diff --git a/scite-app/lexilla/CONTRIBUTING b/scite-app/lexilla/CONTRIBUTING
new file mode 100644
index 0000000..01870a9
--- /dev/null
+++ b/scite-app/lexilla/CONTRIBUTING
@@ -0,0 +1,42 @@
+Lexilla is on GitHub at https://github.com/ScintillaOrg/lexilla
+
+Bugs, fixes and features should be posted to the Issue Tracker
+https://github.com/ScintillaOrg/lexilla/issues
+
+Patches should include test cases. Add a test case file in 
+lexilla/test/examples/<language> and run the test program in 
+lexilla/test.
+The result will be new files with ".styled.new" and ".folded.new"
+appended containing lexing or folding results.
+For lexing, there are brace surrounded style numbers for each style
+start as markup:
+{5}import{0} {11}contextlib{0}
+
+For folding, there are 4 columns of folding results preceding the example text:
+ 2 400   0 + --[[ coding:UTF-8
+ 0 402   0 | comment ]]
+See the test/README file for more explanation of the folding results.
+
+To build lexilla and the tests with gcc there are Windows batch
+and Unix shell files scripts/RunTest.bat scripts/RunTest.sh.
+Check the result of the .new files and, if correct, rename replacing
+".styled.new" with ".styled" and ".folded.new" with ".folded".
+Run the tests again and success should be reported.
+Include the .styled and .folded files in the patch.
+Including test cases ensures that the change won't be undone by
+other changes in the future and clarifies the intentions of the author.
+
+Either send unified diffs (or patch files) or zip archives with whole files.
+Mercurial/Git patch files are best as they include author information and commit
+messages.
+
+Questions should go to the scintilla-interest mailing list
+https://groups.google.com/forum/#!forum/scintilla-interest
+
+Code should follow the guidelines at
+https://www.scintilla.org/SciCoding.html
+
+Lexilla is on GitHub so use its facilities rather than SourceForge which is
+the home of Scintilla.
+The neilh @ scintilla.org account receives much spam and is only checked
+occasionally. Almost all Scintilla mail should go to the mailing list.
diff --git a/scite-app/lexilla/License.txt b/scite-app/lexilla/License.txt
new file mode 100644
index 0000000..e93ac62
--- /dev/null
+++ b/scite-app/lexilla/License.txt
@@ -0,0 +1,20 @@
+License for Lexilla, Scintilla, and SciTE
+
+Copyright 1998-2021 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/scite-app/lexilla/README b/scite-app/lexilla/README
new file mode 100644
index 0000000..d65790a
--- /dev/null
+++ b/scite-app/lexilla/README
@@ -0,0 +1,45 @@
+README for Lexilla library.
+
+The Lexilla library contains a set of lexers and folders that provides support for
+programming, mark-up, and data languages for the Scintilla source code editing
+component.
+
+Lexilla is made available as both a shared library and static library.
+The shared library is called liblexilla.so / liblexilla.dylib / lexilla.dll on Linux / macOS /
+Windows.
+The static library is called liblexilla.a when built with GCC or Clang and liblexilla.lib
+when built with MSVC.
+
+Lexilla is developed on Windows, Linux, and macOS and requires a C++17 compiler.
+It may work on other Unix platforms like BSD but that is not a development focus.
+MSVC 2019.4, GCC 9.0, Clang 9.0, and Apple Clang 11.0 are known to work.
+
+MSVC is only available on Windows.
+
+GCC and Clang work on Windows and Linux.
+
+On macOS, only Apple Clang is available.
+
+To use GCC, run lexilla/src/makefile:
+	make
+
+To use Clang, run lexilla/test/makefile:
+	make CLANG=1
+On macOS, CLANG is set automatically so this can just be
+	make
+
+To use MSVC, run lexilla/test/lexilla.mak:
+	nmake -f lexilla.mak
+
+To build a debugging version of the library, add DEBUG=1 to the command:
+	make DEBUG=1
+	
+The built libraries are copied into scintilla/bin.
+
+Lexilla relies on a list of lexers from the scintilla/lexers directory. If any changes are
+made to the set of lexers then source and build files can be regenerated with the
+lexilla/scripts/LexillaGen.py script which requires Python 3 and is tested with 3.7+.
+Unix:
+	python3 LexillaGen.py
+Windows:
+	pyw LexillaGen.py
diff --git a/scite-app/lexilla/access/LexillaAccess.cxx b/scite-app/lexilla/access/LexillaAccess.cxx
new file mode 100644
index 0000000..f612ce2
--- /dev/null
+++ b/scite-app/lexilla/access/LexillaAccess.cxx
@@ -0,0 +1,285 @@
+// SciTE - Scintilla based Text Editor
+/** @file LexillaAccess.cxx
+ ** Interface to loadable lexers.
+ ** Maintains a list of lexer library paths and CreateLexer functions.
+ ** If list changes then load all the lexer libraries and find the functions.
+ ** When asked to create a lexer, call each function until one succeeds.
+ **/
+// Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstring>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <set>
+
+#if !_WIN32
+#include <dlfcn.h>
+#else
+#include <windows.h>
+#endif
+
+#include "ILexer.h"
+
+#include "Lexilla.h"
+
+#include "LexillaAccess.h"
+
+namespace {
+
+#if _WIN32
+typedef FARPROC Function;
+typedef HMODULE Module;
+constexpr const char *pathSeparator = "\\";
+#else
+typedef void *Function;
+typedef void *Module;
+constexpr const char *pathSeparator = "/";
+#endif
+
+/// Generic function to convert from a Function(void* or FARPROC) to a function pointer.
+/// This avoids undefined and conditionally defined behaviour.
+template<typename T>
+T FunctionPointer(Function function) noexcept {
+	static_assert(sizeof(T) == sizeof(function));
+	T fp {};
+	memcpy(&fp, &function, sizeof(T));
+	return fp;
+}
+
+#if _WIN32
+
+std::wstring WideStringFromUTF8(std::string_view sv) {
+	const int sLength = static_cast<int>(sv.length());
+	const int cchWide = ::MultiByteToWideChar(CP_UTF8, 0, sv.data(), sLength, nullptr, 0);
+	std::wstring sWide(cchWide, 0);
+	::MultiByteToWideChar(CP_UTF8, 0, sv.data(), sLength, &sWide[0], cchWide);
+	return sWide;
+}
+
+#endif
+
+// Turn off deprecation checks as LexillaAccess deprecates its wrapper over
+// the deprecated LexerNameFromID. Thus use within LexillaAccess is intentional.
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#else
+#pragma warning(disable: 4996)
+#endif
+
+std::string directoryLoadDefault;
+std::string lastLoaded;
+
+struct LexLibrary {
+	Lexilla::CreateLexerFn fnCL;
+	Lexilla::LexerNameFromIDFn fnLNFI;
+	Lexilla::GetLibraryPropertyNamesFn fnGLPN;
+	Lexilla::SetLibraryPropertyFn fnSLP;
+	std::string nameSpace;
+};
+std::vector<LexLibrary> libraries;
+
+std::vector<std::string> lexers;
+std::vector<std::string> libraryProperties;
+
+Function FindSymbol(Module m, const char *symbol) noexcept {
+#if _WIN32
+	return ::GetProcAddress(m, symbol);
+#else
+	return dlsym(m, symbol);
+#endif
+}
+
+Lexilla::CreateLexerFn pCreateLexerDefault = nullptr;
+
+bool NameContainsDot(std::string_view path) noexcept {
+	for (std::string_view::const_reverse_iterator it = path.crbegin();
+	     it != path.crend(); ++it) {
+		if (*it == '.')
+			return true;
+		if (*it == '/' || *it == '\\')
+			return false;
+	}
+	return false;
+}
+
+constexpr bool HasPrefix(std::string_view s, std::string_view prefix) noexcept {
+	return (s.size() >= prefix.size()) && (prefix == s.substr(0, prefix.size()));
+}
+
+}
+
+void Lexilla::SetDefault(CreateLexerFn pCreate) noexcept {
+	pCreateLexerDefault = pCreate;
+}
+
+void Lexilla::SetDefaultDirectory(std::string_view directory) {
+	directoryLoadDefault = directory;
+}
+
+bool Lexilla::Load(std::string_view sharedLibraryPaths) {
+	if (sharedLibraryPaths == lastLoaded) {
+		return !libraries.empty();
+	}
+
+	std::string_view paths = sharedLibraryPaths;
+	lexers.clear();
+
+	libraries.clear();
+	while (!paths.empty()) {
+		const size_t separator = paths.find_first_of(';');
+		std::string path(paths.substr(0, separator));
+		if (separator == std::string::npos) {
+			paths.remove_prefix(paths.size());
+		} else {
+			paths.remove_prefix(separator + 1);
+		}
+		if (path == ".") {
+			if (directoryLoadDefault.empty()) {
+				path = "";
+			} else {
+				path = directoryLoadDefault;
+				path += pathSeparator;
+			}
+			path += LEXILLA_LIB;
+		}
+		if (!NameContainsDot(path)) {
+			// No '.' in name so add extension
+			path.append(LEXILLA_EXTENSION);
+		}
+#if _WIN32
+		// Convert from UTF-8 to wide characters
+		std::wstring wsPath = WideStringFromUTF8(path);
+		Module lexillaDL = ::LoadLibraryW(wsPath.c_str());
+#else
+		Module lexillaDL = dlopen(path.c_str(), RTLD_LAZY);
+#endif
+		if (lexillaDL) {
+			GetLexerCountFn fnLexerCount = FunctionPointer<GetLexerCountFn>(
+				FindSymbol(lexillaDL, LEXILLA_GETLEXERCOUNT));
+			GetLexerNameFn fnLexerName = FunctionPointer<GetLexerNameFn>(
+				FindSymbol(lexillaDL, LEXILLA_GETLEXERNAME));
+			if (fnLexerCount && fnLexerName) {
+				const int nLexers = fnLexerCount();
+				for (int i = 0; i < nLexers; i++) {
+					char name[100] = "";
+					fnLexerName(i, name, sizeof(name));
+					lexers.push_back(name);
+				}
+			}
+			CreateLexerFn fnCL = FunctionPointer<CreateLexerFn>(
+				FindSymbol(lexillaDL, LEXILLA_CREATELEXER));
+			LexerNameFromIDFn fnLNFI = FunctionPointer<LexerNameFromIDFn>(
+				FindSymbol(lexillaDL, LEXILLA_LEXERNAMEFROMID));
+			GetLibraryPropertyNamesFn fnGLPN = FunctionPointer<GetLibraryPropertyNamesFn>(
+				FindSymbol(lexillaDL, LEXILLA_GETLIBRARYPROPERTYNAMES));
+			SetLibraryPropertyFn fnSLP = FunctionPointer<SetLibraryPropertyFn>(
+				FindSymbol(lexillaDL, LEXILLA_SETLIBRARYPROPERTY));
+			GetNameSpaceFn fnGNS = FunctionPointer<GetNameSpaceFn>(
+				FindSymbol(lexillaDL, LEXILLA_GETNAMESPACE));
+			std::string nameSpace;
+			if (fnGNS) {
+				nameSpace = fnGNS();
+				nameSpace += LEXILLA_NAMESPACE_SEPARATOR;
+			}
+			LexLibrary lexLib {
+				fnCL,
+				fnLNFI,
+				fnGLPN,
+				fnSLP,
+				nameSpace
+			};
+			libraries.push_back(lexLib);
+		}
+	}
+	lastLoaded = sharedLibraryPaths;
+
+	std::set<std::string> nameSet;
+	for (const LexLibrary &lexLib : libraries) {
+		if (lexLib.fnGLPN) {
+			const char *cpNames = lexLib.fnGLPN();
+			if (cpNames) {
+				std::string_view names = cpNames;
+				while (!names.empty()) {
+					const size_t separator = names.find_first_of('\n');
+					std::string name(names.substr(0, separator));
+					nameSet.insert(name);
+					if (separator == std::string::npos) {
+						names.remove_prefix(names.size());
+					} else {
+						names.remove_prefix(separator + 1);
+					}
+				}
+			}
+		}
+	}
+	// Standard Lexilla does not have any properties so can't be added to set.
+	libraryProperties = std::vector<std::string>(nameSet.begin(), nameSet.end());
+
+	return !libraries.empty();
+}
+
+Scintilla::ILexer5 *Lexilla::MakeLexer(std::string_view languageName) {
+	std::string sLanguageName(languageName);	// Ensure NUL-termination
+	// First, try to match namespace then name suffix
+	for (const LexLibrary &lexLib : libraries) {
+		if (lexLib.fnCL && !lexLib.nameSpace.empty()) {
+			if (HasPrefix(languageName, lexLib.nameSpace)) {
+				Scintilla::ILexer5 *pLexer = lexLib.fnCL(sLanguageName.substr(lexLib.nameSpace.size()).c_str());
+				if (pLexer) {
+					return pLexer;
+				}
+			}
+		}
+	}
+	// If no match with namespace, try to just match name
+	for (const LexLibrary &lexLib : libraries) {
+		if (lexLib.fnCL) {
+			Scintilla::ILexer5 *pLexer = lexLib.fnCL(sLanguageName.c_str());
+			if (pLexer) {
+				return pLexer;
+			}
+		}
+	}
+	if (pCreateLexerDefault) {
+		return pCreateLexerDefault(sLanguageName.c_str());
+	}
+#ifdef LEXILLA_STATIC
+	Scintilla::ILexer5 *pLexer = CreateLexer(sLanguageName.c_str());
+	if (pLexer) {
+		return pLexer;
+	}
+#endif
+	return nullptr;
+}
+
+std::vector<std::string> Lexilla::Lexers() {
+	return lexers;
+}
+
+std::string Lexilla::NameFromID(int identifier) {
+	for (const LexLibrary &lexLib : libraries) {
+		if (lexLib.fnLNFI) {
+			const char *name = lexLib.fnLNFI(identifier);
+			if (name) {
+				return name;
+			}
+		}
+	}
+	return std::string();
+}
+
+std::vector<std::string> Lexilla::LibraryProperties() {
+	return libraryProperties;
+}
+
+void Lexilla::SetProperty(const char *key, const char *value) {
+	for (const LexLibrary &lexLib : libraries) {
+		if (lexLib.fnSLP) {
+			lexLib.fnSLP(key, value);
+		}
+	}
+	// Standard Lexilla does not have any properties so don't set.
+}
diff --git a/scite-app/lexilla/access/LexillaAccess.h b/scite-app/lexilla/access/LexillaAccess.h
new file mode 100644
index 0000000..e1fda8d
--- /dev/null
+++ b/scite-app/lexilla/access/LexillaAccess.h
@@ -0,0 +1,35 @@
+// SciTE - Scintilla based Text Editor
+/** @file LexillaAccess.h
+ ** Interface to loadable lexers.
+ ** This does not depend on SciTE code so can be copied out into other projects.
+ **/
+// Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXILLAACCESS_H
+#define LEXILLAACCESS_H
+
+namespace Lexilla {
+ 
+// Directory to load default Lexilla from, commonly the directory of the application.
+void SetDefaultDirectory(std::string_view directory);
+
+// Specify CreateLexer when statically linked so no hard dependency in LexillaAccess
+// so it doesn't have to be built in two forms - static and dynamic.
+void SetDefault(CreateLexerFn pCreate) noexcept;
+
+// sharedLibraryPaths is a ';' separated list of shared libraries to load.
+// On Win32 it is treated as UTF-8 and on Unix it is passed to dlopen directly.
+// Return true if any shared libraries are loaded.
+bool Load(std::string_view sharedLibraryPaths);
+
+Scintilla::ILexer5 *MakeLexer(std::string_view languageName);
+
+std::vector<std::string> Lexers();
+[[deprecated]] std::string NameFromID(int identifier);
+std::vector<std::string> LibraryProperties();
+void SetProperty(const char *key, const char *value);
+
+}
+
+#endif
diff --git a/scite-app/lexilla/access/README b/scite-app/lexilla/access/README
new file mode 100644
index 0000000..97e28e5
--- /dev/null
+++ b/scite-app/lexilla/access/README
@@ -0,0 +1,9 @@
+README for access directory.
+
+LexillaAccess is a module that simplifies using multiple libraries that follow the Lexilla protocol.
+
+It can be compiled into a Lexilla client application.
+
+Applications with complex needs can copy the code and customise it to meet their requirements.
+
+This module is not meant to be compiled into Lexilla.
diff --git a/scite-app/lexilla/bin/empty.txt b/scite-app/lexilla/bin/empty.txt
new file mode 100644
index 0000000..6618385
--- /dev/null
+++ b/scite-app/lexilla/bin/empty.txt
@@ -0,0 +1 @@
+This empty files ensures that the directory is created.
\ No newline at end of file
diff --git a/scite-app/lexilla/cppcheck.suppress b/scite-app/lexilla/cppcheck.suppress
new file mode 100644
index 0000000..83396ea
--- /dev/null
+++ b/scite-app/lexilla/cppcheck.suppress
@@ -0,0 +1,143 @@
+// File to suppress cppcheck warnings for files that will not be fixed.
+// Does not suppress warnings where an additional occurrence of the warning may be of interest.
+
+// Coding style is to use assignments in constructor when there are many
+// members to initialize or the initialization is complex or has comments.
+useInitializationList
+
+// These may be interesting but its not clear without examining each instance closely
+// Would have to ensure that any_of/all_of has same early/late exits as current code and
+// produces same result on empty collections
+useStlAlgorithm
+
+// Some non-explicit constructors are used for conversions or are private to lexers
+noExplicitConstructor
+
+// The performance cost of by-value passing is often small and using a reference decreases
+// code legibility.
+passedByValue
+
+// Suppress most lexer warnings since the lexers are maintained by others
+redundantCondition:lexilla/lexers/LexA68k.cxx
+constParameter:lexilla/lexers/LexAbaqus.cxx
+knownConditionTrueFalse:lexilla/lexers/LexAU3.cxx
+shadowVariable:lexilla/lexers/LexAU3.cxx
+constParameter:lexilla/lexers/LexBaan.cxx
+unreadVariable:lexilla/lexers/LexBaan.cxx
+constParameter:lexilla/lexers/LexBash.cxx
+uninitMemberVar:lexilla/lexers/LexBash.cxx
+variableScope:lexilla/lexers/LexBash.cxx
+variableScope:lexilla/lexers/LexBatch.cxx
+knownConditionTrueFalse:lexilla/lexers/LexBatch.cxx
+variableScope:lexilla/lexers/LexCmake.cxx
+knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
+constParameter:lexilla/lexers/LexCLW.cxx
+constParameter:lexilla/lexers/LexCoffeeScript.cxx
+constParameter:lexilla/lexers/LexCPP.cxx
+variableScope:lexilla/lexers/LexCSS.cxx
+variableScope:lexilla/lexers/LexDataflex.cxx
+knownConditionTrueFalse:lexilla/lexers/LexECL.cxx
+variableScope:lexilla/lexers/LexErlang.cxx
+knownConditionTrueFalse:lexilla/lexers/LexErlang.cxx
+knownConditionTrueFalse:lexilla/lexers/LexEScript.cxx
+constParameter:lexilla/lexers/LexFortran.cxx
+redundantCondition:lexilla/lexers/LexFSharp.cxx
+knownConditionTrueFalse:lexilla/lexers/LexFSharp.cxx
+variableScope:lexilla/lexers/LexGui4Cli.cxx
+constParameter:lexilla/lexers/LexHaskell.cxx
+constParameter:lexilla/lexers/LexHex.cxx
+constParameter:lexilla/lexers/LexHTML.cxx
+variableScope:lexilla/lexers/LexInno.cxx
+variableScope:lexilla/lexers/LexJulia.cxx
+constParameter:lexilla/lexers/LexJulia.cxx
+unreadVariable: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
+variableScope:lexilla/lexers/LexMetapost.cxx
+constParameter:lexilla/lexers/LexModula.cxx
+variableScope:lexilla/lexers/LexModula.cxx
+variableScope:lexilla/lexers/LexMSSQL.cxx
+shadowArgument:lexilla/lexers/LexMySQL.cxx
+constParameter:lexilla/lexers/LexNim.cxx
+constParameter:lexilla/lexers/LexNimrod.cxx
+variableScope:lexilla/lexers/LexNimrod.cxx
+variableScope:lexilla/lexers/LexNsis.cxx
+knownConditionTrueFalse:lexilla/lexers/LexNsis.cxx
+variableScope:lexilla/lexers/LexOpal.cxx
+constParameter:lexilla/lexers/LexOScript.cxx
+variableScope:lexilla/lexers/LexPB.cxx
+constParameter:lexilla/lexers/LexPerl.cxx
+knownConditionTrueFalse:lexilla/lexers/LexPerl.cxx
+constParameter:lexilla/lexers/LexPython.cxx
+shadowVariable:lexilla/lexers/LexPowerPro.cxx
+knownConditionTrueFalse:lexilla/lexers/LexPowerPro.cxx
+variableScope:lexilla/lexers/LexProgress.cxx
+constParameter:lexilla/lexers/LexRaku.cxx
+variableScope:lexilla/lexers/LexRaku.cxx
+redundantInitialization:lexilla/lexers/LexRegistry.cxx
+constParameter:lexilla/lexers/LexRuby.cxx
+constParameter:lexilla/lexers/LexRust.cxx
+constParameter:lexilla/lexers/LexScriptol.cxx
+variableScope:lexilla/lexers/LexSpecman.cxx
+unreadVariable:lexilla/lexers/LexSpice.cxx
+constParameter:lexilla/lexers/LexSTTXT.cxx
+knownConditionTrueFalse:lexilla/lexers/LexTACL.cxx
+clarifyCalculation:lexilla/lexers/LexTADS3.cxx
+constParameter:lexilla/lexers/LexTADS3.cxx
+invalidscanf:lexilla/lexers/LexTCMD.cxx
+constParameter:lexilla/lexers/LexTeX.cxx
+variableScope:lexilla/lexers/LexTeX.cxx
+knownConditionTrueFalse:lexilla/lexers/LexTxt2tags.cxx
+constParameter:lexilla/lexers/LexVerilog.cxx
+knownConditionTrueFalse:lexilla/lexers/LexVerilog.cxx
+constParameter:lexilla/lexers/LexVHDL.cxx
+shadowVariable:lexilla/lexers/LexVHDL.cxx
+unreadVariable:lexilla/lexers/LexVHDL.cxx
+variableScope:lexilla/lexers/LexVHDL.cxx
+unreadVariable:lexilla/lexers/LexVisualProlog.cxx
+constParameter:lexilla/lexers/LexYAML.cxx
+
+// These are due to Accessor::IndentAmount not declaring the callback as taking a const.
+// Changing this could cause problems for downstream projects.
+constParameterCallback:lexilla/lexers/LexEiffel.cxx
+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/LexR.cxx
+constVariable:lexilla/lexers/LexRebol.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
+
+// bp.itBracket not actually redundant as needed by return statements
+redundantAssignment:lexilla/lexers/LexCPP.cxx
+
+// Suppress everything in test example files
+*:lexilla/test/examples/*
+
+// Suppress everything in catch.hpp as won't be changing
+*:lexilla/test/unit/catch.hpp
diff --git a/scite-app/lexilla/delbin.bat b/scite-app/lexilla/delbin.bat
new file mode 100755
index 0000000..533e67b
--- /dev/null
+++ b/scite-app/lexilla/delbin.bat
@@ -0,0 +1 @@
+@del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.ipdb *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog >NUL:
diff --git a/scite-app/lexilla/doc/Lexilla.html b/scite-app/lexilla/doc/Lexilla.html
new file mode 100644
index 0000000..11f99e8
--- /dev/null
+++ b/scite-app/lexilla/doc/Lexilla.html
@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <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="20210726" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+        .logo {
+            background: url(https://www.scintilla.org/LexillaLogo.png) no-repeat;
+            background-image: image-set(
+                        url(https://www.scintilla.org/LexillaLogo.png) 1x,
+                        url(https://www.scintilla.org/LexillaLogo2x.png) 2x  );
+            height:150px;
+        }
+        #versionlist {
+            margin: 0;
+            padding: .5em;
+            list-style-type: none;
+            color: #FFCC99;
+            background: #000000;
+        }
+        #versionlist li {
+            margin-bottom: .5em;
+        }
+        #menu {
+            margin: 0;
+            padding: .5em 0;
+            list-style-type: none;
+            font-size: larger;
+            background: #CCCCCC;
+        }
+        #menu li {
+            margin: 0;
+            padding: 0 .5em;
+            display: inline;
+        }
+    </style>
+    <script type="text/javascript">
+   	function IsRemote() {
+		var loc = '' + window.location;
+		return (loc.indexOf('http:')) != -1 || (loc.indexOf('https:') != -1);
+   	}
+    </script>
+     <title>
+       Lexilla
+     </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="256">
+        </td>
+        <td width="40%" align="left">
+          <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.1.1<br />
+           Site last modified July 26 2021</font>
+        </td>
+        <td width="20%">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="100%" class="logo">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <ul id="versionlist">
+      <li>Version 5.1.1 improves C++, Julia, Markdown, Matlab, and PHP.</li>
+      <li>Version 5.1.0 is a stable release: the interfaces between Scintilla and Lexilla and between
+      platform-independent code and platform layers should remain compatible through 5.x releases.
+      Improvements were made for ASP, Erlang, F#, Raku, Ruby, Tcl, and YAML.</li>
+      <li>Version 5.0.3 adds a lexer for Julia.</li>
+      <li>Version 5.0.2 improves preprocessor handling for C/C++.</li>
+      <li>Version 5.0.1 adds a LexerNameFromID function to the Lexilla protocol to ease migrating applications.
+      The cpp and errorlist lexers were improved.</li>
+      <li>Version 5.0.0 is an unstable testing release.</li>
+    </ul>
+    <ul id="menu">
+      <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
+      <li id="remote2"><a href="https://www.scintilla.org/LexillaDownload.html">Download</a></li>
+      <li><a href="https://www.scintilla.org/LexillaDoc.html">Documentation</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaToDo.html">Bugs</a></li>
+      <li id="remote3"><a href="https://www.scintilla.org/SciTE.html">SciTE</a></li>
+      <li><a href="https://www.scintilla.org/LexillaHistory.html">History</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaRelated.html">Related</a></li>
+      <li id="remote4"><a href="https://www.scintilla.org/Privacy.html">Privacy</a></li>
+    </ul>
+<script type="text/javascript" language="JavaScript"><!--
+if (!IsRemote()) { //if NOT remote...
+    document.getElementById('remote1').style.display='none';
+    document.getElementById('remote2').style.display='none';
+    document.getElementById('remote3').style.display='none';
+    document.getElementById('remote4').style.display='none';
+}
+//--></script>
+    <p>
+       <a href="https://www.scintilla.org/LexillaDoc.html">Lexilla</a> is a free library of language
+       lexers that can be used with the <a href="https://www.scintilla.org/index.html">Scintilla</a>
+       editing component.
+       It comes with complete source code and a <a href="https://www.scintilla.org/License.txt">license</a> that
+       permits use in any free project or commercial product.
+    </p>
+    <p>
+       Originally, this functionality was incorporated inside Scintilla.
+       It has been extracted as a separate project to make it easier for contributors to work on
+       support for new languages and to fix bugs in existing lexers.
+       It also defines a protocol where projects can easily implement their own lexers and distribute
+       them as they wish.
+    </p>
+    <p>
+       Current development occurs on the default branch as 5.* which requires a recent
+       C++ compiler that supports C++17.
+       The testing framework uses some C++20 features but the basic library only uses C++17.
+    </p>
+    <p>
+       Lexilla is currently available for Intel Win32, OS X, and Linux compatible operating
+      systems. It has been run on Windows 10, OS X 10.13+, and on Ubuntu 20.04 but is likely
+      to run on earlier systems as it has no GUI functionality.
+    </p>
+    <p>
+       You can <a href="https://www.scintilla.org/LexillaDownload.html">download Lexilla.</a>
+    </p>
+    <p>
+       The source code can be downloaded via Git at GitHub
+	<a href="https://github.com/ScintillaOrg/lexilla">Lexilla project page</a>.<br />
+        git clone https://github.com/ScintillaOrg/lexilla
+    </p>
+    <p>Current repository status:
+    <a href="https://travis-ci.com/github/ScintillaOrg/lexilla">
+    <img  src="https://travis-ci.com/ScintillaOrg/lexilla.svg?branch=master" /></a></p>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaRelated.html">Related sites.</a>
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaToDo.html">Bugs and To Do list.</a>
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/LexillaHistory.html">History and contribution credits.</a>
+    </p>
+    <p>
+      Questions and comments about Lexilla should be directed to the
+      <a href="https://groups.google.com/forum/#!forum/scintilla-interest">scintilla-interest</a>
+      mailing list,
+      which is for discussion of Scintilla and related projects, their bugs and future features.
+      This is a low traffic list, averaging less than 20 messages per week.
+      To avoid spam, only list members can write to the list.
+      New versions of Lexilla are announced on scintilla-interest.
+      Messages sent to my personal email address that could have been sent to the list
+      may receive no response.
+      <br />
+    </p>
+  </body>
+</html>
+
diff --git a/scite-app/lexilla/doc/LexillaDoc.html b/scite-app/lexilla/doc/LexillaDoc.html
new file mode 100644
index 0000000..7cb280b
--- /dev/null
+++ b/scite-app/lexilla/doc/LexillaDoc.html
@@ -0,0 +1,251 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator"
+    content="HTML Tidy for Windows (vers 1st August 2002), see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+
+    <title>Lexilla Documentation</title>
+
+    <style type="text/css">
+<!--
+/*<![CDATA[*/
+	CODE { font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A:visited { color: blue; }
+	A:hover { text-decoration: underline ! important; }
+	A.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.seealso { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.toc { text-decoration: none; }
+	A.jump { text-decoration: none; }
+	LI.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	H2 { background: #E0EAFF; }
+
+	table {
+		border: 0px;
+		border-collapse: collapse;
+	}
+
+        div.console {
+            font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;
+            color: #008000;
+            font-weight: bold;
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+        }
+        span.console {
+            font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;
+            color: #008000;
+            font-weight: bold;
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.1em 0em;
+            padding: 0.1em 0.3em;
+        }
+
+        .name {
+		color: #B08000;
+        }
+/*]]>*/
+-->
+    </style>
+  </head>
+
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0"
+    summary="Banner">
+      <tr>
+        <td><img src="SciTEIco.png" border="3" height="64" width="64" alt="Lexilla icon" /></td>
+
+        <td><a href="index.html"
+        style="color:white;text-decoration:none;font-size:200%">Lexilla</a></td>
+      </tr>
+    </table>
+
+    <h1>Lexilla Documentation</h1>
+
+    <p>Last edited 21 April 2021 NH</p>
+
+    <h2>Introduction</h2>
+
+    <p>Lexilla is a library containing lexers for use with Scintilla. It can be either a static library
+    that is linked into an application or a shared library that is loaded at runtime.</p>
+
+    <p>Lexilla does not interact with the display so there is no need to compile it for a
+    particular GUI toolkit. Therefore there can be a common library shared by applications using
+    different GUI toolkits. In some circumstances there may need to be both 32-bit and 64-bit versions
+    on one system to match different applications.</p>
+
+    <p>Different extensions are commonly used for shared libraries: .so on Linux, .dylib on macOS, and .DLL on Windows.
+     </p>
+
+    <h2>The Lexilla protocol</h2>
+
+    <p>A set of functions is defined by Lexilla for use by applications. Libraries that provide these functions
+    can be used as a replacement for Lexilla or to add new lexers beyond those provided by Lexilla.</p>
+
+    <p>The Lexilla protocol is a superset of the external lexer protocol and defines these functions that may be exported from a shared library:<br />
+    <code>int <span class="name">GetLexerCount</span>()</code><br />
+    <code>void <span class="name">GetLexerName</span>(unsigned int index, char *name, int buflength)</code><br />
+    <code>LexerFactoryFunction <span class="name">GetLexerFactory</span>(unsigned int index)</code><br />
+    <code>ILexer5 *<span class="name">CreateLexer</span>(const char *name)</code><br />
+    <code>const char *<span class="name">LexerNameFromID</span>(int identifier)</code><br />
+    <code>const char *<span class="name">GetLibraryPropertyNames</span>()</code><br />
+    <code>void <span class="name">SetLibraryProperty</span>(const char *key, const char *value)</code><br />
+    <code>const char *<span class="name">GetNameSpace</span>()</code>
+    </p>
+  
+    <p><span class="name">ILexer5</span> is defined by Scintilla in include/ILexer.h as the interface provided by lexers which is called by Scintilla.
+    Many clients do not actually need to call methods on <span class="name">ILexer5</span> - they just take the return from CreateLexer and plug it
+    straight into Scintilla so it can be treated as a machine pointer (void *).
+    </p>
+
+    <p><span class="name">LexerFactoryFunction</span> is defined as a function that takes no arguments and returns an <span class="name">ILexer5</span> *:
+    <code>ILexer5 *(*LexerFactoryFunction)()</code> but this can be ignored by most client code.
+    </p>
+
+    <p>The Lexilla protocol is a superset of the earlier external lexer protocol that defined the first 3 functions 
+    (<span class="name">GetLexerCount</span>, <span class="name">GetLexerName</span>, <span class="name">GetLexerFactory</span>)
+    so Lexilla be loaded by applications that support that protocol.
+    <span class="name">GetLexerFactory</span> will rarely be used now as it is easier to call <span class="name">CreateLexer</span>.
+    </p>
+  
+    <p><span class="name">CreateLexer</span> is the main call that will create a lexer for a particular language. The returned lexer can then be
+    set as the current lexer in Scintilla by calling
+    <a class="seealso" href="ScintillaDoc.html#SCI_SETILEXER">SCI_SETILEXER</a>.</p>
+  
+    <p><span class="name">LexerNameFromID</span> is an optional function that returns the name for a lexer identifier.
+    <code>LexerNameFromID(SCLEX_CPP) &rarr; "cpp"</code>.
+    This is a temporary affordance to make it easier to convert applications to using Lexilla.
+    Applications should move to using lexer names instead of IDs.
+    This function is deprecated, showing warnings with some compilers, and will be removed in a future version of Lexilla.</p>
+  
+    <p><span class="name">SetLibraryProperty</span> and <span class="name">GetLibraryPropertyNames</span>
+    are optional functions that can be
+    defined if a library requires initialisation before calling other methods.
+    For example, a lexer library that reads language definitions from XML files may require that the
+    directory containing these files be set before a call to CreateLexer.
+    <code>SetLibraryProperty("definitions.directory", "/usr/share/xeditor/language-definitions")</code>
+    If a library implements SetLibraryProperty then it may also provide a set of valid property names with
+    GetLibraryPropertyNames that can then be used by the application to define configuration file property
+    names or user interface elements for options dialogs.</p>
+  
+    <p><span class="name">GetNameSpace</span> is an optional function that returns a namespace string
+    that can be used to disambiguate lexers with the same name from different providers.
+    If Lexilla and XMLLexers both provide a "cpp" lexer than a request for "cpp" may be satisfied by either but "xmllexers.cpp"
+    unambiguously refers to the "cpp" lexer from XMLLexers.</p>
+  
+    <h2>Building Lexilla</h2>
+
+    <p>Before using Lexilla it must be built or downloaded.</p>
+
+    <div>To build Lexilla, in the lexilla/src directory, run make (for gcc or clang)</div>
+    <div class="console">make</div>
+    <div>or nmake for MSVC</div>
+    <div class="console">nmake -f lexilla.mak</div>
+    <br />
+
+    <div>After building Lexilla, its test suite can be run with make/nmake in the lexilla/test directory. For gcc or clang</div>
+    <div class="console">make test</div>
+    or for MSVC<br />
+    <div class="console">nmake -f testlexers.mak test</div>
+    <div>Each test case should show "<code>Lexing ...</code>" and errors will display a diagnostic, commonly showing
+    a difference between the actual and expected result:<br>
+    <code>C:\u\hg\lexilla\test\examples\python\x.py:1: is different</code>
+    </div>
+    
+    <p>There are also RunTest.sh / RunTest.bat scripts in the scripts directory to build Lexilla and then build and run the tests.
+    These both use gcc/clang, not MSVC.</p>
+
+    <p>There are Microsoft Visual C++ and Xcode projects that can be used to build Lexilla.
+    For Visual C++: src/Lexilla.vcxproj. For Xcode: src/Lexilla/Lexilla.xcodeproj.
+    There is also test/TestLexers.vcxproj to build the tests with Visual C++.</p>
+
+    <h2>Using Lexilla</h2>
+    
+    <p>Definitions for using Lexilla from C and C++ are included in lexilla/include/Lexilla.h.
+    For C++, scintilla/include/ILexer.h should be included before Lexilla.h as the
+    <code>ILexer5</code> type is used.
+    For C, ILexer.h should not be included as C does not understand it and from C,
+    <code>void*</code> is used instead of <code>ILexer5*</code>.
+    </p>
+
+    <p>For many applications the main Lexilla operations are loading the Lexilla library, creating a
+    lexer and using that lexer in Scintilla.
+    Applications need to define the location (or locations) they expect
+    to find Lexilla or libraries that support the Lexilla protocol.
+    They also need to define how they request particular lexers, perhaps with a mapping from
+    file extensions to lexer names.</p>
+
+    <h3 id="CheckLexilla">From C - CheckLexilla</h3>
+
+    <p>An example C program for accessing Lexilla is provided in lexilla/examples/CheckLexilla.
+    Build with <span class="console">make</span> and run with <span class="console">make check</span>.
+    </p>
+
+    <h3>From C++ - LexillaAccess</h3>
+
+    <p>A C++ module, LexillaAccess.cxx / LexillaAccess.h is provided in lexilla/access.
+    This can either be compiled into the application when it is sufficient
+    or the source code can be copied into the application and customized when the application has additional requirements
+    (such as checking code signatures).
+    SciTE uses LexillaAccess.</p>
+
+    <p>LexillaAccess supports loading multiple shared libraries implementing the Lexilla protocol at one time.</p>
+
+    <h3>From Qt</h3>
+
+    <p>For Qt, use either LexillaAccess from above or Qt's QLibrary class. With 'Call' defined to call Scintilla APIs.<br />
+    <code>
+#if _WIN32<br />
+&nbsp;&nbsp;&nbsp;&nbsp;typedef void *(__stdcall *CreateLexerFn)(const char *name);<br />
+#else<br />
+&nbsp;&nbsp;&nbsp;&nbsp;typedef void *(*CreateLexerFn)(const char *name);<br />
+#endif<br />
+&nbsp;&nbsp;&nbsp;&nbsp;QFunctionPointer fn = QLibrary::resolve("lexilla", "CreateLexer");<br />
+&nbsp;&nbsp;&nbsp;&nbsp;void *lexCpp = ((CreateLexerFn)fn)("cpp");<br />
+&nbsp;&nbsp;&nbsp;&nbsp;Call(SCI_SETILEXER, 0, (sptr_t)(void *)lexCpp);<br />
+    </code></p>
+
+    <p>Applications may discover the set of lexers provided by a library by first calling
+    <span class="name">GetLexerCount</span> to find the number of lexers implemented in the library then looping over calling
+    <span class="name">GetLexerName</span> with integers 0 to <code>GetLexerCount()-1</code>.</p>
+
+    <p>Applications may set properties on a library by calling <span class="name">SetLibraryProperty</span> if provided.
+    This may be needed for initialisation so should before calling <span class="name">GetLexerCount</span> or <span class="name">CreateLexer</span>.
+    A set of property names may be available from <span class="name">GetLibraryPropertyNames</span> if provided.
+    It returns a string pointer where the string contains a list of property names separated by '\n'.
+    It is up to applications to define how properties are defined and persisted in its user interface
+    and configuration files.</p>
+
+    <h2>Modifying or adding lexers</h2>
+ 
+    <p>Lexilla can be modified or a new library created that can be used to replace or augment Lexilla.</p>
+
+    <p>Lexer libraries that provide the same functions as Lexilla may provide lexers for use by Scintilla,
+    augmenting or replacing those provided by Lexilla.
+    To allow initialisation of lexer libraries, a <code>SetLibraryProperty(const char *key, const char *value)</code>
+    may optionally be implemented. For example, a lexer library that uses XML based lexer definitions may
+    be provided with a directory to search for such definitions.
+    Lexer libraries should ignore any properties that they do not understand.
+    The set of properties supported by a lexer library is specified as a '\n' separated list of property names by
+    an optional <code>const char *GetLibraryPropertyNames()</code> function.
+    </p>
+
+    <p>Lexilla and its contained lexers can be tested with the TestLexers program in lexilla/test.
+    Read lexilla/test/README for information on building and using TestLexers.</p>
+
+    <p>An example of a simple lexer housed in a shared library that is compatible with the
+    Lexilla protocol can be found in lexilla/examples/SimpleLexer. It is implemented in C++.
+    Build with <span class="console">make</span> and check by running <a href="#CheckLexilla">CheckLexilla</a> against it with
+    <span class="console">make check</span>.
+    </p>
+
+  </body>
+</html>
+
diff --git a/scite-app/lexilla/doc/LexillaDownload.html b/scite-app/lexilla/doc/LexillaDownload.html
new file mode 100644
index 0000000..685f11f
--- /dev/null
+++ b/scite-app/lexilla/doc/LexillaDownload.html
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Download Lexilla
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Download
+          Lexilla</font></a>
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
+      <tr>
+        <td>
+          <font size="4"> <a href="https://www.scintilla.org/lexilla511.zip">
+	Windows</a>&nbsp;&nbsp;
+	<a href="https://www.scintilla.org/lexilla511.tgz">
+          GTK/Linux</a>&nbsp;&nbsp;
+	</font>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Download.
+    </h2>
+    <p>
+       The <a href="License.txt">license</a> for using Lexilla is similar to that of Python
+      containing very few restrictions.
+    </p>
+    <h3>
+       Release 4.4.6
+    </h3>
+    <h4>
+       Source Code
+    </h4>
+       The source code package contains all of the source code for Lexilla but no binary
+	executable code and is available in
+       <ul>
+       <li><a href="https://www.scintilla.org/lexilla511.zip">zip format</a> (1.0M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla511.tgz">tgz format</a> (0.8M) 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>
+       Windows Executable Code
+    </h4>
+       There is no download available containing only the Lexilla DLL.
+       However, it is included in the <a href="SciTEDownload.html">SciTE
+       executable full download</a> as Lexilla.DLL.
+    <p>
+       <a href="SciTEDownload.html">SciTE</a> is a good demonstration of Lexilla.
+    </p>
+    <p>
+       Previous versions can be downloaded from the <a href="LexillaHistory.html">history
+      page</a>.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/lexilla/doc/LexillaHistory.html b/scite-app/lexilla/doc/LexillaHistory.html
new file mode 100644
index 0000000..c2a68dc
--- /dev/null
+++ b/scite-app/lexilla/doc/LexillaHistory.html
@@ -0,0 +1,13268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Lexilla
+    </title>
+    <style type="text/css">
+        table {
+            border-collapse: collapse;
+            font-size: 80%;
+        }
+        td {
+            xborder: 1px solid #1F1F1F;
+            padding: 0px 4px;
+        }
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Lexilla</font></a>
+        </td>
+      </tr>
+    </table>
+    <h1>History of Lexilla</h1>
+    <p>
+       Lexilla was originally code that was part of the Scintilla project.
+       Thus it shares much of the history and contributors of Scintilla before it was extracted as its own project.
+    </p>
+    <h2>Contributors</h2>
+    <p>
+       Thanks to all the people that have contributed patches, bug reports and suggestions.
+    </p>
+    <p>
+       Source code and documentation have been contributed by
+    </p>
+    <table>
+      <tr>
+	<td>Atsuo Ishimoto</td>
+	<td>Mark Hammond</td>
+	<td>Francois Le Coguiec</td>
+	<td>Dale Nagata</td>
+      </tr><tr>
+	<td>Ralf Reinhardt</td>
+	<td>Philippe Lhoste</td>
+	<td>Andrew McKinlay</td>
+	<td>Stephan R. A. Deibel</td>
+      </tr><tr>
+	<td>Hans Eckardt</td>
+	<td>Vassili Bourdo</td>
+	<td>Maksim Lin</td>
+	<td>Robin Dunn</td>
+      </tr><tr>
+	<td>John Ehresman</td>
+	<td>Steffen Goeldner</td>
+	<td>Deepak S.</td>
+	<td><a href="http://www.develop.com">DevelopMentor</a></td>
+      </tr><tr>
+	<td>Yann Gaillard</td>
+	<td>Aubin Paul</td>
+	<td>Jason Diamond</td>
+	<td>Ahmad Baitalmal</td>
+      </tr><tr>
+	<td>Paul Winwood</td>
+	<td>Maxim Baranov</td>
+	<td>Ragnar Højland</td>
+	<td>Christian Obrecht</td>
+      </tr><tr>
+	<td>Andreas Neukoetter</td>
+	<td>Adam Gates</td>
+	<td>Steve Lhomme</td>
+	<td>Ferdinand Prantl</td>
+      </tr><tr>
+	<td>Jan Dries</td>
+	<td>Markus Gritsch</td>
+	<td>Tahir Karaca</td>
+	<td>Ahmad Zawawi</td>
+      </tr><tr>
+	<td>Laurent le Tynevez</td>
+	<td>Walter Braeu</td>
+	<td>Ashley Cambrell</td>
+	<td>Garrett Serack</td>
+      </tr><tr>
+	<td>Holger Schmidt</td>
+	<td><a href="http://www.activestate.com">ActiveState</a></td>
+	<td>James Larcombe</td>
+	<td>Alexey Yutkin</td>
+      </tr><tr>
+	<td>Jan Hercek</td>
+	<td>Richard Pecl</td>
+	<td>Edward K. Ream</td>
+	<td>Valery Kondakoff</td>
+      </tr><tr>
+	<td>Smári McCarthy</td>
+	<td>Clemens Wyss</td>
+	<td>Simon Steele</td>
+	<td>Serge A. Baranov</td>
+      </tr><tr>
+	<td>Xavier Nodet</td>
+	<td>Willy Devaux</td>
+	<td>David Clain</td>
+	<td>Brendon Yenson</td>
+      </tr><tr>
+	<td><a href="http://www.baanboard.com">Vamsi Potluru</a></td>
+	<td>Praveen Ambekar</td>
+	<td>Alan Knowles</td>
+	<td>Kengo Jinno</td>
+      </tr><tr>
+	<td>Valentin Valchev</td>
+	<td>Marcos E. Wurzius</td>
+	<td>Martin Alderson</td>
+	<td>Robert Gustavsson</td>
+      </tr><tr>
+	<td>José Fonseca</td>
+	<td>Holger Kiemes</td>
+	<td>Francis Irving</td>
+	<td>Scott Kirkwood</td>
+      </tr><tr>
+	<td>Brian Quinlan</td>
+	<td>Ubi</td>
+	<td>Michael R. Duerig</td>
+	<td>Deepak T</td>
+      </tr><tr>
+	<td>Don Paul Beletsky</td>
+	<td>Gerhard Kalab</td>
+	<td>Olivier Dagenais</td>
+	<td>Josh Wingstrom</td>
+      </tr><tr>
+	<td>Bruce Dodson</td>
+	<td>Sergey Koshcheyev</td>
+	<td>Chuan-jian Shen</td>
+	<td>Shane Caraveo</td>
+      </tr><tr>
+	<td>Alexander Scripnik</td>
+	<td>Ryan Christianson</td>
+	<td>Martin Steffensen</td>
+	<td>Jakub Vrána</td>
+      </tr><tr>
+	<td>The Black Horus</td>
+	<td>Bernd Kreuss</td>
+	<td>Thomas Lauer</td>
+	<td>Mike Lansdaal</td>
+      </tr><tr>
+	<td>Yukihiro Nakai</td>
+	<td>Jochen Tucht</td>
+	<td>Greg Smith</td>
+	<td>Steve Schoettler</td>
+      </tr><tr>
+	<td>Mauritius Thinnes</td>
+	<td>Darren Schroeder</td>
+	<td>Pedro Guerreiro</td>
+	<td>Steven te Brinke</td>
+      </tr><tr>
+	<td>Dan Petitt</td>
+	<td>Biswapesh Chattopadhyay</td>
+	<td>Kein-Hong Man</td>
+	<td>Patrizio Bekerle</td>
+      </tr><tr>
+	<td>Nigel Hathaway</td>
+	<td>Hrishikesh Desai</td>
+	<td>Sergey Puljajev</td>
+	<td>Mathias Rauen</td>
+      </tr><tr>
+	<td><a href="http://www.spaceblue.com">Angelo Mandato</a></td>
+	<td>Denis Sureau</td>
+	<td>Kaspar Schiess</td>
+	<td>Christoph Hösler</td>
+      </tr><tr>
+	<td>João Paulo F Farias</td>
+	<td>Ron Schofield</td>
+	<td>Stefan Wosnik</td>
+	<td>Marius Gheorghe</td>
+      </tr><tr>
+	<td>Naba Kumar</td>
+	<td>Sean O'Dell</td>
+	<td>Stefanos Togoulidis</td>
+	<td>Hans Hagen</td>
+      </tr><tr>
+	<td>Jim Cape</td>
+	<td>Roland Walter</td>
+	<td>Brian Mosher</td>
+	<td>Nicholas Nemtsev</td>
+      </tr><tr>
+	<td>Roy Wood</td>
+	<td>Peter-Henry Mander</td>
+	<td>Robert Boucher</td>
+	<td>Christoph Dalitz</td>
+      </tr><tr>
+	<td>April White</td>
+	<td>S. Umar</td>
+	<td>Trent Mick</td>
+	<td>Filip Yaghob</td>
+      </tr><tr>
+	<td>Avi Yegudin</td>
+	<td>Vivi Orunitia</td>
+	<td>Manfred Becker</td>
+	<td>Dimitris Keletsekis</td>
+      </tr><tr>
+	<td>Yuiga</td>
+	<td>Davide Scola</td>
+	<td>Jason Boggs</td>
+	<td>Reinhold Niesner</td>
+      </tr><tr>
+	<td>Jos van der Zande</td>
+	<td>Pescuma</td>
+	<td>Pavol Bosik</td>
+	<td>Johannes Schmid</td>
+      </tr><tr>
+	<td>Blair McGlashan</td>
+	<td>Mikael Hultgren</td>
+	<td>Florian Balmer</td>
+	<td>Hadar Raz</td>
+      </tr><tr>
+	<td>Herr Pfarrer</td>
+	<td>Ben Key</td>
+	<td>Gene Barry</td>
+	<td>Niki Spahiev</td>
+      </tr><tr>
+	<td>Carsten Sperber</td>
+	<td>Phil Reid</td>
+	<td>Iago Rubio</td>
+	<td>Régis Vaquette</td>
+      </tr><tr>
+	<td>Massimo Corà</td>
+	<td>Elias Pschernig</td>
+	<td>Chris Jones</td>
+	<td>Josiah Reynolds</td>
+      </tr><tr>
+	<td>Robert Roessler <a href="http://www.rftp.com">rftp.com</a></td>
+	<td>Steve Donovan</td>
+	<td>Jan Martin Pettersen</td>
+	<td>Sergey Philippov</td>
+      </tr><tr>
+	<td>Borujoa</td>
+	<td>Michael Owens</td>
+	<td>Franck Marcia</td>
+	<td>Massimo Maria Ghisalberti</td>
+      </tr><tr>
+	<td>Frank Wunderlich</td>
+	<td>Josepmaria Roca</td>
+	<td>Tobias Engvall</td>
+	<td>Suzumizaki Kimitaka</td>
+      </tr><tr>
+	<td>Michael Cartmell</td>
+	<td>Pascal Hurni</td>
+	<td>Andre</td>
+	<td>Randy Butler</td>
+      </tr><tr>
+	<td>Georg Ritter</td>
+	<td>Michael Goffioul</td>
+	<td>Ben Harper</td>
+	<td>Adam Strzelecki</td>
+      </tr><tr>
+	<td>Kamen Stanev</td>
+	<td>Steve Menard</td>
+	<td>Oliver Yeoh</td>
+	<td>Eric Promislow</td>
+      </tr><tr>
+	<td>Joseph Galbraith</td>
+	<td>Jeffrey Ren</td>
+	<td>Armel Asselin</td>
+	<td>Jim Pattee</td>
+      </tr><tr>
+	<td>Friedrich Vedder</td>
+	<td>Sebastian Pipping</td>
+	<td>Andre Arpin</td>
+	<td>Stanislav Maslovski</td>
+      </tr><tr>
+	<td>Martin Stone</td>
+	<td>Fabien Proriol</td>
+	<td>mimir</td>
+	<td>Nicola Civran</td>
+      </tr><tr>
+	<td>Snow</td>
+	<td>Mitchell Foral</td>
+	<td>Pieter Holtzhausen</td>
+	<td>Waldemar Augustyn</td>
+      </tr><tr>
+	<td>Jason Haslam</td>
+	<td>Sebastian Steinlechner</td>
+	<td>Chris Rickard</td>
+	<td>Rob McMullen</td>
+      </tr><tr>
+	<td>Stefan Schwendeler</td>
+	<td>Cristian Adam</td>
+	<td>Nicolas Chachereau</td>
+	<td>Istvan Szollosi</td>
+      </tr><tr>
+	<td>Xie Renhui</td>
+	<td>Enrico Tröger</td>
+	<td>Todd Whiteman</td>
+	<td>Yuval Papish</td>
+      </tr><tr>
+	<td>instanton</td>
+	<td>Sergio Lucato</td>
+	<td>VladVRO</td>
+	<td>Dmitry Maslov</td>
+      </tr><tr>
+	<td>chupakabra</td>
+	<td>Juan Carlos Arevalo Baeza</td>
+	<td>Nick Treleaven</td>
+	<td>Stephen Stagg</td>
+      </tr><tr>
+	<td>Jean-Paul Iribarren</td>
+	<td>Tim Gerundt</td>
+	<td>Sam Harwell</td>
+	<td>Boris</td>
+      </tr><tr>
+	<td>Jason Oster</td>
+	<td>Gertjan Kloosterman</td>
+	<td>alexbodn</td>
+	<td>Sergiu Dotenco</td>
+      </tr><tr>
+	<td>Anders Karlsson</td>
+	<td>ozlooper</td>
+	<td>Marko Njezic</td>
+	<td>Eugen Bitter</td>
+      </tr><tr>
+	<td>Christoph Baumann</td>
+	<td>Christopher Bean</td>
+	<td>Sergey Kishchenko</td>
+	<td>Kai Liu</td>
+      </tr><tr>
+	<td>Andreas Rumpf</td>
+	<td>James Moffatt</td>
+	<td>Yuzhou Xin</td>
+	<td>Nic Jansma</td>
+      </tr><tr>
+	<td>Evan Jones</td>
+	<td>Mike Lischke</td>
+	<td>Eric Kidd</td>
+	<td>maXmo</td>
+      </tr><tr>
+	<td>David Severwright</td>
+	<td>Jon Strait</td>
+	<td>Oliver Kiddle</td>
+	<td>Etienne Girondel</td>
+      </tr><tr>
+	<td>Haimag Ren</td>
+	<td>Andrey Moskalyov</td>
+	<td>Xavi</td>
+	<td>Toby Inkster</td>
+      </tr><tr>
+	<td>Eric Forgeot</td>
+	<td>Colomban Wendling</td>
+	<td>Neo</td>
+	<td>Jordan Russell</td>
+      </tr><tr>
+	<td>Farshid Lashkari</td>
+	<td>Sam Rawlins</td>
+	<td>Michael Mullin</td>
+	<td>Carlos SS</td>
+      </tr><tr>
+	<td>vim</td>
+	<td>Martial Demolins</td>
+	<td>Tino Weinkauf</td>
+	<td>Jérôme Laforge</td>
+      </tr><tr>
+	<td>Udo Lechner</td>
+	<td>Marco Falda</td>
+	<td>Dariusz Knociński</td>
+	<td>Ben Fisher</td>
+      </tr><tr>
+	<td>Don Gobin</td>
+	<td>John Yeung</td>
+	<td>Adobe</td>
+	<td>Elizabeth A. Irizarry</td>
+      </tr><tr>
+	<td>Mike Schroeder</td>
+	<td>Morten MacFly</td>
+	<td>Jaime Gimeno</td>
+	<td>Thomas Linder Puls</td>
+      </tr><tr>
+	<td>Artyom Zuikov</td>
+	<td>Gerrit</td>
+	<td>Occam's Razor</td>
+	<td>Ben Bluemel</td>
+      </tr><tr>
+	<td>David Wolfendale</td>
+	<td>Chris Angelico</td>
+	<td>Marat Dukhan</td>
+	<td>Stefan Weil</td>
+      </tr><tr>
+	<td>Rex Conn</td>
+	<td>Ross McKay</td>
+	<td>Bruno Barbieri</td>
+	<td>Gordon Smith</td>
+      </tr><tr>
+	<td>dimitar</td>
+	<td>Sébastien Granjoux</td>
+	<td>zeniko</td>
+	<td>James Ribe</td>
+      </tr><tr>
+	<td>Markus Nißl</td>
+	<td>Martin Panter</td>
+	<td>Mark Yen</td>
+	<td>Philippe Elsass</td>
+      </tr><tr>
+	<td>Dimitar Zhekov</td>
+	<td>Fan Yang</td>
+	<td>Denis Shelomovskij</td>
+	<td>darmar</td>
+      </tr><tr>
+	<td>John Vella</td>
+	<td>Chinh Nguyen</td>
+	<td>Sakshi Verma</td>
+	<td>Joel B. Mohler</td>
+      </tr><tr>
+	<td>Isiledhel</td>
+	<td>Vidya Wasi</td>
+	<td>G. Hu</td>
+	<td>Byron Hawkins</td>
+      </tr><tr>
+	<td>Alpha</td>
+	<td>John Donoghue</td>
+	<td>kudah</td>
+	<td>Igor Shaula</td>
+      </tr><tr>
+	<td>Pavel Bulochkin</td>
+	<td>Yosef Or Boczko</td>
+	<td>Brian Griffin</td>
+	<td>Özgür Emir</td>
+      </tr><tr>
+	<td>Neomi</td>
+	<td>OmegaPhil</td>
+	<td>SiegeLord</td>
+	<td>Erik</td>
+      </tr><tr>
+	<td>TJF</td>
+	<td>Mark Robinson</td>
+	<td>Thomas Martitz</td>
+	<td>felix</td>
+      </tr><tr>
+	<td>Christian Walther</td>
+	<td>Ebben</td>
+	<td>Robert Gieseke</td>
+	<td>Mike M</td>
+      </tr><tr>
+	<td>nkmathew</td>
+	<td>Andreas Tscharner</td>
+	<td>Lee Wilmott</td>
+	<td>johnsonj</td>
+      </tr><tr>
+	<td>Vicente</td>
+	<td>Nick Gravgaard</td>
+	<td>Ian Goldby</td>
+	<td>Holger Stenger</td>
+      </tr><tr>
+	<td>danselmi</td>
+	<td>Mat Berchtold</td>
+	<td>Michael Staszewski</td>
+	<td>Baurzhan Muftakhidinov</td>
+      </tr><tr>
+	<td>Erik Angelin</td>
+	<td>Yusuf Ramazan Karagöz</td>
+	<td>Markus Heidelberg</td>
+	<td>Joe Mueller</td>
+      </tr><tr>
+	<td>Mika Attila</td>
+	<td>JoMazM</td>
+	<td>Markus Moser</td>
+	<td>Stefan Küng</td>
+      </tr><tr>
+	<td>Jiří Techet</td>
+	<td>Jonathan Hunt</td>
+	<td>Serg Stetsuk</td>
+	<td>Jordan Jueckstock</td>
+      </tr><tr>
+	<td>Yury Dubinsky</td>
+	<td>Sam Hocevar</td>
+	<td>Luyomi</td>
+	<td>Matt Gilarde</td>
+      </tr><tr>
+	<td>Mark C</td>
+	<td>Johannes Sasongko</td>
+	<td>fstirlitz</td>
+	<td>Robin Haberkorn</td>
+      </tr><tr>
+	<td>Pavel Sountsov</td>
+	<td>Dirk Lorenzen</td>
+	<td>Kasper B. Graversen</td>
+	<td>Chris Mayo</td>
+      </tr><tr>
+	<td>Van de Bugger</td>
+	<td>Tse Kit Yam</td>
+	<td><a href="https://www.smartsharesystems.com/">SmartShare Systems</a></td>
+	<td>Morten Brørup</td>
+      </tr><tr>
+	<td>Alexey Denisov</td>
+	<td>Justin Dailey</td>
+	<td>oirfeodent</td>
+	<td>A-R-C-A</td>
+      </tr><tr>
+	<td>Roberto Rossi</td>
+	<td>Kenny Liu</td>
+	<td>Iain Clarke</td>
+	<td>desto</td>
+      </tr><tr>
+	<td>John Flatness</td>
+	<td>Thorsten Kani</td>
+	<td>Bernhard M. Wiedemann</td>
+	<td>Baldur Karlsson</td>
+      </tr><tr>
+	<td>Martin Kleusberg</td>
+	<td>Jannick</td>
+	<td>Zufu Liu</td>
+	<td>Simon Sobisch</td>
+      </tr><tr>
+	<td>Georger Araújo</td>
+	<td>Tobias Kühne</td>
+	<td>Dimitar Radev</td>
+	<td>Liang Bai</td>
+      </tr><tr>
+	<td>Gunter Königsmann</td>
+	<td>Nicholai Benalal</td>
+	<td>Uniface</td>
+	<td>Raghda Morsy</td>
+      </tr><tr>
+	<td>Giuseppe Corbelli</td>
+	<td>Andreas Rönnquist</td>
+	<td>Henrik Hank</td>
+	<td>Luke Rasmussen</td>
+      </tr><tr>
+	<td>Philipp</td>
+	<td>maboroshin</td>
+	<td>Gokul Krishnan</td>
+	<td>John Horigan</td>
+      </tr><tr>
+	<td>jj5</td>
+	<td>Jad Altahan</td>
+	<td>Andrea Ricchi</td>
+	<td>Juarez Rudsatz</td>
+      </tr><tr>
+	<td>Wil van Antwerpen</td>
+	<td>Hodong Kim</td>
+	<td>Michael Conrad</td>
+	<td>Dejan Budimir</td>
+      </tr><tr>
+	<td>Andreas Falkenhahn</td>
+	<td>Mark Reay</td>
+	<td>David Shuman</td>
+	<td>McLoo</td>
+      </tr><tr>
+	<td>Shmuel Zeigerman</td>
+	<td>Chris Graham</td>
+	<td>Hugues Larrive</td>
+	<td>Prakash Sahni</td>
+      </tr><tr>
+	<td>Michel Sauvard</td>
+	<td>uhf7</td>
+	<td>gnombat</td>
+	<td>Derek Brown</td>
+      </tr><tr>
+	<td>Robert Di Pardo</td>
+	<td>riQQ</td>
+	<td>YX Hao</td>
+	<td>Bertrand Lacoste</td>
+      </tr><tr>
+	<td>Ivan Ustûžanin</td>
+    </tr>
+    </table>
+    <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla511.zip">Release 5.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 July 2021.
+	</li>
+	<li>
+	On 32-bit Win32 using Visual C++ projects, stop exported functions ending with @n causing failures with GetProcAddress.
+	</li>
+	<li>
+	Fixed crash when calling TagsOfStyle on C++ lexer after allocating substyles.
+	</li>
+	<li>
+	Fixed folding for Julia which could be inconsistent depending on range folded.
+	Added SCE_JULIA_KEYWORD4 and SCE_JULIA_TYPEOPERATOR lexical styles and
+	changed keyword set 4 from "Raw string literals" to "Built in functions".
+	Property lexer.julia.string.interpolation removed.
+	Updated set of characters for identifiers.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/13">Pull request #13</a>.
+	</li>
+	<li>
+	Fixed Markdown emphasis spans to only be recognized when closed in same paragraph.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1216/">Bug #1216</a>.
+	</li>
+	<li>
+	Fixed Markdown code block to terminate when end marker is indented.
+	Display all of end marker in code block style.
+	Only recognize inline code when closed in same paragraph.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2247/">Bug #2247</a>.
+	</li>
+	<li>
+	Fixed Matlab to not allow escape sequences in double-quoted strings.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/18">Issue #18</a>.
+	</li>
+	<li>
+	Support flexible heredoc and nowdoc syntax for PHP.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+	</li>
+	<li>
+	Enabled '_' digit separator in numbers for PHP.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+	</li>
+	<li>
+	Stop styling attributes as comments for PHP.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla510.zip">Release 5.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 June 2021.
+	</li>
+	<li>
+	This is a stable release. The Lexilla protocol should remain compatible through 5.x releases.
+	</li>
+	<li>
+	Fixed bugs with styling Erlang by handling \n and \r\n line endings consistently.
+	</li>
+	<li>
+	Fixed folding for F# open statements and for strings that contain comment prefixes.
+	</li>
+	<li>
+	Format specifiers lexed in F# strings.
+	</li>
+	<li>
+	Fixed folding for ASP files where scripts were treated inconsistently when '&lt;%' was included
+	or not included in range examined.
+	</li>
+	<li>
+	Fixed folding of Raku heredocs that start with "q:to" or "qq:to".
+	</li>
+	<li>
+	Fixed folding at end of Ruby files where these is no final new line.
+	</li>
+	<li>
+	Made folding of Tcl files more consistent by always treating completely empty lines as whitespace.
+	</li>
+	<li>
+	Fixed styling of "a:b" with no spaces in YAML as a single piece of text instead of a key-value pair.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/15">Pull request #15</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla503.zip">Release 5.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2021.
+	</li>
+	<li>
+	Add namespace feature with GetNameSpace function.
+	</li>
+	<li>
+	Add Julia lexer.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1380/">Feature #1380</a>.
+	</li>
+	<li>
+	Fix transition to comment for --> inside JavaScript string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2207/">Bug #2207</a>.
+	</li>
+	<li>
+	Fix variable expansion in Batch.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/4">Issue #4</a>.
+	</li>
+	<li>
+	Fix empty link titles in Markdown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2235/">Bug #2235</a>.
+	Also fix detection of whether the previous line had content which treated '\n' and '\r\n' line endings differently.
+	</li>
+	<li>
+	Remove nested comment and long string support as these were removed from Lua.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2205/">Bug #2205</a>.
+	</li>
+	<li>
+	Update to Unicode 13.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1379/">Feature #1379</a>.
+	</li>
+	<li>
+	AddStaticLexerModule function adds a static lexer to Lexilla's list.
+	</li>
+	<li>
+	On Win32 enable hardware-enforced stack protection.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1405/">Feature #1405</a>.
+	</li>
+	<li>
+	On 32-bit Win32 using g++, stop exported functions ending with @n causing failures with GetProcAddress.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/10">Issue #10</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla502.zip">Release 5.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 April 2021.
+	</li>
+	<li>
+	Fix assertion in cpp lexer handling of preprocessor.
+	Empty preprocessor statement '#' caused preprocessor history to be stored on incorrect line number.
+	Dangling #else or #elif without corresponding #if led to inconsistent state.
+	Change treatment of empty preprocessor statement to set subsequent line end characters in
+	preprocessor style as this is more consistent with other preprocessor directives and avoids
+	differences between \n and \r\n line ends.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2245/">Bug #2245</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla501.zip">Release 5.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 April 2021.
+	</li>
+	<li>
+	Add LexerNameFromID function to Lexilla protocol as optional and temporary to
+	help applications migrate to Lexilla.
+	It is marked deprecated and will be removed in a future release.
+	</li>
+	<li>
+	The cpp lexer supports XML styled comment doc keywords.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/2">Pull request #2</a>.
+	</li>
+	<li>
+	The errorlist lexer detects NMAKE fatal errors and Microsoft linker errors as SCE_ERR_MS.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla500.zip">Release 5.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 March 2021.
+	</li>
+	<li>
+	First version that separates Lexilla from Scintilla.
+	Each of the 3 projects now has a separate history page but history before 5.0.0 remains combined.
+	</li>
+	<li>
+	Lexer added for F#.
+	</li>
+    </ul>
+    <h3>
+       Lexilla became a separate project at this point.
+    </h3>
+    <h3>
+       <a href="https://www.scintilla.org/scite446.zip">Release 4.4.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 December 2020.
+	</li>
+	<li>
+	Fix building with Xcode 12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2187/">Bug #2187</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite445.zip">Release 4.4.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 September 2020.
+	</li>
+	<li>
+	Lexilla interface supports setting initialisation properties on lexer libraries with
+	SetLibraryProperty and GetLibraryPropertyNames functions.
+	These are called by SciTE which will forward properties to lexer libraries that are prefixed with
+	"lexilla.context.".
+	</li>
+	<li>
+	Allow cross-building for GTK by choosing pkg-config.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
+	</li>
+	<li>
+	On GTK, allow setting CPPFLAGS (and LDFLAGS for SciTE) to support hardening.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2191/">Bug #2191</a>.
+	</li>
+	<li>
+	Changed SciTE's indent.auto mode to set tab size to indent size when file uses tabs for indentation.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2198/">Bug #2198</a>.
+	</li>
+	<li>
+	Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based on
+	width of text.
+	</li>
+	<li>
+	Fixed bug on Win32 where cursor was flickering between hand and text over an
+	indicator with hover style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2170/">Bug #2170</a>.
+	</li>
+	<li>
+	Fixed bug where hovered indicator was not returning to non-hover
+	appearance when mouse moved out of window or into margin.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2193/">Bug #2193</a>.
+	</li>
+	<li>
+	Fixed bug where a hovered INDIC_TEXTFORE indicator was not applying the hover
+	colour to the whole range.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2199/">Bug #2199</a>.
+	</li>
+	<li>
+	Fixed bug where gradient indicators were not showing hovered appearance.
+	</li>
+	<li>
+	Fixed bug where layout caching was ineffective.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2197/">Bug #2197</a>.
+	</li>
+	<li>
+	For SciTE, don't show the output pane for quiet jobs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Support command.quiet for SciTE on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Fixed a bug in SciTE with stack balance when a syntax error in the Lua startup script
+	caused continuing failures to find functions after the syntax error was corrected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	Added method for iterating through multiple vertical edges: SCI_GETMULTIEDGECOLUMN.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1350/">Feature #1350</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite444.zip">Release 4.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 July 2020.
+	</li>
+	<li>
+	End of line annotations implemented.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2141/">Bug #2141</a>.
+	</li>
+	<li>
+	Add SCI_BRACEMATCHNEXT API.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1368/">Feature #1368</a>.
+	</li>
+	<li>
+	The latex lexer supports lstlisting environment that is similar to verbatim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1358/">Feature #1358</a>.
+	</li>
+	<li>
+	For SciTE on Linux, place liblexilla.so and libscintilla.so in /usr/lib/scite.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2184/">Bug #2184</a>.
+	</li>
+	<li>
+	Round SCI_TEXTWIDTH instead of truncating as this may be more accurate when sizing application
+	elements to match text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1355/">Feature #1355</a>.
+	</li>
+	<li>
+	Display DEL control character as visible "DEL" block like other control characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1369/">Feature #1369</a>.
+	</li>
+	<li>
+	Allow caret width to be up to 20 pixels.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1361/">Feature #1361</a>.
+	</li>
+	<li>
+	SciTE on Windows adds create.hidden.console option to stop console window flashing
+	when Lua script calls os.execute or io.popen.
+	</li>
+	<li>
+	Fix translucent rectangle drawing on Qt. When drawing a translucent selection, there were edge
+	artifacts as the calls used were drawing outlines over fill areas. Make bottom and right borders on
+	INDIC_ROUNDBOX be same intensity as top and left.
+	Replaced some deprecated Qt calls with currently supported calls.
+	</li>
+	<li>
+	Fix printing on Windows to use correct text size.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2185/">Bug #2185</a>.
+	</li>
+	<li>
+	Fix bug on Win32 where calling WM_GETTEXT for more text than in document could return
+	less text than in document.
+	</li>
+	<li>
+	Fixed a bug in SciTE with Lua stack balance causing failure to find
+	functions after reloading script.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite443.zip">Release 4.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 June 2020.
+	</li>
+	<li>
+	Fix syntax highlighting for SciTE on Windows by setting executable directory for loading Lexilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2181/">Bug #2181</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite442.zip">Release 4.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2020.
+	</li>
+	<li>
+	On Cocoa using Xcode changed Lexilla.dylib install path to @rpath as would otherwise try /usr/lib which
+	won't work for sandboxed applications.
+	</li>
+	<li>
+	On Cocoa using Xcode made work on old versions of macOS by specifying deployment target as 10.8
+	instead of 10.15.
+	</li>
+	<li>
+	On Win32 fix static linking of Lexilla by specifying calling convention in Lexilla.h.
+	</li>
+	<li>
+	SciTE now uses default shared library extension even when directory contains '.'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite440.zip">Release 4.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2020.
+	</li>
+	<li>
+	Added Xcode project files for Lexilla and Scintilla with no lexers (cocoa/Scintilla).
+	</li>
+	<li>
+	For GTK, build a shared library with no lexers libscintilla.so or libscintilla.dll.
+	</li>
+	<li>
+	Lexilla used as a shared library for most builds of SciTE except for the single file executable on Win32.
+	On GTK, Scintilla shared library used.
+	LexillaLibrary code can be copied out of SciTE for other applications that want to interface to Lexilla.
+	</li>
+	<li>
+	Constants in Scintilla.h can be disabled with SCI_DISABLE_AUTOGENERATED.
+	</li>
+	<li>
+	Implement per-monitor DPI Awareness on Win32 so both Scintilla and SciTE
+	will adapt to the display scale when moved between monitors.
+	Applications should forward WM_DPICHANGED to Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2171/">Bug #2171</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2063/">Bug #2063</a>.
+	</li>
+	<li>
+	Optimized performance when opening huge files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1347/">Feature #1347</a>.
+	</li>
+	<li>
+	Add Appearance and Contrast properties to SciTE that allow customising visuals for dark mode and
+	high contrast modes.
+	</li>
+	<li>
+	Fixed bug in Batch lexer where a single character line with a single character line end continued
+	state onto the next line.
+	</li>
+	<li>
+	Added SCE_ERR_GCC_EXCERPT style for GCC 9 diagnostics in errorlist lexer.
+	</li>
+	<li>
+	Fixed buffer over-read bug with absolute references in MMIXAL lexer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2019/">Bug #2019</a>.
+	</li>
+	<li>
+	Fixed bug with GTK on recent Linux distributions where underscores were invisible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
+	</li>
+	<li>
+	Fixed GTK on Linux bug when pasting from closed application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2175/">Bug #2175</a>.
+	</li>
+	<li>
+	Fixed bug in SciTE with Lua stack balance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	For macOS, SciTE reverts to running python (2) due to python3 not being available in the sandbox.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite433.zip">Release 4.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 April 2020.
+	</li>
+	<li>
+	Added Visual Studio project files for Lexilla and Scintilla with no lexers.
+	</li>
+	<li>
+	Add methods for iterating through the marker handles and marker numbers on a line:
+	SCI_MARKERHANDLEFROMLINE and SCI_MARKERNUMBERFROMLINE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1344/">Feature #1344</a>.
+	</li>
+	<li>
+	Assembler lexers asm and as can change comment character with lexer.as.comment.character property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1314/">Feature #1314</a>.
+	</li>
+	<li>
+	Fix brace styling in Batch lexer so that brace matching works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1624/">Bug #1624</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1906/">Bug #1906</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1997/">Bug #1997</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2065/">Bug #2065</a>.
+	</li>
+	<li>
+	Change Perl lexer to style all line ends of comment lines in comment line style.
+	Previously, the last character was in default style which made the characters in
+	\r\n line ends have mismatching styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2164/">Bug #2164</a>.
+	</li>
+	<li>
+	When a lexer has been set with SCI_SETILEXER, fix SCI_GETLEXER and avoid
+	sending SCN_STYLENEEDED notifications.
+	</li>
+	<li>
+	On Win32 fix handling Japanese IME input when both GCS_COMPSTR and
+	GCS_RESULTSTR set.
+	</li>
+	<li>
+	With Qt on Win32 add support for line copy format on clipboard, compatible with Visual Studio.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2167/">Bug #2167</a>.
+	</li>
+	<li>
+	On Qt with default encoding (ISO 8859-1) fix bug where 'µ' (Micro Sign) case-insensitively matches '?'
+	<a href="https://sourceforge.net/p/scintilla/bugs/2168/">Bug #2168</a>.
+	</li>
+	<li>
+	On GTK with Wayland fix display of windowed IME.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2149/">Bug #2149</a>.
+	</li>
+	<li>
+	For Python programs, SciTE defaults to running python3 on Unix and pyw on Windows which will run
+	the most recently installed Python in many cases.
+	Set the "python.command" property to override this.
+	Scripts distributed with Scintilla and SciTE are checked with Python 3 and may not work with Python 2.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite432.zip">Release 4.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 March 2020.
+	</li>
+	<li>
+	On Win32 fix new bug that treated all dropped text as rectangular.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite431.zip">Release 4.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 March 2020.
+	</li>
+	<li>
+	Add default argument for StyleContext::GetRelative.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1336/">Feature #1336</a>.
+	</li>
+	<li>
+	Fix drag and drop between different encodings on Win32 by always providing CF_UNICODETEXT only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2151/">Bug #2151</a>.
+	</li>
+	<li>
+	Automatically scroll while dragging text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/497/">Feature #497</a>.
+	</li>
+	<li>
+	On Win32, the numeric keypad with Alt pressed can be used to enter characters by number.
+	This can produce unexpected results in non-numlock mode when function keys are assigned.
+	Potentially problematic keys like Alt+KeypadUp are now ignored.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2152/">Bug #2152</a>.
+	</li>
+	<li>
+	Crash fixed with Direct2D on Win32 when updating driver.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2138/">Bug #2138</a>.
+	</li>
+	<li>
+	For SciTE on Win32, fix crashes when Lua script closes application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2155/">Bug #2155</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite430.zip">Release 4.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 January 2020.
+	</li>
+	<li>
+	Lexers made available as Lexilla library.
+	TestLexers program with tests for Lexilla and lexers added in lexilla/test.
+	</li>
+	<li>
+	SCI_SETILEXER implemented to use lexers from Lexilla or other sources.
+	</li>
+	<li>
+	ILexer5 interface defined provisionally to support use of Lexilla.
+	The details of this interface may change before being stabilised in Scintilla 5.0.
+	</li>
+	<li>
+	SCI_LOADLEXERLIBRARY implemented on Cocoa.
+	</li>
+	<li>
+	Build Scintilla with SCI_EMPTYCATALOGUE to avoid making lexers available.
+	</li>
+	<li>
+	Lexer and folder added for Raku language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1328/">Feature #1328</a>.
+	</li>
+	<li>
+	Don't clear clipboard before copying text with Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2147/">Bug #2147</a>.
+	</li>
+	<li>
+	On Win32, remove support for CF_TEXT clipboard format as Windows will convert to
+	CF_UNICODETEXT.
+	</li>
+	<li>
+	Improve IME behaviour on GTK.
+	Set candidate position for windowed IME.
+	Improve location of candidate window.
+	Prevent movement of candidate window while typing.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2135/">Bug #2135</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite423.zip">Release 4.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 December 2019.
+	</li>
+	<li>
+	Fix failure in SciTE's Complete Symbol command.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite422.zip">Release 4.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2019.
+	</li>
+	<li>
+	Move rather than grow selection when insertion at start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2140/">Bug #2140</a>.
+	</li>
+	<li>
+	Allow target to have virtual space.
+	Add methods for finding the virtual space at start and end of multiple selections.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1316/">Feature #1316</a>.
+	</li>
+	<li>
+	SciTE on Win32 adds mouse button "Forward" and "Backward" key definitions for use in
+	properties like user.shortcuts.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1317/">Feature #1317</a>.
+	</li>
+	<li>
+	Lexer and folder added for Hollywood language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1324/">Feature #1324</a>.
+	</li>
+	<li>
+	HTML lexer treats custom tags from HTML5 as known tags. These contain "-" like "custom-tag".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1299/">Feature #1299</a>.
+	</li>
+	<li>
+	HTML lexer fixes bug with some non-alphabetic characters in unknown tags.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1320/">Feature #1320</a>.
+	</li>
+	<li>
+	Fix bug in properties file lexer where long lines were only styled for the first 1024 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1933/">Bug #1933</a>.
+	</li>
+	<li>
+	Ruby lexer recognizes squiggly heredocs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1326/">Feature #1326</a>.
+	</li>
+	<li>
+	Avoid unnecessary IME caret movement on Win32.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1304/">Feature #1304</a>.
+	</li>
+	<li>
+	Clear IME state when switching language on Win32.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>.
+	</li>
+	<li>
+	Fixed drawing of translucent rounded rectangles on Win32 with Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2144/">Bug #2144</a>.
+	</li>
+	<li>
+	Setting rectangular selection made faster.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>.
+	</li>
+	<li>
+	SciTE reassigns *.s extension to the GNU Assembler language from the S+ statistical language.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite421.zip">Release 4.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 October 2019.
+	</li>
+	<li>
+	Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs.
+	This allows minimaps or overviews to be layed out to match the full size editing view.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2118/">Bug #2118</a>.
+	</li>
+	<li>
+	SciTE enables use of SCI_ commands in user.context.menu.
+	</li>
+ 	<li>
+	XML folder adds fold.xml.at.tag.open option to fold tags at the start of the tag "&lt;" instead of the end "&gt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2128/">Bug #2128</a>.
+	</li>
+ 	<li>
+	Metapost lexer fixes crash with 'interface=none' comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2129/">Bug #2129</a>.
+	</li>
+ 	<li>
+	Perl lexer supports indented here-docs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2121/">Bug #2121</a>.
+	</li>
+ 	<li>
+	Perl folder folds qw arrays.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1306/">Feature #1306</a>.
+	</li>
+ 	<li>
+	TCL folder can turn off whitespace flag by setting fold.compact property to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2131/">Bug #2131</a>.
+	</li>
+ 	<li>
+	Optimize setting up keyword lists in lexers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1305/">Feature #1305</a>.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 12.1.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1315/">Feature #1315</a>.
+	</li>
+ 	<li>
+	On Win32, stop the IME candidate window moving unnecessarily and position it better.<br />
+	Stop candidate window overlapping composition text and taskbar.<br />
+	Position candidate window closer to composition text.<br />
+	Stop candidate window moving while typing.<br />
+	Align candidate window to target part of composition text.<br />
+	Stop Google IME on Windows 7 moving while typing.<br />
+	<a href="https://sourceforge.net/p/scintilla/bugs/2120/">Bug #2120</a>.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1300/">Feature #1300</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite420.zip">Release 4.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 July 2019.
+	</li>
+ 	<li>
+	Scintilla.iface adds line and pointer types, increases use of the position type, uses enumeration
+	types in methods and properties, and adds enumeration aliases to produce better CamelCase
+	identifiers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1297/">Feature #1297</a>.
+	</li>
+ 	<li>
+	Source of input (direct / IME composition / IME result) reported in SCN_CHARADDED so applications
+	can treat temporary IME composition input differently.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2038/">Bug #2038</a>.
+	</li>
+ 	<li>
+	Lexer added for DataFlex.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1295/">Feature #1295</a>.
+	</li>
+ 	<li>
+	Matlab lexer now treats keywords as case-sensitive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2112/">Bug #2112</a>.
+	</li>
+ 	<li>
+	SQL lexer fixes single quoted strings where '" (quote, double quote) was seen as continuing the string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2098/">Bug #2098</a>.
+	</li>
+ 	<li>
+	Platform layers should use InsertCharacter method to perform keyboard and IME input, replacing
+	AddCharUTF method.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1293/">Feature #1293</a>.
+	</li>
+ 	<li>
+	Add CARETSTYLE_BLOCK_AFTER option to always display block caret after selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1924/">Bug #1924</a>.
+	</li>
+ 	<li>
+	On Win32, limit text returned from WM_GETTEXT to the length specified in wParam.
+	This could cause failures when using assistive technologies like NVDA.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2110/">Bug #2110</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2114/">Bug #2114</a>.
+	</li>
+ 	<li>
+	Fix deletion of isolated invalid bytes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2116/">Bug #2116</a>.
+	</li>
+ 	<li>
+	Fix position of line caret when overstrike caret set to block.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2106/">Bug #2106</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite417.zip">Release 4.1.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 June 2019.
+	</li>
+	<li>
+	Fixes an incorrect default setting in SciTE which caused multiple visual features to fail to display.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite416.zip">Release 4.1.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 June 2019.
+	</li>
+	<li>
+	For Visual C++ 2019, /std:c++latest now includes some C++20 features so switch to /std:c++17.
+	</li>
+	<li>
+	SciTE supports editing files larger than 2 gigabytes when built as a 64-bit application.
+	</li>
+ 	<li>
+	Lexer added for X12.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1280/">Feature #1280</a>.
+	</li>
+ 	<li>
+	CMake folder folds function - endfunction.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1289/">Feature #1289</a>.
+	</li>
+ 	<li>
+	VB lexer adds support for VB2017 binary literal &amp;B and digit separators 123_456.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1288/">Feature #1288</a>.
+	</li>
+	<li>
+	Improved performance of line folding code on large files when no folds are contracted.
+	This improves the time taken to open or close large files.
+	</li>
+	<li>
+	Fix bug where changing identifier sets in lexers preserved previous identifiers.
+	</li>
+	<li>
+	Fixed bug where changing to Unicode would rediscover line end positions even if still
+	sticking to ASCII (not Unicode NEL, LS, PS) line ends.
+	Only noticeable on huge files with over 100,000 lines.
+	</li>
+ 	<li>
+	Changed behaviour of SCI_STYLESETCASE(*,SC_CASE_CAMEL) so that it only treats 'a-zA-Z'
+	as word characters because this covers the feature's intended use (viewing case-insensitive ASCII-only
+	keywords in a specified casing style) and simplifies the behaviour and code.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1238/">Feature #1238</a>.
+	</li>
+ 	<li>
+	In SciTE added Camel case option "case:c" for styles to show keywords with initial capital.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite415.zip">Release 4.1.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2019.
+	</li>
+ 	<li>
+	On Win32, removed special handling of non-0 wParam to WM_PAINT.
+	</li>
+ 	<li>
+	Implement high-priority idle on Win32 to make redraw smoother and more efficient.
+	</li>
+	<li>
+	Add vertical bookmark symbol SC_MARK_VERTICALBOOKMARK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1276/">Feature #1276</a>.
+	</li>
+ 	<li>
+	Set default fold display text SCI_SETDEFAULTFOLDDISPLAYTEXT(text).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1272/">Feature #1272</a>.
+	</li>
+ 	<li>
+	Add SCI_SETCHARACTERCATEGORYOPTIMIZATION API to optimize speed
+	of character category features like determining whether a character is a space or number
+	at the expense of memory.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1259/">Feature #1259</a>.
+	</li>
+ 	<li>
+	Improve the styling of numbers in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1268/">Feature #1268</a>.
+	</li>
+ 	<li>
+	Fix exception when inserting DBCS text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2093/">Bug #2093</a>.
+	</li>
+	<li>
+	Improve performance of accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2094/">Bug #2094</a>.
+	</li>
+ 	<li>
+	Fix text reported for deletion with accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2095/">Bug #2095</a>.
+	</li>
+ 	<li>
+	Fix flicker when inserting primary selection on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2087/">Bug #2087</a>.
+	</li>
+ 	<li>
+	Support coloured text in Windows 8.1+.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1277/">Feature #1277</a>.
+	</li>
+ 	<li>
+	Avoid potential long hangs with idle styling for huge documents on Cocoa and GTK.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite414.zip">Release 4.1.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 March 2019.
+	</li>
+	<li>
+	Calltips implemented on Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1548/">Bug #1548</a>.
+	</li>
+ 	<li>
+	Block caret in overtype mode SCI_SETCARETSTYLE(caretStyle | CARETSTYLE_OVERSTRIKE_BLOCK).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1217/">Feature #1217</a>.
+	</li>
+ 	<li>
+	SciTE supports changing caret style via caret.style property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1264/">Feature #1624</a>.
+	</li>
+ 	<li>
+	Lexer added for .NET's Common Intermediate Language CIL.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1265/">Feature #1265</a>.
+	</li>
+ 	<li>
+	The C++ lexer, with styling.within.preprocessor on, now interprets "(" in preprocessor "#if("
+	as an operator instead of part of the directive. This improves folding as well which could become
+	unbalanced.
+	</li>
+ 	<li>
+	Fix raw strings in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1253/">Feature #1253</a>.
+	</li>
+ 	<li>
+	Fix inconsistency with dot styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1260/">Feature #1260</a>.
+	</li>
+ 	<li>
+	Enhance the styling of backticks in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1261/">Feature #1261</a>.
+	</li>
+ 	<li>
+	Enhance raw string identifier styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1262/">Feature #1262</a>.
+	</li>
+ 	<li>
+	Fix fold behaviour with comments in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1254/">Feature #1254</a>.
+	</li>
+ 	<li>
+	Fix TCL lexer recognizing '"' after "," inside a bracketed substitution.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1947/">Bug #1947</a>.
+	</li>
+ 	<li>
+	Fix garbage text from SCI_MOVESELECTEDLINESUP and SCI_MOVESELECTEDLINESDOWN
+	for rectangular or thin selection by performing no action.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2078/">Bug #2078</a>.
+	</li>
+ 	<li>
+	Ensure container notified if Insert pressed when caret off-screen.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2083/">Bug #2083</a>.
+	</li>
+ 	<li>
+	Fix memory leak when checking running instance on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1267/">Feature #1267</a>.
+	</li>
+	<li>
+	Platform layer font cache removed on Win32 as there is a platform-independent cache.
+	</li>
+	<li>
+	SciTE for GTK easier to build on macOS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2084/">Bug #2084</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite413.zip">Release 4.1.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 January 2019.
+	</li>
+	<li>
+	Add SCI_SETCOMMANDEVENTS API to allow turning off command events as they
+	can be a significant performance cost.
+	</li>
+	<li>
+	Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
+	still remaining responsive.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 11.
+	</li>
+	<li>
+	Errorlist lexer recognizes negative line numbers as some programs show whole-file
+	errors occurring on line -1.
+	SciTE's parsing of diagnostics also updated to handle this case.
+	</li>
+ 	<li>
+	Added "nim" lexer (SCLEX_NIM) for the Nim language which was previously called Nimrod.
+	For compatibility, the old "nimrod" lexer is still present but is deprecated and will be removed at the
+	next major version.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1242/">Feature #1242</a>.
+	</li>
+ 	<li>
+	The Bash lexer implements substyles for multiple sets of keywords and supports SCI_PROPERTYNAMES.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2054/">Bug #2054</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets continued preprocessor lines correctly by reading all of
+	the logical line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2062/">Bug #2062</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets preprocessor arithmetic expressions containing multiplicative and additive
+	operators correctly by following operator precedence rules.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2069/">Bug #2069</a>.
+	</li>
+ 	<li>
+	The EDIFACT lexer handles message groups as well as messages.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1247/">Feature #1247</a>.
+	</li>
+ 	<li>
+	For SciTE's Find in Files, allow case-sensitivity and whole-word options when running
+	a user defined command.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2053/">Bug #2053</a>.
+	</li>
+	<li>
+	Notify with SC_UPDATE_SELECTION when user performs a multiple selection add.
+	</li>
+	<li>
+	On macOS 10.14 Cocoa, fix incorrect horizontal offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2022/">Bug #2022</a>.
+	</li>
+	<li>
+	On Cocoa, fix a crash that occurred when entering a dead key diacritic then a character
+	that can not take that diacritic, such as option+e (acute accent) followed by g.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2061/">Bug #2061</a>.
+	</li>
+	<li>
+	On Cocoa, use dark info bar background when system is set to Dark Appearance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2055/">Bug #2055</a>.
+	</li>
+	<li>
+	Fixed a crash on Cocoa in bidirectional mode where some patterns of invalid UTF-8
+	caused failures to create Unicode strings.
+	</li>
+	<li>
+	SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
+	</li>
+	<li>
+	Improve performance of text insertion when Unicode line indexing off.
+	</li>
+	<li>
+	For Qt on Windows, stop specifying -std:c++latest as that is no longer needed
+	to enable C++17 with MSVC 2017 and Qt 5.12 and it caused duplicate flag warnings.
+	</li>
+	<li>
+	On Linux, enable Lua to access dynamic libraries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2058/">Bug #2058</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite412.zip">Release 4.1.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 October 2018.
+	</li>
+	<li>
+	C++ lexer fixes evaluation of "#elif".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
+	</li>
+	<li>
+	Markdown lexer fixes highlighting of non-ASCII characters in links.
+	</li>
+	<li>
+	SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips
+	and disables F5 while command running.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite411.zip">Release 4.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 September 2018.
+	</li>
+	<li>
+	Optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units added.
+	This can improve performance for clients that provide UTF-32 or UTF-16 interfaces or that need to interoperate
+	with UTF-32 or UTF-16 components.
+	</li>
+	<li>
+	Lexers added for SAS and Stata.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
+	</li>
+	<li>
+	Shell folder folds "if", "do", and "case".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1144/">Feature #1144.</a>
+	</li>
+	<li>
+	SciTE's menukey feature implemented on Windows.
+	</li>
+	<li>
+	For SciTE on Windows, user defined strip lists are now scrollable.
+	Cursor no longer flickers in edit and combo boxes.
+	Focus in and out events occur for combo boxes.
+	</li>
+	<li>
+	Fix a leak in the bidirectional code on Win32.
+	</li>
+	<li>
+	Fix crash on Win32 when switching technology to default after setting bidirectional mode.
+	</li>
+	<li>
+	Fix margin cursor on Cocoa to point more accurately.
+	</li>
+	<li>
+	Fix SciTE crash on GTK+ when using director interface.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite410.zip">Release 4.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 June 2018.
+	</li>
+	<li>
+	Experimental and incomplete support added for bidirectional text on Windows using DirectWrite and Cocoa for
+	UTF-8 documents by calling SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R).
+	This allows documents that contain Arabic or Hebrew to be edited more easily in a way that is similar
+	to other editors.
+	</li>
+	<li>
+	INDIC_GRADIENT and INDIC_GRADIENTCENTRE indicator types added.
+	INDIC_GRADIENT starts with a specified colour and alpha at top of line and fades
+	to fully transparent at bottom.
+	INDIC_GRADIENTCENTRE starts with a specified colour and alpha at centre of line and fades
+	to fully transparent at top and bottom.
+	</li>
+	<li>
+	Wrap indent mode SC_WRAPINDENT_DEEPINDENT added which indents two tabs from previous line.
+	</li>
+	<li>
+	Indicators are drawn for line end characters when displayed.
+	</li>
+	<li>
+	Most invalid bytes in DBCS encodings are displayed as blobs to make problems clear
+	and ensure something is shown.
+	</li>
+	<li>
+	On Cocoa, invalid text in DBCS encodings will be interpreted through the
+	single-byte MacRoman encoding as that will accept any byte.
+	</li>
+	<li>
+	Diff lexer adds styles for diffs containing patches.
+	</li>
+	<li>
+	Crashes fixed on macOS for invalid DBCS characters when dragging text,
+	changing case of text, case-insensitive searching, and retrieving text as UTF-8.
+	</li>
+	<li>
+	Regular expression crash fixed on macOS when linking to libstdc++.
+	</li>
+	<li>
+	SciTE on GTK+, when running in single-instance mode, now forwards all command line arguments
+	to the already running instance.
+	This allows "SciTE filename -goto:line" to work.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite405.zip">Release 4.0.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 May 2018.
+	</li>
+	<li>
+	Add experimental SC_DOCUMENTOPTION_TEXT_LARGE option to accommodate documents larger than
+	2 GigaBytes.
+	</li>
+	<li>
+	Additional print option SC_PRINT_SCREENCOLOURS prints with the same colours used on screen
+	including line numbers.
+	</li>
+	<li>
+	SciTE can read settings in EditorConfig format when enabled with editor.config.enable property.
+	</li>
+	<li>
+	EDIFACT lexer adds property lexer.edifact.highlight.un.all to highlight all UN* segments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	Fortran folder understands "change team" and "endteam".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1216/">Feature #1216.</a>
+	</li>
+	<li>
+	Set the last X chosen when SCI_REPLACESEL called to ensure macros work
+	when text insertion followed by caret up or down.
+	</li>
+	<li>
+	Bugs fixed in regular expression searches in Scintilla where some matches did not occur in an
+	effort to avoid infinite loops when replacing on empty matches like "^" and "$".
+	Applications should always handle empty matches in a way that avoids infinite loops, commonly
+	by incrementing the search position after replacing an empty match.
+	SciTE fixes a bug where replacing "^" always matched on the first line even when it was an
+	"in selection" replace and the selection started after the line start.
+	</li>
+	<li>
+	Bug fixed in SciTE where invalid numeric properties could crash.
+	</li>
+	<li>
+	Runtime warnings fixed with SciTE on GTK after using Find in Files.
+	</li>
+	<li>
+	SciTE on Windows find and replace strips place caret at end of text after search.
+	</li>
+	<li>
+	Bug fixed with SciTE on macOS where corner debris appeared in the margin when scrolling.
+	Fixed by not completely hiding the status bar so the curved corner is no longer part of the
+	scrolling region.
+	By default, 4 pixels of the status bar remain visible and this can be changed with
+	the statusbar.minimum.height property or turned off if the debris are not a problem by
+	setting the property to 0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite404.zip">Release 4.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 April 2018.
+	</li>
+	<li>
+	On Win32, the standard makefiles build a libscintilla static library as well as the existing dynamic libraries.
+	The statically linked version of SciTE, Sc1, links to this static library. A new file, ScintillaDLL.cxx, provides
+	the DllMain function required for a stand-alone Scintilla DLL. Build and project files should include this
+	file when producing a DLL and omit it when producing a static library or linking Scintilla statically.
+	The STATIC_BUILD preprocessor symbol is no longer used.
+	</li>
+	<li>
+	On Win32, Direct2D support is no longer automatically detected during build.
+	DISABLE_D2D may still be defined to remove Direct2D features.
+	</li>
+	<li>
+	In some cases, invalid UTF-8 is handled in a way that is a little friendlier.
+	For example, when copying to the clipboard on Windows, an invalid lead byte will be copied as the
+	equivalent ISO 8859-1 character and will not hide the following byte.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1211/">Feature #1211.</a>
+	</li>
+	<li>
+	Lexer added for the Maxima computer algebra language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1210/">Feature #1210.</a>
+	</li>
+	<li>
+	Fix hang in Lua lexer when lexing a label upto the terminating "::".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1999/">Bug #1999</a>.
+	</li>
+	<li>
+	Lua lexer matches identifier chains with dots and colons.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1952/">Bug #1952</a>.
+	</li>
+	<li>
+	For rectangular selections, pressing Home or End now moves the caret to the Home or End
+	position instead of the limit of the rectangular selection.
+	</li>
+	<li>
+	Fix move-extends-selection mode for rectangular and line selections.
+	</li>
+	<li>
+	On GTK+, change lifetime of selection widget to avoid runtime warnings.
+	</li>
+	<li>
+	Fix building on Mingw/MSYS to perform file copies and deletions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1993/">Bug #1993</a>.
+	</li>
+	<li>
+	SciTE can match a wider variety of file patterns where '*' is in the middle of
+	the pattern and where there are multiple '*'.
+	A '?' matches any single character.
+	</li>
+	<li>
+	SciTE on Windows can execute Python scripts directly by name when on path.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1209/">Feature #1209.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files checks for cancel after every 10,000 lines read so
+	can be stopped on huge files.
+	</li>
+	<li>
+	SciTE remembers entered values in lists in more cases for find, replace and find in files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1715/">Bug #1715</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite403.zip">Release 4.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 February 2018.
+	</li>
+	<li>
+	Features from C++14 and C++17 are used more often, with build files now specifying
+	c++17, gnu++17, c++1z, or std:c++latest (MSVC).
+	Requires Microsoft Visual C++ 2017.5, GCC 7, Xcode 9.2 or Clang 4.0 or newer.
+	</li>
+	<li>
+	SCI_CREATEDOCUMENT adds a bytes argument to allocate memory for an initial size.
+	SCI_CREATELOADER and SCI_CREATEDOCUMENT add a documentOption argument to
+	allow choosing different document capabilities.
+	</li>
+	<li>
+	Add SC_DOCUMENTOPTION_STYLES_NONE option to stop allocating memory for styles.
+	</li>
+	<li>
+	Add SCI_GETMOVEEXTENDSSELECTION to allow applications to add more
+	complex selection commands.
+	</li>
+	<li>
+	SciTE property bookmark.symbol allows choosing symbol used for bookmarks.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1208/">Feature #1208.</a>
+	</li>
+	<li>
+	Improve VHDL lexer's handling of character literals and escape characters in strings.
+	</li>
+	<li>
+	Fix double tap word selection on Windows 10 1709 Fall Creators Update.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1983/">Bug #1983</a>.
+	</li>
+	<li>
+	Fix closing autocompletion lists on Cocoa for macOS 10.13 where the window
+	was emptying but staying visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1981/">Bug #1981</a>.
+	</li>
+	<li>
+	Fix drawing failure on Cocoa with animated find indicator in large files with macOS 10.12
+	by disabling animation.
+	</li>
+	<li>
+	SciTE on GTK+ installs its desktop file as non-executable and supports the common
+	LDLIBS make variable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1989/">Bug #1989</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1990/">Bug #1990</a>.
+	</li>
+	<li>
+	SciTE shows correct column number when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1991/">Bug #1991</a>.
+	</li>
+	<li>
+	SciTE preserves selection positions when saving with strip.trailing.spaces
+	and virtual space turned on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1992/">Bug #1992</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite402.zip">Release 4.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 October 2017.
+	</li>
+	<li>
+	Fix HTML lexer handling of Django so that nesting a  &#123;&#123; &#125;&#125; or &#123;% %&#125;
+	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
+	</li>
+	<li>
+	The Matlab folder now treats "while" as a fold start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1985/">Bug #1985</a>.
+	</li>
+	<li>
+	Fix failure on Cocoa with animated find indicator in large files with macOS 10.13
+	by disabling animation on 10.13.
+	</li>
+	<li>
+	Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite401.zip">Release 4.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 October 2017.
+	</li>
+	<li>
+	The ILoader interface is defined in its own header ILoader.h as it is not
+	related to lexing so doesn't belong in ILexer.h.
+	</li>
+	<li>
+	The Scintilla namespace is always active for internal symbols and for the lexer interfaces
+	ILexer4 and IDocument.
+	</li>
+	<li>
+	The Baan lexer checks that matches to 3rd set of keywords are function calls and leaves as identifiers if not.
+	Baan lexer and folder support #context_on / #context_off preprocessor feature.
+	</li>
+	<li>
+	The C++ lexer improved preprocessor conformance.<br />
+	Default value of 0 for undefined preprocessor symbols.<br />
+	#define A is treated as #define A 1.<br />
+	"defined A" removes "A" before replacing "defined" with value.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1966/">Bug #1966</a>.
+	</li>
+	<li>
+	The Python folder treats triple-quoted f-strings like triple-quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1977/">Bug #1977</a>.
+	</li>
+	<li>
+	The SQL lexer uses sql.backslash.escapes for double quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1968/">Bug #1968</a>.
+	</li>
+	<li>
+	Minor undefined behaviour fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1978">Bug #1978</a>.
+	</li>
+	<li>
+	On Cocoa, improve scrolling on macOS 10.12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1885">Bug #1885</a>.
+	</li>
+	<li>
+	On Cocoa, fix line selection by clicking in the margin when scrolled.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1971">Bug #1971</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite400.zip">Release 4.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 August 2017.
+	</li>
+	<li>
+	This is an unstable release with changes to interfaces used for lexers and platform access.
+	Some more changes may occur to internal and external interfaces before stability is regained with 4.1.0.
+	</li>
+	<li>
+	Uses C++14 features. Requires Microsoft Visual C++ 2017, GCC 7, and Clang 4.0 or newer.
+	</li>
+	<li>
+	Support dropped for GTK+ versions before 2.24.
+	</li>
+	<li>
+	The lexer interfaces ILexer and ILexerWithSubStyles, along with additional style metadata methods, were merged into ILexer4.
+	Most lexers will need to be updated to match the new interfaces.
+	</li>
+	<li>
+	The IDocumentWithLineEnd interface was merged into IDocument.
+	</li>
+	<li>
+	The platform layer interface has changed with unused methods removed, a new mechanism for
+	reporting events, removal of methods that take individual keyboard modifiers, and removal of old timer methods.
+	</li>
+	<li>
+	<a href="StyleMetadata.html">Style metadata</a> may be retrieved from lexers that support this through the SCI_GETNAMEDSTYLES, SCI_NAMEOFSTYLE,
+	SCI_TAGSOFSTYLE, and SCI_DESCRIPTIONOFSTYLE APIs.
+	</li>
+	<li>
+	The Cocoa platform layer uses Automatic Reference Counting (ARC).
+	</li>
+	<li>
+	The default encoding in Scintilla is UTF-8.
+	</li>
+	<li>
+	An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
+	</li>
+	<li>
+	The data parameter to ILoader::AddData made const.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1955/">Bug #1955</a>.
+	</li>
+	<li>
+	SciTE's embedded Lua interpreter updated to Lua 5.3.
+	</li>
+	<li>
+	SciTE allows event handlers to be arbitrary callables, not just functions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1190/">Feature #1190.</a>
+	</li>
+	<li>
+	SciTE allows user.shortcuts to be defined with symbolic Scintilla messages like
+	'Ctrl+L|SCI_LINEDELETE|'.
+	</li>
+	<li>
+	The Matlab lexer treats 'end' as a number rather than a keyword when used as a index.
+	This also stops incorrect folding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1951/">Bug #1951</a>.
+	</li>
+	<li>
+	The Matlab folder implements "fold", "fold.comment", and "fold.compact" properties.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1965/">Bug #1965</a>.
+	</li>
+	<li>
+	The Rust lexer recognizes 'usize' numeric literal suffixes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>.
+	</li>
+	<li>
+	Ensure redraw when application changes overtype mode so caret change visible even when not blinking.
+	Notify application with SC_UPDATE_SELECTION when overtype changed - previously
+	sent SC_UPDATE_CONTENT.
+	</li>
+	<li>
+	Fix drawing failure when in wrap mode for delete to start/end of line which
+	affects later lines but did not redraw them.
+	Also fixed drawing for wrap mode on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
+	</li>
+	<li>
+	On GTK+ fix drawing problems including incorrect scrollbar redrawing and flickering of text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1876">Bug #1876</a>.
+	</li>
+	<li>
+	On Linux, both for GTK+ and Qt, the default modifier key for rectangular selection is now Alt.
+	This is the same as Windows and macOS.
+	This was changed from Ctrl as window managers are less likely to intercept Alt+Drag for
+	moving windows than in the past.
+	</li>
+	<li>
+	On Cocoa, fix doCommandBySelector but avoid double effect of 'delete'
+	key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1958">Bug #1958</a>.
+	</li>
+	<li>
+	On Qt, the updateUi signal includes the 'updated' flags.
+	No updateUi signal is sent for focus in events.
+	These changes make Qt behave more like the other platforms.
+	</li>
+	<li>
+	On Qt, dropping files on Scintilla now fires the SCN_URIDROPPED notification
+	instead of inserting text.
+	</li>
+	<li>
+	On Qt, focus changes send the focusChanged signal.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1957/">Bug #1957</a>.
+	</li>
+	<li>
+	On Qt, mouse tracking is reenabled when the window is reshown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>.
+	</li>
+	<li>
+	On Windows, the DirectWrite modes SC_TECHNOLOGY_DIRECTWRITEDC and
+	SC_TECHNOLOGY_DIRECTWRITERETAIN are no longer provisional.
+	</li>
+	<li>
+	SciTE on macOS fixes a crash when platform-specific and platform-independent
+	session restoration clashed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1960/">Bug #1960</a>.
+	</li>
+	<li>
+	SciTE on GTK+ implements find.close.on.find.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1152/">Bug #1152</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1254/">Bug #1254</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1762/">Bug #1762</a>,
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/849/">Feature #849</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla376.zip">Release 3.7.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 August 2017.
+	</li>
+	<li>
+	This is the first release of the
+	<a href="https://scintilla.sourceforge.io/LongTermDownload.html">long term branch</a>
+	which avoids using features from C++14 or later in order to support older systems.
+	</li>
+	<li>
+	The Baan lexer correctly highlights numbers when followed by an operator.
+	</li>
+	<li>
+	On Cocoa, fix a bug with retrieving encoded bytes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite375.zip">Release 3.7.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2017.
+	</li>
+	<li>
+	This is the final release of SciTE 3.x.
+	</li>
+	<li>
+	Support dropped for Microsoft Visual C++ 2013 due to increased use of C++11 features.
+	</li>
+	<li>
+	Added a caret line frame as an alternative visual for highlighting the caret line.
+	</li>
+	<li>
+	Added "Reverse Selected Lines" feature.
+	</li>
+	<li>
+	SciTE adds "Select All Bookmarks" command.
+	</li>
+	<li>
+	SciTE adds a save.path.suggestion setting to suggest a file name when saving an
+	unnamed buffer.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 9.
+	</li>
+	<li>
+	The Baan lexer recognizes numeric literals in a more compliant manner including
+	hexadecimal numbers and exponentials.
+	</li>
+	<li>
+	The Bash lexer recognizes strings in lists in more cases.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1944/">Bug #1944</a>.
+	</li>
+	<li>
+	The Fortran lexer recognizes a preprocessor line after a line continuation &amp;.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1935/">Bug #1935</a>.
+	</li>
+	<li>
+	The Fortran folder can fold comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1936/">Bug #1936</a>.
+	</li>
+	<li>
+	The PowerShell lexer recognizes escaped quotes in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1929/">Bug #1929</a>.
+	</li>
+	<li>
+	The Python lexer recognizes identifiers more accurately when they include non-ASCII characters.
+	</li>
+	<li>
+	The Python folder treats comments at the end of the file as separate from the preceding structure.
+	</li>
+	<li>
+	The YAML lexer recognizes comments in more situations and styles a
+	"..." line like a "---" line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1931/">Bug #1931</a>.
+	</li>
+	<li>
+	Update scroll bar when annotations added, removed, or visibility changed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1187/">Feature #1187.</a>
+	</li>
+	<li>
+	Canceling modes with the Esc key preserves a rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1940/">Bug #1940</a>.
+	</li>
+	<li>
+	Builds are made with a sorted list of lexers to be more reproducible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1946/">Bug #1946</a>.
+	</li>
+	<li>
+	On Cocoa, a leak of mouse tracking areas was fixed.
+	</li>
+	<li>
+	On Cocoa, the autocompletion is 4 pixels wider to avoid text truncation.
+	</li>
+	<li>
+	On Windows, stop drawing a focus rectangle on the autocompletion list and
+	raise the default list length to 9 items.
+	</li>
+	<li>
+	SciTE examines at most 1 MB of a file to automatically determine indentation
+	for indent.auto to avoid a lengthy pause when loading very large files.
+	</li>
+	<li>
+	SciTE user interface uses lighter colours and fewer 3D elements to match current desktop environments.
+	</li>
+	<li>
+	SciTE sets buffer dirty and shows message when file deleted if load.on.activate on.
+	</li>
+	<li>
+	SciTE on Windows Find strip Find button works in incremental no-close mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1926/">Bug #1926</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite374.zip">Release 3.7.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2017.
+	</li>
+	<li>
+	Requires a C++11 compiler. GCC 4.8 and MSVC 2015 are supported.
+	</li>
+	<li>
+	Support dropped for Windows NT 4.
+	</li>
+	<li>
+	Accessibility support may be queried with SCI_GETACCESSIBILITY.
+	On GTK+, accessibility may be disabled by calling SCI_SETACCESSIBILITY.
+	</li>
+	<li>
+	Lexer added for "indent" language which is styled as plain text but folded by indentation level.
+	</li>
+	<li>
+	The Progress ABL lexer handles nested comments where comment starts or ends
+	are adjacent like "/*/*" or "*/*/".
+	</li>
+	<li>
+	In the Python lexer, improve f-string support.
+	Add support for multiline expressions in triple quoted f-strings.
+	Handle nested "()", "[]", and "{}" in f-string expressions and terminate expression colouring at ":" or "!".
+	End f-string if ending quote is seen in a "{}" expression.
+	Fix terminating single quoted f-string at EOL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1918/">Bug #1918</a>.
+	</li>
+	<li>
+	The VHDL folder folds an "entity" on the first line of the file.
+	</li>
+	<li>
+	For IMEs, do not clear selected text when there is no composition text to show.
+	</li>
+	<li>
+	Fix to crash with fold tags where line inserted at start.
+	</li>
+	<li>
+	Fix to stream selection mode when moving caret up or down.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1905/">Bug #1905</a>.
+	</li>
+	<li>
+	Drawing fixes for fold tags include fully drawing lines and not overlapping some
+	drawing and ensuring edges and mark underlines are visible.
+	</li>
+	<li>
+	Fix Cocoa failure to display accented character chooser for European
+	languages by partially reverting a change made to prevent a crash with
+	Chinese input by special-casing the Cangjie input source.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	Fix potential problems with IME on Cocoa when document contains invalid
+	UTF-8.
+	</li>
+	<li>
+	Fix crash on Cocoa with OS X 10.9 due to accessibility API not available.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1915/">Bug #1915</a>.
+	</li>
+	<li>
+	Improved speed of accessibility code on GTK+ by using additional memory
+	as a cache.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1910/">Bug #1910</a>.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ &lt; 3.3.6 caused by previous bug fix.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Fix to prevent double scrolling on GTK+ with X11.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+	<li>
+	SciTE on GTK+ adds an "accessibility" property to allow disabling accessibility
+	on GTK+ as an optimization.
+	</li>
+	<li>
+	SciTE on GTK+ has changed file chooser behaviour for some actions:
+	overwriting an existing file shows a warning;
+	the default session file name "SciTE.session" is shown and a "*.session" filter is applied;
+	appropriate filters are applied when exporting;
+	the current file name is displayed in "Save As" even when that file no longer exists.
+	</li>
+	<li>
+	SciTE fixed a bug where, on GTK+, when the output pane had focus, menu commands
+	performed by mouse were sent instead to the edit pane.
+	</li>
+	<li>
+	SciTE on Windows 8+ further restricts the paths searched for DLLs to the application
+	and system directories which may prevent some binary planting attacks.
+	</li>
+	<li>
+	Fix failure to load Direct2D on Windows when used on old versions of Windows.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1653/">Bug #1653</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite373.zip">Release 3.7.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 February 2017.
+	</li>
+	<li>
+	Display block caret over the character at the end of a selection to be similar
+	to other editors.
+	</li>
+	<li>
+	In SciTE can choose colours for fold markers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1172/">Feature #1172.</a>
+	</li>
+	<li>
+	In SciTE can hide buffer numbers in tabs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1173/">Feature #1173.</a>
+	</li>
+	<li>
+	The Diff lexer recognizes deleted lines that start with "--- ".
+	</li>
+	<li>
+	The Lua lexer requires the first line to start with "#!" to be treated as a shebang comment,
+	not just "#".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1900/">Bug #1900</a>.
+	</li>
+	<li>
+	The Matlab lexer requires block comment start and end to be alone on a line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1902/">Bug #1902</a>.
+	</li>
+	<li>
+	The Python lexer supports f-strings with new styles, allows Unicode identifiers,
+	and no longer allows @1 to be a decorator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1848/">Bug #1848</a>.
+	</li>
+	<li>
+	Fix folding inconsistency when fold header added above a folded part.
+	Avoid unnecessary unfolding when a deletion does not include a line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1896/">Bug #1896</a>.
+	</li>
+	<li>
+	Fix finalization crash on Cocoa.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1909/">Bug #1909</a>.
+	</li>
+	<li>
+	SciTE on GTK+ can have a wide divider between the panes with the
+	split.wide property.
+	</li>
+	<li>
+	Fix display of autocompletion lists and calltips on GTK+ 3.22 on Wayland.
+	Newer APIs used on GTK+ 3.22 as older APIs were deprecated.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ due to signal receipt after destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Make trackpad scrolling work on Wayland.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite372.zip">Release 3.7.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 December 2016.
+	</li>
+	<li>
+	Minimize redrawing for SCI_SETSELECTIONN* APIs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>.
+	</li>
+	<li>
+	Use more precision to allow selecting individual lines in files with
+	more than 16.7 million lines.
+	</li>
+	<li>
+	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
+	</li>
+	<li>
+	For Cocoa, fix crash on view destruction with macOS 10.12.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1891/">Bug #1891</a>.
+	</li>
+	<li>
+	Fix crash on GTK+ &lt;3.8 due to incorrect lifetime of accessibility object.
+	More accurate reporting of attribute ranges and deletion lengths for accessibility.
+	</li>
+	<li>
+	In SciTE, if a Lua script causes a Scintilla failure exception, display error
+	message in output pane instead of exiting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1773/">Bug #1773</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite371.zip">Release 3.7.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 December 2016.
+	</li>
+	<li>
+	The Scintilla namespace is no longer applied to struct definitions in Scintilla.h even
+	when SCI_NAMESPACE defined.
+	Client code should not define SCI_NAMESPACE.
+	</li>
+	<li>
+	Structure names in Scintilla.h without prefixes are deprecated and will now only
+	be usable with INCLUDE_DEPRECATED_FEATURES defined.<br />
+	Use the newer names with the "Sci_" prefix:<br />
+	CharacterRange &rarr; Sci_CharacterRange<br />
+	TextRange &rarr; Sci_TextRange<br />
+	TextToFind &rarr; Sci_TextToFind<br />
+	RangeToFormat &rarr; Sci_RangeToFormat<br />
+	NotifyHeader &rarr; Sci_NotifyHeader
+	</li>
+	<li>
+	Previously deprecated features SC_CP_DBCS, SCI_SETUSEPALETTE. and SCI_GETUSEPALETTE
+	have been removed and can no longer be used in client code.
+	</li>
+	<li>
+	Single phase drawing SC_PHASES_ONE is deprecated along with the
+	SCI_SETTWOPHASEDRAW and SCI_GETTWOPHASEDRAW messages.
+	</li>
+	<li>
+	Accessibility support allowing screen readers to work added on GTK+ and Cocoa.
+	</li>
+	<li>
+	Textual tags may be displayed to the right on folded lines with SCI_TOGGLEFOLDSHOWTEXT.
+	This is commonly something like "{ ... }" or "&lt;tr&gt;...&lt;/tr&gt;".
+	It is displayed with the STYLE_FOLDDISPLAYTEXT style and may have a box drawn around it
+	with SCI_FOLDDISPLAYTEXTSETSTYLE.
+	</li>
+	<li>
+	A mouse right-click over the margin may send an SCN_MARGINRIGHTCLICK event.
+	This only occurs when popup menus are turned off.
+	SCI_USEPOPUP now has three states: SC_POPUP_NEVER, SC_POPUP_ALL, or SC_POPUP_TEXT.
+	</li>
+	<li>
+	INDIC_POINT and INDIC_POINTCHARACTER indicators added to display small arrows
+	underneath positions or characters.
+	</li>
+	<li>
+	Added alternate appearance for visible tabs which looks like a horizontal line.
+	Controlled with SCI_SETTABDRAWMODE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1165/">Feature #1165.</a>
+	</li>
+	<li>
+	On Cocoa, a modulemap file is included to allow Scintilla to be treated as a module.
+	This makes it easier to use Scintilla from the Swift language.
+	</li>
+	<li>
+	Baan folder accommodates sections and lexer fixes definition of SCE_BAAN_FUNCDEF.
+	</li>
+	<li>
+	EDIFACT lexer and folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	JSON folder fixed where it didn't resume folding with the correct fold level.
+	</li>
+	<li>
+	Matlab folder based on syntax instead of indentation so more accurate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1692/">Bug #1692</a>.
+	</li>
+	<li>
+	YAML lexer fixed style of references and keywords when followed by a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1872/">Bug #1872</a>.
+	</li>
+	<li>
+	Margin click to select line now clears rectangular and additional selections.
+	</li>
+	<li>
+	Fixed a NULL access bug on GTK+ where the scrollbars could be used during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1873/">Bug #1873</a>.
+	</li>
+	<li>
+	A potential bug on GTK+ fixed where asynchronous clipboard could be delivered after its
+	target Scintilla instance was destroyed.
+	</li>
+	<li>
+	Cocoa IME made more compliant with documented behaviour to avoid bugs that caused
+	huge allocations.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	On Win32 fix EM_SETSEL to match Microsoft documentation..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1886/">Bug #1886</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows localizing tool bar tool tips.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1167/">Feature #1167.</a>
+	</li>
+	<li>
+	SciTE on Windows restores focus to edit pane after closing user strip.
+	</li>
+	<li>
+	SciTE measures files larger that 2 GB which allows it to refuse to open huge files more consistently
+	and to show better warning messages.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite370.zip">Release 3.7.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 October 2016.
+	</li>
+	<li>
+	Word selection, navigation, and manipulation is now performed on characters instead of bytes
+	leading to more natural behaviour for multi-byte encodings like UTF-8.
+	For UTF-8 characters 0x80 and above, classification into word; punctuation; space; or line-end
+	is based on the Unicode general category of the character and is not customizable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1832/">Bug #1832</a>.
+	</li>
+	<li>
+	Two enums changed in Scintilla.iface which may lead to changed bindings.
+	There were 2 FontQuality enums and the first is now PhasesDraw.
+	The prefix for FoldAction was SC_FOLDACTION and is now SC_FOLDACTION_
+	which is similar to other enums.
+	These changes do not affect the standard C/C++ binding.
+	</li>
+	<li>
+	EDGE_MULTILINE and SCI_MULTIEDGEADDLINE added to allow displaying multiple
+	vertical edges simultaneously.
+	</li>
+	<li>
+	The number of margins can be changed with SCI_SETMARGINS.
+	</li>
+	<li>
+	Margin type SC_MARGIN_COLOUR added so that the application may
+	choose any colour for a margin with SCI_SETMARGINBACKN.
+	</li>
+	<li>
+	On Win32, mouse wheel scrolling can be restricted to only occur when the mouse is
+	within the window.
+	</li>
+	<li>
+	The WordList class in lexlib used by lexers adds an InListAbridged method for
+	matching keywords that have particular prefixes and/or suffixes.
+	</li>
+	<li>
+	The Baan lexer was changed significantly with more lexical states, keyword sets,
+	and support for abridged keywords.
+	</li>
+	<li>
+	The CoffeeScript lexer styles interpolated code in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1865/">Bug #1865</a>.
+	</li>
+	<li>
+	The Progress lexer "progress" has been replaced with a new lexer "abl"
+	(Advanced Business Language)
+	with a different set of lexical states and more functionality.
+	The lexical state prefix has changed from SCE_4GL_ to SCE_ABL_.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1143/">Feature #1143.</a>
+	</li>
+	<li>
+	The PowerShell lexer understands the grave accent escape character.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1868/">Bug #1868</a>.
+	</li>
+	<li>
+	The YAML lexer recognizes inline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1660/">Bug #1660</a>.
+	</li>
+	<li>
+	SciTE on Windows can retain coloured selection when inactive with
+	selection.always.visible property.
+	</li>
+	<li>
+	SciTE on Windows adds a state to close.on.find to close the find strip when
+	a match is found.
+	</li>
+	<li>
+	Fix caret position after left or right movement with rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1861/">Bug #1861</a>.
+	</li>
+	<li>
+	In SciTE, optional prefix argument added to scite.ConstantName method.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1860/">Bug #1860</a>.
+	</li>
+	<li>
+	On Cocoa, include ILexer.h in the public headers of the framework.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1855/">Bug #1855</a>.
+	</li>
+	<li>
+	On Cocoa, allow subclass of SCIContentView to set cursor.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1863/">Bug #1863</a>.
+	</li>
+	<li>
+	On Cocoa, recognize the numeric keypad '+', '-', and '/' keys as
+	SCK_ADD, SCK_SUBTRACT, and SCK_DIVIDE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1867/">Bug #1867</a>.
+	</li>
+	<li>
+	On GTK+ 3.21+ fix incorrect font size in auto-completion list.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1859/">Bug #1859</a>.
+	</li>
+	<li>
+	Fix SciTE crash when command.mode ends with comma.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1857/">Bug #1857</a>.
+	</li>
+	<li>
+	SciTE on Windows has a full size toolbar icon for "Close".
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite367.zip">Release 3.6.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 September 2016.
+	</li>
+	<li>
+	C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
+	</li>
+	<li>
+	SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
+	This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
+	Projects which want to default to DBCS code pages in East Asian locales should set the code page and
+	character set explicitly.
+	</li>
+	<li>
+	SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
+	Most commonly wanted when virtual space is used.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
+	</li>
+	<li>
+	The C++ lexer can fold on #else and #elif with the fold.cpp.preprocessor.at.else property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
+	</li>
+	<li>
+	The errorlist lexer detects warnings from Visual C++ which do not contain line numbers.
+	</li>
+	<li>
+	The HTML lexer no longer treats "&lt;?" inside a string in a script as potentially starting an XML document.
+	<a href="https://sourceforge.net/p/scintilla/bugs/767/">Bug #767</a>.
+	</li>
+	<li>
+	The HTML lexer fixes a problem resuming at a script start where the starting state continued
+	past where it should.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1849/">Bug #1849</a>.
+	</li>
+	<li>
+	When inserting spaces for virtual space and the position is in indentation and tabs are enabled
+	for indentation then use tabs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1850/">Bug #1850</a>.
+	</li>
+	<li>
+	Fix fold expand when some child text not styled.
+	Caused by fixes for Bug #1799.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1842/">Bug #1842</a>.
+	</li>
+	<li>
+	Fix key binding bug on Cocoa for control+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1854/">Bug #1854</a>.
+	</li>
+	<li>
+	Fix scroll bar size warnings on GTK+ caused by #1831.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
+	</li>
+	<li>
+	Small fixes for GTK+ makefile.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1844/">Bug #1844</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1845/">Bug #1845</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1846/">Bug #1846</a>.
+	</li>
+	<li>
+	Fix SciTE indentation after code like "void function () {}".
+	</li>
+	<li>
+	Fix SciTE global regex replace of "^" with something which missed the line after empty
+	lines with LF line ends.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1839/">Bug #1839</a>.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.20 bug where toggle buttons on find and replace strips
+	did not show active state.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1853/">Bug #1853</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite366.zip">Release 3.6.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 May 2016.
+	</li>
+	<li>
+	C++ 11 &lt;regex&gt; support built by default. Can be disabled by defining NO_CXX11_REGEX.
+	</li>
+	<li>
+	SciTE_USERHOME environment variable allows separate location for writeable properties files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/965/">Feature #965.</a>
+	</li>
+	<li>
+	GObject introspection supports notify and command events.
+	</li>
+	<li>
+	The Progress lexer now allows comments preceded by a tab.
+	</li>
+	<li>
+	Scripts reading Scintilla.iface file include comments for enu and lex definitions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1829/">Bug #1829</a>.
+	</li>
+	<li>
+	Fix crashes on GTK+ if idle work active when destroyed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1827/">Bug #1827</a>.
+	</li>
+	<li>
+	Fixed bugs when used on GTK+ 3.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1825/">Bug #1825</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1831/">Bug #1831</a>.
+	</li>
+	<li>
+	Fix SciTE search field background with dark theme on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1826/">Bug #1826</a>.
+	</li>
+	<li>
+	Fixed bug on Win32 that allowed resizing autocompletion from bottom when it was
+	located above the caret.
+	</li>
+	<li>
+	On Win32, when using a screen reader and selecting text using Shift+Arrow,
+	fix bug when scrolling made the caret stay at the same screen location
+	so the screen reader did not speak the added or removed selection.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite365.zip">Release 3.6.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 April 2016.
+	</li>
+	<li>
+	JSON lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1140/">Feature #1140.</a>
+	</li>
+	<li>
+	The C++ lexer fixes a bug with multi-line strings with line continuation where the string style
+	overflowed after an edit.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1824/">Bug #1824</a>.
+	</li>
+	<li>
+	The Python lexer treats '@' as an operator except when it is the first visible character on a line.
+	This is for Python 3.5.
+	</li>
+	<li>
+	The Rust lexer allows '?' as an operator.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1146/">Feature #1146.</a>
+	</li>
+	<li>
+	Doubled size of compiled regex buffer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1822/">Bug #1822</a>.
+	</li>
+	<li>
+	For GTK+, the Super modifier key can be used in key bindings.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1142/">Feature #1142.</a>
+	</li>
+	<li>
+	For GTK+, fix some crashes when using multiple threads.
+	</li>
+	<li>
+	Platform layer font cache removed on GTK+ as platform-independent caches are used.
+	This avoids the use of thread locking and initialization of threads so any GTK+
+	applications that rely on Scintilla initializing threads will have to do that themselves.
+	</li>
+	<li>
+	SciTE bug fixed with exported HTML where extra line shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1816/">Bug #1816</a>.
+	</li>
+	<li>
+	SciTE on Windows fixes bugs with pop-up menus in the find and replace strips.
+	For the replace strip, menu choices change the state.
+	For the find strip, menu choices are reflected in the appearance of their corresponding buttons.
+	</li>
+	<li>
+	SciTE on Windows on high DPI displays fixes the height of edit boxes in user strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite364.zip">Release 3.6.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 March 2016.
+	</li>
+	<li>
+	SciTE allows setting the autocompletion type separator character.
+	</li>
+	<li>
+	The C++ folder folds code on '(' and ')' to allow multi-line calls to be folded.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1138/">Feature #1138.</a>
+	</li>
+	<li>
+	For the HTML lexer, limit the extent of Mako line comments to finish before
+	the line end characters.
+	</li>
+	<li>
+	Folds unfolded when two fold regions are merged by either deleting an intervening line
+	or changing its fold level by adding characters.
+	This was fixed both in Scintilla and in SciTE's equivalent code.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1799/">Bug #1799</a>.<br />
+	</li>
+	<li>
+	The Progress lexer supports hexadecimal numeric literals,
+	single-line comments, abbreviated keywords and
+	extends nested comments to unlimited levels.
+	</li>
+	<li>
+	Ruby lexer treats alternate hash key syntax "key:" as a symbol.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1810/">Bug #1810</a>.
+	</li>
+	<li>
+	Rust lexer handles bracketed Unicode string escapes like "\u{123abc}".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1809/">Bug #1809</a>.
+	</li>
+	<li>
+	For GTK+ on Windows fix 64-bit build which was broken in 3.6.3.
+	</li>
+	<li>
+	For Qt, release builds have assertions turned off.
+	</li>
+	<li>
+	For Qt on Windows, fix compilation failure for Qt 4.x.
+	</li>
+	<li>
+	IME target range displayed on Qt for OS X.
+	</li>
+	<li>
+	On Windows, make clipboard operations more robust by retrying OpenClipboard if it fails
+	as this may occur when another application has opened the clipboard.
+	</li>
+	<li>
+	On Windows back out change that removed use of def file to ensure
+	Scintilla_DirectFunction exported without name mangling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1813/">Bug #1813</a>.
+	</li>
+	<li>
+	On GTK+ and Qt over Win32 in Korean fix bug caused by last release's word input change.
+	</li>
+	<li>
+	For SciTE, more descriptive error messages are displayed when there are problems loading the
+	Lua startup script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1139/">Feature #1139.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite363.zip">Release 3.6.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 18 January 2016.
+	</li>
+	<li>
+	Allow painting without first styling all visible text then styling in the background
+	using idle-time. This helps performance when scrolling down in very large documents.
+	Can also incrementally style after the visible area to the end of the document so that
+	the document is already styled when the user scrolls to it.
+	</li>
+	<li>
+	Support GObject introspection on GTK+.
+	</li>
+	<li>
+	SciTE supports pasting to each selection with the selection.multipaste setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1123/">Feature #1123.</a>
+	</li>
+	<li>
+	SciTE can optionally display a read-only indicator on tabs and in the Buffers menu.
+	</li>
+	<li>
+	Bash lexer flags incomplete here doc delimiters as syntax errors.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1789/">Bug #1789</a>.<br />
+	Support added for using '#' in non-comment ways as is possible with zsh.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1794/">Bug #1794</a>.<br />
+	Recognize more characters as here-doc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1778/">Bug #1778</a>.
+	</li>
+	<li>
+	Errorlist lexer highlights warning messages from the Microsoft linker.
+	</li>
+	<li>
+	Errorlist lexer fixes bug with final line in escape sequence recognition mode.
+	</li>
+	<li>
+	Lua lexer includes '&amp;' and '|' bitwise operators for Lua 5.3.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1790/">Bug #1790</a>.
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.20 and 5.22.<br />
+	Allow '_' for subroutine prototypes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1791/">Bug #1791</a>.<br />
+	Double-diamond operator &lt;&lt;&gt;&gt;.<br />
+	Hexadecimal floating point literals.<br />
+	Repetition in list assignment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1793/">Bug #1793</a>.<br />
+	Highlight changed subroutine prototype syntax for Perl 5.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1797/">Bug #1797</a>.<br />
+	Fix module ::-syntax when special characters such as 'x' are used.<br />
+	Added ' and " detection as prefix chars for x repetition operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1800/">Bug #1800</a>.
+	</li>
+	<li>
+	Visual Prolog lexer recognizes numbers more accurately and allows non-ASCII verbatim
+	quoting characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1130/">Feature #1130.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION when the application changes multiple
+	selection.
+	</li>
+	<li>
+	Expand folded areas before deleting fold header line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1796/">Bug #1796</a>.
+	</li>
+	<li>
+	Treat Unicode line ends like common line ends when maintaining fold state.
+	</li>
+	<li>
+	Highlight whole run for hover indicator when wrapped.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1784/">Bug #1784</a>.
+	</li>
+	<li>
+	On Cocoa, fix crash when autocompletion list closed during scroll bounce-back.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1788/">Bug #1788</a>.
+	</li>
+	<li>
+	On Windows, fix non-BMP input through WM_CHAR and allow WM_UNICHAR to work
+	with non-BMP characters and on non-Unicode documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1779/">Bug #1779</a>.
+	</li>
+	<li>
+	On Windows using DirectWrite, for ligatures and other character clusters,
+	display caret and selections part-way through clusters so that the caret doesn't stick
+	to the end of the cluster making it easier to understand editing actions.
+	</li>
+	<li>
+	On Windows, Scintilla no longer uses a .DEF file during linking as it duplicates
+	source code directives.
+	</li>
+	<li>
+	On GTK+ and Qt, Korean input by word fixed.
+	</li>
+	<li>
+	On GTK+, Qt, and Win32 block IME input when document is read-only or any selected text
+	is protected.
+	</li>
+	<li>
+	On GTK+ on OS X, fix warning during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1777/">Bug #1777</a>.
+	</li>
+	<li>
+	Fix SciTE crashes when using LPEG lexers.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite362.zip">Release 3.6.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 November 2015.
+	</li>
+	<li>
+	Whitespace may be made visible just in indentation.
+	</li>
+	<li>
+	Whitespace dots are centred when larger than 1 pixel.
+	</li>
+	<li>
+	The Scintilla framework on Cocoa now contains version numbers.
+	</li>
+	<li>
+	SciTE's standard properties collect values from all active .properties file to produce the Language menu
+	and the file types pull-down in the File open dialog.
+	</li>
+	<li>
+	The single executable version of SciTE, Sc1, uses 'module' statements within its embedded
+	properties. This makes it act more like the full distribution allowing languages to be turned on
+	and off by setting imports.include and imports.exclude.
+	The default imports.exclude property adds eiffel, erlang, ps, and pov so these languages are
+	turned off by default.
+	</li>
+	<li>
+	SciTE adds an output.blank.margin.left property to allow setting the output pane
+	margin to a different width than the edit pane.
+	</li>
+	<li>
+	CoffeeScript lexer highlights ranges correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1765/">Bug #1765</a>.
+	</li>
+	<li>
+	Markdown lexer treats line starts consistently to always highlight *foo* or similar at line start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1766/">Bug #1766</a>.
+	</li>
+	<li>
+	Optimize marker redrawing by only drawing affected lines when markers shown in the text.
+	</li>
+	<li>
+	On Cocoa, timers and idling now work in modal dialogs. This also stops some crashes.
+	</li>
+	<li>
+	On Cocoa, fix crashes when deleting a ScintillaView. These crashes could occur when scrolling
+	at the time the ScintillaView was deleted although there may have been other cases.
+	</li>
+	<li>
+	On GTK+ 2.x, fix height of lines in autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1774/">Bug #1774</a>.
+	</li>
+	<li>
+	Fix bug with SCI_LINEENDDISPLAY where the caret moved to the next document line instead of the
+	end of the display line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1772/">Bug #1772</a>.
+	</li>
+	<li>
+	Report error (SC_STATUS_FAILURE) when negative length passed to SCI_SETSTYLING.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1768/">Bug #1768</a>.
+	</li>
+	<li>
+	When SC_MARK_UNDERLINE is not assigned to a margin, stop drawing the whole line.
+	</li>
+	<li>
+	When reverting an untitled document in SciTE, just clear it with no message about a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1764/">Bug #1764</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows use of Ctrl+A (Select All) inside find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1769/">Bug #1769</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite361.zip">Release 3.6.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 September 2015.
+	</li>
+	<li>
+	The oldest version of GTK+ supported now is 2.18 and for glib it is 2.22.
+	</li>
+	<li>
+	On GTK+, SC_CHARSET_OEM866 added to allow editing Russian files encoded in code page 866.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1019/">Feature #1019.</a>
+	</li>
+	<li>
+	On Windows, reconversion is performed when requested by the IME.
+	</li>
+	<li>
+	CoffeeScript lexer adds lexical class for instance properties and fixes some cases of regex highlighting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1749/">Bug #1749</a>.
+	</li>
+	<li>
+	The errorlist lexer understands some ANSI escape sequences to change foreground colour and intensity.
+	This is sufficient to colour diagnostic output from gcc and clang when -fdiagnostics-color set.
+	</li>
+	<li>
+	The errorlist lexer allows the line number to be 0 in GCC errors as some tools report whole file
+	errors as line 0.
+	</li>
+	<li>
+	MySql lexer fixes empty comments /**/ so the comment state does not continue.
+	</li>
+	<li>
+	VHDL folder supports "protected" keyword.
+	</li>
+	<li>
+	Treat CRLF line end as two characters in SCI_COUNTCHARACTERS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1757/">Bug #1757</a>.
+	</li>
+	<li>
+	On GTK+ 3.x, fix height of lines in autocompletion lists to match the font.
+	Switch from deprecated style calls to CSS styling.
+	Removed setting list colours on GTK+ 3.16+ as no longer appears needed.
+	</li>
+	<li>
+	On GTK+, avoid "Invalid rectangle passed" warning messages by never reporting the client
+	rectangle with a negative width or height.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1743/">Bug #1743</a>.
+	</li>
+	<li>
+	On Cocoa, copy Sci_Position.h into the framework so clients can build.
+	</li>
+	<li>
+	On Cocoa fix bug with drag and drop that could lead to crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1751/">Bug #1751</a>.
+	</li>
+	<li>
+	Fix SciTE disk exhaustion bug by reporting failures when writing files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1760/">Bug #1760</a>.
+	</li>
+	<li>
+	Fix find strip in SciTE on Windows XP to be visible.
+	</li>
+	<li>
+	SciTE on Windows changes the way it detects that a tool has finished executing to ensure all output data
+	from the process is read.
+	</li>
+	<li>
+	SciTE on Windows improves the time taken to read output from tools that produce a large amount
+	of output by a factor of around 10.
+	</li>
+	<li>
+	On GTK+ the keyboard command for View | End of Line was changed to Ctrl+Shift+N
+	to avoid clash with Search | Selection Add Next.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1750/">Bug #1750</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite360.zip?download">Release 3.6.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 August 2015.
+	</li>
+	<li>
+	External interfaces use the Sci_Position and Sci_PositionU typedefs instead of int and unsigned int
+	to allow for changes to a 64-bit interface on 64-bit platforms in the future.
+	Applications and external lexers should start using the new type names so that
+	they will be compatible when the 64-bit change occurs.
+	There is also Sci_PositionCR (long) for use in the Sci_CharacterRange struct which will
+	also eventually become 64-bit.
+	</li>
+	<li>
+	Multiple selection now works over more key commands.
+	The new multiple-selection handling commands include horizontal movement and selection commands,
+	line up and down movement and selection commands, word and line deletion commands, and
+	line end insertion.
+	This change in behaviours is conditional on setting the SCI_SETADDITIONALSELECTIONTYPING property.
+	</li>
+	<li>
+	Autocompletion lists send an SCN_AUTOCCOMPLETED notification after the text has been inserted.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1109/">Feature #1109.</a>
+	</li>
+	<li>
+	The case mode style attribute can now be SC_CASE_CAMEL.
+	</li>
+	<li>
+	The Python lexer supports substyles for identifiers.
+	</li>
+	<li>
+	SciTE adds support for substyles.
+	</li>
+	<li>
+	SciTE's Export as RTF and Copy as RTF commands support UTF-8.
+	</li>
+	<li>
+	SciTE can display autocompletion on all IME input with ime.autocomplete property.
+	</li>
+	<li>
+	SciTE properties files now discard trailing white space on variable names.
+	</li>
+	<li>
+	Calling SCI_SETIDENTIFIERS resets styling to ensure any added identifier are highlighted.
+	</li>
+	<li>
+	Avoid candidate box randomly popping up away from edit pane with (especially
+	Japanese) IME input.
+	</li>
+	<li>
+	On Cocoa fix problems with positioning of autocompletion lists near screen edge
+	or under dock. Cancel autocompletion when window moved.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1740/">Bug #1740</a>.
+	</li>
+	<li>
+	Fix drawing problem when control characters are in a hidden style as they then
+	have a zero width rectangle to draw but modify that rectangle in a way that
+	clears some pixels.
+	</li>
+	<li>
+	Report error when attempt to resize buffer to more than 2GB with SC_STATUS_FAILURE.
+	</li>
+	<li>
+	Fix bug on GTK+ with scroll bars leaking.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1742/">Bug #1742</a>.
+	</li>
+	<li>
+	LexOthers.cxx file split into one file per lexer: LexBatch, LexDiff,
+	LexErrorList, LexMake, LexNull, and LexProps.
+	</li>
+	<li>
+	SciTE exporters handle styles &gt; 127 correctly now.
+	</li>
+	<li>
+	SciTE on Windows can scale window element sizes based on the system DPI setting.
+	</li>
+	<li>
+	SciTE implements find.in.files.close.on.find on all platforms, not just Windows.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite357.zip?download">Release 3.5.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2015.
+	</li>
+	<li>
+	Added SCI_MULTIPLESELECTADDNEXT to add the next occurrence of the main selection within the
+	target to the set of selections as main. If the current selection is empty then select word around caret.
+	SCI_MULTIPLESELECTADDEACH adds each occurrence of the main selection within the
+	target to the set of selections.
+	</li>
+	<li>
+	SciTE adds "Selection Add Next" and "Selection Add Each" commands to the Search menu.
+	</li>
+	<li>
+	Added SCI_ISRANGEWORD to determine if the parameters are at the start and end of a word.
+	</li>
+	<li>
+	Added SCI_TARGETWHOLEDOCUMENT to set the target to the whole document.
+	</li>
+	<li>
+	Verilog lexer recognizes protected regions and the folder folds protected regions.
+	</li>
+	<li>
+	A performance problem with markers when deleting many lines was fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1733/">Bug #1733</a>.
+	</li>
+	<li>
+	On Cocoa fix crash when ScintillaView destroyed if no autocompletion ever displayed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1728/">Bug #1728</a>.
+	</li>
+	<li>
+	On Cocoa fix crash in drag and drop.
+	</li>
+	<li>
+	On GTK+ 3.4+, when there are both horizontal and vertical scrollbars, draw the lower-right corner
+	so that it does not appear black when text selected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1611/">Bug #1611</a>.
+	</li>
+	<li>
+	Fixed most calls deprecated in GTK+ 3.16. Does not fix style override calls
+	as they are more complex.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x uses a different technique for highlighting the search strip when there is
+	no match which is more compatible with future and past versions and different themes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2015.
+	</li>
+	<li>
+	On Qt, use fractional positioning calls and avoid rounding to ensure consistency.
+	</li>
+	<li>
+	SCI_TARGETASUTF8 and SCI_ENCODEDFROMUTF8 implemented on
+	Win32 as well as GTK+ and Cocoa.
+	</li>
+	<li>
+	C++ lexer fixes empty backquoted string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1711/">Bug #1711</a>.
+	</li>
+	<li>
+	C++ lexer fixes #undef directive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1719/">Bug #1719</a>.
+	</li>
+	<li>
+	Fortran folder fixes handling of "selecttype" and "selectcase".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1724/">Bug #1724</a>.
+	</li>
+	<li>
+	Verilog folder folds interface definitions.
+	</li>
+	<li>
+	VHDL folder folds units declarations and fixes a case insensitivity bug with not treating "IS" the same as "is".
+	</li>
+	<li>
+	Fix bug when drawing text margins in buffered mode which would use default
+	encoding instead of chosen encoding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1703/">Bug #1703</a>.
+	</li>
+	<li>
+	Fix bug with Korean Hanja conversions in DBCS encoding on Windows.
+	</li>
+	<li>
+	Fix for reading a UTF-16 file in SciTE where a non-BMP character is split over a read buffer boundary.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1710/">Bug #1710</a>.
+	</li>
+	<li>
+	Fix bug on GTK+ 2.x for Windows where there was an ABI difference between
+	compiler version.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1726/">Bug #1726</a>.
+	</li>
+	<li>
+	Fix undo bug on Cocoa that could lose data..
+	</li>
+	<li>
+	Fix link error on Windows when SCI_NAMESPACE used.
+	</li>
+	<li>
+	Fix exporting from SciTE when using Scintillua for lexing.
+	</li>
+	<li>
+	SciTE does not report twice that a search string can not be found when "Replace" pressed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1716/">Bug #1716</a>.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x disables arrow in search combo when no entries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1717/">Bug #1717</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2015.
+	</li>
+	<li>
+	Scintilla on Windows is now always a wide character window so SCI_SETKEYSUNICODE has no effect
+	and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called.
+	</li>
+	<li>
+	The wxWidgets-specific ascent member of Font has been removed which breaks
+	compatibility with current wxStyledTextCtrl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1682/">Bug #1682</a>.
+	</li>
+	<li>
+	IME on Qt supports multiple carets and behaves more like other platforms.
+	</li>
+	<li>
+	Always use inline IME on GTK+ for Korean.
+	</li>
+	<li>
+	SQL lexer fixes handling of '+' and '-' in numbers so the '-' in '1-1' is seen as an operator and for
+	'1--comment' the comment is recognized.
+	</li>
+	<li>
+	TCL lexer reverts change to string handling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer fixes bugs with macro styling.
+	Verilog folder fixes bugs with `end completing an `if* instead of `endif and fold.at.else, and implements
+	folding at preprocessor `else.
+	</li>
+	<li>
+	VHDL lexer supports extended identifiers.
+	</li>
+	<li>
+	Fix bug on Cocoa where the calltip would display incorrectly when
+	switching calltips and the new calltip required a taller window.
+	</li>
+	<li>
+	Fix leak on Cocoa with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1706/">Bug #1706</a>.
+	</li>
+	<li>
+	Fix potential crash on Cocoa with drag and drop.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1709/">Bug #1709</a>.
+	</li>
+	<li>
+	Fix bug on Windows when compiling with MinGW-w64 which caused text to not be drawn
+	when in wrap mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1705/">Bug #1705</a>.
+	</li>
+	<li>
+	Fix SciTE bug with missing file open filters and add hex to excluded set of properties files so that its
+	settings don't appear.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1707/">Bug #1707</a>.
+	</li>
+	<li>
+	Fix SciTE bug where files without extensions like "makefile" were not highlighted correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite354.zip?download">Release 3.5.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2015.
+	</li>
+	<li>
+	Indicators may have a different colour and style when the mouse is over them or the caret is moved into them.
+	</li>
+	<li>
+	An indicator may display in a large variety of colours with the SC_INDICFLAG_VALUEFORE
+	flag taking the colour from the indicator's value, which may differ for every character, instead of its
+	foreground colour attribute.
+	</li>
+	<li>
+	On Cocoa, additional IME methods implemented so that more commands are enabled.
+	For Japanese: Reverse Conversion, Convert to Related Character, and Search Similar Kanji
+	can now be performed.
+	The global definition hotkey Command+Control+D and the equivalent three finger tap gesture
+	can be used.
+	</li>
+	<li>
+	Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed.
+	</li>
+	<li>
+	On Windows, for Korean, the VK_HANJA key is implemented to choose Hanja for Hangul and
+	to convert from Hanja to Hangul.
+	</li>
+	<li>
+	C++ lexer adds lexer.cpp.verbatim.strings.allow.escapes option that allows verbatim (@") strings
+	to contain escape sequences. This should remain off (0) for C# and be turned on (1) for Objective C.
+	</li>
+	<li>
+	Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>.
+	</li>
+	<li>
+	Ruby folder can fold multiline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1697/">Bug #1697</a>.
+	</li>
+	<li>
+	SQL lexer fixes a bug with the q-quote operator.
+	</li>
+	<li>
+	TCL lexer fixes a bug with some strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer handles escaped identifiers that begin with \ and end with space like \reset* .
+	Verilog folder fixes one bug with inconsistent folding when fold.comment is on and another
+	with typedef class statements creating a fold point, expecting an endclass statement.
+	</li>
+	<li>
+	VHDL folder fixes hang in folding when document starts with "entity".
+	</li>
+	<li>
+	Add new indicators INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, and INDIC_TEXTFORE.
+	INDIC_COMPOSITIONTHIN is a thin underline that mimics the appearance of non-target segments in OS X IME.
+	INDIC_FULLBOX is similar to INDIC_STRAIGHTBOX but covers the entire character area which means that
+	indicators with this style on contiguous lines may touch. INDIC_TEXTFORE changes the text foreground colour.
+	</li>
+	<li>
+	Fix adaptive scrolling speed for GTK+ on OS X with GTK Quartz backend (as opposed to X11 backend).
+	<a href="https://sourceforge.net/p/scintilla/bugs/1696/">Bug #1696</a>.
+	</li>
+	<li>
+	Fix position of autocompletion and calltips on Cocoa when there were two screens stacked vertically.
+	</li>
+	<li>
+	Fix crash in SciTE when saving large files in background when closing application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1691/">Bug #1691</a>.
+	</li>
+	<li>
+	Fix decoding of MSVC warnings in SciTE so that files in the C:\Program Files (x86)\ directory can be opened.
+	This is a common location of system include files.
+	</li>
+	<li>
+	Fix compilation failure of C++11 &lt;regex&gt; on Windows using gcc.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 January 2015.
+	</li>
+	<li>
+	Support removed for Windows 95, 98, and ME.
+	</li>
+	<li>
+	Lexers added for Motorola S-Record files, Intel hex files, and Tektronix extended hex files with folding for Intel hex files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1091/">Feature #1091.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1093/">Feature #1093.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1095/">Feature #1095.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1096/">Feature #1096.</a>
+	</li>
+	<li>
+	C++ folder allows folding on square brackets '['.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1087/">Feature #1087.</a>
+	</li>
+	<li>
+	Shell lexer fixes three issues with here-documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1672/">Bug #1672</a>.
+	</li>
+	<li>
+	Verilog lexer highlights doc comment keywords; has separate styles for input, output, and inout ports
+	(lexer.verilog.portstyling); fixes a bug in highlighting numbers; can treat upper-case identifiers as
+	keywords (lexer.verilog.allupperkeywords); and can use different styles for code that is inactive due
+	to preprocessor commands (lexer.verilog.track.preprocessor, lexer.verilog.update.preprocessor).
+	</li>
+	<li>
+	When the calltip window is taller than the Scintilla window, leave it in a
+	position that avoids overlapping the Scintilla text.
+	</li>
+	<li>
+	When a text margin is displayed, for annotation lines, use the background colour of the base line.
+	</li>
+	<li>
+	On Windows GDI, assume font names are encoded in UTF-8. This matches the Direct2D code path.
+	</li>
+	<li>
+	Fix paste for GTK+ on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1677/">Bug #1677</a>.
+	</li>
+	<li>
+	Reverted a fix on Qt where Qt 5.3 has returned to the behaviour of 4.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	When the mouse is on the line between margin and text changed to treat as within text.
+	This makes the PLAT_CURSES character cell platform work better.
+	</li>
+	<li>
+	Fix a crash in SciTE when the command line is just "-close:".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1675/">Bug #1675</a>.
+	</li>
+	<li>
+	Fix unexpected dialog in SciTE on Windows when the command line has a quoted filename then ends with a space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1673/">Bug #1673</a>.
+	</li>
+	<li>
+	On Windows and GTK+, use indicators for inline IME.
+	</li>
+	<li>
+	SciTE shuts down quicker when there is no user-written OnClose function and no directors are attached.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite352.zip?download">Release 3.5.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 December 2014.
+	</li>
+	<li>
+	For OS X Cocoa switch C++ runtime to libc++ to enable use of features that will never
+	be added to libstdc++ including those part of C++11.
+	Scintilla will now run only on OS X 10.7 or later and only in 64-bit mode.
+	</li>
+	<li>
+	Include support for using C++11 &lt;regex&gt; for regular expression searches.
+	Enabling this requires rebuilding Scintilla with a non-default option.
+	This is a provisional feature and may change API before being made permanent.
+	</li>
+	<li>
+	Allocate indicators used for Input Method Editors after 31 which was the previous limit of indicators to
+	ensure no clash between the use of indicators for IME and for the application.
+	</li>
+	<li>
+	ANNOTATION_INDENTED added which is similar to ANNOTATION_BOXED in terms of positioning
+	but does not show a border.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1086/">Feature #1086.</a>
+	</li>
+	<li>
+	Allow platform overrides for drawing tab arrows, wrap markers, and line markers.
+	Size of double click detection area is a variable.
+	These enable better visuals and behaviour for PLAT_CURSES as it is character cell based.
+	</li>
+	<li>
+	CoffeeScript lexer fixes "/*" to not be a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1420/">Bug #1420</a>.
+	</li>
+	<li>
+	VHDL folder fixes "block" keyword.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1664/">Bug #1664</a>.
+	</li>
+	<li>
+	Prevent caret blinking when holding down Delete key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1657/">Bug #1657</a>.
+	</li>
+	<li>
+	On Windows, allow right click selection in popup menu.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1080/">Feature #1080.</a>
+	</li>
+	<li>
+	On Windows, only call ShowCaret in GDI mode as it interferes with caret drawing when using Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1643/">Bug #1643</a>.
+	</li>
+	<li>
+	On Windows, another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITEDC added
+	which may avoid drawing failures in some circumstances by drawing into a GDI DC.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows, avoid processing mouse move events where the mouse has not moved as these can
+	cause unexpected dwell start notifications.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1670/">Bug #1670</a>.
+	</li>
+	<li>
+	For GTK+ on Windows, avoid extra space when pasting from external application.
+	</li>
+	<li>
+	On GTK+ 2.x allow Scintilla to be used inside tool tips by changing when preedit window created.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1662/">Bug #1662</a>.
+	</li>
+	<li>
+	Support MinGW compilation under Linux.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1077/">Feature #1077.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 September 2014.
+	</li>
+	<li>
+	BibTeX lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1071/">Feature #1071.</a>
+	</li>
+	<li>
+	SQL lexer supports the q-quote operator as SCE_SQL_QOPERATOR(24).
+	</li>
+	<li>
+	VHDL lexer supports block comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1527/">Bug #1527</a>.
+	</li>
+	<li>
+	VHDL folder fixes case where "component" used before name.
+	<a href="https://sourceforge.net/p/scintilla/bugs/613/">Bug #613</a>.
+	</li>
+	<li>
+	Restore fractional pixel tab positioning which was truncated to whole pixels in 3.5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1652/">Bug #1652</a>.
+	</li>
+	<li>
+	Allow choice between windowed and inline IME on some platforms.
+	</li>
+	<li>
+	On GTK+ cache autocomplete window to avoid platform bug where windows
+	were sometimes lost.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1649/">Bug #1649</a>.
+	</li>
+	<li>
+	On GTK+ size autocomplete window more accurately.
+	</li>
+	<li>
+	On Windows only unregister windows classes registered.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1639/">Bug #1639</a>.
+	</li>
+	<li>
+	On Windows another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITERETAIN added
+	which may avoid drawing failures on some cards and drivers.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows support the Visual Studio 2010+ clipboard format that indicates a line copy.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1636/">Bug #1636</a>.
+	</li>
+	<li>
+	SciTE session files remember the scroll position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite350.zip?download">Release 3.5.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 August 2014.
+	</li>
+	<li>
+	Text may share space vertically so that extreme ascenders and descenders are
+	not cut off by calling SCI_SETPHASESDRAW(SC_PHASES_MULTIPLE).
+	</li>
+	<li>
+	Separate timers are used for each type of periodic activity and they are turned on and off
+	as required. This saves power as there are fewer wake ups.
+	On recent releases of OS X Cocoa and Windows, coalescing timers are used to further
+	save power.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1086/">Bug #1086</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1532/">Bug #1532</a>.
+	</li>
+	<li>
+	Explicit tab stops may be set for each line.
+	</li>
+	<li>
+	On Windows and GTK+, when using Korean input methods, IME composition is moved from a
+	separate window into the Scintilla window.
+	</li>
+	<li>
+	SciTE adds a "Clean" command to the "Tools" menu which is meant to be bound to a command like
+	"make clean".
+	</li>
+	<li>
+	Lexer added for Windows registry files.
+	</li>
+	<li>
+	HTML lexer fixes a crash with SGML after a Mako comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1622/">Bug #1622</a>.
+	</li>
+	<li>
+	KiXtart lexer adds a block comment state.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1053/">Feature #1053.</a>
+	</li>
+	<li>
+	Matlab lexer fixes transpose operations like "X{1}'".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1629/">Bug #1629</a>.
+	</li>
+	<li>
+	Ruby lexer fixes bugs with the syntax of symbols including allowing a symbol to end with '?'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1627/">Bug #1627</a>.
+	</li>
+	<li>
+	Rust lexer supports byte string literals, naked CR can be escaped in strings, and files starting with
+	"#![" are not treated as starting with a hashbang comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1063/">Feature #1063.</a>
+	</li>
+	<li>
+	Bug fixed where style data was stale when deleting a rectangular selection.
+	</li>
+	<li>
+	Bug fixed where annotations disappeared when SCI_CLEARDOCUMENTSTYLE called.
+	</li>
+	<li>
+	Bug fixed where selection not redrawn after SCI_DELWORDRIGHT.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1633/">Bug #1633</a>.
+	</li>
+	<li>
+	Change the function prototypes to be complete for functions exported as "C".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1618/">Bug #1618</a>.
+	</li>
+	<li>
+	Fix a memory leak on GTK+ with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1638/">Bug #1638</a>.
+	</li>
+	<li>
+	On GTK+, use the full character width for the overstrike caret for multibyte characters.
+	</li>
+	<li>
+	On Qt, set list icon size to largest icon. Add padding on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1634/">Bug #1634</a>.
+	</li>
+	<li>
+	On Qt, fix building on FreeBSD 9.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1635/">Bug #1635</a>.
+	</li>
+	<li>
+	On Qt, add a get_character method on the document.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1064/">Feature #1064.</a>
+	</li>
+	<li>
+	On Qt, add SCI_* for methods to ScintillaConstants.py.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1065/">Feature #1065.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed with Insert Abbreviation command.
+	</li>
+	<li>
+	For SciTE with read-only files and are.you.sure=0 reenable choice to save to another
+	location when using Save or Close commands.
+	</li>
+	<li>
+	Fix SciTE bug where toggle bookmark did not work after multiple lines with bookmarks merged.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1617/">Bug #1617</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite344.zip?download">Release 3.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 July 2014.
+	</li>
+	<li>
+	Style byte indicators removed. They were deprecated in 2007. Standard indicators should be used instead.
+	Some elements used by lexers no longer take number of bits or mask arguments so lexers may need to be
+	updated for LexAccessor::StartAt,  LexAccessor::SetFlags (removed),  LexerModule::LexerModule.
+	</li>
+	<li>
+	When multiple selections are active, autocompletion text may be inserted at each selection with new
+	SCI_AUTOCSETMULTI method.
+	</li>
+	<li>
+	C++ lexer fixes crash for "#define x(".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1614/">Bug #1614</a>.
+	</li>
+	<li>
+	C++ lexer fixes raw string recognition so that R"xxx(blah)xxx" is styled as SCE_C_STRINGRAW.
+	</li>
+	<li>
+	The Postscript lexer no longer marks token edges with indicators as this used style byte indicators.
+	</li>
+	<li>
+	The Scriptol lexer no longer displays indicators for poor indentation as this used style byte indicators.
+	</li>
+	<li>
+	TCL lexer fixes names of keyword sets.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1615/">Bug #1615</a>.
+	</li>
+	<li>
+	Shell lexer fixes fold matching problem caused by "&lt;&lt;&lt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1605/">Bug #1605</a>.
+	</li>
+	<li>
+	Fix bug where indicators were not removed when fold highlighting on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1604/">Bug #1604</a>.
+	</li>
+	<li>
+	Fix bug on Cocoa where emoji were treated as being zero width.
+	</li>
+	<li>
+	Fix crash on GTK+ with Ubuntu 12.04 and overlay scroll bars.
+	</li>
+	<li>
+	Avoid creating a Cairo context when measuring text on GTK+ as future versions of GTK+
+	may prohibit calling gdk_cairo_create except inside drawing handlers. This prohibition may
+	be required on Wayland.
+	</li>
+	<li>
+	On Cocoa, the registerNotifyCallback method is now marked as deprecated so client code that
+	uses it will display an error message.
+	Client code should use the delegate mechanism or subclassing instead.
+	The method will be removed in the next version.
+	</li>
+	<li>
+	On Cocoa, package Scintilla more in compliance with platform conventions.
+	Only publish public headers in the framework headers directory.
+	Only define the Scintilla namespace in Scintilla.h when compiling as C++.
+	Use the Cocoa NS_ENUM and NS_OPTIONS macros for exposed enumerations.
+	Hide internal methods from public headers.
+	These changes are aimed towards publishing Scintilla as a module which will allow it to
+	be used from the Swift programming language, although more changes will be needed here.
+	</li>
+	<li>
+	Fix crash in SciTE when stream comment performed at line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1610/">Bug #1610</a>.
+	</li>
+	<li>
+	For SciTE on Windows, display error message when common dialogs fail.
+	<a href="https://sourceforge.net/p/scintilla/bugs/156/">Bug #156</a>.
+	</li>
+	<li>
+	For SciTE on GTK+ fix bug with initialization of toggle buttons in find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1612/">Bug #1612</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 May 2014.
+	</li>
+	<li>
+	Fix hangs and crashes in DLL at shutdown on Windows when using Direct2D.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite342.zip?download">Release 3.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2014.
+	</li>
+	<li>
+	Insertions can be filtered or modified by calling SCI_CHANGEINSERTION inside a handler for
+	SC_MOD_INSERTCHECK.
+	</li>
+	<li>
+	DMIS lexer added. DMIS is a language for coordinate measuring machines.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1049/">Feature #1049.</a>
+	</li>
+	<li>
+	Line state may be displayed in the line number margin to aid in debugging lexing and folding with
+	SC_FOLDFLAG_LINESTATE (128).
+	</li>
+	<li>
+	C++ lexer understands more preprocessor statements. #if defined SYMBOL is understood.
+	Some macros with arguments can be understood and these may be predefined in keyword set 4
+	(keywords5 for SciTE)
+	with syntax similar to CHECKVERSION(x)=(x&lt;3).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1051/">Feature #1051.</a>
+	</li>
+	<li>
+	C++ lexer can highlight task marker keywords in comments as SCE_C_TASKMARKER.
+	</li>
+	<li>
+	C++ lexer can optionally highlight escape sequences in strings as SCE_C_ESCAPESEQUENCE.
+	</li>
+	<li>
+	C++ lexer supports Go back quoted raw string literals with lexer.cpp.backquoted.strings option.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1047/">Feature #1047.</a>
+	</li>
+	<li>
+	SciTE performs word and search match highlighting as an idle task to improve interactivity
+	and allow use of these features on large files.
+	</li>
+	<li>
+	Bug fixed on Cocoa where previous caret lines were visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1593/">Bug #1593</a>.
+	</li>
+	<li>
+	Bug fixed where caret remained invisible when period set to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1592/">Bug #1592</a>.
+	</li>
+	<li>
+	Fixed display flashing when scrolling with GTK+ 3.10.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1567/">Bug #1567</a>.
+	</li>
+	<li>
+	Fixed calls and constants deprecated in GTK+ 3.10.
+	</li>
+	<li>
+	Fixed bug on Windows where WM_GETTEXT did not provide data in UTF-16 for Unicode window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/685/">Bug #685</a>.
+	</li>
+	<li>
+	For SciTE, protect access to variables used by threads with a mutex to prevent data races.
+	</li>
+	<li>
+	For SciTE on GTK+ fix thread object leaks.
+	Display the version of GTK+ compiled against in the about box.
+	</li>
+	<li>
+	For SciTE on GTK+ 3.10, fix the size of the tab bar's content and use
+	freedesktop.org standard icon names where possible.
+	</li>
+	<li>
+	For SciTE on Windows, fix bug where invoking help resubmitted the
+	running program.
+	<a href="https://sourceforge.net/p/scintilla/bugs/272/">Bug #272</a>.
+	</li>
+	<li>
+	SciTE's highlight current word feature no longer matches the selection when it contains space.
+	</li>
+	<li>
+	For building SciTE in Visual C++, the win\SciTE.vcxproj project file should be used.
+	The boundscheck directory and its project and solution files have been removed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite341.zip?download">Release 3.4.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 April 2014.
+	</li>
+	<li>
+	Display Unicode line ends as [LS], [PS], and [NEL] blobs.
+	</li>
+	<li>
+	Bug fixed where cursor down failed on wrapped lines.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1585/">Bug #1585</a>.
+	</li>
+	<li>
+	Caret positioning changed a little to appear inside characters less often by
+	rounding the caret position to the pixel grid instead of truncating.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1588/">Bug #1588</a>.
+	</li>
+	<li>
+	Bug fixed where automatic indentation wrong when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1586/">Bug #1586</a>.
+	</li>
+	<li>
+	Bug fixed on Windows where WM_LBUTTONDBLCLK was no longer sent to window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1587/">Bug #1587</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE on Windows XP where black stripes appeared inside the find and
+	replace strips.
+	</li>
+	<li>
+	Crash fixed in SciTE with recursive properties files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1507/">Bug #1507</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE where Ctrl+E before an unmatched end brace jumps to file start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/315/">Bug #315</a>.
+	</li>
+	<li>
+	Fixed scrolling on Cocoa to avoid display glitches and be smoother.
+	</li>
+	<li>
+	Fixed crash on Cocoa when character composition used when autocompletion list active.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite340.zip?download">Release 3.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 March 2014.
+	</li>
+	<li>
+	The Unicode line ends and substyles features added as provisional in 3.2.5 are now finalized.
+	There are now no provisional features.
+	</li>
+	<li>
+	Added wrap mode SC_WRAP_WHITESPACE which only wraps on whitespace, not on style changes.
+	</li>
+	<li>
+	SciTE find and replace strips can perform incremental searching and temporary highlighting of all
+	matches with the find.strip.incremental, replace.strip.incremental, and find.indicator.incremental settings.
+	</li>
+	<li>
+	SciTE default settings changed to use strips for find and replace and to draw with Direct2D and
+	DirectWrite on Windows.
+	</li>
+	<li>
+	SciTE on Windows scales image buttons on the find and replace strips to match the current system scale factor.
+	</li>
+	<li>
+	Additional assembler lexer variant As(SCLEX_AS) for Unix assembly code which uses '#' for comments and
+	';' to separate statements.
+	</li>
+	<li>
+	Fix Coffeescript lexer for keyword style extending past end of word.
+	Also fixes styling 0...myArray.length all as a number.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1583/">Bug #1583</a>.
+	</li>
+	<li>
+	Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs.
+	</li>
+	<li>
+	Deleting a whole line deletes the annotations on that line instead of the annotations on the next line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1577/">Bug #1577</a>.
+	</li>
+	<li>
+	Changed position of tall calltips to prefer lower half of screen to cut off end instead of start.
+	</li>
+	<li>
+	Fix Qt bug where double click treated as triple click.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	On Qt, selecting an item in an autocompletion list that is not currently visible positions it at the top.
+	</li>
+	<li>
+	Fix bug on Windows when resizing autocompletion list with only short strings caused the list to move.
+	</li>
+	<li>
+	On Cocoa reduce scrollable height by one line to fix bugs with moving caret
+	up or down.
+	</li>
+	<li>
+	On Cocoa fix calltips which did not appear when they were created in an off-screen position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite339.zip?download">Release 3.3.9</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 January 2014.
+	</li>
+	<li>
+	Fix 3.3.8 bug where external lexers became inaccessible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1574/">Bug #1574</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite338.zip?download">Release 3.3.8</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2014.
+	</li>
+	<li>
+	DropSelectionN API added to drop a selection from a multiple selection.
+	</li>
+	<li>
+	CallTipSetPosStart API added to change the position at which backspacing removes the calltip.
+	</li>
+	<li>
+	SC_MARK_BOOKMARK marker symbol added which looks like bookmark ribbons used in
+	book reading applications.
+	</li>
+	<li>
+	Basic lexer highlights hex, octal, and binary numbers in FreeBASIC which use the prefixes
+	&amp;h, &amp;o and &amp;b respectively.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1041/">Feature #1041.</a>
+	</li>
+	<li>
+	C++ lexer fixes bug where keyword followed immediately by quoted string continued
+	keyword style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1564/">Bug #1564</a>.
+	</li>
+	<li>
+	Matlab lexer treats '!' differently for Matlab and Octave languages.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1571/">Bug #1571</a>.
+	</li>
+	<li>
+	Rust lexer improved with nested comments, more compliant doc-comment detection,
+	octal literals, NUL characters treated as valid, and highlighting of raw string literals and float literals fixed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1038/">Feature #1038.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1570/">Bug #1570</a>.
+	</li>
+	<li>
+	On Qt expose the EOLMode on the document object.
+	</li>
+	<li>
+	Fix hotspot clicking where area was off by half a character width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1562/">Bug #1562</a>.
+	</li>
+	<li>
+	Tweaked scroll positioning by either 2 pixels or 1 pixel when caret is at left or right of view
+	to ensure caret is inside visible area.
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for Shift+Tab inside text.
+	</li>
+	<li>
+	On Windows update the system caret position when scrolling to help screen readers
+	see the scroll quickly.
+	</li>
+	<li>
+	On Cocoa, GTK+, and Windows/Direct2D draw circles more accurately so that
+	circular folding margin markers appear circular, of consistent size, and centred.
+	Make SC_MARK_ARROWS drawing more even.
+	Fix corners of SC_MARK_ROUNDRECT with Direct2D to be similar to other platforms.
+	</li>
+	<li>
+	SciTE uses a bookmark ribbon symbol for bookmarks as it scales better to higher resolutions
+	than the previous blue gem bitmap.
+	</li>
+	<li>
+	SciTE will change the width of margins while running when the margin.width and fold.margin.width
+	properties are changed.
+	</li>
+	<li>
+	SciTE on Windows can display a larger tool bar with the toolbar.large property.
+	</li>
+	<li>
+	SciTE displays a warning message when asked to open a directory.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1568/">Bug #1568</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 December 2013.
+	</li>
+	<li>
+	Lexer added for DMAP language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1026/">Feature #1026.</a>
+	</li>
+	<li>
+	Basic lexer supports multiline comments in FreeBASIC.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1023/">Feature #1023.</a>
+	</li>
+	<li>
+	Bash lexer allows '#' inside words..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1553/">Bug #1553</a>.
+	</li>
+	<li>
+	C++ lexer recognizes C++11 user-defined literals and applies lexical class SCE_C_USERLITERAL.
+	</li>
+	<li>
+	C++ lexer allows single quote characters as digit separators in numeric literals like 123'456 as this is
+	included in C++14.
+	</li>
+	<li>
+	C++ lexer fixes bug with #include statements without " or &gt; terminating filename.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>.
+	</li>
+	<li>
+	C++ lexer fixes split of Doxygen keywords @code{.fileExtension} and @param[in,out].
+	<a href="https://sourceforge.net/p/scintilla/bugs/1551/">Bug #1551</a>.
+	</li>
+	<li>
+	C++ lexer styles Doxygen keywords at end of document.
+	</li>
+	<li>
+	Cmake lexer fixes bug with empty comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1550/">Bug #1550</a>.
+	</li>
+	<li>
+	Fortran folder improved. Treats "else" as fold header.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/962/">Feature #962.</a>
+	</li>
+	<li>
+	Fix bug with adjacent instances of the same indicator with different values where only the first was drawn.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1560/">Bug #1560</a>.
+	</li>
+	<li>
+	For DirectWrite, use the GDI ClearType gamma value for SC_EFF_QUALITY_LCD_OPTIMIZED as
+	this results in text that is similar in colour intensity to GDI.
+	For the duller default DirectWrite ClearType text appearance, use SC_EFF_QUALITY_DEFAULT.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/887/">Feature #887.</a>
+	</li>
+	<li>
+	Fix another problem with drawing on Windows with Direct2D when returning from lock screen.
+	The whole window is redrawn as just redrawing the initially required area left other areas black.
+	</li>
+	<li>
+	When scroll width is tracked, take width of annotation lines into account.
+	</li>
+	<li>
+	For Cocoa on OS X 10.9, responsive scrolling is supported.
+	</li>
+	<li>
+	On Cocoa, apply font quality setting to line numbers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1544/">Bug #1544</a>.
+	</li>
+	<li>
+	On Cocoa, clicking in margin now sets focus.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
+	</li>
+	<li>
+	On Cocoa, correct cursor displayed in margin after showing dialog.
+	</li>
+	<li>
+	On Cocoa, multipaste mode now works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
+	</li>
+	<li>
+	On GTK+, chain up to superclass finalize so that all finalization is performed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1549/">Bug #1549</a>.
+	</li>
+	<li>
+	On GTK+, fix horizontal scroll bar range to not be double the needed width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1546/">Bug #1546</a>.
+	</li>
+	<li>
+	On OS X GTK+, report control key as SCI_META for mouse down events.
+	</li>
+	<li>
+	On Qt, bug fixed with drawing of scrollbars, where previous contents were not drawn over with some
+	themes.
+	</li>
+	<li>
+	On Qt, bug fixed with finding monitor rectangle which could lead to autocomplete showing at wrong location.
+	</li>
+	<li>
+	SciTE fix for multiple message boxes when failing to save a file with save.on.deactivate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1540/">Bug #1540</a>.
+	</li>
+	<li>
+	SciTE on GTK+ fixes SIGCHLD handling so that Lua scripts can determine the exit status of processes
+	they start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1557/">Bug #1557</a>.
+	</li>
+	<li>
+	SciTE on Windows XP fixes bad display of find and replace values when using strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 October 2013.
+	</li>
+	<li>
+	Added functions to help convert between substyles and base styles and between secondary and primary styles.
+	SCI_GETSTYLEFROMSUBSTYLE finds the base style of substyles.
+	Can be used to treat all substyles of a style equivalent to that style.
+	SCI_GETPRIMARYSTYLEFROMSTYLE finds the primary style of secondary styles.
+	StyleFromSubStyle and PrimaryStyleFromStyle methods were added to ILexerWithSubStyles so each lexer can implement these.
+	</li>
+	<li>
+	Lexer added for Rust language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1024/">Feature #1024.</a>
+	</li>
+	<li>
+	Avoid false matches in errorlist lexer which is used for the SciTE output pane
+	by stricter checking of ctags lines.
+	</li>
+	<li>
+	Perl lexer fixes bugs with multi-byte characters, including in HEREDOCs and PODs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1528/">Bug #1528</a>.
+	</li>
+	<li>
+	SQL folder folds 'create view' statements.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1020/">Feature #1020.</a>
+	</li>
+	<li>
+	Visual Prolog lexer updated with better support for string literals and Unicode.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1025/">Feature #1025.</a>
+	</li>
+	<li>
+	For SCI_SETIDENTIFIERS, \t, \r, and \n are allowed as well as space between identifiers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1521/">Bug #1521</a>.
+	</li>
+	<li>
+	Gaining and losing focus is now reported as a notification with the code set to SCN_FOCUSIN
+	or SCN_FOCUSOUT.
+	This allows clients to uniformly use notifications instead of commands.
+	Since there is no longer a need for commands they will be deprecated in a future version.
+	Clients should switch any code that currently uses SCEN_SETFOCUS or SCEN_KILLFOCUS.
+	</li>
+	<li>
+	On Cocoa, clients should use the delegate mechanism or subclass ScintillaView in preference
+	to registerNotifyCallback: which will be deprecated in the future.
+	</li>
+	<li>
+	On Cocoa, the ScintillaView.h header hides internal implementation details from Platform.h and ScintillaCocoa.h.
+	InnerView was renamed to SCIContentView and MarginView was renamed to SCIMarginView.
+	dealloc removed from @interface.
+	</li>
+	<li>
+	On Cocoa, clients may customize SCIContentView by subclassing both SCIContentView and ScintillaView
+	and implementing the contentViewClass class method on the ScintillaView subclass to return the class of
+	the SCIContentView subclass.
+	</li>
+	<li>
+	On Cocoa, fixed appearance of alpha rectangles to use specified alpha and colour for outline as well as corner size.
+	This makes INDIC_STRAIGHTBOX and INDIC_ROUNDBOX look correct.
+	</li>
+	<li>
+	On Cocoa, memory leak fixed for MarginView.
+	</li>
+	<li>
+	On Cocoa, make drag and drop work when destination view is empty.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1534/">Bug #1534</a>.
+	</li>
+	<li>
+	On Cocoa, drag image fixed when view scrolled.
+	</li>
+	<li>
+	On Cocoa, SCI_POSITIONFROMPOINTCLOSE fixed when view scrolled.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1021/">Feature #1021.</a>
+	</li>
+	<li>
+	On Cocoa, don't send selection change notification when scrolling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1522/">Bug #1522</a>.
+	</li>
+	<li>
+	On Qt, turn off idle events on destruction to prevent repeatedly calling idle.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit changed to use signed first parameter.
+	</li>
+	<li>
+	Compilation errors fixed on Windows and GTK+ with SCI_NAMESPACE.
+	</li>
+	<li>
+	On Windows, building with gcc will check if Direct2D headers are available and enable Direct2D if they are.
+	</li>
+	<li>
+	Avoid attempts to redraw empty areas when lexing beyond the currently visible lines.
+	</li>
+	<li>
+	Control more attributes of indicators in SciTE with find.mark.indicator and highlight.current.word.indicator
+	properties.
+	</li>
+	<li>
+	Fix SciTE bug with buffers becoming read-only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1525/">Bug #1525</a>.
+	</li>
+	<li>
+	Fix linking SciTE on non-Linux Unix systems with GNU toolchain by linking to libdl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1523/">Bug #1523</a>.
+	</li>
+	<li>
+	On Windows, SciTE's Incremental Search displays match failures by changing the background colour
+	instead of not adding the character that caused failure.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.x incremental search to change foreground colour when no match as
+	changing background colour is difficult.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite335.zip?download">Release 3.3.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2013.
+	</li>
+	<li>
+	Characters may be represented by strings.
+	In Unicode mode C1 control characters are represented by their mnemonics.
+	</li>
+	<li>
+	Added SCI_POSITIONRELATIVE to optimize navigation by character.
+	</li>
+	<li>
+	Option to allow mouse selection to switch to rectangular by pressing Alt after start of gesture.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Lexer added for KVIrc script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1008/">Feature #1008.</a>
+	</li>
+	<li>
+	Bash lexer fixed quoted HereDoc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1500/">Bug #1500</a>.
+	</li>
+	<li>
+	MS SQL lexer fixed ';' to appear as an operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1509/">Bug #1509</a>.
+	</li>
+	<li>
+	Structured Text lexer fixed styling of enumeration members.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1508/">Bug #1508</a>.
+	</li>
+	<li>
+	Fixed bug with horizontal caret position when margin changed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1512/">Bug #1512</a>.
+	</li>
+	<li>
+	Fixed bug on Cocoa where coordinates were relative to text subview instead of whole view.
+	</li>
+	<li>
+	Ensure selection redrawn correctly in two cases.
+	When switching from stream to rectangular selection with Alt+Shift+Up.
+	When reducing the range of an additional selection by moving mouse up.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Copy and paste of rectangular selections compatible with Borland Delphi IDE on Windows.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1002/">Feature #1002.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1513/">Bug #1513</a>.
+	</li>
+	<li>
+	Initialize extended styles to the default style.
+	</li>
+	<li>
+	On Windows, fix painting on an explicit HDC when first paint attempt abandoned.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit made to work on 64-bit Unix systems.
+	</li>
+	<li>
+	Easier access to printing on Qt with formatRange method.
+	</li>
+	<li>
+	Fixed SciTE failure to save initial buffer in single buffer mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339</a>.
+	</li>
+	<li>
+	Fixed compilation problem with Visual C++ in non-English locales.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1506/">Bug #1506</a>.
+	</li>
+	<li>
+	Disable Direct2D when compiling with MinGW gcc on Windows because of changes in the recent MinGW release.
+	</li>
+	<li>
+	SciTE crash fixed for negative line.margin.width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1504/">Bug #1504</a>.
+	</li>
+	<li>
+	SciTE fix for infinite dialog boxes when failing to automatically save a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1503/">Bug #1503</a>.
+	</li>
+	<li>
+	SciTE settings buffered.draw, two.phase.draw, and technology are applied to the
+	output pane as well as the edit pane.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite334.zip?download">Release 3.3.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 July 2013.
+	</li>
+	<li>
+	Handling of UTF-8 and DBCS text in lexers improved with methods ForwardBytes and
+	GetRelativeCharacter added to StyleContext.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	For Unicode text, case-insensitive searching and making text upper or lower case is now
+	compliant with Unicode standards on all platforms and is much faster for non-ASCII characters.
+	</li>
+	<li>
+	A CategoriseCharacter function was added to return the Unicode general category of a character
+	which can be useful in lexers.
+	</li>
+	<li>
+	On Cocoa, the LCD Optimized font quality level turns font smoothing on.
+	</li>
+	<li>
+	SciTE 'immediate' subsystem added to allow scripts that work while tools are executed.
+	</li>
+	<li>
+	Font quality exposed in SciTE as font.quality setting.
+	</li>
+	<li>
+	On Cocoa, message:... methods simplify direct access to Scintilla and avoid call layers..
+	</li>
+	<li>
+	A68K lexer updated.
+	</li>
+	<li>
+	CoffeeScript lexer fixes a bug with comment blocks.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1495/">Bug #1495</a>
+	</li>
+	<li>
+	ECL lexer regular expression code fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1491/">Bug #1491</a>.
+	</li>
+	<li>
+	errorlist lexer only recognizes Perl diagnostics when there is a filename between
+	"at" and "line". Had been triggering for MSVC errors containing "at line".
+	</li>
+	<li>
+	Haskell lexer fixed to avoid unnecessary full redraws.
+	Don't highlight CPP inside comments when styling.within.preprocessor is on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459</a>.
+	</li>
+	<li>
+	Lua lexer fixes bug in labels with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Perl lexer fixes bug in string interpolation with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Fixed bugs with case conversion when the result was longer or shorter than the original text.
+	Could access past end of string potentially crashing.
+	Selection now updated to result length.
+	</li>
+	<li>
+	Fixed bug where data being inserted and removed was not being reported in
+	notification messages. Bug was introduced in 3.3.2.
+	</li>
+	<li>
+	Word wrap bug fixed where the last line could be shown twice.
+	</li>
+	<li>
+	Word wrap bug fixed for lines wrapping too short on Windows and GTK+.
+	</li>
+	<li>
+	Word wrap performance improved.
+	</li>
+	<li>
+	Minor memory leak fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1487/">Bug #1487</a>.
+	</li>
+	<li>
+	On Cocoa, fixed insertText: method which was broken when implementing a newer protocol.
+	</li>
+	<li>
+	On Cocoa, fixed a crash when performing string folding for bytes that do not represent a character
+	in the current encoding.
+	</li>
+	<li>
+	On Qt, fixed layout problem when QApplication construction delayed.
+	</li>
+	<li>
+	On Qt, find_text reports failure with -1 as first element of return value.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where a tool command could be performed using the keyboard while one was
+	already running leading to confusion and crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1486/">Bug #1486</a>.
+	</li>
+	<li>
+	Fixed SciTE bug in Copy as RTF which was limited to first 32 styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1011/">Bug #1011</a>.
+	</li>
+	<li>
+	Fixed SciTE on Windows user strip height when the system text scaling factor is 125% or 150%.
+	</li>
+	<li>
+	Compile time checks for Digital Mars C++ removed.
+	</li>
+	<li>
+	Visual C++ 2013 supported.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1492/">Bug #1492</a>.
+	</li>
+	<li>
+	Python scripts used for building and maintenance improved and moved into scripts directory.
+	</li>
+	<li>
+	Testing scripts now work on Linux using Qt and PySide.
+	</li>
+	<li>
+	Tk platform defined.
+	Implementation for Tk will be available separately from main Scintilla distribution.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite333.zip?download">Release 3.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2013.
+	</li>
+	<li>
+	Lexer and folder added for Structured Text language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/959/">Feature #959.</a>
+	</li>
+	<li>
+	Out of bounds access fixed for GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1480/">Bug #1480</a>.
+	</li>
+	<li>
+	Crash fixed for GTK+ on Windows paste.
+	</li>
+	<li>
+	Bug fixed with incorrect event copying on GTK+ 3.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1481/">Bug #1481</a>.
+	</li>
+	<li>
+	Bug fixed with right to left locales, like Hebrew, on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1477/">Bug #1477</a>.
+	</li>
+	<li>
+	Bug fixed with undo grouping of tab and backtab commands.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1478/">Bug #1478</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite332.zip?download">Release 3.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2013.
+	</li>
+	<li>
+	Basic implementations of common folding methods added to Scintilla to make it
+	easier for containers to implement folding.
+	</li>
+	<li>
+	Add indicator INDIC_COMPOSITIONTHICK, a thick low underline, to mimic an
+	appearance used for Asian language input composition.
+	</li>
+	<li>
+	On Cocoa, implement font quality setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/988/">Feature #988.</a>
+	</li>
+	<li>
+	On Cocoa, implement automatic enabling of commands and added clear command.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/987/">Feature #987.</a>
+	</li>
+	<li>
+	C++ lexer adds style for preprocessor doc comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/990/">Feature #990.</a>
+	</li>
+	<li>
+	Haskell lexer and folder improved. Separate mode for literate Haskell "literatehaskell" SCLEX_LITERATEHASKELL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459 </a>.
+	</li>
+	<li>
+	LaTeX lexer bug fixed for Unicode character following '\'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1468/">Bug #1468 </a>.
+	</li>
+	<li>
+	PowerShell lexer recognizes here strings and doccomment keywords.
+	#region folding added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/985/">Feature #985.</a>
+	</li>
+	<li>
+	Fix multi-typing when two carets are located in virtual space on one line so that spaces
+	are preserved.
+	</li>
+	<li>
+	Fixes to input composition on Cocoa and implementation of accented character input through
+	press and hold. Set selection correctly so that changes to pieces of composition text are easier to perform.
+	Restore undo collection after a sequence of composition actions.
+	Composition popups appear near input.
+	</li>
+	<li>
+	Fix lexer problem where no line end was seen at end of document.
+	</li>
+	<li>
+	Fix crash on Cocoa when view deallocated.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1466/">Bug #1466</a>.
+	</li>
+	<li>
+	Fix Qt window positioning to not assume the top right of a monitor is at 0, 0.
+	</li>
+	<li>
+	Fix Qt to not track mouse when widget is hidden.
+	</li>
+	<li>
+	Qt now supports Qt 5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1448/">Bug #1448</a>.
+	</li>
+	<li>
+	Fix drawing on Windows with Direct2D when returning from lock screen.
+	The render target had to be recreated and an area would be black since the drawing was not retried.
+	</li>
+	<li>
+	Fix display of DBCS documents on Windows Direct2D/DirectWrite with default character set.
+	</li>
+	<li>
+	For SciTE on Windows, fixed most-recently-used menu when files opened through check.if.already.opened.
+	</li>
+	<li>
+	In SciTE, do not call OnSave twice when files saved asynchronously.
+	</li>
+	<li>
+	Scintilla no longer builds with Visual C++ 6.0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite331.zip?download">Release 3.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 April 2013.
+	</li>
+	<li>
+	Autocompletion lists can now appear in priority order or be sorted by Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/981/">Feature #981.</a>
+	</li>
+	<li>
+	Most lexers now lex an extra NUL byte at the end of the
+	document which makes it more likely they will classify keywords at document end correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/588/">Bug #588.</a>
+	</li>
+	<li>
+	Haskell lexer improved in several ways.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459.</a>
+	</li>
+	<li>
+	Matlab/Octave lexer recognizes block comments and ... comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1414/">Bug #1414.</a>
+	</li>
+	<li>
+	Ruby lexer crash fixed with keyword at start of document.
+	</li>
+	<li>
+	The PLAT_NCURSES platform now called PLAT_CURSES as may work on other implementations.
+	</li>
+	<li>
+	Bug on Cocoa fixed where input composition with multiple selection or virtual space selection
+	could make undo stop working.
+	</li>
+	<li>
+	Direct2D/DirectWrite mode on Windows now displays documents in non-Latin1 8-bit encodings correctly.
+	</li>
+	<li>
+	Character positioning corrected in Direct2D/DirectWrite mode on Windows to avoid text moving and cutting off
+	lower parts of characters.
+	</li>
+	<li>
+	Position of calltip and autocompletion lists fixed on Cocoa.
+	</li>
+	<li>
+	While regular expression search in DBCS text is still not working, matching partial characters is now avoided
+	by moving end of match to end of character.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite330.zip?download">Release 3.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 March 2013.
+	</li>
+	<li>
+	Overlay scrollers and kinetic scrolling implemented on Cocoa.
+	</li>
+	<li>
+	To improve display smoothness, styling and UI Update notifications will, when possible, be performed in
+	a high-priority idle task on Cocoa instead of during painting.
+	Performing these jobs inside painting can cause paints to be abandoned and a new paint scheduled.
+	On GTK+, the high-priority idle task is used in more cases.
+	</li>
+	<li>
+	SCI_SCROLLRANGE added to scroll the view to display a range of text.
+	If the whole range can not be displayed, priority is given to one end.
+	</li>
+	<li>
+	C++ lexer no longer recognizes raw (R"") strings when the first character after "
+	is invalid.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1454/">Bug #1454.</a>
+	</li>
+	<li>
+	HTML lexer recognizes JavaScript RegEx literals in more contexts.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1412/">Bug #1412.</a>
+	</li>
+	<li>
+	Fixed automatic display of folded text when return pressed at end of fold header and
+	first folded line was blank.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1455/">Bug #1455.</a>
+	</li>
+	<li>
+	SCI_VISIBLEFROMDOCLINE fixed to never return a line beyond the document end.
+	</li>
+	<li>
+	SCI_LINESCROLL fixed for a negative column offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1450/">Bug #1450.</a>
+	</li>
+	<li>
+	On GTK+, fix tab markers so visible if indent markers are visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1453/">Bug #1453.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite325.zip?download">Release 3.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 February 2013.
+	</li>
+	<li>
+	To allow cooperation between different uses of extended (beyond 255) styles they should be allocated
+	using SCI_ALLOCATEEXTENDEDSTYLES.
+	</li>
+	<li>
+	For Unicode documents, lexers that use StyleContext will retrieve whole characters
+	instead of bytes.
+	LexAccessor provides a LineEnd method which can be a more efficient way to
+	handle line ends and can enable Unicode line ends.
+	</li>
+	<li>
+	The C++ lexer understands the #undef directive when determining preprocessor definitions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/978/">Feature #978.</a>
+	</li>
+	<li>
+	The errorlist lexer recognizes gcc include path diagnostics that appear before an error.
+	</li>
+	<li>
+	Folding implemented for GetText (PO)  translation language.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1437/">Bug #1437.</a>
+	</li>
+	<li>
+	HTML lexer does not interrupt comment style for processing instructions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1447/">Bug #1447.</a>
+	</li>
+	<li>
+	Fix SciTE forgetting caret x-position when switching documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1442/">Bug #1442.</a>
+	</li>
+	<li>
+	Fixed bug where vertical scrollbar thumb appeared at beginning of document when
+	scrollbar shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1446/">Bug #1446.</a>
+	</li>
+	<li>
+	Fixed brace-highlighting bug on OS X 10.8 where matching brace is on a different line.
+	</li>
+	<li>
+	<a href="ScintillaDoc.html#ProvisionalMessages">Provisional features</a>
+	are new features that may change or be removed if they cause problems but should become
+	permanent if they work well.
+	For this release <a href="ScintillaDoc.html#SCI_GETLINEENDTYPESSUPPORTED">Unicode line ends</a> and
+	<a href="ScintillaDoc.html#Substyles">substyles</a>
+	are provisional features.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite324.zip?download">Release 3.2.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 January 2013.
+	</li>
+	<li>
+	Caret line highlight can optionally remain visible when window does not have focus.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/964/">Feature #964.</a>
+	</li>
+	<li>
+	Delegate mechanism for notifications added on Cocoa.
+	</li>
+	<li>
+	NUL characters in selection are copied to clipboard as spaces to avoid truncating
+	at the NUL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1289/">Bug #1289.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with showing inactive sections when preprocessor lines contain trailing comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1413/">Bug #1413.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with JavaScript regular expressions with '/' in character ranges.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1415/">Bug #1415.</a>
+	</li>
+	<li>
+	LaTeX folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	LaTeX lexer improves styling of math environments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	MySQL lexer implements hidden commands.
+	</li>
+	<li>
+	Only produce a single undo step when autocompleting a single word.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1421/">Bug #1421.</a>
+	</li>
+	<li>
+	Fixed crash when printing lines longer than 8000 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1430/">Bug #1430.</a>
+	</li>
+	<li>
+	Fixed problem in character movement extends selection mode where reversing
+	direction collapsed the selection.
+	</li>
+	<li>
+	Memory issues fixed on Cocoa, involving object ownership,
+	lifetime of timers, and images held by the info bar.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1436/">Bug #1436.</a>
+	</li>
+	<li>
+	Cocoa key binding for Alt+Delete changed to delete previous word to be more compatible with
+	platform standards.
+	</li>
+	<li>
+	Fixed crash on Cocoa with scrollbar when there is no scrolling possible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1416/">Bug #1416.</a>
+	</li>
+	<li>
+	On Cocoa with retina display fixed positioning of autocompletion lists.
+	</li>
+	<li>
+	Fixed SciTE on Windows failure to run a batch file with a name containing a space by
+	quoting the path in the properties file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1423/">Bug #1423.</a>
+	</li>
+	<li>
+	Fixed scaling bug when printing on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1427/">Bug #1427.</a>
+	</li>
+	<li>
+	SciTE on GTK toolbar.detachable feature removed.
+	</li>
+	<li>
+	Fixed some background saving bugs in SciTE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1366/">Bug #1366.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite323.zip?download">Release 3.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 October 2012.
+	</li>
+	<li>
+	Improve speed when performing multiple searches.
+	</li>
+	<li>
+	SciTE adds definition of PLAT_UNIX for both PLAT_GTK and PLAT_MAC to allow consolidation of
+	settings valid on all Unix variants.
+	</li>
+	<li>
+	Signal autoCompleteCancelled added on Qt.
+	</li>
+	<li>
+	Bash lexer supports nested delimiter pairs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3569352&group_id=2439">Feature #3569352.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1515556&group_id=2439">Bug #1515556.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3008483&group_id=2439">Bug #3008483.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515392&group_id=2439">Bug #3515392.</a>
+	</li>
+	<li>
+	For C/C++, recognize exponent in floating point hexadecimal literals.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3576454&group_id=2439">Bug #3576454.</a>
+	</li>
+	<li>
+	For C #include statements, do not treat // in the path as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519260&group_id=2439">Bug #3519260.</a>
+	</li>
+	<li>
+	Lexer for GetText translations (PO) improved with additional styles and single instance limitation fixed.
+	</li>
+	<li>
+	Ruby for loop folding fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3240902&group_id=2439">Bug #3240902.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567391&group_id=2439">Bug #3567391.</a>
+	</li>
+	<li>
+	Ruby recognition of here-doc after class or instance variable fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567809&group_id=2439">Bug #3567809.</a>
+	</li>
+	<li>
+	SQL folding of loop and case fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567905&group_id=2439">Bug #3567905.</a>
+	</li>
+	<li>
+	SQL folding of case with assignment fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3571820&group_id=2439">Bug #3571820.</a>
+	</li>
+	<li>
+	Fix hang when removing all characters from indicator at end of document.
+	</li>
+	<li>
+	Fix failure of \xhh in regular expression search for values greater than 0x79.
+	</li>
+	<li>
+	On Cocoa on OS X 10.8, fix inverted drawing of find indicator.
+	</li>
+	<li>
+	On Cocoa, fix double drawing when horizontal scroll range small and user swipes horizontally.
+	</li>
+	<li>
+	On Cocoa, remove incorrect setting of save point when reading information through 'string' and 'selectedString'.
+	</li>
+	<li>
+	On Cocoa, fix incorrect memory management of infoBar.
+	</li>
+	<li>
+	On GTK+ 3 Ubuntu, fix crash when drawing margin.
+	</li>
+	<li>
+	On ncurses, fix excessive spacing with italics line end.
+	</li>
+	<li>
+	On Windows, search for D2D1.DLL and DWRITE.DLL in system directory to avoid loading from earlier
+	in path where could be planted by malware.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite322.zip?download">Release 3.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2012.
+	</li>
+	<li>
+	Retina display support for Cocoa. Text size fixed.
+	Scale factor for images implemented so they can be displayed in high definition.
+	</li>
+	<li>
+	Implement INDIC_SQUIGGLEPIXMAP as a faster version of INDIC_SQUIGGLE.
+	Avoid poor drawing at right of INDIC_SQUIGGLE.
+	Align INDIC_DOTBOX to pixel grid for full intensity.
+	</li>
+	<li>
+	Implement SCI_GETSELECTIONEMPTY API.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Added SCI_VCHOMEDISPLAY and SCI_VCHOMEDISPLAYEXTEND key commands.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3561433&group_id=2439">Feature #3561433.</a>
+	</li>
+	<li>
+	Allow specifying SciTE Find in Files directory with find.in.directory property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3558594&group_id=2439">Feature #3558594.</a>
+	</li>
+	<li>
+	Override SciTE global strip.trailing.spaces with strip.trailing.spaces by pattern files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3556320&group_id=2439">Feature #3556320.</a>
+	</li>
+	<li>
+	Fix long XML script tag handling in XML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3534190&group_id=2439">Bug #3534190.</a>
+	</li>
+	<li>
+	Fix rectangular selection range after backspace.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543097&group_id=2439">Bug #3543097.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for backspace in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Avoid problems when calltip highlight range is negative.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	On Cocoa, fix image drawing code so that image is not accessed after being freed
+	and is drawn in the correct location.
+	</li>
+	<li>
+	On Cocoa, limit horizontal touch scrolling to existing established width.
+	</li>
+	<li>
+	On Cocoa, decrease sensitivity of pinch-zoom.
+	</li>
+	<li>
+	Fix Cocoa drawing where style changes were not immediately visible.
+	</li>
+	<li>
+	Fix Cocoa memory leak due to reference cycle.
+	</li>
+	<li>
+	Fix Cocoa bug where notifications were sent after Scintilla was freed.
+	</li>
+	<li>
+	SciTE on OS X user shortcuts treats "Ctrl+D" as equivalent to "Ctrl+d".
+	</li>
+	<li>
+	On Windows, saving SciTE's Lua startup script causes it to run.
+	</li>
+	<li>
+	Limit time allowed to highlight current word in SciTE to 0.25 seconds to remain responsive.
+	</li>
+	<li>
+	Fixed SciTE read-only mode to stick with buffer.
+	</li>
+	<li>
+	For SciTE on Windows, enable Ctrl+Z, Ctrl+X, and Ctrl+C (Undo, Cut, and Copy) in the
+	editable fields of find and replace strips
+	</li>
+	<li>
+	Remove limit on logical line length in SciTE .properties files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3544312&group_id=2439">Bug #3544312.</a>
+	</li>
+	<li>
+	Improve performance of SciTE Save As command.
+	</li>
+	<li>
+	Fix SciTE crash with empty .properties files. Bug #3545938.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3555308&group_id=2439">Bug #3555308.</a>
+	</li>
+	<li>
+	Fix repeated letter in SciTE calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	Refine build time checking for Direct2D and DirectWrite.
+	</li>
+	<li>
+	Avoid potential build problems on Windows with MultiMon.h by explicitly checking for multi-monitor APIs.
+	</li>
+	<li>
+	Automatically disable themed drawing in SciTE when building on Windows 2000.
+	Reenable building for Windows NT 4 on NT 4 .
+	</li>
+	<li>
+	Added ncurses platform definitions. Implementation is maintained separately as
+	<a href="https://foicica.com/scinterm/">Scinterm</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite321.zip?download">Release 3.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 July 2012.
+	</li>
+	<li>
+	In Scintilla.iface, specify features as properties instead of functions where possible and fix some enumerations.
+	</li>
+	<li>
+	In SciTE Lua scripts, string properties in Scintilla API can be retrieved as well as set using property notation.
+	</li>
+	<li>
+	Added character class APIs: SCI_SETPUNCTUATIONCHARS, SCI_GETWORDCHARS, SCI_GETWHITESPACECHARS,
+	and SCI_GETPUNCTUATIONCHARS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3529805&group_id=2439">Feature #3529805.</a>
+	</li>
+	<li>
+	Less/Hss support added to CSS lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3532413&group_id=2439">Feature #3532413.</a>
+	</li>
+	<li>
+	C++ lexer style SCE_C_PREPROCESSORCOMMENT added for stream comments in preprocessor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487406&group_id=2439">Bug #3487406.</a>
+	</li>
+	<li>
+	Fix incorrect styling of inactive code in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3533036&group_id=2439">Bug #3533036.</a>
+	</li>
+	<li>
+	Fix incorrect styling by C++ lexer after empty lines in preprocessor style.
+	</li>
+	<li>
+	C++ lexer option "lexer.cpp.allow.dollars" fixed so can be turned off after being on.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3541461&group_id=2439">Bug #3541461.</a>
+	</li>
+	<li>
+	Fortran fixed format lexer fixed to style comments from column 73.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran folder folds CRITICAL .. END CRITICAL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran lexer fixes styling after comment line ending with '&amp;'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3087226&group_id=2439">Bug #3087226.</a>
+	</li>
+	<li>
+	Fortran lexer styles preprocessor lines so they do not trigger incorrect folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2906275&group_id=2439">Bug #2906275.</a>
+	</li>
+	<li>
+	Fortran folder fixes folding of nested ifs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809176&group_id=2439">Bug #2809176.</a>
+	</li>
+	<li>
+	HTML folder fixes folding of CDATA when fold.html.preprocessor=0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540491&group_id=2439">Bug #3540491.</a>
+	</li>
+	<li>
+	On Cocoa, fix autocompletion font lifetime issue and row height computation.
+	</li>
+	<li>
+	In 'choose single' mode, autocompletion will close an existing list if asked to display a single entry list.
+	</li>
+	<li>
+	Fixed SCI_MARKERDELETE to only delete one marker per call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3535806&group_id=2439">Bug #3535806.</a>
+	</li>
+	<li>
+	Properly position caret after undoing coalesced delete operations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3523326&group_id=2439">Bug #3523326.</a>
+	</li>
+	<li>
+	Ensure margin is redrawn when SCI_MARGINSETSTYLE called.
+	</li>
+	<li>
+	Fix clicks in first pixel of margins to send SCN_MARGINCLICK.
+	</li>
+	<li>
+	Fix infinite loop when drawing block caret for a zero width space character at document start.
+	</li>
+	<li>
+	Crash fixed for deleting negative range.
+	</li>
+	<li>
+	For characters that overlap the beginning of their space such as italics descenders and bold serifs, allow start
+	of text to draw 1 pixel into margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=699587&group_id=2439">Bug #699587.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537799&group_id=2439">Bug #3537799.</a>
+	</li>
+	<li>
+	Fixed problems compiling Scintilla for Qt with GCC 4.7.1 x64.
+	</li>
+	<li>
+	Fixed problem with determining GTK+ sub-platform caused when adding Qt support in 3.2.0.
+	</li>
+	<li>
+	Fix incorrect measurement of untitled file in SciTE on Linux leading to message "File ...' is 2147483647 bytes long".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537764&group_id=2439">Bug #3537764.</a>
+	</li>
+	<li>
+	In SciTE, fix open of selected filename with line number to go to that line.
+	</li>
+	<li>
+	Fix problem with last visible buffer closing in SciTE causing invisible buffers to be active.
+	</li>
+	<li>
+	Avoid blinking of SciTE's current word highlight when output pane changes.
+	</li>
+	<li>
+	SciTE properties files can be longer than 60K.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite320.zip?download">Release 3.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2012.
+	</li>
+	<li>
+	Platform layer added for the Qt open-source cross-platform application and user interface framework
+	for development in C++ or in Python with the PySide bindings for Qt.
+	</li>
+	<li>
+	Direct access provided to the document bytes for ranges within Scintilla.
+	This is similar to the existing SCI_GETCHARACTERPOINTER API but allows for better performance.
+	</li>
+	<li>
+	Ctrl+Double Click and Ctrl+Triple Click add the word or line to the set of selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3520037&group_id=2439">Feature #3520037.</a>
+	</li>
+	<li>
+	A SCI_DELETERANGE API was added for deleting a range of text.
+	</li>
+	<li>
+	Line wrap markers may now be drawn in the line number margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3518198&group_id=2439">Feature #3518198.</a>
+	</li>
+	<li>
+	SciTE on OS X adds option to hide hidden files in the open dialog box.
+	</li>
+	<li>
+	Lexer added for OScript language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523197&group_id=2439">Feature #3523197.</a>
+	</li>
+	<li>
+	Lexer added for Visual Prolog language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523018&group_id=2439">Feature #3523018.</a>
+	</li>
+	<li>
+	UTF-8 validity is checked more stringently and consistently. All 66 non-characters are now treated as invalid.
+	</li>
+	<li>
+	HTML lexer bug fixed with inconsistent highlighting for PHP when attribute on separate line from tag.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520027&group_id=2439">Bug #3520027.</a>
+	</li>
+	<li>
+	HTML lexer bug fixed for JavaScript block comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520032&group_id=2439">Bug #3520032.</a>
+	</li>
+	<li>
+	Annotation drawing bug fixed when box displayed with different colours on different lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519872&group_id=2439">Bug #3519872.</a>
+	</li>
+	<li>
+	On Windows with Direct2D, fix drawing with 125% and 150% DPI system settings.
+	</li>
+	<li>
+	Virtual space selection bug fixed for rectangular selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519246&group_id=2439">Bug #3519246.</a>
+	</li>
+	<li>
+	Replacing multiple selection with newline changed to only affect main selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522251&group_id=2439">Bug #3522251.</a>
+	</li>
+	<li>
+	Replacing selection with newline changed to group deletion and insertion as a single undo action.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522250&group_id=2439">Bug #3522250.</a>
+	</li>
+	<li>
+	Auto-completion lists on GTK+ 3 set height correctly instead of showing too few lines.
+	</li>
+	<li>
+	Mouse wheel scrolling changed to avoid GTK+ bug in recent distributions.
+	</li>
+	<li>
+	IME bug on Windows fixed for horizontal jump.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3529728&group_id=2439">Bug #3529728.</a>
+	</li>
+	<li>
+	SciTE case-insensitive autocompletion filters equal identifiers better.
+	Calltip arrows work with bare word identifiers.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3517810&group_id=2439">Bug #3517810.</a>
+	</li>
+	<li>
+	SciTE bug fixed where shbang lines not setting file type when switching
+	to file loaded in background.
+	</li>
+	<li>
+	SciTE on GTK+ shows open and save dialogs with the directory of the current file displayed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite310.zip?download">Release 3.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 April 2012.
+	</li>
+	<li>
+	Animated find indicator added on Cocoa.
+	</li>
+	<li>
+	Buttons can be made default in SciTE user strips.
+	</li>
+	<li>
+	SciTE allows find and replace histories to be saved in session.
+	</li>
+	<li>
+	Option added to allow case-insensitive selection in auto-completion lists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3516538&group_id=2439">Bug #3516538.</a>
+	</li>
+	<li>
+	Replace \0 by complete found text in regular expressions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3510979&group_id=2439">Feature #3510979.</a>
+	</li>
+	<li>
+	Fixed single quoted strings in bash lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	</li>
+	<li>
+	Incorrect highlighting fixed in C++ lexer for continued lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3509317&group_id=2439">Bug #3509317.</a>
+	</li>
+	<li>
+	Hang fixed in diff lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3508602&group_id=2439">Bug #3508602.</a>
+	</li>
+	<li>
+	Folding improved for SQL CASE/MERGE statement.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3503277&group_id=2439">Bug #3503277.</a>
+	</li>
+	<li>
+	Fix extra drawing of selection inside word wrap indentation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515555&group_id=2439">Bug #3515555.</a>
+	</li>
+	<li>
+	Fix problem with determining the last line that needs styling when drawing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix problems with drawing in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix printing crash when using Direct2D to display on-screen.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3513946&group_id=2439">Bug #3513946.</a>
+	</li>
+	<li>
+	Fix SciTE bug where background.*.size disabled restoration of bookmarks and positions from session.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514885&group_id=2439">Bug #3514885.</a>
+	</li>
+	<li>
+	Fixed the Move Selected Lines command when last line does not end with a line end character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3511023&group_id=2439">Bug #3511023.</a>
+	</li>
+	<li>
+	Fix word wrap indentation printing to use printer settings instead of screen settings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512961&group_id=2439">Bug #3512961.</a>
+	</li>
+	<li>
+	Fix SciTE bug where executing an empty command prevented executing further commands
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512976&group_id=2439">Bug #3512976.</a>
+	</li>
+	<li>
+	Fix SciTE bugs with focus in user strips and made strips more robust with invalid definitions.
+	</li>
+	<li>
+	Suppress SciTE regular expression option when searching with find next selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3510985&group_id=2439">Bug #3510985.</a>
+	</li>
+	<li>
+	SciTE Find in Files command matches empty pattern to all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495918&group_id=2439">Feature #3495918.</a>
+	</li>
+	<li>
+	Fix scroll with mouse wheel on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3501321&group_id=2439">Bug #3501321.</a>
+	</li>
+	<li>
+	Fix column finding method so that tab is counted correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3483713&group_id=2439">Bug #3483713.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite304.zip?download">Release 3.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2012.
+	</li>
+	<li>
+	SciTE scripts can create user interfaces as strips.
+	</li>
+	<li>
+	SciTE can save files automatically in the background.
+	</li>
+	<li>
+	Pinch zoom implemented on Cocoa.
+	</li>
+	<li>
+	ECL lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488209&group_id=2439">Feature #3488209.</a>
+	</li>
+	<li>
+	CPP lexer fixes styling after document comment keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495445&group_id=2439">Bug #3495445.</a>
+	</li>
+	<li>
+	Pascal folder improves handling of some constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486385&group_id=2439">Feature #3486385.</a>
+	</li>
+	<li>
+	XML lexer avoids entering a bad mode due to complex preprocessor instructions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488060&group_id=2439">Bug #3488060.</a>
+	</li>
+	<li>
+	Duplicate command is always remembered as a distinct command for undo.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495836&group_id=2439">Bug #3495836.</a>
+	</li>
+	<li>
+	SciTE xml.auto.close.tags no longer closes with PHP code similar to &lt;a $this-&gt;
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488067&group_id=2439">Bug #3488067.</a>
+	</li>
+	<li>
+	Fix bug where setting an indicator for the whole document would fail.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487440&group_id=2439">Bug #3487440.</a>
+	</li>
+	<li>
+	Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3496403&group_id=2439">Bug #3496403.</a>
+	</li>
+	<li>
+	Differences between buffered and unbuffered mode on Direct2D eliminated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495791&group_id=2439">Bug #3495791.</a>
+	</li>
+	<li>
+	Font leading implemented for Direct2D to improve display of character blobs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494744&group_id=2439">Bug #3494744.</a>
+	</li>
+	<li>
+	Fractional widths used for line numbers, character markers and other situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	Translucent rectangles drawn using Direct2D with sharper corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	RGBA markers drawn sharper when centred using Direct2D.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494202&group_id=2439">Bug #3494202.</a>
+	</li>
+	<li>
+	RGBA markers are drawn centred when taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494184&group_id=2439">Bug #3494184.</a>
+	</li>
+	<li>
+	Image marker drawing problem fixed for markers taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3493503&group_id=2439">Bug #3493503.</a>
+	</li>
+	<li>
+	Markers are drawn horizontally off-centre based on margin type instead of dimensions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488696&group_id=2439">Bug #3488696.</a>
+	</li>
+	<li>
+	Fold tail markers drawn vertically centred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488289&group_id=2439">Feature #3488289.</a>
+	</li>
+	<li>
+	On Windows, Scintilla is more responsive in wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487397&group_id=2439">Bug #3487397.</a>
+	</li>
+	<li>
+	Unimportant "Gdk-CRITICAL" messages are no longer displayed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488481&group_id=2439">Bug #3488481.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480635&group_id=2439">Bug #3480635.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3486657&group_id=2439">Bug #3486657.</a>
+	</li>
+	<li>
+	Fixed problems with multiple clicks in margin and with mouse actions combined with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484370&group_id=2439">Bug #3484370.</a>
+	</li>
+	<li>
+	Fixed bug with using page up and down and not returning to original line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3485669&group_id=2439">Bug #3485669.</a>
+	</li>
+	<li>
+	Down arrow with wrapped text no longer skips lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1776560&group_id=2439">Bug #1776560.</a>
+	</li>
+	<li>
+	Fix problem with dwell ending immediately due to word wrap.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484416&group_id=2439">Bug #3484416.</a>
+	</li>
+	<li>
+	Wrapped lines are rewrapped more consistently while resizing window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484179&group_id=2439">Bug #3484179.</a>
+	</li>
+	<li>
+	Selected line ends are highlighted more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484330&group_id=2439">Bug #3484330.</a>
+	</li>
+	<li>
+	Fix grey background on files that use shbang to choose language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3482777&group_id=2439">Bug #3482777.</a>
+	</li>
+	<li>
+	Fix failure messages from empty commands in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480645&group_id=2439">Bug #3480645.</a>
+	</li>
+	<li>
+	Redrawing reduced for some marker calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3493530&group_id=2439">Feature #3493530.</a>
+	</li>
+	<li>
+	Match brace and select brace commands work in SciTE output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486598&group_id=2439">Feature #3486598.</a>
+	</li>
+	<li>
+	Performing SciTE "Show Calltip" command when a calltip is already visible shows the next calltip.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3487017&group_id=2439">Feature #3487017.</a>
+	</li>
+	<li>
+	SciTE allows saving file even when file unchanged.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486654&group_id=2439">Feature #3486654.</a>
+	</li>
+	<li>
+	SciTE allows optional use of character escapes in calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495239&group_id=2439">Feature #3495239.</a>
+	</li>
+	<li>
+	SciTE can open file:// URLs with Ctrl+Shift+O.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495389&group_id=2439">Feature #3495389.</a>
+	</li>
+	<li>
+	Key modifiers updated for GTK+ on OS X to match upstream changes.
+	</li>
+	<li>
+	SciTE hang when marking all occurrences of regular expressions fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite303.zip?download">Release 3.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2012.
+	</li>
+	<li>
+	Printing works on GTK+ version 2.x as well as 3.x.
+	</li>
+	<li>
+	Lexer added for the AviSynth language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3475611&group_id=2439">Feature #3475611.</a>
+	</li>
+	<li>
+	Lexer added for the Take Command / TCC scripting language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3462462&group_id=2439">Feature #3462462.</a>
+	</li>
+	<li>
+	CSS lexer gains support for SCSS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3268017&group_id=2439">Feature #3268017.</a>
+	</li>
+	<li>
+	CPP lexer fixes problems in the preprocessor structure caused by continuation lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3458508&group_id=2439">Bug #3458508.</a>
+	</li>
+	<li>
+	Errorlist lexer handles column numbers for GCC format diagnostics.
+	In SciTE, Next Message goes to column where this can be decoded from GCC format diagnostics.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3453075&group_id=2439">Feature #3453075.</a>
+	</li>
+	<li>
+	HTML folder fixes spurious folds on some tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459262&group_id=2439">Bug #3459262.</a>
+	</li>
+	<li>
+	Ruby lexer fixes bug where '=' at start of file caused whole file to appear as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3452488&group_id=2439">Bug #3452488.</a>
+	</li>
+	<li>
+	SQL folder folds blocks of single line comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3467425&group_id=2439">Feature #3467425.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, defer invalidation of render target until completion of painting to avoid failures.
+	</li>
+	<li>
+	Further support of fractional positioning. Spaces, tabs, and single character tokens can take fractional space
+	and wrapped lines are positioned taking fractional positions into account.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, fix extra carets appearing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	For autocompletion lists Page Up and Down move by the list height instead of by 5 lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3455493&group_id=2439">Bug #3455493.</a>
+	</li>
+	<li>
+	For SCI_LINESCROLLDOWN/UP don't select into virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3451681&group_id=2439">Bug #3451681.</a>
+	</li>
+	<li>
+	Fix fold highlight not being fully drawn.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469936&group_id=2439">Bug #3469936.</a>
+	</li>
+	<li>
+	Fix selection margin appearing black when starting in wrap mode.
+	</li>
+	<li>
+	Fix crash when changing end of document after adding an annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476637&group_id=2439">Bug #3476637.</a>
+	</li>
+	<li>
+	Fix problems with building to make RPMs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476149&group_id=2439">Bug #3476149.</a>
+	</li>
+	<li>
+	Fix problem with building on GTK+ where recent distributions could not find gmodule.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469056&group_id=2439">Bug #3469056.</a>
+	</li>
+	<li>
+	Fix problem with installing SciTE on GTK+ due to icon definition in .desktop file including an extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476117&group_id=2439">Bug #3476117.</a>
+	</li>
+	<li>
+	Fix SciTE bug where new buffers inherited some properties from previously opened file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3457060&group_id=2439">Bug #3457060.</a>
+	</li>
+	<li>
+	Fix focus when closing tab in SciTE with middle click. Focus moves to edit pane instead of staying on tab bar.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix bug where Open Selected Filename for URL would append a file extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3459185&group_id=2439">Feature #3459185.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix key handling of control characters in Parameters dialog so normal editing (Ctrl+C, ...) works.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459345&group_id=2439">Bug #3459345.</a>
+	</li>
+	<li>
+	Fix SciTE bug where files became read-only after saving. Drop the "*" dirty marker after save completes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467432&group_id=2439">Bug #3467432.</a>
+	</li>
+	<li>
+	For SciTE handling of diffs with "+++" and "---" lines, also handle case where not followed by tab.
+	Go to correct line for diff "+++" message.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467143&group_id=2439">Bug #3467143.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467178&group_id=2439">Bug #3467178.</a>
+	</li>
+	<li>
+	SciTE on GTK+ now performs threaded actions even on GTK+ versions before 2.12.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite302.zip?download">Release 3.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 December 2011.
+	</li>
+	<li>
+	SciTE saves files in the background without blocking the user interface.
+	</li>
+	<li>
+	Printing implemented in SciTE on GTK+ 3.x.
+	</li>
+	<li>
+	ILoader interface for background loading finalized and documented.
+	</li>
+	<li>
+	CoffeeScript lexer added.
+	</li>
+	<li>
+	C++ lexer fixes crash with "#if defined( XXX 1".
+	</li>
+	<li>
+	Crash with Direct2D on Windows fixed.
+	</li>
+	<li>
+	Backspace removing protected range fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3445911&group_id=2439">Bug #3445911.</a>
+	</li>
+	<li>
+	Cursor setting failure on Windows when screen saver on fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3438780&group_id=2439">Bug #3438780.</a>
+	</li>
+	<li>
+	SciTE on GTK+ hang fixed with -open:file option.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441980&group_id=2439">Bug #3441980.</a>
+	</li>
+	<li>
+	Failure to evaluate shbang fixed in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441801&group_id=2439">Bug #3441801.</a>
+	</li>
+	<li>
+	SciTE failure to treat files starting with "&lt;?xml" as XML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440718&group_id=2439">Bug #3440718.</a>
+	</li>
+	<li>
+	Made untitled tab saveable when created by closing all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440244&group_id=2439">Bug #3440244.</a>
+	</li>
+	<li>
+	SciTE crash fixed when using Scintillua.
+	</li>
+	<li>
+	SciTE revert command fixed so that undo works on individual actions instead of undoing to revert point.
+	</li>
+	<li>
+	Focus loss in SciTE when opening a recent file fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	Fixed SciTE SelLength property to measure characters instead of bytes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283519&group_id=2439">Bug #3283519.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite301.zip?download">Release 3.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 November 2011.
+	</li>
+	<li>
+	SciTE on Windows now runs Lua scripts directly on the main thread instead of starting them on a
+	secondary thread and then moving back to the main thread.
+	</li>
+	<li>
+	Highlight "else" as a keyword for TCL in the same way as other languages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1836954&group_id=2439">Bug #1836954.</a>
+	</li>
+	<li>
+	Fix problems with setting fonts for autocompletion lists on Windows where
+	font handles were copied and later deleted causing a system default font to be used.
+	</li>
+	<li>
+	Fix font size used on Windows for Asian language input methods which sometimes led to IME not being visible.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3436753&group_id=2439">Bug #3436753.</a>
+	</li>
+	<li>
+	Fixed polygon drawing on Windows so fold symbols are visible again.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433558&group_id=2439">Bug #3433558.</a>
+	</li>
+	<li>
+	Changed background drawing on GTK+ to allow for fractional character positioning as occurs on OS X
+	as this avoids faint lines at lexeme boundaries.
+	</li>
+	<li>
+	Ensure pixmaps allocated before painting as there was a crash when Scintilla drew without common initialization calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3432354&group_id=2439">Bug #3432354.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows bug causing wrong caret position after indenting a selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433433&group_id=2439">Bug #3433433.</a>
+	</li>
+	<li>
+	Fixed SciTE session saving to store buffer position matching buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3434372&group_id=2439">Bug #3434372.</a>
+	</li>
+	<li>
+	Fixed leak of document objects in SciTE.
+	</li>
+	<li>
+	Recognize URL characters '?' and '%' for Open Selected command in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3429409&group_id=2439">Bug #3429409.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite300.zip?download">Release 3.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 November 2011.
+	</li>
+	<li>
+	Carbon platform support removed. OS X applications should switch to Cocoa.
+	</li>
+	<li>
+	On Windows Vista or newer, drawing may be performed with Direct2D and DirectWrite instead of GDI.
+	</li>
+	<li>
+	Cairo is now used for all drawing on GTK+. GDK drawing was removed.
+	</li>
+	<li>
+	Paletted display support removed.
+	</li>
+	<li>
+	Fractional font sizes can be specified.
+	</li>
+	<li>
+	Different weights of text supported on some platforms instead of just normal and bold.
+	</li>
+	<li>
+	Sub-pixel character positioning supported.
+	</li>
+	<li>
+	SciTE loads files in the background without blocking the user interface.
+	</li>
+	<li>
+	SciTE can display diagnostic messages interleaved with the text of files immediately after the
+	line referred to by the diagnostic.
+	</li>
+	<li>
+	New API to see if all lines are visible which can be used to optimize processing fold structure notifications.
+	</li>
+	<li>
+	Scrolling optimized by avoiding invalidation of fold margin when redrawing whole window.
+	</li>
+	<li>
+	Optimized SCI_MARKERNEXT.
+	</li>
+	<li>
+	C++ lexer supports Pike hash quoted strings when turned on with lexer.cpp.hashquoted.strings.
+	</li>
+	<li>
+	Fixed incorrect line height with annotations in wrapped mode when there are multiple views.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388159&group_id=2439">Bug #3388159.</a>
+	</li>
+	<li>
+	Calltips may be displayed above the text as well as below.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3410830&group_id=2439">Bug #3410830.</a>
+	</li>
+	<li>
+	For huge files SciTE only examines the first megabyte for newline discovery.
+	</li>
+	<li>
+	SciTE on GTK+ removes the fileselector.show.hidden property and check box as this was buggy and GTK+ now
+	supports an equivalent feature.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3413630&group_id=2439">Bug #3413630.</a>
+	</li>
+	<li>
+	SciTE on GTK+ supports mnemonics in dynamic menus.
+	</li>
+	<li>
+	SciTE on GTK+ displays the user's home directory as '~' in menus to make them shorter.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite229.zip?download">Release 2.29</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 September 2011.
+	</li>
+	<li>
+	To automatically discover the encoding of a file when opening it, SciTE can run a program set with command.discover.properties.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3324341&group_id=2439">Feature #3324341.</a>
+	</li>
+	<li>
+	Cairo always used for drawing on GTK+.
+	</li>
+	<li>
+	The set of properties files imported by SciTE can be controlled with the properties imports.include and imports.exclude.
+	The import statement has been extended to allow "import *".
+	The properties files for some languages are no longer automatically loaded by default. The properties files affected are
+	avenue, baan, escript, lot, metapost, and mmixal.
+	</li>
+	<li>
+	C++ lexer fixed a bug with raw strings being recognized too easily.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388122&group_id=2439">Bug #3388122.</a>
+	</li>
+	<li>
+	LaTeX lexer improved with more states and fixes to most outstanding bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1493111&group_id=2439">Bug #1493111.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1856356&group_id=2439">Bug #1856356.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081692&group_id=2439">Bug #3081692.</a>
+	</li>
+	<li>
+	Lua lexer updates for Lua 5.2 beta with goto labels and "\z" string escape.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3386330&group_id=2439">Feature #3386330.</a>
+	</li>
+	<li>
+	Perl string styling highlights interpolated variables.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3394258&group_id=2439">Feature #3394258.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3076629&group_id=2439">Bug #3076629.</a>
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.14.0 with 0X and 0B numeric literal prefixes, break keyword and "+" supported in subroutine prototypes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3388802&group_id=2439">Feature #3388802.</a>
+	</li>
+	<li>
+	Perl bug fixed with CRLF line endings.
+	</li>
+	<li>
+	Markdown lexer fixed to not change state with "_" in middle of word.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3398184&group_id=2439">Bug #3398184.</a>
+	</li>
+	<li>
+	Cocoa restores compatibility with OS X 10.5.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow near start when scrolled horizontally.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3389055&group_id=2439">Bug #3389055.</a>
+	</li>
+	<li>
+	Indicators that finish at the end of the document no longer expand when text is appended.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3378718&group_id=2439">Bug #3378718.</a>
+	</li>
+	<li>
+	SparseState merge fixed to check if other range is empty.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3387053&group_id=2439">Bug #3387053.</a>
+	</li>
+	<li>
+	On Windows, autocompletion lists will scroll instead of document when mouse wheel spun.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3403600&group_id=2439">Feature #3403600.</a>
+	</li>
+	<li>
+	SciTE performs more rapid polling for command completion so will return faster and report more accurate times.
+	</li>
+	<li>
+	SciTE resizes panes proportionally when switched between horizontal and vertical layout.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3376784&group_id=2439">Feature #3376784.</a>
+	</li>
+	<li>
+	SciTE on GTK+ opens multiple files into a single instance more reliably.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3363754&group_id=2439">Bug #3363754.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite228.zip?download">Release 2.28</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 August 2011.
+	</li>
+	<li>
+	GTK+ Cairo support works back to GTK+ version 2.8. Requires changing Scintilla source code to enable before GTK+ 2.22.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3322351&group_id=2439">Bug #3322351.</a>
+	</li>
+	<li>
+	Translucent images in RGBA format can be used for margin markers and in autocompletion lists.
+	</li>
+	<li>
+	INDIC_DOTBOX added as a translucent dotted rectangular indicator.
+	</li>
+	<li>
+	Asian text input using IME works for GTK+ 3.x and GTK+ 2.x with Cairo.
+	</li>
+	<li>
+	On GTK+, IME works for Ctrl+Shift+U Unicode input in Scintilla. For SciTE, Ctrl+Shift+U is still Make Selection Uppercase.
+	</li>
+	<li>
+	Key bindings for GTK+ on OS X made compatible with Cocoa port and platform conventions.
+	</li>
+	<li>
+	Cocoa port supports different character encodings, improves scrolling performance and drag image appearance.
+	The control ID is included in WM_COMMAND notifications. Text may be deleted by dragging to the trash.
+	ScrollToStart and ScrollToEnd key commands added to simplify implementation of standard OS X Home and End
+	behaviour.
+	</li>
+	<li>
+	SciTE on GTK+ uses a paned widget to contain the edit and output panes instead of custom code.
+	This allows the divider to be moved easily on GTK+ 3 and its appearance follows GTK+ conventions more closely.
+	</li>
+	<li>
+	SciTE builds and installs on BSD.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324644&group_id=2439">Bug #3324644.</a>
+	</li>
+	<li>
+	Cobol supports fixed format comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3014850&group_id=2439">Bug #3014850.</a>
+	</li>
+	<li>
+	Mako template language block syntax extended and ## comments recognized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3325178&group_id=2439">Feature #3325178.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3318818&group_id=2439">Bug #3318818.</a>
+	</li>
+	<li>
+	Folding of Mako template language within HTML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324563&group_id=2439">Bug #3324563.</a>
+	</li>
+	<li>
+	Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of
+	keywords following '.'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3325333&group_id=2439">Bug #3325333.</a>
+	</li>
+	<li>
+	Python folder fixes bug where fold would not extend to final line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3349157&group_id=2439">Bug #3349157.</a>
+	</li>
+	<li>
+	SciTE treats LPEG lexers the same as script lexers by setting all 8 style bits.
+	</li>
+	<li>
+	For Cocoa, crashes with unsupported font variants and memory leaks for colour objects fixed.
+	</li>
+	<li>
+	Shift-JIS lead byte ranges modified to match Windows.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315756&group_id=2439">Bug #3315756.</a>
+	</li>
+	<li>
+	Bug fixed with annotations beyond end of document.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3347268&group_id=2439">Bug #3347268.</a>
+	</li>
+	<li>
+	Incorrect drawing fixed for combination of background colour change and translucent selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377116&group_id=2439">Bug #3377116.</a>
+	</li>
+	<li>
+	Lexers initialized correctly when started at position other than start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377148&group_id=2439">Bug #3377148.</a>
+	</li>
+	<li>
+	Fold highlight drawing fixed for some situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323015&group_id=2439">Bug #3323015.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323805&group_id=2439">Bug #3323805.</a>
+	</li>
+	<li>
+	Case insensitive search fixed for cases where folded character uses fewer bytes than base character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3362038&group_id=2439">Bug #3362038.</a>
+	</li>
+	<li>
+	SciTE bookmark.alpha setting fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3373907&group_id=2439">Bug #3373907.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite227.zip?download">Release 2.27</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2011.
+	</li>
+	<li>
+	On recent GTK+ 2.x versions when using Cairo, bug fixed where wrong colours were drawn.
+	</li>
+	<li>
+	SciTE on GTK+ slow performance in menu maintenance fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315233&group_id=2439">Bug #3315233.</a>
+	</li>
+	<li>
+	Cocoa platform supports 64-bit builds and uses only non-deprecated APIs.
+	Asian Input Method Editors are supported.
+	Autocompletion lists and calltips implemented.
+	Control identifier used in notifications.
+	</li>
+	<li>
+	On Cocoa, rectangular selection now uses Option/Alt key to be compatible with Apple Human
+	Interface Guidelines and other applications.
+	The Control key is reported with an SCMOD_META modifier bit.
+	</li>
+	<li>
+	API added for setting and retrieving the identifier number used in notifications.
+	</li>
+	<li>
+	SCI_SETEMPTYSELECTION added to set selection without scrolling or redrawing more than needed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3314877&group_id=2439">Feature #3314877.</a>
+	</li>
+	<li>
+	Added new indicators. INDIC_DASH and INDIC_DOTS are variants of underlines.
+	INDIC_SQUIGGLELOW indicator added as shorter alternative to INDIC_SQUIGGLE for small fonts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314591&group_id=2439">Bug #3314591</a>
+	</li>
+	<li>
+	Margin line selection can be changed to select display lines instead of document lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	On Windows, SciTE can perform reverse searches by pressing Shift+Enter
+	in the Find or Replace strips or dialogs.
+	</li>
+	<li>
+	Matlab lexer does not special case '\' in single quoted strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=948757&group_id=2439">Bug #948757</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1755950&group_id=2439">Bug #1755950</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1888738&group_id=2439">Bug #1888738</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3316852&group_id=2439">Bug #3316852.</a>
+	</li>
+	<li>
+	Verilog lexer supports SystemVerilog folding and keywords.
+	</li>
+	<li>
+	Font leak fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+	<li>
+	Automatic scrolling works for long wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	Multiple typing works for cases where selections collapse together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3309906&group_id=2439">Bug #3309906.</a>
+	</li>
+	<li>
+	Fold expanded when needed in word wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	</li>
+	<li>
+	Bug fixed with edge drawn in wrong place on wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314807&group_id=2439">Bug #3314807.</a>
+	</li>
+	<li>
+	Bug fixed with unnecessary scrolling for SCI_GOTOLINE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3303406&group_id=2439">Bug #3303406.</a>
+	</li>
+	<li>
+	Bug fixed where extra step needed to undo SCI_CLEAR in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3159691&group_id=2439">Bug #3159691.</a>
+	</li>
+	<li>
+	Regular expression search fixed for \$ on last line of search range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313746&group_id=2439">Bug #3313746.</a>
+	</li>
+	<li>
+	SciTE performance improved when switching to a tab with a very large file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3311421&group_id=2439">Bug #3311421.</a>
+	</li>
+	<li>
+	On Windows, SciTE advanced search remembers the "Search only in this style" setting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313344&group_id=2439">Bug #3313344.</a>
+	</li>
+	<li>
+	On GTK+, SciTE opens help using "xdg-open" instead of "netscape" as "netscape" no longer commonly installed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314377&group_id=2439">Bug #3314377.</a>
+	</li>
+	<li>
+	SciTE script lexers can use 256 styles.
+	</li>
+	<li>
+	SciTE word highlight works for words containing DBCS characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315173&group_id=2439">Bug #3315173.</a>
+	</li>
+	<li>
+	Compilation fixed for wxWidgets.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite226.zip?download">Release 2.26</a>
+    </h3>
+    <ul>
+	<li>
+	Released 25 May 2011.
+	</li>
+	<li>
+	Folding margin symbols can be highlighted for the current folding block.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3147069&group_id=2439">Feature #3147069.</a>
+	</li>
+	<li>
+	Selected lines can be moved up or down together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3304850&group_id=2439">Feature #3304850.</a>
+	</li>
+	<li>
+	SciTE can highlight all occurrences of the current word or selected text.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3291636&group_id=2439">Feature #3291636.</a>
+	</li>
+	<li>
+	Experimental GTK+ 3.0 support: build with "make GTK3=1".
+	</li>
+	<li>
+	INDIC_STRAIGHTBOX added. Is similar to INDIC_ROUNDBOX but without rounded corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3290435&group_id=2439">Bug #3290435.</a>
+	</li>
+	<li>
+	Can show brace matching and mismatching with indicators instead of text style.
+	Translucency of outline can be altered for INDIC_ROUNDBOX and INDIC_STRAIGHTBOX.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3290434&group_id=2439">Feature #3290434.</a>
+	</li>
+	<li>
+	SciTE can automatically indent python by examining previous line for scope-starting ':' with indent.python.colon.
+	</li>
+	<li>
+	Batch file lexer allows braces '(' or ')' inside variable names.
+	</li>
+	<li>
+	The cpp lexer only recognizes Vala triple quoted strings when lexer.cpp.triplequoted.strings property is set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3239234&group_id=2439">Bug #3239234.</a>
+	</li>
+	<li>
+	Make file lexer treats a variable with a nested variable like $(f$(qx)b) as one variable.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3298223&group_id=2439">Bug #3298223.</a>
+	</li>
+	<li>
+	Folding bug fixed for JavaScript with nested PHP.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3193530&group_id=2439">Bug #3193530.</a>
+	</li>
+	<li>
+	HTML lexer styles Django's {# #} comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3013798&group_id=2439">Bug #3013798.</a>
+	</li>
+	<li>
+	HTML lexer styles JavaScript regular expression correctly for /abc/i.test('abc');.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3209108&group_id=2439">Bug #3209108.</a>
+	</li>
+	<li>
+	Inno Setup Script lexer now works properly when it restarts from middle of [CODE] section.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283880&group_id=2439">Bug #3283880.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3129044&group_id=2439">Bug #3129044.</a>
+	</li>
+	<li>
+	Lua lexer updated for Lua 5.2 with hexadecimal floating-point numbers and '\*' whitespace escaping in strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3243811&group_id=2439">Feature #3243811.</a>
+	</li>
+	<li>
+	Perl folding folds "here doc"s and adds options fold.perl.at.else and fold.perl.comment.explicit. Fold structure for Perl fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3112671&group_id=2439">Feature #3112671.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	Python lexer supports cpdef keyword for Cython.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3279728&group_id=2439">Bug #3279728.</a>
+	</li>
+	<li>
+	SQL folding option lexer.sql.fold.at.else renamed to fold.sql.at.else.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3271474&group_id=2439">Bug #3271474.</a>
+	</li>
+	<li>
+	SQL lexer no longer treats ';' as terminating a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3196071&group_id=2439">Bug #3196071.</a>
+	</li>
+	<li>
+	Text drawing and measurement segmented into smaller runs to avoid platform bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3277449&group_id=2439">Bug #3277449.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3165743&group_id=2439">Bug #3165743.</a>
+	</li>
+	<li>
+	SciTE on Windows adds temp.files.sync.load property to open dropped temporary files synchronously as they may
+	be removed before they can be opened asynchronously.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3072009&group_id=2439">Bug #3072009.</a>
+	</li>
+	<li>
+	Bug fixed with indentation guides ignoring first line in SC_IV_LOOKBOTH mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291317&group_id=2439">Bug #3291317.</a>
+	</li>
+	<li>
+	Bugs fixed in backward regex search.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3292659&group_id=2439">Bug #3292659.</a>
+	</li>
+	<li>
+	Bugs with display of folding structure fixed for wrapped lines and where there is a fold header but no body.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	SciTE on Windows cursor changes to an arrow now when over horizontal splitter near top of window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3286620&group_id=2439">Bug #3286620.</a>
+	</li>
+	<li>
+	Fixed default widget size problem on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3267892&group_id=2439">Bug #3267892.</a>
+	</li>
+	<li>
+	Fixed font size when using Cairo on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3272662&group_id=2439">Bug #3272662.</a>
+	</li>
+	<li>
+	Fixed primary selection and cursor issues on GTK+ when unrealized then realized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3256153&group_id=2439">Bug #3256153.</a>
+	</li>
+	<li>
+	Right click now cancels selection on GTK+ like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3235190&group_id=2439">Bug #3235190.</a>
+	</li>
+	<li>
+	SciTE on GTK+ implements z-order buffer switching like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3228384&group_id=2439">Bug #3228384.</a>
+	</li>
+	<li>
+	Improve selection position after SciTE Insert Abbreviation command when abbreviation expansion includes '|'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite225.zip?download">Release 2.25</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2011.
+	</li>
+	<li>
+	SparseState class makes it easier to write lexers which have to remember complex state between lines.
+	</li>
+	<li>
+	Visual Studio project (.dsp) files removed. The make files should be used instead as described in the README.
+	</li>
+	<li>
+	Modula 3 lexer added along with SciTE support.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3173374&group_id=2439">Feature #3173374.</a>
+	</li>
+	<li>
+	Asm, Basic, and D lexers add extra folding properties.
+	</li>
+	<li>
+	Raw string literals for C++0x supported in C++ lexer.
+	</li>
+	<li>
+	Triple-quoted strings used in Vala language supported in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3177601&group_id=2439">Feature #3177601.</a>
+	</li>
+	<li>
+ 	The errorlist lexer used in SciTE's output pane colours lines that start with '&lt;' as diff deletions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3172878&group_id=2439">Feature #3172878.</a>
+	</li>
+	<li>
+ 	The Fortran lexer correctly folds type-bound procedures from Fortran 2003.
+	</li>
+	<li>
+	LPeg lexer support‎ improved in SciTE.
+	</li>
+	<li>
+	SciTE on Windows-64 fixes for menu localization and Lua scripts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3204502&group_id=2439">Bug #3204502.</a>
+	</li>
+	<li>
+	SciTE on Windows avoids locking folders when using the open or save dialogs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1795484&group_id=2439">Bug #1795484.</a>
+	</li>
+	<li>
+	Diff lexer fixes problem where diffs of diffs producing lines that start with "----".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3197952&group_id=2439">Bug #3197952.</a>
+	</li>
+	<li>
+	Bug fixed when searching upwards in Chinese code page 936.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3176271&group_id=2439">Bug #3176271.</a>
+	</li>
+	<li>
+	On Cocoa, translucent drawing performed as on other platforms instead of 2.5 times less translucent.
+	</li>
+	<li>
+	Performance issue and potential bug fixed on GTK+ with caret line for long lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite224.zip?download">Release 2.24</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 February 2011.
+	</li>
+	<li>
+	Fixed memory leak in GTK+ Cairo code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3157655&group_id=2439">Feature #3157655.</a>
+	</li>
+	<li>
+	Insert Abbreviation dialog added to SciTE on GTK+.
+	</li>
+	<li>
+	SCN_UPDATEUI notifications received when window scrolled. An 'updated' bit mask indicates which
+	types of update have occurred from SC_UPDATE_SELECTION, SC_UPDATE_CONTENT, SC_UPDATE_H_SCROLL
+	or SC_UPDATE_V_SCROLL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3125977&group_id=2439">Feature #3125977.</a>
+	</li>
+	<li>
+	On Windows, to ensure reverse arrow cursor matches platform default, it is now generated by
+	reflecting the platform arrow cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3143968&group_id=2439">Feature #3143968.</a>
+	</li>
+	<li>
+	Can choose mouse cursor used in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3161326&group_id=2439">Feature #3161326.</a>
+	</li>
+	<li>
+	On GTK+, SciTE sets a mime type of text/plain in its .desktop file so that it will appear in the shell context menu.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3137126&group_id=2439">Feature #3137126.</a>
+	</li>
+	<li>
+	Bash folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118223&group_id=2439">Feature #3118223.</a>
+	</li>
+	<li>
+	C++ folder adds fold.cpp.syntax.based, fold.cpp.comment.multiline, fold.cpp.explicit.start, fold.cpp.explicit.end,
+	and fold.cpp.explicit.anywhere properties to allow more control over folding and choice of explicit fold markers.
+	</li>
+	<li>
+	C++ lexer fixed to always handle single quote strings continued past a line end.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3150522&group_id=2439">Bug #3150522.</a>
+	</li>
+	<li>
+	Ruby folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118224&group_id=2439">Feature #3118224.</a>
+	</li>
+	<li>
+	SQL lexer allows '.' to be part of words.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3103129&group_id=2439">Feature #3103129.</a>
+	</li>
+	<li>
+	SQL folder handles case statements in more situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3135027&group_id=2439">Feature #3135027.</a>
+	</li>
+	<li>
+	SQL folder adds fold points inside expressions based on bracket structure.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3165488&group_id=2439">Feature #3165488.</a>
+	</li>
+	<li>
+	SQL folder drops fold.sql.exists property as 'exists' is handled automatically.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3164194&group_id=2439">Bug #3164194.</a>
+	</li>
+	<li>
+	SciTE only forwards properties to lexers when they have been explicitly set so the defaults set by lexers are used
+	rather than 0.
+	</li>
+	<li>
+	Mouse double click word selection chooses the word around the character under the mouse rather than
+	the inter-character position under the mouse. This makes double clicking select what the user is pointing
+	at and avoids selecting adjacent non-word characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3111174&group_id=2439">Bug #3111174.</a>
+	</li>
+	<li>
+	Fixed mouse double click to always perform word select, not line select.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3143635&group_id=2439">Bug #3143635.</a>
+	</li>
+	<li>
+	Right click cancels autocompletion.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3144531&group_id=2439">Bug #3144531.</a>
+	</li>
+	<li>
+	Fixed multiPaste to work when additionalSelectionTyping off.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3126221&group_id=2439">Bug #3126221.</a>
+	</li>
+	<li>
+	Fixed virtual space problems when text modified at caret.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3154986&group_id=2439">Bug #3154986.</a>
+	</li>
+	<li>
+	Fixed memory leak in lexer object code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3133672&group_id=2439">Bug #3133672.</a>
+	</li>
+	<li>
+	Fixed SciTE on GTK+ search failure when using regular expression.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3156217&group_id=2439">Bug #3156217.</a>
+	</li>
+	<li>
+	Avoid unnecessary full window redraw for SCI_GOTOPOS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3146650&group_id=2439">Feature #3146650.</a>
+	</li>
+	<li>
+	Avoid unnecessary redraw when indicator fill range makes no real change.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite223.zip?download">Release 2.23</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2010.
+	</li>
+	<li>
+	On GTK+ version 2.22 and later, drawing is performed with Cairo rather than GDK.
+	This is in preparation for GTK+ 3.0 which will no longer support GDK drawing.
+	The appearance of some elements will be different with Cairo as it is anti-aliased and uses sub-pixel positioning.
+	Cairo may be turned on for GTK+ versions before 2.22 by defining USE_CAIRO although this has not
+	been extensively tested.
+	</li>
+	<li>
+	New lexer a68k for Motorola 68000 assembler.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101598&group_id=2439">Feature #3101598.</a>
+	</li>
+	<li>
+	Borland C++ is no longer supported for building Scintilla or SciTE on Windows.
+	</li>
+	<li>
+	Performance improved when creating large rectangular selections.
+	</li>
+	<li>
+	PHP folder recognizes #region and #endregion comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101624&group_id=2439">Feature #3101624.</a>
+	</li>
+	<li>
+	SQL lexer has a lexer.sql.numbersign.comment option to turn off use of '#' comments
+	as these are a non-standard feature only available in some implementations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3098071&group_id=2439">Feature #3098071.</a>
+	</li>
+	<li>
+	SQL folder recognizes case statements and understands the fold.at.else property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3107362&group_id=2439">Bug #3107362.</a>
+	</li>
+	<li>
+	SQL folder fixes bugs with end statements when fold.sql.only.begin=1.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed with multi-line tab bar not adjusting correctly when maximizing and demaximizing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3097517&group_id=2439">Bug #3097517.</a>
+	</li>
+	<li>
+	Crash fixed on GTK+ when Scintilla widget destroyed while it still has an outstanding style idle pending.
+	</li>
+	<li>
+	Bug fixed where searching backwards in DBCS text (code page 936 or similar) failed to find occurrences at the start of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3103936&group_id=2439">Bug #3103936.</a>
+	</li>
+	<li>
+	SciTE on Windows supports Unicode file names when executing help applications with winhelp and htmlhelp subsystems.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite222.zip?download">Release 2.22</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 October 2010.
+	</li>
+	<li>
+	SciTE includes support for integrating with Scintillua which allows lexers to be implemented in Lua as a
+	Parsing Expression Grammar (PEG).
+	</li>
+	<li>
+	Regular expressions allow use of '?' for non-greedy matches or to match 0 or 1 instances of an item.
+	</li>
+	<li>
+	SCI_CONTRACTEDFOLDNEXT added to allow rapid retrieval of folding state.
+	</li>
+	<li>
+	SCN_HOTSPOTRELEASECLICK notification added which is similar to SCN_HOTSPOTCLICK but occurs
+	when the mouse is released.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3082409&group_id=2439">Feature #3082409.</a>
+	</li>
+	<li>
+	Command added for centring current line in window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3064696&group_id=2439">Feature #3064696.</a>
+	</li>
+	<li>
+	SciTE performance improved by not examining document for line ends when switching buffers and not
+	storing folds when folding turned off.
+	</li>
+	<li>
+	Bug fixed where scrolling to ensure the caret is visible did not take into account all pixels of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081721&group_id=2439">Bug #3081721.</a>
+	</li>
+	<li>
+	Bug fixed for autocompletion list overlapping text when WS_EX_CLIENTEDGE used.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079778&group_id=2439">Bug #3079778.</a>
+	</li>
+	<li>
+	After autocompletion, the caret's X is updated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079114&group_id=2439">Bug #3079114.</a>
+	</li>
+	<li>
+	On Windows, default to the system caret blink time.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3079784&group_id=2439">Feature #3079784.</a>
+	</li>
+	<li>
+	PgUp/PgDn fixed to allow virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3077452&group_id=2439">Bug #3077452.</a>
+	</li>
+	<li>
+	Crash fixed when AddMark and AddMarkSet called with negative argument.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3075074&group_id=2439">Bug #3075074.</a>
+	</li>
+	<li>
+	Dwell notifications fixed so that they do not occur when the mouse is outside Scintilla.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a>
+	</li>
+	<li>
+	Bash lexer bug fixed for here docs starting with &lt;&lt;-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3063822&group_id=2439">Bug #3063822.</a>
+	</li>
+	<li>
+	C++ lexer bug fixed for // comments that are continued onto a second line by a \.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a>
+	</li>
+	<li>
+	C++ lexer fixes wrong highlighting for float literals containing +/-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058924&group_id=2439">Bug #3058924.</a>
+	</li>
+	<li>
+	JavaScript lexer recognize regexes following return keyword.‎
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3062287&group_id=2439">Bug #3062287.</a>
+	</li>
+	<li>
+	Ruby lexer handles % quoting better and treats range dots as operators in 1..2 and 1...2.
+	Ruby folder handles "if" keyword used as a modifier even when it is separated from the modified statement by an escaped new line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2093767&group_id=2439">Bug #2093767.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058496&group_id=2439">Bug #3058496.</a>
+	</li>
+	<li>
+	Bug fixed where upwards search failed with DBCS code pages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3065912&group_id=2439">Bug #3065912.</a>
+	</li>
+	<li>
+	SciTE has a default Lua startup script name distributed in SciTEGlobal.properties.
+	No error message is displayed if this file does not exist.
+	</li>
+	<li>
+	SciTE on Windows tab control height is calculated better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635702&group_id=2439">Bug #2635702.</a>
+	</li>
+	<li>
+	SciTE on Windows uses better themed check buttons in find and replace strips.
+	</li>
+	<li>
+	SciTE on Windows fixes bug with Find strip appearing along with Incremental Find strip.
+	</li>
+	<li>
+	SciTE setting find.close.on.find added to allow preventing the Find dialog from closing.
+	</li>
+	<li>
+	SciTE on Windows attempts to rerun commands that fail by prepending them with "cmd.exe /c".
+	This allows commands built in to the command processor like "dir" to run.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite221.zip?download">Release 2.21</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 September 2010.
+	</li>
+	<li>
+	Asian Double Byte Character Set (DBCS) support improved.
+	Case insensitive search works and other operations are much faster.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2999125&group_id=2439">Bug #2999125,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2774616&group_id=2439">Bug #2774616,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2991942&group_id=2439">Bug #2991942,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005688&group_id=2439">Bug #3005688.</a>
+	</li>
+	<li>
+	Scintilla on GTK+ uses only non-deprecated APIs (for GTK+ 2.20) except for GdkFont and GdkFont use can be disabled
+	with the preprocessor symbol DISABLE_GDK_FONT.
+	</li>
+	<li>
+	IDocument interface used by lexers adds BufferPointer and GetLineIndentation methods.
+	</li>
+	<li>
+	On Windows, clicking sets focus before processing the click or sending notifications.
+	</li>
+	<li>
+	Bug on OS X (macosx platform) fixed where drag/drop overwrote clipboard.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3039732&group_id=2439">Bug #3039732.</a>
+	</li>
+	<li>
+	GTK+ drawing bug when the view was horizontally scrolled more than 32000 pixels fixed.
+	</li>
+	<li>
+	SciTE bug fixed with invoking Complete Symbol from output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3050957&group_id=2439">Bug #3050957.</a>
+	</li>
+	<li>
+	Bug fixed where it was not possible to disable folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3040649&group_id=2439">Bug #3040649.</a>
+	</li>
+	<li>
+	Bug fixed with pressing Enter on a folded fold header line not opening the fold.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3043419&group_id=2439">Bug #3043419.</a>
+	</li>
+	<li>
+	SciTE 'Match case' option in find and replace user interfaces changed to 'Case sensitive' to allow use of 'v'
+	rather than 'c' as the mnemonic.
+	</li>
+	<li>
+	SciTE displays stack trace for Lua when error occurs..
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3051397&group_id=2439">Bug #3051397.</a>
+	</li>
+	<li>
+	SciTE on Windows fixes bug where double clicking on error message left focus in output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1264835&group_id=2439">Bug #1264835.</a>
+	</li>
+	<li>
+	SciTE on Windows uses SetDllDirectory to avoid a security problem.
+	</li>
+	<li>
+	C++ lexer crash fixed with preprocessor expression that looked like division by 0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3056825&group_id=2439">Bug #3056825.</a>
+	</li>
+	<li>
+	Haskell lexer improved.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3039490&group_id=2439">Feature #3039490.</a>
+	</li>
+	<li>
+	HTML lexing fixed around Django {% %} tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3034853&group_id=2439">Bug #3034853.</a>
+	</li>
+	<li>
+	HTML JavaScript lexing fixed when line end escaped.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3038381&group_id=2439">Bug #3038381.</a>
+	</li>
+	<li>
+	HTML lexer stores line state produced by a line on that line rather than on the next line.
+	</li>
+	<li>
+	Markdown lexer fixes infinite loop.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3045386&group_id=2439">Bug #3045386.</a>
+	</li>
+	<li>
+	MySQL folding bugs with END statements fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3031742&group_id=2439">Bug #3031742.</a>
+	</li>
+	<li>
+	PowerShell lexer allows '_' as a word character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3042228&group_id=2439">Feature #3042228.</a>
+	</li>
+	<li>
+	SciTE on GTK+ abandons processing of subsequent commands if a command.go.needs command fails.
+	</li>
+	<li>
+	When SciTE is closed, all buffers now receive an OnClose call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3033857&group_id=2439">Bug #3033857.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite220.zip?download">Release 2.20</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 July 2010.
+	</li>
+	<li>
+	Lexers are implemented as objects so that they may retain extra state.
+	The interfaces defined for this are tentative and may change before the next release.
+	Compatibility classes allow current lexers compiled into Scintilla to run with few changes.
+	The interface to external lexers has changed and existing external lexers will need to have changes
+	made and be recompiled.
+	A single lexer object is attached to a document whereas previously lexers were attached to views
+	which could lead to different lexers being used for split views with confusing results.
+	</li>
+	<li>
+	C++ lexer understands the preprocessor enough to grey-out inactive code due to conditional compilation.
+	</li>
+	<li>
+	SciTE can use strips within the main window for find and replace rather than dialogs.
+	On Windows SciTE always uses a strip for incremental search.
+	</li>
+	<li>
+	Lexer added for Txt2Tags language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3018736&group_id=2439">Feature #3018736.</a>
+	</li>
+	<li>
+	Sticky caret feature enhanced with additional SC_CARETSTICKY_WHITESPACE mode .
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3027559&group_id=2439">Feature #3027559.</a>
+	</li>
+	<li>
+	Bash lexer implements basic parsing of compound commands and constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3033135&group_id=2439">Feature #3033135.</a>
+	</li>
+	<li>
+	C++ folder allows disabling explicit fold comments.
+	</li>
+	<li>
+	Perl folder works for array blocks, adjacent package statements, nested PODs, and terminates package folding at __DATA__, ^D and ^Z.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3030887&group_id=2439">Feature #3030887.</a>
+	</li>
+	<li>
+	PowerShell lexer supports multiline &lt;# .. #&gt; comments and adds 2 keyword classes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3015176&group_id=2439">Feature #3015176.</a>
+	</li>
+	<li>
+	Lexing performed incrementally when needed by wrapping to make user interface more responsive.
+	</li>
+	<li>
+	SciTE setting replaceselection:yes works on GTK+.
+	</li>
+	<li>
+	SciTE Lua scripts calling io.open or io.popen on Windows have arguments treated as UTF-8 and converted to Unicode
+	so that non-ASCII file paths will work. Lua files with non-ASCII paths run.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3016951&group_id=2439">Bug #3016951.</a>
+	</li>
+	<li>
+	Crash fixed when searching for empty string.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017572&group_id=2439">Bug #3017572.</a>
+	</li>
+	<li>
+	Bugs fixed with folding and lexing when Enter pressed at start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3032652&group_id=2439">Bug #3032652.</a>
+	</li>
+	<li>
+	Bug fixed with line selection mode not affecting selection range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021480&group_id=2439">Bug #3021480.</a>
+	</li>
+	<li>
+	Bug fixed where indicator alpha was limited to 100 rather than 255.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021473&group_id=2439">Bug #3021473.</a>
+	</li>
+	<li>
+	Bug fixed where changing annotation did not cause automatic redraw.
+	</li>
+	<li>
+	Regular expression bug fixed when a character range included non-ASCII characters.
+	</li>
+	<li>
+	Compilation failure with recent compilers fixed on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3022027&group_id=2439">Bug #3022027.</a>
+	</li>
+	<li>
+	Bug fixed on Windows with multiple monitors where autocomplete pop up would appear off-screen
+	or straddling monitors.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017512&group_id=2439">Bug #3017512.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where changing directory to a Unicode path failed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011987&group_id=2439">Bug #3011987.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where combo boxes were not allowing Unicode characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012986&group_id=2439">Bug #3012986.</a>
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed when dragging files into SciTE on KDE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3026555&group_id=2439">Bug #3026555.</a>
+	</li>
+	<li>
+	SciTE bug fixed where closing untitled file could lose data if attempt to name file same as another buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011680&group_id=2439">Bug #3011680.</a>
+	</li>
+	<li>
+	COBOL number masks now correctly highlighted.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012164&group_id=2439">Bug #3012164.</a>
+	</li>
+	<li>
+	PHP comments can include &lt;?PHP without triggering state change.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2854183&group_id=2439">Bug #2854183.</a>
+	</li>
+	<li>
+	VHDL lexer styles unclosed string correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3029627&group_id=2439">Bug #3029627.</a>
+	</li>
+	<li>
+	Memory leak fixed in list boxes on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3007669&group_id=2439">Bug #3007669.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite212.zip?download">Release 2.12</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2010.
+	</li>
+	<li>
+	Drawing optimizations improve speed and fix some visible flashing when scrolling.
+	</li>
+	<li>
+	Copy Path command added to File menu in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986745&group_id=2439">Feature #2986745.</a>
+	</li>
+	<li>
+	Optional warning displayed by SciTE when saving a file which has been modified by another process.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2975041&group_id=2439">Feature #2975041.</a>
+	</li>
+	<li>
+	Flagship lexer for xBase languages updated to follow the language much more closely.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2992689&group_id=2439">Feature #2992689.</a>
+	</li>
+	<li>
+	HTML lexer highlights Django templates in more regions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3002874&group_id=2439">Feature #3002874.</a>
+	</li>
+	<li>
+	Dropping files on SciTE on Windows, releases the drag object earlier and opens the files asynchronously,
+	leading to smoother user experience.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986724&group_id=2439">Feature #2986724.</a>
+	</li>
+	<li>
+	SciTE HTML exports take the Use Monospaced Font setting into account.
+	</li>
+	<li>
+	SciTE window title "[n of m]" localized.
+	</li>
+	<li>
+	When new line inserted at start of line, markers are moved down.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986727&group_id=2439">Bug #2986727.</a>
+	</li>
+	<li>
+	On Windows, dropped text has its line ends converted, similar to pasting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005328&group_id=2439">Bug #3005328.</a>
+	</li>
+	<li>
+	Fixed bug with middle-click paste in block select mode where text was pasted next to selection rather than at cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2984460&group_id=2439">Bug #2984460.</a>
+	</li>
+	<li>
+	Fixed SciTE crash where a style had a size parameter without a value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3003834&group_id=2439">Bug #3003834.</a>
+	</li>
+	<li>
+	Debug assertions in multiple lexers fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3000566&group_id=2439">Bug #3000566.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where @font-face displayed incorrectly
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994224&group_id=2439">Bug #2994224.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where open comment caused highlighting error.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1683672&group_id=2439">Bug #1683672.</a>
+	</li>
+	<li>
+	Shell file lexer fixed highlight glitch with here docs where the first line is a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830239&group_id=2439">Bug #2830239.</a>
+	</li>
+	<li>
+	Bug fixed in SciTE openpath property that caused Open Selected File to fail to open the selected file.
+	</li>
+	<li>
+	Bug fixed in SciTE FileExt property when file name with no extension evaluated to whole path.
+	</li>
+	<li>
+	Fixed SciTE on Windows printing bug where the $(CurrentTime), $(CurrentPage) variables were not expanded.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994612&group_id=2439">Bug #2994612.</a>
+	</li>
+	<li>
+	SciTE compiles for 64-bit Windows and runs without crashing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986312&group_id=2439">Bug #2986312.</a>
+	</li>
+	<li>
+	Full Screen mode in Windows Vista/7 improved to hide Start button and size borders a little better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3002813&group_id=2439">Bug #3002813.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite211.zip?download">Release 2.11</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 April 2010.
+	</li>
+	<li>
+	Fixes compatibility of Scintilla.h with the C language.
+	</li>
+	<li>
+	With a rectangular selection SCI_GETSELECTIONSTART and SCI_GETSELECTIONEND return limits of the
+	rectangular selection rather than the limits of the main selection.
+	</li>
+	<li>
+	When SciTE on Windows is minimized to tray, only takes a single click to restore rather than a double click.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=981917&group_id=2439">Feature #981917.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite210.zip?download">Release 2.10</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 April 2010.
+	</li>
+	<li>
+	Version 1.x of GTK+ is no longer supported.
+	</li>
+	<li>
+	SciTE is no longer supported on Windows 95, 98 or ME.
+	</li>
+	<li>
+	Case-insensitive search works for non-ASCII characters in UTF-8 and 8-bit encodings.
+	Non-regex search in DBCS encodings is always case-sensitive.
+	</li>
+	<li>
+	Non-ASCII characters may be changed to upper and lower case.
+	</li>
+	<li>
+	SciTE on Windows can access all files including those with names outside the user's preferred character encoding.
+	</li>
+	<li>
+	SciTE may be extended with lexers written in Lua.
+	</li>
+	<li>
+	When there are multiple selections, the paste command can go either to the main selection or to each
+	selection. This is controlled with SCI_SETMULTIPASTE.
+	</li>
+	<li>
+	More forms of bad UTF-8 are detected including overlong sequences, surrogates, and characters outside
+	the valid range. Bad UTF-8 bytes are now displayed as 2 hex digits preceded by 'x'.
+	</li>
+	<li>
+	SCI_GETTAG retrieves the value of captured expressions within regular expression searches.
+	</li>
+	<li>
+	Django template highlighting added to the HTML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2974889&group_id=2439">Feature #2974889.</a>
+	</li>
+	<li>
+	Verilog line comments can be folded.
+	</li>
+	<li>
+	SciTE on Windows allows specifying a filter for the Save As dialog.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2943445&group_id=2439">Feature #2943445.</a>
+	</li>
+	<li>
+	Bug fixed when multiple selection disabled where rectangular selections could be expanded into multiple selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2948260&group_id=2439">Bug #2948260.</a>
+	</li>
+	<li>
+	Bug fixed when document horizontally scrolled and up/down-arrow did not return to the same
+	column after horizontal scroll occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2950799&group_id=2439">Bug #2950799.</a>
+	</li>
+	<li>
+	Bug fixed to remove hotspot highlight when mouse is moved out of the document. Windows only fix.
+	<a href="https://sourceforge.net/tracker/?func=detail&aid=2951353&group_id=2439&atid=102439">Bug #2951353.</a>
+	</li>
+	<li>
+	R lexer now performs case-sensitive check for keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2956543&group_id=2439">Bug #2956543.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ where text disappeared when a wrap occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2958043&group_id=2439">Bug #2958043.</a>
+	</li>
+	<li>
+	Bug fixed where regular expression replace cannot escape the '\' character by using '\\'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2959876&group_id=2439">Bug #2959876.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ when virtual space disabled, middle-click could still paste text beyond end of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2971618&group_id=2439">Bug #2971618.</a>
+	</li>
+	<li>
+	SciTE crash fixed when double clicking on a malformed error message in the output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2976551&group_id=2439">Bug #2976551.</a>
+	</li>
+	<li>
+	Improved performance on GTK+ when changing parameters associated with scroll bars to the same value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2964357&group_id=2439">Bug #2964357.</a>
+	</li>
+	<li>
+	Fixed bug with pressing Shift+Tab with a rectangular selection so that it performs an un-indent
+	similar to how Tab performs an indent.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite203.zip?download">Release 2.03</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 February 2010.
+	</li>
+	<li>
+	Added SCI_SETFIRSTVISIBLELINE to match SCI_GETFIRSTVISIBLELINE.
+	</li>
+	<li>
+	Erlang lexer extended set of numeric bases recognized; separate style for module:function_name; detects
+	built-in functions, known module attributes, and known preprocessor instructions; recognizes EDoc and EDoc macros;
+	separates types of comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942448&group_id=2439">Bug #2942448.</a>
+	</li>
+	<li>
+	Python lexer extended with lexer.python.strings.over.newline option that allows non-triple-quoted strings to extend
+	past line ends. This allows use of the Ren'Py language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2945550&group_id=2439">Feature #2945550.</a>
+	</li>
+	<li>
+	Fixed bugs with cursor movement after deleting a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942131&group_id=2439">Bug #2942131.</a>
+	</li>
+	<li>
+	Fixed bug where calling SCI_SETSEL when there is a rectangular selection left
+	the additional selections selected.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2947064&group_id=2439">Bug #2947064.</a>
+	</li>
+	<li>
+	Fixed macro recording bug where not all bytes in multi-byte character insertions were reported through
+	SCI_REPLACESEL.
+	</li>
+	<li>
+	Fixed SciTE bug where using Ctrl+Enter followed by Ctrl+Space produced an autocompletion list
+	with only a single line containing all the identifiers.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where running a tool made the user interface completely unresponsive.
+	</li>
+	<li>
+	Fixed SciTE on Windows Copy to RTF bug.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2108574&group_id=2439">Bug #2108574.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite202.zip?download">Release 2.02</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 January 2010.
+	</li>
+	<li>
+	Markdown lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2844081&group_id=2439">Feature #2844081.</a>
+	</li>
+	<li>
+	On GTK+, include code that understands the ranges of lead bytes for code pages 932, 936, and 950
+	so that most Chinese and Japanese text can be used on systems that are not set to the corresponding locale.
+	</li>
+	<li>
+	Allow changing the size of dots in visible whitespace using SCI_SETWHITESPACESIZE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2839427&group_id=2439">Feature #2839427.</a>
+	</li>
+	<li>
+	Additional carets can be hidden with SCI_SETADDITIONALCARETSVISIBLE.
+	</li>
+	<li>
+	Can choose anti-aliased, non-anti-aliased or lcd-optimized text using SCI_SETFONTQUALITY.
+	</li>
+	<li>
+	Retrieve the current selected text in the autocompletion list with SCI_AUTOCGETCURRENTTEXT.
+	</li>
+	<li>
+	Retrieve the name of the current lexer with SCI_GETLEXERLANGUAGE.
+	</li>
+	<li>
+	Progress 4GL lexer improves handling of comments in preprocessor declaration.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2902206&group_id=2439">Feature #2902206.</a>
+	</li>
+	<li>
+	HTML lexer extended to handle Mako template language.
+	</li>
+	<li>
+	SQL folder extended for SQL Anywhere "EXISTS" and "ENDIF" keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2887524&group_id=2439">Feature #2887524.</a>
+	</li>
+	<li>
+	SciTE adds APIPath and AbbrevPath variables.
+	</li>
+	<li>
+	SciTE on GTK+ uses pipes instead of temporary files for running tools. This should be more secure.
+	</li>
+	<li>
+	Fixed crash when calling SCI_STYLEGETFONT for a style which does not have a font set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2857425&group_id=2439">Bug #2857425.</a>
+	</li>
+	<li>
+	Fixed crash caused by not having sufficient styles allocated after choosing a lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2881279&group_id=2439">Bug #2881279.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE using autocomplete word when word characters includes space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2840141&group_id=2439">Bug #2840141.</a>
+	</li>
+	<li>
+	Fixed bug with handling upper-case file extensions SciTE on GTK+.
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions with folded folds where it would not
+	be scrolled to the correct location.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882775&group_id=2439">Bug #2882775.</a>
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions when file no longer exists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2883437&group_id=2439">Bug #2883437.</a>
+	</li>
+	<li>
+	Fixed SciTE export to HTML using the wrong background colour.
+	</li>
+	<li>
+	Fixed crash when adding an annotation and then adding a new line after the annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929708&group_id=2439">Bug #2929708.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE setting a property to nil from Lua.
+	</li>
+	<li>
+	SCI_GETSELTEXT fixed to return correct length.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929441&group_id=2439">Bug #2929441.</a>
+	</li>
+	<li>
+	Fixed text positioning problems with selection in some circumstances.
+	</li>
+	<li>
+	Fixed text positioning problems with ligatures on GTK+.
+	</li>
+	<li>
+	Fixed problem pasting into rectangular selection with caret at bottom caused text to go from the caret down
+	rather than replacing the selection.
+	</li>
+	<li>
+	Fixed problem replacing in a rectangular selection where only the final line was changed.
+	</li>
+	<li>
+	Fixed inability to select a rectangular area using Alt+Shift+Click at both corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2899746&group_id=2439">Bug #2899746.</a>
+	</li>
+	<li>
+	Fixed problem moving to start/end of a rectangular selection with left/right key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871358&group_id=2439">Bug #2871358.</a>
+	</li>
+	<li>
+	Fixed problem with Select All when there's a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2930488&group_id=2439">Bug #2930488.</a>
+	</li>
+	<li>
+	Fixed SCI_LINEDUPLICATE on a rectangular selection to not produce multiple discontinuous selections.
+	</li>
+	<li>
+	Virtual space removed when performing delete word left or delete line left.
+	Virtual space converted to real space for delete word right.
+	Preserve virtual space when pressing Delete key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882566&group_id=2439">Bug #2882566.</a>
+	</li>
+	<li>
+	Fixed problem where Shift+Alt+Down did not move through wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871749&group_id=2439">Bug #2871749.</a>
+	</li>
+	<li>
+	Fixed incorrect background colour when using coloured lines with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2914691&group_id=2439">Bug #2914691.</a>
+	</li>
+	<li>
+	Fixed failure to display wrap symbol for SC_WRAPVISUALFLAGLOC_END_BY_TEXT.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2936108&group_id=2439">Bug #2936108.</a>
+	</li>
+	<li>
+	Fixed blank background colour with EOLFilled style on last line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2890105&group_id=2439">Bug #2890105.</a>
+	</li>
+	<li>
+	Fixed problem in VB lexer with keyword at end of file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2901239&group_id=2439">Bug #2901239.</a>
+	</li>
+	<li>
+	Fixed SciTE bug where double clicking on a tab closed the file.
+	</li>
+	<li>
+	Fixed SciTE brace matching commands to only work when the caret is next to the brace, not when
+	it is in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2885560&group_id=2439">Bug #2885560.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows Vista to access files in the Program Files directory rather than allow Windows
+	to virtualize access.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2916685&group_id=2439">Bug #2916685.</a>
+	</li>
+	<li>
+	Fixed NSIS folder to handle keywords that start with '!'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2872157&group_id=2439">Bug #2872157.</a>
+	</li>
+	<li>
+	Changed linkage of Scintilla_LinkLexers to "C" so that it can be used by clients written in C.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2844718&group_id=2439">Bug #2844718.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite201.zip?download">Release 2.01</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 August 2009.
+	</li>
+	<li>
+	Fix to positioning rectangular paste when viewing line ends.
+	</li>
+	<li>
+	Don't insert new lines and indentation for line ends at end of rectangular paste.
+	</li>
+	<li>
+	When not in additional selection typing mode, cutting a rectangular selection removes all of the selected text.
+	</li>
+	<li>
+	Rectangular selections are copied to the clipboard in document order, not in the order of selection.
+	</li>
+	<li>
+	SCI_SETCURRENTPOS and SCI_SETANCHOR work in rectangular mode.
+	</li>
+	<li>
+	On GTK+, drag and drop to a later position in the document now drops at the position.
+	</li>
+	<li>
+	Fix bug where missing property did not use default value.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite200.zip?download">Release 2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 August 2009.
+	</li>
+	<li>
+	Multiple pieces of text can be selected simultaneously by holding control while dragging the mouse.
+	Typing, backspace and delete may affect all selections together.
+	</li>
+	<li>
+	Virtual space allows selecting beyond the last character on a line.
+	</li>
+	<li>
+	SciTE on GTK+ path bar is now optional and defaults to off.
+	</li>
+	<li>
+	MagikSF lexer recognizes numbers correctly.
+	</li>
+	<li>
+	Folding of Python comments and blank lines improved. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=210240&group_id=2439">Bug #210240.</a>
+	</li>
+	<li>
+	Bug fixed where background colour of last character in document leaked past that character.
+	</li>
+	<li>
+	Crash fixed when adding marker beyond last line in document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830307&group_id=2439">Bug #2830307.</a>
+	</li>
+	<li>
+	Resource leak fixed in SciTE for Windows when printing fails. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2816524&group_id=2439">Bug #2816524.</a>
+	</li>
+	<li>
+	Bug fixed on Windows where the system caret was destroyed during destruction when another window
+	was using the system caret. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830223&group_id=2439">Bug #2830223.</a>
+	</li>
+	<li>
+	Bug fixed where indentation guides were drawn over text when the indentation used a style with a different
+	space width to the default style.
+	</li>
+	<li>
+	SciTE bug fixed where box comment added a bare line feed rather than the chosen line end. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2818104&group_id=2439">Bug #2818104.</a>
+	</li>
+	<li>
+	Reverted fix that led to wrapping whole document when displaying the first line of the document.
+	</li>
+	<li>
+	Export to LaTeX in SciTE fixed to work in more cases and not use as much space. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1286548&group_id=2439">Bug #1286548.</a>
+	</li>
+	<li>
+	Bug fixed where EN_CHANGE notification was sent when performing a paste operation in a
+	read-only document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2825485&group_id=2439">Bug #2825485.</a>
+	</li>
+	<li>
+	Refactored code so that Scintilla exposes less of its internal implementation and uses the C++ standard
+	library for some basic collections. Projects that linked to Scintilla's SString or PropSet classes
+	should copy this code from a previous version of Scintilla or from SciTE.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite179.zip?download">Release 1.79</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 July 2009.
+	</li>
+	<li>
+	Memory exhaustion and other exceptions handled by placing an error value into the
+	status property rather than crashing.
+	Scintilla now builds with exception handling enabled and requires exception handling to be enabled. <br />
+	This is a major change and application developers should consider how they will deal with Scintilla exhausting
+	memory since Scintilla may not be in a stable state.
+	</li>
+	<li>
+	Deprecated APIs removed. The symbols removed are:
+	<ul>
+ <li>SCI_SETCARETPOLICY</li>
+<li> CARET_CENTER</li>
+<li> CARET_XEVEN</li>
+<li> CARET_XJUMPS</li>
+<li> SC_FOLDFLAG_BOX</li>
+<li> SC_FOLDLEVELBOXHEADERFLAG</li>
+<li> SC_FOLDLEVELBOXFOOTERFLAG</li>
+<li> SC_FOLDLEVELCONTRACTED</li>
+<li> SC_FOLDLEVELUNINDENT</li>
+<li> SCN_POSCHANGED</li>
+<li> SCN_CHECKBRACE</li>
+<li> SCLEX_ASP</li>
+<li> SCLEX_PHP</li>
+</ul>
+	</li>
+	<li>
+	Cocoa platform added.
+	</li>
+	<li>
+	Names of struct types in Scintilla.h now start with "Sci_" to avoid possible clashes with platform
+	definitions. Currently, the old names still work but these will be phased out.
+	</li>
+	<li>
+	When lines are wrapped, subsequent lines may be indented to match the indent of the initial line,
+	or one more indentation level. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2796119&group_id=2439">Feature #2796119.</a>
+	</li>
+	<li>
+	APIs added for finding the character at a point rather than an inter-character position. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2646738&group_id=2439">Feature #2646738.</a>
+	</li>
+	<li>
+	A new marker SC_MARK_BACKGROUND_UNDERLINE is drawn in the text area as an underline
+	the full width of the window.
+	</li>
+	<li>
+	Batch file lexer understands variables surrounded by '!'.
+	</li>
+	<li>
+	CAML lexer also supports SML.
+	</li>
+	<li>
+	D lexer handles string and numeric literals more accurately. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2793782&group_id=2439">Feature #2793782.</a>
+	</li>
+	<li>
+	Forth lexer is now case-insensitive and better supports numbers like $hex and %binary. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2804894&group_id=2439">Feature #2804894.</a>
+	</li>
+	<li>
+	Lisp lexer treats '[', ']', '{', and '}' as balanced delimiters which is common usage. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794989&group_id=2439">Feature #2794989.</a>
+	<br />
+	It treats keyword argument names as being equivalent to symbols. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794901&group_id=2439">Feature #2794901.</a>
+	</li>
+	<li>
+	Pascal lexer bug fixed to prevent hang when 'interface' near beginning of file. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2802863&group_id=2439">Bug #2802863.</a>
+	</li>
+	<li>
+	Perl lexer bug fixed where previous lexical states persisted causing "/" special case styling and
+	subroutine prototype styling to not be correct. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809168&group_id=2439">Bug #2809168.</a>
+	</li>
+	<li>
+	XML lexer fixes bug where Unicode entities like '&amp;—' were broken into fragments. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2804760&group_id=2439">Bug #2804760.</a>
+	</li>
+	<li>
+	SciTE on GTK+ enables scrolling the tab bar on recent versions of GTK+. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2061821&group_id=2439">Feature #2061821.</a>
+	</li>
+	<li>
+	SciTE on Windows allows tab bar tabs to be reordered by drag and drop.
+	</li>
+	<li>
+	Unit test script for Scintilla on Windows included with source code.
+	</li>
+	<li>
+	User defined menu items are now localized when there is a matching translation.
+	</li>
+	<li>
+	Width of icon column of autocompletion lists on GTK+ made more consistent.
+	</li>
+	<li>
+	Bug with slicing UTF-8 text into character fragments when there is a sequence of 100 or more 3 byte characters. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2780566&group_id=2439">Bug #2780566.</a>
+	</li>
+	<li>
+	Folding bugs introduced in 1.78 fixed. Some of the fix was generic and there was also a specific fix for C++.
+	</li>
+	<li>
+	Bug fixed where a rectangular paste was not padding the line with sufficient spaces to align the pasted text.
+	</li>
+	<li>
+	Bug fixed with showing all text on each line of multi-line annotations when styling the whole annotation using SCI_ANNOTATIONSETSTYLE. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2789430&group_id=2439">Bug #2789430.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite178.zip?download">Release 1.78</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 28 April 2009.
+	</li>
+	<li>
+	Annotation lines may be added to each line.
+	</li>
+	<li>
+	A text margin may be defined with different text on each line.
+	</li>
+	<li>
+	Application actions may be added to the undo history.
+	</li>
+	<li>
+	Can query the symbol defined for a marker.
+	An available symbol added for applications to indicate that plugins may allocate a marker.
+	</li>
+	<li>
+	Can increase the amount of font ascent and descent.
+	</li>
+	<li>
+	COBOL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Nimrod lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2642620&group_id=2439">Feature #2642620.</a>
+	</li>
+	<li>
+	PowerPro lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2195308&group_id=2439">Feature #2195308.</a>
+	</li>
+	<li>
+	SML lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2710950&group_id=2439">Feature #2710950.</a>
+	</li>
+	<li>
+	SORCUS Installation file lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2343375&group_id=2439">Feature #2343375.</a>
+	</li>
+	<li>
+	TACL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	TAL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Rewritten Pascal lexer with improved folding and other fixes. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2190650&group_id=2439">Feature #2190650.</a>
+	</li>
+	<li>
+	INDIC_ROUNDBOX translucency level can be modified. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2586290&group_id=2439">Feature #2586290.</a>
+	</li>
+	<li>
+	C++ lexer treats angle brackets in #include directives as quotes when styling.within.preprocessor. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2551033&group_id=2439">Bug #2551033.</a>
+	</li>
+	<li>
+	Inno Setup lexer is sensitive to whether within the [Code] section and handles comments better. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2552973&group_id=2439">Bug #2552973.</a>
+	</li>
+	<li>
+	HTML lexer does not go into script mode when script tag is self-closing.
+	</li>
+	<li>
+	HTML folder fixed where confused by comments when fold.html.preprocessor off. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2532774&group_id=2439">Bug #2532774.</a>
+	</li>
+	<li>
+	Perl lexer fixes problem with string matching caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2648342&group_id=2439">Bug #2648342.</a>
+	</li>
+	<li>
+	Progress lexer fixes problem with "last-event:function" phrase. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2483619&group_id=2439">Bug #2483619.</a>
+	</li>
+	<li>
+	Properties file lexer extended to handle RFC2822 text when lexer.props.allow.initial.spaces on.
+	</li>
+	<li>
+	Python lexer adds options for Python 3 and Cython.
+	</li>
+	<li>
+	Shell lexer fixes heredoc problem caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635257&group_id=2439">Bug #2635257.</a>
+	</li>
+	<li>
+	TeX lexer handles comment at end of line correctly. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2698766&group_id=2439">Bug #2698766.</a>
+	</li>
+	<li>
+	SciTE retains selection range when performing a replace selection command. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2339160&group_id=2439">Feature #2339160.</a>
+	</li>
+	<li>
+	SciTE definition of word characters fixed to match documentation. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2464531&group_id=2439">Bug #2464531.</a>
+	</li>
+	<li>
+	SciTE on GTK+ performing Search or Replace when dialog already shown now brings dialog to foreground.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2634224&group_id=2439">Bug #2634224.</a>
+	</li>
+	<li>
+	Fixed encoding bug with calltips on GTK+.
+	</li>
+	<li>
+	Block caret drawn in correct place on wrapped lines. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2126144&group_id=2439">Bug #2126144.</a>
+	</li>
+	<li>
+	Compilation for 64 bit Windows works using MinGW. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2515578&group_id=2439">Bug #2515578.</a>
+	</li>
+	<li>
+	Incorrect memory freeing fixed on OS X.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2354098&group_id=2439">Bug #2354098</a>,
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2671749&group_id=2439">Bug #2671749.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed on startup when child process exits before initialization complete.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2716987&group_id=2439">Bug #2716987.</a>
+	</li>
+	<li>
+	Crash fixed when AutoCompleteGetCurrent called with no active autocompletion.
+	</li>
+	<li>
+	Flickering diminished when pressing Tab. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2723006&group_id=2439">Bug #2723006.</a>
+	</li>
+	<li>
+	Namespace compilation issues with GTK+ on OS X fixed.
+	</li>
+	<li>
+	Increased maximum length of SciTE's Language menu on GTK+ to 100 items. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2528241&group_id=2439">Bug #2528241.</a>
+	</li>
+	<li>
+	Fixed incorrect Python lexing for multi-line continued strings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2450963&group_id=2439">Bug #2450963.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite177.zip?download">Release 1.77</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 October 2008.
+	</li>
+	<li>
+	Direct temporary access to Scintilla's text buffer to allow simple efficient interfacing
+	to libraries like regular expression libraries.
+	</li>
+	<li>
+	Scintilla on Windows can interpret keys as Unicode even when a narrow character
+	window with SCI_SETKEYSUNICODE.
+	</li>
+	<li>
+	Notification sent when autocompletion cancelled.
+	</li>
+	<li>
+	MySQL lexer added.
+	</li>
+	<li>
+	Lexer for gettext .po files added.
+	</li>
+	<li>
+	Abaqus lexer handles program structure more correctly.
+	</li>
+	<li>
+	Assembler lexer works with non-ASCII text.
+	</li>
+	<li>
+	C++ lexer allows mixed case doc comment tags.
+	</li>
+	<li>
+	CSS lexer updated and works with non-ASCII.
+	</li>
+	<li>
+	Diff lexer adds style for changed lines, handles subversion diffs better and
+	fixes styling and folding for lines containing chunk dividers ("---").
+	</li>
+	<li>
+	FORTRAN lexer accepts more styles of compiler directive.
+	</li>
+	<li>
+	Haskell lexer allows hexadecimal literals.
+	</li>
+	<li>
+	HTML lexer improves PHP and JavaScript folding.
+	PHP heredocs, nowdocs, strings and comments processed more accurately.
+	Internet Explorer's non-standard &gt;comment&lt; tag supported.
+	Script recognition in XML can be controlled with lexer.xml.allow.scripts property.
+	</li>
+	<li>
+	Lua lexer styles last character correctly.
+	</li>
+	<li>
+	Perl lexer update.
+	</li>
+	<li>
+	Comment folding implemented for Ruby.
+	</li>
+	<li>
+	Better TeX folding.
+	</li>
+	<li>
+	Verilog lexer updated.
+	</li>
+	<li>
+	Windows Batch file lexer handles %~ and %*.
+	</li>
+	<li>
+	YAML lexer allows non-ASCII text.
+	</li>
+	<li>
+	SciTE on GTK+ implements "Replace in Buffers" in advanced mode.
+	</li>
+	<li>
+	The extender OnBeforeSave method can override the default file saving behaviour by retuning true.
+	</li>
+	<li>
+	Window position and recent files list may be saved into the session file.
+	</li>
+	<li>
+	Right button press outside the selection moves the caret.
+	</li>
+	<li>
+	SciTE load.on.activate works when closing a document reveals a changed document.
+	</li>
+	<li>
+	SciTE bug fixed where eol.mode not used for initial buffer.
+	</li>
+	<li>
+	SciTE bug fixed where a file could be saved as the same name as another
+	buffer leading to confusing behaviour.
+	</li>
+	<li>
+	Fixed display bug for long lines in same style on Windows.
+	</li>
+	<li>
+	Fixed SciTE crash when finding matching preprocessor command used on some files.
+	</li>
+	<li>
+	Drawing performance improved for files with many blank lines.
+	</li>
+	<li>
+	Folding bugs fixed where changing program text produced a decrease in fold level on a fold header line.
+	</li>
+	<li>
+	Clearing document style now clears all indicators.
+	</li>
+	<li>
+	SciTE's embedded Lua updated to 5.1.4.
+	</li>
+	<li>
+	SciTE will compile with versions of GTK+ before 2.8 again.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where multiple files not opened.
+	</li>
+	<li>
+	Bug fixed with SCI_VCHOMEWRAP and SCI_VCHOMEWRAPEXTEND on white last line.
+	</li>
+	<li>
+	Regular expression bug fixed where "^[^(]+$" matched empty lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite176.zip?download">Release 1.76</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 16 March 2008.
+	</li>
+	<li>
+	Support for PowerShell.
+	</li>
+	<li>
+	Lexer added for Magik.
+	</li>
+	<li>
+	Director extension working on GTK+.
+	</li>
+	<li>
+	Director extension may set focus to SciTE through "focus:" message on GTK+.
+	</li>
+	<li>
+	C++ folder handles final line better in some cases.
+	</li>
+	<li>
+	SCI_COPYALLOWLINE added which is similar to SCI_COPY except that if the selection is empty then
+	the line holding the caret is copied. On Windows an extra clipboard format allows pasting this as a whole
+	line before the current selection. This behaviour is compatible with Visual Studio.
+	</li>
+	<li>
+	On Windows, the horizontal scroll bar can handle wider files.
+	</li>
+	<li>
+	On Windows, a system palette leak was fixed. Should not affect many as palette mode is rarely used.
+	</li>
+	<li>
+	Install command on GTK+ no longer tries to set explicit owner.
+	</li>
+	<li>
+	Perl lexer handles defined-or operator "//".
+	</li>
+	<li>
+	Octave lexer fixes "!=" operator.
+	</li>
+	<li>
+	Optimized selection change drawing to not redraw as much when not needed.
+	</li>
+	<li>
+	SciTE on GTK+ no longer echoes Lua commands so is same as on Windows.
+	</li>
+	<li>
+	Automatic vertical scrolling limited to one line at a time so is not too fast.
+	</li>
+	<li>
+	Crash fixed when line states set beyond end of line states. This occurred when lexers did not
+	set a line state for each line.
+	</li>
+	<li>
+	Crash in SciTE on Windows fixed when search for 513 character string fails.
+	</li>
+	<li>
+	SciTE disables translucent features on Windows 9x due to crashes reported when using translucency.
+	</li>
+	<li>
+	Bug fixed where whitespace background was not seen on wrapped lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite175.zip?download">Release 1.75</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 22 November 2007.
+	</li>
+	<li>
+	Some WordList and PropSet functionality moved from Scintilla to SciTE.
+	Projects that link to Scintilla's code for these classes may need to copy
+	code from SciTE.
+	</li>
+	<li>
+	Borland C++ can no longer build Scintilla.
+	</li>
+	<li>
+	Invalid bytes in UTF-8 mode are displayed as hex blobs. This also prevents crashes due to
+	passing invalid UTF-8 to platform calls.
+	</li>
+	<li>
+	Indentation guides enhanced to be visible on completely empty lines when possible.
+	</li>
+	<li>
+	The horizontal scroll bar may grow to match the widest line displayed.
+	</li>
+	<li>
+	Allow autocomplete pop ups to appear outside client rectangle in some cases.
+	</li>
+	<li>
+	When line state changed, SC_MOD_CHANGELINESTATE modification notification sent and
+	margin redrawn.
+	</li>
+	<li>
+	SciTE scripts can access the menu command values IDM_*.
+	</li>
+	<li>
+	SciTE's statement.end property has been implemented again.
+	</li>
+	<li>
+	SciTE shows paths and matches in different styles for Find In Files.
+	</li>
+	<li>
+	Incremental search in SciTE for Windows is modeless to make it easier to exit.
+	</li>
+	<li>
+	Folding performance improved.
+	</li>
+	<li>
+	SciTE for GTK+ now includes a Browse button in the Find In Files dialog.
+	</li>
+	<li>
+	On Windows versions that support Unicode well, Scintilla is a wide character window
+	which allows input for some less common languages like Armenian, Devanagari,
+	Tamil, and Georgian. To fully benefit, applications should use wide character calls.
+	</li>
+	<li>
+	Lua function names are exported from SciTE to allow some extension libraries to work.
+	</li>
+	<li>
+	Lexers added for Abaqus, Ansys APDL, Asymptote, and R.
+	</li>
+	<li>
+	SCI_DELWORDRIGHTEND added for closer compatibility with GTK+ entry widget.
+	</li>
+	<li>
+	The styling buffer may now use all 8 bits in each byte for lexical states with 0 bits for indicators.
+	</li>
+	<li>
+	Multiple characters may be set for SciTE's calltip.&lt;lexer&gt;.parameters.start property.
+	</li>
+	<li>
+	Bash lexer handles octal literals.
+	</li>
+	<li>
+	C++/JavaScript lexer recognizes regex literals in more situations.
+	</li>
+	<li>
+	Haskell lexer fixed for quoted strings.
+	</li>
+	<li>
+	HTML/XML lexer does not notice XML indicator if there is
+	non-whitespace between the "&lt;?" and "XML".
+	ASP problem fixed where &lt;/ is used inside a comment.
+	</li>
+	<li>
+	Error messages from Lua 5.1 are recognized.
+	</li>
+	<li>
+	Folding implemented for Metapost.
+	</li>
+	<li>
+	Perl lexer enhanced for handling minus-prefixed barewords,
+	underscores in numeric literals and vector/version strings,
+	^D and ^Z similar to __END__,
+	subroutine prototypes as a new lexical class,
+	formats and format blocks as new lexical classes, and
+	'/' suffixed keywords and barewords.
+	</li>
+	<li>
+	Python lexer styles all of a decorator in the decorator style rather than just the name.
+	</li>
+	<li>
+	YAML lexer styles colons as operators.
+	</li>
+	<li>
+	Fixed SciTE bug where undo would group together multiple separate modifications.
+	</li>
+	<li>
+	Bug fixed where setting background colour of calltip failed.
+	</li>
+	<li>
+	SciTE allows wildcard suffixes for file pattern based properties.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where user not prompted to save untitled buffer.
+	</li>
+	<li>
+	SciTE bug fixed where property values from one file were not seen by lower priority files.
+	</li>
+	<li>
+	Bug fixed when showing selection with a foreground colour change which highlighted
+	an incorrect range in some positions.
+	</li>
+	<li>
+	Cut now invokes SCN_MODIFYATTEMPTRO notification.
+	</li>
+	<li>
+	Bug fixed where caret not shown at beginning of wrapped lines.
+	Caret made visible in some cases after wrapping and scroll bar updated after wrapping.
+	</li>
+	<li>
+	Modern indicators now work on wrapped lines.
+	</li>
+	<li>
+	Some crashes fixed for 64-bit GTK+.
+	</li>
+	<li>
+	On GTK+ clipboard features improved for VMWare tools copy and paste.
+	SciTE exports the clipboard more consistently on shut down.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite174.zip?download">Release 1.74</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 June 2007.
+	</li>
+	<li>
+	OS X support.
+	</li>
+	<li>
+	Indicators changed to be a separate data structure allowing more indicators. Storing indicators in high bits
+	of styling bytes is deprecated and will be removed in the next version.
+	</li>
+	<li>
+	Unicode support extended to all Unicode characters not just the Basic Multilingual Plane.
+	</li>
+	<li>
+	Performance improved on wide lines by breaking long runs in a single style into shorter segments.
+	</li>
+	<li>
+	Performance improved by caching layout of short text segments.
+	</li>
+	<li>
+	SciTE includes Lua 5.1.
+	</li>
+	<li>
+	Caret may be displayed as a block.
+	</li>
+	<li>
+	Lexer added for GAP.
+	</li>
+	<li>
+	Lexer added for PL/M.
+	</li>
+	<li>
+	Lexer added for Progress.
+	</li>
+	<li>
+	SciTE session files have changed format to be like other SciTE .properties files
+	and now use the extension .session.
+	Bookmarks and folds may optionally be saved in session files.
+	Session files created with previous versions of SciTE will not load into this version.
+	</li>
+	<li>
+	SciTE's extension and scripting interfaces add OnKey, OnDwellStart, and OnClose methods.
+	</li>
+	<li>
+	On GTK+, copying to the clipboard does not include the text/urilist type since this caused problems when
+	pasting into Open Office.
+	</li>
+	<li>
+	On GTK+, Scintilla defaults caret blink rate to platform preference.
+	</li>
+	<li>
+	Dragging does not start until the mouse has been dragged a certain amount.
+	This stops spurious drags when just clicking inside the selection.
+	</li>
+	<li>
+	Bug fixed where brace highlight not shown when caret line background set.
+	</li>
+	<li>
+	Bug fixed in Ruby lexer where out of bounds access could occur.
+	</li>
+	<li>
+	Bug fixed in XML folding where tags were not being folded because they are singletons in HTML.
+	</li>
+	<li>
+	Bug fixed when many font names used.
+	</li>
+	<li>
+	Layout bug fixed on GTK+ where fonts have ligatures available.
+	</li>
+	<li>
+	Bug fixed with SCI_LINETRANSPOSE on a blank line.
+	</li>
+	<li>
+	SciTE hang fixed when using UNC path with directory properties feature.
+	</li>
+	<li>
+	Bug on Windows fixed by examining dropped text for Unicode even in non-Unicode mode so it
+	can work when source only provides Unicode or when using an encoding different from the
+	system default.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where Stop Executing did not work when more than a single process started.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where mouse wheel was not switching between buffers.
+	</li>
+	<li>
+	Minor line end fix to PostScript lexer.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite173.zip?download">Release 1.73</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 March 2007.
+	</li>
+	<li>
+	SciTE adds a Directory properties file to configure behaviour for files in a directory and its subdirectories.
+	</li>
+	<li>
+	Style changes may be made during text modification events.
+	</li>
+	<li>
+	Regular expressions recognize \d, \D, \s, \S, \w, \W, and \xHH.
+	</li>
+	<li>
+	Support for cmake language added.
+	</li>
+	<li>
+	More Scintilla properties can be queried.
+	</li>
+	<li>
+	Edge line drawn under text.
+	</li>
+	<li>
+	A savesession command added to SciTE director interface.
+	</li>
+	<li>
+	SciTE File | Encoding menu item names changed to be less confusing.
+	</li>
+	<li>
+	SciTE on GTK+ dialog buttons reordered to follow guidelines.
+	</li>
+	<li>
+	SciTE on GTK+ removed GTK+ 1.x compatible file dialog code.
+	</li>
+	<li>
+	SciTE on GTK+ recognizes key names KeypadMultiply and KeypadDivide.
+	</li>
+	<li>
+	Background colour of line wrapping visual flag changed to STYLE_DEFAULT.
+	</li>
+	<li>
+	Makefile lexing enhanced for ':=' operator and when lines start with tab.
+	</li>
+	<li>
+	TADS3 lexer and folder improved.
+	</li>
+	<li>
+	SCN_DOUBLECLICK notification may set SCI_SHIFT, SCI_CTRL, and SCI_ALT flags on modifiers field.
+	</li>
+	<li>
+	Slow folding of large constructs in Python fixed.
+	</li>
+	<li>
+	MSSQL folding fixed to be case-insensitive and fold at more keywords.
+	</li>
+	<li>
+	SciTE's brace matching works better for HTML.
+	</li>
+	<li>
+	Determining API list items checks for specified parameters start character before default '('.
+	</li>
+	<li>
+	Hang fixed in HTML lexer.
+	</li>
+	<li>
+	Bug fixed in with LineTranspose command where markers could move to different line.
+	</li>
+	<li>
+	Memory released when buffer completely emptied.
+	</li>
+	<li>
+	If translucency not available on Windows, draw rectangular outline instead.
+	</li>
+	<li>
+	Bash lexer handles "-x" in "--x-includes..." better.
+	</li>
+	<li>
+	AutoIt3 lexer fixes string followed by '+'.
+	</li>
+	<li>
+	LinesJoin fixed where it stopped early due to not adjusting for inserted spaces..
+	</li>
+	<li>
+	StutteredPageDown fixed when lines wrapped.
+	</li>
+	<li>
+	FormatRange fixed to not double count line number width which could lead to a large space.
+	</li>
+	<li>
+	SciTE Export As PDF and Latex commands fixed to format floating point numbers with '.' even in locales
+	that use ','.
+	</li>
+	<li>
+	SciTE bug fixed where File | New could produce buffer with contents of previous file when using read-only mode.
+	</li>
+	<li>
+	SciTE retains current scroll position when switching buffers and fold.on.open set.
+	</li>
+	<li>
+	SciTE crash fixed where '*' used to invoke parameters dialog.
+	</li>
+	<li>
+	SciTE bugs when writing large UCS-2 files fixed.
+	</li>
+	<li>
+	Bug fixed when scrolling inside a SCN_PAINTED event by invalidating window
+	rather than trying to perform synchronous painting.
+	</li>
+	<li>
+	SciTE for GTK+ View | Full Screen works on recent versions of GTK+.
+	</li>
+	<li>
+	SciTE for Windows enables and disables toolbar commands correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite172.zip?download">Release 1.72</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 15 January 2007.
+	</li>
+	<li>
+	Performance of per-line data improved.
+	</li>
+	<li>
+	SC_STARTACTION flag set on the first modification notification in an undo
+	transaction to help synchronize the container's undo stack with Scintilla's.
+	</li>
+	<li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li>
+	<li>
+	Scintilla supports extending appearance of selection to right hand margin.
+	</li>
+	<li>
+	Incremental search available on GTK+.
+	</li>
+	<li>
+	SciTE Indentation Settings dialog available on GTK+ and adds a "Convert" button.
+	</li>
+	<li>
+	Find in Files can optionally ignore binary files or directories that start with ".".
+	</li>
+	<li>
+	Lexer added for "D" language.
+	</li>
+	<li>
+	Export as HTML shows folding with underline lines and +/- symbols.
+	</li>
+	<li>
+	Ruby lexer interprets interpolated strings as expressions.
+	</li>
+	<li>
+	Lua lexer fixes some cases of numeric literals.
+	</li>
+	<li>
+	C++ folder fixes bug with "@" in doc comments.
+	</li>
+	<li>
+	NSIS folder handles !if and related commands.
+	</li>
+	<li>
+	Inno setup lexer adds styling for single and double quoted strings.
+	</li>
+	<li>
+	Matlab lexer handles backslashes in string literals correctly.
+	</li>
+	<li>
+	HTML lexer fixed to allow "?&gt;" in comments in Basic script.
+	</li>
+	<li>
+	Added key codes for Windows key and Menu key.
+	</li>
+	<li>
+	Lua script method scite.MenuCommand(x) performs a menu command.
+	</li>
+	<li>
+	SciTE bug fixed with box comment command near start of file setting selection to end of file.
+	</li>
+	<li>
+	SciTE on GTK+, fixed loop that occurred with automatic loading for an unreadable file.
+	</li>
+	<li>
+	SciTE asks whether to save files when Windows shuts down.
+	</li>
+	<li>
+	Save Session on Windows now defaults the extension to "ses".
+	</li>
+	<li>
+	Bug fixed with single character keywords.
+	</li>
+	<li>
+	Fixed infinite loop for SCI_GETCOLUMN for position beyond end of document.
+	</li>
+	<li>
+	Fixed failure to accept typing on Solaris/GTK+ when using default ISO-8859-1 encoding.
+	</li>
+	<li>
+	Fixed warning from Lua in SciTE when creating a new buffer when already have
+	maximum number of buffers open.
+	</li>
+	<li>
+	Crash fixed with "%%" at end of batch file.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite171.zip?download">Release 1.71</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 21 August 2006.
+	</li>
+	<!--li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li-->
+	<li>
+	Double click notification includes line and position.
+	</li>
+	<li>
+	VB lexer bugs fixed for preprocessor directive below a comment or some other states and
+	to use string not closed style back to the starting quote when there are internal doubled quotes.
+	</li>
+	<li>
+	C++ lexer allows identifiers to contain '$' and non-ASCII characters such as UTF-8.
+	The '$' character can be disallowed with lexer.cpp.allow.dollars=0.
+	</li>
+	<li>
+	Perl lexer allows UTF-8 identifiers and has some other small improvements.
+	</li>
+	<li>
+	SciTE's $(CurrentWord) uses word.characters.&lt;filepattern&gt; to define the word
+	rather than a hardcoded list of word characters.
+	</li>
+	<li>
+	SciTE Export as HTML adds encoding information for UTF-8 file and fixes DOCTYPE.
+	</li>
+	<li>
+	SciTE session and .recent files default to the user properties directory rather than global
+	properties directory.
+	</li>
+	<li>
+	Left and right scroll events handled correctly on GTK+ and horizontal scroll bar has more sensible
+	distances for page and arrow clicks.
+	</li>
+	<li>
+	SciTE on GTK+ tab bar fixed to work on recent versions of GTK+.
+	</li>
+	<li>
+	On GTK+, if the approximate character set conversion is unavailable, a second attempt is made
+	without approximations. This may allow keyboard input and paste to work on older systems.
+	</li>
+	<li>
+	SciTE on GTK+ can redefine the Insert key.
+	</li>
+	<li>
+	SciTE scripting interface bug fixed where some string properties could not be changed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite170.zip?download">Release 1.70</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 20 June 2006.
+	</li>
+	<li>
+	On GTK+, character set conversion is performed using an option that allows approximate conversions rather
+	than failures when a character can not be converted. This may lead to similar characters being inserted or
+	when no similar character is available a '?' may be inserted.
+	</li>
+	<li>
+	On GTK+, the internationalized IM (Input Method) feature is used for all typed input for all character sets.
+	</li>
+	<li>
+	Scintilla has new margin types SC_MARGIN_BACK and SC_MARGIN_FORE that use the default
+	style's background and foreground colours (normally white and black) as the background to the margin.
+	</li>
+	<li>
+	Scintilla/GTK+ allows file drops on Windows when drop is of type DROPFILES_DND
+	as well as text/uri-list.
+	</li>
+	<li>
+	Code page can only be set to one of the listed valid values.
+	</li>
+	<li>
+	Text wrapping fixed for cases where insertion was not wide enough to trigger
+	wrapping before being styled but was after styling.
+	</li>
+	<li>
+	SciTE find marks are removed before printing or exporting to avoid producing incorrect styles.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite169.zip?download">Release 1.69</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2006.
+	</li>
+	<li>
+	SciTE supports z-order based buffer switching on Ctrl+Tab.
+	</li>
+	<li>
+	Translucent support for selection and whole line markers.
+	</li>
+	<li>
+	SciTE may have per-language abbreviations files.
+	</li>
+	<li>
+	Support for Spice language.
+	</li>
+	<li>
+	On GTK+ autocompletion lists are optimized and use correct selection colours.
+	</li>
+	<li>
+	On GTK+ the URI data type is preferred in drag and drop so that applications
+	will see files dragged from the shell rather than dragging the text of the file name
+	into the document.
+	</li>
+	<li>
+	Increased number of margins to 5.
+	</li>
+	<li>
+	Basic lexer allows include directive $include: "file name".
+	</li>
+	<li>
+	SQL lexer no longer bases folding on indentation.
+	</li>
+	<li>
+	Line ends are transformed when copied to clipboard on
+	Windows/GTK+2 as well as Windows/GTK+ 1.
+	</li>
+	<li>
+	Lexing code masks off the indicator bits on the start style before calling the lexer
+	to avoid confusing the lexer when an application has used an indicator.
+	</li>
+	<li>
+	SciTE savebefore:yes only saves the file when it has been changed.
+	</li>
+	<li>
+	SciTE adds output.initial.hide setting to allow setting the size of the output pane
+	without it showing initially.
+	</li>
+	<li>
+	SciTE on Windows Go To dialog allows line number with more digits.
+	</li>
+	<li>
+	Bug in HTML lexer fixed where a segment of PHP could switch scripting language
+	based on earlier text on that line.
+	</li>
+	<li>
+	Memory bug fixed when freeing regions on GTK+.
+	Other minor bugs fixed on GTK+.
+	</li>
+	<li>
+	Deprecated GTK+ calls in Scintilla replaced with current calls.
+	</li>
+	<li>
+	Fixed a SciTE bug where closing the final buffer, if read-only, left the text present in an
+	untitled buffer.
+	</li>
+	<li>
+	Bug fixed in bash lexer that prevented folding.
+	</li>
+	<li>
+	Crash fixed in bash lexer when backslash at end of file.
+	</li>
+	<li>
+	Crash on recent releases of GTK+ 2.x avoided by changing default font from X
+	core font to Pango font "!Sans".
+	</li>
+	<li>
+	Fix for SciTE properties files where multiline properties continued over completely blank lines.
+	</li>
+	<li>
+	Bug fixed in SciTE/GTK+ director interface where more data available than
+	buffer size.
+	</li>
+	<li>
+	Minor visual fixes to SciTE splitter on GTK+.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite168.zip?download">Release 1.68</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 9 March 2006.
+	</li>
+	<li>
+	Translucent drawing implemented for caret line and box indicators.
+	</li>
+	<li>
+	Lexer specifically for TCL is much more accurate than reusing C++ lexer.
+	</li>
+	<li>
+	Support for Inno Setup scripts.
+	</li>
+	<li>
+	Support for Opal language.
+	</li>
+	<li>
+	Calltips may use a new style, STYLE_CALLTIP which allows choosing a
+	different font for calltips.
+	</li>
+	<li>
+	Python lexer styles comments on decorators.
+	</li>
+	<li>
+	HTML lexer refined handling of "?>" and "%>" within server
+	side scripts.
+	</li>
+	<li>
+	Batch file lexer improved.
+	</li>
+	<li>
+	Eiffel lexer doesn't treat '.' as a name character.
+	</li>
+	<li>
+	Lua lexer handles length operator, #, and hex literals.
+	</li>
+	<li>
+	Properties file lexer has separate style for keys.
+	</li>
+	<li>
+	PL/SQL folding improved.
+	</li>
+	<li>
+	SciTE Replace dialog always searches in forwards direction.
+	</li>
+	<li>
+	SciTE can detect language of file from initial #! line.
+	</li>
+	<li>
+	SciTE on GTK+ supports output.scroll=2 setting.
+	</li>
+	<li>
+	SciTE can perform an import a properties file from the command line.
+	</li>
+	<li>
+	Set of word characters used for regular expression \&lt; and \&gt;.
+	</li>
+	<li>
+	Bug fixed with SCI_COPYTEXT stopping too early.
+	</li>
+	<li>
+	Bug fixed with splitting lines so that all lines are split.
+	</li>
+	<li>
+	SciTE calls OnSwitchFile when closing one buffer causes a switch to another.
+	</li>
+	<li>
+	SciTE bug fixed where properties were being reevaluated without good reason
+	after running a macro.
+	</li>
+	<li>
+	Crash fixed when clearing document with some lines contracted in word wrap mode.
+	</li>
+	<li>
+	Palette expands as more entries are needed.
+	</li>
+	<li>
+	SCI_POSITIONFROMPOINT returns more reasonable value when close to
+	last text on a line.
+	</li>
+	<li>
+	On Windows, long pieces of text may be drawn in segments if they fail to draw
+	as a whole.
+	</li>
+	<li>
+	Bug fixed with bad drawing when some visual changes made inside SCN_UPDATEUI
+	notification.
+	</li>
+	<li>
+	SciTE bug fixed with groupundo setting.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite167.zip?download">Release 1.67</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 17 December 2005.
+	</li>
+	<li>
+	Scintilla checks the paint region more accurately when seeing if an area is being
+	repainted. Platform layer implementations may need to change for this to take
+	effect. This fixes some drawing and styling bugs. Also optimized some parts of
+	marker code to only redraw the line of the marker rather than whole of the margin.
+	</li>
+	<li>
+	Quoted identifier style for SQL. SQL folding performed more simply.
+	</li>
+	<li>
+	Ruby lexer improved to better handle here documents and non-ASCII
+	characters.
+	</li>
+	<li>
+	Lua lexer supports long string and block comment syntax from Lua 5.1.
+	</li>
+	<li>
+	Bash lexer handles here documents better.
+	</li>
+	<li>
+	JavaScript lexing recognizes regular expressions more accurately and includes flag
+	characters in the regular expression style. This is both in JavaScript files and when
+	JavaScript is embedded in HTML.
+	</li>
+	<li>
+	Scintilla API provided to reveal how many style bits are needed for the
+	current lexer.
+	</li>
+	<li>
+	Selection duplicate added.
+	</li>
+	<li>
+	Scintilla API for adding a set of markers to a line.
+	</li>
+	<li>
+	DBCS encodings work on Windows 9x.
+	</li>
+	<li>
+	Convention defined for property names to be used by lexers and folders
+	so they can be automatically discovered and forwarded from containers.
+	</li>
+	<li>
+	Default bookmark in SciTE changed to a blue sphere image.
+	</li>
+	<li>
+	SciTE stores the time of last asking for a save separately for each buffer
+	which fixes bugs with automatic reloading.
+	</li>
+	<li>
+	On Windows, pasted text has line ends converted to current preference.
+	GTK+ already did this.
+	</li>
+	<li>
+	Kid template language better handled by HTML lexer by finishing ASP Python
+	mode when a ?> is found.
+	</li>
+	<li>
+	SciTE counts number of characters in a rectangular selection correctly.
+	</li>
+	<li>
+	64-bit compatibility improved. One change that may affect user code is that
+	the notification message header changed to include a pointer-sized id field
+	to match the current Windows definition.
+	</li>
+	<li>
+	Empty ranges can no longer be dragged.
+	</li>
+	<li>
+	Crash fixed when calls made that use layout inside the painted notification.
+	</li>
+	<li>
+	Bug fixed where Scintilla created pixmap buffers that were too large leading
+	to failures when many instances used.
+	</li>
+	<li>
+	SciTE sets the directory of a new file to the directory of the currently
+	active file.
+	</li>
+	<li>
+	SciTE allows choosing a code page for the output pane.
+	</li>
+	<li>
+	SciTE HTML exporter no longer honours monospaced font setting.
+	</li>
+	<li>
+	Line layout cache in page mode caches the line of the caret. An assertion is
+	now used to ensure that the layout reentrancy problem that caused this
+	is easier to find.
+	</li>
+	<li>
+	Speed optimized for long lines and lines containing many control characters.
+	</li>
+	<li>
+	Bug fixed in brace matching in DBCS files where byte inside character
+	is same as brace.
+	</li>
+	<li>
+	Indent command does not indent empty lines.
+	</li>
+	<li>
+	SciTE bug fixed for commands that operate on files with empty extensions.
+	</li>
+	<li>
+	SciTE bug fixed where monospaced option was copied for subsequently opened files.
+	</li>
+	<li>
+	SciTE on Windows bug fixed in the display of a non-ASCII search string
+	which can not be found.
+	</li>
+	<li>
+	Bugs fixed with nested calls displaying a new calltip while one is already
+	displayed.
+	</li>
+	<li>
+	Bug fixed when styling PHP strings.
+	</li>
+	<li>
+	Bug fixed when styling C++ continued preprocessor lines.
+	</li>
+	<li>
+	SciTE bug fixed where opening file from recently used list reset choice of
+	language.
+	</li>
+	<li>
+	SciTE bug fixed when compiled with NO_EXTENSIONS and
+	closing one file closes the application.
+	</li>
+	<li>
+	SciTE crash fixed for error messages that look like Lua messages but aren't
+	in the same order.
+	</li>
+	<li>
+	Remaining fold box support deprecated. The symbols SC_FOLDLEVELBOXHEADERFLAG,
+   SC_FOLDLEVELBOXFOOTERFLAG, SC_FOLDLEVELCONTRACTED,
+   SC_FOLDLEVELUNINDENT, and SC_FOLDFLAG_BOX are deprecated.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite166.zip?download">Release 1.66</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 26 August 2005.
+	</li>
+	<li>
+	New, more ambitious Ruby lexer.
+	</li>
+	<li>
+	SciTE Find in Files dialog has options for matching case and whole words which are
+	enabled when the internal find command is used.
+	</li>
+	<li>
+	SciTE output pane can display automatic completion after "$(" typed.
+	An initial ">" on a line is ignored when Enter pressed.
+	</li>
+	<li>
+	C++ lexer recognizes keywords within line doc comments. It continues styles over line
+	end characters more consistently so that eolfilled style can be used for preprocessor lines
+	and line comments.
+	</li>
+	<li>
+	VB lexer improves handling of file numbers and date literals.
+	</li>
+	<li>
+	Lua folder handles repeat until, nested comments and nested strings.
+	</li>
+	<li>
+	POV lexer improves handling of comment lines.
+	</li>
+	<li>
+	AU3 lexer and folder updated. COMOBJ style added.
+	</li>
+	<li>
+	Bug fixed with text display on GTK+ with Pango 1.8.
+	</li>
+	<li>
+	Caret painting avoided when not focused.
+	</li>
+	<li>
+	SciTE on GTK+ handles file names used to reference properties as case-sensitive.
+	</li>
+	<li>
+	SciTE on GTK+ Save As and Export commands set the file name field.
+	On GTK+ the Export commands modify the file name in the same way as on Windows.
+	</li>
+	<li>
+	Fixed SciTE problem where confirmation was not displaying when closing a file where all
+	contents had been deleted.
+	</li>
+	<li>
+	Middle click on SciTE tab now closes correct buffer on Windows when tool bar is visible.
+	</li>
+	<li>
+	SciTE bugs fixed where files contained in directory that includes '.' character.
+	</li>
+	<li>
+	SciTE bug fixed where import in user options was reading file from directory of
+	global options.
+	</li>
+	<li>
+	SciTE calltip bug fixed where single line calltips had arrow displayed incorrectly.
+	</li>
+	<li>
+	SciTE folding bug fixed where empty lines were shown for no reason.
+	</li>
+	<li>
+	Bug fixed where 2 byte per pixel XPM images caused crash although they are still not
+	displayed.
+	</li>
+	<li>
+	Autocompletion list size tweaked.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite165.zip?download">Release 1.65</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 August 2005.
+	</li>
+	<li>
+	FreeBasic support.
+	</li>
+	<li>
+	SciTE on Windows handles command line arguments
+	"-" (read standard input into buffer),
+	"--" (read standard input into output pane) and
+	"-@" (read file names from standard input and open each).
+	</li>
+	<li>
+	SciTE includes a simple implementation of Find in Files which is used if no find.command is set.
+	</li>
+	<li>
+	SciTE can close tabs with a mouse middle click.
+	</li>
+	<li>
+	SciTE includes a save.all.for.build setting.
+	</li>
+	<li>
+	Folder for MSSQL.
+	</li>
+	<li>
+	Batch file lexer understands more of the syntax and the behaviour of built in commands.
+	</li>
+	<li>
+	Perl lexer handles here docs better; disambiguates barewords, quote-like delimiters, and repetition operators;
+	handles Pods after __END__; recognizes numbers better; and handles some typeglob special variables.
+	</li>
+	<li>
+	Lisp adds more lexical states.
+	</li>
+	<li>
+	PHP allows spaces after &lt;&lt;&lt;.
+	</li>
+	<li>
+	TADS3 has a simpler set of states and recognizes identifiers.
+	</li>
+	<li>
+	Avenue elseif folds better.
+	</li>
+	<li>
+	Errorlist lexer treats lines starting with '+++' and '---' as separate
+	styles from '+' and '-' as they indicate file names in diffs.
+	</li>
+	<li>
+	SciTE error recognizer handles file paths in extra explanatory lines from MSVC
+	and in '+++' and '---' lines from diff.
+	</li>
+	<li>
+	Bugs fixed in SciTE and Scintilla folding behaviour when text pasted before
+	folded text caused unnecessary
+	unfolding and cutting text could lead to text being irretrievably hidden.
+	</li>
+	<li>
+	SciTE on Windows uses correct font for dialogs and better font for tab bar
+	allowing better localization
+	</li>
+	<li>
+	When Windows is used with a secondary monitor before the primary
+	monitor, autocompletion lists are not forced onto the primary monitor.
+	</li>
+	<li>
+	Scintilla calltip bug fixed where down arrow setting wrong value in notification
+	if not in first line. SciTE bug fixed where second arrow only shown on multiple line
+	calltip and was therefore misinterpreting the notification value.
+	</li>
+	<li>
+	Lexers will no longer be re-entered recursively during, for example, fold level setting.
+	</li>
+	<li>
+	Undo of typing in overwrite mode undoes one character at a time rather than requiring a removal
+	and addition step for each character.
+	</li>
+	<li>
+	EM_EXSETSEL(0,-1) fixed.
+	</li>
+	<li>
+	Bug fixed where part of a rectangular selection was not shown as selected.
+	</li>
+	<li>
+	Autocomplete window size fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite164.zip?download">Release 1.64</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 6 June 2005.
+	</li>
+	<li>
+	TADS3 support
+	</li>
+	<li>
+	Smalltalk support.
+	</li>
+	<li>
+	Rebol support.
+	</li>
+	<li>
+	Flagship (Clipper / XBase) support.
+	</li>
+	<li>
+	CSound support.
+	</li>
+	<li>
+	SQL enhanced to support SQL*Plus.
+	</li>
+	<li>
+	SC_MARK_FULLRECT margin marker fills the whole marker margin for marked
+	lines with a colour.
+	</li>
+	<li>
+	Performance improved for some large undo and redo operations and modification flags
+	added in notifications.
+	</li>
+	<li>
+	SciTE adds command equivalents for fold margin mouse actions.
+	</li>
+	<li>
+	SciTE adds OnUpdateUI to set of events that can be handled by a Lua script.
+	</li>
+	<li>
+	Properties set in Scintilla can be read.
+	</li>
+	<li>
+	GTK+ SciTE exit confirmation adds Cancel button.
+	</li>
+	<li>
+	More accurate lexing of numbers in PHP and Caml.
+	</li>
+	<li>
+	Perl can fold POD and package sections. POD verbatim section style.
+	Globbing syntax recognized better.
+	</li>
+	<li>
+	Context menu moved slightly on GTK+ so that it will be under the mouse and will
+	stay open if just clicked rather than held.
+	</li>
+	<li>
+	Rectangular selection paste works the same whichever direction the selection was dragged in.
+	</li>
+	<li>
+	EncodedFromUTF8 handles -1 length argument as documented.
+	</li>
+	<li>
+	Undo and redo can cause SCN_MODIFYATTEMPTRO notifications.
+	</li>
+	<li>
+	Indicators display correctly when they start at the second character on a line.
+	</li>
+	<li>
+	SciTE Export As HTML uses standards compliant CSS.
+	</li>
+	<li>
+	SciTE automatic indentation handles keywords for indentation better.
+	</li>
+	<li>
+	SciTE fold.comment.python property removed as does not work.
+	</li>
+	<li>
+	Fixed problem with character set conversion when pasting on GTK+.
+	</li>
+	<li>
+	SciTE default character set changed from ANSI_CHARSET to DEFAULT_CHARSET.
+	</li>
+	<li>
+	Fixed crash when creating empty autocompletion list.
+	</li>
+	<li>
+	Autocomplete window size made larger under some conditions to make truncation less common.
+	</li>
+	<li>
+	Bug fixed where changing case of a selection did not affect initial character of lines
+	in multi-byte encodings.
+	</li>
+	<li>
+	Bug fixed where rectangular selection not displayed after Alt+Shift+Click.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite163.zip?download">Release 1.63</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 4 April 2005.
+	</li>
+	<li>
+	Autocompletion on Windows changed to use pop up window, be faster,
+	allow choice of maximum width and height, and to highlight only the text of the
+	selected item rather than both the text and icon if any.
+	</li>
+	<li>
+	Extra items can be added to the context menu in SciTE.
+	</li>
+	<li>
+	Character wrap mode in Scintilla helps East Asian languages.
+	</li>
+	<li>
+	Lexer added for Haskell.
+	</li>
+	<li>
+	Objective Caml support.
+	</li>
+	<li>
+	BlitzBasic and PureBasic support.
+	</li>
+	<li>
+	CSS support updated to handle CSS2.
+	</li>
+	<li>
+	C++ lexer is more selective about document comment keywords.
+	</li>
+	<li>
+	AutoIt 3 lexer improved.
+	</li>
+	<li>
+	Lua lexer styles end of line characters on comment and preprocessor
+	lines so that the eolfilled style can be applied to them.
+	</li>
+	<li>
+	NSIS support updated for line continuations, box comments, SectionGroup and
+	PageEx, and with more up-to-date properties.
+	</li>
+	<li>
+	Clarion lexer updated to perform folding and have more styles.
+	</li>
+	<li>
+	SQL lexer gains second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer recognizes Borland Delphi error messages.
+	</li>
+	<li>
+	Method added for determining number of visual lines occupied by a document
+	line due to wrapping.
+	</li>
+	<li>
+	Sticky caret mode does not modify the preferred caret x position when typing
+	and may be useful for typing columns of text.
+	</li>
+	<li>
+	Dwell end notification sent when scroll occurs.
+	</li>
+	<li>
+	On GTK+, Scintilla requisition height is screen height rather than large fixed value.
+	</li>
+	<li>
+	Case insensitive autocompletion prefers exact case match.
+	</li>
+	<li>
+	SCI_PARADOWN and SCI_PARAUP treat lines containing only white
+	space as empty and handle text hidden by folding.
+	</li>
+	<li>
+	Scintilla on Windows supports WM_PRINTCLIENT although there are some
+	limitations.
+	</li>
+	<li>
+	SCN_AUTOCSELECTION notification sent when user selects from autoselection list.
+	</li>
+	<li>
+	SciTE's standard properties file sets buffers to 10, uses Pango fonts on GTK+ and
+	has dropped several languages to make the menu fit on screen.
+	</li>
+	<li>
+	SciTE's encoding cookie detection loosened so that common XML files will load
+	in UTF-8 if that is their declared encoding.
+	</li>
+	<li>
+	SciTE on GTK+ changes menus and toolbars to not be detachable unless turned
+	on with a property. Menus no longer tear off. The toolbar may be set to use the
+	default theme icons rather than SciTE's set. Changed key for View | End of Line
+	because of a conflict. Language menu can contain more items.
+	</li>
+	<li>
+	SciTE on GTK+ 2.x allows the height and width of the file open file chooser to
+	be set, for the show hidden files check box to be set from an option and for it
+	to be opened in the directory of the current file explicitly. Enter key works in
+	save chooser.
+	</li>
+	<li>
+	Scintilla lexers should no longer see bits in style bytes that are outside the set
+	they modify so should be able to correctly lex documents where the container
+	has used indicators.
+	</li>
+	<li>
+	SciTE no longer asks to save before performing a revert.
+	</li>
+	<li>
+	SciTE director interface adds a reloadproperties command to reload properties
+	from files.
+	</li>
+	<li>
+	Allow build on CYGWIN platform.
+	</li>
+	<li>
+	Allow use from LccWin compiler.
+	</li>
+	<li>
+	SCI_COLOURISE for SCLEX_CONTAINER causes a
+	SCN_STYLENEEDED notification.
+	</li>
+	<li>
+	Bugs fixed in lexing of HTML/ASP/JScript.
+	</li>
+	<li>
+	Fix for folding becoming confused.
+	</li>
+	<li>
+	On Windows, fixes for Japanese Input Method Editor and for 8 bit Katakana
+	characters.
+	</li>
+	<li>
+	Fixed buffer size bug avoided when typing long words by making buffer bigger.
+	</li>
+	<li>
+	Undo after automatic indentation more sensible.
+	</li>
+	<li>
+	SciTE menus on GTK+ uses Shift and Ctrl rather than old style abbreviations.
+	</li>
+	<li>
+	SciTE full screen mode on Windows calculates size more correctly.
+	</li>
+	<li>
+	SciTE on Windows menus work better with skinning applications.
+	</li>
+	<li>
+	Searching bugs fixed.
+	</li>
+	<li>
+	Colours reallocated when changing image using SCI_REGISTERIMAGE.
+	</li>
+	<li>
+	Caret stays visible when Enter held down.
+	</li>
+	<li>
+	Undo of automatic indentation more reasonable.
+	</li>
+	<li>
+	High processor usage fixed in background wrapping under some
+	circumstances.
+	</li>
+	<li>
+	Crashing bug fixed on AMD64.
+	</li>
+	<li>
+	SciTE crashing bug fixed when position.height or position.width not set.
+	</li>
+	<li>
+	Crashing bug on GTK+ fixed when setting cursor and window is NULL.
+	</li>
+	<li>
+	Crashing bug on GTK+ preedit window fixed.
+	</li>
+	<li>
+	SciTE crashing bug fixed in incremental search on Windows ME.
+	</li>
+	<li>
+	SciTE on Windows has a optional find and replace dialogs that can search through
+	all buffers and search within a particular style number.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite162.zip?download">Release 1.62</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 October 2004.
+	</li>
+	<li>
+	Lexer added for ASN.1.
+	</li>
+	<li>
+	Lexer added for VHDL.
+	</li>
+	<li>
+	On Windows, an invisible system caret is used to allow screen readers to determine
+	where the caret is. The visible caret is still drawn by the painting code.
+	</li>
+	<li>
+	On GTK+, Scintilla has methods to read the target as UTF-8 and to convert
+	a string from UTF-8 to the document encoding. This eases integration with
+	containers that use the UTF-8 encoding which is the API encoding for GTK+ 2.
+	</li>
+	<li>
+	SciTE on GTK+2 and Windows NT/2000/XP allows search and replace of Unicode text.
+	</li>
+	<li>
+	SciTE calltips allow setting the characters used to start and end parameter lists and
+	to separate parameters.
+	</li>
+	<li>
+	FindColumn method converts a line and column into a position, taking into account
+	tabs and multi-byte characters.
+	</li>
+	<li>
+	On Windows, when Scintilla copies text to the clipboard as Unicode, it avoids
+	adding an ANSI copy as the system will automatically convert as required in
+	a context-sensitive manner.
+	</li>
+	<li>
+	SciTE indent.auto setting automatically determines indent.size and use.tabs from
+	document contents.
+	</li>
+	<li>
+	SciTE defines a CurrentMessage property that holds the most recently selected
+	output pane message.
+	</li>
+	<li>
+	SciTE Lua scripting enhanced with
+	<ul>
+	<li>A Lua table called 'buffer' is associated with each buffer and can be used to
+	maintain buffer-specific state.</li>
+	<li>A 'scite' object allows interaction with the application such as opening
+	files from script.</li>
+	<li>Dynamic properties can be reset by assigning nil to a given key in
+	the props table.</li>
+	<li>An 'OnClear' event fires whenever properties and extension scripts are
+	about to be reloaded.</li>
+	<li>On Windows, loadlib is enabled and can be used to access Lua
+	binary modules / DLLs.</li></ul>
+	</li>
+	<li>
+	SciTE Find in Files on Windows can be used in a modeless way and gains a '..'
+	button to move up to the parent directory. It is also wider so that longer paths
+	can be seen.
+	</li>
+	<li>
+	Close buttons added to dialogs in SciTE on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ 2 has a "hidden files" check box in file open dialog.
+	</li>
+	<li>
+	SciTE use.monospaced setting removed. More information in the
+	<a href="SciTEFAQ.html">FAQ</a>.
+	</li>
+	<li>
+	APDL lexer updated with more lexical classes
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Ada lexer fixed to support non-ASCII text.
+	</li>
+	<li>
+	Cpp lexer now only matches exactly three slashes as starting a doc-comment so that
+	lines of slashes are seen as a normal comment.
+	Line ending characters are appear in default style on preprocessor and single line
+	comment lines.
+	</li>
+	<li>
+	CSS lexer updated to support CSS2 including second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer now understands Java stack trace lines.
+	</li>
+	<li>
+	SciTE's handling of HTML Tidy messages jumps to column as well as line indicated.
+	</li>
+	<li>
+	Lisp lexer allows multiline strings.
+	</li>
+	<li>
+	Lua lexer treats .. as an operator when between identifiers.
+	</li>
+	<li>
+	PHP lexer handles 'e' in numerical literals.
+	</li>
+	<li>
+	PowerBasic lexer updated for macros and optimized.
+	</li>
+	<li>
+	Properties file folder changed to leave lines before a header at the base level
+	and thus avoid a vertical line when using connected folding symbols.
+	</li>
+	<li>
+	GTK+ on Windows version uses Alt for rectangular selection to be compatible with
+	platform convention.
+	</li>
+	<li>
+	SciTE abbreviations file moved from system directory to user directory
+	so each user can have separate abbreviations.
+	</li>
+	<li>
+	SciTE on GTK+ has improved .desktop file and make install support that may
+	lead to better integration with system shell.
+	</li>
+	<li>
+	Disabling of themed background drawing on GTK+ extended to all cases.
+	</li>
+	<li>
+	SciTE date formatting on Windows performed with the user setting rather than the
+	system setting.
+	</li>
+	<li>
+	GTK+ 2 redraw while scrolling fixed.
+	</li>
+	<li>
+	Recursive property definitions are safer, avoiding expansion when detected.
+	</li>
+	<li>
+	SciTE thread synchronization for scripts no longer uses HWND_MESSAGE
+	so is compatible with older versions of Windows.
+	Other Lua scripting bugs fixed.
+	</li>
+	<li>
+	SciTE on Windows localization of menu accelerators changed to be compatible
+	with alternative UI themes.
+	</li>
+	<li>
+	SciTE on Windows full screen mode now fits better when menu different height
+	to title bar height.
+	</li>
+	<li>
+	SC_MARK_EMPTY marker is now invisible and does not change the background
+	colour.
+	</li>
+	<li>
+	Bug fixed in HTML lexer to allow use of &lt;?xml in strings in scripts without
+	triggering xml mode.
+	</li>
+	<li>
+	Bug fixed in SciTE abbreviation expansion that could break indentation or crash.
+	</li>
+	<li>
+	Bug fixed when searching for a whole word string that ends one character before
+	end of document.
+	</li>
+	<li>
+	Drawing bug fixed when indicators drawn on wrapped lines.
+	</li>
+	<li>
+	Bug fixed when double clicking a hotspot.
+	</li>
+	<li>
+	Bug fixed where autocompletion would remove typed text if no match found.
+	</li>
+	<li>
+	Bug fixed where display does not scroll when inserting in long wrapped line.
+	</li>
+	<li>
+	Bug fixed where SCI_MARKERDELETEALL would only remove one of the markers
+	on a line that contained multiple markers with the same number.
+	</li>
+	<li>
+	Bug fixed where markers would move when converting line endings.
+	</li>
+	<li>
+	Bug fixed where SCI_LINEENDWRAP would move too far when line ends are visible.
+	</li>
+	<li>
+	Bugs fixed where calltips with unicode or other non-ASCII text would display
+	incorrectly.
+	</li>
+	<li>
+	Bug fixed in determining if at save point after undoing from save point and then
+	performing changes.
+	</li>
+	<li>
+	Bug fixed on GTK+ using unsupported code pages where extraneous text could
+	be drawn.
+	</li>
+	<li>
+	Bug fixed in drag and drop code on Windows where dragging from SciTE to
+	Firefox could hang both applications.
+	</li>
+	<li>
+	Crashing bug fixed on GTK+ when no font allocation succeeds.
+	</li>
+	<li>
+	Crashing bug fixed when autocompleting word longer than 1000 characters.
+	</li>
+	<li>
+	SciTE crashing bug fixed when both Find and Replace dialogs shown by disallowing
+	this situation.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite161.zip?download">Release 1.61</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2004.
+	</li>
+	<li>
+	Improvements to selection handling on GTK+.
+	</li>
+	<li>
+	SciTE on GTK+ 2.4 uses the improved file chooser which allows
+	file extension filters, multiple selection, and remembers favourite
+	directories.
+	</li>
+	<li>
+	SciTE Load Session and Save Session commands available on GTK+.
+	</li>
+	<li>
+	SciTE lists Lua Startup Script in Options menu when loaded.
+	</li>
+	<li>
+	In SciTE, OnUserListSelection can be implemented in Lua.
+	</li>
+	<li>
+	SciTE on Windows has a context menu on the file tabs.
+	</li>
+	<li>
+	SQL lexer allows '#' comments and optionally '\' quoting inside strings.
+	</li>
+	<li>
+	Mssql lexer improved.
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Perl lexer recognizes regular expression use better.
+	</li>
+	<li>
+	Errorlist lexer understands Lua tracebacks and copes with findstr
+	output for file names that end with digits.
+	</li>
+	<li>
+	Drawing of lines on GTK+ improved and made more like Windows
+	without final point.
+	</li>
+	<li>
+	SciTE on GTK+ uses a high resolution window icon.
+	</li>
+	<li>
+	SciTE can be set to warn before loading files larger than a particular size.
+	</li>
+	<li>
+	SciTE Lua scripting bugs fixed included a crashing bug when using
+	an undefined function name that would go before first actual name.
+	</li>
+	<li>
+	SciTE bug fixed where a modified buffer was not saved if it was
+	the last buffer and was not current when the New command used.
+	</li>
+	<li>
+	SciTE monofont mode no longer affects line numbers.
+	</li>
+	<li>
+	Crashing bug in SciTE avoided by not allowing both the Find and Replace
+	dialogs to be visible at one time.
+	</li>
+	<li>
+	Crashing bug in SciTE fixed when Lua scripts were being run
+	concurrently.
+	</li>
+	<li>
+	Bug fixed that caused incorrect line number width in SciTE.
+	</li>
+	<li>
+	PHP folding bug fixed.
+	</li>
+	<li>
+	Regression fixed when setting word characters to not include
+	some of the standard word characters.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite160.zip?download">Release 1.60</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 May 2004.
+	</li>
+	<li>
+	SciTE can be scripted using the Lua programming language.
+	</li>
+	<li>
+	command.mode is a better way to specify tool command options in SciTE.
+	</li>
+	<li>
+	Continuation markers can be displayed so that you can see which lines are wrapped.
+	</li>
+	<li>
+	Lexer for Gui4Cli language.
+	</li>
+	<li>
+	Lexer for Kix language.
+	</li>
+	<li>
+	Lexer for Specman E language.
+	</li>
+	<li>
+	Lexer for AutoIt3 language.
+	</li>
+	<li>
+	Lexer for APDL language.
+	</li>
+	<li>
+	Lexer for Bash language. Also reasonable for other Unix shells.
+	</li>
+	<li>
+	SciTE can load lexers implemented in external shared libraries.
+	</li>
+	<li>
+	Perl treats "." not as part of an identifier and interprets '/' and '->'
+	correctly in more circumstances.
+	</li>
+	<li>
+	PHP recognizes variables within strings.
+	</li>
+	<li>
+	NSIS has properties "nsis.uservars" and "nsis.ignorecase".
+	</li>
+	<li>
+	MSSQL lexer adds keyword list for operators and stored procedures,
+	defines '(', ')', and ',' as operators and changes some other details.
+	</li>
+	<li>
+	Input method preedit window on GTK+ 2 may support some Asian languages.
+	</li>
+	<li>
+	Platform interface adds an extra platform-specific flag to Font::Create.
+	Used on wxWidgets to choose antialiased text display but may be used for
+	any task that a platform needs.
+	</li>
+	<li>
+	OnBeforeSave method added to Extension interface.
+	</li>
+	<li>
+	Scintilla methods that return strings can be called with a NULL pointer
+	to find out how long the string should be.
+	</li>
+	<li>
+	Visual Studio .NET project file now in VS .NET 2003 format so can not be used
+	directly in VS .NET 2002.
+	</li>
+	<li>
+	Scintilla can be built with GTK+ 2 on Windows.
+	</li>
+	<li>
+	Updated RPM spec for SciTE on GTK+.
+	</li>
+	<li>
+	GTK+ makefile for SciTE allows selection of destination directory, creates destination
+	directories and sets file modes and owners better.
+	</li>
+	<li>
+	Tab indents now go to next tab multiple rather than add tab size.
+	</li>
+	<li>
+	SciTE abbreviations now use the longest possible match rather than the shortest.
+	</li>
+	<li>
+	Autocompletion does not remove prefix when actioned with no choice selected.
+	</li>
+	<li>
+	Autocompletion cancels when moving beyond the start position, not at the start position.
+	</li>
+	<li>
+	SciTE now shows only calltips for functions that match exactly, not
+	those that match as a prefix.
+	</li>
+	<li>
+	SciTE can repair box comment sections where some lines were added without
+	the box comment middle line prefix.
+	</li>
+	<li>
+	Alt+ works in user.shortcuts on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ enables replace in selection for rectangular selections.
+	</li>
+	<li>
+	Key bindings for command.shortcut implemented in a way that doesn't break
+	when the menus are localized.
+	</li>
+	<li>
+	Drawing of background on GTK+ faster as theme drawing disabled.
+	</li>
+	<li>
+	On GTK+, calltips are moved back onto the screen if they extend beyond the screen bounds.
+	</li>
+	<li>
+	On Windows, the Scintilla object is destroyed on WM_NCDESTROY rather than
+	WM_DESTROY which arrives earlier. This fixes some problems when Scintilla was subclassed.
+	</li>
+	<li>
+	The zorder switching feature removed due to number of crashing bugs.
+	</li>
+	<li>
+	Code for XPM images made more robust.
+	</li>
+	<li>
+	Bug fixed with primary selection on GTK+.
+	</li>
+	<li>
+	On GTK+ 2, copied or cut text can still be pasted after the Scintilla widget is destroyed.
+	</li>
+	<li>
+	Styling change not visible problem fixed when line was cached.
+	</li>
+	<li>
+	Bug in SciTE on Windows fixed where clipboard commands stopped working.
+	</li>
+	<li>
+	Crashing bugs in display fixed in line layout cache.
+	</li>
+	<li>
+	Crashing bug may be fixed on AMD64 processor on GTK+.
+	</li>
+	<li>
+	Rare hanging crash fixed in Python lexer.
+	</li>
+	<li>
+	Display bugs fixed with DBCS characters on GTK+.
+	</li>
+	<li>
+	Autocompletion lists on GTK+ 2 are not sorted by the ListModel as the
+	contents are sorted correctly by Scintilla.
+	</li>
+	<li>
+	SciTE fixed to not open extra untitled buffers with check.if.already.open.
+	</li>
+	<li>
+	Sizing bug fixed on GTK+ when window resized while unmapped.
+	</li>
+	<li>
+	Text drawing crashing bug fixed on GTK+ with non-Pango fonts and long strings.
+	</li>
+	<li>
+	Fixed some issues if characters are unsigned.
+	</li>
+	<li>
+	Fixes in NSIS support.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite159.zip?download">Release 1.59</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 February 2004.
+	</li>
+	<li>
+	SciTE Options and Language menus reduced in length by commenting
+	out some languages. Languages can be enabled by editing the global
+	properties file.
+	</li>
+	<li>
+	Verilog language supported.
+	</li>
+	<li>
+	Lexer for Microsoft dialect of SQL. SciTE properties file available from extras page.
+	</li>
+	<li>
+	Perl lexer disambiguates '/' better.
+	</li>
+	<li>
+	NSIS lexer improved with a lexical class for numbers, option for ignoring case
+	of keywords, and folds only occurring when folding keyword first on line.
+	</li>
+	<li>
+	PowerBasic lexer improved with styles for constants and assembler and
+	folding improvements.
+	</li>
+	<li>
+	On GTK+, input method support only invoked for Asian languages and not
+	European languages as the old European keyboard code works better.
+	</li>
+	<li>
+	Scintilla can be requested to allocate a certain amount and so avoid repeated
+	reallocations and memory inefficiencies. SciTE uses this and so should require
+	less memory.
+	</li>
+	<li>
+	SciTE's "toggle current fold" works when invoked on child line as well as
+	fold header.
+	</li>
+	<li>
+	SciTE output pane scrolling can be set to not scroll back to start after
+	completion of command.
+	</li>
+	<li>
+	SciTE has a $(SessionPath) property.
+	</li>
+	<li>
+	SciTE on Windows can use VK_* codes for keys in user.shortcuts.
+	</li>
+	<li>
+	Stack overwrite bug fixed in SciTE's command to move to the end of a
+	preprocessor conditional.
+	</li>
+	<li>
+	Bug fixed where vertical selection appeared to select a different set of characters
+	then would be used by, for example, a copy.
+	</li>
+	<li>
+	SciTE memory leak fixed in fold state remembering.
+	</li>
+	<li>
+	Bug fixed where changing the style of some text outside the
+	standard StyleNeeded notification would not be visible.
+	</li>
+	<li>
+	On GTK+ 2 g_iconv is used in preference to iconv, as it is provided by GTK+
+	so should avoid problems finding the iconv library.
+	</li>
+	<li>
+	On GTK+ fixed a style reference count bug.
+	</li>
+	<li>
+	Memory corruption bug fixed with GetSelText.
+	</li>
+	<li>
+	On Windows Scintilla deletes memory on WM_NCDESTROY rather than
+	the earlier WM_DESTROY to avoid problems when the window is subclassed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite158.zip?download">Release 1.58</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 January 2004.
+	</li>
+	<li>
+	Method to discover the currently highlighted element in an autocompletion list.
+	</li>
+	<li>
+	On GTK+, the lexers are now included in the scintilla.a library file. This
+	will require changes to the make files of dependent projects.
+	</li>
+	<li>
+	Octave support added alongside related Matlab language and Matlab support improved.
+	</li>
+	<li>
+	VB lexer gains an unterminated string state and 4 sets of keywords.
+	</li>
+	<li>
+	Ruby lexer handles $' correctly.
+	</li>
+	<li>
+	Error line handling improved for FORTRAN compilers from Absoft and Intel.
+	</li>
+	<li>
+	International input enabled on GTK+ 2 although there is no way to choose an
+	input method.
+	</li>
+	<li>
+	MultiplexExtension in SciTE allows multiple extensions to be used at once.
+	</li>
+	<li>
+	Regular expression replace interprets backslash expressions \a, \b, \f, \n, \r, \t,
+	and \v in the replacement value.
+	</li>
+	<li>
+	SciTE Replace dialog displays number of replacements made when Replace All or
+	Replace in Selection performed.
+	</li>
+	<li>
+	Localization files may contain a translation.encoding setting which is used
+	on GTK+ 2 to automatically reencode the translation to UTF-8 so it will be
+	the localized text will be displayed correctly.
+	</li>
+	<li>
+	SciTE on GTK+ implements check.if.already.open.
+	</li>
+	<li>
+	Make files for Mac OS X made more robust.
+	</li>
+	<li>
+	Performance improved in SciTE when switching buffers when there
+	is a rectangular selection.
+	</li>
+	<li>
+	Fixed failure to display some text when wrapped.
+	</li>
+	<li>
+	SciTE crashes from Ctrl+Tab buffer cycling fixed.
+	May still be some rare bugs here.
+	</li>
+	<li>
+	Crash fixed when decoding an error message that appears similar to a
+	Borland error message.
+	</li>
+	<li>
+	Fix to auto-scrolling allows containers to implement enhanced double click selection.
+	</li>
+	<li>
+	Hang fixed in idle word wrap.
+	</li>
+	<li>
+	Crash fixed in hotspot display code..
+	</li>
+	<li>
+	SciTE on Windows Incremental Search no longer moves caret back.
+	</li>
+	<li>
+	SciTE hang fixed when performing a replace with a find string that
+	matched zero length strings such as ".*".
+	</li>
+	<li>
+	SciTE no longer styles the whole file when saving buffer fold state
+	as that was slow.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite157.zip?download">Release 1.57</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 27 November 2003.
+	</li>
+	<li>
+	SciTE remembers folding of each buffer.
+	</li>
+	<li>
+	Lexer for Erlang language.
+	</li>
+	<li>
+	Scintilla allows setting the set of white space characters.
+	</li>
+	<li>
+	Scintilla has 'stuttered' page movement commands to first move
+	to top or bottom within current visible lines before scrolling.
+	</li>
+	<li>
+	Scintilla commands for moving to end of words.
+	</li>
+	<li>
+	Incremental line wrap enabled on Windows.
+	</li>
+	<li>
+	SciTE PDF exporter produces output that is more compliant with reader
+	applications, is smaller and allows more configuration.
+	HTML exporter optimizes size of output files.
+	</li>
+	<li>
+	SciTE defines properties PLAT_WINNT and PLAT_WIN95 on the
+	corresponding platforms.
+	</li>
+	<li>
+	SciTE can adjust the line margin width to fit the largest line number.
+	The line.numbers property is split between line.margin.visible and
+	line.margin.width.
+	</li>
+	<li>
+	SciTE on GTK+ allows user defined menu accelerators.
+	Alt can be included in user.shortcuts.
+	</li>
+	<li>
+	SciTE Language menu can have items commented out.
+	</li>
+	<li>
+	SciTE on Windows Go to dialog allows choosing a column number as
+	well as a line number.
+	</li>
+	<li>
+	SciTE on GTK+ make file uses prefix setting more consistently.
+	</li>
+	<li>
+	Bug fixed that caused word wrapping to fail to display all text.
+	</li>
+	<li>
+	Crashing bug fixed in GTK+ version of Scintilla when using GDK fonts
+	and opening autocompletion.
+	</li>
+	<li>
+	Bug fixed in Scintilla SCI_GETSELTEXT where an extra NUL
+	was included at end of returned string
+	</li>
+	<li>
+	Crashing bug fixed in SciTE z-order switching implementation.
+	</li>
+	<li>
+	Hanging bug fixed in Perl lexer.
+	</li>
+	<li>
+	SciTE crashing bug fixed for using 'case' without argument in style definition.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite156.zip?download">Release 1.56</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 October 2003.
+	</li>
+	<li>
+	Rectangular selection can be performed using the keyboard.
+	Greater programmatic control over rectangular selection.
+	This has caused several changes to key bindings.
+	</li>
+	<li>
+	SciTE Replace In Selection works on rectangular selections.
+	</li>
+	<li>
+	Improved lexer for TeX, new lexer for Metapost and other support for these
+	languages.
+	</li>
+	<li>
+	Lexer for PowerBasic.
+	</li>
+	<li>
+	Lexer for Forth.
+	</li>
+	<li>
+	YAML lexer improved to include error styling.
+	</li>
+	<li>
+	Perl lexer improved to correctly handle more cases.
+	</li>
+	<li>
+	Assembler lexer updated to support single-quote strings and fix some
+	problems.
+	</li>
+	<li>
+	SciTE on Windows can switch between buffers in order of use (z-order) rather
+	than static order.
+	</li>
+	<li>
+	SciTE supports adding an extension for "Open Selected Filename".
+	The openpath setting works on GTK+.
+	</li>
+	<li>
+	SciTE can Export as XML.
+	</li>
+	<li>
+	SciTE $(SelHeight) variable gives a more natural result for empty and whole line
+	selections.
+	</li>
+	<li>
+	Fixes to wrapping problems, such as only first display line being visible in some
+	cases.
+	</li>
+	<li>
+	Fixes to hotspot to only highlight when over the hotspot, only use background
+	colour when set and option to limit hotspots to a single line.
+	</li>
+	<li>
+	Small fixes to FORTRAN lexing and folding.
+	</li>
+	<li>
+	SQL lexer treats single quote strings as a separate class to double quote strings..
+	</li>
+	<li>
+	Scintilla made compatible with expectations of container widget in GTK+ 2.3.
+	</li>
+	<li>
+	Fix to strip out pixmap ID when automatically choosing from an autocompletion
+	list with only one element.
+	</li>
+	<li>
+	SciTE bug fixed where UTF-8 files longer than 128K were gaining more than one
+	BOM.
+	</li>
+	<li>
+	Crashing bug fixed in SciTE on GTK+ where using "Stop Executing" twice leads
+	to all applications exiting.
+	</li>
+	<li>
+	Bug fixed in autocompletion scrolling on GTK+ 2 with a case sensitive list.
+	The ListBox::Sort method is no longer needed or available so platform
+	maintainers should remove it.
+	</li>
+	<li>
+	SciTE check.if.already.open setting removed from GTK+ version as unmaintained.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite155.zip?download">Release 1.55</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 25 September 2003.
+      </li>
+      <li>
+	Fix a crashing bug in indicator display in Scintilla.
+      </li>
+      <li>
+	GTK+ version now defaults to building for GTK+ 2 rather than 1.
+      </li>
+      <li>
+	Mingw make file detects compiler version and avoids options
+	that are cause problems for some versions.
+      </li>
+      <li>
+	Large performance improvement on GTK+ 2 for long lines.
+      </li>
+      <li>
+	Incremental line wrap on GTK+.
+      </li>
+      <li>
+	International text entry works much better on GTK+ with particular
+	improvements for Baltic languages and languages that use 'dead' accents.
+	NUL key events such as those generated by some function keys, ignored.
+      </li>
+      <li>
+	Unicode clipboard support on GTK+.
+      </li>
+      <li>
+	Indicator type INDIC_BOX draws a rectangle around the text.
+      </li>
+      <li>
+	Clarion language support.
+      </li>
+      <li>
+	YAML language support.
+      </li>
+      <li>
+	MPT LOG language support.
+      </li>
+      <li>
+	On Windows, SciTE can switch buffers based on activation order rather
+	than buffer number.
+      </li>
+      <li>
+	SciTE save.on.deactivate saves all buffers rather than just the current buffer.
+      </li>
+      <li>
+	Lua lexer handles non-ASCII characters correctly.
+      </li>
+      <li>
+	Error lexer understands Borland errors with pathnames that contain space.
+      </li>
+      <li>
+	On GTK+ 2, autocompletion uses TreeView rather than deprecated CList.
+      </li>
+      <li>
+	SciTE autocompletion removed when expand abbreviation command used.
+      </li>
+      <li>
+	SciTE calltips support overloaded functions.
+      </li>
+      <li>
+	When Save fails in SciTE, choice offered to Save As.
+      </li>
+      <li>
+	SciTE message boxes on Windows may be moved to front when needed.
+      </li>
+      <li>
+	Indicators drawn correctly on wrapped lines.
+      </li>
+      <li>
+	Regular expression search no longer matches characters with high bit
+	set to characters without high bit set.
+      </li>
+      <li>
+	Hang fixed in backwards search in multi byte character documents.
+      </li>
+      <li>
+	Hang fixed in SciTE Mark All command when wrap around turned off.
+      </li>
+      <li>
+	SciTE Incremental Search no longer uses hot keys on Windows.
+      </li>
+      <li>
+	Calltips draw non-ASCII characters correctly rather than as arrows.
+      </li>
+      <li>
+	SciTE crash fixed when going to an error message with empty file name.
+      </li>
+      <li>
+	Bugs fixed in XPM image handling code.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite154.zip?download">Release 1.54</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 12 August 2003.
+      </li>
+      <li>
+	SciTE on GTK+ 2.x can display a tab bar.
+      </li>
+      <li>
+	SciTE on Windows provides incremental search.
+      </li>
+      <li>
+	Lexer for PostScript.
+      </li>
+      <li>
+	Lexer for the NSIS scripting language.
+      </li>
+      <li>
+	New lexer for POV-Ray Scene Description Language
+	replaces previous implementation.
+      </li>
+      <li>
+	Lexer for the MMIX Assembler language.
+      </li>
+      <li>
+	Lexer for the Scriptol language.
+      </li>
+      <li>
+	Incompatibility: SQL keywords are specified in lower case rather than upper case.
+	SQL lexer allows double quoted strings.
+      </li>
+      <li>
+	Pascal lexer: character constants that start with '#' understood,
+	'@' only allowed within assembler blocks,
+	'$' can be the start of a number,
+	initial '.' in 0..constant not treated as part of a number,
+	and assembler blocks made more distinctive.
+      </li>
+      <li>
+	Lua lexer allows '.' in keywords.
+	Multi-line strings and comments can be folded.
+      </li>
+      <li>
+	CSS lexer handles multiple psuedoclasses.
+      </li>
+      <li>
+	Properties file folder works for INI file format.
+      </li>
+      <li>
+	Hidden indicator style allows the container to mark text within Scintilla
+	without there being any visual effect.
+      </li>
+      <li>
+	SciTE does not prompt to save changes when the buffer is empty and untitled.
+      </li>
+      <li>
+	Modification notifications caused by SCI_INSERTSTYLEDSTRING
+	now include the contents of the insertion.
+      </li>
+      <li>
+	SCI_MARKERDELETEALL deletes all the markers on a line
+	rather than just the first match.
+      </li>
+      <li>
+	Better handling of 'dead' accents on GTK+ 2 for languages
+	that use accented characters.
+      </li>
+      <li>
+	SciTE now uses value of output.vertical.size property.
+      </li>
+      <li>
+	Crash fixed in SciTE autocompletion on long lines.
+      </li>
+      <li>
+	Crash fixed in SciTE comment command on long lines.
+      </li>
+      <li>
+	Bug fixed with backwards regular expression search skipping
+	every second match.
+      </li>
+      <li>
+	Hang fixed with regular expression replace where both target and replacement were empty.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite153.zip?download">Release 1.53</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 May 2003.
+      </li>
+      <li>
+	On GTK+ 2, encodings other than ASCII, Latin1, and Unicode are
+	supported for both display and input using iconv.
+      </li>
+      <li>
+	External lexers supported on GTK+/Linux.
+	External lexers must now be explicitly loaded with SCI_LOADLEXERLIBRARY
+	rather than relying upon a naming convention and automatic loading.
+      </li>
+      <li>
+	Support of Lout typesetting language.
+      </li>
+      <li>
+	Support of E-Scripts language used in the POL Ultima Online Emulator.
+      </li>
+      <li>
+	Scrolling and drawing performance on GTK+ enhanced, particularly for GTK+ 2.x
+	with an extra window for the text area avoiding conflicts with the scroll bars.
+      </li>
+      <li>
+	CopyText and CopyRange methods in Scintilla allow container to
+	easily copy to the system clipboard.
+      </li>
+      <li>
+	Line Copy command implemented and bound to Ctrl+Shift+T.
+      </li>
+      <li>
+	Scintilla APIs PositionBefore and PositionAfter can be used to iterate through
+	a document taking into account the encoding and multi-byte characters.
+      </li>
+      <li>
+	C++ folder can fold on the "} else {" line of an if statement by setting
+	fold.at.else property to 1.
+      </li>
+      <li>
+	C++ lexer allows an extra set of keywords.
+      </li>
+      <li>
+	Property names and thus abbreviations may be non-ASCII.
+      </li>
+      <li>
+	Removed attempt to load a file when setting properties that was
+	part of an old scripting experiment.
+      </li>
+      <li>
+	SciTE no longer warns about a file not existing when opening
+	properties files from the Options menu as there is a good chance
+	the user wants to create one.
+      </li>
+      <li>
+	Bug fixed with brace recognition in multi-byte encoded files where a partial
+	character matched a brace byte.
+      </li>
+      <li>
+	More protection against infinite loops or recursion with recursive property definitions.
+      </li>
+      <li>
+	On Windows, cursor will no longer disappear over margins in custom builds when
+	cursor resource not present. The Windows default cursor is displayed instead.
+      </li>
+      <li>
+	load.on.activate fixed in SciTE as was broken in 1.52.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite152.zip?download">Release 1.52</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2003.
+      </li>
+      <li>
+	Pango font support on GTK+ 2.
+	Unicode input improved on GTK+ 2.
+      </li>
+      <li>
+	Hotspot style implemented in Scintilla.
+      </li>
+      <li>
+	Small up and down arrows can be displayed in calltips and the container
+	is notified when the mouse is clicked on a calltip.
+	Normal and selected calltip text colours can be set.
+      </li>
+      <li>
+	POSIX compatibility flag in Scintilla regular expression search
+	interprets bare ( and ) as tagged sections.
+      </li>
+      <li>
+	Error message lexer tightened to yield fewer false matches.
+	Recognition of Lahey and Intel FORTRAN error formats.
+      </li>
+      <li>
+	Scintilla keyboard commands for moving to start and end of
+	screen lines rather than document lines, unless already there
+	where these keys move to the start or end of the document line.
+      </li>
+      <li>
+	Line joining command.
+      </li>
+      <li>
+	Lexer for POV-Ray.
+      </li>
+      <li>
+	Calltips on Windows are no longer clipped by the parent window.
+      </li>
+      <li>
+	Autocompletion lists are cancelled when focus leaves their parent window.
+      </li>
+      <li>
+	Move to next/previous empty line delimited paragraph key commands.
+      </li>
+      <li>
+	SciTE hang fixed with recursive property definitions by placing limit
+	on number of substitutions performed.
+      </li>
+      <li>
+	SciTE Export as PDF reenabled and works.
+      </li>
+      <li>
+	Added loadsession: command line command to SciTE.
+      </li>
+      <li>
+	SciTE option to quit application when last document closed.
+      </li>
+      <li>
+	SciTE option to ask user if it is OK to reload a file that has been
+	modified outside SciTE.
+      </li>
+      <li>
+	SciTE option to automatically save before running particular command tools
+	or to ask user or to not save.
+      </li>
+      <li>
+	SciTE on Windows 9x will write a Ctrl+Z to the process input pipe before
+	closing the pipe when running tool commands that take input.
+      </li>
+      <li>
+	Added a manifest resource to SciTE on Windows to enable Windows XP
+	themed UI.
+      </li>
+      <li>
+	SciTE calltips handle nested calls and other situations better.
+      </li>
+      <li>
+	CSS lexer improved.
+      </li>
+      <li>
+	Interface to platform layer changed - Surface initialization now requires
+	a WindowID parameter.
+      </li>
+      <li>
+	Bug fixed with drawing or measuring long pieces of text on Windows 9x
+	by truncating the pieces.
+      </li>
+      <li>
+	Bug fixed with SciTE on GTK+ where a user shortcut for a visible character
+	inserted the character as well as executing the command.
+      </li>
+      <li>
+	Bug fixed where primary selection on GTK+ was reset by
+	Scintilla during creation.
+      </li>
+      <li>
+	Bug fixed where SciTE would close immediately on startup
+	when using save.session.
+      </li>
+      <li>
+	Crash fixed when entering '\' in LaTeX file.
+      </li>
+      <li>
+	Hang fixed when '#' last character in VB file.
+      </li>
+      <li>
+	Crash fixed in error message lexer.
+      </li>
+      <li>
+	Crash fixed when searching for long regular expressions.
+      </li>
+      <li>
+	Pressing return when nothing selected in user list sends notification with
+	empty text rather than random text.
+      </li>
+      <li>
+	Mouse debouncing disabled on Windows as it interfered with some
+	mouse utilities.
+      </li>
+      <li>
+	Bug fixed where overstrike mode inserted before rather than replaced last
+	character in document.
+      </li>
+      <li>
+	Bug fixed with syntax highlighting of Japanese text.
+      </li>
+      <li>
+	Bug fixed in split lines function.
+      </li>
+      <li>
+	Cosmetic fix to SciTE tab bar on Windows when window resized.
+	Focus sticks to either pane more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite151.zip?download">Release 1.51</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 February 2003.
+      </li>
+      <li>
+	Two phase drawing avoids cutting off text that overlaps runs by drawing
+	all the backgrounds of a line then drawing all the text transparently.
+	Single phase drawing is an option.
+      </li>
+      <li>
+	Scintilla method to split lines at a particular width by adding new line
+	characters.
+      </li>
+      <li>
+	The character used in autocompletion lists to separate the text from the image
+	number can be changed.
+      </li>
+      <li>
+	The scrollbar range will automatically expand when the caret is moved
+	beyond the current range.
+	The scroll bar is updated when SCI_SETXOFFSET is called.
+      </li>
+      <li>
+	Mouse cursors on GTK+ improved to be consistent with other applications
+	and the Windows version.
+      </li>
+      <li>
+	Horizontal scrollbar on GTK+ now disappears in wrapped mode.
+      </li>
+      <li>
+	Scintilla on GTK+ 2: mouse wheel scrolling, cursor over scrollbars, focus,
+	and syntax highlighting now work.
+	gtk_selection_notify avoided for compatibility with GTK+ 2.2.
+      </li>
+      <li>
+	Fold margin colours can now be set.
+      </li>
+      <li>
+	SciTE can be built for GTK+ 2.
+      </li>
+      <li>
+	SciTE can optionally preserve the undo history over an automatic file reload.
+      </li>
+      <li>
+	Tags can optionally be case insensitive in XML and HTML.
+      </li>
+      <li>
+	SciTE on Windows handles input to tool commands in a way that should avoid
+	deadlock. Output from tools can be used to replace the selection.
+      </li>
+      <li>
+	SciTE on GTK+ automatically substitutes '|' for '/' in menu items as '/'
+	is used to define the menu hierarchy.
+      </li>
+      <li>
+	Optional buffer number in SciTE title bar.
+      </li>
+      <li>
+	Crash fixed in SciTE brace matching.
+      </li>
+      <li>
+	Bug fixed where automatic scrolling past end of document
+	flipped back to the beginning.
+      </li>
+      <li>
+	Bug fixed where wrapping caused text to disappear.
+      </li>
+      <li>
+	Bug fixed on Windows where images in autocompletion lists were
+	shown on the wrong item.
+      </li>
+      <li>
+	Crash fixed due to memory bug in autocompletion lists on Windows.
+      </li>
+      <li>
+	Crash fixed when double clicking some error messages.
+      </li>
+      <li>
+	Bug fixed in word part movement where sometimes no movement would occur.
+      </li>
+      <li>
+	Bug fixed on Windows NT where long text runs were truncated by
+	treating NT differently to 9x where there is a limitation.
+      </li>
+      <li>
+	Text in not-changeable style works better but there remain some cases where
+	it is still possible to delete text protected this way.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite150.zip?download">Release 1.50</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 January 2003.
+      </li>
+      <li>
+	Autocompletion lists may have a per-item pixmap.
+      </li>
+      <li>
+	Autocompletion lists allow Unicode text on Windows.
+      </li>
+      <li>
+	Scintilla documentation rewritten.
+      </li>
+      <li>
+	Additional DBCS encoding support in Scintilla on GTK+ primarily aimed at
+	Japanese EUC encoding.
+      </li>
+      <li>
+	CSS (Cascading Style Sheets) lexer added.
+      </li>
+      <li>
+	diff lexer understands some more formats.
+      </li>
+      <li>
+	Fold box feature is an alternative way to show the structure of code.
+      </li>
+      <li>
+	Avenue lexer supports multiple keyword lists.
+      </li>
+      <li>
+	The caret may now be made invisible by setting the caret width to 0.
+      </li>
+      <li>
+	Python folder attaches comments before blocks to the next block rather
+	than the previous block.
+      </li>
+      <li>
+	SciTE openpath property on Windows searches a path for files that are
+	the subject of the Open Selected Filename command.
+      </li>
+      <li>
+        The localization file name can be changed with the locale.properties property.
+      </li>
+      <li>
+	On Windows, SciTE can pipe the result of a string expression into a command line tool.
+      </li>
+      <li>
+	On Windows, SciTE's Find dialog has a Mark All button.
+      </li>
+      <li>
+	On Windows, there is an Insert Abbreviation command that allows a choice from
+	the defined abbreviations and inserts the selection into the abbreviation at the
+	position of a '|'.
+      </li>
+      <li>
+	Minor fixes to Fortran lexer.
+      </li>
+      <li>
+	fold.html.preprocessor decides whether to fold &lt;? and ?&gt;.
+	Minor improvements to PHP folding.
+      </li>
+      <li>
+	Maximum number of keyword lists allowed increased from 6 to 9.
+      </li>
+      <li>
+	Duplicate line command added with default assignment to Ctrl+D.
+      </li>
+      <li>
+	SciTE sets $(Replacements) to the number of replacements made by the
+	Replace All command. $(CurrentWord) is set to the word before the caret if the caret
+	is at the end of a word.
+      </li>
+      <li>
+	Opening a SciTE session now loads files in remembered order, sets the current file
+	as remembered, and moves the caret to the remembered line.
+      </li>
+      <li>
+	Bugs fixed with printing on Windows where line wrapping was causing some text
+	to not print.
+      </li>
+      <li>
+	Bug fixed with Korean Input Method Editor on Windows.
+      </li>
+      <li>
+	Bugs fixed with line wrap which would sometimes choose different break positions
+	after switching focus away and back.
+      </li>
+      <li>
+	Bug fixed where wheel scrolling had no effect on GTK+ after opening a fold.
+      </li>
+      <li>
+	Bug fixed with file paths containing non-ASCII characters on Windows.
+      </li>
+      <li>
+	Crash fixed with printing on Windows after defining pixmap marker.
+      </li>
+      <li>
+	Crash fixed in makefile lexer when first character on line was '='.
+      </li>
+      <li>
+	Bug fixed where local properties were not always being applied.
+      </li>
+      <li>
+	Ctrl+Keypad* fold command works on GTK+.
+      </li>
+      <li>
+	Hangs fixed in SciTE's Replace All command when replacing regular expressions '^'
+	or '$'.
+      </li>
+      <li>
+	SciTE monospace setting behaves more sensibly.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite149.zip?download">Release 1.49</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 November 2002.
+      </li>
+      <li>
+	Unicode supported on GTK+. To perform well, this added a font cache to GTK+
+	and to make that safe, a mutex is used. The mutex requires the application to link in
+	the threading library by evaluating `glib-config --libs gthread`. A Unicode locale
+	should also be set up by a call like setlocale(LC_CTYPE, "en_US.UTF-8").
+	scintilla_release_resources function added to release mutex.
+      </li>
+      <li>
+	FORTRAN and assembler lexers added along with other support for these
+	languages in SciTE.
+      </li>
+      <li>
+	Ada lexer improved handling of based numbers, identifier validity and attributes
+	distinguished from character literals.
+      </li>
+      <li>
+	Lua lexer handles block comments and a deep level of nesting for literal strings
+	and block comments.
+      </li>
+      <li>
+	Errorlist lexer recognizes PHP error messages.
+      </li>
+      <li>
+	Variant of the C++ lexer with case insensitive keywords
+	called cppnocase. Whitespace in preprocessor text handled more correctly.
+      </li>
+      <li>
+	Folder added for Perl.
+      </li>
+      <li>
+	Compilation with GCC 3.2 supported.
+      </li>
+      <li>
+	Markers can be pixmaps.
+      </li>
+      <li>
+	Lines are wrapped when printing.
+	Bug fixed which printed line numbers in different styles.
+      </li>
+      <li>
+	Text can be appended to end with AppendText method.
+      </li>
+      <li>
+	ChooseCaretX method added.
+      </li>
+      <li>
+	Vertical scroll bar can be turned off with SetVScrollBar method.
+      </li>
+      <li>
+	SciTE Save All command saves all buffers.
+      </li>
+      <li>
+	SciTE localization compares keys case insensitively to make translations more flexible.
+      </li>
+      <li>
+	SciTE detects a utf-8 coding cookie "coding: utf-8" in first two
+	lines and goes into Unicode mode.
+      </li>
+      <li>
+	SciTE key bindings are definable.
+      </li>
+      <li>
+	SciTE Find in Files dialog can display directory browser to
+	choose directory to search.
+      </li>
+      <li>
+	SciTE enabling of undo and redo toolbar buttons improved.
+      </li>
+      <li>
+	SciTE on Windows file type filters in open dialog sorted.
+      </li>
+      <li>
+	Fixed crashing bug when using automatic tag closing in XML or HTML.
+      </li>
+      <li>
+	Fixed bug on Windows causing very long (&gt;64K) lines to not display.
+      </li>
+      <li>
+	Fixed bug in backwards regular expression searching.
+      </li>
+      <li>
+	Fixed bug in calltips where wrong argument was highlighted.
+      </li>
+      <li>
+	Fixed bug in tab timmy feature when file has line feed line endings.
+      </li>
+      <li>
+	Fixed bug in compiling without INCLUDE_DEPRECATED_FEATURES
+	defined.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite148.zip?download">Release 1.48</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 9 September 2002.
+      </li>
+      <li>
+	Improved Pascal lexer with context sensitive keywords
+	and separate folder which handles  //{ and //} folding comments and
+	{$region} and {$end} folding directives.
+	The "case" statement now folds correctly.
+      </li>
+      <li>
+	C++ lexer correctly handles comments on preprocessor lines.
+      </li>
+      <li>
+	New commands for moving to beginning and end of display lines when in line
+	wrap mode. Key bindings added for these commands.
+      </li>
+      <li>
+	New marker symbols that look like ">>>" and "..." which can be used for
+	interactive shell prompts for Python.
+      </li>
+      <li>
+	The foreground and background colours of visible whitespace can be chosen
+	independent of the colours chosen for the lexical class of that whitespace.
+      </li>
+      <li>
+	Per line data optimized by using an exponential allocation scheme.
+      </li>
+      <li>
+	SciTE API file loading optimized.
+      </li>
+      <li>
+	SciTE for GTK+ subsystem 2 documented. The exit status of commands
+	is decoded into more understandable fields.
+      </li>
+      <li>
+	SciTE find dialog remembers previous find string when there is no selection.
+	Find in Selection button disabled when selection is rectangular as command
+	did not work.
+      </li>
+      <li>
+	Shift+Enter made equivalent to Enter to avoid users having to let go of
+	the shift key when typing. Avoids the possibility of entering single carriage
+	returns in a file that contains CR+LF line ends.
+      </li>
+      <li>
+	Autocompletion does not immediately disappear when the length parameter
+	to SCI_AUTOCSHOW is 0.
+      </li>
+      <li>
+	SciTE focuses on the editor pane when File | New executed and when the
+	output pane is closed with F8. Double clicking on a non-highlighted output
+	pane line selects the word under the cursor rather than seeking the next
+	highlighted line.
+      </li>
+      <li>
+	SciTE director interface implements an "askproperty" command.
+      </li>
+      <li>
+	SciTE's Export as LaTeX output improved.
+      </li>
+      <li>
+	Better choice of autocompletion displaying above the caret rather then
+	below when that is more sensible.
+      </li>
+      <li>
+	Bug fixed where context menu would not be completely visible if invoked
+	when cursor near bottom or left of screen.
+      </li>
+      <li>
+	Crashing bug fixed when displaying long strings on GTK+ caused failure of X server
+	by displaying long text in segments.
+      </li>
+      <li>
+	Crashing bug fixed on GTK+ when a Scintilla window was removed from its parent
+	but was still the selection owner.
+      </li>
+      <li>
+	Bug fixed on Windows in Unicode mode where not all characters on a line
+	were displayed when that line contained some characters not in ASCII.
+      </li>
+      <li>
+	Crashing bug fixed in SciTE on Windows with clearing output while running command.
+      </li>
+      <li>
+	Bug fixed in SciTE for GTK+ with command completion not detected when
+	no output was produced by the command.
+      </li>
+      <li>
+	Bug fixed in SciTE for Windows where menus were not shown translated.
+      </li>
+      <li>
+	Bug fixed where words failed to display in line wrapping mode with visible
+	line ends.
+      </li>
+      <li>
+	Bug fixed in SciTE where files opened from a session file were not closed.
+      </li>
+      <li>
+	Cosmetic flicker fixed when using Ctrl+Up and Ctrl+Down with some caret policies.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite147.zip?download">Release 1.47</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 August 2002.
+      </li>
+      <li>
+	Support for GTK+ 2 in Scintilla. International input methods not supported
+	on GTK+2.
+      </li>
+      <li>
+	Line wrapping performance improved greatly.
+      </li>
+      <li>
+	New caret policy implementation that treats horizontal and vertical
+	positioning equivalently and independently. Old caret policy methods
+	deprecated and not all options work correctly with old methods.
+      </li>
+      <li>
+	Extra fold points for C, C++, Java, ... for fold comments //{ .. //} and
+	#if / #ifdef .. #endif and the #region .. #endregion feature of C#.
+      </li>
+      <li>
+	Scintilla method to find the height in pixels of a line. Currently returns the
+	same result for every line as all lines are same height.
+      </li>
+      <li>
+	Separate make file, scintilla_vc6.mak, for Scintilla to use Visual C++
+	version 6 since main makefile now assumes VS .NET.
+	VS .NET project files available for combined Scintilla and
+	SciTE in scite/boundscheck.
+      </li>
+      <li>
+	SciTE automatically recognizes Unicode files based
+	on their Byte Order Marks and switches to Unicode mode.
+	On Windows, where SciTE supports Unicode display, this
+	allows display of non European characters.
+	The file is saved back into the same character encoding unless
+	the user decides to switch using the File | Encoding menu.
+      </li>
+      <li>
+	Handling of character input changed so that a fillup character, typically '('
+	displays a calltip when an autocompletion list was being displayed.
+      </li>
+      <li>
+	Multiline strings lexed better for C++ and Lua.
+      </li>
+      <li>
+	Regular expressions in JavaScript within hypertext files are lexed better.
+      </li>
+      <li>
+	On Windows, Scintilla exports a function called Scintilla_DirectFunction
+	that can be used the same as the function returned by GetDirectFunction.
+      </li>
+      <li>
+	Scintilla converts line endings of text obtained from the clipboard to
+	the current default line endings.
+      </li>
+      <li>
+	New SciTE property ensure.final.line.end can ensure that saved files
+	always end with a new line as this is required by some tools.
+	The ensure.consistent.line.ends property ensures all line ends are the
+	current default when saving files.
+	The strip.trailing.spaces property now works on the buffer so the
+	buffer in memory and the file on disk are the same after a save is performed.
+      </li>
+      <li>
+	The SciTE expand abbreviation command again allows '|' characters
+	in expansions to be quoted by using '||'.
+      </li>
+      <li>
+	SciTE on Windows can send data to the find tool through standard
+	input rather than using a command line argument to avoid problems
+	with quoting command line arguments.
+      </li>
+      <li>
+	The Stop Executing command in SciTE on Windows improved to send
+	a Ctrl+Z character to the tool. Better messages when stopping a tool.
+      </li>
+      <li>
+	Autocompletion can automatically "fill up" when one of a set of characters is
+	type with the autocomplete.&lt;lexer&gt;.fillups property.
+      </li>
+      <li>
+	New predefined properties in SciTE, SelectionStartColumn, SelectionStartLine,
+	SelectionEndColumn, SelectionEndLine can be used to integrate with other
+	applications.
+      </li>
+      <li>
+	Environment variables are available as properties in SciTE.
+      </li>
+      <li>
+	SciTE on Windows keeps status line more current.
+      </li>
+      <li>
+	Abbreviations work in SciTE on Linux when first opened.
+      </li>
+      <li>
+	File saving fixed in SciTE to ensure files are not closed when they can not be
+	saved because of file permissions. Also fixed a problem with buffers that
+	caused files to not be saved.
+      </li>
+      <li>
+	SciTE bug fixed where monospace mode not remembered when saving files.
+	Some searching options now remembered when switching files.
+      </li>
+      <li>
+	SciTE on Linux now waits on child termination when it shuts a child down
+	to avoid zombies.
+      </li>
+      <li>
+	SciTE on Linux has a Print menu command that defaults to invoking a2ps.
+      </li>
+      <li>
+	Fixed incorrect highlighting of indentation guides in SciTE for Python.
+      </li>
+      <li>
+	Crash fixed in Scintilla when calling GetText for 0 characters.
+      </li>
+      <li>
+	Exporting as LaTeX improved when processing backslashes and tabs
+	and setting up font.
+      </li>
+      <li>
+	Crash fixed in SciTE when exporting or copying as RTF.
+      </li>
+      <li>
+	SciTE session loading fixed to handle more than 10 files in session.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite146.zip?download">Release 1.46</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 10 May 2002.
+      </li>
+      <li>
+	Set of lexers compiled into Scintilla can now be changed by adding and
+	removing lexer source files from scintilla/src and running LexGen.py.
+      </li>
+      <li>
+	SCN_ZOOM notification provided by Scintilla when user changes zoom level.
+	Method to determine width of strings in pixels so that elements can be sized
+	relative to text size.
+	SciTE changed to keep line number column displaying a given
+	number of characters.
+      </li>
+      <li>
+	The logical width of the document used to determine scroll bar range can be set.
+      </li>
+      <li>
+	Setting to allow vertical scrolling to display last line at top rather than
+	bottom of window.
+      </li>
+      <li>
+	Read-only mode improved to avoid changing the selection in most cases
+	when a modification is attempted. Drag and drop cursors display correctly
+	for read-only in some cases.
+      </li>
+      <li>
+	Visual C++ options in make files changed to suit Visual Studio .NET.
+      </li>
+      <li>
+	Scintilla.iface includes feature types for enumerations and lexers.
+      </li>
+      <li>
+	Lua lexer improves handling of literal strings and copes with nested literal strings.
+      </li>
+      <li>
+	Diff lexer changed to treat lines starting with "***" similarly to "---".
+	Symbolic names defined for lexical classes.
+      </li>
+      <li>
+	nncrontab lexer improved.
+      </li>
+      <li>
+	Turkish fonts (iso8859-9) supported on GTK+.
+      </li>
+      <li>
+	Automatic close tag feature for XML and HTML in SciTE.
+      </li>
+      <li>
+	Automatic indentation in SciTE improved.
+      </li>
+      <li>
+	Maximum number of buffers available in SciTE increased. May be up to 100
+	although other restrictions on menu length limit the real maximum.
+      </li>
+      <li>
+	Save a Copy command added to SciTE.
+      </li>
+      <li>
+	Export as TeX command added to SciTE.
+      </li>
+      <li>
+	Export as HTML command in SciTE respects Use Monospaced Font and
+	background colour settings.
+      </li>
+      <li>
+	Compilation problem on Solaris fixed.
+      </li>
+      <li>
+	Order of files displayed for SciTE's previous and next menu and key commands
+	are now consistent.
+      </li>
+      <li>
+	Saving of MRU in recent file changed so files open when SciTE quit
+	are remembered.
+      </li>
+      <li>
+	More variants of ctags tags handled by Open Selected Filename in SciTE.
+      </li>
+      <li>
+	JavaScript embedded in XML highlighted again.
+      </li>
+      <li>
+	SciTE status bar updated after changing parameters in case they are being
+	displayed in status bar.
+      </li>
+      <li>
+	Crash fixed when handling some multi-byte languages.
+      </li>
+      <li>
+	Crash fixed when replacing end of line characters.
+      </li>
+      <li>
+	Bug in SciTE fixed in multiple buffer mode where automatic loading
+	turned on could lead to losing file contents.
+      </li>
+      <li>
+	Bug in SciTE on GTK+ fixed where dismissing dialogs with close box led to
+	those dialogs never being shown again.
+      </li>
+      <li>
+	Bug in SciTE on Windows fixed where position.tile with default positions
+	led to SciTE being positioned off-screen.
+      </li>
+      <li>
+	Bug fixed in read-only mode, clearing all deletes contraction state data
+	leading to it not being synchronized with text.
+      </li>
+      <li>
+	Crash fixed in SciTE on Windows when tab bar displayed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite145.zip?download">Release 1.45</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 15 March 2002.
+      </li>
+      <li>
+	Line layout cache implemented to improve performance by maintaining
+	the positioning of characters on lines. Can be set to cache nothing,
+	the line with the caret, the visible page or the whole document.
+      </li>
+      <li>
+	Support, including a new lexer, added for Matlab programs.
+      </li>
+      <li>
+	Lua folder supports folding {} ranges and compact mode.
+	Lua lexer styles floating point numbers in number style instead of
+	setting the '.' in operator style.
+	Up to 6 sets of keywords.
+	Better support for [[ although only works well
+	when all on one line.
+      </li>
+      <li>
+	Python lexer improved to handle floating point numbers that contain negative
+	exponents and that start with '.'.
+      </li>
+      <li>
+	When performing a rectangular paste, the caret now remains at the
+	insertion point.
+      </li>
+      <li>
+	On Windows with a wheel mouse, page-at-a-time mode is recognized.
+      </li>
+      <li>
+	Read-only mode added to SciTE with a property to initialize it and another property,
+	$(ReadOnly) available to show this mode in the status bar.
+      </li>
+      <li>
+	SciTE status bar can show the number of lines in the selection
+	with the $(SelHeight) property.
+      </li>
+      <li>
+	SciTE's "Export as HTML" command uses the current character set to produce
+	correct output for non-Western-European character sets, such as Russian.
+      </li>
+      <li>
+	SciTE's "Export as RTF" fixed to produce correct output when file contains '\'.
+      </li>
+      <li>
+	SciTE goto command accepts a column as well as a line.
+	If given a column, it selects the word at that column.
+      </li>
+      <li>
+	SciTE's Build, Compile and Go commands are now disabled if no
+	action has been assigned to them.
+      </li>
+      <li>
+	The Refresh button in the status bar has been removed from SciTE on Windows.
+      </li>
+      <li>
+	Bug fixed in line wrap mode where cursor up or down command did not work.
+      </li>
+      <li>
+	Some styling bugs fixed that were due to a compilation problem with
+	gcc and inline functions with same name but different code.
+      </li>
+      <li>
+	The way that lexers loop over text was changed to avoid accessing beyond the
+	end or setting beyond the end. May fix some bugs and make the code safer but
+	may also cause new bugs.
+      </li>
+      <li>
+	Bug fixed in HTML lexer's handling of SGML.
+      </li>
+      <li>
+	Bug fixed on GTK+/X where lines wider than 32767 pixels did not display.
+      </li>
+      <li>
+	SciTE bug fixed with file name generation for standard property files.
+      </li>
+      <li>
+	SciTE bug fixed with Open Selected Filename command when used with
+	file name and line number combination.
+      </li>
+      <li>
+	In SciTE, indentation and tab settings stored with buffers so maintained correctly
+	as buffers selected.
+	The properties used to initialize these settings can now be set separately for different
+	file patterns.
+      </li>
+      <li>
+	Thread safety improved on Windows with a critical section protecting the font
+	cache and initialization of globals performed within Scintilla_RegisterClasses.
+	New Scintilla_ReleaseResources call provided to allow explicit freeing of resources
+	when statically bound into another application. Resources automatically freed
+	in DLL version. The window classes are now unregistered as part of resource
+	freeing which fixes bugs that occurred in some containers such as Internet Explorer.
+      </li>
+      <li>
+	'make install' fixed on Solaris.
+      </li>
+      <li>
+	Bug fixed that could lead to a file being opened twice in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite144.zip?download">Release 1.44</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 4 February 2002.
+      </li>
+      <li>
+	Crashing bug fixed in Editor::Paint.
+      </li>
+      <li>
+	Lua lexer no longer treats '.' as a word character and
+	handles 6 keyword sets.
+      </li>
+      <li>
+	WordStartPosition and WordEndPosition take an onlyWordCharacters
+	argument.
+      </li>
+      <li>
+	SciTE option for simplified automatic indentation which repeats
+	the indentation of the previous line.
+      </li>
+      <li>
+	Compilation fix on Alpha because of 64 bit.
+      </li>
+      <li>
+	Compilation fix for static linking.
+      </li>
+      <li>
+	Limited maximum line length handled to 8000 characters as previous
+	value of 16000 was causing stack exhaustion crashes for some.
+      </li>
+      <li>
+	When whole document line selected, only the last display line gets
+	the extra selected rectangle at the right hand side rather than
+	every display line.
+      </li>
+      <li>
+	Caret disappearing bug fixed for the case that the caret was not on the
+	first display line of a document line.
+      </li>
+      <li>
+	SciTE bug fixed where untitled buffer containing text was sometimes
+	deleted without chance to save.
+      </li>
+      <li>
+	SciTE bug fixed where use.monospaced not working with
+	multiple buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite143.zip?download">Release 1.43</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 19 January 2002.
+      </li>
+      <li>
+	Line wrapping robustness and performance improved in Scintilla.
+      </li>
+      <li>
+	Line wrapping option added to SciTE for both edit and output panes.
+      </li>
+      <li>
+	Static linking on Windows handles cursor resource better.
+	Documentation of static linking improved.
+      </li>
+      <li>
+	Autocompletion has an option to delete any word characters after the caret
+	upon selecting an item.
+      </li>
+      <li>
+	FOX version identified by PLAT_FOX in Platform.h.
+      </li>
+      <li>
+	Calltips in SciTE use the calltip.&lt;lexer&gt;.word.characters setting to
+	correctly find calltips for functions that include characters like '$' which
+	is not normally considered a word character.
+      </li>
+      <li>
+	SciTE has a command to show help on itself which gets hooked up to displaying
+	SciTEDoc.html.
+      </li>
+      <li>
+	SciTE option calltip.&lt;lexer&gt;.end.definition to display help text on a
+	second line of calltip.
+      </li>
+      <li>
+	Fixed the handling of the Buffers menu on GTK+ to ensure current buffer
+	indicated and no warnings occur.
+	Changed some menu items on GTK+ version to be same as Windows version.
+      </li>
+      <li>
+	use.monospaced property for SciTE determines initial state of Use Monospaced Font
+	setting.
+      </li>
+      <li>
+	The SciTE Complete Symbol command now works when there are no word
+	characters before the caret, even though it is slow to display the whole set of
+	symbols.
+      </li>
+      <li>
+	Function names removed from SciTE's list of PHP keywords. The full list of
+	predefined functions is available from another web site mentioned on the
+	Extras page.
+      </li>
+      <li>
+	Crashing bug at startup on GTK+ for some configurations fixed.
+      </li>
+      <li>
+	Crashing bug on GTK+ on 64 bit platforms fixed.
+      </li>
+      <li>
+	Compilation problem with some compilers fixed in GTK+.
+      </li>
+      <li>
+	Japanese text entry improved on Windows 9x.
+      </li>
+      <li>
+        SciTE recent files directory problem on Windows when HOME and SciTE_HOME
+	environment variables not set is now the directory of the executable.
+      </li>
+      <li>
+	Session files no longer include untitled buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite142.zip?download">Release 1.42</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 December 2001.
+      </li>
+      <li>
+	Better localization support including context menus and most messages.
+	Translations of the SciTE user interface available for Bulgarian,
+	French, German, Italian, Russian, and Turkish.
+      </li>
+      <li>
+	Can specify a character to use to indicate control characters
+	rather than having them displayed as mnemonics.
+      </li>
+      <li>
+	Scintilla key command for backspace that will not delete line
+	end characters.
+      </li>
+      <li>
+	Scintilla method to find start and end of words.
+      </li>
+      <li>
+	SciTE on GTK+ now supports the load.on.activate and save.on.deactivate
+	properties in an equivalent way to the Windows version.
+      </li>
+      <li>
+	The output pane of SciTE on Windows is now interactive so command line
+	utilities that prompt for input or confirmation can be used.
+      </li>
+      <li>
+	SciTE on Windows can choose directory for a "Find in Files"
+	command like the GTK+ version could.
+      </li>
+      <li>
+	SciTE can now load a set of API files rather than just one file.
+      </li>
+      <li>
+	ElapsedTime class added to Platform for accurate measurement of durations.
+	Used for debugging and for showing the user how long commands take in SciTE.
+      </li>
+      <li>
+	Baan lexer added.
+      </li>
+      <li>
+	In C++ lexer, document comment keywords no longer have to be at the start
+	of the line.
+      </li>
+      <li>
+	PHP lexer changed to match keywords case insensitively.
+      </li>
+      <li>
+	More shell keywords added.
+      </li>
+      <li>
+	SciTE support for VoiceXML added to xml.properties.
+      </li>
+       <li>
+	In SciTE the selection is not copied to the find field of the Search and Replace
+	dialogs if it contains end of line characters.
+      </li>
+      <li>
+	SciTE on Windows has a menu item to decide whether to respond to other
+	instances which are performing their check.if.already.open check.
+      </li>
+      <li>
+	SciTE accelerator key for Box Comment command changed to avoid problems
+	in non-English locales.
+      </li>
+      <li>
+	SciTE context menu includes Close command for the editor pane and
+	Hide command for the output pane.
+      </li>
+      <li>
+	output: command added to SciTE director interface to add text to the
+	output pane. The director interface can execute commands (such as tool
+	commands with subsystem set to 3) by sending a macro:run message.
+      </li>
+      <li>
+	SciTE on GTK+ will defer to the Window Manager for position if position.left or
+	position.top not set and for size if position.width or position.height not set.
+      </li>
+      <li>
+	SciTE on Windows has a position.tile property to place a second instance
+	to the right of the first.
+      </li>
+      <li>
+	 Scintilla on Windows again supports EM_GETSEL and EM_SETSEL.
+      </li>
+      <li>
+	Problem fixed in Scintilla on Windows where control ID is no longer cached
+	as it could be changed by external code.
+      </li>
+      <li>
+	Problems fixed in SciTE on Windows when finding any other open instances at
+	start up when check.if.already.open is true.
+      </li>
+      <li>
+	Bugs fixed in SciTE where command strings were not always having
+	variables evaluated.
+      </li>
+      <li>
+	Bugs fixed with displaying partial double-byte and Unicode characters
+	in rectangular selections and at the edge when edge mode is EDGE_BACKGROUND.
+	Column numbers reported by GetColumn treat multiple byte characters as one column
+	rather than counting bytes.
+      </li>
+      <li>
+	Bug fixed with caret movement over folded lines.
+      </li>
+      <li>
+        Another bug fixed with tracking selection in secondary views when performing
+	modifications.
+      </li>
+      <li>
+	Horizontal scrolling and display of long lines optimized.
+      </li>
+      <li>
+	Cursor setting in Scintilla on GTK+ optimized.
+      </li>
+      <li>
+	Experimental changeable style attribute.
+	Set to false to make text read-only.
+	Currently only stops caret from being within not-changeable
+	text and does not yet stop deleting a range that contains
+	not-changeable text.
+	Can be used from SciTE by adding notchangeable to style entries.
+      </li>
+      <li>
+	Experimental line wrapping.
+	Currently has performance and appearance problems.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite141.zip?download">Release 1.41</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 6 November 2001.
+      </li>
+      <li>
+        Changed Platform.h to not include platform	headers. This lessens likelihood and impact of
+	name clashes from system headers and also speeds up compilation.
+	Renamed DrawText to DrawTextNoClip to avoid name clash.
+      </li>
+      <li>
+        Changed way word functions work to treat a sequence of punctuation as
+	a word. This is more sensible and also more compatible with other editors.
+      </li>
+      <li>
+        Cursor changes over the margins and selection on GTK+ platform.
+      </li>
+      <li>
+        SC_MARK_BACKGROUND is a marker that only changes the line's background colour.
+      </li>
+      <li>
+	Enhanced Visual Basic lexer handles character date and octal literals,
+	and bracketed keywords for VB.NET. There are two VB lexers, vb and vbscript
+	with type indication characters like ! and $ allowed at the end of identifiers
+	in vb but not vbscript. Lexer states now separate from those used for C++ and
+	names start with SCE_B.
+      </li>
+      <li>
+         Lexer added for Bullant language.
+      </li>
+      <li>
+         The horizontal scroll position, xOffset, is now exposed through the API.
+      </li>
+      <li>
+         The SCN_POSCHANGED notification is deprecated as it was causing confusion.
+	 Use SCN_UPDATEUI  instead.
+      </li>
+      <li>
+         Compilation problems fixed for some versions of gcc.
+      </li>
+      <li>
+        Support for WM_GETTEXT restored on Windows.
+      </li>
+      <li>
+        Double clicking on an autocompletion list entry works on GTK+.
+      </li>
+      <li>
+        Bug fixed with case insensitive sorts for autocompletion lists.
+      </li>
+      <li>
+        Bug fixed with tracking selection in secondary views when performing modifications.
+      </li>
+      <li>
+        SciTE's abbreviation expansion feature will now indent expansions to the current
+	indentation level if indent.automatic is on.
+      </li>
+      <li>
+        SciTE allows setting up of parameters to commands from a dialog and can also
+       show this dialog automatically to prompt for arguments when running a command.
+      </li>
+      <li>
+        SciTE's Language menu (formerly Options | Use Lexer) is now defined by the
+	menu.language property rather than being hardcoded.
+      </li>
+      <li>
+        The user interface of SciTE can be localized to a particular language by editing
+	a locale.properties file.
+      </li>
+      <li>
+        On Windows, SciTE will try to move to the front when opening a new file from
+	the shell and using check.if.already.open.
+      </li>
+      <li>
+        SciTE can display the file name and directory in the title bar in the form
+	"file @ directory" when title.full.path=2.
+      </li>
+      <li>
+        The SciTE time.commands property reports the time taken by a command as well
+	as its status when completed.
+      </li>
+      <li>
+        The SciTE find.files property is now a list separated by '|' characters and this list is
+	added into the Files pull down of the Find in Files dialog.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite140.zip?download">Release 1.40</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 September 2001.
+      </li>
+      <li>
+	Removal of emulation of Win32 RichEdit control in core of Scintilla.
+	<em>This change may be incompatible with existing client code.</em>
+	Some emulation still done in Windows platform layer.
+      </li>
+      <li>
+	SGML support in the HTML/XML lexer.
+      </li>
+      <li>
+	SciTE's "Stop Executing" command will terminate GUI programs on
+	Windows NT and Windows 2000.
+      </li>
+      <li>
+	StyleContext class helps construct lexers that are simple and accurate.
+	Used in the C++, Eiffel, and Python lexers.
+      </li>
+      <li>
+	Clipboard operations in GTK+ version convert between platform '\n' line endings and
+	currently chosen line endings.
+      </li>
+      <li>
+	Any character in range 0..255 can be used as a marker.
+	This can be used to support numbered bookmarks, for example.
+      </li>
+      <li>
+	The default scripting language for ASP can be set.
+      </li>
+      <li>
+	New lexer and other support for crontab files used with the nncron scheduler.
+      </li>
+      <li>
+	Folding of Python improved.
+      </li>
+      <li>
+	The ` character is treated as a Python operator.
+      </li>
+      <li>
+	Line continuations ("\" at end of line) handled inside Python strings.
+      </li>
+      <li>
+	More consistent handling of line continuation ('\' at end of line) in
+	C++ lexer.
+	This fixes macro definitions that span more than one line.
+      </li>
+      <li>
+	C++ lexer can understand Doxygen keywords in doc comments.
+      </li>
+      <li>
+	SciTE on Windows allows choosing to open the "open" dialog on the directory
+	of the current file rather than in the default directory.
+      </li>
+      <li>
+	SciTE on Windows handles command line arguments in "check.if.already.open"
+	correctly when the current directory of the new instance is different to the
+	already open instance of SciTE.
+      </li>
+      <li>
+	"cwd" command (change working directory) defined for SciTE director interface.
+      </li>
+      <li>
+	SciTE "Export As HTML" produces better, more compliant, and shorter files.
+      </li>
+      <li>
+	SciTE on Windows allows several options for determining default file name
+	for exported files.
+      </li>
+      <li>
+	Automatic indentation of Python in SciTE fixed.
+      </li>
+      <li>
+	Exported HTML can support folding.
+      </li>
+      <li>
+	Bug fixed in SCI_GETTEXT macro command of director interface.
+      </li>
+      <li>
+	Cursor leak fixed on GTK+.
+      </li>
+      <li>
+	During SciTE shutdown, "identity" messages are no longer sent over the director interface.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite139.zip?download">Release 1.39</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 22 August 2001.
+      </li>
+      <li>
+	Windows version requires msvcrt.dll to be available so will not work
+	on original Windows 95 version 1. The msvcrt.dll file is installed
+	by almost everything including Internet Explorer so should be available.
+      </li>
+      <li>
+	Flattened tree control style folding margin. The SciTE fold.plus option is
+	now fold.symbols and has more values for the new styles.
+      </li>
+      <li>
+	Mouse dwell events are generated when the user holds the mouse steady
+	over Scintilla.
+      </li>
+      <li>
+      PositionFromPointClose is like PositionFromPoint but returns
+      INVALID_POSITION when point outside window or after end of line.
+      </li>
+      <li>
+      Input of Hungarian and Russian characters in GTK+ version works by
+      truncating input to 8 bits if in the range of normal characters.
+      </li>
+      <li>
+      Better choices for font descriptors on GTK+ for most character sets.
+      </li>
+      <li>
+      GTK+ Scintilla is destroyed upon receiving destroy signal rather than
+      destroy_event signal.
+      </li>
+      <li>
+      Style setting that force upper or lower case text.
+      </li>
+      <li>
+      Case-insensitive autocompletion lists work correctly.
+      </li>
+      <li>
+      Keywords can be prefix based so ^GTK_ will treat all words that start
+      with GTK_ as keywords.
+      </li>
+      <li>
+      Horizontal scrolling can be jumpy rather than gradual.
+      </li>
+      <li>
+      GetSelText places a '\0' in the buffer if the selection is empty..
+      </li>
+      <li>
+      EnsureVisible split into two methods EnsureVisible which will not scroll to show
+      the line and EnsureVisibleEnforcePolicy which may scroll.
+      </li>
+      <li>
+      Python folder has options to fold multi-line comments and triple quoted strings.
+      </li>
+      <li>
+      C++ lexer handles keywords before '.' like "this.x" in Java as keywords.
+      Compact folding mode option chooses whether blank lines after a structure are
+      folded with that structure. Second set of keywords with separate style supported.
+      </li>
+      <li>
+      Ruby lexer handles multi-line comments.
+      </li>
+      <li>
+      VB has folder.
+      </li>
+      <li>
+      PHP lexer has an operator style, handles "&lt;?" and "?&gt;" inside strings
+      and some comments.
+      </li>
+      <li>
+      TCL lexer which is just an alias for the C++ lexer so does not really
+      understand TCL syntax.
+      </li>
+      <li>
+      Error lines lexer has styles for Lua error messages and .NET stack traces.
+      </li>
+      <li>
+      Makefile lexer has a target style.
+      </li>
+      <li>
+      Lua lexer handles some [[]] string literals.
+      </li>
+      <li>
+      HTML and XML lexer have a SCE_H_SGML state for tags that
+      start with "&lt;!".
+      </li>
+      <li>
+      Fixed Scintilla bugs with folding. When modifications were performed near
+      folded regions sometimes no unfolding occurred when it should have. Deleting a
+      fold causing character sometimes failed to update fold information correctly.
+      </li>
+      <li>
+      Better support for Scintilla on GTK+ for Win32 including separate
+      PLAT_GTK_WIN32 definition and correct handling of rectangular selection
+      with clipboard operations.
+      </li>
+      <li>
+      SciTE has a Tools | Switch Pane (Ctrl+F6) command to switch focus between
+      edit and output panes.
+      </li>
+      <li>
+      SciTE option output.scroll allows automatic scrolling of output pane to
+      be turned off.
+      </li>
+      <li>
+      Commands can be typed into the SciTE output pane similar to a shell window.
+      </li>
+      <li>
+      SciTE properties magnification and output magnification set initial zoom levels.
+      </li>
+      <li>
+      Option for SciTE comment block command to place comments at start of line.
+      </li>
+      <li>
+       SciTE for Win32 has an option to minimize to the tray rather than the task bar.
+      </li>
+      <li>
+      Close button on SciTE tool bar for Win32.
+      </li>
+      <li>
+      SciTE compiles with GCC 3.0.
+      </li>
+      <li>
+      SciTE's automatic indentation of C++ handles braces without preceding keyword
+      correctly.
+      </li>
+      <li>
+      Bug fixed with GetLine method writing past the end of where it should.
+      </li>
+      <li>
+      Bug fixed with mouse drag automatic scrolling when some lines were folded.
+      </li>
+      <li>
+      Bug fixed because caret XEven setting was inverted.
+      </li>
+      <li>
+      Bug fixed where caret was initially visible even though window was not focussed.
+      </li>
+      <li>
+      Bug fixed where some file names could end with "\\" which caused slow
+      downs on Windows 9x.
+      </li>
+      <li>
+      On Win32, SciTE Replace dialog starts with focus on replacement text.
+      </li>
+      <li>
+      SciTE Go to dialog displays correct current line.
+      </li>
+      <li>
+      Fixed bug with SciTE opening multiple files at once.
+      </li>
+      <li>
+      Fixed bug with Unicode key values reported to container truncated.
+      </li>
+      <li>
+      Fixed bug with unnecessary save point notifications.
+      </li>
+      <li>
+      Fixed bugs with indenting and unindenting at start of line.
+      </li>
+      <li>
+      Monospace Font setting behaves more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite138.zip?download">Release 1.38</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 May 2001.
+      </li>
+      <li>
+	Loadable lexer plugins on Windows.
+      </li>
+      <li>
+	Ruby lexer and support.
+      </li>
+      <li>
+	Lisp lexer and support.
+      </li>
+      <li>
+	Eiffel lexer and support.
+      </li>
+      <li>
+	Modes for better handling of Tab and BackSpace keys within
+	indentation. Mode to avoid autocompletion list cancelling when
+	there are no viable matches.
+      </li>
+      <li>
+	ReplaceTarget replaced with two calls ReplaceTarget
+	(which is incompatible with previous ReplaceTarget) and
+	ReplaceTargetRE. Both of these calls have a count first
+	parameter which allows using strings containing nulls.
+	SearchInTarget and SetSearchFlags functions allow
+	specifying a search in several simple steps which helps
+	some clients which can not create structs or pointers easily.
+      </li>
+      <li>
+	Asian language input through an Input Method Editor works
+	on Windows 2000.
+      </li>
+      <li>
+	On Windows, control characters can be entered through use of
+	the numeric keypad in conjunction with the Alt key.
+      </li>
+      <li>
+	Document memory allocation changed to grow exponentially
+	which reduced time to load a 30 Megabyte file from
+	1000 seconds to 25. Change means more memory may be used.
+      </li>
+      <li>
+	Word part movement keys now handled in Scintilla rather than
+	SciTE.
+      </li>
+      <li>
+	Regular expression '^' and '$' work more often allowing insertion
+	of text at start or end of line with a replace command.
+	Backslash quoted control characters \a, \b, \f, \t, and \v
+	recognized within sets.
+      </li>
+      <li>
+	Session files for SciTE.
+      </li>
+      <li>
+	Export as PDF command hidden in SciTE as it often failed.
+	Code still present so can be turned on by those willing to cope.
+      </li>
+      <li>
+	Bug fixed in HTML lexer handling % before &gt; as end ASP
+	even when no start ASP encountered.
+        Bug fixed when scripts ended with a quoted string and
+        end tag was not seen.
+      </li>
+      <li>
+	Bug fixed on Windows where context menu key caused menu to
+	appear in corner of screen rather than within window.
+      </li>
+      <li>
+	Bug fixed in SciTE's Replace All command not processing
+	whole file when replace string longer than search string.
+      </li>
+      <li>
+	Bug fixed in SciTE's MRU list repeating entries if Ctrl+Tab
+	used when all entries filled.
+      </li>
+      <li>
+	ConvertEOLs call documentation fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite137.zip?download">Release 1.37</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2001.
+      </li>
+      <li>
+	Bug fixed with scroll bars being invisible on GTK+ 1.2.9.
+      </li>
+      <li>
+	Scintilla and SciTE support find and replace using simple regular
+	expressions with tagged expressions. SciTE supports C '\' escapes
+	in the Find and Replace dialogs.
+	Replace in Selection available in SciTE.
+      </li>
+      <li>
+	Scintilla has a 'target' feature for replacing code rapidly without
+	causing display updates.
+      </li>
+      <li>
+	Scintilla and SciTE on GTK+ support file dropping from file managers
+	such as Nautilus and gmc. Files or other URIs dropped on Scintilla
+	result in a URIDropped notification.
+      </li>
+      <li>
+	Lexers may have separate Lex and Fold functions.
+      </li>
+      <li>
+	Lexer infrastructure improved to allow for plug in lexers and for referring
+	to lexers by name rather than by ID.
+      </li>
+      <li>
+	Ada lexer and support added.
+      </li>
+      <li>
+	Option in both Scintilla and SciTE to treat both left and right margin
+	as equally important when repositioning visible area in response to
+	caret movement. Default is to prefer visible area positioning which
+	minimizes the horizontal scroll position thus favouring the left margin.
+      </li>
+      <li>
+	Caret line highlighting.
+      </li>
+      <li>
+	Commands to delete from the caret to the end of line and
+	from the caret to the beginning of line.
+      </li>
+      <li>
+	SciTE has commands for inserting and removing block comments and
+	for inserting stream comments.
+      </li>
+      <li>
+	SciTE Director interface uses C++ '\' escapes to send control characters.
+      </li>
+      <li>
+	SciTE Director interface adds more commands including support for macros.
+      </li>
+      <li>
+	SciTE has menu options for recording and playing macros which are visible
+	when used with a companion program that supports these features.
+      </li>
+      <li>
+	SciTE has an Expand Abbreviation command.
+	Abbreviations are stored in a global abbrev.properties file.
+      </li>
+      <li>
+	SciTE has a Full Screen command to switch between a normal window
+	size and using the full screen. On Windows, the menu bar can be turned
+	off when in full screen mode.
+      </li>
+      <li>
+	SciTE has a Use monospaced font command to switch between the normal
+	set of fonts and one size of a particular fixed width font.
+      </li>
+      <li>
+	SciTE's use of tabs can be controlled for particular file names
+	as well as globally.
+      </li>
+      <li>
+	The contents of SciTE's status bar can be defined by a property and
+	include variables. On Windows, several status bar definitions can be active
+	with a click on the status bar cycling through them.
+      </li>
+      <li>
+	Copy as RTF command in SciTE on Windows to allow pasting
+	styled text into word processors.
+      </li>
+      <li>
+	SciTE can allow the use of non-alphabetic characters in
+	Complete Symbol lists and can automatically display this autocompletion
+	list when a trigger character such as '.' is typed.
+	Complete word can be set to pop up when the user is typing a word and
+	there is only one matching word in the document.
+      </li>
+      <li>
+	SciTE lists the imported properties files on a menu to allow rapid
+	access to them.
+      </li>
+      <li>
+	SciTE on GTK+ improvements to handling accelerator keys and focus
+	in dialogs. Message boxes respond to key presses without the Alt key as
+	they have no text entries to accept normal keystrokes.
+      </li>
+      <li>
+	SciTE on GTK+ sets the application icon.
+      </li>
+      <li>
+	SciTE allows setting the colours used to indicate the current
+	error line.
+      </li>
+      <li>
+	Variables within PHP strings have own style. Keyword list updated.
+      </li>
+      <li>
+	Keyword list for Lua updated for Lua 4.0.
+      </li>
+      <li>
+	Bug fixed in rectangular selection where rectangle still appeared
+	selected after using cursor keys to move caret.
+      </li>
+      <li>
+	Bug fixed in C++ lexer when deleting a '{' controlling a folded range
+	led to that range becoming permanently invisible.
+      </li>
+      <li>
+	Bug fixed in Batch lexer where comments were not recognized.
+      </li>
+      <li>
+	Bug fixed with undo actions coalescing into steps incorrectly.
+      </li>
+      <li>
+	Bug fixed with Scintilla on GTK+ positioning scroll bars 1 pixel
+	over the Scintilla window leading to their sides being chopped off.
+      </li>
+      <li>
+	Bugs fixed in SciTE when doing some actions led to the start
+	or end of the file being displayed rather than the current location.
+      </li>
+      <li>
+	Appearance of calltips fixed to look like document text including
+	any zoom factor. Positioned to be outside current line even when
+	multiple fonts and sizes used.
+      </li>
+      <li>
+	Bug fixed in Scintilla macro support where typing Enter caused both a newline
+	command and newline character insertion to be recorded.
+      </li>
+      <li>
+	Bug fixed in SciTE on GTK+ where focus was moving
+	between widgets incorrectly.
+      </li>
+      <li>
+	Bug fixed with fold symbols sometimes not updating when
+	the text changed.
+      </li>
+      <li>
+	Bugs fixed in SciTE's handling of folding commands.
+      </li>
+      <li>
+	Deprecated undo collection enumeration removed from API.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite136.zip?download">Release 1.36</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 March 2001.
+      </li>
+      <li>
+	Scintilla supports GTK+ on Win32.
+      </li>
+      <li>
+	Some untested work on making Scintilla and SciTE 64 bit compatible.
+	For users on GTK+ this requires including Scintilla.h before
+	ScintillaWidget.h.
+      </li>
+      <li>
+	HTML lexer allows folding HTML.
+      </li>
+      <li>
+	New lexer for Avenue files which are used in the ESRI ArcView GIS.
+      </li>
+      <li>
+	DOS Batch file lexer has states for '@', external commands, variables and
+	operators.
+      </li>
+      <li>
+	C++ lexer can fold comments of /* .. */ form.
+      </li>
+      <li>
+	Better disabling of pop up menu items in Scintilla when in read-only mode.
+      </li>
+      <li>
+	Starting to move to Doxygen compatible commenting.
+      </li>
+      <li>
+	Director interface on Windows enables another application to control SciTE.
+      </li>
+      <li>
+	Opening SciTE on Windows 9x sped up greatly for some cases.
+      </li>
+      <li>
+	The command.build.directory property allows SciTE to run the build
+	command in a different directory to the source files.
+      </li>
+      <li>
+	SciTE on Windows allows setting foreground and background colours
+	for printed headers and footers.
+      </li>
+      <li>
+	Bug fixed in finding calltips in SciTE which led to no calltips for some identifiers.
+      </li>
+      <li>
+	Documentation added for lexers and for the extension and director interfaces.
+      </li>
+      <li>
+	SciTE menus rearranged with new View menu taking over some of the items that
+	were under the Options menu. Clear All Bookmarks command added.
+      </li>
+      <li>
+	Clear Output command in SciTE.
+      </li>
+      <li>
+	SciTE on Windows gains an Always On Top command.
+      </li>
+      <li>
+	Bug fixed in SciTE with attempts to define properties recursively.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where only one level of substitution was done.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where extensions were not being
+	matched in a case insensitive manner.
+      </li>
+      <li>
+	Bug fixed in SciTE on Windows where the Go to dialog displays the correct
+	line number.
+      </li>
+      <li>
+	In SciTE, if fold.on.open set then switching buffers also performs fold.
+      </li>
+      <li>
+	Bug fixed in Scintilla where ensuring a line was visible in the presence of folding
+	operated on the document line instead of the visible line.
+      </li>
+      <li>
+	SciTE command line processing modified to operate on arguments in order and in
+	two phases. First any arguments before the first file name are processed, then the
+	UI is opened, then the remaining arguments are processed. Actions defined for the
+	Director interface (currently only "open") may also be used on the command line.
+	For example, "SciTE -open:x.txt" will start SciTE and open x.txt.
+      </li>
+      <li>
+	Numbered menu items SciTE's Buffers menu and the Most Recently Used portion
+	of the File menu go from 1..0 rather than 0..9.
+      </li>
+      <li>
+	The tab bar in SciTE for Windows has numbers.
+	The tab.hide.one option hides the tab bar until there is more than one buffer open.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite135.zip?download">Release 1.35</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 January 2001.
+      </li>
+      <li>
+        Rewritten and simplified widget code for the GTK+ version to enhance
+        solidity and make more fully compliant with platform norms. This includes more
+        normal handling of keystrokes so they are forwarded to containers correctly.
+      </li>
+      <li>
+        User defined lists can be shown.
+      </li>
+      <li>
+        Many fixes to the Perl lexer.
+      </li>
+      <li>
+        Pascal lexer handles comments more correctly.
+      </li>
+      <li>
+        C/C++/Java/JavaScipt lexer has a state for line doc comments.
+      </li>
+      <li>
+        Error output lexer understands Sun CC messages.
+      </li>
+      <li>
+        Make file lexer has variable, preprocessor, and operator states.
+      </li>
+      <li>
+        Wider area given to an italics character that is at the end of a line to prevent it
+	being cut off.
+      </li>
+      <li>
+        Call to move the caret inside the currently visible area.
+      </li>
+      <li>
+        Paste Rectangular will space fill on the left hand side of the pasted text as
+	needed to ensure it is kept rectangular.
+      </li>
+      <li>
+        Cut and Paste Rectangular does nothing in read-only mode.
+      </li>
+      <li>
+        Undo batching changed so that a paste followed by typing creates two undo actions..
+      </li>
+      <li>
+        A "visibility policy" setting for Scintilla determines which range of lines are displayed
+	when a particular line is moved to. Also exposed as a property in SciTE.
+      </li>
+      <li>
+        SciTE command line allows property settings.
+      </li>
+      <li>
+        SciTE has a View Output command to hide or show the output pane.
+      </li>
+      <li>
+        SciTE's Edit menu has been split in two with searching commands moved to a
+	new Search menu. Find Previous and Previous Bookmark are in the Search menu.
+      </li>
+      <li>
+        SciTE on Windows has options for setting print margins, headers and footers.
+      </li>
+      <li>
+        SciTE on Windows has tooltips for toolbar.
+      </li>
+      <li>
+        SciTE on GTK+ has properties for setting size of file selector.
+      </li>
+      <li>
+        Visual and audio cues in SciTE on Windows enhanced.
+      </li>
+      <li>
+        Fixed performance problem in SciTE for GTK+ by dropping the extra 3D
+        effect on the content windows.
+      </li>
+      <li>
+        Fixed problem in SciTE where choosing a specific lexer then meant
+        that no lexer was chosen when files opened.
+      </li>
+      <li>
+        Default selection colour changed to be visible on low colour displays.
+      </li>
+      <li>
+        Fixed problems with automatically reloading changed documents in SciTE on
+        Windows.
+      </li>
+      <li>
+        Fixed problem with uppercase file extensions in SciTE.
+      </li>
+      <li>
+        Fixed some problems when using characters >= 128, some of which were being
+        incorrectly treated as spaces.
+      </li>
+      <li>
+        Fixed handling multiple line tags, non-inline scripts, and XML end tags /&gt; in HTML/XML lexer.
+      </li>
+      <li>
+        Bookmarks in SciTE no longer disappear when switching between buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite134.zip?download">Release 1.34</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 November 2000.
+      </li>
+      <li>
+        Pascal lexer.
+      </li>
+      <li>
+        Export as PDF in SciTE.
+      </li>
+      <li>
+        Support for the OpenVMS operating system in SciTE.
+      </li>
+      <li>
+        SciTE for GTK+ can check for another instance of SciTE
+	editing a file and switch to it rather than open a second instance
+	on one file.
+      </li>
+      <li>
+        Fixes to quoting and here documents in the Perl lexer.
+      </li>
+      <li>
+        SciTE on Windows can give extra visual and audio cues when a
+	warning is shown or find restarts from beginning of file.
+      </li>
+      <li>
+        Open Selected Filename command in SciTE. Also understands some
+	warning message formats.
+      </li>
+      <li>
+        Wider area for line numbers when printing.
+      </li>
+      <li>
+        Better scrolling performance on GTK+.
+      </li>
+      <li>
+        Fixed problem where rectangles with negative coordinates were
+	invalidated leading to trouble with platforms that use
+	unsigned coordinates.
+      </li>
+      <li>
+        GTK+ Scintilla uses more compliant signalling code so that keyboard
+	events should propagate to containers.
+      </li>
+      <li>
+        Bug fixed with opening full or partial paths.
+      </li>
+      <li>
+        Improved handling of paths in error messages in SciTE.
+      </li>
+      <li>
+        Better handling of F6 in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite133.zip?download">Release 1.33</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 2000.
+      </li>
+      <li>
+        XIM support for the GTK+ version of Scintilla ensures that more non-English
+        characters can be typed.
+      </li>
+      <li>
+        Caret may be 1, 2, or 3 pixels wide.
+      </li>
+      <li>
+        Cursor may be switched to wait image during lengthy processing.
+      </li>
+      <li>
+        Scintilla's internal focus flag is exposed for clients where focus is handled in
+        complex ways.
+      </li>
+      <li>
+        Error status defined for Scintilla to hold indication that an operation failed and the reason
+        for that failure. No detection yet implemented but clients may start using the interface
+        so as to be ready for when it does.
+      </li>
+      <li>
+        Context sensitive help in SciTE.
+      </li>
+      <li>
+        CurrentWord property available in SciTE holding the value of the word the
+        caret is within or near.
+      </li>
+      <li>
+        Apache CONF file lexer.
+      </li>
+      <li>
+        Changes to Python lexer to allow 'as' as a context sensitive keyword and the
+        string forms starting with u, r, and ur to be recognized.
+      </li>
+      <li>
+        SCN_POSCHANGED notification now working and SCN_PAINTED notification added.
+      </li>
+      <li>
+        Word part movement commands for cursoring between the parts of reallyLongCamelIdentifiers and
+        other_ways_of_making_words.
+      </li>
+      <li>
+        When text on only one line is selected, Shift+Tab moves to the previous tab stop.
+      </li>
+      <li>
+        Tab control available for Windows version of SciTE listing all the buffers
+        and making it easy to switch between them.
+      </li>
+      <li>
+        SciTE can be set to automatically determine the line ending type from the contents of a
+        file when it is opened.
+      </li>
+      <li>
+        Dialogs in GTK+ version of SciTE made more modal and have accelerator keys.
+      </li>
+      <li>
+        Find in Files command in GTK+ version of SciTE allows choice of directory.
+      </li>
+      <li>
+        On Windows, multiple files can be opened at once.
+      </li>
+      <li>
+        SciTE source broken up into more files.
+      </li>
+      <li>
+        Scintilla headers made safe for C language, not just C++.
+      </li>
+      <li>
+        New printing modes - force background to white and force default background to white.
+      </li>
+      <li>
+        Automatic unfolding not occurring when Enter pressed at end of line bug fixed.
+      </li>
+      <li>
+        Bugs fixed in line selection.
+      </li>
+      <li>
+        Bug fixed with escapes in PHP strings in the HTML lexer.
+      </li>
+      <li>
+        Bug fixed in SciTE for GTK+ opening files when given full paths.
+      </li>
+      <li>
+        Bug fixed in autocompletion where user backspaces into existing text.
+      </li>
+      <li>
+        Bugs fixed in opening files and ensuring they are saved before running.
+        A case bug also fixed here.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite132.zip?download">Release 1.32</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 8 September 2000.
+      </li>
+      <li>
+        Fixes bugs in complete word and related code. Protection against a bug when
+	receiving a bad argument.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite131.zip?download">Release 1.31</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 September 2000.
+      </li>
+      <li>
+        Scintilla is available as a COM control from the scintillactrl module in CVS.
+      </li>
+      <li>
+        Style setting to underline text. Exposed in SciTE as "underlined".
+      </li>
+      <li>
+        Style setting to make text invisible.
+      </li>
+      <li>
+        SciTE has an extensibility interface that can be used to implement features such as
+        a scripting language or remote control. An example use of this is the extlua module
+        available from CVS which allows SciTE to be scripted in Lua.
+      </li>
+      <li>
+        Many minor fixes to all of the lexers.
+      </li>
+      <li>
+        New lexer for diff and patch files.
+      </li>
+      <li>
+        Error message lexer understands Perl error messages.
+      </li>
+      <li>
+        C/C++/Java lexer now supports C#, specifically verbatim strings and
+	@ quoting of identifiers that are the same as keywords. SciTE has
+	a set of keywords for C# and a build command set up for C#.
+      </li>
+      <li>
+        Scintilla property to see whether in overtype or insert state.
+      </li>
+      <li>
+         PosChanged notification fired when caret moved.
+      </li>
+      <li>
+        Comboboxes in dialogs in SciTE on Windows can be horizontally scrolled.
+      </li>
+      <li>
+        Autocompletion and calltips can treat the document as case sensitive or
+        case insensitive.
+      </li>
+      <li>
+        Autocompletion can be set to automatically choose the only
+	element in a single element list.
+      </li>
+      <li>
+        Set of characters that automatically complete an autocompletion list
+	can be set.
+      </li>
+      <li>
+        SciTE command to display calltip - useful when dropped because of
+	editing.
+      </li>
+      <li>
+        SciTE has a Revert command to go back to the last saved version.
+      </li>
+      <li>
+        SciTE has an Export as RTF command. Save as HTML is renamed
+	to Export as HTML and is located on the Export sub menu.
+      </li>
+      <li>
+        SciTE command "Complete Word" searches document for any
+	words starting with characters before caret.
+      </li>
+      <li>
+        SciTE options for changing aspects of the formatting of files exported
+	as HTML or RTF.
+      </li>
+      <li>
+        SciTE "character.set" option for choosing the character
+	set for all fonts.
+      </li>
+      <li>
+        SciTE has a "Toggle all folds" command.
+      </li>
+      <li>
+        The makefiles have changed. The makefile_vc and
+	makefile_bor files in scintilla/win32 and scite/win32 have been
+	merged into scintilla/win32/scintilla.mak and scite/win32/scite.mak.
+	DEBUG may be defined for all make files and this will turn on
+	assertions and for some make files will choose other debugging
+	options.
+      </li>
+      <li>
+         To make debugging easier and allow good use of BoundsChecker
+	 there is a Visual C++ project file in scite/boundscheck that builds
+	 all of Scintilla and SciTE into one executable.
+      </li>
+      <li>
+         The size of the SciTE output window can be set with the
+	 output.horizontal.size and output.vertical.size settings.
+      </li>
+      <li>
+         SciTE status bar indicator for insert or overwrite mode.
+      </li>
+      <li>
+        Performance improvements to autocompletion and calltips.
+      </li>
+      <li>
+        A caret redraw problem when undoing is fixed.
+      </li>
+      <li>
+        Crash with long lines fixed.
+      </li>
+      <li>
+        Bug fixed with merging markers when lines merged.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite130.zip?download">Release 1.30</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 26 July 2000.
+      </li>
+      <li>
+        Much better support for PHP which is now an integral part of the HTML support.
+      </li>
+      <li>
+        Start replacement of Windows-specific APIs with cross platform APIs.
+        In 1.30, the new APIs are introduced but the old APIs are still available.
+        For the GTK+ version, may have to include "WinDefs.h" explicitly to
+        use the old APIs.
+      </li>
+      <li>
+        "if" and "import" statements in SciTE properties files allows modularization into
+        language-specific properties files and choices based upon platform.
+        This means that SciTE is delivered with 9 language-specific properties files
+        as well as the standard SciTEGlobal.properties file.
+      </li>
+      <li>
+        Much lower resource usage on Windows 9x.
+      </li>
+      <li>
+        "/p" option in SciTE on Windows for printing a file and then exiting.
+      </li>
+      <li>
+        Options for printing with inverted brightness (when the screen is set to use
+        a dark background) and to force black on white printing.
+      </li>
+      <li>
+        Option for printing magnified or miniaturized from screen settings.
+      </li>
+      <li>
+        In SciTE, Ctrl+F3 and Ctrl+Shift+F3 find the selection in the forwards and backwards
+        directions respectively.
+      </li>
+      <li>
+        Auto-completion lists may be set to cancel when the cursor goes before
+        its start position or before the start of string being completed.
+      </li>
+      <li>
+        Auto-completion lists automatically size more sensibly.
+      </li>
+      <li>
+        SCI_CLEARDOCUMENTSTYLE zeroes all style bytes, ensures all
+        lines are shown and deletes all folding information.
+      </li>
+      <li>
+        On Windows, auto-completion lists are visually outdented rather than indented.
+      </li>
+      <li>
+        Close all command in SciTE.
+      </li>
+      <li>
+        On Windows multiple files can be dragged into SciTE.
+      </li>
+      <li>
+        When saving a file, the SciTE option save.deletes.first deletes it before doing the save.
+        This allows saving with a different capitalization on Windows.
+      </li>
+      <li>
+        When use tabs option is off pressing the tab key inserts spaces.
+      </li>
+      <li>
+        Bug in indicators leading to extra line drawn fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite128.zip?download">Release 1.28</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 June 2000.
+      </li>
+      <li>
+         Fixes crash in indentation guides when indent size set to 0.
+      </li>
+      <li>
+         Fixes to installation on GTK+/Linux. User properties file on GTK+ has a dot at front of name:
+         .SciTEUser.properties. Global properties file location configurable at compile time
+         defaulting to $prefix/share/scite. $prefix determined from Gnome if present else its
+         /usr/local and can be overridden by installer. Gnome menu integration performed in
+         make install if Gnome present.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite127.zip?download">Release 1.27</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 23 June 2000.
+      </li>
+      <li>
+         Indentation guides. View whitespace mode may be set to not display whitespace
+	 in indentation.
+      </li>
+      <li>
+        Set methods have corresponding gets for UndoCollection, BufferedDraw,
+	CodePage, UsePalette, ReadOnly, CaretFore, and ModEventMask.
+      </li>
+      <li>
+        Caret is continuously on rather than blinking while typing or holding down
+	delete or backspace. And is now always shown if non blinking when focused on GTK+.
+      </li>
+      <li>
+        Bug fixed in SciTE with file extension comparison now done in case insensitive way.
+      </li>
+      <li>
+        Bugs fixed in SciTE's file path handling on Windows.
+      </li>
+      <li>
+        Bug fixed with preprocessor '#' last visible character causing hang.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite126.zip?download">Release 1.26</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 13 June 2000.
+      </li>
+      <li>
+         Support for the Lua language in both Scintilla and SciTE.
+      </li>
+      <li>
+        Multiple buffers may be open in SciTE.
+      </li>
+      <li>
+        Each style may have a character set configured. This may determine
+	the characters that are displayed by the style.
+      </li>
+      <li>
+         In the C++ lexer, lexing of preprocessor source may either treat it all as being in
+	 the preprocessor class or only the initial # and preprocessor command word as
+	 being in the preprocessor class.
+      </li>
+      <li>
+        Scintilla provides SCI_CREATEDOCUMENT, SCI_ADDREFDOCUMENT, and
+	SCI_RELEASEDOCUMENT to make it easier for a container to deal with multiple
+	documents.
+      </li>
+      <li>
+        GTK+ specific definitions in Scintilla.h were removed to ScintillaWidget.h. All GTK+ clients will need to
+	#include "ScintillaWidget.h".
+      </li>
+      <li>
+        For GTK+, tools can be executed in the background by setting subsystem to 2.
+      </li>
+      <li>
+        Keys in the properties files are now case sensitive. This leads to a performance increase.
+      </li>
+      <li>
+        Menu to choose which lexer to use on a file.
+      </li>
+      <li>
+        Tab size dialog on Windows.
+      </li>
+      <li>
+        File dialogs enlarged on GTK+.
+      </li>
+      <li>
+         Match Brace command bound to Ctrl+E on both platforms with Ctrl+] a synonym on Windows.
+         Ctrl+Shift+E is select to matching brace. Brace matching tries to match to either the inside or the
+         outside, depending on whether the cursor is inside or outside the braces initially.
+	View End of Line bound to Ctrl+Shift+O.
+      </li>
+      <li>
+        The Home key may be bound to move the caret to either the start of the line or the start of the
+        text on the line.
+      </li>
+      <li>
+        Visual C++ project file for SciTE.
+      </li>
+      <li>
+        Bug fixed with current x location after Tab key.
+      </li>
+      <li>
+        Bug fixed with hiding fold margin by setting fold.margin.width to 0.
+      </li>
+      <li>
+        Bugs fixed with file name confusion on Windows when long and short names used, or different capitalizations,
+	or relative paths.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite125.zip?download">Release 1.25</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 May 2000.
+      </li>
+      <li>
+        Some Unicode support on Windows. Treats buffer and API as UTF-8 and displays
+	through UCS-2 of Windows.
+      </li>
+      <li>
+        Automatic indentation. Indentation size can be different to tab size.
+      </li>
+      <li>
+        Tool bar.
+      </li>
+      <li>
+        Status bar now on Windows as well as GTK+.
+      </li>
+      <li>
+        Input fields in Find and Replace dialogs now have history on both Windows and
+	GTK+.
+      </li>
+      <li>
+        Auto completion list items may be separated by a chosen character to allow spaces
+	in items. The selected item may be changed through the API.
+      </li>
+      <li>
+        Horizontal scrollbar can be turned off.
+      </li>
+      <li>
+        Property to remove trailing spaces when saving file.
+      </li>
+      <li>
+        On Windows, changed font size calculation to be more compatible with
+	other applications.
+      </li>
+      <li>
+        On GTK+, SciTE's global properties files are looked for in the directory specified in the
+	SCITE_HOME environment variable if it is set. This allows hiding in a dot directory.
+      </li>
+      <li>
+        Keyword lists in SciTE updated for JavaScript to include those destined to be used in
+	the future. IDL includes XPIDL keywords as well as MSIDL keywords.
+      </li>
+      <li>
+        Zoom level can be set and queried through API.
+      </li>
+      <li>
+        New notification sent before insertions and deletions.
+      </li>
+      <li>
+        LaTeX lexer.
+      </li>
+      <li>
+        Fixes to folding including when deletions and additions are performed.
+      </li>
+      <li>
+        Fix for crash with very long lines.
+      </li>
+      <li>
+        Fix to affect all of rectangular selections with deletion and case changing.
+      </li>
+      <li>
+        Removed non-working messages that had been included only for Richedit compatibility.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite124.zip">Release 1.24</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 March 2000.
+      </li>
+      <li>
+        Added lexing of IDL based on C++ lexer with extra UUID lexical class.
+      </li>
+      <li>
+        Functions and associated keys for Line Delete, Line Cut, Line Transpose,
+	Selection Lower Case and Selection Upper Case.
+      </li>
+      <li>
+        Property setting for SciTE, eol.mode, chooses initial state of line end characters.
+      </li>
+      <li>
+        Fixed bugs in undo history with small almost-contiguous changes being incorrectly coalesced.
+      </li>
+      <li>
+        Fixed bugs with incorrect expansion of ContractionState data structures causing crash.
+      </li>
+      <li>
+        Fixed bugs relating to null fonts.
+      </li>
+      <li>
+        Fixed bugs where recolourization was not done sometimes when required.
+      </li>
+      <li>
+        Fixed compilation problems with SVector.h.
+      </li>
+      <li>
+        Fixed bad setting of fold points in Python.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite123.zip?download">Release 1.23</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 March 2000.
+      </li>
+      <li>
+        Directory structure to separate on basis of product (Scintilla, SciTE, DMApp)
+	and environment (Cross-platform, Win32, GTK+).
+      </li>
+      <li>
+        Download packaging to allow download of the source or platform dependent executables.
+      </li>
+      <li>
+        Source code now available from CVS at SourceForge.
+      </li>
+      <li>
+        Very simple Windows-only demonstration application DMApp is available from cvs as dmapp.
+      </li>
+      <li>
+        Lexing functionality may optionally be included in Scintilla rather than be provided by
+        the container.
+      </li>
+      <li>
+        Set of lexers included is determined at link time by defining which of the Lex* object files
+	are linked in.
+      </li>
+      <li>
+        On Windows, the SciLexer.DLL extends Scintilla.DLL with the standard lexers.
+      </li>
+      <li>
+        Enhanced HTML lexer styles embedded VBScript and Python.
+	ASP segments are styled and ASP scripts in JavaScript, VBScript and Python are styled.
+      </li>
+      <li>
+        PLSQL and PHP supported.
+      </li>
+      <li>
+        Maximum number of lexical states extended to 128.
+      </li>
+      <li>
+        Lexers may store per line parse state for multiple line features such as ASP script language choice.
+      </li>
+      <li>
+        Lexing API simplified.
+      </li>
+      <li>
+        Project file for Visual C++.
+      </li>
+      <li>
+        Can now cycle through all recent files with Ctrl+Tab in SciTE.
+      </li>
+      <li>
+        Bookmarks in SciTE.
+      </li>
+      <li>
+        Drag and drop copy works when dragging to the edge of the selection.
+      </li>
+      <li>
+        Fixed bug with value sizes in properties file.
+      </li>
+      <li>
+        Fixed bug with last line in properties file not being used.
+      </li>
+      <li>
+        Bug with multiple views of one document fixed.
+      </li>
+      <li>
+        Keypad now works on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE122.zip?download">Release 1.22</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 February 2000.
+      </li>
+      <li>
+        wxWindows platform defined.
+	Implementation for wxWindows will be available separately
+	from main Scintilla distribution.
+      </li>
+      <li>
+        Line folding in Scintilla.
+      </li>
+      <li>
+        SciTE performs syntax directed folding for C/C++/Java/JavaScript and for Python.
+      </li>
+      <li>
+        Optional macro recording support.
+      </li>
+      <li>
+        User properties file (SciTEUser.properties) allows for customization by the user
+	that is not overwritten with each installation of SciTE.
+      </li>
+      <li>
+        Python lexer detects and highlights inconsistent indentation.
+      </li>
+      <li>
+        Margin API made more orthogonal. SCI_SETMARGINWIDTH and SCI_SETLINENUMBERWIDTH
+        are deprecated in favour of this new API.
+      </li>
+      <li>
+        Margins may be made sensitive to forward mouse click events to container.
+      </li>
+      <li>
+        SQL lexer and styles included.
+      </li>
+      <li>
+        Perl lexer handles regular expressions better.
+      </li>
+      <li>
+        Caret policy determines how closely caret is tracked by visible area.
+      </li>
+      <li>
+        New marker shapes: arrow pointing down, plus and minus.
+      </li>
+      <li>
+        Optionally display full path in title rather than just file name.
+      </li>
+      <li>
+        Container is notified when Scintilla gains or loses focus.
+      </li>
+      <li>
+        SciTE handles focus in a more standard way and applies the main
+	edit commands to the focused pane.
+      </li>
+      <li>
+        Container is notified when Scintilla determines that a line needs to be made visible.
+      </li>
+      <li>
+        Document watchers receive notification when document about to be deleted.
+      </li>
+      <li>
+        Document interface allows access to list of watchers.
+      </li>
+      <li>
+        Line end determined correctly for lines ending with only a '\n'.
+      </li>
+      <li>
+        Search variant that searches form current selection and sets selection.
+      </li>
+      <li>
+        SciTE understands format of diagnostic messages from WScript.
+      </li>
+      <li>
+        SciTE remembers top line of window for each file in MRU list so switching to a recent file
+	is more likely to show the same text as when the file was previously visible.
+      </li>
+      <li>
+        Document reference count now initialized correctly.
+      </li>
+      <li>
+        Setting a null document pointer creates an empty document.
+      </li>
+      <li>
+        WM_GETTEXT can no longer overrun buffer.
+      </li>
+      <li>
+        Polygon drawing bug fixed on GTK+.
+      </li>
+      <li>
+        Java and JavaScript lexers merged into C++ lexer.
+      </li>
+      <li>
+        C++ lexer indicates unterminated strings by colouring the end of the line
+	rather than changing the rest of the file to string style. This is less
+	obtrusive and helps the folding.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE121.zip?download">Release 1.21</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 2 February 2000.
+      </li>
+      <li>
+        Blank margins on left and right side of text.
+      </li>
+      <li>
+        SCN_CHECKBRACE renamed SCN_UPDATEUI and made more efficient.
+      </li>
+      <li>
+        SciTE source code refactored into platform independent and platform specific classes.
+      </li>
+      <li>
+        XML and Perl subset lexers in SciTE.
+      </li>
+      <li>
+        Large improvement to lexing speed.
+      </li>
+      <li>
+        A new subsystem, 2, allows use of ShellExec on Windows.
+      </li>
+      <li>
+        Borland compatible makefile.
+      </li>
+      <li>
+        Status bar showing caret position in GTK+ version of SciTE.
+      </li>
+      <li>
+        Bug fixes to selection drawing when part of selection outside window, mouse release over
+        scroll bars, and scroll positioning after deletion.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE120.zip">Release 1.2</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 January 2000.
+      </li>
+      <li>
+        Multiple views of one document.
+      </li>
+      <li>
+        Rectangular selection, cut, copy, paste, drag and drop.
+      </li>
+      <li>
+        Long line indication.
+      </li>
+      <li>
+        Reverse searching
+      </li>
+      <li>
+        Line end conversion.
+      </li>
+      <li>
+        Generic autocompletion and calltips in SciTE.
+      </li>
+      <li>
+        Call tip background colour can be set.
+      </li>
+      <li>
+        SCI_MARKERPREV for moving to a previous marker.
+      </li>
+      <li>
+        Caret kept more within window where possible.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE115.zip">Release 1.15</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 15 December 1999.
+      </li>
+      <li>
+        Brace highlighting and badlighting (for mismatched braces).
+      </li>
+      <li>
+        Visible line ends.
+      </li>
+      <li>
+        Multiple line call tips.
+      </li>
+      <li>
+        Printing now works from SciTE on Windows.
+      </li>
+      <li>
+        SciTE has a global "*" lexer style that is used as the basis for all the lexers' styles.
+      </li>
+      <li>
+        Fixes some warnings on GTK+ 1.2.6.
+      </li>
+      <li>
+        Better handling of modal dialogs on GTK+.
+      </li>
+      <li>
+        Resize handle drawn on pane splitter in SciTE on GTK+ so it looks more like a regular GTK+
+        *paned widget.
+      </li>
+      <li>
+        SciTE does not place window origin offscreen if no properties file found on GTK+.
+      </li>
+      <li>
+        File open filter remembered in SciTE on Windows.
+      </li>
+      <li>
+        New mechanism using style numbers 32 to 36 standardizes the setting of styles for brace
+        highlighting, brace badlighting, line numbers, control characters and the default style.
+      </li>
+      <li>
+        Old messages SCI_SETFORE .. SCI_SETFONT have been replaced by the default style 32. The old
+        messages are deprecated and will disappear in a future version.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE114.zip">Release 1.14</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 20 November 1999.
+      </li>
+      <li>
+        Fixes a scrolling bug reported on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE113.zip">Release 1.13</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 18 November 1999.
+      </li>
+      <li>
+        Fixes compilation problems with the mingw32 GCC 2.95.2 on Windows.
+      </li>
+      <li>
+        Control characters are now visible.
+      </li>
+      <li>
+        Performance has improved, particularly for scrolling.
+      </li>
+      <li>
+        Windows RichEdit emulation is more accurate. This may break client code that uses these
+        messages: EM_GETLINE, EM_GETLINECOUNT, EM_EXGETSEL, EM_EXSETSEL, EM_EXLINEFROMCHAR,
+        EM_LINELENGTH, EM_LINEINDEX, EM_CHARFROMPOS, EM_POSFROMCHAR, and EM_GETTEXTRANGE.
+      </li>
+      <li>
+        Menus rearranged and accelerator keys set for all static items.
+      </li>
+      <li>
+        Placement of space indicators in view whitespace mode is more accurate with some fonts.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE112.zip">Release 1.12</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 November 1999.
+      </li>
+      <li>
+        Packaging error in 1.11 meant that the compilation error was not fixed in that release.
+        Linux/GTK+ should compile with GCC 2.95 this time.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE111.zip">Release 1.11</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 7 November 1999.
+      </li>
+      <li>
+        Fixed a compilation bug in ScintillaGTK.cxx.
+      </li>
+      <li>
+        Added a README file to explain how to build.
+      </li>
+      <li>
+        GTK+/Linux downloads now include documentation.
+      </li>
+      <li>
+        Binary only Sc1.EXE one file download for Windows.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE110.zip">Release 1.1</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 1999.
+      </li>
+      <li>
+        Major restructuring for better modularity and platform independence.
+      </li>
+      <li>
+        Inter-application drag and drop.
+      </li>
+      <li>
+        Printing support in Scintilla on Windows.
+      </li>
+      <li>
+        Styles can select colouring to end of line. This can be used when a file contains more than
+        one language to differentiate between the areas in each language. An example is the HTML +
+        JavaScript styling in SciTE.
+      </li>
+      <li>
+        Actions can be grouped in the undo stack, so they will be undone together. This grouping is
+        hierarchical so higher level actions such as replace all can be undone in one go. Call to
+        discover whether there are any actions to redo.
+      </li>
+      <li>
+        The set of characters that define words can be changed.
+      </li>
+      <li>
+        Markers now have identifiers and can be found and deleted by their identifier. The empty
+        marker type can be used to make a marker that is invisible and which is only used to trace
+        where a particular line moves to.
+      </li>
+      <li>
+        Double click notification.
+      </li>
+      <li>
+        HTML styling in SciTE also styles embedded JavaScript.
+      </li>
+      <li>
+        Additional tool commands can be added to SciTE.
+      </li>
+      <li>
+        SciTE option to allow reloading if changed upon application activation and saving on
+        application deactivation. Not yet working on GTK+ version.
+      </li>
+      <li>
+        Entry fields in search dialogs remember last 10 user entries. Not working in all cases in
+        Windows version.
+      </li>
+      <li>
+        SciTE can save a styled copy of the current file in HTML format. As SciTE does not yet
+        support printing, this can be used to print a file by then using a browser to print the
+        HTML file.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE102.zip">Release 1.02</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 October 1999.
+      </li>
+      <li>
+        GTK+ version compiles with GCC 2.95.
+      </li>
+      <li>
+        Properly deleting objects when window destroyed under GTK+.
+      </li>
+      <li>
+        If the selection is not empty backspace deletes the selection.
+      </li>
+      <li>
+        Some X style middle mouse button handling for copying the primary selection to and from
+        Scintilla. Does not work in all cases.
+      </li>
+      <li>
+        HTML styling in SciTE.
+      </li>
+      <li>
+        Stopped dirty flag being set in SciTE when results pane modified.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE101.zip">Release 1.01</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 September 1999.
+      </li>
+      <li>
+        Better DBCS support on Windows including IME.
+      </li>
+      <li>
+        Wheel mouse support for scrolling and zooming on Windows. Zooming with Ctrl+KeypadPlus and
+        Ctrl+KeypadMinus.
+      </li>
+      <li>
+        Performance improvements especially on GTK+.
+      </li>
+      <li>
+        Caret blinking and settable colour on both GTK+ and Windows.
+      </li>
+      <li>
+        Drag and drop within a Scintilla window. On Windows, files can be dragged into SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE100.zip">Release 1.0</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 17 May 1999.
+      </li>
+      <li>
+        Changed name of "Tide" to "SciTE" to avoid clash with a TCL based IDE. "SciTE" is a
+        SCIntilla based Text Editor and is Latin meaning something like "understanding in a neat
+        way" and is also an Old English version of the word "shit".
+      </li>
+      <li>
+        There is a SCI_AUTOCSTOPS message for defining a string of characters that will stop
+        autocompletion mode. Autocompletion mode is cancelled when any cursor movement occurs apart
+        from backspace.
+      </li>
+      <li>
+        GTK+ version now splits horizontally as well as vertically and all dialogs cancel when the
+        escape key is pressed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.93</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 12 May 1999.
+      </li>
+      <li>
+        A bit more robust than 0.92 and supports SCI_MARKERNEXT message.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.92</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 11 May 1999.
+      </li>
+      <li>
+        GTK+ version now contains all features of Windows version with some very small differences.
+        Executing programs works much better now.
+      </li>
+      <li>
+        New palette code to allow more colours to be displayed in 256 colour screen modes. A line
+        number column can be displayed to the left of the selection margin.
+      </li>
+      <li>
+        The code that maps from line numbers to text positions and back has been completely
+        rewritten to be faster, and to allow markers to move with the text.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide91.zip">Beta release 0.91</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30 April 1999, containing fixes to text measuring to make Scintilla work better
+        with bitmap fonts. Also some small fixes to make compiling work with Visual C++.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide90.zip">Beta release 0.90</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 April 1999, containing working GTK+/Linux version.
+      </li>
+      <li>
+        The Java, C++ and Python lexers recognize operators as distinct from default allowing them
+        to be highlighted.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide82.zip">Beta release 0.82</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 April 1999, to fix a problem with handling the Enter key in PythonWin. Also
+        fixes some problems with cmd key mapping.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide81.zip">Beta release 0.81</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30th March 1999, containing bug fixes and a few more features.
+      </li>
+      <li>
+        Static linking supported and Tidy.EXE, a statically linked version of Tide.EXE. Changes to
+        compiler flags in the makefiles to optimize for size.
+      </li>
+      <li>
+        Scintilla supports a 'savepoint' in the undo stack which can be set by the container when
+        the document is saved. Notifications are sent to the container when the savepoint is
+        entered or left, allowing the container to to display a dirty indicator and change its
+        menus.
+      </li>
+      <li>
+        When Scintilla is set to read-only mode, a notification is sent to the container should the
+        user try to edit the document. This can be used to check the document out of a version
+        control system.
+      </li>
+      <li>
+        There is an API for setting the appearance of indicators.
+      </li>
+      <li>
+        The keyboard mapping can be redefined or removed so it can be implemented completely by the
+        container. All of the keyboard commands are now commands which can be sent by the
+        container.
+      </li>
+      <li>
+        A home command like Visual C++ with one hit going to the start of the text on the line and
+        the next going to the left margin is available. I do not personally like this but my
+        fingers have become trained to it by much repetition.
+      </li>
+      <li>
+        SCI_MARKERDELETEALL has an argument in wParam which is the number of the type marker to
+        delete with -1 performing the old action of removing all marker types.
+      </li>
+      <li>
+        Tide now understands both the file name and line numbers in error messages in most cases.
+      </li>
+      <li>
+        Tide remembers the current lines of files in the recently used list.
+      </li>
+      <li>
+        Tide has a Find in Files command.
+      </li>
+    </ul>
+    <h3>
+       Beta release 0.80
+    </h3>
+    <ul>
+      <li>
+        This was the first public release on 14th March 1999, containing a mostly working Win32
+        Scintilla DLL and Tide EXE.
+      </li>
+    </ul>
+    <h3>
+       Beta releases of SciTE were called Tide
+    </h3>
+  </body>
+</html>
diff --git a/scite-app/lexilla/doc/LexillaLogo.png b/scite-app/lexilla/doc/LexillaLogo.png
new file mode 100644
index 0000000..fe78f49
Binary files /dev/null and b/scite-app/lexilla/doc/LexillaLogo.png differ
diff --git a/scite-app/lexilla/doc/LexillaLogo2x.png b/scite-app/lexilla/doc/LexillaLogo2x.png
new file mode 100644
index 0000000..65a99a6
Binary files /dev/null and b/scite-app/lexilla/doc/LexillaLogo2x.png differ
diff --git a/scite-app/lexilla/examples/CheckLexilla/CheckLexilla.c b/scite-app/lexilla/examples/CheckLexilla/CheckLexilla.c
new file mode 100644
index 0000000..c3d881c
--- /dev/null
+++ b/scite-app/lexilla/examples/CheckLexilla/CheckLexilla.c
@@ -0,0 +1,144 @@
+// Lexilla lexer library use example
+/** @file CheckLexilla.c
+ ** Check that Lexilla.h works.
+ **/
+// Copyright 2021 by Neil Hodgson <neilh@scintilla.org>
+// This file is in the public domain.
+// If the public domain is not possible in your location then it can also be used under the same
+// license as Scintilla. https://www.scintilla.org/License.txt
+
+/* Build and run
+
+    Win32
+gcc CheckLexilla.c -I ../../include -o CheckLexilla
+CheckLexilla
+CheckLexilla ../SimpleLexer/SimpleLexer.dll
+
+   Win32 Visual C++
+cl CheckLexilla.c -I ../../include -Fe: CheckLexilla
+CheckLexilla
+CheckLexilla ../SimpleLexer/SimpleLexer.dll
+
+    macOS
+clang CheckLexilla.c -I ../../include -o CheckLexilla
+./CheckLexilla
+./CheckLexilla ../SimpleLexer/SimpleLexer.dylib
+
+    Linux
+gcc CheckLexilla.c -I ../../include -ldl -o CheckLexilla
+./CheckLexilla
+./CheckLexilla ../SimpleLexer/SimpleLexer.so
+
+While principally meant for compilation as C to act as an example of using Lexilla
+from C it can also be built as C++.
+
+Warnings are intentionally shown for the deprecated typedef LexerNameFromIDFn when compiled with
+GCC or Clang or as C++.
+
+*/
+
+#include <stdio.h>
+
+#if _WIN32
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
+
+#ifdef __cplusplus
+#include "ILexer.h"
+#endif
+
+#include "Lexilla.h"
+
+#ifdef __cplusplus
+using namespace Lexilla;
+#endif
+
+#if _WIN32
+typedef FARPROC Function;
+typedef HMODULE Module;
+#else
+typedef void *Function;
+typedef void *Module;
+#endif
+
+static Function FindSymbol(Module m, const char *symbol) {
+#if _WIN32
+	return GetProcAddress(m, symbol);
+#else
+	return dlsym(m, symbol);
+#endif
+}
+
+int main(int argc, char *argv[]) {
+	char szLexillaPath[] = "../../bin/" LEXILLA_LIB LEXILLA_EXTENSION;
+	const char *libPath = szLexillaPath;
+	if (argc > 1) {
+		libPath = argv[1];
+	}
+#if _WIN32
+	Module lexillaLibrary = LoadLibraryA(libPath);
+#else
+	Module lexillaLibrary = dlopen(libPath, RTLD_LAZY);
+#endif
+
+	printf("Opened %s -> %p.\n", libPath, lexillaLibrary);
+	if (lexillaLibrary) {
+		GetLexerCountFn lexerCount = (GetLexerCountFn)FindSymbol(lexillaLibrary, LEXILLA_GETLEXERCOUNT);
+		if (lexerCount) {
+			int nLexers = lexerCount();
+			printf("There are %d lexers.\n", nLexers);
+			GetLexerNameFn lexerName = (GetLexerNameFn)FindSymbol(lexillaLibrary, LEXILLA_GETLEXERNAME);
+			for (int i = 0; i < nLexers; i++) {
+				char name[100] = "";
+				lexerName(i, name, sizeof(name));
+				printf("%s ", name);
+			}
+			printf("\n");
+
+			GetLexerFactoryFn lexerFactory = (GetLexerFactoryFn)FindSymbol(lexillaLibrary, LEXILLA_GETLEXERFACTORY);
+			LexerFactoryFunction lexerFactory4 = lexerFactory(4);	// 4th entry is "as" which is an object lexer so works
+			printf("Lexer factory 4 -> %p.\n", lexerFactory4);
+
+			CreateLexerFn lexerCreate = (CreateLexerFn)FindSymbol(lexillaLibrary, LEXILLA_CREATELEXER);
+			ILexer5 *lexerCpp = lexerCreate("cpp");
+			printf("Created cpp lexer -> %p.\n", lexerCpp);
+
+			LexerNameFromIDFn lexerNameFromID = (LexerNameFromIDFn)FindSymbol(lexillaLibrary, LEXILLA_LEXERNAMEFROMID);
+			if (lexerNameFromID) {
+				const char *lexerNameCpp = lexerNameFromID(3);	// SCLEX_CPP=3
+				if (lexerNameCpp) {
+					printf("Lexer name 3 -> %s.\n", lexerNameCpp);
+				} else {
+					printf("Lexer name 3 not available.\n");
+				}
+			} else {
+				printf("Lexer name from ID not supported.\n");
+			}
+
+			GetLibraryPropertyNamesFn libraryProperties = (GetLibraryPropertyNamesFn)FindSymbol(lexillaLibrary, LEXILLA_GETLIBRARYPROPERTYNAMES);
+			if (libraryProperties) {
+				const char *names = libraryProperties();
+				printf("Property names '%s'.\n", names);
+			} else {
+				printf("Property names not supported.\n");
+			}
+
+			SetLibraryPropertyFn librarySetProperty = (SetLibraryPropertyFn)FindSymbol(lexillaLibrary, LEXILLA_SETLIBRARYPROPERTY);
+			if (librarySetProperty) {
+				librarySetProperty("key", "value");
+			} else {
+				printf("Set property not supported.\n");
+			}
+
+			GetNameSpaceFn libraryNameSpace = (GetLibraryPropertyNamesFn)FindSymbol(lexillaLibrary, LEXILLA_GETNAMESPACE);
+			if (libraryNameSpace) {
+				const char *nameSpace = libraryNameSpace();
+				printf("Name space '%s'.\n", nameSpace);
+			} else {
+				printf("Name space not supported.\n");
+			}
+		}
+	}
+}
diff --git a/scite-app/lexilla/examples/CheckLexilla/makefile b/scite-app/lexilla/examples/CheckLexilla/makefile
new file mode 100644
index 0000000..5dac888
--- /dev/null
+++ b/scite-app/lexilla/examples/CheckLexilla/makefile
@@ -0,0 +1,22 @@
+.PHONY: all check clean
+
+INCLUDES = -I ../../include
+EXE = $(if $(windir),CheckLexilla.exe,CheckLexilla)
+
+ifdef windir
+	RM = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
+	CC = gcc
+else
+	LIBS += -ldl
+endif
+
+all: $(EXE)
+
+check: $(EXE)
+	./$(EXE)
+
+clean:
+	$(RM) $(EXE)
+
+$(EXE): *.c
+	$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $^ $(LIBS) $(LDLIBS) -o $@
diff --git a/scite-app/lexilla/examples/SimpleLexer/SimpleLexer.cxx b/scite-app/lexilla/examples/SimpleLexer/SimpleLexer.cxx
new file mode 100644
index 0000000..599c711
--- /dev/null
+++ b/scite-app/lexilla/examples/SimpleLexer/SimpleLexer.cxx
@@ -0,0 +1,123 @@
+//  A simple lexer
+/** @file SimpleLexer.cxx
+ ** A lexer that follows the Lexilla protocol to allow it to be used from Lexilla clients like SciTE.
+ ** The lexer applies alternating styles (0,1) to bytes of the text.
+ **/
+// Copyright 2021 by Neil Hodgson <neilh@scintilla.org>
+// This file is in the public domain.
+// If the public domain is not possible in your location then it can also be used under the same
+// license as Scintilla. https://www.scintilla.org/License.txt
+
+// Windows/MSVC
+// cl -std:c++17 -EHsc -LD -I ../../../scintilla/include -I ../../include -I ../../lexlib SimpleLexer.cxx ../../lexlib/*.cxx
+
+// macOS/clang
+// clang++ -dynamiclib --std=c++17 -I ../../../scintilla/include -I ../../include -I ../../lexlib SimpleLexer.cxx ../../lexlib/*.cxx -o SimpleLexer.dylib
+
+// Linux/g++
+// g++ -fPIC -shared --std=c++17 -I ../../../scintilla/include -I ../../include -I ../../lexlib SimpleLexer.cxx ../../lexlib/*.cxx -o SimpleLexer.so
+
+/* It can be demonstrated in SciTE like this, substituting the actual shared library location as lexilla.path: 
+lexilla.path=.;C:\u\hg\lexilla\examples\SimpleLexer\SimpleLexer.dll
+lexer.*.xx=simple
+style.simple.1=fore:#FF0000
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+// Lexilla.h should not be included here as it declares statically linked functions without the __declspec( dllexport )
+
+#include "WordList.h"
+#include "PropSetSimple.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+class LexerSimple : public LexerBase {
+public:
+        LexerSimple() {
+        }
+        void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override {
+                try {
+			Accessor astyler(pAccess, &props);
+			if (length > 0) {
+				astyler.StartAt(startPos);
+				astyler.StartSegment(startPos);
+				for (unsigned int k=0; k<length; k++) {
+					astyler.ColourTo(startPos+k, (startPos+k)%2);
+				}
+			}
+                        astyler.Flush();
+                } catch (...) {
+                        // Should not throw into caller as may be compiled with different compiler or options
+                        pAccess->SetErrorStatus(SC_STATUS_FAILURE);
+                }
+        }
+        void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override {
+        }
+
+        static ILexer5 *LexerFactorySimple() {
+                try {
+                        return new LexerSimple();
+                } catch (...) {
+                        // Should not throw into caller as may be compiled with different compiler or options
+                        return nullptr;
+                }
+        }
+};
+
+#if _WIN32
+#define EXPORT_FUNCTION __declspec(dllexport)
+#define CALLING_CONVENTION __stdcall
+#else
+#define EXPORT_FUNCTION __attribute__((visibility("default")))
+#define CALLING_CONVENTION
+#endif
+
+static const char *lexerName = "simple";
+
+extern "C" {
+
+EXPORT_FUNCTION int CALLING_CONVENTION GetLexerCount() {
+        return 1;
+}
+
+EXPORT_FUNCTION void CALLING_CONVENTION GetLexerName(unsigned int index, char *name, int buflength) {
+        *name = 0;
+        if ((index == 0) && (buflength > static_cast<int>(strlen(lexerName)))) {
+                strcpy(name, lexerName);
+        }
+}
+
+EXPORT_FUNCTION LexerFactoryFunction CALLING_CONVENTION GetLexerFactory(unsigned int index) {
+        if (index == 0)
+                return LexerSimple::LexerFactorySimple;
+        else
+                return 0;
+}
+
+EXPORT_FUNCTION Scintilla::ILexer5* CALLING_CONVENTION CreateLexer(const char *name) {
+	if (0 == strcmp(name, lexerName)) {
+		return LexerSimple::LexerFactorySimple();
+	}
+	return nullptr;
+}
+
+EXPORT_FUNCTION const char * CALLING_CONVENTION GetNameSpace() {
+	return "example";
+}
+
+}
diff --git a/scite-app/lexilla/examples/SimpleLexer/makefile b/scite-app/lexilla/examples/SimpleLexer/makefile
new file mode 100644
index 0000000..06ab6e1
--- /dev/null
+++ b/scite-app/lexilla/examples/SimpleLexer/makefile
@@ -0,0 +1,38 @@
+.PHONY: all check clean
+
+INCLUDES = -I ../../../scintilla/include -I ../../include -I ../../lexlib
+
+BASE_FLAGS += --std=c++17 -shared
+
+ifdef windir
+    SHAREDEXTENSION = dll
+else
+    ifeq ($(shell uname),Darwin)
+        SHAREDEXTENSION = dylib
+        BASE_FLAGS += -dynamiclib -arch arm64 -arch x86_64
+    else
+        BASE_FLAGS += -fPIC
+        SHAREDEXTENSION = so
+    endif
+    BASE_FLAGS += -fvisibility=hidden
+endif
+
+ifdef windir
+	RM = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
+	CXX = g++
+endif
+
+LIBRARY = SimpleLexer.$(SHAREDEXTENSION)
+LEXLIB = ../../lexlib/*.cxx
+
+all: $(LIBRARY)
+
+# make check requires CheckLexilla to have already been built
+check: $(LIBRARY)
+	../CheckLexilla/CheckLexilla ./$(LIBRARY)
+
+clean:
+	$(RM) *.o *obj *.lib *.exp $(LIBRARY)
+
+$(LIBRARY): *.cxx
+	$(CXX) $(INCLUDES) $(BASE_FLAGS) $(CPPFLAGS) $(CXXFLAGS) $^ $(LEXLIB) $(LIBS) $(LDLIBS) -o $@
diff --git a/scite-app/lexilla/include/LexicalStyles.iface b/scite-app/lexilla/include/LexicalStyles.iface
new file mode 100644
index 0000000..6bd9536
--- /dev/null
+++ b/scite-app/lexilla/include/LexicalStyles.iface
@@ -0,0 +1,2252 @@
+## This file defines the interface to Lexilla
+
+## Copyright 2000-2020 by Neil Hodgson <neilh@scintilla.org>
+## The License.txt file describes the conditions under which this software may be distributed.
+
+## Similar file structure as Scintilla.iface but only contains constants.
+
+cat Default
+
+################################################
+# For SciLexer.h
+enu Lexer=SCLEX_
+val SCLEX_CONTAINER=0
+val SCLEX_NULL=1
+val SCLEX_PYTHON=2
+val SCLEX_CPP=3
+val SCLEX_HTML=4
+val SCLEX_XML=5
+val SCLEX_PERL=6
+val SCLEX_SQL=7
+val SCLEX_VB=8
+val SCLEX_PROPERTIES=9
+val SCLEX_ERRORLIST=10
+val SCLEX_MAKEFILE=11
+val SCLEX_BATCH=12
+val SCLEX_XCODE=13
+val SCLEX_LATEX=14
+val SCLEX_LUA=15
+val SCLEX_DIFF=16
+val SCLEX_CONF=17
+val SCLEX_PASCAL=18
+val SCLEX_AVE=19
+val SCLEX_ADA=20
+val SCLEX_LISP=21
+val SCLEX_RUBY=22
+val SCLEX_EIFFEL=23
+val SCLEX_EIFFELKW=24
+val SCLEX_TCL=25
+val SCLEX_NNCRONTAB=26
+val SCLEX_BULLANT=27
+val SCLEX_VBSCRIPT=28
+val SCLEX_BAAN=31
+val SCLEX_MATLAB=32
+val SCLEX_SCRIPTOL=33
+val SCLEX_ASM=34
+val SCLEX_CPPNOCASE=35
+val SCLEX_FORTRAN=36
+val SCLEX_F77=37
+val SCLEX_CSS=38
+val SCLEX_POV=39
+val SCLEX_LOUT=40
+val SCLEX_ESCRIPT=41
+val SCLEX_PS=42
+val SCLEX_NSIS=43
+val SCLEX_MMIXAL=44
+val SCLEX_CLW=45
+val SCLEX_CLWNOCASE=46
+val SCLEX_LOT=47
+val SCLEX_YAML=48
+val SCLEX_TEX=49
+val SCLEX_METAPOST=50
+val SCLEX_POWERBASIC=51
+val SCLEX_FORTH=52
+val SCLEX_ERLANG=53
+val SCLEX_OCTAVE=54
+val SCLEX_MSSQL=55
+val SCLEX_VERILOG=56
+val SCLEX_KIX=57
+val SCLEX_GUI4CLI=58
+val SCLEX_SPECMAN=59
+val SCLEX_AU3=60
+val SCLEX_APDL=61
+val SCLEX_BASH=62
+val SCLEX_ASN1=63
+val SCLEX_VHDL=64
+val SCLEX_CAML=65
+val SCLEX_BLITZBASIC=66
+val SCLEX_PUREBASIC=67
+val SCLEX_HASKELL=68
+val SCLEX_PHPSCRIPT=69
+val SCLEX_TADS3=70
+val SCLEX_REBOL=71
+val SCLEX_SMALLTALK=72
+val SCLEX_FLAGSHIP=73
+val SCLEX_CSOUND=74
+val SCLEX_FREEBASIC=75
+val SCLEX_INNOSETUP=76
+val SCLEX_OPAL=77
+val SCLEX_SPICE=78
+val SCLEX_D=79
+val SCLEX_CMAKE=80
+val SCLEX_GAP=81
+val SCLEX_PLM=82
+val SCLEX_PROGRESS=83
+val SCLEX_ABAQUS=84
+val SCLEX_ASYMPTOTE=85
+val SCLEX_R=86
+val SCLEX_MAGIK=87
+val SCLEX_POWERSHELL=88
+val SCLEX_MYSQL=89
+val SCLEX_PO=90
+val SCLEX_TAL=91
+val SCLEX_COBOL=92
+val SCLEX_TACL=93
+val SCLEX_SORCUS=94
+val SCLEX_POWERPRO=95
+val SCLEX_NIMROD=96
+val SCLEX_SML=97
+val SCLEX_MARKDOWN=98
+val SCLEX_TXT2TAGS=99
+val SCLEX_A68K=100
+val SCLEX_MODULA=101
+val SCLEX_COFFEESCRIPT=102
+val SCLEX_TCMD=103
+val SCLEX_AVS=104
+val SCLEX_ECL=105
+val SCLEX_OSCRIPT=106
+val SCLEX_VISUALPROLOG=107
+val SCLEX_LITERATEHASKELL=108
+val SCLEX_STTXT=109
+val SCLEX_KVIRC=110
+val SCLEX_RUST=111
+val SCLEX_DMAP=112
+val SCLEX_AS=113
+val SCLEX_DMIS=114
+val SCLEX_REGISTRY=115
+val SCLEX_BIBTEX=116
+val SCLEX_SREC=117
+val SCLEX_IHEX=118
+val SCLEX_TEHEX=119
+val SCLEX_JSON=120
+val SCLEX_EDIFACT=121
+val SCLEX_INDENT=122
+val SCLEX_MAXIMA=123
+val SCLEX_STATA=124
+val SCLEX_SAS=125
+val SCLEX_NIM=126
+val SCLEX_CIL=127
+val SCLEX_X12=128
+val SCLEX_DATAFLEX=129
+val SCLEX_HOLLYWOOD=130
+val SCLEX_RAKU=131
+val SCLEX_FSHARP=132
+val SCLEX_JULIA=133
+
+# When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
+# value assigned in sequence from SCLEX_AUTOMATIC+1.
+val SCLEX_AUTOMATIC=1000
+# Lexical states for SCLEX_PYTHON
+lex Python=SCLEX_PYTHON SCE_P_
+lex Nimrod=SCLEX_NIMROD SCE_P_
+val SCE_P_DEFAULT=0
+val SCE_P_COMMENTLINE=1
+val SCE_P_NUMBER=2
+val SCE_P_STRING=3
+val SCE_P_CHARACTER=4
+val SCE_P_WORD=5
+val SCE_P_TRIPLE=6
+val SCE_P_TRIPLEDOUBLE=7
+val SCE_P_CLASSNAME=8
+val SCE_P_DEFNAME=9
+val SCE_P_OPERATOR=10
+val SCE_P_IDENTIFIER=11
+val SCE_P_COMMENTBLOCK=12
+val SCE_P_STRINGEOL=13
+val SCE_P_WORD2=14
+val SCE_P_DECORATOR=15
+val SCE_P_FSTRING=16
+val SCE_P_FCHARACTER=17
+val SCE_P_FTRIPLE=18
+val SCE_P_FTRIPLEDOUBLE=19
+# Lexical states for SCLEX_CPP
+# Lexical states for SCLEX_BULLANT
+# Lexical states for SCLEX_COBOL
+# Lexical states for SCLEX_TACL
+# Lexical states for SCLEX_TAL
+lex Cpp=SCLEX_CPP SCE_C_
+lex BullAnt=SCLEX_BULLANT SCE_C_
+lex COBOL=SCLEX_COBOL SCE_C_
+lex TACL=SCLEX_TACL SCE_C_
+lex TAL=SCLEX_TAL SCE_C_
+val SCE_C_DEFAULT=0
+val SCE_C_COMMENT=1
+val SCE_C_COMMENTLINE=2
+val SCE_C_COMMENTDOC=3
+val SCE_C_NUMBER=4
+val SCE_C_WORD=5
+val SCE_C_STRING=6
+val SCE_C_CHARACTER=7
+val SCE_C_UUID=8
+val SCE_C_PREPROCESSOR=9
+val SCE_C_OPERATOR=10
+val SCE_C_IDENTIFIER=11
+val SCE_C_STRINGEOL=12
+val SCE_C_VERBATIM=13
+val SCE_C_REGEX=14
+val SCE_C_COMMENTLINEDOC=15
+val SCE_C_WORD2=16
+val SCE_C_COMMENTDOCKEYWORD=17
+val SCE_C_COMMENTDOCKEYWORDERROR=18
+val SCE_C_GLOBALCLASS=19
+val SCE_C_STRINGRAW=20
+val SCE_C_TRIPLEVERBATIM=21
+val SCE_C_HASHQUOTEDSTRING=22
+val SCE_C_PREPROCESSORCOMMENT=23
+val SCE_C_PREPROCESSORCOMMENTDOC=24
+val SCE_C_USERLITERAL=25
+val SCE_C_TASKMARKER=26
+val SCE_C_ESCAPESEQUENCE=27
+# Lexical states for SCLEX_D
+lex D=SCLEX_D SCE_D_
+val SCE_D_DEFAULT=0
+val SCE_D_COMMENT=1
+val SCE_D_COMMENTLINE=2
+val SCE_D_COMMENTDOC=3
+val SCE_D_COMMENTNESTED=4
+val SCE_D_NUMBER=5
+val SCE_D_WORD=6
+val SCE_D_WORD2=7
+val SCE_D_WORD3=8
+val SCE_D_TYPEDEF=9
+val SCE_D_STRING=10
+val SCE_D_STRINGEOL=11
+val SCE_D_CHARACTER=12
+val SCE_D_OPERATOR=13
+val SCE_D_IDENTIFIER=14
+val SCE_D_COMMENTLINEDOC=15
+val SCE_D_COMMENTDOCKEYWORD=16
+val SCE_D_COMMENTDOCKEYWORDERROR=17
+val SCE_D_STRINGB=18
+val SCE_D_STRINGR=19
+val SCE_D_WORD5=20
+val SCE_D_WORD6=21
+val SCE_D_WORD7=22
+# Lexical states for SCLEX_TCL
+lex TCL=SCLEX_TCL SCE_TCL_
+val SCE_TCL_DEFAULT=0
+val SCE_TCL_COMMENT=1
+val SCE_TCL_COMMENTLINE=2
+val SCE_TCL_NUMBER=3
+val SCE_TCL_WORD_IN_QUOTE=4
+val SCE_TCL_IN_QUOTE=5
+val SCE_TCL_OPERATOR=6
+val SCE_TCL_IDENTIFIER=7
+val SCE_TCL_SUBSTITUTION=8
+val SCE_TCL_SUB_BRACE=9
+val SCE_TCL_MODIFIER=10
+val SCE_TCL_EXPAND=11
+val SCE_TCL_WORD=12
+val SCE_TCL_WORD2=13
+val SCE_TCL_WORD3=14
+val SCE_TCL_WORD4=15
+val SCE_TCL_WORD5=16
+val SCE_TCL_WORD6=17
+val SCE_TCL_WORD7=18
+val SCE_TCL_WORD8=19
+val SCE_TCL_COMMENT_BOX=20
+val SCE_TCL_BLOCK_COMMENT=21
+# Lexical states for SCLEX_HTML, SCLEX_XML
+lex HTML=SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
+lex XML=SCLEX_XML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_
+val SCE_H_DEFAULT=0
+val SCE_H_TAG=1
+val SCE_H_TAGUNKNOWN=2
+val SCE_H_ATTRIBUTE=3
+val SCE_H_ATTRIBUTEUNKNOWN=4
+val SCE_H_NUMBER=5
+val SCE_H_DOUBLESTRING=6
+val SCE_H_SINGLESTRING=7
+val SCE_H_OTHER=8
+val SCE_H_COMMENT=9
+val SCE_H_ENTITY=10
+# XML and ASP
+val SCE_H_TAGEND=11
+val SCE_H_XMLSTART=12
+val SCE_H_XMLEND=13
+val SCE_H_SCRIPT=14
+val SCE_H_ASP=15
+val SCE_H_ASPAT=16
+val SCE_H_CDATA=17
+val SCE_H_QUESTION=18
+# More HTML
+val SCE_H_VALUE=19
+# X-Code
+val SCE_H_XCCOMMENT=20
+# SGML
+val SCE_H_SGML_DEFAULT=21
+val SCE_H_SGML_COMMAND=22
+val SCE_H_SGML_1ST_PARAM=23
+val SCE_H_SGML_DOUBLESTRING=24
+val SCE_H_SGML_SIMPLESTRING=25
+val SCE_H_SGML_ERROR=26
+val SCE_H_SGML_SPECIAL=27
+val SCE_H_SGML_ENTITY=28
+val SCE_H_SGML_COMMENT=29
+val SCE_H_SGML_1ST_PARAM_COMMENT=30
+val SCE_H_SGML_BLOCK_DEFAULT=31
+# Embedded Javascript
+val SCE_HJ_START=40
+val SCE_HJ_DEFAULT=41
+val SCE_HJ_COMMENT=42
+val SCE_HJ_COMMENTLINE=43
+val SCE_HJ_COMMENTDOC=44
+val SCE_HJ_NUMBER=45
+val SCE_HJ_WORD=46
+val SCE_HJ_KEYWORD=47
+val SCE_HJ_DOUBLESTRING=48
+val SCE_HJ_SINGLESTRING=49
+val SCE_HJ_SYMBOLS=50
+val SCE_HJ_STRINGEOL=51
+val SCE_HJ_REGEX=52
+# ASP Javascript
+val SCE_HJA_START=55
+val SCE_HJA_DEFAULT=56
+val SCE_HJA_COMMENT=57
+val SCE_HJA_COMMENTLINE=58
+val SCE_HJA_COMMENTDOC=59
+val SCE_HJA_NUMBER=60
+val SCE_HJA_WORD=61
+val SCE_HJA_KEYWORD=62
+val SCE_HJA_DOUBLESTRING=63
+val SCE_HJA_SINGLESTRING=64
+val SCE_HJA_SYMBOLS=65
+val SCE_HJA_STRINGEOL=66
+val SCE_HJA_REGEX=67
+# Embedded VBScript
+val SCE_HB_START=70
+val SCE_HB_DEFAULT=71
+val SCE_HB_COMMENTLINE=72
+val SCE_HB_NUMBER=73
+val SCE_HB_WORD=74
+val SCE_HB_STRING=75
+val SCE_HB_IDENTIFIER=76
+val SCE_HB_STRINGEOL=77
+# ASP VBScript
+val SCE_HBA_START=80
+val SCE_HBA_DEFAULT=81
+val SCE_HBA_COMMENTLINE=82
+val SCE_HBA_NUMBER=83
+val SCE_HBA_WORD=84
+val SCE_HBA_STRING=85
+val SCE_HBA_IDENTIFIER=86
+val SCE_HBA_STRINGEOL=87
+# Embedded Python
+val SCE_HP_START=90
+val SCE_HP_DEFAULT=91
+val SCE_HP_COMMENTLINE=92
+val SCE_HP_NUMBER=93
+val SCE_HP_STRING=94
+val SCE_HP_CHARACTER=95
+val SCE_HP_WORD=96
+val SCE_HP_TRIPLE=97
+val SCE_HP_TRIPLEDOUBLE=98
+val SCE_HP_CLASSNAME=99
+val SCE_HP_DEFNAME=100
+val SCE_HP_OPERATOR=101
+val SCE_HP_IDENTIFIER=102
+# PHP
+val SCE_HPHP_COMPLEX_VARIABLE=104
+# ASP Python
+val SCE_HPA_START=105
+val SCE_HPA_DEFAULT=106
+val SCE_HPA_COMMENTLINE=107
+val SCE_HPA_NUMBER=108
+val SCE_HPA_STRING=109
+val SCE_HPA_CHARACTER=110
+val SCE_HPA_WORD=111
+val SCE_HPA_TRIPLE=112
+val SCE_HPA_TRIPLEDOUBLE=113
+val SCE_HPA_CLASSNAME=114
+val SCE_HPA_DEFNAME=115
+val SCE_HPA_OPERATOR=116
+val SCE_HPA_IDENTIFIER=117
+# PHP
+val SCE_HPHP_DEFAULT=118
+val SCE_HPHP_HSTRING=119
+val SCE_HPHP_SIMPLESTRING=120
+val SCE_HPHP_WORD=121
+val SCE_HPHP_NUMBER=122
+val SCE_HPHP_VARIABLE=123
+val SCE_HPHP_COMMENT=124
+val SCE_HPHP_COMMENTLINE=125
+val SCE_HPHP_HSTRING_VARIABLE=126
+val SCE_HPHP_OPERATOR=127
+# Lexical states for SCLEX_PERL
+lex Perl=SCLEX_PERL SCE_PL_
+val SCE_PL_DEFAULT=0
+val SCE_PL_ERROR=1
+val SCE_PL_COMMENTLINE=2
+val SCE_PL_POD=3
+val SCE_PL_NUMBER=4
+val SCE_PL_WORD=5
+val SCE_PL_STRING=6
+val SCE_PL_CHARACTER=7
+val SCE_PL_PUNCTUATION=8
+val SCE_PL_PREPROCESSOR=9
+val SCE_PL_OPERATOR=10
+val SCE_PL_IDENTIFIER=11
+val SCE_PL_SCALAR=12
+val SCE_PL_ARRAY=13
+val SCE_PL_HASH=14
+val SCE_PL_SYMBOLTABLE=15
+val SCE_PL_VARIABLE_INDEXER=16
+val SCE_PL_REGEX=17
+val SCE_PL_REGSUBST=18
+val SCE_PL_LONGQUOTE=19
+val SCE_PL_BACKTICKS=20
+val SCE_PL_DATASECTION=21
+val SCE_PL_HERE_DELIM=22
+val SCE_PL_HERE_Q=23
+val SCE_PL_HERE_QQ=24
+val SCE_PL_HERE_QX=25
+val SCE_PL_STRING_Q=26
+val SCE_PL_STRING_QQ=27
+val SCE_PL_STRING_QX=28
+val SCE_PL_STRING_QR=29
+val SCE_PL_STRING_QW=30
+val SCE_PL_POD_VERB=31
+val SCE_PL_SUB_PROTOTYPE=40
+val SCE_PL_FORMAT_IDENT=41
+val SCE_PL_FORMAT=42
+val SCE_PL_STRING_VAR=43
+val SCE_PL_XLAT=44
+val SCE_PL_REGEX_VAR=54
+val SCE_PL_REGSUBST_VAR=55
+val SCE_PL_BACKTICKS_VAR=57
+val SCE_PL_HERE_QQ_VAR=61
+val SCE_PL_HERE_QX_VAR=62
+val SCE_PL_STRING_QQ_VAR=64
+val SCE_PL_STRING_QX_VAR=65
+val SCE_PL_STRING_QR_VAR=66
+# Lexical states for SCLEX_RUBY
+lex Ruby=SCLEX_RUBY SCE_RB_
+val SCE_RB_DEFAULT=0
+val SCE_RB_ERROR=1
+val SCE_RB_COMMENTLINE=2
+val SCE_RB_POD=3
+val SCE_RB_NUMBER=4
+val SCE_RB_WORD=5
+val SCE_RB_STRING=6
+val SCE_RB_CHARACTER=7
+val SCE_RB_CLASSNAME=8
+val SCE_RB_DEFNAME=9
+val SCE_RB_OPERATOR=10
+val SCE_RB_IDENTIFIER=11
+val SCE_RB_REGEX=12
+val SCE_RB_GLOBAL=13
+val SCE_RB_SYMBOL=14
+val SCE_RB_MODULE_NAME=15
+val SCE_RB_INSTANCE_VAR=16
+val SCE_RB_CLASS_VAR=17
+val SCE_RB_BACKTICKS=18
+val SCE_RB_DATASECTION=19
+val SCE_RB_HERE_DELIM=20
+val SCE_RB_HERE_Q=21
+val SCE_RB_HERE_QQ=22
+val SCE_RB_HERE_QX=23
+val SCE_RB_STRING_Q=24
+val SCE_RB_STRING_QQ=25
+val SCE_RB_STRING_QX=26
+val SCE_RB_STRING_QR=27
+val SCE_RB_STRING_QW=28
+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
+# 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_
+lex PowerBasic=SCLEX_POWERBASIC SCE_B_
+lex BlitzBasic=SCLEX_BLITZBASIC SCE_B_
+lex PureBasic=SCLEX_PUREBASIC SCE_B_
+lex FreeBasic=SCLEX_FREEBASIC SCE_B_
+val SCE_B_DEFAULT=0
+val SCE_B_COMMENT=1
+val SCE_B_NUMBER=2
+val SCE_B_KEYWORD=3
+val SCE_B_STRING=4
+val SCE_B_PREPROCESSOR=5
+val SCE_B_OPERATOR=6
+val SCE_B_IDENTIFIER=7
+val SCE_B_DATE=8
+val SCE_B_STRINGEOL=9
+val SCE_B_KEYWORD2=10
+val SCE_B_KEYWORD3=11
+val SCE_B_KEYWORD4=12
+val SCE_B_CONSTANT=13
+val SCE_B_ASM=14
+val SCE_B_LABEL=15
+val SCE_B_ERROR=16
+val SCE_B_HEXNUMBER=17
+val SCE_B_BINNUMBER=18
+val SCE_B_COMMENTBLOCK=19
+val SCE_B_DOCLINE=20
+val SCE_B_DOCBLOCK=21
+val SCE_B_DOCKEYWORD=22
+# Lexical states for SCLEX_PROPERTIES
+lex Properties=SCLEX_PROPERTIES SCE_PROPS_
+val SCE_PROPS_DEFAULT=0
+val SCE_PROPS_COMMENT=1
+val SCE_PROPS_SECTION=2
+val SCE_PROPS_ASSIGNMENT=3
+val SCE_PROPS_DEFVAL=4
+val SCE_PROPS_KEY=5
+# Lexical states for SCLEX_LATEX
+lex LaTeX=SCLEX_LATEX SCE_L_
+val SCE_L_DEFAULT=0
+val SCE_L_COMMAND=1
+val SCE_L_TAG=2
+val SCE_L_MATH=3
+val SCE_L_COMMENT=4
+val SCE_L_TAG2=5
+val SCE_L_MATH2=6
+val SCE_L_COMMENT2=7
+val SCE_L_VERBATIM=8
+val SCE_L_SHORTCMD=9
+val SCE_L_SPECIAL=10
+val SCE_L_CMDOPT=11
+val SCE_L_ERROR=12
+# Lexical states for SCLEX_LUA
+lex Lua=SCLEX_LUA SCE_LUA_
+val SCE_LUA_DEFAULT=0
+val SCE_LUA_COMMENT=1
+val SCE_LUA_COMMENTLINE=2
+val SCE_LUA_COMMENTDOC=3
+val SCE_LUA_NUMBER=4
+val SCE_LUA_WORD=5
+val SCE_LUA_STRING=6
+val SCE_LUA_CHARACTER=7
+val SCE_LUA_LITERALSTRING=8
+val SCE_LUA_PREPROCESSOR=9
+val SCE_LUA_OPERATOR=10
+val SCE_LUA_IDENTIFIER=11
+val SCE_LUA_STRINGEOL=12
+val SCE_LUA_WORD2=13
+val SCE_LUA_WORD3=14
+val SCE_LUA_WORD4=15
+val SCE_LUA_WORD5=16
+val SCE_LUA_WORD6=17
+val SCE_LUA_WORD7=18
+val SCE_LUA_WORD8=19
+val SCE_LUA_LABEL=20
+# Lexical states for SCLEX_ERRORLIST
+lex ErrorList=SCLEX_ERRORLIST SCE_ERR_
+val SCE_ERR_DEFAULT=0
+val SCE_ERR_PYTHON=1
+val SCE_ERR_GCC=2
+val SCE_ERR_MS=3
+val SCE_ERR_CMD=4
+val SCE_ERR_BORLAND=5
+val SCE_ERR_PERL=6
+val SCE_ERR_NET=7
+val SCE_ERR_LUA=8
+val SCE_ERR_CTAG=9
+val SCE_ERR_DIFF_CHANGED=10
+val SCE_ERR_DIFF_ADDITION=11
+val SCE_ERR_DIFF_DELETION=12
+val SCE_ERR_DIFF_MESSAGE=13
+val SCE_ERR_PHP=14
+val SCE_ERR_ELF=15
+val SCE_ERR_IFC=16
+val SCE_ERR_IFORT=17
+val SCE_ERR_ABSF=18
+val SCE_ERR_TIDY=19
+val SCE_ERR_JAVA_STACK=20
+val SCE_ERR_VALUE=21
+val SCE_ERR_GCC_INCLUDED_FROM=22
+val SCE_ERR_ESCSEQ=23
+val SCE_ERR_ESCSEQ_UNKNOWN=24
+val SCE_ERR_GCC_EXCERPT=25
+val SCE_ERR_ES_BLACK=40
+val SCE_ERR_ES_RED=41
+val SCE_ERR_ES_GREEN=42
+val SCE_ERR_ES_BROWN=43
+val SCE_ERR_ES_BLUE=44
+val SCE_ERR_ES_MAGENTA=45
+val SCE_ERR_ES_CYAN=46
+val SCE_ERR_ES_GRAY=47
+val SCE_ERR_ES_DARK_GRAY=48
+val SCE_ERR_ES_BRIGHT_RED=49
+val SCE_ERR_ES_BRIGHT_GREEN=50
+val SCE_ERR_ES_YELLOW=51
+val SCE_ERR_ES_BRIGHT_BLUE=52
+val SCE_ERR_ES_BRIGHT_MAGENTA=53
+val SCE_ERR_ES_BRIGHT_CYAN=54
+val SCE_ERR_ES_WHITE=55
+# Lexical states for SCLEX_BATCH
+lex Batch=SCLEX_BATCH SCE_BAT_
+val SCE_BAT_DEFAULT=0
+val SCE_BAT_COMMENT=1
+val SCE_BAT_WORD=2
+val SCE_BAT_LABEL=3
+val SCE_BAT_HIDE=4
+val SCE_BAT_COMMAND=5
+val SCE_BAT_IDENTIFIER=6
+val SCE_BAT_OPERATOR=7
+# Lexical states for SCLEX_TCMD
+lex TCMD=SCLEX_TCMD SCE_TCMD_
+val SCE_TCMD_DEFAULT=0
+val SCE_TCMD_COMMENT=1
+val SCE_TCMD_WORD=2
+val SCE_TCMD_LABEL=3
+val SCE_TCMD_HIDE=4
+val SCE_TCMD_COMMAND=5
+val SCE_TCMD_IDENTIFIER=6
+val SCE_TCMD_OPERATOR=7
+val SCE_TCMD_ENVIRONMENT=8
+val SCE_TCMD_EXPANSION=9
+val SCE_TCMD_CLABEL=10
+# Lexical states for SCLEX_MAKEFILE
+lex MakeFile=SCLEX_MAKEFILE SCE_MAKE_
+val SCE_MAKE_DEFAULT=0
+val SCE_MAKE_COMMENT=1
+val SCE_MAKE_PREPROCESSOR=2
+val SCE_MAKE_IDENTIFIER=3
+val SCE_MAKE_OPERATOR=4
+val SCE_MAKE_TARGET=5
+val SCE_MAKE_IDEOL=9
+# Lexical states for SCLEX_DIFF
+lex Diff=SCLEX_DIFF SCE_DIFF_
+val SCE_DIFF_DEFAULT=0
+val SCE_DIFF_COMMENT=1
+val SCE_DIFF_COMMAND=2
+val SCE_DIFF_HEADER=3
+val SCE_DIFF_POSITION=4
+val SCE_DIFF_DELETED=5
+val SCE_DIFF_ADDED=6
+val SCE_DIFF_CHANGED=7
+val SCE_DIFF_PATCH_ADD=8
+val SCE_DIFF_PATCH_DELETE=9
+val SCE_DIFF_REMOVED_PATCH_ADD=10
+val SCE_DIFF_REMOVED_PATCH_DELETE=11
+# Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
+lex Conf=SCLEX_CONF SCE_CONF_
+val SCE_CONF_DEFAULT=0
+val SCE_CONF_COMMENT=1
+val SCE_CONF_NUMBER=2
+val SCE_CONF_IDENTIFIER=3
+val SCE_CONF_EXTENSION=4
+val SCE_CONF_PARAMETER=5
+val SCE_CONF_STRING=6
+val SCE_CONF_OPERATOR=7
+val SCE_CONF_IP=8
+val SCE_CONF_DIRECTIVE=9
+# Lexical states for SCLEX_AVE, Avenue
+lex Avenue=SCLEX_AVE SCE_AVE_
+val SCE_AVE_DEFAULT=0
+val SCE_AVE_COMMENT=1
+val SCE_AVE_NUMBER=2
+val SCE_AVE_WORD=3
+val SCE_AVE_STRING=6
+val SCE_AVE_ENUM=7
+val SCE_AVE_STRINGEOL=8
+val SCE_AVE_IDENTIFIER=9
+val SCE_AVE_OPERATOR=10
+val SCE_AVE_WORD1=11
+val SCE_AVE_WORD2=12
+val SCE_AVE_WORD3=13
+val SCE_AVE_WORD4=14
+val SCE_AVE_WORD5=15
+val SCE_AVE_WORD6=16
+# Lexical states for SCLEX_ADA
+lex Ada=SCLEX_ADA SCE_ADA_
+val SCE_ADA_DEFAULT=0
+val SCE_ADA_WORD=1
+val SCE_ADA_IDENTIFIER=2
+val SCE_ADA_NUMBER=3
+val SCE_ADA_DELIMITER=4
+val SCE_ADA_CHARACTER=5
+val SCE_ADA_CHARACTEREOL=6
+val SCE_ADA_STRING=7
+val SCE_ADA_STRINGEOL=8
+val SCE_ADA_LABEL=9
+val SCE_ADA_COMMENTLINE=10
+val SCE_ADA_ILLEGAL=11
+# Lexical states for SCLEX_BAAN
+lex Baan=SCLEX_BAAN SCE_BAAN_
+val SCE_BAAN_DEFAULT=0
+val SCE_BAAN_COMMENT=1
+val SCE_BAAN_COMMENTDOC=2
+val SCE_BAAN_NUMBER=3
+val SCE_BAAN_WORD=4
+val SCE_BAAN_STRING=5
+val SCE_BAAN_PREPROCESSOR=6
+val SCE_BAAN_OPERATOR=7
+val SCE_BAAN_IDENTIFIER=8
+val SCE_BAAN_STRINGEOL=9
+val SCE_BAAN_WORD2=10
+val SCE_BAAN_WORD3=11
+val SCE_BAAN_WORD4=12
+val SCE_BAAN_WORD5=13
+val SCE_BAAN_WORD6=14
+val SCE_BAAN_WORD7=15
+val SCE_BAAN_WORD8=16
+val SCE_BAAN_WORD9=17
+val SCE_BAAN_TABLEDEF=18
+val SCE_BAAN_TABLESQL=19
+val SCE_BAAN_FUNCTION=20
+val SCE_BAAN_DOMDEF=21
+val SCE_BAAN_FUNCDEF=22
+val SCE_BAAN_OBJECTDEF=23
+val SCE_BAAN_DEFINEDEF=24
+# Lexical states for SCLEX_LISP
+lex Lisp=SCLEX_LISP SCE_LISP_
+val SCE_LISP_DEFAULT=0
+val SCE_LISP_COMMENT=1
+val SCE_LISP_NUMBER=2
+val SCE_LISP_KEYWORD=3
+val SCE_LISP_KEYWORD_KW=4
+val SCE_LISP_SYMBOL=5
+val SCE_LISP_STRING=6
+val SCE_LISP_STRINGEOL=8
+val SCE_LISP_IDENTIFIER=9
+val SCE_LISP_OPERATOR=10
+val SCE_LISP_SPECIAL=11
+val SCE_LISP_MULTI_COMMENT=12
+# Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
+lex Eiffel=SCLEX_EIFFEL SCE_EIFFEL_
+lex EiffelKW=SCLEX_EIFFELKW SCE_EIFFEL_
+val SCE_EIFFEL_DEFAULT=0
+val SCE_EIFFEL_COMMENTLINE=1
+val SCE_EIFFEL_NUMBER=2
+val SCE_EIFFEL_WORD=3
+val SCE_EIFFEL_STRING=4
+val SCE_EIFFEL_CHARACTER=5
+val SCE_EIFFEL_OPERATOR=6
+val SCE_EIFFEL_IDENTIFIER=7
+val SCE_EIFFEL_STRINGEOL=8
+# Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)
+lex NNCronTab=SCLEX_NNCRONTAB SCE_NNCRONTAB_
+val SCE_NNCRONTAB_DEFAULT=0
+val SCE_NNCRONTAB_COMMENT=1
+val SCE_NNCRONTAB_TASK=2
+val SCE_NNCRONTAB_SECTION=3
+val SCE_NNCRONTAB_KEYWORD=4
+val SCE_NNCRONTAB_MODIFIER=5
+val SCE_NNCRONTAB_ASTERISK=6
+val SCE_NNCRONTAB_NUMBER=7
+val SCE_NNCRONTAB_STRING=8
+val SCE_NNCRONTAB_ENVIRONMENT=9
+val SCE_NNCRONTAB_IDENTIFIER=10
+# Lexical states for SCLEX_FORTH (Forth Lexer)
+lex Forth=SCLEX_FORTH SCE_FORTH_
+val SCE_FORTH_DEFAULT=0
+val SCE_FORTH_COMMENT=1
+val SCE_FORTH_COMMENT_ML=2
+val SCE_FORTH_IDENTIFIER=3
+val SCE_FORTH_CONTROL=4
+val SCE_FORTH_KEYWORD=5
+val SCE_FORTH_DEFWORD=6
+val SCE_FORTH_PREWORD1=7
+val SCE_FORTH_PREWORD2=8
+val SCE_FORTH_NUMBER=9
+val SCE_FORTH_STRING=10
+val SCE_FORTH_LOCALE=11
+# Lexical states for SCLEX_MATLAB
+lex MatLab=SCLEX_MATLAB SCE_MATLAB_
+val SCE_MATLAB_DEFAULT=0
+val SCE_MATLAB_COMMENT=1
+val SCE_MATLAB_COMMAND=2
+val SCE_MATLAB_NUMBER=3
+val SCE_MATLAB_KEYWORD=4
+# single quoted string
+val SCE_MATLAB_STRING=5
+val SCE_MATLAB_OPERATOR=6
+val SCE_MATLAB_IDENTIFIER=7
+val SCE_MATLAB_DOUBLEQUOTESTRING=8
+# Lexical states for SCLEX_MAXIMA
+lex Maxima=SCLEX_MAXIMA SCE_MAXIMA_
+val SCE_MAXIMA_OPERATOR=0
+val SCE_MAXIMA_COMMANDENDING=1
+val SCE_MAXIMA_COMMENT=2
+val SCE_MAXIMA_NUMBER=3
+val SCE_MAXIMA_STRING=4
+val SCE_MAXIMA_COMMAND=5
+val SCE_MAXIMA_VARIABLE=6
+val SCE_MAXIMA_UNKNOWN=7
+# Lexical states for SCLEX_SCRIPTOL
+lex Sol=SCLEX_SCRIPTOL SCE_SCRIPTOL_
+val SCE_SCRIPTOL_DEFAULT=0
+val SCE_SCRIPTOL_WHITE=1
+val SCE_SCRIPTOL_COMMENTLINE=2
+val SCE_SCRIPTOL_PERSISTENT=3
+val SCE_SCRIPTOL_CSTYLE=4
+val SCE_SCRIPTOL_COMMENTBLOCK=5
+val SCE_SCRIPTOL_NUMBER=6
+val SCE_SCRIPTOL_STRING=7
+val SCE_SCRIPTOL_CHARACTER=8
+val SCE_SCRIPTOL_STRINGEOL=9
+val SCE_SCRIPTOL_KEYWORD=10
+val SCE_SCRIPTOL_OPERATOR=11
+val SCE_SCRIPTOL_IDENTIFIER=12
+val SCE_SCRIPTOL_TRIPLE=13
+val SCE_SCRIPTOL_CLASSNAME=14
+val SCE_SCRIPTOL_PREPROCESSOR=15
+# Lexical states for SCLEX_ASM, SCLEX_AS
+lex Asm=SCLEX_ASM SCE_ASM_
+lex As=SCLEX_AS SCE_ASM_
+val SCE_ASM_DEFAULT=0
+val SCE_ASM_COMMENT=1
+val SCE_ASM_NUMBER=2
+val SCE_ASM_STRING=3
+val SCE_ASM_OPERATOR=4
+val SCE_ASM_IDENTIFIER=5
+val SCE_ASM_CPUINSTRUCTION=6
+val SCE_ASM_MATHINSTRUCTION=7
+val SCE_ASM_REGISTER=8
+val SCE_ASM_DIRECTIVE=9
+val SCE_ASM_DIRECTIVEOPERAND=10
+val SCE_ASM_COMMENTBLOCK=11
+val SCE_ASM_CHARACTER=12
+val SCE_ASM_STRINGEOL=13
+val SCE_ASM_EXTINSTRUCTION=14
+val SCE_ASM_COMMENTDIRECTIVE=15
+# Lexical states for SCLEX_FORTRAN
+lex Fortran=SCLEX_FORTRAN SCE_F_
+lex F77=SCLEX_F77 SCE_F_
+val SCE_F_DEFAULT=0
+val SCE_F_COMMENT=1
+val SCE_F_NUMBER=2
+val SCE_F_STRING1=3
+val SCE_F_STRING2=4
+val SCE_F_STRINGEOL=5
+val SCE_F_OPERATOR=6
+val SCE_F_IDENTIFIER=7
+val SCE_F_WORD=8
+val SCE_F_WORD2=9
+val SCE_F_WORD3=10
+val SCE_F_PREPROCESSOR=11
+val SCE_F_OPERATOR2=12
+val SCE_F_LABEL=13
+val SCE_F_CONTINUATION=14
+# Lexical states for SCLEX_CSS
+lex CSS=SCLEX_CSS SCE_CSS_
+val SCE_CSS_DEFAULT=0
+val SCE_CSS_TAG=1
+val SCE_CSS_CLASS=2
+val SCE_CSS_PSEUDOCLASS=3
+val SCE_CSS_UNKNOWN_PSEUDOCLASS=4
+val SCE_CSS_OPERATOR=5
+val SCE_CSS_IDENTIFIER=6
+val SCE_CSS_UNKNOWN_IDENTIFIER=7
+val SCE_CSS_VALUE=8
+val SCE_CSS_COMMENT=9
+val SCE_CSS_ID=10
+val SCE_CSS_IMPORTANT=11
+val SCE_CSS_DIRECTIVE=12
+val SCE_CSS_DOUBLESTRING=13
+val SCE_CSS_SINGLESTRING=14
+val SCE_CSS_IDENTIFIER2=15
+val SCE_CSS_ATTRIBUTE=16
+val SCE_CSS_IDENTIFIER3=17
+val SCE_CSS_PSEUDOELEMENT=18
+val SCE_CSS_EXTENDED_IDENTIFIER=19
+val SCE_CSS_EXTENDED_PSEUDOCLASS=20
+val SCE_CSS_EXTENDED_PSEUDOELEMENT=21
+val SCE_CSS_MEDIA=22
+val SCE_CSS_VARIABLE=23
+# Lexical states for SCLEX_POV
+lex POV=SCLEX_POV SCE_POV_
+val SCE_POV_DEFAULT=0
+val SCE_POV_COMMENT=1
+val SCE_POV_COMMENTLINE=2
+val SCE_POV_NUMBER=3
+val SCE_POV_OPERATOR=4
+val SCE_POV_IDENTIFIER=5
+val SCE_POV_STRING=6
+val SCE_POV_STRINGEOL=7
+val SCE_POV_DIRECTIVE=8
+val SCE_POV_BADDIRECTIVE=9
+val SCE_POV_WORD2=10
+val SCE_POV_WORD3=11
+val SCE_POV_WORD4=12
+val SCE_POV_WORD5=13
+val SCE_POV_WORD6=14
+val SCE_POV_WORD7=15
+val SCE_POV_WORD8=16
+# Lexical states for SCLEX_LOUT
+lex LOUT=SCLEX_LOUT SCE_LOUT_
+val SCE_LOUT_DEFAULT=0
+val SCE_LOUT_COMMENT=1
+val SCE_LOUT_NUMBER=2
+val SCE_LOUT_WORD=3
+val SCE_LOUT_WORD2=4
+val SCE_LOUT_WORD3=5
+val SCE_LOUT_WORD4=6
+val SCE_LOUT_STRING=7
+val SCE_LOUT_OPERATOR=8
+val SCE_LOUT_IDENTIFIER=9
+val SCE_LOUT_STRINGEOL=10
+# Lexical states for SCLEX_ESCRIPT
+lex ESCRIPT=SCLEX_ESCRIPT SCE_ESCRIPT_
+val SCE_ESCRIPT_DEFAULT=0
+val SCE_ESCRIPT_COMMENT=1
+val SCE_ESCRIPT_COMMENTLINE=2
+val SCE_ESCRIPT_COMMENTDOC=3
+val SCE_ESCRIPT_NUMBER=4
+val SCE_ESCRIPT_WORD=5
+val SCE_ESCRIPT_STRING=6
+val SCE_ESCRIPT_OPERATOR=7
+val SCE_ESCRIPT_IDENTIFIER=8
+val SCE_ESCRIPT_BRACE=9
+val SCE_ESCRIPT_WORD2=10
+val SCE_ESCRIPT_WORD3=11
+# Lexical states for SCLEX_PS
+lex PS=SCLEX_PS SCE_PS_
+val SCE_PS_DEFAULT=0
+val SCE_PS_COMMENT=1
+val SCE_PS_DSC_COMMENT=2
+val SCE_PS_DSC_VALUE=3
+val SCE_PS_NUMBER=4
+val SCE_PS_NAME=5
+val SCE_PS_KEYWORD=6
+val SCE_PS_LITERAL=7
+val SCE_PS_IMMEVAL=8
+val SCE_PS_PAREN_ARRAY=9
+val SCE_PS_PAREN_DICT=10
+val SCE_PS_PAREN_PROC=11
+val SCE_PS_TEXT=12
+val SCE_PS_HEXSTRING=13
+val SCE_PS_BASE85STRING=14
+val SCE_PS_BADSTRINGCHAR=15
+# Lexical states for SCLEX_NSIS
+lex NSIS=SCLEX_NSIS SCE_NSIS_
+val SCE_NSIS_DEFAULT=0
+val SCE_NSIS_COMMENT=1
+val SCE_NSIS_STRINGDQ=2
+val SCE_NSIS_STRINGLQ=3
+val SCE_NSIS_STRINGRQ=4
+val SCE_NSIS_FUNCTION=5
+val SCE_NSIS_VARIABLE=6
+val SCE_NSIS_LABEL=7
+val SCE_NSIS_USERDEFINED=8
+val SCE_NSIS_SECTIONDEF=9
+val SCE_NSIS_SUBSECTIONDEF=10
+val SCE_NSIS_IFDEFINEDEF=11
+val SCE_NSIS_MACRODEF=12
+val SCE_NSIS_STRINGVAR=13
+val SCE_NSIS_NUMBER=14
+val SCE_NSIS_SECTIONGROUP=15
+val SCE_NSIS_PAGEEX=16
+val SCE_NSIS_FUNCTIONDEF=17
+val SCE_NSIS_COMMENTBOX=18
+# Lexical states for SCLEX_MMIXAL
+lex MMIXAL=SCLEX_MMIXAL SCE_MMIXAL_
+val SCE_MMIXAL_LEADWS=0
+val SCE_MMIXAL_COMMENT=1
+val SCE_MMIXAL_LABEL=2
+val SCE_MMIXAL_OPCODE=3
+val SCE_MMIXAL_OPCODE_PRE=4
+val SCE_MMIXAL_OPCODE_VALID=5
+val SCE_MMIXAL_OPCODE_UNKNOWN=6
+val SCE_MMIXAL_OPCODE_POST=7
+val SCE_MMIXAL_OPERANDS=8
+val SCE_MMIXAL_NUMBER=9
+val SCE_MMIXAL_REF=10
+val SCE_MMIXAL_CHAR=11
+val SCE_MMIXAL_STRING=12
+val SCE_MMIXAL_REGISTER=13
+val SCE_MMIXAL_HEX=14
+val SCE_MMIXAL_OPERATOR=15
+val SCE_MMIXAL_SYMBOL=16
+val SCE_MMIXAL_INCLUDE=17
+# Lexical states for SCLEX_CLW
+lex Clarion=SCLEX_CLW SCE_CLW_
+val SCE_CLW_DEFAULT=0
+val SCE_CLW_LABEL=1
+val SCE_CLW_COMMENT=2
+val SCE_CLW_STRING=3
+val SCE_CLW_USER_IDENTIFIER=4
+val SCE_CLW_INTEGER_CONSTANT=5
+val SCE_CLW_REAL_CONSTANT=6
+val SCE_CLW_PICTURE_STRING=7
+val SCE_CLW_KEYWORD=8
+val SCE_CLW_COMPILER_DIRECTIVE=9
+val SCE_CLW_RUNTIME_EXPRESSIONS=10
+val SCE_CLW_BUILTIN_PROCEDURES_FUNCTION=11
+val SCE_CLW_STRUCTURE_DATA_TYPE=12
+val SCE_CLW_ATTRIBUTE=13
+val SCE_CLW_STANDARD_EQUATE=14
+val SCE_CLW_ERROR=15
+val SCE_CLW_DEPRECATED=16
+# Lexical states for SCLEX_LOT
+lex LOT=SCLEX_LOT SCE_LOT_
+val SCE_LOT_DEFAULT=0
+val SCE_LOT_HEADER=1
+val SCE_LOT_BREAK=2
+val SCE_LOT_SET=3
+val SCE_LOT_PASS=4
+val SCE_LOT_FAIL=5
+val SCE_LOT_ABORT=6
+# Lexical states for SCLEX_YAML
+lex YAML=SCLEX_YAML SCE_YAML_
+val SCE_YAML_DEFAULT=0
+val SCE_YAML_COMMENT=1
+val SCE_YAML_IDENTIFIER=2
+val SCE_YAML_KEYWORD=3
+val SCE_YAML_NUMBER=4
+val SCE_YAML_REFERENCE=5
+val SCE_YAML_DOCUMENT=6
+val SCE_YAML_TEXT=7
+val SCE_YAML_ERROR=8
+val SCE_YAML_OPERATOR=9
+# Lexical states for SCLEX_TEX
+lex TeX=SCLEX_TEX SCE_TEX_
+val SCE_TEX_DEFAULT=0
+val SCE_TEX_SPECIAL=1
+val SCE_TEX_GROUP=2
+val SCE_TEX_SYMBOL=3
+val SCE_TEX_COMMAND=4
+val SCE_TEX_TEXT=5
+lex Metapost=SCLEX_METAPOST SCE_METAPOST_
+val SCE_METAPOST_DEFAULT=0
+val SCE_METAPOST_SPECIAL=1
+val SCE_METAPOST_GROUP=2
+val SCE_METAPOST_SYMBOL=3
+val SCE_METAPOST_COMMAND=4
+val SCE_METAPOST_TEXT=5
+val SCE_METAPOST_EXTRA=6
+# Lexical states for SCLEX_ERLANG
+lex Erlang=SCLEX_ERLANG SCE_ERLANG_
+val SCE_ERLANG_DEFAULT=0
+val SCE_ERLANG_COMMENT=1
+val SCE_ERLANG_VARIABLE=2
+val SCE_ERLANG_NUMBER=3
+val SCE_ERLANG_KEYWORD=4
+val SCE_ERLANG_STRING=5
+val SCE_ERLANG_OPERATOR=6
+val SCE_ERLANG_ATOM=7
+val SCE_ERLANG_FUNCTION_NAME=8
+val SCE_ERLANG_CHARACTER=9
+val SCE_ERLANG_MACRO=10
+val SCE_ERLANG_RECORD=11
+val SCE_ERLANG_PREPROC=12
+val SCE_ERLANG_NODE_NAME=13
+val SCE_ERLANG_COMMENT_FUNCTION=14
+val SCE_ERLANG_COMMENT_MODULE=15
+val SCE_ERLANG_COMMENT_DOC=16
+val SCE_ERLANG_COMMENT_DOC_MACRO=17
+val SCE_ERLANG_ATOM_QUOTED=18
+val SCE_ERLANG_MACRO_QUOTED=19
+val SCE_ERLANG_RECORD_QUOTED=20
+val SCE_ERLANG_NODE_NAME_QUOTED=21
+val SCE_ERLANG_BIFS=22
+val SCE_ERLANG_MODULES=23
+val SCE_ERLANG_MODULES_ATT=24
+val SCE_ERLANG_UNKNOWN=31
+# Lexical states for SCLEX_OCTAVE are identical to MatLab
+lex Octave=SCLEX_OCTAVE SCE_MATLAB_
+# Lexical states for SCLEX_JULIA
+lex Julia=SCLEX_JULIA SCE_JULIA_
+val SCE_JULIA_DEFAULT=0
+val SCE_JULIA_COMMENT=1
+val SCE_JULIA_NUMBER=2
+val SCE_JULIA_KEYWORD1=3
+val SCE_JULIA_KEYWORD2=4
+val SCE_JULIA_KEYWORD3=5
+val SCE_JULIA_CHAR=6
+val SCE_JULIA_OPERATOR=7
+val SCE_JULIA_BRACKET=8
+val SCE_JULIA_IDENTIFIER=9
+val SCE_JULIA_STRING=10
+val SCE_JULIA_SYMBOL=11
+val SCE_JULIA_MACRO=12
+val SCE_JULIA_STRINGINTERP=13
+val SCE_JULIA_DOCSTRING=14
+val SCE_JULIA_STRINGLITERAL=15
+val SCE_JULIA_COMMAND=16
+val SCE_JULIA_COMMANDLITERAL=17
+val SCE_JULIA_TYPEANNOT=18
+val SCE_JULIA_LEXERROR=19
+val SCE_JULIA_KEYWORD4=20
+val SCE_JULIA_TYPEOPERATOR=21
+# Lexical states for SCLEX_MSSQL
+lex MSSQL=SCLEX_MSSQL SCE_MSSQL_
+val SCE_MSSQL_DEFAULT=0
+val SCE_MSSQL_COMMENT=1
+val SCE_MSSQL_LINE_COMMENT=2
+val SCE_MSSQL_NUMBER=3
+val SCE_MSSQL_STRING=4
+val SCE_MSSQL_OPERATOR=5
+val SCE_MSSQL_IDENTIFIER=6
+val SCE_MSSQL_VARIABLE=7
+val SCE_MSSQL_COLUMN_NAME=8
+val SCE_MSSQL_STATEMENT=9
+val SCE_MSSQL_DATATYPE=10
+val SCE_MSSQL_SYSTABLE=11
+val SCE_MSSQL_GLOBAL_VARIABLE=12
+val SCE_MSSQL_FUNCTION=13
+val SCE_MSSQL_STORED_PROCEDURE=14
+val SCE_MSSQL_DEFAULT_PREF_DATATYPE=15
+val SCE_MSSQL_COLUMN_NAME_2=16
+# Lexical states for SCLEX_VERILOG
+lex Verilog=SCLEX_VERILOG SCE_V_
+val SCE_V_DEFAULT=0
+val SCE_V_COMMENT=1
+val SCE_V_COMMENTLINE=2
+val SCE_V_COMMENTLINEBANG=3
+val SCE_V_NUMBER=4
+val SCE_V_WORD=5
+val SCE_V_STRING=6
+val SCE_V_WORD2=7
+val SCE_V_WORD3=8
+val SCE_V_PREPROCESSOR=9
+val SCE_V_OPERATOR=10
+val SCE_V_IDENTIFIER=11
+val SCE_V_STRINGEOL=12
+val SCE_V_USER=19
+val SCE_V_COMMENT_WORD=20
+val SCE_V_INPUT=21
+val SCE_V_OUTPUT=22
+val SCE_V_INOUT=23
+val SCE_V_PORT_CONNECT=24
+# Lexical states for SCLEX_KIX
+lex Kix=SCLEX_KIX SCE_KIX_
+val SCE_KIX_DEFAULT=0
+val SCE_KIX_COMMENT=1
+val SCE_KIX_STRING1=2
+val SCE_KIX_STRING2=3
+val SCE_KIX_NUMBER=4
+val SCE_KIX_VAR=5
+val SCE_KIX_MACRO=6
+val SCE_KIX_KEYWORD=7
+val SCE_KIX_FUNCTIONS=8
+val SCE_KIX_OPERATOR=9
+val SCE_KIX_COMMENTSTREAM=10
+val SCE_KIX_IDENTIFIER=31
+# Lexical states for SCLEX_GUI4CLI
+lex Gui4Cli=SCLEX_GUI4CLI SCE_GC_
+val SCE_GC_DEFAULT=0
+val SCE_GC_COMMENTLINE=1
+val SCE_GC_COMMENTBLOCK=2
+val SCE_GC_GLOBAL=3
+val SCE_GC_EVENT=4
+val SCE_GC_ATTRIBUTE=5
+val SCE_GC_CONTROL=6
+val SCE_GC_COMMAND=7
+val SCE_GC_STRING=8
+val SCE_GC_OPERATOR=9
+# Lexical states for SCLEX_SPECMAN
+lex Specman=SCLEX_SPECMAN SCE_SN_
+val SCE_SN_DEFAULT=0
+val SCE_SN_CODE=1
+val SCE_SN_COMMENTLINE=2
+val SCE_SN_COMMENTLINEBANG=3
+val SCE_SN_NUMBER=4
+val SCE_SN_WORD=5
+val SCE_SN_STRING=6
+val SCE_SN_WORD2=7
+val SCE_SN_WORD3=8
+val SCE_SN_PREPROCESSOR=9
+val SCE_SN_OPERATOR=10
+val SCE_SN_IDENTIFIER=11
+val SCE_SN_STRINGEOL=12
+val SCE_SN_REGEXTAG=13
+val SCE_SN_SIGNAL=14
+val SCE_SN_USER=19
+# Lexical states for SCLEX_AU3
+lex Au3=SCLEX_AU3 SCE_AU3_
+val SCE_AU3_DEFAULT=0
+val SCE_AU3_COMMENT=1
+val SCE_AU3_COMMENTBLOCK=2
+val SCE_AU3_NUMBER=3
+val SCE_AU3_FUNCTION=4
+val SCE_AU3_KEYWORD=5
+val SCE_AU3_MACRO=6
+val SCE_AU3_STRING=7
+val SCE_AU3_OPERATOR=8
+val SCE_AU3_VARIABLE=9
+val SCE_AU3_SENT=10
+val SCE_AU3_PREPROCESSOR=11
+val SCE_AU3_SPECIAL=12
+val SCE_AU3_EXPAND=13
+val SCE_AU3_COMOBJ=14
+val SCE_AU3_UDF=15
+# Lexical states for SCLEX_APDL
+lex APDL=SCLEX_APDL SCE_APDL_
+val SCE_APDL_DEFAULT=0
+val SCE_APDL_COMMENT=1
+val SCE_APDL_COMMENTBLOCK=2
+val SCE_APDL_NUMBER=3
+val SCE_APDL_STRING=4
+val SCE_APDL_OPERATOR=5
+val SCE_APDL_WORD=6
+val SCE_APDL_PROCESSOR=7
+val SCE_APDL_COMMAND=8
+val SCE_APDL_SLASHCOMMAND=9
+val SCE_APDL_STARCOMMAND=10
+val SCE_APDL_ARGUMENT=11
+val SCE_APDL_FUNCTION=12
+# Lexical states for SCLEX_BASH
+lex Bash=SCLEX_BASH SCE_SH_
+val SCE_SH_DEFAULT=0
+val SCE_SH_ERROR=1
+val SCE_SH_COMMENTLINE=2
+val SCE_SH_NUMBER=3
+val SCE_SH_WORD=4
+val SCE_SH_STRING=5
+val SCE_SH_CHARACTER=6
+val SCE_SH_OPERATOR=7
+val SCE_SH_IDENTIFIER=8
+val SCE_SH_SCALAR=9
+val SCE_SH_PARAM=10
+val SCE_SH_BACKTICKS=11
+val SCE_SH_HERE_DELIM=12
+val SCE_SH_HERE_Q=13
+# Lexical states for SCLEX_ASN1
+lex Asn1=SCLEX_ASN1 SCE_ASN1_
+val SCE_ASN1_DEFAULT=0
+val SCE_ASN1_COMMENT=1
+val SCE_ASN1_IDENTIFIER=2
+val SCE_ASN1_STRING=3
+val SCE_ASN1_OID=4
+val SCE_ASN1_SCALAR=5
+val SCE_ASN1_KEYWORD=6
+val SCE_ASN1_ATTRIBUTE=7
+val SCE_ASN1_DESCRIPTOR=8
+val SCE_ASN1_TYPE=9
+val SCE_ASN1_OPERATOR=10
+# Lexical states for SCLEX_VHDL
+lex VHDL=SCLEX_VHDL SCE_VHDL_
+val SCE_VHDL_DEFAULT=0
+val SCE_VHDL_COMMENT=1
+val SCE_VHDL_COMMENTLINEBANG=2
+val SCE_VHDL_NUMBER=3
+val SCE_VHDL_STRING=4
+val SCE_VHDL_OPERATOR=5
+val SCE_VHDL_IDENTIFIER=6
+val SCE_VHDL_STRINGEOL=7
+val SCE_VHDL_KEYWORD=8
+val SCE_VHDL_STDOPERATOR=9
+val SCE_VHDL_ATTRIBUTE=10
+val SCE_VHDL_STDFUNCTION=11
+val SCE_VHDL_STDPACKAGE=12
+val SCE_VHDL_STDTYPE=13
+val SCE_VHDL_USERWORD=14
+val SCE_VHDL_BLOCK_COMMENT=15
+# Lexical states for SCLEX_CAML
+lex Caml=SCLEX_CAML SCE_CAML_
+val SCE_CAML_DEFAULT=0
+val SCE_CAML_IDENTIFIER=1
+val SCE_CAML_TAGNAME=2
+val SCE_CAML_KEYWORD=3
+val SCE_CAML_KEYWORD2=4
+val SCE_CAML_KEYWORD3=5
+val SCE_CAML_LINENUM=6
+val SCE_CAML_OPERATOR=7
+val SCE_CAML_NUMBER=8
+val SCE_CAML_CHAR=9
+val SCE_CAML_WHITE=10
+val SCE_CAML_STRING=11
+val SCE_CAML_COMMENT=12
+val SCE_CAML_COMMENT1=13
+val SCE_CAML_COMMENT2=14
+val SCE_CAML_COMMENT3=15
+# Lexical states for SCLEX_HASKELL
+lex Haskell=SCLEX_HASKELL SCE_HA_
+val SCE_HA_DEFAULT=0
+val SCE_HA_IDENTIFIER=1
+val SCE_HA_KEYWORD=2
+val SCE_HA_NUMBER=3
+val SCE_HA_STRING=4
+val SCE_HA_CHARACTER=5
+val SCE_HA_CLASS=6
+val SCE_HA_MODULE=7
+val SCE_HA_CAPITAL=8
+val SCE_HA_DATA=9
+val SCE_HA_IMPORT=10
+val SCE_HA_OPERATOR=11
+val SCE_HA_INSTANCE=12
+val SCE_HA_COMMENTLINE=13
+val SCE_HA_COMMENTBLOCK=14
+val SCE_HA_COMMENTBLOCK2=15
+val SCE_HA_COMMENTBLOCK3=16
+val SCE_HA_PRAGMA=17
+val SCE_HA_PREPROCESSOR=18
+val SCE_HA_STRINGEOL=19
+val SCE_HA_RESERVED_OPERATOR=20
+val SCE_HA_LITERATE_COMMENT=21
+val SCE_HA_LITERATE_CODEDELIM=22
+# Lexical states of SCLEX_TADS3
+lex TADS3=SCLEX_TADS3 SCE_T3_
+val SCE_T3_DEFAULT=0
+val SCE_T3_X_DEFAULT=1
+val SCE_T3_PREPROCESSOR=2
+val SCE_T3_BLOCK_COMMENT=3
+val SCE_T3_LINE_COMMENT=4
+val SCE_T3_OPERATOR=5
+val SCE_T3_KEYWORD=6
+val SCE_T3_NUMBER=7
+val SCE_T3_IDENTIFIER=8
+val SCE_T3_S_STRING=9
+val SCE_T3_D_STRING=10
+val SCE_T3_X_STRING=11
+val SCE_T3_LIB_DIRECTIVE=12
+val SCE_T3_MSG_PARAM=13
+val SCE_T3_HTML_TAG=14
+val SCE_T3_HTML_DEFAULT=15
+val SCE_T3_HTML_STRING=16
+val SCE_T3_USER1=17
+val SCE_T3_USER2=18
+val SCE_T3_USER3=19
+val SCE_T3_BRACE=20
+# Lexical states for SCLEX_REBOL
+lex Rebol=SCLEX_REBOL SCE_REBOL_
+val SCE_REBOL_DEFAULT=0
+val SCE_REBOL_COMMENTLINE=1
+val SCE_REBOL_COMMENTBLOCK=2
+val SCE_REBOL_PREFACE=3
+val SCE_REBOL_OPERATOR=4
+val SCE_REBOL_CHARACTER=5
+val SCE_REBOL_QUOTEDSTRING=6
+val SCE_REBOL_BRACEDSTRING=7
+val SCE_REBOL_NUMBER=8
+val SCE_REBOL_PAIR=9
+val SCE_REBOL_TUPLE=10
+val SCE_REBOL_BINARY=11
+val SCE_REBOL_MONEY=12
+val SCE_REBOL_ISSUE=13
+val SCE_REBOL_TAG=14
+val SCE_REBOL_FILE=15
+val SCE_REBOL_EMAIL=16
+val SCE_REBOL_URL=17
+val SCE_REBOL_DATE=18
+val SCE_REBOL_TIME=19
+val SCE_REBOL_IDENTIFIER=20
+val SCE_REBOL_WORD=21
+val SCE_REBOL_WORD2=22
+val SCE_REBOL_WORD3=23
+val SCE_REBOL_WORD4=24
+val SCE_REBOL_WORD5=25
+val SCE_REBOL_WORD6=26
+val SCE_REBOL_WORD7=27
+val SCE_REBOL_WORD8=28
+# Lexical states for SCLEX_SQL
+lex SQL=SCLEX_SQL SCE_SQL_
+val SCE_SQL_DEFAULT=0
+val SCE_SQL_COMMENT=1
+val SCE_SQL_COMMENTLINE=2
+val SCE_SQL_COMMENTDOC=3
+val SCE_SQL_NUMBER=4
+val SCE_SQL_WORD=5
+val SCE_SQL_STRING=6
+val SCE_SQL_CHARACTER=7
+val SCE_SQL_SQLPLUS=8
+val SCE_SQL_SQLPLUS_PROMPT=9
+val SCE_SQL_OPERATOR=10
+val SCE_SQL_IDENTIFIER=11
+val SCE_SQL_SQLPLUS_COMMENT=13
+val SCE_SQL_COMMENTLINEDOC=15
+val SCE_SQL_WORD2=16
+val SCE_SQL_COMMENTDOCKEYWORD=17
+val SCE_SQL_COMMENTDOCKEYWORDERROR=18
+val SCE_SQL_USER1=19
+val SCE_SQL_USER2=20
+val SCE_SQL_USER3=21
+val SCE_SQL_USER4=22
+val SCE_SQL_QUOTEDIDENTIFIER=23
+val SCE_SQL_QOPERATOR=24
+# Lexical states for SCLEX_SMALLTALK
+lex Smalltalk=SCLEX_SMALLTALK SCE_ST_
+val SCE_ST_DEFAULT=0
+val SCE_ST_STRING=1
+val SCE_ST_NUMBER=2
+val SCE_ST_COMMENT=3
+val SCE_ST_SYMBOL=4
+val SCE_ST_BINARY=5
+val SCE_ST_BOOL=6
+val SCE_ST_SELF=7
+val SCE_ST_SUPER=8
+val SCE_ST_NIL=9
+val SCE_ST_GLOBAL=10
+val SCE_ST_RETURN=11
+val SCE_ST_SPECIAL=12
+val SCE_ST_KWSEND=13
+val SCE_ST_ASSIGN=14
+val SCE_ST_CHARACTER=15
+val SCE_ST_SPEC_SEL=16
+# Lexical states for SCLEX_FLAGSHIP (clipper)
+lex FlagShip=SCLEX_FLAGSHIP SCE_FS_
+val SCE_FS_DEFAULT=0
+val SCE_FS_COMMENT=1
+val SCE_FS_COMMENTLINE=2
+val SCE_FS_COMMENTDOC=3
+val SCE_FS_COMMENTLINEDOC=4
+val SCE_FS_COMMENTDOCKEYWORD=5
+val SCE_FS_COMMENTDOCKEYWORDERROR=6
+val SCE_FS_KEYWORD=7
+val SCE_FS_KEYWORD2=8
+val SCE_FS_KEYWORD3=9
+val SCE_FS_KEYWORD4=10
+val SCE_FS_NUMBER=11
+val SCE_FS_STRING=12
+val SCE_FS_PREPROCESSOR=13
+val SCE_FS_OPERATOR=14
+val SCE_FS_IDENTIFIER=15
+val SCE_FS_DATE=16
+val SCE_FS_STRINGEOL=17
+val SCE_FS_CONSTANT=18
+val SCE_FS_WORDOPERATOR=19
+val SCE_FS_DISABLEDCODE=20
+val SCE_FS_DEFAULT_C=21
+val SCE_FS_COMMENTDOC_C=22
+val SCE_FS_COMMENTLINEDOC_C=23
+val SCE_FS_KEYWORD_C=24
+val SCE_FS_KEYWORD2_C=25
+val SCE_FS_NUMBER_C=26
+val SCE_FS_STRING_C=27
+val SCE_FS_PREPROCESSOR_C=28
+val SCE_FS_OPERATOR_C=29
+val SCE_FS_IDENTIFIER_C=30
+val SCE_FS_STRINGEOL_C=31
+# Lexical states for SCLEX_CSOUND
+lex Csound=SCLEX_CSOUND SCE_CSOUND_
+val SCE_CSOUND_DEFAULT=0
+val SCE_CSOUND_COMMENT=1
+val SCE_CSOUND_NUMBER=2
+val SCE_CSOUND_OPERATOR=3
+val SCE_CSOUND_INSTR=4
+val SCE_CSOUND_IDENTIFIER=5
+val SCE_CSOUND_OPCODE=6
+val SCE_CSOUND_HEADERSTMT=7
+val SCE_CSOUND_USERKEYWORD=8
+val SCE_CSOUND_COMMENTBLOCK=9
+val SCE_CSOUND_PARAM=10
+val SCE_CSOUND_ARATE_VAR=11
+val SCE_CSOUND_KRATE_VAR=12
+val SCE_CSOUND_IRATE_VAR=13
+val SCE_CSOUND_GLOBAL_VAR=14
+val SCE_CSOUND_STRINGEOL=15
+# Lexical states for SCLEX_INNOSETUP
+lex Inno=SCLEX_INNOSETUP SCE_INNO_
+val SCE_INNO_DEFAULT=0
+val SCE_INNO_COMMENT=1
+val SCE_INNO_KEYWORD=2
+val SCE_INNO_PARAMETER=3
+val SCE_INNO_SECTION=4
+val SCE_INNO_PREPROC=5
+val SCE_INNO_INLINE_EXPANSION=6
+val SCE_INNO_COMMENT_PASCAL=7
+val SCE_INNO_KEYWORD_PASCAL=8
+val SCE_INNO_KEYWORD_USER=9
+val SCE_INNO_STRING_DOUBLE=10
+val SCE_INNO_STRING_SINGLE=11
+val SCE_INNO_IDENTIFIER=12
+# Lexical states for SCLEX_OPAL
+lex Opal=SCLEX_OPAL SCE_OPAL_
+val SCE_OPAL_SPACE=0
+val SCE_OPAL_COMMENT_BLOCK=1
+val SCE_OPAL_COMMENT_LINE=2
+val SCE_OPAL_INTEGER=3
+val SCE_OPAL_KEYWORD=4
+val SCE_OPAL_SORT=5
+val SCE_OPAL_STRING=6
+val SCE_OPAL_PAR=7
+val SCE_OPAL_BOOL_CONST=8
+val SCE_OPAL_DEFAULT=32
+# Lexical states for SCLEX_SPICE
+lex Spice=SCLEX_SPICE SCE_SPICE_
+val SCE_SPICE_DEFAULT=0
+val SCE_SPICE_IDENTIFIER=1
+val SCE_SPICE_KEYWORD=2
+val SCE_SPICE_KEYWORD2=3
+val SCE_SPICE_KEYWORD3=4
+val SCE_SPICE_NUMBER=5
+val SCE_SPICE_DELIMITER=6
+val SCE_SPICE_VALUE=7
+val SCE_SPICE_COMMENTLINE=8
+# Lexical states for SCLEX_CMAKE
+lex CMAKE=SCLEX_CMAKE SCE_CMAKE_
+val SCE_CMAKE_DEFAULT=0
+val SCE_CMAKE_COMMENT=1
+val SCE_CMAKE_STRINGDQ=2
+val SCE_CMAKE_STRINGLQ=3
+val SCE_CMAKE_STRINGRQ=4
+val SCE_CMAKE_COMMANDS=5
+val SCE_CMAKE_PARAMETERS=6
+val SCE_CMAKE_VARIABLE=7
+val SCE_CMAKE_USERDEFINED=8
+val SCE_CMAKE_WHILEDEF=9
+val SCE_CMAKE_FOREACHDEF=10
+val SCE_CMAKE_IFDEFINEDEF=11
+val SCE_CMAKE_MACRODEF=12
+val SCE_CMAKE_STRINGVAR=13
+val SCE_CMAKE_NUMBER=14
+# Lexical states for SCLEX_GAP
+lex Gap=SCLEX_GAP SCE_GAP_
+val SCE_GAP_DEFAULT=0
+val SCE_GAP_IDENTIFIER=1
+val SCE_GAP_KEYWORD=2
+val SCE_GAP_KEYWORD2=3
+val SCE_GAP_KEYWORD3=4
+val SCE_GAP_KEYWORD4=5
+val SCE_GAP_STRING=6
+val SCE_GAP_CHAR=7
+val SCE_GAP_OPERATOR=8
+val SCE_GAP_COMMENT=9
+val SCE_GAP_NUMBER=10
+val SCE_GAP_STRINGEOL=11
+# Lexical state for SCLEX_PLM
+lex PLM=SCLEX_PLM SCE_PLM_
+val SCE_PLM_DEFAULT=0
+val SCE_PLM_COMMENT=1
+val SCE_PLM_STRING=2
+val SCE_PLM_NUMBER=3
+val SCE_PLM_IDENTIFIER=4
+val SCE_PLM_OPERATOR=5
+val SCE_PLM_CONTROL=6
+val SCE_PLM_KEYWORD=7
+# Lexical state for SCLEX_PROGRESS
+lex Progress=SCLEX_PROGRESS SCE_ABL_
+val SCE_ABL_DEFAULT=0
+val SCE_ABL_NUMBER=1
+val SCE_ABL_WORD=2
+val SCE_ABL_STRING=3
+val SCE_ABL_CHARACTER=4
+val SCE_ABL_PREPROCESSOR=5
+val SCE_ABL_OPERATOR=6
+val SCE_ABL_IDENTIFIER=7
+val SCE_ABL_BLOCK=8
+val SCE_ABL_END=9
+val SCE_ABL_COMMENT=10
+val SCE_ABL_TASKMARKER=11
+val SCE_ABL_LINECOMMENT=12
+# Lexical states for SCLEX_ABAQUS
+lex ABAQUS=SCLEX_ABAQUS SCE_ABAQUS_
+val SCE_ABAQUS_DEFAULT=0
+val SCE_ABAQUS_COMMENT=1
+val SCE_ABAQUS_COMMENTBLOCK=2
+val SCE_ABAQUS_NUMBER=3
+val SCE_ABAQUS_STRING=4
+val SCE_ABAQUS_OPERATOR=5
+val SCE_ABAQUS_WORD=6
+val SCE_ABAQUS_PROCESSOR=7
+val SCE_ABAQUS_COMMAND=8
+val SCE_ABAQUS_SLASHCOMMAND=9
+val SCE_ABAQUS_STARCOMMAND=10
+val SCE_ABAQUS_ARGUMENT=11
+val SCE_ABAQUS_FUNCTION=12
+# Lexical states for SCLEX_ASYMPTOTE
+lex Asymptote=SCLEX_ASYMPTOTE SCE_ASY_
+val SCE_ASY_DEFAULT=0
+val SCE_ASY_COMMENT=1
+val SCE_ASY_COMMENTLINE=2
+val SCE_ASY_NUMBER=3
+val SCE_ASY_WORD=4
+val SCE_ASY_STRING=5
+val SCE_ASY_CHARACTER=6
+val SCE_ASY_OPERATOR=7
+val SCE_ASY_IDENTIFIER=8
+val SCE_ASY_STRINGEOL=9
+val SCE_ASY_COMMENTLINEDOC=10
+val SCE_ASY_WORD2=11
+# Lexical states for SCLEX_R
+lex R=SCLEX_R SCE_R_
+val SCE_R_DEFAULT=0
+val SCE_R_COMMENT=1
+val SCE_R_KWORD=2
+val SCE_R_BASEKWORD=3
+val SCE_R_OTHERKWORD=4
+val SCE_R_NUMBER=5
+val SCE_R_STRING=6
+val SCE_R_STRING2=7
+val SCE_R_OPERATOR=8
+val SCE_R_IDENTIFIER=9
+val SCE_R_INFIX=10
+val SCE_R_INFIXEOL=11
+# Lexical state for SCLEX_MAGIK
+lex MagikSF=SCLEX_MAGIK SCE_MAGIK_
+val SCE_MAGIK_DEFAULT=0
+val SCE_MAGIK_COMMENT=1
+val SCE_MAGIK_HYPER_COMMENT=16
+val SCE_MAGIK_STRING=2
+val SCE_MAGIK_CHARACTER=3
+val SCE_MAGIK_NUMBER=4
+val SCE_MAGIK_IDENTIFIER=5
+val SCE_MAGIK_OPERATOR=6
+val SCE_MAGIK_FLOW=7
+val SCE_MAGIK_CONTAINER=8
+val SCE_MAGIK_BRACKET_BLOCK=9
+val SCE_MAGIK_BRACE_BLOCK=10
+val SCE_MAGIK_SQBRACKET_BLOCK=11
+val SCE_MAGIK_UNKNOWN_KEYWORD=12
+val SCE_MAGIK_KEYWORD=13
+val SCE_MAGIK_PRAGMA=14
+val SCE_MAGIK_SYMBOL=15
+# Lexical state for SCLEX_POWERSHELL
+lex PowerShell=SCLEX_POWERSHELL SCE_POWERSHELL_
+val SCE_POWERSHELL_DEFAULT=0
+val SCE_POWERSHELL_COMMENT=1
+val SCE_POWERSHELL_STRING=2
+val SCE_POWERSHELL_CHARACTER=3
+val SCE_POWERSHELL_NUMBER=4
+val SCE_POWERSHELL_VARIABLE=5
+val SCE_POWERSHELL_OPERATOR=6
+val SCE_POWERSHELL_IDENTIFIER=7
+val SCE_POWERSHELL_KEYWORD=8
+val SCE_POWERSHELL_CMDLET=9
+val SCE_POWERSHELL_ALIAS=10
+val SCE_POWERSHELL_FUNCTION=11
+val SCE_POWERSHELL_USER1=12
+val SCE_POWERSHELL_COMMENTSTREAM=13
+val SCE_POWERSHELL_HERE_STRING=14
+val SCE_POWERSHELL_HERE_CHARACTER=15
+val SCE_POWERSHELL_COMMENTDOCKEYWORD=16
+# Lexical state for SCLEX_MYSQL
+lex MySQL=SCLEX_MYSQL SCE_MYSQL_
+val SCE_MYSQL_DEFAULT=0
+val SCE_MYSQL_COMMENT=1
+val SCE_MYSQL_COMMENTLINE=2
+val SCE_MYSQL_VARIABLE=3
+val SCE_MYSQL_SYSTEMVARIABLE=4
+val SCE_MYSQL_KNOWNSYSTEMVARIABLE=5
+val SCE_MYSQL_NUMBER=6
+val SCE_MYSQL_MAJORKEYWORD=7
+val SCE_MYSQL_KEYWORD=8
+val SCE_MYSQL_DATABASEOBJECT=9
+val SCE_MYSQL_PROCEDUREKEYWORD=10
+val SCE_MYSQL_STRING=11
+val SCE_MYSQL_SQSTRING=12
+val SCE_MYSQL_DQSTRING=13
+val SCE_MYSQL_OPERATOR=14
+val SCE_MYSQL_FUNCTION=15
+val SCE_MYSQL_IDENTIFIER=16
+val SCE_MYSQL_QUOTEDIDENTIFIER=17
+val SCE_MYSQL_USER1=18
+val SCE_MYSQL_USER2=19
+val SCE_MYSQL_USER3=20
+val SCE_MYSQL_HIDDENCOMMAND=21
+val SCE_MYSQL_PLACEHOLDER=22
+# Lexical state for SCLEX_PO
+lex Po=SCLEX_PO SCE_PO_
+val SCE_PO_DEFAULT=0
+val SCE_PO_COMMENT=1
+val SCE_PO_MSGID=2
+val SCE_PO_MSGID_TEXT=3
+val SCE_PO_MSGSTR=4
+val SCE_PO_MSGSTR_TEXT=5
+val SCE_PO_MSGCTXT=6
+val SCE_PO_MSGCTXT_TEXT=7
+val SCE_PO_FUZZY=8
+val SCE_PO_PROGRAMMER_COMMENT=9
+val SCE_PO_REFERENCE=10
+val SCE_PO_FLAGS=11
+val SCE_PO_MSGID_TEXT_EOL=12
+val SCE_PO_MSGSTR_TEXT_EOL=13
+val SCE_PO_MSGCTXT_TEXT_EOL=14
+val SCE_PO_ERROR=15
+# Lexical states for SCLEX_PASCAL
+lex Pascal=SCLEX_PASCAL SCE_PAS_
+val SCE_PAS_DEFAULT=0
+val SCE_PAS_IDENTIFIER=1
+val SCE_PAS_COMMENT=2
+val SCE_PAS_COMMENT2=3
+val SCE_PAS_COMMENTLINE=4
+val SCE_PAS_PREPROCESSOR=5
+val SCE_PAS_PREPROCESSOR2=6
+val SCE_PAS_NUMBER=7
+val SCE_PAS_HEXNUMBER=8
+val SCE_PAS_WORD=9
+val SCE_PAS_STRING=10
+val SCE_PAS_STRINGEOL=11
+val SCE_PAS_CHARACTER=12
+val SCE_PAS_OPERATOR=13
+val SCE_PAS_ASM=14
+# Lexical state for SCLEX_SORCUS
+lex SORCUS=SCLEX_SORCUS SCE_SORCUS_
+val SCE_SORCUS_DEFAULT=0
+val SCE_SORCUS_COMMAND=1
+val SCE_SORCUS_PARAMETER=2
+val SCE_SORCUS_COMMENTLINE=3
+val SCE_SORCUS_STRING=4
+val SCE_SORCUS_STRINGEOL=5
+val SCE_SORCUS_IDENTIFIER=6
+val SCE_SORCUS_OPERATOR=7
+val SCE_SORCUS_NUMBER=8
+val SCE_SORCUS_CONSTANT=9
+# Lexical state for SCLEX_POWERPRO
+lex PowerPro=SCLEX_POWERPRO SCE_POWERPRO_
+val SCE_POWERPRO_DEFAULT=0
+val SCE_POWERPRO_COMMENTBLOCK=1
+val SCE_POWERPRO_COMMENTLINE=2
+val SCE_POWERPRO_NUMBER=3
+val SCE_POWERPRO_WORD=4
+val SCE_POWERPRO_WORD2=5
+val SCE_POWERPRO_WORD3=6
+val SCE_POWERPRO_WORD4=7
+val SCE_POWERPRO_DOUBLEQUOTEDSTRING=8
+val SCE_POWERPRO_SINGLEQUOTEDSTRING=9
+val SCE_POWERPRO_LINECONTINUE=10
+val SCE_POWERPRO_OPERATOR=11
+val SCE_POWERPRO_IDENTIFIER=12
+val SCE_POWERPRO_STRINGEOL=13
+val SCE_POWERPRO_VERBATIM=14
+val SCE_POWERPRO_ALTQUOTE=15
+val SCE_POWERPRO_FUNCTION=16
+# Lexical states for SCLEX_SML
+lex SML=SCLEX_SML SCE_SML_
+val SCE_SML_DEFAULT=0
+val SCE_SML_IDENTIFIER=1
+val SCE_SML_TAGNAME=2
+val SCE_SML_KEYWORD=3
+val SCE_SML_KEYWORD2=4
+val SCE_SML_KEYWORD3=5
+val SCE_SML_LINENUM=6
+val SCE_SML_OPERATOR=7
+val SCE_SML_NUMBER=8
+val SCE_SML_CHAR=9
+val SCE_SML_STRING=11
+val SCE_SML_COMMENT=12
+val SCE_SML_COMMENT1=13
+val SCE_SML_COMMENT2=14
+val SCE_SML_COMMENT3=15
+# Lexical state for SCLEX_MARKDOWN
+lex Markdown=SCLEX_MARKDOWN SCE_MARKDOWN_
+val SCE_MARKDOWN_DEFAULT=0
+val SCE_MARKDOWN_LINE_BEGIN=1
+val SCE_MARKDOWN_STRONG1=2
+val SCE_MARKDOWN_STRONG2=3
+val SCE_MARKDOWN_EM1=4
+val SCE_MARKDOWN_EM2=5
+val SCE_MARKDOWN_HEADER1=6
+val SCE_MARKDOWN_HEADER2=7
+val SCE_MARKDOWN_HEADER3=8
+val SCE_MARKDOWN_HEADER4=9
+val SCE_MARKDOWN_HEADER5=10
+val SCE_MARKDOWN_HEADER6=11
+val SCE_MARKDOWN_PRECHAR=12
+val SCE_MARKDOWN_ULIST_ITEM=13
+val SCE_MARKDOWN_OLIST_ITEM=14
+val SCE_MARKDOWN_BLOCKQUOTE=15
+val SCE_MARKDOWN_STRIKEOUT=16
+val SCE_MARKDOWN_HRULE=17
+val SCE_MARKDOWN_LINK=18
+val SCE_MARKDOWN_CODE=19
+val SCE_MARKDOWN_CODE2=20
+val SCE_MARKDOWN_CODEBK=21
+# Lexical state for SCLEX_TXT2TAGS
+lex Txt2tags=SCLEX_TXT2TAGS SCE_TXT2TAGS_
+val SCE_TXT2TAGS_DEFAULT=0
+val SCE_TXT2TAGS_LINE_BEGIN=1
+val SCE_TXT2TAGS_STRONG1=2
+val SCE_TXT2TAGS_STRONG2=3
+val SCE_TXT2TAGS_EM1=4
+val SCE_TXT2TAGS_EM2=5
+val SCE_TXT2TAGS_HEADER1=6
+val SCE_TXT2TAGS_HEADER2=7
+val SCE_TXT2TAGS_HEADER3=8
+val SCE_TXT2TAGS_HEADER4=9
+val SCE_TXT2TAGS_HEADER5=10
+val SCE_TXT2TAGS_HEADER6=11
+val SCE_TXT2TAGS_PRECHAR=12
+val SCE_TXT2TAGS_ULIST_ITEM=13
+val SCE_TXT2TAGS_OLIST_ITEM=14
+val SCE_TXT2TAGS_BLOCKQUOTE=15
+val SCE_TXT2TAGS_STRIKEOUT=16
+val SCE_TXT2TAGS_HRULE=17
+val SCE_TXT2TAGS_LINK=18
+val SCE_TXT2TAGS_CODE=19
+val SCE_TXT2TAGS_CODE2=20
+val SCE_TXT2TAGS_CODEBK=21
+val SCE_TXT2TAGS_COMMENT=22
+val SCE_TXT2TAGS_OPTION=23
+val SCE_TXT2TAGS_PREPROC=24
+val SCE_TXT2TAGS_POSTPROC=25
+# Lexical states for SCLEX_A68K
+lex A68k=SCLEX_A68K SCE_A68K_
+val SCE_A68K_DEFAULT=0
+val SCE_A68K_COMMENT=1
+val SCE_A68K_NUMBER_DEC=2
+val SCE_A68K_NUMBER_BIN=3
+val SCE_A68K_NUMBER_HEX=4
+val SCE_A68K_STRING1=5
+val SCE_A68K_OPERATOR=6
+val SCE_A68K_CPUINSTRUCTION=7
+val SCE_A68K_EXTINSTRUCTION=8
+val SCE_A68K_REGISTER=9
+val SCE_A68K_DIRECTIVE=10
+val SCE_A68K_MACRO_ARG=11
+val SCE_A68K_LABEL=12
+val SCE_A68K_STRING2=13
+val SCE_A68K_IDENTIFIER=14
+val SCE_A68K_MACRO_DECLARATION=15
+val SCE_A68K_COMMENT_WORD=16
+val SCE_A68K_COMMENT_SPECIAL=17
+val SCE_A68K_COMMENT_DOXYGEN=18
+# Lexical states for SCLEX_MODULA
+lex Modula=SCLEX_MODULA SCE_MODULA_
+val SCE_MODULA_DEFAULT=0
+val SCE_MODULA_COMMENT=1
+val SCE_MODULA_DOXYCOMM=2
+val SCE_MODULA_DOXYKEY=3
+val SCE_MODULA_KEYWORD=4
+val SCE_MODULA_RESERVED=5
+val SCE_MODULA_NUMBER=6
+val SCE_MODULA_BASENUM=7
+val SCE_MODULA_FLOAT=8
+val SCE_MODULA_STRING=9
+val SCE_MODULA_STRSPEC=10
+val SCE_MODULA_CHAR=11
+val SCE_MODULA_CHARSPEC=12
+val SCE_MODULA_PROC=13
+val SCE_MODULA_PRAGMA=14
+val SCE_MODULA_PRGKEY=15
+val SCE_MODULA_OPERATOR=16
+val SCE_MODULA_BADSTR=17
+# Lexical states for SCLEX_COFFEESCRIPT
+lex CoffeeScript=SCLEX_COFFEESCRIPT SCE_COFFEESCRIPT_
+val SCE_COFFEESCRIPT_DEFAULT=0
+val SCE_COFFEESCRIPT_COMMENT=1
+val SCE_COFFEESCRIPT_COMMENTLINE=2
+val SCE_COFFEESCRIPT_COMMENTDOC=3
+val SCE_COFFEESCRIPT_NUMBER=4
+val SCE_COFFEESCRIPT_WORD=5
+val SCE_COFFEESCRIPT_STRING=6
+val SCE_COFFEESCRIPT_CHARACTER=7
+val SCE_COFFEESCRIPT_UUID=8
+val SCE_COFFEESCRIPT_PREPROCESSOR=9
+val SCE_COFFEESCRIPT_OPERATOR=10
+val SCE_COFFEESCRIPT_IDENTIFIER=11
+val SCE_COFFEESCRIPT_STRINGEOL=12
+val SCE_COFFEESCRIPT_VERBATIM=13
+val SCE_COFFEESCRIPT_REGEX=14
+val SCE_COFFEESCRIPT_COMMENTLINEDOC=15
+val SCE_COFFEESCRIPT_WORD2=16
+val SCE_COFFEESCRIPT_COMMENTDOCKEYWORD=17
+val SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR=18
+val SCE_COFFEESCRIPT_GLOBALCLASS=19
+val SCE_COFFEESCRIPT_STRINGRAW=20
+val SCE_COFFEESCRIPT_TRIPLEVERBATIM=21
+val SCE_COFFEESCRIPT_COMMENTBLOCK=22
+val SCE_COFFEESCRIPT_VERBOSE_REGEX=23
+val SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT=24
+val SCE_COFFEESCRIPT_INSTANCEPROPERTY=25
+# Lexical states for SCLEX_AVS
+lex AVS=SCLEX_AVS SCE_AVS_
+val SCE_AVS_DEFAULT=0
+val SCE_AVS_COMMENTBLOCK=1
+val SCE_AVS_COMMENTBLOCKN=2
+val SCE_AVS_COMMENTLINE=3
+val SCE_AVS_NUMBER=4
+val SCE_AVS_OPERATOR=5
+val SCE_AVS_IDENTIFIER=6
+val SCE_AVS_STRING=7
+val SCE_AVS_TRIPLESTRING=8
+val SCE_AVS_KEYWORD=9
+val SCE_AVS_FILTER=10
+val SCE_AVS_PLUGIN=11
+val SCE_AVS_FUNCTION=12
+val SCE_AVS_CLIPPROP=13
+val SCE_AVS_USERDFN=14
+# Lexical states for SCLEX_ECL
+lex ECL=SCLEX_ECL SCE_ECL_
+val SCE_ECL_DEFAULT=0
+val SCE_ECL_COMMENT=1
+val SCE_ECL_COMMENTLINE=2
+val SCE_ECL_NUMBER=3
+val SCE_ECL_STRING=4
+val SCE_ECL_WORD0=5
+val SCE_ECL_OPERATOR=6
+val SCE_ECL_CHARACTER=7
+val SCE_ECL_UUID=8
+val SCE_ECL_PREPROCESSOR=9
+val SCE_ECL_UNKNOWN=10
+val SCE_ECL_IDENTIFIER=11
+val SCE_ECL_STRINGEOL=12
+val SCE_ECL_VERBATIM=13
+val SCE_ECL_REGEX=14
+val SCE_ECL_COMMENTLINEDOC=15
+val SCE_ECL_WORD1=16
+val SCE_ECL_COMMENTDOCKEYWORD=17
+val SCE_ECL_COMMENTDOCKEYWORDERROR=18
+val SCE_ECL_WORD2=19
+val SCE_ECL_WORD3=20
+val SCE_ECL_WORD4=21
+val SCE_ECL_WORD5=22
+val SCE_ECL_COMMENTDOC=23
+val SCE_ECL_ADDED=24
+val SCE_ECL_DELETED=25
+val SCE_ECL_CHANGED=26
+val SCE_ECL_MOVED=27
+# Lexical states for SCLEX_OSCRIPT
+lex OScript=SCLEX_OSCRIPT SCE_OSCRIPT_
+val SCE_OSCRIPT_DEFAULT=0
+val SCE_OSCRIPT_LINE_COMMENT=1
+val SCE_OSCRIPT_BLOCK_COMMENT=2
+val SCE_OSCRIPT_DOC_COMMENT=3
+val SCE_OSCRIPT_PREPROCESSOR=4
+val SCE_OSCRIPT_NUMBER=5
+val SCE_OSCRIPT_SINGLEQUOTE_STRING=6
+val SCE_OSCRIPT_DOUBLEQUOTE_STRING=7
+val SCE_OSCRIPT_CONSTANT=8
+val SCE_OSCRIPT_IDENTIFIER=9
+val SCE_OSCRIPT_GLOBAL=10
+val SCE_OSCRIPT_KEYWORD=11
+val SCE_OSCRIPT_OPERATOR=12
+val SCE_OSCRIPT_LABEL=13
+val SCE_OSCRIPT_TYPE=14
+val SCE_OSCRIPT_FUNCTION=15
+val SCE_OSCRIPT_OBJECT=16
+val SCE_OSCRIPT_PROPERTY=17
+val SCE_OSCRIPT_METHOD=18
+# Lexical states for SCLEX_VISUALPROLOG
+lex VisualProlog=SCLEX_VISUALPROLOG SCE_VISUALPROLOG_
+val SCE_VISUALPROLOG_DEFAULT=0
+val SCE_VISUALPROLOG_KEY_MAJOR=1
+val SCE_VISUALPROLOG_KEY_MINOR=2
+val SCE_VISUALPROLOG_KEY_DIRECTIVE=3
+val SCE_VISUALPROLOG_COMMENT_BLOCK=4
+val SCE_VISUALPROLOG_COMMENT_LINE=5
+val SCE_VISUALPROLOG_COMMENT_KEY=6
+val SCE_VISUALPROLOG_COMMENT_KEY_ERROR=7
+val SCE_VISUALPROLOG_IDENTIFIER=8
+val SCE_VISUALPROLOG_VARIABLE=9
+val SCE_VISUALPROLOG_ANONYMOUS=10
+val SCE_VISUALPROLOG_NUMBER=11
+val SCE_VISUALPROLOG_OPERATOR=12
+val SCE_VISUALPROLOG_CHARACTER=13
+val SCE_VISUALPROLOG_CHARACTER_TOO_MANY=14
+val SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR=15
+val SCE_VISUALPROLOG_STRING=16
+val SCE_VISUALPROLOG_STRING_ESCAPE=17
+val SCE_VISUALPROLOG_STRING_ESCAPE_ERROR=18
+val SCE_VISUALPROLOG_STRING_EOL_OPEN=19
+val SCE_VISUALPROLOG_STRING_VERBATIM=20
+val SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL=21
+val SCE_VISUALPROLOG_STRING_VERBATIM_EOL=22
+# Lexical states for SCLEX_STTXT
+lex StructuredText=SCLEX_STTXT SCE_STTXT_
+val SCE_STTXT_DEFAULT=0
+val SCE_STTXT_COMMENT=1
+val SCE_STTXT_COMMENTLINE=2
+val SCE_STTXT_KEYWORD=3
+val SCE_STTXT_TYPE=4
+val SCE_STTXT_FUNCTION=5
+val SCE_STTXT_FB=6
+val SCE_STTXT_NUMBER=7
+val SCE_STTXT_HEXNUMBER=8
+val SCE_STTXT_PRAGMA=9
+val SCE_STTXT_OPERATOR=10
+val SCE_STTXT_CHARACTER=11
+val SCE_STTXT_STRING1=12
+val SCE_STTXT_STRING2=13
+val SCE_STTXT_STRINGEOL=14
+val SCE_STTXT_IDENTIFIER=15
+val SCE_STTXT_DATETIME=16
+val SCE_STTXT_VARS=17
+val SCE_STTXT_PRAGMAS=18
+# Lexical states for SCLEX_KVIRC
+lex KVIrc=SCLEX_KVIRC SCE_KVIRC_
+val SCE_KVIRC_DEFAULT=0
+val SCE_KVIRC_COMMENT=1
+val SCE_KVIRC_COMMENTBLOCK=2
+val SCE_KVIRC_STRING=3
+val SCE_KVIRC_WORD=4
+val SCE_KVIRC_KEYWORD=5
+val SCE_KVIRC_FUNCTION_KEYWORD=6
+val SCE_KVIRC_FUNCTION=7
+val SCE_KVIRC_VARIABLE=8
+val SCE_KVIRC_NUMBER=9
+val SCE_KVIRC_OPERATOR=10
+val SCE_KVIRC_STRING_FUNCTION=11
+val SCE_KVIRC_STRING_VARIABLE=12
+# Lexical states for SCLEX_RUST
+lex Rust=SCLEX_RUST SCE_RUST_
+val SCE_RUST_DEFAULT=0
+val SCE_RUST_COMMENTBLOCK=1
+val SCE_RUST_COMMENTLINE=2
+val SCE_RUST_COMMENTBLOCKDOC=3
+val SCE_RUST_COMMENTLINEDOC=4
+val SCE_RUST_NUMBER=5
+val SCE_RUST_WORD=6
+val SCE_RUST_WORD2=7
+val SCE_RUST_WORD3=8
+val SCE_RUST_WORD4=9
+val SCE_RUST_WORD5=10
+val SCE_RUST_WORD6=11
+val SCE_RUST_WORD7=12
+val SCE_RUST_STRING=13
+val SCE_RUST_STRINGR=14
+val SCE_RUST_CHARACTER=15
+val SCE_RUST_OPERATOR=16
+val SCE_RUST_IDENTIFIER=17
+val SCE_RUST_LIFETIME=18
+val SCE_RUST_MACRO=19
+val SCE_RUST_LEXERROR=20
+val SCE_RUST_BYTESTRING=21
+val SCE_RUST_BYTESTRINGR=22
+val SCE_RUST_BYTECHARACTER=23
+# Lexical states for SCLEX_DMAP
+lex DMAP=SCLEX_DMAP SCE_DMAP_
+val SCE_DMAP_DEFAULT=0
+val SCE_DMAP_COMMENT=1
+val SCE_DMAP_NUMBER=2
+val SCE_DMAP_STRING1=3
+val SCE_DMAP_STRING2=4
+val SCE_DMAP_STRINGEOL=5
+val SCE_DMAP_OPERATOR=6
+val SCE_DMAP_IDENTIFIER=7
+val SCE_DMAP_WORD=8
+val SCE_DMAP_WORD2=9
+val SCE_DMAP_WORD3=10
+# Lexical states for SCLEX_DMIS
+lex DMIS=SCLEX_DMIS SCE_DMIS_
+val SCE_DMIS_DEFAULT=0
+val SCE_DMIS_COMMENT=1
+val SCE_DMIS_STRING=2
+val SCE_DMIS_NUMBER=3
+val SCE_DMIS_KEYWORD=4
+val SCE_DMIS_MAJORWORD=5
+val SCE_DMIS_MINORWORD=6
+val SCE_DMIS_UNSUPPORTED_MAJOR=7
+val SCE_DMIS_UNSUPPORTED_MINOR=8
+val SCE_DMIS_LABEL=9
+# Lexical states for SCLEX_REGISTRY
+lex REG=SCLEX_REGISTRY SCE_REG_
+val SCE_REG_DEFAULT=0
+val SCE_REG_COMMENT=1
+val SCE_REG_VALUENAME=2
+val SCE_REG_STRING=3
+val SCE_REG_HEXDIGIT=4
+val SCE_REG_VALUETYPE=5
+val SCE_REG_ADDEDKEY=6
+val SCE_REG_DELETEDKEY=7
+val SCE_REG_ESCAPED=8
+val SCE_REG_KEYPATH_GUID=9
+val SCE_REG_STRING_GUID=10
+val SCE_REG_PARAMETER=11
+val SCE_REG_OPERATOR=12
+# Lexical state for SCLEX_BIBTEX
+lex BibTeX=SCLEX_BIBTEX SCE_BIBTEX_
+val SCE_BIBTEX_DEFAULT=0
+val SCE_BIBTEX_ENTRY=1
+val SCE_BIBTEX_UNKNOWN_ENTRY=2
+val SCE_BIBTEX_KEY=3
+val SCE_BIBTEX_PARAMETER=4
+val SCE_BIBTEX_VALUE=5
+val SCE_BIBTEX_COMMENT=6
+# Lexical state for SCLEX_SREC
+lex Srec=SCLEX_SREC SCE_HEX_
+val SCE_HEX_DEFAULT=0
+val SCE_HEX_RECSTART=1
+val SCE_HEX_RECTYPE=2
+val SCE_HEX_RECTYPE_UNKNOWN=3
+val SCE_HEX_BYTECOUNT=4
+val SCE_HEX_BYTECOUNT_WRONG=5
+val SCE_HEX_NOADDRESS=6
+val SCE_HEX_DATAADDRESS=7
+val SCE_HEX_RECCOUNT=8
+val SCE_HEX_STARTADDRESS=9
+val SCE_HEX_ADDRESSFIELD_UNKNOWN=10
+val SCE_HEX_EXTENDEDADDRESS=11
+val SCE_HEX_DATA_ODD=12
+val SCE_HEX_DATA_EVEN=13
+val SCE_HEX_DATA_UNKNOWN=14
+val SCE_HEX_DATA_EMPTY=15
+val SCE_HEX_CHECKSUM=16
+val SCE_HEX_CHECKSUM_WRONG=17
+val SCE_HEX_GARBAGE=18
+# Lexical state for SCLEX_IHEX (shared with Srec)
+lex IHex=SCLEX_IHEX SCE_HEX_
+# Lexical state for SCLEX_TEHEX (shared with Srec)
+lex TEHex=SCLEX_TEHEX SCE_HEX_
+# Lexical states for SCLEX_JSON
+lex JSON=SCLEX_JSON SCE_JSON_
+val SCE_JSON_DEFAULT=0
+val SCE_JSON_NUMBER=1
+val SCE_JSON_STRING=2
+val SCE_JSON_STRINGEOL=3
+val SCE_JSON_PROPERTYNAME=4
+val SCE_JSON_ESCAPESEQUENCE=5
+val SCE_JSON_LINECOMMENT=6
+val SCE_JSON_BLOCKCOMMENT=7
+val SCE_JSON_OPERATOR=8
+val SCE_JSON_URI=9
+val SCE_JSON_COMPACTIRI=10
+val SCE_JSON_KEYWORD=11
+val SCE_JSON_LDKEYWORD=12
+val SCE_JSON_ERROR=13
+lex EDIFACT=SCLEX_EDIFACT SCE_EDI_
+val SCE_EDI_DEFAULT=0
+val SCE_EDI_SEGMENTSTART=1
+val SCE_EDI_SEGMENTEND=2
+val SCE_EDI_SEP_ELEMENT=3
+val SCE_EDI_SEP_COMPOSITE=4
+val SCE_EDI_SEP_RELEASE=5
+val SCE_EDI_UNA=6
+val SCE_EDI_UNH=7
+val SCE_EDI_BADSEGMENT=8
+# Lexical states for SCLEX_STATA
+lex STATA=SCLEX_STATA SCE_STATA_
+val SCE_STATA_DEFAULT=0
+val SCE_STATA_COMMENT=1
+val SCE_STATA_COMMENTLINE=2
+val SCE_STATA_COMMENTBLOCK=3
+val SCE_STATA_NUMBER=4
+val SCE_STATA_OPERATOR=5
+val SCE_STATA_IDENTIFIER=6
+val SCE_STATA_STRING=7
+val SCE_STATA_TYPE=8
+val SCE_STATA_WORD=9
+val SCE_STATA_GLOBAL_MACRO=10
+val SCE_STATA_MACRO=11
+# Lexical states for SCLEX_SAS
+lex SAS=SCLEX_SAS SCE_SAS_
+val SCE_SAS_DEFAULT=0
+val SCE_SAS_COMMENT=1
+val SCE_SAS_COMMENTLINE=2
+val SCE_SAS_COMMENTBLOCK=3
+val SCE_SAS_NUMBER=4
+val SCE_SAS_OPERATOR=5
+val SCE_SAS_IDENTIFIER=6
+val SCE_SAS_STRING=7
+val SCE_SAS_TYPE=8
+val SCE_SAS_WORD=9
+val SCE_SAS_GLOBAL_MACRO=10
+val SCE_SAS_MACRO=11
+val SCE_SAS_MACRO_KEYWORD=12
+val SCE_SAS_BLOCK_KEYWORD=13
+val SCE_SAS_MACRO_FUNCTION=14
+val SCE_SAS_STATEMENT=15
+# Lexical states for SCLEX_NIM
+lex Nim=SCLEX_NIM SCE_NIM_
+val SCE_NIM_DEFAULT=0
+val SCE_NIM_COMMENT=1
+val SCE_NIM_COMMENTDOC=2
+val SCE_NIM_COMMENTLINE=3
+val SCE_NIM_COMMENTLINEDOC=4
+val SCE_NIM_NUMBER=5
+val SCE_NIM_STRING=6
+val SCE_NIM_CHARACTER=7
+val SCE_NIM_WORD=8
+val SCE_NIM_TRIPLE=9
+val SCE_NIM_TRIPLEDOUBLE=10
+val SCE_NIM_BACKTICKS=11
+val SCE_NIM_FUNCNAME=12
+val SCE_NIM_STRINGEOL=13
+val SCE_NIM_NUMERROR=14
+val SCE_NIM_OPERATOR=15
+val SCE_NIM_IDENTIFIER=16
+# Lexical states for SCLEX_CIL
+lex CIL=SCLEX_CIL SCE_CIL_
+val SCE_CIL_DEFAULT=0
+val SCE_CIL_COMMENT=1
+val SCE_CIL_COMMENTLINE=2
+val SCE_CIL_WORD=3
+val SCE_CIL_WORD2=4
+val SCE_CIL_WORD3=5
+val SCE_CIL_STRING=6
+val SCE_CIL_LABEL=7
+val SCE_CIL_OPERATOR=8
+val SCE_CIL_IDENTIFIER=9
+val SCE_CIL_STRINGEOL=10
+# Lexical states for SCLEX_X12
+lex X12=SCLEX_X12 SCE_X12_
+val SCE_X12_DEFAULT=0
+val SCE_X12_BAD=1
+val SCE_X12_ENVELOPE=2
+val SCE_X12_FUNCTIONGROUP=3
+val SCE_X12_TRANSACTIONSET=4
+val SCE_X12_SEGMENTHEADER=5
+val SCE_X12_SEGMENTEND=6
+val SCE_X12_SEP_ELEMENT=7
+val SCE_X12_SEP_SUBELEMENT=8
+# Lexical states for SCLEX_DATAFLEX
+lex Dataflex=SCLEX_DATAFLEX SCE_DF_
+val SCE_DF_DEFAULT=0
+val SCE_DF_IDENTIFIER=1
+val SCE_DF_METATAG=2
+val SCE_DF_IMAGE=3
+val SCE_DF_COMMENTLINE=4
+val SCE_DF_PREPROCESSOR=5
+val SCE_DF_PREPROCESSOR2=6
+val SCE_DF_NUMBER=7
+val SCE_DF_HEXNUMBER=8
+val SCE_DF_WORD=9
+val SCE_DF_STRING=10
+val SCE_DF_STRINGEOL=11
+val SCE_DF_SCOPEWORD=12
+val SCE_DF_OPERATOR=13
+val SCE_DF_ICODE=14
+# Lexical states for SCLEX_HOLLYWOOD
+lex Hollywood=SCLEX_HOLLYWOOD SCE_HOLLYWOOD_
+val SCE_HOLLYWOOD_DEFAULT=0
+val SCE_HOLLYWOOD_COMMENT=1
+val SCE_HOLLYWOOD_COMMENTBLOCK=2
+val SCE_HOLLYWOOD_NUMBER=3
+val SCE_HOLLYWOOD_KEYWORD=4
+val SCE_HOLLYWOOD_STDAPI=5
+val SCE_HOLLYWOOD_PLUGINAPI=6
+val SCE_HOLLYWOOD_PLUGINMETHOD=7
+val SCE_HOLLYWOOD_STRING=8
+val SCE_HOLLYWOOD_STRINGBLOCK=9
+val SCE_HOLLYWOOD_PREPROCESSOR=10
+val SCE_HOLLYWOOD_OPERATOR=11
+val SCE_HOLLYWOOD_IDENTIFIER=12
+val SCE_HOLLYWOOD_CONSTANT=13
+val SCE_HOLLYWOOD_HEXNUMBER=14
+# Lexical states for SCLEX_RAKU
+lex Raku=SCLEX_RAKU SCE_RAKU_
+val SCE_RAKU_DEFAULT=0
+val SCE_RAKU_ERROR=1
+val SCE_RAKU_COMMENTLINE=2
+val SCE_RAKU_COMMENTEMBED=3
+val SCE_RAKU_POD=4
+val SCE_RAKU_CHARACTER=5
+val SCE_RAKU_HEREDOC_Q=6
+val SCE_RAKU_HEREDOC_QQ=7
+val SCE_RAKU_STRING=8
+val SCE_RAKU_STRING_Q=9
+val SCE_RAKU_STRING_QQ=10
+val SCE_RAKU_STRING_Q_LANG=11
+val SCE_RAKU_STRING_VAR=12
+val SCE_RAKU_REGEX=13
+val SCE_RAKU_REGEX_VAR=14
+val SCE_RAKU_ADVERB=15
+val SCE_RAKU_NUMBER=16
+val SCE_RAKU_PREPROCESSOR=17
+val SCE_RAKU_OPERATOR=18
+val SCE_RAKU_WORD=19
+val SCE_RAKU_FUNCTION=20
+val SCE_RAKU_IDENTIFIER=21
+val SCE_RAKU_TYPEDEF=22
+val SCE_RAKU_MU=23
+val SCE_RAKU_POSITIONAL=24
+val SCE_RAKU_ASSOCIATIVE=25
+val SCE_RAKU_CALLABLE=26
+val SCE_RAKU_GRAMMAR=27
+val SCE_RAKU_CLASS=28
+# Lexical states for SCLEX_FSHARP
+lex FSharp=SCLEX_FSHARP SCE_FSHARP_
+val SCE_FSHARP_DEFAULT=0
+val SCE_FSHARP_KEYWORD=1
+val SCE_FSHARP_KEYWORD2=2
+val SCE_FSHARP_KEYWORD3=3
+val SCE_FSHARP_KEYWORD4=4
+val SCE_FSHARP_KEYWORD5=5
+val SCE_FSHARP_IDENTIFIER=6
+val SCE_FSHARP_QUOT_IDENTIFIER=7
+val SCE_FSHARP_COMMENT=8
+val SCE_FSHARP_COMMENTLINE=9
+val SCE_FSHARP_PREPROCESSOR=10
+val SCE_FSHARP_LINENUM=11
+val SCE_FSHARP_OPERATOR=12
+val SCE_FSHARP_NUMBER=13
+val SCE_FSHARP_CHARACTER=14
+val SCE_FSHARP_STRING=15
+val SCE_FSHARP_VERBATIM=16
+val SCE_FSHARP_QUOTATION=17
+val SCE_FSHARP_ATTRIBUTE=18
+val SCE_FSHARP_FORMAT_SPEC=19
diff --git a/scite-app/lexilla/include/Lexilla.h b/scite-app/lexilla/include/Lexilla.h
new file mode 100644
index 0000000..4a1a3be
--- /dev/null
+++ b/scite-app/lexilla/include/Lexilla.h
@@ -0,0 +1,108 @@
+// Lexilla lexer library
+/** @file Lexilla.h
+ ** Lexilla definitions for dynamic and static linking.
+ ** For C++, more features and type safety are available with the LexillaAccess module.
+ **/
+// Copyright 2020 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXILLA_H
+#define LEXILLA_H
+
+// Define the default Lexilla shared library name for each platform
+#if _WIN32
+#define LEXILLA_LIB "lexilla"
+#define LEXILLA_EXTENSION ".dll"
+#else
+#define LEXILLA_LIB "liblexilla"
+#if defined(__APPLE__)
+#define LEXILLA_EXTENSION ".dylib"
+#else
+#define LEXILLA_EXTENSION ".so"
+#endif
+#endif
+
+// On Win32 use the stdcall calling convention otherwise use the standard calling convention
+#if _WIN32
+#define LEXILLA_CALL __stdcall
+#else
+#define LEXILLA_CALL
+#endif
+
+#if defined(__OBJC2__)
+// Objective C(++) treats '[' as a message expression.
+#define DEPRECATE_DEFINITION
+#elif defined(__cplusplus)
+#define DEPRECATE_DEFINITION [[deprecated]]
+#elif defined(__GNUC__) || defined(__clang__)
+#define DEPRECATE_DEFINITION __attribute__((deprecated))
+#else
+// MSVC __declspec(deprecated) has different positioning rules to GCC so define to nothing
+#define DEPRECATE_DEFINITION
+#endif
+
+#ifdef __cplusplus
+// Must have already included ILexer.h to have Scintilla::ILexer5 defined.
+using Scintilla::ILexer5;
+#else
+typedef void ILexer5;
+#endif
+
+typedef ILexer5 *(*LexerFactoryFunction)();
+
+#ifdef __cplusplus
+namespace Lexilla {
+#endif
+
+typedef int (LEXILLA_CALL *GetLexerCountFn)();
+typedef void (LEXILLA_CALL *GetLexerNameFn)(unsigned int Index, char *name, int buflength);
+typedef LexerFactoryFunction(LEXILLA_CALL *GetLexerFactoryFn)(unsigned int Index);
+typedef ILexer5*(LEXILLA_CALL *CreateLexerFn)(const char *name);
+DEPRECATE_DEFINITION typedef const char *(LEXILLA_CALL *LexerNameFromIDFn)(int identifier);
+typedef const char *(LEXILLA_CALL *GetLibraryPropertyNamesFn)();
+typedef void(LEXILLA_CALL *SetLibraryPropertyFn)(const char *key, const char *value);
+typedef const char *(LEXILLA_CALL *GetNameSpaceFn)();
+
+#ifdef __cplusplus
+}
+#endif
+
+#define LEXILLA_NAMESPACE_SEPARATOR '.'
+
+#define LEXILLA_GETLEXERCOUNT "GetLexerCount"
+#define LEXILLA_GETLEXERNAME "GetLexerName"
+#define LEXILLA_GETLEXERFACTORY "GetLexerFactory"
+#define LEXILLA_CREATELEXER "CreateLexer"
+#define LEXILLA_LEXERNAMEFROMID "LexerNameFromID"
+#define LEXILLA_GETLIBRARYPROPERTYNAMES "GetLibraryPropertyNames"
+#define LEXILLA_SETLIBRARYPROPERTY "SetLibraryProperty"
+#define LEXILLA_GETNAMESPACE "GetNameSpace"
+
+// Static linking prototypes
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ILexer5 * LEXILLA_CALL CreateLexer(const char *name);
+int LEXILLA_CALL GetLexerCount();
+void LEXILLA_CALL GetLexerName(unsigned int index, char *name, int buflength);
+LexerFactoryFunction LEXILLA_CALL GetLexerFactory(unsigned int index);
+DEPRECATE_DEFINITION const char *LEXILLA_CALL LexerNameFromID(int identifier);
+const char * LEXILLA_CALL GetLibraryPropertyNames();
+void LEXILLA_CALL SetLibraryProperty(const char *key, const char *value);
+const char *LEXILLA_CALL GetNameSpace();
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+namespace Lexilla {
+	class LexerModule;
+}
+// Add a static lexer (in the same binary) to Lexilla's list
+void AddStaticLexerModule(Lexilla::LexerModule *plm);
+#endif
+
+#endif
diff --git a/scite-app/lexilla/include/SciLexer.h b/scite-app/lexilla/include/SciLexer.h
new file mode 100644
index 0000000..762a466
--- /dev/null
+++ b/scite-app/lexilla/include/SciLexer.h
@@ -0,0 +1,2007 @@
+/* Scintilla source code edit control */
+/** @file SciLexer.h
+ ** Interface to the added lexer functions in the SciLexer version of the edit control.
+ **/
+/* Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
+
+#ifndef SCILEXER_H
+#define SCILEXER_H
+
+/* SciLexer features - not in standard Scintilla */
+
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+#define SCLEX_CONTAINER 0
+#define SCLEX_NULL 1
+#define SCLEX_PYTHON 2
+#define SCLEX_CPP 3
+#define SCLEX_HTML 4
+#define SCLEX_XML 5
+#define SCLEX_PERL 6
+#define SCLEX_SQL 7
+#define SCLEX_VB 8
+#define SCLEX_PROPERTIES 9
+#define SCLEX_ERRORLIST 10
+#define SCLEX_MAKEFILE 11
+#define SCLEX_BATCH 12
+#define SCLEX_XCODE 13
+#define SCLEX_LATEX 14
+#define SCLEX_LUA 15
+#define SCLEX_DIFF 16
+#define SCLEX_CONF 17
+#define SCLEX_PASCAL 18
+#define SCLEX_AVE 19
+#define SCLEX_ADA 20
+#define SCLEX_LISP 21
+#define SCLEX_RUBY 22
+#define SCLEX_EIFFEL 23
+#define SCLEX_EIFFELKW 24
+#define SCLEX_TCL 25
+#define SCLEX_NNCRONTAB 26
+#define SCLEX_BULLANT 27
+#define SCLEX_VBSCRIPT 28
+#define SCLEX_BAAN 31
+#define SCLEX_MATLAB 32
+#define SCLEX_SCRIPTOL 33
+#define SCLEX_ASM 34
+#define SCLEX_CPPNOCASE 35
+#define SCLEX_FORTRAN 36
+#define SCLEX_F77 37
+#define SCLEX_CSS 38
+#define SCLEX_POV 39
+#define SCLEX_LOUT 40
+#define SCLEX_ESCRIPT 41
+#define SCLEX_PS 42
+#define SCLEX_NSIS 43
+#define SCLEX_MMIXAL 44
+#define SCLEX_CLW 45
+#define SCLEX_CLWNOCASE 46
+#define SCLEX_LOT 47
+#define SCLEX_YAML 48
+#define SCLEX_TEX 49
+#define SCLEX_METAPOST 50
+#define SCLEX_POWERBASIC 51
+#define SCLEX_FORTH 52
+#define SCLEX_ERLANG 53
+#define SCLEX_OCTAVE 54
+#define SCLEX_MSSQL 55
+#define SCLEX_VERILOG 56
+#define SCLEX_KIX 57
+#define SCLEX_GUI4CLI 58
+#define SCLEX_SPECMAN 59
+#define SCLEX_AU3 60
+#define SCLEX_APDL 61
+#define SCLEX_BASH 62
+#define SCLEX_ASN1 63
+#define SCLEX_VHDL 64
+#define SCLEX_CAML 65
+#define SCLEX_BLITZBASIC 66
+#define SCLEX_PUREBASIC 67
+#define SCLEX_HASKELL 68
+#define SCLEX_PHPSCRIPT 69
+#define SCLEX_TADS3 70
+#define SCLEX_REBOL 71
+#define SCLEX_SMALLTALK 72
+#define SCLEX_FLAGSHIP 73
+#define SCLEX_CSOUND 74
+#define SCLEX_FREEBASIC 75
+#define SCLEX_INNOSETUP 76
+#define SCLEX_OPAL 77
+#define SCLEX_SPICE 78
+#define SCLEX_D 79
+#define SCLEX_CMAKE 80
+#define SCLEX_GAP 81
+#define SCLEX_PLM 82
+#define SCLEX_PROGRESS 83
+#define SCLEX_ABAQUS 84
+#define SCLEX_ASYMPTOTE 85
+#define SCLEX_R 86
+#define SCLEX_MAGIK 87
+#define SCLEX_POWERSHELL 88
+#define SCLEX_MYSQL 89
+#define SCLEX_PO 90
+#define SCLEX_TAL 91
+#define SCLEX_COBOL 92
+#define SCLEX_TACL 93
+#define SCLEX_SORCUS 94
+#define SCLEX_POWERPRO 95
+#define SCLEX_NIMROD 96
+#define SCLEX_SML 97
+#define SCLEX_MARKDOWN 98
+#define SCLEX_TXT2TAGS 99
+#define SCLEX_A68K 100
+#define SCLEX_MODULA 101
+#define SCLEX_COFFEESCRIPT 102
+#define SCLEX_TCMD 103
+#define SCLEX_AVS 104
+#define SCLEX_ECL 105
+#define SCLEX_OSCRIPT 106
+#define SCLEX_VISUALPROLOG 107
+#define SCLEX_LITERATEHASKELL 108
+#define SCLEX_STTXT 109
+#define SCLEX_KVIRC 110
+#define SCLEX_RUST 111
+#define SCLEX_DMAP 112
+#define SCLEX_AS 113
+#define SCLEX_DMIS 114
+#define SCLEX_REGISTRY 115
+#define SCLEX_BIBTEX 116
+#define SCLEX_SREC 117
+#define SCLEX_IHEX 118
+#define SCLEX_TEHEX 119
+#define SCLEX_JSON 120
+#define SCLEX_EDIFACT 121
+#define SCLEX_INDENT 122
+#define SCLEX_MAXIMA 123
+#define SCLEX_STATA 124
+#define SCLEX_SAS 125
+#define SCLEX_NIM 126
+#define SCLEX_CIL 127
+#define SCLEX_X12 128
+#define SCLEX_DATAFLEX 129
+#define SCLEX_HOLLYWOOD 130
+#define SCLEX_RAKU 131
+#define SCLEX_FSHARP 132
+#define SCLEX_JULIA 133
+#define SCLEX_AUTOMATIC 1000
+#define SCE_P_DEFAULT 0
+#define SCE_P_COMMENTLINE 1
+#define SCE_P_NUMBER 2
+#define SCE_P_STRING 3
+#define SCE_P_CHARACTER 4
+#define SCE_P_WORD 5
+#define SCE_P_TRIPLE 6
+#define SCE_P_TRIPLEDOUBLE 7
+#define SCE_P_CLASSNAME 8
+#define SCE_P_DEFNAME 9
+#define SCE_P_OPERATOR 10
+#define SCE_P_IDENTIFIER 11
+#define SCE_P_COMMENTBLOCK 12
+#define SCE_P_STRINGEOL 13
+#define SCE_P_WORD2 14
+#define SCE_P_DECORATOR 15
+#define SCE_P_FSTRING 16
+#define SCE_P_FCHARACTER 17
+#define SCE_P_FTRIPLE 18
+#define SCE_P_FTRIPLEDOUBLE 19
+#define SCE_C_DEFAULT 0
+#define SCE_C_COMMENT 1
+#define SCE_C_COMMENTLINE 2
+#define SCE_C_COMMENTDOC 3
+#define SCE_C_NUMBER 4
+#define SCE_C_WORD 5
+#define SCE_C_STRING 6
+#define SCE_C_CHARACTER 7
+#define SCE_C_UUID 8
+#define SCE_C_PREPROCESSOR 9
+#define SCE_C_OPERATOR 10
+#define SCE_C_IDENTIFIER 11
+#define SCE_C_STRINGEOL 12
+#define SCE_C_VERBATIM 13
+#define SCE_C_REGEX 14
+#define SCE_C_COMMENTLINEDOC 15
+#define SCE_C_WORD2 16
+#define SCE_C_COMMENTDOCKEYWORD 17
+#define SCE_C_COMMENTDOCKEYWORDERROR 18
+#define SCE_C_GLOBALCLASS 19
+#define SCE_C_STRINGRAW 20
+#define SCE_C_TRIPLEVERBATIM 21
+#define SCE_C_HASHQUOTEDSTRING 22
+#define SCE_C_PREPROCESSORCOMMENT 23
+#define SCE_C_PREPROCESSORCOMMENTDOC 24
+#define SCE_C_USERLITERAL 25
+#define SCE_C_TASKMARKER 26
+#define SCE_C_ESCAPESEQUENCE 27
+#define SCE_D_DEFAULT 0
+#define SCE_D_COMMENT 1
+#define SCE_D_COMMENTLINE 2
+#define SCE_D_COMMENTDOC 3
+#define SCE_D_COMMENTNESTED 4
+#define SCE_D_NUMBER 5
+#define SCE_D_WORD 6
+#define SCE_D_WORD2 7
+#define SCE_D_WORD3 8
+#define SCE_D_TYPEDEF 9
+#define SCE_D_STRING 10
+#define SCE_D_STRINGEOL 11
+#define SCE_D_CHARACTER 12
+#define SCE_D_OPERATOR 13
+#define SCE_D_IDENTIFIER 14
+#define SCE_D_COMMENTLINEDOC 15
+#define SCE_D_COMMENTDOCKEYWORD 16
+#define SCE_D_COMMENTDOCKEYWORDERROR 17
+#define SCE_D_STRINGB 18
+#define SCE_D_STRINGR 19
+#define SCE_D_WORD5 20
+#define SCE_D_WORD6 21
+#define SCE_D_WORD7 22
+#define SCE_TCL_DEFAULT 0
+#define SCE_TCL_COMMENT 1
+#define SCE_TCL_COMMENTLINE 2
+#define SCE_TCL_NUMBER 3
+#define SCE_TCL_WORD_IN_QUOTE 4
+#define SCE_TCL_IN_QUOTE 5
+#define SCE_TCL_OPERATOR 6
+#define SCE_TCL_IDENTIFIER 7
+#define SCE_TCL_SUBSTITUTION 8
+#define SCE_TCL_SUB_BRACE 9
+#define SCE_TCL_MODIFIER 10
+#define SCE_TCL_EXPAND 11
+#define SCE_TCL_WORD 12
+#define SCE_TCL_WORD2 13
+#define SCE_TCL_WORD3 14
+#define SCE_TCL_WORD4 15
+#define SCE_TCL_WORD5 16
+#define SCE_TCL_WORD6 17
+#define SCE_TCL_WORD7 18
+#define SCE_TCL_WORD8 19
+#define SCE_TCL_COMMENT_BOX 20
+#define SCE_TCL_BLOCK_COMMENT 21
+#define SCE_H_DEFAULT 0
+#define SCE_H_TAG 1
+#define SCE_H_TAGUNKNOWN 2
+#define SCE_H_ATTRIBUTE 3
+#define SCE_H_ATTRIBUTEUNKNOWN 4
+#define SCE_H_NUMBER 5
+#define SCE_H_DOUBLESTRING 6
+#define SCE_H_SINGLESTRING 7
+#define SCE_H_OTHER 8
+#define SCE_H_COMMENT 9
+#define SCE_H_ENTITY 10
+#define SCE_H_TAGEND 11
+#define SCE_H_XMLSTART 12
+#define SCE_H_XMLEND 13
+#define SCE_H_SCRIPT 14
+#define SCE_H_ASP 15
+#define SCE_H_ASPAT 16
+#define SCE_H_CDATA 17
+#define SCE_H_QUESTION 18
+#define SCE_H_VALUE 19
+#define SCE_H_XCCOMMENT 20
+#define SCE_H_SGML_DEFAULT 21
+#define SCE_H_SGML_COMMAND 22
+#define SCE_H_SGML_1ST_PARAM 23
+#define SCE_H_SGML_DOUBLESTRING 24
+#define SCE_H_SGML_SIMPLESTRING 25
+#define SCE_H_SGML_ERROR 26
+#define SCE_H_SGML_SPECIAL 27
+#define SCE_H_SGML_ENTITY 28
+#define SCE_H_SGML_COMMENT 29
+#define SCE_H_SGML_1ST_PARAM_COMMENT 30
+#define SCE_H_SGML_BLOCK_DEFAULT 31
+#define SCE_HJ_START 40
+#define SCE_HJ_DEFAULT 41
+#define SCE_HJ_COMMENT 42
+#define SCE_HJ_COMMENTLINE 43
+#define SCE_HJ_COMMENTDOC 44
+#define SCE_HJ_NUMBER 45
+#define SCE_HJ_WORD 46
+#define SCE_HJ_KEYWORD 47
+#define SCE_HJ_DOUBLESTRING 48
+#define SCE_HJ_SINGLESTRING 49
+#define SCE_HJ_SYMBOLS 50
+#define SCE_HJ_STRINGEOL 51
+#define SCE_HJ_REGEX 52
+#define SCE_HJA_START 55
+#define SCE_HJA_DEFAULT 56
+#define SCE_HJA_COMMENT 57
+#define SCE_HJA_COMMENTLINE 58
+#define SCE_HJA_COMMENTDOC 59
+#define SCE_HJA_NUMBER 60
+#define SCE_HJA_WORD 61
+#define SCE_HJA_KEYWORD 62
+#define SCE_HJA_DOUBLESTRING 63
+#define SCE_HJA_SINGLESTRING 64
+#define SCE_HJA_SYMBOLS 65
+#define SCE_HJA_STRINGEOL 66
+#define SCE_HJA_REGEX 67
+#define SCE_HB_START 70
+#define SCE_HB_DEFAULT 71
+#define SCE_HB_COMMENTLINE 72
+#define SCE_HB_NUMBER 73
+#define SCE_HB_WORD 74
+#define SCE_HB_STRING 75
+#define SCE_HB_IDENTIFIER 76
+#define SCE_HB_STRINGEOL 77
+#define SCE_HBA_START 80
+#define SCE_HBA_DEFAULT 81
+#define SCE_HBA_COMMENTLINE 82
+#define SCE_HBA_NUMBER 83
+#define SCE_HBA_WORD 84
+#define SCE_HBA_STRING 85
+#define SCE_HBA_IDENTIFIER 86
+#define SCE_HBA_STRINGEOL 87
+#define SCE_HP_START 90
+#define SCE_HP_DEFAULT 91
+#define SCE_HP_COMMENTLINE 92
+#define SCE_HP_NUMBER 93
+#define SCE_HP_STRING 94
+#define SCE_HP_CHARACTER 95
+#define SCE_HP_WORD 96
+#define SCE_HP_TRIPLE 97
+#define SCE_HP_TRIPLEDOUBLE 98
+#define SCE_HP_CLASSNAME 99
+#define SCE_HP_DEFNAME 100
+#define SCE_HP_OPERATOR 101
+#define SCE_HP_IDENTIFIER 102
+#define SCE_HPHP_COMPLEX_VARIABLE 104
+#define SCE_HPA_START 105
+#define SCE_HPA_DEFAULT 106
+#define SCE_HPA_COMMENTLINE 107
+#define SCE_HPA_NUMBER 108
+#define SCE_HPA_STRING 109
+#define SCE_HPA_CHARACTER 110
+#define SCE_HPA_WORD 111
+#define SCE_HPA_TRIPLE 112
+#define SCE_HPA_TRIPLEDOUBLE 113
+#define SCE_HPA_CLASSNAME 114
+#define SCE_HPA_DEFNAME 115
+#define SCE_HPA_OPERATOR 116
+#define SCE_HPA_IDENTIFIER 117
+#define SCE_HPHP_DEFAULT 118
+#define SCE_HPHP_HSTRING 119
+#define SCE_HPHP_SIMPLESTRING 120
+#define SCE_HPHP_WORD 121
+#define SCE_HPHP_NUMBER 122
+#define SCE_HPHP_VARIABLE 123
+#define SCE_HPHP_COMMENT 124
+#define SCE_HPHP_COMMENTLINE 125
+#define SCE_HPHP_HSTRING_VARIABLE 126
+#define SCE_HPHP_OPERATOR 127
+#define SCE_PL_DEFAULT 0
+#define SCE_PL_ERROR 1
+#define SCE_PL_COMMENTLINE 2
+#define SCE_PL_POD 3
+#define SCE_PL_NUMBER 4
+#define SCE_PL_WORD 5
+#define SCE_PL_STRING 6
+#define SCE_PL_CHARACTER 7
+#define SCE_PL_PUNCTUATION 8
+#define SCE_PL_PREPROCESSOR 9
+#define SCE_PL_OPERATOR 10
+#define SCE_PL_IDENTIFIER 11
+#define SCE_PL_SCALAR 12
+#define SCE_PL_ARRAY 13
+#define SCE_PL_HASH 14
+#define SCE_PL_SYMBOLTABLE 15
+#define SCE_PL_VARIABLE_INDEXER 16
+#define SCE_PL_REGEX 17
+#define SCE_PL_REGSUBST 18
+#define SCE_PL_LONGQUOTE 19
+#define SCE_PL_BACKTICKS 20
+#define SCE_PL_DATASECTION 21
+#define SCE_PL_HERE_DELIM 22
+#define SCE_PL_HERE_Q 23
+#define SCE_PL_HERE_QQ 24
+#define SCE_PL_HERE_QX 25
+#define SCE_PL_STRING_Q 26
+#define SCE_PL_STRING_QQ 27
+#define SCE_PL_STRING_QX 28
+#define SCE_PL_STRING_QR 29
+#define SCE_PL_STRING_QW 30
+#define SCE_PL_POD_VERB 31
+#define SCE_PL_SUB_PROTOTYPE 40
+#define SCE_PL_FORMAT_IDENT 41
+#define SCE_PL_FORMAT 42
+#define SCE_PL_STRING_VAR 43
+#define SCE_PL_XLAT 44
+#define SCE_PL_REGEX_VAR 54
+#define SCE_PL_REGSUBST_VAR 55
+#define SCE_PL_BACKTICKS_VAR 57
+#define SCE_PL_HERE_QQ_VAR 61
+#define SCE_PL_HERE_QX_VAR 62
+#define SCE_PL_STRING_QQ_VAR 64
+#define SCE_PL_STRING_QX_VAR 65
+#define SCE_PL_STRING_QR_VAR 66
+#define SCE_RB_DEFAULT 0
+#define SCE_RB_ERROR 1
+#define SCE_RB_COMMENTLINE 2
+#define SCE_RB_POD 3
+#define SCE_RB_NUMBER 4
+#define SCE_RB_WORD 5
+#define SCE_RB_STRING 6
+#define SCE_RB_CHARACTER 7
+#define SCE_RB_CLASSNAME 8
+#define SCE_RB_DEFNAME 9
+#define SCE_RB_OPERATOR 10
+#define SCE_RB_IDENTIFIER 11
+#define SCE_RB_REGEX 12
+#define SCE_RB_GLOBAL 13
+#define SCE_RB_SYMBOL 14
+#define SCE_RB_MODULE_NAME 15
+#define SCE_RB_INSTANCE_VAR 16
+#define SCE_RB_CLASS_VAR 17
+#define SCE_RB_BACKTICKS 18
+#define SCE_RB_DATASECTION 19
+#define SCE_RB_HERE_DELIM 20
+#define SCE_RB_HERE_Q 21
+#define SCE_RB_HERE_QQ 22
+#define SCE_RB_HERE_QX 23
+#define SCE_RB_STRING_Q 24
+#define SCE_RB_STRING_QQ 25
+#define SCE_RB_STRING_QX 26
+#define SCE_RB_STRING_QR 27
+#define SCE_RB_STRING_QW 28
+#define SCE_RB_WORD_DEMOTED 29
+#define SCE_RB_STDIN 30
+#define SCE_RB_STDOUT 31
+#define SCE_RB_STDERR 40
+#define SCE_RB_UPPER_BOUND 41
+#define SCE_B_DEFAULT 0
+#define SCE_B_COMMENT 1
+#define SCE_B_NUMBER 2
+#define SCE_B_KEYWORD 3
+#define SCE_B_STRING 4
+#define SCE_B_PREPROCESSOR 5
+#define SCE_B_OPERATOR 6
+#define SCE_B_IDENTIFIER 7
+#define SCE_B_DATE 8
+#define SCE_B_STRINGEOL 9
+#define SCE_B_KEYWORD2 10
+#define SCE_B_KEYWORD3 11
+#define SCE_B_KEYWORD4 12
+#define SCE_B_CONSTANT 13
+#define SCE_B_ASM 14
+#define SCE_B_LABEL 15
+#define SCE_B_ERROR 16
+#define SCE_B_HEXNUMBER 17
+#define SCE_B_BINNUMBER 18
+#define SCE_B_COMMENTBLOCK 19
+#define SCE_B_DOCLINE 20
+#define SCE_B_DOCBLOCK 21
+#define SCE_B_DOCKEYWORD 22
+#define SCE_PROPS_DEFAULT 0
+#define SCE_PROPS_COMMENT 1
+#define SCE_PROPS_SECTION 2
+#define SCE_PROPS_ASSIGNMENT 3
+#define SCE_PROPS_DEFVAL 4
+#define SCE_PROPS_KEY 5
+#define SCE_L_DEFAULT 0
+#define SCE_L_COMMAND 1
+#define SCE_L_TAG 2
+#define SCE_L_MATH 3
+#define SCE_L_COMMENT 4
+#define SCE_L_TAG2 5
+#define SCE_L_MATH2 6
+#define SCE_L_COMMENT2 7
+#define SCE_L_VERBATIM 8
+#define SCE_L_SHORTCMD 9
+#define SCE_L_SPECIAL 10
+#define SCE_L_CMDOPT 11
+#define SCE_L_ERROR 12
+#define SCE_LUA_DEFAULT 0
+#define SCE_LUA_COMMENT 1
+#define SCE_LUA_COMMENTLINE 2
+#define SCE_LUA_COMMENTDOC 3
+#define SCE_LUA_NUMBER 4
+#define SCE_LUA_WORD 5
+#define SCE_LUA_STRING 6
+#define SCE_LUA_CHARACTER 7
+#define SCE_LUA_LITERALSTRING 8
+#define SCE_LUA_PREPROCESSOR 9
+#define SCE_LUA_OPERATOR 10
+#define SCE_LUA_IDENTIFIER 11
+#define SCE_LUA_STRINGEOL 12
+#define SCE_LUA_WORD2 13
+#define SCE_LUA_WORD3 14
+#define SCE_LUA_WORD4 15
+#define SCE_LUA_WORD5 16
+#define SCE_LUA_WORD6 17
+#define SCE_LUA_WORD7 18
+#define SCE_LUA_WORD8 19
+#define SCE_LUA_LABEL 20
+#define SCE_ERR_DEFAULT 0
+#define SCE_ERR_PYTHON 1
+#define SCE_ERR_GCC 2
+#define SCE_ERR_MS 3
+#define SCE_ERR_CMD 4
+#define SCE_ERR_BORLAND 5
+#define SCE_ERR_PERL 6
+#define SCE_ERR_NET 7
+#define SCE_ERR_LUA 8
+#define SCE_ERR_CTAG 9
+#define SCE_ERR_DIFF_CHANGED 10
+#define SCE_ERR_DIFF_ADDITION 11
+#define SCE_ERR_DIFF_DELETION 12
+#define SCE_ERR_DIFF_MESSAGE 13
+#define SCE_ERR_PHP 14
+#define SCE_ERR_ELF 15
+#define SCE_ERR_IFC 16
+#define SCE_ERR_IFORT 17
+#define SCE_ERR_ABSF 18
+#define SCE_ERR_TIDY 19
+#define SCE_ERR_JAVA_STACK 20
+#define SCE_ERR_VALUE 21
+#define SCE_ERR_GCC_INCLUDED_FROM 22
+#define SCE_ERR_ESCSEQ 23
+#define SCE_ERR_ESCSEQ_UNKNOWN 24
+#define SCE_ERR_GCC_EXCERPT 25
+#define SCE_ERR_ES_BLACK 40
+#define SCE_ERR_ES_RED 41
+#define SCE_ERR_ES_GREEN 42
+#define SCE_ERR_ES_BROWN 43
+#define SCE_ERR_ES_BLUE 44
+#define SCE_ERR_ES_MAGENTA 45
+#define SCE_ERR_ES_CYAN 46
+#define SCE_ERR_ES_GRAY 47
+#define SCE_ERR_ES_DARK_GRAY 48
+#define SCE_ERR_ES_BRIGHT_RED 49
+#define SCE_ERR_ES_BRIGHT_GREEN 50
+#define SCE_ERR_ES_YELLOW 51
+#define SCE_ERR_ES_BRIGHT_BLUE 52
+#define SCE_ERR_ES_BRIGHT_MAGENTA 53
+#define SCE_ERR_ES_BRIGHT_CYAN 54
+#define SCE_ERR_ES_WHITE 55
+#define SCE_BAT_DEFAULT 0
+#define SCE_BAT_COMMENT 1
+#define SCE_BAT_WORD 2
+#define SCE_BAT_LABEL 3
+#define SCE_BAT_HIDE 4
+#define SCE_BAT_COMMAND 5
+#define SCE_BAT_IDENTIFIER 6
+#define SCE_BAT_OPERATOR 7
+#define SCE_TCMD_DEFAULT 0
+#define SCE_TCMD_COMMENT 1
+#define SCE_TCMD_WORD 2
+#define SCE_TCMD_LABEL 3
+#define SCE_TCMD_HIDE 4
+#define SCE_TCMD_COMMAND 5
+#define SCE_TCMD_IDENTIFIER 6
+#define SCE_TCMD_OPERATOR 7
+#define SCE_TCMD_ENVIRONMENT 8
+#define SCE_TCMD_EXPANSION 9
+#define SCE_TCMD_CLABEL 10
+#define SCE_MAKE_DEFAULT 0
+#define SCE_MAKE_COMMENT 1
+#define SCE_MAKE_PREPROCESSOR 2
+#define SCE_MAKE_IDENTIFIER 3
+#define SCE_MAKE_OPERATOR 4
+#define SCE_MAKE_TARGET 5
+#define SCE_MAKE_IDEOL 9
+#define SCE_DIFF_DEFAULT 0
+#define SCE_DIFF_COMMENT 1
+#define SCE_DIFF_COMMAND 2
+#define SCE_DIFF_HEADER 3
+#define SCE_DIFF_POSITION 4
+#define SCE_DIFF_DELETED 5
+#define SCE_DIFF_ADDED 6
+#define SCE_DIFF_CHANGED 7
+#define SCE_DIFF_PATCH_ADD 8
+#define SCE_DIFF_PATCH_DELETE 9
+#define SCE_DIFF_REMOVED_PATCH_ADD 10
+#define SCE_DIFF_REMOVED_PATCH_DELETE 11
+#define SCE_CONF_DEFAULT 0
+#define SCE_CONF_COMMENT 1
+#define SCE_CONF_NUMBER 2
+#define SCE_CONF_IDENTIFIER 3
+#define SCE_CONF_EXTENSION 4
+#define SCE_CONF_PARAMETER 5
+#define SCE_CONF_STRING 6
+#define SCE_CONF_OPERATOR 7
+#define SCE_CONF_IP 8
+#define SCE_CONF_DIRECTIVE 9
+#define SCE_AVE_DEFAULT 0
+#define SCE_AVE_COMMENT 1
+#define SCE_AVE_NUMBER 2
+#define SCE_AVE_WORD 3
+#define SCE_AVE_STRING 6
+#define SCE_AVE_ENUM 7
+#define SCE_AVE_STRINGEOL 8
+#define SCE_AVE_IDENTIFIER 9
+#define SCE_AVE_OPERATOR 10
+#define SCE_AVE_WORD1 11
+#define SCE_AVE_WORD2 12
+#define SCE_AVE_WORD3 13
+#define SCE_AVE_WORD4 14
+#define SCE_AVE_WORD5 15
+#define SCE_AVE_WORD6 16
+#define SCE_ADA_DEFAULT 0
+#define SCE_ADA_WORD 1
+#define SCE_ADA_IDENTIFIER 2
+#define SCE_ADA_NUMBER 3
+#define SCE_ADA_DELIMITER 4
+#define SCE_ADA_CHARACTER 5
+#define SCE_ADA_CHARACTEREOL 6
+#define SCE_ADA_STRING 7
+#define SCE_ADA_STRINGEOL 8
+#define SCE_ADA_LABEL 9
+#define SCE_ADA_COMMENTLINE 10
+#define SCE_ADA_ILLEGAL 11
+#define SCE_BAAN_DEFAULT 0
+#define SCE_BAAN_COMMENT 1
+#define SCE_BAAN_COMMENTDOC 2
+#define SCE_BAAN_NUMBER 3
+#define SCE_BAAN_WORD 4
+#define SCE_BAAN_STRING 5
+#define SCE_BAAN_PREPROCESSOR 6
+#define SCE_BAAN_OPERATOR 7
+#define SCE_BAAN_IDENTIFIER 8
+#define SCE_BAAN_STRINGEOL 9
+#define SCE_BAAN_WORD2 10
+#define SCE_BAAN_WORD3 11
+#define SCE_BAAN_WORD4 12
+#define SCE_BAAN_WORD5 13
+#define SCE_BAAN_WORD6 14
+#define SCE_BAAN_WORD7 15
+#define SCE_BAAN_WORD8 16
+#define SCE_BAAN_WORD9 17
+#define SCE_BAAN_TABLEDEF 18
+#define SCE_BAAN_TABLESQL 19
+#define SCE_BAAN_FUNCTION 20
+#define SCE_BAAN_DOMDEF 21
+#define SCE_BAAN_FUNCDEF 22
+#define SCE_BAAN_OBJECTDEF 23
+#define SCE_BAAN_DEFINEDEF 24
+#define SCE_LISP_DEFAULT 0
+#define SCE_LISP_COMMENT 1
+#define SCE_LISP_NUMBER 2
+#define SCE_LISP_KEYWORD 3
+#define SCE_LISP_KEYWORD_KW 4
+#define SCE_LISP_SYMBOL 5
+#define SCE_LISP_STRING 6
+#define SCE_LISP_STRINGEOL 8
+#define SCE_LISP_IDENTIFIER 9
+#define SCE_LISP_OPERATOR 10
+#define SCE_LISP_SPECIAL 11
+#define SCE_LISP_MULTI_COMMENT 12
+#define SCE_EIFFEL_DEFAULT 0
+#define SCE_EIFFEL_COMMENTLINE 1
+#define SCE_EIFFEL_NUMBER 2
+#define SCE_EIFFEL_WORD 3
+#define SCE_EIFFEL_STRING 4
+#define SCE_EIFFEL_CHARACTER 5
+#define SCE_EIFFEL_OPERATOR 6
+#define SCE_EIFFEL_IDENTIFIER 7
+#define SCE_EIFFEL_STRINGEOL 8
+#define SCE_NNCRONTAB_DEFAULT 0
+#define SCE_NNCRONTAB_COMMENT 1
+#define SCE_NNCRONTAB_TASK 2
+#define SCE_NNCRONTAB_SECTION 3
+#define SCE_NNCRONTAB_KEYWORD 4
+#define SCE_NNCRONTAB_MODIFIER 5
+#define SCE_NNCRONTAB_ASTERISK 6
+#define SCE_NNCRONTAB_NUMBER 7
+#define SCE_NNCRONTAB_STRING 8
+#define SCE_NNCRONTAB_ENVIRONMENT 9
+#define SCE_NNCRONTAB_IDENTIFIER 10
+#define SCE_FORTH_DEFAULT 0
+#define SCE_FORTH_COMMENT 1
+#define SCE_FORTH_COMMENT_ML 2
+#define SCE_FORTH_IDENTIFIER 3
+#define SCE_FORTH_CONTROL 4
+#define SCE_FORTH_KEYWORD 5
+#define SCE_FORTH_DEFWORD 6
+#define SCE_FORTH_PREWORD1 7
+#define SCE_FORTH_PREWORD2 8
+#define SCE_FORTH_NUMBER 9
+#define SCE_FORTH_STRING 10
+#define SCE_FORTH_LOCALE 11
+#define SCE_MATLAB_DEFAULT 0
+#define SCE_MATLAB_COMMENT 1
+#define SCE_MATLAB_COMMAND 2
+#define SCE_MATLAB_NUMBER 3
+#define SCE_MATLAB_KEYWORD 4
+#define SCE_MATLAB_STRING 5
+#define SCE_MATLAB_OPERATOR 6
+#define SCE_MATLAB_IDENTIFIER 7
+#define SCE_MATLAB_DOUBLEQUOTESTRING 8
+#define SCE_MAXIMA_OPERATOR 0
+#define SCE_MAXIMA_COMMANDENDING 1
+#define SCE_MAXIMA_COMMENT 2
+#define SCE_MAXIMA_NUMBER 3
+#define SCE_MAXIMA_STRING 4
+#define SCE_MAXIMA_COMMAND 5
+#define SCE_MAXIMA_VARIABLE 6
+#define SCE_MAXIMA_UNKNOWN 7
+#define SCE_SCRIPTOL_DEFAULT 0
+#define SCE_SCRIPTOL_WHITE 1
+#define SCE_SCRIPTOL_COMMENTLINE 2
+#define SCE_SCRIPTOL_PERSISTENT 3
+#define SCE_SCRIPTOL_CSTYLE 4
+#define SCE_SCRIPTOL_COMMENTBLOCK 5
+#define SCE_SCRIPTOL_NUMBER 6
+#define SCE_SCRIPTOL_STRING 7
+#define SCE_SCRIPTOL_CHARACTER 8
+#define SCE_SCRIPTOL_STRINGEOL 9
+#define SCE_SCRIPTOL_KEYWORD 10
+#define SCE_SCRIPTOL_OPERATOR 11
+#define SCE_SCRIPTOL_IDENTIFIER 12
+#define SCE_SCRIPTOL_TRIPLE 13
+#define SCE_SCRIPTOL_CLASSNAME 14
+#define SCE_SCRIPTOL_PREPROCESSOR 15
+#define SCE_ASM_DEFAULT 0
+#define SCE_ASM_COMMENT 1
+#define SCE_ASM_NUMBER 2
+#define SCE_ASM_STRING 3
+#define SCE_ASM_OPERATOR 4
+#define SCE_ASM_IDENTIFIER 5
+#define SCE_ASM_CPUINSTRUCTION 6
+#define SCE_ASM_MATHINSTRUCTION 7
+#define SCE_ASM_REGISTER 8
+#define SCE_ASM_DIRECTIVE 9
+#define SCE_ASM_DIRECTIVEOPERAND 10
+#define SCE_ASM_COMMENTBLOCK 11
+#define SCE_ASM_CHARACTER 12
+#define SCE_ASM_STRINGEOL 13
+#define SCE_ASM_EXTINSTRUCTION 14
+#define SCE_ASM_COMMENTDIRECTIVE 15
+#define SCE_F_DEFAULT 0
+#define SCE_F_COMMENT 1
+#define SCE_F_NUMBER 2
+#define SCE_F_STRING1 3
+#define SCE_F_STRING2 4
+#define SCE_F_STRINGEOL 5
+#define SCE_F_OPERATOR 6
+#define SCE_F_IDENTIFIER 7
+#define SCE_F_WORD 8
+#define SCE_F_WORD2 9
+#define SCE_F_WORD3 10
+#define SCE_F_PREPROCESSOR 11
+#define SCE_F_OPERATOR2 12
+#define SCE_F_LABEL 13
+#define SCE_F_CONTINUATION 14
+#define SCE_CSS_DEFAULT 0
+#define SCE_CSS_TAG 1
+#define SCE_CSS_CLASS 2
+#define SCE_CSS_PSEUDOCLASS 3
+#define SCE_CSS_UNKNOWN_PSEUDOCLASS 4
+#define SCE_CSS_OPERATOR 5
+#define SCE_CSS_IDENTIFIER 6
+#define SCE_CSS_UNKNOWN_IDENTIFIER 7
+#define SCE_CSS_VALUE 8
+#define SCE_CSS_COMMENT 9
+#define SCE_CSS_ID 10
+#define SCE_CSS_IMPORTANT 11
+#define SCE_CSS_DIRECTIVE 12
+#define SCE_CSS_DOUBLESTRING 13
+#define SCE_CSS_SINGLESTRING 14
+#define SCE_CSS_IDENTIFIER2 15
+#define SCE_CSS_ATTRIBUTE 16
+#define SCE_CSS_IDENTIFIER3 17
+#define SCE_CSS_PSEUDOELEMENT 18
+#define SCE_CSS_EXTENDED_IDENTIFIER 19
+#define SCE_CSS_EXTENDED_PSEUDOCLASS 20
+#define SCE_CSS_EXTENDED_PSEUDOELEMENT 21
+#define SCE_CSS_MEDIA 22
+#define SCE_CSS_VARIABLE 23
+#define SCE_POV_DEFAULT 0
+#define SCE_POV_COMMENT 1
+#define SCE_POV_COMMENTLINE 2
+#define SCE_POV_NUMBER 3
+#define SCE_POV_OPERATOR 4
+#define SCE_POV_IDENTIFIER 5
+#define SCE_POV_STRING 6
+#define SCE_POV_STRINGEOL 7
+#define SCE_POV_DIRECTIVE 8
+#define SCE_POV_BADDIRECTIVE 9
+#define SCE_POV_WORD2 10
+#define SCE_POV_WORD3 11
+#define SCE_POV_WORD4 12
+#define SCE_POV_WORD5 13
+#define SCE_POV_WORD6 14
+#define SCE_POV_WORD7 15
+#define SCE_POV_WORD8 16
+#define SCE_LOUT_DEFAULT 0
+#define SCE_LOUT_COMMENT 1
+#define SCE_LOUT_NUMBER 2
+#define SCE_LOUT_WORD 3
+#define SCE_LOUT_WORD2 4
+#define SCE_LOUT_WORD3 5
+#define SCE_LOUT_WORD4 6
+#define SCE_LOUT_STRING 7
+#define SCE_LOUT_OPERATOR 8
+#define SCE_LOUT_IDENTIFIER 9
+#define SCE_LOUT_STRINGEOL 10
+#define SCE_ESCRIPT_DEFAULT 0
+#define SCE_ESCRIPT_COMMENT 1
+#define SCE_ESCRIPT_COMMENTLINE 2
+#define SCE_ESCRIPT_COMMENTDOC 3
+#define SCE_ESCRIPT_NUMBER 4
+#define SCE_ESCRIPT_WORD 5
+#define SCE_ESCRIPT_STRING 6
+#define SCE_ESCRIPT_OPERATOR 7
+#define SCE_ESCRIPT_IDENTIFIER 8
+#define SCE_ESCRIPT_BRACE 9
+#define SCE_ESCRIPT_WORD2 10
+#define SCE_ESCRIPT_WORD3 11
+#define SCE_PS_DEFAULT 0
+#define SCE_PS_COMMENT 1
+#define SCE_PS_DSC_COMMENT 2
+#define SCE_PS_DSC_VALUE 3
+#define SCE_PS_NUMBER 4
+#define SCE_PS_NAME 5
+#define SCE_PS_KEYWORD 6
+#define SCE_PS_LITERAL 7
+#define SCE_PS_IMMEVAL 8
+#define SCE_PS_PAREN_ARRAY 9
+#define SCE_PS_PAREN_DICT 10
+#define SCE_PS_PAREN_PROC 11
+#define SCE_PS_TEXT 12
+#define SCE_PS_HEXSTRING 13
+#define SCE_PS_BASE85STRING 14
+#define SCE_PS_BADSTRINGCHAR 15
+#define SCE_NSIS_DEFAULT 0
+#define SCE_NSIS_COMMENT 1
+#define SCE_NSIS_STRINGDQ 2
+#define SCE_NSIS_STRINGLQ 3
+#define SCE_NSIS_STRINGRQ 4
+#define SCE_NSIS_FUNCTION 5
+#define SCE_NSIS_VARIABLE 6
+#define SCE_NSIS_LABEL 7
+#define SCE_NSIS_USERDEFINED 8
+#define SCE_NSIS_SECTIONDEF 9
+#define SCE_NSIS_SUBSECTIONDEF 10
+#define SCE_NSIS_IFDEFINEDEF 11
+#define SCE_NSIS_MACRODEF 12
+#define SCE_NSIS_STRINGVAR 13
+#define SCE_NSIS_NUMBER 14
+#define SCE_NSIS_SECTIONGROUP 15
+#define SCE_NSIS_PAGEEX 16
+#define SCE_NSIS_FUNCTIONDEF 17
+#define SCE_NSIS_COMMENTBOX 18
+#define SCE_MMIXAL_LEADWS 0
+#define SCE_MMIXAL_COMMENT 1
+#define SCE_MMIXAL_LABEL 2
+#define SCE_MMIXAL_OPCODE 3
+#define SCE_MMIXAL_OPCODE_PRE 4
+#define SCE_MMIXAL_OPCODE_VALID 5
+#define SCE_MMIXAL_OPCODE_UNKNOWN 6
+#define SCE_MMIXAL_OPCODE_POST 7
+#define SCE_MMIXAL_OPERANDS 8
+#define SCE_MMIXAL_NUMBER 9
+#define SCE_MMIXAL_REF 10
+#define SCE_MMIXAL_CHAR 11
+#define SCE_MMIXAL_STRING 12
+#define SCE_MMIXAL_REGISTER 13
+#define SCE_MMIXAL_HEX 14
+#define SCE_MMIXAL_OPERATOR 15
+#define SCE_MMIXAL_SYMBOL 16
+#define SCE_MMIXAL_INCLUDE 17
+#define SCE_CLW_DEFAULT 0
+#define SCE_CLW_LABEL 1
+#define SCE_CLW_COMMENT 2
+#define SCE_CLW_STRING 3
+#define SCE_CLW_USER_IDENTIFIER 4
+#define SCE_CLW_INTEGER_CONSTANT 5
+#define SCE_CLW_REAL_CONSTANT 6
+#define SCE_CLW_PICTURE_STRING 7
+#define SCE_CLW_KEYWORD 8
+#define SCE_CLW_COMPILER_DIRECTIVE 9
+#define SCE_CLW_RUNTIME_EXPRESSIONS 10
+#define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11
+#define SCE_CLW_STRUCTURE_DATA_TYPE 12
+#define SCE_CLW_ATTRIBUTE 13
+#define SCE_CLW_STANDARD_EQUATE 14
+#define SCE_CLW_ERROR 15
+#define SCE_CLW_DEPRECATED 16
+#define SCE_LOT_DEFAULT 0
+#define SCE_LOT_HEADER 1
+#define SCE_LOT_BREAK 2
+#define SCE_LOT_SET 3
+#define SCE_LOT_PASS 4
+#define SCE_LOT_FAIL 5
+#define SCE_LOT_ABORT 6
+#define SCE_YAML_DEFAULT 0
+#define SCE_YAML_COMMENT 1
+#define SCE_YAML_IDENTIFIER 2
+#define SCE_YAML_KEYWORD 3
+#define SCE_YAML_NUMBER 4
+#define SCE_YAML_REFERENCE 5
+#define SCE_YAML_DOCUMENT 6
+#define SCE_YAML_TEXT 7
+#define SCE_YAML_ERROR 8
+#define SCE_YAML_OPERATOR 9
+#define SCE_TEX_DEFAULT 0
+#define SCE_TEX_SPECIAL 1
+#define SCE_TEX_GROUP 2
+#define SCE_TEX_SYMBOL 3
+#define SCE_TEX_COMMAND 4
+#define SCE_TEX_TEXT 5
+#define SCE_METAPOST_DEFAULT 0
+#define SCE_METAPOST_SPECIAL 1
+#define SCE_METAPOST_GROUP 2
+#define SCE_METAPOST_SYMBOL 3
+#define SCE_METAPOST_COMMAND 4
+#define SCE_METAPOST_TEXT 5
+#define SCE_METAPOST_EXTRA 6
+#define SCE_ERLANG_DEFAULT 0
+#define SCE_ERLANG_COMMENT 1
+#define SCE_ERLANG_VARIABLE 2
+#define SCE_ERLANG_NUMBER 3
+#define SCE_ERLANG_KEYWORD 4
+#define SCE_ERLANG_STRING 5
+#define SCE_ERLANG_OPERATOR 6
+#define SCE_ERLANG_ATOM 7
+#define SCE_ERLANG_FUNCTION_NAME 8
+#define SCE_ERLANG_CHARACTER 9
+#define SCE_ERLANG_MACRO 10
+#define SCE_ERLANG_RECORD 11
+#define SCE_ERLANG_PREPROC 12
+#define SCE_ERLANG_NODE_NAME 13
+#define SCE_ERLANG_COMMENT_FUNCTION 14
+#define SCE_ERLANG_COMMENT_MODULE 15
+#define SCE_ERLANG_COMMENT_DOC 16
+#define SCE_ERLANG_COMMENT_DOC_MACRO 17
+#define SCE_ERLANG_ATOM_QUOTED 18
+#define SCE_ERLANG_MACRO_QUOTED 19
+#define SCE_ERLANG_RECORD_QUOTED 20
+#define SCE_ERLANG_NODE_NAME_QUOTED 21
+#define SCE_ERLANG_BIFS 22
+#define SCE_ERLANG_MODULES 23
+#define SCE_ERLANG_MODULES_ATT 24
+#define SCE_ERLANG_UNKNOWN 31
+#define SCE_JULIA_DEFAULT 0
+#define SCE_JULIA_COMMENT 1
+#define SCE_JULIA_NUMBER 2
+#define SCE_JULIA_KEYWORD1 3
+#define SCE_JULIA_KEYWORD2 4
+#define SCE_JULIA_KEYWORD3 5
+#define SCE_JULIA_CHAR 6
+#define SCE_JULIA_OPERATOR 7
+#define SCE_JULIA_BRACKET 8
+#define SCE_JULIA_IDENTIFIER 9
+#define SCE_JULIA_STRING 10
+#define SCE_JULIA_SYMBOL 11
+#define SCE_JULIA_MACRO 12
+#define SCE_JULIA_STRINGINTERP 13
+#define SCE_JULIA_DOCSTRING 14
+#define SCE_JULIA_STRINGLITERAL 15
+#define SCE_JULIA_COMMAND 16
+#define SCE_JULIA_COMMANDLITERAL 17
+#define SCE_JULIA_TYPEANNOT 18
+#define SCE_JULIA_LEXERROR 19
+#define SCE_JULIA_KEYWORD4 20
+#define SCE_JULIA_TYPEOPERATOR 21
+#define SCE_MSSQL_DEFAULT 0
+#define SCE_MSSQL_COMMENT 1
+#define SCE_MSSQL_LINE_COMMENT 2
+#define SCE_MSSQL_NUMBER 3
+#define SCE_MSSQL_STRING 4
+#define SCE_MSSQL_OPERATOR 5
+#define SCE_MSSQL_IDENTIFIER 6
+#define SCE_MSSQL_VARIABLE 7
+#define SCE_MSSQL_COLUMN_NAME 8
+#define SCE_MSSQL_STATEMENT 9
+#define SCE_MSSQL_DATATYPE 10
+#define SCE_MSSQL_SYSTABLE 11
+#define SCE_MSSQL_GLOBAL_VARIABLE 12
+#define SCE_MSSQL_FUNCTION 13
+#define SCE_MSSQL_STORED_PROCEDURE 14
+#define SCE_MSSQL_DEFAULT_PREF_DATATYPE 15
+#define SCE_MSSQL_COLUMN_NAME_2 16
+#define SCE_V_DEFAULT 0
+#define SCE_V_COMMENT 1
+#define SCE_V_COMMENTLINE 2
+#define SCE_V_COMMENTLINEBANG 3
+#define SCE_V_NUMBER 4
+#define SCE_V_WORD 5
+#define SCE_V_STRING 6
+#define SCE_V_WORD2 7
+#define SCE_V_WORD3 8
+#define SCE_V_PREPROCESSOR 9
+#define SCE_V_OPERATOR 10
+#define SCE_V_IDENTIFIER 11
+#define SCE_V_STRINGEOL 12
+#define SCE_V_USER 19
+#define SCE_V_COMMENT_WORD 20
+#define SCE_V_INPUT 21
+#define SCE_V_OUTPUT 22
+#define SCE_V_INOUT 23
+#define SCE_V_PORT_CONNECT 24
+#define SCE_KIX_DEFAULT 0
+#define SCE_KIX_COMMENT 1
+#define SCE_KIX_STRING1 2
+#define SCE_KIX_STRING2 3
+#define SCE_KIX_NUMBER 4
+#define SCE_KIX_VAR 5
+#define SCE_KIX_MACRO 6
+#define SCE_KIX_KEYWORD 7
+#define SCE_KIX_FUNCTIONS 8
+#define SCE_KIX_OPERATOR 9
+#define SCE_KIX_COMMENTSTREAM 10
+#define SCE_KIX_IDENTIFIER 31
+#define SCE_GC_DEFAULT 0
+#define SCE_GC_COMMENTLINE 1
+#define SCE_GC_COMMENTBLOCK 2
+#define SCE_GC_GLOBAL 3
+#define SCE_GC_EVENT 4
+#define SCE_GC_ATTRIBUTE 5
+#define SCE_GC_CONTROL 6
+#define SCE_GC_COMMAND 7
+#define SCE_GC_STRING 8
+#define SCE_GC_OPERATOR 9
+#define SCE_SN_DEFAULT 0
+#define SCE_SN_CODE 1
+#define SCE_SN_COMMENTLINE 2
+#define SCE_SN_COMMENTLINEBANG 3
+#define SCE_SN_NUMBER 4
+#define SCE_SN_WORD 5
+#define SCE_SN_STRING 6
+#define SCE_SN_WORD2 7
+#define SCE_SN_WORD3 8
+#define SCE_SN_PREPROCESSOR 9
+#define SCE_SN_OPERATOR 10
+#define SCE_SN_IDENTIFIER 11
+#define SCE_SN_STRINGEOL 12
+#define SCE_SN_REGEXTAG 13
+#define SCE_SN_SIGNAL 14
+#define SCE_SN_USER 19
+#define SCE_AU3_DEFAULT 0
+#define SCE_AU3_COMMENT 1
+#define SCE_AU3_COMMENTBLOCK 2
+#define SCE_AU3_NUMBER 3
+#define SCE_AU3_FUNCTION 4
+#define SCE_AU3_KEYWORD 5
+#define SCE_AU3_MACRO 6
+#define SCE_AU3_STRING 7
+#define SCE_AU3_OPERATOR 8
+#define SCE_AU3_VARIABLE 9
+#define SCE_AU3_SENT 10
+#define SCE_AU3_PREPROCESSOR 11
+#define SCE_AU3_SPECIAL 12
+#define SCE_AU3_EXPAND 13
+#define SCE_AU3_COMOBJ 14
+#define SCE_AU3_UDF 15
+#define SCE_APDL_DEFAULT 0
+#define SCE_APDL_COMMENT 1
+#define SCE_APDL_COMMENTBLOCK 2
+#define SCE_APDL_NUMBER 3
+#define SCE_APDL_STRING 4
+#define SCE_APDL_OPERATOR 5
+#define SCE_APDL_WORD 6
+#define SCE_APDL_PROCESSOR 7
+#define SCE_APDL_COMMAND 8
+#define SCE_APDL_SLASHCOMMAND 9
+#define SCE_APDL_STARCOMMAND 10
+#define SCE_APDL_ARGUMENT 11
+#define SCE_APDL_FUNCTION 12
+#define SCE_SH_DEFAULT 0
+#define SCE_SH_ERROR 1
+#define SCE_SH_COMMENTLINE 2
+#define SCE_SH_NUMBER 3
+#define SCE_SH_WORD 4
+#define SCE_SH_STRING 5
+#define SCE_SH_CHARACTER 6
+#define SCE_SH_OPERATOR 7
+#define SCE_SH_IDENTIFIER 8
+#define SCE_SH_SCALAR 9
+#define SCE_SH_PARAM 10
+#define SCE_SH_BACKTICKS 11
+#define SCE_SH_HERE_DELIM 12
+#define SCE_SH_HERE_Q 13
+#define SCE_ASN1_DEFAULT 0
+#define SCE_ASN1_COMMENT 1
+#define SCE_ASN1_IDENTIFIER 2
+#define SCE_ASN1_STRING 3
+#define SCE_ASN1_OID 4
+#define SCE_ASN1_SCALAR 5
+#define SCE_ASN1_KEYWORD 6
+#define SCE_ASN1_ATTRIBUTE 7
+#define SCE_ASN1_DESCRIPTOR 8
+#define SCE_ASN1_TYPE 9
+#define SCE_ASN1_OPERATOR 10
+#define SCE_VHDL_DEFAULT 0
+#define SCE_VHDL_COMMENT 1
+#define SCE_VHDL_COMMENTLINEBANG 2
+#define SCE_VHDL_NUMBER 3
+#define SCE_VHDL_STRING 4
+#define SCE_VHDL_OPERATOR 5
+#define SCE_VHDL_IDENTIFIER 6
+#define SCE_VHDL_STRINGEOL 7
+#define SCE_VHDL_KEYWORD 8
+#define SCE_VHDL_STDOPERATOR 9
+#define SCE_VHDL_ATTRIBUTE 10
+#define SCE_VHDL_STDFUNCTION 11
+#define SCE_VHDL_STDPACKAGE 12
+#define SCE_VHDL_STDTYPE 13
+#define SCE_VHDL_USERWORD 14
+#define SCE_VHDL_BLOCK_COMMENT 15
+#define SCE_CAML_DEFAULT 0
+#define SCE_CAML_IDENTIFIER 1
+#define SCE_CAML_TAGNAME 2
+#define SCE_CAML_KEYWORD 3
+#define SCE_CAML_KEYWORD2 4
+#define SCE_CAML_KEYWORD3 5
+#define SCE_CAML_LINENUM 6
+#define SCE_CAML_OPERATOR 7
+#define SCE_CAML_NUMBER 8
+#define SCE_CAML_CHAR 9
+#define SCE_CAML_WHITE 10
+#define SCE_CAML_STRING 11
+#define SCE_CAML_COMMENT 12
+#define SCE_CAML_COMMENT1 13
+#define SCE_CAML_COMMENT2 14
+#define SCE_CAML_COMMENT3 15
+#define SCE_HA_DEFAULT 0
+#define SCE_HA_IDENTIFIER 1
+#define SCE_HA_KEYWORD 2
+#define SCE_HA_NUMBER 3
+#define SCE_HA_STRING 4
+#define SCE_HA_CHARACTER 5
+#define SCE_HA_CLASS 6
+#define SCE_HA_MODULE 7
+#define SCE_HA_CAPITAL 8
+#define SCE_HA_DATA 9
+#define SCE_HA_IMPORT 10
+#define SCE_HA_OPERATOR 11
+#define SCE_HA_INSTANCE 12
+#define SCE_HA_COMMENTLINE 13
+#define SCE_HA_COMMENTBLOCK 14
+#define SCE_HA_COMMENTBLOCK2 15
+#define SCE_HA_COMMENTBLOCK3 16
+#define SCE_HA_PRAGMA 17
+#define SCE_HA_PREPROCESSOR 18
+#define SCE_HA_STRINGEOL 19
+#define SCE_HA_RESERVED_OPERATOR 20
+#define SCE_HA_LITERATE_COMMENT 21
+#define SCE_HA_LITERATE_CODEDELIM 22
+#define SCE_T3_DEFAULT 0
+#define SCE_T3_X_DEFAULT 1
+#define SCE_T3_PREPROCESSOR 2
+#define SCE_T3_BLOCK_COMMENT 3
+#define SCE_T3_LINE_COMMENT 4
+#define SCE_T3_OPERATOR 5
+#define SCE_T3_KEYWORD 6
+#define SCE_T3_NUMBER 7
+#define SCE_T3_IDENTIFIER 8
+#define SCE_T3_S_STRING 9
+#define SCE_T3_D_STRING 10
+#define SCE_T3_X_STRING 11
+#define SCE_T3_LIB_DIRECTIVE 12
+#define SCE_T3_MSG_PARAM 13
+#define SCE_T3_HTML_TAG 14
+#define SCE_T3_HTML_DEFAULT 15
+#define SCE_T3_HTML_STRING 16
+#define SCE_T3_USER1 17
+#define SCE_T3_USER2 18
+#define SCE_T3_USER3 19
+#define SCE_T3_BRACE 20
+#define SCE_REBOL_DEFAULT 0
+#define SCE_REBOL_COMMENTLINE 1
+#define SCE_REBOL_COMMENTBLOCK 2
+#define SCE_REBOL_PREFACE 3
+#define SCE_REBOL_OPERATOR 4
+#define SCE_REBOL_CHARACTER 5
+#define SCE_REBOL_QUOTEDSTRING 6
+#define SCE_REBOL_BRACEDSTRING 7
+#define SCE_REBOL_NUMBER 8
+#define SCE_REBOL_PAIR 9
+#define SCE_REBOL_TUPLE 10
+#define SCE_REBOL_BINARY 11
+#define SCE_REBOL_MONEY 12
+#define SCE_REBOL_ISSUE 13
+#define SCE_REBOL_TAG 14
+#define SCE_REBOL_FILE 15
+#define SCE_REBOL_EMAIL 16
+#define SCE_REBOL_URL 17
+#define SCE_REBOL_DATE 18
+#define SCE_REBOL_TIME 19
+#define SCE_REBOL_IDENTIFIER 20
+#define SCE_REBOL_WORD 21
+#define SCE_REBOL_WORD2 22
+#define SCE_REBOL_WORD3 23
+#define SCE_REBOL_WORD4 24
+#define SCE_REBOL_WORD5 25
+#define SCE_REBOL_WORD6 26
+#define SCE_REBOL_WORD7 27
+#define SCE_REBOL_WORD8 28
+#define SCE_SQL_DEFAULT 0
+#define SCE_SQL_COMMENT 1
+#define SCE_SQL_COMMENTLINE 2
+#define SCE_SQL_COMMENTDOC 3
+#define SCE_SQL_NUMBER 4
+#define SCE_SQL_WORD 5
+#define SCE_SQL_STRING 6
+#define SCE_SQL_CHARACTER 7
+#define SCE_SQL_SQLPLUS 8
+#define SCE_SQL_SQLPLUS_PROMPT 9
+#define SCE_SQL_OPERATOR 10
+#define SCE_SQL_IDENTIFIER 11
+#define SCE_SQL_SQLPLUS_COMMENT 13
+#define SCE_SQL_COMMENTLINEDOC 15
+#define SCE_SQL_WORD2 16
+#define SCE_SQL_COMMENTDOCKEYWORD 17
+#define SCE_SQL_COMMENTDOCKEYWORDERROR 18
+#define SCE_SQL_USER1 19
+#define SCE_SQL_USER2 20
+#define SCE_SQL_USER3 21
+#define SCE_SQL_USER4 22
+#define SCE_SQL_QUOTEDIDENTIFIER 23
+#define SCE_SQL_QOPERATOR 24
+#define SCE_ST_DEFAULT 0
+#define SCE_ST_STRING 1
+#define SCE_ST_NUMBER 2
+#define SCE_ST_COMMENT 3
+#define SCE_ST_SYMBOL 4
+#define SCE_ST_BINARY 5
+#define SCE_ST_BOOL 6
+#define SCE_ST_SELF 7
+#define SCE_ST_SUPER 8
+#define SCE_ST_NIL 9
+#define SCE_ST_GLOBAL 10
+#define SCE_ST_RETURN 11
+#define SCE_ST_SPECIAL 12
+#define SCE_ST_KWSEND 13
+#define SCE_ST_ASSIGN 14
+#define SCE_ST_CHARACTER 15
+#define SCE_ST_SPEC_SEL 16
+#define SCE_FS_DEFAULT 0
+#define SCE_FS_COMMENT 1
+#define SCE_FS_COMMENTLINE 2
+#define SCE_FS_COMMENTDOC 3
+#define SCE_FS_COMMENTLINEDOC 4
+#define SCE_FS_COMMENTDOCKEYWORD 5
+#define SCE_FS_COMMENTDOCKEYWORDERROR 6
+#define SCE_FS_KEYWORD 7
+#define SCE_FS_KEYWORD2 8
+#define SCE_FS_KEYWORD3 9
+#define SCE_FS_KEYWORD4 10
+#define SCE_FS_NUMBER 11
+#define SCE_FS_STRING 12
+#define SCE_FS_PREPROCESSOR 13
+#define SCE_FS_OPERATOR 14
+#define SCE_FS_IDENTIFIER 15
+#define SCE_FS_DATE 16
+#define SCE_FS_STRINGEOL 17
+#define SCE_FS_CONSTANT 18
+#define SCE_FS_WORDOPERATOR 19
+#define SCE_FS_DISABLEDCODE 20
+#define SCE_FS_DEFAULT_C 21
+#define SCE_FS_COMMENTDOC_C 22
+#define SCE_FS_COMMENTLINEDOC_C 23
+#define SCE_FS_KEYWORD_C 24
+#define SCE_FS_KEYWORD2_C 25
+#define SCE_FS_NUMBER_C 26
+#define SCE_FS_STRING_C 27
+#define SCE_FS_PREPROCESSOR_C 28
+#define SCE_FS_OPERATOR_C 29
+#define SCE_FS_IDENTIFIER_C 30
+#define SCE_FS_STRINGEOL_C 31
+#define SCE_CSOUND_DEFAULT 0
+#define SCE_CSOUND_COMMENT 1
+#define SCE_CSOUND_NUMBER 2
+#define SCE_CSOUND_OPERATOR 3
+#define SCE_CSOUND_INSTR 4
+#define SCE_CSOUND_IDENTIFIER 5
+#define SCE_CSOUND_OPCODE 6
+#define SCE_CSOUND_HEADERSTMT 7
+#define SCE_CSOUND_USERKEYWORD 8
+#define SCE_CSOUND_COMMENTBLOCK 9
+#define SCE_CSOUND_PARAM 10
+#define SCE_CSOUND_ARATE_VAR 11
+#define SCE_CSOUND_KRATE_VAR 12
+#define SCE_CSOUND_IRATE_VAR 13
+#define SCE_CSOUND_GLOBAL_VAR 14
+#define SCE_CSOUND_STRINGEOL 15
+#define SCE_INNO_DEFAULT 0
+#define SCE_INNO_COMMENT 1
+#define SCE_INNO_KEYWORD 2
+#define SCE_INNO_PARAMETER 3
+#define SCE_INNO_SECTION 4
+#define SCE_INNO_PREPROC 5
+#define SCE_INNO_INLINE_EXPANSION 6
+#define SCE_INNO_COMMENT_PASCAL 7
+#define SCE_INNO_KEYWORD_PASCAL 8
+#define SCE_INNO_KEYWORD_USER 9
+#define SCE_INNO_STRING_DOUBLE 10
+#define SCE_INNO_STRING_SINGLE 11
+#define SCE_INNO_IDENTIFIER 12
+#define SCE_OPAL_SPACE 0
+#define SCE_OPAL_COMMENT_BLOCK 1
+#define SCE_OPAL_COMMENT_LINE 2
+#define SCE_OPAL_INTEGER 3
+#define SCE_OPAL_KEYWORD 4
+#define SCE_OPAL_SORT 5
+#define SCE_OPAL_STRING 6
+#define SCE_OPAL_PAR 7
+#define SCE_OPAL_BOOL_CONST 8
+#define SCE_OPAL_DEFAULT 32
+#define SCE_SPICE_DEFAULT 0
+#define SCE_SPICE_IDENTIFIER 1
+#define SCE_SPICE_KEYWORD 2
+#define SCE_SPICE_KEYWORD2 3
+#define SCE_SPICE_KEYWORD3 4
+#define SCE_SPICE_NUMBER 5
+#define SCE_SPICE_DELIMITER 6
+#define SCE_SPICE_VALUE 7
+#define SCE_SPICE_COMMENTLINE 8
+#define SCE_CMAKE_DEFAULT 0
+#define SCE_CMAKE_COMMENT 1
+#define SCE_CMAKE_STRINGDQ 2
+#define SCE_CMAKE_STRINGLQ 3
+#define SCE_CMAKE_STRINGRQ 4
+#define SCE_CMAKE_COMMANDS 5
+#define SCE_CMAKE_PARAMETERS 6
+#define SCE_CMAKE_VARIABLE 7
+#define SCE_CMAKE_USERDEFINED 8
+#define SCE_CMAKE_WHILEDEF 9
+#define SCE_CMAKE_FOREACHDEF 10
+#define SCE_CMAKE_IFDEFINEDEF 11
+#define SCE_CMAKE_MACRODEF 12
+#define SCE_CMAKE_STRINGVAR 13
+#define SCE_CMAKE_NUMBER 14
+#define SCE_GAP_DEFAULT 0
+#define SCE_GAP_IDENTIFIER 1
+#define SCE_GAP_KEYWORD 2
+#define SCE_GAP_KEYWORD2 3
+#define SCE_GAP_KEYWORD3 4
+#define SCE_GAP_KEYWORD4 5
+#define SCE_GAP_STRING 6
+#define SCE_GAP_CHAR 7
+#define SCE_GAP_OPERATOR 8
+#define SCE_GAP_COMMENT 9
+#define SCE_GAP_NUMBER 10
+#define SCE_GAP_STRINGEOL 11
+#define SCE_PLM_DEFAULT 0
+#define SCE_PLM_COMMENT 1
+#define SCE_PLM_STRING 2
+#define SCE_PLM_NUMBER 3
+#define SCE_PLM_IDENTIFIER 4
+#define SCE_PLM_OPERATOR 5
+#define SCE_PLM_CONTROL 6
+#define SCE_PLM_KEYWORD 7
+#define SCE_ABL_DEFAULT 0
+#define SCE_ABL_NUMBER 1
+#define SCE_ABL_WORD 2
+#define SCE_ABL_STRING 3
+#define SCE_ABL_CHARACTER 4
+#define SCE_ABL_PREPROCESSOR 5
+#define SCE_ABL_OPERATOR 6
+#define SCE_ABL_IDENTIFIER 7
+#define SCE_ABL_BLOCK 8
+#define SCE_ABL_END 9
+#define SCE_ABL_COMMENT 10
+#define SCE_ABL_TASKMARKER 11
+#define SCE_ABL_LINECOMMENT 12
+#define SCE_ABAQUS_DEFAULT 0
+#define SCE_ABAQUS_COMMENT 1
+#define SCE_ABAQUS_COMMENTBLOCK 2
+#define SCE_ABAQUS_NUMBER 3
+#define SCE_ABAQUS_STRING 4
+#define SCE_ABAQUS_OPERATOR 5
+#define SCE_ABAQUS_WORD 6
+#define SCE_ABAQUS_PROCESSOR 7
+#define SCE_ABAQUS_COMMAND 8
+#define SCE_ABAQUS_SLASHCOMMAND 9
+#define SCE_ABAQUS_STARCOMMAND 10
+#define SCE_ABAQUS_ARGUMENT 11
+#define SCE_ABAQUS_FUNCTION 12
+#define SCE_ASY_DEFAULT 0
+#define SCE_ASY_COMMENT 1
+#define SCE_ASY_COMMENTLINE 2
+#define SCE_ASY_NUMBER 3
+#define SCE_ASY_WORD 4
+#define SCE_ASY_STRING 5
+#define SCE_ASY_CHARACTER 6
+#define SCE_ASY_OPERATOR 7
+#define SCE_ASY_IDENTIFIER 8
+#define SCE_ASY_STRINGEOL 9
+#define SCE_ASY_COMMENTLINEDOC 10
+#define SCE_ASY_WORD2 11
+#define SCE_R_DEFAULT 0
+#define SCE_R_COMMENT 1
+#define SCE_R_KWORD 2
+#define SCE_R_BASEKWORD 3
+#define SCE_R_OTHERKWORD 4
+#define SCE_R_NUMBER 5
+#define SCE_R_STRING 6
+#define SCE_R_STRING2 7
+#define SCE_R_OPERATOR 8
+#define SCE_R_IDENTIFIER 9
+#define SCE_R_INFIX 10
+#define SCE_R_INFIXEOL 11
+#define SCE_MAGIK_DEFAULT 0
+#define SCE_MAGIK_COMMENT 1
+#define SCE_MAGIK_HYPER_COMMENT 16
+#define SCE_MAGIK_STRING 2
+#define SCE_MAGIK_CHARACTER 3
+#define SCE_MAGIK_NUMBER 4
+#define SCE_MAGIK_IDENTIFIER 5
+#define SCE_MAGIK_OPERATOR 6
+#define SCE_MAGIK_FLOW 7
+#define SCE_MAGIK_CONTAINER 8
+#define SCE_MAGIK_BRACKET_BLOCK 9
+#define SCE_MAGIK_BRACE_BLOCK 10
+#define SCE_MAGIK_SQBRACKET_BLOCK 11
+#define SCE_MAGIK_UNKNOWN_KEYWORD 12
+#define SCE_MAGIK_KEYWORD 13
+#define SCE_MAGIK_PRAGMA 14
+#define SCE_MAGIK_SYMBOL 15
+#define SCE_POWERSHELL_DEFAULT 0
+#define SCE_POWERSHELL_COMMENT 1
+#define SCE_POWERSHELL_STRING 2
+#define SCE_POWERSHELL_CHARACTER 3
+#define SCE_POWERSHELL_NUMBER 4
+#define SCE_POWERSHELL_VARIABLE 5
+#define SCE_POWERSHELL_OPERATOR 6
+#define SCE_POWERSHELL_IDENTIFIER 7
+#define SCE_POWERSHELL_KEYWORD 8
+#define SCE_POWERSHELL_CMDLET 9
+#define SCE_POWERSHELL_ALIAS 10
+#define SCE_POWERSHELL_FUNCTION 11
+#define SCE_POWERSHELL_USER1 12
+#define SCE_POWERSHELL_COMMENTSTREAM 13
+#define SCE_POWERSHELL_HERE_STRING 14
+#define SCE_POWERSHELL_HERE_CHARACTER 15
+#define SCE_POWERSHELL_COMMENTDOCKEYWORD 16
+#define SCE_MYSQL_DEFAULT 0
+#define SCE_MYSQL_COMMENT 1
+#define SCE_MYSQL_COMMENTLINE 2
+#define SCE_MYSQL_VARIABLE 3
+#define SCE_MYSQL_SYSTEMVARIABLE 4
+#define SCE_MYSQL_KNOWNSYSTEMVARIABLE 5
+#define SCE_MYSQL_NUMBER 6
+#define SCE_MYSQL_MAJORKEYWORD 7
+#define SCE_MYSQL_KEYWORD 8
+#define SCE_MYSQL_DATABASEOBJECT 9
+#define SCE_MYSQL_PROCEDUREKEYWORD 10
+#define SCE_MYSQL_STRING 11
+#define SCE_MYSQL_SQSTRING 12
+#define SCE_MYSQL_DQSTRING 13
+#define SCE_MYSQL_OPERATOR 14
+#define SCE_MYSQL_FUNCTION 15
+#define SCE_MYSQL_IDENTIFIER 16
+#define SCE_MYSQL_QUOTEDIDENTIFIER 17
+#define SCE_MYSQL_USER1 18
+#define SCE_MYSQL_USER2 19
+#define SCE_MYSQL_USER3 20
+#define SCE_MYSQL_HIDDENCOMMAND 21
+#define SCE_MYSQL_PLACEHOLDER 22
+#define SCE_PO_DEFAULT 0
+#define SCE_PO_COMMENT 1
+#define SCE_PO_MSGID 2
+#define SCE_PO_MSGID_TEXT 3
+#define SCE_PO_MSGSTR 4
+#define SCE_PO_MSGSTR_TEXT 5
+#define SCE_PO_MSGCTXT 6
+#define SCE_PO_MSGCTXT_TEXT 7
+#define SCE_PO_FUZZY 8
+#define SCE_PO_PROGRAMMER_COMMENT 9
+#define SCE_PO_REFERENCE 10
+#define SCE_PO_FLAGS 11
+#define SCE_PO_MSGID_TEXT_EOL 12
+#define SCE_PO_MSGSTR_TEXT_EOL 13
+#define SCE_PO_MSGCTXT_TEXT_EOL 14
+#define SCE_PO_ERROR 15
+#define SCE_PAS_DEFAULT 0
+#define SCE_PAS_IDENTIFIER 1
+#define SCE_PAS_COMMENT 2
+#define SCE_PAS_COMMENT2 3
+#define SCE_PAS_COMMENTLINE 4
+#define SCE_PAS_PREPROCESSOR 5
+#define SCE_PAS_PREPROCESSOR2 6
+#define SCE_PAS_NUMBER 7
+#define SCE_PAS_HEXNUMBER 8
+#define SCE_PAS_WORD 9
+#define SCE_PAS_STRING 10
+#define SCE_PAS_STRINGEOL 11
+#define SCE_PAS_CHARACTER 12
+#define SCE_PAS_OPERATOR 13
+#define SCE_PAS_ASM 14
+#define SCE_SORCUS_DEFAULT 0
+#define SCE_SORCUS_COMMAND 1
+#define SCE_SORCUS_PARAMETER 2
+#define SCE_SORCUS_COMMENTLINE 3
+#define SCE_SORCUS_STRING 4
+#define SCE_SORCUS_STRINGEOL 5
+#define SCE_SORCUS_IDENTIFIER 6
+#define SCE_SORCUS_OPERATOR 7
+#define SCE_SORCUS_NUMBER 8
+#define SCE_SORCUS_CONSTANT 9
+#define SCE_POWERPRO_DEFAULT 0
+#define SCE_POWERPRO_COMMENTBLOCK 1
+#define SCE_POWERPRO_COMMENTLINE 2
+#define SCE_POWERPRO_NUMBER 3
+#define SCE_POWERPRO_WORD 4
+#define SCE_POWERPRO_WORD2 5
+#define SCE_POWERPRO_WORD3 6
+#define SCE_POWERPRO_WORD4 7
+#define SCE_POWERPRO_DOUBLEQUOTEDSTRING 8
+#define SCE_POWERPRO_SINGLEQUOTEDSTRING 9
+#define SCE_POWERPRO_LINECONTINUE 10
+#define SCE_POWERPRO_OPERATOR 11
+#define SCE_POWERPRO_IDENTIFIER 12
+#define SCE_POWERPRO_STRINGEOL 13
+#define SCE_POWERPRO_VERBATIM 14
+#define SCE_POWERPRO_ALTQUOTE 15
+#define SCE_POWERPRO_FUNCTION 16
+#define SCE_SML_DEFAULT 0
+#define SCE_SML_IDENTIFIER 1
+#define SCE_SML_TAGNAME 2
+#define SCE_SML_KEYWORD 3
+#define SCE_SML_KEYWORD2 4
+#define SCE_SML_KEYWORD3 5
+#define SCE_SML_LINENUM 6
+#define SCE_SML_OPERATOR 7
+#define SCE_SML_NUMBER 8
+#define SCE_SML_CHAR 9
+#define SCE_SML_STRING 11
+#define SCE_SML_COMMENT 12
+#define SCE_SML_COMMENT1 13
+#define SCE_SML_COMMENT2 14
+#define SCE_SML_COMMENT3 15
+#define SCE_MARKDOWN_DEFAULT 0
+#define SCE_MARKDOWN_LINE_BEGIN 1
+#define SCE_MARKDOWN_STRONG1 2
+#define SCE_MARKDOWN_STRONG2 3
+#define SCE_MARKDOWN_EM1 4
+#define SCE_MARKDOWN_EM2 5
+#define SCE_MARKDOWN_HEADER1 6
+#define SCE_MARKDOWN_HEADER2 7
+#define SCE_MARKDOWN_HEADER3 8
+#define SCE_MARKDOWN_HEADER4 9
+#define SCE_MARKDOWN_HEADER5 10
+#define SCE_MARKDOWN_HEADER6 11
+#define SCE_MARKDOWN_PRECHAR 12
+#define SCE_MARKDOWN_ULIST_ITEM 13
+#define SCE_MARKDOWN_OLIST_ITEM 14
+#define SCE_MARKDOWN_BLOCKQUOTE 15
+#define SCE_MARKDOWN_STRIKEOUT 16
+#define SCE_MARKDOWN_HRULE 17
+#define SCE_MARKDOWN_LINK 18
+#define SCE_MARKDOWN_CODE 19
+#define SCE_MARKDOWN_CODE2 20
+#define SCE_MARKDOWN_CODEBK 21
+#define SCE_TXT2TAGS_DEFAULT 0
+#define SCE_TXT2TAGS_LINE_BEGIN 1
+#define SCE_TXT2TAGS_STRONG1 2
+#define SCE_TXT2TAGS_STRONG2 3
+#define SCE_TXT2TAGS_EM1 4
+#define SCE_TXT2TAGS_EM2 5
+#define SCE_TXT2TAGS_HEADER1 6
+#define SCE_TXT2TAGS_HEADER2 7
+#define SCE_TXT2TAGS_HEADER3 8
+#define SCE_TXT2TAGS_HEADER4 9
+#define SCE_TXT2TAGS_HEADER5 10
+#define SCE_TXT2TAGS_HEADER6 11
+#define SCE_TXT2TAGS_PRECHAR 12
+#define SCE_TXT2TAGS_ULIST_ITEM 13
+#define SCE_TXT2TAGS_OLIST_ITEM 14
+#define SCE_TXT2TAGS_BLOCKQUOTE 15
+#define SCE_TXT2TAGS_STRIKEOUT 16
+#define SCE_TXT2TAGS_HRULE 17
+#define SCE_TXT2TAGS_LINK 18
+#define SCE_TXT2TAGS_CODE 19
+#define SCE_TXT2TAGS_CODE2 20
+#define SCE_TXT2TAGS_CODEBK 21
+#define SCE_TXT2TAGS_COMMENT 22
+#define SCE_TXT2TAGS_OPTION 23
+#define SCE_TXT2TAGS_PREPROC 24
+#define SCE_TXT2TAGS_POSTPROC 25
+#define SCE_A68K_DEFAULT 0
+#define SCE_A68K_COMMENT 1
+#define SCE_A68K_NUMBER_DEC 2
+#define SCE_A68K_NUMBER_BIN 3
+#define SCE_A68K_NUMBER_HEX 4
+#define SCE_A68K_STRING1 5
+#define SCE_A68K_OPERATOR 6
+#define SCE_A68K_CPUINSTRUCTION 7
+#define SCE_A68K_EXTINSTRUCTION 8
+#define SCE_A68K_REGISTER 9
+#define SCE_A68K_DIRECTIVE 10
+#define SCE_A68K_MACRO_ARG 11
+#define SCE_A68K_LABEL 12
+#define SCE_A68K_STRING2 13
+#define SCE_A68K_IDENTIFIER 14
+#define SCE_A68K_MACRO_DECLARATION 15
+#define SCE_A68K_COMMENT_WORD 16
+#define SCE_A68K_COMMENT_SPECIAL 17
+#define SCE_A68K_COMMENT_DOXYGEN 18
+#define SCE_MODULA_DEFAULT 0
+#define SCE_MODULA_COMMENT 1
+#define SCE_MODULA_DOXYCOMM 2
+#define SCE_MODULA_DOXYKEY 3
+#define SCE_MODULA_KEYWORD 4
+#define SCE_MODULA_RESERVED 5
+#define SCE_MODULA_NUMBER 6
+#define SCE_MODULA_BASENUM 7
+#define SCE_MODULA_FLOAT 8
+#define SCE_MODULA_STRING 9
+#define SCE_MODULA_STRSPEC 10
+#define SCE_MODULA_CHAR 11
+#define SCE_MODULA_CHARSPEC 12
+#define SCE_MODULA_PROC 13
+#define SCE_MODULA_PRAGMA 14
+#define SCE_MODULA_PRGKEY 15
+#define SCE_MODULA_OPERATOR 16
+#define SCE_MODULA_BADSTR 17
+#define SCE_COFFEESCRIPT_DEFAULT 0
+#define SCE_COFFEESCRIPT_COMMENT 1
+#define SCE_COFFEESCRIPT_COMMENTLINE 2
+#define SCE_COFFEESCRIPT_COMMENTDOC 3
+#define SCE_COFFEESCRIPT_NUMBER 4
+#define SCE_COFFEESCRIPT_WORD 5
+#define SCE_COFFEESCRIPT_STRING 6
+#define SCE_COFFEESCRIPT_CHARACTER 7
+#define SCE_COFFEESCRIPT_UUID 8
+#define SCE_COFFEESCRIPT_PREPROCESSOR 9
+#define SCE_COFFEESCRIPT_OPERATOR 10
+#define SCE_COFFEESCRIPT_IDENTIFIER 11
+#define SCE_COFFEESCRIPT_STRINGEOL 12
+#define SCE_COFFEESCRIPT_VERBATIM 13
+#define SCE_COFFEESCRIPT_REGEX 14
+#define SCE_COFFEESCRIPT_COMMENTLINEDOC 15
+#define SCE_COFFEESCRIPT_WORD2 16
+#define SCE_COFFEESCRIPT_COMMENTDOCKEYWORD 17
+#define SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR 18
+#define SCE_COFFEESCRIPT_GLOBALCLASS 19
+#define SCE_COFFEESCRIPT_STRINGRAW 20
+#define SCE_COFFEESCRIPT_TRIPLEVERBATIM 21
+#define SCE_COFFEESCRIPT_COMMENTBLOCK 22
+#define SCE_COFFEESCRIPT_VERBOSE_REGEX 23
+#define SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24
+#define SCE_COFFEESCRIPT_INSTANCEPROPERTY 25
+#define SCE_AVS_DEFAULT 0
+#define SCE_AVS_COMMENTBLOCK 1
+#define SCE_AVS_COMMENTBLOCKN 2
+#define SCE_AVS_COMMENTLINE 3
+#define SCE_AVS_NUMBER 4
+#define SCE_AVS_OPERATOR 5
+#define SCE_AVS_IDENTIFIER 6
+#define SCE_AVS_STRING 7
+#define SCE_AVS_TRIPLESTRING 8
+#define SCE_AVS_KEYWORD 9
+#define SCE_AVS_FILTER 10
+#define SCE_AVS_PLUGIN 11
+#define SCE_AVS_FUNCTION 12
+#define SCE_AVS_CLIPPROP 13
+#define SCE_AVS_USERDFN 14
+#define SCE_ECL_DEFAULT 0
+#define SCE_ECL_COMMENT 1
+#define SCE_ECL_COMMENTLINE 2
+#define SCE_ECL_NUMBER 3
+#define SCE_ECL_STRING 4
+#define SCE_ECL_WORD0 5
+#define SCE_ECL_OPERATOR 6
+#define SCE_ECL_CHARACTER 7
+#define SCE_ECL_UUID 8
+#define SCE_ECL_PREPROCESSOR 9
+#define SCE_ECL_UNKNOWN 10
+#define SCE_ECL_IDENTIFIER 11
+#define SCE_ECL_STRINGEOL 12
+#define SCE_ECL_VERBATIM 13
+#define SCE_ECL_REGEX 14
+#define SCE_ECL_COMMENTLINEDOC 15
+#define SCE_ECL_WORD1 16
+#define SCE_ECL_COMMENTDOCKEYWORD 17
+#define SCE_ECL_COMMENTDOCKEYWORDERROR 18
+#define SCE_ECL_WORD2 19
+#define SCE_ECL_WORD3 20
+#define SCE_ECL_WORD4 21
+#define SCE_ECL_WORD5 22
+#define SCE_ECL_COMMENTDOC 23
+#define SCE_ECL_ADDED 24
+#define SCE_ECL_DELETED 25
+#define SCE_ECL_CHANGED 26
+#define SCE_ECL_MOVED 27
+#define SCE_OSCRIPT_DEFAULT 0
+#define SCE_OSCRIPT_LINE_COMMENT 1
+#define SCE_OSCRIPT_BLOCK_COMMENT 2
+#define SCE_OSCRIPT_DOC_COMMENT 3
+#define SCE_OSCRIPT_PREPROCESSOR 4
+#define SCE_OSCRIPT_NUMBER 5
+#define SCE_OSCRIPT_SINGLEQUOTE_STRING 6
+#define SCE_OSCRIPT_DOUBLEQUOTE_STRING 7
+#define SCE_OSCRIPT_CONSTANT 8
+#define SCE_OSCRIPT_IDENTIFIER 9
+#define SCE_OSCRIPT_GLOBAL 10
+#define SCE_OSCRIPT_KEYWORD 11
+#define SCE_OSCRIPT_OPERATOR 12
+#define SCE_OSCRIPT_LABEL 13
+#define SCE_OSCRIPT_TYPE 14
+#define SCE_OSCRIPT_FUNCTION 15
+#define SCE_OSCRIPT_OBJECT 16
+#define SCE_OSCRIPT_PROPERTY 17
+#define SCE_OSCRIPT_METHOD 18
+#define SCE_VISUALPROLOG_DEFAULT 0
+#define SCE_VISUALPROLOG_KEY_MAJOR 1
+#define SCE_VISUALPROLOG_KEY_MINOR 2
+#define SCE_VISUALPROLOG_KEY_DIRECTIVE 3
+#define SCE_VISUALPROLOG_COMMENT_BLOCK 4
+#define SCE_VISUALPROLOG_COMMENT_LINE 5
+#define SCE_VISUALPROLOG_COMMENT_KEY 6
+#define SCE_VISUALPROLOG_COMMENT_KEY_ERROR 7
+#define SCE_VISUALPROLOG_IDENTIFIER 8
+#define SCE_VISUALPROLOG_VARIABLE 9
+#define SCE_VISUALPROLOG_ANONYMOUS 10
+#define SCE_VISUALPROLOG_NUMBER 11
+#define SCE_VISUALPROLOG_OPERATOR 12
+#define SCE_VISUALPROLOG_CHARACTER 13
+#define SCE_VISUALPROLOG_CHARACTER_TOO_MANY 14
+#define SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15
+#define SCE_VISUALPROLOG_STRING 16
+#define SCE_VISUALPROLOG_STRING_ESCAPE 17
+#define SCE_VISUALPROLOG_STRING_ESCAPE_ERROR 18
+#define SCE_VISUALPROLOG_STRING_EOL_OPEN 19
+#define SCE_VISUALPROLOG_STRING_VERBATIM 20
+#define SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21
+#define SCE_VISUALPROLOG_STRING_VERBATIM_EOL 22
+#define SCE_STTXT_DEFAULT 0
+#define SCE_STTXT_COMMENT 1
+#define SCE_STTXT_COMMENTLINE 2
+#define SCE_STTXT_KEYWORD 3
+#define SCE_STTXT_TYPE 4
+#define SCE_STTXT_FUNCTION 5
+#define SCE_STTXT_FB 6
+#define SCE_STTXT_NUMBER 7
+#define SCE_STTXT_HEXNUMBER 8
+#define SCE_STTXT_PRAGMA 9
+#define SCE_STTXT_OPERATOR 10
+#define SCE_STTXT_CHARACTER 11
+#define SCE_STTXT_STRING1 12
+#define SCE_STTXT_STRING2 13
+#define SCE_STTXT_STRINGEOL 14
+#define SCE_STTXT_IDENTIFIER 15
+#define SCE_STTXT_DATETIME 16
+#define SCE_STTXT_VARS 17
+#define SCE_STTXT_PRAGMAS 18
+#define SCE_KVIRC_DEFAULT 0
+#define SCE_KVIRC_COMMENT 1
+#define SCE_KVIRC_COMMENTBLOCK 2
+#define SCE_KVIRC_STRING 3
+#define SCE_KVIRC_WORD 4
+#define SCE_KVIRC_KEYWORD 5
+#define SCE_KVIRC_FUNCTION_KEYWORD 6
+#define SCE_KVIRC_FUNCTION 7
+#define SCE_KVIRC_VARIABLE 8
+#define SCE_KVIRC_NUMBER 9
+#define SCE_KVIRC_OPERATOR 10
+#define SCE_KVIRC_STRING_FUNCTION 11
+#define SCE_KVIRC_STRING_VARIABLE 12
+#define SCE_RUST_DEFAULT 0
+#define SCE_RUST_COMMENTBLOCK 1
+#define SCE_RUST_COMMENTLINE 2
+#define SCE_RUST_COMMENTBLOCKDOC 3
+#define SCE_RUST_COMMENTLINEDOC 4
+#define SCE_RUST_NUMBER 5
+#define SCE_RUST_WORD 6
+#define SCE_RUST_WORD2 7
+#define SCE_RUST_WORD3 8
+#define SCE_RUST_WORD4 9
+#define SCE_RUST_WORD5 10
+#define SCE_RUST_WORD6 11
+#define SCE_RUST_WORD7 12
+#define SCE_RUST_STRING 13
+#define SCE_RUST_STRINGR 14
+#define SCE_RUST_CHARACTER 15
+#define SCE_RUST_OPERATOR 16
+#define SCE_RUST_IDENTIFIER 17
+#define SCE_RUST_LIFETIME 18
+#define SCE_RUST_MACRO 19
+#define SCE_RUST_LEXERROR 20
+#define SCE_RUST_BYTESTRING 21
+#define SCE_RUST_BYTESTRINGR 22
+#define SCE_RUST_BYTECHARACTER 23
+#define SCE_DMAP_DEFAULT 0
+#define SCE_DMAP_COMMENT 1
+#define SCE_DMAP_NUMBER 2
+#define SCE_DMAP_STRING1 3
+#define SCE_DMAP_STRING2 4
+#define SCE_DMAP_STRINGEOL 5
+#define SCE_DMAP_OPERATOR 6
+#define SCE_DMAP_IDENTIFIER 7
+#define SCE_DMAP_WORD 8
+#define SCE_DMAP_WORD2 9
+#define SCE_DMAP_WORD3 10
+#define SCE_DMIS_DEFAULT 0
+#define SCE_DMIS_COMMENT 1
+#define SCE_DMIS_STRING 2
+#define SCE_DMIS_NUMBER 3
+#define SCE_DMIS_KEYWORD 4
+#define SCE_DMIS_MAJORWORD 5
+#define SCE_DMIS_MINORWORD 6
+#define SCE_DMIS_UNSUPPORTED_MAJOR 7
+#define SCE_DMIS_UNSUPPORTED_MINOR 8
+#define SCE_DMIS_LABEL 9
+#define SCE_REG_DEFAULT 0
+#define SCE_REG_COMMENT 1
+#define SCE_REG_VALUENAME 2
+#define SCE_REG_STRING 3
+#define SCE_REG_HEXDIGIT 4
+#define SCE_REG_VALUETYPE 5
+#define SCE_REG_ADDEDKEY 6
+#define SCE_REG_DELETEDKEY 7
+#define SCE_REG_ESCAPED 8
+#define SCE_REG_KEYPATH_GUID 9
+#define SCE_REG_STRING_GUID 10
+#define SCE_REG_PARAMETER 11
+#define SCE_REG_OPERATOR 12
+#define SCE_BIBTEX_DEFAULT 0
+#define SCE_BIBTEX_ENTRY 1
+#define SCE_BIBTEX_UNKNOWN_ENTRY 2
+#define SCE_BIBTEX_KEY 3
+#define SCE_BIBTEX_PARAMETER 4
+#define SCE_BIBTEX_VALUE 5
+#define SCE_BIBTEX_COMMENT 6
+#define SCE_HEX_DEFAULT 0
+#define SCE_HEX_RECSTART 1
+#define SCE_HEX_RECTYPE 2
+#define SCE_HEX_RECTYPE_UNKNOWN 3
+#define SCE_HEX_BYTECOUNT 4
+#define SCE_HEX_BYTECOUNT_WRONG 5
+#define SCE_HEX_NOADDRESS 6
+#define SCE_HEX_DATAADDRESS 7
+#define SCE_HEX_RECCOUNT 8
+#define SCE_HEX_STARTADDRESS 9
+#define SCE_HEX_ADDRESSFIELD_UNKNOWN 10
+#define SCE_HEX_EXTENDEDADDRESS 11
+#define SCE_HEX_DATA_ODD 12
+#define SCE_HEX_DATA_EVEN 13
+#define SCE_HEX_DATA_UNKNOWN 14
+#define SCE_HEX_DATA_EMPTY 15
+#define SCE_HEX_CHECKSUM 16
+#define SCE_HEX_CHECKSUM_WRONG 17
+#define SCE_HEX_GARBAGE 18
+#define SCE_JSON_DEFAULT 0
+#define SCE_JSON_NUMBER 1
+#define SCE_JSON_STRING 2
+#define SCE_JSON_STRINGEOL 3
+#define SCE_JSON_PROPERTYNAME 4
+#define SCE_JSON_ESCAPESEQUENCE 5
+#define SCE_JSON_LINECOMMENT 6
+#define SCE_JSON_BLOCKCOMMENT 7
+#define SCE_JSON_OPERATOR 8
+#define SCE_JSON_URI 9
+#define SCE_JSON_COMPACTIRI 10
+#define SCE_JSON_KEYWORD 11
+#define SCE_JSON_LDKEYWORD 12
+#define SCE_JSON_ERROR 13
+#define SCE_EDI_DEFAULT 0
+#define SCE_EDI_SEGMENTSTART 1
+#define SCE_EDI_SEGMENTEND 2
+#define SCE_EDI_SEP_ELEMENT 3
+#define SCE_EDI_SEP_COMPOSITE 4
+#define SCE_EDI_SEP_RELEASE 5
+#define SCE_EDI_UNA 6
+#define SCE_EDI_UNH 7
+#define SCE_EDI_BADSEGMENT 8
+#define SCE_STATA_DEFAULT 0
+#define SCE_STATA_COMMENT 1
+#define SCE_STATA_COMMENTLINE 2
+#define SCE_STATA_COMMENTBLOCK 3
+#define SCE_STATA_NUMBER 4
+#define SCE_STATA_OPERATOR 5
+#define SCE_STATA_IDENTIFIER 6
+#define SCE_STATA_STRING 7
+#define SCE_STATA_TYPE 8
+#define SCE_STATA_WORD 9
+#define SCE_STATA_GLOBAL_MACRO 10
+#define SCE_STATA_MACRO 11
+#define SCE_SAS_DEFAULT 0
+#define SCE_SAS_COMMENT 1
+#define SCE_SAS_COMMENTLINE 2
+#define SCE_SAS_COMMENTBLOCK 3
+#define SCE_SAS_NUMBER 4
+#define SCE_SAS_OPERATOR 5
+#define SCE_SAS_IDENTIFIER 6
+#define SCE_SAS_STRING 7
+#define SCE_SAS_TYPE 8
+#define SCE_SAS_WORD 9
+#define SCE_SAS_GLOBAL_MACRO 10
+#define SCE_SAS_MACRO 11
+#define SCE_SAS_MACRO_KEYWORD 12
+#define SCE_SAS_BLOCK_KEYWORD 13
+#define SCE_SAS_MACRO_FUNCTION 14
+#define SCE_SAS_STATEMENT 15
+#define SCE_NIM_DEFAULT 0
+#define SCE_NIM_COMMENT 1
+#define SCE_NIM_COMMENTDOC 2
+#define SCE_NIM_COMMENTLINE 3
+#define SCE_NIM_COMMENTLINEDOC 4
+#define SCE_NIM_NUMBER 5
+#define SCE_NIM_STRING 6
+#define SCE_NIM_CHARACTER 7
+#define SCE_NIM_WORD 8
+#define SCE_NIM_TRIPLE 9
+#define SCE_NIM_TRIPLEDOUBLE 10
+#define SCE_NIM_BACKTICKS 11
+#define SCE_NIM_FUNCNAME 12
+#define SCE_NIM_STRINGEOL 13
+#define SCE_NIM_NUMERROR 14
+#define SCE_NIM_OPERATOR 15
+#define SCE_NIM_IDENTIFIER 16
+#define SCE_CIL_DEFAULT 0
+#define SCE_CIL_COMMENT 1
+#define SCE_CIL_COMMENTLINE 2
+#define SCE_CIL_WORD 3
+#define SCE_CIL_WORD2 4
+#define SCE_CIL_WORD3 5
+#define SCE_CIL_STRING 6
+#define SCE_CIL_LABEL 7
+#define SCE_CIL_OPERATOR 8
+#define SCE_CIL_IDENTIFIER 9
+#define SCE_CIL_STRINGEOL 10
+#define SCE_X12_DEFAULT 0
+#define SCE_X12_BAD 1
+#define SCE_X12_ENVELOPE 2
+#define SCE_X12_FUNCTIONGROUP 3
+#define SCE_X12_TRANSACTIONSET 4
+#define SCE_X12_SEGMENTHEADER 5
+#define SCE_X12_SEGMENTEND 6
+#define SCE_X12_SEP_ELEMENT 7
+#define SCE_X12_SEP_SUBELEMENT 8
+#define SCE_DF_DEFAULT 0
+#define SCE_DF_IDENTIFIER 1
+#define SCE_DF_METATAG 2
+#define SCE_DF_IMAGE 3
+#define SCE_DF_COMMENTLINE 4
+#define SCE_DF_PREPROCESSOR 5
+#define SCE_DF_PREPROCESSOR2 6
+#define SCE_DF_NUMBER 7
+#define SCE_DF_HEXNUMBER 8
+#define SCE_DF_WORD 9
+#define SCE_DF_STRING 10
+#define SCE_DF_STRINGEOL 11
+#define SCE_DF_SCOPEWORD 12
+#define SCE_DF_OPERATOR 13
+#define SCE_DF_ICODE 14
+#define SCE_HOLLYWOOD_DEFAULT 0
+#define SCE_HOLLYWOOD_COMMENT 1
+#define SCE_HOLLYWOOD_COMMENTBLOCK 2
+#define SCE_HOLLYWOOD_NUMBER 3
+#define SCE_HOLLYWOOD_KEYWORD 4
+#define SCE_HOLLYWOOD_STDAPI 5
+#define SCE_HOLLYWOOD_PLUGINAPI 6
+#define SCE_HOLLYWOOD_PLUGINMETHOD 7
+#define SCE_HOLLYWOOD_STRING 8
+#define SCE_HOLLYWOOD_STRINGBLOCK 9
+#define SCE_HOLLYWOOD_PREPROCESSOR 10
+#define SCE_HOLLYWOOD_OPERATOR 11
+#define SCE_HOLLYWOOD_IDENTIFIER 12
+#define SCE_HOLLYWOOD_CONSTANT 13
+#define SCE_HOLLYWOOD_HEXNUMBER 14
+#define SCE_RAKU_DEFAULT 0
+#define SCE_RAKU_ERROR 1
+#define SCE_RAKU_COMMENTLINE 2
+#define SCE_RAKU_COMMENTEMBED 3
+#define SCE_RAKU_POD 4
+#define SCE_RAKU_CHARACTER 5
+#define SCE_RAKU_HEREDOC_Q 6
+#define SCE_RAKU_HEREDOC_QQ 7
+#define SCE_RAKU_STRING 8
+#define SCE_RAKU_STRING_Q 9
+#define SCE_RAKU_STRING_QQ 10
+#define SCE_RAKU_STRING_Q_LANG 11
+#define SCE_RAKU_STRING_VAR 12
+#define SCE_RAKU_REGEX 13
+#define SCE_RAKU_REGEX_VAR 14
+#define SCE_RAKU_ADVERB 15
+#define SCE_RAKU_NUMBER 16
+#define SCE_RAKU_PREPROCESSOR 17
+#define SCE_RAKU_OPERATOR 18
+#define SCE_RAKU_WORD 19
+#define SCE_RAKU_FUNCTION 20
+#define SCE_RAKU_IDENTIFIER 21
+#define SCE_RAKU_TYPEDEF 22
+#define SCE_RAKU_MU 23
+#define SCE_RAKU_POSITIONAL 24
+#define SCE_RAKU_ASSOCIATIVE 25
+#define SCE_RAKU_CALLABLE 26
+#define SCE_RAKU_GRAMMAR 27
+#define SCE_RAKU_CLASS 28
+#define SCE_FSHARP_DEFAULT 0
+#define SCE_FSHARP_KEYWORD 1
+#define SCE_FSHARP_KEYWORD2 2
+#define SCE_FSHARP_KEYWORD3 3
+#define SCE_FSHARP_KEYWORD4 4
+#define SCE_FSHARP_KEYWORD5 5
+#define SCE_FSHARP_IDENTIFIER 6
+#define SCE_FSHARP_QUOT_IDENTIFIER 7
+#define SCE_FSHARP_COMMENT 8
+#define SCE_FSHARP_COMMENTLINE 9
+#define SCE_FSHARP_PREPROCESSOR 10
+#define SCE_FSHARP_LINENUM 11
+#define SCE_FSHARP_OPERATOR 12
+#define SCE_FSHARP_NUMBER 13
+#define SCE_FSHARP_CHARACTER 14
+#define SCE_FSHARP_STRING 15
+#define SCE_FSHARP_VERBATIM 16
+#define SCE_FSHARP_QUOTATION 17
+#define SCE_FSHARP_ATTRIBUTE 18
+#define SCE_FSHARP_FORMAT_SPEC 19
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
+
+#endif
diff --git a/scite-app/lexilla/lexers/LexA68k.cxx b/scite-app/lexilla/lexers/LexA68k.cxx
new file mode 100644
index 0000000..1ecefa5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexA68k.cxx
@@ -0,0 +1,348 @@
+// Scintilla source code edit control
+/** @file LexA68k.cxx
+ ** Lexer for Assembler, just for the MASM syntax
+ ** Written by Martial Demolins AKA Folco
+ **/
+// Copyright 2010 Martial Demolins <mdemolins(a)gmail.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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+// Return values for GetOperatorType
+#define NO_OPERATOR     0
+#define OPERATOR_1CHAR  1
+#define OPERATOR_2CHAR  2
+
+
+/**
+ *  IsIdentifierStart
+ *
+ *  Return true if the given char is a valid identifier first char
+ */
+
+static inline bool IsIdentifierStart (const int ch)
+{
+    return (isalpha(ch) || (ch == '_') || (ch == '\\'));
+}
+
+
+/**
+ *  IsIdentifierChar
+ *
+ *  Return true if the given char is a valid identifier char
+ */
+
+static inline bool IsIdentifierChar (const int ch)
+{
+    return (isalnum(ch) || (ch == '_') || (ch == '@') || (ch == ':') || (ch == '.'));
+}
+
+
+/**
+ *  GetOperatorType
+ *
+ *  Return:
+ *  NO_OPERATOR     if char is not an operator
+ *  OPERATOR_1CHAR  if the operator is one char long
+ *  OPERATOR_2CHAR  if the operator is two chars long
+ */
+
+static inline int GetOperatorType (const int ch1, const int ch2)
+{
+    int OpType = NO_OPERATOR;
+
+    if ((ch1 == '+') || (ch1 == '-') || (ch1 == '*') || (ch1 == '/') || (ch1 == '#') ||
+        (ch1 == '(') || (ch1 == ')') || (ch1 == '~') || (ch1 == '&') || (ch1 == '|') || (ch1 == ','))
+        OpType = OPERATOR_1CHAR;
+
+    else if ((ch1 == ch2) && (ch1 == '<' || ch1 == '>'))
+        OpType = OPERATOR_2CHAR;
+
+    return OpType;
+}
+
+
+/**
+ *  IsBin
+ *
+ *  Return true if the given char is 0 or 1
+ */
+
+static inline bool IsBin (const int ch)
+{
+    return (ch == '0') || (ch == '1');
+}
+
+
+/**
+ *  IsDoxygenChar
+ *
+ *  Return true if the char may be part of a Doxygen keyword
+ */
+
+static inline bool IsDoxygenChar (const int ch)
+{
+    return isalpha(ch) || (ch == '$') || (ch == '[') || (ch == ']') || (ch == '{') || (ch == '}');
+}
+
+
+/**
+ *  ColouriseA68kDoc
+ *
+ *  Main function, which colourises a 68k source
+ */
+
+static void ColouriseA68kDoc (Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler)
+{
+    // Used to buffer a string, to be able to compare it using built-in functions
+    char Buffer[100];
+
+
+    // Used to know the length of an operator
+    int OpType;
+
+
+    // Get references to keywords lists
+    WordList &cpuInstruction = *keywordlists[0];
+    WordList &registers = *keywordlists[1];
+    WordList &directive = *keywordlists[2];
+    WordList &extInstruction = *keywordlists[3];
+    WordList &alert          = *keywordlists[4];
+    WordList &doxygenKeyword = *keywordlists[5];
+
+
+    // Instanciate a context for our source
+    StyleContext sc(startPos, length, initStyle, styler);
+
+
+    /************************************************************
+    *
+    *   Parse the source
+    *
+    ************************************************************/
+
+    for ( ; sc.More(); sc.Forward())
+    {
+        /************************************************************
+        *
+        *   A style always terminates at the end of a line, even for
+        *   comments (no multi-lines comments)
+        *
+        ************************************************************/
+        if (sc.atLineStart) {
+            sc.SetState(SCE_A68K_DEFAULT);
+        }
+
+
+        /************************************************************
+        *
+        *   If we are not in "default style", check if the style continues
+        *   In this case, we just have to loop
+        *
+        ************************************************************/
+
+        if (sc.state != SCE_A68K_DEFAULT)
+        {
+            if (   ((sc.state == SCE_A68K_NUMBER_DEC)        && isdigit(sc.ch))                      // Decimal number
+                || ((sc.state == SCE_A68K_NUMBER_BIN) && IsBin(sc.ch))                                      // Binary number
+                || ((sc.state == SCE_A68K_NUMBER_HEX) && isxdigit(sc.ch))                                   // Hexa number
+                || ((sc.state == SCE_A68K_MACRO_ARG)         && isdigit(sc.ch))                      // Macro argument
+                || ((sc.state == SCE_A68K_STRING1)    && (sc.ch != '\''))                                   // String single-quoted
+                || ((sc.state == SCE_A68K_STRING2)    && (sc.ch != '\"'))                                   // String double-quoted
+                || ((sc.state == SCE_A68K_MACRO_DECLARATION) && IsIdentifierChar(sc.ch))             // Macro declaration (or global label, we don't know at this point)
+                || ((sc.state == SCE_A68K_IDENTIFIER)        && IsIdentifierChar(sc.ch))             // Identifier
+                || ((sc.state == SCE_A68K_LABEL)             && IsIdentifierChar(sc.ch))             // Label (local)
+                || ((sc.state == SCE_A68K_COMMENT_DOXYGEN)   && IsDoxygenChar(sc.ch))                // Doxygen keyword
+                || ((sc.state == SCE_A68K_COMMENT_SPECIAL)   && isalpha(sc.ch))                      // Alert
+                || ((sc.state == SCE_A68K_COMMENT)           && !isalpha(sc.ch) && (sc.ch != '\\'))) // Normal comment
+            {
+                continue;
+            }
+
+        /************************************************************
+        *
+        *   Check if current state terminates
+        *
+        ************************************************************/
+
+            // Strings: include terminal ' or " in the current string by skipping it
+            if ((sc.state == SCE_A68K_STRING1) || (sc.state == SCE_A68K_STRING2)) {
+                sc.Forward();
+                }
+
+
+            // If a macro declaration was terminated with ':', it was a label
+            else if ((sc.state == SCE_A68K_MACRO_DECLARATION) && (sc.chPrev == ':')) {
+                sc.ChangeState(SCE_A68K_LABEL);
+            }
+
+
+            // If it wasn't a Doxygen keyword, change it to normal comment
+            else if (sc.state == SCE_A68K_COMMENT_DOXYGEN) {
+                sc.GetCurrent(Buffer, sizeof(Buffer));
+                if (!doxygenKeyword.InList(Buffer)) {
+                    sc.ChangeState(SCE_A68K_COMMENT);
+                }
+                sc.SetState(SCE_A68K_COMMENT);
+                continue;
+            }
+
+
+            // If it wasn't an Alert, change it to normal comment
+            else if (sc.state == SCE_A68K_COMMENT_SPECIAL) {
+                sc.GetCurrent(Buffer, sizeof(Buffer));
+                if (!alert.InList(Buffer)) {
+                    sc.ChangeState(SCE_A68K_COMMENT);
+                }
+                // Reset style to normal comment, or to Doxygen keyword if it begins with '\'
+                if (sc.ch == '\\') {
+                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN);
+                }
+                else {
+                sc.SetState(SCE_A68K_COMMENT);
+                }
+                continue;
+            }
+
+
+            // If we are in a comment, it's a Doxygen keyword or an Alert
+            else if (sc.state == SCE_A68K_COMMENT) {
+                if (sc.ch == '\\') {
+                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN);
+                }
+                else {
+                    sc.SetState(SCE_A68K_COMMENT_SPECIAL);
+                }
+                continue;
+            }
+
+
+            // Check if we are at the end of an identifier
+            // In this case, colourise it if was a keyword.
+            else if ((sc.state == SCE_A68K_IDENTIFIER) && !IsIdentifierChar(sc.ch)) {
+                sc.GetCurrentLowered(Buffer, sizeof(Buffer));                           // Buffer the string of the current context
+                if (cpuInstruction.InList(Buffer)) {                                    // And check if it belongs to a keyword list
+                    sc.ChangeState(SCE_A68K_CPUINSTRUCTION);
+                }
+                else if (extInstruction.InList(Buffer)) {
+                    sc.ChangeState(SCE_A68K_EXTINSTRUCTION);
+                }
+                else if (registers.InList(Buffer)) {
+                    sc.ChangeState(SCE_A68K_REGISTER);
+                }
+                else if (directive.InList(Buffer)) {
+                    sc.ChangeState(SCE_A68K_DIRECTIVE);
+                }
+            }
+
+            // All special contexts are now handled.Come back to default style
+            sc.SetState(SCE_A68K_DEFAULT);
+        }
+
+
+        /************************************************************
+        *
+        *   Check if we must enter a new state
+        *
+        ************************************************************/
+
+        // Something which begins at the beginning of a line, and with
+        // - '\' + an identifier start char, or
+        // - '\\@' + an identifier start char
+        // is a local label (second case is used for macro local labels). We set it already as a label, it can't be a macro/equ declaration
+        if (sc.atLineStart && (sc.ch < 0x80) && IsIdentifierStart(sc.chNext) && (sc.ch == '\\')) {
+            sc.SetState(SCE_A68K_LABEL);
+        }
+
+        if (sc.atLineStart && (sc.ch < 0x80) && (sc.ch == '\\') && (sc.chNext == '\\')) {
+            sc.Forward(2);
+            if ((sc.ch == '@') && IsIdentifierStart(sc.chNext)) {
+                sc.ChangeState(SCE_A68K_LABEL);
+                sc.SetState(SCE_A68K_LABEL);
+            }
+        }
+
+        // Label and macro identifiers start at the beginning of a line
+        // We set both as a macro id, but if it wasn't one (':' at the end),
+        // it will be changed as a label.
+        if (sc.atLineStart && (sc.ch < 0x80) && IsIdentifierStart(sc.ch)) {
+            sc.SetState(SCE_A68K_MACRO_DECLARATION);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == ';')) {                            // Default: alert in a comment. If it doesn't match
+            sc.SetState(SCE_A68K_COMMENT);                                      // with an alert, it will be toggle to a normal comment
+        }
+        else if ((sc.ch < 0x80) && isdigit(sc.ch)) {                            // Decimal numbers haven't prefix
+            sc.SetState(SCE_A68K_NUMBER_DEC);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == '%')) {                            // Binary numbers are prefixed with '%'
+            sc.SetState(SCE_A68K_NUMBER_BIN);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == '$')) {                            // Hexadecimal numbers are prefixed with '$'
+            sc.SetState(SCE_A68K_NUMBER_HEX);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == '\'')) {                           // String (single-quoted)
+            sc.SetState(SCE_A68K_STRING1);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == '\"')) {                           // String (double-quoted)
+            sc.SetState(SCE_A68K_STRING2);
+        }
+        else if ((sc.ch < 0x80) && (sc.ch == '\\') && (isdigit(sc.chNext))) {   // Replacement symbols in macro are prefixed with '\'
+            sc.SetState(SCE_A68K_MACRO_ARG);
+        }
+        else if ((sc.ch < 0x80) && IsIdentifierStart(sc.ch)) {                  // An identifier: constant, label, etc...
+            sc.SetState(SCE_A68K_IDENTIFIER);
+        }
+        else {
+            if (sc.ch < 0x80) {
+                OpType = GetOperatorType(sc.ch, sc.chNext);                     // Check if current char is an operator
+                if (OpType != NO_OPERATOR) {
+                    sc.SetState(SCE_A68K_OPERATOR);
+                    if (OpType == OPERATOR_2CHAR) {                             // Check if the operator is 2 bytes long
+                        sc.ForwardSetState(SCE_A68K_OPERATOR);                  // (>> or <<)
+                    }
+                }
+            }
+        }
+    }                                                                           // End of for()
+    sc.Complete();
+}
+
+
+// Names of the keyword lists
+
+static const char * const a68kWordListDesc[] =
+{
+    "CPU instructions",
+    "Registers",
+    "Directives",
+    "Extended instructions",
+    "Comment special words",
+    "Doxygen keywords",
+    0
+};
+
+LexerModule lmA68k(SCLEX_A68K, ColouriseA68kDoc, "a68k", 0, a68kWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexAPDL.cxx b/scite-app/lexilla/lexers/LexAPDL.cxx
new file mode 100644
index 0000000..9f632a3
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAPDL.cxx
@@ -0,0 +1,260 @@
+// Scintilla source code edit control
+/** @file LexAPDL.cxx
+ ** Lexer for APDL. Based on the lexer for Assembler by The Black Horus.
+ ** By Hadar Raz.
+ **/
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || ch == '_'));
+}
+
+static inline bool IsAnOperator(char ch) {
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '$' || ch == ':' || ch == '%')
+		return true;
+	return false;
+}
+
+static void ColouriseAPDLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	int stringStart = ' ';
+
+	WordList &processors = *keywordlists[0];
+	WordList &commands = *keywordlists[1];
+	WordList &slashcommands = *keywordlists[2];
+	WordList &starcommands = *keywordlists[3];
+	WordList &arguments = *keywordlists[4];
+	WordList &functions = *keywordlists[5];
+
+	// Do not leak onto next line
+	initStyle = SCE_APDL_DEFAULT;
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_APDL_NUMBER) {
+			if (!(IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+				((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_COMMENTBLOCK) {
+			if (sc.atLineEnd) {
+				if (sc.ch == '\r') {
+				sc.Forward();
+				}
+				sc.ForwardSetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_STRING) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_APDL_DEFAULT);
+			} else if ((sc.ch == '\'' && stringStart == '\'') || (sc.ch == '\"' && stringStart == '\"')) {
+				sc.ForwardSetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_WORD) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (processors.InList(s)) {
+					sc.ChangeState(SCE_APDL_PROCESSOR);
+				} else if (slashcommands.InList(s)) {
+					sc.ChangeState(SCE_APDL_SLASHCOMMAND);
+				} else if (starcommands.InList(s)) {
+					sc.ChangeState(SCE_APDL_STARCOMMAND);
+				} else if (commands.InList(s)) {
+					sc.ChangeState(SCE_APDL_COMMAND);
+				} else if (arguments.InList(s)) {
+					sc.ChangeState(SCE_APDL_ARGUMENT);
+				} else if (functions.InList(s)) {
+					sc.ChangeState(SCE_APDL_FUNCTION);
+				}
+				sc.SetState(SCE_APDL_DEFAULT);
+			}
+		} else if (sc.state == SCE_APDL_OPERATOR) {
+			if (!IsAnOperator(static_cast<char>(sc.ch))) {
+			    sc.SetState(SCE_APDL_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_APDL_DEFAULT) {
+			if (sc.ch == '!' && sc.chNext == '!') {
+				sc.SetState(SCE_APDL_COMMENTBLOCK);
+			} else if (sc.ch == '!') {
+				sc.SetState(SCE_APDL_COMMENT);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_APDL_NUMBER);
+			} else if (sc.ch == '\'' || sc.ch == '\"') {
+				sc.SetState(SCE_APDL_STRING);
+				stringStart = sc.ch;
+			} else if (IsAWordChar(sc.ch) || ((sc.ch == '*' || sc.ch == '/') && !isgraph(sc.chPrev))) {
+				sc.SetState(SCE_APDL_WORD);
+			} else if (IsAnOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_APDL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+//------------------------------------------------------------------------------
+// 06-27-07 Sergio Lucato
+// - Included code folding for Ansys APDL lexer
+// - Copyied from LexBasic.cxx and modified for APDL
+//------------------------------------------------------------------------------
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ */
+static int character_classification[128] =
+{
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  6,  2,  2,  2,  10, 6,
+    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int CheckAPDLFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "*if") ||
+		!strcmp(token, "*do") ||
+		!strcmp(token, "*dowhile") ) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "*endif") ||
+		!strcmp(token, "*enddo") ) {
+		return -1;
+	}
+	return 0;
+}
+
+static void FoldAPDLDoc(Sci_PositionU startPos, Sci_Position length, int,
+	WordList *[], Accessor &styler) {
+
+	Sci_Position line = styler.GetLine(startPos);
+	int level = styler.LevelAt(line);
+	int go = 0, done = 0;
+	Sci_Position endPos = startPos + length;
+	char word[256];
+	int wordlen = 0;
+	Sci_Position i;
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	// Scan for tokens at the start of the line (they may include
+	// whitespace, for tokens like "End Function"
+	for (i = startPos; i < endPos; i++) {
+		int c = styler.SafeGetCharAt(i);
+		if (!done && !go) {
+			if (wordlen) { // are we scanning a token already?
+				word[wordlen] = static_cast<char>(LowerCase(c));
+				if (!IsIdentifier(c)) { // done with token
+					word[wordlen] = '\0';
+					go = CheckAPDLFoldPoint(word, level);
+					if (!go) {
+						// Treat any whitespace as single blank, for
+						// things like "End   Function".
+						if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) {
+							word[wordlen] = ' ';
+							if (wordlen < 255)
+								wordlen++;
+						}
+						else // done with this line
+							done = 1;
+					}
+				} else if (wordlen < 255) {
+					wordlen++;
+				}
+			} else { // start scanning at first non-whitespace character
+				if (!IsSpace(c)) {
+					if (IsIdentifier(c)) {
+						word[0] = static_cast<char>(LowerCase(c));
+						wordlen = 1;
+					} else // done with this line
+						done = 1;
+				}
+			}
+		}
+		if (c == '\n') { // line end
+			if (!done && wordlen == 0 && foldCompact) // line was only space
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if (level != styler.LevelAt(line))
+				styler.SetLevel(line, level);
+			level += go;
+			line++;
+			// reset state
+			wordlen = 0;
+			level &= ~SC_FOLDLEVELHEADERFLAG;
+			level &= ~SC_FOLDLEVELWHITEFLAG;
+			go = 0;
+			done = 0;
+		}
+	}
+}
+
+static const char * const apdlWordListDesc[] = {
+    "processors",
+    "commands",
+    "slashommands",
+    "starcommands",
+    "arguments",
+    "functions",
+    0
+};
+
+LexerModule lmAPDL(SCLEX_APDL, ColouriseAPDLDoc, "apdl", FoldAPDLDoc, apdlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexASY.cxx b/scite-app/lexilla/lexers/LexASY.cxx
new file mode 100644
index 0000000..6ad682f
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexASY.cxx
@@ -0,0 +1,273 @@
+// Scintilla source code edit control
+// @file LexASY.cxx
+//Author: instanton (email: soft_share<at>126<dot>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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseAsyDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+		WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			if (sc.state == SCE_ASY_STRING) {
+				sc.SetState(SCE_ASY_STRING);
+			}
+			visibleChars = 0;
+		}
+
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+//				continuationLine = true;
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_ASY_OPERATOR:
+				sc.SetState(SCE_ASY_DEFAULT);
+				break;
+			case SCE_ASY_NUMBER:
+				if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_IDENTIFIER:
+				if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+					char s[1000];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_ASY_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_ASY_WORD2);
+					}
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ASY_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+			case SCE_ASY_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ASY_STRINGEOL);
+				} else 	if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_ASY_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ASY_DEFAULT) {
+			if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) {
+				sc.SetState(SCE_ASY_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_ASY_COMMENT);
+				sc.Forward();	//
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_ASY_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ASY_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_ASY_CHARACTER);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_ASY_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_ASY_OPERATOR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static bool IsAsyCommentStyle(int style) {
+	return style == SCE_ASY_COMMENT;
+}
+
+
+static inline bool isASYidentifier(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ;
+}
+
+static int ParseASYWord(Sci_PositionU pos, Accessor &styler, char *word)
+{
+  int length=0;
+  char ch=styler.SafeGetCharAt(pos);
+  *word=0;
+
+  while(isASYidentifier(ch) && length<100){
+          word[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length);
+  }
+  word[length]=0;
+  return length;
+}
+
+static bool IsASYDrawingLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+
+	Sci_Position startpos = pos;
+	char buffer[100]="";
+
+	while (startpos<eol_pos){
+		char ch = styler[startpos];
+		ParseASYWord(startpos,styler,buffer);
+		bool drawcommands = strncmp(buffer,"draw",4)==0||
+			strncmp(buffer,"pair",4)==0||strncmp(buffer,"label",5)==0;
+		if (!drawcommands && ch!=' ') return false;
+		else if (drawcommands) return true;
+		startpos++;
+	}
+	return false;
+}
+
+static void FoldAsyDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+					   WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsAsyCommentStyle(style)) {
+			if (!IsAsyCommentStyle(stylePrev) && (stylePrev != SCE_ASY_COMMENTLINEDOC)) {
+				levelNext++;
+			} else if (!IsAsyCommentStyle(styleNext) && (styleNext != SCE_ASY_COMMENTLINEDOC) && !atEOL) {
+				levelNext--;
+			}
+		}
+		if (style == SCE_ASY_OPERATOR) {
+			if (ch == '{') {
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+
+		if (atEOL && IsASYDrawingLine(lineCurrent, styler)){
+			if (lineCurrent==0 && IsASYDrawingLine(lineCurrent + 1, styler))
+				levelNext++;
+			else if (lineCurrent!=0 && !IsASYDrawingLine(lineCurrent - 1, styler)
+				&& IsASYDrawingLine(lineCurrent + 1, styler)
+				)
+				levelNext++;
+			else if (lineCurrent!=0 && IsASYDrawingLine(lineCurrent - 1, styler) &&
+				!IsASYDrawingLine(lineCurrent+1, styler))
+				levelNext--;
+		}
+
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+	}
+}
+
+static const char * const asyWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            0,
+        };
+
+LexerModule lmASY(SCLEX_ASYMPTOTE, ColouriseAsyDoc, "asy", FoldAsyDoc, asyWordLists);
diff --git a/scite-app/lexilla/lexers/LexAU3.cxx b/scite-app/lexilla/lexers/LexAU3.cxx
new file mode 100644
index 0000000..8973754
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAU3.cxx
@@ -0,0 +1,911 @@
+// Scintilla source code edit control
+// @file LexAU3.cxx
+// Lexer for AutoIt3 https://www.autoitscript.com/site/
+// by Jos van der Zande, jvdzande@yahoo.com
+//
+// Changes:
+// March 28, 2004 - Added the standard Folding code
+// April 21, 2004 - Added Preprosessor Table + Syntax Highlighting
+//                  Fixed Number highlighting
+//                  Changed default isoperator to IsAOperator to have a better match to AutoIt3
+//                  Fixed "#comments_start" -> "#comments-start"
+//                  Fixed "#comments_end" -> "#comments-end"
+//                  Fixed Sendkeys in Strings when not terminated with }
+//                  Added support for Sendkey strings that have second parameter e.g. {UP 5} or {a down}
+// April 26, 2004 - Fixed # pre-processor statement inside of comment block would invalidly change the color.
+//                  Added logic for #include <xyz.au3> to treat the <> as string
+//                  Added underscore to IsAOperator.
+// May 17, 2004   - Changed the folding logic from indent to keyword folding.
+//                  Added Folding logic for blocks of single-commentlines or commentblock.
+//                        triggered by: fold.comment=1
+//                  Added Folding logic for preprocessor blocks triggered by fold.preprocessor=1
+//                  Added Special for #region - #endregion syntax highlight and folding.
+// May 30, 2004   - Fixed issue with continuation lines on If statements.
+// June 5, 2004   - Added comma to Operators for better readability.
+//                  Added fold.compact support set with fold.compact=1
+//                  Changed folding inside of #cs-#ce. Default is no keyword folding inside comment blocks when fold.comment=1
+//                        it will now only happen when fold.comment=2.
+// Sep 5, 2004    - Added logic to handle colourizing words on the last line.
+//                        Typed Characters now show as "default" till they match any table.
+// Oct 10, 2004   - Added logic to show Comments in "Special" directives.
+// Nov  1, 2004   - Added better testing for Numbers supporting x and e notation.
+// Nov 28, 2004   - Added logic to handle continuation lines for syntax highlighting.
+// Jan 10, 2005   - Added Abbreviations Keyword used for expansion
+// Mar 24, 2005   - Updated Abbreviations Keywords to fix when followed by Operator.
+// Apr 18, 2005   - Updated #CE/#Comment-End logic to take a linecomment ";" into account
+//                - Added folding support for With...EndWith
+//                - Added support for a DOT in variable names
+//                - Fixed Underscore in CommentBlock
+// May 23, 2005   - Fixed the SentKey lexing in case of a missing }
+// Aug 11, 2005   - Fixed possible bug with s_save length > 100.
+// Aug 23, 2005   - Added Switch/endswitch support to the folding logic.
+// Sep 27, 2005   - Fixed the SentKey lexing logic in case of multiple sentkeys.
+// Mar 12, 2006   - Fixed issue with <> coloring as String in stead of Operator in rare occasions.
+// Apr  8, 2006   - Added support for AutoIt3 Standard UDF library (SCE_AU3_UDF)
+// Mar  9, 2007   - Fixed bug with + following a String getting the wrong Color.
+// Jun 20, 2007   - Fixed Commentblock issue when LF's are used as EOL.
+// Jul 26, 2007   - Fixed #endregion undetected bug.
+//
+// Copyright for Scintilla: 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+// Scintilla source code edit control
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsTypeCharacter(const int ch)
+{
+    return ch == '$';
+}
+static inline bool IsAWordChar(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '@' || ch == '#' || ch == '$' || ch == '.');
+}
+
+static inline bool IsAOperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+	    ch == '&' || ch == '^' || ch == '=' || ch == '<' || ch == '>' ||
+	    ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == ',' )
+		return true;
+	return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GetSendKey() filters the portion before and after a/multiple space(s)
+// and return the first portion to be looked-up in the table
+// also check if the second portion is valid... (up,down.on.off,toggle or a number)
+///////////////////////////////////////////////////////////////////////////////
+
+static int GetSendKey(const char *szLine, char *szKey)
+{
+	int		nFlag	= 0;
+	int		nStartFound	= 0;
+	int		nKeyPos	= 0;
+	int		nSpecPos= 0;
+	int		nSpecNum= 1;
+	int		nPos	= 0;
+	char	cTemp;
+	char	szSpecial[100];
+
+	// split the portion of the sendkey in the part before and after the spaces
+	while ( ( (cTemp = szLine[nPos]) != '\0'))
+	{
+		// skip leading Ctrl/Shift/Alt state
+		if (cTemp == '{') {
+			nStartFound = 1;
+		}
+		//
+		if (nStartFound == 1) {
+			if ((cTemp == ' ') && (nFlag == 0) ) // get the stuff till first space
+			{
+				nFlag = 1;
+				// Add } to the end of the first bit for table lookup later.
+				szKey[nKeyPos++] = '}';
+			}
+			else if (cTemp == ' ')
+			{
+				// skip other spaces
+			}
+			else if (nFlag == 0)
+			{
+				// save first portion into var till space or } is hit
+				szKey[nKeyPos++] = cTemp;
+			}
+			else if ((nFlag == 1) && (cTemp != '}'))
+			{
+				// Save second portion into var...
+				szSpecial[nSpecPos++] = cTemp;
+				// check if Second portion is all numbers for repeat fuction
+				if (isdigit(cTemp) == false) {nSpecNum = 0;}
+			}
+		}
+		nPos++;									// skip to next char
+
+	} // End While
+
+
+	// Check if the second portion is either a number or one of these keywords
+	szKey[nKeyPos] = '\0';
+	szSpecial[nSpecPos] = '\0';
+	if (strcmp(szSpecial,"down")== 0    || strcmp(szSpecial,"up")== 0  ||
+		strcmp(szSpecial,"on")== 0      || strcmp(szSpecial,"off")== 0 ||
+		strcmp(szSpecial,"toggle")== 0  || nSpecNum == 1 )
+	{
+		nFlag = 0;
+	}
+	else
+	{
+		nFlag = 1;
+	}
+	return nFlag;  // 1 is bad, 0 is good
+
+} // GetSendKey()
+
+//
+// Routine to check the last "none comment" character on a line to see if its a continuation
+//
+static bool IsContinuationLine(Sci_PositionU szLine, Accessor &styler)
+{
+	Sci_Position nsPos = styler.LineStart(szLine);
+	Sci_Position nePos = styler.LineStart(szLine+1) - 2;
+	//int stylech = styler.StyleAt(nsPos);
+	while (nsPos < nePos)
+	{
+		//stylech = styler.StyleAt(nePos);
+		int stylech = styler.StyleAt(nsPos);
+		if (!(stylech == SCE_AU3_COMMENT)) {
+			char ch = styler.SafeGetCharAt(nePos);
+			if (!isspacechar(ch)) {
+				if (ch == '_')
+					return true;
+				else
+					return false;
+			}
+		}
+		nePos--; // skip to next char
+	} // End While
+	return false;
+} // IsContinuationLine()
+
+//
+// syntax highlighting logic
+static void ColouriseAU3Doc(Sci_PositionU startPos,
+							Sci_Position length, int initStyle,
+							WordList *keywordlists[],
+							Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    WordList &keywords4 = *keywordlists[3];
+    WordList &keywords5 = *keywordlists[4];
+    WordList &keywords6 = *keywordlists[5];
+    WordList &keywords7 = *keywordlists[6];
+    WordList &keywords8 = *keywordlists[7];
+	// find the first previous line without continuation character at the end
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	Sci_Position s_startPos = startPos;
+	// When not inside a Block comment: find First line without _
+	if (!(initStyle==SCE_AU3_COMMENTBLOCK)) {
+		while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
+			   (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent); // get start position
+			initStyle =  0;                           // reset the start style to 0
+		}
+	}
+	// Set the new length to include it from the start and set the start position
+	length = length + s_startPos - startPos;      // correct the total length to process
+    styler.StartAt(startPos);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+	char si;     // string indicator "=1 '=2
+	char ni;     // Numeric indicator error=9 normal=0 normal+dec=1 hex=2 Enot=3
+	char ci;     // comment indicator 0=not linecomment(;)
+	char s_save[100] = "";
+	si=0;
+	ni=0;
+	ci=0;
+	//$$$
+    for (; sc.More(); sc.Forward()) {
+		char s[100];
+		sc.GetCurrentLowered(s, sizeof(s));
+		// **********************************************
+		// save the total current word for eof processing
+		if (IsAWordChar(sc.ch) || sc.ch == '}')
+		{
+			strcpy(s_save,s);
+			int tp = static_cast<int>(strlen(s_save));
+			if (tp < 99) {
+				s_save[tp] = static_cast<char>(tolower(sc.ch));
+				s_save[tp+1] = '\0';
+			}
+		}
+		// **********************************************
+		//
+		switch (sc.state)
+        {
+            case SCE_AU3_COMMENTBLOCK:
+            {
+				//Reset at line end
+				if (sc.atLineEnd) {
+					ci=0;
+					if (strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0) {
+						if (sc.atLineEnd)
+							sc.SetState(SCE_AU3_DEFAULT);
+						else
+							sc.SetState(SCE_AU3_COMMENTBLOCK);
+					}
+					break;
+				}
+				//skip rest of line when a ; is encountered
+				if (sc.chPrev == ';') {
+					ci=2;
+					sc.SetState(SCE_AU3_COMMENTBLOCK);
+				}
+				// skip rest of the line
+				if (ci==2)
+					break;
+				// check when first character is detected on the line
+				if (ci==0) {
+					if (IsAWordStart(static_cast<char>(sc.ch)) || IsAOperator(static_cast<char>(sc.ch))) {
+						ci=1;
+						sc.SetState(SCE_AU3_COMMENTBLOCK);
+					}
+					break;
+				}
+				if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && strcmp(s, "#comments") == 0))) {
+					if ((strcmp(s, "#ce")== 0 || strcmp(s, "#comments-end")== 0))
+							sc.SetState(SCE_AU3_COMMENT);  // set to comment line for the rest of the line
+					else
+						ci=2;  // line doesn't begin with #CE so skip the rest of the line
+				}
+				break;
+			}
+            case SCE_AU3_COMMENT:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+            case SCE_AU3_OPERATOR:
+            {
+                // check if its a COMobject
+				if (sc.chPrev == '.' && IsAWordChar(sc.ch)) {
+					sc.SetState(SCE_AU3_COMOBJ);
+				}
+				else {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+                break;
+            }
+            case SCE_AU3_SPECIAL:
+            {
+                if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
+				if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+            case SCE_AU3_KEYWORD:
+            {
+                if (!(IsAWordChar(sc.ch) || (sc.ch == '-' && (strcmp(s, "#comments") == 0 || strcmp(s, "#include") == 0))))
+                {
+                    if (!IsTypeCharacter(sc.ch))
+                    {
+						if (strcmp(s, "#cs")== 0 || strcmp(s, "#comments-start")== 0 )
+						{
+							sc.ChangeState(SCE_AU3_COMMENTBLOCK);
+							sc.SetState(SCE_AU3_COMMENTBLOCK);
+							break;
+						}
+						else if (keywords.InList(s)) {
+							sc.ChangeState(SCE_AU3_KEYWORD);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords2.InList(s)) {
+							sc.ChangeState(SCE_AU3_FUNCTION);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords3.InList(s)) {
+							sc.ChangeState(SCE_AU3_MACRO);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords5.InList(s)) {
+							sc.ChangeState(SCE_AU3_PREPROCESSOR);
+							sc.SetState(SCE_AU3_DEFAULT);
+							if (strcmp(s, "#include")== 0)
+							{
+								si = 3;   // use to determine string start for #inlude <>
+							}
+						}
+						else if (keywords6.InList(s)) {
+							sc.ChangeState(SCE_AU3_SPECIAL);
+							sc.SetState(SCE_AU3_SPECIAL);
+						}
+						else if ((keywords7.InList(s)) && (!IsAOperator(static_cast<char>(sc.ch)))) {
+							sc.ChangeState(SCE_AU3_EXPAND);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (keywords8.InList(s)) {
+							sc.ChangeState(SCE_AU3_UDF);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (strcmp(s, "_") == 0) {
+							sc.ChangeState(SCE_AU3_OPERATOR);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+						else if (!IsAWordChar(sc.ch)) {
+							sc.ChangeState(SCE_AU3_DEFAULT);
+							sc.SetState(SCE_AU3_DEFAULT);
+						}
+					}
+				}
+                if (sc.atLineEnd) {
+					sc.SetState(SCE_AU3_DEFAULT);}
+                break;
+            }
+			case SCE_AU3_NUMBER:
+            {
+				// Numeric indicator error=9 normal=0 normal+dec=1 hex=2 E-not=3
+				//
+				// test for Hex notation
+				if (strcmp(s, "0") == 0 && (sc.ch == 'x' || sc.ch == 'X') && ni == 0)
+				{
+					ni = 2;
+					break;
+				}
+				// test for E notation
+				if (IsADigit(sc.chPrev) && (sc.ch == 'e' || sc.ch == 'E') && ni <= 1)
+				{
+					ni = 3;
+					break;
+				}
+				//  Allow Hex characters inside hex numeric strings
+				if ((ni == 2) &&
+					(sc.ch == 'a' || sc.ch == 'b' || sc.ch == 'c' || sc.ch == 'd' || sc.ch == 'e' || sc.ch == 'f' ||
+					 sc.ch == 'A' || sc.ch == 'B' || sc.ch == 'C' || sc.ch == 'D' || sc.ch == 'E' || sc.ch == 'F' ))
+				{
+					break;
+				}
+				// test for 1 dec point only
+				if (sc.ch == '.')
+				{
+					if (ni==0)
+					{
+						ni=1;
+					}
+					else
+					{
+						ni=9;
+					}
+					break;
+				}
+				// end of numeric string ?
+				if (!(IsADigit(sc.ch)))
+				{
+					if (ni==9)
+					{
+						sc.ChangeState(SCE_AU3_DEFAULT);
+					}
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+			}
+			case SCE_AU3_VARIABLE:
+			{
+				// Check if its a COMObject
+				if (sc.ch == '.' && !IsADigit(sc.chNext)) {
+					sc.SetState(SCE_AU3_OPERATOR);
+				}
+				else if (!IsAWordChar(sc.ch)) {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+			case SCE_AU3_COMOBJ:
+			{
+				if (!(IsAWordChar(sc.ch))) {
+					sc.SetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+            case SCE_AU3_STRING:
+            {
+				// check for " to end a double qouted string or
+				// check for ' to end a single qouted string
+	            if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\'') || (si == 3 && sc.ch == '>'))
+				{
+					sc.ForwardSetState(SCE_AU3_DEFAULT);
+					si=0;
+					break;
+				}
+                if (sc.atLineEnd)
+				{
+					si=0;
+					// at line end and not found a continuation char then reset to default
+					Sci_Position lineCurrent = styler.GetLine(sc.currentPos);
+					if (!IsContinuationLine(lineCurrent,styler))
+					{
+						sc.SetState(SCE_AU3_DEFAULT);
+						break;
+					}
+				}
+				// find Sendkeys in a STRING
+				if (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ) {
+					sc.SetState(SCE_AU3_SENT);}
+				break;
+            }
+
+            case SCE_AU3_SENT:
+            {
+				// Send key string ended
+				if (sc.chPrev == '}' && sc.ch != '}')
+				{
+					// set color to SENDKEY when valid sendkey .. else set back to regular string
+					char sk[100];
+					// split {111 222} and return {111} and check if 222 is valid.
+					// if return code = 1 then invalid 222 so must be string
+					if (GetSendKey(s,sk))
+					{
+						sc.ChangeState(SCE_AU3_STRING);
+					}
+					// if single char between {?} then its ok as sendkey for a single character
+					else if (strlen(sk) == 3)
+					{
+						sc.ChangeState(SCE_AU3_SENT);
+					}
+					// if sendkey {111} is in table then ok as sendkey
+					else if (keywords4.InList(sk))
+					{
+						sc.ChangeState(SCE_AU3_SENT);
+					}
+					else
+					{
+						sc.ChangeState(SCE_AU3_STRING);
+					}
+					sc.SetState(SCE_AU3_STRING);
+				}
+				else
+				{
+					// check if the start is a valid SendKey start
+					Sci_Position		nPos	= 0;
+					int		nState	= 1;
+					char	cTemp;
+					while (!(nState == 2) && ((cTemp = s[nPos]) != '\0'))
+					{
+						if (cTemp == '{' && nState == 1)
+						{
+							nState = 2;
+						}
+						if (nState == 1 && !(cTemp == '+' || cTemp == '!' || cTemp == '^' || cTemp == '#' ))
+						{
+							nState = 0;
+						}
+						nPos++;
+					}
+					//Verify characters infront of { ... if not assume  regular string
+					if (nState == 1 && (!(sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' ))) {
+						sc.ChangeState(SCE_AU3_STRING);
+						sc.SetState(SCE_AU3_STRING);
+					}
+					// If invalid character found then assume its a regular string
+					if (nState == 0) {
+						sc.ChangeState(SCE_AU3_STRING);
+						sc.SetState(SCE_AU3_STRING);
+					}
+				}
+				// check if next portion is again a sendkey
+				if (sc.atLineEnd)
+				{
+					sc.ChangeState(SCE_AU3_STRING);
+					sc.SetState(SCE_AU3_DEFAULT);
+					si = 0;  // reset string indicator
+				}
+				//* check in next characters following a sentkey are again a sent key
+				// Need this test incase of 2 sentkeys like {F1}{ENTER} but not detect {{}
+				if (sc.state == SCE_AU3_STRING && (sc.ch == '{' || sc.ch == '+' || sc.ch == '!' || sc.ch == '^' || sc.ch == '#' )) {
+					sc.SetState(SCE_AU3_SENT);}
+				// check to see if the string ended...
+				// Sendkey string isn't complete but the string ended....
+				if ((si == 1 && sc.ch == '\"') || (si == 2 && sc.ch == '\''))
+				{
+					sc.ChangeState(SCE_AU3_STRING);
+					sc.ForwardSetState(SCE_AU3_DEFAULT);
+				}
+				break;
+            }
+        }  //switch (sc.state)
+
+        // Determine if a new state should be entered:
+
+		if (sc.state == SCE_AU3_DEFAULT)
+        {
+            if (sc.ch == ';') {sc.SetState(SCE_AU3_COMMENT);}
+            else if (sc.ch == '#') {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (sc.ch == '$') {sc.SetState(SCE_AU3_VARIABLE);}
+            else if (sc.ch == '.' && !IsADigit(sc.chNext)) {sc.SetState(SCE_AU3_OPERATOR);}
+            else if (sc.ch == '@') {sc.SetState(SCE_AU3_KEYWORD);}
+            //else if (sc.ch == '_') {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (sc.ch == '<' && si==3) {sc.SetState(SCE_AU3_STRING);}  // string after #include
+            else if (sc.ch == '\"') {
+				sc.SetState(SCE_AU3_STRING);
+				si = 1;	}
+            else if (sc.ch == '\'') {
+				sc.SetState(SCE_AU3_STRING);
+				si = 2;	}
+            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext)))
+			{
+				sc.SetState(SCE_AU3_NUMBER);
+				ni = 0;
+			}
+            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_AU3_KEYWORD);}
+            else if (IsAOperator(static_cast<char>(sc.ch))) {sc.SetState(SCE_AU3_OPERATOR);}
+			else if (sc.atLineEnd) {sc.SetState(SCE_AU3_DEFAULT);}
+        }
+    }      //for (; sc.More(); sc.Forward())
+
+	//*************************************
+	// Colourize the last word correctly
+	//*************************************
+	if (sc.state == SCE_AU3_KEYWORD)
+		{
+		if (strcmp(s_save, "#cs")== 0 || strcmp(s_save, "#comments-start")== 0 )
+		{
+			sc.ChangeState(SCE_AU3_COMMENTBLOCK);
+			sc.SetState(SCE_AU3_COMMENTBLOCK);
+		}
+		else if (keywords.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_KEYWORD);
+			sc.SetState(SCE_AU3_KEYWORD);
+		}
+		else if (keywords2.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_FUNCTION);
+			sc.SetState(SCE_AU3_FUNCTION);
+		}
+		else if (keywords3.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_MACRO);
+			sc.SetState(SCE_AU3_MACRO);
+		}
+		else if (keywords5.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_PREPROCESSOR);
+			sc.SetState(SCE_AU3_PREPROCESSOR);
+		}
+		else if (keywords6.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_SPECIAL);
+			sc.SetState(SCE_AU3_SPECIAL);
+		}
+		else if (keywords7.InList(s_save) && sc.atLineEnd) {
+			sc.ChangeState(SCE_AU3_EXPAND);
+			sc.SetState(SCE_AU3_EXPAND);
+		}
+		else if (keywords8.InList(s_save)) {
+			sc.ChangeState(SCE_AU3_UDF);
+			sc.SetState(SCE_AU3_UDF);
+		}
+		else {
+			sc.ChangeState(SCE_AU3_DEFAULT);
+			sc.SetState(SCE_AU3_DEFAULT);
+		}
+	}
+	if (sc.state == SCE_AU3_SENT)
+    {
+		// Send key string ended
+		if (sc.chPrev == '}' && sc.ch != '}')
+		{
+			// set color to SENDKEY when valid sendkey .. else set back to regular string
+			char sk[100];
+			// split {111 222} and return {111} and check if 222 is valid.
+			// if return code = 1 then invalid 222 so must be string
+			if (GetSendKey(s_save,sk))
+			{
+				sc.ChangeState(SCE_AU3_STRING);
+			}
+			// if single char between {?} then its ok as sendkey for a single character
+			else if (strlen(sk) == 3)
+			{
+				sc.ChangeState(SCE_AU3_SENT);
+			}
+			// if sendkey {111} is in table then ok as sendkey
+			else if (keywords4.InList(sk))
+			{
+				sc.ChangeState(SCE_AU3_SENT);
+			}
+			else
+			{
+				sc.ChangeState(SCE_AU3_STRING);
+			}
+			sc.SetState(SCE_AU3_STRING);
+		}
+		// check if next portion is again a sendkey
+		if (sc.atLineEnd)
+		{
+			sc.ChangeState(SCE_AU3_STRING);
+			sc.SetState(SCE_AU3_DEFAULT);
+		}
+    }
+	//*************************************
+	sc.Complete();
+}
+
+//
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_AU3_COMMENT || style == SCE_AU3_COMMENTBLOCK;
+}
+
+//
+// Routine to find first none space on the current line and return its Style
+// needed for comment lines not starting on pos 1
+static int GetStyleFirstWord(Sci_PositionU szLine, Accessor &styler)
+{
+	Sci_Position nsPos = styler.LineStart(szLine);
+	Sci_Position nePos = styler.LineStart(szLine+1) - 1;
+	while (isspacechar(styler.SafeGetCharAt(nsPos)) && nsPos < nePos)
+	{
+		nsPos++; // skip to next char
+
+	} // End While
+	return styler.StyleAt(nsPos);
+
+} // GetStyleFirstWord()
+
+
+//
+static void FoldAU3Doc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	Sci_Position endPos = startPos + length;
+	// get settings from the config files for folding comments and preprocessor lines
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldInComment = styler.GetPropertyInt("fold.comment") == 2;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldpreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	// Backtrack to previous line in case need to fix its fold status
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	// vars for style of previous/current/next lines
+	int style = GetStyleFirstWord(lineCurrent,styler);
+	int stylePrev = 0;
+	// find the first previous line without continuation character at the end
+	while ((lineCurrent > 0 && IsContinuationLine(lineCurrent,styler)) ||
+	       (lineCurrent > 1 && IsContinuationLine(lineCurrent-1,styler))) {
+		lineCurrent--;
+		startPos = styler.LineStart(lineCurrent);
+	}
+	if (lineCurrent > 0) {
+		stylePrev = GetStyleFirstWord(lineCurrent-1,styler);
+	}
+	// vars for getting first word to check for keywords
+	bool FirstWordStart = false;
+	bool FirstWordEnd = false;
+	char szKeyword[11]="";
+	int	 szKeywordlen = 0;
+	char szThen[5]="";
+	int	 szThenlen = 0;
+	bool ThenFoundLast = false;
+	// var for indentlevel
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+	//
+	int	visibleChars = 0;
+	char chNext = styler.SafeGetCharAt(startPos);
+	char chPrev = ' ';
+	//
+	for (Sci_Position i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		if (IsAWordChar(ch)) {
+			visibleChars++;
+		}
+		// get the syle for the current character neede to check in comment
+		int stylech = styler.StyleAt(i);
+		// get first word for the line for indent check max 9 characters
+		if (FirstWordStart && (!(FirstWordEnd))) {
+			if (!IsAWordChar(ch)) {
+				FirstWordEnd = true;
+				szKeyword[szKeywordlen] = '\0';
+			}
+			else {
+				if (szKeywordlen < 10) {
+				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
+				}
+			}
+		}
+		// start the capture of the first word
+		if (!(FirstWordStart)) {
+			if (IsAWordChar(ch) || IsAWordStart(ch) || ch == ';') {
+				FirstWordStart = true;
+				szKeyword[szKeywordlen++] = static_cast<char>(tolower(ch));
+			}
+		}
+		// only process this logic when not in comment section
+		if (!(stylech == SCE_AU3_COMMENT)) {
+			if (ThenFoundLast) {
+				if (IsAWordChar(ch)) {
+					ThenFoundLast = false;
+				}
+			}
+			// find out if the word "then" is the last on a "if" line
+			if (FirstWordEnd && strcmp(szKeyword,"if") == 0) {
+				if (szThenlen == 4) {
+					szThen[0] = szThen[1];
+					szThen[1] = szThen[2];
+					szThen[2] = szThen[3];
+					szThen[3] = static_cast<char>(tolower(ch));
+					if (strcmp(szThen,"then") == 0 ) {
+						ThenFoundLast = true;
+					}
+				}
+				else {
+					szThen[szThenlen++] = static_cast<char>(tolower(ch));
+					if (szThenlen == 5) {
+						szThen[4] = '\0';
+					}
+				}
+			}
+		}
+		// End of Line found so process the information
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			// **************************
+			// Folding logic for Keywords
+			// **************************
+			// if a keyword is found on the current line and the line doesn't end with _ (continuation)
+			//    and we are not inside a commentblock.
+			if (szKeywordlen > 0 && (!(chPrev == '_')) &&
+				((!(IsStreamCommentStyle(style)) || foldInComment)) ) {
+				szKeyword[szKeywordlen] = '\0';
+				// only fold "if" last keyword is "then"  (else its a one line if)
+				if (strcmp(szKeyword,"if") == 0  && ThenFoundLast) {
+						levelNext++;
+				}
+				// create new fold for these words
+				if (strcmp(szKeyword,"do") == 0   || strcmp(szKeyword,"for") == 0 ||
+					strcmp(szKeyword,"func") == 0 || strcmp(szKeyword,"while") == 0||
+					strcmp(szKeyword,"with") == 0 || strcmp(szKeyword,"#region") == 0 ) {
+						levelNext++;
+				}
+				// create double Fold for select&switch because Case will subtract one of the current level
+				if (strcmp(szKeyword,"select") == 0 || strcmp(szKeyword,"switch") == 0) {
+						levelNext++;
+						levelNext++;
+				}
+				// end the fold for these words before the current line
+				if (strcmp(szKeyword,"endfunc") == 0 || strcmp(szKeyword,"endif") == 0 ||
+					strcmp(szKeyword,"next") == 0    || strcmp(szKeyword,"until") == 0 ||
+					strcmp(szKeyword,"endwith") == 0 ||strcmp(szKeyword,"wend") == 0){
+						levelNext--;
+						levelCurrent--;
+				}
+				// end the fold for these words before the current line and Start new fold
+				if (strcmp(szKeyword,"case") == 0      || strcmp(szKeyword,"else") == 0 ||
+					strcmp(szKeyword,"elseif") == 0 ) {
+						levelCurrent--;
+				}
+				// end the double fold for this word before the current line
+				if (strcmp(szKeyword,"endselect") == 0 || strcmp(szKeyword,"endswitch") == 0 ) {
+						levelNext--;
+						levelNext--;
+						levelCurrent--;
+						levelCurrent--;
+				}
+				// end the fold for these words on the current line
+				if (strcmp(szKeyword,"#endregion") == 0 ) {
+						levelNext--;
+				}
+			}
+			// Preprocessor and Comment folding
+			int styleNext = GetStyleFirstWord(lineCurrent + 1,styler);
+			// *************************************
+			// Folding logic for preprocessor blocks
+			// *************************************
+			// process preprosessor line
+			if (foldpreprocessor && style == SCE_AU3_PREPROCESSOR) {
+				if (!(stylePrev == SCE_AU3_PREPROCESSOR) && (styleNext == SCE_AU3_PREPROCESSOR)) {
+				    levelNext++;
+				}
+				// fold till the last line for normal comment lines
+				else if (stylePrev == SCE_AU3_PREPROCESSOR && !(styleNext == SCE_AU3_PREPROCESSOR)) {
+					levelNext--;
+				}
+			}
+			// *********************************
+			// Folding logic for Comment blocks
+			// *********************************
+			if (foldComment && IsStreamCommentStyle(style)) {
+				// Start of a comment block
+				if (!(stylePrev==style) && IsStreamCommentStyle(styleNext) && styleNext==style) {
+				    levelNext++;
+				}
+				// fold till the last line for normal comment lines
+				else if (IsStreamCommentStyle(stylePrev)
+						&& !(styleNext == SCE_AU3_COMMENT)
+						&& stylePrev == SCE_AU3_COMMENT
+						&& style == SCE_AU3_COMMENT) {
+					levelNext--;
+				}
+				// fold till the one but last line for Blockcomment lines
+				else if (IsStreamCommentStyle(stylePrev)
+						&& !(styleNext == SCE_AU3_COMMENTBLOCK)
+						&& style == SCE_AU3_COMMENTBLOCK) {
+					levelNext--;
+					levelCurrent--;
+				}
+			}
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			// reset values for the next line
+			lineCurrent++;
+			stylePrev = style;
+			style = styleNext;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+			// if the last character is an Underscore then don't reset since the line continues on the next line.
+			if (!(chPrev == '_')) {
+				szKeywordlen = 0;
+				szThenlen = 0;
+				FirstWordStart = false;
+				FirstWordEnd = false;
+				ThenFoundLast = false;
+			}
+		}
+		// save the last processed character
+		if (!isspacechar(ch)) {
+			chPrev = ch;
+			visibleChars++;
+		}
+	}
+}
+
+
+//
+
+static const char * const AU3WordLists[] = {
+    "#autoit keywords",
+    "#autoit functions",
+    "#autoit macros",
+    "#autoit Sent keys",
+    "#autoit Pre-processors",
+    "#autoit Special",
+    "#autoit Expand",
+    "#autoit UDF",
+    0
+};
+LexerModule lmAU3(SCLEX_AU3, ColouriseAU3Doc, "au3", FoldAU3Doc , AU3WordLists);
diff --git a/scite-app/lexilla/lexers/LexAVE.cxx b/scite-app/lexilla/lexers/LexAVE.cxx
new file mode 100644
index 0000000..014b309
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAVE.cxx
@@ -0,0 +1,232 @@
+// SciTE - Scintilla based Text Editor
+/** @file LexAVE.cxx
+ ** Lexer for Avenue.
+ **
+  ** Written by Alexey Yutkin <yutkin@geol.msu.ru>.
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+static inline bool IsEnumChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch)|| ch == '_');
+}
+static inline bool IsANumberChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' );
+}
+
+inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+inline bool isAveOperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' ||
+		ch == '{' || ch == '}' ||
+		ch == '[' || ch == ']' || ch == ';' ||
+		ch == '<' || ch == '>' || ch == ',' ||
+		ch == '.'  )
+		return true;
+	return false;
+}
+
+static void ColouriseAveDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_AVE_STRINGEOL) {
+		initStyle = SCE_AVE_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			Sci_Position currentLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(currentLine, 0);
+		}
+		if (sc.atLineStart && (sc.state == SCE_AVE_STRING)) {
+			// Prevent SCE_AVE_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_AVE_STRING);
+		}
+
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_AVE_OPERATOR) {
+			sc.SetState(SCE_AVE_DEFAULT);
+		} else if (sc.state == SCE_AVE_NUMBER) {
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_ENUM) {
+			if (!IsEnumChar(sc.ch)) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				//sc.GetCurrent(s, sizeof(s));
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD4);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD5);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_AVE_WORD6);
+				}
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_AVE_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVE_STRING) {
+			 if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_AVE_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_AVE_STRINGEOL);
+				sc.ForwardSetState(SCE_AVE_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_AVE_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_AVE_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_AVE_IDENTIFIER);
+			} else if (sc.Match('\"')) {
+				sc.SetState(SCE_AVE_STRING);
+			} else if (sc.Match('\'')) {
+				sc.SetState(SCE_AVE_COMMENT);
+				sc.Forward();
+			} else if (isAveOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_AVE_OPERATOR);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_AVE_ENUM);
+				sc.Forward();
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldAveDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[],
+                       Accessor &styler) {
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = static_cast<char>(tolower(styler[startPos]));
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int styleNext = styler.StyleAt(startPos);
+	char s[10] = "";
+
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = static_cast<char>(tolower(chNext));
+		chNext = static_cast<char>(tolower(styler.SafeGetCharAt(i + 1)));
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_AVE_WORD) {
+			if (ch == 't' || ch == 'f' || ch == 'w' || ch == 'e') {
+				for (unsigned int j = 0; j < 6; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = static_cast<char>(tolower(styler[i + j]));
+					s[j + 1] = '\0';
+				}
+
+				if ((strcmp(s, "then") == 0) || (strcmp(s, "for") == 0) || (strcmp(s, "while") == 0)) {
+					levelCurrent++;
+				}
+				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0)) {
+					// Normally "elseif" and "then" will be on the same line and will cancel
+					// each other out.  // As implemented, this does not support fold.at.else.
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_AVE_OPERATOR) {
+			if (ch == '{' || ch == '(') {
+				levelCurrent++;
+			} else if (ch == '}' || ch == ')') {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave", FoldAveDoc);
+
diff --git a/scite-app/lexilla/lexers/LexAVS.cxx b/scite-app/lexilla/lexers/LexAVS.cxx
new file mode 100644
index 0000000..0ea47ca
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAVS.cxx
@@ -0,0 +1,294 @@
+// Scintilla source code edit control
+/** @file LexAVS.cxx
+ ** Lexer for AviSynth.
+ **/
+// Copyright 2012 by Bruno Barbieri <brunorex@gmail.com>
+// Heavily based on LexPOV by Neil Hodgson
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return isalpha(ch) || (ch != ' ' && ch != '\n' && ch != '(' && ch != '.' && ch != ',');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+			(isdigit(ch) || ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseAvsDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &filters = *keywordlists[1];
+	WordList &plugins = *keywordlists[2];
+	WordList &functions = *keywordlists[3];
+	WordList &clipProperties = *keywordlists[4];
+	WordList &userDefined = *keywordlists[5];
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	// Initialize the block comment nesting level, if we are inside such a comment.
+	int blockCommentLevel = 0;
+	if (initStyle == SCE_AVS_COMMENTBLOCK || initStyle == SCE_AVS_COMMENTBLOCKN) {
+		blockCommentLevel = styler.GetLineState(currentLine - 1);
+	}
+
+	// Do not leak onto next line
+	if (initStyle == SCE_AVS_COMMENTLINE) {
+		initStyle = SCE_AVS_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			if (sc.state == SCE_AVS_COMMENTBLOCK || sc.state == SCE_AVS_COMMENTBLOCKN) {
+				// Inside a block comment, we set the line state
+				styler.SetLineState(currentLine, blockCommentLevel);
+			} else {
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_AVS_OPERATOR) {
+			sc.SetState(SCE_AVS_DEFAULT);
+		} else if (sc.state == SCE_AVS_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-sign char
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_AVS_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVS_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_AVS_KEYWORD);
+				} else if (filters.InList(s)) {
+					sc.ChangeState(SCE_AVS_FILTER);
+				} else if (plugins.InList(s)) {
+					sc.ChangeState(SCE_AVS_PLUGIN);
+				} else if (functions.InList(s)) {
+					sc.ChangeState(SCE_AVS_FUNCTION);
+				} else if (clipProperties.InList(s)) {
+					sc.ChangeState(SCE_AVS_CLIPPROP);
+				} else if (userDefined.InList(s)) {
+					sc.ChangeState(SCE_AVS_USERDFN);
+				}
+				sc.SetState(SCE_AVS_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVS_COMMENTBLOCK) {
+			if (sc.Match('/', '*')) {
+				blockCommentLevel++;
+				sc.Forward();
+			} else if (sc.Match('*', '/') && blockCommentLevel > 0) {
+				blockCommentLevel--;
+				sc.Forward();
+				if (blockCommentLevel == 0) {
+					sc.ForwardSetState(SCE_AVS_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_AVS_COMMENTBLOCKN) {
+			if (sc.Match('[', '*')) {
+				blockCommentLevel++;
+				sc.Forward();
+			} else if (sc.Match('*', ']') && blockCommentLevel > 0) {
+				blockCommentLevel--;
+				sc.Forward();
+				if (blockCommentLevel == 0) {
+					sc.ForwardSetState(SCE_AVS_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_AVS_COMMENTLINE) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_AVS_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVS_STRING) {
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_AVS_DEFAULT);
+			}
+		} else if (sc.state == SCE_AVS_TRIPLESTRING) {
+			if (sc.Match("\"\"\"")) {
+				sc.Forward();
+				sc.Forward();
+				sc.ForwardSetState(SCE_AVS_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_AVS_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_AVS_NUMBER);
+			} else 	if (IsADigit(sc.ch) || (sc.ch == ',' && IsADigit(sc.chNext))) {
+				sc.Forward();
+				sc.SetState(SCE_AVS_NUMBER);
+			} else if (sc.Match('/', '*')) {
+				blockCommentLevel = 1;
+				sc.SetState(SCE_AVS_COMMENTBLOCK);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('[', '*')) {
+				blockCommentLevel = 1;
+				sc.SetState(SCE_AVS_COMMENTBLOCKN);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_AVS_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				if (sc.Match("\"\"\"")) {
+					sc.SetState(SCE_AVS_TRIPLESTRING);
+				} else {
+					sc.SetState(SCE_AVS_STRING);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_AVS_OPERATOR);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_AVS_IDENTIFIER);
+			}
+		}
+	}
+
+	// End of file: complete any pending changeState
+	if (sc.state == SCE_AVS_IDENTIFIER) {
+		if (!IsAWordChar(sc.ch)) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+
+			if (keywords.InList(s)) {
+				sc.ChangeState(SCE_AVS_KEYWORD);
+			} else if (filters.InList(s)) {
+				sc.ChangeState(SCE_AVS_FILTER);
+			} else if (plugins.InList(s)) {
+				sc.ChangeState(SCE_AVS_PLUGIN);
+			} else if (functions.InList(s)) {
+				sc.ChangeState(SCE_AVS_FUNCTION);
+			} else if (clipProperties.InList(s)) {
+				sc.ChangeState(SCE_AVS_CLIPPROP);
+			} else if (userDefined.InList(s)) {
+				sc.ChangeState(SCE_AVS_USERDFN);
+			}
+			sc.SetState(SCE_AVS_DEFAULT);
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldAvsDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *[],
+	Accessor &styler) {
+
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && style == SCE_AVS_COMMENTBLOCK) {
+			if (stylePrev != SCE_AVS_COMMENTBLOCK) {
+				levelCurrent++;
+			} else if ((styleNext != SCE_AVS_COMMENTBLOCK) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (foldComment && style == SCE_AVS_COMMENTBLOCKN) {
+			if (stylePrev != SCE_AVS_COMMENTBLOCKN) {
+				levelCurrent++;
+			} else if ((styleNext != SCE_AVS_COMMENTBLOCKN) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (style == SCE_AVS_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const avsWordLists[] = {
+	"Keywords",
+	"Filters",
+	"Plugins",
+	"Functions",
+	"Clip properties",
+	"User defined functions",
+	0,
+};
+
+LexerModule lmAVS(SCLEX_AVS, ColouriseAvsDoc, "avs", FoldAvsDoc, avsWordLists);
diff --git a/scite-app/lexilla/lexers/LexAbaqus.cxx b/scite-app/lexilla/lexers/LexAbaqus.cxx
new file mode 100644
index 0000000..e9aba9c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAbaqus.cxx
@@ -0,0 +1,606 @@
+// Scintilla source code edit control
+/** @file LexAbaqus.cxx
+ ** Lexer for ABAQUS. Based on the lexer for APDL by Hadar Raz.
+ ** By Sergio Lucato.
+ ** Sort of completely rewritten by Gertjan Kloosterman
+ **/
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Code folding copyied and modified from LexBasic.cxx
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAKeywordChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' ')));
+}
+
+static inline bool IsASetChar(const int ch) {
+	return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == '.') || (ch == '-')));
+}
+
+static void ColouriseABAQUSDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList*[] /* *keywordlists[] */,
+                            Accessor &styler) {
+	enum localState { KW_LINE_KW, KW_LINE_COMMA, KW_LINE_PAR, KW_LINE_EQ, KW_LINE_VAL, \
+					  DAT_LINE_VAL, DAT_LINE_COMMA,\
+					  COMMENT_LINE,\
+					  ST_ERROR, LINE_END } state ;
+
+	// Do not leak onto next line
+	state = LINE_END ;
+	initStyle = SCE_ABAQUS_DEFAULT;
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// Things are actually quite simple
+	// we have commentlines
+	// keywordlines and datalines
+	// On a data line there will only be colouring of numbers
+	// a keyword line is constructed as
+	// *word,[ paramname[=paramvalue]]*
+	// if the line ends with a , the keyword line continues onto the new line
+
+	for (; sc.More(); sc.Forward()) {
+		switch ( state ) {
+        case KW_LINE_KW :
+            if ( sc.atLineEnd ) {
+                // finished the line in keyword state, switch to LINE_END
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                // nothing changes
+                state = KW_LINE_KW ;
+            } else if ( sc.ch == ',' ) {
+                // Well well we say a comma, arguments *MUST* follow
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // Flag an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            // Done with processing
+            break ;
+        case KW_LINE_COMMA :
+            // acomma on a keywordline was seen
+            if ( IsAKeywordChar(sc.ch)) {
+                sc.SetState(SCE_ABAQUS_ARGUMENT) ;
+                state = KW_LINE_PAR ;
+            } else if ( sc.atLineEnd || (sc.ch == ',') ) {
+                // we remain in keyword mode
+                state = KW_LINE_COMMA ;
+            } else if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // Anything else constitutes an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_PAR :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsAKeywordChar(sc.ch) || (sc.ch == '-') ) {
+                // remain in this state
+                state = KW_LINE_PAR ;
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else if ( sc.ch == '=' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_EQ ;
+            } else {
+                // Anything else constitutes an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_EQ :
+            if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                // remain in this state
+                state = KW_LINE_EQ ;
+            } else if ( IsADigit(sc.ch) || (sc.ch == '-') || (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                sc.SetState(SCE_ABAQUS_NUMBER) ;
+                state = KW_LINE_VAL ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = KW_LINE_VAL ;
+            } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                sc.SetState(SCE_ABAQUS_STRING) ;
+                state = KW_LINE_VAL ;
+            } else {
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case KW_LINE_VAL :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) {
+                // nothing changes
+                state = KW_LINE_VAL ;
+            } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+                    ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) &&
+                    (sc.state == SCE_ABAQUS_NUMBER)) {
+                // remain in number mode
+                state = KW_LINE_VAL ;
+            } else if (sc.state == SCE_ABAQUS_STRING) {
+                // accept everything until a closing quote
+                if ( sc.ch == '\'' || sc.ch == '\"' ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = KW_LINE_VAL ;
+                }
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = KW_LINE_COMMA ;
+            } else {
+                // anything else is an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case DAT_LINE_VAL :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( IsASetChar(sc.ch) && (sc.state == SCE_ABAQUS_DEFAULT) ) {
+                // nothing changes
+                state = DAT_LINE_VAL ;
+            } else if (( (IsADigit(sc.ch) || sc.ch == '.' || (sc.ch == 'e' || sc.ch == 'E') ||
+                    ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) &&
+                    (sc.state == SCE_ABAQUS_NUMBER)) {
+                // remain in number mode
+                state = DAT_LINE_VAL ;
+            } else if (sc.state == SCE_ABAQUS_STRING) {
+                // accept everything until a closing quote
+                if ( sc.ch == '\'' || sc.ch == '\"' ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = DAT_LINE_VAL ;
+                }
+            } else if ( sc.ch == ',' ) {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = DAT_LINE_COMMA ;
+            } else {
+                // anything else is an error
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case DAT_LINE_COMMA :
+            // a comma on a data line was seen
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            } else if ( sc.ch == ' ' ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = DAT_LINE_COMMA ;
+            } else if (sc.ch == ',')  {
+                sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                state = DAT_LINE_COMMA ;
+            } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                sc.SetState(SCE_ABAQUS_NUMBER) ;
+                state = DAT_LINE_VAL ;
+            } else if ( IsAKeywordChar(sc.ch) ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = DAT_LINE_VAL ;
+            } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                sc.SetState(SCE_ABAQUS_STRING) ;
+                state = DAT_LINE_VAL ;
+            } else {
+                sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                state = ST_ERROR ;
+            }
+            break ;
+        case COMMENT_LINE :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            }
+            break ;
+        case ST_ERROR :
+            if ( sc.atLineEnd ) {
+                sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                state = LINE_END ;
+            }
+            break ;
+        case LINE_END :
+            if ( sc.atLineEnd || sc.ch == ' ' ) {
+                // nothing changes
+                state = LINE_END ;
+            } else if ( sc.ch == '*' ) {
+                if ( sc.chNext == '*' ) {
+                    state = COMMENT_LINE ;
+                    sc.SetState(SCE_ABAQUS_COMMENT) ;
+                } else {
+                    state = KW_LINE_KW ;
+                    sc.SetState(SCE_ABAQUS_STARCOMMAND) ;
+                }
+            } else {
+                // it must be a data line, things are as if we are in DAT_LINE_COMMA
+                if ( sc.ch == ',' ) {
+                    sc.SetState(SCE_ABAQUS_OPERATOR) ;
+                    state = DAT_LINE_COMMA ;
+                } else if ( IsADigit(sc.ch) || (sc.ch == '-')|| (sc.ch == '.' && IsADigit(sc.chNext)) ) {
+                    sc.SetState(SCE_ABAQUS_NUMBER) ;
+                    state = DAT_LINE_VAL ;
+                } else if ( IsAKeywordChar(sc.ch) ) {
+                    sc.SetState(SCE_ABAQUS_DEFAULT) ;
+                    state = DAT_LINE_VAL ;
+                } else if ( (sc.ch == '\'') || (sc.ch == '\"') ) {
+                    sc.SetState(SCE_ABAQUS_STRING) ;
+                    state = DAT_LINE_VAL ;
+                } else {
+                    sc.SetState(SCE_ABAQUS_PROCESSOR) ;
+                    state = ST_ERROR ;
+                }
+            }
+            break ;
+		  }
+   }
+   sc.Complete();
+}
+
+//------------------------------------------------------------------------------
+// This copyied and modified from LexBasic.cxx
+//------------------------------------------------------------------------------
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ */
+static int character_classification[128] =
+{
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  6,  2,  2,  2,  10, 6,
+    60, 60, 28, 28, 28, 28, 28, 28, 28, 28, 2,  2,  2,  2,  2,  2,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  4,
+    2,  20, 20, 20, 20, 20, 20, 4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static Sci_Position LineEnd(Sci_Position line, Accessor &styler)
+{
+    const Sci_Position docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+    Sci_Position eol_pos ;
+    // if the line is the last line, the eol_pos is styler.Length()
+    // eol will contain a new line, or a virtual new line
+    if ( docLines == line )
+        eol_pos = styler.Length() ;
+    else
+        eol_pos = styler.LineStart(line + 1) - 1;
+    return eol_pos ;
+}
+
+static Sci_Position LineStart(Sci_Position line, Accessor &styler)
+{
+    return styler.LineStart(line) ;
+}
+
+// LineType
+//
+// bits determines the line type
+// 1  : data line
+// 2  : only whitespace
+// 3  : data line with only whitespace
+// 4  : keyword line
+// 5  : block open keyword line
+// 6  : block close keyword line
+// 7  : keyword line in error
+// 8  : comment line
+static int LineType(Sci_Position line, Accessor &styler) {
+    Sci_Position pos = LineStart(line, styler) ;
+    Sci_Position eol_pos = LineEnd(line, styler) ;
+
+    int c ;
+    char ch = ' ';
+
+    Sci_Position i = pos ;
+    while ( i < eol_pos ) {
+        c = styler.SafeGetCharAt(i);
+        ch = static_cast<char>(LowerCase(c));
+        // We can say something as soon as no whitespace
+        // was encountered
+        if ( !IsSpace(c) )
+            break ;
+        i++ ;
+    }
+
+    if ( i >= eol_pos ) {
+        // This is a whitespace line, currently
+        // classifies as data line
+        return 3 ;
+    }
+
+    if ( ch != '*' ) {
+        // This is a data line
+        return 1 ;
+    }
+
+    if ( i == eol_pos - 1 ) {
+        // Only a single *, error but make keyword line
+        return 4+3 ;
+    }
+
+    // This means we can have a second character
+    // if that is also a * this means a comment
+    // otherwise it is a keyword.
+    c = styler.SafeGetCharAt(i+1);
+    ch = static_cast<char>(LowerCase(c));
+    if ( ch == '*' ) {
+        return 8 ;
+    }
+
+    // At this point we know this is a keyword line
+    // the character at position i is a *
+    // it is not a comment line
+    char word[256] ;
+    int  wlen = 0;
+
+    word[wlen] = '*' ;
+	wlen++ ;
+
+    i++ ;
+    while ( (i < eol_pos) && (wlen < 255) ) {
+        c = styler.SafeGetCharAt(i);
+        ch = static_cast<char>(LowerCase(c));
+
+        if ( (!IsSpace(c)) && (!IsIdentifier(c)) )
+            break ;
+
+        if ( IsIdentifier(c) ) {
+            word[wlen] = ch ;
+			wlen++ ;
+		}
+
+        i++ ;
+    }
+
+    word[wlen] = 0 ;
+
+    // Make a comparison
+	if ( !strcmp(word, "*step") ||
+         !strcmp(word, "*part") ||
+         !strcmp(word, "*instance") ||
+         !strcmp(word, "*assembly")) {
+       return 4+1 ;
+    }
+
+	if ( !strcmp(word, "*endstep") ||
+         !strcmp(word, "*endpart") ||
+         !strcmp(word, "*endinstance") ||
+         !strcmp(word, "*endassembly")) {
+       return 4+2 ;
+    }
+
+    return 4 ;
+}
+
+static void SafeSetLevel(Sci_Position line, int level, Accessor &styler)
+{
+    if ( line < 0 )
+        return ;
+
+    int mask = ((~SC_FOLDLEVELHEADERFLAG) | (~SC_FOLDLEVELWHITEFLAG));
+
+    if ( (level & mask) < 0 )
+        return ;
+
+    if ( styler.LevelAt(line) != level )
+        styler.SetLevel(line, level) ;
+}
+
+static void FoldABAQUSDoc(Sci_PositionU startPos, Sci_Position length, int,
+WordList *[], Accessor &styler) {
+    Sci_Position startLine = styler.GetLine(startPos) ;
+    Sci_Position endLine   = styler.GetLine(startPos+length-1) ;
+
+    // bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    // We want to deal with all the cases
+    // To know the correct indentlevel, we need to look back to the
+    // previous command line indentation level
+	// order of formatting keyline datalines commentlines
+    Sci_Position beginData    = -1 ;
+    Sci_Position beginComment = -1 ;
+    Sci_Position prvKeyLine   = startLine ;
+    Sci_Position prvKeyLineTp =  0 ;
+
+    // Scan until we find the previous keyword line
+    // this will give us the level reference that we need
+    while ( prvKeyLine > 0 ) {
+        prvKeyLine-- ;
+        prvKeyLineTp = LineType(prvKeyLine, styler) ;
+        if ( prvKeyLineTp & 4 )
+            break ;
+    }
+
+    // Determine the base line level of all lines following
+    // the previous keyword
+    // new keyword lines are placed on this level
+    //if ( prvKeyLineTp & 4 ) {
+    int level = styler.LevelAt(prvKeyLine) & ~SC_FOLDLEVELHEADERFLAG ;
+    //}
+
+    // uncomment line below if weird behaviour continues
+    prvKeyLine = -1 ;
+
+    // Now start scanning over the lines.
+    for ( Sci_Position line = startLine; line <= endLine; line++ ) {
+        int lineType = LineType(line, styler) ;
+
+        // Check for comment line
+        if ( lineType == 8 ) {
+            if ( beginComment < 0 ) {
+                beginComment = line ;
+			}
+        }
+
+        // Check for data line
+        if ( (lineType == 1) || (lineType == 3) ) {
+            if ( beginData < 0 ) {
+                if ( beginComment >= 0 ) {
+                    beginData = beginComment ;
+                } else {
+                    beginData = line ;
+                }
+            }
+			beginComment = -1 ;
+		}
+
+        // Check for keywordline.
+        // As soon as a keyword line is encountered, we can set the
+        // levels of everything from the previous keyword line to this one
+        if ( lineType & 4 ) {
+            // this is a keyword, we can now place the previous keyword
+            // all its data lines and the remainder
+
+            // Write comments and data line
+            if ( beginComment < 0 ) {
+                beginComment = line ;
+			}
+
+            if ( beginData < 0 ) {
+                beginData = beginComment ;
+				if ( prvKeyLineTp != 5 )
+					SafeSetLevel(prvKeyLine, level, styler) ;
+				else
+					SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+            } else {
+                SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+            }
+
+            int datLevel = level + 1 ;
+			if ( !(prvKeyLineTp & 4) ) {
+				datLevel = level ;
+			}
+
+            for ( Sci_Position ll = beginData; ll < beginComment; ll++ )
+                SafeSetLevel(ll, datLevel, styler) ;
+
+            // The keyword we just found is going to be written at another level
+            // if we have a type 5 and type 6
+            if ( prvKeyLineTp == 5 ) {
+                level += 1 ;
+			}
+
+            if ( prvKeyLineTp == 6 ) {
+                level -= 1 ;
+				if ( level < 0 ) {
+					level = 0 ;
+				}
+            }
+
+            for ( Sci_Position lll = beginComment; lll < line; lll++ )
+                SafeSetLevel(lll, level, styler) ;
+
+            // wrap and reset
+            beginComment = -1 ;
+            beginData    = -1 ;
+            prvKeyLine   = line ;
+            prvKeyLineTp = lineType ;
+        }
+
+    }
+
+    if ( beginComment < 0 ) {
+        beginComment = endLine + 1 ;
+    } else {
+        // We need to find out whether this comment block is followed by
+        // a data line or a keyword line
+        const Sci_Position docLines = styler.GetLine(styler.Length() - 1);
+
+        for ( Sci_Position line = endLine + 1; line <= docLines; line++ ) {
+            Sci_Position lineType = LineType(line, styler) ;
+
+            if ( lineType != 8 ) {
+				if ( !(lineType & 4) )  {
+					beginComment = endLine + 1 ;
+				}
+                break ;
+			}
+        }
+    }
+
+    if ( beginData < 0 ) {
+        beginData = beginComment ;
+		if ( prvKeyLineTp != 5 )
+			SafeSetLevel(prvKeyLine, level, styler) ;
+		else
+			SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+    } else {
+        SafeSetLevel(prvKeyLine, level | SC_FOLDLEVELHEADERFLAG, styler) ;
+    }
+
+    int datLevel = level + 1 ;
+	if ( !(prvKeyLineTp & 4) ) {
+		datLevel = level ;
+	}
+
+    for ( Sci_Position ll = beginData; ll < beginComment; ll++ )
+        SafeSetLevel(ll, datLevel, styler) ;
+
+    if ( prvKeyLineTp == 5 ) {
+        level += 1 ;
+    }
+
+    if ( prvKeyLineTp == 6 ) {
+        level -= 1 ;
+    }
+    for ( Sci_Position m = beginComment; m <= endLine; m++ )
+        SafeSetLevel(m, level, styler) ;
+}
+
+static const char * const abaqusWordListDesc[] = {
+    "processors",
+    "commands",
+    "slashommands",
+    "starcommands",
+    "arguments",
+    "functions",
+    0
+};
+
+LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexAda.cxx b/scite-app/lexilla/lexers/LexAda.cxx
new file mode 100644
index 0000000..4c2b5d1
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAda.cxx
@@ -0,0 +1,514 @@
+// Scintilla source code edit control
+/** @file LexAda.cxx
+ ** Lexer for Ada 95
+ **/
+// Copyright 2002 by Sergey Koshcheyev <sergey.k@seznam.cz>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+/*
+ * Interface
+ */
+
+static void ColouriseDocument(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler);
+
+static const char * const adaWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmAda(SCLEX_ADA, ColouriseDocument, "ada", NULL, adaWordListDesc);
+
+/*
+ * Implementation
+ */
+
+// Functions that have apostropheStartsAttribute as a parameter set it according to whether
+// an apostrophe encountered after processing the current token will start an attribute or
+// a character literal.
+static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL);
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute);
+
+static inline bool IsDelimiterCharacter(int ch);
+static inline bool IsSeparatorOrDelimiterCharacter(int ch);
+static bool IsValidIdentifier(const std::string& identifier);
+static bool IsValidNumber(const std::string& number);
+static inline bool IsWordStartCharacter(int ch);
+static inline bool IsWordCharacter(int ch);
+
+static void ColouriseCharacter(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	sc.SetState(SCE_ADA_CHARACTER);
+
+	// Skip the apostrophe and one more character (so that '' is shown as non-terminated and '''
+	// is handled correctly)
+	sc.Forward();
+	sc.Forward();
+
+	ColouriseContext(sc, '\'', SCE_ADA_CHARACTEREOL);
+}
+
+static void ColouriseContext(StyleContext& sc, char chEnd, int stateEOL) {
+	while (!sc.atLineEnd && !sc.Match(chEnd)) {
+		sc.Forward();
+	}
+
+	if (!sc.atLineEnd) {
+		sc.ForwardSetState(SCE_ADA_DEFAULT);
+	} else {
+		sc.ChangeState(stateEOL);
+	}
+}
+
+static void ColouriseComment(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
+	// Apostrophe meaning is not changed, but the parameter is present for uniformity
+
+	sc.SetState(SCE_ADA_COMMENTLINE);
+
+	while (!sc.atLineEnd) {
+		sc.Forward();
+	}
+}
+
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = sc.Match (')');
+	sc.SetState(SCE_ADA_DELIMITER);
+	sc.ForwardSetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseLabel(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = false;
+
+	sc.SetState(SCE_ADA_LABEL);
+
+	// Skip "<<"
+	sc.Forward();
+	sc.Forward();
+
+	std::string identifier;
+
+	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+		identifier += static_cast<char>(tolower(sc.ch));
+		sc.Forward();
+	}
+
+	// Skip ">>"
+	if (sc.Match('>', '>')) {
+		sc.Forward();
+		sc.Forward();
+	} else {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	// If the name is an invalid identifier or a keyword, then make it invalid label
+	if (!IsValidIdentifier(identifier) || keywords.InList(identifier.c_str())) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+
+}
+
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	std::string number;
+	sc.SetState(SCE_ADA_NUMBER);
+
+	// Get all characters up to a delimiter or a separator, including points, but excluding
+	// double points (ranges).
+	while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
+		number += static_cast<char>(sc.ch);
+		sc.Forward();
+	}
+
+	// Special case: exponent with sign
+	if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
+	        (sc.ch == '+' || sc.ch == '-')) {
+		number += static_cast<char>(sc.ch);
+		sc.Forward ();
+
+		while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
+			number += static_cast<char>(sc.ch);
+			sc.Forward();
+		}
+	}
+
+	if (!IsValidNumber(number)) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseString(StyleContext& sc, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+
+	sc.SetState(SCE_ADA_STRING);
+	sc.Forward();
+
+	ColouriseContext(sc, '"', SCE_ADA_STRINGEOL);
+}
+
+static void ColouriseWhiteSpace(StyleContext& sc, bool& /*apostropheStartsAttribute*/) {
+	// Apostrophe meaning is not changed, but the parameter is present for uniformity
+	sc.SetState(SCE_ADA_DEFAULT);
+	sc.ForwardSetState(SCE_ADA_DEFAULT);
+}
+
+static void ColouriseWord(StyleContext& sc, WordList& keywords, bool& apostropheStartsAttribute) {
+	apostropheStartsAttribute = true;
+	sc.SetState(SCE_ADA_IDENTIFIER);
+
+	std::string word;
+
+	while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+		word += static_cast<char>(tolower(sc.ch));
+		sc.Forward();
+	}
+
+	if (!IsValidIdentifier(word)) {
+		sc.ChangeState(SCE_ADA_ILLEGAL);
+
+	} else if (keywords.InList(word.c_str())) {
+		sc.ChangeState(SCE_ADA_WORD);
+
+		if (word != "all") {
+			apostropheStartsAttribute = false;
+		}
+	}
+
+	sc.SetState(SCE_ADA_DEFAULT);
+}
+
+//
+// ColouriseDocument
+//
+
+static void ColouriseDocument(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+	WordList &keywords = *keywordlists[0];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
+
+	while (sc.More()) {
+		if (sc.atLineEnd) {
+			// Go to the next line
+			sc.Forward();
+			lineCurrent++;
+
+			// Remember the line state for future incremental lexing
+			styler.SetLineState(lineCurrent, apostropheStartsAttribute);
+
+			// Don't continue any styles on the next line
+			sc.SetState(SCE_ADA_DEFAULT);
+		}
+
+		// Comments
+		if (sc.Match('-', '-')) {
+			ColouriseComment(sc, apostropheStartsAttribute);
+
+		// Strings
+		} else if (sc.Match('"')) {
+			ColouriseString(sc, apostropheStartsAttribute);
+
+		// Characters
+		} else if (sc.Match('\'') && !apostropheStartsAttribute) {
+			ColouriseCharacter(sc, apostropheStartsAttribute);
+
+		// Labels
+		} else if (sc.Match('<', '<')) {
+			ColouriseLabel(sc, keywords, apostropheStartsAttribute);
+
+		// Whitespace
+		} else if (IsASpace(sc.ch)) {
+			ColouriseWhiteSpace(sc, apostropheStartsAttribute);
+
+		// Delimiters
+		} else if (IsDelimiterCharacter(sc.ch)) {
+			ColouriseDelimiter(sc, apostropheStartsAttribute);
+
+		// Numbers
+		} else if (IsADigit(sc.ch) || sc.ch == '#') {
+			ColouriseNumber(sc, apostropheStartsAttribute);
+
+		// Keywords or identifiers
+		} else {
+			ColouriseWord(sc, keywords, apostropheStartsAttribute);
+		}
+	}
+
+	sc.Complete();
+}
+
+static inline bool IsDelimiterCharacter(int ch) {
+	switch (ch) {
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '|':
+		return true;
+	default:
+		return false;
+	}
+}
+
+static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
+	return IsASpace(ch) || IsDelimiterCharacter(ch);
+}
+
+static bool IsValidIdentifier(const std::string& identifier) {
+	// First character can't be '_', so initialize the flag to true
+	bool lastWasUnderscore = true;
+
+	size_t length = identifier.length();
+
+	// Zero-length identifiers are not valid (these can occur inside labels)
+	if (length == 0) {
+		return false;
+	}
+
+	// Check for valid character at the start
+	if (!IsWordStartCharacter(identifier[0])) {
+		return false;
+	}
+
+	// Check for only valid characters and no double underscores
+	for (size_t i = 0; i < length; i++) {
+		if (!IsWordCharacter(identifier[i]) ||
+		        (identifier[i] == '_' && lastWasUnderscore)) {
+			return false;
+		}
+		lastWasUnderscore = identifier[i] == '_';
+	}
+
+	// Check for underscore at the end
+	if (lastWasUnderscore == true) {
+		return false;
+	}
+
+	// All checks passed
+	return true;
+}
+
+static bool IsValidNumber(const std::string& number) {
+	size_t hashPos = number.find("#");
+	bool seenDot = false;
+
+	size_t i = 0;
+	size_t length = number.length();
+
+	if (length == 0)
+		return false; // Just in case
+
+	// Decimal number
+	if (hashPos == std::string::npos) {
+		bool canBeSpecial = false;
+
+		for (; i < length; i++) {
+			if (number[i] == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+			} else if (number[i] == '.') {
+				if (!canBeSpecial || seenDot) {
+					return false;
+				}
+				canBeSpecial = false;
+				seenDot = true;
+			} else if (IsADigit(number[i])) {
+				canBeSpecial = true;
+			} else {
+				break;
+			}
+		}
+
+		if (!canBeSpecial)
+			return false;
+	} else {
+		// Based number
+		bool canBeSpecial = false;
+		int base = 0;
+
+		// Parse base
+		for (; i < length; i++) {
+			int ch = number[i];
+			if (ch == '_') {
+				if (!canBeSpecial)
+					return false;
+				canBeSpecial = false;
+			} else if (IsADigit(ch)) {
+				base = base * 10 + (ch - '0');
+				if (base > 16)
+					return false;
+				canBeSpecial = true;
+			} else if (ch == '#' && canBeSpecial) {
+				break;
+			} else {
+				return false;
+			}
+		}
+
+		if (base < 2)
+			return false;
+		if (i == length)
+			return false;
+
+		i++; // Skip over '#'
+
+		// Parse number
+		canBeSpecial = false;
+
+		for (; i < length; i++) {
+			int ch = tolower(number[i]);
+
+			if (ch == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+
+			} else if (ch == '.') {
+				if (!canBeSpecial || seenDot) {
+					return false;
+				}
+				canBeSpecial = false;
+				seenDot = true;
+
+			} else if (IsADigit(ch)) {
+				if (ch - '0' >= base) {
+					return false;
+				}
+				canBeSpecial = true;
+
+			} else if (ch >= 'a' && ch <= 'f') {
+				if (ch - 'a' + 10 >= base) {
+					return false;
+				}
+				canBeSpecial = true;
+
+			} else if (ch == '#' && canBeSpecial) {
+				break;
+
+			} else {
+				return false;
+			}
+		}
+
+		if (i == length) {
+			return false;
+		}
+
+		i++;
+	}
+
+	// Exponent (optional)
+	if (i < length) {
+		if (number[i] != 'e' && number[i] != 'E')
+			return false;
+
+		i++; // Move past 'E'
+
+		if (i == length) {
+			return false;
+		}
+
+		if (number[i] == '+')
+			i++;
+		else if (number[i] == '-') {
+			if (seenDot) {
+				i++;
+			} else {
+				return false; // Integer literals should not have negative exponents
+			}
+		}
+
+		if (i == length) {
+			return false;
+		}
+
+		bool canBeSpecial = false;
+
+		for (; i < length; i++) {
+			if (number[i] == '_') {
+				if (!canBeSpecial) {
+					return false;
+				}
+				canBeSpecial = false;
+			} else if (IsADigit(number[i])) {
+				canBeSpecial = true;
+			} else {
+				return false;
+			}
+		}
+
+		if (!canBeSpecial)
+			return false;
+	}
+
+	// if i == length, number was parsed successfully.
+	return i == length;
+}
+
+static inline bool IsWordCharacter(int ch) {
+	return IsWordStartCharacter(ch) || IsADigit(ch);
+}
+
+static inline bool IsWordStartCharacter(int ch) {
+	return (IsASCII(ch) && isalpha(ch)) || ch == '_';
+}
diff --git a/scite-app/lexilla/lexers/LexAsm.cxx b/scite-app/lexilla/lexers/LexAsm.cxx
new file mode 100644
index 0000000..44f399a
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAsm.cxx
@@ -0,0 +1,480 @@
+// Scintilla source code edit control
+/** @file LexAsm.cxx
+ ** Lexer for Assembler, just for the MASM syntax
+ ** Written by The Black Horus
+ ** Enhancements and NASM stuff by Kein-Hong Man, 2003-10
+ ** SCE_ASM_COMMENTBLOCK and SCE_ASM_CHARACTER are for future GNU as colouring
+ ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+#include <map>
+#include <set>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
+		ch == '_' || ch == '?');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
+		ch == '%' || ch == '@' || ch == '$' || ch == '?');
+}
+
+static inline bool IsAsmOperator(const int ch) {
+	if ((ch < 0x80) && (isalnum(ch)))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '%' || ch == ':')
+		return true;
+	return false;
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_ASM_COMMENTDIRECTIVE || style == SCE_ASM_COMMENTBLOCK;
+}
+
+static inline int LowerCase(int c) {
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerAsm
+struct OptionsAsm {
+	std::string delimiter;
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldCommentMultiline;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldCompact;
+	std::string commentChar;
+	OptionsAsm() {
+		delimiter = "";
+		fold = false;
+		foldSyntaxBased = true;
+		foldCommentMultiline = false;
+		foldCommentExplicit = false;
+		foldExplicitStart = "";
+		foldExplicitEnd   = "";
+		foldExplicitAnywhere = false;
+		foldCompact = true;
+		commentChar = "";
+	}
+};
+
+static const char * const asmWordListDesc[] = {
+	"CPU instructions",
+	"FPU instructions",
+	"Registers",
+	"Directives",
+	"Directive operands",
+	"Extended instructions",
+	"Directives4Foldstart",
+	"Directives4Foldend",
+	0
+};
+
+struct OptionSetAsm : public OptionSet<OptionsAsm> {
+	OptionSetAsm() {
+		DefineProperty("lexer.asm.comment.delimiter", &OptionsAsm::delimiter,
+			"Character used for COMMENT directive's delimiter, replacing the standard \"~\".");
+
+		DefineProperty("fold", &OptionsAsm::fold);
+
+		DefineProperty("fold.asm.syntax.based", &OptionsAsm::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.asm.comment.multiline", &OptionsAsm::foldCommentMultiline,
+			"Set this property to 1 to enable folding multi-line comments.");
+
+		DefineProperty("fold.asm.comment.explicit", &OptionsAsm::foldCommentExplicit,
+			"This option enables folding explicit fold points when using the Asm lexer. "
+			"Explicit fold points allows adding extra folding by placing a ;{ comment at the start and a ;} "
+			"at the end of a section that should fold.");
+
+		DefineProperty("fold.asm.explicit.start", &OptionsAsm::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard ;{.");
+
+		DefineProperty("fold.asm.explicit.end", &OptionsAsm::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard ;}.");
+
+		DefineProperty("fold.asm.explicit.anywhere", &OptionsAsm::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("fold.compact", &OptionsAsm::foldCompact);
+
+		DefineProperty("lexer.as.comment.character", &OptionsAsm::commentChar,
+			"Overrides the default comment character (which is ';' for asm and '#' for as).");
+
+		DefineWordListSets(asmWordListDesc);
+	}
+};
+
+class LexerAsm : public DefaultLexer {
+	WordList cpuInstruction;
+	WordList mathInstruction;
+	WordList registers;
+	WordList directive;
+	WordList directiveOperand;
+	WordList extInstruction;
+	WordList directives4foldstart;
+	WordList directives4foldend;
+	OptionsAsm options;
+	OptionSetAsm osAsm;
+	int commentChar;
+public:
+	LexerAsm(const char *languageName_, int language_, int commentChar_) : DefaultLexer(languageName_, language_) {
+		commentChar = commentChar_;
+	}
+	virtual ~LexerAsm() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osAsm.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osAsm.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osAsm.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osAsm.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osAsm.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	static ILexer5 *LexerFactoryAsm() {
+		return new LexerAsm("asm", SCLEX_ASM, ';');
+	}
+
+	static ILexer5 *LexerFactoryAs() {
+		return new LexerAsm("as", SCLEX_AS, '#');
+	}
+};
+
+Sci_Position SCI_METHOD LexerAsm::PropertySet(const char *key, const char *val) {
+	if (osAsm.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &cpuInstruction;
+		break;
+	case 1:
+		wordListN = &mathInstruction;
+		break;
+	case 2:
+		wordListN = &registers;
+		break;
+	case 3:
+		wordListN = &directive;
+		break;
+	case 4:
+		wordListN = &directiveOperand;
+		break;
+	case 5:
+		wordListN = &extInstruction;
+		break;
+	case 6:
+		wordListN = &directives4foldstart;
+		break;
+	case 7:
+		wordListN = &directives4foldend;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerAsm::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	const char commentCharacter = options.commentChar.empty() ?
+		commentChar : options.commentChar.front();
+
+	// Do not leak onto next line
+	if (initStyle == SCE_ASM_STRINGEOL)
+		initStyle = SCE_ASM_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+
+		// Prevent SCE_ASM_STRINGEOL from leaking back to previous line
+		if (sc.atLineStart && (sc.state == SCE_ASM_STRING)) {
+			sc.SetState(SCE_ASM_STRING);
+		} else if (sc.atLineStart && (sc.state == SCE_ASM_CHARACTER)) {
+			sc.SetState(SCE_ASM_CHARACTER);
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_ASM_OPERATOR) {
+			if (!IsAsmOperator(sc.ch)) {
+			    sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				bool IsDirective = false;
+
+				if (cpuInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_CPUINSTRUCTION);
+				} else if (mathInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_MATHINSTRUCTION);
+				} else if (registers.InList(s)) {
+					sc.ChangeState(SCE_ASM_REGISTER);
+				}  else if (directive.InList(s)) {
+					sc.ChangeState(SCE_ASM_DIRECTIVE);
+					IsDirective = true;
+				} else if (directiveOperand.InList(s)) {
+					sc.ChangeState(SCE_ASM_DIRECTIVEOPERAND);
+				} else if (extInstruction.InList(s)) {
+					sc.ChangeState(SCE_ASM_EXTINSTRUCTION);
+				}
+				sc.SetState(SCE_ASM_DEFAULT);
+				if (IsDirective && !strcmp(s, "comment")) {
+					char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0];
+					while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd) {
+						sc.ForwardSetState(SCE_ASM_DEFAULT);
+					}
+					if (sc.ch == delimiter) {
+						sc.SetState(SCE_ASM_COMMENTDIRECTIVE);
+					}
+				}
+			}
+		} else if (sc.state == SCE_ASM_COMMENTDIRECTIVE) {
+			char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0];
+			if (sc.ch == delimiter) {
+				while (!sc.atLineEnd) {
+					sc.Forward();
+				}
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_COMMENT ) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_ASM_STRINGEOL);
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			}
+		} else if (sc.state == SCE_ASM_CHARACTER) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_ASM_STRINGEOL);
+				sc.ForwardSetState(SCE_ASM_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ASM_DEFAULT) {
+			if (sc.ch == commentCharacter) {
+				sc.SetState(SCE_ASM_COMMENT);
+			} else if (IsASCII(sc.ch) && (isdigit(sc.ch) || (sc.ch == '.' && IsASCII(sc.chNext) && isdigit(sc.chNext)))) {
+				sc.SetState(SCE_ASM_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_ASM_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ASM_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_ASM_CHARACTER);
+			} else if (IsAsmOperator(sc.ch)) {
+				sc.SetState(SCE_ASM_OPERATOR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "else".
+
+void SCI_METHOD LexerAsm::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	char word[100];
+	int wordlen = 0;
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (options.foldCommentMultiline && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (options.foldCommentExplicit && ((style == SCE_ASM_COMMENT) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+ 					levelNext++;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+ 					levelNext--;
+ 				}
+			} else {
+				if (ch == ';') {
+					if (chNext == '{') {
+						levelNext++;
+					} else if (chNext == '}') {
+						levelNext--;
+					}
+				}
+ 			}
+ 		}
+		if (options.foldSyntaxBased && (style == SCE_ASM_DIRECTIVE)) {
+			word[wordlen++] = static_cast<char>(LowerCase(ch));
+			if (wordlen == 100) {                   // prevent overflow
+				word[0] = '\0';
+				wordlen = 1;
+			}
+			if (styleNext != SCE_ASM_DIRECTIVE) {   // reading directive ready
+				word[wordlen] = '\0';
+				wordlen = 0;
+				if (directives4foldstart.InList(word)) {
+					levelNext++;
+				} else if (directives4foldend.InList(word)){
+					levelNext--;
+				}
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length() - 1))) {
+				// There is an empty line at end of file so give it same level and empty
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+			visibleChars = 0;
+		}
+	}
+}
+
+LexerModule lmAsm(SCLEX_ASM, LexerAsm::LexerFactoryAsm, "asm", asmWordListDesc);
+LexerModule lmAs(SCLEX_AS, LexerAsm::LexerFactoryAs, "as", asmWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexAsn1.cxx b/scite-app/lexilla/lexers/LexAsn1.cxx
new file mode 100644
index 0000000..be19a9f
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexAsn1.cxx
@@ -0,0 +1,189 @@
+// Scintilla source code edit control
+/** @file LexAsn1.cxx
+ ** Lexer for ASN.1
+ **/
+// Copyright 2004 by Herr Pfarrer rpfarrer <at> yahoo <dot> de
+// Last Updated: 20/07/2004
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Some char test functions
+static bool isAsn1Number(int ch)
+{
+	return (ch >= '0' && ch <= '9');
+}
+
+static bool isAsn1Letter(int ch)
+{
+	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isAsn1Char(int ch)
+{
+	return (ch == '-' ) || isAsn1Number(ch) || isAsn1Letter (ch);
+}
+
+//
+//	Function determining the color of a given code portion
+//	Based on a "state"
+//
+static void ColouriseAsn1Doc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordLists[], Accessor &styler)
+{
+	// The keywords
+	WordList &Keywords = *keywordLists[0];
+	WordList &Attributes = *keywordLists[1];
+	WordList &Descriptors = *keywordLists[2];
+	WordList &Types = *keywordLists[3];
+
+	// Parse the whole buffer character by character using StyleContext
+	StyleContext sc(startPos, length, initStyle, styler);
+	for (; sc.More(); sc.Forward())
+	{
+		// The state engine
+		switch (sc.state)
+		{
+		case SCE_ASN1_DEFAULT:		// Plain characters
+asn1_default:
+			if (sc.ch == '-' && sc.chNext == '-')
+				// A comment begins here
+				sc.SetState(SCE_ASN1_COMMENT);
+			else if (sc.ch == '"')
+				// A string begins here
+				sc.SetState(SCE_ASN1_STRING);
+			else if (isAsn1Number (sc.ch))
+				// A number starts here (identifier should start with a letter in ASN.1)
+				sc.SetState(SCE_ASN1_SCALAR);
+			else if (isAsn1Char (sc.ch))
+				// An identifier starts here (identifier always start with a letter)
+				sc.SetState(SCE_ASN1_IDENTIFIER);
+			else if (sc.ch == ':')
+				// A ::= operator starts here
+				sc.SetState(SCE_ASN1_OPERATOR);
+			break;
+		case SCE_ASN1_COMMENT:		// A comment
+			if (sc.ch == '\r' || sc.ch == '\n')
+				// A comment ends here
+				sc.SetState(SCE_ASN1_DEFAULT);
+			break;
+		case SCE_ASN1_IDENTIFIER:	// An identifier (keyword, attribute, descriptor or type)
+			if (!isAsn1Char (sc.ch))
+			{
+				// The end of identifier is here: we can look for it in lists by now and change its state
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (Keywords.InList(s))
+					// It's a keyword, change its state
+					sc.ChangeState(SCE_ASN1_KEYWORD);
+				else if (Attributes.InList(s))
+					// It's an attribute, change its state
+					sc.ChangeState(SCE_ASN1_ATTRIBUTE);
+				else if (Descriptors.InList(s))
+					// It's a descriptor, change its state
+					sc.ChangeState(SCE_ASN1_DESCRIPTOR);
+				else if (Types.InList(s))
+					// It's a type, change its state
+					sc.ChangeState(SCE_ASN1_TYPE);
+
+				// Set to default now
+				sc.SetState(SCE_ASN1_DEFAULT);
+			}
+			break;
+		case SCE_ASN1_STRING:		// A string delimited by ""
+			if (sc.ch == '"')
+			{
+				// A string ends here
+				sc.ForwardSetState(SCE_ASN1_DEFAULT);
+
+				// To correctly manage a char sticking to the string quote
+				goto asn1_default;
+			}
+			break;
+		case SCE_ASN1_SCALAR:		// A plain number
+			if (!isAsn1Number (sc.ch))
+				// A number ends here
+				sc.SetState(SCE_ASN1_DEFAULT);
+			break;
+		case SCE_ASN1_OPERATOR:		// The affectation operator ::= and wath follows (eg: ::= { org 6 } OID or ::= 12 trap)
+			if (sc.ch == '{')
+			{
+				// An OID definition starts here: enter the sub loop
+				for (; sc.More(); sc.Forward())
+				{
+					if (isAsn1Number (sc.ch) && (!isAsn1Char (sc.chPrev) || isAsn1Number (sc.chPrev)))
+						// The OID number is highlighted
+						sc.SetState(SCE_ASN1_OID);
+					else if (isAsn1Char (sc.ch))
+						// The OID parent identifier is plain
+						sc.SetState(SCE_ASN1_IDENTIFIER);
+					else
+						sc.SetState(SCE_ASN1_DEFAULT);
+
+					if (sc.ch == '}')
+						// Here ends the OID and the operator sub loop: go back to main loop
+						break;
+				}
+			}
+			else if (isAsn1Number (sc.ch))
+			{
+				// A trap number definition starts here: enter the sub loop
+				for (; sc.More(); sc.Forward())
+				{
+					if (isAsn1Number (sc.ch))
+						// The trap number is highlighted
+						sc.SetState(SCE_ASN1_OID);
+					else
+					{
+						// The number ends here: go back to main loop
+						sc.SetState(SCE_ASN1_DEFAULT);
+						break;
+					}
+				}
+			}
+			else if (sc.ch != ':' && sc.ch != '=' && sc.ch != ' ')
+				// The operator doesn't imply an OID definition nor a trap, back to main loop
+				goto asn1_default; // To be sure to handle actually the state change
+			break;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldAsn1Doc(Sci_PositionU, Sci_Position, int, WordList *[], Accessor &styler)
+{
+	// No folding enabled, no reason to continue...
+	if( styler.GetPropertyInt("fold") == 0 )
+		return;
+
+	// No folding implemented: doesn't make sense for ASN.1
+}
+
+static const char * const asn1WordLists[] = {
+	"Keywords",
+	"Attributes",
+	"Descriptors",
+	"Types",
+	0, };
+
+
+LexerModule lmAsn1(SCLEX_ASN1, ColouriseAsn1Doc, "asn1", FoldAsn1Doc, asn1WordLists);
diff --git a/scite-app/lexilla/lexers/LexBaan.cxx b/scite-app/lexilla/lexers/LexBaan.cxx
new file mode 100644
index 0000000..f3c14fa
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBaan.cxx
@@ -0,0 +1,995 @@
+// Scintilla source code edit control
+/** @file LexBaan.cxx
+** Lexer for Baan.
+** Based heavily on LexCPP.cxx
+**/
+// Copyright 2001- by Vamsi Potluru <vamsi@who.net> & Praveen Ambekar <ambekarpraveen@yahoo.com>
+// Maintainer Email: oirfeodent@yahoo.co.in
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// C standard library
+#include <stdlib.h>
+#include <string.h>
+
+// C++ wrappers of C standard library
+#include <cassert>
+
+// C++ standard library
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+// Scintilla headers
+
+// Non-platform-specific headers
+
+// include
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+// lexlib
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+// Use an unnamed namespace to protect the functions and classes from name conflicts
+
+// Options used for LexerBaan
+struct OptionsBaan {
+	bool fold;
+	bool foldComment;
+	bool foldPreprocessor;
+	bool foldCompact;
+	bool baanFoldSyntaxBased;
+	bool baanFoldKeywordsBased;
+	bool baanFoldSections;
+	bool baanFoldInnerLevel;
+	bool baanStylingWithinPreprocessor;
+	OptionsBaan() {
+		fold = false;
+		foldComment = false;
+		foldPreprocessor = false;
+		foldCompact = false;
+		baanFoldSyntaxBased = false;
+		baanFoldKeywordsBased = false;
+		baanFoldSections = false;
+		baanFoldInnerLevel = false;
+		baanStylingWithinPreprocessor = false;
+	}
+};
+
+const char *const baanWordLists[] = {
+	"Baan & BaanSQL Reserved Keywords ",
+	"Baan Standard functions",
+	"Baan Functions Abridged",
+	"Baan Main Sections ",
+	"Baan Sub Sections",
+	"PreDefined Variables",
+	"PreDefined Attributes",
+	"Enumerates",
+	0,
+};
+
+struct OptionSetBaan : public OptionSet<OptionsBaan> {
+	OptionSetBaan() {
+		DefineProperty("fold", &OptionsBaan::fold);
+
+		DefineProperty("fold.comment", &OptionsBaan::foldComment);
+
+		DefineProperty("fold.preprocessor", &OptionsBaan::foldPreprocessor);
+
+		DefineProperty("fold.compact", &OptionsBaan::foldCompact);
+
+		DefineProperty("fold.baan.syntax.based", &OptionsBaan::baanFoldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding, which is folding based on '{' & '('.");
+
+		DefineProperty("fold.baan.keywords.based", &OptionsBaan::baanFoldKeywordsBased,
+			"Set this property to 0 to disable keywords based folding, which is folding based on "
+			" for, if, on (case), repeat, select, while and fold ends based on endfor, endif, endcase, until, endselect, endwhile respectively."
+			"Also folds declarations which are grouped together.");
+
+		DefineProperty("fold.baan.sections", &OptionsBaan::baanFoldSections,
+			"Set this property to 0 to disable folding of Main Sections as well as Sub Sections.");
+
+		DefineProperty("fold.baan.inner.level", &OptionsBaan::baanFoldInnerLevel,
+			"Set this property to 1 to enable folding of inner levels of select statements."
+			"Disabled by default. case and if statements are also eligible" );
+
+		DefineProperty("lexer.baan.styling.within.preprocessor", &OptionsBaan::baanStylingWithinPreprocessor,
+			"For Baan code, determines whether all preprocessor code is styled in the "
+			"preprocessor style (0, the default) or only from the initial # to the end "
+			"of the command word(1).");
+
+		DefineWordListSets(baanWordLists);
+	}
+};
+
+static inline bool IsAWordChar(const int  ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '$');
+}
+
+static inline bool IsAnOperator(int ch) {
+	if (IsAlphaNumeric(ch))
+		return false;
+	if (ch == '#' || ch == '^' || ch == '&' || ch == '*' ||
+		ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
+		ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
+		ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
+		ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
+		ch == '?' || ch == '!' || ch == '"' || ch == '~' ||
+		ch == '\\')
+		return true;
+	return false;
+}
+
+static inline int IsAnyOtherIdentifier(char *s, Sci_Position sLength) {
+
+	/*	IsAnyOtherIdentifier uses standard templates used in baan.
+	The matching template is shown as comments just above the return condition.
+	^ - refers to any character [a-z].
+	# - refers to any number [0-9].
+	Other characters shown are compared as is.
+	Tried implementing with Regex... it was too complicated for me.
+	Any other implementation suggestion welcome.
+	*/
+	switch (sLength) {
+	case 8:
+		if (isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			//^^^^^###
+			return(SCE_BAAN_TABLEDEF);
+		}
+		break;
+	case 9:
+		if (s[0] == 't' && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && isalpha(s[5]) && IsADigit(s[6]) && IsADigit(s[7]) && IsADigit(s[8])) {
+			//t^^^^^###
+			return(SCE_BAAN_TABLEDEF);
+		}
+		else if (s[8] == '.' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			//^^^^^###.
+			return(SCE_BAAN_TABLESQL);
+		}
+		break;
+	case 13:
+		if (s[8] == '.' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			//^^^^^###.****
+			return(SCE_BAAN_TABLESQL);
+		}
+		else if (s[0] == 'r' && s[1] == 'c' && s[2] == 'd' && s[3] == '.' && s[4] == 't' && isalpha(s[5]) && isalpha(s[6]) && isalpha(s[7]) && isalpha(s[8]) && isalpha(s[9]) && IsADigit(s[10]) && IsADigit(s[11]) && IsADigit(s[12])) {
+			//rcd.t^^^^^###
+			return(SCE_BAAN_TABLEDEF);
+		}
+		break;
+	case 14:
+	case 15:
+		if (s[8] == '.' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			if (s[13] != ':') {
+				//^^^^^###.******
+				return(SCE_BAAN_TABLESQL);
+			}
+		}
+		break;
+	case 16:
+	case 17:
+		if (s[8] == '.' && s[9] == '_' && s[10] == 'i' && s[11] == 'n' && s[12] == 'd' && s[13] == 'e' && s[14] == 'x' && IsADigit(s[15]) && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			//^^^^^###._index##
+			return(SCE_BAAN_TABLEDEF);
+		}
+		else if (s[8] == '.' && s[9] == '_' && s[10] == 'c' && s[11] == 'o' && s[12] == 'm' && s[13] == 'p' && s[14] == 'n' && s[15] == 'r' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[5]) && IsADigit(s[6]) && IsADigit(s[7])) {
+			//^^^^^###._compnr
+			return(SCE_BAAN_TABLEDEF);
+		}
+		break;
+	default:
+		break;
+	}
+	if (sLength > 14 && s[5] == '.' && s[6] == 'd' && s[7] == 'l' && s[8] == 'l' && s[13] == '.' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && IsADigit(s[9]) && IsADigit(s[10]) && IsADigit(s[11]) && IsADigit(s[12])) {
+		//^^^^^.dll####.
+		return(SCE_BAAN_FUNCTION);
+	}
+	else if (sLength > 15 && s[2] == 'i' && s[3] == 'n' && s[4] == 't' && s[5] == '.' && s[6] == 'd' && s[7] == 'l' && s[8] == 'l' && isalpha(s[0]) && isalpha(s[1]) && isalpha(s[9]) && isalpha(s[10]) && isalpha(s[11]) && isalpha(s[12]) && isalpha(s[13])) {
+		//^^int.dll^^^^^.
+		return(SCE_BAAN_FUNCTION);
+	}
+	else if (sLength > 11 && s[0] == 'i' && s[10] == '.' && isalpha(s[1]) && isalpha(s[2]) && isalpha(s[3]) && isalpha(s[4]) && isalpha(s[5]) && IsADigit(s[6]) && IsADigit(s[7]) && IsADigit(s[8]) && IsADigit(s[9])) {
+		//i^^^^^####.
+		return(SCE_BAAN_FUNCTION);
+	}
+
+	return(SCE_BAAN_DEFAULT);
+}
+
+static bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (ch == '|' && style == SCE_BAAN_COMMENT)
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static bool IsPreProcLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (ch == '#' && style == SCE_BAAN_PREPROCESSOR) {
+			if (styler.Match(i, "#elif") || styler.Match(i, "#else") || styler.Match(i, "#endif")
+				|| styler.Match(i, "#if") || styler.Match(i, "#ifdef") || styler.Match(i, "#ifndef"))
+				// Above PreProcessors has a seperate fold mechanism.
+				return false;
+			else
+				return true;
+		}
+		else if (ch == '^')
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static int mainOrSubSectionLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (style == SCE_BAAN_WORD5 || style == SCE_BAAN_WORD4)
+			return style;
+		else if (IsASpaceOrTab(ch))
+			continue;
+		else
+			break;
+	}
+	return 0;
+}
+
+static bool priorSectionIsSubSection(Sci_Position line, LexAccessor &styler){
+	while (line > 0) {
+		Sci_Position pos = styler.LineStart(line);
+		Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+		for (Sci_Position i = pos; i < eol_pos; i++) {
+			char ch = styler[i];
+			int style = styler.StyleAt(i);
+			if (style == SCE_BAAN_WORD4)
+				return true;
+			else if (style == SCE_BAAN_WORD5)
+				return false;
+			else if (IsASpaceOrTab(ch))
+				continue;
+			else
+				break;
+		}
+		line--;
+	}
+	return false;
+}
+
+static bool nextSectionIsSubSection(Sci_Position line, LexAccessor &styler) {
+	while (line > 0) {
+		Sci_Position pos = styler.LineStart(line);
+		Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+		for (Sci_Position i = pos; i < eol_pos; i++) {
+			char ch = styler[i];
+			int style = styler.StyleAt(i);
+			if (style == SCE_BAAN_WORD4)
+				return true;
+			else if (style == SCE_BAAN_WORD5)
+				return false;
+			else if (IsASpaceOrTab(ch))
+				continue;
+			else
+				break;
+		}
+		line++;
+	}
+	return false;
+}
+
+static bool IsDeclarationLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (style == SCE_BAAN_WORD) {
+			if (styler.Match(i, "table") || styler.Match(i, "extern") || styler.Match(i, "long")
+				|| styler.Match(i, "double") || styler.Match(i, "boolean") || styler.Match(i, "string")
+				|| styler.Match(i, "domain")) {
+				for (Sci_Position j = eol_pos; j > pos; j--) {
+					int styleFromEnd = styler.StyleAt(j);
+					if (styleFromEnd == SCE_BAAN_COMMENT)
+						continue;
+					else if (IsASpace(styler[j]))
+						continue;
+					else if (styler[j] != ',')
+						//Above conditions ensures, Declaration is not part of any function parameters.
+						return true;
+					else
+						return false;
+				}
+			}
+			else
+				return false;
+		}
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static bool IsInnerLevelFold(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (style == SCE_BAAN_WORD && (styler.Match(i, "else" ) || styler.Match(i, "case")
+			|| styler.Match(i, "default") || styler.Match(i, "selectdo") || styler.Match(i, "selecteos")
+			|| styler.Match(i, "selectempty") || styler.Match(i, "selecterror")))
+			return true;
+		else if (IsASpaceOrTab(ch))
+			continue;
+		else
+			return false;
+	}
+	return false;
+}
+
+static inline bool wordInArray(const std::string& value, std::string *array, int length)
+{
+	for (int i = 0; i < length; i++)
+	{
+		if (value == array[i])
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+class WordListAbridged : public WordList {
+public:
+	WordListAbridged() {
+		kwAbridged = false;
+		kwHasSection = false;
+	};
+	~WordListAbridged() {
+		Clear();
+	};
+	bool kwAbridged;
+	bool kwHasSection;
+	bool Contains(const char *s) {
+		return kwAbridged ? InListAbridged(s, '~') : InList(s);
+	};
+};
+
+}
+
+class LexerBaan : public DefaultLexer {
+	WordListAbridged keywords;
+	WordListAbridged keywords2;
+	WordListAbridged keywords3;
+	WordListAbridged keywords4;
+	WordListAbridged keywords5;
+	WordListAbridged keywords6;
+	WordListAbridged keywords7;
+	WordListAbridged keywords8;
+	WordListAbridged keywords9;
+	OptionsBaan options;
+	OptionSetBaan osBaan;
+public:
+	LexerBaan() : DefaultLexer("baan", SCLEX_BAAN) {
+	}
+
+	virtual ~LexerBaan() {
+	}
+
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+
+	const char * SCI_METHOD PropertyNames() override {
+		return osBaan.PropertyNames();
+	}
+
+	int SCI_METHOD PropertyType(const char * name) override {
+		return osBaan.PropertyType(name);
+	}
+
+	const char * SCI_METHOD DescribeProperty(const char * name) override {
+		return osBaan.DescribeProperty(name);
+	}
+
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osBaan.PropertyGet(key);
+	}
+
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osBaan.DescribeWordListSets();
+	}
+
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return NULL;
+	}
+
+	static ILexer5 * LexerFactoryBaan() {
+		return new LexerBaan();
+	}
+};
+
+Sci_Position SCI_METHOD LexerBaan::PropertySet(const char *key, const char *val) {
+	if (osBaan.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerBaan::WordListSet(int n, const char *wl) {
+	WordListAbridged *WordListAbridgedN = 0;
+	switch (n) {
+	case 0:
+		WordListAbridgedN = &keywords;
+		break;
+	case 1:
+		WordListAbridgedN = &keywords2;
+		break;
+	case 2:
+		WordListAbridgedN = &keywords3;
+		break;
+	case 3:
+		WordListAbridgedN = &keywords4;
+		break;
+	case 4:
+		WordListAbridgedN = &keywords5;
+		break;
+	case 5:
+		WordListAbridgedN = &keywords6;
+		break;
+	case 6:
+		WordListAbridgedN = &keywords7;
+		break;
+	case 7:
+		WordListAbridgedN = &keywords8;
+		break;
+	case 8:
+		WordListAbridgedN = &keywords9;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (WordListAbridgedN) {
+		WordListAbridged wlNew;
+		wlNew.Set(wl);
+		if (*WordListAbridgedN != wlNew) {
+			WordListAbridgedN->Set(wl);
+			WordListAbridgedN->kwAbridged = strchr(wl, '~') != NULL;
+			WordListAbridgedN->kwHasSection = strchr(wl, ':') != NULL;
+
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerBaan::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (initStyle == SCE_BAAN_STRINGEOL)	// Does not leak onto next line
+		initStyle = SCE_BAAN_DEFAULT;
+
+	int visibleChars = 0;
+	bool lineHasDomain = false;
+	bool lineHasFunction = false;
+	bool lineHasPreProc = false;
+	bool lineIgnoreString = false;
+	bool lineHasDefines = false;
+	bool numberIsHex = false;
+	char word[1000];
+	int wordlen = 0;
+
+	std::string preProcessorTags[13] = { "#context_off", "#context_on",
+		"#define", "#elif", "#else", "#endif",
+		"#ident", "#if", "#ifdef", "#ifndef",
+		"#include", "#pragma", "#undef" };
+	LexAccessor styler(pAccess);
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+		case SCE_BAAN_OPERATOR:
+			sc.SetState(SCE_BAAN_DEFAULT);
+			break;
+		case SCE_BAAN_NUMBER:
+			if (IsASpaceOrTab(sc.ch) || sc.ch == '\r' || sc.ch == '\n' || IsAnOperator(sc.ch)) {
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+			else if ((numberIsHex && !(MakeLowerCase(sc.ch) == 'x' || MakeLowerCase(sc.ch) == 'e' ||
+				IsADigit(sc.ch, 16) || sc.ch == '.' || sc.ch == '-' || sc.ch == '+')) ||
+				(!numberIsHex && !(MakeLowerCase(sc.ch) == 'e' || IsADigit(sc.ch)
+				|| sc.ch == '.' || sc.ch == '-' || sc.ch == '+'))) {
+					// check '-' for possible -10e-5. Add '+' as well.
+					numberIsHex = false;
+					sc.ChangeState(SCE_BAAN_IDENTIFIER);
+					sc.SetState(SCE_BAAN_DEFAULT);
+			}
+			break;
+		case SCE_BAAN_IDENTIFIER:
+			if (!IsAWordChar(sc.ch)) {
+				char s[1000];
+				char s1[1000];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (sc.ch == ':') {
+					memcpy(s1, s, sizeof(s));
+					s1[sc.LengthCurrent()] = sc.ch;
+					s1[sc.LengthCurrent() + 1] = '\0';
+				}
+				if ((keywords.kwHasSection && (sc.ch == ':')) ? keywords.Contains(s1) : keywords.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD);
+					if (0 == strcmp(s, "domain")) {
+						lineHasDomain = true;
+					}
+					else if (0 == strcmp(s, "function")) {
+						lineHasFunction = true;
+					}
+				}
+				else if (lineHasDomain) {
+					sc.ChangeState(SCE_BAAN_DOMDEF);
+					lineHasDomain = false;
+				}
+				else if (lineHasFunction) {
+					sc.ChangeState(SCE_BAAN_FUNCDEF);
+					lineHasFunction = false;
+				}
+				else if ((keywords2.kwHasSection && (sc.ch == ':')) ? keywords2.Contains(s1) : keywords2.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD2);
+				}
+				else if ((keywords3.kwHasSection && (sc.ch == ':')) ? keywords3.Contains(s1) : keywords3.Contains(s)) {
+					if (sc.ch == '(')
+						sc.ChangeState(SCE_BAAN_WORD3);
+					else
+						sc.ChangeState(SCE_BAAN_IDENTIFIER);
+				}
+				else if ((keywords4.kwHasSection && (sc.ch == ':')) ? keywords4.Contains(s1) : keywords4.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD4);
+				}
+				else if ((keywords5.kwHasSection && (sc.ch == ':')) ? keywords5.Contains(s1) : keywords5.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD5);
+				}
+				else if ((keywords6.kwHasSection && (sc.ch == ':')) ? keywords6.Contains(s1) : keywords6.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD6);
+				}
+				else if ((keywords7.kwHasSection && (sc.ch == ':')) ? keywords7.Contains(s1) : keywords7.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD7);
+				}
+				else if ((keywords8.kwHasSection && (sc.ch == ':')) ? keywords8.Contains(s1) : keywords8.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD8);
+				}
+				else if ((keywords9.kwHasSection && (sc.ch == ':')) ? keywords9.Contains(s1) : keywords9.Contains(s)) {
+					sc.ChangeState(SCE_BAAN_WORD9);
+				}
+				else if (lineHasPreProc) {
+					sc.ChangeState(SCE_BAAN_OBJECTDEF);
+					lineHasPreProc = false;
+				}
+				else if (lineHasDefines) {
+					sc.ChangeState(SCE_BAAN_DEFINEDEF);
+					lineHasDefines = false;
+				}
+				else {
+					int state = IsAnyOtherIdentifier(s, sc.LengthCurrent());
+					if (state > 0) {
+						sc.ChangeState(state);
+					}
+				}
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+			break;
+		case SCE_BAAN_PREPROCESSOR:
+			if (options.baanStylingWithinPreprocessor) {
+				if (IsASpace(sc.ch) || IsAnOperator(sc.ch)) {
+					sc.SetState(SCE_BAAN_DEFAULT);
+				}
+			}
+			else {
+				if (sc.atLineEnd && (sc.chNext != '^')) {
+					sc.SetState(SCE_BAAN_DEFAULT);
+				}
+			}
+			break;
+		case SCE_BAAN_COMMENT:
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_BAAN_DEFAULT);
+			}
+			break;
+		case SCE_BAAN_COMMENTDOC:
+			if (sc.MatchIgnoreCase("enddllusage")) {
+				for (unsigned int i = 0; i < 10; i++) {
+					sc.Forward();
+				}
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+			}
+			else if (sc.MatchIgnoreCase("endfunctionusage")) {
+				for (unsigned int i = 0; i < 15; i++) {
+					sc.Forward();
+				}
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+			}
+			break;
+		case SCE_BAAN_STRING:
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+			}
+			else if ((sc.atLineEnd) && (sc.chNext != '^')) {
+				sc.ChangeState(SCE_BAAN_STRINGEOL);
+				sc.ForwardSetState(SCE_BAAN_DEFAULT);
+				visibleChars = 0;
+			}
+			break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_BAAN_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))
+				|| ((sc.ch == '-' || sc.ch == '+') && (IsADigit(sc.chNext) || sc.chNext == '.'))
+				|| (MakeLowerCase(sc.ch) == 'e' && (IsADigit(sc.chNext) || sc.chNext == '+' || sc.chNext == '-'))) {
+				if ((sc.ch == '0' && MakeLowerCase(sc.chNext) == 'x') ||
+					((sc.ch == '-' || sc.ch == '+') && sc.chNext == '0' && MakeLowerCase(sc.GetRelativeCharacter(2)) == 'x')){
+					numberIsHex = true;
+				}
+				sc.SetState(SCE_BAAN_NUMBER);
+			}
+			else if (sc.MatchIgnoreCase("dllusage") || sc.MatchIgnoreCase("functionusage")) {
+				sc.SetState(SCE_BAAN_COMMENTDOC);
+				do {
+					sc.Forward();
+				} while ((!sc.atLineEnd) && sc.More());
+			}
+			else if (iswordstart(sc.ch)) {
+				sc.SetState(SCE_BAAN_IDENTIFIER);
+			}
+			else if (sc.Match('|')) {
+				sc.SetState(SCE_BAAN_COMMENT);
+			}
+			else if (sc.ch == '\"' && !(lineIgnoreString)) {
+				sc.SetState(SCE_BAAN_STRING);
+			}
+			else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_BAAN_PREPROCESSOR);
+				word[0] = '\0';
+				wordlen = 0;
+				while (sc.More() && !(IsASpace(sc.chNext) || IsAnOperator(sc.chNext))) {
+					sc.Forward();
+					wordlen++;
+				}
+				sc.GetCurrentLowered(word, sizeof(word));
+				if (!sc.atLineEnd) {
+					word[wordlen++] = sc.ch;
+					word[wordlen++] = '\0';
+				}
+				if (!wordInArray(word, preProcessorTags, 13))
+					// Colorise only preprocessor built in Baan.
+					sc.ChangeState(SCE_BAAN_IDENTIFIER);
+				if (strcmp(word, "#pragma") == 0 || strcmp(word, "#include") == 0) {
+					lineHasPreProc = true;
+					lineIgnoreString = true;
+				}
+				else if (strcmp(word, "#define") == 0 || strcmp(word, "#undef") == 0 ||
+					strcmp(word, "#ifdef") == 0 || strcmp(word, "#if") == 0 || strcmp(word, "#ifndef") == 0) {
+					lineHasDefines = true;
+					lineIgnoreString = false;
+				}
+			}
+			else if (IsAnOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_BAAN_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+			lineHasDomain = false;
+			lineHasFunction = false;
+			lineHasPreProc = false;
+			lineIgnoreString = false;
+			lineHasDefines = false;
+			numberIsHex = false;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+void SCI_METHOD LexerBaan::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	if (!options.fold)
+		return;
+
+	char word[100];
+	int wordlen = 0;
+	bool foldStart = true;
+	bool foldNextSelect = true;
+	bool afterFunctionSection = false;
+	bool beforeDeclarationSection = false;
+	int currLineStyle = 0;
+	int nextLineStyle = 0;
+
+	std::string startTags[6] = { "for", "if", "on", "repeat", "select", "while" };
+	std::string endTags[6] = { "endcase", "endfor", "endif", "endselect", "endwhile", "until" };
+	std::string selectCloseTags[5] = { "selectdo", "selecteos", "selectempty", "selecterror", "endselect" };
+
+	LexAccessor styler(pAccess);
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	// Backtrack to previous line in case need to fix its fold status
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+
+	int levelPrev = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int style = initStyle;
+	int styleNext = styler.StyleAt(startPos);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		int stylePrev = (i) ? styler.StyleAt(i - 1) : SCE_BAAN_DEFAULT;
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		// Comment folding
+		if (options.foldComment && style == SCE_BAAN_COMMENTDOC) {
+			if (style != stylePrev) {
+				levelCurrent++;
+			}
+			else if (style != styleNext) {
+				levelCurrent--;
+			}
+		}
+		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
+			if (!IsCommentLine(lineCurrent - 1, styler)
+				&& IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+				&& !IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent--;
+		}
+		// PreProcessor Folding
+		if (options.foldPreprocessor) {
+			if (atEOL && IsPreProcLine(lineCurrent, styler)) {
+				if (!IsPreProcLine(lineCurrent - 1, styler)
+					&& IsPreProcLine(lineCurrent + 1, styler))
+					levelCurrent++;
+				else if (IsPreProcLine(lineCurrent - 1, styler)
+					&& !IsPreProcLine(lineCurrent + 1, styler))
+					levelCurrent--;
+			}
+			else if (style == SCE_BAAN_PREPROCESSOR) {
+				// folds #ifdef/#if/#ifndef - they are not part of the IsPreProcLine folding.
+				if (ch == '#') {
+					if (styler.Match(i, "#ifdef") || styler.Match(i, "#if") || styler.Match(i, "#ifndef")
+						|| styler.Match(i, "#context_on"))
+						levelCurrent++;
+					else if (styler.Match(i, "#endif") || styler.Match(i, "#context_off"))
+						levelCurrent--;
+				}
+			}
+		}
+		//Syntax Folding
+		if (options.baanFoldSyntaxBased && (style == SCE_BAAN_OPERATOR)) {
+			if (ch == '{' || ch == '(') {
+				levelCurrent++;
+			}
+			else if (ch == '}' || ch == ')') {
+				levelCurrent--;
+			}
+		}
+		//Keywords Folding
+		if (options.baanFoldKeywordsBased) {
+			if (atEOL && IsDeclarationLine(lineCurrent, styler)) {
+				if (!IsDeclarationLine(lineCurrent - 1, styler)
+					&& IsDeclarationLine(lineCurrent + 1, styler))
+					levelCurrent++;
+				else if (IsDeclarationLine(lineCurrent - 1, styler)
+					&& !IsDeclarationLine(lineCurrent + 1, styler))
+					levelCurrent--;
+			}
+			else if (style == SCE_BAAN_WORD) {
+				word[wordlen++] = static_cast<char>(MakeLowerCase(ch));
+				if (wordlen == 100) {                   // prevent overflow
+					word[0] = '\0';
+					wordlen = 1;
+				}
+				if (styleNext != SCE_BAAN_WORD) {
+					word[wordlen] = '\0';
+					wordlen = 0;
+					if (strcmp(word, "for") == 0) {
+						Sci_PositionU j = i + 1;
+						while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+							j++;
+						}
+						if (styler.Match(j, "update")) {
+							// Means this is a "for update" used by Select which is already folded.
+							foldStart = false;
+						}
+					}
+					else if (strcmp(word, "on") == 0) {
+						Sci_PositionU j = i + 1;
+						while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+							j++;
+						}
+						if (!styler.Match(j, "case")) {
+							// Means this is not a "on Case" statement... could be "on" used by index.
+							foldStart = false;
+						}
+					}
+					else if (strcmp(word, "select") == 0) {
+						if (foldNextSelect) {
+							// Next Selects are sub-clause till reach of selectCloseTags[] array.
+							foldNextSelect = false;
+							foldStart = true;
+						}
+						else {
+							foldNextSelect = false;
+							foldStart = false;
+						}
+					}
+					else if (wordInArray(word, selectCloseTags, 5)) {
+						// select clause ends, next select clause can be folded.
+						foldNextSelect = true;
+						foldStart = true;
+					}
+					else {
+						foldStart = true;
+					}
+					if (foldStart) {
+						if (wordInArray(word, startTags, 6)) {
+							levelCurrent++;
+						}
+						else if (wordInArray(word, endTags, 6)) {
+							levelCurrent--;
+						}
+					}
+				}
+			}
+		}
+		// Fold inner level of if/select/case statements
+		if (options.baanFoldInnerLevel && atEOL) {
+			bool currLineInnerLevel = IsInnerLevelFold(lineCurrent, styler);
+			bool nextLineInnerLevel = IsInnerLevelFold(lineCurrent + 1, styler);
+			if (currLineInnerLevel && currLineInnerLevel != nextLineInnerLevel) {
+				levelCurrent++;
+			}
+			else if (nextLineInnerLevel && nextLineInnerLevel != currLineInnerLevel) {
+				levelCurrent--;
+			}
+		}
+		// Section Foldings.
+		// One way of implementing Section Foldings, as there is no END markings of sections.
+		// first section ends on the previous line of next section.
+		// Re-written whole folding to accomodate this.
+		if (options.baanFoldSections && atEOL) {
+			currLineStyle = mainOrSubSectionLine(lineCurrent, styler);
+			nextLineStyle = mainOrSubSectionLine(lineCurrent + 1, styler);
+			if (currLineStyle != 0 && currLineStyle != nextLineStyle) {
+				if (levelCurrent < levelPrev)
+					--levelPrev;
+				for (Sci_Position j = styler.LineStart(lineCurrent); j < styler.LineStart(lineCurrent + 1) - 1; j++) {
+					if (IsASpaceOrTab(styler[j]))
+						continue;
+					else if (styler.StyleAt(j) == SCE_BAAN_WORD5) {
+						if (styler.Match(j, "functions:")) {
+							// Means functions: is the end of MainSections.
+							// Nothing to fold after this.
+							afterFunctionSection = true;
+							break;
+						}
+						else {
+							afterFunctionSection = false;
+							break;
+						}
+					}
+					else {
+						afterFunctionSection = false;
+						break;
+					}
+				}
+				if (!afterFunctionSection)
+					levelCurrent++;
+			}
+			else if (nextLineStyle != 0 && currLineStyle != nextLineStyle
+				&& (priorSectionIsSubSection(lineCurrent -1 ,styler)
+					|| !nextSectionIsSubSection(lineCurrent + 1, styler))) {
+				for (Sci_Position j = styler.LineStart(lineCurrent + 1); j < styler.LineStart(lineCurrent + 1 + 1) - 1; j++) {
+					if (IsASpaceOrTab(styler[j]))
+						continue;
+					else if (styler.StyleAt(j) == SCE_BAAN_WORD5) {
+						if (styler.Match(j, "declaration:")) {
+							// Means declaration: is the start of MainSections.
+							// Nothing to fold before this.
+							beforeDeclarationSection = true;
+							break;
+						}
+						else {
+							beforeDeclarationSection = false;
+							break;
+						}
+					}
+					else {
+						beforeDeclarationSection = false;
+						break;
+					}
+				}
+				if (!beforeDeclarationSection) {
+					levelCurrent--;
+					if (nextLineStyle == SCE_BAAN_WORD5 && priorSectionIsSubSection(lineCurrent-1, styler))
+						// next levelCurrent--; is to unfold previous subsection fold.
+						// On reaching the next main section, the previous main as well sub section ends.
+						levelCurrent--;
+				}
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			lev |= levelCurrent << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmBaan(SCLEX_BAAN, LexerBaan::LexerFactoryBaan, "baan", baanWordLists);
diff --git a/scite-app/lexilla/lexers/LexBash.cxx b/scite-app/lexilla/lexers/LexBash.cxx
new file mode 100644
index 0000000..be66ad9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBash.cxx
@@ -0,0 +1,1089 @@
+// Scintilla source code edit control
+/** @file LexBash.cxx
+ ** Lexer for Bash.
+ **/
+// Copyright 2004-2012 by Neil Hodgson <neilh@scintilla.org>
+// Adapted from LexPerl by Kein-Hong Man 2004
+// 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 <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SubStyles.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+#define HERE_DELIM_MAX			256
+
+// define this if you want 'invalid octals' to be marked as errors
+// usually, this is not a good idea, permissive lexing is better
+#undef PEDANTIC_OCTAL
+
+#define BASH_BASE_ERROR			65
+#define BASH_BASE_DECIMAL		66
+#define BASH_BASE_HEX			67
+#ifdef PEDANTIC_OCTAL
+#define BASH_BASE_OCTAL			68
+#define	BASH_BASE_OCTAL_ERROR	69
+#endif
+
+// state constants for parts of a bash command segment
+#define	BASH_CMD_BODY			0
+#define BASH_CMD_START			1
+#define BASH_CMD_WORD			2
+#define BASH_CMD_TEST			3
+#define BASH_CMD_ARITH			4
+#define BASH_CMD_DELIM			5
+
+// state constants for nested delimiter pairs, used by
+// SCE_SH_STRING and SCE_SH_BACKTICKS processing
+#define BASH_DELIM_LITERAL		0
+#define BASH_DELIM_STRING		1
+#define BASH_DELIM_CSTRING		2
+#define BASH_DELIM_LSTRING		3
+#define BASH_DELIM_COMMAND		4
+#define BASH_DELIM_BACKTICK		5
+
+#define BASH_DELIM_STACK_MAX	7
+
+namespace {
+
+inline int translateBashDigit(int ch) {
+	if (ch >= '0' && ch <= '9') {
+		return ch - '0';
+	} else if (ch >= 'a' && ch <= 'z') {
+		return ch - 'a' + 10;
+	} else if (ch >= 'A' && ch <= 'Z') {
+		return ch - 'A' + 36;
+	} else if (ch == '@') {
+		return 62;
+	} else if (ch == '_') {
+		return 63;
+	}
+	return BASH_BASE_ERROR;
+}
+
+inline int getBashNumberBase(char *s) {
+	int i = 0;
+	int base = 0;
+	while (*s) {
+		base = base * 10 + (*s++ - '0');
+		i++;
+	}
+	if (base > 64 || i > 2) {
+		return BASH_BASE_ERROR;
+	}
+	return base;
+}
+
+int opposite(int ch) {
+	if (ch == '(') return ')';
+	if (ch == '[') return ']';
+	if (ch == '{') return '}';
+	if (ch == '<') return '>';
+	return ch;
+}
+
+int GlobScan(StyleContext &sc) {
+	// forward scan for zsh globs, disambiguate versus bash arrays
+	// complex expressions may still fail, e.g. unbalanced () '' "" etc
+	int c, sLen = 0;
+	int pCount = 0;
+	int hash = 0;
+	while ((c = sc.GetRelativeCharacter(++sLen)) != 0) {
+		if (IsASpace(c)) {
+			return 0;
+		} else if (c == '\'' || c == '\"') {
+			if (hash != 2) return 0;
+		} else if (c == '#' && hash == 0) {
+			hash = (sLen == 1) ? 2:1;
+		} else if (c == '(') {
+			pCount++;
+		} else if (c == ')') {
+			if (pCount == 0) {
+				if (hash) return sLen;
+				return 0;
+			}
+			pCount--;
+		}
+	}
+	return 0;
+}
+
+bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+struct OptionsBash {
+	bool fold;
+	bool foldComment;
+	bool foldCompact;
+
+	OptionsBash() {
+		fold = false;
+		foldComment = false;
+		foldCompact = true;
+	}
+};
+
+const char * const bashWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+struct OptionSetBash : public OptionSet<OptionsBash> {
+	OptionSetBash() {
+		DefineProperty("fold", &OptionsBash::fold);
+
+		DefineProperty("fold.comment", &OptionsBash::foldComment);
+
+		DefineProperty("fold.compact", &OptionsBash::foldCompact);
+
+		DefineWordListSets(bashWordListDesc);
+	}
+};
+
+const char styleSubable[] = { SCE_SH_IDENTIFIER, SCE_SH_SCALAR, 0 };
+
+LexicalClass lexicalClasses[] = {
+	// Lexer Bash SCLEX_BASH SCE_SH_:
+	0, "SCE_SH_DEFAULT", "default", "White space",
+	1, "SCE_SH_ERROR", "error", "Error",
+	2, "SCE_SH_COMMENTLINE", "comment line", "Line comment: #",
+	3, "SCE_SH_NUMBER", "literal numeric", "Number",
+	4, "SCE_SH_WORD", "keyword", "Keyword",
+	5, "SCE_SH_STRING", "literal string", "String",
+	6, "SCE_SH_CHARACTER", "literal string", "Single quoted string",
+	7, "SCE_SH_OPERATOR", "operator", "Operators",
+	8, "SCE_SH_IDENTIFIER", "identifier", "Identifiers",
+	9, "SCE_SH_SCALAR", "identifier", "Scalar variable",
+	10, "SCE_SH_PARAM", "identifier", "Parameter",
+	11, "SCE_SH_BACKTICKS", "literal string", "Backtick quoted command",
+	12, "SCE_SH_HERE_DELIM", "operator", "Heredoc delimiter",
+	13, "SCE_SH_HERE_Q", "literal string", "Heredoc quoted string",
+};
+
+}
+
+class LexerBash : public DefaultLexer {
+	WordList keywords;
+	OptionsBash options;
+	OptionSetBash osBash;
+	enum { ssIdentifier, ssScalar };
+	SubStyles subStyles;
+public:
+	LexerBash() :
+		DefaultLexer("bash", SCLEX_BASH, lexicalClasses, ELEMENTS(lexicalClasses)),
+		subStyles(styleSubable, 0x80, 0x40, 0) {
+	}
+	virtual ~LexerBash() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osBash.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char* name) override {
+		return osBash.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osBash.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char* key) override {
+		return osBash.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osBash.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		const int styleBase = subStyles.BaseStyle(subStyle);
+		return styleBase;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+		return style;
+	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() override {
+		return 0;
+	}
+	const char *SCI_METHOD GetSubStyleBases() override {
+		return styleSubable;
+	}
+
+	static ILexer5 *LexerFactoryBash() {
+		return new LexerBash();
+	}
+};
+
+Sci_Position SCI_METHOD LexerBash::PropertySet(const char *key, const char *val) {
+	if (osBash.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerBash::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	WordList cmdDelimiter, bashStruct, bashStruct_in;
+	cmdDelimiter.Set("| || |& & && ; ;; ( ) { }");
+	bashStruct.Set("if elif fi while until else then do done esac eval");
+	bashStruct_in.Set("for case select");
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_");
+	// note that [+-] are often parts of identifiers in shell scripts
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._+-");
+	CharacterSet setMetaCharacter(CharacterSet::setNone, "|&;()<> \t\r\n");
+	setMetaCharacter.Add(0);
+	CharacterSet setBashOperator(CharacterSet::setNone, "^&%()-+=|{}[]:;>,*/<?!.~@");
+	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMACahGLNn");
+	CharacterSet setParam(CharacterSet::setAlphaNum, "$_");
+	CharacterSet setHereDoc(CharacterSet::setAlpha, "_\\-+!%*,./:?@[]^`{}~");
+	CharacterSet setHereDoc2(CharacterSet::setAlphaNum, "_-+!%*,./:=?@[]^`{}~");
+	CharacterSet setLeftShift(CharacterSet::setDigits, "$");
+
+	class HereDocCls {	// Class to manage HERE document elements
+	public:
+		int State;		// 0: '<<' encountered
+		// 1: collect the delimiter
+		// 2: here doc text (lines after the delimiter)
+		int Quote;		// the char after '<<'
+		bool Quoted;		// true if Quote in ('\'','"','`')
+		bool Indent;		// indented delimiter (for <<-)
+		int DelimiterLength;	// strlen(Delimiter)
+		char Delimiter[HERE_DELIM_MAX];	// the Delimiter
+		HereDocCls() {
+			State = 0;
+			Quote = 0;
+			Quoted = false;
+			Indent = 0;
+			DelimiterLength = 0;
+			Delimiter[0] = '\0';
+		}
+		void Append(int ch) {
+			Delimiter[DelimiterLength++] = static_cast<char>(ch);
+			Delimiter[DelimiterLength] = '\0';
+		}
+		~HereDocCls() {
+		}
+	};
+	HereDocCls HereDoc;
+
+	class QuoteCls {	// Class to manage quote pairs (simplified vs LexPerl)
+		public:
+		int Count;
+		int Up, Down;
+		QuoteCls() {
+			Count = 0;
+			Up    = '\0';
+			Down  = '\0';
+		}
+		void Open(int u) {
+			Count++;
+			Up    = u;
+			Down  = opposite(Up);
+		}
+		void Start(int u) {
+			Count = 0;
+			Open(u);
+		}
+	};
+	QuoteCls Quote;
+
+	class QuoteStackCls {	// Class to manage quote pairs that nest
+		public:
+		int Count;
+		int Up, Down;
+		int Style;
+		int Depth;			// levels pushed
+		int CountStack[BASH_DELIM_STACK_MAX];
+		int UpStack   [BASH_DELIM_STACK_MAX];
+		int StyleStack[BASH_DELIM_STACK_MAX];
+		QuoteStackCls() {
+			Count = 0;
+			Up    = '\0';
+			Down  = '\0';
+			Style = 0;
+			Depth = 0;
+		}
+		void Start(int u, int s) {
+			Count = 1;
+			Up    = u;
+			Down  = opposite(Up);
+			Style = s;
+		}
+		void Push(int u, int s) {
+			if (Depth >= BASH_DELIM_STACK_MAX)
+				return;
+			CountStack[Depth] = Count;
+			UpStack   [Depth] = Up;
+			StyleStack[Depth] = Style;
+			Depth++;
+			Count = 1;
+			Up    = u;
+			Down  = opposite(Up);
+			Style = s;
+		}
+		void Pop(void) {
+			if (Depth <= 0)
+				return;
+			Depth--;
+			Count = CountStack[Depth];
+			Up    = UpStack   [Depth];
+			Style = StyleStack[Depth];
+			Down  = opposite(Up);
+		}
+		~QuoteStackCls() {
+		}
+	};
+	QuoteStackCls QuoteStack;
+
+	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_SH_IDENTIFIER);
+	const WordClassifier &classifierScalars = subStyles.Classifier(SCE_SH_SCALAR);
+
+	int numBase = 0;
+	int digit;
+	Sci_PositionU endPos = startPos + length;
+	int cmdState = BASH_CMD_START;
+	int testExprType = 0;
+	LexAccessor styler(pAccess);
+
+	// Always backtracks to the start of a line that is not a continuation
+	// of the previous line (i.e. start of a bash command segment)
+	Sci_Position ln = styler.GetLine(startPos);
+	if (ln > 0 && startPos == static_cast<Sci_PositionU>(styler.LineStart(ln)))
+		ln--;
+	for (;;) {
+		startPos = styler.LineStart(ln);
+		if (ln == 0 || styler.GetLineState(ln) == BASH_CMD_START)
+			break;
+		ln--;
+	}
+	initStyle = SCE_SH_DEFAULT;
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// handle line continuation, updates per-line stored state
+		if (sc.atLineStart) {
+			ln = styler.GetLine(sc.currentPos);
+			if (sc.state == SCE_SH_STRING
+			 || sc.state == SCE_SH_BACKTICKS
+			 || sc.state == SCE_SH_CHARACTER
+			 || sc.state == SCE_SH_HERE_Q
+			 || sc.state == SCE_SH_COMMENTLINE
+			 || sc.state == SCE_SH_PARAM) {
+				// force backtrack while retaining cmdState
+				styler.SetLineState(ln, BASH_CMD_BODY);
+			} else {
+				if (ln > 0) {
+					if ((sc.GetRelative(-3) == '\\' && sc.GetRelative(-2) == '\r' && sc.chPrev == '\n')
+					 || sc.GetRelative(-2) == '\\') {	// handle '\' line continuation
+						// retain last line's state
+					} else
+						cmdState = BASH_CMD_START;
+				}
+				styler.SetLineState(ln, cmdState);
+			}
+		}
+
+		// controls change of cmdState at the end of a non-whitespace element
+		// states BODY|TEST|ARITH persist until the end of a command segment
+		// state WORD persist, but ends with 'in' or 'do' construct keywords
+		int cmdStateNew = BASH_CMD_BODY;
+		if (cmdState == BASH_CMD_TEST || cmdState == BASH_CMD_ARITH || cmdState == BASH_CMD_WORD)
+			cmdStateNew = cmdState;
+		int stylePrev = sc.state;
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_SH_OPERATOR:
+				sc.SetState(SCE_SH_DEFAULT);
+				if (cmdState == BASH_CMD_DELIM)		// if command delimiter, start new command
+					cmdStateNew = BASH_CMD_START;
+				else if (sc.chPrev == '\\')			// propagate command state if line continued
+					cmdStateNew = cmdState;
+				break;
+			case SCE_SH_WORD:
+				// "." never used in Bash variable names but used in file names
+				if (!setWord.Contains(sc.ch)) {
+					char s[500];
+					char s2[10];
+					sc.GetCurrent(s, sizeof(s));
+					int identifierStyle = SCE_SH_IDENTIFIER;
+					int subStyle = classifierIdentifiers.ValueFor(s);
+					if (subStyle >= 0) {
+						identifierStyle = subStyle;
+					}
+					// allow keywords ending in a whitespace or command delimiter
+					s2[0] = static_cast<char>(sc.ch);
+					s2[1] = '\0';
+					bool keywordEnds = IsASpace(sc.ch) || cmdDelimiter.InList(s2);
+					// 'in' or 'do' may be construct keywords
+					if (cmdState == BASH_CMD_WORD) {
+						if (strcmp(s, "in") == 0 && keywordEnds)
+							cmdStateNew = BASH_CMD_BODY;
+						else if (strcmp(s, "do") == 0 && keywordEnds)
+							cmdStateNew = BASH_CMD_START;
+						else
+							sc.ChangeState(identifierStyle);
+						sc.SetState(SCE_SH_DEFAULT);
+						break;
+					}
+					// a 'test' keyword starts a test expression
+					if (strcmp(s, "test") == 0) {
+						if (cmdState == BASH_CMD_START && keywordEnds) {
+							cmdStateNew = BASH_CMD_TEST;
+							testExprType = 0;
+						} else
+							sc.ChangeState(identifierStyle);
+					}
+					// detect bash construct keywords
+					else if (bashStruct.InList(s)) {
+						if (cmdState == BASH_CMD_START && keywordEnds)
+							cmdStateNew = BASH_CMD_START;
+						else
+							sc.ChangeState(identifierStyle);
+					}
+					// 'for'|'case'|'select' needs 'in'|'do' to be highlighted later
+					else if (bashStruct_in.InList(s)) {
+						if (cmdState == BASH_CMD_START && keywordEnds)
+							cmdStateNew = BASH_CMD_WORD;
+						else
+							sc.ChangeState(identifierStyle);
+					}
+					// disambiguate option items and file test operators
+					else if (s[0] == '-') {
+						if (cmdState != BASH_CMD_TEST)
+							sc.ChangeState(identifierStyle);
+					}
+					// disambiguate keywords and identifiers
+					else if (cmdState != BASH_CMD_START
+						  || !(keywords.InList(s) && keywordEnds)) {
+						sc.ChangeState(identifierStyle);
+					}
+					sc.SetState(SCE_SH_DEFAULT);
+				}
+				break;
+			case SCE_SH_IDENTIFIER:
+				if (sc.chPrev == '\\' || !setWord.Contains(sc.ch) ||
+					  (cmdState == BASH_CMD_ARITH && !setWordStart.Contains(sc.ch))) {
+					char s[500];
+					sc.GetCurrent(s, sizeof(s));
+					int subStyle = classifierIdentifiers.ValueFor(s);
+					if (subStyle >= 0) {
+						sc.ChangeState(subStyle);
+					}
+					if (sc.chPrev == '\\') {	// for escaped chars
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else {
+						sc.SetState(SCE_SH_DEFAULT);
+					}
+				}
+				break;
+			case SCE_SH_NUMBER:
+				digit = translateBashDigit(sc.ch);
+				if (numBase == BASH_BASE_DECIMAL) {
+					if (sc.ch == '#') {
+						char s[10];
+						sc.GetCurrent(s, sizeof(s));
+						numBase = getBashNumberBase(s);
+						if (numBase != BASH_BASE_ERROR)
+							break;
+					} else if (IsADigit(sc.ch))
+						break;
+				} else if (numBase == BASH_BASE_HEX) {
+					if (IsADigit(sc.ch, 16))
+						break;
+#ifdef PEDANTIC_OCTAL
+				} else if (numBase == BASH_BASE_OCTAL ||
+						   numBase == BASH_BASE_OCTAL_ERROR) {
+					if (digit <= 7)
+						break;
+					if (digit <= 9) {
+						numBase = BASH_BASE_OCTAL_ERROR;
+						break;
+					}
+#endif
+				} else if (numBase == BASH_BASE_ERROR) {
+					if (digit <= 9)
+						break;
+				} else {	// DD#DDDD number style handling
+					if (digit != BASH_BASE_ERROR) {
+						if (numBase <= 36) {
+							// case-insensitive if base<=36
+							if (digit >= 36) digit -= 26;
+						}
+						if (digit < numBase)
+							break;
+						if (digit <= 9) {
+							numBase = BASH_BASE_ERROR;
+							break;
+						}
+					}
+				}
+				// fallthrough when number is at an end or error
+				if (numBase == BASH_BASE_ERROR
+#ifdef PEDANTIC_OCTAL
+					|| numBase == BASH_BASE_OCTAL_ERROR
+#endif
+				) {
+					sc.ChangeState(SCE_SH_ERROR);
+				}
+				sc.SetState(SCE_SH_DEFAULT);
+				break;
+			case SCE_SH_COMMENTLINE:
+				if (sc.atLineEnd && sc.chPrev != '\\') {
+					sc.SetState(SCE_SH_DEFAULT);
+				}
+				break;
+			case SCE_SH_HERE_DELIM:
+				// From Bash info:
+				// ---------------
+				// Specifier format is: <<[-]WORD
+				// Optional '-' is for removal of leading tabs from here-doc.
+				// Whitespace acceptable after <<[-] operator
+				//
+				if (HereDoc.State == 0) { // '<<' encountered
+					HereDoc.Quote = sc.chNext;
+					HereDoc.Quoted = false;
+					HereDoc.DelimiterLength = 0;
+					HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+					if (sc.chNext == '\'' || sc.chNext == '\"') {	// a quoted here-doc delimiter (' or ")
+						sc.Forward();
+						HereDoc.Quoted = true;
+						HereDoc.State = 1;
+					} else if (setHereDoc.Contains(sc.chNext) ||
+					           (sc.chNext == '=' && cmdState != BASH_CMD_ARITH)) {
+						// an unquoted here-doc delimiter, no special handling
+						HereDoc.State = 1;
+					} else if (sc.chNext == '<') {	// HERE string <<<
+						sc.Forward();
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else if (IsASpace(sc.chNext)) {
+						// eat whitespace
+					} else if (setLeftShift.Contains(sc.chNext) ||
+					           (sc.chNext == '=' && cmdState == BASH_CMD_ARITH)) {
+						// left shift <<$var or <<= cases
+						sc.ChangeState(SCE_SH_OPERATOR);
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else {
+						// symbols terminates; deprecated zero-length delimiter
+						HereDoc.State = 1;
+					}
+				} else if (HereDoc.State == 1) { // collect the delimiter
+					// * if single quoted, there's no escape
+					// * if double quoted, there are \\ and \" escapes
+					if ((HereDoc.Quote == '\'' && sc.ch != HereDoc.Quote) ||
+					    (HereDoc.Quoted && sc.ch != HereDoc.Quote && sc.ch != '\\') ||
+					    (HereDoc.Quote != '\'' && sc.chPrev == '\\') ||
+					    (setHereDoc2.Contains(sc.ch))) {
+						HereDoc.Append(sc.ch);
+					} else if (HereDoc.Quoted && sc.ch == HereDoc.Quote) {	// closing quote => end of delimiter
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else if (sc.ch == '\\') {
+						if (HereDoc.Quoted && sc.chNext != HereDoc.Quote && sc.chNext != '\\') {
+							// in quoted prefixes only \ and the quote eat the escape
+							HereDoc.Append(sc.ch);
+						} else {
+							// skip escape prefix
+						}
+					} else if (!HereDoc.Quoted) {
+						sc.SetState(SCE_SH_DEFAULT);
+					}
+					if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {	// force blowup
+						sc.SetState(SCE_SH_ERROR);
+						HereDoc.State = 0;
+					}
+				}
+				break;
+			case SCE_SH_HERE_Q:
+				// HereDoc.State == 2
+				if (sc.atLineStart) {
+					sc.SetState(SCE_SH_HERE_Q);
+					int prefixws = 0;
+					while (sc.ch == '\t' && !sc.atLineEnd) {	// tabulation prefix
+						sc.Forward();
+						prefixws++;
+					}
+					if (prefixws > 0)
+						sc.SetState(SCE_SH_HERE_Q);
+					while (!sc.atLineEnd) {
+						sc.Forward();
+					}
+					char s[HERE_DELIM_MAX];
+					sc.GetCurrent(s, sizeof(s));
+					if (sc.LengthCurrent() == 0) {  // '' or "" delimiters
+						if ((prefixws == 0 || HereDoc.Indent) &&
+							HereDoc.Quoted && HereDoc.DelimiterLength == 0)
+							sc.SetState(SCE_SH_DEFAULT);
+						break;
+					}
+					if (s[strlen(s) - 1] == '\r')
+						s[strlen(s) - 1] = '\0';
+					if (strcmp(HereDoc.Delimiter, s) == 0) {
+						if ((prefixws == 0) ||	// indentation rule
+							(prefixws > 0 && HereDoc.Indent)) {
+							sc.SetState(SCE_SH_DEFAULT);
+							break;
+						}
+					}
+				}
+				break;
+			case SCE_SH_SCALAR:	// variable names
+				if (!setParam.Contains(sc.ch)) {
+					char s[500];
+					sc.GetCurrent(s, sizeof(s));
+					int subStyle = classifierScalars.ValueFor(&s[1]); // skip the $
+					if (subStyle >= 0) {
+						sc.ChangeState(subStyle);
+					}
+					if (sc.LengthCurrent() == 1) {
+						// Special variable: $(, $_ etc.
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					} else {
+						sc.SetState(SCE_SH_DEFAULT);
+					}
+				}
+				break;
+			case SCE_SH_STRING:	// delimited styles, can nest
+			case SCE_SH_BACKTICKS:
+				if (sc.ch == '\\' && QuoteStack.Up != '\\') {
+					if (QuoteStack.Style != BASH_DELIM_LITERAL)
+						sc.Forward();
+				} else if (sc.ch == QuoteStack.Down) {
+					QuoteStack.Count--;
+					if (QuoteStack.Count == 0) {
+						if (QuoteStack.Depth > 0) {
+							QuoteStack.Pop();
+						} else
+							sc.ForwardSetState(SCE_SH_DEFAULT);
+					}
+				} else if (sc.ch == QuoteStack.Up) {
+					QuoteStack.Count++;
+				} else {
+					if (QuoteStack.Style == BASH_DELIM_STRING ||
+						QuoteStack.Style == BASH_DELIM_LSTRING
+					) {	// do nesting for "string", $"locale-string"
+						if (sc.ch == '`') {
+							QuoteStack.Push(sc.ch, BASH_DELIM_BACKTICK);
+						} else if (sc.ch == '$' && sc.chNext == '(') {
+							sc.Forward();
+							QuoteStack.Push(sc.ch, BASH_DELIM_COMMAND);
+						}
+					} else if (QuoteStack.Style == BASH_DELIM_COMMAND ||
+							   QuoteStack.Style == BASH_DELIM_BACKTICK
+					) {	// do nesting for $(command), `command`
+						if (sc.ch == '\'') {
+							QuoteStack.Push(sc.ch, BASH_DELIM_LITERAL);
+						} else if (sc.ch == '\"') {
+							QuoteStack.Push(sc.ch, BASH_DELIM_STRING);
+						} else if (sc.ch == '`') {
+							QuoteStack.Push(sc.ch, BASH_DELIM_BACKTICK);
+						} else if (sc.ch == '$') {
+							if (sc.chNext == '\'') {
+								sc.Forward();
+								QuoteStack.Push(sc.ch, BASH_DELIM_CSTRING);
+							} else if (sc.chNext == '\"') {
+								sc.Forward();
+								QuoteStack.Push(sc.ch, BASH_DELIM_LSTRING);
+							} else if (sc.chNext == '(') {
+								sc.Forward();
+								QuoteStack.Push(sc.ch, BASH_DELIM_COMMAND);
+							}
+						}
+					}
+				}
+				break;
+			case SCE_SH_PARAM: // ${parameter}
+				if (sc.ch == '\\' && Quote.Up != '\\') {
+					sc.Forward();
+				} else if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0) {
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					}
+				} else if (sc.ch == Quote.Up) {
+					Quote.Count++;
+				}
+				break;
+			case SCE_SH_CHARACTER: // singly-quoted strings
+				if (sc.ch == Quote.Down) {
+					Quote.Count--;
+					if (Quote.Count == 0) {
+						sc.ForwardSetState(SCE_SH_DEFAULT);
+					}
+				}
+				break;
+		}
+
+		// Must check end of HereDoc state 1 before default state is handled
+		if (HereDoc.State == 1 && sc.atLineEnd) {
+			// Begin of here-doc (the line after the here-doc delimiter):
+			// Lexically, the here-doc starts from the next line after the >>, but the
+			// first line of here-doc seem to follow the style of the last EOL sequence
+			HereDoc.State = 2;
+			if (HereDoc.Quoted) {
+				if (sc.state == SCE_SH_HERE_DELIM) {
+					// Missing quote at end of string! Syntax error in bash 4.3
+					// Mark this bit as an error, do not colour any here-doc
+					sc.ChangeState(SCE_SH_ERROR);
+					sc.SetState(SCE_SH_DEFAULT);
+				} else {
+					// HereDoc.Quote always == '\''
+					sc.SetState(SCE_SH_HERE_Q);
+				}
+			} else if (HereDoc.DelimiterLength == 0) {
+				// no delimiter, illegal (but '' and "" are legal)
+				sc.ChangeState(SCE_SH_ERROR);
+				sc.SetState(SCE_SH_DEFAULT);
+			} else {
+				sc.SetState(SCE_SH_HERE_Q);
+			}
+		}
+
+		// update cmdState about the current command segment
+		if (stylePrev != SCE_SH_DEFAULT && sc.state == SCE_SH_DEFAULT) {
+			cmdState = cmdStateNew;
+		}
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SH_DEFAULT) {
+			if (sc.ch == '\\') {
+				// Bash can escape any non-newline as a literal
+				sc.SetState(SCE_SH_IDENTIFIER);
+				if (sc.chNext == '\r' || sc.chNext == '\n')
+					sc.SetState(SCE_SH_OPERATOR);
+			} else if (IsADigit(sc.ch)) {
+				sc.SetState(SCE_SH_NUMBER);
+				numBase = BASH_BASE_DECIMAL;
+				if (sc.ch == '0') {	// hex,octal
+					if (sc.chNext == 'x' || sc.chNext == 'X') {
+						numBase = BASH_BASE_HEX;
+						sc.Forward();
+					} else if (IsADigit(sc.chNext)) {
+#ifdef PEDANTIC_OCTAL
+						numBase = BASH_BASE_OCTAL;
+#else
+						numBase = BASH_BASE_HEX;
+#endif
+					}
+				}
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_SH_WORD);
+			} else if (sc.ch == '#') {
+				if (stylePrev != SCE_SH_WORD && stylePrev != SCE_SH_IDENTIFIER &&
+					(sc.currentPos == 0 || setMetaCharacter.Contains(sc.chPrev))) {
+					sc.SetState(SCE_SH_COMMENTLINE);
+				} else {
+					sc.SetState(SCE_SH_WORD);
+				}
+				// handle some zsh features within arithmetic expressions only
+				if (cmdState == BASH_CMD_ARITH) {
+					if (sc.chPrev == '[') {	// [#8] [##8] output digit setting
+						sc.SetState(SCE_SH_WORD);
+						if (sc.chNext == '#') {
+							sc.Forward();
+						}
+					} else if (sc.Match("##^") && IsUpperCase(sc.GetRelative(3))) {	// ##^A
+						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.Forward(3);
+					} else if (sc.chNext == '#' && !IsASpace(sc.GetRelative(2))) {	// ##a
+						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.Forward(2);
+					} else if (setWordStart.Contains(sc.chNext)) {	// #name
+						sc.SetState(SCE_SH_IDENTIFIER);
+					}
+				}
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SH_STRING);
+				QuoteStack.Start(sc.ch, BASH_DELIM_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SH_CHARACTER);
+				Quote.Start(sc.ch);
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_SH_BACKTICKS);
+				QuoteStack.Start(sc.ch, BASH_DELIM_BACKTICK);
+			} else if (sc.ch == '$') {
+				if (sc.Match("$((")) {
+					sc.SetState(SCE_SH_OPERATOR);	// handle '((' later
+					continue;
+				}
+				sc.SetState(SCE_SH_SCALAR);
+				sc.Forward();
+				if (sc.ch == '{') {
+					sc.ChangeState(SCE_SH_PARAM);
+					Quote.Start(sc.ch);
+				} else if (sc.ch == '\'') {
+					sc.ChangeState(SCE_SH_STRING);
+					QuoteStack.Start(sc.ch, BASH_DELIM_CSTRING);
+				} else if (sc.ch == '"') {
+					sc.ChangeState(SCE_SH_STRING);
+					QuoteStack.Start(sc.ch, BASH_DELIM_LSTRING);
+				} else if (sc.ch == '(') {
+					sc.ChangeState(SCE_SH_BACKTICKS);
+					QuoteStack.Start(sc.ch, BASH_DELIM_COMMAND);
+				} else if (sc.ch == '`') {	// $` seen in a configure script, valid?
+					sc.ChangeState(SCE_SH_BACKTICKS);
+					QuoteStack.Start(sc.ch, BASH_DELIM_BACKTICK);
+				} else {
+					continue;	// scalar has no delimiter pair
+				}
+			} else if (sc.Match('<', '<')) {
+				sc.SetState(SCE_SH_HERE_DELIM);
+				HereDoc.State = 0;
+				if (sc.GetRelative(2) == '-') {	// <<- indent case
+					HereDoc.Indent = true;
+					sc.Forward();
+				} else {
+					HereDoc.Indent = false;
+				}
+			} else if (sc.ch == '-'	&&	// one-char file test operators
+					   setSingleCharOp.Contains(sc.chNext) &&
+					   !setWord.Contains(sc.GetRelative(2)) &&
+					   IsASpace(sc.chPrev)) {
+				sc.SetState(SCE_SH_WORD);
+				sc.Forward();
+			} else if (setBashOperator.Contains(sc.ch)) {
+				char s[10];
+				bool isCmdDelim = false;
+				sc.SetState(SCE_SH_OPERATOR);
+				// globs have no whitespace, do not appear in arithmetic expressions
+				if (cmdState != BASH_CMD_ARITH && sc.ch == '(' && sc.chNext != '(') {
+					int i = GlobScan(sc);
+					if (i > 1) {
+						sc.SetState(SCE_SH_IDENTIFIER);
+						sc.Forward(i);
+						continue;
+					}
+				}
+				// handle opening delimiters for test/arithmetic expressions - ((,[[,[
+				if (cmdState == BASH_CMD_START
+				 || cmdState == BASH_CMD_BODY) {
+					if (sc.Match('(', '(')) {
+						cmdState = BASH_CMD_ARITH;
+						sc.Forward();
+					} else if (sc.Match('[', '[') && IsASpace(sc.GetRelative(2))) {
+						cmdState = BASH_CMD_TEST;
+						testExprType = 1;
+						sc.Forward();
+					} else if (sc.ch == '[' && IsASpace(sc.chNext)) {
+						cmdState = BASH_CMD_TEST;
+						testExprType = 2;
+					}
+				}
+				// special state -- for ((x;y;z)) in ... looping
+				if (cmdState == BASH_CMD_WORD && sc.Match('(', '(')) {
+					cmdState = BASH_CMD_ARITH;
+					sc.Forward();
+					continue;
+				}
+				// handle command delimiters in command START|BODY|WORD state, also TEST if 'test'
+				if (cmdState == BASH_CMD_START
+				 || cmdState == BASH_CMD_BODY
+				 || cmdState == BASH_CMD_WORD
+				 || (cmdState == BASH_CMD_TEST && testExprType == 0)) {
+					s[0] = static_cast<char>(sc.ch);
+					if (setBashOperator.Contains(sc.chNext)) {
+						s[1] = static_cast<char>(sc.chNext);
+						s[2] = '\0';
+						isCmdDelim = cmdDelimiter.InList(s);
+						if (isCmdDelim)
+							sc.Forward();
+					}
+					if (!isCmdDelim) {
+						s[1] = '\0';
+						isCmdDelim = cmdDelimiter.InList(s);
+					}
+					if (isCmdDelim) {
+						cmdState = BASH_CMD_DELIM;
+						continue;
+					}
+				}
+				// handle closing delimiters for test/arithmetic expressions - )),]],]
+				if (cmdState == BASH_CMD_ARITH && sc.Match(')', ')')) {
+					cmdState = BASH_CMD_BODY;
+					sc.Forward();
+				} else if (cmdState == BASH_CMD_TEST && IsASpace(sc.chPrev)) {
+					if (sc.Match(']', ']') && testExprType == 1) {
+						sc.Forward();
+						cmdState = BASH_CMD_BODY;
+					} else if (sc.ch == ']' && testExprType == 2) {
+						cmdState = BASH_CMD_BODY;
+					}
+				}
+			}
+		}// sc.state
+	}
+	sc.Complete();
+	if (sc.state == SCE_SH_HERE_Q) {
+		styler.ChangeLexerState(sc.currentPos, styler.Length());
+	}
+	sc.Complete();
+}
+
+void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) {
+	if(!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	int skipHereCh = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	char word[8] = { '\0' }; // we're not interested in long words anyway
+	unsigned int wordlen = 0;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		// Comment folding
+		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+		{
+			if (!IsCommentLine(lineCurrent - 1, styler)
+				&& IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+					 && !IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent--;
+		}
+		if (style == SCE_SH_WORD) {
+			if ((wordlen + 1) < sizeof(word))
+				word[wordlen++] = ch;
+			if (styleNext != style) {
+				word[wordlen] = '\0';
+				wordlen = 0;
+				if (strcmp(word, "if") == 0 || strcmp(word, "case") == 0 || strcmp(word, "do") == 0) {
+					levelCurrent++;
+				} else if (strcmp(word, "fi") == 0 || strcmp(word, "esac") == 0 || strcmp(word, "done") == 0) {
+					levelCurrent--;
+				}
+			}
+		}
+		if (style == SCE_SH_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		// Here Document folding
+		if (style == SCE_SH_HERE_DELIM) {
+			if (ch == '<' && chNext == '<') {
+				if (styler.SafeGetCharAt(i + 2) == '<') {
+					skipHereCh = 1;
+				} else {
+					if (skipHereCh == 0) {
+						levelCurrent++;
+					} else {
+						skipHereCh = 0;
+					}
+				}
+			}
+		} else if (style == SCE_SH_HERE_Q && styler.StyleAt(i+1) == SCE_SH_DEFAULT) {
+			levelCurrent--;
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmBash(SCLEX_BASH, LexerBash::LexerFactoryBash, "bash", bashWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexBasic.cxx b/scite-app/lexilla/lexers/LexBasic.cxx
new file mode 100644
index 0000000..5057fa7
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBasic.cxx
@@ -0,0 +1,573 @@
+// Scintilla source code edit control
+/** @file LexBasic.cxx
+ ** Lexer for BlitzBasic and PureBasic.
+ ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This tries to be a unified Lexer/Folder for all the BlitzBasic/BlitzMax/PurBasic basics
+// and derivatives. Once they diverge enough, might want to split it into multiple
+// lexers for more code clearity.
+//
+// Mail me (elias <at> users <dot> sf <dot> net) for any bugs.
+
+// Folding only works for simple things like functions or types.
+
+// You may want to have a look at my ctags lexer as well, if you additionally to coloring
+// and folding need to extract things like label tags in your editor.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ * 64 - letter
+ */
+static int character_classification[128] =
+{
+		0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,
+		0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+		1,  2,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  10, 2,
+	 60, 60, 28, 28, 28, 28, 28, 28, 28, 28,  2,  2,  2,  2,  2,  2,
+		2, 84, 84, 84, 84, 84, 84, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2,  2,  2,  2, 68,
+		2, 84, 84, 84, 84, 84, 84, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+	 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2,  2,  2,  2,  0
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsOperator(int c) {
+	return c < 128 && (character_classification[c] & 2);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static bool IsDigit(int c) {
+	return c < 128 && (character_classification[c] & 8);
+}
+
+static bool IsHexDigit(int c) {
+	return c < 128 && (character_classification[c] & 16);
+}
+
+static bool IsBinDigit(int c) {
+	return c < 128 && (character_classification[c] & 32);
+}
+
+static bool IsLetter(int c) {
+	return c < 128 && (character_classification[c] & 64);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int CheckBlitzFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "type")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end type")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckPureFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "procedure") ||
+		!strcmp(token, "enumeration") ||
+		!strcmp(token, "interface") ||
+		!strcmp(token, "structure")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "endprocedure") ||
+		!strcmp(token, "endenumeration") ||
+		!strcmp(token, "endinterface") ||
+		!strcmp(token, "endstructure")) {
+		return -1;
+	}
+	return 0;
+}
+
+static int CheckFreeFoldPoint(char const *token, int &level) {
+	if (!strcmp(token, "function") ||
+		!strcmp(token, "sub") ||
+		!strcmp(token, "enum") ||
+		!strcmp(token, "type") ||
+		!strcmp(token, "union") ||
+		!strcmp(token, "property") ||
+		!strcmp(token, "destructor") ||
+		!strcmp(token, "constructor")) {
+		level |= SC_FOLDLEVELHEADERFLAG;
+		return 1;
+	}
+	if (!strcmp(token, "end function") ||
+		!strcmp(token, "end sub") ||
+		!strcmp(token, "end enum") ||
+		!strcmp(token, "end type") ||
+		!strcmp(token, "end union") ||
+		!strcmp(token, "end property") ||
+		!strcmp(token, "end destructor") ||
+		!strcmp(token, "end constructor")) {
+		return -1;
+	}
+	return 0;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerBasic
+struct OptionsBasic {
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldCompact;
+	OptionsBasic() {
+		fold = false;
+		foldSyntaxBased = true;
+		foldCommentExplicit = false;
+		foldExplicitStart = "";
+		foldExplicitEnd   = "";
+		foldExplicitAnywhere = false;
+		foldCompact = true;
+	}
+};
+
+static const char * const blitzbasicWordListDesc[] = {
+	"BlitzBasic Keywords",
+	"user1",
+	"user2",
+	"user3",
+	0
+};
+
+static const char * const purebasicWordListDesc[] = {
+	"PureBasic Keywords",
+	"PureBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+static const char * const freebasicWordListDesc[] = {
+	"FreeBasic Keywords",
+	"FreeBasic PreProcessor Keywords",
+	"user defined 1",
+	"user defined 2",
+	0
+};
+
+struct OptionSetBasic : public OptionSet<OptionsBasic> {
+	OptionSetBasic(const char * const wordListDescriptions[]) {
+		DefineProperty("fold", &OptionsBasic::fold);
+
+		DefineProperty("fold.basic.syntax.based", &OptionsBasic::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.basic.comment.explicit", &OptionsBasic::foldCommentExplicit,
+			"This option enables folding explicit fold points when using the Basic lexer. "
+			"Explicit fold points allows adding extra folding by placing a ;{ (BB/PB) or '{ (FB) comment at the start "
+			"and a ;} (BB/PB) or '} (FB) at the end of a section that should be folded.");
+
+		DefineProperty("fold.basic.explicit.start", &OptionsBasic::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard ;{ (BB/PB) or '{ (FB).");
+
+		DefineProperty("fold.basic.explicit.end", &OptionsBasic::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard ;} (BB/PB) or '} (FB).");
+
+		DefineProperty("fold.basic.explicit.anywhere", &OptionsBasic::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("fold.compact", &OptionsBasic::foldCompact);
+
+		DefineWordListSets(wordListDescriptions);
+	}
+};
+
+class LexerBasic : public DefaultLexer {
+	char comment_char;
+	int (*CheckFoldPoint)(char const *, int &);
+	WordList keywordlists[4];
+	OptionsBasic options;
+	OptionSetBasic osBasic;
+public:
+	LexerBasic(const char *languageName_, int language_, char comment_char_,
+		int (*CheckFoldPoint_)(char const *, int &), const char * const wordListDescriptions[]) :
+						 DefaultLexer(languageName_, language_),
+						 comment_char(comment_char_),
+						 CheckFoldPoint(CheckFoldPoint_),
+						 osBasic(wordListDescriptions) {
+	}
+	virtual ~LexerBasic() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osBasic.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osBasic.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osBasic.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osBasic.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osBasic.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+	static ILexer5 *LexerFactoryBlitzBasic() {
+		return new LexerBasic("blitzbasic", SCLEX_BLITZBASIC, ';', CheckBlitzFoldPoint, blitzbasicWordListDesc);
+	}
+	static ILexer5 *LexerFactoryPureBasic() {
+		return new LexerBasic("purebasic", SCLEX_PUREBASIC, ';', CheckPureFoldPoint, purebasicWordListDesc);
+	}
+	static ILexer5 *LexerFactoryFreeBasic() {
+		return new LexerBasic("freebasic", SCLEX_FREEBASIC, '\'', CheckFreeFoldPoint, freebasicWordListDesc );
+	}
+};
+
+Sci_Position SCI_METHOD LexerBasic::PropertySet(const char *key, const char *val) {
+	if (osBasic.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerBasic::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywordlists[0];
+		break;
+	case 1:
+		wordListN = &keywordlists[1];
+		break;
+	case 2:
+		wordListN = &keywordlists[2];
+		break;
+	case 3:
+		wordListN = &keywordlists[3];
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerBasic::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	bool wasfirst = true, isfirst = true; // true if first token in a line
+	styler.StartAt(startPos);
+	int styleBeforeKeyword = SCE_B_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// Can't use sc.More() here else we miss the last character
+	for (; ; sc.Forward()) {
+		if (sc.state == SCE_B_IDENTIFIER) {
+			if (!IsIdentifier(sc.ch)) {
+				// Labels
+				if (wasfirst && sc.Match(':')) {
+					sc.ChangeState(SCE_B_LABEL);
+					sc.ForwardSetState(SCE_B_DEFAULT);
+				} else {
+					char s[100];
+					int kstates[4] = {
+						SCE_B_KEYWORD,
+						SCE_B_KEYWORD2,
+						SCE_B_KEYWORD3,
+						SCE_B_KEYWORD4,
+					};
+					sc.GetCurrentLowered(s, sizeof(s));
+					for (int i = 0; i < 4; i++) {
+						if (keywordlists[i].InList(s)) {
+							sc.ChangeState(kstates[i]);
+						}
+					}
+					// Types, must set them as operator else they will be
+					// matched as number/constant
+					if (sc.Match('.') || sc.Match('$') || sc.Match('%') ||
+						sc.Match('#')) {
+						sc.SetState(SCE_B_OPERATOR);
+					} else {
+						sc.SetState(SCE_B_DEFAULT);
+					}
+				}
+			}
+		} else if (sc.state == SCE_B_OPERATOR) {
+			if (!IsOperator(sc.ch) || sc.Match('#'))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_LABEL) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_CONSTANT) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_NUMBER) {
+			if (!IsDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_HEXNUMBER) {
+			if (!IsHexDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_BINNUMBER) {
+			if (!IsBinDigit(sc.ch))
+				sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_STRING) {
+			if (sc.ch == '"') {
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_B_ERROR);
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_COMMENT || sc.state == SCE_B_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_DOCLINE) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '\\' || sc.ch == '@') {
+				if (IsLetter(sc.chNext) && sc.chPrev != '\\') {
+					styleBeforeKeyword = sc.state;
+					sc.SetState(SCE_B_DOCKEYWORD);
+				};
+			}
+		} else if (sc.state == SCE_B_DOCKEYWORD) {
+			if (IsSpace(sc.ch)) {
+				sc.SetState(styleBeforeKeyword);
+			}	else if (sc.atLineEnd && styleBeforeKeyword == SCE_B_DOCLINE) {
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_COMMENTBLOCK) {
+			if (sc.Match("\'/")) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_DOCBLOCK) {
+			if (sc.Match("\'/")) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '\\' || sc.ch == '@') {
+				if (IsLetter(sc.chNext) && sc.chPrev != '\\') {
+					styleBeforeKeyword = sc.state;
+					sc.SetState(SCE_B_DOCKEYWORD);
+				};
+			}
+		}
+
+		if (sc.atLineStart)
+			isfirst = true;
+
+		if (sc.state == SCE_B_DEFAULT || sc.state == SCE_B_ERROR) {
+			if (isfirst && sc.Match('.') && comment_char != '\'') {
+					sc.SetState(SCE_B_LABEL);
+			} else if (isfirst && sc.Match('#')) {
+				wasfirst = isfirst;
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (sc.Match(comment_char)) {
+				// Hack to make deprecated QBASIC '$Include show
+				// up in freebasic with SCE_B_PREPROCESSOR.
+				if (comment_char == '\'' && sc.Match(comment_char, '$'))
+					sc.SetState(SCE_B_PREPROCESSOR);
+				else if (sc.Match("\'*") || sc.Match("\'!")) {
+					sc.SetState(SCE_B_DOCLINE);
+				} else {
+					sc.SetState(SCE_B_COMMENT);
+				}
+			} else if (sc.Match("/\'")) {
+				if (sc.Match("/\'*") || sc.Match("/\'!")) {	// Support of gtk-doc/Doxygen doc. style
+					sc.SetState(SCE_B_DOCBLOCK);
+				} else {
+					sc.SetState(SCE_B_COMMENTBLOCK);
+				}
+				sc.Forward();	// Eat the ' so it isn't used for the end of the comment
+			} else if (sc.Match('"')) {
+				sc.SetState(SCE_B_STRING);
+			} else if (IsDigit(sc.ch)) {
+				sc.SetState(SCE_B_NUMBER);
+			} else if (sc.Match('$') || sc.Match("&h") || sc.Match("&H") || sc.Match("&o") || sc.Match("&O")) {
+				sc.SetState(SCE_B_HEXNUMBER);
+			} else if (sc.Match('%') || sc.Match("&b") || sc.Match("&B")) {
+				sc.SetState(SCE_B_BINNUMBER);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_B_CONSTANT);
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_B_OPERATOR);
+			} else if (IsIdentifier(sc.ch)) {
+				wasfirst = isfirst;
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (!IsSpace(sc.ch)) {
+				sc.SetState(SCE_B_ERROR);
+			}
+		}
+
+		if (!IsSpace(sc.ch))
+			isfirst = false;
+
+		if (!sc.More())
+			break;
+	}
+	sc.Complete();
+}
+
+
+void SCI_METHOD LexerBasic::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_Position line = styler.GetLine(startPos);
+	int level = styler.LevelAt(line);
+	int go = 0, done = 0;
+	Sci_Position endPos = startPos + length;
+	char word[256];
+	int wordlen = 0;
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	int cNext = styler[startPos];
+
+	// Scan for tokens at the start of the line (they may include
+	// whitespace, for tokens like "End Function"
+	for (Sci_Position i = startPos; i < endPos; i++) {
+		int c = cNext;
+		cNext = styler.SafeGetCharAt(i + 1);
+		bool atEOL = (c == '\r' && cNext != '\n') || (c == '\n');
+		if (options.foldSyntaxBased && !done && !go) {
+			if (wordlen) { // are we scanning a token already?
+				word[wordlen] = static_cast<char>(LowerCase(c));
+				if (!IsIdentifier(c)) { // done with token
+					word[wordlen] = '\0';
+					go = CheckFoldPoint(word, level);
+					if (!go) {
+						// Treat any whitespace as single blank, for
+						// things like "End   Function".
+						if (IsSpace(c) && IsIdentifier(word[wordlen - 1])) {
+							word[wordlen] = ' ';
+							if (wordlen < 255)
+								wordlen++;
+						}
+						else // done with this line
+							done = 1;
+					}
+				} else if (wordlen < 255) {
+					wordlen++;
+				}
+			} else { // start scanning at first non-whitespace character
+				if (!IsSpace(c)) {
+					if (IsIdentifier(c)) {
+						word[0] = static_cast<char>(LowerCase(c));
+						wordlen = 1;
+					} else // done with this line
+						done = 1;
+				}
+			}
+		}
+		if (options.foldCommentExplicit && ((styler.StyleAt(i) == SCE_B_COMMENT) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+ 					level |= SC_FOLDLEVELHEADERFLAG;
+					go = 1;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+ 					go = -1;
+ 				}
+			} else {
+				if (c == comment_char) {
+					if (cNext == '{') {
+						level |= SC_FOLDLEVELHEADERFLAG;
+						go = 1;
+					} else if (cNext == '}') {
+						go = -1;
+					}
+				}
+ 			}
+ 		}
+		if (atEOL) { // line end
+			if (!done && wordlen == 0 && options.foldCompact) // line was only space
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if (level != styler.LevelAt(line))
+				styler.SetLevel(line, level);
+			level += go;
+			line++;
+			// reset state
+			wordlen = 0;
+			level &= ~SC_FOLDLEVELHEADERFLAG;
+			level &= ~SC_FOLDLEVELWHITEFLAG;
+			go = 0;
+			done = 0;
+		}
+	}
+}
+
+LexerModule lmBlitzBasic(SCLEX_BLITZBASIC, LexerBasic::LexerFactoryBlitzBasic, "blitzbasic", blitzbasicWordListDesc);
+
+LexerModule lmPureBasic(SCLEX_PUREBASIC, LexerBasic::LexerFactoryPureBasic, "purebasic", purebasicWordListDesc);
+
+LexerModule lmFreeBasic(SCLEX_FREEBASIC, LexerBasic::LexerFactoryFreeBasic, "freebasic", freebasicWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexBatch.cxx b/scite-app/lexilla/lexers/LexBatch.cxx
new file mode 100644
index 0000000..0973d05
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBatch.cxx
@@ -0,0 +1,627 @@
+// Scintilla source code edit control
+/** @file LexBatch.cxx
+ ** Lexer for batch files.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static bool Is0To9(char ch) {
+	return (ch >= '0') && (ch <= '9');
+}
+
+static bool IsAlphabetic(int ch) {
+	return IsASCII(ch) && isalpha(ch);
+}
+
+static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') ||
+	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+// Tests for BATCH Operators
+static bool IsBOperator(char ch) {
+	return (ch == '=') || (ch == '+') || (ch == '>') || (ch == '<') ||
+		(ch == '|') || (ch == '?') || (ch == '*')||
+		(ch == '&') || (ch == '(') || (ch == ')');
+}
+
+// Tests for BATCH Separators
+static bool IsBSeparator(char ch) {
+	return (ch == '\\') || (ch == '.') || (ch == ';') ||
+		(ch == '\"') || (ch == '\'') || (ch == '/');
+}
+
+// Tests for escape character
+static bool IsEscaped(char* wordStr, Sci_PositionU pos) {
+	bool isQoted=false;
+	while (pos>0){
+		pos--;
+		if (wordStr[pos]=='^')
+			isQoted=!isQoted;
+		else
+			break;
+	}
+	return isQoted;
+}
+
+// Tests for quote character
+static bool textQuoted(char *lineBuffer, Sci_PositionU endPos) {
+	char strBuffer[1024];
+	strncpy(strBuffer, lineBuffer, endPos);
+	strBuffer[endPos] = '\0';
+	char *pQuote;
+	pQuote = strchr(strBuffer, '"');
+	bool CurrentStatus = false;
+	while (pQuote != NULL)
+	{
+		if (!IsEscaped(strBuffer, pQuote - strBuffer)) {
+			CurrentStatus = !CurrentStatus;
+		}
+		pQuote = strchr(pQuote + 1, '"');
+	}
+	return CurrentStatus;
+}
+
+static void ColouriseBatchDoc(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int /*initStyle*/,
+    WordList *keywordlists[],
+    Accessor &styler) {
+	// Always backtracks to the start of a line that is not a continuation
+	// of the previous line
+	if (startPos > 0) {
+		Sci_Position ln = styler.GetLine(startPos); // Current line number
+		while (startPos > 0) {
+			ln--;
+			if ((styler.SafeGetCharAt(startPos-3) == '^' && styler.SafeGetCharAt(startPos-2) == '\r' && styler.SafeGetCharAt(startPos-1) == '\n')
+			|| styler.SafeGetCharAt(startPos-2) == '^') {	// handle '^' line continuation
+				// When the line continuation is found,
+				// set the Start Position to the Start of the previous line
+				length+=startPos-styler.LineStart(ln);
+				startPos=styler.LineStart(ln);
+			}
+			else
+				break;
+		}
+	}
+
+	char lineBuffer[1024];
+
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	Sci_PositionU linePos = 0;
+	Sci_PositionU startLine = startPos;
+	bool continueProcessing = true;	// Used to toggle Regular Keyword Checking
+	bool isNotAssigned=false; // Used to flag Assignment in Set operation
+
+	for (Sci_PositionU i = startPos; i < startPos + length; i++) {
+		lineBuffer[linePos++] = styler[i];
+		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1) || (i==startPos + length-1)) {
+			// End of line (or of line buffer) (or End of Last Line) met, colourise it
+			lineBuffer[linePos] = '\0';
+			Sci_PositionU lengthLine=linePos;
+			Sci_PositionU endPos=i;
+			Sci_PositionU offset = 0;	// Line Buffer Offset
+			Sci_PositionU cmdLoc;		// External Command / Program Location
+			char wordBuffer[81];		// Word Buffer - large to catch long paths
+			Sci_PositionU wbl;		// Word Buffer Length
+			Sci_PositionU wbo;		// Word Buffer Offset - also Special Keyword Buffer Length
+			WordList &keywords = *keywordlists[0];      // Internal Commands
+			WordList &keywords2 = *keywordlists[1];     // External Commands (optional)
+
+			// CHOICE, ECHO, GOTO, PROMPT and SET have Default Text that may contain Regular Keywords
+			//   Toggling Regular Keyword Checking off improves readability
+			// Other Regular Keywords and External Commands / Programs might also benefit from toggling
+			//   Need a more robust algorithm to properly toggle Regular Keyword Checking
+			bool stopLineProcessing=false;  // Used to stop line processing if Comment or Drive Change found
+			// Special Keywords are those that allow certain characters without whitespace after the command
+			// Examples are: cd. cd\ md. rd. dir| dir> echo: echo. path=
+			// Special Keyword Buffer used to determine if the first n characters is a Keyword
+			char sKeywordBuffer[10];	// Special Keyword Buffer
+			bool sKeywordFound;		// Exit Special Keyword for-loop if found
+
+			// Skip initial spaces
+			while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+				offset++;
+			}
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+			// Set External Command / Program Location
+			cmdLoc = offset;
+
+			// Check for Fake Label (Comment) or Real Label - return if found
+			if (lineBuffer[offset] == ':') {
+				if (lineBuffer[offset + 1] == ':') {
+					// Colorize Fake Label (Comment) - :: is similar to REM, see http://content.techweb.com/winmag/columns/explorer/2000/21.htm
+					styler.ColourTo(endPos, SCE_BAT_COMMENT);
+				} else {
+					// Colorize Real Label
+					styler.ColourTo(endPos, SCE_BAT_LABEL);
+				}
+				stopLineProcessing=true;
+			// Check for Drive Change (Drive Change is internal command) - return if found
+			} else if ((IsAlphabetic(lineBuffer[offset])) &&
+				(lineBuffer[offset + 1] == ':') &&
+				((isspacechar(lineBuffer[offset + 2])) ||
+				(((lineBuffer[offset + 2] == '\\')) &&
+				(isspacechar(lineBuffer[offset + 3]))))) {
+				// Colorize Regular Keyword
+				styler.ColourTo(endPos, SCE_BAT_WORD);
+				stopLineProcessing=true;
+			}
+
+			// Check for Hide Command (@ECHO OFF/ON)
+			if (lineBuffer[offset] == '@') {
+				styler.ColourTo(startLine + offset, SCE_BAT_HIDE);
+				offset++;
+			}
+			// Skip next spaces
+			while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+				offset++;
+			}
+
+			// Read remainder of line word-at-a-time or remainder-of-word-at-a-time
+			while (offset < lengthLine  && !stopLineProcessing) {
+				if (offset > startLine) {
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+				}
+				// Copy word from Line Buffer into Word Buffer
+				wbl = 0;
+				for (; offset < lengthLine && wbl < 80 &&
+						!isspacechar(lineBuffer[offset]); wbl++, offset++) {
+					wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset]));
+				}
+				wordBuffer[wbl] = '\0';
+				wbo = 0;
+
+				// Check for Comment - return if found
+				if ((CompareCaseInsensitive(wordBuffer, "rem") == 0) && continueProcessing) {
+					styler.ColourTo(endPos, SCE_BAT_COMMENT);
+					break;
+				}
+				// Check for Separator
+				if (IsBSeparator(wordBuffer[0])) {
+					// Check for External Command / Program
+					if ((cmdLoc == offset - wbl) &&
+						((wordBuffer[0] == ':') ||
+						(wordBuffer[0] == '\\') ||
+						(wordBuffer[0] == '.'))) {
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 1);
+						// Colorize External Command / Program
+						if (!keywords2) {
+							styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+						} else if (keywords2.InList(wordBuffer)) {
+							styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+						} else {
+							styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+						}
+						// Reset External Command / Program Location
+						cmdLoc = offset;
+					} else {
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 1);
+						// Colorize Default Text
+						styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+					}
+				// Check for Regular Keyword in list
+				} else if ((keywords.InList(wordBuffer)) &&
+					(continueProcessing)) {
+					// ECHO, GOTO, PROMPT and SET require no further Regular Keyword Checking
+					if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "goto") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "prompt") == 0)) {
+						continueProcessing = false;
+					}
+					// SET requires additional processing for the assignment operator
+					if (CompareCaseInsensitive(wordBuffer, "set") == 0) {
+						continueProcessing = false;
+						isNotAssigned=true;
+					}
+					// Identify External Command / Program Location for ERRORLEVEL, and EXIST
+					if ((CompareCaseInsensitive(wordBuffer, "errorlevel") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "exist") == 0)) {
+						// Reset External Command / Program Location
+						cmdLoc = offset;
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+						// Skip comparison
+						while ((cmdLoc < lengthLine) &&
+							(!isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+					// Identify External Command / Program Location for CALL, DO, LOADHIGH and LH
+					} else if ((CompareCaseInsensitive(wordBuffer, "call") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "do") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "loadhigh") == 0) ||
+						(CompareCaseInsensitive(wordBuffer, "lh") == 0)) {
+						// Reset External Command / Program Location
+						cmdLoc = offset;
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+					}
+					// Colorize Regular keyword
+					styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD);
+					// No need to Reset Offset
+				// Check for Special Keyword in list, External Command / Program, or Default Text
+				} else if ((wordBuffer[0] != '%') &&
+						   (wordBuffer[0] != '!') &&
+					(!IsBOperator(wordBuffer[0])) &&
+					(continueProcessing)) {
+					// Check for Special Keyword
+					//     Affected Commands are in Length range 2-6
+					//     Good that ERRORLEVEL, EXIST, CALL, DO, LOADHIGH, and LH are unaffected
+					sKeywordFound = false;
+					for (Sci_PositionU keywordLength = 2; keywordLength < wbl && keywordLength < 7 && !sKeywordFound; keywordLength++) {
+						wbo = 0;
+						// Copy Keyword Length from Word Buffer into Special Keyword Buffer
+						for (; wbo < keywordLength; wbo++) {
+							sKeywordBuffer[wbo] = static_cast<char>(wordBuffer[wbo]);
+						}
+						sKeywordBuffer[wbo] = '\0';
+						// Check for Special Keyword in list
+						if ((keywords.InList(sKeywordBuffer)) &&
+							((IsBOperator(wordBuffer[wbo])) ||
+							(IsBSeparator(wordBuffer[wbo])))) {
+							sKeywordFound = true;
+							// ECHO requires no further Regular Keyword Checking
+							if (CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) {
+								continueProcessing = false;
+							}
+							// Colorize Special Keyword as Regular Keyword
+							styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_WORD);
+							// Reset Offset to re-process remainder of word
+							offset -= (wbl - wbo);
+						}
+					}
+					// Check for External Command / Program or Default Text
+					if (!sKeywordFound) {
+						wbo = 0;
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							// Read up to %, Operator or Separator
+							while ((wbo < wbl) &&
+								(((wordBuffer[wbo] != '%') &&
+								(wordBuffer[wbo] != '!') &&
+								(!IsBOperator(wordBuffer[wbo])) &&
+								(!IsBSeparator(wordBuffer[wbo]))))) {
+								wbo++;
+							}
+							// Reset External Command / Program Location
+							cmdLoc = offset - (wbl - wbo);
+							// Reset Offset to re-process remainder of word
+							offset -= (wbl - wbo);
+							// CHOICE requires no further Regular Keyword Checking
+							if (CompareCaseInsensitive(wordBuffer, "choice") == 0) {
+								continueProcessing = false;
+							}
+							// Check for START (and its switches) - What follows is External Command \ Program
+							if (CompareCaseInsensitive(wordBuffer, "start") == 0) {
+								// Reset External Command / Program Location
+								cmdLoc = offset;
+								// Skip next spaces
+								while ((cmdLoc < lengthLine) &&
+									(isspacechar(lineBuffer[cmdLoc]))) {
+									cmdLoc++;
+								}
+								// Reset External Command / Program Location if command switch detected
+								if (lineBuffer[cmdLoc] == '/') {
+									// Skip command switch
+									while ((cmdLoc < lengthLine) &&
+										(!isspacechar(lineBuffer[cmdLoc]))) {
+										cmdLoc++;
+									}
+									// Skip next spaces
+									while ((cmdLoc < lengthLine) &&
+										(isspacechar(lineBuffer[cmdLoc]))) {
+										cmdLoc++;
+									}
+								}
+							}
+							// Colorize External Command / Program
+							if (!keywords2) {
+								styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+							} else if (keywords2.InList(wordBuffer)) {
+								styler.ColourTo(startLine + offset - 1, SCE_BAT_COMMAND);
+							} else {
+								styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+							}
+							// No need to Reset Offset
+						// Check for Default Text
+						} else {
+							// Read up to %, Operator or Separator
+							while ((wbo < wbl) &&
+								(((wordBuffer[wbo] != '%') &&
+								(wordBuffer[wbo] != '!') &&
+								(!IsBOperator(wordBuffer[wbo])) &&
+								(!IsBSeparator(wordBuffer[wbo]))))) {
+								wbo++;
+							}
+							// Colorize Default Text
+							styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+							// Reset Offset to re-process remainder of word
+							offset -= (wbl - wbo);
+						}
+					}
+				// Check for Argument  (%n), Environment Variable (%x...%) or Local Variable (%%a)
+				} else if (wordBuffer[0] == '%') {
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
+					wbo++;
+					// Search to end of word for second % (can be a long path)
+					while ((wbo < wbl) &&
+						(wordBuffer[wbo] != '%')) {
+						wbo++;
+					}
+					// Check for Argument (%n) or (%*)
+					if (((Is0To9(wordBuffer[1])) || (wordBuffer[1] == '*')) &&
+						(wordBuffer[wbo] != '%')) {
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							cmdLoc = offset - (wbl - 2);
+						}
+						// Colorize Argument
+						styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_IDENTIFIER);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 2);
+					// Check for Expanded Argument (%~...) / Variable (%%~...)
+					// Expanded Argument: %~[<path-operators>]<single digit>
+					// Expanded Variable: %%~[<path-operators>]<single identifier character>
+					// Path operators are exclusively alphabetic.
+					// Expanded arguments have a single digit at the end.
+					// Expanded variables have a single identifier character as variable name.
+					} else if (((wbl > 1) && (wordBuffer[1] == '~')) ||
+						((wbl > 2) && (wordBuffer[1] == '%') && (wordBuffer[2] == '~'))) {
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							cmdLoc = offset - (wbl - wbo);
+						}
+						bool isArgument = (wordBuffer[1] == '~');
+						if (isArgument) {
+							Sci_PositionU expansionStopOffset = 2;
+							bool isValid = false;
+							for (; expansionStopOffset < wbl; expansionStopOffset++) {
+								if (isArgument && Is0To9(wordBuffer[expansionStopOffset])) {
+									expansionStopOffset++;
+									isValid = true;
+									wbo = expansionStopOffset;
+									// Colorize Expanded Argument
+									styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+									break;
+								}
+							}
+							if (!isValid) {
+								// not a valid expanded argument or variable
+								styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+							}
+						// Expanded Variable
+						} else {
+							// start after ~
+							wbo = 3;
+							// Search to end of word for another % (can be a long path)
+							while ((wbo < wbl) &&
+								(wordBuffer[wbo] != '%') &&
+								(!IsBOperator(wordBuffer[wbo])) &&
+								(!IsBSeparator(wordBuffer[wbo]))) {
+								wbo++;
+							}
+							if (wbo > 3) {
+								// Colorize Expanded Variable
+								styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+							} else {
+								// not a valid expanded argument or variable
+								styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+							}
+						}
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - wbo);
+					// Check for Environment Variable (%x...%)
+					} else if ((wordBuffer[1] != '%') &&
+						(wordBuffer[wbo] == '%')) {
+						wbo++;
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							cmdLoc = offset - (wbl - wbo);
+						}
+						// Colorize Environment Variable
+						styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - wbo);
+					// Check for Local Variable (%%a)
+					} else if (
+						(wbl > 2) &&
+						(wordBuffer[1] == '%') &&
+						(wordBuffer[2] != '%') &&
+						(!IsBOperator(wordBuffer[2])) &&
+						(!IsBSeparator(wordBuffer[2]))) {
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							cmdLoc = offset - (wbl - 3);
+						}
+						// Colorize Local Variable
+						styler.ColourTo(startLine + offset - 1 - (wbl - 3), SCE_BAT_IDENTIFIER);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 3);
+					// escaped %
+					} else if (
+						(wbl > 1) &&
+						(wordBuffer[1] == '%')) {
+
+						// Reset Offset to re-process remainder of word
+						styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_DEFAULT);
+						offset -= (wbl - 2);
+					}
+				// Check for Environment Variable (!x...!)
+				} else if (wordBuffer[0] == '!') {
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
+					wbo++;
+					// Search to end of word for second ! (can be a long path)
+					while ((wbo < wbl) &&
+						(wordBuffer[wbo] != '!')) {
+						wbo++;
+					}
+					if (wordBuffer[wbo] == '!') {
+						wbo++;
+						// Check for External Command / Program
+						if (cmdLoc == offset - wbl) {
+							cmdLoc = offset - (wbl - wbo);
+						}
+						// Colorize Environment Variable
+						styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_IDENTIFIER);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - wbo);
+					}
+				// Check for Operator
+				} else if (IsBOperator(wordBuffer[0])) {
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1 - wbl, SCE_BAT_DEFAULT);
+					// Check for Comparison Operator
+					if ((wordBuffer[0] == '=') && (wordBuffer[1] == '=')) {
+						// Identify External Command / Program Location for IF
+						cmdLoc = offset;
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+						// Colorize Comparison Operator
+						if (continueProcessing)
+							styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_OPERATOR);
+						else
+							styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_BAT_DEFAULT);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 2);
+					// Check for Pipe Operator
+					} else if ((wordBuffer[0] == '|') &&
+								!(IsEscaped(lineBuffer,offset - wbl + wbo) || textQuoted(lineBuffer, offset - wbl) )) {
+						// Reset External Command / Program Location
+						cmdLoc = offset - wbl + 1;
+						// Skip next spaces
+						while ((cmdLoc < lengthLine) &&
+							(isspacechar(lineBuffer[cmdLoc]))) {
+							cmdLoc++;
+						}
+						// Colorize Pipe Operator
+						styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 1);
+						continueProcessing = true;
+					// Check for Other Operator
+					} else {
+						// Check for Operators: >, |, &
+						if (((wordBuffer[0] == '>')||
+						   (wordBuffer[0] == ')')||
+						   (wordBuffer[0] == '(')||
+						   (wordBuffer[0] == '&' )) &&
+						   !(!continueProcessing && (IsEscaped(lineBuffer,offset - wbl + wbo)
+						   || textQuoted(lineBuffer, offset - wbl) ))){
+							// Turn Keyword and External Command / Program checking back on
+							continueProcessing = true;
+							isNotAssigned=false;
+						}
+						// Colorize Other Operators
+						// Do not Colorize Paranthesis, quoted text and escaped operators
+						if (((wordBuffer[0] != ')') && (wordBuffer[0] != '(')
+						&& !textQuoted(lineBuffer, offset - wbl)  && !IsEscaped(lineBuffer,offset - wbl + wbo))
+						&& !((wordBuffer[0] == '=') && !isNotAssigned ))
+							styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_OPERATOR);
+						else
+							styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_BAT_DEFAULT);
+						// Reset Offset to re-process remainder of word
+						offset -= (wbl - 1);
+
+						if ((wordBuffer[0] == '=') && isNotAssigned ){
+							isNotAssigned=false;
+						}
+					}
+				// Check for Default Text
+				} else {
+					// Read up to %, Operator or Separator
+					while ((wbo < wbl) &&
+						((wordBuffer[wbo] != '%') &&
+						(wordBuffer[wbo] != '!') &&
+						(!IsBOperator(wordBuffer[wbo])) &&
+						(!IsBSeparator(wordBuffer[wbo])))) {
+						wbo++;
+					}
+					// Colorize Default Text
+					styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_BAT_DEFAULT);
+					// Reset Offset to re-process remainder of word
+					offset -= (wbl - wbo);
+				}
+				// Skip next spaces - nothing happens if Offset was Reset
+				while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+					offset++;
+				}
+			}
+			// Colorize Default Text for remainder of line - currently not lexed
+			styler.ColourTo(endPos, SCE_BAT_DEFAULT);
+
+			// handle line continuation for SET and ECHO commands except the last line
+			if (!continueProcessing && (i<startPos + length-1)) {
+				if (linePos==1 || (linePos==2 && lineBuffer[1]=='\r')) // empty line on Unix and Mac or on Windows
+					continueProcessing=true;
+				else {
+					Sci_PositionU lineContinuationPos;
+					if ((linePos>2) && lineBuffer[linePos-2]=='\r') // Windows EOL
+						lineContinuationPos=linePos-3;
+					else
+						lineContinuationPos=linePos-2; // Unix or Mac EOL
+					// Reset continueProcessing	if line continuation was not found
+					if ((lineBuffer[lineContinuationPos]!='^')
+							|| IsEscaped(lineBuffer, lineContinuationPos)
+							|| textQuoted(lineBuffer, lineContinuationPos))
+						continueProcessing=true;
+				}
+			}
+
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+}
+
+static const char *const batchWordListDesc[] = {
+	"Internal Commands",
+	"External Commands",
+	0
+};
+
+LexerModule lmBatch(SCLEX_BATCH, ColouriseBatchDoc, "batch", 0, batchWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexBibTeX.cxx b/scite-app/lexilla/lexers/LexBibTeX.cxx
new file mode 100644
index 0000000..7c14684
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBibTeX.cxx
@@ -0,0 +1,309 @@
+// Copyright 2008-2010 Sergiu Dotenco. The License.txt file describes the
+// conditions under which this software may be distributed.
+
+/**
+ * @file LexBibTeX.cxx
+ * @brief General BibTeX coloring scheme.
+ * @author Sergiu Dotenco
+ * @date April 18, 2009
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <cassert>
+#include <cctype>
+
+#include <string>
+#include <string_view>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+namespace {
+	bool IsAlphabetic(unsigned int ch)
+	{
+		return IsASCII(ch) && std::isalpha(ch) != 0;
+	}
+	bool IsAlphaNumeric(char ch)
+	{
+	    return IsASCII(ch) && std::isalnum(ch);
+	}
+
+	bool EqualCaseInsensitive(const char* a, const char* b)
+	{
+		return CompareCaseInsensitive(a, b) == 0;
+	}
+
+	bool EntryWithoutKey(const char* name)
+	{
+		return EqualCaseInsensitive(name,"string");
+	}
+
+	char GetClosingBrace(char openbrace)
+	{
+		char result = openbrace;
+
+		switch (openbrace) {
+			case '(': result = ')'; break;
+			case '{': result = '}'; break;
+		}
+
+		return result;
+	}
+
+	bool IsEntryStart(char prev, char ch)
+	{
+		return prev != '\\' && ch == '@';
+	}
+
+	bool IsEntryStart(const StyleContext& sc)
+	{
+		return IsEntryStart(sc.chPrev, sc.ch);
+	}
+
+	void ColorizeBibTeX(Sci_PositionU start_pos, Sci_Position length, int /*init_style*/, WordList* keywordlists[], Accessor& styler)
+	{
+	    WordList &EntryNames = *keywordlists[0];
+		bool fold_compact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+		std::string buffer;
+		buffer.reserve(25);
+
+		// We always colorize a section from the beginning, so let's
+		// search for the @ character which isn't escaped, i.e. \@
+		while (start_pos > 0 && !IsEntryStart(styler.SafeGetCharAt(start_pos - 1),
+			styler.SafeGetCharAt(start_pos))) {
+			--start_pos; ++length;
+		}
+
+		styler.StartAt(start_pos);
+		styler.StartSegment(start_pos);
+
+		Sci_Position current_line = styler.GetLine(start_pos);
+		int prev_level = styler.LevelAt(current_line) & SC_FOLDLEVELNUMBERMASK;
+		int current_level = prev_level;
+		int visible_chars = 0;
+
+		bool in_comment = false ;
+		StyleContext sc(start_pos, length, SCE_BIBTEX_DEFAULT, styler);
+
+		bool going = sc.More(); // needed because of a fuzzy end of file state
+		char closing_brace = 0;
+		bool collect_entry_name = false;
+
+		for (; going; sc.Forward()) {
+			if (!sc.More())
+				going = false; // we need to go one behind the end of text
+
+			if (in_comment) {
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_BIBTEX_DEFAULT);
+					in_comment = false;
+				}
+			}
+			else {
+				// Found @entry
+				if (IsEntryStart(sc)) {
+					sc.SetState(SCE_BIBTEX_UNKNOWN_ENTRY);
+					sc.Forward();
+					++current_level;
+
+					buffer.clear();
+					collect_entry_name = true;
+				}
+				else if ((sc.state == SCE_BIBTEX_ENTRY || sc.state == SCE_BIBTEX_UNKNOWN_ENTRY)
+					&& (sc.ch == '{' || sc.ch == '(')) {
+					// Entry name colorization done
+					// Found either a { or a ( after entry's name, e.g. @entry(...) @entry{...}
+					// Closing counterpart needs to be stored.
+					closing_brace = GetClosingBrace(sc.ch);
+
+					sc.SetState(SCE_BIBTEX_DEFAULT); // Don't colorize { (
+
+					// @string doesn't have any key
+					if (EntryWithoutKey(buffer.c_str()))
+						sc.ForwardSetState(SCE_BIBTEX_PARAMETER);
+					else
+						sc.ForwardSetState(SCE_BIBTEX_KEY); // Key/label colorization
+				}
+
+				// Need to handle the case where entry's key is empty
+				// e.g. @book{,...}
+				if (sc.state == SCE_BIBTEX_KEY && sc.ch == ',') {
+					// Key/label colorization done
+					sc.SetState(SCE_BIBTEX_DEFAULT); // Don't colorize the ,
+					sc.ForwardSetState(SCE_BIBTEX_PARAMETER); // Parameter colorization
+				}
+				else if (sc.state == SCE_BIBTEX_PARAMETER && sc.ch == '=') {
+					sc.SetState(SCE_BIBTEX_DEFAULT); // Don't colorize the =
+					sc.ForwardSetState(SCE_BIBTEX_VALUE); // Parameter value colorization
+
+					Sci_Position start = sc.currentPos;
+
+					// We need to handle multiple situations:
+					// 1. name"one two {three}"
+					// 2. name={one {one two {two}} three}
+					// 3. year=2005
+
+					// Skip ", { until we encounter the first alphanumerical character
+					while (sc.More() && !(IsAlphaNumeric(sc.ch) || sc.ch == '"' || sc.ch == '{'))
+						sc.Forward();
+
+					if (sc.More()) {
+						// Store " or {
+						char ch = sc.ch;
+
+						// Not interested in alphanumerical characters
+						if (IsAlphaNumeric(ch))
+							ch = 0;
+
+						int skipped = 0;
+
+						if (ch) {
+							// Skip preceding " or { such as in name={{test}}.
+							// Remember how many characters have been skipped
+							// Make sure that empty values, i.e. "" are also handled correctly
+							while (sc.More() && (sc.ch == ch && (ch != '"' || skipped < 1))) {
+								sc.Forward();
+								++skipped;
+							}
+						}
+
+						// Closing counterpart for " is the same character
+						if (ch == '{')
+							ch = '}';
+
+						// We have reached the parameter value
+						// In case the open character was a alnum char, skip until , is found
+						// otherwise until skipped == 0
+						while (sc.More() && (skipped > 0 || (!ch && !(sc.ch == ',' || sc.ch == closing_brace)))) {
+							// Make sure the character isn't escaped
+							if (sc.chPrev != '\\') {
+								// Parameter value contains a { which is the 2nd case described above
+								if (sc.ch == '{')
+									++skipped; // Remember it
+								else if (sc.ch == '}')
+									--skipped;
+								else if (skipped == 1 && sc.ch == ch && ch == '"') // Don't ignore cases like {"o}
+									skipped = 0;
+							}
+
+							sc.Forward();
+						}
+					}
+
+					// Don't colorize the ,
+					sc.SetState(SCE_BIBTEX_DEFAULT);
+
+					// Skip until the , or entry's closing closing_brace is found
+					// since this parameter might be the last one
+					while (sc.More() && !(sc.ch == ',' || sc.ch == closing_brace))
+						sc.Forward();
+
+					int state = SCE_BIBTEX_PARAMETER; // The might be more parameters
+
+					// We've reached the closing closing_brace for the bib entry
+					// in case no " or {} has been used to enclose the value,
+					// as in 3rd case described above
+					if (sc.ch == closing_brace) {
+						--current_level;
+						// Make sure the text between entries is not colored
+						// using parameter's style
+						state = SCE_BIBTEX_DEFAULT;
+					}
+
+					Sci_Position end = sc.currentPos;
+					current_line = styler.GetLine(end);
+
+					// We have possibly skipped some lines, so the folding levels
+					// have to be adjusted separately
+					for (Sci_Position i = styler.GetLine(start); i <= styler.GetLine(end); ++i)
+						styler.SetLevel(i, prev_level);
+
+					sc.ForwardSetState(state);
+				}
+
+				if (sc.state == SCE_BIBTEX_PARAMETER && sc.ch == closing_brace) {
+					sc.SetState(SCE_BIBTEX_DEFAULT);
+					--current_level;
+				}
+
+				// Non escaped % found which represents a comment until the end of the line
+				if (sc.chPrev != '\\' && sc.ch == '%') {
+					in_comment = true;
+					sc.SetState(SCE_BIBTEX_COMMENT);
+				}
+			}
+
+			if (sc.state == SCE_BIBTEX_UNKNOWN_ENTRY || sc.state == SCE_BIBTEX_ENTRY) {
+				if (!IsAlphabetic(sc.ch) && collect_entry_name)
+					collect_entry_name = false;
+
+				if (collect_entry_name) {
+					buffer += static_cast<char>(tolower(sc.ch));
+                    if (EntryNames.InList(buffer.c_str()))
+                        sc.ChangeState(SCE_BIBTEX_ENTRY);
+                    else
+                        sc.ChangeState(SCE_BIBTEX_UNKNOWN_ENTRY);
+				}
+			}
+
+			if (sc.atLineEnd) {
+				int level = prev_level;
+
+				if (visible_chars == 0 && fold_compact)
+					level |= SC_FOLDLEVELWHITEFLAG;
+
+				if ((current_level > prev_level))
+					level |= SC_FOLDLEVELHEADERFLAG;
+				// else if (current_level < prev_level)
+				//	level |= SC_FOLDLEVELBOXFOOTERFLAG; // Deprecated
+
+				if (level != styler.LevelAt(current_line)) {
+					styler.SetLevel(current_line, level);
+				}
+
+				++current_line;
+				prev_level = current_level;
+				visible_chars = 0;
+			}
+
+			if (!isspacechar(sc.ch))
+				++visible_chars;
+		}
+
+		sc.Complete();
+
+		// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+		int flagsNext = styler.LevelAt(current_line) & ~SC_FOLDLEVELNUMBERMASK;
+		styler.SetLevel(current_line, prev_level | flagsNext);
+	}
+}
+static const char * const BibTeXWordLists[] = {
+            "Entry Names",
+            0,
+};
+
+
+LexerModule lmBibTeX(SCLEX_BIBTEX, ColorizeBibTeX, "bib", 0, BibTeXWordLists);
+
+// Entry Names
+//    article, book, booklet, conference, inbook,
+//    incollection, inproceedings, manual, mastersthesis,
+//    misc, phdthesis, proceedings, techreport, unpublished,
+//    string, url
+
diff --git a/scite-app/lexilla/lexers/LexBullant.cxx b/scite-app/lexilla/lexers/LexBullant.cxx
new file mode 100644
index 0000000..19e99e0
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexBullant.cxx
@@ -0,0 +1,234 @@
+// SciTE - Scintilla based Text Editor
+// LexBullant.cxx - lexer for Bullant
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static int classifyWordBullant(Sci_PositionU start, Sci_PositionU end, WordList &keywords, Accessor &styler) {
+	char s[100];
+	s[0] = '\0';
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		s[i + 1] = '\0';
+	}
+	int lev= 0;
+	char chAttr = SCE_C_IDENTIFIER;
+	if (isdigit(s[0]) || (s[0] == '.')){
+		chAttr = SCE_C_NUMBER;
+	}
+	else {
+		if (keywords.InList(s)) {
+			chAttr = SCE_C_WORD;
+			if (strcmp(s, "end") == 0)
+				lev = -1;
+			else if (strcmp(s, "method") == 0 ||
+				strcmp(s, "case") == 0 ||
+				strcmp(s, "class") == 0 ||
+				strcmp(s, "debug") == 0 ||
+				strcmp(s, "test") == 0 ||
+				strcmp(s, "if") == 0 ||
+				strcmp(s, "lock") == 0 ||
+				strcmp(s, "transaction") == 0 ||
+				strcmp(s, "trap") == 0 ||
+				strcmp(s, "until") == 0 ||
+				strcmp(s, "while") == 0)
+				lev = 1;
+		}
+	}
+	styler.ColourTo(end, chAttr);
+	return lev;
+}
+
+static void ColouriseBullantDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+	Accessor &styler) {
+	WordList &keywords = *keywordlists[0];
+
+	styler.StartAt(startPos);
+
+	bool fold = styler.GetPropertyInt("fold") != 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+
+	int state = initStyle;
+	if (state == SCE_C_STRINGEOL)	// Does not leak onto next line
+		state = SCE_C_DEFAULT;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	styler.StartSegment(startPos);
+	int endFoundThisLine = 0;
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// End of line
+			endFoundThisLine = 0;
+			if (state == SCE_C_STRINGEOL) {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			}
+			if (fold) {
+				int lev = levelPrev;
+				if (visibleChars == 0)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				if ((levelCurrent > levelPrev) && (visibleChars > 0))
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				styler.SetLevel(lineCurrent, lev);
+				lineCurrent++;
+				levelPrev = levelCurrent;
+			}
+			visibleChars = 0;
+
+/*			int indentBlock = GetLineIndentation(lineCurrent);
+			if (blockChange==1){
+				lineCurrent++;
+				int pos=SetLineIndentation(lineCurrent, indentBlock + indentSize);
+			} else if (blockChange==-1) {
+				indentBlock -= indentSize;
+				if (indentBlock < 0)
+					indentBlock = 0;
+				SetLineIndentation(lineCurrent, indentBlock);
+				lineCurrent++;
+			}
+			blockChange=0;
+*/		}
+		if (!(IsASCII(ch) && isspace(ch)))
+			visibleChars++;
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_C_DEFAULT) {
+			if (iswordstart(ch)) {
+				styler.ColourTo(i-1, state);
+					state = SCE_C_IDENTIFIER;
+			} else if (ch == '@' && chNext == 'o') {
+				if ((styler.SafeGetCharAt(i+2) =='f') && (styler.SafeGetCharAt(i+3) == 'f')) {
+					styler.ColourTo(i-1, state);
+					state = SCE_C_COMMENT;
+				}
+			} else if (ch == '#') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_STRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i-1, state);
+				state = SCE_C_CHARACTER;
+			} else if (isoperator(ch)) {
+				styler.ColourTo(i-1, state);
+				styler.ColourTo(i, SCE_C_OPERATOR);
+			}
+		} else if (state == SCE_C_IDENTIFIER) {
+			if (!iswordchar(ch)) {
+				int levelChange = classifyWordBullant(styler.GetStartSegment(), i - 1, keywords, styler);
+				state = SCE_C_DEFAULT;
+				chNext = styler.SafeGetCharAt(i + 1);
+				if (ch == '#') {
+					state = SCE_C_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_C_STRING;
+				} else if (ch == '\'') {
+					state = SCE_C_CHARACTER;
+				} else if (isoperator(ch)) {
+					styler.ColourTo(i, SCE_C_OPERATOR);
+				}
+				if (endFoundThisLine == 0)
+					levelCurrent+=levelChange;
+				if (levelChange == -1)
+					endFoundThisLine=1;
+			}
+		} else if (state == SCE_C_COMMENT) {
+			if (ch == '@' && chNext == 'o') {
+				if (styler.SafeGetCharAt(i+2) == 'n') {
+					styler.ColourTo(i+2, state);
+					state = SCE_C_DEFAULT;
+					i+=2;
+				}
+			}
+		} else if (state == SCE_C_COMMENTLINE) {
+			if (ch == '\r' || ch == '\n') {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, state);
+				state = SCE_C_DEFAULT;
+			}
+		} else if (state == SCE_C_STRING) {
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			} else if (chNext == '\r' || chNext == '\n') {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, SCE_C_STRINGEOL);
+				state = SCE_C_STRINGEOL;
+			}
+		} else if (state == SCE_C_CHARACTER) {
+			if ((ch == '\r' || ch == '\n') && (chPrev != '\\')) {
+				endFoundThisLine = 0;
+				styler.ColourTo(i-1, SCE_C_STRINGEOL);
+				state = SCE_C_STRINGEOL;
+			} else if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, state);
+				state = SCE_C_DEFAULT;
+			}
+		}
+		chPrev = ch;
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	if (fold) {
+		int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+		//styler.SetLevel(lineCurrent, levelCurrent | flagsNext);
+		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+
+	}
+}
+
+static const char * const bullantWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmBullant(SCLEX_BULLANT, ColouriseBullantDoc, "bullant", 0, bullantWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCIL.cxx b/scite-app/lexilla/lexers/LexCIL.cxx
new file mode 100644
index 0000000..5c801a6
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCIL.cxx
@@ -0,0 +1,410 @@
+// Scintilla source code edit control
+/** @file LexCIL.cxx
+ ** Lexer for Common Intermediate Language
+ ** Written by Jad Altahan (github.com/xv)
+ ** CIL manual: https://www.ecma-international.org/publications/standards/Ecma-335.htm
+ **/
+// 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 <string>
+#include <string_view>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+    // Use an unnamed namespace to protect the functions and classes from name conflicts
+
+bool IsAWordChar(const int ch) {
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
+}
+
+bool IsOperator(const int ch) {
+    if ((ch < 0x80) && (isalnum(ch)))
+        return false;
+
+    if (strchr("!%&*+-/<=>@^|~()[]{}", ch)) {
+        return true;
+    }
+
+    return false;
+}
+
+constexpr bool IsStreamCommentStyle(const int style) noexcept {
+    return style == SCE_CIL_COMMENT;
+}
+
+struct OptionsCIL {
+    bool fold;
+    bool foldComment;
+    bool foldCommentMultiline;
+    bool foldCompact;
+
+    OptionsCIL() {
+        fold = true;
+        foldComment = false;
+        foldCommentMultiline = true;
+        foldCompact = true;
+    }
+};
+
+static const char *const cilWordListDesc[] = {
+    "Primary CIL keywords",
+    "Metadata",
+    "Opcode instructions",
+    0
+};
+
+struct OptionSetCIL : public OptionSet<OptionsCIL> {
+    OptionSetCIL() {
+        DefineProperty("fold", &OptionsCIL::fold);
+        DefineProperty("fold.comment", &OptionsCIL::foldComment);
+
+        DefineProperty("fold.cil.comment.multiline", &OptionsCIL::foldCommentMultiline,
+            "Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+
+        DefineProperty("fold.compact", &OptionsCIL::foldCompact);
+
+        DefineWordListSets(cilWordListDesc);
+    }
+};
+
+LexicalClass lexicalClasses[] = {
+    // Lexer CIL SCLEX_CIL SCE_CIL_:
+    0,  "SCE_CIL_DEFAULT",     "default",              "White space",
+    1,  "SCE_CIL_COMMENT",     "comment",              "Multi-line comment",
+    2,  "SCE_CIL_COMMENTLINE", "comment line",         "Line comment",
+    3,  "SCE_CIL_WORD",        "keyword",              "Keyword 1",
+    4,  "SCE_CIL_WORD2",       "keyword",              "Keyword 2",
+    5,  "SCE_CIL_WORD3",       "keyword",              "Keyword 3",
+    6,  "SCE_CIL_STRING",      "literal string",       "Double quoted string",
+    7,  "SCE_CIL_LABEL",       "label",                "Code label",
+    8,  "SCE_CIL_OPERATOR",    "operator",             "Operators",
+    9,  "SCE_CIL_STRINGEOL",   "error literal string", "String is not closed",
+    10, "SCE_CIL_IDENTIFIER",  "identifier",           "Identifiers",
+};
+
+}
+
+class LexerCIL : public DefaultLexer {
+    WordList keywords, keywords2, keywords3;
+    OptionsCIL options;
+    OptionSetCIL osCIL;
+
+public:
+    LexerCIL() : DefaultLexer("cil", SCLEX_CIL, lexicalClasses, ELEMENTS(lexicalClasses)) { }
+
+    virtual ~LexerCIL() { }
+
+    void SCI_METHOD Release() override {
+        delete this;
+    }
+
+    int SCI_METHOD Version() const override {
+        return lvRelease5;
+    }
+
+    const char * SCI_METHOD PropertyNames() override {
+        return osCIL.PropertyNames();
+    }
+
+    int SCI_METHOD PropertyType(const char *name) override {
+        return osCIL.PropertyType(name);
+    }
+
+    const char * SCI_METHOD DescribeProperty(const char *name) override {
+        return osCIL.DescribeProperty(name);
+    }
+
+    Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+
+	const char * SCI_METHOD PropertyGet(const char* key) override {
+		return osCIL.PropertyGet(key);
+	}
+
+    const char * SCI_METHOD DescribeWordListSets() override {
+        return osCIL.DescribeWordListSets();
+    }
+
+    Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+
+    void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+    void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+    void * SCI_METHOD PrivateCall(int, void *) override {
+        return 0;
+    }
+
+    int SCI_METHOD LineEndTypesSupported() override {
+        return SC_LINE_END_TYPE_UNICODE;
+    }
+
+    int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+        return style;
+    }
+
+    static ILexer5 *LexerFactoryCIL() {
+        return new LexerCIL();
+    }
+};
+
+Sci_Position SCI_METHOD LexerCIL::PropertySet(const char *key, const char *val) {
+    if (osCIL.PropertySet(&options, key, val)) {
+        return 0;
+    }
+
+    return -1;
+}
+
+Sci_Position SCI_METHOD LexerCIL::WordListSet(int n, const char *wl) {
+    WordList *wordListN = 0;
+
+    switch (n) {
+        case 0:
+            wordListN = &keywords;
+            break;
+        case 1:
+            wordListN = &keywords2;
+            break;
+        case 2:
+            wordListN = &keywords3;
+            break;
+    }
+
+    Sci_Position firstModification = -1;
+
+    if (wordListN) {
+        WordList wlNew;
+        wlNew.Set(wl);
+
+        if (*wordListN != wlNew) {
+            wordListN->Set(wl);
+            firstModification = 0;
+        }
+    }
+
+    return firstModification;
+}
+
+void SCI_METHOD LexerCIL::Lex(Sci_PositionU startPos, Sci_Position length,
+                              int initStyle, IDocument *pAccess) {
+    if (initStyle == SCE_CIL_STRINGEOL) {
+        initStyle = SCE_CIL_DEFAULT;
+    }
+
+    Accessor styler(pAccess, NULL);
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    bool identAtLineStart = false, // Checks if an identifier is at line start (ignoring spaces)
+         canStyleLabels = false;   // Checks if conditions are met to style SCE_CIL_LABEL
+
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+            if (sc.state == SCE_CIL_STRING) {
+                sc.SetState(SCE_CIL_STRING);
+            }
+
+            identAtLineStart = true;
+        }
+
+        // Handle string line continuation
+        if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') &&
+           (sc.state == SCE_CIL_STRING)) {
+            sc.Forward();
+
+            if (sc.ch == '\r' && sc.chNext == '\n') {
+                sc.Forward();
+            }
+
+            continue;
+        }
+
+        switch (sc.state) {
+            case SCE_CIL_OPERATOR:
+                sc.SetState(SCE_CIL_DEFAULT);
+                break;
+            case SCE_CIL_IDENTIFIER:
+                if (!IsAWordChar(sc.ch)) {
+                    if (canStyleLabels && (sc.ch == ':' && sc.chNext != ':')) {
+                        sc.ChangeState(SCE_CIL_LABEL);
+                        sc.ForwardSetState(SCE_CIL_DEFAULT);
+                    } else {
+                        char kwSize[100];
+                        sc.GetCurrent(kwSize, sizeof(kwSize));
+                        int style = SCE_CIL_IDENTIFIER;
+
+                        if (keywords.InList(kwSize)) {
+                            style = SCE_CIL_WORD;
+                        } else if (keywords2.InList(kwSize)) {
+                            style = SCE_CIL_WORD2;
+                        } else if (keywords3.InList(kwSize)) {
+                            style = SCE_CIL_WORD3;
+                        }
+
+                        sc.ChangeState(style);
+                        sc.SetState(SCE_CIL_DEFAULT);
+                    }
+                }
+                break;
+            case SCE_CIL_COMMENT:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_CIL_DEFAULT);
+                }
+                break;
+            case SCE_CIL_COMMENTLINE:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_CIL_DEFAULT);
+                }
+                break;
+            case SCE_CIL_STRING:
+                if (sc.ch == '\\') {
+                    if (sc.chNext == '"' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                } else if (sc.ch == '"') {
+                    sc.ForwardSetState(SCE_CIL_DEFAULT);
+                } else if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_CIL_STRINGEOL);
+                    sc.ForwardSetState(SCE_CIL_DEFAULT);
+                }
+                break;
+        }
+
+        if (sc.state == SCE_CIL_DEFAULT) {
+            // String
+            if (sc.ch == '"') {
+                sc.SetState(SCE_CIL_STRING);
+            }
+            // Keyword
+            else if (IsAWordChar(sc.ch)) {
+                // Allow setting SCE_CIL_LABEL style only if the label is the
+                // first token in the line and does not start with a dot or a digit
+                canStyleLabels = identAtLineStart && !(sc.ch == '.' || IsADigit(sc.ch));
+                sc.SetState(SCE_CIL_IDENTIFIER);
+            }
+            // Multi-line comment
+            else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_CIL_COMMENT);
+                sc.Forward();
+            }
+            // Line comment
+            else if (sc.Match('/', '/')) {
+                sc.SetState(SCE_CIL_COMMENTLINE);
+            }
+            // Operators
+            else if (IsOperator(sc.ch)) {
+                sc.SetState(SCE_CIL_OPERATOR);
+            }
+        }
+
+        if (!IsASpace(sc.ch)) {
+            identAtLineStart = false;
+        }
+    }
+
+    sc.Complete();
+}
+
+void SCI_METHOD LexerCIL::Fold(Sci_PositionU startPos, Sci_Position length, 
+                               int initStyle, IDocument *pAccess) {
+    if (!options.fold) {
+        return;
+    }
+
+    LexAccessor styler(pAccess);
+
+    const Sci_PositionU endPos = startPos + length;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+    
+    int style = initStyle;
+    int styleNext = styler.StyleAt(startPos);
+    int levelNext = levelCurrent;
+    int visibleChars = 0;
+
+    char chNext = styler[startPos];
+
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        const char ch = chNext;
+        int stylePrev = style;
+
+        chNext = styler.SafeGetCharAt(i + 1);
+        style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+
+        const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+        if (options.foldComment && 
+            options.foldCommentMultiline && IsStreamCommentStyle(style)) {
+            if (!IsStreamCommentStyle(stylePrev)) {
+                levelNext++;
+            } else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+                levelNext--;
+            }
+        }
+
+        if (style == SCE_CIL_OPERATOR) {
+            if (ch == '{') {
+                levelNext++;
+            } else if (ch == '}') {
+                levelNext--;
+            }
+        }
+
+        if (!IsASpace(ch)) {
+            visibleChars++;
+        }
+
+        if (atEOL || (i == endPos - 1)) {
+            int lev = levelCurrent | levelNext << 16;
+            if (visibleChars == 0 && options.foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelCurrent < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            
+            lineCurrent++;
+            levelCurrent = levelNext;
+            
+            if (options.foldCompact &&
+                i == static_cast<Sci_PositionU>(styler.Length() - 1)) {
+                styler.SetLevel(lineCurrent, lev | SC_FOLDLEVELWHITEFLAG);
+            }
+
+            visibleChars = 0;
+        }
+    }
+}
+
+LexerModule lmCIL(SCLEX_CIL, LexerCIL::LexerFactoryCIL, "cil", cilWordListDesc);
\ No newline at end of file
diff --git a/scite-app/lexilla/lexers/LexCLW.cxx b/scite-app/lexilla/lexers/LexCLW.cxx
new file mode 100644
index 0000000..0e86f4c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCLW.cxx
@@ -0,0 +1,683 @@
+// Scintilla source code edit control
+/** @file LexCLW.cxx
+ ** Lexer for Clarion.
+ ** 2004/12/17 Updated Lexer
+ **/
+// Copyright 2003-2004 by Ron Schofield <ron@schofieldcomputer.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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Is an end of line character
+inline bool IsEOL(const int ch) {
+
+	return(ch == '\n');
+}
+
+// Convert character to uppercase
+static char CharacterUpper(char chChar) {
+
+	if (chChar < 'a' || chChar > 'z') {
+		return(chChar);
+	}
+	else {
+		return(static_cast<char>(chChar - 'a' + 'A'));
+	}
+}
+
+// Convert string to uppercase
+static void StringUpper(char *szString) {
+
+	while (*szString) {
+		*szString = CharacterUpper(*szString);
+		szString++;
+	}
+}
+
+// Is a label start character
+inline bool IsALabelStart(const int iChar) {
+
+	return(isalpha(iChar) || iChar == '_');
+}
+
+// Is a label character
+inline bool IsALabelCharacter(const int iChar) {
+
+	return(isalnum(iChar) || iChar == '_' || iChar == ':');
+}
+
+// Is the character is a ! and the the next character is not a !
+inline bool IsACommentStart(const int iChar) {
+
+	return(iChar == '!');
+}
+
+// Is the character a Clarion hex character (ABCDEF)
+inline bool IsAHexCharacter(const int iChar, bool bCaseSensitive) {
+
+	// Case insensitive.
+	if (!bCaseSensitive) {
+		if (strchr("ABCDEFabcdef", iChar) != NULL) {
+			return(true);
+		}
+	}
+	// Case sensitive
+	else {
+		if (strchr("ABCDEF", iChar) != NULL) {
+			return(true);
+		}
+	}
+	return(false);
+}
+
+// Is the character a Clarion base character (B=Binary, O=Octal, H=Hex)
+inline bool IsANumericBaseCharacter(const int iChar, bool bCaseSensitive) {
+
+	// Case insensitive.
+	if (!bCaseSensitive) {
+		// If character is a numeric base character
+		if (strchr("BOHboh", iChar) != NULL) {
+			return(true);
+		}
+	}
+	// Case sensitive
+	else {
+		// If character is a numeric base character
+		if (strchr("BOH", iChar) != NULL) {
+			return(true);
+		}
+	}
+	return(false);
+}
+
+// Set the correct numeric constant state
+inline bool SetNumericConstantState(StyleContext &scDoc) {
+
+	int iPoints = 0;			// Point counter
+	char cNumericString[512];	// Numeric string buffer
+
+	// Buffer the current numberic string
+	scDoc.GetCurrent(cNumericString, sizeof(cNumericString));
+	// Loop through the string until end of string (NULL termination)
+	for (int iIndex = 0; cNumericString[iIndex] != '\0'; iIndex++) {
+		// Depending on the character
+		switch (cNumericString[iIndex]) {
+			// Is a . (point)
+			case '.' :
+				// Increment point counter
+				iPoints++;
+				break;
+			default :
+				break;
+		}
+	}
+	// If points found (can be more than one for improper formatted number
+	if (iPoints > 0) {
+		return(true);
+	}
+	// Else no points found
+	else {
+		return(false);
+	}
+}
+
+// Get the next word in uppercase from the current position (keyword lookahead)
+inline bool GetNextWordUpper(Accessor &styler, Sci_PositionU uiStartPos, Sci_Position iLength, char *cWord) {
+
+	Sci_PositionU iIndex = 0;		// Buffer Index
+
+	// Loop through the remaining string from the current position
+	for (Sci_Position iOffset = uiStartPos; iOffset < iLength; iOffset++) {
+		// Get the character from the buffer using the offset
+		char cCharacter = styler[iOffset];
+		if (IsEOL(cCharacter)) {
+			break;
+		}
+		// If the character is alphabet character
+		if (isalpha(cCharacter)) {
+			// Add UPPERCASE character to the word buffer
+			cWord[iIndex++] = CharacterUpper(cCharacter);
+		}
+	}
+	// Add null termination
+	cWord[iIndex] = '\0';
+	// If no word was found
+	if (iIndex == 0) {
+		// Return failure
+		return(false);
+	}
+	// Else word was found
+	else {
+		// Return success
+		return(true);
+	}
+}
+
+// Clarion Language Colouring Procedure
+static void ColouriseClarionDoc(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler, bool bCaseSensitive) {
+
+	int iParenthesesLevel = 0;		// Parenthese Level
+	int iColumn1Label = false;		// Label starts in Column 1
+
+	WordList &wlClarionKeywords = *wlKeywords[0];			// Clarion Keywords
+	WordList &wlCompilerDirectives = *wlKeywords[1];		// Compiler Directives
+	WordList &wlRuntimeExpressions = *wlKeywords[2];		// Runtime Expressions
+	WordList &wlBuiltInProcsFuncs = *wlKeywords[3];			// Builtin Procedures and Functions
+	WordList &wlStructsDataTypes = *wlKeywords[4];			// Structures and Data Types
+	WordList &wlAttributes = *wlKeywords[5];				// Procedure Attributes
+	WordList &wlStandardEquates = *wlKeywords[6];			// Standard Equates
+	WordList &wlLabelReservedWords = *wlKeywords[7];		// Clarion Reserved Keywords (Labels)
+	WordList &wlProcLabelReservedWords = *wlKeywords[8];	// Clarion Reserved Keywords (Procedure Labels)
+
+	const char wlProcReservedKeywordList[] =
+	"PROCEDURE FUNCTION";
+	WordList wlProcReservedKeywords;
+	wlProcReservedKeywords.Set(wlProcReservedKeywordList);
+
+	const char wlCompilerKeywordList[] =
+	"COMPILE OMIT";
+	WordList wlCompilerKeywords;
+	wlCompilerKeywords.Set(wlCompilerKeywordList);
+
+	const char wlLegacyStatementsList[] =
+	"BOF EOF FUNCTION POINTER SHARE";
+	WordList wlLegacyStatements;
+	wlLegacyStatements.Set(wlLegacyStatementsList);
+
+	StyleContext scDoc(uiStartPos, iLength, iInitStyle, accStyler);
+
+	// lex source code
+    for (; scDoc.More(); scDoc.Forward())
+	{
+		//
+		// Determine if the current state should terminate.
+		//
+
+		// Label State Handling
+		if (scDoc.state == SCE_CLW_LABEL) {
+			// If the character is not a valid label
+			if (!IsALabelCharacter(scDoc.ch)) {
+				// If the character is a . (dot syntax)
+				if (scDoc.ch == '.') {
+					// Turn off column 1 label flag as label now cannot be reserved work
+					iColumn1Label = false;
+					// Uncolour the . (dot) to default state, move forward one character,
+					// and change back to the label state.
+					scDoc.SetState(SCE_CLW_DEFAULT);
+					scDoc.Forward();
+					scDoc.SetState(SCE_CLW_LABEL);
+				}
+				// Else check label
+				else {
+					char cLabel[512];		// Label buffer
+					// Buffer the current label string
+					scDoc.GetCurrent(cLabel,sizeof(cLabel));
+					// If case insensitive, convert string to UPPERCASE to match passed keywords.
+					if (!bCaseSensitive) {
+						StringUpper(cLabel);
+					}
+					// Else if UPPERCASE label string is in the Clarion compiler keyword list
+					if (wlCompilerKeywords.InList(cLabel) && iColumn1Label){
+						// change the label to error state
+						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+					}
+					// Else if UPPERCASE label string is in the Clarion reserved keyword list
+					else if (wlLabelReservedWords.InList(cLabel) && iColumn1Label){
+						// change the label to error state
+						scDoc.ChangeState(SCE_CLW_ERROR);
+					}
+					// Else if UPPERCASE label string is
+					else if (wlProcLabelReservedWords.InList(cLabel) && iColumn1Label) {
+						char cWord[512];	// Word buffer
+						// Get the next word from the current position
+						if (GetNextWordUpper(accStyler,scDoc.currentPos,uiStartPos+iLength,cWord)) {
+							// If the next word is a procedure reserved word
+							if (wlProcReservedKeywords.InList(cWord)) {
+								// Change the label to error state
+								scDoc.ChangeState(SCE_CLW_ERROR);
+							}
+						}
+					}
+					// Else if label string is in the compiler directive keyword list
+					else if (wlCompilerDirectives.InList(cLabel)) {
+						// change the state to compiler directive state
+						scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+					}
+					// Terminate the label state and set to default state
+					scDoc.SetState(SCE_CLW_DEFAULT);
+				}
+			}
+		}
+		// Keyword State Handling
+		else if (scDoc.state == SCE_CLW_KEYWORD) {
+			// If character is : (colon)
+			if (scDoc.ch == ':') {
+				char cEquate[512];		// Equate buffer
+				// Move forward to include : (colon) in buffer
+				scDoc.Forward();
+				// Buffer the equate string
+				scDoc.GetCurrent(cEquate,sizeof(cEquate));
+				// If case insensitive, convert string to UPPERCASE to match passed keywords.
+				if (!bCaseSensitive) {
+					StringUpper(cEquate);
+				}
+				// If statement string is in the equate list
+				if (wlStandardEquates.InList(cEquate)) {
+					// Change to equate state
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
+				}
+			}
+			// If the character is not a valid label character
+			else if (!IsALabelCharacter(scDoc.ch)) {
+				char cStatement[512];		// Statement buffer
+				// Buffer the statement string
+				scDoc.GetCurrent(cStatement,sizeof(cStatement));
+				// If case insensitive, convert string to UPPERCASE to match passed keywords.
+				if (!bCaseSensitive) {
+					StringUpper(cStatement);
+				}
+				// If statement string is in the Clarion keyword list
+				if (wlClarionKeywords.InList(cStatement)) {
+					// Change the statement string to the Clarion keyword state
+					scDoc.ChangeState(SCE_CLW_KEYWORD);
+				}
+				// Else if statement string is in the compiler directive keyword list
+				else if (wlCompilerDirectives.InList(cStatement)) {
+					// Change the statement string to the compiler directive state
+					scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+				}
+				// Else if statement string is in the runtime expressions keyword list
+				else if (wlRuntimeExpressions.InList(cStatement)) {
+					// Change the statement string to the runtime expressions state
+					scDoc.ChangeState(SCE_CLW_RUNTIME_EXPRESSIONS);
+				}
+				// Else if statement string is in the builtin procedures and functions keyword list
+				else if (wlBuiltInProcsFuncs.InList(cStatement)) {
+					// Change the statement string to the builtin procedures and functions state
+					scDoc.ChangeState(SCE_CLW_BUILTIN_PROCEDURES_FUNCTION);
+				}
+				// Else if statement string is in the tructures and data types keyword list
+				else if (wlStructsDataTypes.InList(cStatement)) {
+					// Change the statement string to the structures and data types state
+					scDoc.ChangeState(SCE_CLW_STRUCTURE_DATA_TYPE);
+				}
+				// Else if statement string is in the procedure attribute keyword list
+				else if (wlAttributes.InList(cStatement)) {
+					// Change the statement string to the procedure attribute state
+					scDoc.ChangeState(SCE_CLW_ATTRIBUTE);
+				}
+				// Else if statement string is in the standard equate keyword list
+				else if (wlStandardEquates.InList(cStatement)) {
+					// Change the statement string to the standard equate state
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
+				}
+				// Else if statement string is in the deprecated or legacy keyword list
+				else if (wlLegacyStatements.InList(cStatement)) {
+					// Change the statement string to the standard equate state
+					scDoc.ChangeState(SCE_CLW_DEPRECATED);
+				}
+				// Else the statement string doesn't match any work list
+				else {
+					// Change the statement string to the default state
+					scDoc.ChangeState(SCE_CLW_DEFAULT);
+				}
+				// Terminate the keyword state and set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+		// String State Handling
+		else if (scDoc.state == SCE_CLW_STRING) {
+			// If the character is an ' (single quote)
+			if (scDoc.ch == '\'') {
+				// Set the state to default and move forward colouring
+				// the ' (single quote) as default state
+				// terminating the string state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+				scDoc.Forward();
+			}
+			// If the next character is an ' (single quote)
+			if (scDoc.chNext == '\'') {
+				// Move forward one character and set to default state
+				// colouring the next ' (single quote) as default state
+				// terminating the string state
+				scDoc.ForwardSetState(SCE_CLW_DEFAULT);
+				scDoc.Forward();
+			}
+		}
+		// Picture String State Handling
+		else if (scDoc.state == SCE_CLW_PICTURE_STRING) {
+			// If the character is an ( (open parenthese)
+			if (scDoc.ch == '(') {
+				// Increment the parenthese level
+				iParenthesesLevel++;
+			}
+			// Else if the character is a ) (close parenthese)
+			else if (scDoc.ch == ')') {
+				// If the parenthese level is set to zero
+				// parentheses matched
+				if (!iParenthesesLevel) {
+					scDoc.SetState(SCE_CLW_DEFAULT);
+				}
+				// Else parenthese level is greater than zero
+				// still looking for matching parentheses
+				else {
+					// Decrement the parenthese level
+					iParenthesesLevel--;
+				}
+			}
+		}
+		// Standard Equate State Handling
+		else if (scDoc.state == SCE_CLW_STANDARD_EQUATE) {
+			if (!isalnum(scDoc.ch)) {
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+		// Integer Constant State Handling
+		else if (scDoc.state == SCE_CLW_INTEGER_CONSTANT) {
+			// If the character is not a digit (0-9)
+			// or character is not a hexidecimal character (A-F)
+			// or character is not a . (point)
+			// or character is not a numberic base character (B,O,H)
+			if (!(isdigit(scDoc.ch)
+			|| IsAHexCharacter(scDoc.ch, bCaseSensitive)
+			|| scDoc.ch == '.'
+			|| IsANumericBaseCharacter(scDoc.ch, bCaseSensitive))) {
+				// If the number was a real
+				if (SetNumericConstantState(scDoc)) {
+					// Colour the matched string to the real constant state
+					scDoc.ChangeState(SCE_CLW_REAL_CONSTANT);
+				}
+				// Else the number was an integer
+				else {
+					// Colour the matched string to an integer constant state
+					scDoc.ChangeState(SCE_CLW_INTEGER_CONSTANT);
+				}
+				// Terminate the integer constant state and set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+		}
+
+		//
+		// Determine if a new state should be entered.
+		//
+
+		// Beginning of Line Handling
+		if (scDoc.atLineStart) {
+			// Reset the column 1 label flag
+			iColumn1Label = false;
+			// If column 1 character is a label start character
+			if (IsALabelStart(scDoc.ch)) {
+				// Label character is found in column 1
+				// so set column 1 label flag and clear last column 1 label
+				iColumn1Label = true;
+				// Set the state to label
+				scDoc.SetState(SCE_CLW_LABEL);
+			}
+			// else if character is a space or tab
+			else if (IsASpace(scDoc.ch)){
+				// Set to default state
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+			// else if comment start (!) or is an * (asterisk)
+			else if (IsACommentStart(scDoc.ch) || scDoc.ch == '*' ) {
+				// then set the state to comment.
+				scDoc.SetState(SCE_CLW_COMMENT);
+			}
+			// else the character is a ? (question mark)
+			else if (scDoc.ch == '?') {
+				// Change to the compiler directive state, move forward,
+				// colouring the ? (question mark), change back to default state.
+				scDoc.ChangeState(SCE_CLW_COMPILER_DIRECTIVE);
+				scDoc.Forward();
+				scDoc.SetState(SCE_CLW_DEFAULT);
+			}
+			// else an invalid character in column 1
+			else {
+				// Set to error state
+				scDoc.SetState(SCE_CLW_ERROR);
+			}
+		}
+		// End of Line Handling
+		else if (scDoc.atLineEnd) {
+			// Reset to the default state at the end of each line.
+			scDoc.SetState(SCE_CLW_DEFAULT);
+		}
+		// Default Handling
+		else {
+			// If in default state
+			if (scDoc.state == SCE_CLW_DEFAULT) {
+				// If is a letter could be a possible statement
+				if (isalpha(scDoc.ch)) {
+					// Set the state to Clarion Keyword and verify later
+					scDoc.SetState(SCE_CLW_KEYWORD);
+				}
+				// else is a number
+				else if (isdigit(scDoc.ch)) {
+					// Set the state to Integer Constant and verify later
+					scDoc.SetState(SCE_CLW_INTEGER_CONSTANT);
+				}
+				// else if the start of a comment or a | (line continuation)
+				else if (IsACommentStart(scDoc.ch) || scDoc.ch == '|') {
+					// then set the state to comment.
+					scDoc.SetState(SCE_CLW_COMMENT);
+				}
+				// else if the character is a ' (single quote)
+				else if (scDoc.ch == '\'') {
+					// If the character is also a ' (single quote)
+					// Embedded Apostrophe
+					if (scDoc.chNext == '\'') {
+						// Move forward colouring it as default state
+						scDoc.ForwardSetState(SCE_CLW_DEFAULT);
+					}
+					else {
+						// move to the next character and then set the state to comment.
+						scDoc.ForwardSetState(SCE_CLW_STRING);
+					}
+				}
+				// else the character is an @ (ampersand)
+				else if (scDoc.ch == '@') {
+					// Case insensitive.
+					if (!bCaseSensitive) {
+						// If character is a valid picture token character
+						if (strchr("DEKNPSTdeknpst", scDoc.chNext) != NULL) {
+							// Set to the picture string state
+							scDoc.SetState(SCE_CLW_PICTURE_STRING);
+						}
+					}
+					// Case sensitive
+					else {
+						// If character is a valid picture token character
+						if (strchr("DEKNPST", scDoc.chNext) != NULL) {
+							// Set the picture string state
+							scDoc.SetState(SCE_CLW_PICTURE_STRING);
+						}
+					}
+				}
+			}
+		}
+	}
+	// lexing complete
+	scDoc.Complete();
+}
+
+// Clarion Language Case Sensitive Colouring Procedure
+static void ColouriseClarionDocSensitive(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
+
+	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, true);
+}
+
+// Clarion Language Case Insensitive Colouring Procedure
+static void ColouriseClarionDocInsensitive(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *wlKeywords[], Accessor &accStyler) {
+
+	ColouriseClarionDoc(uiStartPos, iLength, iInitStyle, wlKeywords, accStyler, false);
+}
+
+// Fill Buffer
+
+static void FillBuffer(Sci_PositionU uiStart, Sci_PositionU uiEnd, Accessor &accStyler, char *szBuffer, Sci_PositionU uiLength) {
+
+	Sci_PositionU uiPos = 0;
+
+	while ((uiPos < uiEnd - uiStart + 1) && (uiPos < uiLength-1)) {
+		szBuffer[uiPos] = static_cast<char>(toupper(accStyler[uiStart + uiPos]));
+		uiPos++;
+	}
+	szBuffer[uiPos] = '\0';
+}
+
+// Classify Clarion Fold Point
+
+static int ClassifyClarionFoldPoint(int iLevel, const char* szString) {
+
+	if (!(isdigit(szString[0]) || (szString[0] == '.'))) {
+		if (strcmp(szString, "PROCEDURE") == 0) {
+	//		iLevel = SC_FOLDLEVELBASE + 1;
+		}
+		else if (strcmp(szString, "MAP") == 0 ||
+			strcmp(szString,"ACCEPT") == 0 ||
+			strcmp(szString,"BEGIN") == 0 ||
+			strcmp(szString,"CASE") == 0 ||
+			strcmp(szString,"EXECUTE") == 0 ||
+			strcmp(szString,"IF") == 0 ||
+			strcmp(szString,"ITEMIZE") == 0 ||
+			strcmp(szString,"INTERFACE") == 0 ||
+			strcmp(szString,"JOIN") == 0 ||
+			strcmp(szString,"LOOP") == 0 ||
+			strcmp(szString,"MODULE") == 0 ||
+			strcmp(szString,"RECORD") == 0) {
+			iLevel++;
+		}
+		else if (strcmp(szString, "APPLICATION") == 0 ||
+			strcmp(szString, "CLASS") == 0 ||
+			strcmp(szString, "DETAIL") == 0 ||
+			strcmp(szString, "FILE") == 0 ||
+			strcmp(szString, "FOOTER") == 0 ||
+			strcmp(szString, "FORM") == 0 ||
+			strcmp(szString, "GROUP") == 0 ||
+			strcmp(szString, "HEADER") == 0 ||
+			strcmp(szString, "INTERFACE") == 0 ||
+			strcmp(szString, "MENU") == 0 ||
+			strcmp(szString, "MENUBAR") == 0 ||
+			strcmp(szString, "OLE") == 0 ||
+			strcmp(szString, "OPTION") == 0 ||
+			strcmp(szString, "QUEUE") == 0 ||
+			strcmp(szString, "REPORT") == 0 ||
+			strcmp(szString, "SHEET") == 0 ||
+			strcmp(szString, "TAB") == 0 ||
+			strcmp(szString, "TOOLBAR") == 0 ||
+			strcmp(szString, "VIEW") == 0 ||
+			strcmp(szString, "WINDOW") == 0) {
+			iLevel++;
+		}
+		else if (strcmp(szString, "END") == 0 ||
+			strcmp(szString, "UNTIL") == 0 ||
+			strcmp(szString, "WHILE") == 0) {
+			iLevel--;
+		}
+	}
+	return(iLevel);
+}
+
+// Clarion Language Folding Procedure
+static void FoldClarionDoc(Sci_PositionU uiStartPos, Sci_Position iLength, int iInitStyle, WordList *[], Accessor &accStyler) {
+
+	Sci_PositionU uiEndPos = uiStartPos + iLength;
+	Sci_Position iLineCurrent = accStyler.GetLine(uiStartPos);
+	int iLevelPrev = accStyler.LevelAt(iLineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int iLevelCurrent = iLevelPrev;
+	char chNext = accStyler[uiStartPos];
+	int iStyle = iInitStyle;
+	int iStyleNext = accStyler.StyleAt(uiStartPos);
+	int iVisibleChars = 0;
+	Sci_Position iLastStart = 0;
+
+	for (Sci_PositionU uiPos = uiStartPos; uiPos < uiEndPos; uiPos++) {
+
+		char chChar = chNext;
+		chNext = accStyler.SafeGetCharAt(uiPos + 1);
+		int iStylePrev = iStyle;
+		iStyle = iStyleNext;
+		iStyleNext = accStyler.StyleAt(uiPos + 1);
+		bool bEOL = (chChar == '\r' && chNext != '\n') || (chChar == '\n');
+
+		if (iStylePrev == SCE_CLW_DEFAULT) {
+			if (iStyle == SCE_CLW_KEYWORD || iStyle == SCE_CLW_STRUCTURE_DATA_TYPE) {
+				// Store last word start point.
+				iLastStart = uiPos;
+			}
+		}
+
+		if (iStylePrev == SCE_CLW_KEYWORD || iStylePrev == SCE_CLW_STRUCTURE_DATA_TYPE) {
+			if(iswordchar(chChar) && !iswordchar(chNext)) {
+				char chBuffer[100];
+				FillBuffer(iLastStart, uiPos, accStyler, chBuffer, sizeof(chBuffer));
+				iLevelCurrent = ClassifyClarionFoldPoint(iLevelCurrent,chBuffer);
+			//	if ((iLevelCurrent == SC_FOLDLEVELBASE + 1) && iLineCurrent > 1) {
+			//		accStyler.SetLevel(iLineCurrent-1,SC_FOLDLEVELBASE);
+			//		iLevelPrev = SC_FOLDLEVELBASE;
+			//	}
+			}
+		}
+
+		if (bEOL) {
+			int iLevel = iLevelPrev;
+			if ((iLevelCurrent > iLevelPrev) && (iVisibleChars > 0))
+				iLevel |= SC_FOLDLEVELHEADERFLAG;
+			if (iLevel != accStyler.LevelAt(iLineCurrent)) {
+				accStyler.SetLevel(iLineCurrent,iLevel);
+			}
+			iLineCurrent++;
+			iLevelPrev = iLevelCurrent;
+			iVisibleChars = 0;
+		}
+
+		if (!isspacechar(chChar))
+			iVisibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags
+	// as they will be filled in later.
+	int iFlagsNext = accStyler.LevelAt(iLineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	accStyler.SetLevel(iLineCurrent, iLevelPrev | iFlagsNext);
+}
+
+// Word List Descriptions
+static const char * const rgWordListDescriptions[] = {
+	"Clarion Keywords",
+	"Compiler Directives",
+	"Built-in Procedures and Functions",
+	"Runtime Expressions",
+	"Structure and Data Types",
+	"Attributes",
+	"Standard Equates",
+	"Reserved Words (Labels)",
+	"Reserved Words (Procedure Labels)",
+	0,
+};
+
+// Case Sensitive Clarion Language Lexer
+LexerModule lmClw(SCLEX_CLW, ColouriseClarionDocSensitive, "clarion", FoldClarionDoc, rgWordListDescriptions);
+
+// Case Insensitive Clarion Language Lexer
+LexerModule lmClwNoCase(SCLEX_CLWNOCASE, ColouriseClarionDocInsensitive, "clarionnocase", FoldClarionDoc, rgWordListDescriptions);
diff --git a/scite-app/lexilla/lexers/LexCOBOL.cxx b/scite-app/lexilla/lexers/LexCOBOL.cxx
new file mode 100644
index 0000000..39682f5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCOBOL.cxx
@@ -0,0 +1,382 @@
+// Scintilla source code edit control
+/** @file LexCOBOL.cxx
+ ** Lexer for COBOL
+ ** Based on LexPascal.cxx
+ ** Written by Laurent le Tynevez
+ ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
+ ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
+ ** Updated by Rod Falck, Aug 2006 Converted to COBOL
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+#define IN_DIVISION 0x01
+#define IN_DECLARATIVES 0x02
+#define IN_SECTION 0x04
+#define IN_PARAGRAPH 0x08
+#define IN_FLAGS 0xF
+#define NOT_HEADER 0x10
+
+inline bool isCOBOLoperator(char ch)
+    {
+    return isoperator(ch);
+    }
+
+inline bool isCOBOLwordchar(char ch)
+    {
+    return IsASCII(ch) && (isalnum(ch) || ch == '-');
+
+    }
+
+inline bool isCOBOLwordstart(char ch)
+    {
+    return IsASCII(ch) && isalnum(ch);
+    }
+
+static int CountBits(int nBits)
+	{
+	int count = 0;
+	for (int i = 0; i < 32; ++i)
+		{
+		count += nBits & 1;
+		nBits >>= 1;
+		}
+	return count;
+	}
+
+static void getRange(Sci_PositionU start,
+        Sci_PositionU end,
+        Accessor &styler,
+        char *s,
+        Sci_PositionU len) {
+    Sci_PositionU i = 0;
+    while ((i < end - start + 1) && (i < len-1)) {
+        s[i] = static_cast<char>(tolower(styler[start + i]));
+        i++;
+    }
+    s[i] = '\0';
+}
+
+static void ColourTo(Accessor &styler, Sci_PositionU end, unsigned int attr) {
+    styler.ColourTo(end, attr);
+}
+
+
+static int classifyWordCOBOL(Sci_PositionU start, Sci_PositionU end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, int nContainment, bool *bAarea) {
+    int ret = 0;
+
+    WordList& a_keywords = *keywordlists[0];
+    WordList& b_keywords = *keywordlists[1];
+    WordList& c_keywords = *keywordlists[2];
+
+    char s[100];
+    s[0] = '\0';
+    s[1] = '\0';
+    getRange(start, end, styler, s, sizeof(s));
+
+    char chAttr = SCE_C_IDENTIFIER;
+    if (isdigit(s[0]) || (s[0] == '.') || (s[0] == 'v')) {
+        chAttr = SCE_C_NUMBER;
+		char *p = s + 1;
+		while (*p) {
+			if ((!isdigit(*p) && (*p) != 'v') && isCOBOLwordchar(*p)) {
+				chAttr = SCE_C_IDENTIFIER;
+			    break;
+			}
+			++p;
+		}
+    }
+    else {
+        if (a_keywords.InList(s)) {
+            chAttr = SCE_C_WORD;
+        }
+        else if (b_keywords.InList(s)) {
+            chAttr = SCE_C_WORD2;
+        }
+        else if (c_keywords.InList(s)) {
+            chAttr = SCE_C_UUID;
+        }
+    }
+    if (*bAarea) {
+        if (strcmp(s, "division") == 0) {
+            ret = IN_DIVISION;
+			// we've determined the containment, anything else is just ignored for those purposes
+			*bAarea = false;
+		} else if (strcmp(s, "declaratives") == 0) {
+            ret = IN_DIVISION | IN_DECLARATIVES;
+			if (nContainment & IN_DECLARATIVES)
+				ret |= NOT_HEADER | IN_SECTION;
+			// we've determined the containment, anything else is just ignored for those purposes
+			*bAarea = false;
+		} else if (strcmp(s, "section") == 0) {
+            ret = (nContainment &~ IN_PARAGRAPH) | IN_SECTION;
+			// we've determined the containment, anything else is just ignored for those purposes
+			*bAarea = false;
+		} else if (strcmp(s, "end") == 0 && (nContainment & IN_DECLARATIVES)) {
+            ret = IN_DIVISION | IN_DECLARATIVES | IN_SECTION | NOT_HEADER;
+		} else {
+			ret = nContainment | IN_PARAGRAPH;
+        }
+    }
+    ColourTo(styler, end, chAttr);
+    return ret;
+}
+
+static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+    Accessor &styler) {
+
+    styler.StartAt(startPos);
+
+    int state = initStyle;
+    if (state == SCE_C_CHARACTER)   // Does not leak onto next line
+        state = SCE_C_DEFAULT;
+    char chPrev = ' ';
+    char chNext = styler[startPos];
+    Sci_PositionU lengthDoc = startPos + length;
+
+    int nContainment;
+
+    Sci_Position currentLine = styler.GetLine(startPos);
+    if (currentLine > 0) {
+        styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
+        nContainment = styler.GetLineState(currentLine);
+		nContainment &= ~NOT_HEADER;
+    } else {
+        styler.SetLineState(currentLine, 0);
+        nContainment = 0;
+    }
+
+    styler.StartSegment(startPos);
+    bool bNewLine = true;
+    bool bAarea = !isspacechar(chNext);
+	int column = 0;
+    for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+        char ch = chNext;
+
+        chNext = styler.SafeGetCharAt(i + 1);
+
+		++column;
+
+        if (bNewLine) {
+			column = 0;
+        }
+		if (column <= 1 && !bAarea) {
+			bAarea = !isspacechar(ch);
+			}
+        bool bSetNewLine = false;
+        if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+            // Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+            // Avoid triggering two times on Dos/Win
+            // End of line
+            if (state == SCE_C_CHARACTER) {
+                ColourTo(styler, i, state);
+                state = SCE_C_DEFAULT;
+            }
+            styler.SetLineState(currentLine, nContainment);
+            currentLine++;
+            bSetNewLine = true;
+			if (nContainment & NOT_HEADER)
+				nContainment &= ~(NOT_HEADER | IN_DECLARATIVES | IN_SECTION);
+        }
+
+        if (styler.IsLeadByte(ch)) {
+            chNext = styler.SafeGetCharAt(i + 2);
+            chPrev = ' ';
+            i += 1;
+            continue;
+        }
+
+        if (state == SCE_C_DEFAULT) {
+            if (isCOBOLwordstart(ch) || (ch == '$' && IsASCII(chNext) && isalpha(chNext))) {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_IDENTIFIER;
+            } else if (column == 6 && ch == '*') {
+            // Cobol comment line: asterisk in column 7.
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
+            } else if (ch == '*' && chNext == '>') {
+            // Cobol inline comment: asterisk, followed by greater than.
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
+            } else if (column == 0 && ch == '*' && chNext != '*') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
+            } else if (column == 0 && ch == '/' && chNext != '*') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTLINE;
+            } else if (column == 0 && ch == '*' && chNext == '*') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTDOC;
+            } else if (column == 0 && ch == '/' && chNext == '*') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_COMMENTDOC;
+            } else if (ch == '"') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_STRING;
+            } else if (ch == '\'') {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_CHARACTER;
+            } else if (ch == '?' && column == 0) {
+                ColourTo(styler, i-1, state);
+                state = SCE_C_PREPROCESSOR;
+            } else if (isCOBOLoperator(ch)) {
+                ColourTo(styler, i-1, state);
+                ColourTo(styler, i, SCE_C_OPERATOR);
+            }
+        } else if (state == SCE_C_IDENTIFIER) {
+            if (!isCOBOLwordchar(ch)) {
+                int lStateChange = classifyWordCOBOL(styler.GetStartSegment(), i - 1, keywordlists, styler, nContainment, &bAarea);
+
+                if(lStateChange != 0) {
+                    styler.SetLineState(currentLine, lStateChange);
+                    nContainment = lStateChange;
+                }
+
+                state = SCE_C_DEFAULT;
+                chNext = styler.SafeGetCharAt(i + 1);
+                if (ch == '"') {
+                    state = SCE_C_STRING;
+                } else if (ch == '\'') {
+                    state = SCE_C_CHARACTER;
+                } else if (isCOBOLoperator(ch)) {
+                    ColourTo(styler, i, SCE_C_OPERATOR);
+                }
+            }
+        } else {
+            if (state == SCE_C_PREPROCESSOR) {
+                if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
+                    ColourTo(styler, i-1, state);
+                    state = SCE_C_DEFAULT;
+                }
+            } else if (state == SCE_C_COMMENT) {
+                if (ch == '\r' || ch == '\n') {
+                    ColourTo(styler, i, state);
+                    state = SCE_C_DEFAULT;
+                }
+            } else if (state == SCE_C_COMMENTDOC) {
+                if (ch == '\r' || ch == '\n') {
+                    if (((i > styler.GetStartSegment() + 2) || (
+                        (initStyle == SCE_C_COMMENTDOC) &&
+                        (styler.GetStartSegment() == static_cast<Sci_PositionU>(startPos))))) {
+                            ColourTo(styler, i, state);
+                            state = SCE_C_DEFAULT;
+                    }
+                }
+            } else if (state == SCE_C_COMMENTLINE) {
+                if (ch == '\r' || ch == '\n') {
+                    ColourTo(styler, i-1, state);
+                    state = SCE_C_DEFAULT;
+                }
+            } else if (state == SCE_C_STRING) {
+                if (ch == '"') {
+                    ColourTo(styler, i, state);
+                    state = SCE_C_DEFAULT;
+                }
+            } else if (state == SCE_C_CHARACTER) {
+                if (ch == '\'') {
+                    ColourTo(styler, i, state);
+                    state = SCE_C_DEFAULT;
+                }
+            }
+        }
+        chPrev = ch;
+        bNewLine = bSetNewLine;
+		if (bNewLine)
+			{
+			bAarea = false;
+			}
+    }
+    ColourTo(styler, lengthDoc - 1, state);
+}
+
+static void FoldCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                            Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelPrev = lineCurrent > 0 ? styler.LevelAt(lineCurrent - 1) & SC_FOLDLEVELNUMBERMASK : 0xFFF;
+    char chNext = styler[startPos];
+
+    bool bNewLine = true;
+    bool bAarea = !isspacechar(chNext);
+	int column = 0;
+	bool bComment = false;
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+		++column;
+
+        if (bNewLine) {
+			column = 0;
+			bComment = (ch == '*' || ch == '/' || ch == '?');
+        }
+		if (column <= 1 && !bAarea) {
+			bAarea = !isspacechar(ch);
+			}
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (atEOL) {
+			int nContainment = styler.GetLineState(lineCurrent);
+            int lev = CountBits(nContainment & IN_FLAGS) | SC_FOLDLEVELBASE;
+			if (bAarea && !bComment)
+				--lev;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if ((bAarea) && (visibleChars > 0) && !(nContainment & NOT_HEADER) && !bComment)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+			if ((lev & SC_FOLDLEVELNUMBERMASK) <= (levelPrev & SC_FOLDLEVELNUMBERMASK)) {
+				// this level is at the same level or less than the previous line
+				// therefore these is nothing for the previous header to collapse, so remove the header
+				styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG);
+			}
+            levelPrev = lev;
+            visibleChars = 0;
+			bAarea = false;
+            bNewLine = true;
+            lineCurrent++;
+        } else {
+            bNewLine = false;
+        }
+
+
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+
+    // Fill in the real level of the next line, keeping the current flags as they will be filled in later
+    int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+    styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const COBOLWordListDesc[] = {
+    "A Keywords",
+    "B Keywords",
+    "Extended Keywords",
+    0
+};
+
+LexerModule lmCOBOL(SCLEX_COBOL, ColouriseCOBOLDoc, "COBOL", FoldCOBOLDoc, COBOLWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCPP.cxx b/scite-app/lexilla/lexers/LexCPP.cxx
new file mode 100644
index 0000000..050a4b9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCPP.cxx
@@ -0,0 +1,1825 @@
+// Scintilla source code edit control
+/** @file LexCPP.cxx
+ ** Lexer for C++, C, Java, and JavaScript.
+ ** Further folding features and configuration properties added by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <utility>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SparseState.h"
+#include "SubStyles.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+	// Use an unnamed namespace to protect the functions and classes from name conflicts
+
+constexpr bool IsSpaceEquiv(int state) noexcept {
+	return (state <= SCE_C_COMMENTDOC) ||
+		// including SCE_C_DEFAULT, SCE_C_COMMENT, SCE_C_COMMENTLINE
+		(state == SCE_C_COMMENTLINEDOC) || (state == SCE_C_COMMENTDOCKEYWORD) ||
+		(state == SCE_C_COMMENTDOCKEYWORDERROR);
+}
+
+// Preconditions: sc.currentPos points to a character after '+' or '-'.
+// The test for pos reaching 0 should be redundant,
+// and is in only for safety measures.
+// Limitation: this code will give the incorrect answer for code like
+// a = b+++/ptn/...
+// Putting a space between the '++' post-inc operator and the '+' binary op
+// fixes this, and is highly recommended for readability anyway.
+bool FollowsPostfixOperator(const StyleContext &sc, LexAccessor &styler) {
+	Sci_Position pos = sc.currentPos;
+	while (--pos > 0) {
+		const char ch = styler[pos];
+		if (ch == '+' || ch == '-') {
+			return styler[pos - 1] == ch;
+		}
+	}
+	return false;
+}
+
+bool followsReturnKeyword(const StyleContext &sc, LexAccessor &styler) {
+	// Don't look at styles, so no need to flush.
+	Sci_Position pos = sc.currentPos;
+	const Sci_Position currentLine = styler.GetLine(pos);
+	const Sci_Position lineStartPos = styler.LineStart(currentLine);
+	while (--pos > lineStartPos) {
+		const char ch = styler.SafeGetCharAt(pos);
+		if (ch != ' ' && ch != '\t') {
+			break;
+		}
+	}
+	const char *retBack = "nruter";
+	const char *s = retBack;
+	while (*s
+		&& pos >= lineStartPos
+		&& styler.SafeGetCharAt(pos) == *s) {
+		s++;
+		pos--;
+	}
+	return !*s;
+}
+
+constexpr bool IsSpaceOrTab(int ch) noexcept {
+	return ch == ' ' || ch == '\t';
+}
+
+bool OnlySpaceOrTab(const std::string &s) noexcept {
+	for (const char ch : s) {
+		if (!IsSpaceOrTab(ch))
+			return false;
+	}
+	return true;
+}
+
+std::vector<std::string> StringSplit(const std::string &text, int separator) {
+	std::vector<std::string> vs(text.empty() ? 0 : 1);
+	for (const char ch : text) {
+		if (ch == separator) {
+			vs.emplace_back();
+		} else {
+			vs.back() += ch;
+		}
+	}
+	return vs;
+}
+
+struct BracketPair {
+	std::vector<std::string>::iterator itBracket;
+	std::vector<std::string>::iterator itEndBracket;
+};
+
+BracketPair FindBracketPair(std::vector<std::string> &tokens) {
+	BracketPair bp;
+	std::vector<std::string>::iterator itTok = std::find(tokens.begin(), tokens.end(), "(");
+	bp.itBracket = tokens.end();
+	bp.itEndBracket = tokens.end();
+	if (itTok != tokens.end()) {
+		bp.itBracket = itTok;
+		size_t nest = 0;
+		while (itTok != tokens.end()) {
+			if (*itTok == "(") {
+				nest++;
+			} else if (*itTok == ")") {
+				nest--;
+				if (nest == 0) {
+					bp.itEndBracket = itTok;
+					return bp;
+				}
+			}
+			++itTok;
+		}
+	}
+	bp.itBracket = tokens.end();
+	return bp;
+}
+
+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)) {
+				break;
+			}
+			if (caseSensitive)
+				marker[i] = ch;
+			else
+				marker[i] = MakeLowerCase(ch);
+			i++;
+		}
+		marker[i] = '\0';
+		if (markerList.InList(marker)) {
+			sc.SetState(SCE_C_TASKMARKER|activity);
+		}
+	}
+}
+
+class EscapeSequence {
+	const CharacterSet setHexDigits = CharacterSet(CharacterSet::setDigits, "ABCDEFabcdef");
+	const CharacterSet setOctDigits = CharacterSet(CharacterSet::setNone, "01234567");
+	const CharacterSet setNoneNumeric;
+	const CharacterSet *escapeSetValid = nullptr;
+	int digitsLeft = 0;
+public:
+	EscapeSequence() = default;
+	void resetEscapeState(int nextChar) {
+		digitsLeft = 0;
+		escapeSetValid = &setNoneNumeric;
+		if (nextChar == 'U') {
+			digitsLeft = 9;
+			escapeSetValid = &setHexDigits;
+		} else if (nextChar == 'u') {
+			digitsLeft = 5;
+			escapeSetValid = &setHexDigits;
+		} else if (nextChar == 'x') {
+			digitsLeft = 5;
+			escapeSetValid = &setHexDigits;
+		} else if (setOctDigits.Contains(nextChar)) {
+			digitsLeft = 3;
+			escapeSetValid = &setOctDigits;
+		}
+	}
+	bool atEscapeEnd(int currChar) const {
+		return (digitsLeft <= 0) || !escapeSetValid->Contains(currChar);
+	}
+	void consumeDigit() noexcept {
+		digitsLeft--;
+	}
+};
+
+std::string GetRestOfLine(LexAccessor &styler, Sci_Position start, bool allowSpace) {
+	std::string restOfLine;
+	Sci_Position line = styler.GetLine(start);
+	Sci_Position pos = start;
+	Sci_Position endLine = styler.LineEnd(line);
+	char ch = styler.SafeGetCharAt(start, '\n');
+	while (pos < endLine) {
+		if (ch == '\\' && ((pos + 1) == endLine)) {
+			// Continuation line
+			line++;
+			pos = styler.LineStart(line);
+			endLine = styler.LineEnd(line);
+			ch = styler.SafeGetCharAt(pos, '\n');
+		} else {
+			const char chNext = styler.SafeGetCharAt(pos + 1, '\n');
+			if (ch == '/' && (chNext == '/' || chNext == '*'))
+				break;
+			if (allowSpace || (ch != ' ')) {
+				restOfLine += ch;
+			}
+			pos++;
+			ch = chNext;
+		}
+	}
+	return restOfLine;
+}
+
+constexpr bool IsStreamCommentStyle(int style) noexcept {
+	return style == SCE_C_COMMENT ||
+		style == SCE_C_COMMENTDOC ||
+		style == SCE_C_COMMENTDOCKEYWORD ||
+		style == SCE_C_COMMENTDOCKEYWORDERROR;
+}
+
+struct PPDefinition {
+	Sci_Position line;
+	std::string key;
+	std::string value;
+	bool isUndef;
+	std::string arguments;
+	PPDefinition(Sci_Position line_, const std::string &key_, const std::string &value_, bool isUndef_ = false, const std::string &arguments_="") :
+		line(line_), key(key_), value(value_), isUndef(isUndef_), arguments(arguments_) {
+	}
+};
+
+constexpr int inactiveFlag = 0x40;
+
+class LinePPState {
+	// Track the state of preprocessor conditionals to allow showing active and inactive
+	// code in different styles.
+	// Only works up to 31 levels of conditional nesting.
+
+	// state is a bit mask with 1 bit per level
+	// bit is 1 for level if section inactive, so any bits set = inactive style
+	int state = 0;
+	// ifTaken is a bit mask with 1 bit per level
+	// bit is 1 for level if some branch at this level has been taken
+	int ifTaken = 0;
+	// level is the nesting level of #if constructs
+	int level = -1;
+	static const int maximumNestingLevel = 31;
+	int maskLevel() const noexcept {
+		if (level >= 0) {
+			return 1 << level;
+		} else {
+			return 1;
+		}
+	}
+public:
+	LinePPState() noexcept {
+	}
+	bool ValidLevel() const noexcept {
+		return level >= 0 && level < maximumNestingLevel;
+	}
+	bool IsActive() const noexcept {
+		return state == 0;
+	}
+	bool IsInactive() const noexcept {
+		return state != 0;
+	}
+	int ActiveState() const noexcept {
+		return state ? inactiveFlag : 0;
+	}
+	bool CurrentIfTaken() const noexcept {
+		return (ifTaken & maskLevel()) != 0;
+	}
+	void StartSection(bool on) noexcept {
+		level++;
+		if (ValidLevel()) {
+			if (on) {
+				state &= ~maskLevel();
+				ifTaken |= maskLevel();
+			} else {
+				state |= maskLevel();
+				ifTaken &= ~maskLevel();
+			}
+		}
+	}
+	void EndSection() noexcept {
+		if (ValidLevel()) {
+			state &= ~maskLevel();
+			ifTaken &= ~maskLevel();
+		}
+		level--;
+	}
+	void InvertCurrentLevel() noexcept {
+		if (ValidLevel()) {
+			state ^= maskLevel();
+			ifTaken |= maskLevel();
+		}
+	}
+};
+
+// Hold the preprocessor state for each line seen.
+// Currently one entry per line but could become sparse with just one entry per preprocessor line.
+class PPStates {
+	std::vector<LinePPState> vlls;
+public:
+	LinePPState ForLine(Sci_Position line) const noexcept {
+		if ((line > 0) && (vlls.size() > static_cast<size_t>(line))) {
+			return vlls[line];
+		} else {
+			return LinePPState();
+		}
+	}
+	void Add(Sci_Position line, LinePPState lls) {
+		vlls.resize(line+1);
+		vlls[line] = lls;
+	}
+};
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerCPP
+struct OptionsCPP {
+	bool stylingWithinPreprocessor;
+	bool identifiersAllowDollars;
+	bool trackPreprocessor;
+	bool updatePreprocessor;
+	bool verbatimStringsAllowEscapes;
+	bool triplequotedStrings;
+	bool hashquotedStrings;
+	bool backQuotedStrings;
+	bool escapeSequence;
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldComment;
+	bool foldCommentMultiline;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldPreprocessor;
+	bool foldPreprocessorAtElse;
+	bool foldCompact;
+	bool foldAtElse;
+	OptionsCPP() {
+		stylingWithinPreprocessor = false;
+		identifiersAllowDollars = true;
+		trackPreprocessor = true;
+		updatePreprocessor = true;
+		verbatimStringsAllowEscapes = false;
+		triplequotedStrings = false;
+		hashquotedStrings = false;
+		backQuotedStrings = false;
+		escapeSequence = false;
+		fold = false;
+		foldSyntaxBased = true;
+		foldComment = false;
+		foldCommentMultiline = true;
+		foldCommentExplicit = true;
+		foldExplicitStart = "";
+		foldExplicitEnd = "";
+		foldExplicitAnywhere = false;
+		foldPreprocessor = false;
+		foldPreprocessorAtElse = false;
+		foldCompact = false;
+		foldAtElse = false;
+	}
+};
+
+const char *const cppWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Documentation comment keywords",
+            "Global classes and typedefs",
+            "Preprocessor definitions",
+            "Task marker and error marker keywords",
+            nullptr,
+};
+
+struct OptionSetCPP : public OptionSet<OptionsCPP> {
+	OptionSetCPP() {
+		DefineProperty("styling.within.preprocessor", &OptionsCPP::stylingWithinPreprocessor,
+			"For C++ code, determines whether all preprocessor code is styled in the "
+			"preprocessor style (0, the default) or only from the initial # to the end "
+			"of the command word(1).");
+
+		DefineProperty("lexer.cpp.allow.dollars", &OptionsCPP::identifiersAllowDollars,
+			"Set to 0 to disallow the '$' character in identifiers with the cpp lexer.");
+
+		DefineProperty("lexer.cpp.track.preprocessor", &OptionsCPP::trackPreprocessor,
+			"Set to 1 to interpret #if/#else/#endif to grey out code that is not active.");
+
+		DefineProperty("lexer.cpp.update.preprocessor", &OptionsCPP::updatePreprocessor,
+			"Set to 1 to update preprocessor definitions when #define found.");
+
+		DefineProperty("lexer.cpp.verbatim.strings.allow.escapes", &OptionsCPP::verbatimStringsAllowEscapes,
+			"Set to 1 to allow verbatim strings to contain escape sequences.");
+
+		DefineProperty("lexer.cpp.triplequoted.strings", &OptionsCPP::triplequotedStrings,
+			"Set to 1 to enable highlighting of triple-quoted strings.");
+
+		DefineProperty("lexer.cpp.hashquoted.strings", &OptionsCPP::hashquotedStrings,
+			"Set to 1 to enable highlighting of hash-quoted strings.");
+
+		DefineProperty("lexer.cpp.backquoted.strings", &OptionsCPP::backQuotedStrings,
+			"Set to 1 to enable highlighting of back-quoted raw strings .");
+
+		DefineProperty("lexer.cpp.escape.sequence", &OptionsCPP::escapeSequence,
+			"Set to 1 to enable highlighting of escape sequences in strings");
+
+		DefineProperty("fold", &OptionsCPP::fold);
+
+		DefineProperty("fold.cpp.syntax.based", &OptionsCPP::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.comment", &OptionsCPP::foldComment,
+			"This option enables folding multi-line comments and explicit fold points when using the C++ lexer. "
+			"Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} "
+			"at the end of a section that should fold.");
+
+		DefineProperty("fold.cpp.comment.multiline", &OptionsCPP::foldCommentMultiline,
+			"Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+
+		DefineProperty("fold.cpp.comment.explicit", &OptionsCPP::foldCommentExplicit,
+			"Set this property to 0 to disable folding explicit fold points when fold.comment=1.");
+
+		DefineProperty("fold.cpp.explicit.start", &OptionsCPP::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard //{.");
+
+		DefineProperty("fold.cpp.explicit.end", &OptionsCPP::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard //}.");
+
+		DefineProperty("fold.cpp.explicit.anywhere", &OptionsCPP::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("fold.cpp.preprocessor.at.else", &OptionsCPP::foldPreprocessorAtElse,
+			"This option enables folding on a preprocessor #else or #endif line of an #if statement.");
+
+		DefineProperty("fold.preprocessor", &OptionsCPP::foldPreprocessor,
+			"This option enables folding preprocessor directives when using the C++ lexer. "
+			"Includes C#'s explicit #region and #endregion folding directives.");
+
+		DefineProperty("fold.compact", &OptionsCPP::foldCompact);
+
+		DefineProperty("fold.at.else", &OptionsCPP::foldAtElse,
+			"This option enables C++ folding on a \"} else {\" line of an if statement.");
+
+		DefineWordListSets(cppWordLists);
+	}
+};
+
+const char styleSubable[] = {SCE_C_IDENTIFIER, SCE_C_COMMENTDOCKEYWORD, 0};
+
+LexicalClass lexicalClasses[] = {
+	// Lexer Cpp SCLEX_CPP SCE_C_:
+	0, "SCE_C_DEFAULT", "default", "White space",
+	1, "SCE_C_COMMENT", "comment", "Comment: /* */.",
+	2, "SCE_C_COMMENTLINE", "comment line", "Line Comment: //.",
+	3, "SCE_C_COMMENTDOC", "comment documentation", "Doc comment: block comments beginning with /** or /*!",
+	4, "SCE_C_NUMBER", "literal numeric", "Number",
+	5, "SCE_C_WORD", "keyword", "Keyword",
+	6, "SCE_C_STRING", "literal string", "Double quoted string",
+	7, "SCE_C_CHARACTER", "literal string character", "Single quoted string",
+	8, "SCE_C_UUID", "literal uuid", "UUIDs (only in IDL)",
+	9, "SCE_C_PREPROCESSOR", "preprocessor", "Preprocessor",
+	10, "SCE_C_OPERATOR", "operator", "Operators",
+	11, "SCE_C_IDENTIFIER", "identifier", "Identifiers",
+	12, "SCE_C_STRINGEOL", "error literal string", "End of line where string is not closed",
+	13, "SCE_C_VERBATIM", "literal string multiline raw", "Verbatim strings for C#",
+	14, "SCE_C_REGEX", "literal regex", "Regular expressions for JavaScript",
+	15, "SCE_C_COMMENTLINEDOC", "comment documentation line", "Doc Comment Line: line comments beginning with /// or //!.",
+	16, "SCE_C_WORD2", "identifier", "Keywords2",
+	17, "SCE_C_COMMENTDOCKEYWORD", "comment documentation keyword", "Comment keyword",
+	18, "SCE_C_COMMENTDOCKEYWORDERROR", "error comment documentation keyword", "Comment keyword error",
+	19, "SCE_C_GLOBALCLASS", "identifier", "Global class",
+	20, "SCE_C_STRINGRAW", "literal string multiline raw", "Raw strings for C++0x",
+	21, "SCE_C_TRIPLEVERBATIM", "literal string multiline raw", "Triple-quoted strings for Vala",
+	22, "SCE_C_HASHQUOTEDSTRING", "literal string", "Hash-quoted strings for Pike",
+	23, "SCE_C_PREPROCESSORCOMMENT", "comment preprocessor", "Preprocessor stream comment",
+	24, "SCE_C_PREPROCESSORCOMMENTDOC", "comment preprocessor documentation", "Preprocessor stream doc comment",
+	25, "SCE_C_USERLITERAL", "literal", "User defined literals",
+	26, "SCE_C_TASKMARKER", "comment taskmarker", "Task Marker",
+	27, "SCE_C_ESCAPESEQUENCE", "literal string escapesequence", "Escape sequence",
+};
+
+const int sizeLexicalClasses = static_cast<int>(std::size(lexicalClasses));
+
+}
+
+class LexerCPP : public ILexer5 {
+	bool caseSensitive;
+	CharacterSet setWord;
+	CharacterSet setNegationOp;
+	CharacterSet setAddOp;
+	CharacterSet setMultOp;
+	CharacterSet setRelOp;
+	CharacterSet setLogicalOp;
+	CharacterSet setWordStart;
+	PPStates vlls;
+	std::vector<PPDefinition> ppDefineHistory;
+	WordList keywords;
+	WordList keywords2;
+	WordList keywords3;
+	WordList keywords4;
+	WordList ppDefinitions;
+	WordList markerList;
+	struct SymbolValue {
+		std::string value;
+		std::string arguments;
+		SymbolValue() noexcept = default;
+		SymbolValue(const std::string &value_, const std::string &arguments_) : value(value_), arguments(arguments_) {
+		}
+		SymbolValue &operator = (const std::string &value_) {
+			value = value_;
+			arguments.clear();
+			return *this;
+		}
+		bool IsMacro() const noexcept {
+			return !arguments.empty();
+		}
+	};
+	typedef std::map<std::string, SymbolValue> SymbolTable;
+	SymbolTable preprocessorDefinitionsStart;
+	OptionsCPP options;
+	OptionSetCPP osCPP;
+	EscapeSequence escapeSeq;
+	SparseState<std::string> rawStringTerminators;
+	enum { ssIdentifier, ssDocKeyword };
+	SubStyles subStyles;
+	std::string returnBuffer;
+public:
+	explicit LexerCPP(bool caseSensitive_) :
+		caseSensitive(caseSensitive_),
+		setWord(CharacterSet::setAlphaNum, "._", true),
+		setNegationOp(CharacterSet::setNone, "!"),
+		setAddOp(CharacterSet::setNone, "+-"),
+		setMultOp(CharacterSet::setNone, "*/%"),
+		setRelOp(CharacterSet::setNone, "=!<>"),
+		setLogicalOp(CharacterSet::setNone, "|&"),
+		subStyles(styleSubable, 0x80, 0x40, inactiveFlag) {
+	}
+	// Deleted so LexerCPP objects can not be copied.
+	LexerCPP(const LexerCPP &) = delete;
+	LexerCPP(LexerCPP &&) = delete;
+	void operator=(const LexerCPP &) = delete;
+	void operator=(LexerCPP &&) = delete;
+	virtual ~LexerCPP() {
+	}
+	void SCI_METHOD Release() noexcept override {
+		delete this;
+	}
+	int SCI_METHOD Version() const noexcept override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osCPP.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osCPP.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osCPP.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osCPP.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) noexcept override {
+		return nullptr;
+	}
+
+	int SCI_METHOD LineEndTypesSupported() noexcept override {
+		return SC_LINE_END_TYPE_UNICODE;
+	}
+
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		const int styleBase = subStyles.BaseStyle(MaskActive(subStyle));
+		const int inactive = subStyle & inactiveFlag;
+		return styleBase | inactive;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) noexcept override {
+		return MaskActive(style);
+	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() noexcept override {
+		return inactiveFlag;
+	}
+	const char * SCI_METHOD GetSubStyleBases() noexcept override {
+		return styleSubable;
+	}
+	int SCI_METHOD NamedStyles() override {
+		return std::max(subStyles.LastAllocated() + 1,
+			sizeLexicalClasses) +
+			inactiveFlag;
+	}
+	const char * SCI_METHOD NameOfStyle(int style) override {
+		if (style >= NamedStyles())
+			return "";
+		if (style < sizeLexicalClasses)
+			return lexicalClasses[style].name;
+		// TODO: inactive and substyles
+		return "";
+	}
+	const char * SCI_METHOD TagsOfStyle(int style) override {
+		if (style >= NamedStyles())
+			return "Excess";
+		returnBuffer.clear();
+		const int firstSubStyle = subStyles.FirstAllocated();
+		if (firstSubStyle >= 0) {
+			const int lastSubStyle = subStyles.LastAllocated();
+			if (((style >= firstSubStyle) && (style <= (lastSubStyle))) ||
+				((style >= firstSubStyle + inactiveFlag) && (style <= (lastSubStyle + inactiveFlag)))) {
+				int styleActive = style;
+				if (style > lastSubStyle) {
+					returnBuffer = "inactive ";
+					styleActive -= inactiveFlag;
+				}
+				const int styleMain = StyleFromSubStyle(styleActive);
+				returnBuffer += lexicalClasses[styleMain].tags;
+				return returnBuffer.c_str();
+			}
+		}
+		if (style < sizeLexicalClasses)
+			return lexicalClasses[style].tags;
+		if (style >= inactiveFlag) {
+			returnBuffer = "inactive ";
+			const int styleActive = style - inactiveFlag;
+			if (styleActive < sizeLexicalClasses)
+				returnBuffer += lexicalClasses[styleActive].tags;
+			else
+				returnBuffer = "";
+			return returnBuffer.c_str();
+		}
+		return "";
+	}
+	const char * SCI_METHOD DescriptionOfStyle(int style) override {
+		if (style >= NamedStyles())
+			return "";
+		if (style < sizeLexicalClasses)
+			return lexicalClasses[style].description;
+		// TODO: inactive and substyles
+		return "";
+	}
+
+	// ILexer5 methods
+	const char * SCI_METHOD GetName() override {
+		return caseSensitive ? "cpp" : "cppnocase";
+	}
+	int SCI_METHOD  GetIdentifier() override {
+		return caseSensitive ? SCLEX_CPP : SCLEX_CPPNOCASE;
+	}
+	const char * SCI_METHOD PropertyGet(const char *key) override;
+
+	static ILexer5 *LexerFactoryCPP() {
+		return new LexerCPP(true);
+	}
+	static ILexer5 *LexerFactoryCPPInsensitive() {
+		return new LexerCPP(false);
+	}
+	constexpr static int MaskActive(int style) noexcept {
+		return style & ~inactiveFlag;
+	}
+	void EvaluateTokens(std::vector<std::string> &tokens, const SymbolTable &preprocessorDefinitions);
+	std::vector<std::string> Tokenize(const std::string &expr) const;
+	bool EvaluateExpression(const std::string &expr, const SymbolTable &preprocessorDefinitions);
+};
+
+Sci_Position SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val) {
+	if (osCPP.PropertySet(&options, key, val)) {
+		if (strcmp(key, "lexer.cpp.allow.dollars") == 0) {
+			setWord = CharacterSet(CharacterSet::setAlphaNum, "._", true);
+			if (options.identifiersAllowDollars) {
+				setWord.Add('$');
+			}
+		}
+		return 0;
+	}
+	return -1;
+}
+
+const char * SCI_METHOD LexerCPP::PropertyGet(const char *key) {
+	return osCPP.PropertyGet(key);
+}
+
+Sci_Position SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) {
+	WordList *wordListN = nullptr;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	case 2:
+		wordListN = &keywords3;
+		break;
+	case 3:
+		wordListN = &keywords4;
+		break;
+	case 4:
+		wordListN = &ppDefinitions;
+		break;
+	case 5:
+		wordListN = &markerList;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+			if (n == 4) {
+				// Rebuild preprocessorDefinitions
+				preprocessorDefinitionsStart.clear();
+				for (int nDefinition = 0; nDefinition < ppDefinitions.Length(); nDefinition++) {
+					const char *cpDefinition = ppDefinitions.WordAt(nDefinition);
+					const char *cpEquals = strchr(cpDefinition, '=');
+					if (cpEquals) {
+						std::string name(cpDefinition, cpEquals - cpDefinition);
+						std::string val(cpEquals+1);
+						const size_t bracket = name.find('(');
+						const size_t bracketEnd = name.find(')');
+						if ((bracket != std::string::npos) && (bracketEnd != std::string::npos)) {
+							// Macro
+							std::string args = name.substr(bracket + 1, bracketEnd - bracket - 1);
+							name = name.substr(0, bracket);
+							preprocessorDefinitionsStart[name] = SymbolValue(val, args);
+						} else {
+							preprocessorDefinitionsStart[name] = val;
+						}
+					} else {
+						std::string name(cpDefinition);
+						std::string val("1");
+						preprocessorDefinitionsStart[name] = val;
+					}
+				}
+			}
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-");
+	CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+
+	CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]");
+
+	setWordStart = CharacterSet(CharacterSet::setAlpha, "_", true);
+
+	CharacterSet setInvalidRawFirst(CharacterSet::setNone, " )\\\t\v\f\n");
+
+	if (options.identifiersAllowDollars) {
+		setWordStart.Add('$');
+	}
+
+	int chPrevNonWhite = ' ';
+	int visibleChars = 0;
+	bool lastWordWasUUID = false;
+	int styleBeforeDCKeyword = SCE_C_DEFAULT;
+	int styleBeforeTaskMarker = SCE_C_DEFAULT;
+	bool continuationLine = false;
+	bool isIncludePreprocessor = false;
+	bool isStringInPreprocessor = false;
+	bool inRERange = false;
+	bool seenDocKeyBrace = false;
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if ((MaskActive(initStyle) == SCE_C_PREPROCESSOR) ||
+      (MaskActive(initStyle) == SCE_C_COMMENTLINE) ||
+      (MaskActive(initStyle) == SCE_C_COMMENTLINEDOC)) {
+		// Set continuationLine if last character of previous line is '\'
+		if (lineCurrent > 0) {
+			const Sci_Position endLinePrevious = styler.LineEnd(lineCurrent - 1);
+			if (endLinePrevious > 0) {
+				continuationLine = styler.SafeGetCharAt(endLinePrevious-1) == '\\';
+			}
+		}
+	}
+
+	// look back to set chPrevNonWhite properly for better regex colouring
+	if (startPos > 0) {
+		Sci_Position back = startPos;
+		while (--back && IsSpaceEquiv(MaskActive(styler.StyleAt(back))))
+			;
+		if (MaskActive(styler.StyleAt(back)) == SCE_C_OPERATOR) {
+			chPrevNonWhite = styler.SafeGetCharAt(back);
+		}
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	LinePPState preproc = vlls.ForLine(lineCurrent);
+
+	bool definitionsChanged = false;
+
+	// Truncate ppDefineHistory before current line
+
+	if (!options.updatePreprocessor)
+		ppDefineHistory.clear();
+
+	std::vector<PPDefinition>::iterator itInvalid = std::find_if(ppDefineHistory.begin(), ppDefineHistory.end(),
+		[lineCurrent](const PPDefinition &p) noexcept { return p.line >= lineCurrent; });
+	if (itInvalid != ppDefineHistory.end()) {
+		ppDefineHistory.erase(itInvalid, ppDefineHistory.end());
+		definitionsChanged = true;
+	}
+
+	SymbolTable preprocessorDefinitions = preprocessorDefinitionsStart;
+	for (const PPDefinition &ppDef : ppDefineHistory) {
+		if (ppDef.isUndef)
+			preprocessorDefinitions.erase(ppDef.key);
+		else
+			preprocessorDefinitions[ppDef.key] = SymbolValue(ppDef.value, ppDef.arguments);
+	}
+
+	std::string rawStringTerminator = rawStringTerminators.ValueAt(lineCurrent-1);
+	SparseState<std::string> rawSTNew(lineCurrent);
+
+	int activitySet = preproc.ActiveState();
+
+	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_C_IDENTIFIER);
+	const WordClassifier &classifierDocKeyWords = subStyles.Classifier(SCE_C_COMMENTDOCKEYWORD);
+
+	Sci_PositionU lineEndNext = styler.LineEnd(lineCurrent);
+
+	for (; sc.More();) {
+
+		if (sc.atLineStart) {
+			// Using MaskActive() is not needed in the following statement.
+			// Inside inactive preprocessor declaration, state will be reset anyway at the end of this block.
+			if ((sc.state == SCE_C_STRING) || (sc.state == SCE_C_CHARACTER)) {
+				// Prevent SCE_C_STRINGEOL from leaking back to previous line which
+				// ends with a line continuation by locking in the state up to this position.
+				sc.SetState(sc.state);
+			}
+			if ((MaskActive(sc.state) == SCE_C_PREPROCESSOR) && (!continuationLine)) {
+				sc.SetState(SCE_C_DEFAULT|activitySet);
+			}
+			// Reset states to beginning of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+			lastWordWasUUID = false;
+			isIncludePreprocessor = false;
+			inRERange = false;
+			if (preproc.IsInactive()) {
+				activitySet = inactiveFlag;
+				sc.SetState(sc.state | activitySet);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			lineCurrent++;
+			lineEndNext = styler.LineEnd(lineCurrent);
+			vlls.Add(lineCurrent, preproc);
+			if (rawStringTerminator != "") {
+				rawSTNew.Set(lineCurrent-1, rawStringTerminator);
+			}
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if ((sc.currentPos+1) >= lineEndNext) {
+				lineCurrent++;
+				lineEndNext = styler.LineEnd(lineCurrent);
+				vlls.Add(lineCurrent, preproc);
+				if (rawStringTerminator != "") {
+					rawSTNew.Set(lineCurrent-1, rawStringTerminator);
+				}
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					// Even in UTF-8, \r and \n are separate
+					sc.Forward();
+				}
+				continuationLine = true;
+				sc.Forward();
+				continue;
+			}
+		}
+
+		const bool atLineEndBeforeSwitch = sc.atLineEnd;
+
+		// Determine if the current state should terminate.
+		switch (MaskActive(sc.state)) {
+			case SCE_C_OPERATOR:
+				sc.SetState(SCE_C_DEFAULT|activitySet);
+				break;
+			case SCE_C_NUMBER:
+				// We accept almost anything because of hex. and number suffixes
+				if (sc.ch == '_') {
+					sc.ChangeState(SCE_C_USERLITERAL|activitySet);
+				} else if (!(setWord.Contains(sc.ch)
+				   || (sc.ch == '\'')
+				   || ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E' ||
+				                                          sc.chPrev == 'p' || sc.chPrev == 'P')))) {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_C_USERLITERAL:
+				if (!(setWord.Contains(sc.ch)))
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				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.ChangeState(SCE_C_WORD|activitySet);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_C_WORD2|activitySet);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_C_GLOBALCLASS|activitySet);
+					} else {
+						int subStyle = classifierIdentifiers.ValueFor(s);
+						if (subStyle >= 0) {
+							sc.ChangeState(subStyle|activitySet);
+						}
+					}
+					const bool literalString = sc.ch == '\"';
+					if (literalString || sc.ch == '\'') {
+						size_t lenS = strlen(s);
+						const bool raw = literalString && sc.chPrev == 'R' && !setInvalidRawFirst.Contains(sc.chNext);
+						if (raw)
+							s[lenS--] = '\0';
+						const bool valid =
+							(lenS == 0) ||
+							((lenS == 1) && ((s[0] == 'L') || (s[0] == 'u') || (s[0] == 'U'))) ||
+							((lenS == 2) && literalString && (s[0] == 'u') && (s[1] == '8'));
+						if (valid) {
+							if (literalString) {
+								if (raw) {
+									// Set the style of the string prefix to SCE_C_STRINGRAW but then change to
+									// SCE_C_DEFAULT as that allows the raw string start code to run.
+									sc.ChangeState(SCE_C_STRINGRAW|activitySet);
+									sc.SetState(SCE_C_DEFAULT|activitySet);
+								} else {
+									sc.ChangeState(SCE_C_STRING|activitySet);
+								}
+							} else {
+								sc.ChangeState(SCE_C_CHARACTER|activitySet);
+							}
+						} else {
+							sc.SetState(SCE_C_DEFAULT | activitySet);
+						}
+					} else {
+						sc.SetState(SCE_C_DEFAULT|activitySet);
+					}
+				}
+				break;
+			case SCE_C_PREPROCESSOR:
+				if (options.stylingWithinPreprocessor) {
+					if (IsASpace(sc.ch) || (sc.ch == '(')) {
+						sc.SetState(SCE_C_DEFAULT|activitySet);
+					}
+				} else if (isStringInPreprocessor && (sc.Match('>') || sc.Match('\"') || sc.atLineEnd)) {
+					isStringInPreprocessor = false;
+				} else if (!isStringInPreprocessor) {
+					if ((isIncludePreprocessor && sc.Match('<')) || sc.Match('\"')) {
+						isStringInPreprocessor = true;
+					} else if (sc.Match('/', '*')) {
+						if (sc.Match("/**") || sc.Match("/*!")) {
+							sc.SetState(SCE_C_PREPROCESSORCOMMENTDOC|activitySet);
+						} else {
+							sc.SetState(SCE_C_PREPROCESSORCOMMENT|activitySet);
+						}
+						sc.Forward();	// Eat the *
+					} else if (sc.Match('/', '/')) {
+						sc.SetState(SCE_C_DEFAULT|activitySet);
+					}
+				}
+				break;
+			case SCE_C_PREPROCESSORCOMMENT:
+			case SCE_C_PREPROCESSORCOMMENTDOC:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_PREPROCESSOR|activitySet);
+					continue;	// Without advancing in case of '\'.
+				}
+				break;
+			case SCE_C_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+				} else {
+					styleBeforeTaskMarker = SCE_C_COMMENT;
+					highlightTaskMarker(sc, styler, activitySet, markerList, caseSensitive);
+				}
+				break;
+			case SCE_C_COMMENTDOC:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_C_COMMENTDOC;
+						sc.SetState(SCE_C_COMMENTDOCKEYWORD|activitySet);
+					}
+				} else if ((sc.ch == '<' && sc.chNext != '/')
+							|| (sc.ch == '/' && sc.chPrev == '<')) { // XML comment style
+					styleBeforeDCKeyword = SCE_C_COMMENTDOC;
+					sc.ForwardSetState(SCE_C_COMMENTDOCKEYWORD | activitySet);
+				}
+				break;
+			case SCE_C_COMMENTLINE:
+				if (sc.atLineStart && !continuationLine) {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				} else {
+					styleBeforeTaskMarker = SCE_C_COMMENTLINE;
+					highlightTaskMarker(sc, styler, activitySet, markerList, caseSensitive);
+				}
+				break;
+			case SCE_C_COMMENTLINEDOC:
+				if (sc.atLineStart && !continuationLine) {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_C_COMMENTLINEDOC;
+						sc.SetState(SCE_C_COMMENTDOCKEYWORD|activitySet);
+					}
+				} else if ((sc.ch == '<' && sc.chNext != '/')
+							|| (sc.ch == '/' && sc.chPrev == '<')) { // XML comment style
+					styleBeforeDCKeyword = SCE_C_COMMENTLINEDOC;
+					sc.ForwardSetState(SCE_C_COMMENTDOCKEYWORD | activitySet);
+				}
+				break;
+			case SCE_C_COMMENTDOCKEYWORD:
+				if ((styleBeforeDCKeyword == SCE_C_COMMENTDOC) && sc.Match('*', '/')) {
+					sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR);
+					sc.Forward();
+					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+					seenDocKeyBrace = false;
+				} else if (sc.ch == '[' || sc.ch == '{') {
+					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)) {
+						int subStyleCDKW = classifierDocKeyWords.ValueFor(s+1);
+						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)) {
+						int subStyleCDKW = classifierDocKeyWords.ValueFor(s + 1);
+						if (subStyleCDKW >= 0) {
+							sc.ChangeState(subStyleCDKW | activitySet);
+						} else {
+							sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR | activitySet);
+						}
+					}
+					sc.SetState(styleBeforeDCKeyword | activitySet);
+					seenDocKeyBrace = false;
+				}
+				break;
+			case SCE_C_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_C_STRINGEOL|activitySet);
+				} else if (isIncludePreprocessor) {
+					if (sc.ch == '>') {
+						sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+						isIncludePreprocessor = false;
+					}
+				} else if (sc.ch == '\\') {
+					if (options.escapeSequence) {
+						sc.SetState(SCE_C_ESCAPESEQUENCE|activitySet);
+						escapeSeq.resetEscapeState(sc.chNext);
+					}
+					sc.Forward(); // Skip all characters after the backslash
+				} else if (sc.ch == '\"') {
+					if (sc.chNext == '_') {
+						sc.ChangeState(SCE_C_USERLITERAL|activitySet);
+					} else {
+						sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+					}
+				}
+				break;
+			case SCE_C_ESCAPESEQUENCE:
+				escapeSeq.consumeDigit();
+				if (!escapeSeq.atEscapeEnd(sc.ch)) {
+					break;
+				}
+				if (sc.ch == '"') {
+					sc.SetState(SCE_C_STRING|activitySet);
+					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+				} else if (sc.ch == '\\') {
+					escapeSeq.resetEscapeState(sc.chNext);
+					sc.Forward();
+				} else {
+					sc.SetState(SCE_C_STRING|activitySet);
+					if (sc.atLineEnd) {
+						sc.ChangeState(SCE_C_STRINGEOL|activitySet);
+					}
+				}
+				break;
+			case SCE_C_HASHQUOTEDSTRING:
+				if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_C_STRINGRAW:
+				if (sc.Match(rawStringTerminator.c_str())) {
+					for (size_t termPos=rawStringTerminator.size(); termPos; termPos--)
+						sc.Forward();
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+					rawStringTerminator = "";
+				}
+				break;
+			case SCE_C_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_C_STRINGEOL|activitySet);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					if (sc.chNext == '_') {
+						sc.ChangeState(SCE_C_USERLITERAL|activitySet);
+					} else {
+						sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+					}
+				}
+				break;
+			case SCE_C_REGEX:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				} else if (!inRERange && sc.ch == '/') {
+					sc.Forward();
+					while (IsLowerCase(sc.ch))
+						sc.Forward();    // gobble regex flags
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				} else if (sc.ch == '\\' && ((sc.currentPos+1) < lineEndNext)) {
+					// Gobble up the escaped character
+					sc.Forward();
+				} else if (sc.ch == '[') {
+					inRERange = true;
+				} else if (sc.ch == ']') {
+					inRERange = false;
+				}
+				break;
+			case SCE_C_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_C_VERBATIM:
+				if (options.verbatimStringsAllowEscapes && (sc.ch == '\\')) {
+					sc.Forward(); // Skip all characters after the backslash
+				} else if (sc.ch == '\"') {
+					if (sc.chNext == '\"') {
+						sc.Forward();
+					} else {
+						sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
+					}
+				}
+				break;
+			case SCE_C_TRIPLEVERBATIM:
+				if (sc.Match(R"(""")")) {
+					while (sc.Match('"')) {
+						sc.Forward();
+					}
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_C_UUID:
+				if (sc.atLineEnd || sc.ch == ')') {
+					sc.SetState(SCE_C_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_C_TASKMARKER:
+				if (isoperator(sc.ch) || IsASpace(sc.ch)) {
+					sc.SetState(styleBeforeTaskMarker|activitySet);
+					styleBeforeTaskMarker = SCE_C_DEFAULT;
+				}
+		}
+
+		if (sc.atLineEnd && !atLineEndBeforeSwitch) {
+			// State exit processing consumed characters up to end of line.
+			lineCurrent++;
+			lineEndNext = styler.LineEnd(lineCurrent);
+			vlls.Add(lineCurrent, preproc);
+		}
+
+		const bool atLineEndBeforeStateEntry = sc.atLineEnd;
+
+		// Determine if a new state should be entered.
+		if (MaskActive(sc.state) == SCE_C_DEFAULT) {
+			if (sc.Match('@', '\"')) {
+				sc.SetState(SCE_C_VERBATIM|activitySet);
+				sc.Forward();
+			} else if (options.triplequotedStrings && sc.Match(R"(""")")) {
+				sc.SetState(SCE_C_TRIPLEVERBATIM|activitySet);
+				sc.Forward(2);
+			} else if (options.hashquotedStrings && sc.Match('#', '\"')) {
+				sc.SetState(SCE_C_HASHQUOTEDSTRING|activitySet);
+				sc.Forward();
+			} else if (options.backQuotedStrings && sc.Match('`')) {
+				sc.SetState(SCE_C_STRINGRAW|activitySet);
+				rawStringTerminator = "`";
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_C_UUID|activitySet);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_C_NUMBER|activitySet);
+				}
+			} else if (!sc.atLineEnd && (setWordStart.Contains(sc.ch) || (sc.ch == '@'))) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_C_UUID|activitySet);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_C_IDENTIFIER|activitySet);
+				}
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTDOC|activitySet);
+				} else {
+					sc.SetState(SCE_C_COMMENT|activitySet);
+				}
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
+					// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_C_COMMENTLINEDOC|activitySet);
+				else
+					sc.SetState(SCE_C_COMMENTLINE|activitySet);
+			} else if (sc.ch == '/'
+				   && (setOKBeforeRE.Contains(chPrevNonWhite)
+				       || followsReturnKeyword(sc, styler))
+				   && (!setCouldBePostOp.Contains(chPrevNonWhite)
+				       || !FollowsPostfixOperator(sc, styler))) {
+				sc.SetState(SCE_C_REGEX|activitySet);	// JavaScript's RegEx
+				inRERange = false;
+			} else if (sc.ch == '\"') {
+				if (sc.chPrev == 'R') {
+					styler.Flush();
+					if (MaskActive(styler.StyleAt(sc.currentPos - 1)) == SCE_C_STRINGRAW) {
+						sc.SetState(SCE_C_STRINGRAW|activitySet);
+						rawStringTerminator = ")";
+						for (Sci_Position termPos = sc.currentPos + 1;; termPos++) {
+							const char chTerminator = styler.SafeGetCharAt(termPos, '(');
+							if (chTerminator == '(')
+								break;
+							rawStringTerminator += chTerminator;
+						}
+						rawStringTerminator += '\"';
+					} else {
+						sc.SetState(SCE_C_STRING|activitySet);
+					}
+				} else {
+					sc.SetState(SCE_C_STRING|activitySet);
+				}
+				isIncludePreprocessor = false;	// ensure that '>' won't end the string
+			} else if (isIncludePreprocessor && sc.ch == '<') {
+				sc.SetState(SCE_C_STRING|activitySet);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_C_CHARACTER|activitySet);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_C_PREPROCESSOR|activitySet);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.Match("include")) {
+					isIncludePreprocessor = true;
+				} else {
+					if (options.trackPreprocessor && IsAlphaNumeric(sc.ch)) {
+						// If #if is nested too deeply (>31 levels) the active/inactive appearance
+						// will stop reflecting the code.
+						if (sc.Match("ifdef") || sc.Match("ifndef")) {
+							const bool isIfDef = sc.Match("ifdef");
+							const int startRest = isIfDef ? 5 : 6;
+							std::string restOfLine = GetRestOfLine(styler, sc.currentPos + startRest + 1, false);
+							bool foundDef = preprocessorDefinitions.find(restOfLine) != preprocessorDefinitions.end();
+							preproc.StartSection(isIfDef == foundDef);
+						} else if (sc.Match("if")) {
+							std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 2, true);
+							const bool ifGood = EvaluateExpression(restOfLine, preprocessorDefinitions);
+							preproc.StartSection(ifGood);
+						} else if (sc.Match("else")) {
+							// #else is shown as active if either preceding or following section is active
+							// as that means that it contributed to the result.
+							if (preproc.ValidLevel()) {
+								// If #else has no corresponding #if then take no action as invalid
+								if (!preproc.CurrentIfTaken()) {
+									// Inactive, may become active if parent scope active
+									assert(sc.state == (SCE_C_PREPROCESSOR | inactiveFlag));
+									preproc.InvertCurrentLevel();
+									activitySet = preproc.ActiveState();
+									// If following is active then show "else" as active
+									if (!activitySet)
+										sc.ChangeState(SCE_C_PREPROCESSOR);
+								} else if (preproc.IsActive()) {
+									// Active -> inactive
+									assert(sc.state == SCE_C_PREPROCESSOR);
+									preproc.InvertCurrentLevel();
+									activitySet = preproc.ActiveState();
+									// Continue to show "else" as active as it ends active section.
+								}
+							}
+						} else if (sc.Match("elif")) {
+							// Ensure only one chosen out of #if .. #elif .. #elif .. #else .. #endif
+							// #elif is shown as active if either preceding or following section is active
+							// as that means that it contributed to the result.
+							if (preproc.ValidLevel()) {
+								if (!preproc.CurrentIfTaken()) {
+									// Inactive, if expression true then may become active if parent scope active
+									assert(sc.state == (SCE_C_PREPROCESSOR | inactiveFlag));
+									// Similar to #if
+									std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 4, true);
+									const bool ifGood = EvaluateExpression(restOfLine, preprocessorDefinitions);
+									if (ifGood) {
+										preproc.InvertCurrentLevel();
+										activitySet = preproc.ActiveState();
+										if (!activitySet)
+											sc.ChangeState(SCE_C_PREPROCESSOR);
+									}
+								} else if (preproc.IsActive()) {
+									// Active -> inactive
+									assert(sc.state == SCE_C_PREPROCESSOR);
+									preproc.InvertCurrentLevel();
+									activitySet = preproc.ActiveState();
+									// Continue to show "elif" as active as it ends active section.
+								}
+							}
+						} else if (sc.Match("endif")) {
+							preproc.EndSection();
+							activitySet = preproc.ActiveState();
+							sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
+						} else if (sc.Match("define")) {
+							if (options.updatePreprocessor && preproc.IsActive()) {
+								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 6, true);
+								size_t startName = 0;
+								while ((startName < restOfLine.length()) && IsSpaceOrTab(restOfLine[startName]))
+									startName++;
+								size_t endName = startName;
+								while ((endName < restOfLine.length()) && setWord.Contains(restOfLine[endName]))
+									endName++;
+								std::string key = restOfLine.substr(startName, endName-startName);
+								if ((endName < restOfLine.length()) && (restOfLine.at(endName) == '(')) {
+									// Macro
+									size_t endArgs = endName;
+									while ((endArgs < restOfLine.length()) && (restOfLine[endArgs] != ')'))
+										endArgs++;
+									std::string args = restOfLine.substr(endName + 1, endArgs - endName - 1);
+									size_t startValue = endArgs+1;
+									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
+										startValue++;
+									std::string value;
+									if (startValue < restOfLine.length())
+										value = restOfLine.substr(startValue);
+									preprocessorDefinitions[key] = SymbolValue(value, args);
+									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, value, false, args));
+									definitionsChanged = true;
+								} else {
+									// Value
+									size_t startValue = endName;
+									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
+										startValue++;
+									std::string value = restOfLine.substr(startValue);
+									if (OnlySpaceOrTab(value))
+										value = "1";	// No value defaults to 1
+									preprocessorDefinitions[key] = value;
+									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, value));
+									definitionsChanged = true;
+								}
+							}
+						} else if (sc.Match("undef")) {
+							if (options.updatePreprocessor && preproc.IsActive()) {
+								const std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 5, false);
+								std::vector<std::string> tokens = Tokenize(restOfLine);
+								if (tokens.size() >= 1) {
+									const std::string key = tokens[0];
+									preprocessorDefinitions.erase(key);
+									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, "", true));
+									definitionsChanged = true;
+								}
+							}
+						}
+					}
+				}
+			} else if (isoperator(sc.ch)) {
+				sc.SetState(SCE_C_OPERATOR|activitySet);
+			}
+		}
+
+		if (sc.atLineEnd && !atLineEndBeforeStateEntry) {
+			// State entry processing consumed characters up to end of line.
+			lineCurrent++;
+			lineEndNext = styler.LineEnd(lineCurrent);
+			vlls.Add(lineCurrent, preproc);
+		}
+
+		if (!IsASpace(sc.ch) && !IsSpaceEquiv(MaskActive(sc.state))) {
+			chPrevNonWhite = sc.ch;
+			visibleChars++;
+		}
+		continuationLine = false;
+		sc.Forward();
+	}
+	const bool rawStringsChanged = rawStringTerminators.Merge(rawSTNew, lineCurrent);
+	if (definitionsChanged || rawStringsChanged)
+		styler.ChangeLexerState(startPos, startPos + length);
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+
+void SCI_METHOD LexerCPP::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	const Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	bool inLineComment = false;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	Sci_PositionU lineStartNext = styler.LineStart(lineCurrent+1);
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = MaskActive(styler.StyleAt(startPos));
+	int style = MaskActive(initStyle);
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		const char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		const int stylePrev = style;
+		style = styleNext;
+		styleNext = MaskActive(styler.StyleAt(i + 1));
+		const bool atEOL = i == (lineStartNext-1);
+		if ((style == SCE_C_COMMENTLINE) || (style == SCE_C_COMMENTLINEDOC))
+			inLineComment = true;
+		if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style) && !inLineComment) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (options.foldComment && options.foldCommentExplicit && ((style == SCE_C_COMMENTLINE) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+					levelNext++;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+					levelNext--;
+				}
+			} else {
+				if ((ch == '/') && (chNext == '/')) {
+					const char chNext2 = styler.SafeGetCharAt(i + 2);
+					if (chNext2 == '{') {
+						levelNext++;
+					} else if (chNext2 == '}') {
+						levelNext--;
+					}
+				}
+			}
+		}
+		if (options.foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
+			if (ch == '#') {
+				Sci_PositionU j = i + 1;
+				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region") || styler.Match(j, "if")) {
+					levelNext++;
+				} else if (styler.Match(j, "end")) {
+					levelNext--;
+				}
+
+				if (options.foldPreprocessorAtElse && (styler.Match(j, "else") || styler.Match(j, "elif"))) {
+					levelMinCurrent--;
+				}
+			}
+		}
+		if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) {
+			if (ch == '{' || ch == '[' || ch == '(') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (options.foldAtElse && levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}' || ch == ']' || ch == ')') {
+				levelNext--;
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if ((options.foldSyntaxBased && options.foldAtElse) ||
+				(options.foldPreprocessor && options.foldPreprocessorAtElse)
+			) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			lineStartNext = styler.LineStart(lineCurrent+1);
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
+				// There is an empty line at end of file so give it same level and empty
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+			visibleChars = 0;
+			inLineComment = false;
+		}
+	}
+}
+
+void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTable &preprocessorDefinitions) {
+
+	// Remove whitespace tokens
+	tokens.erase(std::remove_if(tokens.begin(), tokens.end(), OnlySpaceOrTab), tokens.end());
+
+	// Evaluate defined statements to either 0 or 1
+	for (size_t i=0; (i+1)<tokens.size();) {
+		if (tokens[i] == "defined") {
+			const char *val = "0";
+			if (tokens[i+1] == "(") {
+				if (((i + 2)<tokens.size()) && (tokens[i + 2] == ")")) {
+					// defined()
+					tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 3);
+				} else if (((i+3)<tokens.size()) && (tokens[i+3] == ")")) {
+					// defined(<identifier>)
+					SymbolTable::const_iterator it = preprocessorDefinitions.find(tokens[i+2]);
+					if (it != preprocessorDefinitions.end()) {
+						val = "1";
+					}
+					tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 4);
+				} else {
+					// Spurious '(' so erase as more likely to result in false
+					tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 2);
+				}
+			} else {
+				// defined <identifier>
+				SymbolTable::const_iterator it = preprocessorDefinitions.find(tokens[i+1]);
+				if (it != preprocessorDefinitions.end()) {
+					val = "1";
+				}
+				tokens.erase(tokens.begin() + i + 1, tokens.begin() + i + 2);
+			}
+			tokens[i] = val;
+		} else {
+			i++;
+		}
+	}
+
+	// Evaluate identifiers
+	constexpr size_t maxIterations = 100;
+	size_t iterations = 0;	// Limit number of iterations in case there is a recursive macro.
+	for (size_t i = 0; (i<tokens.size()) && (iterations < maxIterations);) {
+		iterations++;
+		if (setWordStart.Contains(tokens[i][0])) {
+			SymbolTable::const_iterator it = preprocessorDefinitions.find(tokens[i]);
+			if (it != preprocessorDefinitions.end()) {
+				// Tokenize value
+				std::vector<std::string> macroTokens = Tokenize(it->second.value);
+				if (it->second.IsMacro()) {
+					if ((i + 1 < tokens.size()) && (tokens.at(i + 1) == "(")) {
+						// Create map of argument name to value
+						std::vector<std::string> argumentNames = StringSplit(it->second.arguments, ',');
+						std::map<std::string, std::string> arguments;
+						size_t arg = 0;
+						size_t tok = i+2;
+						while ((tok < tokens.size()) && (arg < argumentNames.size()) && (tokens.at(tok) != ")")) {
+							if (tokens.at(tok) != ",") {
+								arguments[argumentNames.at(arg)] = tokens.at(tok);
+								arg++;
+							}
+							tok++;
+						}
+
+						// Remove invocation
+						tokens.erase(tokens.begin() + i, tokens.begin() + tok + 1);
+
+						// Substitute values into macro
+						macroTokens.erase(std::remove_if(macroTokens.begin(), macroTokens.end(), OnlySpaceOrTab), macroTokens.end());
+
+						for (size_t iMacro = 0; iMacro < macroTokens.size();) {
+							if (setWordStart.Contains(macroTokens[iMacro][0])) {
+								std::map<std::string, std::string>::const_iterator itFind = arguments.find(macroTokens[iMacro]);
+								if (itFind != arguments.end()) {
+									// TODO: Possible that value will be expression so should insert tokenized form
+									macroTokens[iMacro] = itFind->second;
+								}
+							}
+							iMacro++;
+						}
+
+						// Insert results back into tokens
+						tokens.insert(tokens.begin() + i, macroTokens.begin(), macroTokens.end());
+
+					} else {
+						i++;
+					}
+				} else {
+					// Remove invocation
+					tokens.erase(tokens.begin() + i);
+					// Insert results back into tokens
+					tokens.insert(tokens.begin() + i, macroTokens.begin(), macroTokens.end());
+				}
+			} else {
+				// Identifier not found and value defaults to zero
+				tokens[i] = "0";
+			}
+		} else {
+			i++;
+		}
+	}
+
+	// Find bracketed subexpressions and recurse on them
+	BracketPair bracketPair = FindBracketPair(tokens);
+	while (bracketPair.itBracket != tokens.end()) {
+		std::vector<std::string> inBracket(bracketPair.itBracket + 1, bracketPair.itEndBracket);
+		EvaluateTokens(inBracket, preprocessorDefinitions);
+
+		// The insertion is done before the removal because there were failures with the opposite approach
+		tokens.insert(bracketPair.itBracket, inBracket.begin(), inBracket.end());
+
+		bracketPair = FindBracketPair(tokens);
+		tokens.erase(bracketPair.itBracket, bracketPair.itEndBracket + 1);
+
+		bracketPair = FindBracketPair(tokens);
+	}
+
+	// Evaluate logical negations
+	for (size_t j=0; (j+1)<tokens.size();) {
+		if (setNegationOp.Contains(tokens[j][0])) {
+			int isTrue = atoi(tokens[j+1].c_str());
+			if (tokens[j] == "!")
+				isTrue = !isTrue;
+			std::vector<std::string>::iterator itInsert =
+				tokens.erase(tokens.begin() + j, tokens.begin() + j + 2);
+			tokens.insert(itInsert, isTrue ? "1" : "0");
+		} else {
+			j++;
+		}
+	}
+
+	// Evaluate expressions in precedence order
+	enum precedence { precMult, precAdd, precRelative
+		, precLogical, /* end marker */ precLast };
+	for (int prec = precMult; prec < precLast; prec++) {
+		// Looking at 3 tokens at a time so end at 2 before end
+		for (size_t k=0; (k+2)<tokens.size();) {
+			const char chOp = tokens[k+1][0];
+			if (
+				((prec==precMult) && setMultOp.Contains(chOp)) ||
+				((prec==precAdd) && setAddOp.Contains(chOp)) ||
+				((prec==precRelative) && setRelOp.Contains(chOp)) ||
+				((prec==precLogical) && setLogicalOp.Contains(chOp))
+				) {
+				const int valA = atoi(tokens[k].c_str());
+				const int valB = atoi(tokens[k+2].c_str());
+				int result = 0;
+				if (tokens[k+1] == "+")
+					result = valA + valB;
+				else if (tokens[k+1] == "-")
+					result = valA - valB;
+				else if (tokens[k+1] == "*")
+					result = valA * valB;
+				else if (tokens[k+1] == "/")
+					result = valA / (valB ? valB : 1);
+				else if (tokens[k+1] == "%")
+					result = valA % (valB ? valB : 1);
+				else if (tokens[k+1] == "<")
+					result = valA < valB;
+				else if (tokens[k+1] == "<=")
+					result = valA <= valB;
+				else if (tokens[k+1] == ">")
+					result = valA > valB;
+				else if (tokens[k+1] == ">=")
+					result = valA >= valB;
+				else if (tokens[k+1] == "==")
+					result = valA == valB;
+				else if (tokens[k+1] == "!=")
+					result = valA != valB;
+				else if (tokens[k+1] == "||")
+					result = valA || valB;
+				else if (tokens[k+1] == "&&")
+					result = valA && valB;
+				std::vector<std::string>::iterator itInsert =
+					tokens.erase(tokens.begin() + k, tokens.begin() + k + 3);
+				tokens.insert(itInsert, std::to_string(result));
+			} else {
+				k++;
+			}
+		}
+	}
+}
+
+std::vector<std::string> LexerCPP::Tokenize(const std::string &expr) const {
+	// Break into tokens
+	std::vector<std::string> tokens;
+	const char *cp = expr.c_str();
+	while (*cp) {
+		std::string word;
+		if (setWord.Contains(*cp)) {
+			// Identifiers and numbers
+			while (setWord.Contains(*cp)) {
+				word += *cp;
+				cp++;
+			}
+		} else if (IsSpaceOrTab(*cp)) {
+			while (IsSpaceOrTab(*cp)) {
+				word += *cp;
+				cp++;
+			}
+		} else if (setRelOp.Contains(*cp)) {
+			word += *cp;
+			cp++;
+			if (setRelOp.Contains(*cp)) {
+				word += *cp;
+				cp++;
+			}
+		} else if (setLogicalOp.Contains(*cp)) {
+			word += *cp;
+			cp++;
+			if (setLogicalOp.Contains(*cp)) {
+				word += *cp;
+				cp++;
+			}
+		} else {
+			// Should handle strings, characters, and comments here
+			word += *cp;
+			cp++;
+		}
+		tokens.push_back(word);
+	}
+	return tokens;
+}
+
+bool LexerCPP::EvaluateExpression(const std::string &expr, const SymbolTable &preprocessorDefinitions) {
+	std::vector<std::string> tokens = Tokenize(expr);
+
+	EvaluateTokens(tokens, preprocessorDefinitions);
+
+	// "0" or "" -> false else true
+	const bool isFalse = tokens.empty() ||
+		((tokens.size() == 1) && ((tokens[0] == "") || tokens[0] == "0"));
+	return !isFalse;
+}
+
+LexerModule lmCPP(SCLEX_CPP, LexerCPP::LexerFactoryCPP, "cpp", cppWordLists);
+LexerModule lmCPPNoCase(SCLEX_CPPNOCASE, LexerCPP::LexerFactoryCPPInsensitive, "cppnocase", cppWordLists);
diff --git a/scite-app/lexilla/lexers/LexCSS.cxx b/scite-app/lexilla/lexers/LexCSS.cxx
new file mode 100644
index 0000000..2cfcd12
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCSS.cxx
@@ -0,0 +1,570 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file LexCSS.cxx
+ ** Lexer for Cascading Style Sheets
+ ** Written by Jakub Vrána
+ ** Improved by Philippe Lhoste (CSS2)
+ ** Improved by Ross McKay (SCSS mode; see http://sass-lang.com/ )
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// TODO: handle SCSS nested properties like font: { weight: bold; size: 1em; }
+// TODO: handle SCSS interpolation: #{}
+// TODO: add features for Less if somebody feels like contributing; http://lesscss.org/
+// TODO: refactor this monster so that the next poor slob can read it!
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static inline bool IsAWordChar(const unsigned int ch) {
+	/* FIXME:
+	 * The CSS spec allows "ISO 10646 characters U+00A1 and higher" to be treated as word chars.
+	 * Unfortunately, we are only getting string bytes here, and not full unicode characters. We cannot guarantee
+	 * that our byte is between U+0080 - U+00A0 (to return false), so we have to allow all characters U+0080 and higher
+	 */
+	return ch >= 0x80 || isalnum(ch) || ch == '-' || ch == '_';
+}
+
+inline bool IsCssOperator(const int ch) {
+	if (!((ch < 0x80) && isalnum(ch)) &&
+		(ch == '{' || ch == '}' || ch == ':' || ch == ',' || ch == ';' ||
+		 ch == '.' || ch == '#' || ch == '!' || ch == '@' ||
+		 /* CSS2 */
+		 ch == '*' || ch == '>' || ch == '+' || ch == '=' || ch == '~' || ch == '|' ||
+		 ch == '[' || ch == ']' || ch == '(' || ch == ')')) {
+		return true;
+	}
+	return false;
+}
+
+// look behind (from start of document to our start position) to determine current nesting level
+inline int NestingLevelLookBehind(Sci_PositionU startPos, Accessor &styler) {
+	int ch;
+	int nestingLevel = 0;
+
+	for (Sci_PositionU i = 0; i < startPos; i++) {
+		ch = styler.SafeGetCharAt(i);
+		if (ch == '{')
+			nestingLevel++;
+		else if (ch == '}')
+			nestingLevel--;
+	}
+
+	return nestingLevel;
+}
+
+static void ColouriseCssDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+	WordList &css1Props = *keywordlists[0];
+	WordList &pseudoClasses = *keywordlists[1];
+	WordList &css2Props = *keywordlists[2];
+	WordList &css3Props = *keywordlists[3];
+	WordList &pseudoElements = *keywordlists[4];
+	WordList &exProps = *keywordlists[5];
+	WordList &exPseudoClasses = *keywordlists[6];
+	WordList &exPseudoElements = *keywordlists[7];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	int lastState = -1; // before operator
+	int lastStateC = -1; // before comment
+	int lastStateS = -1; // before single-quoted/double-quoted string
+	int lastStateVar = -1; // before variable (SCSS)
+	int lastStateVal = -1; // before value (SCSS)
+	int op = ' '; // last operator
+	int opPrev = ' '; // last operator
+	bool insideParentheses = false; // true if currently in a CSS url() or similar construct
+
+	// property lexer.css.scss.language
+	//	Set to 1 for Sassy CSS (.scss)
+	bool isScssDocument = styler.GetPropertyInt("lexer.css.scss.language") != 0;
+
+	// property lexer.css.less.language
+	// Set to 1 for Less CSS (.less)
+	bool isLessDocument = styler.GetPropertyInt("lexer.css.less.language") != 0;
+
+	// property lexer.css.hss.language
+	// Set to 1 for HSS (.hss)
+	bool isHssDocument = styler.GetPropertyInt("lexer.css.hss.language") != 0;
+
+	// SCSS/LESS/HSS have the concept of variable
+	bool hasVariables = isScssDocument || isLessDocument || isHssDocument;
+	char varPrefix = 0;
+	if (hasVariables)
+		varPrefix = isLessDocument ? '@' : '$';
+
+	// SCSS/LESS/HSS support single-line comments
+	typedef enum _CommentModes { eCommentBlock = 0, eCommentLine = 1} CommentMode;
+	CommentMode comment_mode = eCommentBlock;
+	bool hasSingleLineComments = isScssDocument || isLessDocument || isHssDocument;
+
+	// must keep track of nesting level in document types that support it (SCSS/LESS/HSS)
+	bool hasNesting = false;
+	int nestingLevel = 0;
+	if (isScssDocument || isLessDocument || isHssDocument) {
+		hasNesting = true;
+		nestingLevel = NestingLevelLookBehind(startPos, styler);
+	}
+
+	// "the loop"
+	for (; sc.More(); sc.Forward()) {
+		if (sc.state == SCE_CSS_COMMENT && ((comment_mode == eCommentBlock && sc.Match('*', '/')) || (comment_mode == eCommentLine && sc.atLineEnd))) {
+			if (lastStateC == -1) {
+				// backtrack to get last state:
+				// comments are like whitespace, so we must return to the previous state
+				Sci_PositionU i = startPos;
+				for (; i > 0; i--) {
+					if ((lastStateC = styler.StyleAt(i-1)) != SCE_CSS_COMMENT) {
+						if (lastStateC == SCE_CSS_OPERATOR) {
+							op = styler.SafeGetCharAt(i-1);
+							opPrev = styler.SafeGetCharAt(i-2);
+							while (--i) {
+								lastState = styler.StyleAt(i-1);
+								if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
+									break;
+							}
+							if (i == 0)
+								lastState = SCE_CSS_DEFAULT;
+						}
+						break;
+					}
+				}
+				if (i == 0)
+					lastStateC = SCE_CSS_DEFAULT;
+			}
+			if (comment_mode == eCommentBlock) {
+				sc.Forward();
+				sc.ForwardSetState(lastStateC);
+			} else /* eCommentLine */ {
+				sc.SetState(lastStateC);
+			}
+		}
+
+		if (sc.state == SCE_CSS_COMMENT)
+			continue;
+
+		if (sc.state == SCE_CSS_DOUBLESTRING || sc.state == SCE_CSS_SINGLESTRING) {
+			if (sc.ch != (sc.state == SCE_CSS_DOUBLESTRING ? '\"' : '\''))
+				continue;
+			Sci_PositionU i = sc.currentPos;
+			while (i && styler[i-1] == '\\')
+				i--;
+			if ((sc.currentPos - i) % 2 == 1)
+				continue;
+			sc.ForwardSetState(lastStateS);
+		}
+
+		if (sc.state == SCE_CSS_OPERATOR) {
+			if (op == ' ') {
+				Sci_PositionU i = startPos;
+				op = styler.SafeGetCharAt(i-1);
+				opPrev = styler.SafeGetCharAt(i-2);
+				while (--i) {
+					lastState = styler.StyleAt(i-1);
+					if (lastState != SCE_CSS_OPERATOR && lastState != SCE_CSS_COMMENT)
+						break;
+				}
+			}
+			switch (op) {
+			case '@':
+				if (lastState == SCE_CSS_DEFAULT || hasNesting)
+					sc.SetState(SCE_CSS_DIRECTIVE);
+				break;
+			case '>':
+			case '+':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_DEFAULT);
+				break;
+			case '[':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_ATTRIBUTE);
+				break;
+			case ']':
+				if (lastState == SCE_CSS_ATTRIBUTE)
+					sc.SetState(SCE_CSS_TAG);
+				break;
+			case '{':
+				nestingLevel++;
+				switch (lastState) {
+				case SCE_CSS_MEDIA:
+					sc.SetState(SCE_CSS_DEFAULT);
+					break;
+				case SCE_CSS_TAG:
+				case SCE_CSS_DIRECTIVE:
+					sc.SetState(SCE_CSS_IDENTIFIER);
+					break;
+				}
+				break;
+			case '}':
+				if (--nestingLevel < 0)
+					nestingLevel = 0;
+				switch (lastState) {
+				case SCE_CSS_DEFAULT:
+				case SCE_CSS_VALUE:
+				case SCE_CSS_IMPORTANT:
+				case SCE_CSS_IDENTIFIER:
+				case SCE_CSS_IDENTIFIER2:
+				case SCE_CSS_IDENTIFIER3:
+					if (hasNesting)
+						sc.SetState(nestingLevel > 0 ? SCE_CSS_IDENTIFIER : SCE_CSS_DEFAULT);
+					else
+						sc.SetState(SCE_CSS_DEFAULT);
+					break;
+				}
+				break;
+			case '(':
+				if (lastState == SCE_CSS_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_TAG);
+				else if (lastState == SCE_CSS_EXTENDED_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_EXTENDED_PSEUDOCLASS);
+				break;
+			case ')':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS ||
+					lastState == SCE_CSS_PSEUDOELEMENT || lastState == SCE_CSS_EXTENDED_PSEUDOELEMENT)
+					sc.SetState(SCE_CSS_TAG);
+				break;
+			case ':':
+				switch (lastState) {
+				case SCE_CSS_TAG:
+				case SCE_CSS_DEFAULT:
+				case SCE_CSS_CLASS:
+				case SCE_CSS_ID:
+				case SCE_CSS_PSEUDOCLASS:
+				case SCE_CSS_EXTENDED_PSEUDOCLASS:
+				case SCE_CSS_UNKNOWN_PSEUDOCLASS:
+				case SCE_CSS_PSEUDOELEMENT:
+				case SCE_CSS_EXTENDED_PSEUDOELEMENT:
+					sc.SetState(SCE_CSS_PSEUDOCLASS);
+					break;
+				case SCE_CSS_IDENTIFIER:
+				case SCE_CSS_IDENTIFIER2:
+				case SCE_CSS_IDENTIFIER3:
+				case SCE_CSS_EXTENDED_IDENTIFIER:
+				case SCE_CSS_UNKNOWN_IDENTIFIER:
+				case SCE_CSS_VARIABLE:
+					sc.SetState(SCE_CSS_VALUE);
+					lastStateVal = lastState;
+					break;
+				}
+				break;
+			case '.':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_CLASS);
+				break;
+			case '#':
+				if (lastState == SCE_CSS_TAG || lastState == SCE_CSS_DEFAULT || lastState == SCE_CSS_CLASS || lastState == SCE_CSS_ID ||
+					lastState == SCE_CSS_PSEUDOCLASS || lastState == SCE_CSS_EXTENDED_PSEUDOCLASS || lastState == SCE_CSS_UNKNOWN_PSEUDOCLASS)
+					sc.SetState(SCE_CSS_ID);
+				break;
+			case ',':
+			case '|':
+			case '~':
+				if (lastState == SCE_CSS_TAG)
+					sc.SetState(SCE_CSS_DEFAULT);
+				break;
+			case ';':
+				switch (lastState) {
+				case SCE_CSS_DIRECTIVE:
+					if (hasNesting) {
+						sc.SetState(nestingLevel > 0 ? SCE_CSS_IDENTIFIER : SCE_CSS_DEFAULT);
+					} else {
+						sc.SetState(SCE_CSS_DEFAULT);
+					}
+					break;
+				case SCE_CSS_VALUE:
+				case SCE_CSS_IMPORTANT:
+					// data URLs can have semicolons; simplistically check for wrapping parentheses and move along
+					if (insideParentheses) {
+						sc.SetState(lastState);
+					} else {
+						if (lastStateVal == SCE_CSS_VARIABLE) {
+							sc.SetState(SCE_CSS_DEFAULT);
+						} else {
+							sc.SetState(SCE_CSS_IDENTIFIER);
+						}
+					}
+					break;
+				case SCE_CSS_VARIABLE:
+					if (lastStateVar == SCE_CSS_VALUE) {
+						// data URLs can have semicolons; simplistically check for wrapping parentheses and move along
+						if (insideParentheses) {
+							sc.SetState(SCE_CSS_VALUE);
+						} else {
+							sc.SetState(SCE_CSS_IDENTIFIER);
+						}
+					} else {
+						sc.SetState(SCE_CSS_DEFAULT);
+					}
+					break;
+				}
+				break;
+			case '!':
+				if (lastState == SCE_CSS_VALUE)
+					sc.SetState(SCE_CSS_IMPORTANT);
+				break;
+			}
+		}
+
+		if (sc.ch == '*' && sc.state == SCE_CSS_DEFAULT) {
+			sc.SetState(SCE_CSS_TAG);
+			continue;
+		}
+
+		// check for inside parentheses (whether part of an "operator" or not)
+		if (sc.ch == '(')
+			insideParentheses = true;
+		else if (sc.ch == ')')
+			insideParentheses = false;
+
+		// SCSS special modes
+		if (hasVariables) {
+			// variable name
+			if (sc.ch == varPrefix) {
+				switch (sc.state) {
+				case SCE_CSS_DEFAULT:
+					if (isLessDocument) // give priority to pseudo elements
+						break;
+					// Falls through.
+				case SCE_CSS_VALUE:
+					lastStateVar = sc.state;
+					sc.SetState(SCE_CSS_VARIABLE);
+					continue;
+				}
+			}
+			if (sc.state == SCE_CSS_VARIABLE) {
+				if (IsAWordChar(sc.ch)) {
+					// still looking at the variable name
+					continue;
+				}
+				if (lastStateVar == SCE_CSS_VALUE) {
+					// not looking at the variable name any more, and it was part of a value
+					sc.SetState(SCE_CSS_VALUE);
+				}
+			}
+
+			// nested rule parent selector
+			if (sc.ch == '&') {
+				switch (sc.state) {
+				case SCE_CSS_DEFAULT:
+				case SCE_CSS_IDENTIFIER:
+					sc.SetState(SCE_CSS_TAG);
+					continue;
+				}
+			}
+		}
+
+		// nesting rules that apply to SCSS and Less
+		if (hasNesting) {
+			// check for nested rule selector
+			if (sc.state == SCE_CSS_IDENTIFIER && (IsAWordChar(sc.ch) || sc.ch == ':' || sc.ch == '.' || sc.ch == '#')) {
+				// look ahead to see whether { comes before next ; and }
+				Sci_PositionU endPos = startPos + length;
+				int ch;
+
+				for (Sci_PositionU i = sc.currentPos; i < endPos; i++) {
+					ch = styler.SafeGetCharAt(i);
+					if (ch == ';' || ch == '}')
+						break;
+					if (ch == '{') {
+						sc.SetState(SCE_CSS_DEFAULT);
+						continue;
+					}
+				}
+			}
+
+		}
+
+		if (IsAWordChar(sc.ch)) {
+			if (sc.state == SCE_CSS_DEFAULT)
+				sc.SetState(SCE_CSS_TAG);
+			continue;
+		}
+
+		if (IsAWordChar(sc.chPrev) && (
+			sc.state == SCE_CSS_IDENTIFIER || sc.state == SCE_CSS_IDENTIFIER2 ||
+			sc.state == SCE_CSS_IDENTIFIER3 || sc.state == SCE_CSS_EXTENDED_IDENTIFIER ||
+			sc.state == SCE_CSS_UNKNOWN_IDENTIFIER ||
+			sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT ||
+			sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT ||
+			sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS ||
+			sc.state == SCE_CSS_IMPORTANT ||
+			sc.state == SCE_CSS_DIRECTIVE
+		)) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			char *s2 = s;
+			while (*s2 && !IsAWordChar(*s2))
+				s2++;
+			switch (sc.state) {
+			case SCE_CSS_IDENTIFIER:
+			case SCE_CSS_IDENTIFIER2:
+			case SCE_CSS_IDENTIFIER3:
+			case SCE_CSS_EXTENDED_IDENTIFIER:
+			case SCE_CSS_UNKNOWN_IDENTIFIER:
+				if (css1Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER);
+				else if (css2Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER2);
+				else if (css3Props.InList(s2))
+					sc.ChangeState(SCE_CSS_IDENTIFIER3);
+				else if (exProps.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_IDENTIFIER);
+				else
+					sc.ChangeState(SCE_CSS_UNKNOWN_IDENTIFIER);
+				break;
+			case SCE_CSS_PSEUDOCLASS:
+			case SCE_CSS_PSEUDOELEMENT:
+			case SCE_CSS_EXTENDED_PSEUDOCLASS:
+			case SCE_CSS_EXTENDED_PSEUDOELEMENT:
+			case SCE_CSS_UNKNOWN_PSEUDOCLASS:
+				if (op == ':' && opPrev != ':' && pseudoClasses.InList(s2))
+					sc.ChangeState(SCE_CSS_PSEUDOCLASS);
+				else if (opPrev == ':' && pseudoElements.InList(s2))
+					sc.ChangeState(SCE_CSS_PSEUDOELEMENT);
+				else if ((op == ':' || (op == '(' && lastState == SCE_CSS_EXTENDED_PSEUDOCLASS)) && opPrev != ':' && exPseudoClasses.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_PSEUDOCLASS);
+				else if (opPrev == ':' && exPseudoElements.InList(s2))
+					sc.ChangeState(SCE_CSS_EXTENDED_PSEUDOELEMENT);
+				else
+					sc.ChangeState(SCE_CSS_UNKNOWN_PSEUDOCLASS);
+				break;
+			case SCE_CSS_IMPORTANT:
+				if (strcmp(s2, "important") != 0)
+					sc.ChangeState(SCE_CSS_VALUE);
+				break;
+			case SCE_CSS_DIRECTIVE:
+				if (op == '@' && strcmp(s2, "media") == 0)
+					sc.ChangeState(SCE_CSS_MEDIA);
+				break;
+			}
+		}
+
+		if (sc.ch != '.' && sc.ch != ':' && sc.ch != '#' && (
+			sc.state == SCE_CSS_CLASS || sc.state == SCE_CSS_ID ||
+			(sc.ch != '(' && sc.ch != ')' && ( /* This line of the condition makes it possible to extend pseudo-classes with parentheses */
+				sc.state == SCE_CSS_PSEUDOCLASS || sc.state == SCE_CSS_PSEUDOELEMENT ||
+				sc.state == SCE_CSS_EXTENDED_PSEUDOCLASS || sc.state == SCE_CSS_EXTENDED_PSEUDOELEMENT ||
+				sc.state == SCE_CSS_UNKNOWN_PSEUDOCLASS
+			))
+		))
+			sc.SetState(SCE_CSS_TAG);
+
+		if (sc.Match('/', '*')) {
+			lastStateC = sc.state;
+			comment_mode = eCommentBlock;
+			sc.SetState(SCE_CSS_COMMENT);
+			sc.Forward();
+		} else if (hasSingleLineComments && sc.Match('/', '/') && !insideParentheses) {
+			// note that we've had to treat ([...]// as the start of a URL not a comment, e.g. url(http://example.com), url(//example.com)
+			lastStateC = sc.state;
+			comment_mode = eCommentLine;
+			sc.SetState(SCE_CSS_COMMENT);
+			sc.Forward();
+		} else if ((sc.state == SCE_CSS_VALUE || sc.state == SCE_CSS_ATTRIBUTE)
+			&& (sc.ch == '\"' || sc.ch == '\'')) {
+			lastStateS = sc.state;
+			sc.SetState((sc.ch == '\"' ? SCE_CSS_DOUBLESTRING : SCE_CSS_SINGLESTRING));
+		} else if (IsCssOperator(sc.ch)
+			&& (sc.state != SCE_CSS_ATTRIBUTE || sc.ch == ']')
+			&& (sc.state != SCE_CSS_VALUE || sc.ch == ';' || sc.ch == '}' || sc.ch == '!')
+			&& ((sc.state != SCE_CSS_DIRECTIVE && sc.state != SCE_CSS_MEDIA) || sc.ch == ';' || sc.ch == '{')
+		) {
+			if (sc.state != SCE_CSS_OPERATOR)
+				lastState = sc.state;
+			sc.SetState(SCE_CSS_OPERATOR);
+			op = sc.ch;
+			opPrev = sc.chPrev;
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldCSSDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool inComment = (styler.StyleAt(startPos-1) == SCE_CSS_COMMENT);
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment) {
+			if (!inComment && (style == SCE_CSS_COMMENT))
+				levelCurrent++;
+			else if (inComment && (style != SCE_CSS_COMMENT))
+				levelCurrent--;
+			inComment = (style == SCE_CSS_COMMENT);
+		}
+		if (style == SCE_CSS_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const cssWordListDesc[] = {
+	"CSS1 Properties",
+	"Pseudo-classes",
+	"CSS2 Properties",
+	"CSS3 Properties",
+	"Pseudo-elements",
+	"Browser-Specific CSS Properties",
+	"Browser-Specific Pseudo-classes",
+	"Browser-Specific Pseudo-elements",
+	0
+};
+
+LexerModule lmCss(SCLEX_CSS, ColouriseCssDoc, "css", FoldCSSDoc, cssWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCaml.cxx b/scite-app/lexilla/lexers/LexCaml.cxx
new file mode 100644
index 0000000..72bb3f3
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCaml.cxx
@@ -0,0 +1,329 @@
+// Scintilla source code edit control
+/** @file LexCaml.cxx
+ ** Lexer for Objective Caml.
+ **/
+// Copyright 2005-2009 by Robert Roessler <robertr@rftp.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+/*	Release History
+	20050204 Initial release.
+	20050205 Quick compiler standards/"cleanliness" adjustment.
+	20050206 Added cast for IsLeadByte().
+	20050209 Changes to "external" build support.
+	20050306 Fix for 1st-char-in-doc "corner" case.
+	20050502 Fix for [harmless] one-past-the-end coloring.
+	20050515 Refined numeric token recognition logic.
+	20051125 Added 2nd "optional" keywords class.
+	20051129 Support "magic" (read-only) comments for RCaml.
+	20051204 Swtich to using StyleContext infrastructure.
+	20090629 Add full Standard ML '97 support.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wcomma"
+#endif
+
+//	Since the Microsoft __iscsym[f] funcs are not ANSI...
+inline int  iscaml(int c) {return isalnum(c) || c == '_';}
+inline int iscamlf(int c) {return isalpha(c) || c == '_';}
+
+static const int baseT[24] = {
+	0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* A - L */
+	0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,16	/* M - X */
+};
+
+using namespace Lexilla;
+
+static void ColouriseCamlDoc(
+	Sci_PositionU startPos, Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler)
+{
+	// initialize styler
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	Sci_PositionU chToken = 0;
+	int chBase = 0, chLit = 0;
+	WordList& keywords  = *keywordlists[0];
+	WordList& keywords2 = *keywordlists[1];
+	WordList& keywords3 = *keywordlists[2];
+	const bool isSML = keywords.InList("andalso");
+	const int useMagic = styler.GetPropertyInt("lexer.caml.magic", 0);
+
+	// set up [initial] state info (terminating states that shouldn't "bleed")
+	const int state_ = sc.state & 0x0f;
+	if (state_ <= SCE_CAML_CHAR
+		|| (isSML && state_ == SCE_CAML_STRING))
+		sc.state = SCE_CAML_DEFAULT;
+	int nesting = (state_ >= SCE_CAML_COMMENT)? (state_ - SCE_CAML_COMMENT): 0;
+
+	// foreach char in range...
+	while (sc.More()) {
+		// set up [per-char] state info
+		int state2 = -1;				// (ASSUME no state change)
+		Sci_Position chColor = sc.currentPos - 1;// (ASSUME standard coloring range)
+		bool advance = true;			// (ASSUME scanner "eats" 1 char)
+
+		// step state machine
+		switch (sc.state & 0x0f) {
+		case SCE_CAML_DEFAULT:
+			chToken = sc.currentPos;	// save [possible] token start (JIC)
+			// it's wide open; what do we have?
+			if (iscamlf(sc.ch))
+				state2 = SCE_CAML_IDENTIFIER;
+			else if (!isSML && sc.Match('`') && iscamlf(sc.chNext))
+				state2 = SCE_CAML_TAGNAME;
+			else if (!isSML && sc.Match('#') && isdigit(sc.chNext))
+				state2 = SCE_CAML_LINENUM;
+			else if (isdigit(sc.ch)) {
+				// it's a number, assume base 10
+				state2 = SCE_CAML_NUMBER, chBase = 10;
+				if (sc.Match('0')) {
+					// there MAY be a base specified...
+					const char* baseC = "bBoOxX";
+					if (isSML) {
+						if (sc.chNext == 'w')
+							sc.Forward();	// (consume SML "word" indicator)
+						baseC = "x";
+					}
+					// ... change to specified base AS REQUIRED
+					if (strchr(baseC, sc.chNext))
+						chBase = baseT[tolower(sc.chNext) - 'a'], sc.Forward();
+				}
+			} else if (!isSML && sc.Match('\''))	// (Caml char literal?)
+				state2 = SCE_CAML_CHAR, chLit = 0;
+			else if (isSML && sc.Match('#', '"'))	// (SML char literal?)
+				state2 = SCE_CAML_CHAR, sc.Forward();
+			else if (sc.Match('"'))
+				state2 = SCE_CAML_STRING;
+			else if (sc.Match('(', '*'))
+				state2 = SCE_CAML_COMMENT, sc.Forward(), sc.ch = ' '; // (*)...
+			else if (strchr("!?~"			/* Caml "prefix-symbol" */
+					"=<>@^|&+-*/$%"			/* Caml "infix-symbol" */
+					"()[]{};,:.#", sc.ch)	// Caml "bracket" or ;,:.#
+											// SML "extra" ident chars
+				|| (isSML && (sc.Match('\\') || sc.Match('`'))))
+				state2 = SCE_CAML_OPERATOR;
+			break;
+
+		case SCE_CAML_IDENTIFIER:
+			// [try to] interpret as [additional] identifier char
+			if (!(iscaml(sc.ch) || sc.Match('\''))) {
+				const Sci_Position n = sc.currentPos - chToken;
+				if (n < 24) {
+					// length is believable as keyword, [re-]construct token
+					char t[24];
+					for (Sci_Position i = -n; i < 0; i++)
+						t[n + i] = static_cast<char>(sc.GetRelative(i));
+					t[n] = '\0';
+					// special-case "_" token as KEYWORD
+					if ((n == 1 && sc.chPrev == '_') || keywords.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD);
+					else if (keywords2.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD2);
+					else if (keywords3.InList(t))
+						sc.ChangeState(SCE_CAML_KEYWORD3);
+				}
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			}
+			break;
+
+		case SCE_CAML_TAGNAME:
+			// [try to] interpret as [additional] tagname char
+			if (!(iscaml(sc.ch) || sc.Match('\'')))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		/*case SCE_CAML_KEYWORD:
+		case SCE_CAML_KEYWORD2:
+		case SCE_CAML_KEYWORD3:
+			// [try to] interpret as [additional] keyword char
+			if (!iscaml(ch))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;*/
+
+		case SCE_CAML_LINENUM:
+			// [try to] interpret as [additional] linenum directive char
+			if (!isdigit(sc.ch))
+				state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		case SCE_CAML_OPERATOR: {
+			// [try to] interpret as [additional] operator char
+			const char* o = 0;
+			if (iscaml(sc.ch) || isspace(sc.ch)			// ident or whitespace
+				|| (o = strchr(")]};,\'\"#", sc.ch),o)	// "termination" chars
+				|| (!isSML && sc.Match('`'))			// Caml extra term char
+				|| (!strchr("!$%&*+-./:<=>?@^|~", sc.ch)// "operator" chars
+														// SML extra ident chars
+					&& !(isSML && (sc.Match('\\') || sc.Match('`'))))) {
+				// check for INCLUSIVE termination
+				if (o && strchr(")]};,", sc.ch)) {
+					if ((sc.Match(')') && sc.chPrev == '(')
+						|| (sc.Match(']') && sc.chPrev == '['))
+						// special-case "()" and "[]" tokens as KEYWORDS
+						sc.ChangeState(SCE_CAML_KEYWORD);
+					chColor++;
+				} else
+					advance = false;
+				state2 = SCE_CAML_DEFAULT;
+			}
+			break;
+		}
+
+		case SCE_CAML_NUMBER:
+			// [try to] interpret as [additional] numeric literal char
+			if ((!isSML && sc.Match('_')) || IsADigit(sc.ch, chBase))
+				break;
+			// how about an integer suffix?
+			if (!isSML && (sc.Match('l') || sc.Match('L') || sc.Match('n'))
+				&& (sc.chPrev == '_' || IsADigit(sc.chPrev, chBase)))
+				break;
+			// or a floating-point literal?
+			if (chBase == 10) {
+				// with a decimal point?
+				if (sc.Match('.')
+					&& ((!isSML && sc.chPrev == '_')
+						|| IsADigit(sc.chPrev, chBase)))
+					break;
+				// with an exponent? (I)
+				if ((sc.Match('e') || sc.Match('E'))
+					&& ((!isSML && (sc.chPrev == '.' || sc.chPrev == '_'))
+						|| IsADigit(sc.chPrev, chBase)))
+					break;
+				// with an exponent? (II)
+				if (((!isSML && (sc.Match('+') || sc.Match('-')))
+						|| (isSML && sc.Match('~')))
+					&& (sc.chPrev == 'e' || sc.chPrev == 'E'))
+					break;
+			}
+			// it looks like we have run out of number
+			state2 = SCE_CAML_DEFAULT, advance = false;
+			break;
+
+		case SCE_CAML_CHAR:
+			if (!isSML) {
+				// [try to] interpret as [additional] char literal char
+				if (sc.Match('\\')) {
+					chLit = 1;	// (definitely IS a char literal)
+					if (sc.chPrev == '\\')
+						sc.ch = ' ';	// (...\\')
+				// should we be terminating - one way or another?
+				} else if ((sc.Match('\'') && sc.chPrev != '\\')
+					|| sc.atLineEnd) {
+					state2 = SCE_CAML_DEFAULT;
+					if (sc.Match('\''))
+						chColor++;
+					else
+						sc.ChangeState(SCE_CAML_IDENTIFIER);
+				// ... maybe a char literal, maybe not
+				} else if (chLit < 1 && sc.currentPos - chToken >= 2)
+					sc.ChangeState(SCE_CAML_IDENTIFIER), advance = false;
+				break;
+			}/* else
+				// fall through for SML char literal (handle like string) */
+			// Falls through.
+
+		case SCE_CAML_STRING:
+			// [try to] interpret as [additional] [SML char/] string literal char
+			if (isSML && sc.Match('\\') && sc.chPrev != '\\' && isspace(sc.chNext))
+				state2 = SCE_CAML_WHITE;
+			else if (sc.Match('\\') && sc.chPrev == '\\')
+				sc.ch = ' ';	// (...\\")
+			// should we be terminating - one way or another?
+			else if ((sc.Match('"') && sc.chPrev != '\\')
+				|| (isSML && sc.atLineEnd)) {
+				state2 = SCE_CAML_DEFAULT;
+				if (sc.Match('"'))
+					chColor++;
+			}
+			break;
+
+		case SCE_CAML_WHITE:
+			// [try to] interpret as [additional] SML embedded whitespace char
+			if (sc.Match('\\')) {
+				// style this puppy NOW...
+				state2 = SCE_CAML_STRING, sc.ch = ' ' /* (...\") */, chColor++,
+					styler.ColourTo(chColor, SCE_CAML_WHITE), styler.Flush();
+				// ... then backtrack to determine original SML literal type
+				Sci_Position p = chColor - 2;
+				for (; p >= 0 && styler.StyleAt(p) == SCE_CAML_WHITE; p--) ;
+				if (p >= 0)
+					state2 = static_cast<int>(styler.StyleAt(p));
+				// take care of state change NOW
+				sc.ChangeState(state2), state2 = -1;
+			}
+			break;
+
+		case SCE_CAML_COMMENT:
+		case SCE_CAML_COMMENT1:
+		case SCE_CAML_COMMENT2:
+		case SCE_CAML_COMMENT3:
+			// we're IN a comment - does this start a NESTED comment?
+			if (sc.Match('(', '*'))
+				state2 = sc.state + 1, chToken = sc.currentPos,
+					sc.Forward(), sc.ch = ' ' /* (*)... */, nesting++;
+			// [try to] interpret as [additional] comment char
+			else if (sc.Match(')') && sc.chPrev == '*') {
+				if (nesting)
+					state2 = (sc.state & 0x0f) - 1, chToken = 0, nesting--;
+				else
+					state2 = SCE_CAML_DEFAULT;
+				chColor++;
+			// enable "magic" (read-only) comment AS REQUIRED
+			} else if (useMagic && sc.currentPos - chToken == 4
+				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
+				sc.state |= 0x10;	// (switch to read-only comment style)
+			break;
+		}
+
+		// handle state change and char coloring AS REQUIRED
+		if (state2 >= 0)
+			styler.ColourTo(chColor, sc.state), sc.ChangeState(state2);
+		// move to next char UNLESS re-scanning current char
+		if (advance)
+			sc.Forward();
+	}
+
+	// do any required terminal char coloring (JIC)
+	sc.Complete();
+}
+
+static
+void FoldCamlDoc(
+	Sci_PositionU, Sci_Position,
+	int,
+	WordList *[],
+	Accessor &)
+{
+}
+
+static const char * const camlWordListDesc[] = {
+	"Keywords",		// primary Objective Caml keywords
+	"Keywords2",	// "optional" keywords (typically from Pervasives)
+	"Keywords3",	// "optional" keywords (typically typenames)
+	0
+};
+
+LexerModule lmCaml(SCLEX_CAML, ColouriseCamlDoc, "caml", FoldCamlDoc, camlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCmake.cxx b/scite-app/lexilla/lexers/LexCmake.cxx
new file mode 100644
index 0000000..5302c20
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCmake.cxx
@@ -0,0 +1,459 @@
+// Scintilla source code edit control
+/** @file LexCmake.cxx
+ ** Lexer for Cmake
+ **/
+// Copyright 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+// based on the NSIS lexer
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static bool isCmakeNumber(char ch)
+{
+    return(ch >= '0' && ch <= '9');
+}
+
+static bool isCmakeChar(char ch)
+{
+    return(ch == '.' ) || (ch == '_' ) || isCmakeNumber(ch) || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isCmakeLetter(char ch)
+{
+    return(ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool CmakeNextLineHasElse(Sci_PositionU start, Sci_PositionU end, Accessor &styler)
+{
+    Sci_Position nNextLine = -1;
+    for ( Sci_PositionU i = start; i < end; i++ ) {
+        char cNext = styler.SafeGetCharAt( i );
+        if ( cNext == '\n' ) {
+            nNextLine = i+1;
+            break;
+        }
+    }
+
+    if ( nNextLine == -1 ) // We never foudn the next line...
+        return false;
+
+    for ( Sci_PositionU firstChar = nNextLine; firstChar < end; firstChar++ ) {
+        char cNext = styler.SafeGetCharAt( firstChar );
+        if ( cNext == ' ' )
+            continue;
+        if ( cNext == '\t' )
+            continue;
+        if ( styler.Match(firstChar, "ELSE")  || styler.Match(firstChar, "else"))
+            return true;
+        break;
+    }
+
+    return false;
+}
+
+static int calculateFoldCmake(Sci_PositionU start, Sci_PositionU end, int foldlevel, Accessor &styler, bool bElse)
+{
+    // If the word is too long, it is not what we are looking for
+    if ( end - start > 20 )
+        return foldlevel;
+
+    int newFoldlevel = foldlevel;
+
+    char s[20]; // The key word we are looking for has atmost 13 characters
+    for (unsigned int i = 0; i < end - start + 1 && i < 19; i++) {
+        s[i] = static_cast<char>( styler[ start + i ] );
+        s[i + 1] = '\0';
+    }
+
+    if ( CompareCaseInsensitive(s, "IF") == 0 || CompareCaseInsensitive(s, "WHILE") == 0
+         || CompareCaseInsensitive(s, "MACRO") == 0 || CompareCaseInsensitive(s, "FOREACH") == 0
+         || CompareCaseInsensitive(s, "FUNCTION") == 0 || CompareCaseInsensitive(s, "ELSEIF") == 0)
+        newFoldlevel++;
+    else if ( CompareCaseInsensitive(s, "ENDIF") == 0 || CompareCaseInsensitive(s, "ENDWHILE") == 0
+              || CompareCaseInsensitive(s, "ENDMACRO") == 0 || CompareCaseInsensitive(s, "ENDFOREACH") == 0
+              || CompareCaseInsensitive(s, "ENDFUNCTION") == 0)
+        newFoldlevel--;
+    else if ( bElse && CompareCaseInsensitive(s, "ELSEIF") == 0 )
+        newFoldlevel++;
+    else if ( bElse && CompareCaseInsensitive(s, "ELSE") == 0 )
+        newFoldlevel++;
+
+    return newFoldlevel;
+}
+
+static int classifyWordCmake(Sci_PositionU start, Sci_PositionU end, WordList *keywordLists[], Accessor &styler )
+{
+    char word[100] = {0};
+    char lowercaseWord[100] = {0};
+
+    WordList &Commands = *keywordLists[0];
+    WordList &Parameters = *keywordLists[1];
+    WordList &UserDefined = *keywordLists[2];
+
+    for (Sci_PositionU i = 0; i < end - start + 1 && i < 99; i++) {
+        word[i] = static_cast<char>( styler[ start + i ] );
+        lowercaseWord[i] = static_cast<char>(tolower(word[i]));
+    }
+
+    // Check for special words...
+    if ( CompareCaseInsensitive(word, "MACRO") == 0 || CompareCaseInsensitive(word, "ENDMACRO") == 0 )
+        return SCE_CMAKE_MACRODEF;
+
+    if ( CompareCaseInsensitive(word, "IF") == 0 ||  CompareCaseInsensitive(word, "ENDIF") == 0 )
+        return SCE_CMAKE_IFDEFINEDEF;
+
+    if ( CompareCaseInsensitive(word, "ELSEIF") == 0  || CompareCaseInsensitive(word, "ELSE") == 0 )
+        return SCE_CMAKE_IFDEFINEDEF;
+
+    if ( CompareCaseInsensitive(word, "WHILE") == 0 || CompareCaseInsensitive(word, "ENDWHILE") == 0)
+        return SCE_CMAKE_WHILEDEF;
+
+    if ( CompareCaseInsensitive(word, "FOREACH") == 0 || CompareCaseInsensitive(word, "ENDFOREACH") == 0)
+        return SCE_CMAKE_FOREACHDEF;
+
+    if ( Commands.InList(lowercaseWord) )
+        return SCE_CMAKE_COMMANDS;
+
+    if ( Parameters.InList(word) )
+        return SCE_CMAKE_PARAMETERS;
+
+
+    if ( UserDefined.InList(word) )
+        return SCE_CMAKE_USERDEFINED;
+
+    if ( strlen(word) > 3 ) {
+        if ( word[1] == '{' && word[strlen(word)-1] == '}' )
+            return SCE_CMAKE_VARIABLE;
+    }
+
+    // To check for numbers
+    if ( isCmakeNumber( word[0] ) ) {
+        bool bHasSimpleCmakeNumber = true;
+        for (unsigned int j = 1; j < end - start + 1 && j < 99; j++) {
+            if ( !isCmakeNumber( word[j] ) ) {
+                bHasSimpleCmakeNumber = false;
+                break;
+            }
+        }
+
+        if ( bHasSimpleCmakeNumber )
+            return SCE_CMAKE_NUMBER;
+    }
+
+    return SCE_CMAKE_DEFAULT;
+}
+
+static void ColouriseCmakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler)
+{
+    int state = SCE_CMAKE_DEFAULT;
+    if ( startPos > 0 )
+        state = styler.StyleAt(startPos-1); // Use the style from the previous line, usually default, but could be commentbox
+
+    styler.StartAt( startPos );
+    styler.GetLine( startPos );
+
+    Sci_PositionU nLengthDoc = startPos + length;
+    styler.StartSegment( startPos );
+
+    char cCurrChar;
+    bool bVarInString = false;
+    bool bClassicVarInString = false;
+
+    Sci_PositionU i;
+    for ( i = startPos; i < nLengthDoc; i++ ) {
+        cCurrChar = styler.SafeGetCharAt( i );
+        char cNextChar = styler.SafeGetCharAt(i+1);
+
+        switch (state) {
+        case SCE_CMAKE_DEFAULT:
+            if ( cCurrChar == '#' ) { // we have a comment line
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_COMMENT;
+                break;
+            }
+            if ( cCurrChar == '"' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGDQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+            if ( cCurrChar == '\'' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGRQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+            if ( cCurrChar == '`' ) {
+                styler.ColourTo(i-1, state );
+                state = SCE_CMAKE_STRINGLQ;
+                bVarInString = false;
+                bClassicVarInString = false;
+                break;
+            }
+
+            // CMake Variable
+            if ( cCurrChar == '$' || isCmakeChar(cCurrChar)) {
+                styler.ColourTo(i-1,state);
+                state = SCE_CMAKE_VARIABLE;
+
+                // If it is a number, we must check and set style here first...
+                if ( isCmakeNumber(cCurrChar) && (cNextChar == '\t' || cNextChar == ' ' || cNextChar == '\r' || cNextChar == '\n' ) )
+                    styler.ColourTo( i, SCE_CMAKE_NUMBER);
+
+                break;
+            }
+
+            break;
+        case SCE_CMAKE_COMMENT:
+            if ( cCurrChar == '\n' || cCurrChar == '\r' ) {
+                if ( styler.SafeGetCharAt(i-1) == '\\' ) {
+                    styler.ColourTo(i-2,state);
+                    styler.ColourTo(i-1,SCE_CMAKE_DEFAULT);
+                }
+                else {
+                    styler.ColourTo(i-1,state);
+                    state = SCE_CMAKE_DEFAULT;
+                }
+            }
+            break;
+        case SCE_CMAKE_STRINGDQ:
+        case SCE_CMAKE_STRINGLQ:
+        case SCE_CMAKE_STRINGRQ:
+
+            if ( styler.SafeGetCharAt(i-1) == '\\' && styler.SafeGetCharAt(i-2) == '$' )
+                break; // Ignore the next character, even if it is a quote of some sort
+
+            if ( cCurrChar == '"' && state == SCE_CMAKE_STRINGDQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cCurrChar == '`' && state == SCE_CMAKE_STRINGLQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cCurrChar == '\'' && state == SCE_CMAKE_STRINGRQ ) {
+                styler.ColourTo(i,state);
+                state = SCE_CMAKE_DEFAULT;
+                break;
+            }
+
+            if ( cNextChar == '\r' || cNextChar == '\n' ) {
+                Sci_Position nCurLine = styler.GetLine(i+1);
+                Sci_Position nBack = i;
+                // We need to check if the previous line has a \ in it...
+                bool bNextLine = false;
+
+                while ( nBack > 0 ) {
+                    if ( styler.GetLine(nBack) != nCurLine )
+                        break;
+
+                    char cTemp = styler.SafeGetCharAt(nBack, 'a'); // Letter 'a' is safe here
+
+                    if ( cTemp == '\\' ) {
+                        bNextLine = true;
+                        break;
+                    }
+                    if ( cTemp != '\r' && cTemp != '\n' && cTemp != '\t' && cTemp != ' ' )
+                        break;
+
+                    nBack--;
+                }
+
+                if ( bNextLine ) {
+                    styler.ColourTo(i+1,state);
+                }
+                if ( bNextLine == false ) {
+                    styler.ColourTo(i,state);
+                    state = SCE_CMAKE_DEFAULT;
+                }
+            }
+            break;
+
+        case SCE_CMAKE_VARIABLE:
+
+            // CMake Variable:
+            if ( cCurrChar == '$' )
+                state = SCE_CMAKE_DEFAULT;
+            else if ( cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' ) )
+                state = SCE_CMAKE_DEFAULT;
+            else if ( (isCmakeChar(cCurrChar) && !isCmakeChar( cNextChar) && cNextChar != '}') || cCurrChar == '}' ) {
+                state = classifyWordCmake( styler.GetStartSegment(), i, keywordLists, styler );
+                styler.ColourTo( i, state);
+                state = SCE_CMAKE_DEFAULT;
+            }
+            else if ( !isCmakeChar( cCurrChar ) && cCurrChar != '{' && cCurrChar != '}' ) {
+                if ( classifyWordCmake( styler.GetStartSegment(), i-1, keywordLists, styler) == SCE_CMAKE_NUMBER )
+                    styler.ColourTo( i-1, SCE_CMAKE_NUMBER );
+
+                state = SCE_CMAKE_DEFAULT;
+
+                if ( cCurrChar == '"' ) {
+                    state = SCE_CMAKE_STRINGDQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '`' ) {
+                    state = SCE_CMAKE_STRINGLQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '\'' ) {
+                    state = SCE_CMAKE_STRINGRQ;
+                    bVarInString = false;
+                    bClassicVarInString = false;
+                }
+                else if ( cCurrChar == '#' ) {
+                    state = SCE_CMAKE_COMMENT;
+                }
+            }
+            break;
+        }
+
+        if ( state == SCE_CMAKE_STRINGDQ || state == SCE_CMAKE_STRINGLQ || state == SCE_CMAKE_STRINGRQ ) {
+            bool bIngoreNextDollarSign = false;
+
+            if ( bVarInString && cCurrChar == '$' ) {
+                bVarInString = false;
+                bIngoreNextDollarSign = true;
+            }
+            else if ( bVarInString && cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' || cNextChar == '"' || cNextChar == '`' || cNextChar == '\'' ) ) {
+                styler.ColourTo( i+1, SCE_CMAKE_STRINGVAR);
+                bVarInString = false;
+                bIngoreNextDollarSign = false;
+            }
+
+            else if ( bVarInString && !isCmakeChar(cNextChar) ) {
+                int nWordState = classifyWordCmake( styler.GetStartSegment(), i, keywordLists, styler);
+                if ( nWordState == SCE_CMAKE_VARIABLE )
+                    styler.ColourTo( i, SCE_CMAKE_STRINGVAR);
+                bVarInString = false;
+            }
+            // Covers "${TEST}..."
+            else if ( bClassicVarInString && cNextChar == '}' ) {
+                styler.ColourTo( i+1, SCE_CMAKE_STRINGVAR);
+                bClassicVarInString = false;
+            }
+
+            // Start of var in string
+            if ( !bIngoreNextDollarSign && cCurrChar == '$' && cNextChar == '{' ) {
+                styler.ColourTo( i-1, state);
+                bClassicVarInString = true;
+                bVarInString = false;
+            }
+            else if ( !bIngoreNextDollarSign && cCurrChar == '$' ) {
+                styler.ColourTo( i-1, state);
+                bVarInString = true;
+                bClassicVarInString = false;
+            }
+        }
+    }
+
+    // Colourise remaining document
+    styler.ColourTo(nLengthDoc-1,state);
+}
+
+static void FoldCmakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+    // No folding enabled, no reason to continue...
+    if ( styler.GetPropertyInt("fold") == 0 )
+        return;
+
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) == 1;
+
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    Sci_PositionU safeStartPos = styler.LineStart( lineCurrent );
+
+    bool bArg1 = true;
+    Sci_Position nWordStart = -1;
+
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelNext = levelCurrent;
+
+    for (Sci_PositionU i = safeStartPos; i < startPos + length; i++) {
+        char chCurr = styler.SafeGetCharAt(i);
+
+        if ( bArg1 ) {
+            if ( nWordStart == -1 && (isCmakeLetter(chCurr)) ) {
+                nWordStart = i;
+            }
+            else if ( isCmakeLetter(chCurr) == false && nWordStart > -1 ) {
+                int newLevel = calculateFoldCmake( nWordStart, i-1, levelNext, styler, foldAtElse);
+
+                if ( newLevel == levelNext ) {
+                    if ( foldAtElse ) {
+                        if ( CmakeNextLineHasElse(i, startPos + length, styler) )
+                            levelNext--;
+                    }
+                }
+                else
+                    levelNext = newLevel;
+                bArg1 = false;
+            }
+        }
+
+        if ( chCurr == '\n' ) {
+            if ( bArg1 && foldAtElse) {
+                if ( CmakeNextLineHasElse(i, startPos + length, styler) )
+                    levelNext--;
+            }
+
+            // If we are on a new line...
+            int levelUse = levelCurrent;
+            int lev = levelUse | levelNext << 16;
+            if (levelUse < levelNext )
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent))
+                styler.SetLevel(lineCurrent, lev);
+
+            lineCurrent++;
+            levelCurrent = levelNext;
+            bArg1 = true; // New line, lets look at first argument again
+            nWordStart = -1;
+        }
+    }
+
+    int levelUse = levelCurrent;
+    int lev = levelUse | levelNext << 16;
+    if (levelUse < levelNext)
+        lev |= SC_FOLDLEVELHEADERFLAG;
+    if (lev != styler.LevelAt(lineCurrent))
+        styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const cmakeWordLists[] = {
+    "Commands",
+    "Parameters",
+    "UserDefined",
+    0,
+    0,};
+
+LexerModule lmCmake(SCLEX_CMAKE, ColouriseCmakeDoc, "cmake", FoldCmakeDoc, cmakeWordLists);
diff --git a/scite-app/lexilla/lexers/LexCoffeeScript.cxx b/scite-app/lexilla/lexers/LexCoffeeScript.cxx
new file mode 100644
index 0000000..317497a
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCoffeeScript.cxx
@@ -0,0 +1,486 @@
+// Scintilla source code edit control
+/** @file LexCoffeeScript.cxx
+ ** Lexer for CoffeeScript.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// Based on the Scintilla C++ Lexer
+// Written by Eric Promislow <ericp@activestate.com> in 2011 for the Komodo IDE
+// 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 <string>
+#include <string_view>
+
+#include <algorithm>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static bool IsSpaceEquiv(int state) {
+	return (state == SCE_COFFEESCRIPT_DEFAULT
+	    || state == SCE_COFFEESCRIPT_COMMENTLINE
+	    || state == SCE_COFFEESCRIPT_COMMENTBLOCK
+	    || state == SCE_COFFEESCRIPT_VERBOSE_REGEX
+	    || state == SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT
+	    || state == SCE_COFFEESCRIPT_WORD
+	    || state == SCE_COFFEESCRIPT_REGEX);
+}
+
+// Store the current lexer state and brace count prior to starting a new
+// `#{}` interpolation level.
+// Based on LexRuby.cxx.
+static void enterInnerExpression(int  *p_inner_string_types,
+                                 int  *p_inner_expn_brace_counts,
+                                 int&  inner_string_count,
+                                 int   state,
+                                 int&  brace_counts
+                                 ) {
+	p_inner_string_types[inner_string_count] = state;
+	p_inner_expn_brace_counts[inner_string_count] = brace_counts;
+	brace_counts = 0;
+	++inner_string_count;
+}
+
+// Restore the lexer state and brace count for the previous `#{}` interpolation
+// level upon returning to it.
+// Note the previous lexer state is the return value and needs to be restored
+// manually by the StyleContext.
+// Based on LexRuby.cxx.
+static int exitInnerExpression(int  *p_inner_string_types,
+                               int  *p_inner_expn_brace_counts,
+                               int&  inner_string_count,
+                               int&  brace_counts
+                              ) {
+	--inner_string_count;
+	brace_counts = p_inner_expn_brace_counts[inner_string_count];
+	return p_inner_string_types[inner_string_count];
+}
+
+// Preconditions: sc.currentPos points to a character after '+' or '-'.
+// The test for pos reaching 0 should be redundant,
+// and is in only for safety measures.
+// Limitation: this code will give the incorrect answer for code like
+// a = b+++/ptn/...
+// Putting a space between the '++' post-inc operator and the '+' binary op
+// fixes this, and is highly recommended for readability anyway.
+static bool FollowsPostfixOperator(StyleContext &sc, Accessor &styler) {
+	Sci_Position pos = (Sci_Position) sc.currentPos;
+	while (--pos > 0) {
+		char ch = styler[pos];
+		if (ch == '+' || ch == '-') {
+			return styler[pos - 1] == ch;
+		}
+	}
+	return false;
+}
+
+static bool followsKeyword(StyleContext &sc, Accessor &styler) {
+	Sci_Position pos = (Sci_Position) sc.currentPos;
+	Sci_Position currentLine = styler.GetLine(pos);
+	Sci_Position lineStartPos = styler.LineStart(currentLine);
+	while (--pos > lineStartPos) {
+		char ch = styler.SafeGetCharAt(pos);
+		if (ch != ' ' && ch != '\t') {
+			break;
+		}
+	}
+	styler.Flush();
+	return styler.StyleAt(pos) == SCE_COFFEESCRIPT_WORD;
+}
+
+static void ColouriseCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords4 = *keywordlists[3];
+
+	CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-");
+	CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_$@", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._$", 0x80, true);
+
+	int chPrevNonWhite = ' ';
+	int visibleChars = 0;
+
+	// String/Regex interpolation variables, based on LexRuby.cxx.
+	// In most cases a value of 2 should be ample for the code the user is
+	// likely to enter. For example,
+	//   "Filling the #{container} with #{liquid}..."
+	// from the CoffeeScript homepage nests to a level of 2
+	// If the user actually hits a 6th occurrence of '#{' in a double-quoted
+	// string (including regexes), it will stay as a string.  The problem with
+	// this is that quotes might flip, a 7th '#{' will look like a comment,
+	// and code-folding might be wrong.
+#define INNER_STRINGS_MAX_COUNT 5
+	// These vars track our instances of "...#{,,,'..#{,,,}...',,,}..."
+	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];
+	int inner_string_count = 0;
+	int brace_counts = 0;   // Number of #{ ... } things within an expression
+	for (int i = 0; i < INNER_STRINGS_MAX_COUNT; i++) {
+		inner_string_types[i] = 0;
+		inner_expn_brace_counts[i] = 0;
+	}
+
+	// look back to set chPrevNonWhite properly for better regex colouring
+	Sci_Position endPos = startPos + length;
+        if (startPos > 0 && IsSpaceEquiv(initStyle)) {
+		Sci_PositionU back = startPos;
+		styler.Flush();
+		while (back > 0 && IsSpaceEquiv(styler.StyleAt(--back)))
+			;
+		if (styler.StyleAt(back) == SCE_COFFEESCRIPT_OPERATOR) {
+			chPrevNonWhite = styler.SafeGetCharAt(back);
+		}
+		if (startPos != back) {
+			initStyle = styler.StyleAt(back);
+			if (IsSpaceEquiv(initStyle)) {
+				initStyle = SCE_COFFEESCRIPT_DEFAULT;
+			}
+		}
+		startPos = back;
+	}
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	for (; sc.More();) {
+
+		if (sc.atLineStart) {
+			// Reset states to beginning of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_COFFEESCRIPT_OPERATOR:
+				sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				break;
+			case SCE_COFFEESCRIPT_NUMBER:
+				// We accept almost anything because of hex. and number suffixes
+				if (!setWord.Contains(sc.ch) || sc.Match('.', '.')) {
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_IDENTIFIER:
+				if (!setWord.Contains(sc.ch) || (sc.ch == '.') || (sc.ch == '$')) {
+					char s[1000];
+					sc.GetCurrent(s, sizeof(s));
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_COFFEESCRIPT_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_COFFEESCRIPT_WORD2);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_COFFEESCRIPT_GLOBALCLASS);
+					} else if (sc.LengthCurrent() > 0 && s[0] == '@') {
+						sc.ChangeState(SCE_COFFEESCRIPT_INSTANCEPROPERTY);
+					}
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_WORD:
+			case SCE_COFFEESCRIPT_WORD2:
+			case SCE_COFFEESCRIPT_GLOBALCLASS:
+			case SCE_COFFEESCRIPT_INSTANCEPROPERTY:
+				if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_STRING:
+				if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);
+				} else if (sc.ch == '#' && sc.chNext == '{' && inner_string_count < INNER_STRINGS_MAX_COUNT) {
+					// process interpolated code #{ ... }
+					enterInnerExpression(inner_string_types,
+					                     inner_expn_brace_counts,
+					                     inner_string_count,
+					                     sc.state,
+					                     brace_counts);
+					sc.SetState(SCE_COFFEESCRIPT_OPERATOR);
+					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_CHARACTER:
+				if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_REGEX:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				} else if (sc.ch == '/') {
+					sc.Forward();
+					while ((sc.ch < 0x80) && islower(sc.ch))
+						sc.Forward();    // gobble regex flags
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				} else if (sc.ch == '\\') {
+					// Gobble up the quoted character
+					if (sc.chNext == '\\' || sc.chNext == '/') {
+						sc.Forward();
+					}
+				}
+				break;
+			case SCE_COFFEESCRIPT_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_COFFEESCRIPT_DEFAULT);
+				}
+				break;
+			case SCE_COFFEESCRIPT_COMMENTBLOCK:
+				if (sc.Match("###")) {
+					sc.Forward();
+					sc.Forward();
+					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);
+				} else if (sc.ch == '\\') {
+					sc.Forward();
+				}
+				break;
+			case SCE_COFFEESCRIPT_VERBOSE_REGEX:
+				if (sc.Match("///")) {
+					sc.Forward();
+					sc.Forward();
+					sc.ForwardSetState(SCE_COFFEESCRIPT_DEFAULT);
+				} else if (sc.Match('#')) {
+					sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT);
+				} else if (sc.ch == '\\') {
+					sc.Forward();
+				}
+				break;
+			case SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_COFFEESCRIPT_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_COFFEESCRIPT_NUMBER);
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_COFFEESCRIPT_IDENTIFIER);
+			} else if (sc.Match("///")) {
+				sc.SetState(SCE_COFFEESCRIPT_VERBOSE_REGEX);
+				sc.Forward();
+				sc.Forward();
+			} else if (sc.ch == '/'
+				   && (setOKBeforeRE.Contains(chPrevNonWhite)
+				       || followsKeyword(sc, styler))
+				   && (!setCouldBePostOp.Contains(chPrevNonWhite)
+				       || !FollowsPostfixOperator(sc, styler))) {
+				sc.SetState(SCE_COFFEESCRIPT_REGEX);	// JavaScript's RegEx
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_COFFEESCRIPT_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_COFFEESCRIPT_CHARACTER);
+			} else if (sc.ch == '#') {
+				if (sc.Match("###")) {
+					sc.SetState(SCE_COFFEESCRIPT_COMMENTBLOCK);
+					sc.Forward();
+					sc.Forward();
+				} else {
+					sc.SetState(SCE_COFFEESCRIPT_COMMENTLINE);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_COFFEESCRIPT_OPERATOR);
+				// Handle '..' and '...' operators correctly.
+				if (sc.ch == '.') {
+					for (int i = 0; i < 2 && sc.chNext == '.'; i++, sc.Forward()) ;
+				} else if (sc.ch == '{') {
+					++brace_counts;
+				} else if (sc.ch == '}' && --brace_counts <= 0 && inner_string_count > 0) {
+					// Return to previous state before #{ ... }
+					sc.ForwardSetState(exitInnerExpression(inner_string_types,
+					                                       inner_expn_brace_counts,
+					                                       inner_string_count,
+					                                       brace_counts));
+					continue; // skip sc.Forward() at loop end
+				}
+			}
+		}
+
+		if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
+			chPrevNonWhite = sc.ch;
+			visibleChars++;
+		}
+		sc.Forward();
+	}
+	sc.Complete();
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+static void FoldCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position length, int,
+				WordList *[], Accessor &styler) {
+	// A simplified version of FoldPyDoc
+	const Sci_Position maxPos = startPos + length;
+	const Sci_Position maxLines = styler.GetLine(maxPos - 1);             // Requested last line
+	const Sci_Position docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+
+	// property fold.coffeescript.comment
+	const bool foldComment = styler.GetPropertyInt("fold.coffeescript.comment") != 0;
+
+	const bool foldCompact = styler.GetPropertyInt("fold.compact") != 0;
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)
+		    && !IsCommentLine(lineCurrent, styler))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	int prevComment = 0;
+	if (lineCurrent >= 1)
+		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
+
+	// Process all characters to end of requested range
+	// or comment that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of comment at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		Sci_Position lineNext = lineCurrent + 1;
+		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);
+		}
+		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
+		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
+		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
+		const int comment_continue = (comment && prevComment);
+		if (!comment)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (comment_start) {
+			// Place fold point at start of a block of comments
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (comment_continue) {
+			// Add level to rest of lines in the block
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.
+
+		while ((lineNext < docLines) &&
+		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+		}
+
+		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
+		const int levelBeforeComments = std::max(indentCurrentLevel,levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		Sci_Position skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+
+			if (foldCompact) {
+				if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+					skipLevel = levelBeforeComments;
+
+				int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+				styler.SetLevel(skipLine, skipLevel | whiteFlag);
+			} else {
+				if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments &&
+					!(skipLineIndent & SC_FOLDLEVELWHITEFLAG) &&
+					!IsCommentLine(skipLine, styler))
+					skipLevel = levelBeforeComments;
+
+				styler.SetLevel(skipLine, skipLevel);
+			}
+		}
+
+		// Set fold header on non-comment line
+		if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of block comment state of previous line
+		prevComment = comment_start || comment_continue;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, lev);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+}
+
+static const char *const csWordLists[] = {
+            "Keywords",
+            "Secondary keywords",
+            "Unused",
+            "Global classes",
+            0,
+};
+
+LexerModule lmCoffeeScript(SCLEX_COFFEESCRIPT, ColouriseCoffeeScriptDoc, "coffeescript", FoldCoffeeScriptDoc, csWordLists);
diff --git a/scite-app/lexilla/lexers/LexConf.cxx b/scite-app/lexilla/lexers/LexConf.cxx
new file mode 100644
index 0000000..f49a3fc
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexConf.cxx
@@ -0,0 +1,193 @@
+// Scintilla source code edit control
+/** @file LexConf.cxx
+ ** Lexer for Apache Configuration Files.
+ **
+ ** First working version contributed by Ahmad Zawawi <ahmad.zawawi@gmail.com> on October 28, 2000.
+ ** i created this lexer because i needed something pretty when dealing
+ ** when Apache Configuration files...
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseConfDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler)
+{
+	int state = SCE_CONF_DEFAULT;
+	char chNext = styler[startPos];
+	Sci_Position lengthDoc = startPos + length;
+	// create a buffer large enough to take the largest chunk...
+	char *buffer = new char[length+1];
+	Sci_Position bufferCount = 0;
+
+	// this assumes that we have 2 keyword list in conf.properties
+	WordList &directives = *keywordLists[0];
+	WordList &params = *keywordLists[1];
+
+	// go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+		switch(state) {
+			case SCE_CONF_DEFAULT:
+				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
+					// whitespace is simply ignored here...
+					styler.ColourTo(i,SCE_CONF_DEFAULT);
+					break;
+				} else if( ch == '#' ) {
+					// signals the start of a comment...
+					state = SCE_CONF_COMMENT;
+					styler.ColourTo(i,SCE_CONF_COMMENT);
+				} else if( ch == '.' /*|| ch == '/'*/) {
+					// signals the start of a file...
+					state = SCE_CONF_EXTENSION;
+					styler.ColourTo(i,SCE_CONF_EXTENSION);
+				} else if( ch == '"') {
+					state = SCE_CONF_STRING;
+					styler.ColourTo(i,SCE_CONF_STRING);
+				} else if( IsASCII(ch) && ispunct(ch) ) {
+					// signals an operator...
+					// no state jump necessary for this
+					// simple case...
+					styler.ColourTo(i,SCE_CONF_OPERATOR);
+				} else if( IsASCII(ch) && isalpha(ch) ) {
+					// signals the start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+					state = SCE_CONF_IDENTIFIER;
+				} else if( IsASCII(ch) && isdigit(ch) ) {
+					// signals the start of a number
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					//styler.ColourTo(i,SCE_CONF_NUMBER);
+					state = SCE_CONF_NUMBER;
+				} else {
+					// style it the default style..
+					styler.ColourTo(i,SCE_CONF_DEFAULT);
+				}
+				break;
+
+			case SCE_CONF_COMMENT:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_CONF_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_CONF_COMMENT);
+				}
+				break;
+
+			case SCE_CONF_EXTENSION:
+				// if we find a non-alphanumeric char,
+				// we simply go to default state
+				// else we're still dealing with an extension...
+				if( (IsASCII(ch) && isalnum(ch)) || (ch == '_') ||
+					(ch == '-') || (ch == '$') ||
+					(ch == '/') || (ch == '.') || (ch == '*') )
+				{
+					styler.ColourTo(i,SCE_CONF_EXTENSION);
+				} else {
+					state = SCE_CONF_DEFAULT;
+					chNext = styler[i--];
+				}
+				break;
+
+			case SCE_CONF_STRING:
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') || (ch == '\n') || (ch == '\r') ) {
+					state = SCE_CONF_DEFAULT;
+				}
+				styler.ColourTo(i,SCE_CONF_STRING);
+				break;
+
+			case SCE_CONF_IDENTIFIER:
+				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
+				if( (IsASCII(ch) && isalnum(ch)) || (ch == '_') || (ch == '-') || (ch == '/') || (ch == '$') || (ch == '.') || (ch == '*')) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_CONF_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// check if the buffer contains a keyword, and highlight it if it is a keyword...
+					if(directives.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_CONF_DIRECTIVE );
+					} else if(params.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_CONF_PARAMETER );
+					} else if(strchr(buffer,'/') || strchr(buffer,'.')) {
+						styler.ColourTo(i-1,SCE_CONF_EXTENSION);
+					} else {
+						styler.ColourTo(i-1,SCE_CONF_DEFAULT);
+					}
+
+					// push back the faulty character
+					chNext = styler[i--];
+
+				}
+				break;
+
+			case SCE_CONF_NUMBER:
+				// stay  in CONF_NUMBER state until we find a non-numeric
+				if( (IsASCII(ch) && isdigit(ch)) || ch == '.') {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_CONF_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Colourize here...
+					if( strchr(buffer,'.') ) {
+						// it is an IP address...
+						styler.ColourTo(i-1,SCE_CONF_IP);
+					} else {
+						// normal number
+						styler.ColourTo(i-1,SCE_CONF_NUMBER);
+					}
+
+					// push back a character
+					chNext = styler[i--];
+				}
+				break;
+
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const confWordListDesc[] = {
+	"Directives",
+	"Parameters",
+	0
+};
+
+LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf", 0, confWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCrontab.cxx b/scite-app/lexilla/lexers/LexCrontab.cxx
new file mode 100644
index 0000000..907c4a5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCrontab.cxx
@@ -0,0 +1,227 @@
+// Scintilla source code edit control
+/** @file LexCrontab.cxx
+ ** Lexer to use with extended crontab files used by a powerful
+ ** Windows scheduler/event monitor/automation manager nnCron.
+ ** (http://nemtsev.eserv.ru/)
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseNncrontabDoc(Sci_PositionU startPos, Sci_Position length, int, WordList
+*keywordLists[], Accessor &styler)
+{
+	int state = SCE_NNCRONTAB_DEFAULT;
+	char chNext = styler[startPos];
+	Sci_Position lengthDoc = startPos + length;
+	// create a buffer large enough to take the largest chunk...
+	char *buffer = new char[length+1];
+	Sci_Position bufferCount = 0;
+	// used when highliting environment variables inside quoted string:
+	bool insideString = false;
+
+	// this assumes that we have 3 keyword list in conf.properties
+	WordList &section = *keywordLists[0];
+	WordList &keyword = *keywordLists[1];
+	WordList &modifier = *keywordLists[2];
+
+	// go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+		switch(state) {
+			case SCE_NNCRONTAB_DEFAULT:
+				if( ch == '\n' || ch == '\r' || ch == '\t' || ch == ' ') {
+					// whitespace is simply ignored here...
+					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
+					break;
+				} else if( ch == '#' && styler.SafeGetCharAt(i+1) == '(') {
+					// signals the start of a task...
+					state = SCE_NNCRONTAB_TASK;
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				}
+				  else if( ch == '\\' && (styler.SafeGetCharAt(i+1) == ' ' ||
+										 styler.SafeGetCharAt(i+1) == '\t')) {
+					// signals the start of an extended comment...
+					state = SCE_NNCRONTAB_COMMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				} else if( ch == '#' ) {
+					// signals the start of a plain comment...
+					state = SCE_NNCRONTAB_COMMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				} else if( ch == ')' && styler.SafeGetCharAt(i+1) == '#') {
+					// signals the end of a task...
+					state = SCE_NNCRONTAB_TASK;
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				} else if( ch == '"') {
+					state = SCE_NNCRONTAB_STRING;
+					styler.ColourTo(i,SCE_NNCRONTAB_STRING);
+				} else if( ch == '%') {
+					// signals environment variables
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+				} else if( ch == '<' && styler.SafeGetCharAt(i+1) == '%') {
+					// signals environment variables
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+				} else if( ch == '*' ) {
+					// signals an asterisk
+					// no state jump necessary for this simple case...
+					styler.ColourTo(i,SCE_NNCRONTAB_ASTERISK);
+				} else if( (IsASCII(ch) && isalpha(ch)) || ch == '<' ) {
+					// signals the start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					state = SCE_NNCRONTAB_IDENTIFIER;
+				} else if( IsASCII(ch) && isdigit(ch) ) {
+					// signals the start of a number
+					bufferCount = 0;
+					buffer[bufferCount++] = ch;
+					state = SCE_NNCRONTAB_NUMBER;
+				} else {
+					// style it the default style..
+					styler.ColourTo(i,SCE_NNCRONTAB_DEFAULT);
+				}
+				break;
+
+			case SCE_NNCRONTAB_COMMENT:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_NNCRONTAB_COMMENT);
+				}
+				break;
+
+			case SCE_NNCRONTAB_TASK:
+				// if we find a newline here,
+				// we simply go to default state
+				// else continue to work on it...
+				if( ch == '\n' || ch == '\r' ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				} else {
+					styler.ColourTo(i,SCE_NNCRONTAB_TASK);
+				}
+				break;
+
+			case SCE_NNCRONTAB_STRING:
+				if( ch == '%' ) {
+					state = SCE_NNCRONTAB_ENVIRONMENT;
+					insideString = true;
+					styler.ColourTo(i-1,SCE_NNCRONTAB_STRING);
+					break;
+				}
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( (ch == '"' && styler.SafeGetCharAt(i-1)!='\\') ||
+					(ch == '\n') || (ch == '\r') ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+				}
+				styler.ColourTo(i,SCE_NNCRONTAB_STRING);
+				break;
+
+			case SCE_NNCRONTAB_ENVIRONMENT:
+				// if we find the end of a string char, we simply go to default state
+				// else we're still dealing with an string...
+				if( ch == '%' && insideString ) {
+					state = SCE_NNCRONTAB_STRING;
+					insideString = false;
+					break;
+				}
+				if( (ch == '%' && styler.SafeGetCharAt(i-1)!='\\')
+					|| (ch == '\n') || (ch == '\r') || (ch == '>') ) {
+					state = SCE_NNCRONTAB_DEFAULT;
+					styler.ColourTo(i,SCE_NNCRONTAB_ENVIRONMENT);
+					break;
+				}
+				styler.ColourTo(i+1,SCE_NNCRONTAB_ENVIRONMENT);
+				break;
+
+			case SCE_NNCRONTAB_IDENTIFIER:
+				// stay  in CONF_IDENTIFIER state until we find a non-alphanumeric
+				if( (IsASCII(ch) && isalnum(ch)) || (ch == '_') || (ch == '-') || (ch == '/') ||
+					(ch == '$') || (ch == '.') || (ch == '<') || (ch == '>') ||
+					(ch == '@') ) {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_NNCRONTAB_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// check if the buffer contains a keyword,
+					// and highlight it if it is a keyword...
+					if(section.InList(buffer)) {
+						styler.ColourTo(i,SCE_NNCRONTAB_SECTION );
+					} else if(keyword.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_KEYWORD );
+					} // else if(strchr(buffer,'/') || strchr(buffer,'.')) {
+					//	styler.ColourTo(i-1,SCE_NNCRONTAB_EXTENSION);
+					// }
+					  else if(modifier.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_MODIFIER );
+					  }	else {
+						styler.ColourTo(i-1,SCE_NNCRONTAB_DEFAULT);
+					}
+					// push back the faulty character
+					chNext = styler[i--];
+				}
+				break;
+
+			case SCE_NNCRONTAB_NUMBER:
+				// stay  in CONF_NUMBER state until we find a non-numeric
+				if( IsASCII(ch) && isdigit(ch) /* || ch == '.' */ ) {
+					buffer[bufferCount++] = ch;
+				} else {
+					state = SCE_NNCRONTAB_DEFAULT;
+					buffer[bufferCount] = '\0';
+					// Colourize here... (normal number)
+					styler.ColourTo(i-1,SCE_NNCRONTAB_NUMBER);
+					// push back a character
+					chNext = styler[i--];
+				}
+				break;
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const cronWordListDesc[] = {
+	"Section keywords and Forth words",
+	"nnCrontab keywords",
+	"Modifiers",
+	0
+};
+
+LexerModule lmNncrontab(SCLEX_NNCRONTAB, ColouriseNncrontabDoc, "nncrontab", 0, cronWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexCsound.cxx b/scite-app/lexilla/lexers/LexCsound.cxx
new file mode 100644
index 0000000..524abb6
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexCsound.cxx
@@ -0,0 +1,215 @@
+// Scintilla source code edit control
+/** @file LexCsound.cxx
+ ** Lexer for Csound (Orchestra & Score)
+ ** Written by Georg Ritter - <ritterfuture A T gmail D O T com>
+ **/
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' ||
+		ch == '_' || ch == '?');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.' ||
+		ch == '%' || ch == '@' || ch == '$' || ch == '?');
+}
+
+static inline bool IsCsoundOperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		ch == '(' || ch == ')' || ch == '=' || ch == '^' ||
+		ch == '[' || ch == ']' || ch == '<' || ch == '&' ||
+		ch == '>' || ch == ',' || ch == '|' || ch == '~' ||
+		ch == '%' || ch == ':')
+		return true;
+	return false;
+}
+
+static void ColouriseCsoundDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+				Accessor &styler) {
+
+	WordList &opcode = *keywordlists[0];
+	WordList &headerStmt = *keywordlists[1];
+	WordList &otherKeyword = *keywordlists[2];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_CSOUND_STRINGEOL)
+		initStyle = SCE_CSOUND_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_CSOUND_OPERATOR) {
+			if (!IsCsoundOperator(static_cast<char>(sc.ch))) {
+			    sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}else if (sc.state == SCE_CSOUND_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		} else if (sc.state == SCE_CSOUND_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (opcode.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_OPCODE);
+				} else if (headerStmt.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_HEADERSTMT);
+				} else if (otherKeyword.InList(s)) {
+					sc.ChangeState(SCE_CSOUND_USERKEYWORD);
+				} else if (s[0] == 'p') {
+					sc.ChangeState(SCE_CSOUND_PARAM);
+				} else if (s[0] == 'a') {
+					sc.ChangeState(SCE_CSOUND_ARATE_VAR);
+				} else if (s[0] == 'k') {
+					sc.ChangeState(SCE_CSOUND_KRATE_VAR);
+				} else if (s[0] == 'i') { // covers both i-rate variables and i-statements
+					sc.ChangeState(SCE_CSOUND_IRATE_VAR);
+				} else if (s[0] == 'g') {
+					sc.ChangeState(SCE_CSOUND_GLOBAL_VAR);
+				}
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+		else if (sc.state == SCE_CSOUND_COMMENT ) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+		else if ((sc.state == SCE_CSOUND_ARATE_VAR) ||
+			(sc.state == SCE_CSOUND_KRATE_VAR) ||
+		(sc.state == SCE_CSOUND_IRATE_VAR)) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_CSOUND_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_CSOUND_DEFAULT) {
+			if (sc.ch == ';'){
+				sc.SetState(SCE_CSOUND_COMMENT);
+			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
+				sc.SetState(SCE_CSOUND_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_CSOUND_IDENTIFIER);
+			} else if (IsCsoundOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_CSOUND_OPERATOR);
+			} else if (sc.ch == 'p') {
+				sc.SetState(SCE_CSOUND_PARAM);
+			} else if (sc.ch == 'a') {
+				sc.SetState(SCE_CSOUND_ARATE_VAR);
+			} else if (sc.ch == 'k') {
+				sc.SetState(SCE_CSOUND_KRATE_VAR);
+			} else if (sc.ch == 'i') { // covers both i-rate variables and i-statements
+				sc.SetState(SCE_CSOUND_IRATE_VAR);
+			} else if (sc.ch == 'g') {
+				sc.SetState(SCE_CSOUND_GLOBAL_VAR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldCsoundInstruments(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[],
+		Accessor &styler) {
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int stylePrev = 0;
+	int styleNext = styler.StyleAt(startPos);
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if ((stylePrev != SCE_CSOUND_OPCODE) && (style == SCE_CSOUND_OPCODE)) {
+			char s[20];
+			unsigned int j = 0;
+			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
+				s[j] = styler[i + j];
+				j++;
+			}
+			s[j] = '\0';
+
+			if (strcmp(s, "instr") == 0)
+				levelCurrent++;
+			if (strcmp(s, "endin") == 0)
+				levelCurrent--;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		stylePrev = style;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+static const char * const csoundWordListDesc[] = {
+	"Opcodes",
+	"Header Statements",
+	"User keywords",
+	0
+};
+
+LexerModule lmCsound(SCLEX_CSOUND, ColouriseCsoundDoc, "csound", FoldCsoundInstruments, csoundWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexD.cxx b/scite-app/lexilla/lexers/LexD.cxx
new file mode 100644
index 0000000..5b8dab9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexD.cxx
@@ -0,0 +1,574 @@
+/** @file LexD.cxx
+ ** Lexer for D.
+ **
+ ** Copyright (c) 2006 by Waldemar Augustyn <waldemar@wdmsys.com>
+ ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+/* Nested comments require keeping the value of the nesting level for every
+   position in the document.  But since scintilla always styles line by line,
+   we only need to store one value per line. The non-negative number indicates
+   nesting level at the end of the line.
+*/
+
+// Underscore, letter, digit and universal alphas from C99 Appendix D.
+
+static bool IsWordStart(int ch) {
+	return (IsASCII(ch) && (isalpha(ch) || ch == '_')) || !IsASCII(ch);
+}
+
+static bool IsWord(int ch) {
+	return (IsASCII(ch) && (isalnum(ch) || ch == '_')) || !IsASCII(ch);
+}
+
+static bool IsDoxygen(int ch) {
+	if (IsASCII(ch) && islower(ch))
+		return true;
+	if (ch == '$' || ch == '@' || ch == '\\' ||
+		ch == '&' || ch == '#' || ch == '<' || ch == '>' ||
+		ch == '{' || ch == '}' || ch == '[' || ch == ']')
+		return true;
+	return false;
+}
+
+static bool IsStringSuffix(int ch) {
+	return ch == 'c' || ch == 'w' || ch == 'd';
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_D_COMMENT ||
+		style == SCE_D_COMMENTDOC ||
+		style == SCE_D_COMMENTDOCKEYWORD ||
+		style == SCE_D_COMMENTDOCKEYWORDERROR;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerD
+struct OptionsD {
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldComment;
+	bool foldCommentMultiline;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldCompact;
+	int  foldAtElseInt;
+	bool foldAtElse;
+	OptionsD() {
+		fold = false;
+		foldSyntaxBased = true;
+		foldComment = false;
+		foldCommentMultiline = true;
+		foldCommentExplicit = true;
+		foldExplicitStart = "";
+		foldExplicitEnd   = "";
+		foldExplicitAnywhere = false;
+		foldCompact = true;
+		foldAtElseInt = -1;
+		foldAtElse = false;
+	}
+};
+
+static const char * const dWordLists[] = {
+			"Primary keywords and identifiers",
+			"Secondary keywords and identifiers",
+			"Documentation comment keywords",
+			"Type definitions and aliases",
+			"Keywords 5",
+			"Keywords 6",
+			"Keywords 7",
+			0,
+		};
+
+struct OptionSetD : public OptionSet<OptionsD> {
+	OptionSetD() {
+		DefineProperty("fold", &OptionsD::fold);
+
+		DefineProperty("fold.d.syntax.based", &OptionsD::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.comment", &OptionsD::foldComment);
+
+		DefineProperty("fold.d.comment.multiline", &OptionsD::foldCommentMultiline,
+			"Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+
+		DefineProperty("fold.d.comment.explicit", &OptionsD::foldCommentExplicit,
+			"Set this property to 0 to disable folding explicit fold points when fold.comment=1.");
+
+		DefineProperty("fold.d.explicit.start", &OptionsD::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard //{.");
+
+		DefineProperty("fold.d.explicit.end", &OptionsD::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard //}.");
+
+		DefineProperty("fold.d.explicit.anywhere", &OptionsD::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("fold.compact", &OptionsD::foldCompact);
+
+		DefineProperty("lexer.d.fold.at.else", &OptionsD::foldAtElseInt,
+			"This option enables D folding on a \"} else {\" line of an if statement.");
+
+		DefineProperty("fold.at.else", &OptionsD::foldAtElse);
+
+		DefineWordListSets(dWordLists);
+	}
+};
+
+class LexerD : public DefaultLexer {
+	bool caseSensitive;
+	WordList keywords;
+	WordList keywords2;
+	WordList keywords3;
+	WordList keywords4;
+	WordList keywords5;
+	WordList keywords6;
+	WordList keywords7;
+	OptionsD options;
+	OptionSetD osD;
+public:
+	LexerD(bool caseSensitive_) :
+		DefaultLexer("D", SCLEX_D),
+		caseSensitive(caseSensitive_) {
+	}
+	virtual ~LexerD() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osD.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osD.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osD.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osD.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osD.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	static ILexer5 *LexerFactoryD() {
+		return new LexerD(true);
+	}
+	static ILexer5 *LexerFactoryDInsensitive() {
+		return new LexerD(false);
+	}
+};
+
+Sci_Position SCI_METHOD LexerD::PropertySet(const char *key, const char *val) {
+	if (osD.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerD::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	case 2:
+		wordListN = &keywords3;
+		break;
+	case 3:
+		wordListN = &keywords4;
+		break;
+	case 4:
+		wordListN = &keywords5;
+		break;
+	case 5:
+		wordListN = &keywords6;
+		break;
+	case 6:
+		wordListN = &keywords7;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerD::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	int styleBeforeDCKeyword = SCE_D_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	Sci_Position curLine = styler.GetLine(startPos);
+	int curNcLevel = curLine > 0? styler.GetLineState(curLine-1): 0;
+	bool numFloat = false; // Float literals have '+' and '-' signs
+	bool numHex = false;
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			curLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(curLine, curNcLevel);
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_D_OPERATOR:
+				sc.SetState(SCE_D_DEFAULT);
+				break;
+			case SCE_D_NUMBER:
+				// We accept almost anything because of hex. and number suffixes
+				if (IsASCII(sc.ch) && (isalnum(sc.ch) || sc.ch == '_')) {
+					continue;
+				} else if (sc.ch == '.' && sc.chNext != '.' && !numFloat) {
+					// Don't parse 0..2 as number.
+					numFloat=true;
+					continue;
+				} else if ( ( sc.ch == '-' || sc.ch == '+' ) && (		/*sign and*/
+					( !numHex && ( sc.chPrev == 'e' || sc.chPrev == 'E' ) ) || /*decimal or*/
+					( sc.chPrev == 'p' || sc.chPrev == 'P' ) ) ) {		/*hex*/
+					// Parse exponent sign in float literals: 2e+10 0x2e+10
+					continue;
+				} else {
+					sc.SetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_IDENTIFIER:
+				if (!IsWord(sc.ch)) {
+					char s[1000];
+					if (caseSensitive) {
+						sc.GetCurrent(s, sizeof(s));
+					} else {
+						sc.GetCurrentLowered(s, sizeof(s));
+					}
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_D_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_D_WORD2);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_D_TYPEDEF);
+					} else if (keywords5.InList(s)) {
+						sc.ChangeState(SCE_D_WORD5);
+					} else if (keywords6.InList(s)) {
+						sc.ChangeState(SCE_D_WORD6);
+					} else if (keywords7.InList(s)) {
+						sc.ChangeState(SCE_D_WORD7);
+					}
+					sc.SetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_COMMENTDOC:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_D_COMMENTDOC;
+						sc.SetState(SCE_D_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_D_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_COMMENTLINEDOC:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_D_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_D_COMMENTLINEDOC;
+						sc.SetState(SCE_D_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_D_COMMENTDOCKEYWORD:
+				if ((styleBeforeDCKeyword == SCE_D_COMMENTDOC) && sc.Match('*', '/')) {
+					sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR);
+					sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				} else if (!IsDoxygen(sc.ch)) {
+					char s[100];
+					if (caseSensitive) {
+						sc.GetCurrent(s, sizeof(s));
+					} else {
+						sc.GetCurrentLowered(s, sizeof(s));
+					}
+					if (!IsASpace(sc.ch) || !keywords3.InList(s + 1)) {
+						sc.ChangeState(SCE_D_COMMENTDOCKEYWORDERROR);
+					}
+					sc.SetState(styleBeforeDCKeyword);
+				}
+				break;
+			case SCE_D_COMMENTNESTED:
+				if (sc.Match('+', '/')) {
+					if (curNcLevel > 0)
+						curNcLevel -= 1;
+					curLine = styler.GetLine(sc.currentPos);
+					styler.SetLineState(curLine, curNcLevel);
+					sc.Forward();
+					if (curNcLevel == 0) {
+						sc.ForwardSetState(SCE_D_DEFAULT);
+					}
+				} else if (sc.Match('/','+')) {
+					curNcLevel += 1;
+					curLine = styler.GetLine(sc.currentPos);
+					styler.SetLineState(curLine, curNcLevel);
+					sc.Forward();
+				}
+				break;
+			case SCE_D_STRING:
+				if (sc.ch == '\\') {
+					if (sc.chNext == '"' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '"') {
+					if(IsStringSuffix(sc.chNext))
+						sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_D_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					// Char has no suffixes
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_STRINGB:
+				if (sc.ch == '`') {
+					if(IsStringSuffix(sc.chNext))
+						sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				}
+				break;
+			case SCE_D_STRINGR:
+				if (sc.ch == '"') {
+					if(IsStringSuffix(sc.chNext))
+						sc.Forward();
+					sc.ForwardSetState(SCE_D_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_D_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_D_NUMBER);
+				numFloat = sc.ch == '.';
+				// Remember hex literal
+				numHex = sc.ch == '0' && ( sc.chNext == 'x' || sc.chNext == 'X' );
+			} else if ( (sc.ch == 'r' || sc.ch == 'x' || sc.ch == 'q')
+				&& sc.chNext == '"' ) {
+				// Limited support for hex and delimited strings: parse as r""
+				sc.SetState(SCE_D_STRINGR);
+				sc.Forward();
+			} else if (IsWordStart(sc.ch) || sc.ch == '$') {
+				sc.SetState(SCE_D_IDENTIFIER);
+			} else if (sc.Match('/','+')) {
+				curNcLevel += 1;
+				curLine = styler.GetLine(sc.currentPos);
+				styler.SetLineState(curLine, curNcLevel);
+				sc.SetState(SCE_D_COMMENTNESTED);
+				sc.Forward();
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {   // Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_D_COMMENTDOC);
+				} else {
+					sc.SetState(SCE_D_COMMENT);
+				}
+				sc.Forward();   // Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
+					// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_D_COMMENTLINEDOC);
+				else
+					sc.SetState(SCE_D_COMMENTLINE);
+			} else if (sc.ch == '"') {
+				sc.SetState(SCE_D_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_D_CHARACTER);
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_D_STRINGB);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_D_OPERATOR);
+				if (sc.ch == '.' && sc.chNext == '.') sc.Forward(); // Range operator
+			}
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+
+void SCI_METHOD LexerD::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool foldAtElse = options.foldAtElseInt >= 0 ? options.foldAtElseInt != 0 : options.foldAtElse;
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (options.foldComment && options.foldCommentExplicit && ((style == SCE_D_COMMENTLINE) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+ 					levelNext++;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+ 					levelNext--;
+ 				}
+			} else {
+				if ((ch == '/') && (chNext == '/')) {
+					char chNext2 = styler.SafeGetCharAt(i + 2);
+					if (chNext2 == '{') {
+						levelNext++;
+					} else if (chNext2 == '}') {
+						levelNext--;
+					}
+				}
+ 			}
+ 		}
+		if (options.foldSyntaxBased && (style == SCE_D_OPERATOR)) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (atEOL || (i == endPos-1)) {
+			if (options.foldComment && options.foldCommentMultiline) {  // Handle nested comments
+				int nc;
+				nc =  styler.GetLineState(lineCurrent);
+				nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0;
+				levelNext += nc;
+			}
+			int levelUse = levelCurrent;
+			if (options.foldSyntaxBased && foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+	}
+}
+
+LexerModule lmD(SCLEX_D, LexerD::LexerFactoryD, "d", dWordLists);
diff --git a/scite-app/lexilla/lexers/LexDMAP.cxx b/scite-app/lexilla/lexers/LexDMAP.cxx
new file mode 100644
index 0000000..ef71ee1
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexDMAP.cxx
@@ -0,0 +1,229 @@
+// Scintilla source code edit control
+/** @file LexDMAP.cxx
+ ** Lexer for MSC Nastran DMAP.
+ ** Written by Mark Robinson, based on the Fortran lexer by Chuan-jian Shen, Last changed Aug. 2013
+ **/
+// 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 <string>
+#include <string_view>
+/***************************************/
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+/***************************************/
+
+using namespace Lexilla;
+
+/***********************************************/
+static inline bool IsAWordChar(const int ch) {
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '%');
+}
+/**********************************************/
+static inline bool IsAWordStart(const int ch) {
+    return (ch < 0x80) && (isalnum(ch));
+}
+/***************************************/
+static void ColouriseDMAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+            WordList *keywordlists[], Accessor &styler) {
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    /***************************************/
+    Sci_Position posLineStart = 0, numNonBlank = 0;
+    Sci_Position endPos = startPos + length;
+    /***************************************/
+    // backtrack to the nearest keyword
+    while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_DMAP_WORD)) {
+        startPos--;
+    }
+    startPos = styler.LineStart(styler.GetLine(startPos));
+    initStyle = styler.StyleAt(startPos - 1);
+    StyleContext sc(startPos, endPos-startPos, initStyle, styler);
+    /***************************************/
+    for (; sc.More(); sc.Forward()) {
+        // remember the start position of the line
+        if (sc.atLineStart) {
+            posLineStart = sc.currentPos;
+            numNonBlank = 0;
+            sc.SetState(SCE_DMAP_DEFAULT);
+        }
+        if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
+        /***********************************************/
+        // Handle data appearing after column 72; it is ignored
+        Sci_Position toLineStart = sc.currentPos - posLineStart;
+        if (toLineStart >= 72 || sc.ch == '$') {
+            sc.SetState(SCE_DMAP_COMMENT);
+            while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
+            continue;
+        }
+        /***************************************/
+        // Determine if the current state should terminate.
+        if (sc.state == SCE_DMAP_OPERATOR) {
+            sc.SetState(SCE_DMAP_DEFAULT);
+        } else if (sc.state == SCE_DMAP_NUMBER) {
+            if (!(IsAWordChar(sc.ch) || sc.ch=='\'' || sc.ch=='\"' || sc.ch=='.')) {
+                sc.SetState(SCE_DMAP_DEFAULT);
+            }
+        } else if (sc.state == SCE_DMAP_IDENTIFIER) {
+            if (!IsAWordChar(sc.ch) || (sc.ch == '%')) {
+                char s[100];
+                sc.GetCurrentLowered(s, sizeof(s));
+                if (keywords.InList(s)) {
+                    sc.ChangeState(SCE_DMAP_WORD);
+                } else if (keywords2.InList(s)) {
+                    sc.ChangeState(SCE_DMAP_WORD2);
+                } else if (keywords3.InList(s)) {
+                    sc.ChangeState(SCE_DMAP_WORD3);
+                }
+                sc.SetState(SCE_DMAP_DEFAULT);
+            }
+        } else if (sc.state == SCE_DMAP_COMMENT) {
+            if (sc.ch == '\r' || sc.ch == '\n') {
+                sc.SetState(SCE_DMAP_DEFAULT);
+            }
+        } else if (sc.state == SCE_DMAP_STRING1) {
+            if (sc.ch == '\'') {
+                if (sc.chNext == '\'') {
+                    sc.Forward();
+                } else {
+                    sc.ForwardSetState(SCE_DMAP_DEFAULT);
+                }
+            } else if (sc.atLineEnd) {
+                sc.ChangeState(SCE_DMAP_STRINGEOL);
+                sc.ForwardSetState(SCE_DMAP_DEFAULT);
+            }
+        } else if (sc.state == SCE_DMAP_STRING2) {
+            if (sc.atLineEnd) {
+                sc.ChangeState(SCE_DMAP_STRINGEOL);
+                sc.ForwardSetState(SCE_DMAP_DEFAULT);
+            } else if (sc.ch == '\"') {
+                if (sc.chNext == '\"') {
+                    sc.Forward();
+                } else {
+                    sc.ForwardSetState(SCE_DMAP_DEFAULT);
+                }
+            }
+        }
+        /***************************************/
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_DMAP_DEFAULT) {
+            if (sc.ch == '$') {
+                sc.SetState(SCE_DMAP_COMMENT);
+            } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext)) || (sc.ch == '-' && IsADigit(sc.chNext))) {
+                sc.SetState(SCE_F_NUMBER);
+            } else if (IsAWordStart(sc.ch)) {
+                sc.SetState(SCE_DMAP_IDENTIFIER);
+            } else if (sc.ch == '\"') {
+                sc.SetState(SCE_DMAP_STRING2);
+            } else if (sc.ch == '\'') {
+                sc.SetState(SCE_DMAP_STRING1);
+            } else if (isoperator(static_cast<char>(sc.ch))) {
+                sc.SetState(SCE_DMAP_OPERATOR);
+            }
+        }
+    }
+    sc.Complete();
+}
+/***************************************/
+// To determine the folding level depending on keywords
+static int classifyFoldPointDMAP(const char* s, const char* prevWord) {
+    int lev = 0;
+    if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "enddo") == 0 || strcmp(s, "endif") == 0) {
+        lev = -1;
+    } else if ((strcmp(prevWord, "do") == 0 && strcmp(s, "while") == 0) || strcmp(s, "then") == 0) {
+        lev = 1;
+    }
+    return lev;
+}
+// Folding the code
+static void FoldDMAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *[], Accessor &styler) {
+    //
+    // bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+    // Do not know how to fold the comment at the moment.
+    //
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+    int levelCurrent = levelPrev;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    int style = initStyle;
+    /***************************************/
+    Sci_Position lastStart = 0;
+    char prevWord[32] = "";
+    /***************************************/
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int stylePrev = style;
+        style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        //
+        if ((stylePrev == SCE_DMAP_DEFAULT || stylePrev == SCE_DMAP_OPERATOR || stylePrev == SCE_DMAP_COMMENT) && (style == SCE_DMAP_WORD)) {
+            // Store last word and label start point.
+            lastStart = i;
+        }
+        /***************************************/
+        if (style == SCE_DMAP_WORD) {
+            if(iswordchar(ch) && !iswordchar(chNext)) {
+                char s[32];
+                Sci_PositionU k;
+                for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
+                    s[k] = static_cast<char>(tolower(styler[lastStart+k]));
+                }
+                s[k] = '\0';
+                levelCurrent += classifyFoldPointDMAP(s, prevWord);
+                strcpy(prevWord, s);
+            }
+        }
+        if (atEOL) {
+            int lev = levelPrev;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if ((levelCurrent > levelPrev) && (visibleChars > 0))
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelPrev = levelCurrent;
+            visibleChars = 0;
+            strcpy(prevWord, "");
+        }
+        /***************************************/
+        if (!isspacechar(ch)) visibleChars++;
+    }
+    /***************************************/
+    // Fill in the real level of the next line, keeping the current flags as they will be filled in later
+    int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+    styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+/***************************************/
+static const char * const DMAPWordLists[] = {
+    "Primary keywords and identifiers",
+    "Intrinsic functions",
+    "Extended and user defined functions",
+    0,
+};
+/***************************************/
+LexerModule lmDMAP(SCLEX_DMAP, ColouriseDMAPDoc, "DMAP", FoldDMAPDoc, DMAPWordLists);
diff --git a/scite-app/lexilla/lexers/LexDMIS.cxx b/scite-app/lexilla/lexers/LexDMIS.cxx
new file mode 100644
index 0000000..be117ad
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexDMIS.cxx
@@ -0,0 +1,361 @@
+// Scintilla source code edit control
+/** @file LexDMIS.cxx
+ ** Lexer for DMIS.
+  **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 2013-2014 by Andreas Tscharner <andy@vis.ethz.ch>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "DefaultLexer.h"
+
+using namespace Lexilla;
+
+
+static const char *const DMISWordListDesc[] = {
+	"DMIS Major Words",
+	"DMIS Minor Words",
+	"Unsupported DMIS Major Words",
+	"Unsupported DMIS Minor Words",
+	"Keywords for code folding start",
+	"Corresponding keywords for code folding end",
+	0
+};
+
+
+class LexerDMIS : public DefaultLexer
+{
+	private:
+		char *m_wordListSets;
+		WordList m_majorWords;
+		WordList m_minorWords;
+		WordList m_unsupportedMajor;
+		WordList m_unsupportedMinor;
+		WordList m_codeFoldingStart;
+		WordList m_codeFoldingEnd;
+
+		char * SCI_METHOD UpperCase(char *item);
+		void SCI_METHOD InitWordListSets(void);
+
+	public:
+		LexerDMIS(void);
+		virtual ~LexerDMIS(void);
+
+		int SCI_METHOD Version() const override {
+			return Scintilla::lvRelease5;
+		}
+
+		void SCI_METHOD Release() override {
+			delete this;
+		}
+
+		const char * SCI_METHOD PropertyNames() override {
+			return NULL;
+		}
+
+		int SCI_METHOD PropertyType(const char *) override {
+			return -1;
+		}
+
+		const char * SCI_METHOD DescribeProperty(const char *) override {
+			return NULL;
+		}
+
+		Sci_Position SCI_METHOD PropertySet(const char *, const char *) override {
+			return -1;
+		}
+
+		const char * SCI_METHOD PropertyGet(const char *) override {
+			return NULL;
+		}
+
+		Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+
+		void * SCI_METHOD PrivateCall(int, void *) override {
+			return NULL;
+		}
+
+		static ILexer5 *LexerFactoryDMIS() {
+			return new LexerDMIS;
+		}
+
+		const char * SCI_METHOD DescribeWordListSets() override;
+		void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+		void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+};
+
+
+char * SCI_METHOD LexerDMIS::UpperCase(char *item)
+{
+	char *itemStart;
+
+
+	itemStart = item;
+	while (item && *item) {
+		*item = toupper(*item);
+		item++;
+	};
+	return itemStart;
+}
+
+void SCI_METHOD LexerDMIS::InitWordListSets(void)
+{
+	size_t totalLen = 0;
+
+
+	for (int i=0; DMISWordListDesc[i]; i++) {
+		totalLen += strlen(DMISWordListDesc[i]);
+		totalLen++;
+	};
+
+	totalLen++;
+	this->m_wordListSets = new char[totalLen];
+	memset(this->m_wordListSets, 0, totalLen);
+
+	for (int i=0; DMISWordListDesc[i]; i++) {
+		strcat(this->m_wordListSets, DMISWordListDesc[i]);
+		strcat(this->m_wordListSets, "\n");
+	};
+}
+
+
+LexerDMIS::LexerDMIS(void) : DefaultLexer("DMIS", SCLEX_DMIS) {
+	this->InitWordListSets();
+
+	this->m_majorWords.Clear();
+	this->m_minorWords.Clear();
+	this->m_unsupportedMajor.Clear();
+	this->m_unsupportedMinor.Clear();
+	this->m_codeFoldingStart.Clear();
+	this->m_codeFoldingEnd.Clear();
+}
+
+LexerDMIS::~LexerDMIS(void) {
+	delete[] this->m_wordListSets;
+}
+
+Sci_Position SCI_METHOD LexerDMIS::WordListSet(int n, const char *wl)
+{
+	switch (n) {
+		case 0:
+			this->m_majorWords.Clear();
+			this->m_majorWords.Set(wl);
+			break;
+		case 1:
+			this->m_minorWords.Clear();
+			this->m_minorWords.Set(wl);
+			break;
+		case 2:
+			this->m_unsupportedMajor.Clear();
+			this->m_unsupportedMajor.Set(wl);
+			break;
+		case 3:
+			this->m_unsupportedMinor.Clear();
+			this->m_unsupportedMinor.Set(wl);
+			break;
+		case 4:
+			this->m_codeFoldingStart.Clear();
+			this->m_codeFoldingStart.Set(wl);
+			break;
+		case 5:
+			this->m_codeFoldingEnd.Clear();
+			this->m_codeFoldingEnd.Set(wl);
+			break;
+		default:
+			return -1;
+			break;
+	}
+
+	return 0;
+}
+
+const char * SCI_METHOD LexerDMIS::DescribeWordListSets()
+{
+	return this->m_wordListSets;
+}
+
+void SCI_METHOD LexerDMIS::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess)
+{
+	const Sci_PositionU MAX_STR_LEN = 100;
+
+	LexAccessor styler(pAccess);
+	StyleContext scCTX(startPos, lengthDoc, initStyle, styler);
+	CharacterSet setDMISNumber(CharacterSet::setDigits, ".-+eE");
+	CharacterSet setDMISWordStart(CharacterSet::setAlpha, "-234", 0x80, true);
+	CharacterSet setDMISWord(CharacterSet::setAlpha);
+
+
+	bool isIFLine = false;
+
+	for (; scCTX.More(); scCTX.Forward()) {
+		if (scCTX.atLineEnd) {
+			isIFLine = false;
+		};
+
+		switch (scCTX.state) {
+			case SCE_DMIS_DEFAULT:
+				if (scCTX.Match('$', '$')) {
+					scCTX.SetState(SCE_DMIS_COMMENT);
+					scCTX.Forward();
+				};
+				if (scCTX.Match('\'')) {
+					scCTX.SetState(SCE_DMIS_STRING);
+				};
+				if (IsADigit(scCTX.ch) || ((scCTX.Match('-') || scCTX.Match('+')) && IsADigit(scCTX.chNext))) {
+					scCTX.SetState(SCE_DMIS_NUMBER);
+					break;
+				};
+				if (setDMISWordStart.Contains(scCTX.ch)) {
+					scCTX.SetState(SCE_DMIS_KEYWORD);
+				};
+				if (scCTX.Match('(') && (!isIFLine)) {
+					scCTX.SetState(SCE_DMIS_LABEL);
+				};
+				break;
+
+			case SCE_DMIS_COMMENT:
+				if (scCTX.atLineEnd) {
+					scCTX.SetState(SCE_DMIS_DEFAULT);
+				};
+				break;
+
+			case SCE_DMIS_STRING:
+				if (scCTX.Match('\'')) {
+					scCTX.SetState(SCE_DMIS_DEFAULT);
+				};
+				break;
+
+			case SCE_DMIS_NUMBER:
+				if (!setDMISNumber.Contains(scCTX.ch)) {
+					scCTX.SetState(SCE_DMIS_DEFAULT);
+				};
+				break;
+
+			case SCE_DMIS_KEYWORD:
+				if (!setDMISWord.Contains(scCTX.ch)) {
+					char tmpStr[MAX_STR_LEN];
+					memset(tmpStr, 0, MAX_STR_LEN*sizeof(char));
+					scCTX.GetCurrent(tmpStr, (MAX_STR_LEN-1));
+					strncpy(tmpStr, this->UpperCase(tmpStr), (MAX_STR_LEN-1));
+
+					if (this->m_minorWords.InList(tmpStr)) {
+						scCTX.ChangeState(SCE_DMIS_MINORWORD);
+					};
+					if (this->m_majorWords.InList(tmpStr)) {
+						isIFLine = (strcmp(tmpStr, "IF") == 0);
+						scCTX.ChangeState(SCE_DMIS_MAJORWORD);
+					};
+					if (this->m_unsupportedMajor.InList(tmpStr)) {
+						scCTX.ChangeState(SCE_DMIS_UNSUPPORTED_MAJOR);
+					};
+					if (this->m_unsupportedMinor.InList(tmpStr)) {
+						scCTX.ChangeState(SCE_DMIS_UNSUPPORTED_MINOR);
+					};
+
+					if (scCTX.Match('(') && (!isIFLine)) {
+						scCTX.SetState(SCE_DMIS_LABEL);
+					} else {
+						scCTX.SetState(SCE_DMIS_DEFAULT);
+					};
+				};
+				break;
+
+			case SCE_DMIS_LABEL:
+				if (scCTX.Match(')')) {
+					scCTX.SetState(SCE_DMIS_DEFAULT);
+				};
+				break;
+		};
+	};
+	scCTX.Complete();
+}
+
+void SCI_METHOD LexerDMIS::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int, Scintilla::IDocument *pAccess)
+{
+	const int MAX_STR_LEN = 100;
+
+	LexAccessor styler(pAccess);
+	Sci_PositionU endPos = startPos + lengthDoc;
+	char chNext = styler[startPos];
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	int strPos = 0;
+	bool foldWordPossible = false;
+	CharacterSet setDMISFoldWord(CharacterSet::setAlpha);
+	char *tmpStr;
+
+
+	tmpStr = new char[MAX_STR_LEN];
+	memset(tmpStr, 0, MAX_STR_LEN*sizeof(char));
+
+	for (Sci_PositionU i=startPos; i<endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i+1);
+
+		bool atEOL = ((ch == '\r' && chNext != '\n') || (ch == '\n'));
+
+		if (strPos >= (MAX_STR_LEN-1)) {
+			strPos = MAX_STR_LEN-1;
+		};
+
+		int style = styler.StyleAt(i);
+		bool noFoldPos = ((style == SCE_DMIS_COMMENT) || (style == SCE_DMIS_STRING));
+
+		if (foldWordPossible) {
+			if (setDMISFoldWord.Contains(ch)) {
+				tmpStr[strPos++] = ch;
+			} else {
+				tmpStr = this->UpperCase(tmpStr);
+				if (this->m_codeFoldingStart.InList(tmpStr) && (!noFoldPos)) {
+					levelCurrent++;
+				};
+				if (this->m_codeFoldingEnd.InList(tmpStr) && (!noFoldPos)) {
+					levelCurrent--;
+				};
+				memset(tmpStr, 0, MAX_STR_LEN*sizeof(char));
+				strPos = 0;
+				foldWordPossible = false;
+			};
+		} else {
+			if (setDMISFoldWord.Contains(ch)) {
+				tmpStr[strPos++] = ch;
+				foldWordPossible = true;
+			};
+		};
+
+		if (atEOL || (i == (endPos-1))) {
+			int lev = levelPrev;
+
+			if (levelCurrent > levelPrev) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			};
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			};
+			lineCurrent++;
+			levelPrev = levelCurrent;
+		};
+	};
+	delete[] tmpStr;
+}
+
+
+LexerModule lmDMIS(SCLEX_DMIS, LexerDMIS::LexerFactoryDMIS, "DMIS", DMISWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexDataflex.cxx b/scite-app/lexilla/lexers/LexDataflex.cxx
new file mode 100644
index 0000000..a51b34b
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexDataflex.cxx
@@ -0,0 +1,611 @@
+// Scintilla source code edit control
+/** @file LexDataflex.cxx
+ ** Lexer for DataFlex.
+ ** Based on LexPascal.cxx
+ ** Written by Wil van Antwerpen, June 2019
+ **/
+
+/*
+// The License.txt file describes the conditions under which this software may be distributed.
+
+A few words about features of LexDataflex...
+
+Generally speaking LexDataflex tries to support all available DataFlex features (up
+to DataFlex 19.1 at this time).
+
+~ FOLDING:
+
+Folding is supported in the following cases:
+
+- Folding of stream-like comments
+- Folding of groups of consecutive line comments
+- Folding of preprocessor blocks (the following preprocessor blocks are
+supported: #IFDEF, #IFNDEF, #ENDIF and #HEADER / #ENDHEADER 
+blocks), 
+- Folding of code blocks on appropriate keywords (the following code blocks are
+supported: "begin, struct, type, case / end" blocks, class & object
+declarations and interface declarations)
+
+Remarks:
+
+- We pass 4 arrays to the lexer:
+1. The DataFlex keyword list, these are normal DataFlex keywords
+2. The Scope Open list, for example, begin / procedure / while
+3. The Scope Close list, for example, end / end_procedure / loop
+4. Operator list, for ex. + / - / * / Lt / iand
+These lists are all mutually exclusive, scope open words should not be in the keyword list and vice versa
+
+- Folding of code blocks tries to handle all special cases in which folding
+should not occur. 
+
+~ KEYWORDS:
+
+The list of keywords that can be used in dataflex.properties file (up to DataFlex
+19.1):
+
+- Keywords: .. snipped .. see dataflex.properties file.
+
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static void GetRangeLowered(Sci_PositionU start,
+		Sci_PositionU end,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void GetForwardRangeLowered(Sci_PositionU start,
+		CharacterSet &charSet,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < len-1) && charSet.Contains(styler.SafeGetCharAt(start + i))) {
+		s[i] = static_cast<char>(tolower(styler.SafeGetCharAt(start + i)));
+		i++;
+	}
+	s[i] = '\0';
+
+}
+
+enum {
+	stateInICode = 0x1000,
+	stateSingleQuoteOpen = 0x2000,
+	stateDoubleQuoteOpen = 0x4000,
+	stateFoldInPreprocessor = 0x0100,
+	stateFoldInCaseStatement = 0x0200,
+	stateFoldInPreprocessorLevelMask = 0x00FF,
+	stateFoldMaskAll = 0x0FFF
+};
+
+
+static bool IsFirstDataFlexWord(Sci_Position pos, Accessor &styler) {
+	Sci_Position line = styler.GetLine(pos);
+	Sci_Position start_pos = styler.LineStart(line);
+	for (Sci_Position i = start_pos; i < pos; i++) {
+		char ch = styler.SafeGetCharAt(i);
+		if (!(ch == ' ' || ch == '\t'))
+			return false;
+	}
+	return true;
+}
+
+
+inline bool IsADataFlexField(int ch) {
+	return (ch == '.');
+}
+
+
+static void ClassifyDataFlexWord(WordList *keywordlists[], StyleContext &sc, Accessor &styler) {
+	WordList& keywords = *keywordlists[0];
+	WordList& scopeOpen   = *keywordlists[1];
+	WordList& scopeClosed = *keywordlists[2];
+	WordList& operators   = *keywordlists[3];
+
+	char s[100];
+	int oldState;
+	int newState;
+	size_t tokenlen;
+
+    oldState = sc.state;
+	newState = oldState;
+	sc.GetCurrentLowered(s, sizeof(s));
+	tokenlen = strnlen(s,sizeof(s));
+	if (keywords.InList(s)) {
+		// keywords in DataFlex can be used as table column names (file.field) and as such they
+		// should not be characterized as a keyword. So test for that.
+		// for ex. somebody using date as field name.
+        if (!IsADataFlexField(sc.GetRelative(-static_cast<int>(tokenlen+1)))) {
+	      newState = SCE_DF_WORD;
+	    }
+	}
+	if (oldState == newState) {
+		if ((scopeOpen.InList(s) || scopeClosed.InList(s)) && (strcmp(s, "for") != 0) && (strcmp(s, "repeat") != 0)) {
+			// scope words in DataFlex can be used as table column names (file.field) and as such they
+			// should not be characterized as a scope word. So test for that.
+			// for ex. somebody using procedure for field name.
+			if (!IsADataFlexField(sc.GetRelative(-static_cast<int>(tokenlen+1)))) {
+				newState = SCE_DF_SCOPEWORD;
+			}
+		} 
+		// no code folding on the next words, but just want to paint them like keywords (as they are) (??? doesn't the code to the opposite?)
+		if (strcmp(s, "if") == 0 ||  
+			strcmp(s, "ifnot") == 0 ||
+			strcmp(s, "case") == 0 ||
+			strcmp(s, "else") == 0 ) {
+				newState = SCE_DF_SCOPEWORD;
+		} 
+	}
+	if (oldState != newState && newState == SCE_DF_WORD) {
+		// a for loop must have for at the start of the line, for is also used in "define abc for 123"
+		if ( (strcmp(s, "for") == 0) && (IsFirstDataFlexWord(sc.currentPos-3, styler)) ) {   
+				newState = SCE_DF_SCOPEWORD;
+		} 
+	}
+	if (oldState != newState && newState == SCE_DF_WORD) {
+		// a repeat loop must have repeat at the start of the line, repeat is also used in 'move (repeat("d",5)) to sFoo'
+		if ( (strcmp(s, "repeat") == 0) && (IsFirstDataFlexWord(sc.currentPos-6, styler)) ) {   
+				newState = SCE_DF_SCOPEWORD;
+		} 
+	}
+	if (oldState == newState)  {
+	  if (operators.InList(s)) {
+		  newState = SCE_DF_OPERATOR;
+		} 
+	}
+
+	if (oldState != newState) {
+		sc.ChangeState(newState);
+	}
+	sc.SetState(SCE_DF_DEFAULT);
+}
+
+static void ColouriseDataFlexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+		Accessor &styler) {
+//	bool bSmartHighlighting = styler.GetPropertyInt("lexer.dataflex.smart.highlighting", 1) != 0;
+
+			CharacterSet setWordStart(CharacterSet::setAlpha, "_$#@", 0x80, true);
+			CharacterSet setWord(CharacterSet::setAlphaNum, "_$#@", 0x80, true);
+	CharacterSet setNumber(CharacterSet::setDigits, ".-+eE");
+	CharacterSet setHexNumber(CharacterSet::setDigits, "abcdefABCDEF");
+	CharacterSet setOperator(CharacterSet::setNone, "*+-/<=>^");
+
+	Sci_Position curLine = styler.GetLine(startPos);
+	int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			curLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(curLine, curLineState);
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_DF_NUMBER:
+				if (!setNumber.Contains(sc.ch) || (sc.ch == '.' && sc.chNext == '.')) {
+					sc.SetState(SCE_DF_DEFAULT);
+				} else if (sc.ch == '-' || sc.ch == '+') {
+					if (sc.chPrev != 'E' && sc.chPrev != 'e') {
+						sc.SetState(SCE_DF_DEFAULT);
+					}
+				}
+				break;
+			case SCE_DF_IDENTIFIER:
+				if (!setWord.Contains(sc.ch)) {
+					ClassifyDataFlexWord(keywordlists, sc, styler);
+				}
+				break;
+			case SCE_DF_HEXNUMBER:
+				if (!(setHexNumber.Contains(sc.ch) || sc.ch == 'I') ) { // in |CI$22a we also want to color the "I"
+					sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_METATAG:
+				if (sc.atLineStart || sc.chPrev == '}') {
+					sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_PREPROCESSOR:
+				if (sc.atLineStart || IsASpaceOrTab(sc.ch)) {
+					sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_IMAGE:
+				if (sc.atLineStart && sc.Match("/*")) {
+					sc.Forward();  // these characters are still part of the DF Image
+					sc.ForwardSetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_PREPROCESSOR2:
+				// we don't have inline comments or preprocessor2 commands
+				//if (sc.Match('*', ')')) {
+				//	sc.Forward();
+				//	sc.ForwardSetState(SCE_DF_DEFAULT);
+				//}
+				break;
+			case SCE_DF_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_DF_STRINGEOL);
+				} else if (sc.ch == '\'' && sc.chNext == '\'') {
+					sc.Forward();
+				} else if (sc.ch == '\"' && sc.chNext == '\"') {
+					sc.Forward();
+				} else if (sc.ch == '\'' || sc.ch == '\"') {
+					if (sc.ch == '\'' && (curLineState & stateSingleQuoteOpen) ) {
+ 				    curLineState &= ~(stateSingleQuoteOpen);
+					sc.ForwardSetState(SCE_DF_DEFAULT);
+					}
+					else if (sc.ch == '\"' && (curLineState & stateDoubleQuoteOpen) ) {
+ 				    curLineState &= ~(stateDoubleQuoteOpen);
+					sc.ForwardSetState(SCE_DF_DEFAULT);
+					}
+				}
+				break;
+			case SCE_DF_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+			case SCE_DF_SCOPEWORD:
+				//if (!setHexNumber.Contains(sc.ch) && sc.ch != '$') {
+				//	sc.SetState(SCE_DF_DEFAULT);
+				//}
+				break;
+			case SCE_DF_OPERATOR:
+//				if (bSmartHighlighting && sc.chPrev == ';') {
+//					curLineState &= ~(stateInProperty | stateInExport);
+//				}
+				sc.SetState(SCE_DF_DEFAULT);
+				break;
+			case SCE_DF_ICODE:
+				if (sc.atLineStart || IsASpace(sc.ch) || isoperator(sc.ch)) {
+				sc.SetState(SCE_DF_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_DF_DEFAULT) {
+			if (IsADigit(sc.ch)) {
+				sc.SetState(SCE_DF_NUMBER);
+			} else if (sc.Match('/', '/') || sc.Match("#REM")) {
+				sc.SetState(SCE_DF_COMMENTLINE);
+			} else if ((sc.ch == '#' && !sc.Match("#REM")) && IsFirstDataFlexWord(sc.currentPos, styler)) {
+				sc.SetState(SCE_DF_PREPROCESSOR);
+			// || (sc.ch == '|' && sc.chNext == 'C' && sc.GetRelativeCharacter(2) == 'I' && sc.GetRelativeCharacter(3) == '$') ) {
+			} else if ((sc.ch == '$' && ((!setWord.Contains(sc.chPrev)) || sc.chPrev == 'I' ) ) || (sc.Match("|CI$")) ) {
+				sc.SetState(SCE_DF_HEXNUMBER); // start with $ and previous character not in a..zA..Z0..9 excluding "I" OR start with |CI$
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_DF_IDENTIFIER);
+			} else if (sc.ch == '{') {
+				sc.SetState(SCE_DF_METATAG);
+			//} else if (sc.Match("(*$")) {
+			//	sc.SetState(SCE_DF_PREPROCESSOR2);
+			} else if (sc.ch == '/' && setWord.Contains(sc.chNext) &&  sc.atLineStart) {
+				sc.SetState(SCE_DF_IMAGE);
+			//	sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.ch == '\'' || sc.ch == '\"') {
+				if (sc.ch == '\'' && !(curLineState & stateDoubleQuoteOpen)) {
+				  curLineState |= stateSingleQuoteOpen;
+				} else if (sc.ch == '\"' && !(curLineState & stateSingleQuoteOpen)) {
+				  curLineState |= stateDoubleQuoteOpen;
+				}
+			    sc.SetState(SCE_DF_STRING);
+			} else if (setOperator.Contains(sc.ch)) {
+				sc.SetState(SCE_DF_OPERATOR);
+//			} else if (curLineState & stateInICode) {
+				// ICode start ! in a string followed by close string mark is not icode
+			} else if ((sc.ch == '!') && !(sc.ch == '!' && ((sc.chNext == '\"') || (sc.ch == '\'')) )) {
+				sc.SetState(SCE_DF_ICODE);
+			}
+		}
+	}
+
+	if (sc.state == SCE_DF_IDENTIFIER && setWord.Contains(sc.chPrev)) {
+		ClassifyDataFlexWord(keywordlists, sc, styler);
+	}
+
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_DF_IMAGE;
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eolPos; i++) {
+		char ch = styler[i];
+		char chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		if (ch == '/' && chNext == '/' && style == SCE_DF_COMMENTLINE) {
+			return true;
+		} else if (!IsASpaceOrTab(ch)) {
+			return false;
+		}
+	}
+	return false;
+}
+
+
+
+static unsigned int GetFoldInPreprocessorLevelFlag(int lineFoldStateCurrent) {
+	return lineFoldStateCurrent & stateFoldInPreprocessorLevelMask;
+}
+
+static void SetFoldInPreprocessorLevelFlag(int &lineFoldStateCurrent, unsigned int nestLevel) {
+	lineFoldStateCurrent &= ~stateFoldInPreprocessorLevelMask;
+	lineFoldStateCurrent |= nestLevel & stateFoldInPreprocessorLevelMask;
+}
+
+static int ClassifyDataFlexPreprocessorFoldPoint(int &levelCurrent, int &lineFoldStateCurrent,
+		Sci_PositionU startPos, Accessor &styler) {
+	CharacterSet setWord(CharacterSet::setAlpha);
+
+	char s[100];	// Size of the longest possible keyword + one additional character + null
+	GetForwardRangeLowered(startPos, setWord, styler, s, sizeof(s));
+	size_t iLen = strnlen(s,sizeof(s));
+	size_t iWordSize = 0;
+
+	unsigned int nestLevel = GetFoldInPreprocessorLevelFlag(lineFoldStateCurrent);
+
+	if (strcmp(s, "command") == 0 ||
+		// The #if/#ifdef etcetera commands are not currently foldable as it is easy to write code that
+		// breaks the collaps logic, so we keep things simple and not include that for now.
+		strcmp(s, "header") == 0) {
+		nestLevel++;
+		SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel);
+		lineFoldStateCurrent |= stateFoldInPreprocessor;
+		levelCurrent++;
+		iWordSize = iLen;
+	} else if (strcmp(s, "endcommand") == 0 ||
+		strcmp(s, "endheader") == 0) {
+		nestLevel--;
+		SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel);
+		if (nestLevel == 0) {
+			lineFoldStateCurrent &= ~stateFoldInPreprocessor;
+		}
+		levelCurrent--;
+		iWordSize = iLen;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+	return static_cast<int>(iWordSize);
+}
+
+
+static void ClassifyDataFlexWordFoldPoint(int &levelCurrent, int &lineFoldStateCurrent,
+		Sci_PositionU lastStart, Sci_PositionU currentPos, WordList *[], Accessor &styler) {
+	char s[100];
+
+	// property fold.dataflex.compilerlist
+	//	Set to 1 for enabling the code folding feature in *.prn files
+	bool foldPRN = styler.GetPropertyInt("fold.dataflex.compilerlist",0) != 0;
+
+	GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s));
+
+	if (strcmp(s, "case") == 0) {
+		lineFoldStateCurrent |= stateFoldInCaseStatement;
+	} else if (strcmp(s, "begin") == 0) {
+		levelCurrent++;
+	} else if (strcmp(s, "for") == 0 ||
+		strcmp(s, "while") == 0 ||
+		strcmp(s, "repeat") == 0 ||
+		strcmp(s, "for_all") == 0 ||
+		strcmp(s, "struct") == 0 ||
+		strcmp(s, "type") == 0 ||
+		strcmp(s, "begin_row") == 0 ||
+		strcmp(s, "item_list") == 0 ||
+		strcmp(s, "begin_constraints") == 0 ||
+		strcmp(s, "begin_transaction") == 0 ||
+		strcmp(s, "enum_list") == 0 ||
+		strcmp(s, "class") == 0 || 
+		strcmp(s, "object") == 0 ||
+		strcmp(s, "cd_popup_object") == 0 ||
+		strcmp(s, "procedure") == 0 ||
+		strcmp(s, "procedure_section") == 0 ||
+		strcmp(s, "function") == 0 ) {
+			if ((IsFirstDataFlexWord(lastStart, styler )) || foldPRN) {
+			levelCurrent++;
+			}
+	} else if (strcmp(s, "end") == 0) {  // end is not always the first keyword, for example "case end"
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	} else if (strcmp(s, "loop") == 0 ||
+				   strcmp(s, "until") == 0 ||
+				   strcmp(s, "end_class") == 0 ||
+				   strcmp(s, "end_object") == 0 ||
+				   strcmp(s, "cd_end_object") == 0 ||
+				   strcmp(s, "end_procedure") == 0 ||
+				   strcmp(s, "end_function") == 0 ||
+				   strcmp(s, "end_for_all") == 0 ||
+				   strcmp(s, "end_struct") == 0 ||
+				   strcmp(s, "end_type") == 0 ||
+				   strcmp(s, "end_row") == 0 ||
+				   strcmp(s, "end_item_list") == 0 ||
+				   strcmp(s, "end_constraints") == 0 ||
+				   strcmp(s, "end_transaction") == 0 ||
+				   strcmp(s, "end_enum_list") == 0 ) {
+	//		lineFoldStateCurrent &= ~stateFoldInRecord;
+			if ((IsFirstDataFlexWord(lastStart, styler )) || foldPRN) {
+				levelCurrent--;
+				if (levelCurrent < SC_FOLDLEVELBASE) {
+					levelCurrent = SC_FOLDLEVELBASE;
+				}
+			}
+	}
+
+}
+
+
+static void ClassifyDataFlexMetaDataFoldPoint(int &levelCurrent, 
+		Sci_PositionU lastStart, Sci_PositionU currentPos, WordList *[], Accessor &styler) {
+	char s[100];
+
+	GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s));
+
+    if (strcmp(s, "#beginsection") == 0) {
+		levelCurrent++;
+	} else if (strcmp(s, "#endsection") == 0) {
+			levelCurrent--;
+			if (levelCurrent < SC_FOLDLEVELBASE) {
+				levelCurrent = SC_FOLDLEVELBASE;
+			}
+	}
+
+}
+
+static void FoldDataFlexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+		Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	int lineFoldStateCurrent = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) & stateFoldMaskAll : 0;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	int iWordSize;
+
+	Sci_Position lastStart = 0;
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_$#@", 0x80, true);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext)) {
+				levelCurrent--;
+			}
+		}
+		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+		{
+			if (!IsCommentLine(lineCurrent - 1, styler)
+			    && IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+			         && !IsCommentLine(lineCurrent+1, styler))
+				levelCurrent--;
+		}
+		if (foldPreprocessor) {
+			if (style == SCE_DF_PREPROCESSOR) {
+				iWordSize = ClassifyDataFlexPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 1, styler);
+			//} else if (style == SCE_DF_PREPROCESSOR2 && ch == '(' && chNext == '*'
+			//           && styler.SafeGetCharAt(i + 2) == '$') {
+			//	ClassifyDataFlexPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 3, styler);
+				i = i + iWordSize;
+			}
+		}
+
+		if (stylePrev != SCE_DF_SCOPEWORD && style == SCE_DF_SCOPEWORD)
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+		if (stylePrev == SCE_DF_SCOPEWORD) {
+			if(setWord.Contains(ch) && !setWord.Contains(chNext)) {
+				ClassifyDataFlexWordFoldPoint(levelCurrent, lineFoldStateCurrent, lastStart, i, keywordlists, styler);
+			}
+		}
+
+		if (stylePrev == SCE_DF_METATAG && ch == '#')
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+		if (stylePrev == SCE_DF_METATAG) {
+			if(setWord.Contains(ch) && !setWord.Contains(chNext)) {
+				ClassifyDataFlexMetaDataFoldPoint(levelCurrent, lastStart, i, keywordlists, styler);
+			}
+		}
+
+		if (!IsASpace(ch))
+			visibleChars++;
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			int newLineState = (styler.GetLineState(lineCurrent) & ~stateFoldMaskAll) | lineFoldStateCurrent;
+			styler.SetLineState(lineCurrent, newLineState);
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+
+	// If we didn't reach the EOL in previous loop, store line level and whitespace information.
+	// The rest will be filled in later...
+	int lev = levelPrev;
+	if (visibleChars == 0 && foldCompact)
+		lev |= SC_FOLDLEVELWHITEFLAG;
+	styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const dataflexWordListDesc[] = {
+	"Keywords",
+	"Scope open",
+	"Scope close",
+	"Operators",
+	0
+};
+
+LexerModule lmDataflex(SCLEX_DATAFLEX, ColouriseDataFlexDoc, "dataflex", FoldDataFlexDoc, dataflexWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexDiff.cxx b/scite-app/lexilla/lexers/LexDiff.cxx
new file mode 100644
index 0000000..9fdd7e4
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexDiff.cxx
@@ -0,0 +1,164 @@
+// Scintilla source code edit control
+/** @file LexDiff.cxx
+ ** Lexer for diff results.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static 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) {
+	// 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
+	// otherwise it is considered a comment (Only in..., Binary file...)
+	if (0 == strncmp(lineBuffer, "diff ", 5)) {
+		styler.ColourTo(endLine, SCE_DIFF_COMMAND);
+	} else if (0 == strncmp(lineBuffer, "Index: ", 7)) {  // For subversion's diff
+		styler.ColourTo(endLine, SCE_DIFF_COMMAND);
+	} else if (0 == strncmp(lineBuffer, "---", 3) && lineBuffer[3] != '-') {
+		// In a context diff, --- appears in both the header and the position markers
+		if (lineBuffer[3] == ' ' && atoi(lineBuffer + 4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else if (lineBuffer[3] == '\r' || lineBuffer[3] == '\n')
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else if (lineBuffer[3] == ' ')
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_DELETED);
+	} else if (0 == strncmp(lineBuffer, "+++ ", 4)) {
+		// I don't know of any diff where "+++ " is a position marker, but for
+		// consistency, do the same as with "--- " and "*** ".
+		if (atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "====", 4)) {  // For p4's diff
+		styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "***", 3)) {
+		// In a context diff, *** appears in both the header and the position markers.
+		// Also ******** is a chunk header, but here it's treated as part of the
+		// position marker since there is no separate style for a chunk header.
+		if (lineBuffer[3] == ' ' && atoi(lineBuffer+4) && !strchr(lineBuffer, '/'))
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else if (lineBuffer[3] == '*')
+			styler.ColourTo(endLine, SCE_DIFF_POSITION);
+		else
+			styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (0 == strncmp(lineBuffer, "? ", 2)) {    // For difflib
+		styler.ColourTo(endLine, SCE_DIFF_HEADER);
+	} else if (lineBuffer[0] == '@') {
+		styler.ColourTo(endLine, SCE_DIFF_POSITION);
+	} else if (lineBuffer[0] >= '0' && lineBuffer[0] <= '9') {
+		styler.ColourTo(endLine, SCE_DIFF_POSITION);
+	} else if (0 == strncmp(lineBuffer, "++", 2)) {
+		styler.ColourTo(endLine, SCE_DIFF_PATCH_ADD);
+	} else if (0 == strncmp(lineBuffer, "+-", 2)) {
+		styler.ColourTo(endLine, SCE_DIFF_PATCH_DELETE);
+	} else if (0 == strncmp(lineBuffer, "-+", 2)) {
+		styler.ColourTo(endLine, SCE_DIFF_REMOVED_PATCH_ADD);
+	} else if (0 == strncmp(lineBuffer, "--", 2)) {
+		styler.ColourTo(endLine, SCE_DIFF_REMOVED_PATCH_DELETE);
+	} else if (lineBuffer[0] == '-' || lineBuffer[0] == '<') {
+		styler.ColourTo(endLine, SCE_DIFF_DELETED);
+	} else if (lineBuffer[0] == '+' || lineBuffer[0] == '>') {
+		styler.ColourTo(endLine, SCE_DIFF_ADDED);
+	} else if (lineBuffer[0] == '!') {
+		styler.ColourTo(endLine, SCE_DIFF_CHANGED);
+	} else if (lineBuffer[0] != ' ') {
+		styler.ColourTo(endLine, SCE_DIFF_COMMENT);
+	} else {
+		styler.ColourTo(endLine, SCE_DIFF_DEFAULT);
+	}
+}
+
+static void ColouriseDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[DIFF_BUFFER_START_SIZE] = "";
+	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;
+		}
+	}
+	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);
+	}
+}
+
+static 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 {
+		const int lineType = styler.StyleAt(curLineStart);
+		if (lineType == SCE_DIFF_COMMAND)
+			nextLevel = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+		else if (lineType == SCE_DIFF_HEADER)
+			nextLevel = (SC_FOLDLEVELBASE + 1) | SC_FOLDLEVELHEADERFLAG;
+		else if (lineType == SCE_DIFF_POSITION && styler[curLineStart] != '-')
+			nextLevel = (SC_FOLDLEVELBASE + 2) | SC_FOLDLEVELHEADERFLAG;
+		else if (prevLevel & SC_FOLDLEVELHEADERFLAG)
+			nextLevel = (prevLevel & SC_FOLDLEVELNUMBERMASK) + 1;
+		else
+			nextLevel = prevLevel;
+
+		if ((nextLevel & SC_FOLDLEVELHEADERFLAG) && (nextLevel == prevLevel))
+			styler.SetLevel(curLine-1, prevLevel & ~SC_FOLDLEVELHEADERFLAG);
+
+		styler.SetLevel(curLine, nextLevel);
+		prevLevel = nextLevel;
+
+		curLineStart = styler.LineStart(++curLine);
+	} while (static_cast<Sci_Position>(startPos)+length > curLineStart);
+}
+
+static const char *const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff", FoldDiffDoc, emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexECL.cxx b/scite-app/lexilla/lexers/LexECL.cxx
new file mode 100644
index 0000000..052753a
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexECL.cxx
@@ -0,0 +1,521 @@
+// Scintilla source code edit control
+/** @file LexECL.cxx
+ ** Lexer for ECL.
+ **/
+// 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>
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+#ifdef __BORLANDC__
+// Borland C++ displays warnings in vector header without this
+#pragma option -w-ccc -w-rch
+#endif
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+
+#define SET_LOWER "abcdefghijklmnopqrstuvwxyz"
+#define SET_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+#define SET_DIGITS "0123456789"
+
+using namespace Lexilla;
+
+static bool IsSpaceEquiv(int state) {
+	switch (state) {
+	case SCE_ECL_DEFAULT:
+	case SCE_ECL_COMMENT:
+	case SCE_ECL_COMMENTLINE:
+	case SCE_ECL_COMMENTLINEDOC:
+	case SCE_ECL_COMMENTDOCKEYWORD:
+	case SCE_ECL_COMMENTDOCKEYWORDERROR:
+	case SCE_ECL_COMMENTDOC:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+static void ColouriseEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+	WordList &keywords0 = *keywordlists[0];
+	WordList &keywords1 = *keywordlists[1];
+	WordList &keywords2 = *keywordlists[2];
+	WordList &keywords3 = *keywordlists[3]; //Value Types
+	WordList &keywords4 = *keywordlists[4];
+	WordList &keywords5 = *keywordlists[5];
+	WordList &keywords6 = *keywordlists[6];	//Javadoc Tags
+	WordList cplusplus;
+	cplusplus.Set("beginc endc");
+
+	bool stylingWithinPreprocessor = false;
+
+	CharacterSet setOKBeforeRE(CharacterSet::setNone, "(=,");
+	CharacterSet setDoxygen(CharacterSet::setLower, "$@\\&<>#{}[]");
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+	CharacterSet setQualified(CharacterSet::setNone, "uUxX");
+
+	int chPrevNonWhite = ' ';
+	int visibleChars = 0;
+	bool lastWordWasUUID = false;
+	int styleBeforeDCKeyword = SCE_ECL_DEFAULT;
+	bool continuationLine = false;
+
+	if (initStyle == SCE_ECL_PREPROCESSOR) {
+		// Set continuationLine if last character of previous line is '\'
+		Sci_Position lineCurrent = styler.GetLine(startPos);
+		if (lineCurrent > 0) {
+			int chBack = styler.SafeGetCharAt(startPos-1, 0);
+			int chBack2 = styler.SafeGetCharAt(startPos-2, 0);
+			int lineEndChar = '!';
+			if (chBack2 == '\r' && chBack == '\n') {
+				lineEndChar = styler.SafeGetCharAt(startPos-3, 0);
+			} else if (chBack == '\n' || chBack == '\r') {
+				lineEndChar = chBack2;
+			}
+			continuationLine = lineEndChar == '\\';
+		}
+	}
+
+	// look back to set chPrevNonWhite properly for better regex colouring
+	if (startPos > 0) {
+		Sci_Position back = startPos;
+		while (--back && IsSpaceEquiv(styler.StyleAt(back)))
+			;
+		if (styler.StyleAt(back) == SCE_ECL_OPERATOR) {
+			chPrevNonWhite = styler.SafeGetCharAt(back);
+		}
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineStart) {
+			if (sc.state == SCE_ECL_STRING) {
+				// Prevent SCE_ECL_STRINGEOL from leaking back to previous line which
+				// ends with a line continuation by locking in the state upto this position.
+				sc.SetState(SCE_ECL_STRING);
+			}
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+			lastWordWasUUID = false;
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continuationLine = true;
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_ECL_ADDED:
+			case SCE_ECL_DELETED:
+			case SCE_ECL_CHANGED:
+			case SCE_ECL_MOVED:
+			if (sc.atLineStart)
+					sc.SetState(SCE_ECL_DEFAULT);
+				break;
+			case SCE_ECL_OPERATOR:
+				sc.SetState(SCE_ECL_DEFAULT);
+				break;
+			case SCE_ECL_NUMBER:
+				// We accept almost anything because of hex. and number suffixes
+				if (!setWord.Contains(sc.ch)) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_IDENTIFIER:
+				if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+					char s[1000];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (keywords0.InList(s)) {
+						lastWordWasUUID = strcmp(s, "uuid") == 0;
+						sc.ChangeState(SCE_ECL_WORD0);
+					} else if (keywords1.InList(s)) {
+						sc.ChangeState(SCE_ECL_WORD1);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_ECL_WORD2);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_ECL_WORD4);
+					} else if (keywords5.InList(s)) {
+						sc.ChangeState(SCE_ECL_WORD5);
+					}
+					else	//Data types are of from KEYWORD##
+					{
+						int i = static_cast<int>(strlen(s)) - 1;
+						while(i >= 0 && (isdigit(s[i]) || s[i] == '_'))
+							--i;
+
+						char s2[1000];
+						strncpy(s2, s, i + 1);
+						s2[i + 1] = 0;
+						if (keywords3.InList(s2)) {
+							sc.ChangeState(SCE_ECL_WORD3);
+						}
+					}
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_PREPROCESSOR:
+				if (sc.atLineStart && !continuationLine) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				} else if (stylingWithinPreprocessor) {
+					if (IsASpace(sc.ch)) {
+						sc.SetState(SCE_ECL_DEFAULT);
+					}
+				} else {
+					if (sc.Match('/', '*') || sc.Match('/', '/')) {
+						sc.SetState(SCE_ECL_DEFAULT);
+					}
+				}
+				break;
+			case SCE_ECL_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_COMMENTDOC:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_ECL_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_ECL_COMMENTDOC;
+						sc.SetState(SCE_ECL_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_ECL_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_COMMENTLINEDOC:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = SCE_ECL_COMMENTLINEDOC;
+						sc.SetState(SCE_ECL_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_ECL_COMMENTDOCKEYWORD:
+				if ((styleBeforeDCKeyword == SCE_ECL_COMMENTDOC) && sc.Match('*', '/')) {
+					sc.ChangeState(SCE_ECL_COMMENTDOCKEYWORDERROR);
+					sc.Forward();
+					sc.ForwardSetState(SCE_ECL_DEFAULT);
+				} else if (!setDoxygen.Contains(sc.ch)) {
+					char s[1000];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (!IsASpace(sc.ch) || !keywords6.InList(s+1)) {
+						sc.ChangeState(SCE_ECL_COMMENTDOCKEYWORDERROR);
+					}
+					sc.SetState(styleBeforeDCKeyword);
+				}
+				break;
+			case SCE_ECL_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ECL_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_CHARACTER:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_ECL_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_REGEX:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				} else if (sc.ch == '/') {
+					sc.Forward();
+					while ((sc.ch < 0x80) && islower(sc.ch))
+						sc.Forward();    // gobble regex flags
+					sc.SetState(SCE_ECL_DEFAULT);
+				} else if (sc.ch == '\\') {
+					// Gobble up the quoted character
+					if (sc.chNext == '\\' || sc.chNext == '/') {
+						sc.Forward();
+					}
+				}
+				break;
+			case SCE_ECL_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+				break;
+			case SCE_ECL_VERBATIM:
+				if (sc.ch == '\"') {
+					if (sc.chNext == '\"') {
+						sc.Forward();
+					} else {
+						sc.ForwardSetState(SCE_ECL_DEFAULT);
+					}
+				}
+				break;
+			case SCE_ECL_UUID:
+				if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') {
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		Sci_Position lineCurrent = styler.GetLine(sc.currentPos);
+		int lineState = styler.GetLineState(lineCurrent);
+		if (sc.state == SCE_ECL_DEFAULT) {
+			if (lineState) {
+				sc.SetState(lineState);
+			}
+			else if (sc.Match('@', '\"')) {
+				sc.SetState(SCE_ECL_VERBATIM);
+				sc.Forward();
+			} else if (setQualified.Contains(sc.ch) && sc.chNext == '\'') {
+				sc.SetState(SCE_ECL_CHARACTER);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_ECL_UUID);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_ECL_NUMBER);
+				}
+			} else if (setWordStart.Contains(sc.ch) || (sc.ch == '@')) {
+				if (lastWordWasUUID) {
+					sc.SetState(SCE_ECL_UUID);
+					lastWordWasUUID = false;
+				} else {
+					sc.SetState(SCE_ECL_IDENTIFIER);
+				}
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_ECL_COMMENTDOC);
+				} else {
+					sc.SetState(SCE_ECL_COMMENT);
+				}
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if ((sc.Match("///") && !sc.Match("////")) || sc.Match("//!"))
+					// Support of Qt/Doxygen doc. style
+					sc.SetState(SCE_ECL_COMMENTLINEDOC);
+				else
+					sc.SetState(SCE_ECL_COMMENTLINE);
+			} else if (sc.ch == '/' && setOKBeforeRE.Contains(chPrevNonWhite)) {
+				sc.SetState(SCE_ECL_REGEX);	// JavaScript's RegEx
+//			} else if (sc.ch == '\"') {
+//				sc.SetState(SCE_ECL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_ECL_CHARACTER);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_ECL_PREPROCESSOR);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_ECL_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_ECL_OPERATOR);
+			}
+		}
+
+		if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
+			chPrevNonWhite = sc.ch;
+			visibleChars++;
+		}
+		continuationLine = false;
+	}
+	sc.Complete();
+
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_ECL_COMMENT ||
+		style == SCE_ECL_COMMENTDOC ||
+		style == SCE_ECL_COMMENTDOCKEYWORD ||
+		style == SCE_ECL_COMMENTDOCKEYWORDERROR;
+}
+
+static bool MatchNoCase(Accessor & styler, Sci_PositionU & pos, const char *s) {
+	Sci_Position i=0;
+	for (; *s; i++) {
+		char compare_char = tolower(*s);
+		char styler_char = tolower(styler.SafeGetCharAt(pos+i));
+		if (compare_char != styler_char)
+			return false;
+		s++;
+	}
+	pos+=i-1;
+	return true;
+}
+
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+					   WordList *[], Accessor &styler) {
+	bool foldComment = true;
+	bool foldPreprocessor = true;
+	bool foldCompact = true;
+	bool foldAtElse = true;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_ECL_COMMENTLINEDOC)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && (styleNext != SCE_ECL_COMMENTLINEDOC) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (foldComment && (style == SCE_ECL_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (foldPreprocessor && (style == SCE_ECL_PREPROCESSOR)) {
+			if (ch == '#') {
+				Sci_PositionU j = i + 1;
+				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (MatchNoCase(styler, j, "region") || MatchNoCase(styler, j, "if")) {
+					levelNext++;
+				} else if (MatchNoCase(styler, j, "endregion") || MatchNoCase(styler, j, "end")) {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_ECL_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (style == SCE_ECL_WORD2) {
+			if (MatchNoCase(styler, i, "record") || MatchNoCase(styler, i, "transform") || MatchNoCase(styler, i, "type") || MatchNoCase(styler, i, "function") ||
+				MatchNoCase(styler, i, "module") || MatchNoCase(styler, i, "service") || MatchNoCase(styler, i, "interface") || MatchNoCase(styler, i, "ifblock") ||
+				MatchNoCase(styler, i, "macro") || MatchNoCase(styler, i, "beginc++")) {
+				levelNext++;
+			} else if (MatchNoCase(styler, i, "endmacro") || MatchNoCase(styler, i, "endc++") || MatchNoCase(styler, i, "end")) {
+				levelNext--;
+			}
+		}
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
+				// There is an empty line at end of file so give it same level and empty
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+			visibleChars = 0;
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+	}
+}
+
+static const char * const EclWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmECL(
+   SCLEX_ECL,
+   ColouriseEclDoc,
+   "ecl",
+   FoldEclDoc,
+   EclWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexEDIFACT.cxx b/scite-app/lexilla/lexers/LexEDIFACT.cxx
new file mode 100644
index 0000000..c651228
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexEDIFACT.cxx
@@ -0,0 +1,405 @@
+// Scintilla Lexer for EDIFACT
+// @file LexEDIFACT.cxx
+// Written by Iain Clarke, IMCSoft & Inobiz AB.
+// EDIFACT documented here: https://www.unece.org/cefact/edifact/welcome.html
+// and more readably here: https://en.wikipedia.org/wiki/EDIFACT
+// This code is subject to the same license terms as the rest of the scintilla project:
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+
+// Header order must match order in scripts/HeaderOrder.txt
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "LexAccessor.h"
+#include "LexerModule.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+class LexerEDIFACT : public DefaultLexer
+{
+public:
+	LexerEDIFACT();
+	virtual ~LexerEDIFACT() {} // virtual destructor, as we inherit from ILexer
+
+	static ILexer5 *Factory() {
+		return new LexerEDIFACT;
+	}
+
+	int SCI_METHOD Version() const override
+	{
+		return lvRelease5;
+	}
+	void SCI_METHOD Release() override
+	{
+		delete this;
+	}
+
+	const char * SCI_METHOD PropertyNames() override
+	{
+		return "fold\nlexer.edifact.highlight.un.all";
+	}
+	int SCI_METHOD PropertyType(const char *) override
+	{
+		return SC_TYPE_BOOLEAN; // Only one property!
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override
+	{
+		if (!strcmp(name, "fold"))
+			return "Whether to apply folding to document or not";
+		if (!strcmp(name, "lexer.edifact.highlight.un.all"))
+			return "Whether to apply UN* highlighting to all UN segments, or just to UNH";
+		return NULL;
+	}
+
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override
+	{
+		if (!strcmp(key, "fold"))
+		{
+			m_bFold = strcmp(val, "0") ? true : false;
+			return 0;
+		}
+		if (!strcmp(key, "lexer.edifact.highlight.un.all"))	// GetProperty
+		{
+			m_bHighlightAllUN = strcmp(val, "0") ? true : false;
+			return 0;
+		}
+		return -1;
+	}
+
+	const char * SCI_METHOD PropertyGet(const char *key) override
+	{
+		m_lastPropertyValue = "";
+		if (!strcmp(key, "fold"))
+		{
+			m_lastPropertyValue = m_bFold ? "1" : "0";
+		}
+		if (!strcmp(key, "lexer.edifact.highlight.un.all"))	// GetProperty
+		{
+			m_lastPropertyValue = m_bHighlightAllUN ? "1" : "0";
+		}
+		return m_lastPropertyValue.c_str();
+	}
+
+	const char * SCI_METHOD DescribeWordListSets() override
+	{
+		return NULL;
+	}
+	Sci_Position SCI_METHOD WordListSet(int, const char *) override
+	{
+		return -1;
+	}
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void * SCI_METHOD PrivateCall(int, void *) override
+	{
+		return NULL;
+	}
+
+protected:
+	Sci_Position InitialiseFromUNA(IDocument *pAccess, Sci_PositionU MaxLength);
+	Sci_Position FindPreviousEnd(IDocument *pAccess, Sci_Position startPos) const;
+	Sci_Position ForwardPastWhitespace(IDocument *pAccess, Sci_Position startPos, Sci_Position MaxLength) const;
+	int DetectSegmentHeader(char SegmentHeader[3]) const;
+
+	bool m_bFold;
+
+	// property lexer.edifact.highlight.un.all
+	//	Set to 0 to highlight only UNA segments, or 1 to highlight all UNx segments.
+	bool m_bHighlightAllUN;
+
+	char m_chComponent;
+	char m_chData;
+	char m_chDecimal;
+	char m_chRelease;
+	char m_chSegment;
+
+	std::string m_lastPropertyValue;
+};
+
+LexerModule lmEDIFACT(SCLEX_EDIFACT, LexerEDIFACT::Factory, "edifact");
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+LexerEDIFACT::LexerEDIFACT() : DefaultLexer("edifact", SCLEX_EDIFACT)
+{
+	m_bFold = false;
+	m_bHighlightAllUN = false;
+	m_chComponent = ':';
+	m_chData = '+';
+	m_chDecimal = '.';
+	m_chRelease = '?';
+	m_chSegment = '\'';
+}
+
+void LexerEDIFACT::Lex(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess)
+{
+	Sci_PositionU posFinish = startPos + length;
+	InitialiseFromUNA(pAccess, posFinish);
+
+	// Look backwards for a ' or a document beginning
+	Sci_PositionU posCurrent = FindPreviousEnd(pAccess, startPos);
+	// And jump past the ' if this was not the beginning of the document
+	if (posCurrent != 0)
+		posCurrent++;
+
+	// Style buffer, so we're not issuing loads of notifications
+	LexAccessor styler (pAccess);
+	pAccess->StartStyling(posCurrent);
+	styler.StartSegment(posCurrent);
+	Sci_Position posSegmentStart = -1;
+
+	while ((posCurrent < posFinish) && (posSegmentStart == -1))
+	{
+		posCurrent = ForwardPastWhitespace(pAccess, posCurrent, posFinish);
+		// Mark whitespace as default
+		styler.ColourTo(posCurrent - 1, SCE_EDI_DEFAULT);
+		if (posCurrent >= posFinish)
+			break;
+
+		// Does is start with 3 charaters? ie, UNH
+		char SegmentHeader[4] = { 0 };
+		pAccess->GetCharRange(SegmentHeader, posCurrent, 3);
+
+		int SegmentStyle = DetectSegmentHeader(SegmentHeader);
+		if (SegmentStyle == SCE_EDI_BADSEGMENT)
+			break;
+		if (SegmentStyle == SCE_EDI_UNA)
+		{
+			posCurrent += 9;
+			styler.ColourTo(posCurrent - 1, SCE_EDI_UNA); // UNA
+			continue;
+		}
+		posSegmentStart = posCurrent;
+		posCurrent += 3;
+
+		styler.ColourTo(posCurrent - 1, SegmentStyle); // UNH etc
+
+		// Colour in the rest of the segment
+		for (char c; posCurrent < posFinish; posCurrent++)
+		{
+			pAccess->GetCharRange(&c, posCurrent, 1);
+
+			if (c == m_chRelease) // ? escape character, check first, in case of ?'
+				posCurrent++;
+			else if (c == m_chSegment) // '
+			{
+				// Make sure the whole segment is on one line. styler won't let us go back in time, so we'll settle for marking the ' as bad.
+				Sci_Position lineSegmentStart = pAccess->LineFromPosition(posSegmentStart);
+				Sci_Position lineSegmentEnd = pAccess->LineFromPosition(posCurrent);
+				if (lineSegmentStart == lineSegmentEnd)
+					styler.ColourTo(posCurrent, SCE_EDI_SEGMENTEND);
+				else
+					styler.ColourTo(posCurrent, SCE_EDI_BADSEGMENT);
+				posSegmentStart = -1;
+				posCurrent++;
+				break;
+			}
+			else if (c == m_chComponent) // :
+				styler.ColourTo(posCurrent, SCE_EDI_SEP_COMPOSITE);
+			else if (c == m_chData) // +
+				styler.ColourTo(posCurrent, SCE_EDI_SEP_ELEMENT);
+			else
+				styler.ColourTo(posCurrent, SCE_EDI_DEFAULT);
+		}
+	}
+	styler.Flush();
+
+	if (posSegmentStart == -1)
+		return;
+
+	pAccess->StartStyling(posSegmentStart);
+	pAccess->SetStyleFor(posFinish - posSegmentStart, SCE_EDI_BADSEGMENT);
+}
+
+void LexerEDIFACT::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess)
+{
+	if (!m_bFold)
+		return;
+
+	Sci_PositionU endPos = startPos + length;
+	startPos = FindPreviousEnd(pAccess, startPos);
+	char c;
+	char SegmentHeader[4] = { 0 };
+
+	bool AwaitingSegment = true;
+	Sci_PositionU currLine = pAccess->LineFromPosition(startPos);
+	int levelCurrentStyle = SC_FOLDLEVELBASE;
+	if (currLine > 0)
+		levelCurrentStyle = pAccess->GetLevel(currLine - 1); // bottom 12 bits are level
+	int indentCurrent = levelCurrentStyle & SC_FOLDLEVELNUMBERMASK;
+	int indentNext = indentCurrent;
+
+	while (startPos < endPos)
+	{
+		pAccess->GetCharRange(&c, startPos, 1);
+		switch (c)
+		{
+		case '\t':
+		case '\r':
+		case ' ':
+			startPos++;
+			continue;
+		case '\n':
+			currLine = pAccess->LineFromPosition(startPos);
+			pAccess->SetLevel(currLine, levelCurrentStyle | indentCurrent);
+			startPos++;
+			levelCurrentStyle = SC_FOLDLEVELBASE;
+			indentCurrent = indentNext;
+			continue;
+		}
+		if (c == m_chRelease)
+		{
+			startPos += 2;
+			continue;
+		}
+		if (c == m_chSegment)
+		{
+			AwaitingSegment = true;
+			startPos++;
+			continue;
+		}
+
+		if (!AwaitingSegment)
+		{
+			startPos++;
+			continue;
+		}
+		
+		// Segment!
+		pAccess->GetCharRange(SegmentHeader, startPos, 3);
+		if (SegmentHeader[0] != 'U' || SegmentHeader[1] != 'N')
+		{
+			startPos++;
+			continue;
+		}
+
+		AwaitingSegment = false;
+		switch (SegmentHeader[2])
+		{
+		case 'H':
+		case 'G':
+			indentNext++;
+			levelCurrentStyle = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+			break;
+
+		case 'T':
+		case 'E':
+			if (indentNext > 0)
+				indentNext--;
+			break;
+		}
+
+		startPos += 3;
+	}
+}
+
+Sci_Position LexerEDIFACT::InitialiseFromUNA(IDocument *pAccess, Sci_PositionU MaxLength)
+{
+	MaxLength -= 9; // drop 9 chars, to give us room for UNA:+.? '
+
+	Sci_PositionU startPos = 0;
+	startPos += ForwardPastWhitespace(pAccess, 0, MaxLength);
+	if (startPos < MaxLength)
+	{
+		char bufUNA[9];
+		pAccess->GetCharRange(bufUNA, startPos, 9);
+
+		// Check it's UNA segment
+		if (!memcmp(bufUNA, "UNA", 3))
+		{
+			m_chComponent = bufUNA[3];
+			m_chData = bufUNA[4];
+			m_chDecimal = bufUNA[5];
+			m_chRelease = bufUNA[6];
+			// bufUNA [7] should be space - reserved.
+			m_chSegment = bufUNA[8];
+
+			return 0; // success!
+		}
+	}
+
+	// We failed to find a UNA, so drop to defaults
+	m_chComponent = ':';
+	m_chData = '+';
+	m_chDecimal = '.';
+	m_chRelease = '?';
+	m_chSegment = '\'';
+
+	return -1;
+}
+
+Sci_Position LexerEDIFACT::ForwardPastWhitespace(IDocument *pAccess, Sci_Position startPos, Sci_Position MaxLength) const
+{
+	char c;
+
+	while (startPos < MaxLength)
+	{
+		pAccess->GetCharRange(&c, startPos, 1);
+		switch (c)
+		{
+		case '\t':
+		case '\r':
+		case '\n':
+		case ' ':
+			break;
+		default:
+			return startPos;
+		}
+
+		startPos++;
+	}
+
+	return MaxLength;
+}
+
+int LexerEDIFACT::DetectSegmentHeader(char SegmentHeader[3]) const
+{
+	if (
+		SegmentHeader[0] < 'A' || SegmentHeader[0] > 'Z' ||
+		SegmentHeader[1] < 'A' || SegmentHeader[1] > 'Z' ||
+		SegmentHeader[2] < 'A' || SegmentHeader[2] > 'Z')
+		return SCE_EDI_BADSEGMENT;
+
+	if (!memcmp(SegmentHeader, "UNA", 3))
+		return SCE_EDI_UNA;
+
+	if (m_bHighlightAllUN && !memcmp(SegmentHeader, "UN", 2))
+		return SCE_EDI_UNH;
+	else if (!memcmp(SegmentHeader, "UNH", 3))
+		return SCE_EDI_UNH;
+	else if (!memcmp(SegmentHeader, "UNG", 3))
+		return SCE_EDI_UNH;
+
+	return SCE_EDI_SEGMENTSTART;
+}
+
+// Look backwards for a ' or a document beginning
+Sci_Position LexerEDIFACT::FindPreviousEnd(IDocument *pAccess, Sci_Position startPos) const
+{
+	for (char c; startPos > 0; startPos--)
+	{
+		pAccess->GetCharRange(&c, startPos, 1);
+		if (c == m_chSegment)
+			return startPos;
+	}
+	// We didn't find a ', so just go with the beginning
+	return 0;
+}
+
+
diff --git a/scite-app/lexilla/lexers/LexEScript.cxx b/scite-app/lexilla/lexers/LexEScript.cxx
new file mode 100644
index 0000000..f7d4c23
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexEScript.cxx
@@ -0,0 +1,277 @@
+// Scintilla source code edit control
+/** @file LexEScript.cxx
+ ** Lexer for ESCRIPT
+ **/
+// Copyright 2003 by Patrizio Bekerle (patrizio@bekerle.com)
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+
+
+static void ColouriseESCRIPTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+	// Do not leak onto next line
+	/*if (initStyle == SCE_ESCRIPT_STRINGEOL)
+		initStyle = SCE_ESCRIPT_DEFAULT;*/
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	bool caseSensitive = styler.GetPropertyInt("escript.case.sensitive", 0) != 0;
+
+	for (; sc.More(); sc.Forward()) {
+
+		/*if (sc.atLineStart && (sc.state == SCE_ESCRIPT_STRING)) {
+			// Prevent SCE_ESCRIPT_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_ESCRIPT_STRING);
+		}*/
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_ESCRIPT_OPERATOR || sc.state == SCE_ESCRIPT_BRACE) {
+			sc.SetState(SCE_ESCRIPT_DEFAULT);
+		} else if (sc.state == SCE_ESCRIPT_NUMBER) {
+			if (!IsADigit(sc.ch) || sc.ch != '.') {
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				if (caseSensitive) {
+					sc.GetCurrent(s, sizeof(s));
+				} else {
+					sc.GetCurrentLowered(s, sizeof(s));
+				}
+
+//				sc.GetCurrentLowered(s, sizeof(s));
+
+                                if (keywords.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_ESCRIPT_WORD3);
+                                        // sc.state = SCE_ESCRIPT_IDENTIFIER;
+				}
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENT) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENTDOC) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_COMMENTLINE) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_ESCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_ESCRIPT_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_ESCRIPT_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_ESCRIPT_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_ESCRIPT_NUMBER);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '#')) {
+				sc.SetState(SCE_ESCRIPT_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_ESCRIPT_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_ESCRIPT_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_ESCRIPT_STRING);
+				//} else if (isoperator(static_cast<char>(sc.ch))) {
+			} else if (sc.ch == '+' || sc.ch == '-' || sc.ch == '*' || sc.ch == '/' || sc.ch == '=' || sc.ch == '<' || sc.ch == '>' || sc.ch == '&' || sc.ch == '|' || sc.ch == '!' || sc.ch == '?' || sc.ch == ':') {
+				sc.SetState(SCE_ESCRIPT_OPERATOR);
+			} else if (sc.ch == '{' || sc.ch == '}') {
+				sc.SetState(SCE_ESCRIPT_BRACE);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+
+static int classifyFoldPointESCRIPT(const char* s, const char* prevWord) {
+	int lev = 0;
+	if (strcmp(prevWord, "end") == 0) return lev;
+	if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0)
+		return -1;
+
+        if (strcmp(s, "for") == 0 || strcmp(s, "foreach") == 0
+	    || strcmp(s, "program") == 0 || strcmp(s, "function") == 0
+	    || strcmp(s, "while") == 0 || strcmp(s, "case") == 0
+	    || strcmp(s, "if") == 0 ) {
+		lev = 1;
+	} else if ( strcmp(s, "endfor") == 0 || strcmp(s, "endforeach") == 0
+	    || strcmp(s, "endprogram") == 0 || strcmp(s, "endfunction") == 0
+	    || strcmp(s, "endwhile") == 0 || strcmp(s, "endcase") == 0
+	    || strcmp(s, "endif") == 0 ) {
+		lev = -1;
+	}
+
+	return lev;
+}
+
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_ESCRIPT_COMMENT ||
+	       style == SCE_ESCRIPT_COMMENTDOC ||
+	       style == SCE_ESCRIPT_COMMENTLINE;
+}
+
+static void FoldESCRIPTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) {
+	//~ bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	// Do not know how to fold the comment at the moment.
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+        bool foldComment = true;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	Sci_Position lastStart = 0;
+	char prevWord[32] = "";
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (foldComment && (style == SCE_ESCRIPT_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (stylePrev == SCE_ESCRIPT_DEFAULT && style == SCE_ESCRIPT_WORD3)
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (style == SCE_ESCRIPT_WORD3) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[32];
+				Sci_PositionU j;
+				for(j = 0; ( j < 31 ) && ( j < i-lastStart+1 ); j++) {
+					s[j] = static_cast<char>(tolower(styler[lastStart + j]));
+				}
+				s[j] = '\0';
+				levelCurrent += classifyFoldPointESCRIPT(s, prevWord);
+				strcpy(prevWord, s);
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			strcpy(prevWord, "");
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+
+static const char * const ESCRIPTWordLists[] = {
+	"Primary keywords and identifiers",
+	"Intrinsic functions",
+	"Extended and user defined functions",
+	0,
+};
+
+LexerModule lmESCRIPT(SCLEX_ESCRIPT, ColouriseESCRIPTDoc, "escript", FoldESCRIPTDoc, ESCRIPTWordLists);
diff --git a/scite-app/lexilla/lexers/LexEiffel.cxx b/scite-app/lexilla/lexers/LexEiffel.cxx
new file mode 100644
index 0000000..9fed919
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexEiffel.cxx
@@ -0,0 +1,242 @@
+// Scintilla source code edit control
+/** @file LexEiffel.cxx
+ ** Lexer for Eiffel.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool isEiffelOperator(unsigned int ch) {
+	// '.' left out as it is used to make up numbers
+	return ch == '*' || ch == '/' || ch == '\\' || ch == '-' || ch == '+' ||
+	        ch == '(' || ch == ')' || ch == '=' ||
+	        ch == '{' || ch == '}' || ch == '~' ||
+	        ch == '[' || ch == ']' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' ||
+	        ch == '.' || ch == '^' || ch == '%' || ch == ':' ||
+		ch == '!' || ch == '@' || ch == '?';
+}
+
+static inline bool IsAWordChar(unsigned int  ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(unsigned int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static void ColouriseEiffelDoc(Sci_PositionU startPos,
+                            Sci_Position length,
+                            int initStyle,
+                            WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_EIFFEL_STRINGEOL) {
+			if (sc.ch != '\r' && sc.ch != '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_OPERATOR) {
+			sc.SetState(SCE_EIFFEL_DEFAULT);
+		} else if (sc.state == SCE_EIFFEL_WORD) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (!keywords.InList(s)) {
+					sc.ChangeState(SCE_EIFFEL_IDENTIFIER);
+				}
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_NUMBER) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_COMMENTLINE) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_STRING) {
+			if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		} else if (sc.state == SCE_EIFFEL_CHARACTER) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_EIFFEL_STRINGEOL);
+			} else if (sc.ch == '%') {
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				sc.Forward();
+				sc.SetState(SCE_EIFFEL_DEFAULT);
+			}
+		}
+
+		if (sc.state == SCE_EIFFEL_DEFAULT) {
+			if (sc.ch == '-' && sc.chNext == '-') {
+				sc.SetState(SCE_EIFFEL_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_EIFFEL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_EIFFEL_CHARACTER);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.')) {
+				sc.SetState(SCE_EIFFEL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_WORD);
+			} else if (isEiffelOperator(sc.ch)) {
+				sc.SetState(SCE_EIFFEL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static bool IsEiffelComment(Accessor &styler, Sci_Position pos, Sci_Position len) {
+	return len>1 && styler[pos]=='-' && styler[pos+1]=='-';
+}
+
+static void FoldEiffelDocIndent(Sci_PositionU startPos, Sci_Position length, int,
+						   WordList *[], Accessor &styler) {
+	Sci_Position lengthDoc = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsEiffelComment);
+	char chNext = styler[startPos];
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsEiffelComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsEiffelComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static void FoldEiffelDocKeyWords(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[],
+                       Accessor &styler) {
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int stylePrev = 0;
+	int styleNext = styler.StyleAt(startPos);
+	// lastDeferred should be determined by looking back to last keyword in case
+	// the "deferred" is on a line before "class"
+	bool lastDeferred = false;
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if ((stylePrev != SCE_EIFFEL_WORD) && (style == SCE_EIFFEL_WORD)) {
+			char s[20];
+			Sci_PositionU j = 0;
+			while ((j < (sizeof(s) - 1)) && (iswordchar(styler[i + j]))) {
+				s[j] = styler[i + j];
+				j++;
+			}
+			s[j] = '\0';
+
+			if (
+				(strcmp(s, "check") == 0) ||
+				(strcmp(s, "debug") == 0) ||
+				(strcmp(s, "deferred") == 0) ||
+				(strcmp(s, "do") == 0) ||
+				(strcmp(s, "from") == 0) ||
+				(strcmp(s, "if") == 0) ||
+				(strcmp(s, "inspect") == 0) ||
+				(strcmp(s, "once") == 0)
+			)
+				levelCurrent++;
+			if (!lastDeferred && (strcmp(s, "class") == 0))
+				levelCurrent++;
+			if (strcmp(s, "end") == 0)
+				levelCurrent--;
+			lastDeferred = strcmp(s, "deferred") == 0;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		stylePrev = style;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const eiffelWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmEiffel(SCLEX_EIFFEL, ColouriseEiffelDoc, "eiffel", FoldEiffelDocIndent, eiffelWordListDesc);
+LexerModule lmEiffelkw(SCLEX_EIFFELKW, ColouriseEiffelDoc, "eiffelkw", FoldEiffelDocKeyWords, eiffelWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexErlang.cxx b/scite-app/lexilla/lexers/LexErlang.cxx
new file mode 100644
index 0000000..b08f99b
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexErlang.cxx
@@ -0,0 +1,631 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+/** @file LexErlang.cxx
+ ** Lexer for Erlang.
+ ** Enhanced by Etienne 'Lenain' Girondel (lenaing@gmail.com)
+ ** Originally wrote by Peter-Henry Mander,
+ ** based on Matlab lexer by José Fonseca.
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static int is_radix(int radix, int ch) {
+	int digit;
+
+	if (36 < radix || 2 > radix)
+		return 0;
+
+	if (isdigit(ch)) {
+		digit = ch - '0';
+	} else if (isalnum(ch)) {
+		digit = toupper(ch) - 'A' + 10;
+	} else {
+		return 0;
+	}
+
+	return (digit < radix);
+}
+
+typedef enum {
+	STATE_NULL,
+	COMMENT,
+	COMMENT_FUNCTION,
+	COMMENT_MODULE,
+	COMMENT_DOC,
+	COMMENT_DOC_MACRO,
+	ATOM_UNQUOTED,
+	ATOM_QUOTED,
+	NODE_NAME_UNQUOTED,
+	NODE_NAME_QUOTED,
+	MACRO_START,
+	MACRO_UNQUOTED,
+	MACRO_QUOTED,
+	RECORD_START,
+	RECORD_UNQUOTED,
+	RECORD_QUOTED,
+	NUMERAL_START,
+	NUMERAL_BASE_VALUE,
+	NUMERAL_FLOAT,
+	NUMERAL_EXPONENT,
+	PREPROCESSOR
+} atom_parse_state_t;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (ch != ' ') && (isalnum(ch) || ch == '_');
+}
+
+static void ColouriseErlangDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+								WordList *keywordlists[], Accessor &styler) {
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	WordList &reservedWords = *keywordlists[0];
+	WordList &erlangBIFs = *keywordlists[1];
+	WordList &erlangPreproc = *keywordlists[2];
+	WordList &erlangModulesAtt = *keywordlists[3];
+	WordList &erlangDoc = *keywordlists[4];
+	WordList &erlangDocMacro = *keywordlists[5];
+	int radix_digits = 0;
+	int exponent_digits = 0;
+	atom_parse_state_t parse_state = STATE_NULL;
+	atom_parse_state_t old_parse_state = STATE_NULL;
+	bool to_late_to_comment = false;
+	char cur[100];
+	int old_style = SCE_ERLANG_DEFAULT;
+
+	styler.StartAt(startPos);
+
+	for (; sc.More(); sc.Forward()) {
+		int style = SCE_ERLANG_DEFAULT;
+		if (STATE_NULL != parse_state) {
+
+			switch (parse_state) {
+
+				case STATE_NULL : sc.SetState(SCE_ERLANG_DEFAULT); break;
+
+			/* COMMENTS ------------------------------------------------------*/
+				case COMMENT : {
+					if (sc.ch != '%') {
+						to_late_to_comment = true;
+					} else if (!to_late_to_comment && sc.ch == '%') {
+						// Switch to comment level 2 (Function)
+						sc.ChangeState(SCE_ERLANG_COMMENT_FUNCTION);
+						old_style = SCE_ERLANG_COMMENT_FUNCTION;
+						parse_state = COMMENT_FUNCTION;
+						sc.Forward();
+					}
+				}
+				// V--- Falling through!
+				// Falls through.
+				case COMMENT_FUNCTION : {
+					if (sc.ch != '%') {
+						to_late_to_comment = true;
+					} else if (!to_late_to_comment && sc.ch == '%') {
+						// Switch to comment level 3 (Module)
+						sc.ChangeState(SCE_ERLANG_COMMENT_MODULE);
+						old_style = SCE_ERLANG_COMMENT_MODULE;
+						parse_state = COMMENT_MODULE;
+						sc.Forward();
+					}
+				}
+				// V--- Falling through!
+				// Falls through.
+				case COMMENT_MODULE : {
+					if (parse_state != COMMENT) {
+						// Search for comment documentation
+						if (sc.chNext == '@') {
+							old_parse_state = parse_state;
+							parse_state = ('{' == sc.ch)
+											? COMMENT_DOC_MACRO
+											: COMMENT_DOC;
+							sc.ForwardSetState(sc.state);
+						}
+					}
+
+					// All comments types fall here.
+					if (sc.MatchLineEnd()) {
+						to_late_to_comment = false;
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case COMMENT_DOC :
+				// V--- Falling through!
+				case COMMENT_DOC_MACRO : {
+
+					if (!isalnum(sc.ch)) {
+						// Try to match documentation comment
+						sc.GetCurrent(cur, sizeof(cur));
+
+						if (parse_state == COMMENT_DOC_MACRO
+							&& erlangDocMacro.InList(cur)) {
+								sc.ChangeState(SCE_ERLANG_COMMENT_DOC_MACRO);
+								while (sc.ch != '}' && !sc.atLineEnd)
+									sc.Forward();
+						} else if (erlangDoc.InList(cur)) {
+							sc.ChangeState(SCE_ERLANG_COMMENT_DOC);
+						} else {
+							sc.ChangeState(old_style);
+						}
+
+						// Switch back to old state
+						sc.SetState(old_style);
+						parse_state = old_parse_state;
+					}
+
+					if (sc.MatchLineEnd()) {
+						to_late_to_comment = false;
+						sc.ChangeState(old_style);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Atoms ---------------------------------------------------------*/
+				case ATOM_UNQUOTED : {
+					if ('@' == sc.ch){
+						parse_state = NODE_NAME_UNQUOTED;
+					} else if (sc.ch == ':') {
+						// Searching for module name
+						if (sc.chNext == ' ') {
+							// error
+							sc.ChangeState(SCE_ERLANG_UNKNOWN);
+							parse_state = STATE_NULL;
+						} else {
+							sc.Forward();
+							if (isalnum(sc.ch) || (sc.ch == '\''))  {
+								sc.GetCurrent(cur, sizeof(cur));
+								sc.ChangeState(SCE_ERLANG_MODULES);
+								sc.SetState(SCE_ERLANG_MODULES);
+							}
+							if (sc.ch == '\'') {
+								parse_state = ATOM_QUOTED;
+							}
+
+						}
+					} else if (!IsAWordChar(sc.ch)) {
+
+						sc.GetCurrent(cur, sizeof(cur));
+						if (reservedWords.InList(cur)) {
+							style = SCE_ERLANG_KEYWORD;
+						} else if (erlangBIFs.InList(cur)
+									&& strcmp(cur,"erlang:")){
+							style = SCE_ERLANG_BIFS;
+						} else if (sc.ch == '(' || '/' == sc.ch){
+							style = SCE_ERLANG_FUNCTION_NAME;
+						} else {
+							style = SCE_ERLANG_ATOM;
+						}
+
+						sc.ChangeState(style);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+
+				} break;
+
+				case ATOM_QUOTED : {
+					if ( '@' == sc.ch ){
+						parse_state = NODE_NAME_QUOTED;
+					} else if ('\'' == sc.ch && '\\' != sc.chPrev) {
+						sc.ChangeState(SCE_ERLANG_ATOM_QUOTED);
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Node names ----------------------------------------------------*/
+				case NODE_NAME_UNQUOTED : {
+					if ('@' == sc.ch) {
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					} else if (!IsAWordChar(sc.ch)) {
+						sc.ChangeState(SCE_ERLANG_NODE_NAME);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case NODE_NAME_QUOTED : {
+					if ('@' == sc.ch) {
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					} else if ('\'' == sc.ch && '\\' != sc.chPrev) {
+						sc.ChangeState(SCE_ERLANG_NODE_NAME_QUOTED);
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Records -------------------------------------------------------*/
+				case RECORD_START : {
+					if ('\'' == sc.ch) {
+						parse_state = RECORD_QUOTED;
+					} else if (isalpha(sc.ch) && islower(sc.ch)) {
+						parse_state = RECORD_UNQUOTED;
+					} else { // error
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case RECORD_UNQUOTED : {
+					if (!IsAWordChar(sc.ch)) {
+						sc.ChangeState(SCE_ERLANG_RECORD);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case RECORD_QUOTED : {
+					if ('\'' == sc.ch && '\\' != sc.chPrev) {
+						sc.ChangeState(SCE_ERLANG_RECORD_QUOTED);
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Macros --------------------------------------------------------*/
+				case MACRO_START : {
+					if ('\'' == sc.ch) {
+						parse_state = MACRO_QUOTED;
+					} else if (isalpha(sc.ch)) {
+						parse_state = MACRO_UNQUOTED;
+					} else { // error
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case MACRO_UNQUOTED : {
+					if (!IsAWordChar(sc.ch)) {
+						sc.ChangeState(SCE_ERLANG_MACRO);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+				case MACRO_QUOTED : {
+					if ('\'' == sc.ch && '\\' != sc.chPrev) {
+						sc.ChangeState(SCE_ERLANG_MACRO_QUOTED);
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Numerics ------------------------------------------------------*/
+			/* Simple integer */
+				case NUMERAL_START : {
+					if (isdigit(sc.ch)) {
+						radix_digits *= 10;
+						radix_digits += sc.ch - '0'; // Assuming ASCII here!
+					} else if ('#' == sc.ch) {
+						if (2 > radix_digits || 36 < radix_digits) {
+							sc.SetState(SCE_ERLANG_DEFAULT);
+							parse_state = STATE_NULL;
+						} else {
+							parse_state = NUMERAL_BASE_VALUE;
+						}
+					} else if ('.' == sc.ch && isdigit(sc.chNext)) {
+						radix_digits = 0;
+						parse_state = NUMERAL_FLOAT;
+					} else if ('e' == sc.ch || 'E' == sc.ch) {
+						exponent_digits = 0;
+						parse_state = NUMERAL_EXPONENT;
+					} else {
+						radix_digits = 0;
+						sc.ChangeState(SCE_ERLANG_NUMBER);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* Integer in other base than 10 (x#yyy) */
+				case NUMERAL_BASE_VALUE : {
+					if (!is_radix(radix_digits,sc.ch)) {
+						radix_digits = 0;
+
+						if (!isalnum(sc.ch))
+							sc.ChangeState(SCE_ERLANG_NUMBER);
+
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* Float (x.yyy) */
+				case NUMERAL_FLOAT : {
+					if ('e' == sc.ch || 'E' == sc.ch) {
+						exponent_digits = 0;
+						parse_state = NUMERAL_EXPONENT;
+					} else if (!isdigit(sc.ch)) {
+						sc.ChangeState(SCE_ERLANG_NUMBER);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			/* Exponent, either integer or float (xEyy, x.yyEzzz) */
+				case NUMERAL_EXPONENT : {
+					if (('-' == sc.ch || '+' == sc.ch)
+							&& (isdigit(sc.chNext))) {
+						sc.Forward();
+					} else if (!isdigit(sc.ch)) {
+						if (0 < exponent_digits)
+							sc.ChangeState(SCE_ERLANG_NUMBER);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					} else {
+						++exponent_digits;
+					}
+				} break;
+
+			/* -------------------------------------------------------------- */
+			/* Preprocessor --------------------------------------------------*/
+				case PREPROCESSOR : {
+					if (!IsAWordChar(sc.ch)) {
+
+						sc.GetCurrent(cur, sizeof(cur));
+						if (erlangPreproc.InList(cur)) {
+							style = SCE_ERLANG_PREPROC;
+						} else if (erlangModulesAtt.InList(cur)) {
+							style = SCE_ERLANG_MODULES_ATT;
+						}
+
+						sc.ChangeState(style);
+						sc.SetState(SCE_ERLANG_DEFAULT);
+						parse_state = STATE_NULL;
+					}
+				} break;
+
+			}
+
+		} /* End of : STATE_NULL != parse_state */
+		else
+		{
+			switch (sc.state) {
+				case SCE_ERLANG_VARIABLE : {
+					if (!IsAWordChar(sc.ch))
+						sc.SetState(SCE_ERLANG_DEFAULT);
+				} break;
+				case SCE_ERLANG_STRING : {
+					 if (sc.ch == '\"' && sc.chPrev != '\\')
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+				} break;
+				case SCE_ERLANG_COMMENT : {
+					 if (sc.atLineEnd)
+						sc.SetState(SCE_ERLANG_DEFAULT);
+				} break;
+				case SCE_ERLANG_CHARACTER : {
+					if (sc.chPrev == '\\') {
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+					} else if (sc.ch != '\\') {
+						sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+					}
+				} break;
+				case SCE_ERLANG_OPERATOR : {
+					if (sc.chPrev == '.') {
+						if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\'
+							|| sc.ch == '^') {
+							sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						} else if (sc.ch == '\'') {
+							sc.ForwardSetState(SCE_ERLANG_DEFAULT);
+						} else {
+							sc.SetState(SCE_ERLANG_DEFAULT);
+						}
+					} else {
+						sc.SetState(SCE_ERLANG_DEFAULT);
+					}
+				} break;
+			}
+		}
+
+		if (sc.state == SCE_ERLANG_DEFAULT) {
+			bool no_new_state = false;
+
+			switch (sc.ch) {
+				case '\"' : sc.SetState(SCE_ERLANG_STRING); break;
+				case '$' : sc.SetState(SCE_ERLANG_CHARACTER); break;
+				case '%' : {
+					parse_state = COMMENT;
+					sc.SetState(SCE_ERLANG_COMMENT);
+				} break;
+				case '#' : {
+					parse_state = RECORD_START;
+					sc.SetState(SCE_ERLANG_UNKNOWN);
+				} break;
+				case '?' : {
+					parse_state = MACRO_START;
+					sc.SetState(SCE_ERLANG_UNKNOWN);
+				} break;
+				case '\'' : {
+					parse_state = ATOM_QUOTED;
+					sc.SetState(SCE_ERLANG_UNKNOWN);
+				} break;
+				case '+' :
+				case '-' : {
+					if (IsADigit(sc.chNext)) {
+						parse_state = NUMERAL_START;
+						radix_digits = 0;
+						sc.SetState(SCE_ERLANG_UNKNOWN);
+					} else if (sc.ch != '+') {
+						parse_state = PREPROCESSOR;
+						sc.SetState(SCE_ERLANG_UNKNOWN);
+					}
+				} break;
+				default : no_new_state = true;
+			}
+
+			if (no_new_state) {
+				if (isdigit(sc.ch)) {
+					parse_state = NUMERAL_START;
+					radix_digits = sc.ch - '0';
+					sc.SetState(SCE_ERLANG_UNKNOWN);
+				} else if (isupper(sc.ch) || '_' == sc.ch) {
+					sc.SetState(SCE_ERLANG_VARIABLE);
+				} else if (isalpha(sc.ch)) {
+					parse_state = ATOM_UNQUOTED;
+					sc.SetState(SCE_ERLANG_UNKNOWN);
+				} else if (isoperator(static_cast<char>(sc.ch))
+							|| sc.ch == '\\') {
+					sc.SetState(SCE_ERLANG_OPERATOR);
+				}
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static int ClassifyErlangFoldPoint(
+	Accessor &styler,
+	int styleNext,
+	Sci_Position keyword_start
+) {
+	int lev = 0;
+	if (styler.Match(keyword_start,"case")
+		|| (
+			styler.Match(keyword_start,"fun")
+			&& (SCE_ERLANG_FUNCTION_NAME != styleNext)
+			)
+		|| styler.Match(keyword_start,"if")
+		|| styler.Match(keyword_start,"query")
+		|| styler.Match(keyword_start,"receive")
+	) {
+		++lev;
+	} else if (styler.Match(keyword_start,"end")) {
+		--lev;
+	}
+
+	return lev;
+}
+
+static void FoldErlangDoc(
+	Sci_PositionU startPos, Sci_Position length, int initStyle,
+	WordList** /*keywordlists*/, Accessor &styler
+) {
+	Sci_PositionU endPos = startPos + length;
+	Sci_Position currentLine = styler.GetLine(startPos);
+	int lev;
+	int previousLevel = styler.LevelAt(currentLine) & SC_FOLDLEVELNUMBERMASK;
+	int currentLevel = previousLevel;
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	int stylePrev;
+	Sci_Position keyword_start = 0;
+	char ch;
+	char chNext = styler.SafeGetCharAt(startPos);
+	bool atEOL;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		// Get styles
+		stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		atEOL = ((ch == '\r') && (chNext != '\n')) || (ch == '\n');
+
+		if (stylePrev != SCE_ERLANG_KEYWORD
+			&& style == SCE_ERLANG_KEYWORD) {
+			keyword_start = i;
+		}
+
+		// Fold on keywords
+		if (stylePrev == SCE_ERLANG_KEYWORD
+			&& style != SCE_ERLANG_KEYWORD
+			&& style != SCE_ERLANG_ATOM
+		) {
+			currentLevel += ClassifyErlangFoldPoint(styler,
+													styleNext,
+													keyword_start);
+		}
+
+		// Fold on comments
+		if (style == SCE_ERLANG_COMMENT
+			|| style == SCE_ERLANG_COMMENT_MODULE
+			|| style == SCE_ERLANG_COMMENT_FUNCTION) {
+
+			if (ch == '%' && chNext == '{') {
+				currentLevel++;
+			} else if (ch == '%' && chNext == '}') {
+				currentLevel--;
+			}
+		}
+
+		// Fold on braces
+		if (style == SCE_ERLANG_OPERATOR) {
+			if (ch == '{' || ch == '(' || ch == '[') {
+				currentLevel++;
+			} else if (ch == '}' || ch == ')' || ch == ']') {
+				currentLevel--;
+			}
+		}
+
+
+		if (atEOL) {
+			lev = previousLevel;
+
+			if (currentLevel > previousLevel)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+
+			if (lev != styler.LevelAt(currentLine))
+				styler.SetLevel(currentLine, lev);
+
+			currentLine++;
+			previousLevel = currentLevel;
+		}
+
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	styler.SetLevel(currentLine,
+					previousLevel
+					| (styler.LevelAt(currentLine) & ~SC_FOLDLEVELNUMBERMASK));
+}
+
+static const char * const erlangWordListDesc[] = {
+	"Erlang Reserved words",
+	"Erlang BIFs",
+	"Erlang Preprocessor",
+	"Erlang Module Attributes",
+	"Erlang Documentation",
+	"Erlang Documentation Macro",
+	0
+};
+
+LexerModule lmErlang(
+	SCLEX_ERLANG,
+	ColouriseErlangDoc,
+	"erlang",
+	FoldErlangDoc,
+	erlangWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexErrorList.cxx b/scite-app/lexilla/lexers/LexErrorList.cxx
new file mode 100644
index 0000000..24eec8f
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexErrorList.cxx
@@ -0,0 +1,415 @@
+// Scintilla source code edit control
+/** @file LexErrorList.cxx
+ ** Lexer for error lists. Used for the output pane in SciTE.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+namespace {
+
+bool strstart(const char *haystack, const char *needle) noexcept {
+	return strncmp(haystack, needle, strlen(needle)) == 0;
+}
+
+constexpr bool Is0To9(char ch) noexcept {
+	return (ch >= '0') && (ch <= '9');
+}
+
+constexpr bool Is1To9(char ch) noexcept {
+	return (ch >= '1') && (ch <= '9');
+}
+
+bool IsAlphabetic(int ch) {
+	return IsASCII(ch) && isalpha(ch);
+}
+
+inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') ||
+	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+bool IsGccExcerpt(const char *s) noexcept {
+	while (*s) {
+		if (s[0] == ' ' && s[1] == '|' && (s[2] == ' ' || s[2] == '+')) {
+			return true;
+		}
+		if (!(s[0] == ' ' || s[0] == '+' || Is0To9(s[0]))) {
+			return false;
+		}
+		s++;
+	}
+	return true;
+}
+
+int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLine, Sci_Position &startValue) {
+	if (lineBuffer[0] == '>') {
+		// Command or return status
+		return SCE_ERR_CMD;
+	} else if (lineBuffer[0] == '<') {
+		// Diff removal.
+		return SCE_ERR_DIFF_DELETION;
+	} else if (lineBuffer[0] == '!') {
+		return SCE_ERR_DIFF_CHANGED;
+	} else if (lineBuffer[0] == '+') {
+		if (strstart(lineBuffer, "+++ ")) {
+			return SCE_ERR_DIFF_MESSAGE;
+		} else {
+			return SCE_ERR_DIFF_ADDITION;
+		}
+	} else if (lineBuffer[0] == '-') {
+		if (strstart(lineBuffer, "--- ")) {
+			return SCE_ERR_DIFF_MESSAGE;
+		} else {
+			return SCE_ERR_DIFF_DELETION;
+		}
+	} else if (strstart(lineBuffer, "cf90-")) {
+		// Absoft Pro Fortran 90/95 v8.2 error and/or warning message
+		return SCE_ERR_ABSF;
+	} else if (strstart(lineBuffer, "fortcom:")) {
+		// Intel Fortran Compiler v8.0 error/warning message
+		return SCE_ERR_IFORT;
+	} else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) {
+		return SCE_ERR_PYTHON;
+	} else if (strstr(lineBuffer, " in ") && strstr(lineBuffer, " on line ")) {
+		return SCE_ERR_PHP;
+	} else if ((strstart(lineBuffer, "Error ") ||
+	            strstart(lineBuffer, "Warning ")) &&
+	           strstr(lineBuffer, " at (") &&
+	           strstr(lineBuffer, ") : ") &&
+	           (strstr(lineBuffer, " at (") < strstr(lineBuffer, ") : "))) {
+		// Intel Fortran Compiler error/warning message
+		return SCE_ERR_IFC;
+	} else if (strstart(lineBuffer, "Error ")) {
+		// Borland error message
+		return SCE_ERR_BORLAND;
+	} else if (strstart(lineBuffer, "Warning ")) {
+		// Borland warning message
+		return SCE_ERR_BORLAND;
+	} else if (strstr(lineBuffer, "at line ") &&
+	        (strstr(lineBuffer, "at line ") < (lineBuffer + lengthLine)) &&
+	           strstr(lineBuffer, "file ") &&
+	           (strstr(lineBuffer, "file ") < (lineBuffer + lengthLine))) {
+		// Lua 4 error message
+		return SCE_ERR_LUA;
+	} else if (strstr(lineBuffer, " at ") &&
+	        (strstr(lineBuffer, " at ") < (lineBuffer + lengthLine)) &&
+	           strstr(lineBuffer, " line ") &&
+	           (strstr(lineBuffer, " line ") < (lineBuffer + lengthLine)) &&
+	        (strstr(lineBuffer, " at ") + 4 < (strstr(lineBuffer, " line ")))) {
+		// perl error message:
+		// <message> at <file> line <line>
+		return SCE_ERR_PERL;
+	} else if ((lengthLine >= 6) &&
+	           (memcmp(lineBuffer, "   at ", 6) == 0) &&
+	           strstr(lineBuffer, ":line ")) {
+		// A .NET traceback
+		return SCE_ERR_NET;
+	} else if (strstart(lineBuffer, "Line ") &&
+	           strstr(lineBuffer, ", file ")) {
+		// Essential Lahey Fortran error message
+		return SCE_ERR_ELF;
+	} else if (strstart(lineBuffer, "line ") &&
+	           strstr(lineBuffer, " column ")) {
+		// HTML tidy style: line 42 column 1
+		return SCE_ERR_TIDY;
+	} else if (strstart(lineBuffer, "\tat ") &&
+	           strstr(lineBuffer, "(") &&
+	           strstr(lineBuffer, ".java:")) {
+		// Java stack back trace
+		return SCE_ERR_JAVA_STACK;
+	} else if (strstart(lineBuffer, "In file included from ") ||
+	           strstart(lineBuffer, "                 from ")) {
+		// GCC showing include path to following error
+		return SCE_ERR_GCC_INCLUDED_FROM;
+	} else if (strstart(lineBuffer, "NMAKE : fatal error")) {
+		// Microsoft nmake fatal error:
+		// NMAKE : fatal error <code>: <program> : return code <return>
+		return SCE_ERR_MS;
+	} else if (strstr(lineBuffer, "warning LNK") ||
+		strstr(lineBuffer, "error LNK")) {
+		// Microsoft linker warning:
+		// {<object> : } (warning|error) LNK9999
+		return SCE_ERR_MS;
+	} else if (IsGccExcerpt(lineBuffer)) {
+		// GCC code excerpt and pointer to issue
+		//    73 |   GTimeVal last_popdown;
+		//       |            ^~~~~~~~~~~~
+		return SCE_ERR_GCC_EXCERPT;
+	} else {
+		// Look for one of the following formats:
+		// GCC: <filename>:<line>:<message>
+		// Microsoft: <filename>(<line>) :<message>
+		// Common: <filename>(<line>): warning|error|note|remark|catastrophic|fatal
+		// Common: <filename>(<line>) warning|error|note|remark|catastrophic|fatal
+		// Microsoft: <filename>(<line>,<column>)<message>
+		// CTags: <identifier>\t<filename>\t<message>
+		// Lua 5 traceback: \t<filename>:<line>:<message>
+		// Lua 5.1: <exe>: <filename>:<line>:<message>
+		const bool initialTab = (lineBuffer[0] == '\t');
+		bool initialColonPart = false;
+		bool canBeCtags = !initialTab;	// For ctags must have an identifier with no spaces then a tab
+		enum { stInitial,
+			stGccStart, stGccDigit, stGccColumn, stGcc,
+			stMsStart, stMsDigit, stMsBracket, stMsVc, stMsDigitComma, stMsDotNet,
+			stCtagsStart, stCtagsFile, stCtagsStartString, stCtagsStringDollar, stCtags,
+			stUnrecognized
+		} state = stInitial;
+		for (Sci_PositionU i = 0; i < lengthLine; i++) {
+			const char ch = lineBuffer[i];
+			char chNext = ' ';
+			if ((i + 1) < lengthLine)
+				chNext = lineBuffer[i + 1];
+			if (state == stInitial) {
+				if (ch == ':') {
+					// May be GCC, or might be Lua 5 (Lua traceback same but with tab prefix)
+					if ((chNext != '\\') && (chNext != '/') && (chNext != ' ')) {
+						// This check is not completely accurate as may be on
+						// GTK+ with a file name that includes ':'.
+						state = stGccStart;
+					} else if (chNext == ' ') { // indicates a Lua 5.1 error message
+						initialColonPart = true;
+					}
+				} else if ((ch == '(') && Is1To9(chNext) && (!initialTab)) {
+					// May be Microsoft
+					// Check against '0' often removes phone numbers
+					state = stMsStart;
+				} else if ((ch == '\t') && canBeCtags) {
+					// May be CTags
+					state = stCtagsStart;
+				} else if (ch == ' ') {
+					canBeCtags = false;
+				}
+			} else if (state == stGccStart) {	// <filename>:
+				state = ((ch == '-') || Is0To9(ch)) ? stGccDigit : stUnrecognized;
+			} else if (state == stGccDigit) {	// <filename>:<line>
+				if (ch == ':') {
+					state = stGccColumn;	// :9.*: is GCC
+					startValue = i + 1;
+				} else if (!Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stGccColumn) {	// <filename>:<line>:<column>
+				if (!Is0To9(ch)) {
+					state = stGcc;
+					if (ch == ':')
+						startValue = i + 1;
+					break;
+				}
+			} else if (state == stMsStart) {	// <filename>(
+				state = Is0To9(ch) ? stMsDigit : stUnrecognized;
+			} else if (state == stMsDigit) {	// <filename>(<line>
+				if (ch == ',') {
+					state = stMsDigitComma;
+				} else if (ch == ')') {
+					state = stMsBracket;
+				} else if ((ch != ' ') && !Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stMsBracket) {	// <filename>(<line>)
+				if ((ch == ' ') && (chNext == ':')) {
+					state = stMsVc;
+				} else if ((ch == ':' && chNext == ' ') || (ch == ' ')) {
+					// Possibly Delphi.. don't test against chNext as it's one of the strings below.
+					char word[512];
+					unsigned numstep;
+					if (ch == ' ')
+						numstep = 1; // ch was ' ', handle as if it's a delphi errorline, only add 1 to i.
+					else
+						numstep = 2; // otherwise add 2.
+					Sci_PositionU chPos = 0;
+					for (Sci_PositionU j = i + numstep; j < lengthLine && IsAlphabetic(lineBuffer[j]) && chPos < sizeof(word) - 1; j++)
+						word[chPos++] = lineBuffer[j];
+					word[chPos] = 0;
+					if (!CompareCaseInsensitive(word, "error") || !CompareCaseInsensitive(word, "warning") ||
+						!CompareCaseInsensitive(word, "fatal") || !CompareCaseInsensitive(word, "catastrophic") ||
+						!CompareCaseInsensitive(word, "note") || !CompareCaseInsensitive(word, "remark")) {
+						state = stMsVc;
+					} else {
+						state = stUnrecognized;
+					}
+				} else {
+					state = stUnrecognized;
+				}
+			} else if (state == stMsDigitComma) {	// <filename>(<line>,
+				if (ch == ')') {
+					state = stMsDotNet;
+					break;
+				} else if ((ch != ' ') && !Is0To9(ch)) {
+					state = stUnrecognized;
+				}
+			} else if (state == stCtagsStart) {
+				if (ch == '\t') {
+					state = stCtagsFile;
+				}
+			} else if (state == stCtagsFile) {
+				if ((lineBuffer[i - 1] == '\t') &&
+				        ((ch == '/' && chNext == '^') || Is0To9(ch))) {
+					state = stCtags;
+					break;
+				} else if ((ch == '/') && (chNext == '^')) {
+					state = stCtagsStartString;
+				}
+			} else if ((state == stCtagsStartString) && ((lineBuffer[i] == '$') && (lineBuffer[i + 1] == '/'))) {
+				state = stCtagsStringDollar;
+				break;
+			}
+		}
+		if (state == stGcc) {
+			return initialColonPart ? SCE_ERR_LUA : SCE_ERR_GCC;
+		} else if ((state == stMsVc) || (state == stMsDotNet)) {
+			return SCE_ERR_MS;
+		} else if ((state == stCtagsStringDollar) || (state == stCtags)) {
+			return SCE_ERR_CTAG;
+		} else if (initialColonPart && strstr(lineBuffer, ": warning C")) {
+			// Microsoft warning without line number
+			// <filename>: warning C9999
+			return SCE_ERR_MS;
+		} else {
+			return SCE_ERR_DEFAULT;
+		}
+	}
+}
+
+#define CSI "\033["
+
+constexpr bool SequenceEnd(int ch) noexcept {
+	return (ch == 0) || ((ch >= '@') && (ch <= '~'));
+}
+
+int StyleFromSequence(const char *seq) noexcept {
+	int bold = 0;
+	int colour = 0;
+	while (!SequenceEnd(*seq)) {
+		if (Is0To9(*seq)) {
+			int base = *seq - '0';
+			if (Is0To9(seq[1])) {
+				base = base * 10;
+				base += seq[1] - '0';
+				seq++;
+			}
+			if (base == 0) {
+				colour = 0;
+				bold = 0;
+			}
+			else if (base == 1) {
+				bold = 1;
+			}
+			else if (base >= 30 && base <= 37) {
+				colour = base - 30;
+			}
+		}
+		seq++;
+	}
+	return SCE_ERR_ES_BLACK + bold * 8 + colour;
+}
+
+void ColouriseErrorListLine(
+    const std::string &lineBuffer,
+    Sci_PositionU endPos,
+    Accessor &styler,
+	bool valueSeparate,
+	bool escapeSequences) {
+	Sci_Position startValue = -1;
+	const Sci_PositionU lengthLine = lineBuffer.length();
+	const int style = RecogniseErrorListLine(lineBuffer.c_str(), lengthLine, startValue);
+	if (escapeSequences && strstr(lineBuffer.c_str(), CSI)) {
+		const Sci_Position startPos = endPos - lengthLine;
+		const char *linePortion = lineBuffer.c_str();
+		Sci_Position startPortion = startPos;
+		int portionStyle = style;
+		while (const char *startSeq = strstr(linePortion, CSI)) {
+			if (startSeq > linePortion) {
+				styler.ColourTo(startPortion + static_cast<int>(startSeq - linePortion), portionStyle);
+			}
+			const char *endSeq = startSeq + 2;
+			while (!SequenceEnd(*endSeq))
+				endSeq++;
+			const Sci_Position endSeqPosition = startPortion + static_cast<Sci_Position>(endSeq - linePortion) + 1;
+			switch (*endSeq) {
+			case 0:
+				styler.ColourTo(endPos, SCE_ERR_ESCSEQ_UNKNOWN);
+				return;
+			case 'm':	// Colour command
+				styler.ColourTo(endSeqPosition, SCE_ERR_ESCSEQ);
+				portionStyle = StyleFromSequence(startSeq+2);
+				break;
+			case 'K':	// Erase to end of line -> ignore
+				styler.ColourTo(endSeqPosition, SCE_ERR_ESCSEQ);
+				break;
+			default:
+				styler.ColourTo(endSeqPosition, SCE_ERR_ESCSEQ_UNKNOWN);
+				portionStyle = style;
+			}
+			startPortion = endSeqPosition;
+			linePortion = endSeq + 1;
+		}
+		styler.ColourTo(endPos, portionStyle);
+	} else {
+		if (valueSeparate && (startValue >= 0)) {
+			styler.ColourTo(endPos - (lengthLine - startValue), style);
+			styler.ColourTo(endPos, SCE_ERR_VALUE);
+		} else {
+			styler.ColourTo(endPos, style);
+		}
+	}
+}
+
+void ColouriseErrorListDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	std::string lineBuffer;
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+
+	// property lexer.errorlist.value.separate
+	//	For lines in the output pane that are matches from Find in Files or GCC-style
+	//	diagnostics, style the path and line number separately from the rest of the
+	//	line with style 21 used for the rest of the line.
+	//	This allows matched text to be more easily distinguished from its location.
+	const bool valueSeparate = styler.GetPropertyInt("lexer.errorlist.value.separate", 0) != 0;
+
+	// property lexer.errorlist.escape.sequences
+	//	Set to 1 to interpret escape sequences.
+	const bool escapeSequences = styler.GetPropertyInt("lexer.errorlist.escape.sequences") != 0;
+
+	for (Sci_PositionU i = startPos; i < startPos + length; i++) {
+		lineBuffer.push_back(styler[i]);
+		if (AtEOL(styler, i)) {
+			// End of line met, colourise it
+			ColouriseErrorListLine(lineBuffer, i, styler, valueSeparate, escapeSequences);
+			lineBuffer.clear();
+		}
+	}
+	if (!lineBuffer.empty()) {	// Last line does not have ending characters
+		ColouriseErrorListLine(lineBuffer, startPos + length - 1, styler, valueSeparate, escapeSequences);
+	}
+}
+
+const char *const emptyWordListDesc[] = {
+	nullptr
+};
+
+}
+
+LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", 0, emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexFSharp.cxx b/scite-app/lexilla/lexers/LexFSharp.cxx
new file mode 100644
index 0000000..56b63c3
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexFSharp.cxx
@@ -0,0 +1,698 @@
+/**
+ * @file LexFSharp.cxx
+ * Lexer for F# 5.0
+ * Copyright (c) 2021 Robert Di Pardo <dipardo.r@gmail.com>
+ * Parts of LexerFSharp::Lex were adapted from LexCaml.cxx by Robert Roessler ("RR").
+ * Parts of LexerFSharp::Fold were adapted from LexCPP.cxx by Neil Hodgson and Udo Lechner.
+ * The License.txt file describes the conditions under which this software may be distributed.
+ */
+// clang-format off
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+// clang-format on
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static const char *const lexerName = "fsharp";
+static constexpr int WORDLIST_SIZE = 5;
+static const char *const fsharpWordLists[] = {
+	"standard language keywords",
+	"core functions, including those in the FSharp.Collections namespace",
+	"built-in types, core namespaces, modules",
+	"optional",
+	"optional",
+	nullptr,
+};
+static constexpr int keywordClasses[] = {
+	SCE_FSHARP_KEYWORD, SCE_FSHARP_KEYWORD2, SCE_FSHARP_KEYWORD3, SCE_FSHARP_KEYWORD4, SCE_FSHARP_KEYWORD5,
+};
+
+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;
+	}
+};
+
+struct OptionSetFSharp : public OptionSet<OptionsFSharp> {
+	OptionSetFSharp() {
+		DefineProperty("fold", &OptionsFSharp::fold);
+		DefineProperty("fold.compact", &OptionsFSharp::foldCompact);
+		DefineProperty("fold.comment", &OptionsFSharp::foldComment,
+				   "Setting this option to 0 disables comment folding in F# files.");
+
+		DefineProperty("fold.fsharp.comment.stream", &OptionsFSharp::foldCommentStream,
+				   "Setting this option to 0 disables folding of ML-style comments in F# files when "
+				   "fold.comment=1.");
+
+		DefineProperty("fold.fsharp.comment.multiline", &OptionsFSharp::foldCommentMultiLine,
+				   "Setting this option to 0 disables folding of grouped line comments in F# files when "
+				   "fold.comment=1.");
+
+		DefineProperty("fold.fsharp.preprocessor", &OptionsFSharp::foldPreprocessor,
+				   "Setting this option to 1 enables folding of F# compiler directives.");
+
+		DefineProperty("fold.fsharp.imports", &OptionsFSharp::foldImports,
+				   "Setting this option to 0 disables folding of F# import declarations.");
+
+		DefineWordListSets(fsharpWordLists);
+	}
+};
+
+const CharacterSet setOperators = CharacterSet(CharacterSet::setNone, "~^'-+*/%=@|&<>()[]{};,:!?");
+const CharacterSet setClosingTokens = CharacterSet(CharacterSet::setNone, ")}]");
+const CharacterSet setFormatSpecs = CharacterSet(CharacterSet::setNone, ".%aAbcdeEfFgGiMoOstuxX0123456789");
+const CharacterSet setFormatFlags = CharacterSet(CharacterSet::setNone, ".-+0 ");
+const CharacterSet numericMetaChars1 = CharacterSet(CharacterSet::setNone, "_IbeEflmnosuxy");
+const CharacterSet numericMetaChars2 = CharacterSet(CharacterSet::setNone, "lnsy");
+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 = '"';
+	}
+	constexpr bool HasLength() const {
+		return startPos > ZERO_LENGTH;
+	}
+};
+
+class UnicodeChar {
+	enum class Notation { none, asciiDec, asciiHex, utf16, utf32 };
+	Notation type = Notation::none;
+	// single-byte Unicode char (000 - 255)
+	int asciiDigits[3] = { 0 };
+	int maxDigit = '9';
+	int toEnd = 0;
+	bool invalid = false;
+
+public:
+	UnicodeChar() noexcept = default;
+	explicit UnicodeChar(const int prefix) {
+		if (IsADigit(prefix)) {
+			*asciiDigits = prefix;
+			if (*asciiDigits >= '0' && *asciiDigits <= '2') {
+				type = Notation::asciiDec;
+				// count first digit as "prefix"
+				toEnd = 2;
+			}
+		} else if (prefix == 'x' || prefix == 'u' || prefix == 'U') {
+			switch (prefix) {
+				case 'x':
+					type = Notation::asciiHex;
+					toEnd = 2;
+					break;
+				case 'u':
+					type = Notation::utf16;
+					toEnd = 4;
+					break;
+				case 'U':
+					type = Notation::utf32;
+					toEnd = 8;
+					break;
+			}
+		}
+	}
+	void Parse(const int ch) {
+		invalid = false;
+		switch (type) {
+			case Notation::asciiDec: {
+				maxDigit = (*asciiDigits < '2') ? '9' : (asciiDigits[1] <= '4') ? '9' : '5';
+				if (IsADigit(ch) && asciiDigits[1] <= maxDigit && ch <= maxDigit) {
+					asciiDigits[1] = ch;
+					toEnd--;
+				} else {
+					invalid = true;
+				}
+				break;
+			}
+			case Notation::asciiHex:
+			case Notation::utf16:
+				if (IsADigit(ch, 16)) {
+					toEnd--;
+				} else {
+					invalid = true;
+				}
+				break;
+			case Notation::utf32:
+				if ((toEnd > 6 && ch == '0') || (toEnd <= 6 && IsADigit(ch, 16))) {
+					toEnd--;
+				} else {
+					invalid = true;
+				}
+				break;
+			case Notation::none:
+				break;
+		}
+	}
+	constexpr bool AtEnd() noexcept {
+		return invalid || type == Notation::none || (type != Notation::none && toEnd < 0);
+	}
+};
+
+inline bool MatchStreamCommentStart(StyleContext &cxt) {
+	// match (* ... *), but allow point-free usage of the `*` operator,
+	// e.g.  List.fold (*) 1 [ 1; 2; 3 ]
+	return (cxt.Match('(', '*') && cxt.GetRelative(2) != ')');
+}
+
+inline bool MatchStreamCommentEnd(const StyleContext &cxt) {
+	return (cxt.ch == ')' && cxt.chPrev == '*');
+}
+
+inline bool MatchLineComment(const StyleContext &cxt) {
+	// style shebang lines as comments in F# scripts:
+	// https://fsharp.org/specs/language-spec/4.1/FSharpSpec-4.1-latest.pdf#page=30&zoom=auto,-98,537
+	return cxt.Match('/', '/') || cxt.Match('#', '!');
+}
+
+inline bool MatchLineNumberStart(StyleContext &cxt) {
+	return cxt.atLineStart && (cxt.MatchIgnoreCase("#line") ||
+		(cxt.ch == '#' && (IsADigit(cxt.chNext) || IsADigit(cxt.GetRelative(2)))));
+}
+
+inline bool MatchPPDirectiveStart(const StyleContext &cxt) {
+	return (cxt.atLineStart && cxt.ch == '#' && iswordstart(cxt.chNext));
+}
+
+inline bool MatchTypeAttributeStart(const StyleContext &cxt) {
+	return cxt.Match('[', '<');
+}
+
+inline bool MatchTypeAttributeEnd(const StyleContext &cxt) {
+	return (cxt.ch == ']' && cxt.chPrev == '>');
+}
+
+inline bool MatchQuotedExpressionStart(const StyleContext &cxt) {
+	return cxt.Match('<', '@');
+}
+
+inline bool MatchQuotedExpressionEnd(const StyleContext &cxt) {
+	return (cxt.ch == '>' && cxt.chPrev == '@');
+}
+
+inline bool MatchStringStart(const StyleContext &cxt) {
+	return (cxt.ch == '"' || cxt.Match('@', '"') || cxt.Match('$', '"') || cxt.Match('`', '`'));
+}
+
+inline bool MatchStringEnd(StyleContext &cxt, const FSharpString &fsStr) {
+	return (fsStr.HasLength() &&
+		// end of quoted identifier?
+		((cxt.ch == '`' && cxt.chPrev == '`') ||
+		// end of triple-quoted-string?
+		(fsStr.startChar == '"' && cxt.MatchIgnoreCase("\"\"\"")) ||
+		// end of verbatim string?
+		(fsStr.startChar == '@' &&
+			// embedded quotes must be in pairs
+			cxt.ch == '"' && cxt.chNext != '"' &&
+			(cxt.chPrev != '"' || (cxt.chPrev == '"' &&
+				// empty verbatim string?
+				(cxt.GetRelative(-2) == '@' ||
+				// pair of quotes at end of string?
+				(cxt.GetRelative(-2) == '"' && cxt.GetRelative(-3) != '@'))))))) ||
+		(!fsStr.HasLength() && cxt.ch == '"' &&
+			(cxt.chPrev != '\\' ||
+			// treat backslashes as char literals in verbatim strings
+			(fsStr.startChar == '@' && cxt.chPrev == '\\')));
+}
+
+inline bool MatchCharacterStart(StyleContext &cxt) {
+	// don't style generic type parameters: 'a, 'b, 'T, etc.
+	return (cxt.ch == '\'' && !(cxt.chPrev == ':' || cxt.GetRelative(-2) == ':'));
+}
+
+inline bool CanEmbedQuotes(StyleContext &cxt) {
+	// allow unescaped double quotes inside verbatim and triple-quoted strings, and quoted identifiers:
+	// - https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/strings
+	// - https://fsharp.org/specs/language-spec/4.1/FSharpSpec-4.1-latest.pdf#page=25&zoom=auto,-98,600
+	return cxt.MatchIgnoreCase("\"\"\"") || cxt.Match('@', '"') || 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(const StyleContext &cxt) {
+	return (cxt.ch == '.' && IsADigit(cxt.chPrev)) ||
+		((cxt.ch == '+' || cxt.ch == '-' ) && IsADigit(cxt.chNext));
+}
+
+class LexerFSharp : public DefaultLexer {
+	WordList keywords[WORDLIST_SIZE];
+	OptionsFSharp options;
+	OptionSetFSharp optionSet;
+
+public:
+	explicit LexerFSharp() : DefaultLexer(lexerName, SCLEX_FSHARP) {
+	}
+	static ILexer5 *LexerFactoryFSharp() {
+		return new LexerFSharp();
+	}
+	virtual ~LexerFSharp() {
+	}
+	void SCI_METHOD Release() noexcept override {
+		delete this;
+	}
+	int SCI_METHOD Version() const noexcept override {
+		return lvRelease5;
+	}
+	const char *SCI_METHOD GetName() noexcept override {
+		return lexerName;
+	}
+	int SCI_METHOD GetIdentifier() noexcept override {
+		return SCLEX_FSHARP;
+	}
+	int SCI_METHOD LineEndTypesSupported() noexcept override {
+		return SC_LINE_END_TYPE_DEFAULT;
+	}
+	void *SCI_METHOD PrivateCall(int, void *) noexcept override {
+		return nullptr;
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return optionSet.DescribeWordListSets();
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return optionSet.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return optionSet.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return optionSet.DescribeProperty(name);
+	}
+	const char *SCI_METHOD PropertyGet(const char *key) override {
+		return optionSet.PropertyGet(key);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override {
+		if (optionSet.PropertySet(&options, key, val)) {
+			return 0;
+		}
+		return ZERO_LENGTH;
+	}
+	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;
+};
+
+Sci_Position SCI_METHOD LexerFSharp::WordListSet(int n, const char *wl) {
+	WordList *wordListN = nullptr;
+	Sci_Position firstModification = ZERO_LENGTH;
+
+	if (n < WORDLIST_SIZE) {
+		wordListN = &keywords[n];
+	}
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+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_PositionU cursor = 0;
+	UnicodeChar uniCh = UnicodeChar();
+	FSharpString fsStr = FSharpString();
+	constexpr Sci_Position MAX_WORD_LEN = 64;
+	constexpr int SPACE = ' ';
+	int currentBase = 10;
+
+	while (sc.More()) {
+		Sci_PositionU colorSpan = sc.currentPos - 1;
+		int state = -1;
+		bool advance = true;
+
+		switch (sc.state & 0xff) {
+			case SCE_FSHARP_DEFAULT:
+				cursor = sc.currentPos;
+
+				if (MatchLineNumberStart(sc)) {
+					state = SCE_FSHARP_LINENUM;
+				} else if (MatchPPDirectiveStart(sc)) {
+					state = SCE_FSHARP_PREPROCESSOR;
+				} else if (MatchLineComment(sc)) {
+					state = SCE_FSHARP_COMMENTLINE;
+					sc.Forward();
+					sc.ch = SPACE;
+				} else if (MatchStreamCommentStart(sc)) {
+					state = SCE_FSHARP_COMMENT;
+					sc.Forward();
+					sc.ch = SPACE;
+				} else if (MatchTypeAttributeStart(sc)) {
+					state = SCE_FSHARP_ATTRIBUTE;
+					sc.Forward();
+				} else if (MatchQuotedExpressionStart(sc)) {
+					state = SCE_FSHARP_QUOTATION;
+					sc.Forward();
+				} else if (MatchCharacterStart(sc)) {
+					state = SCE_FSHARP_CHARACTER;
+				} else if (MatchStringStart(sc)) {
+					fsStr.startChar = sc.ch;
+					fsStr.startPos = ZERO_LENGTH;
+					if (CanEmbedQuotes(sc)) {
+						// double quotes after this position should be non-terminating
+						fsStr.startPos = static_cast<Sci_Position>(sc.currentPos - cursor);
+					}
+					if (sc.ch == '`') {
+						state = SCE_FSHARP_QUOT_IDENTIFIER;
+					} else if (sc.ch == '@') {
+						state = SCE_FSHARP_VERBATIM;
+					} else {
+						state = SCE_FSHARP_STRING;
+					}
+				} else if (IsADigit(sc.ch, currentBase) ||
+					   ((sc.ch == '+' || sc.ch == '-') && IsADigit(sc.chNext))) {
+					state = SCE_FSHARP_NUMBER;
+					if (sc.ch == '0') {
+						const int prefix = sc.chNext;
+						if (numericPrefixes.find(prefix) != numericPrefixes.end()) {
+							currentBase = numericPrefixes[prefix];
+						}
+					}
+				} else if (setOperators.Contains(sc.ch) &&
+					   // don't use operator style in async keywords (e.g. `return!`)
+					   !(sc.ch == '!' && iswordstart(sc.chPrev)) &&
+					   // don't use operator style in member access, array/string indexing
+					   !(sc.ch == '.' && (sc.chPrev == '\"' || iswordstart(sc.chPrev)) &&
+					     (iswordstart(sc.chNext) || sc.chNext == '['))) {
+					state = SCE_FSHARP_OPERATOR;
+				} else if (iswordstart(sc.ch)) {
+					state = SCE_FSHARP_IDENTIFIER;
+				} else {
+					state = SCE_FSHARP_DEFAULT;
+				}
+				break;
+			case SCE_FSHARP_LINENUM:
+			case SCE_FSHARP_PREPROCESSOR:
+			case SCE_FSHARP_COMMENTLINE:
+				if (sc.MatchLineEnd()) {
+					state = SCE_FSHARP_DEFAULT;
+					advance = false;
+				}
+				break;
+			case SCE_FSHARP_COMMENT:
+			case SCE_FSHARP_ATTRIBUTE:
+			case SCE_FSHARP_QUOTATION:
+				if (MatchStreamCommentEnd(sc) || MatchTypeAttributeEnd(sc) || MatchQuotedExpressionEnd(sc)) {
+					state = SCE_FSHARP_DEFAULT;
+					colorSpan++;
+				}
+				break;
+			case SCE_FSHARP_CHARACTER:
+				if (sc.chPrev == '\\' && sc.GetRelative(-2) != '\\') {
+					uniCh = UnicodeChar(sc.ch);
+				} else if (sc.ch == '\'' &&
+					   ((sc.chPrev == ' ' && sc.GetRelative(-2) == '\'') || sc.chPrev != '\\' ||
+						(sc.chPrev == '\\' && sc.GetRelative(-2) == '\\'))) {
+					// byte literal?
+					if (sc.Match('\'', 'B')) {
+						sc.Forward();
+						colorSpan++;
+					}
+					if (!sc.atLineEnd) {
+						colorSpan++;
+					} else {
+						sc.ChangeState(SCE_FSHARP_IDENTIFIER);
+					}
+					state = SCE_FSHARP_DEFAULT;
+				} else {
+					uniCh.Parse(sc.ch);
+					if (uniCh.AtEnd() && (sc.currentPos - cursor) >= 2) {
+						// terminate now, since we left the char behind
+						sc.ChangeState(SCE_FSHARP_IDENTIFIER);
+						advance = false;
+					}
+				}
+				break;
+			case SCE_FSHARP_STRING:
+			case SCE_FSHARP_VERBATIM:
+			case SCE_FSHARP_QUOT_IDENTIFIER:
+				if (MatchStringEnd(sc, fsStr)) {
+					const Sci_Position strLen = static_cast<Sci_Position>(sc.currentPos - cursor);
+					// backtrack to start of string
+					for (Sci_Position i = -strLen; i < 0; i++) {
+						const int startQuote = sc.GetRelative(i);
+						if (startQuote == '\"' || (startQuote == '`' && sc.GetRelative(i - 1) == '`')) {
+							// byte array?
+							if (sc.Match('\"', 'B')) {
+								sc.Forward();
+								colorSpan++;
+							}
+							if (!sc.atLineEnd) {
+								colorSpan++;
+							} else {
+								sc.ChangeState(SCE_FSHARP_IDENTIFIER);
+							}
+							state = SCE_FSHARP_DEFAULT;
+							break;
+						}
+					}
+				} else if (sc.ch == '%' && !(fsStr.startChar == '`' || fsStr.startChar == '$') &&
+					   (setFormatSpecs.Contains(sc.chNext) || setFormatFlags.Contains(sc.chNext))) {
+					state = SCE_FSHARP_FORMAT_SPEC;
+				}
+				break;
+			case SCE_FSHARP_IDENTIFIER:
+				if (!(iswordstart(sc.ch) || sc.ch == '\'')) {
+					const Sci_Position wordLen = static_cast<Sci_Position>(sc.currentPos - cursor);
+					if (wordLen < MAX_WORD_LEN) {
+						// wordLength is believable as keyword, [re-]construct token - RR
+						char token[MAX_WORD_LEN] = { 0 };
+						for (Sci_Position i = -wordLen; i < 0; i++) {
+							token[wordLen + i] = static_cast<char>(sc.GetRelative(i));
+						}
+						token[wordLen] = '\0';
+						// a snake_case_identifier can never be a keyword
+						if (!(sc.ch == '_' || sc.GetRelative(-wordLen - 1) == '_')) {
+							for (int i = 0; i < WORDLIST_SIZE; i++) {
+								if (keywords[i].InList(token)) {
+									sc.ChangeState(keywordClasses[i]);
+									break;
+								}
+							}
+						}
+					}
+					state = SCE_FSHARP_DEFAULT;
+					advance = false;
+				}
+				break;
+			case SCE_FSHARP_OPERATOR:
+				// special-case "()" and "[]" tokens as KEYWORDS - RR
+				if (setClosingTokens.Contains(sc.ch) &&
+					((sc.ch == ')' && sc.chPrev == '(') || (sc.ch == ']' && sc.chPrev == '['))) {
+					sc.ChangeState(SCE_FSHARP_KEYWORD);
+					colorSpan++;
+				} else {
+					advance = false;
+				}
+				state = SCE_FSHARP_DEFAULT;
+				break;
+			case SCE_FSHARP_NUMBER:
+				state = (IsNumber(sc, currentBase) || IsFloat(sc))
+					? SCE_FSHARP_NUMBER
+					// change style even when operators aren't spaced
+					: setOperators.Contains(sc.ch) ? SCE_FSHARP_OPERATOR : SCE_FSHARP_DEFAULT;
+				currentBase = (state == SCE_FSHARP_NUMBER) ? currentBase : 10;
+				break;
+			case SCE_FSHARP_FORMAT_SPEC:
+				if (!setFormatSpecs.Contains(sc.chNext) ||
+				    !(setFormatFlags.Contains(sc.ch) || IsADigit(sc.ch)) ||
+				    (setFormatFlags.Contains(sc.ch) && sc.ch == sc.chNext)) {
+					colorSpan++;
+					state = (fsStr.startChar == '@') ? SCE_FSHARP_VERBATIM : SCE_FSHARP_STRING;
+				}
+				break;
+		}
+
+		if (state >= SCE_FSHARP_DEFAULT) {
+			styler.ColourTo(colorSpan, sc.state);
+			sc.ChangeState(state);
+		}
+
+		if (advance) {
+			sc.Forward();
+		}
+	}
+
+	sc.Complete();
+}
+
+bool LineContains(LexAccessor &styler, const char *word, const Sci_Position start, const Sci_Position end = 1,
+		  const int chAttr = SCE_FSHARP_DEFAULT);
+
+void FoldLexicalGroup(LexAccessor &styler, int &levelNext, const Sci_Position lineCurrent, const char *word,
+		      const int chAttr);
+
+void SCI_METHOD LexerFSharp::Fold(Sci_PositionU start, Sci_Position length, int initStyle, IDocument *pAccess) {
+	if (!options.fold) {
+		return;
+	}
+
+	LexAccessor styler(pAccess);
+	const Sci_Position startPos = static_cast<Sci_Position>(start);
+	const Sci_PositionU endPos = start + length;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	Sci_Position lineNext = lineCurrent + 1;
+	Sci_Position lineStartNext = styler.LineStart(lineNext);
+	int style = initStyle;
+	int styleNext = styler.StyleAt(startPos);
+	char chNext = styler[startPos];
+	int levelNext;
+	int levelCurrent = SC_FOLDLEVELBASE;
+	int visibleChars = 0;
+
+	if (lineCurrent > 0) {
+		levelCurrent = styler.LevelAt(lineCurrent - 1) >> 0x10;
+	}
+
+	levelNext = levelCurrent;
+
+	for (Sci_PositionU i = start; i < endPos; i++) {
+		const Sci_Position currentPos = static_cast<Sci_Position>(i);
+		const bool atEOL = currentPos == (lineStartNext - 1);
+		const bool atLineOrDocEnd = (atEOL || (i == (endPos - 1)));
+		const bool atDosOrMacEOL = (atEOL || styler.SafeGetCharAt(currentPos) == '\r');
+		const int stylePrev = style;
+		const char ch = chNext;
+		const bool inLineComment = (stylePrev == SCE_FSHARP_COMMENTLINE);
+		style = styleNext;
+		styleNext = styler.StyleAt(currentPos + 1);
+		chNext = styler.SafeGetCharAt(currentPos + 1);
+
+		if (options.foldComment) {
+			if (options.foldCommentMultiLine && inLineComment && atDosOrMacEOL &&
+			    (lineCurrent > 0 || styler.StyleAt(lineStartNext) == SCE_FSHARP_COMMENTLINE)) {
+				FoldLexicalGroup(styler, levelNext, lineCurrent, "//", SCE_FSHARP_COMMENTLINE);
+			}
+
+			if (options.foldCommentStream && style == SCE_FSHARP_COMMENT && !inLineComment) {
+				if (stylePrev != SCE_FSHARP_COMMENT) {
+					levelNext++;
+				} else if (styleNext != SCE_FSHARP_COMMENT && !atEOL) {
+					levelNext--;
+				}
+			}
+		}
+
+		if (options.foldPreprocessor && style == SCE_FSHARP_PREPROCESSOR) {
+			if (styler.Match(currentPos, "#if")) {
+				levelNext++;
+			} else if (styler.Match(currentPos, "#endif")) {
+				levelNext--;
+			}
+		}
+
+		if (options.foldImports && atLineOrDocEnd &&
+		    LineContains(styler, "open ", lineCurrent, 1, SCE_FSHARP_KEYWORD)) {
+			FoldLexicalGroup(styler, levelNext, lineCurrent, "open ", SCE_FSHARP_KEYWORD);
+		}
+
+		if (!IsASpace(ch)) {
+			visibleChars++;
+		}
+
+		if (atLineOrDocEnd) {
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+
+			if (visibleChars == 0 && options.foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if (levelUse < levelNext) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+
+			visibleChars = 0;
+			lineCurrent++;
+			lineNext = lineCurrent + 1;
+			lineStartNext = styler.LineStart(lineNext);
+			levelCurrent = levelNext;
+
+			if (atEOL && (currentPos == (styler.Length() - 1))) {
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+		}
+	}
+}
+
+bool LineContains(LexAccessor &styler, const char *word, const Sci_Position start, const Sci_Position end,
+		  const int chAttr) {
+	bool found = false;
+	bool requireStyle = (chAttr > SCE_FSHARP_DEFAULT);
+	const Sci_Position limit = (end > 1) ? end : start;
+	for (Sci_Position i = start; i < styler.LineEnd(limit); i++) {
+		if (styler.Match(i, word)) {
+			found = requireStyle ? styler.StyleAt(i) == chAttr : true;
+			break;
+		}
+	}
+	return found;
+}
+
+void FoldLexicalGroup(LexAccessor &styler, int &levelNext, const Sci_Position lineCurrent, const char *word,
+		      const int chAttr) {
+	const Sci_Position linePrev = lineCurrent - 1;
+	const Sci_Position lineNext = lineCurrent + 1;
+	const Sci_Position lineStartPrev = styler.LineStart(linePrev);
+	const Sci_Position lineStartNext = styler.LineStart(lineNext);
+	const bool atFoldGroupStart =
+	    (lineCurrent == 0 || !LineContains(styler, word, lineStartPrev, linePrev, chAttr)) &&
+	    LineContains(styler, word, lineStartNext, lineNext, chAttr);
+	const bool atFoldGroupEnd =
+		LineContains(styler, word, lineStartPrev, linePrev, chAttr) &&
+		!LineContains(styler, word, lineStartNext, lineNext, chAttr);
+
+	if (atFoldGroupStart) {
+		levelNext++;
+	} else if (atFoldGroupEnd && levelNext > SC_FOLDLEVELBASE) {
+		levelNext--;
+	}
+}
+} // namespace
+
+LexerModule lmFSharp(SCLEX_FSHARP, LexerFSharp::LexerFactoryFSharp, "fsharp", fsharpWordLists);
diff --git a/scite-app/lexilla/lexers/LexFlagship.cxx b/scite-app/lexilla/lexers/LexFlagship.cxx
new file mode 100644
index 0000000..10d3ff5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexFlagship.cxx
@@ -0,0 +1,355 @@
+// Scintilla source code edit control
+/** @file LexFlagship.cxx
+ ** Lexer for Harbour and FlagShip.
+ ** (Syntactically compatible to other xBase dialects, like Clipper, dBase, Clip, FoxPro etc.)
+ **/
+// Copyright 2005 by Randy Butler
+// Copyright 2010 by Xavi <jarabal/at/gmail.com> (Harbour)
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch)
+{
+	return ch >= 0x80 ||
+				(isalnum(ch) || ch == '_');
+}
+
+static void ColouriseFlagShipDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                                 WordList *keywordlists[], Accessor &styler)
+{
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+
+	// property lexer.flagship.styling.within.preprocessor
+	//	For Harbour code, determines whether all preprocessor code is styled in the preprocessor style (0) or only from the
+	//	initial # to the end of the command word(1, the default). It also determines how to present text, dump, and disabled code.
+	bool stylingWithinPreprocessor = styler.GetPropertyInt("lexer.flagship.styling.within.preprocessor", 1) != 0;
+
+	CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]");
+
+	int visibleChars = 0;
+	int closeStringChar = 0;
+	int styleBeforeDCKeyword = SCE_FS_DEFAULT;
+	bool bEnableCode = initStyle < SCE_FS_DISABLEDCODE;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_FS_OPERATOR:
+			case SCE_FS_OPERATOR_C:
+			case SCE_FS_WORDOPERATOR:
+				sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				break;
+			case SCE_FS_IDENTIFIER:
+			case SCE_FS_IDENTIFIER_C:
+				if (!IsAWordChar(sc.ch)) {
+					char s[64];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (keywords.InList(s)) {
+						sc.ChangeState(bEnableCode ? SCE_FS_KEYWORD : SCE_FS_KEYWORD_C);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(bEnableCode ? SCE_FS_KEYWORD2 : SCE_FS_KEYWORD2_C);
+					} else if (bEnableCode && keywords3.InList(s)) {
+						sc.ChangeState(SCE_FS_KEYWORD3);
+					} else if (bEnableCode && keywords4.InList(s)) {
+						sc.ChangeState(SCE_FS_KEYWORD4);
+					}// Else, it is really an identifier...
+					sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				}
+				break;
+			case SCE_FS_NUMBER:
+				if (!IsAWordChar(sc.ch) && !(sc.ch == '.' && IsADigit(sc.chNext))) {
+					sc.SetState(SCE_FS_DEFAULT);
+				}
+				break;
+			case SCE_FS_NUMBER_C:
+				if (!IsAWordChar(sc.ch) && sc.ch != '.') {
+					sc.SetState(SCE_FS_DEFAULT_C);
+				}
+				break;
+			case SCE_FS_CONSTANT:
+				if (!IsAWordChar(sc.ch)) {
+					sc.SetState(SCE_FS_DEFAULT);
+				}
+				break;
+			case SCE_FS_STRING:
+			case SCE_FS_STRING_C:
+				if (sc.ch == closeStringChar) {
+					sc.ForwardSetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				} else if (sc.atLineEnd) {
+					sc.ChangeState(bEnableCode ? SCE_FS_STRINGEOL : SCE_FS_STRINGEOL_C);
+				}
+				break;
+			case SCE_FS_STRINGEOL:
+			case SCE_FS_STRINGEOL_C:
+				if (sc.atLineStart) {
+					sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				}
+				break;
+			case SCE_FS_COMMENTDOC:
+			case SCE_FS_COMMENTDOC_C:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = bEnableCode ? SCE_FS_COMMENTDOC : SCE_FS_COMMENTDOC_C;
+						sc.SetState(SCE_FS_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_FS_COMMENT:
+			case SCE_FS_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_FS_DEFAULT);
+				}
+				break;
+			case SCE_FS_COMMENTLINEDOC:
+			case SCE_FS_COMMENTLINEDOC_C:
+				if (sc.atLineStart) {
+					sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+					// Verify that we have the conditions to mark a comment-doc-keyword
+					if ((IsASpace(sc.chPrev) || sc.chPrev == '/' || sc.chPrev == '!') && (!IsASpace(sc.chNext))) {
+						styleBeforeDCKeyword = bEnableCode ? SCE_FS_COMMENTLINEDOC : SCE_FS_COMMENTLINEDOC_C;
+						sc.SetState(SCE_FS_COMMENTDOCKEYWORD);
+					}
+				}
+				break;
+			case SCE_FS_COMMENTDOCKEYWORD:
+				if ((styleBeforeDCKeyword == SCE_FS_COMMENTDOC || styleBeforeDCKeyword == SCE_FS_COMMENTDOC_C) &&
+						sc.Match('*', '/')) {
+					sc.ChangeState(SCE_FS_COMMENTDOCKEYWORDERROR);
+					sc.Forward();
+					sc.ForwardSetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				} else if (!setDoxygen.Contains(sc.ch)) {
+					char s[64];
+					sc.GetCurrentLowered(s, sizeof(s));
+					if (!IsASpace(sc.ch) || !keywords5.InList(s + 1)) {
+						sc.ChangeState(SCE_FS_COMMENTDOCKEYWORDERROR);
+					}
+					sc.SetState(styleBeforeDCKeyword);
+				}
+				break;
+			case SCE_FS_PREPROCESSOR:
+			case SCE_FS_PREPROCESSOR_C:
+				if (sc.atLineEnd) {
+					if (!(sc.chPrev == ';' || sc.GetRelative(-2) == ';')) {
+						sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+					}
+				} else if (stylingWithinPreprocessor) {
+					if (IsASpaceOrTab(sc.ch)) {
+						sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+					}
+				} else if (sc.Match('/', '*') || sc.Match('/', '/') || sc.Match('&', '&')) {
+					sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				}
+				break;
+			case SCE_FS_DISABLEDCODE:
+				if (sc.ch == '#' && visibleChars == 0) {
+					sc.SetState(bEnableCode ? SCE_FS_PREPROCESSOR : SCE_FS_PREPROCESSOR_C);
+					do {	// Skip whitespace between # and preprocessor word
+						sc.Forward();
+					} while (IsASpaceOrTab(sc.ch) && sc.More());
+					if (sc.MatchIgnoreCase("pragma")) {
+						sc.Forward(6);
+						do {	// Skip more whitespace until keyword
+							sc.Forward();
+						} while (IsASpaceOrTab(sc.ch) && sc.More());
+						if (sc.MatchIgnoreCase("enddump") || sc.MatchIgnoreCase("__endtext")) {
+							bEnableCode = true;
+							sc.SetState(SCE_FS_DISABLEDCODE);
+							sc.Forward(sc.ch == '_' ? 8 : 6);
+							sc.ForwardSetState(SCE_FS_DEFAULT);
+						} else {
+							sc.ChangeState(SCE_FS_DISABLEDCODE);
+						}
+					} else {
+						sc.ChangeState(SCE_FS_DISABLEDCODE);
+					}
+				}
+				break;
+			case SCE_FS_DATE:
+				if (sc.ch == '}') {
+					sc.ForwardSetState(SCE_FS_DEFAULT);
+				} else if (sc.atLineEnd) {
+					sc.ChangeState(SCE_FS_STRINGEOL);
+				}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_FS_DEFAULT || sc.state == SCE_FS_DEFAULT_C) {
+			if (bEnableCode &&
+					(sc.MatchIgnoreCase(".and.") || sc.MatchIgnoreCase(".not."))) {
+				sc.SetState(SCE_FS_WORDOPERATOR);
+				sc.Forward(4);
+			} else if (bEnableCode && sc.MatchIgnoreCase(".or.")) {
+				sc.SetState(SCE_FS_WORDOPERATOR);
+				sc.Forward(3);
+			} else if (bEnableCode &&
+					(sc.MatchIgnoreCase(".t.") || sc.MatchIgnoreCase(".f.") ||
+					(!IsAWordChar(sc.GetRelative(3)) && sc.MatchIgnoreCase("nil")))) {
+				sc.SetState(SCE_FS_CONSTANT);
+				sc.Forward(2);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(bEnableCode ? SCE_FS_COMMENTDOC : SCE_FS_COMMENTDOC_C);
+				sc.Forward();
+			} else if (bEnableCode && sc.Match('&', '&')) {
+				sc.SetState(SCE_FS_COMMENTLINE);
+				sc.Forward();
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(bEnableCode ? SCE_FS_COMMENTLINEDOC : SCE_FS_COMMENTLINEDOC_C);
+				sc.Forward();
+			} else if (bEnableCode && sc.ch == '*' && visibleChars == 0) {
+				sc.SetState(SCE_FS_COMMENT);
+			} else if (sc.ch == '\"' || sc.ch == '\'') {
+				sc.SetState(bEnableCode ? SCE_FS_STRING : SCE_FS_STRING_C);
+				closeStringChar = sc.ch;
+			} else if (closeStringChar == '>' && sc.ch == '<') {
+				sc.SetState(bEnableCode ? SCE_FS_STRING : SCE_FS_STRING_C);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				sc.SetState(bEnableCode ? SCE_FS_PREPROCESSOR : SCE_FS_PREPROCESSOR_C);
+				do {	// Skip whitespace between # and preprocessor word
+					sc.Forward();
+				} while (IsASpaceOrTab(sc.ch) && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(bEnableCode ? SCE_FS_DEFAULT : SCE_FS_DEFAULT_C);
+				} else if (sc.MatchIgnoreCase("include")) {
+					if (stylingWithinPreprocessor) {
+						closeStringChar = '>';
+					}
+				} else if (sc.MatchIgnoreCase("pragma")) {
+					sc.Forward(6);
+					do {	// Skip more whitespace until keyword
+						sc.Forward();
+					} while (IsASpaceOrTab(sc.ch) && sc.More());
+					if (sc.MatchIgnoreCase("begindump") || sc.MatchIgnoreCase("__cstream")) {
+						bEnableCode = false;
+						if (stylingWithinPreprocessor) {
+							sc.SetState(SCE_FS_DISABLEDCODE);
+							sc.Forward(8);
+							sc.ForwardSetState(SCE_FS_DEFAULT_C);
+						} else {
+							sc.SetState(SCE_FS_DISABLEDCODE);
+						}
+					} else if (sc.MatchIgnoreCase("enddump") || sc.MatchIgnoreCase("__endtext")) {
+						bEnableCode = true;
+						sc.SetState(SCE_FS_DISABLEDCODE);
+						sc.Forward(sc.ch == '_' ? 8 : 6);
+						sc.ForwardSetState(SCE_FS_DEFAULT);
+					}
+				}
+			} else if (bEnableCode && sc.ch == '{') {
+				Sci_Position p = 0;
+				int chSeek;
+				Sci_PositionU endPos(startPos + length);
+				do {	// Skip whitespace
+					chSeek = sc.GetRelative(++p);
+				} while (IsASpaceOrTab(chSeek) && (sc.currentPos + p < endPos));
+				if (chSeek == '^') {
+					sc.SetState(SCE_FS_DATE);
+				} else {
+					sc.SetState(SCE_FS_OPERATOR);
+				}
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(bEnableCode ? SCE_FS_NUMBER : SCE_FS_NUMBER_C);
+			} else if (IsAWordChar(sc.ch)) {
+				sc.SetState(bEnableCode ? SCE_FS_IDENTIFIER : SCE_FS_IDENTIFIER_C);
+			} else if (isoperator(static_cast<char>(sc.ch)) || (bEnableCode && sc.ch == '@')) {
+				sc.SetState(bEnableCode ? SCE_FS_OPERATOR : SCE_FS_OPERATOR_C);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			visibleChars = 0;
+			closeStringChar = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldFlagShipDoc(Sci_PositionU startPos, Sci_Position length, int,
+									WordList *[], Accessor &styler)
+{
+
+	Sci_Position endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0 && lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
+	char chNext = styler[startPos];
+	for (Sci_Position i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos-1)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static const char * const FSWordListDesc[] = {
+	"Keywords Commands",
+	"Std Library Functions",
+	"Procedure, return, exit",
+	"Class (oop)",
+	"Doxygen keywords",
+	0
+};
+
+LexerModule lmFlagShip(SCLEX_FLAGSHIP, ColouriseFlagShipDoc, "flagship", FoldFlagShipDoc, FSWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexForth.cxx b/scite-app/lexilla/lexers/LexForth.cxx
new file mode 100644
index 0000000..bea5256
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexForth.cxx
@@ -0,0 +1,171 @@
+// Scintilla source code edit control
+/** @file LexForth.cxx
+ ** Lexer for FORTH
+ **/
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
+}
+
+static inline bool IsANumChar(int ch) {
+	return (ch < 0x80) && (isxdigit(ch) || ch == '.' || ch == 'e' || ch == 'E' );
+}
+
+static inline bool IsASpaceChar(int ch) {
+	return (ch < 0x80) && isspace(ch);
+}
+
+static void ColouriseForthDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordLists[],
+                            Accessor &styler) {
+
+    WordList &control = *keywordLists[0];
+    WordList &keyword = *keywordLists[1];
+    WordList &defword = *keywordLists[2];
+    WordList &preword1 = *keywordLists[3];
+    WordList &preword2 = *keywordLists[4];
+    WordList &strings = *keywordLists[5];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_FORTH_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_FORTH_DEFAULT);
+			}
+		}else if (sc.state == SCE_FORTH_COMMENT_ML) {
+			if (sc.ch == ')') {
+				sc.ForwardSetState(SCE_FORTH_DEFAULT);
+			}
+		}else if (sc.state == SCE_FORTH_IDENTIFIER || sc.state == SCE_FORTH_NUMBER) {
+			// handle numbers here too, because what we thought was a number might
+			// turn out to be a keyword e.g. 2DUP
+			if (IsASpaceChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				int newState = sc.state == SCE_FORTH_NUMBER ? SCE_FORTH_NUMBER : SCE_FORTH_DEFAULT;
+				if (control.InList(s)) {
+					sc.ChangeState(SCE_FORTH_CONTROL);
+				} else if (keyword.InList(s)) {
+					sc.ChangeState(SCE_FORTH_KEYWORD);
+				} else if (defword.InList(s)) {
+					sc.ChangeState(SCE_FORTH_DEFWORD);
+				}  else if (preword1.InList(s)) {
+					sc.ChangeState(SCE_FORTH_PREWORD1);
+				} else if (preword2.InList(s)) {
+					sc.ChangeState(SCE_FORTH_PREWORD2);
+				} else if (strings.InList(s)) {
+					sc.ChangeState(SCE_FORTH_STRING);
+					newState = SCE_FORTH_STRING;
+				}
+				sc.SetState(newState);
+			}
+			if (sc.state == SCE_FORTH_NUMBER) {
+				if (IsASpaceChar(sc.ch)) {
+					sc.SetState(SCE_FORTH_DEFAULT);
+				} else if (!IsANumChar(sc.ch)) {
+					sc.ChangeState(SCE_FORTH_IDENTIFIER);
+				}
+			}
+		}else if (sc.state == SCE_FORTH_STRING) {
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_FORTH_DEFAULT);
+			}
+		}else if (sc.state == SCE_FORTH_LOCALE) {
+			if (sc.ch == '}') {
+				sc.ForwardSetState(SCE_FORTH_DEFAULT);
+			}
+		}else if (sc.state == SCE_FORTH_DEFWORD) {
+			if (IsASpaceChar(sc.ch)) {
+				sc.SetState(SCE_FORTH_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_FORTH_DEFAULT) {
+			if (sc.ch == '\\'){
+				sc.SetState(SCE_FORTH_COMMENT);
+			} else if (sc.ch == '(' &&
+					(sc.atLineStart || IsASpaceChar(sc.chPrev)) &&
+					(sc.atLineEnd   || IsASpaceChar(sc.chNext))) {
+				sc.SetState(SCE_FORTH_COMMENT_ML);
+			} else if (	(sc.ch == '$' && (IsASCII(sc.chNext) && isxdigit(sc.chNext))) ) {
+				// number starting with $ is a hex number
+				sc.SetState(SCE_FORTH_NUMBER);
+				while(sc.More() && IsASCII(sc.chNext) && isxdigit(sc.chNext))
+					sc.Forward();
+			} else if ( (sc.ch == '%' && (IsASCII(sc.chNext) && (sc.chNext == '0' || sc.chNext == '1'))) ) {
+				// number starting with % is binary
+				sc.SetState(SCE_FORTH_NUMBER);
+				while(sc.More() && IsASCII(sc.chNext) && (sc.chNext == '0' || sc.chNext == '1'))
+					sc.Forward();
+			} else if (	IsASCII(sc.ch) &&
+						(isxdigit(sc.ch) || ((sc.ch == '.' || sc.ch == '-') && IsASCII(sc.chNext) && isxdigit(sc.chNext)) )
+					){
+				sc.SetState(SCE_FORTH_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_FORTH_IDENTIFIER);
+			} else if (sc.ch == '{') {
+				sc.SetState(SCE_FORTH_LOCALE);
+			} else if (sc.ch == ':' && IsASCII(sc.chNext) && isspace(sc.chNext)) {
+				// highlight word definitions e.g.  : GCD ( n n -- n ) ..... ;
+				//                                  ^ ^^^
+				sc.SetState(SCE_FORTH_DEFWORD);
+				while(sc.More() && IsASCII(sc.chNext) && isspace(sc.chNext))
+					sc.Forward();
+			} else if (sc.ch == ';' &&
+					(sc.atLineStart || IsASpaceChar(sc.chPrev)) &&
+					(sc.atLineEnd   || IsASpaceChar(sc.chNext))	) {
+				// mark the ';' that ends a word
+				sc.SetState(SCE_FORTH_DEFWORD);
+				sc.ForwardSetState(SCE_FORTH_DEFAULT);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static void FoldForthDoc(Sci_PositionU, Sci_Position, int, WordList *[],
+						Accessor &) {
+}
+
+static const char * const forthWordLists[] = {
+			"control keywords",
+			"keywords",
+			"definition words",
+			"prewords with one argument",
+			"prewords with two arguments",
+			"string definition keywords",
+			0,
+		};
+
+LexerModule lmForth(SCLEX_FORTH, ColouriseForthDoc, "forth", FoldForthDoc, forthWordLists);
+
+
diff --git a/scite-app/lexilla/lexers/LexFortran.cxx b/scite-app/lexilla/lexers/LexFortran.cxx
new file mode 100644
index 0000000..a7d79cb
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexFortran.cxx
@@ -0,0 +1,724 @@
+// Scintilla source code edit control
+/** @file LexFortran.cxx
+ ** Lexer for Fortran.
+ ** Written by Chuan-jian Shen, Last changed Sep. 2003
+ **/
+// 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 <string>
+#include <string_view>
+/***************************************/
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+/***************************************/
+
+using namespace Lexilla;
+
+/***********************************************/
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '%');
+}
+/**********************************************/
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch));
+}
+/***************************************/
+static inline bool IsABlank(unsigned int ch) {
+	return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
+}
+/***************************************/
+static inline bool IsALineEnd(char ch) {
+	return ((ch == '\n') || (ch == '\r')) ;
+}
+/***************************************/
+static Sci_PositionU GetContinuedPos(Sci_PositionU pos, Accessor &styler) {
+	while (!IsALineEnd(styler.SafeGetCharAt(pos++))) continue;
+	if (styler.SafeGetCharAt(pos) == '\n') pos++;
+	while (IsABlank(styler.SafeGetCharAt(pos++))) continue;
+	char chCur = styler.SafeGetCharAt(pos);
+	if (chCur == '&') {
+		while (IsABlank(styler.SafeGetCharAt(++pos))) continue;
+		return pos;
+	} else {
+		return pos;
+	}
+}
+/***************************************/
+static void ColouriseFortranDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+        WordList *keywordlists[], Accessor &styler, bool isFixFormat) {
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	/***************************************/
+	Sci_Position posLineStart = 0;
+	int numNonBlank = 0, prevState = 0;
+	Sci_Position endPos = startPos + length;
+	/***************************************/
+	// backtrack to the nearest keyword
+	while ((startPos > 1) && (styler.StyleAt(startPos) != SCE_F_WORD)) {
+		startPos--;
+	}
+	startPos = styler.LineStart(styler.GetLine(startPos));
+	initStyle = styler.StyleAt(startPos - 1);
+	StyleContext sc(startPos, endPos-startPos, initStyle, styler);
+	/***************************************/
+	for (; sc.More(); sc.Forward()) {
+		// remember the start position of the line
+		if (sc.atLineStart) {
+			posLineStart = sc.currentPos;
+			numNonBlank = 0;
+			sc.SetState(SCE_F_DEFAULT);
+		}
+		if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
+		/***********************************************/
+		// Handle the fix format generically
+		Sci_Position toLineStart = sc.currentPos - posLineStart;
+		if (isFixFormat && (toLineStart < 6 || toLineStart >= 72)) {
+			if ((toLineStart == 0 && (tolower(sc.ch) == 'c' || sc.ch == '*')) || sc.ch == '!') {
+				if (sc.MatchIgnoreCase("cdec$") || sc.MatchIgnoreCase("*dec$") || sc.MatchIgnoreCase("!dec$") ||
+				        sc.MatchIgnoreCase("cdir$") || sc.MatchIgnoreCase("*dir$") || sc.MatchIgnoreCase("!dir$") ||
+				        sc.MatchIgnoreCase("cms$")  || sc.MatchIgnoreCase("*ms$")  || sc.MatchIgnoreCase("!ms$")  ||
+				        sc.chNext == '$') {
+					sc.SetState(SCE_F_PREPROCESSOR);
+				} else {
+					sc.SetState(SCE_F_COMMENT);
+				}
+
+				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
+			} else if (toLineStart >= 72) {
+				sc.SetState(SCE_F_COMMENT);
+				while (!sc.atLineEnd && sc.More()) sc.Forward(); // Until line end
+			} else if (toLineStart < 5) {
+				if (IsADigit(sc.ch))
+					sc.SetState(SCE_F_LABEL);
+				else
+					sc.SetState(SCE_F_DEFAULT);
+			} else if (toLineStart == 5) {
+				//if (!IsASpace(sc.ch) && sc.ch != '0') {
+				if (sc.ch != '\r' && sc.ch != '\n') {
+					sc.SetState(SCE_F_CONTINUATION);
+					if (!IsASpace(sc.ch) && sc.ch != '0')
+						sc.ForwardSetState(prevState);
+				} else
+					sc.SetState(SCE_F_DEFAULT);
+			}
+			continue;
+		}
+		/***************************************/
+		// Handle line continuation generically.
+		if (!isFixFormat && sc.ch == '&' && sc.state != SCE_F_COMMENT) {
+			char chTemp = ' ';
+			Sci_Position j = 1;
+			while (IsABlank(chTemp) && j<132) {
+				chTemp = static_cast<char>(sc.GetRelative(j));
+				j++;
+			}
+			if (chTemp == '!') {
+				sc.SetState(SCE_F_CONTINUATION);
+				if (sc.chNext == '!') sc.ForwardSetState(SCE_F_COMMENT);
+			} else if (chTemp == '\r' || chTemp == '\n') {
+				int currentState = sc.state;
+				sc.SetState(SCE_F_CONTINUATION);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+				while (IsASpace(sc.ch) && sc.More()) {
+					sc.Forward();
+					if (sc.atLineStart) numNonBlank = 0;
+					if (!IsASpaceOrTab(sc.ch)) numNonBlank ++;
+				}
+				if (sc.ch == '&') {
+					sc.SetState(SCE_F_CONTINUATION);
+					sc.Forward();
+				}
+				sc.SetState(currentState);
+			}
+		}
+		/***************************************/
+		// Hanndle preprocessor directives
+		if (sc.ch == '#' && numNonBlank == 1)
+		{
+			sc.SetState(SCE_F_PREPROCESSOR);
+			while (!sc.atLineEnd && sc.More())
+				sc.Forward(); // Until line end
+		}
+		/***************************************/
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_F_OPERATOR) {
+			sc.SetState(SCE_F_DEFAULT);
+		} else if (sc.state == SCE_F_NUMBER) {
+			if (!(IsAWordChar(sc.ch) || sc.ch=='\'' || sc.ch=='\"' || sc.ch=='.')) {
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '%')) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_F_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_F_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_F_WORD3);
+				}
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_COMMENT || sc.state == SCE_F_PREPROCESSOR) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_STRING1) {
+			prevState = sc.state;
+			if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_F_DEFAULT);
+					prevState = SCE_F_DEFAULT;
+				}
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_F_STRINGEOL);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_STRING2) {
+			prevState = sc.state;
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_F_STRINGEOL);
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			} else if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_F_DEFAULT);
+					prevState = SCE_F_DEFAULT;
+				}
+			}
+		} else if (sc.state == SCE_F_OPERATOR2) {
+			if (sc.ch == '.') {
+				sc.ForwardSetState(SCE_F_DEFAULT);
+			}
+		} else if (sc.state == SCE_F_CONTINUATION) {
+			sc.SetState(SCE_F_DEFAULT);
+		} else if (sc.state == SCE_F_LABEL) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_F_DEFAULT);
+			} else {
+				if (isFixFormat && sc.currentPos-posLineStart > 4)
+					sc.SetState(SCE_F_DEFAULT);
+				else if (numNonBlank > 5)
+					sc.SetState(SCE_F_DEFAULT);
+			}
+		}
+		/***************************************/
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_F_DEFAULT) {
+			if (sc.ch == '!') {
+				if (sc.MatchIgnoreCase("!dec$") || sc.MatchIgnoreCase("!dir$") ||
+					sc.MatchIgnoreCase("!ms$") || sc.chNext == '$') {
+					sc.SetState(SCE_F_PREPROCESSOR);
+				} else {
+					sc.SetState(SCE_F_COMMENT);
+				}
+			} else if ((!isFixFormat) && IsADigit(sc.ch) && numNonBlank == 1) {
+				sc.SetState(SCE_F_LABEL);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_F_NUMBER);
+			} else if ((tolower(sc.ch) == 'b' || tolower(sc.ch) == 'o' ||
+				tolower(sc.ch) == 'z') && (sc.chNext == '\"' || sc.chNext == '\'')) {
+				sc.SetState(SCE_F_NUMBER);
+				sc.Forward();
+			} else if (sc.ch == '.' && isalpha(sc.chNext)) {
+				sc.SetState(SCE_F_OPERATOR2);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_F_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_F_STRING2);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_F_STRING1);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_F_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+/***************************************/
+static void CheckLevelCommentLine(const unsigned int nComL,
+				  Sci_Position nComColB[], Sci_Position nComColF[], Sci_Position &nComCur,
+				  bool comLineB[], bool comLineF[], bool &comLineCur,
+				  int &levelDeltaNext) {
+	levelDeltaNext = 0;
+	if (!comLineCur) {
+		return;
+	}
+
+	if (!comLineF[0] || nComColF[0] != nComCur) {
+		unsigned int i=0;
+		for (; i<nComL; i++) {
+			if (!comLineB[i] || nComColB[i] != nComCur) {
+				break;
+			}
+		}
+		if (i == nComL) {
+			levelDeltaNext = -1;
+		}
+	}
+	else if (!comLineB[0] || nComColB[0] != nComCur) {
+		unsigned int i=0;
+		for (; i<nComL; i++) {
+			if (!comLineF[i] || nComColF[i] != nComCur) {
+				break;
+			}
+		}
+		if (i == nComL) {
+			levelDeltaNext = 1;
+		}
+	}
+}
+/***************************************/
+static void GetIfLineComment(Accessor &styler, bool isFixFormat, const Sci_Position line, bool &isComLine, Sci_Position &comCol) {
+	Sci_Position col = 0;
+	isComLine = false;
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position len = styler.Length();
+	while(pos<len) {
+		char ch = styler.SafeGetCharAt(pos);
+		if (ch == '!' || (isFixFormat && col == 0 && (tolower(ch) == 'c' || ch == '*'))) {
+			isComLine = true;
+			comCol = col;
+			break;
+		}
+		else if (!IsABlank(ch) || IsALineEnd(ch)) {
+			break;
+		}
+		pos++;
+		col++;
+	}
+}
+/***************************************/
+static void StepCommentLine(Accessor &styler, bool isFixFormat, Sci_Position lineCurrent, const unsigned int nComL,
+				  Sci_Position nComColB[], Sci_Position nComColF[], Sci_Position &nComCur,
+				  bool comLineB[], bool comLineF[], bool &comLineCur) {
+	Sci_Position nLineTotal = styler.GetLine(styler.Length()-1) + 1;
+	if (lineCurrent >= nLineTotal) {
+		return;
+	}
+
+	for (int i=nComL-2; i>=0; i--) {
+		nComColB[i+1] = nComColB[i];
+		comLineB[i+1] = comLineB[i];
+	}
+	nComColB[0] = nComCur;
+	comLineB[0] = comLineCur;
+	nComCur = nComColF[0];
+	comLineCur = comLineF[0];
+	for (unsigned int i=0; i+1<nComL; i++) {
+		nComColF[i] = nComColF[i+1];
+		comLineF[i] = comLineF[i+1];
+	}
+	Sci_Position chL = lineCurrent + nComL;
+	if (chL < nLineTotal) {
+		GetIfLineComment(styler, isFixFormat, chL, comLineF[nComL-1], nComColF[nComL-1]);
+	}
+	else {
+		comLineF[nComL-1] = false;
+	}
+}
+/***************************************/
+static void CheckBackComLines(Accessor &styler, bool isFixFormat, Sci_Position lineCurrent, const unsigned int nComL,
+				  Sci_Position nComColB[], Sci_Position nComColF[], Sci_Position nComCur,
+				  bool comLineB[], bool comLineF[], bool &comLineCur) {
+	unsigned int nLines = nComL + nComL + 1;
+	bool* comL = new bool[nLines];
+	Sci_Position* nComCol = new Sci_Position[nLines];
+	bool comL0;
+	Sci_Position nComCol0;
+	GetIfLineComment(styler, isFixFormat, lineCurrent-nComL-1, comL0, nComCol0);
+	for (unsigned int i=0; i<nComL; i++) {
+		unsigned copyTo = nComL - i - 1;
+		comL[copyTo]    = comLineB[i];
+		nComCol[copyTo] = nComColB[i];
+	}
+	assert(nComL < nLines);
+	comL[nComL] = comLineCur;
+	nComCol[nComL] = nComCur;
+	for (unsigned int i=0; i<nComL; i++) {
+		unsigned copyTo = i + nComL + 1;
+		comL[copyTo]    = comLineF[i];
+		nComCol[copyTo] = nComColF[i];
+	}
+	
+	Sci_Position lineC = lineCurrent - nComL + 1;
+	Sci_PositionU iStart;
+	if (lineC <= 0) {
+		lineC = 0;
+		iStart = nComL - lineCurrent;
+	}
+	else {
+		iStart = 1;
+	}
+	bool levChanged = false;
+	int lev = styler.LevelAt(lineC) & SC_FOLDLEVELNUMBERMASK;
+	
+	for (Sci_PositionU i=iStart; i<=nComL; i++) {
+		if (comL[i] && (!comL[i-1] || nComCol[i] != nComCol[i-1])) {
+			bool increase = true;
+			Sci_PositionU until = i + nComL;
+			for (Sci_PositionU j=i+1; j<=until; j++) {
+				if (!comL[j] || nComCol[j] != nComCol[i]) {
+					increase = false;
+					break;
+				}
+			}
+			lev = styler.LevelAt(lineC) & SC_FOLDLEVELNUMBERMASK;
+			if (increase) {
+				int levH = lev | SC_FOLDLEVELHEADERFLAG;
+				lev += 1;
+				if (levH != styler.LevelAt(lineC)) {
+					styler.SetLevel(lineC, levH);
+				}
+				for (Sci_Position j=lineC+1; j<=lineCurrent; j++) {
+					if (lev != styler.LevelAt(j)) {
+						styler.SetLevel(j, lev);
+					}
+				}
+				break;
+			}
+			else {
+				if (lev != styler.LevelAt(lineC)) {
+					styler.SetLevel(lineC, lev);
+				}
+			}
+			levChanged = true;
+		}
+		else if (levChanged && comL[i]) {
+			if (lev != styler.LevelAt(lineC)) {
+				styler.SetLevel(lineC, lev);
+			}
+		}
+		lineC++;
+	}
+	delete[] comL;
+	delete[] nComCol;
+}
+/***************************************/
+// To determine the folding level depending on keywords
+static int classifyFoldPointFortran(const char* s, const char* prevWord, const char chNextNonBlank) {
+	int lev = 0;
+
+	if ((strcmp(prevWord, "module") == 0 && strcmp(s, "subroutine") == 0)
+		|| (strcmp(prevWord, "module") == 0 && strcmp(s, "function") == 0)) {
+		lev = 0;
+	} else if (strcmp(s, "associate") == 0 || strcmp(s, "block") == 0
+	        || strcmp(s, "blockdata") == 0 || strcmp(s, "select") == 0
+	        || strcmp(s, "selecttype") == 0 || strcmp(s, "selectcase") == 0
+	        || strcmp(s, "do") == 0 || strcmp(s, "enum") ==0
+	        || strcmp(s, "function") == 0 || strcmp(s, "interface") == 0
+	        || strcmp(s, "module") == 0 || strcmp(s, "program") == 0
+	        || strcmp(s, "subroutine") == 0 || strcmp(s, "then") == 0
+	        || (strcmp(s, "type") == 0 && chNextNonBlank != '(')
+		|| strcmp(s, "critical") == 0 || strcmp(s, "submodule") == 0){
+		if (strcmp(prevWord, "end") == 0)
+			lev = 0;
+		else
+			lev = 1;
+	} else if ((strcmp(s, "end") == 0 && chNextNonBlank != '=')
+	        || strcmp(s, "endassociate") == 0 || strcmp(s, "endblock") == 0
+	        || strcmp(s, "endblockdata") == 0 || strcmp(s, "endselect") == 0
+	        || strcmp(s, "enddo") == 0 || strcmp(s, "endenum") ==0
+	        || strcmp(s, "endif") == 0 || strcmp(s, "endforall") == 0
+	        || strcmp(s, "endfunction") == 0 || strcmp(s, "endinterface") == 0
+	        || strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0
+	        || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0
+	        || strcmp(s, "endwhere") == 0 || strcmp(s, "endcritical") == 0
+		|| (strcmp(prevWord, "module") == 0 && strcmp(s, "procedure") == 0)  // Take care of the "module procedure" statement
+		|| strcmp(s, "endsubmodule") == 0 || strcmp(s, "endteam") == 0) {
+		lev = -1;
+	} else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if
+		lev = 0;
+	} else if (strcmp(prevWord, "type") == 0 && strcmp(s, "is") == 0){ // type is
+		lev = -1;
+	} else if ((strcmp(prevWord, "end") == 0 && strcmp(s, "procedure") == 0)
+			   || strcmp(s, "endprocedure") == 0) {
+			lev = 1; // level back to 0, because no folding support for "module procedure" in submodule
+	} else if (strcmp(prevWord, "change") == 0 && strcmp(s, "team") == 0){ // change team
+		lev = 1;
+	}
+	return lev;
+}
+/***************************************/
+// Folding the code
+static void FoldFortranDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+        Accessor &styler, bool isFixFormat) {
+
+	bool foldComment = styler.GetPropertyInt("fold.comment", 1) != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	bool isPrevLine;
+	if (lineCurrent > 0) {
+		lineCurrent--;
+		startPos = styler.LineStart(lineCurrent);
+		isPrevLine = true;
+	} else {
+		isPrevLine = false;
+	}
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	int levelDeltaNext = 0;
+
+	const unsigned int nComL = 3; // defines how many comment lines should be before they are folded
+	Sci_Position nComColB[nComL] = {};
+	Sci_Position nComColF[nComL] = {};
+	Sci_Position nComCur = 0;
+	bool comLineB[nComL] = {};
+	bool comLineF[nComL] = {};
+	bool comLineCur;
+	Sci_Position nLineTotal = styler.GetLine(styler.Length()-1) + 1;
+	if (foldComment) {
+		for (unsigned int i=0; i<nComL; i++) {
+			Sci_Position chL = lineCurrent-(i+1);
+			if (chL < 0) {
+				comLineB[i] = false;
+				break;
+			}
+			GetIfLineComment(styler, isFixFormat, chL, comLineB[i], nComColB[i]);
+			if (!comLineB[i]) {
+				for (unsigned int j=i+1; j<nComL; j++) {
+					comLineB[j] = false;
+				}
+				break;
+			}
+		}
+		for (unsigned int i=0; i<nComL; i++) {
+			Sci_Position chL = lineCurrent+i+1;
+			if (chL >= nLineTotal) {
+				comLineF[i] = false;
+				break;
+			}
+			GetIfLineComment(styler, isFixFormat, chL, comLineF[i], nComColF[i]);
+		}
+		GetIfLineComment(styler, isFixFormat, lineCurrent, comLineCur, nComCur);
+		CheckBackComLines(styler, isFixFormat, lineCurrent, nComL, nComColB, nComColF, nComCur, 
+				comLineB, comLineF, comLineCur);
+	}
+	int levelCurrent = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+
+	/***************************************/
+	Sci_Position lastStart = 0;
+	char prevWord[32] = "";
+	/***************************************/
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		char chNextNonBlank = chNext;
+		bool nextEOL = false;
+		if (IsALineEnd(chNextNonBlank)) {
+			nextEOL = true;
+		}
+		Sci_PositionU j=i+1;
+		while(IsABlank(chNextNonBlank) && j<endPos) {
+			j ++ ;
+			chNextNonBlank = styler.SafeGetCharAt(j);
+			if (IsALineEnd(chNextNonBlank)) {
+				nextEOL = true;
+			}
+		}
+		if (!nextEOL && j == endPos) {
+			nextEOL = true;
+		}
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		//
+		if (((isFixFormat && stylePrev == SCE_F_CONTINUATION) || stylePrev == SCE_F_DEFAULT
+			|| stylePrev == SCE_F_OPERATOR) && (style == SCE_F_WORD || style == SCE_F_LABEL)) {
+			// Store last word and label start point.
+			lastStart = i;
+		}
+		/***************************************/
+		if (style == SCE_F_WORD) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[32];
+				Sci_PositionU k;
+				for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
+					s[k] = static_cast<char>(tolower(styler[lastStart+k]));
+				}
+				s[k] = '\0';
+				// Handle the forall and where statement and structure.
+				if (strcmp(s, "forall") == 0 || (strcmp(s, "where") == 0 && strcmp(prevWord, "else") != 0)) {
+					if (strcmp(prevWord, "end") != 0) {
+						j = i + 1;
+						char chBrace = '(', chSeek = ')', ch1 = styler.SafeGetCharAt(j);
+						// Find the position of the first (
+						while (ch1 != chBrace && j<endPos) {
+							j++;
+							ch1 = styler.SafeGetCharAt(j);
+						}
+						char styBrace = styler.StyleAt(j);
+						int depth = 1;
+						char chAtPos;
+						char styAtPos;
+						while (j<endPos) {
+							j++;
+							chAtPos = styler.SafeGetCharAt(j);
+							styAtPos = styler.StyleAt(j);
+							if (styAtPos == styBrace) {
+								if (chAtPos == chBrace) depth++;
+								if (chAtPos == chSeek) depth--;
+								if (depth == 0) break;
+							}
+						}
+						Sci_Position tmpLineCurrent = lineCurrent;
+						while (j<endPos) {
+							j++;
+							chAtPos = styler.SafeGetCharAt(j);
+							styAtPos = styler.StyleAt(j);
+							if (!IsALineEnd(chAtPos) && (styAtPos == SCE_F_COMMENT || IsABlank(chAtPos))) continue;
+							if (isFixFormat) {
+								if (!IsALineEnd(chAtPos)) {
+									break;
+								} else {
+									if (tmpLineCurrent < styler.GetLine(styler.Length()-1)) {
+										tmpLineCurrent++;
+										j = styler.LineStart(tmpLineCurrent);
+										if (styler.StyleAt(j+5) == SCE_F_CONTINUATION
+											&& !IsABlank(styler.SafeGetCharAt(j+5)) && styler.SafeGetCharAt(j+5) != '0') {
+											j += 5;
+											continue;
+										} else {
+											levelDeltaNext++;
+											break;
+										}
+									}
+								}
+							} else {
+								if (chAtPos == '&' && styler.StyleAt(j) == SCE_F_CONTINUATION) {
+									j = GetContinuedPos(j+1, styler);
+									continue;
+								} else if (IsALineEnd(chAtPos)) {
+									levelDeltaNext++;
+									break;
+								} else {
+									break;
+								}
+							}
+						}
+					}
+				} else {
+					int wordLevelDelta = classifyFoldPointFortran(s, prevWord, chNextNonBlank);
+					levelDeltaNext += wordLevelDelta;
+					if (((strcmp(s, "else") == 0) && (nextEOL || chNextNonBlank == '!')) ||
+						(strcmp(prevWord, "else") == 0 && strcmp(s, "where") == 0) || strcmp(s, "elsewhere") == 0) {
+						if (!isPrevLine) {
+							levelCurrent--;
+						}
+						levelDeltaNext++;
+					} else if ((strcmp(prevWord, "else") == 0 && strcmp(s, "if") == 0) || strcmp(s, "elseif") == 0) {
+						if (!isPrevLine) {
+							levelCurrent--;
+						}
+					} else if ((strcmp(prevWord, "select") == 0 && strcmp(s, "case") == 0) || strcmp(s, "selectcase") == 0 ||
+							   (strcmp(prevWord, "select") == 0 && strcmp(s, "type") == 0) || strcmp(s, "selecttype") == 0) {
+						levelDeltaNext += 2;
+					} else if ((strcmp(s, "case") == 0 && chNextNonBlank == '(') || (strcmp(prevWord, "case") == 0 && strcmp(s, "default") == 0) ||
+							   (strcmp(prevWord, "type") == 0 && strcmp(s, "is") == 0) ||
+							   (strcmp(prevWord, "class") == 0 && strcmp(s, "is") == 0) ||
+							   (strcmp(prevWord, "class") == 0 && strcmp(s, "default") == 0) ) {
+						if (!isPrevLine) {
+							levelCurrent--;
+						}
+						levelDeltaNext++;
+					} else if ((strcmp(prevWord, "end") == 0 && strcmp(s, "select") == 0) || strcmp(s, "endselect") == 0) {
+						levelDeltaNext -= 2;
+					}
+
+					// There are multiple forms of "do" loop. The older form with a label "do 100 i=1,10" would require matching
+					// labels to ensure the folding level does not decrease too far when labels are used for other purposes.
+					// Since this is difficult, do-label constructs are not folded.
+					if (strcmp(s, "do") == 0 && IsADigit(chNextNonBlank)) {
+						// Remove delta for do-label
+						levelDeltaNext -= wordLevelDelta;
+					}
+				}
+				strcpy(prevWord, s);
+			}
+		}
+		if (atEOL) {
+			if (foldComment) {
+				int ldNext;
+				CheckLevelCommentLine(nComL, nComColB, nComColF, nComCur, comLineB, comLineF, comLineCur, ldNext);
+				levelDeltaNext += ldNext;
+			}
+			int lev = levelCurrent;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelDeltaNext > 0) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			levelCurrent += levelDeltaNext;
+			levelDeltaNext = 0;
+			visibleChars = 0;
+			strcpy(prevWord, "");
+			isPrevLine = false;
+
+			if (foldComment) {
+				StepCommentLine(styler, isFixFormat, lineCurrent, nComL, nComColB, nComColF, nComCur,
+						comLineB, comLineF, comLineCur);
+			}
+		}
+		/***************************************/
+		if (!isspacechar(ch)) visibleChars++;
+	}
+	/***************************************/
+}
+/***************************************/
+static const char * const FortranWordLists[] = {
+	"Primary keywords and identifiers",
+	"Intrinsic functions",
+	"Extended and user defined functions",
+	0,
+};
+/***************************************/
+static void ColouriseFortranDocFreeFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+        Accessor &styler) {
+	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+/***************************************/
+static void ColouriseFortranDocFixFormat(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+        Accessor &styler) {
+	ColouriseFortranDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+/***************************************/
+static void FoldFortranDocFreeFormat(Sci_PositionU startPos, Sci_Position length, int initStyle,
+        WordList *[], Accessor &styler) {
+	FoldFortranDoc(startPos, length, initStyle,styler, false);
+}
+/***************************************/
+static void FoldFortranDocFixFormat(Sci_PositionU startPos, Sci_Position length, int initStyle,
+        WordList *[], Accessor &styler) {
+	FoldFortranDoc(startPos, length, initStyle,styler, true);
+}
+/***************************************/
+LexerModule lmFortran(SCLEX_FORTRAN, ColouriseFortranDocFreeFormat, "fortran", FoldFortranDocFreeFormat, FortranWordLists);
+LexerModule lmF77(SCLEX_F77, ColouriseFortranDocFixFormat, "f77", FoldFortranDocFixFormat, FortranWordLists);
diff --git a/scite-app/lexilla/lexers/LexGAP.cxx b/scite-app/lexilla/lexers/LexGAP.cxx
new file mode 100644
index 0000000..3947072
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexGAP.cxx
@@ -0,0 +1,267 @@
+// Scintilla source code edit control
+/** @file LexGAP.cxx
+ ** Lexer for the GAP language. (The GAP System for Computational Discrete Algebra)
+ ** http://www.gap-system.org
+ **/
+// Copyright 2007 by Istvan Szollosi ( szteven <at> gmail <dot> 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsGAPOperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch)) return false;
+	if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+		ch == '^' || ch == ',' || ch == '!' || ch == '.' ||
+		ch == '=' || ch == '<' || ch == '>' || ch == '(' ||
+		ch == ')' || ch == ';' || ch == '[' || ch == ']' ||
+		ch == '{' || ch == '}' || ch == ':' )
+		return true;
+	return false;
+}
+
+static void GetRange(Sci_PositionU start, Sci_PositionU end, Accessor &styler, char *s, Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(styler[start + i]);
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void ColouriseGAPDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords1 = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_GAP_STRINGEOL) initStyle = SCE_GAP_DEFAULT;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Prevent SCE_GAP_STRINGEOL from leaking back to previous line
+		if ( sc.atLineStart ) {
+			if (sc.state == SCE_GAP_STRING) sc.SetState(SCE_GAP_STRING);
+			if (sc.state == SCE_GAP_CHAR) sc.SetState(SCE_GAP_CHAR);
+		}
+
+		// Handle line continuation generically
+		if (sc.ch == '\\' ) {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate
+		switch (sc.state) {
+			case SCE_GAP_OPERATOR :
+				sc.SetState(SCE_GAP_DEFAULT);
+				break;
+
+			case SCE_GAP_NUMBER :
+				if (!IsADigit(sc.ch)) {
+					if (sc.ch == '\\') {
+						if (!sc.atLineEnd) {
+							if (!IsADigit(sc.chNext)) {
+								sc.Forward();
+								sc.ChangeState(SCE_GAP_IDENTIFIER);
+							}
+						}
+					} else if (isalpha(sc.ch) || sc.ch == '_') {
+						sc.ChangeState(SCE_GAP_IDENTIFIER);
+					}
+					else sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_IDENTIFIER :
+				if (!(iswordstart(static_cast<char>(sc.ch)) || sc.ch == '$')) {
+					if (sc.ch == '\\') sc.Forward();
+					else {
+						char s[1000];
+						sc.GetCurrent(s, sizeof(s));
+						if (keywords1.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD);
+						} else if (keywords2.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD2);
+						} else if (keywords3.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD3);
+						} else if (keywords4.InList(s)) {
+							sc.ChangeState(SCE_GAP_KEYWORD4);
+						}
+						sc.SetState(SCE_GAP_DEFAULT);
+					}
+				}
+				break;
+
+			case SCE_GAP_COMMENT :
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_GAP_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_CHAR:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_GAP_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_GAP_DEFAULT);
+				}
+				break;
+
+			case SCE_GAP_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_GAP_DEFAULT);
+				}
+				break;
+		}
+
+		// Determine if a new state should be entered
+		if (sc.state == SCE_GAP_DEFAULT) {
+			if (IsGAPOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_GAP_OPERATOR);
+			}
+			else if (IsADigit(sc.ch)) {
+				sc.SetState(SCE_GAP_NUMBER);
+			} else if (isalpha(sc.ch) || sc.ch == '_' || sc.ch == '\\' || sc.ch == '$' || sc.ch == '~') {
+				sc.SetState(SCE_GAP_IDENTIFIER);
+				if (sc.ch == '\\') sc.Forward();
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_GAP_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_GAP_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_GAP_CHAR);
+			}
+		}
+
+	}
+	sc.Complete();
+}
+
+static int ClassifyFoldPointGAP(const char* s) {
+	int level = 0;
+	if (strcmp(s, "function") == 0 ||
+		strcmp(s, "do") == 0 ||
+		strcmp(s, "if") == 0 ||
+		strcmp(s, "repeat") == 0 ) {
+		level = 1;
+	} else if (strcmp(s, "end") == 0 ||
+			strcmp(s, "od") == 0 ||
+			strcmp(s, "fi") == 0 ||
+			strcmp(s, "until") == 0 ) {
+		level = -1;
+	}
+	return level;
+}
+
+static void FoldGAPDoc( Sci_PositionU startPos, Sci_Position length, int initStyle,   WordList** , Accessor &styler) {
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	Sci_Position lastStart = 0;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev != SCE_GAP_KEYWORD && style == SCE_GAP_KEYWORD) {
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (stylePrev == SCE_GAP_KEYWORD) {
+			if(iswordchar(ch) && !iswordchar(chNext)) {
+				char s[100];
+				GetRange(lastStart, i, styler, s, sizeof(s));
+				levelCurrent += ClassifyFoldPointGAP(s);
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const GAPWordListDesc[] = {
+	"Keywords 1",
+	"Keywords 2",
+	"Keywords 3 (unused)",
+	"Keywords 4 (unused)",
+	0
+};
+
+LexerModule lmGAP(
+   SCLEX_GAP,
+   ColouriseGAPDoc,
+   "gap",
+   FoldGAPDoc,
+   GAPWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexGui4Cli.cxx b/scite-app/lexilla/lexers/LexGui4Cli.cxx
new file mode 100644
index 0000000..44c432b
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexGui4Cli.cxx
@@ -0,0 +1,315 @@
+// Scintilla source code edit control
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// @file LexGui4Cli.cxx
+/*
+This is the Lexer for Gui4Cli, included in SciLexer.dll
+- by d. Keletsekis, 2/10/2003
+
+To add to SciLexer.dll:
+1. Add the values below to INCLUDE\Scintilla.iface
+2. Run the scripts/HFacer.py script
+3. Run the scripts/LexGen.py script
+
+val SCE_GC_DEFAULT=0
+val SCE_GC_COMMENTLINE=1
+val SCE_GC_COMMENTBLOCK=2
+val SCE_GC_GLOBAL=3
+val SCE_GC_EVENT=4
+val SCE_GC_ATTRIBUTE=5
+val SCE_GC_CONTROL=6
+val SCE_GC_COMMAND=7
+val SCE_GC_STRING=8
+val SCE_GC_OPERATOR=9
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+#define debug Platform::DebugPrintf
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch =='\\');
+}
+
+inline bool isGCOperator(int ch)
+{	if (isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '*' || ch == '/' || ch == '-' || ch == '+' ||
+		 ch == '(' || ch == ')' || ch == '=' || ch == '%' ||
+		 ch == '[' || ch == ']' || ch == '<' || ch == '>' ||
+		 ch == ',' || ch == ';' || ch == ':')
+		return true;
+	return false;
+}
+
+#define isSpace(x)		((x)==' ' || (x)=='\t')
+#define isNL(x)			((x)=='\n' || (x)=='\r')
+#define isSpaceOrNL(x)  (isSpace(x) || isNL(x))
+#define BUFFSIZE 500
+#define isFoldPoint(x)  ((styler.LevelAt(x) & SC_FOLDLEVELNUMBERMASK) == 1024)
+
+static void colorFirstWord(WordList *keywordlists[], Accessor &styler,
+									StyleContext *sc, char *buff, Sci_Position length, Sci_Position)
+{
+	Sci_Position c = 0;
+	while (sc->More() && isSpaceOrNL(sc->ch))
+	{	sc->Forward();
+	}
+	styler.ColourTo(sc->currentPos - 1, sc->state);
+
+	if (!IsAWordChar(sc->ch)) // comment, marker, etc..
+		return;
+
+	while (sc->More() && !isSpaceOrNL(sc->ch) && (c < length-1) && !isGCOperator(sc->ch))
+	{	buff[c] = static_cast<char>(sc->ch);
+		++c; sc->Forward();
+	}
+	buff[c] = '\0';
+	char *p = buff;
+	while (*p)	// capitalize..
+	{	if (islower(*p)) *p = static_cast<char>(toupper(*p));
+		++p;
+	}
+
+	WordList &kGlobal		= *keywordlists[0];	// keyword lists set by the user
+	WordList &kEvent		= *keywordlists[1];
+	WordList &kAttribute	= *keywordlists[2];
+	WordList &kControl	= *keywordlists[3];
+	WordList &kCommand	= *keywordlists[4];
+
+	int state = 0;
+	// int level = styler.LevelAt(line) & SC_FOLDLEVELNUMBERMASK;
+	// debug ("line = %d, level = %d", line, level);
+
+	if	     (kGlobal.InList(buff))		state = SCE_GC_GLOBAL;
+	else if (kAttribute.InList(buff))	state = SCE_GC_ATTRIBUTE;
+	else if (kControl.InList(buff))		state = SCE_GC_CONTROL;
+	else if (kCommand.InList(buff))		state = SCE_GC_COMMAND;
+	else if (kEvent.InList(buff))			state = SCE_GC_EVENT;
+
+	if (state)
+	{	sc->ChangeState(state);
+		styler.ColourTo(sc->currentPos - 1, sc->state);
+		sc->ChangeState(SCE_GC_DEFAULT);
+	}
+	else
+	{	sc->ChangeState(SCE_GC_DEFAULT);
+		styler.ColourTo(sc->currentPos - 1, sc->state);
+	}
+}
+
+// Main colorizing function called by Scintilla
+static void
+ColouriseGui4CliDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                    WordList *keywordlists[], Accessor &styler)
+{
+	styler.StartAt(startPos);
+
+	Sci_Position currentline = styler.GetLine(startPos);
+	int quotestart = 0, oldstate;
+	styler.StartSegment(startPos);
+	bool noforward;
+	char buff[BUFFSIZE+1];	// buffer for command name
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	buff[0] = '\0'; // cbuff = 0;
+
+	if (sc.state != SCE_GC_COMMENTBLOCK) // colorize 1st word..
+		colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+
+	while (sc.More())
+	{	noforward = 0;
+
+		switch (sc.ch)
+		{
+			case '/':
+				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_STRING)
+					break;
+				if (sc.chNext == '/')	// line comment
+				{	sc.SetState (SCE_GC_COMMENTLINE);
+					sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+				}
+				else if (sc.chNext == '*')	// block comment
+				{	sc.SetState(SCE_GC_COMMENTBLOCK);
+					sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+				}
+				else
+					styler.ColourTo(sc.currentPos, sc.state);
+				break;
+
+			case '*':	// end of comment block, or operator..
+				if (sc.state == SCE_GC_STRING)
+					break;
+				if (sc.state == SCE_GC_COMMENTBLOCK && sc.chNext == '/')
+				{	sc.Forward();
+					styler.ColourTo(sc.currentPos, sc.state);
+					sc.ChangeState (SCE_GC_DEFAULT);
+				}
+				else
+					styler.ColourTo(sc.currentPos, sc.state);
+				break;
+
+			case '\'':	case '\"': // strings..
+				if (sc.state == SCE_GC_COMMENTBLOCK || sc.state == SCE_GC_COMMENTLINE)
+					break;
+				if (sc.state == SCE_GC_STRING)
+				{	if (sc.ch == quotestart)	// match same quote char..
+					{	styler.ColourTo(sc.currentPos, sc.state);
+						sc.ChangeState(SCE_GC_DEFAULT);
+						quotestart = 0;
+				}	}
+				else
+				{	styler.ColourTo(sc.currentPos - 1, sc.state);
+					sc.ChangeState(SCE_GC_STRING);
+					quotestart = sc.ch;
+				}
+				break;
+
+			case ';':	// end of commandline character
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
+					 sc.state != SCE_GC_STRING)
+				{
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(SCE_GC_DEFAULT);
+					sc.Forward();
+					colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+					noforward = 1; // don't move forward - already positioned at next char..
+				}
+				break;
+
+			case '+': case '-': case '=':	case '!':	// operators..
+			case '<': case '>': case '&': case '|': case '$':
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE &&
+					 sc.state != SCE_GC_STRING)
+				{
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(SCE_GC_DEFAULT);
+				}
+				break;
+
+			case '\\':	// escape - same as operator, but also mark in strings..
+				if (sc.state != SCE_GC_COMMENTBLOCK && sc.state != SCE_GC_COMMENTLINE)
+				{
+					oldstate = sc.state;
+					styler.ColourTo(sc.currentPos - 1, sc.state);
+					sc.Forward(); // mark also the next char..
+					styler.ColourTo(sc.currentPos, SCE_GC_OPERATOR);
+					sc.ChangeState(oldstate);
+				}
+				break;
+
+			case '\n': case '\r':
+				++currentline;
+				if (sc.state == SCE_GC_COMMENTLINE)
+				{	styler.ColourTo(sc.currentPos, sc.state);
+					sc.ChangeState (SCE_GC_DEFAULT);
+				}
+				else if (sc.state != SCE_GC_COMMENTBLOCK)
+				{	colorFirstWord(keywordlists, styler, &sc, buff, BUFFSIZE, currentline);
+					noforward = 1; // don't move forward - already positioned at next char..
+				}
+				break;
+
+//			case ' ': case '\t':
+//			default :
+		}
+
+		if (!noforward) sc.Forward();
+
+	}
+	sc.Complete();
+}
+
+// Main folding function called by Scintilla - (based on props (.ini) files function)
+static void FoldGui4Cli(Sci_PositionU startPos, Sci_Position length, int,
+								WordList *[], Accessor &styler)
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	bool headerPoint = false;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++)
+	{
+		char ch = chNext;
+		chNext = styler[i+1];
+
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_GC_EVENT || style == SCE_GC_GLOBAL)
+		{	headerPoint = true; // fold at events and globals
+		}
+
+		if (atEOL)
+		{	int lev = SC_FOLDLEVELBASE+1;
+
+			if (headerPoint)
+				lev = SC_FOLDLEVELBASE;
+
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+
+			if (headerPoint)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+
+			if (lev != styler.LevelAt(lineCurrent)) // set level, if not already correct
+			{	styler.SetLevel(lineCurrent, lev);
+			}
+
+			lineCurrent++;		// re-initialize our flags
+			visibleChars = 0;
+			headerPoint = false;
+		}
+
+		if (!(isspacechar(ch))) // || (style == SCE_GC_COMMENTLINE) || (style != SCE_GC_COMMENTBLOCK)))
+			visibleChars++;
+	}
+
+	int lev = headerPoint ? SC_FOLDLEVELBASE : SC_FOLDLEVELBASE+1;
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, lev | flagsNext);
+}
+
+// I have no idea what these are for.. probably accessible by some message.
+static const char * const gui4cliWordListDesc[] = {
+	"Globals", "Events", "Attributes", "Control", "Commands",
+	0
+};
+
+// Declare language & pass our function pointers to Scintilla
+LexerModule lmGui4Cli(SCLEX_GUI4CLI, ColouriseGui4CliDoc, "gui4cli", FoldGui4Cli, gui4cliWordListDesc);
+
+#undef debug
+
diff --git a/scite-app/lexilla/lexers/LexHTML.cxx b/scite-app/lexilla/lexers/LexHTML.cxx
new file mode 100644
index 0000000..ea66965
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexHTML.cxx
@@ -0,0 +1,2508 @@
+// Scintilla source code edit control
+/** @file LexHTML.cxx
+ ** Lexer for HTML.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <set>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+
+#define SCE_HA_JS (SCE_HJA_START - SCE_HJ_START)
+#define SCE_HA_VBS (SCE_HBA_START - SCE_HB_START)
+#define SCE_HA_PYTHON (SCE_HPA_START - SCE_HP_START)
+
+enum script_type { eScriptNone = 0, eScriptJS, eScriptVBS, eScriptPython, eScriptPHP, eScriptXML, eScriptSGML, eScriptSGMLblock, eScriptComment };
+enum script_mode { eHtml = 0, eNonHtmlScript, eNonHtmlPreProc, eNonHtmlScriptPreProc };
+
+inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+inline bool IsOperator(int ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
+	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
+	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
+	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
+		return true;
+	return false;
+}
+
+void GetTextSegment(Accessor &styler, Sci_PositionU start, Sci_PositionU end, char *s, size_t len) {
+	Sci_PositionU i = 0;
+	for (; (i < end - start + 1) && (i < len-1); i++) {
+		s[i] = MakeLowerCase(styler[start + i]);
+	}
+	s[i] = '\0';
+}
+
+std::string GetStringSegment(Accessor &styler, Sci_PositionU start, Sci_PositionU end) {
+	std::string s;
+	Sci_PositionU i = 0;
+	for (; (i < end - start + 1); i++) {
+		s.push_back(MakeLowerCase(styler[start + i]));
+	}
+	return s;
+}
+
+std::string GetNextWord(Accessor &styler, Sci_PositionU start) {
+	std::string ret;
+	Sci_PositionU i = 0;
+	for (; i < 200; i++) {	// Put an upper limit to bound time taken for unexpected text.
+		const char ch = styler.SafeGetCharAt(start + i);
+		if ((i == 0) && !IsAWordStart(ch))
+			break;
+		if ((i > 0) && !IsAWordChar(ch))
+			break;
+		ret.push_back(ch);
+	}
+	return ret;
+}
+
+script_type segIsScriptingIndicator(Accessor &styler, Sci_PositionU start, Sci_PositionU end, script_type prevValue) {
+	char s[100];
+	GetTextSegment(styler, start, end, s, sizeof(s));
+	//Platform::DebugPrintf("Scripting indicator [%s]\n", s);
+	if (strstr(s, "src"))	// External script
+		return eScriptNone;
+	if (strstr(s, "vbs"))
+		return eScriptVBS;
+	if (strstr(s, "pyth"))
+		return eScriptPython;
+	if (strstr(s, "javas"))
+		return eScriptJS;
+	if (strstr(s, "jscr"))
+		return eScriptJS;
+	if (strstr(s, "php"))
+		return eScriptPHP;
+	if (strstr(s, "xml")) {
+		const char *xml = strstr(s, "xml");
+		for (const char *t=s; t<xml; t++) {
+			if (!IsASpace(*t)) {
+				return prevValue;
+			}
+		}
+		return eScriptXML;
+	}
+
+	return prevValue;
+}
+
+int PrintScriptingIndicatorOffset(Accessor &styler, Sci_PositionU start, Sci_PositionU end) {
+	int iResult = 0;
+	std::string s = GetStringSegment(styler, start, end);
+	if (0 == strncmp(s.c_str(), "php", 3)) {
+		iResult = 3;
+	}
+	return iResult;
+}
+
+script_type ScriptOfState(int state) {
+	if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
+		return eScriptPython;
+	} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
+		return eScriptVBS;
+	} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
+		return eScriptJS;
+	} else if ((state >= SCE_HPHP_DEFAULT) && (state <= SCE_HPHP_COMMENTLINE)) {
+		return eScriptPHP;
+	} else if ((state >= SCE_H_SGML_DEFAULT) && (state < SCE_H_SGML_BLOCK_DEFAULT)) {
+		return eScriptSGML;
+	} else if (state == SCE_H_SGML_BLOCK_DEFAULT) {
+		return eScriptSGMLblock;
+	} else {
+		return eScriptNone;
+	}
+}
+
+int statePrintForState(int state, script_mode inScriptType) {
+	int StateToPrint = state;
+
+	if (state >= SCE_HJ_START) {
+		if ((state >= SCE_HP_START) && (state <= SCE_HP_IDENTIFIER)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_PYTHON);
+		} else if ((state >= SCE_HB_START) && (state <= SCE_HB_STRINGEOL)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_VBS);
+		} else if ((state >= SCE_HJ_START) && (state <= SCE_HJ_REGEX)) {
+			StateToPrint = state + ((inScriptType == eNonHtmlScript) ? 0 : SCE_HA_JS);
+		}
+	}
+
+	return StateToPrint;
+}
+
+int stateForPrintState(int StateToPrint) {
+	int state;
+
+	if ((StateToPrint >= SCE_HPA_START) && (StateToPrint <= SCE_HPA_IDENTIFIER)) {
+		state = StateToPrint - SCE_HA_PYTHON;
+	} else if ((StateToPrint >= SCE_HBA_START) && (StateToPrint <= SCE_HBA_STRINGEOL)) {
+		state = StateToPrint - SCE_HA_VBS;
+	} else if ((StateToPrint >= SCE_HJA_START) && (StateToPrint <= SCE_HJA_REGEX)) {
+		state = StateToPrint - SCE_HA_JS;
+	} else {
+		state = StateToPrint;
+	}
+
+	return state;
+}
+
+inline bool IsNumber(Sci_PositionU start, Accessor &styler) {
+	return IsADigit(styler[start]) || (styler[start] == '.') ||
+	       (styler[start] == '-') || (styler[start] == '#');
+}
+
+inline bool isStringState(int state) {
+	bool bResult;
+
+	switch (state) {
+	case SCE_HJ_DOUBLESTRING:
+	case SCE_HJ_SINGLESTRING:
+	case SCE_HJA_DOUBLESTRING:
+	case SCE_HJA_SINGLESTRING:
+	case SCE_HB_STRING:
+	case SCE_HBA_STRING:
+	case SCE_HP_STRING:
+	case SCE_HP_CHARACTER:
+	case SCE_HP_TRIPLE:
+	case SCE_HP_TRIPLEDOUBLE:
+	case SCE_HPA_STRING:
+	case SCE_HPA_CHARACTER:
+	case SCE_HPA_TRIPLE:
+	case SCE_HPA_TRIPLEDOUBLE:
+	case SCE_HPHP_HSTRING:
+	case SCE_HPHP_SIMPLESTRING:
+	case SCE_HPHP_HSTRING_VARIABLE:
+	case SCE_HPHP_COMPLEX_VARIABLE:
+		bResult = true;
+		break;
+	default :
+		bResult = false;
+		break;
+	}
+	return bResult;
+}
+
+inline bool stateAllowsTermination(int state) {
+	bool allowTermination = !isStringState(state);
+	if (allowTermination) {
+		switch (state) {
+		case SCE_HB_COMMENTLINE:
+		case SCE_HPHP_COMMENT:
+		case SCE_HP_COMMENTLINE:
+		case SCE_HPA_COMMENTLINE:
+			allowTermination = false;
+		}
+	}
+	return allowTermination;
+}
+
+// not really well done, since it's only comments that should lex the %> and <%
+inline bool isCommentASPState(int state) {
+	bool bResult;
+
+	switch (state) {
+	case SCE_HJ_COMMENT:
+	case SCE_HJ_COMMENTLINE:
+	case SCE_HJ_COMMENTDOC:
+	case SCE_HB_COMMENTLINE:
+	case SCE_HP_COMMENTLINE:
+	case SCE_HPHP_COMMENT:
+	case SCE_HPHP_COMMENTLINE:
+		bResult = true;
+		break;
+	default :
+		bResult = false;
+		break;
+	}
+	return bResult;
+}
+
+void classifyAttribHTML(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
+	const bool wordIsNumber = IsNumber(start, styler);
+	char chAttr = SCE_H_ATTRIBUTEUNKNOWN;
+	if (wordIsNumber) {
+		chAttr = SCE_H_NUMBER;
+	} else {
+		std::string s = GetStringSegment(styler, start, end);
+		if (keywords.InList(s.c_str()))
+			chAttr = SCE_H_ATTRIBUTE;
+	}
+	if ((chAttr == SCE_H_ATTRIBUTEUNKNOWN) && !keywords)
+		// No keywords -> all are known
+		chAttr = SCE_H_ATTRIBUTE;
+	styler.ColourTo(end, chAttr);
+}
+
+// https://html.spec.whatwg.org/multipage/custom-elements.html#custom-elements-core-concepts
+bool isHTMLCustomElement(const std::string &tag) {
+	// check valid HTML custom element name: starts with an ASCII lower alpha and contains hyphen.
+	// IsUpperOrLowerCase() is used for `html.tags.case.sensitive=1`.
+	if (tag.length() < 2 || !IsUpperOrLowerCase(tag[0])) {
+		return false;
+	}
+	if (tag.find('-') == std::string::npos) {
+		return false;
+	}
+	return true;
+}
+
+int classifyTagHTML(Sci_PositionU start, Sci_PositionU end,
+                           const WordList &keywords, Accessor &styler, bool &tagDontFold,
+                    bool caseSensitive, bool isXml, bool allowScripts,
+                    const std::set<std::string> &nonFoldingTags) {
+	std::string tag;
+	// Copy after the '<' and stop before ' '
+	for (Sci_PositionU cPos = start; cPos <= end; cPos++) {
+		const char ch = styler[cPos];
+		if (IsASpace(ch)) {
+			break;
+		}
+		if ((ch != '<') && (ch != '/')) {
+			tag.push_back(caseSensitive ? ch : MakeLowerCase(ch));
+		}
+	}
+	// if the current language is XML, I can fold any tag
+	// if the current language is HTML, I don't want to fold certain tags (input, meta, etc.)
+	//...to find it in the list of no-container-tags
+	tagDontFold = (!isXml) && (nonFoldingTags.count(tag) > 0);
+	// No keywords -> all are known
+	char chAttr = SCE_H_TAGUNKNOWN;
+	if (!tag.empty() && (tag[0] == '!')) {
+		chAttr = SCE_H_SGML_DEFAULT;
+	} else if (!keywords || keywords.InList(tag.c_str())) {
+		chAttr = SCE_H_TAG;
+	} else if (!isXml && isHTMLCustomElement(tag)) {
+		chAttr = SCE_H_TAG;
+	}
+	if (chAttr != SCE_H_TAGUNKNOWN) {
+		styler.ColourTo(end, chAttr);
+	}
+	if (chAttr == SCE_H_TAG) {
+		if (allowScripts && (tag == "script")) {
+			// check to see if this is a self-closing tag by sniffing ahead
+			bool isSelfClose = false;
+			for (Sci_PositionU cPos = end; cPos <= end + 200; cPos++) {
+				const char ch = styler.SafeGetCharAt(cPos, '\0');
+				if (ch == '\0' || ch == '>')
+					break;
+				else if (ch == '/' && styler.SafeGetCharAt(cPos + 1, '\0') == '>') {
+					isSelfClose = true;
+					break;
+				}
+			}
+
+			// do not enter a script state if the tag self-closed
+			if (!isSelfClose)
+				chAttr = SCE_H_SCRIPT;
+		} else if (!isXml && (tag == "comment")) {
+			chAttr = SCE_H_COMMENT;
+		}
+	}
+	return chAttr;
+}
+
+void classifyWordHTJS(Sci_PositionU start, Sci_PositionU end,
+                             const WordList &keywords, Accessor &styler, script_mode inScriptType) {
+	char s[30 + 1];
+	Sci_PositionU i = 0;
+	for (; i < end - start + 1 && i < 30; i++) {
+		s[i] = styler[start + i];
+	}
+	s[i] = '\0';
+
+	char chAttr = SCE_HJ_WORD;
+	const bool wordIsNumber = IsADigit(s[0]) || ((s[0] == '.') && IsADigit(s[1]));
+	if (wordIsNumber) {
+		chAttr = SCE_HJ_NUMBER;
+	} else if (keywords.InList(s)) {
+		chAttr = SCE_HJ_KEYWORD;
+	}
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+}
+
+int classifyWordHTVB(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler, script_mode inScriptType) {
+	char chAttr = SCE_HB_IDENTIFIER;
+	const bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
+	if (wordIsNumber) {
+		chAttr = SCE_HB_NUMBER;
+	} else {
+		std::string s = GetStringSegment(styler, start, end);
+		if (keywords.InList(s.c_str())) {
+			chAttr = SCE_HB_WORD;
+			if (s == "rem")
+				chAttr = SCE_HB_COMMENTLINE;
+		}
+	}
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+	if (chAttr == SCE_HB_COMMENTLINE)
+		return SCE_HB_COMMENTLINE;
+	else
+		return SCE_HB_DEFAULT;
+}
+
+void classifyWordHTPy(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler, std::string &prevWord, script_mode inScriptType, bool isMako) {
+	const bool wordIsNumber = IsADigit(styler[start]);
+	std::string s;
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
+		s.push_back(styler[start + i]);
+	}
+	char chAttr = SCE_HP_IDENTIFIER;
+	if (prevWord == "class")
+		chAttr = SCE_HP_CLASSNAME;
+	else if (prevWord == "def")
+		chAttr = SCE_HP_DEFNAME;
+	else if (wordIsNumber)
+		chAttr = SCE_HP_NUMBER;
+	else if (keywords.InList(s.c_str()))
+		chAttr = SCE_HP_WORD;
+	else if (isMako && (s == "block"))
+		chAttr = SCE_HP_WORD;
+	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
+	prevWord = s;
+}
+
+// Update the word colour to default or keyword
+// Called when in a PHP word
+void classifyWordHTPHP(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
+	char chAttr = SCE_HPHP_DEFAULT;
+	const bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.' && start+1 <= end && IsADigit(styler[start+1]));
+	if (wordIsNumber) {
+		chAttr = SCE_HPHP_NUMBER;
+	} else {
+		std::string s = GetStringSegment(styler, start, end);
+		if (keywords.InList(s.c_str()))
+			chAttr = SCE_HPHP_WORD;
+	}
+	styler.ColourTo(end, chAttr);
+}
+
+bool isWordHSGML(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
+	std::string s;
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
+		s.push_back(styler[start + i]);
+	}
+	return keywords.InList(s.c_str());
+}
+
+bool isWordCdata(Sci_PositionU start, Sci_PositionU end, Accessor &styler) {
+	std::string s;
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
+		s.push_back(styler[start + i]);
+	}
+	return s == "[CDATA[";
+}
+
+// Return the first state to reach when entering a scripting language
+int StateForScript(script_type scriptLanguage) {
+	int Result;
+	switch (scriptLanguage) {
+	case eScriptVBS:
+		Result = SCE_HB_START;
+		break;
+	case eScriptPython:
+		Result = SCE_HP_START;
+		break;
+	case eScriptPHP:
+		Result = SCE_HPHP_DEFAULT;
+		break;
+	case eScriptXML:
+		Result = SCE_H_TAGUNKNOWN;
+		break;
+	case eScriptSGML:
+		Result = SCE_H_SGML_DEFAULT;
+		break;
+	case eScriptComment:
+		Result = SCE_H_COMMENT;
+		break;
+	default :
+		Result = SCE_HJ_START;
+		break;
+	}
+	return Result;
+}
+
+inline bool issgmlwordchar(int ch) {
+	return !IsASCII(ch) ||
+		(isalnum(ch) || ch == '.' || ch == '_' || ch == ':' || ch == '!' || ch == '#' || ch == '[');
+}
+
+inline bool IsPhpWordStart(int ch) {
+	return (IsASCII(ch) && (isalpha(ch) || (ch == '_'))) || (ch >= 0x7f);
+}
+
+inline bool IsPhpWordChar(int ch) {
+	return IsADigit(ch) || IsPhpWordStart(ch);
+}
+
+bool InTagState(int state) {
+	return state == SCE_H_TAG || state == SCE_H_TAGUNKNOWN ||
+	       state == SCE_H_SCRIPT ||
+	       state == SCE_H_ATTRIBUTE || state == SCE_H_ATTRIBUTEUNKNOWN ||
+	       state == SCE_H_NUMBER || state == SCE_H_OTHER ||
+	       state == SCE_H_DOUBLESTRING || state == SCE_H_SINGLESTRING;
+}
+
+bool IsCommentState(const int state) {
+	return state == SCE_H_COMMENT || state == SCE_H_SGML_COMMENT;
+}
+
+bool IsScriptCommentState(const int state) {
+	return state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJA_COMMENT ||
+		   state == SCE_HJA_COMMENTLINE || state == SCE_HB_COMMENTLINE || state == SCE_HBA_COMMENTLINE;
+}
+
+bool isLineEnd(int ch) {
+	return ch == '\r' || ch == '\n';
+}
+
+bool isMakoBlockEnd(const int ch, const int chNext, const std::string &blockType) {
+	if (blockType.empty()) {
+		return ((ch == '%') && (chNext == '>'));
+	} else if ((blockType == "inherit") ||
+			   (blockType == "namespace") ||
+			   (blockType == "include") ||
+			   (blockType == "page")) {
+		return ((ch == '/') && (chNext == '>'));
+	} else if (blockType == "%") {
+		if (ch == '/' && isLineEnd(chNext))
+			return true;
+		else
+			return isLineEnd(ch);
+	} else if (blockType == "{") {
+		return ch == '}';
+	} else {
+		return (ch == '>');
+	}
+}
+
+bool isDjangoBlockEnd(const int ch, const int chNext, const std::string &blockType) {
+	if (blockType.empty()) {
+		return false;
+	} else if (blockType == "%") {
+		return ((ch == '%') && (chNext == '}'));
+	} else if (blockType == "{") {
+		return ((ch == '}') && (chNext == '}'));
+	} else {
+		return false;
+	}
+}
+
+bool isPHPStringState(int state) {
+	return
+	    (state == SCE_HPHP_HSTRING) ||
+	    (state == SCE_HPHP_SIMPLESTRING) ||
+	    (state == SCE_HPHP_HSTRING_VARIABLE) ||
+	    (state == SCE_HPHP_COMPLEX_VARIABLE);
+}
+
+Sci_Position FindPhpStringDelimiter(std::string &phpStringDelimiter, Sci_Position i, const Sci_Position lengthDoc, Accessor &styler, bool &isSimpleString) {
+	Sci_Position j;
+	const Sci_Position beginning = i - 1;
+	bool isQuoted = false;
+
+	while (i < lengthDoc && (styler[i] == ' ' || styler[i] == '\t'))
+		i++;
+	char ch = styler.SafeGetCharAt(i);
+	const char chNext = styler.SafeGetCharAt(i + 1);
+	phpStringDelimiter.clear();
+	if (!IsPhpWordStart(ch)) {
+		if ((ch == '\'' || ch == '\"') && IsPhpWordStart(chNext)) {
+			isSimpleString = ch == '\'';
+			isQuoted = true;
+			i++;
+			ch = chNext;
+		} else {
+			return beginning;
+		}
+	}
+	phpStringDelimiter.push_back(ch);
+	i++;
+	for (j = i; j < lengthDoc && !isLineEnd(styler[j]); j++) {
+		if (!IsPhpWordChar(styler[j]) && isQuoted) {
+			if (((isSimpleString && styler[j] == '\'') || (!isSimpleString && styler[j] == '\"')) && isLineEnd(styler.SafeGetCharAt(j + 1))) {
+				isQuoted = false;
+				j++;
+				break;
+			} else {
+				phpStringDelimiter.clear();
+				return beginning;
+			}
+		}
+		phpStringDelimiter.push_back(styler[j]);
+	}
+	if (isQuoted) {
+		phpStringDelimiter.clear();
+		return beginning;
+	}
+	return j - 1;
+}
+
+// Options used for LexerHTML
+struct OptionsHTML {
+	int aspDefaultLanguage = eScriptJS;
+	bool caseSensitive = false;
+	bool allowScripts = true;
+	bool isMako = false;
+	bool isDjango = false;
+	bool fold = false;
+	bool foldHTML = false;
+	bool foldHTMLPreprocessor = true;
+	bool foldCompact = true;
+	bool foldComment = false;
+	bool foldHeredoc = false;
+	bool foldXmlAtTagOpen = false;
+	OptionsHTML() noexcept {
+	}
+};
+
+const char * const htmlWordListDesc[] = {
+	"HTML elements and attributes",
+	"JavaScript keywords",
+	"VBScript keywords",
+	"Python keywords",
+	"PHP keywords",
+	"SGML and DTD keywords",
+	0,
+};
+
+const char * const phpscriptWordListDesc[] = {
+	"", //Unused
+	"", //Unused
+	"", //Unused
+	"", //Unused
+	"PHP keywords",
+	"", //Unused
+	0,
+};
+
+struct OptionSetHTML : public OptionSet<OptionsHTML> {
+	OptionSetHTML(bool isPHPScript_) {
+
+		DefineProperty("asp.default.language", &OptionsHTML::aspDefaultLanguage,
+			"Script in ASP code is initially assumed to be in JavaScript. "
+			"To change this to VBScript set asp.default.language to 2. Python is 3.");
+
+		DefineProperty("html.tags.case.sensitive", &OptionsHTML::caseSensitive,
+			"For XML and HTML, setting this property to 1 will make tags match in a case "
+			"sensitive way which is the expected behaviour for XML and XHTML.");
+
+		DefineProperty("lexer.xml.allow.scripts", &OptionsHTML::allowScripts,
+			"Set to 0 to disable scripts in XML.");
+
+		DefineProperty("lexer.html.mako", &OptionsHTML::isMako,
+			"Set to 1 to enable the mako template language.");
+
+		DefineProperty("lexer.html.django", &OptionsHTML::isDjango,
+			"Set to 1 to enable the django template language.");
+
+		DefineProperty("fold", &OptionsHTML::fold);
+
+		DefineProperty("fold.html", &OptionsHTML::foldHTML,
+			"Folding is turned on or off for HTML and XML files with this option. "
+			"The fold option must also be on for folding to occur.");
+
+		DefineProperty("fold.html.preprocessor", &OptionsHTML::foldHTMLPreprocessor,
+			"Folding is turned on or off for scripts embedded in HTML files with this option. "
+			"The default is on.");
+
+		DefineProperty("fold.compact", &OptionsHTML::foldCompact);
+
+		DefineProperty("fold.hypertext.comment", &OptionsHTML::foldComment,
+			"Allow folding for comments in scripts embedded in HTML. "
+			"The default is off.");
+
+		DefineProperty("fold.hypertext.heredoc", &OptionsHTML::foldHeredoc,
+			"Allow folding for heredocs in scripts embedded in HTML. "
+			"The default is off.");
+
+		DefineProperty("fold.xml.at.tag.open", &OptionsHTML::foldXmlAtTagOpen,
+			"Enable folding for XML at the start of open tag. "
+			"The default is off.");
+
+		DefineWordListSets(isPHPScript_ ? phpscriptWordListDesc : htmlWordListDesc);
+	}
+};
+
+LexicalClass lexicalClassesHTML[] = {
+	// Lexer HTML SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_:
+	0, "SCE_H_DEFAULT", "default", "Text",
+	1, "SCE_H_TAG", "tag", "Tags",
+	2, "SCE_H_ERRORTAGUNKNOWN", "error tag", "Unknown Tags",
+	3, "SCE_H_ATTRIBUTE", "attribute", "Attributes",
+	4, "SCE_H_ATTRIBUTEUNKNOWN", "error attribute", "Unknown Attributes",
+	5, "SCE_H_NUMBER", "literal numeric", "Numbers",
+	6, "SCE_H_DOUBLESTRING", "literal string", "Double quoted strings",
+	7, "SCE_H_SINGLESTRING", "literal string", "Single quoted strings",
+	8, "SCE_H_OTHER", "tag operator", "Other inside tag, including space and '='",
+	9, "SCE_H_COMMENT", "comment", "Comment",
+	10, "SCE_H_ENTITY", "literal", "Entities",
+	11, "SCE_H_TAGEND", "tag", "XML style tag ends '/>'",
+	12, "SCE_H_XMLSTART", "identifier", "XML identifier start '<?'",
+	13, "SCE_H_XMLEND", "identifier", "XML identifier end '?>'",
+	14, "SCE_H_SCRIPT", "error", "Internal state which should never be visible",
+	15, "SCE_H_ASP", "preprocessor", "ASP <% ... %>",
+	16, "SCE_H_ASPAT", "preprocessor", "ASP <% ... %>",
+	17, "SCE_H_CDATA", "literal", "CDATA",
+	18, "SCE_H_QUESTION", "preprocessor", "PHP",
+	19, "SCE_H_VALUE", "literal string", "Unquoted values",
+	20, "SCE_H_XCCOMMENT", "comment", "JSP Comment <%-- ... --%>",
+	21, "SCE_H_SGML_DEFAULT", "default", "SGML tags <! ... >",
+	22, "SCE_H_SGML_COMMAND", "preprocessor", "SGML command",
+	23, "SCE_H_SGML_1ST_PARAM", "preprocessor", "SGML 1st param",
+	24, "SCE_H_SGML_DOUBLESTRING", "literal string", "SGML double string",
+	25, "SCE_H_SGML_SIMPLESTRING", "literal string", "SGML single string",
+	26, "SCE_H_SGML_ERROR", "error", "SGML error",
+	27, "SCE_H_SGML_SPECIAL", "literal", "SGML special (#XXXX type)",
+	28, "SCE_H_SGML_ENTITY", "literal", "SGML entity",
+	29, "SCE_H_SGML_COMMENT", "comment", "SGML comment",
+	30, "SCE_H_SGML_1ST_PARAM_COMMENT", "error comment", "SGML first parameter - lexer internal. It is an error if any text is in this style.",
+	31, "SCE_H_SGML_BLOCK_DEFAULT", "default", "SGML block",
+	32, "", "predefined", "",
+	33, "", "predefined", "",
+	34, "", "predefined", "",
+	35, "", "predefined", "",
+	36, "", "predefined", "",
+	37, "", "predefined", "",
+	38, "", "predefined", "",
+	39, "", "predefined", "",
+	40, "SCE_HJ_START", "client javascript default", "JS Start - allows eol filled background to not start on same line as SCRIPT tag",
+	41, "SCE_HJ_DEFAULT", "client javascript default", "JS Default",
+	42, "SCE_HJ_COMMENT", "client javascript comment", "JS Comment",
+	43, "SCE_HJ_COMMENTLINE", "client javascript comment line", "JS Line Comment",
+	44, "SCE_HJ_COMMENTDOC", "client javascript comment documentation", "JS Doc comment",
+	45, "SCE_HJ_NUMBER", "client javascript literal numeric", "JS Number",
+	46, "SCE_HJ_WORD", "client javascript identifier", "JS Word",
+	47, "SCE_HJ_KEYWORD", "client javascript keyword", "JS Keyword",
+	48, "SCE_HJ_DOUBLESTRING", "client javascript literal string", "JS Double quoted string",
+	49, "SCE_HJ_SINGLESTRING", "client javascript literal string", "JS Single quoted string",
+	50, "SCE_HJ_SYMBOLS", "client javascript operator", "JS Symbols",
+	51, "SCE_HJ_STRINGEOL", "client javascript error literal string", "JavaScript EOL",
+	52, "SCE_HJ_REGEX", "client javascript literal regex", "JavaScript RegEx",
+	53, "", "unused", "",
+	54, "", "unused", "",
+	55, "SCE_HJA_START", "server javascript default", "JS Start - allows eol filled background to not start on same line as SCRIPT tag",
+	56, "SCE_HJA_DEFAULT", "server javascript default", "JS Default",
+	57, "SCE_HJA_COMMENT", "server javascript comment", "JS Comment",
+	58, "SCE_HJA_COMMENTLINE", "server javascript comment line", "JS Line Comment",
+	59, "SCE_HJA_COMMENTDOC", "server javascript comment documentation", "JS Doc comment",
+	60, "SCE_HJA_NUMBER", "server javascript literal numeric", "JS Number",
+	61, "SCE_HJA_WORD", "server javascript identifier", "JS Word",
+	62, "SCE_HJA_KEYWORD", "server javascript keyword", "JS Keyword",
+	63, "SCE_HJA_DOUBLESTRING", "server javascript literal string", "JS Double quoted string",
+	64, "SCE_HJA_SINGLESTRING", "server javascript literal string", "JS Single quoted string",
+	65, "SCE_HJA_SYMBOLS", "server javascript operator", "JS Symbols",
+	66, "SCE_HJA_STRINGEOL", "server javascript error literal string", "JavaScript EOL",
+	67, "SCE_HJA_REGEX", "server javascript literal regex", "JavaScript RegEx",
+	68, "", "unused", "",
+	69, "", "unused", "",
+	70, "SCE_HB_START", "client basic default", "Start",
+	71, "SCE_HB_DEFAULT", "client basic default", "Default",
+	72, "SCE_HB_COMMENTLINE", "client basic comment line", "Comment",
+	73, "SCE_HB_NUMBER", "client basic literal numeric", "Number",
+	74, "SCE_HB_WORD", "client basic keyword", "KeyWord",
+	75, "SCE_HB_STRING", "client basic literal string", "String",
+	76, "SCE_HB_IDENTIFIER", "client basic identifier", "Identifier",
+	77, "SCE_HB_STRINGEOL", "client basic literal string", "Unterminated string",
+	78, "", "unused", "",
+	79, "", "unused", "",
+	80, "SCE_HBA_START", "server basic default", "Start",
+	81, "SCE_HBA_DEFAULT", "server basic default", "Default",
+	82, "SCE_HBA_COMMENTLINE", "server basic comment line", "Comment",
+	83, "SCE_HBA_NUMBER", "server basic literal numeric", "Number",
+	84, "SCE_HBA_WORD", "server basic keyword", "KeyWord",
+	85, "SCE_HBA_STRING", "server basic literal string", "String",
+	86, "SCE_HBA_IDENTIFIER", "server basic identifier", "Identifier",
+	87, "SCE_HBA_STRINGEOL", "server basic literal string", "Unterminated string",
+	88, "", "unused", "",
+	89, "", "unused", "",
+	90, "SCE_HP_START", "client python default", "Embedded Python",
+	91, "SCE_HP_DEFAULT", "client python default", "Embedded Python",
+	92, "SCE_HP_COMMENTLINE", "client python comment line", "Comment",
+	93, "SCE_HP_NUMBER", "client python literal numeric", "Number",
+	94, "SCE_HP_STRING", "client python literal string", "String",
+	95, "SCE_HP_CHARACTER", "client python literal string character", "Single quoted string",
+	96, "SCE_HP_WORD", "client python keyword", "Keyword",
+	97, "SCE_HP_TRIPLE", "client python literal string", "Triple quotes",
+	98, "SCE_HP_TRIPLEDOUBLE", "client python literal string", "Triple double quotes",
+	99, "SCE_HP_CLASSNAME", "client python identifier", "Class name definition",
+	100, "SCE_HP_DEFNAME", "client python identifier", "Function or method name definition",
+	101, "SCE_HP_OPERATOR", "client python operator", "Operators",
+	102, "SCE_HP_IDENTIFIER", "client python identifier", "Identifiers",
+	103, "", "unused", "",
+	104, "SCE_HPHP_COMPLEX_VARIABLE", "server php identifier", "PHP complex variable",
+	105, "SCE_HPA_START", "server python default", "ASP Python",
+	106, "SCE_HPA_DEFAULT", "server python default", "ASP Python",
+	107, "SCE_HPA_COMMENTLINE", "server python comment line", "Comment",
+	108, "SCE_HPA_NUMBER", "server python literal numeric", "Number",
+	109, "SCE_HPA_STRING", "server python literal string", "String",
+	110, "SCE_HPA_CHARACTER", "server python literal string character", "Single quoted string",
+	111, "SCE_HPA_WORD", "server python keyword", "Keyword",
+	112, "SCE_HPA_TRIPLE", "server python literal string", "Triple quotes",
+	113, "SCE_HPA_TRIPLEDOUBLE", "server python literal string", "Triple double quotes",
+	114, "SCE_HPA_CLASSNAME", "server python identifier", "Class name definition",
+	115, "SCE_HPA_DEFNAME", "server python identifier", "Function or method name definition",
+	116, "SCE_HPA_OPERATOR", "server python operator", "Operators",
+	117, "SCE_HPA_IDENTIFIER", "server python identifier", "Identifiers",
+	118, "SCE_HPHP_DEFAULT", "server php default", "Default",
+	119, "SCE_HPHP_HSTRING", "server php literal string", "Double quoted String",
+	120, "SCE_HPHP_SIMPLESTRING", "server php literal string", "Single quoted string",
+	121, "SCE_HPHP_WORD", "server php keyword", "Keyword",
+	122, "SCE_HPHP_NUMBER", "server php literal numeric", "Number",
+	123, "SCE_HPHP_VARIABLE", "server php identifier", "Variable",
+	124, "SCE_HPHP_COMMENT", "server php comment", "Comment",
+	125, "SCE_HPHP_COMMENTLINE", "server php comment line", "One line comment",
+	126, "SCE_HPHP_HSTRING_VARIABLE", "server php literal string identifier", "PHP variable in double quoted string",
+	127, "SCE_HPHP_OPERATOR", "server php operator", "PHP operator",
+};
+
+LexicalClass lexicalClassesXML[] = {
+	// Lexer.Secondary XML SCLEX_XML SCE_H_:
+	0, "SCE_H_DEFAULT", "default", "Default",
+	1, "SCE_H_TAG", "tag", "Tags",
+	2, "SCE_H_TAGUNKNOWN", "error tag", "Unknown Tags",
+	3, "SCE_H_ATTRIBUTE", "attribute", "Attributes",
+	4, "SCE_H_ERRORATTRIBUTEUNKNOWN", "error attribute", "Unknown Attributes",
+	5, "SCE_H_NUMBER", "literal numeric", "Numbers",
+	6, "SCE_H_DOUBLESTRING", "literal string", "Double quoted strings",
+	7, "SCE_H_SINGLESTRING", "literal string", "Single quoted strings",
+	8, "SCE_H_OTHER", "tag operator", "Other inside tag, including space and '='",
+	9, "SCE_H_COMMENT", "comment", "Comment",
+	10, "SCE_H_ENTITY", "literal", "Entities",
+	11, "SCE_H_TAGEND", "tag", "XML style tag ends '/>'",
+	12, "SCE_H_XMLSTART", "identifier", "XML identifier start '<?'",
+	13, "SCE_H_XMLEND", "identifier", "XML identifier end '?>'",
+	14, "", "unused", "",
+	15, "", "unused", "",
+	16, "", "unused", "",
+	17, "SCE_H_CDATA", "literal", "CDATA",
+	18, "SCE_H_QUESTION", "preprocessor", "Question",
+	19, "SCE_H_VALUE", "literal string", "Unquoted Value",
+	20, "", "unused", "",
+	21, "SCE_H_SGML_DEFAULT", "default", "SGML tags <! ... >",
+	22, "SCE_H_SGML_COMMAND", "preprocessor", "SGML command",
+	23, "SCE_H_SGML_1ST_PARAM", "preprocessor", "SGML 1st param",
+	24, "SCE_H_SGML_DOUBLESTRING", "literal string", "SGML double string",
+	25, "SCE_H_SGML_SIMPLESTRING", "literal string", "SGML single string",
+	26, "SCE_H_SGML_ERROR", "error", "SGML error",
+	27, "SCE_H_SGML_SPECIAL", "literal", "SGML special (#XXXX type)",
+	28, "SCE_H_SGML_ENTITY", "literal", "SGML entity",
+	29, "SCE_H_SGML_COMMENT", "comment", "SGML comment",
+	30, "", "unused", "",
+	31, "SCE_H_SGML_BLOCK_DEFAULT", "default", "SGML block",
+};
+
+const char *tagsThatDoNotFold[] = {
+	"area",
+	"base",
+	"basefont",
+	"br",
+	"col",
+	"command",
+	"embed",
+	"frame",
+	"hr",
+	"img",
+	"input",
+	"isindex",
+	"keygen",
+	"link",
+	"meta",
+	"param",
+	"source",
+	"track",
+	"wbr"
+};
+
+}
+
+class LexerHTML : public DefaultLexer {
+	bool isXml;
+	bool isPHPScript;
+	WordList keywords;
+	WordList keywords2;
+	WordList keywords3;
+	WordList keywords4;
+	WordList keywords5;
+	WordList keywords6; // SGML (DTD) keywords
+	OptionsHTML options;
+	OptionSetHTML osHTML;
+	std::set<std::string> nonFoldingTags;
+public:
+	explicit LexerHTML(bool isXml_, bool isPHPScript_) :
+		DefaultLexer(
+			isXml_ ? "xml" : (isPHPScript_ ? "phpscript" : "hypertext"),
+			isXml_ ? SCLEX_XML : (isPHPScript_ ? SCLEX_PHPSCRIPT : SCLEX_HTML),
+			isXml_ ?  lexicalClassesXML : lexicalClassesHTML,
+			isXml_ ?  std::size(lexicalClassesXML) : std::size(lexicalClassesHTML)),
+		isXml(isXml_),
+		isPHPScript(isPHPScript_),
+		osHTML(isPHPScript_),
+		nonFoldingTags(std::begin(tagsThatDoNotFold), std::end(tagsThatDoNotFold)) {
+	}
+	~LexerHTML() override {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return osHTML.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osHTML.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return osHTML.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osHTML.PropertyGet(key);
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return osHTML.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	// No Fold as all folding performs in Lex.
+
+	static ILexer5 *LexerFactoryHTML() {
+		return new LexerHTML(false, false);
+	}
+	static ILexer5 *LexerFactoryXML() {
+		return new LexerHTML(true, false);
+	}
+	static ILexer5 *LexerFactoryPHPScript() {
+		return new LexerHTML(false, true);
+	}
+};
+
+Sci_Position SCI_METHOD LexerHTML::PropertySet(const char *key, const char *val) {
+	if (osHTML.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerHTML::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	case 2:
+		wordListN = &keywords3;
+		break;
+	case 3:
+		wordListN = &keywords4;
+		break;
+	case 4:
+		wordListN = &keywords5;
+		break;
+	case 5:
+		wordListN = &keywords6;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	Accessor styler(pAccess, nullptr);
+	if (isPHPScript && (startPos == 0)) {
+		initStyle = SCE_HPHP_DEFAULT;
+	}
+	styler.StartAt(startPos);
+	std::string prevWord;
+	std::string phpStringDelimiter;
+	int StateToPrint = initStyle;
+	int state = stateForPrintState(StateToPrint);
+	std::string makoBlockType;
+	int makoComment = 0;
+	std::string djangoBlockType;
+	// If inside a tag, it may be a script tag, so reread from the start of line starting tag to ensure any language tags are seen
+	if (InTagState(state)) {
+		while ((startPos > 0) && (InTagState(styler.StyleAt(startPos - 1)))) {
+			const Sci_Position backLineStart = styler.LineStart(styler.GetLine(startPos-1));
+			length += startPos - backLineStart;
+			startPos = backLineStart;
+		}
+		state = SCE_H_DEFAULT;
+	}
+	// String can be heredoc, must find a delimiter first. Reread from beginning of line containing the string, to get the correct lineState
+	if (isPHPStringState(state)) {
+		while (startPos > 0 && (isPHPStringState(state) || !isLineEnd(styler[startPos - 1]))) {
+			startPos--;
+			length++;
+			state = styler.StyleAt(startPos);
+		}
+		if (startPos == 0)
+			state = SCE_H_DEFAULT;
+	}
+	styler.StartAt(startPos);
+
+	/* Nothing handles getting out of these, so we need not start in any of them.
+	 * As we're at line start and they can't span lines, we'll re-detect them anyway */
+	switch (state) {
+		case SCE_H_QUESTION:
+		case SCE_H_XMLSTART:
+		case SCE_H_XMLEND:
+		case SCE_H_ASP:
+			state = SCE_H_DEFAULT;
+			break;
+	}
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int lineState;
+	if (lineCurrent > 0) {
+		lineState = styler.GetLineState(lineCurrent-1);
+	} else {
+		// Default client and ASP scripting language is JavaScript
+		lineState = eScriptJS << 8;
+		lineState |= options.aspDefaultLanguage << 4;
+	}
+	script_mode inScriptType = static_cast<script_mode>((lineState >> 0) & 0x03); // 2 bits of scripting mode
+
+	bool tagOpened = (lineState >> 2) & 0x01; // 1 bit to know if we are in an opened tag
+	bool tagClosing = (lineState >> 3) & 0x01; // 1 bit to know if we are in a closing tag
+	bool tagDontFold = false; //some HTML tags should not be folded
+	script_type aspScript = static_cast<script_type>((lineState >> 4) & 0x0F); // 4 bits of script name
+	script_type clientScript = static_cast<script_type>((lineState >> 8) & 0x0F); // 4 bits of script name
+	int beforePreProc = (lineState >> 12) & 0xFF; // 8 bits of state
+
+	script_type scriptLanguage = ScriptOfState(state);
+	// If eNonHtmlScript coincides with SCE_H_COMMENT, assume eScriptComment
+	if (inScriptType == eNonHtmlScript && state == SCE_H_COMMENT) {
+		scriptLanguage = eScriptComment;
+	}
+	script_type beforeLanguage = ScriptOfState(beforePreProc);
+	const bool foldHTML = options.foldHTML;
+	const bool fold = foldHTML && options.fold;
+	const bool foldHTMLPreprocessor = foldHTML && options.foldHTMLPreprocessor;
+	const bool foldCompact = options.foldCompact;
+	const bool foldComment = fold && options.foldComment;
+	const bool foldHeredoc = fold && options.foldHeredoc;
+	const bool foldXmlAtTagOpen = isXml && fold && options.foldXmlAtTagOpen;
+	const bool caseSensitive = options.caseSensitive;
+	const bool allowScripts = options.allowScripts;
+	const bool isMako = options.isMako;
+	const bool isDjango = options.isDjango;
+	const CharacterSet setHTMLWord(CharacterSet::setAlphaNum, ".-_:!#", true);
+	const CharacterSet setTagContinue(CharacterSet::setAlphaNum, ".-_:!#[", true);
+	const CharacterSet setAttributeContinue(CharacterSet::setAlphaNum, ".-_:!#/", true);
+	// TODO: also handle + and - (except if they're part of ++ or --) and return keywords
+	const CharacterSet setOKBeforeJSRE(CharacterSet::setNone, "([{=,:;!%^&*|?~");
+
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	int visibleChars = 0;
+	int lineStartVisibleChars = 0;
+
+	int chPrev = ' ';
+	int ch = ' ';
+	int chPrevNonWhite = ' ';
+	// look back to set chPrevNonWhite properly for better regex colouring
+	if (scriptLanguage == eScriptJS && startPos > 0) {
+		Sci_Position back = startPos;
+		int style = 0;
+		while (--back) {
+			style = styler.StyleAt(back);
+			if (style < SCE_HJ_DEFAULT || style > SCE_HJ_COMMENTDOC)
+				// includes SCE_HJ_COMMENT & SCE_HJ_COMMENTLINE
+				break;
+		}
+		if (style == SCE_HJ_SYMBOLS) {
+			chPrevNonWhite = static_cast<unsigned char>(styler.SafeGetCharAt(back));
+		}
+	}
+
+	styler.StartSegment(startPos);
+	const Sci_Position lengthDoc = startPos + length;
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		const int chPrev2 = chPrev;
+		chPrev = ch;
+		if (!IsASpace(ch) && state != SCE_HJ_COMMENT &&
+			state != SCE_HJ_COMMENTLINE && state != SCE_HJ_COMMENTDOC)
+			chPrevNonWhite = ch;
+		ch = static_cast<unsigned char>(styler[i]);
+		int chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+		const int chNext2 = static_cast<unsigned char>(styler.SafeGetCharAt(i + 2));
+
+		// Handle DBCS codepages
+		if (styler.IsLeadByte(static_cast<char>(ch))) {
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if ((!IsASpace(ch) || !foldCompact) && fold)
+			visibleChars++;
+		if (!IsASpace(ch))
+			lineStartVisibleChars++;
+
+		// decide what is the current state to print (depending of the script tag)
+		StateToPrint = statePrintForState(state, inScriptType);
+
+		// handle script folding
+		if (fold) {
+			switch (scriptLanguage) {
+			case eScriptJS:
+			case eScriptPHP:
+				//not currently supported				case eScriptVBS:
+
+				if ((state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (state != SCE_HJ_COMMENT) && (state != SCE_HJ_COMMENTLINE) && (state != SCE_HJ_COMMENTDOC) && (!isStringState(state))) {
+				//Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle);
+				//if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) {
+					if (ch == '#') {
+						Sci_Position j = i + 1;
+						while ((j < lengthDoc) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+							j++;
+						}
+						if (styler.Match(j, "region") || styler.Match(j, "if")) {
+							levelCurrent++;
+						} else if (styler.Match(j, "end")) {
+							levelCurrent--;
+						}
+					} else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) {
+						levelCurrent += (((ch == '{') || (ch == '/')) ? 1 : -1);
+					}
+				} else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) {
+					levelCurrent--;
+				}
+				break;
+			case eScriptPython:
+				if (state != SCE_HP_COMMENTLINE && !isMako) {
+					if ((ch == ':') && ((chNext == '\n') || (chNext == '\r' && chNext2 == '\n'))) {
+						levelCurrent++;
+					} else if ((ch == '\n') && !((chNext == '\r') && (chNext2 == '\n')) && (chNext != '\n')) {
+						// check if the number of tabs is lower than the level
+						int Findlevel = (levelCurrent & ~SC_FOLDLEVELBASE) * 8;
+						for (Sci_Position j = 0; Findlevel > 0; j++) {
+							const char chTmp = styler.SafeGetCharAt(i + j + 1);
+							if (chTmp == '\t') {
+								Findlevel -= 8;
+							} else if (chTmp == ' ') {
+								Findlevel--;
+							} else {
+								break;
+							}
+						}
+
+						if (Findlevel > 0) {
+							levelCurrent -= Findlevel / 8;
+							if (Findlevel % 8)
+								levelCurrent--;
+						}
+					}
+				}
+				break;
+			default:
+				break;
+			}
+		}
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// New line -> record any line state onto /next/ line
+			if (fold) {
+				int lev = levelPrev;
+				if (visibleChars == 0)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				if ((levelCurrent > levelPrev) && (visibleChars > 0))
+					lev |= SC_FOLDLEVELHEADERFLAG;
+
+				styler.SetLevel(lineCurrent, lev);
+				visibleChars = 0;
+				levelPrev = levelCurrent;
+			}
+			styler.SetLineState(lineCurrent,
+			                    ((inScriptType & 0x03) << 0) |
+			                    ((tagOpened ? 1 : 0) << 2) |
+			                    ((tagClosing ? 1 : 0) << 3) |
+			                    ((aspScript & 0x0F) << 4) |
+			                    ((clientScript & 0x0F) << 8) |
+			                    ((beforePreProc & 0xFF) << 12));
+			lineCurrent++;
+			lineStartVisibleChars = 0;
+		}
+
+		// handle start of Mako comment line
+		if (isMako && ch == '#' && chNext == '#') {
+			makoComment = 1;
+			state = SCE_HP_COMMENTLINE;
+		}
+
+		// handle end of Mako comment line
+		else if (isMako && makoComment && (ch == '\r' || ch == '\n')) {
+			makoComment = 0;
+			styler.ColourTo(i - 1, StateToPrint);
+			if (scriptLanguage == eScriptPython) {
+				state = SCE_HP_DEFAULT;
+			} else {
+				state = SCE_H_DEFAULT;
+			}
+		}
+		// Allow falling through to mako handling code if newline is going to end a block
+		if (((ch == '\r' && chNext != '\n') || (ch == '\n')) &&
+			(!isMako || (makoBlockType != "%"))) {
+		}
+		// Ignore everything in mako comment until the line ends
+		else if (isMako && makoComment) {
+		}
+
+		// generic end of script processing
+		else if ((inScriptType == eNonHtmlScript) && (ch == '<') && (chNext == '/')) {
+			// Check if it's the end of the script tag (or any other HTML tag)
+			switch (state) {
+				// in these cases, you can embed HTML tags (to confirm !!!!!!!!!!!!!!!!!!!!!!)
+			case SCE_H_DOUBLESTRING:
+			case SCE_H_SINGLESTRING:
+			case SCE_HJ_COMMENT:
+			case SCE_HJ_COMMENTDOC:
+			//case SCE_HJ_COMMENTLINE: // removed as this is a common thing done to hide
+			// the end of script marker from some JS interpreters.
+			case SCE_HB_COMMENTLINE:
+			case SCE_HBA_COMMENTLINE:
+			case SCE_HJ_DOUBLESTRING:
+			case SCE_HJ_SINGLESTRING:
+			case SCE_HJ_REGEX:
+			case SCE_HB_STRING:
+			case SCE_HBA_STRING:
+			case SCE_HP_STRING:
+			case SCE_HP_TRIPLE:
+			case SCE_HP_TRIPLEDOUBLE:
+			case SCE_HPHP_HSTRING:
+			case SCE_HPHP_SIMPLESTRING:
+			case SCE_HPHP_COMMENT:
+			case SCE_HPHP_COMMENTLINE:
+				break;
+			default :
+				// check if the closing tag is a script tag
+				if (const char *tag =
+						state == SCE_HJ_COMMENTLINE || isXml ? "script" :
+						state == SCE_H_COMMENT ? "comment" : 0) {
+					Sci_Position j = i + 2;
+					int chr;
+					do {
+						chr = static_cast<int>(*tag++);
+					} while (chr != 0 && chr == MakeLowerCase(styler.SafeGetCharAt(j++)));
+					if (chr != 0) break;
+				}
+				// closing tag of the script (it's a closing HTML tag anyway)
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_TAGUNKNOWN;
+				inScriptType = eHtml;
+				scriptLanguage = eScriptNone;
+				clientScript = eScriptJS;
+				i += 2;
+				visibleChars += 2;
+				tagClosing = true;
+				if (foldXmlAtTagOpen) {
+					levelCurrent--;
+				}
+				continue;
+			}
+		}
+
+		/////////////////////////////////////
+		// handle the start of PHP pre-processor = Non-HTML
+		else if ((state != SCE_H_ASPAT) &&
+		         !isStringState(state) &&
+		         (state != SCE_HPHP_COMMENT) &&
+		         (state != SCE_HPHP_COMMENTLINE) &&
+		         (ch == '<') &&
+		         (chNext == '?') &&
+				 !IsScriptCommentState(state)) {
+ 			beforeLanguage = scriptLanguage;
+			scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 6, isXml ? eScriptXML : eScriptPHP);
+			if ((scriptLanguage != eScriptPHP) && (isStringState(state) || (state==SCE_H_COMMENT))) continue;
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			i++;
+			visibleChars++;
+			i += PrintScriptingIndicatorOffset(styler, styler.GetStartSegment() + 2, i + 6);
+			if (scriptLanguage == eScriptXML)
+				styler.ColourTo(i, SCE_H_XMLSTART);
+			else
+				styler.ColourTo(i, SCE_H_QUESTION);
+			state = StateForScript(scriptLanguage);
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+			// Fold whole script, but not if the XML first tag (all XML-like tags in this case)
+			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
+				levelCurrent++;
+			}
+			// should be better
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		// handle the start Mako template Python code
+		else if (isMako && scriptLanguage == eScriptNone && ((ch == '<' && chNext == '%') ||
+															 (lineStartVisibleChars == 1 && ch == '%') ||
+															 (lineStartVisibleChars == 1 && ch == '/' && chNext == '%') ||
+															 (ch == '$' && chNext == '{') ||
+															 (ch == '<' && chNext == '/' && chNext2 == '%'))) {
+			if (ch == '%' || ch == '/')
+				makoBlockType = "%";
+			else if (ch == '$')
+				makoBlockType = "{";
+			else if (chNext == '/')
+				makoBlockType = GetNextWord(styler, i+3);
+			else
+				makoBlockType = GetNextWord(styler, i+2);
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+
+			if (chNext == '/') {
+				i += 2;
+				visibleChars += 2;
+			} else if (ch != '%') {
+				i++;
+				visibleChars++;
+			}
+			state = SCE_HP_START;
+			scriptLanguage = eScriptPython;
+			styler.ColourTo(i, SCE_H_ASP);
+			if (ch != '%' && ch != '$' && ch != '/') {
+				i += makoBlockType.length();
+				visibleChars += static_cast<int>(makoBlockType.length());
+				if (keywords4.InList(makoBlockType.c_str()))
+					styler.ColourTo(i, SCE_HP_WORD);
+				else
+					styler.ColourTo(i, SCE_H_TAGUNKNOWN);
+			}
+
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		// handle the start/end of Django comment
+		else if (isDjango && state != SCE_H_COMMENT && (ch == '{' && chNext == '#')) {
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			beforeLanguage = scriptLanguage;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+			i += 1;
+			visibleChars += 1;
+			scriptLanguage = eScriptComment;
+			state = SCE_H_COMMENT;
+			styler.ColourTo(i, SCE_H_ASP);
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		} else if (isDjango && state == SCE_H_COMMENT && (ch == '#' && chNext == '}')) {
+			styler.ColourTo(i - 1, StateToPrint);
+			i += 1;
+			visibleChars += 1;
+			styler.ColourTo(i, SCE_H_ASP);
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			scriptLanguage = beforeLanguage;
+			continue;
+		}
+
+		// handle the start Django template code
+		else if (isDjango && scriptLanguage != eScriptPython && scriptLanguage != eScriptComment && (ch == '{' && (chNext == '%' ||  chNext == '{'))) {
+			if (chNext == '%')
+				djangoBlockType = "%";
+			else
+				djangoBlockType = "{";
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+
+			i += 1;
+			visibleChars += 1;
+			state = SCE_HP_START;
+			beforeLanguage = scriptLanguage;
+			scriptLanguage = eScriptPython;
+			styler.ColourTo(i, SCE_H_ASP);
+
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		// handle the start of ASP pre-processor = Non-HTML
+		else if (!isMako && !isDjango && !isCommentASPState(state) && (ch == '<') && (chNext == '%') && !isPHPStringState(state)) {
+			styler.ColourTo(i - 1, StateToPrint);
+			beforePreProc = state;
+			if (inScriptType == eNonHtmlScript)
+				inScriptType = eNonHtmlScriptPreProc;
+			else
+				inScriptType = eNonHtmlPreProc;
+
+			if (chNext2 == '@') {
+				i += 2; // place as if it was the second next char treated
+				visibleChars += 2;
+				state = SCE_H_ASPAT;
+				scriptLanguage = eScriptVBS;
+			} else if ((chNext2 == '-') && (styler.SafeGetCharAt(i + 3) == '-')) {
+				styler.ColourTo(i + 3, SCE_H_ASP);
+				state = SCE_H_XCCOMMENT;
+				scriptLanguage = eScriptVBS;
+				continue;
+			} else {
+				if (chNext2 == '=') {
+					i += 2; // place as if it was the second next char treated
+					visibleChars += 2;
+				} else {
+					i++; // place as if it was the next char treated
+					visibleChars++;
+				}
+
+				state = StateForScript(aspScript);
+				scriptLanguage = aspScript;
+			}
+			styler.ColourTo(i, SCE_H_ASP);
+			// fold whole script
+			if (foldHTMLPreprocessor)
+				levelCurrent++;
+			// should be better
+			ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+			continue;
+		}
+
+		/////////////////////////////////////
+		// handle the start of SGML language (DTD)
+		else if (((scriptLanguage == eScriptNone) || (scriptLanguage == eScriptXML)) &&
+				 (chPrev == '<') &&
+				 (ch == '!') &&
+				 (StateToPrint != SCE_H_CDATA) &&
+				 (!IsCommentState(StateToPrint)) &&
+				 (!IsScriptCommentState(StateToPrint))) {
+			beforePreProc = state;
+			styler.ColourTo(i - 2, StateToPrint);
+			if ((chNext == '-') && (chNext2 == '-')) {
+				state = SCE_H_COMMENT; // wait for a pending command
+				styler.ColourTo(i + 2, SCE_H_COMMENT);
+				i += 2; // follow styling after the --
+			} else if (isWordCdata(i + 1, i + 7, styler)) {
+				state = SCE_H_CDATA;
+			} else {
+				styler.ColourTo(i, SCE_H_SGML_DEFAULT); // <! is default
+				scriptLanguage = eScriptSGML;
+				state = SCE_H_SGML_COMMAND; // wait for a pending command
+			}
+			// fold whole tag (-- when closing the tag)
+			if (foldHTMLPreprocessor || state == SCE_H_COMMENT || state == SCE_H_CDATA)
+				levelCurrent++;
+			continue;
+		}
+
+		// handle the end of Mako Python code
+		else if (isMako &&
+			     ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) &&
+				 (scriptLanguage != eScriptNone) && stateAllowsTermination(state) &&
+				 isMakoBlockEnd(ch, chNext, makoBlockType)) {
+			if (state == SCE_H_ASPAT) {
+				aspScript = segIsScriptingIndicator(styler,
+				                                    styler.GetStartSegment(), i - 1, aspScript);
+			}
+			if (state == SCE_HP_WORD) {
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+			} else {
+				styler.ColourTo(i - 1, StateToPrint);
+			}
+			if ((makoBlockType != "%") && (makoBlockType != "{") && ch != '>') {
+				i++;
+				visibleChars++;
+		    }
+			else if ((makoBlockType == "%") && ch == '/') {
+				i++;
+				visibleChars++;
+			}
+			if ((makoBlockType != "%") || ch == '/') {
+				styler.ColourTo(i, SCE_H_ASP);
+			}
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			scriptLanguage = eScriptNone;
+			continue;
+		}
+
+		// handle the end of Django template code
+		else if (isDjango &&
+			     ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) &&
+				 (scriptLanguage != eScriptNone) && stateAllowsTermination(state) &&
+				 isDjangoBlockEnd(ch, chNext, djangoBlockType)) {
+			if (state == SCE_H_ASPAT) {
+				aspScript = segIsScriptingIndicator(styler,
+				                                    styler.GetStartSegment(), i - 1, aspScript);
+			}
+			if (state == SCE_HP_WORD) {
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+			} else {
+				styler.ColourTo(i - 1, StateToPrint);
+			}
+			i += 1;
+			visibleChars += 1;
+			styler.ColourTo(i, SCE_H_ASP);
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			scriptLanguage = beforeLanguage;
+			continue;
+		}
+
+		// handle the end of a pre-processor = Non-HTML
+		else if ((!isMako && !isDjango && ((inScriptType == eNonHtmlPreProc) || (inScriptType == eNonHtmlScriptPreProc)) &&
+				  (((scriptLanguage != eScriptNone) && stateAllowsTermination(state))) &&
+				  (((ch == '%') || (ch == '?')) && (chNext == '>'))) ||
+		         ((scriptLanguage == eScriptSGML) && (ch == '>') && (state != SCE_H_SGML_COMMENT))) {
+			if (state == SCE_H_ASPAT) {
+				aspScript = segIsScriptingIndicator(styler,
+				                                    styler.GetStartSegment(), i - 1, aspScript);
+			}
+			// Bounce out of any ASP mode
+			switch (state) {
+			case SCE_HJ_WORD:
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				break;
+			case SCE_HB_WORD:
+				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				break;
+			case SCE_HP_WORD:
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				break;
+			case SCE_HPHP_WORD:
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				break;
+			case SCE_H_XCCOMMENT:
+				styler.ColourTo(i - 1, state);
+				break;
+			default :
+				styler.ColourTo(i - 1, StateToPrint);
+				break;
+			}
+			if (scriptLanguage != eScriptSGML) {
+				i++;
+				visibleChars++;
+			}
+			if (ch == '%')
+				styler.ColourTo(i, SCE_H_ASP);
+			else if (scriptLanguage == eScriptXML)
+				styler.ColourTo(i, SCE_H_XMLEND);
+			else if (scriptLanguage == eScriptSGML)
+				styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+			else
+				styler.ColourTo(i, SCE_H_QUESTION);
+			state = beforePreProc;
+			if (inScriptType == eNonHtmlScriptPreProc)
+				inScriptType = eNonHtmlScript;
+			else
+				inScriptType = eHtml;
+			// Unfold all scripting languages, except for XML tag
+			if (foldHTMLPreprocessor && (scriptLanguage != eScriptXML)) {
+				levelCurrent--;
+			}
+			scriptLanguage = beforeLanguage;
+			continue;
+		}
+		/////////////////////////////////////
+
+		switch (state) {
+		case SCE_H_DEFAULT:
+			if (ch == '<') {
+				// in HTML, fold on tag open and unfold on tag close
+				tagOpened = true;
+				tagClosing = (chNext == '/');
+				if (foldXmlAtTagOpen && !(chNext == '/' || chNext == '?' || chNext == '!' || chNext == '-' || chNext == '%')) {
+					levelCurrent++;
+				}
+				if (foldXmlAtTagOpen && chNext == '/') {
+					levelCurrent--;
+				}
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext != '!')
+					state = SCE_H_TAGUNKNOWN;
+			} else if (ch == '&') {
+				styler.ColourTo(i - 1, SCE_H_DEFAULT);
+				state = SCE_H_ENTITY;
+			}
+			break;
+		case SCE_H_SGML_DEFAULT:
+		case SCE_H_SGML_BLOCK_DEFAULT:
+//			if (scriptLanguage == eScriptSGMLblock)
+//				StateToPrint = SCE_H_SGML_BLOCK_DEFAULT;
+
+			if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_SIMPLESTRING;
+			} else if ((ch == '-') && (chPrev == '-')) {
+				if (static_cast<Sci_Position>(styler.GetStartSegment()) <= (i - 2)) {
+					styler.ColourTo(i - 2, StateToPrint);
+				}
+				state = SCE_H_SGML_COMMENT;
+			} else if (IsASCII(ch) && isalpha(ch) && (chPrev == '%')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_ENTITY;
+			} else if (ch == '#') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SGML_SPECIAL;
+			} else if (ch == '[') {
+				styler.ColourTo(i - 1, StateToPrint);
+				scriptLanguage = eScriptSGMLblock;
+				state = SCE_H_SGML_BLOCK_DEFAULT;
+			} else if (ch == ']') {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i, StateToPrint);
+					scriptLanguage = eScriptSGML;
+				} else {
+					styler.ColourTo(i - 1, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_ERROR);
+				}
+				state = SCE_H_SGML_DEFAULT;
+			} else if (scriptLanguage == eScriptSGMLblock) {
+				if ((ch == '!') && (chPrev == '<')) {
+					styler.ColourTo(i - 2, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+					state = SCE_H_SGML_COMMAND;
+				} else if (ch == '>') {
+					styler.ColourTo(i - 1, StateToPrint);
+					styler.ColourTo(i, SCE_H_SGML_DEFAULT);
+				}
+			}
+			break;
+		case SCE_H_SGML_COMMAND:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_COMMENT;
+			} else if (!issgmlwordchar(ch)) {
+				if (isWordHSGML(styler.GetStartSegment(), i - 1, keywords6, styler)) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_H_SGML_1ST_PARAM;
+				} else {
+					state = SCE_H_SGML_ERROR;
+				}
+			}
+			break;
+		case SCE_H_SGML_1ST_PARAM:
+			// wait for the beginning of the word
+			if ((ch == '-') && (chPrev == '-')) {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i - 2, SCE_H_SGML_BLOCK_DEFAULT);
+				} else {
+					styler.ColourTo(i - 2, SCE_H_SGML_DEFAULT);
+				}
+				state = SCE_H_SGML_1ST_PARAM_COMMENT;
+			} else if (issgmlwordchar(ch)) {
+				if (scriptLanguage == eScriptSGMLblock) {
+					styler.ColourTo(i - 1, SCE_H_SGML_BLOCK_DEFAULT);
+				} else {
+					styler.ColourTo(i - 1, SCE_H_SGML_DEFAULT);
+				}
+				// find the length of the word
+				int size = 1;
+				while (setHTMLWord.Contains(static_cast<unsigned char>(styler.SafeGetCharAt(i + size))))
+					size++;
+				styler.ColourTo(i + size - 1, StateToPrint);
+				i += size - 1;
+				visibleChars += size - 1;
+				ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+				if (scriptLanguage == eScriptSGMLblock) {
+					state = SCE_H_SGML_BLOCK_DEFAULT;
+				} else {
+					state = SCE_H_SGML_DEFAULT;
+				}
+				continue;
+			}
+			break;
+		case SCE_H_SGML_ERROR:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i - 2, StateToPrint);
+				state = SCE_H_SGML_COMMENT;
+			}
+			break;
+		case SCE_H_SGML_DOUBLESTRING:
+			if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_SGML_SIMPLESTRING:
+			if (ch == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_SGML_COMMENT:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_CDATA:
+			if ((chPrev2 == ']') && (chPrev == ']') && (ch == '>')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+				levelCurrent--;
+			}
+			break;
+		case SCE_H_COMMENT:
+			if ((scriptLanguage != eScriptComment) && (chPrev2 == '-') && (chPrev == '-') && (ch == '>')) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+				levelCurrent--;
+			}
+			break;
+		case SCE_H_SGML_1ST_PARAM_COMMENT:
+			if ((ch == '-') && (chPrev == '-')) {
+				styler.ColourTo(i, SCE_H_SGML_COMMENT);
+				state = SCE_H_SGML_1ST_PARAM;
+			}
+			break;
+		case SCE_H_SGML_SPECIAL:
+			if (!(IsASCII(ch) && isupper(ch))) {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (isalnum(ch)) {
+					state = SCE_H_SGML_ERROR;
+				} else {
+					state = SCE_H_SGML_DEFAULT;
+				}
+			}
+			break;
+		case SCE_H_SGML_ENTITY:
+			if (ch == ';') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_SGML_DEFAULT;
+			} else if (!(IsASCII(ch) && isalnum(ch)) && ch != '-' && ch != '.') {
+				styler.ColourTo(i, SCE_H_SGML_ERROR);
+				state = SCE_H_SGML_DEFAULT;
+			}
+			break;
+		case SCE_H_ENTITY:
+			if (ch == ';') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_DEFAULT;
+			}
+			if (ch != '#' && !(IsASCII(ch) && isalnum(ch))	// Should check that '#' follows '&', but it is unlikely anyway...
+				&& ch != '.' && ch != '-' && ch != '_' && ch != ':') { // valid in XML
+				if (!IsASCII(ch))	// Possibly start of a multibyte character so don't allow this byte to be in entity style
+					styler.ColourTo(i-1, SCE_H_TAGUNKNOWN);
+				else
+					styler.ColourTo(i, SCE_H_TAGUNKNOWN);
+				state = SCE_H_DEFAULT;
+			}
+			break;
+		case SCE_H_TAGUNKNOWN:
+			if (!setTagContinue.Contains(ch) && !((ch == '/') && (chPrev == '<'))) {
+				int eClass = classifyTagHTML(styler.GetStartSegment(),
+					i - 1, keywords, styler, tagDontFold, caseSensitive, isXml, allowScripts, nonFoldingTags);
+				if (eClass == SCE_H_SCRIPT || eClass == SCE_H_COMMENT) {
+					if (!tagClosing) {
+						inScriptType = eNonHtmlScript;
+						scriptLanguage = eClass == SCE_H_SCRIPT ? clientScript : eScriptComment;
+					} else {
+						scriptLanguage = eScriptNone;
+					}
+					eClass = SCE_H_TAG;
+				}
+				if (ch == '>') {
+					styler.ColourTo(i, eClass);
+					if (inScriptType == eNonHtmlScript) {
+						state = StateForScript(scriptLanguage);
+					} else {
+						state = SCE_H_DEFAULT;
+					}
+					tagOpened = false;
+					if (!(foldXmlAtTagOpen || tagDontFold)) {
+						if (tagClosing) {
+							levelCurrent--;
+						} else {
+							levelCurrent++;
+						}
+					}
+					tagClosing = false;
+				} else if (ch == '/' && chNext == '>') {
+					if (eClass == SCE_H_TAGUNKNOWN) {
+						styler.ColourTo(i + 1, SCE_H_TAGUNKNOWN);
+					} else {
+						styler.ColourTo(i - 1, StateToPrint);
+						styler.ColourTo(i + 1, SCE_H_TAGEND);
+					}
+					i++;
+					ch = chNext;
+					state = SCE_H_DEFAULT;
+					tagOpened = false;
+					if (foldXmlAtTagOpen) {
+						levelCurrent--;
+					}
+				} else {
+					if (eClass != SCE_H_TAGUNKNOWN) {
+						if (eClass == SCE_H_SGML_DEFAULT) {
+							state = SCE_H_SGML_DEFAULT;
+						} else {
+							state = SCE_H_OTHER;
+						}
+					}
+				}
+			}
+			break;
+		case SCE_H_ATTRIBUTE:
+			if (!setAttributeContinue.Contains(ch)) {
+				if (inScriptType == eNonHtmlScript) {
+					const int scriptLanguagePrev = scriptLanguage;
+					clientScript = segIsScriptingIndicator(styler, styler.GetStartSegment(), i - 1, scriptLanguage);
+					scriptLanguage = clientScript;
+					if ((scriptLanguagePrev != scriptLanguage) && (scriptLanguage == eScriptNone))
+						inScriptType = eHtml;
+				}
+				classifyAttribHTML(styler.GetStartSegment(), i - 1, keywords, styler);
+				if (ch == '>') {
+					styler.ColourTo(i, SCE_H_TAG);
+					if (inScriptType == eNonHtmlScript) {
+						state = StateForScript(scriptLanguage);
+					} else {
+						state = SCE_H_DEFAULT;
+					}
+					tagOpened = false;
+					if (!(foldXmlAtTagOpen || tagDontFold)) {
+						if (tagClosing) {
+							levelCurrent--;
+						} else {
+							levelCurrent++;
+						}
+					}
+					tagClosing = false;
+				} else if (ch == '=') {
+					styler.ColourTo(i, SCE_H_OTHER);
+					state = SCE_H_VALUE;
+				} else {
+					state = SCE_H_OTHER;
+				}
+			}
+			break;
+		case SCE_H_OTHER:
+			if (ch == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, SCE_H_TAG);
+				if (inScriptType == eNonHtmlScript) {
+					state = StateForScript(scriptLanguage);
+				} else {
+					state = SCE_H_DEFAULT;
+				}
+				tagOpened = false;
+				if (!(foldXmlAtTagOpen || tagDontFold)) {
+					if (tagClosing) {
+						levelCurrent--;
+					} else {
+						levelCurrent++;
+					}
+				}
+				tagClosing = false;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_SINGLESTRING;
+			} else if (ch == '=') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_H_VALUE;
+			} else if (ch == '/' && chNext == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i + 1, SCE_H_TAGEND);
+				i++;
+				ch = chNext;
+				state = SCE_H_DEFAULT;
+				tagOpened = false;
+				if (foldXmlAtTagOpen) {
+					levelCurrent--;
+				}
+			} else if (ch == '?' && chNext == '>') {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i + 1, SCE_H_XMLEND);
+				i++;
+				ch = chNext;
+				state = SCE_H_DEFAULT;
+			} else if (setHTMLWord.Contains(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_H_ATTRIBUTE;
+			}
+			break;
+		case SCE_H_DOUBLESTRING:
+			if (ch == '\"') {
+				if (inScriptType == eNonHtmlScript) {
+					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
+				}
+				styler.ColourTo(i, SCE_H_DOUBLESTRING);
+				state = SCE_H_OTHER;
+			}
+			break;
+		case SCE_H_SINGLESTRING:
+			if (ch == '\'') {
+				if (inScriptType == eNonHtmlScript) {
+					scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment(), i, scriptLanguage);
+				}
+				styler.ColourTo(i, SCE_H_SINGLESTRING);
+				state = SCE_H_OTHER;
+			}
+			break;
+		case SCE_H_VALUE:
+			if (!setHTMLWord.Contains(ch)) {
+				if (ch == '\"' && chPrev == '=') {
+					// Should really test for being first character
+					state = SCE_H_DOUBLESTRING;
+				} else if (ch == '\'' && chPrev == '=') {
+					state = SCE_H_SINGLESTRING;
+				} else {
+					if (IsNumber(styler.GetStartSegment(), styler)) {
+						styler.ColourTo(i - 1, SCE_H_NUMBER);
+					} else {
+						styler.ColourTo(i - 1, StateToPrint);
+					}
+					if (ch == '>') {
+						styler.ColourTo(i, SCE_H_TAG);
+						if (inScriptType == eNonHtmlScript) {
+							state = StateForScript(scriptLanguage);
+						} else {
+							state = SCE_H_DEFAULT;
+						}
+						tagOpened = false;
+						if (!tagDontFold) {
+							if (tagClosing) {
+								levelCurrent--;
+							} else {
+								levelCurrent++;
+							}
+						}
+						tagClosing = false;
+					} else {
+						state = SCE_H_OTHER;
+					}
+				}
+			}
+			break;
+		case SCE_HJ_DEFAULT:
+		case SCE_HJ_START:
+		case SCE_HJ_SYMBOLS:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_WORD;
+			} else if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext2 == '*')
+					state = SCE_HJ_COMMENTDOC;
+				else
+					state = SCE_HJ_COMMENT;
+				if (chNext2 == '/') {
+					// Eat the * so it isn't used for the end of the comment
+					i++;
+				}
+			} else if (ch == '/' && chNext == '/') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+			} else if (ch == '/' && setOKBeforeJSRE.Contains(chPrevNonWhite)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_REGEX;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_DOUBLESTRING;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_SINGLESTRING;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+			} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_COMMENTLINE;
+				i += 2;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HJ_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HJ_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HJ_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				//styler.ColourTo(i - 1, eHTJSKeyword);
+				state = SCE_HJ_DEFAULT;
+				if (ch == '/' && chNext == '*') {
+					if (chNext2 == '*')
+						state = SCE_HJ_COMMENTDOC;
+					else
+						state = SCE_HJ_COMMENT;
+				} else if (ch == '/' && chNext == '/') {
+					state = SCE_HJ_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_HJ_DOUBLESTRING;
+				} else if (ch == '\'') {
+					state = SCE_HJ_SINGLESTRING;
+				} else if ((ch == '-') && (chNext == '-') && (chNext2 == '>')) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HJ_COMMENTLINE;
+					i += 2;
+				} else if (IsOperator(ch)) {
+					styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+					state = SCE_HJ_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HJ_COMMENT:
+		case SCE_HJ_COMMENTDOC:
+			if (ch == '/' && chPrev == '*') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+				ch = ' ';
+			}
+			break;
+		case SCE_HJ_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, statePrintForState(SCE_HJ_COMMENTLINE, inScriptType));
+				state = SCE_HJ_DEFAULT;
+				ch = ' ';
+			}
+			break;
+		case SCE_HJ_DOUBLESTRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_DOUBLESTRING, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if (isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_STRINGEOL;
+			}
+			break;
+		case SCE_HJ_SINGLESTRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SINGLESTRING, inScriptType));
+				state = SCE_HJ_DEFAULT;
+			} else if (isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chPrev != '\\' && (chPrev2 != '\\' || chPrev != '\r' || ch != '\n')) {
+					state = SCE_HJ_STRINGEOL;
+				}
+			}
+			break;
+		case SCE_HJ_STRINGEOL:
+			if (!isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			} else if (!isLineEnd(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			}
+			break;
+		case SCE_HJ_REGEX:
+			if (ch == '\r' || ch == '\n' || ch == '/') {
+				if (ch == '/') {
+					while (IsASCII(chNext) && islower(chNext)) {   // gobble regex flags
+						i++;
+						ch = chNext;
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					}
+				}
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HJ_DEFAULT;
+			} else if (ch == '\\') {
+				// Gobble up the quoted character
+				if (chNext == '\\' || chNext == '/') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			}
+			break;
+		case SCE_HB_DEFAULT:
+		case SCE_HB_START:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_WORD;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_STRING;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_COMMENTLINE;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
+				state = SCE_HB_DEFAULT;
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HB_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HB_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HB_WORD:
+			if (!IsAWordChar(ch)) {
+				state = classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				if (state == SCE_HB_DEFAULT) {
+					if (ch == '\"') {
+						state = SCE_HB_STRING;
+					} else if (ch == '\'') {
+						state = SCE_HB_COMMENTLINE;
+					} else if (IsOperator(ch)) {
+						styler.ColourTo(i, statePrintForState(SCE_HB_DEFAULT, inScriptType));
+						state = SCE_HB_DEFAULT;
+					}
+				}
+			}
+			break;
+		case SCE_HB_STRING:
+			if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			} else if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_STRINGEOL;
+			}
+			break;
+		case SCE_HB_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			}
+			break;
+		case SCE_HB_STRINGEOL:
+			if (!isLineEnd(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			} else if (!isLineEnd(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HB_DEFAULT;
+			}
+			break;
+		case SCE_HP_DEFAULT:
+		case SCE_HP_START:
+			if (IsAWordStart(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_WORD;
+			} else if ((ch == '<') && (chNext == '!') && (chNext2 == '-') &&
+			           styler.SafeGetCharAt(i + 3) == '-') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_COMMENTLINE;
+			} else if (ch == '#') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_COMMENTLINE;
+			} else if (ch == '\"') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext == '\"' && chNext2 == '\"') {
+					i += 2;
+					state = SCE_HP_TRIPLEDOUBLE;
+					ch = ' ';
+					chPrev = ' ';
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				} else {
+					//					state = statePrintForState(SCE_HP_STRING,inScriptType);
+					state = SCE_HP_STRING;
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, StateToPrint);
+				if (chNext == '\'' && chNext2 == '\'') {
+					i += 2;
+					state = SCE_HP_TRIPLE;
+					ch = ' ';
+					chPrev = ' ';
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				} else {
+					state = SCE_HP_CHARACTER;
+				}
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
+			} else if ((ch == ' ') || (ch == '\t')) {
+				if (state == SCE_HP_START) {
+					styler.ColourTo(i - 1, StateToPrint);
+					state = SCE_HP_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HP_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				state = SCE_HP_DEFAULT;
+				if (ch == '#') {
+					state = SCE_HP_COMMENTLINE;
+				} else if (ch == '\"') {
+					if (chNext == '\"' && chNext2 == '\"') {
+						i += 2;
+						state = SCE_HP_TRIPLEDOUBLE;
+						ch = ' ';
+						chPrev = ' ';
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					} else {
+						state = SCE_HP_STRING;
+					}
+				} else if (ch == '\'') {
+					if (chNext == '\'' && chNext2 == '\'') {
+						i += 2;
+						state = SCE_HP_TRIPLE;
+						ch = ' ';
+						chPrev = ' ';
+						chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+					} else {
+						state = SCE_HP_CHARACTER;
+					}
+				} else if (IsOperator(ch)) {
+					styler.ColourTo(i, statePrintForState(SCE_HP_OPERATOR, inScriptType));
+				}
+			}
+			break;
+		case SCE_HP_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_STRING:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			} else if (ch == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_CHARACTER:
+			if (ch == '\\') {
+				if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+					i++;
+					ch = chNext;
+					chNext = static_cast<unsigned char>(styler.SafeGetCharAt(i + 1));
+				}
+			} else if (ch == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_TRIPLE:
+			if (ch == '\'' && chPrev == '\'' && chPrev2 == '\'') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+		case SCE_HP_TRIPLEDOUBLE:
+			if (ch == '\"' && chPrev == '\"' && chPrev2 == '\"') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HP_DEFAULT;
+			}
+			break;
+			///////////// start - PHP state handling
+		case SCE_HPHP_WORD:
+			if (!IsAWordChar(ch)) {
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				if (ch == '/' && chNext == '*') {
+					i++;
+					state = SCE_HPHP_COMMENT;
+				} else if (ch == '/' && chNext == '/') {
+					i++;
+					state = SCE_HPHP_COMMENTLINE;
+				} else if (ch == '#' && chNext != '[') {
+					state = SCE_HPHP_COMMENTLINE;
+				} else if (ch == '\"') {
+					state = SCE_HPHP_HSTRING;
+					phpStringDelimiter = "\"";
+				} else if (styler.Match(i, "<<<")) {
+					bool isSimpleString = false;
+					i = FindPhpStringDelimiter(phpStringDelimiter, i + 3, lengthDoc, styler, isSimpleString);
+					if (!phpStringDelimiter.empty()) {
+						state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING);
+						if (foldHeredoc) levelCurrent++;
+					}
+				} else if (ch == '\'') {
+					state = SCE_HPHP_SIMPLESTRING;
+					phpStringDelimiter = "\'";
+				} else if (ch == '$' && IsPhpWordStart(chNext)) {
+					state = SCE_HPHP_VARIABLE;
+				} else if (IsOperator(ch)) {
+					state = SCE_HPHP_OPERATOR;
+				} else {
+					state = SCE_HPHP_DEFAULT;
+				}
+			}
+			break;
+		case SCE_HPHP_NUMBER:
+			// recognize bases 8,10 or 16 integers OR floating-point numbers
+			if (!IsADigit(ch)
+				&& strchr(".xXabcdefABCDEF_", ch) == NULL
+				&& ((ch != '-' && ch != '+') || (chPrev != 'e' && chPrev != 'E'))) {
+				styler.ColourTo(i - 1, SCE_HPHP_NUMBER);
+				if (IsOperator(ch))
+					state = SCE_HPHP_OPERATOR;
+				else
+					state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_VARIABLE:
+			if (!IsPhpWordChar(chNext)) {
+				styler.ColourTo(i, SCE_HPHP_VARIABLE);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_COMMENT:
+			if (ch == '/' && chPrev == '*') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_COMMENTLINE:
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+		case SCE_HPHP_HSTRING:
+			if (ch == '\\' && ((phpStringDelimiter == "\"") || chNext == '$' || chNext == '{')) {
+				// skip the next char
+				i++;
+			} else if (((ch == '{' && chNext == '$') || (ch == '$' && chNext == '{'))
+				&& IsPhpWordStart(chNext2)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_COMPLEX_VARIABLE;
+			} else if (ch == '$' && IsPhpWordStart(chNext)) {
+				styler.ColourTo(i - 1, StateToPrint);
+				state = SCE_HPHP_HSTRING_VARIABLE;
+			} else if (styler.Match(i, phpStringDelimiter.c_str())) {
+				if (phpStringDelimiter == "\"") {
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+				} else if (lineStartVisibleChars == 1) {
+					const int psdLength = static_cast<int>(phpStringDelimiter.length());
+					if (!IsPhpWordChar(styler.SafeGetCharAt(i + psdLength))) {
+						i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1;
+						styler.ColourTo(i, StateToPrint);
+						state = SCE_HPHP_DEFAULT;
+						if (foldHeredoc) levelCurrent--;
+					}
+				}
+			}
+			break;
+		case SCE_HPHP_SIMPLESTRING:
+			if (phpStringDelimiter == "\'") {
+				if (ch == '\\') {
+					// skip the next char
+					i++;
+				} else if (ch == '\'') {
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+				}
+			} else if (lineStartVisibleChars == 1 && styler.Match(i, phpStringDelimiter.c_str())) {
+				const int psdLength = static_cast<int>(phpStringDelimiter.length());
+				if (!IsPhpWordChar(styler.SafeGetCharAt(i + psdLength))) {
+					i += (((i + psdLength) < lengthDoc) ? psdLength : lengthDoc) - 1;
+					styler.ColourTo(i, StateToPrint);
+					state = SCE_HPHP_DEFAULT;
+					if (foldHeredoc) levelCurrent--;
+				}
+			}
+			break;
+		case SCE_HPHP_HSTRING_VARIABLE:
+			if (!IsPhpWordChar(chNext)) {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_HSTRING;
+			}
+			break;
+		case SCE_HPHP_COMPLEX_VARIABLE:
+			if (ch == '}') {
+				styler.ColourTo(i, StateToPrint);
+				state = SCE_HPHP_HSTRING;
+			}
+			break;
+		case SCE_HPHP_OPERATOR:
+		case SCE_HPHP_DEFAULT:
+			styler.ColourTo(i - 1, StateToPrint);
+			if (IsADigit(ch) || (ch == '.' && IsADigit(chNext))) {
+				state = SCE_HPHP_NUMBER;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HPHP_WORD;
+			} else if (ch == '/' && chNext == '*') {
+				i++;
+				state = SCE_HPHP_COMMENT;
+			} else if (ch == '/' && chNext == '/') {
+				i++;
+				state = SCE_HPHP_COMMENTLINE;
+			} else if (ch == '#' && chNext != '[') {
+				state = SCE_HPHP_COMMENTLINE;
+			} else if (ch == '\"') {
+				state = SCE_HPHP_HSTRING;
+				phpStringDelimiter = "\"";
+			} else if (styler.Match(i, "<<<")) {
+				bool isSimpleString = false;
+				i = FindPhpStringDelimiter(phpStringDelimiter, i + 3, lengthDoc, styler, isSimpleString);
+				if (!phpStringDelimiter.empty()) {
+					state = (isSimpleString ? SCE_HPHP_SIMPLESTRING : SCE_HPHP_HSTRING);
+					if (foldHeredoc) levelCurrent++;
+				}
+			} else if (ch == '\'') {
+				state = SCE_HPHP_SIMPLESTRING;
+				phpStringDelimiter = "\'";
+			} else if (ch == '$' && IsPhpWordStart(chNext)) {
+				state = SCE_HPHP_VARIABLE;
+			} else if (IsOperator(ch)) {
+				state = SCE_HPHP_OPERATOR;
+			} else if ((state == SCE_HPHP_OPERATOR) && (IsASpace(ch))) {
+				state = SCE_HPHP_DEFAULT;
+			}
+			break;
+			///////////// end - PHP state handling
+		}
+
+		// Some of the above terminated their lexeme but since the same character starts
+		// the same class again, only reenter if non empty segment.
+
+		const bool nonEmptySegment = i >= static_cast<Sci_Position>(styler.GetStartSegment());
+		if (state == SCE_HB_DEFAULT) {    // One of the above succeeded
+			if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HB_STRING;
+			} else if (ch == '\'') {
+				state = SCE_HB_COMMENTLINE;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HB_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, SCE_HB_DEFAULT);
+			}
+		} else if (state == SCE_HBA_DEFAULT) {    // One of the above succeeded
+			if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HBA_STRING;
+			} else if (ch == '\'') {
+				state = SCE_HBA_COMMENTLINE;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HBA_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, SCE_HBA_DEFAULT);
+			}
+		} else if (state == SCE_HJ_DEFAULT) {    // One of the above succeeded
+			if (ch == '/' && chNext == '*') {
+				if (styler.SafeGetCharAt(i + 2) == '*')
+					state = SCE_HJ_COMMENTDOC;
+				else
+					state = SCE_HJ_COMMENT;
+			} else if (ch == '/' && chNext == '/') {
+				state = SCE_HJ_COMMENTLINE;
+			} else if ((ch == '\"') && (nonEmptySegment)) {
+				state = SCE_HJ_DOUBLESTRING;
+			} else if ((ch == '\'') && (nonEmptySegment)) {
+				state = SCE_HJ_SINGLESTRING;
+			} else if (IsAWordStart(ch)) {
+				state = SCE_HJ_WORD;
+			} else if (IsOperator(ch)) {
+				styler.ColourTo(i, statePrintForState(SCE_HJ_SYMBOLS, inScriptType));
+			}
+		}
+	}
+
+	switch (state) {
+	case SCE_HJ_WORD:
+		classifyWordHTJS(styler.GetStartSegment(), lengthDoc - 1, keywords2, styler, inScriptType);
+		break;
+	case SCE_HB_WORD:
+		classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, styler, inScriptType);
+		break;
+	case SCE_HP_WORD:
+		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType, isMako);
+		break;
+	case SCE_HPHP_WORD:
+		classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, styler);
+		break;
+	default:
+		StateToPrint = statePrintForState(state, inScriptType);
+		if (static_cast<Sci_Position>(styler.GetStartSegment()) < lengthDoc)
+			styler.ColourTo(lengthDoc - 1, StateToPrint);
+		break;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	if (fold) {
+		const int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+		styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+	}
+	styler.Flush();
+}
+
+LexerModule lmHTML(SCLEX_HTML, LexerHTML::LexerFactoryHTML, "hypertext", htmlWordListDesc);
+LexerModule lmXML(SCLEX_XML, LexerHTML::LexerFactoryXML, "xml", htmlWordListDesc);
+LexerModule lmPHPSCRIPT(SCLEX_PHPSCRIPT, LexerHTML::LexerFactoryPHPScript, "phpscript", phpscriptWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexHaskell.cxx b/scite-app/lexilla/lexers/LexHaskell.cxx
new file mode 100644
index 0000000..8f8ce75
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexHaskell.cxx
@@ -0,0 +1,1119 @@
+/******************************************************************
+ *    LexHaskell.cxx
+ *
+ *    A haskell lexer for the scintilla code control.
+ *    Some stuff "lended" from LexPython.cxx and LexCPP.cxx.
+ *    External lexer stuff inspired from the caml external lexer.
+ *    Folder copied from Python's.
+ *
+ *    Written by Tobias Engvall - tumm at dtek dot chalmers dot se
+ *
+ *    Several bug fixes by Krasimir Angelov - kr.angelov at gmail.com
+ *
+ *    Improved by kudah <kudahkukarek@gmail.com>
+ *
+ *    TODO:
+ *    * A proper lexical folder to fold group declarations, comments, pragmas,
+ *      #ifdefs, explicit layout, lists, tuples, quasi-quotes, splces, etc, etc,
+ *      etc.
+ *
+ *****************************************************************/
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+// See https://github.com/ghc/ghc/blob/master/compiler/parser/Lexer.x#L1682
+// Note, letter modifiers are prohibited.
+
+static int u_iswupper (int ch) {
+   CharacterCategory c = CategoriseCharacter(ch);
+   return c == ccLu || c == ccLt;
+}
+
+static int u_iswalpha (int ch) {
+   CharacterCategory c = CategoriseCharacter(ch);
+   return c == ccLl || c == ccLu || c == ccLt || c == ccLo;
+}
+
+static int u_iswalnum (int ch) {
+   CharacterCategory c = CategoriseCharacter(ch);
+   return c == ccLl || c == ccLu || c == ccLt || c == ccLo
+       || c == ccNd || c == ccNo;
+}
+
+static int u_IsHaskellSymbol(int ch) {
+   CharacterCategory c = CategoriseCharacter(ch);
+   return c == ccPc || c == ccPd || c == ccPo
+       || c == ccSm || c == ccSc || c == ccSk || c == ccSo;
+}
+
+static inline bool IsHaskellLetter(const int ch) {
+   if (IsASCII(ch)) {
+      return (ch >= 'a' && ch <= 'z')
+          || (ch >= 'A' && ch <= 'Z');
+   } else {
+      return u_iswalpha(ch) != 0;
+   }
+}
+
+static inline bool IsHaskellAlphaNumeric(const int ch) {
+   if (IsASCII(ch)) {
+      return IsAlphaNumeric(ch);
+   } else {
+      return u_iswalnum(ch) != 0;
+   }
+}
+
+static inline bool IsHaskellUpperCase(const int ch) {
+   if (IsASCII(ch)) {
+      return ch >= 'A' && ch <= 'Z';
+   } else {
+      return u_iswupper(ch) != 0;
+   }
+}
+
+static inline bool IsAnHaskellOperatorChar(const int ch) {
+   if (IsASCII(ch)) {
+      return
+         (  ch == '!' || ch == '#' || ch == '$' || ch == '%'
+         || ch == '&' || ch == '*' || ch == '+' || ch == '-'
+         || ch == '.' || ch == '/' || ch == ':' || ch == '<'
+         || ch == '=' || ch == '>' || ch == '?' || ch == '@'
+         || ch == '^' || ch == '|' || ch == '~' || ch == '\\');
+   } else {
+      return u_IsHaskellSymbol(ch) != 0;
+   }
+}
+
+static inline bool IsAHaskellWordStart(const int ch) {
+   return IsHaskellLetter(ch) || ch == '_';
+}
+
+static inline bool IsAHaskellWordChar(const int ch) {
+   return (  IsHaskellAlphaNumeric(ch)
+          || ch == '_'
+          || ch == '\'');
+}
+
+static inline bool IsCommentBlockStyle(int style) {
+   return (style >= SCE_HA_COMMENTBLOCK && style <= SCE_HA_COMMENTBLOCK3);
+}
+
+static inline bool IsCommentStyle(int style) {
+   return (style >= SCE_HA_COMMENTLINE && style <= SCE_HA_COMMENTBLOCK3)
+       || ( style == SCE_HA_LITERATE_COMMENT
+         || style == SCE_HA_LITERATE_CODEDELIM);
+}
+
+// styles which do not belong to Haskell, but to external tools
+static inline bool IsExternalStyle(int style) {
+   return ( style == SCE_HA_PREPROCESSOR
+         || style == SCE_HA_LITERATE_COMMENT
+         || style == SCE_HA_LITERATE_CODEDELIM);
+}
+
+static inline int CommentBlockStyleFromNestLevel(const unsigned int nestLevel) {
+   return SCE_HA_COMMENTBLOCK + (nestLevel % 3);
+}
+
+// Mangled version of lexlib/Accessor.cxx IndentAmount.
+// Modified to treat comment blocks as whitespace
+// plus special case for commentline/preprocessor.
+static int HaskellIndentAmount(Accessor &styler, const Sci_Position line) {
+
+   // Determines the indentation level of the current line
+   // Comment blocks are treated as whitespace
+
+   Sci_Position pos = styler.LineStart(line);
+   Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+
+   char ch = styler[pos];
+   int style = styler.StyleAt(pos);
+
+   int indent = 0;
+   bool inPrevPrefix = line > 0;
+
+   Sci_Position posPrev = inPrevPrefix ? styler.LineStart(line-1) : 0;
+
+   while ((  ch == ' ' || ch == '\t'
+          || IsCommentBlockStyle(style)
+          || style == SCE_HA_LITERATE_CODEDELIM)
+         && (pos < eol_pos)) {
+      if (inPrevPrefix) {
+         char chPrev = styler[posPrev++];
+         if (chPrev != ' ' && chPrev != '\t') {
+            inPrevPrefix = false;
+         }
+      }
+      if (ch == '\t') {
+         indent = (indent / 8 + 1) * 8;
+      } else { // Space or comment block
+         indent++;
+      }
+      pos++;
+      ch = styler[pos];
+      style = styler.StyleAt(pos);
+   }
+
+   indent += SC_FOLDLEVELBASE;
+   // if completely empty line or the start of a comment or preprocessor...
+   if (  styler.LineStart(line) == styler.Length()
+      || ch == ' '
+      || ch == '\t'
+      || ch == '\n'
+      || ch == '\r'
+      || IsCommentStyle(style)
+      || style == SCE_HA_PREPROCESSOR)
+      return indent | SC_FOLDLEVELWHITEFLAG;
+   else
+      return indent;
+}
+
+struct OptionsHaskell {
+   bool magicHash;
+   bool allowQuotes;
+   bool implicitParams;
+   bool highlightSafe;
+   bool cpp;
+   bool stylingWithinPreprocessor;
+   bool fold;
+   bool foldComment;
+   bool foldCompact;
+   bool foldImports;
+   OptionsHaskell() {
+      magicHash = true;       // Widespread use, enabled by default.
+      allowQuotes = true;     // Widespread use, enabled by default.
+      implicitParams = false; // Fell out of favor, seldom used, disabled.
+      highlightSafe = true;   // Moderately used, doesn't hurt to enable.
+      cpp = true;             // Widespread use, enabled by default;
+      stylingWithinPreprocessor = false;
+      fold = false;
+      foldComment = false;
+      foldCompact = false;
+      foldImports = false;
+   }
+};
+
+static const char * const haskellWordListDesc[] = {
+   "Keywords",
+   "FFI",
+   "Reserved operators",
+   0
+};
+
+struct OptionSetHaskell : public OptionSet<OptionsHaskell> {
+   OptionSetHaskell() {
+      DefineProperty("lexer.haskell.allow.hash", &OptionsHaskell::magicHash,
+         "Set to 0 to disallow the '#' character at the end of identifiers and "
+         "literals with the haskell lexer "
+         "(GHC -XMagicHash extension)");
+
+      DefineProperty("lexer.haskell.allow.quotes", &OptionsHaskell::allowQuotes,
+         "Set to 0 to disable highlighting of Template Haskell name quotations "
+         "and promoted constructors "
+         "(GHC -XTemplateHaskell and -XDataKinds extensions)");
+
+      DefineProperty("lexer.haskell.allow.questionmark", &OptionsHaskell::implicitParams,
+         "Set to 1 to allow the '?' character at the start of identifiers "
+         "with the haskell lexer "
+         "(GHC & Hugs -XImplicitParams extension)");
+
+      DefineProperty("lexer.haskell.import.safe", &OptionsHaskell::highlightSafe,
+         "Set to 0 to disallow \"safe\" keyword in imports "
+         "(GHC -XSafe, -XTrustworthy, -XUnsafe extensions)");
+
+      DefineProperty("lexer.haskell.cpp", &OptionsHaskell::cpp,
+         "Set to 0 to disable C-preprocessor highlighting "
+         "(-XCPP extension)");
+
+      DefineProperty("styling.within.preprocessor", &OptionsHaskell::stylingWithinPreprocessor,
+         "For Haskell code, determines whether all preprocessor code is styled in the "
+         "preprocessor style (0, the default) or only from the initial # to the end "
+         "of the command word(1)."
+         );
+
+      DefineProperty("fold", &OptionsHaskell::fold);
+
+      DefineProperty("fold.comment", &OptionsHaskell::foldComment);
+
+      DefineProperty("fold.compact", &OptionsHaskell::foldCompact);
+
+      DefineProperty("fold.haskell.imports", &OptionsHaskell::foldImports,
+         "Set to 1 to enable folding of import declarations");
+
+      DefineWordListSets(haskellWordListDesc);
+   }
+};
+
+class LexerHaskell : public DefaultLexer {
+   bool literate;
+   Sci_Position firstImportLine;
+   int firstImportIndent;
+   WordList keywords;
+   WordList ffi;
+   WordList reserved_operators;
+   OptionsHaskell options;
+   OptionSetHaskell osHaskell;
+
+   enum HashCount {
+       oneHash
+      ,twoHashes
+      ,unlimitedHashes
+   };
+
+   enum KeywordMode {
+       HA_MODE_DEFAULT = 0
+      ,HA_MODE_IMPORT1 = 1 // after "import", before "qualified" or "safe" or package name or module name.
+      ,HA_MODE_IMPORT2 = 2 // after module name, before "as" or "hiding".
+      ,HA_MODE_IMPORT3 = 3 // after "as", before "hiding"
+      ,HA_MODE_MODULE  = 4 // after "module", before module name.
+      ,HA_MODE_FFI     = 5 // after "foreign", before FFI keywords
+      ,HA_MODE_TYPE    = 6 // after "type" or "data", before "family"
+   };
+
+   enum LiterateMode {
+       LITERATE_BIRD  = 0 // if '>' is the first character on the line,
+                          //   color '>' as a codedelim and the rest of
+                          //   the line as code.
+                          // else if "\begin{code}" is the only word on the
+                          //    line except whitespace, switch to LITERATE_BLOCK
+                          // otherwise color the line as a literate comment.
+      ,LITERATE_BLOCK = 1 // if the string "\end{code}" is encountered at column
+                          //   0 ignoring all later characters, color the line
+                          //   as a codedelim and switch to LITERATE_BIRD
+                          // otherwise color the line as code.
+   };
+
+   struct HaskellLineInfo {
+      unsigned int nestLevel; // 22 bits ought to be enough for anybody
+      unsigned int nonexternalStyle; // 5 bits, widen if number of styles goes
+                                     // beyond 31.
+      bool pragma;
+      LiterateMode lmode;
+      KeywordMode mode;
+
+      HaskellLineInfo(int state) :
+         nestLevel (state >> 10)
+       , nonexternalStyle ((state >> 5) & 0x1F)
+       , pragma ((state >> 4) & 0x1)
+       , lmode (static_cast<LiterateMode>((state >> 3) & 0x1))
+       , mode (static_cast<KeywordMode>(state & 0x7))
+         {}
+
+      int ToLineState() {
+         return
+              (nestLevel << 10)
+            | (nonexternalStyle << 5)
+            | (pragma << 4)
+            | (lmode << 3)
+            | mode;
+      }
+   };
+
+   inline void skipMagicHash(StyleContext &sc, const HashCount hashes) const {
+      if (options.magicHash && sc.ch == '#') {
+         sc.Forward();
+         if (hashes == twoHashes && sc.ch == '#') {
+            sc.Forward();
+         } else if (hashes == unlimitedHashes) {
+            while (sc.ch == '#') {
+               sc.Forward();
+            }
+         }
+      }
+   }
+
+   bool LineContainsImport(const Sci_Position line, Accessor &styler) const {
+      if (options.foldImports) {
+         Sci_Position currentPos = styler.LineStart(line);
+         int style = styler.StyleAt(currentPos);
+
+         Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+
+         while (currentPos < eol_pos) {
+            int ch = styler[currentPos];
+            style = styler.StyleAt(currentPos);
+
+            if (ch == ' ' || ch == '\t'
+             || IsCommentBlockStyle(style)
+             || style == SCE_HA_LITERATE_CODEDELIM) {
+               currentPos++;
+            } else {
+               break;
+            }
+         }
+
+         return (style == SCE_HA_KEYWORD
+              && styler.Match(currentPos, "import"));
+      } else {
+         return false;
+      }
+   }
+
+   inline int IndentAmountWithOffset(Accessor &styler, const Sci_Position line) const {
+      const int indent = HaskellIndentAmount(styler, line);
+      const int indentLevel = indent & SC_FOLDLEVELNUMBERMASK;
+      return indentLevel <= ((firstImportIndent - 1) + SC_FOLDLEVELBASE)
+               ? indent
+               : (indentLevel + firstImportIndent) | (indent & ~SC_FOLDLEVELNUMBERMASK);
+   }
+
+   inline int IndentLevelRemoveIndentOffset(const int indentLevel) const {
+      return indentLevel <= ((firstImportIndent - 1) + SC_FOLDLEVELBASE)
+            ? indentLevel
+            : indentLevel - firstImportIndent;
+   }
+
+public:
+   LexerHaskell(bool literate_)
+      : DefaultLexer(literate_ ? "literatehaskell" : "haskell", literate_ ? SCLEX_LITERATEHASKELL : SCLEX_HASKELL)
+	  , literate(literate_)
+      , firstImportLine(-1)
+      , firstImportIndent(0)
+      {}
+   virtual ~LexerHaskell() {}
+
+   void SCI_METHOD Release() override {
+      delete this;
+   }
+
+   int SCI_METHOD Version() const override {
+      return lvRelease5;
+   }
+
+   const char * SCI_METHOD PropertyNames() override {
+      return osHaskell.PropertyNames();
+   }
+
+   int SCI_METHOD PropertyType(const char *name) override {
+      return osHaskell.PropertyType(name);
+   }
+
+   const char * SCI_METHOD DescribeProperty(const char *name) override {
+      return osHaskell.DescribeProperty(name);
+   }
+
+   Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+
+   const char * SCI_METHOD PropertyGet(const char *key) override {
+	   return osHaskell.PropertyGet(key);
+   }
+
+   const char * SCI_METHOD DescribeWordListSets() override {
+      return osHaskell.DescribeWordListSets();
+   }
+
+   Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+
+   void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+   void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+   void * SCI_METHOD PrivateCall(int, void *) override {
+      return 0;
+   }
+
+   static ILexer5 *LexerFactoryHaskell() {
+      return new LexerHaskell(false);
+   }
+
+   static ILexer5 *LexerFactoryLiterateHaskell() {
+      return new LexerHaskell(true);
+   }
+};
+
+Sci_Position SCI_METHOD LexerHaskell::PropertySet(const char *key, const char *val) {
+   if (osHaskell.PropertySet(&options, key, val)) {
+      return 0;
+   }
+   return -1;
+}
+
+Sci_Position SCI_METHOD LexerHaskell::WordListSet(int n, const char *wl) {
+   WordList *wordListN = 0;
+   switch (n) {
+   case 0:
+      wordListN = &keywords;
+      break;
+   case 1:
+      wordListN = &ffi;
+      break;
+   case 2:
+      wordListN = &reserved_operators;
+      break;
+   }
+   Sci_Position firstModification = -1;
+   if (wordListN) {
+      WordList wlNew;
+      wlNew.Set(wl);
+      if (*wordListN != wlNew) {
+         wordListN->Set(wl);
+         firstModification = 0;
+      }
+   }
+   return firstModification;
+}
+
+void SCI_METHOD LexerHaskell::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle
+                                 ,IDocument *pAccess) {
+   LexAccessor styler(pAccess);
+
+   Sci_Position lineCurrent = styler.GetLine(startPos);
+
+   HaskellLineInfo hs = HaskellLineInfo(lineCurrent ? styler.GetLineState(lineCurrent-1) : 0);
+
+   // Do not leak onto next line
+   if (initStyle == SCE_HA_STRINGEOL)
+      initStyle = SCE_HA_DEFAULT;
+   else if (initStyle == SCE_HA_LITERATE_CODEDELIM)
+      initStyle = hs.nonexternalStyle;
+
+   StyleContext sc(startPos, length, initStyle, styler);
+
+   int base = 10;
+   bool dot = false;
+
+   bool inDashes = false;
+   bool alreadyInTheMiddleOfOperator = false;
+
+   assert(!(IsCommentBlockStyle(initStyle) && hs.nestLevel == 0));
+
+   while (sc.More()) {
+      // Check for state end
+
+      if (!IsExternalStyle(sc.state)) {
+         hs.nonexternalStyle = sc.state;
+      }
+
+      // For lexer to work, states should unconditionally forward at least one
+      // character.
+      // If they don't, they should still check if they are at line end and
+      // forward if so.
+      // If a state forwards more than one character, it should check every time
+      // that it is not a line end and cease forwarding otherwise.
+      if (sc.atLineEnd) {
+         // Remember the line state for future incremental lexing
+         styler.SetLineState(lineCurrent, hs.ToLineState());
+         lineCurrent++;
+      }
+
+      // Handle line continuation generically.
+      if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r')
+         && (  sc.state == SCE_HA_STRING
+            || sc.state == SCE_HA_PREPROCESSOR)) {
+         // Remember the line state for future incremental lexing
+         styler.SetLineState(lineCurrent, hs.ToLineState());
+         lineCurrent++;
+
+         sc.Forward();
+         if (sc.ch == '\r' && sc.chNext == '\n') {
+            sc.Forward();
+         }
+         sc.Forward();
+
+         continue;
+      }
+
+      if (sc.atLineStart) {
+
+         if (sc.state == SCE_HA_STRING || sc.state == SCE_HA_CHARACTER) {
+            // Prevent SCE_HA_STRINGEOL from leaking back to previous line
+            sc.SetState(sc.state);
+         }
+
+         if (literate && hs.lmode == LITERATE_BIRD) {
+            if (!IsExternalStyle(sc.state)) {
+               sc.SetState(SCE_HA_LITERATE_COMMENT);
+            }
+         }
+      }
+
+      // External
+         // Literate
+      if (  literate && hs.lmode == LITERATE_BIRD && sc.atLineStart
+         && sc.ch == '>') {
+            sc.SetState(SCE_HA_LITERATE_CODEDELIM);
+            sc.ForwardSetState(hs.nonexternalStyle);
+      }
+      else if (literate && hs.lmode == LITERATE_BIRD && sc.atLineStart
+            && (  sc.ch == ' ' || sc.ch == '\t'
+               || sc.Match("\\begin{code}"))) {
+         sc.SetState(sc.state);
+
+         while ((sc.ch == ' ' || sc.ch == '\t') && sc.More())
+            sc.Forward();
+
+         if (sc.Match("\\begin{code}")) {
+            sc.Forward(static_cast<int>(strlen("\\begin{code}")));
+
+            bool correct = true;
+
+            while (!sc.atLineEnd && sc.More()) {
+               if (sc.ch != ' ' && sc.ch != '\t') {
+                  correct = false;
+               }
+               sc.Forward();
+            }
+
+            if (correct) {
+               sc.ChangeState(SCE_HA_LITERATE_CODEDELIM); // color the line end
+               hs.lmode = LITERATE_BLOCK;
+            }
+         }
+      }
+      else if (literate && hs.lmode == LITERATE_BLOCK && sc.atLineStart
+            && sc.Match("\\end{code}")) {
+         sc.SetState(SCE_HA_LITERATE_CODEDELIM);
+
+         sc.Forward(static_cast<int>(strlen("\\end{code}")));
+
+         while (!sc.atLineEnd && sc.More()) {
+            sc.Forward();
+         }
+
+         sc.SetState(SCE_HA_LITERATE_COMMENT);
+         hs.lmode = LITERATE_BIRD;
+      }
+         // Preprocessor
+      else if (sc.atLineStart && sc.ch == '#' && options.cpp
+            && (!options.stylingWithinPreprocessor || sc.state == SCE_HA_DEFAULT)) {
+         sc.SetState(SCE_HA_PREPROCESSOR);
+         sc.Forward();
+      }
+            // Literate
+      else if (sc.state == SCE_HA_LITERATE_COMMENT) {
+         sc.Forward();
+      }
+      else if (sc.state == SCE_HA_LITERATE_CODEDELIM) {
+         sc.ForwardSetState(hs.nonexternalStyle);
+      }
+            // Preprocessor
+      else if (sc.state == SCE_HA_PREPROCESSOR) {
+         if (sc.atLineEnd) {
+            sc.SetState(options.stylingWithinPreprocessor
+                        ? SCE_HA_DEFAULT
+                        : hs.nonexternalStyle);
+            sc.Forward(); // prevent double counting a line
+         } else if (options.stylingWithinPreprocessor && !IsHaskellLetter(sc.ch)) {
+            sc.SetState(SCE_HA_DEFAULT);
+         } else {
+            sc.Forward();
+         }
+      }
+      // Haskell
+         // Operator
+      else if (sc.state == SCE_HA_OPERATOR) {
+         int style = SCE_HA_OPERATOR;
+
+         if ( sc.ch == ':'
+            && !alreadyInTheMiddleOfOperator
+            // except "::"
+            && !( sc.chNext == ':'
+               && !IsAnHaskellOperatorChar(sc.GetRelative(2)))) {
+            style = SCE_HA_CAPITAL;
+         }
+
+         alreadyInTheMiddleOfOperator = false;
+
+         while (IsAnHaskellOperatorChar(sc.ch))
+               sc.Forward();
+
+         char s[100];
+         sc.GetCurrent(s, sizeof(s));
+
+         if (reserved_operators.InList(s))
+            style = SCE_HA_RESERVED_OPERATOR;
+
+         sc.ChangeState(style);
+         sc.SetState(SCE_HA_DEFAULT);
+      }
+         // String
+      else if (sc.state == SCE_HA_STRING) {
+         if (sc.atLineEnd) {
+            sc.ChangeState(SCE_HA_STRINGEOL);
+            sc.ForwardSetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\"') {
+            sc.Forward();
+            skipMagicHash(sc, oneHash);
+            sc.SetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\\') {
+            sc.Forward(2);
+         } else {
+            sc.Forward();
+         }
+      }
+         // Char
+      else if (sc.state == SCE_HA_CHARACTER) {
+         if (sc.atLineEnd) {
+            sc.ChangeState(SCE_HA_STRINGEOL);
+            sc.ForwardSetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\'') {
+            sc.Forward();
+            skipMagicHash(sc, oneHash);
+            sc.SetState(SCE_HA_DEFAULT);
+         } else if (sc.ch == '\\') {
+            sc.Forward(2);
+         } else {
+            sc.Forward();
+         }
+      }
+         // Number
+      else if (sc.state == SCE_HA_NUMBER) {
+         if (sc.atLineEnd) {
+            sc.SetState(SCE_HA_DEFAULT);
+            sc.Forward(); // prevent double counting a line
+         } else if (IsADigit(sc.ch, base)) {
+            sc.Forward();
+         } else if (sc.ch=='.' && dot && IsADigit(sc.chNext, base)) {
+            sc.Forward(2);
+            dot = false;
+         } else if ((base == 10) &&
+                    (sc.ch == 'e' || sc.ch == 'E') &&
+                    (IsADigit(sc.chNext) || sc.chNext == '+' || sc.chNext == '-')) {
+            sc.Forward();
+            if (sc.ch == '+' || sc.ch == '-')
+                sc.Forward();
+         } else {
+            skipMagicHash(sc, twoHashes);
+            sc.SetState(SCE_HA_DEFAULT);
+         }
+      }
+         // Keyword or Identifier
+      else if (sc.state == SCE_HA_IDENTIFIER) {
+         int style = IsHaskellUpperCase(sc.ch) ? SCE_HA_CAPITAL : SCE_HA_IDENTIFIER;
+
+         assert(IsAHaskellWordStart(sc.ch));
+
+         sc.Forward();
+
+         while (sc.More()) {
+            if (IsAHaskellWordChar(sc.ch)) {
+               sc.Forward();
+            } else if (sc.ch == '.' && style == SCE_HA_CAPITAL) {
+               if (IsHaskellUpperCase(sc.chNext)) {
+                  sc.Forward();
+                  style = SCE_HA_CAPITAL;
+               } else if (IsAHaskellWordStart(sc.chNext)) {
+                  sc.Forward();
+                  style = SCE_HA_IDENTIFIER;
+               } else if (IsAnHaskellOperatorChar(sc.chNext)) {
+                  sc.Forward();
+                  style = sc.ch == ':' ? SCE_HA_CAPITAL : SCE_HA_OPERATOR;
+                  while (IsAnHaskellOperatorChar(sc.ch))
+                     sc.Forward();
+                  break;
+               } else {
+                  break;
+               }
+            } else {
+               break;
+            }
+         }
+
+         skipMagicHash(sc, unlimitedHashes);
+
+         char s[100];
+         sc.GetCurrent(s, sizeof(s));
+
+         KeywordMode new_mode = HA_MODE_DEFAULT;
+
+         if (keywords.InList(s)) {
+            style = SCE_HA_KEYWORD;
+         } else if (style == SCE_HA_CAPITAL) {
+            if (hs.mode == HA_MODE_IMPORT1 || hs.mode == HA_MODE_IMPORT3) {
+               style    = SCE_HA_MODULE;
+               new_mode = HA_MODE_IMPORT2;
+            } else if (hs.mode == HA_MODE_MODULE) {
+               style = SCE_HA_MODULE;
+            }
+         } else if (hs.mode == HA_MODE_IMPORT1 &&
+                    strcmp(s,"qualified") == 0) {
+             style    = SCE_HA_KEYWORD;
+             new_mode = HA_MODE_IMPORT1;
+         } else if (options.highlightSafe &&
+                    hs.mode == HA_MODE_IMPORT1 &&
+                    strcmp(s,"safe") == 0) {
+             style    = SCE_HA_KEYWORD;
+             new_mode = HA_MODE_IMPORT1;
+         } else if (hs.mode == HA_MODE_IMPORT2) {
+             if (strcmp(s,"as") == 0) {
+                style    = SCE_HA_KEYWORD;
+                new_mode = HA_MODE_IMPORT3;
+            } else if (strcmp(s,"hiding") == 0) {
+                style     = SCE_HA_KEYWORD;
+            }
+         } else if (hs.mode == HA_MODE_TYPE) {
+            if (strcmp(s,"family") == 0)
+               style    = SCE_HA_KEYWORD;
+         }
+
+         if (hs.mode == HA_MODE_FFI) {
+            if (ffi.InList(s)) {
+               style = SCE_HA_KEYWORD;
+               new_mode = HA_MODE_FFI;
+            }
+         }
+
+         sc.ChangeState(style);
+         sc.SetState(SCE_HA_DEFAULT);
+
+         if (strcmp(s,"import") == 0 && hs.mode != HA_MODE_FFI)
+            new_mode = HA_MODE_IMPORT1;
+         else if (strcmp(s,"module") == 0)
+            new_mode = HA_MODE_MODULE;
+         else if (strcmp(s,"foreign") == 0)
+            new_mode = HA_MODE_FFI;
+         else if (strcmp(s,"type") == 0
+               || strcmp(s,"data") == 0)
+            new_mode = HA_MODE_TYPE;
+
+         hs.mode = new_mode;
+      }
+
+         // Comments
+            // Oneliner
+      else if (sc.state == SCE_HA_COMMENTLINE) {
+         if (sc.atLineEnd) {
+            sc.SetState(hs.pragma ? SCE_HA_PRAGMA : SCE_HA_DEFAULT);
+            sc.Forward(); // prevent double counting a line
+         } else if (inDashes && sc.ch != '-' && !hs.pragma) {
+            inDashes = false;
+            if (IsAnHaskellOperatorChar(sc.ch)) {
+               alreadyInTheMiddleOfOperator = true;
+               sc.ChangeState(SCE_HA_OPERATOR);
+            }
+         } else {
+            sc.Forward();
+         }
+      }
+            // Nested
+      else if (IsCommentBlockStyle(sc.state)) {
+         if (sc.Match('{','-')) {
+            sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel));
+            sc.Forward(2);
+            hs.nestLevel++;
+         } else if (sc.Match('-','}')) {
+            sc.Forward(2);
+            assert(hs.nestLevel > 0);
+            if (hs.nestLevel > 0)
+               hs.nestLevel--;
+            sc.SetState(
+               hs.nestLevel == 0
+                  ? (hs.pragma ? SCE_HA_PRAGMA : SCE_HA_DEFAULT)
+                  : CommentBlockStyleFromNestLevel(hs.nestLevel - 1));
+         } else {
+            sc.Forward();
+         }
+      }
+            // Pragma
+      else if (sc.state == SCE_HA_PRAGMA) {
+         if (sc.Match("#-}")) {
+            hs.pragma = false;
+            sc.Forward(3);
+            sc.SetState(SCE_HA_DEFAULT);
+         } else if (sc.Match('-','-')) {
+            sc.SetState(SCE_HA_COMMENTLINE);
+            sc.Forward(2);
+            inDashes = false;
+         } else if (sc.Match('{','-')) {
+            sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel));
+            sc.Forward(2);
+            hs.nestLevel = 1;
+         } else {
+            sc.Forward();
+         }
+      }
+            // New state?
+      else if (sc.state == SCE_HA_DEFAULT) {
+         // Digit
+         if (IsADigit(sc.ch)) {
+            hs.mode = HA_MODE_DEFAULT;
+
+            sc.SetState(SCE_HA_NUMBER);
+            if (sc.ch == '0' && (sc.chNext == 'X' || sc.chNext == 'x')) {
+               // Match anything starting with "0x" or "0X", too
+               sc.Forward(2);
+               base = 16;
+               dot = false;
+            } else if (sc.ch == '0' && (sc.chNext == 'O' || sc.chNext == 'o')) {
+               // Match anything starting with "0o" or "0O", too
+               sc.Forward(2);
+               base = 8;
+               dot = false;
+            } else {
+               sc.Forward();
+               base = 10;
+               dot = true;
+            }
+         }
+         // Pragma
+         else if (sc.Match("{-#")) {
+            hs.pragma = true;
+            sc.SetState(SCE_HA_PRAGMA);
+            sc.Forward(3);
+         }
+         // Comment line
+         else if (sc.Match('-','-')) {
+            sc.SetState(SCE_HA_COMMENTLINE);
+            sc.Forward(2);
+            inDashes = true;
+         }
+         // Comment block
+         else if (sc.Match('{','-')) {
+            sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel));
+            sc.Forward(2);
+            hs.nestLevel = 1;
+         }
+         // String
+         else if (sc.ch == '\"') {
+            sc.SetState(SCE_HA_STRING);
+            sc.Forward();
+         }
+         // Character or quoted name or promoted term
+         else if (sc.ch == '\'') {
+            hs.mode = HA_MODE_DEFAULT;
+
+            sc.SetState(SCE_HA_CHARACTER);
+            sc.Forward();
+
+            if (options.allowQuotes) {
+               // Quoted type ''T
+               if (sc.ch=='\'' && IsAHaskellWordStart(sc.chNext)) {
+                  sc.Forward();
+                  sc.ChangeState(SCE_HA_IDENTIFIER);
+               } else if (sc.chNext != '\'') {
+                  // Quoted name 'n or promoted constructor 'N
+                  if (IsAHaskellWordStart(sc.ch)) {
+                     sc.ChangeState(SCE_HA_IDENTIFIER);
+                  // Promoted constructor operator ':~>
+                  } else if (sc.ch == ':') {
+                     alreadyInTheMiddleOfOperator = false;
+                     sc.ChangeState(SCE_HA_OPERATOR);
+                  // Promoted list or tuple '[T]
+                  } else if (sc.ch == '[' || sc.ch== '(') {
+                     sc.ChangeState(SCE_HA_OPERATOR);
+                     sc.ForwardSetState(SCE_HA_DEFAULT);
+                  }
+               }
+            }
+         }
+         // Operator starting with '?' or an implicit parameter
+         else if (sc.ch == '?') {
+            hs.mode = HA_MODE_DEFAULT;
+
+            alreadyInTheMiddleOfOperator = false;
+            sc.SetState(SCE_HA_OPERATOR);
+
+            if (  options.implicitParams
+               && IsAHaskellWordStart(sc.chNext)
+               && !IsHaskellUpperCase(sc.chNext)) {
+               sc.Forward();
+               sc.ChangeState(SCE_HA_IDENTIFIER);
+            }
+         }
+         // Operator
+         else if (IsAnHaskellOperatorChar(sc.ch)) {
+            hs.mode = HA_MODE_DEFAULT;
+
+            sc.SetState(SCE_HA_OPERATOR);
+         }
+         // Braces and punctuation
+         else if (sc.ch == ',' || sc.ch == ';'
+               || sc.ch == '(' || sc.ch == ')'
+               || sc.ch == '[' || sc.ch == ']'
+               || sc.ch == '{' || sc.ch == '}') {
+            sc.SetState(SCE_HA_OPERATOR);
+            sc.ForwardSetState(SCE_HA_DEFAULT);
+         }
+         // Keyword or Identifier
+         else if (IsAHaskellWordStart(sc.ch)) {
+            sc.SetState(SCE_HA_IDENTIFIER);
+         // Something we don't care about
+         } else {
+            sc.Forward();
+         }
+      }
+            // This branch should never be reached.
+      else {
+         assert(false);
+         sc.Forward();
+      }
+   }
+   sc.Complete();
+}
+
+void SCI_METHOD LexerHaskell::Fold(Sci_PositionU startPos, Sci_Position length, int // initStyle
+                                  ,IDocument *pAccess) {
+   if (!options.fold)
+      return;
+
+   Accessor styler(pAccess, NULL);
+
+   Sci_Position lineCurrent = styler.GetLine(startPos);
+
+   if (lineCurrent <= firstImportLine) {
+      firstImportLine = -1; // readjust first import position
+      firstImportIndent = 0;
+   }
+
+   const Sci_Position maxPos = startPos + length;
+   const Sci_Position maxLines =
+      maxPos == styler.Length()
+         ? styler.GetLine(maxPos)
+         : styler.GetLine(maxPos - 1);  // Requested last line
+   const Sci_Position docLines = styler.GetLine(styler.Length()); // Available last line
+
+   // Backtrack to previous non-blank line so we can determine indent level
+   // for any white space lines
+   // and so we can fix any preceding fold level (which is why we go back
+   // at least one line in all cases)
+   bool importHere = LineContainsImport(lineCurrent, styler);
+   int indentCurrent = IndentAmountWithOffset(styler, lineCurrent);
+
+   while (lineCurrent > 0) {
+      lineCurrent--;
+      importHere = LineContainsImport(lineCurrent, styler);
+      indentCurrent = IndentAmountWithOffset(styler, lineCurrent);
+      if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG))
+         break;
+   }
+
+   int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+   if (importHere) {
+      indentCurrentLevel = IndentLevelRemoveIndentOffset(indentCurrentLevel);
+      if (firstImportLine == -1) {
+         firstImportLine = lineCurrent;
+         firstImportIndent = (1 + indentCurrentLevel) - SC_FOLDLEVELBASE;
+      }
+      if (firstImportLine != lineCurrent) {
+         indentCurrentLevel++;
+      }
+   }
+
+   indentCurrent = indentCurrentLevel | (indentCurrent & ~SC_FOLDLEVELNUMBERMASK);
+
+   // Process all characters to end of requested range
+   //that hangs over the end of the range.  Cap processing in all cases
+   // to end of document.
+   while (lineCurrent <= docLines && lineCurrent <= maxLines) {
+
+      // Gather info
+      Sci_Position lineNext = lineCurrent + 1;
+      importHere = false;
+      int indentNext = indentCurrent;
+
+      if (lineNext <= docLines) {
+         // Information about next line is only available if not at end of document
+         importHere = LineContainsImport(lineNext, styler);
+         indentNext = IndentAmountWithOffset(styler, lineNext);
+      }
+      if (indentNext & SC_FOLDLEVELWHITEFLAG)
+         indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+      // Skip past any blank lines for next indent level info; we skip also
+      // comments (all comments, not just those starting in column 0)
+      // which effectively folds them into surrounding code rather
+      // than screwing up folding.
+
+      while (lineNext < docLines && (indentNext & SC_FOLDLEVELWHITEFLAG)) {
+         lineNext++;
+         importHere = LineContainsImport(lineNext, styler);
+         indentNext = IndentAmountWithOffset(styler, lineNext);
+      }
+
+      int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK;
+
+      if (importHere) {
+         indentNextLevel = IndentLevelRemoveIndentOffset(indentNextLevel);
+         if (firstImportLine == -1) {
+            firstImportLine = lineNext;
+            firstImportIndent = (1 + indentNextLevel) - SC_FOLDLEVELBASE;
+         }
+         if (firstImportLine != lineNext) {
+            indentNextLevel++;
+         }
+      }
+
+      indentNext = indentNextLevel | (indentNext & ~SC_FOLDLEVELNUMBERMASK);
+
+      const int levelBeforeComments = Maximum(indentCurrentLevel,indentNextLevel);
+
+      // Now set all the indent levels on the lines we skipped
+      // Do this from end to start.  Once we encounter one line
+      // which is indented more than the line after the end of
+      // the comment-block, use the level of the block before
+
+      Sci_Position skipLine = lineNext;
+      int skipLevel = indentNextLevel;
+
+      while (--skipLine > lineCurrent) {
+         int skipLineIndent = IndentAmountWithOffset(styler, skipLine);
+
+         if (options.foldCompact) {
+            if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel) {
+               skipLevel = levelBeforeComments;
+            }
+
+            int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+            styler.SetLevel(skipLine, skipLevel | whiteFlag);
+         } else {
+            if (  (skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel
+               && !(skipLineIndent & SC_FOLDLEVELWHITEFLAG)) {
+               skipLevel = levelBeforeComments;
+            }
+
+            styler.SetLevel(skipLine, skipLevel);
+         }
+      }
+
+      int lev = indentCurrent;
+
+      if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+         if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+            lev |= SC_FOLDLEVELHEADERFLAG;
+      }
+
+      // Set fold level for this line and move to next line
+      styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG);
+
+      indentCurrent = indentNext;
+      indentCurrentLevel = indentNextLevel;
+      lineCurrent = lineNext;
+   }
+
+   // NOTE: Cannot set level of last line here because indentCurrent doesn't have
+   // header flag set; the loop above is crafted to take care of this case!
+   //styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+LexerModule lmHaskell(SCLEX_HASKELL, LexerHaskell::LexerFactoryHaskell, "haskell", haskellWordListDesc);
+LexerModule lmLiterateHaskell(SCLEX_LITERATEHASKELL, LexerHaskell::LexerFactoryLiterateHaskell, "literatehaskell", haskellWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexHex.cxx b/scite-app/lexilla/lexers/LexHex.cxx
new file mode 100644
index 0000000..1ca89c2
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexHex.cxx
@@ -0,0 +1,1048 @@
+// Scintilla source code edit control
+/** @file LexHex.cxx
+ ** Lexers for Motorola S-Record, Intel HEX and Tektronix extended HEX.
+ **
+ ** Written by Markus Heidelberg
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/*
+ *  Motorola S-Record
+ * ===============================
+ *
+ * Each record (line) is built as follows:
+ *
+ *    field       digits          states
+ *
+ *  +----------+
+ *  | start    |  1 ('S')         SCE_HEX_RECSTART
+ *  +----------+
+ *  | type     |  1               SCE_HEX_RECTYPE, (SCE_HEX_RECTYPE_UNKNOWN)
+ *  +----------+
+ *  | count    |  2               SCE_HEX_BYTECOUNT, SCE_HEX_BYTECOUNT_WRONG
+ *  +----------+
+ *  | address  |  4/6/8           SCE_HEX_NOADDRESS, SCE_HEX_DATAADDRESS, SCE_HEX_RECCOUNT, SCE_HEX_STARTADDRESS, (SCE_HEX_ADDRESSFIELD_UNKNOWN)
+ *  +----------+
+ *  | data     |  0..504/502/500  SCE_HEX_DATA_ODD, SCE_HEX_DATA_EVEN, SCE_HEX_DATA_EMPTY, (SCE_HEX_DATA_UNKNOWN)
+ *  +----------+
+ *  | checksum |  2               SCE_HEX_CHECKSUM, SCE_HEX_CHECKSUM_WRONG
+ *  +----------+
+ *
+ *
+ *  Intel HEX
+ * ===============================
+ *
+ * Each record (line) is built as follows:
+ *
+ *    field       digits          states
+ *
+ *  +----------+
+ *  | start    |  1 (':')         SCE_HEX_RECSTART
+ *  +----------+
+ *  | count    |  2               SCE_HEX_BYTECOUNT, SCE_HEX_BYTECOUNT_WRONG
+ *  +----------+
+ *  | address  |  4               SCE_HEX_NOADDRESS, SCE_HEX_DATAADDRESS, (SCE_HEX_ADDRESSFIELD_UNKNOWN)
+ *  +----------+
+ *  | type     |  2               SCE_HEX_RECTYPE, (SCE_HEX_RECTYPE_UNKNOWN)
+ *  +----------+
+ *  | data     |  0..510          SCE_HEX_DATA_ODD, SCE_HEX_DATA_EVEN, SCE_HEX_DATA_EMPTY, SCE_HEX_EXTENDEDADDRESS, SCE_HEX_STARTADDRESS, (SCE_HEX_DATA_UNKNOWN)
+ *  +----------+
+ *  | checksum |  2               SCE_HEX_CHECKSUM, SCE_HEX_CHECKSUM_WRONG
+ *  +----------+
+ *
+ *
+ * Folding:
+ *
+ *   Data records (type 0x00), which follow an extended address record (type
+ *   0x02 or 0x04), can be folded. The extended address record is the fold
+ *   point at fold level 0, the corresponding data records are set to level 1.
+ *
+ *   Any record, which is not a data record, sets the fold level back to 0.
+ *   Any line, which is not a record (blank lines and lines starting with a
+ *   character other than ':'), leaves the fold level unchanged.
+ *
+ *
+ *  Tektronix extended HEX
+ * ===============================
+ *
+ * Each record (line) is built as follows:
+ *
+ *    field       digits          states
+ *
+ *  +----------+
+ *  | start    |  1 ('%')         SCE_HEX_RECSTART
+ *  +----------+
+ *  | length   |  2               SCE_HEX_BYTECOUNT, SCE_HEX_BYTECOUNT_WRONG
+ *  +----------+
+ *  | type     |  1               SCE_HEX_RECTYPE, (SCE_HEX_RECTYPE_UNKNOWN)
+ *  +----------+
+ *  | checksum |  2               SCE_HEX_CHECKSUM, SCE_HEX_CHECKSUM_WRONG
+ *  +----------+
+ *  | address  |  9               SCE_HEX_DATAADDRESS, SCE_HEX_STARTADDRESS, (SCE_HEX_ADDRESSFIELD_UNKNOWN)
+ *  +----------+
+ *  | data     |  0..241          SCE_HEX_DATA_ODD, SCE_HEX_DATA_EVEN
+ *  +----------+
+ *
+ *
+ *  General notes for all lexers
+ * ===============================
+ *
+ * - Depending on where the helper functions are invoked, some of them have to
+ *   read beyond the current position. In case of malformed data (record too
+ *   short), it has to be ensured that this either does not have bad influence
+ *   or will be captured deliberately.
+ *
+ * - States in parentheses in the upper format descriptions indicate that they
+ *   should not appear in a valid hex file.
+ *
+ * - State SCE_HEX_GARBAGE means garbage data after the intended end of the
+ *   record, the line is too long then. This state is used in all lexers.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// prototypes for general helper functions
+static inline bool IsNewline(const int ch);
+static int GetHexaNibble(char hd);
+static int GetHexaChar(char hd1, char hd2);
+static int GetHexaChar(Sci_PositionU pos, Accessor &styler);
+static bool ForwardWithinLine(StyleContext &sc, Sci_Position nb = 1);
+static bool PosInSameRecord(Sci_PositionU pos1, Sci_PositionU pos2, Accessor &styler);
+static Sci_Position CountByteCount(Sci_PositionU startPos, Sci_Position uncountedDigits, Accessor &styler);
+static int CalcChecksum(Sci_PositionU startPos, Sci_Position cnt, bool twosCompl, Accessor &styler);
+
+// prototypes for file format specific helper functions
+static Sci_PositionU GetSrecRecStartPosition(Sci_PositionU pos, Accessor &styler);
+static int GetSrecByteCount(Sci_PositionU recStartPos, Accessor &styler);
+static Sci_Position CountSrecByteCount(Sci_PositionU recStartPos, Accessor &styler);
+static int GetSrecAddressFieldSize(Sci_PositionU recStartPos, Accessor &styler);
+static int GetSrecAddressFieldType(Sci_PositionU recStartPos, Accessor &styler);
+static int GetSrecDataFieldType(Sci_PositionU recStartPos, Accessor &styler);
+static Sci_Position GetSrecRequiredDataFieldSize(Sci_PositionU recStartPos, Accessor &styler);
+static int GetSrecChecksum(Sci_PositionU recStartPos, Accessor &styler);
+static int CalcSrecChecksum(Sci_PositionU recStartPos, Accessor &styler);
+
+static Sci_PositionU GetIHexRecStartPosition(Sci_PositionU pos, Accessor &styler);
+static int GetIHexByteCount(Sci_PositionU recStartPos, Accessor &styler);
+static Sci_Position CountIHexByteCount(Sci_PositionU recStartPos, Accessor &styler);
+static int GetIHexAddressFieldType(Sci_PositionU recStartPos, Accessor &styler);
+static int GetIHexDataFieldType(Sci_PositionU recStartPos, Accessor &styler);
+static int GetIHexRequiredDataFieldSize(Sci_PositionU recStartPos, Accessor &styler);
+static int GetIHexChecksum(Sci_PositionU recStartPos, Accessor &styler);
+static int CalcIHexChecksum(Sci_PositionU recStartPos, Accessor &styler);
+
+static int GetTEHexDigitCount(Sci_PositionU recStartPos, Accessor &styler);
+static Sci_Position CountTEHexDigitCount(Sci_PositionU recStartPos, Accessor &styler);
+static int GetTEHexAddressFieldType(Sci_PositionU recStartPos, Accessor &styler);
+static int GetTEHexChecksum(Sci_PositionU recStartPos, Accessor &styler);
+static int CalcTEHexChecksum(Sci_PositionU recStartPos, Accessor &styler);
+
+static inline bool IsNewline(const int ch)
+{
+    return (ch == '\n' || ch == '\r');
+}
+
+static int GetHexaNibble(char hd)
+{
+	int hexValue = 0;
+
+	if (hd >= '0' && hd <= '9') {
+		hexValue += hd - '0';
+	} else if (hd >= 'A' && hd <= 'F') {
+		hexValue += hd - 'A' + 10;
+	} else if (hd >= 'a' && hd <= 'f') {
+		hexValue += hd - 'a' + 10;
+	} else {
+		return -1;
+	}
+
+	return hexValue;
+}
+
+static int GetHexaChar(char hd1, char hd2)
+{
+	int hexValue = 0;
+
+	if (hd1 >= '0' && hd1 <= '9') {
+		hexValue += 16 * (hd1 - '0');
+	} else if (hd1 >= 'A' && hd1 <= 'F') {
+		hexValue += 16 * (hd1 - 'A' + 10);
+	} else if (hd1 >= 'a' && hd1 <= 'f') {
+		hexValue += 16 * (hd1 - 'a' + 10);
+	} else {
+		return -1;
+	}
+
+	if (hd2 >= '0' && hd2 <= '9') {
+		hexValue += hd2 - '0';
+	} else if (hd2 >= 'A' && hd2 <= 'F') {
+		hexValue += hd2 - 'A' + 10;
+	} else if (hd2 >= 'a' && hd2 <= 'f') {
+		hexValue += hd2 - 'a' + 10;
+	} else {
+		return -1;
+	}
+
+	return hexValue;
+}
+
+static int GetHexaChar(Sci_PositionU pos, Accessor &styler)
+{
+	char highNibble, lowNibble;
+
+	highNibble = styler.SafeGetCharAt(pos);
+	lowNibble = styler.SafeGetCharAt(pos + 1);
+
+	return GetHexaChar(highNibble, lowNibble);
+}
+
+// Forward <nb> characters, but abort (and return false) if hitting the line
+// end. Return true if forwarding within the line was possible.
+// Avoids influence on highlighting of the subsequent line if the current line
+// is malformed (too short).
+static bool ForwardWithinLine(StyleContext &sc, Sci_Position nb)
+{
+	for (Sci_Position i = 0; i < nb; i++) {
+		if (sc.atLineEnd) {
+			// line is too short
+			sc.SetState(SCE_HEX_DEFAULT);
+			sc.Forward();
+			return false;
+		} else {
+			sc.Forward();
+		}
+	}
+
+	return true;
+}
+
+// Checks whether the given positions are in the same record.
+static bool PosInSameRecord(Sci_PositionU pos1, Sci_PositionU pos2, Accessor &styler)
+{
+	return styler.GetLine(pos1) == styler.GetLine(pos2);
+}
+
+// Count the number of digit pairs from <startPos> till end of record, ignoring
+// <uncountedDigits> digits.
+// If the record is too short, a negative count may be returned.
+static Sci_Position CountByteCount(Sci_PositionU startPos, Sci_Position uncountedDigits, Accessor &styler)
+{
+	Sci_Position cnt;
+	Sci_PositionU pos;
+
+	pos = startPos;
+
+	while (!IsNewline(styler.SafeGetCharAt(pos, '\n'))) {
+		pos++;
+	}
+
+	// number of digits in this line minus number of digits of uncounted fields
+	cnt = static_cast<Sci_Position>(pos - startPos) - uncountedDigits;
+
+	// Prepare round up if odd (digit pair incomplete), this way the byte
+	// count is considered to be valid if the checksum is incomplete.
+	if (cnt >= 0) {
+		cnt++;
+	}
+
+	// digit pairs
+	cnt /= 2;
+
+	return cnt;
+}
+
+// Calculate the checksum of the record.
+// <startPos> is the position of the first character of the starting digit
+// pair, <cnt> is the number of digit pairs.
+static int CalcChecksum(Sci_PositionU startPos, Sci_Position cnt, bool twosCompl, Accessor &styler)
+{
+	int cs = 0;
+
+	for (Sci_PositionU pos = startPos; pos < startPos + cnt; pos += 2) {
+		int val = GetHexaChar(pos, styler);
+
+		if (val < 0) {
+			return val;
+		}
+
+		// overflow does not matter
+		cs += val;
+	}
+
+	if (twosCompl) {
+		// low byte of two's complement
+		return -cs & 0xFF;
+	} else {
+		// low byte of one's complement
+		return ~cs & 0xFF;
+	}
+}
+
+// Get the position of the record "start" field (first character in line) in
+// the record around position <pos>.
+static Sci_PositionU GetSrecRecStartPosition(Sci_PositionU pos, Accessor &styler)
+{
+	while (styler.SafeGetCharAt(pos) != 'S') {
+		pos--;
+	}
+
+	return pos;
+}
+
+// Get the value of the "byte count" field, it counts the number of bytes in
+// the subsequent fields ("address", "data" and "checksum" fields).
+static int GetSrecByteCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int val;
+
+	val = GetHexaChar(recStartPos + 2, styler);
+	if (val < 0) {
+	       val = 0;
+	}
+
+	return val;
+}
+
+// Count the number of digit pairs for the "address", "data" and "checksum"
+// fields in this record. Has to be equal to the "byte count" field value.
+// If the record is too short, a negative count may be returned.
+static Sci_Position CountSrecByteCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	return CountByteCount(recStartPos, 4, styler);
+}
+
+// Get the size of the "address" field.
+static int GetSrecAddressFieldSize(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (styler.SafeGetCharAt(recStartPos + 1)) {
+		case '0':
+		case '1':
+		case '5':
+		case '9':
+			return 2; // 16 bit
+
+		case '2':
+		case '6':
+		case '8':
+			return 3; // 24 bit
+
+		case '3':
+		case '7':
+			return 4; // 32 bit
+
+		default:
+			return 0;
+	}
+}
+
+// Get the type of the "address" field content.
+static int GetSrecAddressFieldType(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (styler.SafeGetCharAt(recStartPos + 1)) {
+		case '0':
+			return SCE_HEX_NOADDRESS;
+
+		case '1':
+		case '2':
+		case '3':
+			return SCE_HEX_DATAADDRESS;
+
+		case '5':
+		case '6':
+			return SCE_HEX_RECCOUNT;
+
+		case '7':
+		case '8':
+		case '9':
+			return SCE_HEX_STARTADDRESS;
+
+		default: // handle possible format extension in the future
+			return SCE_HEX_ADDRESSFIELD_UNKNOWN;
+	}
+}
+
+// Get the type of the "data" field content.
+static int GetSrecDataFieldType(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (styler.SafeGetCharAt(recStartPos + 1)) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+			return SCE_HEX_DATA_ODD;
+
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			return SCE_HEX_DATA_EMPTY;
+
+		default: // handle possible format extension in the future
+			return SCE_HEX_DATA_UNKNOWN;
+	}
+}
+
+// Get the required size of the "data" field. Useless for block header and
+// ordinary data records (type S0, S1, S2, S3), return the value calculated
+// from the "byte count" and "address field" size in this case.
+static Sci_Position GetSrecRequiredDataFieldSize(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (styler.SafeGetCharAt(recStartPos + 1)) {
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			return 0;
+
+		default:
+			return GetSrecByteCount(recStartPos, styler)
+				- GetSrecAddressFieldSize(recStartPos, styler)
+				- 1; // -1 for checksum field
+	}
+}
+
+// Get the value of the "checksum" field.
+static int GetSrecChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int byteCount;
+
+	byteCount = GetSrecByteCount(recStartPos, styler);
+
+	return GetHexaChar(recStartPos + 2 + byteCount * 2, styler);
+}
+
+// Calculate the checksum of the record.
+static int CalcSrecChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	Sci_Position byteCount;
+
+	byteCount = GetSrecByteCount(recStartPos, styler);
+
+	// sum over "byte count", "address" and "data" fields (6..510 digits)
+	return CalcChecksum(recStartPos + 2, byteCount * 2, false, styler);
+}
+
+// Get the position of the record "start" field (first character in line) in
+// the record around position <pos>.
+static Sci_PositionU GetIHexRecStartPosition(Sci_PositionU pos, Accessor &styler)
+{
+	while (styler.SafeGetCharAt(pos) != ':') {
+		pos--;
+	}
+
+	return pos;
+}
+
+// Get the value of the "byte count" field, it counts the number of bytes in
+// the "data" field.
+static int GetIHexByteCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int val;
+
+	val = GetHexaChar(recStartPos + 1, styler);
+	if (val < 0) {
+	       val = 0;
+	}
+
+	return val;
+}
+
+// Count the number of digit pairs for the "data" field in this record. Has to
+// be equal to the "byte count" field value.
+// If the record is too short, a negative count may be returned.
+static Sci_Position CountIHexByteCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	return CountByteCount(recStartPos, 11, styler);
+}
+
+// Get the type of the "address" field content.
+static int GetIHexAddressFieldType(Sci_PositionU recStartPos, Accessor &styler)
+{
+	if (!PosInSameRecord(recStartPos, recStartPos + 7, styler)) {
+		// malformed (record too short)
+		// type cannot be determined
+		return SCE_HEX_ADDRESSFIELD_UNKNOWN;
+	}
+
+	switch (GetHexaChar(recStartPos + 7, styler)) {
+		case 0x00:
+			return SCE_HEX_DATAADDRESS;
+
+		case 0x01:
+		case 0x02:
+		case 0x03:
+		case 0x04:
+		case 0x05:
+			return SCE_HEX_NOADDRESS;
+
+		default: // handle possible format extension in the future
+			return SCE_HEX_ADDRESSFIELD_UNKNOWN;
+	}
+}
+
+// Get the type of the "data" field content.
+static int GetIHexDataFieldType(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (GetHexaChar(recStartPos + 7, styler)) {
+		case 0x00:
+			return SCE_HEX_DATA_ODD;
+
+		case 0x01:
+			return SCE_HEX_DATA_EMPTY;
+
+		case 0x02:
+		case 0x04:
+			return SCE_HEX_EXTENDEDADDRESS;
+
+		case 0x03:
+		case 0x05:
+			return SCE_HEX_STARTADDRESS;
+
+		default: // handle possible format extension in the future
+			return SCE_HEX_DATA_UNKNOWN;
+	}
+}
+
+// Get the required size of the "data" field. Useless for an ordinary data
+// record (type 00), return the "byte count" in this case.
+static int GetIHexRequiredDataFieldSize(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (GetHexaChar(recStartPos + 7, styler)) {
+		case 0x01:
+			return 0;
+
+		case 0x02:
+		case 0x04:
+			return 2;
+
+		case 0x03:
+		case 0x05:
+			return 4;
+
+		default:
+			return GetIHexByteCount(recStartPos, styler);
+	}
+}
+
+// Get the value of the "checksum" field.
+static int GetIHexChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int byteCount;
+
+	byteCount = GetIHexByteCount(recStartPos, styler);
+
+	return GetHexaChar(recStartPos + 9 + byteCount * 2, styler);
+}
+
+// Calculate the checksum of the record.
+static int CalcIHexChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int byteCount;
+
+	byteCount = GetIHexByteCount(recStartPos, styler);
+
+	// sum over "byte count", "address", "type" and "data" fields (8..518 digits)
+	return CalcChecksum(recStartPos + 1, 8 + byteCount * 2, true, styler);
+}
+
+
+// Get the value of the "record length" field, it counts the number of digits in
+// the record excluding the percent.
+static int GetTEHexDigitCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	int val = GetHexaChar(recStartPos + 1, styler);
+	if (val < 0)
+	       val = 0;
+
+	return val;
+}
+
+// Count the number of digits in this record. Has to
+// be equal to the "record length" field value.
+static Sci_Position CountTEHexDigitCount(Sci_PositionU recStartPos, Accessor &styler)
+{
+	Sci_PositionU pos;
+
+	pos = recStartPos+1;
+
+	while (!IsNewline(styler.SafeGetCharAt(pos, '\n'))) {
+		pos++;
+	}
+
+	return static_cast<Sci_Position>(pos - (recStartPos+1));
+}
+
+// Get the type of the "address" field content.
+static int GetTEHexAddressFieldType(Sci_PositionU recStartPos, Accessor &styler)
+{
+	switch (styler.SafeGetCharAt(recStartPos + 3)) {
+		case '6':
+			return SCE_HEX_DATAADDRESS;
+
+		case '8':
+			return SCE_HEX_STARTADDRESS;
+
+		default: // handle possible format extension in the future
+			return SCE_HEX_ADDRESSFIELD_UNKNOWN;
+	}
+}
+
+// Get the value of the "checksum" field.
+static int GetTEHexChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	return GetHexaChar(recStartPos+4, styler);
+}
+
+// Calculate the checksum of the record (excluding the checksum field).
+static int CalcTEHexChecksum(Sci_PositionU recStartPos, Accessor &styler)
+{
+	Sci_PositionU pos = recStartPos +1;
+	Sci_PositionU length = GetTEHexDigitCount(recStartPos, styler);
+
+	int cs = GetHexaNibble(styler.SafeGetCharAt(pos++));//length
+	cs += GetHexaNibble(styler.SafeGetCharAt(pos++));//length
+
+	cs += GetHexaNibble(styler.SafeGetCharAt(pos++));//type
+
+	pos += 2;// jump over CS field
+
+	for (; pos <= recStartPos + length; ++pos) {
+		int val = GetHexaNibble(styler.SafeGetCharAt(pos));
+
+		if (val < 0) {
+			return val;
+		}
+
+		// overflow does not matter
+		cs += val;
+	}
+
+	// low byte
+	return cs & 0xFF;
+
+}
+
+static void ColouriseSrecDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	while (sc.More()) {
+		Sci_PositionU recStartPos;
+		Sci_Position reqByteCount;
+		Sci_Position dataFieldSize;
+		int byteCount, addrFieldSize, addrFieldType, dataFieldType;
+		int cs1, cs2;
+
+		switch (sc.state) {
+			case SCE_HEX_DEFAULT:
+				if (sc.atLineStart && sc.Match('S')) {
+					sc.SetState(SCE_HEX_RECSTART);
+				}
+				ForwardWithinLine(sc);
+				break;
+
+			case SCE_HEX_RECSTART:
+				recStartPos = sc.currentPos - 1;
+				addrFieldType = GetSrecAddressFieldType(recStartPos, styler);
+
+				if (addrFieldType == SCE_HEX_ADDRESSFIELD_UNKNOWN) {
+					sc.SetState(SCE_HEX_RECTYPE_UNKNOWN);
+				} else {
+					sc.SetState(SCE_HEX_RECTYPE);
+				}
+
+				ForwardWithinLine(sc);
+				break;
+
+			case SCE_HEX_RECTYPE:
+			case SCE_HEX_RECTYPE_UNKNOWN:
+				recStartPos = sc.currentPos - 2;
+				byteCount = GetSrecByteCount(recStartPos, styler);
+				reqByteCount = GetSrecAddressFieldSize(recStartPos, styler)
+						+ GetSrecRequiredDataFieldSize(recStartPos, styler)
+						+ 1; // +1 for checksum field
+
+				if (byteCount == CountSrecByteCount(recStartPos, styler)
+						&& byteCount == reqByteCount) {
+					sc.SetState(SCE_HEX_BYTECOUNT);
+				} else {
+					sc.SetState(SCE_HEX_BYTECOUNT_WRONG);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_BYTECOUNT:
+			case SCE_HEX_BYTECOUNT_WRONG:
+				recStartPos = sc.currentPos - 4;
+				addrFieldSize = GetSrecAddressFieldSize(recStartPos, styler);
+				addrFieldType = GetSrecAddressFieldType(recStartPos, styler);
+
+				sc.SetState(addrFieldType);
+				ForwardWithinLine(sc, addrFieldSize * 2);
+				break;
+
+			case SCE_HEX_NOADDRESS:
+			case SCE_HEX_DATAADDRESS:
+			case SCE_HEX_RECCOUNT:
+			case SCE_HEX_STARTADDRESS:
+			case SCE_HEX_ADDRESSFIELD_UNKNOWN:
+				recStartPos = GetSrecRecStartPosition(sc.currentPos, styler);
+				dataFieldType = GetSrecDataFieldType(recStartPos, styler);
+
+				// Using the required size here if possible has the effect that the
+				// checksum is highlighted at a fixed position after this field for
+				// specific record types, independent on the "byte count" value.
+				dataFieldSize = GetSrecRequiredDataFieldSize(recStartPos, styler);
+
+				sc.SetState(dataFieldType);
+
+				if (dataFieldType == SCE_HEX_DATA_ODD) {
+					for (int i = 0; i < dataFieldSize * 2; i++) {
+						if ((i & 0x3) == 0) {
+							sc.SetState(SCE_HEX_DATA_ODD);
+						} else if ((i & 0x3) == 2) {
+							sc.SetState(SCE_HEX_DATA_EVEN);
+						}
+
+						if (!ForwardWithinLine(sc)) {
+							break;
+						}
+					}
+				} else {
+					ForwardWithinLine(sc, dataFieldSize * 2);
+				}
+				break;
+
+			case SCE_HEX_DATA_ODD:
+			case SCE_HEX_DATA_EVEN:
+			case SCE_HEX_DATA_EMPTY:
+			case SCE_HEX_DATA_UNKNOWN:
+				recStartPos = GetSrecRecStartPosition(sc.currentPos, styler);
+				cs1 = CalcSrecChecksum(recStartPos, styler);
+				cs2 = GetSrecChecksum(recStartPos, styler);
+
+				if (cs1 != cs2 || cs1 < 0 || cs2 < 0) {
+					sc.SetState(SCE_HEX_CHECKSUM_WRONG);
+				} else {
+					sc.SetState(SCE_HEX_CHECKSUM);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_CHECKSUM:
+			case SCE_HEX_CHECKSUM_WRONG:
+			case SCE_HEX_GARBAGE:
+				// record finished or line too long
+				sc.SetState(SCE_HEX_GARBAGE);
+				ForwardWithinLine(sc);
+				break;
+
+			default:
+				// prevent endless loop in faulty state
+				sc.SetState(SCE_HEX_DEFAULT);
+				break;
+		}
+	}
+	sc.Complete();
+}
+
+static void ColouriseIHexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	while (sc.More()) {
+		Sci_PositionU recStartPos;
+		int byteCount, addrFieldType, dataFieldSize, dataFieldType;
+		int cs1, cs2;
+
+		switch (sc.state) {
+			case SCE_HEX_DEFAULT:
+				if (sc.atLineStart && sc.Match(':')) {
+					sc.SetState(SCE_HEX_RECSTART);
+				}
+				ForwardWithinLine(sc);
+				break;
+
+			case SCE_HEX_RECSTART:
+				recStartPos = sc.currentPos - 1;
+				byteCount = GetIHexByteCount(recStartPos, styler);
+				dataFieldSize = GetIHexRequiredDataFieldSize(recStartPos, styler);
+
+				if (byteCount == CountIHexByteCount(recStartPos, styler)
+						&& byteCount == dataFieldSize) {
+					sc.SetState(SCE_HEX_BYTECOUNT);
+				} else {
+					sc.SetState(SCE_HEX_BYTECOUNT_WRONG);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_BYTECOUNT:
+			case SCE_HEX_BYTECOUNT_WRONG:
+				recStartPos = sc.currentPos - 3;
+				addrFieldType = GetIHexAddressFieldType(recStartPos, styler);
+
+				sc.SetState(addrFieldType);
+				ForwardWithinLine(sc, 4);
+				break;
+
+			case SCE_HEX_NOADDRESS:
+			case SCE_HEX_DATAADDRESS:
+			case SCE_HEX_ADDRESSFIELD_UNKNOWN:
+				recStartPos = sc.currentPos - 7;
+				addrFieldType = GetIHexAddressFieldType(recStartPos, styler);
+
+				if (addrFieldType == SCE_HEX_ADDRESSFIELD_UNKNOWN) {
+					sc.SetState(SCE_HEX_RECTYPE_UNKNOWN);
+				} else {
+					sc.SetState(SCE_HEX_RECTYPE);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_RECTYPE:
+			case SCE_HEX_RECTYPE_UNKNOWN:
+				recStartPos = sc.currentPos - 9;
+				dataFieldType = GetIHexDataFieldType(recStartPos, styler);
+
+				// Using the required size here if possible has the effect that the
+				// checksum is highlighted at a fixed position after this field for
+				// specific record types, independent on the "byte count" value.
+				dataFieldSize = GetIHexRequiredDataFieldSize(recStartPos, styler);
+
+				sc.SetState(dataFieldType);
+
+				if (dataFieldType == SCE_HEX_DATA_ODD) {
+					for (int i = 0; i < dataFieldSize * 2; i++) {
+						if ((i & 0x3) == 0) {
+							sc.SetState(SCE_HEX_DATA_ODD);
+						} else if ((i & 0x3) == 2) {
+							sc.SetState(SCE_HEX_DATA_EVEN);
+						}
+
+						if (!ForwardWithinLine(sc)) {
+							break;
+						}
+					}
+				} else {
+					ForwardWithinLine(sc, dataFieldSize * 2);
+				}
+				break;
+
+			case SCE_HEX_DATA_ODD:
+			case SCE_HEX_DATA_EVEN:
+			case SCE_HEX_DATA_EMPTY:
+			case SCE_HEX_EXTENDEDADDRESS:
+			case SCE_HEX_STARTADDRESS:
+			case SCE_HEX_DATA_UNKNOWN:
+				recStartPos = GetIHexRecStartPosition(sc.currentPos, styler);
+				cs1 = CalcIHexChecksum(recStartPos, styler);
+				cs2 = GetIHexChecksum(recStartPos, styler);
+
+				if (cs1 != cs2 || cs1 < 0 || cs2 < 0) {
+					sc.SetState(SCE_HEX_CHECKSUM_WRONG);
+				} else {
+					sc.SetState(SCE_HEX_CHECKSUM);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_CHECKSUM:
+			case SCE_HEX_CHECKSUM_WRONG:
+			case SCE_HEX_GARBAGE:
+				// record finished or line too long
+				sc.SetState(SCE_HEX_GARBAGE);
+				ForwardWithinLine(sc);
+				break;
+
+			default:
+				// prevent endless loop in faulty state
+				sc.SetState(SCE_HEX_DEFAULT);
+				break;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldIHexDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	Sci_PositionU endPos = startPos + length;
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent - 1);
+
+	Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1);
+	int levelNext = SC_FOLDLEVELBASE; // default if no specific line found
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		bool atEOL = i == (lineStartNext - 1);
+		int style = styler.StyleAt(i);
+
+		// search for specific lines
+		if (style == SCE_HEX_EXTENDEDADDRESS) {
+			// extended addres record
+			levelNext = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+		} else if (style == SCE_HEX_DATAADDRESS
+			|| (style == SCE_HEX_DEFAULT
+				&& i == (Sci_PositionU)styler.LineStart(lineCurrent))) {
+			// data record or no record start code at all
+			if (levelCurrent & SC_FOLDLEVELHEADERFLAG) {
+				levelNext = SC_FOLDLEVELBASE + 1;
+			} else {
+				// continue level 0 or 1, no fold point
+				levelNext = levelCurrent;
+			}
+		}
+
+		if (atEOL || (i == endPos - 1)) {
+			styler.SetLevel(lineCurrent, levelNext);
+
+			lineCurrent++;
+			lineStartNext = styler.LineStart(lineCurrent + 1);
+			levelCurrent = levelNext;
+			levelNext = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+static void ColouriseTEHexDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	while (sc.More()) {
+		Sci_PositionU recStartPos;
+		int digitCount, addrFieldType;
+		int cs1, cs2;
+
+		switch (sc.state) {
+			case SCE_HEX_DEFAULT:
+				if (sc.atLineStart && sc.Match('%')) {
+					sc.SetState(SCE_HEX_RECSTART);
+				}
+				ForwardWithinLine(sc);
+				break;
+
+			case SCE_HEX_RECSTART:
+
+				recStartPos = sc.currentPos - 1;
+
+				if (GetTEHexDigitCount(recStartPos, styler) == CountTEHexDigitCount(recStartPos, styler)) {
+					sc.SetState(SCE_HEX_BYTECOUNT);
+				} else {
+					sc.SetState(SCE_HEX_BYTECOUNT_WRONG);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+			case SCE_HEX_BYTECOUNT:
+			case SCE_HEX_BYTECOUNT_WRONG:
+				recStartPos = sc.currentPos - 3;
+				addrFieldType = GetTEHexAddressFieldType(recStartPos, styler);
+
+				if (addrFieldType == SCE_HEX_ADDRESSFIELD_UNKNOWN) {
+					sc.SetState(SCE_HEX_RECTYPE_UNKNOWN);
+				} else {
+					sc.SetState(SCE_HEX_RECTYPE);
+				}
+
+				ForwardWithinLine(sc);
+				break;
+
+			case SCE_HEX_RECTYPE:
+			case SCE_HEX_RECTYPE_UNKNOWN:
+				recStartPos = sc.currentPos - 4;
+				cs1 = CalcTEHexChecksum(recStartPos, styler);
+				cs2 = GetTEHexChecksum(recStartPos, styler);
+
+				if (cs1 != cs2 || cs1 < 0 || cs2 < 0) {
+					sc.SetState(SCE_HEX_CHECKSUM_WRONG);
+				} else {
+					sc.SetState(SCE_HEX_CHECKSUM);
+				}
+
+				ForwardWithinLine(sc, 2);
+				break;
+
+
+			case SCE_HEX_CHECKSUM:
+			case SCE_HEX_CHECKSUM_WRONG:
+				recStartPos = sc.currentPos - 6;
+				addrFieldType = GetTEHexAddressFieldType(recStartPos, styler);
+
+				sc.SetState(addrFieldType);
+				ForwardWithinLine(sc, 9);
+				break;
+
+			case SCE_HEX_DATAADDRESS:
+			case SCE_HEX_STARTADDRESS:
+			case SCE_HEX_ADDRESSFIELD_UNKNOWN:
+				recStartPos = sc.currentPos - 15;
+				digitCount = GetTEHexDigitCount(recStartPos, styler) - 14;
+
+				sc.SetState(SCE_HEX_DATA_ODD);
+
+				for (int i = 0; i < digitCount; i++) {
+					if ((i & 0x3) == 0) {
+						sc.SetState(SCE_HEX_DATA_ODD);
+					} else if ((i & 0x3) == 2) {
+						sc.SetState(SCE_HEX_DATA_EVEN);
+					}
+
+					if (!ForwardWithinLine(sc)) {
+						break;
+					}
+				}
+				break;
+
+			case SCE_HEX_DATA_ODD:
+			case SCE_HEX_DATA_EVEN:
+			case SCE_HEX_GARBAGE:
+				// record finished or line too long
+				sc.SetState(SCE_HEX_GARBAGE);
+				ForwardWithinLine(sc);
+				break;
+
+			default:
+				// prevent endless loop in faulty state
+				sc.SetState(SCE_HEX_DEFAULT);
+				break;
+		}
+	}
+	sc.Complete();
+}
+
+LexerModule lmSrec(SCLEX_SREC, ColouriseSrecDoc, "srec", 0, NULL);
+LexerModule lmIHex(SCLEX_IHEX, ColouriseIHexDoc, "ihex", FoldIHexDoc, NULL);
+LexerModule lmTEHex(SCLEX_TEHEX, ColouriseTEHexDoc, "tehex", 0, NULL);
diff --git a/scite-app/lexilla/lexers/LexHollywood.cxx b/scite-app/lexilla/lexers/LexHollywood.cxx
new file mode 100644
index 0000000..fe9b477
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexHollywood.cxx
@@ -0,0 +1,519 @@
+// Scintilla source code edit control
+/** @file LexHollywood.cxx
+ ** Lexer for Hollywood
+ ** Written by Andreas Falkenhahn, based on the BlitzBasic/PureBasic/Lua lexers
+ ** Thanks to Nicholai Benalal
+ ** For more information on Hollywood, see http://www.hollywood-mal.com/
+ ** Mail me (andreas <at> airsoftsoftwair <dot> de) for any bugs.
+ ** This code is subject to the same license terms as the rest of the Scintilla project:
+ ** 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 <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+/* Bits:
+ * 1  - whitespace
+ * 2  - operator
+ * 4  - identifier
+ * 8  - decimal digit
+ * 16 - hex digit
+ * 32 - bin digit
+ * 64 - letter
+ */
+static int character_classification[128] =
+{
+	0, // NUL ($0)
+	0, // SOH ($1)
+	0, // STX ($2)
+	0, // ETX ($3)
+	0, // EOT ($4)
+	0, // ENQ ($5)
+	0, // ACK ($6)
+	0, // BEL ($7)
+	0, // BS ($8)
+	1, // HT ($9)
+	1, // LF ($A)
+	0, // VT ($B)
+	0, // FF ($C)
+	1, // CR ($D)
+	0, // SO ($E)
+	0, // SI ($F)
+	0, // DLE ($10)
+	0, // DC1 ($11)
+	0, // DC2 ($12)
+	0, // DC3 ($13)
+	0, // DC4 ($14)
+	0, // NAK ($15)
+	0, // SYN ($16)
+	0, // ETB ($17)
+	0, // CAN ($18)
+	0, // EM ($19)
+	0, // SUB ($1A)
+	0, // ESC ($1B)
+	0, // FS ($1C)
+	0, // GS ($1D)
+	0, // RS ($1E)
+	0, // US ($1F)
+	1, // space ($20)
+	4, // ! ($21)
+	0, // " ($22)
+	0, // # ($23)
+	4, // $ ($24)
+	2, // % ($25)
+	2, // & ($26)
+	2, // ' ($27)
+	2, // ( ($28)
+	2, // ) ($29)
+	2, // * ($2A)
+	2, // + ($2B)
+	2, // , ($2C)
+	2, // - ($2D)
+	// NB: we treat "." as an identifier although it is also an operator and a decimal digit
+	// the reason why we treat it as an identifier is to support syntax highlighting for
+	// plugin commands which always use a "." in their names, e.g. pdf.OpenDocument();
+	// we handle the decimal digit case manually below so that 3.1415 and .123 is styled correctly
+	// the collateral damage of treating "." as an identifier is that "." is never styled
+	// SCE_HOLLYWOOD_OPERATOR
+	4, // . ($2E) 
+	2, // / ($2F)
+	28, // 0 ($30)
+	28, // 1 ($31)
+	28, // 2 ($32)
+	28, // 3 ($33)
+	28, // 4 ($34)
+	28, // 5 ($35)
+	28, // 6 ($36)
+	28, // 7 ($37)
+	28, // 8 ($38)
+	28, // 9 ($39)
+	2, // : ($3A)
+	2, // ; ($3B)
+	2, // < ($3C)
+	2, // = ($3D)
+	2, // > ($3E)
+	2, // ? ($3F)
+	0, // @ ($40)
+	84, // A ($41)
+	84, // B ($42)
+	84, // C ($43)
+	84, // D ($44)
+	84, // E ($45)
+	84, // F ($46)
+	68, // G ($47)
+	68, // H ($48)
+	68, // I ($49)
+	68, // J ($4A)
+	68, // K ($4B)
+	68, // L ($4C)
+	68, // M ($4D)
+	68, // N ($4E)
+	68, // O ($4F)
+	68, // P ($50)
+	68, // Q ($51)
+	68, // R ($52)
+	68, // S ($53)
+	68, // T ($54)
+	68, // U ($55)
+	68, // V ($56)
+	68, // W ($57)
+	68, // X ($58)
+	68, // Y ($59)
+	68, // Z ($5A)
+	2, // [ ($5B)
+	2, // \ ($5C)
+	2, // ] ($5D)
+	2, // ^ ($5E)
+	68, // _ ($5F)
+	2, // ` ($60)
+	84, // a ($61)
+	84, // b ($62)
+	84, // c ($63)
+	84, // d ($64)
+	84, // e ($65)
+	84, // f ($66)
+	68, // g ($67)
+	68, // h ($68)
+	68, // i ($69)
+	68, // j ($6A)
+	68, // k ($6B)
+	68, // l ($6C)
+	68, // m ($6D)
+	68, // n ($6E)
+	68, // o ($6F)
+	68, // p ($70)
+	68, // q ($71)
+	68, // r ($72)
+	68, // s ($73)
+	68, // t ($74)
+	68, // u ($75)
+	68, // v ($76)
+	68, // w ($77)
+	68, // x ($78)
+	68, // y ($79)
+	68, // z ($7A)
+	2, // { ($7B)
+	2, // | ($7C)
+	2, // } ($7D)
+	2, // ~ ($7E)
+	0, // &#127; ($7F)
+};
+
+static bool IsSpace(int c) {
+	return c < 128 && (character_classification[c] & 1);
+}
+
+static bool IsOperator(int c) {
+	return c < 128 && (character_classification[c] & 2);
+}
+
+static bool IsIdentifier(int c) {
+	return c < 128 && (character_classification[c] & 4);
+}
+
+static bool IsDigit(int c) {
+	return c < 128 && (character_classification[c] & 8);
+}
+
+static bool IsHexDigit(int c) {
+	return c < 128 && (character_classification[c] & 16);
+}
+
+static int LowerCase(int c)
+{
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int CheckHollywoodFoldPoint(char const *token) {
+	if (!strcmp(token, "function")) {
+		return 1;
+	}
+	if (!strcmp(token, "endfunction")) {
+		return -1;
+	}
+	return 0;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerHollywood
+struct OptionsHollywood {
+	bool fold;
+	bool foldCompact;
+	OptionsHollywood() {
+		fold = false;
+		foldCompact = false;
+	}
+};
+
+static const char * const hollywoodWordListDesc[] = {
+	"Hollywood keywords",
+	"Hollywood standard API functions",
+	"Hollywood plugin API functions",
+	"Hollywood plugin methods",
+	0
+};
+
+struct OptionSetHollywood : public OptionSet<OptionsHollywood> {
+	OptionSetHollywood(const char * const wordListDescriptions[]) {
+		DefineProperty("fold", &OptionsHollywood::fold);
+		DefineProperty("fold.compact", &OptionsHollywood::foldCompact);
+		DefineWordListSets(wordListDescriptions);
+	}
+};
+
+class LexerHollywood : public DefaultLexer {
+	int (*CheckFoldPoint)(char const *);
+	WordList keywordlists[4];	
+	OptionsHollywood options;
+	OptionSetHollywood osHollywood;
+public:
+	LexerHollywood(int (*CheckFoldPoint_)(char const *), const char * const wordListDescriptions[]) :
+						 DefaultLexer("hollywood", SCLEX_HOLLYWOOD),
+						 CheckFoldPoint(CheckFoldPoint_),
+						 osHollywood(wordListDescriptions) {
+	}
+	virtual ~LexerHollywood() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osHollywood.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osHollywood.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osHollywood.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char* key) override {
+		return osHollywood.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osHollywood.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+	static ILexer5 *LexerFactoryHollywood() {
+		return new LexerHollywood(CheckHollywoodFoldPoint, hollywoodWordListDesc);
+	}
+};
+
+Sci_Position SCI_METHOD LexerHollywood::PropertySet(const char *key, const char *val) {
+	if (osHollywood.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerHollywood::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywordlists[0];
+		break;
+	case 1:
+		wordListN = &keywordlists[1];
+		break;
+	case 2:
+		wordListN = &keywordlists[2];
+		break;
+	case 3:
+		wordListN = &keywordlists[3];
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;	
+}
+
+void SCI_METHOD LexerHollywood::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	styler.StartAt(startPos);
+	bool inString = false;
+	
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// Can't use sc.More() here else we miss the last character
+	for (; ; sc.Forward())
+	 {
+	 	if (sc.atLineStart) inString = false;
+	 		
+	 	if (sc.ch == '\"' && sc.chPrev != '\\') inString = !inString;
+	 		
+		if (sc.state == SCE_HOLLYWOOD_IDENTIFIER) {
+			if (!IsIdentifier(sc.ch)) {				
+				char s[100];
+				int kstates[4] = {
+					SCE_HOLLYWOOD_KEYWORD,
+					SCE_HOLLYWOOD_STDAPI,
+					SCE_HOLLYWOOD_PLUGINAPI,
+					SCE_HOLLYWOOD_PLUGINMETHOD,
+				};
+				sc.GetCurrentLowered(s, sizeof(s));
+				for (int i = 0; i < 4; i++) {
+					if (keywordlists[i].InList(s)) {
+						sc.ChangeState(kstates[i]);
+					}
+				}
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);				
+			}
+		} else if (sc.state == SCE_HOLLYWOOD_OPERATOR) {
+			
+			// always reset to default on operators because otherwise
+			// comments won't be recognized in sequences like "+/* Hello*/"
+			// --> "+/*" would be recognized as a sequence of operators
+			
+			// if (!IsOperator(sc.ch)) sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+			sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+			
+		} else if (sc.state == SCE_HOLLYWOOD_PREPROCESSOR) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+		} else if (sc.state == SCE_HOLLYWOOD_CONSTANT) {
+			if (!IsIdentifier(sc.ch))
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+		} else if (sc.state == SCE_HOLLYWOOD_NUMBER) {
+			if (!IsDigit(sc.ch) && sc.ch != '.')
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+		} else if (sc.state == SCE_HOLLYWOOD_HEXNUMBER) {
+			if (!IsHexDigit(sc.ch))
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+		} else if (sc.state == SCE_HOLLYWOOD_STRING) {
+			if (sc.ch == '"') {
+				sc.ForwardSetState(SCE_HOLLYWOOD_DEFAULT);
+			}
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+			}
+		} else if (sc.state == SCE_HOLLYWOOD_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_HOLLYWOOD_DEFAULT);
+			}
+		} else if (sc.state == SCE_HOLLYWOOD_COMMENTBLOCK) {
+			if (sc.Match("*/") && !inString) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_HOLLYWOOD_DEFAULT);
+			}
+		} else if (sc.state == SCE_HOLLYWOOD_STRINGBLOCK) {
+			if (sc.Match("]]") && !inString) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_HOLLYWOOD_DEFAULT);
+			}			
+		}
+
+		if (sc.state == SCE_HOLLYWOOD_DEFAULT) {
+			if (sc.Match(';')) {
+				sc.SetState(SCE_HOLLYWOOD_COMMENT);
+			} else if (sc.Match("/*")) {
+				sc.SetState(SCE_HOLLYWOOD_COMMENTBLOCK);
+				sc.Forward();
+			} else if (sc.Match("[[")) {
+				sc.SetState(SCE_HOLLYWOOD_STRINGBLOCK);
+				sc.Forward();				
+			} else if (sc.Match('"')) {
+				sc.SetState(SCE_HOLLYWOOD_STRING);
+			} else if (sc.Match('$')) { 
+				sc.SetState(SCE_HOLLYWOOD_HEXNUMBER);
+			} else if (sc.Match("0x") || sc.Match("0X")) {  // must be before IsDigit() because of 0x
+				sc.SetState(SCE_HOLLYWOOD_HEXNUMBER);
+				sc.Forward();
+			} else if (sc.ch == '.' && (sc.chNext >= '0' && sc.chNext <= '9')) {  // ".1234" style numbers
+				sc.SetState(SCE_HOLLYWOOD_NUMBER);
+				sc.Forward();	
+			} else if (IsDigit(sc.ch)) {
+				sc.SetState(SCE_HOLLYWOOD_NUMBER);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_HOLLYWOOD_CONSTANT);
+			} else if (sc.Match('@')) {
+				sc.SetState(SCE_HOLLYWOOD_PREPROCESSOR);	
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_HOLLYWOOD_OPERATOR);
+			} else if (IsIdentifier(sc.ch)) {
+				sc.SetState(SCE_HOLLYWOOD_IDENTIFIER);
+			}
+		}
+
+		if (!sc.More())
+			break;
+	}
+	sc.Complete();
+}
+
+void SCI_METHOD LexerHollywood::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+	
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int done = 0;
+	char word[256];
+	int wordlen = 0;
+		
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (!done) {
+			if (wordlen) { // are we scanning a token already?
+				word[wordlen] = static_cast<char>(LowerCase(ch));
+				if (!IsIdentifier(ch)) { // done with token
+					word[wordlen] = '\0';
+					levelCurrent += CheckFoldPoint(word);
+					done = 1;
+				} else if (wordlen < 255) {
+					wordlen++;
+				}
+			} else { // start scanning at first non-whitespace character
+				if (!IsSpace(ch)) {
+					if (style != SCE_HOLLYWOOD_COMMENTBLOCK && IsIdentifier(ch)) {
+						word[0] = static_cast<char>(LowerCase(ch));
+						wordlen = 1;
+					} else // done with this line
+						done = 1;
+				}
+			}
+		}		
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && options.foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			done = 0;
+			wordlen = 0;			
+		}
+		if (!IsSpace(ch)) {
+			visibleChars++;
+		}
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);	
+}
+
+LexerModule lmHollywood(SCLEX_HOLLYWOOD, LexerHollywood::LexerFactoryHollywood, "hollywood", hollywoodWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexIndent.cxx b/scite-app/lexilla/lexers/LexIndent.cxx
new file mode 100644
index 0000000..dfb21fb
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexIndent.cxx
@@ -0,0 +1,74 @@
+// Scintilla source code edit control
+/** @file LexIndent.cxx
+ ** Lexer for no language. Used for indentation-based folding of files.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseIndentDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                            Accessor &styler) {
+	// Indent language means all style bytes are 0 so just mark the end - no need to fill in.
+	if (length > 0) {
+		styler.StartAt(startPos + length - 1);
+		styler.StartSegment(startPos + length - 1);
+		styler.ColourTo(startPos + length - 1, 0);
+	}
+}
+
+static void FoldIndentDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[], Accessor &styler) {
+	int visibleCharsCurrent, visibleCharsNext;
+	int levelCurrent, levelNext;
+	Sci_PositionU i, lineEnd;
+	Sci_PositionU lengthDoc   = startPos + length;
+	Sci_Position  lineCurrent = styler.GetLine(startPos);
+
+	i       = styler.LineStart(lineCurrent  );
+	lineEnd = styler.LineStart(lineCurrent+1)-1;
+	if(lineEnd>=lengthDoc) lineEnd = lengthDoc-1;
+	while(styler[lineEnd]=='\n' || styler[lineEnd]=='\r') lineEnd--;
+	for(visibleCharsCurrent=0, levelCurrent=SC_FOLDLEVELBASE; !visibleCharsCurrent && i<=lineEnd; i++){
+		if(isspacechar(styler[i])) levelCurrent++;
+		else                       visibleCharsCurrent=1;
+	}
+
+	for(; i<lengthDoc; lineCurrent++) {
+		i       = styler.LineStart(lineCurrent+1);
+		lineEnd = styler.LineStart(lineCurrent+2)-1;
+		if(lineEnd>=lengthDoc) lineEnd = lengthDoc-1;
+		while(styler[lineEnd]=='\n' || styler[lineEnd]=='\r') lineEnd--;
+		for(visibleCharsNext=0, levelNext=SC_FOLDLEVELBASE; !visibleCharsNext && i<=lineEnd; i++){
+			if(isspacechar(styler[i])) levelNext++;
+			else                       visibleCharsNext=1;
+		}
+		int lev = levelCurrent;
+		if(!visibleCharsCurrent) lev |= SC_FOLDLEVELWHITEFLAG;
+		else if(levelNext > levelCurrent) lev |= SC_FOLDLEVELHEADERFLAG;
+		styler.SetLevel(lineCurrent, lev);
+		levelCurrent = levelNext;
+		visibleCharsCurrent = visibleCharsNext;
+	}
+}
+
+LexerModule lmIndent(SCLEX_INDENT, ColouriseIndentDoc, "indent", FoldIndentDoc);
diff --git a/scite-app/lexilla/lexers/LexInno.cxx b/scite-app/lexilla/lexers/LexInno.cxx
new file mode 100644
index 0000000..64971a7
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexInno.cxx
@@ -0,0 +1,291 @@
+// Scintilla source code edit control
+/** @file LexInno.cxx
+ ** Lexer for Inno Setup scripts.
+ **/
+// Written by Friedrich Vedder <fvedd@t-online.de>, using code from LexOthers.cxx.
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseInnoDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) {
+	int state = SCE_INNO_DEFAULT;
+	char chPrev;
+	char ch = 0;
+	char chNext = styler[startPos];
+	Sci_Position lengthDoc = startPos + length;
+	char *buffer = new char[length+1];
+	Sci_Position bufferCount = 0;
+	bool isBOL, isEOL, isWS, isBOLWS = 0;
+	bool isCStyleComment = false;
+
+	WordList &sectionKeywords = *keywordLists[0];
+	WordList &standardKeywords = *keywordLists[1];
+	WordList &parameterKeywords = *keywordLists[2];
+	WordList &preprocessorKeywords = *keywordLists[3];
+	WordList &pascalKeywords = *keywordLists[4];
+	WordList &userKeywords = *keywordLists[5];
+
+	Sci_Position curLine = styler.GetLine(startPos);
+	int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : 0;
+	bool isCode = (curLineState == 1);
+
+	// Go through all provided text segment
+	// using the hand-written state machine shown below
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		chPrev = ch;
+		ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i++;
+			continue;
+		}
+
+		isBOL = (chPrev == 0) || (chPrev == '\n') || (chPrev == '\r' && ch != '\n');
+		isBOLWS = (isBOL) ? 1 : (isBOLWS && (chPrev == ' ' || chPrev == '\t'));
+		isEOL = (ch == '\n' || ch == '\r');
+		isWS = (ch == ' ' || ch == '\t');
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Remember the line state for future incremental lexing
+			curLine = styler.GetLine(i);
+			styler.SetLineState(curLine, (isCode ? 1 : 0));
+		}
+
+		switch(state) {
+			case SCE_INNO_DEFAULT:
+				if (!isCode && ch == ';' && isBOLWS) {
+					// Start of a comment
+					state = SCE_INNO_COMMENT;
+				} else if (ch == '[' && isBOLWS) {
+					// Start of a section name
+					bufferCount = 0;
+					state = SCE_INNO_SECTION;
+				} else if (ch == '#' && isBOLWS) {
+					// Start of a preprocessor directive
+					state = SCE_INNO_PREPROC;
+				} else if (!isCode && ch == '{' && chNext != '{' && chPrev != '{') {
+					// Start of an inline expansion
+					state = SCE_INNO_INLINE_EXPANSION;
+				} else if (isCode && (ch == '{' || (ch == '(' && chNext == '*'))) {
+					// Start of a Pascal comment
+					state = SCE_INNO_COMMENT_PASCAL;
+					isCStyleComment = false;
+				} else if (isCode && ch == '/' && chNext == '/') {
+					// Apparently, C-style comments are legal, too
+					state = SCE_INNO_COMMENT_PASCAL;
+					isCStyleComment = true;
+				} else if (ch == '"') {
+					// Start of a double-quote string
+					state = SCE_INNO_STRING_DOUBLE;
+				} else if (ch == '\'') {
+					// Start of a single-quote string
+					state = SCE_INNO_STRING_SINGLE;
+				} else if (IsASCII(ch) && (isalpha(ch) || (ch == '_'))) {
+					// Start of an identifier
+					bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+					state = SCE_INNO_IDENTIFIER;
+				} else {
+					// Style it the default style
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_COMMENT:
+				if (isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_COMMENT);
+				}
+				break;
+
+			case SCE_INNO_IDENTIFIER:
+				if (IsASCII(ch) && (isalnum(ch) || (ch == '_'))) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_INNO_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Check if the buffer contains a keyword
+					if (!isCode && standardKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD);
+					} else if (!isCode && parameterKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_PARAMETER);
+					} else if (isCode && pascalKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD_PASCAL);
+					} else if (!isCode && userKeywords.InList(buffer)) {
+						styler.ColourTo(i-1,SCE_INNO_KEYWORD_USER);
+					} else {
+						styler.ColourTo(i-1,SCE_INNO_DEFAULT);
+					}
+
+					// Push back the faulty character
+					chNext = styler[i--];
+					ch = chPrev;
+				}
+				break;
+
+			case SCE_INNO_SECTION:
+				if (ch == ']') {
+					state = SCE_INNO_DEFAULT;
+					buffer[bufferCount] = '\0';
+
+					// Check if the buffer contains a section name
+					if (sectionKeywords.InList(buffer)) {
+						styler.ColourTo(i,SCE_INNO_SECTION);
+						isCode = !CompareCaseInsensitive(buffer, "code");
+					} else {
+						styler.ColourTo(i,SCE_INNO_DEFAULT);
+					}
+				} else if (IsASCII(ch) && (isalnum(ch) || (ch == '_'))) {
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				} else {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_PREPROC:
+				if (isWS || isEOL) {
+					if (IsASCII(chPrev) && isalpha(chPrev)) {
+						state = SCE_INNO_DEFAULT;
+						buffer[bufferCount] = '\0';
+
+						// Check if the buffer contains a preprocessor directive
+						if (preprocessorKeywords.InList(buffer)) {
+							styler.ColourTo(i-1,SCE_INNO_PREPROC);
+						} else {
+							styler.ColourTo(i-1,SCE_INNO_DEFAULT);
+						}
+
+						// Push back the faulty character
+						chNext = styler[i--];
+						ch = chPrev;
+					}
+				} else if (IsASCII(ch) && isalpha(ch)) {
+					if (chPrev == '#' || chPrev == ' ' || chPrev == '\t')
+						bufferCount = 0;
+					buffer[bufferCount++] = static_cast<char>(tolower(ch));
+				}
+				break;
+
+			case SCE_INNO_STRING_DOUBLE:
+				if (ch == '"' || isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_STRING_DOUBLE);
+				}
+				break;
+
+			case SCE_INNO_STRING_SINGLE:
+				if (ch == '\'' || isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_STRING_SINGLE);
+				}
+				break;
+
+			case SCE_INNO_INLINE_EXPANSION:
+				if (ch == '}') {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_INLINE_EXPANSION);
+				} else if (isEOL) {
+					state = SCE_INNO_DEFAULT;
+					styler.ColourTo(i,SCE_INNO_DEFAULT);
+				}
+				break;
+
+			case SCE_INNO_COMMENT_PASCAL:
+				if (isCStyleComment) {
+					if (isEOL) {
+						state = SCE_INNO_DEFAULT;
+						styler.ColourTo(i,SCE_INNO_COMMENT_PASCAL);
+					}
+				} else {
+					if (ch == '}' || (ch == ')' && chPrev == '*')) {
+						state = SCE_INNO_DEFAULT;
+						styler.ColourTo(i,SCE_INNO_COMMENT_PASCAL);
+					} else if (isEOL) {
+						state = SCE_INNO_DEFAULT;
+						styler.ColourTo(i,SCE_INNO_DEFAULT);
+					}
+				}
+				break;
+
+		}
+	}
+	delete []buffer;
+}
+
+static const char * const innoWordListDesc[] = {
+	"Sections",
+	"Keywords",
+	"Parameters",
+	"Preprocessor directives",
+	"Pascal keywords",
+	"User defined keywords",
+	0
+};
+
+static void FoldInnoDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	Sci_PositionU endPos = startPos + length;
+	char chNext = styler[startPos];
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	bool sectionFlag = false;
+	int levelPrev = lineCurrent > 0 ? styler.LevelAt(lineCurrent - 1) : SC_FOLDLEVELBASE;
+	int level;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler[i+1];
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		int style = styler.StyleAt(i);
+
+		if (style == SCE_INNO_SECTION)
+			sectionFlag = true;
+
+		if (atEOL || i == endPos - 1) {
+			if (sectionFlag) {
+				level = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				if (level == levelPrev)
+					styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG);
+			} else {
+				level = levelPrev & SC_FOLDLEVELNUMBERMASK;
+				if (levelPrev & SC_FOLDLEVELHEADERFLAG)
+					level++;
+			}
+
+			styler.SetLevel(lineCurrent, level);
+
+			levelPrev = level;
+			lineCurrent++;
+			sectionFlag = false;
+		}
+	}
+}
+
+LexerModule lmInno(SCLEX_INNOSETUP, ColouriseInnoDoc, "inno", FoldInnoDoc, innoWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexJSON.cxx b/scite-app/lexilla/lexers/LexJSON.cxx
new file mode 100644
index 0000000..9261671
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexJSON.cxx
@@ -0,0 +1,506 @@
+// Scintilla source code edit control
+/**
+ * @file LexJSON.cxx
+ * @date February 19, 2016
+ * @brief Lexer for JSON and JSON-LD formats
+ * @author nkmathew
+ *
+ * The License.txt file describes the conditions under which this software may
+ * be distributed.
+ *
+ */
+
+#include <cstdlib>
+#include <cassert>
+#include <cctype>
+#include <cstdio>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static const char *const JSONWordListDesc[] = {
+	"JSON Keywords",
+	"JSON-LD Keywords",
+	0
+};
+
+/**
+ * Used to detect compact IRI/URLs in JSON-LD without first looking ahead for the
+ * colon separating the prefix and suffix
+ *
+ * https://www.w3.org/TR/json-ld/#dfn-compact-iri
+ */
+struct CompactIRI {
+	int colonCount;
+	bool foundInvalidChar;
+	CharacterSet setCompactIRI;
+	CompactIRI() {
+		colonCount = 0;
+		foundInvalidChar = false;
+		setCompactIRI = CharacterSet(CharacterSet::setAlpha, "$_-");
+	}
+	void resetState() {
+		colonCount = 0;
+		foundInvalidChar = false;
+	}
+	void checkChar(int ch) {
+		if (ch == ':') {
+			colonCount++;
+		} else {
+			foundInvalidChar |= !setCompactIRI.Contains(ch);
+		}
+	}
+	bool shouldHighlight() const {
+		return !foundInvalidChar && colonCount == 1;
+	}
+};
+
+/**
+ * Keeps track of escaped characters in strings as per:
+ *
+ * https://tools.ietf.org/html/rfc7159#section-7
+ */
+struct EscapeSequence {
+	int digitsLeft;
+	CharacterSet setHexDigits;
+	CharacterSet setEscapeChars;
+	EscapeSequence() {
+		digitsLeft = 0;
+		setHexDigits = CharacterSet(CharacterSet::setDigits, "ABCDEFabcdef");
+		setEscapeChars = CharacterSet(CharacterSet::setNone, "\\\"tnbfru/");
+	}
+	// Returns true if the following character is a valid escaped character
+	bool newSequence(int nextChar) {
+		digitsLeft = 0;
+		if (nextChar == 'u') {
+			digitsLeft = 5;
+		} else if (!setEscapeChars.Contains(nextChar)) {
+			return false;
+		}
+		return true;
+	}
+	bool atEscapeEnd() const {
+		return digitsLeft <= 0;
+	}
+	bool isInvalidChar(int currChar) const {
+		return !setHexDigits.Contains(currChar);
+	}
+};
+
+struct OptionsJSON {
+	bool foldCompact;
+	bool fold;
+	bool allowComments;
+	bool escapeSequence;
+	OptionsJSON() {
+		foldCompact = false;
+		fold = false;
+		allowComments = false;
+		escapeSequence = false;
+	}
+};
+
+struct OptionSetJSON : public OptionSet<OptionsJSON> {
+	OptionSetJSON() {
+		DefineProperty("lexer.json.escape.sequence", &OptionsJSON::escapeSequence,
+					   "Set to 1 to enable highlighting of escape sequences in strings");
+
+		DefineProperty("lexer.json.allow.comments", &OptionsJSON::allowComments,
+					   "Set to 1 to enable highlighting of line/block comments in JSON");
+
+		DefineProperty("fold.compact", &OptionsJSON::foldCompact);
+		DefineProperty("fold", &OptionsJSON::fold);
+		DefineWordListSets(JSONWordListDesc);
+	}
+};
+
+class LexerJSON : public DefaultLexer {
+	OptionsJSON options;
+	OptionSetJSON optSetJSON;
+	EscapeSequence escapeSeq;
+	WordList keywordsJSON;
+	WordList keywordsJSONLD;
+	CharacterSet setOperators;
+	CharacterSet setURL;
+	CharacterSet setKeywordJSONLD;
+	CharacterSet setKeywordJSON;
+	CompactIRI compactIRI;
+
+	static bool IsNextNonWhitespace(LexAccessor &styler, Sci_Position start, char ch) {
+		Sci_Position i = 0;
+		while (i < 50) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			char next = styler.SafeGetCharAt(start+i+1, '\0');
+			bool atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+			if (curr == ch) {
+				return true;
+			} else if (!isspacechar(curr) || atEOL) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Looks for the colon following the end quote
+	 *
+	 * Assumes property names of lengths no longer than a 100 characters.
+	 * The colon is also expected to be less than 50 spaces after the end
+	 * quote for the string to be considered a property name
+	 */
+	static bool AtPropertyName(LexAccessor &styler, Sci_Position start) {
+		Sci_Position i = 0;
+		bool escaped = false;
+		while (i < 100) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			escaped = curr == '\\';
+			if (curr == '"') {
+				return IsNextNonWhitespace(styler, start+i, ':');
+			} else if (!curr) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	static bool IsNextWordInList(WordList &keywordList, CharacterSet wordSet,
+								 StyleContext &context, LexAccessor &styler) {
+		char word[51];
+		Sci_Position currPos = (Sci_Position) context.currentPos;
+		int i = 0;
+		while (i < 50) {
+			char ch = styler.SafeGetCharAt(currPos + i);
+			if (!wordSet.Contains(ch)) {
+				break;
+			}
+			word[i] = ch;
+			i++;
+		}
+		word[i] = '\0';
+		return keywordList.InList(word);
+	}
+
+	public:
+	LexerJSON() :
+		DefaultLexer("json", SCLEX_JSON),
+		setOperators(CharacterSet::setNone, "[{}]:,"),
+		setURL(CharacterSet::setAlphaNum, "-._~:/?#[]@!$&'()*+,),="),
+		setKeywordJSONLD(CharacterSet::setAlpha, ":@"),
+		setKeywordJSON(CharacterSet::setAlpha, "$_") {
+	}
+	virtual ~LexerJSON() {}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return optSetJSON.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return optSetJSON.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return optSetJSON.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override {
+		if (optSetJSON.PropertySet(&options, key, val)) {
+			return 0;
+		}
+		return -1;
+	}
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return optSetJSON.PropertyGet(key);
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override {
+		WordList *wordListN = 0;
+		switch (n) {
+			case 0:
+				wordListN = &keywordsJSON;
+				break;
+			case 1:
+				wordListN = &keywordsJSONLD;
+				break;
+		}
+		Sci_Position firstModification = -1;
+		if (wordListN) {
+			WordList wlNew;
+			wlNew.Set(wl);
+			if (*wordListN != wlNew) {
+				wordListN->Set(wl);
+				firstModification = 0;
+			}
+		}
+		return firstModification;
+	}
+	void *SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+	static ILexer5 *LexerFactoryJSON() {
+		return new LexerJSON;
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return optSetJSON.DescribeWordListSets();
+	}
+	void SCI_METHOD Lex(Sci_PositionU startPos,
+								Sci_Position length,
+								int initStyle,
+								IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos,
+								 Sci_Position length,
+								 int initStyle,
+								 IDocument *pAccess) override;
+};
+
+void SCI_METHOD LexerJSON::Lex(Sci_PositionU startPos,
+							   Sci_Position length,
+							   int initStyle,
+							   IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+	StyleContext context(startPos, length, initStyle, styler);
+	int stringStyleBefore = SCE_JSON_STRING;
+	while (context.More()) {
+		switch (context.state) {
+			case SCE_JSON_BLOCKCOMMENT:
+				if (context.Match("*/")) {
+					context.Forward();
+					context.ForwardSetState(SCE_JSON_DEFAULT);
+				}
+				break;
+			case SCE_JSON_LINECOMMENT:
+				if (context.atLineEnd) {
+					context.SetState(SCE_JSON_DEFAULT);
+				}
+				break;
+			case SCE_JSON_STRINGEOL:
+				if (context.atLineStart) {
+					context.SetState(SCE_JSON_DEFAULT);
+				}
+				break;
+			case SCE_JSON_ESCAPESEQUENCE:
+				escapeSeq.digitsLeft--;
+				if (!escapeSeq.atEscapeEnd()) {
+					if (escapeSeq.isInvalidChar(context.ch)) {
+						context.SetState(SCE_JSON_ERROR);
+					}
+					break;
+				}
+				if (context.ch == '"') {
+					context.SetState(stringStyleBefore);
+					context.ForwardSetState(SCE_C_DEFAULT);
+				} else if (context.ch == '\\') {
+					if (!escapeSeq.newSequence(context.chNext)) {
+						context.SetState(SCE_JSON_ERROR);
+					}
+					context.Forward();
+				} else {
+					context.SetState(stringStyleBefore);
+					if (context.atLineEnd) {
+						context.ChangeState(SCE_JSON_STRINGEOL);
+					}
+				}
+				break;
+			case SCE_JSON_PROPERTYNAME:
+			case SCE_JSON_STRING:
+				if (context.ch == '"') {
+					if (compactIRI.shouldHighlight()) {
+						context.ChangeState(SCE_JSON_COMPACTIRI);
+						context.ForwardSetState(SCE_JSON_DEFAULT);
+						compactIRI.resetState();
+					} else {
+						context.ForwardSetState(SCE_JSON_DEFAULT);
+					}
+				} else if (context.atLineEnd) {
+					context.ChangeState(SCE_JSON_STRINGEOL);
+				} else if (context.ch == '\\') {
+					stringStyleBefore = context.state;
+					if (options.escapeSequence) {
+						context.SetState(SCE_JSON_ESCAPESEQUENCE);
+						if (!escapeSeq.newSequence(context.chNext)) {
+							context.SetState(SCE_JSON_ERROR);
+						}
+					}
+					context.Forward();
+				} else if (context.Match("https://") ||
+						   context.Match("http://") ||
+						   context.Match("ssh://") ||
+						   context.Match("git://") ||
+						   context.Match("svn://") ||
+						   context.Match("ftp://") ||
+						   context.Match("mailto:")) {
+					// Handle most common URI schemes only
+					stringStyleBefore = context.state;
+					context.SetState(SCE_JSON_URI);
+				} else if (context.ch == '@') {
+					// https://www.w3.org/TR/json-ld/#dfn-keyword
+					if (IsNextWordInList(keywordsJSONLD, setKeywordJSONLD, context, styler)) {
+						stringStyleBefore = context.state;
+						context.SetState(SCE_JSON_LDKEYWORD);
+					}
+				} else {
+					compactIRI.checkChar(context.ch);
+				}
+				break;
+			case SCE_JSON_LDKEYWORD:
+			case SCE_JSON_URI:
+				if ((!setKeywordJSONLD.Contains(context.ch) &&
+					 (context.state == SCE_JSON_LDKEYWORD)) ||
+					(!setURL.Contains(context.ch))) {
+					context.SetState(stringStyleBefore);
+				}
+				if (context.ch == '"') {
+					context.ForwardSetState(SCE_JSON_DEFAULT);
+				} else if (context.atLineEnd) {
+					context.ChangeState(SCE_JSON_STRINGEOL);
+				}
+				break;
+			case SCE_JSON_OPERATOR:
+			case SCE_JSON_NUMBER:
+				context.SetState(SCE_JSON_DEFAULT);
+				break;
+			case SCE_JSON_ERROR:
+				if (context.atLineEnd) {
+					context.SetState(SCE_JSON_DEFAULT);
+				}
+				break;
+			case SCE_JSON_KEYWORD:
+				if (!setKeywordJSON.Contains(context.ch)) {
+					context.SetState(SCE_JSON_DEFAULT);
+				}
+				break;
+		}
+		if (context.state == SCE_JSON_DEFAULT) {
+			if (context.ch == '"') {
+				compactIRI.resetState();
+				context.SetState(SCE_JSON_STRING);
+				Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+				if (AtPropertyName(styler, currPos)) {
+					context.SetState(SCE_JSON_PROPERTYNAME);
+				}
+			} else if (setOperators.Contains(context.ch)) {
+				context.SetState(SCE_JSON_OPERATOR);
+			} else if (options.allowComments && context.Match("/*")) {
+				context.SetState(SCE_JSON_BLOCKCOMMENT);
+				context.Forward();
+			} else if (options.allowComments && context.Match("//")) {
+				context.SetState(SCE_JSON_LINECOMMENT);
+			} else if (setKeywordJSON.Contains(context.ch)) {
+				if (IsNextWordInList(keywordsJSON, setKeywordJSON, context, styler)) {
+					context.SetState(SCE_JSON_KEYWORD);
+				}
+			}
+			bool numberStart =
+				IsADigit(context.ch) && (context.chPrev == '+'||
+										 context.chPrev == '-' ||
+										 context.atLineStart ||
+										 IsASpace(context.chPrev) ||
+										 setOperators.Contains(context.chPrev));
+			bool exponentPart =
+				tolower(context.ch) == 'e' &&
+				IsADigit(context.chPrev) &&
+				(IsADigit(context.chNext) ||
+				 context.chNext == '+' ||
+				 context.chNext == '-');
+			bool signPart =
+				(context.ch == '-' || context.ch == '+') &&
+				((tolower(context.chPrev) == 'e' && IsADigit(context.chNext)) ||
+				 ((IsASpace(context.chPrev) || setOperators.Contains(context.chPrev))
+				  && IsADigit(context.chNext)));
+			bool adjacentDigit =
+				IsADigit(context.ch) && IsADigit(context.chPrev);
+			bool afterExponent = IsADigit(context.ch) && tolower(context.chPrev) == 'e';
+			bool dotPart = context.ch == '.' &&
+				IsADigit(context.chPrev) &&
+				IsADigit(context.chNext);
+			bool afterDot = IsADigit(context.ch) && context.chPrev == '.';
+			if (numberStart ||
+				exponentPart ||
+				signPart ||
+				adjacentDigit ||
+				dotPart ||
+				afterExponent ||
+				afterDot) {
+				context.SetState(SCE_JSON_NUMBER);
+			} else if (context.state == SCE_JSON_DEFAULT && !IsASpace(context.ch)) {
+				context.SetState(SCE_JSON_ERROR);
+			}
+		}
+		context.Forward();
+	}
+	context.Complete();
+}
+
+void SCI_METHOD LexerJSON::Fold(Sci_PositionU startPos,
+								Sci_Position length,
+								int,
+								IDocument *pAccess) {
+	if (!options.fold) {
+		return;
+	}
+	LexAccessor styler(pAccess);
+	Sci_PositionU currLine = styler.GetLine(startPos);
+	Sci_PositionU endPos = startPos + length;
+	int currLevel = SC_FOLDLEVELBASE;
+	if (currLine > 0)
+		currLevel = styler.LevelAt(currLine - 1) >> 16;
+	int nextLevel = currLevel;
+	int visibleChars = 0;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char curr = styler.SafeGetCharAt(i);
+		char next = styler.SafeGetCharAt(i+1);
+		bool atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+		if (styler.StyleAt(i) == SCE_JSON_OPERATOR) {
+			if (curr == '{' || curr == '[') {
+				nextLevel++;
+			} else if (curr == '}' || curr == ']') {
+				nextLevel--;
+			}
+		}
+		if (atEOL || i == (endPos-1)) {
+			int level = currLevel | nextLevel << 16;
+			if (!visibleChars && options.foldCompact) {
+				level |= SC_FOLDLEVELWHITEFLAG;
+			} else if (nextLevel > currLevel) {
+				level |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (level != styler.LevelAt(currLine)) {
+				styler.SetLevel(currLine, level);
+			}
+			currLine++;
+			currLevel = nextLevel;
+			visibleChars = 0;
+		}
+		if (!isspacechar(curr)) {
+			visibleChars++;
+		}
+	}
+}
+
+LexerModule lmJSON(SCLEX_JSON,
+				   LexerJSON::LexerFactoryJSON,
+				   "json",
+				   JSONWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexJulia.cxx b/scite-app/lexilla/lexers/LexJulia.cxx
new file mode 100644
index 0000000..7bbbe51
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexJulia.cxx
@@ -0,0 +1,1263 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file LexJulia.cxx
+ ** Lexer for Julia.
+ ** Reusing code from LexMatlab, LexPython and LexRust
+ **
+ ** Written by Bertrand Lacoste
+ **
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static const int MAX_JULIA_IDENT_CHARS = 1023;
+
+// Options used for LexerJulia
+struct OptionsJulia {
+    bool fold;
+    bool foldComment;
+    bool foldCompact;
+    bool foldDocstring;
+    bool foldSyntaxBased;
+    bool highlightTypeannotation;
+    bool highlightLexerror;
+	OptionsJulia() {
+        fold = true;
+        foldComment = true;
+        foldCompact = false;
+        foldDocstring = true;
+        foldSyntaxBased = true;
+        highlightTypeannotation = false;
+        highlightLexerror = false;
+	}
+};
+
+const char * const juliaWordLists[] = {
+    "Primary keywords and identifiers",
+    "Built in types",
+    "Other keywords",
+    "Built in functions",
+    0,
+};
+
+struct OptionSetJulia : public OptionSet<OptionsJulia> {
+	OptionSetJulia() {
+		DefineProperty("fold", &OptionsJulia::fold);
+
+		DefineProperty("fold.compact", &OptionsJulia::foldCompact);
+
+		DefineProperty("fold.comment", &OptionsJulia::foldComment);
+
+		DefineProperty("fold.julia.docstring", &OptionsJulia::foldDocstring,
+			"Fold multiline triple-doublequote strings, usually used to document a function or type above the definition.");
+
+		DefineProperty("fold.julia.syntax.based", &OptionsJulia::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("lexer.julia.highlight.typeannotation", &OptionsJulia::highlightTypeannotation,
+			"This option enables highlighting of the type identifier after `::`.");
+
+		DefineProperty("lexer.julia.highlight.lexerror", &OptionsJulia::highlightLexerror,
+			"This option enables highlighting of syntax error int character or number definition.");
+
+		DefineWordListSets(juliaWordLists);
+	}
+};
+
+LexicalClass juliaLexicalClasses[] = {
+	// Lexer Julia SCLEX_JULIA SCE_JULIA_:
+	0,  "SCE_JULIA_DEFAULT", "default", "White space",
+	1,  "SCE_JULIA_COMMENT", "comment", "Comment",
+	2,  "SCE_JULIA_NUMBER", "literal numeric", "Number",
+	3,  "SCE_JULIA_KEYWORD1", "keyword", "Reserved keywords",
+	4,  "SCE_JULIA_KEYWORD2", "identifier", "Builtin type names",
+	5,  "SCE_JULIA_KEYWORD3", "identifier", "Constants",
+	6,  "SCE_JULIA_CHAR", "literal string character", "Single quoted string",
+	7,  "SCE_JULIA_OPERATOR", "operator", "Operator",
+	8,  "SCE_JULIA_BRACKET", "bracket operator", "Bracket operator",
+	9,  "SCE_JULIA_IDENTIFIER", "identifier", "Identifier",
+	10, "SCE_JULIA_STRING", "literal string", "Double quoted String",
+	11, "SCE_JULIA_SYMBOL", "literal string symbol", "Symbol",
+	12, "SCE_JULIA_MACRO", "macro preprocessor", "Macro",
+	13, "SCE_JULIA_STRINGINTERP", "literal string interpolated", "String interpolation",
+	14, "SCE_JULIA_DOCSTRING", "literal string documentation", "Docstring",
+	15, "SCE_JULIA_STRINGLITERAL", "literal string", "String literal prefix",
+	16, "SCE_JULIA_COMMAND", "literal string command", "Command",
+	17, "SCE_JULIA_COMMANDLITERAL", "literal string command", "Command literal prefix",
+	18, "SCE_JULIA_TYPEANNOT", "identifier type", "Type annotation identifier",
+	19, "SCE_JULIA_LEXERROR", "lexer error", "Lexing error",
+	20, "SCE_JULIA_KEYWORD4", "identifier", "Builtin function names",
+	21, "SCE_JULIA_TYPEOPERATOR", "operator type", "Type annotation operator",
+};
+
+class LexerJulia : public DefaultLexer {
+	WordList keywords;
+	WordList identifiers2;
+	WordList identifiers3;
+	WordList identifiers4;
+	OptionsJulia options;
+	OptionSetJulia osJulia;
+public:
+	explicit LexerJulia() :
+		DefaultLexer("julia", SCLEX_JULIA, juliaLexicalClasses, ELEMENTS(juliaLexicalClasses)) {
+	}
+	virtual ~LexerJulia() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osJulia.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osJulia.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osJulia.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osJulia.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osJulia.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	static ILexer5 *LexerFactoryJulia() {
+		return new LexerJulia();
+	}
+};
+
+Sci_Position SCI_METHOD LexerJulia::PropertySet(const char *key, const char *val) {
+	if (osJulia.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerJulia::WordListSet(int n, const char *wl) {
+	WordList *wordListN = nullptr;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &identifiers2;
+		break;
+	case 2:
+		wordListN = &identifiers3;
+		break;
+	case 3:
+		wordListN = &identifiers4;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+static inline bool IsJuliaOperator(int ch) {
+    if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+        ch == '-' || ch == '+' || ch == '=' || ch == '|' ||
+        ch == '<' || ch == '>' || ch == '/' || ch == '~' ||
+        ch == '\\' ) {
+        return true;
+    }
+    return false;
+}
+
+// The list contains non-ascii unary operators
+static inline bool IsJuliaUnaryOperator (int ch) {
+    if (ch == 0x00ac || ch == 0x221a || ch == 0x221b ||
+        ch == 0x221c || ch == 0x22c6 || ch == 0x00b1 ||
+        ch == 0x2213 ) {
+        return true;
+    }
+    return false;
+}
+
+static inline bool IsJuliaParen (int ch) {
+    if (ch == '(' || ch == ')' || ch == '{' || ch == '}' ||
+        ch == '[' || ch == ']' ) {
+        return true;
+    }
+    return false;
+}
+
+// Unicode parsing from Julia source code:
+// https://github.com/JuliaLang/julia/blob/master/src/flisp/julia_extensions.c
+// keep the same function name to be easy to find again
+static int is_wc_cat_id_start(uint32_t wc) {
+    const CharacterCategory cat = CategoriseCharacter((int) wc);
+
+    return (cat == ccLu || cat == ccLl ||
+            cat == ccLt || cat == ccLm ||
+            cat == ccLo || cat == ccNl ||
+            cat == ccSc ||  // allow currency symbols
+            // other symbols, but not arrows or replacement characters
+            (cat == ccSo && !(wc >= 0x2190 && wc <= 0x21FF) &&
+             wc != 0xfffc && wc != 0xfffd &&
+             wc != 0x233f &&  // notslash
+             wc != 0x00a6) || // broken bar
+
+            // math symbol (category Sm) whitelist
+            (wc >= 0x2140 && wc <= 0x2a1c &&
+             ((wc >= 0x2140 && wc <= 0x2144) || // ⅀, ⅁, ⅂, ⅃, ⅄
+              wc == 0x223f || wc == 0x22be || wc == 0x22bf || // ∿, ⊾, ⊿
+              wc == 0x22a4 || wc == 0x22a5 ||   // ⊤ ⊥
+
+              (wc >= 0x2202 && wc <= 0x2233 &&
+               (wc == 0x2202 || wc == 0x2205 || wc == 0x2206 || // ∂, ∅, ∆
+                wc == 0x2207 || wc == 0x220e || wc == 0x220f || // ∇, ∎, ∏
+                wc == 0x2210 || wc == 0x2211 || // ∐, ∑
+                wc == 0x221e || wc == 0x221f || // ∞, ∟
+                wc >= 0x222b)) || // ∫, ∬, ∭, ∮, ∯, ∰, ∱, ∲, ∳
+
+              (wc >= 0x22c0 && wc <= 0x22c3) ||  // N-ary big ops: ⋀, ⋁, ⋂, ⋃
+              (wc >= 0x25F8 && wc <= 0x25ff) ||  // ◸, ◹, ◺, ◻, ◼, ◽, ◾, ◿
+
+              (wc >= 0x266f &&
+               (wc == 0x266f || wc == 0x27d8 || wc == 0x27d9 || // ♯, ⟘, ⟙
+                (wc >= 0x27c0 && wc <= 0x27c1) ||  // ⟀, ⟁
+                (wc >= 0x29b0 && wc <= 0x29b4) ||  // ⦰, ⦱, ⦲, ⦳, ⦴
+                (wc >= 0x2a00 && wc <= 0x2a06) ||  // ⨀, ⨁, ⨂, ⨃, ⨄, ⨅, ⨆
+                (wc >= 0x2a09 && wc <= 0x2a16) ||  // ⨉, ⨊, ⨋, ⨌, ⨍, ⨎, ⨏, ⨐, ⨑, ⨒, ⨓, ⨔, ⨕, ⨖
+                wc == 0x2a1b || wc == 0x2a1c)))) || // ⨛, ⨜
+
+            (wc >= 0x1d6c1 && // variants of \nabla and \partial
+             (wc == 0x1d6c1 || wc == 0x1d6db ||
+              wc == 0x1d6fb || wc == 0x1d715 ||
+              wc == 0x1d735 || wc == 0x1d74f ||
+              wc == 0x1d76f || wc == 0x1d789 ||
+              wc == 0x1d7a9 || wc == 0x1d7c3)) ||
+
+            // super- and subscript +-=()
+            (wc >= 0x207a && wc <= 0x207e) ||
+            (wc >= 0x208a && wc <= 0x208e) ||
+
+            // angle symbols
+            (wc >= 0x2220 && wc <= 0x2222) || // ∠, ∡, ∢
+            (wc >= 0x299b && wc <= 0x29af) || // ⦛, ⦜, ⦝, ⦞, ⦟, ⦠, ⦡, ⦢, ⦣, ⦤, ⦥, ⦦, ⦧, ⦨, ⦩, ⦪, ⦫, ⦬, ⦭, ⦮, ⦯
+
+            // Other_ID_Start
+            wc == 0x2118 || wc == 0x212E || // ℘, ℮
+            (wc >= 0x309B && wc <= 0x309C) || // katakana-hiragana sound marks
+
+            // bold-digits and double-struck digits
+            (wc >= 0x1D7CE && wc <= 0x1D7E1)); // 𝟎 through 𝟗 (inclusive), 𝟘 through 𝟡 (inclusive)
+}
+
+static inline bool IsIdentifierFirstCharacter (int ch) {
+    if (IsASCII(ch)) {
+        return (bool) (isalpha(ch) || ch == '_');
+    }
+    if (ch < 0xA1 || ch > 0x10ffff) {
+        return false;
+    }
+
+    return is_wc_cat_id_start((uint32_t) ch);
+}
+
+static inline bool IsIdentifierCharacter (int ch) {
+    if (IsASCII(ch)) {
+        return (bool) (isalnum(ch) || ch == '_' || ch == '!');
+    }
+    if (ch < 0xA1 || ch > 0x10ffff) {
+        return false;
+    }
+
+    if (is_wc_cat_id_start((uint32_t) ch)) {
+        return true;
+    }
+
+    const CharacterCategory cat = CategoriseCharacter(ch);
+
+    if (cat == ccMn || cat == ccMc ||
+        cat == ccNd || cat == ccPc ||
+        cat == ccSk || cat == ccMe ||
+        cat == ccNo ||
+        // primes (single, double, triple, their reverses, and quadruple)
+        (ch >= 0x2032 && ch <= 0x2037) || (ch == 0x2057)) {
+        return true;
+    }
+    return false;
+}
+
+// keep the same function name to be easy to find again
+static const uint32_t opsuffs[] = {
+   0x00b2, // ²
+   0x00b3, // ³
+   0x00b9, // ¹
+   0x02b0, // ʰ
+   0x02b2, // ʲ
+   0x02b3, // ʳ
+   0x02b7, // ʷ
+   0x02b8, // ʸ
+   0x02e1, // ˡ
+   0x02e2, // ˢ
+   0x02e3, // ˣ
+   0x1d2c, // ᴬ
+   0x1d2e, // ᴮ
+   0x1d30, // ᴰ
+   0x1d31, // ᴱ
+   0x1d33, // ᴳ
+   0x1d34, // ᴴ
+   0x1d35, // ᴵ
+   0x1d36, // ᴶ
+   0x1d37, // ᴷ
+   0x1d38, // ᴸ
+   0x1d39, // ᴹ
+   0x1d3a, // ᴺ
+   0x1d3c, // ᴼ
+   0x1d3e, // ᴾ
+   0x1d3f, // ᴿ
+   0x1d40, // ᵀ
+   0x1d41, // ᵁ
+   0x1d42, // ᵂ
+   0x1d43, // ᵃ
+   0x1d47, // ᵇ
+   0x1d48, // ᵈ
+   0x1d49, // ᵉ
+   0x1d4d, // ᵍ
+   0x1d4f, // ᵏ
+   0x1d50, // ᵐ
+   0x1d52, // ᵒ
+   0x1d56, // ᵖ
+   0x1d57, // ᵗ
+   0x1d58, // ᵘ
+   0x1d5b, // ᵛ
+   0x1d5d, // ᵝ
+   0x1d5e, // ᵞ
+   0x1d5f, // ᵟ
+   0x1d60, // ᵠ
+   0x1d61, // ᵡ
+   0x1d62, // ᵢ
+   0x1d63, // ᵣ
+   0x1d64, // ᵤ
+   0x1d65, // ᵥ
+   0x1d66, // ᵦ
+   0x1d67, // ᵧ
+   0x1d68, // ᵨ
+   0x1d69, // ᵩ
+   0x1d6a, // ᵪ
+   0x1d9c, // ᶜ
+   0x1da0, // ᶠ
+   0x1da5, // ᶥ
+   0x1da6, // ᶦ
+   0x1dab, // ᶫ
+   0x1db0, // ᶰ
+   0x1db8, // ᶸ
+   0x1dbb, // ᶻ
+   0x1dbf, // ᶿ
+   0x2032, // ′
+   0x2033, // ″
+   0x2034, // ‴
+   0x2035, // ‵
+   0x2036, // ‶
+   0x2037, // ‷
+   0x2057, // ⁗
+   0x2070, // ⁰
+   0x2071, // ⁱ
+   0x2074, // ⁴
+   0x2075, // ⁵
+   0x2076, // ⁶
+   0x2077, // ⁷
+   0x2078, // ⁸
+   0x2079, // ⁹
+   0x207a, // ⁺
+   0x207b, // ⁻
+   0x207c, // ⁼
+   0x207d, // ⁽
+   0x207e, // ⁾
+   0x207f, // ⁿ
+   0x2080, // ₀
+   0x2081, // ₁
+   0x2082, // ₂
+   0x2083, // ₃
+   0x2084, // ₄
+   0x2085, // ₅
+   0x2086, // ₆
+   0x2087, // ₇
+   0x2088, // ₈
+   0x2089, // ₉
+   0x208a, // ₊
+   0x208b, // ₋
+   0x208c, // ₌
+   0x208d, // ₍
+   0x208e, // ₎
+   0x2090, // ₐ
+   0x2091, // ₑ
+   0x2092, // ₒ
+   0x2093, // ₓ
+   0x2095, // ₕ
+   0x2096, // ₖ
+   0x2097, // ₗ
+   0x2098, // ₘ
+   0x2099, // ₙ
+   0x209a, // ₚ
+   0x209b, // ₛ
+   0x209c, // ₜ
+   0x2c7c, // ⱼ
+   0x2c7d, // ⱽ
+   0xa71b, // ꜛ
+   0xa71c, // ꜜ
+   0xa71d  // ꜝ
+};
+static const size_t opsuffs_len = sizeof(opsuffs) / (sizeof(uint32_t));
+
+// keep the same function name to be easy to find again
+static bool jl_op_suffix_char(uint32_t wc) {
+    if (wc < 0xA1 || wc > 0x10ffff) {
+        return false;
+    }
+    const CharacterCategory cat = CategoriseCharacter((int) wc);
+    if (cat == ccMn || cat == ccMc ||
+        cat == ccMe) {
+        return true;
+    }
+
+    for (size_t i = 0; i < opsuffs_len; ++i) {
+        if (wc == opsuffs[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// keep the same function name to be easy to find again
+static bool never_id_char(uint32_t wc) {
+     const CharacterCategory cat = CategoriseCharacter((int) wc);
+     return (
+          // spaces and control characters:
+          (cat >= ccZs && cat <= ccCs) ||
+
+          // ASCII and Latin1 non-connector punctuation
+          (wc < 0xff &&
+           cat >= ccPd && cat <= ccPo) ||
+
+          wc == '`' ||
+
+          // mathematical brackets
+          (wc >= 0x27e6 && wc <= 0x27ef) ||
+          // angle, corner, and lenticular brackets
+          (wc >= 0x3008 && wc <= 0x3011) ||
+          // tortoise shell, square, and more lenticular brackets
+          (wc >= 0x3014 && wc <= 0x301b) ||
+          // fullwidth parens
+          (wc == 0xff08 || wc == 0xff09) ||
+          // fullwidth square brackets
+          (wc == 0xff3b || wc == 0xff3d));
+}
+
+
+static bool IsOperatorFirstCharacter (int ch) {
+    if (IsASCII(ch)) {
+        if (IsJuliaOperator(ch) ||
+            ch == '!' || ch == '?' ||
+            ch == ':' || ch == ';' ||
+            ch == ',' || ch == '.' ) {
+            return true;
+        }else {
+            return false;
+        }
+    } else if (is_wc_cat_id_start((uint32_t) ch)) {
+        return false;
+    } else if (IsJuliaUnaryOperator(ch) ||
+               ! never_id_char((uint32_t) ch)) {
+        return true;
+    }
+    return false;
+}
+
+static bool IsOperatorCharacter (int ch) {
+    if (IsOperatorFirstCharacter(ch) ||
+        (!IsASCII(ch) && jl_op_suffix_char((uint32_t) ch)) ) {
+        return true;
+    }
+    return false;
+}
+
+static bool CheckBoundsIndexing(char *str) {
+    if (strcmp("begin", str) == 0 || strcmp("end", str) == 0 ) {
+        return true;
+    }
+    return false;
+}
+
+static int CheckKeywordFoldPoint(char *str) {
+    if (strcmp ("if", str) == 0 ||
+        strcmp ("for", str) == 0 ||
+        strcmp ("while", str) == 0 ||
+        strcmp ("try", str) == 0 ||
+        strcmp ("do", str) == 0 ||
+        strcmp ("begin", str) == 0 ||
+        strcmp ("let", str) == 0 ||
+        strcmp ("baremodule", str) == 0 ||
+        strcmp ("quote", str) == 0 ||
+        strcmp ("module", str) == 0 ||
+        strcmp ("struct", str) == 0 ||
+        strcmp ("type", str) == 0 ||
+        strcmp ("macro", str) == 0 ||
+        strcmp ("function", str) == 0) {
+        return 1;
+    }
+    if (strcmp("end", str) == 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static bool IsNumberExpon(int ch, int base) {
+    if ((base == 10 && (ch == 'e' || ch == 'E' || ch == 'f')) ||
+        (base == 16 && (ch == 'p' || ch == 'P'))) {
+        return true;
+    }
+    return false;
+}
+
+/* Scans a sequence of digits, returning true if it found any. */
+static bool ScanDigits(StyleContext& sc, int base, bool allow_sep) {
+	bool found = false;
+    for (;;) {
+		if (IsADigit(sc.chNext, base) || (allow_sep && sc.chNext == '_')) {
+			found = true;
+            sc.Forward();
+		} else {
+			break;
+        }
+	}
+	return found;
+}
+
+static inline bool ScanNHexas(StyleContext &sc, int max) {
+    int n = 0;
+    bool error = false;
+
+    sc.Forward();
+    if (!IsADigit(sc.ch, 16)) {
+        error = true;
+    } else {
+        while (IsADigit(sc.ch, 16) && n < max) {
+            sc.Forward();
+            n++;
+        }
+    }
+    return error;
+}
+
+static void resumeCharacter(StyleContext &sc, bool lexerror) {
+    bool error = false;
+
+    //  ''' case
+    if (sc.chPrev == '\'' && sc.ch == '\'' && sc.chNext == '\'') {
+        sc.Forward();
+        sc.ForwardSetState(SCE_JULIA_DEFAULT);
+        return;
+    } else if (lexerror && sc.chPrev == '\'' && sc.ch == '\'') {
+        sc.ChangeState(SCE_JULIA_LEXERROR);
+        sc.ForwardSetState(SCE_JULIA_DEFAULT);
+
+    // Escape characters
+    } else if (sc.ch == '\\') {
+        sc.Forward();
+        if (sc.ch == '\'' || sc.ch == '\\' ) {
+            sc.Forward();
+        } else if (sc.ch == 'n' || sc.ch == 't' || sc.ch == 'a' ||
+                   sc.ch == 'b' || sc.ch == 'e' || sc.ch == 'f' ||
+                   sc.ch == 'r' || sc.ch == 'v' ) {
+            sc.Forward();
+        } else if (sc.ch == 'x') {
+            error |= ScanNHexas(sc, 2);
+        } else if (sc.ch == 'u') {
+            error |= ScanNHexas(sc, 4);
+        } else if (sc.ch == 'U') {
+            error |= ScanNHexas(sc, 8);
+        } else if (IsADigit(sc.ch, 8)) {
+            int n = 1;
+            int max = 3;
+            sc.Forward();
+            while (IsADigit(sc.ch, 8) && n < max) {
+                sc.Forward();
+                n++;
+            }
+        }
+
+        if (lexerror) {
+            if (sc.ch != '\'') {
+                error = true;
+                while (sc.ch != '\'' &&
+                       sc.ch != '\r' &&
+                       sc.ch != '\n') {
+                    sc.Forward();
+                }
+            }
+
+            if (error) {
+                sc.ChangeState(SCE_JULIA_LEXERROR);
+                sc.ForwardSetState(SCE_JULIA_DEFAULT);
+            }
+        }
+    } else if (lexerror) {
+        if (sc.ch < 0x20 || sc.ch > 0x10ffff) {
+            error = true;
+        } else {
+            // single character
+            sc.Forward();
+
+            if (sc.ch != '\'') {
+                error = true;
+                while (sc.ch != '\'' &&
+                       sc.ch != '\r' &&
+                       sc.ch != '\n') {
+                    sc.Forward();
+                }
+            }
+        }
+
+        if (error) {
+            sc.ChangeState(SCE_JULIA_LEXERROR);
+            sc.ForwardSetState(SCE_JULIA_DEFAULT);
+        }
+    }
+
+    // closing quote
+    if (sc.ch == '\'') {
+        if (sc.chNext == '\'') {
+            sc.Forward();
+        } else {
+            sc.ForwardSetState(SCE_JULIA_DEFAULT);
+        }
+    }
+}
+
+static inline bool IsACharacter(StyleContext &sc) {
+    return (sc.chPrev == '\'' && sc.chNext == '\'');
+}
+
+static void ScanParenInterpolation(StyleContext &sc) {
+    // TODO: no syntax highlighting inside a string interpolation
+
+    // Level of nested parenthesis
+    int interp_level = 0;
+
+    // If true, it is inside a string and parenthesis are not counted.
+    bool allow_paren_string = false;
+
+
+    // check for end of states
+    for (; sc.More(); sc.Forward()) {
+        // TODO: check corner cases for nested string interpolation
+        // TODO: check corner cases with Command inside interpolation
+
+        if ( sc.ch == '\"' && sc.chPrev != '\\') {
+            // Toggle the string environment (parenthesis are not counted inside a string)
+            allow_paren_string = !allow_paren_string;
+        } else if ( !allow_paren_string ) {
+            if ( sc.ch == '(' && !IsACharacter(sc) ) {
+                interp_level ++;
+            } else if ( sc.ch == ')' && !IsACharacter(sc) && interp_level > 0 ) {
+                interp_level --;
+                if (interp_level == 0) {
+                    // Exit interpolation
+                    return;
+                }
+            }
+        }
+    }
+}
+/*
+ * Start parsing a number, parse the base.
+ */
+static void initNumber (StyleContext &sc, int &base, bool &with_dot) {
+    base = 10;
+    with_dot = false;
+    sc.SetState(SCE_JULIA_NUMBER);
+    if (sc.ch == '0') {
+        if (sc.chNext == 'x') {
+            sc.Forward();
+            base = 16;
+            if (sc.chNext == '.') {
+                sc.Forward();
+                with_dot = true;
+            }
+        } else if (sc.chNext == 'o') {
+            sc.Forward();
+            base = 8;
+        } else if (sc.chNext == 'b') {
+            sc.Forward();
+            base = 2;
+        }
+    } else if (sc.ch == '.') {
+        with_dot = true;
+    }
+}
+
+/*
+ * Resume parsing a String or Command, bounded by the `quote` character (\" or \`)
+ * The `triple` argument specifies if it is a triple-quote String or Command.
+ * Interpolation is detected (with `$`), and parsed if `allow_interp` is true.
+ */
+static void resumeStringLike(StyleContext &sc, int quote, bool triple, bool allow_interp, bool full_highlight) {
+    int stylePrev = sc.state;
+    bool checkcurrent = false;
+
+    // Escape characters
+    if (sc.ch == '\\') {
+        if (sc.chNext == quote || sc.chNext == '\\' || sc.chNext == '$') {
+            sc.Forward();
+        }
+    } else if (allow_interp && sc.ch == '$') {
+        // If the interpolation is only of a variable, do not change state
+        if (sc.chNext == '(') {
+            if (full_highlight) {
+                sc.SetState(SCE_JULIA_STRINGINTERP);
+            } else {
+                sc.ForwardSetState(SCE_JULIA_STRINGINTERP);
+            }
+            ScanParenInterpolation(sc);
+            sc.ForwardSetState(stylePrev);
+
+            checkcurrent = true;
+
+        } else if (full_highlight && IsIdentifierFirstCharacter(sc.chNext)) {
+            sc.SetState(SCE_JULIA_STRINGINTERP);
+            sc.Forward();
+            sc.Forward();
+            for (; sc.More(); sc.Forward()) {
+                if (! IsIdentifierCharacter(sc.ch)) {
+                    break;
+                }
+            }
+            sc.SetState(stylePrev);
+
+            checkcurrent = true;
+        }
+
+        if (checkcurrent) {
+            // Check that the current character is not a special char,
+            // otherwise it will be skipped
+            resumeStringLike(sc, quote, triple, allow_interp, full_highlight);
+        }
+
+    } else if (sc.ch == quote) {
+        if (triple) {
+            if (sc.chNext == quote && sc.GetRelativeCharacter(2) == quote) {
+                // Move to the end of the triple quotes
+                Sci_PositionU nextIndex = sc.currentPos + 2;
+                while (nextIndex > sc.currentPos && sc.More()) {
+                    sc.Forward();
+                }
+                sc.ForwardSetState(SCE_JULIA_DEFAULT);
+            }
+        } else {
+            sc.ForwardSetState(SCE_JULIA_DEFAULT);
+        }
+    }
+}
+
+static void resumeCommand(StyleContext &sc, bool triple, bool allow_interp) {
+    return resumeStringLike(sc, '`', triple, allow_interp, true);
+}
+
+static void resumeString(StyleContext &sc, bool triple, bool allow_interp) {
+    return resumeStringLike(sc, '"', triple, allow_interp, true);
+}
+
+static void resumeNumber (StyleContext &sc, int base, bool &with_dot, bool lexerror) {
+    if (IsNumberExpon(sc.ch, base)) {
+        if (IsADigit(sc.chNext) || sc.chNext == '+' || sc.chNext == '-') {
+            sc.Forward();
+            // Capture all digits
+            ScanDigits(sc, 10, false);
+            sc.Forward();
+        }
+        sc.SetState(SCE_JULIA_DEFAULT);
+    } else if (sc.ch == '.' && sc.chNext == '.') {
+        // Interval operator `..`
+        sc.SetState(SCE_JULIA_OPERATOR);
+        sc.Forward();
+        sc.ForwardSetState(SCE_JULIA_DEFAULT);
+    } else if (sc.ch == '.' && !with_dot) {
+        with_dot = true;
+        ScanDigits(sc, base, true);
+    } else if (IsADigit(sc.ch, base) || sc.ch == '_') {
+        ScanDigits(sc, base, true);
+    } else if (IsADigit(sc.ch) && !IsADigit(sc.ch, base)) {
+        if (lexerror) {
+            sc.ChangeState(SCE_JULIA_LEXERROR);
+        }
+        ScanDigits(sc, 10, false);
+        sc.ForwardSetState(SCE_JULIA_DEFAULT);
+    } else {
+        sc.SetState(SCE_JULIA_DEFAULT);
+    }
+}
+
+static void resumeOperator (StyleContext &sc) {
+    if (sc.chNext == ':' && (sc.ch == ':' || sc.ch == '<' ||
+                    (sc.ch == '>' && (sc.chPrev != '-' && sc.chPrev != '=')))) {
+        // Case `:a=>:b`
+        sc.Forward();
+        sc.ForwardSetState(SCE_JULIA_DEFAULT);
+    } else if (sc.ch == ':') {
+        // Case `foo(:baz,:baz)` or `:one+:two`
+        // Let the default case switch decide if it is a symbol
+        sc.SetState(SCE_JULIA_DEFAULT);
+    } else if (sc.ch == '\'') {
+        sc.SetState(SCE_JULIA_DEFAULT);
+    } else if ((sc.ch == '.' && sc.chPrev != '.') || IsIdentifierFirstCharacter(sc.ch) ||
+               (! (sc.chPrev == '.' && IsOperatorFirstCharacter(sc.ch)) &&
+                ! IsOperatorCharacter(sc.ch)) ) {
+        sc.SetState(SCE_JULIA_DEFAULT);
+    }
+}
+
+void SCI_METHOD LexerJulia::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	PropSetSimple props;
+	Accessor styler(pAccess, &props);
+
+	Sci_Position pos = startPos;
+	styler.StartAt(pos);
+	styler.StartSegment(pos);
+
+    // use the line state of each line to store block/multiline states
+    Sci_Position curLine = styler.GetLine(startPos);
+    // Default is false for everything and 0 counters.
+	int lineState = (curLine > 0) ? styler.GetLineState(curLine-1) : 0;
+
+    bool transpose = (lineState >> 0) & 0x01;                // 1 bit to know if ' is allowed to mean transpose
+    bool istripledocstring = (lineState >> 1) & 0x01;        // 1 bit to know if we are in a triple doublequotes string
+	bool triple_backtick = (lineState >> 2) & 0x01;          // 1 bit to know if we are in a triple backtick command
+	bool israwstring = (lineState >> 3) & 0x01;              // 1 bit to know if we are in a raw string
+    int indexing_level = (int)((lineState >> 4) & 0x0F);     // 4 bits of bracket nesting counter
+    int list_comprehension = (int)((lineState >> 8) & 0x0F); // 4 bits of parenthesis nesting counter
+    int commentDepth = (int)((lineState >> 12) & 0x0F);      // 4 bits of nested comment counter
+
+    // base for parsing number
+    int base = 10;
+    // number has a float dot ?
+    bool with_dot = false;
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    for (; sc.More(); sc.Forward()) {
+
+        //// check for end of states
+        switch (sc.state) {
+            case SCE_JULIA_BRACKET:
+                sc.SetState(SCE_JULIA_DEFAULT);
+                break;
+            case SCE_JULIA_OPERATOR:
+                resumeOperator(sc);
+                break;
+            case SCE_JULIA_TYPEOPERATOR:
+                sc.SetState(SCE_JULIA_DEFAULT);
+                break;
+            case SCE_JULIA_TYPEANNOT:
+                if (! IsIdentifierCharacter(sc.ch)) {
+                    sc.SetState(SCE_JULIA_DEFAULT);
+                }
+                break;
+            case SCE_JULIA_IDENTIFIER:
+                // String literal
+                if (sc.ch == '\"') {
+                    // If the string literal has a prefix, interpolation is disabled
+                    israwstring = true;
+                    sc.ChangeState(SCE_JULIA_STRINGLITERAL);
+                    sc.SetState(SCE_JULIA_DEFAULT);
+
+                } else if (sc.ch == '`') {
+                    // If the string literal has a prefix, interpolation is disabled
+                    israwstring = true;
+                    sc.ChangeState(SCE_JULIA_COMMANDLITERAL);
+                    sc.SetState(SCE_JULIA_DEFAULT);
+
+                // Continue if the character is an identifier character
+                } else if (! IsIdentifierCharacter(sc.ch)) {
+                    char s[MAX_JULIA_IDENT_CHARS + 1];
+                    sc.GetCurrent(s, sizeof(s));
+
+                    // Treat the keywords differently if we are indexing or not
+                    if ( indexing_level > 0 && CheckBoundsIndexing(s)) {
+                        // Inside [], (), `begin` and `end` are numbers not block keywords
+                        sc.ChangeState(SCE_JULIA_NUMBER);
+                        transpose = false;
+
+                    } else {
+                        if (keywords.InList(s)) {
+                            sc.ChangeState(SCE_JULIA_KEYWORD1);
+                            transpose = false;
+                        } else if (identifiers2.InList(s)) {
+                            sc.ChangeState(SCE_JULIA_KEYWORD2);
+                            transpose = false;
+                        } else if (identifiers3.InList(s)) {
+                            sc.ChangeState(SCE_JULIA_KEYWORD3);
+                            transpose = false;
+                        } else if (identifiers4.InList(s)) {
+                            sc.ChangeState(SCE_JULIA_KEYWORD4);
+                            // These identifiers can be used for variable names also,
+                            // so transpose is not forbidden.
+                            //transpose = false;
+                        }
+                    }
+                    sc.SetState(SCE_JULIA_DEFAULT);
+
+                    // TODO: recognize begin-end blocks inside list comprehension
+                    // b = [(begin n%2; n*2 end) for n in 1:10]
+                    // TODO: recognize better comprehension for-if to avoid problem with code-folding
+                    // c = [(if isempty(a); missing else first(b) end) for (a, b) in zip(l1, l2)]
+                }
+                break;
+            case SCE_JULIA_NUMBER:
+                resumeNumber(sc, base, with_dot, options.highlightLexerror);
+                break;
+            case SCE_JULIA_CHAR:
+                resumeCharacter(sc, options.highlightLexerror);
+                break;
+            case SCE_JULIA_DOCSTRING:
+                resumeString(sc, true, !israwstring);
+                if (sc.state == SCE_JULIA_DEFAULT && israwstring) {
+                    israwstring = false;
+                }
+                break;
+            case SCE_JULIA_STRING:
+                resumeString(sc, false, !israwstring);
+                if (sc.state == SCE_JULIA_DEFAULT && israwstring) {
+                    israwstring = false;
+                }
+                break;
+            case SCE_JULIA_COMMAND:
+                resumeCommand(sc, triple_backtick, !israwstring);
+                break;
+            case SCE_JULIA_MACRO:
+                if (IsASpace(sc.ch) || ! IsIdentifierCharacter(sc.ch)) {
+                    sc.SetState(SCE_JULIA_DEFAULT);
+                }
+                break;
+            case SCE_JULIA_SYMBOL:
+                if (! IsIdentifierCharacter(sc.ch)) {
+                    sc.SetState(SCE_JULIA_DEFAULT);
+                }
+                break;
+            case SCE_JULIA_COMMENT:
+                if( commentDepth > 0 ) {
+                    // end or start of a nested a block comment
+                    if ( sc.ch == '=' && sc.chNext == '#') {
+                        commentDepth --;
+                        sc.Forward();
+
+                        if (commentDepth == 0) {
+                            sc.ForwardSetState(SCE_JULIA_DEFAULT);
+                        }
+                    } else if( sc.ch == '#' && sc.chNext == '=') {
+                        commentDepth ++;
+                        sc.Forward();
+                    }
+                } else {
+                    // single line comment
+                    if (sc.atLineEnd || sc.ch == '\r' || sc.ch == '\n') {
+                        sc.SetState(SCE_JULIA_DEFAULT);
+                        transpose = false;
+                    }
+                }
+                break;
+        }
+
+        // check start of a new state
+        if (sc.state == SCE_JULIA_DEFAULT) {
+            if (sc.ch == '#') {
+                sc.SetState(SCE_JULIA_COMMENT);
+                // increment depth if we are a block comment
+                if(sc.chNext == '=') {
+                    commentDepth ++;
+                    sc.Forward();
+                }
+            } else if (sc.ch == '!') {
+                sc.SetState(SCE_JULIA_OPERATOR);
+            } else if (sc.ch == '\'') {
+                if (transpose) {
+                    sc.SetState(SCE_JULIA_OPERATOR);
+                } else {
+                    sc.SetState(SCE_JULIA_CHAR);
+                }
+            } else if (sc.ch == '\"') {
+                istripledocstring = (sc.chNext == '\"' && sc.GetRelativeCharacter(2) == '\"');
+                if (istripledocstring) {
+                    sc.SetState(SCE_JULIA_DOCSTRING);
+                    // Move to the end of the triple quotes
+                    Sci_PositionU nextIndex = sc.currentPos + 2;
+                    while (nextIndex > sc.currentPos && sc.More()) {
+                        sc.Forward();
+                    }
+                } else {
+                    sc.SetState(SCE_JULIA_STRING);
+                }
+            } else if (sc.ch == '`') {
+                triple_backtick = (sc.chNext == '`' && sc.GetRelativeCharacter(2) == '`');
+                sc.SetState(SCE_JULIA_COMMAND);
+                if (triple_backtick) {
+                    // Move to the end of the triple backticks
+                    Sci_PositionU nextIndex = sc.currentPos + 2;
+                    while (nextIndex > sc.currentPos && sc.More()) {
+                        sc.Forward();
+                    }
+                }
+            } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                initNumber(sc, base, with_dot);
+            } else if (IsIdentifierFirstCharacter(sc.ch)) {
+                sc.SetState(SCE_JULIA_IDENTIFIER);
+                transpose = true;
+            } else if (sc.ch == '@') {
+                sc.SetState(SCE_JULIA_MACRO);
+                transpose = false;
+
+            // Several parsing of operators, should keep the order of `if` blocks
+            } else if ((sc.ch == ':' || sc.ch == '<' || sc.ch == '>') && sc.chNext == ':') {
+                sc.SetState(SCE_JULIA_TYPEOPERATOR);
+                sc.Forward();
+                // Highlight the next identifier, if option is set
+                if (options.highlightTypeannotation &&
+                    IsIdentifierFirstCharacter(sc.chNext)) {
+                    sc.ForwardSetState(SCE_JULIA_TYPEANNOT);
+                }
+            } else if (sc.ch == ':') {
+                // TODO: improve detection of range
+                // should be solved with begin-end parsing
+                // `push!(arr, s1 :s2)` and `a[begin :end]
+                if (IsIdentifierFirstCharacter(sc.chNext) &&
+                    ! IsIdentifierCharacter(sc.chPrev) &&
+                    sc.chPrev != ')' && sc.chPrev != ']' ) {
+                    sc.SetState(SCE_JULIA_SYMBOL);
+                } else {
+                    sc.SetState(SCE_JULIA_OPERATOR);
+                }
+            } else if (IsJuliaParen(sc.ch)) {
+                if (sc.ch == '[') {
+                    list_comprehension ++;
+                    indexing_level ++;
+                } else if (sc.ch == ']' && (indexing_level > 0)) {
+                    list_comprehension --;
+                    indexing_level --;
+                } else if (sc.ch == '(') {
+                    list_comprehension ++;
+                } else if (sc.ch == ')' && (list_comprehension > 0)) {
+                    list_comprehension --;
+                }
+
+                if (sc.ch == ')' || sc.ch == ']' || sc.ch == '}') {
+                    transpose = true;
+                } else {
+                    transpose = false;
+                }
+                sc.SetState(SCE_JULIA_BRACKET);
+            } else if (IsOperatorFirstCharacter(sc.ch)) {
+                transpose = false;
+                sc.SetState(SCE_JULIA_OPERATOR);
+            } else {
+                transpose = false;
+            }
+        }
+
+        // update the line information (used for line-by-line lexing and folding)
+        if (sc.atLineEnd) {
+            // set the line state to the current state
+            curLine = styler.GetLine(sc.currentPos);
+
+            lineState = ((transpose ? 1 : 0) << 0) |
+                        ((istripledocstring ? 1 : 0) << 1) |
+                        ((triple_backtick ? 1 : 0) << 2) |
+                        ((israwstring ? 1 : 0) << 3) |
+                        ((indexing_level & 0x0F) << 4) |
+                        ((list_comprehension & 0x0F) << 8) |
+                        ((commentDepth & 0x0F) << 12);
+            styler.SetLineState(curLine, lineState);
+        }
+    }
+    sc.Complete();
+}
+
+void SCI_METHOD LexerJulia::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+    int lineState = 0;
+	if (lineCurrent > 0) {
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+        lineState = styler.GetLineState(lineCurrent-1);
+    }
+
+    // level of nested brackets
+    int indexing_level = (int)((lineState >> 4) & 0x0F);     // 4 bits of bracket nesting counter
+    // level of nested parenthesis or brackets
+    int list_comprehension = (int)((lineState >> 8) & 0x0F); // 4 bits of parenthesis nesting counter
+    //int commentDepth = (int)((lineState >> 12) & 0x0F);      // 4 bits of nested comment counter
+    
+	Sci_PositionU lineStartNext = styler.LineStart(lineCurrent+1);
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int stylePrev = styler.StyleAt(startPos - 1);
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+    char word[100];
+    int wordlen = 0;
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = i == (lineStartNext-1);
+
+        // a start/end of comment block
+        if (options.foldComment && style == SCE_JULIA_COMMENT) {
+            // start of block comment
+            if (ch == '#' && chNext == '=') {
+                levelNext ++;
+            }
+            // end of block comment
+            if (ch == '=' && chNext == '#' && levelNext > 0) {
+                levelNext --;
+            }
+        }
+
+        // Syntax based folding, accounts for list comprehension
+        if (options.foldSyntaxBased) {
+            // list comprehension allow `for`, `if` and `begin` without `end`
+            if (style == SCE_JULIA_BRACKET) {
+                if (ch == '[') {
+                    list_comprehension ++;
+                    indexing_level ++;
+                    levelNext ++;
+                } else if (ch == ']') {
+                    list_comprehension --;
+                    indexing_level --;
+                    levelNext --;
+                } else if (ch == '(') {
+                    list_comprehension ++;
+                    levelNext ++;
+                } else if (ch == ')') {
+                    list_comprehension --;
+                    levelNext --;
+                }
+                // check non-negative
+                if (indexing_level < 0) {
+                    indexing_level = 0;
+                }
+                if (list_comprehension < 0) {
+                    list_comprehension = 0;
+                }
+            }
+
+            // keyword
+            if (style == SCE_JULIA_KEYWORD1) {
+                word[wordlen++] = static_cast<char>(ch);
+                if (wordlen == 100) {  // prevent overflow
+                    word[0] = '\0';
+                    wordlen = 1;
+                }
+                if (styleNext != SCE_JULIA_KEYWORD1) {
+                    word[wordlen] = '\0';
+                    wordlen = 0;
+                    if (list_comprehension <= 0 && indexing_level <= 0) {
+                        levelNext += CheckKeywordFoldPoint(word);
+                    }
+                }
+            }
+        }
+
+        // Docstring
+        if (options.foldDocstring) {
+            if (stylePrev != SCE_JULIA_DOCSTRING && style == SCE_JULIA_DOCSTRING) {
+                levelNext ++;
+            } else if (style == SCE_JULIA_DOCSTRING && styleNext != SCE_JULIA_DOCSTRING) {
+                levelNext --;
+            }
+        }
+
+        // check non-negative level
+        if (levelNext < 0) {
+            levelNext = 0;
+        }
+
+        if (!IsASpace(ch)) {
+            visibleChars++;
+        }
+        stylePrev = style;
+
+        if (atEOL || (i == endPos-1)) {
+            int levelUse = levelCurrent;
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && options.foldCompact) {
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            }
+            if (levelUse < levelNext) {
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            }
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            lineStartNext = styler.LineStart(lineCurrent+1);
+            levelCurrent = levelNext;
+            if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length() - 1))) {
+                // There is an empty line at end of file so give it same level and empty
+                styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+            }
+            visibleChars = 0;
+        }
+    }
+}
+
+LexerModule lmJulia(SCLEX_JULIA, LexerJulia::LexerFactoryJulia, "julia", juliaWordLists);
diff --git a/scite-app/lexilla/lexers/LexKVIrc.cxx b/scite-app/lexilla/lexers/LexKVIrc.cxx
new file mode 100644
index 0000000..ec36db9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexKVIrc.cxx
@@ -0,0 +1,474 @@
+// Scintilla source code edit control
+/** @file LexKVIrc.cxx
+ ** Lexer for KVIrc script.
+ **/
+// Copyright 2013 by OmegaPhil <OmegaPhil+scintilla@gmail.com>, based in
+// part from LexPython Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// and LexCmake Copyright 2007 by Cristian Adam <cristian [dot] adam [at] gmx [dot] net>
+
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+/* KVIrc Script syntactic rules: http://www.kvirc.net/doc/doc_syntactic_rules.html */
+
+/* Utility functions */
+static inline bool IsAWordChar(int ch) {
+
+    /* Keyword list includes modules, i.e. words including '.', and
+     * alias namespaces include ':' */
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'
+            || ch == ':');
+}
+static inline bool IsAWordStart(int ch) {
+
+    /* Functions (start with '$') are treated separately to keywords */
+    return (ch < 0x80) && (isalnum(ch) || ch == '_' );
+}
+
+/* Interface function called by Scintilla to request some text to be
+ syntax highlighted */
+static void ColouriseKVIrcDoc(Sci_PositionU startPos, Sci_Position length,
+                              int initStyle, WordList *keywordlists[],
+                              Accessor &styler)
+{
+    /* Fetching style context */
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    /* Accessing keywords and function-marking keywords */
+    WordList &keywords = *keywordlists[0];
+    WordList &functionKeywords = *keywordlists[1];
+
+    /* Looping for all characters - only automatically moving forward
+     * when asked for (transitions leaving strings and keywords do this
+     * already) */
+    bool next = true;
+    for( ; sc.More(); next ? sc.Forward() : (void)0 )
+    {
+        /* Resetting next */
+        next = true;
+
+        /* Dealing with different states */
+        switch (sc.state)
+        {
+            case SCE_KVIRC_DEFAULT:
+
+                /* Detecting single-line comments
+                 * Unfortunately KVIrc script allows raw '#<channel
+                 * name>' to be used, and appending # to an array returns
+                 * its length...
+                 * Going for a compromise where single line comments not
+                 * starting on a newline are allowed in all cases except
+                 * when they are preceeded with an opening bracket or comma
+                 * (this will probably be the most common style a valid
+                 * string-less channel name will be used with), with the
+                 * array length case included
+                 */
+                if (
+                    (sc.ch == '#' && sc.atLineStart) ||
+                    (sc.ch == '#' && (
+                        sc.chPrev != '(' && sc.chPrev != ',' &&
+                        sc.chPrev != ']')
+                    )
+                )
+                {
+                    sc.SetState(SCE_KVIRC_COMMENT);
+                    break;
+                }
+
+                /* Detecting multi-line comments */
+                if (sc.Match('/', '*'))
+                {
+                    sc.SetState(SCE_KVIRC_COMMENTBLOCK);
+                    break;
+                }
+
+                /* Detecting strings */
+                if (sc.ch == '"')
+                {
+                    sc.SetState(SCE_KVIRC_STRING);
+                    break;
+                }
+
+                /* Detecting functions */
+                if (sc.ch == '$')
+                {
+                    sc.SetState(SCE_KVIRC_FUNCTION);
+                    break;
+                }
+
+                /* Detecting variables */
+                if (sc.ch == '%')
+                {
+                    sc.SetState(SCE_KVIRC_VARIABLE);
+                    break;
+                }
+
+                /* Detecting numbers - isdigit is unsafe as it does not
+                 * validate, use CharacterSet.h functions */
+                if (IsADigit(sc.ch))
+                {
+                    sc.SetState(SCE_KVIRC_NUMBER);
+                    break;
+                }
+
+                /* Detecting words */
+                if (IsAWordStart(sc.ch) && IsAWordChar(sc.chNext))
+                {
+                    sc.SetState(SCE_KVIRC_WORD);
+                    sc.Forward();
+                    break;
+                }
+
+                /* Detecting operators */
+                if (isoperator(sc.ch))
+                {
+                    sc.SetState(SCE_KVIRC_OPERATOR);
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_COMMENT:
+
+                /* Breaking out of single line comment when a newline
+                 * is introduced */
+                if (sc.ch == '\r' || sc.ch == '\n')
+                {
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_COMMENTBLOCK:
+
+                /* Detecting end of multi-line comment */
+                if (sc.Match('*', '/'))
+                {
+                    // Moving the current position forward two characters
+                    // so that '*/' is included in the comment
+                    sc.Forward(2);
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+
+                    /* Comment has been exited and the current position
+                     * moved forward, yet the new current character
+                     * has yet to be defined - loop without moving
+                     * forward again */
+                    next = false;
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_STRING:
+
+                /* Detecting end of string - closing speechmarks */
+                if (sc.ch == '"')
+                {
+                    /* Allowing escaped speechmarks to pass */
+                    if (sc.chPrev == '\\')
+                        break;
+
+                    /* Moving the current position forward to capture the
+                     * terminating speechmarks, and ending string */
+                    sc.ForwardSetState(SCE_KVIRC_DEFAULT);
+
+                    /* String has been exited and the current position
+                     * moved forward, yet the new current character
+                     * has yet to be defined - loop without moving
+                     * forward again */
+                    next = false;
+                    break;
+                }
+
+                /* Functions and variables are now highlighted in strings
+                 * Detecting functions */
+                if (sc.ch == '$')
+                {
+                    /* Allowing escaped functions to pass */
+                    if (sc.chPrev == '\\')
+                        break;
+
+                    sc.SetState(SCE_KVIRC_STRING_FUNCTION);
+                    break;
+                }
+
+                /* Detecting variables */
+                if (sc.ch == '%')
+                {
+                    /* Allowing escaped variables to pass */
+                    if (sc.chPrev == '\\')
+                        break;
+
+                    sc.SetState(SCE_KVIRC_STRING_VARIABLE);
+                    break;
+                }
+
+                /* Breaking out of a string when a newline is introduced */
+                if (sc.ch == '\r' || sc.ch == '\n')
+                {
+                    /* Allowing escaped newlines */
+                    if (sc.chPrev == '\\')
+                        break;
+
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_FUNCTION:
+            case SCE_KVIRC_VARIABLE:
+
+                /* Detecting the end of a function/variable (word) */
+                if (!IsAWordChar(sc.ch))
+                {
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+
+                    /* Word has been exited yet the current character
+                     * has yet to be defined - loop without moving
+                     * forward again */
+                    next = false;
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_STRING_FUNCTION:
+            case SCE_KVIRC_STRING_VARIABLE:
+
+                /* A function or variable in a string
+                 * Detecting the end of a function/variable (word) */
+                if (!IsAWordChar(sc.ch))
+                {
+                    sc.SetState(SCE_KVIRC_STRING);
+
+                    /* Word has been exited yet the current character
+                     * has yet to be defined - loop without moving
+                     * forward again */
+                    next = false;
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_NUMBER:
+
+                /* Detecting the end of a number */
+                if (!IsADigit(sc.ch))
+                {
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+
+                    /* Number has been exited yet the current character
+                     * has yet to be defined - loop without moving
+                     * forward */
+                    next = false;
+                    break;
+                }
+
+                break;
+
+            case SCE_KVIRC_OPERATOR:
+
+                /* Because '%' is an operator but is also the marker for
+                 * a variable, I need to always treat operators as single
+                 * character strings and therefore redo their detection
+                 * after every character */
+                sc.SetState(SCE_KVIRC_DEFAULT);
+
+                /* Operator has been exited yet the current character
+                 * has yet to be defined - loop without moving
+                 * forward */
+                next = false;
+                break;
+
+            case SCE_KVIRC_WORD:
+
+                /* Detecting the end of a word */
+                if (!IsAWordChar(sc.ch))
+                {
+                    /* Checking if the word was actually a keyword -
+                     * fetching the current word, NULL-terminated like
+                     * the keyword list */
+                    char s[100];
+                    Sci_Position wordLen = sc.currentPos - styler.GetStartSegment();
+                    if (wordLen > 99)
+                        wordLen = 99;  /* Include '\0' in buffer */
+                    Sci_Position i;
+                    for( i = 0; i < wordLen; ++i )
+                    {
+                        s[i] = styler.SafeGetCharAt( styler.GetStartSegment() + i );
+                    }
+                    s[wordLen] = '\0';
+
+                    /* Actually detecting keywords and fixing the state */
+                    if (keywords.InList(s))
+                    {
+                        /* The SetState call actually commits the
+                         * previous keyword state */
+                        sc.ChangeState(SCE_KVIRC_KEYWORD);
+                    }
+                    else if (functionKeywords.InList(s))
+                    {
+                        // Detecting function keywords and fixing the state
+                        sc.ChangeState(SCE_KVIRC_FUNCTION_KEYWORD);
+                    }
+
+                    /* Transitioning to default and committing the previous
+                     * word state */
+                    sc.SetState(SCE_KVIRC_DEFAULT);
+
+                    /* Word has been exited yet the current character
+                     * has yet to be defined - loop without moving
+                     * forward again */
+                    next = false;
+                    break;
+                }
+
+                break;
+        }
+    }
+
+    /* Indicating processing is complete */
+    sc.Complete();
+}
+
+static void FoldKVIrcDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/,
+                      WordList *[], Accessor &styler)
+{
+    /* Based on CMake's folder */
+
+    /* Exiting if folding isnt enabled */
+    if ( styler.GetPropertyInt("fold") == 0 )
+        return;
+
+    /* Obtaining current line number*/
+    Sci_Position currentLine = styler.GetLine(startPos);
+
+    /* Obtaining starting character - indentation is done on a line basis,
+     * not character */
+    Sci_PositionU safeStartPos = styler.LineStart( currentLine );
+
+    /* Initialising current level - this is defined as indentation level
+     * in the low 12 bits, with flag bits in the upper four bits.
+     * It looks like two indentation states are maintained in the returned
+     * 32bit value - 'nextLevel' in the most-significant bits, 'currentLevel'
+     * in the least-significant bits. Since the next level is the most
+     * up to date, this must refer to the current state of indentation.
+     * So the code bitshifts the old current level out of existence to
+     * get at the actual current state of indentation
+     * Based on the LexerCPP.cxx line 958 comment */
+    int currentLevel = SC_FOLDLEVELBASE;
+    if (currentLine > 0)
+        currentLevel = styler.LevelAt(currentLine - 1) >> 16;
+    int nextLevel = currentLevel;
+
+    // Looping for characters in range
+    for (Sci_PositionU i = safeStartPos; i < startPos + length; ++i)
+    {
+        /* Folding occurs after syntax highlighting, meaning Scintilla
+         * already knows where the comments are
+         * Fetching the current state */
+        int state = styler.StyleAt(i) & 31;
+
+        switch( styler.SafeGetCharAt(i) )
+        {
+            case '{':
+
+                /* Indenting only when the braces are not contained in
+                 * a comment */
+                if (state != SCE_KVIRC_COMMENT &&
+                    state != SCE_KVIRC_COMMENTBLOCK)
+                    ++nextLevel;
+                break;
+
+            case '}':
+
+                /* Outdenting only when the braces are not contained in
+                 * a comment */
+                if (state != SCE_KVIRC_COMMENT &&
+                    state != SCE_KVIRC_COMMENTBLOCK)
+                    --nextLevel;
+                break;
+
+            case '\n':
+            case '\r':
+
+                /* Preparing indentation information to return - combining
+                 * current and next level data */
+                int lev = currentLevel | nextLevel << 16;
+
+                /* If the next level increases the indent level, mark the
+                 * current line as a fold point - current level data is
+                 * in the least significant bits */
+                if (nextLevel > currentLevel )
+                    lev |= SC_FOLDLEVELHEADERFLAG;
+
+                /* Updating indentation level if needed */
+                if (lev != styler.LevelAt(currentLine))
+                    styler.SetLevel(currentLine, lev);
+
+                /* Updating variables */
+                ++currentLine;
+                currentLevel = nextLevel;
+
+                /* Dealing with problematic Windows newlines -
+                 * incrementing to avoid the extra newline breaking the
+                 * fold point */
+                if (styler.SafeGetCharAt(i) == '\r' &&
+                    styler.SafeGetCharAt(i + 1) == '\n')
+                    ++i;
+                break;
+        }
+    }
+
+    /* At this point the data has ended, so presumably the end of the line?
+     * Preparing indentation information to return - combining current
+     * and next level data */
+    int lev = currentLevel | nextLevel << 16;
+
+    /* If the next level increases the indent level, mark the current
+     * line as a fold point - current level data is in the least
+     * significant bits */
+    if (nextLevel > currentLevel )
+        lev |= SC_FOLDLEVELHEADERFLAG;
+
+    /* Updating indentation level if needed */
+    if (lev != styler.LevelAt(currentLine))
+        styler.SetLevel(currentLine, lev);
+}
+
+/* Registering wordlists */
+static const char *const kvircWordListDesc[] = {
+	"primary",
+	"function_keywords",
+	0
+};
+
+
+/* Registering functions and wordlists */
+LexerModule lmKVIrc(SCLEX_KVIRC, ColouriseKVIrcDoc, "kvirc", FoldKVIrcDoc,
+                    kvircWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexKix.cxx b/scite-app/lexilla/lexers/LexKix.cxx
new file mode 100644
index 0000000..f7004d1
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexKix.cxx
@@ -0,0 +1,137 @@
+// Scintilla source code edit control
+/** @file LexKix.cxx
+ ** Lexer for KIX-Scripts.
+ **/
+// Copyright 2004 by Manfred Becker <manfred@becker-trdf.de>
+// The License.txt file describes the conditions under which this software may be distributed.
+// Edited by Lee Wilmott (24-Jun-2014) added support for block comments
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 || isalnum(ch) || ch == '_';
+}
+
+static inline bool IsOperator(const int ch) {
+	return (ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '&' || ch == '|' || ch == '<' || ch == '>' || ch == '=');
+}
+
+static void ColouriseKixDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+//	WordList &keywords4 = *keywordlists[3];
+
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_KIX_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_COMMENTSTREAM) {
+			if (sc.ch == '/' && sc.chPrev == '*') {
+				sc.ForwardSetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_STRING1) {
+			// This is a doubles quotes string
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_STRING2) {
+			// This is a single quote string
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_NUMBER) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_VAR) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_MACRO) {
+			if (!IsAWordChar(sc.ch) && !IsADigit(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (!keywords3.InList(&s[1])) {
+					sc.ChangeState(SCE_KIX_DEFAULT);
+				}
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_OPERATOR) {
+			if (!IsOperator(sc.ch)) {
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		} else if (sc.state == SCE_KIX_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_KIX_KEYWORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_KIX_FUNCTIONS);
+				}
+				sc.SetState(SCE_KIX_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_KIX_DEFAULT) {
+			if (sc.ch == ';') {
+				sc.SetState(SCE_KIX_COMMENT);
+			} else if (sc.ch == '/' && sc.chNext == '*') {
+				sc.SetState(SCE_KIX_COMMENTSTREAM);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_KIX_STRING1);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_KIX_STRING2);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_KIX_VAR);
+			} else if (sc.ch == '@') {
+				sc.SetState(SCE_KIX_MACRO);
+			} else if (IsADigit(sc.ch) || ((sc.ch == '.' || sc.ch == '&') && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_KIX_NUMBER);
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_KIX_OPERATOR);
+			} else if (IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_KIX_IDENTIFIER);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+
+LexerModule lmKix(SCLEX_KIX, ColouriseKixDoc, "kix");
+
diff --git a/scite-app/lexilla/lexers/LexLaTeX.cxx b/scite-app/lexilla/lexers/LexLaTeX.cxx
new file mode 100644
index 0000000..c4e1cf4
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexLaTeX.cxx
@@ -0,0 +1,563 @@
+// Scintilla source code edit control
+/** @file LexLaTeX.cxx
+ ** Lexer for LaTeX2e.
+  **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Modified by G. HU in 2013. Added folding, syntax highting inside math environments, and changed some minor behaviors.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "DefaultLexer.h"
+#include "LexerBase.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+using namespace std;
+
+struct latexFoldSave {
+	latexFoldSave() : structLev(0) {
+		for (int i = 0; i < 8; ++i) openBegins[i] = 0;
+	}
+	latexFoldSave(const latexFoldSave &save) : structLev(save.structLev) {
+		for (int i = 0; i < 8; ++i) openBegins[i] = save.openBegins[i];
+	}
+	latexFoldSave &operator=(const latexFoldSave &save) {
+		if (this != &save) {
+			structLev = save.structLev;
+			for (int i = 0; i < 8; ++i) openBegins[i] = save.openBegins[i];
+		}
+		return *this;
+	}
+	int openBegins[8];
+	Sci_Position structLev;
+};
+
+class LexerLaTeX : public LexerBase {
+private:
+	vector<int> modes;
+	void setMode(Sci_Position line, int mode) {
+		if (line >= static_cast<Sci_Position>(modes.size())) modes.resize(line + 1, 0);
+		modes[line] = mode;
+	}
+	int getMode(Sci_Position line) {
+		if (line >= 0 && line < static_cast<Sci_Position>(modes.size())) return modes[line];
+		return 0;
+	}
+	void truncModes(Sci_Position numLines) {
+		if (static_cast<Sci_Position>(modes.size()) > numLines * 2 + 256)
+			modes.resize(numLines + 128);
+	}
+
+	vector<latexFoldSave> saves;
+	void setSave(Sci_Position line, const latexFoldSave &save) {
+		if (line >= static_cast<Sci_Position>(saves.size())) saves.resize(line + 1);
+		saves[line] = save;
+	}
+	void getSave(Sci_Position line, latexFoldSave &save) {
+		if (line >= 0 && line < static_cast<Sci_Position>(saves.size())) save = saves[line];
+		else {
+			save.structLev = 0;
+			for (int i = 0; i < 8; ++i) save.openBegins[i] = 0;
+		}
+	}
+	void truncSaves(Sci_Position numLines) {
+		if (static_cast<Sci_Position>(saves.size()) > numLines * 2 + 256)
+			saves.resize(numLines + 128);
+	}
+public:
+	static ILexer5 *LexerFactoryLaTeX() {
+		return new LexerLaTeX();
+	}
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	// ILexer5 methods
+	const char * SCI_METHOD GetName() override {
+		return "latex";
+	}
+	int SCI_METHOD  GetIdentifier() override {
+		return SCLEX_LATEX;
+	}
+};
+
+static bool latexIsSpecial(int ch) {
+	return (ch == '#') || (ch == '$') || (ch == '%') || (ch == '&') || (ch == '_') ||
+		   (ch == '{') || (ch == '}') || (ch == ' ');
+}
+
+static bool latexIsBlank(int ch) {
+	return (ch == ' ') || (ch == '\t');
+}
+
+static bool latexIsBlankAndNL(int ch) {
+	return (ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n');
+}
+
+static bool latexIsLetter(int ch) {
+	return IsASCII(ch) && isalpha(ch);
+}
+
+static bool latexIsTagValid(Sci_Position &i, Sci_Position l, Accessor &styler) {
+	while (i < l) {
+		if (styler.SafeGetCharAt(i) == '{') {
+			while (i < l) {
+				i++;
+				if (styler.SafeGetCharAt(i) == '}') {
+					return true;
+				}	else if (!latexIsLetter(styler.SafeGetCharAt(i)) &&
+                   styler.SafeGetCharAt(i)!='*') {
+					return false;
+				}
+			}
+		} else if (!latexIsBlank(styler.SafeGetCharAt(i))) {
+			return false;
+		}
+		i++;
+	}
+	return false;
+}
+
+static bool latexNextNotBlankIs(Sci_Position i, Accessor &styler, char needle) {
+  char ch;
+	while (i < styler.Length()) {
+    ch = styler.SafeGetCharAt(i);
+		if (!latexIsBlankAndNL(ch) && ch != '*') {
+      if (ch == needle)
+        return true;
+      else
+        return false;
+		}
+		i++;
+	}
+	return false;
+}
+
+static bool latexLastWordIs(Sci_Position start, Accessor &styler, const char *needle) {
+	Sci_PositionU i = 0;
+	Sci_PositionU l = static_cast<Sci_PositionU>(strlen(needle));
+	Sci_Position ini = start-l+1;
+	char s[32];
+
+	while (i < l && i < 31) {
+		s[i] = styler.SafeGetCharAt(ini + i);
+		i++;
+	}
+	s[i] = '\0';
+
+	return (strcmp(s, needle) == 0);
+}
+
+static bool latexLastWordIsMathEnv(Sci_Position pos, Accessor &styler) {
+	Sci_Position i, j;
+	char s[32];
+	const char *mathEnvs[] = { "align", "alignat", "flalign", "gather",
+		"multiline", "displaymath", "eqnarray", "equation" };
+	if (styler.SafeGetCharAt(pos) != '}') return false;
+	for (i = pos - 1; i >= 0; --i) {
+		if (styler.SafeGetCharAt(i) == '{') break;
+		if (pos - i >= 20) return false;
+	}
+	if (i < 0 || i == pos - 1) return false;
+	++i;
+	for (j = 0; i + j < pos; ++j)
+		s[j] = styler.SafeGetCharAt(i + j);
+	s[j] = '\0';
+	if (j == 0) return false;
+	if (s[j - 1] == '*') s[--j] = '\0';
+	for (i = 0; i < static_cast<int>(sizeof(mathEnvs) / sizeof(const char *)); ++i)
+		if (strcmp(s, mathEnvs[i]) == 0) return true;
+	return false;
+}
+
+static inline void latexStateReset(int &mode, int &state) {
+	switch (mode) {
+	case 1:     state = SCE_L_MATH; break;
+	case 2:     state = SCE_L_MATH2; break;
+	default:    state = SCE_L_DEFAULT; break;
+	}
+}
+
+// There are cases not handled correctly, like $abcd\textrm{what is $x+y$}z+w$.
+// But I think it's already good enough.
+void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	// startPos is assumed to be the first character of a line
+	Accessor styler(pAccess, &props);
+	styler.StartAt(startPos);
+	int mode = getMode(styler.GetLine(startPos) - 1);
+	int state = initStyle;
+	if (state == SCE_L_ERROR || state == SCE_L_SHORTCMD || state == SCE_L_SPECIAL)   // should not happen
+		latexStateReset(mode, state);
+
+	char chNext = styler.SafeGetCharAt(startPos);
+	char chVerbatimDelim = '\0';
+	styler.StartSegment(startPos);
+	Sci_Position lengthDoc = startPos + length;
+
+	for (Sci_Position i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (styler.IsLeadByte(ch)) {
+			i++;
+			chNext = styler.SafeGetCharAt(i + 1);
+			continue;
+		}
+
+		if (ch == '\r' || ch == '\n')
+			setMode(styler.GetLine(i), mode);
+
+		switch (state) {
+		case SCE_L_DEFAULT :
+			switch (ch) {
+			case '\\' :
+				styler.ColourTo(i - 1, state);
+				if (latexIsLetter(chNext)) {
+					state = SCE_L_COMMAND;
+				} else if (latexIsSpecial(chNext)) {
+					styler.ColourTo(i + 1, SCE_L_SPECIAL);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else if (chNext == '\r' || chNext == '\n') {
+					styler.ColourTo(i, SCE_L_ERROR);
+				} else if (IsASCII(chNext)) {
+					styler.ColourTo(i + 1, SCE_L_SHORTCMD);
+					if (chNext == '(') {
+						mode = 1;
+						state = SCE_L_MATH;
+					} else if (chNext == '[') {
+						mode = 2;
+						state = SCE_L_MATH2;
+					}
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+				break;
+			case '$' :
+				styler.ColourTo(i - 1, state);
+				if (chNext == '$') {
+					styler.ColourTo(i + 1, SCE_L_SHORTCMD);
+					mode = 2;
+					state = SCE_L_MATH2;
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else {
+					styler.ColourTo(i, SCE_L_SHORTCMD);
+					mode = 1;
+					state = SCE_L_MATH;
+				}
+				break;
+			case '%' :
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_COMMENT;
+				break;
+			}
+			break;
+		// These 3 will never be reached.
+		case SCE_L_ERROR:
+		case SCE_L_SPECIAL:
+		case SCE_L_SHORTCMD:
+			break;
+		case SCE_L_COMMAND :
+			if (!latexIsLetter(chNext)) {
+				styler.ColourTo(i, state);
+				if (latexNextNotBlankIs(i + 1, styler, '[' )) {
+					state = SCE_L_CMDOPT;
+				} else if (latexLastWordIs(i, styler, "\\begin")) {
+					state = SCE_L_TAG;
+				} else if (latexLastWordIs(i, styler, "\\end")) {
+					state = SCE_L_TAG2;
+				} else if (latexLastWordIs(i, styler, "\\verb") && chNext != '*' && chNext != ' ') {
+					chVerbatimDelim = chNext;
+					state = SCE_L_VERBATIM;
+				} else {
+					latexStateReset(mode, state);
+				}
+			}
+			break;
+		case SCE_L_CMDOPT :
+			if (ch == ']') {
+				styler.ColourTo(i, state);
+				latexStateReset(mode, state);
+			}
+			break;
+		case SCE_L_TAG :
+			if (latexIsTagValid(i, lengthDoc, styler)) {
+				styler.ColourTo(i, state);
+				latexStateReset(mode, state);
+				if (latexLastWordIs(i, styler, "{verbatim}")) {
+					state = SCE_L_VERBATIM;
+				} else if (latexLastWordIs(i, styler, "{lstlisting}")) {
+					state = SCE_L_VERBATIM;
+				} else if (latexLastWordIs(i, styler, "{comment}")) {
+					state = SCE_L_COMMENT2;
+				} else if (latexLastWordIs(i, styler, "{math}") && mode == 0) {
+					mode = 1;
+					state = SCE_L_MATH;
+				} else if (latexLastWordIsMathEnv(i, styler) && mode == 0) {
+					mode = 2;
+					state = SCE_L_MATH2;
+				}
+			} else {
+				styler.ColourTo(i, SCE_L_ERROR);
+				latexStateReset(mode, state);
+				ch = styler.SafeGetCharAt(i);
+				if (ch == '\r' || ch == '\n') setMode(styler.GetLine(i), mode);
+			}
+			chNext = styler.SafeGetCharAt(i+1);
+			break;
+		case SCE_L_TAG2 :
+			if (latexIsTagValid(i, lengthDoc, styler)) {
+				styler.ColourTo(i, state);
+				latexStateReset(mode, state);
+			} else {
+				styler.ColourTo(i, SCE_L_ERROR);
+				latexStateReset(mode, state);
+				ch = styler.SafeGetCharAt(i);
+				if (ch == '\r' || ch == '\n') setMode(styler.GetLine(i), mode);
+			}
+			chNext = styler.SafeGetCharAt(i+1);
+			break;
+		case SCE_L_MATH :
+			switch (ch) {
+			case '\\' :
+				styler.ColourTo(i - 1, state);
+				if (latexIsLetter(chNext)) {
+					Sci_Position match = i + 3;
+					if (latexLastWordIs(match, styler, "\\end")) {
+						match++;
+						if (latexIsTagValid(match, lengthDoc, styler)) {
+							if (latexLastWordIs(match, styler, "{math}"))
+								mode = 0;
+						}
+					}
+					state = SCE_L_COMMAND;
+				} else if (latexIsSpecial(chNext)) {
+					styler.ColourTo(i + 1, SCE_L_SPECIAL);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else if (chNext == '\r' || chNext == '\n') {
+					styler.ColourTo(i, SCE_L_ERROR);
+				} else if (IsASCII(chNext)) {
+					if (chNext == ')') {
+						mode = 0;
+						state = SCE_L_DEFAULT;
+					}
+					styler.ColourTo(i + 1, SCE_L_SHORTCMD);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+				break;
+			case '$' :
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_L_SHORTCMD);
+				mode = 0;
+				state = SCE_L_DEFAULT;
+				break;
+			case '%' :
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_COMMENT;
+				break;
+			}
+			break;
+		case SCE_L_MATH2 :
+			switch (ch) {
+			case '\\' :
+				styler.ColourTo(i - 1, state);
+				if (latexIsLetter(chNext)) {
+					Sci_Position match = i + 3;
+					if (latexLastWordIs(match, styler, "\\end")) {
+						match++;
+						if (latexIsTagValid(match, lengthDoc, styler)) {
+							if (latexLastWordIsMathEnv(match, styler))
+								mode = 0;
+						}
+					}
+					state = SCE_L_COMMAND;
+				} else if (latexIsSpecial(chNext)) {
+					styler.ColourTo(i + 1, SCE_L_SPECIAL);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else if (chNext == '\r' || chNext == '\n') {
+					styler.ColourTo(i, SCE_L_ERROR);
+				} else if (IsASCII(chNext)) {
+					if (chNext == ']') {
+						mode = 0;
+						state = SCE_L_DEFAULT;
+					}
+					styler.ColourTo(i + 1, SCE_L_SHORTCMD);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+				}
+				break;
+			case '$' :
+				styler.ColourTo(i - 1, state);
+				if (chNext == '$') {
+					styler.ColourTo(i + 1, SCE_L_SHORTCMD);
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+					mode = 0;
+					state = SCE_L_DEFAULT;
+				} else { // This may not be an error, e.g. \begin{equation}\text{$a$}\end{equation}
+					styler.ColourTo(i, SCE_L_SHORTCMD);
+				}
+				break;
+			case '%' :
+				styler.ColourTo(i - 1, state);
+				state = SCE_L_COMMENT;
+				break;
+			}
+			break;
+		case SCE_L_COMMENT :
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				latexStateReset(mode, state);
+			}
+			break;
+		case SCE_L_COMMENT2 :
+			if (ch == '\\') {
+				Sci_Position match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{comment}")) {
+							styler.ColourTo(i - 1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
+			}
+			break;
+		case SCE_L_VERBATIM :
+			if (ch == '\\') {
+				Sci_Position match = i + 3;
+				if (latexLastWordIs(match, styler, "\\end")) {
+					match++;
+					if (latexIsTagValid(match, lengthDoc, styler)) {
+						if (latexLastWordIs(match, styler, "{verbatim}")) {
+							styler.ColourTo(i - 1, state);
+							state = SCE_L_COMMAND;
+						} else if (latexLastWordIs(match, styler, "{lstlisting}")) {
+							styler.ColourTo(i - 1, state);
+							state = SCE_L_COMMAND;
+						}
+					}
+				}
+			} else if (chNext == chVerbatimDelim) {
+				styler.ColourTo(i + 1, state);
+				latexStateReset(mode, state);
+				chVerbatimDelim = '\0';
+				i++;
+				chNext = styler.SafeGetCharAt(i + 1);
+			} else if (chVerbatimDelim != '\0' && (ch == '\n' || ch == '\r')) {
+				styler.ColourTo(i, SCE_L_ERROR);
+				latexStateReset(mode, state);
+				chVerbatimDelim = '\0';
+			}
+			break;
+		}
+	}
+	if (lengthDoc == styler.Length()) truncModes(styler.GetLine(lengthDoc - 1));
+	styler.ColourTo(lengthDoc - 1, state);
+	styler.Flush();
+}
+
+static int latexFoldSaveToInt(const latexFoldSave &save) {
+	int sum = 0;
+	for (int i = 0; i <= save.structLev; ++i)
+		sum += save.openBegins[i];
+	return ((sum + save.structLev + SC_FOLDLEVELBASE) & SC_FOLDLEVELNUMBERMASK);
+}
+
+// Change folding state while processing a line
+// Return the level before the first relevant command
+void SCI_METHOD LexerLaTeX::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) {
+	const char *structWords[7] = {"part", "chapter", "section", "subsection",
+		"subsubsection", "paragraph", "subparagraph"};
+	Accessor styler(pAccess, &props);
+	Sci_PositionU endPos = startPos + length;
+	Sci_Position curLine = styler.GetLine(startPos);
+	latexFoldSave save;
+	getSave(curLine - 1, save);
+	do {
+		char ch, buf[16];
+		Sci_Position i, j;
+		int lev = -1;
+		bool needFold = false;
+		for (i = static_cast<Sci_Position>(startPos); i < static_cast<Sci_Position>(endPos); ++i) {
+			ch = styler.SafeGetCharAt(i);
+			if (ch == '\r' || ch == '\n') break;
+			if (ch != '\\' || styler.StyleAt(i) != SCE_L_COMMAND) continue;
+			for (j = 0; j < 15 && i + 1 < static_cast<Sci_Position>(endPos); ++j, ++i) {
+				buf[j] = styler.SafeGetCharAt(i + 1);
+				if (!latexIsLetter(buf[j])) break;
+			}
+			buf[j] = '\0';
+			if (strcmp(buf, "begin") == 0) {
+				if (lev < 0) lev = latexFoldSaveToInt(save);
+				++save.openBegins[save.structLev];
+				needFold = true;
+			}
+			else if (strcmp(buf, "end") == 0) {
+				while (save.structLev > 0 && save.openBegins[save.structLev] == 0)
+					--save.structLev;
+				if (lev < 0) lev = latexFoldSaveToInt(save);
+				if (save.openBegins[save.structLev] > 0) --save.openBegins[save.structLev];
+			}
+			else {
+				for (j = 0; j < 7; ++j)
+					if (strcmp(buf, structWords[j]) == 0) break;
+				if (j >= 7) continue;
+				save.structLev = j;   // level before the command
+				for (j = save.structLev + 1; j < 8; ++j) {
+					save.openBegins[save.structLev] += save.openBegins[j];
+					save.openBegins[j] = 0;
+				}
+				if (lev < 0) lev = latexFoldSaveToInt(save);
+				++save.structLev;   // level after the command
+				needFold = true;
+			}
+		}
+		if (lev < 0) lev = latexFoldSaveToInt(save);
+		if (needFold) lev |= SC_FOLDLEVELHEADERFLAG;
+		styler.SetLevel(curLine, lev);
+		setSave(curLine, save);
+		++curLine;
+		startPos = styler.LineStart(curLine);
+		if (static_cast<Sci_Position>(startPos) == styler.Length()) {
+			lev = latexFoldSaveToInt(save);
+			styler.SetLevel(curLine, lev);
+			setSave(curLine, save);
+			truncSaves(curLine);
+		}
+	} while (startPos < endPos);
+	styler.Flush();
+}
+
+static const char *const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmLatex(SCLEX_LATEX, LexerLaTeX::LexerFactoryLaTeX, "latex", emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexLisp.cxx b/scite-app/lexilla/lexers/LexLisp.cxx
new file mode 100644
index 0000000..d482541
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexLisp.cxx
@@ -0,0 +1,286 @@
+// Scintilla source code edit control
+/** @file LexLisp.cxx
+ ** Lexer for Lisp.
+ ** Written by Alexey Yutkin.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+#define SCE_LISP_CHARACTER 29
+#define SCE_LISP_MACRO 30
+#define SCE_LISP_MACRO_DISPATCH 31
+
+static inline bool isLispoperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	if (ch == '\'' || ch == '`' || ch == '(' || ch == ')' || ch == '[' || ch == ']' || ch == '{' || ch == '}')
+		return true;
+	return false;
+}
+
+static inline bool isLispwordstart(char ch) {
+	return IsASCII(ch) && ch != ';'  && !isspacechar(ch) && !isLispoperator(ch) &&
+		ch != '\n' && ch != '\r' &&  ch != '\"';
+}
+
+
+static void classifyWordLisp(Sci_PositionU start, Sci_PositionU end, WordList &keywords, WordList &keywords_kw, Accessor &styler) {
+	assert(end >= start);
+	char s[100];
+	Sci_PositionU i;
+	bool digit_flag = true;
+	for (i = 0; (i < end - start + 1) && (i < 99); i++) {
+		s[i] = styler[start + i];
+		s[i + 1] = '\0';
+		if (!isdigit(s[i]) && (s[i] != '.')) digit_flag = false;
+	}
+	char chAttr = SCE_LISP_IDENTIFIER;
+
+	if(digit_flag) chAttr = SCE_LISP_NUMBER;
+	else {
+		if (keywords.InList(s)) {
+			chAttr = SCE_LISP_KEYWORD;
+		} else if (keywords_kw.InList(s)) {
+			chAttr = SCE_LISP_KEYWORD_KW;
+		} else if ((s[0] == '*' && s[i-1] == '*') ||
+			   (s[0] == '+' && s[i-1] == '+')) {
+			chAttr = SCE_LISP_SPECIAL;
+		}
+	}
+	styler.ColourTo(end, chAttr);
+	return;
+}
+
+
+static void ColouriseLispDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords_kw = *keywordlists[1];
+
+	styler.StartAt(startPos);
+
+	int state = initStyle, radix = -1;
+	char chNext = styler[startPos];
+	Sci_PositionU lengthDoc = startPos + length;
+	styler.StartSegment(startPos);
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_LISP_DEFAULT) {
+			if (ch == '#') {
+				styler.ColourTo(i - 1, state);
+				radix = -1;
+				state = SCE_LISP_MACRO_DISPATCH;
+			} else if (ch == ':' && isLispwordstart(chNext)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_SYMBOL;
+			} else if (isLispwordstart(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_IDENTIFIER;
+			}
+			else if (ch == ';') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_COMMENT;
+			}
+			else if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+			else if (ch == '\"') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_STRING;
+			}
+		} else if (state == SCE_LISP_IDENTIFIER || state == SCE_LISP_SYMBOL) {
+			if (!isLispwordstart(ch)) {
+				if (state == SCE_LISP_IDENTIFIER) {
+					classifyWordLisp(styler.GetStartSegment(), i - 1, keywords, keywords_kw, styler);
+				} else {
+					styler.ColourTo(i - 1, state);
+				}
+				state = SCE_LISP_DEFAULT;
+			} /*else*/
+			if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+		} else if (state == SCE_LISP_MACRO_DISPATCH) {
+			if (!(IsASCII(ch) && isdigit(ch))) {
+				if (ch != 'r' && ch != 'R' && (i - styler.GetStartSegment()) > 1) {
+					state = SCE_LISP_DEFAULT;
+				} else {
+					switch (ch) {
+						case '|': state = SCE_LISP_MULTI_COMMENT; break;
+						case 'o':
+						case 'O': radix = 8; state = SCE_LISP_MACRO; break;
+						case 'x':
+						case 'X': radix = 16; state = SCE_LISP_MACRO; break;
+						case 'b':
+						case 'B': radix = 2; state = SCE_LISP_MACRO; break;
+						case '\\': state = SCE_LISP_CHARACTER; break;
+						case ':':
+						case '-':
+						case '+': state = SCE_LISP_MACRO; break;
+						case '\'': if (isLispwordstart(chNext)) {
+								   state = SCE_LISP_SPECIAL;
+							   } else {
+								   styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
+								   styler.ColourTo(i, SCE_LISP_OPERATOR);
+								   state = SCE_LISP_DEFAULT;
+							   }
+							   break;
+						default: if (isLispoperator(ch)) {
+								 styler.ColourTo(i - 1, SCE_LISP_DEFAULT);
+								 styler.ColourTo(i, SCE_LISP_OPERATOR);
+							 }
+							 state = SCE_LISP_DEFAULT;
+							 break;
+					}
+				}
+			}
+		} else if (state == SCE_LISP_MACRO) {
+			if (isLispwordstart(ch) && (radix == -1 || IsADigit(ch, radix))) {
+				state = SCE_LISP_SPECIAL;
+			} else {
+				state = SCE_LISP_DEFAULT;
+			}
+		} else if (state == SCE_LISP_CHARACTER) {
+			if (isLispoperator(ch)) {
+				styler.ColourTo(i, SCE_LISP_SPECIAL);
+				state = SCE_LISP_DEFAULT;
+			} else if (isLispwordstart(ch)) {
+				styler.ColourTo(i, SCE_LISP_SPECIAL);
+				state = SCE_LISP_SPECIAL;
+			} else {
+				state = SCE_LISP_DEFAULT;
+			}
+		} else if (state == SCE_LISP_SPECIAL) {
+			if (!isLispwordstart(ch) || (radix != -1 && !IsADigit(ch, radix))) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_LISP_DEFAULT;
+			}
+			if (isLispoperator(ch) || ch=='\'') {
+				styler.ColourTo(i - 1, state);
+				styler.ColourTo(i, SCE_LISP_OPERATOR);
+				if (ch=='\'' && isLispwordstart(chNext)) {
+					state = SCE_LISP_SYMBOL;
+				}
+			}
+		} else {
+			if (state == SCE_LISP_COMMENT) {
+				if (atEOL) {
+					styler.ColourTo(i - 1, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			} else if (state == SCE_LISP_MULTI_COMMENT) {
+				if (ch == '|' && chNext == '#') {
+					i++;
+					chNext = styler.SafeGetCharAt(i + 1);
+					styler.ColourTo(i, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			} else if (state == SCE_LISP_STRING) {
+				if (ch == '\\') {
+					if (chNext == '\"' || chNext == '\'' || chNext == '\\') {
+						i++;
+						chNext = styler.SafeGetCharAt(i + 1);
+					}
+				} else if (ch == '\"') {
+					styler.ColourTo(i, state);
+					state = SCE_LISP_DEFAULT;
+				}
+			}
+		}
+
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+}
+
+static void FoldLispDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[],
+                            Accessor &styler) {
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_LISP_OPERATOR) {
+			if (ch == '(' || ch == '[' || ch == '{') {
+				levelCurrent++;
+			} else if (ch == ')' || ch == ']' || ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const lispWordListDesc[] = {
+	"Functions and special operators",
+	"Keywords",
+	0
+};
+
+LexerModule lmLISP(SCLEX_LISP, ColouriseLispDoc, "lisp", FoldLispDoc, lispWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexLout.cxx b/scite-app/lexilla/lexers/LexLout.cxx
new file mode 100644
index 0000000..98435c6
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexLout.cxx
@@ -0,0 +1,216 @@
+// Scintilla source code edit control
+/** @file LexLout.cxx
+ ** Lexer for the Basser Lout (>= version 3) typesetting language
+ **/
+// Copyright 2003 by Kein-Hong Man <mkh@pl.jaring.my>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '@' || ch == '_');
+}
+
+static inline bool IsAnOther(const int ch) {
+	return (ch < 0x80) && (ch == '{' || ch == '}' ||
+	ch == '!' || ch == '$' || ch == '%' || ch == '&' || ch == '\'' ||
+	ch == '(' || ch == ')' || ch == '*' || ch == '+' || ch == ',' ||
+	ch == '-' || ch == '.' || ch == '/' || ch == ':' || ch == ';' ||
+	ch == '<' || ch == '=' || ch == '>' || ch == '?' || ch == '[' ||
+	ch == ']' || ch == '^' || ch == '`' || ch == '|' || ch == '~');
+}
+
+static void ColouriseLoutDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+			     WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+	int visibleChars = 0;
+	int firstWordInLine = 0;
+	int leadingAtSign = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_LOUT_STRING)) {
+			// Prevent SCE_LOUT_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_LOUT_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_LOUT_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_LOUT_DEFAULT);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_LOUT_NUMBER) {
+			if (!IsADigit(sc.ch) && sc.ch != '.') {
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		} else if (sc.state == SCE_LOUT_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_LOUT_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_LOUT_STRINGEOL);
+				sc.ForwardSetState(SCE_LOUT_DEFAULT);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_LOUT_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (leadingAtSign) {
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_LOUT_WORD);
+					} else {
+						sc.ChangeState(SCE_LOUT_WORD4);
+					}
+				} else if (firstWordInLine && keywords3.InList(s)) {
+					sc.ChangeState(SCE_LOUT_WORD3);
+				}
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		} else if (sc.state == SCE_LOUT_OPERATOR) {
+			if (!IsAnOther(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_LOUT_WORD2);
+				}
+				sc.SetState(SCE_LOUT_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_LOUT_DEFAULT) {
+			if (sc.ch == '#') {
+				sc.SetState(SCE_LOUT_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_LOUT_STRING);
+			} else if (IsADigit(sc.ch) ||
+				  (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_LOUT_NUMBER);
+			} else if (IsAWordChar(sc.ch)) {
+				firstWordInLine = (visibleChars == 0);
+				leadingAtSign = (sc.ch == '@');
+				sc.SetState(SCE_LOUT_IDENTIFIER);
+			} else if (IsAnOther(sc.ch)) {
+				sc.SetState(SCE_LOUT_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldLoutDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                        Accessor &styler) {
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int styleNext = styler.StyleAt(startPos);
+	char s[10] = "";
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_LOUT_WORD) {
+			if (ch == '@') {
+				for (Sci_PositionU j = 0; j < 8; j++) {
+					if (!IsAWordChar(styler[i + j])) {
+						break;
+					}
+					s[j] = styler[i + j];
+					s[j + 1] = '\0';
+				}
+				if (strcmp(s, "@Begin") == 0) {
+					levelCurrent++;
+				} else if (strcmp(s, "@End") == 0) {
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_LOUT_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const loutWordLists[] = {
+            "Predefined identifiers",
+            "Predefined delimiters",
+            "Predefined keywords",
+            0,
+        };
+
+LexerModule lmLout(SCLEX_LOUT, ColouriseLoutDoc, "lout", FoldLoutDoc, loutWordLists);
diff --git a/scite-app/lexilla/lexers/LexLua.cxx b/scite-app/lexilla/lexers/LexLua.cxx
new file mode 100644
index 0000000..fc9cef9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexLua.cxx
@@ -0,0 +1,487 @@
+// Scintilla source code edit control
+/** @file LexLua.cxx
+ ** Lexer for Lua language.
+ **
+ ** Written by Paul Winwood.
+ ** Folder by Alexey Yutkin.
+ ** Modified by Marcos E. Wurzius & Philippe Lhoste
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Test for [=[ ... ]=] delimiters, returns 0 if it's only a [ or ],
+// return 1 for [[ or ]], returns >=2 for [=[ or ]=] and so on.
+// The maximum number of '=' characters allowed is 254.
+static int LongDelimCheck(StyleContext &sc) {
+	int sep = 1;
+	while (sc.GetRelative(sep) == '=' && sep < 0xFF)
+		sep++;
+	if (sc.GetRelative(sep) == sc.ch)
+		return sep;
+	return 0;
+}
+
+static void ColouriseLuaDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler) {
+
+	const WordList &keywords = *keywordlists[0];
+	const WordList &keywords2 = *keywordlists[1];
+	const WordList &keywords3 = *keywordlists[2];
+	const WordList &keywords4 = *keywordlists[3];
+	const WordList &keywords5 = *keywordlists[4];
+	const WordList &keywords6 = *keywordlists[5];
+	const WordList &keywords7 = *keywordlists[6];
+	const WordList &keywords8 = *keywordlists[7];
+
+	// Accepts accented characters
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", true);
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases. [pP] is for hex floats.
+	CharacterSet setNumber(CharacterSet::setDigits, ".-+abcdefpABCDEFP");
+	CharacterSet setExponent(CharacterSet::setNone, "eEpP");
+	CharacterSet setLuaOperator(CharacterSet::setNone, "*/-+()={}~[];<>,.^%:#&|");
+	CharacterSet setEscapeSkip(CharacterSet::setNone, "\"'\\");
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	// Initialize long string [[ ... ]] or block comment --[[ ... ]],
+	// if we are inside such a string. Block comment was introduced in Lua 5.0,
+	// blocks with separators [=[ ... ]=] in Lua 5.1.
+	// Continuation of a string (\z whitespace escaping) is controlled by stringWs.
+	int sepCount = 0;
+	int stringWs = 0;
+	if (initStyle == SCE_LUA_LITERALSTRING || initStyle == SCE_LUA_COMMENT ||
+		initStyle == SCE_LUA_STRING || initStyle == SCE_LUA_CHARACTER) {
+		const int lineState = styler.GetLineState(currentLine - 1);
+		sepCount = lineState & 0xFF;
+		stringWs = lineState & 0x100;
+	}
+
+	// results of identifier/keyword matching
+	Sci_Position idenPos = 0;
+	Sci_Position idenWordPos = 0;
+	int idenStyle = SCE_LUA_IDENTIFIER;
+	bool foundGoto = false;
+
+	// Do not leak onto next line
+	if (initStyle == SCE_LUA_STRINGEOL || initStyle == SCE_LUA_COMMENTLINE || initStyle == SCE_LUA_PREPROCESSOR) {
+		initStyle = SCE_LUA_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	if (startPos == 0 && sc.ch == '#' && sc.chNext == '!') {
+		// shbang line: "#!" is a comment only if located at the start of the script
+		sc.SetState(SCE_LUA_COMMENTLINE);
+	}
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			switch (sc.state) {
+			case SCE_LUA_LITERALSTRING:
+			case SCE_LUA_COMMENT:
+			case SCE_LUA_STRING:
+			case SCE_LUA_CHARACTER:
+				// Inside a literal string, block comment or string, we set the line state
+				styler.SetLineState(currentLine, stringWs | sepCount);
+				break;
+			default:
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+				break;
+			}
+		}
+		if (sc.atLineStart && (sc.state == SCE_LUA_STRING)) {
+			// Prevent SCE_LUA_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_LUA_STRING);
+		}
+
+		// Handle string line continuation
+		if ((sc.state == SCE_LUA_STRING || sc.state == SCE_LUA_CHARACTER) &&
+				sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_LUA_OPERATOR) {
+			if (sc.ch == ':' && sc.chPrev == ':') {	// :: <label> :: forward scan
+				sc.Forward();
+				Sci_Position ln = 0;
+				while (IsASpaceOrTab(sc.GetRelative(ln)))	// skip over spaces/tabs
+					ln++;
+				Sci_Position ws1 = ln;
+				if (setWordStart.Contains(sc.GetRelative(ln))) {
+					int c, i = 0;
+					char s[100];
+					while (setWord.Contains(c = sc.GetRelative(ln))) {	// get potential label
+						if (i < 90)
+							s[i++] = static_cast<char>(c);
+						ln++;
+					}
+					s[i] = '\0'; Sci_Position lbl = ln;
+					if (!keywords.InList(s)) {
+						while (IsASpaceOrTab(sc.GetRelative(ln)))	// skip over spaces/tabs
+							ln++;
+						Sci_Position ws2 = ln - lbl;
+						if (sc.GetRelative(ln) == ':' && sc.GetRelative(ln + 1) == ':') {
+							// final :: found, complete valid label construct
+							sc.ChangeState(SCE_LUA_LABEL);
+							if (ws1) {
+								sc.SetState(SCE_LUA_DEFAULT);
+								sc.ForwardBytes(ws1);
+							}
+							sc.SetState(SCE_LUA_LABEL);
+							sc.ForwardBytes(lbl - ws1);
+							if (ws2) {
+								sc.SetState(SCE_LUA_DEFAULT);
+								sc.ForwardBytes(ws2);
+							}
+							sc.SetState(SCE_LUA_LABEL);
+							sc.ForwardBytes(2);
+						}
+					}
+				}
+			}
+			sc.SetState(SCE_LUA_DEFAULT);
+		} else if (sc.state == SCE_LUA_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eEpP non-sign non-hexdigit char
+			if (!setNumber.Contains(sc.ch)) {
+				sc.SetState(SCE_LUA_DEFAULT);
+			} else if (sc.ch == '-' || sc.ch == '+') {
+				if (!setExponent.Contains(sc.chPrev))
+					sc.SetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_IDENTIFIER) {
+			idenPos--;			// commit already-scanned identitier/word parts
+			if (idenWordPos > 0) {
+				idenWordPos--;
+				sc.ChangeState(idenStyle);
+				sc.ForwardBytes(idenWordPos);
+				idenPos -= idenWordPos;
+				if (idenPos > 0) {
+					sc.SetState(SCE_LUA_IDENTIFIER);
+					sc.ForwardBytes(idenPos);
+				}
+			} else {
+				sc.ForwardBytes(idenPos);
+			}
+			sc.SetState(SCE_LUA_DEFAULT);
+			if (foundGoto) {					// goto <label> forward scan
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+				if (setWordStart.Contains(sc.ch)) {
+					sc.SetState(SCE_LUA_LABEL);
+					sc.Forward();
+					while (setWord.Contains(sc.ch))
+						sc.Forward();
+					char s[100];
+					sc.GetCurrent(s, sizeof(s));
+					if (keywords.InList(s))		// labels cannot be keywords
+						sc.ChangeState(SCE_LUA_WORD);
+				}
+				sc.SetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_COMMENTLINE || sc.state == SCE_LUA_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_STRING) {
+			if (stringWs) {
+				if (!IsASpace(sc.ch))
+					stringWs = 0;
+			}
+			if (sc.ch == '\\') {
+				if (setEscapeSkip.Contains(sc.chNext)) {
+					sc.Forward();
+				} else if (sc.chNext == 'z') {
+					sc.Forward();
+					stringWs = 0x100;
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			} else if (stringWs == 0 && sc.atLineEnd) {
+				sc.ChangeState(SCE_LUA_STRINGEOL);
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.state == SCE_LUA_CHARACTER) {
+			if (stringWs) {
+				if (!IsASpace(sc.ch))
+					stringWs = 0;
+			}
+			if (sc.ch == '\\') {
+				if (setEscapeSkip.Contains(sc.chNext)) {
+					sc.Forward();
+				} else if (sc.chNext == 'z') {
+					sc.Forward();
+					stringWs = 0x100;
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			} else if (stringWs == 0 && sc.atLineEnd) {
+				sc.ChangeState(SCE_LUA_STRINGEOL);
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		} else if (sc.ch == ']' && (sc.state == SCE_LUA_LITERALSTRING || sc.state == SCE_LUA_COMMENT)) {
+			const int sep = LongDelimCheck(sc);
+			if (sep == sepCount) {   // ]=]-style delim
+				sc.Forward(sep);
+				sc.ForwardSetState(SCE_LUA_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_LUA_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_LUA_NUMBER);
+				if (sc.ch == '0' && toupper(sc.chNext) == 'X') {
+					sc.Forward();
+				}
+			} else if (setWordStart.Contains(sc.ch)) {
+				// For matching various identifiers with dots and colons, multiple
+				// matches are done as identifier segments are added. Longest match is
+				// set to a word style. The non-matched part is in identifier style.
+				std::string ident;
+				idenPos = 0;
+				idenWordPos = 0;
+				idenStyle = SCE_LUA_IDENTIFIER;
+				foundGoto = false;
+				int cNext;
+				do {
+					int c;
+					const Sci_Position idenPosOld = idenPos;
+					std::string identSeg;
+					identSeg += static_cast<char>(sc.GetRelative(idenPos++));
+					while (setWord.Contains(c = sc.GetRelative(idenPos))) {
+						identSeg += static_cast<char>(c);
+						idenPos++;
+					}
+					if (keywords.InList(identSeg.c_str()) && (idenPosOld > 0)) {
+						idenPos = idenPosOld - 1;	// keywords cannot mix
+						ident.pop_back();
+						break;
+					}
+					ident += identSeg;
+					const char* s = ident.c_str();
+					int newStyle = SCE_LUA_IDENTIFIER;
+					if (keywords.InList(s)) {
+						newStyle = SCE_LUA_WORD;
+					} else if (keywords2.InList(s)) {
+						newStyle = SCE_LUA_WORD2;
+					} else if (keywords3.InList(s)) {
+						newStyle = SCE_LUA_WORD3;
+					} else if (keywords4.InList(s)) {
+						newStyle = SCE_LUA_WORD4;
+					} else if (keywords5.InList(s)) {
+						newStyle = SCE_LUA_WORD5;
+					} else if (keywords6.InList(s)) {
+						newStyle = SCE_LUA_WORD6;
+					} else if (keywords7.InList(s)) {
+						newStyle = SCE_LUA_WORD7;
+					} else if (keywords8.InList(s)) {
+						newStyle = SCE_LUA_WORD8;
+					}
+					if (newStyle != SCE_LUA_IDENTIFIER) {
+						idenStyle = newStyle;
+						idenWordPos = idenPos;
+					}
+					if (idenStyle == SCE_LUA_WORD)	// keywords cannot mix
+						break;
+					cNext = sc.GetRelative(idenPos + 1);
+					if ((c == '.' || c == ':') && setWordStart.Contains(cNext)) {
+						ident += static_cast<char>(c);
+						idenPos++;
+					} else {
+						cNext = 0;
+					}
+				} while (cNext);
+				if ((idenStyle == SCE_LUA_WORD) && (ident.compare("goto") == 0)) {
+					foundGoto = true;
+				}
+				sc.SetState(SCE_LUA_IDENTIFIER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_LUA_STRING);
+				stringWs = 0;
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_LUA_CHARACTER);
+				stringWs = 0;
+			} else if (sc.ch == '[') {
+				sepCount = LongDelimCheck(sc);
+				if (sepCount == 0) {
+					sc.SetState(SCE_LUA_OPERATOR);
+				} else {
+					sc.SetState(SCE_LUA_LITERALSTRING);
+					sc.Forward(sepCount);
+				}
+			} else if (sc.Match('-', '-')) {
+				sc.SetState(SCE_LUA_COMMENTLINE);
+				if (sc.Match("--[")) {
+					sc.Forward(2);
+					sepCount = LongDelimCheck(sc);
+					if (sepCount > 0) {
+						sc.ChangeState(SCE_LUA_COMMENT);
+						sc.Forward(sepCount);
+					}
+				} else {
+					sc.Forward();
+				}
+			} else if (sc.atLineStart && sc.Match('$')) {
+				sc.SetState(SCE_LUA_PREPROCESSOR);	// Obsolete since Lua 4.0, but still in old code
+			} else if (setLuaOperator.Contains(sc.ch)) {
+				sc.SetState(SCE_LUA_OPERATOR);
+			}
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldLuaDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+                       Accessor &styler) {
+	const Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	int style = initStyle;
+	int styleNext = styler.StyleAt(startPos);
+
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		const char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		const int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_LUA_WORD) {
+			if (ch == 'i' || ch == 'd' || ch == 'f' || ch == 'e' || ch == 'r' || ch == 'u') {
+				char s[10] = "";
+				for (Sci_PositionU j = 0; j < 8; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = styler[i + j];
+					s[j + 1] = '\0';
+				}
+
+				if ((strcmp(s, "if") == 0) || (strcmp(s, "do") == 0) || (strcmp(s, "function") == 0) || (strcmp(s, "repeat") == 0)) {
+					levelCurrent++;
+				}
+				if ((strcmp(s, "end") == 0) || (strcmp(s, "elseif") == 0) || (strcmp(s, "until") == 0)) {
+					levelCurrent--;
+				}
+			}
+		} else if (style == SCE_LUA_OPERATOR) {
+			if (ch == '{' || ch == '(') {
+				levelCurrent++;
+			} else if (ch == '}' || ch == ')') {
+				levelCurrent--;
+			}
+		} else if (style == SCE_LUA_LITERALSTRING || style == SCE_LUA_COMMENT) {
+			if (stylePrev != style) {
+				levelCurrent++;
+			} else if (styleNext != style) {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact) {
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			}
+			if ((levelCurrent > levelPrev) && (visibleChars > 0)) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const luaWordListDesc[] = {
+	"Keywords",
+	"Basic functions",
+	"String, (table) & math functions",
+	"(coroutines), I/O & system facilities",
+	"user1",
+	"user2",
+	"user3",
+	"user4",
+	0
+};
+
+namespace {
+
+LexicalClass lexicalClasses[] = {
+	// Lexer Lua SCLEX_LUA SCE_LUA_:
+	0, "SCE_LUA_DEFAULT", "default", "White space: Visible only in View Whitespace mode (or if it has a back colour)",
+	1, "SCE_LUA_COMMENT", "comment", "Block comment (Lua 5.0)",
+	2, "SCE_LUA_COMMENTLINE", "comment line", "Line comment",
+	3, "SCE_LUA_COMMENTDOC", "comment documentation", "Doc comment -- Not used in Lua (yet?)",
+	4, "SCE_LUA_NUMBER", "literal numeric", "Number",
+	5, "SCE_LUA_WORD", "keyword", "Keyword",
+	6, "SCE_LUA_STRING", "literal string", "(Double quoted) String",
+	7, "SCE_LUA_CHARACTER", "literal string character", "Character (Single quoted string)",
+	8, "SCE_LUA_LITERALSTRING", "literal string", "Literal string",
+	9, "SCE_LUA_PREPROCESSOR", "preprocessor", "Preprocessor (obsolete in Lua 4.0 and up)",
+	10, "SCE_LUA_OPERATOR", "operator", "Operators",
+	11, "SCE_LUA_IDENTIFIER", "identifier", "Identifier (everything else...)",
+	12, "SCE_LUA_STRINGEOL", "error literal string", "End of line where string is not closed",
+	13, "SCE_LUA_WORD2", "identifier", "Other keywords",
+	14, "SCE_LUA_WORD3", "identifier", "Other keywords",
+	15, "SCE_LUA_WORD4", "identifier", "Other keywords",
+	16, "SCE_LUA_WORD5", "identifier", "Other keywords",
+	17, "SCE_LUA_WORD6", "identifier", "Other keywords",
+	18, "SCE_LUA_WORD7", "identifier", "Other keywords",
+	19, "SCE_LUA_WORD8", "identifier", "Other keywords",
+	20, "SCE_LUA_LABEL", "label", "Labels",
+};
+
+}
+
+LexerModule lmLua(SCLEX_LUA, ColouriseLuaDoc, "lua", FoldLuaDoc, luaWordListDesc, lexicalClasses, ELEMENTS(lexicalClasses));
diff --git a/scite-app/lexilla/lexers/LexMMIXAL.cxx b/scite-app/lexilla/lexers/LexMMIXAL.cxx
new file mode 100644
index 0000000..f0b779c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMMIXAL.cxx
@@ -0,0 +1,186 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file LexMMIXAL.cxx
+ ** Lexer for MMIX Assembler Language.
+ ** Written by Christoph Hösler <christoph.hoesler@student.uni-tuebingen.de>
+ ** For information about MMIX visit http://www-cs-faculty.stanford.edu/~knuth/mmix.html
+ **/
+// Copyright 1998-2003 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == ':' || ch == '_');
+}
+
+static inline bool isMMIXALOperator(char ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	if (ch == '+' || ch == '-' || ch == '|' || ch == '^' ||
+		ch == '*' || ch == '/' ||
+		ch == '%' || ch == '<' || ch == '>' || ch == '&' ||
+		ch == '~' || ch == '$' ||
+		ch == ',' || ch == '(' || ch == ')' ||
+		ch == '[' || ch == ']')
+		return true;
+	return false;
+}
+
+static void ColouriseMMIXALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &opcodes = *keywordlists[0];
+	WordList &special_register = *keywordlists[1];
+	WordList &predef_symbols = *keywordlists[2];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward())
+	{
+		// No EOL continuation
+		if (sc.atLineStart) {
+			if (sc.ch ==  '@' && sc.chNext == 'i') {
+				sc.SetState(SCE_MMIXAL_INCLUDE);
+			} else {
+				sc.SetState(SCE_MMIXAL_LEADWS);
+			}
+		}
+
+		// Check if first non whitespace character in line is alphanumeric
+		if (sc.state == SCE_MMIXAL_LEADWS && !isspace(sc.ch)) {	// LEADWS
+			if(!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_COMMENT);
+			} else {
+				if(sc.atLineStart) {
+					sc.SetState(SCE_MMIXAL_LABEL);
+				} else {
+					sc.SetState(SCE_MMIXAL_OPCODE_PRE);
+				}
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_MMIXAL_OPERATOR) {			// OPERATOR
+			sc.SetState(SCE_MMIXAL_OPERANDS);
+		} else if (sc.state == SCE_MMIXAL_NUMBER) {		// NUMBER
+			if (!isdigit(sc.ch)) {
+				if (IsAWordChar(sc.ch)) {
+					sc.ChangeState(SCE_MMIXAL_REF);
+					sc.SetState(SCE_MMIXAL_REF);
+				} else {
+					sc.SetState(SCE_MMIXAL_OPERANDS);
+				}
+			}
+		} else if (sc.state == SCE_MMIXAL_LABEL) {			// LABEL
+			if (!IsAWordChar(sc.ch) ) {
+				sc.SetState(SCE_MMIXAL_OPCODE_PRE);
+			}
+		} else if (sc.state == SCE_MMIXAL_REF) {			// REF
+			if (!IsAWordChar(sc.ch) ) {
+				char s0[100];
+				sc.GetCurrent(s0, sizeof(s0));
+				const char *s = s0;
+				if (*s == ':') {	// ignore base prefix for match
+					++s;
+				}
+				if (special_register.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_REGISTER);
+				} else if (predef_symbols.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_SYMBOL);
+				}
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_OPCODE_PRE) {	// OPCODE_PRE
+				if (!isspace(sc.ch)) {
+					sc.SetState(SCE_MMIXAL_OPCODE);
+				}
+		} else if (sc.state == SCE_MMIXAL_OPCODE) {		// OPCODE
+			if (!IsAWordChar(sc.ch) ) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (opcodes.InList(s)) {
+					sc.ChangeState(SCE_MMIXAL_OPCODE_VALID);
+				} else {
+					sc.ChangeState(SCE_MMIXAL_OPCODE_UNKNOWN);
+				}
+				sc.SetState(SCE_MMIXAL_OPCODE_POST);
+			}
+		} else if (sc.state == SCE_MMIXAL_STRING) {		// STRING
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_CHAR) {			// CHAR
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_REGISTER) {		// REGISTER
+			if (!isdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		} else if (sc.state == SCE_MMIXAL_HEX) {			// HEX
+			if (!isxdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_OPERANDS);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_MMIXAL_OPCODE_POST ||		// OPCODE_POST
+			sc.state == SCE_MMIXAL_OPERANDS) {			// OPERANDS
+			if (sc.state == SCE_MMIXAL_OPERANDS && isspace(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_COMMENT);
+			} else if (isdigit(sc.ch)) {
+				sc.SetState(SCE_MMIXAL_NUMBER);
+			} else if (IsAWordChar(sc.ch) || sc.Match('@')) {
+				sc.SetState(SCE_MMIXAL_REF);
+			} else if (sc.Match('\"')) {
+				sc.SetState(SCE_MMIXAL_STRING);
+			} else if (sc.Match('\'')) {
+				sc.SetState(SCE_MMIXAL_CHAR);
+			} else if (sc.Match('$')) {
+				sc.SetState(SCE_MMIXAL_REGISTER);
+			} else if (sc.Match('#')) {
+				sc.SetState(SCE_MMIXAL_HEX);
+			} else if (isMMIXALOperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_MMIXAL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static const char * const MMIXALWordListDesc[] = {
+	"Operation Codes",
+	"Special Register",
+	"Predefined Symbols",
+	0
+};
+
+LexerModule lmMMIXAL(SCLEX_MMIXAL, ColouriseMMIXALDoc, "mmixal", 0, MMIXALWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexMPT.cxx b/scite-app/lexilla/lexers/LexMPT.cxx
new file mode 100644
index 0000000..f54b013
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMPT.cxx
@@ -0,0 +1,192 @@
+// Scintilla source code edit control
+/** @file LexMPT.cxx
+ ** Lexer for MPT specific files. Based on LexOthers.cxx
+ ** LOT = the text log file created by the MPT application while running a test program
+ ** Other MPT specific files to be added later.
+ **/
+// Copyright 2003 by Marius Gheorghe <mgheorghe@cabletest.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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static int GetLotLineState(std::string &line) {
+	if (line.length()) {
+		// Most of the time the first non-blank character in line determines that line's type
+		// Now finds the first non-blank character
+		unsigned i; // Declares counter here to make it persistent after the for loop
+		for (i = 0; i < line.length(); ++i) {
+			if (!(IsASCII(line[i]) && isspace(line[i])))
+				break;
+		}
+
+		// Checks if it was a blank line
+		if (i == line.length())
+			return SCE_LOT_DEFAULT;
+
+		switch (line[i]) {
+		case '*': // Fail measurement
+			return SCE_LOT_FAIL;
+
+		case '+': // Header
+		case '|': // Header
+			return SCE_LOT_HEADER;
+
+		case ':': // Set test limits
+			return SCE_LOT_SET;
+
+		case '-': // Section break
+			return SCE_LOT_BREAK;
+
+		default:  // Any other line
+			// Checks for message at the end of lot file
+			if (line.find("PASSED") != std::string::npos) {
+				return SCE_LOT_PASS;
+			}
+			else if (line.find("FAILED") != std::string::npos) {
+				return SCE_LOT_FAIL;
+			}
+			else if (line.find("ABORTED") != std::string::npos) {
+				return SCE_LOT_ABORT;
+			}
+			else {
+				return i ? SCE_LOT_PASS : SCE_LOT_DEFAULT;
+			}
+		}
+	}
+	else {
+		return SCE_LOT_DEFAULT;
+	}
+}
+
+static void ColourizeLotDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	bool atLineStart = true;// Arms the 'at line start' flag
+	char chNext = styler.SafeGetCharAt(startPos);
+	std::string line("");
+	line.reserve(256);	// Lot lines are less than 256 chars long most of the time. This should avoid reallocations
+
+	// Styles LOT document
+	Sci_PositionU i;			// Declared here because it's used after the for loop
+	for (i = startPos; i < startPos + length; ++i) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		line += ch;
+		atLineStart = false;
+
+		// LOT files are only used on the Win32 platform, thus EOL == CR+LF
+		// Searches for the end of line
+		if (ch == '\r' && chNext == '\n') {
+			line += chNext; // Gets the '\n'
+			++i; // Advances past the '\n'
+			chNext = styler.SafeGetCharAt(i + 1); // Gets character of next line
+			styler.ColourTo(i, GetLotLineState(line));
+			line = "";
+			atLineStart = true; // Arms flag for next line
+		}
+	}
+
+	// Last line may not have a line ending
+	if (!atLineStart) {
+		styler.ColourTo(i - 1, GetLotLineState(line));
+	}
+}
+
+// Folds an MPT LOT file: the blocks that can be folded are:
+// sections (headed by a set line)
+// passes (contiguous pass results within a section)
+// fails (contiguous fail results within a section)
+static void FoldLotDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 0) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler.SafeGetCharAt(startPos);
+	int style = SCE_LOT_DEFAULT;
+	int styleNext = styler.StyleAt(startPos);
+	int lev = SC_FOLDLEVELBASE;
+
+	// Gets style of previous line if not at the beginning of the document
+	if (startPos > 1)
+		style = styler.StyleAt(startPos - 2);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if (ch == '\r' && chNext == '\n') {
+			// TO DO:
+			// Should really get the state of the previous line from the styler
+			int stylePrev = style;
+			style = styleNext;
+			styleNext = styler.StyleAt(i + 2);
+
+			switch (style) {
+/*
+			case SCE_LOT_SET:
+				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				break;
+*/
+			case SCE_LOT_FAIL:
+/*
+				if (stylePrev != SCE_LOT_FAIL)
+					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				else
+					lev = SC_FOLDLEVELBASE + 1;
+*/
+				lev = SC_FOLDLEVELBASE;
+				break;
+
+			default:
+				if (lineCurrent == 0 || stylePrev == SCE_LOT_FAIL)
+					lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				else
+					lev = SC_FOLDLEVELBASE + 1;
+
+				if (visibleChars == 0 && foldCompact)
+					lev |= SC_FOLDLEVELWHITEFLAG;
+				break;
+			}
+
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, lev | flagsNext);
+}
+
+static const char * const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmLot(SCLEX_LOT, ColourizeLotDoc, "lot", FoldLotDoc, emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexMSSQL.cxx b/scite-app/lexilla/lexers/LexMSSQL.cxx
new file mode 100644
index 0000000..d0b5637
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMSSQL.cxx
@@ -0,0 +1,355 @@
+// Scintilla source code edit control
+/** @file LexMSSQL.cxx
+ ** Lexer for MSSQL.
+ **/
+// By Filip Yaghob <fyaghob@gmail.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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+#define KW_MSSQL_STATEMENTS         0
+#define KW_MSSQL_DATA_TYPES         1
+#define KW_MSSQL_SYSTEM_TABLES      2
+#define KW_MSSQL_GLOBAL_VARIABLES   3
+#define KW_MSSQL_FUNCTIONS          4
+#define KW_MSSQL_STORED_PROCEDURES  5
+#define KW_MSSQL_OPERATORS          6
+
+static char classifyWordSQL(Sci_PositionU start,
+                            Sci_PositionU end,
+                            WordList *keywordlists[],
+                            Accessor &styler,
+                            unsigned int actualState,
+							unsigned int prevState) {
+	char s[256];
+	bool wordIsNumber = isdigit(styler[start]) || (styler[start] == '.');
+
+	WordList &kwStatements          = *keywordlists[KW_MSSQL_STATEMENTS];
+    WordList &kwDataTypes           = *keywordlists[KW_MSSQL_DATA_TYPES];
+    WordList &kwSystemTables        = *keywordlists[KW_MSSQL_SYSTEM_TABLES];
+    WordList &kwGlobalVariables     = *keywordlists[KW_MSSQL_GLOBAL_VARIABLES];
+    WordList &kwFunctions           = *keywordlists[KW_MSSQL_FUNCTIONS];
+    WordList &kwStoredProcedures    = *keywordlists[KW_MSSQL_STORED_PROCEDURES];
+    WordList &kwOperators           = *keywordlists[KW_MSSQL_OPERATORS];
+
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 128; i++) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		s[i + 1] = '\0';
+	}
+	char chAttr = SCE_MSSQL_IDENTIFIER;
+
+	if (actualState == SCE_MSSQL_GLOBAL_VARIABLE) {
+
+        if (kwGlobalVariables.InList(&s[2]))
+            chAttr = SCE_MSSQL_GLOBAL_VARIABLE;
+
+	} else if (wordIsNumber) {
+		chAttr = SCE_MSSQL_NUMBER;
+
+	} else if (prevState == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
+		// Look first in datatypes
+        if (kwDataTypes.InList(s))
+            chAttr = SCE_MSSQL_DATATYPE;
+		else if (kwOperators.InList(s))
+			chAttr = SCE_MSSQL_OPERATOR;
+		else if (kwStatements.InList(s))
+			chAttr = SCE_MSSQL_STATEMENT;
+		else if (kwSystemTables.InList(s))
+			chAttr = SCE_MSSQL_SYSTABLE;
+		else if (kwFunctions.InList(s))
+            chAttr = SCE_MSSQL_FUNCTION;
+		else if (kwStoredProcedures.InList(s))
+			chAttr = SCE_MSSQL_STORED_PROCEDURE;
+
+	} else {
+		if (kwOperators.InList(s))
+			chAttr = SCE_MSSQL_OPERATOR;
+		else if (kwStatements.InList(s))
+			chAttr = SCE_MSSQL_STATEMENT;
+		else if (kwSystemTables.InList(s))
+			chAttr = SCE_MSSQL_SYSTABLE;
+		else if (kwFunctions.InList(s))
+			chAttr = SCE_MSSQL_FUNCTION;
+		else if (kwStoredProcedures.InList(s))
+			chAttr = SCE_MSSQL_STORED_PROCEDURE;
+		else if (kwDataTypes.InList(s))
+			chAttr = SCE_MSSQL_DATATYPE;
+	}
+
+	styler.ColourTo(end, chAttr);
+
+	return chAttr;
+}
+
+static void ColouriseMSSQLDoc(Sci_PositionU startPos, Sci_Position length,
+                              int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+
+	styler.StartAt(startPos);
+
+	bool fold = styler.GetPropertyInt("fold") != 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int spaceFlags = 0;
+
+	int state = initStyle;
+	int prevState = initStyle;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	styler.StartSegment(startPos);
+	Sci_PositionU lengthDoc = startPos + length;
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags);
+			int lev = indentCurrent;
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags);
+				if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				}
+			}
+			if (fold) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+		}
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		// When the last char isn't part of the state (have to deal with it too)...
+		if ( (state == SCE_MSSQL_IDENTIFIER) ||
+                    (state == SCE_MSSQL_STORED_PROCEDURE) ||
+                    (state == SCE_MSSQL_DATATYPE) ||
+                    //~ (state == SCE_MSSQL_COLUMN_NAME) ||
+                    (state == SCE_MSSQL_FUNCTION) ||
+                    //~ (state == SCE_MSSQL_GLOBAL_VARIABLE) ||
+                    (state == SCE_MSSQL_VARIABLE)) {
+			if (!iswordchar(ch)) {
+				int stateTmp;
+
+                if ((state == SCE_MSSQL_VARIABLE) || (state == SCE_MSSQL_COLUMN_NAME)) {
+                    styler.ColourTo(i - 1, state);
+					stateTmp = state;
+                } else
+                    stateTmp = classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
+
+				prevState = state;
+
+				if (stateTmp == SCE_MSSQL_IDENTIFIER || stateTmp == SCE_MSSQL_VARIABLE)
+					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+				else
+					state = SCE_MSSQL_DEFAULT;
+			}
+		} else if (state == SCE_MSSQL_LINE_COMMENT) {
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			}
+		} else if (state == SCE_MSSQL_GLOBAL_VARIABLE) {
+			if ((ch != '@') && !iswordchar(ch)) {
+				classifyWordSQL(styler.GetStartSegment(), i - 1, keywordlists, styler, state, prevState);
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			}
+		}
+
+		// If is the default or one of the above succeeded
+		if (state == SCE_MSSQL_DEFAULT || state == SCE_MSSQL_DEFAULT_PREF_DATATYPE) {
+			if (iswordstart(ch)) {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_IDENTIFIER;
+			} else if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COMMENT;
+			} else if (ch == '-' && chNext == '-') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_LINE_COMMENT;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_STRING;
+			} else if (ch == '"') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COLUMN_NAME;
+			} else if (ch == '[') {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+				state = SCE_MSSQL_COLUMN_NAME_2;
+			} else if (isoperator(ch)) {
+				styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				styler.ColourTo(i, SCE_MSSQL_OPERATOR);
+                //~ style = SCE_MSSQL_DEFAULT;
+				prevState = state;
+				state = SCE_MSSQL_DEFAULT;
+			} else if (ch == '@') {
+                styler.ColourTo(i - 1, SCE_MSSQL_DEFAULT);
+				prevState = state;
+                if (chNext == '@') {
+                    state = SCE_MSSQL_GLOBAL_VARIABLE;
+//                    i += 2;
+                } else
+                    state = SCE_MSSQL_VARIABLE;
+            }
+
+
+		// When the last char is part of the state...
+		} else if (state == SCE_MSSQL_COMMENT) {
+				if (ch == '/' && chPrev == '*') {
+					if (((i > (styler.GetStartSegment() + 2)) || ((initStyle == SCE_MSSQL_COMMENT) &&
+					    (styler.GetStartSegment() == startPos)))) {
+						styler.ColourTo(i, state);
+						//~ state = SCE_MSSQL_COMMENT;
+					prevState = state;
+                        state = SCE_MSSQL_DEFAULT;
+					}
+				}
+			} else if (state == SCE_MSSQL_STRING) {
+				if (ch == '\'') {
+					if ( chNext == '\'' ) {
+						i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+					} else {
+						styler.ColourTo(i, state);
+					prevState = state;
+						state = SCE_MSSQL_DEFAULT;
+					//i++;
+					}
+				//ch = chNext;
+				//chNext = styler.SafeGetCharAt(i + 1);
+				}
+			} else if (state == SCE_MSSQL_COLUMN_NAME) {
+				if (ch == '"') {
+					if (chNext == '"') {
+						i++;
+					ch = chNext;
+					chNext = styler.SafeGetCharAt(i + 1);
+				} else {
+                    styler.ColourTo(i, state);
+					prevState = state;
+					state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+					//i++;
+                }
+                }
+		} else if (state == SCE_MSSQL_COLUMN_NAME_2) {
+			if (ch == ']') {
+                styler.ColourTo(i, state);
+				prevState = state;
+                state = SCE_MSSQL_DEFAULT_PREF_DATATYPE;
+                //i++;
+			}
+		}
+
+		chPrev = ch;
+	}
+	styler.ColourTo(lengthDoc - 1, state);
+}
+
+static void FoldMSSQLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	bool inComment = (styler.StyleAt(startPos-1) == SCE_MSSQL_COMMENT);
+    char s[10] = "";
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        // Comment folding
+		if (foldComment) {
+			if (!inComment && (style == SCE_MSSQL_COMMENT))
+				levelCurrent++;
+			else if (inComment && (style != SCE_MSSQL_COMMENT))
+				levelCurrent--;
+			inComment = (style == SCE_MSSQL_COMMENT);
+		}
+        if (style == SCE_MSSQL_STATEMENT) {
+            // Folding between begin or case and end
+            if (ch == 'b' || ch == 'B' || ch == 'c' || ch == 'C' || ch == 'e' || ch == 'E') {
+                for (Sci_PositionU j = 0; j < 5; j++) {
+					if (!iswordchar(styler[i + j])) {
+						break;
+					}
+					s[j] = static_cast<char>(tolower(styler[i + j]));
+					s[j + 1] = '\0';
+                }
+				if ((strcmp(s, "begin") == 0) || (strcmp(s, "case") == 0)) {
+					levelCurrent++;
+				}
+				if (strcmp(s, "end") == 0) {
+					levelCurrent--;
+				}
+            }
+        }
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const sqlWordListDesc[] = {
+	"Statements",
+    "Data Types",
+    "System tables",
+    "Global variables",
+    "Functions",
+    "System Stored Procedures",
+    "Operators",
+	0,
+};
+
+LexerModule lmMSSQL(SCLEX_MSSQL, ColouriseMSSQLDoc, "mssql", FoldMSSQLDoc, sqlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexMagik.cxx b/scite-app/lexilla/lexers/LexMagik.cxx
new file mode 100644
index 0000000..ca2aba3
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMagik.cxx
@@ -0,0 +1,449 @@
+// Scintilla source code edit control
+/**
+ * @file LexMagik.cxx
+ * Lexer for GE(r) Smallworld(tm) MagikSF
+ */
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+/**
+ * Is it a core character (C isalpha(), exclamation and question mark)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlphaCore(int ch) {
+    return (isalpha(ch) || ch == '!' || ch == '?');
+}
+
+/**
+ * Is it a character (IsAlphaCore() and underscore)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlpha(int ch) {
+    return (IsAlphaCore(ch) || ch == '_');
+}
+
+/**
+ * Is it a symbolic character (IsAlpha() and colon)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlphaSym(int ch) {
+    return (IsAlpha(ch) || ch == ':');
+}
+
+/**
+ * Is it a numerical character (IsAlpha() and 0 - 9)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlNum(int ch) {
+    return ((ch >= '0' && ch <= '9') || IsAlpha(ch));
+}
+
+/**
+ * Is it a symbolic numerical character (IsAlNum() and colon)
+ *
+ * \param  ch The character
+ * \return True if ch is a character, False otherwise
+ */
+static inline bool IsAlNumSym(int ch) {
+    return (IsAlNum(ch) || ch == ':');
+}
+
+/**
+ * The lexer function
+ *
+ * \param  startPos Where to start scanning
+ * \param  length Where to scan to
+ * \param  initStyle The style at the initial point, not used in this folder
+ * \param  keywordlists The keywordslists, currently, number 5 is used
+ * \param  styler The styler
+ */
+static void ColouriseMagikDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+    styler.StartAt(startPos);
+
+    WordList &keywords = *keywordlists[0];
+    WordList &pragmatics = *keywordlists[1];
+    WordList &containers = *keywordlists[2];
+    WordList &flow = *keywordlists[3];
+    WordList &characters = *keywordlists[4];
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+
+	for (; sc.More(); sc.Forward()) {
+
+    repeat:
+
+        if(sc.ch == '#') {
+            if (sc.chNext == '#') sc.SetState(SCE_MAGIK_HYPER_COMMENT);
+            else sc.SetState(SCE_MAGIK_COMMENT);
+            for(; sc.More() && !(sc.atLineEnd); sc.Forward());
+            sc.SetState(SCE_MAGIK_DEFAULT);
+            goto repeat;
+        }
+
+        if(sc.ch == '"') {
+            sc.SetState(SCE_MAGIK_STRING);
+
+            if(sc.More())
+            {
+                sc.Forward();
+                for(; sc.More() && sc.ch != '"'; sc.Forward());
+            }
+
+            sc.ForwardSetState(SCE_MAGIK_DEFAULT);
+            goto repeat;
+        }
+
+	    // The default state
+	    if(sc.state == SCE_MAGIK_DEFAULT) {
+
+	        // A certain keyword has been detected
+	        if (sc.ch == '_' && (
+                    sc.currentPos == 0 || !IsAlNum(sc.chPrev))) {
+	            char keyword[50];
+	            memset(keyword, '\0', 50);
+
+	            for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+	                char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                static_cast<Sci_Position>(sc.currentPos+1), ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+	            }
+
+                // It is a pragma
+	            if(pragmatics.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_PRAGMA);
+	            }
+
+	            // it is a normal keyword like _local, _self, etc.
+	            else if(keywords.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_KEYWORD);
+	            }
+
+                // It is a container keyword, such as _method, _proc, etc.
+	            else if(containers.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_CONTAINER);
+	            }
+
+	            // It is a flow keyword, such as _for, _if, _try, etc.
+	            else if(flow.InList(keyword)) {
+	                sc.SetState(SCE_MAGIK_FLOW);
+	            }
+
+	            // Interpret as unknown keyword
+	            else {
+	                sc.SetState(SCE_MAGIK_UNKNOWN_KEYWORD);
+	            }
+	        }
+
+            // Symbolic expression
+	        else if(sc.ch == ':' && !IsAlNum(sc.chPrev)) {
+	            sc.SetState(SCE_MAGIK_SYMBOL);
+	            bool firstTrip = true;
+	            for(sc.Forward(); sc.More(); sc.Forward()) {
+	                if(firstTrip && IsAlphaSym(sc.ch));
+	                else if(!firstTrip && IsAlNumSym(sc.ch));
+	                else if(sc.ch == '|') {
+	                    for(sc.Forward();
+                            sc.More() && sc.ch != '|';
+                            sc.Forward());
+	                }
+	                else break;
+
+	                firstTrip = false;
+	            }
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+
+            // Identifier (label) expression
+	        else if(sc.ch == '@') {
+	            sc.SetState(SCE_MAGIK_IDENTIFIER);
+	            bool firstTrip = true;
+	            for(sc.Forward(); sc.More(); sc.Forward()) {
+	                if(firstTrip && IsAlphaCore(sc.ch)) {
+	                    firstTrip = false;
+	                }
+	                else if(!firstTrip && IsAlpha(sc.ch));
+	                else break;
+	            }
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+
+	        // Start of a character
+            else if(sc.ch == '%') {
+                sc.SetState(SCE_MAGIK_CHARACTER);
+                sc.Forward();
+                char keyword[50];
+	            memset(keyword, '\0', 50);
+
+	            for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+	                char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                static_cast<int>(sc.currentPos), ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+	            }
+
+	            if(characters.InList(keyword)) {
+	                sc.Forward(static_cast<int>(strlen(keyword)));
+	            } else {
+	                sc.Forward();
+	            }
+
+                sc.SetState(SCE_MAGIK_DEFAULT);
+                goto repeat;
+            }
+
+            // Operators
+	        else if(
+                sc.ch == '>' ||
+                sc.ch == '<' ||
+                sc.ch == '.' ||
+                sc.ch == ',' ||
+                sc.ch == '+' ||
+                sc.ch == '-' ||
+                sc.ch == '/' ||
+                sc.ch == '*' ||
+                sc.ch == '~' ||
+                sc.ch == '$' ||
+                sc.ch == '=') {
+                sc.SetState(SCE_MAGIK_OPERATOR);
+            }
+
+            // Braces
+            else if(sc.ch == '(' || sc.ch == ')') {
+                sc.SetState(SCE_MAGIK_BRACE_BLOCK);
+            }
+
+            // Brackets
+            else if(sc.ch == '{' || sc.ch == '}') {
+                sc.SetState(SCE_MAGIK_BRACKET_BLOCK);
+            }
+
+            // Square Brackets
+            else if(sc.ch == '[' || sc.ch == ']') {
+                sc.SetState(SCE_MAGIK_SQBRACKET_BLOCK);
+            }
+
+
+	    }
+
+	    // It is an operator
+	    else if(
+            sc.state == SCE_MAGIK_OPERATOR ||
+            sc.state == SCE_MAGIK_BRACE_BLOCK ||
+            sc.state == SCE_MAGIK_BRACKET_BLOCK ||
+            sc.state == SCE_MAGIK_SQBRACKET_BLOCK) {
+	        sc.SetState(SCE_MAGIK_DEFAULT);
+	        goto repeat;
+	    }
+
+	    // It is the pragma state
+	    else if(sc.state == SCE_MAGIK_PRAGMA) {
+	        if(!IsAlpha(sc.ch)) {
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+                goto repeat;
+	        }
+	    }
+
+	    // It is the keyword state
+	    else if(
+            sc.state == SCE_MAGIK_KEYWORD ||
+            sc.state == SCE_MAGIK_CONTAINER ||
+            sc.state == SCE_MAGIK_FLOW ||
+            sc.state == SCE_MAGIK_UNKNOWN_KEYWORD) {
+	        if(!IsAlpha(sc.ch)) {
+	            sc.SetState(SCE_MAGIK_DEFAULT);
+	            goto repeat;
+	        }
+	    }
+	}
+
+	sc.Complete();
+}
+
+/**
+ * The word list description
+ */
+static const char * const magikWordListDesc[] = {
+    "Accessors (local, global, self, super, thisthread)",
+    "Pragmatic (pragma, private)",
+    "Containers (method, block, proc)",
+    "Flow (if, then, elif, else)",
+    "Characters (space, tab, newline, return)",
+    "Fold Containers (method, proc, block, if, loop)",
+    0};
+
+/**
+ * This function detects keywords which are able to have a body. Note that it
+ * uses the Fold Containers word description, not the containers description. It
+ * only works when the style at that particular position is set on Containers
+ * or Flow (number 3 or 4).
+ *
+ * \param  keywordslist The list of keywords that are scanned, they should only
+ *         contain the start keywords, not the end keywords
+ * \param  keyword The actual keyword
+ * \return 1 if it is a folding start-keyword, -1 if it is a folding end-keyword
+ *         0 otherwise
+ */
+static inline int IsFoldingContainer(WordList &keywordslist, char * keyword) {
+    if(
+        strlen(keyword) > 3 &&
+        keyword[0] == 'e' && keyword[1] == 'n' && keyword[2] == 'd') {
+        if (keywordslist.InList(keyword + 3)) {
+            return -1;
+        }
+
+    } else {
+        if(keywordslist.InList(keyword)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * The folding function
+ *
+ * \param  startPos Where to start scanning
+ * \param  length Where to scan to
+ * \param  keywordslists The keywordslists, currently, number 5 is used
+ * \param  styler The styler
+ */
+static void FoldMagikDoc(Sci_PositionU startPos, Sci_Position length, int,
+    WordList *keywordslists[], Accessor &styler) {
+
+    bool compact = styler.GetPropertyInt("fold.compact") != 0;
+
+    WordList &foldingElements = *keywordslists[5];
+    Sci_Position endPos = startPos + length;
+    Sci_Position line = styler.GetLine(startPos);
+    int level = styler.LevelAt(line) & SC_FOLDLEVELNUMBERMASK;
+    int flags = styler.LevelAt(line) & ~SC_FOLDLEVELNUMBERMASK;
+
+    for(
+        Sci_Position currentPos = startPos;
+        currentPos < endPos;
+        currentPos++) {
+            char currentState = styler.StyleAt(currentPos);
+            char c = styler.SafeGetCharAt(currentPos, ' ');
+            Sci_Position prevLine = styler.GetLine(currentPos - 1);
+            line = styler.GetLine(currentPos);
+
+            // Default situation
+            if(prevLine < line) {
+                styler.SetLevel(line, (level|flags) & ~SC_FOLDLEVELHEADERFLAG);
+                flags = styler.LevelAt(line) & ~SC_FOLDLEVELNUMBERMASK;
+            }
+
+            if(
+                (
+                    currentState == SCE_MAGIK_CONTAINER ||
+                    currentState == SCE_MAGIK_FLOW
+                ) &&
+                c == '_') {
+
+                char keyword[50];
+                memset(keyword, '\0', 50);
+
+                for(
+                    int scanPosition = 0;
+                    scanPosition < 50;
+                    scanPosition++) {
+                    char keywordChar = static_cast<char>(
+                        tolower(styler.SafeGetCharAt(
+                            scanPosition +
+                                currentPos + 1, ' ')));
+                    if(IsAlpha(keywordChar)) {
+                        keyword[scanPosition] = keywordChar;
+                    } else {
+                        break;
+                    }
+                }
+
+                if(IsFoldingContainer(foldingElements, keyword) > 0) {
+                    styler.SetLevel(
+                        line,
+                        styler.LevelAt(line) | SC_FOLDLEVELHEADERFLAG);
+                    level++;
+                } else if(IsFoldingContainer(foldingElements, keyword) < 0) {
+                    styler.SetLevel(line, styler.LevelAt(line));
+                    level--;
+                }
+            }
+
+            if(
+                compact && (
+                    currentState == SCE_MAGIK_BRACE_BLOCK ||
+                    currentState == SCE_MAGIK_BRACKET_BLOCK ||
+                    currentState == SCE_MAGIK_SQBRACKET_BLOCK)) {
+                if(c == '{' || c == '[' || c == '(') {
+                    styler.SetLevel(
+                        line,
+                        styler.LevelAt(line) | SC_FOLDLEVELHEADERFLAG);
+                    level++;
+                } else if(c == '}' || c == ']' || c == ')') {
+                    styler.SetLevel(line, styler.LevelAt(line));
+                    level--;
+                }
+            }
+        }
+
+}
+
+/**
+ * Injecting the module
+ */
+LexerModule lmMagikSF(
+    SCLEX_MAGIK, ColouriseMagikDoc, "magiksf", FoldMagikDoc, magikWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexMake.cxx b/scite-app/lexilla/lexers/LexMake.cxx
new file mode 100644
index 0000000..3e84512
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMake.cxx
@@ -0,0 +1,145 @@
+// Scintilla source code edit control
+/** @file LexMake.cxx
+ ** Lexer for make files.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') ||
+	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+static void ColouriseMakeLine(
+    char *lineBuffer,
+    Sci_PositionU lengthLine,
+    Sci_PositionU startLine,
+    Sci_PositionU endPos,
+    Accessor &styler) {
+
+	Sci_PositionU i = 0;
+	Sci_Position lastNonSpace = -1;
+	unsigned int state = SCE_MAKE_DEFAULT;
+	bool bSpecial = false;
+
+	// check for a tab character in column 0 indicating a command
+	bool bCommand = false;
+	if ((lengthLine > 0) && (lineBuffer[0] == '\t'))
+		bCommand = true;
+
+	// Skip initial spaces
+	while ((i < lengthLine) && isspacechar(lineBuffer[i])) {
+		i++;
+	}
+	if (i < lengthLine) {
+		if (lineBuffer[i] == '#') {	// Comment
+			styler.ColourTo(endPos, SCE_MAKE_COMMENT);
+			return;
+		}
+		if (lineBuffer[i] == '!') {	// Special directive
+			styler.ColourTo(endPos, SCE_MAKE_PREPROCESSOR);
+			return;
+		}
+	}
+	int varCount = 0;
+	while (i < lengthLine) {
+		if (((i + 1) < lengthLine) && (lineBuffer[i] == '$' && lineBuffer[i + 1] == '(')) {
+			styler.ColourTo(startLine + i - 1, state);
+			state = SCE_MAKE_IDENTIFIER;
+			varCount++;
+		} else if (state == SCE_MAKE_IDENTIFIER && lineBuffer[i] == ')') {
+			if (--varCount == 0) {
+				styler.ColourTo(startLine + i, state);
+				state = SCE_MAKE_DEFAULT;
+			}
+		}
+
+		// skip identifier and target styling if this is a command line
+		if (!bSpecial && !bCommand) {
+			if (lineBuffer[i] == ':') {
+				if (((i + 1) < lengthLine) && (lineBuffer[i + 1] == '=')) {
+					// it's a ':=', so style as an identifier
+					if (lastNonSpace >= 0)
+						styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_IDENTIFIER);
+					styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+					styler.ColourTo(startLine + i + 1, SCE_MAKE_OPERATOR);
+				} else {
+					// We should check that no colouring was made since the beginning of the line,
+					// to avoid colouring stuff like /OUT:file
+					if (lastNonSpace >= 0)
+						styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_TARGET);
+					styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+					styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
+				}
+				bSpecial = true;	// Only react to the first ':' of the line
+				state = SCE_MAKE_DEFAULT;
+			} else if (lineBuffer[i] == '=') {
+				if (lastNonSpace >= 0)
+					styler.ColourTo(startLine + lastNonSpace, SCE_MAKE_IDENTIFIER);
+				styler.ColourTo(startLine + i - 1, SCE_MAKE_DEFAULT);
+				styler.ColourTo(startLine + i, SCE_MAKE_OPERATOR);
+				bSpecial = true;	// Only react to the first '=' of the line
+				state = SCE_MAKE_DEFAULT;
+			}
+		}
+		if (!isspacechar(lineBuffer[i])) {
+			lastNonSpace = i;
+		}
+		i++;
+	}
+	if (state == SCE_MAKE_IDENTIFIER) {
+		styler.ColourTo(endPos, SCE_MAKE_IDEOL);	// Error, variable reference not ended
+	} else {
+		styler.ColourTo(endPos, SCE_MAKE_DEFAULT);
+	}
+}
+
+static void ColouriseMakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	char lineBuffer[1024];
+	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)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseMakeLine(lineBuffer, linePos, startLine, i, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		ColouriseMakeLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
+	}
+}
+
+static const char *const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", 0, emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexMarkdown.cxx b/scite-app/lexilla/lexers/LexMarkdown.cxx
new file mode 100644
index 0000000..7e0c567
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMarkdown.cxx
@@ -0,0 +1,440 @@
+/******************************************************************
+ *  LexMarkdown.cxx
+ *
+ *  A simple Markdown lexer for scintilla.
+ *
+ *  Includes highlighting for some extra features from the
+ *  Pandoc implementation; strikeout, using '#.' as a default
+ *  ordered list item marker, and delimited code blocks.
+ *
+ *  Limitations:
+ *
+ *  Standard indented code blocks are not highlighted at all,
+ *  as it would conflict with other indentation schemes. Use
+ *  delimited code blocks for blanket highlighting of an
+ *  entire code block.  Embedded HTML is not highlighted either.
+ *  Blanket HTML highlighting has issues, because some Markdown
+ *  implementations allow Markdown markup inside of the HTML. Also,
+ *  there is a following blank line issue that can't be ignored,
+ *  explained in the next paragraph. Embedded HTML and code
+ *  blocks would be better supported with language specific
+ *  highlighting.
+ *
+ *  The highlighting aims to accurately reflect correct syntax,
+ *  but a few restrictions are relaxed. Delimited code blocks are
+ *  highlighted, even if the line following the code block is not blank.
+ *  Requiring a blank line after a block, breaks the highlighting
+ *  in certain cases, because of the way Scintilla ends up calling
+ *  the lexer.
+ *
+ *  Written by Jon Strait - jstrait@moonloop.net
+ *
+ *  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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsNewline(const int ch) {
+    return (ch == '\n' || ch == '\r');
+}
+
+// True if can follow ch down to the end with possibly trailing whitespace
+static bool FollowToLineEnd(const int ch, const int state, const Sci_PositionU endPos, StyleContext &sc) {
+    Sci_Position i = 0;
+    while (sc.GetRelative(++i) == ch)
+        ;
+    // Skip over whitespace
+    while (IsASpaceOrTab(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+        ++i;
+    if (IsNewline(sc.GetRelative(i)) || sc.currentPos + i == endPos) {
+        sc.Forward(i);
+        sc.ChangeState(state);
+        sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+        return true;
+    }
+    else return false;
+}
+
+// Set the state on text section from current to length characters,
+// then set the rest until the newline to default, except for any characters matching token
+static void SetStateAndZoom(const int state, const Sci_Position length, const int token, StyleContext &sc) {
+    sc.SetState(state);
+    sc.Forward(length);
+    sc.SetState(SCE_MARKDOWN_DEFAULT);
+    sc.Forward();
+    bool started = false;
+    while (sc.More() && !IsNewline(sc.ch)) {
+        if (sc.ch == token && !started) {
+            sc.SetState(state);
+            started = true;
+        }
+        else if (sc.ch != token) {
+            sc.SetState(SCE_MARKDOWN_DEFAULT);
+            started = false;
+        }
+        sc.Forward();
+    }
+    sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+}
+
+// Does the previous line have more than spaces and tabs?
+static bool HasPrevLineContent(StyleContext &sc) {
+    Sci_Position i = 0;
+    // Go back to the previous newline
+    while ((--i + (Sci_Position)sc.currentPos) >= 0 && !IsNewline(sc.GetRelative(i)))
+        ;
+    while ((--i + (Sci_Position)sc.currentPos) >= 0) {
+        const int ch = sc.GetRelative(i);
+        if (ch == '\n')
+            break;
+        if (!((ch == '\r' || IsASpaceOrTab(ch))))
+            return true;
+    }
+    return false;
+}
+
+static bool AtTermStart(StyleContext &sc) {
+    return sc.currentPos == 0 || sc.chPrev == 0 || isspacechar(sc.chPrev);
+}
+
+static bool IsCompleteStyleRegion(StyleContext &sc, const char *token) {
+    bool found = false;
+	const size_t start = strlen(token);
+    Sci_Position i = static_cast<Sci_Position>(start);
+    while (!IsNewline(sc.GetRelative(i))) {
+        // make sure an empty pair of single-char tokens doesn't match
+        // with a longer token: {*}{*} != {**}
+	    if (sc.GetRelative(i) == *token && sc.GetRelative(i - 1) != *token) {
+		    found = start > 1U ? sc.GetRelative(i + 1) == token[1] : true;
+			break;
+		}
+        i++;
+    }
+    return AtTermStart(sc) && found;
+}
+
+static bool IsValidHrule(const Sci_PositionU endPos, StyleContext &sc) {
+    int count = 1;
+    Sci_Position i = 0;
+    for (;;) {
+        ++i;
+        int c = sc.GetRelative(i);
+        if (c == sc.ch)
+            ++count;
+        // hit a terminating character
+        else if (!IsASpaceOrTab(c) || sc.currentPos + i == endPos) {
+            // Are we a valid HRULE
+            if ((IsNewline(c) || sc.currentPos + i == endPos) &&
+                    count >= 3 && !HasPrevLineContent(sc)) {
+                sc.SetState(SCE_MARKDOWN_HRULE);
+                sc.Forward(i);
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                return true;
+            }
+            else {
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+		return false;
+            }
+        }
+    }
+}
+
+static void ColorizeMarkdownDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                               WordList **, Accessor &styler) {
+    Sci_PositionU endPos = startPos + length;
+    int precharCount = 0;
+    bool isLinkNameDetecting = false;
+    // Don't advance on a new loop iteration and retry at the same position.
+    // Useful in the corner case of having to start at the beginning file position
+    // in the default state.
+    bool freezeCursor = false;
+
+    StyleContext sc(startPos, static_cast<Sci_PositionU>(length), initStyle, styler);
+
+    while (sc.More()) {
+        // Skip past escaped characters
+        if (sc.ch == '\\') {
+            sc.Forward();
+            continue;
+        }
+
+        // A blockquotes resets the line semantics
+        if (sc.state == SCE_MARKDOWN_BLOCKQUOTE)
+            sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+
+        // Conditional state-based actions
+        if (sc.state == SCE_MARKDOWN_CODE2) {
+            if (sc.Match("``")) {
+                const int closingSpan = (sc.GetRelative(2) == '`') ? 3 : 2;
+                sc.Forward(closingSpan);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_CODE) {
+            if (sc.ch == '`' && sc.chPrev != ' ')
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        /* De-activated because it gets in the way of other valid indentation
+         * schemes, for example multiple paragraphs inside a list item.
+        // Code block
+        else if (sc.state == SCE_MARKDOWN_CODEBK) {
+            bool d = true;
+            if (IsNewline(sc.ch)) {
+                if (sc.chNext != '\t') {
+                    for (int c = 1; c < 5; ++c) {
+                        if (sc.GetRelative(c) != ' ')
+                            d = false;
+                    }
+                }
+            }
+            else if (sc.atLineStart) {
+                if (sc.ch != '\t' ) {
+                    for (int i = 0; i < 4; ++i) {
+                        if (sc.GetRelative(i) != ' ')
+                            d = false;
+                    }
+                }
+            }
+            if (!d)
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+        }
+        */
+        // Strong
+        else if (sc.state == SCE_MARKDOWN_STRONG1) {
+            if ((sc.Match("**") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_STRONG2) {
+            if ((sc.Match("__") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        // Emphasis
+        else if (sc.state == SCE_MARKDOWN_EM1) {
+            if ((sc.ch == '*' && sc.chPrev != ' ') || IsNewline(sc.chNext))
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        else if (sc.state == SCE_MARKDOWN_EM2) {
+            if ((sc.ch == '_' && sc.chPrev != ' ') || IsNewline(sc.chNext))
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+        }
+        else if (sc.state == SCE_MARKDOWN_CODEBK) {
+            if (sc.atLineStart && sc.Match("~~~")) {
+                Sci_Position i = 1;
+                while (!IsNewline(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+                    i++;
+                sc.Forward(i);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_STRIKEOUT) {
+            if ((sc.Match("~~") && sc.chPrev != ' ') || IsNewline(sc.GetRelative(2))) {
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_MARKDOWN_LINE_BEGIN) {
+            // Header
+            if (sc.Match("######"))
+                SetStateAndZoom(SCE_MARKDOWN_HEADER6, 6, '#', sc);
+            else if (sc.Match("#####"))
+                SetStateAndZoom(SCE_MARKDOWN_HEADER5, 5, '#', sc);
+            else if (sc.Match("####"))
+                SetStateAndZoom(SCE_MARKDOWN_HEADER4, 4, '#', sc);
+            else if (sc.Match("###"))
+                SetStateAndZoom(SCE_MARKDOWN_HEADER3, 3, '#', sc);
+            else if (sc.Match("##"))
+                SetStateAndZoom(SCE_MARKDOWN_HEADER2, 2, '#', sc);
+            else if (sc.Match("#")) {
+                // Catch the special case of an unordered list
+                if (sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
+                    precharCount = 0;
+                    sc.SetState(SCE_MARKDOWN_PRECHAR);
+                }
+                else
+                    SetStateAndZoom(SCE_MARKDOWN_HEADER1, 1, '#', sc);
+            }
+            // Code block
+            else if (sc.Match("~~~")) {
+                if (!HasPrevLineContent(sc))
+                    sc.SetState(SCE_MARKDOWN_CODEBK);
+                else
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch == '=') {
+                if (HasPrevLineContent(sc) && FollowToLineEnd('=', SCE_MARKDOWN_HEADER1, endPos, sc))
+                    ;
+                else
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch == '-') {
+                if (HasPrevLineContent(sc) && FollowToLineEnd('-', SCE_MARKDOWN_HEADER2, endPos, sc))
+                    ;
+                else {
+                    precharCount = 0;
+                    sc.SetState(SCE_MARKDOWN_PRECHAR);
+                }
+            }
+            else if (IsNewline(sc.ch))
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+            else {
+                precharCount = 0;
+                sc.SetState(SCE_MARKDOWN_PRECHAR);
+            }
+        }
+
+        // The header lasts until the newline
+        else if (sc.state == SCE_MARKDOWN_HEADER1 || sc.state == SCE_MARKDOWN_HEADER2 ||
+                sc.state == SCE_MARKDOWN_HEADER3 || sc.state == SCE_MARKDOWN_HEADER4 ||
+                sc.state == SCE_MARKDOWN_HEADER5 || sc.state == SCE_MARKDOWN_HEADER6) {
+            if (IsNewline(sc.ch))
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+        }
+
+        // New state only within the initial whitespace
+        if (sc.state == SCE_MARKDOWN_PRECHAR) {
+            // Blockquote
+            if (sc.ch == '>' && precharCount < 5)
+                sc.SetState(SCE_MARKDOWN_BLOCKQUOTE);
+            /*
+            // Begin of code block
+            else if (!HasPrevLineContent(sc) && (sc.chPrev == '\t' || precharCount >= 4))
+                sc.SetState(SCE_MARKDOWN_CODEBK);
+            */
+            // HRule - Total of three or more hyphens, asterisks, or underscores
+            // on a line by themselves
+            else if ((sc.ch == '-' || sc.ch == '*' || sc.ch == '_') && IsValidHrule(endPos, sc))
+                ;
+            // Unordered list
+            else if ((sc.ch == '-' || sc.ch == '*' || sc.ch == '+') && IsASpaceOrTab(sc.chNext)) {
+                sc.SetState(SCE_MARKDOWN_ULIST_ITEM);
+                sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
+            }
+            // Ordered list
+            else if (IsADigit(sc.ch)) {
+                int digitCount = 0;
+                while (IsADigit(sc.GetRelative(++digitCount)))
+                    ;
+                if (sc.GetRelative(digitCount) == '.' &&
+                        IsASpaceOrTab(sc.GetRelative(digitCount + 1))) {
+                    sc.SetState(SCE_MARKDOWN_OLIST_ITEM);
+                    sc.Forward(digitCount + 1);
+                    sc.SetState(SCE_MARKDOWN_DEFAULT);
+                }
+            }
+            // Alternate Ordered list
+            else if (sc.ch == '#' && sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
+                sc.SetState(SCE_MARKDOWN_OLIST_ITEM);
+                sc.Forward(2);
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (sc.ch != ' ' || precharCount > 2)
+                sc.SetState(SCE_MARKDOWN_DEFAULT);
+            else
+                ++precharCount;
+        }
+
+        // Any link
+        if (sc.state == SCE_MARKDOWN_LINK) {
+            if (sc.Match("](") && sc.GetRelative(-1) != '\\') {
+              sc.Forward(2);
+              isLinkNameDetecting = true;
+            }
+            else if (sc.Match("]:") && sc.GetRelative(-1) != '\\') {
+              sc.Forward(2);
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (!isLinkNameDetecting && sc.ch == ']' && sc.GetRelative(-1) != '\\') {
+              sc.Forward();
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (isLinkNameDetecting && sc.ch == ')' && sc.GetRelative(-1) != '\\') {
+              sc.Forward();
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+              isLinkNameDetecting = false;
+            }
+        }
+
+        // New state anywhere in doc
+        if (sc.state == SCE_MARKDOWN_DEFAULT) {
+            if (sc.atLineStart && sc.ch == '#') {
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+                freezeCursor = true;
+            }
+            // Links and Images
+            if (sc.Match("![")) {
+              sc.SetState(SCE_MARKDOWN_LINK);
+              sc.Forward(1);
+            }
+            else if (sc.ch == '[' && sc.GetRelative(-1) != '\\') {
+              sc.SetState(SCE_MARKDOWN_LINK);
+            }
+            // Code - also a special case for alternate inside spacing
+            else if (sc.Match("``") && sc.GetRelative(3) != ' ' && AtTermStart(sc)) {
+                const int openingSpan = (sc.GetRelative(2) == '`') ? 2 : 1;
+                sc.SetState(SCE_MARKDOWN_CODE2);
+                sc.Forward(openingSpan);
+            }
+            else if (sc.ch == '`' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "`")) {
+                sc.SetState(SCE_MARKDOWN_CODE);
+            }
+            // Strong
+            else if (sc.Match("**") && sc.GetRelative(2) != ' ' && IsCompleteStyleRegion(sc, "**")) {
+                sc.SetState(SCE_MARKDOWN_STRONG1);
+                sc.Forward();
+           }
+            else if (sc.Match("__") && sc.GetRelative(2) != ' ' && IsCompleteStyleRegion(sc, "__")) {
+                sc.SetState(SCE_MARKDOWN_STRONG2);
+                sc.Forward();
+            }
+            // Emphasis
+            else if (sc.ch == '*' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "*")) {
+                sc.SetState(SCE_MARKDOWN_EM1);
+            } else if (sc.ch == '_' && sc.chNext != ' ' && IsCompleteStyleRegion(sc, "_")) {
+                sc.SetState(SCE_MARKDOWN_EM2);
+            }
+            // Strikeout
+            else if (sc.Match("~~") && !(sc.GetRelative(2) == '~' || sc.GetRelative(2) == ' ') &&
+                IsCompleteStyleRegion(sc, "~~")) {
+                sc.SetState(SCE_MARKDOWN_STRIKEOUT);
+                sc.Forward();
+            }
+            // Beginning of line
+            else if (IsNewline(sc.ch)) {
+                sc.SetState(SCE_MARKDOWN_LINE_BEGIN);
+            }
+        }
+        // Advance if not holding back the cursor for this iteration.
+        if (!freezeCursor)
+            sc.Forward();
+        freezeCursor = false;
+    }
+    sc.Complete();
+}
+
+LexerModule lmMarkdown(SCLEX_MARKDOWN, ColorizeMarkdownDoc, "markdown");
diff --git a/scite-app/lexilla/lexers/LexMatlab.cxx b/scite-app/lexilla/lexers/LexMatlab.cxx
new file mode 100644
index 0000000..e9b2409
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMatlab.cxx
@@ -0,0 +1,392 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file LexMatlab.cxx
+ ** Lexer for Matlab.
+ ** Written by José Fonseca
+ **
+ ** Changes by Christoph Dalitz 2003/12/04:
+ **   - added support for Octave
+ **   - Strings can now be included both in single or double quotes
+ **
+ ** Changes by John Donoghue 2012/04/02
+ **   - added block comment (and nested block comments)
+ **   - added ... displayed as a comment
+ **   - removed unused IsAWord functions
+ **   - added some comments
+ **
+ ** Changes by John Donoghue 2014/08/01
+ **   - fix allowed transpose ' after {} operator
+ **
+ ** Changes by John Donoghue 2016/11/15
+ **   - update matlab code folding
+ **
+ ** Changes by John Donoghue 2017/01/18
+ **   - update matlab block comment detection
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static bool IsMatlabCommentChar(int c) {
+	return (c == '%') ;
+}
+
+static bool IsOctaveCommentChar(int c) {
+	return (c == '%' || c == '#') ;
+}
+
+static inline int LowerCase(int c) {
+	if (c >= 'A' && c <= 'Z')
+		return 'a' + c - 'A';
+	return c;
+}
+
+static int CheckKeywordFoldPoint(char *str) {
+	if (strcmp ("if", str) == 0 ||
+		strcmp ("for", str) == 0 ||
+		strcmp ("switch", str) == 0 ||
+		strcmp ("while", str) == 0 ||
+		strcmp ("try", str) == 0 ||
+		strcmp ("do", str) == 0 ||
+		strcmp ("parfor", str) == 0 ||
+		strcmp ("function", str) == 0)
+		return 1;
+	if (strncmp("end", str, 3) == 0 ||
+		strcmp("until", str) == 0)
+		return -1;
+	return 0;
+}
+
+static bool IsSpaceToEOL(Sci_Position startPos, Accessor &styler) {
+	Sci_Position line = styler.GetLine(startPos);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = startPos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if(!IsASpace(ch)) return false;
+	}
+	return true;
+}
+
+static void ColouriseMatlabOctaveDoc(
+            Sci_PositionU startPos, Sci_Position length, int initStyle,
+            WordList *keywordlists[], Accessor &styler,
+            bool (*IsCommentChar)(int),
+            bool ismatlab) {
+
+	WordList &keywords = *keywordlists[0];
+
+	styler.StartAt(startPos);
+
+	// boolean for when the ' is allowed to be transpose vs the start/end
+	// of a string
+	bool transpose = false;
+
+	// count of brackets as boolean for when end could be an operator not a keyword
+	int allow_end_op = 0;
+
+	// approximate position of first non space character in a line
+	int nonSpaceColumn = -1;
+	// approximate column position of the current character in a line
+	int column = 0;
+
+        // use the line state of each line to store the block comment depth
+	Sci_Position curLine = styler.GetLine(startPos);
+        int commentDepth = curLine > 0 ? styler.GetLineState(curLine-1) : 0;
+
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward(), column++) {
+
+               	if(sc.atLineStart) {
+			// set the line state to the current commentDepth
+			curLine = styler.GetLine(sc.currentPos);
+                        styler.SetLineState(curLine, commentDepth);
+
+			// reset the column to 0, nonSpace to -1 (not set)
+			column = 0;
+			nonSpaceColumn = -1;
+		}
+
+		// save the column position of first non space character in a line
+		if((nonSpaceColumn == -1) && (! IsASpace(sc.ch)))
+		{
+			nonSpaceColumn = column;
+		}
+
+		// check for end of states
+		if (sc.state == SCE_MATLAB_OPERATOR) {
+			if (sc.chPrev == '.') {
+				if (sc.ch == '*' || sc.ch == '/' || sc.ch == '\\' || sc.ch == '^') {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+					transpose = false;
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+					transpose = true;
+                                } else if(sc.ch == '.' && sc.chNext == '.') {
+                                        // we werent an operator, but a '...'
+                                        sc.ChangeState(SCE_MATLAB_COMMENT);
+                                        transpose = false;
+				} else {
+					sc.SetState(SCE_MATLAB_DEFAULT);
+				}
+			} else {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+			}
+		} else if (sc.state == SCE_MATLAB_KEYWORD) {
+			if (!isalnum(sc.ch) && sc.ch != '_') {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					if (strcmp ("end", s) == 0 && allow_end_op) {
+						sc.ChangeState(SCE_MATLAB_NUMBER);
+					}
+					sc.SetState(SCE_MATLAB_DEFAULT);
+					transpose = false;
+				} else {
+					sc.ChangeState(SCE_MATLAB_IDENTIFIER);
+					sc.SetState(SCE_MATLAB_DEFAULT);
+					transpose = true;
+				}
+			}
+		} else if (sc.state == SCE_MATLAB_NUMBER) {
+			if (!isdigit(sc.ch) && sc.ch != '.'
+			        && !(sc.ch == 'e' || sc.ch == 'E')
+			        && !((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E'))) {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+				transpose = true;
+			}
+		} else if (sc.state == SCE_MATLAB_STRING) {
+			if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+ 					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+ 				}
+			}
+		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
+			if (sc.ch == '\\' && !ismatlab) {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+			}
+		} else if (sc.state == SCE_MATLAB_COMMAND) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_MATLAB_DEFAULT);
+				transpose = false;
+			}
+		} else if (sc.state == SCE_MATLAB_COMMENT) {
+			// end or start of a nested a block comment?
+			if( IsCommentChar(sc.ch) && sc.chNext == '}' && nonSpaceColumn == column && IsSpaceToEOL(sc.currentPos+2, styler)) {
+                           	if(commentDepth > 0) commentDepth --;
+
+				curLine = styler.GetLine(sc.currentPos);
+				styler.SetLineState(curLine, commentDepth);
+				sc.Forward();
+
+				if (commentDepth == 0) {
+					sc.ForwardSetState(SCE_D_DEFAULT);
+					transpose = false;
+				}
+                        }
+                        else if( IsCommentChar(sc.ch) && sc.chNext == '{' && nonSpaceColumn == column && IsSpaceToEOL(sc.currentPos+2, styler))
+                        {
+ 				commentDepth ++;
+
+				curLine = styler.GetLine(sc.currentPos);
+				styler.SetLineState(curLine, commentDepth);
+				sc.Forward();
+				transpose = false;
+
+                        } else if(commentDepth == 0) {
+				// single line comment
+				if (sc.atLineEnd || sc.ch == '\r' || sc.ch == '\n') {
+					sc.SetState(SCE_MATLAB_DEFAULT);
+					transpose = false;
+				}
+			}
+		}
+
+		// check start of a new state
+		if (sc.state == SCE_MATLAB_DEFAULT) {
+			if (IsCommentChar(sc.ch)) {
+				// ncrement depth if we are a block comment
+				if(sc.chNext == '{' && nonSpaceColumn == column) {
+					if(IsSpaceToEOL(sc.currentPos+2, styler)) {
+						commentDepth ++;
+					}
+				}
+				curLine = styler.GetLine(sc.currentPos);
+				styler.SetLineState(curLine, commentDepth);
+				sc.SetState(SCE_MATLAB_COMMENT);
+			} else if (sc.ch == '!' && sc.chNext != '=' ) {
+				if(ismatlab) {
+					sc.SetState(SCE_MATLAB_COMMAND);
+				} else {
+					sc.SetState(SCE_MATLAB_OPERATOR);
+				}
+			} else if (sc.ch == '\'') {
+				if (transpose) {
+					sc.SetState(SCE_MATLAB_OPERATOR);
+				} else {
+					sc.SetState(SCE_MATLAB_STRING);
+				}
+			} else if (sc.ch == '"') {
+				sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING);
+			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
+				sc.SetState(SCE_MATLAB_NUMBER);
+			} else if (isalpha(sc.ch)) {
+				sc.SetState(SCE_MATLAB_KEYWORD);
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') {
+				if (sc.ch == '(' || sc.ch == '[' || sc.ch == '{') {
+					allow_end_op ++;
+				} else if ((sc.ch == ')' || sc.ch == ']' || sc.ch == '}') && (allow_end_op > 0)) {
+					allow_end_op --;
+				}
+
+				if (sc.ch == ')' || sc.ch == ']' || sc.ch == '}') {
+					transpose = true;
+				} else {
+					transpose = false;
+				}
+				sc.SetState(SCE_MATLAB_OPERATOR);
+			} else {
+				transpose = false;
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void ColouriseMatlabDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+	ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar, true);
+}
+
+static void ColouriseOctaveDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                               WordList *keywordlists[], Accessor &styler) {
+	ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar, false);
+}
+
+static void FoldMatlabOctaveDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                                WordList *[], Accessor &styler,
+                                bool (*IsComment)(int ch)) {
+
+	if (styler.GetPropertyInt("fold") == 0)
+		return;
+
+	const bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	char word[100];
+	int wordlen = 0;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		// a line that starts with a comment
+		if (foldComment && style == SCE_MATLAB_COMMENT && IsComment(ch) && visibleChars == 0) {
+			// start/end of block comment
+			if (chNext == '{' && IsSpaceToEOL(i+2, styler))
+				levelNext ++;
+			if (chNext == '}' && IsSpaceToEOL(i+2, styler))
+				levelNext --;
+		}
+		// keyword
+		if(style == SCE_MATLAB_KEYWORD) {
+			word[wordlen++] = static_cast<char>(LowerCase(ch));
+			if (wordlen == 100) {  // prevent overflow
+				word[0] = '\0';
+				wordlen = 1;
+			}
+			if (styleNext !=  SCE_MATLAB_KEYWORD) {
+				word[wordlen] = '\0';
+				wordlen = 0;
+
+				levelNext += CheckKeywordFoldPoint(word);
+ 			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length() - 1))) {
+				// There is an empty line at end of file so give it same level and empty
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+			visibleChars = 0;
+		}
+	}
+}
+
+static void FoldMatlabDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                          WordList *keywordlists[], Accessor &styler) {
+	FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar);
+}
+
+static void FoldOctaveDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                          WordList *keywordlists[], Accessor &styler) {
+	FoldMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar);
+}
+
+static const char * const matlabWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+static const char * const octaveWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmMatlab(SCLEX_MATLAB, ColouriseMatlabDoc, "matlab", FoldMatlabDoc, matlabWordListDesc);
+
+LexerModule lmOctave(SCLEX_OCTAVE, ColouriseOctaveDoc, "octave", FoldOctaveDoc, octaveWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexMaxima.cxx b/scite-app/lexilla/lexers/LexMaxima.cxx
new file mode 100644
index 0000000..75d1405
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMaxima.cxx
@@ -0,0 +1,225 @@
+// Scintilla source code edit control
+/** @file LexMaxima.cxx
+ ** Lexer for Maxima (http://maxima.sourceforge.net).
+ ** Written by Gunter Königsmann based on the lisp lexer by Alexey Yutkin and Neil Hodgson .
+ **/
+// Copyright 2018 by Gunter Königsmann <wxMaxima@physikbuch.de>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+using namespace Lexilla;
+
+static inline bool isMaximaoperator(char ch) {
+  return (ch == '\'' || ch == '`' || ch == '(' ||
+	  ch == ')'  || ch == '[' || ch == ']' ||
+	  ch == '{'  || ch == '}' || ch == '!' ||
+	  ch == '*'  || ch == '/' || ch == '^' ||
+	  ch == ','  || ch == ':' || ch == '+' ||
+	  ch == '-');
+}
+
+static void ColouriseMaximaDoc(Sci_PositionU startPos, Sci_Position length, int lastStyle,
+			       WordList *[],
+			       Accessor &styler) {
+
+  styler.StartAt(startPos);
+
+  Sci_PositionU lengthDoc = startPos + length;
+  styler.StartSegment(startPos);
+
+  Sci_PositionU i = startPos;
+
+  // If we are in the middle of a comment we go back to its start before highlighting
+  if(lastStyle == SCE_MAXIMA_COMMENT)
+    {
+      while((i>0) &&
+	    !((styler.SafeGetCharAt(i+1) == '*') && (styler.SafeGetCharAt(i) == '/')))
+	i--;
+    }
+
+  for (; i < lengthDoc; i++) {
+    char ch = styler.SafeGetCharAt(i);
+    char chNext = styler.SafeGetCharAt(i + 1);
+
+    if (styler.IsLeadByte(ch))
+      continue;
+
+    // Handle comments.
+    // Comments start with /* and end with */
+    if((ch == '/') && (chNext == '*'))
+      {
+	i++;i++;
+
+	chNext = styler.SafeGetCharAt(i);
+	for (; i < lengthDoc; i++)
+	  {
+	    ch = chNext;
+	    chNext = styler.SafeGetCharAt(i + 1);
+	    if((ch == '*') && (chNext == '/'))
+	      {
+		i++;
+		i++;
+		break;
+	      }
+	  }
+	if(i > lengthDoc)
+	  i = lengthDoc;
+	i--;
+	styler.ColourTo(i, SCE_MAXIMA_COMMENT);
+	continue;
+      }
+
+    // Handle Operators
+    if(isMaximaoperator(ch))
+      {
+	styler.ColourTo(i, SCE_MAXIMA_OPERATOR);
+	continue;
+      }
+
+    // Handle command endings.
+    if((ch == '$') || (ch == ';'))
+      {
+	styler.ColourTo(i, SCE_MAXIMA_COMMANDENDING);
+	continue;
+      }
+
+    // Handle numbers. Numbers always begin with a digit.
+    if(IsASCII(ch) && isdigit(ch))
+      {
+	i++;
+	for (; i < lengthDoc; i++)
+	  {
+	    ch = chNext;
+	    chNext = styler.SafeGetCharAt(i + 1);
+
+	    if(ch == '.')
+	      continue;
+
+	    // A "e" or similar can be followed by a "+" or a "-"
+	    if(((ch == 'e') || (ch == 'b') || (ch == 'g') || (ch == 'f')) &&
+	       ((chNext == '+') || (chNext == '-')))
+	      {
+		i++;
+		chNext = styler.SafeGetCharAt(i + 1);
+		continue;
+	      }
+
+	    if(!IsASCII(ch) || !(isdigit(ch) || islower(ch) || isupper(ch)))
+	      {
+		i--;
+		break;
+	      }
+	  }
+	styler.ColourTo(i, SCE_MAXIMA_NUMBER);
+	continue;
+      }
+
+    // Handle strings
+    if(ch == '\"')
+      {
+	i++;
+	for (; i < lengthDoc; i++)
+	  {
+	    ch = chNext;
+	    chNext = styler.SafeGetCharAt(i + 1);
+	    if(ch == '\\')
+	      i++;
+	    else
+	      {
+		if(ch == '\"')
+		  break;
+	      }
+	  }
+	styler.ColourTo(i, SCE_MAXIMA_STRING);
+	continue;
+      }
+
+    // Handle keywords. Maxima treats Non-ASCII chars as ordinary letters.
+    if(((!IsASCII(ch))) || isalpha(ch) || (ch == '_'))
+      {
+	char cmd[100];
+	int cmdidx = 0;
+	memset(cmd,0,100);
+	cmd[cmdidx++] = ch;
+	i++;
+	for (; i < lengthDoc; i++)
+	  {
+	    ch = chNext;
+	    chNext = styler.SafeGetCharAt(i + 1);
+	    if(ch == '\\')
+	      {
+		if(cmdidx < 99)
+		  cmd[cmdidx++] = ch;
+		i++;
+		if(cmdidx < 99)
+		  cmd[cmdidx++] = ch;
+		continue;
+	      }
+	    if(isMaximaoperator(ch) || ((IsASCII(ch) && !isalpha(ch) && !isdigit(ch) && (ch != '_'))))
+	      {
+		i--;
+		break;
+	      }
+	    if(cmdidx < 99)
+	      cmd[cmdidx++] = ch;
+	  }
+
+	// A few known keywords
+	if(
+	   (strncmp(cmd,"if",99) == 0) ||
+	   (strncmp(cmd,"then",99) == 0) ||
+	   (strncmp(cmd,"else",99) == 0) ||
+	   (strncmp(cmd,"thru",99) == 0) ||
+	   (strncmp(cmd,"for",99) == 0) ||
+	   (strncmp(cmd,"while",99) == 0) ||
+	   (strncmp(cmd,"do",99) == 0)
+	   )
+	  {
+	    styler.ColourTo(i, SCE_MAXIMA_COMMAND);
+	    continue;
+	  }
+
+	// All other keywords are functions if they are followed
+	// by an opening parenthesis
+	char nextNonwhitespace = ' ';
+	for (Sci_PositionU o = i + 1; o < lengthDoc; o++)
+	  {
+	    nextNonwhitespace = styler.SafeGetCharAt(o);
+	    if(!IsASCII(nextNonwhitespace) || !isspacechar(nextNonwhitespace))
+	      break;
+	  }
+	if(nextNonwhitespace == '(')
+	  {
+	    styler.ColourTo(i, SCE_MAXIMA_COMMAND);
+	  }
+	else
+	  {
+	    styler.ColourTo(i, SCE_MAXIMA_VARIABLE);
+	  }
+	continue;
+      }
+
+    styler.ColourTo(i-1, SCE_MAXIMA_UNKNOWN);
+  }
+}
+
+LexerModule lmMaxima(SCLEX_MAXIMA, ColouriseMaximaDoc, "maxima", 0, 0);
diff --git a/scite-app/lexilla/lexers/LexMetapost.cxx b/scite-app/lexilla/lexers/LexMetapost.cxx
new file mode 100644
index 0000000..9c21037
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMetapost.cxx
@@ -0,0 +1,404 @@
+// Scintilla source code edit control
+
+// @file LexMetapost.cxx - general context conformant metapost coloring scheme
+// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
+// Version: September 28, 2003
+// Modified by instanton: July 10, 2007
+// Folding based on keywordlists[]
+
+// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This lexer is derived from the one written for the texwork environment (1999++) which in
+// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// val SCE_METAPOST_DEFAULT = 0
+// val SCE_METAPOST_SPECIAL = 1
+// val SCE_METAPOST_GROUP = 2
+// val SCE_METAPOST_SYMBOL = 3
+// val SCE_METAPOST_COMMAND = 4
+// val SCE_METAPOST_TEXT = 5
+
+// Definitions in SciTEGlobal.properties:
+//
+// Metapost Highlighting
+//
+// # Default
+// style.metapost.0=fore:#7F7F00
+// # Special
+// style.metapost.1=fore:#007F7F
+// # Group
+// style.metapost.2=fore:#880000
+// # Symbol
+// style.metapost.3=fore:#7F7F00
+// # Command
+// style.metapost.4=fore:#008800
+// # Text
+// style.metapost.5=fore:#000000
+
+// lexer.tex.comment.process=0
+
+// Auxiliary functions:
+
+static inline bool endOfLine(Accessor &styler, Sci_PositionU i) {
+	return
+      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
+}
+
+static inline bool isMETAPOSTcomment(int ch) {
+	return
+      (ch == '%') ;
+}
+
+static inline bool isMETAPOSTone(int ch) {
+	return
+      (ch == '[') || (ch == ']') || (ch == '(') || (ch == ')') ||
+      (ch == ':') || (ch == '=') || (ch == '<') || (ch == '>') ||
+      (ch == '{') || (ch == '}') || (ch == '\'') || (ch == '\"') ;
+}
+
+static inline bool isMETAPOSTtwo(int ch) {
+	return
+      (ch == ';') || (ch == '$') || (ch == '@') || (ch == '#');
+}
+
+static inline bool isMETAPOSTthree(int ch) {
+	return
+      (ch == '.') || (ch == '-') || (ch == '+') || (ch == '/') ||
+      (ch == '*') || (ch == ',') || (ch == '|') || (ch == '`') ||
+      (ch == '!') || (ch == '?') || (ch == '^') || (ch == '&') ||
+      (ch == '%') ;
+}
+
+static inline bool isMETAPOSTidentifier(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
+      (ch == '_') ;
+}
+
+static inline bool isMETAPOSTnumber(int ch) {
+	return
+      (ch >= '0') && (ch <= '9') ;
+}
+
+static inline bool isMETAPOSTstring(int ch) {
+	return
+      (ch == '\"') ;
+}
+
+static inline bool isMETAPOSTcolon(int ch) {
+	return
+		(ch == ':') ;
+}
+
+static inline bool isMETAPOSTequal(int ch) {
+	return
+		(ch == '=') ;
+}
+
+static int CheckMETAPOSTInterface(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    Accessor &styler,
+	int defaultInterface) {
+
+    char lineBuffer[1024] ;
+	Sci_PositionU linePos = 0 ;
+
+	// some day we can make something lexer.metapost.mapping=(none,0)(metapost,1)(mp,1)(metafun,2)...
+
+    if (styler.SafeGetCharAt(0) == '%') {
+        for (Sci_PositionU i = 0; i < startPos + length; i++) {
+            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
+            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+                lineBuffer[linePos] = '\0';
+				if (strstr(lineBuffer, "interface=none")) {
+                    return 0 ;
+				} else if (strstr(lineBuffer, "interface=metapost") || strstr(lineBuffer, "interface=mp")) {
+                    return 1 ;
+				} else if (strstr(lineBuffer, "interface=metafun")) {
+                    return 2 ;
+				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
+					// better would be to limit the search to just one line
+					return 2 ;
+                } else {
+                    return defaultInterface ;
+                }
+            }
+		}
+    }
+
+    return defaultInterface ;
+}
+
+static void ColouriseMETAPOSTDoc(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	styler.StartAt(startPos) ;
+	styler.StartSegment(startPos) ;
+
+	bool processComment   = styler.GetPropertyInt("lexer.metapost.comment.process",   0) == 1 ;
+    int  defaultInterface = styler.GetPropertyInt("lexer.metapost.interface.default", 1) ;
+
+	int currentInterface = CheckMETAPOSTInterface(startPos,length,styler,defaultInterface) ;
+
+	// 0  no keyword highlighting
+	// 1  metapost keyword hightlighting
+	// 2+ metafun keyword hightlighting
+
+	int extraInterface = 0 ;
+
+	if (currentInterface != 0) {
+		extraInterface = currentInterface ;
+	}
+
+	WordList &keywords  = *keywordlists[0] ;
+	WordList kwEmpty;
+	WordList &keywords2 = (extraInterface > 0) ? *keywordlists[extraInterface - 1] : kwEmpty;
+
+	StyleContext sc(startPos, length, SCE_METAPOST_TEXT, styler) ;
+
+	char key[100] ;
+
+    bool inTeX     = false ;
+	bool inComment = false ;
+	bool inString  = false ;
+	bool inClause  = false ;
+
+	bool going = sc.More() ; // needed because of a fuzzy end of file state
+
+	for (; going; sc.Forward()) {
+
+		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
+
+		if (inClause) {
+			sc.SetState(SCE_METAPOST_TEXT) ;
+			inClause = false ;
+		}
+
+		if (inComment) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ; // not correct but we want to stimulate one-lines
+			}
+		} else if (inString) {
+			if (isMETAPOSTstring(sc.ch)) {
+				sc.SetState(SCE_METAPOST_SPECIAL) ;
+				sc.ForwardSetState(SCE_METAPOST_TEXT) ;
+				inString = false ;
+			} else if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ; // not correct but we want to stimulate one-lines
+			}
+		} else {
+			if ((! isMETAPOSTidentifier(sc.ch)) && (sc.LengthCurrent() > 0)) {
+				if (sc.state == SCE_METAPOST_COMMAND) {
+					sc.GetCurrent(key, sizeof(key)) ;
+					if ((strcmp(key,"btex") == 0) || (strcmp(key,"verbatimtex") == 0)) {
+    					sc.ChangeState(SCE_METAPOST_GROUP) ;
+						inTeX = true ;
+					} else if (inTeX) {
+						if (strcmp(key,"etex") == 0) {
+	    					sc.ChangeState(SCE_METAPOST_GROUP) ;
+							inTeX = false ;
+						} else {
+	    					sc.ChangeState(SCE_METAPOST_TEXT) ;
+						}
+					} else {
+						if (keywords && keywords.InList(key)) {
+    						sc.ChangeState(SCE_METAPOST_COMMAND) ;
+						} else if (keywords2 && keywords2.InList(key)) {
+							sc.ChangeState(SCE_METAPOST_EXTRA) ;
+						} else {
+							sc.ChangeState(SCE_METAPOST_TEXT) ;
+						}
+					}
+				}
+			}
+			if (isMETAPOSTcomment(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SYMBOL) ;
+					sc.ForwardSetState(SCE_METAPOST_DEFAULT) ;
+					inComment = ! processComment ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTstring(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SPECIAL) ;
+					if (! isMETAPOSTstring(sc.chNext)) {
+						sc.ForwardSetState(SCE_METAPOST_TEXT) ;
+					}
+					inString = true ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTcolon(sc.ch)) {
+				if (! inTeX) {
+					if (! isMETAPOSTequal(sc.chNext)) {
+						sc.SetState(SCE_METAPOST_COMMAND) ;
+						inClause = true ;
+					} else {
+						sc.SetState(SCE_METAPOST_SPECIAL) ;
+					}
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTone(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SPECIAL) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTtwo(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_GROUP) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTthree(sc.ch)) {
+				if (! inTeX) {
+					sc.SetState(SCE_METAPOST_SYMBOL) ;
+				} else {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+				}
+			} else if (isMETAPOSTidentifier(sc.ch)) {
+				if (sc.state != SCE_METAPOST_COMMAND) {
+					sc.SetState(SCE_METAPOST_TEXT) ;
+					sc.ChangeState(SCE_METAPOST_COMMAND) ;
+				}
+			} else if (isMETAPOSTnumber(sc.ch)) {
+				// rather redundant since for the moment we don't handle numbers
+				sc.SetState(SCE_METAPOST_TEXT) ;
+			} else if (sc.atLineEnd) {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+				inTeX = false ;
+				inComment = false ;
+				inClause = false ;
+				inString = false ;
+			} else {
+				sc.SetState(SCE_METAPOST_TEXT) ;
+			}
+		}
+
+	}
+
+	sc.Complete();
+
+}
+
+// Hooks info the system:
+
+static const char * const metapostWordListDesc[] = {
+	"MetaPost",
+	"MetaFun",
+	0
+} ;
+
+static int classifyFoldPointMetapost(const char* s,WordList *keywordlists[]) {
+	WordList& keywordsStart=*keywordlists[3];
+	WordList& keywordsStop1=*keywordlists[4];
+
+	if (keywordsStart.InList(s)) {return 1;}
+	else if (keywordsStop1.InList(s)) {return -1;}
+	return 0;
+
+}
+
+static int ParseMetapostWord(Sci_PositionU pos, Accessor &styler, char *word)
+{
+  int length=0;
+  char ch=styler.SafeGetCharAt(pos);
+  *word=0;
+
+  while(isMETAPOSTidentifier(ch) && isalpha(ch) && length<100){
+          word[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length);
+  }
+  word[length]=0;
+  return length;
+}
+
+static void FoldMetapostDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordlists[], Accessor &styler)
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos+length;
+	int visibleChars=0;
+	Sci_Position lineCurrent=styler.GetLine(startPos);
+	int levelPrev=styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent=levelPrev;
+	char chNext=styler[startPos];
+
+	char buffer[100]="";
+
+	for (Sci_PositionU i=startPos; i < endPos; i++) {
+		char ch=chNext;
+		chNext=styler.SafeGetCharAt(i+1);
+		char chPrev=styler.SafeGetCharAt(i-1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if(i==0 || chPrev == '\r' || chPrev=='\n'|| chPrev==' '|| chPrev=='(' || chPrev=='$')
+		{
+            ParseMetapostWord(i, styler, buffer);
+			levelCurrent += classifyFoldPointMetapost(buffer,keywordlists);
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+
+}
+
+
+LexerModule lmMETAPOST(SCLEX_METAPOST, ColouriseMETAPOSTDoc, "metapost", FoldMetapostDoc, metapostWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexModula.cxx b/scite-app/lexilla/lexers/LexModula.cxx
new file mode 100644
index 0000000..6347db7
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexModula.cxx
@@ -0,0 +1,744 @@
+//	-*- coding: utf-8 -*-
+//	Scintilla source code edit control
+/**
+ *	@file LexModula.cxx
+ *	@author Dariusz "DKnoto" Knociński
+ *	@date 2011/02/03
+ *	@brief Lexer for Modula-2/3 documents.
+ */
+//	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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+#ifdef DEBUG_LEX_MODULA
+#define DEBUG_STATE( p, c )\
+		fprintf( stderr, "Unknown state: currentPos = %u, char = '%c'\n", static_cast<unsigned int>(p), c );
+#else
+#define DEBUG_STATE( p, c )
+#endif
+
+static inline bool IsDigitOfBase( unsigned ch, unsigned base ) {
+	if( ch < '0' || ch > 'f' ) return false;
+	if( base <= 10 ) {
+		if( ch >= ( '0' + base ) ) return false;
+	} else {
+		if( ch > '9' ) {
+			unsigned nb = base - 10;
+			if( ( ch < 'A' ) || ( ch >= ( 'A' + nb ) ) ) {
+				if( ( ch < 'a' ) || ( ch >= ( 'a' + nb ) ) ) {
+					return false;
+				}
+			}
+		}
+	}
+	return true;
+}
+
+static inline unsigned IsOperator( StyleContext & sc, WordList & op ) {
+	int i;
+	char s[3];
+
+	s[0] = sc.ch;
+	s[1] = sc.chNext;
+	s[2] = 0;
+	for( i = 0; i < op.Length(); i++ ) {
+		if( ( strlen( op.WordAt(i) ) == 2 ) &&
+			( s[0] == op.WordAt(i)[0] && s[1] == op.WordAt(i)[1] ) ) {
+			return 2;
+		}
+	}
+	s[1] = 0;
+	for( i = 0; i < op.Length(); i++ ) {
+		if( ( strlen( op.WordAt(i) ) == 1 ) &&
+			( s[0] == op.WordAt(i)[0] ) ) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static inline bool IsEOL( Accessor &styler, Sci_PositionU curPos ) {
+	unsigned ch = styler.SafeGetCharAt( curPos );
+	if( ( ch == '\r' && styler.SafeGetCharAt( curPos + 1 ) == '\n' ) ||
+		( ch == '\n' ) ) {
+		return true;
+	}
+	return false;
+}
+
+static inline bool checkStatement(
+	Accessor &styler,
+	Sci_Position &curPos,
+	const char *stt, bool spaceAfter = true ) {
+	int len = static_cast<int>(strlen( stt ));
+	int i;
+	for( i = 0; i < len; i++ ) {
+		if( styler.SafeGetCharAt( curPos + i ) != stt[i] ) {
+			return false;
+		}
+	}
+	if( spaceAfter ) {
+		if( ! isspace( styler.SafeGetCharAt( curPos + i ) ) ) {
+			return false;
+		}
+	}
+	curPos += ( len - 1 );
+	return true;
+}
+
+static inline bool checkEndSemicolon(
+	Accessor &styler,
+	Sci_Position &curPos, Sci_Position endPos )
+{
+	const char *stt = "END";
+	int len = static_cast<int>(strlen( stt ));
+	int i;
+	for( i = 0; i < len; i++ ) {
+		if( styler.SafeGetCharAt( curPos + i ) != stt[i] ) {
+			return false;
+		}
+	}
+	while( isspace( styler.SafeGetCharAt( curPos + i ) ) ) {
+		i++;
+		if( ( curPos + i ) >= endPos ) return false;
+	}
+	if( styler.SafeGetCharAt( curPos + i ) != ';' ) {
+		return false;
+	}
+	curPos += ( i - 1 );
+	return true;
+}
+
+static inline bool checkKeyIdentOper(
+
+	Accessor &styler,
+	Sci_Position &curPos, Sci_Position endPos,
+	const char *stt, const char etk ) {
+	Sci_Position newPos = curPos;
+	if( ! checkStatement( styler, newPos, stt ) )
+		return false;
+	newPos++;
+	if( newPos >= endPos )
+		return false;
+	if( ! isspace( styler.SafeGetCharAt( newPos ) ) )
+		return false;
+	newPos++;
+	if( newPos >= endPos )
+		return false;
+	while( isspace( styler.SafeGetCharAt( newPos ) ) ) {
+		newPos++;
+		if( newPos >= endPos )
+			return false;
+	}
+	if( ! isalpha( styler.SafeGetCharAt( newPos ) ) )
+		return false;
+	newPos++;
+	if( newPos >= endPos )
+		return false;
+	char ch;
+	ch = styler.SafeGetCharAt( newPos );
+	while( isalpha( ch ) || isdigit( ch ) || ch == '_' ) {
+		newPos++;
+		if( newPos >= endPos ) return false;
+		ch = styler.SafeGetCharAt( newPos );
+	}
+	while( isspace( styler.SafeGetCharAt( newPos ) ) ) {
+		newPos++;
+		if( newPos >= endPos ) return false;
+	}
+	if( styler.SafeGetCharAt( newPos ) != etk )
+		return false;
+	curPos = newPos;
+	return true;
+}
+
+static void FoldModulaDoc( Sci_PositionU startPos,
+						 Sci_Position length,
+						 int , WordList *[],
+						 Accessor &styler)
+{
+	Sci_Position curLine = styler.GetLine(startPos);
+	int curLevel = SC_FOLDLEVELBASE;
+	Sci_Position endPos = startPos + length;
+	if( curLine > 0 )
+		curLevel = styler.LevelAt( curLine - 1 ) >> 16;
+	Sci_Position curPos = startPos;
+	int style = styler.StyleAt( curPos );
+	int visChars = 0;
+	int nextLevel = curLevel;
+
+	while( curPos < endPos ) {
+		if( ! isspace( styler.SafeGetCharAt( curPos ) ) ) visChars++;
+
+		switch( style ) {
+		case SCE_MODULA_COMMENT:
+			if( checkStatement( styler, curPos, "(*" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "*)" ) )
+				nextLevel--;
+			break;
+
+		case SCE_MODULA_DOXYCOMM:
+			if( checkStatement( styler, curPos, "(**", false ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "*)" ) )
+				nextLevel--;
+			break;
+
+		case SCE_MODULA_KEYWORD:
+			if( checkStatement( styler, curPos, "IF" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "BEGIN" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "TRY" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "LOOP" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "FOR" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "WHILE" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "REPEAT" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "UNTIL" ) )
+				nextLevel--;
+			else
+			if( checkStatement( styler, curPos, "WITH" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "CASE" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "TYPECASE" ) )
+				nextLevel++;
+			else
+			if( checkStatement( styler, curPos, "LOCK" ) )
+				nextLevel++;
+			else
+			if( checkKeyIdentOper( styler, curPos, endPos, "PROCEDURE", '(' ) )
+				nextLevel++;
+			else
+			if( checkKeyIdentOper( styler, curPos, endPos, "END", ';' ) ) {
+				Sci_Position cln = curLine;
+				int clv_old = curLevel;
+				Sci_Position pos;
+				char ch;
+				int clv_new;
+				while( cln > 0 ) {
+					clv_new = styler.LevelAt( cln - 1 ) >> 16;
+					if( clv_new < clv_old ) {
+						nextLevel--;
+						pos = styler.LineStart( cln );
+						while( ( ch = styler.SafeGetCharAt( pos ) ) != '\n' ) {
+							if( ch == 'P' ) {
+								if( styler.StyleAt(pos) == SCE_MODULA_KEYWORD )	{
+									if( checkKeyIdentOper( styler, pos, endPos,
+														"PROCEDURE", '(' ) ) {
+										break;
+									}
+								}
+							}
+							pos++;
+						}
+						clv_old = clv_new;
+					}
+					cln--;
+				}
+			}
+			else
+			if( checkKeyIdentOper( styler, curPos, endPos, "END", '.' ) )
+				nextLevel--;
+			else
+			if( checkEndSemicolon( styler, curPos, endPos ) )
+				nextLevel--;
+			else {
+				while( styler.StyleAt( curPos + 1 ) == SCE_MODULA_KEYWORD )
+					curPos++;
+			}
+			break;
+
+		default:
+			break;
+		}
+
+		if( IsEOL( styler, curPos ) || ( curPos == endPos - 1 ) ) {
+			int efectiveLevel = curLevel | nextLevel << 16;
+			if( visChars == 0 )
+				efectiveLevel |= SC_FOLDLEVELWHITEFLAG;
+			if( curLevel < nextLevel )
+				efectiveLevel |= SC_FOLDLEVELHEADERFLAG;
+			if( efectiveLevel != styler.LevelAt(curLine) ) {
+				styler.SetLevel(curLine, efectiveLevel );
+			}
+			curLine++;
+			curLevel = nextLevel;
+			if( IsEOL( styler, curPos ) && ( curPos == endPos - 1 ) ) {
+				styler.SetLevel( curLine, ( curLevel | curLevel << 16)
+								| SC_FOLDLEVELWHITEFLAG);
+			}
+			visChars = 0;
+		}
+		curPos++;
+		style = styler.StyleAt( curPos );
+	}
+}
+
+static inline bool skipWhiteSpaces( StyleContext & sc ) {
+	while( isspace( sc.ch ) ) {
+		sc.SetState( SCE_MODULA_DEFAULT );
+		if( sc.More() )
+			sc.Forward();
+		else
+			return false;
+	}
+	return true;
+}
+
+static void ColouriseModulaDoc(	Sci_PositionU startPos,
+									Sci_Position length,
+									int initStyle,
+									WordList *wl[],
+									Accessor &styler ) {
+	WordList& keyWords		= *wl[0];
+	WordList& reservedWords	= *wl[1];
+	WordList& operators 	= *wl[2];
+	WordList& pragmaWords 	= *wl[3];
+	WordList& escapeCodes	= *wl[4];
+	WordList& doxyKeys		= *wl[5];
+
+	const int BUFLEN = 128;
+
+	char	buf[BUFLEN];
+	int		i, kl;
+
+	Sci_Position  charPos = 0;
+
+	StyleContext sc( startPos, length, initStyle, styler );
+
+	while( sc.More() ) 	{
+		switch( sc.state )	{
+		case SCE_MODULA_DEFAULT:
+			if( ! skipWhiteSpaces( sc ) ) break;
+
+			if( sc.ch == '(' && sc.chNext == '*' ) {
+				if( sc.GetRelative(2) == '*' ) {
+					sc.SetState( SCE_MODULA_DOXYCOMM );
+					sc.Forward();
+				} else {
+					sc.SetState( SCE_MODULA_COMMENT );
+				}
+				sc.Forward();
+			}
+			else
+			if( isalpha( sc.ch ) ) {
+				if( isupper( sc.ch ) && isupper( sc.chNext ) ) {
+					for( i = 0; i < BUFLEN - 1; i++ ) {
+						buf[i] = sc.GetRelative(i);
+						if( !isalpha( buf[i] ) && !(buf[i] == '_') )
+							break;
+					}
+					kl = i;
+					buf[kl] = 0;
+
+					if( keyWords.InList( buf ) ) {
+						sc.SetState( SCE_MODULA_KEYWORD );
+						sc.Forward( kl );
+						sc.SetState( SCE_MODULA_DEFAULT );
+						continue;
+					}
+					else
+					if( reservedWords.InList( buf ) ) {
+						sc.SetState( SCE_MODULA_RESERVED );
+						sc.Forward( kl );
+						sc.SetState( SCE_MODULA_DEFAULT );
+						continue;
+					} else {
+						/** check procedure identifier */
+					}
+				} else {
+					for( i = 0; i < BUFLEN - 1; i++ ) {
+						buf[i] = sc.GetRelative(i);
+						if( !isalpha( buf[i] ) &&
+							!isdigit( buf[i] ) &&
+							!(buf[i] == '_') )
+							break;
+					}
+					kl = i;
+					buf[kl] = 0;
+
+					sc.SetState( SCE_MODULA_DEFAULT );
+					sc.Forward( kl );
+					continue;
+				}
+			}
+			else
+			if( isdigit( sc.ch ) ) {
+				sc.SetState( SCE_MODULA_NUMBER );
+				continue;
+			}
+			else
+			if( sc.ch == '\"' ) {
+				sc.SetState( SCE_MODULA_STRING );
+			}
+			else
+			if( sc.ch == '\'' ) {
+				charPos = sc.currentPos;
+				sc.SetState( SCE_MODULA_CHAR );
+			}
+			else
+			if( sc.ch == '<' && sc.chNext == '*' ) {
+				sc.SetState( SCE_MODULA_PRAGMA );
+				sc.Forward();
+			} else {
+				unsigned len = IsOperator( sc, operators );
+				if( len > 0 ) {
+					sc.SetState( SCE_MODULA_OPERATOR );
+					sc.Forward( len );
+					sc.SetState( SCE_MODULA_DEFAULT );
+					continue;
+				} else {
+					DEBUG_STATE( sc.currentPos, sc.ch );
+				}
+			}
+			break;
+
+		case SCE_MODULA_COMMENT:
+			if( sc.ch == '*' && sc.chNext == ')' ) {
+				sc.Forward( 2 );
+				sc.SetState( SCE_MODULA_DEFAULT );
+				continue;
+			}
+			break;
+
+		case SCE_MODULA_DOXYCOMM:
+			switch( sc.ch ) {
+			case '*':
+				if( sc.chNext == ')' ) {
+					sc.Forward( 2 );
+					sc.SetState( SCE_MODULA_DEFAULT );
+					continue;
+				}
+				break;
+
+			case '@':
+				if( islower( sc.chNext ) ) {
+					for( i = 0; i < BUFLEN - 1; i++ ) {
+						buf[i] = sc.GetRelative(i+1);
+						if( isspace( buf[i] ) ) break;
+					}
+					buf[i] = 0;
+					kl = i;
+
+					if( doxyKeys.InList( buf ) ) {
+						sc.SetState( SCE_MODULA_DOXYKEY );
+						sc.Forward( kl + 1 );
+						sc.SetState( SCE_MODULA_DOXYCOMM );
+					}
+				}
+				break;
+
+			default:
+				break;
+			}
+			break;
+
+		case SCE_MODULA_NUMBER:
+			{
+				buf[0] = sc.ch;
+				for( i = 1; i < BUFLEN - 1; i++ ) {
+					buf[i] = sc.GetRelative(i);
+					if( ! isdigit( buf[i] ) )
+						break;
+				}
+				kl = i;
+				buf[kl] = 0;
+
+				switch( sc.GetRelative(kl) ) {
+				case '_':
+					{
+						int base = atoi( buf );
+						if( base < 2 || base > 16 ) {
+							sc.SetState( SCE_MODULA_BADSTR );
+						} else {
+							int imax;
+
+							kl++;
+							for( i = 0; i < BUFLEN - 1; i++ ) {
+								buf[i] = sc.GetRelative(kl+i);
+								if( ! IsDigitOfBase( buf[i], 16 ) ) {
+									break;
+								}
+							}
+							imax = i;
+							for( i = 0; i < imax; i++ ) {
+								if( ! IsDigitOfBase( buf[i], base ) ) {
+									sc.SetState( SCE_MODULA_BADSTR );
+									break;
+								}
+							}
+							kl += imax;
+						}
+						sc.SetState( SCE_MODULA_BASENUM );
+						for( i = 0; i < kl; i++ ) {
+							sc.Forward();
+						}
+						sc.SetState( SCE_MODULA_DEFAULT );
+						continue;
+					}
+					break;
+
+				case '.':
+					if( sc.GetRelative(kl+1) == '.' ) {
+						kl--;
+						for( i = 0; i < kl; i++ ) {
+							sc.Forward();
+						}
+						sc.Forward();
+						sc.SetState( SCE_MODULA_DEFAULT );
+						continue;
+					} else {
+						bool doNext = false;
+
+						kl++;
+
+						buf[0] = sc.GetRelative(kl);
+						if( isdigit( buf[0] ) ) {
+							for( i = 0;; i++ ) {
+								if( !isdigit(sc.GetRelative(kl+i)) )
+									break;
+							}
+							kl += i;
+							buf[0] = sc.GetRelative(kl);
+
+							switch( buf[0] )
+							{
+							case 'E':
+							case 'e':
+							case 'D':
+							case 'd':
+							case 'X':
+							case 'x':
+								kl++;
+								buf[0] = sc.GetRelative(kl);
+								if( buf[0] == '-' || buf[0] == '+' ) {
+									kl++;
+								}
+								buf[0] = sc.GetRelative(kl);
+								if( isdigit( buf[0] ) ) {
+									for( i = 0;; i++ ) {
+										if( !isdigit(sc.GetRelative(kl+i)) ) {
+											buf[0] = sc.GetRelative(kl+i);
+											break;
+										}
+									}
+									kl += i;
+									doNext = true;
+								} else {
+									sc.SetState( SCE_MODULA_BADSTR );
+								}
+								break;
+
+							default:
+								doNext = true;
+								break;
+							}
+						} else {
+							sc.SetState( SCE_MODULA_BADSTR );
+						}
+
+						if( doNext ) {
+							if( ! isspace( buf[0] ) &&
+								buf[0] != ')' &&
+								buf[0] != '>' &&
+								buf[0] != '<' &&
+								buf[0] != '=' &&
+								buf[0] != '#' &&
+								buf[0] != '+' &&
+								buf[0] != '-' &&
+								buf[0] != '*' &&
+								buf[0] != '/' &&
+								buf[0] != ',' &&
+								buf[0] != ';'
+								) {
+								sc.SetState( SCE_MODULA_BADSTR );
+							} else {
+								kl--;
+							}
+						}
+					}
+					sc.SetState( SCE_MODULA_FLOAT );
+					for( i = 0; i < kl; i++ ) {
+						sc.Forward();
+					}
+					sc.SetState( SCE_MODULA_DEFAULT );
+					continue;
+					break;
+
+				default:
+					for( i = 0; i < kl; i++ ) {
+						sc.Forward();
+					}
+					break;
+				}
+				sc.SetState( SCE_MODULA_DEFAULT );
+				continue;
+			}
+			break;
+
+		case SCE_MODULA_STRING:
+			if( sc.ch == '\"' ) {
+				sc.Forward();
+				sc.SetState( SCE_MODULA_DEFAULT );
+				continue;
+			} else {
+				if( sc.ch == '\\' ) {
+					i = 1;
+					if( IsDigitOfBase( sc.chNext, 8 ) ) {
+						for( i = 1; i < BUFLEN - 1; i++ ) {
+							if( ! IsDigitOfBase(sc.GetRelative(i+1), 8 ) )
+								break;
+						}
+						if( i == 3 ) {
+							sc.SetState( SCE_MODULA_STRSPEC );
+						} else {
+							sc.SetState( SCE_MODULA_BADSTR );
+						}
+					} else {
+						buf[0] = sc.chNext;
+						buf[1] = 0;
+
+						if( escapeCodes.InList( buf ) ) {
+							sc.SetState( SCE_MODULA_STRSPEC );
+						} else {
+							sc.SetState( SCE_MODULA_BADSTR );
+						}
+					}
+					sc.Forward(i+1);
+					sc.SetState( SCE_MODULA_STRING );
+					continue;
+				}
+			}
+			break;
+
+		case SCE_MODULA_CHAR:
+			if( sc.ch == '\'' ) {
+				sc.Forward();
+				sc.SetState( SCE_MODULA_DEFAULT );
+				continue;
+			}
+			else
+			if( ( sc.currentPos - charPos ) == 1 ) {
+				if( sc.ch == '\\' ) {
+					i = 1;
+					if( IsDigitOfBase( sc.chNext, 8 ) ) {
+						for( i = 1; i < BUFLEN - 1; i++ ) {
+							if( ! IsDigitOfBase(sc.GetRelative(i+1), 8 ) )
+								break;
+						}
+						if( i == 3 ) {
+							sc.SetState( SCE_MODULA_CHARSPEC );
+						} else {
+							sc.SetState( SCE_MODULA_BADSTR );
+						}
+					} else {
+						buf[0] = sc.chNext;
+						buf[1] = 0;
+
+						if( escapeCodes.InList( buf ) ) {
+							sc.SetState( SCE_MODULA_CHARSPEC );
+						} else {
+							sc.SetState( SCE_MODULA_BADSTR );
+						}
+					}
+					sc.Forward(i+1);
+					sc.SetState( SCE_MODULA_CHAR );
+					continue;
+				}
+			} else {
+				sc.SetState( SCE_MODULA_BADSTR );
+				sc.Forward();
+				sc.SetState( SCE_MODULA_CHAR );
+				continue;
+			}
+			break;
+
+		case SCE_MODULA_PRAGMA:
+			if( sc.ch == '*' && sc.chNext == '>' ) {
+				sc.Forward();
+				sc.Forward();
+				sc.SetState( SCE_MODULA_DEFAULT );
+				continue;
+			}
+			else
+			if( isupper( sc.ch ) && isupper( sc.chNext ) ) {
+				buf[0] = sc.ch;
+				buf[1] = sc.chNext;
+				for( i = 2; i < BUFLEN - 1; i++ ) {
+					buf[i] = sc.GetRelative(i);
+					if( !isupper( buf[i] ) )
+						break;
+				}
+				kl = i;
+				buf[kl] = 0;
+				if( pragmaWords.InList( buf ) ) {
+					sc.SetState( SCE_MODULA_PRGKEY );
+					sc.Forward( kl );
+					sc.SetState( SCE_MODULA_PRAGMA );
+					continue;
+				}
+			}
+			break;
+
+		default:
+			break;
+		}
+		sc.Forward();
+	}
+	sc.Complete();
+}
+
+static const char *const modulaWordListDesc[] =
+{
+	"Keywords",
+	"ReservedKeywords",
+	"Operators",
+	"PragmaKeyswords",
+	"EscapeCodes",
+	"DoxygeneKeywords",
+	0
+};
+
+LexerModule lmModula( SCLEX_MODULA, ColouriseModulaDoc, "modula", FoldModulaDoc,
+					  modulaWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexMySQL.cxx b/scite-app/lexilla/lexers/LexMySQL.cxx
new file mode 100644
index 0000000..887ec8d
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexMySQL.cxx
@@ -0,0 +1,577 @@
+/**
+ * Scintilla source code edit control
+ * @file LexMySQL.cxx
+ * Lexer for MySQL
+ *
+ * Improved by Mike Lischke <mike.lischke@oracle.com>
+ * Adopted from LexSQL.cxx by Anders Karlsson <anders@mysql.com>
+ * Original work by Neil Hodgson <neilh@scintilla.org>
+ * Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Check if the current content context represent a keyword and set the context state if so.
+ */
+static void CheckForKeyword(StyleContext& sc, WordList* keywordlists[], int activeState)
+{
+  Sci_Position length = sc.LengthCurrent() + 1; // +1 for the next char
+  char* s = new char[length];
+  sc.GetCurrentLowered(s, length);
+  if (keywordlists[0]->InList(s))
+    sc.ChangeState(SCE_MYSQL_MAJORKEYWORD | activeState);
+  else
+    if (keywordlists[1]->InList(s))
+      sc.ChangeState(SCE_MYSQL_KEYWORD | activeState);
+    else
+      if (keywordlists[2]->InList(s))
+        sc.ChangeState(SCE_MYSQL_DATABASEOBJECT | activeState);
+      else
+        if (keywordlists[3]->InList(s))
+          sc.ChangeState(SCE_MYSQL_FUNCTION | activeState);
+        else
+          if (keywordlists[5]->InList(s))
+            sc.ChangeState(SCE_MYSQL_PROCEDUREKEYWORD | activeState);
+          else
+            if (keywordlists[6]->InList(s))
+              sc.ChangeState(SCE_MYSQL_USER1 | activeState);
+            else
+              if (keywordlists[7]->InList(s))
+                sc.ChangeState(SCE_MYSQL_USER2 | activeState);
+              else
+                if (keywordlists[8]->InList(s))
+                  sc.ChangeState(SCE_MYSQL_USER3 | activeState);
+  delete [] s;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+#define HIDDENCOMMAND_STATE 0x40 // Offset for states within a hidden command.
+#define MASKACTIVE(style) (style & ~HIDDENCOMMAND_STATE)
+
+static void SetDefaultState(StyleContext& sc, int activeState)
+{
+  if (activeState == 0)
+    sc.SetState(SCE_MYSQL_DEFAULT);
+  else
+    sc.SetState(SCE_MYSQL_HIDDENCOMMAND);
+}
+
+static void ForwardDefaultState(StyleContext& sc, int activeState)
+{
+  if (activeState == 0)
+    sc.ForwardSetState(SCE_MYSQL_DEFAULT);
+  else
+    sc.ForwardSetState(SCE_MYSQL_HIDDENCOMMAND);
+}
+
+static void ColouriseMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler, 127);
+  int activeState = (initStyle == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : initStyle & HIDDENCOMMAND_STATE;
+
+	for (; sc.More(); sc.Forward())
+  {
+		// Determine if the current state should terminate.
+		switch (MASKACTIVE(sc.state))
+    {
+      case SCE_MYSQL_OPERATOR:
+        SetDefaultState(sc, activeState);
+        break;
+      case SCE_MYSQL_NUMBER:
+        // We stop the number definition on non-numerical non-dot non-eE non-sign char.
+        if (!IsANumberChar(sc.ch))
+          SetDefaultState(sc, activeState);
+        break;
+      case SCE_MYSQL_IDENTIFIER:
+        // Switch from identifier to keyword state and open a new state for the new char.
+        if (!IsAWordChar(sc.ch))
+        {
+          CheckForKeyword(sc, keywordlists, activeState);
+
+          // Additional check for function keywords needed.
+          // A function name must be followed by an opening parenthesis.
+          if (MASKACTIVE(sc.state) == SCE_MYSQL_FUNCTION && sc.ch != '(')
+          {
+            if (activeState > 0)
+              sc.ChangeState(SCE_MYSQL_HIDDENCOMMAND);
+            else
+              sc.ChangeState(SCE_MYSQL_DEFAULT);
+          }
+
+          SetDefaultState(sc, activeState);
+        }
+        break;
+      case SCE_MYSQL_VARIABLE:
+        if (!IsAWordChar(sc.ch))
+          SetDefaultState(sc, activeState);
+        break;
+      case SCE_MYSQL_SYSTEMVARIABLE:
+        if (!IsAWordChar(sc.ch))
+        {
+          Sci_Position length = sc.LengthCurrent() + 1;
+          char* s = new char[length];
+          sc.GetCurrentLowered(s, length);
+
+          // Check for known system variables here.
+          if (keywordlists[4]->InList(&s[2]))
+            sc.ChangeState(SCE_MYSQL_KNOWNSYSTEMVARIABLE | activeState);
+          delete [] s;
+
+          SetDefaultState(sc, activeState);
+        }
+        break;
+      case SCE_MYSQL_QUOTEDIDENTIFIER:
+        if (sc.ch == '`')
+        {
+          if (sc.chNext == '`')
+            sc.Forward();	// Ignore it
+          else
+            ForwardDefaultState(sc, activeState);
+				}
+  			break;
+      case SCE_MYSQL_COMMENT:
+        if (sc.Match('*', '/'))
+        {
+          sc.Forward();
+          ForwardDefaultState(sc, activeState);
+        }
+        break;
+      case SCE_MYSQL_COMMENTLINE:
+        if (sc.atLineStart)
+          SetDefaultState(sc, activeState);
+        break;
+      case SCE_MYSQL_SQSTRING:
+        if (sc.ch == '\\')
+          sc.Forward(); // Escape sequence
+        else
+          if (sc.ch == '\'')
+          {
+            // End of single quoted string reached?
+            if (sc.chNext == '\'')
+              sc.Forward();
+            else
+              ForwardDefaultState(sc, activeState);
+          }
+        break;
+      case SCE_MYSQL_DQSTRING:
+        if (sc.ch == '\\')
+          sc.Forward(); // Escape sequence
+        else
+          if (sc.ch == '\"')
+          {
+            // End of single quoted string reached?
+            if (sc.chNext == '\"')
+              sc.Forward();
+            else
+              ForwardDefaultState(sc, activeState);
+          }
+        break;
+      case SCE_MYSQL_PLACEHOLDER:
+        if (sc.Match('}', '>'))
+        {
+          sc.Forward();
+          ForwardDefaultState(sc, activeState);
+        }
+        break;
+    }
+
+    if (sc.state == SCE_MYSQL_HIDDENCOMMAND && sc.Match('*', '/'))
+    {
+      activeState = 0;
+      sc.Forward();
+      ForwardDefaultState(sc, activeState);
+    }
+
+    // Determine if a new state should be entered.
+    if (sc.state == SCE_MYSQL_DEFAULT || sc.state == SCE_MYSQL_HIDDENCOMMAND)
+    {
+      switch (sc.ch)
+      {
+        case '@':
+          if (sc.chNext == '@')
+          {
+            sc.SetState(SCE_MYSQL_SYSTEMVARIABLE | activeState);
+            sc.Forward(2); // Skip past @@.
+          }
+          else
+            if (IsAWordStart(sc.ch))
+            {
+              sc.SetState(SCE_MYSQL_VARIABLE | activeState);
+              sc.Forward(); // Skip past @.
+            }
+            else
+              sc.SetState(SCE_MYSQL_OPERATOR | activeState);
+          break;
+        case '`':
+          sc.SetState(SCE_MYSQL_QUOTEDIDENTIFIER | activeState);
+          break;
+        case '#':
+          sc.SetState(SCE_MYSQL_COMMENTLINE | activeState);
+          break;
+        case '\'':
+          sc.SetState(SCE_MYSQL_SQSTRING | activeState);
+          break;
+        case '\"':
+          sc.SetState(SCE_MYSQL_DQSTRING | activeState);
+          break;
+        default:
+          if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext)))
+            sc.SetState(SCE_MYSQL_NUMBER | activeState);
+          else
+            if (IsAWordStart(sc.ch))
+              sc.SetState(SCE_MYSQL_IDENTIFIER | activeState);
+            else
+              if (sc.Match('/', '*'))
+              {
+                sc.SetState(SCE_MYSQL_COMMENT | activeState);
+
+                // Skip first char of comment introducer and check for hidden command.
+                // The second char is skipped by the outer loop.
+                sc.Forward();
+                if (sc.GetRelativeCharacter(1) == '!')
+                {
+                  // Version comment found. Skip * now.
+                  sc.Forward();
+                  activeState = HIDDENCOMMAND_STATE;
+                  sc.ChangeState(SCE_MYSQL_HIDDENCOMMAND);
+                }
+              }
+              else if (sc.Match('<', '{'))
+              {
+                sc.SetState(SCE_MYSQL_PLACEHOLDER | activeState);
+              }
+              else
+                if (sc.Match("--"))
+                {
+                  // Special MySQL single line comment.
+                  sc.SetState(SCE_MYSQL_COMMENTLINE | activeState);
+                  sc.Forward(2);
+
+                  // Check the third character too. It must be a space or EOL.
+                  if (sc.ch != ' ' && sc.ch != '\n' && sc.ch != '\r')
+                    sc.ChangeState(SCE_MYSQL_OPERATOR | activeState);
+                }
+                else
+                  if (isoperator(static_cast<char>(sc.ch)))
+                    sc.SetState(SCE_MYSQL_OPERATOR | activeState);
+      }
+    }
+  }
+
+  // Do a final check for keywords if we currently have an identifier, to highlight them
+  // also at the end of a line.
+  if (sc.state == SCE_MYSQL_IDENTIFIER)
+  {
+    CheckForKeyword(sc, keywordlists, activeState);
+
+    // Additional check for function keywords needed.
+    // A function name must be followed by an opening parenthesis.
+    if (sc.state == SCE_MYSQL_FUNCTION && sc.ch != '(')
+      SetDefaultState(sc, activeState);
+  }
+
+  sc.Complete();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper function to determine if we have a foldable comment currently.
+ */
+static bool IsStreamCommentStyle(int style)
+{
+	return MASKACTIVE(style) == SCE_MYSQL_COMMENT;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Code copied from StyleContext and modified to work here. Should go into Accessor as a
+ * companion to Match()...
+ */
+static bool MatchIgnoreCase(Accessor &styler, Sci_Position currentPos, const char *s)
+{
+  for (Sci_Position n = 0; *s; n++)
+  {
+    if (*s != tolower(styler.SafeGetCharAt(currentPos + n)))
+      return false;
+    s++;
+  }
+  return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment.
+static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler)
+{
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0;
+
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+	int levelNext = levelCurrent;
+
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+  int activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
+
+  bool endPending = false;
+	bool whenPending = false;
+	bool elseIfPending = false;
+
+  char nextChar = styler.SafeGetCharAt(startPos);
+  for (Sci_PositionU i = startPos; length > 0; i++, length--)
+  {
+		int stylePrev = style;
+    int lastActiveState = activeState;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+    activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
+
+    char currentChar = nextChar;
+    nextChar = styler.SafeGetCharAt(i + 1);
+		bool atEOL = (currentChar == '\r' && nextChar != '\n') || (currentChar == '\n');
+
+    switch (MASKACTIVE(style))
+    {
+      case SCE_MYSQL_COMMENT:
+        if (foldComment)
+        {
+          // Multiline comment style /* .. */ just started or is still in progress.
+          if (IsStreamCommentStyle(style) && !IsStreamCommentStyle(stylePrev))
+            levelNext++;
+        }
+        break;
+      case SCE_MYSQL_COMMENTLINE:
+        if (foldComment)
+        {
+          // Not really a standard, but we add support for single line comments
+          // with special curly braces syntax as foldable comments too.
+          // MySQL needs -- comments to be followed by space or control char
+          if (styler.Match(i, "--"))
+          {
+            char chNext2 = styler.SafeGetCharAt(i + 2);
+            char chNext3 = styler.SafeGetCharAt(i + 3);
+            if (chNext2 == '{' || chNext3 == '{')
+              levelNext++;
+            else
+              if (chNext2 == '}' || chNext3 == '}')
+                levelNext--;
+          }
+        }
+        break;
+      case SCE_MYSQL_HIDDENCOMMAND:
+        /*
+        if (endPending)
+        {
+          // A conditional command is not a white space so it should end the current block
+          // before opening a new one.
+          endPending = false;
+          levelNext--;
+          if (levelNext < SC_FOLDLEVELBASE)
+            levelNext = SC_FOLDLEVELBASE;
+        }
+        }*/
+        if (activeState != lastActiveState)
+          levelNext++;
+        break;
+      case SCE_MYSQL_OPERATOR:
+        if (endPending)
+        {
+          endPending = false;
+          levelNext--;
+          if (levelNext < SC_FOLDLEVELBASE)
+            levelNext = SC_FOLDLEVELBASE;
+        }
+        if (currentChar == '(')
+          levelNext++;
+        else
+          if (currentChar == ')')
+          {
+            levelNext--;
+            if (levelNext < SC_FOLDLEVELBASE)
+              levelNext = SC_FOLDLEVELBASE;
+          }
+        break;
+      case SCE_MYSQL_MAJORKEYWORD:
+      case SCE_MYSQL_KEYWORD:
+      case SCE_MYSQL_FUNCTION:
+      case SCE_MYSQL_PROCEDUREKEYWORD:
+        // Reserved and other keywords.
+        if (style != stylePrev)
+        {
+          // END decreases the folding level, regardless which keyword follows.
+          bool endFound = MatchIgnoreCase(styler, i, "end");
+          if (endPending)
+          {
+            levelNext--;
+            if (levelNext < SC_FOLDLEVELBASE)
+              levelNext = SC_FOLDLEVELBASE;
+          }
+          else
+            if (!endFound)
+            {
+              if (MatchIgnoreCase(styler, i, "begin"))
+                levelNext++;
+              else
+              {
+                if (!foldOnlyBegin)
+                {
+                  bool whileFound = MatchIgnoreCase(styler, i, "while");
+                  bool loopFound = MatchIgnoreCase(styler, i, "loop");
+                  bool repeatFound = MatchIgnoreCase(styler, i, "repeat");
+                  bool caseFound = MatchIgnoreCase(styler, i, "case");
+
+                  if (whileFound || loopFound || repeatFound || caseFound)
+                    levelNext++;
+                  else
+                  {
+                    // IF alone does not increase the fold level as it is also used in non-block'ed
+                    // code like DROP PROCEDURE blah IF EXISTS.
+                    // Instead THEN opens the new level (if not part of an ELSEIF or WHEN (case) branch).
+                    if (MatchIgnoreCase(styler, i, "then"))
+                    {
+                      if (!elseIfPending && !whenPending)
+                        levelNext++;
+                      else
+                      {
+                        elseIfPending = false;
+                        whenPending = false;
+                      }
+                    }
+                    else
+                    {
+                      // Neither of if/then/while/loop/repeat/case, so check for
+                      // sub parts of IF and CASE.
+                      if (MatchIgnoreCase(styler, i, "elseif"))
+                        elseIfPending = true;
+                      if (MatchIgnoreCase(styler, i, "when"))
+                        whenPending = true;
+                    }
+                  }
+                }
+              }
+            }
+
+          // Keep the current end state for the next round.
+          endPending = endFound;
+        }
+        break;
+
+      default:
+        if (!isspacechar(currentChar) && endPending)
+        {
+          // END followed by a non-whitespace character (not covered by other cases like identifiers)
+          // also should end a folding block. Typical case: END followed by self defined delimiter.
+          levelNext--;
+          if (levelNext < SC_FOLDLEVELBASE)
+            levelNext = SC_FOLDLEVELBASE;
+        }
+        break;
+    }
+
+    // Go up one level if we just ended a multi line comment.
+    if (IsStreamCommentStyle(stylePrev) && !IsStreamCommentStyle(style))
+    {
+      levelNext--;
+      if (levelNext < SC_FOLDLEVELBASE)
+        levelNext = SC_FOLDLEVELBASE;
+    }
+
+    if (activeState == 0 && lastActiveState != 0)
+    {
+      // Decrease fold level when we left a hidden command.
+      levelNext--;
+      if (levelNext < SC_FOLDLEVELBASE)
+        levelNext = SC_FOLDLEVELBASE;
+    }
+
+    if (atEOL)
+    {
+      // Apply the new folding level to this line.
+      // Leave pending states as they are otherwise a line break will de-sync
+      // code folding and valid syntax.
+      int levelUse = levelCurrent;
+      int lev = levelUse | levelNext << 16;
+      if (visibleChars == 0 && foldCompact)
+        lev |= SC_FOLDLEVELWHITEFLAG;
+      if (levelUse < levelNext)
+        lev |= SC_FOLDLEVELHEADERFLAG;
+      if (lev != styler.LevelAt(lineCurrent))
+        styler.SetLevel(lineCurrent, lev);
+
+      lineCurrent++;
+      levelCurrent = levelNext;
+      visibleChars = 0;
+    }
+
+		if (!isspacechar(currentChar))
+      visibleChars++;
+  }
+}
+
+//--------------------------------------------------------------------------------------------------
+
+static const char * const mysqlWordListDesc[] = {
+	"Major Keywords",
+	"Keywords",
+	"Database Objects",
+	"Functions",
+	"System Variables",
+	"Procedure keywords",
+	"User Keywords 1",
+	"User Keywords 2",
+	"User Keywords 3",
+	0
+};
+
+LexerModule lmMySQL(SCLEX_MYSQL, ColouriseMySQLDoc, "mysql", FoldMySQLDoc, mysqlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexNim.cxx b/scite-app/lexilla/lexers/LexNim.cxx
new file mode 100644
index 0000000..3e8a6e0
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexNim.cxx
@@ -0,0 +1,814 @@
+// Scintilla source code edit control
+/** @file LexNim.cxx
+** Lexer for Nim
+** Written by Jad Altahan (github.com/xv)
+** Nim manual: https://nim-lang.org/docs/manual.html
+**/
+// 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 <string>
+#include <string_view>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+    // Use an unnamed namespace to protect the functions and classes from name conflicts
+
+enum NumType {
+    Binary,
+    Octal,
+    Exponent,
+    Hexadecimal,
+    Decimal,
+    FormatError
+};
+
+int GetNumStyle(const int numType) noexcept {
+    if (numType == NumType::FormatError) {
+        return SCE_NIM_NUMERROR;
+    }
+
+    return SCE_NIM_NUMBER;
+}
+
+constexpr bool IsLetter(const int ch) noexcept {
+    // 97 to 122 || 65 to 90
+    return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
+}
+
+bool IsAWordChar(const int ch) noexcept {
+    return ch < 0x80 && (isalnum(ch) || ch == '_' || ch == '.');
+}
+
+int IsNumHex(const StyleContext &sc) noexcept {
+    return sc.chNext == 'x' || sc.chNext == 'X';
+}
+
+int IsNumBinary(const StyleContext &sc) noexcept {
+    return sc.chNext == 'b' || sc.chNext == 'B';
+}
+
+int IsNumOctal(const StyleContext &sc) {
+    return IsADigit(sc.chNext) || sc.chNext == 'o';
+}
+
+constexpr bool IsNewline(const int ch) noexcept {
+    return (ch == '\n' || ch == '\r');
+}
+
+bool IsFuncName(const char *str) noexcept {
+    const char *identifiers[] = {
+        "proc",
+        "func",
+        "macro",
+        "method",
+        "template",
+        "iterator",
+        "converter"
+    };
+
+    for (const char *id : identifiers) {
+        if (strcmp(str, id) == 0) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+constexpr bool IsTripleLiteral(const int style) noexcept {
+    return style == SCE_NIM_TRIPLE || style == SCE_NIM_TRIPLEDOUBLE;
+}
+
+constexpr bool IsLineComment(const int style) noexcept {
+    return style == SCE_NIM_COMMENTLINE || style == SCE_NIM_COMMENTLINEDOC;
+}
+
+constexpr bool IsStreamComment(const int style) noexcept {
+    return style == SCE_NIM_COMMENT || style == SCE_NIM_COMMENTDOC;
+}
+
+// Adopted from Accessor.cxx
+int GetIndent(const Sci_Position line, Accessor &styler) {
+    Sci_Position startPos = styler.LineStart(line);
+    const Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+
+    char ch = styler[startPos];
+    int style = styler.StyleAt(startPos);
+
+    int indent = 0;
+    bool inPrevPrefix = line > 0;
+    Sci_Position posPrev = inPrevPrefix ? styler.LineStart(line - 1) : 0;
+
+    // No fold points inside triple literals
+    while ((IsASpaceOrTab(ch) || IsTripleLiteral(style)) && (startPos < eolPos)) {
+        if (inPrevPrefix) {
+            const char chPrev = styler[posPrev++];
+            if (chPrev != ' ' && chPrev != '\t') {
+                inPrevPrefix = false;
+            }
+        }
+
+        if (ch == '\t') {
+            indent = (indent / 8 + 1) * 8;
+        } else {
+            indent++;
+        }
+
+        startPos++;
+        ch = styler[startPos];
+        style = styler.StyleAt(startPos);
+    }
+
+    // Prevent creating fold lines for comments if indented
+    if (!(IsStreamComment(style) || IsLineComment(style)))
+        indent += SC_FOLDLEVELBASE;
+
+    if (styler.LineStart(line) == styler.Length() 
+        || IsASpaceOrTab(ch) 
+        || IsNewline(ch) 
+        || IsStreamComment(style)
+        || IsLineComment(style)) {
+        return indent | SC_FOLDLEVELWHITEFLAG;
+    } else {
+        return indent;
+    }
+}
+
+int IndentAmount(const Sci_Position line, Accessor &styler) {
+    const int indent = GetIndent(line, styler);
+    const int indentLevel = indent & SC_FOLDLEVELNUMBERMASK;
+    return indentLevel <= SC_FOLDLEVELBASE ? indent : indentLevel | (indent & ~SC_FOLDLEVELNUMBERMASK);
+}
+
+struct OptionsNim {
+    bool fold;
+    bool foldCompact;
+    bool highlightRawStrIdent;
+
+    OptionsNim() {
+        fold = true;
+        foldCompact = true;
+        highlightRawStrIdent = false;
+    }
+};
+
+static const char *const nimWordListDesc[] = {
+    "Keywords",
+    nullptr
+};
+
+struct OptionSetNim : public OptionSet<OptionsNim> {
+    OptionSetNim() {
+        DefineProperty("lexer.nim.raw.strings.highlight.ident", &OptionsNim::highlightRawStrIdent,
+            "Set to 1 to enable highlighting generalized raw string identifiers. "
+            "Generalized raw string identifiers are anything other than r (or R).");
+
+        DefineProperty("fold", &OptionsNim::fold);
+        DefineProperty("fold.compact", &OptionsNim::foldCompact);
+
+        DefineWordListSets(nimWordListDesc);
+    }
+};
+
+LexicalClass lexicalClasses[] = {
+    // Lexer Nim SCLEX_NIM SCE_NIM_:
+    0,  "SCE_NIM_DEFAULT",        "default",              "White space",
+    1,  "SCE_NIM_COMMENT",        "comment block",        "Block comment",
+    2,  "SCE_NIM_COMMENTDOC",     "comment block doc",    "Block doc comment",
+    3,  "SCE_NIM_COMMENTLINE",    "comment line",         "Line comment",
+    4,  "SCE_NIM_COMMENTLINEDOC", "comment doc",          "Line doc comment",
+    5,  "SCE_NIM_NUMBER",         "literal numeric",      "Number",
+    6,  "SCE_NIM_STRING",         "literal string",       "String",
+    7,  "SCE_NIM_CHARACTER",      "literal string",       "Single quoted string",
+    8,  "SCE_NIM_WORD",           "keyword",              "Keyword",
+    9,  "SCE_NIM_TRIPLE",         "literal string",       "Triple quotes",
+    10, "SCE_NIM_TRIPLEDOUBLE",   "literal string",       "Triple double quotes",
+    11, "SCE_NIM_BACKTICKS",      "operator definition",  "Identifiers",
+    12, "SCE_NIM_FUNCNAME",       "identifier",           "Function name definition",
+    13, "SCE_NIM_STRINGEOL",      "error literal string", "String is not closed",
+    14, "SCE_NIM_NUMERROR",       "numeric error",        "Numeric format error",
+    15, "SCE_NIM_OPERATOR",       "operator",             "Operators",
+    16, "SCE_NIM_IDENTIFIER",     "identifier",           "Identifiers",
+};
+
+}
+
+class LexerNim : public DefaultLexer {
+    CharacterSet setWord;
+    WordList keywords;
+    OptionsNim options;
+    OptionSetNim osNim;
+
+public:
+    LexerNim() :
+        DefaultLexer("nim", SCLEX_NIM, lexicalClasses, ELEMENTS(lexicalClasses)),
+        setWord(CharacterSet::setAlphaNum, "_", 0x80, true) { }
+
+    virtual ~LexerNim() { }
+
+    void SCI_METHOD Release() noexcept override {
+        delete this;
+    }
+
+    int SCI_METHOD Version() const noexcept override {
+        return lvRelease5;
+    }
+
+    const char * SCI_METHOD PropertyNames() override {
+        return osNim.PropertyNames();
+    }
+
+    int SCI_METHOD PropertyType(const char *name) override {
+        return osNim.PropertyType(name);
+    }
+
+    const char * SCI_METHOD DescribeProperty(const char *name) override {
+        return osNim.DescribeProperty(name);
+    }
+
+    Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+
+	const char * SCI_METHOD PropertyGet(const char* key) override {
+		return osNim.PropertyGet(key);
+	}
+
+    const char * SCI_METHOD DescribeWordListSets() override {
+        return osNim.DescribeWordListSets();
+    }
+
+    Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+
+    void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+    void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+    void * SCI_METHOD PrivateCall(int, void *) noexcept override {
+        return nullptr;
+    }
+
+    int SCI_METHOD LineEndTypesSupported() noexcept override {
+        return SC_LINE_END_TYPE_UNICODE;
+    }
+
+    int SCI_METHOD PrimaryStyleFromStyle(int style) noexcept override {
+        return style;
+    }
+
+    static ILexer5 *LexerFactoryNim() {
+        return new LexerNim();
+    }
+};
+
+Sci_Position SCI_METHOD LexerNim::PropertySet(const char *key, const char *val) {
+    if (osNim.PropertySet(&options, key, val)) {
+        return 0;
+    }
+
+    return -1;
+}
+
+Sci_Position SCI_METHOD LexerNim::WordListSet(int n, const char *wl) {
+    WordList *wordListN = nullptr;
+
+    switch (n) {
+        case 0:
+            wordListN = &keywords;
+            break;
+    }
+
+    Sci_Position firstModification = -1;
+
+    if (wordListN) {
+        WordList wlNew;
+        wlNew.Set(wl);
+
+        if (*wordListN != wlNew) {
+            wordListN->Set(wl);
+            firstModification = 0;
+        }
+    }
+
+    return firstModification;
+}
+
+void SCI_METHOD LexerNim::Lex(Sci_PositionU startPos, Sci_Position length,
+                              int initStyle, IDocument *pAccess) {
+    // No one likes a leaky string
+    if (initStyle == SCE_NIM_STRINGEOL) {
+        initStyle = SCE_NIM_DEFAULT;
+    }
+
+    Accessor styler(pAccess, nullptr);
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    // Nim supports nested block comments!
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int commentNestLevel = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) : 0;
+
+    int numType = NumType::Decimal;
+    int decimalCount = 0;
+
+    bool funcNameExists = false;
+    bool isStylingRawString = false;
+    bool isStylingRawStringIdent = false;
+
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+            if (sc.state == SCE_NIM_STRING) {
+                sc.SetState(SCE_NIM_STRING);
+            }
+
+            lineCurrent = styler.GetLine(sc.currentPos);
+            styler.SetLineState(lineCurrent, commentNestLevel);
+        }
+
+        // Handle string line continuation
+        if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') &&
+           (sc.state == SCE_NIM_STRING || sc.state == SCE_NIM_CHARACTER) && !isStylingRawString) {
+            sc.Forward();
+
+            if (sc.ch == '\r' && sc.chNext == '\n') {
+                sc.Forward();
+            }
+
+            continue;
+        }
+
+        switch (sc.state) {
+            case SCE_NIM_OPERATOR:
+                funcNameExists = false;
+                sc.SetState(SCE_NIM_DEFAULT);
+                break;
+            case SCE_NIM_NUMBER:
+                // For a type suffix, such as 0x80'u8
+                if (sc.ch == '\'') {
+                    if (sc.chNext == 'i' || sc.chNext == 'I' || 
+                        sc.chNext == 'u' || sc.chNext == 'U' ||
+                        sc.chNext == 'f' || sc.chNext == 'F' || 
+                        sc.chNext == 'd' || sc.chNext == 'D') {
+                        sc.Forward(2);
+                    }
+                } else if (sc.ch == '.') {
+                    if (IsADigit(sc.chNext)) {
+                        sc.Forward();
+                    } else if (numType <= NumType::Exponent) {
+                        sc.SetState(SCE_NIM_OPERATOR);
+                        break;
+                    } else {
+                        decimalCount++;
+
+                        if (numType == NumType::Decimal) {
+                            if (decimalCount <= 1 && !IsAWordChar(sc.chNext)) {
+                                break;
+                            }
+                        } else if (numType == NumType::Hexadecimal) {
+                            if (decimalCount <= 1 && IsADigit(sc.chNext, 16)) {
+                                break;
+                            }
+
+                            sc.SetState(SCE_NIM_OPERATOR);
+                            break;
+                        }
+                    }
+                } else if (sc.ch == '_') {
+                    // Accept only one underscore between digits
+                    if (IsADigit(sc.chNext)) {
+                        sc.Forward();
+                    }
+                } else if (numType == NumType::Decimal) {
+                    if (sc.chPrev != '\'' && (sc.ch == 'e' || sc.ch == 'E')) {
+                        numType = NumType::Exponent;
+
+                        if (sc.chNext == '-' || sc.chNext == '+') {
+                            sc.Forward();
+                        }
+
+                        break;
+                    }
+
+                    if (IsADigit(sc.ch)) {
+                        break;
+                    }
+                } else if (numType == NumType::Hexadecimal) {
+                    if (IsADigit(sc.ch, 16)) {
+                        break;
+                    }
+                } else if (IsADigit(sc.ch)) {
+                    if (numType == NumType::Exponent) {
+                        break;
+                    }
+
+                    if (numType == NumType::Octal) {
+                        // Accept only 0-7
+                        if (sc.ch <= '7') {
+                            break;
+                        }
+                    } else if (numType == NumType::Binary) {
+                        // Accept only 0 and 1
+                        if (sc.ch <= '1') {
+                            break;
+                        }
+                    }
+
+                    numType = NumType::FormatError;
+                    break;
+                }
+
+                sc.ChangeState(GetNumStyle(numType));
+                sc.SetState(SCE_NIM_DEFAULT);
+                break;
+            case SCE_NIM_IDENTIFIER:
+                if (sc.ch == '.' || !IsAWordChar(sc.ch)) {
+                    char s[100];
+                    sc.GetCurrent(s, sizeof(s));
+                    int style = SCE_NIM_IDENTIFIER;
+
+                    if (keywords.InList(s) && !funcNameExists) {
+                        // Prevent styling keywords if they are sub-identifiers
+                        const Sci_Position segStart = styler.GetStartSegment() - 1;
+                        if (segStart < 0 || styler.SafeGetCharAt(segStart, '\0') != '.') {
+                            style = SCE_NIM_WORD;
+                        }
+                    } else if (funcNameExists) {
+                        style = SCE_NIM_FUNCNAME;
+                    }
+
+                    sc.ChangeState(style);
+                    sc.SetState(SCE_NIM_DEFAULT);
+
+                    if (style == SCE_NIM_WORD) {
+                        funcNameExists = IsFuncName(s);
+                    } else {
+                        funcNameExists = false;
+                    }
+                }
+
+                if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') {
+                    isStylingRawStringIdent = true;
+
+                    if (options.highlightRawStrIdent) {
+                        if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' &&
+                            styler.SafeGetCharAt(sc.currentPos + 3) == '\"') {
+                            sc.ChangeState(SCE_NIM_TRIPLEDOUBLE);
+                        } else {
+                            sc.ChangeState(SCE_NIM_STRING);
+                        }
+                    }
+
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_FUNCNAME:
+                if (sc.ch == '`') {
+                    funcNameExists = false;
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                } else if (sc.atLineEnd) {
+                    // Prevent leaking the style to the next line if not closed
+                    funcNameExists = false;
+
+                    sc.ChangeState(SCE_NIM_STRINGEOL);
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_COMMENT:
+                if (sc.Match(']', '#')) {
+                    if (commentNestLevel > 0) {
+                        commentNestLevel--;
+                    }
+
+                    lineCurrent = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(lineCurrent, commentNestLevel);
+                    sc.Forward();
+
+                    if (commentNestLevel == 0) {
+                        sc.ForwardSetState(SCE_NIM_DEFAULT);
+                    }
+                } else if (sc.Match('#', '[')) {
+                    commentNestLevel++;
+                    lineCurrent = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(lineCurrent, commentNestLevel);
+                }
+                break;
+            case SCE_NIM_COMMENTDOC:
+                if (sc.Match("]##")) {
+                    if (commentNestLevel > 0) {
+                        commentNestLevel--;
+                    }
+
+                    lineCurrent = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(lineCurrent, commentNestLevel);
+                    sc.Forward(2);
+
+                    if (commentNestLevel == 0) {
+                        sc.ForwardSetState(SCE_NIM_DEFAULT);
+                    }
+                } else if (sc.Match("##[")) {
+                    commentNestLevel++;
+                    lineCurrent = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(lineCurrent, commentNestLevel);
+                }
+                break;
+            case SCE_NIM_COMMENTLINE:
+            case SCE_NIM_COMMENTLINEDOC:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_STRING:
+                if (!isStylingRawStringIdent && !isStylingRawString && sc.ch == '\\') {
+                    if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                } else if (isStylingRawString && sc.ch == '\"' && sc.chNext == '\"') {
+                    // Forward in situations such as r"a""bc\" so that "bc\" wouldn't be
+                    // considered a string of its own
+                    sc.Forward();
+                } else if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                } else if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_NIM_STRINGEOL);
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_CHARACTER:
+                if (sc.ch == '\\') {
+                    if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                } else if (sc.ch == '\'') {
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                } else if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_NIM_STRINGEOL);
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_BACKTICKS:
+                if (sc.ch == '`' ) {
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                } else if (sc.atLineEnd) {
+                    sc.ChangeState(SCE_NIM_STRINGEOL);
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_TRIPLEDOUBLE:
+                if (sc.Match(R"(""")")) {
+
+                    // Outright forward all " after the closing """ as a triple double
+                    //
+                    // A valid example where this is needed is: """8 double quotes->""""""""
+                    // You can have as many """ at the end as you wish, as long as the actual
+                    // closing literal is there
+                    while (sc.ch == '"') {
+                        sc.Forward();
+                    }
+
+                    sc.SetState(SCE_NIM_DEFAULT);
+                }
+                break;
+            case SCE_NIM_TRIPLE:
+                if (sc.Match("'''")) {
+                    sc.Forward(2);
+                    sc.ForwardSetState(SCE_NIM_DEFAULT);
+                }
+                break;
+        }
+
+        if (sc.state == SCE_NIM_DEFAULT) {
+            // Number
+            if (IsADigit(sc.ch)) {
+                sc.SetState(SCE_NIM_NUMBER);
+
+                numType = NumType::Decimal;
+                decimalCount = 0;
+
+                if (sc.ch == '0') {
+                    if (IsNumHex(sc)) {
+                        numType = NumType::Hexadecimal;
+                    } else if (IsNumBinary(sc)) {
+                        numType = NumType::Binary;
+                    } else if (IsNumOctal(sc)) {
+                        numType = NumType::Octal;
+                    }
+
+                    if (numType != NumType::Decimal) {
+                        sc.Forward();
+                    }
+                }
+            }
+            // Raw string
+            else if (IsAlphaNumeric(sc.ch) && sc.chNext == '\"') {
+                isStylingRawString = true;
+
+                // Triple doubles can be raw strings too. How sweet
+                if (styler.SafeGetCharAt(sc.currentPos + 2) == '\"' &&
+                    styler.SafeGetCharAt(sc.currentPos + 3) == '\"') {
+                    sc.SetState(SCE_NIM_TRIPLEDOUBLE);
+                } else {
+                    sc.SetState(SCE_NIM_STRING);
+                }
+
+                const int rawStrStyle = options.highlightRawStrIdent ? IsLetter(sc.ch) :
+                                        (sc.ch == 'r' || sc.ch == 'R');
+
+                if (rawStrStyle) {
+                    sc.Forward();
+
+                    if (sc.state == SCE_NIM_TRIPLEDOUBLE) {
+                        sc.Forward(2);
+                    }
+                } else {
+                    // Anything other than r/R is considered a general raw string identifier
+                    isStylingRawStringIdent = true;
+                    sc.SetState(SCE_NIM_IDENTIFIER);
+                }
+            }
+            // String and triple double literal
+            else if (sc.ch == '\"') {
+                isStylingRawString = false;
+
+                if (sc.Match(R"(""")")) {
+                    sc.SetState(SCE_NIM_TRIPLEDOUBLE);
+                    
+                    // Keep forwarding until the total opening literal count is 5
+                    // A valid example where this is needed is: """""<-5 double quotes"""
+                    while (sc.ch == '"') {
+                        sc.Forward();
+
+                        if (sc.Match(R"(""")")) {
+                            sc.Forward();
+                            break;
+                        }
+                    }
+                } else {
+                    sc.SetState(SCE_NIM_STRING);
+                }
+            }
+            // Charecter and triple literal
+            else if (sc.ch == '\'') {
+                if (sc.Match("'''")) {
+                    sc.SetState(SCE_NIM_TRIPLE);
+                } else {
+                    sc.SetState(SCE_NIM_CHARACTER);
+                }
+            }
+            // Operator definition
+            else if (sc.ch == '`') {
+                if (funcNameExists) {
+                    sc.SetState(SCE_NIM_FUNCNAME);
+                } else {
+                    sc.SetState(SCE_NIM_BACKTICKS);
+                }
+            }
+            // Keyword
+            else if (iswordstart(sc.ch)) {
+                sc.SetState(SCE_NIM_IDENTIFIER);
+            }
+            // Comments
+            else if (sc.ch == '#') {
+                if (sc.Match("##[") || sc.Match("#[")) {
+                    commentNestLevel++;
+                    lineCurrent = styler.GetLine(sc.currentPos);
+                    styler.SetLineState(lineCurrent, commentNestLevel);
+                }
+
+                if (sc.Match("##[")) {
+                    sc.SetState(SCE_NIM_COMMENTDOC);
+                    sc.Forward();
+                } else if (sc.Match("#[")) {
+                    sc.SetState(SCE_NIM_COMMENT);
+                    sc.Forward();
+                } else if (sc.Match("##")) {
+                    sc.SetState(SCE_NIM_COMMENTLINEDOC);
+                } else {
+                    sc.SetState(SCE_NIM_COMMENTLINE);
+                }
+            }
+            // Operators
+            else if (strchr("()[]{}:=;-\\/&%$!+<>|^?,.*~@", sc.ch)) {
+                sc.SetState(SCE_NIM_OPERATOR);
+            }
+        }
+
+        if (sc.atLineEnd) {
+            funcNameExists = false;
+            isStylingRawString = false;
+            isStylingRawStringIdent = false;
+        }
+    }
+
+    sc.Complete();
+}
+
+void SCI_METHOD LexerNim::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess) {
+    if (!options.fold) {
+        return;
+    }
+
+    Accessor styler(pAccess, nullptr);
+
+    const Sci_Position docLines = styler.GetLine(styler.Length());
+    const Sci_Position maxPos = startPos + length;
+    const Sci_Position maxLines = styler.GetLine(maxPos == styler.Length() ? maxPos : maxPos - 1);
+
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int indentCurrent = IndentAmount(lineCurrent, styler);
+
+    while (lineCurrent > 0) {
+        lineCurrent--;
+        indentCurrent = IndentAmount(lineCurrent, styler);
+
+        if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+            break;
+        }
+    }
+
+    int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+    indentCurrent = indentCurrentLevel | (indentCurrent & ~SC_FOLDLEVELNUMBERMASK);
+
+    while (lineCurrent <= docLines && lineCurrent <= maxLines) {
+        Sci_Position lineNext = lineCurrent + 1;
+        int indentNext = indentCurrent;
+        int lev = indentCurrent;
+
+        if (lineNext <= docLines) {
+            indentNext = IndentAmount(lineNext, styler);
+        }
+
+        if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+            indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+        }
+
+        while (lineNext < docLines && (indentNext & SC_FOLDLEVELWHITEFLAG)) {
+            lineNext++;
+            indentNext = IndentAmount(lineNext, styler);
+        }
+
+        const int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK;
+        indentNext = indentNextLevel | (indentNext & ~SC_FOLDLEVELNUMBERMASK);
+
+        const int levelBeforeComments = std::max(indentCurrentLevel, indentNextLevel);
+
+        Sci_Position skipLine = lineNext;
+        int skipLevel = indentNextLevel;
+
+        while (--skipLine > lineCurrent) {
+            const int skipLineIndent = IndentAmount(skipLine, styler);
+
+            if (options.foldCompact) {
+                if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel) {
+                    skipLevel = levelBeforeComments;
+                }
+
+                const int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+                styler.SetLevel(skipLine, skipLevel | whiteFlag);
+            } else {
+                if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel &&
+                   !(skipLineIndent & SC_FOLDLEVELWHITEFLAG)) {
+                    skipLevel = levelBeforeComments;
+                }
+
+                styler.SetLevel(skipLine, skipLevel);
+            }
+        }
+
+        if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+            if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            }
+        }
+
+        styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG);
+
+        indentCurrent = indentNext;
+        indentCurrentLevel = indentNextLevel;
+        lineCurrent = lineNext;
+    }
+}
+
+LexerModule lmNim(SCLEX_NIM, LexerNim::LexerFactoryNim, "nim", nimWordListDesc);
\ No newline at end of file
diff --git a/scite-app/lexilla/lexers/LexNimrod.cxx b/scite-app/lexilla/lexers/LexNimrod.cxx
new file mode 100644
index 0000000..b19a3dd
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexNimrod.cxx
@@ -0,0 +1,434 @@
+// Scintilla source code edit control
+// Nimrod lexer
+// (c) 2009 Andreas Rumpf
+/** @file LexNimrod.cxx
+ ** Lexer for Nimrod.
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(int ch) {
+	return (ch >= 0x80) || isalnum(ch) || ch == '_';
+}
+
+static Sci_Position tillEndOfTripleQuote(Accessor &styler, Sci_Position pos, Sci_Position max) {
+  /* search for """ */
+  for (;;) {
+    if (styler.SafeGetCharAt(pos, '\0') == '\0') return pos;
+    if (pos >= max) return pos;
+    if (styler.Match(pos, "\"\"\"")) {
+      return pos + 2;
+    }
+    pos++;
+  }
+}
+
+#define CR 13 /* use both because Scite allows changing the line ending */
+#define LF 10
+
+static bool inline isNewLine(int ch) {
+  return ch == CR || ch == LF;
+}
+
+static Sci_Position scanString(Accessor &styler, Sci_Position pos, Sci_Position max, bool rawMode) {
+  for (;;) {
+    if (pos >= max) return pos;
+    char ch = styler.SafeGetCharAt(pos, '\0');
+    if (ch == CR || ch == LF || ch == '\0') return pos;
+    if (ch == '"') return pos;
+    if (ch == '\\' && !rawMode) {
+      pos += 2;
+    } else {
+      pos++;
+    }
+  }
+}
+
+static Sci_Position scanChar(Accessor &styler, Sci_Position pos, Sci_Position max) {
+  for (;;) {
+    if (pos >= max) return pos;
+    char ch = styler.SafeGetCharAt(pos, '\0');
+    if (ch == CR || ch == LF || ch == '\0') return pos;
+    if (ch == '\'' && !isalnum(styler.SafeGetCharAt(pos+1, '\0')) )
+      return pos;
+    if (ch == '\\') {
+      pos += 2;
+    } else {
+      pos++;
+    }
+  }
+}
+
+static Sci_Position scanIdent(Accessor &styler, Sci_Position pos, WordList &keywords) {
+  char buf[100]; /* copy to lowercase and ignore underscores */
+  Sci_Position i = 0;
+
+  for (;;) {
+    char ch = styler.SafeGetCharAt(pos, '\0');
+    if (!IsAWordChar(ch)) break;
+    if (ch != '_' && i < ((int)sizeof(buf))-1) {
+      buf[i] = static_cast<char>(tolower(ch));
+      i++;
+    }
+    pos++;
+  }
+  buf[i] = '\0';
+  /* look for keyword */
+  if (keywords.InList(buf)) {
+    styler.ColourTo(pos-1, SCE_P_WORD);
+  } else {
+    styler.ColourTo(pos-1, SCE_P_IDENTIFIER);
+  }
+  return pos;
+}
+
+static Sci_Position scanNumber(Accessor &styler, Sci_Position pos) {
+  char ch, ch2;
+  ch = styler.SafeGetCharAt(pos, '\0');
+  ch2 = styler.SafeGetCharAt(pos+1, '\0');
+  if (ch == '0' && (ch2 == 'b' || ch2 == 'B')) {
+    /* binary number: */
+    pos += 2;
+    for (;;) {
+      ch = styler.SafeGetCharAt(pos, '\0');
+      if (ch == '_' || (ch >= '0' && ch <= '1')) ++pos;
+      else break;
+    }
+  } else if (ch == '0' &&
+            (ch2 == 'o' || ch2 == 'O' || ch2 == 'c' || ch2 == 'C')) {
+    /* octal number: */
+    pos += 2;
+    for (;;) {
+      ch = styler.SafeGetCharAt(pos, '\0');
+      if (ch == '_' || (ch >= '0' && ch <= '7')) ++pos;
+      else break;
+    }
+  } else if (ch == '0' && (ch2 == 'x' || ch2 == 'X')) {
+    /* hexadecimal number: */
+    pos += 2;
+    for (;;) {
+      ch = styler.SafeGetCharAt(pos, '\0');
+      if (ch == '_' || (ch >= '0' && ch <= '9')
+          || (ch >= 'a' && ch <= 'f')
+          || (ch >= 'A' && ch <= 'F')) ++pos;
+      else break;
+    }
+  } else {
+    // skip decimal part:
+    for (;;) {
+      ch = styler.SafeGetCharAt(pos, '\0');
+      if (ch == '_' || (ch >= '0' && ch <= '9')) ++pos;
+      else break;
+    }
+    ch2 = styler.SafeGetCharAt(pos+1, '\0');
+    if (ch == '.' && ch2 >= '0' && ch2 <= '9') {
+      ++pos; // skip '.'
+      for (;;) {
+        ch = styler.SafeGetCharAt(pos, '\0');
+        if (ch == '_' || (ch >= '0' && ch <= '9')) ++pos;
+        else break;
+      }
+    }
+    if (ch == 'e' || ch == 'E') {
+      ++pos;
+      ch = styler.SafeGetCharAt(pos, '\0');
+      if (ch == '-' || ch == '+') ++pos;
+      for (;;) {
+        ch = styler.SafeGetCharAt(pos, '\0');
+        if (ch == '_' || (ch >= '0' && ch <= '9')) ++pos;
+        else break;
+      }
+    }
+  }
+  if (ch == '\'') {
+    /* a type suffix: */
+    pos++;
+    for (;;) {
+      ch = styler.SafeGetCharAt(pos);
+      if ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z')
+         || (ch >= 'a' && ch <= 'z') || ch == '_') ++pos;
+      else break;
+    }
+  }
+  styler.ColourTo(pos-1, SCE_P_NUMBER);
+  return pos;
+}
+
+/* rewritten from scratch, because I couldn't get rid of the bugs...
+   (A character based approach sucks!)
+*/
+static void ColouriseNimrodDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                                WordList *keywordlists[], Accessor &styler) {
+  Sci_Position pos = startPos;
+  Sci_Position max = startPos + length;
+  char ch;
+  WordList &keywords = *keywordlists[0];
+
+  styler.StartAt(startPos);
+  styler.StartSegment(startPos);
+
+  switch (initStyle) {
+    /* check where we are: */
+    case SCE_P_TRIPLEDOUBLE:
+      pos = tillEndOfTripleQuote(styler, pos, max);
+      styler.ColourTo(pos, SCE_P_TRIPLEDOUBLE);
+      pos++;
+    break;
+    default: /* nothing to do: */
+    break;
+  }
+  while (pos < max) {
+    ch = styler.SafeGetCharAt(pos, '\0');
+    switch (ch) {
+      case '\0': return;
+      case '#': {
+        bool doccomment = (styler.SafeGetCharAt(pos+1) == '#');
+        while (pos < max && !isNewLine(styler.SafeGetCharAt(pos, LF))) pos++;
+        if (doccomment)
+          styler.ColourTo(pos, SCE_C_COMMENTLINEDOC);
+        else
+          styler.ColourTo(pos, SCE_P_COMMENTLINE);
+      } break;
+      case 'r': case 'R': {
+        if (styler.SafeGetCharAt(pos+1) == '"') {
+          pos = scanString(styler, pos+2, max, true);
+          styler.ColourTo(pos, SCE_P_STRING);
+          pos++;
+        } else {
+          pos = scanIdent(styler, pos, keywords);
+        }
+      } break;
+      case '"':
+        if (styler.Match(pos+1, "\"\"")) {
+          pos = tillEndOfTripleQuote(styler, pos+3, max);
+          styler.ColourTo(pos, SCE_P_TRIPLEDOUBLE);
+        } else {
+          pos = scanString(styler, pos+1, max, false);
+          styler.ColourTo(pos, SCE_P_STRING);
+        }
+        pos++;
+      break;
+      case '\'':
+        pos = scanChar(styler, pos+1, max);
+        styler.ColourTo(pos, SCE_P_CHARACTER);
+        pos++;
+      break;
+      default: // identifers, numbers, operators, whitespace
+        if (ch >= '0' && ch <= '9') {
+          pos = scanNumber(styler, pos);
+        } else if (IsAWordChar(ch)) {
+          pos = scanIdent(styler, pos, keywords);
+        } else if (ch == '`') {
+          pos++;
+          while (pos < max) {
+            ch = styler.SafeGetCharAt(pos, LF);
+            if (ch == '`') {
+              ++pos;
+              break;
+            }
+            if (ch == CR || ch == LF) break;
+            ++pos;
+          }
+          styler.ColourTo(pos, SCE_P_IDENTIFIER);
+        } else if (strchr("()[]{}:=;-\\/&%$!+<>|^?,.*~@", ch)) {
+          styler.ColourTo(pos, SCE_P_OPERATOR);
+          pos++;
+        } else {
+          styler.ColourTo(pos, SCE_P_DEFAULT);
+          pos++;
+        }
+      break;
+    }
+  }
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+static bool IsQuoteLine(Sci_Position line, Accessor &styler) {
+	int style = styler.StyleAt(styler.LineStart(line)) & 31;
+	return ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
+}
+
+
+static void FoldNimrodDoc(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
+	const Sci_Position docLines = styler.GetLine(styler.Length() - 1); // Available last line
+	const bool foldComment = styler.GetPropertyInt("fold.comment.nimrod") != 0;
+	const bool foldQuotes = styler.GetPropertyInt("fold.quotes.nimrod") != 0;
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines (needed esp. within triple quoted strings)
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
+		        (!IsCommentLine(lineCurrent, styler)) &&
+		        (!IsQuoteLine(lineCurrent, styler)))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	startPos = styler.LineStart(lineCurrent);
+	int prev_state = SCE_P_DEFAULT & 31;
+	if (lineCurrent >= 1)
+		prev_state = styler.StyleAt(startPos - 1) & 31;
+	int prevQuote = foldQuotes && ((prev_state == SCE_P_TRIPLE) ||
+	                               (prev_state == SCE_P_TRIPLEDOUBLE));
+	int prevComment = 0;
+	if (lineCurrent >= 1)
+		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
+
+	// Process all characters to end of requested range or end of any triple quote
+	// or comment that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed quote or comment at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) ||
+	                                      prevQuote || prevComment)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		Sci_Position lineNext = lineCurrent + 1;
+		int indentNext = indentCurrent;
+		int quote = false;
+		if (lineNext <= docLines) {
+			// Information about next line is only available if not at end of document
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+			int style = styler.StyleAt(styler.LineStart(lineNext)) & 31;
+			quote = foldQuotes && ((style == SCE_P_TRIPLE) || (style == SCE_P_TRIPLEDOUBLE));
+		}
+		const int quote_start = (quote && !prevQuote);
+		const int quote_continue = (quote && prevQuote);
+		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
+		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
+		                           IsCommentLine(lineNext, styler) &&
+		                           (lev > SC_FOLDLEVELBASE));
+		const int comment_continue = (comment && prevComment);
+		if ((!quote || !prevQuote) && !comment)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (quote)
+			indentNext = indentCurrentLevel;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (quote_start) {
+			// Place fold point at start of triple quoted string
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (quote_continue || prevQuote) {
+			// Add level to rest of lines in the string
+			lev = lev + 1;
+		} else if (comment_start) {
+			// Place fold point at start of a block of comments
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (comment_continue) {
+			// Add level to rest of lines in the block
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.
+
+		while (!quote &&
+		        (lineNext < docLines) &&
+		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+		}
+
+		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
+		const int levelBeforeComments =
+		    Maximum(indentCurrentLevel,levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		Sci_Position skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+
+			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+				skipLevel = levelBeforeComments;
+
+			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+			styler.SetLevel(skipLine, skipLevel | whiteFlag);
+		}
+
+		// Set fold header on non-quote/non-comment line
+		if (!quote && !comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) <
+			     (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of triple quote and block comment state of previous line
+		prevQuote = quote;
+		prevComment = comment_start || comment_continue;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, lev);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+
+	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
+	// header flag set; the loop above is crafted to take care of this case!
+	//styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+static const char * const nimrodWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmNimrod(SCLEX_NIMROD, ColouriseNimrodDoc, "nimrod", FoldNimrodDoc,
+				     nimrodWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexNsis.cxx b/scite-app/lexilla/lexers/LexNsis.cxx
new file mode 100644
index 0000000..e9fa5fd
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexNsis.cxx
@@ -0,0 +1,663 @@
+// Scintilla source code edit control
+/** @file LexNsis.cxx
+ ** Lexer for NSIS
+ **/
+// Copyright 2003 - 2005 by Angelo Mandato <angelo [at] spaceblue [dot] com>
+// Last Updated: 03/13/2005
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+/*
+// located in SciLexer.h
+#define SCLEX_NSIS 43
+
+#define SCE_NSIS_DEFAULT 0
+#define SCE_NSIS_COMMENT 1
+#define SCE_NSIS_STRINGDQ 2
+#define SCE_NSIS_STRINGLQ 3
+#define SCE_NSIS_STRINGRQ 4
+#define SCE_NSIS_FUNCTION 5
+#define SCE_NSIS_VARIABLE 6
+#define SCE_NSIS_LABEL 7
+#define SCE_NSIS_USERDEFINED 8
+#define SCE_NSIS_SECTIONDEF 9
+#define SCE_NSIS_SUBSECTIONDEF 10
+#define SCE_NSIS_IFDEFINEDEF 11
+#define SCE_NSIS_MACRODEF 12
+#define SCE_NSIS_STRINGVAR 13
+#define SCE_NSIS_NUMBER 14
+// ADDED for Scintilla v1.63
+#define SCE_NSIS_SECTIONGROUP 15
+#define SCE_NSIS_PAGEEX 16
+#define SCE_NSIS_FUNCTIONDEF 17
+#define SCE_NSIS_COMMENTBOX 18
+*/
+
+static bool isNsisNumber(char ch)
+{
+  return (ch >= '0' && ch <= '9');
+}
+
+static bool isNsisChar(char ch)
+{
+  return (ch == '.' ) || (ch == '_' ) || isNsisNumber(ch) || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool isNsisLetter(char ch)
+{
+  return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
+}
+
+static bool NsisNextLineHasElse(Sci_PositionU start, Sci_PositionU end, Accessor &styler)
+{
+  Sci_Position nNextLine = -1;
+  for( Sci_PositionU i = start; i < end; i++ )
+  {
+    char cNext = styler.SafeGetCharAt( i );
+    if( cNext == '\n' )
+    {
+      nNextLine = i+1;
+      break;
+    }
+  }
+
+  if( nNextLine == -1 ) // We never found the next line...
+    return false;
+
+  for( Sci_PositionU firstChar = nNextLine; firstChar < end; firstChar++ )
+  {
+    char cNext = styler.SafeGetCharAt( firstChar );
+    if( cNext == ' ' )
+      continue;
+    if( cNext == '\t' )
+      continue;
+    if( cNext == '!' )
+    {
+      if( styler.Match(firstChar, "!else") )
+        return true;
+    }
+    break;
+  }
+
+  return false;
+}
+
+static int NsisCmp( const char *s1, const char *s2, bool bIgnoreCase )
+{
+  if( bIgnoreCase )
+     return CompareCaseInsensitive( s1, s2);
+
+  return strcmp( s1, s2 );
+}
+
+static int calculateFoldNsis(Sci_PositionU start, Sci_PositionU end, int foldlevel, Accessor &styler, bool bElse, bool foldUtilityCmd )
+{
+  int style = styler.StyleAt(end);
+
+  // If the word is too long, it is not what we are looking for
+  if( end - start > 20 )
+    return foldlevel;
+
+  if( foldUtilityCmd )
+  {
+    // Check the style at this point, if it is not valid, then return zero
+    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
+        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_IFDEFINEDEF &&
+        style != SCE_NSIS_MACRODEF && style != SCE_NSIS_SECTIONGROUP &&
+        style != SCE_NSIS_PAGEEX )
+          return foldlevel;
+  }
+  else
+  {
+    if( style != SCE_NSIS_FUNCTIONDEF && style != SCE_NSIS_SECTIONDEF &&
+        style != SCE_NSIS_SUBSECTIONDEF && style != SCE_NSIS_SECTIONGROUP &&
+        style != SCE_NSIS_PAGEEX )
+          return foldlevel;
+  }
+
+  int newFoldlevel = foldlevel;
+  bool bIgnoreCase = false;
+  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
+    bIgnoreCase = true;
+
+  char s[20]; // The key word we are looking for has atmost 13 characters
+  s[0] = '\0';
+  for (Sci_PositionU i = 0; i < end - start + 1 && i < 19; i++)
+	{
+		s[i] = static_cast<char>( styler[ start + i ] );
+		s[i + 1] = '\0';
+	}
+
+  if( s[0] == '!' )
+  {
+    if( NsisCmp(s, "!ifndef", bIgnoreCase) == 0 || NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrodef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrondef", bIgnoreCase ) == 0 || NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!macro", bIgnoreCase ) == 0 )
+      newFoldlevel++;
+    else if( NsisCmp(s, "!endif", bIgnoreCase) == 0 || NsisCmp(s, "!macroend", bIgnoreCase ) == 0 )
+      newFoldlevel--;
+    else if( bElse && NsisCmp(s, "!else", bIgnoreCase) == 0 )
+      newFoldlevel++;
+  }
+  else
+  {
+    if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionGroup", bIgnoreCase ) == 0 || NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "SubSection", bIgnoreCase ) == 0 || NsisCmp(s, "PageEx", bIgnoreCase ) == 0 )
+      newFoldlevel++;
+    else if( NsisCmp(s, "SectionGroupEnd", bIgnoreCase ) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase ) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase ) == 0 )
+      newFoldlevel--;
+  }
+
+  return newFoldlevel;
+}
+
+static int classifyWordNsis(Sci_PositionU start, Sci_PositionU end, WordList *keywordLists[], Accessor &styler )
+{
+  bool bIgnoreCase = false;
+  if( styler.GetPropertyInt("nsis.ignorecase") == 1 )
+    bIgnoreCase = true;
+
+  bool bUserVars = false;
+  if( styler.GetPropertyInt("nsis.uservars") == 1 )
+    bUserVars = true;
+
+	char s[100];
+	s[0] = '\0';
+	s[1] = '\0';
+
+	WordList &Functions = *keywordLists[0];
+	WordList &Variables = *keywordLists[1];
+	WordList &Lables = *keywordLists[2];
+	WordList &UserDefined = *keywordLists[3];
+
+	for (Sci_PositionU i = 0; i < end - start + 1 && i < 99; i++)
+	{
+    if( bIgnoreCase )
+      s[i] = static_cast<char>( tolower(styler[ start + i ] ) );
+    else
+		  s[i] = static_cast<char>( styler[ start + i ] );
+		s[i + 1] = '\0';
+	}
+
+	// Check for special words...
+	if( NsisCmp(s, "!macro", bIgnoreCase ) == 0 || NsisCmp(s, "!macroend", bIgnoreCase) == 0 ) // Covers !macro and !macroend
+		return SCE_NSIS_MACRODEF;
+
+	if( NsisCmp(s, "!ifdef", bIgnoreCase ) == 0 ||  NsisCmp(s, "!ifndef", bIgnoreCase) == 0 ||  NsisCmp(s, "!endif", bIgnoreCase) == 0 ) // Covers !ifdef, !ifndef and !endif
+		return SCE_NSIS_IFDEFINEDEF;
+
+	if( NsisCmp(s, "!if", bIgnoreCase ) == 0 || NsisCmp(s, "!else", bIgnoreCase )  == 0 ) // Covers !if and else
+		return SCE_NSIS_IFDEFINEDEF;
+
+	if (NsisCmp(s, "!ifmacrodef", bIgnoreCase ) == 0 || NsisCmp(s, "!ifmacrondef", bIgnoreCase )  == 0 ) // Covers !ifmacrodef and !ifnmacrodef
+		return SCE_NSIS_IFDEFINEDEF;
+
+  if( NsisCmp(s, "SectionGroup", bIgnoreCase) == 0 || NsisCmp(s, "SectionGroupEnd", bIgnoreCase) == 0 ) // Covers SectionGroup and SectionGroupEnd
+    return SCE_NSIS_SECTIONGROUP;
+
+	if( NsisCmp(s, "Section", bIgnoreCase ) == 0 || NsisCmp(s, "SectionEnd", bIgnoreCase) == 0 ) // Covers Section and SectionEnd
+		return SCE_NSIS_SECTIONDEF;
+
+	if( NsisCmp(s, "SubSection", bIgnoreCase) == 0 || NsisCmp(s, "SubSectionEnd", bIgnoreCase) == 0 ) // Covers SubSection and SubSectionEnd
+		return SCE_NSIS_SUBSECTIONDEF;
+
+  if( NsisCmp(s, "PageEx", bIgnoreCase) == 0 || NsisCmp(s, "PageExEnd", bIgnoreCase) == 0 ) // Covers PageEx and PageExEnd
+    return SCE_NSIS_PAGEEX;
+
+	if( NsisCmp(s, "Function", bIgnoreCase) == 0 || NsisCmp(s, "FunctionEnd", bIgnoreCase) == 0 ) // Covers Function and FunctionEnd
+		return SCE_NSIS_FUNCTIONDEF;
+
+	if ( Functions.InList(s) )
+		return SCE_NSIS_FUNCTION;
+
+	if ( Variables.InList(s) )
+		return SCE_NSIS_VARIABLE;
+
+	if ( Lables.InList(s) )
+		return SCE_NSIS_LABEL;
+
+	if( UserDefined.InList(s) )
+		return SCE_NSIS_USERDEFINED;
+
+	if( strlen(s) > 3 )
+	{
+		if( s[1] == '{' && s[strlen(s)-1] == '}' )
+			return SCE_NSIS_VARIABLE;
+	}
+
+  // See if the variable is a user defined variable
+  if( s[0] == '$' && bUserVars )
+  {
+    bool bHasSimpleNsisChars = true;
+    for (Sci_PositionU j = 1; j < end - start + 1 && j < 99; j++)
+	  {
+      if( !isNsisChar( s[j] ) )
+      {
+        bHasSimpleNsisChars = false;
+        break;
+      }
+	  }
+
+    if( bHasSimpleNsisChars )
+      return SCE_NSIS_VARIABLE;
+  }
+
+  // To check for numbers
+  if( isNsisNumber( s[0] ) )
+  {
+    bool bHasSimpleNsisNumber = true;
+    for (Sci_PositionU j = 1; j < end - start + 1 && j < 99; j++)
+	  {
+      if( !isNsisNumber( s[j] ) )
+      {
+        bHasSimpleNsisNumber = false;
+        break;
+      }
+	  }
+
+    if( bHasSimpleNsisNumber )
+      return SCE_NSIS_NUMBER;
+  }
+
+	return SCE_NSIS_DEFAULT;
+}
+
+static void ColouriseNsisDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler)
+{
+	int state = SCE_NSIS_DEFAULT;
+  if( startPos > 0 )
+    state = styler.StyleAt(startPos-1); // Use the style from the previous line, usually default, but could be commentbox
+
+	styler.StartAt( startPos );
+	styler.GetLine( startPos );
+
+	Sci_PositionU nLengthDoc = startPos + length;
+	styler.StartSegment( startPos );
+
+	char cCurrChar;
+	bool bVarInString = false;
+  bool bClassicVarInString = false;
+
+	Sci_PositionU i;
+	for( i = startPos; i < nLengthDoc; i++ )
+	{
+		cCurrChar = styler.SafeGetCharAt( i );
+		char cNextChar = styler.SafeGetCharAt(i+1);
+
+		switch(state)
+		{
+			case SCE_NSIS_DEFAULT:
+				if( cCurrChar == ';' || cCurrChar == '#' ) // we have a comment line
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_COMMENT;
+					break;
+				}
+				if( cCurrChar == '"' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGDQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+				if( cCurrChar == '\'' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGRQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+				if( cCurrChar == '`' )
+				{
+					styler.ColourTo(i-1, state );
+					state = SCE_NSIS_STRINGLQ;
+					bVarInString = false;
+          bClassicVarInString = false;
+					break;
+				}
+
+				// NSIS KeyWord,Function, Variable, UserDefined:
+				if( cCurrChar == '$' || isNsisChar(cCurrChar) || cCurrChar == '!' )
+				{
+					styler.ColourTo(i-1,state);
+				  state = SCE_NSIS_FUNCTION;
+
+          // If it is a number, we must check and set style here first...
+          if( isNsisNumber(cCurrChar) && (cNextChar == '\t' || cNextChar == ' ' || cNextChar == '\r' || cNextChar == '\n' ) )
+              styler.ColourTo( i, SCE_NSIS_NUMBER);
+
+					break;
+				}
+
+        if( cCurrChar == '/' && cNextChar == '*' )
+        {
+          styler.ColourTo(i-1,state);
+          state = SCE_NSIS_COMMENTBOX;
+          break;
+        }
+
+				break;
+			case SCE_NSIS_COMMENT:
+				if( cNextChar == '\n' || cNextChar == '\r' )
+        {
+          // Special case:
+          if( cCurrChar == '\\' )
+          {
+            styler.ColourTo(i-2,state);
+            styler.ColourTo(i,SCE_NSIS_DEFAULT);
+          }
+          else
+          {
+				    styler.ColourTo(i,state);
+            state = SCE_NSIS_DEFAULT;
+          }
+        }
+				break;
+			case SCE_NSIS_STRINGDQ:
+      case SCE_NSIS_STRINGLQ:
+      case SCE_NSIS_STRINGRQ:
+
+        if( styler.SafeGetCharAt(i-1) == '\\' && styler.SafeGetCharAt(i-2) == '$' )
+          break; // Ignore the next character, even if it is a quote of some sort
+
+        if( cCurrChar == '"' && state == SCE_NSIS_STRINGDQ )
+				{
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cCurrChar == '`' && state == SCE_NSIS_STRINGLQ )
+        {
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cCurrChar == '\'' && state == SCE_NSIS_STRINGRQ )
+				{
+					styler.ColourTo(i,state);
+				  state = SCE_NSIS_DEFAULT;
+          break;
+				}
+
+        if( cNextChar == '\r' || cNextChar == '\n' )
+        {
+          Sci_Position nCurLine = styler.GetLine(i+1);
+          Sci_Position nBack = i;
+          // We need to check if the previous line has a \ in it...
+          bool bNextLine = false;
+
+          while( nBack > 0 )
+          {
+            if( styler.GetLine(nBack) != nCurLine )
+              break;
+
+            char cTemp = styler.SafeGetCharAt(nBack, 'a'); // Letter 'a' is safe here
+
+            if( cTemp == '\\' )
+            {
+              bNextLine = true;
+              break;
+            }
+            if( cTemp != '\r' && cTemp != '\n' && cTemp != '\t' && cTemp != ' ' )
+              break;
+
+            nBack--;
+          }
+
+          if( bNextLine )
+          {
+            styler.ColourTo(i+1,state);
+          }
+          if( bNextLine == false )
+          {
+            styler.ColourTo(i,state);
+				    state = SCE_NSIS_DEFAULT;
+          }
+        }
+				break;
+
+			case SCE_NSIS_FUNCTION:
+
+				// NSIS KeyWord:
+        if( cCurrChar == '$' )
+          state = SCE_NSIS_DEFAULT;
+        else if( cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' ) )
+          state = SCE_NSIS_DEFAULT;
+				else if( (isNsisChar(cCurrChar) && !isNsisChar( cNextChar) && cNextChar != '}') || cCurrChar == '}' )
+				{
+					state = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler );
+					styler.ColourTo( i, state);
+					state = SCE_NSIS_DEFAULT;
+				}
+				else if( !isNsisChar( cCurrChar ) && cCurrChar != '{' && cCurrChar != '}' )
+				{
+          if( classifyWordNsis( styler.GetStartSegment(), i-1, keywordLists, styler) == SCE_NSIS_NUMBER )
+             styler.ColourTo( i-1, SCE_NSIS_NUMBER );
+
+					state = SCE_NSIS_DEFAULT;
+
+					if( cCurrChar == '"' )
+					{
+						state = SCE_NSIS_STRINGDQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '`' )
+					{
+						state = SCE_NSIS_STRINGLQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '\'' )
+					{
+						state = SCE_NSIS_STRINGRQ;
+						bVarInString = false;
+            bClassicVarInString = false;
+					}
+					else if( cCurrChar == '#' || cCurrChar == ';' )
+          {
+						state = SCE_NSIS_COMMENT;
+          }
+				}
+				break;
+      case SCE_NSIS_COMMENTBOX:
+
+        if( styler.SafeGetCharAt(i-1) == '*' && cCurrChar == '/' )
+        {
+          styler.ColourTo(i,state);
+          state = SCE_NSIS_DEFAULT;
+        }
+        break;
+		}
+
+		if( state == SCE_NSIS_COMMENT || state == SCE_NSIS_COMMENTBOX )
+		{
+			styler.ColourTo(i,state);
+		}
+		else if( state == SCE_NSIS_STRINGDQ || state == SCE_NSIS_STRINGLQ || state == SCE_NSIS_STRINGRQ )
+		{
+      bool bIngoreNextDollarSign = false;
+      bool bUserVars = false;
+      if( styler.GetPropertyInt("nsis.uservars") == 1 )
+        bUserVars = true;
+
+      if( bVarInString && cCurrChar == '$' )
+      {
+        bVarInString = false;
+        bIngoreNextDollarSign = true;
+      }
+      else if( bVarInString && cCurrChar == '\\' && (cNextChar == 'n' || cNextChar == 'r' || cNextChar == 't' || cNextChar == '"' || cNextChar == '`' || cNextChar == '\'' ) )
+      {
+        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
+        bVarInString = false;
+        bIngoreNextDollarSign = false;
+      }
+
+      // Covers "$INSTDIR and user vars like $MYVAR"
+      else if( bVarInString && !isNsisChar(cNextChar) )
+      {
+        int nWordState = classifyWordNsis( styler.GetStartSegment(), i, keywordLists, styler);
+				if( nWordState == SCE_NSIS_VARIABLE )
+					styler.ColourTo( i, SCE_NSIS_STRINGVAR);
+        else if( bUserVars )
+          styler.ColourTo( i, SCE_NSIS_STRINGVAR);
+        bVarInString = false;
+      }
+      // Covers "${TEST}..."
+      else if( bClassicVarInString && cNextChar == '}' )
+      {
+        styler.ColourTo( i+1, SCE_NSIS_STRINGVAR);
+				bClassicVarInString = false;
+      }
+
+      // Start of var in string
+			if( !bIngoreNextDollarSign && cCurrChar == '$' && cNextChar == '{' )
+			{
+				styler.ColourTo( i-1, state);
+				bClassicVarInString = true;
+        bVarInString = false;
+			}
+      else if( !bIngoreNextDollarSign && cCurrChar == '$' )
+      {
+        styler.ColourTo( i-1, state);
+        bVarInString = true;
+        bClassicVarInString = false;
+      }
+		}
+	}
+
+  // Colourise remaining document
+	styler.ColourTo(nLengthDoc-1,state);
+}
+
+static void FoldNsisDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	// No folding enabled, no reason to continue...
+	if( styler.GetPropertyInt("fold") == 0 )
+		return;
+
+  bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) == 1;
+  bool foldUtilityCmd = styler.GetPropertyInt("nsis.foldutilcmd", 1) == 1;
+  bool blockComment = false;
+
+  Sci_Position lineCurrent = styler.GetLine(startPos);
+  Sci_PositionU safeStartPos = styler.LineStart( lineCurrent );
+
+  bool bArg1 = true;
+  Sci_Position nWordStart = -1;
+
+  int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+  int style = styler.StyleAt(safeStartPos);
+  if( style == SCE_NSIS_COMMENTBOX )
+  {
+    if( styler.SafeGetCharAt(safeStartPos) == '/' && styler.SafeGetCharAt(safeStartPos+1) == '*' )
+      levelNext++;
+    blockComment = true;
+  }
+
+  for (Sci_PositionU i = safeStartPos; i < startPos + length; i++)
+	{
+    char chCurr = styler.SafeGetCharAt(i);
+    style = styler.StyleAt(i);
+    if( blockComment && style != SCE_NSIS_COMMENTBOX )
+    {
+      levelNext--;
+      blockComment = false;
+    }
+    else if( !blockComment && style == SCE_NSIS_COMMENTBOX )
+    {
+      levelNext++;
+      blockComment = true;
+    }
+
+    if( bArg1 && !blockComment)
+    {
+      if( nWordStart == -1 && (isNsisLetter(chCurr) || chCurr == '!') )
+      {
+        nWordStart = i;
+      }
+      else if( isNsisLetter(chCurr) == false && nWordStart > -1 )
+      {
+        int newLevel = calculateFoldNsis( nWordStart, i-1, levelNext, styler, foldAtElse, foldUtilityCmd );
+
+        if( newLevel == levelNext )
+        {
+          if( foldAtElse && foldUtilityCmd )
+          {
+            if( NsisNextLineHasElse(i, startPos + length, styler) )
+              levelNext--;
+          }
+        }
+        else
+          levelNext = newLevel;
+        bArg1 = false;
+      }
+    }
+
+    if( chCurr == '\n' )
+    {
+      if( bArg1 && foldAtElse && foldUtilityCmd && !blockComment )
+      {
+        if( NsisNextLineHasElse(i, startPos + length, styler) )
+          levelNext--;
+      }
+
+      // If we are on a new line...
+      int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+      if (levelUse < levelNext )
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			levelCurrent = levelNext;
+      bArg1 = true; // New line, lets look at first argument again
+      nWordStart = -1;
+    }
+  }
+
+	int levelUse = levelCurrent;
+	int lev = levelUse | levelNext << 16;
+	if (levelUse < levelNext)
+		lev |= SC_FOLDLEVELHEADERFLAG;
+	if (lev != styler.LevelAt(lineCurrent))
+		styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const nsisWordLists[] = {
+	"Functions",
+	"Variables",
+	"Lables",
+	"UserDefined",
+	0, };
+
+
+LexerModule lmNsis(SCLEX_NSIS, ColouriseNsisDoc, "nsis", FoldNsisDoc, nsisWordLists);
+
diff --git a/scite-app/lexilla/lexers/LexNull.cxx b/scite-app/lexilla/lexers/LexNull.cxx
new file mode 100644
index 0000000..92f12c1
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexNull.cxx
@@ -0,0 +1,41 @@
+// Scintilla source code edit control
+/** @file LexNull.cxx
+ ** Lexer for no language. Used for plain text and unrecognized files.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseNullDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                            Accessor &styler) {
+	// Null language means all style bytes are 0 so just mark the end - no need to fill in.
+	if (length > 0) {
+		styler.StartAt(startPos + length - 1);
+		styler.StartSegment(startPos + length - 1);
+		styler.ColourTo(startPos + length - 1, 0);
+	}
+}
+
+LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null");
diff --git a/scite-app/lexilla/lexers/LexOScript.cxx b/scite-app/lexilla/lexers/LexOScript.cxx
new file mode 100644
index 0000000..b97d787
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexOScript.cxx
@@ -0,0 +1,549 @@
+// Scintilla source code edit control
+/** @file LexOScript.cxx
+ ** Lexer for OScript sources; ocx files and/or OSpace dumps.
+ ** OScript is a programming language used to develop applications for the
+ ** Livelink server platform.
+ **/
+// Written by Ferdinand Prantl <prantlf@gmail.com>, inspired by the code from
+// LexVB.cxx and LexPascal.cxx. 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// -----------------------------------------
+// Functions classifying a single character.
+
+// This function is generic and should be probably moved to CharSet.h where
+// IsAlphaNumeric the others reside.
+inline bool IsAlpha(int ch) {
+	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
+}
+
+static inline bool IsIdentifierChar(int ch) {
+	// Identifiers cannot contain non-ASCII letters; a word with non-English
+	// language-specific characters cannot be an identifier.
+	return IsAlphaNumeric(ch) || ch == '_';
+}
+
+static inline bool IsIdentifierStart(int ch) {
+	// Identifiers cannot contain non-ASCII letters; a word with non-English
+	// language-specific characters cannot be an identifier.
+	return IsAlpha(ch) || ch == '_';
+}
+
+static inline bool IsNumberChar(int ch, int chNext) {
+	// Numeric constructs are not checked for lexical correctness. They are
+	// expected to look like +1.23-E9 but actually any bunch of the following
+	// characters will be styled as number.
+	// KNOWN PROBLEM: if you put + or - operators immediately after a number
+	// and the next operand starts with the letter E, the operator will not be
+	// recognized and it will be styled together with the preceding number.
+	// This should not occur; at least not often. The coding style recommends
+	// putting spaces around operators.
+	return IsADigit(ch) || toupper(ch) == 'E' || ch == '.' ||
+		   ((ch == '-' || ch == '+') && toupper(chNext) == 'E');
+}
+
+// This function checks for the start or a natural number without any symbols
+// or operators as a prefix; the IsPrefixedNumberStart should be called
+// immediately after this one to cover all possible numeric constructs.
+static inline bool IsNaturalNumberStart(int ch) {
+	return IsADigit(ch) != 0;
+}
+
+static inline bool IsPrefixedNumberStart(int ch, int chNext) {
+	// KNOWN PROBLEM: if you put + or - operators immediately before a number
+	// the operator will not be recognized and it will be styled together with
+	// the succeeding number. This should not occur; at least not often. The
+	// coding style recommends putting spaces around operators.
+	return (ch == '.' || ch == '-' || ch == '+') && IsADigit(chNext);
+}
+
+static inline bool IsOperator(int ch) {
+	return strchr("%^&*()-+={}[]:;<>,/?!.~|\\", ch) != NULL;
+}
+
+// ---------------------------------------------------------------
+// Functions classifying a token currently processed in the lexer.
+
+// Checks if the current line starts with the preprocessor directive used
+// usually to introduce documentation comments: #ifdef DOC. This method is
+// supposed to be called if the line has been recognized as a preprocessor
+// directive already.
+static bool IsDocCommentStart(StyleContext &sc) {
+	// Check the line back to its start only if the end looks promising.
+	if (sc.LengthCurrent() == 10 && !IsAlphaNumeric(sc.ch)) {
+		char s[11];
+		sc.GetCurrentLowered(s, sizeof(s));
+		return strcmp(s, "#ifdef doc") == 0;
+	}
+	return false;
+}
+
+// Checks if the current line starts with the preprocessor directive that
+// is complementary to the #ifdef DOC start: #endif. This method is supposed
+// to be called if the current state point to the documentation comment.
+// QUESTIONAL ASSUMPTION: The complete #endif directive is not checked; just
+// the starting #e. However, there is no other preprocessor directive with
+// the same starting letter and thus this optimization should always work.
+static bool IsDocCommentEnd(StyleContext &sc) {
+	return sc.ch == '#' && sc.chNext == 'e';
+}
+
+class IdentifierClassifier {
+	WordList &keywords;  // Passed from keywords property.
+	WordList &constants; // Passed from keywords2 property.
+	WordList &operators; // Passed from keywords3 property.
+	WordList &types;     // Passed from keywords4 property.
+	WordList &functions; // Passed from keywords5 property.
+	WordList &objects;   // Passed from keywords6 property.
+
+	IdentifierClassifier(IdentifierClassifier const&);
+	IdentifierClassifier& operator=(IdentifierClassifier const&);
+
+public:
+	IdentifierClassifier(WordList *keywordlists[]) :
+		keywords(*keywordlists[0]), constants(*keywordlists[1]),
+		operators(*keywordlists[2]), types(*keywordlists[3]),
+		functions(*keywordlists[4]), objects(*keywordlists[5])
+	{}
+
+	void ClassifyIdentifier(StyleContext &sc) {
+		// Opening parenthesis following an identifier makes it a possible
+		// function call.
+		// KNOWN PROBLEM: If some whitespace is inserted between the
+		// identifier and the parenthesis they will not be able to be
+		// recognized as a function call. This should not occur; at
+		// least not often. Such coding style would be weird.
+		if (sc.Match('(')) {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			// Before an opening brace can be control statements and
+			// operators too; function call is the last option.
+			if (keywords.InList(s)) {
+				sc.ChangeState(SCE_OSCRIPT_KEYWORD);
+			} else if (operators.InList(s)) {
+				sc.ChangeState(SCE_OSCRIPT_OPERATOR);
+			} else if (functions.InList(s)) {
+				sc.ChangeState(SCE_OSCRIPT_FUNCTION);
+			} else {
+				sc.ChangeState(SCE_OSCRIPT_METHOD);
+			}
+			sc.SetState(SCE_OSCRIPT_OPERATOR);
+		} else {
+			char s[100];
+			sc.GetCurrentLowered(s, sizeof(s));
+			// A dot following an identifier means an access to an object
+			// member. The related object identifier can be special.
+			// KNOWN PROBLEM: If there is whitespace between the identifier
+			// and the following dot, the identifier will not be recognized
+			// as an object in an object member access. If it is one of the
+			// listed static objects it will not be styled.
+			if (sc.Match('.') && objects.InList(s)) {
+				sc.ChangeState(SCE_OSCRIPT_OBJECT);
+				sc.SetState(SCE_OSCRIPT_OPERATOR);
+			} else {
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_OSCRIPT_KEYWORD);
+				} else if (constants.InList(s)) {
+					sc.ChangeState(SCE_OSCRIPT_CONSTANT);
+				} else if (operators.InList(s)) {
+					sc.ChangeState(SCE_OSCRIPT_OPERATOR);
+				} else if (types.InList(s)) {
+					sc.ChangeState(SCE_OSCRIPT_TYPE);
+				} else if (functions.InList(s)) {
+					sc.ChangeState(SCE_OSCRIPT_FUNCTION);
+				}
+				sc.SetState(SCE_OSCRIPT_DEFAULT);
+			}
+		}
+	}
+};
+
+// ------------------------------------------------
+// Function colourising an excerpt of OScript code.
+
+static void ColouriseOScriptDoc(Sci_PositionU startPos, Sci_Position length,
+								int initStyle, WordList *keywordlists[],
+								Accessor &styler) {
+	// I wonder how whole-line styles ended by EOLN can escape the resetting
+	// code in the loop below and overflow to the next line. Let us make sure
+	// that a new line does not start with them carried from the previous one.
+	// NOTE: An overflowing string is intentionally not checked; it reminds
+	// the developer that the string must be ended on the same line.
+	if (initStyle == SCE_OSCRIPT_LINE_COMMENT ||
+			initStyle == SCE_OSCRIPT_PREPROCESSOR) {
+		initStyle = SCE_OSCRIPT_DEFAULT;
+	}
+
+	styler.StartAt(startPos);
+	StyleContext sc(startPos, length, initStyle, styler);
+	IdentifierClassifier identifierClassifier(keywordlists);
+
+	// It starts with true at the beginning of a line and changes to false as
+	// soon as the first non-whitespace character has been processed.
+	bool isFirstToken = true;
+	// It starts with true at the beginning of a line and changes to false as
+	// soon as the first identifier on the line is passed by.
+	bool isFirstIdentifier = true;
+	// It becomes false when #ifdef DOC (the preprocessor directive often
+	// used to start a documentation comment) is encountered and remain false
+	// until the end of the documentation block is not detected. This is done
+	// by checking for the complementary #endif preprocessor directive.
+	bool endDocComment = false;
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			isFirstToken = true;
+			isFirstIdentifier = true;
+		// Detect the current state is neither whitespace nor identifier. It
+		// means that no next identifier can be the first token on the line.
+		} else if (isFirstIdentifier && sc.state != SCE_OSCRIPT_DEFAULT &&
+				   sc.state != SCE_OSCRIPT_IDENTIFIER) {
+			isFirstIdentifier = false;
+		}
+
+		// Check if the current state should be changed.
+		if (sc.state == SCE_OSCRIPT_OPERATOR) {
+			// Multiple-symbol operators are marked by single characters.
+			sc.SetState(SCE_OSCRIPT_DEFAULT);
+		} else if (sc.state == SCE_OSCRIPT_IDENTIFIER) {
+			if (!IsIdentifierChar(sc.ch)) {
+				// Colon after an identifier makes it a label if it is the
+				// first token on the line.
+				// KNOWN PROBLEM: If some whitespace is inserted between the
+				// identifier and the colon they will not be recognized as a
+				// label. This should not occur; at least not often. It would
+				// make the code structure less legible and examples in the
+				// Livelink documentation do not show it.
+				if (sc.Match(':') && isFirstIdentifier) {
+					sc.ChangeState(SCE_OSCRIPT_LABEL);
+					sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+				} else {
+					identifierClassifier.ClassifyIdentifier(sc);
+				}
+				// Avoid a sequence of two words be mistaken for a label. A
+				// switch case would be an example.
+				isFirstIdentifier = false;
+			}
+		} else if (sc.state == SCE_OSCRIPT_GLOBAL) {
+			if (!IsIdentifierChar(sc.ch)) {
+				sc.SetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_PROPERTY) {
+			if (!IsIdentifierChar(sc.ch)) {
+				// Any member access introduced by the dot operator is
+				// initially marked as a property access. If an opening
+				// parenthesis is detected later it is changed to method call.
+				// KNOWN PROBLEM: The same as at the function call recognition
+				// for SCE_OSCRIPT_IDENTIFIER above.
+				if (sc.Match('(')) {
+					sc.ChangeState(SCE_OSCRIPT_METHOD);
+				}
+				sc.SetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_NUMBER) {
+			if (!IsNumberChar(sc.ch, sc.chNext)) {
+				sc.SetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_SINGLEQUOTE_STRING) {
+			if (sc.ch == '\'') {
+				// Two consequential apostrophes convert to a single one.
+				if (sc.chNext == '\'') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+				}
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_DOUBLEQUOTE_STRING) {
+			if (sc.ch == '\"') {
+				// Two consequential quotation marks convert to a single one.
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+				}
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_BLOCK_COMMENT) {
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_LINE_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_PREPROCESSOR) {
+			if (IsDocCommentStart(sc)) {
+				sc.ChangeState(SCE_OSCRIPT_DOC_COMMENT);
+				endDocComment = false;
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		} else if (sc.state == SCE_OSCRIPT_DOC_COMMENT) {
+			// KNOWN PROBLEM: The first line detected that would close a
+			// conditional preprocessor block (#endif) the documentation
+			// comment block will end. (Nested #if-#endif blocks are not
+			// supported. Hopefully it will not occur often that a line
+			// within the text block would stat with #endif.
+			if (isFirstToken && IsDocCommentEnd(sc)) {
+				endDocComment = true;
+			} else if (sc.atLineEnd && endDocComment) {
+				sc.ForwardSetState(SCE_OSCRIPT_DEFAULT);
+			}
+		}
+
+		// Check what state starts with the current character.
+		if (sc.state == SCE_OSCRIPT_DEFAULT) {
+			if (sc.Match('\'')) {
+				sc.SetState(SCE_OSCRIPT_SINGLEQUOTE_STRING);
+			} else if (sc.Match('\"')) {
+				sc.SetState(SCE_OSCRIPT_DOUBLEQUOTE_STRING);
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_OSCRIPT_LINE_COMMENT);
+				sc.Forward();
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_OSCRIPT_BLOCK_COMMENT);
+				sc.Forward();
+			} else if (isFirstToken && sc.Match('#')) {
+				sc.SetState(SCE_OSCRIPT_PREPROCESSOR);
+			} else if (sc.Match('$')) {
+				// Both process-global ($xxx) and thread-global ($$xxx)
+				// variables are handled as one global.
+				sc.SetState(SCE_OSCRIPT_GLOBAL);
+			} else if (IsNaturalNumberStart(sc.ch)) {
+				sc.SetState(SCE_OSCRIPT_NUMBER);
+			} else if (IsPrefixedNumberStart(sc.ch, sc.chNext)) {
+				sc.SetState(SCE_OSCRIPT_NUMBER);
+				sc.Forward();
+			} else if (sc.Match('.') && IsIdentifierStart(sc.chNext)) {
+				// Every object member access is marked as a property access
+				// initially. The decision between property and method is made
+				// after parsing the identifier and looking what comes then.
+				// KNOWN PROBLEM: If there is whitespace between the following
+				// identifier and the dot, the dot will not be recognized
+				// as a member accessing operator. In turn, the identifier
+				// will not be recognizable as a property or a method too.
+				sc.SetState(SCE_OSCRIPT_OPERATOR);
+				sc.Forward();
+				sc.SetState(SCE_OSCRIPT_PROPERTY);
+			} else if (IsIdentifierStart(sc.ch)) {
+				sc.SetState(SCE_OSCRIPT_IDENTIFIER);
+			} else if (IsOperator(sc.ch)) {
+				sc.SetState(SCE_OSCRIPT_OPERATOR);
+			}
+		}
+
+		if (isFirstToken && !IsASpaceOrTab(sc.ch)) {
+			isFirstToken = false;
+		}
+	}
+
+	sc.Complete();
+}
+
+// ------------------------------------------
+// Functions supporting OScript code folding.
+
+static inline bool IsBlockComment(int style) {
+	return style == SCE_OSCRIPT_BLOCK_COMMENT;
+}
+
+static bool IsLineComment(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eolPos; i++) {
+		char ch = styler[i];
+		char chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		if (ch == '/' && chNext == '/' && style == SCE_OSCRIPT_LINE_COMMENT) {
+			return true;
+		} else if (!IsASpaceOrTab(ch)) {
+			return false;
+		}
+	}
+	return false;
+}
+
+static inline bool IsPreprocessor(int style) {
+	return style == SCE_OSCRIPT_PREPROCESSOR ||
+		   style == SCE_OSCRIPT_DOC_COMMENT;
+}
+
+static void GetRangeLowered(Sci_PositionU start, Sci_PositionU end,
+							Accessor &styler, char *s, Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while (i < end - start + 1 && i < len - 1) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void GetForwardWordLowered(Sci_PositionU start, Accessor &styler,
+								  char *s, Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while (i < len - 1 && IsAlpha(styler.SafeGetCharAt(start + i))) {
+		s[i] = static_cast<char>(tolower(styler.SafeGetCharAt(start + i)));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void UpdatePreprocessorFoldLevel(int &levelCurrent,
+		Sci_PositionU startPos, Accessor &styler) {
+	char s[7]; // Size of the longest possible keyword + null.
+	GetForwardWordLowered(startPos, styler, s, sizeof(s));
+
+	if (strcmp(s, "ifdef") == 0 ||
+		strcmp(s, "ifndef") == 0) {
+		levelCurrent++;
+	} else if (strcmp(s, "endif") == 0) {
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+static void UpdateKeywordFoldLevel(int &levelCurrent, Sci_PositionU lastStart,
+		Sci_PositionU currentPos, Accessor &styler) {
+	char s[9];
+	GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s));
+
+	if (strcmp(s, "if") == 0 || strcmp(s, "for") == 0 ||
+		strcmp(s, "switch") == 0 || strcmp(s, "function") == 0 ||
+		strcmp(s, "while") == 0 || strcmp(s, "repeat") == 0) {
+		levelCurrent++;
+	} else if (strcmp(s, "end") == 0 || strcmp(s, "until") == 0) {
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+// ------------------------------
+// Function folding OScript code.
+
+static void FoldOScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+						   WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_Position endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	Sci_Position lastStart = 0;
+
+	for (Sci_Position i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atLineEnd = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (foldComment && IsBlockComment(style)) {
+			if (!IsBlockComment(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsBlockComment(styleNext) && !atLineEnd) {
+				// Comments do not end at end of line and the next character
+				// may not be styled.
+				levelCurrent--;
+			}
+		}
+		if (foldComment && atLineEnd && IsLineComment(lineCurrent, styler)) {
+			if (!IsLineComment(lineCurrent - 1, styler) &&
+				IsLineComment(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsLineComment(lineCurrent - 1, styler) &&
+					 !IsLineComment(lineCurrent+1, styler))
+				levelCurrent--;
+		}
+		if (foldPreprocessor) {
+			if (ch == '#' && IsPreprocessor(style)) {
+				UpdatePreprocessorFoldLevel(levelCurrent, i + 1, styler);
+			}
+		}
+
+		if (stylePrev != SCE_OSCRIPT_KEYWORD && style == SCE_OSCRIPT_KEYWORD) {
+			lastStart = i;
+		}
+		if (stylePrev == SCE_OSCRIPT_KEYWORD) {
+			if(IsIdentifierChar(ch) && !IsIdentifierChar(chNext)) {
+				UpdateKeywordFoldLevel(levelCurrent, lastStart, i, styler);
+			}
+		}
+
+		if (!IsASpace(ch))
+			visibleChars++;
+
+		if (atLineEnd) {
+			int level = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				level |= SC_FOLDLEVELHEADERFLAG;
+			if (level != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, level);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+
+	// If we did not reach EOLN in the previous loop, store the line level and
+	// whitespace information. The rest will be filled in later.
+	int lev = levelPrev;
+	if (visibleChars == 0 && foldCompact)
+		lev |= SC_FOLDLEVELWHITEFLAG;
+	styler.SetLevel(lineCurrent, lev);
+}
+
+// --------------------------------------------
+// Declaration of the OScript lexer descriptor.
+
+static const char * const oscriptWordListDesc[] = {
+	"Keywords and reserved words",
+	"Literal constants",
+	"Literal operators",
+	"Built-in value and reference types",
+	"Built-in global functions",
+	"Built-in static objects",
+	0
+};
+
+LexerModule lmOScript(SCLEX_OSCRIPT, ColouriseOScriptDoc, "oscript", FoldOScriptDoc, oscriptWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexOpal.cxx b/scite-app/lexilla/lexers/LexOpal.cxx
new file mode 100644
index 0000000..2e5ce06
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexOpal.cxx
@@ -0,0 +1,526 @@
+// Scintilla source code edit control
+/** @file LexOpal.cxx
+ ** Lexer for OPAL (functional language similar to Haskell)
+ ** Written by Sebastian Pipping <webmaster@hartwork.org>
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+inline static void getRange( Sci_PositionU start, Sci_PositionU end, Accessor & styler, char * s, Sci_PositionU len )
+{
+	Sci_PositionU i = 0;
+	while( ( i < end - start + 1 ) && ( i < len - 1 ) )
+	{
+		s[i] = static_cast<char>( styler[ start + i ] );
+		i++;
+	}
+	s[ i ] = '\0';
+}
+
+inline bool HandleString( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler )
+{
+	char ch;
+
+	// Wait for string to close
+	bool even_backslash_count = true; // Without gaps in between
+	cur++; // Skip initial quote
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch == '\015' ) || ( ch == '\012' ) ) // Deny multi-line strings
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_STRING );
+			styler.StartSegment( cur );
+			return true;
+		}
+		else
+		{
+			if( even_backslash_count )
+			{
+				if( ch == '"' )
+				{
+					styler.ColourTo( cur, SCE_OPAL_STRING );
+					cur++;
+					if( cur >= one_too_much )
+					{
+						return false; // STOP
+					}
+					else
+					{
+						styler.StartSegment( cur );
+						return true;
+					}
+				}
+				else if( ch == '\\' )
+				{
+					even_backslash_count = false;
+				}
+			}
+			else
+			{
+				even_backslash_count = true;
+			}
+		}
+
+		cur++;
+	}
+}
+
+inline bool HandleCommentBlock( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler, bool could_fail )
+{
+	char ch;
+
+	if( could_fail )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( ch != '*' )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+
+	// Wait for comment close
+	cur++;
+	bool star_found = false;
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_BLOCK );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( star_found )
+		{
+			if( ch == '/' )
+			{
+				styler.ColourTo( cur, SCE_OPAL_COMMENT_BLOCK );
+				cur++;
+				if( cur >= one_too_much )
+				{
+					return false; // STOP
+				}
+				else
+				{
+					styler.StartSegment( cur );
+					return true;
+				}
+			}
+			else if( ch != '*' )
+			{
+				star_found = false;
+			}
+		}
+		else if( ch == '*' )
+		{
+			star_found = true;
+		}
+		cur++;
+	}
+}
+
+inline bool HandleCommentLine( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler, bool could_fail )
+{
+	char ch;
+
+	if( could_fail )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( ch != '-' )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch != ' ' ) && ( ch != '\t' ) )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+
+	// Wait for end of line
+	bool fifteen_found = false;
+
+	for( ; ; )
+	{
+		cur++;
+
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( fifteen_found )
+		{
+/*
+			if( ch == '\012' )
+			{
+				// One newline on Windows (015, 012)
+			}
+			else
+			{
+				// One newline on MAC (015) and another char
+			}
+*/
+			cur--;
+			styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+			styler.StartSegment( cur );
+			return true;
+		}
+		else
+		{
+			if( ch == '\015' )
+			{
+				fifteen_found = true;
+			}
+			else if( ch == '\012' )
+			{
+				// One newline on Linux (012)
+				styler.ColourTo( cur - 1, SCE_OPAL_COMMENT_LINE );
+				styler.StartSegment( cur );
+				return true;
+			}
+		}
+	}
+}
+
+inline bool HandlePar( Sci_PositionU & cur, Accessor & styler )
+{
+	styler.ColourTo( cur, SCE_OPAL_PAR );
+
+	cur++;
+
+	styler.StartSegment( cur );
+	return true;
+}
+
+inline bool HandleSpace( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler )
+{
+	char ch;
+
+	cur++;
+	for( ; ; )
+	{
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
+			return false;
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		switch( ch )
+		{
+		case ' ':
+		case '\t':
+		case '\015':
+		case '\012':
+			cur++;
+			break;
+
+		default:
+			styler.ColourTo( cur - 1, SCE_OPAL_SPACE );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+}
+
+inline bool HandleInteger( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler )
+{
+	char ch;
+
+	for( ; ; )
+	{
+		cur++;
+		if( cur >= one_too_much )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
+			return false; // STOP
+		}
+
+		ch = styler.SafeGetCharAt( cur );
+		if( !( IsASCII( ch ) && isdigit( ch ) ) )
+		{
+			styler.ColourTo( cur - 1, SCE_OPAL_INTEGER );
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+}
+
+inline bool HandleWord( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler, WordList * keywordlists[] )
+{
+	char ch;
+	const Sci_PositionU beg = cur;
+
+	cur++;
+	for( ; ; )
+	{
+		ch = styler.SafeGetCharAt( cur );
+		if( ( ch != '_' ) && ( ch != '-' ) &&
+			!( IsASCII( ch ) && ( islower( ch ) || isupper( ch ) || isdigit( ch ) ) ) ) break;
+
+		cur++;
+		if( cur >= one_too_much )
+		{
+			break;
+		}
+	}
+
+	const Sci_Position ide_len = cur - beg + 1;
+	char * ide = new char[ ide_len ];
+	getRange( beg, cur, styler, ide, ide_len );
+
+	WordList & keywords    = *keywordlists[ 0 ];
+	WordList & classwords  = *keywordlists[ 1 ];
+
+	if( keywords.InList( ide ) ) // Keyword
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_KEYWORD );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+	else if( classwords.InList( ide ) ) // Sort
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_SORT );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+	else if( !strcmp( ide, "true" ) || !strcmp( ide, "false" ) ) // Bool const
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_BOOL_CONST );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+	else // Unknown keyword
+	{
+		delete [] ide;
+
+		styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+		if( cur >= one_too_much )
+		{
+			return false; // STOP
+		}
+		else
+		{
+			styler.StartSegment( cur );
+			return true;
+		}
+	}
+
+}
+
+inline bool HandleSkip( Sci_PositionU & cur, Sci_PositionU one_too_much, Accessor & styler )
+{
+	cur++;
+	styler.ColourTo( cur - 1, SCE_OPAL_DEFAULT );
+	if( cur >= one_too_much )
+	{
+		return false; // STOP
+	}
+	else
+	{
+		styler.StartSegment( cur );
+		return true;
+	}
+}
+
+static void ColouriseOpalDoc( Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor & styler )
+{
+	styler.StartAt( startPos );
+	styler.StartSegment( startPos );
+
+	Sci_PositionU & cur = startPos;
+	const Sci_PositionU one_too_much = startPos + length;
+
+	int state = initStyle;
+
+	for( ; ; )
+	{
+		switch( state )
+		{
+		case SCE_OPAL_KEYWORD:
+		case SCE_OPAL_SORT:
+			if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_INTEGER:
+			if( !HandleInteger( cur, one_too_much, styler ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_COMMENT_BLOCK:
+			if( !HandleCommentBlock( cur, one_too_much, styler, false ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_COMMENT_LINE:
+			if( !HandleCommentLine( cur, one_too_much, styler, false ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		case SCE_OPAL_STRING:
+			if( !HandleString( cur, one_too_much, styler ) ) return;
+			state = SCE_OPAL_DEFAULT;
+			break;
+
+		default: // SCE_OPAL_DEFAULT:
+			{
+				char ch = styler.SafeGetCharAt( cur );
+
+				switch( ch )
+				{
+				// String
+				case '"':
+					if( !HandleString( cur, one_too_much, styler ) ) return;
+					break;
+
+				// Comment block
+				case '/':
+					if( !HandleCommentBlock( cur, one_too_much, styler, true ) ) return;
+					break;
+
+				// Comment line
+				case '-':
+					if( !HandleCommentLine( cur, one_too_much, styler, true ) ) return;
+					break;
+
+				// Par
+				case '(':
+				case ')':
+				case '[':
+				case ']':
+				case '{':
+				case '}':
+					if( !HandlePar( cur, styler ) ) return;
+					break;
+
+				// Whitespace
+				case ' ':
+				case '\t':
+				case '\015':
+				case '\012':
+					if( !HandleSpace( cur, one_too_much, styler ) ) return;
+					break;
+
+				default:
+					{
+						// Integer
+						if( IsASCII( ch ) && isdigit( ch ) )
+						{
+							if( !HandleInteger( cur, one_too_much, styler ) ) return;
+						}
+
+						// Keyword
+						else if( IsASCII( ch ) && ( islower( ch ) || isupper( ch ) ) )
+						{
+							if( !HandleWord( cur, one_too_much, styler, keywordlists ) ) return;
+
+						}
+
+						// Skip
+						else
+						{
+							if( !HandleSkip( cur, one_too_much, styler ) ) return;
+						}
+					}
+				}
+
+				break;
+			}
+		}
+	}
+}
+
+static const char * const opalWordListDesc[] = {
+	"Keywords",
+	"Sorts",
+	0
+};
+
+LexerModule lmOpal(SCLEX_OPAL, ColouriseOpalDoc, "opal", NULL, opalWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPB.cxx b/scite-app/lexilla/lexers/LexPB.cxx
new file mode 100644
index 0000000..c8522a0
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPB.cxx
@@ -0,0 +1,366 @@
+// Scintilla source code edit control
+// @file LexPB.cxx
+// Lexer for PowerBasic by Roland Walter, roland@rowalt.de (for PowerBasic see www.powerbasic.com)
+//
+// Changes:
+// 17.10.2003: Toggling of subs/functions now until next sub/function - this gives better results
+// 29.10.2003: 1. Bug: Toggling didn't work for subs/functions added in editor
+//             2. Own colors for PB constants and Inline Assembler SCE_B_CONSTANT and SCE_B_ASM
+//             3. Several smaller syntax coloring improvements and speed optimizations
+// 12.07.2004: 1. Toggling for macros added
+//             2. Further folding speed optimitations (for people dealing with very large listings)
+//
+// Necessary changes for the PB lexer in Scintilla project:
+//  - In SciLexer.h and Scintilla.iface:
+//
+//    #define SCLEX_POWERBASIC 51       //ID for PowerBasic lexer
+//    (...)
+//    #define SCE_B_DEFAULT 0           //in both VB and PB lexer
+//    #define SCE_B_COMMENT 1           //in both VB and PB lexer
+//    #define SCE_B_NUMBER 2            //in both VB and PB lexer
+//    #define SCE_B_KEYWORD 3           //in both VB and PB lexer
+//    #define SCE_B_STRING 4            //in both VB and PB lexer
+//    #define SCE_B_PREPROCESSOR 5      //VB lexer only, not in PB lexer
+//    #define SCE_B_OPERATOR 6          //in both VB and PB lexer
+//    #define SCE_B_IDENTIFIER 7        //in both VB and PB lexer
+//    #define SCE_B_DATE 8              //VB lexer only, not in PB lexer
+//    #define SCE_B_CONSTANT 13         //PB lexer only, not in VB lexer
+//    #define SCE_B_ASM 14              //PB lexer only, not in VB lexer
+
+//  - Statement added to KeyWords.cxx:      'LINK_LEXER(lmPB);'
+//  - Statement added to scintilla_vc6.mak: '$(DIR_O)\LexPB.obj: ...\src\LexPB.cxx $(LEX_HEADERS)'
+//
+// Copyright for Scintilla: 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsTypeCharacter(const int ch)
+{
+    return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$' || ch == '?';
+}
+
+static inline bool IsAWordChar(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch)
+{
+    return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static bool MatchUpperCase(Accessor &styler, Sci_Position pos, const char *s)   //Same as styler.Match() but uppercase comparison (a-z,A-Z and space only)
+{
+    char ch;
+    for (Sci_Position i=0; *s; i++)
+    {
+        ch=styler.SafeGetCharAt(pos+i);
+        if (ch > 0x60) ch -= '\x20';
+        if (*s != ch) return false;
+        s++;
+    }
+    return true;
+}
+
+static void ColourisePBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,WordList *keywordlists[],Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+
+    styler.StartAt(startPos);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    for (; sc.More(); sc.Forward()) {
+        switch (sc.state)
+        {
+            case SCE_B_OPERATOR:
+            {
+                sc.SetState(SCE_B_DEFAULT);
+                break;
+            }
+            case SCE_B_KEYWORD:
+            {
+                if (!IsAWordChar(sc.ch))
+                {
+                    if (!IsTypeCharacter(sc.ch))
+                    {
+                        char s[100];
+                        sc.GetCurrentLowered(s, sizeof(s));
+                        if (keywords.InList(s))
+                        {
+                            if (strcmp(s, "rem") == 0)
+                            {
+                                sc.ChangeState(SCE_B_COMMENT);
+                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                            }
+                            else if (strcmp(s, "asm") == 0)
+                            {
+                                sc.ChangeState(SCE_B_ASM);
+                                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                            }
+                            else
+                            {
+                                sc.SetState(SCE_B_DEFAULT);
+                            }
+                        }
+                        else
+                        {
+                            sc.ChangeState(SCE_B_IDENTIFIER);
+                            sc.SetState(SCE_B_DEFAULT);
+                        }
+                    }
+                }
+                break;
+            }
+            case SCE_B_NUMBER:
+            {
+                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_STRING:
+            {
+                if (sc.ch == '\"'){sc.ForwardSetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_CONSTANT:
+            {
+                if (!IsAWordChar(sc.ch)) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_COMMENT:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+            case SCE_B_ASM:
+            {
+                if (sc.atLineEnd) {sc.SetState(SCE_B_DEFAULT);}
+                break;
+            }
+        }  //switch (sc.state)
+
+        // Determine if a new state should be entered:
+        if (sc.state == SCE_B_DEFAULT)
+        {
+            if (sc.ch == '\'') {sc.SetState(SCE_B_COMMENT);}
+            else if (sc.ch == '\"') {sc.SetState(SCE_B_STRING);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {sc.SetState(SCE_B_NUMBER);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'b') {sc.SetState(SCE_B_NUMBER);}
+            else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {sc.SetState(SCE_B_NUMBER);}
+            else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {sc.SetState(SCE_B_NUMBER);}
+            else if (IsAWordStart(sc.ch)) {sc.SetState(SCE_B_KEYWORD);}
+            else if (sc.ch == '%') {sc.SetState(SCE_B_CONSTANT);}
+            else if (sc.ch == '$') {sc.SetState(SCE_B_CONSTANT);}
+            else if (sc.ch == '#') {sc.SetState(SCE_B_KEYWORD);}
+            else if (sc.ch == '!') {sc.SetState(SCE_B_ASM);}
+            else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {sc.SetState(SCE_B_OPERATOR);}
+        }
+    }      //for (; sc.More(); sc.Forward())
+    sc.Complete();
+}
+
+//The folding routine for PowerBasic toggles SUBs and FUNCTIONs only. This was exactly what I wanted,
+//nothing more. I had worked with this kind of toggling for several years when I used the great good old
+//GFA Basic which is dead now. After testing the feature of toggling FOR-NEXT loops, WHILE-WEND loops
+//and so on too I found this is more disturbing then helping (for me). So if You think in another way
+//you can (or must) write Your own toggling routine ;-)
+static void FoldPBDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+    // No folding enabled, no reason to continue...
+    if( styler.GetPropertyInt("fold") == 0 )
+        return;
+
+    Sci_PositionU endPos = startPos + length;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+
+    bool fNewLine=true;
+    bool fMightBeMultiLineMacro=false;
+    bool fBeginOfCommentFound=false;
+    for (Sci_PositionU i = startPos; i < endPos; i++)
+    {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+
+        if (fNewLine)            //Begin of a new line (The Sub/Function/Macro keywords may occur at begin of line only)
+        {
+            fNewLine=false;
+            fBeginOfCommentFound=false;
+            switch (ch)
+            {
+            case ' ':      //Most lines start with space - so check this first, the code is the same as for 'default:'
+            case '\t':     //Handle tab too
+                {
+                    int levelUse = levelCurrent;
+                    int lev = levelUse | levelNext << 16;
+                    styler.SetLevel(lineCurrent, lev);
+                    break;
+                }
+            case 'F':
+            case 'f':
+                {
+					switch (chNext)
+					{
+                    case 'U':
+                    case 'u':
+						{
+							if( MatchUpperCase(styler,i,"FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'S':
+            case 's':
+                {
+					switch (chNext)
+					{
+                    case 'U':
+                    case 'u':
+						{
+							if( MatchUpperCase(styler,i,"SUB") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+                    case 'T':
+                    case 't':
+						{
+							if( MatchUpperCase(styler,i,"STATIC FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							else if( MatchUpperCase(styler,i,"STATIC SUB") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'C':
+            case 'c':
+                {
+					switch (chNext)
+					{
+                    case 'A':
+                    case 'a':
+						{
+							if( MatchUpperCase(styler,i,"CALLBACK FUNCTION") )
+							{
+								styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+								levelNext=SC_FOLDLEVELBASE+1;
+							}
+							break;
+						}
+					}
+                break;
+                }
+            case 'M':
+            case 'm':
+                {
+					switch (chNext)
+					{
+                    case 'A':
+                    case 'a':
+						{
+							if( MatchUpperCase(styler,i,"MACRO") )
+							{
+								fMightBeMultiLineMacro=true;  //Set folder level at end of line, we have to check for single line macro
+							}
+							break;
+						}
+					}
+                break;
+                }
+            default:
+                {
+                    int levelUse = levelCurrent;
+                    int lev = levelUse | levelNext << 16;
+                    styler.SetLevel(lineCurrent, lev);
+                    break;
+                }
+            }  //switch (ch)
+        }  //if( fNewLine )
+
+        switch (ch)
+        {
+            case '=':                              //To test single line macros
+            {
+                if (fBeginOfCommentFound==false)
+                    fMightBeMultiLineMacro=false;  //The found macro is a single line macro only;
+                break;
+            }
+            case '\'':                             //A comment starts
+            {
+                fBeginOfCommentFound=true;
+                break;
+            }
+            case '\n':
+            {
+                if (fMightBeMultiLineMacro)        //The current line is the begin of a multi line macro
+                {
+                    fMightBeMultiLineMacro=false;
+                    styler.SetLevel(lineCurrent, (SC_FOLDLEVELBASE << 16) | SC_FOLDLEVELHEADERFLAG);
+                    levelNext=SC_FOLDLEVELBASE+1;
+                }
+                lineCurrent++;
+                levelCurrent = levelNext;
+                fNewLine=true;
+                break;
+            }
+            case '\r':
+            {
+                if (chNext != '\n')
+                {
+                    lineCurrent++;
+                    levelCurrent = levelNext;
+                    fNewLine=true;
+                }
+                break;
+            }
+        }  //switch (ch)
+    }  //for (Sci_PositionU i = startPos; i < endPos; i++)
+}
+
+static const char * const pbWordListDesc[] = {
+    "Keywords",
+    0
+};
+
+LexerModule lmPB(SCLEX_POWERBASIC, ColourisePBDoc, "powerbasic", FoldPBDoc, pbWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPLM.cxx b/scite-app/lexilla/lexers/LexPLM.cxx
new file mode 100644
index 0000000..d703afa
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPLM.cxx
@@ -0,0 +1,203 @@
+// Copyright (c) 1990-2007, Scientific Toolworks, Inc.
+// @file LexPLM.cxx
+// Author: Jason Haslam
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void GetRange(Sci_PositionU start,
+                     Sci_PositionU end,
+                     Accessor &styler,
+                     char *s,
+                     Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void ColourisePlmDoc(Sci_PositionU startPos,
+                            Sci_Position length,
+                            int initStyle,
+                            WordList *keywordlists[],
+                            Accessor &styler)
+{
+	Sci_PositionU endPos = startPos + length;
+	int state = initStyle;
+
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = styler.SafeGetCharAt(i);
+		char chNext = styler.SafeGetCharAt(i + 1);
+
+		if (state == SCE_PLM_DEFAULT) {
+			if (ch == '/' && chNext == '*') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_COMMENT;
+			} else if (ch == '\'') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_STRING;
+			} else if (isdigit(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_NUMBER;
+			} else if (isalpha(ch)) {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_IDENTIFIER;
+			} else if (ch == '+' || ch == '-' || ch == '*' || ch == '/' ||
+			           ch == '=' || ch == '<' || ch == '>' || ch == ':') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_OPERATOR;
+			} else if (ch == '$') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_CONTROL;
+			}
+		} else if (state == SCE_PLM_COMMENT) {
+			if (ch == '*' && chNext == '/') {
+				i++;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_STRING) {
+			if (ch == '\'') {
+				if (chNext == '\'') {
+					i++;
+				} else {
+					styler.ColourTo(i, state);
+					state = SCE_PLM_DEFAULT;
+				}
+			}
+		} else if (state == SCE_PLM_NUMBER) {
+			if (!isdigit(ch) && !isalpha(ch) && ch != '$') {
+				i--;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_IDENTIFIER) {
+			if (!isdigit(ch) && !isalpha(ch) && ch != '$') {
+				// Get the entire identifier.
+				char word[1024];
+				Sci_Position segmentStart = styler.GetStartSegment();
+				GetRange(segmentStart, i - 1, styler, word, sizeof(word));
+
+				i--;
+				if (keywordlists[0]->InList(word))
+					styler.ColourTo(i, SCE_PLM_KEYWORD);
+				else
+					styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_OPERATOR) {
+			if (ch != '=' && ch != '>') {
+				i--;
+				styler.ColourTo(i, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		} else if (state == SCE_PLM_CONTROL) {
+			if (ch == '\r' || ch == '\n') {
+				styler.ColourTo(i - 1, state);
+				state = SCE_PLM_DEFAULT;
+			}
+		}
+	}
+	styler.ColourTo(endPos - 1, state);
+}
+
+static void FoldPlmDoc(Sci_PositionU startPos,
+                       Sci_Position length,
+                       int initStyle,
+                       WordList *[],
+                       Accessor &styler)
+{
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	Sci_Position startKeyword = 0;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev != SCE_PLM_KEYWORD && style == SCE_PLM_KEYWORD)
+			startKeyword = i;
+
+		if (style == SCE_PLM_KEYWORD && styleNext != SCE_PLM_KEYWORD) {
+			char word[1024];
+			GetRange(startKeyword, i, styler, word, sizeof(word));
+
+			if (strcmp(word, "procedure") == 0 || strcmp(word, "do") == 0)
+				levelCurrent++;
+			else if (strcmp(word, "end") == 0)
+				levelCurrent--;
+		}
+
+		if (foldComment) {
+			if (stylePrev != SCE_PLM_COMMENT && style == SCE_PLM_COMMENT)
+				levelCurrent++;
+			else if (stylePrev == SCE_PLM_COMMENT && style != SCE_PLM_COMMENT)
+				levelCurrent--;
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char *const plmWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmPLM(SCLEX_PLM, ColourisePlmDoc, "PL/M", FoldPlmDoc, plmWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPO.cxx b/scite-app/lexilla/lexers/LexPO.cxx
new file mode 100644
index 0000000..d5dbeb6
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPO.cxx
@@ -0,0 +1,214 @@
+// Scintilla source code edit control
+/** @file LexPO.cxx
+ ** Lexer for GetText Translation (PO) files.
+ **/
+// Copyright 2012 by Colomban Wendling <ban@herbesfolles.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// see https://www.gnu.org/software/gettext/manual/gettext.html#PO-Files for the syntax reference
+// some details are taken from the GNU msgfmt behavior (like that indent is allows in front of lines)
+
+// TODO:
+// * add keywords for flags (fuzzy, c-format, ...)
+// * highlight formats inside c-format strings (%s, %d, etc.)
+// * style for previous untranslated string? ("#|" comment)
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) {
+	StyleContext sc(startPos, length, initStyle, styler);
+	bool escaped = false;
+	Sci_Position curLine = styler.GetLine(startPos);
+	// the line state holds the last state on or before the line that isn't the default style
+	int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : SCE_PO_DEFAULT;
+
+	for (; sc.More(); sc.Forward()) {
+		// whether we should leave a state
+		switch (sc.state) {
+			case SCE_PO_COMMENT:
+			case SCE_PO_PROGRAMMER_COMMENT:
+			case SCE_PO_REFERENCE:
+			case SCE_PO_FLAGS:
+			case SCE_PO_FUZZY:
+				if (sc.atLineEnd)
+					sc.SetState(SCE_PO_DEFAULT);
+				else if (sc.state == SCE_PO_FLAGS && sc.Match("fuzzy"))
+					// here we behave like the previous parser, but this should probably be highlighted
+					// on its own like a keyword rather than changing the whole flags style
+					sc.ChangeState(SCE_PO_FUZZY);
+				break;
+
+			case SCE_PO_MSGCTXT:
+			case SCE_PO_MSGID:
+			case SCE_PO_MSGSTR:
+				if (isspacechar(sc.ch))
+					sc.SetState(SCE_PO_DEFAULT);
+				break;
+
+			case SCE_PO_ERROR:
+				if (sc.atLineEnd)
+					sc.SetState(SCE_PO_DEFAULT);
+				break;
+
+			case SCE_PO_MSGCTXT_TEXT:
+			case SCE_PO_MSGID_TEXT:
+			case SCE_PO_MSGSTR_TEXT:
+				if (sc.atLineEnd) { // invalid inside a string
+					if (sc.state == SCE_PO_MSGCTXT_TEXT)
+						sc.ChangeState(SCE_PO_MSGCTXT_TEXT_EOL);
+					else if (sc.state == SCE_PO_MSGID_TEXT)
+						sc.ChangeState(SCE_PO_MSGID_TEXT_EOL);
+					else if (sc.state == SCE_PO_MSGSTR_TEXT)
+						sc.ChangeState(SCE_PO_MSGSTR_TEXT_EOL);
+					sc.SetState(SCE_PO_DEFAULT);
+					escaped = false;
+				} else {
+					if (escaped)
+						escaped = false;
+					else if (sc.ch == '\\')
+						escaped = true;
+					else if (sc.ch == '"')
+						sc.ForwardSetState(SCE_PO_DEFAULT);
+				}
+				break;
+		}
+
+		// whether we should enter a new state
+		if (sc.state == SCE_PO_DEFAULT) {
+			// forward to the first non-white character on the line
+			bool atLineStart = sc.atLineStart;
+			if (atLineStart) {
+				// reset line state if it is set to comment state so empty lines don't get
+				// comment line state, and the folding code folds comments separately,
+				// and anyway the styling don't use line state for comments
+				if (curLineState == SCE_PO_COMMENT)
+					curLineState = SCE_PO_DEFAULT;
+
+				while (sc.More() && ! sc.atLineEnd && isspacechar(sc.ch))
+					sc.Forward();
+			}
+
+			if (atLineStart && sc.ch == '#') {
+				if (sc.chNext == '.')
+					sc.SetState(SCE_PO_PROGRAMMER_COMMENT);
+				else if (sc.chNext == ':')
+					sc.SetState(SCE_PO_REFERENCE);
+				else if (sc.chNext == ',')
+					sc.SetState(SCE_PO_FLAGS);
+				else
+					sc.SetState(SCE_PO_COMMENT);
+			} else if (atLineStart && sc.Match("msgid")) { // includes msgid_plural
+				sc.SetState(SCE_PO_MSGID);
+			} else if (atLineStart && sc.Match("msgstr")) { // includes [] suffixes
+				sc.SetState(SCE_PO_MSGSTR);
+			} else if (atLineStart && sc.Match("msgctxt")) {
+				sc.SetState(SCE_PO_MSGCTXT);
+			} else if (sc.ch == '"') {
+				if (curLineState == SCE_PO_MSGCTXT || curLineState == SCE_PO_MSGCTXT_TEXT)
+					sc.SetState(SCE_PO_MSGCTXT_TEXT);
+				else if (curLineState == SCE_PO_MSGID || curLineState == SCE_PO_MSGID_TEXT)
+					sc.SetState(SCE_PO_MSGID_TEXT);
+				else if (curLineState == SCE_PO_MSGSTR || curLineState == SCE_PO_MSGSTR_TEXT)
+					sc.SetState(SCE_PO_MSGSTR_TEXT);
+				else
+					sc.SetState(SCE_PO_ERROR);
+			} else if (! isspacechar(sc.ch))
+				sc.SetState(SCE_PO_ERROR);
+
+			if (sc.state != SCE_PO_DEFAULT)
+				curLineState = sc.state;
+		}
+
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			curLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(curLine, curLineState);
+		}
+	}
+	sc.Complete();
+}
+
+static int FindNextNonEmptyLineState(Sci_PositionU startPos, Accessor &styler) {
+	Sci_PositionU length = styler.Length();
+	for (Sci_PositionU i = startPos; i < length; i++) {
+		if (! isspacechar(styler[i])) {
+			return styler.GetLineState(styler.GetLine(i));
+		}
+	}
+	return 0;
+}
+
+static void FoldPODoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	if (! styler.GetPropertyInt("fold"))
+		return;
+	bool foldCompact = styler.GetPropertyInt("fold.compact") != 0;
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+
+	Sci_PositionU endPos = startPos + length;
+	Sci_Position curLine = styler.GetLine(startPos);
+	int lineState = styler.GetLineState(curLine);
+	int nextLineState;
+	int level = styler.LevelAt(curLine) & SC_FOLDLEVELNUMBERMASK;
+	int nextLevel;
+	int visible = 0;
+	int chNext = styler[startPos];
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		int ch = chNext;
+		chNext = styler.SafeGetCharAt(i+1);
+
+		if (! isspacechar(ch)) {
+			visible++;
+		} else if ((ch == '\r' && chNext != '\n') || ch == '\n' || i+1 >= endPos) {
+			int lvl = level;
+			Sci_Position nextLine = curLine + 1;
+
+			nextLineState = styler.GetLineState(nextLine);
+			if ((lineState != SCE_PO_COMMENT || foldComment) &&
+					nextLineState == lineState &&
+					FindNextNonEmptyLineState(i, styler) == lineState)
+				nextLevel = SC_FOLDLEVELBASE + 1;
+			else
+				nextLevel = SC_FOLDLEVELBASE;
+
+			if (nextLevel > level)
+				lvl |= SC_FOLDLEVELHEADERFLAG;
+			if (visible == 0 && foldCompact)
+				lvl |= SC_FOLDLEVELWHITEFLAG;
+
+			styler.SetLevel(curLine, lvl);
+
+			lineState = nextLineState;
+			curLine = nextLine;
+			level = nextLevel;
+			visible = 0;
+		}
+	}
+}
+
+static const char *const poWordListDesc[] = {
+	0
+};
+
+LexerModule lmPO(SCLEX_PO, ColourisePODoc, "po", FoldPODoc, poWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPOV.cxx b/scite-app/lexilla/lexers/LexPOV.cxx
new file mode 100644
index 0000000..fafb78a
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPOV.cxx
@@ -0,0 +1,320 @@
+// Scintilla source code edit control
+/** @file LexPOV.cxx
+ ** Lexer for POV-Ray SDL (Persistance of Vision Raytracer, Scene Description Language).
+ ** Written by Philippe Lhoste but this is mostly a derivative of LexCPP...
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Some points that distinguish from a simple C lexer:
+// Identifiers start only by a character.
+// No line continuation character.
+// Strings are limited to 256 characters.
+// Directives are similar to preprocessor commands,
+// but we match directive keywords and colorize incorrect ones.
+// Block comments can be nested (code stolen from my code in LexLua).
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(int ch) {
+	return ch < 0x80 && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch < 0x80 && isalpha(ch);
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColourisePovDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+    Accessor &styler) {
+
+	WordList &keywords1 = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	// Initialize the block comment /* */ nesting level, if we are inside such a comment.
+	int blockCommentLevel = 0;
+	if (initStyle == SCE_POV_COMMENT) {
+		blockCommentLevel = styler.GetLineState(currentLine - 1);
+	}
+
+	// Do not leak onto next line
+	if (initStyle == SCE_POV_STRINGEOL || initStyle == SCE_POV_COMMENTLINE) {
+		initStyle = SCE_POV_DEFAULT;
+	}
+
+	short stringLen = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			if (sc.state == SCE_POV_COMMENT) {
+				// Inside a block comment, we set the line state
+				styler.SetLineState(currentLine, blockCommentLevel);
+			} else {
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+			}
+		}
+
+		if (sc.atLineStart && (sc.state == SCE_POV_STRING)) {
+			// Prevent SCE_POV_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_POV_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_POV_OPERATOR) {
+			sc.SetState(SCE_POV_DEFAULT);
+		} else if (sc.state == SCE_POV_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD2);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD4);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD5);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD6);
+				} else if (keywords7.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD7);
+				} else if (keywords8.InList(s)) {
+					sc.ChangeState(SCE_POV_WORD8);
+				}
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_DIRECTIVE) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				char *p;
+				sc.GetCurrent(s, sizeof(s));
+				p = s;
+				// Skip # and whitespace between # and directive word
+				do {
+					p++;
+				} while ((*p == ' ' || *p == '\t') && *p != '\0');
+				if (!keywords1.InList(p)) {
+					sc.ChangeState(SCE_POV_BADDIRECTIVE);
+				}
+				sc.SetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_COMMENT) {
+			if (sc.Match('/', '*')) {
+				blockCommentLevel++;
+				sc.Forward();
+			} else if (sc.Match('*', '/') && blockCommentLevel > 0) {
+				blockCommentLevel--;
+				sc.Forward();
+				if (blockCommentLevel == 0) {
+					sc.ForwardSetState(SCE_POV_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_POV_COMMENTLINE) {
+			if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			}
+		} else if (sc.state == SCE_POV_STRING) {
+			if (sc.ch == '\\') {
+				stringLen++;
+				if (strchr("abfnrtuv0'\"", sc.chNext)) {
+					// Compound characters are counted as one.
+					// Note: for Unicode chars \u, we shouldn't count the next 4 digits...
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_POV_STRINGEOL);
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			} else {
+				stringLen++;
+			}
+			if (stringLen > 256) {
+				// Strings are limited to 256 chars
+				sc.SetState(SCE_POV_STRINGEOL);
+			}
+		} else if (sc.state == SCE_POV_STRINGEOL) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_C_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ForwardSetState(SCE_POV_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_POV_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_POV_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_POV_IDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				blockCommentLevel = 1;
+				sc.SetState(SCE_POV_COMMENT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_POV_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_POV_STRING);
+				stringLen = 0;
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_POV_DIRECTIVE);
+				// Skip whitespace between # and directive word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_POV_DEFAULT);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POV_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldPovDoc(
+	Sci_PositionU startPos,
+	Sci_Position length,
+	int initStyle,
+	WordList *[],
+	Accessor &styler) {
+
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldDirective = styler.GetPropertyInt("fold.directive") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && (style == SCE_POV_COMMENT)) {
+			if (stylePrev != SCE_POV_COMMENT) {
+				levelCurrent++;
+			} else if ((styleNext != SCE_POV_COMMENT) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+		if (foldComment && (style == SCE_POV_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+		if (foldDirective && (style == SCE_POV_DIRECTIVE)) {
+			if (ch == '#') {
+				Sci_PositionU j=i+1;
+				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+			}
+		}
+		if (style == SCE_POV_OPERATOR) {
+			if (ch == '{') {
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const povWordLists[] = {
+	"Language directives",
+	"Objects & CSG & Appearance",
+	"Types & Modifiers & Items",
+	"Predefined Identifiers",
+	"Predefined Functions",
+	"User defined 1",
+	"User defined 2",
+	"User defined 3",
+	0,
+};
+
+LexerModule lmPOV(SCLEX_POV, ColourisePovDoc, "pov", FoldPovDoc, povWordLists);
diff --git a/scite-app/lexilla/lexers/LexPS.cxx b/scite-app/lexilla/lexers/LexPS.cxx
new file mode 100644
index 0000000..a70ea71
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPS.cxx
@@ -0,0 +1,334 @@
+// Scintilla source code edit control
+/** @file LexPS.cxx
+ ** Lexer for PostScript
+ **
+ ** Written by Nigel Hathaway <nigel@bprj.co.uk>.
+ ** The License.txt file describes the conditions under which this software may be distributed.
+ **/
+
+// Previous releases of this lexer included support for marking token starts with
+// a style byte indicator. This was used by the wxGhostscript IDE/debugger.
+// Style byte indicators were removed in version 3.4.3.
+// Anyone wanting to restore this functionality for wxGhostscript using 'modern'
+// indicators can examine the earlier source in the Mercurial repository.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsASelfDelimitingChar(const int ch) {
+    return (ch == '[' || ch == ']' || ch == '{' || ch == '}' ||
+            ch == '/' || ch == '<' || ch == '>' ||
+            ch == '(' || ch == ')' || ch == '%');
+}
+
+static inline bool IsAWhitespaceChar(const int ch) {
+    return (ch == ' '  || ch == '\t' || ch == '\r' ||
+            ch == '\n' || ch == '\f' || ch == '\0');
+}
+
+static bool IsABaseNDigit(const int ch, const int base) {
+    int maxdig = '9';
+    int letterext = -1;
+
+    if (base <= 10)
+        maxdig = '0' + base - 1;
+    else
+        letterext = base - 11;
+
+    return ((ch >= '0' && ch <= maxdig) ||
+            (ch >= 'A' && ch <= ('A' + letterext)) ||
+            (ch >= 'a' && ch <= ('a' + letterext)));
+}
+
+static inline bool IsABase85Char(const int ch) {
+    return ((ch >= '!' && ch <= 'u') || ch == 'z');
+}
+
+static void ColourisePSDoc(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords1 = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    WordList &keywords4 = *keywordlists[3];
+    WordList &keywords5 = *keywordlists[4];
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    int pslevel = styler.GetPropertyInt("ps.level", 3);
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int nestTextCurrent = 0;
+    if (lineCurrent > 0 && initStyle == SCE_PS_TEXT)
+        nestTextCurrent = styler.GetLineState(lineCurrent - 1);
+    int numRadix = 0;
+    bool numHasPoint = false;
+    bool numHasExponent = false;
+    bool numHasSign = false;
+
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart)
+            lineCurrent = styler.GetLine(sc.currentPos);
+
+        // Determine if the current state should terminate.
+        if (sc.state == SCE_PS_COMMENT || sc.state == SCE_PS_DSC_VALUE) {
+            if (sc.atLineEnd) {
+                sc.SetState(SCE_C_DEFAULT);
+            }
+        } else if (sc.state == SCE_PS_DSC_COMMENT) {
+            if (sc.ch == ':') {
+                sc.Forward();
+                if (!sc.atLineEnd)
+                    sc.SetState(SCE_PS_DSC_VALUE);
+                else
+                    sc.SetState(SCE_C_DEFAULT);
+            } else if (sc.atLineEnd) {
+                sc.SetState(SCE_C_DEFAULT);
+            } else if (IsAWhitespaceChar(sc.ch) && sc.ch != '\r') {
+                sc.ChangeState(SCE_PS_COMMENT);
+            }
+        } else if (sc.state == SCE_PS_NUMBER) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
+                if ((sc.chPrev == '+' || sc.chPrev == '-' ||
+                     sc.chPrev == 'E' || sc.chPrev == 'e') && numRadix == 0)
+                    sc.ChangeState(SCE_PS_NAME);
+                sc.SetState(SCE_C_DEFAULT);
+            } else if (sc.ch == '#') {
+                if (numHasPoint || numHasExponent || numHasSign || numRadix != 0) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    char szradix[5];
+                    sc.GetCurrent(szradix, 4);
+                    numRadix = atoi(szradix);
+                    if (numRadix < 2 || numRadix > 36)
+                        sc.ChangeState(SCE_PS_NAME);
+                }
+            } else if ((sc.ch == 'E' || sc.ch == 'e') && numRadix == 0) {
+                if (numHasExponent) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    numHasExponent = true;
+                    if (sc.chNext == '+' || sc.chNext == '-')
+                        sc.Forward();
+                }
+            } else if (sc.ch == '.') {
+                if (numHasPoint || numHasExponent || numRadix != 0) {
+                    sc.ChangeState(SCE_PS_NAME);
+                } else {
+                    numHasPoint = true;
+                }
+            } else if (numRadix == 0) {
+                if (!IsABaseNDigit(sc.ch, 10))
+                    sc.ChangeState(SCE_PS_NAME);
+            } else {
+                if (!IsABaseNDigit(sc.ch, numRadix))
+                    sc.ChangeState(SCE_PS_NAME);
+            }
+        } else if (sc.state == SCE_PS_NAME || sc.state == SCE_PS_KEYWORD) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch)) {
+                char s[100];
+                sc.GetCurrent(s, sizeof(s));
+                if ((pslevel >= 1 && keywords1.InList(s)) ||
+                    (pslevel >= 2 && keywords2.InList(s)) ||
+                    (pslevel >= 3 && keywords3.InList(s)) ||
+                    keywords4.InList(s) || keywords5.InList(s)) {
+                    sc.ChangeState(SCE_PS_KEYWORD);
+                }
+                sc.SetState(SCE_C_DEFAULT);
+            }
+        } else if (sc.state == SCE_PS_LITERAL || sc.state == SCE_PS_IMMEVAL) {
+            if (IsASelfDelimitingChar(sc.ch) || IsAWhitespaceChar(sc.ch))
+                sc.SetState(SCE_C_DEFAULT);
+        } else if (sc.state == SCE_PS_PAREN_ARRAY || sc.state == SCE_PS_PAREN_DICT ||
+                   sc.state == SCE_PS_PAREN_PROC) {
+            sc.SetState(SCE_C_DEFAULT);
+        } else if (sc.state == SCE_PS_TEXT) {
+            if (sc.ch == '(') {
+                nestTextCurrent++;
+            } else if (sc.ch == ')') {
+                if (--nestTextCurrent == 0)
+                   sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (sc.ch == '\\') {
+                sc.Forward();
+            }
+        } else if (sc.state == SCE_PS_HEXSTRING) {
+            if (sc.ch == '>') {
+                sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (!IsABaseNDigit(sc.ch, 16) && !IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_HEXSTRING);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            }
+        } else if (sc.state == SCE_PS_BASE85STRING) {
+            if (sc.Match('~', '>')) {
+                sc.Forward();
+                sc.ForwardSetState(SCE_PS_DEFAULT);
+            } else if (!IsABase85Char(sc.ch) && !IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_BASE85STRING);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            }
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_C_DEFAULT) {
+
+            if (sc.ch == '[' || sc.ch == ']') {
+                sc.SetState(SCE_PS_PAREN_ARRAY);
+            } else if (sc.ch == '{' || sc.ch == '}') {
+                sc.SetState(SCE_PS_PAREN_PROC);
+            } else if (sc.ch == '/') {
+                if (sc.chNext == '/') {
+                    sc.SetState(SCE_PS_IMMEVAL);
+                    sc.Forward();
+                } else {
+                    sc.SetState(SCE_PS_LITERAL);
+                }
+            } else if (sc.ch == '<') {
+                if (sc.chNext == '<') {
+                    sc.SetState(SCE_PS_PAREN_DICT);
+                    sc.Forward();
+                } else if (sc.chNext == '~') {
+                    sc.SetState(SCE_PS_BASE85STRING);
+                    sc.Forward();
+                } else {
+                    sc.SetState(SCE_PS_HEXSTRING);
+                }
+            } else if (sc.ch == '>' && sc.chNext == '>') {
+                    sc.SetState(SCE_PS_PAREN_DICT);
+                    sc.Forward();
+            } else if (sc.ch == '>' || sc.ch == ')') {
+                sc.SetState(SCE_C_DEFAULT);
+                styler.ColourTo(sc.currentPos, SCE_PS_BADSTRINGCHAR);
+            } else if (sc.ch == '(') {
+                sc.SetState(SCE_PS_TEXT);
+                nestTextCurrent = 1;
+            } else if (sc.ch == '%') {
+                if (sc.chNext == '%' && sc.atLineStart) {
+                    sc.SetState(SCE_PS_DSC_COMMENT);
+                    sc.Forward();
+                    if (sc.chNext == '+') {
+                        sc.Forward();
+                        sc.ForwardSetState(SCE_PS_DSC_VALUE);
+                    }
+                } else {
+                    sc.SetState(SCE_PS_COMMENT);
+                }
+            } else if ((sc.ch == '+' || sc.ch == '-' || sc.ch == '.') &&
+                       IsABaseNDigit(sc.chNext, 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = (sc.ch == '.');
+                numHasExponent = false;
+                numHasSign = (sc.ch == '+' || sc.ch == '-');
+            } else if ((sc.ch == '+' || sc.ch == '-') && sc.chNext == '.' &&
+                       IsABaseNDigit(sc.GetRelative(2), 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = false;
+                numHasExponent = false;
+                numHasSign = true;
+            } else if (IsABaseNDigit(sc.ch, 10)) {
+                sc.SetState(SCE_PS_NUMBER);
+                numRadix = 0;
+                numHasPoint = false;
+                numHasExponent = false;
+                numHasSign = false;
+            } else if (!IsAWhitespaceChar(sc.ch)) {
+                sc.SetState(SCE_PS_NAME);
+            }
+        }
+
+        if (sc.atLineEnd)
+            styler.SetLineState(lineCurrent, nestTextCurrent);
+    }
+
+    sc.Complete();
+}
+
+static void FoldPSDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                       Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');  //mac??
+        if ((style & 31) == SCE_PS_PAREN_PROC) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            } else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+static const char * const psWordListDesc[] = {
+    "PS Level 1 operators",
+    "PS Level 2 operators",
+    "PS Level 3 operators",
+    "RIP-specific operators",
+    "User-defined operators",
+    0
+};
+
+LexerModule lmPS(SCLEX_PS, ColourisePSDoc, "ps", FoldPSDoc, psWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPascal.cxx b/scite-app/lexilla/lexers/LexPascal.cxx
new file mode 100644
index 0000000..4aa88a9
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPascal.cxx
@@ -0,0 +1,616 @@
+// Scintilla source code edit control
+/** @file LexPascal.cxx
+ ** Lexer for Pascal.
+ ** Written by Laurent le Tynevez
+ ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
+ ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
+ ** Completely rewritten by Marko Njezic <sf@maxempire.com> October 2008
+ **/
+
+/*
+
+A few words about features of the new completely rewritten LexPascal...
+
+Generally speaking LexPascal tries to support all available Delphi features (up
+to Delphi XE4 at this time).
+
+~ HIGHLIGHTING:
+
+If you enable "lexer.pascal.smart.highlighting" property, some keywords will
+only be highlighted in appropriate context. As implemented those are keywords
+related to property and DLL exports declarations (similar to how Delphi IDE
+works).
+
+For example, keywords "read" and "write" will only be highlighted if they are in
+property declaration:
+
+property MyProperty: boolean read FMyProperty write FMyProperty;
+
+~ FOLDING:
+
+Folding is supported in the following cases:
+
+- Folding of stream-like comments
+- Folding of groups of consecutive line comments
+- Folding of preprocessor blocks (the following preprocessor blocks are
+supported: IF / IFEND; IFDEF, IFNDEF, IFOPT / ENDIF and REGION / ENDREGION
+blocks), including nesting of preprocessor blocks up to 255 levels
+- Folding of code blocks on appropriate keywords (the following code blocks are
+supported: "begin, asm, record, try, case / end" blocks, class & object
+declarations and interface declarations)
+
+Remarks:
+
+- Folding of code blocks tries to handle all special cases in which folding
+should not occur. As implemented those are:
+
+1. Structure "record case / end" (there's only one "end" statement and "case" is
+ignored as fold point)
+2. Forward class declarations ("type TMyClass = class;") and object method
+declarations ("TNotifyEvent = procedure(Sender: TObject) of object;") are
+ignored as fold points
+3. Simplified complete class declarations ("type TMyClass = class(TObject);")
+are ignored as fold points
+4. Every other situation when class keyword doesn't actually start class
+declaration ("class procedure", "class function", "class of", "class var",
+"class property" and "class operator")
+5. Forward (disp)interface declarations ("type IMyInterface = interface;") are
+ignored as fold points
+
+- Folding of code blocks inside preprocessor blocks is disabled (any comments
+inside them will be folded fine) because there is no guarantee that complete
+code block will be contained inside folded preprocessor block in which case
+folded code block could end prematurely at the end of preprocessor block if
+there is no closing statement inside. This was done in order to properly process
+document that may contain something like this:
+
+type
+{$IFDEF UNICODE}
+  TMyClass = class(UnicodeAncestor)
+{$ELSE}
+  TMyClass = class(AnsiAncestor)
+{$ENDIF}
+  private
+  ...
+  public
+  ...
+  published
+  ...
+end;
+
+If class declarations were folded, then the second class declaration would end
+at "$ENDIF" statement, first class statement would end at "end;" statement and
+preprocessor "$IFDEF" block would go all the way to the end of document.
+However, having in mind all this, if you want to enable folding of code blocks
+inside preprocessor blocks, you can disable folding of preprocessor blocks by
+changing "fold.preprocessor" property, in which case everything inside them
+would be folded.
+
+~ KEYWORDS:
+
+The list of keywords that can be used in pascal.properties file (up to Delphi
+XE4):
+
+- Keywords: absolute abstract and array as asm assembler automated begin case
+cdecl class const constructor delayed deprecated destructor dispid dispinterface
+div do downto dynamic else end except experimental export exports external far
+file final finalization finally for forward function goto helper if
+implementation in inherited initialization inline interface is label library
+message mod near nil not object of on operator or out overload override packed
+pascal platform private procedure program property protected public published
+raise record reference register reintroduce repeat resourcestring safecall
+sealed set shl shr static stdcall strict string then threadvar to try type unit
+unsafe until uses var varargs virtual while winapi with xor
+
+- Keywords related to the "smart highlithing" feature: add default implements
+index name nodefault read readonly remove stored write writeonly
+
+- Keywords related to Delphi packages (in addition to all above): package
+contains requires
+
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void GetRangeLowered(Sci_PositionU start,
+		Sci_PositionU end,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void GetForwardRangeLowered(Sci_PositionU start,
+		CharacterSet &charSet,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < len-1) && charSet.Contains(styler.SafeGetCharAt(start + i))) {
+		s[i] = static_cast<char>(tolower(styler.SafeGetCharAt(start + i)));
+		i++;
+	}
+	s[i] = '\0';
+
+}
+
+enum {
+	stateInAsm = 0x1000,
+	stateInProperty = 0x2000,
+	stateInExport = 0x4000,
+	stateFoldInPreprocessor = 0x0100,
+	stateFoldInRecord = 0x0200,
+	stateFoldInPreprocessorLevelMask = 0x00FF,
+	stateFoldMaskAll = 0x0FFF
+};
+
+static void ClassifyPascalWord(WordList *keywordlists[], StyleContext &sc, int &curLineState, bool bSmartHighlighting) {
+	WordList& keywords = *keywordlists[0];
+
+	char s[100];
+	sc.GetCurrentLowered(s, sizeof(s));
+	if (keywords.InList(s)) {
+		if (curLineState & stateInAsm) {
+			if (strcmp(s, "end") == 0 && sc.GetRelative(-4) != '@') {
+				curLineState &= ~stateInAsm;
+				sc.ChangeState(SCE_PAS_WORD);
+			} else {
+				sc.ChangeState(SCE_PAS_ASM);
+			}
+		} else {
+			bool ignoreKeyword = false;
+			if (strcmp(s, "asm") == 0) {
+				curLineState |= stateInAsm;
+			} else if (bSmartHighlighting) {
+				if (strcmp(s, "property") == 0) {
+					curLineState |= stateInProperty;
+				} else if (strcmp(s, "exports") == 0) {
+					curLineState |= stateInExport;
+				} else if (!(curLineState & (stateInProperty | stateInExport)) && strcmp(s, "index") == 0) {
+					ignoreKeyword = true;
+				} else if (!(curLineState & stateInExport) && strcmp(s, "name") == 0) {
+					ignoreKeyword = true;
+				} else if (!(curLineState & stateInProperty) &&
+					(strcmp(s, "read") == 0 || strcmp(s, "write") == 0 ||
+					 strcmp(s, "default") == 0 || strcmp(s, "nodefault") == 0 ||
+					 strcmp(s, "stored") == 0 || strcmp(s, "implements") == 0 ||
+					 strcmp(s, "readonly") == 0 || strcmp(s, "writeonly") == 0 ||
+					 strcmp(s, "add") == 0 || strcmp(s, "remove") == 0)) {
+					ignoreKeyword = true;
+				}
+			}
+			if (!ignoreKeyword) {
+				sc.ChangeState(SCE_PAS_WORD);
+			}
+		}
+	} else if (curLineState & stateInAsm) {
+		sc.ChangeState(SCE_PAS_ASM);
+	}
+	sc.SetState(SCE_PAS_DEFAULT);
+}
+
+static void ColourisePascalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+		Accessor &styler) {
+	bool bSmartHighlighting = styler.GetPropertyInt("lexer.pascal.smart.highlighting", 1) != 0;
+
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
+	CharacterSet setNumber(CharacterSet::setDigits, ".-+eE");
+	CharacterSet setHexNumber(CharacterSet::setDigits, "abcdefABCDEF");
+	CharacterSet setOperator(CharacterSet::setNone, "#$&'()*+,-./:;<=>@[]^{}");
+
+	Sci_Position curLine = styler.GetLine(startPos);
+	int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineEnd) {
+			// Update the line state, so it can be seen by next line
+			curLine = styler.GetLine(sc.currentPos);
+			styler.SetLineState(curLine, curLineState);
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_PAS_NUMBER:
+				if (!setNumber.Contains(sc.ch) || (sc.ch == '.' && sc.chNext == '.')) {
+					sc.SetState(SCE_PAS_DEFAULT);
+				} else if (sc.ch == '-' || sc.ch == '+') {
+					if (sc.chPrev != 'E' && sc.chPrev != 'e') {
+						sc.SetState(SCE_PAS_DEFAULT);
+					}
+				}
+				break;
+			case SCE_PAS_IDENTIFIER:
+				if (!setWord.Contains(sc.ch)) {
+					ClassifyPascalWord(keywordlists, sc, curLineState, bSmartHighlighting);
+				}
+				break;
+			case SCE_PAS_HEXNUMBER:
+				if (!setHexNumber.Contains(sc.ch)) {
+					sc.SetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_COMMENT:
+			case SCE_PAS_PREPROCESSOR:
+				if (sc.ch == '}') {
+					sc.ForwardSetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_COMMENT2:
+			case SCE_PAS_PREPROCESSOR2:
+				if (sc.Match('*', ')')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_STRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_PAS_STRINGEOL);
+				} else if (sc.ch == '\'' && sc.chNext == '\'') {
+					sc.Forward();
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_CHARACTER:
+				if (!setHexNumber.Contains(sc.ch) && sc.ch != '$') {
+					sc.SetState(SCE_PAS_DEFAULT);
+				}
+				break;
+			case SCE_PAS_OPERATOR:
+				if (bSmartHighlighting && sc.chPrev == ';') {
+					curLineState &= ~(stateInProperty | stateInExport);
+				}
+				sc.SetState(SCE_PAS_DEFAULT);
+				break;
+			case SCE_PAS_ASM:
+				sc.SetState(SCE_PAS_DEFAULT);
+				break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_PAS_DEFAULT) {
+			if (IsADigit(sc.ch) && !(curLineState & stateInAsm)) {
+				sc.SetState(SCE_PAS_NUMBER);
+			} else if (setWordStart.Contains(sc.ch)) {
+				sc.SetState(SCE_PAS_IDENTIFIER);
+			} else if (sc.ch == '$' && !(curLineState & stateInAsm)) {
+				sc.SetState(SCE_PAS_HEXNUMBER);
+			} else if (sc.Match('{', '$')) {
+				sc.SetState(SCE_PAS_PREPROCESSOR);
+			} else if (sc.ch == '{') {
+				sc.SetState(SCE_PAS_COMMENT);
+			} else if (sc.Match("(*$")) {
+				sc.SetState(SCE_PAS_PREPROCESSOR2);
+			} else if (sc.Match('(', '*')) {
+				sc.SetState(SCE_PAS_COMMENT2);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_PAS_COMMENTLINE);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_PAS_STRING);
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_PAS_CHARACTER);
+			} else if (setOperator.Contains(sc.ch) && !(curLineState & stateInAsm)) {
+				sc.SetState(SCE_PAS_OPERATOR);
+			} else if (curLineState & stateInAsm) {
+				sc.SetState(SCE_PAS_ASM);
+			}
+		}
+	}
+
+	if (sc.state == SCE_PAS_IDENTIFIER && setWord.Contains(sc.chPrev)) {
+		ClassifyPascalWord(keywordlists, sc, curLineState, bSmartHighlighting);
+	}
+
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_PAS_COMMENT || style == SCE_PAS_COMMENT2;
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eolPos; i++) {
+		char ch = styler[i];
+		char chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		if (ch == '/' && chNext == '/' && style == SCE_PAS_COMMENTLINE) {
+			return true;
+		} else if (!IsASpaceOrTab(ch)) {
+			return false;
+		}
+	}
+	return false;
+}
+
+static unsigned int GetFoldInPreprocessorLevelFlag(int lineFoldStateCurrent) {
+	return lineFoldStateCurrent & stateFoldInPreprocessorLevelMask;
+}
+
+static void SetFoldInPreprocessorLevelFlag(int &lineFoldStateCurrent, unsigned int nestLevel) {
+	lineFoldStateCurrent &= ~stateFoldInPreprocessorLevelMask;
+	lineFoldStateCurrent |= nestLevel & stateFoldInPreprocessorLevelMask;
+}
+
+static void ClassifyPascalPreprocessorFoldPoint(int &levelCurrent, int &lineFoldStateCurrent,
+		Sci_PositionU startPos, Accessor &styler) {
+	CharacterSet setWord(CharacterSet::setAlpha);
+
+	char s[11];	// Size of the longest possible keyword + one additional character + null
+	GetForwardRangeLowered(startPos, setWord, styler, s, sizeof(s));
+
+	unsigned int nestLevel = GetFoldInPreprocessorLevelFlag(lineFoldStateCurrent);
+
+	if (strcmp(s, "if") == 0 ||
+		strcmp(s, "ifdef") == 0 ||
+		strcmp(s, "ifndef") == 0 ||
+		strcmp(s, "ifopt") == 0 ||
+		strcmp(s, "region") == 0) {
+		nestLevel++;
+		SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel);
+		lineFoldStateCurrent |= stateFoldInPreprocessor;
+		levelCurrent++;
+	} else if (strcmp(s, "endif") == 0 ||
+		strcmp(s, "ifend") == 0 ||
+		strcmp(s, "endregion") == 0) {
+		nestLevel--;
+		SetFoldInPreprocessorLevelFlag(lineFoldStateCurrent, nestLevel);
+		if (nestLevel == 0) {
+			lineFoldStateCurrent &= ~stateFoldInPreprocessor;
+		}
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+static Sci_PositionU SkipWhiteSpace(Sci_PositionU currentPos, Sci_PositionU endPos,
+		Accessor &styler, bool includeChars = false) {
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_");
+	Sci_PositionU j = currentPos + 1;
+	char ch = styler.SafeGetCharAt(j);
+	while ((j < endPos) && (IsASpaceOrTab(ch) || ch == '\r' || ch == '\n' ||
+		IsStreamCommentStyle(styler.StyleAt(j)) || (includeChars && setWord.Contains(ch)))) {
+		j++;
+		ch = styler.SafeGetCharAt(j);
+	}
+	return j;
+}
+
+static void ClassifyPascalWordFoldPoint(int &levelCurrent, int &lineFoldStateCurrent,
+		Sci_Position startPos, Sci_PositionU endPos,
+		Sci_PositionU lastStart, Sci_PositionU currentPos, Accessor &styler) {
+	char s[100];
+	GetRangeLowered(lastStart, currentPos, styler, s, sizeof(s));
+
+	if (strcmp(s, "record") == 0) {
+		lineFoldStateCurrent |= stateFoldInRecord;
+		levelCurrent++;
+	} else if (strcmp(s, "begin") == 0 ||
+		strcmp(s, "asm") == 0 ||
+		strcmp(s, "try") == 0 ||
+		(strcmp(s, "case") == 0 && !(lineFoldStateCurrent & stateFoldInRecord))) {
+		levelCurrent++;
+	} else if (strcmp(s, "class") == 0 || strcmp(s, "object") == 0) {
+		// "class" & "object" keywords require special handling...
+		bool ignoreKeyword = false;
+		Sci_PositionU j = SkipWhiteSpace(currentPos, endPos, styler);
+		if (j < endPos) {
+			CharacterSet setWordStart(CharacterSet::setAlpha, "_");
+			CharacterSet setWord(CharacterSet::setAlphaNum, "_");
+
+			if (styler.SafeGetCharAt(j) == ';') {
+				// Handle forward class declarations ("type TMyClass = class;")
+				// and object method declarations ("TNotifyEvent = procedure(Sender: TObject) of object;")
+				ignoreKeyword = true;
+			} else if (strcmp(s, "class") == 0) {
+				// "class" keyword has a few more special cases...
+				if (styler.SafeGetCharAt(j) == '(') {
+					// Handle simplified complete class declarations ("type TMyClass = class(TObject);")
+					j = SkipWhiteSpace(j, endPos, styler, true);
+					if (j < endPos && styler.SafeGetCharAt(j) == ')') {
+						j = SkipWhiteSpace(j, endPos, styler);
+						if (j < endPos && styler.SafeGetCharAt(j) == ';') {
+							ignoreKeyword = true;
+						}
+					}
+				} else if (setWordStart.Contains(styler.SafeGetCharAt(j))) {
+					char s2[11];	// Size of the longest possible keyword + one additional character + null
+					GetForwardRangeLowered(j, setWord, styler, s2, sizeof(s2));
+
+					if (strcmp(s2, "procedure") == 0 ||
+						strcmp(s2, "function") == 0 ||
+						strcmp(s2, "of") == 0 ||
+						strcmp(s2, "var") == 0 ||
+						strcmp(s2, "property") == 0 ||
+						strcmp(s2, "operator") == 0) {
+						ignoreKeyword = true;
+					}
+				}
+			}
+		}
+		if (!ignoreKeyword) {
+			levelCurrent++;
+		}
+	} else if (strcmp(s, "interface") == 0) {
+		// "interface" keyword requires special handling...
+		bool ignoreKeyword = true;
+		Sci_Position j = lastStart - 1;
+		char ch = styler.SafeGetCharAt(j);
+		while ((j >= startPos) && (IsASpaceOrTab(ch) || ch == '\r' || ch == '\n' ||
+			IsStreamCommentStyle(styler.StyleAt(j)))) {
+			j--;
+			ch = styler.SafeGetCharAt(j);
+		}
+		if (j >= startPos && styler.SafeGetCharAt(j) == '=') {
+			ignoreKeyword = false;
+		}
+		if (!ignoreKeyword) {
+			Sci_PositionU k = SkipWhiteSpace(currentPos, endPos, styler);
+			if (k < endPos && styler.SafeGetCharAt(k) == ';') {
+				// Handle forward interface declarations ("type IMyInterface = interface;")
+				ignoreKeyword = true;
+			}
+		}
+		if (!ignoreKeyword) {
+			levelCurrent++;
+		}
+	} else if (strcmp(s, "dispinterface") == 0) {
+		// "dispinterface" keyword requires special handling...
+		bool ignoreKeyword = false;
+		Sci_PositionU j = SkipWhiteSpace(currentPos, endPos, styler);
+		if (j < endPos && styler.SafeGetCharAt(j) == ';') {
+			// Handle forward dispinterface declarations ("type IMyInterface = dispinterface;")
+			ignoreKeyword = true;
+		}
+		if (!ignoreKeyword) {
+			levelCurrent++;
+		}
+	} else if (strcmp(s, "end") == 0) {
+		lineFoldStateCurrent &= ~stateFoldInRecord;
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+static void FoldPascalDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+		Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	int lineFoldStateCurrent = lineCurrent > 0 ? styler.GetLineState(lineCurrent - 1) & stateFoldMaskAll : 0;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+
+	Sci_Position lastStart = 0;
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+		if (foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+		{
+			if (!IsCommentLine(lineCurrent - 1, styler)
+			    && IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+			         && !IsCommentLine(lineCurrent+1, styler))
+				levelCurrent--;
+		}
+		if (foldPreprocessor) {
+			if (style == SCE_PAS_PREPROCESSOR && ch == '{' && chNext == '$') {
+				ClassifyPascalPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 2, styler);
+			} else if (style == SCE_PAS_PREPROCESSOR2 && ch == '(' && chNext == '*'
+			           && styler.SafeGetCharAt(i + 2) == '$') {
+				ClassifyPascalPreprocessorFoldPoint(levelCurrent, lineFoldStateCurrent, i + 3, styler);
+			}
+		}
+
+		if (stylePrev != SCE_PAS_WORD && style == SCE_PAS_WORD)
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+		if (stylePrev == SCE_PAS_WORD && !(lineFoldStateCurrent & stateFoldInPreprocessor)) {
+			if(setWord.Contains(ch) && !setWord.Contains(chNext)) {
+				ClassifyPascalWordFoldPoint(levelCurrent, lineFoldStateCurrent, startPos, endPos, lastStart, i, styler);
+			}
+		}
+
+		if (!IsASpace(ch))
+			visibleChars++;
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			int newLineState = (styler.GetLineState(lineCurrent) & ~stateFoldMaskAll) | lineFoldStateCurrent;
+			styler.SetLineState(lineCurrent, newLineState);
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+
+	// If we didn't reach the EOL in previous loop, store line level and whitespace information.
+	// The rest will be filled in later...
+	int lev = levelPrev;
+	if (visibleChars == 0 && foldCompact)
+		lev |= SC_FOLDLEVELWHITEFLAG;
+	styler.SetLevel(lineCurrent, lev);
+}
+
+static const char * const pascalWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmPascal(SCLEX_PASCAL, ColourisePascalDoc, "pascal", FoldPascalDoc, pascalWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPerl.cxx b/scite-app/lexilla/lexers/LexPerl.cxx
new file mode 100644
index 0000000..1ba426e
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPerl.cxx
@@ -0,0 +1,1851 @@
+// Scintilla source code edit control
+/** @file LexPerl.cxx
+ ** Lexer for Perl.
+ ** Converted to lexer object by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2008 by Neil Hodgson <neilh@scintilla.org>
+// Lexical analysis fixes by Kein-Hong Man <mkh@pl.jaring.my>
+// 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 <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+// Info for HERE document handling from perldata.pod (reformatted):
+// ----------------------------------------------------------------
+// A line-oriented form of quoting is based on the shell ``here-doc'' syntax.
+// Following a << you specify a string to terminate the quoted material, and
+// all lines following the current line down to the terminating string are
+// the value of the item.
+// Prefixing the terminating string with a "~" specifies that you want to
+// use "Indented Here-docs" (see below).
+// * The terminating string may be either an identifier (a word), or some
+//   quoted text.
+// * If quoted, the type of quotes you use determines the treatment of the
+//   text, just as in regular quoting.
+// * An unquoted identifier works like double quotes.
+// * There must be no space between the << and the identifier.
+//   (If you put a space it will be treated as a null identifier,
+//    which is valid, and matches the first empty line.)
+//   (This is deprecated, -w warns of this syntax)
+// * The terminating string must appear by itself (unquoted and
+//   with no surrounding whitespace) on the terminating line.
+//
+// Indented Here-docs
+// ------------------
+// The here-doc modifier "~" allows you to indent your here-docs to
+// make the code more readable.
+// The delimiter is used to determine the exact whitespace to remove
+// from the beginning of each line. All lines must have at least the
+// same starting whitespace (except lines only containing a newline)
+// or perl will croak. Tabs and spaces can be mixed, but are matched
+// exactly. One tab will not be equal to 8 spaces!
+// Additional beginning whitespace (beyond what preceded the
+// delimiter) will be preserved.
+
+#define HERE_DELIM_MAX 256		// maximum length of HERE doc delimiter
+
+#define PERLNUM_BINARY		1	// order is significant: 1-3 cannot have a dot
+#define PERLNUM_OCTAL		2
+#define PERLNUM_FLOAT_EXP	3	// exponent part only
+#define PERLNUM_HEX			4	// may be a hex float
+#define PERLNUM_DECIMAL		5	// 1-5 are numbers; 6-7 are strings
+#define PERLNUM_VECTOR		6
+#define PERLNUM_V_VECTOR	7
+#define PERLNUM_BAD			8
+
+#define BACK_NONE		0	// lookback state for bareword disambiguation:
+#define BACK_OPERATOR	1	// whitespace/comments are insignificant
+#define BACK_KEYWORD	2	// operators/keywords are needed for disambiguation
+
+#define SUB_BEGIN		0	// states for subroutine prototype scan:
+#define SUB_HAS_PROTO	1	// only 'prototype' attribute allows prototypes
+#define SUB_HAS_ATTRIB	2	// other attributes can exist leftward
+#define SUB_HAS_MODULE	3	// sub name can have a ::identifier part
+#define SUB_HAS_SUB		4	// 'sub' keyword
+
+// all interpolated styles are different from their parent styles by a constant difference
+// we also assume SCE_PL_STRING_VAR is the interpolated style with the smallest value
+#define	INTERPOLATE_SHIFT	(SCE_PL_STRING_VAR - SCE_PL_STRING)
+
+static bool isPerlKeyword(Sci_PositionU start, Sci_PositionU end, WordList &keywords, LexAccessor &styler) {
+	// old-style keyword matcher; needed because GetCurrent() needs
+	// current segment to be committed, but we may abandon early...
+	char s[100];
+	Sci_PositionU i, len = end - start;
+	if (len > 30) { len = 30; }
+	for (i = 0; i < len; i++, start++) s[i] = styler[start];
+	s[i] = '\0';
+	return keywords.InList(s);
+}
+
+static int disambiguateBareword(LexAccessor &styler, Sci_PositionU bk, Sci_PositionU fw,
+        int backFlag, Sci_PositionU backPos, Sci_PositionU endPos) {
+	// identifiers are recognized by Perl as barewords under some
+	// conditions, the following attempts to do the disambiguation
+	// by looking backward and forward; result in 2 LSB
+	int result = 0;
+	bool moreback = false;		// true if passed newline/comments
+	bool brace = false;			// true if opening brace found
+	// if BACK_NONE, neither operator nor keyword, so skip test
+	if (backFlag == BACK_NONE)
+		return result;
+	// first look backwards past whitespace/comments to set EOL flag
+	// (some disambiguation patterns must be on a single line)
+	if (backPos <= static_cast<Sci_PositionU>(styler.LineStart(styler.GetLine(bk))))
+		moreback = true;
+	// look backwards at last significant lexed item for disambiguation
+	bk = backPos - 1;
+	int ch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+	if (ch == '{' && !moreback) {
+		// {bareword: possible variable spec
+		brace = true;
+	} else if ((ch == '&' && styler.SafeGetCharAt(bk - 1) != '&')
+	        // &bareword: subroutine call
+	        || styler.Match(bk - 1, "->")
+	        // ->bareword: part of variable spec
+	        || styler.Match(bk - 1, "::")
+	        // ::bareword: part of module spec
+	        || styler.Match(bk - 2, "sub")) {
+	        // sub bareword: subroutine declaration
+	        // (implied BACK_KEYWORD, no keywords end in 'sub'!)
+		result |= 1;
+	}
+	// next, scan forward after word past tab/spaces only;
+	// if ch isn't one of '[{(,' we can skip the test
+	if ((ch == '{' || ch == '(' || ch == '['|| ch == ',')
+	        && fw < endPos) {
+		while (IsASpaceOrTab(ch = static_cast<unsigned char>(styler.SafeGetCharAt(fw)))
+		        && fw < endPos) {
+			fw++;
+		}
+		if ((ch == '}' && brace)
+		        // {bareword}: variable spec
+		        || styler.Match(fw, "=>")) {
+		        // [{(, bareword=>: hash literal
+			result |= 2;
+		}
+	}
+	return result;
+}
+
+static void skipWhitespaceComment(LexAccessor &styler, Sci_PositionU &p) {
+	// when backtracking, we need to skip whitespace and comments
+	while (p > 0) {
+		const int style = styler.StyleAt(p);
+		if (style != SCE_PL_DEFAULT && style != SCE_PL_COMMENTLINE)
+			break;
+		p--;
+	}
+}
+
+static int findPrevLexeme(LexAccessor &styler, Sci_PositionU &bk, int &style) {
+	// scan backward past whitespace and comments to find a lexeme
+	skipWhitespaceComment(styler, bk);
+	if (bk == 0)
+		return 0;
+	int sz = 1;
+	style = styler.StyleAt(bk);
+	while (bk > 0) {	// find extent of lexeme
+		if (styler.StyleAt(bk - 1) == style) {
+			bk--; sz++;
+		} else
+			break;
+	}
+	return sz;
+}
+
+static int styleBeforeBracePair(LexAccessor &styler, Sci_PositionU bk) {
+	// backtrack to find open '{' corresponding to a '}', balanced
+	// return significant style to be tested for '/' disambiguation
+	int braceCount = 1;
+	if (bk == 0)
+		return SCE_PL_DEFAULT;
+	while (--bk > 0) {
+		if (styler.StyleAt(bk) == SCE_PL_OPERATOR) {
+			int bkch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+			if (bkch == ';') {	// early out
+				break;
+			} else if (bkch == '}') {
+				braceCount++;
+			} else if (bkch == '{') {
+				if (--braceCount == 0) break;
+			}
+		}
+	}
+	if (bk > 0 && braceCount == 0) {
+		// balanced { found, bk > 0, skip more whitespace/comments
+		bk--;
+		skipWhitespaceComment(styler, bk);
+		return styler.StyleAt(bk);
+	}
+	return SCE_PL_DEFAULT;
+}
+
+static int styleCheckIdentifier(LexAccessor &styler, Sci_PositionU bk) {
+	// backtrack to classify sub-styles of identifier under test
+	// return sub-style to be tested for '/' disambiguation
+	if (styler.SafeGetCharAt(bk) == '>')	// inputsymbol, like <foo>
+		return 1;
+	// backtrack to check for possible "->" or "::" before identifier
+	while (bk > 0 && styler.StyleAt(bk) == SCE_PL_IDENTIFIER) {
+		bk--;
+	}
+	while (bk > 0) {
+		int bkstyle = styler.StyleAt(bk);
+		if (bkstyle == SCE_PL_DEFAULT
+		        || bkstyle == SCE_PL_COMMENTLINE) {
+			// skip whitespace, comments
+		} else if (bkstyle == SCE_PL_OPERATOR) {
+			// test for "->" and "::"
+			if (styler.Match(bk - 1, "->") || styler.Match(bk - 1, "::"))
+				return 2;
+		} else
+			return 3;	// bare identifier
+		bk--;
+	}
+	return 0;
+}
+
+static int podLineScan(LexAccessor &styler, Sci_PositionU &pos, Sci_PositionU endPos) {
+	// forward scan the current line to classify line for POD style
+	int state = -1;
+	while (pos < endPos) {
+		int ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos));
+		if (ch == '\n' || ch == '\r') {
+			if (ch == '\r' && styler.SafeGetCharAt(pos + 1) == '\n') pos++;
+			break;
+		}
+		if (IsASpaceOrTab(ch)) {	// whitespace, take note
+			if (state == -1)
+				state = SCE_PL_DEFAULT;
+		} else if (state == SCE_PL_DEFAULT) {	// verbatim POD line
+			state = SCE_PL_POD_VERB;
+		} else if (state != SCE_PL_POD_VERB) {	// regular POD line
+			state = SCE_PL_POD;
+		}
+		pos++;
+	}
+	if (state == -1)
+		state = SCE_PL_DEFAULT;
+	return state;
+}
+
+static bool styleCheckSubPrototype(LexAccessor &styler, Sci_PositionU bk) {
+	// backtrack to identify if we're starting a subroutine prototype
+	// we also need to ignore whitespace/comments, format is like:
+	//     sub abc::pqr :const :prototype(...)
+	// lexemes are tested in pairs, e.g. '::'+'pqr', ':'+'const', etc.
+	// and a state machine generates legal subroutine syntax matches
+	styler.Flush();
+	int state = SUB_BEGIN;
+	do {
+		// find two lexemes, lexeme 2 follows lexeme 1
+		int style2 = SCE_PL_DEFAULT;
+		Sci_PositionU pos2 = bk;
+		int len2 = findPrevLexeme(styler, pos2, style2);
+		int style1 = SCE_PL_DEFAULT;
+		Sci_PositionU pos1 = pos2;
+		if (pos1 > 0) pos1--;
+		int len1 = findPrevLexeme(styler, pos1, style1);
+		if (len1 == 0 || len2 == 0)		// lexeme pair must exist
+			break;
+
+		// match parts of syntax, if invalid subroutine syntax, break off
+		if (style1 == SCE_PL_OPERATOR && len1 == 1 &&
+		    styler.SafeGetCharAt(pos1) == ':') {	// ':'
+			if (style2 == SCE_PL_IDENTIFIER || style2 == SCE_PL_WORD) {
+				if (len2 == 9 && styler.Match(pos2, "prototype")) {	// ':' 'prototype'
+					if (state == SUB_BEGIN) {
+						state = SUB_HAS_PROTO;
+					} else
+						break;
+				} else {	// ':' <attribute>
+					if (state == SUB_HAS_PROTO || state == SUB_HAS_ATTRIB) {
+						state = SUB_HAS_ATTRIB;
+					} else
+						break;
+				}
+			} else
+				break;
+		} else if (style1 == SCE_PL_OPERATOR && len1 == 2 &&
+		           styler.Match(pos1, "::")) {	// '::'
+			if (style2 == SCE_PL_IDENTIFIER) {	// '::' <identifier>
+				state = SUB_HAS_MODULE;
+			} else
+				break;
+		} else if (style1 == SCE_PL_WORD && len1 == 3 &&
+		           styler.Match(pos1, "sub")) {	// 'sub'
+			if (style2 == SCE_PL_IDENTIFIER) {	// 'sub' <identifier>
+				state = SUB_HAS_SUB;
+			} else
+				break;
+		} else
+			break;
+		bk = pos1;			// set position for finding next lexeme pair
+		if (bk > 0) bk--;
+	} while (state != SUB_HAS_SUB);
+	return (state == SUB_HAS_SUB);
+}
+
+static int actualNumStyle(int numberStyle) {
+	if (numberStyle == PERLNUM_VECTOR || numberStyle == PERLNUM_V_VECTOR) {
+		return SCE_PL_STRING;
+	} else if (numberStyle == PERLNUM_BAD) {
+		return SCE_PL_ERROR;
+	}
+	return SCE_PL_NUMBER;
+}
+
+static int opposite(int ch) {
+	if (ch == '(') return ')';
+	if (ch == '[') return ']';
+	if (ch == '{') return '}';
+	if (ch == '<') return '>';
+	return ch;
+}
+
+static bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (ch == '#' && style == SCE_PL_COMMENTLINE)
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static bool IsPackageLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	int style = styler.StyleAt(pos);
+	if (style == SCE_PL_WORD && styler.Match(pos, "package")) {
+		return true;
+	}
+	return false;
+}
+
+static int PodHeadingLevel(Sci_Position pos, LexAccessor &styler) {
+	int lvl = static_cast<unsigned char>(styler.SafeGetCharAt(pos + 5));
+	if (lvl >= '1' && lvl <= '4') {
+		return lvl - '0';
+	}
+	return 0;
+}
+
+// An individual named option for use in an OptionSet
+
+// Options used for LexerPerl
+struct OptionsPerl {
+	bool fold;
+	bool foldComment;
+	bool foldCompact;
+	// Custom folding of POD and packages
+	bool foldPOD;            // fold.perl.pod
+	// Enable folding Pod blocks when using the Perl lexer.
+	bool foldPackage;        // fold.perl.package
+	// Enable folding packages when using the Perl lexer.
+
+	bool foldCommentExplicit;
+
+	bool foldAtElse;
+
+	OptionsPerl() {
+		fold = false;
+		foldComment = false;
+		foldCompact = true;
+		foldPOD = true;
+		foldPackage = true;
+		foldCommentExplicit = true;
+		foldAtElse = false;
+	}
+};
+
+static const char *const perlWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+struct OptionSetPerl : public OptionSet<OptionsPerl> {
+	OptionSetPerl() {
+		DefineProperty("fold", &OptionsPerl::fold);
+
+		DefineProperty("fold.comment", &OptionsPerl::foldComment);
+
+		DefineProperty("fold.compact", &OptionsPerl::foldCompact);
+
+		DefineProperty("fold.perl.pod", &OptionsPerl::foldPOD,
+		        "Set to 0 to disable folding Pod blocks when using the Perl lexer.");
+
+		DefineProperty("fold.perl.package", &OptionsPerl::foldPackage,
+		        "Set to 0 to disable folding packages when using the Perl lexer.");
+
+		DefineProperty("fold.perl.comment.explicit", &OptionsPerl::foldCommentExplicit,
+		        "Set to 0 to disable explicit folding.");
+
+		DefineProperty("fold.perl.at.else", &OptionsPerl::foldAtElse,
+		               "This option enables Perl folding on a \"} else {\" line of an if statement.");
+
+		DefineWordListSets(perlWordListDesc);
+	}
+};
+
+class LexerPerl : public DefaultLexer {
+	CharacterSet setWordStart;
+	CharacterSet setWord;
+	CharacterSet setSpecialVar;
+	CharacterSet setControlVar;
+	WordList keywords;
+	OptionsPerl options;
+	OptionSetPerl osPerl;
+public:
+	LexerPerl() :
+		DefaultLexer("perl", SCLEX_PERL),
+		setWordStart(CharacterSet::setAlpha, "_", 0x80, true),
+		setWord(CharacterSet::setAlphaNum, "_", 0x80, true),
+		setSpecialVar(CharacterSet::setNone, "\"$;<>&`'+,./\\%:=~!?@[]"),
+		setControlVar(CharacterSet::setNone, "ACDEFHILMNOPRSTVWX") {
+	}
+	virtual ~LexerPerl() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return osPerl.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osPerl.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return osPerl.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osPerl.PropertyGet(key);
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return osPerl.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void *SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	static ILexer5 *LexerFactoryPerl() {
+		return new LexerPerl();
+	}
+	int InputSymbolScan(StyleContext &sc);
+	void InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern=false);
+};
+
+Sci_Position SCI_METHOD LexerPerl::PropertySet(const char *key, const char *val) {
+	if (osPerl.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerPerl::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+int LexerPerl::InputSymbolScan(StyleContext &sc) {
+	// forward scan for matching > on same line; file handles
+	int c, sLen = 0;
+	while ((c = sc.GetRelativeCharacter(++sLen)) != 0) {
+		if (c == '\r' || c == '\n') {
+			return 0;
+		} else if (c == '>') {
+			if (sc.Match("<=>"))	// '<=>' case
+				return 0;
+			return sLen;
+		}
+	}
+	return 0;
+}
+
+void LexerPerl::InterpolateSegment(StyleContext &sc, int maxSeg, bool isPattern) {
+	// interpolate a segment (with no active backslashes or delimiters within)
+	// switch in or out of an interpolation style or continue current style
+	// commit variable patterns if found, trim segment, repeat until done
+	while (maxSeg > 0) {
+		bool isVar = false;
+		int sLen = 0;
+		if ((maxSeg > 1) && (sc.ch == '$' || sc.ch == '@')) {
+			// $#[$]*word [$@][$]*word (where word or {word} is always present)
+			bool braces = false;
+			sLen = 1;
+			if (sc.ch == '$' && sc.chNext == '#') {	// starts with $#
+				sLen++;
+			}
+			while ((maxSeg > sLen) && (sc.GetRelativeCharacter(sLen) == '$'))	// >0 $ dereference within
+				sLen++;
+			if ((maxSeg > sLen) && (sc.GetRelativeCharacter(sLen) == '{')) {	// { start for {word}
+				sLen++;
+				braces = true;
+			}
+			if (maxSeg > sLen) {
+				int c = sc.GetRelativeCharacter(sLen);
+				if (setWordStart.Contains(c)) {	// word (various)
+					sLen++;
+					isVar = true;
+					while (maxSeg > sLen) {
+						if (!setWord.Contains(sc.GetRelativeCharacter(sLen)))
+							break;
+						sLen++;
+					}
+				} else if (braces && IsADigit(c) && (sLen == 2)) {	// digit for ${digit}
+					sLen++;
+					isVar = true;
+				}
+			}
+			if (braces) {
+				if ((maxSeg > sLen) && (sc.GetRelativeCharacter(sLen) == '}')) {	// } end for {word}
+					sLen++;
+				} else
+					isVar = false;
+			}
+		}
+		if (!isVar && (maxSeg > 1)) {	// $- or @-specific variable patterns
+			int c = sc.chNext;
+			if (sc.ch == '$') {
+				sLen = 1;
+				if (IsADigit(c)) {	// $[0-9] and slurp trailing digits
+					sLen++;
+					isVar = true;
+					while ((maxSeg > sLen) && IsADigit(sc.GetRelativeCharacter(sLen)))
+						sLen++;
+				} else if (setSpecialVar.Contains(c)) {	// $ special variables
+					sLen++;
+					isVar = true;
+				} else if (!isPattern && ((c == '(') || (c == ')') || (c == '|'))) {	// $ additional
+					sLen++;
+					isVar = true;
+				} else if (c == '^') {	// $^A control-char style
+					sLen++;
+					if ((maxSeg > sLen) && setControlVar.Contains(sc.GetRelativeCharacter(sLen))) {
+						sLen++;
+						isVar = true;
+					}
+				}
+			} else if (sc.ch == '@') {
+				sLen = 1;
+				if (!isPattern && ((c == '+') || (c == '-'))) {	// @ specials non-pattern
+					sLen++;
+					isVar = true;
+				}
+			}
+		}
+		if (isVar) {	// commit as interpolated variable or normal character
+			if (sc.state < SCE_PL_STRING_VAR)
+				sc.SetState(sc.state + INTERPOLATE_SHIFT);
+			sc.Forward(sLen);
+			maxSeg -= sLen;
+		} else {
+			if (sc.state >= SCE_PL_STRING_VAR)
+				sc.SetState(sc.state - INTERPOLATE_SHIFT);
+			sc.Forward();
+			maxSeg--;
+		}
+	}
+	if (sc.state >= SCE_PL_STRING_VAR)
+		sc.SetState(sc.state - INTERPOLATE_SHIFT);
+}
+
+void SCI_METHOD LexerPerl::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+
+	// keywords that forces /PATTERN/ at all times; should track vim's behaviour
+	WordList reWords;
+	reWords.Set("elsif if split while");
+
+	// charset classes
+	CharacterSet setSingleCharOp(CharacterSet::setNone, "rwxoRWXOezsfdlpSbctugkTBMAC");
+	// lexing of "%*</" operators is non-trivial; these are missing in the set below
+	CharacterSet setPerlOperator(CharacterSet::setNone, "^&\\()-+=|{}[]:;>,?!.~");
+	CharacterSet setQDelim(CharacterSet::setNone, "qrwx");
+	CharacterSet setModifiers(CharacterSet::setAlpha);
+	CharacterSet setPreferRE(CharacterSet::setNone, "*/<%");
+	// setArray and setHash also accepts chars for special vars like $_,
+	// which are then truncated when the next char does not match setVar
+	CharacterSet setVar(CharacterSet::setAlphaNum, "#$_'", 0x80, true);
+	CharacterSet setArray(CharacterSet::setAlpha, "#$_+-", 0x80, true);
+	CharacterSet setHash(CharacterSet::setAlpha, "#$_!^+-", 0x80, true);
+	CharacterSet &setPOD = setModifiers;
+	CharacterSet setNonHereDoc(CharacterSet::setDigits, "=$@");
+	CharacterSet setHereDocDelim(CharacterSet::setAlphaNum, "_");
+	CharacterSet setSubPrototype(CharacterSet::setNone, "\\[$@%&*+];_ \t");
+	CharacterSet setRepetition(CharacterSet::setDigits, ")\"'");
+	// for format identifiers
+	CharacterSet setFormatStart(CharacterSet::setAlpha, "_=");
+	CharacterSet &setFormat = setHereDocDelim;
+
+	// Lexer for perl often has to backtrack to start of current style to determine
+	// which characters are being used as quotes, how deeply nested is the
+	// start position and what the termination string is for HERE documents.
+
+	class HereDocCls {	// Class to manage HERE doc sequence
+	public:
+		int State;
+		// 0: '<<' encountered
+		// 1: collect the delimiter
+		// 2: here doc text (lines after the delimiter)
+		int Quote;		// the char after '<<'
+		bool Quoted;		// true if Quote in ('\'','"','`')
+		bool StripIndent;	// true if '<<~' requested to strip leading whitespace
+		int DelimiterLength;	// strlen(Delimiter)
+		char Delimiter[HERE_DELIM_MAX];	// the Delimiter
+		HereDocCls() {
+			State = 0;
+			Quote = 0;
+			Quoted = false;
+			StripIndent = false;
+			DelimiterLength = 0;
+			Delimiter[0] = '\0';
+		}
+		void Append(int ch) {
+			Delimiter[DelimiterLength++] = static_cast<char>(ch);
+			Delimiter[DelimiterLength] = '\0';
+		}
+		~HereDocCls() {
+		}
+	};
+	HereDocCls HereDoc;		// TODO: FIFO for stacked here-docs
+
+	class QuoteCls {	// Class to manage quote pairs
+	public:
+		int Rep;
+		int Count;
+		int Up, Down;
+		QuoteCls() {
+			New(1);
+		}
+		void New(int r = 1) {
+			Rep   = r;
+			Count = 0;
+			Up    = '\0';
+			Down  = '\0';
+		}
+		void Open(int u) {
+			Count++;
+			Up    = u;
+			Down  = opposite(Up);
+		}
+	};
+	QuoteCls Quote;
+
+	// additional state for number lexing
+	int numState = PERLNUM_DECIMAL;
+	int dotCount = 0;
+
+	Sci_PositionU endPos = startPos + length;
+
+	// Backtrack to beginning of style if required...
+	// If in a long distance lexical state, backtrack to find quote characters.
+	// Includes strings (may be multi-line), numbers (additional state), format
+	// bodies, as well as POD sections.
+	if (initStyle == SCE_PL_HERE_Q
+	    || initStyle == SCE_PL_HERE_QQ
+	    || initStyle == SCE_PL_HERE_QX
+	    || initStyle == SCE_PL_FORMAT
+	    || initStyle == SCE_PL_HERE_QQ_VAR
+	    || initStyle == SCE_PL_HERE_QX_VAR
+	   ) {
+		// backtrack through multiple styles to reach the delimiter start
+		int delim = (initStyle == SCE_PL_FORMAT) ? SCE_PL_FORMAT_IDENT:SCE_PL_HERE_DELIM;
+		while ((startPos > 1) && (styler.StyleAt(startPos) != delim)) {
+			startPos--;
+		}
+		startPos = styler.LineStart(styler.GetLine(startPos));
+		initStyle = styler.StyleAt(startPos - 1);
+	}
+	if (initStyle == SCE_PL_STRING
+	    || initStyle == SCE_PL_STRING_QQ
+	    || initStyle == SCE_PL_BACKTICKS
+	    || initStyle == SCE_PL_STRING_QX
+	    || initStyle == SCE_PL_REGEX
+	    || initStyle == SCE_PL_STRING_QR
+	    || initStyle == SCE_PL_REGSUBST
+	    || initStyle == SCE_PL_STRING_VAR
+	    || initStyle == SCE_PL_STRING_QQ_VAR
+	    || initStyle == SCE_PL_BACKTICKS_VAR
+	    || initStyle == SCE_PL_STRING_QX_VAR
+	    || initStyle == SCE_PL_REGEX_VAR
+	    || initStyle == SCE_PL_STRING_QR_VAR
+	    || initStyle == SCE_PL_REGSUBST_VAR
+	   ) {
+		// for interpolation, must backtrack through a mix of two different styles
+		int otherStyle = (initStyle >= SCE_PL_STRING_VAR) ?
+			initStyle - INTERPOLATE_SHIFT : initStyle + INTERPOLATE_SHIFT;
+		while (startPos > 1) {
+			int st = styler.StyleAt(startPos - 1);
+			if ((st != initStyle) && (st != otherStyle))
+				break;
+			startPos--;
+		}
+		initStyle = SCE_PL_DEFAULT;
+	} else if (initStyle == SCE_PL_STRING_Q
+	        || initStyle == SCE_PL_STRING_QW
+	        || initStyle == SCE_PL_XLAT
+	        || initStyle == SCE_PL_CHARACTER
+	        || initStyle == SCE_PL_NUMBER
+	        || initStyle == SCE_PL_IDENTIFIER
+	        || initStyle == SCE_PL_ERROR
+	        || initStyle == SCE_PL_SUB_PROTOTYPE
+	   ) {
+		while ((startPos > 1) && (styler.StyleAt(startPos - 1) == initStyle)) {
+			startPos--;
+		}
+		initStyle = SCE_PL_DEFAULT;
+	} else if (initStyle == SCE_PL_POD
+	        || initStyle == SCE_PL_POD_VERB
+	          ) {
+		// POD backtracking finds preceding blank lines and goes back past them
+		Sci_Position ln = styler.GetLine(startPos);
+		if (ln > 0) {
+			initStyle = styler.StyleAt(styler.LineStart(--ln));
+			if (initStyle == SCE_PL_POD || initStyle == SCE_PL_POD_VERB) {
+				while (ln > 0 && styler.GetLineState(ln) == SCE_PL_DEFAULT)
+					ln--;
+			}
+			startPos = styler.LineStart(++ln);
+			initStyle = styler.StyleAt(startPos - 1);
+		} else {
+			startPos = 0;
+			initStyle = SCE_PL_DEFAULT;
+		}
+	}
+
+	// backFlag, backPos are additional state to aid identifier corner cases.
+	// Look backwards past whitespace and comments in order to detect either
+	// operator or keyword. Later updated as we go along.
+	int backFlag = BACK_NONE;
+	Sci_PositionU backPos = startPos;
+	if (backPos > 0) {
+		backPos--;
+		skipWhitespaceComment(styler, backPos);
+		if (styler.StyleAt(backPos) == SCE_PL_OPERATOR)
+			backFlag = BACK_OPERATOR;
+		else if (styler.StyleAt(backPos) == SCE_PL_WORD)
+			backFlag = BACK_KEYWORD;
+		backPos++;
+	}
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+		case SCE_PL_OPERATOR:
+			sc.SetState(SCE_PL_DEFAULT);
+			backFlag = BACK_OPERATOR;
+			backPos = sc.currentPos;
+			break;
+		case SCE_PL_IDENTIFIER:		// identifier, bareword, inputsymbol
+			if ((!setWord.Contains(sc.ch) && sc.ch != '\'')
+			        || sc.Match('.', '.')
+			        || sc.chPrev == '>') {	// end of inputsymbol
+				sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_WORD:		// keyword, plus special cases
+			if (!setWord.Contains(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if ((strcmp(s, "__DATA__") == 0) || (strcmp(s, "__END__") == 0)) {
+					sc.ChangeState(SCE_PL_DATASECTION);
+				} else {
+					if ((strcmp(s, "format") == 0)) {
+						sc.SetState(SCE_PL_FORMAT_IDENT);
+						HereDoc.State = 0;
+					} else {
+						sc.SetState(SCE_PL_DEFAULT);
+					}
+					backFlag = BACK_KEYWORD;
+					backPos = sc.currentPos;
+				}
+			}
+			break;
+		case SCE_PL_SCALAR:
+		case SCE_PL_ARRAY:
+		case SCE_PL_HASH:
+		case SCE_PL_SYMBOLTABLE:
+			if (sc.Match(':', ':')) {	// skip ::
+				sc.Forward();
+			} else if (!setVar.Contains(sc.ch)) {
+				if (sc.LengthCurrent() == 1) {
+					// Special variable: $(, $_ etc.
+					sc.Forward();
+				}
+				sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_NUMBER:
+			// if no early break, number style is terminated at "(go through)"
+			if (sc.ch == '.') {
+				if (sc.chNext == '.') {
+					// double dot is always an operator (go through)
+				} else if (numState <= PERLNUM_FLOAT_EXP) {
+					// non-decimal number or float exponent, consume next dot
+					sc.SetState(SCE_PL_OPERATOR);
+					break;
+				} else {	// decimal or vectors allows dots
+					dotCount++;
+					if (numState == PERLNUM_DECIMAL) {
+						if (dotCount <= 1)	// number with one dot in it
+							break;
+						if (IsADigit(sc.chNext)) {	// really a vector
+							numState = PERLNUM_VECTOR;
+							break;
+						}
+						// number then dot (go through)
+					} else if (numState == PERLNUM_HEX) {
+						if (dotCount <= 1 && IsADigit(sc.chNext, 16)) {
+							break;	// hex with one dot is a hex float
+						} else {
+							sc.SetState(SCE_PL_OPERATOR);
+							break;
+						}
+						// hex then dot (go through)
+					} else if (IsADigit(sc.chNext))	// vectors
+						break;
+					// vector then dot (go through)
+				}
+			} else if (sc.ch == '_') {
+				// permissive underscoring for number and vector literals
+				break;
+			} else if (numState == PERLNUM_DECIMAL) {
+				if (sc.ch == 'E' || sc.ch == 'e') {	// exponent, sign
+					numState = PERLNUM_FLOAT_EXP;
+					if (sc.chNext == '+' || sc.chNext == '-') {
+						sc.Forward();
+					}
+					break;
+				} else if (IsADigit(sc.ch))
+					break;
+				// number then word (go through)
+			} else if (numState == PERLNUM_HEX) {
+				if (sc.ch == 'P' || sc.ch == 'p') {	// hex float exponent, sign
+					numState = PERLNUM_FLOAT_EXP;
+					if (sc.chNext == '+' || sc.chNext == '-') {
+						sc.Forward();
+					}
+					break;
+				} else if (IsADigit(sc.ch, 16))
+					break;
+				// hex or hex float then word (go through)
+			} else if (numState == PERLNUM_VECTOR || numState == PERLNUM_V_VECTOR) {
+				if (IsADigit(sc.ch))	// vector
+					break;
+				if (setWord.Contains(sc.ch) && dotCount == 0) {	// change to word
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+					break;
+				}
+				// vector then word (go through)
+			} else if (IsADigit(sc.ch)) {
+				if (numState == PERLNUM_FLOAT_EXP) {
+					break;
+				} else if (numState == PERLNUM_OCTAL) {
+					if (sc.ch <= '7') break;
+				} else if (numState == PERLNUM_BINARY) {
+					if (sc.ch <= '1') break;
+				}
+				// mark invalid octal, binary numbers (go through)
+				numState = PERLNUM_BAD;
+				break;
+			}
+			// complete current number or vector
+			sc.ChangeState(actualNumStyle(numState));
+			sc.SetState(SCE_PL_DEFAULT);
+			break;
+		case SCE_PL_COMMENTLINE:
+			if (sc.atLineStart) {
+				sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_HERE_DELIM:
+			if (HereDoc.State == 0) { // '<<' encountered
+				int delim_ch = sc.chNext;
+				Sci_Position ws_skip = 0;
+				HereDoc.State = 1;	// pre-init HERE doc class
+				HereDoc.Quote = sc.chNext;
+				HereDoc.Quoted = false;
+				HereDoc.StripIndent = false;
+				HereDoc.DelimiterLength = 0;
+				HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+				if (delim_ch == '~') { // was actually '<<~'
+					sc.Forward();
+					HereDoc.StripIndent = true;
+					HereDoc.Quote = delim_ch = sc.chNext;
+				}
+				if (IsASpaceOrTab(delim_ch)) {
+					// skip whitespace; legal only for quoted delimiters
+					Sci_PositionU i = sc.currentPos + 1;
+					while ((i < endPos) && IsASpaceOrTab(delim_ch)) {
+						i++;
+						delim_ch = static_cast<unsigned char>(styler.SafeGetCharAt(i));
+					}
+					ws_skip = i - sc.currentPos - 1;
+				}
+				if (delim_ch == '\'' || delim_ch == '"' || delim_ch == '`') {
+					// a quoted here-doc delimiter; skip any whitespace
+					sc.Forward(ws_skip + 1);
+					HereDoc.Quote = delim_ch;
+					HereDoc.Quoted = true;
+				} else if ((ws_skip == 0 && setNonHereDoc.Contains(sc.chNext))
+				        || ws_skip > 0) {
+					// left shift << or <<= operator cases
+					// restore position if operator
+					sc.ChangeState(SCE_PL_OPERATOR);
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+					backFlag = BACK_OPERATOR;
+					backPos = sc.currentPos;
+					HereDoc.State = 0;
+				} else {
+					// specially handle initial '\' for identifier
+					if (ws_skip == 0 && HereDoc.Quote == '\\')
+						sc.Forward();
+					// an unquoted here-doc delimiter, no special handling
+					// (cannot be prefixed by spaces/tabs), or
+					// symbols terminates; deprecated zero-length delimiter
+				}
+			} else if (HereDoc.State == 1) { // collect the delimiter
+				backFlag = BACK_NONE;
+				if (HereDoc.Quoted) { // a quoted here-doc delimiter
+					if (sc.ch == HereDoc.Quote) { // closing quote => end of delimiter
+						sc.ForwardSetState(SCE_PL_DEFAULT);
+					} else if (!sc.atLineEnd) {
+						if (sc.Match('\\', static_cast<char>(HereDoc.Quote))) { // escaped quote
+							sc.Forward();
+						}
+						if (sc.ch != '\r') {	// skip CR if CRLF
+							int i = 0;			// else append char, possibly an extended char
+							while (i < sc.width) {
+								HereDoc.Append(static_cast<unsigned char>(styler.SafeGetCharAt(sc.currentPos + i)));
+								i++;
+							}
+						}
+					}
+				} else { // an unquoted here-doc delimiter, no extended charsets
+					if (setHereDocDelim.Contains(sc.ch)) {
+						HereDoc.Append(sc.ch);
+					} else {
+						sc.SetState(SCE_PL_DEFAULT);
+					}
+				}
+				if (HereDoc.DelimiterLength >= HERE_DELIM_MAX - 1) {
+					sc.SetState(SCE_PL_ERROR);
+					HereDoc.State = 0;
+				}
+			}
+			break;
+		case SCE_PL_HERE_Q:
+		case SCE_PL_HERE_QQ:
+		case SCE_PL_HERE_QX:
+			// also implies HereDoc.State == 2
+			sc.Complete();
+			if (HereDoc.StripIndent) {
+				// skip whitespace
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+			}
+			if (HereDoc.DelimiterLength == 0 || sc.Match(HereDoc.Delimiter)) {
+				int c = sc.GetRelative(HereDoc.DelimiterLength);
+				if (c == '\r' || c == '\n') {	// peek first, do not consume match
+					sc.ForwardBytes(HereDoc.DelimiterLength);
+					sc.SetState(SCE_PL_DEFAULT);
+					backFlag = BACK_NONE;
+					HereDoc.State = 0;
+					if (!sc.atLineEnd)
+						sc.Forward();
+					break;
+				}
+			}
+			if (sc.state == SCE_PL_HERE_Q) {	// \EOF and 'EOF' non-interpolated
+				while (!sc.atLineEnd)
+					sc.Forward();
+				break;
+			}
+			while (!sc.atLineEnd) {		// "EOF" and `EOF` interpolated
+				int c, sLen = 0, endType = 0;
+				while ((c = sc.GetRelativeCharacter(sLen)) != 0) {
+					// scan to break string into segments
+					if (c == '\\') {
+						endType = 1; break;
+					} else if (c == '\r' || c == '\n') {
+						endType = 2; break;
+					}
+					sLen++;
+				}
+				if (sLen > 0)	// process non-empty segments
+					InterpolateSegment(sc, sLen);
+				if (endType == 1) {
+					sc.Forward();
+					// \ at end-of-line does not appear to have any effect, skip
+					if (sc.ch != '\r' && sc.ch != '\n')
+						sc.Forward();
+				} else if (endType == 2) {
+					if (!sc.atLineEnd)
+						sc.Forward();
+				}
+			}
+			break;
+		case SCE_PL_POD:
+		case SCE_PL_POD_VERB: {
+				Sci_PositionU fw = sc.currentPos;
+				Sci_Position ln = styler.GetLine(fw);
+				if (sc.atLineStart && sc.Match("=cut")) {	// end of POD
+					sc.SetState(SCE_PL_POD);
+					sc.Forward(4);
+					sc.SetState(SCE_PL_DEFAULT);
+					styler.SetLineState(ln, SCE_PL_POD);
+					break;
+				}
+				int pod = podLineScan(styler, fw, endPos);	// classify POD line
+				styler.SetLineState(ln, pod);
+				if (pod == SCE_PL_DEFAULT) {
+					if (sc.state == SCE_PL_POD_VERB) {
+						Sci_PositionU fw2 = fw;
+						while (fw2 < (endPos - 1) && pod == SCE_PL_DEFAULT) {
+							fw = fw2++;	// penultimate line (last blank line)
+							pod = podLineScan(styler, fw2, endPos);
+							styler.SetLineState(styler.GetLine(fw2), pod);
+						}
+						if (pod == SCE_PL_POD) {	// truncate verbatim POD early
+							sc.SetState(SCE_PL_POD);
+						} else
+							fw = fw2;
+					}
+				} else {
+					if (pod == SCE_PL_POD_VERB	// still part of current paragraph
+					        && (styler.GetLineState(ln - 1) == SCE_PL_POD)) {
+						pod = SCE_PL_POD;
+						styler.SetLineState(ln, pod);
+					} else if (pod == SCE_PL_POD
+					        && (styler.GetLineState(ln - 1) == SCE_PL_POD_VERB)) {
+						pod = SCE_PL_POD_VERB;
+						styler.SetLineState(ln, pod);
+					}
+					sc.SetState(pod);
+				}
+				sc.ForwardBytes(fw - sc.currentPos);	// commit style
+			}
+			break;
+		case SCE_PL_REGEX:
+		case SCE_PL_STRING_QR:
+			if (Quote.Rep <= 0) {
+				if (!setModifiers.Contains(sc.ch))
+					sc.SetState(SCE_PL_DEFAULT);
+			} else if (!Quote.Up && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int c, sLen = 0, endType = 0;
+				while ((c = sc.GetRelativeCharacter(sLen)) != 0) {
+					// scan to break string into segments
+					if (IsASpace(c)) {
+						break;
+					} else if (c == '\\' && Quote.Up != '\\') {
+						endType = 1; break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							Quote.Rep--;
+							break;
+						}
+					} else if (c == Quote.Up)
+						Quote.Count++;
+					sLen++;
+				}
+				if (sLen > 0) {	// process non-empty segments
+					if (Quote.Up != '\'') {
+						InterpolateSegment(sc, sLen, true);
+					} else		// non-interpolated path
+						sc.Forward(sLen);
+				}
+				if (endType == 1)
+					sc.Forward();
+			}
+			break;
+		case SCE_PL_REGSUBST:
+		case SCE_PL_XLAT:
+			if (Quote.Rep <= 0) {
+				if (!setModifiers.Contains(sc.ch))
+					sc.SetState(SCE_PL_DEFAULT);
+			} else if (!Quote.Up && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int c, sLen = 0, endType = 0;
+				bool isPattern = (Quote.Rep == 2);
+				while ((c = sc.GetRelativeCharacter(sLen)) != 0) {
+					// scan to break string into segments
+					if (c == '\\' && Quote.Up != '\\') {
+						endType = 2; break;
+					} else if (Quote.Count == 0 && Quote.Rep == 1) {
+						// We matched something like s(...) or tr{...}, Perl 5.10
+						// appears to allow almost any character for use as the
+						// next delimiters. Whitespace and comments are accepted in
+						// between, but we'll limit to whitespace here.
+						// For '#', if no whitespace in between, it's a delimiter.
+						if (IsASpace(c)) {
+							// Keep going
+						} else if (c == '#' && IsASpaceOrTab(sc.GetRelativeCharacter(sLen - 1))) {
+							endType = 3;
+						} else
+							Quote.Open(c);
+						break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							Quote.Rep--;
+							endType = 1;
+						}
+						if (Quote.Up == Quote.Down)
+							Quote.Count++;
+						if (endType == 1)
+							break;
+					} else if (c == Quote.Up) {
+						Quote.Count++;
+					} else if (IsASpace(c))
+						break;
+					sLen++;
+				}
+				if (sLen > 0) {	// process non-empty segments
+					if (sc.state == SCE_PL_REGSUBST && Quote.Up != '\'') {
+						InterpolateSegment(sc, sLen, isPattern);
+					} else		// non-interpolated path
+						sc.Forward(sLen);
+				}
+				if (endType == 2) {
+					sc.Forward();
+				} else if (endType == 3)
+					sc.SetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_STRING_Q:
+		case SCE_PL_STRING_QQ:
+		case SCE_PL_STRING_QX:
+		case SCE_PL_STRING_QW:
+		case SCE_PL_STRING:
+		case SCE_PL_CHARACTER:
+		case SCE_PL_BACKTICKS:
+			if (!Quote.Down && !IsASpace(sc.ch)) {
+				Quote.Open(sc.ch);
+			} else {
+				int c, sLen = 0, endType = 0;
+				while ((c = sc.GetRelativeCharacter(sLen)) != 0) {
+					// scan to break string into segments
+					if (IsASpace(c)) {
+						break;
+					} else if (c == '\\' && Quote.Up != '\\') {
+						endType = 2; break;
+					} else if (c == Quote.Down) {
+						Quote.Count--;
+						if (Quote.Count == 0) {
+							endType = 3; break;
+						}
+					} else if (c == Quote.Up)
+						Quote.Count++;
+					sLen++;
+				}
+				if (sLen > 0) {	// process non-empty segments
+					switch (sc.state) {
+					case SCE_PL_STRING:
+					case SCE_PL_STRING_QQ:
+					case SCE_PL_BACKTICKS:
+						InterpolateSegment(sc, sLen);
+						break;
+					case SCE_PL_STRING_QX:
+						if (Quote.Up != '\'') {
+							InterpolateSegment(sc, sLen);
+							break;
+						}
+						// (continued for ' delim)
+						// Falls through.
+					default:	// non-interpolated path
+						sc.Forward(sLen);
+					}
+				}
+				if (endType == 2) {
+					sc.Forward();
+				} else if (endType == 3)
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+			}
+			break;
+		case SCE_PL_SUB_PROTOTYPE: {
+				int i = 0;
+				// forward scan; must all be valid proto characters
+				while (setSubPrototype.Contains(sc.GetRelative(i)))
+					i++;
+				if (sc.GetRelative(i) == ')') {	// valid sub prototype
+					sc.ForwardBytes(i);
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+				} else {
+					// abandon prototype, restart from '('
+					sc.ChangeState(SCE_PL_OPERATOR);
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_PL_FORMAT: {
+				sc.Complete();
+				if (sc.Match('.')) {
+					sc.Forward();
+					if (sc.atLineEnd || ((sc.ch == '\r' && sc.chNext == '\n')))
+						sc.SetState(SCE_PL_DEFAULT);
+				}
+				while (!sc.atLineEnd)
+					sc.Forward();
+			}
+			break;
+		case SCE_PL_ERROR:
+			break;
+		}
+		// Needed for specific continuation styles (one follows the other)
+		switch (sc.state) {
+			// continued from SCE_PL_WORD
+		case SCE_PL_FORMAT_IDENT:
+			// occupies HereDoc state 3 to avoid clashing with HERE docs
+			if (IsASpaceOrTab(sc.ch)) {		// skip whitespace
+				sc.ChangeState(SCE_PL_DEFAULT);
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+				sc.SetState(SCE_PL_FORMAT_IDENT);
+			}
+			if (setFormatStart.Contains(sc.ch)) {	// identifier or '='
+				if (sc.ch != '=') {
+					do {
+						sc.Forward();
+					} while (setFormat.Contains(sc.ch));
+				}
+				while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd)
+					sc.Forward();
+				if (sc.ch == '=') {
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+					HereDoc.State = 3;
+				} else {
+					// invalid identifier; inexact fallback, but hey
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+					sc.SetState(SCE_PL_DEFAULT);
+				}
+			} else {
+				sc.ChangeState(SCE_PL_DEFAULT);	// invalid identifier
+			}
+			backFlag = BACK_NONE;
+			break;
+		}
+
+		// Must check end of HereDoc states here before default state is handled
+		if (HereDoc.State == 1 && sc.atLineEnd) {
+			// Begin of here-doc (the line after the here-doc delimiter):
+			// Lexically, the here-doc starts from the next line after the >>, but the
+			// first line of here-doc seem to follow the style of the last EOL sequence
+			int st_new = SCE_PL_HERE_QQ;
+			HereDoc.State = 2;
+			if (HereDoc.Quoted) {
+				if (sc.state == SCE_PL_HERE_DELIM) {
+					// Missing quote at end of string! We are stricter than perl.
+					// Colour here-doc anyway while marking this bit as an error.
+					sc.ChangeState(SCE_PL_ERROR);
+				}
+				switch (HereDoc.Quote) {
+				case '\'':
+					st_new = SCE_PL_HERE_Q;
+					break;
+				case '"' :
+					st_new = SCE_PL_HERE_QQ;
+					break;
+				case '`' :
+					st_new = SCE_PL_HERE_QX;
+					break;
+				}
+			} else {
+				if (HereDoc.Quote == '\\')
+					st_new = SCE_PL_HERE_Q;
+			}
+			sc.SetState(st_new);
+		}
+		if (HereDoc.State == 3 && sc.atLineEnd) {
+			// Start of format body.
+			HereDoc.State = 0;
+			sc.SetState(SCE_PL_FORMAT);
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_PL_DEFAULT) {
+			if (IsADigit(sc.ch) ||
+			        (IsADigit(sc.chNext) && (sc.ch == '.' || sc.ch == 'v'))) {
+				sc.SetState(SCE_PL_NUMBER);
+				backFlag = BACK_NONE;
+				numState = PERLNUM_DECIMAL;
+				dotCount = 0;
+				if (sc.ch == '0') {		// hex,bin,octal
+					if (sc.chNext == 'x' || sc.chNext == 'X') {
+						numState = PERLNUM_HEX;
+					} else if (sc.chNext == 'b' || sc.chNext == 'B') {
+						numState = PERLNUM_BINARY;
+					} else if (IsADigit(sc.chNext)) {
+						numState = PERLNUM_OCTAL;
+					}
+					if (numState != PERLNUM_DECIMAL) {
+						sc.Forward();
+					}
+				} else if (sc.ch == 'v') {		// vector
+					numState = PERLNUM_V_VECTOR;
+				}
+			} else if (setWord.Contains(sc.ch)) {
+				// if immediately prefixed by '::', always a bareword
+				sc.SetState(SCE_PL_WORD);
+				if (sc.chPrev == ':' && sc.GetRelative(-2) == ':') {
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				Sci_PositionU bk = sc.currentPos;
+				Sci_PositionU fw = sc.currentPos + 1;
+				// first check for possible quote-like delimiter
+				if (sc.ch == 's' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_REGSUBST);
+					Quote.New(2);
+				} else if (sc.ch == 'm' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_REGEX);
+					Quote.New();
+				} else if (sc.ch == 'q' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_STRING_Q);
+					Quote.New();
+				} else if (sc.ch == 'y' && !setWord.Contains(sc.chNext)) {
+					sc.ChangeState(SCE_PL_XLAT);
+					Quote.New(2);
+				} else if (sc.Match('t', 'r') && !setWord.Contains(sc.GetRelative(2))) {
+					sc.ChangeState(SCE_PL_XLAT);
+					Quote.New(2);
+					sc.Forward();
+					fw++;
+				} else if (sc.ch == 'q' && setQDelim.Contains(sc.chNext)
+				        && !setWord.Contains(sc.GetRelative(2))) {
+					if (sc.chNext == 'q') sc.ChangeState(SCE_PL_STRING_QQ);
+					else if (sc.chNext == 'x') sc.ChangeState(SCE_PL_STRING_QX);
+					else if (sc.chNext == 'r') sc.ChangeState(SCE_PL_STRING_QR);
+					else sc.ChangeState(SCE_PL_STRING_QW);	// sc.chNext == 'w'
+					Quote.New();
+					sc.Forward();
+					fw++;
+				} else if (sc.ch == 'x' && (sc.chNext == '=' ||	// repetition
+				        !setWord.Contains(sc.chNext) ||
+				        (setRepetition.Contains(sc.chPrev) && IsADigit(sc.chNext)))) {
+					sc.ChangeState(SCE_PL_OPERATOR);
+				}
+				// if potentially a keyword, scan forward and grab word, then check
+				// if it's really one; if yes, disambiguation test is performed
+				// otherwise it is always a bareword and we skip a lot of scanning
+				if (sc.state == SCE_PL_WORD) {
+					while (setWord.Contains(static_cast<unsigned char>(styler.SafeGetCharAt(fw))))
+						fw++;
+					if (!isPerlKeyword(styler.GetStartSegment(), fw, keywords, styler)) {
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+					}
+				}
+				// if already SCE_PL_IDENTIFIER, then no ambiguity, skip this
+				// for quote-like delimiters/keywords, attempt to disambiguate
+				// to select for bareword, change state -> SCE_PL_IDENTIFIER
+				if (sc.state != SCE_PL_IDENTIFIER && bk > 0) {
+					if (disambiguateBareword(styler, bk, fw, backFlag, backPos, endPos))
+						sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '#') {
+				sc.SetState(SCE_PL_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_PL_STRING);
+				Quote.New();
+				Quote.Open(sc.ch);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '\'') {
+				if (sc.chPrev == '&' && setWordStart.Contains(sc.chNext)) {
+					// Archaic call
+					sc.SetState(SCE_PL_IDENTIFIER);
+				} else {
+					sc.SetState(SCE_PL_CHARACTER);
+					Quote.New();
+					Quote.Open(sc.ch);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '`') {
+				sc.SetState(SCE_PL_BACKTICKS);
+				Quote.New();
+				Quote.Open(sc.ch);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_PL_SCALAR);
+				if (sc.chNext == '{') {
+					sc.ForwardSetState(SCE_PL_OPERATOR);
+				} else if (IsASpace(sc.chNext)) {
+					sc.ForwardSetState(SCE_PL_DEFAULT);
+				} else {
+					sc.Forward();
+					if (sc.Match('`', '`') || sc.Match(':', ':')) {
+						sc.Forward();
+					}
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '@') {
+				sc.SetState(SCE_PL_ARRAY);
+				if (setArray.Contains(sc.chNext)) {
+					// no special treatment
+				} else if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+					sc.ForwardBytes(2);
+				} else if (sc.chNext == '{' || sc.chNext == '[') {
+					sc.ForwardSetState(SCE_PL_OPERATOR);
+				} else {
+					sc.ChangeState(SCE_PL_OPERATOR);
+				}
+				backFlag = BACK_NONE;
+			} else if (setPreferRE.Contains(sc.ch)) {
+				// Explicit backward peeking to set a consistent preferRE for
+				// any slash found, so no longer need to track preferRE state.
+				// Find first previous significant lexed element and interpret.
+				// A few symbols shares this code for disambiguation.
+				bool preferRE = false;
+				bool isHereDoc = sc.Match('<', '<');
+				bool hereDocSpace = false;		// for: SCALAR [whitespace] '<<'
+				Sci_PositionU bk = (sc.currentPos > 0) ? sc.currentPos - 1: 0;
+				sc.Complete();
+				styler.Flush();
+				if (styler.StyleAt(bk) == SCE_PL_DEFAULT)
+					hereDocSpace = true;
+				skipWhitespaceComment(styler, bk);
+				if (bk == 0) {
+					// avoid backward scanning breakage
+					preferRE = true;
+				} else {
+					int bkstyle = styler.StyleAt(bk);
+					int bkch = static_cast<unsigned char>(styler.SafeGetCharAt(bk));
+					switch (bkstyle) {
+					case SCE_PL_OPERATOR:
+						preferRE = true;
+						if (bkch == ')' || bkch == ']') {
+							preferRE = false;
+						} else if (bkch == '}') {
+							// backtrack by counting balanced brace pairs
+							// needed to test for variables like ${}, @{} etc.
+							bkstyle = styleBeforeBracePair(styler, bk);
+							if (bkstyle == SCE_PL_SCALAR
+							        || bkstyle == SCE_PL_ARRAY
+							        || bkstyle == SCE_PL_HASH
+							        || bkstyle == SCE_PL_SYMBOLTABLE
+							        || bkstyle == SCE_PL_OPERATOR) {
+								preferRE = false;
+							}
+						} else if (bkch == '+' || bkch == '-') {
+							if (bkch == static_cast<unsigned char>(styler.SafeGetCharAt(bk - 1))
+							        && bkch != static_cast<unsigned char>(styler.SafeGetCharAt(bk - 2)))
+								// exceptions for operators: unary suffixes ++, --
+								preferRE = false;
+						}
+						break;
+					case SCE_PL_IDENTIFIER:
+						preferRE = true;
+						bkstyle = styleCheckIdentifier(styler, bk);
+						if ((bkstyle == 1) || (bkstyle == 2)) {
+							// inputsymbol or var with "->" or "::" before identifier
+							preferRE = false;
+						} else if (bkstyle == 3) {
+							// bare identifier, test cases follows:
+							if (sc.ch == '/') {
+								// if '/', /PATTERN/ unless digit/space immediately after '/'
+								// if '//', always expect defined-or operator to follow identifier
+								if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.chNext == '/')
+									preferRE = false;
+							} else if (sc.ch == '*' || sc.ch == '%') {
+								if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.Match('*', '*'))
+									preferRE = false;
+							} else if (sc.ch == '<') {
+								if (IsASpace(sc.chNext) || sc.chNext == '=')
+									preferRE = false;
+							}
+						}
+						break;
+					case SCE_PL_SCALAR:		// for $var<< case:
+						if (isHereDoc && hereDocSpace)	// if SCALAR whitespace '<<', *always* a HERE doc
+							preferRE = true;
+						break;
+					case SCE_PL_WORD:
+						preferRE = true;
+						// for HERE docs, always true
+						if (sc.ch == '/') {
+							// adopt heuristics similar to vim-style rules:
+							// keywords always forced as /PATTERN/: split, if, elsif, while
+							// everything else /PATTERN/ unless digit/space immediately after '/'
+							// for '//', defined-or favoured unless special keywords
+							Sci_PositionU bkend = bk + 1;
+							while (bk > 0 && styler.StyleAt(bk - 1) == SCE_PL_WORD) {
+								bk--;
+							}
+							if (isPerlKeyword(bk, bkend, reWords, styler))
+								break;
+							if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.chNext == '/')
+								preferRE = false;
+						} else if (sc.ch == '*' || sc.ch == '%') {
+							if (IsASpace(sc.chNext) || IsADigit(sc.chNext) || sc.Match('*', '*'))
+								preferRE = false;
+						} else if (sc.ch == '<') {
+							if (IsASpace(sc.chNext) || sc.chNext == '=')
+								preferRE = false;
+						}
+						break;
+
+						// other styles uses the default, preferRE=false
+					case SCE_PL_POD:
+					case SCE_PL_HERE_Q:
+					case SCE_PL_HERE_QQ:
+					case SCE_PL_HERE_QX:
+						preferRE = true;
+						break;
+					}
+				}
+				backFlag = BACK_NONE;
+				if (isHereDoc) {	// handle '<<', HERE doc
+					if (sc.Match("<<>>")) {		// double-diamond operator (5.22)
+						sc.SetState(SCE_PL_OPERATOR);
+						sc.Forward(3);
+					} else if (preferRE) {
+						sc.SetState(SCE_PL_HERE_DELIM);
+						HereDoc.State = 0;
+					} else {		// << operator
+						sc.SetState(SCE_PL_OPERATOR);
+						sc.Forward();
+					}
+				} else if (sc.ch == '*') {	// handle '*', typeglob
+					if (preferRE) {
+						sc.SetState(SCE_PL_SYMBOLTABLE);
+						if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+							sc.ForwardBytes(2);
+						} else if (sc.chNext == '{') {
+							sc.ForwardSetState(SCE_PL_OPERATOR);
+						} else {
+							sc.Forward();
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+						if (sc.chNext == '*') 	// exponentiation
+							sc.Forward();
+					}
+				} else if (sc.ch == '%') {	// handle '%', hash
+					if (preferRE) {
+						sc.SetState(SCE_PL_HASH);
+						if (setHash.Contains(sc.chNext)) {
+							sc.Forward();
+						} else if (sc.chNext == ':' && sc.GetRelative(2) == ':') {
+							sc.ForwardBytes(2);
+						} else if (sc.chNext == '{') {
+							sc.ForwardSetState(SCE_PL_OPERATOR);
+						} else {
+							sc.ChangeState(SCE_PL_OPERATOR);
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+					}
+				} else if (sc.ch == '<') {	// handle '<', inputsymbol
+					if (preferRE) {
+						// forward scan
+						int i = InputSymbolScan(sc);
+						if (i > 0) {
+							sc.SetState(SCE_PL_IDENTIFIER);
+							sc.Forward(i);
+						} else {
+							sc.SetState(SCE_PL_OPERATOR);
+						}
+					} else {
+						sc.SetState(SCE_PL_OPERATOR);
+					}
+				} else {			// handle '/', regexp
+					if (preferRE) {
+						sc.SetState(SCE_PL_REGEX);
+						Quote.New();
+						Quote.Open(sc.ch);
+					} else {		// / and // operators
+						sc.SetState(SCE_PL_OPERATOR);
+						if (sc.chNext == '/') {
+							sc.Forward();
+						}
+					}
+				}
+			} else if (sc.ch == '='		// POD
+			        && setPOD.Contains(sc.chNext)
+			        && sc.atLineStart) {
+				sc.SetState(SCE_PL_POD);
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '-' && setWordStart.Contains(sc.chNext)) {	// extended '-' cases
+				Sci_PositionU bk = sc.currentPos;
+				Sci_PositionU fw = 2;
+				if (setSingleCharOp.Contains(sc.chNext) &&	// file test operators
+				        !setWord.Contains(sc.GetRelative(2))) {
+					sc.SetState(SCE_PL_WORD);
+				} else {
+					// nominally a minus and bareword; find extent of bareword
+					while (setWord.Contains(sc.GetRelative(fw)))
+						fw++;
+					sc.SetState(SCE_PL_OPERATOR);
+				}
+				// force to bareword for hash key => or {variable literal} cases
+				if (disambiguateBareword(styler, bk, bk + fw, backFlag, backPos, endPos) & 2) {
+					sc.ChangeState(SCE_PL_IDENTIFIER);
+				}
+				backFlag = BACK_NONE;
+			} else if (sc.ch == '(' && sc.currentPos > 0) {	// '(' or subroutine prototype
+				sc.Complete();
+				if (styleCheckSubPrototype(styler, sc.currentPos - 1)) {
+					sc.SetState(SCE_PL_SUB_PROTOTYPE);
+					backFlag = BACK_NONE;
+				} else {
+					sc.SetState(SCE_PL_OPERATOR);
+				}
+			} else if (setPerlOperator.Contains(sc.ch)) {	// operators
+				sc.SetState(SCE_PL_OPERATOR);
+				if (sc.Match('.', '.')) {	// .. and ...
+					sc.Forward();
+					if (sc.chNext == '.') sc.Forward();
+				}
+			} else if (sc.ch == 4 || sc.ch == 26) {		// ^D and ^Z ends valid perl source
+				sc.SetState(SCE_PL_DATASECTION);
+			} else {
+				// keep colouring defaults
+				sc.Complete();
+			}
+		}
+	}
+	sc.Complete();
+	if (sc.state == SCE_PL_HERE_Q
+	        || sc.state == SCE_PL_HERE_QQ
+	        || sc.state == SCE_PL_HERE_QX
+	        || sc.state == SCE_PL_FORMAT) {
+		styler.ChangeLexerState(sc.currentPos, styler.Length());
+	}
+	sc.Complete();
+}
+
+#define PERL_HEADFOLD_SHIFT		4
+#define PERL_HEADFOLD_MASK		0xF0
+
+void SCI_METHOD LexerPerl::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	// Backtrack to previous line in case need to fix its fold status
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+
+	int levelPrev = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	char chPrev = styler.SafeGetCharAt(startPos - 1);
+	int styleNext = styler.StyleAt(startPos);
+	// Used at end of line to determine if the line was a package definition
+	bool isPackageLine = false;
+	int podHeading = 0;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		int stylePrevCh = (i) ? styler.StyleAt(i - 1):SCE_PL_DEFAULT;
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		bool atLineStart = ((chPrev == '\r') || (chPrev == '\n')) || i == 0;
+		// Comment folding
+		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
+			if (!IsCommentLine(lineCurrent - 1, styler)
+			        && IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent++;
+			else if (IsCommentLine(lineCurrent - 1, styler)
+			        && !IsCommentLine(lineCurrent + 1, styler))
+				levelCurrent--;
+		}
+		// {} [] block folding
+		if (style == SCE_PL_OPERATOR) {
+			if (ch == '{') {
+				if (options.foldAtElse && levelCurrent < levelPrev)
+					--levelPrev;
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+			if (ch == '[') {
+				if (options.foldAtElse && levelCurrent < levelPrev)
+					--levelPrev;
+				levelCurrent++;
+			} else if (ch == ']') {
+				levelCurrent--;
+			}
+		} else if (style == SCE_PL_STRING_QW) {
+			// qw
+			if (stylePrevCh != style)
+				levelCurrent++;
+			else if (styleNext != style)
+				levelCurrent--;
+		}
+		// POD folding
+		if (options.foldPOD && atLineStart) {
+			if (style == SCE_PL_POD) {
+				if (stylePrevCh != SCE_PL_POD && stylePrevCh != SCE_PL_POD_VERB)
+					levelCurrent++;
+				else if (styler.Match(i, "=cut"))
+					levelCurrent = (levelCurrent & ~PERL_HEADFOLD_MASK) - 1;
+				else if (styler.Match(i, "=head"))
+					podHeading = PodHeadingLevel(i, styler);
+			} else if (style == SCE_PL_DATASECTION) {
+				if (ch == '=' && IsASCII(chNext) && isalpha(chNext) && levelCurrent == SC_FOLDLEVELBASE)
+					levelCurrent++;
+				else if (styler.Match(i, "=cut") && levelCurrent > SC_FOLDLEVELBASE)
+					levelCurrent = (levelCurrent & ~PERL_HEADFOLD_MASK) - 1;
+				else if (styler.Match(i, "=head"))
+					podHeading = PodHeadingLevel(i, styler);
+				// if package used or unclosed brace, level > SC_FOLDLEVELBASE!
+				// reset needed as level test is vs. SC_FOLDLEVELBASE
+				else if (stylePrevCh != SCE_PL_DATASECTION)
+					levelCurrent = SC_FOLDLEVELBASE;
+			}
+		}
+		// package folding
+		if (options.foldPackage && atLineStart) {
+			if (IsPackageLine(lineCurrent, styler)
+			        && !IsPackageLine(lineCurrent + 1, styler))
+				isPackageLine = true;
+		}
+
+		//heredoc folding
+		switch (style) {
+		case SCE_PL_HERE_QQ :
+		case SCE_PL_HERE_Q :
+		case SCE_PL_HERE_QX :
+			switch (stylePrevCh) {
+			case SCE_PL_HERE_QQ :
+			case SCE_PL_HERE_Q :
+			case SCE_PL_HERE_QX :
+				//do nothing;
+				break;
+			default :
+				levelCurrent++;
+				break;
+			}
+			break;
+		default:
+			switch (stylePrevCh) {
+			case SCE_PL_HERE_QQ :
+			case SCE_PL_HERE_Q :
+			case SCE_PL_HERE_QX :
+				levelCurrent--;
+				break;
+			default :
+				//do nothing;
+				break;
+			}
+			break;
+		}
+
+		//explicit folding
+		if (options.foldCommentExplicit && style == SCE_PL_COMMENTLINE && ch == '#') {
+			if (chNext == '{') {
+				levelCurrent++;
+			} else if (levelCurrent > SC_FOLDLEVELBASE  && chNext == '}') {
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev;
+			// POD headings occupy bits 7-4, leaving some breathing room for
+			// non-standard practice -- POD sections stuck in blocks, etc.
+			if (podHeading > 0) {
+				levelCurrent = (lev & ~PERL_HEADFOLD_MASK) | (podHeading << PERL_HEADFOLD_SHIFT);
+				lev = levelCurrent - 1;
+				lev |= SC_FOLDLEVELHEADERFLAG;
+				podHeading = 0;
+			}
+			// Check if line was a package declaration
+			// because packages need "special" treatment
+			if (isPackageLine) {
+				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				levelCurrent = SC_FOLDLEVELBASE + 1;
+				isPackageLine = false;
+			}
+			lev |= levelCurrent << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+		chPrev = ch;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+LexerModule lmPerl(SCLEX_PERL, LexerPerl::LexerFactoryPerl, "perl", perlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPowerPro.cxx b/scite-app/lexilla/lexers/LexPowerPro.cxx
new file mode 100644
index 0000000..bfa58b2
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPowerPro.cxx
@@ -0,0 +1,631 @@
+// Scintilla source code edit control
+// @file LexPowerPro.cxx
+// PowerPro utility, written by Bruce Switzer, is available from http://powerpro.webeddie.com
+// PowerPro lexer is written by Christopher Bean (cbean@cb-software.net)
+//
+// Lexer code heavily borrowed from:
+//	LexAU3.cxx by Jos van der Zande
+//	LexCPP.cxx by Neil Hodgson
+//	LexVB.cxx by Neil Hodgson
+//
+// Changes:
+// 	2008-10-25 - Initial release
+//	2008-10-26 - Changed how <name> is hilighted in  'function <name>' so that
+//				 local isFunction = "" and local functions = "" don't get falsely highlighted
+//	2008-12-14 - Added bounds checking for szFirstWord and szDo
+//			   - Replaced SetOfCharacters with CharacterSet
+//			   - Made sure that CharacterSet::Contains is passed only positive values
+//			   - Made sure that the return value of Accessor::SafeGetCharAt is positive before
+//				 passing to functions that require positive values like isspacechar()
+//			   - Removed unused visibleChars processing from ColourisePowerProDoc()
+//			   - Fixed bug with folding logic where line continuations didn't end where
+//				 they were supposed to
+//			   - Moved all helper functions to the top of the file
+//	2010-06-03 - Added onlySpaces variable to allow the @function and ;comment styles to be indented
+//			   - Modified HasFunction function to be a bit more robust
+//			   - Renamed HasFunction function to IsFunction
+//			   - Cleanup
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsStreamCommentStyle(int style) {
+	return style == SCE_POWERPRO_COMMENTBLOCK;
+}
+
+static inline bool IsLineEndChar(unsigned char ch) {
+	return 	ch == 0x0a 		//LF
+			|| ch == 0x0c	//FF
+			|| ch == 0x0d;	//CR
+}
+
+static bool IsContinuationLine(Sci_PositionU szLine, Accessor &styler)
+{
+	Sci_Position startPos = styler.LineStart(szLine);
+	Sci_Position endPos = styler.LineStart(szLine + 1) - 2;
+	while (startPos < endPos)
+	{
+		char stylech = styler.StyleAt(startPos);
+		if (!(stylech == SCE_POWERPRO_COMMENTBLOCK)) {
+			char ch = styler.SafeGetCharAt(endPos);
+			char chPrev = styler.SafeGetCharAt(endPos - 1);
+			char chPrevPrev = styler.SafeGetCharAt(endPos - 2);
+			if (ch > 0 && chPrev > 0 && chPrevPrev > 0 && !isspacechar(ch) && !isspacechar(chPrev) && !isspacechar(chPrevPrev) )
+				return (chPrevPrev == ';' && chPrev == ';' && ch == '+');
+			}
+		endPos--; // skip to next char
+	}
+	return false;
+}
+
+// Routine to find first none space on the current line and return its Style
+// needed for comment lines not starting on pos 1
+static int GetStyleFirstWord(Sci_Position szLine, Accessor &styler)
+{
+	Sci_Position startPos = styler.LineStart(szLine);
+	Sci_Position endPos = styler.LineStart(szLine + 1) - 1;
+	char ch = styler.SafeGetCharAt(startPos);
+
+	while (ch > 0 && isspacechar(ch) && startPos < endPos)
+	{
+		startPos++; // skip to next char
+		ch = styler.SafeGetCharAt(startPos);
+	}
+	return styler.StyleAt(startPos);
+}
+
+//returns true if there is a function to highlight
+//used to highlight <name> in 'function <name>'
+//note:
+//		sample line (without quotes): "\tfunction asdf()
+//		currentPos will be the position of 'a'
+static bool IsFunction(Accessor &styler, Sci_PositionU currentPos) {
+
+	const char function[10] = "function "; //10 includes \0
+	unsigned int numberOfCharacters = sizeof(function) - 1;
+	Sci_PositionU position = currentPos - numberOfCharacters;
+
+	//compare each character with the letters in the function array
+	//return false if ALL don't match
+	for (Sci_PositionU i = 0; i < numberOfCharacters; i++) {
+		char c = styler.SafeGetCharAt(position++);
+		if (c != function[i])
+			return false;
+	}
+
+	//make sure that there are only spaces (or tabs) between the beginning
+	//of the line and the function declaration
+	position = currentPos - numberOfCharacters - 1; 		//-1 to move to char before 'function'
+	for (Sci_PositionU j = 0; j < 16; j++) {					//check up to 16 preceeding characters
+		char c = styler.SafeGetCharAt(position--, '\0');	//if can't read char, return NUL (past beginning of document)
+		if (c <= 0)	//reached beginning of document
+			return true;
+		if (c > 0 && IsLineEndChar(c))
+			return true;
+		else if (c > 0 && !IsASpaceOrTab(c))
+			return false;
+	}
+
+	//fall-through
+	return false;
+}
+
+static void ColourisePowerProDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler, bool caseSensitive) {
+
+	WordList &keywords  = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	//define the character sets
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_@", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	char s_save[100]; //for last line highlighting
+
+	//are there only spaces between the first letter of the line and the beginning of the line
+	bool onlySpaces = true;
+
+	for (; sc.More(); sc.Forward()) {
+
+		// save the total current word for eof processing
+		char s[100];
+		sc.GetCurrentLowered(s, sizeof(s));
+
+		if ((sc.ch > 0) && setWord.Contains(sc.ch))
+		{
+			strcpy(s_save,s);
+			int tp = static_cast<int>(strlen(s_save));
+			if (tp < 99) {
+				s_save[tp] = static_cast<char>(tolower(sc.ch));
+				s_save[tp+1] = '\0';
+			}
+		}
+
+		if (sc.atLineStart) {
+			if (sc.state == SCE_POWERPRO_DOUBLEQUOTEDSTRING) {
+				// Prevent SCE_POWERPRO_STRINGEOL from leaking back to previous line which
+				// ends with a line continuation by locking in the state upto this position.
+				sc.SetState(SCE_POWERPRO_DOUBLEQUOTEDSTRING);
+			}
+		}
+
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+			case SCE_POWERPRO_OPERATOR:
+				sc.SetState(SCE_POWERPRO_DEFAULT);
+				break;
+
+			case SCE_POWERPRO_NUMBER:
+
+				if (!IsADigit(sc.ch))
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+
+				break;
+
+			case SCE_POWERPRO_IDENTIFIER:
+				//if ((sc.ch > 0) && !setWord.Contains(sc.ch) || (sc.ch == '.')) { // use this line if don't want to match keywords with . in them. ie: win.debug will match both win and debug so win debug will also be colorized
+				if ((sc.ch > 0) && !setWord.Contains(sc.ch)){  // || (sc.ch == '.')) { // use this line if you want to match keywords with a . ie: win.debug will only match win.debug neither win nor debug will be colorized separately
+					char s[1000];
+					if (caseSensitive) {
+						sc.GetCurrent(s, sizeof(s));
+					} else {
+						sc.GetCurrentLowered(s, sizeof(s));
+					}
+
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_POWERPRO_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_POWERPRO_WORD2);
+					} else if (keywords3.InList(s)) {
+						sc.ChangeState(SCE_POWERPRO_WORD3);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_POWERPRO_WORD4);
+					}
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_LINECONTINUE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				} else if (sc.Match('/', '*') || sc.Match('/', '/')) {
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_COMMENTBLOCK:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_COMMENTLINE:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_DOUBLEQUOTEDSTRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_POWERPRO_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_SINGLEQUOTEDSTRING:
+				if (sc.atLineEnd) {
+					sc.ChangeState(SCE_POWERPRO_STRINGEOL);
+				} else if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\'') {
+					sc.ForwardSetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_STRINGEOL:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				}
+				break;
+
+			case SCE_POWERPRO_VERBATIM:
+				if (sc.ch == '\"') {
+					if (sc.chNext == '\"') {
+						sc.Forward();
+					} else {
+						sc.ForwardSetState(SCE_POWERPRO_DEFAULT);
+					}
+				}
+				break;
+
+			case SCE_POWERPRO_ALTQUOTE:
+				if (sc.ch == '#') {
+					if (sc.chNext == '#') {
+						sc.Forward();
+					} else {
+						sc.ForwardSetState(SCE_POWERPRO_DEFAULT);
+					}
+				}
+				break;
+
+			case SCE_POWERPRO_FUNCTION:
+				if (isspacechar(sc.ch) || sc.ch == '(') {
+					sc.SetState(SCE_POWERPRO_DEFAULT);
+				}
+			break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_POWERPRO_DEFAULT) {
+			if (sc.Match('?', '\"')) {
+				sc.SetState(SCE_POWERPRO_VERBATIM);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_POWERPRO_NUMBER);
+			}else if (sc.Match('?','#')) {
+				if (sc.ch == '?' && sc.chNext == '#') {
+					sc.SetState(SCE_POWERPRO_ALTQUOTE);
+					sc.Forward();
+				}
+			} else if (IsFunction(styler, sc.currentPos)) {	//highlight <name> in 'function <name>'
+				sc.SetState(SCE_POWERPRO_FUNCTION);
+			} else if (onlySpaces && sc.ch == '@') { 		//alternate function definition [label]
+				sc.SetState(SCE_POWERPRO_FUNCTION);
+			} else if ((sc.ch > 0) && (setWordStart.Contains(sc.ch) || (sc.ch == '?'))) {
+				sc.SetState(SCE_POWERPRO_IDENTIFIER);
+			} else if (sc.Match(";;+")) {
+				sc.SetState(SCE_POWERPRO_LINECONTINUE);
+			} else if (sc.Match('/', '*')) {
+				sc.SetState(SCE_POWERPRO_COMMENTBLOCK);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				sc.SetState(SCE_POWERPRO_COMMENTLINE);
+			} else if (onlySpaces && sc.ch == ';') {		//legacy comment that can only have blank space in front of it
+				sc.SetState(SCE_POWERPRO_COMMENTLINE);
+			} else if (sc.Match(";;")) {
+				sc.SetState(SCE_POWERPRO_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_POWERPRO_DOUBLEQUOTEDSTRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_POWERPRO_SINGLEQUOTEDSTRING);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POWERPRO_OPERATOR);
+			}
+		}
+
+		//maintain a record of whether or not all the preceding characters on
+		//a line are space characters
+		if (onlySpaces && !IsASpaceOrTab(sc.ch))
+			onlySpaces = false;
+
+		//reset when starting a new line
+		if (sc.atLineEnd)
+			onlySpaces = true;
+	}
+
+	//*************************************
+	// Colourize the last word correctly
+	//*************************************
+	if (sc.state == SCE_POWERPRO_IDENTIFIER)
+	{
+		if (keywords.InList(s_save)) {
+			sc.ChangeState(SCE_POWERPRO_WORD);
+			sc.SetState(SCE_POWERPRO_DEFAULT);
+		}
+		else if (keywords2.InList(s_save)) {
+			sc.ChangeState(SCE_POWERPRO_WORD2);
+			sc.SetState(SCE_POWERPRO_DEFAULT);
+		}
+		else if (keywords3.InList(s_save)) {
+			sc.ChangeState(SCE_POWERPRO_WORD3);
+			sc.SetState(SCE_POWERPRO_DEFAULT);
+		}
+		else if (keywords4.InList(s_save)) {
+			sc.ChangeState(SCE_POWERPRO_WORD4);
+			sc.SetState(SCE_POWERPRO_DEFAULT);
+		}
+		else {
+			sc.SetState(SCE_POWERPRO_DEFAULT);
+		}
+	}
+	sc.Complete();
+}
+
+static void FoldPowerProDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	//define the character sets
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_@", 0x80, true);
+	CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+	//used to tell if we're recursively folding the whole document, or just a small piece (ie: if statement or 1 function)
+	bool isFoldingAll = true;
+
+	Sci_Position endPos = startPos + length;
+	Sci_Position lastLine = styler.GetLine(styler.Length()); //used to help fold the last line correctly
+
+	// get settings from the config files for folding comments and preprocessor lines
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldInComment = styler.GetPropertyInt("fold.comment") == 2;
+	bool foldCompact = true;
+
+	// Backtrack to previous line in case need to fix its fold status
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		isFoldingAll = false;
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	// vars for style of previous/current/next lines
+	int style = GetStyleFirstWord(lineCurrent,styler);
+	int stylePrev = 0;
+
+	// find the first previous line without continuation character at the end
+	while ((lineCurrent > 0 && IsContinuationLine(lineCurrent, styler))
+	       || (lineCurrent > 1 && IsContinuationLine(lineCurrent - 1, styler))) {
+		lineCurrent--;
+		startPos = styler.LineStart(lineCurrent);
+	}
+
+	if (lineCurrent > 0) {
+		stylePrev = GetStyleFirstWord(lineCurrent-1,styler);
+	}
+
+	// vars for getting first word to check for keywords
+	bool isFirstWordStarted = false;
+	bool isFirstWordEnded = false;
+
+	const unsigned int FIRST_WORD_MAX_LEN = 10;
+	char szFirstWord[FIRST_WORD_MAX_LEN] = "";
+	unsigned int firstWordLen = 0;
+
+	char szDo[3]="";
+	int	 szDolen = 0;
+	bool isDoLastWord = false;
+
+	// var for indentlevel
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelNext = levelCurrent;
+
+	int	visibleChars = 0;
+	int functionCount = 0;
+
+	char chNext = styler.SafeGetCharAt(startPos);
+	char chPrev = '\0';
+	char chPrevPrev = '\0';
+	char chPrevPrevPrev = '\0';
+
+	for (Sci_Position i = startPos; i < endPos; i++) {
+
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch > 0) && setWord.Contains(ch))
+			visibleChars++;
+
+		// get the syle for the current character neede to check in comment
+		int stylech = styler.StyleAt(i);
+
+		// start the capture of the first word
+		if (!isFirstWordStarted && (ch > 0)) {
+			if (setWord.Contains(ch) || setWordStart.Contains(ch) || ch == ';' || ch == '/') {
+				isFirstWordStarted = true;
+				if (firstWordLen < FIRST_WORD_MAX_LEN - 1) {
+					szFirstWord[firstWordLen++] = static_cast<char>(tolower(ch));
+					szFirstWord[firstWordLen] = '\0';
+				}
+			}
+		} // continue capture of the first word on the line
+		else if (isFirstWordStarted && !isFirstWordEnded && (ch > 0)) {
+			if (!setWord.Contains(ch)) {
+				isFirstWordEnded = true;
+			}
+			else if (firstWordLen < (FIRST_WORD_MAX_LEN - 1)) {
+				szFirstWord[firstWordLen++] = static_cast<char>(tolower(ch));
+				szFirstWord[firstWordLen] = '\0';
+			}
+		}
+
+		if (stylech != SCE_POWERPRO_COMMENTLINE) {
+
+			//reset isDoLastWord if we find a character(ignoring spaces) after 'do'
+			if (isDoLastWord && (ch > 0) && setWord.Contains(ch))
+				isDoLastWord = false;
+
+			// --find out if the word "do" is the last on a "if" line--
+			// collect each letter and put it into a buffer 2 chars long
+			// if we end up with "do" in the buffer when we reach the end of
+			// the line, "do" was the last word on the line
+			if ((ch > 0) && isFirstWordEnded && strcmp(szFirstWord, "if") == 0) {
+				if (szDolen == 2) {
+					szDo[0] = szDo[1];
+					szDo[1] = static_cast<char>(tolower(ch));
+					szDo[2] = '\0';
+
+					if (strcmp(szDo, "do") == 0)
+						isDoLastWord = true;
+
+				} else if (szDolen < 2) {
+					szDo[szDolen++] = static_cast<char>(tolower(ch));
+					szDo[szDolen] = '\0';
+				}
+			}
+		}
+
+		// End of Line found so process the information
+		 if ((ch == '\r' && chNext != '\n') // \r\n
+			|| ch == '\n' 					// \n
+			|| i == endPos) {				// end of selection
+
+			// **************************
+			// Folding logic for Keywords
+			// **************************
+
+			// if a keyword is found on the current line and the line doesn't end with ;;+ (continuation)
+			//    and we are not inside a commentblock.
+			if (firstWordLen > 0
+				&& chPrev != '+' && chPrevPrev != ';' && chPrevPrevPrev !=';'
+				&& (!IsStreamCommentStyle(style) || foldInComment) ) {
+
+				// only fold "if" last keyword is "then"  (else its a one line if)
+				if (strcmp(szFirstWord, "if") == 0  && isDoLastWord)
+						levelNext++;
+
+				// create new fold for these words
+				if (strcmp(szFirstWord, "for") == 0)
+					levelNext++;
+
+				//handle folding for functions/labels
+				//Note: Functions and labels don't have an explicit end like [end function]
+				//	1. functions/labels end at the start of another function
+				//	2. functions/labels end at the end of the file
+				if ((strcmp(szFirstWord, "function") == 0) || (firstWordLen > 0 && szFirstWord[0] == '@')) {
+					if (isFoldingAll) { //if we're folding the whole document (recursivly by lua script)
+
+						if (functionCount > 0) {
+							levelCurrent--;
+						} else {
+							levelNext++;
+						}
+						functionCount++;
+
+					} else { //if just folding a small piece (by clicking on the minus sign next to the word)
+						levelCurrent--;
+					}
+				}
+
+				// end the fold for these words before the current line
+				if (strcmp(szFirstWord, "endif") == 0 || strcmp(szFirstWord, "endfor") == 0) {
+						levelNext--;
+						levelCurrent--;
+				}
+
+				// end the fold for these words before the current line and Start new fold
+				if (strcmp(szFirstWord, "else") == 0 || strcmp(szFirstWord, "elseif") == 0 )
+						levelCurrent--;
+
+			}
+			// Preprocessor and Comment folding
+			int styleNext = GetStyleFirstWord(lineCurrent + 1,styler);
+
+			// *********************************
+			// Folding logic for Comment blocks
+			// *********************************
+			if (foldComment && IsStreamCommentStyle(style)) {
+
+				// Start of a comment block
+				if (stylePrev != style && IsStreamCommentStyle(styleNext) && styleNext == style) {
+				    levelNext++;
+				} // fold till the last line for normal comment lines
+				else if (IsStreamCommentStyle(stylePrev)
+						&& styleNext != SCE_POWERPRO_COMMENTLINE
+						&& stylePrev == SCE_POWERPRO_COMMENTLINE
+						&& style == SCE_POWERPRO_COMMENTLINE) {
+					levelNext--;
+				} // fold till the one but last line for Blockcomment lines
+				else if (IsStreamCommentStyle(stylePrev)
+						&& styleNext != SCE_POWERPRO_COMMENTBLOCK
+						&& style == SCE_POWERPRO_COMMENTBLOCK) {
+					levelNext--;
+					levelCurrent--;
+				}
+			}
+
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			// reset values for the next line
+			lineCurrent++;
+			stylePrev = style;
+			style = styleNext;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+
+			// if the last characters are ;;+ then don't reset since the line continues on the next line.
+			if (chPrev != '+' && chPrevPrev != ';' && chPrevPrevPrev != ';') {
+				firstWordLen = 0;
+				szDolen = 0;
+				isFirstWordStarted = false;
+				isFirstWordEnded = false;
+				isDoLastWord = false;
+
+				//blank out first word
+				for (unsigned int i = 0; i < FIRST_WORD_MAX_LEN; i++)
+					szFirstWord[i] = '\0';
+			}
+		}
+
+		// save the last processed characters
+		if ((ch > 0) && !isspacechar(ch)) {
+			chPrevPrevPrev = chPrevPrev;
+			chPrevPrev = chPrev;
+			chPrev = ch;
+		}
+	}
+
+	//close folds on the last line - without this a 'phantom'
+	//fold can appear when an open fold is on the last line
+	//this can occur because functions and labels don't have an explicit end
+	if (lineCurrent >= lastLine) {
+		int lev = 0;
+		lev |= SC_FOLDLEVELWHITEFLAG;
+		styler.SetLevel(lineCurrent, lev);
+	}
+
+}
+
+static const char * const powerProWordLists[] = {
+            "Keyword list 1",
+            "Keyword list 2",
+            "Keyword list 3",
+            "Keyword list 4",
+            0,
+        };
+
+static void ColourisePowerProDocWrapper(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                                       Accessor &styler) {
+	ColourisePowerProDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+
+LexerModule lmPowerPro(SCLEX_POWERPRO, ColourisePowerProDocWrapper, "powerpro", FoldPowerProDoc, powerProWordLists);
+
+
diff --git a/scite-app/lexilla/lexers/LexPowerShell.cxx b/scite-app/lexilla/lexers/LexPowerShell.cxx
new file mode 100644
index 0000000..4e65278
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPowerShell.cxx
@@ -0,0 +1,255 @@
+// Scintilla source code edit control
+/** @file LexPowerShell.cxx
+ ** Lexer for PowerShell scripts.
+ **/
+// Copyright 2008 by Tim Gerundt <tim@gerundt.de>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 || isalnum(ch) || ch == '-' || ch == '_';
+}
+
+static void ColourisePowerShellDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+				   WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+
+	styler.StartAt(startPos);
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_POWERSHELL_COMMENT) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_COMMENTSTREAM) {
+			if (sc.atLineStart) {
+				while (IsASpaceOrTab(sc.ch)) {
+					sc.Forward();
+				}
+				if (sc.ch == '.' && IsAWordChar(sc.chNext)) {
+					sc.SetState(SCE_POWERSHELL_COMMENTDOCKEYWORD);
+				}
+			}
+			if (sc.ch == '>' && sc.chPrev == '#') {
+				sc.ForwardSetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_COMMENTDOCKEYWORD) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (!keywords6.InList(s + 1)) {
+					sc.ChangeState(SCE_POWERSHELL_COMMENTSTREAM);
+				}
+				sc.SetState(SCE_POWERSHELL_COMMENTSTREAM);
+			}
+		} else if (sc.state == SCE_POWERSHELL_STRING) {
+			// This is a doubles quotes string
+			if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_POWERSHELL_DEFAULT);
+			} else if (sc.ch == '`') {
+				sc.Forward(); // skip next escaped character
+			}
+		} else if (sc.state == SCE_POWERSHELL_CHARACTER) {
+			// This is a single quote string
+			if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_POWERSHELL_DEFAULT);
+			} else if (sc.ch == '`') {
+				sc.Forward(); // skip next escaped character
+			}
+		} else if (sc.state == SCE_POWERSHELL_HERE_STRING) {
+			// This is a doubles quotes here-string
+			if (sc.atLineStart && sc.ch == '\"' && sc.chNext == '@') {
+				sc.Forward(2);
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_HERE_CHARACTER) {
+			// This is a single quote here-string
+			if (sc.atLineStart && sc.ch == '\'' && sc.chNext == '@') {
+				sc.Forward(2);
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_NUMBER) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_VARIABLE) {
+			if (!IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_OPERATOR) {
+			if (!isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		} else if (sc.state == SCE_POWERSHELL_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_KEYWORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_CMDLET);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_ALIAS);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_FUNCTION);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_POWERSHELL_USER1);
+				}
+				sc.SetState(SCE_POWERSHELL_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_POWERSHELL_DEFAULT) {
+			if (sc.ch == '#') {
+				sc.SetState(SCE_POWERSHELL_COMMENT);
+			} else if (sc.ch == '<' && sc.chNext == '#') {
+				sc.SetState(SCE_POWERSHELL_COMMENTSTREAM);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_POWERSHELL_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_POWERSHELL_CHARACTER);
+			} else if (sc.ch == '@' && sc.chNext == '\"') {
+				sc.SetState(SCE_POWERSHELL_HERE_STRING);
+			} else if (sc.ch == '@' && sc.chNext == '\'') {
+				sc.SetState(SCE_POWERSHELL_HERE_CHARACTER);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_POWERSHELL_VARIABLE);
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_POWERSHELL_NUMBER);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_POWERSHELL_OPERATOR);
+			} else if (IsAWordChar(sc.ch)) {
+				sc.SetState(SCE_POWERSHELL_IDENTIFIER);
+			} else if (sc.ch == '`') {
+				sc.Forward(); // skip next escaped character
+			}
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldPowerShellDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+			      WordList *[], Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_POWERSHELL_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		} else if (foldComment && style == SCE_POWERSHELL_COMMENTSTREAM) {
+			if (stylePrev != SCE_POWERSHELL_COMMENTSTREAM && stylePrev != SCE_POWERSHELL_COMMENTDOCKEYWORD) {
+				levelNext++;
+			} else if (styleNext != SCE_POWERSHELL_COMMENTSTREAM && styleNext != SCE_POWERSHELL_COMMENTDOCKEYWORD) {
+				levelNext--;
+			}
+		} else if (foldComment && style == SCE_POWERSHELL_COMMENT) {
+			if (ch == '#') {
+				Sci_PositionU j = i + 1;
+				while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region")) {
+					levelNext++;
+				} else if (styler.Match(j, "endregion")) {
+					levelNext--;
+				}
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+	}
+}
+
+static const char *const powershellWordLists[] = {
+	"Commands",
+	"Cmdlets",
+	"Aliases",
+	"Functions",
+	"User1",
+	"DocComment",
+	0
+};
+
+LexerModule lmPowerShell(SCLEX_POWERSHELL, ColourisePowerShellDoc, "powershell", FoldPowerShellDoc, powershellWordLists);
+
diff --git a/scite-app/lexilla/lexers/LexProgress.cxx b/scite-app/lexilla/lexers/LexProgress.cxx
new file mode 100644
index 0000000..e95e95e
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexProgress.cxx
@@ -0,0 +1,571 @@
+// Scintilla source code edit control
+/** @file LexProgress.cxx
+ **  Lexer for Progress 4GL.
+ ** Based on LexCPP.cxx of Neil Hodgson <neilh@scintilla.org>
+  **/
+// Copyright 2006-2016 by Yuval Papish <Yuval@YuvCom.com>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/** TODO:
+
+SpeedScript support in html lexer
+Differentiate between labels and variables
+  Option 1: By symbols table
+  Option 2: As a single unidentified symbol in a sytactical line
+
+**/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SparseState.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+   // Use an unnamed namespace to protect the functions and classes from name conflicts
+
+   bool IsSpaceEquiv(int state) {
+      return (state == SCE_ABL_COMMENT ||
+              state == SCE_ABL_LINECOMMENT ||
+              state == SCE_ABL_DEFAULT);
+   }
+
+   void highlightTaskMarker(StyleContext &sc, LexAccessor &styler, WordList &markerList){
+      if ((isoperator(sc.chPrev) || IsASpace(sc.chPrev)) && markerList.Length()) {
+         const int lengthMarker = 50;
+         char marker[lengthMarker+1];
+         Sci_Position currPos = (Sci_Position) sc.currentPos;
+         Sci_Position i = 0;
+         while (i < lengthMarker) {
+            char ch = styler.SafeGetCharAt(currPos + i);
+            if (IsASpace(ch) || isoperator(ch)) {
+               break;
+            }
+            marker[i] = ch;
+            i++;
+         }
+         marker[i] = '\0';
+         if (markerList.InListAbbreviated (marker,'(')) {
+            sc.SetState(SCE_ABL_TASKMARKER);
+         }
+      }
+   }
+
+   bool IsStreamCommentStyle(int style) {
+      return style == SCE_ABL_COMMENT;
+             // style == SCE_ABL_LINECOMMENT;  Only block comments are used for folding
+   }
+
+   // Options used for LexerABL
+   struct OptionsABL {
+      bool fold;
+      bool foldSyntaxBased;
+      bool foldComment;
+      bool foldCommentMultiline;
+      bool foldCompact;
+      OptionsABL() {
+         fold = false;
+         foldSyntaxBased = true;
+         foldComment = true;
+         foldCommentMultiline = true;
+         foldCompact = false;
+      }
+   };
+
+   const char *const ablWordLists[] = {
+               "Primary keywords and identifiers",
+               "Keywords that opens a block, only when used to begin a syntactic line",
+               "Keywords that opens a block anywhere in a syntactic line",
+               "Task Marker", /* "END MODIFY START TODO" */
+               0,
+   };
+
+   struct OptionSetABL : public OptionSet<OptionsABL> {
+      OptionSetABL() {
+         DefineProperty("fold", &OptionsABL::fold);
+
+         DefineProperty("fold.abl.syntax.based", &OptionsABL::foldSyntaxBased,
+            "Set this property to 0 to disable syntax based folding.");
+
+         DefineProperty("fold.comment", &OptionsABL::foldComment,
+            "This option enables folding multi-line comments and explicit fold points when using the ABL lexer. ");
+
+         DefineProperty("fold.abl.comment.multiline", &OptionsABL::foldCommentMultiline,
+            "Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+
+         DefineProperty("fold.compact", &OptionsABL::foldCompact);
+
+         DefineWordListSets(ablWordLists);
+      }
+   };
+}
+
+class LexerABL : public DefaultLexer {
+   CharacterSet setWord;
+   CharacterSet setNegationOp;
+   CharacterSet setArithmethicOp;
+   CharacterSet setRelOp;
+   CharacterSet setLogicalOp;
+   CharacterSet setWordStart;
+   WordList keywords1;      // regular keywords
+   WordList keywords2;      // block opening keywords, only when isSentenceStart
+   WordList keywords3;      // block opening keywords
+   WordList keywords4;      // Task Marker
+   OptionsABL options;
+   OptionSetABL osABL;
+public:
+   LexerABL() :
+      DefaultLexer("abl", SCLEX_PROGRESS),
+      setWord(CharacterSet::setAlphaNum, "_", 0x80, true),
+      setNegationOp(CharacterSet::setNone, "!"),
+      setArithmethicOp(CharacterSet::setNone, "+-/*%"),
+      setRelOp(CharacterSet::setNone, "=!<>"),
+      setLogicalOp(CharacterSet::setNone, "|&"){
+   }
+   virtual ~LexerABL() {
+   }
+   void SCI_METHOD Release() override {
+      delete this;
+   }
+   int SCI_METHOD Version() const override {
+      return lvRelease5;
+   }
+   const char * SCI_METHOD PropertyNames() override {
+      return osABL.PropertyNames();
+   }
+   int SCI_METHOD PropertyType(const char *name) override {
+      return osABL.PropertyType(name);
+   }
+   const char * SCI_METHOD DescribeProperty(const char *name) override {
+      return osABL.DescribeProperty(name);
+   }
+   Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override ;
+   const char * SCI_METHOD PropertyGet(const char *key) override {
+	   return osABL.PropertyGet(key);
+   }
+
+   const char * SCI_METHOD DescribeWordListSets() override {
+      return osABL.DescribeWordListSets();
+   }
+   Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+   void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+   void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+   void * SCI_METHOD PrivateCall(int, void *) override {
+      return 0;
+   }
+   int SCI_METHOD LineEndTypesSupported() override {
+      return SC_LINE_END_TYPE_DEFAULT;
+   }
+   static ILexer5 *LexerFactoryABL() {
+      return new LexerABL();
+   }
+};
+
+Sci_Position SCI_METHOD LexerABL::PropertySet(const char *key, const char *val) {
+   if (osABL.PropertySet(&options, key, val)) {
+      return 0;
+   }
+   return -1;
+}
+
+Sci_Position SCI_METHOD LexerABL::WordListSet(int n, const char *wl) {
+   WordList *wordListN = 0;
+   switch (n) {
+   case 0:
+      wordListN = &keywords1;
+      break;
+   case 1:
+      wordListN = &keywords2;
+      break;
+   case 2:
+      wordListN = &keywords3;
+      break;
+   case 3:
+      wordListN = &keywords4;
+      break;
+   }
+   Sci_Position firstModification = -1;
+   if (wordListN) {
+      WordList wlNew;
+      wlNew.Set(wl);
+      if (*wordListN != wlNew) {
+         wordListN->Set(wl);
+         firstModification = 0;
+      }
+   }
+   return firstModification;
+}
+
+void SCI_METHOD LexerABL::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+   LexAccessor styler(pAccess);
+
+   setWordStart = CharacterSet(CharacterSet::setAlpha, "_", 0x80, true);
+
+   int visibleChars = 0;
+   int visibleChars1 = 0;
+   int styleBeforeTaskMarker = SCE_ABL_DEFAULT;
+   bool continuationLine = false;
+   int commentNestingLevel = 0;
+   bool isSentenceStart = true;
+   bool possibleOOLChange = false;
+
+   Sci_Position lineCurrent = styler.GetLine(startPos);
+   if (initStyle == SCE_ABL_PREPROCESSOR) {
+      // Set continuationLine if last character of previous line is '~'
+      if (lineCurrent > 0) {
+         Sci_Position endLinePrevious = styler.LineEnd(lineCurrent-1);
+         if (endLinePrevious > 0) {
+            continuationLine = styler.SafeGetCharAt(endLinePrevious-1) == '~';
+         }
+      }
+   }
+
+    // Look back to set variables that are actually invisible secondary states. The reason to avoid formal states is to cut down on state's bits
+   if (startPos > 0) {
+      Sci_Position back = startPos;
+      bool checkCommentNestingLevel = (initStyle == SCE_ABL_COMMENT);
+      bool checkIsSentenceStart = (initStyle == SCE_ABL_DEFAULT || initStyle == SCE_ABL_IDENTIFIER);
+      char ch;
+      char st;
+      char chPrev;
+      char chPrev_1;
+      char chPrev_2;
+      char chPrev_3;
+
+      while (back >= 0 && (checkCommentNestingLevel || checkIsSentenceStart)) {
+         ch = styler.SafeGetCharAt(back);
+         styler.Flush();  // looking at styles so need to flush
+         st = styler.StyleAt(back);
+
+         chPrev = styler.SafeGetCharAt(back-1);
+         // isSentenceStart is a non-visible state, used to identify where statements and preprocessor declerations can start
+         if (checkIsSentenceStart && st != SCE_ABL_COMMENT && st != SCE_ABL_LINECOMMENT && st != SCE_ABL_CHARACTER  && st != SCE_ABL_STRING ) {
+            chPrev_1 = styler.SafeGetCharAt(back-2);
+            chPrev_2 = styler.SafeGetCharAt(back-3);
+            chPrev_3 = styler.SafeGetCharAt(back-4);
+            if ((chPrev == '.' || chPrev == ':' || chPrev == '}' ||
+               (chPrev_3 == 'e' && chPrev_2 == 'l' && chPrev_1 == 's' &&  chPrev == 'e') ||
+               (chPrev_3 == 't' && chPrev_2 == 'h' && chPrev_1 == 'e' &&  chPrev == 'n')) &&
+               (IsASpace(ch) || (ch == '/' && styler.SafeGetCharAt(back+1) == '*'))
+               ) {
+                  checkIsSentenceStart = false;
+                  isSentenceStart = true;
+            }
+            else if (IsASpace(chPrev) && ch == '{') {
+               checkIsSentenceStart = false;
+               isSentenceStart = false;
+            }
+         }
+
+         // commentNestingLevel is a non-visible state, used to identify the nesting level of a comment
+         if (checkCommentNestingLevel) {
+            if (chPrev == '/' && ch == '*') {
+               commentNestingLevel++;
+               // eat the '/' so we don't miscount a */ if we see /*/*
+               --back;
+            }
+            if (chPrev == '*' && ch == '/') {
+               commentNestingLevel--;
+               // eat the '*' so we don't miscount a /* if we see */*/
+               --back;
+            }
+         }
+         --back;
+      }
+   }
+
+   StyleContext sc(startPos, length, initStyle, styler, static_cast<unsigned char>(0xff));
+   Sci_Position lineEndNext = styler.LineEnd(lineCurrent);
+
+   for (; sc.More();) {
+      if (sc.atLineStart) {
+         visibleChars = 0;
+         visibleChars1 = 0;
+      }
+      if (sc.atLineEnd) {
+         lineCurrent++;
+         lineEndNext = styler.LineEnd(lineCurrent);
+      }
+      // Handle line continuation generically.
+      if (sc.ch == '~') {
+         if (static_cast<Sci_Position>((sc.currentPos+1)) >= lineEndNext) {
+            lineCurrent++;
+            lineEndNext = styler.LineEnd(lineCurrent);
+            sc.Forward();
+            if (sc.ch == '\r' && sc.chNext == '\n') {
+               sc.Forward();
+            }
+            continuationLine = true;
+            sc.Forward();
+            continue;
+         }
+      }
+
+      const bool atLineEndBeforeSwitch = sc.atLineEnd;
+      // Determine if the current state should terminate.
+      switch (sc.state) {
+         case SCE_ABL_OPERATOR:
+            sc.SetState(SCE_ABL_DEFAULT);
+            break;
+         case SCE_ABL_NUMBER:
+            // We accept almost anything because of hex. and maybe number suffixes and scientific notations in the future
+            if (!(setWord.Contains(sc.ch)
+				   || ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E' ||
+				                                          sc.chPrev == 'p' || sc.chPrev == 'P')))) {
+               sc.SetState(SCE_ABL_DEFAULT);
+            }
+            break;
+         case SCE_ABL_IDENTIFIER:
+            if (sc.atLineStart || sc.atLineEnd || (!setWord.Contains(sc.ch) && sc.ch != '-')) {
+               char s[1000];
+               sc.GetCurrentLowered(s, sizeof(s));
+               bool isLastWordEnd = (s[0] == 'e' && s[1] =='n' && s[2] == 'd' && !IsAlphaNumeric(s[3]) && s[3] != '-');  // helps to identify "end trigger" phrase
+               if ((isSentenceStart && keywords2.InListAbbreviated (s,'(')) || (!isLastWordEnd && keywords3.InListAbbreviated (s,'('))) {
+                  sc.ChangeState(SCE_ABL_BLOCK);
+                  isSentenceStart = false;
+               }
+               else if (keywords1.InListAbbreviated (s,'(')) {
+                  if (isLastWordEnd ||
+                     (s[0] == 'f' && s[1] =='o' && s[2] == 'r' && s[3] == 'w' && s[4] =='a' && s[5] == 'r' && s[6] == 'd'&& !IsAlphaNumeric(s[7]))) {
+                     sc.ChangeState(SCE_ABL_END);
+                     isSentenceStart = false;
+                  }
+                  else if ((s[0] == 'e' && s[1] =='l' && s[2] == 's' && s[3] == 'e') ||
+                         (s[0] == 't' && s[1] =='h' && s[2] == 'e' && s[3] == 'n')) {
+                     sc.ChangeState(SCE_ABL_WORD);
+                     isSentenceStart = true;
+                  }
+                  else {
+                     sc.ChangeState(SCE_ABL_WORD);
+                     isSentenceStart = false;
+                  }
+               }
+               sc.SetState(SCE_ABL_DEFAULT);
+            }
+            break;
+         case SCE_ABL_PREPROCESSOR:
+            if (sc.atLineStart && !continuationLine) {
+               sc.SetState(SCE_ABL_DEFAULT);
+               // Force Scintilla to acknowledge changed stated even though this change might happen outside of the current line
+               possibleOOLChange = true;
+               isSentenceStart = true;
+            }
+            break;
+         case SCE_ABL_LINECOMMENT:
+            if (sc.atLineStart && !continuationLine) {
+               sc.SetState(SCE_ABL_DEFAULT);
+               isSentenceStart = true;
+            } else {
+               styleBeforeTaskMarker = SCE_ABL_LINECOMMENT;
+               highlightTaskMarker(sc, styler, keywords4);
+            }
+            break;
+         case SCE_ABL_TASKMARKER:
+            if (isoperator(sc.ch) || IsASpace(sc.ch)) {
+               sc.SetState(styleBeforeTaskMarker);
+               styleBeforeTaskMarker = SCE_ABL_DEFAULT;
+            }
+            // fall through
+         case SCE_ABL_COMMENT:
+            if (sc.Match('*', '/')) {
+               sc.Forward();
+               commentNestingLevel--;
+               if (commentNestingLevel == 0) {
+                  sc.ForwardSetState(SCE_ABL_DEFAULT);
+                  possibleOOLChange = true;
+               }
+            } else if (sc.Match('/', '*')) {
+               commentNestingLevel++;
+               sc.Forward();
+            }
+            if (commentNestingLevel > 0) {
+               styleBeforeTaskMarker = SCE_ABL_COMMENT;
+               possibleOOLChange = true;
+               highlightTaskMarker(sc, styler, keywords4);
+            }
+            break;
+         case SCE_ABL_STRING:
+            if (sc.ch == '~') {
+               sc.Forward(); // Skip a character after a tilde
+            } else if (sc.ch == '\"') {
+                  sc.ForwardSetState(SCE_ABL_DEFAULT);
+            }
+            break;
+         case SCE_ABL_CHARACTER:
+            if (sc.ch == '~') {
+               sc.Forward(); // Skip a character after a tilde
+            } else if (sc.ch == '\'') {
+                  sc.ForwardSetState(SCE_ABL_DEFAULT);
+            }
+            break;
+      }
+
+      if (sc.atLineEnd && !atLineEndBeforeSwitch) {
+         // State exit processing consumed characters up to end of line.
+         lineCurrent++;
+         lineEndNext = styler.LineEnd(lineCurrent);
+      }
+
+      // Determine if a new state should be entered.
+      if (sc.state == SCE_ABL_DEFAULT) {
+         if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+               sc.SetState(SCE_ABL_NUMBER);
+               isSentenceStart = false;
+         } else if (!sc.atLineEnd && (setWordStart.Contains(sc.ch)) && sc.chPrev != '&') {
+               sc.SetState(SCE_ABL_IDENTIFIER);
+         } else if (sc.Match('/', '*')) {
+            if (sc.chPrev == '.' || sc.chPrev == ':' || sc.chPrev == '}') {
+               isSentenceStart = true;
+            }
+            sc.SetState(SCE_ABL_COMMENT);
+            possibleOOLChange = true;
+            commentNestingLevel++;
+            sc.Forward();   // Eat the * so it isn't used for the end of the comment
+         } else if (sc.ch == '\"') {
+               sc.SetState(SCE_ABL_STRING);
+               isSentenceStart = false;
+         } else if (sc.ch == '\'') {
+            sc.SetState(SCE_ABL_CHARACTER);
+            isSentenceStart = false;
+         } else if (sc.ch == '&' && visibleChars1 == 0 && isSentenceStart) {
+            // Preprocessor commands are alone on their line
+            sc.SetState(SCE_ABL_PREPROCESSOR);
+            // Force Scintilla to acknowledge changed stated even though this change might happen outside of the current line
+            possibleOOLChange = true;
+            // Skip whitespace between & and preprocessor word
+            do {
+               sc.Forward();
+            } while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+            if (sc.atLineEnd) {
+               sc.SetState(SCE_ABL_DEFAULT);
+            }
+         } else if (sc.Match('/','/') && (IsASpace(sc.chPrev) || isSentenceStart)) {
+            // Line comments are valid after a white space or EOL
+            sc.SetState(SCE_ABL_LINECOMMENT);
+            // Skip whitespace between // and preprocessor word
+            do {
+               sc.Forward();
+            } while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+            if (sc.atLineEnd) {
+               sc.SetState(SCE_ABL_DEFAULT);
+            }
+         } else if (isoperator(sc.ch)) {
+            sc.SetState(SCE_ABL_OPERATOR);
+            /*    This code allows highlight of handles. Alas, it would cause the phrase "last-event:function"
+               to be recognized as a BlockBegin */
+               isSentenceStart = false;
+         }
+         else if ((sc.chPrev == '.' || sc.chPrev == ':' || sc.chPrev == '}') && (IsASpace(sc.ch))) {
+            isSentenceStart = true;
+         }
+      }
+      if (!IsASpace(sc.ch)) {
+         visibleChars1++;
+      }
+      if (!IsASpace(sc.ch) && !IsSpaceEquiv(sc.state)) {
+         visibleChars++;
+      }
+      continuationLine = false;
+      sc.Forward();
+   }
+	if (possibleOOLChange)
+		styler.ChangeLexerState(startPos, startPos + length);
+   sc.Complete();
+}
+
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+
+void SCI_METHOD LexerABL::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+   if (!options.fold)
+      return;
+
+   LexAccessor styler(pAccess);
+
+   Sci_PositionU endPos = startPos + length;
+   int visibleChars = 0;
+   Sci_Position lineCurrent = styler.GetLine(startPos);
+   int levelCurrent = SC_FOLDLEVELBASE;
+   if (lineCurrent > 0)
+      levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+   Sci_PositionU lineStartNext = styler.LineStart(lineCurrent+1);
+   int levelNext = levelCurrent;
+   char chNext = styler[startPos];
+   int styleNext = styler.StyleAt(startPos);
+   int style = initStyle;
+   for (Sci_PositionU i = startPos; i < endPos; i++) {
+      chNext = static_cast<char>(tolower(chNext));  // check tolower
+      char ch = chNext;
+      chNext = styler.SafeGetCharAt(i+1);
+      int stylePrev = style;
+      style = styleNext;
+      styleNext = styler.StyleAt(i+1);
+      bool atEOL = i == (lineStartNext-1);
+      if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) {
+         if (!IsStreamCommentStyle(stylePrev)) {
+            levelNext++;
+         } else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+            // Comments don't end at end of line and the next character may be unstyled.
+            levelNext--;
+         }
+      }
+      if (options.foldSyntaxBased) {
+         if (style == SCE_ABL_BLOCK && !IsAlphaNumeric(chNext)) {
+            levelNext++;
+         }
+         else if (style == SCE_ABL_END  && (ch == 'e' || ch == 'f')) {
+            levelNext--;
+         }
+      }
+      if (!IsASpace(ch))
+         visibleChars++;
+      if (atEOL || (i == endPos-1)) {
+         int lev = levelCurrent | levelNext << 16;
+         if (visibleChars == 0 && options.foldCompact)
+            lev |= SC_FOLDLEVELWHITEFLAG;
+         if (levelCurrent < levelNext)
+            lev |= SC_FOLDLEVELHEADERFLAG;
+         if (lev != styler.LevelAt(lineCurrent)) {
+            styler.SetLevel(lineCurrent, lev);
+         }
+         lineCurrent++;
+         lineStartNext = styler.LineStart(lineCurrent+1);
+         levelCurrent = levelNext;
+         if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
+            // There is an empty line at end of file so give it same level and empty
+            styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+         }
+         visibleChars = 0;
+      }
+   }
+}
+
+LexerModule lmProgress(SCLEX_PROGRESS, LexerABL::LexerFactoryABL, "abl", ablWordLists);
diff --git a/scite-app/lexilla/lexers/LexProps.cxx b/scite-app/lexilla/lexers/LexProps.cxx
new file mode 100644
index 0000000..7dadb2c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexProps.cxx
@@ -0,0 +1,188 @@
+// Scintilla source code edit control
+/** @file LexProps.cxx
+ ** Lexer for properties files.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') ||
+	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+static inline bool isassignchar(unsigned char ch) {
+	return (ch == '=') || (ch == ':');
+}
+
+static void ColourisePropsLine(
+	const char *lineBuffer,
+    Sci_PositionU lengthLine,
+    Sci_PositionU startLine,
+    Sci_PositionU endPos,
+    Accessor &styler,
+    bool allowInitialSpaces) {
+
+	Sci_PositionU i = 0;
+	if (allowInitialSpaces) {
+		while ((i < lengthLine) && isspacechar(lineBuffer[i]))	// Skip initial spaces
+			i++;
+	} else {
+		if (isspacechar(lineBuffer[i])) // don't allow initial spaces
+			i = lengthLine;
+	}
+
+	if (i < lengthLine) {
+		if (lineBuffer[i] == '#' || lineBuffer[i] == '!' || lineBuffer[i] == ';') {
+			styler.ColourTo(endPos, SCE_PROPS_COMMENT);
+		} else if (lineBuffer[i] == '[') {
+			styler.ColourTo(endPos, SCE_PROPS_SECTION);
+		} else if (lineBuffer[i] == '@') {
+			styler.ColourTo(startLine + i, SCE_PROPS_DEFVAL);
+			if (isassignchar(lineBuffer[i++]))
+				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
+			styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+		} else {
+			// Search for the '=' character
+			while ((i < lengthLine) && !isassignchar(lineBuffer[i]))
+				i++;
+			if ((i < lengthLine) && isassignchar(lineBuffer[i])) {
+				styler.ColourTo(startLine + i - 1, SCE_PROPS_KEY);
+				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
+				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+			} else {
+				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+			}
+		}
+	} else {
+		styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
+	}
+}
+
+static void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	std::string lineBuffer;
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	Sci_PositionU startLine = startPos;
+
+	// property lexer.props.allow.initial.spaces
+	//	For properties files, set to 0 to style all lines that start with whitespace in the default style.
+	//	This is not suitable for SciTE .properties files which use indentation for flow control but
+	//	can be used for RFC2822 text where indentation is used for continuation lines.
+	const bool allowInitialSpaces = styler.GetPropertyInt("lexer.props.allow.initial.spaces", 1) != 0;
+
+	for (Sci_PositionU i = startPos; i < startPos + length; i++) {
+		lineBuffer.push_back(styler[i]);
+		if (AtEOL(styler, i)) {
+			// End of line (or of line buffer) met, colourise it
+			ColourisePropsLine(lineBuffer.c_str(), lineBuffer.length(), startLine, i, styler, allowInitialSpaces);
+			lineBuffer.clear();
+			startLine = i + 1;
+		}
+	}
+	if (lineBuffer.length() > 0) {	// Last line does not have ending characters
+		ColourisePropsLine(lineBuffer.c_str(), lineBuffer.length(), startLine, startPos + length - 1, styler, allowInitialSpaces);
+	}
+}
+
+// adaption by ksc, using the "} else {" trick of 1.53
+// 030721
+static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+
+	const Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	bool headerPoint = false;
+	int lev;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		const char ch = chNext;
+		chNext = styler[i+1];
+
+		const int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (style == SCE_PROPS_SECTION) {
+			headerPoint = true;
+		}
+
+		if (atEOL) {
+			lev = SC_FOLDLEVELBASE;
+
+			if (lineCurrent > 0) {
+				const int levelPrevious = styler.LevelAt(lineCurrent - 1);
+
+				if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+					lev = SC_FOLDLEVELBASE + 1;
+				} else {
+					lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
+				}
+			}
+
+			if (headerPoint) {
+				lev = SC_FOLDLEVELBASE;
+			}
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+
+			if (headerPoint) {
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+
+			lineCurrent++;
+			visibleChars = 0;
+			headerPoint = false;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	if (lineCurrent > 0) {
+		const int levelPrevious = styler.LevelAt(lineCurrent - 1);
+		if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+			lev = SC_FOLDLEVELBASE + 1;
+		} else {
+			lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
+		}
+	} else {
+		lev = SC_FOLDLEVELBASE;
+	}
+	int flagsNext = styler.LevelAt(lineCurrent);
+	styler.SetLevel(lineCurrent, lev | (flagsNext & ~SC_FOLDLEVELNUMBERMASK));
+}
+
+static const char *const emptyWordListDesc[] = {
+	0
+};
+
+LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props", FoldPropsDoc, emptyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexPython.cxx b/scite-app/lexilla/lexers/LexPython.cxx
new file mode 100644
index 0000000..b87192a
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexPython.cxx
@@ -0,0 +1,987 @@
+// Scintilla source code edit control
+/** @file LexPython.cxx
+ ** Lexer for Python.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "StringCopy.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SubStyles.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+// Use an unnamed namespace to protect the functions and classes from name conflicts
+
+/* Notes on f-strings: f-strings are strings prefixed with f (e.g. f'') that may
+   have arbitrary expressions in {}.  The tokens in the expressions are lexed as if
+   they were outside of any string.  Expressions may contain { and } characters as
+   long as there is a closing } for every {, may be 2+ lines in a triple quoted
+   string, and may have a formatting specifier following a ! or :, but both !
+   and : are valid inside of a bracketed expression and != is a valid
+   expression token even outside of a bracketed expression.
+
+   When in an f-string expression, the lexer keeps track of the state value of
+   the f-string and the nesting count for the expression (# of [, (, { seen - # of
+   }, ), ] seen).  f-strings may be nested (e.g. f'{ a + f"{1+2}"') so a stack of
+   states and nesting counts is kept.  If a f-string expression continues beyond
+   the end of a line, this stack is saved in a std::map that maps a line number to
+   the stack at the end of that line.  std::vector is used for the stack.
+
+   The PEP for f-strings is at https://www.python.org/dev/peps/pep-0498/
+*/
+struct SingleFStringExpState {
+	int state;
+	int nestingCount;
+};
+
+/* kwCDef, kwCTypeName only used for Cython */
+enum kwType { kwOther, kwClass, kwDef, kwImport, kwCDef, kwCTypeName, kwCPDef };
+
+enum literalsAllowed { litNone = 0, litU = 1, litB = 2, litF = 4 };
+
+constexpr int indicatorWhitespace = 1;
+
+bool IsPyComment(Accessor &styler, Sci_Position pos, Sci_Position len) {
+	return len > 0 && styler[pos] == '#';
+}
+
+bool IsPyStringTypeChar(int ch, literalsAllowed allowed) noexcept {
+	return
+		((allowed & litB) && (ch == 'b' || ch == 'B')) ||
+		((allowed & litU) && (ch == 'u' || ch == 'U')) ||
+		((allowed & litF) && (ch == 'f' || ch == 'F'));
+}
+
+bool IsPyStringStart(int ch, int chNext, int chNext2, literalsAllowed allowed) noexcept {
+	if (ch == '\'' || ch == '"')
+		return true;
+	if (IsPyStringTypeChar(ch, allowed)) {
+		if (chNext == '"' || chNext == '\'')
+			return true;
+		if ((chNext == 'r' || chNext == 'R') && (chNext2 == '"' || chNext2 == '\''))
+			return true;
+	}
+	if ((ch == 'r' || ch == 'R') && (chNext == '"' || chNext == '\''))
+		return true;
+
+	return false;
+}
+
+bool IsPyFStringState(int st) noexcept {
+	return ((st == SCE_P_FCHARACTER) || (st == SCE_P_FSTRING) ||
+		(st == SCE_P_FTRIPLE) || (st == SCE_P_FTRIPLEDOUBLE));
+}
+
+bool IsPySingleQuoteStringState(int st) noexcept {
+	return ((st == SCE_P_CHARACTER) || (st == SCE_P_STRING) ||
+		(st == SCE_P_FCHARACTER) || (st == SCE_P_FSTRING));
+}
+
+bool IsPyTripleQuoteStringState(int st) noexcept {
+	return ((st == SCE_P_TRIPLE) || (st == SCE_P_TRIPLEDOUBLE) ||
+		(st == SCE_P_FTRIPLE) || (st == SCE_P_FTRIPLEDOUBLE));
+}
+
+char GetPyStringQuoteChar(int st) noexcept {
+	if ((st == SCE_P_CHARACTER) || (st == SCE_P_FCHARACTER) ||
+			(st == SCE_P_TRIPLE) || (st == SCE_P_FTRIPLE))
+		return '\'';
+	if ((st == SCE_P_STRING) || (st == SCE_P_FSTRING) ||
+			(st == SCE_P_TRIPLEDOUBLE) || (st == SCE_P_FTRIPLEDOUBLE))
+		return '"';
+
+	return '\0';
+}
+
+void PushStateToStack(int state, std::vector<SingleFStringExpState> &stack, SingleFStringExpState *&currentFStringExp) {
+	SingleFStringExpState single = {state, 0};
+	stack.push_back(single);
+
+	currentFStringExp = &stack.back();
+}
+
+int PopFromStateStack(std::vector<SingleFStringExpState> &stack, SingleFStringExpState *&currentFStringExp) noexcept {
+	int state = 0;
+
+	if (!stack.empty()) {
+		state = stack.back().state;
+		stack.pop_back();
+	}
+
+	if (stack.empty()) {
+		currentFStringExp = nullptr;
+	} else {
+		currentFStringExp = &stack.back();
+	}
+
+	return state;
+}
+
+/* Return the state to use for the string starting at i; *nextIndex will be set to the first index following the quote(s) */
+int GetPyStringState(Accessor &styler, Sci_Position i, Sci_PositionU *nextIndex, literalsAllowed allowed) {
+	char ch = styler.SafeGetCharAt(i);
+	char chNext = styler.SafeGetCharAt(i + 1);
+	const int firstIsF = (ch == 'f' || ch == 'F');
+
+	// Advance beyond r, u, or ur prefix (or r, b, or br in Python 2.7+ and r, f, or fr in Python 3.6+), but bail if there are any unexpected chars
+	if (ch == 'r' || ch == 'R') {
+		i++;
+		ch = styler.SafeGetCharAt(i);
+		chNext = styler.SafeGetCharAt(i + 1);
+	} else if (IsPyStringTypeChar(ch, allowed)) {
+		if (chNext == 'r' || chNext == 'R')
+			i += 2;
+		else
+			i += 1;
+		ch = styler.SafeGetCharAt(i);
+		chNext = styler.SafeGetCharAt(i + 1);
+	}
+
+	if (ch != '"' && ch != '\'') {
+		*nextIndex = i + 1;
+		return SCE_P_DEFAULT;
+	}
+
+	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2)) {
+		*nextIndex = i + 3;
+
+		if (ch == '"')
+			return (firstIsF ? SCE_P_FTRIPLEDOUBLE : SCE_P_TRIPLEDOUBLE);
+		else
+			return (firstIsF ? SCE_P_FTRIPLE : SCE_P_TRIPLE);
+	} else {
+		*nextIndex = i + 1;
+
+		if (ch == '"')
+			return (firstIsF ? SCE_P_FSTRING : SCE_P_STRING);
+		else
+			return (firstIsF ? SCE_P_FCHARACTER : SCE_P_CHARACTER);
+	}
+}
+
+inline bool IsAWordChar(int ch, bool unicodeIdentifiers) {
+	if (IsASCII(ch))
+		return (IsAlphaNumeric(ch) || ch == '.' || ch == '_');
+
+	if (!unicodeIdentifiers)
+		return false;
+
+	// Python uses the XID_Continue set from Unicode data
+	return IsXidContinue(ch);
+}
+
+inline bool IsAWordStart(int ch, bool unicodeIdentifiers) {
+	if (IsASCII(ch))
+		return (IsUpperOrLowerCase(ch) || ch == '_');
+
+	if (!unicodeIdentifiers)
+		return false;
+
+	// Python uses the XID_Start set from Unicode data
+	return IsXidStart(ch);
+}
+
+bool IsFirstNonWhitespace(Sci_Position pos, Accessor &styler) {
+	const Sci_Position line = styler.GetLine(pos);
+	const Sci_Position start_pos = styler.LineStart(line);
+	for (Sci_Position i = start_pos; i < pos; i++) {
+		const char ch = styler[i];
+		if (!(ch == ' ' || ch == '\t'))
+			return false;
+	}
+	return true;
+}
+
+// Options used for LexerPython
+struct OptionsPython {
+	int whingeLevel;
+	bool base2or8Literals;
+	bool stringsU;
+	bool stringsB;
+	bool stringsF;
+	bool stringsOverNewline;
+	bool keywords2NoSubIdentifiers;
+	bool fold;
+	bool foldQuotes;
+	bool foldCompact;
+	bool unicodeIdentifiers;
+
+	OptionsPython() {
+		whingeLevel = 0;
+		base2or8Literals = true;
+		stringsU = true;
+		stringsB = true;
+		stringsF = true;
+		stringsOverNewline = false;
+		keywords2NoSubIdentifiers = false;
+		fold = false;
+		foldQuotes = false;
+		foldCompact = false;
+		unicodeIdentifiers = true;
+	}
+
+	literalsAllowed AllowedLiterals() const noexcept {
+		literalsAllowed allowedLiterals = stringsU ? litU : litNone;
+		if (stringsB)
+			allowedLiterals = static_cast<literalsAllowed>(allowedLiterals | litB);
+		if (stringsF)
+			allowedLiterals = static_cast<literalsAllowed>(allowedLiterals | litF);
+		return allowedLiterals;
+	}
+};
+
+const char *const pythonWordListDesc[] = {
+	"Keywords",
+	"Highlighted identifiers",
+	nullptr
+};
+
+struct OptionSetPython : public OptionSet<OptionsPython> {
+	OptionSetPython() {
+		DefineProperty("tab.timmy.whinge.level", &OptionsPython::whingeLevel,
+			       "For Python code, checks whether indenting is consistent. "
+			       "The default, 0 turns off indentation checking, "
+			       "1 checks whether each line is potentially inconsistent with the previous line, "
+			       "2 checks whether any space characters occur before a tab character in the indentation, "
+			       "3 checks whether any spaces are in the indentation, and "
+			       "4 checks for any tab characters in the indentation. "
+			       "1 is a good level to use.");
+
+		DefineProperty("lexer.python.literals.binary", &OptionsPython::base2or8Literals,
+			       "Set to 0 to not recognise Python 3 binary and octal literals: 0b1011 0o712.");
+
+		DefineProperty("lexer.python.strings.u", &OptionsPython::stringsU,
+			       "Set to 0 to not recognise Python Unicode literals u\"x\" as used before Python 3.");
+
+		DefineProperty("lexer.python.strings.b", &OptionsPython::stringsB,
+			       "Set to 0 to not recognise Python 3 bytes literals b\"x\".");
+
+		DefineProperty("lexer.python.strings.f", &OptionsPython::stringsF,
+			       "Set to 0 to not recognise Python 3.6 f-string literals f\"var={var}\".");
+
+		DefineProperty("lexer.python.strings.over.newline", &OptionsPython::stringsOverNewline,
+			       "Set to 1 to allow strings to span newline characters.");
+
+		DefineProperty("lexer.python.keywords2.no.sub.identifiers", &OptionsPython::keywords2NoSubIdentifiers,
+			       "When enabled, it will not style keywords2 items that are used as a sub-identifier. "
+			       "Example: when set, will not highlight \"foo.open\" when \"open\" is a keywords2 item.");
+
+		DefineProperty("fold", &OptionsPython::fold);
+
+		DefineProperty("fold.quotes.python", &OptionsPython::foldQuotes,
+			       "This option enables folding multi-line quoted strings when using the Python lexer.");
+
+		DefineProperty("fold.compact", &OptionsPython::foldCompact);
+
+		DefineProperty("lexer.python.unicode.identifiers", &OptionsPython::unicodeIdentifiers,
+			       "Set to 0 to not recognise Python 3 Unicode identifiers.");
+
+		DefineWordListSets(pythonWordListDesc);
+	}
+};
+
+const char styleSubable[] = { SCE_P_IDENTIFIER, 0 };
+
+LexicalClass lexicalClasses[] = {
+	// Lexer Python SCLEX_PYTHON SCE_P_:
+	0, "SCE_P_DEFAULT", "default", "White space",
+	1, "SCE_P_COMMENTLINE", "comment line", "Comment",
+	2, "SCE_P_NUMBER", "literal numeric", "Number",
+	3, "SCE_P_STRING", "literal string", "String",
+	4, "SCE_P_CHARACTER", "literal string", "Single quoted string",
+	5, "SCE_P_WORD", "keyword", "Keyword",
+	6, "SCE_P_TRIPLE", "literal string", "Triple quotes",
+	7, "SCE_P_TRIPLEDOUBLE", "literal string", "Triple double quotes",
+	8, "SCE_P_CLASSNAME", "identifier", "Class name definition",
+	9, "SCE_P_DEFNAME", "identifier", "Function or method name definition",
+	10, "SCE_P_OPERATOR", "operator", "Operators",
+	11, "SCE_P_IDENTIFIER", "identifier", "Identifiers",
+	12, "SCE_P_COMMENTBLOCK", "comment", "Comment-blocks",
+	13, "SCE_P_STRINGEOL", "error literal string", "End of line where string is not closed",
+	14, "SCE_P_WORD2", "identifier", "Highlighted identifiers",
+	15, "SCE_P_DECORATOR", "preprocessor", "Decorators",
+	16, "SCE_P_FSTRING", "literal string interpolated", "F-String",
+	17, "SCE_P_FCHARACTER", "literal string interpolated", "Single quoted f-string",
+	18, "SCE_P_FTRIPLE", "literal string interpolated", "Triple quoted f-string",
+	19, "SCE_P_FTRIPLEDOUBLE", "literal string interpolated", "Triple double quoted f-string",
+};
+
+}
+
+class LexerPython : public DefaultLexer {
+	WordList keywords;
+	WordList keywords2;
+	OptionsPython options;
+	OptionSetPython osPython;
+	enum { ssIdentifier };
+	SubStyles subStyles;
+	std::map<Sci_Position, std::vector<SingleFStringExpState> > ftripleStateAtEol;
+public:
+	explicit LexerPython() :
+		DefaultLexer("python", SCLEX_PYTHON, lexicalClasses, ELEMENTS(lexicalClasses)),
+		subStyles(styleSubable, 0x80, 0x40, 0) {
+	}
+	~LexerPython() override {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return osPython.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osPython.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return osPython.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osPython.PropertyGet(key);
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return osPython.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void *SCI_METHOD PrivateCall(int, void *) override {
+		return nullptr;
+	}
+
+	int SCI_METHOD LineEndTypesSupported() override {
+		return SC_LINE_END_TYPE_UNICODE;
+	}
+
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		const int styleBase = subStyles.BaseStyle(subStyle);
+		return styleBase;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+		return style;
+	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() override {
+		return 0;
+	}
+	const char *SCI_METHOD GetSubStyleBases() override {
+		return styleSubable;
+	}
+
+	static ILexer5 *LexerFactoryPython() {
+		return new LexerPython();
+	}
+
+private:
+	void ProcessLineEnd(StyleContext &sc, std::vector<SingleFStringExpState> &fstringStateStack, SingleFStringExpState *&currentFStringExp, bool &inContinuedString);
+};
+
+Sci_Position SCI_METHOD LexerPython::PropertySet(const char *key, const char *val) {
+	if (osPython.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerPython::WordListSet(int n, const char *wl) {
+	WordList *wordListN = nullptr;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void LexerPython::ProcessLineEnd(StyleContext &sc, std::vector<SingleFStringExpState> &fstringStateStack, SingleFStringExpState *&currentFStringExp, bool &inContinuedString) {
+	long deepestSingleStateIndex = -1;
+	unsigned long i;
+
+	// Find the deepest single quote state because that string will end; no \ continuation in f-string
+	for (i = 0; i < fstringStateStack.size(); i++) {
+		if (IsPySingleQuoteStringState(fstringStateStack[i].state)) {
+			deepestSingleStateIndex = i;
+			break;
+		}
+	}
+
+	if (deepestSingleStateIndex != -1) {
+		sc.SetState(fstringStateStack[deepestSingleStateIndex].state);
+		while (fstringStateStack.size() > static_cast<unsigned long>(deepestSingleStateIndex)) {
+			PopFromStateStack(fstringStateStack, currentFStringExp);
+		}
+	}
+	if (!fstringStateStack.empty()) {
+		std::pair<Sci_Position, std::vector<SingleFStringExpState> > val;
+		val.first = sc.currentLine;
+		val.second = fstringStateStack;
+
+		ftripleStateAtEol.insert(val);
+	}
+
+	if ((sc.state == SCE_P_DEFAULT)
+			|| IsPyTripleQuoteStringState(sc.state)) {
+		// Perform colourisation of white space and triple quoted strings at end of each line to allow
+		// tab marking to work inside white space and triple quoted strings
+		sc.SetState(sc.state);
+	}
+	if (IsPySingleQuoteStringState(sc.state)) {
+		if (inContinuedString || options.stringsOverNewline) {
+			inContinuedString = false;
+		} else {
+			sc.ChangeState(SCE_P_STRINGEOL);
+			sc.ForwardSetState(SCE_P_DEFAULT);
+		}
+	}
+}
+
+void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	Accessor styler(pAccess, nullptr);
+
+	// Track whether in f-string expression; vector is used for a stack to
+	// handle nested f-strings such as f"""{f'''{f"{f'{1}'}"}'''}"""
+	std::vector<SingleFStringExpState> fstringStateStack;
+	SingleFStringExpState *currentFStringExp = nullptr;
+
+	const Sci_Position endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its tab whinging
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			// Look for backslash-continued lines
+			while (lineCurrent > 0) {
+				const Sci_Position eolPos = styler.LineStart(lineCurrent) - 1;
+				const int eolStyle = styler.StyleAt(eolPos);
+				if (eolStyle == SCE_P_STRING
+						|| eolStyle == SCE_P_CHARACTER
+						|| eolStyle == SCE_P_STRINGEOL) {
+					lineCurrent -= 1;
+				} else {
+					break;
+				}
+			}
+			startPos = styler.LineStart(lineCurrent);
+		}
+		initStyle = startPos == 0 ? SCE_P_DEFAULT : styler.StyleAt(startPos - 1);
+	}
+
+	const literalsAllowed allowedLiterals = options.AllowedLiterals();
+
+	initStyle = initStyle & 31;
+	if (initStyle == SCE_P_STRINGEOL) {
+		initStyle = SCE_P_DEFAULT;
+	}
+
+	// Set up fstate stack from last line and remove any subsequent ftriple at eol states
+	std::map<Sci_Position, std::vector<SingleFStringExpState> >::iterator it;
+	it = ftripleStateAtEol.find(lineCurrent - 1);
+	if (it != ftripleStateAtEol.end() && !it->second.empty()) {
+		fstringStateStack = it->second;
+		currentFStringExp = &fstringStateStack.back();
+	}
+	it = ftripleStateAtEol.lower_bound(lineCurrent);
+	if (it != ftripleStateAtEol.end()) {
+		ftripleStateAtEol.erase(it, ftripleStateAtEol.end());
+	}
+
+	kwType kwLast = kwOther;
+	int spaceFlags = 0;
+	styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+	bool base_n_number = false;
+
+	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_P_IDENTIFIER);
+
+	StyleContext sc(startPos, endPos - startPos, initStyle, styler);
+
+	bool indentGood = true;
+	Sci_Position startIndicator = sc.currentPos;
+	bool inContinuedString = false;
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart) {
+			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+			indentGood = true;
+			if (options.whingeLevel == 1) {
+				indentGood = (spaceFlags & wsInconsistent) == 0;
+			} else if (options.whingeLevel == 2) {
+				indentGood = (spaceFlags & wsSpaceTab) == 0;
+			} else if (options.whingeLevel == 3) {
+				indentGood = (spaceFlags & wsSpace) == 0;
+			} else if (options.whingeLevel == 4) {
+				indentGood = (spaceFlags & wsTab) == 0;
+			}
+			if (!indentGood) {
+				styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 0);
+				startIndicator = sc.currentPos;
+			}
+		}
+
+		if (sc.atLineEnd) {
+			ProcessLineEnd(sc, fstringStateStack, currentFStringExp, inContinuedString);
+			lineCurrent++;
+			if (!sc.More())
+				break;
+		}
+
+		bool needEOLCheck = false;
+
+
+		if (sc.state == SCE_P_OPERATOR) {
+			kwLast = kwOther;
+			sc.SetState(SCE_P_DEFAULT);
+		} else if (sc.state == SCE_P_NUMBER) {
+			if (!IsAWordChar(sc.ch, false) &&
+					!(!base_n_number && ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E')))) {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if (sc.state == SCE_P_IDENTIFIER) {
+			if ((sc.ch == '.') || (!IsAWordChar(sc.ch, options.unicodeIdentifiers))) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				int style = SCE_P_IDENTIFIER;
+				if ((kwLast == kwImport) && (strcmp(s, "as") == 0)) {
+					style = SCE_P_WORD;
+				} else if (keywords.InList(s)) {
+					style = SCE_P_WORD;
+				} else if (kwLast == kwClass) {
+					style = SCE_P_CLASSNAME;
+				} else if (kwLast == kwDef) {
+					style = SCE_P_DEFNAME;
+				} else if (kwLast == kwCDef || kwLast == kwCPDef) {
+					Sci_Position pos = sc.currentPos;
+					unsigned char ch = styler.SafeGetCharAt(pos, '\0');
+					while (ch != '\0') {
+						if (ch == '(') {
+							style = SCE_P_DEFNAME;
+							break;
+						} else if (ch == ':') {
+							style = SCE_P_CLASSNAME;
+							break;
+						} else if (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') {
+							pos++;
+							ch = styler.SafeGetCharAt(pos, '\0');
+						} else {
+							break;
+						}
+					}
+				} else if (keywords2.InList(s)) {
+					if (options.keywords2NoSubIdentifiers) {
+						// We don't want to highlight keywords2
+						// that are used as a sub-identifier,
+						// i.e. not open in "foo.open".
+						const Sci_Position pos = styler.GetStartSegment() - 1;
+						if (pos < 0 || (styler.SafeGetCharAt(pos, '\0') != '.'))
+							style = SCE_P_WORD2;
+					} else {
+						style = SCE_P_WORD2;
+					}
+				} else {
+					int subStyle = classifierIdentifiers.ValueFor(s);
+					if (subStyle >= 0) {
+						style = subStyle;
+					}
+				}
+				sc.ChangeState(style);
+				sc.SetState(SCE_P_DEFAULT);
+				if (style == SCE_P_WORD) {
+					if (0 == strcmp(s, "class"))
+						kwLast = kwClass;
+					else if (0 == strcmp(s, "def"))
+						kwLast = kwDef;
+					else if (0 == strcmp(s, "import"))
+						kwLast = kwImport;
+					else if (0 == strcmp(s, "cdef"))
+						kwLast = kwCDef;
+					else if (0 == strcmp(s, "cpdef"))
+						kwLast = kwCPDef;
+					else if (0 == strcmp(s, "cimport"))
+						kwLast = kwImport;
+					else if (kwLast != kwCDef && kwLast != kwCPDef)
+						kwLast = kwOther;
+				} else if (kwLast != kwCDef && kwLast != kwCPDef) {
+					kwLast = kwOther;
+				}
+			}
+		} else if ((sc.state == SCE_P_COMMENTLINE) || (sc.state == SCE_P_COMMENTBLOCK)) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if (sc.state == SCE_P_DECORATOR) {
+			if (!IsAWordStart(sc.ch, options.unicodeIdentifiers)) {
+				sc.SetState(SCE_P_DEFAULT);
+			}
+		} else if (IsPySingleQuoteStringState(sc.state)) {
+			if (sc.ch == '\\') {
+				if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
+					sc.Forward();
+				}
+				if (sc.chNext == '\n' || sc.chNext == '\r') {
+					inContinuedString = true;
+				} else {
+					// Don't roll over the newline.
+					sc.Forward();
+				}
+			} else if (sc.ch == GetPyStringQuoteChar(sc.state)) {
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		} else if ((sc.state == SCE_P_TRIPLE) || (sc.state == SCE_P_FTRIPLE)) {
+			if (sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.Match(R"(''')")) {
+				sc.Forward();
+				sc.Forward();
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		} else if ((sc.state == SCE_P_TRIPLEDOUBLE) || (sc.state == SCE_P_FTRIPLEDOUBLE)) {
+			if (sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.Match(R"(""")")) {
+				sc.Forward();
+				sc.Forward();
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+			}
+		}
+
+		// Note if used and not if else because string states also match
+		// some of the above clauses
+		if (IsPyFStringState(sc.state) && sc.ch == '{') {
+			if (sc.chNext == '{') {
+				sc.Forward();
+			} else {
+				PushStateToStack(sc.state, fstringStateStack, currentFStringExp);
+				sc.ForwardSetState(SCE_P_DEFAULT);
+			}
+			needEOLCheck = true;
+		}
+
+		// If in an f-string expression, check for the ending quote(s)
+		// and end f-string to handle syntactically incorrect cases like
+		// f'{' and f"""{"""
+		if (!fstringStateStack.empty() && (sc.ch == '\'' || sc.ch == '"')) {
+			long matching_stack_i = -1;
+			for (unsigned long stack_i = 0; stack_i < fstringStateStack.size() && matching_stack_i == -1; stack_i++) {
+				const int stack_state = fstringStateStack[stack_i].state;
+				const char quote = GetPyStringQuoteChar(stack_state);
+				if (sc.ch == quote) {
+					if (IsPySingleQuoteStringState(stack_state)) {
+						matching_stack_i = stack_i;
+					} else if (quote == '"' ? sc.Match(R"(""")") : sc.Match("'''")) {
+						matching_stack_i = stack_i;
+					}
+				}
+			}
+
+			if (matching_stack_i != -1) {
+				sc.SetState(fstringStateStack[matching_stack_i].state);
+				if (IsPyTripleQuoteStringState(fstringStateStack[matching_stack_i].state)) {
+					sc.Forward();
+					sc.Forward();
+				}
+				sc.ForwardSetState(SCE_P_DEFAULT);
+				needEOLCheck = true;
+
+				while (fstringStateStack.size() > static_cast<unsigned long>(matching_stack_i)) {
+					PopFromStateStack(fstringStateStack, currentFStringExp);
+				}
+			}
+		}
+		// End of code to find the end of a state
+
+		if (!indentGood && !IsASpaceOrTab(sc.ch)) {
+			styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 1);
+			startIndicator = sc.currentPos;
+			indentGood = true;
+		}
+
+		// One cdef or cpdef line, clear kwLast only at end of line
+		if ((kwLast == kwCDef || kwLast == kwCPDef) && sc.atLineEnd) {
+			kwLast = kwOther;
+		}
+
+		// State exit code may have moved on to end of line
+		if (needEOLCheck && sc.atLineEnd) {
+			ProcessLineEnd(sc, fstringStateStack, currentFStringExp, inContinuedString);
+			lineCurrent++;
+			styler.IndentAmount(lineCurrent, &spaceFlags, IsPyComment);
+			if (!sc.More())
+				break;
+		}
+
+		// If in f-string expression, check for }, :, ! to resume f-string state or update nesting count
+		if (currentFStringExp && !IsPySingleQuoteStringState(sc.state) && !IsPyTripleQuoteStringState(sc.state)) {
+			if (currentFStringExp->nestingCount == 0 && (sc.ch == '}' || sc.ch == ':' || (sc.ch == '!' && sc.chNext != '='))) {
+				sc.SetState(PopFromStateStack(fstringStateStack, currentFStringExp));
+			} else {
+				if (sc.ch == '{' || sc.ch == '[' || sc.ch == '(') {
+					currentFStringExp->nestingCount++;
+				} else if (sc.ch == '}' || sc.ch == ']' || sc.ch == ')') {
+					currentFStringExp->nestingCount--;
+				}
+			}
+		}
+
+		// Check for a new state starting character
+		if (sc.state == SCE_P_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				if (sc.ch == '0' && (sc.chNext == 'x' || sc.chNext == 'X')) {
+					base_n_number = true;
+					sc.SetState(SCE_P_NUMBER);
+				} else if (sc.ch == '0' &&
+						(sc.chNext == 'o' || sc.chNext == 'O' || sc.chNext == 'b' || sc.chNext == 'B')) {
+					if (options.base2or8Literals) {
+						base_n_number = true;
+						sc.SetState(SCE_P_NUMBER);
+					} else {
+						sc.SetState(SCE_P_NUMBER);
+						sc.ForwardSetState(SCE_P_IDENTIFIER);
+					}
+				} else {
+					base_n_number = false;
+					sc.SetState(SCE_P_NUMBER);
+				}
+			} else if (isoperator(sc.ch) || sc.ch == '`') {
+				sc.SetState(SCE_P_OPERATOR);
+			} else if (sc.ch == '#') {
+				sc.SetState(sc.chNext == '#' ? SCE_P_COMMENTBLOCK : SCE_P_COMMENTLINE);
+			} else if (sc.ch == '@') {
+				if (IsFirstNonWhitespace(sc.currentPos, styler))
+					sc.SetState(SCE_P_DECORATOR);
+				else
+					sc.SetState(SCE_P_OPERATOR);
+			} else if (IsPyStringStart(sc.ch, sc.chNext, sc.GetRelative(2), allowedLiterals)) {
+				Sci_PositionU nextIndex = 0;
+				sc.SetState(GetPyStringState(styler, sc.currentPos, &nextIndex, allowedLiterals));
+				while (nextIndex > (sc.currentPos + 1) && sc.More()) {
+					sc.Forward();
+				}
+			} else if (IsAWordStart(sc.ch, options.unicodeIdentifiers)) {
+				sc.SetState(SCE_P_IDENTIFIER);
+			}
+		}
+	}
+	styler.IndicatorFill(startIndicator, sc.currentPos, indicatorWhitespace, 0);
+	sc.Complete();
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	const Sci_Position pos = styler.LineStart(line);
+	const Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		const char ch = styler[i];
+		if (ch == '#')
+			return true;
+		else if (ch != ' ' && ch != '\t')
+			return false;
+	}
+	return false;
+}
+
+static bool IsQuoteLine(Sci_Position line, const Accessor &styler) {
+	const int style = styler.StyleAt(styler.LineStart(line)) & 31;
+	return IsPyTripleQuoteStringState(style);
+}
+
+
+void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/, IDocument *pAccess) {
+	if (!options.fold)
+		return;
+
+	Accessor styler(pAccess, nullptr);
+
+	const Sci_Position maxPos = startPos + length;
+	const Sci_Position maxLines = (maxPos == styler.Length()) ? styler.GetLine(maxPos) : styler.GetLine(maxPos - 1);	// Requested last line
+	const Sci_Position docLines = styler.GetLine(styler.Length());	// Available last line
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines (needed esp. within triple quoted strings)
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, nullptr);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, nullptr);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
+				(!IsCommentLine(lineCurrent, styler)) &&
+				(!IsQuoteLine(lineCurrent, styler)))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	startPos = styler.LineStart(lineCurrent);
+	int prev_state = SCE_P_DEFAULT & 31;
+	if (lineCurrent >= 1)
+		prev_state = styler.StyleAt(startPos - 1) & 31;
+	int prevQuote = options.foldQuotes && IsPyTripleQuoteStringState(prev_state);
+
+	// Process all characters to end of requested range or end of any triple quote
+	//that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed quote at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevQuote)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		Sci_Position lineNext = lineCurrent + 1;
+		int indentNext = indentCurrent;
+		int quote = false;
+		if (lineNext <= docLines) {
+			// Information about next line is only available if not at end of document
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, nullptr);
+			const Sci_Position lookAtPos = (styler.LineStart(lineNext) == styler.Length()) ? styler.Length() - 1 : styler.LineStart(lineNext);
+			const int style = styler.StyleAt(lookAtPos) & 31;
+			quote = options.foldQuotes && IsPyTripleQuoteStringState(style);
+		}
+		const int quote_start = (quote && !prevQuote);
+		const int quote_continue = (quote && prevQuote);
+		if (!quote || !prevQuote)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (quote)
+			indentNext = indentCurrentLevel;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (quote_start) {
+			// Place fold point at start of triple quoted string
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (quote_continue || prevQuote) {
+			// Add level to rest of lines in the string
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.  If comments end file, use the min
+		// comment indent as the level after
+
+		int minCommentLevel = indentCurrentLevel;
+		while (!quote &&
+				(lineNext < docLines) &&
+				((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+				 (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			if (IsCommentLine(lineNext, styler) && indentNext < minCommentLevel) {
+				minCommentLevel = indentNext;
+			}
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, nullptr);
+		}
+
+		const int levelAfterComments = ((lineNext < docLines) ? indentNext & SC_FOLDLEVELNUMBERMASK : minCommentLevel);
+		const int levelBeforeComments = std::max(indentCurrentLevel, levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		Sci_Position skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			const int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, nullptr);
+
+			if (options.foldCompact) {
+				if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+					skipLevel = levelBeforeComments;
+
+				const int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+				styler.SetLevel(skipLine, skipLevel | whiteFlag);
+			} else {
+				if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments &&
+						!(skipLineIndent & SC_FOLDLEVELWHITEFLAG) &&
+						!IsCommentLine(skipLine, styler))
+					skipLevel = levelBeforeComments;
+
+				styler.SetLevel(skipLine, skipLevel);
+			}
+		}
+
+		// Set fold header on non-quote line
+		if (!quote && !(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of triple quote state of previous line
+		prevQuote = quote;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+
+	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
+	// header flag set; the loop above is crafted to take care of this case!
+	//styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+LexerModule lmPython(SCLEX_PYTHON, LexerPython::LexerFactoryPython, "python",
+		     pythonWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexR.cxx b/scite-app/lexilla/lexers/LexR.cxx
new file mode 100644
index 0000000..2a1da0c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexR.cxx
@@ -0,0 +1,217 @@
+// Scintilla source code edit control
+/** @file LexR.cxx
+ ** Lexer for R, S, SPlus Statistics Program (Heavily derived from CPP Lexer).
+ **
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+static inline bool IsAnOperator(const int ch) {
+	if (IsASCII(ch) && isalnum(ch))
+		return false;
+	// '.' left out as it is used to make up numbers
+	if (ch == '-' || ch == '+' || ch == '!' || ch == '~' ||
+	        ch == '?' || ch == ':' || ch == '*' || ch == '/' ||
+	        ch == '^' || ch == '<' || ch == '>' || ch == '=' ||
+	        ch == '&' || ch == '|' || ch == '$' || ch == '(' ||
+	        ch == ')' || ch == '}' || ch == '{' || ch == '[' ||
+		ch == ']')
+		return true;
+	return false;
+}
+
+static void ColouriseRDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler) {
+
+	WordList &keywords   = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+
+
+	// Do not leak onto next line
+	if (initStyle == SCE_R_INFIXEOL)
+		initStyle = SCE_R_DEFAULT;
+
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_R_STRING)) {
+			// Prevent SCE_R_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_R_STRING);
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_R_OPERATOR) {
+			sc.SetState(SCE_R_DEFAULT);
+		} else if (sc.state == SCE_R_NUMBER) {
+			if (!IsADigit(sc.ch) && !(sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrent(s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_R_KWORD);
+				} else if  (keywords2.InList(s)) {
+					sc.ChangeState(SCE_R_BASEKWORD);
+				} else if  (keywords3.InList(s)) {
+					sc.ChangeState(SCE_R_OTHERKWORD);
+				}
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_COMMENT) {
+			if (sc.ch == '\r' || sc.ch == '\n') {
+				sc.SetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		} else if (sc.state == SCE_R_INFIX) {
+			if (sc.ch == '%') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_R_INFIXEOL);
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		}else if (sc.state == SCE_R_STRING2) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_R_DEFAULT);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_R_DEFAULT) {
+			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_R_NUMBER);
+			} else if (IsAWordStart(sc.ch) ) {
+				sc.SetState(SCE_R_IDENTIFIER);
+			} else if (sc.Match('#')) {
+					sc.SetState(SCE_R_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_R_STRING);
+			} else if (sc.ch == '%') {
+				sc.SetState(SCE_R_INFIX);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_R_STRING2);
+			} else if (IsAnOperator(sc.ch)) {
+				sc.SetState(SCE_R_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldRDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+                       Accessor &styler) {
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_R_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+
+static const char * const RWordLists[] = {
+            "Language Keywords",
+            "Base / Default package function",
+            "Other Package Functions",
+            "Unused",
+            "Unused",
+            0,
+        };
+
+
+
+LexerModule lmR(SCLEX_R, ColouriseRDoc, "r", FoldRDoc, RWordLists);
diff --git a/scite-app/lexilla/lexers/LexRaku.cxx b/scite-app/lexilla/lexers/LexRaku.cxx
new file mode 100644
index 0000000..7406b91
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexRaku.cxx
@@ -0,0 +1,1632 @@
+/** @file LexRaku.cxx
+ ** Lexer for Raku
+ **
+ ** Copyright (c) 2019 Mark Reay <mark@reay.net.au>
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/*
+ * Raku (Perl6) Lexer for Scintilla
+ * ---------------------------------
+ * ---------------------------------
+ * 06-Dec-2019: More Unicode support:
+ *              - Added a full scope of allowed numbers and letters
+ * 29-Nov-2019: More  highlighting / implemented basic folding:
+ *              - Operators (blanket cover, no sequence checking)
+ *              - Class / Grammar name highlighting
+ *              - Folding:
+ *                - Comments: line / multi-line
+ *                - POD sections
+ *                - Code blocks {}
+ * 26-Nov-2019: Basic syntax highlighting covering the following:
+ *              - Comments, both line and embedded (multi-line)
+ *              - POD, no inline highlighting as yet...
+ *              - Heredoc block string, with variable highlighting (with qq)
+ *              - Strings, with variable highlighting (with ")
+ *              - Q Language, including adverbs (also basic q and qq)
+ *              - Regex, including adverbs
+ *              - Numbers
+ *              - Bareword / identifiers
+ *              - Types
+ *              - Variables: mu, positional, associative, callable
+ * TODO:
+ *       - POD inline
+ *       - Better operator sequence coverage
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace { // anonymous namespace to isolate any name clashes
+/*----------------------------------------------------------------------------*
+ * --- DEFINITIONS: OPTIONS / CONSTANTS ---
+ *----------------------------------------------------------------------------*/
+
+// Number types
+#define RAKUNUM_BINARY		1	// order is significant: 1-3 cannot have a dot
+#define RAKUNUM_OCTAL		2
+#define RAKUNUM_FLOAT_EXP	3	// exponent part only
+#define RAKUNUM_HEX			4	// may be a hex float
+#define RAKUNUM_DECIMAL		5	// 1-5 are numbers; 6-7 are strings
+#define RAKUNUM_VECTOR		6
+#define RAKUNUM_V_VECTOR	7
+#define RAKUNUM_VERSION		8	// can contain multiple '.'s
+#define RAKUNUM_BAD			9
+
+// Regex / Q string types
+#define RAKUTYPE_REGEX_NORM		0	// 0 char ident
+#define RAKUTYPE_REGEX_S		1	// order is significant:
+#define RAKUTYPE_REGEX_M		2	// 1 char ident
+#define RAKUTYPE_REGEX_Y		3	// 1 char ident
+#define RAKUTYPE_REGEX			4	// > RAKUTYPE_REGEX == 2 char identifiers
+#define RAKUTYPE_REGEX_RX		5	// 2 char ident
+#define RAKUTYPE_REGEX_TR		6	// 2 char ident
+#define RAKUTYPE_QLANG			7	// < RAKUTYPE_QLANG == RAKUTYPE_REGEX_?
+#define RAKUTYPE_STR_WQ			8	// 0 char ident < word quote >
+#define RAKUTYPE_STR_Q			9	// 1 char ident
+#define RAKUTYPE_STR_QX			10	// 2 char ident
+#define RAKUTYPE_STR_QW			11	// 2 char ident
+#define RAKUTYPE_STR_QQ			12	// 2 char ident
+#define RAKUTYPE_STR_QQX		13	// 3 char ident
+#define RAKUTYPE_STR_QQW		14	// 3 char ident
+#define RAKUTYPE_STR_QQWW		15	// 4 char ident
+
+// Delimiter types
+#define RAKUDELIM_BRACKET		0	// bracket: regex, Q language
+#define RAKUDELIM_QUOTE			1	// quote: normal string
+
+// rakuWordLists: keywords as defined in config
+const char *const rakuWordLists[] = {
+	"Keywords and identifiers",
+	"Functions",
+	"Types basic",
+	"Types composite",
+	"Types domain-specific",
+	"Types exception",
+	"Adverbs",
+	nullptr,
+};
+
+// Options and defaults
+struct OptionsRaku {
+	bool fold;
+	bool foldCompact;
+	bool foldComment;
+	bool foldCommentMultiline;
+	bool foldCommentPOD;
+	OptionsRaku() {
+		fold					= true;
+		foldCompact				= false;
+		foldComment				= true;
+		foldCommentMultiline	= true;
+		foldCommentPOD			= true;
+	}
+};
+
+// init options and words
+struct OptionSetRaku : public OptionSet<OptionsRaku> {
+	OptionSetRaku() {
+		DefineProperty("fold",			&OptionsRaku::fold);
+		DefineProperty("fold.comment",	&OptionsRaku::foldComment);
+		DefineProperty("fold.compact",	&OptionsRaku::foldCompact);
+
+		DefineProperty("fold.raku.comment.multiline",	&OptionsRaku::foldCommentMultiline,
+			"Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+		DefineProperty("fold.raku.comment.pod",			&OptionsRaku::foldCommentPOD,
+			"Set this property to 0 to disable folding POD comments when fold.comment=1.");
+
+		// init word lists
+		DefineWordListSets(rakuWordLists);
+	}
+};
+
+// Delimiter pair
+struct DelimPair {
+	int opener;		// opener char
+	int closer[2];	// closer chars
+	bool interpol;	// can variables be interpolated?
+	short count;	// delimiter char count
+	DelimPair() {
+		opener = 0;
+		closer[0] = 0;
+		closer[1] = 0;
+		interpol = false;
+		count = 0;
+	}
+	bool isCloser(int ch) const {
+		return ch == closer[0] || ch == closer[1];
+	}
+};
+
+/*----------------------------------------------------------------------------*
+ * --- FUNCTIONS ---
+ *----------------------------------------------------------------------------*/
+
+/*
+ * IsANewLine
+ * - returns true if this is a new line char
+ */
+constexpr bool IsANewLine(int ch) noexcept {
+	return ch == '\r' || ch == '\n';
+}
+
+/*
+ * IsAWhitespace
+ * - returns true if this is a whitespace (or newline) char
+ */
+bool IsAWhitespace(int ch) noexcept {
+	return IsASpaceOrTab(ch) || IsANewLine(ch);
+}
+
+/*
+ * IsAlphabet
+ * - returns true if this is an alphabetical char
+ */
+constexpr bool IsAlphabet(int ch) noexcept {
+	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z');
+}
+
+/*
+ * IsCommentLine
+ * - returns true if this is a comment line
+ *   - tests: SCE_RAKU_COMMENTLINE or SCE_RAKU_COMMENTEMBED
+ * modified from: LexPerl.cxx
+ */
+bool IsCommentLine(Sci_Position line, LexAccessor &styler, int type = SCE_RAKU_COMMENTLINE) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eol_pos; i++) {
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+		if (type == SCE_RAKU_COMMENTEMBED) {
+			if (i == (eol_pos - 1) && style == type)
+				return true;
+		} else { // make sure the line is NOT a SCE_RAKU_COMMENTEMBED
+			if (ch == '#' && style == type && styler[i+1] != '`' )
+				return true;
+			else if (!IsASpaceOrTab(ch))
+				return false;
+		}
+	}
+	return false;
+}
+
+/*
+ * ContainsQTo
+ * - returns true if this range contains ":to" in style SCE_RAKU_ADVERB indicating the start
+ * of a SCE_RAKU_HEREDOC_Q or SCE_RAKU_HEREDOC_QQ.
+ */
+bool ContainsQTo(Sci_Position start, Sci_Position end, LexAccessor &styler) {
+	std::string adverb;
+	for (Sci_Position i = start; i < end; i++) {
+		if (styler.StyleAt(i) == SCE_RAKU_ADVERB) {
+			adverb.push_back(styler[i]);
+		}
+	}
+	return adverb.find(":to") != std::string::npos;
+}
+
+/*
+ * GetBracketCloseChar
+ * - returns the end bracket char: opposite of start
+ *   - see: http://www.unicode.org/Public/5.1.0/ucd/BidiMirroring.txt (first section)
+ * - Categories are general matches for valid BiDi types
+ * - Most closer chars are opener + 1
+ */
+int GetBracketCloseChar(const int ch) noexcept {
+	const CharacterCategory cc = CategoriseCharacter(ch);
+	switch (cc) {
+		case ccSm:
+			switch (ch) {
+				case 0x3C: return 0x3E; // LESS-THAN SIGN
+				case 0x2208: return 0x220B; // ELEMENT OF
+				case 0x2209: return 0x220C; // NOT AN ELEMENT OF
+				case 0x220A: return 0x220D; // SMALL ELEMENT OF
+				case 0x2215: return 0x29F5; // DIVISION SLASH
+				case 0x2243: return 0x22CD; // ASYMPTOTICALLY EQUAL TO
+				case 0x2298: return 0x29B8; // CIRCLED DIVISION SLASH
+				case 0x22A6: return 0x2ADE; // ASSERTION
+				case 0x22A8: return 0x2AE4; // TRUE
+				case 0x22A9: return 0x2AE3; // FORCES
+				case 0x22AB: return 0x2AE5; // DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
+				case 0x22F2: return 0x22FA; // ELEMENT OF WITH LONG HORIZONTAL STROKE
+				case 0x22F3: return 0x22FB; // ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+				case 0x22F4: return 0x22FC; // SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+				case 0x22F6: return 0x22FD; // ELEMENT OF WITH OVERBAR
+				case 0x22F7: return 0x22FE; // SMALL ELEMENT OF WITH OVERBAR
+				case 0xFF1C: return 0xFF1E; // FULLWIDTH LESS-THAN SIGN
+			}
+			break;
+		case ccPs:
+			switch (ch) {
+				case 0x5B: return 0x5D; // LEFT SQUARE BRACKET
+				case 0x7B: return 0x7D; // LEFT CURLY BRACKET
+				case 0x298D: return 0x2990; // LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
+				case 0x298F: return 0x298E; // LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+				case 0xFF3B: return 0xFF3D; // FULLWIDTH LEFT SQUARE BRACKET
+				case 0xFF5B: return 0xFF5D; // FULLWIDTH LEFT CURLY BRACKET
+			}
+			break;
+		case ccPi:
+			break;
+		default: return 0;
+	}
+	return ch + 1;
+}
+
+/*
+ * IsValidQuoteOpener
+ * -
+ */
+bool IsValidQuoteOpener(const int ch, DelimPair &dp, int type = RAKUDELIM_BRACKET) noexcept {
+	dp.closer[0] = 0;
+	dp.closer[1] = 0;
+	dp.interpol = true;
+	if (type == RAKUDELIM_QUOTE) {
+		switch (ch) {
+			//   Opener		Closer					Description
+			case '\'':		dp.closer[0] = '\'';	// APOSTROPHE
+				dp.interpol = false;
+				break;
+			case '"':		dp.closer[0] = '"';		// QUOTATION MARK
+				break;
+			case 0x2018:	dp.closer[0] = 0x2019;	// LEFT SINGLE QUOTATION MARK
+				dp.interpol = false;
+				break;
+			case 0x201C:	dp.closer[0] = 0x201D;	// LEFT DOUBLE QUOTATION MARK
+				break;
+			case 0x201D:	dp.closer[0] = 0x201C;	// RIGHT DOUBLE QUOTATION MARK
+				break;
+			case 0x201E:	dp.closer[0] = 0x201C;	// DOUBLE LOW-9 QUOTATION MARK
+							dp.closer[1] = 0x201D;
+				break;
+			case 0xFF62:	dp.closer[0] = 0xFF63;	// HALFWIDTH LEFT CORNER BRACKET
+				dp.interpol = false;
+				break;
+			default:		return false;
+		}
+	} else if (type == RAKUDELIM_BRACKET) {
+		dp.closer[0] = GetBracketCloseChar(ch);
+	}
+	dp.opener = ch;
+	dp.count = 1;
+	return dp.closer[0] > 0;
+}
+
+/*
+ * IsBracketOpenChar
+ * - true if this is a valid start bracket character
+ */
+bool IsBracketOpenChar(int ch) noexcept {
+	return GetBracketCloseChar(ch) > 0;
+}
+
+/*
+ * IsValidRegOrQAdjacent
+ * - returns true if ch is a valid character to put directly after Q / q
+ *   * ref: Q Language: https://docs.raku.org/language/quoting
+ */
+bool IsValidRegOrQAdjacent(int ch) noexcept {
+	return !(IsAlphaNumeric(ch) || ch == '_' || ch == '(' || ch == ')' || ch == '\'' );
+}
+
+/*
+ * IsValidRegOrQPrecede
+ * - returns true if ch is a valid preceeding character to put directly before Q / q
+ *   * ref: Q Language: https://docs.raku.org/language/quoting
+ */
+bool IsValidRegOrQPrecede(int ch) noexcept {
+	return !(IsAlphaNumeric(ch) || ch == '_');
+}
+
+/*
+ * MatchCharInRange
+ * - returns true if the mach character is found in range (of length)
+ * - ignoreDelim (default false)
+ */
+bool MatchCharInRange(StyleContext &sc, const Sci_Position length,
+		const int match, bool ignoreDelim = false) {
+	Sci_Position len = 0;
+	int chPrev = sc.chPrev;
+	while (++len < length) {
+		const int ch = sc.GetRelativeCharacter(len);
+		if (ch == match && (ignoreDelim || chPrev != '\\'))
+			return true;
+	}
+	return false;
+}
+
+/*
+ * PrevNonWhitespaceChar
+ * - returns the last non-whitespace char
+ */
+int PrevNonWhitespaceChar(StyleContext &sc) {
+	Sci_Position rel = 0;
+	Sci_Position max_back = 0 - sc.currentPos;
+	while (--rel > max_back) {
+		const int ch = sc.GetRelativeCharacter(rel);
+		if (!IsAWhitespace(ch))
+			return ch;
+	}
+	return 0; // no matching char
+}
+
+/*
+ * IsQLangStartAtScPos
+ * - returns true if this is a valid Q Language sc position
+ *   - ref: https://docs.raku.org/language/quoting
+ *   - Q :adverb :adverb //;
+ *   - q,qx,qw,qq,qqx,qqw,qqww :adverb /:adverb /;
+ */
+bool IsQLangStartAtScPos(StyleContext &sc, int &type, const Sci_Position length) {
+	const bool valid_adj = IsValidRegOrQAdjacent(sc.chNext);
+	const int chFw2 = sc.GetRelativeCharacter(2);
+	const int chFw3 = sc.GetRelativeCharacter(3);
+	type = -1;
+	if (IsValidRegOrQPrecede(sc.chPrev)) {
+		if (sc.ch == 'Q' && valid_adj) {
+			type = RAKUTYPE_QLANG;
+		} else if (sc.ch == 'q') {
+			switch (sc.chNext) {
+				case 'x':
+					type = RAKUTYPE_STR_QX;
+					break;
+				case 'w':
+					type = RAKUTYPE_STR_QW;
+					break;
+				case 'q':
+					if (chFw2 == 'x') {
+						type = RAKUTYPE_STR_QQX;
+					} else if (chFw2 == 'w') {
+						if (chFw3 == 'w') {
+							type = RAKUTYPE_STR_QQWW;
+						} else {
+							type = RAKUTYPE_STR_QQW;
+						}
+					} else {
+						type = RAKUTYPE_STR_QQ;
+					}
+					break;
+				default:
+					type = RAKUTYPE_STR_Q;
+			}
+		} else if (sc.ch == '<' && MatchCharInRange(sc, length, '>')) {
+			type = RAKUTYPE_STR_WQ; // < word quote >
+		}
+	}
+	return type >= 0;
+}
+
+/*
+ * IsRegexStartAtScPos
+ * - returns true if this is a valid Regex sc position
+ *   - ref: https://docs.raku.org/language/regexes
+ *   - Regex: (rx/s/m/tr/y) :adverb /:adverb /;
+ *   -              regex R :adverb //;
+ *   -                     /:adverb /;
+ */
+bool IsRegexStartAtScPos(StyleContext &sc, int &type, CharacterSet &set) {
+	const bool valid_adj = IsValidRegOrQAdjacent(sc.chNext);
+	type = -1;
+	if (IsValidRegOrQPrecede(sc.chPrev)) {
+		switch (sc.ch) {
+			case 'r':
+				if (sc.chNext == 'x')
+					type = RAKUTYPE_REGEX_RX;
+				break;
+			case 't':
+			case 'T':
+				if (sc.chNext == 'r' || sc.chNext == 'R')
+					type = RAKUTYPE_REGEX_TR;
+				break;
+			case 'm':
+				if (valid_adj)
+					type = RAKUTYPE_REGEX_M;
+				break;
+			case 's':
+			case 'S':
+				if (valid_adj)
+					type = RAKUTYPE_REGEX_S;
+				break;
+			case 'y':
+				if (valid_adj)
+					type = RAKUTYPE_REGEX_Y;
+				break;
+			case '/':
+				if (set.Contains(PrevNonWhitespaceChar(sc)))
+					type = RAKUTYPE_REGEX_NORM;
+		}
+	}
+	return type >= 0;
+}
+
+/*
+ * IsValidIdentPrecede
+ * - returns if ch is a valid preceeding char to put directly before an identifier
+ */
+bool IsValidIdentPrecede(int ch) noexcept {
+	return !(IsAlphaNumeric(ch) || ch == '_' || ch == '@' || ch == '$' || ch == '%');
+}
+
+/*
+ * IsValidDelimiter
+ * - returns if ch is a valid delimiter (most chars are valid)
+ *   * ref: Q Language: https://docs.raku.org/language/quoting
+ */
+bool IsValidDelimiter(int ch) noexcept {
+	return !(IsAlphaNumeric(ch) || ch == ':');
+}
+
+/*
+ * GetDelimiterCloseChar
+ * - returns the corrisponding close char for a given delimiter (could be the same char)
+ */
+int GetDelimiterCloseChar(int ch) noexcept {
+	int ch_end = GetBracketCloseChar(ch);
+	if (ch_end == 0 && IsValidDelimiter(ch)) {
+		ch_end = ch;
+	}
+	return ch_end;
+}
+
+/*
+ * GetRepeatCharCount
+ * - returns the occurence count of match
+ */
+Sci_Position GetRepeatCharCount(StyleContext &sc, int chMatch, Sci_Position length) {
+	Sci_Position cnt = 0;
+	while (cnt < length) {
+		if (sc.GetRelativeCharacter(cnt) != chMatch) {
+			break;
+		}
+		cnt++;
+	}
+	return cnt;
+}
+
+/*
+ * LengthToDelimiter
+ * - returns the length until the end of a delimited string section
+ *   - Ignores nested delimiters (if opener != closer)
+ *   - no trailing char after last closer (default false)
+ */
+Sci_Position LengthToDelimiter(StyleContext &sc, const DelimPair &dp,
+		Sci_Position length, bool noTrailing = false) {
+	short cnt_open = 0;			// count open bracket
+	short cnt_close = 0;		// count close bracket
+	Sci_Position len = 0;		// count characters
+	int chOpener = dp.opener;	// look for nested opener / closer
+	if (dp.opener == dp.closer[0])
+		chOpener = 0;			// no opening delimiter (no nesting possible)
+
+	while (len < length) {
+		const int chPrev = sc.GetRelativeCharacter(len - 1);
+		const int ch = sc.GetRelativeCharacter(len);
+		const int chNext = sc.GetRelativeCharacter(len+1);
+
+		if (cnt_open == 0 && cnt_close == dp.count) {
+			return len;				// end condition has been met
+		} else {
+			if (chPrev != '\\' && ch == chOpener) {			// ignore escape sequence
+				cnt_open++;			// open nested bracket
+			} else if (chPrev != '\\' && dp.isCloser(ch)) {	// ignore escape sequence
+				if ( cnt_open > 0 ) {
+					cnt_open--;		// close nested bracket
+				} else if (dp.count > 1 && cnt_close < (dp.count - 1)) {
+					if (cnt_close > 1) {
+						if (dp.isCloser(chPrev)) {
+							cnt_close++;
+						} else {	// reset if previous char was not close
+							cnt_close = 0;
+						}
+					} else {
+						cnt_close++;
+					}
+				} else if (!noTrailing || (IsAWhitespace(chNext))) {
+					cnt_close++;		// found last close
+					if (cnt_close > 1 && !dp.isCloser(chPrev)) {
+						cnt_close = 0;	// reset if previous char was not close
+					}
+				} else {
+					cnt_close = 0;		// non handled close: reset
+				}
+			} else if (IsANewLine(ch)) {
+				cnt_open = 0;			// reset after each line
+				cnt_close = 0;
+			}
+		}
+		len++;
+	}
+	return -1; // end condition has NOT been met
+}
+
+/*
+ * LengthToEndHeredoc
+ * - returns the length until the end of a heredoc section
+ *   - delimiter string MUST begin on a new line
+ */
+Sci_Position LengthToEndHeredoc(const StyleContext &sc, LexAccessor &styler,
+		const Sci_Position length, const char *delim) {
+	bool on_new_ln = false;
+	int i = 0; // str index
+	for (int n = 0; n < length; n++) {
+		const char ch = styler.SafeGetCharAt(sc.currentPos + n, 0);
+		if (on_new_ln) {
+			if (delim[i] == '\0')
+				return n;	// at end of str, match found!
+			if (ch != delim[i++])
+				i = 0;		// no char match, reset 'i'ndex
+		}
+		if (i == 0)			// detect new line
+			on_new_ln = IsANewLine(ch);
+	}
+	return -1;				// no match found
+}
+
+/*
+ * LengthToNextChar
+ * - returns the length until the next character
+ */
+Sci_Position LengthToNextChar(StyleContext &sc, const Sci_Position length) {
+	Sci_Position len = 0;
+	while (++len < length) {
+		const int ch = sc.GetRelativeCharacter(len);
+		if (!IsASpaceOrTab(ch) && !IsANewLine(ch)) {
+			break;
+		}
+	}
+	return len;
+}
+
+/*
+ * GetRelativeString
+ * - gets a relitive string and sets it in &str
+ *   - resets string before seting
+ */
+void GetRelativeString(StyleContext &sc, Sci_Position offset, Sci_Position length,
+		std::string &str) {
+	Sci_Position pos = offset;
+	str.clear();
+	while (pos < length) {
+		str += sc.GetRelativeCharacter(pos++);
+	}
+}
+
+} // end anonymous namespace
+
+/*----------------------------------------------------------------------------*
+ * --- class: LexerRaku ---
+ *----------------------------------------------------------------------------*/
+//class LexerRaku : public ILexerWithMetaData {
+class LexerRaku : public DefaultLexer {
+	CharacterSet setWord;
+	CharacterSet setSigil;
+	CharacterSet setTwigil;
+	CharacterSet setOperator;
+	CharacterSet setSpecialVar;
+	WordList regexIdent;			// identifiers that specify a regex
+	OptionsRaku options;			// Options from config
+	OptionSetRaku osRaku;
+	WordList keywords;				// Word Lists from config
+	WordList functions;
+	WordList typesBasic;
+	WordList typesComposite;
+	WordList typesDomainSpecific;
+	WordList typesExceptions;
+	WordList adverbs;
+
+public:
+	// Defined as explicit, so that constructor can not be copied
+	explicit LexerRaku() :
+		DefaultLexer("raku", SCLEX_RAKU),
+		setWord(CharacterSet::setAlphaNum, "-_", 0x80),
+		setSigil(CharacterSet::setNone, "$&%@"),
+		setTwigil(CharacterSet::setNone, "!*.:<=?^~"),
+		setOperator(CharacterSet::setNone, "^&\\()-+=|{}[]:;<>,?!.~"),
+		setSpecialVar(CharacterSet::setNone, "_/!") {
+		regexIdent.Set("regex rule token");
+	}
+	// Deleted so LexerRaku objects can not be copied.
+	LexerRaku(const LexerRaku &) = delete;
+	LexerRaku(LexerRaku &&) = delete;
+	void operator=(const LexerRaku &) = delete;
+	void operator=(LexerRaku &&) = delete;
+	virtual ~LexerRaku() {
+	}
+	void SCI_METHOD Release() noexcept override {
+		delete this;
+	}
+	int SCI_METHOD Version() const noexcept override {
+		return lvRelease5;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return osRaku.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osRaku.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return osRaku.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char *SCI_METHOD PropertyGet(const char *key) override {
+		return osRaku.PropertyGet(key);
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return osRaku.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	static ILexer5 *LexerFactoryRaku() {
+		return new LexerRaku();
+	}
+
+protected:
+	bool IsOperatorChar(const int ch);
+	bool IsWordChar(const int ch, bool allowNumber = true);
+	bool IsWordStartChar(const int ch);
+	bool IsNumberChar(const int ch, int base = 10);
+	bool ProcessRegexTwinCapture(StyleContext &sc, const Sci_Position length,
+		int &type, const DelimPair &dp);
+	void ProcessStringVars(StyleContext &sc, const Sci_Position length, const int varState);
+	bool ProcessValidRegQlangStart(StyleContext &sc, Sci_Position length, const int type,
+		WordList &wordsAdverbs, DelimPair &dp);
+	Sci_Position LengthToNonWordChar(StyleContext &sc, Sci_Position length,
+		char *s, const int size, Sci_Position offset = 0);
+};
+
+/*----------------------------------------------------------------------------*
+ * --- METHODS: LexerRaku ---
+ *----------------------------------------------------------------------------*/
+
+/*
+ * LexerRaku::IsOperatorChar
+ * - Test for both ASCII and Unicode operators
+ *   see: https://docs.raku.org/language/unicode_entry
+ */
+bool LexerRaku::IsOperatorChar(const int ch) {
+	if (ch > 0x7F) {
+		switch (ch) {
+			//   Unicode	ASCII Equiv.
+			case 0x2208:	// (elem)
+			case 0x2209:	// !(elem)
+			case 0x220B:	// (cont)
+			case 0x220C:	// !(cont)
+			case 0x2216:	// (-)
+			case 0x2229:	// (&)
+			case 0x222A:	// (|)
+			case 0x2282:	// (<)
+			case 0x2283:	// (>)
+			case 0x2284:	// !(<)
+			case 0x2285:	// !(>)
+			case 0x2286:	// (<=)
+			case 0x2287:	// (>=)
+			case 0x2288:	// !(<=)
+			case 0x2289:	// !(>=)
+			case 0x228D:	// (.)
+			case 0x228E:	// (+)
+			case 0x2296:	// (^)
+				return true;
+		}
+	}
+	return setOperator.Contains(ch);
+}
+
+/*
+ * LexerRaku::IsWordChar
+ * - Test for both ASCII and Unicode identifier characters
+ *   see: https://docs.raku.org/language/unicode_ascii
+ *   also: ftp://ftp.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
+ *   FIXME: *still* may not contain all valid characters
+ */
+bool LexerRaku::IsWordChar(const int ch, bool allowNumber) {
+	// Unicode numbers should not apear in word identifiers
+	if (ch > 0x7F) {
+		const CharacterCategory cc = CategoriseCharacter(ch);
+		switch (cc) {
+			// Letters
+			case ccLu:
+			case ccLl:
+			case ccLt:
+			case ccLm:
+			case ccLo:
+				return true;
+			default:
+				return false;
+		}
+	} else if (allowNumber && IsADigit(ch)) {
+		return true; // an ASCII number type
+	}
+	return setWord.Contains(ch);
+}
+
+/*
+ * LexerRaku::IsWordStartChar
+ * - Test for both ASCII and Unicode identifier "start / first" characters
+ */
+bool LexerRaku::IsWordStartChar(const int ch) {
+	return ch != '-' && IsWordChar(ch, false); // no numbers allowed
+}
+
+/*
+ * LexerRaku::IsNumberChar
+ * - Test for both ASCII and Unicode identifier number characters
+ *   see: https://docs.raku.org/language/unicode_ascii
+ *   also: ftp://ftp.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt
+ *   FILTERED by Unicode letters that are NUMBER
+ *     and NOT PARENTHESIZED or CIRCLED
+ *   FIXME: *still* may not contain all valid number characters
+ */
+bool LexerRaku::IsNumberChar(const int ch, int base) {
+	if (ch > 0x7F) {
+		const CharacterCategory cc = CategoriseCharacter(ch);
+		switch (cc) {
+			// Numbers
+			case ccNd:
+			case ccNl:
+			case ccNo:
+				return true;
+			default:
+				return false;
+		}
+	}
+	return IsADigit(ch, base);
+}
+
+/*
+ * LexerRaku::PropertySet
+ * -
+ */
+Sci_Position SCI_METHOD LexerRaku::PropertySet(const char *key, const char *val) {
+	if (osRaku.PropertySet(&options, key, val))
+		return 0;
+	return -1;
+}
+
+/*
+ * LexerRaku::WordListSet
+ * -
+ */
+Sci_Position SCI_METHOD LexerRaku::WordListSet(int n, const char *wl) {
+	WordList *wordListN = nullptr;
+	switch (n) {
+		case 0:
+			wordListN = &keywords;
+			break;
+		case 1:
+			wordListN = &functions;
+			break;
+		case 2:
+			wordListN = &typesBasic;
+			break;
+		case 3:
+			wordListN = &typesComposite;
+			break;
+		case 4:
+			wordListN = &typesDomainSpecific;
+			break;
+		case 5:
+			wordListN = &typesExceptions;
+			break;
+		case 6:
+			wordListN = &adverbs;
+			break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+/*
+ * LexerRaku::ProcessRegexTwinCapture
+ * - processes the transition between a regex pair (two sets of delimiters)
+ * - moves to first new delimiter, if a bracket
+ * - returns true when valid delimiter start found (if bracket)
+ */
+bool LexerRaku::ProcessRegexTwinCapture(StyleContext &sc, const Sci_Position length,
+		int &type, const DelimPair &dp) {
+
+	if (type == RAKUTYPE_REGEX_S || type == RAKUTYPE_REGEX_TR || type == RAKUTYPE_REGEX_Y) {
+		type = -1; // clear type
+
+		// move past chRegQClose if it was the previous char
+		if (dp.isCloser(sc.chPrev))
+			sc.Forward();
+
+		// no processing needed for non-bracket
+		if (dp.isCloser(dp.opener))
+			return true;
+
+		// move to next opening bracket
+		const Sci_Position len = LengthToNextChar(sc, length);
+		if (sc.GetRelativeCharacter(len) == dp.opener) {
+			sc.Forward(len);
+			return true;
+		}
+	}
+	return false;
+}
+
+/*
+ * LexerRaku::ProcessStringVars
+ * - processes a string and highlights any valid variables
+ */
+void LexerRaku::ProcessStringVars(StyleContext &sc, const Sci_Position length, const int varState) {
+	const int state = sc.state;
+	for (Sci_Position pos = 0; pos < length; pos++) {
+		if (sc.state == varState && !IsWordChar(sc.ch)) {
+			sc.SetState(state);
+		} else if (sc.chPrev != '\\'
+				&& (sc.ch == '$' || sc.ch == '@')
+				&& IsWordStartChar(sc.chNext)) {
+			sc.SetState(varState);
+		}
+		sc.Forward(); // Next character
+	}
+}
+/*
+ * LexerRaku::ProcessValidRegQlangStart
+ * - processes a section of the document range from after a Regex / Q delimiter
+ * - returns true on success
+ *   - sets: adverbs, chOpen, chClose, chCount
+ *  ref: https://docs.raku.org/language/regexes
+ */
+bool LexerRaku::ProcessValidRegQlangStart(StyleContext &sc, Sci_Position length, const int type,
+		WordList &wordsAdverbs, DelimPair &dp) {
+	Sci_Position startPos = sc.currentPos;
+	Sci_Position startLen = length;
+	const int target_state = sc.state;
+	int state = SCE_RAKU_DEFAULT;
+	std::string str;
+
+	// find our opening delimiter (and occurrences) / save any adverbs
+	dp.opener = 0;					// adverbs can be after the first delimiter
+	bool got_all_adverbs = false;	// in Regex statements
+	bool got_ident = false;			// regex can have an identifier: 'regex R'
+	sc.SetState(state);				// set state default to avoid pre-highlights
+	while ((dp.opener == 0 || !got_all_adverbs) && sc.More()) {
+
+		// move to the next non-space character
+		const bool was_space = IsAWhitespace(sc.ch);
+		if (!got_all_adverbs && was_space) {
+			sc.Forward(LengthToNextChar(sc, length));
+		}
+		length = startLen - (sc.currentPos - startPos); // update length remaining
+
+		// parse / eat an identifier (if type == RAKUTYPE_REGEX)
+		if (dp.opener == 0 && !got_ident && type == RAKUTYPE_REGEX && IsAlphabet(sc.ch)) {
+
+			// eat identifier / account for special adverb :sym<name>
+			bool got_sym = false;
+			while (sc.More()) {
+				sc.SetState(SCE_RAKU_IDENTIFIER);
+				while (sc.More() && (IsAlphaNumeric(sc.chNext)
+						|| sc.chNext == '_' || sc.chNext == '-')) {
+					sc.Forward();
+				}
+				sc.Forward();
+				if (got_sym && sc.ch == '>') {
+					sc.SetState(SCE_RAKU_OPERATOR);	// '>'
+					sc.Forward();
+					break;
+				} else if (type == RAKUTYPE_REGEX && sc.Match(":sym<")) {
+					sc.SetState(SCE_RAKU_ADVERB);	// ':sym'
+					sc.Forward(4);
+					sc.SetState(SCE_RAKU_OPERATOR);	// '<'
+					sc.Forward();
+					got_sym = true;
+				} else {
+					break;
+				}
+			}
+			sc.SetState(state);
+			got_ident = true;
+		}
+
+		// parse / save an adverb: RAKUTYPE_REGEX only has adverbs after delim
+		//                      >= RAKUTYPE_QLANG only has adverbs before delim
+		else if (!got_all_adverbs && sc.ch == ':' && (!(dp.opener == 0 && got_ident)
+				&& !(dp.opener > 0 && type >= RAKUTYPE_QLANG))) {
+			sc.SetState(SCE_RAKU_ADVERB);
+			while (IsAlphaNumeric(sc.chNext) && sc.More()) {
+				sc.Forward();
+				str += sc.ch;
+			}
+			str += ' ';
+			sc.Forward();
+			sc.SetState(state);
+		}
+
+		// find starting delimiter
+		else if (dp.opener == 0 && (was_space || IsValidRegOrQAdjacent(sc.ch))
+				&& IsValidDelimiter(sc.ch)) {	// make sure the delimiter is legal (most are)
+			sc.SetState((state = target_state));// start state here...
+			dp.opener = sc.ch;					// this is our delimiter, get count
+			if (type < RAKUTYPE_QLANG)			// type is Regex
+				dp.count = 1;					// has only one delimiter
+			else
+				dp.count = GetRepeatCharCount(sc, dp.opener, length);
+			sc.Forward(dp.count);
+		}
+
+		// we must have all the adverbs by now...
+		else {
+			if (got_all_adverbs)
+				break; // prevent infinite loop: occurs on missing open char
+			got_all_adverbs = true;
+		}
+	}
+
+	// set word list / find a valid closing delimiter (or bomb!)
+	wordsAdverbs.Set(str.c_str());
+	dp.closer[0] = GetDelimiterCloseChar(dp.opener);
+	dp.closer[1] = 0; // no other closer char
+	return dp.closer[0] > 0;
+}
+
+/*
+ * LexerRaku::LengthToNonWordChar
+ * - returns the length until the next non "word" character: AlphaNum + '_'
+ *   - also sets all the parsed chars in 's'
+ */
+Sci_Position LexerRaku::LengthToNonWordChar(StyleContext &sc, Sci_Position length,
+		char *s, const int size, Sci_Position offset) {
+	Sci_Position len = 0;
+	Sci_Position max_length = size < length ? size : length;
+	while (len <= max_length) {
+		const int ch = sc.GetRelativeCharacter(len + offset);
+		if (!IsWordChar(ch)) {
+			s[len] = '\0';
+			break;
+		}
+		s[len] = ch;
+		len++;
+	}
+	s[len + 1] = '\0';
+	return len;
+}
+
+/*
+ * LexerRaku::Lex
+ * - Main lexer method
+ */
+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 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
+	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)
+	Sci_Position lengthToEnd;		// length until the end of range
+
+	// Backtrack to safe start position before complex quoted elements
+
+	Sci_PositionU newStartPos = startPos;
+	if (initStyle != SCE_RAKU_DEFAULT) {
+		// Backtrack to last SCE_RAKU_DEFAULT or 0
+		while (newStartPos > 0) {
+			newStartPos--;
+			if (styler.StyleAt(newStartPos) == SCE_RAKU_DEFAULT)
+				break;
+		}
+		// Backtrack to start of line before SCE_RAKU_HEREDOC_Q?
+		if (initStyle == SCE_RAKU_HEREDOC_Q || initStyle == SCE_RAKU_HEREDOC_QQ) {
+			if (newStartPos > 0) {
+				newStartPos = styler.LineStart(styler.GetLine(newStartPos));
+			}
+		}
+	} else {
+		const Sci_Position line = styler.GetLine(newStartPos);
+		if (line > 0) {
+			// If the previous line is a start of a q or qq heredoc, backtrack to start of line
+			const Sci_Position startPreviousLine = styler.LineStart(line-1);
+			if (ContainsQTo(startPreviousLine, newStartPos, styler)) {
+				newStartPos = startPreviousLine;
+			}
+		}
+	}
+
+
+	// Re-calculate (any) changed startPos, length and initStyle state
+	if (newStartPos < startPos) {
+		initStyle = SCE_RAKU_DEFAULT;
+		length += startPos - newStartPos;
+		startPos = newStartPos;
+	}
+
+	// init StyleContext
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	// StyleContext Loop
+	for (; sc.More(); sc.Forward()) {
+		lengthToEnd = (length - (sc.currentPos - startPos)); // end of range
+
+		/* *** Determine if the current state should terminate ************** *
+		 * Everything within the 'switch' statement processes characters up
+		 * until the end of a syntax highlight section / state.
+		 * ****************************************************************** */
+		switch (sc.state) {
+			case SCE_RAKU_OPERATOR:
+				sc.SetState(SCE_RAKU_DEFAULT);
+				break; // FIXME: better valid operator sequences needed?
+			case SCE_RAKU_COMMENTLINE:
+				if (IsANewLine(sc.ch)) {
+					sc.SetState(SCE_RAKU_DEFAULT);
+				}
+				break;
+			case SCE_RAKU_COMMENTEMBED:
+				if ((len = LengthToDelimiter(sc, dpEmbeded, lengthToEnd)) >= 0) {
+					sc.Forward(len);			// Move to end delimiter
+					sc.SetState(SCE_RAKU_DEFAULT);
+				} else {
+					sc.Forward(lengthToEnd);	// no end delimiter found
+				}
+				break;
+			case SCE_RAKU_POD:
+				if (sc.atLineStart && sc.Match("=end pod")) {
+					sc.Forward(8);
+					sc.SetState(SCE_RAKU_DEFAULT);
+				}
+				break;
+			case SCE_RAKU_STRING:
+
+				// Process the string for variables: move to end delimiter
+				if ((len = LengthToDelimiter(sc, dpString, lengthToEnd)) >= 0) {
+					if (dpString.interpol) {
+						ProcessStringVars(sc, len, SCE_RAKU_STRING_VAR);
+					} else {
+						sc.Forward(len);
+					}
+					sc.SetState(SCE_RAKU_DEFAULT);
+				} else {
+					sc.Forward(lengthToEnd);	// no end delimiter found
+				}
+				break;
+			case SCE_RAKU_STRING_Q:
+			case SCE_RAKU_STRING_QQ:
+			case SCE_RAKU_STRING_Q_LANG:
+
+				// No string: previous char was the delimiter
+				if (dpRegQ.count == 1 && dpRegQ.isCloser(sc.chPrev)) {
+					sc.SetState(SCE_RAKU_DEFAULT);
+				}
+
+				// Process the string for variables: move to end delimiter
+				else if ((len = LengthToDelimiter(sc, dpRegQ, lengthToEnd)) >= 0) {
+
+					// set (any) heredoc delimiter string
+					if (lastAdverbs.InList("to")) {
+						GetRelativeString(sc, -1, len - dpRegQ.count, hereDelim);
+						hereState = SCE_RAKU_HEREDOC_Q; // default heredoc state
+					}
+
+					// select variable identifiers
+					if (sc.state == SCE_RAKU_STRING_QQ || lastAdverbs.InList("qq")) {
+						ProcessStringVars(sc, len, SCE_RAKU_STRING_VAR);
+						hereState = SCE_RAKU_HEREDOC_QQ; // potential heredoc state
+					} else {
+						sc.Forward(len);
+					}
+					sc.SetState(SCE_RAKU_DEFAULT);
+				} else {
+					sc.Forward(lengthToEnd);	// no end delimiter found
+				}
+				break;
+			case SCE_RAKU_HEREDOC_Q:
+			case SCE_RAKU_HEREDOC_QQ:
+				if ((len = LengthToEndHeredoc(sc, styler, lengthToEnd, hereDelim.c_str())) >= 0) {
+					// select variable identifiers
+					if (sc.state == SCE_RAKU_HEREDOC_QQ) {
+						ProcessStringVars(sc, len, SCE_RAKU_STRING_VAR);
+					} else {
+						sc.Forward(len);
+					}
+					sc.SetState(SCE_RAKU_DEFAULT);
+				} else {
+					sc.Forward(lengthToEnd);	// no end delimiter found
+				}
+				hereDelim.clear();				// clear heredoc delimiter
+				break;
+			case SCE_RAKU_REGEX:
+				// account for typeDetect = RAKUTYPE_REGEX_S/TR/Y
+				while (sc.state == SCE_RAKU_REGEX) {
+
+					// No string: previous char was the delimiter
+					if (dpRegQ.count == 1 && dpRegQ.isCloser(sc.chPrev)) {
+						if (ProcessRegexTwinCapture(sc, lengthToEnd, typeDetect, dpRegQ))
+							continue;
+						sc.SetState(SCE_RAKU_DEFAULT);
+						break;
+					}
+
+					// Process the string for variables: move to end delimiter
+					else if ((len = LengthToDelimiter(sc, dpRegQ, lengthToEnd)) >= 0) {
+						ProcessStringVars(sc, len, SCE_RAKU_REGEX_VAR);
+						if (ProcessRegexTwinCapture(sc, lengthToEnd, typeDetect, dpRegQ))
+							continue;
+						sc.SetState(SCE_RAKU_DEFAULT);
+						break;
+					} else {
+						sc.Forward(lengthToEnd); // no end delimiter found
+						break;
+					}
+				}
+				break;
+			case SCE_RAKU_NUMBER:
+				if (sc.ch == '.') {
+					if (sc.chNext == '.') {		// '..' is an operator
+						sc.SetState(SCE_RAKU_OPERATOR);
+						sc.Forward();
+						if (sc.chNext == '.')	// '...' is also an operator
+							sc.Forward();
+						break;
+					} else if (numState > RAKUNUM_FLOAT_EXP
+							&& (cntDecimal < 1 || numState == RAKUNUM_VERSION)) {
+						cntDecimal++;
+						sc.Forward();
+					} else {
+						sc.SetState(SCE_RAKU_DEFAULT);
+						break; // too many decinal places
+					}
+				}
+				switch (numState) {
+					case RAKUNUM_BINARY:
+						if (!IsNumberChar(sc.ch, 2))
+							sc.SetState(SCE_RAKU_DEFAULT);
+						break;
+					case RAKUNUM_OCTAL:
+						if (!IsNumberChar(sc.ch, 8))
+							sc.SetState(SCE_RAKU_DEFAULT);
+						break;
+					case RAKUNUM_HEX:
+						if (!IsNumberChar(sc.ch, 16))
+							sc.SetState(SCE_RAKU_DEFAULT);
+						break;
+					case RAKUNUM_DECIMAL:
+					case RAKUNUM_VERSION:
+						if (!IsNumberChar(sc.ch))
+							sc.SetState(SCE_RAKU_DEFAULT);
+				}
+				break;
+			case SCE_RAKU_WORD:
+			case SCE_RAKU_FUNCTION:
+			case SCE_RAKU_TYPEDEF:
+			case SCE_RAKU_ADVERB:
+				sc.SetState(SCE_RAKU_DEFAULT);
+				break;
+			case SCE_RAKU_MU:
+			case SCE_RAKU_POSITIONAL:
+			case SCE_RAKU_ASSOCIATIVE:
+			case SCE_RAKU_CALLABLE:
+			case SCE_RAKU_IDENTIFIER:
+			case SCE_RAKU_GRAMMAR:
+			case SCE_RAKU_CLASS:
+				sc.SetState(SCE_RAKU_DEFAULT);
+				break;
+		}
+
+		/* *** Determine if a new state should be entered ******************* *
+		 * Everything below here identifies the beginning of a state, all or part
+		 * of the characters within this state are processed here, the rest are
+		 * completed above in the terminate state section.
+		 * ****************************************************************** */
+		if (sc.state == SCE_RAKU_DEFAULT) {
+
+			// --- Single line comment
+			if (sc.ch == '#') {
+				sc.SetState(SCE_RAKU_COMMENTLINE);
+			}
+
+			// --- POD block
+			else if (sc.atLineStart && sc.Match("=begin pod")) {
+				sc.SetState(SCE_RAKU_POD);
+				sc.Forward(10);
+			}
+
+			// --- String (normal)
+			else if (sc.chPrev != '\\' && (IsValidQuoteOpener(sc.ch, dpString, RAKUDELIM_QUOTE))) {
+				sc.SetState(SCE_RAKU_STRING);
+			}
+
+			// --- String (Q Language) ----------------------------------------
+			//   - https://docs.raku.org/language/quoting
+			//   - Q :adverb :adverb //;
+			//   - q,qx,qw,qq,qqx,qqw,qqww :adverb :adverb //;
+			else if (IsQLangStartAtScPos(sc, typeDetect, lengthToEnd)) {
+				int state = SCE_RAKU_STRING_Q_LANG;
+				Sci_Position forward = 1;	// single char ident (default)
+				if (typeDetect > RAKUTYPE_QLANG) {
+					state = SCE_RAKU_STRING_Q;
+					if (typeDetect == RAKUTYPE_STR_WQ)
+						forward = 0;		// no char ident
+				}
+				if (typeDetect > RAKUTYPE_STR_Q) {
+					if (typeDetect == RAKUTYPE_STR_QQ)
+						state = SCE_RAKU_STRING_QQ;
+					forward++;				// two char ident
+				}
+				if (typeDetect > RAKUTYPE_STR_QQ)
+					forward++;				// three char ident
+				if (typeDetect == RAKUTYPE_STR_QQWW)
+					forward++;				// four char ident
+
+				// Proceed: check for a valid character after statement
+				if (IsValidRegOrQAdjacent(sc.GetRelative(forward)) || typeDetect == RAKUTYPE_QLANG) {
+					sc.SetState(state);
+					sc.Forward(forward);
+					lastAdverbs.Clear();
+
+					// Process: adverbs / opening delimiter / adverbs after delim
+					if (ProcessValidRegQlangStart(sc, lengthToEnd, typeDetect,
+							lastAdverbs, dpRegQ))
+						sc.SetState(state);
+				}
+			}
+
+			// --- Regex (rx/s/m/tr/y) ----------------------------------------
+			//   - https://docs.raku.org/language/regexes
+			else if ((IsRegexStartAtScPos(sc, typeDetect, setOperator) || regexIdent.InList(wordLast.c_str()))) {
+				if (typeDetect == -1) { // must be a regex identifier word
+					wordLast.clear();
+					typeDetect = RAKUTYPE_REGEX;
+				}
+				Sci_Position forward = 0;	// no ident (RAKUTYPE_REGEX, RAKUTYPE_REGEX_NORM)
+				if (typeDetect > 0 && typeDetect != RAKUTYPE_REGEX)
+					forward++;				// single char ident
+				if (typeDetect > RAKUTYPE_REGEX)
+					forward++;				// two char ident
+
+				// Proceed: check for a valid character after statement
+				if (IsValidRegOrQAdjacent(sc.GetRelative(forward)) || typeDetect == RAKUTYPE_REGEX_NORM) {
+					sc.SetState(SCE_RAKU_REGEX);
+					sc.Forward(forward);
+					lastAdverbs.Clear();
+
+					// Process: adverbs / opening delimiter / adverbs after delim
+					if (ProcessValidRegQlangStart(sc, lengthToEnd, typeDetect,
+							lastAdverbs, dpRegQ))
+						sc.SetState(SCE_RAKU_REGEX);
+				}
+			}
+
+			// --- Numbers ----------------------------------------------------
+			else if (IsValidIdentPrecede(sc.chPrev) && (IsNumberChar(sc.ch)
+					|| (sc.ch == 'v' && IsNumberChar(sc.chNext) && wordLast == "use"))) {
+				numState = RAKUNUM_DECIMAL;	// default: decimal (base 10)
+				cntDecimal = 0;
+				sc.SetState(SCE_RAKU_NUMBER);
+				if (sc.ch == 'v')			// forward past 'v'
+					sc.Forward();
+				if (wordLast == "use") {	// package version number
+					numState = RAKUNUM_VERSION;
+				} else if (sc.ch == '0') {	// other type of number
+					switch (sc.chNext) {
+						case 'b':	// binary (base 2)
+							numState = RAKUNUM_BINARY;
+							break;
+						case 'o':	// octal (base 8)
+							numState = RAKUNUM_OCTAL;
+							break;
+						case 'x':	// hexadecimal (base 16)
+							numState = RAKUNUM_HEX;
+					}
+					if (numState != RAKUNUM_DECIMAL)
+						sc.Forward();		// forward to number type char
+				}
+			}
+
+			// --- Keywords / functions / types / barewords -------------------
+			else if ((sc.currentPos == 0 || sc.atLineStart || IsValidIdentPrecede(sc.chPrev))
+					&& IsWordStartChar(sc.ch)) {
+				len = LengthToNonWordChar(sc, lengthToEnd, s, sizeof(s));
+				if (keywords.InList(s)) {
+					sc.SetState(SCE_RAKU_WORD);		// Keywords
+				} else if(functions.InList(s)) {
+					sc.SetState(SCE_RAKU_FUNCTION);	// Functions
+				} else if(typesBasic.InList(s)) {
+					sc.SetState(SCE_RAKU_TYPEDEF);	// Types (basic)
+				} else if(typesComposite.InList(s)) {
+					sc.SetState(SCE_RAKU_TYPEDEF);	// Types (composite)
+				} else if(typesDomainSpecific.InList(s)) {
+					sc.SetState(SCE_RAKU_TYPEDEF);	// Types (domain-specific)
+				} else if(typesExceptions.InList(s)) {
+					sc.SetState(SCE_RAKU_TYPEDEF);	// Types (exceptions)
+				} else {
+					if (wordLast == "class")
+						sc.SetState(SCE_RAKU_CLASS);	// a Class ident
+					else if (wordLast == "grammar")
+						sc.SetState(SCE_RAKU_GRAMMAR);	// a Grammar ident
+					else
+						sc.SetState(SCE_RAKU_IDENTIFIER);	// Bareword
+					identLast = s;						// save identifier
+				}
+				if (adverbLast == "sym") {				// special adverb ":sym"
+					sc.SetState(SCE_RAKU_IDENTIFIER);	// treat as identifier
+					identLast = s;						// save identifier
+				}
+				if (sc.state != SCE_RAKU_IDENTIFIER)
+					wordLast = s;					// save word
+				sc.Forward(len - 1);				// ...forward past word
+			}
+
+			// --- Adverbs ----------------------------------------------------
+			else if (sc.ch == ':' && IsWordStartChar(sc.chNext)) {
+				len = LengthToNonWordChar(sc, lengthToEnd, s, sizeof(s), 1);
+				if (adverbs.InList(s)) {
+					sc.SetState(SCE_RAKU_ADVERB);	// Adverbs (begin with ':')
+					adverbLast = s;					// save word
+					sc.Forward(len); // ...forward past word (less offset: 1)
+				}
+			}
+
+			// --- Identifiers: $mu / @positional / %associative / &callable --
+			//     see: https://docs.raku.org/language/variables
+			else if (setSigil.Contains(sc.ch) && (setTwigil.Contains(sc.chNext)
+					|| setSpecialVar.Contains(sc.chNext)
+					|| IsWordStartChar(sc.chNext))) {
+
+				// State based on sigil
+				switch (sc.ch) {
+					case '$': sc.SetState(SCE_RAKU_MU);
+						break;
+					case '@': sc.SetState(SCE_RAKU_POSITIONAL);
+						break;
+					case '%': sc.SetState(SCE_RAKU_ASSOCIATIVE);
+						break;
+					case '&': sc.SetState(SCE_RAKU_CALLABLE);
+				}
+				const int state = sc.state;
+				sc.Forward();
+				char ch_delim = 0;
+				if (setSpecialVar.Contains(sc.ch)
+						&& !setWord.Contains(sc.chNext)) {	// Process Special Var
+					ch_delim = -1;
+				} else if (setTwigil.Contains(sc.ch)) {		// Process Twigil
+					sc.SetState(SCE_RAKU_OPERATOR);
+					if (sc.ch == '<' && setWord.Contains(sc.chNext))
+						ch_delim = '>';
+					sc.Forward();
+					sc.SetState(state);
+				}
+
+				// Process (any) identifier
+				if (ch_delim >= 0) {
+					sc.Forward(LengthToNonWordChar(sc, lengthToEnd, s, sizeof(s)) - 1);
+					if (ch_delim > 0 && sc.chNext == ch_delim) {
+						sc.Forward();
+						sc.SetState(SCE_RAKU_OPERATOR);
+					}
+					identLast = s;	// save identifier
+				}
+			}
+
+			// --- Operators --------------------------------------------------
+			else if (IsOperatorChar(sc.ch)) {
+				// FIXME: better valid operator sequences needed?
+				sc.SetState(SCE_RAKU_OPERATOR);
+			}
+
+			// --- Heredoc: begin ---------------------------------------------
+			else if (!hereDelim.empty() && sc.atLineEnd) {
+				if (IsANewLine(sc.ch))
+					sc.Forward(); // skip a possible CRLF situation
+				sc.SetState(hereState);
+			}
+
+			// Reset words: on operator simi-colon OR '}' (end of statement)
+			if (sc.state == SCE_RAKU_OPERATOR && (sc.ch == ';' || sc.ch == '}')) {
+				wordLast.clear();
+				identLast.clear();
+				adverbLast.clear();
+			}
+		}
+
+		/* *** Determine if an "embedded comment" is to be entered ********** *
+		 * This type of embedded comment section, or multi-line comment comes
+		 * after a normal comment has begun... e.g: #`[ ... ]
+		 * ****************************************************************** */
+		else if (sc.state == SCE_RAKU_COMMENTLINE && sc.chPrev == '#' && sc.ch == '`') {
+			if (IsBracketOpenChar(sc.chNext)) {
+				sc.Forward(); // Condition met for "embedded comment"
+				dpEmbeded.opener = sc.ch;
+
+				// Find the opposite (termination) closeing bracket (if any)
+				dpEmbeded.closer[0] = GetBracketCloseChar(dpEmbeded.opener);
+				if (dpEmbeded.closer[0] > 0) { // Enter "embedded comment"
+
+					// Find multiple opening character occurence
+					dpEmbeded.count = GetRepeatCharCount(sc, dpEmbeded.opener, lengthToEnd);
+					sc.SetState(SCE_RAKU_COMMENTEMBED);
+					sc.Forward(dpEmbeded.count - 1); // incremented in the next loop
+				}
+			}
+		}
+	}
+
+	// And we're done...
+	sc.Complete();
+}
+
+/*
+ * LexerRaku::Lex
+ * - Main fold method
+ *   NOTE: although Raku uses and supports UNICODE characters, we're only looking
+ *         at normal chars here, using 'SafeGetCharAt' - for folding purposes
+ *         that is all we need.
+ */
+#define RAKU_HEADFOLD_SHIFT	4
+#define RAKU_HEADFOLD_MASK	0xF0
+void SCI_METHOD LexerRaku::Fold(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, IDocument *pAccess) {
+
+	// init LexAccessor / return if fold option is off
+	if (!options.fold) return;
+	LexAccessor styler(pAccess);
+
+	// init char and line positions
+	const Sci_PositionU endPos = startPos + length;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+
+	// Backtrack to last SCE_RAKU_DEFAULT line
+	if (startPos > 0 && lineCurrent > 0) {
+		while (lineCurrent > 0 && styler.StyleAt(startPos) != SCE_RAKU_DEFAULT) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+		lineCurrent = styler.GetLine(startPos);
+	}
+	Sci_PositionU lineStart = startPos;
+	Sci_PositionU lineStartNext = styler.LineStart(lineCurrent + 1);
+
+	// init line folding level
+	int levelPrev = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelPrev = styler.LevelAt(lineCurrent - 1) >> 16;
+	int levelCurrent = levelPrev;
+
+	// init char and style variables
+	char chNext = styler[startPos];
+	int stylePrev = styler.StyleAt(startPos - 1);
+	int styleNext = styler.StyleAt(startPos);
+	int styleNextStartLine = styler.StyleAt(lineStartNext);
+	int visibleChars = 0;
+	bool wasCommentMulti = false;
+
+	// main loop
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+
+		// next char, style and flags
+		const char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		const int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		const bool atEOL = i == (lineStartNext - 1);
+		const bool atLineStart = i == lineStart;
+
+		// --- Comments / Multi-line / POD ------------------------------------
+		if (options.foldComment) {
+
+			// Multi-line
+			if (options.foldCommentMultiline) {
+				if (style == SCE_RAKU_COMMENTLINE && atLineStart && ch == '#' && chNext == '`'
+						&& styleNextStartLine == SCE_RAKU_COMMENTEMBED) {
+					levelCurrent++;
+					wasCommentMulti = true; // don't confuse line comments
+				} else if (style == SCE_RAKU_COMMENTEMBED && atLineStart
+						&& styleNextStartLine != SCE_RAKU_COMMENTEMBED) {
+					levelCurrent--;
+				}
+			}
+
+			// Line comments
+			if (!wasCommentMulti && atEOL && stylePrev == SCE_RAKU_COMMENTLINE
+					&& IsCommentLine(lineCurrent, styler)) {
+				if (!IsCommentLine(lineCurrent - 1, styler)
+						&& IsCommentLine(lineCurrent + 1, styler))
+					levelCurrent++;
+				else if (IsCommentLine(lineCurrent - 1, styler)
+						&& !IsCommentLine(lineCurrent + 1, styler))
+					levelCurrent--;
+			}
+
+			// POD
+			if (options.foldCommentPOD && atLineStart && style == SCE_RAKU_POD) {
+				if (styler.Match(i, "=begin"))
+					levelCurrent++;
+				else if (styler.Match(i, "=end"))
+					levelCurrent--;
+			}
+		}
+
+		// --- Code block -----------------------------------------------------
+		if (style == SCE_RAKU_OPERATOR) {
+			if (ch == '{') {
+				if (levelCurrent < levelPrev) levelPrev--;
+				levelCurrent++;
+			} else if (ch == '}') {
+				levelCurrent--;
+			}
+		}
+
+		// --- at end of line / range / apply fold ----------------------------
+		if (atEOL) {
+			int level = levelPrev;
+
+			// set level flags
+			level |= levelCurrent << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				level |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				level |= SC_FOLDLEVELHEADERFLAG;
+			if (level != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, level);
+			}
+			lineCurrent++;
+			lineStart = lineStartNext;
+			lineStartNext = styler.LineStart(lineCurrent + 1);
+			styleNextStartLine = styler.StyleAt(lineStartNext);
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			wasCommentMulti = false;
+		}
+
+		// increment visibleChars / set previous char
+		if (!isspacechar(ch))
+			visibleChars++;
+		stylePrev = style;
+	}
+
+	// Done: set real level of the next line
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+/*----------------------------------------------------------------------------*
+ * --- Scintilla: LexerModule ---
+ *----------------------------------------------------------------------------*/
+
+LexerModule lmRaku(SCLEX_RAKU, LexerRaku::LexerFactoryRaku, "raku", rakuWordLists);
diff --git a/scite-app/lexilla/lexers/LexRebol.cxx b/scite-app/lexilla/lexers/LexRebol.cxx
new file mode 100644
index 0000000..f5b6925
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexRebol.cxx
@@ -0,0 +1,326 @@
+// Scintilla source code edit control
+/** @file LexRebol.cxx
+ ** Lexer for REBOL.
+ ** Written by Pascal Hurni, inspired from LexLua by Paul Winwood & Marcos E. Wurzius & Philippe Lhoste
+ **
+ ** History:
+ **		2005-04-07	First release.
+ **		2005-04-10	Closing parens and brackets go now in default style
+ **					String and comment nesting should be more safe
+ **/
+// Copyright 2005 by Pascal Hurni <pascal_hurni@fastmail.fm>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (isalnum(ch) || ch == '?' || ch == '!' || ch == '.' || ch == '\'' || ch == '+' || ch == '-' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
+}
+
+static inline bool IsAWordStart(const int ch, const int ch2) {
+	return ((ch == '+' || ch == '-' || ch == '.') && !isdigit(ch2)) ||
+		(isalpha(ch) || ch == '?' || ch == '!' || ch == '\'' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~');
+}
+
+static inline bool IsAnOperator(const int ch, const int ch2, const int ch3) {
+	// One char operators
+	if (IsASpaceOrTab(ch2)) {
+		return ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '<' || ch == '>' || ch == '=' || ch == '?';
+	}
+
+	// Two char operators
+	if (IsASpaceOrTab(ch3)) {
+		return (ch == '*' && ch2 == '*') ||
+			   (ch == '/' && ch2 == '/') ||
+			   (ch == '<' && (ch2 == '=' || ch2 == '>')) ||
+			   (ch == '>' && ch2 == '=') ||
+			   (ch == '=' && (ch2 == '=' || ch2 == '?')) ||
+			   (ch == '?' && ch2 == '?');
+	}
+
+	return false;
+}
+
+static inline bool IsBinaryStart(const int ch, const int ch2, const int ch3, const int ch4) {
+	return (ch == '#' && ch2 == '{') ||
+		   (IsADigit(ch) && ch2 == '#' && ch3 == '{' ) ||
+		   (IsADigit(ch) && IsADigit(ch2) && ch3 == '#' && ch4 == '{' );
+}
+
+
+static void ColouriseRebolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	// Initialize the braced string {.. { ... } ..} nesting level, if we are inside such a string.
+	int stringLevel = 0;
+	if (initStyle == SCE_REBOL_BRACEDSTRING || initStyle == SCE_REBOL_COMMENTBLOCK) {
+		stringLevel = styler.GetLineState(currentLine - 1);
+	}
+
+	bool blockComment = initStyle == SCE_REBOL_COMMENTBLOCK;
+	int dotCount = 0;
+
+	// Do not leak onto next line
+	if (initStyle == SCE_REBOL_COMMENTLINE) {
+		initStyle = SCE_REBOL_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	if (startPos == 0) {
+		sc.SetState(SCE_REBOL_PREFACE);
+	}
+	for (; sc.More(); sc.Forward()) {
+
+		//--- What to do at line end ?
+		if (sc.atLineEnd) {
+			// Can be either inside a {} string or simply at eol
+			if (sc.state != SCE_REBOL_BRACEDSTRING && sc.state != SCE_REBOL_COMMENTBLOCK &&
+				sc.state != SCE_REBOL_BINARY && sc.state != SCE_REBOL_PREFACE)
+				sc.SetState(SCE_REBOL_DEFAULT);
+
+			// Update the line state, so it can be seen by next line
+			currentLine = styler.GetLine(sc.currentPos);
+			switch (sc.state) {
+			case SCE_REBOL_BRACEDSTRING:
+			case SCE_REBOL_COMMENTBLOCK:
+				// Inside a braced string, we set the line state
+				styler.SetLineState(currentLine, stringLevel);
+				break;
+			default:
+				// Reset the line state
+				styler.SetLineState(currentLine, 0);
+				break;
+			}
+
+			// continue with next char
+			continue;
+		}
+
+		//--- What to do on white-space ?
+		if (IsASpaceOrTab(sc.ch))
+		{
+			// Return to default if any of these states
+			if (sc.state == SCE_REBOL_OPERATOR || sc.state == SCE_REBOL_CHARACTER ||
+				sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR ||
+				sc.state == SCE_REBOL_TUPLE || sc.state == SCE_REBOL_FILE ||
+				sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME ||
+				sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE ||
+				sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_EMAIL) {
+				sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Specialize state ?
+		// URL, Email look like identifier
+		if (sc.state == SCE_REBOL_IDENTIFIER)
+		{
+			if (sc.ch == ':' && !IsASpace(sc.chNext)) {
+				sc.ChangeState(SCE_REBOL_URL);
+			} else if (sc.ch == '@') {
+				sc.ChangeState(SCE_REBOL_EMAIL);
+			} else if (sc.ch == '$') {
+				sc.ChangeState(SCE_REBOL_MONEY);
+			}
+		}
+		// Words look like identifiers
+		if (sc.state == SCE_REBOL_IDENTIFIER || (sc.state >= SCE_REBOL_WORD && sc.state <= SCE_REBOL_WORD8)) {
+			// Keywords ?
+			if (!IsAWordChar(sc.ch) || sc.Match('/')) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				blockComment = strcmp(s, "comment") == 0;
+				if (keywords8.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD8);
+				} else if (keywords7.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD7);
+				} else if (keywords6.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD6);
+				} else if (keywords5.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD5);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD4);
+				} else if (keywords3.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD3);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD2);
+				} else if (keywords.InList(s)) {
+					sc.ChangeState(SCE_REBOL_WORD);
+				}
+				// Keep same style if there are refinements
+				if (!sc.Match('/')) {
+					sc.SetState(SCE_REBOL_DEFAULT);
+				}
+			}
+		// special numbers
+		} else if (sc.state == SCE_REBOL_NUMBER) {
+			switch (sc.ch) {
+			case 'x':	sc.ChangeState(SCE_REBOL_PAIR);
+						break;
+			case ':':	sc.ChangeState(SCE_REBOL_TIME);
+						break;
+			case '-':
+			case '/':	sc.ChangeState(SCE_REBOL_DATE);
+						break;
+			case '.':	if (++dotCount >= 2) sc.ChangeState(SCE_REBOL_TUPLE);
+						break;
+			}
+		}
+
+		//--- Determine if the current state should terminate
+		if (sc.state == SCE_REBOL_QUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
+			if (sc.ch == '^' && sc.chNext == '\"') {
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_BRACEDSTRING || sc.state == SCE_REBOL_COMMENTBLOCK) {
+			if (sc.ch == '}') {
+				if (--stringLevel == 0) {
+					sc.ForwardSetState(SCE_REBOL_DEFAULT);
+				}
+			} else if (sc.ch == '{') {
+				stringLevel++;
+			}
+		} else if (sc.state == SCE_REBOL_BINARY) {
+			if (sc.ch == '}') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_TAG) {
+			if (sc.ch == '>') {
+				sc.ForwardSetState(SCE_REBOL_DEFAULT);
+			}
+		} else if (sc.state == SCE_REBOL_PREFACE) {
+			if (sc.MatchIgnoreCase("rebol"))
+			{
+				int i;
+				for (i=5; IsASpaceOrTab(styler.SafeGetCharAt(sc.currentPos+i, 0)); i++);
+				if (sc.GetRelative(i) == '[')
+					sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Parens and bracket changes to default style when the current is a number
+		if (sc.state == SCE_REBOL_NUMBER || sc.state == SCE_REBOL_PAIR || sc.state == SCE_REBOL_TUPLE ||
+			sc.state == SCE_REBOL_MONEY || sc.state == SCE_REBOL_ISSUE || sc.state == SCE_REBOL_EMAIL ||
+			sc.state == SCE_REBOL_URL || sc.state == SCE_REBOL_DATE || sc.state == SCE_REBOL_TIME) {
+			if (sc.ch == '(' || sc.ch == '[' || sc.ch == ')' || sc.ch == ']') {
+				sc.SetState(SCE_REBOL_DEFAULT);
+			}
+		}
+
+		//--- Determine if a new state should be entered.
+		if (sc.state == SCE_REBOL_DEFAULT) {
+			if (IsAnOperator(sc.ch, sc.chNext, sc.GetRelative(2))) {
+				sc.SetState(SCE_REBOL_OPERATOR);
+			} else if (IsBinaryStart(sc.ch, sc.chNext, sc.GetRelative(2), sc.GetRelative(3))) {
+				sc.SetState(SCE_REBOL_BINARY);
+			} else if (IsAWordStart(sc.ch, sc.chNext)) {
+				sc.SetState(SCE_REBOL_IDENTIFIER);
+			} else if (IsADigit(sc.ch) || sc.ch == '+' || sc.ch == '-' || /*Decimal*/ sc.ch == '.' || sc.ch == ',') {
+				dotCount = 0;
+				sc.SetState(SCE_REBOL_NUMBER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_REBOL_QUOTEDSTRING);
+			} else if (sc.ch == '{') {
+				sc.SetState(blockComment ? SCE_REBOL_COMMENTBLOCK : SCE_REBOL_BRACEDSTRING);
+				++stringLevel;
+			} else if (sc.ch == ';') {
+				sc.SetState(SCE_REBOL_COMMENTLINE);
+			} else if (sc.ch == '$') {
+				sc.SetState(SCE_REBOL_MONEY);
+			} else if (sc.ch == '%') {
+				sc.SetState(SCE_REBOL_FILE);
+			} else if (sc.ch == '<') {
+				sc.SetState(SCE_REBOL_TAG);
+			} else if (sc.ch == '#' && sc.chNext == '"') {
+				sc.SetState(SCE_REBOL_CHARACTER);
+				sc.Forward();
+			} else if (sc.ch == '#' && sc.chNext != '"' && sc.chNext != '{' ) {
+				sc.SetState(SCE_REBOL_ISSUE);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+
+static void FoldRebolDoc(Sci_PositionU startPos, Sci_Position length, int /* initStyle */, WordList *[],
+                            Accessor &styler) {
+	Sci_PositionU lengthDoc = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (style == SCE_REBOL_DEFAULT) {
+			if (ch == '[') {
+				levelCurrent++;
+			} else if (ch == ']') {
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const rebolWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+LexerModule lmREBOL(SCLEX_REBOL, ColouriseRebolDoc, "rebol", FoldRebolDoc, rebolWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexRegistry.cxx b/scite-app/lexilla/lexers/LexRegistry.cxx
new file mode 100644
index 0000000..80c4234
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexRegistry.cxx
@@ -0,0 +1,423 @@
+// Scintilla source code edit control
+/**
+ * @file LexRegistry.cxx
+ * @date July 26 2014
+ * @brief Lexer for Windows registration files(.reg)
+ * @author nkmathew
+ *
+ * The License.txt file describes the conditions under which this software may be
+ * distributed.
+ *
+ */
+
+#include <cstdlib>
+#include <cassert>
+#include <cctype>
+#include <cstdio>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static const char *const RegistryWordListDesc[] = {
+	0
+};
+
+struct OptionsRegistry {
+	bool foldCompact;
+	bool fold;
+	OptionsRegistry() {
+		foldCompact = false;
+		fold = false;
+	}
+};
+
+struct OptionSetRegistry : public OptionSet<OptionsRegistry> {
+	OptionSetRegistry() {
+		DefineProperty("fold.compact", &OptionsRegistry::foldCompact);
+		DefineProperty("fold", &OptionsRegistry::fold);
+		DefineWordListSets(RegistryWordListDesc);
+	}
+};
+
+class LexerRegistry : public DefaultLexer {
+	OptionsRegistry options;
+	OptionSetRegistry optSetRegistry;
+
+	static bool IsStringState(int state) {
+		return (state == SCE_REG_VALUENAME || state == SCE_REG_STRING);
+	}
+
+	static bool IsKeyPathState(int state) {
+		return (state == SCE_REG_ADDEDKEY || state == SCE_REG_DELETEDKEY);
+	}
+
+	static bool AtValueType(LexAccessor &styler, Sci_Position start) {
+		Sci_Position i = 0;
+		while (i < 10) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			if (curr == ':') {
+				return true;
+			} else if (!curr) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	static bool IsNextNonWhitespace(LexAccessor &styler, Sci_Position start, char ch) {
+		Sci_Position i = 0;
+		while (i < 100) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			char next = styler.SafeGetCharAt(start+i+1, '\0');
+			bool atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+			if (curr == ch) {
+				return true;
+			} else if (!isspacechar(curr) || atEOL) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	// Looks for the equal sign at the end of the string
+	static bool AtValueName(LexAccessor &styler, Sci_Position start) {
+		bool atEOL = false;
+		Sci_Position i = 0;
+		bool escaped = false;
+		while (!atEOL) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			char next = styler.SafeGetCharAt(start+i+1, '\0');
+			atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			escaped = curr == '\\';
+			if (curr == '"') {
+				return IsNextNonWhitespace(styler, start+i, '=');
+			} else if (!curr) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	static bool AtKeyPathEnd(LexAccessor &styler, Sci_Position start) {
+		bool atEOL = false;
+		Sci_Position i = 0;
+		while (!atEOL) {
+			i++;
+			char curr = styler.SafeGetCharAt(start+i, '\0');
+			char next = styler.SafeGetCharAt(start+i+1, '\0');
+			atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+			if (curr == ']' || !curr) {
+				// There's still at least one or more square brackets ahead
+				return false;
+			}
+		}
+		return true;
+	}
+
+	static bool AtGUID(LexAccessor &styler, Sci_Position start) {
+		int count = 8;
+		int portion = 0;
+		int offset = 1;
+		char digit = '\0';
+		while (portion < 5) {
+			int i = 0;
+			while (i < count) {
+				digit = styler.SafeGetCharAt(start+offset);
+				if (!(isxdigit(digit) || digit == '-')) {
+					return false;
+				}
+				offset++;
+				i++;
+			}
+			portion++;
+			count = (portion == 4) ? 13 : 5;
+		}
+		digit = styler.SafeGetCharAt(start+offset);
+		if (digit == '}') {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+public:
+	LexerRegistry() : DefaultLexer("registry", SCLEX_REGISTRY) {}
+	virtual ~LexerRegistry() {}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	const char *SCI_METHOD PropertyNames() override {
+		return optSetRegistry.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return optSetRegistry.PropertyType(name);
+	}
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
+		return optSetRegistry.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override {
+		if (optSetRegistry.PropertySet(&options, key, val)) {
+			return 0;
+		}
+		return -1;
+	}
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return optSetRegistry.PropertyGet(key);
+	}
+
+	Sci_Position SCI_METHOD WordListSet(int, const char *) override {
+		return -1;
+	}
+	void *SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+	static ILexer5 *LexerFactoryRegistry() {
+		return new LexerRegistry;
+	}
+	const char *SCI_METHOD DescribeWordListSets() override {
+		return optSetRegistry.DescribeWordListSets();
+	}
+	void SCI_METHOD Lex(Sci_PositionU startPos,
+								Sci_Position length,
+								int initStyle,
+								IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos,
+								 Sci_Position length,
+								 int initStyle,
+								 IDocument *pAccess) override;
+};
+
+void SCI_METHOD LexerRegistry::Lex(Sci_PositionU startPos,
+								   Sci_Position length,
+								   int initStyle,
+								   IDocument *pAccess) {
+	int beforeGUID = SCE_REG_DEFAULT;
+	int beforeEscape = SCE_REG_DEFAULT;
+	CharacterSet setOperators = CharacterSet(CharacterSet::setNone, "-,.=:\\@()");
+	LexAccessor styler(pAccess);
+	StyleContext context(startPos, length, initStyle, styler);
+	bool highlight = true;
+	bool afterEqualSign = false;
+	while (context.More()) {
+		if (context.atLineStart) {
+			Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+			bool continued = styler[currPos-3] == '\\';
+			highlight = continued ? true : false;
+		}
+		switch (context.state) {
+			case SCE_REG_COMMENT:
+				if (context.atLineEnd) {
+					context.SetState(SCE_REG_DEFAULT);
+				}
+				break;
+			case SCE_REG_VALUENAME:
+			case SCE_REG_STRING: {
+					Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+					if (context.ch == '"') {
+						context.ForwardSetState(SCE_REG_DEFAULT);
+					} else if (context.ch == '\\') {
+						beforeEscape = context.state;
+						context.SetState(SCE_REG_ESCAPED);
+						context.Forward();
+					} else if (context.ch == '{') {
+						if (AtGUID(styler, currPos)) {
+							beforeGUID = context.state;
+							context.SetState(SCE_REG_STRING_GUID);
+						}
+					}
+					if (context.state == SCE_REG_STRING &&
+						context.ch == '%' &&
+						(isdigit(context.chNext) || context.chNext == '*')) {
+						context.SetState(SCE_REG_PARAMETER);
+					}
+				}
+				break;
+			case SCE_REG_PARAMETER:
+				context.ForwardSetState(SCE_REG_STRING);
+				if (context.ch == '"') {
+					context.ForwardSetState(SCE_REG_DEFAULT);
+				}
+				break;
+			case SCE_REG_VALUETYPE:
+				if (context.ch == ':') {
+					context.SetState(SCE_REG_DEFAULT);
+					afterEqualSign = false;
+				}
+				break;
+			case SCE_REG_HEXDIGIT:
+			case SCE_REG_OPERATOR:
+				context.SetState(SCE_REG_DEFAULT);
+				break;
+			case SCE_REG_DELETEDKEY:
+			case SCE_REG_ADDEDKEY: {
+					Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+					if (context.ch == ']' && AtKeyPathEnd(styler, currPos)) {
+						context.ForwardSetState(SCE_REG_DEFAULT);
+					} else if (context.ch == '{') {
+						if (AtGUID(styler, currPos)) {
+							beforeGUID = context.state;
+							context.SetState(SCE_REG_KEYPATH_GUID);
+						}
+					}
+				}
+				break;
+			case SCE_REG_ESCAPED:
+				if (context.ch == '"') {
+					context.SetState(beforeEscape);
+					context.ForwardSetState(SCE_REG_DEFAULT);
+				} else if (context.ch == '\\') {
+					context.Forward();
+				} else {
+					context.SetState(beforeEscape);
+					beforeEscape = SCE_REG_DEFAULT;
+				}
+				break;
+			case SCE_REG_STRING_GUID:
+			case SCE_REG_KEYPATH_GUID: {
+					if (context.ch == '}') {
+						context.ForwardSetState(beforeGUID);
+						beforeGUID = SCE_REG_DEFAULT;
+					}
+					Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+					if (context.ch == '"' && IsStringState(context.state)) {
+						context.ForwardSetState(SCE_REG_DEFAULT);
+					} else if (context.ch == ']' &&
+							   AtKeyPathEnd(styler, currPos) &&
+							   IsKeyPathState(context.state)) {
+						context.ForwardSetState(SCE_REG_DEFAULT);
+					} else if (context.ch == '\\' && IsStringState(context.state)) {
+						beforeEscape = context.state;
+						context.SetState(SCE_REG_ESCAPED);
+						context.Forward();
+					}
+				}
+				break;
+		}
+		// Determine if a new state should be entered.
+		if (context.state == SCE_REG_DEFAULT) {
+			Sci_Position currPos = static_cast<Sci_Position>(context.currentPos);
+			if (context.ch == ';') {
+				context.SetState(SCE_REG_COMMENT);
+			} else if (context.ch == '"') {
+				if (AtValueName(styler, currPos)) {
+					context.SetState(SCE_REG_VALUENAME);
+				} else {
+					context.SetState(SCE_REG_STRING);
+				}
+			} else if (context.ch == '[') {
+				if (IsNextNonWhitespace(styler, currPos, '-')) {
+					context.SetState(SCE_REG_DELETEDKEY);
+				} else {
+					context.SetState(SCE_REG_ADDEDKEY);
+				}
+			} else if (context.ch == '=') {
+				afterEqualSign = true;
+				highlight = true;
+			} else if (afterEqualSign) {
+				bool wordStart = isalpha(context.ch) && !isalpha(context.chPrev);
+				if (wordStart && AtValueType(styler, currPos)) {
+					context.SetState(SCE_REG_VALUETYPE);
+				}
+			} else if (isxdigit(context.ch) && highlight) {
+				context.SetState(SCE_REG_HEXDIGIT);
+			}
+			highlight = (context.ch == '@') ? true : highlight;
+			if (setOperators.Contains(context.ch) && highlight) {
+				context.SetState(SCE_REG_OPERATOR);
+			}
+		}
+		context.Forward();
+	}
+	context.Complete();
+}
+
+// Folding similar to that of FoldPropsDoc in LexOthers
+void SCI_METHOD LexerRegistry::Fold(Sci_PositionU startPos,
+									Sci_Position length,
+									int,
+									IDocument *pAccess) {
+	if (!options.fold) {
+		return;
+	}
+	LexAccessor styler(pAccess);
+	Sci_Position currLine = styler.GetLine(startPos);
+	int visibleChars = 0;
+	Sci_PositionU endPos = startPos + length;
+	bool atKeyPath = false;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		atKeyPath = IsKeyPathState(styler.StyleAt(i)) ? true : atKeyPath;
+		char curr = styler.SafeGetCharAt(i);
+		char next = styler.SafeGetCharAt(i+1);
+		bool atEOL = (curr == '\r' && next != '\n') || (curr == '\n');
+		if (atEOL || i == (endPos-1)) {
+			int level = SC_FOLDLEVELBASE;
+			if (currLine > 0) {
+				int prevLevel = styler.LevelAt(currLine-1);
+				if (prevLevel & SC_FOLDLEVELHEADERFLAG) {
+					level += 1;
+				} else {
+					level = prevLevel;
+				}
+			}
+			if (!visibleChars && options.foldCompact) {
+				level |= SC_FOLDLEVELWHITEFLAG;
+			} else if (atKeyPath) {
+				level = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+			}
+			if (level != styler.LevelAt(currLine)) {
+				styler.SetLevel(currLine, level);
+			}
+			currLine++;
+			visibleChars = 0;
+			atKeyPath = false;
+		}
+		if (!isspacechar(curr)) {
+			visibleChars++;
+		}
+	}
+
+	// Make the folding reach the last line in the file
+	int level = SC_FOLDLEVELBASE;
+	if (currLine > 0) {
+		int prevLevel = styler.LevelAt(currLine-1);
+		if (prevLevel & SC_FOLDLEVELHEADERFLAG) {
+			level += 1;
+		} else {
+			level = prevLevel;
+		}
+	}
+	styler.SetLevel(currLine, level);
+}
+
+LexerModule lmRegistry(SCLEX_REGISTRY,
+					   LexerRegistry::LexerFactoryRegistry,
+					   "registry",
+					   RegistryWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexRuby.cxx b/scite-app/lexilla/lexers/LexRuby.cxx
new file mode 100644
index 0000000..566d0cc
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexRuby.cxx
@@ -0,0 +1,1858 @@
+// Scintilla source code edit control
+/** @file LexRuby.cxx
+ ** Lexer for Ruby.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+//XXX Identical to Perl, put in common area
+static inline bool isEOLChar(char ch) {
+    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)
+
+static inline bool isSafeAlpha(char ch) {
+    return (isSafeASCII(ch) && isalpha(ch)) || ch == '_';
+}
+
+static inline bool isSafeAlnum(char ch) {
+    return (isSafeASCII(ch) && isalnum(ch)) || ch == '_';
+}
+
+static inline bool isSafeAlnumOrHigh(char ch) {
+    return isHighBitChar(ch) || isalnum(ch) || ch == '_';
+}
+
+static inline bool isSafeDigit(char ch) {
+    return isSafeASCII(ch) && isdigit(ch);
+}
+
+static inline bool isSafeWordcharOrHigh(char ch) {
+    // 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';
+}
+
+#define MAX_KEYWORD_LENGTH 200
+
+#define STYLE_MASK 63
+#define actual_style(style) (style & STYLE_MASK)
+
+static bool followsDot(Sci_PositionU pos, Accessor &styler) {
+    styler.Flush();
+    for (; pos >= 1; --pos) {
+        int style = actual_style(styler.StyleAt(pos));
+        char ch;
+        switch (style) {
+        case SCE_RB_DEFAULT:
+            ch = styler[pos];
+            if (ch == ' ' || ch == '\t') {
+                //continue
+            } else {
+                return false;
+            }
+            break;
+
+        case SCE_RB_OPERATOR:
+            return styler[pos] == '.';
+
+        default:
+            return false;
+        }
+    }
+    return false;
+}
+
+// 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);
+
+static int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, WordList &keywords, Accessor &styler, char *prevWord) {
+    char s[MAX_KEYWORD_LENGTH];
+    Sci_PositionU i, j;
+    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++) {
+        s[j] = styler[i];
+    }
+    s[j] = '\0';
+    int chAttr;
+    if (0 == strcmp(prevWord, "class"))
+        chAttr = SCE_RB_CLASSNAME;
+    else if (0 == strcmp(prevWord, "module"))
+        chAttr = SCE_RB_MODULE_NAME;
+    else if (0 == strcmp(prevWord, "def"))
+        chAttr = SCE_RB_DEFNAME;
+    else if (keywords.InList(s) && ((start == 0) || !followsDot(start - 1, styler))) {
+        if (keywordIsAmbiguous(s)
+                && keywordIsModifier(s, start, styler)) {
+
+            // Demoted keywords are colored as keywords,
+            // but do not affect changes in indentation.
+            //
+            // Consider the word 'if':
+            // 1. <<if test ...>> : normal
+            // 2. <<stmt if test>> : demoted
+            // 3. <<lhs = if ...>> : normal: start a new indent level
+            // 4. <<obj.if = 10>> : color as identifer, since it follows '.'
+
+            chAttr = SCE_RB_WORD_DEMOTED;
+        } else {
+            chAttr = SCE_RB_WORD;
+        }
+    } else
+        chAttr = SCE_RB_IDENTIFIER;
+    styler.ColourTo(end, chAttr);
+    if (chAttr == SCE_RB_WORD) {
+        strcpy(prevWord, s);
+    } else {
+        prevWord[0] = 0;
+    }
+    return chAttr;
+}
+
+
+//XXX Identical to Perl, put in common area
+static bool isMatch(Accessor &styler, Sci_Position lengthDoc, Sci_Position pos, const char *val) {
+    if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
+        return false;
+    }
+    while (*val) {
+        if (*val != styler[pos++]) {
+            return false;
+        }
+        val++;
+    }
+    return true;
+}
+
+// Do Ruby better -- find the end of the line, work back,
+// 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)
+{
+    if (!isMatch(styler, lengthDoc, pos, HereDocDelim)) {
+        return false;
+    }
+    while (--pos > 0) {
+        char ch = styler[pos];
+        if (isEOLChar(ch)) {
+            return true;
+        } else if (ch != ' ' && ch != '\t') {
+            return false;
+        }
+    }
+    return false;
+}
+
+//XXX Identical to Perl, put in common area
+static char opposite(char ch) {
+    if (ch == '(')
+        return ')';
+    if (ch == '[')
+        return ']';
+    if (ch == '{')
+        return '}';
+    if (ch == '<')
+        return '>';
+    return 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) {
+    i--;
+    chNext2 = chNext;
+    chNext = ch;
+    state = SCE_RB_DEFAULT;
+}
+
+static void advance_char(Sci_Position &i, char &ch, char &chNext, char &chNext2) {
+    i++;
+    ch = chNext;
+    chNext = chNext2;
+}
+
+// precondition: startPos points to one after the EOL char
+static 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);
+        if (isEOLChar(ch)) {
+            // Leave the pointers where they are -- there are no
+            // here doc delims on the current line, even if
+            // the EOL isn't default style
+
+            return false;
+        } else {
+            styler.Flush();
+            if (actual_style(styler.StyleAt(pos)) == SCE_RB_HERE_DELIM) {
+                break;
+            }
+        }
+    }
+    if (pos == 0) {
+        return false;
+    }
+    // Update the pointers so we don't have to re-analyze the string
+    startPos = pos;
+    return true;
+}
+
+// This class is used by the enter and exit methods, so it needs
+// to be hoisted out of the function.
+
+class QuoteCls {
+public:
+    int  Count;
+    char Up;
+    char Down;
+    QuoteCls() noexcept {
+        New();
+    }
+    void New() noexcept {
+        Count = 0;
+        Up    = '\0';
+        Down  = '\0';
+    }
+    void Open(char u) {
+        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;
+}
+
+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];
+}
+
+static bool isEmptyLine(Sci_Position pos,
+                        Accessor &styler) {
+    int spaceFlags = 0;
+    Sci_Position lineCurrent = styler.GetLine(pos);
+    int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+    return (indentCurrent & SC_FOLDLEVELWHITEFLAG) != 0;
+}
+
+static bool RE_CanFollowKeyword(const char *keyword) {
+    if (!strcmp(keyword, "and")
+            || !strcmp(keyword, "begin")
+            || !strcmp(keyword, "break")
+            || !strcmp(keyword, "case")
+            || !strcmp(keyword, "do")
+            || !strcmp(keyword, "else")
+            || !strcmp(keyword, "elsif")
+            || !strcmp(keyword, "if")
+            || !strcmp(keyword, "next")
+            || !strcmp(keyword, "return")
+            || !strcmp(keyword, "when")
+            || !strcmp(keyword, "unless")
+            || !strcmp(keyword, "until")
+            || !strcmp(keyword, "not")
+            || !strcmp(keyword, "or")) {
+        return true;
+    }
+    return false;
+}
+
+// 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) {
+    for (Sci_Position i = startPos; i < endPos; i++) {
+        if (!iswhitespace(styler[i])) {
+            return i;
+        }
+    }
+    return endPos;
+}
+
+// This routine looks for false positives like
+// undef foo, <<
+// There aren't too many.
+//
+// iPrev points to the start of <<
+
+static 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);
+    styler.Flush();
+
+    // Find the first word after some whitespace
+    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)) {
+        case SCE_RB_WORD:
+        case SCE_RB_WORD_DEMOTED:
+        case SCE_RB_IDENTIFIER:
+            break;
+        default:
+            return true;
+        }
+    }
+    Sci_Position firstWordEndPosn = firstWordPosn;
+    char *dst = prevWord;
+    for (;;) {
+        if (firstWordEndPosn >= iPrev ||
+                styler.StyleAt(firstWordEndPosn) != prevStyle) {
+            *dst = 0;
+            break;
+        }
+        *dst++ = styler[firstWordEndPosn];
+        firstWordEndPosn += 1;
+    }
+    //XXX Write a style-aware thing to regex scintilla buffer objects
+    if (!strcmp(prevWord, "undef")
+            || !strcmp(prevWord, "def")
+            || !strcmp(prevWord, "alias")) {
+        // These keywords are what we were looking for
+        return false;
+    }
+    return true;
+}
+
+// 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) {
+    if (lengthDoc - currPos < targetEndPos - targetStartPos) {
+        return false;
+    }
+    Sci_Position i, j;
+    for (i = targetStartPos, j = currPos;
+            i < targetEndPos && j < lengthDoc;
+            i++, j++) {
+        if (styler[i] != styler[j]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+// 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) {
+    int depth = 0;
+    for (; pos > min_pos; pos -= 1) {
+        int style = styler.StyleAt(pos - 1);
+        if (style == SCE_RB_OPERATOR) {
+            int ch = styler[pos - 1];
+            if (ch == '}' || ch == ')' || ch == ']') {
+                depth += 1;
+            } else if (ch == '{' || ch == '(' || ch == '[') {
+                if (depth == 0) {
+                    break;
+                } else {
+                    depth -= 1;
+                }
+            } else if (ch == ';' && depth == 0) {
+                break;
+            }
+        }
+    }
+    return pos;
+}
+
+// We need a check because the form
+// [identifier] <<[target]
+// is ambiguous.  The Ruby lexer/parser resolves it by
+// looking to see if [identifier] names a variable or a
+// function.  If it's the first, it's the start of a here-doc.
+// If it's a var, it's an operator.  This lexer doesn't
+// maintain a symbol table, so it looks ahead to see what's
+// going on, in cases where we have
+// ^[white-space]*[identifier([.|::]identifier)*][white-space]*<<[target]
+//
+// If there's no occurrence of [target] on a line, assume we don't.
+
+// return true == yes, we have no heredocs
+
+static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
+                                 Accessor &styler) {
+    int prevStyle;
+    // 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);
+    styler.Flush();
+    const bool definitely_not_a_here_doc = true;
+    const bool looks_like_a_here_doc = false;
+
+    // find the expression start rather than the line start
+    Sci_Position exprStartPosn = findExpressionStart(lt2StartPos, lineStartPosn, styler);
+
+    // Find the first word after some whitespace
+    Sci_Position firstWordPosn = skipWhitespace(exprStartPosn, lt2StartPos, styler);
+    if (firstWordPosn >= lt2StartPos) {
+        return definitely_not_a_here_doc;
+    }
+    prevStyle = styler.StyleAt(firstWordPosn);
+    // If we have '<<' following a keyword, it's not a heredoc
+    if (prevStyle != SCE_RB_IDENTIFIER
+            && prevStyle != SCE_RB_SYMBOL
+            && prevStyle != SCE_RB_INSTANCE_VAR
+            && prevStyle != SCE_RB_CLASS_VAR) {
+        return definitely_not_a_here_doc;
+    }
+    int newStyle = prevStyle;
+    // Some compilers incorrectly warn about uninit newStyle
+    for (firstWordPosn += 1; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
+        // Inner loop looks at the name
+        for (; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
+            newStyle = styler.StyleAt(firstWordPosn);
+            if (newStyle != prevStyle) {
+                break;
+            }
+        }
+        // Do we have '::' or '.'?
+        if (firstWordPosn < lt2StartPos && newStyle == SCE_RB_OPERATOR) {
+            char ch = styler[firstWordPosn];
+            if (ch == '.') {
+                // yes
+            } else if (ch == ':') {
+                if (styler.StyleAt(++firstWordPosn) != SCE_RB_OPERATOR) {
+                    return definitely_not_a_here_doc;
+                } else if (styler[firstWordPosn] != ':') {
+                    return definitely_not_a_here_doc;
+                }
+            } else {
+                break;
+            }
+        } else {
+            break;
+        }
+        // on second and next passes, only identifiers may appear since
+        // class and instance variable are private
+        prevStyle = SCE_RB_IDENTIFIER;
+    }
+    // Skip next batch of white-space
+    firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler);
+    // possible symbol for an implicit hash argument
+    if (firstWordPosn < lt2StartPos && styler.StyleAt(firstWordPosn) == SCE_RB_SYMBOL) {
+        for (; firstWordPosn <= lt2StartPos; firstWordPosn += 1) {
+            if (styler.StyleAt(firstWordPosn) != SCE_RB_SYMBOL) {
+                break;
+            }
+        }
+        // Skip next batch of white-space
+        firstWordPosn = skipWhitespace(firstWordPosn, lt2StartPos, styler);
+    }
+    if (firstWordPosn != lt2StartPos) {
+        // Have [[^ws[identifier]ws[*something_else*]ws<<
+        return definitely_not_a_here_doc;
+    }
+    // OK, now 'j' will point to the current spot moving ahead
+    Sci_Position j = firstWordPosn + 1;
+    if (styler.StyleAt(j) != SCE_RB_OPERATOR || styler[j] != '<') {
+        // This shouldn't happen
+        return definitely_not_a_here_doc;
+    }
+    Sci_Position nextLineStartPosn = styler.LineStart(lineStart + 1);
+    if (nextLineStartPosn >= lengthDoc) {
+        return definitely_not_a_here_doc;
+    }
+    j = skipWhitespace(j + 1, nextLineStartPosn, styler);
+    if (j >= lengthDoc) {
+        return definitely_not_a_here_doc;
+    }
+    bool allow_indent;
+    Sci_Position target_start, target_end;
+    // From this point on no more styling, since we're looking ahead
+    if (styler[j] == '-' || styler[j] == '~') {
+        allow_indent = true;
+        j++;
+    } else {
+        allow_indent = false;
+    }
+
+    // Allow for quoted targets.
+    char target_quote = 0;
+    switch (styler[j]) {
+    case '\'':
+    case '"':
+    case '`':
+        target_quote = styler[j];
+        j += 1;
+    }
+
+    if (isSafeAlnum(styler[j])) {
+        // Init target_end because some compilers think it won't
+        // be initialized by the time it's used
+        target_start = target_end = j;
+        j++;
+    } else {
+        return definitely_not_a_here_doc;
+    }
+    for (; j < lengthDoc; j++) {
+        if (!isSafeAlnum(styler[j])) {
+            if (target_quote && styler[j] != target_quote) {
+                // unquoted end
+                return definitely_not_a_here_doc;
+            }
+
+            // And for now make sure that it's a newline
+            // don't handle arbitrary expressions yet
+
+            target_end = j;
+            if (target_quote) {
+                // Now we can move to the character after the string delimiter.
+                j += 1;
+            }
+            j = skipWhitespace(j, lengthDoc, styler);
+            if (j >= lengthDoc) {
+                return definitely_not_a_here_doc;
+            } else {
+                char ch = styler[j];
+                if (ch == '#' || isEOLChar(ch)) {
+                    // This is OK, so break and continue;
+                    break;
+                } else {
+                    return definitely_not_a_here_doc;
+                }
+            }
+        }
+    }
+
+    // Just look at the start of each line
+    Sci_Position last_line = styler.GetLine(lengthDoc - 1);
+    // But don't go too far
+    if (last_line > lineStart + 50) {
+        last_line = lineStart + 50;
+    }
+    for (Sci_Position line_num = lineStart + 1; line_num <= last_line; line_num++) {
+        if (allow_indent) {
+            j = skipWhitespace(styler.LineStart(line_num), lengthDoc, styler);
+        } else {
+            j = styler.LineStart(line_num);
+        }
+        // target_end is one past the end
+        if (haveTargetMatch(j, lengthDoc, target_start, target_end, styler)) {
+            // We got it
+            return looks_like_a_here_doc;
+        }
+    }
+    return definitely_not_a_here_doc;
+}
+
+//todo: if we aren't looking at a stdio character,
+// 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) {
+
+    styler.Flush();
+    int style = actual_style(styler.StyleAt(startPos));
+    switch (style) {
+    case SCE_RB_STDIN:
+    case SCE_RB_STDOUT:
+    case SCE_RB_STDERR:
+        // Don't do anything else with these.
+        return;
+    }
+
+    Sci_Position pos = startPos;
+    // Quick way to characterize each line
+    Sci_Position lineStart;
+    for (lineStart = styler.GetLine(pos); lineStart > 0; lineStart--) {
+        // Now look at the style before the previous line's EOL
+        pos = styler.LineStart(lineStart) - 1;
+        if (pos <= 10) {
+            lineStart = 0;
+            break;
+        }
+        char ch = styler.SafeGetCharAt(pos);
+        char chPrev = styler.SafeGetCharAt(pos - 1);
+        if (ch == '\n' && chPrev == '\r') {
+            pos--;
+        }
+        if (styler.SafeGetCharAt(pos - 1) == '\\') {
+            // Continuation line -- keep going
+        } else if (actual_style(styler.StyleAt(pos)) != SCE_RB_DEFAULT) {
+            // Part of multi-line construct -- keep going
+        } else if (currLineContainsHereDelims(pos, styler)) {
+            // Keep going, with pos and length now pointing
+            // at the end of the here-doc delimiter
+        } else if (skipWhiteSpace && isEmptyLine(pos, styler)) {
+            // Keep going
+        } else {
+            break;
+        }
+    }
+    pos = styler.LineStart(lineStart);
+    length += (startPos - pos);
+    startPos = pos;
+    initStyle = SCE_RB_DEFAULT;
+}
+
+static 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
+    // start position and what the termination string is for here documents
+
+    WordList &keywords = *keywordlists[0];
+
+    class HereDocCls {
+    public:
+        int State = 0;
+        // States
+        // 0: '<<' encountered
+        // 1: collect the delimiter
+        // 1b: text between the end of the delimiter and the EOL
+        // 2: here doc text (lines after the delimiter)
+        char Quote = 0;		// the char after '<<'
+        bool Quoted = false;		// true if Quote in ('\'','"','`')
+        int DelimiterLength = 0;	// strlen(Delimiter)
+        char Delimiter[256] {};	// the Delimiter, limit of 256: from Perl
+        bool CanBeIndented = false;
+    };
+    HereDocCls HereDoc;
+
+    QuoteCls Quote;
+
+    int numDots = 0;  // For numbers --
+    // Don't start lexing in the middle of a num
+
+    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
+                        false);
+
+    bool preferRE = true;
+    int state = initStyle;
+    Sci_Position lengthDoc = startPos + length;
+
+    char prevWord[MAX_KEYWORD_LENGTH + 1] = ""; // 1 byte for zero
+    if (length == 0)
+        return;
+
+    char chPrev = styler.SafeGetCharAt(startPos - 1);
+    char chNext = styler.SafeGetCharAt(startPos);
+    bool is_real_number = true;   // Differentiate between constants and ?-sequences.
+    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";
+
+    // 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.
+    // For example,
+    // fu_output_message "mkdir #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}"
+    //     if options[:verbose]
+    // from fileutils.rb nests to a level of 2
+    // If the user actually hits a 6th occurrence of '#{' in a double-quoted
+    // string (including regex'es, %Q, %<sym>, %w, and other strings
+    // that interpolate), it will stay as a string.  The problem with this
+    // is that quotes might flip, a 7th '#{' will look like a comment,
+    // and code-folding might be wrong.
+
+    // If anyone runs into this problem, I recommend raising this
+    // value slightly higher to replacing the fixed array with a linked
+    // list.  Keep in mind this code will be called every time the lexer
+    // 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
+
+    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++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        char chNext2 = styler.SafeGetCharAt(i + 2);
+
+        if (styler.IsLeadByte(ch)) {
+            chNext = chNext2;
+            chPrev = ' ';
+            i += 1;
+            continue;
+        }
+
+        // skip on DOS/Windows
+        //No, don't, because some things will get tagged on,
+        // so we won't recognize keywords, for example
+#if 0
+        if (ch == '\r' && chNext == '\n') {
+            continue;
+        }
+#endif
+
+        if (HereDoc.State == 1 && isEOLChar(ch)) {
+            // Begin of here-doc (the line after the here-doc delimiter):
+            HereDoc.State = 2;
+            styler.ColourTo(i-1, state);
+            // Don't check for a missing quote, just jump into
+            // the here-doc state
+            state = SCE_RB_HERE_Q;
+        }
+
+        // Regular transitions
+        if (state == SCE_RB_DEFAULT) {
+            if (isSafeDigit(ch)) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_NUMBER;
+                is_real_number = true;
+                numDots = 0;
+            } else if (isHighBitChar(ch) || iswordstart(ch)) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_WORD;
+            } else if (ch == '#') {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_COMMENTLINE;
+            } else if (ch == '=') {
+                // =begin indicates the start of a comment (doc) block
+                if ((i == 0 || isEOLChar(chPrev))
+                        && chNext == 'b'
+                        && styler.SafeGetCharAt(i + 2) == 'e'
+                        && styler.SafeGetCharAt(i + 3) == 'g'
+                        && styler.SafeGetCharAt(i + 4) == 'i'
+                        && styler.SafeGetCharAt(i + 5) == 'n'
+                        && !isSafeWordcharOrHigh(styler.SafeGetCharAt(i + 6))) {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_RB_POD;
+                } else {
+                    styler.ColourTo(i - 1, state);
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    preferRE = true;
+                }
+            } else if (ch == '"') {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_STRING;
+                Quote.New();
+                Quote.Open(ch);
+            } else if (ch == '\'') {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_CHARACTER;
+                Quote.New();
+                Quote.Open(ch);
+            } else if (ch == '`') {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_BACKTICKS;
+                Quote.New();
+                Quote.Open(ch);
+            } else if (ch == '@') {
+                // Instance or class var
+                styler.ColourTo(i - 1, state);
+                if (chNext == '@') {
+                    state = SCE_RB_CLASS_VAR;
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    state = SCE_RB_INSTANCE_VAR;
+                }
+            } else if (ch == '$') {
+                // Check for a builtin global
+                styler.ColourTo(i - 1, state);
+                // Recognize it bit by bit
+                state = SCE_RB_GLOBAL;
+            } else if (ch == '/' && preferRE) {
+                // Ambigous operator
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_REGEX;
+                Quote.New();
+                Quote.Open(ch);
+            } else if (ch == '<' && chNext == '<' && chNext2 != '=') {
+
+                // Recognise the '<<' symbol - either a here document or a binary op
+                styler.ColourTo(i - 1, state);
+                i++;
+                chNext = chNext2;
+                styler.ColourTo(i, SCE_RB_OPERATOR);
+
+                if (!(strchr("\"\'`_-~", chNext2) || isSafeAlpha(chNext2))) {
+                    // It's definitely not a here-doc,
+                    // based on Ruby's lexer/parser in the
+                    // heredoc_identifier routine.
+                    // Nothing else to do.
+                } else if (preferRE) {
+                    if (sureThisIsHeredoc(i - 1, styler, prevWord)) {
+                        state = SCE_RB_HERE_DELIM;
+                        HereDoc.State = 0;
+                    }
+                    // else leave it in default state
+                } else {
+                    if (sureThisIsNotHeredoc(i - 1, styler)) {
+                        // leave state as default
+                        // We don't have all the heuristics Perl has for indications
+                        // of a here-doc, because '<<' is overloadable and used
+                        // for so many other classes.
+                    } else {
+                        state = SCE_RB_HERE_DELIM;
+                        HereDoc.State = 0;
+                    }
+                }
+                preferRE = (state != SCE_RB_HERE_DELIM);
+            } else if (ch == ':') {
+                styler.ColourTo(i - 1, state);
+                if (chNext == ':') {
+                    // Mark "::" as an operator, not symbol start
+                    styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                } else if (isSafeWordcharOrHigh(chNext)) {
+                    state = SCE_RB_SYMBOL;
+                } else if ((chNext == '@' || chNext == '$') &&
+                           isSafeWordcharOrHigh(chNext2)) {
+                    // instance and global variable followed by an identifier
+                    advance_char(i, ch, chNext, chNext2);
+                    state = SCE_RB_SYMBOL;
+                } else if (((chNext == '@' && chNext2 == '@')  ||
+                            (chNext == '$' && chNext2 == '-')) &&
+                           isSafeWordcharOrHigh(styler.SafeGetCharAt(i+3))) {
+                    // class variables and special global variable "$-IDENTCHAR"
+                    state = SCE_RB_SYMBOL;
+                    // $-IDENTCHAR doesn't continue past the IDENTCHAR
+                    if (chNext == '$') {
+                        styler.ColourTo(i+3, SCE_RB_SYMBOL);
+                        state = SCE_RB_DEFAULT;
+                    }
+                    i += 3;
+                    ch = styler.SafeGetCharAt(i);
+                    chNext = styler.SafeGetCharAt(i+1);
+                } else if (chNext == '$' && strchr("_~*$?!@/\\;,.=:<>\"&`'+", chNext2)) {
+                    // single-character special global variables
+                    i += 2;
+                    ch = chNext2;
+                    chNext = styler.SafeGetCharAt(i+1);
+                    styler.ColourTo(i, SCE_RB_SYMBOL);
+                    state = SCE_RB_DEFAULT;
+                } else if (strchr("[*!~+-*/%=<>&^|", chNext)) {
+                    // Do the operator analysis in-line, looking ahead
+                    // Based on the table in pickaxe 2nd ed., page 339
+                    bool doColoring = true;
+                    switch (chNext) {
+                    case '[':
+                        if (chNext2 == ']') {
+                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            if (ch_tmp == '=') {
+                                i += 3;
+                                ch = ch_tmp;
+                                chNext = styler.SafeGetCharAt(i + 1);
+                            } else {
+                                i += 2;
+                                ch = chNext2;
+                                chNext = ch_tmp;
+                            }
+                        } else {
+                            doColoring = false;
+                        }
+                        break;
+
+                    case '*':
+                        if (chNext2 == '*') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    case '!':
+                        if (chNext2 == '=' || chNext2 == '~') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    case '<':
+                        if (chNext2 == '<') {
+                            i += 2;
+                            ch = chNext2;
+                            chNext = styler.SafeGetCharAt(i + 1);
+                        } else if (chNext2 == '=') {
+                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            if (ch_tmp == '>') {  // <=> operator
+                                i += 3;
+                                ch = ch_tmp;
+                                chNext = styler.SafeGetCharAt(i + 1);
+                            } else {
+                                i += 2;
+                                ch = chNext2;
+                                chNext = ch_tmp;
+                            }
+                        } else {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        break;
+
+                    default:
+                        // Simple one-character operators
+                        advance_char(i, ch, chNext, chNext2);
+                        break;
+                    }
+                    if (doColoring) {
+                        styler.ColourTo(i, SCE_RB_SYMBOL);
+                        state = SCE_RB_DEFAULT;
+                    }
+                } else if (!preferRE) {
+                    // Don't color symbol strings (yet)
+                    // Just color the ":" and color rest as string
+                    styler.ColourTo(i, SCE_RB_SYMBOL);
+                    state = SCE_RB_DEFAULT;
+                } else {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = true;
+                }
+            } else if (ch == '%') {
+                styler.ColourTo(i - 1, state);
+                bool have_string = false;
+                if (strchr(q_chars, chNext) && !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
+                    have_string = true;
+                } else if (!isSafeWordcharOrHigh(chNext) && !iswhitespace(chNext) && !isEOLChar(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
+                    have_string = true;
+                }
+                if (!have_string) {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    // stay in default
+                    preferRE = true;
+                }
+            } else if (ch == '?') {
+                styler.ColourTo(i - 1, state);
+                if (iswhitespace(chNext) || chNext == '\n' || chNext == '\r') {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                } else {
+                    // It's the start of a character code escape sequence
+                    // Color it as a number.
+                    state = SCE_RB_NUMBER;
+                    is_real_number = false;
+                }
+            } else if (isoperator(ch) || ch == '.') {
+                styler.ColourTo(i - 1, state);
+                styler.ColourTo(i, SCE_RB_OPERATOR);
+                // If we're ending an expression or block,
+                // assume it ends an object, and the ambivalent
+                // constructs are binary operators
+                //
+                // So if we don't have one of these chars,
+                // we aren't ending an object exp'n, and ops
+                // like : << / are unary operators.
+
+                if (ch == '{') {
+                    ++brace_counts;
+                    preferRE = true;
+                } else if (ch == '}' && --brace_counts < 0
+                           && inner_string_count > 0) {
+                    styler.ColourTo(i, SCE_RB_OPERATOR);
+                    exitInnerExpression(inner_string_types,
+                                        inner_expn_brace_counts,
+                                        inner_quotes,
+                                        inner_string_count,
+                                        state, brace_counts, Quote);
+                } else {
+                    preferRE = (strchr(")}].", ch) == NULL);
+                }
+                // Stay in default state
+            } else if (isEOLChar(ch)) {
+                // Make sure it's a true line-end, with no backslash
+                if ((ch == '\r' || (ch == '\n' && chPrev != '\r'))
+                        && chPrev != '\\') {
+                    // Assume we've hit the end of the statement.
+                    preferRE = true;
+                }
+            }
+        } else if (state == SCE_RB_WORD) {
+            if (ch == '.' || !isSafeWordcharOrHigh(ch)) {
+                // Words include x? in all contexts,
+                // and <letters>= after either 'def' or a dot
+                // Move along until a complete word is on our left
+
+                // Default accessor treats '.' as word-chars,
+                // but we don't for now.
+
+                if (ch == '='
+                        && isSafeWordcharOrHigh(chPrev)
+                        && (chNext == '('
+                            || strchr(" \t\n\r", chNext) != NULL)
+                        && (!strcmp(prevWord, "def")
+                            || followsDot(styler.GetStartSegment(), styler))) {
+                    // <name>= is a name only when being def'd -- Get it the next time
+                    // This means that <name>=<name> is always lexed as
+                    // <name>, (op, =), <name>
+                } else if (ch == ':'
+                           && isSafeWordcharOrHigh(chPrev)
+                           && strchr(" \t\n\r", chNext) != NULL) {
+                    state = SCE_RB_SYMBOL;
+                } else if ((ch == '?' || ch == '!')
+                           && isSafeWordcharOrHigh(chPrev)
+                           && !isSafeWordcharOrHigh(chNext)) {
+                    // <name>? is a name -- Get it the next time
+                    // But <name>?<name> is always lexed as
+                    // <name>, (op, ?), <name>
+                    // Same with <name>! to indicate a method that
+                    // modifies its target
+                } else if (isEOLChar(ch)
+                           && isMatch(styler, lengthDoc, i - 7, "__END__")) {
+                    styler.ColourTo(i, SCE_RB_DATASECTION);
+                    state = SCE_RB_DATASECTION;
+                    // 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, keywords, styler, prevWord);
+                    switch (word_style) {
+                    case SCE_RB_WORD:
+                        preferRE = RE_CanFollowKeyword(prevWord);
+                        break;
+
+                    case SCE_RB_WORD_DEMOTED:
+                        preferRE = true;
+                        break;
+
+                    case SCE_RB_IDENTIFIER:
+                        if (isMatch(styler, lengthDoc, wordStartPos, "print")) {
+                            preferRE = true;
+                        } else if (isEOLChar(ch)) {
+                            preferRE = true;
+                        } else {
+                            preferRE = false;
+                        }
+                        break;
+                    default:
+                        preferRE = false;
+                    }
+                    if (ch == '.') {
+                        // We might be redefining an operator-method
+                        preferRE = false;
+                    }
+                    // And if it's the first
+                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                }
+            }
+        } else if (state == SCE_RB_NUMBER) {
+            if (!is_real_number) {
+                if (ch != '\\') {
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                } else if (strchr("\\ntrfvaebs", chNext)) {
+                    // Terminal escape sequence -- handle it next time
+                    // Nothing more to do this time through the loop
+                } else if (chNext == 'C' || chNext == 'M') {
+                    if (chNext2 != '-') {
+                        // \C or \M ends the sequence -- handle it next time
+                    } else {
+                        // Move from abc?\C-x
+                        //               ^
+                        // to
+                        //                 ^
+                        i += 2;
+                        ch = chNext2;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                    }
+                } else if (chNext == 'c') {
+                    // Stay here, \c is a combining sequence
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    // ?\x, including ?\\ is final.
+                    styler.ColourTo(i + 1, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                    advance_char(i, ch, chNext, chNext2);
+                }
+            } else if (isSafeAlnumOrHigh(ch) || ch == '_') {
+                // Keep going
+            } else if (ch == '.' && chNext == '.') {
+                ++numDots;
+                styler.ColourTo(i - 1, state);
+                redo_char(i, ch, chNext, chNext2, state); // pass by ref
+            } else if (ch == '.' && ++numDots == 1) {
+                // Keep going
+            } else {
+                styler.ColourTo(i - 1, state);
+                redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_COMMENTLINE) {
+            if (isEOLChar(ch)) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_DEFAULT;
+                // Use whatever setting we had going into the comment
+            }
+        } else if (state == SCE_RB_HERE_DELIM) {
+            // See the comment for SCE_RB_HERE_DELIM in LexPerl.cxx
+            // Slightly different: if we find an immediate '-',
+            // the target can appear indented.
+
+            if (HereDoc.State == 0) { // '<<' encountered
+                HereDoc.State = 1;
+                HereDoc.DelimiterLength = 0;
+                if (ch == '-' || ch == '~') {
+                    HereDoc.CanBeIndented = true;
+                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                } else {
+                    HereDoc.CanBeIndented = false;
+                }
+                if (isEOLChar(ch)) {
+                    // Bail out of doing a here doc if there's no target
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                } else {
+                    HereDoc.Quote = ch;
+
+                    if (ch == '\'' || ch == '"' || ch == '`') {
+                        HereDoc.Quoted = true;
+                        HereDoc.Delimiter[0] = '\0';
+                    } else {
+                        HereDoc.Quoted = false;
+                        HereDoc.Delimiter[0] = ch;
+                        HereDoc.Delimiter[1] = '\0';
+                        HereDoc.DelimiterLength = 1;
+                    }
+                }
+            } else if (HereDoc.State == 1) { // collect the delimiter
+                if (isEOLChar(ch)) {
+                    // End the quote now, and go back for more
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_RB_DEFAULT;
+                    i--;
+                    chNext = ch;
+                    preferRE = false;
+                } else if (HereDoc.Quoted) {
+                    if (ch == HereDoc.Quote) { // closing quote => end of delimiter
+                        styler.ColourTo(i, state);
+                        state = SCE_RB_DEFAULT;
+                        preferRE = false;
+                    } else {
+                        if (ch == '\\' && !isEOLChar(chNext)) {
+                            advance_char(i, ch, chNext, chNext2);
+                        }
+                        HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
+                        HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+                    }
+                } else { // an unquoted here-doc delimiter
+                    if (isSafeAlnumOrHigh(ch) || ch == '_') {
+                        HereDoc.Delimiter[HereDoc.DelimiterLength++] = ch;
+                        HereDoc.Delimiter[HereDoc.DelimiterLength] = '\0';
+                    } else {
+                        styler.ColourTo(i - 1, state);
+                        redo_char(i, ch, chNext, chNext2, state);
+                        preferRE = false;
+                    }
+                }
+                if (HereDoc.DelimiterLength >= static_cast<int>(sizeof(HereDoc.Delimiter)) - 1) {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_RB_ERROR;
+                    preferRE = false;
+                }
+            }
+        } else if (state == SCE_RB_HERE_Q) {
+            // 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) {
+                if (isEOLChar(chPrev)
+                        && isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
+                    styler.ColourTo(i - 1, state);
+                    i += static_cast<Sci_Position>(HereDoc.DelimiterLength) - 1;
+                    chNext = styler.SafeGetCharAt(i + 1);
+                    if (isEOLChar(chNext)) {
+                        styler.ColourTo(i, SCE_RB_HERE_DELIM);
+                        state = SCE_RB_DEFAULT;
+                        HereDoc.State = 0;
+                        preferRE = false;
+                    }
+                    // Otherwise we skipped through the here doc faster.
+                }
+            } else if (isEOLChar(chNext)
+                       && lookingAtHereDocDelim(styler,
+                                                i - HereDoc.DelimiterLength + 1,
+                                                lengthDoc,
+                                                HereDoc.Delimiter)) {
+                styler.ColourTo(i - 1 - HereDoc.DelimiterLength, state);
+                styler.ColourTo(i, SCE_RB_HERE_DELIM);
+                state = SCE_RB_DEFAULT;
+                preferRE = false;
+                HereDoc.State = 0;
+            }
+        } else if (state == SCE_RB_CLASS_VAR
+                   || state == SCE_RB_INSTANCE_VAR
+                   || state == SCE_RB_SYMBOL) {
+            if (state == SCE_RB_SYMBOL &&
+                    // FIDs suffices '?' and '!'
+                    (((ch == '!' || ch == '?') && chNext != '=') ||
+                     // identifier suffix '='
+                     (ch == '=' && (chNext != '~' && chNext != '>' &&
+                                    (chNext != '=' || chNext2 == '>'))))) {
+                styler.ColourTo(i, state);
+                state = SCE_RB_DEFAULT;
+                preferRE = false;
+            } else if (!isSafeWordcharOrHigh(ch)) {
+                styler.ColourTo(i - 1, state);
+                redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_GLOBAL) {
+            if (!isSafeWordcharOrHigh(ch)) {
+                // handle special globals here as well
+                if (chPrev == '$') {
+                    if (ch == '-') {
+                        // Include the next char, like $-a
+                        advance_char(i, ch, chNext, chNext2);
+                    }
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                } else {
+                    styler.ColourTo(i - 1, state);
+                    redo_char(i, ch, chNext, chNext2, state); // pass by ref
+                }
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_POD) {
+            // PODs end with ^=end\s, -- any whitespace can follow =end
+            if (strchr(" \t\n\r", ch) != NULL
+                    && i > 5
+                    && isEOLChar(styler[i - 5])
+                    && isMatch(styler, lengthDoc, i - 4, "=end")) {
+                styler.ColourTo(i - 1, state);
+                state = SCE_RB_DEFAULT;
+                preferRE = false;
+            }
+        } else if (state == SCE_RB_REGEX || state == SCE_RB_STRING_QR) {
+            if (ch == '\\' && Quote.Up != '\\') {
+                // Skip one
+                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == Quote.Down) {
+                Quote.Count--;
+                if (Quote.Count == 0) {
+                    // Include the options
+                    while (isSafeAlpha(chNext)) {
+                        i++;
+                        ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                    }
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                }
+            } else if (ch == Quote.Up) {
+                // Only if close quoter != open quoter
+                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);
+                } else {
+                    //todo: distinguish comments from pound chars
+                    // for now, handle as comment
+                    styler.ColourTo(i - 1, state);
+                    bool inEscape = false;
+                    while (++i < lengthDoc) {
+                        ch = styler.SafeGetCharAt(i);
+                        if (ch == '\\') {
+                            inEscape = true;
+                        } else if (isEOLChar(ch)) {
+                            // Comment inside a regex
+                            styler.ColourTo(i - 1, SCE_RB_COMMENTLINE);
+                            break;
+                        } else if (inEscape) {
+                            inEscape = false;  // don't look at char
+                        } else if (ch == Quote.Down) {
+                            // Have the regular handler deal with this
+                            // to get trailing modifiers.
+                            i--;
+                            ch = styler[i];
+                            break;
+                        }
+                    }
+                    chNext = styler.SafeGetCharAt(i + 1);
+                }
+            }
+            // 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 ||
+                   state == SCE_RB_STRING || state == SCE_RB_CHARACTER ||
+                   state == SCE_RB_BACKTICKS) {
+            if (!Quote.Down && !isspacechar(ch)) {
+                Quote.Open(ch);
+            } else if (ch == '\\' && Quote.Up != '\\') {
+                //Riddle me this: Is it safe to skip *every* escaped char?
+                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == Quote.Down) {
+                Quote.Count--;
+                if (Quote.Count == 0) {
+                    styler.ColourTo(i, state);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = false;
+                }
+            } 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);
+            }
+        }
+
+        if (state == SCE_RB_ERROR) {
+            break;
+        }
+        chPrev = ch;
+    }
+    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, keywords, styler, prevWord);
+    } else {
+        styler.ColourTo(lengthDoc - 1, state);
+    }
+}
+
+// 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)
+{
+    Sci_Position i;
+    styler.Flush();
+    for (i = pos - 1; i > 0; i--) {
+        if (actual_style(styler.StyleAt(i)) != word_state) {
+            i++;
+            break;
+        }
+    }
+    if (i < pos - MAX_KEYWORD_LENGTH) // overflow
+        i = pos - MAX_KEYWORD_LENGTH;
+    char *dst = prevWord;
+    for (; i <= pos; i++) {
+        *dst++ = styler[i];
+    }
+    *dst = 0;
+}
+
+static bool keywordIsAmbiguous(const char *prevWord)
+{
+    // Order from most likely used to least likely
+    // Lots of ways to do a loop in Ruby besides 'while/until'
+    if (!strcmp(prevWord, "if")
+            || !strcmp(prevWord, "do")
+            || !strcmp(prevWord, "while")
+            || !strcmp(prevWord, "unless")
+            || !strcmp(prevWord, "until")
+            || !strcmp(prevWord, "for")) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Demote keywords in the following conditions:
+// 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)
+{
+    if (word[0] == 'd' && word[1] == 'o' && !word[2]) {
+        return keywordDoStartsLoop(pos, styler);
+    }
+    char ch, chPrev, chPrev2;
+    int style = SCE_RB_DEFAULT;
+    Sci_Position lineStart = styler.GetLine(pos);
+    Sci_Position lineStartPosn = styler.LineStart(lineStart);
+    // We want to step backwards until we don't care about the current
+    // position. But first move lineStartPosn back behind any
+    // continuations immediately above word.
+    while (lineStartPosn > 0) {
+        ch = styler[lineStartPosn-1];
+        if (ch == '\n' || ch == '\r') {
+            chPrev  = styler.SafeGetCharAt(lineStartPosn-2);
+            chPrev2 = styler.SafeGetCharAt(lineStartPosn-3);
+            lineStart = styler.GetLine(lineStartPosn-1);
+            // If we find a continuation line, include it in our analysis.
+            if (chPrev == '\\') {
+                lineStartPosn = styler.LineStart(lineStart);
+            } else if (ch == '\n' && chPrev == '\r' && chPrev2 == '\\') {
+                lineStartPosn = styler.LineStart(lineStart);
+            } else {
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+
+    styler.Flush();
+    while (--pos >= lineStartPosn) {
+        style = actual_style(styler.StyleAt(pos));
+        if (style == SCE_RB_DEFAULT) {
+            if (iswhitespace(ch = styler[pos])) {
+                //continue
+            } else 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.
+
+                // 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);
+                if (chPrev == '\\') {
+                    pos-=1;  // gloss over the "\\"
+                    //continue
+                } else if (ch == '\n' && chPrev == '\r' && chPrev2 == '\\') {
+                    pos-=2;  // gloss over the "\\\r"
+                    //continue
+                } else {
+                    return false;
+                }
+            }
+        } else {
+            break;
+        }
+    }
+    if (pos < lineStartPosn) {
+        return false;
+    }
+    // First things where the action is unambiguous
+    switch (style) {
+    case SCE_RB_DEFAULT:
+    case SCE_RB_COMMENTLINE:
+    case SCE_RB_POD:
+    case SCE_RB_CLASSNAME:
+    case SCE_RB_DEFNAME:
+    case SCE_RB_MODULE_NAME:
+        return false;
+    case SCE_RB_OPERATOR:
+        break;
+    case SCE_RB_WORD:
+        // Watch out for uses of 'else if'
+        //XXX: Make a list of other keywords where 'if' isn't a modifier
+        //     and can appear legitimately
+        // Formulate this to avoid warnings from most compilers
+        if (strcmp(word, "if") == 0) {
+            char prevWord[MAX_KEYWORD_LENGTH + 1];
+            getPrevWord(pos, prevWord, styler, SCE_RB_WORD);
+            return strcmp(prevWord, "else") != 0;
+        }
+        return true;
+    default:
+        return true;
+    }
+    // Assume that if the keyword follows an operator,
+    // usually it's a block assignment, like
+    // a << if x then y else z
+
+    ch = styler[pos];
+    switch (ch) {
+    case ')':
+    case ']':
+    case '}':
+        return true;
+    default:
+        return false;
+    }
+}
+
+#define WHILE_BACKWARDS "elihw"
+#define UNTIL_BACKWARDS "litnu"
+#define FOR_BACKWARDS "rof"
+
+// 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);
+    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') {
+                // 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.
+                return false;
+            }
+        } else if (style == SCE_RB_WORD) {
+            // Check for while or until, but write the word in backwards
+            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
+            char *dst = prevWord;
+            int wordLen = 0;
+            Sci_Position start_word;
+            for (start_word = pos;
+                    start_word >= lineStartPosn && actual_style(styler.StyleAt(start_word)) == SCE_RB_WORD;
+                    start_word--) {
+                if (++wordLen < MAX_KEYWORD_LENGTH) {
+                    *dst++ = styler[start_word];
+                }
+            }
+            *dst = 0;
+            // Did we see our keyword?
+            if (!strcmp(prevWord, WHILE_BACKWARDS)
+                    || !strcmp(prevWord, UNTIL_BACKWARDS)
+                    || !strcmp(prevWord, FOR_BACKWARDS)) {
+                return true;
+            }
+            // We can move pos to the beginning of the keyword, and then
+            // accept another decrement, as we can never have two contiguous
+            // keywords:
+            // word1 word2
+            //           ^
+            //        <-  move to start_word
+            //      ^
+            //      <- loop decrement
+            //     ^  # pointing to end of word1 is fine
+            pos = start_word;
+        }
+    }
+    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;
+    for (Sci_Position i = pos; i < eol_pos; i++) {
+        char ch = styler[i];
+        if (ch == '#')
+            return true;
+        else if (ch != ' ' && ch != '\t')
+            return false;
+    }
+    return false;
+}
+
+/*
+ *  Folding Ruby
+ *
+ *  The language is quite complex to analyze without a full parse.
+ *  For example, this line shouldn't affect fold level:
+ *
+ *   print "hello" if feeling_friendly?
+ *
+ *  Neither should this:
+ *
+ *   print "hello" \
+ *      if feeling_friendly?
+ *
+ *
+ *  But this should:
+ *
+ *   if feeling_friendly?  #++
+ *     print "hello" \
+ *     print "goodbye"
+ *   end                   #--
+ *
+ *  So we cheat, by actually looking at the existing indentation
+ *  levels for each line, and just echoing it back.  Like Python.
+ *  Then if we get better at it, we'll take braces into consideration,
+ *  which always affect folding levels.
+
+ *  How the keywords should work:
+ *  No effect:
+ *  __FILE__ __LINE__ BEGIN END alias and
+ *  defined? false in nil not or self super then
+ *  true undef
+
+ *  Always increment:
+ *  begin  class def do for module when {
+ *
+ *  Always decrement:
+ *  end }
+ *
+ *  Increment if these start a statement
+ *  if unless until while -- do nothing if they're modifiers
+
+ *  These end a block if there's no modifier, but don't bother
+ *  break next redo retry return yield
+ *
+ *  These temporarily de-indent, but re-indent
+ *  case else elsif ensure rescue
+ *
+ *  This means that the folder reflects indentation rather
+ *  than setting it.  The language-service updates indentation
+ *  when users type return and finishes entering de-denters.
+ *
+ *  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) {
+    const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+
+    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
+                        false);
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelPrev = startPos == 0 ? 0 : (styler.LevelAt(lineCurrent)
+                                         & SC_FOLDLEVELNUMBERMASK
+                                         & ~SC_FOLDLEVELBASE);
+    int levelCurrent = levelPrev;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    int stylePrev = startPos <= 1 ? SCE_RB_DEFAULT : styler.StyleAt(startPos - 1);
+    bool buffer_ends_with_eol = false;
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+        /*Mutiline comment patch*/
+        if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
+            if (!IsCommentLine(lineCurrent - 1, styler)
+                    && IsCommentLine(lineCurrent + 1, styler))
+                levelCurrent++;
+            else if (IsCommentLine(lineCurrent - 1, styler)
+                     && !IsCommentLine(lineCurrent + 1, styler))
+                levelCurrent--;
+        }
+
+        if (style == SCE_RB_COMMENTLINE) {
+            if (foldComment && stylePrev != SCE_RB_COMMENTLINE) {
+                if (chNext == '{') {
+                    levelCurrent++;
+                } else if (chNext == '}' && levelCurrent > 0) {
+                    levelCurrent--;
+                }
+            }
+        } else if (style == SCE_RB_OPERATOR) {
+            if (strchr("[{(", ch)) {
+                levelCurrent++;
+            } else if (strchr(")}]", ch)) {
+                // Don't decrement below 0
+                if (levelCurrent > 0)
+                    levelCurrent--;
+            }
+        } else if (style == SCE_RB_WORD && styleNext != SCE_RB_WORD) {
+            // Look at the keyword on the left and decide what to do
+            char prevWord[MAX_KEYWORD_LENGTH + 1]; // 1 byte for zero
+            prevWord[0] = 0;
+            getPrevWord(i, prevWord, styler, SCE_RB_WORD);
+            if (!strcmp(prevWord, "end")) {
+                // Don't decrement below 0
+                if (levelCurrent > 0)
+                    levelCurrent--;
+            } else if (!strcmp(prevWord, "if")
+                       || !strcmp(prevWord, "def")
+                       || !strcmp(prevWord, "class")
+                       || !strcmp(prevWord, "module")
+                       || !strcmp(prevWord, "begin")
+                       || !strcmp(prevWord, "case")
+                       || !strcmp(prevWord, "do")
+                       || !strcmp(prevWord, "while")
+                       || !strcmp(prevWord, "unless")
+                       || !strcmp(prevWord, "until")
+                       || !strcmp(prevWord, "for")
+                      ) {
+                levelCurrent++;
+            }
+        } else if (style == SCE_RB_HERE_DELIM) {
+            if (styler.SafeGetCharAt(i-2) == '<' && styler.SafeGetCharAt(i-1) == '<') {
+                levelCurrent++;
+            } else if (styleNext == SCE_RB_DEFAULT) {
+                levelCurrent--;
+            }
+        }
+        if (atEOL) {
+            int lev = levelPrev;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if ((levelCurrent > levelPrev) && (visibleChars > 0))
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            styler.SetLevel(lineCurrent, lev|SC_FOLDLEVELBASE);
+            lineCurrent++;
+            levelPrev = levelCurrent;
+            visibleChars = 0;
+            buffer_ends_with_eol = true;
+        } else if (!isspacechar(ch)) {
+            visibleChars++;
+            buffer_ends_with_eol = false;
+        }
+        stylePrev = style;
+    }
+    // Fill in the real level of the next line, keeping the current flags as they will be filled in later
+    if (!buffer_ends_with_eol) {
+        int new_lev = levelCurrent;
+        if (visibleChars == 0 && foldCompact)
+            new_lev |= SC_FOLDLEVELWHITEFLAG;
+        if ((levelCurrent > levelPrev) && (visibleChars > 0))
+            new_lev |= SC_FOLDLEVELHEADERFLAG;
+        levelCurrent = new_lev;
+    }
+    styler.SetLevel(lineCurrent, levelCurrent|SC_FOLDLEVELBASE);
+}
+
+static const char *const rubyWordListDesc[] = {
+    "Keywords",
+    0
+};
+
+LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexRust.cxx b/scite-app/lexilla/lexers/LexRust.cxx
new file mode 100644
index 0000000..12a6d03
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexRust.cxx
@@ -0,0 +1,847 @@
+/** @file LexRust.cxx
+ ** Lexer for Rust.
+ **
+ ** Copyright (c) 2013 by SiegeLord <slabode@aim.com>
+ ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net>
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static const int NUM_RUST_KEYWORD_LISTS = 7;
+static const int MAX_RUST_IDENT_CHARS = 1023;
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_RUST_COMMENTBLOCK ||
+		   style == SCE_RUST_COMMENTBLOCKDOC;
+}
+
+// Options used for LexerRust
+struct OptionsRust {
+	bool fold;
+	bool foldSyntaxBased;
+	bool foldComment;
+	bool foldCommentMultiline;
+	bool foldCommentExplicit;
+	std::string foldExplicitStart;
+	std::string foldExplicitEnd;
+	bool foldExplicitAnywhere;
+	bool foldCompact;
+	int  foldAtElseInt;
+	bool foldAtElse;
+	OptionsRust() {
+		fold = false;
+		foldSyntaxBased = true;
+		foldComment = false;
+		foldCommentMultiline = true;
+		foldCommentExplicit = true;
+		foldExplicitStart = "";
+		foldExplicitEnd   = "";
+		foldExplicitAnywhere = false;
+		foldCompact = true;
+		foldAtElseInt = -1;
+		foldAtElse = false;
+	}
+};
+
+static const char * const rustWordLists[NUM_RUST_KEYWORD_LISTS + 1] = {
+			"Primary keywords and identifiers",
+			"Built in types",
+			"Other keywords",
+			"Keywords 4",
+			"Keywords 5",
+			"Keywords 6",
+			"Keywords 7",
+			0,
+		};
+
+struct OptionSetRust : public OptionSet<OptionsRust> {
+	OptionSetRust() {
+		DefineProperty("fold", &OptionsRust::fold);
+
+		DefineProperty("fold.comment", &OptionsRust::foldComment);
+
+		DefineProperty("fold.compact", &OptionsRust::foldCompact);
+
+		DefineProperty("fold.at.else", &OptionsRust::foldAtElse);
+
+		DefineProperty("fold.rust.syntax.based", &OptionsRust::foldSyntaxBased,
+			"Set this property to 0 to disable syntax based folding.");
+
+		DefineProperty("fold.rust.comment.multiline", &OptionsRust::foldCommentMultiline,
+			"Set this property to 0 to disable folding multi-line comments when fold.comment=1.");
+
+		DefineProperty("fold.rust.comment.explicit", &OptionsRust::foldCommentExplicit,
+			"Set this property to 0 to disable folding explicit fold points when fold.comment=1.");
+
+		DefineProperty("fold.rust.explicit.start", &OptionsRust::foldExplicitStart,
+			"The string to use for explicit fold start points, replacing the standard //{.");
+
+		DefineProperty("fold.rust.explicit.end", &OptionsRust::foldExplicitEnd,
+			"The string to use for explicit fold end points, replacing the standard //}.");
+
+		DefineProperty("fold.rust.explicit.anywhere", &OptionsRust::foldExplicitAnywhere,
+			"Set this property to 1 to enable explicit fold points anywhere, not just in line comments.");
+
+		DefineProperty("lexer.rust.fold.at.else", &OptionsRust::foldAtElseInt,
+			"This option enables Rust folding on a \"} else {\" line of an if statement.");
+
+		DefineWordListSets(rustWordLists);
+	}
+};
+
+class LexerRust : public DefaultLexer {
+	WordList keywords[NUM_RUST_KEYWORD_LISTS];
+	OptionsRust options;
+	OptionSetRust osRust;
+public:
+	LexerRust() : DefaultLexer("rust", SCLEX_RUST) {
+	}
+	virtual ~LexerRust() {
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	const char * SCI_METHOD PropertyNames() override {
+		return osRust.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osRust.PropertyType(name);
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osRust.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osRust.PropertyGet(key);
+	}
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osRust.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+	static ILexer5 *LexerFactoryRust() {
+		return new LexerRust();
+	}
+};
+
+Sci_Position SCI_METHOD LexerRust::PropertySet(const char *key, const char *val) {
+	if (osRust.PropertySet(&options, key, val)) {
+		return 0;
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerRust::WordListSet(int n, const char *wl) {
+	Sci_Position firstModification = -1;
+	if (n < NUM_RUST_KEYWORD_LISTS) {
+		WordList *wordListN = &keywords[n];
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+static bool IsWhitespace(int c) {
+    return c == ' ' || c == '\t' || c == '\r' || c == '\n';
+}
+
+/* This isn't quite right for Unicode identifiers */
+static bool IsIdentifierStart(int ch) {
+	return (IsASCII(ch) && (isalpha(ch) || ch == '_')) || !IsASCII(ch);
+}
+
+/* This isn't quite right for Unicode identifiers */
+static bool IsIdentifierContinue(int ch) {
+	return (IsASCII(ch) && (isalnum(ch) || ch == '_')) || !IsASCII(ch);
+}
+
+static void ScanWhitespace(Accessor& styler, Sci_Position& pos, Sci_Position max) {
+	while (IsWhitespace(styler.SafeGetCharAt(pos, '\0')) && pos < max) {
+		if (pos == styler.LineEnd(styler.GetLine(pos)))
+			styler.SetLineState(styler.GetLine(pos), 0);
+		pos++;
+	}
+	styler.ColourTo(pos-1, SCE_RUST_DEFAULT);
+}
+
+static void GrabString(char* s, Accessor& styler, Sci_Position start, Sci_Position len) {
+	for (Sci_Position ii = 0; ii < len; ii++)
+		s[ii] = styler[ii + start];
+	s[len] = '\0';
+}
+
+static void ScanIdentifier(Accessor& styler, Sci_Position& pos, WordList *keywords) {
+	Sci_Position start = pos;
+	while (IsIdentifierContinue(styler.SafeGetCharAt(pos, '\0')))
+		pos++;
+
+	if (styler.SafeGetCharAt(pos, '\0') == '!') {
+		pos++;
+		styler.ColourTo(pos - 1, SCE_RUST_MACRO);
+	} else {
+		char s[MAX_RUST_IDENT_CHARS + 1];
+		Sci_Position len = pos - start;
+		len = len > MAX_RUST_IDENT_CHARS ? MAX_RUST_IDENT_CHARS : len;
+		GrabString(s, styler, start, len);
+		bool keyword = false;
+		for (int ii = 0; ii < NUM_RUST_KEYWORD_LISTS; ii++) {
+			if (keywords[ii].InList(s)) {
+				styler.ColourTo(pos - 1, SCE_RUST_WORD + ii);
+				keyword = true;
+				break;
+			}
+		}
+		if (!keyword) {
+			styler.ColourTo(pos - 1, SCE_RUST_IDENTIFIER);
+		}
+	}
+}
+
+/* Scans a sequence of digits, returning true if it found any. */
+static bool ScanDigits(Accessor& styler, Sci_Position& pos, int base) {
+	Sci_Position old_pos = pos;
+	for (;;) {
+		int c = styler.SafeGetCharAt(pos, '\0');
+		if (IsADigit(c, base) || c == '_')
+			pos++;
+		else
+			break;
+	}
+	return old_pos != pos;
+}
+
+/* Scans an integer and floating point literals. */
+static void ScanNumber(Accessor& styler, Sci_Position& pos) {
+	int base = 10;
+	int c = styler.SafeGetCharAt(pos, '\0');
+	int n = styler.SafeGetCharAt(pos + 1, '\0');
+	bool error = false;
+	/* Scan the prefix, thus determining the base.
+	 * 10 is default if there's no prefix. */
+	if (c == '0' && n == 'x') {
+		pos += 2;
+		base = 16;
+	} else if (c == '0' && n == 'b') {
+		pos += 2;
+		base = 2;
+	} else if (c == '0' && n == 'o') {
+		pos += 2;
+		base = 8;
+	}
+
+	/* Scan initial digits. The literal is malformed if there are none. */
+	error |= !ScanDigits(styler, pos, base);
+	/* See if there's an integer suffix. We mimic the Rust's lexer
+	 * and munch it even if there was an error above. */
+	c = styler.SafeGetCharAt(pos, '\0');
+	if (c == 'u' || c == 'i') {
+		pos++;
+		c = styler.SafeGetCharAt(pos, '\0');
+		n = styler.SafeGetCharAt(pos + 1, '\0');
+		if (c == '8') {
+			pos++;
+		} else if (c == '1' && n == '6') {
+			pos += 2;
+		} else if (c == '3' && n == '2') {
+			pos += 2;
+		} else if (c == '6' && n == '4') {
+			pos += 2;
+		} else if (styler.Match(pos, "size")) {
+			pos += 4;
+		} else {
+			error = true;
+		}
+	/* See if it's a floating point literal. These literals have to be base 10.
+	 */
+	} else if (!error) {
+		/* If there's a period, it's a floating point literal unless it's
+		 * followed by an identifier (meaning this is a method call, e.g.
+		 * `1.foo()`) or another period, in which case it's a range (e.g. 1..2)
+		 */
+		n = styler.SafeGetCharAt(pos + 1, '\0');
+		if (c == '.' && !(IsIdentifierStart(n) || n == '.')) {
+			error |= base != 10;
+			pos++;
+			/* It's ok to have no digits after the period. */
+			ScanDigits(styler, pos, 10);
+		}
+
+		/* Look for the exponentiation. */
+		c = styler.SafeGetCharAt(pos, '\0');
+		if (c == 'e' || c == 'E') {
+			error |= base != 10;
+			pos++;
+			c = styler.SafeGetCharAt(pos, '\0');
+			if (c == '-' || c == '+')
+				pos++;
+			/* It is invalid to have no digits in the exponent. */
+			error |= !ScanDigits(styler, pos, 10);
+		}
+
+		/* Scan the floating point suffix. */
+		c = styler.SafeGetCharAt(pos, '\0');
+		if (c == 'f') {
+			error |= base != 10;
+			pos++;
+			c = styler.SafeGetCharAt(pos, '\0');
+			n = styler.SafeGetCharAt(pos + 1, '\0');
+			if (c == '3' && n == '2') {
+				pos += 2;
+			} else if (c == '6' && n == '4') {
+				pos += 2;
+			} else {
+				error = true;
+			}
+		}
+	}
+
+	if (error)
+		styler.ColourTo(pos - 1, SCE_RUST_LEXERROR);
+	else
+		styler.ColourTo(pos - 1, SCE_RUST_NUMBER);
+}
+
+static bool IsOneCharOperator(int c) {
+	return c == ';' || c == ',' || c == '(' || c == ')'
+	    || c == '{' || c == '}' || c == '[' || c == ']'
+	    || c == '@' || c == '#' || c == '~' || c == '+'
+	    || c == '*' || c == '/' || c == '^' || c == '%'
+	    || c == '.' || c == ':' || c == '!' || c == '<'
+	    || c == '>' || c == '=' || c == '-' || c == '&'
+	    || c == '|' || c == '$' || c == '?';
+}
+
+static bool IsTwoCharOperator(int c, int n) {
+	return (c == '.' && n == '.') || (c == ':' && n == ':')
+	    || (c == '!' && n == '=') || (c == '<' && n == '<')
+	    || (c == '<' && n == '=') || (c == '>' && n == '>')
+	    || (c == '>' && n == '=') || (c == '=' && n == '=')
+	    || (c == '=' && n == '>') || (c == '-' && n == '>')
+	    || (c == '&' && n == '&') || (c == '|' && n == '|')
+	    || (c == '-' && n == '=') || (c == '&' && n == '=')
+	    || (c == '|' && n == '=') || (c == '+' && n == '=')
+	    || (c == '*' && n == '=') || (c == '/' && n == '=')
+	    || (c == '^' && n == '=') || (c == '%' && n == '=');
+}
+
+static bool IsThreeCharOperator(int c, int n, int n2) {
+	return (c == '<' && n == '<' && n2 == '=')
+	    || (c == '>' && n == '>' && n2 == '=');
+}
+
+static bool IsValidCharacterEscape(int c) {
+	return c == 'n'  || c == 'r' || c == 't' || c == '\\'
+	    || c == '\'' || c == '"' || c == '0';
+}
+
+static bool IsValidStringEscape(int c) {
+	return IsValidCharacterEscape(c) || c == '\n' || c == '\r';
+}
+
+static bool ScanNumericEscape(Accessor &styler, Sci_Position& pos, Sci_Position num_digits, bool stop_asap) {
+	for (;;) {
+		int c = styler.SafeGetCharAt(pos, '\0');
+		if (!IsADigit(c, 16))
+			break;
+		num_digits--;
+		pos++;
+		if (num_digits == 0 && stop_asap)
+			return true;
+	}
+	if (num_digits == 0) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/* This is overly permissive for character literals in order to accept UTF-8 encoded
+ * character literals. */
+static void ScanCharacterLiteralOrLifetime(Accessor &styler, Sci_Position& pos, bool ascii_only) {
+	pos++;
+	int c = styler.SafeGetCharAt(pos, '\0');
+	int n = styler.SafeGetCharAt(pos + 1, '\0');
+	bool done = false;
+	bool valid_lifetime = !ascii_only && IsIdentifierStart(c);
+	bool valid_char = true;
+	bool first = true;
+	while (!done) {
+		switch (c) {
+			case '\\':
+				done = true;
+				if (IsValidCharacterEscape(n)) {
+					pos += 2;
+				} else if (n == 'x') {
+					pos += 2;
+					valid_char = ScanNumericEscape(styler, pos, 2, false);
+				} else if (n == 'u' && !ascii_only) {
+					pos += 2;
+					if (styler.SafeGetCharAt(pos, '\0') != '{') {
+						// old-style
+						valid_char = ScanNumericEscape(styler, pos, 4, false);
+					} else {
+						int n_digits = 0;
+						while (IsADigit(styler.SafeGetCharAt(++pos, '\0'), 16) && n_digits++ < 6) {
+						}
+						if (n_digits > 0 && styler.SafeGetCharAt(pos, '\0') == '}')
+							pos++;
+						else
+							valid_char = false;
+					}
+				} else if (n == 'U' && !ascii_only) {
+					pos += 2;
+					valid_char = ScanNumericEscape(styler, pos, 8, false);
+				} else {
+					valid_char = false;
+				}
+				break;
+			case '\'':
+				valid_char = !first;
+				done = true;
+				break;
+			case '\t':
+			case '\n':
+			case '\r':
+			case '\0':
+				valid_char = false;
+				done = true;
+				break;
+			default:
+				if (ascii_only && !IsASCII((char)c)) {
+					done = true;
+					valid_char = false;
+				} else if (!IsIdentifierContinue(c) && !first) {
+					done = true;
+				} else {
+					pos++;
+				}
+				break;
+		}
+		c = styler.SafeGetCharAt(pos, '\0');
+		n = styler.SafeGetCharAt(pos + 1, '\0');
+
+		first = false;
+	}
+	if (styler.SafeGetCharAt(pos, '\0') == '\'') {
+		valid_lifetime = false;
+	} else {
+		valid_char = false;
+	}
+	if (valid_lifetime) {
+		styler.ColourTo(pos - 1, SCE_RUST_LIFETIME);
+	} else if (valid_char) {
+		pos++;
+		styler.ColourTo(pos - 1, ascii_only ? SCE_RUST_BYTECHARACTER : SCE_RUST_CHARACTER);
+	} else {
+		styler.ColourTo(pos - 1, SCE_RUST_LEXERROR);
+	}
+}
+
+enum CommentState {
+	UnknownComment,
+	DocComment,
+	NotDocComment
+};
+
+/*
+ * The rule for block-doc comments is as follows: /xxN and /x! (where x is an asterisk, N is a non-asterisk) start doc comments.
+ * Otherwise it's a regular comment.
+ */
+static void ResumeBlockComment(Accessor &styler, Sci_Position& pos, Sci_Position max, CommentState state, int level) {
+	int c = styler.SafeGetCharAt(pos, '\0');
+	bool maybe_doc_comment = false;
+	if (c == '*') {
+		int n = styler.SafeGetCharAt(pos + 1, '\0');
+		if (n != '*' && n != '/') {
+			maybe_doc_comment = true;
+		}
+	} else if (c == '!') {
+		maybe_doc_comment = true;
+	}
+
+	for (;;) {
+		int n = styler.SafeGetCharAt(pos + 1, '\0');
+		if (pos == styler.LineEnd(styler.GetLine(pos)))
+			styler.SetLineState(styler.GetLine(pos), level);
+		if (c == '*') {
+			pos++;
+			if (n == '/') {
+				pos++;
+				level--;
+				if (level == 0) {
+					styler.SetLineState(styler.GetLine(pos), 0);
+					if (state == DocComment || (state == UnknownComment && maybe_doc_comment))
+						styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC);
+					else
+						styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK);
+					break;
+				}
+			}
+		} else if (c == '/') {
+			pos++;
+			if (n == '*') {
+				pos++;
+				level++;
+			}
+		}
+		else {
+			pos++;
+		}
+		if (pos >= max) {
+			if (state == DocComment || (state == UnknownComment && maybe_doc_comment))
+				styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC);
+			else
+				styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK);
+			break;
+		}
+		c = styler.SafeGetCharAt(pos, '\0');
+	}
+}
+
+/*
+ * The rule for line-doc comments is as follows... ///N and //! (where N is a non slash) start doc comments.
+ * Otherwise it's a normal line comment.
+ */
+static void ResumeLineComment(Accessor &styler, Sci_Position& pos, Sci_Position max, CommentState state) {
+	bool maybe_doc_comment = false;
+	int c = styler.SafeGetCharAt(pos, '\0');
+	if (c == '/') {
+		if (pos < max) {
+			pos++;
+			c = styler.SafeGetCharAt(pos, '\0');
+			if (c != '/') {
+				maybe_doc_comment = true;
+			}
+		}
+	} else if (c == '!') {
+		maybe_doc_comment = true;
+	}
+
+	while (pos < max && c != '\n') {
+		if (pos == styler.LineEnd(styler.GetLine(pos)))
+			styler.SetLineState(styler.GetLine(pos), 0);
+		pos++;
+		c = styler.SafeGetCharAt(pos, '\0');
+	}
+
+	if (state == DocComment || (state == UnknownComment && maybe_doc_comment))
+		styler.ColourTo(pos - 1, SCE_RUST_COMMENTLINEDOC);
+	else
+		styler.ColourTo(pos - 1, SCE_RUST_COMMENTLINE);
+}
+
+static void ScanComments(Accessor &styler, Sci_Position& pos, Sci_Position max) {
+	pos++;
+	int c = styler.SafeGetCharAt(pos, '\0');
+	pos++;
+	if (c == '/')
+		ResumeLineComment(styler, pos, max, UnknownComment);
+	else if (c == '*')
+		ResumeBlockComment(styler, pos, max, UnknownComment, 1);
+}
+
+static void ResumeString(Accessor &styler, Sci_Position& pos, Sci_Position max, bool ascii_only) {
+	int c = styler.SafeGetCharAt(pos, '\0');
+	bool error = false;
+	while (c != '"' && !error) {
+		if (pos >= max) {
+			error = true;
+			break;
+		}
+		if (pos == styler.LineEnd(styler.GetLine(pos)))
+			styler.SetLineState(styler.GetLine(pos), 0);
+		if (c == '\\') {
+			int n = styler.SafeGetCharAt(pos + 1, '\0');
+			if (IsValidStringEscape(n)) {
+				pos += 2;
+			} else if (n == 'x') {
+				pos += 2;
+				error = !ScanNumericEscape(styler, pos, 2, true);
+			} else if (n == 'u' && !ascii_only) {
+				pos += 2;
+				if (styler.SafeGetCharAt(pos, '\0') != '{') {
+					// old-style
+					error = !ScanNumericEscape(styler, pos, 4, true);
+				} else {
+					int n_digits = 0;
+					while (IsADigit(styler.SafeGetCharAt(++pos, '\0'), 16) && n_digits++ < 6) {
+					}
+					if (n_digits > 0 && styler.SafeGetCharAt(pos, '\0') == '}')
+						pos++;
+					else
+						error = true;
+				}
+			} else if (n == 'U' && !ascii_only) {
+				pos += 2;
+				error = !ScanNumericEscape(styler, pos, 8, true);
+			} else {
+				pos += 1;
+				error = true;
+			}
+		} else {
+			if (ascii_only && !IsASCII((char)c))
+				error = true;
+			else
+				pos++;
+		}
+		c = styler.SafeGetCharAt(pos, '\0');
+	}
+	if (!error)
+		pos++;
+	styler.ColourTo(pos - 1, ascii_only ? SCE_RUST_BYTESTRING : SCE_RUST_STRING);
+}
+
+static void ResumeRawString(Accessor &styler, Sci_Position& pos, Sci_Position max, int num_hashes, bool ascii_only) {
+	for (;;) {
+		if (pos == styler.LineEnd(styler.GetLine(pos)))
+			styler.SetLineState(styler.GetLine(pos), num_hashes);
+
+		int c = styler.SafeGetCharAt(pos, '\0');
+		if (c == '"') {
+			pos++;
+			int trailing_num_hashes = 0;
+			while (styler.SafeGetCharAt(pos, '\0') == '#' && trailing_num_hashes < num_hashes) {
+				trailing_num_hashes++;
+				pos++;
+			}
+			if (trailing_num_hashes == num_hashes) {
+				styler.SetLineState(styler.GetLine(pos), 0);
+				break;
+			}
+		} else if (pos >= max) {
+			break;
+		} else {
+			if (ascii_only && !IsASCII((char)c))
+				break;
+			pos++;
+		}
+	}
+	styler.ColourTo(pos - 1, ascii_only ? SCE_RUST_BYTESTRINGR : SCE_RUST_STRINGR);
+}
+
+static void ScanRawString(Accessor &styler, Sci_Position& pos, Sci_Position max, bool ascii_only) {
+	pos++;
+	int num_hashes = 0;
+	while (styler.SafeGetCharAt(pos, '\0') == '#') {
+		num_hashes++;
+		pos++;
+	}
+	if (styler.SafeGetCharAt(pos, '\0') != '"') {
+		styler.ColourTo(pos - 1, SCE_RUST_LEXERROR);
+	} else {
+		pos++;
+		ResumeRawString(styler, pos, max, num_hashes, ascii_only);
+	}
+}
+
+void SCI_METHOD LexerRust::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	PropSetSimple props;
+	Accessor styler(pAccess, &props);
+	Sci_Position pos = startPos;
+	Sci_Position max = pos + length;
+
+	styler.StartAt(pos);
+	styler.StartSegment(pos);
+
+	if (initStyle == SCE_RUST_COMMENTBLOCK || initStyle == SCE_RUST_COMMENTBLOCKDOC) {
+		ResumeBlockComment(styler, pos, max, initStyle == SCE_RUST_COMMENTBLOCKDOC ? DocComment : NotDocComment, styler.GetLineState(styler.GetLine(pos) - 1));
+	} else if (initStyle == SCE_RUST_COMMENTLINE || initStyle == SCE_RUST_COMMENTLINEDOC) {
+		ResumeLineComment(styler, pos, max, initStyle == SCE_RUST_COMMENTLINEDOC ? DocComment : NotDocComment);
+	} else if (initStyle == SCE_RUST_STRING) {
+		ResumeString(styler, pos, max, false);
+	} else if (initStyle == SCE_RUST_BYTESTRING) {
+		ResumeString(styler, pos, max, true);
+	} else if (initStyle == SCE_RUST_STRINGR) {
+		ResumeRawString(styler, pos, max, styler.GetLineState(styler.GetLine(pos) - 1), false);
+	} else if (initStyle == SCE_RUST_BYTESTRINGR) {
+		ResumeRawString(styler, pos, max, styler.GetLineState(styler.GetLine(pos) - 1), true);
+	}
+
+	while (pos < max) {
+		int c = styler.SafeGetCharAt(pos, '\0');
+		int n = styler.SafeGetCharAt(pos + 1, '\0');
+		int n2 = styler.SafeGetCharAt(pos + 2, '\0');
+
+		if (pos == 0 && c == '#' && n == '!' && n2 != '[') {
+			pos += 2;
+			ResumeLineComment(styler, pos, max, NotDocComment);
+		} else if (IsWhitespace(c)) {
+			ScanWhitespace(styler, pos, max);
+		} else if (c == '/' && (n == '/' || n == '*')) {
+			ScanComments(styler, pos, max);
+		} else if (c == 'r' && (n == '#' || n == '"')) {
+			ScanRawString(styler, pos, max, false);
+		} else if (c == 'b' && n == 'r' && (n2 == '#' || n2 == '"')) {
+			pos++;
+			ScanRawString(styler, pos, max, true);
+		} else if (c == 'b' && n == '"') {
+			pos += 2;
+			ResumeString(styler, pos, max, true);
+		} else if (c == 'b' && n == '\'') {
+			pos++;
+			ScanCharacterLiteralOrLifetime(styler, pos, true);
+		} else if (IsIdentifierStart(c)) {
+			ScanIdentifier(styler, pos, keywords);
+		} else if (IsADigit(c)) {
+			ScanNumber(styler, pos);
+		} else if (IsThreeCharOperator(c, n, n2)) {
+			pos += 3;
+			styler.ColourTo(pos - 1, SCE_RUST_OPERATOR);
+		} else if (IsTwoCharOperator(c, n)) {
+			pos += 2;
+			styler.ColourTo(pos - 1, SCE_RUST_OPERATOR);
+		} else if (IsOneCharOperator(c)) {
+			pos++;
+			styler.ColourTo(pos - 1, SCE_RUST_OPERATOR);
+		} else if (c == '\'') {
+			ScanCharacterLiteralOrLifetime(styler, pos, false);
+		} else if (c == '"') {
+			pos++;
+			ResumeString(styler, pos, max, false);
+		} else {
+			pos++;
+			styler.ColourTo(pos - 1, SCE_RUST_LEXERROR);
+		}
+	}
+	styler.ColourTo(pos - 1, SCE_RUST_DEFAULT);
+	styler.Flush();
+}
+
+void SCI_METHOD LexerRust::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+	if (!options.fold)
+		return;
+
+	LexAccessor styler(pAccess);
+
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	bool inLineComment = false;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	Sci_PositionU lineStartNext = styler.LineStart(lineCurrent+1);
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty();
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = i == (lineStartNext-1);
+		if ((style == SCE_RUST_COMMENTLINE) || (style == SCE_RUST_COMMENTLINEDOC))
+			inLineComment = true;
+		if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style) && !inLineComment) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (options.foldComment && options.foldCommentExplicit && ((style == SCE_RUST_COMMENTLINE) || options.foldExplicitAnywhere)) {
+			if (userDefinedFoldMarkers) {
+				if (styler.Match(i, options.foldExplicitStart.c_str())) {
+					levelNext++;
+				} else if (styler.Match(i, options.foldExplicitEnd.c_str())) {
+					levelNext--;
+				}
+			} else {
+				if ((ch == '/') && (chNext == '/')) {
+					char chNext2 = styler.SafeGetCharAt(i + 2);
+					if (chNext2 == '{') {
+						levelNext++;
+					} else if (chNext2 == '}') {
+						levelNext--;
+					}
+				}
+			}
+		}
+		if (options.foldSyntaxBased && (style == SCE_RUST_OPERATOR)) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (!IsASpace(ch))
+			visibleChars++;
+		if (atEOL || (i == endPos-1)) {
+			int levelUse = levelCurrent;
+			if (options.foldSyntaxBased && options.foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			lineStartNext = styler.LineStart(lineCurrent+1);
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
+				// There is an empty line at end of file so give it same level and empty
+				styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+			}
+			visibleChars = 0;
+			inLineComment = false;
+		}
+	}
+}
+
+LexerModule lmRust(SCLEX_RUST, LexerRust::LexerFactoryRust, "rust", rustWordLists);
diff --git a/scite-app/lexilla/lexers/LexSAS.cxx b/scite-app/lexilla/lexers/LexSAS.cxx
new file mode 100644
index 0000000..dea62ed
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSAS.cxx
@@ -0,0 +1,223 @@
+// Scintilla source code edit control
+/** @file LexSAS.cxx
+ ** Lexer for SAS
+ **/
+// Author: Luke Rasmussen (luke.rasmussen@gmail.com)
+//
+// The License.txt file describes the conditions under which this software may
+// be distributed.
+//
+// Developed as part of the StatTag project at Northwestern University Feinberg
+// School of Medicine with funding from Northwestern University Clinical and
+// Translational Sciences Institute through CTSA grant UL1TR001422.  This work
+// has not been reviewed or endorsed by NCATS or the NIH.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseSASDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &blockKeywords = *keywordlists[1];
+    WordList &functionKeywords = *keywordlists[2];
+    WordList &statements = *keywordlists[3];
+
+    CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+    CharacterSet setMacroStart(CharacterSet::setNone, "%");
+    CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+    CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+    bool lineHasNonCommentChar = false;
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+            lineHasNonCommentChar = false;
+        }
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+            case SCE_SAS_OPERATOR:
+                sc.SetState(SCE_SAS_DEFAULT);
+                break;
+            case SCE_SAS_NUMBER:
+                // We accept almost anything because of hex. and number suffixes
+                if (!setWord.Contains(sc.ch)) {
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_MACRO:
+              if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                char s[1000];
+                sc.GetCurrentLowered(s, sizeof(s));
+                if (keywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_MACRO_KEYWORD);
+                }
+                else if (blockKeywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_BLOCK_KEYWORD);
+                }
+                else if (functionKeywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_MACRO_FUNCTION);
+                }
+                sc.SetState(SCE_SAS_DEFAULT);
+              }
+              break;
+            case SCE_SAS_IDENTIFIER:
+                if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                    char s[1000];
+                    sc.GetCurrentLowered(s, sizeof(s));
+                    if (statements.InList(s)) {
+                      sc.ChangeState(SCE_SAS_STATEMENT);
+                    }
+                    else if(blockKeywords.InList(s)) {
+                      sc.ChangeState(SCE_SAS_BLOCK_KEYWORD);
+                    }
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_COMMENTBLOCK:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_COMMENT:
+            case SCE_SAS_COMMENTLINE:
+                if (sc.Match(';')) {
+                    sc.Forward();
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_STRING:
+                if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_SAS_DEFAULT);
+                }
+                break;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_SAS_DEFAULT) {
+            if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_NUMBER);
+            }
+            else if (setWordStart.Contains(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_IDENTIFIER);
+            }
+            else if (sc.Match('*') && !lineHasNonCommentChar) {
+                sc.SetState(SCE_SAS_COMMENT);
+            }
+            else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_SAS_COMMENTBLOCK);
+                sc.Forward();	// Eat the * so it isn't used for the end of the comment
+            }
+            else if (sc.Match('/', '/')) {
+                sc.SetState(SCE_SAS_COMMENTLINE);
+            }
+            else if (sc.ch == '\"') {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_STRING);
+            }
+            else if (setMacroStart.Contains(sc.ch)) {
+              lineHasNonCommentChar = true;
+              sc.SetState(SCE_SAS_MACRO);
+            }
+            else if (isoperator(static_cast<char>(sc.ch))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_OPERATOR);
+            }
+        }
+    }
+
+    sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldSASDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+    Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_R_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            }
+            else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+
+static const char * const SASWordLists[] = {
+    "Language Keywords",
+	  "Macro Keywords",
+    "Types",
+    0,
+};
+
+LexerModule lmSAS(SCLEX_SAS, ColouriseSASDoc, "sas", FoldSASDoc, SASWordLists);
diff --git a/scite-app/lexilla/lexers/LexSML.cxx b/scite-app/lexilla/lexers/LexSML.cxx
new file mode 100644
index 0000000..d4ccc94
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSML.cxx
@@ -0,0 +1,229 @@
+// Scintilla source code edit control
+/** @file LexSML.cxx
+ ** Lexer for SML.
+ **/
+// Copyright 2009 by James Moffatt and Yuzhou Xin
+// Modified from LexCaml.cxx by Robert Roessler <robertr@rftp.com> Copyright 2005
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wcomma"
+#endif
+
+inline int  issml(int c) {return isalnum(c) || c == '_';}
+inline int issmlf(int c) {return isalpha(c) || c == '_';}
+inline int issmld(int c) {return isdigit(c) || c == '_';}
+
+
+using namespace Lexilla;
+
+static void ColouriseSMLDoc(
+	Sci_PositionU startPos, Sci_Position length,
+	int initStyle,
+	WordList *keywordlists[],
+	Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler);
+	int nesting = 0;
+	if (sc.state < SCE_SML_STRING)
+		sc.state = SCE_SML_DEFAULT;
+	if (sc.state >= SCE_SML_COMMENT)
+		nesting = (sc.state & 0x0f) - SCE_SML_COMMENT;
+
+	Sci_PositionU chToken = 0;
+	int chBase = 0, chLit = 0;
+	WordList& keywords  = *keywordlists[0];
+	WordList& keywords2 = *keywordlists[1];
+	WordList& keywords3 = *keywordlists[2];
+	const int useMagic = styler.GetPropertyInt("lexer.caml.magic", 0);
+
+	while (sc.More()) {
+		int state2 = -1;
+		Sci_Position chColor = sc.currentPos - 1;
+		bool advance = true;
+
+		switch (sc.state & 0x0f) {
+		case SCE_SML_DEFAULT:
+			chToken = sc.currentPos;
+			if (issmlf(sc.ch))
+				state2 = SCE_SML_IDENTIFIER;
+			else if (sc.Match('`') && issmlf(sc.chNext))
+				state2 = SCE_SML_TAGNAME;
+			else if (sc.Match('#')&&isdigit(sc.chNext))
+					state2 = SCE_SML_LINENUM;
+			else if (sc.Match('#','\"')){
+					state2 = SCE_SML_CHAR,chLit = 0;
+					sc.Forward();
+
+				}
+			else if (isdigit(sc.ch)) {
+				state2 = SCE_SML_NUMBER, chBase = 10;
+				if (sc.Match('0') && strchr("xX", sc.chNext))
+					chBase = 16, sc.Forward();}
+			else if (sc.Match('\"')&&sc.chPrev!='#')
+				state2 = SCE_SML_STRING;
+			else if (sc.Match('(', '*')){
+				state2 = SCE_SML_COMMENT,
+					sc.ch = ' ',
+					sc.Forward();}
+			else if (strchr("!~"
+					"=<>@^+-*/"
+					"()[];,:.#", sc.ch))
+				state2 = SCE_SML_OPERATOR;
+			break;
+
+		case SCE_SML_IDENTIFIER:
+			if (!(issml(sc.ch) || sc.Match('\''))) {
+				const Sci_Position n = sc.currentPos - chToken;
+				if (n < 24) {
+					char t[24];
+					for (Sci_Position i = -n; i < 0; i++)
+						t[n + i] = static_cast<char>(sc.GetRelative(i));
+					t[n] = '\0';
+					if ((n == 1 && sc.chPrev == '_') || keywords.InList(t))
+						sc.ChangeState(SCE_SML_KEYWORD);
+					else if (keywords2.InList(t))
+						sc.ChangeState(SCE_SML_KEYWORD2);
+					else if (keywords3.InList(t))
+						sc.ChangeState(SCE_SML_KEYWORD3);
+				}
+				state2 = SCE_SML_DEFAULT, advance = false;
+			}
+			break;
+
+		case SCE_SML_TAGNAME:
+			if (!(issml(sc.ch) || sc.Match('\'')))
+				state2 = SCE_SML_DEFAULT, advance = false;
+			break;
+
+		case SCE_SML_LINENUM:
+			if (!isdigit(sc.ch))
+				state2 = SCE_SML_DEFAULT, advance = false;
+			break;
+
+		case SCE_SML_OPERATOR: {
+			const char* o = 0;
+			if (issml(sc.ch) || isspace(sc.ch)
+				|| (o = strchr(")]};,\'\"`#", sc.ch),o)
+				|| !strchr("!$%&*+-./:<=>?@^|~", sc.ch)) {
+				if (o && strchr(")]};,", sc.ch)) {
+					if ((sc.Match(')') && sc.chPrev == '(')
+						|| (sc.Match(']') && sc.chPrev == '['))
+						sc.ChangeState(SCE_SML_KEYWORD);
+					chColor++;
+				} else
+					advance = false;
+				state2 = SCE_SML_DEFAULT;
+			}
+			break;
+		}
+
+		case SCE_SML_NUMBER:
+			if (issmld(sc.ch) || IsADigit(sc.ch, chBase))
+				break;
+			if ((sc.Match('l') || sc.Match('L') || sc.Match('n'))
+				&& (issmld(sc.chPrev) || IsADigit(sc.chPrev, chBase)))
+				break;
+			if (chBase == 10) {
+				if (sc.Match('.') && issmld(sc.chPrev))
+					break;
+				if ((sc.Match('e') || sc.Match('E'))
+					&& (issmld(sc.chPrev) || sc.chPrev == '.'))
+					break;
+				if ((sc.Match('+') || sc.Match('-'))
+					&& (sc.chPrev == 'e' || sc.chPrev == 'E'))
+					break;
+			}
+			state2 = SCE_SML_DEFAULT, advance = false;
+			break;
+
+		case SCE_SML_CHAR:
+			if (sc.Match('\\')) {
+				chLit = 1;
+				if (sc.chPrev == '\\')
+					sc.ch = ' ';
+			} else if ((sc.Match('\"') && sc.chPrev != '\\') || sc.atLineEnd) {
+				state2 = SCE_SML_DEFAULT;
+				chLit = 1;
+				if (sc.Match('\"'))
+					chColor++;
+				else
+					sc.ChangeState(SCE_SML_IDENTIFIER);
+			} else if (chLit < 1 && sc.currentPos - chToken >= 3)
+				sc.ChangeState(SCE_SML_IDENTIFIER), advance = false;
+			break;
+
+		case SCE_SML_STRING:
+			if (sc.Match('\\') && sc.chPrev == '\\')
+				sc.ch = ' ';
+			else if (sc.Match('\"') && sc.chPrev != '\\')
+				state2 = SCE_SML_DEFAULT, chColor++;
+			break;
+
+		case SCE_SML_COMMENT:
+		case SCE_SML_COMMENT1:
+		case SCE_SML_COMMENT2:
+		case SCE_SML_COMMENT3:
+			if (sc.Match('(', '*'))
+				state2 = sc.state + 1, chToken = sc.currentPos,
+					sc.ch = ' ',
+					sc.Forward(), nesting++;
+			else if (sc.Match(')') && sc.chPrev == '*') {
+				if (nesting)
+					state2 = (sc.state & 0x0f) - 1, chToken = 0, nesting--;
+				else
+					state2 = SCE_SML_DEFAULT;
+				chColor++;
+			} else if (useMagic && sc.currentPos - chToken == 4
+				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
+				sc.state |= 0x10;
+			break;
+		}
+
+		if (state2 >= 0)
+			styler.ColourTo(chColor, sc.state), sc.ChangeState(state2);
+		if (advance)
+			sc.Forward();
+	}
+
+	sc.Complete();
+}
+
+static void FoldSMLDoc(
+	Sci_PositionU, Sci_Position,
+	int,
+	WordList *[],
+	Accessor &)
+{
+}
+
+static const char * const SMLWordListDesc[] = {
+	"Keywords",
+	"Keywords2",
+	"Keywords3",
+	0
+};
+
+LexerModule lmSML(SCLEX_SML, ColouriseSMLDoc, "SML", FoldSMLDoc, SMLWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexSQL.cxx b/scite-app/lexilla/lexers/LexSQL.cxx
new file mode 100644
index 0000000..027d2f2
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSQL.cxx
@@ -0,0 +1,973 @@
+//-*- coding: utf-8 -*-
+// Scintilla source code edit control
+/** @file LexSQL.cxx
+ ** Lexer for SQL, including PL/SQL and SQL*Plus.
+ ** Improved by Jérôme LAFORGE <jerome.laforge_AT_gmail_DOT_com> from 2010 to 2012.
+ **/
+// Copyright 1998-2012 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "SparseState.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+static inline bool IsAWordChar(int ch, bool sqlAllowDottedWord) {
+	if (!sqlAllowDottedWord)
+		return (ch < 0x80) && (isalnum(ch) || ch == '_');
+	else
+		return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return (ch < 0x80) && (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsADoxygenChar(int ch) {
+	return (islower(ch) || ch == '$' || ch == '@' ||
+	        ch == '\\' || ch == '&' || ch == '<' ||
+	        ch == '>' || ch == '#' || ch == '{' ||
+	        ch == '}' || ch == '[' || ch == ']');
+}
+
+static inline bool IsANumberChar(int ch, int chPrev) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	       (isdigit(ch) || toupper(ch) == 'E' ||
+	        ch == '.' || ((ch == '-' || ch == '+') && chPrev < 0x80 && toupper(chPrev) == 'E'));
+}
+
+typedef unsigned int sql_state_t;
+
+class SQLStates {
+public :
+	void Set(Sci_Position lineNumber, unsigned short int sqlStatesLine) {
+		sqlStatement.Set(lineNumber, sqlStatesLine);
+	}
+
+	sql_state_t IgnoreWhen (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_IGNORE_WHEN;
+		else
+			sqlStatesLine &= ~MASK_IGNORE_WHEN;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoCondition (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_CONDITION;
+		else
+			sqlStatesLine &= ~MASK_INTO_CONDITION;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoExceptionBlock (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_EXCEPTION;
+		else
+			sqlStatesLine &= ~MASK_INTO_EXCEPTION;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoDeclareBlock (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_DECLARE;
+		else
+			sqlStatesLine &= ~MASK_INTO_DECLARE;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoMergeStatement (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_MERGE_STATEMENT;
+		else
+			sqlStatesLine &= ~MASK_MERGE_STATEMENT;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t CaseMergeWithoutWhenFound (sql_state_t sqlStatesLine, bool found) {
+		if (found)
+			sqlStatesLine |= MASK_CASE_MERGE_WITHOUT_WHEN_FOUND;
+		else
+			sqlStatesLine &= ~MASK_CASE_MERGE_WITHOUT_WHEN_FOUND;
+
+		return sqlStatesLine;
+	}
+	sql_state_t IntoSelectStatementOrAssignment (sql_state_t sqlStatesLine, bool found) {
+		if (found)
+			sqlStatesLine |= MASK_INTO_SELECT_STATEMENT_OR_ASSIGNEMENT;
+		else
+			sqlStatesLine &= ~MASK_INTO_SELECT_STATEMENT_OR_ASSIGNEMENT;
+		return sqlStatesLine;
+	}
+
+	sql_state_t BeginCaseBlock (sql_state_t sqlStatesLine) {
+		if ((sqlStatesLine & MASK_NESTED_CASES) < MASK_NESTED_CASES) {
+			sqlStatesLine++;
+		}
+		return sqlStatesLine;
+	}
+
+	sql_state_t EndCaseBlock (sql_state_t sqlStatesLine) {
+		if ((sqlStatesLine & MASK_NESTED_CASES) > 0) {
+			sqlStatesLine--;
+		}
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoCreateStatement (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_CREATE;
+		else
+			sqlStatesLine &= ~MASK_INTO_CREATE;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoCreateViewStatement (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_CREATE_VIEW;
+		else
+			sqlStatesLine &= ~MASK_INTO_CREATE_VIEW;
+
+		return sqlStatesLine;
+	}
+
+	sql_state_t IntoCreateViewAsStatement (sql_state_t sqlStatesLine, bool enable) {
+		if (enable)
+			sqlStatesLine |= MASK_INTO_CREATE_VIEW_AS_STATEMENT;
+		else
+			sqlStatesLine &= ~MASK_INTO_CREATE_VIEW_AS_STATEMENT;
+
+		return sqlStatesLine;
+	}
+
+	bool IsIgnoreWhen (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_IGNORE_WHEN) != 0;
+	}
+
+	bool IsIntoCondition (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_CONDITION) != 0;
+	}
+
+	bool IsIntoCaseBlock (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_NESTED_CASES) != 0;
+	}
+
+	bool IsIntoExceptionBlock (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_EXCEPTION) != 0;
+	}
+	bool IsIntoSelectStatementOrAssignment (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_SELECT_STATEMENT_OR_ASSIGNEMENT) != 0;
+	}
+	bool IsCaseMergeWithoutWhenFound (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_CASE_MERGE_WITHOUT_WHEN_FOUND) != 0;
+	}
+
+	bool IsIntoDeclareBlock (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_DECLARE) != 0;
+	}
+
+	bool IsIntoMergeStatement (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_MERGE_STATEMENT) != 0;
+	}
+
+	bool IsIntoCreateStatement (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_CREATE) != 0;
+	}
+
+	bool IsIntoCreateViewStatement (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_CREATE_VIEW) != 0;
+	}
+
+	bool IsIntoCreateViewAsStatement (sql_state_t sqlStatesLine) {
+		return (sqlStatesLine & MASK_INTO_CREATE_VIEW_AS_STATEMENT) != 0;
+	}
+
+	sql_state_t ForLine(Sci_Position lineNumber) {
+		return sqlStatement.ValueAt(lineNumber);
+	}
+
+	SQLStates() {}
+
+private :
+	SparseState <sql_state_t> sqlStatement;
+	enum {
+		MASK_NESTED_CASES                         = 0x0001FF,
+		MASK_INTO_SELECT_STATEMENT_OR_ASSIGNEMENT = 0x000200,
+		MASK_CASE_MERGE_WITHOUT_WHEN_FOUND        = 0x000400,
+		MASK_MERGE_STATEMENT                      = 0x000800,
+		MASK_INTO_DECLARE                         = 0x001000,
+		MASK_INTO_EXCEPTION                       = 0x002000,
+		MASK_INTO_CONDITION                       = 0x004000,
+		MASK_IGNORE_WHEN                          = 0x008000,
+		MASK_INTO_CREATE                          = 0x010000,
+		MASK_INTO_CREATE_VIEW                     = 0x020000,
+		MASK_INTO_CREATE_VIEW_AS_STATEMENT        = 0x040000
+	};
+};
+
+// Options used for LexerSQL
+struct OptionsSQL {
+	bool fold;
+	bool foldAtElse;
+	bool foldComment;
+	bool foldCompact;
+	bool foldOnlyBegin;
+	bool sqlBackticksIdentifier;
+	bool sqlNumbersignComment;
+	bool sqlBackslashEscapes;
+	bool sqlAllowDottedWord;
+	OptionsSQL() {
+		fold = false;
+		foldAtElse = false;
+		foldComment = false;
+		foldCompact = false;
+		foldOnlyBegin = false;
+		sqlBackticksIdentifier = false;
+		sqlNumbersignComment = false;
+		sqlBackslashEscapes = false;
+		sqlAllowDottedWord = false;
+	}
+};
+
+static const char * const sqlWordListDesc[] = {
+	"Keywords",
+	"Database Objects",
+	"PLDoc",
+	"SQL*Plus",
+	"User Keywords 1",
+	"User Keywords 2",
+	"User Keywords 3",
+	"User Keywords 4",
+	0
+};
+
+struct OptionSetSQL : public OptionSet<OptionsSQL> {
+	OptionSetSQL() {
+		DefineProperty("fold", &OptionsSQL::fold);
+
+		DefineProperty("fold.sql.at.else", &OptionsSQL::foldAtElse,
+		               "This option enables SQL folding on a \"ELSE\" and \"ELSIF\" line of an IF statement.");
+
+		DefineProperty("fold.comment", &OptionsSQL::foldComment);
+
+		DefineProperty("fold.compact", &OptionsSQL::foldCompact);
+
+		DefineProperty("fold.sql.only.begin", &OptionsSQL::foldOnlyBegin);
+
+		DefineProperty("lexer.sql.backticks.identifier", &OptionsSQL::sqlBackticksIdentifier);
+
+		DefineProperty("lexer.sql.numbersign.comment", &OptionsSQL::sqlNumbersignComment,
+		               "If \"lexer.sql.numbersign.comment\" property is set to 0 a line beginning with '#' will not be a comment.");
+
+		DefineProperty("sql.backslash.escapes", &OptionsSQL::sqlBackslashEscapes,
+		               "Enables backslash as an escape character in SQL.");
+
+		DefineProperty("lexer.sql.allow.dotted.word", &OptionsSQL::sqlAllowDottedWord,
+		               "Set to 1 to colourise recognized words with dots "
+		               "(recommended for Oracle PL/SQL objects).");
+
+		DefineWordListSets(sqlWordListDesc);
+	}
+};
+
+class LexerSQL : public DefaultLexer {
+public :
+	LexerSQL() : DefaultLexer("sql", SCLEX_SQL) {}
+
+	virtual ~LexerSQL() {}
+
+	int SCI_METHOD Version () const override {
+		return lvRelease5;
+	}
+
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+
+	const char * SCI_METHOD PropertyNames() override {
+		return osSQL.PropertyNames();
+	}
+
+	int SCI_METHOD PropertyType(const char *name) override {
+		return osSQL.PropertyType(name);
+	}
+
+	const char * SCI_METHOD DescribeProperty(const char *name) override {
+		return osSQL.DescribeProperty(name);
+	}
+
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override {
+		if (osSQL.PropertySet(&options, key, val)) {
+			return 0;
+		}
+		return -1;
+	}
+
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osSQL.PropertyGet(key);
+	}
+
+	const char * SCI_METHOD DescribeWordListSets() override {
+		return osSQL.DescribeWordListSets();
+	}
+
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+	void * SCI_METHOD PrivateCall(int, void *) override {
+		return 0;
+	}
+
+	static ILexer5 *LexerFactorySQL() {
+		return new LexerSQL();
+	}
+private:
+	bool IsStreamCommentStyle(int style) {
+		return style == SCE_SQL_COMMENT ||
+		       style == SCE_SQL_COMMENTDOC ||
+		       style == SCE_SQL_COMMENTDOCKEYWORD ||
+		       style == SCE_SQL_COMMENTDOCKEYWORDERROR;
+	}
+
+	bool IsCommentStyle (int style) {
+		switch (style) {
+		case SCE_SQL_COMMENT :
+		case SCE_SQL_COMMENTDOC :
+		case SCE_SQL_COMMENTLINE :
+		case SCE_SQL_COMMENTLINEDOC :
+		case SCE_SQL_COMMENTDOCKEYWORD :
+		case SCE_SQL_COMMENTDOCKEYWORDERROR :
+			return true;
+		default :
+			return false;
+		}
+	}
+
+	bool IsCommentLine (Sci_Position line, LexAccessor &styler) {
+		Sci_Position pos = styler.LineStart(line);
+		Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+		for (Sci_Position i = pos; i + 1 < eol_pos; i++) {
+			int style = styler.StyleAt(i);
+			// MySQL needs -- comments to be followed by space or control char
+			if (style == SCE_SQL_COMMENTLINE && styler.Match(i, "--"))
+				return true;
+			else if (!IsASpaceOrTab(styler[i]))
+				return false;
+		}
+		return false;
+	}
+
+	OptionsSQL options;
+	OptionSetSQL osSQL;
+	SQLStates sqlStates;
+
+	WordList keywords1;
+	WordList keywords2;
+	WordList kw_pldoc;
+	WordList kw_sqlplus;
+	WordList kw_user1;
+	WordList kw_user2;
+	WordList kw_user3;
+	WordList kw_user4;
+};
+
+Sci_Position SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords1;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	case 2:
+		wordListN = &kw_pldoc;
+		break;
+	case 3:
+		wordListN = &kw_sqlplus;
+		break;
+	case 4:
+		wordListN = &kw_user1;
+		break;
+	case 5:
+		wordListN = &kw_user2;
+		break;
+	case 6:
+		wordListN = &kw_user3;
+		break;
+	case 7:
+		wordListN = &kw_user4;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+		}
+	}
+	return firstModification;
+}
+
+void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	LexAccessor styler(pAccess);
+	StyleContext sc(startPos, length, initStyle, styler);
+	int styleBeforeDCKeyword = SCE_SQL_DEFAULT;
+
+	for (; sc.More(); sc.Forward()) {
+		// Determine if the current state should terminate.
+		switch (sc.state) {
+		case SCE_SQL_OPERATOR:
+			sc.SetState(SCE_SQL_DEFAULT);
+			break;
+		case SCE_SQL_NUMBER:
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			if (!IsANumberChar(sc.ch, sc.chPrev)) {
+				sc.SetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_IDENTIFIER:
+			if (!IsAWordChar(sc.ch, options.sqlAllowDottedWord)) {
+				int nextState = SCE_SQL_DEFAULT;
+				char s[1000];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (keywords1.InList(s)) {
+					sc.ChangeState(SCE_SQL_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_SQL_WORD2);
+				} else if (kw_sqlplus.InListAbbreviated(s, '~')) {
+					sc.ChangeState(SCE_SQL_SQLPLUS);
+					if (strncmp(s, "rem", 3) == 0) {
+						nextState = SCE_SQL_SQLPLUS_COMMENT;
+					} else if (strncmp(s, "pro", 3) == 0) {
+						nextState = SCE_SQL_SQLPLUS_PROMPT;
+					}
+				} else if (kw_user1.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER1);
+				} else if (kw_user2.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER2);
+				} else if (kw_user3.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER3);
+				} else if (kw_user4.InList(s)) {
+					sc.ChangeState(SCE_SQL_USER4);
+				}
+				sc.SetState(nextState);
+			}
+			break;
+		case SCE_SQL_QUOTEDIDENTIFIER:
+			if (sc.ch == 0x60) {
+				if (sc.chNext == 0x60) {
+					sc.Forward();	// Ignore it
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_SQL_COMMENT:
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_COMMENTDOC:
+			if (sc.Match('*', '/')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			} else if (sc.ch == '@' || sc.ch == '\\') { // Doxygen support
+				// Verify that we have the conditions to mark a comment-doc-keyword
+				if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+					styleBeforeDCKeyword = SCE_SQL_COMMENTDOC;
+					sc.SetState(SCE_SQL_COMMENTDOCKEYWORD);
+				}
+			}
+			break;
+		case SCE_SQL_COMMENTLINE:
+		case SCE_SQL_COMMENTLINEDOC:
+		case SCE_SQL_SQLPLUS_COMMENT:
+		case SCE_SQL_SQLPLUS_PROMPT:
+			if (sc.atLineStart) {
+				sc.SetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		case SCE_SQL_COMMENTDOCKEYWORD:
+			if ((styleBeforeDCKeyword == SCE_SQL_COMMENTDOC) && sc.Match('*', '/')) {
+				sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			} else if (!IsADoxygenChar(sc.ch)) {
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (!isspace(sc.ch) || !kw_pldoc.InList(s + 1)) {
+					sc.ChangeState(SCE_SQL_COMMENTDOCKEYWORDERROR);
+				}
+				sc.SetState(styleBeforeDCKeyword);
+			}
+			break;
+		case SCE_SQL_CHARACTER:
+			if (options.sqlBackslashEscapes && sc.ch == '\\') {
+				sc.Forward();
+			} else if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_SQL_STRING:
+			if (options.sqlBackslashEscapes && sc.ch == '\\') {
+				// Escape sequence
+				sc.Forward();
+			} else if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_SQL_DEFAULT);
+				}
+			}
+			break;
+		case SCE_SQL_QOPERATOR:
+			// Locate the unique Q operator character
+			sc.Complete();
+			char qOperator = 0x00;
+			for (Sci_Position styleStartPos = sc.currentPos; styleStartPos > 0; --styleStartPos) {
+				if (styler.StyleAt(styleStartPos - 1) != SCE_SQL_QOPERATOR) {
+					qOperator = styler.SafeGetCharAt(styleStartPos + 2);
+					break;
+				}
+			}
+
+			char qComplement = 0x00;
+
+			if (qOperator == '<') {
+				qComplement = '>';
+			} else if (qOperator == '(') {
+				qComplement = ')';
+			} else if (qOperator == '{') {
+				qComplement = '}';
+			} else if (qOperator == '[') {
+				qComplement = ']';
+			} else {
+				qComplement = qOperator;
+			}
+
+			if (sc.Match(qComplement, '\'')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SQL_DEFAULT);
+			}
+			break;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SQL_DEFAULT) {
+			if (sc.Match('q', '\'') || sc.Match('Q', '\'')) {
+				sc.SetState(SCE_SQL_QOPERATOR);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext)) ||
+			          ((sc.ch == '-' || sc.ch == '+') && IsADigit(sc.chNext) && !IsADigit(sc.chPrev))) {
+				sc.SetState(SCE_SQL_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_SQL_IDENTIFIER);
+			} else if (sc.ch == 0x60 && options.sqlBackticksIdentifier) {
+				sc.SetState(SCE_SQL_QUOTEDIDENTIFIER);
+			} else if (sc.Match('/', '*')) {
+				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Doxygen doc. style
+					sc.SetState(SCE_SQL_COMMENTDOC);
+				} else {
+					sc.SetState(SCE_SQL_COMMENT);
+				}
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('-', '-')) {
+				// MySQL requires a space or control char after --
+				// http://dev.mysql.com/doc/mysql/en/ansi-diff-comments.html
+				// Perhaps we should enforce that with proper property:
+				//~ 			} else if (sc.Match("-- ")) {
+				sc.SetState(SCE_SQL_COMMENTLINE);
+			} else if (sc.ch == '#' && options.sqlNumbersignComment) {
+				sc.SetState(SCE_SQL_COMMENTLINEDOC);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SQL_CHARACTER);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SQL_STRING);
+			} else if (isoperator(static_cast<char>(sc.ch))) {
+				sc.SetState(SCE_SQL_OPERATOR);
+			}
+		}
+	}
+	sc.Complete();
+}
+
+void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+	if (!options.fold)
+		return;
+	LexAccessor styler(pAccess);
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+
+	if (lineCurrent > 0) {
+		// Backtrack to previous line in case need to fix its fold status for folding block of single-line comments (i.e. '--').
+		Sci_Position lastNLPos = -1;
+		// And keep going back until we find an operator ';' followed
+		// by white-space and/or comments. This will improve folding.
+		while (--startPos > 0) {
+			char ch = styler[startPos];
+			if (ch == '\n' || (ch == '\r' && styler[startPos + 1] != '\n')) {
+				lastNLPos = startPos;
+			} else if (ch == ';' &&
+				   styler.StyleAt(startPos) == SCE_SQL_OPERATOR) {
+				bool isAllClear = true;
+				for (Sci_Position tempPos = startPos + 1;
+				     tempPos < lastNLPos;
+				     ++tempPos) {
+					int tempStyle = styler.StyleAt(tempPos);
+					if (!IsCommentStyle(tempStyle)
+					    && tempStyle != SCE_SQL_DEFAULT) {
+						isAllClear = false;
+						break;
+					}
+				}
+				if (isAllClear) {
+					startPos = lastNLPos + 1;
+					break;
+				}
+			}
+		}
+		lineCurrent = styler.GetLine(startPos);
+		if (lineCurrent > 0)
+			levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+	}
+	// And because folding ends at ';', keep going until we find one
+	// Otherwise if create ... view ... as is split over multiple
+	// lines the folding won't always update immediately.
+	Sci_PositionU docLength = styler.Length();
+	for (; endPos < docLength; ++endPos) {
+		if (styler.SafeGetCharAt(endPos) == ';') {
+			break;
+		}
+	}
+
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool endFound = false;
+	bool isUnfoldingIgnored = false;
+	// this statementFound flag avoids to fold when the statement is on only one line by ignoring ELSE or ELSIF
+	// eg. "IF condition1 THEN ... ELSIF condition2 THEN ... ELSE ... END IF;"
+	bool statementFound = false;
+	sql_state_t sqlStatesCurrentLine = 0;
+	if (!options.foldOnlyBegin) {
+		sqlStatesCurrentLine = sqlStates.ForLine(lineCurrent);
+	}
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (atEOL || (!IsCommentStyle(style) && ch == ';')) {
+			if (endFound) {
+				//Maybe this is the end of "EXCEPTION" BLOCK (eg. "BEGIN ... EXCEPTION ... END;")
+				sqlStatesCurrentLine = sqlStates.IntoExceptionBlock(sqlStatesCurrentLine, false);
+			}
+			// set endFound and isUnfoldingIgnored to false if EOL is reached or ';' is found
+			endFound = false;
+			isUnfoldingIgnored = false;
+		}
+		if ((!IsCommentStyle(style) && ch == ';')) {
+			if (sqlStates.IsIntoMergeStatement(sqlStatesCurrentLine)) {
+				// This is the end of "MERGE" statement.
+				if (!sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine))
+					levelNext--;
+				sqlStatesCurrentLine = sqlStates.IntoMergeStatement(sqlStatesCurrentLine, false);
+				levelNext--;
+			}
+			if (sqlStates.IsIntoSelectStatementOrAssignment(sqlStatesCurrentLine))
+				sqlStatesCurrentLine = sqlStates.IntoSelectStatementOrAssignment(sqlStatesCurrentLine, false);
+			if (sqlStates.IsIntoCreateStatement(sqlStatesCurrentLine)) {
+				if (sqlStates.IsIntoCreateViewStatement(sqlStatesCurrentLine)) {
+					if (sqlStates.IsIntoCreateViewAsStatement(sqlStatesCurrentLine)) {
+						levelNext--;
+						sqlStatesCurrentLine = sqlStates.IntoCreateViewAsStatement(sqlStatesCurrentLine, false);
+					}
+					sqlStatesCurrentLine = sqlStates.IntoCreateViewStatement(sqlStatesCurrentLine, false);
+				}
+				sqlStatesCurrentLine = sqlStates.IntoCreateStatement(sqlStatesCurrentLine, false);
+			}
+		}
+		if (ch == ':' && chNext == '=' && !IsCommentStyle(style))
+			sqlStatesCurrentLine = sqlStates.IntoSelectStatementOrAssignment(sqlStatesCurrentLine, true);
+
+		if (options.foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelNext++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelNext--;
+			}
+		}
+		if (options.foldComment && (style == SCE_SQL_COMMENTLINE)) {
+			// MySQL needs -- comments to be followed by space or control char
+			if ((ch == '-') && (chNext == '-')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				char chNext3 = styler.SafeGetCharAt(i + 3);
+				if (chNext2 == '{' || chNext3 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}' || chNext3 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		// Fold block of single-line comments (i.e. '--').
+		if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
+			if (!IsCommentLine(lineCurrent - 1, styler) && IsCommentLine(lineCurrent + 1, styler))
+				levelNext++;
+			else if (IsCommentLine(lineCurrent - 1, styler) && !IsCommentLine(lineCurrent + 1, styler))
+				levelNext--;
+		}
+		if (style == SCE_SQL_OPERATOR) {
+			if (ch == '(') {
+				if (levelCurrent > levelNext)
+					levelCurrent--;
+				levelNext++;
+			} else if (ch == ')') {
+				levelNext--;
+			} else if ((!options.foldOnlyBegin) && ch == ';') {
+				sqlStatesCurrentLine = sqlStates.IgnoreWhen(sqlStatesCurrentLine, false);
+			}
+		}
+		// If new keyword (cannot trigger on elseif or nullif, does less tests)
+		if (style == SCE_SQL_WORD && stylePrev != SCE_SQL_WORD) {
+			const int MAX_KW_LEN = 9;	// Maximum length of folding keywords
+			char s[MAX_KW_LEN + 2];
+			unsigned int j = 0;
+			for (; j < MAX_KW_LEN + 1; j++) {
+				if (!iswordchar(styler[i + j])) {
+					break;
+				}
+				s[j] = static_cast<char>(tolower(styler[i + j]));
+			}
+			if (j == MAX_KW_LEN + 1) {
+				// Keyword too long, don't test it
+				s[0] = '\0';
+			} else {
+				s[j] = '\0';
+			}
+			if (!options.foldOnlyBegin &&
+			        strcmp(s, "select") == 0) {
+				sqlStatesCurrentLine = sqlStates.IntoSelectStatementOrAssignment(sqlStatesCurrentLine, true);
+			} else if (strcmp(s, "if") == 0) {
+				if (endFound) {
+					endFound = false;
+					if (options.foldOnlyBegin && !isUnfoldingIgnored) {
+						// this end isn't for begin block, but for if block ("end if;")
+						// so ignore previous "end" by increment levelNext.
+						levelNext++;
+					}
+				} else {
+					if (!options.foldOnlyBegin)
+						sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true);
+					if (levelCurrent > levelNext) {
+						// doesn't include this line into the folding block
+						// because doesn't hide IF (eg "END; IF")
+						levelCurrent = levelNext;
+					}
+				}
+			} else if (!options.foldOnlyBegin &&
+			           strcmp(s, "then") == 0 &&
+			           sqlStates.IsIntoCondition(sqlStatesCurrentLine)) {
+				sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, false);
+				if (!options.foldOnlyBegin) {
+					if (levelCurrent > levelNext) {
+						levelCurrent = levelNext;
+					}
+					if (!statementFound)
+						levelNext++;
+
+					statementFound = true;
+				} else if (levelCurrent > levelNext) {
+					// doesn't include this line into the folding block
+					// because doesn't hide LOOP or CASE (eg "END; LOOP" or "END; CASE")
+					levelCurrent = levelNext;
+				}
+			} else if (strcmp(s, "loop") == 0 ||
+			           strcmp(s, "case") == 0) {
+				if (endFound) {
+					endFound = false;
+					if (options.foldOnlyBegin && !isUnfoldingIgnored) {
+						// this end isn't for begin block, but for loop block ("end loop;") or case block ("end case;")
+						// so ignore previous "end" by increment levelNext.
+						levelNext++;
+					}
+					if ((!options.foldOnlyBegin) && strcmp(s, "case") == 0) {
+						sqlStatesCurrentLine = sqlStates.EndCaseBlock(sqlStatesCurrentLine);
+						if (!sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine))
+							levelNext--; //again for the "end case;" and block when
+					}
+				} else if (!options.foldOnlyBegin) {
+					if (strcmp(s, "case") == 0) {
+						sqlStatesCurrentLine = sqlStates.BeginCaseBlock(sqlStatesCurrentLine);
+						sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, true);
+					}
+
+					if (levelCurrent > levelNext)
+						levelCurrent = levelNext;
+
+					if (!statementFound)
+						levelNext++;
+
+					statementFound = true;
+				} else if (levelCurrent > levelNext) {
+					// doesn't include this line into the folding block
+					// because doesn't hide LOOP or CASE (eg "END; LOOP" or "END; CASE")
+					levelCurrent = levelNext;
+				}
+			} else if ((!options.foldOnlyBegin) && (
+			               // folding for ELSE and ELSIF block only if foldAtElse is set
+			               // and IF or CASE aren't on only one line with ELSE or ELSIF (with flag statementFound)
+			               options.foldAtElse && !statementFound) && strcmp(s, "elsif") == 0) {
+				sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true);
+				levelCurrent--;
+				levelNext--;
+			} else if ((!options.foldOnlyBegin) && (
+			               // folding for ELSE and ELSIF block only if foldAtElse is set
+			               // and IF or CASE aren't on only one line with ELSE or ELSIF (with flag statementFound)
+			               options.foldAtElse && !statementFound) && strcmp(s, "else") == 0) {
+				// prevent also ELSE is on the same line (eg. "ELSE ... END IF;")
+				statementFound = true;
+				if (sqlStates.IsIntoCaseBlock(sqlStatesCurrentLine) && sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine)) {
+					sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, false);
+					levelNext++;
+				} else {
+					// we are in same case "} ELSE {" in C language
+					levelCurrent--;
+				}
+			} else if (strcmp(s, "begin") == 0) {
+				levelNext++;
+				sqlStatesCurrentLine = sqlStates.IntoDeclareBlock(sqlStatesCurrentLine, false);
+			} else if ((strcmp(s, "end") == 0) ||
+			           // SQL Anywhere permits IF ... ELSE ... ENDIF
+			           // will only be active if "endif" appears in the
+			           // keyword list.
+			           (strcmp(s, "endif") == 0)) {
+				endFound = true;
+				levelNext--;
+				if (sqlStates.IsIntoSelectStatementOrAssignment(sqlStatesCurrentLine) && !sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine))
+					levelNext--;
+				if (levelNext < SC_FOLDLEVELBASE) {
+					levelNext = SC_FOLDLEVELBASE;
+					isUnfoldingIgnored = true;
+				}
+			} else if ((!options.foldOnlyBegin) &&
+			           strcmp(s, "when") == 0 &&
+			           !sqlStates.IsIgnoreWhen(sqlStatesCurrentLine) &&
+			           !sqlStates.IsIntoExceptionBlock(sqlStatesCurrentLine) && (
+			               sqlStates.IsIntoCaseBlock(sqlStatesCurrentLine) ||
+			               sqlStates.IsIntoMergeStatement(sqlStatesCurrentLine)
+			               )
+			           ) {
+				sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true);
+
+				// Don't foldind when CASE and WHEN are on the same line (with flag statementFound) (eg. "CASE selector WHEN expression1 THEN sequence_of_statements1;\n")
+				// and same way for MERGE statement.
+				if (!statementFound) {
+					if (!sqlStates.IsCaseMergeWithoutWhenFound(sqlStatesCurrentLine)) {
+						levelCurrent--;
+						levelNext--;
+					}
+					sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, false);
+				}
+			} else if ((!options.foldOnlyBegin) && strcmp(s, "exit") == 0) {
+				sqlStatesCurrentLine = sqlStates.IgnoreWhen(sqlStatesCurrentLine, true);
+			} else if ((!options.foldOnlyBegin) && !sqlStates.IsIntoDeclareBlock(sqlStatesCurrentLine) && strcmp(s, "exception") == 0) {
+				sqlStatesCurrentLine = sqlStates.IntoExceptionBlock(sqlStatesCurrentLine, true);
+			} else if ((!options.foldOnlyBegin) &&
+			           (strcmp(s, "declare") == 0 ||
+			            strcmp(s, "function") == 0 ||
+			            strcmp(s, "procedure") == 0 ||
+			            strcmp(s, "package") == 0)) {
+				sqlStatesCurrentLine = sqlStates.IntoDeclareBlock(sqlStatesCurrentLine, true);
+			} else if ((!options.foldOnlyBegin) &&
+			           strcmp(s, "merge") == 0) {
+				sqlStatesCurrentLine = sqlStates.IntoMergeStatement(sqlStatesCurrentLine, true);
+				sqlStatesCurrentLine = sqlStates.CaseMergeWithoutWhenFound(sqlStatesCurrentLine, true);
+				levelNext++;
+				statementFound = true;
+			} else if ((!options.foldOnlyBegin) &&
+				   strcmp(s, "create") == 0) {
+				sqlStatesCurrentLine = sqlStates.IntoCreateStatement(sqlStatesCurrentLine, true);
+			} else if ((!options.foldOnlyBegin) &&
+				   strcmp(s, "view") == 0 &&
+				   sqlStates.IsIntoCreateStatement(sqlStatesCurrentLine)) {
+				sqlStatesCurrentLine = sqlStates.IntoCreateViewStatement(sqlStatesCurrentLine, true);
+			} else if ((!options.foldOnlyBegin) &&
+				   strcmp(s, "as") == 0 &&
+				   sqlStates.IsIntoCreateViewStatement(sqlStatesCurrentLine) &&
+				   ! sqlStates.IsIntoCreateViewAsStatement(sqlStatesCurrentLine)) {
+				sqlStatesCurrentLine = sqlStates.IntoCreateViewAsStatement(sqlStatesCurrentLine, true);
+				levelNext++;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			visibleChars = 0;
+			statementFound = false;
+			if (!options.foldOnlyBegin)
+				sqlStates.Set(lineCurrent, sqlStatesCurrentLine);
+		}
+		if (!isspacechar(ch)) {
+			visibleChars++;
+		}
+	}
+}
+
+LexerModule lmSQL(SCLEX_SQL, LexerSQL::LexerFactorySQL, "sql", sqlWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexSTTXT.cxx b/scite-app/lexilla/lexers/LexSTTXT.cxx
new file mode 100644
index 0000000..b022862
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSTTXT.cxx
@@ -0,0 +1,407 @@
+// Scintilla source code edit control
+/** @file LexSTTXT.cxx
+ ** Lexer for Structured Text language.
+ ** Written by Pavel Bulochkin
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ClassifySTTXTWord(WordList *keywordlists[], StyleContext &sc)
+{
+	char s[256] = { 0 };
+	sc.GetCurrentLowered(s, sizeof(s));
+
+ 	if ((*keywordlists[0]).InList(s)) {
+ 		sc.ChangeState(SCE_STTXT_KEYWORD);
+ 	}
+
+	else if ((*keywordlists[1]).InList(s)) {
+		sc.ChangeState(SCE_STTXT_TYPE);
+	}
+
+	else if ((*keywordlists[2]).InList(s)) {
+		sc.ChangeState(SCE_STTXT_FUNCTION);
+	}
+
+	else if ((*keywordlists[3]).InList(s)) {
+		sc.ChangeState(SCE_STTXT_FB);
+	}
+
+	else if ((*keywordlists[4]).InList(s)) {
+		sc.ChangeState(SCE_STTXT_VARS);
+	}
+
+	else if ((*keywordlists[5]).InList(s)) {
+		sc.ChangeState(SCE_STTXT_PRAGMAS);
+	}
+
+	sc.SetState(SCE_STTXT_DEFAULT);
+}
+
+static void ColouriseSTTXTDoc (Sci_PositionU startPos, Sci_Position length, int initStyle,
+							  WordList *keywordlists[], Accessor &styler)
+{
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
+	CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+	CharacterSet setNumber(CharacterSet::setDigits, "_.eE");
+	CharacterSet setHexNumber(CharacterSet::setDigits, "_abcdefABCDEF");
+	CharacterSet setOperator(CharacterSet::setNone,",.+-*/:;<=>[]()%&");
+	CharacterSet setDataTime(CharacterSet::setDigits,"_.-:dmshDMSH");
+
+ 	for ( ; sc.More() ; sc.Forward())
+ 	{
+		if(sc.atLineStart && sc.state != SCE_STTXT_COMMENT)
+			sc.SetState(SCE_STTXT_DEFAULT);
+
+		switch(sc.state)
+		{
+			case SCE_STTXT_NUMBER: {
+				if(!setNumber.Contains(sc.ch))
+					sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_HEXNUMBER: {
+				if (setHexNumber.Contains(sc.ch))
+					continue;
+				else if(setDataTime.Contains(sc.ch))
+					sc.ChangeState(SCE_STTXT_DATETIME);
+				else if(setWord.Contains(sc.ch))
+					sc.ChangeState(SCE_STTXT_DEFAULT);
+				else
+					sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_DATETIME: {
+				if (setDataTime.Contains(sc.ch))
+					continue;
+				else if(setWord.Contains(sc.ch))
+					sc.ChangeState(SCE_STTXT_DEFAULT);
+				else
+					sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_OPERATOR: {
+				sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_PRAGMA: {
+				if (sc.ch == '}')
+					sc.ForwardSetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_COMMENTLINE: {
+				if (sc.atLineStart)
+					sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_COMMENT: {
+				if(sc.Match('*',')'))
+				{
+					sc.Forward();
+					sc.ForwardSetState(SCE_STTXT_DEFAULT);
+				}
+				break;
+			}
+			case SCE_STTXT_STRING1: {
+				if(sc.atLineEnd)
+					sc.SetState(SCE_STTXT_STRINGEOL);
+				else if(sc.ch == '\'' && sc.chPrev != '$')
+					sc.ForwardSetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_STRING2: {
+				if (sc.atLineEnd)
+					sc.SetState(SCE_STTXT_STRINGEOL);
+				else if(sc.ch == '\"' && sc.chPrev != '$')
+					sc.ForwardSetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_STRINGEOL: {
+				if(sc.atLineStart)
+					sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_CHARACTER: {
+				if(setHexNumber.Contains(sc.ch))
+					sc.SetState(SCE_STTXT_HEXNUMBER);
+				else if(setDataTime.Contains(sc.ch))
+					sc.SetState(SCE_STTXT_DATETIME);
+				else sc.SetState(SCE_STTXT_DEFAULT);
+				break;
+			}
+			case SCE_STTXT_IDENTIFIER: {
+				if(!setWord.Contains(sc.ch))
+					ClassifySTTXTWord(keywordlists, sc);
+				break;
+			}
+		}
+
+		if(sc.state == SCE_STTXT_DEFAULT)
+		{
+			if(IsADigit(sc.ch))
+				sc.SetState(SCE_STTXT_NUMBER);
+			else if (setWordStart.Contains(sc.ch))
+				sc.SetState(SCE_STTXT_IDENTIFIER);
+			else if (sc.Match('/', '/'))
+				sc.SetState(SCE_STTXT_COMMENTLINE);
+			else if(sc.Match('(', '*'))
+				sc.SetState(SCE_STTXT_COMMENT);
+			else if (sc.ch == '{')
+				sc.SetState(SCE_STTXT_PRAGMA);
+			else if (sc.ch == '\'')
+				sc.SetState(SCE_STTXT_STRING1);
+			else if (sc.ch == '\"')
+				sc.SetState(SCE_STTXT_STRING2);
+			else if(sc.ch == '#')
+				sc.SetState(SCE_STTXT_CHARACTER);
+			else if (setOperator.Contains(sc.ch))
+				sc.SetState(SCE_STTXT_OPERATOR);
+		}
+ 	}
+
+	if (sc.state == SCE_STTXT_IDENTIFIER && setWord.Contains(sc.chPrev))
+		ClassifySTTXTWord(keywordlists, sc);
+
+	sc.Complete();
+}
+
+static const char * const STTXTWordListDesc[] = {
+	"Keywords",
+	"Types",
+	"Functions",
+	"FB",
+	"Local_Var",
+	"Local_Pragma",
+	0
+};
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler, bool type)
+{
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+
+	for (Sci_Position i = pos; i < eolPos; i++)
+	{
+		char ch = styler[i];
+		char chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+
+		if(type) {
+			 if (ch == '/' && chNext == '/' && style == SCE_STTXT_COMMENTLINE)
+				return true;
+		}
+		else if (ch == '(' && chNext == '*' && style == SCE_STTXT_COMMENT)
+			break;
+
+		if (!IsASpaceOrTab(ch))
+			return false;
+	}
+
+	for (Sci_Position i = eolPos-2; i>pos; i--)
+	{
+		char ch = styler[i];
+		char chPrev = styler.SafeGetCharAt(i-1);
+		int style = styler.StyleAt(i);
+
+		if(ch == ')' && chPrev == '*' && style == SCE_STTXT_COMMENT)
+			return true;
+		if(!IsASpaceOrTab(ch))
+			return false;
+	}
+
+	return false;
+}
+
+static bool IsPragmaLine(Sci_Position line, Accessor &styler)
+{
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line+1) - 1;
+
+	for (Sci_Position i = pos ; i < eolPos ; i++)
+	{
+		char ch = styler[i];
+		int style = styler.StyleAt(i);
+
+		if(ch == '{' && style == SCE_STTXT_PRAGMA)
+			return true;
+		else if (!IsASpaceOrTab(ch))
+			return false;
+	}
+	return false;
+}
+
+static void GetRangeUpper(Sci_PositionU start,Sci_PositionU end,Accessor &styler,char *s,Sci_PositionU len)
+{
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(toupper(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static void ClassifySTTXTWordFoldPoint(int &levelCurrent,Sci_PositionU lastStart,
+									 Sci_PositionU currentPos, Accessor &styler)
+{
+	char s[256];
+	GetRangeUpper(lastStart, currentPos, styler, s, sizeof(s));
+
+	// See Table C.2 - Keywords
+	if (!strcmp(s, "ACTION") ||
+		!strcmp(s, "CASE") ||
+		!strcmp(s, "CONFIGURATION") ||
+		!strcmp(s, "FOR") ||
+		!strcmp(s, "FUNCTION") ||
+		!strcmp(s, "FUNCTION_BLOCK") ||
+		!strcmp(s, "IF") ||
+		!strcmp(s, "INITIAL_STEP") ||
+		!strcmp(s, "REPEAT") ||
+		!strcmp(s, "RESOURCE") ||
+		!strcmp(s, "STEP") ||
+		!strcmp(s, "STRUCT") ||
+		!strcmp(s, "TRANSITION") ||
+		!strcmp(s, "TYPE") ||
+		!strcmp(s, "VAR") ||
+		!strcmp(s, "VAR_INPUT") ||
+		!strcmp(s, "VAR_OUTPUT") ||
+		!strcmp(s, "VAR_IN_OUT") ||
+		!strcmp(s, "VAR_TEMP") ||
+		!strcmp(s, "VAR_EXTERNAL") ||
+		!strcmp(s, "VAR_ACCESS") ||
+		!strcmp(s, "VAR_CONFIG") ||
+		!strcmp(s, "VAR_GLOBAL") ||
+		!strcmp(s, "WHILE"))
+	{
+		levelCurrent++;
+	}
+	else if (!strcmp(s, "END_ACTION") ||
+		!strcmp(s, "END_CASE") ||
+		!strcmp(s, "END_CONFIGURATION") ||
+		!strcmp(s, "END_FOR") ||
+		!strcmp(s, "END_FUNCTION") ||
+		!strcmp(s, "END_FUNCTION_BLOCK") ||
+		!strcmp(s, "END_IF") ||
+		!strcmp(s, "END_REPEAT") ||
+		!strcmp(s, "END_RESOURCE") ||
+		!strcmp(s, "END_STEP") ||
+		!strcmp(s, "END_STRUCT") ||
+		!strcmp(s, "END_TRANSITION") ||
+		!strcmp(s, "END_TYPE") ||
+		!strcmp(s, "END_VAR") ||
+		!strcmp(s, "END_WHILE"))
+	{
+		levelCurrent--;
+		if (levelCurrent < SC_FOLDLEVELBASE) {
+			levelCurrent = SC_FOLDLEVELBASE;
+		}
+	}
+}
+
+static void FoldSTTXTDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],Accessor &styler)
+{
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	Sci_Position lastStart = 0;
+
+	CharacterSet setWord(CharacterSet::setAlphaNum, "_", 0x80, true);
+
+	for (Sci_PositionU i = startPos; i < endPos; i++)
+	{
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (foldComment && style == SCE_STTXT_COMMENT) {
+			if(stylePrev != SCE_STTXT_COMMENT)
+				levelCurrent++;
+			else if(styleNext != SCE_STTXT_COMMENT && !atEOL)
+				levelCurrent--;
+		}
+		if ( foldComment && atEOL && ( IsCommentLine(lineCurrent, styler,false)
+			|| IsCommentLine(lineCurrent,styler,true))) {
+ 			if(!IsCommentLine(lineCurrent-1, styler,true) && IsCommentLine(lineCurrent+1, styler,true))
+				levelCurrent++;
+			if (IsCommentLine(lineCurrent-1, styler,true) && !IsCommentLine(lineCurrent+1, styler,true))
+				levelCurrent--;
+			if (!IsCommentLine(lineCurrent-1, styler,false) && IsCommentLine(lineCurrent+1, styler,false))
+				levelCurrent++;
+			if (IsCommentLine(lineCurrent-1, styler,false) && !IsCommentLine(lineCurrent+1, styler,false))
+				levelCurrent--;
+		}
+		if(foldPreprocessor && atEOL && IsPragmaLine(lineCurrent, styler)) {
+			if(!IsPragmaLine(lineCurrent-1, styler) && IsPragmaLine(lineCurrent+1, styler ))
+				levelCurrent++;
+			else if(IsPragmaLine(lineCurrent-1, styler) && !IsPragmaLine(lineCurrent+1, styler))
+				levelCurrent--;
+		}
+		if (stylePrev != SCE_STTXT_KEYWORD && style == SCE_STTXT_KEYWORD) {
+				lastStart = i;
+		}
+		if(stylePrev == SCE_STTXT_KEYWORD) {
+			if(setWord.Contains(ch) && !setWord.Contains(chNext))
+				ClassifySTTXTWordFoldPoint(levelCurrent,lastStart, i, styler);
+		}
+		if (!IsASpace(ch)) {
+			visibleChars++;
+		}
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent))
+				styler.SetLevel(lineCurrent, lev);
+
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		// If we didn't reach the EOL in previous loop, store line level and whitespace information.
+		// The rest will be filled in later...
+		int lev = levelPrev;
+		if (visibleChars == 0 && foldCompact)
+			lev |= SC_FOLDLEVELWHITEFLAG;
+		styler.SetLevel(lineCurrent, lev);
+	}
+}
+
+LexerModule lmSTTXT(SCLEX_STTXT, ColouriseSTTXTDoc, "fcST", FoldSTTXTDoc, STTXTWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexScriptol.cxx b/scite-app/lexilla/lexers/LexScriptol.cxx
new file mode 100644
index 0000000..4fbda05
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexScriptol.cxx
@@ -0,0 +1,382 @@
+// Scintilla source code edit control
+/** @file LexScriptol.cxx
+ ** Lexer for Scriptol.
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ClassifyWordSol(Sci_PositionU start, Sci_PositionU end, WordList &keywords, Accessor &styler, char *prevWord)
+{
+    char s[100] = "";
+    bool wordIsNumber = isdigit(styler[start]) != 0;
+    for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++)
+     {
+           s[i] = styler[start + i];
+           s[i + 1] = '\0';
+     }
+    char chAttr = SCE_SCRIPTOL_IDENTIFIER;
+    if (0 == strcmp(prevWord, "class"))       chAttr = SCE_SCRIPTOL_CLASSNAME;
+    else if (wordIsNumber)                    chAttr = SCE_SCRIPTOL_NUMBER;
+    else if (keywords.InList(s))              chAttr = SCE_SCRIPTOL_KEYWORD;
+    else for (Sci_PositionU i = 0; i < end - start + 1; i++)  // test dotted idents
+    {
+        if (styler[start + i] == '.')
+        {
+            styler.ColourTo(start + i - 1, chAttr);
+            styler.ColourTo(start + i, SCE_SCRIPTOL_OPERATOR);
+        }
+    }
+    styler.ColourTo(end, chAttr);
+    strcpy(prevWord, s);
+}
+
+static bool IsSolComment(Accessor &styler, Sci_Position pos, Sci_Position len)
+{
+   if(len > 0)
+   {
+     char c = styler[pos];
+     if(c == '`') return true;
+     if(len > 1)
+     {
+        if(c == '/')
+        {
+          c = styler[pos + 1];
+          if(c == '/') return true;
+          if(c == '*') return true;
+        }
+     }
+   }
+   return false;
+}
+
+static bool IsSolStringStart(char ch)
+{
+    if (ch == '\'' || ch == '"')  return true;
+    return false;
+}
+
+static bool IsSolWordStart(char ch)
+{
+    return (iswordchar(ch) && !IsSolStringStart(ch));
+}
+
+
+static int GetSolStringState(Accessor &styler, Sci_Position i, Sci_Position *nextIndex)
+{
+	char ch = styler.SafeGetCharAt(i);
+	char chNext = styler.SafeGetCharAt(i + 1);
+
+        if (ch != '\"' && ch != '\'')
+        {
+            *nextIndex = i + 1;
+            return SCE_SCRIPTOL_DEFAULT;
+	}
+        // ch is either single or double quotes in string
+        // code below seem non-sense but is here for future extensions
+	if (ch == chNext && ch == styler.SafeGetCharAt(i + 2))
+        {
+          *nextIndex = i + 3;
+          if(ch == '\"') return SCE_SCRIPTOL_TRIPLE;
+          if(ch == '\'') return SCE_SCRIPTOL_TRIPLE;
+          return SCE_SCRIPTOL_STRING;
+	}
+        else
+        {
+          *nextIndex = i + 1;
+          if (ch == '"') return SCE_SCRIPTOL_STRING;
+          else           return SCE_SCRIPTOL_STRING;
+	}
+}
+
+
+static void ColouriseSolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                            WordList *keywordlists[], Accessor &styler)
+ {
+
+	Sci_Position lengthDoc = startPos + length;
+        char stringType = '\"';
+
+	if (startPos > 0)
+        {
+            Sci_Position lineCurrent = styler.GetLine(startPos);
+            if (lineCurrent > 0)
+            {
+              startPos = styler.LineStart(lineCurrent-1);
+              if (startPos == 0) initStyle = SCE_SCRIPTOL_DEFAULT;
+              else               initStyle = styler.StyleAt(startPos-1);
+            }
+	}
+
+	styler.StartAt(startPos);
+
+	WordList &keywords = *keywordlists[0];
+
+	char prevWord[200];
+	prevWord[0] = '\0';
+        if (length == 0)  return;
+
+	int state = initStyle & 31;
+
+	Sci_Position nextIndex = 0;
+        char chPrev  = ' ';
+        char chPrev2 = ' ';
+        char chNext  = styler[startPos];
+	styler.StartSegment(startPos);
+	for (Sci_Position i = startPos; i < lengthDoc; i++)
+        {
+
+       char ch = chNext;
+       chNext = styler.SafeGetCharAt(i + 1);
+
+       if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
+       {
+          if ((state == SCE_SCRIPTOL_DEFAULT) ||
+              (state == SCE_SCRIPTOL_TRIPLE) ||
+              (state == SCE_SCRIPTOL_COMMENTBLOCK))
+          {
+              styler.ColourTo(i, state);
+          }
+        }
+
+        if (styler.IsLeadByte(ch))
+         {
+             chNext = styler.SafeGetCharAt(i + 2);
+             chPrev  = ' ';
+             chPrev2 = ' ';
+             i += 1;
+             continue;
+         }
+
+        if (state == SCE_SCRIPTOL_STRINGEOL)
+         {
+             if (ch != '\r' && ch != '\n')
+             {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_SCRIPTOL_DEFAULT;
+             }
+         }
+
+        if (state == SCE_SCRIPTOL_DEFAULT)
+         {
+            if (IsSolWordStart(ch))
+            {
+                 styler.ColourTo(i - 1, state);
+                 state = SCE_SCRIPTOL_KEYWORD;
+            }
+            else if (ch == '`')
+            {
+                styler.ColourTo(i - 1, state);
+                state = SCE_SCRIPTOL_COMMENTLINE;
+            }
+            else if (ch == '/')
+            {
+                styler.ColourTo(i - 1, state);
+                if(chNext == '/') state = SCE_SCRIPTOL_CSTYLE;
+                if(chNext == '*') state = SCE_SCRIPTOL_COMMENTBLOCK;
+            }
+
+            else if (IsSolStringStart(ch))
+            {
+               styler.ColourTo(i - 1, state);
+               state = GetSolStringState(styler, i, &nextIndex);
+               if(state == SCE_SCRIPTOL_STRING)
+               {
+                 stringType = ch;
+               }
+               if (nextIndex != i + 1)
+               {
+                   i = nextIndex - 1;
+                   ch = ' ';
+                   chPrev = ' ';
+                   chNext = styler.SafeGetCharAt(i + 1);
+               }
+           }
+            else if (isoperator(ch))
+            {
+                 styler.ColourTo(i - 1, state);
+                 styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
+            }
+          }
+          else if (state == SCE_SCRIPTOL_KEYWORD)
+          {
+              if (!iswordchar(ch))
+              {
+                 ClassifyWordSol(styler.GetStartSegment(), i - 1, keywords, styler, prevWord);
+                 state = SCE_SCRIPTOL_DEFAULT;
+                 if (ch == '`')
+                 {
+                     state = chNext == '`' ? SCE_SCRIPTOL_PERSISTENT : SCE_SCRIPTOL_COMMENTLINE;
+                 }
+                 else if (IsSolStringStart(ch))
+                 {
+                    styler.ColourTo(i - 1, state);
+                    state = GetSolStringState(styler, i, &nextIndex);
+                    if (nextIndex != i + 1)
+                    {
+                       i = nextIndex - 1;
+                       ch = ' ';
+                       chPrev = ' ';
+                       chNext = styler.SafeGetCharAt(i + 1);
+                     }
+                 }
+                 else if (isoperator(ch))
+                 {
+                     styler.ColourTo(i, SCE_SCRIPTOL_OPERATOR);
+                 }
+             }
+          }
+          else
+          {
+            if (state == SCE_SCRIPTOL_COMMENTLINE ||
+                state == SCE_SCRIPTOL_PERSISTENT ||
+                state == SCE_SCRIPTOL_CSTYLE)
+            {
+                 if (ch == '\r' || ch == '\n')
+                 {
+                     styler.ColourTo(i - 1, state);
+                     state = SCE_SCRIPTOL_DEFAULT;
+                 }
+            }
+            else if(state == SCE_SCRIPTOL_COMMENTBLOCK)
+            {
+              if(chPrev == '*' && ch == '/')
+              {
+                styler.ColourTo(i, state);
+                state = SCE_SCRIPTOL_DEFAULT;
+              }
+            }
+            else if ((state == SCE_SCRIPTOL_STRING) ||
+                     (state == SCE_SCRIPTOL_CHARACTER))
+            {
+               if ((ch == '\r' || ch == '\n') && (chPrev != '\\'))
+                {
+                    styler.ColourTo(i - 1, state);
+                    state = SCE_SCRIPTOL_STRINGEOL;
+                }
+                else if (ch == '\\')
+                {
+                   if (chNext == '\"' || chNext == '\'' || chNext == '\\')
+                   {
+                        i++;
+                        ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                   }
+                 }
+                else if ((ch == '\"') || (ch == '\''))
+                {
+                    // must match the entered quote type
+                    if(ch == stringType)
+                    {
+                      styler.ColourTo(i, state);
+                      state = SCE_SCRIPTOL_DEFAULT;
+                    }
+                 }
+             }
+             else if (state == SCE_SCRIPTOL_TRIPLE)
+             {
+                if ((ch == '\'' && chPrev == '\'' && chPrev2 == '\'') ||
+                    (ch == '\"' && chPrev == '\"' && chPrev2 == '\"'))
+                 {
+                    styler.ColourTo(i, state);
+                    state = SCE_SCRIPTOL_DEFAULT;
+                 }
+             }
+
+           }
+          chPrev2 = chPrev;
+          chPrev = ch;
+	}
+        if (state == SCE_SCRIPTOL_KEYWORD)
+        {
+            ClassifyWordSol(styler.GetStartSegment(),
+                 lengthDoc-1, keywords, styler, prevWord);
+	}
+        else
+        {
+            styler.ColourTo(lengthDoc-1, state);
+	}
+}
+
+static void FoldSolDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+						   WordList *[], Accessor &styler)
+ {
+	Sci_Position lengthDoc = startPos + length;
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0)
+        {
+          if (lineCurrent > 0)
+          {
+               lineCurrent--;
+               startPos = styler.LineStart(lineCurrent);
+               if (startPos == 0)
+                    initStyle = SCE_SCRIPTOL_DEFAULT;
+               else
+                    initStyle = styler.StyleAt(startPos-1);
+           }
+	}
+	int state = initStyle & 31;
+	int spaceFlags = 0;
+        int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsSolComment);
+        if (state == SCE_SCRIPTOL_TRIPLE)
+             indentCurrent |= SC_FOLDLEVELWHITEFLAG;
+	char chNext = styler[startPos];
+	for (Sci_Position i = startPos; i < lengthDoc; i++)
+         {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i) & 31;
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == lengthDoc))
+                {
+                   int lev = indentCurrent;
+                   int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsSolComment);
+                   if (style == SCE_SCRIPTOL_TRIPLE)
+                        indentNext |= SC_FOLDLEVELWHITEFLAG;
+                   if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG))
+                    {
+                        // Only non whitespace lines can be headers
+                        if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+                        {
+                              lev |= SC_FOLDLEVELHEADERFLAG;
+                        }
+                        else if (indentNext & SC_FOLDLEVELWHITEFLAG)
+                        {
+                             // Line after is blank so check the next - maybe should continue further?
+                             int spaceFlags2 = 0;
+                             int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsSolComment);
+                             if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK))
+                             {
+                                   lev |= SC_FOLDLEVELHEADERFLAG;
+                              }
+                        }
+                    }
+                   indentCurrent = indentNext;
+                   styler.SetLevel(lineCurrent, lev);
+                   lineCurrent++;
+		}
+	}
+}
+
+LexerModule lmScriptol(SCLEX_SCRIPTOL, ColouriseSolDoc, "scriptol", FoldSolDoc);
diff --git a/scite-app/lexilla/lexers/LexSmalltalk.cxx b/scite-app/lexilla/lexers/LexSmalltalk.cxx
new file mode 100644
index 0000000..85d1c02
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSmalltalk.cxx
@@ -0,0 +1,327 @@
+// Scintilla source code edit control
+/** @file LexSmalltalk.cxx
+ ** Lexer for Smalltalk language.
+ ** Written by Sergey Philippov, sphilippov-at-gmail-dot-com
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+/*
+| lexTable classificationBlock charClasses |
+charClasses := #(#DecDigit #Letter #Special #Upper #BinSel).
+lexTable := ByteArray new: 128.
+classificationBlock := [ :charClass :chars |
+    | flag |
+    flag := 1 bitShift: (charClasses indexOf: charClass) - 1.
+    chars do: [ :char | lexTable at: char codePoint + 1 put: ((lexTable at: char codePoint + 1) bitOr: flag)]].
+
+classificationBlock
+    value: #DecDigit value: '0123456789';
+    value: #Letter value: '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    value: #Special value: '()[]{};.^:';
+    value: #BinSel value: '~@%&*-+=|\/,<>?!';
+    value: #Upper value: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+
+((String new: 500) streamContents: [ :stream |
+    stream crLf; nextPutAll: 'static int ClassificationTable[256] = {'.
+    lexTable keysAndValuesDo: [ :index :value |
+        ((index - 1) rem: 16) == 0 ifTrue: [
+            stream crLf; tab]
+        ifFalse: [
+            stream space].
+        stream print: value.
+        index ~= 256 ifTrue: [
+            stream nextPut: $,]].
+    stream crLf; nextPutAll: '};'; crLf.
+
+    charClasses keysAndValuesDo: [ :index :name |
+        stream
+            crLf;
+            nextPutAll: (
+                ('static inline bool is<1s>(int ch) {return (ch > 0) && (ch %< 0x80) && ((ClassificationTable[ch] & <2p>) != 0);}')
+                    expandMacrosWith: name with: (1 bitShift: (index - 1)))
+    ]]) edit
+*/
+
+// autogenerated {{{{
+
+static int ClassificationTable[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 16, 0, 0, 0, 16, 16, 0, 4, 4, 16, 16, 16, 16, 4, 16,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 16, 16, 16, 16,
+    16, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 16, 4, 4, 2,
+    0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 16, 4, 16, 0,
+};
+
+static inline bool isDecDigit(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 1) != 0);}
+static inline bool isLetter(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 2) != 0);}
+static inline bool isSpecial(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 4) != 0);}
+static inline bool isUpper(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 8) != 0);}
+static inline bool isBinSel(int ch) {return (ch > 0) && (ch < 0x80) && ((ClassificationTable[ch] & 16) != 0);}
+// autogenerated }}}}
+
+static inline bool isAlphaNumeric(int ch) {
+    return isDecDigit(ch) || isLetter(ch);
+}
+
+static inline bool isDigitOfRadix(int ch, int radix)
+{
+    if (isDecDigit(ch))
+        return (ch - '0') < radix;
+    else if (!isUpper(ch))
+        return false;
+    else
+        return (ch - 'A' + 10) < radix;
+}
+
+static inline void skipComment(StyleContext& sc)
+{
+    while (sc.More() && sc.ch != '\"')
+        sc.Forward();
+}
+
+static inline void skipString(StyleContext& sc)
+{
+    while (sc.More()) {
+        if (sc.ch == '\'') {
+            if (sc.chNext != '\'')
+                return;
+            sc.Forward();
+        }
+        sc.Forward();
+    }
+}
+
+static void handleHash(StyleContext& sc)
+{
+    if (isSpecial(sc.chNext)) {
+        sc.SetState(SCE_ST_SPECIAL);
+        return;
+    }
+
+    sc.SetState(SCE_ST_SYMBOL);
+    sc.Forward();
+    if (sc.ch == '\'') {
+        sc.Forward();
+        skipString(sc);
+    }
+    else {
+        if (isLetter(sc.ch)) {
+            while (isAlphaNumeric(sc.chNext) || sc.chNext == ':')
+                sc.Forward();
+        }
+        else if (isBinSel(sc.ch)) {
+            while (isBinSel(sc.chNext))
+                sc.Forward();
+        }
+    }
+}
+
+static inline void handleSpecial(StyleContext& sc)
+{
+    if (sc.ch == ':' && sc.chNext == '=') {
+        sc.SetState(SCE_ST_ASSIGN);
+        sc.Forward();
+    }
+    else {
+        if (sc.ch == '^')
+            sc.SetState(SCE_ST_RETURN);
+        else
+            sc.SetState(SCE_ST_SPECIAL);
+    }
+}
+
+static inline void skipInt(StyleContext& sc, int radix)
+{
+    while (isDigitOfRadix(sc.chNext, radix))
+        sc.Forward();
+}
+
+static void handleNumeric(StyleContext& sc)
+{
+    char num[256];
+    int nl;
+    int radix;
+
+    sc.SetState(SCE_ST_NUMBER);
+    num[0] = static_cast<char>(sc.ch);
+    nl = 1;
+    while (isDecDigit(sc.chNext)) {
+        num[nl++] = static_cast<char>(sc.chNext);
+        sc.Forward();
+        if (nl+1 == sizeof(num)/sizeof(num[0])) // overrun check
+            break;
+    }
+    if (sc.chNext == 'r') {
+        num[nl] = 0;
+        if (num[0] == '-')
+            radix = atoi(num + 1);
+        else
+            radix = atoi(num);
+        sc.Forward();
+        if (sc.chNext == '-')
+            sc.Forward();
+        skipInt(sc, radix);
+    }
+    else
+        radix = 10;
+    if (sc.chNext != '.' || !isDigitOfRadix(sc.GetRelative(2), radix))
+        return;
+    sc.Forward();
+    skipInt(sc, radix);
+    if (sc.chNext == 's') {
+        // ScaledDecimal
+        sc.Forward();
+        while (isDecDigit(sc.chNext))
+            sc.Forward();
+        return;
+    }
+    else if (sc.chNext != 'e' && sc.chNext != 'd' && sc.chNext != 'q')
+        return;
+    sc.Forward();
+    if (sc.chNext == '+' || sc.chNext == '-')
+        sc.Forward();
+    skipInt(sc, radix);
+}
+
+static inline void handleBinSel(StyleContext& sc)
+{
+    sc.SetState(SCE_ST_BINARY);
+    while (isBinSel(sc.chNext))
+        sc.Forward();
+}
+
+static void handleLetter(StyleContext& sc, WordList* specialSelectorList)
+{
+    char ident[256];
+    int il;
+    int state;
+    bool doubleColonPresent;
+
+    sc.SetState(SCE_ST_DEFAULT);
+
+    ident[0] = static_cast<char>(sc.ch);
+    il = 1;
+    while (isAlphaNumeric(sc.chNext)) {
+        ident[il++] = static_cast<char>(sc.chNext);
+        sc.Forward();
+        if (il+2 == sizeof(ident)/sizeof(ident[0])) // overrun check
+            break;
+    }
+
+    if (sc.chNext == ':') {
+        doubleColonPresent = true;
+        ident[il++] = ':';
+        sc.Forward();
+    }
+    else
+        doubleColonPresent = false;
+    ident[il] = 0;
+
+    if (specialSelectorList->InList(ident))
+            state = SCE_ST_SPEC_SEL;
+    else if (doubleColonPresent)
+            state = SCE_ST_KWSEND;
+    else if (isUpper(ident[0]))
+        state = SCE_ST_GLOBAL;
+    else {
+        if (!strcmp(ident, "self"))
+            state = SCE_ST_SELF;
+        else if (!strcmp(ident, "super"))
+            state = SCE_ST_SUPER;
+        else if (!strcmp(ident, "nil"))
+            state = SCE_ST_NIL;
+        else if (!strcmp(ident, "true") || !strcmp(ident, "false"))
+            state = SCE_ST_BOOL;
+        else
+            state = SCE_ST_DEFAULT;
+    }
+
+    sc.ChangeState(state);
+}
+
+static void colorizeSmalltalkDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *wordLists[], Accessor &styler)
+{
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    if (initStyle == SCE_ST_COMMENT) {
+        skipComment(sc);
+        if (sc.More())
+            sc.Forward();
+    }
+    else if (initStyle == SCE_ST_STRING) {
+        skipString(sc);
+        if (sc.More())
+            sc.Forward();
+    }
+
+    for (; sc.More(); sc.Forward()) {
+        int ch;
+
+        ch = sc.ch;
+        if (ch == '\"') {
+            sc.SetState(SCE_ST_COMMENT);
+            sc.Forward();
+            skipComment(sc);
+        }
+        else if (ch == '\'') {
+            sc.SetState(SCE_ST_STRING);
+            sc.Forward();
+            skipString(sc);
+        }
+        else if (ch == '#')
+            handleHash(sc);
+        else if (ch == '$') {
+            sc.SetState(SCE_ST_CHARACTER);
+            sc.Forward();
+        }
+        else if (isSpecial(ch))
+            handleSpecial(sc);
+        else if (isDecDigit(ch))
+            handleNumeric(sc);
+        else if (isLetter(ch))
+            handleLetter(sc, wordLists[0]);
+        else if (isBinSel(ch)) {
+            if (ch == '-' && isDecDigit(sc.chNext))
+                handleNumeric(sc);
+            else
+                handleBinSel(sc);
+        }
+        else
+            sc.SetState(SCE_ST_DEFAULT);
+    }
+    sc.Complete();
+}
+
+static const char* const smalltalkWordListDesc[] = {
+    "Special selectors",
+    0
+};
+
+LexerModule lmSmalltalk(SCLEX_SMALLTALK, colorizeSmalltalkDoc, "smalltalk", NULL, smalltalkWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexSorcus.cxx b/scite-app/lexilla/lexers/LexSorcus.cxx
new file mode 100644
index 0000000..3a435ee
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSorcus.cxx
@@ -0,0 +1,209 @@
+// Scintilla source code edit control
+/** @file LexSorcus.cxx
+** Lexer for SORCUS installation files
+** Written by Eugen Bitter and Christoph Baumann at SORCUS Computer, Heidelberg Germany
+** Based on the ASM Lexer by The Black Horus
+**/
+
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+//each character a..z and A..Z + '_' can be part of a keyword
+//additionally numbers that follow 'M' can be contained in a keyword
+static inline bool IsSWordStart(const int ch, const int prev_ch)
+{
+    if (isalpha(ch) || (ch == '_') || ((isdigit(ch)) && (prev_ch == 'M')))
+        return true;
+
+    return false;
+}
+
+
+//only digits that are not preceded by 'M' count as a number
+static inline bool IsSorcusNumber(const int ch, const int prev_ch)
+{
+    if ((isdigit(ch)) && (prev_ch != 'M'))
+        return true;
+
+    return false;
+}
+
+
+//only = is a valid operator
+static inline bool IsSorcusOperator(const int ch)
+{
+    if (ch == '=')
+        return true;
+
+    return false;
+}
+
+
+static void ColouriseSorcusDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                               Accessor &styler)
+{
+
+    WordList &Command = *keywordlists[0];
+    WordList &Parameter = *keywordlists[1];
+    WordList &Constant = *keywordlists[2];
+
+    // Do not leak onto next line
+    if (initStyle == SCE_SORCUS_STRINGEOL)
+        initStyle = SCE_SORCUS_DEFAULT;
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    for (; sc.More(); sc.Forward())
+    {
+
+        // Prevent SCE_SORCUS_STRINGEOL from leaking back to previous line
+        if (sc.atLineStart && (sc.state == SCE_SORCUS_STRING))
+        {
+            sc.SetState(SCE_SORCUS_STRING);
+        }
+
+        // Determine if the current state should terminate.
+        if (sc.state == SCE_SORCUS_OPERATOR)
+        {
+            if (!IsSorcusOperator(sc.ch))
+            {
+                sc.SetState(SCE_SORCUS_DEFAULT);
+            }
+        }
+        else if(sc.state == SCE_SORCUS_NUMBER)
+        {
+            if(!IsSorcusNumber(sc.ch, sc.chPrev))
+            {
+                sc.SetState(SCE_SORCUS_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_SORCUS_IDENTIFIER)
+        {
+            if (!IsSWordStart(sc.ch, sc.chPrev))
+            {
+                char s[100];
+
+                sc.GetCurrent(s, sizeof(s));
+
+                if (Command.InList(s))
+                {
+                    sc.ChangeState(SCE_SORCUS_COMMAND);
+                }
+                else if (Parameter.InList(s))
+                {
+                    sc.ChangeState(SCE_SORCUS_PARAMETER);
+                }
+                else if (Constant.InList(s))
+                {
+                    sc.ChangeState(SCE_SORCUS_CONSTANT);
+                }
+
+                sc.SetState(SCE_SORCUS_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_SORCUS_COMMENTLINE )
+        {
+            if (sc.atLineEnd)
+            {
+                sc.SetState(SCE_SORCUS_DEFAULT);
+            }
+        }
+        else if (sc.state == SCE_SORCUS_STRING)
+        {
+            if (sc.ch == '\"')
+            {
+                sc.ForwardSetState(SCE_SORCUS_DEFAULT);
+            }
+            else if (sc.atLineEnd)
+            {
+                sc.ChangeState(SCE_SORCUS_STRINGEOL);
+                sc.ForwardSetState(SCE_SORCUS_DEFAULT);
+            }
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_SORCUS_DEFAULT)
+        {
+            if ((sc.ch == ';') || (sc.ch == '\''))
+            {
+                sc.SetState(SCE_SORCUS_COMMENTLINE);
+            }
+            else if (IsSWordStart(sc.ch, sc.chPrev))
+            {
+                sc.SetState(SCE_SORCUS_IDENTIFIER);
+            }
+            else if (sc.ch == '\"')
+            {
+                sc.SetState(SCE_SORCUS_STRING);
+            }
+            else if (IsSorcusOperator(sc.ch))
+            {
+                sc.SetState(SCE_SORCUS_OPERATOR);
+            }
+            else if (IsSorcusNumber(sc.ch, sc.chPrev))
+            {
+                sc.SetState(SCE_SORCUS_NUMBER);
+            }
+        }
+
+    }
+    sc.Complete();
+}
+
+
+static const char* const SorcusWordListDesc[] = {"Command","Parameter", "Constant", 0};
+
+LexerModule lmSorc(SCLEX_SORCUS, ColouriseSorcusDoc, "sorcins", 0, SorcusWordListDesc);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scite-app/lexilla/lexers/LexSpecman.cxx b/scite-app/lexilla/lexers/LexSpecman.cxx
new file mode 100644
index 0000000..c898a47
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSpecman.cxx
@@ -0,0 +1,293 @@
+// Scintilla source code edit control
+/** @file LexSpecman.cxx
+ ** Lexer for Specman E language.
+ ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+}
+
+static inline bool IsANumberChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '\'');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '`');
+}
+
+static void ColouriseSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                            Accessor &styler, bool caseSensitive) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	// Do not leak onto next line
+	if (initStyle == SCE_SN_STRINGEOL)
+		initStyle = SCE_SN_CODE;
+
+	int visibleChars = 0;
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.atLineStart && (sc.state == SCE_SN_STRING)) {
+			// Prevent SCE_SN_STRINGEOL from leaking back to previous line
+			sc.SetState(SCE_SN_STRING);
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (sc.chNext == '\n' || sc.chNext == '\r') {
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					sc.Forward();
+				}
+				continue;
+			}
+		}
+
+		// Determine if the current state should terminate.
+		if (sc.state == SCE_SN_OPERATOR) {
+			sc.SetState(SCE_SN_CODE);
+		} else if (sc.state == SCE_SN_NUMBER) {
+			if (!IsANumberChar(sc.ch)) {
+				sc.SetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch) || (sc.ch == '.')) {
+				char s[100];
+				if (caseSensitive) {
+					sc.GetCurrent(s, sizeof(s));
+				} else {
+					sc.GetCurrentLowered(s, sizeof(s));
+				}
+				if (keywords.InList(s)) {
+					sc.ChangeState(SCE_SN_WORD);
+				} else if (keywords2.InList(s)) {
+					sc.ChangeState(SCE_SN_WORD2);
+				} else if (keywords3.InList(s)) {
+                                        sc.ChangeState(SCE_SN_WORD3);
+				} else if (keywords4.InList(s)) {
+					sc.ChangeState(SCE_SN_USER);
+				}
+				sc.SetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_PREPROCESSOR) {
+                        if (IsASpace(sc.ch)) {
+                                sc.SetState(SCE_SN_CODE);
+                        }
+		} else if (sc.state == SCE_SN_DEFAULT) {
+			if (sc.Match('<', '\'')) {
+				sc.Forward();
+				sc.ForwardSetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_COMMENTLINE || sc.state == SCE_SN_COMMENTLINEBANG) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_SN_CODE);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_SN_STRING) {
+			if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\"') {
+				sc.ForwardSetState(SCE_SN_CODE);
+			} else if (sc.atLineEnd) {
+				sc.ChangeState(SCE_SN_STRINGEOL);
+				sc.ForwardSetState(SCE_SN_CODE);
+				visibleChars = 0;
+			}
+		} else if (sc.state == SCE_SN_SIGNAL) {
+			if (sc.atLineEnd) {
+				sc.ChangeState(SCE_SN_STRINGEOL);
+				sc.ForwardSetState(SCE_SN_CODE);
+				visibleChars = 0;
+			} else if (sc.ch == '\\') {
+				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+					sc.Forward();
+				}
+			} else if (sc.ch == '\'') {
+				sc.ForwardSetState(SCE_SN_CODE);
+			}
+		} else if (sc.state == SCE_SN_REGEXTAG) {
+			if (!IsADigit(sc.ch)) {
+				sc.SetState(SCE_SN_CODE);
+			}
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_SN_CODE) {
+			if (sc.ch == '$' && IsADigit(sc.chNext)) {
+				sc.SetState(SCE_SN_REGEXTAG);
+                                sc.Forward();
+			} else if (IsADigit(sc.ch)) {
+                                sc.SetState(SCE_SN_NUMBER);
+			} else if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_SN_IDENTIFIER);
+			} else if (sc.Match('\'', '>')) {
+                                sc.SetState(SCE_SN_DEFAULT);
+				sc.Forward();	// Eat the * so it isn't used for the end of the comment
+			} else if (sc.Match('/', '/')) {
+				if (sc.Match("//!"))	// Nice to have a different comment style
+					sc.SetState(SCE_SN_COMMENTLINEBANG);
+				else
+					sc.SetState(SCE_SN_COMMENTLINE);
+			} else if (sc.Match('-', '-')) {
+				if (sc.Match("--!"))	// Nice to have a different comment style
+					sc.SetState(SCE_SN_COMMENTLINEBANG);
+				else
+					sc.SetState(SCE_SN_COMMENTLINE);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_SN_STRING);
+			} else if (sc.ch == '\'') {
+				sc.SetState(SCE_SN_SIGNAL);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_SN_PREPROCESSOR);
+				// Skip whitespace between # and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_SN_CODE);
+				}
+			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@') {
+				sc.SetState(SCE_SN_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			// Reset states to begining of colourise so no surprises
+			// if different sets of lines lexed.
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+	sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldNoBoxSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int,
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style;
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		//int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (foldComment && (style == SCE_SN_COMMENTLINE)) {
+			if (((ch == '/') && (chNext == '/')) ||
+                            ((ch == '-') && (chNext == '-'))) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelNext++;
+				} else if (chNext2 == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_SN_OPERATOR) {
+			if (ch == '{') {
+				// Measure the minimum before a '{' to allow
+				// folding on "} else {"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (ch == '}') {
+				levelNext--;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (foldAtElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+static void FoldSpecmanDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+                       Accessor &styler) {
+	FoldNoBoxSpecmanDoc(startPos, length, initStyle, styler);
+}
+
+static const char * const specmanWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "Sequence keywords and identifiers",
+            "User defined keywords and identifiers",
+            "Unused",
+            0,
+        };
+
+static void ColouriseSpecmanDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+                                     Accessor &styler) {
+	ColouriseSpecmanDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+
+LexerModule lmSpecman(SCLEX_SPECMAN, ColouriseSpecmanDocSensitive, "specman", FoldSpecmanDoc, specmanWordLists);
diff --git a/scite-app/lexilla/lexers/LexSpice.cxx b/scite-app/lexilla/lexers/LexSpice.cxx
new file mode 100644
index 0000000..c637449
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexSpice.cxx
@@ -0,0 +1,205 @@
+// Scintilla source code edit control
+/** @file LexSpice.cxx
+ ** Lexer for Spice
+ **/
+// Copyright 2006 by Fabien Proriol
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+/*
+ * Interface
+ */
+
+static void ColouriseDocument(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler);
+
+static const char * const spiceWordListDesc[] = {
+    "Keywords",        // SPICE command
+    "Keywords2",    // SPICE functions
+    "Keywords3",    // SPICE params
+    0
+};
+
+LexerModule lmSpice(SCLEX_SPICE, ColouriseDocument, "spice", NULL, spiceWordListDesc);
+
+/*
+ * Implementation
+ */
+
+static void ColouriseComment(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWhiteSpace(StyleContext& sc, bool& apostropheStartsAttribute);
+static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute);
+
+static inline bool IsDelimiterCharacter(int ch);
+static inline bool IsSeparatorOrDelimiterCharacter(int ch);
+
+static void ColouriseComment(StyleContext& sc, bool&) {
+    sc.SetState(SCE_SPICE_COMMENTLINE);
+    while (!sc.atLineEnd) {
+        sc.Forward();
+    }
+}
+
+static void ColouriseDelimiter(StyleContext& sc, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = sc.Match (')');
+    sc.SetState(SCE_SPICE_DELIMITER);
+    sc.ForwardSetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseNumber(StyleContext& sc, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = true;
+    std::string number;
+    sc.SetState(SCE_SPICE_NUMBER);
+    // Get all characters up to a delimiter or a separator, including points, but excluding
+    // double points (ranges).
+    while (!IsSeparatorOrDelimiterCharacter(sc.ch) || (sc.ch == '.' && sc.chNext != '.')) {
+        number += static_cast<char>(sc.ch);
+        sc.Forward();
+    }
+    // Special case: exponent with sign
+    if ((sc.chPrev == 'e' || sc.chPrev == 'E') &&
+            (sc.ch == '+' || sc.ch == '-')) {
+        number += static_cast<char>(sc.ch);
+        sc.Forward ();
+        while (!IsSeparatorOrDelimiterCharacter(sc.ch)) {
+            number += static_cast<char>(sc.ch);
+            sc.Forward();
+        }
+    }
+    sc.SetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseWhiteSpace(StyleContext& sc, bool& ) {
+    sc.SetState(SCE_SPICE_DEFAULT);
+    sc.ForwardSetState(SCE_SPICE_DEFAULT);
+}
+
+static void ColouriseWord(StyleContext& sc, WordList& keywords, WordList& keywords2, WordList& keywords3, bool& apostropheStartsAttribute) {
+    apostropheStartsAttribute = true;
+    sc.SetState(SCE_SPICE_IDENTIFIER);
+    std::string word;
+    while (!sc.atLineEnd && !IsSeparatorOrDelimiterCharacter(sc.ch)) {
+        word += static_cast<char>(tolower(sc.ch));
+        sc.Forward();
+    }
+    if (keywords.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    else if (keywords2.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD2);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    else if (keywords3.InList(word.c_str())) {
+        sc.ChangeState(SCE_SPICE_KEYWORD3);
+        if (word != "all") {
+            apostropheStartsAttribute = false;
+        }
+    }
+    sc.SetState(SCE_SPICE_DEFAULT);
+}
+
+//
+// ColouriseDocument
+//
+static void ColouriseDocument(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int initStyle,
+    WordList *keywordlists[],
+    Accessor &styler) {
+    WordList &keywords = *keywordlists[0];
+    WordList &keywords2 = *keywordlists[1];
+    WordList &keywords3 = *keywordlists[2];
+    StyleContext sc(startPos, length, initStyle, styler);
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    bool apostropheStartsAttribute = (styler.GetLineState(lineCurrent) & 1) != 0;
+    while (sc.More()) {
+        if (sc.atLineEnd) {
+            // Go to the next line
+            sc.Forward();
+            lineCurrent++;
+            // Remember the line state for future incremental lexing
+            styler.SetLineState(lineCurrent, apostropheStartsAttribute);
+            // Don't continue any styles on the next line
+            sc.SetState(SCE_SPICE_DEFAULT);
+        }
+        // Comments
+        if ((sc.Match('*') && sc.atLineStart) || sc.Match('*','~')) {
+            ColouriseComment(sc, apostropheStartsAttribute);
+        // Whitespace
+        } else if (IsASpace(sc.ch)) {
+            ColouriseWhiteSpace(sc, apostropheStartsAttribute);
+        // Delimiters
+        } else if (IsDelimiterCharacter(sc.ch)) {
+            ColouriseDelimiter(sc, apostropheStartsAttribute);
+        // Numbers
+        } else if (IsADigit(sc.ch) || sc.ch == '#') {
+            ColouriseNumber(sc, apostropheStartsAttribute);
+        // Keywords or identifiers
+        } else {
+            ColouriseWord(sc, keywords, keywords2, keywords3, apostropheStartsAttribute);
+        }
+    }
+    sc.Complete();
+}
+
+static inline bool IsDelimiterCharacter(int ch) {
+    switch (ch) {
+    case '&':
+    case '\'':
+    case '(':
+    case ')':
+    case '*':
+    case '+':
+    case ',':
+    case '-':
+    case '.':
+    case '/':
+    case ':':
+    case ';':
+    case '<':
+    case '=':
+    case '>':
+    case '|':
+        return true;
+    default:
+        return false;
+    }
+}
+
+static inline bool IsSeparatorOrDelimiterCharacter(int ch) {
+    return IsASpace(ch) || IsDelimiterCharacter(ch);
+}
diff --git a/scite-app/lexilla/lexers/LexStata.cxx b/scite-app/lexilla/lexers/LexStata.cxx
new file mode 100644
index 0000000..90d9694
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexStata.cxx
@@ -0,0 +1,206 @@
+// Scintilla source code edit control
+/** @file LexStata.cxx
+ ** Lexer for Stata
+ **/
+// Author: Luke Rasmussen (luke.rasmussen@gmail.com)
+//
+// The License.txt file describes the conditions under which this software may
+// be distributed.
+//
+// Developed as part of the StatTag project at Northwestern University Feinberg
+// School of Medicine with funding from Northwestern University Clinical and
+// Translational Sciences Institute through CTSA grant UL1TR001422.  This work
+// has not been reviewed or endorsed by NCATS or the NIH.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseStataDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &types = *keywordlists[1];
+    
+    CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+    CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+    CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+    bool lineHasNonCommentChar = false;
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+          lineHasNonCommentChar = false;
+        }
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+            case SCE_STATA_OPERATOR:
+                sc.SetState(SCE_STATA_DEFAULT);
+                break;
+            case SCE_STATA_NUMBER:
+                // We accept almost anything because of hex. and number suffixes
+                if (!setWord.Contains(sc.ch)) {
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_IDENTIFIER:
+                if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                    char s[1000];
+                    sc.GetCurrent(s, sizeof(s));
+                    if (keywords.InList(s)) {
+                        sc.ChangeState(SCE_STATA_WORD);
+                    }
+                    else if (types.InList(s)) {
+                        sc.ChangeState(SCE_STATA_TYPE);
+                    }
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_COMMENTBLOCK:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_COMMENT:
+            case SCE_STATA_COMMENTLINE:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_STRING:
+                if (sc.ch == '\\') {
+                    // Per Stata documentation, the following characters are the only ones that can
+                    // be escaped (not our typical set of quotes, etc.):
+                    // https://www.stata.com/support/faqs/programming/backslashes-and-macros/
+                    if (sc.chNext == '$' || sc.chNext == '`' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                }
+                else if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_STATA_DEFAULT);
+                }
+                break;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_STATA_DEFAULT) {
+            if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_NUMBER);
+            }
+            else if (setWordStart.Contains(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_IDENTIFIER);
+            }
+            else if (sc.Match('*') && !lineHasNonCommentChar) {
+                sc.SetState(SCE_STATA_COMMENT);
+            }
+            else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_STATA_COMMENTBLOCK);
+                sc.Forward();	// Eat the * so it isn't used for the end of the comment
+            }
+            else if (sc.Match('/', '/')) {
+                sc.SetState(SCE_STATA_COMMENTLINE);
+            }
+            else if (sc.ch == '\"') {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_STRING);
+            }
+            else if (isoperator(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_OPERATOR);
+            }
+        }
+    }
+
+    sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldStataDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+    Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_R_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            }
+            else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+
+static const char * const StataWordLists[] = {
+    "Language Keywords",
+    "Types",
+    0,
+};
+
+LexerModule lmStata(SCLEX_STATA, ColouriseStataDoc, "stata", FoldStataDoc, StataWordLists);
diff --git a/scite-app/lexilla/lexers/LexTACL.cxx b/scite-app/lexilla/lexers/LexTACL.cxx
new file mode 100644
index 0000000..f5e2c4c
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTACL.cxx
@@ -0,0 +1,401 @@
+// Scintilla source code edit control
+/** @file LexTACL.cxx
+ ** Lexer for TACL
+ ** Based on LexPascal.cxx
+ ** Written by Laurent le Tynevez
+ ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
+ ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
+ ** Updated by Rod Falck, Aug 2006 Converted to TACL
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+inline bool isTACLoperator(char ch)
+	{
+	return ch == '\'' || isoperator(ch);
+	}
+
+inline bool isTACLwordchar(char ch)
+	{
+	return ch == '#' || ch == '^' || ch == '|' || ch == '_' || iswordchar(ch);
+	}
+
+inline bool isTACLwordstart(char ch)
+	{
+	return ch == '#' || ch == '|' || ch == '_' || iswordstart(ch);
+	}
+
+static void getRange(Sci_PositionU start,
+		Sci_PositionU end,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_C_COMMENT ||
+		style == SCE_C_COMMENTDOC ||
+		style == SCE_C_COMMENTDOCKEYWORD ||
+		style == SCE_C_COMMENTDOCKEYWORDERROR;
+}
+
+static void ColourTo(Accessor &styler, Sci_PositionU end, unsigned int attr, bool bInAsm) {
+	if ((bInAsm) && (attr == SCE_C_OPERATOR || attr == SCE_C_NUMBER || attr == SCE_C_DEFAULT || attr == SCE_C_WORD || attr == SCE_C_IDENTIFIER)) {
+		styler.ColourTo(end, SCE_C_REGEX);
+	} else
+		styler.ColourTo(end, attr);
+}
+
+// returns 1 if the item starts a class definition, and -1 if the word is "end", and 2 if the word is "asm"
+static int classifyWordTACL(Sci_PositionU start, Sci_PositionU end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, bool bInAsm) {
+	int ret = 0;
+
+	WordList& keywords = *keywordlists[0];
+	WordList& builtins = *keywordlists[1];
+	WordList& commands = *keywordlists[2];
+
+	char s[100];
+	getRange(start, end, styler, s, sizeof(s));
+
+	char chAttr = SCE_C_IDENTIFIER;
+	if (isdigit(s[0]) || (s[0] == '.')) {
+		chAttr = SCE_C_NUMBER;
+	}
+	else {
+		if (s[0] == '#' || keywords.InList(s)) {
+			chAttr = SCE_C_WORD;
+
+			if (strcmp(s, "asm") == 0) {
+				ret = 2;
+			}
+			else if (strcmp(s, "end") == 0) {
+				ret = -1;
+			}
+		}
+		else if (s[0] == '|' || builtins.InList(s)) {
+			chAttr = SCE_C_WORD2;
+		}
+		else if (commands.InList(s)) {
+			chAttr = SCE_C_UUID;
+		}
+		else if (strcmp(s, "comment") == 0) {
+			chAttr = SCE_C_COMMENTLINE;
+			ret = 3;
+		}
+	}
+	ColourTo(styler, end, chAttr, (bInAsm && ret != -1));
+	return ret;
+}
+
+static int classifyFoldPointTACL(const char* s) {
+	int lev = 0;
+	if (s[0] == '[')
+		lev=1;
+	else if (s[0] == ']')
+		lev=-1;
+	return lev;
+}
+
+static void ColouriseTACLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+	Accessor &styler) {
+
+	styler.StartAt(startPos);
+
+	int state = initStyle;
+	if (state == SCE_C_CHARACTER)	// Does not leak onto next line
+		state = SCE_C_DEFAULT;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	Sci_PositionU lengthDoc = startPos + length;
+
+	bool bInClassDefinition;
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	if (currentLine > 0) {
+		styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
+		bInClassDefinition = (styler.GetLineState(currentLine) == 1);
+	} else {
+		styler.SetLineState(currentLine, 0);
+		bInClassDefinition = false;
+	}
+
+	bool bInAsm = (state == SCE_C_REGEX);
+	if (bInAsm)
+		state = SCE_C_DEFAULT;
+
+	styler.StartSegment(startPos);
+	int visibleChars = 0;
+	Sci_PositionU i;
+	for (i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// End of line
+			if (state == SCE_C_CHARACTER) {
+				ColourTo(styler, i, state, bInAsm);
+				state = SCE_C_DEFAULT;
+			}
+			visibleChars = 0;
+			currentLine++;
+			styler.SetLineState(currentLine, (bInClassDefinition ? 1 : 0));
+		}
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_C_DEFAULT) {
+			if (isTACLwordstart(ch)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_IDENTIFIER;
+			} else if (ch == '{') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENT;
+			} else if (ch == '{' && chNext == '*') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTDOC;
+			} else if (ch == '=' && chNext == '=') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTLINE;
+			} else if (ch == '"') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_STRING;
+			} else if (ch == '?' && visibleChars == 0) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_PREPROCESSOR;
+			} else if (isTACLoperator(ch)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+			}
+		} else if (state == SCE_C_IDENTIFIER) {
+			if (!isTACLwordchar(ch)) {
+				int lStateChange = classifyWordTACL(styler.GetStartSegment(), i - 1, keywordlists, styler, bInAsm);
+
+				if(lStateChange == 1) {
+					styler.SetLineState(currentLine, 1);
+					bInClassDefinition = true;
+				} else if(lStateChange == 2) {
+					bInAsm = true;
+				} else if(lStateChange == -1) {
+					styler.SetLineState(currentLine, 0);
+					bInClassDefinition = false;
+					bInAsm = false;
+				}
+
+				if (lStateChange == 3) {
+					 state = SCE_C_COMMENTLINE;
+				}
+				else {
+					state = SCE_C_DEFAULT;
+					chNext = styler.SafeGetCharAt(i + 1);
+					if (ch == '{') {
+						state = SCE_C_COMMENT;
+					} else if (ch == '{' && chNext == '*') {
+						ColourTo(styler, i-1, state, bInAsm);
+						state = SCE_C_COMMENTDOC;
+					} else if (ch == '=' && chNext == '=') {
+						state = SCE_C_COMMENTLINE;
+					} else if (ch == '"') {
+						state = SCE_C_STRING;
+					} else if (isTACLoperator(ch)) {
+						ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+					}
+				}
+			}
+		} else {
+			if (state == SCE_C_PREPROCESSOR) {
+				if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_COMMENT) {
+				if (ch == '}' || (ch == '\r' || ch == '\n') ) {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_COMMENTDOC) {
+				if (ch == '}' || (ch == '\r' || ch == '\n')) {
+					if (((i > styler.GetStartSegment() + 2) || (
+						(initStyle == SCE_C_COMMENTDOC) &&
+						(styler.GetStartSegment() == static_cast<Sci_PositionU>(startPos))))) {
+							ColourTo(styler, i, state, bInAsm);
+							state = SCE_C_DEFAULT;
+					}
+				}
+			} else if (state == SCE_C_COMMENTLINE) {
+				if (ch == '\r' || ch == '\n') {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_STRING) {
+				if (ch == '"' || ch == '\r' || ch == '\n') {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			}
+		}
+        if (!isspacechar(ch))
+            visibleChars++;
+		chPrev = ch;
+	}
+
+	// Process to end of document
+	if (state == SCE_C_IDENTIFIER) {
+		classifyWordTACL(styler.GetStartSegment(), i - 1, keywordlists, styler, bInAsm);
+		}
+	else
+		ColourTo(styler, lengthDoc - 1, state, bInAsm);
+}
+
+static void FoldTACLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool section = false;
+
+	Sci_Position lastStart = 0;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev == SCE_C_DEFAULT && (style == SCE_C_WORD || style == SCE_C_PREPROCESSOR))
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (stylePrev == SCE_C_WORD || stylePrev == SCE_C_PREPROCESSOR) {
+			if(isTACLwordchar(ch) && !isTACLwordchar(chNext)) {
+				char s[100];
+				getRange(lastStart, i, styler, s, sizeof(s));
+				if (stylePrev == SCE_C_PREPROCESSOR && strcmp(s, "?section") == 0)
+					{
+					section = true;
+					levelCurrent = 1;
+					levelPrev = 0;
+					}
+				else if (stylePrev == SCE_C_WORD)
+					levelCurrent += classifyFoldPointTACL(s);
+			}
+		}
+
+		if (style == SCE_C_OPERATOR) {
+			if (ch == '[') {
+				levelCurrent++;
+			} else if (ch == ']') {
+				levelCurrent--;
+			}
+		}
+		if (foldComment && (style == SCE_C_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
+			if (ch == '{' && chNext == '$') {
+				Sci_PositionU j=i+2; // skip {$
+				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region") || styler.Match(j, "if")) {
+					levelCurrent++;
+				} else if (styler.Match(j, "end")) {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+		if (atEOL) {
+			int lev = levelPrev | SC_FOLDLEVELBASE;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev || section) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			section = false;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const TACLWordListDesc[] = {
+	"Builtins",
+	"Labels",
+	"Commands",
+	0
+};
+
+LexerModule lmTACL(SCLEX_TACL, ColouriseTACLDoc, "TACL", FoldTACLDoc, TACLWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexTADS3.cxx b/scite-app/lexilla/lexers/LexTADS3.cxx
new file mode 100644
index 0000000..e43ced5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTADS3.cxx
@@ -0,0 +1,904 @@
+// Scintilla source code edit control
+/** @file LexTADS3.cxx
+ ** Lexer for TADS3.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/*
+ * TADS3 is a language designed by Michael J. Roberts for the writing of text
+ * based games.  TADS comes from Text Adventure Development System.  It has good
+ * support for the processing and outputting of formatted text and much of a
+ * TADS program listing consists of strings.
+ *
+ * TADS has two types of strings, those enclosed in single quotes (') and those
+ * enclosed in double quotes (").  These strings have different symantics and
+ * can be given different highlighting if desired.
+ *
+ * There can be embedded within both types of strings html tags
+ * ( <tag key=value> ), library directives ( <.directive> ), and message
+ * parameters ( {The doctor's/his} ).
+ *
+ * Double quoted strings can also contain interpolated expressions
+ * ( << rug.moved ? ' and a hole in the floor. ' : nil >> ).  These expressions
+ * may themselves contain single or double quoted strings, although the double
+ * quoted strings may not contain interpolated expressions.
+ *
+ * These embedded constructs influence the output and formatting and are an
+ * important part of a program and require highlighting.
+ *
+ * LINKS
+ * http://www.tads.org/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static const int T3_SINGLE_QUOTE = 1;
+static const int T3_INT_EXPRESSION = 2;
+static const int T3_INT_EXPRESSION_IN_TAG = 4;
+static const int T3_HTML_SQUOTE = 8;
+
+static inline bool IsEOL(const int ch, const int chNext) {
+        return (ch == '\r' && chNext != '\n') || (ch == '\n');
+}
+
+/*
+ *   Test the current character to see if it's the START of an EOL sequence;
+ *   if so, skip ahead to the last character of the sequence and return true,
+ *   and if not just return false.  There are a few places where we want to
+ *   check to see if a newline sequence occurs at a particular point, but
+ *   where a caller expects a subroutine to stop only upon reaching the END
+ *   of a newline sequence (in particular, CR-LF on Windows).  That's why
+ *   IsEOL() above only returns true on CR if the CR isn't followed by an LF
+ *   - it doesn't want to admit that there's a newline until reaching the END
+ *   of the sequence.  We meet both needs by saying that there's a newline
+ *   when we see the CR in a CR-LF, but skipping the CR before returning so
+ *   that the caller's caller will see that we've stopped at the LF.
+ */
+static inline bool IsEOLSkip(StyleContext &sc)
+{
+    /* test for CR-LF */
+    if (sc.ch == '\r' && sc.chNext == '\n')
+    {
+        /* got CR-LF - skip the CR and indicate that we're at a newline */
+        sc.Forward();
+        return true;
+    }
+
+    /*
+     *   in other cases, we have at most a 1-character newline, so do the
+     *   normal IsEOL test
+     */
+    return IsEOL(sc.ch, sc.chNext);
+}
+
+static inline bool IsATADS3Operator(const int ch) {
+        return ch == '=' || ch == '{' || ch == '}' || ch == '(' || ch == ')'
+                || ch == '[' || ch == ']' || ch == ',' || ch == ':' || ch == ';'
+                || ch == '+' || ch == '-' || ch == '*' || ch == '/' || ch == '%'
+                || ch == '?' || ch == '!' || ch == '<' || ch == '>' || ch == '|'
+                || ch == '@' || ch == '&' || ch == '~';
+}
+
+static inline bool IsAWordChar(const int ch) {
+        return isalnum(ch) || ch == '_';
+}
+
+static inline bool IsAWordStart(const int ch) {
+        return isalpha(ch) || ch == '_';
+}
+
+static inline bool IsAHexDigit(const int ch) {
+        int lch = tolower(ch);
+        return isdigit(lch) || lch == 'a' || lch == 'b' || lch == 'c'
+                || lch == 'd' || lch == 'e' || lch == 'f';
+}
+
+static inline bool IsAnHTMLChar(int ch) {
+        return isalnum(ch) || ch == '-' || ch == '_' || ch == '.';
+}
+
+static inline bool IsADirectiveChar(int ch) {
+        return isalnum(ch) || isspace(ch) || ch == '-' || ch == '/';
+}
+
+static inline bool IsANumberStart(StyleContext &sc) {
+        return isdigit(sc.ch)
+                || (!isdigit(sc.chPrev) && sc.ch == '.' && isdigit(sc.chNext));
+}
+
+inline static void ColouriseTADS3Operator(StyleContext &sc) {
+        int initState = sc.state;
+        int c = sc.ch;
+        sc.SetState(c == '{' || c == '}' ? SCE_T3_BRACE : SCE_T3_OPERATOR);
+        sc.ForwardSetState(initState);
+}
+
+static void ColouriseTADSHTMLString(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = sc.ch;
+        int chString = (lineState & T3_SINGLE_QUOTE) ? '\'' : '"';
+        if (endState == SCE_T3_HTML_STRING) {
+                if (lineState&T3_SINGLE_QUOTE) {
+                        endState = SCE_T3_S_STRING;
+                        chString = '\'';
+                } else if (lineState&T3_INT_EXPRESSION) {
+                        endState = SCE_T3_X_STRING;
+                        chString = '"';
+                } else {
+                        endState = SCE_T3_HTML_DEFAULT;
+                        chString = '"';
+                }
+                chQuote = (lineState & T3_HTML_SQUOTE) ? '\'' : '"';
+        } else {
+                sc.SetState(SCE_T3_HTML_STRING);
+                sc.Forward();
+        }
+        if (chQuote == '"')
+                lineState &= ~T3_HTML_SQUOTE;
+        else
+                lineState |= T3_HTML_SQUOTE;
+
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))) {
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.ch == chString) {
+                        sc.SetState(SCE_T3_DEFAULT);
+                        return;
+                }
+
+                if (sc.Match('<', '<')) {
+                        lineState |= T3_INT_EXPRESSION | T3_INT_EXPRESSION_IN_TAG;
+                        sc.SetState(SCE_T3_X_DEFAULT);
+                        sc.Forward(2);
+                        return;
+                }
+
+                if (sc.Match('\\', static_cast<char>(chQuote))
+                        || sc.Match('\\', static_cast<char>(chString))
+                        || sc.Match('\\', '\\')) {
+                        sc.Forward(2);
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3HTMLTagStart(StyleContext &sc) {
+        sc.SetState(SCE_T3_HTML_TAG);
+        sc.Forward();
+        if (sc.ch == '/') {
+                sc.Forward();
+        }
+        while (IsAnHTMLChar(sc.ch)) {
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3HTMLTag(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = '"';
+        int chString = '\'';
+        switch (endState) {
+                case SCE_T3_S_STRING:
+                        ColouriseTADS3HTMLTagStart(sc);
+                        sc.SetState(SCE_T3_HTML_DEFAULT);
+                        chQuote = '\'';
+                        chString = '"';
+                        break;
+                case SCE_T3_D_STRING:
+                case SCE_T3_X_STRING:
+                        ColouriseTADS3HTMLTagStart(sc);
+                        sc.SetState(SCE_T3_HTML_DEFAULT);
+                        break;
+                case SCE_T3_HTML_DEFAULT:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                endState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                                chString = '"';
+                        } else if (lineState&T3_INT_EXPRESSION) {
+                                endState = SCE_T3_X_STRING;
+                        } else {
+                                endState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.Match('/', '>')) {
+                        sc.SetState(SCE_T3_HTML_TAG);
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.ch == '>') {
+                        sc.SetState(SCE_T3_HTML_TAG);
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.SetState(endState);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))) {
+                        sc.Forward();
+                        ColouriseTADSHTMLString(sc, lineState);
+                        if (sc.state == SCE_T3_X_DEFAULT)
+                            break;
+                } else if (sc.ch == chString) {
+                        ColouriseTADSHTMLString(sc, lineState);
+                } else if (sc.ch == '=') {
+                        ColouriseTADS3Operator(sc);
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3Keyword(StyleContext &sc,
+                                                        WordList *keywordlists[],       Sci_PositionU endPos) {
+        char s[250];
+        WordList &keywords = *keywordlists[0];
+        WordList &userwords1 = *keywordlists[1];
+        WordList &userwords2 = *keywordlists[2];
+        WordList &userwords3 = *keywordlists[3];
+        int initState = sc.state;
+        sc.SetState(SCE_T3_IDENTIFIER);
+        while (sc.More() && (IsAWordChar(sc.ch))) {
+                sc.Forward();
+        }
+        sc.GetCurrent(s, sizeof(s));
+        if ( strcmp(s, "is") == 0 || strcmp(s, "not") == 0) {
+                // have to find if "in" is next
+                Sci_Position n = 1;
+                while (n + sc.currentPos < endPos && IsASpaceOrTab(sc.GetRelative(n)))
+                        n++;
+                if (sc.GetRelative(n) == 'i' && sc.GetRelative(n+1) == 'n') {
+                        sc.Forward(n+2);
+                        sc.ChangeState(SCE_T3_KEYWORD);
+                }
+        } else if (keywords.InList(s)) {
+                sc.ChangeState(SCE_T3_KEYWORD);
+        } else if (userwords3.InList(s)) {
+                sc.ChangeState(SCE_T3_USER3);
+        } else if (userwords2.InList(s)) {
+                sc.ChangeState(SCE_T3_USER2);
+        } else if (userwords1.InList(s)) {
+                sc.ChangeState(SCE_T3_USER1);
+        }
+        sc.SetState(initState);
+}
+
+static void ColouriseTADS3MsgParam(StyleContext &sc, int &lineState) {
+        int endState = sc.state;
+        int chQuote = '"';
+        switch (endState) {
+                case SCE_T3_S_STRING:
+                        sc.SetState(SCE_T3_MSG_PARAM);
+                        sc.Forward();
+                        chQuote = '\'';
+                        break;
+                case SCE_T3_D_STRING:
+                case SCE_T3_X_STRING:
+                        sc.SetState(SCE_T3_MSG_PARAM);
+                        sc.Forward();
+                        break;
+                case SCE_T3_MSG_PARAM:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                endState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                        } else if (lineState&T3_INT_EXPRESSION) {
+                                endState = SCE_T3_X_STRING;
+                        } else {
+                                endState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+        while (sc.More() && sc.ch != '}' && sc.ch != chQuote) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == '\\') {
+                        sc.Forward();
+                }
+                sc.Forward();
+        }
+        if (sc.ch == chQuote) {
+                sc.SetState(endState);
+        } else {
+                sc.ForwardSetState(endState);
+        }
+}
+
+static void ColouriseTADS3LibDirective(StyleContext &sc, int &lineState) {
+        int initState = sc.state;
+        int chQuote = '"';
+        switch (initState) {
+                case SCE_T3_S_STRING:
+                        sc.SetState(SCE_T3_LIB_DIRECTIVE);
+                        sc.Forward(2);
+                        chQuote = '\'';
+                        break;
+                case SCE_T3_D_STRING:
+                        sc.SetState(SCE_T3_LIB_DIRECTIVE);
+                        sc.Forward(2);
+                        break;
+                case SCE_T3_LIB_DIRECTIVE:
+                        if (lineState&T3_SINGLE_QUOTE) {
+                                initState = SCE_T3_S_STRING;
+                                chQuote = '\'';
+                        } else {
+                                initState = SCE_T3_D_STRING;
+                        }
+                        break;
+        }
+        while (sc.More() && IsADirectiveChar(sc.ch)) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                sc.Forward();
+        };
+        if (sc.ch == '>' || !sc.More()) {
+                sc.ForwardSetState(initState);
+        } else if (sc.ch == chQuote) {
+                sc.SetState(initState);
+        } else {
+                sc.ChangeState(initState);
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3String(StyleContext &sc, int &lineState) {
+        int chQuote = sc.ch;
+        int endState = sc.state;
+        switch (sc.state) {
+                case SCE_T3_DEFAULT:
+                case SCE_T3_X_DEFAULT:
+                        if (chQuote == '"') {
+                                if (sc.state == SCE_T3_DEFAULT) {
+                                        sc.SetState(SCE_T3_D_STRING);
+                                } else {
+                                        sc.SetState(SCE_T3_X_STRING);
+                                }
+                                lineState &= ~T3_SINGLE_QUOTE;
+                        } else {
+                                sc.SetState(SCE_T3_S_STRING);
+                                lineState |= T3_SINGLE_QUOTE;
+                        }
+                        sc.Forward();
+                        break;
+                case SCE_T3_S_STRING:
+                        chQuote = '\'';
+                        endState = lineState&T3_INT_EXPRESSION ?
+                                SCE_T3_X_DEFAULT : SCE_T3_DEFAULT;
+                        break;
+                case SCE_T3_D_STRING:
+                        chQuote = '"';
+                        endState = SCE_T3_DEFAULT;
+                        break;
+                case SCE_T3_X_STRING:
+                        chQuote = '"';
+                        endState = SCE_T3_X_DEFAULT;
+                        break;
+        }
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.ch == chQuote) {
+                        sc.ForwardSetState(endState);
+                        return;
+                }
+                if (sc.state == SCE_T3_D_STRING && sc.Match('<', '<')) {
+                        lineState |= T3_INT_EXPRESSION;
+                        sc.SetState(SCE_T3_X_DEFAULT);
+                        sc.Forward(2);
+                        return;
+                }
+                if (sc.Match('\\', static_cast<char>(chQuote))
+                    || sc.Match('\\', '\\')) {
+                        sc.Forward(2);
+                } else if (sc.ch == '{') {
+                        ColouriseTADS3MsgParam(sc, lineState);
+                } else if (sc.Match('<', '.')) {
+                        ColouriseTADS3LibDirective(sc, lineState);
+                } else if (sc.ch == '<') {
+                        ColouriseTADS3HTMLTag(sc, lineState);
+                        if (sc.state == SCE_T3_X_DEFAULT)
+                                return;
+                } else {
+                        sc.Forward();
+                }
+        }
+}
+
+static void ColouriseTADS3Comment(StyleContext &sc, int endState) {
+        sc.SetState(SCE_T3_BLOCK_COMMENT);
+        while (sc.More()) {
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        return;
+                }
+                if (sc.Match('*', '/')) {
+                        sc.Forward(2);
+                        sc.SetState(endState);
+                        return;
+                }
+                sc.Forward();
+        }
+}
+
+static void ColouriseToEndOfLine(StyleContext &sc, int initState, int endState) {
+        sc.SetState(initState);
+        while (sc.More()) {
+                if (sc.ch == '\\') {
+                        sc.Forward();
+                        if (IsEOLSkip(sc)) {
+                                        return;
+                        }
+                }
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        sc.SetState(endState);
+                        return;
+                }
+                sc.Forward();
+        }
+}
+
+static void ColouriseTADS3Number(StyleContext &sc) {
+        int endState = sc.state;
+        bool inHexNumber = false;
+        bool seenE = false;
+        bool seenDot = sc.ch == '.';
+        sc.SetState(SCE_T3_NUMBER);
+        if (sc.More()) {
+                sc.Forward();
+        }
+        if (sc.chPrev == '0' && tolower(sc.ch) == 'x') {
+                inHexNumber = true;
+                sc.Forward();
+        }
+        while (sc.More()) {
+                if (inHexNumber) {
+                        if (!IsAHexDigit(sc.ch)) {
+                                break;
+                        }
+                } else if (!isdigit(sc.ch)) {
+                        if (!seenE && tolower(sc.ch) == 'e') {
+                                seenE = true;
+                                seenDot = true;
+                                if (sc.chNext == '+' || sc.chNext == '-') {
+                                        sc.Forward();
+                                }
+                        } else if (!seenDot && sc.ch == '.') {
+                                seenDot = true;
+                        } else {
+                                break;
+                        }
+                }
+                sc.Forward();
+        }
+        sc.SetState(endState);
+}
+
+static void ColouriseTADS3Doc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                                                           WordList *keywordlists[], Accessor &styler) {
+        int visibleChars = 0;
+        int bracketLevel = 0;
+        int lineState = 0;
+        Sci_PositionU endPos = startPos + length;
+        Sci_Position lineCurrent = styler.GetLine(startPos);
+        if (lineCurrent > 0) {
+                lineState = styler.GetLineState(lineCurrent-1);
+        }
+        StyleContext sc(startPos, length, initStyle, styler);
+
+        while (sc.More()) {
+
+                if (IsEOL(sc.ch, sc.chNext)) {
+                        styler.SetLineState(lineCurrent, lineState);
+                        lineCurrent++;
+                        visibleChars = 0;
+                        sc.Forward();
+                        if (sc.ch == '\n') {
+                                sc.Forward();
+                        }
+                }
+
+                switch(sc.state) {
+                        case SCE_T3_PREPROCESSOR:
+                        case SCE_T3_LINE_COMMENT:
+                                ColouriseToEndOfLine(sc, sc.state, lineState&T3_INT_EXPRESSION ?
+                                        SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
+                                break;
+                        case SCE_T3_S_STRING:
+                        case SCE_T3_D_STRING:
+                        case SCE_T3_X_STRING:
+                                ColouriseTADS3String(sc, lineState);
+                                visibleChars++;
+                                break;
+                        case SCE_T3_MSG_PARAM:
+                                ColouriseTADS3MsgParam(sc, lineState);
+                                break;
+                        case SCE_T3_LIB_DIRECTIVE:
+                                ColouriseTADS3LibDirective(sc, lineState);
+                                break;
+                        case SCE_T3_HTML_DEFAULT:
+                                ColouriseTADS3HTMLTag(sc, lineState);
+                                break;
+                        case SCE_T3_HTML_STRING:
+                                ColouriseTADSHTMLString(sc, lineState);
+                                break;
+                        case SCE_T3_BLOCK_COMMENT:
+                                ColouriseTADS3Comment(sc, lineState&T3_INT_EXPRESSION ?
+                                        SCE_T3_X_DEFAULT : SCE_T3_DEFAULT);
+                                break;
+                        case SCE_T3_DEFAULT:
+                        case SCE_T3_X_DEFAULT:
+                                if (IsASpaceOrTab(sc.ch)) {
+                                        sc.Forward();
+                                } else if (sc.ch == '#' && visibleChars == 0) {
+                                        ColouriseToEndOfLine(sc, SCE_T3_PREPROCESSOR, sc.state);
+                                } else if (sc.Match('/', '*')) {
+                                        ColouriseTADS3Comment(sc, sc.state);
+                                        visibleChars++;
+                                } else if (sc.Match('/', '/')) {
+                                        ColouriseToEndOfLine(sc, SCE_T3_LINE_COMMENT, sc.state);
+                                } else if (sc.ch == '"') {
+                                        bracketLevel = 0;
+                                        ColouriseTADS3String(sc, lineState);
+                                        visibleChars++;
+                                } else if (sc.ch == '\'') {
+                                        ColouriseTADS3String(sc, lineState);
+                                        visibleChars++;
+                                } else if (sc.state == SCE_T3_X_DEFAULT && bracketLevel == 0
+                                                   && sc.Match('>', '>')) {
+                                        sc.Forward(2);
+                                        sc.SetState(SCE_T3_D_STRING);
+                                        if (lineState & T3_INT_EXPRESSION_IN_TAG)
+                                                sc.SetState(SCE_T3_HTML_STRING);
+                                        lineState &= ~(T3_SINGLE_QUOTE|T3_INT_EXPRESSION
+                                                       |T3_INT_EXPRESSION_IN_TAG);
+                                } else if (IsATADS3Operator(sc.ch)) {
+                                        if (sc.state == SCE_T3_X_DEFAULT) {
+                                                if (sc.ch == '(') {
+                                                        bracketLevel++;
+                                                } else if (sc.ch == ')' && bracketLevel > 0) {
+                                                        bracketLevel--;
+                                                }
+                                        }
+                                        ColouriseTADS3Operator(sc);
+                                        visibleChars++;
+                                } else if (IsANumberStart(sc)) {
+                                        ColouriseTADS3Number(sc);
+                                        visibleChars++;
+                                } else if (IsAWordStart(sc.ch)) {
+                                        ColouriseTADS3Keyword(sc, keywordlists, endPos);
+                                        visibleChars++;
+                                } else if (sc.Match("...")) {
+                                        sc.SetState(SCE_T3_IDENTIFIER);
+                                        sc.Forward(3);
+                                        sc.SetState(SCE_T3_DEFAULT);
+                                } else {
+                                        sc.Forward();
+                                        visibleChars++;
+                                }
+                                break;
+                        default:
+                                sc.SetState(SCE_T3_DEFAULT);
+                                sc.Forward();
+                }
+        }
+        sc.Complete();
+}
+
+/*
+ TADS3 has two styles of top level block (TLB). Eg
+
+ // default style
+ silverKey : Key 'small silver key' 'small silver key'
+        "A small key glints in the sunlight. "
+ ;
+
+ and
+
+ silverKey : Key {
+        'small silver key'
+        'small silver key'
+        "A small key glints in the sunlight. "
+ }
+
+ Some constructs mandate one or the other, but usually the author has may choose
+ either.
+
+ T3_SEENSTART is used to indicate that a braceless TLB has been (potentially)
+ seen and is also used to match the closing ';' of the default style.
+
+ T3_EXPECTINGIDENTIFIER and T3_EXPECTINGPUNCTUATION are used to keep track of
+ what characters may be seen without incrementing the block level.  The general
+ pattern is identifier <punc> identifier, acceptable punctuation characters
+ are ':', ',', '(' and ')'.  No attempt is made to ensure that punctuation
+ characters are syntactically correct, eg parentheses match. A ')' always
+ signifies the start of a block.  We just need to check if it is followed by a
+ '{', in which case we let the brace handling code handle the folding level.
+
+ expectingIdentifier == false && expectingIdentifier == false
+ Before the start of a TLB.
+
+ expectingIdentifier == true && expectingIdentifier == true
+ Currently in an identifier.  Will accept identifier or punctuation.
+
+ expectingIdentifier == true && expectingIdentifier == false
+ Just seen a punctuation character & now waiting for an identifier to start.
+
+ expectingIdentifier == false && expectingIdentifier == truee
+ We were in an identifier and have seen space.  Now waiting to see a punctuation
+ character
+
+ Space, comments & preprocessor directives are always acceptable and are
+ equivalent.
+*/
+
+static const int T3_SEENSTART = 1 << 12;
+static const int T3_EXPECTINGIDENTIFIER = 1 << 13;
+static const int T3_EXPECTINGPUNCTUATION = 1 << 14;
+
+static inline bool IsStringTransition(int s1, int s2) {
+        return s1 != s2
+                && (s1 == SCE_T3_S_STRING || s1 == SCE_T3_X_STRING
+                        || (s1 == SCE_T3_D_STRING && s2 != SCE_T3_X_DEFAULT))
+                && s2 != SCE_T3_LIB_DIRECTIVE
+                && s2 != SCE_T3_MSG_PARAM
+                && s2 != SCE_T3_HTML_TAG
+                && s2 != SCE_T3_HTML_STRING;
+}
+
+static inline bool IsATADS3Punctuation(const int ch) {
+        return ch == ':' || ch == ',' || ch == '(' || ch == ')';
+}
+
+static inline bool IsAnIdentifier(const int style) {
+        return style == SCE_T3_IDENTIFIER
+                || style == SCE_T3_USER1
+                || style == SCE_T3_USER2
+                || style == SCE_T3_USER3;
+}
+
+static inline bool IsAnOperator(const int style) {
+    return style == SCE_T3_OPERATOR || style == SCE_T3_BRACE;
+}
+
+static inline bool IsSpaceEquivalent(const int ch, const int style) {
+        return isspace(ch)
+                || style == SCE_T3_BLOCK_COMMENT
+                || style == SCE_T3_LINE_COMMENT
+                || style == SCE_T3_PREPROCESSOR;
+}
+
+static char peekAhead(Sci_PositionU startPos, Sci_PositionU endPos,
+                                          Accessor &styler) {
+        for (Sci_PositionU i = startPos; i < endPos; i++) {
+                int style = styler.StyleAt(i);
+                char ch = styler[i];
+                if (!IsSpaceEquivalent(ch, style)) {
+                        if (IsAnIdentifier(style)) {
+                                return 'a';
+                        }
+                        if (IsATADS3Punctuation(ch)) {
+                                return ':';
+                        }
+                        if (ch == '{') {
+                                return '{';
+                        }
+                        return '*';
+                }
+        }
+        return ' ';
+}
+
+static void FoldTADS3Doc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                            WordList *[], Accessor &styler) {
+        Sci_PositionU endPos = startPos + length;
+        Sci_Position lineCurrent = styler.GetLine(startPos);
+        int levelCurrent = SC_FOLDLEVELBASE;
+        if (lineCurrent > 0)
+                levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+        int seenStart = levelCurrent & T3_SEENSTART;
+        int expectingIdentifier = levelCurrent & T3_EXPECTINGIDENTIFIER;
+        int expectingPunctuation = levelCurrent & T3_EXPECTINGPUNCTUATION;
+        levelCurrent &= SC_FOLDLEVELNUMBERMASK;
+        int levelMinCurrent = levelCurrent;
+        int levelNext = levelCurrent;
+        char chNext = styler[startPos];
+        int styleNext = styler.StyleAt(startPos);
+        int style = initStyle;
+        char ch = chNext;
+        int stylePrev = style;
+        bool redo = false;
+        for (Sci_PositionU i = startPos; i < endPos; i++) {
+                if (redo) {
+                        redo = false;
+                        i--;
+                } else {
+                        ch = chNext;
+                        chNext = styler.SafeGetCharAt(i + 1);
+                        stylePrev = style;
+                        style = styleNext;
+                        styleNext = styler.StyleAt(i + 1);
+                }
+                bool atEOL = IsEOL(ch, chNext);
+
+                if (levelNext == SC_FOLDLEVELBASE) {
+                        if (IsSpaceEquivalent(ch, style)) {
+                                if (expectingPunctuation) {
+                                        expectingIdentifier = 0;
+                                }
+                                if (style == SCE_T3_BLOCK_COMMENT) {
+                                        levelNext++;
+                                }
+                        } else if (ch == '{') {
+                                levelNext++;
+                                seenStart = 0;
+                        } else if (ch == '\'' || ch == '"' || ch == '[') {
+                                levelNext++;
+                                if (seenStart) {
+                                        redo = true;
+                                }
+                        } else if (ch == ';') {
+                                seenStart = 0;
+                                expectingIdentifier = 0;
+                                expectingPunctuation = 0;
+                        } else if (expectingIdentifier && expectingPunctuation) {
+                                if (IsATADS3Punctuation(ch)) {
+                                        if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
+                                                levelNext++;
+                                        } else {
+                                                expectingPunctuation = 0;
+                                        }
+                                } else if (!IsAnIdentifier(style)) {
+                                        levelNext++;
+                                }
+                        } else if (expectingIdentifier && !expectingPunctuation) {
+                                if (!IsAnIdentifier(style)) {
+                                        levelNext++;
+                                } else {
+                                        expectingPunctuation = T3_EXPECTINGPUNCTUATION;
+                                }
+                        } else if (!expectingIdentifier && expectingPunctuation) {
+                                if (!IsATADS3Punctuation(ch)) {
+                                        levelNext++;
+                                } else {
+                                        if (ch == ')' && peekAhead(i+1, endPos, styler) != '{') {
+                                                levelNext++;
+                                        } else {
+                                                expectingIdentifier = T3_EXPECTINGIDENTIFIER;
+                                                expectingPunctuation = 0;
+                                        }
+                                }
+                        } else if (!expectingIdentifier && !expectingPunctuation) {
+                                if (IsAnIdentifier(style)) {
+                                        seenStart = T3_SEENSTART;
+                                        expectingIdentifier = T3_EXPECTINGIDENTIFIER;
+                                        expectingPunctuation = T3_EXPECTINGPUNCTUATION;
+                                }
+                        }
+
+                        if (levelNext != SC_FOLDLEVELBASE && style != SCE_T3_BLOCK_COMMENT) {
+                                expectingIdentifier = 0;
+                                expectingPunctuation = 0;
+                        }
+
+                } else if (levelNext == SC_FOLDLEVELBASE+1 && seenStart
+                                   && ch == ';' && IsAnOperator(style)) {
+                        levelNext--;
+                        seenStart = 0;
+                } else if (style == SCE_T3_BLOCK_COMMENT) {
+                        if (stylePrev != SCE_T3_BLOCK_COMMENT) {
+                                levelNext++;
+                        } else if (styleNext != SCE_T3_BLOCK_COMMENT && !atEOL) {
+                                // Comments don't end at end of line and the next character may be unstyled.
+                                levelNext--;
+                        }
+                } else if (ch == '\'' || ch == '"') {
+                        if (IsStringTransition(style, stylePrev)) {
+                                if (levelMinCurrent > levelNext) {
+                                        levelMinCurrent = levelNext;
+                                }
+                                levelNext++;
+                        } else if (IsStringTransition(style, styleNext)) {
+                                levelNext--;
+                        }
+                } else if (IsAnOperator(style)) {
+                        if (ch == '{' || ch == '[') {
+                                // Measure the minimum before a '{' to allow
+                                // folding on "} else {"
+                                if (levelMinCurrent > levelNext) {
+                                        levelMinCurrent = levelNext;
+                                }
+                                levelNext++;
+                        } else if (ch == '}' || ch == ']') {
+                                levelNext--;
+                        }
+                }
+
+                if (atEOL) {
+                        if (seenStart && levelNext == SC_FOLDLEVELBASE) {
+                                switch (peekAhead(i+1, endPos, styler)) {
+                                        case ' ':
+                                        case '{':
+                                                break;
+                                        case '*':
+                                                levelNext++;
+                                                break;
+                                        case 'a':
+                                                if (expectingPunctuation) {
+                                                        levelNext++;
+                                                }
+                                                break;
+                                        case ':':
+                                                if (expectingIdentifier) {
+                                                        levelNext++;
+                                                }
+                                                break;
+                                }
+                                if (levelNext != SC_FOLDLEVELBASE) {
+                                        expectingIdentifier = 0;
+                                        expectingPunctuation = 0;
+                                }
+                        }
+                        int lev = levelMinCurrent | (levelNext | expectingIdentifier
+                                | expectingPunctuation | seenStart) << 16;
+                        if (levelMinCurrent < levelNext)
+                                lev |= SC_FOLDLEVELHEADERFLAG;
+                        if (lev != styler.LevelAt(lineCurrent)) {
+                                styler.SetLevel(lineCurrent, lev);
+                        }
+                        lineCurrent++;
+                        levelCurrent = levelNext;
+                        levelMinCurrent = levelCurrent;
+                }
+        }
+}
+
+static const char * const tads3WordList[] = {
+        "TADS3 Keywords",
+        "User defined 1",
+        "User defined 2",
+        "User defined 3",
+        0
+};
+
+LexerModule lmTADS3(SCLEX_TADS3, ColouriseTADS3Doc, "tads3", FoldTADS3Doc, tads3WordList);
diff --git a/scite-app/lexilla/lexers/LexTAL.cxx b/scite-app/lexilla/lexers/LexTAL.cxx
new file mode 100644
index 0000000..ef5490b
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTAL.cxx
@@ -0,0 +1,400 @@
+// Scintilla source code edit control
+/** @file LexTAL.cxx
+ ** Lexer for TAL
+ ** Based on LexPascal.cxx
+ ** Written by Laurent le Tynevez
+ ** Updated by Simon Steele <s.steele@pnotepad.org> September 2002
+ ** Updated by Mathias Rauen <scite@madshi.net> May 2003 (Delphi adjustments)
+ ** Updated by Rod Falck, Aug 2006 Converted to TAL
+ **/
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+inline bool isTALoperator(char ch)
+	{
+	return ch == '\'' || ch == '@' || ch == '#' || isoperator(ch);
+	}
+
+inline bool isTALwordchar(char ch)
+	{
+	return ch == '$' || ch == '^' || iswordchar(ch);
+	}
+
+inline bool isTALwordstart(char ch)
+	{
+	return ch == '$' || ch == '^' || iswordstart(ch);
+	}
+
+static void getRange(Sci_PositionU start,
+		Sci_PositionU end,
+		Accessor &styler,
+		char *s,
+		Sci_PositionU len) {
+	Sci_PositionU i = 0;
+	while ((i < end - start + 1) && (i < len-1)) {
+		s[i] = static_cast<char>(tolower(styler[start + i]));
+		i++;
+	}
+	s[i] = '\0';
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_C_COMMENT ||
+		style == SCE_C_COMMENTDOC ||
+		style == SCE_C_COMMENTDOCKEYWORD ||
+		style == SCE_C_COMMENTDOCKEYWORDERROR;
+}
+
+static void ColourTo(Accessor &styler, Sci_PositionU end, unsigned int attr, bool bInAsm) {
+	if ((bInAsm) && (attr == SCE_C_OPERATOR || attr == SCE_C_NUMBER || attr == SCE_C_DEFAULT || attr == SCE_C_WORD || attr == SCE_C_IDENTIFIER)) {
+		styler.ColourTo(end, SCE_C_REGEX);
+	} else
+		styler.ColourTo(end, attr);
+}
+
+// returns 1 if the item starts a class definition, and -1 if the word is "end", and 2 if the word is "asm"
+static int classifyWordTAL(Sci_PositionU start, Sci_PositionU end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, bool bInAsm) {
+	int ret = 0;
+
+	WordList& keywords = *keywordlists[0];
+	WordList& builtins = *keywordlists[1];
+	WordList& nonreserved_keywords = *keywordlists[2];
+
+	char s[100];
+	getRange(start, end, styler, s, sizeof(s));
+
+	char chAttr = SCE_C_IDENTIFIER;
+	if (isdigit(s[0]) || (s[0] == '.')) {
+		chAttr = SCE_C_NUMBER;
+	}
+	else {
+		if (keywords.InList(s)) {
+			chAttr = SCE_C_WORD;
+
+			if (strcmp(s, "asm") == 0) {
+				ret = 2;
+			}
+			else if (strcmp(s, "end") == 0) {
+				ret = -1;
+			}
+		}
+		else if (s[0] == '$' || builtins.InList(s)) {
+			chAttr = SCE_C_WORD2;
+		}
+		else if (nonreserved_keywords.InList(s)) {
+			chAttr = SCE_C_UUID;
+		}
+	}
+	ColourTo(styler, end, chAttr, (bInAsm && ret != -1));
+	return ret;
+}
+
+static int classifyFoldPointTAL(const char* s) {
+	int lev = 0;
+	if (!(isdigit(s[0]) || (s[0] == '.'))) {
+		if (strcmp(s, "begin") == 0 ||
+			strcmp(s, "block") == 0) {
+			lev=1;
+		} else if (strcmp(s, "end") == 0) {
+			lev=-1;
+		}
+	}
+	return lev;
+}
+
+static void ColouriseTALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+	Accessor &styler) {
+
+	styler.StartAt(startPos);
+
+	int state = initStyle;
+	if (state == SCE_C_CHARACTER)	// Does not leak onto next line
+		state = SCE_C_DEFAULT;
+	char chPrev = ' ';
+	char chNext = styler[startPos];
+	Sci_PositionU lengthDoc = startPos + length;
+
+	bool bInClassDefinition;
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	if (currentLine > 0) {
+		styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
+		bInClassDefinition = (styler.GetLineState(currentLine) == 1);
+	} else {
+		styler.SetLineState(currentLine, 0);
+		bInClassDefinition = false;
+	}
+
+	bool bInAsm = (state == SCE_C_REGEX);
+	if (bInAsm)
+		state = SCE_C_DEFAULT;
+
+	styler.StartSegment(startPos);
+	int visibleChars = 0;
+	for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
+		char ch = chNext;
+
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
+			// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
+			// Avoid triggering two times on Dos/Win
+			// End of line
+			if (state == SCE_C_CHARACTER) {
+				ColourTo(styler, i, state, bInAsm);
+				state = SCE_C_DEFAULT;
+			}
+			visibleChars = 0;
+			currentLine++;
+			styler.SetLineState(currentLine, (bInClassDefinition ? 1 : 0));
+		}
+
+		if (styler.IsLeadByte(ch)) {
+			chNext = styler.SafeGetCharAt(i + 2);
+			chPrev = ' ';
+			i += 1;
+			continue;
+		}
+
+		if (state == SCE_C_DEFAULT) {
+			if (isTALwordstart(ch)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_IDENTIFIER;
+			} else if (ch == '!' && chNext != '*') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENT;
+			} else if (ch == '!' && chNext == '*') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTDOC;
+			} else if (ch == '-' && chNext == '-') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_COMMENTLINE;
+			} else if (ch == '"') {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_STRING;
+			} else if (ch == '?' && visibleChars == 0) {
+				ColourTo(styler, i-1, state, bInAsm);
+				state = SCE_C_PREPROCESSOR;
+			} else if (isTALoperator(ch)) {
+				ColourTo(styler, i-1, state, bInAsm);
+				ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+			}
+		} else if (state == SCE_C_IDENTIFIER) {
+			if (!isTALwordchar(ch)) {
+				int lStateChange = classifyWordTAL(styler.GetStartSegment(), i - 1, keywordlists, styler, bInAsm);
+
+				if(lStateChange == 1) {
+					styler.SetLineState(currentLine, 1);
+					bInClassDefinition = true;
+				} else if(lStateChange == 2) {
+					bInAsm = true;
+				} else if(lStateChange == -1) {
+					styler.SetLineState(currentLine, 0);
+					bInClassDefinition = false;
+					bInAsm = false;
+				}
+
+				state = SCE_C_DEFAULT;
+				chNext = styler.SafeGetCharAt(i + 1);
+				if (ch == '!' && chNext != '*') {
+					state = SCE_C_COMMENT;
+				} else if (ch == '!' && chNext == '*') {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_COMMENTDOC;
+				} else if (ch == '-' && chNext == '-') {
+					state = SCE_C_COMMENTLINE;
+				} else if (ch == '"') {
+					state = SCE_C_STRING;
+				} else if (isTALoperator(ch)) {
+					ColourTo(styler, i, SCE_C_OPERATOR, bInAsm);
+				}
+			}
+		} else {
+			if (state == SCE_C_PREPROCESSOR) {
+				if ((ch == '\r' || ch == '\n') && !(chPrev == '\\' || chPrev == '\r')) {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_COMMENT) {
+				if (ch == '!' || (ch == '\r' || ch == '\n') ) {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_COMMENTDOC) {
+				if (ch == '!' || (ch == '\r' || ch == '\n')) {
+					if (((i > styler.GetStartSegment() + 2) || (
+						(initStyle == SCE_C_COMMENTDOC) &&
+						(styler.GetStartSegment() == static_cast<Sci_PositionU>(startPos))))) {
+							ColourTo(styler, i, state, bInAsm);
+							state = SCE_C_DEFAULT;
+					}
+				}
+			} else if (state == SCE_C_COMMENTLINE) {
+				if (ch == '\r' || ch == '\n') {
+					ColourTo(styler, i-1, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			} else if (state == SCE_C_STRING) {
+				if (ch == '"') {
+					ColourTo(styler, i, state, bInAsm);
+					state = SCE_C_DEFAULT;
+				}
+			}
+		}
+        if (!isspacechar(ch))
+            visibleChars++;
+		chPrev = ch;
+	}
+	ColourTo(styler, lengthDoc - 1, state, bInAsm);
+}
+
+static void FoldTALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+                            Accessor &styler) {
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	bool foldPreprocessor = styler.GetPropertyInt("fold.preprocessor") != 0;
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent = levelPrev;
+	char chNext = styler[startPos];
+	int styleNext = styler.StyleAt(startPos);
+	int style = initStyle;
+	bool was_end = false;
+	bool section = false;
+
+	Sci_Position lastStart = 0;
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = styler.StyleAt(i + 1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+		if (stylePrev == SCE_C_DEFAULT && (style == SCE_C_WORD || style == SCE_C_UUID || style == SCE_C_PREPROCESSOR))
+		{
+			// Store last word start point.
+			lastStart = i;
+		}
+
+		if (stylePrev == SCE_C_WORD || style == SCE_C_UUID || stylePrev == SCE_C_PREPROCESSOR) {
+			if(isTALwordchar(ch) && !isTALwordchar(chNext)) {
+				char s[100];
+				getRange(lastStart, i, styler, s, sizeof(s));
+				if (stylePrev == SCE_C_PREPROCESSOR && strcmp(s, "?section") == 0)
+					{
+					section = true;
+					levelCurrent = 1;
+					levelPrev = 0;
+					}
+				else if (stylePrev == SCE_C_WORD || stylePrev == SCE_C_UUID)
+					{
+					if (strcmp(s, "block") == 0)
+						{
+						// block keyword is ignored immediately after end keyword
+						if (!was_end)
+							levelCurrent++;
+						}
+					else
+						levelCurrent += classifyFoldPointTAL(s);
+					if (strcmp(s, "end") == 0)
+						{
+						was_end = true;
+						}
+					else
+						{
+						was_end = false;
+						}
+					}
+			}
+		}
+
+		if (foldComment && (style == SCE_C_COMMENTLINE)) {
+			if ((ch == '/') && (chNext == '/')) {
+				char chNext2 = styler.SafeGetCharAt(i + 2);
+				if (chNext2 == '{') {
+					levelCurrent++;
+				} else if (chNext2 == '}') {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldPreprocessor && (style == SCE_C_PREPROCESSOR)) {
+			if (ch == '{' && chNext == '$') {
+				Sci_PositionU j=i+2; // skip {$
+				while ((j<endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+					j++;
+				}
+				if (styler.Match(j, "region") || styler.Match(j, "if")) {
+					levelCurrent++;
+				} else if (styler.Match(j, "end")) {
+					levelCurrent--;
+				}
+			}
+		}
+
+		if (foldComment && IsStreamCommentStyle(style)) {
+			if (!IsStreamCommentStyle(stylePrev)) {
+				levelCurrent++;
+			} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+				// Comments don't end at end of line and the next character may be unstyled.
+				levelCurrent--;
+			}
+		}
+
+		if (atEOL) {
+			int lev = levelPrev | SC_FOLDLEVELBASE;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev || section) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+			section = false;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+static const char * const TALWordListDesc[] = {
+	"Keywords",
+	"Builtins",
+	0
+};
+
+LexerModule lmTAL(SCLEX_TAL, ColouriseTALDoc, "TAL", FoldTALDoc, TALWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexTCL.cxx b/scite-app/lexilla/lexers/LexTCL.cxx
new file mode 100644
index 0000000..5e34aea
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTCL.cxx
@@ -0,0 +1,375 @@
+// Scintilla source code edit control
+/** @file LexTCL.cxx
+ ** Lexer for TCL language.
+ **/
+// Copyright 1998-2001 by Andre Arpin <arpin@kingston.net>
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 ||
+	       (isalnum(ch) || ch == '_' || ch ==':' || ch=='.'); // : name space separator
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch >= 0x80 || (ch ==':' || isalpha(ch) || ch == '_');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	       (IsADigit(ch, 0x10) || toupper(ch) == 'E' ||
+	        ch == '.' || ch == '-' || ch == '+');
+}
+
+static void ColouriseTCLDoc(Sci_PositionU startPos, Sci_Position length, int , WordList *keywordlists[], Accessor &styler) {
+#define  isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT)
+	const bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	bool commentLevel = false;
+	bool subBrace = false; // substitution begin with a brace ${.....}
+	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf,
+	                 LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32
+	                } lineState = LS_DEFAULT;
+	bool prevSlash = false;
+	int currentLevel = 0;
+	bool expected = 0;
+	bool subParen = 0;
+
+	Sci_Position currentLine = styler.GetLine(startPos);
+	if (currentLine > 0)
+		currentLine--;
+	length += startPos - styler.LineStart(currentLine);
+	// make sure lines overlap
+	startPos = styler.LineStart(currentLine);
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+	WordList &keywords5 = *keywordlists[4];
+	WordList &keywords6 = *keywordlists[5];
+	WordList &keywords7 = *keywordlists[6];
+	WordList &keywords8 = *keywordlists[7];
+	WordList &keywords9 = *keywordlists[8];
+
+	if (currentLine > 0) {
+		int ls = styler.GetLineState(currentLine - 1);
+		lineState = tLineState(ls & LS_MASK_STATE);
+		expected = LS_COMMAND_EXPECTED == tLineState(ls & LS_COMMAND_EXPECTED);
+		subBrace = LS_BRACE_ONLY == tLineState(ls & LS_BRACE_ONLY);
+		currentLevel = styler.LevelAt(currentLine - 1) >> 17;
+		commentLevel = (styler.LevelAt(currentLine - 1) >> 16) & 1;
+	} else
+		styler.SetLevel(0, SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG);
+	bool visibleChars = false;
+
+	int previousLevel = currentLevel;
+	StyleContext sc(startPos, length, SCE_TCL_DEFAULT, styler);
+	for (; ; sc.Forward()) {
+next:
+		if (sc.ch=='\r' && sc.chNext == '\n') // only ignore \r on PC process on the mac
+			continue;
+		bool atEnd = !sc.More();  // make sure we coloured the last word
+		if (lineState != LS_DEFAULT) {
+			sc.SetState(SCE_TCL_DEFAULT);
+			if (lineState == LS_OPEN_COMMENT)
+				sc.SetState(SCE_TCL_COMMENTLINE);
+			else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+				sc.SetState(SCE_TCL_IN_QUOTE);
+			else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#')))
+				sc.SetState(SCE_TCL_COMMENT_BOX);
+			lineState = LS_DEFAULT;
+		}
+		if (subBrace) { // ${ overrides every thing even \ except }
+			if (sc.ch == '}') {
+				subBrace = false;
+				sc.SetState(SCE_TCL_OPERATOR);
+				sc.ForwardSetState(SCE_TCL_DEFAULT);
+				goto next;
+			} else
+				sc.SetState(SCE_TCL_SUB_BRACE);
+			if (!sc.atLineEnd)
+				continue;
+		} else if (sc.state == SCE_TCL_DEFAULT || sc.state ==SCE_TCL_OPERATOR) {
+			expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch) || sc.ch =='#';
+		} else if (sc.state == SCE_TCL_SUBSTITUTION) {
+			switch (sc.ch) {
+			case '(':
+				subParen=true;
+				sc.SetState(SCE_TCL_OPERATOR);
+				sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
+				continue;
+			case ')':
+				sc.SetState(SCE_TCL_OPERATOR);
+				subParen=false;
+				continue;
+			case '$':
+				continue;
+			case ',':
+				sc.SetState(SCE_TCL_OPERATOR);
+				if (subParen) {
+					sc.ForwardSetState(SCE_TCL_SUBSTITUTION);
+					goto next;	// Already forwarded so avoid loop's Forward()
+				}
+				continue;
+			default :
+				// maybe spaces should be allowed ???
+				if (!IsAWordChar(sc.ch)) { // probably the code is wrong
+					sc.SetState(SCE_TCL_DEFAULT);
+					subParen = 0;
+				}
+				break;
+			}
+		} else if (isComment(sc.state)) {
+		} else if (!IsAWordChar(sc.ch)) {
+			if ((sc.state == SCE_TCL_IDENTIFIER && expected) ||  sc.state == SCE_TCL_MODIFIER) {
+				char w[100];
+				sc.GetCurrent(w, sizeof(w));
+				char *s=w;
+				if (w[strlen(w)-1]=='\r')
+					w[strlen(w)-1]=0;
+				while (*s == ':') // ignore leading : like in ::set a 10
+					++s;
+				bool quote = sc.state == SCE_TCL_IN_QUOTE;
+				if (commentLevel  || expected) {
+					if (keywords.InList(s)) {
+						sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2);
+					} else if (keywords3.InList(s)) {
+						sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4);
+					} else if (sc.GetRelative(-static_cast<Sci_Position>(strlen(s))-1) == '{' &&
+					           keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces
+						sc.ChangeState(SCE_TCL_EXPAND);
+					}
+					if (keywords6.InList(s)) {
+						sc.ChangeState(SCE_TCL_WORD5);
+					} else if (keywords7.InList(s)) {
+						sc.ChangeState(SCE_TCL_WORD6);
+					} else if (keywords8.InList(s)) {
+						sc.ChangeState(SCE_TCL_WORD7);
+					} else if (keywords9.InList(s)) {
+						sc.ChangeState(SCE_TCL_WORD8);
+					}
+				}
+				expected = false;
+				sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT);
+			} else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) {
+				sc.SetState(SCE_TCL_DEFAULT);
+			}
+		}
+		if (atEnd)
+			break;
+		if (sc.atLineEnd) {
+			lineState = LS_DEFAULT;
+			currentLine = styler.GetLine(sc.currentPos);
+			if (foldComment && sc.state!=SCE_TCL_COMMENT && isComment(sc.state)) {
+				if (currentLevel == 0) {
+					++currentLevel;
+					commentLevel = true;
+				}
+			} else {
+				if (visibleChars && commentLevel) {
+					--currentLevel;
+					--previousLevel;
+					commentLevel = false;
+				}
+			}
+			int flag = 0;
+			if (!visibleChars && foldCompact)
+				flag = SC_FOLDLEVELWHITEFLAG;
+			if (currentLevel > previousLevel)
+				flag = SC_FOLDLEVELHEADERFLAG;
+			styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16));
+
+			// Update the line state, so it can be seen by next line
+			if (sc.state == SCE_TCL_IN_QUOTE) {
+				lineState = LS_OPEN_DOUBLE_QUOTE;
+			} else {
+				if (prevSlash) {
+					if (isComment(sc.state))
+						lineState = LS_OPEN_COMMENT;
+				} else if (sc.state == SCE_TCL_COMMENT_BOX)
+					lineState = LS_COMMENT_BOX;
+			}
+			styler.SetLineState(currentLine,
+			                    (subBrace ? LS_BRACE_ONLY : 0) |
+			                    (expected ? LS_COMMAND_EXPECTED : 0)  | lineState);
+			if (lineState == LS_COMMENT_BOX)
+				sc.ForwardSetState(SCE_TCL_COMMENT_BOX);
+			else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+				sc.ForwardSetState(SCE_TCL_IN_QUOTE);
+			else
+				sc.ForwardSetState(SCE_TCL_DEFAULT);
+			prevSlash = false;
+			previousLevel = currentLevel;
+			visibleChars = false;
+			goto next;
+		}
+
+		if (prevSlash) {
+			prevSlash = false;
+			if (sc.ch == '#' && IsANumberChar(sc.chNext))
+				sc.ForwardSetState(SCE_TCL_NUMBER);
+			continue;
+		}
+		prevSlash = sc.ch == '\\';
+		if (isComment(sc.state))
+			continue;
+		if (sc.atLineStart) {
+			visibleChars = false;
+			if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state))
+			{
+				sc.SetState(SCE_TCL_DEFAULT);
+				expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch));
+			}
+		}
+
+		switch (sc.state) {
+		case SCE_TCL_NUMBER:
+			if (!IsANumberChar(sc.ch))
+				sc.SetState(SCE_TCL_DEFAULT);
+			break;
+		case SCE_TCL_IN_QUOTE:
+			if (sc.ch == '"') {
+				sc.ForwardSetState(SCE_TCL_DEFAULT);
+				visibleChars = true; // necessary if a " is the first and only character on a line
+				goto next;
+			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
+				sc.SetState(SCE_TCL_OPERATOR);
+				expected = sc.ch == '[';
+				sc.ForwardSetState(SCE_TCL_IN_QUOTE);
+				goto next;
+			}
+			continue;
+		case SCE_TCL_OPERATOR:
+			sc.SetState(SCE_TCL_DEFAULT);
+			break;
+		}
+
+		if (sc.ch == '#') {
+			if (visibleChars) {
+				if (sc.state != SCE_TCL_IN_QUOTE && expected)
+					sc.SetState(SCE_TCL_COMMENT);
+			} else {
+				sc.SetState(SCE_TCL_COMMENTLINE);
+				if (sc.chNext == '~')
+					sc.SetState(SCE_TCL_BLOCK_COMMENT);
+				if (sc.atLineStart && (sc.chNext == '#' || sc.chNext == '-'))
+					sc.SetState(SCE_TCL_COMMENT_BOX);
+			}
+		}
+
+		if (!isspacechar(static_cast<unsigned char>(sc.ch))) {
+			visibleChars = true;
+		}
+
+		if (sc.ch == '\\') {
+			prevSlash = true;
+			continue;
+		}
+
+		// Determine if a new state should be entered.
+		if (sc.state == SCE_TCL_DEFAULT) {
+			if (IsAWordStart(sc.ch)) {
+				sc.SetState(SCE_TCL_IDENTIFIER);
+			} else if (IsADigit(sc.ch) && !IsAWordChar(sc.chPrev)) {
+				sc.SetState(SCE_TCL_NUMBER);
+			} else {
+				switch (sc.ch) {
+				case '\"':
+					sc.SetState(SCE_TCL_IN_QUOTE);
+					break;
+				case '{':
+					sc.SetState(SCE_TCL_OPERATOR);
+					expected = true;
+					++currentLevel;
+					break;
+				case '}':
+					sc.SetState(SCE_TCL_OPERATOR);
+					expected = true;
+					--currentLevel;
+					break;
+				case '[':
+					expected = true;
+					[[fallthrough]];
+				case ']':
+				case '(':
+				case ')':
+					sc.SetState(SCE_TCL_OPERATOR);
+					break;
+				case ';':
+					expected = true;
+					break;
+				case '$':
+					subParen = 0;
+					if (sc.chNext != '{') {
+						sc.SetState(SCE_TCL_SUBSTITUTION);
+					} else {
+						sc.SetState(SCE_TCL_OPERATOR);  // $
+						sc.Forward();  // {
+						sc.ForwardSetState(SCE_TCL_SUB_BRACE);
+						subBrace = true;
+					}
+					break;
+				case '#':
+					if ((isspacechar(static_cast<unsigned char>(sc.chPrev))||
+					        isoperator(static_cast<char>(sc.chPrev))) && IsADigit(sc.chNext,0x10))
+						sc.SetState(SCE_TCL_NUMBER);
+					break;
+				case '-':
+					sc.SetState(IsADigit(sc.chNext)? SCE_TCL_NUMBER: SCE_TCL_MODIFIER);
+					break;
+				default:
+					if (isoperator(static_cast<char>(sc.ch))) {
+						sc.SetState(SCE_TCL_OPERATOR);
+					}
+				}
+			}
+		}
+	}
+	sc.Complete();
+}
+
+static const char *const tclWordListDesc[] = {
+	"TCL Keywords",
+	"TK Keywords",
+	"iTCL Keywords",
+	"tkCommands",
+	"expand",
+	"user1",
+	"user2",
+	"user3",
+	"user4",
+	0
+};
+
+// this code supports folding in the colourizer
+LexerModule lmTCL(SCLEX_TCL, ColouriseTCLDoc, "tcl", 0, tclWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexTCMD.cxx b/scite-app/lexilla/lexers/LexTCMD.cxx
new file mode 100644
index 0000000..23dbd11
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTCMD.cxx
@@ -0,0 +1,507 @@
+// Scintilla\ source code edit control
+/** @file LexTCMD.cxx
+ ** Lexer for Take Command / TCC batch scripts (.bat, .btm, .cmd).
+ **/
+// Written by Rex Conn (rconn [at] jpsoft [dot] com)
+// based on the CMD lexer
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+static bool IsAlphabetic(int ch) {
+	return IsASCII(ch) && isalpha(ch);
+}
+
+static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+// Tests for BATCH Operators
+static bool IsBOperator(char ch) {
+	return (ch == '=') || (ch == '+') || (ch == '>') || (ch == '<') || (ch == '|') || (ch == '&') || (ch == '!') || (ch == '?') || (ch == '*') || (ch == '(') || (ch == ')');
+}
+
+// Tests for BATCH Separators
+static bool IsBSeparator(char ch) {
+	return (ch == '\\') || (ch == '.') || (ch == ';') || (ch == ' ') || (ch == '\t') || (ch == '[') || (ch == ']') || (ch == '\"') || (ch == '\'') || (ch == '/');
+}
+
+// Find length of CMD FOR variable with modifier (%~...) or return 0
+static unsigned int GetBatchVarLen( char *wordBuffer )
+{
+	int nLength = 0;
+	if ( wordBuffer[0] == '%' ) {
+
+		if ( wordBuffer[1] == '~' )
+			nLength = 2;
+		else if (( wordBuffer[1] == '%' ) && ( wordBuffer[2] == '~' ))
+			nLength++;
+		else
+			return 0;
+
+		for ( ; ( wordBuffer[nLength] ); nLength++ ) {
+
+			switch ( toupper(wordBuffer[nLength]) ) {
+			case 'A':
+				// file attributes
+			case 'D':
+				// drive letter only
+			case 'F':
+				// fully qualified path name
+			case 'N':
+				// filename only
+			case 'P':
+				// path only
+			case 'S':
+				// short name
+			case 'T':
+				// date / time of file
+			case 'X':
+				// file extension only
+			case 'Z':
+				// file size
+				break;
+			default:
+				return nLength;
+			}
+		}
+	}
+
+	return nLength;
+}
+
+
+static void ColouriseTCMDLine( char *lineBuffer, Sci_PositionU lengthLine, Sci_PositionU startLine, Sci_PositionU endPos, WordList *keywordlists[], Accessor &styler)
+{
+	Sci_PositionU offset = 0;	// Line Buffer Offset
+	char wordBuffer[260];		// Word Buffer - large to catch long paths
+	Sci_PositionU wbl;			// Word Buffer Length
+	Sci_PositionU wbo;			// Word Buffer Offset - also Special Keyword Buffer Length
+	WordList &keywords = *keywordlists[0];      // Internal Commands
+//	WordList &keywords2 = *keywordlists[1];     // Aliases (optional)
+	bool isDelayedExpansion = 1;				// !var!
+
+	bool continueProcessing = true;	// Used to toggle Regular Keyword Checking
+	// Special Keywords are those that allow certain characters without whitespace after the command
+	// Examples are: cd. cd\ echo: echo. path=
+	bool inString = false; // Used for processing while ""
+	// Special Keyword Buffer used to determine if the first n characters is a Keyword
+	char sKeywordBuffer[260] = "";	// Special Keyword Buffer
+	bool sKeywordFound;		// Exit Special Keyword for-loop if found
+
+	// Skip leading whitespace
+	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+		offset++;
+	}
+	// Colorize Default Text
+	styler.ColourTo(startLine + offset - 1, SCE_TCMD_DEFAULT);
+
+	if ( offset >= lengthLine )
+		return;
+
+	// Check for Fake Label (Comment) or Real Label - return if found
+	if (lineBuffer[offset] == ':') {
+		if (lineBuffer[offset + 1] == ':') {
+			// Colorize Fake Label (Comment) - :: is the same as REM
+			styler.ColourTo(endPos, SCE_TCMD_COMMENT);
+		} else {
+			// Colorize Real Label
+			styler.ColourTo(endPos, SCE_TCMD_LABEL);
+		}
+		return;
+
+	// Check for Comment - return if found
+	} else if (( CompareNCaseInsensitive(lineBuffer+offset, "rem", 3) == 0 ) && (( lineBuffer[offset+3] == 0 ) || ( isspace(lineBuffer[offset+3] )))) {
+			styler.ColourTo(endPos, SCE_TCMD_COMMENT);
+			return;
+
+	// Check for Drive Change (Drive Change is internal command) - return if found
+	} else if ((IsAlphabetic(lineBuffer[offset])) &&
+		(lineBuffer[offset + 1] == ':') &&
+		((isspacechar(lineBuffer[offset + 2])) ||
+		(((lineBuffer[offset + 2] == '\\')) &&
+		(isspacechar(lineBuffer[offset + 3]))))) {
+		// Colorize Regular Keyword
+		styler.ColourTo(endPos, SCE_TCMD_WORD);
+		return;
+	}
+
+	// Check for Hide Command (@ECHO OFF/ON)
+	if (lineBuffer[offset] == '@') {
+		styler.ColourTo(startLine + offset, SCE_TCMD_HIDE);
+		offset++;
+	}
+	// Skip whitespace
+	while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+		offset++;
+	}
+
+	// Read remainder of line word-at-a-time or remainder-of-word-at-a-time
+	while (offset < lengthLine) {
+		if (offset > startLine) {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1, SCE_TCMD_DEFAULT);
+		}
+		// Copy word from Line Buffer into Word Buffer
+		wbl = 0;
+		for (; offset < lengthLine && ( wbl < 260 ) && !isspacechar(lineBuffer[offset]); wbl++, offset++) {
+			wordBuffer[wbl] = static_cast<char>(tolower(lineBuffer[offset]));
+		}
+		wordBuffer[wbl] = '\0';
+		wbo = 0;
+
+		// Check for Separator
+		if (IsBSeparator(wordBuffer[0])) {
+
+			// Reset Offset to re-process remainder of word
+			offset -= (wbl - 1);
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
+
+			if (wordBuffer[0] == '"')
+				inString = !inString;
+
+		// Check for Regular expression
+		} else if (( wordBuffer[0] == ':' ) && ( wordBuffer[1] == ':' ) && (continueProcessing)) {
+
+			// Colorize Regular exoressuin
+			styler.ColourTo(startLine + offset - 1, SCE_TCMD_DEFAULT);
+			// No need to Reset Offset
+
+		// Check for Labels in text (... :label)
+		} else if (wordBuffer[0] == ':' && isspacechar(lineBuffer[offset - wbl - 1])) {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_TCMD_DEFAULT);
+			// Colorize Label
+			styler.ColourTo(startLine + offset - 1, SCE_TCMD_CLABEL);
+			// No need to Reset Offset
+		// Check for delayed expansion Variable (!x...!)
+		} else if (isDelayedExpansion && wordBuffer[0] == '!') {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_TCMD_DEFAULT);
+			wbo++;
+			// Search to end of word for second !
+			while ((wbo < wbl) && (wordBuffer[wbo] != '!') && (!IsBOperator(wordBuffer[wbo])) && (!IsBSeparator(wordBuffer[wbo]))) {
+				wbo++;
+			}
+			if (wordBuffer[wbo] == '!') {
+				wbo++;
+				// Colorize Environment Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_TCMD_EXPANSION);
+			} else {
+				wbo = 1;
+				// Colorize Symbol
+				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_TCMD_DEFAULT);
+			}
+
+			// Reset Offset to re-process remainder of word
+			offset -= (wbl - wbo);
+
+		// Check for Regular Keyword in list
+		} else if ((keywords.InList(wordBuffer)) &&	(!inString) && (continueProcessing)) {
+
+			// ECHO, PATH, and PROMPT require no further Regular Keyword Checking
+			if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echos") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echoerr") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echoserr") == 0) ||
+			  (CompareCaseInsensitive(wordBuffer, "path") == 0) ||
+			  (CompareCaseInsensitive(wordBuffer, "prompt") == 0)) {
+				continueProcessing = false;
+			}
+
+			// Colorize Regular keyword
+			styler.ColourTo(startLine + offset - 1, SCE_TCMD_WORD);
+			// No need to Reset Offset
+
+		} else if ((wordBuffer[0] != '%') && (wordBuffer[0] != '!') && (!IsBOperator(wordBuffer[0])) &&	(!inString) && (continueProcessing)) {
+
+			// a few commands accept "illegal" syntax -- cd\, echo., etc.
+			sscanf( wordBuffer, "%[^.<>|&=\\/]", sKeywordBuffer );
+			sKeywordFound = false;
+
+			if ((CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echos") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echoerr") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "echoserr") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "cd") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "path") == 0) ||
+			  (CompareCaseInsensitive(sKeywordBuffer, "prompt") == 0)) {
+
+				// no further Regular Keyword Checking
+				continueProcessing = false;
+				sKeywordFound = true;
+				wbo = (Sci_PositionU)strlen( sKeywordBuffer );
+
+				// Colorize Special Keyword as Regular Keyword
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_TCMD_WORD);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - wbo);
+			}
+
+			// Check for Default Text
+			if (!sKeywordFound) {
+				wbo = 0;
+				// Read up to %, Operator or Separator
+				while ((wbo < wbl) && (wordBuffer[wbo] != '%') && (!isDelayedExpansion || wordBuffer[wbo] != '!') && (!IsBOperator(wordBuffer[wbo])) &&	(!IsBSeparator(wordBuffer[wbo]))) {
+					wbo++;
+				}
+				// Colorize Default Text
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_TCMD_DEFAULT);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - wbo);
+			}
+
+		// Check for Argument  (%n), Environment Variable (%x...%) or Local Variable (%%a)
+		} else if (wordBuffer[0] == '%') {
+			unsigned int varlen;
+			unsigned int n = 1;
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_TCMD_DEFAULT);
+			wbo++;
+
+			// check for %[nn] syntax
+			if ( wordBuffer[1] == '[' ) {
+				n++;
+				while ((n < wbl) && (wordBuffer[n] != ']')) {
+					n++;
+				}
+				if ( wordBuffer[n] == ']' )
+					n++;
+				goto ColorizeArg;
+			}
+
+			// Search to end of word for second % or to the first terminator (can be a long path)
+			while ((wbo < wbl) && (wordBuffer[wbo] != '%') && (!IsBOperator(wordBuffer[wbo])) && (!IsBSeparator(wordBuffer[wbo]))) {
+				wbo++;
+			}
+
+			// Check for Argument (%n) or (%*)
+			if (((isdigit(wordBuffer[1])) || (wordBuffer[1] == '*')) && (wordBuffer[wbo] != '%')) {
+				while (( wordBuffer[n] ) && ( strchr( "%0123456789*#$", wordBuffer[n] ) != NULL ))
+					n++;
+ColorizeArg:
+				// Colorize Argument
+				styler.ColourTo(startLine + offset - 1 - (wbl - n), SCE_TCMD_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - n);
+
+			// Check for Variable with modifiers (%~...)
+			} else if ((varlen = GetBatchVarLen(wordBuffer)) != 0) {
+
+				// Colorize Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - varlen), SCE_TCMD_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - varlen);
+
+			// Check for Environment Variable (%x...%)
+			} else if (( wordBuffer[1] ) && ( wordBuffer[1] != '%')) {
+				if ( wordBuffer[wbo] == '%' )
+					wbo++;
+
+				// Colorize Environment Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_TCMD_ENVIRONMENT);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - wbo);
+
+			// Check for Local Variable (%%a)
+			} else if (	(wbl > 2) && (wordBuffer[1] == '%') && (wordBuffer[2] != '%') && (!IsBOperator(wordBuffer[2])) && (!IsBSeparator(wordBuffer[2]))) {
+
+				n = 2;
+				while (( wordBuffer[n] ) && (!IsBOperator(wordBuffer[n])) && (!IsBSeparator(wordBuffer[n])))
+					n++;
+
+				// Colorize Local Variable
+				styler.ColourTo(startLine + offset - 1 - (wbl - n), SCE_TCMD_IDENTIFIER);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - n);
+
+			// Check for %%
+			} else if ((wbl > 1) && (wordBuffer[1] == '%')) {
+
+				// Colorize Symbols
+				styler.ColourTo(startLine + offset - 1 - (wbl - 2), SCE_TCMD_DEFAULT);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 2);
+			} else {
+
+				// Colorize Symbol
+				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_TCMD_DEFAULT);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+			}
+
+		// Check for Operator
+		} else if (IsBOperator(wordBuffer[0])) {
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - wbl, SCE_TCMD_DEFAULT);
+
+			// Check for Pipe, compound, or conditional Operator
+			if ((wordBuffer[0] == '|') || (wordBuffer[0] == '&')) {
+
+				// Colorize Pipe Operator
+				styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_TCMD_OPERATOR);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+				continueProcessing = true;
+
+			// Check for Other Operator
+			} else {
+				// Check for > Operator
+				if ((wordBuffer[0] == '>') || (wordBuffer[0] == '<')) {
+					// Turn Keyword and External Command / Program checking back on
+					continueProcessing = true;
+				}
+				// Colorize Other Operator
+				if (!inString || !(wordBuffer[0] == '(' || wordBuffer[0] == ')'))
+					styler.ColourTo(startLine + offset - 1 - (wbl - 1), SCE_TCMD_OPERATOR);
+				// Reset Offset to re-process remainder of word
+				offset -= (wbl - 1);
+			}
+
+		// Check for Default Text
+		} else {
+			// Read up to %, Operator or Separator
+			while ((wbo < wbl) && (wordBuffer[wbo] != '%') && (!isDelayedExpansion || wordBuffer[wbo] != '!') && (!IsBOperator(wordBuffer[wbo])) &&	(!IsBSeparator(wordBuffer[wbo]))) {
+				wbo++;
+			}
+			// Colorize Default Text
+			styler.ColourTo(startLine + offset - 1 - (wbl - wbo), SCE_TCMD_DEFAULT);
+			// Reset Offset to re-process remainder of word
+			offset -= (wbl - wbo);
+		}
+
+		// Skip whitespace - nothing happens if Offset was Reset
+		while ((offset < lengthLine) && (isspacechar(lineBuffer[offset]))) {
+			offset++;
+		}
+	}
+	// Colorize Default Text for remainder of line - currently not lexed
+	styler.ColourTo(endPos, SCE_TCMD_DEFAULT);
+}
+
+static void ColouriseTCMDDoc( Sci_PositionU startPos, Sci_Position length, int /*initStyle*/, WordList *keywordlists[], Accessor &styler )
+{
+	char lineBuffer[16384];
+
+	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)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseTCMDLine(lineBuffer, linePos, startLine, i, keywordlists, styler);
+			linePos = 0;
+			startLine = i + 1;
+		}
+	}
+	if (linePos > 0) {	// Last line does not have ending characters
+		lineBuffer[linePos] = '\0';
+		ColouriseTCMDLine(lineBuffer, linePos, startLine, startPos + length - 1, keywordlists, styler);
+	}
+}
+
+// Convert string to upper case
+static void StrUpr(char *s) {
+	while (*s) {
+		*s = MakeUpperCase(*s);
+		s++;
+	}
+}
+
+// Folding support (for DO, IFF, SWITCH, TEXT, and command groups)
+static void FoldTCMDDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	Sci_Position line = styler.GetLine(startPos);
+	int level = styler.LevelAt(line);
+	int levelIndent = 0;
+	Sci_PositionU endPos = startPos + length;
+	char s[16] = "";
+
+    char chPrev = styler.SafeGetCharAt(startPos - 1);
+
+	// Scan for ( and )
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+
+		int c = styler.SafeGetCharAt(i, '\n');
+		int style = styler.StyleAt(i);
+        bool bLineStart = ((chPrev == '\r') || (chPrev == '\n')) || i == 0;
+
+		if (style == SCE_TCMD_OPERATOR) {
+			// CheckFoldPoint
+			if (c == '(') {
+				levelIndent += 1;
+			} else if (c == ')') {
+				levelIndent -= 1;
+			}
+		}
+
+        if (( bLineStart ) && ( style == SCE_TCMD_WORD )) {
+            for (Sci_PositionU j = 0; j < 10; j++) {
+                if (!iswordchar(styler[i + j])) {
+                    break;
+                }
+                s[j] = styler[i + j];
+                s[j + 1] = '\0';
+            }
+
+			StrUpr( s );
+            if ((strcmp(s, "DO") == 0) || (strcmp(s, "IFF") == 0) || (strcmp(s, "SWITCH") == 0) || (strcmp(s, "TEXT") == 0)) {
+                levelIndent++;
+            } else if ((strcmp(s, "ENDDO") == 0) || (strcmp(s, "ENDIFF") == 0) || (strcmp(s, "ENDSWITCH") == 0) || (strcmp(s, "ENDTEXT") == 0)) {
+                levelIndent--;
+            }
+        }
+
+		if (c == '\n') { // line end
+				if (levelIndent > 0) {
+						level |= SC_FOLDLEVELHEADERFLAG;
+				}
+				if (level != styler.LevelAt(line))
+						styler.SetLevel(line, level);
+				level += levelIndent;
+				if ((level & SC_FOLDLEVELNUMBERMASK) < SC_FOLDLEVELBASE)
+						level = SC_FOLDLEVELBASE;
+				line++;
+				// reset state
+				levelIndent = 0;
+				level &= ~SC_FOLDLEVELHEADERFLAG;
+				level &= ~SC_FOLDLEVELWHITEFLAG;
+		}
+
+		chPrev = c;
+	}
+}
+
+static const char *const tcmdWordListDesc[] = {
+	"Internal Commands",
+	"Aliases",
+	0
+};
+
+LexerModule lmTCMD(SCLEX_TCMD, ColouriseTCMDDoc, "tcmd", FoldTCMDDoc, tcmdWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexTeX.cxx b/scite-app/lexilla/lexers/LexTeX.cxx
new file mode 100644
index 0000000..2c619a7
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTeX.cxx
@@ -0,0 +1,498 @@
+// Scintilla source code edit control
+
+// @file LexTeX.cxx - general context conformant tex coloring scheme
+// Author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com
+// Version: September 28, 2003
+
+// Copyright: 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// This lexer is derived from the one written for the texwork environment (1999++) which in
+// turn is inspired on texedit (1991++) which finds its roots in wdt (1986).
+
+// If you run into strange boundary cases, just tell me and I'll look into it.
+
+
+// TeX Folding code added by instanton (soft_share@126.com) with borrowed code from VisualTeX source by Alex Romanenko.
+// Version: June 22, 2007
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// val SCE_TEX_DEFAULT = 0
+// val SCE_TEX_SPECIAL = 1
+// val SCE_TEX_GROUP   = 2
+// val SCE_TEX_SYMBOL  = 3
+// val SCE_TEX_COMMAND = 4
+// val SCE_TEX_TEXT    = 5
+
+// Definitions in SciTEGlobal.properties:
+//
+// TeX Highlighting
+//
+// # Default
+// style.tex.0=fore:#7F7F00
+// # Special
+// style.tex.1=fore:#007F7F
+// # Group
+// style.tex.2=fore:#880000
+// # Symbol
+// style.tex.3=fore:#7F7F00
+// # Command
+// style.tex.4=fore:#008800
+// # Text
+// style.tex.5=fore:#000000
+
+// lexer.tex.interface.default=0
+// lexer.tex.comment.process=0
+
+// todo: lexer.tex.auto.if
+
+// Auxiliary functions:
+
+static inline bool endOfLine(Accessor &styler, Sci_PositionU i) {
+	return
+      (styler[i] == '\n') || ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n')) ;
+}
+
+static inline bool isTeXzero(int ch) {
+	return
+      (ch == '%') ;
+}
+
+static inline bool isTeXone(int ch) {
+	return
+      (ch == '[') || (ch == ']') || (ch == '=') || (ch == '#') ||
+      (ch == '(') || (ch == ')') || (ch == '<') || (ch == '>') ||
+      (ch == '"') ;
+}
+
+static inline bool isTeXtwo(int ch) {
+	return
+      (ch == '{') || (ch == '}') || (ch == '$') ;
+}
+
+static inline bool isTeXthree(int ch) {
+	return
+      (ch == '~') || (ch == '^') || (ch == '_') || (ch == '&') ||
+      (ch == '-') || (ch == '+') || (ch == '\"') || (ch == '`') ||
+      (ch == '/') || (ch == '|') || (ch == '%') ;
+}
+
+static inline bool isTeXfour(int ch) {
+	return
+      (ch == '\\') ;
+}
+
+static inline bool isTeXfive(int ch) {
+	return
+      ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) ||
+      (ch == '@') || (ch == '!') || (ch == '?') ;
+}
+
+static inline bool isTeXsix(int ch) {
+	return
+      (ch == ' ') ;
+}
+
+static inline bool isTeXseven(int ch) {
+	return
+      (ch == '^') ;
+}
+
+// Interface determination
+
+static int CheckTeXInterface(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    Accessor &styler,
+	int defaultInterface) {
+
+    char lineBuffer[1024] ;
+	Sci_PositionU linePos = 0 ;
+
+    // some day we can make something lexer.tex.mapping=(all,0)(nl,1)(en,2)...
+
+    if (styler.SafeGetCharAt(0) == '%') {
+        for (Sci_PositionU i = 0; i < startPos + length; i++) {
+            lineBuffer[linePos++] = styler.SafeGetCharAt(i) ;
+            if (endOfLine(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+                lineBuffer[linePos] = '\0';
+                if (strstr(lineBuffer, "interface=all")) {
+                    return 0 ;
+				} else if (strstr(lineBuffer, "interface=tex")) {
+                    return 1 ;
+                } else if (strstr(lineBuffer, "interface=nl")) {
+                    return 2 ;
+                } else if (strstr(lineBuffer, "interface=en")) {
+                    return 3 ;
+                } else if (strstr(lineBuffer, "interface=de")) {
+                    return 4 ;
+                } else if (strstr(lineBuffer, "interface=cz")) {
+                    return 5 ;
+                } else if (strstr(lineBuffer, "interface=it")) {
+                    return 6 ;
+                } else if (strstr(lineBuffer, "interface=ro")) {
+                    return 7 ;
+                } else if (strstr(lineBuffer, "interface=latex")) {
+					// we will move latex cum suis up to 91+ when more keyword lists are supported
+                    return 8 ;
+				} else if (styler.SafeGetCharAt(1) == 'D' && strstr(lineBuffer, "%D \\module")) {
+					// better would be to limit the search to just one line
+					return 3 ;
+                } else {
+                    return defaultInterface ;
+                }
+            }
+		}
+    }
+
+    return defaultInterface ;
+}
+
+static void ColouriseTeXDoc(
+    Sci_PositionU startPos,
+    Sci_Position length,
+    int,
+    WordList *keywordlists[],
+    Accessor &styler) {
+
+	styler.StartAt(startPos) ;
+	styler.StartSegment(startPos) ;
+
+	bool processComment   = styler.GetPropertyInt("lexer.tex.comment.process",   0) == 1 ;
+	bool useKeywords      = styler.GetPropertyInt("lexer.tex.use.keywords",      1) == 1 ;
+	bool autoIf           = styler.GetPropertyInt("lexer.tex.auto.if",           1) == 1 ;
+	int  defaultInterface = styler.GetPropertyInt("lexer.tex.interface.default", 1) ;
+
+	char key[100] ;
+	int  k ;
+	bool newifDone = false ;
+	bool inComment = false ;
+
+	int currentInterface = CheckTeXInterface(startPos,length,styler,defaultInterface) ;
+
+    if (currentInterface == 0) {
+        useKeywords = false ;
+        currentInterface = 1 ;
+    }
+
+    WordList &keywords = *keywordlists[currentInterface-1] ;
+
+	StyleContext sc(startPos, length, SCE_TEX_TEXT, styler);
+
+	bool going = sc.More() ; // needed because of a fuzzy end of file state
+
+	for (; going; sc.Forward()) {
+
+		if (! sc.More()) { going = false ; } // we need to go one behind the end of text
+
+		if (inComment) {
+			if (sc.atLineEnd) {
+				sc.SetState(SCE_TEX_TEXT) ;
+				newifDone = false ;
+				inComment = false ;
+			}
+		} else {
+			if (! isTeXfive(sc.ch)) {
+				if (sc.state == SCE_TEX_COMMAND) {
+					if (sc.LengthCurrent() == 1) { // \<noncstoken>
+						if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
+							sc.Forward(2) ; // \^^ and \^^<token>
+						}
+						sc.ForwardSetState(SCE_TEX_TEXT) ;
+					} else {
+						sc.GetCurrent(key, sizeof(key)-1) ;
+						k = static_cast<int>(strlen(key)) ;
+						memmove(key,key+1,k) ; // shift left over escape token
+						key[k] = '\0' ;
+						k-- ;
+						if (! keywords || ! useKeywords) {
+							sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = false ;
+						} else if (k == 1) { //\<cstoken>
+							sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = false ;
+						} else if (keywords.InList(key)) {
+    						sc.SetState(SCE_TEX_COMMAND) ;
+							newifDone = autoIf && (strcmp(key,"newif") == 0) ;
+						} else if (autoIf && ! newifDone && (key[0] == 'i') && (key[1] == 'f') && keywords.InList("if")) {
+	    					sc.SetState(SCE_TEX_COMMAND) ;
+						} else {
+							sc.ChangeState(SCE_TEX_TEXT) ;
+							sc.SetState(SCE_TEX_TEXT) ;
+							newifDone = false ;
+						}
+					}
+				}
+				if (isTeXzero(sc.ch)) {
+					sc.SetState(SCE_TEX_SYMBOL);
+
+					if (!endOfLine(styler,sc.currentPos + 1))
+						sc.ForwardSetState(SCE_TEX_DEFAULT) ;
+
+					inComment = ! processComment ;
+					newifDone = false ;
+				} else if (isTeXseven(sc.ch) && isTeXseven(sc.chNext)) {
+					sc.SetState(SCE_TEX_TEXT) ;
+					sc.ForwardSetState(SCE_TEX_TEXT) ;
+				} else if (isTeXone(sc.ch)) {
+					sc.SetState(SCE_TEX_SPECIAL) ;
+					newifDone = false ;
+				} else if (isTeXtwo(sc.ch)) {
+					sc.SetState(SCE_TEX_GROUP) ;
+					newifDone = false ;
+				} else if (isTeXthree(sc.ch)) {
+					sc.SetState(SCE_TEX_SYMBOL) ;
+					newifDone = false ;
+				} else if (isTeXfour(sc.ch)) {
+					sc.SetState(SCE_TEX_COMMAND) ;
+				} else if (isTeXsix(sc.ch)) {
+					sc.SetState(SCE_TEX_TEXT) ;
+				} else if (sc.atLineEnd) {
+					sc.SetState(SCE_TEX_TEXT) ;
+					newifDone = false ;
+					inComment = false ;
+				} else {
+					sc.SetState(SCE_TEX_TEXT) ;
+				}
+			} else if (sc.state != SCE_TEX_COMMAND) {
+				sc.SetState(SCE_TEX_TEXT) ;
+			}
+		}
+	}
+	sc.ChangeState(SCE_TEX_TEXT) ;
+	sc.Complete();
+
+}
+
+
+static inline bool isNumber(int ch) {
+	return
+      (ch == '0') || (ch == '1') || (ch == '2') ||
+      (ch == '3') || (ch == '4') || (ch == '5') ||
+      (ch == '6') || (ch == '7') || (ch == '8') || (ch == '9');
+}
+
+static inline bool isWordChar(int ch) {
+	return ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'));
+}
+
+static Sci_Position ParseTeXCommand(Sci_PositionU pos, Accessor &styler, char *command)
+{
+  Sci_Position length=0;
+  char ch=styler.SafeGetCharAt(pos+1);
+
+  if(ch==',' || ch==':' || ch==';' || ch=='%'){
+      command[0]=ch;
+      command[1]=0;
+	  return 1;
+  }
+
+  // find end
+     while(isWordChar(ch) && !isNumber(ch) && ch!='_' && ch!='.' && length<100){
+          command[length]=ch;
+          length++;
+          ch=styler.SafeGetCharAt(pos+length+1);
+     }
+
+  command[length]='\0';
+  if(!length) return 0;
+  return length+1;
+}
+
+static int classifyFoldPointTeXPaired(const char* s) {
+	int lev=0;
+	if (!(isdigit(s[0]) || (s[0] == '.'))){
+		if (strcmp(s, "begin")==0||strcmp(s,"FoldStart")==0||
+			strcmp(s,"abstract")==0||strcmp(s,"unprotect")==0||
+			strcmp(s,"title")==0||strncmp(s,"start",5)==0||strncmp(s,"Start",5)==0||
+			strcmp(s,"documentclass")==0||strncmp(s,"if",2)==0
+			)
+			lev=1;
+		if (strcmp(s, "end")==0||strcmp(s,"FoldStop")==0||
+			strcmp(s,"maketitle")==0||strcmp(s,"protect")==0||
+			strncmp(s,"stop",4)==0||strncmp(s,"Stop",4)==0||
+			strcmp(s,"fi")==0
+			)
+		lev=-1;
+	}
+	return lev;
+}
+
+static int classifyFoldPointTeXUnpaired(const char* s) {
+	int lev=0;
+	if (!(isdigit(s[0]) || (s[0] == '.'))){
+		if (strcmp(s,"part")==0||
+			strcmp(s,"chapter")==0||
+			strcmp(s,"section")==0||
+			strcmp(s,"subsection")==0||
+			strcmp(s,"subsubsection")==0||
+			strcmp(s,"CJKfamily")==0||
+			strcmp(s,"appendix")==0||
+			strcmp(s,"Topic")==0||strcmp(s,"topic")==0||
+			strcmp(s,"subject")==0||strcmp(s,"subsubject")==0||
+			strcmp(s,"def")==0||strcmp(s,"gdef")==0||strcmp(s,"edef")==0||
+			strcmp(s,"xdef")==0||strcmp(s,"framed")==0||
+			strcmp(s,"frame")==0||
+			strcmp(s,"foilhead")==0||strcmp(s,"overlays")==0||strcmp(s,"slide")==0
+			){
+			    lev=1;
+			}
+	}
+	return lev;
+}
+
+static bool IsTeXCommentLine(Sci_Position line, Accessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+
+	Sci_Position startpos = pos;
+
+	while (startpos<eol_pos){
+		char ch = styler[startpos];
+		if (ch!='%' && ch!=' ') return false;
+		else if (ch=='%') return true;
+		startpos++;
+	}
+
+	return false;
+}
+
+// FoldTeXDoc: borrowed from VisualTeX with modifications
+
+static void FoldTexDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler)
+{
+	bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+	Sci_PositionU endPos = startPos+length;
+	int visibleChars=0;
+	Sci_Position lineCurrent=styler.GetLine(startPos);
+	int levelPrev=styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
+	int levelCurrent=levelPrev;
+	char chNext=styler[startPos];
+	char buffer[100]="";
+
+	for (Sci_PositionU i=startPos; i < endPos; i++) {
+		char ch=chNext;
+		chNext=styler.SafeGetCharAt(i+1);
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+        if(ch=='\\') {
+            ParseTeXCommand(i, styler, buffer);
+			levelCurrent += classifyFoldPointTeXPaired(buffer)+classifyFoldPointTeXUnpaired(buffer);
+		}
+
+		if (levelCurrent > SC_FOLDLEVELBASE && ((ch == '\r' || ch=='\n') && (chNext == '\\'))) {
+            ParseTeXCommand(i+1, styler, buffer);
+			levelCurrent -= classifyFoldPointTeXUnpaired(buffer);
+		}
+
+	char chNext2;
+	char chNext3;
+	char chNext4;
+	char chNext5;
+	chNext2=styler.SafeGetCharAt(i+2);
+	chNext3=styler.SafeGetCharAt(i+3);
+	chNext4=styler.SafeGetCharAt(i+4);
+	chNext5=styler.SafeGetCharAt(i+5);
+
+	bool atEOfold = (ch == '%') &&
+			(chNext == '%') && (chNext2=='}') &&
+				(chNext3=='}')&& (chNext4=='-')&& (chNext5=='-');
+
+	bool atBOfold = (ch == '%') &&
+			(chNext == '%') && (chNext2=='-') &&
+				(chNext3=='-')&& (chNext4=='{')&& (chNext5=='{');
+
+	if(atBOfold){
+		levelCurrent+=1;
+	}
+
+	if(atEOfold){
+		levelCurrent-=1;
+	}
+
+	if(ch=='\\' && chNext=='['){
+		levelCurrent+=1;
+	}
+
+	if(ch=='\\' && chNext==']'){
+		levelCurrent-=1;
+	}
+
+	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+
+	if (foldComment && atEOL && IsTeXCommentLine(lineCurrent, styler))
+        {
+            if (lineCurrent==0 && IsTeXCommentLine(lineCurrent + 1, styler)
+				)
+                levelCurrent++;
+            else if (lineCurrent!=0 && !IsTeXCommentLine(lineCurrent - 1, styler)
+               && IsTeXCommentLine(lineCurrent + 1, styler)
+				)
+                levelCurrent++;
+            else if (lineCurrent!=0 && IsTeXCommentLine(lineCurrent - 1, styler) &&
+                     !IsTeXCommentLine(lineCurrent+1, styler))
+                levelCurrent--;
+        }
+
+//---------------------------------------------------------------------------------------------
+
+		if (atEOL) {
+			int lev = levelPrev;
+			if (visibleChars == 0 && foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if ((levelCurrent > levelPrev) && (visibleChars > 0))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelPrev = levelCurrent;
+			visibleChars = 0;
+		}
+
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+
+	// Fill in the real level of the next line, keeping the current flags as they will be filled in later
+	int flagsNext = styler.LevelAt(lineCurrent) & ~SC_FOLDLEVELNUMBERMASK;
+	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+}
+
+
+
+
+static const char * const texWordListDesc[] = {
+    "TeX, eTeX, pdfTeX, Omega",
+    "ConTeXt Dutch",
+    "ConTeXt English",
+    "ConTeXt German",
+    "ConTeXt Czech",
+    "ConTeXt Italian",
+    "ConTeXt Romanian",
+	0,
+} ;
+
+LexerModule lmTeX(SCLEX_TEX,   ColouriseTeXDoc, "tex", FoldTexDoc, texWordListDesc);
diff --git a/scite-app/lexilla/lexers/LexTxt2tags.cxx b/scite-app/lexilla/lexers/LexTxt2tags.cxx
new file mode 100644
index 0000000..beea5c5
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexTxt2tags.cxx
@@ -0,0 +1,481 @@
+/******************************************************************
+ *  LexTxt2tags.cxx
+ *
+ *  A simple Txt2tags lexer for scintilla.
+ *
+ *
+ *  Adapted by Eric Forgeot
+ *  Based on the LexMarkdown.cxx by Jon Strait - jstrait@moonloop.net
+ *
+ *  What could be improved:
+ *   - Verbatim lines could be like for raw lines : when there is no space between the ``` and the following text, the first letter should be colored so the user would understand there must be a space for a valid tag.
+ *   - marks such as bold, italic, strikeout, underline should begin to be highlighted only when they are closed and valid.
+ *   - verbatim and raw area should be highlighted too.
+ *
+ *  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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+
+
+static inline bool IsNewline(const int ch) {
+    return (ch == '\n' || ch == '\r');
+}
+
+// True if can follow ch down to the end with possibly trailing whitespace
+static bool FollowToLineEnd(const int ch, const int state, const Sci_PositionU endPos, StyleContext &sc) {
+    Sci_PositionU i = 0;
+    while (sc.GetRelative(++i) == ch)
+        ;
+    // Skip over whitespace
+    while (IsASpaceOrTab(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+        ++i;
+    if (IsNewline(sc.GetRelative(i)) || sc.currentPos + i == endPos) {
+        sc.Forward(i);
+        sc.ChangeState(state);
+        sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+        return true;
+    }
+    else return false;
+}
+
+// Does the previous line have more than spaces and tabs?
+static bool HasPrevLineContent(StyleContext &sc) {
+    Sci_Position i = 0;
+    // Go back to the previous newline
+    while ((--i + sc.currentPos) && !IsNewline(sc.GetRelative(i)))
+        ;
+    while (--i + sc.currentPos) {
+        if (IsNewline(sc.GetRelative(i)))
+            break;
+        if (!IsASpaceOrTab(sc.GetRelative(i)))
+            return true;
+    }
+    return false;
+}
+
+// Separator line
+static bool IsValidHrule(const Sci_PositionU endPos, StyleContext &sc) {
+    int count = 1;
+    Sci_PositionU i = 0;
+    for (;;) {
+        ++i;
+        int c = sc.GetRelative(i);
+        if (c == sc.ch)
+            ++count;
+        // hit a terminating character
+        else if (!IsASpaceOrTab(c) || sc.currentPos + i == endPos) {
+            // Are we a valid HRULE
+            if ((IsNewline(c) || sc.currentPos + i == endPos) &&
+                    count >= 20 && !HasPrevLineContent(sc)) {
+                sc.SetState(SCE_TXT2TAGS_HRULE);
+                sc.Forward(i);
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+                return true;
+            }
+            else {
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+		return false;
+            }
+        }
+    }
+}
+
+static void ColorizeTxt2tagsDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                               WordList **, Accessor &styler) {
+    Sci_PositionU endPos = startPos + length;
+    int precharCount = 0;
+    // Don't advance on a new loop iteration and retry at the same position.
+    // Useful in the corner case of having to start at the beginning file position
+    // in the default state.
+    bool freezeCursor = false;
+
+    StyleContext sc(startPos, length, initStyle, styler);
+
+    while (sc.More()) {
+        // Skip past escaped characters
+        if (sc.ch == '\\') {
+            sc.Forward();
+            continue;
+        }
+
+        // A blockquotes resets the line semantics
+        if (sc.state == SCE_TXT2TAGS_BLOCKQUOTE){
+            sc.Forward(2);
+            sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+        }
+        // An option colors the whole line
+        if (sc.state == SCE_TXT2TAGS_OPTION){
+            FollowToLineEnd('%', SCE_TXT2TAGS_OPTION, endPos, sc);
+        }
+        if (sc.state == SCE_TXT2TAGS_POSTPROC){
+            FollowToLineEnd('%', SCE_TXT2TAGS_POSTPROC, endPos, sc);
+        }
+        if (sc.state == SCE_TXT2TAGS_PREPROC){
+            FollowToLineEnd('%', SCE_TXT2TAGS_PREPROC, endPos, sc);
+        }
+        // A comment colors the whole line
+        if (sc.state == SCE_TXT2TAGS_COMMENT){
+            FollowToLineEnd('%', SCE_TXT2TAGS_COMMENT, endPos, sc);
+        }
+        // Conditional state-based actions
+        if (sc.state == SCE_TXT2TAGS_CODE2) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.Match("``") && sc.GetRelative(-2) != ' ') {
+                sc.Forward(2);
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+        }
+        // Table
+        else if (sc.state == SCE_TXT2TAGS_CODE) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.ch == '|' && sc.chPrev != ' ')
+                sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT);
+        }
+        // Strong
+        else if (sc.state == SCE_TXT2TAGS_STRONG1) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.Match("**") && sc.chPrev != ' ') {
+                sc.Forward(2);
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+        }
+        // Emphasis
+        else if (sc.state == SCE_TXT2TAGS_EM1) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.Match("//") && sc.chPrev != ' ') {
+                sc.Forward(2);
+                sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT);
+           }
+        }
+        // Underline
+        else if (sc.state == SCE_TXT2TAGS_EM2) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.Match("__") && sc.chPrev != ' ') {
+                sc.Forward(2);
+                sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT);
+           }
+        }
+        // codeblock
+        else if (sc.state == SCE_TXT2TAGS_CODEBK) {
+                if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.atLineStart && sc.Match("```")) {
+                Sci_Position i = 1;
+                while (!IsNewline(sc.GetRelative(i)) && sc.currentPos + i < endPos)
+                    i++;
+                sc.Forward(i);
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+        }
+        // strikeout
+        else if (sc.state == SCE_TXT2TAGS_STRIKEOUT) {
+        if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            if (sc.Match("--") && sc.chPrev != ' ') {
+                sc.Forward(2);
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+        }
+        // Headers
+        else if (sc.state == SCE_TXT2TAGS_LINE_BEGIN) {
+            if (sc.Match("======"))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER6);
+                sc.Forward();
+                }
+            else if (sc.Match("====="))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER5);
+                sc.Forward();
+                }
+            else if (sc.Match("===="))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER4);
+                sc.Forward();
+                }
+            else if (sc.Match("==="))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER3);
+                sc.Forward();
+                }
+                //SetStateAndZoom(SCE_TXT2TAGS_HEADER3, 3, '=', sc);
+            else if (sc.Match("==")) {
+                sc.SetState(SCE_TXT2TAGS_HEADER2);
+                sc.Forward();
+                }
+                //SetStateAndZoom(SCE_TXT2TAGS_HEADER2, 2, '=', sc);
+            else if (sc.Match("=")) {
+                // Catch the special case of an unordered list
+                if (sc.chNext == '.' && IsASpaceOrTab(sc.GetRelative(2))) {
+                    precharCount = 0;
+                    sc.SetState(SCE_TXT2TAGS_PRECHAR);
+                }
+                else
+                    {
+                    sc.SetState(SCE_TXT2TAGS_HEADER1);
+                    sc.Forward();
+                    }
+                    //SetStateAndZoom(SCE_TXT2TAGS_HEADER1, 1, '=', sc);
+            }
+
+            // Numbered title
+            else if (sc.Match("++++++"))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER6);
+                sc.Forward();
+                }
+            else if (sc.Match("+++++"))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER5);
+                sc.Forward();
+                }
+            else if (sc.Match("++++"))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER4);
+                sc.Forward();
+                }
+            else if (sc.Match("+++"))
+                {
+                sc.SetState(SCE_TXT2TAGS_HEADER3);
+                sc.Forward();
+                }
+                //SetStateAndZoom(SCE_TXT2TAGS_HEADER3, 3, '+', sc);
+            else if (sc.Match("++")) {
+                sc.SetState(SCE_TXT2TAGS_HEADER2);
+                sc.Forward();
+                }
+                //SetStateAndZoom(SCE_TXT2TAGS_HEADER2, 2, '+', sc);
+            else if (sc.Match("+")) {
+                // Catch the special case of an unordered list
+                if (sc.chNext == ' ' && IsASpaceOrTab(sc.GetRelative(1))) {
+                 //    if (IsNewline(sc.ch)) {
+                     	//precharCount = 0;
+                //		sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+                		//sc.SetState(SCE_TXT2TAGS_PRECHAR);
+				//	}
+                //    else {
+                //    precharCount = 0;
+                    sc.SetState(SCE_TXT2TAGS_OLIST_ITEM);
+                    sc.Forward(2);
+                    sc.SetState(SCE_TXT2TAGS_DEFAULT);
+               //     sc.SetState(SCE_TXT2TAGS_PRECHAR);
+				//	}
+                }
+                else
+                    {
+                    sc.SetState(SCE_TXT2TAGS_HEADER1);
+                    sc.Forward();
+                    }
+            }
+
+
+            // Codeblock
+            else if (sc.Match("```")) {
+                if (!HasPrevLineContent(sc))
+              //  if (!FollowToLineEnd(sc))
+                    sc.SetState(SCE_TXT2TAGS_CODEBK);
+                else
+                    sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+
+            // Preproc
+            else if (sc.Match("%!preproc")) {
+                sc.SetState(SCE_TXT2TAGS_PREPROC);
+            }
+            // Postproc
+            else if (sc.Match("%!postproc")) {
+                sc.SetState(SCE_TXT2TAGS_POSTPROC);
+            }
+            // Option
+            else if (sc.Match("%!")) {
+                sc.SetState(SCE_TXT2TAGS_OPTION);
+            }
+
+             // Comment
+            else if (sc.ch == '%') {
+                sc.SetState(SCE_TXT2TAGS_COMMENT);
+            }
+            // list
+            else if (sc.ch == '-') {
+                    precharCount = 0;
+                    sc.SetState(SCE_TXT2TAGS_PRECHAR);
+            }
+            // def list
+            else if (sc.ch == ':') {
+                    precharCount = 0;
+                   sc.SetState(SCE_TXT2TAGS_OLIST_ITEM);
+                   sc.Forward(1);
+                   sc.SetState(SCE_TXT2TAGS_PRECHAR);
+            }
+            else if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+            else {
+                precharCount = 0;
+                sc.SetState(SCE_TXT2TAGS_PRECHAR);
+            }
+        }
+
+        // The header lasts until the newline
+        else if (sc.state == SCE_TXT2TAGS_HEADER1 || sc.state == SCE_TXT2TAGS_HEADER2 ||
+                sc.state == SCE_TXT2TAGS_HEADER3 || sc.state == SCE_TXT2TAGS_HEADER4 ||
+                sc.state == SCE_TXT2TAGS_HEADER5 || sc.state == SCE_TXT2TAGS_HEADER6) {
+            if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+        }
+
+        // New state only within the initial whitespace
+        if (sc.state == SCE_TXT2TAGS_PRECHAR) {
+            // Blockquote
+            if (sc.Match("\"\"\"") && precharCount < 5){
+
+                sc.SetState(SCE_TXT2TAGS_BLOCKQUOTE);
+                sc.Forward(1);
+                }
+            /*
+            // Begin of code block
+            else if (!HasPrevLineContent(sc) && (sc.chPrev == '\t' || precharCount >= 4))
+                sc.SetState(SCE_TXT2TAGS_CODEBK);
+            */
+            // HRule - Total of 20 or more hyphens, asterisks, or underscores
+            // on a line by themselves
+            else if ((sc.ch == '-' ) && IsValidHrule(endPos, sc))
+                ;
+            // Unordered list
+            else if ((sc.ch == '-') && IsASpaceOrTab(sc.chNext)) {
+                sc.SetState(SCE_TXT2TAGS_ULIST_ITEM);
+                sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT);
+            }
+            // Ordered list
+            else if (IsADigit(sc.ch)) {
+                Sci_Position digitCount = 0;
+                while (IsADigit(sc.GetRelative(++digitCount)))
+                    ;
+                if (sc.GetRelative(digitCount) == '.' &&
+                        IsASpaceOrTab(sc.GetRelative(digitCount + 1))) {
+                    sc.SetState(SCE_TXT2TAGS_OLIST_ITEM);
+                    sc.Forward(digitCount + 1);
+                    sc.SetState(SCE_TXT2TAGS_DEFAULT);
+                }
+            }
+            // Alternate Ordered list
+            else if (sc.ch == '+' && sc.chNext == ' ' && IsASpaceOrTab(sc.GetRelative(2))) {
+            //    sc.SetState(SCE_TXT2TAGS_OLIST_ITEM);
+            //    sc.Forward(2);
+             //   sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            }
+            else if (sc.ch != ' ' || precharCount > 2)
+                sc.SetState(SCE_TXT2TAGS_DEFAULT);
+            else
+                ++precharCount;
+        }
+
+        // New state anywhere in doc
+        if (sc.state == SCE_TXT2TAGS_DEFAULT) {
+         //   if (sc.atLineStart && sc.ch == '#') {
+         //       sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+         //       freezeCursor = true;
+         //   }
+            // Links and Images
+            if (sc.Match("![") || sc.ch == '[') {
+                Sci_Position i = 0, j = 0, k = 0;
+                Sci_Position len = endPos - sc.currentPos;
+                while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\'))
+                    ;
+                if (sc.GetRelative(i) == ']') {
+                    j = i;
+                    if (sc.GetRelative(++i) == '(') {
+                        while (i < len && (sc.GetRelative(++i) != '(' || sc.GetRelative(i - 1) == '\\'))
+                            ;
+                        if (sc.GetRelative(i) == '(')
+                            k = i;
+                    }
+
+                    else if (sc.GetRelative(i) == '[' || sc.GetRelative(++i) == '[') {
+                        while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\'))
+                            ;
+                        if (sc.GetRelative(i) == ']')
+                            k = i;
+                    }
+                }
+                // At least a link text
+                if (j) {
+                    sc.SetState(SCE_TXT2TAGS_LINK);
+                    sc.Forward(j);
+                    // Also has a URL or reference portion
+                    if (k)
+                        sc.Forward(k - j);
+                    sc.ForwardSetState(SCE_TXT2TAGS_DEFAULT);
+                }
+            }
+            // Code - also a special case for alternate inside spacing
+            if (sc.Match("``") && sc.GetRelative(3) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_CODE2);
+                sc.Forward();
+            }
+            else if (sc.ch == '|' && sc.GetRelative(3) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_CODE);
+            }
+            // Strong
+            else if (sc.Match("**") && sc.GetRelative(2) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_STRONG1);
+                sc.Forward();
+           }
+            // Emphasis
+            else if (sc.Match("//") && sc.GetRelative(2) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_EM1);
+                sc.Forward();
+            }
+            else if (sc.Match("__") && sc.GetRelative(2) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_EM2);
+                sc.Forward();
+            }
+            // Strikeout
+            else if (sc.Match("--") && sc.GetRelative(2) != ' ') {
+                sc.SetState(SCE_TXT2TAGS_STRIKEOUT);
+                sc.Forward();
+            }
+
+            // Beginning of line
+            else if (IsNewline(sc.ch))
+                sc.SetState(SCE_TXT2TAGS_LINE_BEGIN);
+        }
+        // Advance if not holding back the cursor for this iteration.
+        if (!freezeCursor)
+            sc.Forward();
+        freezeCursor = false;
+    }
+    sc.Complete();
+}
+
+LexerModule lmTxt2tags(SCLEX_TXT2TAGS, ColorizeTxt2tagsDoc, "txt2tags");
+
+
diff --git a/scite-app/lexilla/lexers/LexVB.cxx b/scite-app/lexilla/lexers/LexVB.cxx
new file mode 100644
index 0000000..eca3497
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexVB.cxx
@@ -0,0 +1,324 @@
+// Scintilla source code edit control
+/** @file LexVB.cxx
+ ** Lexer for Visual Basic and VBScript.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+// Internal state, highlighted as number
+#define SCE_B_FILENUMBER SCE_B_DEFAULT+100
+
+
+static bool IsVBComment(Accessor &styler, Sci_Position pos, Sci_Position len) {
+	return len > 0 && styler[pos] == '\'';
+}
+
+static inline bool IsTypeCharacter(int ch) {
+	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
+}
+
+// Extended to accept accented characters
+static inline bool IsAWordChar(int ch) {
+	return ch >= 0x80 ||
+	       (isalnum(ch) || ch == '.' || ch == '_');
+}
+
+static inline bool IsAWordStart(int ch) {
+	return ch >= 0x80 ||
+	       (isalpha(ch) || ch == '_');
+}
+
+static inline bool IsANumberChar(int ch) {
+	// Not exactly following number definition (several dots are seen as OK, etc.)
+	// but probably enough in most cases.
+	return (ch < 0x80) &&
+	        (isdigit(ch) || toupper(ch) == 'E' ||
+             ch == '.' || ch == '-' || ch == '+' || ch == '_');
+}
+
+static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler, bool vbScriptSyntax) {
+
+	WordList &keywords = *keywordlists[0];
+	WordList &keywords2 = *keywordlists[1];
+	WordList &keywords3 = *keywordlists[2];
+	WordList &keywords4 = *keywordlists[3];
+
+	styler.StartAt(startPos);
+
+	int visibleChars = 0;
+	int fileNbDigits = 0;
+
+	// Do not leak onto next line
+	if (initStyle == SCE_B_STRINGEOL || initStyle == SCE_B_COMMENT || initStyle == SCE_B_PREPROCESSOR) {
+		initStyle = SCE_B_DEFAULT;
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+
+	for (; sc.More(); sc.Forward()) {
+
+		if (sc.state == SCE_B_OPERATOR) {
+			sc.SetState(SCE_B_DEFAULT);
+		} else if (sc.state == SCE_B_IDENTIFIER) {
+			if (!IsAWordChar(sc.ch)) {
+				// In Basic (except VBScript), a variable name or a function name
+				// can end with a special character indicating the type of the value
+				// held or returned.
+				bool skipType = false;
+				if (!vbScriptSyntax && IsTypeCharacter(sc.ch)) {
+					sc.Forward();	// Skip it
+					skipType = true;
+				}
+				if (sc.ch == ']') {
+					sc.Forward();
+				}
+				char s[100];
+				sc.GetCurrentLowered(s, sizeof(s));
+				if (skipType) {
+					s[strlen(s) - 1] = '\0';
+				}
+				if (strcmp(s, "rem") == 0) {
+					sc.ChangeState(SCE_B_COMMENT);
+				} else {
+					if (keywords.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD2);
+					} else if (keywords3.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD3);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_B_KEYWORD4);
+					}	// Else, it is really an identifier...
+					sc.SetState(SCE_B_DEFAULT);
+				}
+			}
+		} else if (sc.state == SCE_B_NUMBER) {
+			// We stop the number definition on non-numerical non-dot non-eE non-sign char
+			// Also accepts A-F for hex. numbers
+			if (!IsANumberChar(sc.ch) && !(tolower(sc.ch) >= 'a' && tolower(sc.ch) <= 'f')) {
+				sc.SetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_STRING) {
+			// VB doubles quotes to preserve them, so just end this string
+			// state now as a following quote will start again
+			if (sc.ch == '\"') {
+				if (sc.chNext == '\"') {
+					sc.Forward();
+				} else {
+					if (tolower(sc.chNext) == 'c') {
+						sc.Forward();
+					}
+					sc.ForwardSetState(SCE_B_DEFAULT);
+				}
+			} else if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ChangeState(SCE_B_STRINGEOL);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_COMMENT) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_PREPROCESSOR) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		} else if (sc.state == SCE_B_FILENUMBER) {
+			if (IsADigit(sc.ch)) {
+				fileNbDigits++;
+				if (fileNbDigits > 3) {
+					sc.ChangeState(SCE_B_DATE);
+				}
+			} else if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ',') {
+				// Regular uses: Close #1; Put #1, ...; Get #1, ... etc.
+				// Too bad if date is format #27, Oct, 2003# or something like that...
+				// Use regular number state
+				sc.ChangeState(SCE_B_NUMBER);
+				sc.SetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '#') {
+				sc.ChangeState(SCE_B_DATE);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			} else {
+				sc.ChangeState(SCE_B_DATE);
+			}
+			if (sc.state != SCE_B_FILENUMBER) {
+				fileNbDigits = 0;
+			}
+		} else if (sc.state == SCE_B_DATE) {
+			if (sc.atLineEnd) {
+				visibleChars = 0;
+				sc.ChangeState(SCE_B_STRINGEOL);
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			} else if (sc.ch == '#') {
+				sc.ForwardSetState(SCE_B_DEFAULT);
+			}
+		}
+
+		if (sc.state == SCE_B_DEFAULT) {
+			if (sc.ch == '\'') {
+				sc.SetState(SCE_B_COMMENT);
+			} else if (sc.ch == '\"') {
+				sc.SetState(SCE_B_STRING);
+			} else if (sc.ch == '#' && visibleChars == 0) {
+				// Preprocessor commands are alone on their line
+				sc.SetState(SCE_B_PREPROCESSOR);
+			} else if (sc.ch == '#') {
+				// It can be a date literal, ending with #, or a file number, from 1 to 511
+				// The date literal depends on the locale, so anything can go between #'s.
+				// Can be #January 1, 1993# or #1 Jan 93# or #05/11/2003#, etc.
+				// So we set the FILENUMBER state, and switch to DATE if it isn't a file number
+				sc.SetState(SCE_B_FILENUMBER);
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'h') {
+				// Hexadecimal number
+				sc.SetState(SCE_B_NUMBER);
+				sc.Forward();
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'o') {
+				// Octal number
+				sc.SetState(SCE_B_NUMBER);
+				sc.Forward();
+			} else if (sc.ch == '&' && tolower(sc.chNext) == 'b') {
+				// Binary number
+				sc.SetState(SCE_B_NUMBER);
+				sc.Forward();
+			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+				sc.SetState(SCE_B_NUMBER);
+			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
+				sc.SetState(SCE_B_IDENTIFIER);
+			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {	// Integer division
+				sc.SetState(SCE_B_OPERATOR);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			visibleChars = 0;
+		}
+		if (!IsASpace(sc.ch)) {
+			visibleChars++;
+		}
+	}
+
+	if (sc.state == SCE_B_IDENTIFIER && !IsAWordChar(sc.ch)) {
+		// In Basic (except VBScript), a variable name or a function name
+		// can end with a special character indicating the type of the value
+		// held or returned.
+		bool skipType = false;
+		if (!vbScriptSyntax && IsTypeCharacter(sc.ch)) {
+			sc.Forward();	// Skip it
+			skipType = true;
+		}
+		if (sc.ch == ']') {
+			sc.Forward();
+		}
+		char s[100];
+		sc.GetCurrentLowered(s, sizeof(s));
+		if (skipType) {
+			s[strlen(s) - 1] = '\0';
+		}
+		if (strcmp(s, "rem") == 0) {
+			sc.ChangeState(SCE_B_COMMENT);
+		} else {
+			if (keywords.InList(s)) {
+				sc.ChangeState(SCE_B_KEYWORD);
+			} else if (keywords2.InList(s)) {
+				sc.ChangeState(SCE_B_KEYWORD2);
+			} else if (keywords3.InList(s)) {
+				sc.ChangeState(SCE_B_KEYWORD3);
+			} else if (keywords4.InList(s)) {
+				sc.ChangeState(SCE_B_KEYWORD4);
+			}	// Else, it is really an identifier...
+			sc.SetState(SCE_B_DEFAULT);
+		}
+	}
+
+	sc.Complete();
+}
+
+static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
+						   WordList *[], Accessor &styler) {
+	Sci_Position endPos = startPos + length;
+
+	// Backtrack to previous line in case need to fix its fold status
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (startPos > 0) {
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			startPos = styler.LineStart(lineCurrent);
+		}
+	}
+	int spaceFlags = 0;
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsVBComment);
+	char chNext = styler[startPos];
+	for (Sci_Position i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+
+		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
+			int lev = indentCurrent;
+			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsVBComment);
+			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
+				// Only non whitespace lines can be headers
+				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
+					lev |= SC_FOLDLEVELHEADERFLAG;
+				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
+					// Line after is blank so check the next - maybe should continue further?
+					int spaceFlags2 = 0;
+					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsVBComment);
+					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
+						lev |= SC_FOLDLEVELHEADERFLAG;
+					}
+				}
+			}
+			indentCurrent = indentNext;
+			styler.SetLevel(lineCurrent, lev);
+			lineCurrent++;
+		}
+	}
+}
+
+static void ColouriseVBNetDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, false);
+}
+
+static void ColouriseVBScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+                           WordList *keywordlists[], Accessor &styler) {
+	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true);
+}
+
+static const char * const vbWordListDesc[] = {
+	"Keywords",
+	"user1",
+	"user2",
+	"user3",
+	0
+};
+
+LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc, vbWordListDesc);
+LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc, vbWordListDesc);
+
diff --git a/scite-app/lexilla/lexers/LexVHDL.cxx b/scite-app/lexilla/lexers/LexVHDL.cxx
new file mode 100644
index 0000000..b64eb9e
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexVHDL.cxx
@@ -0,0 +1,588 @@
+// Scintilla source code edit control
+/** @file LexVHDL.cxx
+ ** Lexer for VHDL
+ ** Written by Phil Reid,
+ ** Based on:
+ **  - The Verilog Lexer by Avi Yegudin
+ **  - The Fortran Lexer by Chuan-jian Shen
+ **  - The C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static void ColouriseVHDLDoc(
+  Sci_PositionU startPos,
+  Sci_Position length,
+  int initStyle,
+  WordList *keywordlists[],
+  Accessor &styler);
+
+
+/***************************************/
+static inline bool IsAWordChar(const int ch) {
+  return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' );
+}
+
+/***************************************/
+static inline bool IsAWordStart(const int ch) {
+  return (ch < 0x80) && (isalnum(ch) || ch == '_');
+}
+
+/***************************************/
+static inline bool IsABlank(unsigned int ch) {
+  return (ch == ' ') || (ch == 0x09) || (ch == 0x0b) ;
+}
+
+/***************************************/
+static void ColouriseVHDLDoc(
+  Sci_PositionU startPos,
+  Sci_Position length,
+  int initStyle,
+  WordList *keywordlists[],
+  Accessor &styler)
+{
+  WordList &Keywords   = *keywordlists[0];
+  WordList &Operators  = *keywordlists[1];
+  WordList &Attributes = *keywordlists[2];
+  WordList &Functions  = *keywordlists[3];
+  WordList &Packages   = *keywordlists[4];
+  WordList &Types      = *keywordlists[5];
+  WordList &User       = *keywordlists[6];
+
+  StyleContext sc(startPos, length, initStyle, styler);
+  bool isExtendedId = false;    // true when parsing an extended identifier
+
+  while (sc.More())
+  {
+    bool advance = true;
+
+    // Determine if the current state should terminate.
+    if (sc.state == SCE_VHDL_OPERATOR) {
+      sc.SetState(SCE_VHDL_DEFAULT);
+    } else if (sc.state == SCE_VHDL_NUMBER) {
+      if (!IsAWordChar(sc.ch) && (sc.ch != '#')) {
+        sc.SetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_IDENTIFIER) {
+      if (!isExtendedId && (!IsAWordChar(sc.ch) || (sc.ch == '.'))) {
+        char s[100];
+        sc.GetCurrentLowered(s, sizeof(s));
+        if (Keywords.InList(s)) {
+          sc.ChangeState(SCE_VHDL_KEYWORD);
+        } else if (Operators.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDOPERATOR);
+        } else if (Attributes.InList(s)) {
+          sc.ChangeState(SCE_VHDL_ATTRIBUTE);
+        } else if (Functions.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDFUNCTION);
+        } else if (Packages.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDPACKAGE);
+        } else if (Types.InList(s)) {
+          sc.ChangeState(SCE_VHDL_STDTYPE);
+        } else if (User.InList(s)) {
+          sc.ChangeState(SCE_VHDL_USERWORD);
+        }
+        sc.SetState(SCE_VHDL_DEFAULT);
+      } else if (isExtendedId && ((sc.ch == '\\') || sc.atLineEnd)) {
+        // extended identifiers are terminated by backslash, check for end of line in case we have invalid syntax
+        isExtendedId = false;
+        sc.ForwardSetState(SCE_VHDL_DEFAULT);
+        advance = false;
+      }
+    } else if (sc.state == SCE_VHDL_COMMENT || sc.state == SCE_VHDL_COMMENTLINEBANG) {
+      if (sc.atLineEnd) {
+        sc.SetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_STRING) {
+      if (sc.ch == '"') {
+        advance = false;
+        sc.Forward();
+        if (sc.ch == '"')
+          sc.Forward();
+        else
+          sc.SetState(SCE_VHDL_DEFAULT);
+      } else if (sc.atLineEnd) {
+        advance = false;
+        sc.ChangeState(SCE_VHDL_STRINGEOL);
+        sc.ForwardSetState(SCE_VHDL_DEFAULT);
+      }
+    } else if (sc.state == SCE_VHDL_BLOCK_COMMENT){
+      if(sc.ch == '*' && sc.chNext == '/'){
+        advance = false;
+        sc.Forward();
+        sc.ForwardSetState(SCE_VHDL_DEFAULT);
+      }
+    }
+
+    // Determine if a new state should be entered.
+    if (sc.state == SCE_VHDL_DEFAULT) {
+      if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+        sc.SetState(SCE_VHDL_NUMBER);
+      } else if (IsAWordStart(sc.ch)) {
+        sc.SetState(SCE_VHDL_IDENTIFIER);
+      } else if (sc.Match('-', '-')) {
+        if (sc.Match("--!"))  // Nice to have a different comment style
+          sc.SetState(SCE_VHDL_COMMENTLINEBANG);
+        else
+          sc.SetState(SCE_VHDL_COMMENT);
+      } else if (sc.Match('/', '*')){
+        sc.SetState(SCE_VHDL_BLOCK_COMMENT);
+      } else if (sc.ch == '"') {
+        sc.SetState(SCE_VHDL_STRING);
+      } else if (sc.ch == '\'') {
+        if (sc.GetRelative(2) == '\''){
+          if (sc.chNext != '(' || sc.GetRelative(4) != '\''){
+            // Can only be a character literal
+            sc.SetState(SCE_VHDL_STRING);
+            sc.Forward();
+            sc.Forward();
+            sc.ForwardSetState(SCE_VHDL_DEFAULT);
+            advance = false;
+          } // else can be a tick or a character literal, need more context, eg.: identifier'('x')
+        } // else can only be a tick
+      } else if (sc.ch == '\\') {
+        isExtendedId = true;
+        sc.SetState(SCE_VHDL_IDENTIFIER);
+      } else if (isoperator(static_cast<char>(sc.ch))) {
+        sc.SetState(SCE_VHDL_OPERATOR);
+      }
+    }
+
+    if (advance)
+      sc.Forward();
+  }
+  sc.Complete();
+}
+//=============================================================================
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+  Sci_Position pos = styler.LineStart(line);
+  Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+  for (Sci_Position i = pos; i < eol_pos; i++) {
+    char ch = styler[i];
+    char chNext = styler[i+1];
+    if ((ch == '-') && (chNext == '-'))
+      return true;
+    else if (ch != ' ' && ch != '\t')
+      return false;
+  }
+  return false;
+}
+static bool IsCommentBlockStart(Sci_Position line, Accessor &styler)
+{
+  Sci_Position pos = styler.LineStart(line);
+  Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+  for (Sci_Position i = pos; i < eol_pos; i++) {
+    char ch = styler[i];
+    char chNext = styler[i+1];
+    char style = styler.StyleAt(i);
+    if ((style == SCE_VHDL_BLOCK_COMMENT) && (ch == '/') && (chNext == '*'))
+      return true;
+  }
+  return false;
+}
+
+static bool IsCommentBlockEnd(Sci_Position line, Accessor &styler)
+{
+  Sci_Position pos = styler.LineStart(line);
+  Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+
+  for (Sci_Position i = pos; i < eol_pos; i++) {
+    char ch = styler[i];
+    char chNext = styler[i+1];
+    char style = styler.StyleAt(i);
+    if ((style == SCE_VHDL_BLOCK_COMMENT) && (ch == '*') && (chNext == '/'))
+      return true;
+  }
+  return false;
+}
+
+static bool IsCommentStyle(char style)
+{
+  return style == SCE_VHDL_BLOCK_COMMENT || style == SCE_VHDL_COMMENT || style == SCE_VHDL_COMMENTLINEBANG;
+}
+
+//=============================================================================
+// Folding the code
+static void FoldNoBoxVHDLDoc(
+  Sci_PositionU startPos,
+  Sci_Position length,
+  int,
+  Accessor &styler)
+{
+  // Decided it would be smarter to have the lexer have all keywords included. Therefore I
+  // don't check if the style for the keywords that I use to adjust the levels.
+  char words[] =
+    "architecture begin block case component else elsif end entity generate loop package process record then "
+    "procedure protected function when units";
+  WordList keywords;
+  keywords.Set(words);
+
+  bool foldComment      = styler.GetPropertyInt("fold.comment", 1) != 0;
+  bool foldCompact      = styler.GetPropertyInt("fold.compact", 1) != 0;
+  bool foldAtElse       = styler.GetPropertyInt("fold.at.else", 1) != 0;
+  bool foldAtBegin      = styler.GetPropertyInt("fold.at.Begin", 1) != 0;
+  bool foldAtParenthese = styler.GetPropertyInt("fold.at.Parenthese", 1) != 0;
+  //bool foldAtWhen       = styler.GetPropertyInt("fold.at.When", 1) != 0;  //< fold at when in case statements
+
+  int  visibleChars     = 0;
+  Sci_PositionU endPos   = startPos + length;
+
+  Sci_Position lineCurrent       = styler.GetLine(startPos);
+  int levelCurrent      = SC_FOLDLEVELBASE;
+  if(lineCurrent > 0)
+    levelCurrent        = styler.LevelAt(lineCurrent-1) >> 16;
+  //int levelMinCurrent   = levelCurrent;
+  int levelMinCurrentElse = levelCurrent;   ///< Used for folding at 'else'
+  int levelMinCurrentBegin = levelCurrent;  ///< Used for folding at 'begin'
+  int levelNext         = levelCurrent;
+
+  /***************************************/
+  Sci_Position lastStart         = 0;
+  char prevWord[32]     = "";
+
+  /***************************************/
+  // Find prev word
+  // The logic for going up or down a level depends on a the previous keyword
+  // This code could be cleaned up.
+  Sci_Position end = 0;
+  Sci_PositionU j;
+  for(j = startPos; j>0; j--)
+  {
+    char ch       = styler.SafeGetCharAt(j);
+    char chPrev   = styler.SafeGetCharAt(j-1);
+    int style     = styler.StyleAt(j);
+    int stylePrev = styler.StyleAt(j-1);
+    if ((!IsCommentStyle(style)) && (stylePrev != SCE_VHDL_STRING))
+    {
+      if(IsAWordChar(chPrev) && !IsAWordChar(ch))
+      {
+        end = j-1;
+      }
+    }
+    if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING))
+    {
+      if(!IsAWordChar(chPrev) && IsAWordStart(ch) && (end != 0))
+      {
+        char s[32];
+        Sci_PositionU k;
+        for(k=0; (k<31 ) && (k<end-j+1 ); k++) {
+          s[k] = static_cast<char>(tolower(styler[j+k]));
+        }
+        s[k] = '\0';
+
+        if(keywords.InList(s)) {
+          strcpy(prevWord, s);
+          break;
+        }
+      }
+    }
+  }
+  for(j=j+static_cast<Sci_PositionU>(strlen(prevWord)); j<endPos; j++)
+  {
+    char ch       = styler.SafeGetCharAt(j);
+    int style     = styler.StyleAt(j);
+    if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING))
+    {
+      if((ch == ';') && (strcmp(prevWord, "end") == 0))
+      {
+        strcpy(prevWord, ";");
+      }
+    }
+  }
+
+  char  chNext          = styler[startPos];
+  char  chPrev          = '\0';
+  char  chNextNonBlank;
+  int   styleNext       = styler.StyleAt(startPos);
+  //Platform::DebugPrintf("Line[%04d] Prev[%20s] ************************* Level[%x]\n", lineCurrent+1, prevWord, levelCurrent);
+
+  /***************************************/
+  for (Sci_PositionU i = startPos; i < endPos; i++)
+  {
+    char ch         = chNext;
+    chNext          = styler.SafeGetCharAt(i + 1);
+    chPrev          = styler.SafeGetCharAt(i - 1);
+    chNextNonBlank  = chNext;
+    Sci_PositionU j  = i+1;
+    while(IsABlank(chNextNonBlank) && j<endPos)
+    {
+      j ++ ;
+      chNextNonBlank = styler.SafeGetCharAt(j);
+    }
+    int style           = styleNext;
+    styleNext       = styler.StyleAt(i + 1);
+    bool atEOL      = (ch == '\r' && chNext != '\n') || (ch == '\n');
+
+    if (foldComment && atEOL)
+    {
+      if(IsCommentLine(lineCurrent, styler))
+      {
+        if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler))
+        {
+          levelNext++;
+        }
+        else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler))
+        {
+          levelNext--;
+        }
+      }
+      else
+      {
+        if (IsCommentBlockStart(lineCurrent, styler) && !IsCommentBlockEnd(lineCurrent, styler))
+        {
+          levelNext++;
+        }
+        else if (IsCommentBlockEnd(lineCurrent, styler) && !IsCommentBlockStart(lineCurrent, styler))
+        {
+          levelNext--;
+        }
+      }
+    }
+
+    if ((style == SCE_VHDL_OPERATOR) && foldAtParenthese)
+    {
+      if(ch == '(') {
+        levelNext++;
+      } else if (ch == ')') {
+        levelNext--;
+      }
+    }
+
+    if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING))
+    {
+      if((ch == ';') && (strcmp(prevWord, "end") == 0))
+      {
+        strcpy(prevWord, ";");
+      }
+
+      if(!IsAWordChar(chPrev) && IsAWordStart(ch))
+      {
+        lastStart = i;
+      }
+
+      if(IsAWordChar(ch) && !IsAWordChar(chNext)) {
+        char s[32];
+        Sci_PositionU k;
+        for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) {
+          s[k] = static_cast<char>(tolower(styler[lastStart+k]));
+        }
+        s[k] = '\0';
+
+        if(keywords.InList(s))
+        {
+          if (
+            strcmp(s, "architecture") == 0  ||
+            strcmp(s, "case") == 0          ||
+            strcmp(s, "generate") == 0      ||
+            strcmp(s, "block") == 0         ||
+            strcmp(s, "loop") == 0          ||
+            strcmp(s, "package") ==0        ||
+            strcmp(s, "process") == 0       ||
+            strcmp(s, "protected") == 0     ||
+            strcmp(s, "record") == 0        ||
+            strcmp(s, "then") == 0          ||
+            strcmp(s, "units") == 0)
+          {
+            if (strcmp(prevWord, "end") != 0)
+            {
+              if (levelMinCurrentElse > levelNext) {
+                levelMinCurrentElse = levelNext;
+              }
+              levelNext++;
+            }
+          } else if (
+            strcmp(s, "component") == 0      ||
+            strcmp(s, "entity") == 0         ||
+            strcmp(s, "configuration") == 0 )
+          {
+            if (strcmp(prevWord, "end") != 0)
+            { // check for instantiated unit by backward searching for the colon.
+              Sci_PositionU pos = lastStart;
+              char chAtPos=0, styleAtPos;
+              do{// skip white spaces
+                if(!pos)
+                  break;
+                pos--;
+                styleAtPos = styler.StyleAt(pos);
+                chAtPos = styler.SafeGetCharAt(pos);
+              }while(pos &&
+                     (chAtPos == ' ' || chAtPos == '\t' ||
+                      chAtPos == '\n' || chAtPos == '\r' ||
+                      IsCommentStyle(styleAtPos)));
+
+              // check for a colon (':') before the instantiated units "entity", "component" or "configuration". Don't fold thereafter.
+              if (chAtPos != ':')
+              {
+                if (levelMinCurrentElse > levelNext) {
+                  levelMinCurrentElse = levelNext;
+                }
+                levelNext++;
+              }
+            }
+          } else if (
+            strcmp(s, "procedure") == 0     ||
+            strcmp(s, "function") == 0)
+          {
+            if (strcmp(prevWord, "end") != 0) // check for "end procedure" etc.
+            { // This code checks to see if the procedure / function is a definition within a "package"
+              // rather than the actual code in the body.
+              int BracketLevel = 0;
+              for(Sci_Position pos=i+1; pos<styler.Length(); pos++)
+              {
+                int styleAtPos = styler.StyleAt(pos);
+                char chAtPos = styler.SafeGetCharAt(pos);
+                if(chAtPos == '(') BracketLevel++;
+                if(chAtPos == ')') BracketLevel--;
+                if(
+                  (BracketLevel == 0) &&
+                  (!IsCommentStyle(styleAtPos)) &&
+                  (styleAtPos != SCE_VHDL_STRING) &&
+                  !iswordchar(styler.SafeGetCharAt(pos-1)) &&
+                  (chAtPos|' ')=='i' && (styler.SafeGetCharAt(pos+1)|' ')=='s' &&
+                  !iswordchar(styler.SafeGetCharAt(pos+2)))
+                {
+                  if (levelMinCurrentElse > levelNext) {
+                    levelMinCurrentElse = levelNext;
+                  }
+                  levelNext++;
+                  break;
+                }
+                if((BracketLevel == 0) && (chAtPos == ';'))
+                {
+                  break;
+                }
+              }
+            }
+
+          } else if (strcmp(s, "end") == 0) {
+            levelNext--;
+          }  else if(strcmp(s, "elsif") == 0) { // elsif is followed by then so folding occurs correctly
+            levelNext--;
+          } else if (strcmp(s, "else") == 0) {
+            if(strcmp(prevWord, "when") != 0)  // ignore a <= x when y else z;
+            {
+              levelMinCurrentElse = levelNext - 1;  // VHDL else is all on its own so just dec. the min level
+            }
+          } else if(
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "architecture") == 0)) ||
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "function") == 0)) ||
+            ((strcmp(s, "begin") == 0) && (strcmp(prevWord, "procedure") == 0)))
+          {
+            levelMinCurrentBegin = levelNext - 1;
+          }
+          //Platform::DebugPrintf("Line[%04d] Prev[%20s] Cur[%20s] Level[%x]\n", lineCurrent+1, prevWord, s, levelCurrent);
+          strcpy(prevWord, s);
+        }
+      }
+    }
+    if (atEOL) {
+      int levelUse = levelCurrent;
+
+      if (foldAtElse && (levelMinCurrentElse < levelUse)) {
+        levelUse = levelMinCurrentElse;
+      }
+      if (foldAtBegin && (levelMinCurrentBegin < levelUse)) {
+        levelUse = levelMinCurrentBegin;
+      }
+      int lev = levelUse | levelNext << 16;
+      if (visibleChars == 0 && foldCompact)
+        lev |= SC_FOLDLEVELWHITEFLAG;
+
+      if (levelUse < levelNext)
+        lev |= SC_FOLDLEVELHEADERFLAG;
+      if (lev != styler.LevelAt(lineCurrent)) {
+        styler.SetLevel(lineCurrent, lev);
+      }
+      //Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
+      lineCurrent++;
+      levelCurrent = levelNext;
+      //levelMinCurrent = levelCurrent;
+      levelMinCurrentElse = levelCurrent;
+      levelMinCurrentBegin = levelCurrent;
+      visibleChars = 0;
+    }
+    /***************************************/
+    if (!isspacechar(ch)) visibleChars++;
+  }
+
+  /***************************************/
+//  Platform::DebugPrintf("Line[%04d] ---------------------------------------------------- Level[%x]\n", lineCurrent+1, levelCurrent);
+}
+
+//=============================================================================
+static void FoldVHDLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[],
+                       Accessor &styler) {
+  FoldNoBoxVHDLDoc(startPos, length, initStyle, styler);
+}
+
+//=============================================================================
+static const char * const VHDLWordLists[] = {
+            "Keywords",
+            "Operators",
+            "Attributes",
+            "Standard Functions",
+            "Standard Packages",
+            "Standard Types",
+            "User Words",
+            0,
+        };
+
+
+LexerModule lmVHDL(SCLEX_VHDL, ColouriseVHDLDoc, "vhdl", FoldVHDLDoc, VHDLWordLists);
+
+
+// Keyword:
+//    access after alias all architecture array assert attribute begin block body buffer bus case component
+//    configuration constant disconnect downto else elsif end entity exit file for function generate generic
+//    group guarded if impure in inertial inout is label library linkage literal loop map new next null of
+//    on open others out package port postponed procedure process pure range record register reject report
+//    return select severity shared signal subtype then to transport type unaffected units until use variable
+//    wait when while with
+//
+// Operators:
+//    abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor
+//
+// Attributes:
+//    left right low high ascending image value pos val succ pred leftof rightof base range reverse_range
+//    length delayed stable quiet transaction event active last_event last_active last_value driving
+//    driving_value simple_name path_name instance_name
+//
+// Std Functions:
+//    now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector
+//    to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left
+//    rotate_right resize to_integer to_unsigned to_signed std_match to_01
+//
+// Std Packages:
+//    std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed
+//    std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives
+//    vital_timing
+//
+// Std Types:
+//    boolean bit character severity_level integer real time delay_length natural positive string bit_vector
+//    file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic
+//    std_logic_vector X01 X01Z UX01 UX01Z unsigned signed
+//
+
diff --git a/scite-app/lexilla/lexers/LexVerilog.cxx b/scite-app/lexilla/lexers/LexVerilog.cxx
new file mode 100644
index 0000000..b2120d4
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexVerilog.cxx
@@ -0,0 +1,1084 @@
+// Scintilla source code edit control
+/** @file LexVerilog.cxx
+ ** Lexer for Verilog.
+ ** Written by Avi Yegudin, based on C++ lexer by Neil Hodgson
+ **/
+// Copyright 1998-2002 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 <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+#include "OptionSet.h"
+#include "SubStyles.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+namespace {
+	// Use an unnamed namespace to protect the functions and classes from name conflicts
+
+struct PPDefinition {
+	Sci_Position line;
+	std::string key;
+	std::string value;
+	bool isUndef;
+	std::string arguments;
+	PPDefinition(Sci_Position line_, const std::string &key_, const std::string &value_, bool isUndef_ = false, std::string arguments_="") :
+		line(line_), key(key_), value(value_), isUndef(isUndef_), arguments(arguments_) {
+	}
+};
+
+class LinePPState {
+	int state;
+	int ifTaken;
+	int level;
+	bool ValidLevel() const {
+		return level >= 0 && level < 32;
+	}
+	int maskLevel() const {
+		if (level >= 0) {
+			return 1 << level;
+		} else {
+			return 1;
+		}
+	}
+public:
+	LinePPState() : state(0), ifTaken(0), level(-1) {
+	}
+	bool IsInactive() const {
+		return state != 0;
+	}
+	bool CurrentIfTaken() const {
+		return (ifTaken & maskLevel()) != 0;
+	}
+	void StartSection(bool on) {
+		level++;
+		if (ValidLevel()) {
+			if (on) {
+				state &= ~maskLevel();
+				ifTaken |= maskLevel();
+			} else {
+				state |= maskLevel();
+				ifTaken &= ~maskLevel();
+			}
+		}
+	}
+	void EndSection() {
+		if (ValidLevel()) {
+			state &= ~maskLevel();
+			ifTaken &= ~maskLevel();
+		}
+		level--;
+	}
+	void InvertCurrentLevel() {
+		if (ValidLevel()) {
+			state ^= maskLevel();
+			ifTaken |= maskLevel();
+		}
+	}
+};
+
+// Hold the preprocessor state for each line seen.
+// Currently one entry per line but could become sparse with just one entry per preprocessor line.
+class PPStates {
+	std::vector<LinePPState> vlls;
+public:
+	LinePPState ForLine(Sci_Position line) const {
+		if ((line > 0) && (vlls.size() > static_cast<size_t>(line))) {
+			return vlls[line];
+		} else {
+			return LinePPState();
+		}
+	}
+	void Add(Sci_Position line, LinePPState lls) {
+		vlls.resize(line+1);
+		vlls[line] = lls;
+	}
+};
+
+// Options used for LexerVerilog
+struct OptionsVerilog {
+	bool foldComment;
+	bool foldPreprocessor;
+	bool foldPreprocessorElse;
+	bool foldCompact;
+	bool foldAtElse;
+	bool foldAtModule;
+	bool trackPreprocessor;
+	bool updatePreprocessor;
+	bool portStyling;
+	bool allUppercaseDocKeyword;
+	OptionsVerilog() {
+		foldComment = false;
+		foldPreprocessor = false;
+		foldPreprocessorElse = false;
+		foldCompact = false;
+		foldAtElse = false;
+		foldAtModule = false;
+		// for backwards compatibility, preprocessor functionality is disabled by default
+		trackPreprocessor = false;
+		updatePreprocessor = false;
+		// for backwards compatibility, treat input/output/inout as regular keywords
+		portStyling = false;
+		// for backwards compatibility, don't treat all uppercase identifiers as documentation keywords
+		allUppercaseDocKeyword = false;
+	}
+};
+
+struct OptionSetVerilog : public OptionSet<OptionsVerilog> {
+	OptionSetVerilog() {
+		DefineProperty("fold.comment", &OptionsVerilog::foldComment,
+			"This option enables folding multi-line comments when using the Verilog lexer.");
+		DefineProperty("fold.preprocessor", &OptionsVerilog::foldPreprocessor,
+			"This option enables folding preprocessor directives when using the Verilog lexer.");
+		DefineProperty("fold.compact", &OptionsVerilog::foldCompact);
+		DefineProperty("fold.at.else", &OptionsVerilog::foldAtElse,
+			"This option enables folding on the else line of an if statement.");
+		DefineProperty("fold.verilog.flags", &OptionsVerilog::foldAtModule,
+			"This option enables folding module definitions. Typically source files "
+			"contain only one module definition so this option is somewhat useless.");
+		DefineProperty("lexer.verilog.track.preprocessor", &OptionsVerilog::trackPreprocessor,
+			"Set to 1 to interpret `if/`else/`endif to grey out code that is not active.");
+		DefineProperty("lexer.verilog.update.preprocessor", &OptionsVerilog::updatePreprocessor,
+			"Set to 1 to update preprocessor definitions when `define, `undef, or `undefineall found.");
+		DefineProperty("lexer.verilog.portstyling", &OptionsVerilog::portStyling,
+			"Set to 1 to style input, output, and inout ports differently from regular keywords.");
+		DefineProperty("lexer.verilog.allupperkeywords", &OptionsVerilog::allUppercaseDocKeyword,
+			"Set to 1 to style identifiers that are all uppercase as documentation keyword.");
+		DefineProperty("lexer.verilog.fold.preprocessor.else", &OptionsVerilog::foldPreprocessorElse,
+			"This option enables folding on `else and `elsif preprocessor directives.");
+	}
+};
+
+const char styleSubable[] = {0};
+
+}
+
+class LexerVerilog : public DefaultLexer {
+	CharacterSet setWord;
+	WordList keywords;
+	WordList keywords2;
+	WordList keywords3;
+	WordList keywords4;
+	WordList keywords5;
+	WordList ppDefinitions;
+	PPStates vlls;
+	std::vector<PPDefinition> ppDefineHistory;
+	struct SymbolValue {
+		std::string value;
+		std::string arguments;
+		SymbolValue(const std::string &value_="", const std::string &arguments_="") : value(value_), arguments(arguments_) {
+		}
+		SymbolValue &operator = (const std::string &value_) {
+			value = value_;
+			arguments.clear();
+			return *this;
+		}
+		bool IsMacro() const {
+			return !arguments.empty();
+		}
+	};
+	typedef std::map<std::string, SymbolValue> SymbolTable;
+	SymbolTable preprocessorDefinitionsStart;
+	OptionsVerilog options;
+	OptionSetVerilog osVerilog;
+	enum { activeFlag = 0x40 };
+	SubStyles subStyles;
+
+	// states at end of line (EOL) during fold operations:
+	//		foldExternFlag: EOL while parsing an extern function/task declaration terminated by ';'
+	//		foldWaitDisableFlag: EOL while parsing wait or disable statement, terminated by "fork" or '('
+	//		typdefFlag: EOL while parsing typedef statement, terminated by ';'
+	enum {foldExternFlag = 0x01, foldWaitDisableFlag = 0x02, typedefFlag = 0x04, protectedFlag = 0x08};
+	// map using line number as key to store fold state information
+	std::map<Sci_Position, int> foldState;
+
+public:
+	LexerVerilog() :
+		DefaultLexer("verilog", SCLEX_VERILOG),
+		setWord(CharacterSet::setAlphaNum, "._", 0x80, true),
+		subStyles(styleSubable, 0x80, 0x40, activeFlag) {
+		}
+	virtual ~LexerVerilog() {}
+	int SCI_METHOD Version() const override {
+		return lvRelease5;
+	}
+	void SCI_METHOD Release() override {
+		delete this;
+	}
+	const char* SCI_METHOD PropertyNames() override {
+		return osVerilog.PropertyNames();
+	}
+	int SCI_METHOD PropertyType(const char* name) override {
+		return osVerilog.PropertyType(name);
+	}
+	const char* SCI_METHOD DescribeProperty(const char* name) override {
+		return osVerilog.DescribeProperty(name);
+	}
+	Sci_Position SCI_METHOD PropertySet(const char* key, const char* val) override {
+	    return osVerilog.PropertySet(&options, key, val);
+	}
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osVerilog.PropertyGet(key);
+	}
+	const char* SCI_METHOD DescribeWordListSets() override {
+		return osVerilog.DescribeWordListSets();
+	}
+	Sci_Position SCI_METHOD WordListSet(int n, const char* wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void* SCI_METHOD PrivateCall(int, void*) override {
+		return 0;
+	}
+	int SCI_METHOD LineEndTypesSupported() override {
+		return SC_LINE_END_TYPE_UNICODE;
+	}
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		int styleBase = subStyles.BaseStyle(MaskActive(subStyle));
+		int active = subStyle & activeFlag;
+		return styleBase | active;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+		return MaskActive(style);
+ 	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() override {
+		return activeFlag;
+	}
+	const char * SCI_METHOD GetSubStyleBases() override {
+		return styleSubable;
+	}
+	static ILexer5* LexerFactoryVerilog() {
+		return new LexerVerilog();
+	}
+	static int MaskActive(int style) {
+		return style & ~activeFlag;
+	}
+	std::vector<std::string> Tokenize(const std::string &expr) const;
+};
+
+Sci_Position SCI_METHOD LexerVerilog::WordListSet(int n, const char *wl) {
+	WordList *wordListN = 0;
+	switch (n) {
+	case 0:
+		wordListN = &keywords;
+		break;
+	case 1:
+		wordListN = &keywords2;
+		break;
+	case 2:
+		wordListN = &keywords3;
+		break;
+	case 3:
+		wordListN = &keywords4;
+		break;
+	case 4:
+		wordListN = &keywords5;
+		break;
+	case 5:
+		wordListN = &ppDefinitions;
+		break;
+	}
+	Sci_Position firstModification = -1;
+	if (wordListN) {
+		WordList wlNew;
+		wlNew.Set(wl);
+		if (*wordListN != wlNew) {
+			wordListN->Set(wl);
+			firstModification = 0;
+			if (n == 5) {
+				// Rebuild preprocessorDefinitions
+				preprocessorDefinitionsStart.clear();
+				for (int nDefinition = 0; nDefinition < ppDefinitions.Length(); nDefinition++) {
+					const char *cpDefinition = ppDefinitions.WordAt(nDefinition);
+					const char *cpEquals = strchr(cpDefinition, '=');
+					if (cpEquals) {
+						std::string name(cpDefinition, cpEquals - cpDefinition);
+						std::string val(cpEquals+1);
+						size_t bracket = name.find('(');
+						size_t bracketEnd = name.find(')');
+						if ((bracket != std::string::npos) && (bracketEnd != std::string::npos)) {
+							// Macro
+							std::string args = name.substr(bracket + 1, bracketEnd - bracket - 1);
+							name = name.substr(0, bracket);
+							preprocessorDefinitionsStart[name] = SymbolValue(val, args);
+						} else {
+							preprocessorDefinitionsStart[name] = val;
+						}
+					} else {
+						std::string name(cpDefinition);
+						std::string val("1");
+						preprocessorDefinitionsStart[name] = val;
+					}
+				}
+			}
+		}
+	}
+	return firstModification;
+}
+
+static inline bool IsAWordChar(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '\''|| ch == '$');
+}
+
+static inline bool IsAWordStart(const int ch) {
+	return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '$');
+}
+
+static inline bool AllUpperCase(const char *a) {
+	while (*a) {
+		if (*a >= 'a' && *a <= 'z') return false;
+		a++;
+	}
+	return true;
+}
+
+// Functor used to truncate history
+struct After {
+	Sci_Position line;
+	explicit After(Sci_Position line_) : line(line_) {}
+	bool operator()(PPDefinition &p) const {
+		return p.line > line;
+	}
+};
+
+static std::string GetRestOfLine(LexAccessor &styler, Sci_Position start, bool allowSpace) {
+	std::string restOfLine;
+	Sci_Position i =0;
+	char ch = styler.SafeGetCharAt(start, '\n');
+	Sci_Position endLine = styler.LineEnd(styler.GetLine(start));
+	while (((start+i) < endLine) && (ch != '\r')) {
+		char chNext = styler.SafeGetCharAt(start + i + 1, '\n');
+		if (ch == '/' && (chNext == '/' || chNext == '*'))
+			break;
+		if (allowSpace || (ch != ' '))
+			restOfLine += ch;
+		i++;
+		ch = chNext;
+	}
+	return restOfLine;
+}
+
+static bool IsSpaceOrTab(int ch) {
+	return ch == ' ' || ch == '\t';
+}
+
+void SCI_METHOD LexerVerilog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess)
+{
+	LexAccessor styler(pAccess);
+
+	const int kwOther=0, kwDot=0x100, kwInput=0x200, kwOutput=0x300, kwInout=0x400, kwProtected=0x800;
+	int lineState = kwOther;
+	bool continuationLine = false;
+
+	Sci_Position curLine = styler.GetLine(startPos);
+	if (curLine > 0) lineState = styler.GetLineState(curLine - 1);
+
+	// Do not leak onto next line
+	if (initStyle == SCE_V_STRINGEOL)
+		initStyle = SCE_V_DEFAULT;
+
+	if ((MaskActive(initStyle) == SCE_V_PREPROCESSOR) ||
+			(MaskActive(initStyle) == SCE_V_COMMENTLINE) ||
+			(MaskActive(initStyle) == SCE_V_COMMENTLINEBANG)) {
+		// Set continuationLine if last character of previous line is '\'
+		if (curLine > 0) {
+			Sci_Position endLinePrevious = styler.LineEnd(curLine - 1);
+			if (endLinePrevious > 0) {
+				continuationLine = styler.SafeGetCharAt(endLinePrevious-1) == '\\';
+			}
+		}
+	}
+
+	StyleContext sc(startPos, length, initStyle, styler);
+	LinePPState preproc = vlls.ForLine(curLine);
+
+	bool definitionsChanged = false;
+
+	// Truncate ppDefineHistory before current line
+
+	if (!options.updatePreprocessor)
+		ppDefineHistory.clear();
+
+	std::vector<PPDefinition>::iterator itInvalid = std::find_if(ppDefineHistory.begin(), ppDefineHistory.end(), After(curLine-1));
+	if (itInvalid != ppDefineHistory.end()) {
+		ppDefineHistory.erase(itInvalid, ppDefineHistory.end());
+		definitionsChanged = true;
+	}
+
+	SymbolTable preprocessorDefinitions = preprocessorDefinitionsStart;
+	for (std::vector<PPDefinition>::iterator itDef = ppDefineHistory.begin(); itDef != ppDefineHistory.end(); ++itDef) {
+		if (itDef->isUndef)
+			preprocessorDefinitions.erase(itDef->key);
+		else
+			preprocessorDefinitions[itDef->key] = SymbolValue(itDef->value, itDef->arguments);
+	}
+
+	int activitySet = preproc.IsInactive() ? activeFlag : 0;
+	Sci_Position lineEndNext = styler.LineEnd(curLine);
+	bool isEscapedId = false;    // true when parsing an escaped Identifier
+	bool isProtected = (lineState&kwProtected) != 0;	// true when parsing a protected region
+
+	for (; sc.More(); sc.Forward()) {
+		if (sc.atLineStart) {
+			if (sc.state == SCE_V_STRING) {
+				// Prevent SCE_V_STRINGEOL from leaking back to previous line
+				sc.SetState(SCE_V_STRING);
+			}
+			if ((MaskActive(sc.state) == SCE_V_PREPROCESSOR) && (!continuationLine)) {
+				sc.SetState(SCE_V_DEFAULT|activitySet);
+			}
+			if (preproc.IsInactive()) {
+				activitySet = activeFlag;
+				sc.SetState(sc.state | activitySet);
+			}
+		}
+
+		if (sc.atLineEnd) {
+			curLine++;
+			lineEndNext = styler.LineEnd(curLine);
+			vlls.Add(curLine, preproc);
+			// Update the line state, so it can be seen by next line
+			styler.SetLineState(curLine, lineState);
+			isEscapedId = false;    // EOL terminates an escaped Identifier
+		}
+
+		// Handle line continuation generically.
+		if (sc.ch == '\\') {
+			if (static_cast<Sci_Position>((sc.currentPos+1)) >= lineEndNext) {
+				curLine++;
+				lineEndNext = styler.LineEnd(curLine);
+				vlls.Add(curLine, preproc);
+				// Update the line state, so it can be seen by next line
+				styler.SetLineState(curLine, lineState);
+				sc.Forward();
+				if (sc.ch == '\r' && sc.chNext == '\n') {
+					// Even in UTF-8, \r and \n are separate
+					sc.Forward();
+				}
+				continuationLine = true;
+				sc.Forward();
+				continue;
+			}
+		}
+
+		// for comment keyword
+		if (MaskActive(sc.state) == SCE_V_COMMENT_WORD && !IsAWordChar(sc.ch)) {
+			char s[100];
+			int state = lineState & 0xff;
+			sc.GetCurrent(s, sizeof(s));
+			if (keywords5.InList(s)) {
+				sc.ChangeState(SCE_V_COMMENT_WORD|activitySet);
+			} else {
+				sc.ChangeState(state|activitySet);
+			}
+			sc.SetState(state|activitySet);
+		}
+
+		const bool atLineEndBeforeSwitch = sc.atLineEnd;
+
+		// Determine if the current state should terminate.
+		switch (MaskActive(sc.state)) {
+			case SCE_V_OPERATOR:
+				sc.SetState(SCE_V_DEFAULT|activitySet);
+				break;
+			case SCE_V_NUMBER:
+				if (!(IsAWordChar(sc.ch) || (sc.ch == '?'))) {
+					sc.SetState(SCE_V_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_V_IDENTIFIER:
+				if (!isEscapedId &&(!IsAWordChar(sc.ch) || (sc.ch == '.'))) {
+					char s[100];
+					lineState &= 0xff00;
+					sc.GetCurrent(s, sizeof(s));
+					if (options.portStyling && (strcmp(s, "input") == 0)) {
+						lineState = kwInput;
+						sc.ChangeState(SCE_V_INPUT|activitySet);
+					} else if (options.portStyling && (strcmp(s, "output") == 0)) {
+						lineState = kwOutput;
+						sc.ChangeState(SCE_V_OUTPUT|activitySet);
+					} else if (options.portStyling && (strcmp(s, "inout") == 0)) {
+						lineState = kwInout;
+						sc.ChangeState(SCE_V_INOUT|activitySet);
+					} else if (lineState == kwInput) {
+						sc.ChangeState(SCE_V_INPUT|activitySet);
+					} else if (lineState == kwOutput) {
+						sc.ChangeState(SCE_V_OUTPUT|activitySet);
+					} else if (lineState == kwInout) {
+						sc.ChangeState(SCE_V_INOUT|activitySet);
+					} else if (lineState == kwDot) {
+						lineState = kwOther;
+						if (options.portStyling)
+							sc.ChangeState(SCE_V_PORT_CONNECT|activitySet);
+					} else if (keywords.InList(s)) {
+						sc.ChangeState(SCE_V_WORD|activitySet);
+					} else if (keywords2.InList(s)) {
+						sc.ChangeState(SCE_V_WORD2|activitySet);
+					} else if (keywords3.InList(s)) {
+						sc.ChangeState(SCE_V_WORD3|activitySet);
+					} else if (keywords4.InList(s)) {
+						sc.ChangeState(SCE_V_USER|activitySet);
+					} else if (options.allUppercaseDocKeyword && AllUpperCase(s)) {
+						sc.ChangeState(SCE_V_USER|activitySet);
+					}
+					sc.SetState(SCE_V_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_V_PREPROCESSOR:
+				if (!IsAWordChar(sc.ch) || sc.atLineEnd) {
+					sc.SetState(SCE_V_DEFAULT|activitySet);
+				}
+				break;
+			case SCE_V_COMMENT:
+				if (sc.Match('*', '/')) {
+					sc.Forward();
+					sc.ForwardSetState(SCE_V_DEFAULT|activitySet);
+				} else if (IsAWordStart(sc.ch)) {
+					lineState = sc.state | (lineState & 0xff00);
+					sc.SetState(SCE_V_COMMENT_WORD|activitySet);
+				}
+				break;
+			case SCE_V_COMMENTLINE:
+			case SCE_V_COMMENTLINEBANG:
+				if (sc.atLineStart) {
+					sc.SetState(SCE_V_DEFAULT|activitySet);
+				} else if (IsAWordStart(sc.ch)) {
+					lineState = sc.state | (lineState & 0xff00);
+					sc.SetState(SCE_V_COMMENT_WORD|activitySet);
+				}
+				break;
+			case SCE_V_STRING:
+				if (sc.ch == '\\') {
+					if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
+						sc.Forward();
+					}
+				} else if (sc.ch == '\"') {
+					sc.ForwardSetState(SCE_V_DEFAULT|activitySet);
+				} else if (sc.atLineEnd) {
+					sc.ChangeState(SCE_V_STRINGEOL|activitySet);
+					sc.ForwardSetState(SCE_V_DEFAULT|activitySet);
+				}
+				break;
+		}
+
+		if (sc.atLineEnd && !atLineEndBeforeSwitch) {
+			// State exit processing consumed characters up to end of line.
+			curLine++;
+			lineEndNext = styler.LineEnd(curLine);
+			vlls.Add(curLine, preproc);
+			// Update the line state, so it can be seen by next line
+			styler.SetLineState(curLine, lineState);
+			isEscapedId = false;    // EOL terminates an escaped Identifier
+		}
+
+		// Determine if a new state should be entered.
+		if (MaskActive(sc.state) == SCE_V_DEFAULT) {
+			if (sc.ch == '`') {
+				sc.SetState(SCE_V_PREPROCESSOR|activitySet);
+				// Skip whitespace between ` and preprocessor word
+				do {
+					sc.Forward();
+				} while ((sc.ch == ' ' || sc.ch == '\t') && sc.More());
+				if (sc.atLineEnd) {
+					sc.SetState(SCE_V_DEFAULT|activitySet);
+					styler.SetLineState(curLine, lineState);
+				} else {
+					if (sc.Match("protected")) {
+						isProtected = true;
+						lineState |= kwProtected;
+						styler.SetLineState(curLine, lineState);
+					} else if (sc.Match("endprotected")) {
+						isProtected = false;
+						lineState &= ~kwProtected;
+						styler.SetLineState(curLine, lineState);
+					} else if (!isProtected && options.trackPreprocessor) {
+						if (sc.Match("ifdef") || sc.Match("ifndef")) {
+							bool isIfDef = sc.Match("ifdef");
+							int i = isIfDef ? 5 : 6;
+							std::string restOfLine = GetRestOfLine(styler, sc.currentPos + i + 1, false);
+							bool foundDef = preprocessorDefinitions.find(restOfLine) != preprocessorDefinitions.end();
+							preproc.StartSection(isIfDef == foundDef);
+						} else if (sc.Match("else")) {
+							if (!preproc.CurrentIfTaken()) {
+								preproc.InvertCurrentLevel();
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
+								if (!activitySet) {
+									sc.ChangeState(SCE_V_PREPROCESSOR|activitySet);
+								}
+							} else if (!preproc.IsInactive()) {
+								preproc.InvertCurrentLevel();
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
+								if (!activitySet) {
+									sc.ChangeState(SCE_V_PREPROCESSOR|activitySet);
+								}
+							}
+						} else if (sc.Match("elsif")) {
+							// Ensure only one chosen out of `if .. `elsif .. `elsif .. `else .. `endif
+							if (!preproc.CurrentIfTaken()) {
+								// Similar to `ifdef
+								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 6, true);
+								bool ifGood = preprocessorDefinitions.find(restOfLine) != preprocessorDefinitions.end();
+								if (ifGood) {
+									preproc.InvertCurrentLevel();
+									activitySet = preproc.IsInactive() ? activeFlag : 0;
+									if (!activitySet)
+										sc.ChangeState(SCE_V_PREPROCESSOR|activitySet);
+								}
+							} else if (!preproc.IsInactive()) {
+								preproc.InvertCurrentLevel();
+								activitySet = preproc.IsInactive() ? activeFlag : 0;
+								if (!activitySet)
+									sc.ChangeState(SCE_V_PREPROCESSOR|activitySet);
+							}
+						} else if (sc.Match("endif")) {
+							preproc.EndSection();
+							activitySet = preproc.IsInactive() ? activeFlag : 0;
+							sc.ChangeState(SCE_V_PREPROCESSOR|activitySet);
+						} else if (sc.Match("define")) {
+							if (options.updatePreprocessor && !preproc.IsInactive()) {
+								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 6, true);
+								size_t startName = 0;
+								while ((startName < restOfLine.length()) && IsSpaceOrTab(restOfLine[startName]))
+									startName++;
+								size_t endName = startName;
+								while ((endName < restOfLine.length()) && setWord.Contains(static_cast<unsigned char>(restOfLine[endName])))
+									endName++;
+								std::string key = restOfLine.substr(startName, endName-startName);
+								if ((endName < restOfLine.length()) && (restOfLine.at(endName) == '(')) {
+									// Macro
+									size_t endArgs = endName;
+									while ((endArgs < restOfLine.length()) && (restOfLine[endArgs] != ')'))
+										endArgs++;
+									std::string args = restOfLine.substr(endName + 1, endArgs - endName - 1);
+									size_t startValue = endArgs+1;
+									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
+										startValue++;
+									std::string value;
+									if (startValue < restOfLine.length())
+										value = restOfLine.substr(startValue);
+									preprocessorDefinitions[key] = SymbolValue(value, args);
+									ppDefineHistory.push_back(PPDefinition(curLine, key, value, false, args));
+									definitionsChanged = true;
+								} else {
+									// Value
+									size_t startValue = endName;
+									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
+										startValue++;
+									std::string value = restOfLine.substr(startValue);
+									preprocessorDefinitions[key] = value;
+									ppDefineHistory.push_back(PPDefinition(curLine, key, value));
+									definitionsChanged = true;
+								}
+							}
+						} else if (sc.Match("undefineall")) {
+							if (options.updatePreprocessor && !preproc.IsInactive()) {
+								// remove all preprocessor definitions
+								std::map<std::string, SymbolValue>::iterator itDef;
+								for(itDef = preprocessorDefinitions.begin(); itDef != preprocessorDefinitions.end(); ++itDef) {
+									ppDefineHistory.push_back(PPDefinition(curLine, itDef->first, "", true));
+								}
+								preprocessorDefinitions.clear();
+								definitionsChanged = true;
+							}
+						} else if (sc.Match("undef")) {
+							if (options.updatePreprocessor && !preproc.IsInactive()) {
+								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 5, true);
+								std::vector<std::string> tokens = Tokenize(restOfLine);
+								std::string key;
+								if (tokens.size() >= 1) {
+									key = tokens[0];
+									preprocessorDefinitions.erase(key);
+									ppDefineHistory.push_back(PPDefinition(curLine, key, "", true));
+									definitionsChanged = true;
+								}
+							}
+						}
+					}
+				}
+			} else if (!isProtected) {
+				if (IsADigit(sc.ch) || (sc.ch == '\'') || (sc.ch == '.' && IsADigit(sc.chNext))) {
+					sc.SetState(SCE_V_NUMBER|activitySet);
+				} else if (IsAWordStart(sc.ch)) {
+					sc.SetState(SCE_V_IDENTIFIER|activitySet);
+				} else if (sc.Match('/', '*')) {
+					sc.SetState(SCE_V_COMMENT|activitySet);
+					sc.Forward();	// Eat the * so it isn't used for the end of the comment
+				} else if (sc.Match('/', '/')) {
+					if (sc.Match("//!"))	// Nice to have a different comment style
+						sc.SetState(SCE_V_COMMENTLINEBANG|activitySet);
+					else
+						sc.SetState(SCE_V_COMMENTLINE|activitySet);
+				} else if (sc.ch == '\"') {
+					sc.SetState(SCE_V_STRING|activitySet);
+				} else if (sc.ch == '\\') {
+					// escaped identifier, everything is ok up to whitespace
+					isEscapedId = true;
+					sc.SetState(SCE_V_IDENTIFIER|activitySet);
+				} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '#') {
+					sc.SetState(SCE_V_OPERATOR|activitySet);
+					if (sc.ch == '.') lineState = kwDot;
+					if (sc.ch == ';') lineState = kwOther;
+				}
+			}
+		}
+		if (isEscapedId && isspacechar(sc.ch)) {
+			isEscapedId = false;
+		}
+	}
+	if (definitionsChanged) {
+		styler.ChangeLexerState(startPos, startPos + length);
+	}
+	sc.Complete();
+}
+
+static bool IsStreamCommentStyle(int style) {
+	return style == SCE_V_COMMENT;
+}
+
+static bool IsCommentLine(Sci_Position line, LexAccessor &styler) {
+	Sci_Position pos = styler.LineStart(line);
+	Sci_Position eolPos = styler.LineStart(line + 1) - 1;
+	for (Sci_Position i = pos; i < eolPos; i++) {
+		char ch = styler[i];
+		char chNext = styler.SafeGetCharAt(i + 1);
+		int style = styler.StyleAt(i);
+		if (ch == '/' && chNext == '/' &&
+		   (style == SCE_V_COMMENTLINE || style == SCE_V_COMMENTLINEBANG)) {
+			return true;
+		} else if (!IsASpaceOrTab(ch)) {
+			return false;
+		}
+	}
+	return false;
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+void SCI_METHOD LexerVerilog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess)
+{
+	LexAccessor styler(pAccess);
+	bool foldAtBrace  = 1;
+	bool foldAtParenthese  = 1;
+
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	// Move back one line to be compatible with LexerModule::Fold behavior, fixes problem with foldComment behavior
+	if (lineCurrent > 0) {
+		lineCurrent--;
+		Sci_Position newStartPos = styler.LineStart(lineCurrent);
+		length += startPos - newStartPos;
+		startPos = newStartPos;
+		initStyle = 0;
+		if (startPos > 0) {
+			initStyle = styler.StyleAt(startPos - 1);
+		}
+	}
+	Sci_PositionU endPos = startPos + length;
+	int visibleChars = 0;
+	int levelCurrent = SC_FOLDLEVELBASE;
+	if (lineCurrent > 0)
+		levelCurrent = styler.LevelAt(lineCurrent-1) >> 16;
+	int levelMinCurrent = levelCurrent;
+	int levelNext = levelCurrent;
+	char chNext = styler[startPos];
+	int styleNext = MaskActive(styler.StyleAt(startPos));
+	int style = MaskActive(initStyle);
+
+	// restore fold state (if it exists) for prior line
+	int stateCurrent = 0;
+	std::map<Sci_Position,int>::iterator foldStateIterator = foldState.find(lineCurrent-1);
+	if (foldStateIterator != foldState.end()) {
+		stateCurrent = foldStateIterator->second;
+	}
+
+	// remove all foldState entries after lineCurrent-1
+	foldStateIterator = foldState.upper_bound(lineCurrent-1);
+	if (foldStateIterator != foldState.end()) {
+		foldState.erase(foldStateIterator, foldState.end());
+	}
+
+	for (Sci_PositionU i = startPos; i < endPos; i++) {
+		char ch = chNext;
+		chNext = styler.SafeGetCharAt(i + 1);
+		int stylePrev = style;
+		style = styleNext;
+		styleNext = MaskActive(styler.StyleAt(i + 1));
+		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		if (!(stateCurrent & protectedFlag)) {
+			if (options.foldComment && IsStreamCommentStyle(style)) {
+				if (!IsStreamCommentStyle(stylePrev)) {
+					levelNext++;
+				} else if (!IsStreamCommentStyle(styleNext) && !atEOL) {
+					// Comments don't end at end of line and the next character may be unstyled.
+					levelNext--;
+				}
+			}
+			if (options.foldComment && atEOL && IsCommentLine(lineCurrent, styler))
+			{
+				if (!IsCommentLine(lineCurrent - 1, styler)
+					&& IsCommentLine(lineCurrent + 1, styler))
+					levelNext++;
+				else if (IsCommentLine(lineCurrent - 1, styler)
+						 && !IsCommentLine(lineCurrent+1, styler))
+					levelNext--;
+			}
+			if (options.foldComment && (style == SCE_V_COMMENTLINE)) {
+				if ((ch == '/') && (chNext == '/')) {
+					char chNext2 = styler.SafeGetCharAt(i + 2);
+					if (chNext2 == '{') {
+						levelNext++;
+					} else if (chNext2 == '}') {
+						levelNext--;
+					}
+				}
+			}
+		}
+		if (ch == '`') {
+			Sci_PositionU j = i + 1;
+			while ((j < endPos) && IsASpaceOrTab(styler.SafeGetCharAt(j))) {
+				j++;
+			}
+			if (styler.Match(j, "protected")) {
+				stateCurrent |= protectedFlag;
+				levelNext++;
+			} else if (styler.Match(j, "endprotected")) {
+				stateCurrent &= ~protectedFlag;
+				levelNext--;
+			} else if (!(stateCurrent & protectedFlag) && options.foldPreprocessor && (style == SCE_V_PREPROCESSOR)) {
+				if (styler.Match(j, "if")) {
+					if (options.foldPreprocessorElse) {
+						// Measure the minimum before a begin to allow
+						// folding on "end else begin"
+						if (levelMinCurrent > levelNext) {
+							levelMinCurrent = levelNext;
+						}
+					}
+					levelNext++;
+				} else if (options.foldPreprocessorElse && styler.Match(j, "else")) {
+					levelNext--;
+					if (levelMinCurrent > levelNext) {
+						levelMinCurrent = levelNext;
+					}
+					levelNext++;
+				} else if (options.foldPreprocessorElse && styler.Match(j, "elsif")) {
+					levelNext--;
+					// Measure the minimum before a begin to allow
+					// folding on "end else begin"
+					if (levelMinCurrent > levelNext) {
+						levelMinCurrent = levelNext;
+					}
+					levelNext++;
+				} else if (styler.Match(j, "endif")) {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_V_OPERATOR) {
+			if (foldAtParenthese) {
+				if (ch == '(') {
+					levelNext++;
+				} else if (ch == ')') {
+					levelNext--;
+				}
+			}
+			// semicolons terminate external declarations
+			if (ch == ';') {
+				// extern and pure virtual declarations terminated by semicolon
+				if (stateCurrent & foldExternFlag) {
+					levelNext--;
+					stateCurrent &= ~foldExternFlag;
+				}
+				// wait and disable statements terminated by semicolon
+				if (stateCurrent & foldWaitDisableFlag) {
+					stateCurrent &= ~foldWaitDisableFlag;
+				}
+				// typedef statements terminated by semicolon
+				if (stateCurrent & typedefFlag) {
+					stateCurrent &= ~typedefFlag;
+				}
+			}
+			// wait and disable statements containing '(' will not contain "fork" keyword, special processing is not needed
+			if (ch == '(') {
+				if (stateCurrent & foldWaitDisableFlag) {
+					stateCurrent &= ~foldWaitDisableFlag;
+				}
+			}
+		}
+		if (style == SCE_V_OPERATOR) {
+			if (foldAtBrace) {
+				if (ch == '{') {
+					levelNext++;
+				} else if (ch == '}') {
+					levelNext--;
+				}
+			}
+		}
+		if (style == SCE_V_WORD && stylePrev != SCE_V_WORD) {
+			Sci_PositionU j = i;
+			if (styler.Match(j, "case") ||
+				styler.Match(j, "casex") ||
+				styler.Match(j, "casez") ||
+				styler.Match(j, "covergroup") ||
+				styler.Match(j, "function") ||
+				styler.Match(j, "generate") ||
+				styler.Match(j, "interface") ||
+				styler.Match(j, "package") ||
+				styler.Match(j, "primitive") ||
+				styler.Match(j, "program") ||
+				styler.Match(j, "sequence") ||
+				styler.Match(j, "specify") ||
+				styler.Match(j, "table") ||
+				styler.Match(j, "task") ||
+				(styler.Match(j, "module") && options.foldAtModule)) {
+				levelNext++;
+			} else if (styler.Match(j, "begin")) {
+				// Measure the minimum before a begin to allow
+				// folding on "end else begin"
+				if (levelMinCurrent > levelNext) {
+					levelMinCurrent = levelNext;
+				}
+				levelNext++;
+			} else if (styler.Match(j, "class")) {
+				// class does not introduce a block when used in a typedef statement
+				if (!(stateCurrent & typedefFlag))
+					levelNext++;
+			} else if (styler.Match(j, "fork")) {
+				// fork does not introduce a block when used in a wait or disable statement
+				if (stateCurrent & foldWaitDisableFlag) {
+					stateCurrent &= ~foldWaitDisableFlag;
+				} else
+					levelNext++;
+			} else if (styler.Match(j, "endcase") ||
+				styler.Match(j, "endclass") ||
+				styler.Match(j, "endfunction") ||
+				styler.Match(j, "endgenerate") ||
+				styler.Match(j, "endgroup") ||
+				styler.Match(j, "endinterface") ||
+				styler.Match(j, "endpackage") ||
+				styler.Match(j, "endprimitive") ||
+				styler.Match(j, "endprogram") ||
+				styler.Match(j, "endsequence") ||
+				styler.Match(j, "endspecify") ||
+				styler.Match(j, "endtable") ||
+				styler.Match(j, "endtask") ||
+				styler.Match(j, "join") ||
+				styler.Match(j, "join_any") ||
+				styler.Match(j, "join_none") ||
+				(styler.Match(j, "endmodule") && options.foldAtModule) ||
+				(styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j + 3)))) {
+				levelNext--;
+			} else if (styler.Match(j, "extern") ||
+				styler.Match(j, "pure")) {
+				// extern and pure virtual functions/tasks are terminated by ';' not endfunction/endtask
+				stateCurrent |= foldExternFlag;
+			} else if (styler.Match(j, "disable") ||
+				styler.Match(j, "wait")) {
+				// fork does not introduce a block when used in a wait or disable statement
+				stateCurrent |= foldWaitDisableFlag;
+			} else if (styler.Match(j, "typedef")) {
+				stateCurrent |= typedefFlag;
+			}
+		}
+		if (atEOL) {
+			int levelUse = levelCurrent;
+			if (options.foldAtElse||options.foldPreprocessorElse) {
+				levelUse = levelMinCurrent;
+			}
+			int lev = levelUse | levelNext << 16;
+			if (visibleChars == 0 && options.foldCompact)
+				lev |= SC_FOLDLEVELWHITEFLAG;
+			if (levelUse < levelNext)
+				lev |= SC_FOLDLEVELHEADERFLAG;
+			if (stateCurrent) {
+				foldState[lineCurrent] = stateCurrent;
+			}
+			if (lev != styler.LevelAt(lineCurrent)) {
+				styler.SetLevel(lineCurrent, lev);
+			}
+			lineCurrent++;
+			levelCurrent = levelNext;
+			levelMinCurrent = levelCurrent;
+			visibleChars = 0;
+		}
+		if (!isspacechar(ch))
+			visibleChars++;
+	}
+}
+
+std::vector<std::string> LexerVerilog::Tokenize(const std::string &expr) const {
+	// Break into tokens
+	std::vector<std::string> tokens;
+	const char *cp = expr.c_str();
+	while (*cp) {
+		std::string word;
+		if (setWord.Contains(static_cast<unsigned char>(*cp))) {
+			// Identifiers and numbers
+			while (setWord.Contains(static_cast<unsigned char>(*cp))) {
+				word += *cp;
+				cp++;
+			}
+		} else if (IsSpaceOrTab(*cp)) {
+			while (IsSpaceOrTab(*cp)) {
+				cp++;
+			}
+			continue;
+		} else {
+			// Should handle strings, characters, and comments here
+			word += *cp;
+			cp++;
+		}
+		tokens.push_back(word);
+	}
+	return tokens;
+}
+
+static const char * const verilogWordLists[] = {
+            "Primary keywords and identifiers",
+            "Secondary keywords and identifiers",
+            "System Tasks",
+            "User defined tasks and identifiers",
+            "Documentation comment keywords",
+            "Preprocessor definitions",
+            0,
+        };
+
+LexerModule lmVerilog(SCLEX_VERILOG, LexerVerilog::LexerFactoryVerilog, "verilog", verilogWordLists);
diff --git a/scite-app/lexilla/lexers/LexVisualProlog.cxx b/scite-app/lexilla/lexers/LexVisualProlog.cxx
new file mode 100644
index 0000000..dc7c332
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexVisualProlog.cxx
@@ -0,0 +1,516 @@
+// Scintilla source code edit control
+/** @file LexVisualProlog.cxx
+** Lexer for Visual Prolog.
+**/
+// Author Thomas Linder Puls, Prolog Development Denter A/S, http://www.visual-prolog.com
+// Based on Lexer for C++, C, Java, and JavaScript.
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// The line state contains:
+// In SCE_VISUALPROLOG_STRING_VERBATIM_EOL (i.e. multiline string literal): The closingQuote.
+// else (for SCE_VISUALPROLOG_COMMENT_BLOCK): The comment nesting level
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786)
+#endif
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <functional>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "OptionSet.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+// Options used for LexerVisualProlog
+struct OptionsVisualProlog {
+    OptionsVisualProlog() {
+    }
+};
+
+static const char *const visualPrologWordLists[] = {
+    "Major keywords (class, predicates, ...)",
+    "Minor keywords (if, then, try, ...)",
+    "Directive keywords without the '#' (include, requires, ...)",
+    "Documentation keywords without the '@' (short, detail, ...)",
+    0,
+};
+
+struct OptionSetVisualProlog : public OptionSet<OptionsVisualProlog> {
+    OptionSetVisualProlog() {
+        DefineWordListSets(visualPrologWordLists);
+    }
+};
+
+class LexerVisualProlog : public DefaultLexer {
+    WordList majorKeywords;
+    WordList minorKeywords;
+    WordList directiveKeywords;
+    WordList docKeywords;
+    OptionsVisualProlog options;
+    OptionSetVisualProlog osVisualProlog;
+public:
+    LexerVisualProlog() : DefaultLexer("visualprolog", SCLEX_VISUALPROLOG) {
+    }
+    virtual ~LexerVisualProlog() {
+    }
+    void SCI_METHOD Release() override {
+        delete this;
+    }
+    int SCI_METHOD Version() const override {
+        return lvRelease5;
+    }
+    const char * SCI_METHOD PropertyNames() override {
+        return osVisualProlog.PropertyNames();
+    }
+    int SCI_METHOD PropertyType(const char *name) override {
+        return osVisualProlog.PropertyType(name);
+    }
+    const char * SCI_METHOD DescribeProperty(const char *name) override {
+        return osVisualProlog.DescribeProperty(name);
+    }
+    Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osVisualProlog.PropertyGet(key);
+	}
+    const char * SCI_METHOD DescribeWordListSets() override {
+        return osVisualProlog.DescribeWordListSets();
+    }
+    Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+    void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+    void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+
+    void * SCI_METHOD PrivateCall(int, void *) override {
+        return 0;
+    }
+
+    static ILexer5 *LexerFactoryVisualProlog() {
+        return new LexerVisualProlog();
+    }
+};
+
+Sci_Position SCI_METHOD LexerVisualProlog::PropertySet(const char *key, const char *val) {
+    if (osVisualProlog.PropertySet(&options, key, val)) {
+        return 0;
+    }
+    return -1;
+}
+
+Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) {
+    WordList *wordListN = 0;
+    switch (n) {
+    case 0:
+        wordListN = &majorKeywords;
+        break;
+    case 1:
+        wordListN = &minorKeywords;
+        break;
+    case 2:
+        wordListN = &directiveKeywords;
+        break;
+    case 3:
+        wordListN = &docKeywords;
+        break;
+    }
+    Sci_Position firstModification = -1;
+    if (wordListN) {
+        WordList wlNew;
+        wlNew.Set(wl);
+        if (*wordListN != wlNew) {
+            wordListN->Set(wl);
+            firstModification = 0;
+        }
+    }
+    return firstModification;
+}
+
+// Functor used to truncate history
+struct After {
+    Sci_Position line;
+    After(Sci_Position line_) : line(line_) {}
+};
+
+static bool isLowerLetter(int ch){
+    return ccLl == CategoriseCharacter(ch);
+}
+
+static bool isUpperLetter(int ch){
+    return ccLu == CategoriseCharacter(ch);
+}
+
+static bool isAlphaNum(int ch){
+    CharacterCategory cc = CategoriseCharacter(ch);
+    return (ccLu == cc || ccLl == cc || ccLt == cc || ccLm == cc || ccLo == cc || ccNd == cc || ccNl == cc || ccNo == cc);
+}
+
+static bool isStringVerbatimOpenClose(int ch){
+    CharacterCategory cc = CategoriseCharacter(ch);
+    return (ccPc <= cc && cc <= ccSo);
+}
+
+static bool isIdChar(int ch){
+    return ('_') == ch || isAlphaNum(ch);
+}
+
+static bool isOpenStringVerbatim(int next, int &closingQuote){
+    switch (next) {
+    case L'<':
+        closingQuote = L'>';
+        return true;
+    case L'>':
+        closingQuote = L'<';
+        return true;
+    case L'(':
+        closingQuote = L')';
+        return true;
+    case L')':
+        closingQuote = L'(';
+        return true;
+    case L'[':
+        closingQuote = L']';
+        return true;
+    case L']':
+        closingQuote = L'[';
+        return true;
+    case L'{':
+        closingQuote = L'}';
+        return true;
+    case L'}':
+        closingQuote = L'{';
+        return true;
+    case L'_':
+    case L'.':
+    case L',':
+    case L';':
+        return false;
+    default:
+        if (isStringVerbatimOpenClose(next)) {
+            closingQuote = next;
+            return true;
+        } else {
+			return false;
+        }
+    }
+}
+
+// Look ahead to see which colour "end" should have (takes colour after the following keyword)
+static void endLookAhead(char s[], LexAccessor &styler, Sci_Position start) {
+    char ch = styler.SafeGetCharAt(start, '\n');
+    while (' ' == ch) {
+        start++;
+        ch = styler.SafeGetCharAt(start, '\n');
+    }
+    Sci_Position i = 0;
+    while (i < 100 && isLowerLetter(ch)){
+        s[i] = ch;
+        i++;
+        ch = styler.SafeGetCharAt(start + i, '\n');
+    }
+    s[i] = '\0';
+}
+
+static void forwardEscapeLiteral(StyleContext &sc, int EscapeState) {
+    sc.Forward();
+    if (sc.Match('"') || sc.Match('\'') || sc.Match('\\') || sc.Match('n') || sc.Match('l') || sc.Match('r') || sc.Match('t')) {
+        sc.ChangeState(EscapeState);
+    } else if (sc.Match('u')) {
+        if (IsADigit(sc.chNext, 16)) {
+            sc.Forward();
+            if (IsADigit(sc.chNext, 16)) {
+                sc.Forward();
+                if (IsADigit(sc.chNext, 16)) {
+                    sc.Forward();
+                    if (IsADigit(sc.chNext, 16)) {
+                        sc.Forward();
+                        sc.ChangeState(EscapeState);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+    LexAccessor styler(pAccess);
+    CharacterSet setDoxygen(CharacterSet::setAlpha, "");
+    CharacterSet setNumber(CharacterSet::setNone, "0123456789abcdefABCDEFxoXO");
+
+    StyleContext sc(startPos, length, initStyle, styler, 0x7f);
+
+    int styleBeforeDocKeyword = SCE_VISUALPROLOG_DEFAULT;
+    Sci_Position currentLine = styler.GetLine(startPos);
+
+    int closingQuote = '"';
+    int nestLevel = 0;
+    if (currentLine >= 1)
+    {
+        nestLevel = styler.GetLineState(currentLine - 1);
+        closingQuote = nestLevel;
+    }
+
+    // Truncate ppDefineHistory before current line
+
+    for (; sc.More(); sc.Forward()) {
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+        case SCE_VISUALPROLOG_OPERATOR:
+            sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            break;
+        case SCE_VISUALPROLOG_NUMBER:
+            // We accept almost anything because of hex. and number suffixes
+            if (!(setNumber.Contains(sc.ch)) || (sc.Match('.') && IsADigit(sc.chNext))) {
+                sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            }
+            break;
+        case SCE_VISUALPROLOG_IDENTIFIER:
+            if (!isIdChar(sc.ch)) {
+                char s[1000];
+                sc.GetCurrent(s, sizeof(s));
+                if (0 == strcmp(s, "end")) {
+                    endLookAhead(s, styler, sc.currentPos);
+                }
+                if (majorKeywords.InList(s)) {
+                    sc.ChangeState(SCE_VISUALPROLOG_KEY_MAJOR);
+                } else if (minorKeywords.InList(s)) {
+                    sc.ChangeState(SCE_VISUALPROLOG_KEY_MINOR);
+                }
+                sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            }
+            break;
+        case SCE_VISUALPROLOG_VARIABLE:
+        case SCE_VISUALPROLOG_ANONYMOUS:
+            if (!isIdChar(sc.ch)) {
+                sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            }
+            break;
+        case SCE_VISUALPROLOG_KEY_DIRECTIVE:
+            if (!isLowerLetter(sc.ch)) {
+                char s[1000];
+                sc.GetCurrent(s, sizeof(s));
+                if (!directiveKeywords.InList(s+1)) {
+                    sc.ChangeState(SCE_VISUALPROLOG_IDENTIFIER);
+                }
+                sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            }
+            break;
+        case SCE_VISUALPROLOG_COMMENT_BLOCK:
+            if (sc.Match('*', '/')) {
+                sc.Forward();
+                nestLevel--;
+                int nextState = (nestLevel == 0) ? SCE_VISUALPROLOG_DEFAULT : SCE_VISUALPROLOG_COMMENT_BLOCK;
+                sc.ForwardSetState(nextState);
+            } else if (sc.Match('/', '*')) {
+                sc.Forward();
+                nestLevel++;
+            } else if (sc.Match('@')) {
+                styleBeforeDocKeyword = sc.state;
+                sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR);
+            }
+            break;
+        case SCE_VISUALPROLOG_COMMENT_LINE:
+            if (sc.atLineEnd) {
+                int nextState = (nestLevel == 0) ? SCE_VISUALPROLOG_DEFAULT : SCE_VISUALPROLOG_COMMENT_BLOCK;
+                sc.SetState(nextState);
+            } else if (sc.Match('@')) {
+                styleBeforeDocKeyword = sc.state;
+                sc.SetState(SCE_VISUALPROLOG_COMMENT_KEY_ERROR);
+            }
+            break;
+        case SCE_VISUALPROLOG_COMMENT_KEY_ERROR:
+            if (!setDoxygen.Contains(sc.ch) || sc.atLineEnd) {
+                char s[1000];
+                sc.GetCurrent(s, sizeof(s));
+                if (docKeywords.InList(s+1)) {
+                    sc.ChangeState(SCE_VISUALPROLOG_COMMENT_KEY);
+                }
+                if (SCE_VISUALPROLOG_COMMENT_LINE == styleBeforeDocKeyword && sc.atLineEnd) {
+                    // end line comment
+                    int nextState = (nestLevel == 0) ? SCE_VISUALPROLOG_DEFAULT : SCE_VISUALPROLOG_COMMENT_BLOCK;
+                    sc.SetState(nextState);
+                } else {
+                    sc.SetState(styleBeforeDocKeyword);
+                    if (SCE_VISUALPROLOG_COMMENT_BLOCK == styleBeforeDocKeyword && sc.Match('*', '/')) {
+                        // we have consumed the '*' if it comes immediately after the docKeyword
+                        sc.Forward();
+                        sc.Forward();
+                        nestLevel--;
+                        if (0 == nestLevel) {
+                            sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+                        }
+                    }
+                }
+            }
+            break;
+        case SCE_VISUALPROLOG_STRING_ESCAPE:
+        case SCE_VISUALPROLOG_STRING_ESCAPE_ERROR:
+            // return to SCE_VISUALPROLOG_STRING and treat as such (fall-through)
+            sc.SetState(SCE_VISUALPROLOG_STRING);
+            // Falls through.
+        case SCE_VISUALPROLOG_STRING:
+            if (sc.atLineEnd) {
+                sc.SetState(SCE_VISUALPROLOG_STRING_EOL_OPEN);
+            } else if (sc.Match(closingQuote)) {
+                sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT);
+            } else if (sc.Match('\\')) {
+                sc.SetState(SCE_VISUALPROLOG_STRING_ESCAPE_ERROR);
+                forwardEscapeLiteral(sc, SCE_VISUALPROLOG_STRING_ESCAPE);
+            }
+            break;
+        case SCE_VISUALPROLOG_STRING_EOL_OPEN:
+            if (sc.atLineStart) {
+                sc.SetState(SCE_VISUALPROLOG_DEFAULT);
+            }
+            break;
+        case SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL:
+        case SCE_VISUALPROLOG_STRING_VERBATIM_EOL:
+            // return to SCE_VISUALPROLOG_STRING_VERBATIM and treat as such (fall-through)
+            sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM);
+            // Falls through.
+        case SCE_VISUALPROLOG_STRING_VERBATIM:
+            if (sc.atLineEnd) {
+                sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM_EOL);
+            } else if (sc.Match(closingQuote)) {
+                if (closingQuote == sc.chNext) {
+                    sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL);
+                    sc.Forward();
+                } else {
+                    sc.ForwardSetState(SCE_VISUALPROLOG_DEFAULT);
+                }
+            }
+            break;
+        }
+
+        if (sc.atLineEnd) {
+            // Update the line state, so it can be seen by next line
+            int lineState = 0;
+            if (SCE_VISUALPROLOG_STRING_VERBATIM_EOL == sc.state) {
+                lineState = closingQuote;
+            } else if (SCE_VISUALPROLOG_COMMENT_BLOCK == sc.state) {
+                lineState = nestLevel;
+            }
+            styler.SetLineState(currentLine, lineState);
+            currentLine++;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_VISUALPROLOG_DEFAULT) {
+            if (sc.Match('@') && isOpenStringVerbatim(sc.chNext, closingQuote)) {
+                sc.SetState(SCE_VISUALPROLOG_STRING_VERBATIM);
+                sc.Forward();
+            } else if (IsADigit(sc.ch) || (sc.Match('.') && IsADigit(sc.chNext))) {
+                sc.SetState(SCE_VISUALPROLOG_NUMBER);
+            } else if (isLowerLetter(sc.ch)) {
+                sc.SetState(SCE_VISUALPROLOG_IDENTIFIER);
+            } else if (isUpperLetter(sc.ch)) {
+                sc.SetState(SCE_VISUALPROLOG_VARIABLE);
+            } else if (sc.Match('_')) {
+                sc.SetState(SCE_VISUALPROLOG_ANONYMOUS);
+            } else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_VISUALPROLOG_COMMENT_BLOCK);
+                nestLevel = 1;
+                sc.Forward();	// Eat the * so it isn't used for the end of the comment
+            } else if (sc.Match('%')) {
+                sc.SetState(SCE_VISUALPROLOG_COMMENT_LINE);
+            } else if (sc.Match('\'')) {
+                closingQuote = '\'';
+                sc.SetState(SCE_VISUALPROLOG_STRING);
+            } else if (sc.Match('"')) {
+                closingQuote = '"';
+                sc.SetState(SCE_VISUALPROLOG_STRING);
+            } else if (sc.Match('#')) {
+                sc.SetState(SCE_VISUALPROLOG_KEY_DIRECTIVE);
+            } else if (isoperator(static_cast<char>(sc.ch)) || sc.Match('\\')) {
+                sc.SetState(SCE_VISUALPROLOG_OPERATOR);
+            }
+        }
+
+    }
+    sc.Complete();
+    styler.Flush();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+
+void SCI_METHOD LexerVisualProlog::Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
+
+    LexAccessor styler(pAccess);
+
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position currentLine = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (currentLine > 0)
+        levelCurrent = styler.LevelAt(currentLine-1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    int style = initStyle;
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_VISUALPROLOG_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            } else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (!IsASpace(ch))
+            visibleChars++;
+        if (atEOL || (i == endPos-1)) {
+            int levelUse = levelCurrent;
+            int lev = levelUse | levelNext << 16;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(currentLine)) {
+                styler.SetLevel(currentLine, lev);
+            }
+            currentLine++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            if (atEOL && (i == static_cast<Sci_PositionU>(styler.Length()-1))) {
+                // There is an empty line at end of file so give it same level and empty
+                styler.SetLevel(currentLine, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG);
+            }
+            visibleChars = 0;
+        }
+    }
+}
+
+LexerModule lmVisualProlog(SCLEX_VISUALPROLOG, LexerVisualProlog::LexerFactoryVisualProlog, "visualprolog", visualPrologWordLists);
diff --git a/scite-app/lexilla/lexers/LexX12.cxx b/scite-app/lexilla/lexers/LexX12.cxx
new file mode 100644
index 0000000..71f6a23
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexX12.cxx
@@ -0,0 +1,349 @@
+// Scintilla Lexer for X12
+// @file LexX12.cxx
+// Written by Iain Clarke, IMCSoft & Inobiz AB.
+// X12 official documentation is behind a paywall, but there's a description of the syntax here:
+// http://www.rawlinsecconsulting.com/x12tutorial/x12syn.html
+// This code is subject to the same license terms as the rest of the scintilla project:
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+
+// Header order must match order in scripts/HeaderOrder.txt
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+
+#include <string>
+#include <string_view>
+
+#include <vector>
+#include <algorithm>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "LexerModule.h"
+#include "DefaultLexer.h"
+
+using namespace Scintilla;
+using namespace Lexilla;
+
+class LexerX12 : public DefaultLexer
+{
+public:
+	LexerX12();
+	virtual ~LexerX12() {} // virtual destructor, as we inherit from ILexer
+
+	static ILexer5 *Factory() {
+		return new LexerX12;
+	}
+
+	int SCI_METHOD Version() const override
+	{
+		return lvRelease5;
+	}
+	void SCI_METHOD Release() override
+	{
+		delete this;
+	}
+
+	const char * SCI_METHOD PropertyNames() override
+	{
+		return "fold";
+	}
+	int SCI_METHOD PropertyType(const char *) override
+	{
+		return SC_TYPE_BOOLEAN; // Only one property!
+	}
+	const char * SCI_METHOD DescribeProperty(const char *name) override
+	{
+		if (!strcmp(name, "fold"))
+			return "Whether to apply folding to document or not";
+		return NULL;
+	}
+
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override
+	{
+		if (!strcmp(key, "fold"))
+		{
+			m_bFold = strcmp(val, "0") ? true : false;
+			return 0;
+		}
+		return -1;
+	}
+	const char * SCI_METHOD PropertyGet(const char *) override {
+		return "";
+	}
+	const char * SCI_METHOD DescribeWordListSets() override
+	{
+		return NULL;
+	}
+	Sci_Position SCI_METHOD WordListSet(int, const char *) override
+	{
+		return -1;
+	}
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
+	void * SCI_METHOD PrivateCall(int, void *) override
+	{
+		return NULL;
+	}
+
+protected:
+	struct Terminator
+	{
+		int Style = SCE_X12_BAD;
+		Sci_PositionU pos = 0;
+		Sci_PositionU length = 0;
+		int FoldChange = 0;
+	};
+	Terminator InitialiseFromISA(IDocument *pAccess);
+	Sci_PositionU FindPreviousSegmentStart(IDocument *pAccess, Sci_Position startPos) const;
+	Terminator DetectSegmentHeader(IDocument *pAccess, Sci_PositionU pos) const;
+	Terminator FindNextTerminator(IDocument *pAccess, Sci_PositionU pos, bool bJustSegmentTerminator = false) const;
+
+	bool m_bFold;
+	char m_chSubElement;
+	char m_chElement;
+	char m_chSegment[3]; // might be CRLF
+};
+
+LexerModule lmX12(SCLEX_X12, LexerX12::Factory, "x12");
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+LexerX12::LexerX12() : DefaultLexer("x12", SCLEX_X12)
+{
+	m_bFold = false;
+	m_chSegment[0] = m_chSegment[1] = m_chSegment[2] = m_chElement = m_chSubElement = 0;
+}
+
+void LexerX12::Lex(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess)
+{
+	Sci_PositionU posFinish = startPos + length;
+
+	Terminator T = InitialiseFromISA(pAccess);
+
+	if (T.Style == SCE_X12_BAD)
+	{
+		if (T.pos < startPos)
+			T.pos = startPos; // we may be colouring in batches.
+		pAccess->StartStyling(startPos);
+		pAccess->SetStyleFor(T.pos - startPos, SCE_X12_ENVELOPE);
+		pAccess->SetStyleFor(posFinish - T.pos, SCE_X12_BAD);
+		return;
+	}
+
+	// Look backwards for a segment start or a document beginning
+	Sci_PositionU posCurrent = FindPreviousSegmentStart (pAccess, startPos);
+
+	// Style buffer, so we're not issuing loads of notifications
+	pAccess->StartStyling(posCurrent);
+
+	while (posCurrent < posFinish)
+	{
+		// Look for first element marker, so we can denote segment
+		T = DetectSegmentHeader(pAccess, posCurrent);
+		if (T.Style == SCE_X12_BAD)
+			break;
+
+		pAccess->SetStyleFor(T.pos - posCurrent, T.Style);
+		pAccess->SetStyleFor(T.length, SCE_X12_SEP_ELEMENT);
+		posCurrent = T.pos + T.length;
+
+		while (T.Style != SCE_X12_BAD && T.Style != SCE_X12_SEGMENTEND) // Break on bad or segment ending
+		{
+			T = FindNextTerminator(pAccess, posCurrent);
+			if (T.Style == SCE_X12_BAD)
+				break;
+
+			int Style = T.Style;
+			if (T.Style == SCE_X12_SEGMENTEND && m_chSegment[0] == '\r') // don't style cr/crlf
+				Style = SCE_X12_DEFAULT;
+
+			pAccess->SetStyleFor(T.pos - posCurrent, SCE_X12_DEFAULT);
+			pAccess->SetStyleFor(T.length, Style);
+			posCurrent = T.pos + T.length;
+		}
+		if (T.Style == SCE_X12_BAD)
+			break;
+	}
+
+	pAccess->SetStyleFor(posFinish - posCurrent, SCE_X12_BAD);
+}
+
+void LexerX12::Fold(Sci_PositionU startPos, Sci_Position length, int, IDocument *pAccess)
+{
+	if (!m_bFold)
+		return;
+
+	// Are we even foldable?
+	if (m_chSegment[0] != '\r' && m_chSegment[0] != '\n') // check for cr,lf,cr+lf.
+		return;
+
+	Sci_PositionU posFinish = startPos + length;
+
+	// Look backwards for a segment start or a document beginning
+	startPos = FindPreviousSegmentStart(pAccess, startPos);
+	Terminator T;
+
+	Sci_PositionU currLine = pAccess->LineFromPosition(startPos);
+	int levelCurrentStyle = SC_FOLDLEVELBASE;
+	if (currLine > 0)
+		levelCurrentStyle = pAccess->GetLevel(currLine - 1); // bottom 12 bits are level
+	int indentCurrent = levelCurrentStyle & (SC_FOLDLEVELBASE - 1);
+
+	while (startPos < posFinish)
+	{
+		T = DetectSegmentHeader(pAccess, startPos);
+		int indentNext = indentCurrent + T.FoldChange;
+		if (indentNext < 0)
+			indentNext = 0;
+
+		levelCurrentStyle = (T.FoldChange > 0) ? (SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG) : SC_FOLDLEVELBASE;
+
+		currLine = pAccess->LineFromPosition(startPos);
+		pAccess->SetLevel(currLine, levelCurrentStyle | indentCurrent);
+
+		T = FindNextTerminator(pAccess, startPos, true);
+		startPos = T.pos + T.length;
+		indentCurrent = indentNext;
+	}
+}
+
+LexerX12::Terminator LexerX12::InitialiseFromISA(IDocument *pAccess)
+{
+	Sci_Position length = pAccess->Length();
+	char c;
+	if (length <= 106)
+		return { SCE_X12_BAD, 0 };
+
+	pAccess->GetCharRange(&m_chElement, 3, 1);
+	pAccess->GetCharRange(&m_chSubElement, 104, 1);
+	pAccess->GetCharRange(m_chSegment, 105, 1);
+	if (m_chSegment[0] == '\r') // are we CRLF?
+	{
+		pAccess->GetCharRange(&c, 106, 1);
+		if (c == '\n')
+			m_chSegment[1] = c;
+	}
+
+	// Validate we have an element separator, and it's not silly!
+	if (m_chElement == '\0' || m_chElement == '\n' || m_chElement == '\r')
+		return { SCE_X12_BAD, 3 };
+
+	// Validate we have an element separator, and it's not silly!
+	if (m_chSubElement == '\0' || m_chSubElement == '\n' || m_chSubElement == '\r')
+		return { SCE_X12_BAD, 103 };
+
+	if (m_chElement == m_chSubElement)
+		return { SCE_X12_BAD, 104 };
+	if (m_chElement == m_chSegment[0])
+		return { SCE_X12_BAD, 105 };
+	if (m_chSubElement == m_chSegment[0])
+		return { SCE_X12_BAD, 104 };
+
+	// Check we have element markers at all the right places! ISA element has fixed entries.
+	std::vector<Sci_PositionU> ElementMarkers = { 3, 6, 17, 20, 31, 34, 50, 53, 69, 76, 81, 83, 89, 99, 101, 103  };
+	for (auto i : ElementMarkers)
+	{
+		pAccess->GetCharRange(&c, i, 1);
+		if (c != m_chElement)
+			return { SCE_X12_BAD, i };
+	}
+	// Check we have no element markers anywhere else!
+	for (Sci_PositionU i = 0; i < 105; i++)
+	{
+		if (std::find(ElementMarkers.begin(), ElementMarkers.end(), i) != ElementMarkers.end())
+			continue;
+
+		pAccess->GetCharRange(&c, i, 1);
+		if (c == m_chElement)
+			return { SCE_X12_BAD, i };
+	}
+
+	return { SCE_X12_ENVELOPE };
+}
+
+Sci_PositionU LexerX12::FindPreviousSegmentStart(IDocument *pAccess, Sci_Position startPos) const
+{
+	char c;
+
+	for ( ; startPos > 0; startPos--)
+	{
+		pAccess->GetCharRange(&c, startPos, 1);
+		if (c != m_chSegment[0])
+			continue;
+		// we've matched one - if this is not crlf we're done.
+		if (!m_chSegment[1])
+			return startPos + 1;
+		pAccess->GetCharRange(&c, startPos+1, 1);
+		if (c == m_chSegment[1])
+			return startPos + 2;
+	}
+	// We didn't find a ', so just go with the beginning
+	return 0;
+}
+
+LexerX12::Terminator LexerX12::DetectSegmentHeader(IDocument *pAccess, Sci_PositionU pos) const
+{
+	Sci_PositionU posStart = pos;
+	Sci_Position Length = pAccess->Length();
+	char Buf[6] = { 0 };
+	while (pos - posStart < 5 && pos < (Sci_PositionU)Length)
+	{
+		pAccess->GetCharRange(Buf + pos - posStart, pos, 1);
+		if (Buf [pos - posStart] != m_chElement) // more?
+		{
+			pos++;
+			continue;
+		}
+		if (strcmp(Buf, "ISA*") == 0)
+			return { SCE_X12_ENVELOPE, pos, 1, +1 };
+		if (strcmp(Buf, "IEA*") == 0)
+			return { SCE_X12_ENVELOPE, pos, 1, -1 };
+		if (strcmp(Buf, "GS*") == 0)
+			return { SCE_X12_FUNCTIONGROUP, pos, 1, +1 };
+		if (strcmp(Buf, "GE*") == 0)
+			return { SCE_X12_FUNCTIONGROUP, pos, 1, -1 };
+		if (strcmp(Buf, "ST*") == 0)
+			return { SCE_X12_TRANSACTIONSET, pos, 1, +1 };
+		if (strcmp(Buf, "SE*") == 0)
+			return { SCE_X12_TRANSACTIONSET, pos, 1, -1 };
+		return { SCE_X12_SEGMENTHEADER, pos, 1, 0 };
+	}
+	return { SCE_X12_BAD, pos, 0, 0 };
+}
+
+LexerX12::Terminator LexerX12::FindNextTerminator(IDocument *pAccess, Sci_PositionU pos, bool bJustSegmentTerminator) const
+{
+	char c;
+	Sci_Position Length = pAccess->Length();
+
+	while (pos < (Sci_PositionU)Length)
+	{
+		pAccess->GetCharRange(&c, pos, 1);
+		if (!bJustSegmentTerminator && c == m_chElement)
+			return { SCE_X12_SEP_ELEMENT, pos, 1 };
+		else if (!bJustSegmentTerminator && c == m_chSubElement)
+			return { SCE_X12_SEP_SUBELEMENT, pos, 1 };
+		else if (c == m_chSegment[0])
+		{
+			if (!m_chSegment[1])
+				return { SCE_X12_SEGMENTEND, pos, 1 };
+			pos++;
+			if (pos >= (Sci_PositionU)Length)
+				break;
+			pAccess->GetCharRange(&c, pos, 1);
+			if (c == m_chSegment[1])
+				return { SCE_X12_SEGMENTEND, pos-1, 2 };
+		}
+		pos++;
+	}
+
+	return { SCE_X12_BAD, pos };
+}
diff --git a/scite-app/lexilla/lexers/LexYAML.cxx b/scite-app/lexilla/lexers/LexYAML.cxx
new file mode 100644
index 0000000..e26ebf8
--- /dev/null
+++ b/scite-app/lexilla/lexers/LexYAML.cxx
@@ -0,0 +1,362 @@
+// Scintilla source code edit control
+/** @file LexYAML.cxx
+ ** Lexer for YAML.
+ **/
+// 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 <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Lexilla;
+
+static const char * const yamlWordListDesc[] = {
+	"Keywords",
+	0
+};
+
+static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+	return (styler[i] == '\n') ||
+		((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
+}
+
+/**
+ * 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 {
+	return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r';
+}
+
+static unsigned int SpaceCount(char* lineBuffer) {
+	if (lineBuffer == NULL)
+		return 0;
+
+	char* headBuffer = lineBuffer;
+
+	while (*headBuffer == ' ')
+		headBuffer++;
+
+	return static_cast<unsigned int>(headBuffer - lineBuffer);
+}
+
+static bool KeywordAtChar(char* lineBuffer, char* startComment, const WordList &keywords) {
+	if (lineBuffer == NULL || startComment <= lineBuffer)
+		return false;
+	char* endValue = startComment - 1;
+	while (endValue >= lineBuffer && *endValue == ' ')
+		endValue--;
+	Sci_PositionU len = static_cast<Sci_PositionU>(endValue - lineBuffer) + 1;
+	char s[100];
+	if (len > (sizeof(s) / sizeof(s[0]) - 1))
+		return false;
+	strncpy(s, lineBuffer, len);
+	s[len] = '\0';
+	return (keywords.InList(s));
+}
+
+#define YAML_STATE_BITSIZE		16
+#define YAML_STATE_MASK			(0xFFFF0000)
+#define YAML_STATE_DOCUMENT		(1 << YAML_STATE_BITSIZE)
+#define YAML_STATE_VALUE		(2 << YAML_STATE_BITSIZE)
+#define YAML_STATE_COMMENT		(3 << YAML_STATE_BITSIZE)
+#define YAML_STATE_TEXT_PARENT	(4 << YAML_STATE_BITSIZE)
+#define YAML_STATE_TEXT			(5 << YAML_STATE_BITSIZE)
+
+static void ColouriseYAMLLine(
+	char *lineBuffer,
+	Sci_PositionU currentLine,
+	Sci_PositionU lengthLine,
+	Sci_PositionU startLine,
+	Sci_PositionU endPos,
+	WordList &keywords,
+	Accessor &styler) {
+
+	Sci_PositionU i = 0;
+	bool bInQuotes = false;
+	unsigned int indentAmount = SpaceCount(lineBuffer);
+
+	if (currentLine > 0) {
+		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);
+			if (indentAmount > parentIndentAmount) {
+				styler.SetLineState(currentLine, YAML_STATE_TEXT | parentIndentAmount);
+				styler.ColourTo(endPos, SCE_YAML_TEXT);
+				return;
+			}
+		}
+	}
+	styler.SetLineState(currentLine, 0);
+	if (strncmp(lineBuffer, "---", 3) == 0 || strncmp(lineBuffer, "...", 3) == 0) {	// Document marker
+		styler.SetLineState(currentLine, YAML_STATE_DOCUMENT);
+		styler.ColourTo(endPos, SCE_YAML_DOCUMENT);
+		return;
+	}
+	// Skip initial spaces
+	while ((i < lengthLine) && lineBuffer[i] == ' ') { // YAML always uses space, never TABS or anything else
+		i++;
+	}
+	if (lineBuffer[i] == '\t') { // if we skipped all spaces, and we are NOT inside a text block, this is wrong
+		styler.ColourTo(endPos, SCE_YAML_ERROR);
+		return;
+	}
+	if (lineBuffer[i] == '#') {	// Comment
+		styler.SetLineState(currentLine, YAML_STATE_COMMENT);
+		styler.ColourTo(endPos, SCE_YAML_COMMENT);
+		return;
+	}
+	while (i < lengthLine) {
+		if (lineBuffer[i] == '\'' || lineBuffer[i] == '\"') {
+			bInQuotes = !bInQuotes;
+		} else if (lineBuffer[i] == '#' && isspacechar(lineBuffer[i - 1]) && !bInQuotes) {
+			styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
+			styler.ColourTo(endPos, SCE_YAML_COMMENT);
+			return;
+		} else if (lineBuffer[i] == ':' && !bInQuotes && (IsWhiteSpaceOrEOL(lineBuffer[i + 1]) || i == lengthLine - 1)) {
+			styler.ColourTo(startLine + i - 1, SCE_YAML_IDENTIFIER);
+			styler.ColourTo(startLine + i, SCE_YAML_OPERATOR);
+			// Non-folding scalar
+			i++;
+			while ((i < lengthLine) && isspacechar(lineBuffer[i]))
+				i++;
+			Sci_PositionU endValue = lengthLine - 1;
+			while ((endValue >= i) && isspacechar(lineBuffer[endValue]))
+				endValue--;
+			lineBuffer[endValue + 1] = '\0';
+			if (lineBuffer[i] == '|' || lineBuffer[i] == '>') {
+				i++;
+				if (lineBuffer[i] == '+' || lineBuffer[i] == '-')
+					i++;
+				while ((i < lengthLine) && isspacechar(lineBuffer[i]))
+					i++;
+				if (lineBuffer[i] == '\0') {
+					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
+					styler.ColourTo(endPos, SCE_YAML_DEFAULT);
+					return;
+				} else if (lineBuffer[i] == '#') {
+					styler.SetLineState(currentLine, YAML_STATE_TEXT_PARENT | indentAmount);
+					styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
+					styler.ColourTo(endPos, SCE_YAML_COMMENT);
+					return;
+				} else {
+					styler.ColourTo(endPos, SCE_YAML_ERROR);
+					return;
+				}
+			} else if (lineBuffer[i] == '#') {
+				styler.ColourTo(startLine + i - 1, SCE_YAML_DEFAULT);
+				styler.ColourTo(endPos, SCE_YAML_COMMENT);
+				return;
+			}
+			Sci_PositionU startComment = i;
+			bInQuotes = false;
+			while (startComment < lengthLine) { // Comment must be space padded
+				if (lineBuffer[startComment] == '\'' || lineBuffer[startComment] == '\"')
+					bInQuotes = !bInQuotes;
+				if (lineBuffer[startComment] == '#' && isspacechar(lineBuffer[startComment - 1]) && !bInQuotes)
+					break;
+				startComment++;
+			}
+			styler.SetLineState(currentLine, YAML_STATE_VALUE);
+			if (lineBuffer[i] == '&' || lineBuffer[i] == '*') {
+				styler.ColourTo(startLine + startComment - 1, SCE_YAML_REFERENCE);
+				if (startComment < lengthLine)
+					styler.ColourTo(endPos, SCE_YAML_COMMENT);
+				return;
+			}
+			if (KeywordAtChar(&lineBuffer[i], &lineBuffer[startComment], keywords)) { // Convertible value (true/false, etc.)
+				styler.ColourTo(startLine + startComment - 1, SCE_YAML_KEYWORD);
+				if (startComment < lengthLine)
+					styler.ColourTo(endPos, SCE_YAML_COMMENT);
+				return;
+			}
+			Sci_PositionU i2 = i;
+			while ((i < startComment) && lineBuffer[i]) {
+				if (!(IsASCII(lineBuffer[i]) && isdigit(lineBuffer[i])) && lineBuffer[i] != '-'
+				        && lineBuffer[i] != '.' && lineBuffer[i] != ',' && lineBuffer[i] != ' ') {
+					styler.ColourTo(startLine + startComment - 1, SCE_YAML_DEFAULT);
+					if (startComment < lengthLine)
+						styler.ColourTo(endPos, SCE_YAML_COMMENT);
+					return;
+				}
+				i++;
+			}
+			if (i > i2) {
+				styler.ColourTo(startLine + startComment - 1, SCE_YAML_NUMBER);
+				if (startComment < lengthLine)
+					styler.ColourTo(endPos, SCE_YAML_COMMENT);
+				return;
+			}
+			break; // shouldn't get here, but just in case, the rest of the line is coloured the default
+		}
+		i++;
+	}
+	styler.ColourTo(endPos, SCE_YAML_DEFAULT);
+}
+
+static void ColouriseYAMLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) {
+	char lineBuffer[1024] = "";
+	styler.StartAt(startPos);
+	styler.StartSegment(startPos);
+	Sci_PositionU linePos = 0;
+	Sci_PositionU startLine = startPos;
+	Sci_PositionU endPos = startPos + length;
+	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)) {
+			// End of line (or of line buffer) met, colourise it
+			lineBuffer[linePos] = '\0';
+			ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, i, *keywordLists[0], styler);
+			linePos = 0;
+			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);
+	}
+}
+
+static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	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*/,
+                      WordList *[], Accessor &styler) {
+	const Sci_Position maxPos = startPos + length;
+	const Sci_Position maxLines = styler.GetLine(maxPos - 1);             // Requested last line
+	const Sci_Position docLines = styler.GetLine(styler.Length() - 1);  // Available last line
+	const bool foldComment = styler.GetPropertyInt("fold.comment.yaml") != 0;
+
+	// Backtrack to previous non-blank line so we can determine indent level
+	// for any white space lines
+	// and so we can fix any preceding fold level (which is why we go back
+	// at least one line in all cases)
+	int spaceFlags = 0;
+	Sci_Position lineCurrent = styler.GetLine(startPos);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	while (lineCurrent > 0) {
+		lineCurrent--;
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
+		        (!IsCommentLine(lineCurrent, styler)))
+			break;
+	}
+	int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+
+	// Set up initial loop state
+	int prevComment = 0;
+	if (lineCurrent >= 1)
+		prevComment = foldComment && IsCommentLine(lineCurrent - 1, styler);
+
+	// Process all characters to end of requested range
+	// or comment that hangs over the end of the range.  Cap processing in all cases
+	// to end of document (in case of unclosed comment at end).
+	while ((lineCurrent <= docLines) && ((lineCurrent <= maxLines) || prevComment)) {
+
+		// Gather info
+		int lev = indentCurrent;
+		Sci_Position lineNext = lineCurrent + 1;
+		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);
+		}
+		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
+		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
+		                           IsCommentLine(lineNext, styler) && (lev > SC_FOLDLEVELBASE));
+		const int comment_continue = (comment && prevComment);
+		if (!comment)
+			indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK;
+		if (indentNext & SC_FOLDLEVELWHITEFLAG)
+			indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel;
+
+		if (comment_start) {
+			// Place fold point at start of a block of comments
+			lev |= SC_FOLDLEVELHEADERFLAG;
+		} else if (comment_continue) {
+			// Add level to rest of lines in the block
+			lev = lev + 1;
+		}
+
+		// Skip past any blank lines for next indent level info; we skip also
+		// comments (all comments, not just those starting in column 0)
+		// which effectively folds them into surrounding code rather
+		// than screwing up folding.
+
+		while ((lineNext < docLines) &&
+		        ((indentNext & SC_FOLDLEVELWHITEFLAG) ||
+		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
+
+			lineNext++;
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+		}
+
+		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
+		const int levelBeforeComments = Maximum(indentCurrentLevel,levelAfterComments);
+
+		// Now set all the indent levels on the lines we skipped
+		// Do this from end to start.  Once we encounter one line
+		// which is indented more than the line after the end of
+		// the comment-block, use the level of the block before
+
+		Sci_Position skipLine = lineNext;
+		int skipLevel = levelAfterComments;
+
+		while (--skipLine > lineCurrent) {
+			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+
+			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
+				skipLevel = levelBeforeComments;
+
+			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+
+			styler.SetLevel(skipLine, skipLevel | whiteFlag);
+		}
+
+		// Set fold header on non-comment line
+		if (!comment && !(indentCurrent & SC_FOLDLEVELWHITEFLAG) ) {
+			if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK))
+				lev |= SC_FOLDLEVELHEADERFLAG;
+		}
+
+		// Keep track of block comment state of previous line
+		prevComment = comment_start || comment_continue;
+
+		// Set fold level for this line and move to next line
+		styler.SetLevel(lineCurrent, lev);
+		indentCurrent = indentNext;
+		lineCurrent = lineNext;
+	}
+
+	// NOTE: Cannot set level of last line here because indentCurrent doesn't have
+	// header flag set; the loop above is crafted to take care of this case!
+	//styler.SetLevel(lineCurrent, indentCurrent);
+}
+
+LexerModule lmYAML(SCLEX_YAML, ColouriseYAMLDoc, "yaml", FoldYAMLDoc, yamlWordListDesc);
diff --git a/scite-app/lexilla/lexlib/Accessor.cxx b/scite-app/lexilla/lexlib/Accessor.cxx
new file mode 100644
index 0000000..65e0737
--- /dev/null
+++ b/scite-app/lexilla/lexlib/Accessor.cxx
@@ -0,0 +1,76 @@
+// Scintilla source code edit control
+/** @file Accessor.cxx
+ ** Interfaces between Scintilla and lexers.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+
+using namespace Lexilla;
+
+Accessor::Accessor(Scintilla::IDocument *pAccess_, PropSetSimple *pprops_) : LexAccessor(pAccess_), pprops(pprops_) {
+}
+
+int Accessor::GetPropertyInt(std::string_view key, int defaultValue) const {
+	return pprops->GetInt(key, defaultValue);
+}
+
+int Accessor::IndentAmount(Sci_Position line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
+	const Sci_Position end = Length();
+	int spaceFlags = 0;
+
+	// Determines the indentation level of the current line and also checks for consistent
+	// indentation compared to the previous line.
+	// Indentation is judged consistent when the indentation whitespace of each line lines
+	// the same or the indentation of one line is a prefix of the other.
+
+	Sci_Position pos = LineStart(line);
+	char ch = (*this)[pos];
+	int indent = 0;
+	bool inPrevPrefix = line > 0;
+	Sci_Position posPrev = inPrevPrefix ? LineStart(line-1) : 0;
+	while ((ch == ' ' || ch == '\t') && (pos < end)) {
+		if (inPrevPrefix) {
+			const char chPrev = (*this)[posPrev++];
+			if (chPrev == ' ' || chPrev == '\t') {
+				if (chPrev != ch)
+					spaceFlags |= wsInconsistent;
+			} else {
+				inPrevPrefix = false;
+			}
+		}
+		if (ch == ' ') {
+			spaceFlags |= wsSpace;
+			indent++;
+		} else {	// Tab
+			spaceFlags |= wsTab;
+			if (spaceFlags & wsSpace)
+				spaceFlags |= wsSpaceTab;
+			indent = (indent / 8 + 1) * 8;
+		}
+		ch = (*this)[++pos];
+	}
+
+	*flags = spaceFlags;
+	indent += SC_FOLDLEVELBASE;
+	// if completely empty line or the start of a comment...
+	if ((LineStart(line) == Length()) || (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
+			(pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)))
+		return indent | SC_FOLDLEVELWHITEFLAG;
+	else
+		return indent;
+}
diff --git a/scite-app/lexilla/lexlib/Accessor.h b/scite-app/lexilla/lexlib/Accessor.h
new file mode 100644
index 0000000..fa58fa0
--- /dev/null
+++ b/scite-app/lexilla/lexlib/Accessor.h
@@ -0,0 +1,31 @@
+// Scintilla source code edit control
+/** @file Accessor.h
+ ** Interfaces between Scintilla and lexers.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef ACCESSOR_H
+#define ACCESSOR_H
+
+namespace Lexilla {
+
+enum { wsSpace=1, wsTab=2, wsSpaceTab=4, wsInconsistent=8 };
+
+class Accessor;
+class WordList;
+class PropSetSimple;
+
+typedef bool (*PFNIsCommentLeader)(Accessor &styler, Sci_Position pos, Sci_Position len);
+
+class Accessor : public LexAccessor {
+public:
+	PropSetSimple *pprops;
+	Accessor(Scintilla::IDocument *pAccess_, PropSetSimple *pprops_);
+	int GetPropertyInt(std::string_view key, int defaultValue=0) const;
+	int IndentAmount(Sci_Position line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/CatalogueModules.h b/scite-app/lexilla/lexlib/CatalogueModules.h
new file mode 100644
index 0000000..f66ef89
--- /dev/null
+++ b/scite-app/lexilla/lexlib/CatalogueModules.h
@@ -0,0 +1,74 @@
+// Scintilla source code edit control
+/** @file CatalogueModules.h
+ ** Lexer infrastructure.
+ ** Contains a list of LexerModules which can be searched to find a module appropriate for a
+ ** particular language.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CATALOGUEMODULES_H
+#define CATALOGUEMODULES_H
+
+namespace Lexilla {
+
+class CatalogueModules {
+	std::vector<LexerModule *> lexerCatalogue;
+public:
+	const LexerModule *Find(int language) const {
+		for (const LexerModule *lm : lexerCatalogue) {
+			if (lm->GetLanguage() == language) {
+				return lm;
+			}
+		}
+		return nullptr;
+	}
+
+	const LexerModule *Find(const char *languageName) const noexcept {
+		if (languageName) {
+			for (const LexerModule *lm : lexerCatalogue) {
+				if (lm->languageName && (0 == strcmp(lm->languageName, languageName))) {
+					return lm;
+				}
+			}
+		}
+		return nullptr;
+	}
+
+	void AddLexerModule(LexerModule *plm) {
+		lexerCatalogue.push_back(plm);
+	}
+
+	void AddLexerModules(std::initializer_list<LexerModule *> modules) {
+		lexerCatalogue.insert(lexerCatalogue.end(), modules);
+	}
+
+	unsigned int Count() const noexcept {
+		return static_cast<unsigned int>(lexerCatalogue.size());
+	}
+
+	const char *Name(unsigned int index) const noexcept {
+		if (index < static_cast<unsigned int>(lexerCatalogue.size())) {
+			return lexerCatalogue[index]->languageName;
+		} else {
+			return "";
+		}
+	}
+
+	LexerFactoryFunction Factory(unsigned int index) const noexcept {
+		// Works for object lexers but not for function lexers
+		return lexerCatalogue[index]->fnFactory;
+	}
+
+	Scintilla::ILexer5 *Create(unsigned int index) const {
+		const LexerModule *plm = lexerCatalogue[index];
+		if (!plm) {
+			return nullptr;
+		}
+		return plm->Create();
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/CharacterCategory.cxx b/scite-app/lexilla/lexlib/CharacterCategory.cxx
new file mode 100644
index 0000000..bdbbb03
--- /dev/null
+++ b/scite-app/lexilla/lexlib/CharacterCategory.cxx
@@ -0,0 +1,4103 @@
+// Scintilla source code edit control
+/** @file CharacterCategory.cxx
+ ** Returns the Unicode general category of a character.
+ ** Table automatically regenerated by scripts/GenerateCharacterCategory.py
+ ** Should only be rarely regenerated for new versions of Unicode.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <vector>
+#include <algorithm>
+#include <iterator>
+
+#include "CharacterCategory.h"
+
+namespace Lexilla {
+
+namespace {
+	// Use an unnamed namespace to protect the declarations from name conflicts
+
+const int catRanges[] = {
+//++Autogenerated -- start of section automatically generated
+// Created with Python 3.9.4,  Unicode 13.0.0
+25,
+1046,
+1073,
+1171,
+1201,
+1293,
+1326,
+1361,
+1394,
+1425,
+1452,
+1489,
+1544,
+1873,
+1938,
+2033,
+2080,
+2925,
+2961,
+2990,
+3028,
+3051,
+3092,
+3105,
+3949,
+3986,
+4014,
+4050,
+4089,
+5142,
+5169,
+5203,
+5333,
+5361,
+5396,
+5429,
+5444,
+5487,
+5522,
+5562,
+5589,
+5620,
+5653,
+5682,
+5706,
+5780,
+5793,
+5841,
+5908,
+5930,
+5956,
+6000,
+6026,
+6129,
+6144,
+6898,
+6912,
+7137,
+7922,
+7937,
+8192,
+8225,
+8256,
+8289,
+8320,
+8353,
+8384,
+8417,
+8448,
+8481,
+8512,
+8545,
+8576,
+8609,
+8640,
+8673,
+8704,
+8737,
+8768,
+8801,
+8832,
+8865,
+8896,
+8929,
+8960,
+8993,
+9024,
+9057,
+9088,
+9121,
+9152,
+9185,
+9216,
+9249,
+9280,
+9313,
+9344,
+9377,
+9408,
+9441,
+9472,
+9505,
+9536,
+9569,
+9600,
+9633,
+9664,
+9697,
+9728,
+9761,
+9792,
+9825,
+9856,
+9889,
+9920,
+9953,
+10016,
+10049,
+10080,
+10113,
+10144,
+10177,
+10208,
+10241,
+10272,
+10305,
+10336,
+10369,
+10400,
+10433,
+10464,
+10497,
+10560,
+10593,
+10624,
+10657,
+10688,
+10721,
+10752,
+10785,
+10816,
+10849,
+10880,
+10913,
+10944,
+10977,
+11008,
+11041,
+11072,
+11105,
+11136,
+11169,
+11200,
+11233,
+11264,
+11297,
+11328,
+11361,
+11392,
+11425,
+11456,
+11489,
+11520,
+11553,
+11584,
+11617,
+11648,
+11681,
+11712,
+11745,
+11776,
+11809,
+11840,
+11873,
+11904,
+11937,
+11968,
+12001,
+12032,
+12097,
+12128,
+12161,
+12192,
+12225,
+12320,
+12385,
+12416,
+12449,
+12480,
+12545,
+12576,
+12673,
+12736,
+12865,
+12896,
+12961,
+12992,
+13089,
+13184,
+13249,
+13280,
+13345,
+13376,
+13409,
+13440,
+13473,
+13504,
+13569,
+13600,
+13633,
+13696,
+13729,
+13760,
+13825,
+13856,
+13953,
+13984,
+14017,
+14048,
+14113,
+14180,
+14208,
+14241,
+14340,
+14464,
+14498,
+14529,
+14560,
+14594,
+14625,
+14656,
+14690,
+14721,
+14752,
+14785,
+14816,
+14849,
+14880,
+14913,
+14944,
+14977,
+15008,
+15041,
+15072,
+15105,
+15136,
+15169,
+15200,
+15233,
+15296,
+15329,
+15360,
+15393,
+15424,
+15457,
+15488,
+15521,
+15552,
+15585,
+15616,
+15649,
+15680,
+15713,
+15744,
+15777,
+15808,
+15841,
+15904,
+15938,
+15969,
+16000,
+16033,
+16064,
+16161,
+16192,
+16225,
+16256,
+16289,
+16320,
+16353,
+16384,
+16417,
+16448,
+16481,
+16512,
+16545,
+16576,
+16609,
+16640,
+16673,
+16704,
+16737,
+16768,
+16801,
+16832,
+16865,
+16896,
+16929,
+16960,
+16993,
+17024,
+17057,
+17088,
+17121,
+17152,
+17185,
+17216,
+17249,
+17280,
+17313,
+17344,
+17377,
+17408,
+17441,
+17472,
+17505,
+17536,
+17569,
+17600,
+17633,
+17664,
+17697,
+17728,
+17761,
+17792,
+17825,
+17856,
+17889,
+17920,
+17953,
+17984,
+18017,
+18240,
+18305,
+18336,
+18401,
+18464,
+18497,
+18528,
+18657,
+18688,
+18721,
+18752,
+18785,
+18816,
+18849,
+18880,
+18913,
+21124,
+21153,
+22019,
+22612,
+22723,
+23124,
+23555,
+23732,
+23939,
+23988,
+24003,
+24052,
+24581,
+28160,
+28193,
+28224,
+28257,
+28291,
+28340,
+28352,
+28385,
+28445,
+28483,
+28513,
+28625,
+28640,
+28701,
+28820,
+28864,
+28913,
+28928,
+29053,
+29056,
+29117,
+29120,
+29185,
+29216,
+29789,
+29792,
+30081,
+31200,
+31233,
+31296,
+31393,
+31488,
+31521,
+31552,
+31585,
+31616,
+31649,
+31680,
+31713,
+31744,
+31777,
+31808,
+31841,
+31872,
+31905,
+31936,
+31969,
+32000,
+32033,
+32064,
+32097,
+32128,
+32161,
+32192,
+32225,
+32384,
+32417,
+32466,
+32480,
+32513,
+32544,
+32609,
+32672,
+34305,
+35840,
+35873,
+35904,
+35937,
+35968,
+36001,
+36032,
+36065,
+36096,
+36129,
+36160,
+36193,
+36224,
+36257,
+36288,
+36321,
+36352,
+36385,
+36416,
+36449,
+36480,
+36513,
+36544,
+36577,
+36608,
+36641,
+36672,
+36705,
+36736,
+36769,
+36800,
+36833,
+36864,
+36897,
+36949,
+36965,
+37127,
+37184,
+37217,
+37248,
+37281,
+37312,
+37345,
+37376,
+37409,
+37440,
+37473,
+37504,
+37537,
+37568,
+37601,
+37632,
+37665,
+37696,
+37729,
+37760,
+37793,
+37824,
+37857,
+37888,
+37921,
+37952,
+37985,
+38016,
+38049,
+38080,
+38113,
+38144,
+38177,
+38208,
+38241,
+38272,
+38305,
+38336,
+38369,
+38400,
+38433,
+38464,
+38497,
+38528,
+38561,
+38592,
+38625,
+38656,
+38689,
+38720,
+38753,
+38784,
+38817,
+38848,
+38881,
+38912,
+38977,
+39008,
+39041,
+39072,
+39105,
+39136,
+39169,
+39200,
+39233,
+39264,
+39297,
+39328,
+39361,
+39424,
+39457,
+39488,
+39521,
+39552,
+39585,
+39616,
+39649,
+39680,
+39713,
+39744,
+39777,
+39808,
+39841,
+39872,
+39905,
+39936,
+39969,
+40000,
+40033,
+40064,
+40097,
+40128,
+40161,
+40192,
+40225,
+40256,
+40289,
+40320,
+40353,
+40384,
+40417,
+40448,
+40481,
+40512,
+40545,
+40576,
+40609,
+40640,
+40673,
+40704,
+40737,
+40768,
+40801,
+40832,
+40865,
+40896,
+40929,
+40960,
+40993,
+41024,
+41057,
+41088,
+41121,
+41152,
+41185,
+41216,
+41249,
+41280,
+41313,
+41344,
+41377,
+41408,
+41441,
+41472,
+41505,
+41536,
+41569,
+41600,
+41633,
+41664,
+41697,
+41728,
+41761,
+41792,
+41825,
+41856,
+41889,
+41920,
+41953,
+41984,
+42017,
+42048,
+42081,
+42112,
+42145,
+42176,
+42209,
+42240,
+42273,
+42304,
+42337,
+42368,
+42401,
+42432,
+42465,
+42525,
+42528,
+43773,
+43811,
+43857,
+44033,
+45361,
+45388,
+45437,
+45493,
+45555,
+45597,
+45605,
+47052,
+47077,
+47121,
+47141,
+47217,
+47237,
+47313,
+47333,
+47389,
+47620,
+48509,
+48612,
+48753,
+48829,
+49178,
+49362,
+49457,
+49523,
+49553,
+49621,
+49669,
+50033,
+50074,
+50109,
+50129,
+50180,
+51203,
+51236,
+51557,
+52232,
+52561,
+52676,
+52741,
+52772,
+55953,
+55972,
+56005,
+56250,
+56277,
+56293,
+56483,
+56549,
+56629,
+56645,
+56772,
+56840,
+57156,
+57269,
+57316,
+57361,
+57821,
+57850,
+57860,
+57893,
+57924,
+58885,
+59773,
+59812,
+62661,
+63012,
+63069,
+63496,
+63812,
+64869,
+65155,
+65237,
+65265,
+65347,
+65405,
+65445,
+65491,
+65540,
+66245,
+66371,
+66405,
+66691,
+66725,
+66819,
+66853,
+67037,
+67089,
+67581,
+67588,
+68389,
+68509,
+68561,
+68605,
+68612,
+68989,
+70660,
+71357,
+71364,
+71965,
+72293,
+72794,
+72805,
+73830,
+73860,
+75589,
+75622,
+75653,
+75684,
+75718,
+75813,
+76070,
+76197,
+76230,
+76292,
+76325,
+76548,
+76869,
+76945,
+77000,
+77329,
+77347,
+77380,
+77861,
+77894,
+77981,
+77988,
+78269,
+78308,
+78397,
+78436,
+79165,
+79172,
+79421,
+79428,
+79485,
+79556,
+79709,
+79749,
+79780,
+79814,
+79909,
+80061,
+80102,
+80189,
+80230,
+80293,
+80324,
+80381,
+80614,
+80669,
+80772,
+80861,
+80868,
+80965,
+81053,
+81096,
+81412,
+81491,
+81546,
+81749,
+81779,
+81796,
+81841,
+81861,
+81917,
+81957,
+82022,
+82077,
+82084,
+82301,
+82404,
+82493,
+82532,
+83261,
+83268,
+83517,
+83524,
+83613,
+83620,
+83709,
+83716,
+83805,
+83845,
+83901,
+83910,
+84005,
+84093,
+84197,
+84285,
+84325,
+84445,
+84517,
+84573,
+84772,
+84925,
+84932,
+84989,
+85192,
+85509,
+85572,
+85669,
+85713,
+85757,
+86053,
+86118,
+86173,
+86180,
+86493,
+86500,
+86621,
+86628,
+87357,
+87364,
+87613,
+87620,
+87709,
+87716,
+87901,
+87941,
+87972,
+88006,
+88101,
+88285,
+88293,
+88358,
+88413,
+88422,
+88485,
+88541,
+88580,
+88637,
+89092,
+89157,
+89245,
+89288,
+89617,
+89651,
+89693,
+89892,
+89925,
+90141,
+90149,
+90182,
+90269,
+90276,
+90557,
+90596,
+90685,
+90724,
+91453,
+91460,
+91709,
+91716,
+91805,
+91812,
+91997,
+92037,
+92068,
+92102,
+92133,
+92166,
+92197,
+92349,
+92390,
+92477,
+92518,
+92581,
+92637,
+92837,
+92902,
+92957,
+93060,
+93149,
+93156,
+93253,
+93341,
+93384,
+93717,
+93732,
+93770,
+93981,
+94277,
+94308,
+94365,
+94372,
+94589,
+94660,
+94781,
+94788,
+94941,
+95012,
+95101,
+95108,
+95165,
+95172,
+95261,
+95332,
+95421,
+95492,
+95613,
+95684,
+96093,
+96198,
+96261,
+96294,
+96381,
+96454,
+96573,
+96582,
+96677,
+96733,
+96772,
+96829,
+96998,
+97053,
+97480,
+97802,
+97909,
+98099,
+98133,
+98173,
+98309,
+98342,
+98437,
+98468,
+98749,
+98756,
+98877,
+98884,
+99645,
+99652,
+100189,
+100260,
+100293,
+100390,
+100541,
+100549,
+100669,
+100677,
+100829,
+101029,
+101117,
+101124,
+101245,
+101380,
+101445,
+101533,
+101576,
+101917,
+102129,
+102154,
+102389,
+102404,
+102437,
+102470,
+102545,
+102564,
+102845,
+102852,
+102973,
+102980,
+103741,
+103748,
+104093,
+104100,
+104285,
+104325,
+104356,
+104390,
+104421,
+104454,
+104637,
+104645,
+104678,
+104765,
+104774,
+104837,
+104925,
+105126,
+105213,
+105412,
+105469,
+105476,
+105541,
+105629,
+105672,
+106013,
+106020,
+106109,
+106501,
+106566,
+106628,
+106941,
+106948,
+107069,
+107076,
+108389,
+108452,
+108486,
+108581,
+108733,
+108742,
+108861,
+108870,
+108965,
+108996,
+109045,
+109085,
+109188,
+109286,
+109322,
+109540,
+109637,
+109725,
+109768,
+110090,
+110389,
+110404,
+110621,
+110629,
+110662,
+110749,
+110756,
+111357,
+111428,
+112221,
+112228,
+112541,
+112548,
+112605,
+112644,
+112893,
+112965,
+113021,
+113126,
+113221,
+113341,
+113349,
+113405,
+113414,
+113693,
+113864,
+114205,
+114246,
+114321,
+114365,
+114724,
+116261,
+116292,
+116357,
+116605,
+116723,
+116740,
+116931,
+116965,
+117233,
+117256,
+117585,
+117661,
+118820,
+118909,
+118916,
+118973,
+118980,
+119165,
+119172,
+119965,
+119972,
+120029,
+120036,
+120357,
+120388,
+120453,
+120740,
+120797,
+120836,
+121021,
+121027,
+121085,
+121093,
+121309,
+121352,
+121693,
+121732,
+121885,
+122884,
+122933,
+123025,
+123509,
+123537,
+123573,
+123653,
+123733,
+123912,
+124234,
+124565,
+124581,
+124629,
+124645,
+124693,
+124709,
+124749,
+124782,
+124813,
+124846,
+124870,
+124932,
+125213,
+125220,
+126397,
+126501,
+126950,
+126981,
+127153,
+127173,
+127236,
+127397,
+127773,
+127781,
+128957,
+128981,
+129221,
+129269,
+129469,
+129493,
+129553,
+129717,
+129841,
+129917,
+131076,
+132454,
+132517,
+132646,
+132677,
+132870,
+132901,
+132966,
+133029,
+133092,
+133128,
+133457,
+133636,
+133830,
+133893,
+133956,
+134085,
+134180,
+134214,
+134308,
+134374,
+134596,
+134693,
+134820,
+135237,
+135270,
+135333,
+135398,
+135589,
+135620,
+135654,
+135688,
+136006,
+136101,
+136149,
+136192,
+137437,
+137440,
+137501,
+137632,
+137693,
+137729,
+139121,
+139139,
+139169,
+139268,
+149821,
+149828,
+149981,
+150020,
+150269,
+150276,
+150333,
+150340,
+150493,
+150532,
+151869,
+151876,
+152029,
+152068,
+153149,
+153156,
+153309,
+153348,
+153597,
+153604,
+153661,
+153668,
+153821,
+153860,
+154365,
+154372,
+156221,
+156228,
+156381,
+156420,
+158589,
+158629,
+158737,
+159018,
+159677,
+159748,
+160277,
+160605,
+160768,
+163549,
+163585,
+163805,
+163852,
+163876,
+183733,
+183761,
+183780,
+184342,
+184356,
+185197,
+185230,
+185277,
+185348,
+187761,
+187849,
+187940,
+188221,
+188420,
+188861,
+188868,
+188997,
+189117,
+189444,
+190021,
+190129,
+190205,
+190468,
+191045,
+191133,
+191492,
+191933,
+191940,
+192061,
+192069,
+192157,
+192516,
+194181,
+194246,
+194277,
+194502,
+194757,
+194790,
+194853,
+195217,
+195299,
+195345,
+195443,
+195460,
+195493,
+195549,
+195592,
+195933,
+196106,
+196445,
+196625,
+196812,
+196849,
+196965,
+197082,
+197117,
+197128,
+197469,
+197636,
+198755,
+198788,
+200509,
+200708,
+200869,
+200932,
+202021,
+202052,
+202109,
+202244,
+204509,
+204804,
+205821,
+205829,
+205926,
+206053,
+206118,
+206237,
+206342,
+206405,
+206438,
+206629,
+206749,
+206869,
+206909,
+206993,
+207048,
+207364,
+208349,
+208388,
+208573,
+208900,
+210333,
+210436,
+211293,
+211464,
+211786,
+211837,
+211925,
+212996,
+213733,
+213798,
+213861,
+213917,
+213969,
+214020,
+215718,
+215749,
+215782,
+215813,
+216061,
+216069,
+216102,
+216133,
+216166,
+216229,
+216486,
+216677,
+217021,
+217061,
+217096,
+217437,
+217608,
+217949,
+218129,
+218339,
+218385,
+218589,
+218629,
+219079,
+219109,
+219197,
+221189,
+221318,
+221348,
+222853,
+222886,
+222917,
+223078,
+223109,
+223142,
+223301,
+223334,
+223396,
+223645,
+223752,
+224081,
+224309,
+224613,
+224917,
+225213,
+225285,
+225350,
+225380,
+226342,
+226373,
+226502,
+226565,
+226630,
+226661,
+226756,
+226824,
+227140,
+228549,
+228582,
+228613,
+228678,
+228773,
+228806,
+228837,
+228934,
+229021,
+229265,
+229380,
+230534,
+230789,
+231046,
+231109,
+231197,
+231281,
+231432,
+231773,
+231844,
+231944,
+232260,
+233219,
+233425,
+233473,
+233789,
+233984,
+235389,
+235424,
+235537,
+235805,
+236037,
+236145,
+236165,
+236582,
+236613,
+236836,
+236965,
+236996,
+237189,
+237220,
+237286,
+237317,
+237380,
+237437,
+237569,
+238979,
+240993,
+241411,
+241441,
+242531,
+243717,
+245597,
+245605,
+245760,
+245793,
+245824,
+245857,
+245888,
+245921,
+245952,
+245985,
+246016,
+246049,
+246080,
+246113,
+246144,
+246177,
+246208,
+246241,
+246272,
+246305,
+246336,
+246369,
+246400,
+246433,
+246464,
+246497,
+246528,
+246561,
+246592,
+246625,
+246656,
+246689,
+246720,
+246753,
+246784,
+246817,
+246848,
+246881,
+246912,
+246945,
+246976,
+247009,
+247040,
+247073,
+247104,
+247137,
+247168,
+247201,
+247232,
+247265,
+247296,
+247329,
+247360,
+247393,
+247424,
+247457,
+247488,
+247521,
+247552,
+247585,
+247616,
+247649,
+247680,
+247713,
+247744,
+247777,
+247808,
+247841,
+247872,
+247905,
+247936,
+247969,
+248000,
+248033,
+248064,
+248097,
+248128,
+248161,
+248192,
+248225,
+248256,
+248289,
+248320,
+248353,
+248384,
+248417,
+248448,
+248481,
+248512,
+248545,
+248576,
+248609,
+248640,
+248673,
+248704,
+248737,
+248768,
+248801,
+248832,
+248865,
+248896,
+248929,
+248960,
+248993,
+249024,
+249057,
+249088,
+249121,
+249152,
+249185,
+249216,
+249249,
+249280,
+249313,
+249344,
+249377,
+249408,
+249441,
+249472,
+249505,
+249536,
+249569,
+249600,
+249633,
+249664,
+249697,
+249728,
+249761,
+249792,
+249825,
+249856,
+249889,
+249920,
+249953,
+249984,
+250017,
+250048,
+250081,
+250112,
+250145,
+250176,
+250209,
+250240,
+250273,
+250304,
+250337,
+250368,
+250401,
+250432,
+250465,
+250496,
+250529,
+250816,
+250849,
+250880,
+250913,
+250944,
+250977,
+251008,
+251041,
+251072,
+251105,
+251136,
+251169,
+251200,
+251233,
+251264,
+251297,
+251328,
+251361,
+251392,
+251425,
+251456,
+251489,
+251520,
+251553,
+251584,
+251617,
+251648,
+251681,
+251712,
+251745,
+251776,
+251809,
+251840,
+251873,
+251904,
+251937,
+251968,
+252001,
+252032,
+252065,
+252096,
+252129,
+252160,
+252193,
+252224,
+252257,
+252288,
+252321,
+252352,
+252385,
+252416,
+252449,
+252480,
+252513,
+252544,
+252577,
+252608,
+252641,
+252672,
+252705,
+252736,
+252769,
+252800,
+252833,
+252864,
+252897,
+252928,
+252961,
+252992,
+253025,
+253056,
+253089,
+253120,
+253153,
+253184,
+253217,
+253248,
+253281,
+253312,
+253345,
+253376,
+253409,
+253440,
+253473,
+253504,
+253537,
+253568,
+253601,
+253632,
+253665,
+253696,
+253729,
+253760,
+253793,
+253824,
+253857,
+253888,
+253921,
+254208,
+254465,
+254685,
+254720,
+254941,
+254977,
+255232,
+255489,
+255744,
+256001,
+256221,
+256256,
+256477,
+256513,
+256797,
+256800,
+256861,
+256864,
+256925,
+256928,
+256989,
+256992,
+257025,
+257280,
+257537,
+258013,
+258049,
+258306,
+258561,
+258818,
+259073,
+259330,
+259585,
+259773,
+259777,
+259840,
+259970,
+260020,
+260033,
+260084,
+260161,
+260285,
+260289,
+260352,
+260482,
+260532,
+260609,
+260765,
+260801,
+260864,
+261021,
+261044,
+261121,
+261376,
+261556,
+261661,
+261697,
+261821,
+261825,
+261888,
+262018,
+262068,
+262141,
+262166,
+262522,
+262668,
+262865,
+262927,
+262960,
+262989,
+263023,
+263088,
+263117,
+263151,
+263185,
+263447,
+263480,
+263514,
+263670,
+263697,
+263983,
+264016,
+264049,
+264171,
+264241,
+264338,
+264365,
+264398,
+264433,
+264786,
+264817,
+264843,
+264881,
+265206,
+265242,
+265405,
+265434,
+265738,
+265763,
+265821,
+265866,
+266066,
+266157,
+266190,
+266211,
+266250,
+266578,
+266669,
+266702,
+266749,
+266755,
+267197,
+267283,
+268317,
+268805,
+269223,
+269349,
+269383,
+269477,
+269885,
+270357,
+270400,
+270453,
+270560,
+270613,
+270657,
+270688,
+270785,
+270848,
+270945,
+270997,
+271008,
+271061,
+271122,
+271136,
+271317,
+271488,
+271541,
+271552,
+271605,
+271616,
+271669,
+271680,
+271829,
+271841,
+271872,
+272001,
+272036,
+272161,
+272213,
+272257,
+272320,
+272402,
+272544,
+272577,
+272725,
+272754,
+272789,
+272833,
+272885,
+272906,
+273417,
+274528,
+274561,
+274601,
+274730,
+274773,
+274845,
+274962,
+275125,
+275282,
+275349,
+275474,
+275509,
+275570,
+275605,
+275666,
+275701,
+275922,
+275957,
+276946,
+277013,
+277074,
+277109,
+277138,
+277173,
+278162,
+286741,
+286989,
+287022,
+287053,
+287086,
+287125,
+287762,
+287829,
+288045,
+288078,
+288117,
+290706,
+290741,
+291698,
+292501,
+293778,
+293973,
+296189,
+296981,
+297341,
+297994,
+299925,
+302410,
+303125,
+308978,
+309013,
+309298,
+309333,
+311058,
+311317,
+314866,
+314901,
+322829,
+322862,
+322893,
+322926,
+322957,
+322990,
+323021,
+323054,
+323085,
+323118,
+323149,
+323182,
+323213,
+323246,
+323274,
+324245,
+325650,
+325805,
+325838,
+325874,
+326861,
+326894,
+326925,
+326958,
+326989,
+327022,
+327053,
+327086,
+327117,
+327150,
+327186,
+327701,
+335890,
+340077,
+340110,
+340141,
+340174,
+340205,
+340238,
+340269,
+340302,
+340333,
+340366,
+340397,
+340430,
+340461,
+340494,
+340525,
+340558,
+340589,
+340622,
+340653,
+340686,
+340717,
+340750,
+340786,
+342797,
+342830,
+342861,
+342894,
+342930,
+343949,
+343982,
+344018,
+352277,
+353810,
+354485,
+354546,
+354741,
+355997,
+356053,
+357085,
+357109,
+360448,
+361981,
+361985,
+363517,
+363520,
+363553,
+363584,
+363681,
+363744,
+363777,
+363808,
+363841,
+363872,
+363905,
+363936,
+364065,
+364096,
+364129,
+364192,
+364225,
+364419,
+364480,
+364577,
+364608,
+364641,
+364672,
+364705,
+364736,
+364769,
+364800,
+364833,
+364864,
+364897,
+364928,
+364961,
+364992,
+365025,
+365056,
+365089,
+365120,
+365153,
+365184,
+365217,
+365248,
+365281,
+365312,
+365345,
+365376,
+365409,
+365440,
+365473,
+365504,
+365537,
+365568,
+365601,
+365632,
+365665,
+365696,
+365729,
+365760,
+365793,
+365824,
+365857,
+365888,
+365921,
+365952,
+365985,
+366016,
+366049,
+366080,
+366113,
+366144,
+366177,
+366208,
+366241,
+366272,
+366305,
+366336,
+366369,
+366400,
+366433,
+366464,
+366497,
+366528,
+366561,
+366592,
+366625,
+366656,
+366689,
+366720,
+366753,
+366784,
+366817,
+366848,
+366881,
+366912,
+366945,
+366976,
+367009,
+367040,
+367073,
+367104,
+367137,
+367168,
+367201,
+367232,
+367265,
+367296,
+367329,
+367360,
+367393,
+367424,
+367457,
+367488,
+367521,
+367552,
+367585,
+367616,
+367649,
+367680,
+367713,
+367797,
+367968,
+368001,
+368032,
+368065,
+368101,
+368192,
+368225,
+368285,
+368433,
+368554,
+368593,
+368641,
+369885,
+369889,
+369949,
+370081,
+370141,
+370180,
+371997,
+372195,
+372241,
+372285,
+372709,
+372740,
+373501,
+373764,
+374013,
+374020,
+374269,
+374276,
+374525,
+374532,
+374781,
+374788,
+375037,
+375044,
+375293,
+375300,
+375549,
+375556,
+375805,
+375813,
+376849,
+376911,
+376944,
+376975,
+377008,
+377041,
+377135,
+377168,
+377201,
+377231,
+377264,
+377297,
+377580,
+377617,
+377676,
+377713,
+377743,
+377776,
+377809,
+377871,
+377904,
+377933,
+377966,
+377997,
+378030,
+378061,
+378094,
+378125,
+378158,
+378193,
+378339,
+378385,
+378700,
+378769,
+378892,
+378929,
+378957,
+378993,
+379413,
+379473,
+379517,
+380949,
+381789,
+381813,
+384669,
+385045,
+391901,
+392725,
+393117,
+393238,
+393265,
+393365,
+393379,
+393412,
+393449,
+393485,
+393518,
+393549,
+393582,
+393613,
+393646,
+393677,
+393710,
+393741,
+393774,
+393813,
+393869,
+393902,
+393933,
+393966,
+393997,
+394030,
+394061,
+394094,
+394124,
+394157,
+394190,
+394261,
+394281,
+394565,
+394694,
+394764,
+394787,
+394965,
+395017,
+395107,
+395140,
+395185,
+395221,
+395293,
+395300,
+398077,
+398117,
+398196,
+398243,
+398308,
+398348,
+398372,
+401265,
+401283,
+401380,
+401437,
+401572,
+402973,
+402980,
+406013,
+406037,
+406090,
+406229,
+406532,
+407573,
+408733,
+409092,
+409621,
+410621,
+410634,
+410965,
+411914,
+412181,
+412202,
+412693,
+413706,
+414037,
+415274,
+415765,
+425988,
+636949,
+638980,
+1310653,
+1310724,
+1311395,
+1311428,
+1348029,
+1348117,
+1349885,
+1350148,
+1351427,
+1351633,
+1351684,
+1360259,
+1360305,
+1360388,
+1360904,
+1361220,
+1361309,
+1361920,
+1361953,
+1361984,
+1362017,
+1362048,
+1362081,
+1362112,
+1362145,
+1362176,
+1362209,
+1362240,
+1362273,
+1362304,
+1362337,
+1362368,
+1362401,
+1362432,
+1362465,
+1362496,
+1362529,
+1362560,
+1362593,
+1362624,
+1362657,
+1362688,
+1362721,
+1362752,
+1362785,
+1362816,
+1362849,
+1362880,
+1362913,
+1362944,
+1362977,
+1363008,
+1363041,
+1363072,
+1363105,
+1363136,
+1363169,
+1363200,
+1363233,
+1363264,
+1363297,
+1363328,
+1363361,
+1363396,
+1363429,
+1363463,
+1363569,
+1363589,
+1363921,
+1363939,
+1363968,
+1364001,
+1364032,
+1364065,
+1364096,
+1364129,
+1364160,
+1364193,
+1364224,
+1364257,
+1364288,
+1364321,
+1364352,
+1364385,
+1364416,
+1364449,
+1364480,
+1364513,
+1364544,
+1364577,
+1364608,
+1364641,
+1364672,
+1364705,
+1364736,
+1364769,
+1364800,
+1364833,
+1364867,
+1364933,
+1364996,
+1367241,
+1367557,
+1367633,
+1367837,
+1368084,
+1368803,
+1369108,
+1369152,
+1369185,
+1369216,
+1369249,
+1369280,
+1369313,
+1369344,
+1369377,
+1369408,
+1369441,
+1369472,
+1369505,
+1369536,
+1369569,
+1369664,
+1369697,
+1369728,
+1369761,
+1369792,
+1369825,
+1369856,
+1369889,
+1369920,
+1369953,
+1369984,
+1370017,
+1370048,
+1370081,
+1370112,
+1370145,
+1370176,
+1370209,
+1370240,
+1370273,
+1370304,
+1370337,
+1370368,
+1370401,
+1370432,
+1370465,
+1370496,
+1370529,
+1370560,
+1370593,
+1370624,
+1370657,
+1370688,
+1370721,
+1370752,
+1370785,
+1370816,
+1370849,
+1370880,
+1370913,
+1370944,
+1370977,
+1371008,
+1371041,
+1371072,
+1371105,
+1371136,
+1371169,
+1371200,
+1371233,
+1371264,
+1371297,
+1371328,
+1371361,
+1371392,
+1371425,
+1371456,
+1371489,
+1371520,
+1371553,
+1371584,
+1371617,
+1371651,
+1371681,
+1371936,
+1371969,
+1372000,
+1372033,
+1372064,
+1372129,
+1372160,
+1372193,
+1372224,
+1372257,
+1372288,
+1372321,
+1372352,
+1372385,
+1372419,
+1372468,
+1372512,
+1372545,
+1372576,
+1372609,
+1372644,
+1372672,
+1372705,
+1372736,
+1372769,
+1372864,
+1372897,
+1372928,
+1372961,
+1372992,
+1373025,
+1373056,
+1373089,
+1373120,
+1373153,
+1373184,
+1373217,
+1373248,
+1373281,
+1373312,
+1373345,
+1373376,
+1373409,
+1373440,
+1373473,
+1373504,
+1373665,
+1373696,
+1373857,
+1373888,
+1373921,
+1373952,
+1373985,
+1374016,
+1374049,
+1374080,
+1374113,
+1374144,
+1374177,
+1374237,
+1374272,
+1374305,
+1374336,
+1374465,
+1374496,
+1374529,
+1374589,
+1375904,
+1375937,
+1375972,
+1376003,
+1376065,
+1376100,
+1376325,
+1376356,
+1376453,
+1376484,
+1376613,
+1376644,
+1377382,
+1377445,
+1377510,
+1377557,
+1377669,
+1377725,
+1377802,
+1378005,
+1378067,
+1378101,
+1378141,
+1378308,
+1379985,
+1380125,
+1380358,
+1380420,
+1382022,
+1382533,
+1382621,
+1382865,
+1382920,
+1383261,
+1383429,
+1384004,
+1384209,
+1384292,
+1384337,
+1384356,
+1384421,
+1384456,
+1384772,
+1385669,
+1385937,
+1385988,
+1386725,
+1387078,
+1387165,
+1387505,
+1387524,
+1388477,
+1388549,
+1388646,
+1388676,
+1390181,
+1390214,
+1390277,
+1390406,
+1390469,
+1390534,
+1390641,
+1391069,
+1391075,
+1391112,
+1391453,
+1391569,
+1391620,
+1391781,
+1391811,
+1391844,
+1392136,
+1392452,
+1392637,
+1392644,
+1393957,
+1394150,
+1394213,
+1394278,
+1394341,
+1394429,
+1394692,
+1394789,
+1394820,
+1395077,
+1395110,
+1395165,
+1395208,
+1395549,
+1395601,
+1395716,
+1396227,
+1396260,
+1396469,
+1396548,
+1396582,
+1396613,
+1396646,
+1396676,
+1398277,
+1398308,
+1398341,
+1398436,
+1398501,
+1398564,
+1398725,
+1398788,
+1398821,
+1398852,
+1398909,
+1399652,
+1399715,
+1399761,
+1399812,
+1400166,
+1400197,
+1400262,
+1400337,
+1400388,
+1400419,
+1400486,
+1400517,
+1400573,
+1400868,
+1401085,
+1401124,
+1401341,
+1401380,
+1401597,
+1401860,
+1402109,
+1402116,
+1402365,
+1402369,
+1403764,
+1403779,
+1403905,
+1404195,
+1404244,
+1404317,
+1404417,
+1406980,
+1408102,
+1408165,
+1408198,
+1408261,
+1408294,
+1408369,
+1408390,
+1408421,
+1408477,
+1408520,
+1408861,
+1409028,
+1766557,
+1766916,
+1767677,
+1767780,
+1769373,
+1769499,
+1835036,
+2039812,
+2051549,
+2051588,
+2055005,
+2056193,
+2056445,
+2056801,
+2056989,
+2057124,
+2057157,
+2057188,
+2057522,
+2057540,
+2057981,
+2057988,
+2058173,
+2058180,
+2058237,
+2058244,
+2058333,
+2058340,
+2058429,
+2058436,
+2061908,
+2062429,
+2062948,
+2074574,
+2074605,
+2074653,
+2075140,
+2077213,
+2077252,
+2079005,
+2080260,
+2080659,
+2080693,
+2080733,
+2080773,
+2081297,
+2081517,
+2081550,
+2081585,
+2081629,
+2081797,
+2082321,
+2082348,
+2082411,
+2082477,
+2082510,
+2082541,
+2082574,
+2082605,
+2082638,
+2082669,
+2082702,
+2082733,
+2082766,
+2082797,
+2082830,
+2082861,
+2082894,
+2082925,
+2082958,
+2082993,
+2083053,
+2083086,
+2083121,
+2083243,
+2083345,
+2083453,
+2083473,
+2083596,
+2083629,
+2083662,
+2083693,
+2083726,
+2083757,
+2083790,
+2083825,
+2083922,
+2083948,
+2083986,
+2084093,
+2084113,
+2084147,
+2084177,
+2084253,
+2084356,
+2084541,
+2084548,
+2088893,
+2088954,
+2088989,
+2089009,
+2089107,
+2089137,
+2089229,
+2089262,
+2089297,
+2089330,
+2089361,
+2089388,
+2089425,
+2089480,
+2089809,
+2089874,
+2089969,
+2090016,
+2090861,
+2090897,
+2090926,
+2090964,
+2090987,
+2091028,
+2091041,
+2091885,
+2091922,
+2091950,
+2091986,
+2092013,
+2092046,
+2092081,
+2092109,
+2092142,
+2092177,
+2092228,
+2092547,
+2092580,
+2094019,
+2094084,
+2095101,
+2095172,
+2095389,
+2095428,
+2095645,
+2095684,
+2095901,
+2095940,
+2096061,
+2096147,
+2096210,
+2096244,
+2096277,
+2096307,
+2096381,
+2096405,
+2096434,
+2096565,
+2096637,
+2096954,
+2097045,
+2097117,
+2097156,
+2097565,
+2097572,
+2098429,
+2098436,
+2099069,
+2099076,
+2099165,
+2099172,
+2099677,
+2099716,
+2100189,
+2101252,
+2105213,
+2105361,
+2105469,
+2105578,
+2107037,
+2107125,
+2107401,
+2109098,
+2109237,
+2109770,
+2109845,
+2109949,
+2109973,
+2110397,
+2110485,
+2110525,
+2112021,
+2113445,
+2113501,
+2117636,
+2118589,
+2118660,
+2120253,
+2120709,
+2120746,
+2121629,
+2121732,
+2122762,
+2122909,
+2123172,
+2123817,
+2123844,
+2124105,
+2124157,
+2124292,
+2125509,
+2125693,
+2125828,
+2126813,
+2126833,
+2126852,
+2128029,
+2128132,
+2128401,
+2128425,
+2128605,
+2129920,
+2131201,
+2132484,
+2135005,
+2135048,
+2135389,
+2135552,
+2136733,
+2136833,
+2138013,
+2138116,
+2139421,
+2139652,
+2141341,
+2141681,
+2141725,
+2146308,
+2156285,
+2156548,
+2157277,
+2157572,
+2157853,
+2162692,
+2162909,
+2162948,
+2163005,
+2163012,
+2164445,
+2164452,
+2164541,
+2164612,
+2164669,
+2164708,
+2165469,
+2165489,
+2165514,
+2165764,
+2166517,
+2166570,
+2166788,
+2167805,
+2168042,
+2168349,
+2169860,
+2170493,
+2170500,
+2170589,
+2170730,
+2170884,
+2171594,
+2171805,
+2171889,
+2171908,
+2172765,
+2172913,
+2172957,
+2174980,
+2176797,
+2176906,
+2176964,
+2177034,
+2177565,
+2177610,
+2179076,
+2179109,
+2179229,
+2179237,
+2179325,
+2179461,
+2179588,
+2179741,
+2179748,
+2179869,
+2179876,
+2180829,
+2180869,
+2180989,
+2181093,
+2181130,
+2181437,
+2181649,
+2181949,
+2182148,
+2183082,
+2183153,
+2183172,
+2184106,
+2184221,
+2185220,
+2185493,
+2185508,
+2186405,
+2186493,
+2186602,
+2186769,
+2187005,
+2187268,
+2189021,
+2189105,
+2189316,
+2190045,
+2190090,
+2190340,
+2190973,
+2191114,
+2191364,
+2191965,
+2192177,
+2192317,
+2192682,
+2192925,
+2195460,
+2197821,
+2199552,
+2201213,
+2201601,
+2203261,
+2203466,
+2203652,
+2204805,
+2204957,
+2205192,
+2205533,
+2214922,
+2215933,
+2215940,
+2217309,
+2217317,
+2217388,
+2217437,
+2217476,
+2217565,
+2220036,
+2220970,
+2221284,
+2221341,
+2221572,
+2222277,
+2222634,
+2222769,
+2222941,
+2225668,
+2226346,
+2226589,
+2227204,
+2227965,
+2228230,
+2228261,
+2228294,
+2228324,
+2230021,
+2230513,
+2230749,
+2230858,
+2231496,
+2231837,
+2232293,
+2232390,
+2232420,
+2233862,
+2233957,
+2234086,
+2234149,
+2234225,
+2234298,
+2234321,
+2234461,
+2234810,
+2234845,
+2234884,
+2235709,
+2235912,
+2236253,
+2236421,
+2236516,
+2237669,
+2237830,
+2237861,
+2238141,
+2238152,
+2238481,
+2238596,
+2238630,
+2238692,
+2238749,
+2238980,
+2240101,
+2240145,
+2240196,
+2240253,
+2240517,
+2240582,
+2240612,
+2242150,
+2242245,
+2242534,
+2242596,
+2242737,
+2242853,
+2242993,
+2243014,
+2243045,
+2243080,
+2243396,
+2243441,
+2243460,
+2243505,
+2243613,
+2243626,
+2244285,
+2244612,
+2245213,
+2245220,
+2246022,
+2246117,
+2246214,
+2246277,
+2246310,
+2246341,
+2246417,
+2246597,
+2246653,
+2248708,
+2248957,
+2248964,
+2249021,
+2249028,
+2249181,
+2249188,
+2249693,
+2249700,
+2250033,
+2250077,
+2250244,
+2251749,
+2251782,
+2251877,
+2252157,
+2252296,
+2252637,
+2252805,
+2252870,
+2252957,
+2252964,
+2253245,
+2253284,
+2253373,
+2253412,
+2254141,
+2254148,
+2254397,
+2254404,
+2254493,
+2254500,
+2254685,
+2254693,
+2254756,
+2254790,
+2254853,
+2254886,
+2255037,
+2255078,
+2255165,
+2255206,
+2255325,
+2255364,
+2255421,
+2255590,
+2255645,
+2255780,
+2255942,
+2256029,
+2256069,
+2256317,
+2256389,
+2256573,
+2260996,
+2262694,
+2262789,
+2263046,
+2263109,
+2263206,
+2263237,
+2263268,
+2263409,
+2263560,
+2263889,
+2263965,
+2263985,
+2264005,
+2264036,
+2264157,
+2265092,
+2266630,
+2266725,
+2266918,
+2266949,
+2266982,
+2267109,
+2267174,
+2267205,
+2267268,
+2267345,
+2267364,
+2267421,
+2267656,
+2267997,
+2273284,
+2274790,
+2274885,
+2275037,
+2275078,
+2275205,
+2275270,
+2275301,
+2275377,
+2276100,
+2276229,
+2276317,
+2277380,
+2278918,
+2279013,
+2279270,
+2279333,
+2279366,
+2279397,
+2279473,
+2279556,
+2279613,
+2279944,
+2280285,
+2280465,
+2280893,
+2281476,
+2282853,
+2282886,
+2282917,
+2282950,
+2283013,
+2283206,
+2283237,
+2283268,
+2283325,
+2283528,
+2283869,
+2285572,
+2286461,
+2286501,
+2286598,
+2286661,
+2286790,
+2286821,
+2287005,
+2287112,
+2287434,
+2287505,
+2287605,
+2287645,
+2293764,
+2295174,
+2295269,
+2295558,
+2295589,
+2295665,
+2295709,
+2298880,
+2299905,
+2300936,
+2301258,
+2301565,
+2301924,
+2302205,
+2302244,
+2302301,
+2302340,
+2302621,
+2302628,
+2302717,
+2302724,
+2303494,
+2303709,
+2303718,
+2303805,
+2303845,
+2303910,
+2303941,
+2303972,
+2304006,
+2304036,
+2304070,
+2304101,
+2304145,
+2304253,
+2304520,
+2304861,
+2307076,
+2307357,
+2307396,
+2308646,
+2308741,
+2308893,
+2308933,
+2308998,
+2309125,
+2309156,
+2309201,
+2309220,
+2309254,
+2309309,
+2310148,
+2310181,
+2310500,
+2311781,
+2311974,
+2312004,
+2312037,
+2312177,
+2312421,
+2312477,
+2312708,
+2312741,
+2312934,
+2312997,
+2313092,
+2314565,
+2314982,
+2315013,
+2315089,
+2315172,
+2315217,
+2315389,
+2316292,
+2318141,
+2326532,
+2326845,
+2326852,
+2328038,
+2328069,
+2328317,
+2328325,
+2328518,
+2328549,
+2328580,
+2328625,
+2328797,
+2329096,
+2329418,
+2330045,
+2330129,
+2330180,
+2331165,
+2331205,
+2331933,
+2331942,
+2331973,
+2332198,
+2332229,
+2332294,
+2332325,
+2332413,
+2334724,
+2334973,
+2334980,
+2335069,
+2335076,
+2336293,
+2336509,
+2336581,
+2336637,
+2336645,
+2336733,
+2336741,
+2336964,
+2336997,
+2337053,
+2337288,
+2337629,
+2337796,
+2338013,
+2338020,
+2338109,
+2338116,
+2339142,
+2339325,
+2339333,
+2339421,
+2339430,
+2339493,
+2339526,
+2339557,
+2339588,
+2339645,
+2339848,
+2340189,
+2350084,
+2350693,
+2350758,
+2350833,
+2350909,
+2356740,
+2356797,
+2357258,
+2357941,
+2358195,
+2358325,
+2358877,
+2359281,
+2359300,
+2388829,
+2392073,
+2395645,
+2395665,
+2395837,
+2396164,
+2402461,
+2490372,
+2524669,
+2524698,
+2524989,
+2654212,
+2672893,
+2949124,
+2967357,
+2967556,
+2968573,
+2968584,
+2968925,
+2969041,
+2969117,
+2972164,
+2973149,
+2973189,
+2973361,
+2973405,
+2973700,
+2975237,
+2975473,
+2975637,
+2975747,
+2975889,
+2975925,
+2975965,
+2976264,
+2976605,
+2976618,
+2976861,
+2976868,
+2977565,
+2977700,
+2978333,
+3000320,
+3001345,
+3002378,
+3003121,
+3003261,
+3006468,
+3008893,
+3008997,
+3009028,
+3009062,
+3010845,
+3011045,
+3011171,
+3011613,
+3013635,
+3013713,
+3013731,
+3013765,
+3013821,
+3014150,
+3014237,
+3014660,
+3211037,
+3211268,
+3250909,
+3252228,
+3252541,
+3538948,
+3548157,
+3549700,
+3549821,
+3550340,
+3550493,
+3550724,
+3563421,
+3637252,
+3640701,
+3640836,
+3641277,
+3641348,
+3641661,
+3641860,
+3642205,
+3642261,
+3642277,
+3642353,
+3642394,
+3642525,
+3801109,
+3808989,
+3809301,
+3810557,
+3810613,
+3812518,
+3812581,
+3812693,
+3812774,
+3812986,
+3813221,
+3813493,
+3813541,
+3813781,
+3814725,
+3814869,
+3816765,
+3817493,
+3819589,
+3819701,
+3819741,
+3824650,
+3825309,
+3825685,
+3828477,
+3828746,
+3829565,
+3833856,
+3834689,
+3835520,
+3836353,
+3836605,
+3836609,
+3837184,
+3838017,
+3838848,
+3838909,
+3838912,
+3839005,
+3839040,
+3839101,
+3839136,
+3839229,
+3839264,
+3839421,
+3839424,
+3839681,
+3839837,
+3839841,
+3839901,
+3839905,
+3840157,
+3840161,
+3840512,
+3841345,
+3842176,
+3842269,
+3842272,
+3842429,
+3842464,
+3842749,
+3842752,
+3843005,
+3843009,
+3843840,
+3843933,
+3843936,
+3844093,
+3844096,
+3844285,
+3844288,
+3844349,
+3844416,
+3844669,
+3844673,
+3845504,
+3846337,
+3847168,
+3848001,
+3848832,
+3849665,
+3850496,
+3851329,
+3852160,
+3852993,
+3853824,
+3854657,
+3855581,
+3855616,
+3856434,
+3856449,
+3857266,
+3857281,
+3857472,
+3858290,
+3858305,
+3859122,
+3859137,
+3859328,
+3860146,
+3860161,
+3860978,
+3860993,
+3861184,
+3862002,
+3862017,
+3862834,
+3862849,
+3863040,
+3863858,
+3863873,
+3864690,
+3864705,
+3864896,
+3864929,
+3864989,
+3865032,
+3866645,
+3883013,
+3884789,
+3884901,
+3886517,
+3886757,
+3886805,
+3887237,
+3887285,
+3887345,
+3887517,
+3887973,
+3888157,
+3888165,
+3888669,
+3932165,
+3932413,
+3932421,
+3932989,
+3933029,
+3933277,
+3933285,
+3933373,
+3933381,
+3933565,
+3940356,
+3941821,
+3941893,
+3942115,
+3942365,
+3942408,
+3942749,
+3942852,
+3942901,
+3942941,
+3954692,
+3956101,
+3956232,
+3956573,
+3956723,
+3956765,
+3997700,
+4004029,
+4004074,
+4004357,
+4004605,
+4005888,
+4006977,
+4008069,
+4008291,
+4008349,
+4008456,
+4008797,
+4008913,
+4008989,
+4034090,
+4035989,
+4036010,
+4036115,
+4036138,
+4036285,
+4038698,
+4040149,
+4040170,
+4040669,
+4046852,
+4047005,
+4047012,
+4047901,
+4047908,
+4047997,
+4048004,
+4048061,
+4048100,
+4048157,
+4048164,
+4048509,
+4048516,
+4048669,
+4048676,
+4048733,
+4048740,
+4048797,
+4048964,
+4049021,
+4049124,
+4049181,
+4049188,
+4049245,
+4049252,
+4049309,
+4049316,
+4049437,
+4049444,
+4049533,
+4049540,
+4049597,
+4049636,
+4049693,
+4049700,
+4049757,
+4049764,
+4049821,
+4049828,
+4049885,
+4049892,
+4049949,
+4049956,
+4050045,
+4050052,
+4050109,
+4050148,
+4050301,
+4050308,
+4050557,
+4050564,
+4050717,
+4050724,
+4050877,
+4050884,
+4050941,
+4050948,
+4051293,
+4051300,
+4051869,
+4052004,
+4052125,
+4052132,
+4052317,
+4052324,
+4052893,
+4054546,
+4054621,
+4063253,
+4064669,
+4064789,
+4067997,
+4068373,
+4068861,
+4068917,
+4069405,
+4069429,
+4069917,
+4069941,
+4071133,
+4071434,
+4071861,
+4077021,
+4078805,
+4079741,
+4080149,
+4081565,
+4081685,
+4081981,
+4082197,
+4082269,
+4082709,
+4082909,
+4087829,
+4095860,
+4096021,
+4119325,
+4119573,
+4119997,
+4120085,
+4120509,
+4120597,
+4124317,
+4124693,
+4127549,
+4127765,
+4128157,
+4128789,
+4129181,
+4129301,
+4131101,
+4131349,
+4131677,
+4131861,
+4133149,
+4133397,
+4134365,
+4134421,
+4134493,
+4136981,
+4140861,
+4140885,
+4143517,
+4143541,
+4147869,
+4148245,
+4148701,
+4148757,
+4148925,
+4149013,
+4149117,
+4149269,
+4149501,
+4149781,
+4150589,
+4150805,
+4151037,
+4151317,
+4151421,
+4151829,
+4152061,
+4153365,
+4158077,
+4158101,
+4159869,
+4161032,
+4161373,
+4194308,
+5561309,
+5562372,
+5695165,
+5695492,
+5702621,
+5702660,
+5887069,
+5887492,
+6126653,
+6225924,
+6243293,
+6291460,
+6449533,
+29360186,
+29360221,
+29361178,
+29364253,
+29368325,
+29376029,
+31457308,
+33554397,
+33554460,
+35651549,
+35651613,
+//--Autogenerated -- end of section automatically generated
+};
+
+constexpr int maxUnicode = 0x10ffff;
+constexpr int maskCategory = 0x1F;
+
+}
+
+// Each element in catRanges is the start of a range of Unicode characters in
+// one general category.
+// The value is comprised of a 21-bit character value shifted 5 bits and a 5 bit
+// category matching the CharacterCategory enumeration.
+// Initial version has 3249 entries and adds about 13K to the executable.
+// The array is in ascending order so can be searched using binary search.
+// Therefore the average call takes log2(3249) = 12 comparisons.
+// For speed, it may be useful to make a linear table for the common values,
+// possibly for 0..0xff for most Western European text or 0..0xfff for most
+// alphabetic languages.
+
+CharacterCategory CategoriseCharacter(int character) {
+	if (character < 0 || character > maxUnicode)
+		return ccCn;
+	const int baseValue = character * (maskCategory+1) + maskCategory;
+	const int *placeAfter = std::lower_bound(catRanges, std::end(catRanges), baseValue);
+	return static_cast<CharacterCategory>(*(placeAfter-1) & maskCategory);
+}
+
+// Implementation of character sets recommended for identifiers in Unicode Standard Annex #31.
+// http://unicode.org/reports/tr31/
+
+namespace {
+
+enum class OtherID { oidNone, oidStart, oidContinue };
+
+// Some characters are treated as valid for identifiers even
+// though most characters from their category are not.
+// Values copied from http://www.unicode.org/Public/9.0.0/ucd/PropList.txt
+OtherID OtherIDOfCharacter(int character) noexcept {
+	if (
+		(character == 0x1885) ||	// MONGOLIAN LETTER ALI GALI BALUDA
+		(character == 0x1886) ||	// MONGOLIAN LETTER ALI GALI THREE BALUDA
+		(character == 0x2118) ||	// SCRIPT CAPITAL P
+		(character == 0x212E) ||	// ESTIMATED SYMBOL
+		(character == 0x309B) ||	// KATAKANA-HIRAGANA VOICED SOUND MARK
+		(character == 0x309C)) {	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+		return OtherID::oidStart;
+	} else if (
+		(character == 0x00B7) ||	// MIDDLE DOT
+		(character == 0x0387) ||	// GREEK ANO TELEIA
+		((character >= 0x1369) && (character <= 0x1371)) ||	// ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE
+		(character == 0x19DA)) {	// NEW TAI LUE THAM DIGIT ONE
+		return OtherID::oidContinue;
+	} else {
+		return OtherID::oidNone;
+	}
+}
+
+// Determine if a character is in  Ll|Lu|Lt|Lm|Lo|Nl|Mn|Mc|Nd|Pc and has
+// Pattern_Syntax|Pattern_White_Space.
+// As of Unicode 9, only VERTICAL TILDE which is in Lm and has Pattern_Syntax matches.
+// Should really generate from PropList.txt a list of Pattern_Syntax and Pattern_White_Space.
+constexpr bool IsIdPattern(int character) noexcept {
+	return character == 0x2E2F;
+}
+
+bool OmitXidStart(int character) noexcept {
+	switch (character) {
+	case 0x037A:	// GREEK YPOGEGRAMMENI
+	case 0x0E33:	// THAI CHARACTER SARA AM
+	case 0x0EB3:	// LAO VOWEL SIGN AM
+	case 0x309B:	// KATAKANA-HIRAGANA VOICED SOUND MARK
+	case 0x309C:	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+	case 0xFC5E:	// ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+	case 0xFC5F:	// ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+	case 0xFC60:	// ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+	case 0xFC61:	// ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+	case 0xFC62:	// ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+	case 0xFC63:	// ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+	case 0xFDFA:	// ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
+	case 0xFDFB:	// ARABIC LIGATURE JALLAJALALOUHOU
+	case 0xFE70:	// ARABIC FATHATAN ISOLATED FORM
+	case 0xFE72:	// ARABIC DAMMATAN ISOLATED FORM
+	case 0xFE74:	// ARABIC KASRATAN ISOLATED FORM
+	case 0xFE76:	// ARABIC FATHA ISOLATED FORM
+	case 0xFE78:	// ARABIC DAMMA ISOLATED FORM
+	case 0xFE7A:	// ARABIC KASRA ISOLATED FORM
+	case 0xFE7C:	// ARABIC SHADDA ISOLATED FORM
+	case 0xFE7E:	// ARABIC SUKUN ISOLATED FORM
+	case 0xFF9E:	// HALFWIDTH KATAKANA VOICED SOUND MARK
+	case 0xFF9F:	// HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool OmitXidContinue(int character) noexcept {
+	switch (character) {
+	case 0x037A:	// GREEK YPOGEGRAMMENI
+	case 0x309B:	// KATAKANA-HIRAGANA VOICED SOUND MARK
+	case 0x309C:	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+	case 0xFC5E:	// ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+	case 0xFC5F:	// ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+	case 0xFC60:	// ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+	case 0xFC61:	// ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+	case 0xFC62:	// ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+	case 0xFC63:	// ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+	case 0xFDFA:	// ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
+	case 0xFDFB:	// ARABIC LIGATURE JALLAJALALOUHOU
+	case 0xFE70:	// ARABIC FATHATAN ISOLATED FORM
+	case 0xFE72:	// ARABIC DAMMATAN ISOLATED FORM
+	case 0xFE74:	// ARABIC KASRATAN ISOLATED FORM
+	case 0xFE76:	// ARABIC FATHA ISOLATED FORM
+	case 0xFE78:	// ARABIC DAMMA ISOLATED FORM
+	case 0xFE7A:	// ARABIC KASRA ISOLATED FORM
+	case 0xFE7C:	// ARABIC SHADDA ISOLATED FORM
+	case 0xFE7E:	// ARABIC SUKUN ISOLATED FORM
+		return true;
+	default:
+		return false;
+	}
+}
+
+}
+
+// UAX #31 defines ID_Start as
+// [[:L:][:Nl:][:Other_ID_Start:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
+bool IsIdStart(int character) {
+	if (IsIdPattern(character)) {
+		return false;
+	}
+	const OtherID oid = OtherIDOfCharacter(character);
+	if (oid == OtherID::oidStart) {
+		return true;
+	}
+	const CharacterCategory c = CategoriseCharacter(character);
+	return (c == ccLl || c == ccLu || c == ccLt || c == ccLm || c == ccLo
+		|| c == ccNl);
+}
+
+// UAX #31 defines ID_Continue as
+// [[:ID_Start:][:Mn:][:Mc:][:Nd:][:Pc:][:Other_ID_Continue:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
+bool IsIdContinue(int character) {
+	if (IsIdPattern(character)) {
+		return false;
+	}
+	const OtherID oid = OtherIDOfCharacter(character);
+	if (oid != OtherID::oidNone) {
+		return true;
+	}
+	const CharacterCategory c = CategoriseCharacter(character);
+	return (c == ccLl || c == ccLu || c == ccLt || c == ccLm || c == ccLo
+		|| c == ccNl || c == ccMn || c == ccMc || c == ccNd || c == ccPc);
+}
+
+// XID_Start is ID_Start modified for Normalization Form KC in UAX #31
+bool IsXidStart(int character) {
+	if (OmitXidStart(character)) {
+		return false;
+	} else {
+		return IsIdStart(character);
+	}
+}
+
+// XID_Continue is ID_Continue modified for Normalization Form KC in UAX #31
+bool IsXidContinue(int character) {
+	if (OmitXidContinue(character)) {
+		return false;
+	} else {
+		return IsIdContinue(character);
+	}
+}
+
+CharacterCategoryMap::CharacterCategoryMap() {
+	Optimize(256);
+}
+
+int CharacterCategoryMap::Size() const noexcept {
+	return static_cast<int>(dense.size());
+}
+
+void CharacterCategoryMap::Optimize(int countCharacters) {
+	const int characters = std::clamp(countCharacters, 256, maxUnicode + 1);
+	dense.resize(characters);
+
+	int end = 0;
+	int index = 0;
+	int current = catRanges[index];
+	++index;
+	do {
+		const int next = catRanges[index];
+		const unsigned char category = current & maskCategory;
+		current >>= 5;
+		end = std::min(characters, next >> 5);
+		while (current < end) {
+			dense[current++] = category;
+		}
+		current = next;
+		++index;
+	} while (characters > end);
+}
+
+}
diff --git a/scite-app/lexilla/lexlib/CharacterCategory.h b/scite-app/lexilla/lexlib/CharacterCategory.h
new file mode 100644
index 0000000..f8e5c7b
--- /dev/null
+++ b/scite-app/lexilla/lexlib/CharacterCategory.h
@@ -0,0 +1,50 @@
+// Scintilla source code edit control
+/** @file CharacterCategory.h
+ ** Returns the Unicode general category of a character.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHARACTERCATEGORY_H
+#define CHARACTERCATEGORY_H
+
+namespace Lexilla {
+
+enum CharacterCategory {
+	ccLu, ccLl, ccLt, ccLm, ccLo,
+	ccMn, ccMc, ccMe,
+	ccNd, ccNl, ccNo,
+	ccPc, ccPd, ccPs, ccPe, ccPi, ccPf, ccPo,
+	ccSm, ccSc, ccSk, ccSo,
+	ccZs, ccZl, ccZp,
+	ccCc, ccCf, ccCs, ccCo, ccCn
+};
+
+CharacterCategory CategoriseCharacter(int character);
+
+// Common definitions of allowable characters in identifiers from UAX #31.
+bool IsIdStart(int character);
+bool IsIdContinue(int character);
+bool IsXidStart(int character);
+bool IsXidContinue(int character);
+
+class CharacterCategoryMap {
+private:
+	std::vector<unsigned char> dense;
+public:
+	CharacterCategoryMap();
+	CharacterCategory CategoryFor(int character) const {
+		if (static_cast<size_t>(character) < dense.size()) {
+			return static_cast<CharacterCategory>(dense[character]);
+		} else {
+			// binary search through ranges
+			return CategoriseCharacter(character);
+		}
+	}
+	int Size() const noexcept;
+	void Optimize(int countCharacters);
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/CharacterSet.cxx b/scite-app/lexilla/lexlib/CharacterSet.cxx
new file mode 100644
index 0000000..1b67700
--- /dev/null
+++ b/scite-app/lexilla/lexlib/CharacterSet.cxx
@@ -0,0 +1,52 @@
+// Scintilla source code edit control
+/** @file CharacterSet.cxx
+ ** Simple case functions for ASCII.
+ ** Lexer infrastructure.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include "CharacterSet.h"
+
+using namespace Lexilla;
+
+namespace Lexilla {
+
+int CompareCaseInsensitive(const char *a, const char *b) noexcept {
+	while (*a && *b) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+	}
+	// Either *a or *b is nul
+	return *a - *b;
+}
+
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
+	while (*a && *b && len) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+		len--;
+	}
+	if (len == 0)
+		return 0;
+	else
+		// Either *a or *b is nul
+		return *a - *b;
+}
+
+}
diff --git a/scite-app/lexilla/lexlib/CharacterSet.h b/scite-app/lexilla/lexlib/CharacterSet.h
new file mode 100644
index 0000000..691ca4b
--- /dev/null
+++ b/scite-app/lexilla/lexlib/CharacterSet.h
@@ -0,0 +1,181 @@
+// Scintilla source code edit control
+/** @file CharacterSet.h
+ ** Encapsulates a set of characters. Used to test if a character is within a set.
+ **/
+// Copyright 2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHARACTERSET_H
+#define CHARACTERSET_H
+
+namespace Lexilla {
+
+template<int N>
+class CharacterSetArray {
+	unsigned char bset[(N-1)/8 + 1] = {};
+	bool valueAfter = false;
+public:
+	enum setBase {
+		setNone=0,
+		setLower=1,
+		setUpper=2,
+		setDigits=4,
+		setAlpha=setLower|setUpper,
+		setAlphaNum=setAlpha|setDigits
+	};
+	CharacterSetArray(setBase base=setNone, const char *initialSet="", bool valueAfter_=false) noexcept {
+		valueAfter = valueAfter_;
+		AddString(initialSet);
+		if (base & setLower)
+			AddString("abcdefghijklmnopqrstuvwxyz");
+		if (base & setUpper)
+			AddString("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+		if (base & setDigits)
+			AddString("0123456789");
+	}
+	// For compatibility with previous version but should not be used in new code.
+	CharacterSetArray(setBase base, const char *initialSet, [[maybe_unused]]int size_, bool valueAfter_=false) noexcept :
+		CharacterSetArray(base, initialSet, valueAfter_) {
+		assert(size_ == N);
+	}
+	void Add(int val) noexcept {
+		assert(val >= 0);
+		assert(val < N);
+		bset[val >> 3] |= 1 << (val & 7);
+	}
+	void AddString(const char *setToAdd) noexcept {
+		for (const char *cp=setToAdd; *cp; cp++) {
+			const unsigned char uch = *cp;
+			assert(uch < N);
+			Add(uch);
+		}
+	}
+	bool Contains(int val) const noexcept {
+		assert(val >= 0);
+		if (val < 0) return false;
+		if (val >= N) return valueAfter;
+		return bset[val >> 3] & (1 << (val & 7));
+	}
+	bool Contains(char ch) const noexcept {
+		// Overload char as char may be signed
+		const unsigned char uch = ch;
+		return Contains(uch);
+	}
+};
+
+using CharacterSet = CharacterSetArray<0x80>;
+
+// Functions for classifying characters
+
+template <typename T, typename... Args>
+constexpr bool AnyOf(T t, Args... args) noexcept {
+#if defined(__clang__)
+	static_assert(__is_integral(T));
+#endif
+	return ((t == args) || ...);
+}
+
+// prevent pointer without <type_traits>
+template <typename T, typename... Args>
+constexpr void AnyOf([[maybe_unused]] T *t, [[maybe_unused]] Args... args) noexcept {}
+template <typename T, typename... Args>
+constexpr void AnyOf([[maybe_unused]] const T *t, [[maybe_unused]] Args... args) noexcept {}
+
+constexpr bool IsASpace(int ch) noexcept {
+    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
+constexpr bool IsASpaceOrTab(int ch) noexcept {
+	return (ch == ' ') || (ch == '\t');
+}
+
+constexpr bool IsADigit(int ch) noexcept {
+	return (ch >= '0') && (ch <= '9');
+}
+
+constexpr bool IsADigit(int ch, int base) noexcept {
+	if (base <= 10) {
+		return (ch >= '0') && (ch < '0' + base);
+	} else {
+		return ((ch >= '0') && (ch <= '9')) ||
+		       ((ch >= 'A') && (ch < 'A' + base - 10)) ||
+		       ((ch >= 'a') && (ch < 'a' + base - 10));
+	}
+}
+
+constexpr bool IsASCII(int ch) noexcept {
+	return (ch >= 0) && (ch < 0x80);
+}
+
+constexpr bool IsLowerCase(int ch) noexcept {
+	return (ch >= 'a') && (ch <= 'z');
+}
+
+constexpr bool IsUpperCase(int ch) noexcept {
+	return (ch >= 'A') && (ch <= 'Z');
+}
+
+constexpr bool IsUpperOrLowerCase(int ch) noexcept {
+	return IsUpperCase(ch) || IsLowerCase(ch);
+}
+
+constexpr bool IsAlphaNumeric(int ch) noexcept {
+	return
+		((ch >= '0') && (ch <= '9')) ||
+		((ch >= 'a') && (ch <= 'z')) ||
+		((ch >= 'A') && (ch <= 'Z'));
+}
+
+/**
+ * Check if a character is a space.
+ * This is ASCII specific but is safe with chars >= 0x80.
+ */
+constexpr bool isspacechar(int ch) noexcept {
+    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
+constexpr bool iswordchar(int ch) noexcept {
+	return IsAlphaNumeric(ch) || ch == '.' || ch == '_';
+}
+
+constexpr bool iswordstart(int ch) noexcept {
+	return IsAlphaNumeric(ch) || ch == '_';
+}
+
+constexpr bool isoperator(int ch) noexcept {
+	if (IsAlphaNumeric(ch))
+		return false;
+	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
+	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
+	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
+	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
+		return true;
+	return false;
+}
+
+// Simple case functions for ASCII supersets.
+
+template <typename T>
+constexpr T MakeUpperCase(T ch) noexcept {
+	if (ch < 'a' || ch > 'z')
+		return ch;
+	else
+		return ch - 'a' + 'A';
+}
+
+template <typename T>
+constexpr T MakeLowerCase(T ch) noexcept {
+	if (ch < 'A' || ch > 'Z')
+		return ch;
+	else
+		return ch - 'A' + 'a';
+}
+
+int CompareCaseInsensitive(const char *a, const char *b) noexcept;
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept;
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/DefaultLexer.cxx b/scite-app/lexilla/lexlib/DefaultLexer.cxx
new file mode 100644
index 0000000..991dc34
--- /dev/null
+++ b/scite-app/lexilla/lexlib/DefaultLexer.cxx
@@ -0,0 +1,142 @@
+// Scintilla source code edit control
+/** @file DefaultLexer.cxx
+ ** A lexer base class that provides reasonable default behaviour.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "LexerModule.h"
+#include "DefaultLexer.h"
+
+using namespace Lexilla;
+
+static const char styleSubable[] = { 0 };
+
+DefaultLexer::DefaultLexer(const char *languageName_, int language_,
+	const LexicalClass *lexClasses_, size_t nClasses_) :
+	languageName(languageName_),
+	language(language_),
+	lexClasses(lexClasses_),
+	nClasses(nClasses_) {
+}
+
+DefaultLexer::~DefaultLexer() {
+}
+
+void SCI_METHOD DefaultLexer::Release() {
+	delete this;
+}
+
+int SCI_METHOD DefaultLexer::Version() const {
+	return Scintilla::lvRelease5;
+}
+
+const char * SCI_METHOD DefaultLexer::PropertyNames() {
+	return "";
+}
+
+int SCI_METHOD DefaultLexer::PropertyType(const char *) {
+	return SC_TYPE_BOOLEAN;
+}
+
+const char * SCI_METHOD DefaultLexer::DescribeProperty(const char *) {
+	return "";
+}
+
+Sci_Position SCI_METHOD DefaultLexer::PropertySet(const char *, const char *) {
+	return -1;
+}
+
+const char * SCI_METHOD DefaultLexer::DescribeWordListSets() {
+	return "";
+}
+
+Sci_Position SCI_METHOD DefaultLexer::WordListSet(int, const char *) {
+	return -1;
+}
+
+void SCI_METHOD DefaultLexer::Fold(Sci_PositionU, Sci_Position, int, Scintilla::IDocument *) {
+}
+
+void * SCI_METHOD DefaultLexer::PrivateCall(int, void *) {
+	return nullptr;
+}
+
+int SCI_METHOD DefaultLexer::LineEndTypesSupported() {
+	return SC_LINE_END_TYPE_DEFAULT;
+}
+
+int SCI_METHOD DefaultLexer::AllocateSubStyles(int, int) {
+	return -1;
+}
+
+int SCI_METHOD DefaultLexer::SubStylesStart(int) {
+	return -1;
+}
+
+int SCI_METHOD DefaultLexer::SubStylesLength(int) {
+	return 0;
+}
+
+int SCI_METHOD DefaultLexer::StyleFromSubStyle(int subStyle) {
+	return subStyle;
+}
+
+int SCI_METHOD DefaultLexer::PrimaryStyleFromStyle(int style) {
+	return style;
+}
+
+void SCI_METHOD DefaultLexer::FreeSubStyles() {
+}
+
+void SCI_METHOD DefaultLexer::SetIdentifiers(int, const char *) {
+}
+
+int SCI_METHOD DefaultLexer::DistanceToSecondaryStyles() {
+	return 0;
+}
+
+const char * SCI_METHOD DefaultLexer::GetSubStyleBases() {
+	return styleSubable;
+}
+
+int SCI_METHOD DefaultLexer::NamedStyles() {
+	return static_cast<int>(nClasses);
+}
+
+const char * SCI_METHOD DefaultLexer::NameOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].name : "";
+}
+
+const char * SCI_METHOD DefaultLexer::TagsOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].tags : "";
+}
+
+const char * SCI_METHOD DefaultLexer::DescriptionOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].description : "";
+}
+
+// ILexer5 methods
+const char * SCI_METHOD DefaultLexer::GetName() {
+	return languageName;
+}
+
+int SCI_METHOD DefaultLexer::GetIdentifier() {
+	return language;
+}
+
diff --git a/scite-app/lexilla/lexlib/DefaultLexer.h b/scite-app/lexilla/lexlib/DefaultLexer.h
new file mode 100644
index 0000000..9db3f4d
--- /dev/null
+++ b/scite-app/lexilla/lexlib/DefaultLexer.h
@@ -0,0 +1,57 @@
+// Scintilla source code edit control
+/** @file DefaultLexer.h
+ ** A lexer base class with default empty implementations of methods.
+ ** For lexers that do not support all features so do not need real implementations.
+ ** Does have real implementation for style metadata.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DEFAULTLEXER_H
+#define DEFAULTLEXER_H
+
+namespace Lexilla {
+
+// A simple lexer with no state
+class DefaultLexer : public Scintilla::ILexer5 {
+	const char *languageName;
+	int language;
+	const LexicalClass *lexClasses;
+	size_t nClasses;
+public:
+	DefaultLexer(const char *languageName_, int language_,
+		const LexicalClass *lexClasses_ = nullptr, size_t nClasses_ = 0);
+	virtual ~DefaultLexer();
+	void SCI_METHOD Release() override;
+	int SCI_METHOD Version() const override;
+	const char * SCI_METHOD PropertyNames() override;
+	int SCI_METHOD PropertyType(const char *name) override;
+	const char * SCI_METHOD DescribeProperty(const char *name) override;
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD DescribeWordListSets() override;
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override = 0;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+	void * SCI_METHOD PrivateCall(int operation, void *pointer) override;
+	int SCI_METHOD LineEndTypesSupported() override;
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override;
+	int SCI_METHOD SubStylesStart(int styleBase) override;
+	int SCI_METHOD SubStylesLength(int styleBase) override;
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override;
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override;
+	void SCI_METHOD FreeSubStyles() override;
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override;
+	int SCI_METHOD DistanceToSecondaryStyles() override;
+	const char * SCI_METHOD GetSubStyleBases() override;
+	int SCI_METHOD NamedStyles() override;
+	const char * SCI_METHOD NameOfStyle(int style) override;
+	const char * SCI_METHOD TagsOfStyle(int style) override;
+	const char * SCI_METHOD DescriptionOfStyle(int style) override;
+	// ILexer5 methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD GetIdentifier() override;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/LexAccessor.cxx b/scite-app/lexilla/lexlib/LexAccessor.cxx
new file mode 100644
index 0000000..7a15fb6
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexAccessor.cxx
@@ -0,0 +1,70 @@
+// Scintilla source code edit control
+/** @file LexAccessor.cxx
+ ** Interfaces between Scintilla and lexers.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+#include <cassert>
+#include <cstring>
+
+#include <string>
+#include <algorithm>
+
+#include "ILexer.h"
+
+#include "LexAccessor.h"
+#include "CharacterSet.h"
+
+using namespace Lexilla;
+
+namespace Lexilla {
+
+bool LexAccessor::MatchIgnoreCase(Sci_Position pos, const char *s) {
+	for (; *s; s++, pos++) {
+		if (*s != MakeLowerCase(SafeGetCharAt(pos))) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) {
+	assert(startPos_ <= endPos_ && len != 0 && s != nullptr);
+	endPos_ = std::min(endPos_, startPos_ + len - 1);
+	len = endPos_ - startPos_;
+	if (startPos_ >= static_cast<Sci_PositionU>(startPos) && endPos_ <= static_cast<Sci_PositionU>(endPos)) {
+		const char * const p = buf + (startPos_ - startPos);
+		memcpy(s, p, len);
+	} else {
+		pAccess->GetCharRange(s, startPos_, len);
+	}
+	s[len] = '\0';
+}
+
+void LexAccessor::GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) {
+	GetRange(startPos_, endPos_, s, len);
+	while (*s) {
+		if (*s >= 'A' && *s <= 'Z') {
+			*s += 'a' - 'A';
+		}
+		++s;
+	}
+}
+
+std::string LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_) {
+	assert(startPos_ < endPos_);
+	const Sci_PositionU len = endPos_ - startPos_;
+	std::string s(len, '\0');
+	GetRange(startPos_, endPos_, s.data(), len);
+	return s;
+}
+
+std::string LexAccessor::GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_) {
+	assert(startPos_ < endPos_);
+	const Sci_PositionU len = endPos_ - startPos_;
+	std::string s(len, '\0');
+	GetRangeLowered(startPos_, endPos_, s.data(), len);
+	return s;
+}
+
+}
diff --git a/scite-app/lexilla/lexlib/LexAccessor.h b/scite-app/lexilla/lexlib/LexAccessor.h
new file mode 100644
index 0000000..8f76ed2
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexAccessor.h
@@ -0,0 +1,207 @@
+// Scintilla source code edit control
+/** @file LexAccessor.h
+ ** Interfaces between Scintilla and lexers.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXACCESSOR_H
+#define LEXACCESSOR_H
+
+namespace Lexilla {
+
+enum class EncodingType { eightBit, unicode, dbcs };
+
+class LexAccessor {
+private:
+	Scintilla::IDocument *pAccess;
+	enum {extremePosition=0x7FFFFFFF};
+	/** @a bufferSize is a trade off between time taken to copy the characters
+	 * and retrieval overhead.
+	 * @a slopSize positions the buffer before the desired position
+	 * in case there is some backtracking. */
+	enum {bufferSize=4000, slopSize=bufferSize/8};
+	char buf[bufferSize+1];
+	Sci_Position startPos;
+	Sci_Position endPos;
+	int codePage;
+	enum EncodingType encodingType;
+	Sci_Position lenDoc;
+	char styleBuf[bufferSize];
+	Sci_Position validLen;
+	Sci_PositionU startSeg;
+	Sci_Position startPosStyling;
+	int documentVersion;
+
+	void Fill(Sci_Position position) {
+		startPos = position - slopSize;
+		if (startPos + bufferSize > lenDoc)
+			startPos = lenDoc - bufferSize;
+		if (startPos < 0)
+			startPos = 0;
+		endPos = startPos + bufferSize;
+		if (endPos > lenDoc)
+			endPos = lenDoc;
+
+		pAccess->GetCharRange(buf, startPos, endPos-startPos);
+		buf[endPos-startPos] = '\0';
+	}
+
+public:
+	explicit LexAccessor(Scintilla::IDocument *pAccess_) :
+		pAccess(pAccess_), startPos(extremePosition), endPos(0),
+		codePage(pAccess->CodePage()),
+		encodingType(EncodingType::eightBit),
+		lenDoc(pAccess->Length()),
+		validLen(0),
+		startSeg(0), startPosStyling(0),
+		documentVersion(pAccess->Version()) {
+		// Prevent warnings by static analyzers about uninitialized buf and styleBuf.
+		buf[0] = 0;
+		styleBuf[0] = 0;
+		switch (codePage) {
+		case 65001:
+			encodingType = EncodingType::unicode;
+			break;
+		case 932:
+		case 936:
+		case 949:
+		case 950:
+		case 1361:
+			encodingType = EncodingType::dbcs;
+		}
+	}
+	char operator[](Sci_Position position) {
+		if (position < startPos || position >= endPos) {
+			Fill(position);
+		}
+		return buf[position - startPos];
+	}
+	Scintilla::IDocument *MultiByteAccess() const noexcept {
+		return pAccess;
+	}
+	/** Safe version of operator[], returning a defined value for invalid position. */
+	char SafeGetCharAt(Sci_Position position, char chDefault=' ') {
+		if (position < startPos || position >= endPos) {
+			Fill(position);
+			if (position < startPos || position >= endPos) {
+				// Position is outside range of document
+				return chDefault;
+			}
+		}
+		return buf[position - startPos];
+	}
+	bool IsLeadByte(char ch) const {
+		return
+			(static_cast<unsigned char>(ch) >= 0x80) &&	// non-ASCII
+			(encodingType == EncodingType::dbcs) &&		// IsDBCSLeadByte only for DBCS
+			pAccess->IsDBCSLeadByte(ch);
+	}
+	EncodingType Encoding() const noexcept {
+		return encodingType;
+	}
+	bool Match(Sci_Position pos, const char *s) {
+		for (int i=0; *s; i++) {
+			if (*s != SafeGetCharAt(pos+i))
+				return false;
+			s++;
+		}
+		return true;
+	}
+	bool MatchIgnoreCase(Sci_Position pos, const char *s);
+
+	// Get first len - 1 characters in range [startPos_, endPos_).
+	void GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len);
+	void GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len);
+	// Get all characters in range [startPos_, endPos_).
+	std::string GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_);
+	std::string GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_);
+
+	char StyleAt(Sci_Position position) const {
+		return pAccess->StyleAt(position);
+	}
+	Sci_Position GetLine(Sci_Position position) const {
+		return pAccess->LineFromPosition(position);
+	}
+	Sci_Position LineStart(Sci_Position line) const {
+		return pAccess->LineStart(line);
+	}
+	Sci_Position LineEnd(Sci_Position line) const {
+		return pAccess->LineEnd(line);
+	}
+	int LevelAt(Sci_Position line) const {
+		return pAccess->GetLevel(line);
+	}
+	Sci_Position Length() const {
+		return lenDoc;
+	}
+	void Flush() {
+		if (validLen > 0) {
+			pAccess->SetStyles(validLen, styleBuf);
+			startPosStyling += validLen;
+			validLen = 0;
+		}
+	}
+	int GetLineState(Sci_Position line) const {
+		return pAccess->GetLineState(line);
+	}
+	int SetLineState(Sci_Position line, int state) {
+		return pAccess->SetLineState(line, state);
+	}
+	// Style setting
+	void StartAt(Sci_PositionU start) {
+		pAccess->StartStyling(start);
+		startPosStyling = start;
+	}
+	Sci_PositionU GetStartSegment() const {
+		return startSeg;
+	}
+	void StartSegment(Sci_PositionU pos) {
+		startSeg = pos;
+	}
+	void ColourTo(Sci_PositionU pos, int chAttr) {
+		// Only perform styling if non empty range
+		if (pos != startSeg - 1) {
+			assert(pos >= startSeg);
+			if (pos < startSeg) {
+				return;
+			}
+
+			if (validLen + (pos - startSeg + 1) >= bufferSize)
+				Flush();
+			const char attr = static_cast<char>(chAttr);
+			if (validLen + (pos - startSeg + 1) >= bufferSize) {
+				// Too big for buffer so send directly
+				pAccess->SetStyleFor(pos - startSeg + 1, attr);
+			} else {
+				for (Sci_PositionU i = startSeg; i <= pos; i++) {
+					assert((startPosStyling + validLen) < Length());
+					styleBuf[validLen++] = attr;
+				}
+			}
+		}
+		startSeg = pos+1;
+	}
+	void SetLevel(Sci_Position line, int level) {
+		pAccess->SetLevel(line, level);
+	}
+	void IndicatorFill(Sci_Position start, Sci_Position end, int indicator, int value) {
+		pAccess->DecorationSetCurrentIndicator(indicator);
+		pAccess->DecorationFillRange(start, value, end - start);
+	}
+
+	void ChangeLexerState(Sci_Position start, Sci_Position end) {
+		pAccess->ChangeLexerState(start, end);
+	}
+};
+
+struct LexicalClass {
+	int value;
+	const char *name;
+	const char *tags;
+	const char *description;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/LexerBase.cxx b/scite-app/lexilla/lexlib/LexerBase.cxx
new file mode 100644
index 0000000..a45a334
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerBase.cxx
@@ -0,0 +1,156 @@
+// Scintilla source code edit control
+/** @file LexerBase.cxx
+ ** A simple lexer with no state.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+
+using namespace Lexilla;
+
+static const char styleSubable[] = { 0 };
+
+LexerBase::LexerBase(const LexicalClass *lexClasses_, size_t nClasses_) :
+	lexClasses(lexClasses_), nClasses(nClasses_) {
+	for (int wl = 0; wl < numWordLists; wl++)
+		keyWordLists[wl] = new WordList;
+	keyWordLists[numWordLists] = 0;
+}
+
+LexerBase::~LexerBase() {
+	for (int wl = 0; wl < numWordLists; wl++) {
+		delete keyWordLists[wl];
+		keyWordLists[wl] = 0;
+	}
+	keyWordLists[numWordLists] = 0;
+}
+
+void SCI_METHOD LexerBase::Release() {
+	delete this;
+}
+
+int SCI_METHOD LexerBase::Version() const {
+	return Scintilla::lvRelease5;
+}
+
+const char * SCI_METHOD LexerBase::PropertyNames() {
+	return "";
+}
+
+int SCI_METHOD LexerBase::PropertyType(const char *) {
+	return SC_TYPE_BOOLEAN;
+}
+
+const char * SCI_METHOD LexerBase::DescribeProperty(const char *) {
+	return "";
+}
+
+Sci_Position SCI_METHOD LexerBase::PropertySet(const char *key, const char *val) {
+	if (props.Set(key, val)) {
+		return 0;
+	} else {
+		return -1;
+	}
+}
+
+const char *SCI_METHOD LexerBase::PropertyGet(const char *key) {
+	return props.Get(key);
+}
+
+const char * SCI_METHOD LexerBase::DescribeWordListSets() {
+	return "";
+}
+
+Sci_Position SCI_METHOD LexerBase::WordListSet(int n, const char *wl) {
+	if (n < numWordLists) {
+		if (keyWordLists[n]->Set(wl)) {
+			return 0;
+		}
+	}
+	return -1;
+}
+
+void * SCI_METHOD LexerBase::PrivateCall(int, void *) {
+	return nullptr;
+}
+
+int SCI_METHOD LexerBase::LineEndTypesSupported() {
+	return SC_LINE_END_TYPE_DEFAULT;
+}
+
+int SCI_METHOD LexerBase::AllocateSubStyles(int, int) {
+	return -1;
+}
+
+int SCI_METHOD LexerBase::SubStylesStart(int) {
+	return -1;
+}
+
+int SCI_METHOD LexerBase::SubStylesLength(int) {
+	return 0;
+}
+
+int SCI_METHOD LexerBase::StyleFromSubStyle(int subStyle) {
+	return subStyle;
+}
+
+int SCI_METHOD LexerBase::PrimaryStyleFromStyle(int style) {
+	return style;
+}
+
+void SCI_METHOD LexerBase::FreeSubStyles() {
+}
+
+void SCI_METHOD LexerBase::SetIdentifiers(int, const char *) {
+}
+
+int SCI_METHOD LexerBase::DistanceToSecondaryStyles() {
+	return 0;
+}
+
+const char * SCI_METHOD LexerBase::GetSubStyleBases() {
+	return styleSubable;
+}
+
+int SCI_METHOD LexerBase::NamedStyles() {
+	return static_cast<int>(nClasses);
+}
+
+const char * SCI_METHOD LexerBase::NameOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].name : "";
+}
+
+const char * SCI_METHOD LexerBase::TagsOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].tags : "";
+}
+
+const char * SCI_METHOD LexerBase::DescriptionOfStyle(int style) {
+	return (style < NamedStyles()) ? lexClasses[style].description : "";
+}
+
+// ILexer5 methods
+
+const char *SCI_METHOD LexerBase::GetName() {
+	return "";
+}
+
+int SCI_METHOD LexerBase::GetIdentifier() {
+	return SCLEX_AUTOMATIC;
+}
diff --git a/scite-app/lexilla/lexlib/LexerBase.h b/scite-app/lexilla/lexlib/LexerBase.h
new file mode 100644
index 0000000..32a5576
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerBase.h
@@ -0,0 +1,57 @@
+// Scintilla source code edit control
+/** @file LexerBase.h
+ ** A simple lexer with no state.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXERBASE_H
+#define LEXERBASE_H
+
+namespace Lexilla {
+
+// A simple lexer with no state
+class LexerBase : public Scintilla::ILexer5 {
+protected:
+	const LexicalClass *lexClasses;
+	size_t nClasses;
+	PropSetSimple props;
+	enum {numWordLists=KEYWORDSET_MAX+1};
+	WordList *keyWordLists[numWordLists+1];
+public:
+	LexerBase(const LexicalClass *lexClasses_=nullptr, size_t nClasses_=0);
+	virtual ~LexerBase();
+	void SCI_METHOD Release() override;
+	int SCI_METHOD Version() const override;
+	const char * SCI_METHOD PropertyNames() override;
+	int SCI_METHOD PropertyType(const char *name) override;
+	const char * SCI_METHOD DescribeProperty(const char *name) override;
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD DescribeWordListSets() override;
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override = 0;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override = 0;
+	void * SCI_METHOD PrivateCall(int operation, void *pointer) override;
+	int SCI_METHOD LineEndTypesSupported() override;
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override;
+	int SCI_METHOD SubStylesStart(int styleBase) override;
+	int SCI_METHOD SubStylesLength(int styleBase) override;
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override;
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override;
+	void SCI_METHOD FreeSubStyles() override;
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override;
+	int SCI_METHOD DistanceToSecondaryStyles() override;
+	const char * SCI_METHOD GetSubStyleBases() override;
+	int SCI_METHOD NamedStyles() override;
+	const char * SCI_METHOD NameOfStyle(int style) override;
+	const char * SCI_METHOD TagsOfStyle(int style) override;
+	const char * SCI_METHOD DescriptionOfStyle(int style) override;
+	// ILexer5 methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD GetIdentifier() override;
+	const char *SCI_METHOD PropertyGet(const char *key) override;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/LexerModule.cxx b/scite-app/lexilla/lexlib/LexerModule.cxx
new file mode 100644
index 0000000..4b550f6
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerModule.cxx
@@ -0,0 +1,124 @@
+// Scintilla source code edit control
+/** @file LexerModule.cxx
+ ** Colourise for particular languages.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+#include "LexerSimple.h"
+
+using namespace Lexilla;
+
+LexerModule::LexerModule(int language_,
+	LexerFunction fnLexer_,
+	const char *languageName_,
+	LexerFunction fnFolder_,
+	const char *const wordListDescriptions_[],
+	const LexicalClass *lexClasses_,
+	size_t nClasses_) noexcept :
+	language(language_),
+	fnLexer(fnLexer_),
+	fnFolder(fnFolder_),
+	fnFactory(nullptr),
+	wordListDescriptions(wordListDescriptions_),
+	lexClasses(lexClasses_),
+	nClasses(nClasses_),
+	languageName(languageName_) {
+}
+
+LexerModule::LexerModule(int language_,
+	LexerFactoryFunction fnFactory_,
+	const char *languageName_,
+	const char * const wordListDescriptions_[]) noexcept :
+	language(language_),
+	fnLexer(nullptr),
+	fnFolder(nullptr),
+	fnFactory(fnFactory_),
+	wordListDescriptions(wordListDescriptions_),
+	lexClasses(nullptr),
+	nClasses(0),
+	languageName(languageName_) {
+}
+
+int LexerModule::GetLanguage() const noexcept {
+	return language;
+}
+
+int LexerModule::GetNumWordLists() const noexcept {
+	if (!wordListDescriptions) {
+		return -1;
+	} else {
+		int numWordLists = 0;
+
+		while (wordListDescriptions[numWordLists]) {
+			++numWordLists;
+		}
+
+		return numWordLists;
+	}
+}
+
+const char *LexerModule::GetWordListDescription(int index) const noexcept {
+	assert(index < GetNumWordLists());
+	if (!wordListDescriptions || (index >= GetNumWordLists())) {
+		return "";
+	} else {
+		return wordListDescriptions[index];
+	}
+}
+
+const LexicalClass *LexerModule::LexClasses() const noexcept {
+	return lexClasses;
+}
+
+size_t LexerModule::NamedStyles() const noexcept {
+	return nClasses;
+}
+
+Scintilla::ILexer5 *LexerModule::Create() const {
+	if (fnFactory)
+		return fnFactory();
+	else
+		return new LexerSimple(this);
+}
+
+void LexerModule::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+	  WordList *keywordlists[], Accessor &styler) const {
+	if (fnLexer)
+		fnLexer(startPos, lengthDoc, initStyle, keywordlists, styler);
+}
+
+void LexerModule::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+	  WordList *keywordlists[], Accessor &styler) const {
+	if (fnFolder) {
+		Sci_Position lineCurrent = styler.GetLine(startPos);
+		// Move back one line in case deletion wrecked current line fold state
+		if (lineCurrent > 0) {
+			lineCurrent--;
+			const Sci_Position newStartPos = styler.LineStart(lineCurrent);
+			lengthDoc += startPos - newStartPos;
+			startPos = newStartPos;
+			initStyle = 0;
+			if (startPos > 0) {
+				initStyle = styler.StyleAt(startPos - 1);
+			}
+		}
+		fnFolder(startPos, lengthDoc, initStyle, keywordlists, styler);
+	}
+}
diff --git a/scite-app/lexilla/lexlib/LexerModule.h b/scite-app/lexilla/lexlib/LexerModule.h
new file mode 100644
index 0000000..d6ab78f
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerModule.h
@@ -0,0 +1,92 @@
+// Scintilla source code edit control
+/** @file LexerModule.h
+ ** Colourise for particular languages.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXERMODULE_H
+#define LEXERMODULE_H
+
+namespace Lexilla {
+
+class Accessor;
+class WordList;
+struct LexicalClass;
+
+typedef void (*LexerFunction)(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+                  WordList *keywordlists[], Accessor &styler);
+typedef Scintilla::ILexer5 *(*LexerFactoryFunction)();
+
+/**
+ * A LexerModule is responsible for lexing and folding a particular language.
+ * The Catalogue class maintains a list of LexerModules which can be searched to find a
+ * module appropriate to a particular language.
+ * The ExternalLexerModule subclass holds lexers loaded from DLLs or shared libraries.
+ */
+class LexerModule {
+protected:
+	int language;
+	LexerFunction fnLexer;
+	LexerFunction fnFolder;
+	LexerFactoryFunction fnFactory;
+	const char * const * wordListDescriptions;
+	const LexicalClass *lexClasses;
+	size_t nClasses;
+
+public:
+	const char *languageName;
+	LexerModule(
+		int language_,
+		LexerFunction fnLexer_,
+		const char *languageName_=nullptr,
+		LexerFunction fnFolder_= nullptr,
+		const char * const wordListDescriptions_[]=nullptr,
+		const LexicalClass *lexClasses_=nullptr,
+		size_t nClasses_=0) noexcept;
+	LexerModule(
+		int language_,
+		LexerFactoryFunction fnFactory_,
+		const char *languageName_,
+		const char * const wordListDescriptions_[]=nullptr) noexcept;
+	int GetLanguage() const noexcept;
+
+	// -1 is returned if no WordList information is available
+	int GetNumWordLists() const noexcept;
+	const char *GetWordListDescription(int index) const noexcept;
+	const LexicalClass *LexClasses() const noexcept;
+	size_t NamedStyles() const noexcept;
+
+	Scintilla::ILexer5 *Create() const;
+
+	void Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+                  WordList *keywordlists[], Accessor &styler) const;
+	void Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle,
+                  WordList *keywordlists[], Accessor &styler) const;
+
+	friend class CatalogueModules;
+};
+
+constexpr int Maximum(int a, int b) noexcept {
+	return (a > b) ? a : b;
+}
+
+// Shut up annoying Visual C++ warnings:
+#ifdef _MSC_VER
+#pragma warning(disable: 4244 4456 4457)
+#endif
+
+// Turn off shadow warnings for lexers as may be maintained by others
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+// Clang doesn't like omitting braces in array initialization but they just add
+// noise to LexicalClass arrays in lexers
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wmissing-braces"
+#endif
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/LexerNoExceptions.cxx b/scite-app/lexilla/lexlib/LexerNoExceptions.cxx
new file mode 100644
index 0000000..d4c2857
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerNoExceptions.cxx
@@ -0,0 +1,65 @@
+// Scintilla source code edit control
+/** @file LexerNoExceptions.cxx
+ ** A simple lexer with no state which does not throw exceptions so can be used in an external lexer.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+#include "LexerNoExceptions.h"
+
+using namespace Lexilla;
+
+Sci_Position SCI_METHOD LexerNoExceptions::PropertySet(const char *key, const char *val) {
+	try {
+		return LexerBase::PropertySet(key, val);
+	} catch (...) {
+		// Should not throw into caller as may be compiled with different compiler or options
+	}
+	return -1;
+}
+
+Sci_Position SCI_METHOD LexerNoExceptions::WordListSet(int n, const char *wl) {
+	try {
+		return LexerBase::WordListSet(n, wl);
+	} catch (...) {
+		// Should not throw into caller as may be compiled with different compiler or options
+	}
+	return -1;
+}
+
+void SCI_METHOD LexerNoExceptions::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) {
+	try {
+		Accessor astyler(pAccess, &props);
+		Lexer(startPos, lengthDoc, initStyle, pAccess, astyler);
+		astyler.Flush();
+	} catch (...) {
+		// Should not throw into caller as may be compiled with different compiler or options
+		pAccess->SetErrorStatus(SC_STATUS_FAILURE);
+	}
+}
+void SCI_METHOD LexerNoExceptions::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) {
+	try {
+		Accessor astyler(pAccess, &props);
+		Folder(startPos, lengthDoc, initStyle, pAccess, astyler);
+		astyler.Flush();
+	} catch (...) {
+		// Should not throw into caller as may be compiled with different compiler or options
+		pAccess->SetErrorStatus(SC_STATUS_FAILURE);
+	}
+}
diff --git a/scite-app/lexilla/lexlib/LexerNoExceptions.h b/scite-app/lexilla/lexlib/LexerNoExceptions.h
new file mode 100644
index 0000000..6b3a85a
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerNoExceptions.h
@@ -0,0 +1,28 @@
+// Scintilla source code edit control
+/** @file LexerNoExceptions.h
+ ** A simple lexer with no state.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXERNOEXCEPTIONS_H
+#define LEXERNOEXCEPTIONS_H
+
+namespace Lexilla {
+
+// A simple lexer with no state
+class LexerNoExceptions : public LexerBase {
+public:
+	// TODO Also need to prevent exceptions in constructor and destructor
+	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *) override;
+
+	virtual void Lexer(Sci_PositionU startPos, Sci_Position length, int initStyle, Scintilla::IDocument *pAccess, Accessor &styler) = 0;
+	virtual void Folder(Sci_PositionU startPos, Sci_Position length, int initStyle, Scintilla::IDocument *pAccess, Accessor &styler) = 0;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/LexerSimple.cxx b/scite-app/lexilla/lexlib/LexerSimple.cxx
new file mode 100644
index 0000000..2cbb133
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerSimple.cxx
@@ -0,0 +1,62 @@
+// Scintilla source code edit control
+/** @file LexerSimple.cxx
+ ** A simple lexer with no state.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+#include "LexerSimple.h"
+
+using namespace Lexilla;
+
+LexerSimple::LexerSimple(const LexerModule *module_) :
+	LexerBase(module_->LexClasses(), module_->NamedStyles()),
+	module(module_) {
+	for (int wl = 0; wl < module->GetNumWordLists(); wl++) {
+		if (!wordLists.empty())
+			wordLists += "\n";
+		wordLists += module->GetWordListDescription(wl);
+	}
+}
+
+const char * SCI_METHOD LexerSimple::DescribeWordListSets() {
+	return wordLists.c_str();
+}
+
+void SCI_METHOD LexerSimple::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) {
+	Accessor astyler(pAccess, &props);
+	module->Lex(startPos, lengthDoc, initStyle, keyWordLists, astyler);
+	astyler.Flush();
+}
+
+void SCI_METHOD LexerSimple::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) {
+	if (props.GetInt("fold")) {
+		Accessor astyler(pAccess, &props);
+		module->Fold(startPos, lengthDoc, initStyle, keyWordLists, astyler);
+		astyler.Flush();
+	}
+}
+
+const char * SCI_METHOD LexerSimple::GetName() {
+	return module->languageName;
+}
+
+int SCI_METHOD LexerSimple::GetIdentifier() {
+	return module->GetLanguage();
+}
diff --git a/scite-app/lexilla/lexlib/LexerSimple.h b/scite-app/lexilla/lexlib/LexerSimple.h
new file mode 100644
index 0000000..a1d1b29
--- /dev/null
+++ b/scite-app/lexilla/lexlib/LexerSimple.h
@@ -0,0 +1,29 @@
+// Scintilla source code edit control
+/** @file LexerSimple.h
+ ** A simple lexer with no state.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LEXERSIMPLE_H
+#define LEXERSIMPLE_H
+
+namespace Lexilla {
+
+// A simple lexer with no state
+class LexerSimple : public LexerBase {
+	const LexerModule *module;
+	std::string wordLists;
+public:
+	explicit LexerSimple(const LexerModule *module_);
+	const char * SCI_METHOD DescribeWordListSets() override;
+	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override;
+	// ILexer5 methods
+	const char * SCI_METHOD GetName() override;
+	int SCI_METHOD  GetIdentifier() override;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/OptionSet.h b/scite-app/lexilla/lexlib/OptionSet.h
new file mode 100644
index 0000000..1c5c2ec
--- /dev/null
+++ b/scite-app/lexilla/lexlib/OptionSet.h
@@ -0,0 +1,149 @@
+// Scintilla source code edit control
+/** @file OptionSet.h
+ ** Manage descriptive information about an options struct for a lexer.
+ ** Hold the names, positions, and descriptions of boolean, integer and string options and
+ ** allow setting options and retrieving metadata about the options.
+ **/
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef OPTIONSET_H
+#define OPTIONSET_H
+
+namespace Lexilla {
+
+template <typename T>
+class OptionSet {
+	typedef T Target;
+	typedef bool T::*plcob;
+	typedef int T::*plcoi;
+	typedef std::string T::*plcos;
+	struct Option {
+		int opType;
+		union {
+			plcob pb;
+			plcoi pi;
+			plcos ps;
+		};
+		std::string value;
+		std::string description;
+		Option() :
+			opType(SC_TYPE_BOOLEAN), pb(0), description("") {
+		}
+		Option(plcob pb_, std::string description_="") :
+			opType(SC_TYPE_BOOLEAN), pb(pb_), description(description_) {
+		}
+		Option(plcoi pi_, std::string description_) :
+			opType(SC_TYPE_INTEGER), pi(pi_), description(description_) {
+		}
+		Option(plcos ps_, std::string description_) :
+			opType(SC_TYPE_STRING), ps(ps_), description(description_) {
+		}
+		bool Set(T *base, const char *val) {
+			value = val;
+			switch (opType) {
+			case SC_TYPE_BOOLEAN: {
+					bool option = atoi(val) != 0;
+					if ((*base).*pb != option) {
+						(*base).*pb = option;
+						return true;
+					}
+					break;
+				}
+			case SC_TYPE_INTEGER: {
+					int option = atoi(val);
+					if ((*base).*pi != option) {
+						(*base).*pi = option;
+						return true;
+					}
+					break;
+				}
+			case SC_TYPE_STRING: {
+					if ((*base).*ps != val) {
+						(*base).*ps = val;
+						return true;
+					}
+					break;
+				}
+			}
+			return false;
+		}
+		const char *Get() const noexcept {
+			return value.c_str();
+		}
+	};
+	typedef std::map<std::string, Option, std::less<>> OptionMap;
+	OptionMap nameToDef;
+	std::string names;
+	std::string wordLists;
+
+	void AppendName(const char *name) {
+		if (!names.empty())
+			names += "\n";
+		names += name;
+	}
+public:
+	void DefineProperty(const char *name, plcob pb, std::string description="") {
+		nameToDef[name] = Option(pb, description);
+		AppendName(name);
+	}
+	void DefineProperty(const char *name, plcoi pi, std::string description="") {
+		nameToDef[name] = Option(pi, description);
+		AppendName(name);
+	}
+	void DefineProperty(const char *name, plcos ps, std::string description="") {
+		nameToDef[name] = Option(ps, description);
+		AppendName(name);
+	}
+	const char *PropertyNames() const noexcept {
+		return names.c_str();
+	}
+	int PropertyType(const char *name) {
+		typename OptionMap::iterator it = nameToDef.find(name);
+		if (it != nameToDef.end()) {
+			return it->second.opType;
+		}
+		return SC_TYPE_BOOLEAN;
+	}
+	const char *DescribeProperty(const char *name) {
+		typename OptionMap::iterator it = nameToDef.find(name);
+		if (it != nameToDef.end()) {
+			return it->second.description.c_str();
+		}
+		return "";
+	}
+
+	bool PropertySet(T *base, const char *name, const char *val) {
+		typename OptionMap::iterator it = nameToDef.find(name);
+		if (it != nameToDef.end()) {
+			return it->second.Set(base, val);
+		}
+		return false;
+	}
+
+	const char *PropertyGet(const char *name) {
+		typename OptionMap::iterator it = nameToDef.find(name);
+		if (it != nameToDef.end()) {
+			return it->second.Get();
+		}
+		return nullptr;
+	}
+
+	void DefineWordListSets(const char * const wordListDescriptions[]) {
+		if (wordListDescriptions) {
+			for (size_t wl = 0; wordListDescriptions[wl]; wl++) {
+				if (!wordLists.empty())
+					wordLists += "\n";
+				wordLists += wordListDescriptions[wl];
+			}
+		}
+	}
+
+	const char *DescribeWordListSets() const noexcept {
+		return wordLists.c_str();
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/PropSetSimple.cxx b/scite-app/lexilla/lexlib/PropSetSimple.cxx
new file mode 100644
index 0000000..903d979
--- /dev/null
+++ b/scite-app/lexilla/lexlib/PropSetSimple.cxx
@@ -0,0 +1,75 @@
+// Scintilla source code edit control
+/** @file PropSetSimple.cxx
+ ** A basic string to string map.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// Maintain a dictionary of properties
+
+#include <cstdlib>
+#include <cstring>
+
+#include <string>
+#include <string_view>
+#include <map>
+#include <functional>
+
+#include "PropSetSimple.h"
+
+using namespace Lexilla;
+
+namespace {
+
+typedef std::map<std::string, std::string, std::less<>> mapss;
+
+mapss *PropsFromPointer(void *impl) noexcept {
+	return static_cast<mapss *>(impl);
+}
+
+}
+
+PropSetSimple::PropSetSimple() {
+	mapss *props = new mapss;
+	impl = static_cast<void *>(props);
+}
+
+PropSetSimple::~PropSetSimple() {
+	mapss *props = PropsFromPointer(impl);
+	delete props;
+	impl = nullptr;
+}
+
+bool PropSetSimple::Set(std::string_view key, std::string_view val) {
+	mapss *props = PropsFromPointer(impl);
+	if (!props)
+		return false;
+	mapss::iterator it = props->find(key);
+	if (it != props->end()) {
+		if (val == it->second)
+			return false;
+		it->second = val;
+	} else {
+		props->emplace(key, val);
+	}
+	return true;
+}
+
+const char *PropSetSimple::Get(std::string_view key) const {
+	mapss *props = PropsFromPointer(impl);
+	if (props) {
+		mapss::const_iterator keyPos = props->find(key);
+		if (keyPos != props->end()) {
+			return keyPos->second.c_str();
+		}
+	}
+	return "";
+}
+
+int PropSetSimple::GetInt(std::string_view key, int defaultValue) const {
+	const char *val = Get(key);
+	if (*val) {
+		return atoi(val);
+	}
+	return defaultValue;
+}
diff --git a/scite-app/lexilla/lexlib/PropSetSimple.h b/scite-app/lexilla/lexlib/PropSetSimple.h
new file mode 100644
index 0000000..c5d85f6
--- /dev/null
+++ b/scite-app/lexilla/lexlib/PropSetSimple.h
@@ -0,0 +1,31 @@
+// Scintilla source code edit control
+/** @file PropSetSimple.h
+ ** A basic string to string map.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PROPSETSIMPLE_H
+#define PROPSETSIMPLE_H
+
+namespace Lexilla {
+
+class PropSetSimple {
+	void *impl;
+public:
+	PropSetSimple();
+	// Deleted so PropSetSimple objects can not be copied.
+	PropSetSimple(const PropSetSimple&) = delete;
+	PropSetSimple(PropSetSimple&&) = delete;
+	PropSetSimple &operator=(const PropSetSimple&) = delete;
+	PropSetSimple &operator=(PropSetSimple&&) = delete;
+	virtual ~PropSetSimple();
+
+	bool Set(std::string_view key, std::string_view val);
+	const char *Get(std::string_view key) const;
+	int GetInt(std::string_view key, int defaultValue=0) const;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/SparseState.h b/scite-app/lexilla/lexlib/SparseState.h
new file mode 100644
index 0000000..592b333
--- /dev/null
+++ b/scite-app/lexilla/lexlib/SparseState.h
@@ -0,0 +1,106 @@
+// Scintilla source code edit control
+/** @file SparseState.h
+ ** Hold lexer state that may change rarely.
+ ** This is often per-line state such as whether a particular type of section has been entered.
+ ** A state continues until it is changed.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SPARSESTATE_H
+#define SPARSESTATE_H
+
+namespace Lexilla {
+
+template <typename T>
+class SparseState {
+	struct State {
+		Sci_Position position;
+		T value;
+		constexpr State(Sci_Position position_, T value_) noexcept : position(position_), value(value_) {
+		}
+		inline bool operator<(const State &other) const noexcept {
+			return position < other.position;
+		}
+		inline bool operator==(const State &other) const noexcept {
+			return (position == other.position) && (value == other.value);
+		}
+	};
+	Sci_Position positionFirst;
+	typedef std::vector<State> stateVector;
+	stateVector states;
+
+	typename stateVector::iterator Find(Sci_Position position) {
+		const State searchValue(position, T());
+		return std::lower_bound(states.begin(), states.end(), searchValue);
+	}
+
+public:
+	explicit SparseState(Sci_Position positionFirst_=-1) {
+		positionFirst = positionFirst_;
+	}
+	void Set(Sci_Position position, T value) {
+		Delete(position);
+		if (states.empty() || (value != states[states.size()-1].value)) {
+			states.push_back(State(position, value));
+		}
+	}
+	T ValueAt(Sci_Position position) {
+		if (states.empty())
+			return T();
+		if (position < states[0].position)
+			return T();
+		typename stateVector::iterator low = Find(position);
+		if (low == states.end()) {
+			return states[states.size()-1].value;
+		} else {
+			if (low->position > position) {
+				--low;
+			}
+			return low->value;
+		}
+	}
+	bool Delete(Sci_Position position) {
+		typename stateVector::iterator low = Find(position);
+		if (low != states.end()) {
+			states.erase(low, states.end());
+			return true;
+		}
+		return false;
+	}
+	size_t size() const {
+		return states.size();
+	}
+
+	// Returns true if Merge caused a significant change
+	bool Merge(const SparseState<T> &other, Sci_Position ignoreAfter) {
+		// Changes caused beyond ignoreAfter are not significant
+		Delete(ignoreAfter+1);
+
+		bool different = true;
+		bool changed = false;
+		typename stateVector::iterator low = Find(other.positionFirst);
+		if (static_cast<size_t>(states.end() - low) == other.states.size()) {
+			// Same number in other as after positionFirst in this
+			different = !std::equal(low, states.end(), other.states.begin());
+		}
+		if (different) {
+			if (low != states.end()) {
+				states.erase(low, states.end());
+				changed = true;
+			}
+			typename stateVector::const_iterator startOther = other.states.begin();
+			if (!states.empty() && !other.states.empty() && states.back().value == startOther->value)
+				++startOther;
+			if (startOther != other.states.end()) {
+				states.insert(states.end(), startOther, other.states.end());
+				changed = true;
+			}
+		}
+		return changed;
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/StringCopy.h b/scite-app/lexilla/lexlib/StringCopy.h
new file mode 100644
index 0000000..01f30ba
--- /dev/null
+++ b/scite-app/lexilla/lexlib/StringCopy.h
@@ -0,0 +1,32 @@
+// Scintilla source code edit control
+/** @file StringCopy.h
+ ** Safe string copy function which always NUL terminates.
+ ** ELEMENTS macro for determining array sizes.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STRINGCOPY_H
+#define STRINGCOPY_H
+
+namespace Lexilla {
+
+// Safer version of string copy functions like strcpy, wcsncpy, etc.
+// Instantiate over fixed length strings of both char and wchar_t.
+// May truncate if source doesn't fit into dest with room for NUL.
+
+template <typename T, size_t count>
+void StringCopy(T (&dest)[count], const T* source) {
+	for (size_t i=0; i<count; i++) {
+		dest[i] = source[i];
+		if (!source[i])
+			break;
+	}
+	dest[count-1] = 0;
+}
+
+#define ELEMENTS(a) (sizeof(a) / sizeof(a[0]))
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/StyleContext.cxx b/scite-app/lexilla/lexlib/StyleContext.cxx
new file mode 100644
index 0000000..e7b5719
--- /dev/null
+++ b/scite-app/lexilla/lexlib/StyleContext.cxx
@@ -0,0 +1,45 @@
+// Scintilla source code edit control
+/** @file StyleContext.cxx
+ ** Lexer infrastructure.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// This file is in the public domain.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string>
+#include <string_view>
+
+#include "ILexer.h"
+
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+
+using namespace Lexilla;
+
+bool StyleContext::MatchIgnoreCase(const char *s) {
+	if (MakeLowerCase(ch) != static_cast<unsigned char>(*s))
+		return false;
+	s++;
+	if (MakeLowerCase(chNext) != static_cast<unsigned char>(*s))
+		return false;
+	s++;
+	for (int n = 2; *s; n++) {
+		if (*s !=
+			MakeLowerCase(styler.SafeGetCharAt(currentPos + n, 0)))
+			return false;
+		s++;
+	}
+	return true;
+}
+
+void StyleContext::GetCurrent(char *s, Sci_PositionU len) {
+	styler.GetRange(styler.GetStartSegment(), currentPos, s, len);
+}
+
+void StyleContext::GetCurrentLowered(char *s, Sci_PositionU len) {
+	styler.GetRangeLowered(styler.GetStartSegment(), currentPos, s, len);
+}
diff --git a/scite-app/lexilla/lexlib/StyleContext.h b/scite-app/lexilla/lexlib/StyleContext.h
new file mode 100644
index 0000000..a6c6f9f
--- /dev/null
+++ b/scite-app/lexilla/lexlib/StyleContext.h
@@ -0,0 +1,219 @@
+// Scintilla source code edit control
+/** @file StyleContext.h
+ ** Lexer infrastructure.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// This file is in the public domain.
+
+#ifndef STYLECONTEXT_H
+#define STYLECONTEXT_H
+
+namespace Lexilla {
+
+// All languages handled so far can treat all characters >= 0x80 as one class
+// which just continues the current token or starts an identifier if in default.
+// DBCS treated specially as the second character can be < 0x80 and hence
+// syntactically significant. UTF-8 avoids this as all trail bytes are >= 0x80
+class StyleContext {
+	LexAccessor &styler;
+	Scintilla::IDocument *multiByteAccess;
+	Sci_PositionU endPos;
+	Sci_PositionU lengthDocument;
+
+	// Used for optimizing GetRelativeCharacter
+	Sci_PositionU posRelative;
+	Sci_PositionU currentPosLastRelative;
+	Sci_Position offsetRelative;
+
+	void GetNextChar() {
+		if (multiByteAccess) {
+			chNext = multiByteAccess->GetCharacterAndWidth(currentPos+width, &widthNext);
+		} else {
+			chNext = static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+width, 0));
+			widthNext = 1;
+		}
+		// End of line determined from line end position, allowing CR, LF,
+		// CRLF and Unicode line ends as set by document.
+		if (currentLine < lineDocEnd)
+			atLineEnd = static_cast<Sci_Position>(currentPos) >= (lineStartNext-1);
+		else // Last line
+			atLineEnd = static_cast<Sci_Position>(currentPos) >= lineStartNext;
+	}
+
+public:
+	Sci_PositionU currentPos;
+	Sci_Position currentLine;
+	Sci_Position lineDocEnd;
+	Sci_Position lineEnd;
+	Sci_Position lineStartNext;
+	bool atLineStart;
+	bool atLineEnd;
+	int state;
+	int chPrev;
+	int ch;
+	Sci_Position width;
+	int chNext;
+	Sci_Position widthNext;
+
+	StyleContext(Sci_PositionU startPos, Sci_PositionU length,
+                        int initStyle, LexAccessor &styler_, char chMask='\377') :
+		styler(styler_),
+		multiByteAccess(nullptr),
+		endPos(startPos + length),
+		posRelative(0),
+		currentPosLastRelative(0x7FFFFFFF),
+		offsetRelative(0),
+		currentPos(startPos),
+		currentLine(-1),
+		lineEnd(-1),
+		lineStartNext(-1),
+		atLineEnd(false),
+		state(initStyle & chMask), // Mask off all bits which aren't in the chMask.
+		chPrev(0),
+		ch(0),
+		width(0),
+		chNext(0),
+		widthNext(1) {
+		if (styler.Encoding() != EncodingType::eightBit) {
+			multiByteAccess = styler.MultiByteAccess();
+		}
+		styler.StartAt(startPos /*, chMask*/);
+		styler.StartSegment(startPos);
+		currentLine = styler.GetLine(startPos);
+		lineEnd = styler.LineEnd(currentLine);
+		lineStartNext = styler.LineStart(currentLine+1);
+		lengthDocument = static_cast<Sci_PositionU>(styler.Length());
+		if (endPos == lengthDocument)
+			endPos++;
+		lineDocEnd = styler.GetLine(lengthDocument);
+		atLineStart = static_cast<Sci_PositionU>(styler.LineStart(currentLine)) == startPos;
+
+		// Variable width is now 0 so GetNextChar gets the char at currentPos into chNext/widthNext
+		width = 0;
+		GetNextChar();
+		ch = chNext;
+		width = widthNext;
+
+		GetNextChar();
+	}
+	// Deleted so StyleContext objects can not be copied.
+	StyleContext(const StyleContext &) = delete;
+	StyleContext &operator=(const StyleContext &) = delete;
+	void Complete() {
+		styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state);
+		styler.Flush();
+	}
+	bool More() const noexcept {
+		return currentPos < endPos;
+	}
+	void Forward() {
+		if (currentPos < endPos) {
+			atLineStart = atLineEnd;
+			if (atLineStart) {
+				currentLine++;
+				lineEnd = styler.LineEnd(currentLine);
+				lineStartNext = styler.LineStart(currentLine+1);
+			}
+			chPrev = ch;
+			currentPos += width;
+			ch = chNext;
+			width = widthNext;
+			GetNextChar();
+		} else {
+			atLineStart = false;
+			chPrev = ' ';
+			ch = ' ';
+			chNext = ' ';
+			atLineEnd = true;
+		}
+	}
+	void Forward(Sci_Position nb) {
+		for (Sci_Position i = 0; i < nb; i++) {
+			Forward();
+		}
+	}
+	void ForwardBytes(Sci_Position nb) {
+		const Sci_PositionU forwardPos = currentPos + nb;
+		while (forwardPos > currentPos) {
+			const Sci_PositionU currentPosStart = currentPos;
+			Forward();
+			if (currentPos == currentPosStart) {
+				// Reached end
+				return;
+			}
+		}
+	}
+	void ChangeState(int state_) noexcept {
+		state = state_;
+	}
+	void SetState(int state_) {
+		styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state);
+		state = state_;
+	}
+	void ForwardSetState(int state_) {
+		Forward();
+		styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state);
+		state = state_;
+	}
+	Sci_Position LengthCurrent() const {
+		return currentPos - styler.GetStartSegment();
+	}
+	int GetRelative(Sci_Position n, char chDefault='\0') {
+		return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos+n, chDefault));
+	}
+	int GetRelativeCharacter(Sci_Position n) {
+		if (n == 0)
+			return ch;
+		if (multiByteAccess) {
+			if ((currentPosLastRelative != currentPos) ||
+				((n > 0) && ((offsetRelative < 0) || (n < offsetRelative))) ||
+				((n < 0) && ((offsetRelative > 0) || (n > offsetRelative)))) {
+				posRelative = currentPos;
+				offsetRelative = 0;
+			}
+			const Sci_Position diffRelative = n - offsetRelative;
+			const Sci_Position posNew = multiByteAccess->GetRelativePosition(posRelative, diffRelative);
+			const int chReturn = multiByteAccess->GetCharacterAndWidth(posNew, nullptr);
+			posRelative = posNew;
+			currentPosLastRelative = currentPos;
+			offsetRelative = n;
+			return chReturn;
+		} else {
+			// fast version for single byte encodings
+			return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos + n, 0));
+		}
+	}
+	bool MatchLineEnd() const noexcept {
+		return static_cast<Sci_Position>(currentPos) == lineEnd;
+	}
+	bool Match(char ch0) const {
+		return ch == static_cast<unsigned char>(ch0);
+	}
+	bool Match(char ch0, char ch1) const {
+		return (ch == static_cast<unsigned char>(ch0)) && (chNext == static_cast<unsigned char>(ch1));
+	}
+	bool Match(const char *s) {
+		if (ch != static_cast<unsigned char>(*s))
+			return false;
+		s++;
+		if (!*s)
+			return true;
+		if (chNext != static_cast<unsigned char>(*s))
+			return false;
+		s++;
+		for (int n=2; *s; n++) {
+			if (*s != styler.SafeGetCharAt(currentPos+n, 0))
+				return false;
+			s++;
+		}
+		return true;
+	}
+	// Non-inline
+	bool MatchIgnoreCase(const char *s);
+	void GetCurrent(char *s, Sci_PositionU len);
+	void GetCurrentLowered(char *s, Sci_PositionU len);
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/SubStyles.h b/scite-app/lexilla/lexlib/SubStyles.h
new file mode 100644
index 0000000..049039e
--- /dev/null
+++ b/scite-app/lexilla/lexlib/SubStyles.h
@@ -0,0 +1,212 @@
+// Scintilla source code edit control
+/** @file SubStyles.h
+ ** Manage substyles for a lexer.
+ **/
+// Copyright 2012 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SUBSTYLES_H
+#define SUBSTYLES_H
+
+namespace Lexilla {
+
+class WordClassifier {
+	int baseStyle;
+	int firstStyle;
+	int lenStyles;
+	using WordStyleMap = std::map<std::string, int, std::less<>>;
+	WordStyleMap wordToStyle;
+
+public:
+
+	explicit WordClassifier(int baseStyle_) : baseStyle(baseStyle_), firstStyle(0), lenStyles(0) {
+	}
+
+	void Allocate(int firstStyle_, int lenStyles_) {
+		firstStyle = firstStyle_;
+		lenStyles = lenStyles_;
+		wordToStyle.clear();
+	}
+
+	int Base() const noexcept {
+		return baseStyle;
+	}
+
+	int Start() const noexcept {
+		return firstStyle;
+	}
+
+	int Last() const noexcept {
+		return firstStyle + lenStyles - 1;
+	}
+
+	int Length() const noexcept {
+		return lenStyles;
+	}
+
+	void Clear() noexcept {
+		firstStyle = 0;
+		lenStyles = 0;
+		wordToStyle.clear();
+	}
+
+	int ValueFor(std::string_view s) const {
+		WordStyleMap::const_iterator it = wordToStyle.find(s);
+		if (it != wordToStyle.end())
+			return it->second;
+		else
+			return -1;
+	}
+
+	bool IncludesStyle(int style) const noexcept {
+		return (style >= firstStyle) && (style < (firstStyle + lenStyles));
+	}
+
+	void RemoveStyle(int style) noexcept {
+		WordStyleMap::iterator it = wordToStyle.begin();
+		while (it != wordToStyle.end()) {
+			if (it->second == style) {
+				it = wordToStyle.erase(it);
+			} else {
+				++it;
+			}
+		}
+	}
+
+	void SetIdentifiers(int style, const char *identifiers) {
+		RemoveStyle(style);
+		if (!identifiers)
+			return;
+		while (*identifiers) {
+			const char *cpSpace = identifiers;
+			while (*cpSpace && !(*cpSpace == ' ' || *cpSpace == '\t' || *cpSpace == '\r' || *cpSpace == '\n'))
+				cpSpace++;
+			if (cpSpace > identifiers) {
+				std::string word(identifiers, cpSpace - identifiers);
+				wordToStyle[word] = style;
+			}
+			identifiers = cpSpace;
+			if (*identifiers)
+				identifiers++;
+		}
+	}
+};
+
+class SubStyles {
+	int classifications;
+	const char *baseStyles;
+	int styleFirst;
+	int stylesAvailable;
+	int secondaryDistance;
+	int allocated;
+	std::vector<WordClassifier> classifiers;
+
+	int BlockFromBaseStyle(int baseStyle) const noexcept {
+		for (int b=0; b < classifications; b++) {
+			if (baseStyle == baseStyles[b])
+				return b;
+		}
+		return -1;
+	}
+
+	int BlockFromStyle(int style) const noexcept {
+		int b = 0;
+		for (const WordClassifier &wc : classifiers) {
+			if (wc.IncludesStyle(style))
+				return b;
+			b++;
+		}
+		return -1;
+	}
+
+public:
+
+	SubStyles(const char *baseStyles_, int styleFirst_, int stylesAvailable_, int secondaryDistance_) :
+		classifications(0),
+		baseStyles(baseStyles_),
+		styleFirst(styleFirst_),
+		stylesAvailable(stylesAvailable_),
+		secondaryDistance(secondaryDistance_),
+		allocated(0) {
+		while (baseStyles[classifications]) {
+			classifiers.push_back(WordClassifier(baseStyles[classifications]));
+			classifications++;
+		}
+	}
+
+	int Allocate(int styleBase, int numberStyles) {
+		const int block = BlockFromBaseStyle(styleBase);
+		if (block >= 0) {
+			if ((allocated + numberStyles) > stylesAvailable)
+				return -1;
+			const int startBlock = styleFirst + allocated;
+			allocated += numberStyles;
+			classifiers[block].Allocate(startBlock, numberStyles);
+			return startBlock;
+		} else {
+			return -1;
+		}
+	}
+
+	int Start(int styleBase) noexcept {
+		const int block = BlockFromBaseStyle(styleBase);
+		return (block >= 0) ? classifiers[block].Start() : -1;
+	}
+
+	int Length(int styleBase) noexcept {
+		const int block = BlockFromBaseStyle(styleBase);
+		return (block >= 0) ? classifiers[block].Length() : 0;
+	}
+
+	int BaseStyle(int subStyle) const noexcept {
+		const int block = BlockFromStyle(subStyle);
+		if (block >= 0)
+			return classifiers[block].Base();
+		else
+			return subStyle;
+	}
+
+	int DistanceToSecondaryStyles() const noexcept {
+		return secondaryDistance;
+	}
+
+	int FirstAllocated() const noexcept {
+		int start = 257;
+		for (const WordClassifier &wc : classifiers) {
+			if ((wc.Length() > 0) && (start > wc.Start()))
+				start = wc.Start();
+		}
+		return (start < 256) ? start : -1;
+	}
+
+	int LastAllocated() const noexcept {
+		int last = -1;
+		for (const WordClassifier &wc : classifiers) {
+			if ((wc.Length() > 0) && (last < wc.Last()))
+				last = wc.Last();
+		}
+		return last;
+	}
+
+	void SetIdentifiers(int style, const char *identifiers) {
+		const int block = BlockFromStyle(style);
+		if (block >= 0)
+			classifiers[block].SetIdentifiers(style, identifiers);
+	}
+
+	void Free() noexcept {
+		allocated = 0;
+		for (WordClassifier &wc : classifiers) {
+			wc.Clear();
+		}
+	}
+
+	const WordClassifier &Classifier(int baseStyle) const noexcept {
+		const int block = BlockFromBaseStyle(baseStyle);
+		return classifiers[block >= 0 ? block : 0];
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/lexlib/WordList.cxx b/scite-app/lexilla/lexlib/WordList.cxx
new file mode 100644
index 0000000..4676717
--- /dev/null
+++ b/scite-app/lexilla/lexlib/WordList.cxx
@@ -0,0 +1,315 @@
+// Scintilla source code edit control
+/** @file WordList.cxx
+ ** Hold a list of words.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <algorithm>
+#include <iterator>
+
+#include "WordList.h"
+
+using namespace Lexilla;
+
+/**
+ * Creates an array that points into each word in the string and puts \0 terminators
+ * after each word.
+ */
+static char **ArrayFromWordList(char *wordlist, size_t slen, int *len, bool onlyLineEnds = false) {
+	int prev = '\n';
+	int words = 0;
+	// For rapid determination of whether a character is a separator, build
+	// a look up table.
+	bool wordSeparator[256] = {};	// Initialise all to false.
+	wordSeparator[static_cast<unsigned int>('\r')] = true;
+	wordSeparator[static_cast<unsigned int>('\n')] = true;
+	if (!onlyLineEnds) {
+		wordSeparator[static_cast<unsigned int>(' ')] = true;
+		wordSeparator[static_cast<unsigned int>('\t')] = true;
+	}
+	for (int j = 0; wordlist[j]; j++) {
+		const int curr = static_cast<unsigned char>(wordlist[j]);
+		if (!wordSeparator[curr] && wordSeparator[prev])
+			words++;
+		prev = curr;
+	}
+	char **keywords = new char *[words + 1];
+	int wordsStore = 0;
+	if (words) {
+		prev = '\0';
+		for (size_t k = 0; k < slen; k++) {
+			if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) {
+				if (!prev) {
+					keywords[wordsStore] = &wordlist[k];
+					wordsStore++;
+				}
+			} else {
+				wordlist[k] = '\0';
+			}
+			prev = wordlist[k];
+		}
+	}
+	assert(wordsStore < (words + 1));
+	keywords[wordsStore] = &wordlist[slen];
+	*len = wordsStore;
+	return keywords;
+}
+
+WordList::WordList(bool onlyLineEnds_) :
+	words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) {
+	// Prevent warnings by static analyzers about uninitialized starts.
+	starts[0] = -1;
+}
+
+WordList::~WordList() {
+	Clear();
+}
+
+WordList::operator bool() const noexcept {
+	return len ? true : false;
+}
+
+bool WordList::operator!=(const WordList &other) const noexcept {
+	if (len != other.len)
+		return true;
+	for (int i=0; i<len; i++) {
+		if (strcmp(words[i], other.words[i]) != 0)
+			return true;
+	}
+	return false;
+}
+
+int WordList::Length() const noexcept {
+	return len;
+}
+
+void WordList::Clear() noexcept {
+	if (words) {
+		delete []list;
+		delete []words;
+	}
+	words = nullptr;
+	list = nullptr;
+	len = 0;
+}
+
+#ifdef _MSC_VER
+
+static bool cmpWords(const char *a, const char *b) {
+	return strcmp(a, b) < 0;
+}
+
+#else
+
+static int cmpWords(const void *a, const void *b) {
+	return strcmp(*static_cast<const char * const *>(a), *static_cast<const char * const *>(b));
+}
+
+static void SortWordList(char **words, unsigned int len) {
+	qsort(words, len, sizeof(*words), cmpWords);
+}
+
+#endif
+
+bool WordList::Set(const char *s) {
+	const size_t lenS = strlen(s) + 1;
+	char *listTemp = new char[lenS];
+	memcpy(listTemp, s, lenS);
+	int lenTemp = 0;
+	char **wordsTemp = ArrayFromWordList(listTemp, lenS - 1, &lenTemp, onlyLineEnds);
+#ifdef _MSC_VER
+	std::sort(wordsTemp, wordsTemp + lenTemp, cmpWords);
+#else
+	SortWordList(wordsTemp, lenTemp);
+#endif
+
+	if (lenTemp == len) {
+		bool changed = false;
+		for (int i = 0; i < lenTemp; i++) {
+			if (strcmp(words[i], wordsTemp[i]) != 0) {
+				changed = true;
+				break;
+			}
+		}
+		if (!changed) {
+			delete []listTemp;
+			delete []wordsTemp;
+			return false;
+		}
+	}
+
+	Clear();
+	words = wordsTemp;
+	list = listTemp;
+	len = lenTemp;
+	std::fill(starts, std::end(starts), -1);
+	for (int l = len - 1; l >= 0; l--) {
+		unsigned char indexChar = words[l][0];
+		starts[indexChar] = l;
+	}
+	return true;
+}
+
+/** Check whether a string is in the list.
+ * List elements are either exact matches or prefixes.
+ * Prefix elements start with '^' and match all strings that start with the rest of the element
+ * so '^GTK_' matches 'GTK_X', 'GTK_MAJOR_VERSION', and 'GTK_'.
+ */
+bool WordList::InList(const char *s) const noexcept {
+	if (0 == words)
+		return false;
+	const unsigned char firstChar = s[0];
+	int j = starts[firstChar];
+	if (j >= 0) {
+		while (words[j][0] == firstChar) {
+			if (s[1] == words[j][1]) {
+				const char *a = words[j] + 1;
+				const char *b = s + 1;
+				while (*a && *a == *b) {
+					a++;
+					b++;
+				}
+				if (!*a && !*b)
+					return true;
+			}
+			j++;
+		}
+	}
+	j = starts[static_cast<unsigned int>('^')];
+	if (j >= 0) {
+		while (words[j][0] == '^') {
+			const char *a = words[j] + 1;
+			const char *b = s;
+			while (*a && *a == *b) {
+				a++;
+				b++;
+			}
+			if (!*a)
+				return true;
+			j++;
+		}
+	}
+	return false;
+}
+
+/** 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.
+ * The marker is ~ in this case.
+ */
+bool WordList::InListAbbreviated(const char *s, const char marker) const noexcept {
+	if (0 == words)
+		return false;
+	const unsigned char firstChar = s[0];
+	int j = starts[firstChar];
+	if (j >= 0) {
+		while (words[j][0] == firstChar) {
+			bool isSubword = false;
+			int start = 1;
+			if (words[j][1] == marker) {
+				isSubword = true;
+				start++;
+			}
+			if (s[1] == words[j][start]) {
+				const char *a = words[j] + start;
+				const char *b = s + 1;
+				while (*a && *a == *b) {
+					a++;
+					if (*a == marker) {
+						isSubword = true;
+						a++;
+					}
+					b++;
+				}
+				if ((!*a || isSubword) && !*b)
+					return true;
+			}
+			j++;
+		}
+	}
+	j = starts[static_cast<unsigned int>('^')];
+	if (j >= 0) {
+		while (words[j][0] == '^') {
+			const char *a = words[j] + 1;
+			const char *b = s;
+			while (*a && *a == *b) {
+				a++;
+				b++;
+			}
+			if (!*a)
+				return true;
+			j++;
+		}
+	}
+	return false;
+}
+
+/** similar to InListAbbreviated, but word s can be a abridged version of a keyword.
+* eg. the keyword is defined as "after.~:". This means the word must have a prefix (begins with) of
+* "after." and suffix (ends with) of ":" to be a keyword, Hence "after.field:" , "after.form.item:" are valid.
+* Similarly "~.is.valid" keyword is suffix only... hence "field.is.valid" , "form.is.valid" are valid.
+* The marker is ~ in this case.
+* No multiple markers check is done and wont work.
+*/
+bool WordList::InListAbridged(const char *s, const char marker) const noexcept {
+	if (0 == words)
+		return false;
+	const unsigned char firstChar = s[0];
+	int j = starts[firstChar];
+	if (j >= 0) {
+		while (words[j][0] == firstChar) {
+			const char *a = words[j];
+			const char *b = s;
+			while (*a && *a == *b) {
+				a++;
+				if (*a == marker) {
+					a++;
+					const size_t suffixLengthA = strlen(a);
+					const size_t suffixLengthB = strlen(b);
+					if (suffixLengthA >= suffixLengthB)
+						break;
+					b = b + suffixLengthB - suffixLengthA - 1;
+				}
+				b++;
+			}
+			if (!*a  && !*b)
+				return true;
+			j++;
+		}
+	}
+
+	j = starts[static_cast<unsigned int>(marker)];
+	if (j >= 0) {
+		while (words[j][0] == marker) {
+			const char *a = words[j] + 1;
+			const char *b = s;
+			const size_t suffixLengthA = strlen(a);
+			const size_t suffixLengthB = strlen(b);
+			if (suffixLengthA > suffixLengthB) {
+				j++;
+				continue;
+			}
+			b = b + suffixLengthB - suffixLengthA;
+
+			while (*a && *a == *b) {
+				a++;
+				b++;
+			}
+			if (!*a && !*b)
+				return true;
+			j++;
+		}
+	}
+
+	return false;
+}
+
+const char *WordList::WordAt(int n) const noexcept {
+	return words[n];
+}
+
diff --git a/scite-app/lexilla/lexlib/WordList.h b/scite-app/lexilla/lexlib/WordList.h
new file mode 100644
index 0000000..07ae573
--- /dev/null
+++ b/scite-app/lexilla/lexlib/WordList.h
@@ -0,0 +1,38 @@
+// Scintilla source code edit control
+/** @file WordList.h
+ ** Hold a list of words.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef WORDLIST_H
+#define WORDLIST_H
+
+namespace Lexilla {
+
+/**
+ */
+class WordList {
+	// Each word contains at least one character - a empty word acts as sentinel at the end.
+	char **words;
+	char *list;
+	int len;
+	bool onlyLineEnds;	///< Delimited by any white space or only line ends
+	int starts[256];
+public:
+	explicit WordList(bool onlyLineEnds_ = false);
+	~WordList();
+	operator bool() const noexcept;
+	bool operator!=(const WordList &other) const noexcept;
+	int Length() const noexcept;
+	void Clear() noexcept;
+	bool Set(const char *s);
+	bool InList(const char *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;
+};
+
+}
+
+#endif
diff --git a/scite-app/lexilla/scripts/HeaderOrder.txt b/scite-app/lexilla/scripts/HeaderOrder.txt
new file mode 100644
index 0000000..b5c8714
--- /dev/null
+++ b/scite-app/lexilla/scripts/HeaderOrder.txt
@@ -0,0 +1,103 @@
+// Define the standard order in which to include header files
+// All platform headers should be included before Scintilla headers
+// and each of these groups are then divided into directory groups.
+
+// Base of the repository relative to this file
+
+//base:..
+
+// File patterns to check:
+
+//source:include/*.h
+//source:src/*.cxx
+//source:lexlib/*.cxx
+//source:lexers/*.cxx
+//source:access/*.cxx
+//source:test/*.cxx
+//source:test/unit/*.cxx
+
+// C standard library
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+// C++ wrappers of C standard library
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <cstdarg>
+
+// C++ standard library
+#include <utility>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <initializer_list>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+#include <memory>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <filesystem>
+
+// POSIX
+#include <dlfcn.h>
+
+// Windows header needed for loading DLL
+#include <windows.h>
+
+// Scintilla/Lexilla headers
+
+// Non-platform-specific headers
+
+// Scintilla include
+
+#include "Sci_Position.h"
+#include "ILexer.h"
+#include "Scintilla.h"
+
+// Lexilla include
+
+#include "SciLexer.h"
+#include "Lexilla.h"
+
+// access
+
+#include "LexillaAccess.h"
+
+// lexlib
+#include "StringCopy.h"
+#include "PropSetSimple.h"
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "CharacterCategory.h"
+#include "LexerModule.h"
+#include "CatalogueModules.h"
+#include "OptionSet.h"
+#include "SparseState.h"
+#include "SubStyles.h"
+#include "DefaultLexer.h"
+#include "LexerBase.h"
+#include "LexerSimple.h"
+#include "LexerNoExceptions.h"
+
+// src
+
+#include "TestDocument.h"
+
+// Catch testing framework
+#include "catch.hpp"
+
diff --git a/scite-app/lexilla/scripts/LexFacer.py b/scite-app/lexilla/scripts/LexFacer.py
new file mode 100644
index 0000000..4b4f7de
--- /dev/null
+++ b/scite-app/lexilla/scripts/LexFacer.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+# LexFacer.py - regenerate the SciLexer.h files from the Scintilla.iface interface
+# definition file.
+# Implemented 2000 by Neil Hodgson neilh@scintilla.org
+# Requires Python 3.6 or later
+
+import os, pathlib, sys
+
+sys.path.append(os.path.join("..", "..", "scintilla", "scripts"))
+
+import Face
+import FileGenerator
+
+def printLexHFile(f):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["FeatureType"] in ["val"]:
+			if "SCE_" in name or "SCLEX_" in name:
+				out.append("#define " + name + " " + v["Value"])
+	return out
+
+def RegenerateAll(root, _showMaxID):
+	f = Face.Face()
+	f.ReadFromFile(root / "include/LexicalStyles.iface")
+	FileGenerator.Regenerate(root / "include/SciLexer.h", "/* ", printLexHFile(f))
+
+if __name__ == "__main__":
+	RegenerateAll(pathlib.Path(__file__).resolve().parent.parent, True)
diff --git a/scite-app/lexilla/scripts/LexillaData.py b/scite-app/lexilla/scripts/LexillaData.py
new file mode 100644
index 0000000..0e875bd
--- /dev/null
+++ b/scite-app/lexilla/scripts/LexillaData.py
@@ -0,0 +1,282 @@
+#!/usr/bin/env python3
+# ScintillaData.py - implemented 2013 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Common code used by Scintilla and SciTE for source file regeneration.
+# The ScintillaData object exposes information about Scintilla as properties:
+# Version properties
+#     version
+#     versionDotted
+#     versionCommad
+#
+# Date last modified
+#     dateModified
+#     yearModified
+#     mdyModified
+#     dmyModified
+#     myModified
+#
+# Information about lexers and properties defined in lexers
+#     lexFiles
+#         sorted list of lexer files
+#     lexerModules
+#         sorted list of module names
+#     lexerProperties
+#         sorted list of lexer properties
+#     propertyDocuments
+#         dictionary of property documentation { name: document string }
+#     sclexFromName
+#         dictionary of SCLEX_* IDs { name: SCLEX_ID }
+#     fileFromSclex
+#         dictionary of file names { SCLEX_ID: file name }
+
+# This file can be run to see the data it provides.
+# Requires Python 3.6 or later
+
+import datetime, pathlib, sys, textwrap
+
+thisPath = pathlib.Path(__file__).resolve()
+
+sys.path.append(str(thisPath.parent.parent.parent / "scintilla" / "scripts"))
+
+import FileGenerator
+
+neutralEncoding = "cp437"	# Each byte value is valid in cp437
+
+def FindModules(lexFile):
+    modules = []
+    partLine = ""
+    with lexFile.open(encoding=neutralEncoding) as f:
+        lineNum = 0
+        for l in f.readlines():
+            lineNum += 1
+            l = l.rstrip()
+            if partLine or l.startswith("LexerModule"):
+                if ")" in l:
+                    l = partLine + l
+                    original = l
+                    l = l.replace("(", " ")
+                    l = l.replace(")", " ")
+                    l = l.replace(",", " ")
+                    parts = l.split()
+                    lexerName = parts[4]
+                    if not (lexerName.startswith('"') and lexerName.endswith('"')):
+                        print(f"{lexFile}:{lineNum}: Bad LexerModule statement:\n{original}")
+                        exit(1)
+                    lexerName = lexerName.strip('"')
+                    modules.append([parts[1], parts[2], lexerName])
+                    partLine = ""
+                else:
+                    partLine = partLine + l
+    return modules
+
+def FindLexersInXcode(xCodeProject):
+    lines = FileGenerator.ReadFileAsList(xCodeProject)
+
+    uidsOfBuild = {}
+    markersPBXBuildFile = ["Begin PBXBuildFile section", "", "End PBXBuildFile section"]
+    for buildLine in lines[FileGenerator.FindSectionInList(lines, markersPBXBuildFile)]:
+        # Occurs for each file in the build. Find the UIDs used for the file.
+        #\t\t[0-9A-F]+ /* [a-zA-Z]+.cxx in sources */ = {isa = PBXBuildFile; fileRef = [0-9A-F]+ /* [a-zA-Z]+ */; };
+        pieces = buildLine.split()
+        uid1 = pieces[0]
+        filename = pieces[2].split(".")[0]
+        uid2 = pieces[12]
+        uidsOfBuild[filename] = [uid1, uid2]
+
+    lexers = {}
+    markersLexers = ["/* Lexers */ =", "children", ");"]
+    for lexerLine in lines[FileGenerator.FindSectionInList(lines, markersLexers)]:
+        #\t\t\t\t[0-9A-F]+ /* [a-zA-Z]+.cxx */,
+        uid, _, rest = lexerLine.partition("/* ")
+        uid = uid.strip()
+        lexer, _, _ = rest.partition(".")
+        lexers[lexer] = uidsOfBuild[lexer]
+
+    return lexers
+
+# Properties that start with lexer. or fold. are automatically found but there are some
+# older properties that don't follow this pattern so must be explicitly listed.
+knownIrregularProperties = [
+    "fold",
+    "styling.within.preprocessor",
+    "tab.timmy.whinge.level",
+    "asp.default.language",
+    "html.tags.case.sensitive",
+    "ps.level",
+    "ps.tokenize",
+    "sql.backslash.escapes",
+    "nsis.uservars",
+    "nsis.ignorecase"
+]
+
+def FindProperties(lexFile):
+    properties = {}
+    with open(lexFile, encoding=neutralEncoding) as f:
+        for l in f.readlines():
+            if ("GetProperty" in l or "DefineProperty" in l) and "\"" in l:
+                l = l.strip()
+                if not l.startswith("//"):	# Drop comments
+                    propertyName = l.split("\"")[1]
+                    if propertyName.lower() == propertyName:
+                        # Only allow lower case property names
+                        if propertyName in knownIrregularProperties or \
+                            propertyName.startswith("fold.") or \
+                            propertyName.startswith("lexer."):
+                            properties[propertyName] = 1
+    return properties
+
+def FindPropertyDocumentation(lexFile):
+    documents = {}
+    with lexFile.open(encoding=neutralEncoding) as f:
+        name = ""
+        for l in f.readlines():
+            l = l.strip()
+            if "// property " in l:
+                propertyName = l.split()[2]
+                if propertyName.lower() == propertyName:
+                    # Only allow lower case property names
+                    name = propertyName
+                    documents[name] = ""
+            elif "DefineProperty" in l and "\"" in l:
+                propertyName = l.split("\"")[1]
+                if propertyName.lower() == propertyName:
+                    # Only allow lower case property names
+                    name = propertyName
+                    documents[name] = ""
+            elif name:
+                if l.startswith("//"):
+                    if documents[name]:
+                        documents[name] += " "
+                    documents[name] += l[2:].strip()
+                elif l.startswith("\""):
+                    l = l[1:].strip()
+                    if l.endswith(";"):
+                        l = l[:-1].strip()
+                    if l.endswith(")"):
+                        l = l[:-1].strip()
+                    if l.endswith("\""):
+                        l = l[:-1]
+                    # Fix escaped double quotes
+                    l = l.replace("\\\"", "\"")
+                    documents[name] += l
+                else:
+                    name = ""
+    for name in list(documents.keys()):
+        if documents[name] == "":
+            del documents[name]
+    return documents
+
+def FindCredits(historyFile):
+    credits = []
+    stage = 0
+    with historyFile.open(encoding="utf-8") as f:
+        for l in f.readlines():
+            l = l.strip()
+            if stage == 0 and l == "<table>":
+                stage = 1
+            elif stage == 1 and l == "</table>":
+                stage = 2
+            if stage == 1 and l.startswith("<td>"):
+                credit = l[4:-5]
+                if "<a" in l:
+                    title, a, rest = credit.partition("<a href=")
+                    urlplus, _bracket, end = rest.partition(">")
+                    name = end.split("<")[0]
+                    url = urlplus[1:-1]
+                    credit = title.strip()
+                    if credit:
+                        credit += " "
+                    credit += name + " " + url
+                credits.append(credit)
+    return credits
+
+def ciKey(a):
+    return str(a).lower()
+
+def SortListInsensitive(l):
+    l.sort(key=ciKey)
+
+class LexillaData:
+    def __init__(self, scintillaRoot):
+        # Discover version information
+        self.version = (scintillaRoot / "version.txt").read_text().strip()
+        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
+            self.version[2]
+        self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
+
+        with (scintillaRoot / "doc" / "Lexilla.html").open() as f:
+            self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
+                [0].split('\"')[3]
+            # 20130602
+            # Lexilla.html
+            dtModified = datetime.datetime.strptime(self.dateModified, "%Y%m%d")
+            self.yearModified = self.dateModified[0:4]
+            monthModified = dtModified.strftime("%B")
+            dayModified = "%d" % dtModified.day
+            self.mdyModified = monthModified + " " + dayModified + " " + self.yearModified
+            # May 22 2013
+            # Lexilla.html, SciTE.html
+            self.dmyModified = dayModified + " " + monthModified + " " + self.yearModified
+            # 22 May 2013
+            # LexillaHistory.html -- only first should change
+            self.myModified = monthModified + " " + self.yearModified
+
+        # Find all the lexer source code files
+        lexFilePaths = list((scintillaRoot / "lexers").glob("Lex*.cxx"))
+        SortListInsensitive(lexFilePaths)
+        self.lexFiles = [f.stem for f in lexFilePaths]
+        self.lexerModules = []
+        lexerProperties = set()
+        self.propertyDocuments = {}
+        self.sclexFromName = {}
+        self.fileFromSclex = {}
+        for lexFile in lexFilePaths:
+            modules = FindModules(lexFile)
+            for module in modules:
+                self.sclexFromName[module[2]] = module[1]
+                self.fileFromSclex[module[1]] = lexFile
+                self.lexerModules.append(module[0])
+            for k in FindProperties(lexFile).keys():
+                lexerProperties.add(k)
+            documents = FindPropertyDocumentation(lexFile)
+            for k in documents.keys():
+                if k not in self.propertyDocuments:
+                    self.propertyDocuments[k] = documents[k]
+        SortListInsensitive(self.lexerModules)
+        self.lexerProperties = list(lexerProperties)
+        SortListInsensitive(self.lexerProperties)
+
+        self.lexersXcode = FindLexersInXcode(scintillaRoot /
+            "src/Lexilla/Lexilla.xcodeproj/project.pbxproj")
+        self.credits = FindCredits(scintillaRoot / "doc" / "LexillaHistory.html")
+
+def printWrapped(text):
+    print(textwrap.fill(text, subsequent_indent="    "))
+
+if __name__=="__main__":
+    sci = LexillaData(pathlib.Path(__file__).resolve().parent.parent)
+    print("Version   %s   %s   %s" % (sci.version, sci.versionDotted, sci.versionCommad))
+    print("Date last modified    %s   %s   %s   %s   %s" % (
+        sci.dateModified, sci.yearModified, sci.mdyModified, sci.dmyModified, sci.myModified))
+    printWrapped(str(len(sci.lexFiles)) + " lexer files: " + ", ".join(sci.lexFiles))
+    printWrapped(str(len(sci.lexerModules)) + " lexer modules: " + ", ".join(sci.lexerModules))
+    #~ printWrapped(str(len(sci.lexersXcode)) + " Xcode lexer references: " + ", ".join(
+        #~ [lex+":"+uids[0]+","+uids[1] for lex, uids in sci.lexersXcode.items()]))
+    print("Lexer name to ID:")
+    lexNames = sorted(sci.sclexFromName.keys())
+    for lexName in lexNames:
+        sclex = sci.sclexFromName[lexName]
+        fileName = sci.fileFromSclex[sclex].name
+        print("    " + lexName + " -> " + sclex + " in " + fileName)
+    printWrapped("Lexer properties: " + ", ".join(sci.lexerProperties))
+    print("Lexer property documentation:")
+    documentProperties = list(sci.propertyDocuments.keys())
+    SortListInsensitive(documentProperties)
+    for k in documentProperties:
+        print("    " + k)
+        print(textwrap.fill(sci.propertyDocuments[k], initial_indent="        ",
+            subsequent_indent="        "))
+    print("Credits:")
+    for c in sci.credits:
+        sys.stdout.buffer.write(b"    " + c.encode("utf-8") + b"\n")
diff --git a/scite-app/lexilla/scripts/LexillaGen.py b/scite-app/lexilla/scripts/LexillaGen.py
new file mode 100644
index 0000000..be72ba1
--- /dev/null
+++ b/scite-app/lexilla/scripts/LexillaGen.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+# LexillaGen.py - implemented 2019 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Regenerate the Lexilla source files that list all the lexers.
+# Should be run whenever a new lexer is added or removed.
+# Requires Python 3.6 or later
+# Files are regenerated in place with templates stored in comments.
+# The format of generation comments is documented in FileGenerator.py.
+
+import os, pathlib, sys, uuid
+
+thisPath = pathlib.Path(__file__).resolve()
+
+sys.path.append(str(thisPath.parent.parent.parent / "scintilla" / "scripts"))
+
+from FileGenerator import Regenerate, UpdateLineInFile, \
+    ReplaceREInFile, UpdateLineInPlistFile, ReadFileAsList, UpdateFileFromLines, \
+    FindSectionInList
+import LexillaData
+import LexFacer
+
+sys.path.append(str(thisPath.parent.parent / "src"))
+import DepGen
+
+# RegenerateXcodeProject and assiciated functions is copied from scintilla/scripts/LexGen.py
+
+# Last 24 digits of UUID, used for item IDs in Xcode
+def uid24():
+    return str(uuid.uuid4()).replace("-", "").upper()[-24:]
+
+def ciLexerKey(a):
+    return a.split()[2].lower()
+
+
+"""
+		11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11F35FDA12AEFAF100F0236D /* LexA68k.cxx */; };
+		11F35FDA12AEFAF100F0236D /* LexA68k.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../lexers/LexA68k.cxx; sourceTree = SOURCE_ROOT; };
+				11F35FDA12AEFAF100F0236D /* LexA68k.cxx */,
+				11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */,
+"""
+def RegenerateXcodeProject(path, lexers, lexerReferences):
+    # Build 4 blocks for insertion:
+    # Each markers contains a unique section start, an optional wait string, and a section end
+
+    markersPBXBuildFile = ["Begin PBXBuildFile section", "", "End PBXBuildFile section"]
+    sectionPBXBuildFile = []
+
+    markersPBXFileReference = ["Begin PBXFileReference section", "", "End PBXFileReference section"]
+    sectionPBXFileReference = []
+
+    markersLexers = ["/* Lexers */ =", "children", ");"]
+    sectionLexers = []
+
+    markersPBXSourcesBuildPhase = ["Begin PBXSourcesBuildPhase section", "files", ");"]
+    sectionPBXSourcesBuildPhase = []
+
+    for lexer in lexers:
+        if lexer not in lexerReferences:
+            uid1 = uid24()
+            uid2 = uid24()
+            print("Lexer", lexer, "is not in Xcode project. Use IDs", uid1, uid2)
+            lexerReferences[lexer] = [uid1, uid2]
+            linePBXBuildFile = "\t\t{} /* {}.cxx in Sources */ = {{isa = PBXBuildFile; fileRef = {} /* {}.cxx */; }};".format(uid1, lexer, uid2, lexer)
+            linePBXFileReference = "\t\t{} /* {}.cxx */ = {{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = {}.cxx; path = ../../lexers/{}.cxx; sourceTree = SOURCE_ROOT; }};".format(uid2, lexer, lexer, lexer)
+            lineLexers = "\t\t\t\t{} /* {}.cxx */,".format(uid2, lexer)
+            linePBXSourcesBuildPhase = "\t\t\t\t{} /* {}.cxx in Sources */,".format(uid1, lexer)
+            sectionPBXBuildFile.append(linePBXBuildFile)
+            sectionPBXFileReference.append(linePBXFileReference)
+            sectionLexers.append(lineLexers)
+            sectionPBXSourcesBuildPhase.append(linePBXSourcesBuildPhase)
+
+    lines = ReadFileAsList(path)
+
+    sli = FindSectionInList(lines, markersPBXBuildFile)
+    lines[sli.stop:sli.stop] = sectionPBXBuildFile
+
+    sli = FindSectionInList(lines, markersPBXFileReference)
+    lines[sli.stop:sli.stop] = sectionPBXFileReference
+
+    sli = FindSectionInList(lines, markersLexers)
+    # This section is shown in the project outline so sort it to make it easier to navigate.
+    allLexers = sorted(lines[sli.start:sli.stop] + sectionLexers, key=ciLexerKey)
+    lines[sli] = allLexers
+
+    sli = FindSectionInList(lines, markersPBXSourcesBuildPhase)
+    lines[sli.stop:sli.stop] = sectionPBXSourcesBuildPhase
+
+    UpdateFileFromLines(path, lines, "\n")
+
+def RegenerateAll(rootDirectory):
+
+    root = pathlib.Path(rootDirectory)
+
+    lexillaBase = root.resolve()
+
+    lex = LexillaData.LexillaData(lexillaBase)
+
+    lexillaDir = lexillaBase
+    srcDir = lexillaDir / "src"
+    docDir = lexillaDir / "doc"
+
+    Regenerate(srcDir / "Lexilla.cxx", "//", lex.lexerModules)
+    Regenerate(srcDir / "lexilla.mak", "#", lex.lexFiles)
+
+    # Discover version information
+    version = (lexillaDir / "version.txt").read_text().strip()
+    versionDotted = version[0] + '.' + version[1] + '.' + version[2]
+    versionCommad = versionDotted.replace(".", ", ") + ', 0'
+
+    rcPath = srcDir / "LexillaVersion.rc"
+    UpdateLineInFile(rcPath, "#define VERSION_LEXILLA",
+        "#define VERSION_LEXILLA \"" + versionDotted + "\"")
+    UpdateLineInFile(rcPath, "#define VERSION_WORDS",
+        "#define VERSION_WORDS " + versionCommad)
+    ReplaceREInFile(docDir / "LexillaDownload.html",
+        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/\g<1>" +  version,
+        0)
+
+    pathMain = lexillaDir / "doc" / "Lexilla.html"
+    UpdateLineInFile(pathMain,
+        '          <font color="#FFCC99" size="3">Release version',
+        '          <font color="#FFCC99" size="3">Release version ' + \
+        versionDotted + '<br />')
+    UpdateLineInFile(pathMain,
+        '           Site last modified',
+        '           Site last modified ' + lex.mdyModified + '</font>')
+    UpdateLineInFile(pathMain,
+        '    <meta name="Date.Modified"',
+        '    <meta name="Date.Modified" content="' + lex.dateModified + '" />')
+    UpdateLineInFile(lexillaDir / "doc" / "LexillaHistory.html",
+        '	Released ',
+        '	Released ' + lex.dmyModified + '.')
+
+    lexillaXcode = lexillaDir / "src" / "Lexilla"
+    lexillaXcodeProject = lexillaXcode / "Lexilla.xcodeproj" / "project.pbxproj"
+
+    lexerReferences = LexillaData.FindLexersInXcode(lexillaXcodeProject)
+
+    UpdateLineInPlistFile(lexillaXcode / "Info.plist",
+        "CFBundleShortVersionString", versionDotted)
+
+    ReplaceREInFile(lexillaXcodeProject, "CURRENT_PROJECT_VERSION = [0-9.]+;",
+        f'CURRENT_PROJECT_VERSION = {versionDotted};',
+        0)
+
+    RegenerateXcodeProject(lexillaXcodeProject, lex.lexFiles, lexerReferences)
+
+    LexFacer.RegenerateAll(root, False)
+
+    currentDirectory = pathlib.Path.cwd()
+    os.chdir(srcDir)
+    DepGen.Generate()
+    os.chdir(currentDirectory)
+
+if __name__=="__main__":
+    RegenerateAll(pathlib.Path(__file__).resolve().parent.parent)
diff --git a/scite-app/lexilla/scripts/LexillaLogo.py b/scite-app/lexilla/scripts/LexillaLogo.py
new file mode 100644
index 0000000..3de6757
--- /dev/null
+++ b/scite-app/lexilla/scripts/LexillaLogo.py
@@ -0,0 +1,75 @@
+# LexillaLogo.py 
+# Requires Python 3.6.
+# Requires Pillow https://python-pillow.org/, tested with 7.2.0 on Windows 10
+
+import random
+from PIL import Image, ImageDraw, ImageFont
+
+colours = [
+(136,0,21,255),
+(237,28,36,255),
+(255,127,39,255),
+(255,201,14,255),
+(185,122,87,255),
+(255,174,201,255),
+(181,230,29,255),
+(34,177,76,255),
+(153,217,234,255),
+(0,162,232,255),
+(112,146,190,255),
+(63,72,204,255),
+(200,191,231,255),
+]
+
+width = 1280
+height = 150
+
+def drawLines(dr):
+	for y in range(0,height, 2):
+		x = 0
+		while x < width:
+			#lexeme = random.randint(2, 20)
+			lexeme = int(random.expovariate(0.3))
+			colour = random.choice(colours)
+			strokeRectangle = (x, y, x+lexeme, y)
+			dr.rectangle(strokeRectangle, fill=colour)
+			x += lexeme + 3
+
+def drawGuide(dr):
+	for y in range(0,height, 2):
+		x = 0
+		while x < width:
+			lexeme = int(random.expovariate(0.3))
+			colour = (0x30, 0x30, 0x30)
+			strokeRectangle = (x, y, x+lexeme, y)
+			dr.rectangle(strokeRectangle, fill=colour)
+			x += lexeme + 3
+
+def drawLogo():
+	# Ensure same image each time
+	random.seed(1)
+
+	# Georgia bold italic
+	font = ImageFont.truetype(font="georgiaz.ttf", size=190)
+
+	imageMask = Image.new("L", (width, height), color=(0xff))
+	drMask = ImageDraw.Draw(imageMask)
+	drMask.text((30, -29), "Lexilla", font=font, fill=(0))
+
+	imageBack = Image.new("RGB", (width, height), color=(0,0,0))
+	drBack = ImageDraw.Draw(imageBack)
+	drawGuide(drBack)
+
+	imageLines = Image.new("RGB", (width, height), color=(0,0,0))
+	dr = ImageDraw.Draw(imageLines)
+	drawLines(dr)
+
+	imageOut = Image.composite(imageBack, imageLines, imageMask)
+
+	imageOut.save("../doc/LexillaLogo.png", "png")
+
+	imageDoubled = imageOut.resize((width*2, height * 2), Image.NEAREST)
+
+	imageDoubled.save("../doc/LexillaLogo2x.png", "png")
+
+drawLogo()
diff --git a/scite-app/lexilla/scripts/RunTest.bat b/scite-app/lexilla/scripts/RunTest.bat
new file mode 100644
index 0000000..5c03a07
--- /dev/null
+++ b/scite-app/lexilla/scripts/RunTest.bat
@@ -0,0 +1,7 @@
+rem Test lexers
+rem build lexilla.dll and TestLexers.exe then run TestLexers.exe
+cd ../src
+make DEBUG=1
+cd ../test
+make DEBUG=1
+make test
diff --git a/scite-app/lexilla/scripts/RunTest.sh b/scite-app/lexilla/scripts/RunTest.sh
new file mode 100644
index 0000000..3a54b10
--- /dev/null
+++ b/scite-app/lexilla/scripts/RunTest.sh
@@ -0,0 +1,7 @@
+# Test lexers
+# build lexilla.so and TestLexers then run TestLexers
+cd ../src
+make DEBUG=1
+cd ../test
+make DEBUG=1
+make test
diff --git a/scite-app/lexilla/src/DepGen.py b/scite-app/lexilla/src/DepGen.py
new file mode 100644
index 0000000..e0b3f8d
--- /dev/null
+++ b/scite-app/lexilla/src/DepGen.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+# DepGen.py - produce a make dependencies file for Scintilla
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 3.6 or later
+
+import os, sys
+
+scintilla = os.path.join("..", "..", "scintilla")
+sys.path.append(scintilla)
+
+from scripts import Dependencies
+
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
+
+def Generate():
+	lexilla = os.path.join("..")
+	sources = [
+		os.path.join(lexilla, "src", "Lexilla.cxx"),
+		os.path.join(lexilla, "lexlib", "*.cxx"),
+		os.path.join(lexilla, "lexers", "*.cxx")]
+	includes = [
+		os.path.join(lexilla, "include"),
+		os.path.join(scintilla, "include"),
+		os.path.join(lexilla, "lexlib")]
+
+	# Create the dependencies file for g++
+	deps = Dependencies.FindDependencies(sources,  includes, ".o", "../lexilla/")
+
+	Dependencies.UpdateDependencies(os.path.join(lexilla, "src", "deps.mak"), deps, topComment)
+
+	# Create the dependencies file for MSVC
+
+	# Place the objects in $(DIR_O) and change extension from ".o" to ".obj"
+	deps = [["$(DIR_O)/"+Dependencies.PathStem(obj)+".obj", headers] for obj, headers in deps]
+
+	Dependencies.UpdateDependencies(os.path.join(lexilla, "src", "nmdeps.mak"), deps, topComment)
+
+if __name__ == "__main__":
+	Generate()
\ No newline at end of file
diff --git a/scite-app/lexilla/src/Lexilla.cxx b/scite-app/lexilla/src/Lexilla.cxx
new file mode 100644
index 0000000..cd4b236
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla.cxx
@@ -0,0 +1,376 @@
+// Lexilla lexer library
+/** @file Lexilla.cxx
+ ** Lexer infrastructure.
+ ** Provides entry points to shared library.
+ **/
+// Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstring>
+
+#include <vector>
+#include <initializer_list>
+
+#if _WIN32
+#define EXPORT_FUNCTION __declspec(dllexport)
+#define CALLING_CONVENTION __stdcall
+#else
+#define EXPORT_FUNCTION __attribute__((visibility("default")))
+#define CALLING_CONVENTION
+#endif
+
+#include "ILexer.h"
+
+#include "LexerModule.h"
+#include "CatalogueModules.h"
+
+using namespace Lexilla;
+
+//++Autogenerated -- run lexilla/scripts/LexillaGen.py to regenerate
+//**\(extern LexerModule \*;\n\)
+extern LexerModule lmA68k;
+extern LexerModule lmAbaqus;
+extern LexerModule lmAda;
+extern LexerModule lmAPDL;
+extern LexerModule lmAs;
+extern LexerModule lmAsm;
+extern LexerModule lmAsn1;
+extern LexerModule lmASY;
+extern LexerModule lmAU3;
+extern LexerModule lmAVE;
+extern LexerModule lmAVS;
+extern LexerModule lmBaan;
+extern LexerModule lmBash;
+extern LexerModule lmBatch;
+extern LexerModule lmBibTeX;
+extern LexerModule lmBlitzBasic;
+extern LexerModule lmBullant;
+extern LexerModule lmCaml;
+extern LexerModule lmCIL;
+extern LexerModule lmClw;
+extern LexerModule lmClwNoCase;
+extern LexerModule lmCmake;
+extern LexerModule lmCOBOL;
+extern LexerModule lmCoffeeScript;
+extern LexerModule lmConf;
+extern LexerModule lmCPP;
+extern LexerModule lmCPPNoCase;
+extern LexerModule lmCsound;
+extern LexerModule lmCss;
+extern LexerModule lmD;
+extern LexerModule lmDataflex;
+extern LexerModule lmDiff;
+extern LexerModule lmDMAP;
+extern LexerModule lmDMIS;
+extern LexerModule lmECL;
+extern LexerModule lmEDIFACT;
+extern LexerModule lmEiffel;
+extern LexerModule lmEiffelkw;
+extern LexerModule lmErlang;
+extern LexerModule lmErrorList;
+extern LexerModule lmESCRIPT;
+extern LexerModule lmF77;
+extern LexerModule lmFlagShip;
+extern LexerModule lmForth;
+extern LexerModule lmFortran;
+extern LexerModule lmFreeBasic;
+extern LexerModule lmFSharp;
+extern LexerModule lmGAP;
+extern LexerModule lmGui4Cli;
+extern LexerModule lmHaskell;
+extern LexerModule lmHollywood;
+extern LexerModule lmHTML;
+extern LexerModule lmIHex;
+extern LexerModule lmIndent;
+extern LexerModule lmInno;
+extern LexerModule lmJSON;
+extern LexerModule lmJulia;
+extern LexerModule lmKix;
+extern LexerModule lmKVIrc;
+extern LexerModule lmLatex;
+extern LexerModule lmLISP;
+extern LexerModule lmLiterateHaskell;
+extern LexerModule lmLot;
+extern LexerModule lmLout;
+extern LexerModule lmLua;
+extern LexerModule lmMagikSF;
+extern LexerModule lmMake;
+extern LexerModule lmMarkdown;
+extern LexerModule lmMatlab;
+extern LexerModule lmMaxima;
+extern LexerModule lmMETAPOST;
+extern LexerModule lmMMIXAL;
+extern LexerModule lmModula;
+extern LexerModule lmMSSQL;
+extern LexerModule lmMySQL;
+extern LexerModule lmNim;
+extern LexerModule lmNimrod;
+extern LexerModule lmNncrontab;
+extern LexerModule lmNsis;
+extern LexerModule lmNull;
+extern LexerModule lmOctave;
+extern LexerModule lmOpal;
+extern LexerModule lmOScript;
+extern LexerModule lmPascal;
+extern LexerModule lmPB;
+extern LexerModule lmPerl;
+extern LexerModule lmPHPSCRIPT;
+extern LexerModule lmPLM;
+extern LexerModule lmPO;
+extern LexerModule lmPOV;
+extern LexerModule lmPowerPro;
+extern LexerModule lmPowerShell;
+extern LexerModule lmProgress;
+extern LexerModule lmProps;
+extern LexerModule lmPS;
+extern LexerModule lmPureBasic;
+extern LexerModule lmPython;
+extern LexerModule lmR;
+extern LexerModule lmRaku;
+extern LexerModule lmREBOL;
+extern LexerModule lmRegistry;
+extern LexerModule lmRuby;
+extern LexerModule lmRust;
+extern LexerModule lmSAS;
+extern LexerModule lmScriptol;
+extern LexerModule lmSmalltalk;
+extern LexerModule lmSML;
+extern LexerModule lmSorc;
+extern LexerModule lmSpecman;
+extern LexerModule lmSpice;
+extern LexerModule lmSQL;
+extern LexerModule lmSrec;
+extern LexerModule lmStata;
+extern LexerModule lmSTTXT;
+extern LexerModule lmTACL;
+extern LexerModule lmTADS3;
+extern LexerModule lmTAL;
+extern LexerModule lmTCL;
+extern LexerModule lmTCMD;
+extern LexerModule lmTEHex;
+extern LexerModule lmTeX;
+extern LexerModule lmTxt2tags;
+extern LexerModule lmVB;
+extern LexerModule lmVBScript;
+extern LexerModule lmVerilog;
+extern LexerModule lmVHDL;
+extern LexerModule lmVisualProlog;
+extern LexerModule lmX12;
+extern LexerModule lmXML;
+extern LexerModule lmYAML;
+
+//--Autogenerated -- end of automatically generated section
+
+namespace {
+
+CatalogueModules catalogueLexilla;
+
+void AddEachLexer() {
+
+	if (catalogueLexilla.Count() > 0) {
+		return;
+	}
+
+	catalogueLexilla.AddLexerModules({
+//++Autogenerated -- run scripts/LexillaGen.py to regenerate
+//**\(\t\t&\*,\n\)
+		&lmA68k,
+		&lmAbaqus,
+		&lmAda,
+		&lmAPDL,
+		&lmAs,
+		&lmAsm,
+		&lmAsn1,
+		&lmASY,
+		&lmAU3,
+		&lmAVE,
+		&lmAVS,
+		&lmBaan,
+		&lmBash,
+		&lmBatch,
+		&lmBibTeX,
+		&lmBlitzBasic,
+		&lmBullant,
+		&lmCaml,
+		&lmCIL,
+		&lmClw,
+		&lmClwNoCase,
+		&lmCmake,
+		&lmCOBOL,
+		&lmCoffeeScript,
+		&lmConf,
+		&lmCPP,
+		&lmCPPNoCase,
+		&lmCsound,
+		&lmCss,
+		&lmD,
+		&lmDataflex,
+		&lmDiff,
+		&lmDMAP,
+		&lmDMIS,
+		&lmECL,
+		&lmEDIFACT,
+		&lmEiffel,
+		&lmEiffelkw,
+		&lmErlang,
+		&lmErrorList,
+		&lmESCRIPT,
+		&lmF77,
+		&lmFlagShip,
+		&lmForth,
+		&lmFortran,
+		&lmFreeBasic,
+		&lmFSharp,
+		&lmGAP,
+		&lmGui4Cli,
+		&lmHaskell,
+		&lmHollywood,
+		&lmHTML,
+		&lmIHex,
+		&lmIndent,
+		&lmInno,
+		&lmJSON,
+		&lmJulia,
+		&lmKix,
+		&lmKVIrc,
+		&lmLatex,
+		&lmLISP,
+		&lmLiterateHaskell,
+		&lmLot,
+		&lmLout,
+		&lmLua,
+		&lmMagikSF,
+		&lmMake,
+		&lmMarkdown,
+		&lmMatlab,
+		&lmMaxima,
+		&lmMETAPOST,
+		&lmMMIXAL,
+		&lmModula,
+		&lmMSSQL,
+		&lmMySQL,
+		&lmNim,
+		&lmNimrod,
+		&lmNncrontab,
+		&lmNsis,
+		&lmNull,
+		&lmOctave,
+		&lmOpal,
+		&lmOScript,
+		&lmPascal,
+		&lmPB,
+		&lmPerl,
+		&lmPHPSCRIPT,
+		&lmPLM,
+		&lmPO,
+		&lmPOV,
+		&lmPowerPro,
+		&lmPowerShell,
+		&lmProgress,
+		&lmProps,
+		&lmPS,
+		&lmPureBasic,
+		&lmPython,
+		&lmR,
+		&lmRaku,
+		&lmREBOL,
+		&lmRegistry,
+		&lmRuby,
+		&lmRust,
+		&lmSAS,
+		&lmScriptol,
+		&lmSmalltalk,
+		&lmSML,
+		&lmSorc,
+		&lmSpecman,
+		&lmSpice,
+		&lmSQL,
+		&lmSrec,
+		&lmStata,
+		&lmSTTXT,
+		&lmTACL,
+		&lmTADS3,
+		&lmTAL,
+		&lmTCL,
+		&lmTCMD,
+		&lmTEHex,
+		&lmTeX,
+		&lmTxt2tags,
+		&lmVB,
+		&lmVBScript,
+		&lmVerilog,
+		&lmVHDL,
+		&lmVisualProlog,
+		&lmX12,
+		&lmXML,
+		&lmYAML,
+
+//--Autogenerated -- end of automatically generated section
+		});
+
+}
+
+}
+
+extern "C" {
+
+EXPORT_FUNCTION int CALLING_CONVENTION GetLexerCount() {
+	AddEachLexer();
+	return catalogueLexilla.Count();
+}
+
+EXPORT_FUNCTION void CALLING_CONVENTION GetLexerName(unsigned int index, char *name, int buflength) {
+	AddEachLexer();
+	*name = 0;
+	const char *lexerName = catalogueLexilla.Name(index);
+	if (static_cast<size_t>(buflength) > strlen(lexerName)) {
+		strcpy(name, lexerName);
+	}
+}
+
+EXPORT_FUNCTION LexerFactoryFunction CALLING_CONVENTION GetLexerFactory(unsigned int index) {
+	AddEachLexer();
+	return catalogueLexilla.Factory(index);
+}
+
+EXPORT_FUNCTION Scintilla::ILexer5 * CALLING_CONVENTION CreateLexer(const char *name) {
+	AddEachLexer();
+	for (unsigned int i = 0; i < catalogueLexilla.Count(); i++) {
+		const char *lexerName = catalogueLexilla.Name(i);
+		if (0 == strcmp(lexerName, name)) {
+			return catalogueLexilla.Create(i);
+		}
+	}
+	return nullptr;
+}
+
+EXPORT_FUNCTION const char * CALLING_CONVENTION LexerNameFromID(int identifier) {
+	AddEachLexer();
+	const LexerModule *pModule = catalogueLexilla.Find(identifier);
+	if (pModule) {
+		return pModule->languageName;
+	} else {
+		return nullptr;
+	}
+}
+
+EXPORT_FUNCTION const char * CALLING_CONVENTION GetLibraryPropertyNames() {
+	return "";
+}
+
+EXPORT_FUNCTION void CALLING_CONVENTION SetLibraryProperty(const char *, const char *) {
+	// Null implementation
+}
+
+EXPORT_FUNCTION const char * CALLING_CONVENTION GetNameSpace() {
+	return "lexilla";
+}
+
+// Not exported from binary as LexerModule must be built exactly the same as
+// modules listed above
+void AddStaticLexerModule(LexerModule *plm) {
+	AddEachLexer();
+	catalogueLexilla.AddLexerModule(plm);
+}
+
+}
diff --git a/scite-app/lexilla/src/Lexilla.def b/scite-app/lexilla/src/Lexilla.def
new file mode 100644
index 0000000..7caa479
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla.def
@@ -0,0 +1,9 @@
+EXPORTS
+	GetLexerCount
+	GetLexerName
+	GetLexerFactory
+	CreateLexer
+	LexerNameFromID
+	GetLibraryPropertyNames
+	SetLibraryProperty
+	GetNameSpace
diff --git a/scite-app/lexilla/src/Lexilla.vcxproj b/scite-app/lexilla/src/Lexilla.vcxproj
new file mode 100644
index 0000000..5370e5e
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla.vcxproj
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E541C9BE-13BC-4CE6-A0A4-31145F51A2C1}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Lexilla</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\..\scintilla\include;..\lexlib;</AdditionalIncludeDirectories>
+      <BrowseInformation>true</BrowseInformation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <CETCompat>true</CETCompat>
+      <ModuleDefinitionFile>Lexilla.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <CETCompat>false</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <CETCompat>false</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\lexers\*.cxx" />
+    <ClCompile Include="..\lexlib\*.cxx" />
+    <ClCompile Include="..\src\Lexilla.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\SciLexer.h" />
+    <ClInclude Include="..\lexlib\*.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\LexillaVersion.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/lexilla/src/Lexilla/Info.plist b/scite-app/lexilla/src/Lexilla/Info.plist
new file mode 100644
index 0000000..75fdd65
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>5.1.1</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 Neil Hodgson. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..9ca67ce
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -0,0 +1,917 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		283639BC268FD4EA009D58A1 /* LexAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 283639BB268FD4EA009D58A1 /* LexAccessor.cxx */; };
+		28BA72AB24E34D5B00272C2D /* LexerBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA728F24E34D5A00272C2D /* LexerBase.cxx */; };
+		28BA72AC24E34D5B00272C2D /* LexAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729024E34D5A00272C2D /* LexAccessor.h */; };
+		28BA72AD24E34D5B00272C2D /* DefaultLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729124E34D5A00272C2D /* DefaultLexer.h */; };
+		28BA72AE24E34D5B00272C2D /* SubStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729224E34D5A00272C2D /* SubStyles.h */; };
+		28BA72AF24E34D5B00272C2D /* LexerNoExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729324E34D5A00272C2D /* LexerNoExceptions.h */; };
+		28BA72B024E34D5B00272C2D /* LexerModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729424E34D5A00272C2D /* LexerModule.h */; };
+		28BA72B124E34D5B00272C2D /* CharacterCategory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729524E34D5A00272C2D /* CharacterCategory.cxx */; };
+		28BA72B224E34D5B00272C2D /* LexerSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729624E34D5A00272C2D /* LexerSimple.h */; };
+		28BA72B324E34D5B00272C2D /* Accessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729724E34D5A00272C2D /* Accessor.h */; };
+		28BA72B424E34D5B00272C2D /* PropSetSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729824E34D5A00272C2D /* PropSetSimple.cxx */; };
+		28BA72B524E34D5B00272C2D /* CharacterSet.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729924E34D5A00272C2D /* CharacterSet.cxx */; };
+		28BA72B624E34D5B00272C2D /* SparseState.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729A24E34D5A00272C2D /* SparseState.h */; };
+		28BA72B724E34D5B00272C2D /* WordList.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729B24E34D5A00272C2D /* WordList.h */; };
+		28BA72B824E34D5B00272C2D /* DefaultLexer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729C24E34D5A00272C2D /* DefaultLexer.cxx */; };
+		28BA72B924E34D5B00272C2D /* LexerNoExceptions.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729D24E34D5A00272C2D /* LexerNoExceptions.cxx */; };
+		28BA72BA24E34D5B00272C2D /* WordList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA729E24E34D5A00272C2D /* WordList.cxx */; };
+		28BA72BB24E34D5B00272C2D /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729F24E34D5A00272C2D /* OptionSet.h */; };
+		28BA72BC24E34D5B00272C2D /* CatalogueModules.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A024E34D5B00272C2D /* CatalogueModules.h */; };
+		28BA72BD24E34D5B00272C2D /* CharacterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A124E34D5B00272C2D /* CharacterSet.h */; };
+		28BA72BE24E34D5B00272C2D /* StyleContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A224E34D5B00272C2D /* StyleContext.h */; };
+		28BA72BF24E34D5B00272C2D /* PropSetSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A324E34D5B00272C2D /* PropSetSimple.h */; };
+		28BA72C024E34D5B00272C2D /* StringCopy.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A424E34D5B00272C2D /* StringCopy.h */; };
+		28BA72C124E34D5B00272C2D /* LexerModule.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72A524E34D5B00272C2D /* LexerModule.cxx */; };
+		28BA72C224E34D5B00272C2D /* LexerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A624E34D5B00272C2D /* LexerBase.h */; };
+		28BA72C324E34D5B00272C2D /* LexerSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72A724E34D5B00272C2D /* LexerSimple.cxx */; };
+		28BA72C424E34D5B00272C2D /* StyleContext.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72A824E34D5B00272C2D /* StyleContext.cxx */; };
+		28BA72C524E34D5B00272C2D /* CharacterCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA72A924E34D5B00272C2D /* CharacterCategory.h */; };
+		28BA72C624E34D5B00272C2D /* Accessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72AA24E34D5B00272C2D /* Accessor.cxx */; };
+		28BA733924E34D9700272C2D /* LexBasic.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72C724E34D9100272C2D /* LexBasic.cxx */; };
+		28BA733A24E34D9700272C2D /* LexCIL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72C824E34D9100272C2D /* LexCIL.cxx */; };
+		28BA733B24E34D9700272C2D /* LexTCL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72C924E34D9100272C2D /* LexTCL.cxx */; };
+		28BA733C24E34D9700272C2D /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CA24E34D9100272C2D /* LexMetapost.cxx */; };
+		28BA733D24E34D9700272C2D /* LexForth.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CB24E34D9100272C2D /* LexForth.cxx */; };
+		28BA733E24E34D9700272C2D /* LexSML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CC24E34D9100272C2D /* LexSML.cxx */; };
+		28BA733F24E34D9700272C2D /* LexOScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CD24E34D9100272C2D /* LexOScript.cxx */; };
+		28BA734024E34D9700272C2D /* LexTACL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CE24E34D9100272C2D /* LexTACL.cxx */; };
+		28BA734124E34D9700272C2D /* LexGui4Cli.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72CF24E34D9100272C2D /* LexGui4Cli.cxx */; };
+		28BA734224E34D9700272C2D /* LexCLW.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D024E34D9200272C2D /* LexCLW.cxx */; };
+		28BA734324E34D9700272C2D /* LexRebol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D124E34D9200272C2D /* LexRebol.cxx */; };
+		28BA734424E34D9700272C2D /* LexSAS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D224E34D9200272C2D /* LexSAS.cxx */; };
+		28BA734524E34D9700272C2D /* LexNim.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D324E34D9200272C2D /* LexNim.cxx */; };
+		28BA734624E34D9700272C2D /* LexSmalltalk.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D424E34D9200272C2D /* LexSmalltalk.cxx */; };
+		28BA734724E34D9700272C2D /* LexModula.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D524E34D9200272C2D /* LexModula.cxx */; };
+		28BA734824E34D9700272C2D /* LexBullant.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D624E34D9200272C2D /* LexBullant.cxx */; };
+		28BA734924E34D9700272C2D /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D724E34D9200272C2D /* LexASY.cxx */; };
+		28BA734A24E34D9700272C2D /* LexBash.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D824E34D9200272C2D /* LexBash.cxx */; };
+		28BA734B24E34D9700272C2D /* LexEiffel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72D924E34D9200272C2D /* LexEiffel.cxx */; };
+		28BA734C24E34D9700272C2D /* LexVHDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DA24E34D9200272C2D /* LexVHDL.cxx */; };
+		28BA734D24E34D9700272C2D /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DB24E34D9200272C2D /* LexAsn1.cxx */; };
+		28BA734E24E34D9700272C2D /* LexCoffeeScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DC24E34D9200272C2D /* LexCoffeeScript.cxx */; };
+		28BA734F24E34D9700272C2D /* LexDiff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DD24E34D9200272C2D /* LexDiff.cxx */; };
+		28BA735024E34D9700272C2D /* LexSorcus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DE24E34D9200272C2D /* LexSorcus.cxx */; };
+		28BA735124E34D9700272C2D /* LexAPDL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72DF24E34D9200272C2D /* LexAPDL.cxx */; };
+		28BA735224E34D9700272C2D /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E024E34D9200272C2D /* LexD.cxx */; };
+		28BA735324E34D9700272C2D /* LexMySQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E124E34D9200272C2D /* LexMySQL.cxx */; };
+		28BA735424E34D9700272C2D /* LexHollywood.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E224E34D9200272C2D /* LexHollywood.cxx */; };
+		28BA735524E34D9700272C2D /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E324E34D9200272C2D /* LexProgress.cxx */; };
+		28BA735624E34D9700272C2D /* LexLisp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E424E34D9200272C2D /* LexLisp.cxx */; };
+		28BA735724E34D9700272C2D /* LexPowerShell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E524E34D9200272C2D /* LexPowerShell.cxx */; };
+		28BA735824E34D9700272C2D /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E624E34D9200272C2D /* LexPS.cxx */; };
+		28BA735924E34D9700272C2D /* LexYAML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E724E34D9200272C2D /* LexYAML.cxx */; };
+		28BA735A24E34D9700272C2D /* LexErlang.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E824E34D9200272C2D /* LexErlang.cxx */; };
+		28BA735B24E34D9700272C2D /* LexRuby.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72E924E34D9300272C2D /* LexRuby.cxx */; };
+		28BA735C24E34D9700272C2D /* LexIndent.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72EA24E34D9300272C2D /* LexIndent.cxx */; };
+		28BA735D24E34D9700272C2D /* LexErrorList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72EB24E34D9300272C2D /* LexErrorList.cxx */; };
+		28BA735E24E34D9700272C2D /* LexFlagship.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72EC24E34D9300272C2D /* LexFlagship.cxx */; };
+		28BA735F24E34D9700272C2D /* LexLaTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72ED24E34D9300272C2D /* LexLaTeX.cxx */; };
+		28BA736024E34D9700272C2D /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72EE24E34D9300272C2D /* LexAbaqus.cxx */; };
+		28BA736124E34D9700272C2D /* LexBatch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72EF24E34D9300272C2D /* LexBatch.cxx */; };
+		28BA736224E34D9700272C2D /* LexCPP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F024E34D9300272C2D /* LexCPP.cxx */; };
+		28BA736324E34D9700272C2D /* LexRaku.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F124E34D9300272C2D /* LexRaku.cxx */; };
+		28BA736424E34D9700272C2D /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F224E34D9300272C2D /* LexGAP.cxx */; };
+		28BA736524E34D9700272C2D /* LexSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F324E34D9300272C2D /* LexSQL.cxx */; };
+		28BA736624E34D9700272C2D /* LexNsis.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F424E34D9300272C2D /* LexNsis.cxx */; };
+		28BA736724E34D9700272C2D /* LexEDIFACT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F524E34D9300272C2D /* LexEDIFACT.cxx */; };
+		28BA736824E34D9700272C2D /* LexEScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F624E34D9300272C2D /* LexEScript.cxx */; };
+		28BA736924E34D9700272C2D /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F724E34D9300272C2D /* LexPOV.cxx */; };
+		28BA736A24E34D9700272C2D /* LexKVIrc.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F824E34D9300272C2D /* LexKVIrc.cxx */; };
+		28BA736B24E34D9700272C2D /* LexSpecman.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72F924E34D9300272C2D /* LexSpecman.cxx */; };
+		28BA736C24E34D9700272C2D /* LexHTML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FA24E34D9300272C2D /* LexHTML.cxx */; };
+		28BA736D24E34D9700272C2D /* LexFortran.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FB24E34D9400272C2D /* LexFortran.cxx */; };
+		28BA736E24E34D9700272C2D /* LexRegistry.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FC24E34D9400272C2D /* LexRegistry.cxx */; };
+		28BA736F24E34D9700272C2D /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FD24E34D9400272C2D /* LexPython.cxx */; };
+		28BA737024E34D9700272C2D /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FE24E34D9400272C2D /* LexCmake.cxx */; };
+		28BA737124E34D9700272C2D /* LexAsm.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA72FF24E34D9400272C2D /* LexAsm.cxx */; };
+		28BA737224E34D9700272C2D /* LexAda.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730024E34D9400272C2D /* LexAda.cxx */; };
+		28BA737324E34D9700272C2D /* LexCrontab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730124E34D9400272C2D /* LexCrontab.cxx */; };
+		28BA737424E34D9700272C2D /* LexDMIS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730224E34D9400272C2D /* LexDMIS.cxx */; };
+		28BA737524E34D9700272C2D /* LexTCMD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730324E34D9400272C2D /* LexTCMD.cxx */; };
+		28BA737624E34D9700272C2D /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730424E34D9400272C2D /* LexConf.cxx */; };
+		28BA737724E34D9700272C2D /* LexInno.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730524E34D9400272C2D /* LexInno.cxx */; };
+		28BA737824E34D9700272C2D /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730624E34D9400272C2D /* LexA68k.cxx */; };
+		28BA737924E34D9700272C2D /* LexMake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730724E34D9400272C2D /* LexMake.cxx */; };
+		28BA737A24E34D9700272C2D /* LexTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730824E34D9400272C2D /* LexTeX.cxx */; };
+		28BA737B24E34D9700272C2D /* LexSpice.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730924E34D9400272C2D /* LexSpice.cxx */; };
+		28BA737C24E34D9700272C2D /* LexX12.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730A24E34D9400272C2D /* LexX12.cxx */; };
+		28BA737D24E34D9700272C2D /* LexAU3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730B24E34D9400272C2D /* LexAU3.cxx */; };
+		28BA737E24E34D9700272C2D /* LexBaan.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730C24E34D9400272C2D /* LexBaan.cxx */; };
+		28BA737F24E34D9700272C2D /* LexMPT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730D24E34D9500272C2D /* LexMPT.cxx */; };
+		28BA738024E34D9700272C2D /* LexTADS3.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730E24E34D9500272C2D /* LexTADS3.cxx */; };
+		28BA738124E34D9700272C2D /* LexTxt2tags.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA730F24E34D9500272C2D /* LexTxt2tags.cxx */; };
+		28BA738224E34D9700272C2D /* LexMMIXAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731024E34D9500272C2D /* LexMMIXAL.cxx */; };
+		28BA738324E34D9700272C2D /* LexKix.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731124E34D9500272C2D /* LexKix.cxx */; };
+		28BA738424E34D9700272C2D /* LexSTTXT.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731224E34D9500272C2D /* LexSTTXT.cxx */; };
+		28BA738524E34D9700272C2D /* LexMagik.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731324E34D9500272C2D /* LexMagik.cxx */; };
+		28BA738624E34D9700272C2D /* LexNull.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731424E34D9500272C2D /* LexNull.cxx */; };
+		28BA738724E34D9700272C2D /* LexCsound.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731524E34D9500272C2D /* LexCsound.cxx */; };
+		28BA738824E34D9700272C2D /* LexLua.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731624E34D9500272C2D /* LexLua.cxx */; };
+		28BA738924E34D9700272C2D /* LexStata.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731724E34D9500272C2D /* LexStata.cxx */; };
+		28BA738A24E34D9700272C2D /* LexOpal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731824E34D9500272C2D /* LexOpal.cxx */; };
+		28BA738B24E34D9700272C2D /* LexHex.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731924E34D9500272C2D /* LexHex.cxx */; };
+		28BA738C24E34D9700272C2D /* LexVerilog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731A24E34D9500272C2D /* LexVerilog.cxx */; };
+		28BA738D24E34D9700272C2D /* LexHaskell.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731B24E34D9500272C2D /* LexHaskell.cxx */; };
+		28BA738E24E34D9700272C2D /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731C24E34D9500272C2D /* LexR.cxx */; };
+		28BA738F24E34D9700272C2D /* LexScriptol.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731D24E34D9500272C2D /* LexScriptol.cxx */; };
+		28BA739024E34D9700272C2D /* LexVisualProlog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731E24E34D9500272C2D /* LexVisualProlog.cxx */; };
+		28BA739124E34D9700272C2D /* LexVB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA731F24E34D9600272C2D /* LexVB.cxx */; };
+		28BA739224E34D9700272C2D /* LexDMAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732024E34D9600272C2D /* LexDMAP.cxx */; };
+		28BA739324E34D9700272C2D /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732124E34D9600272C2D /* LexAVS.cxx */; };
+		28BA739424E34D9700272C2D /* LexPB.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732224E34D9600272C2D /* LexPB.cxx */; };
+		28BA739524E34D9700272C2D /* LexPO.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732324E34D9600272C2D /* LexPO.cxx */; };
+		28BA739624E34D9700272C2D /* LexPowerPro.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732424E34D9600272C2D /* LexPowerPro.cxx */; };
+		28BA739724E34D9700272C2D /* LexProps.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732524E34D9600272C2D /* LexProps.cxx */; };
+		28BA739824E34D9700272C2D /* LexCOBOL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732624E34D9600272C2D /* LexCOBOL.cxx */; };
+		28BA739924E34D9700272C2D /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732724E34D9600272C2D /* LexPLM.cxx */; };
+		28BA739A24E34D9700272C2D /* LexMSSQL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732824E34D9600272C2D /* LexMSSQL.cxx */; };
+		28BA739B24E34D9700272C2D /* LexCSS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732924E34D9600272C2D /* LexCSS.cxx */; };
+		28BA739C24E34D9700272C2D /* LexMaxima.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732A24E34D9600272C2D /* LexMaxima.cxx */; };
+		28BA739D24E34D9700272C2D /* LexCaml.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732B24E34D9600272C2D /* LexCaml.cxx */; };
+		28BA739E24E34D9700272C2D /* LexDataflex.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732C24E34D9600272C2D /* LexDataflex.cxx */; };
+		28BA739F24E34D9700272C2D /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732D24E34D9600272C2D /* LexLout.cxx */; };
+		28BA73A024E34D9700272C2D /* LexTAL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732E24E34D9600272C2D /* LexTAL.cxx */; };
+		28BA73A124E34D9700272C2D /* LexMarkdown.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA732F24E34D9600272C2D /* LexMarkdown.cxx */; };
+		28BA73A224E34D9700272C2D /* LexJSON.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733024E34D9600272C2D /* LexJSON.cxx */; };
+		28BA73A324E34D9700272C2D /* LexPascal.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733124E34D9700272C2D /* LexPascal.cxx */; };
+		28BA73A424E34D9700272C2D /* LexAVE.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733224E34D9700272C2D /* LexAVE.cxx */; };
+		28BA73A524E34D9700272C2D /* LexECL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733324E34D9700272C2D /* LexECL.cxx */; };
+		28BA73A624E34D9700272C2D /* LexMatlab.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733424E34D9700272C2D /* LexMatlab.cxx */; };
+		28BA73A724E34D9700272C2D /* LexBibTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733524E34D9700272C2D /* LexBibTeX.cxx */; };
+		28BA73A824E34D9700272C2D /* LexNimrod.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733624E34D9700272C2D /* LexNimrod.cxx */; };
+		28BA73A924E34D9700272C2D /* LexPerl.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733724E34D9700272C2D /* LexPerl.cxx */; };
+		28BA73AA24E34D9700272C2D /* LexRust.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733824E34D9700272C2D /* LexRust.cxx */; };
+		28BA73AD24E34DBC00272C2D /* Lexilla.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA73AB24E34DBC00272C2D /* Lexilla.h */; };
+		28BA73AE24E34DBC00272C2D /* Lexilla.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA73AC24E34DBC00272C2D /* Lexilla.cxx */; };
+		70BF497C8D265026B77C97DA /* LexJulia.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 315E4E969868C52C125686B2 /* LexJulia.cxx */; };
+		B32D4A2A9CEC222A5140E99F /* LexFSharp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F8E54626B22BD9493090F40B /* LexFSharp.cxx */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		280262A5246DF655000DF3B8 /* liblexilla.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblexilla.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		283639BB268FD4EA009D58A1 /* LexAccessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAccessor.cxx; path = ../../lexlib/LexAccessor.cxx; sourceTree = "<group>"; };
+		28BA728F24E34D5A00272C2D /* LexerBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerBase.cxx; path = ../../lexlib/LexerBase.cxx; sourceTree = "<group>"; };
+		28BA729024E34D5A00272C2D /* LexAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexAccessor.h; path = ../../lexlib/LexAccessor.h; sourceTree = "<group>"; };
+		28BA729124E34D5A00272C2D /* DefaultLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultLexer.h; path = ../../lexlib/DefaultLexer.h; sourceTree = "<group>"; };
+		28BA729224E34D5A00272C2D /* SubStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SubStyles.h; path = ../../lexlib/SubStyles.h; sourceTree = "<group>"; };
+		28BA729324E34D5A00272C2D /* LexerNoExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerNoExceptions.h; path = ../../lexlib/LexerNoExceptions.h; sourceTree = "<group>"; };
+		28BA729424E34D5A00272C2D /* LexerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerModule.h; path = ../../lexlib/LexerModule.h; sourceTree = "<group>"; };
+		28BA729524E34D5A00272C2D /* CharacterCategory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategory.cxx; path = ../../lexlib/CharacterCategory.cxx; sourceTree = "<group>"; };
+		28BA729624E34D5A00272C2D /* LexerSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerSimple.h; path = ../../lexlib/LexerSimple.h; sourceTree = "<group>"; };
+		28BA729724E34D5A00272C2D /* Accessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Accessor.h; path = ../../lexlib/Accessor.h; sourceTree = "<group>"; };
+		28BA729824E34D5A00272C2D /* PropSetSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PropSetSimple.cxx; path = ../../lexlib/PropSetSimple.cxx; sourceTree = "<group>"; };
+		28BA729924E34D5A00272C2D /* CharacterSet.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterSet.cxx; path = ../../lexlib/CharacterSet.cxx; sourceTree = "<group>"; };
+		28BA729A24E34D5A00272C2D /* SparseState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseState.h; path = ../../lexlib/SparseState.h; sourceTree = "<group>"; };
+		28BA729B24E34D5A00272C2D /* WordList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordList.h; path = ../../lexlib/WordList.h; sourceTree = "<group>"; };
+		28BA729C24E34D5A00272C2D /* DefaultLexer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultLexer.cxx; path = ../../lexlib/DefaultLexer.cxx; sourceTree = "<group>"; };
+		28BA729D24E34D5A00272C2D /* LexerNoExceptions.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerNoExceptions.cxx; path = ../../lexlib/LexerNoExceptions.cxx; sourceTree = "<group>"; };
+		28BA729E24E34D5A00272C2D /* WordList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../lexlib/WordList.cxx; sourceTree = "<group>"; };
+		28BA729F24E34D5A00272C2D /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionSet.h; path = ../../lexlib/OptionSet.h; sourceTree = "<group>"; };
+		28BA72A024E34D5B00272C2D /* CatalogueModules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CatalogueModules.h; path = ../../lexlib/CatalogueModules.h; sourceTree = "<group>"; };
+		28BA72A124E34D5B00272C2D /* CharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterSet.h; path = ../../lexlib/CharacterSet.h; sourceTree = "<group>"; };
+		28BA72A224E34D5B00272C2D /* StyleContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleContext.h; path = ../../lexlib/StyleContext.h; sourceTree = "<group>"; };
+		28BA72A324E34D5B00272C2D /* PropSetSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropSetSimple.h; path = ../../lexlib/PropSetSimple.h; sourceTree = "<group>"; };
+		28BA72A424E34D5B00272C2D /* StringCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringCopy.h; path = ../../lexlib/StringCopy.h; sourceTree = "<group>"; };
+		28BA72A524E34D5B00272C2D /* LexerModule.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerModule.cxx; path = ../../lexlib/LexerModule.cxx; sourceTree = "<group>"; };
+		28BA72A624E34D5B00272C2D /* LexerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexerBase.h; path = ../../lexlib/LexerBase.h; sourceTree = "<group>"; };
+		28BA72A724E34D5B00272C2D /* LexerSimple.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerSimple.cxx; path = ../../lexlib/LexerSimple.cxx; sourceTree = "<group>"; };
+		28BA72A824E34D5B00272C2D /* StyleContext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleContext.cxx; path = ../../lexlib/StyleContext.cxx; sourceTree = "<group>"; };
+		28BA72A924E34D5B00272C2D /* CharacterCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategory.h; path = ../../lexlib/CharacterCategory.h; sourceTree = "<group>"; };
+		28BA72AA24E34D5B00272C2D /* Accessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Accessor.cxx; path = ../../lexlib/Accessor.cxx; sourceTree = "<group>"; };
+		28BA72C724E34D9100272C2D /* LexBasic.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBasic.cxx; path = ../../lexers/LexBasic.cxx; sourceTree = "<group>"; };
+		28BA72C824E34D9100272C2D /* LexCIL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCIL.cxx; path = ../../lexers/LexCIL.cxx; sourceTree = "<group>"; };
+		28BA72C924E34D9100272C2D /* LexTCL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCL.cxx; path = ../../lexers/LexTCL.cxx; sourceTree = "<group>"; };
+		28BA72CA24E34D9100272C2D /* LexMetapost.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../lexers/LexMetapost.cxx; sourceTree = "<group>"; };
+		28BA72CB24E34D9100272C2D /* LexForth.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexForth.cxx; path = ../../lexers/LexForth.cxx; sourceTree = "<group>"; };
+		28BA72CC24E34D9100272C2D /* LexSML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSML.cxx; path = ../../lexers/LexSML.cxx; sourceTree = "<group>"; };
+		28BA72CD24E34D9100272C2D /* LexOScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOScript.cxx; path = ../../lexers/LexOScript.cxx; sourceTree = "<group>"; };
+		28BA72CE24E34D9100272C2D /* LexTACL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTACL.cxx; path = ../../lexers/LexTACL.cxx; sourceTree = "<group>"; };
+		28BA72CF24E34D9100272C2D /* LexGui4Cli.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGui4Cli.cxx; path = ../../lexers/LexGui4Cli.cxx; sourceTree = "<group>"; };
+		28BA72D024E34D9200272C2D /* LexCLW.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCLW.cxx; path = ../../lexers/LexCLW.cxx; sourceTree = "<group>"; };
+		28BA72D124E34D9200272C2D /* LexRebol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../lexers/LexRebol.cxx; sourceTree = "<group>"; };
+		28BA72D224E34D9200272C2D /* LexSAS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSAS.cxx; path = ../../lexers/LexSAS.cxx; sourceTree = "<group>"; };
+		28BA72D324E34D9200272C2D /* LexNim.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNim.cxx; path = ../../lexers/LexNim.cxx; sourceTree = "<group>"; };
+		28BA72D424E34D9200272C2D /* LexSmalltalk.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSmalltalk.cxx; path = ../../lexers/LexSmalltalk.cxx; sourceTree = "<group>"; };
+		28BA72D524E34D9200272C2D /* LexModula.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexModula.cxx; path = ../../lexers/LexModula.cxx; sourceTree = "<group>"; };
+		28BA72D624E34D9200272C2D /* LexBullant.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBullant.cxx; path = ../../lexers/LexBullant.cxx; sourceTree = "<group>"; };
+		28BA72D724E34D9200272C2D /* LexASY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexASY.cxx; path = ../../lexers/LexASY.cxx; sourceTree = "<group>"; };
+		28BA72D824E34D9200272C2D /* LexBash.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBash.cxx; path = ../../lexers/LexBash.cxx; sourceTree = "<group>"; };
+		28BA72D924E34D9200272C2D /* LexEiffel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEiffel.cxx; path = ../../lexers/LexEiffel.cxx; sourceTree = "<group>"; };
+		28BA72DA24E34D9200272C2D /* LexVHDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVHDL.cxx; path = ../../lexers/LexVHDL.cxx; sourceTree = "<group>"; };
+		28BA72DB24E34D9200272C2D /* LexAsn1.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../lexers/LexAsn1.cxx; sourceTree = "<group>"; };
+		28BA72DC24E34D9200272C2D /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
+		28BA72DD24E34D9200272C2D /* LexDiff.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDiff.cxx; path = ../../lexers/LexDiff.cxx; sourceTree = "<group>"; };
+		28BA72DE24E34D9200272C2D /* LexSorcus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSorcus.cxx; path = ../../lexers/LexSorcus.cxx; sourceTree = "<group>"; };
+		28BA72DF24E34D9200272C2D /* LexAPDL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAPDL.cxx; path = ../../lexers/LexAPDL.cxx; sourceTree = "<group>"; };
+		28BA72E024E34D9200272C2D /* LexD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexD.cxx; path = ../../lexers/LexD.cxx; sourceTree = "<group>"; };
+		28BA72E124E34D9200272C2D /* LexMySQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMySQL.cxx; path = ../../lexers/LexMySQL.cxx; sourceTree = "<group>"; };
+		28BA72E224E34D9200272C2D /* LexHollywood.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHollywood.cxx; path = ../../lexers/LexHollywood.cxx; sourceTree = "<group>"; };
+		28BA72E324E34D9200272C2D /* LexProgress.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexProgress.cxx; path = ../../lexers/LexProgress.cxx; sourceTree = "<group>"; };
+		28BA72E424E34D9200272C2D /* LexLisp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../lexers/LexLisp.cxx; sourceTree = "<group>"; };
+		28BA72E524E34D9200272C2D /* LexPowerShell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerShell.cxx; path = ../../lexers/LexPowerShell.cxx; sourceTree = "<group>"; };
+		28BA72E624E34D9200272C2D /* LexPS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPS.cxx; path = ../../lexers/LexPS.cxx; sourceTree = "<group>"; };
+		28BA72E724E34D9200272C2D /* LexYAML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexYAML.cxx; path = ../../lexers/LexYAML.cxx; sourceTree = "<group>"; };
+		28BA72E824E34D9200272C2D /* LexErlang.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexErlang.cxx; path = ../../lexers/LexErlang.cxx; sourceTree = "<group>"; };
+		28BA72E924E34D9300272C2D /* LexRuby.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRuby.cxx; path = ../../lexers/LexRuby.cxx; sourceTree = "<group>"; };
+		28BA72EA24E34D9300272C2D /* LexIndent.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexIndent.cxx; path = ../../lexers/LexIndent.cxx; sourceTree = "<group>"; };
+		28BA72EB24E34D9300272C2D /* LexErrorList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexErrorList.cxx; path = ../../lexers/LexErrorList.cxx; sourceTree = "<group>"; };
+		28BA72EC24E34D9300272C2D /* LexFlagship.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFlagship.cxx; path = ../../lexers/LexFlagship.cxx; sourceTree = "<group>"; };
+		28BA72ED24E34D9300272C2D /* LexLaTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLaTeX.cxx; path = ../../lexers/LexLaTeX.cxx; sourceTree = "<group>"; };
+		28BA72EE24E34D9300272C2D /* LexAbaqus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAbaqus.cxx; path = ../../lexers/LexAbaqus.cxx; sourceTree = "<group>"; };
+		28BA72EF24E34D9300272C2D /* LexBatch.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBatch.cxx; path = ../../lexers/LexBatch.cxx; sourceTree = "<group>"; };
+		28BA72F024E34D9300272C2D /* LexCPP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCPP.cxx; path = ../../lexers/LexCPP.cxx; sourceTree = "<group>"; };
+		28BA72F124E34D9300272C2D /* LexRaku.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRaku.cxx; path = ../../lexers/LexRaku.cxx; sourceTree = "<group>"; };
+		28BA72F224E34D9300272C2D /* LexGAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexGAP.cxx; path = ../../lexers/LexGAP.cxx; sourceTree = "<group>"; };
+		28BA72F324E34D9300272C2D /* LexSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSQL.cxx; path = ../../lexers/LexSQL.cxx; sourceTree = "<group>"; };
+		28BA72F424E34D9300272C2D /* LexNsis.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNsis.cxx; path = ../../lexers/LexNsis.cxx; sourceTree = "<group>"; };
+		28BA72F524E34D9300272C2D /* LexEDIFACT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEDIFACT.cxx; path = ../../lexers/LexEDIFACT.cxx; sourceTree = "<group>"; };
+		28BA72F624E34D9300272C2D /* LexEScript.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexEScript.cxx; path = ../../lexers/LexEScript.cxx; sourceTree = "<group>"; };
+		28BA72F724E34D9300272C2D /* LexPOV.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPOV.cxx; path = ../../lexers/LexPOV.cxx; sourceTree = "<group>"; };
+		28BA72F824E34D9300272C2D /* LexKVIrc.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKVIrc.cxx; path = ../../lexers/LexKVIrc.cxx; sourceTree = "<group>"; };
+		28BA72F924E34D9300272C2D /* LexSpecman.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpecman.cxx; path = ../../lexers/LexSpecman.cxx; sourceTree = "<group>"; };
+		28BA72FA24E34D9300272C2D /* LexHTML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHTML.cxx; path = ../../lexers/LexHTML.cxx; sourceTree = "<group>"; };
+		28BA72FB24E34D9400272C2D /* LexFortran.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFortran.cxx; path = ../../lexers/LexFortran.cxx; sourceTree = "<group>"; };
+		28BA72FC24E34D9400272C2D /* LexRegistry.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRegistry.cxx; path = ../../lexers/LexRegistry.cxx; sourceTree = "<group>"; };
+		28BA72FD24E34D9400272C2D /* LexPython.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPython.cxx; path = ../../lexers/LexPython.cxx; sourceTree = "<group>"; };
+		28BA72FE24E34D9400272C2D /* LexCmake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../lexers/LexCmake.cxx; sourceTree = "<group>"; };
+		28BA72FF24E34D9400272C2D /* LexAsm.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsm.cxx; path = ../../lexers/LexAsm.cxx; sourceTree = "<group>"; };
+		28BA730024E34D9400272C2D /* LexAda.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAda.cxx; path = ../../lexers/LexAda.cxx; sourceTree = "<group>"; };
+		28BA730124E34D9400272C2D /* LexCrontab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCrontab.cxx; path = ../../lexers/LexCrontab.cxx; sourceTree = "<group>"; };
+		28BA730224E34D9400272C2D /* LexDMIS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMIS.cxx; path = ../../lexers/LexDMIS.cxx; sourceTree = "<group>"; };
+		28BA730324E34D9400272C2D /* LexTCMD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTCMD.cxx; path = ../../lexers/LexTCMD.cxx; sourceTree = "<group>"; };
+		28BA730424E34D9400272C2D /* LexConf.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexConf.cxx; path = ../../lexers/LexConf.cxx; sourceTree = "<group>"; };
+		28BA730524E34D9400272C2D /* LexInno.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexInno.cxx; path = ../../lexers/LexInno.cxx; sourceTree = "<group>"; };
+		28BA730624E34D9400272C2D /* LexA68k.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../lexers/LexA68k.cxx; sourceTree = "<group>"; };
+		28BA730724E34D9400272C2D /* LexMake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMake.cxx; path = ../../lexers/LexMake.cxx; sourceTree = "<group>"; };
+		28BA730824E34D9400272C2D /* LexTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../lexers/LexTeX.cxx; sourceTree = "<group>"; };
+		28BA730924E34D9400272C2D /* LexSpice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSpice.cxx; path = ../../lexers/LexSpice.cxx; sourceTree = "<group>"; };
+		28BA730A24E34D9400272C2D /* LexX12.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexX12.cxx; path = ../../lexers/LexX12.cxx; sourceTree = "<group>"; };
+		28BA730B24E34D9400272C2D /* LexAU3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAU3.cxx; path = ../../lexers/LexAU3.cxx; sourceTree = "<group>"; };
+		28BA730C24E34D9400272C2D /* LexBaan.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBaan.cxx; path = ../../lexers/LexBaan.cxx; sourceTree = "<group>"; };
+		28BA730D24E34D9500272C2D /* LexMPT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMPT.cxx; path = ../../lexers/LexMPT.cxx; sourceTree = "<group>"; };
+		28BA730E24E34D9500272C2D /* LexTADS3.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTADS3.cxx; path = ../../lexers/LexTADS3.cxx; sourceTree = "<group>"; };
+		28BA730F24E34D9500272C2D /* LexTxt2tags.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTxt2tags.cxx; path = ../../lexers/LexTxt2tags.cxx; sourceTree = "<group>"; };
+		28BA731024E34D9500272C2D /* LexMMIXAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMMIXAL.cxx; path = ../../lexers/LexMMIXAL.cxx; sourceTree = "<group>"; };
+		28BA731124E34D9500272C2D /* LexKix.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKix.cxx; path = ../../lexers/LexKix.cxx; sourceTree = "<group>"; };
+		28BA731224E34D9500272C2D /* LexSTTXT.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSTTXT.cxx; path = ../../lexers/LexSTTXT.cxx; sourceTree = "<group>"; };
+		28BA731324E34D9500272C2D /* LexMagik.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMagik.cxx; path = ../../lexers/LexMagik.cxx; sourceTree = "<group>"; };
+		28BA731424E34D9500272C2D /* LexNull.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNull.cxx; path = ../../lexers/LexNull.cxx; sourceTree = "<group>"; };
+		28BA731524E34D9500272C2D /* LexCsound.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCsound.cxx; path = ../../lexers/LexCsound.cxx; sourceTree = "<group>"; };
+		28BA731624E34D9500272C2D /* LexLua.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLua.cxx; path = ../../lexers/LexLua.cxx; sourceTree = "<group>"; };
+		28BA731724E34D9500272C2D /* LexStata.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexStata.cxx; path = ../../lexers/LexStata.cxx; sourceTree = "<group>"; };
+		28BA731824E34D9500272C2D /* LexOpal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../lexers/LexOpal.cxx; sourceTree = "<group>"; };
+		28BA731924E34D9500272C2D /* LexHex.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHex.cxx; path = ../../lexers/LexHex.cxx; sourceTree = "<group>"; };
+		28BA731A24E34D9500272C2D /* LexVerilog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVerilog.cxx; path = ../../lexers/LexVerilog.cxx; sourceTree = "<group>"; };
+		28BA731B24E34D9500272C2D /* LexHaskell.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexHaskell.cxx; path = ../../lexers/LexHaskell.cxx; sourceTree = "<group>"; };
+		28BA731C24E34D9500272C2D /* LexR.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexR.cxx; path = ../../lexers/LexR.cxx; sourceTree = "<group>"; };
+		28BA731D24E34D9500272C2D /* LexScriptol.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexScriptol.cxx; path = ../../lexers/LexScriptol.cxx; sourceTree = "<group>"; };
+		28BA731E24E34D9500272C2D /* LexVisualProlog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVisualProlog.cxx; path = ../../lexers/LexVisualProlog.cxx; sourceTree = "<group>"; };
+		28BA731F24E34D9600272C2D /* LexVB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexVB.cxx; path = ../../lexers/LexVB.cxx; sourceTree = "<group>"; };
+		28BA732024E34D9600272C2D /* LexDMAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../lexers/LexDMAP.cxx; sourceTree = "<group>"; };
+		28BA732124E34D9600272C2D /* LexAVS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVS.cxx; path = ../../lexers/LexAVS.cxx; sourceTree = "<group>"; };
+		28BA732224E34D9600272C2D /* LexPB.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPB.cxx; path = ../../lexers/LexPB.cxx; sourceTree = "<group>"; };
+		28BA732324E34D9600272C2D /* LexPO.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPO.cxx; path = ../../lexers/LexPO.cxx; sourceTree = "<group>"; };
+		28BA732424E34D9600272C2D /* LexPowerPro.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPowerPro.cxx; path = ../../lexers/LexPowerPro.cxx; sourceTree = "<group>"; };
+		28BA732524E34D9600272C2D /* LexProps.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexProps.cxx; path = ../../lexers/LexProps.cxx; sourceTree = "<group>"; };
+		28BA732624E34D9600272C2D /* LexCOBOL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCOBOL.cxx; path = ../../lexers/LexCOBOL.cxx; sourceTree = "<group>"; };
+		28BA732724E34D9600272C2D /* LexPLM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPLM.cxx; path = ../../lexers/LexPLM.cxx; sourceTree = "<group>"; };
+		28BA732824E34D9600272C2D /* LexMSSQL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMSSQL.cxx; path = ../../lexers/LexMSSQL.cxx; sourceTree = "<group>"; };
+		28BA732924E34D9600272C2D /* LexCSS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../lexers/LexCSS.cxx; sourceTree = "<group>"; };
+		28BA732A24E34D9600272C2D /* LexMaxima.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMaxima.cxx; path = ../../lexers/LexMaxima.cxx; sourceTree = "<group>"; };
+		28BA732B24E34D9600272C2D /* LexCaml.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCaml.cxx; path = ../../lexers/LexCaml.cxx; sourceTree = "<group>"; };
+		28BA732C24E34D9600272C2D /* LexDataflex.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDataflex.cxx; path = ../../lexers/LexDataflex.cxx; sourceTree = "<group>"; };
+		28BA732D24E34D9600272C2D /* LexLout.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexLout.cxx; path = ../../lexers/LexLout.cxx; sourceTree = "<group>"; };
+		28BA732E24E34D9600272C2D /* LexTAL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTAL.cxx; path = ../../lexers/LexTAL.cxx; sourceTree = "<group>"; };
+		28BA732F24E34D9600272C2D /* LexMarkdown.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../lexers/LexMarkdown.cxx; sourceTree = "<group>"; };
+		28BA733024E34D9600272C2D /* LexJSON.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexJSON.cxx; path = ../../lexers/LexJSON.cxx; sourceTree = "<group>"; };
+		28BA733124E34D9700272C2D /* LexPascal.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPascal.cxx; path = ../../lexers/LexPascal.cxx; sourceTree = "<group>"; };
+		28BA733224E34D9700272C2D /* LexAVE.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVE.cxx; path = ../../lexers/LexAVE.cxx; sourceTree = "<group>"; };
+		28BA733324E34D9700272C2D /* LexECL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexECL.cxx; path = ../../lexers/LexECL.cxx; sourceTree = "<group>"; };
+		28BA733424E34D9700272C2D /* LexMatlab.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMatlab.cxx; path = ../../lexers/LexMatlab.cxx; sourceTree = "<group>"; };
+		28BA733524E34D9700272C2D /* LexBibTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBibTeX.cxx; path = ../../lexers/LexBibTeX.cxx; sourceTree = "<group>"; };
+		28BA733624E34D9700272C2D /* LexNimrod.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexNimrod.cxx; path = ../../lexers/LexNimrod.cxx; sourceTree = "<group>"; };
+		28BA733724E34D9700272C2D /* LexPerl.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexPerl.cxx; path = ../../lexers/LexPerl.cxx; sourceTree = "<group>"; };
+		28BA733824E34D9700272C2D /* LexRust.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexRust.cxx; path = ../../lexers/LexRust.cxx; sourceTree = "<group>"; };
+		28BA73AB24E34DBC00272C2D /* Lexilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Lexilla.h; path = ../Lexilla.h; sourceTree = "<group>"; };
+		28BA73AC24E34DBC00272C2D /* Lexilla.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lexilla.cxx; path = ../Lexilla.cxx; sourceTree = "<group>"; };
+		28BA73B024E3510900272C2D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		315E4E969868C52C125686B2 /* LexJulia.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexJulia.cxx; path = ../../lexers/LexJulia.cxx; sourceTree = SOURCE_ROOT; };
+		F8E54626B22BD9493090F40B /* LexFSharp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFSharp.cxx; path = ../../lexers/LexFSharp.cxx; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		280262A3246DF655000DF3B8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2802629C246DF655000DF3B8 = {
+			isa = PBXGroup;
+			children = (
+				28BA73B024E3510900272C2D /* Info.plist */,
+				280262B8246DF776000DF3B8 /* LexLib */,
+				280262B7246DF765000DF3B8 /* Lexers */,
+				280262A7246DF655000DF3B8 /* Lexilla */,
+				280262A6246DF655000DF3B8 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		280262A6246DF655000DF3B8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				280262A5246DF655000DF3B8 /* liblexilla.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		280262A7246DF655000DF3B8 /* Lexilla */ = {
+			isa = PBXGroup;
+			children = (
+				28BA73AC24E34DBC00272C2D /* Lexilla.cxx */,
+				28BA73AB24E34DBC00272C2D /* Lexilla.h */,
+			);
+			name = Lexilla;
+			sourceTree = "<group>";
+		};
+		280262B7246DF765000DF3B8 /* Lexers */ = {
+			isa = PBXGroup;
+			children = (
+				28BA730624E34D9400272C2D /* LexA68k.cxx */,
+				28BA72EE24E34D9300272C2D /* LexAbaqus.cxx */,
+				28BA730024E34D9400272C2D /* LexAda.cxx */,
+				28BA72DF24E34D9200272C2D /* LexAPDL.cxx */,
+				28BA72FF24E34D9400272C2D /* LexAsm.cxx */,
+				28BA72DB24E34D9200272C2D /* LexAsn1.cxx */,
+				28BA72D724E34D9200272C2D /* LexASY.cxx */,
+				28BA730B24E34D9400272C2D /* LexAU3.cxx */,
+				28BA733224E34D9700272C2D /* LexAVE.cxx */,
+				28BA732124E34D9600272C2D /* LexAVS.cxx */,
+				28BA730C24E34D9400272C2D /* LexBaan.cxx */,
+				28BA72D824E34D9200272C2D /* LexBash.cxx */,
+				28BA72C724E34D9100272C2D /* LexBasic.cxx */,
+				28BA72EF24E34D9300272C2D /* LexBatch.cxx */,
+				28BA733524E34D9700272C2D /* LexBibTeX.cxx */,
+				28BA72D624E34D9200272C2D /* LexBullant.cxx */,
+				28BA732B24E34D9600272C2D /* LexCaml.cxx */,
+				28BA72C824E34D9100272C2D /* LexCIL.cxx */,
+				28BA72D024E34D9200272C2D /* LexCLW.cxx */,
+				28BA72FE24E34D9400272C2D /* LexCmake.cxx */,
+				28BA732624E34D9600272C2D /* LexCOBOL.cxx */,
+				28BA72DC24E34D9200272C2D /* LexCoffeeScript.cxx */,
+				28BA730424E34D9400272C2D /* LexConf.cxx */,
+				28BA72F024E34D9300272C2D /* LexCPP.cxx */,
+				28BA730124E34D9400272C2D /* LexCrontab.cxx */,
+				28BA731524E34D9500272C2D /* LexCsound.cxx */,
+				28BA732924E34D9600272C2D /* LexCSS.cxx */,
+				28BA72E024E34D9200272C2D /* LexD.cxx */,
+				28BA732C24E34D9600272C2D /* LexDataflex.cxx */,
+				28BA72DD24E34D9200272C2D /* LexDiff.cxx */,
+				28BA732024E34D9600272C2D /* LexDMAP.cxx */,
+				28BA730224E34D9400272C2D /* LexDMIS.cxx */,
+				28BA733324E34D9700272C2D /* LexECL.cxx */,
+				28BA72F524E34D9300272C2D /* LexEDIFACT.cxx */,
+				28BA72D924E34D9200272C2D /* LexEiffel.cxx */,
+				28BA72E824E34D9200272C2D /* LexErlang.cxx */,
+				28BA72EB24E34D9300272C2D /* LexErrorList.cxx */,
+				28BA72F624E34D9300272C2D /* LexEScript.cxx */,
+				28BA72EC24E34D9300272C2D /* LexFlagship.cxx */,
+				28BA72CB24E34D9100272C2D /* LexForth.cxx */,
+				28BA72FB24E34D9400272C2D /* LexFortran.cxx */,
+				F8E54626B22BD9493090F40B /* LexFSharp.cxx */,
+				28BA72F224E34D9300272C2D /* LexGAP.cxx */,
+				28BA72CF24E34D9100272C2D /* LexGui4Cli.cxx */,
+				28BA731B24E34D9500272C2D /* LexHaskell.cxx */,
+				28BA731924E34D9500272C2D /* LexHex.cxx */,
+				28BA72E224E34D9200272C2D /* LexHollywood.cxx */,
+				28BA72FA24E34D9300272C2D /* LexHTML.cxx */,
+				28BA72EA24E34D9300272C2D /* LexIndent.cxx */,
+				28BA730524E34D9400272C2D /* LexInno.cxx */,
+				28BA733024E34D9600272C2D /* LexJSON.cxx */,
+				315E4E969868C52C125686B2 /* LexJulia.cxx */,
+				28BA731124E34D9500272C2D /* LexKix.cxx */,
+				28BA72F824E34D9300272C2D /* LexKVIrc.cxx */,
+				28BA72ED24E34D9300272C2D /* LexLaTeX.cxx */,
+				28BA72E424E34D9200272C2D /* LexLisp.cxx */,
+				28BA732D24E34D9600272C2D /* LexLout.cxx */,
+				28BA731624E34D9500272C2D /* LexLua.cxx */,
+				28BA731324E34D9500272C2D /* LexMagik.cxx */,
+				28BA730724E34D9400272C2D /* LexMake.cxx */,
+				28BA732F24E34D9600272C2D /* LexMarkdown.cxx */,
+				28BA733424E34D9700272C2D /* LexMatlab.cxx */,
+				28BA732A24E34D9600272C2D /* LexMaxima.cxx */,
+				28BA72CA24E34D9100272C2D /* LexMetapost.cxx */,
+				28BA731024E34D9500272C2D /* LexMMIXAL.cxx */,
+				28BA72D524E34D9200272C2D /* LexModula.cxx */,
+				28BA730D24E34D9500272C2D /* LexMPT.cxx */,
+				28BA732824E34D9600272C2D /* LexMSSQL.cxx */,
+				28BA72E124E34D9200272C2D /* LexMySQL.cxx */,
+				28BA72D324E34D9200272C2D /* LexNim.cxx */,
+				28BA733624E34D9700272C2D /* LexNimrod.cxx */,
+				28BA72F424E34D9300272C2D /* LexNsis.cxx */,
+				28BA731424E34D9500272C2D /* LexNull.cxx */,
+				28BA731824E34D9500272C2D /* LexOpal.cxx */,
+				28BA72CD24E34D9100272C2D /* LexOScript.cxx */,
+				28BA733124E34D9700272C2D /* LexPascal.cxx */,
+				28BA732224E34D9600272C2D /* LexPB.cxx */,
+				28BA733724E34D9700272C2D /* LexPerl.cxx */,
+				28BA732724E34D9600272C2D /* LexPLM.cxx */,
+				28BA732324E34D9600272C2D /* LexPO.cxx */,
+				28BA72F724E34D9300272C2D /* LexPOV.cxx */,
+				28BA732424E34D9600272C2D /* LexPowerPro.cxx */,
+				28BA72E524E34D9200272C2D /* LexPowerShell.cxx */,
+				28BA72E324E34D9200272C2D /* LexProgress.cxx */,
+				28BA732524E34D9600272C2D /* LexProps.cxx */,
+				28BA72E624E34D9200272C2D /* LexPS.cxx */,
+				28BA72FD24E34D9400272C2D /* LexPython.cxx */,
+				28BA731C24E34D9500272C2D /* LexR.cxx */,
+				28BA72F124E34D9300272C2D /* LexRaku.cxx */,
+				28BA72D124E34D9200272C2D /* LexRebol.cxx */,
+				28BA72FC24E34D9400272C2D /* LexRegistry.cxx */,
+				28BA72E924E34D9300272C2D /* LexRuby.cxx */,
+				28BA733824E34D9700272C2D /* LexRust.cxx */,
+				28BA72D224E34D9200272C2D /* LexSAS.cxx */,
+				28BA731D24E34D9500272C2D /* LexScriptol.cxx */,
+				28BA72D424E34D9200272C2D /* LexSmalltalk.cxx */,
+				28BA72CC24E34D9100272C2D /* LexSML.cxx */,
+				28BA72DE24E34D9200272C2D /* LexSorcus.cxx */,
+				28BA72F924E34D9300272C2D /* LexSpecman.cxx */,
+				28BA730924E34D9400272C2D /* LexSpice.cxx */,
+				28BA72F324E34D9300272C2D /* LexSQL.cxx */,
+				28BA731724E34D9500272C2D /* LexStata.cxx */,
+				28BA731224E34D9500272C2D /* LexSTTXT.cxx */,
+				28BA72CE24E34D9100272C2D /* LexTACL.cxx */,
+				28BA730E24E34D9500272C2D /* LexTADS3.cxx */,
+				28BA732E24E34D9600272C2D /* LexTAL.cxx */,
+				28BA72C924E34D9100272C2D /* LexTCL.cxx */,
+				28BA730324E34D9400272C2D /* LexTCMD.cxx */,
+				28BA730824E34D9400272C2D /* LexTeX.cxx */,
+				28BA730F24E34D9500272C2D /* LexTxt2tags.cxx */,
+				28BA731F24E34D9600272C2D /* LexVB.cxx */,
+				28BA731A24E34D9500272C2D /* LexVerilog.cxx */,
+				28BA72DA24E34D9200272C2D /* LexVHDL.cxx */,
+				28BA731E24E34D9500272C2D /* LexVisualProlog.cxx */,
+				28BA730A24E34D9400272C2D /* LexX12.cxx */,
+				28BA72E724E34D9200272C2D /* LexYAML.cxx */,
+			);
+			name = Lexers;
+			sourceTree = "<group>";
+		};
+		280262B8246DF776000DF3B8 /* LexLib */ = {
+			isa = PBXGroup;
+			children = (
+				28BA72AA24E34D5B00272C2D /* Accessor.cxx */,
+				28BA729724E34D5A00272C2D /* Accessor.h */,
+				28BA72A024E34D5B00272C2D /* CatalogueModules.h */,
+				28BA729524E34D5A00272C2D /* CharacterCategory.cxx */,
+				28BA72A924E34D5B00272C2D /* CharacterCategory.h */,
+				28BA729924E34D5A00272C2D /* CharacterSet.cxx */,
+				28BA72A124E34D5B00272C2D /* CharacterSet.h */,
+				28BA729C24E34D5A00272C2D /* DefaultLexer.cxx */,
+				28BA729124E34D5A00272C2D /* DefaultLexer.h */,
+				283639BB268FD4EA009D58A1 /* LexAccessor.cxx */,
+				28BA729024E34D5A00272C2D /* LexAccessor.h */,
+				28BA728F24E34D5A00272C2D /* LexerBase.cxx */,
+				28BA72A624E34D5B00272C2D /* LexerBase.h */,
+				28BA72A524E34D5B00272C2D /* LexerModule.cxx */,
+				28BA729424E34D5A00272C2D /* LexerModule.h */,
+				28BA729D24E34D5A00272C2D /* LexerNoExceptions.cxx */,
+				28BA729324E34D5A00272C2D /* LexerNoExceptions.h */,
+				28BA72A724E34D5B00272C2D /* LexerSimple.cxx */,
+				28BA729624E34D5A00272C2D /* LexerSimple.h */,
+				28BA729F24E34D5A00272C2D /* OptionSet.h */,
+				28BA729824E34D5A00272C2D /* PropSetSimple.cxx */,
+				28BA72A324E34D5B00272C2D /* PropSetSimple.h */,
+				28BA729A24E34D5A00272C2D /* SparseState.h */,
+				28BA72A424E34D5B00272C2D /* StringCopy.h */,
+				28BA72A824E34D5B00272C2D /* StyleContext.cxx */,
+				28BA72A224E34D5B00272C2D /* StyleContext.h */,
+				28BA729224E34D5A00272C2D /* SubStyles.h */,
+				28BA729E24E34D5A00272C2D /* WordList.cxx */,
+				28BA729B24E34D5A00272C2D /* WordList.h */,
+			);
+			name = LexLib;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		280262A1246DF655000DF3B8 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				28BA73AD24E34DBC00272C2D /* Lexilla.h in Headers */,
+				28BA72BF24E34D5B00272C2D /* PropSetSimple.h in Headers */,
+				28BA72B224E34D5B00272C2D /* LexerSimple.h in Headers */,
+				28BA72AF24E34D5B00272C2D /* LexerNoExceptions.h in Headers */,
+				28BA72B724E34D5B00272C2D /* WordList.h in Headers */,
+				28BA72C024E34D5B00272C2D /* StringCopy.h in Headers */,
+				28BA72AD24E34D5B00272C2D /* DefaultLexer.h in Headers */,
+				28BA72B324E34D5B00272C2D /* Accessor.h in Headers */,
+				28BA72BE24E34D5B00272C2D /* StyleContext.h in Headers */,
+				28BA72BB24E34D5B00272C2D /* OptionSet.h in Headers */,
+				28BA72B024E34D5B00272C2D /* LexerModule.h in Headers */,
+				28BA72AC24E34D5B00272C2D /* LexAccessor.h in Headers */,
+				28BA72C524E34D5B00272C2D /* CharacterCategory.h in Headers */,
+				28BA72BD24E34D5B00272C2D /* CharacterSet.h in Headers */,
+				28BA72AE24E34D5B00272C2D /* SubStyles.h in Headers */,
+				28BA72BC24E34D5B00272C2D /* CatalogueModules.h in Headers */,
+				28BA72C224E34D5B00272C2D /* LexerBase.h in Headers */,
+				28BA72B624E34D5B00272C2D /* SparseState.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		280262A4246DF655000DF3B8 /* lexilla */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 280262B0246DF655000DF3B8 /* Build configuration list for PBXNativeTarget "lexilla" */;
+			buildPhases = (
+				280262A1246DF655000DF3B8 /* Headers */,
+				280262A2246DF655000DF3B8 /* Sources */,
+				280262A3246DF655000DF3B8 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = lexilla;
+			productName = lexilla;
+			productReference = 280262A5246DF655000DF3B8 /* liblexilla.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2802629D246DF655000DF3B8 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1200;
+				ORGANIZATIONNAME = "Neil Hodgson";
+				TargetAttributes = {
+					280262A4246DF655000DF3B8 = {
+						CreatedOnToolsVersion = 11.4.1;
+					};
+				};
+			};
+			buildConfigurationList = 280262A0246DF655000DF3B8 /* Build configuration list for PBXProject "Lexilla" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 2802629C246DF655000DF3B8;
+			productRefGroup = 280262A6246DF655000DF3B8 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				280262A4246DF655000DF3B8 /* lexilla */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		280262A2246DF655000DF3B8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				28BA739A24E34D9700272C2D /* LexMSSQL.cxx in Sources */,
+				28BA735324E34D9700272C2D /* LexMySQL.cxx in Sources */,
+				28BA738024E34D9700272C2D /* LexTADS3.cxx in Sources */,
+				28BA73A924E34D9700272C2D /* LexPerl.cxx in Sources */,
+				28BA733D24E34D9700272C2D /* LexForth.cxx in Sources */,
+				28BA736824E34D9700272C2D /* LexEScript.cxx in Sources */,
+				283639BC268FD4EA009D58A1 /* LexAccessor.cxx in Sources */,
+				28BA737124E34D9700272C2D /* LexAsm.cxx in Sources */,
+				28BA737B24E34D9700272C2D /* LexSpice.cxx in Sources */,
+				28BA737024E34D9700272C2D /* LexCmake.cxx in Sources */,
+				28BA734624E34D9700272C2D /* LexSmalltalk.cxx in Sources */,
+				28BA72C424E34D5B00272C2D /* StyleContext.cxx in Sources */,
+				28BA734C24E34D9700272C2D /* LexVHDL.cxx in Sources */,
+				28BA737724E34D9700272C2D /* LexInno.cxx in Sources */,
+				28BA739B24E34D9700272C2D /* LexCSS.cxx in Sources */,
+				28BA734A24E34D9700272C2D /* LexBash.cxx in Sources */,
+				28BA734224E34D9700272C2D /* LexCLW.cxx in Sources */,
+				28BA734424E34D9700272C2D /* LexSAS.cxx in Sources */,
+				28BA738E24E34D9700272C2D /* LexR.cxx in Sources */,
+				28BA72C124E34D5B00272C2D /* LexerModule.cxx in Sources */,
+				28BA735C24E34D9700272C2D /* LexIndent.cxx in Sources */,
+				28BA736624E34D9700272C2D /* LexNsis.cxx in Sources */,
+				28BA734724E34D9700272C2D /* LexModula.cxx in Sources */,
+				28BA734924E34D9700272C2D /* LexASY.cxx in Sources */,
+				28BA739024E34D9700272C2D /* LexVisualProlog.cxx in Sources */,
+				28BA739524E34D9700272C2D /* LexPO.cxx in Sources */,
+				28BA72BA24E34D5B00272C2D /* WordList.cxx in Sources */,
+				28BA739624E34D9700272C2D /* LexPowerPro.cxx in Sources */,
+				28BA733924E34D9700272C2D /* LexBasic.cxx in Sources */,
+				28BA739D24E34D9700272C2D /* LexCaml.cxx in Sources */,
+				28BA739724E34D9700272C2D /* LexProps.cxx in Sources */,
+				28BA737424E34D9700272C2D /* LexDMIS.cxx in Sources */,
+				28BA73A524E34D9700272C2D /* LexECL.cxx in Sources */,
+				28BA736524E34D9700272C2D /* LexSQL.cxx in Sources */,
+				28BA72AB24E34D5B00272C2D /* LexerBase.cxx in Sources */,
+				28BA72B824E34D5B00272C2D /* DefaultLexer.cxx in Sources */,
+				28BA73A024E34D9700272C2D /* LexTAL.cxx in Sources */,
+				28BA733C24E34D9700272C2D /* LexMetapost.cxx in Sources */,
+				28BA733A24E34D9700272C2D /* LexCIL.cxx in Sources */,
+				28BA735D24E34D9700272C2D /* LexErrorList.cxx in Sources */,
+				28BA737224E34D9700272C2D /* LexAda.cxx in Sources */,
+				28BA737D24E34D9700272C2D /* LexAU3.cxx in Sources */,
+				28BA734024E34D9700272C2D /* LexTACL.cxx in Sources */,
+				28BA736724E34D9700272C2D /* LexEDIFACT.cxx in Sources */,
+				28BA736024E34D9700272C2D /* LexAbaqus.cxx in Sources */,
+				28BA734D24E34D9700272C2D /* LexAsn1.cxx in Sources */,
+				28BA737A24E34D9700272C2D /* LexTeX.cxx in Sources */,
+				28BA739124E34D9700272C2D /* LexVB.cxx in Sources */,
+				28BA735E24E34D9700272C2D /* LexFlagship.cxx in Sources */,
+				28BA735B24E34D9700272C2D /* LexRuby.cxx in Sources */,
+				28BA735424E34D9700272C2D /* LexHollywood.cxx in Sources */,
+				28BA72B924E34D5B00272C2D /* LexerNoExceptions.cxx in Sources */,
+				28BA736D24E34D9700272C2D /* LexFortran.cxx in Sources */,
+				28BA738924E34D9700272C2D /* LexStata.cxx in Sources */,
+				28BA737524E34D9700272C2D /* LexTCMD.cxx in Sources */,
+				28BA72C624E34D5B00272C2D /* Accessor.cxx in Sources */,
+				28BA733B24E34D9700272C2D /* LexTCL.cxx in Sources */,
+				28BA739C24E34D9700272C2D /* LexMaxima.cxx in Sources */,
+				28BA73AA24E34D9700272C2D /* LexRust.cxx in Sources */,
+				28BA733F24E34D9700272C2D /* LexOScript.cxx in Sources */,
+				28BA737324E34D9700272C2D /* LexCrontab.cxx in Sources */,
+				28BA734E24E34D9700272C2D /* LexCoffeeScript.cxx in Sources */,
+				28BA735624E34D9700272C2D /* LexLisp.cxx in Sources */,
+				28BA735824E34D9700272C2D /* LexPS.cxx in Sources */,
+				28BA735F24E34D9700272C2D /* LexLaTeX.cxx in Sources */,
+				28BA736B24E34D9700272C2D /* LexSpecman.cxx in Sources */,
+				28BA73A724E34D9700272C2D /* LexBibTeX.cxx in Sources */,
+				28BA737E24E34D9700272C2D /* LexBaan.cxx in Sources */,
+				28BA738124E34D9700272C2D /* LexTxt2tags.cxx in Sources */,
+				28BA737F24E34D9700272C2D /* LexMPT.cxx in Sources */,
+				28BA738424E34D9700272C2D /* LexSTTXT.cxx in Sources */,
+				28BA734F24E34D9700272C2D /* LexDiff.cxx in Sources */,
+				28BA735924E34D9700272C2D /* LexYAML.cxx in Sources */,
+				28BA735524E34D9700272C2D /* LexProgress.cxx in Sources */,
+				28BA736F24E34D9700272C2D /* LexPython.cxx in Sources */,
+				28BA72B524E34D5B00272C2D /* CharacterSet.cxx in Sources */,
+				28BA739E24E34D9700272C2D /* LexDataflex.cxx in Sources */,
+				28BA738F24E34D9700272C2D /* LexScriptol.cxx in Sources */,
+				28BA736C24E34D9700272C2D /* LexHTML.cxx in Sources */,
+				28BA737924E34D9700272C2D /* LexMake.cxx in Sources */,
+				28BA738524E34D9700272C2D /* LexMagik.cxx in Sources */,
+				28BA72B124E34D5B00272C2D /* CharacterCategory.cxx in Sources */,
+				28BA739424E34D9700272C2D /* LexPB.cxx in Sources */,
+				28BA73A624E34D9700272C2D /* LexMatlab.cxx in Sources */,
+				28BA736324E34D9700272C2D /* LexRaku.cxx in Sources */,
+				28BA736224E34D9700272C2D /* LexCPP.cxx in Sources */,
+				28BA738A24E34D9700272C2D /* LexOpal.cxx in Sources */,
+				28BA736E24E34D9700272C2D /* LexRegistry.cxx in Sources */,
+				28BA738224E34D9700272C2D /* LexMMIXAL.cxx in Sources */,
+				28BA736A24E34D9700272C2D /* LexKVIrc.cxx in Sources */,
+				28BA73A224E34D9700272C2D /* LexJSON.cxx in Sources */,
+				28BA738724E34D9700272C2D /* LexCsound.cxx in Sources */,
+				28BA738824E34D9700272C2D /* LexLua.cxx in Sources */,
+				28BA739824E34D9700272C2D /* LexCOBOL.cxx in Sources */,
+				28BA73A824E34D9700272C2D /* LexNimrod.cxx in Sources */,
+				28BA739324E34D9700272C2D /* LexAVS.cxx in Sources */,
+				28BA737624E34D9700272C2D /* LexConf.cxx in Sources */,
+				28BA734524E34D9700272C2D /* LexNim.cxx in Sources */,
+				28BA73AE24E34DBC00272C2D /* Lexilla.cxx in Sources */,
+				28BA72C324E34D5B00272C2D /* LexerSimple.cxx in Sources */,
+				28BA735124E34D9700272C2D /* LexAPDL.cxx in Sources */,
+				28BA736424E34D9700272C2D /* LexGAP.cxx in Sources */,
+				28BA734324E34D9700272C2D /* LexRebol.cxx in Sources */,
+				28BA733E24E34D9700272C2D /* LexSML.cxx in Sources */,
+				28BA738C24E34D9700272C2D /* LexVerilog.cxx in Sources */,
+				28BA738624E34D9700272C2D /* LexNull.cxx in Sources */,
+				28BA736124E34D9700272C2D /* LexBatch.cxx in Sources */,
+				28BA736924E34D9700272C2D /* LexPOV.cxx in Sources */,
+				28BA734124E34D9700272C2D /* LexGui4Cli.cxx in Sources */,
+				28BA734824E34D9700272C2D /* LexBullant.cxx in Sources */,
+				28BA734B24E34D9700272C2D /* LexEiffel.cxx in Sources */,
+				28BA73A424E34D9700272C2D /* LexAVE.cxx in Sources */,
+				28BA738D24E34D9700272C2D /* LexHaskell.cxx in Sources */,
+				28BA735024E34D9700272C2D /* LexSorcus.cxx in Sources */,
+				28BA739F24E34D9700272C2D /* LexLout.cxx in Sources */,
+				28BA73A124E34D9700272C2D /* LexMarkdown.cxx in Sources */,
+				28BA739224E34D9700272C2D /* LexDMAP.cxx in Sources */,
+				28BA737824E34D9700272C2D /* LexA68k.cxx in Sources */,
+				28BA735A24E34D9700272C2D /* LexErlang.cxx in Sources */,
+				28BA738B24E34D9700272C2D /* LexHex.cxx in Sources */,
+				28BA735224E34D9700272C2D /* LexD.cxx in Sources */,
+				28BA73A324E34D9700272C2D /* LexPascal.cxx in Sources */,
+				28BA739924E34D9700272C2D /* LexPLM.cxx in Sources */,
+				28BA735724E34D9700272C2D /* LexPowerShell.cxx in Sources */,
+				28BA738324E34D9700272C2D /* LexKix.cxx in Sources */,
+				28BA72B424E34D5B00272C2D /* PropSetSimple.cxx in Sources */,
+				28BA737C24E34D9700272C2D /* LexX12.cxx in Sources */,
+				B32D4A2A9CEC222A5140E99F /* LexFSharp.cxx in Sources */,
+				70BF497C8D265026B77C97DA /* LexJulia.cxx in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		280262AE246DF655000DF3B8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					DEBUG,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		280262AF246DF655000DF3B8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		280262B1246DF655000DF3B8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEVELOPMENT_TEAM = 4F446KW87E;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../../scintilla/include,
+					../../lexlib,
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/Lexilla/Info.plist";
+				INSTALL_PATH = "@rpath";
+				PRODUCT_BUNDLE_IDENTIFIER = org.scintilla.Lexilla;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		280262B2246DF655000DF3B8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEVELOPMENT_TEAM = 4F446KW87E;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_CPP_EXCEPTIONS = YES;
+				GCC_ENABLE_CPP_RTTI = YES;
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../../scintilla/include,
+					../../lexlib,
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/Lexilla/Info.plist";
+				INSTALL_PATH = "@rpath";
+				PRODUCT_BUNDLE_IDENTIFIER = org.scintilla.Lexilla;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		280262A0246DF655000DF3B8 /* Build configuration list for PBXProject "Lexilla" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				280262AE246DF655000DF3B8 /* Debug */,
+				280262AF246DF655000DF3B8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		280262B0246DF655000DF3B8 /* Build configuration list for PBXNativeTarget "lexilla" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				280262B1246DF655000DF3B8 /* Debug */,
+				280262B2246DF655000DF3B8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2802629D246DF655000DF3B8 /* Project object */;
+}
diff --git a/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..3a367d9
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Lexilla.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/scite-app/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/scite-app/lexilla/src/LexillaVersion.rc b/scite-app/lexilla/src/LexillaVersion.rc
new file mode 100644
index 0000000..f76760e
--- /dev/null
+++ b/scite-app/lexilla/src/LexillaVersion.rc
@@ -0,0 +1,37 @@
+// Resource file for Lexilla - provides a version number
+// Copyright 2020 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <windows.h>
+
+#define VERSION_LEXILLA "5.1.1"
+#define VERSION_WORDS 5, 1, 1, 0
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION	VERSION_WORDS
+PRODUCTVERSION	VERSION_WORDS
+FILEFLAGSMASK	0x3fL
+FILEFLAGS 0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+	BLOCK	"VarFileInfo"
+	BEGIN
+		VALUE	"Translation",	0x409,	1200
+	END
+	BLOCK	"StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
+			VALUE	"FileDescription",	"Lexilla.DLL - a Lexical Analysis Component\0"
+			VALUE	"FileVersion",	VERSION_LEXILLA "\0"
+			VALUE	"InternalName",	"Lexilla\0"
+			VALUE	"LegalCopyright",	"Copyright 2019 by Neil Hodgson\0"
+			VALUE	"OriginalFilename",	"Lexilla.DLL\0"
+			VALUE	"ProductName",	"Lexilla\0"
+			VALUE	"ProductVersion",	VERSION_LEXILLA "\0"
+		END
+	END
+END
diff --git a/scite-app/lexilla/src/deps.mak b/scite-app/lexilla/src/deps.mak
new file mode 100644
index 0000000..78557d8
--- /dev/null
+++ b/scite-app/lexilla/src/deps.mak
@@ -0,0 +1,1553 @@
+# Created by DepGen.py. To recreate, run DepGen.py.
+Lexilla.o: \
+	../src/Lexilla.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexerModule.h \
+	../lexlib/CatalogueModules.h
+Accessor.o: \
+	../lexlib/Accessor.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h
+CharacterCategory.o: \
+	../lexlib/CharacterCategory.cxx \
+	../lexlib/CharacterCategory.h
+CharacterSet.o: \
+	../lexlib/CharacterSet.cxx \
+	../lexlib/CharacterSet.h
+DefaultLexer.o: \
+	../lexlib/DefaultLexer.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+LexAccessor.o: \
+	../lexlib/LexAccessor.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/CharacterSet.h
+LexerBase.o: \
+	../lexlib/LexerBase.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h
+LexerModule.o: \
+	../lexlib/LexerModule.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerSimple.h
+LexerNoExceptions.o: \
+	../lexlib/LexerNoExceptions.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerNoExceptions.h
+LexerSimple.o: \
+	../lexlib/LexerSimple.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerSimple.h
+PropSetSimple.o: \
+	../lexlib/PropSetSimple.cxx \
+	../lexlib/PropSetSimple.h
+StyleContext.o: \
+	../lexlib/StyleContext.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h
+WordList.o: \
+	../lexlib/WordList.cxx \
+	../lexlib/WordList.h
+LexA68k.o: \
+	../lexers/LexA68k.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAbaqus.o: \
+	../lexers/LexAbaqus.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAda.o: \
+	../lexers/LexAda.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAPDL.o: \
+	../lexers/LexAPDL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAsm.o: \
+	../lexers/LexAsm.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexAsn1.o: \
+	../lexers/LexAsn1.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexASY.o: \
+	../lexers/LexASY.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAU3.o: \
+	../lexers/LexAU3.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAVE.o: \
+	../lexers/LexAVE.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexAVS.o: \
+	../lexers/LexAVS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexBaan.o: \
+	../lexers/LexBaan.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexBash.o: \
+	../lexers/LexBash.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+LexBasic.o: \
+	../lexers/LexBasic.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexBatch.o: \
+	../lexers/LexBatch.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexBibTeX.o: \
+	../lexers/LexBibTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexBullant.o: \
+	../lexers/LexBullant.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCaml.o: \
+	../lexers/LexCaml.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCIL.o: \
+	../lexers/LexCIL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexCLW.o: \
+	../lexers/LexCLW.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCmake.o: \
+	../lexers/LexCmake.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCOBOL.o: \
+	../lexers/LexCOBOL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCoffeeScript.o: \
+	../lexers/LexCoffeeScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexConf.o: \
+	../lexers/LexConf.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCPP.o: \
+	../lexers/LexCPP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/SubStyles.h
+LexCrontab.o: \
+	../lexers/LexCrontab.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCsound.o: \
+	../lexers/LexCsound.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexCSS.o: \
+	../lexers/LexCSS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexD.o: \
+	../lexers/LexD.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexDataflex.o: \
+	../lexers/LexDataflex.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexDiff.o: \
+	../lexers/LexDiff.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexDMAP.o: \
+	../lexers/LexDMAP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexDMIS.o: \
+	../lexers/LexDMIS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+LexECL.o: \
+	../lexers/LexECL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h
+LexEDIFACT.o: \
+	../lexers/LexEDIFACT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+LexEiffel.o: \
+	../lexers/LexEiffel.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexErlang.o: \
+	../lexers/LexErlang.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexErrorList.o: \
+	../lexers/LexErrorList.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexEScript.o: \
+	../lexers/LexEScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexFlagship.o: \
+	../lexers/LexFlagship.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexForth.o: \
+	../lexers/LexForth.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexFortran.o: \
+	../lexers/LexFortran.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexFSharp.o: \
+	../lexers/LexFSharp.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexGAP.o: \
+	../lexers/LexGAP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexGui4Cli.o: \
+	../lexers/LexGui4Cli.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexHaskell.o: \
+	../lexers/LexHaskell.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexHex.o: \
+	../lexers/LexHex.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexHollywood.o: \
+	../lexers/LexHollywood.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexHTML.o: \
+	../lexers/LexHTML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexIndent.o: \
+	../lexers/LexIndent.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexInno.o: \
+	../lexers/LexInno.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexJSON.o: \
+	../lexers/LexJSON.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexJulia.o: \
+	../lexers/LexJulia.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexKix.o: \
+	../lexers/LexKix.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexKVIrc.o: \
+	../lexers/LexKVIrc.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexLaTeX.o: \
+	../lexers/LexLaTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h \
+	../lexlib/LexerBase.h
+LexLisp.o: \
+	../lexers/LexLisp.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexLout.o: \
+	../lexers/LexLout.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexLua.o: \
+	../lexers/LexLua.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMagik.o: \
+	../lexers/LexMagik.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMake.o: \
+	../lexers/LexMake.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMarkdown.o: \
+	../lexers/LexMarkdown.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMatlab.o: \
+	../lexers/LexMatlab.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMaxima.o: \
+	../lexers/LexMaxima.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMetapost.o: \
+	../lexers/LexMetapost.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMMIXAL.o: \
+	../lexers/LexMMIXAL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexModula.o: \
+	../lexers/LexModula.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMPT.o: \
+	../lexers/LexMPT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMSSQL.o: \
+	../lexers/LexMSSQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexMySQL.o: \
+	../lexers/LexMySQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexNim.o: \
+	../lexers/LexNim.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexNimrod.o: \
+	../lexers/LexNimrod.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexNsis.o: \
+	../lexers/LexNsis.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexNull.o: \
+	../lexers/LexNull.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexOpal.o: \
+	../lexers/LexOpal.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexOScript.o: \
+	../lexers/LexOScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPascal.o: \
+	../lexers/LexPascal.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPB.o: \
+	../lexers/LexPB.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPerl.o: \
+	../lexers/LexPerl.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexPLM.o: \
+	../lexers/LexPLM.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPO.o: \
+	../lexers/LexPO.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPOV.o: \
+	../lexers/LexPOV.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPowerPro.o: \
+	../lexers/LexPowerPro.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPowerShell.o: \
+	../lexers/LexPowerShell.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexProgress.o: \
+	../lexers/LexProgress.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/DefaultLexer.h
+LexProps.o: \
+	../lexers/LexProps.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPS.o: \
+	../lexers/LexPS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexPython.o: \
+	../lexers/LexPython.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+LexR.o: \
+	../lexers/LexR.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexRaku.o: \
+	../lexers/LexRaku.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexRebol.o: \
+	../lexers/LexRebol.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexRegistry.o: \
+	../lexers/LexRegistry.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexRuby.o: \
+	../lexers/LexRuby.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexRust.o: \
+	../lexers/LexRust.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexSAS.o: \
+	../lexers/LexSAS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexScriptol.o: \
+	../lexers/LexScriptol.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSmalltalk.o: \
+	../lexers/LexSmalltalk.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSML.o: \
+	../lexers/LexSML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSorcus.o: \
+	../lexers/LexSorcus.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSpecman.o: \
+	../lexers/LexSpecman.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSpice.o: \
+	../lexers/LexSpice.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSQL.o: \
+	../lexers/LexSQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/DefaultLexer.h
+LexStata.o: \
+	../lexers/LexStata.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexSTTXT.o: \
+	../lexers/LexSTTXT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTACL.o: \
+	../lexers/LexTACL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTADS3.o: \
+	../lexers/LexTADS3.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTAL.o: \
+	../lexers/LexTAL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTCL.o: \
+	../lexers/LexTCL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTCMD.o: \
+	../lexers/LexTCMD.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTeX.o: \
+	../lexers/LexTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexTxt2tags.o: \
+	../lexers/LexTxt2tags.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexVB.o: \
+	../lexers/LexVB.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexVerilog.o: \
+	../lexers/LexVerilog.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+LexVHDL.o: \
+	../lexers/LexVHDL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+LexVisualProlog.o: \
+	../lexers/LexVisualProlog.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+LexX12.o: \
+	../lexers/LexX12.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+LexYAML.o: \
+	../lexers/LexYAML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
diff --git a/scite-app/lexilla/src/lexilla.mak b/scite-app/lexilla/src/lexilla.mak
new file mode 100644
index 0000000..fdb5ebb
--- /dev/null
+++ b/scite-app/lexilla/src/lexilla.mak
@@ -0,0 +1,242 @@
+# Make file for Lexilla on Windows Visual C++ version
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile is for using Visual C++ with nmake.
+# Usage for Microsoft:
+#     nmake -f lexilla.mak
+# For debug versions define DEBUG on the command line:
+#     nmake DEBUG=1 -f lexilla.mak
+# To build with GCC or Clang, run makefile
+
+.SUFFIXES: .cxx
+
+DIR_O=.
+DIR_BIN=..\bin
+
+LEXILLA=$(DIR_BIN)\lexilla.dll
+LIBLEXILLA=$(DIR_BIN)\liblexilla.lib
+
+LD=link
+
+!IFDEF SUPPORT_XP
+ADD_DEFINE=-D_USING_V110_SDK71_
+# Different subsystems for 32-bit and 64-bit Windows XP so detect based on Platform
+# environment vairable set by vcvars*.bat to be either x86 or x64
+!IF "$(PLATFORM)" == "x64"
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02
+!ELSE
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01
+!ENDIF
+!ELSE
+CETCOMPAT=-CETCOMPAT
+!IFDEF ARM64
+ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+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)
+CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS)
+CXXDEBUG=-Od -MTd -DDEBUG
+CXXNDEBUG=-O1 -MT -DNDEBUG -GL
+NAME=-Fo
+LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) $(CETCOMPAT)
+LDDEBUG=
+LIBS=
+NOLOGO=-nologo
+
+!IFDEF QUIET
+CXX=@$(CXX)
+CXXFLAGS=$(CXXFLAGS) $(NOLOGO)
+LDFLAGS=$(LDFLAGS) $(NOLOGO)
+!ENDIF
+
+!IFDEF DEBUG
+CXXFLAGS=$(CXXFLAGS) $(CXXDEBUG)
+LDFLAGS=$(LDDEBUG) $(LDFLAGS)
+!ELSE
+CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
+!ENDIF
+
+INCLUDEDIRS=-I../include -I../../scintilla/include -I../src -I../lexlib
+CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS)
+
+all:	$(LEXILLA) $(LIBLEXILLA)
+
+clean:
+	-del /q $(DIR_O)\*.obj $(DIR_O)\*.o $(DIR_O)\*.pdb \
+	$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\lexilla.lib \
+	$(LEXILLA) $(LIBLEXILLA)
+
+depend:
+	pyw DepGen.py
+
+#++Autogenerated -- run scripts/LexGen.py to regenerate
+#**LEX_OBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
+LEX_OBJS=\
+	$(DIR_O)\LexA68k.obj \
+	$(DIR_O)\LexAbaqus.obj \
+	$(DIR_O)\LexAda.obj \
+	$(DIR_O)\LexAPDL.obj \
+	$(DIR_O)\LexAsm.obj \
+	$(DIR_O)\LexAsn1.obj \
+	$(DIR_O)\LexASY.obj \
+	$(DIR_O)\LexAU3.obj \
+	$(DIR_O)\LexAVE.obj \
+	$(DIR_O)\LexAVS.obj \
+	$(DIR_O)\LexBaan.obj \
+	$(DIR_O)\LexBash.obj \
+	$(DIR_O)\LexBasic.obj \
+	$(DIR_O)\LexBatch.obj \
+	$(DIR_O)\LexBibTeX.obj \
+	$(DIR_O)\LexBullant.obj \
+	$(DIR_O)\LexCaml.obj \
+	$(DIR_O)\LexCIL.obj \
+	$(DIR_O)\LexCLW.obj \
+	$(DIR_O)\LexCmake.obj \
+	$(DIR_O)\LexCOBOL.obj \
+	$(DIR_O)\LexCoffeeScript.obj \
+	$(DIR_O)\LexConf.obj \
+	$(DIR_O)\LexCPP.obj \
+	$(DIR_O)\LexCrontab.obj \
+	$(DIR_O)\LexCsound.obj \
+	$(DIR_O)\LexCSS.obj \
+	$(DIR_O)\LexD.obj \
+	$(DIR_O)\LexDataflex.obj \
+	$(DIR_O)\LexDiff.obj \
+	$(DIR_O)\LexDMAP.obj \
+	$(DIR_O)\LexDMIS.obj \
+	$(DIR_O)\LexECL.obj \
+	$(DIR_O)\LexEDIFACT.obj \
+	$(DIR_O)\LexEiffel.obj \
+	$(DIR_O)\LexErlang.obj \
+	$(DIR_O)\LexErrorList.obj \
+	$(DIR_O)\LexEScript.obj \
+	$(DIR_O)\LexFlagship.obj \
+	$(DIR_O)\LexForth.obj \
+	$(DIR_O)\LexFortran.obj \
+	$(DIR_O)\LexFSharp.obj \
+	$(DIR_O)\LexGAP.obj \
+	$(DIR_O)\LexGui4Cli.obj \
+	$(DIR_O)\LexHaskell.obj \
+	$(DIR_O)\LexHex.obj \
+	$(DIR_O)\LexHollywood.obj \
+	$(DIR_O)\LexHTML.obj \
+	$(DIR_O)\LexIndent.obj \
+	$(DIR_O)\LexInno.obj \
+	$(DIR_O)\LexJSON.obj \
+	$(DIR_O)\LexJulia.obj \
+	$(DIR_O)\LexKix.obj \
+	$(DIR_O)\LexKVIrc.obj \
+	$(DIR_O)\LexLaTeX.obj \
+	$(DIR_O)\LexLisp.obj \
+	$(DIR_O)\LexLout.obj \
+	$(DIR_O)\LexLua.obj \
+	$(DIR_O)\LexMagik.obj \
+	$(DIR_O)\LexMake.obj \
+	$(DIR_O)\LexMarkdown.obj \
+	$(DIR_O)\LexMatlab.obj \
+	$(DIR_O)\LexMaxima.obj \
+	$(DIR_O)\LexMetapost.obj \
+	$(DIR_O)\LexMMIXAL.obj \
+	$(DIR_O)\LexModula.obj \
+	$(DIR_O)\LexMPT.obj \
+	$(DIR_O)\LexMSSQL.obj \
+	$(DIR_O)\LexMySQL.obj \
+	$(DIR_O)\LexNim.obj \
+	$(DIR_O)\LexNimrod.obj \
+	$(DIR_O)\LexNsis.obj \
+	$(DIR_O)\LexNull.obj \
+	$(DIR_O)\LexOpal.obj \
+	$(DIR_O)\LexOScript.obj \
+	$(DIR_O)\LexPascal.obj \
+	$(DIR_O)\LexPB.obj \
+	$(DIR_O)\LexPerl.obj \
+	$(DIR_O)\LexPLM.obj \
+	$(DIR_O)\LexPO.obj \
+	$(DIR_O)\LexPOV.obj \
+	$(DIR_O)\LexPowerPro.obj \
+	$(DIR_O)\LexPowerShell.obj \
+	$(DIR_O)\LexProgress.obj \
+	$(DIR_O)\LexProps.obj \
+	$(DIR_O)\LexPS.obj \
+	$(DIR_O)\LexPython.obj \
+	$(DIR_O)\LexR.obj \
+	$(DIR_O)\LexRaku.obj \
+	$(DIR_O)\LexRebol.obj \
+	$(DIR_O)\LexRegistry.obj \
+	$(DIR_O)\LexRuby.obj \
+	$(DIR_O)\LexRust.obj \
+	$(DIR_O)\LexSAS.obj \
+	$(DIR_O)\LexScriptol.obj \
+	$(DIR_O)\LexSmalltalk.obj \
+	$(DIR_O)\LexSML.obj \
+	$(DIR_O)\LexSorcus.obj \
+	$(DIR_O)\LexSpecman.obj \
+	$(DIR_O)\LexSpice.obj \
+	$(DIR_O)\LexSQL.obj \
+	$(DIR_O)\LexStata.obj \
+	$(DIR_O)\LexSTTXT.obj \
+	$(DIR_O)\LexTACL.obj \
+	$(DIR_O)\LexTADS3.obj \
+	$(DIR_O)\LexTAL.obj \
+	$(DIR_O)\LexTCL.obj \
+	$(DIR_O)\LexTCMD.obj \
+	$(DIR_O)\LexTeX.obj \
+	$(DIR_O)\LexTxt2tags.obj \
+	$(DIR_O)\LexVB.obj \
+	$(DIR_O)\LexVerilog.obj \
+	$(DIR_O)\LexVHDL.obj \
+	$(DIR_O)\LexVisualProlog.obj \
+	$(DIR_O)\LexX12.obj \
+	$(DIR_O)\LexYAML.obj \
+
+#--Autogenerated -- end of automatically generated section
+
+# Required by lexers
+LEXLIB_OBJS=\
+	$(DIR_O)\Accessor.obj \
+	$(DIR_O)\CharacterCategory.obj \
+	$(DIR_O)\CharacterSet.obj \
+	$(DIR_O)\DefaultLexer.obj \
+	$(DIR_O)\LexAccessor.obj \
+	$(DIR_O)\LexerBase.obj \
+	$(DIR_O)\LexerModule.obj \
+	$(DIR_O)\LexerSimple.obj \
+	$(DIR_O)\PropSetSimple.obj \
+	$(DIR_O)\StyleContext.obj \
+	$(DIR_O)\WordList.obj
+
+# Required by libraries and DLLs that include lexing
+LEXILLA_OBJS=\
+	$(DIR_O)\Lexilla.obj \
+	$(LEXLIB_OBJS) \
+	$(LEX_OBJS)
+
+$(LEXILLA): $(LEXILLA_OBJS) LexillaVersion.res
+	$(LD) $(LDFLAGS) -DEF:Lexilla.def -DLL -OUT:$@ $** $(LIBS)
+
+$(LIBLEXILLA): $(LEXILLA_OBJS)
+	LIB -OUT:$@ $**
+
+# Define how to build all the objects and what they depend on
+
+{..\lexlib}.cxx{$(DIR_O)}.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
+{..\lexers}.cxx{$(DIR_O)}.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
+{.}.cxx{$(DIR_O)}.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
+
+.rc.res:
+	$(RC) -fo$@ $**
+
+# Dependencies
+
+!IF EXISTS(nmdeps.mak)
+
+# Protect with !IF EXISTS to handle accidental deletion - just 'nmake -f lexilla.mak deps'
+
+!INCLUDE nmdeps.mak
+
+!ENDIF
diff --git a/scite-app/lexilla/src/makefile b/scite-app/lexilla/src/makefile
new file mode 100644
index 0000000..6c7a228
--- /dev/null
+++ b/scite-app/lexilla/src/makefile
@@ -0,0 +1,135 @@
+# Make file for Lexilla
+# @file makefile
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This works on Windows or Linux using GCC 9.0+
+# This works on Windows, Linux, or macOS using Clang 9.0+
+# On Windows, it is tested with Mingw-w64 GCC and Clang.
+# on macOS, it always uses Clang
+# For debug versions define DEBUG on the command line:
+#     make DEBUG=1
+# On Windows, to build with MSVC, run lexilla.mak
+
+.PHONY: all clean analyze depend
+
+.SUFFIXES: .cxx
+
+DIR_BIN=../bin
+
+WARNINGS = -Wpedantic -Wall -Wextra
+
+ifdef windir
+    SHARED_NAME = lexilla
+    SHAREDEXTENSION = dll
+    WINDRES ?= windres
+    VERSION_RESOURCE = LexillaVersion.o
+else
+    SHARED_NAME = liblexilla
+    ifeq ($(shell uname),Darwin)
+        CLANG := 1
+        LDFLAGS += -dynamiclib
+        SHAREDEXTENSION = dylib
+        BASE_FLAGS += -arch arm64 -arch x86_64
+        LDFLAGS += -arch arm64 -arch x86_64
+    else
+        SHAREDEXTENSION = so
+    endif
+    BASE_FLAGS += -fvisibility=hidden
+endif
+
+LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
+LIBLEXILLA=$(DIR_BIN)/liblexilla.a
+
+BASE_FLAGS += --std=c++17
+
+ifdef CLANG
+CXX = clang++
+ifdef windir
+# Clang on Win32 uses MSVC headers so will complain about strcpy without this
+DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
+endif
+endif
+
+ifdef windir
+    LDFLAGS += -mwindows
+	ifndef CLANG
+	    LDFLAGS += -Wl,--kill-at
+	endif
+else
+    BASE_FLAGS += -fPIC
+endif
+
+# Take care of changing Unix style '/' directory separator to '\' on Windows
+normalize = $(if $(windir),$(subst /,\,$1),$1)
+
+PYTHON = $(if $(windir),pyw,python3)
+
+ifdef windir
+    DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
+else
+    DEL = rm -f
+endif
+
+RANLIB ?= ranlib
+
+vpath %.h ../src ../include ../../scintilla/include ../lexlib
+vpath %.cxx ../src ../lexlib ../lexers
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+INCLUDES = -I ../include -I ../../scintilla/include -I ../src -I ../lexlib
+LDFLAGS += -shared
+
+BASE_FLAGS += $(WARNINGS)
+
+all:	$(LEXILLA) $(LIBLEXILLA)
+
+clean:
+	$(DEL) *.o *.obj *.a *.res *.map *.plist $(call normalize,$(LEXILLA) $(LIBLEXILLA))
+
+%.o: %.cxx
+	$(CXX) $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
+%.o:	%.rc
+	$(WINDRES) $< $@
+
+analyze:
+	$(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx ../lexlib/*.cxx ../lexers/*.cxx
+
+depend deps.mak:
+	$(PYTHON) DepGen.py
+
+LEXERS:=$(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))
+
+OBJS = Lexilla.o
+
+# Required by lexers
+LEXLIB_OBJS=\
+	Accessor.o \
+	CharacterCategory.o \
+	CharacterSet.o \
+	DefaultLexer.o \
+	LexAccessor.o \
+	LexerBase.o \
+	LexerModule.o \
+	LexerSimple.o \
+	PropSetSimple.o \
+	StyleContext.o \
+	WordList.o
+
+# Required by libraries and DLLs that include lexing
+LEXILLA_OBJS=\
+	$(OBJS) \
+	$(LEXLIB_OBJS) \
+	$(LEXERS:.cxx=.o)
+
+$(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
+
+$(LIBLEXILLA):  $(LEXILLA_OBJS)
+	$(AR) rc $@ $^
+	$(RANLIB) $@
+
+# Automatically generate dependencies for most files with "make deps"
+include deps.mak
diff --git a/scite-app/lexilla/src/nmdeps.mak b/scite-app/lexilla/src/nmdeps.mak
new file mode 100644
index 0000000..5d5a994
--- /dev/null
+++ b/scite-app/lexilla/src/nmdeps.mak
@@ -0,0 +1,1553 @@
+# Created by DepGen.py. To recreate, run DepGen.py.
+$(DIR_O)/Lexilla.obj: \
+	../src/Lexilla.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexerModule.h \
+	../lexlib/CatalogueModules.h
+$(DIR_O)/Accessor.obj: \
+	../lexlib/Accessor.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h
+$(DIR_O)/CharacterCategory.obj: \
+	../lexlib/CharacterCategory.cxx \
+	../lexlib/CharacterCategory.h
+$(DIR_O)/CharacterSet.obj: \
+	../lexlib/CharacterSet.cxx \
+	../lexlib/CharacterSet.h
+$(DIR_O)/DefaultLexer.obj: \
+	../lexlib/DefaultLexer.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexAccessor.obj: \
+	../lexlib/LexAccessor.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/CharacterSet.h
+$(DIR_O)/LexerBase.obj: \
+	../lexlib/LexerBase.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h
+$(DIR_O)/LexerModule.obj: \
+	../lexlib/LexerModule.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerSimple.h
+$(DIR_O)/LexerNoExceptions.obj: \
+	../lexlib/LexerNoExceptions.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerNoExceptions.h
+$(DIR_O)/LexerSimple.obj: \
+	../lexlib/LexerSimple.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/LexerBase.h \
+	../lexlib/LexerSimple.h
+$(DIR_O)/PropSetSimple.obj: \
+	../lexlib/PropSetSimple.cxx \
+	../lexlib/PropSetSimple.h
+$(DIR_O)/StyleContext.obj: \
+	../lexlib/StyleContext.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h
+$(DIR_O)/WordList.obj: \
+	../lexlib/WordList.cxx \
+	../lexlib/WordList.h
+$(DIR_O)/LexA68k.obj: \
+	../lexers/LexA68k.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAbaqus.obj: \
+	../lexers/LexAbaqus.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAda.obj: \
+	../lexers/LexAda.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAPDL.obj: \
+	../lexers/LexAPDL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAsm.obj: \
+	../lexers/LexAsm.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexAsn1.obj: \
+	../lexers/LexAsn1.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexASY.obj: \
+	../lexers/LexASY.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAU3.obj: \
+	../lexers/LexAU3.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAVE.obj: \
+	../lexers/LexAVE.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexAVS.obj: \
+	../lexers/LexAVS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexBaan.obj: \
+	../lexers/LexBaan.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexBash.obj: \
+	../lexers/LexBash.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexBasic.obj: \
+	../lexers/LexBasic.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexBatch.obj: \
+	../lexers/LexBatch.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexBibTeX.obj: \
+	../lexers/LexBibTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexBullant.obj: \
+	../lexers/LexBullant.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCaml.obj: \
+	../lexers/LexCaml.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCIL.obj: \
+	../lexers/LexCIL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexCLW.obj: \
+	../lexers/LexCLW.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCmake.obj: \
+	../lexers/LexCmake.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCOBOL.obj: \
+	../lexers/LexCOBOL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCoffeeScript.obj: \
+	../lexers/LexCoffeeScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexConf.obj: \
+	../lexers/LexConf.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCPP.obj: \
+	../lexers/LexCPP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/SubStyles.h
+$(DIR_O)/LexCrontab.obj: \
+	../lexers/LexCrontab.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCsound.obj: \
+	../lexers/LexCsound.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexCSS.obj: \
+	../lexers/LexCSS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexD.obj: \
+	../lexers/LexD.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexDataflex.obj: \
+	../lexers/LexDataflex.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexDiff.obj: \
+	../lexers/LexDiff.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexDMAP.obj: \
+	../lexers/LexDMAP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexDMIS.obj: \
+	../lexers/LexDMIS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexECL.obj: \
+	../lexers/LexECL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h
+$(DIR_O)/LexEDIFACT.obj: \
+	../lexers/LexEDIFACT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexEiffel.obj: \
+	../lexers/LexEiffel.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexErlang.obj: \
+	../lexers/LexErlang.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexErrorList.obj: \
+	../lexers/LexErrorList.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexEScript.obj: \
+	../lexers/LexEScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexFlagship.obj: \
+	../lexers/LexFlagship.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexForth.obj: \
+	../lexers/LexForth.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexFortran.obj: \
+	../lexers/LexFortran.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexFSharp.obj: \
+	../lexers/LexFSharp.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexGAP.obj: \
+	../lexers/LexGAP.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexGui4Cli.obj: \
+	../lexers/LexGui4Cli.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexHaskell.obj: \
+	../lexers/LexHaskell.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexHex.obj: \
+	../lexers/LexHex.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexHollywood.obj: \
+	../lexers/LexHollywood.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexHTML.obj: \
+	../lexers/LexHTML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexIndent.obj: \
+	../lexers/LexIndent.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexInno.obj: \
+	../lexers/LexInno.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexJSON.obj: \
+	../lexers/LexJSON.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexJulia.obj: \
+	../lexers/LexJulia.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexKix.obj: \
+	../lexers/LexKix.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexKVIrc.obj: \
+	../lexers/LexKVIrc.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexLaTeX.obj: \
+	../lexers/LexLaTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h \
+	../lexlib/LexerBase.h
+$(DIR_O)/LexLisp.obj: \
+	../lexers/LexLisp.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexLout.obj: \
+	../lexers/LexLout.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexLua.obj: \
+	../lexers/LexLua.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMagik.obj: \
+	../lexers/LexMagik.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMake.obj: \
+	../lexers/LexMake.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMarkdown.obj: \
+	../lexers/LexMarkdown.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMatlab.obj: \
+	../lexers/LexMatlab.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMaxima.obj: \
+	../lexers/LexMaxima.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMetapost.obj: \
+	../lexers/LexMetapost.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMMIXAL.obj: \
+	../lexers/LexMMIXAL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexModula.obj: \
+	../lexers/LexModula.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMPT.obj: \
+	../lexers/LexMPT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMSSQL.obj: \
+	../lexers/LexMSSQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexMySQL.obj: \
+	../lexers/LexMySQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexNim.obj: \
+	../lexers/LexNim.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexNimrod.obj: \
+	../lexers/LexNimrod.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexNsis.obj: \
+	../lexers/LexNsis.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexNull.obj: \
+	../lexers/LexNull.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexOpal.obj: \
+	../lexers/LexOpal.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexOScript.obj: \
+	../lexers/LexOScript.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPascal.obj: \
+	../lexers/LexPascal.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPB.obj: \
+	../lexers/LexPB.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPerl.obj: \
+	../lexers/LexPerl.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexPLM.obj: \
+	../lexers/LexPLM.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPO.obj: \
+	../lexers/LexPO.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPOV.obj: \
+	../lexers/LexPOV.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPowerPro.obj: \
+	../lexers/LexPowerPro.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPowerShell.obj: \
+	../lexers/LexPowerShell.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexProgress.obj: \
+	../lexers/LexProgress.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexProps.obj: \
+	../lexers/LexProps.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPS.obj: \
+	../lexers/LexPS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexPython.obj: \
+	../lexers/LexPython.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/StringCopy.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexR.obj: \
+	../lexers/LexR.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexRaku.obj: \
+	../lexers/LexRaku.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexRebol.obj: \
+	../lexers/LexRebol.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexRegistry.obj: \
+	../lexers/LexRegistry.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexRuby.obj: \
+	../lexers/LexRuby.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexRust.obj: \
+	../lexers/LexRust.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/PropSetSimple.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexSAS.obj: \
+	../lexers/LexSAS.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexScriptol.obj: \
+	../lexers/LexScriptol.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSmalltalk.obj: \
+	../lexers/LexSmalltalk.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSML.obj: \
+	../lexers/LexSML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSorcus.obj: \
+	../lexers/LexSorcus.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSpecman.obj: \
+	../lexers/LexSpecman.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSpice.obj: \
+	../lexers/LexSpice.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSQL.obj: \
+	../lexers/LexSQL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SparseState.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexStata.obj: \
+	../lexers/LexStata.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexSTTXT.obj: \
+	../lexers/LexSTTXT.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTACL.obj: \
+	../lexers/LexTACL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTADS3.obj: \
+	../lexers/LexTADS3.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTAL.obj: \
+	../lexers/LexTAL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTCL.obj: \
+	../lexers/LexTCL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTCMD.obj: \
+	../lexers/LexTCMD.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTeX.obj: \
+	../lexers/LexTeX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexTxt2tags.obj: \
+	../lexers/LexTxt2tags.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexVB.obj: \
+	../lexers/LexVB.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexVerilog.obj: \
+	../lexers/LexVerilog.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexVHDL.obj: \
+	../lexers/LexVHDL.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
+$(DIR_O)/LexVisualProlog.obj: \
+	../lexers/LexVisualProlog.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/CharacterCategory.h \
+	../lexlib/LexerModule.h \
+	../lexlib/OptionSet.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexX12.obj: \
+	../lexers/LexX12.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/LexerModule.h \
+	../lexlib/DefaultLexer.h
+$(DIR_O)/LexYAML.obj: \
+	../lexers/LexYAML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/Scintilla.h \
+	../include/SciLexer.h \
+	../lexlib/WordList.h \
+	../lexlib/LexAccessor.h \
+	../lexlib/Accessor.h \
+	../lexlib/StyleContext.h \
+	../lexlib/CharacterSet.h \
+	../lexlib/LexerModule.h
diff --git a/scite-app/lexilla/test/README b/scite-app/lexilla/test/README
new file mode 100644
index 0000000..1ea61db
--- /dev/null
+++ b/scite-app/lexilla/test/README
@@ -0,0 +1,105 @@
+README for testing lexers with lexilla/test.
+
+The TestLexers application is run to test the lexing and folding of a set of example
+files and thus ensure that the lexers are working correctly.
+
+Lexers are accessed through the Lexilla shared library which must be built first
+in the lexilla/src directory.
+
+TestLexers works on Windows, Linux, or macOS and requires a C++20 compiler.
+MSVC 2019.4, GCC 9.0, Clang 9.0, and Apple Clang 11.0 are known to work.
+
+MSVC is only available on Windows.
+
+GCC and Clang work on Windows and Linux.
+
+On macOS, only Apple Clang is available.
+
+To use GCC run lexilla/test/makefile:
+	make test
+
+To use Clang run lexilla/test/makefile:
+	make CLANG=1 test
+On macOS, CLANG is set automatically so this can just be
+	make test
+
+To use MSVC:
+	nmake -f testlexers.mak test
+There is also a project file TestLexers.vcxproj that can be loaded into the Visual
+C++ IDE.
+
+
+
+Adding or Changing Tests
+
+The lexilla/test/examples directory contains a set of tests located in a tree of
+subdirectories.
+
+Each directory contains example files along with control files called
+SciTE.properties and expected result files with .styled and .folded suffixes.
+If an unexpected result occurs then files with the additional suffix .new 
+(that is .styled.new or .folded.new) may be created.
+
+Each file in the examples tree that does not have an extension of .properties, .styled,
+.folded or .new is an example file that will be lexed and folded according to settings
+found in SciTE.properties.
+
+The results of the lex will be compared to the corresponding .styled file and if different
+the result will be saved to a .styled.new file for checking.
+So, if x.cxx is the example, its lexed form will be checked against x.cxx.styled and a
+x.cxx.styled.new file may be created. The .styled.new and .styled files contain the text
+of the original file along with style number changes in {} like:
+	{5}function{0} {11}first{10}(){0}
+After checking that the .styled.new file is correct, it can be promoted to .styled and
+committed to the repository.
+
+The results of the fold will be compared to the corresponding .folded file and if different
+the result will be saved to a .folded.new file for checking.
+So, if x.cxx is the example, its folded form will be checked against x.cxx.folded and a
+x.cxx.folded.new file may be created. The folded.new and .folded files contain the text
+of the original file along with fold information to the left like:
+
+ 2 400   0 + --[[ coding:UTF-8
+ 0 402   0 | comment ]]
+
+There are 4 columns before the file text representing the bits of the fold level:
+[flags (0xF000), level (0x0FFF), other (0xFFFF0000), picture].
+flags: may be 2 for header or 1 for whitespace.
+level: hexadecimal level number starting at 0x400. 'negative' level numbers like 0x3FF
+indicate errors in either the folder or in the input file, such as a C file that starts with #endif.
+other: can be used as the folder wants. Often used to hold the level of the next line.
+picture: gives a rough idea of the fold structure: '|' for level greater than 0x400,
+'+' for header, ' ' otherwise.
+After checking that the .folded.new file is correct, it can be promoted to .folded and
+committed to the repository.
+
+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
+printed. Problems with line-by-line processing are often caused by local variables in the
+lexer or folder that are incorrectly initialised. Sometimes extra state can be inferred, but it
+may have to be stored between runs (possibly with SetLineState) or the code may have to
+backtrack to a previous safe line - often something like a line that starts with a character
+in the default style.
+
+The SciTE.properties file is similar to properties files used for SciTE but are simpler.
+The lexer to be run is defined with a lexer.{filepattern} statement like:
+	lexer.*.d=d
+
+Keywords may be defined with keywords settings like:
+	keywords.*.cxx=int char
+	keywords2.*.cxx=open
+
+Other settings are treated as lexer or folder properties and forwarded to the lexer/folder:
+	lexer.cpp.track.preprocessor=1
+	fold=1
+
+It is often necessary to set 'fold' in SciTE.properties to cause folding.
+
+If there is a need to test additional configurations of keywords or properties then
+create another subdirectory with the different settings in a new SciTE.properties.
+
+There is some support for running benchmarks on lexers and folders. The properties
+testlexers.repeat.lex and testlexers.repeat.fold specify the number of times example
+documents are lexed or folded. Set to a large number like testlexers.repeat.lex=10000
+then run with a profiler.
diff --git a/scite-app/lexilla/test/TestDocument.cxx b/scite-app/lexilla/test/TestDocument.cxx
new file mode 100644
index 0000000..3a0972a
--- /dev/null
+++ b/scite-app/lexilla/test/TestDocument.cxx
@@ -0,0 +1,262 @@
+// Lexilla lexer library
+/** @file TestDocument.cxx
+ ** Lexer testing.
+ **/
+ // Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cassert>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+
+#include <iostream>
+
+#include "ILexer.h"
+
+#include "TestDocument.h"
+
+namespace {
+
+	const unsigned char UTF8BytesOfLead[256] = {
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 00 - 0F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 10 - 1F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 20 - 2F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 30 - 3F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 40 - 4F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 50 - 5F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 60 - 6F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 70 - 7F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 80 - 8F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 90 - 9F
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // A0 - AF
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // B0 - BF
+	1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0 - CF
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // D0 - DF
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // E0 - EF
+	4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // F0 - FF
+	};
+
+	int UnicodeFromUTF8(const unsigned char *us) noexcept {
+		switch (UTF8BytesOfLead[us[0]]) {
+		case 1:
+			return us[0];
+		case 2:
+			return ((us[0] & 0x1F) << 6) + (us[1] & 0x3F);
+		case 3:
+			return ((us[0] & 0xF) << 12) + ((us[1] & 0x3F) << 6) + (us[2] & 0x3F);
+		default:
+			return ((us[0] & 0x7) << 18) + ((us[1] & 0x3F) << 12) + ((us[2] & 0x3F) << 6) + (us[3] & 0x3F);
+		}
+	}
+
+	inline constexpr bool UTF8IsTrailByte(unsigned char ch) noexcept {
+		return (ch >= 0x80) && (ch < 0xc0);
+	}
+
+}
+
+void TestDocument::Set(std::string_view sv) {
+	text = sv;
+	textStyles.resize(text.size() + 1);
+	lineStarts.clear();
+	endStyled = 0;
+	lineStarts.push_back(0);
+	for (size_t pos = 0; pos < text.length(); pos++) {
+		if (text[pos] == '\n') {
+			lineStarts.push_back(pos + 1);
+		}
+	}
+	lineStarts.push_back(text.length());
+	lineStates.resize(lineStarts.size());
+	lineLevels.resize(lineStarts.size(), 0x400);
+}
+
+#if _MSC_VER
+// IDocument interface does not specify noexcept so best to not add it to implementation
+#pragma warning(disable: 26440)
+#endif
+
+int SCI_METHOD TestDocument::Version() const {
+	return Scintilla::dvRelease4;
+}
+
+void SCI_METHOD TestDocument::SetErrorStatus(int) {
+}
+
+Sci_Position SCI_METHOD TestDocument::Length() const {
+	return text.length();
+}
+
+void SCI_METHOD TestDocument::GetCharRange(char *buffer, Sci_Position position, Sci_Position lengthRetrieve) const {
+	text.copy(buffer, lengthRetrieve, position);
+}
+
+char SCI_METHOD TestDocument::StyleAt(Sci_Position position) const {
+	if (position < 0) {
+		return 0;
+	}
+	return textStyles.at(position);
+}
+
+Sci_Position SCI_METHOD TestDocument::LineFromPosition(Sci_Position position) const {
+	if (position >= static_cast<Sci_Position>(text.length())) {
+		return lineStarts.size() - 1 - 1;
+	}
+
+	const std::vector<Sci_Position>::const_iterator it = std::lower_bound(lineStarts.begin(), lineStarts.end(), position);
+	Sci_Position line = it - lineStarts.begin();
+	if (*it > position)
+		line--;
+	return line;
+}
+
+Sci_Position SCI_METHOD TestDocument::LineStart(Sci_Position line) const {
+	if (line < 0) {
+		return 0;
+	}
+	if (line >= static_cast<Sci_Position>(lineStarts.size())) {
+		return text.length();
+	}
+	return lineStarts.at(line);
+}
+
+int SCI_METHOD TestDocument::GetLevel(Sci_Position line) const {
+	return lineLevels.at(line);
+}
+
+int SCI_METHOD TestDocument::SetLevel(Sci_Position line, int level) {
+	return lineLevels.at(line) = level;
+}
+
+int SCI_METHOD TestDocument::GetLineState(Sci_Position line) const {
+	return lineStates.at(line);
+}
+
+int SCI_METHOD TestDocument::SetLineState(Sci_Position line, int state) {
+	return lineStates.at(line) = state;
+}
+
+void SCI_METHOD TestDocument::StartStyling(Sci_Position position) {
+	endStyled = position;
+}
+
+bool SCI_METHOD TestDocument::SetStyleFor(Sci_Position length, char style) {
+	for (Sci_Position i = 0; i < length; i++) {
+		textStyles[endStyled] = style;
+		endStyled++;
+	}
+	return true;
+}
+
+bool SCI_METHOD TestDocument::SetStyles(Sci_Position length, const char *styles) {
+	for (Sci_Position i = 0; i < length; i++) {
+		textStyles[endStyled] = styles[i];
+		endStyled++;
+	}
+	return true;
+}
+
+void SCI_METHOD TestDocument::DecorationSetCurrentIndicator(int) {
+	// Not implemented as no way to read decorations
+}
+
+void SCI_METHOD TestDocument::DecorationFillRange(Sci_Position, int, Sci_Position) {
+	// Not implemented as no way to read decorations
+}
+
+void SCI_METHOD TestDocument::ChangeLexerState(Sci_Position, Sci_Position) {
+	// Not implemented as no watcher to trigger
+}
+
+int SCI_METHOD TestDocument::CodePage() const {
+	// Always UTF-8 for now
+	return 65001;
+}
+
+bool SCI_METHOD TestDocument::IsDBCSLeadByte(char) const {
+	// Always UTF-8 for now
+	return false;
+}
+
+const char *SCI_METHOD TestDocument::BufferPointer() {
+	return text.c_str();
+}
+
+int SCI_METHOD TestDocument::GetLineIndentation(Sci_Position) {
+	// Never actually called - lexers use Accessor::IndentAmount
+	return 0;
+}
+
+Sci_Position SCI_METHOD TestDocument::LineEnd(Sci_Position line) const {
+	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
+	if ((position > LineStart(line)) && (text.at(position - 1) == '\r')) {
+		position--;
+	}
+	return position;
+}
+
+Sci_Position SCI_METHOD TestDocument::GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const {
+	Sci_Position pos = positionStart;
+	if (characterOffset < 0) {
+		while (characterOffset < 0) {
+			if (pos <= 0) {
+				return 0;
+			}
+			unsigned char previousByte = text.at(pos - 1);
+			if (previousByte < 0x80) {
+				pos--;
+				characterOffset++;
+			} else {
+				while ((pos > 1) && UTF8IsTrailByte(previousByte)) {
+					pos--;
+					previousByte = text.at(pos - 1);
+				}
+				pos--;
+				// text[pos] is now a character start
+				characterOffset++;
+			}
+		}
+		return pos;
+	}
+	assert(characterOffset >= 0);
+	// TODO: invalid UTF-8
+	while (characterOffset > 0) {
+		Sci_Position width = 0;
+		GetCharacterAndWidth(pos, &width);
+		pos += width;
+		characterOffset--;
+	}
+	return pos;
+}
+
+int SCI_METHOD TestDocument::GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const {
+	// TODO: invalid UTF-8
+	if (position >= static_cast<Sci_Position>(text.length())) {
+		// Return NULs after document end
+		if (pWidth) {
+			*pWidth = 1;
+		}
+		return '\0';
+	}
+	const unsigned char leadByte = text.at(position);
+	if (leadByte < 0x80) {
+		if (pWidth) {
+			*pWidth = 1;
+		}
+		return leadByte;
+	}
+	const int widthCharBytes = UTF8BytesOfLead[leadByte];
+	unsigned char charBytes[] = { leadByte,0,0,0 };
+	for (int b = 1; b < widthCharBytes; b++)
+		charBytes[b] = text[position + b];
+
+	if (pWidth) {
+		*pWidth = widthCharBytes;
+	}
+	return UnicodeFromUTF8(charBytes);
+}
diff --git a/scite-app/lexilla/test/TestDocument.h b/scite-app/lexilla/test/TestDocument.h
new file mode 100644
index 0000000..9faf0ec
--- /dev/null
+++ b/scite-app/lexilla/test/TestDocument.h
@@ -0,0 +1,54 @@
+// Lexilla lexer library
+/** @file TestDocument.h
+ ** Lexer testing.
+ **/
+// Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef TESTDOCUMENT_H
+#define TESTDOCUMENT_H
+
+class TestDocument : public Scintilla::IDocument {
+	std::string text;
+	std::string textStyles;
+	std::vector<Sci_Position> lineStarts;
+	std::vector<int> lineStates;
+	std::vector<int> lineLevels;
+	Sci_Position endStyled=0;
+public:
+	void Set(std::string_view sv);
+	TestDocument() = default;
+	// Deleted so TestDocument objects can not be copied.
+	TestDocument(const TestDocument&) = delete;
+	TestDocument(TestDocument&&) = delete;
+	TestDocument &operator=(const TestDocument&) = delete;
+	TestDocument &operator=(TestDocument&&) = delete;
+	virtual ~TestDocument() = default;
+
+	int SCI_METHOD Version() const override;
+	void SCI_METHOD SetErrorStatus(int status) override;
+	Sci_Position SCI_METHOD Length() const override;
+	void SCI_METHOD GetCharRange(char *buffer, Sci_Position position, Sci_Position lengthRetrieve) const override;
+	char SCI_METHOD StyleAt(Sci_Position position) const override;
+	Sci_Position SCI_METHOD LineFromPosition(Sci_Position position) const override;
+	Sci_Position SCI_METHOD LineStart(Sci_Position line) const override;
+	int SCI_METHOD GetLevel(Sci_Position line) const override;
+	int SCI_METHOD SetLevel(Sci_Position line, int level) override;
+	int SCI_METHOD GetLineState(Sci_Position line) const override;
+	int SCI_METHOD SetLineState(Sci_Position line, int state) override;
+	void SCI_METHOD StartStyling(Sci_Position position) override;
+	bool SCI_METHOD SetStyleFor(Sci_Position length, char style) override;
+	bool SCI_METHOD SetStyles(Sci_Position length, const char *styles) override;
+	void SCI_METHOD DecorationSetCurrentIndicator(int indicator) override;
+	void SCI_METHOD DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) override;
+	void SCI_METHOD ChangeLexerState(Sci_Position start, Sci_Position end) override;
+	int SCI_METHOD CodePage() const override;
+	bool SCI_METHOD IsDBCSLeadByte(char ch) const override;
+	const char *SCI_METHOD BufferPointer() override;
+	int SCI_METHOD GetLineIndentation(Sci_Position line) override;
+	Sci_Position SCI_METHOD LineEnd(Sci_Position line) const override;
+	Sci_Position SCI_METHOD GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const override;
+	int SCI_METHOD GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const override;
+};
+
+#endif
diff --git a/scite-app/lexilla/test/TestLexers.cxx b/scite-app/lexilla/test/TestLexers.cxx
new file mode 100644
index 0000000..c0b33e0
--- /dev/null
+++ b/scite-app/lexilla/test/TestLexers.cxx
@@ -0,0 +1,528 @@
+// Lexilla lexer library
+/** @file TestLexers.cxx
+ ** Test lexers through Lexilla.
+ **/
+ // Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+ // The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cassert>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <filesystem>
+
+#include "ILexer.h"
+
+#include "Lexilla.h"
+#include "LexillaAccess.h"
+
+#include "TestDocument.h"
+
+namespace {
+
+std::string ReadFile(std::filesystem::path path) {
+	std::ifstream ifs(path, std::ios::binary);
+	std::string content((std::istreambuf_iterator<char>(ifs)),
+		(std::istreambuf_iterator<char>()));
+	return content;
+}
+
+std::string MarkedDocument(const Scintilla::IDocument *pdoc) {
+	std::ostringstream os(std::ios::binary);
+	char prevStyle = -1;
+	for (Sci_Position pos = 0; pos < pdoc->Length(); pos++) {
+		const char styleNow = pdoc->StyleAt(pos);
+		if (styleNow != prevStyle) {
+			os << "{" << static_cast<unsigned int>(styleNow) << "}";
+			prevStyle = styleNow;
+		}
+		char ch = '\0';
+		pdoc->GetCharRange(&ch, pos, 1);
+		os << ch;
+	}
+	return os.str();
+}
+
+void PrintLevel(std::ostringstream &os, int level) {
+	const int levelNow = level & 0xFFF;
+	const int levelNext = level >> 16;
+	const int levelFlags = (level >> 12) & 0xF;
+	char foldSymbol = ' ';
+	if (level & 0x2000)
+		foldSymbol = '+';
+	else if (levelNow > 0x400)
+		foldSymbol = '|';
+	os << std::hex << " " << levelFlags << " "
+		<< std::setw(3) << levelNow << " "
+		<< std::setw(3) << levelNext << " "
+		<< foldSymbol << " ";
+}
+
+std::string FoldedDocument(const Scintilla::IDocument *pdoc) {
+	std::ostringstream os(std::ios::binary);
+	Sci_Position linePrev = -1;
+	char ch = '\0';
+	for (Sci_Position pos = 0; pos < pdoc->Length(); pos++) {
+		const Sci_Position lineNow = pdoc->LineFromPosition(pos);
+		if (linePrev < lineNow) {
+			PrintLevel(os, pdoc->GetLevel(lineNow));
+			linePrev = lineNow;
+		}
+		pdoc->GetCharRange(&ch, pos, 1);
+		os << ch;
+	}
+	if (ch == '\n') {
+		// Extra empty line
+		PrintLevel(os, pdoc->GetLevel(linePrev + 1));
+	}
+	return os.str();
+}
+
+class PropertyMap {
+public:
+	using PropMap = std::map<std::string, std::string>;
+	PropMap properties;
+
+	void ReadFromFile(std::filesystem::path path) {
+		std::ifstream ifs(path);
+		std::string line;
+		std::string logicalLine;
+		while (std::getline(ifs, line)) {
+			if (line.ends_with("\r")) {
+				// Accidentally have \r\n line ends on Unix system
+				line.pop_back();
+			}
+			logicalLine += line;
+			if (logicalLine.ends_with("\\")) {
+				logicalLine.pop_back();
+			} else {
+				const size_t positionEquals = logicalLine.find("=");
+				if (positionEquals != std::string::npos) {
+					const std::string key = logicalLine.substr(0, positionEquals);
+					const std::string value = logicalLine.substr(positionEquals + 1);
+					properties[key] = value;
+				}
+				logicalLine.clear();
+			}
+		}
+	}
+
+	std::optional<std::string> GetProperty(std::string_view key) const {
+		const PropMap::const_iterator prop = properties.find(std::string(key));
+		if (prop == properties.end())
+			return std::nullopt;
+		else
+			return prop->second;
+	}
+
+	std::optional<std::string> GetPropertyForFile(std::string_view keyPrefix, std::string_view fileName) const {
+		for (auto const &[key, val] : properties) {
+			if (key.starts_with(keyPrefix)) {
+				const std::string keySuffix = key.substr(keyPrefix.length());
+				if (fileName.ends_with(keySuffix)) {
+					return val;
+				}
+			}
+		}
+		return std::nullopt;
+	}
+
+	std::optional<int> GetPropertyValue(std::string_view key) const {
+		std::optional<std::string> value = GetProperty(key);
+		try {
+			if (value)
+				return std::stoi(value->c_str());
+		}
+		catch (std::invalid_argument &) {
+			// Just return empty
+		}
+		return {};
+	}
+
+};
+
+int Substitute(std::string &s, const std::string &sFind, const std::string &sReplace) {
+	int c = 0;
+	const size_t lenFind = sFind.size();
+	const size_t lenReplace = sReplace.size();
+	size_t posFound = s.find(sFind);
+	while (posFound != std::string::npos) {
+		s.replace(posFound, lenFind, sReplace);
+		posFound = s.find(sFind, posFound + lenReplace);
+		c++;
+	}
+	return c;
+}
+
+int WindowsToUnix(std::string &s) {
+	return Substitute(s, "\r\n", "\n");
+}
+
+int UnixToWindows(std::string &s) {
+	return Substitute(s, "\n", "\r\n");
+}
+
+const std::string BOM = "\xEF\xBB\xBF";
+
+void TestCRLF(std::filesystem::path path, const std::string s, Scintilla::ILexer5 *plex) {
+	// Convert all line ends to \r\n to check if styles change between \r and \n which makes
+	// it difficult to test on different platforms when files may have line ends changed.
+	std::string text = s;
+	WindowsToUnix(text);
+	std::string textUnix = text;
+	UnixToWindows(text);
+	TestDocument doc;
+	doc.Set(text);
+	Scintilla::IDocument *pdoc = &doc;
+	plex->Lex(0, pdoc->Length(), 0, pdoc);
+	plex->Fold(0, pdoc->Length(), 0, pdoc);
+	const std::string styledText = MarkedDocument(pdoc);
+	const std::string foldedText = FoldedDocument(pdoc);
+
+	int prevStyle = -1;
+	Sci_Position line = 1;
+	for (Sci_Position pos = 0; pos < pdoc->Length(); pos++) {
+		const int styleNow = pdoc->StyleAt(pos);
+		char ch = '\0';
+		pdoc->GetCharRange(&ch, pos, 1);
+		if (ch == '\n') {
+			if (styleNow != prevStyle) {
+				std::cout << path.string() << ":" << line << ":" <<
+					" different styles between \\r and \\n at " <<
+					pos << ": " << prevStyle << ", " << styleNow << "\n";
+			}
+			line++;
+		}
+		prevStyle = styleNow;
+	}
+
+	// Lex and fold with \n line ends then check result is same
+
+	TestDocument docUnix;
+	docUnix.Set(textUnix);
+	Scintilla::IDocument *pdocUnix = &docUnix;
+	plex->Lex(0, pdocUnix->Length(), 0, pdocUnix);
+	plex->Fold(0, pdocUnix->Length(), 0, pdocUnix);
+	std::string styledTextUnix = MarkedDocument(pdocUnix);
+	std::string foldedTextUnix = FoldedDocument(pdocUnix);
+
+	// Convert results from \n to \r\n run
+	UnixToWindows(styledTextUnix);
+	UnixToWindows(foldedTextUnix);
+
+	if (styledText != styledTextUnix) {
+		std::cout << "\n" << path.string() << ":1: has different styles with \\n versus \\r\\n line ends\n\n";
+	}
+	if (foldedText != foldedTextUnix) {
+		std::cout << "\n" << path.string() << ":1: has different folds with \\n versus \\r\\n line ends\n\n";
+	}
+
+	plex->Release();
+}
+
+void TestILexer(Scintilla::ILexer5 *plex) {
+	// Test each method of the ILexer interface.
+	// Mostly ensures there are no crashes when calling methods.
+	// Some methods are tested later (Release, Lex, Fold).
+	// PrivateCall performs arbitrary actions so is not safe to call.
+
+	[[maybe_unused]] const int version = plex->Version();
+	assert(version == Scintilla::lvRelease5);
+
+	[[maybe_unused]] const char *language = plex->GetName();
+	assert(language);
+
+	[[maybe_unused]] const int ident = plex->GetIdentifier();
+	assert(ident >= 0);
+
+	[[maybe_unused]] const char *propertyNames = plex->PropertyNames();
+	assert(propertyNames);
+
+	[[maybe_unused]] const int propertyType = plex->PropertyType("unknown");
+	assert(propertyType >= 0 && propertyType <= 2);
+
+	[[maybe_unused]] const char *propertyDescription = plex->DescribeProperty("unknown");
+	assert(propertyDescription);
+
+	[[maybe_unused]] const Sci_Position invalidation = plex->PropertySet("unknown", "unknown");
+	assert(invalidation == 0 || invalidation == -1);
+
+	[[maybe_unused]] const char *wordListDescription = plex->DescribeWordListSets();
+	assert(wordListDescription);
+
+	[[maybe_unused]] const Sci_Position invalidationWordList = plex->WordListSet(9, "unknown");
+	assert(invalidationWordList == 0 || invalidationWordList == -1);
+
+	[[maybe_unused]] const int lineEndTypes = plex->LineEndTypesSupported();
+	assert(lineEndTypes == 0 || lineEndTypes == 1);
+
+	if (const char *bases = plex->GetSubStyleBases()) {
+		// Allocate a substyle for each possible style
+		while (*bases) {
+			constexpr int newStyles = 3;
+			const int base = *bases;
+			const int baseStyle = plex->AllocateSubStyles(base, newStyles);
+			[[maybe_unused]] const int styleBack = plex->StyleFromSubStyle(baseStyle);
+			assert(styleBack == base);
+			plex->SetIdentifiers(baseStyle, "int nullptr");
+			[[maybe_unused]] const int start = plex->SubStylesStart(base);
+			assert(start == baseStyle);
+			[[maybe_unused]] const int len = plex->SubStylesLength(base);
+			assert(len == newStyles);
+			bases++;
+		}
+		plex->FreeSubStyles();
+	}
+
+	[[maybe_unused]] const int primary = plex->PrimaryStyleFromStyle(2);
+	assert(primary == 2);
+
+	[[maybe_unused]] const int distance = plex->DistanceToSecondaryStyles();
+	assert(distance >= 0);
+
+	// Just see if crashes - nullptr is valid return to indicate not present.
+	[[maybe_unused]] const char *propertyUnknownValue = plex->PropertyGet("unknown");
+
+	const int styles = plex->NamedStyles();
+	for (int style = 0; style < styles; style++) {
+		[[maybe_unused]] const char *name = plex->NameOfStyle(style);
+		assert(name);
+		[[maybe_unused]] const char *tags = plex->TagsOfStyle(style);
+		assert(tags);
+		[[maybe_unused]] const char *description = plex->DescriptionOfStyle(style);
+		assert(description);
+	}
+}
+
+const char *lexerPrefix = "lexer.*";
+
+bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap) {
+	// Find and create correct lexer
+	std::optional<std::string> language = propertyMap.GetPropertyForFile(lexerPrefix, path.filename().string());
+	if (!language) {
+		std::cout << "\n" << path.string() << ":1: has no language\n\n";
+		return false;
+	}
+	Scintilla::ILexer5 *plex = Lexilla::MakeLexer(*language);
+	if (!plex) {
+		std::cout << "\n" << path.string() << ":1: has no lexer for " << *language << "\n\n";
+		return false;
+	}
+
+	// Set keywords, keywords2, ... keywords9, for this file 
+	for (int kw = 0; kw < 10; kw++) {
+		std::string kwChoice("keywords");
+		if (kw > 0) {
+			kwChoice.push_back('1' + kw);
+		}
+		kwChoice.append(".*");
+		std::optional<std::string> keywordN = propertyMap.GetPropertyForFile(kwChoice, path.filename().string());
+		if (keywordN) {
+			plex->WordListSet(kw, keywordN->c_str());
+		}
+	}
+
+	// Set parameters of lexer
+	for (auto const &[key, val] : propertyMap.properties) {
+		if (key.starts_with("#")) {
+			// Ignore comments
+		} else if (key.starts_with("lexer.*")) {
+			// Ignore as processed earlier
+		} else if (key.starts_with("keywords")) {
+			// Ignore as processed earlier
+		} else {
+			plex->PropertySet(key.c_str(), val.c_str());
+		}
+	}
+
+	TestILexer(plex);
+
+	std::string text = ReadFile(path);
+	if (text.starts_with(BOM)) {
+		text.erase(0, BOM.length());
+	}
+
+	std::filesystem::path pathStyled = path;
+	pathStyled += ".styled";
+	const std::string styledText = ReadFile(pathStyled);
+
+	std::filesystem::path pathFolded = path;
+	pathFolded += ".folded";
+	const std::string foldedText = ReadFile(pathFolded);
+
+	const int repeatLex = propertyMap.GetPropertyValue("testlexers.repeat.lex").value_or(1);
+	const int repeatFold = propertyMap.GetPropertyValue("testlexers.repeat.fold").value_or(1);
+
+	TestDocument doc;
+	doc.Set(text);
+	Scintilla::IDocument *pdoc = &doc;
+	for (int i = 0; i < repeatLex; i++) {
+		plex->Lex(0, pdoc->Length(), 0, pdoc);
+	}
+	for (int i = 0; i < repeatFold; i++) {
+		plex->Fold(0, pdoc->Length(), 0, pdoc);
+	}
+
+	bool success = true;
+
+	const std::string styledTextNew = MarkedDocument(pdoc);
+	if (styledTextNew != styledText) {
+		success = false;
+		std::cout << "\n" << path.string() << ":1: is different\n\n";
+		std::filesystem::path pathNew = path;
+		pathNew += ".styled.new";
+		std::ofstream ofs(pathNew, std::ios::binary);
+		ofs << styledTextNew;
+	}
+
+	const std::string foldedTextNew = FoldedDocument(pdoc);
+	if (foldedTextNew != foldedText) {
+		success = false;
+		std::cout << "\n" << path.string() << ":1: has different folds\n\n";
+		std::filesystem::path pathNew = path;
+		pathNew += ".folded.new";
+		std::ofstream ofs(pathNew, std::ios::binary);
+		ofs << foldedTextNew;
+	}
+
+	const std::optional<int> perLineDisable = propertyMap.GetPropertyValue("testlexers.per.line.disable");
+	const bool disablePerLineTests = perLineDisable.value_or(false);
+
+	if (success && !disablePerLineTests) {
+		// Test line by line lexing/folding
+		doc.Set(text);
+		const Sci_Position lines = doc.LineFromPosition(doc.Length());
+		Sci_Position startLine = 0;
+		for (Sci_Position line = 0; line <= lines; line++) {
+			const Sci_Position endLine = doc.LineStart(line+1);
+			int styleStart = 0;
+			if (startLine > 0)
+				styleStart = doc.StyleAt(startLine - 1);
+			plex->Lex(startLine, endLine - startLine, styleStart, pdoc);
+			plex->Fold(startLine, endLine - startLine, styleStart, pdoc);
+			startLine = endLine;
+		}
+
+		const std::string styledTextNewPerLine = MarkedDocument(pdoc);
+		if (styledTextNewPerLine != styledText) {
+			success = false;
+			std::cout << "\n" << path.string() << ":1: per-line is different\n\n";
+			std::filesystem::path pathNew = path;
+			pathNew += ".styled.new";
+			std::ofstream ofs(pathNew, std::ios::binary);
+			ofs << styledTextNewPerLine;
+		}
+
+		const std::string foldedTextNewPerLine = FoldedDocument(pdoc);
+		if (foldedTextNewPerLine != foldedText) {
+			success = false;
+			std::cout << "\n" << path.string() << ":1: per-line has different folds\n\n";
+			std::filesystem::path pathNew = path;
+			pathNew += ".folded.new";
+			std::ofstream ofs(pathNew, std::ios::binary);
+			ofs << foldedTextNewPerLine;
+		}
+	}
+
+	plex->Release();
+
+	TestCRLF(path, text, Lexilla::MakeLexer(*language));
+
+	return success;
+}
+
+bool TestDirectory(std::filesystem::path directory, std::filesystem::path basePath) {
+	PropertyMap properties;
+	properties.ReadFromFile(directory / "SciTE.properties");
+	bool success = true;
+	for (auto &p : std::filesystem::directory_iterator(directory)) {
+		if (!p.is_directory()) {
+			const std::string extension = p.path().extension().string();
+			if (extension != ".properties" && extension != ".styled" && extension != ".new" &&
+				extension != ".folded") {
+				const std::filesystem::path relativePath = p.path().lexically_relative(basePath);
+				std::cout << "Lexing " << relativePath.string() << '\n';
+				if (!TestFile(p, properties)) {
+					success = false;
+				}
+			}
+		}
+	}
+	return success;
+}
+
+bool AccessLexilla(std::filesystem::path basePath) {
+	if (!std::filesystem::exists(basePath)) {
+		std::cout << "No examples at " << basePath.string() << "\n";
+		return false;
+	}
+
+	bool success = true;
+	for (auto &p : std::filesystem::recursive_directory_iterator(basePath)) {
+		if (p.is_directory()) {
+			//std::cout << p.path().string() << '\n';
+			if (!TestDirectory(p, basePath)) {
+				success = false;
+			}
+		}
+	}
+	return success;
+}
+
+std::filesystem::path FindLexillaDirectory(std::filesystem::path startDirectory) {
+	// Search up from startDirectory for a directory named "lexilla" or containing a "bin" subdirectory 
+	std::filesystem::path directory = startDirectory;
+	while (!directory.empty()) {
+		//std::cout << "Searching " << directory.string() << "\n";
+		const std::filesystem::path parent = directory.parent_path();
+		const std::filesystem::path localLexilla = directory / "lexilla";
+		const std::filesystem::directory_entry entry(localLexilla);
+		if (entry.is_directory()) {
+			std::cout << "Found Lexilla at " << entry.path().string() << "\n";
+			return localLexilla;
+		}
+		const std::filesystem::path localBin = directory / "bin";
+		const std::filesystem::directory_entry entryBin(localBin);
+		if (entryBin.is_directory()) {
+			std::cout << "Found Lexilla at " << directory.string() << "\n";
+			return directory;
+		}
+		if (parent == directory) {
+			std::cout << "Reached root at " << directory.string() << "\n";
+			return std::filesystem::path();
+		}
+		directory = parent;
+	}
+	return std::filesystem::path();
+}
+
+}
+
+
+
+int main() {
+	bool success = false;
+	// TODO: Allow specifying the base directory through a command line argument
+	const std::filesystem::path baseDirectory = FindLexillaDirectory(std::filesystem::current_path());
+	if (!baseDirectory.empty()) {
+		const std::filesystem::path examplesDirectory = baseDirectory / "test" / "examples";
+#ifdef LEXILLA_STATIC
+		success = AccessLexilla(examplesDirectory);
+#else
+		const std::filesystem::path sharedLibrary = baseDirectory / "bin" / LEXILLA_LIB;
+		if (Lexilla::Load(sharedLibrary.string())) {
+			success = AccessLexilla(examplesDirectory);
+		} else {
+			std::cout << "Failed to load " << sharedLibrary << "\n";
+		}
+#endif
+	}
+	return success ? 0 : 1;
+}
diff --git a/scite-app/lexilla/test/TestLexers.vcxproj b/scite-app/lexilla/test/TestLexers.vcxproj
new file mode 100644
index 0000000..dfb98f4
--- /dev/null
+++ b/scite-app/lexilla/test/TestLexers.vcxproj
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{2E0BBD6B-4BC8-4A6C-9DDA-199C27899335}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>lexillatest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>..\..\..\..\..\..\..\Users\Neil\NeilRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>..\..\..\..\..\..\..\Users\Neil\NeilRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>..\..\..\..\..\..\..\Users\Neil\NeilRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>..\..\..\..\..\..\..\Users\Neil\NeilRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\scintilla\include;..\include;..\access;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\scintilla\include;..\include;..\access;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\scintilla\include;..\include;..\access;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\scintilla\include;..\include;..\access;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="TestLexers.cxx" />
+    <ClCompile Include="TestDocument.cxx" />
+    <ClCompile Include="..\access\LexillaAccess.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\bin\Lexilla.dll" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/batch/SciTE.properties b/scite-app/lexilla/test/examples/batch/SciTE.properties
new file mode 100644
index 0000000..c3963bd
--- /dev/null
+++ b/scite-app/lexilla/test/examples/batch/SciTE.properties
@@ -0,0 +1,3 @@
+lexer.*.bat=batch
+keywords.*.bat=call defined do echo else errorlevel exist exit for goto if in not set
+
diff --git a/scite-app/lexilla/test/examples/batch/x.bat b/scite-app/lexilla/test/examples/batch/x.bat
new file mode 100644
index 0000000..cb01645
--- /dev/null
+++ b/scite-app/lexilla/test/examples/batch/x.bat
@@ -0,0 +1,57 @@
+rem comment=1
+rem 'echo' is word=2, 'a' is default=0
+echo a
+rem label=3
+:START
+rem '@' is hide=4
+@echo b
+rem 'gcc' is external command=5
+gcc --version
+rem '%PATH%' is variable=6
+echo %PATH%
+echo %ProgramFiles(x86)%
+rem operator=7 '='
+@set Q=A
+
+::comment=1
+
+:: Bug 1624: this construct produced inconsistent brackets in the past
+if ERRORLEVEL 2 goto END
+@if exist a (
+echo exists
+) else (
+echo not
+)
+
+FOR /L %%G IN (2,1,4) DO (echo %%G)
+
+:: Bug 1997: keywords not recognized when preceded by '('
+IF NOT DEFINED var (SET var=1)
+
+:: Bug 2065: keywords not recognized when followed by ')'
+@if exist a ( exit)
+
+:: Bug: with \r or \n, 'command' is seen as continuation
+echo word ^
+1
+command
+
+:: Bug argument and variable expansion
+echo %~dp0123
+echo %%-~012
+echo %%~%%~-abcd
+FOR /F %%I in ("C:\Test\temp.txt") do echo %%~dI
+
+:: Bug ending of argument and variable expansion
+echo %~dp0\123
+echo "%~dp0123"
+echo "%%-~012"
+echo "%%~%%~-abcd"
+FOR /F %%I in ("C:\Test\temp.txt") do echo "%%~dI"
+
+:: Bug escaped %
+echo %%0
+echo %%%0
+echo %%%%~-abcd
+
+:END
diff --git a/scite-app/lexilla/test/examples/batch/x.bat.folded b/scite-app/lexilla/test/examples/batch/x.bat.folded
new file mode 100644
index 0000000..eb2db89
--- /dev/null
+++ b/scite-app/lexilla/test/examples/batch/x.bat.folded
@@ -0,0 +1,58 @@
+ 0 400   0   rem comment=1
+ 0 400   0   rem 'echo' is word=2, 'a' is default=0
+ 0 400   0   echo a
+ 0 400   0   rem label=3
+ 0 400   0   :START
+ 0 400   0   rem '@' is hide=4
+ 0 400   0   @echo b
+ 0 400   0   rem 'gcc' is external command=5
+ 0 400   0   gcc --version
+ 0 400   0   rem '%PATH%' is variable=6
+ 0 400   0   echo %PATH%
+ 0 400   0   echo %ProgramFiles(x86)%
+ 0 400   0   rem operator=7 '='
+ 0 400   0   @set Q=A
+ 0 400   0   
+ 0 400   0   ::comment=1
+ 0 400   0   
+ 0 400   0   :: Bug 1624: this construct produced inconsistent brackets in the past
+ 0 400   0   if ERRORLEVEL 2 goto END
+ 0 400   0   @if exist a (
+ 0 400   0   echo exists
+ 0 400   0   ) else (
+ 0 400   0   echo not
+ 0 400   0   )
+ 0 400   0   
+ 0 400   0   FOR /L %%G IN (2,1,4) DO (echo %%G)
+ 0 400   0   
+ 0 400   0   :: Bug 1997: keywords not recognized when preceded by '('
+ 0 400   0   IF NOT DEFINED var (SET var=1)
+ 0 400   0   
+ 0 400   0   :: Bug 2065: keywords not recognized when followed by ')'
+ 0 400   0   @if exist a ( exit)
+ 0 400   0   
+ 0 400   0   :: Bug: with \r or \n, 'command' is seen as continuation
+ 0 400   0   echo word ^
+ 0 400   0   1
+ 0 400   0   command
+ 0 400   0   
+ 0 400   0   :: Bug argument and variable expansion
+ 0 400   0   echo %~dp0123
+ 0 400   0   echo %%-~012
+ 0 400   0   echo %%~%%~-abcd
+ 0 400   0   FOR /F %%I in ("C:\Test\temp.txt") do echo %%~dI
+ 0 400   0   
+ 0 400   0   :: Bug ending of argument and variable expansion
+ 0 400   0   echo %~dp0\123
+ 0 400   0   echo "%~dp0123"
+ 0 400   0   echo "%%-~012"
+ 0 400   0   echo "%%~%%~-abcd"
+ 0 400   0   FOR /F %%I in ("C:\Test\temp.txt") do echo "%%~dI"
+ 0 400   0   
+ 0 400   0   :: Bug escaped %
+ 0 400   0   echo %%0
+ 0 400   0   echo %%%0
+ 0 400   0   echo %%%%~-abcd
+ 0 400   0   
+ 0 400   0   :END
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/batch/x.bat.styled b/scite-app/lexilla/test/examples/batch/x.bat.styled
new file mode 100644
index 0000000..fe06cd5
--- /dev/null
+++ b/scite-app/lexilla/test/examples/batch/x.bat.styled
@@ -0,0 +1,57 @@
+{1}rem comment=1
+rem 'echo' is word=2, 'a' is default=0
+{2}echo{0} a
+{1}rem label=3
+{3}:START
+{1}rem '@' is hide=4
+{4}@{2}echo{0} b
+{1}rem 'gcc' is external command=5
+{5}gcc{0} --version
+{1}rem '%PATH%' is variable=6
+{2}echo{0} {6}%PATH%{0}
+{2}echo{0} {6}%ProgramFiles(x86)%{0}
+{1}rem operator=7 '='
+{4}@{2}set{0} Q{7}={0}A
+
+{1}::comment=1
+{0}
+{1}:: Bug 1624: this construct produced inconsistent brackets in the past
+{2}if ERRORLEVEL{0} 2{2} goto{0} END
+{4}@{2}if exist{0} a (
+{2}echo{0} exists
+){2} else{0} (
+{2}echo{0} not
+)
+
+{2}FOR{0} /L {6}%%G{2} IN{0} (2,1,4){2} DO{0} ({2}echo{0} {6}%%G{0})
+
+{1}:: Bug 1997: keywords not recognized when preceded by '('
+{2}IF NOT DEFINED{0} var ({2}SET{0} var{7}={0}1)
+
+{1}:: Bug 2065: keywords not recognized when followed by ')'
+{4}@{2}if exist{0} a ({2} exit{0})
+
+{1}:: Bug: with \r or \n, 'command' is seen as continuation
+{2}echo{0} word ^
+1
+{5}command{0}
+
+{1}:: Bug argument and variable expansion
+{2}echo{0} {6}%~dp0{0}123
+{2}echo{0} {6}%%-{0}~012
+{2}echo{0} %%~{6}%%~-abcd{0}
+{2}FOR{0} /F {6}%%I{2} in{0} ("C:\Test\temp.txt"){2} do echo{0} {6}%%~dI{0}
+
+{1}:: Bug ending of argument and variable expansion
+{2}echo{0} {6}%~dp0{0}\123
+{2}echo{0} "{6}%~dp0{0}123"
+{2}echo{0} "{6}%%-{0}~012"
+{2}echo{0} "%%~{6}%%~-abcd{0}"
+{2}FOR{0} /F {6}%%I{2} in{0} ("C:\Test\temp.txt"){2} do echo{0} "{6}%%~dI{0}"
+
+{1}:: Bug escaped %
+{2}echo{0} {6}%%0{0}
+{2}echo{0} %%{6}%0{0}
+{2}echo{0} %%{6}%%~-abcd{0}
+
+{3}:END
diff --git a/scite-app/lexilla/test/examples/caml/AllStyles.ml b/scite-app/lexilla/test/examples/caml/AllStyles.ml
new file mode 100644
index 0000000..f8a9dc5
--- /dev/null
+++ b/scite-app/lexilla/test/examples/caml/AllStyles.ml
@@ -0,0 +1,49 @@
+(* Enumerate all styles: 0 to 15 *)
+(* comment=12 *)
+
+(* whitespace=0 *)
+	(* w *)
+
+(* identifier=1 *)
+ident
+
+(* tagname=2 *)
+`ident
+
+(* keyword=3 *)
+and
+
+(* keyword2=4 *)
+None
+
+(* keyword3=5 *)
+char
+
+(* linenum=6 *)
+#12
+
+(* operator=7 *)
+*
+
+(* number=8 *)
+12
+
+(* char=9 *)
+'a'
+
+(* white=10 *)
+(* this state can not be reached in caml mode, only SML mode but that stops other states *)
+(* SML mode is triggered by "andalso" being in the keywords *)
+"\ \x"
+
+(* string=11 *)
+"string"
+
+(* comment1=13 *)
+(* (* comment 1 *) *)
+
+(* comment2=14 *)
+(* (* (* comment 2 *) *) *)
+
+(* comment3=15 *)
+(* (* (* (* comment 1 *) *) *)  *)
diff --git a/scite-app/lexilla/test/examples/caml/AllStyles.ml.folded b/scite-app/lexilla/test/examples/caml/AllStyles.ml.folded
new file mode 100644
index 0000000..3e0299c
--- /dev/null
+++ b/scite-app/lexilla/test/examples/caml/AllStyles.ml.folded
@@ -0,0 +1,50 @@
+ 0 400   0   (* Enumerate all styles: 0 to 15 *)
+ 0 400   0   (* comment=12 *)
+ 0 400   0   
+ 0 400   0   (* whitespace=0 *)
+ 0 400   0   	(* w *)
+ 0 400   0   
+ 0 400   0   (* identifier=1 *)
+ 0 400   0   ident
+ 0 400   0   
+ 0 400   0   (* tagname=2 *)
+ 0 400   0   `ident
+ 0 400   0   
+ 0 400   0   (* keyword=3 *)
+ 0 400   0   and
+ 0 400   0   
+ 0 400   0   (* keyword2=4 *)
+ 0 400   0   None
+ 0 400   0   
+ 0 400   0   (* keyword3=5 *)
+ 0 400   0   char
+ 0 400   0   
+ 0 400   0   (* linenum=6 *)
+ 0 400   0   #12
+ 0 400   0   
+ 0 400   0   (* operator=7 *)
+ 0 400   0   *
+ 0 400   0   
+ 0 400   0   (* number=8 *)
+ 0 400   0   12
+ 0 400   0   
+ 0 400   0   (* char=9 *)
+ 0 400   0   'a'
+ 0 400   0   
+ 0 400   0   (* white=10 *)
+ 0 400   0   (* this state can not be reached in caml mode, only SML mode but that stops other states *)
+ 0 400   0   (* SML mode is triggered by "andalso" being in the keywords *)
+ 0 400   0   "\ \x"
+ 0 400   0   
+ 0 400   0   (* string=11 *)
+ 0 400   0   "string"
+ 0 400   0   
+ 0 400   0   (* comment1=13 *)
+ 0 400   0   (* (* comment 1 *) *)
+ 0 400   0   
+ 0 400   0   (* comment2=14 *)
+ 0 400   0   (* (* (* comment 2 *) *) *)
+ 0 400   0   
+ 0 400   0   (* comment3=15 *)
+ 0 400   0   (* (* (* (* comment 1 *) *) *)  *)
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/caml/AllStyles.ml.styled b/scite-app/lexilla/test/examples/caml/AllStyles.ml.styled
new file mode 100644
index 0000000..1ed9307
--- /dev/null
+++ b/scite-app/lexilla/test/examples/caml/AllStyles.ml.styled
@@ -0,0 +1,49 @@
+{12}(* Enumerate all styles: 0 to 15 *){0}
+{12}(* comment=12 *){0}
+
+{12}(* whitespace=0 *){0}
+	{12}(* w *){0}
+
+{12}(* identifier=1 *){0}
+{1}ident{0}
+
+{12}(* tagname=2 *){0}
+{2}`ident{0}
+
+{12}(* keyword=3 *){0}
+{3}and{0}
+
+{12}(* keyword2=4 *){0}
+{4}None{0}
+
+{12}(* keyword3=5 *){0}
+{5}char{0}
+
+{12}(* linenum=6 *){0}
+{6}#12{0}
+
+{12}(* operator=7 *){0}
+{7}*{0}
+
+{12}(* number=8 *){0}
+{8}12{0}
+
+{12}(* char=9 *){0}
+{9}'a'{0}
+
+{12}(* white=10 *){0}
+{12}(* this state can not be reached in caml mode, only SML mode but that stops other states *){0}
+{12}(* SML mode is triggered by "andalso" being in the keywords *){0}
+{11}"\ \x"{0}
+
+{12}(* string=11 *){0}
+{11}"string"{0}
+
+{12}(* comment1=13 *){0}
+{12}(* {13}(* comment 1 *){12} *){0}
+
+{12}(* comment2=14 *){0}
+{12}(* {13}(* {14}(* comment 2 *){13} *){12} *){0}
+
+{12}(* comment3=15 *){0}
+{12}(* {13}(* {14}(* {15}(* comment 1 *){14} *){13} *){12}  *){0}
diff --git a/scite-app/lexilla/test/examples/caml/SciTE.properties b/scite-app/lexilla/test/examples/caml/SciTE.properties
new file mode 100644
index 0000000..1c769e0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/caml/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.ml=caml
+keywords.*.ml=and xandalso
+keywords2.*.ml=None
+keywords3.*.ml=char
diff --git a/scite-app/lexilla/test/examples/cpp/Bug2245.cxx b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx
new file mode 100644
index 0000000..e3761c8
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx
@@ -0,0 +1,13 @@
+int i;
+#if 1
+i=1;
+#
+i=2;
+#else
+i=3;
+#endif
+i=4;
+#elif 1
+i=5;
+#else
+i=6;
diff --git a/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.folded b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.folded
new file mode 100644
index 0000000..8e075c8
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.folded
@@ -0,0 +1,14 @@
+ 0 400 400   int i;
+ 2 400 401 + #if 1
+ 0 401 401 | i=1;
+ 0 401 401 | #
+ 0 401 401 | i=2;
+ 0 401 401 | #else
+ 0 401 401 | i=3;
+ 0 401 400 | #endif
+ 0 400 400   i=4;
+ 0 400 400   #elif 1
+ 0 400 400   i=5;
+ 0 400 400   #else
+ 0 400 400   i=6;
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.styled b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.styled
new file mode 100644
index 0000000..ddf1337
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/Bug2245.cxx.styled
@@ -0,0 +1,13 @@
+{5}int{0} {11}i{10};{0}
+{9}#if 1
+{11}i{10}={4}1{10};{0}
+{9}#
+{11}i{10}={4}2{10};{0}
+{9}#else
+{75}i{74}={68}3{74};{64}
+{9}#endif
+{11}i{10}={4}4{10};{0}
+{9}#elif 1
+{11}i{10}={4}5{10};{0}
+{9}#else
+{11}i{10}={4}6{10};{0}
diff --git a/scite-app/lexilla/test/examples/cpp/SciTE.properties b/scite-app/lexilla/test/examples/cpp/SciTE.properties
new file mode 100644
index 0000000..53c6a60
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/SciTE.properties
@@ -0,0 +1,10 @@
+lexer.*.cxx=cpp
+keywords.*.cxx=int let
+keywords2.*.cxx=
+keywords3.*.cxx=file
+lexer.cpp.track.preprocessor=1
+lexer.cpp.escape.sequence=1
+fold=1
+fold.preprocessor=1
+fold.comment=1
+fold.compact=1
diff --git a/scite-app/lexilla/test/examples/cpp/x.cxx b/scite-app/lexilla/test/examples/cpp/x.cxx
new file mode 100644
index 0000000..4bd02cb
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/x.cxx
@@ -0,0 +1,39 @@
+// A demonstration program
+#include <stdio.h>
+#if 0 /* */
+#define DUMMY() \
+	if (1);
+#endif
+
+/** @file LexCPP.cxx
+ <file>
+ <file >filename</file>
+ LexCPP.cxx.
+ </file>
+ **/
+
+/** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
+ @wrong LexCPP.cxx
+ <wrong>filename</wrong>
+**/
+
+#define M\
+
+\
+ 
+int main() {
+	double x[] = {3.14159,6.02e23,1.6e-19,1.0+1};
+	int y[] = {75,0113,0x4b};
+	printf("hello world %d %g\n", y[0], x[0]);
+
+	// JavaScript regular expression (14) tests
+	let a = /a/;
+	let b = /[a-z]+/gi;
+
+	// Escape sequence (27) tests
+	printf("\'\"\?\\\a\b\f\n\r\t\v \P");
+	printf("\0a \013a \019");
+	printf("\x013ac \xdz");
+	printf("\ua34df \uz");
+	printf("\Ua34df7833 \Uz");
+}
diff --git a/scite-app/lexilla/test/examples/cpp/x.cxx.folded b/scite-app/lexilla/test/examples/cpp/x.cxx.folded
new file mode 100644
index 0000000..89b6f49
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/x.cxx.folded
@@ -0,0 +1,40 @@
+ 0 400 400   // A demonstration program
+ 0 400 400   #include <stdio.h>
+ 2 400 401 + #if 0 /* */
+ 0 401 401 | #define DUMMY() \
+ 0 401 401 | 	if (1);
+ 0 401 400 | #endif
+ 1 400 400   
+ 2 400 401 + /** @file LexCPP.cxx
+ 0 401 401 |  <file>
+ 0 401 401 |  <file >filename</file>
+ 0 401 401 |  LexCPP.cxx.
+ 0 401 401 |  </file>
+ 0 401 400 |  **/
+ 1 400 400   
+ 2 400 401 + /** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
+ 0 401 401 |  @wrong LexCPP.cxx
+ 0 401 401 |  <wrong>filename</wrong>
+ 0 401 400 | **/
+ 1 400 400   
+ 0 400 400   #define M\
+ 1 400 400   
+ 0 400 400   \
+ 1 400 400    
+ 2 400 401 + int main() {
+ 0 401 401 | 	double x[] = {3.14159,6.02e23,1.6e-19,1.0+1};
+ 0 401 401 | 	int y[] = {75,0113,0x4b};
+ 0 401 401 | 	printf("hello world %d %g\n", y[0], x[0]);
+ 1 401 401 | 
+ 0 401 401 | 	// JavaScript regular expression (14) tests
+ 0 401 401 | 	let a = /a/;
+ 0 401 401 | 	let b = /[a-z]+/gi;
+ 1 401 401 | 
+ 0 401 401 | 	// Escape sequence (27) tests
+ 0 401 401 | 	printf("\'\"\?\\\a\b\f\n\r\t\v \P");
+ 0 401 401 | 	printf("\0a \013a \019");
+ 0 401 401 | 	printf("\x013ac \xdz");
+ 0 401 401 | 	printf("\ua34df \uz");
+ 0 401 401 | 	printf("\Ua34df7833 \Uz");
+ 0 401 400 | }
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/cpp/x.cxx.styled b/scite-app/lexilla/test/examples/cpp/x.cxx.styled
new file mode 100644
index 0000000..1b518ce
--- /dev/null
+++ b/scite-app/lexilla/test/examples/cpp/x.cxx.styled
@@ -0,0 +1,39 @@
+{2}// A demonstration program
+{9}#include <stdio.h>
+#if 0 {23}/* */{9}
+{73}#define DUMMY() \
+	if (1);
+{9}#endif
+{0}
+{3}/** {17}@file{3} LexCPP.cxx
+ <{17}file{3}>
+ <{17}file{3} >filename</{17}file{3}>
+ LexCPP.cxx.
+ </{17}file{3}>
+ **/{0}
+
+{3}/** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
+ {18}@wrong{3} LexCPP.cxx
+ <{18}wrong{3}>filename</{18}wrong{3}>
+**/{0}
+
+{9}#define M\
+
+{0}\
+ 
+{5}int{0} {11}main{10}(){0} {10}{{0}
+	{11}double{0} {11}x{10}[]{0} {10}={0} {10}{{4}3.14159{10},{4}6.02e23{10},{4}1.6e-19{10},{4}1.0{10}+{4}1{10}};{0}
+	{5}int{0} {11}y{10}[]{0} {10}={0} {10}{{4}75{10},{4}0113{10},{4}0x4b{10}};{0}
+	{11}printf{10}({6}"hello world %d %g{27}\n{6}"{10},{0} {11}y{10}[{4}0{10}],{0} {11}x{10}[{4}0{10}]);{0}
+
+	{2}// JavaScript regular expression (14) tests
+{0}	{5}let{0} {11}a{0} {10}={0} {14}/a/{10};{0}
+	{5}let{0} {11}b{0} {10}={0} {14}/[a-z]+/gi{10};{0}
+
+	{2}// Escape sequence (27) tests
+{0}	{11}printf{10}({6}"{27}\'\"\?\\\a\b\f\n\r\t\v{6} {27}\P{6}"{10});{0}
+	{11}printf{10}({6}"{27}\0{6}a {27}\013{6}a {27}\01{6}9"{10});{0}
+	{11}printf{10}({6}"{27}\x013a{6}c {27}\xd{6}z"{10});{0}
+	{11}printf{10}({6}"{27}\ua34d{6}f {27}\u{6}z"{10});{0}
+	{11}printf{10}({6}"{27}\Ua34df783{6}3 {27}\U{6}z"{10});{0}
+{10}}{0}
diff --git a/scite-app/lexilla/test/examples/d/SciTE.properties b/scite-app/lexilla/test/examples/d/SciTE.properties
new file mode 100644
index 0000000..c6849b0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/d/SciTE.properties
@@ -0,0 +1,10 @@
+lexer.*.d=d
+keywords.*.d=keyword1
+keywords2.*.d=keyword2
+keywords3.*.d=
+keywords4.*.d=keyword4
+keywords5.*.d=keyword5
+keywords6.*.d=keyword6
+keywords7.*.d=keyword7
+
+fold=1
diff --git a/scite-app/lexilla/test/examples/d/x.d b/scite-app/lexilla/test/examples/d/x.d
new file mode 100644
index 0000000..617aa38
--- /dev/null
+++ b/scite-app/lexilla/test/examples/d/x.d
@@ -0,0 +1,47 @@
+$
+// /++ +/ doccomments are not yet supported
+/* */
+/** */
+/// drdr
+/+ /+ +/ +/
+//keyword test
+keyword1
+keyword2
+keyword4
+keyword5
+keyword6
+keyword7
+//unicode identifier test
+вапёasdÓΘΣαԷԸՑהכ拉麺とひシマイ단결을
+//strings test
+'s
+'
+w's'w
+"multiline
+			string"w
+e"zz"e
+r"asd\"e
+r"multiline
+			string"c
+r`asd\`e
+`multiline
+			string`d
+x"023 abc"e
+x"023
+	abc"w
+//numbers test
+a[3..4]=3
+2.stringof
+2.0.stringof
+2.
+2.2e+2
+2.2e-2
+.2e+2
+.2
+2e+2
+0x2e+2
+0x2ep+10
+,.2.stringof,
+
+end
+ 	  	 
diff --git a/scite-app/lexilla/test/examples/d/x.d.folded b/scite-app/lexilla/test/examples/d/x.d.folded
new file mode 100644
index 0000000..c7443ac
--- /dev/null
+++ b/scite-app/lexilla/test/examples/d/x.d.folded
@@ -0,0 +1,48 @@
+ 0 400 400   $
+ 0 400 400   // /++ +/ doccomments are not yet supported
+ 0 400 400   /* */
+ 0 400 400   /** */
+ 0 400 400   /// drdr
+ 0 400 400   /+ /+ +/ +/
+ 0 400 400   //keyword test
+ 0 400 400   keyword1
+ 0 400 400   keyword2
+ 0 400 400   keyword4
+ 0 400 400   keyword5
+ 0 400 400   keyword6
+ 0 400 400   keyword7
+ 0 400 400   //unicode identifier test
+ 0 400 400   вапёasdÓΘΣαԷԸՑהכ拉麺とひシマイ단결을
+ 0 400 400   //strings test
+ 0 400 400   's
+ 0 400 400   '
+ 0 400 400   w's'w
+ 0 400 400   "multiline
+ 0 400 400   			string"w
+ 0 400 400   e"zz"e
+ 0 400 400   r"asd\"e
+ 0 400 400   r"multiline
+ 0 400 400   			string"c
+ 0 400 400   r`asd\`e
+ 0 400 400   `multiline
+ 0 400 400   			string`d
+ 0 400 400   x"023 abc"e
+ 0 400 400   x"023
+ 0 400 400   	abc"w
+ 0 400 400   //numbers test
+ 0 400 400   a[3..4]=3
+ 0 400 400   2.stringof
+ 0 400 400   2.0.stringof
+ 0 400 400   2.
+ 0 400 400   2.2e+2
+ 0 400 400   2.2e-2
+ 0 400 400   .2e+2
+ 0 400 400   .2
+ 0 400 400   2e+2
+ 0 400 400   0x2e+2
+ 0 400 400   0x2ep+10
+ 0 400 400   ,.2.stringof,
+ 1 400 400   
+ 0 400 400   end
+ 1 400 400    	  	 
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/d/x.d.styled b/scite-app/lexilla/test/examples/d/x.d.styled
new file mode 100644
index 0000000..32e4556
--- /dev/null
+++ b/scite-app/lexilla/test/examples/d/x.d.styled
@@ -0,0 +1,47 @@
+{14}${0}
+{2}// /++ +/ doccomments are not yet supported
+{1}/* */{0}
+{3}/** */{0}
+{15}/// drdr
+{4}/+ /+ +/ +/{0}
+{2}//keyword test
+{6}keyword1{0}
+{7}keyword2{0}
+{9}keyword4{0}
+{20}keyword5{0}
+{21}keyword6{0}
+{22}keyword7{0}
+{2}//unicode identifier test
+{14}вапёasdÓΘΣαԷԸՑהכ拉麺とひシマイ단결을{0}
+{2}//strings test
+{11}'s
+'
+{14}w{12}'s'{14}w{0}
+{10}"multiline
+			string"w{0}
+{14}e{10}"zz"{14}e{0}
+{19}r"asd\"{14}e{0}
+{19}r"multiline
+			string"c{0}
+{14}r{18}`asd\`{14}e{0}
+{18}`multiline
+			string`d{0}
+{19}x"023 abc"{14}e{0}
+{19}x"023
+	abc"w{0}
+{2}//numbers test
+{14}a{13}[{5}3{13}..{5}4{13}]={5}3{0}
+{5}2.stringof{0}
+{5}2.0{13}.{14}stringof{0}
+{5}2.{0}
+{5}2.2e+2{0}
+{5}2.2e-2{0}
+{5}.2e+2{0}
+{5}.2{0}
+{5}2e+2{0}
+{5}0x2e{13}+{5}2{0}
+{5}0x2ep+10{0}
+{13},{5}.2{13}.{14}stringof{13},{0}
+
+{14}end{0}
+ 	  	 
diff --git a/scite-app/lexilla/test/examples/erlang/AllStyles.erl b/scite-app/lexilla/test/examples/erlang/AllStyles.erl
new file mode 100644
index 0000000..f76ab49
--- /dev/null
+++ b/scite-app/lexilla/test/examples/erlang/AllStyles.erl
@@ -0,0 +1,78 @@
+% Enumerate all styles: 0..24 31
+
+% comment = 1
+
+% whitespace = 0
+    % 0
+
+% variable = 2
+A
+
+% number = 3
+3
+
+% keyword = 4
+let
+
+% string = 5
+"string"
+
+% operator = 6
+*
+
+% atom = 7
+atom
+
+% function_name = 8
+function()
+
+% character = 9
+$a
+
+% macro = 10
+?macro
+
+% record = 11
+#record
+
+% preproc = 12
+-define
+
+% node_name = 13
+node@
+
+% comment_function = 14
+%% function
+
+% comment_module = 15
+%%% module
+
+% comment_doc = 16
+%% @todo
+ 
+% comment_doc_macro = 17
+%% {@module}
+
+% atom_quoted = 18 (fails)
+'fails'
+
+% macro_quoted = 19
+?'macro'
+
+% record_quoted = 20
+#'record'
+
+% node_name_quoted = 21
+'node@'
+
+% bifs = 22
+atom_to_binary
+
+% modules = 23
+io:x
+
+% modules_att = 24
+-module().
+
+% unknown = 31 (this is an internal state and should not be output)
+
diff --git a/scite-app/lexilla/test/examples/erlang/AllStyles.erl.folded b/scite-app/lexilla/test/examples/erlang/AllStyles.erl.folded
new file mode 100644
index 0000000..b394775
--- /dev/null
+++ b/scite-app/lexilla/test/examples/erlang/AllStyles.erl.folded
@@ -0,0 +1,79 @@
+ 0 400   0   % Enumerate all styles: 0..24 31
+ 0 400   0   
+ 0 400   0   % comment = 1
+ 0 400   0   
+ 0 400   0   % whitespace = 0
+ 0 400   0       % 0
+ 0 400   0   
+ 0 400   0   % variable = 2
+ 0 400   0   A
+ 0 400   0   
+ 0 400   0   % number = 3
+ 0 400   0   3
+ 0 400   0   
+ 0 400   0   % keyword = 4
+ 0 400   0   let
+ 0 400   0   
+ 0 400   0   % string = 5
+ 0 400   0   "string"
+ 0 400   0   
+ 0 400   0   % operator = 6
+ 0 400   0   *
+ 0 400   0   
+ 0 400   0   % atom = 7
+ 0 400   0   atom
+ 0 400   0   
+ 0 400   0   % function_name = 8
+ 0 400   0   function()
+ 0 400   0   
+ 0 400   0   % character = 9
+ 0 400   0   $a
+ 0 400   0   
+ 0 400   0   % macro = 10
+ 0 400   0   ?macro
+ 0 400   0   
+ 0 400   0   % record = 11
+ 0 400   0   #record
+ 0 400   0   
+ 0 400   0   % preproc = 12
+ 0 400   0   -define
+ 0 400   0   
+ 0 400   0   % node_name = 13
+ 0 400   0   node@
+ 0 400   0   
+ 0 400   0   % comment_function = 14
+ 0 400   0   %% function
+ 0 400   0   
+ 0 400   0   % comment_module = 15
+ 0 400   0   %%% module
+ 0 400   0   
+ 0 400   0   % comment_doc = 16
+ 0 400   0   %% @todo
+ 0 400   0    
+ 0 400   0   % comment_doc_macro = 17
+ 0 400   0   %% {@module}
+ 0 400   0   
+ 0 400   0   % atom_quoted = 18 (fails)
+ 0 400   0   'fails'
+ 0 400   0   
+ 0 400   0   % macro_quoted = 19
+ 0 400   0   ?'macro'
+ 0 400   0   
+ 0 400   0   % record_quoted = 20
+ 0 400   0   #'record'
+ 0 400   0   
+ 0 400   0   % node_name_quoted = 21
+ 0 400   0   'node@'
+ 0 400   0   
+ 0 400   0   % bifs = 22
+ 0 400   0   atom_to_binary
+ 0 400   0   
+ 0 400   0   % modules = 23
+ 0 400   0   io:x
+ 0 400   0   
+ 0 400   0   % modules_att = 24
+ 0 400   0   -module().
+ 0 400   0   
+ 0 400   0   % unknown = 31 (this is an internal state and should not be output)
+ 0 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/erlang/AllStyles.erl.styled b/scite-app/lexilla/test/examples/erlang/AllStyles.erl.styled
new file mode 100644
index 0000000..9887580
--- /dev/null
+++ b/scite-app/lexilla/test/examples/erlang/AllStyles.erl.styled
@@ -0,0 +1,78 @@
+{1}% Enumerate all styles: 0..24 31{0}
+
+{1}% comment = 1{0}
+
+{1}% whitespace = 0{0}
+    {1}% 0{0}
+
+{1}% variable = 2{0}
+{2}A{0}
+
+{1}% number = 3{0}
+{3}3{0}
+
+{1}% keyword = 4{0}
+{4}let{0}
+
+{1}% string = 5{0}
+{5}"string"{0}
+
+{1}% operator = 6{0}
+{6}*{0}
+
+{1}% atom = 7{0}
+{7}atom{0}
+
+{1}% function_name = 8{0}
+{8}function{6}(){0}
+
+{1}% character = 9{0}
+{9}$a{0}
+
+{1}% macro = 10{0}
+{10}?macro{0}
+
+{1}% record = 11{0}
+{11}#record{0}
+
+{1}% preproc = 12{0}
+{12}-define{0}
+
+{1}% node_name = 13{0}
+{13}node@{0}
+
+{1}% comment_function = 14{0}
+{14}%% function{0}
+
+{1}% comment_module = 15{0}
+{15}%%% module{0}
+
+{1}% comment_doc = 16{0}
+{14}%% {16}@todo{0}
+ 
+{1}% comment_doc_macro = 17{0}
+{14}%% {{17}@module{14}}{0}
+
+{1}% atom_quoted = 18 (fails){0}
+{18}'fails'{0}
+
+{1}% macro_quoted = 19{0}
+{19}?'macro'{0}
+
+{1}% record_quoted = 20{0}
+{20}#'record'{0}
+
+{1}% node_name_quoted = 21{0}
+{21}'node@'{0}
+
+{1}% bifs = 22{0}
+{22}atom_to_binary{0}
+
+{1}% modules = 23{0}
+{23}io:{7}x{0}
+
+{1}% modules_att = 24{0}
+{24}-module{6}().{0}
+
+{1}% unknown = 31 (this is an internal state and should not be output){0}
+
diff --git a/scite-app/lexilla/test/examples/erlang/SciTE.properties b/scite-app/lexilla/test/examples/erlang/SciTE.properties
new file mode 100644
index 0000000..81be943
--- /dev/null
+++ b/scite-app/lexilla/test/examples/erlang/SciTE.properties
@@ -0,0 +1,7 @@
+lexer.*.erl=erlang
+keywords.*.erl=let
+keywords2.*.erl=atom_to_binary
+keywords3.*.erl=-define
+keywords4.*.erl=-module
+keywords5.*.erl=@todo
+keywords6.*.erl=@module
diff --git a/scite-app/lexilla/test/examples/errorlist/AllStyles.err b/scite-app/lexilla/test/examples/errorlist/AllStyles.err
new file mode 100644
index 0000000..96c23b4
--- /dev/null
+++ b/scite-app/lexilla/test/examples/errorlist/AllStyles.err
@@ -0,0 +1,111 @@
+Default 0
+Some text in default
+
+
+Python Error 1
+  File "x.err", line 2
+
+
+Gcc Error 2, Find In Files Match 21
+ScintillaGTKAccessible.cxx:153:13: warning: Deprecated pre-processor symbol, replace with 
+
+
+Microsoft Error 3
+LexErrorList.cxx(15): fatal error C1083: Cannot open include file: 'ILexer.h': No such file or directory
+
+PlatQt.obj : error LNK2019: unresolved external symbol "class Scintilla::PRectangle __cdecl Scintilla::PixelAlign(class Scintilla::PRectangle const &,int)" (?PixelAlign@Scintilla@@YA?AVPRectangle@1@AEBV21@H@Z) referenced in function "public: virtual void __cdecl Scintilla::SurfaceImpl::FillRectangleAligned(class Scintilla::PRectangle,class Scintilla::Fill)" (?FillRectangleAligned@SurfaceImpl@Scintilla@@UEAAXVPRectangle@2@VFill@2@@Z)
+
+NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\HostX64\x64\link.EXE"' : return code '0x460'
+
+
+Command 4
+>pwd
+
+
+Borland Error 5
+Error E2378 oddEven.c 16: For statement missing ; in function main()
+
+
+Perl Error 6
+Bareword found where operator expected at LexMMIXAL.cxx line 1, near "// Scintilla"
+
+
+DotNET Traceback 7
+   at ExceptionTrace.Program.f4() in C:\Ivan\dev\exp\ExceptionTrace\Program.cs:line 18
+
+
+Lua Error 8
+last token read: `result' at line 40 in file `Test.lua'
+
+
+Ctags 9
+IsAWordChar	LexMMIXAL.cxx	/^static inline bool IsAWordChar(const int ch) {$/;"	f	file:
+
+
+Diff Changed ! 10
+! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+
+
+Diff Addition + 11
++    <PlatformToolset>v142</PlatformToolset>
+
+
+Diff Deletion - 12
+-    <PlatformToolset>v141</PlatformToolset>
+
+
+Diff Message --- 13
+--- a/win32/SciTE.vcxproj	Fri Jan 31 12:23:51 2020 +1100
+
+
+PHP error 14
+Fatal error: Call to undefined function:  foo() in example.php on line 11
+
+
+Essential Lahey Fortran 90 Error 15
+Line 11, file c:\fortran90\codigo\demo.f90
+
+
+Intel Fortran Compiler Error 16
+Error 71 at (17:teste.f90) : The program unit has no name
+
+
+Intel Fortran Compiler v8.0 Error 17
+fortcom: Error: shf.f90, line 5602: This name does not have ...
+
+
+Absoft Pro Fortran 90 Error 18
+cf90-113 f90fe: ERROR SHF3D, File = shf.f90, Line = 1101, Column = 19
+
+
+HTML Tidy 19
+line 8 column 1 - Error: unexpected </head> in <meta>
+
+
+Java Runtime Stack Trace 20
+	at MethodName>(FileName.java:33)
+
+
+GCC Include Path 22
+In file included from /usr/include/gtk-2.0/gtk/gtkobject.h:37,
+
+
+GCC Pointer 25
+  236 | void            gtk_type_init   (GTypeDebugFlags    debug_flags);
+      |                                                                ^
+
+
+Escape Sequence 23
+
+
+
+Escape Sequence Unknown 24
+
+
+
+Escape Sequence Colour 40
+Colour 0 is 40
+
+
+Escape Sequence Colour 41
+Colour 1 is 41
diff --git a/scite-app/lexilla/test/examples/errorlist/AllStyles.err.folded b/scite-app/lexilla/test/examples/errorlist/AllStyles.err.folded
new file mode 100644
index 0000000..3934c11
--- /dev/null
+++ b/scite-app/lexilla/test/examples/errorlist/AllStyles.err.folded
@@ -0,0 +1,112 @@
+ 0 400   0   Default 0
+ 0 400   0   Some text in default
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Python Error 1
+ 0 400   0     File "x.err", line 2
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Gcc Error 2, Find In Files Match 21
+ 0 400   0   ScintillaGTKAccessible.cxx:153:13: warning: Deprecated pre-processor symbol, replace with 
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Microsoft Error 3
+ 0 400   0   LexErrorList.cxx(15): fatal error C1083: Cannot open include file: 'ILexer.h': No such file or directory
+ 0 400   0   
+ 0 400   0   PlatQt.obj : error LNK2019: unresolved external symbol "class Scintilla::PRectangle __cdecl Scintilla::PixelAlign(class Scintilla::PRectangle const &,int)" (?PixelAlign@Scintilla@@YA?AVPRectangle@1@AEBV21@H@Z) referenced in function "public: virtual void __cdecl Scintilla::SurfaceImpl::FillRectangleAligned(class Scintilla::PRectangle,class Scintilla::Fill)" (?FillRectangleAligned@SurfaceImpl@Scintilla@@UEAAXVPRectangle@2@VFill@2@@Z)
+ 0 400   0   
+ 0 400   0   NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\HostX64\x64\link.EXE"' : return code '0x460'
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Command 4
+ 0 400   0   >pwd
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Borland Error 5
+ 0 400   0   Error E2378 oddEven.c 16: For statement missing ; in function main()
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Perl Error 6
+ 0 400   0   Bareword found where operator expected at LexMMIXAL.cxx line 1, near "// Scintilla"
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   DotNET Traceback 7
+ 0 400   0      at ExceptionTrace.Program.f4() in C:\Ivan\dev\exp\ExceptionTrace\Program.cs:line 18
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Lua Error 8
+ 0 400   0   last token read: `result' at line 40 in file `Test.lua'
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Ctags 9
+ 0 400   0   IsAWordChar	LexMMIXAL.cxx	/^static inline bool IsAWordChar(const int ch) {$/;"	f	file:
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Diff Changed ! 10
+ 0 400   0   ! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Diff Addition + 11
+ 0 400   0   +    <PlatformToolset>v142</PlatformToolset>
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Diff Deletion - 12
+ 0 400   0   -    <PlatformToolset>v141</PlatformToolset>
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Diff Message --- 13
+ 0 400   0   --- a/win32/SciTE.vcxproj	Fri Jan 31 12:23:51 2020 +1100
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   PHP error 14
+ 0 400   0   Fatal error: Call to undefined function:  foo() in example.php on line 11
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Essential Lahey Fortran 90 Error 15
+ 0 400   0   Line 11, file c:\fortran90\codigo\demo.f90
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Intel Fortran Compiler Error 16
+ 0 400   0   Error 71 at (17:teste.f90) : The program unit has no name
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Intel Fortran Compiler v8.0 Error 17
+ 0 400   0   fortcom: Error: shf.f90, line 5602: This name does not have ...
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Absoft Pro Fortran 90 Error 18
+ 0 400   0   cf90-113 f90fe: ERROR SHF3D, File = shf.f90, Line = 1101, Column = 19
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   HTML Tidy 19
+ 0 400   0   line 8 column 1 - Error: unexpected </head> in <meta>
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Java Runtime Stack Trace 20
+ 0 400   0   	at MethodName>(FileName.java:33)
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   GCC Include Path 22
+ 0 400   0   In file included from /usr/include/gtk-2.0/gtk/gtkobject.h:37,
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   GCC Pointer 25
+ 0 400   0     236 | void            gtk_type_init   (GTypeDebugFlags    debug_flags);
+ 0 400   0         |                                                                ^
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Escape Sequence 23
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Escape Sequence Unknown 24
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Escape Sequence Colour 40
+ 0 400   0   Colour 0 is 40
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   Escape Sequence Colour 41
+ 0 400   0   Colour 1 is 41
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/errorlist/AllStyles.err.styled b/scite-app/lexilla/test/examples/errorlist/AllStyles.err.styled
new file mode 100644
index 0000000..4f12a6f
--- /dev/null
+++ b/scite-app/lexilla/test/examples/errorlist/AllStyles.err.styled
@@ -0,0 +1,111 @@
+{0}Default 0
+Some text in default
+
+
+Python Error 1
+{1}  File "x.err", line 2
+{0}
+
+Gcc Error 2, Find In Files Match 21
+{2}ScintillaGTKAccessible.cxx:153:13:{21} warning: Deprecated pre-processor symbol, replace with 
+{0}
+
+Microsoft Error 3
+{3}LexErrorList.cxx(15): fatal error C1083: Cannot open include file: 'ILexer.h': No such file or directory
+{0}
+{3}PlatQt.obj : error LNK2019: unresolved external symbol "class Scintilla::PRectangle __cdecl Scintilla::PixelAlign(class Scintilla::PRectangle const &,int)" (?PixelAlign@Scintilla@@YA?AVPRectangle@1@AEBV21@H@Z) referenced in function "public: virtual void __cdecl Scintilla::SurfaceImpl::FillRectangleAligned(class Scintilla::PRectangle,class Scintilla::Fill)" (?FillRectangleAligned@SurfaceImpl@Scintilla@@UEAAXVPRectangle@2@VFill@2@@Z)
+{0}
+{3}NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\bin\HostX64\x64\link.EXE"' : return code '0x460'
+{0}
+
+Command 4
+{4}>pwd
+{0}
+
+Borland Error 5
+{5}Error E2378 oddEven.c 16: For statement missing ; in function main()
+{0}
+
+Perl Error 6
+{6}Bareword found where operator expected at LexMMIXAL.cxx line 1, near "// Scintilla"
+{0}
+
+DotNET Traceback 7
+{7}   at ExceptionTrace.Program.f4() in C:\Ivan\dev\exp\ExceptionTrace\Program.cs:line 18
+{0}
+
+Lua Error 8
+{8}last token read: `result' at line 40 in file `Test.lua'
+{0}
+
+Ctags 9
+{9}IsAWordChar	LexMMIXAL.cxx	/^static inline bool IsAWordChar(const int ch) {$/;"	f	file:
+{0}
+
+Diff Changed ! 10
+{10}! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+{0}
+
+Diff Addition + 11
+{11}+    <PlatformToolset>v142</PlatformToolset>
+{0}
+
+Diff Deletion - 12
+{12}-    <PlatformToolset>v141</PlatformToolset>
+{0}
+
+Diff Message --- 13
+{13}--- a/win32/SciTE.vcxproj	Fri Jan 31 12:23:51 2020 +1100
+{0}
+
+PHP error 14
+{14}Fatal error: Call to undefined function:  foo() in example.php on line 11
+{0}
+
+Essential Lahey Fortran 90 Error 15
+{15}Line 11, file c:\fortran90\codigo\demo.f90
+{0}
+
+Intel Fortran Compiler Error 16
+{16}Error 71 at (17:teste.f90) : The program unit has no name
+{0}
+
+Intel Fortran Compiler v8.0 Error 17
+{17}fortcom: Error: shf.f90, line 5602: This name does not have ...
+{0}
+
+Absoft Pro Fortran 90 Error 18
+{18}cf90-113 f90fe: ERROR SHF3D, File = shf.f90, Line = 1101, Column = 19
+{0}
+
+HTML Tidy 19
+{19}line 8 column 1 - Error: unexpected </head> in <meta>
+{0}
+
+Java Runtime Stack Trace 20
+{20}	at MethodName>(FileName.java:33)
+{0}
+
+GCC Include Path 22
+{22}In file included from /usr/include/gtk-2.0/gtk/gtkobject.h:37,
+{0}
+
+GCC Pointer 25
+{25}  236 | void            gtk_type_init   (GTypeDebugFlags    debug_flags);
+      |                                                                ^
+{0}
+
+Escape Sequence 23
+{23}{0}
+
+
+Escape Sequence Unknown 24
+{24}{0}
+
+
+Escape Sequence Colour 40
+{23}{40}Colour 0 is 40
+{0}
+
+Escape Sequence Colour 41
+{23}{41}Colour 1 is 41
diff --git a/scite-app/lexilla/test/examples/errorlist/SciTE.properties b/scite-app/lexilla/test/examples/errorlist/SciTE.properties
new file mode 100644
index 0000000..f9e4a20
--- /dev/null
+++ b/scite-app/lexilla/test/examples/errorlist/SciTE.properties
@@ -0,0 +1,5 @@
+lexer.*.err=errorlist
+lexer.errorlist.value.separate=1
+lexer.errorlist.escape.sequences=1
+style.errorlist.23=fore:#000000,back:#FFFFFF,$(error.background)
+style.errorlist.25=fore:#CF008F,$(font.monospace.small)
diff --git a/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs
new file mode 100644
index 0000000..32e0f82
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs
@@ -0,0 +1,20 @@
+module FormatSpecifiersTest
+
+let x = List.fold (*) 24.5 [ 1.; 2.; 3. ]
+
+// expect "147.00"
+printfn "Speed: %.2f m/s" x
+
+// expect " 147%"
+printfn """%% increase:% .0F%% over last year""" x
+
+// expect "1.5E+002"
+// NB: units should look like text even without a space
+printfn @"Time: %-0.1Esecs" x
+
+// expect "\"         +147\""
+printfn @"""Temp: %+12.3g K""" x
+
+// These don't work
+printfn ``%.2f`` x
+printfn $"%.2f" x
diff --git a/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.folded b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.folded
new file mode 100644
index 0000000..9f72da3
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.folded
@@ -0,0 +1,21 @@
+ 0 400 400   module FormatSpecifiersTest
+ 1 400 400   
+ 0 400 400   let x = List.fold (*) 24.5 [ 1.; 2.; 3. ]
+ 1 400 400   
+ 0 400 400   // expect "147.00"
+ 0 400 400   printfn "Speed: %.2f m/s" x
+ 1 400 400   
+ 0 400 400   // expect " 147%"
+ 0 400 400   printfn """%% increase:% .0F%% over last year""" x
+ 1 400 400   
+ 2 400 401 + // expect "1.5E+002"
+ 0 401 400 | // NB: units should look like text even without a space
+ 0 400 400   printfn @"Time: %-0.1Esecs" x
+ 1 400 400   
+ 0 400 400   // expect "\"         +147\""
+ 0 400 400   printfn @"""Temp: %+12.3g K""" x
+ 1 400 400   
+ 0 400 400   // These don't work
+ 0 400 400   printfn ``%.2f`` x
+ 0 400 400   printfn $"%.2f" x
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.styled b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.styled
new file mode 100644
index 0000000..37be0ac
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/FmtSpecs.fs.styled
@@ -0,0 +1,20 @@
+{1}module{0} {6}FormatSpecifiersTest{0}
+
+{1}let{0} {6}x{0} {12}={0} {3}List{0}.{2}fold{0} {12}(*){0} {13}24.5{0} {12}[{0} {13}1.{12};{0} {13}2.{12};{0} {13}3.{0} {12}]{0}
+
+{9}// expect "147.00"{0}
+{2}printfn{0} {15}"Speed: {19}%.2f{15} m/s"{0} {6}x{0}
+
+{9}// expect " 147%"{0}
+{2}printfn{0} {15}"""{19}%%{15} increase:{19}% .0F%%{15} over last year"""{0} {6}x{0}
+
+{9}// expect "1.5E+002"{0}
+{9}// NB: units should look like text even without a space{0}
+{2}printfn{0} {16}@"Time: {19}%-0.1E{16}secs"{0} {6}x{0}
+
+{9}// expect "\"         +147\""{0}
+{2}printfn{0} {16}@"""Temp: {19}%+12.3g{16} K"""{0} {6}x{0}
+
+{9}// These don't work{0}
+{2}printfn{0} {7}``%.2f``{0} {6}x{0}
+{2}printfn{0} {15}$"%.2f"{0} {6}x{0}
diff --git a/scite-app/lexilla/test/examples/fsharp/SciTE.properties b/scite-app/lexilla/test/examples/fsharp/SciTE.properties
new file mode 100644
index 0000000..6155637
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/SciTE.properties
@@ -0,0 +1,42 @@
+lexer.*.fs=fsharp
+
+keywords.*.fs= \
+abstract and as assert base begin class default delegate do done downcast \
+downto elif else end exception extern false finally fixed for fun function \
+global if in inherit inline interface internal lazy let let! match match! \
+member module mutable namespace new null of open or override private public \
+rec return return! select static struct then to true try type upcast use use! \
+val void when while with yield yield! atomic break checked component const \
+constraint constructor continue eager event external fixed functor global \
+include method mixin object parallel process protected pure sealed tailcall \
+trait virtual volatile
+
+keywords2.*.fs= \
+asr land lor lsl lsr lxor mod sig abs acos add allPairs append asin atan atan2 \
+average averageBy base1 base2 blit cache cast ceil choose \
+chunkBySize collect compareWith concat contains containsKey copy cos cosh count \
+countBy create createBased delay difference distinct distinctBy empty eprintf except \
+exists exists2 exactlyOne failwith fill filter find findBack findIndex findIndexBack \
+findKey floor fold fold2 foldBack foldBack2 forall forall2 fprintf fst get groupBy head ignore indexed \
+init initBased initInfinite intersect intersectMany invalidArg isEmpty isProperSubset \
+isProperSuperset isSubset isSuperset item iter iter2 iteri iteri2 last length \
+length1 length2 length3 length4 map map2 map3 mapFold mapFoldBack mapi mapi2 \
+max maxBy maxElement min minBy minElement nameof not ofArray ofList ofSeq pairwise partition \
+permute pick pown printf printfn raise readonly rebase reduce reduceBack remove replicate rev round scan \
+scanBack seq set sin sinh singleton skip skipWhile snd sort sortBy sortByDescending sortDescending \
+sortInPlace sortInPlaceBy sortInPlaceWith sortWith splitAt splitInto sprintf sqrt sub sum \
+sumBy tail take takeWhile tan tanh toArray toList toSeq transpose truncate \
+tryExactlyOne tryFind tryFindBack tryFindIndex tryFindIndexBack tryHead \
+tryItem tryFindKey tryLast tryPick typeof unfold union unionMany unzip unzip3 where \
+windowed zeroCreate zeroCreateBased zip zip3
+
+keywords3.*.fs= \
+ArgumentException Array Array2D Array3D Array4D BigInteger Boolean Byte Char Collections Core CultureInfo DateTime Decimal Double \
+Environment Expr Float FSharp Globalization Int16 Int32 Int64 IntPtr IO Linq List Map Math Microsoft NumberStyles \
+Object Parallel Printf Random ResizeArray SByte Seq Set Single String System UInt16 UInt32 UInt64 UIntPtr \
+array bigint bool byte byref char comparison decimal double enum equality Error Exception exn float float32 inref int int8 int16 \
+int32 int64 list nativeint nativeptr None obj Ok option Option outref ref Result sbyte Some single string unmanaged unativeint \
+uint uint8 uint16 uint32 uint64 unit void voidptr voption
+
+fold.fsharp.preprocessor=1
+fold.comment=1
diff --git a/scite-app/lexilla/test/examples/fsharp/x.fs b/scite-app/lexilla/test/examples/fsharp/x.fs
new file mode 100644
index 0000000..bac0ee0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/x.fs
@@ -0,0 +1,45 @@
+// x.fs
+// Sample source file to test F# syntax highlighting
+
+[<AutoOpen>]
+module Example
+
+#line 7 "A compiler directive"
+#if DEBUG
+  open System
+  open System.IO
+  open System.Diagnostics
+#endif
+
+# 14 @"See: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/strings#remarks"
+// verbatim string
+let xmlFragment1 = @"<book href=""https://www.worldcat.org/title/paradise-lost/oclc/1083714070"" title=""Paradise Lost"">"
+
+// triple-quoted string
+let xmlFragment2 = """<book href="https://www.worldcat.org/title/paradise-lost/oclc/1083714070" title="Paradise Lost">"""
+
+(* you need .NET 5.0 to compile this:
+  https://docs.microsoft.com/en-us/dotnet/fsharp/whats-new/fsharp-50#string-interpolation
+*)
+let interpolated = $"I think {3.0 + 0.14} is close to {System.Math.PI}!"
+
+let ``a byte literal`` = '\209'B
+
+// quoted expression
+let expr =
+    <@@
+        let foo () = "bar"
+        foo ()
+    @@>
+
+let bigNum (unused: 'a): float option =
+    Seq.init 10_000 (float >> (fun i -> i + 11.))
+    |> (List.ofSeq
+        >> List.take 5
+        >> List.fold (*) 1.0)
+    |> Some
+
+match bigNum () with
+| Some num -> sprintf "%.2f > %u" num ``a byte literal``
+| None -> sprintf "%A" "Have a byte string!"B
+|> printfn "%s"
diff --git a/scite-app/lexilla/test/examples/fsharp/x.fs.folded b/scite-app/lexilla/test/examples/fsharp/x.fs.folded
new file mode 100644
index 0000000..751da52
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/x.fs.folded
@@ -0,0 +1,46 @@
+ 2 400 401 + // x.fs
+ 0 401 400 | // Sample source file to test F# syntax highlighting
+ 1 400 400   
+ 0 400 400   [<AutoOpen>]
+ 0 400 400   module Example
+ 1 400 400   
+ 0 400 400   #line 7 "A compiler directive"
+ 2 400 401 + #if DEBUG
+ 2 401 402 +   open System
+ 0 402 402 |   open System.IO
+ 0 402 401 |   open System.Diagnostics
+ 0 401 400 | #endif
+ 1 400 400   
+ 0 400 400   # 14 @"See: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/strings#remarks"
+ 0 400 400   // verbatim string
+ 0 400 400   let xmlFragment1 = @"<book href=""https://www.worldcat.org/title/paradise-lost/oclc/1083714070"" title=""Paradise Lost"">"
+ 1 400 400   
+ 0 400 400   // triple-quoted string
+ 0 400 400   let xmlFragment2 = """<book href="https://www.worldcat.org/title/paradise-lost/oclc/1083714070" title="Paradise Lost">"""
+ 1 400 400   
+ 2 400 401 + (* you need .NET 5.0 to compile this:
+ 0 401 401 |   https://docs.microsoft.com/en-us/dotnet/fsharp/whats-new/fsharp-50#string-interpolation
+ 0 401 400 | *)
+ 0 400 400   let interpolated = $"I think {3.0 + 0.14} is close to {System.Math.PI}!"
+ 1 400 400   
+ 0 400 400   let ``a byte literal`` = '\209'B
+ 1 400 400   
+ 0 400 400   // quoted expression
+ 0 400 400   let expr =
+ 0 400 400       <@@
+ 0 400 400           let foo () = "bar"
+ 0 400 400           foo ()
+ 0 400 400       @@>
+ 1 400 400   
+ 0 400 400   let bigNum (unused: 'a): float option =
+ 0 400 400       Seq.init 10_000 (float >> (fun i -> i + 11.))
+ 0 400 400       |> (List.ofSeq
+ 0 400 400           >> List.take 5
+ 0 400 400           >> List.fold (*) 1.0)
+ 0 400 400       |> Some
+ 1 400 400   
+ 0 400 400   match bigNum () with
+ 0 400 400   | Some num -> sprintf "%.2f > %u" num ``a byte literal``
+ 0 400 400   | None -> sprintf "%A" "Have a byte string!"B
+ 0 400 400   |> printfn "%s"
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/fsharp/x.fs.styled b/scite-app/lexilla/test/examples/fsharp/x.fs.styled
new file mode 100644
index 0000000..ac3ec04
--- /dev/null
+++ b/scite-app/lexilla/test/examples/fsharp/x.fs.styled
@@ -0,0 +1,45 @@
+{9}// x.fs{0}
+{9}// Sample source file to test F# syntax highlighting{0}
+
+{18}[<AutoOpen>]{0}
+{1}module{0} {6}Example{0}
+
+{11}#line 7 "A compiler directive"{0}
+{10}#if DEBUG{0}
+  {1}open{0} {3}System{0}
+  {1}open{0} {3}System{0}.{3}IO{0}
+  {1}open{0} {3}System{0}.{6}Diagnostics{0}
+{10}#endif{0}
+
+{11}# 14 @"See: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/strings#remarks"{0}
+{9}// verbatim string{0}
+{1}let{0} {6}xmlFragment1{0} {12}={0} {16}@"<book href=""https://www.worldcat.org/title/paradise-lost/oclc/1083714070"" title=""Paradise Lost"">"{0}
+
+{9}// triple-quoted string{0}
+{1}let{0} {6}xmlFragment2{0} {12}={0} {15}"""<book href="https://www.worldcat.org/title/paradise-lost/oclc/1083714070" title="Paradise Lost">"""{0}
+
+{8}(* you need .NET 5.0 to compile this:
+  https://docs.microsoft.com/en-us/dotnet/fsharp/whats-new/fsharp-50#string-interpolation
+*){0}
+{1}let{0} {6}interpolated{0} {12}={0} {15}$"I think {3.0 + 0.14} is close to {System.Math.PI}!"{0}
+
+{1}let{0} {7}``a byte literal``{0} {12}={0} {14}'\209'B{0}
+
+{9}// quoted expression{0}
+{1}let{0} {6}expr{0} {12}={0}
+    {17}<@@
+        let foo () = "bar"
+        foo ()
+    @@>{0}
+
+{1}let{0} {6}bigNum{0} {12}({6}unused{12}:{0} {12}'{6}a{12}):{0} {3}float{0} {3}option{0} {12}={0}
+    {3}Seq{0}.{2}init{0} {13}10_000{0} {12}({3}float{0} {12}>>{0} {12}({1}fun{0} {6}i{0} {12}->{0} {6}i{0} {12}+{0} {13}11.{12})){0}
+    {12}|>{0} {12}({3}List{0}.{2}ofSeq{0}
+        {12}>>{0} {3}List{0}.{2}take{0} {13}5{0}
+        {12}>>{0} {3}List{0}.{2}fold{0} {12}(*){0} {13}1.0{12}){0}
+    {12}|>{0} {3}Some{0}
+
+{1}match{0} {6}bigNum{0} {1}(){0} {1}with{0}
+{12}|{0} {3}Some{0} {6}num{0} {12}->{0} {2}sprintf{0} {15}"{19}%.2f{15} > {19}%u{15}"{0} {6}num{0} {7}``a byte literal``{0}
+{12}|{0} {3}None{0} {12}->{0} {2}sprintf{0} {15}"{19}%A{15}"{0} {15}"Have a byte string!"B{0}
+{12}|>{0} {2}printfn{0} {15}"{19}%s{15}"{0}
diff --git a/scite-app/lexilla/test/examples/hypertext/Bug2207.html b/scite-app/lexilla/test/examples/hypertext/Bug2207.html
new file mode 100644
index 0000000..b02ec07
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Bug2207.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+<script>
+  var example = "<!-- -->";  // closing "-->" is string
+  var example2 = '<!-- -->';  // closing "-->" is string
+</script>
+</html>
diff --git a/scite-app/lexilla/test/examples/hypertext/Bug2207.html.folded b/scite-app/lexilla/test/examples/hypertext/Bug2207.html.folded
new file mode 100644
index 0000000..e245c06
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Bug2207.html.folded
@@ -0,0 +1,8 @@
+ 0 400   0   <!DOCTYPE html>
+ 2 400   0 + <html>
+ 2 401   0 + <script>
+ 0 402   0 |   var example = "<!-- -->";  // closing "-->" is string
+ 0 402   0 |   var example2 = '<!-- -->';  // closing "-->" is string
+ 0 402   0 | </script>
+ 0 401   0 | </html>
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/Bug2207.html.styled b/scite-app/lexilla/test/examples/hypertext/Bug2207.html.styled
new file mode 100644
index 0000000..f09ca64
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Bug2207.html.styled
@@ -0,0 +1,7 @@
+{21}<!{26}DOCTYPE html{21}>{0}
+{1}<html>{0}
+{1}<script>{40}
+{41}  {47}var{41} {46}example{41} {50}={41} {48}"<!-- -->"{50};{41}  {43}// closing "-->" is string{41}
+  {47}var{41} {46}example2{41} {50}={41} {49}'<!-- -->'{50};{41}  {43}// closing "-->" is string{41}
+{1}</script>{0}
+{1}</html>{0}
diff --git a/scite-app/lexilla/test/examples/hypertext/Issue19.php b/scite-app/lexilla/test/examples/hypertext/Issue19.php
new file mode 100644
index 0000000..7b2f60b
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Issue19.php
@@ -0,0 +1,30 @@
+<?php
+
+$number = 1_234;
+$var = 'variable value';
+$test = [
+	<<<EOTEST
+	string $var string EOTEST
+	EOTEST_NOT
+	EOTEST,
+	0b00_01,
+	<<<"EOTEST"
+	"string" "$var" "string" EOTEST
+	EOTEST_NOT
+	EOTEST,
+	0x00_02,
+	<<<'EOTEST'
+	'string' '$var' 'string' EOTEST
+	EOTEST_NOT
+	EOTEST,
+	0x00_03,
+];
+print_r($test);
+
+# Attribute tests
+#[SingleLineAnnotation('string', 1, null)]
+#[
+	MultiLineAnnotation('string', 1, null)
+]
+
+?>
diff --git a/scite-app/lexilla/test/examples/hypertext/Issue19.php.folded b/scite-app/lexilla/test/examples/hypertext/Issue19.php.folded
new file mode 100644
index 0000000..501f6cc
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Issue19.php.folded
@@ -0,0 +1,31 @@
+ 2 400   0 + <?php
+ 1 401   0 | 
+ 0 401   0 | $number = 1_234;
+ 0 401   0 | $var = 'variable value';
+ 0 401   0 | $test = [
+ 0 401   0 | 	<<<EOTEST
+ 0 401   0 | 	string $var string EOTEST
+ 0 401   0 | 	EOTEST_NOT
+ 0 401   0 | 	EOTEST,
+ 0 401   0 | 	0b00_01,
+ 0 401   0 | 	<<<"EOTEST"
+ 0 401   0 | 	"string" "$var" "string" EOTEST
+ 0 401   0 | 	EOTEST_NOT
+ 0 401   0 | 	EOTEST,
+ 0 401   0 | 	0x00_02,
+ 0 401   0 | 	<<<'EOTEST'
+ 0 401   0 | 	'string' '$var' 'string' EOTEST
+ 0 401   0 | 	EOTEST_NOT
+ 0 401   0 | 	EOTEST,
+ 0 401   0 | 	0x00_03,
+ 0 401   0 | ];
+ 0 401   0 | print_r($test);
+ 1 401   0 | 
+ 0 401   0 | # Attribute tests
+ 0 401   0 | #[SingleLineAnnotation('string', 1, null)]
+ 0 401   0 | #[
+ 0 401   0 | 	MultiLineAnnotation('string', 1, null)
+ 0 401   0 | ]
+ 1 401   0 | 
+ 0 401   0 | ?>
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/Issue19.php.styled b/scite-app/lexilla/test/examples/hypertext/Issue19.php.styled
new file mode 100644
index 0000000..5480268
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/Issue19.php.styled
@@ -0,0 +1,30 @@
+{18}<?php{118}
+
+{123}$number{118} {127}={118} {122}1_234{127};{118}
+{123}$var{118} {127}={118} {120}'variable value'{127};{118}
+{123}$test{118} {127}={118} {127}[{118}
+	{119}<<<EOTEST
+	string {126}$var{119} string EOTEST
+	EOTEST_NOT
+	EOTEST{127},{118}
+	{122}0b00_01{127},{118}
+	{119}<<<"EOTEST"
+	"string" "{126}$var{119}" "string" EOTEST
+	EOTEST_NOT
+	EOTEST{127},{118}
+	{122}0x00_02{127},{118}
+	{120}<<<'EOTEST'
+	'string' '$var' 'string' EOTEST
+	EOTEST_NOT
+	EOTEST{127},{118}
+	{122}0x00_03{127},{118}
+{127}];{118}
+print_r{127}({123}$test{127});{118}
+
+{125}# Attribute tests{118}
+#{127}[{118}SingleLineAnnotation{127}({120}'string'{127},{118} {122}1{127},{118} null{127})]{118}
+#{127}[{118}
+	MultiLineAnnotation{127}({120}'string'{127},{118} {122}1{127},{118} null{127}){118}
+{127}]{118}
+
+{18}?>{0}
diff --git a/scite-app/lexilla/test/examples/hypertext/SciTE.properties b/scite-app/lexilla/test/examples/hypertext/SciTE.properties
new file mode 100644
index 0000000..2a516a2
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/SciTE.properties
@@ -0,0 +1,9 @@
+lexer.*=hypertext
+keywords.*=b body content head href html link meta \
+name rel script strong title type xmlns
+keywords2.*=function var
+keywords3.*=sub
+fold=1
+fold.html=1
+fold.html.preprocessor=1
+fold.hypertext.comment=1
diff --git a/scite-app/lexilla/test/examples/hypertext/apostophe.php b/scite-app/lexilla/test/examples/hypertext/apostophe.php
new file mode 100644
index 0000000..ade729b
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/apostophe.php
@@ -0,0 +1,11 @@
+<?php
+# Test that currently fails as comment style not started in a number.
+# line-comment
+// line-comment
+/* comment */
+$foo = 0#comment
+$foo = 0//comment
+$foo = 0/*'*/;
+?>
+
+<br />
diff --git a/scite-app/lexilla/test/examples/hypertext/apostophe.php.folded b/scite-app/lexilla/test/examples/hypertext/apostophe.php.folded
new file mode 100644
index 0000000..7b5c616
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/apostophe.php.folded
@@ -0,0 +1,12 @@
+ 2 400   0 + <?php
+ 0 401   0 | # Test that currently fails as comment style not started in a number.
+ 0 401   0 | # line-comment
+ 0 401   0 | // line-comment
+ 0 401   0 | /* comment */
+ 0 401   0 | $foo = 0#comment
+ 0 401   0 | $foo = 0//comment
+ 2 401   0 + $foo = 0/*'*/;
+ 0 402   0 | ?>
+ 1 402   0 | 
+ 0 402   0 | <br />
+ 0 402   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/apostophe.php.styled b/scite-app/lexilla/test/examples/hypertext/apostophe.php.styled
new file mode 100644
index 0000000..0c27ab5
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/apostophe.php.styled
@@ -0,0 +1,11 @@
+{18}<?php{118}
+{125}# Test that currently fails as comment style not started in a number.{118}
+{125}# line-comment{118}
+{125}// line-comment{118}
+{124}/* comment */{118}
+{123}$foo{118} {127}={118} {122}0{118}#comment
+{123}$foo{118} {127}={118} {122}0{127}//{118}comment
+{123}$foo{118} {127}={118} {122}0{127}/*{120}'*/;
+?>
+
+<br />
diff --git a/scite-app/lexilla/test/examples/hypertext/x.asp b/scite-app/lexilla/test/examples/hypertext/x.asp
new file mode 100644
index 0000000..a78acdc
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.asp
@@ -0,0 +1,12 @@
+<%@language=javas%>
+<% 
+#include 
+function x() {
+}
+%>
+<%@language=vbscript%>
+<% 
+sub x 'comment 
+%>
+<head>
+<body></body>
diff --git a/scite-app/lexilla/test/examples/hypertext/x.asp.folded b/scite-app/lexilla/test/examples/hypertext/x.asp.folded
new file mode 100644
index 0000000..06cf452
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.asp.folded
@@ -0,0 +1,13 @@
+ 0 400   0   <%@language=javas%>
+ 2 400   0 + <% 
+ 0 401   0 | #include 
+ 2 401   0 + function x() {
+ 0 402   0 | }
+ 0 401   0 | %>
+ 0 400   0   <%@language=vbscript%>
+ 2 400   0 + <% 
+ 0 401   0 | sub x 'comment 
+ 0 401   0 | %>
+ 2 400   0 + <head>
+ 0 401   0 | <body></body>
+ 0 401   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/x.asp.styled b/scite-app/lexilla/test/examples/hypertext/x.asp.styled
new file mode 100644
index 0000000..920c638
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.asp.styled
@@ -0,0 +1,12 @@
+{15}<%@{16}language=javas{15}%>{0}
+{15}<%{56} 
+#{61}include{56} 
+{62}function{56} {61}x{65}(){56} {65}{{56}
+{65}}{56}
+{15}%>{0}
+{15}<%@{16}language=vbscript{15}%>{0}
+{15}<%{81} 
+{84}sub{81} {86}x{81} {82}'comment {81}
+{15}%>{0}
+{1}<head>{0}
+{1}<body></body>{0}
diff --git a/scite-app/lexilla/test/examples/hypertext/x.html b/scite-app/lexilla/test/examples/hypertext/x.html
new file mode 100644
index 0000000..caebcf4
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.html
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<script type="text/javascript">
+var b = /abc/i.test('abc');
+'x\
+</t>'
+</script>
+<head>
+    <meta name="Date.Modified" content="20010515" />
+    <title>SinkWorld - Portability</title>
+    <unknown>SinkWorld - Portability</unknown>
+    <link rel="stylesheet" type="text/css" href="SW.css">
+</head>
diff --git a/scite-app/lexilla/test/examples/hypertext/x.html.folded b/scite-app/lexilla/test/examples/hypertext/x.html.folded
new file mode 100644
index 0000000..0bf350c
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.html.folded
@@ -0,0 +1,13 @@
+ 2 400   0 + <html xmlns="http://www.w3.org/1999/xhtml">
+ 2 401   0 + <script type="text/javascript">
+ 0 402   0 | var b = /abc/i.test('abc');
+ 0 402   0 | 'x\
+ 0 402   0 | </t>'
+ 0 402   0 | </script>
+ 2 401   0 + <head>
+ 0 402   0 |     <meta name="Date.Modified" content="20010515" />
+ 0 402   0 |     <title>SinkWorld - Portability</title>
+ 0 402   0 |     <unknown>SinkWorld - Portability</unknown>
+ 0 402   0 |     <link rel="stylesheet" type="text/css" href="SW.css">
+ 0 402   0 | </head>
+ 0 401   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/x.html.styled b/scite-app/lexilla/test/examples/hypertext/x.html.styled
new file mode 100644
index 0000000..41b3d83
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.html.styled
@@ -0,0 +1,12 @@
+{1}<html{8} {3}xmlns{8}={6}"http://www.w3.org/1999/xhtml"{1}>{0}
+{1}<script{8} {3}type{8}={6}"text/javascript"{1}>{40}
+{47}var{41} {46}b{41} {50}={41} {52}/abc/i{46}.test{50}({49}'abc'{50});{41}
+{49}'x\
+</t>'{41}
+{1}</script>{0}
+{1}<head>{0}
+    {1}<meta{8} {3}name{8}={6}"Date.Modified"{8} {3}content{8}={6}"20010515"{8} {11}/>{0}
+    {1}<title>{0}SinkWorld - Portability{1}</title>{0}
+    {2}<unknown>{0}SinkWorld - Portability{2}</unknown>{0}
+    {1}<link{8} {3}rel{8}={6}"stylesheet"{8} {3}type{8}={6}"text/css"{8} {3}href{8}={6}"SW.css"{1}>{0}
+{1}</head>{0}
diff --git a/scite-app/lexilla/test/examples/hypertext/x.php b/scite-app/lexilla/test/examples/hypertext/x.php
new file mode 100644
index 0000000..bc7302d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.php
@@ -0,0 +1,6 @@
+<head> <!-- About to script -->
+<?php
+echo "<!-- -->\n";
+/* ?> */
+?>
+<strong>for</strong><b>if</b>
diff --git a/scite-app/lexilla/test/examples/hypertext/x.php.folded b/scite-app/lexilla/test/examples/hypertext/x.php.folded
new file mode 100644
index 0000000..a80c7e7
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.php.folded
@@ -0,0 +1,7 @@
+ 2 400   0 + <head> <!-- About to script -->
+ 2 401   0 + <?php
+ 0 402   0 | echo "<!-- -->\n";
+ 0 402   0 | /* ?> */
+ 0 402   0 | ?>
+ 0 401   0 | <strong>for</strong><b>if</b>
+ 0 401   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/hypertext/x.php.styled b/scite-app/lexilla/test/examples/hypertext/x.php.styled
new file mode 100644
index 0000000..fb90ba0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/hypertext/x.php.styled
@@ -0,0 +1,6 @@
+{1}<head>{0} {9}<!-- About to script -->{0}
+{18}<?php{118}
+echo {119}"<!-- -->\n"{127};{118}
+{124}/* ?> */{118}
+{18}?>{0}
+{1}<strong>{0}for{1}</strong><b>{0}if{1}</b>{0}
diff --git a/scite-app/lexilla/test/examples/julia/SciTE.properties b/scite-app/lexilla/test/examples/julia/SciTE.properties
new file mode 100644
index 0000000..06d95c3
--- /dev/null
+++ b/scite-app/lexilla/test/examples/julia/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.jl=julia
+keywords.*.jl=const end for function in where
+keywords2.*.jl=Int Number
+keywords3.*.jl=true
diff --git a/scite-app/lexilla/test/examples/julia/x.jl b/scite-app/lexilla/test/examples/julia/x.jl
new file mode 100644
index 0000000..3462807
--- /dev/null
+++ b/scite-app/lexilla/test/examples/julia/x.jl
@@ -0,0 +1,19 @@
+
+# Comment here
+const bar = '\n'
+
+"""
+    test_fun(a::Int)
+For test only
+"""
+function test_fun(a::Int, b::T) where T <: Number
+    println(a)
+    println("foo $(bar)")
+end
+
+@enum Unicode α=1 β=2
+
+res = [√i for i in 1:10]
+
+#= Dummy function =#
+test_fun²(:sym, true, raw"test", `echo 1`)
diff --git a/scite-app/lexilla/test/examples/julia/x.jl.folded b/scite-app/lexilla/test/examples/julia/x.jl.folded
new file mode 100644
index 0000000..2e0ebdf
--- /dev/null
+++ b/scite-app/lexilla/test/examples/julia/x.jl.folded
@@ -0,0 +1,20 @@
+ 0 400 400   
+ 0 400 400   # Comment here
+ 0 400 400   const bar = '\n'
+ 0 400 400   
+ 2 400 401 + """
+ 0 401 401 |     test_fun(a::Int)
+ 0 401 401 | For test only
+ 0 401 400 | """
+ 2 400 401 + function test_fun(a::Int, b::T) where T <: Number
+ 0 401 401 |     println(a)
+ 0 401 401 |     println("foo $(bar)")
+ 0 401 400 | end
+ 0 400 400   
+ 0 400 400   @enum Unicode α=1 β=2
+ 0 400 400   
+ 0 400 400   res = [√i for i in 1:10]
+ 0 400 400   
+ 0 400 400   #= Dummy function =#
+ 0 400 400   test_fun²(:sym, true, raw"test", `echo 1`)
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/julia/x.jl.styled b/scite-app/lexilla/test/examples/julia/x.jl.styled
new file mode 100644
index 0000000..79b966e
--- /dev/null
+++ b/scite-app/lexilla/test/examples/julia/x.jl.styled
@@ -0,0 +1,19 @@
+{0}
+{1}# Comment here{0}
+{3}const{0} {9}bar{0} {7}={0} {6}'\n'{0}
+
+{14}"""
+    test_fun(a::Int)
+For test only
+"""{0}
+{3}function{0} {9}test_fun{8}({9}a{21}::{4}Int{7},{0} {9}b{21}::{9}T{8}){0} {3}where{0} {9}T{0} {21}<:{0} {4}Number{0}
+    {9}println{8}({9}a{8}){0}
+    {9}println{8}({10}"foo {13}$(bar){10}"{8}){0}
+{3}end{0}
+
+{12}@enum{0} {9}Unicode{0} {9}α{7}={2}1{0} {9}β{7}={2}2{0}
+
+{9}res{0} {7}={0} {8}[{7}√{9}i{0} {3}for{0} {9}i{0} {3}in{0} {2}1{7}:{2}10{8}]{0}
+
+{1}#= Dummy function =#{0}
+{9}test_fun²{8}({11}:sym{7},{0} {5}true{7},{0} {15}raw{10}"test"{7},{0} {16}`echo 1`{8}){0}
diff --git a/scite-app/lexilla/test/examples/latex/AllStyles.tex b/scite-app/lexilla/test/examples/latex/AllStyles.tex
new file mode 100644
index 0000000..066a308
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/AllStyles.tex
@@ -0,0 +1,47 @@
+% Enumerate all styles: 0 to 12
+% Not a valid laTeX file as entities are unbalanced and not semantically correct
+% comment=4
+
+% whitespace=0
+text	%
+
+% command=1
+\documentclass
+
+% tag=2
+\begin{document}
+
+% tag closing=5
+\end{document}
+
+% math=3
+\begin{math}
+E &= mc^2
+\end{math}
+
+% math block=6
+\begin{align}
+E &= mc^2
+\end{align}
+
+% comment block=7
+\begin{comment}
+A block comment
+\end{comment}
+
+% verbatim=8
+\begin{verbatim}
+puts $foo
+\end{verbatim}
+
+% short command=9
+\(\)
+
+% special=10
+\#
+
+% command optional argument=11
+\x[12pt]
+
+% error=12
+\
diff --git a/scite-app/lexilla/test/examples/latex/AllStyles.tex.folded b/scite-app/lexilla/test/examples/latex/AllStyles.tex.folded
new file mode 100644
index 0000000..d682a24
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/AllStyles.tex.folded
@@ -0,0 +1,48 @@
+ 0 400   0   % Enumerate all styles: 0 to 12
+ 0 400   0   % Not a valid laTeX file as entities are unbalanced and not semantically correct
+ 0 400   0   % comment=4
+ 0 400   0   
+ 0 400   0   % whitespace=0
+ 0 400   0   text	%
+ 0 400   0   
+ 0 400   0   % command=1
+ 0 400   0   \documentclass
+ 0 400   0   
+ 0 400   0   % tag=2
+ 2 400   0 + \begin{document}
+ 0 401   0 | 
+ 0 401   0 | % tag closing=5
+ 0 401   0 | \end{document}
+ 0 400   0   
+ 0 400   0   % math=3
+ 2 400   0 + \begin{math}
+ 0 401   0 | E &= mc^2
+ 0 401   0 | \end{math}
+ 0 400   0   
+ 0 400   0   % math block=6
+ 2 400   0 + \begin{align}
+ 0 401   0 | E &= mc^2
+ 0 401   0 | \end{align}
+ 0 400   0   
+ 0 400   0   % comment block=7
+ 2 400   0 + \begin{comment}
+ 0 401   0 | A block comment
+ 0 401   0 | \end{comment}
+ 0 400   0   
+ 0 400   0   % verbatim=8
+ 2 400   0 + \begin{verbatim}
+ 0 401   0 | puts $foo
+ 0 401   0 | \end{verbatim}
+ 0 400   0   
+ 0 400   0   % short command=9
+ 0 400   0   \(\)
+ 0 400   0   
+ 0 400   0   % special=10
+ 0 400   0   \#
+ 0 400   0   
+ 0 400   0   % command optional argument=11
+ 0 400   0   \x[12pt]
+ 0 400   0   
+ 0 400   0   % error=12
+ 0 400   0   \
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/latex/AllStyles.tex.styled b/scite-app/lexilla/test/examples/latex/AllStyles.tex.styled
new file mode 100644
index 0000000..bed7ff5
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/AllStyles.tex.styled
@@ -0,0 +1,47 @@
+{4}% Enumerate all styles: 0 to 12{0}
+{4}% Not a valid laTeX file as entities are unbalanced and not semantically correct{0}
+{4}% comment=4{0}
+
+{4}% whitespace=0{0}
+text	{4}%{0}
+
+{4}% command=1{0}
+{1}\documentclass{0}
+
+{4}% tag=2{0}
+{1}\begin{2}{document}{0}
+
+{4}% tag closing=5{0}
+{1}\end{5}{document}{0}
+
+{4}% math=3{0}
+{1}\begin{2}{math}{3}
+E &= mc^2
+{1}\end{5}{math}{0}
+
+{4}% math block=6{0}
+{1}\begin{2}{align}{6}
+E &= mc^2
+{1}\end{5}{align}{0}
+
+{4}% comment block=7{0}
+{1}\begin{2}{comment}{7}
+A block comment
+{1}\end{5}{comment}{0}
+
+{4}% verbatim=8{0}
+{1}\begin{2}{verbatim}{8}
+puts $foo
+{1}\end{5}{verbatim}{0}
+
+{4}% short command=9{0}
+{9}\(\){0}
+
+{4}% special=10{0}
+{10}\#{0}
+
+{4}% command optional argument=11{0}
+{1}\x{11}[12pt]{0}
+
+{4}% error=12{0}
+{12}\{0}
diff --git a/scite-app/lexilla/test/examples/latex/Feature1358.tex b/scite-app/lexilla/test/examples/latex/Feature1358.tex
new file mode 100644
index 0000000..73f27b8
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/Feature1358.tex
@@ -0,0 +1,10 @@
+\begin{lstlisting}[language=make]
+# If no BOARD is found in the environment, use this default:
+BOARD ?= bluepill
+
+# To use chinese st-link v2 and ch340 dongle with bluepill
+ifeq ($(BOARD),bluepill)
+STLINK_VERSION=2
+PORT_LINUX=/dev/ttyUSB0
+endif
+\end{lstlisting}
diff --git a/scite-app/lexilla/test/examples/latex/Feature1358.tex.folded b/scite-app/lexilla/test/examples/latex/Feature1358.tex.folded
new file mode 100644
index 0000000..4742401
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/Feature1358.tex.folded
@@ -0,0 +1,11 @@
+ 2 400   0 + \begin{lstlisting}[language=make]
+ 0 401   0 | # If no BOARD is found in the environment, use this default:
+ 0 401   0 | BOARD ?= bluepill
+ 0 401   0 | 
+ 0 401   0 | # To use chinese st-link v2 and ch340 dongle with bluepill
+ 0 401   0 | ifeq ($(BOARD),bluepill)
+ 0 401   0 | STLINK_VERSION=2
+ 0 401   0 | PORT_LINUX=/dev/ttyUSB0
+ 0 401   0 | endif
+ 0 401   0 | \end{lstlisting}
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/latex/Feature1358.tex.styled b/scite-app/lexilla/test/examples/latex/Feature1358.tex.styled
new file mode 100644
index 0000000..e753ea1
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/Feature1358.tex.styled
@@ -0,0 +1,10 @@
+{1}\begin{2}{lstlisting}{8}[language=make]
+# If no BOARD is found in the environment, use this default:
+BOARD ?= bluepill
+
+# To use chinese st-link v2 and ch340 dongle with bluepill
+ifeq ($(BOARD),bluepill)
+STLINK_VERSION=2
+PORT_LINUX=/dev/ttyUSB0
+endif
+{1}\end{5}{lstlisting}{0}
diff --git a/scite-app/lexilla/test/examples/latex/SciTE.properties b/scite-app/lexilla/test/examples/latex/SciTE.properties
new file mode 100644
index 0000000..0b81c11
--- /dev/null
+++ b/scite-app/lexilla/test/examples/latex/SciTE.properties
@@ -0,0 +1 @@
+lexer.*.tex=latex
diff --git a/scite-app/lexilla/test/examples/lua/Bug2205.lua b/scite-app/lexilla/test/examples/lua/Bug2205.lua
new file mode 100644
index 0000000..062957d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/Bug2205.lua
@@ -0,0 +1,5 @@
+print("First")
+--[[ Block comment start
+print("Second")
+--[[ Another block comment ]]
+print("Third. If run through an actual program, this will be executed.")
diff --git a/scite-app/lexilla/test/examples/lua/Bug2205.lua.folded b/scite-app/lexilla/test/examples/lua/Bug2205.lua.folded
new file mode 100644
index 0000000..746ab58
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/Bug2205.lua.folded
@@ -0,0 +1,6 @@
+ 0 400   0   print("First")
+ 2 400   0 + --[[ Block comment start
+ 0 401   0 | print("Second")
+ 0 401   0 | --[[ Another block comment ]]
+ 0 400   0   print("Third. If run through an actual program, this will be executed.")
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/lua/Bug2205.lua.styled b/scite-app/lexilla/test/examples/lua/Bug2205.lua.styled
new file mode 100644
index 0000000..59a8de4
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/Bug2205.lua.styled
@@ -0,0 +1,5 @@
+{13}print{10}({6}"First"{10}){0}
+{1}--[[ Block comment start
+print("Second")
+--[[ Another block comment ]]{0}
+{13}print{10}({6}"Third. If run through an actual program, this will be executed."{10}){0}
diff --git a/scite-app/lexilla/test/examples/lua/SciTE.properties b/scite-app/lexilla/test/examples/lua/SciTE.properties
new file mode 100644
index 0000000..7baf8cb
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.lua=lua
+keywords.*.lua=function end
+keywords2.*.lua=print
+fold=1
diff --git a/scite-app/lexilla/test/examples/lua/x.lua b/scite-app/lexilla/test/examples/lua/x.lua
new file mode 100644
index 0000000..cfa3537
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/x.lua
@@ -0,0 +1,7 @@
+--[[ coding:UTF-8
+comment ]]
+function first()
+::開::
+   -- Comment
+   func(SCI_ANNOTATIONSETTEXT, 'a', 0, "LINE1")
+end
diff --git a/scite-app/lexilla/test/examples/lua/x.lua.folded b/scite-app/lexilla/test/examples/lua/x.lua.folded
new file mode 100644
index 0000000..0e5379a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/x.lua.folded
@@ -0,0 +1,8 @@
+ 2 400   0 + --[[ coding:UTF-8
+ 0 401   0 | comment ]]
+ 2 400   0 + function first()
+ 0 401   0 | ::開::
+ 0 401   0 |    -- Comment
+ 0 401   0 |    func(SCI_ANNOTATIONSETTEXT, 'a', 0, "LINE1")
+ 0 401   0 | end
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/lua/x.lua.styled b/scite-app/lexilla/test/examples/lua/x.lua.styled
new file mode 100644
index 0000000..0c8f76f
--- /dev/null
+++ b/scite-app/lexilla/test/examples/lua/x.lua.styled
@@ -0,0 +1,7 @@
+{1}--[[ coding:UTF-8
+comment ]]{0}
+{5}function{0} {11}first{10}(){0}
+{20}::開::{0}
+   {2}-- Comment
+{0}   {11}func{10}({11}SCI_ANNOTATIONSETTEXT{10},{0} {7}'a'{10},{0} {4}0{10},{0} {6}"LINE1"{10}){0}
+{5}end{0}
diff --git a/scite-app/lexilla/test/examples/makefile/SciTE.properties b/scite-app/lexilla/test/examples/makefile/SciTE.properties
new file mode 100644
index 0000000..ddc8792
--- /dev/null
+++ b/scite-app/lexilla/test/examples/makefile/SciTE.properties
@@ -0,0 +1 @@
+lexer.*.mak=makefile
diff --git a/scite-app/lexilla/test/examples/makefile/x.mak b/scite-app/lexilla/test/examples/makefile/x.mak
new file mode 100644
index 0000000..d5bdb83
--- /dev/null
+++ b/scite-app/lexilla/test/examples/makefile/x.mak
@@ -0,0 +1,16 @@
+# '# comment' comment=1
+# comment
+
+# '.SUFFIXES' target=5, ':' operator=4
+.SUFFIXES:
+
+# 'LD' identifier=3, '=' operator=4, 'link' default=0
+LD=link
+
+# '!IFDEF DEBUG' preprocessor=2
+!IFDEF DEBUG
+
+# '$(' ID EOL=9
+X=$(
+
+# End of file
diff --git a/scite-app/lexilla/test/examples/makefile/x.mak.folded b/scite-app/lexilla/test/examples/makefile/x.mak.folded
new file mode 100644
index 0000000..71cca1a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/makefile/x.mak.folded
@@ -0,0 +1,17 @@
+ 0 400   0   # '# comment' comment=1
+ 0 400   0   # comment
+ 0 400   0   
+ 0 400   0   # '.SUFFIXES' target=5, ':' operator=4
+ 0 400   0   .SUFFIXES:
+ 0 400   0   
+ 0 400   0   # 'LD' identifier=3, '=' operator=4, 'link' default=0
+ 0 400   0   LD=link
+ 0 400   0   
+ 0 400   0   # '!IFDEF DEBUG' preprocessor=2
+ 0 400   0   !IFDEF DEBUG
+ 0 400   0   
+ 0 400   0   # '$(' ID EOL=9
+ 0 400   0   X=$(
+ 0 400   0   
+ 0 400   0   # End of file
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/makefile/x.mak.styled b/scite-app/lexilla/test/examples/makefile/x.mak.styled
new file mode 100644
index 0000000..752ed58
--- /dev/null
+++ b/scite-app/lexilla/test/examples/makefile/x.mak.styled
@@ -0,0 +1,16 @@
+{1}# '# comment' comment=1
+# comment
+{0}
+{1}# '.SUFFIXES' target=5, ':' operator=4
+{5}.SUFFIXES{4}:{0}
+
+{1}# 'LD' identifier=3, '=' operator=4, 'link' default=0
+{3}LD{4}={0}link
+
+{1}# '!IFDEF DEBUG' preprocessor=2
+{2}!IFDEF DEBUG
+{0}
+{1}# '$(' ID EOL=9
+{3}X{4}={9}$(
+{0}
+{1}# End of file
diff --git a/scite-app/lexilla/test/examples/markdown/AllStyles.md b/scite-app/lexilla/test/examples/markdown/AllStyles.md
new file mode 100644
index 0000000..7ebc639
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/AllStyles.md
@@ -0,0 +1,27 @@
+Text=0
+Line end characters=1
+**Strong Emphasis (bold) 1=2**
+__Strong Emphasis (bold) 2=3__
+*Emphasis (italic) 1=4*
+_Emphasis (italic) 2=5_
+# Heading level 1=6
+## Heading level 2=7
+### Heading level 3=8
+#### Heading level 4=9
+##### Heading level 5=10
+###### Heading level 6=11
+   PreChar=12
+* Unordered list item=13
+1. Ordered list item=14
+>Block Quote=15
+~~Strike-out=16~~
+
+***
+Previous line was horizontal rule=17
+[Link=18](https://18.com)
+`Inline Code=19`
+``Inline Code=20``
+
+~~~
+Block code=21
+~~~
diff --git a/scite-app/lexilla/test/examples/markdown/AllStyles.md.folded b/scite-app/lexilla/test/examples/markdown/AllStyles.md.folded
new file mode 100644
index 0000000..07bd21f
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/AllStyles.md.folded
@@ -0,0 +1,28 @@
+ 0 400   0   Text=0
+ 0 400   0   Line end characters=1
+ 0 400   0   **Strong Emphasis (bold) 1=2**
+ 0 400   0   __Strong Emphasis (bold) 2=3__
+ 0 400   0   *Emphasis (italic) 1=4*
+ 0 400   0   _Emphasis (italic) 2=5_
+ 0 400   0   # Heading level 1=6
+ 0 400   0   ## Heading level 2=7
+ 0 400   0   ### Heading level 3=8
+ 0 400   0   #### Heading level 4=9
+ 0 400   0   ##### Heading level 5=10
+ 0 400   0   ###### Heading level 6=11
+ 0 400   0      PreChar=12
+ 0 400   0   * Unordered list item=13
+ 0 400   0   1. Ordered list item=14
+ 0 400   0   >Block Quote=15
+ 0 400   0   ~~Strike-out=16~~
+ 0 400   0   
+ 0 400   0   ***
+ 0 400   0   Previous line was horizontal rule=17
+ 0 400   0   [Link=18](https://18.com)
+ 0 400   0   `Inline Code=19`
+ 0 400   0   ``Inline Code=20``
+ 0 400   0   
+ 0 400   0   ~~~
+ 0 400   0   Block code=21
+ 0 400   0   ~~~
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/markdown/AllStyles.md.styled b/scite-app/lexilla/test/examples/markdown/AllStyles.md.styled
new file mode 100644
index 0000000..2b8e63e
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/AllStyles.md.styled
@@ -0,0 +1,27 @@
+{0}Text=0{1}
+{0}Line end characters=1{1}
+{2}**Strong Emphasis (bold) 1=2**{1}
+{3}__Strong Emphasis (bold) 2=3__{1}
+{4}*Emphasis (italic) 1=4*{1}
+{5}_Emphasis (italic) 2=5_{1}
+{6}#{0} Heading level 1=6{1}
+{7}##{0} Heading level 2=7{1}
+{8}###{0} Heading level 3=8{1}
+{9}####{0} Heading level 4=9{1}
+{10}#####{0} Heading level 5=10{1}
+{11}######{0} Heading level 6=11{1}
+{12}   {0}PreChar=12{1}
+{13}*{0} Unordered list item=13{1}
+{14}1.{0} Ordered list item=14{1}
+{15}>{0}Block Quote=15{1}
+{16}~~Strike-out=16~~{1}
+
+{17}***{1}
+{0}Previous line was horizontal rule=17{1}
+{18}[Link=18](https://18.com){1}
+{19}`Inline Code=19`{1}
+{20}``Inline Code=20``{1}
+
+{21}~~~
+Block code=21
+~~~{1}
diff --git a/scite-app/lexilla/test/examples/markdown/Bug1216.md b/scite-app/lexilla/test/examples/markdown/Bug1216.md
new file mode 100644
index 0000000..9cd16f3
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug1216.md
@@ -0,0 +1,27 @@
+# Checking resolution of bug 1216
+
+*This line is not emphasized
+
+This is plain text with *inline emphasis*
+
+_This, too, is not emphasized
+
+And this is plain text with _inline emphasis_
+
+**This line is not in bold
+
+But this is plain text with some words **in bold**
+
+__This line is also not in bold
+
+And this is plain text with __some words in bold__
+
+~~This line is not crossed out
+
+This is plain text with ~~some words crossed out~~
+
+~~~
+this is a code block
+~~~
+
+This is a new paragraph
diff --git a/scite-app/lexilla/test/examples/markdown/Bug1216.md.folded b/scite-app/lexilla/test/examples/markdown/Bug1216.md.folded
new file mode 100644
index 0000000..c927a2c
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug1216.md.folded
@@ -0,0 +1,28 @@
+ 0 400   0   # Checking resolution of bug 1216
+ 0 400   0   
+ 0 400   0   *This line is not emphasized
+ 0 400   0   
+ 0 400   0   This is plain text with *inline emphasis*
+ 0 400   0   
+ 0 400   0   _This, too, is not emphasized
+ 0 400   0   
+ 0 400   0   And this is plain text with _inline emphasis_
+ 0 400   0   
+ 0 400   0   **This line is not in bold
+ 0 400   0   
+ 0 400   0   But this is plain text with some words **in bold**
+ 0 400   0   
+ 0 400   0   __This line is also not in bold
+ 0 400   0   
+ 0 400   0   And this is plain text with __some words in bold__
+ 0 400   0   
+ 0 400   0   ~~This line is not crossed out
+ 0 400   0   
+ 0 400   0   This is plain text with ~~some words crossed out~~
+ 0 400   0   
+ 0 400   0   ~~~
+ 0 400   0   this is a code block
+ 0 400   0   ~~~
+ 0 400   0   
+ 0 400   0   This is a new paragraph
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/markdown/Bug1216.md.styled b/scite-app/lexilla/test/examples/markdown/Bug1216.md.styled
new file mode 100644
index 0000000..7f5f13a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug1216.md.styled
@@ -0,0 +1,27 @@
+{6}#{0} Checking resolution of bug 1216{1}
+
+{0}*This line is not emphasized{1}
+
+{0}This is plain text with {4}*inline emphasis*{1}
+
+{0}_This, too, is not emphasized{1}
+
+{0}And this is plain text with {5}_inline emphasis_{1}
+
+{0}**This line is not in bold{1}
+
+{0}But this is plain text with some words {2}**in bold**{1}
+
+{0}__This line is also not in bold{1}
+
+{0}And this is plain text with {3}__some words in bold__{1}
+
+{0}~~This line is not crossed out{1}
+
+{0}This is plain text with {16}~~some words crossed out~~{1}
+
+{21}~~~
+this is a code block
+~~~{1}
+
+{0}This is a new paragraph{1}
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2235.md b/scite-app/lexilla/test/examples/markdown/Bug2235.md
new file mode 100644
index 0000000..2e93b83
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2235.md
@@ -0,0 +1,15 @@
+Po spuštění modulu je zobrazen hlavní dialog modulu:
+
+![](media\image21.png)V tomto dialogu lze nastavit různé
+parametry vykreslení výsledného schématu. Doporučujeme pro většinu
+případů ponechat přednastavené hodnoty.
+
+Základní parametry ne nacházejí v záložce *Obecné*:
+
+![SciTE224.png][]V tomto dialogu lze nastavit různé
+parametry vykreslení výsledného schématu. Doporučujeme pro většinu
+případů ponechat přednastavené hodnoty.
+
+Základní parametry ne nacházejí v záložce _Obecné_
+
+[SciTE224.png]: https://www.scintilla.org/SciTE224.png
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2235.md.folded b/scite-app/lexilla/test/examples/markdown/Bug2235.md.folded
new file mode 100644
index 0000000..502f1e2
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2235.md.folded
@@ -0,0 +1,16 @@
+ 0 400   0   Po spuštění modulu je zobrazen hlavní dialog modulu:
+ 0 400   0   
+ 0 400   0   ![](media\image21.png)V tomto dialogu lze nastavit různé
+ 0 400   0   parametry vykreslení výsledného schématu. Doporučujeme pro většinu
+ 0 400   0   případů ponechat přednastavené hodnoty.
+ 0 400   0   
+ 0 400   0   Základní parametry ne nacházejí v záložce *Obecné*:
+ 0 400   0   
+ 0 400   0   ![SciTE224.png][]V tomto dialogu lze nastavit různé
+ 0 400   0   parametry vykreslení výsledného schématu. Doporučujeme pro většinu
+ 0 400   0   případů ponechat přednastavené hodnoty.
+ 0 400   0   
+ 0 400   0   Základní parametry ne nacházejí v záložce _Obecné_
+ 0 400   0   
+ 0 400   0   [SciTE224.png]: https://www.scintilla.org/SciTE224.png
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2235.md.styled b/scite-app/lexilla/test/examples/markdown/Bug2235.md.styled
new file mode 100644
index 0000000..5cfa918
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2235.md.styled
@@ -0,0 +1,15 @@
+{0}Po spuštění modulu je zobrazen hlavní dialog modulu:{1}
+
+{18}![](media\image21.png){0}V tomto dialogu lze nastavit různé{1}
+{0}parametry vykreslení výsledného schématu. Doporučujeme pro většinu{1}
+{0}případů ponechat přednastavené hodnoty.{1}
+
+{0}Základní parametry ne nacházejí v záložce {4}*Obecné*{0}:{1}
+
+{18}![SciTE224.png][]{0}V tomto dialogu lze nastavit různé{1}
+{0}parametry vykreslení výsledného schématu. Doporučujeme pro většinu{1}
+{0}případů ponechat přednastavené hodnoty.{1}
+
+{0}Základní parametry ne nacházejí v záložce {5}_Obecné_{1}
+
+{18}[SciTE224.png]:{0} https://www.scintilla.org/SciTE224.png{1}
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2247.md b/scite-app/lexilla/test/examples/markdown/Bug2247.md
new file mode 100644
index 0000000..63990cf
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2247.md
@@ -0,0 +1,30 @@
+# Checking resolution of bug 2247
+
+~~~sql
+SELECT datetime() AS `date`;
+~~~
+
+```sql
+SELECT datetime() AS `date`;
+```
+
+List of examples:
+
+-   example *one*
+
+-   example _two_
+
+-   example `inline code without end
+
+    In case of **AAA**:
+    
+    ```sql
+    SELECT strftime('%Y-%m-%d %H:%M:%S', 'now') AS `date`;
+    ```
+    
+    or, in case of __BBB__:
+    . . .
+
+-   example *three*
+
+Last paragraph.
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2247.md.folded b/scite-app/lexilla/test/examples/markdown/Bug2247.md.folded
new file mode 100644
index 0000000..549d7a1
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2247.md.folded
@@ -0,0 +1,31 @@
+ 0 400   0   # Checking resolution of bug 2247
+ 0 400   0   
+ 0 400   0   ~~~sql
+ 0 400   0   SELECT datetime() AS `date`;
+ 0 400   0   ~~~
+ 0 400   0   
+ 0 400   0   ```sql
+ 0 400   0   SELECT datetime() AS `date`;
+ 0 400   0   ```
+ 0 400   0   
+ 0 400   0   List of examples:
+ 0 400   0   
+ 0 400   0   -   example *one*
+ 0 400   0   
+ 0 400   0   -   example _two_
+ 0 400   0   
+ 0 400   0   -   example `inline code without end
+ 0 400   0   
+ 0 400   0       In case of **AAA**:
+ 0 400   0       
+ 0 400   0       ```sql
+ 0 400   0       SELECT strftime('%Y-%m-%d %H:%M:%S', 'now') AS `date`;
+ 0 400   0       ```
+ 0 400   0       
+ 0 400   0       or, in case of __BBB__:
+ 0 400   0       . . .
+ 0 400   0   
+ 0 400   0   -   example *three*
+ 0 400   0   
+ 0 400   0   Last paragraph.
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/markdown/Bug2247.md.styled b/scite-app/lexilla/test/examples/markdown/Bug2247.md.styled
new file mode 100644
index 0000000..77bc84d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/Bug2247.md.styled
@@ -0,0 +1,30 @@
+{6}#{0} Checking resolution of bug 2247{1}
+
+{21}~~~sql
+SELECT datetime() AS `date`;
+~~~{1}
+
+{20}```sql
+SELECT datetime() AS `date`;
+```{1}
+
+{0}List of examples:{1}
+
+{13}-{0}   example {4}*one*{1}
+
+{13}-{0}   example {5}_two_{1}
+
+{13}-{0}   example `inline code without end{1}
+
+{12}   {0} In case of {2}**AAA**{0}:{1}
+{12}   {0} {1}
+{12}   {0} {20}```sql
+    SELECT strftime('%Y-%m-%d %H:%M:%S', 'now') AS `date`;
+    ```{1}
+{12}   {0} {1}
+{12}   {0} or, in case of {3}__BBB__{0}:{1}
+{12}   {0} . . .{1}
+
+{13}-{0}   example {4}*three*{1}
+
+{0}Last paragraph.{1}
diff --git a/scite-app/lexilla/test/examples/markdown/SciTE.properties b/scite-app/lexilla/test/examples/markdown/SciTE.properties
new file mode 100644
index 0000000..cf85d43
--- /dev/null
+++ b/scite-app/lexilla/test/examples/markdown/SciTE.properties
@@ -0,0 +1,3 @@
+code.page=65001
+lexer.*.md=markdown
+fold=1
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab
new file mode 100644
index 0000000..d393fcb
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab
@@ -0,0 +1,44 @@
+% Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug
+
+% White space=0
+   %
+
+% Comment=1
+% Line comment
+
+% Next line is comment in Ocatve but not Matlab
+# Octave comment
+
+%{
+Block comment.
+%}
+
+% Command=2
+
+%{
+Omitted as this places a style transiton between \r and \n
+!rmdir oldtests
+%}
+
+% Number=3
+33.3
+
+% Keyword=4
+global x
+
+% Single Quoted String=5
+'string'
+
+% Operator=6
+[X,Y] = meshgrid(-10:0.25:10,-10:0.25:10);
+
+% Identifier=7
+identifier = 2
+
+% Double Quoted String=8
+"string"
+
+% This loop should fold
+for i = 1:5
+    x(i) = 3 * i;
+end
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.folded b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.folded
new file mode 100644
index 0000000..e305d66
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.folded
@@ -0,0 +1,45 @@
+ 0 400 400   % Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug
+ 1 400 400   
+ 0 400 400   % White space=0
+ 0 400 400      %
+ 1 400 400   
+ 0 400 400   % Comment=1
+ 0 400 400   % Line comment
+ 1 400 400   
+ 0 400 400   % Next line is comment in Ocatve but not Matlab
+ 0 400 400   # Octave comment
+ 1 400 400   
+ 0 400 400   %{
+ 0 400 400   Block comment.
+ 0 400 400   %}
+ 1 400 400   
+ 0 400 400   % Command=2
+ 1 400 400   
+ 0 400 400   %{
+ 0 400 400   Omitted as this places a style transiton between \r and \n
+ 0 400 400   !rmdir oldtests
+ 0 400 400   %}
+ 1 400 400   
+ 0 400 400   % Number=3
+ 0 400 400   33.3
+ 1 400 400   
+ 0 400 400   % Keyword=4
+ 0 400 400   global x
+ 1 400 400   
+ 0 400 400   % Single Quoted String=5
+ 0 400 400   'string'
+ 1 400 400   
+ 0 400 400   % Operator=6
+ 0 400 400   [X,Y] = meshgrid(-10:0.25:10,-10:0.25:10);
+ 1 400 400   
+ 0 400 400   % Identifier=7
+ 0 400 400   identifier = 2
+ 1 400 400   
+ 0 400 400   % Double Quoted String=8
+ 0 400 400   "string"
+ 1 400 400   
+ 0 400 400   % This loop should fold
+ 2 400 401 + for i = 1:5
+ 0 401 401 |     x(i) = 3 * i;
+ 0 401 400 | end
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.styled b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.styled
new file mode 100644
index 0000000..df9e435
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.matlab.styled
@@ -0,0 +1,44 @@
+{1}% Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug{0}
+
+{1}% White space=0{0}
+   {1}%{0}
+
+{1}% Comment=1{0}
+{1}% Line comment{0}
+
+{1}% Next line is comment in Ocatve but not Matlab{0}
+# {7}Octave{0} {7}comment{0}
+
+{1}%{
+Block comment.
+%}{0}
+
+{1}% Command=2{0}
+
+{1}%{
+Omitted as this places a style transiton between \r and \n
+!rmdir oldtests
+%}{0}
+
+{1}% Number=3{0}
+{3}33.3{0}
+
+{1}% Keyword=4{0}
+{4}global{0} {7}x{0}
+
+{1}% Single Quoted String=5{0}
+{5}'string'{0}
+
+{1}% Operator=6{0}
+{6}[{7}X{6},{7}Y{6}]{0} {6}={0} {7}meshgrid{6}(-{3}10{6}:{3}0.25{6}:{3}10{6},-{3}10{6}:{3}0.25{6}:{3}10{6});{0}
+
+{1}% Identifier=7{0}
+{7}identifier{0} {6}={0} {3}2{0}
+
+{1}% Double Quoted String=8{0}
+{8}"string"{0}
+
+{1}% This loop should fold{0}
+{4}for{0} {7}i{0} {6}={0} {3}1{6}:{3}5{0}
+    {7}x{6}({7}i{6}){0} {6}={0} {3}3{0} {6}*{0} {7}i{6};{0}
+{4}end{0}
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave
new file mode 100644
index 0000000..d393fcb
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave
@@ -0,0 +1,44 @@
+% Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug
+
+% White space=0
+   %
+
+% Comment=1
+% Line comment
+
+% Next line is comment in Ocatve but not Matlab
+# Octave comment
+
+%{
+Block comment.
+%}
+
+% Command=2
+
+%{
+Omitted as this places a style transiton between \r and \n
+!rmdir oldtests
+%}
+
+% Number=3
+33.3
+
+% Keyword=4
+global x
+
+% Single Quoted String=5
+'string'
+
+% Operator=6
+[X,Y] = meshgrid(-10:0.25:10,-10:0.25:10);
+
+% Identifier=7
+identifier = 2
+
+% Double Quoted String=8
+"string"
+
+% This loop should fold
+for i = 1:5
+    x(i) = 3 * i;
+end
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.folded b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.folded
new file mode 100644
index 0000000..e305d66
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.folded
@@ -0,0 +1,45 @@
+ 0 400 400   % Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug
+ 1 400 400   
+ 0 400 400   % White space=0
+ 0 400 400      %
+ 1 400 400   
+ 0 400 400   % Comment=1
+ 0 400 400   % Line comment
+ 1 400 400   
+ 0 400 400   % Next line is comment in Ocatve but not Matlab
+ 0 400 400   # Octave comment
+ 1 400 400   
+ 0 400 400   %{
+ 0 400 400   Block comment.
+ 0 400 400   %}
+ 1 400 400   
+ 0 400 400   % Command=2
+ 1 400 400   
+ 0 400 400   %{
+ 0 400 400   Omitted as this places a style transiton between \r and \n
+ 0 400 400   !rmdir oldtests
+ 0 400 400   %}
+ 1 400 400   
+ 0 400 400   % Number=3
+ 0 400 400   33.3
+ 1 400 400   
+ 0 400 400   % Keyword=4
+ 0 400 400   global x
+ 1 400 400   
+ 0 400 400   % Single Quoted String=5
+ 0 400 400   'string'
+ 1 400 400   
+ 0 400 400   % Operator=6
+ 0 400 400   [X,Y] = meshgrid(-10:0.25:10,-10:0.25:10);
+ 1 400 400   
+ 0 400 400   % Identifier=7
+ 0 400 400   identifier = 2
+ 1 400 400   
+ 0 400 400   % Double Quoted String=8
+ 0 400 400   "string"
+ 1 400 400   
+ 0 400 400   % This loop should fold
+ 2 400 401 + for i = 1:5
+ 0 401 401 |     x(i) = 3 * i;
+ 0 401 400 | end
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.styled b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.styled
new file mode 100644
index 0000000..22ec881
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/AllStyles.m.octave.styled
@@ -0,0 +1,44 @@
+{1}% Examples of each style 0..8 except for SCE_MATLAB_COMMAND(2) which has a line ending bug{0}
+
+{1}% White space=0{0}
+   {1}%{0}
+
+{1}% Comment=1{0}
+{1}% Line comment{0}
+
+{1}% Next line is comment in Ocatve but not Matlab{0}
+{1}# Octave comment{0}
+
+{1}%{
+Block comment.
+%}{0}
+
+{1}% Command=2{0}
+
+{1}%{
+Omitted as this places a style transiton between \r and \n
+!rmdir oldtests
+%}{0}
+
+{1}% Number=3{0}
+{3}33.3{0}
+
+{1}% Keyword=4{0}
+{4}global{0} {7}x{0}
+
+{1}% Single Quoted String=5{0}
+{5}'string'{0}
+
+{1}% Operator=6{0}
+{6}[{7}X{6},{7}Y{6}]{0} {6}={0} {7}meshgrid{6}(-{3}10{6}:{3}0.25{6}:{3}10{6},-{3}10{6}:{3}0.25{6}:{3}10{6});{0}
+
+{1}% Identifier=7{0}
+{7}identifier{0} {6}={0} {3}2{0}
+
+{1}% Double Quoted String=8{0}
+{8}"string"{0}
+
+{1}% This loop should fold{0}
+{4}for{0} {7}i{0} {6}={0} {3}1{6}:{3}5{0}
+    {7}x{6}({7}i{6}){0} {6}={0} {3}3{0} {6}*{0} {7}i{6};{0}
+{4}end{0}
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab
new file mode 100644
index 0000000..1d150be
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab
@@ -0,0 +1,16 @@
+a="""";
+b=1;
+c='\';
+d=2;
+e="\";
+f=3;
+%" this should be a comment (colored as such), instead it closes the string
+g="
+h=123;
+%" this is a syntax error in Matlab (about 'g'),
+% followed by a valid assignment (of 'h')
+% Instead, 'h' is colored as part of the string
+
+% Octave terminates string at 3rd ", Matlab at 4th
+i="\" "; % " %
+% end
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.folded b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.folded
new file mode 100644
index 0000000..7dafc3f
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.folded
@@ -0,0 +1,17 @@
+ 0 400 400   a="""";
+ 0 400 400   b=1;
+ 0 400 400   c='\';
+ 0 400 400   d=2;
+ 0 400 400   e="\";
+ 0 400 400   f=3;
+ 0 400 400   %" this should be a comment (colored as such), instead it closes the string
+ 0 400 400   g="
+ 0 400 400   h=123;
+ 0 400 400   %" this is a syntax error in Matlab (about 'g'),
+ 0 400 400   % followed by a valid assignment (of 'h')
+ 0 400 400   % Instead, 'h' is colored as part of the string
+ 1 400 400   
+ 0 400 400   % Octave terminates string at 3rd ", Matlab at 4th
+ 0 400 400   i="\" "; % " %
+ 0 400 400   % end
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.styled b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.styled
new file mode 100644
index 0000000..4221845
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.matlab.styled
@@ -0,0 +1,16 @@
+{7}a{6}={8}""""{6};{0}
+{7}b{6}={3}1{6};{0}
+{7}c{6}={5}'\'{6};{0}
+{7}d{6}={3}2{6};{0}
+{7}e{6}={8}"\"{6};{0}
+{7}f{6}={3}3{6};{0}
+{1}%" this should be a comment (colored as such), instead it closes the string{0}
+{7}g{6}={8}"
+h=123;
+%"{0} {7}this{0} {7}is{0} {7}a{0} {7}syntax{0} {7}error{0} {7}in{0} {7}Matlab{0} {6}({7}about{0} {5}'g'{6}),{0}
+{1}% followed by a valid assignment (of 'h'){0}
+{1}% Instead, 'h' is colored as part of the string{0}
+
+{1}% Octave terminates string at 3rd ", Matlab at 4th{0}
+{7}i{6}={8}"\"{0} {8}"; % "{0} {1}%{0}
+{1}% end{0}
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave
new file mode 100644
index 0000000..c4f1cf7
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave
@@ -0,0 +1,4 @@
+% Ensure escape sequences still work in octave
+% Octave terminates string at 3rd ", Matlab at 4th
+i="\" "; % " %
+% end
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.folded b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.folded
new file mode 100644
index 0000000..0b34ea1
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.folded
@@ -0,0 +1,5 @@
+ 0 400 400   % Ensure escape sequences still work in octave
+ 0 400 400   % Octave terminates string at 3rd ", Matlab at 4th
+ 0 400 400   i="\" "; % " %
+ 0 400 400   % end
+ 1 400 400   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.styled b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.styled
new file mode 100644
index 0000000..7c29acc
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/Issue18_EscapeSequence.m.octave.styled
@@ -0,0 +1,4 @@
+{1}% Ensure escape sequences still work in octave{0}
+{1}% Octave terminates string at 3rd ", Matlab at 4th{0}
+{7}i{6}={8}"\" "{6};{0} {1}% " %{0}
+{1}% end{0}
diff --git a/scite-app/lexilla/test/examples/matlab/SciTE.properties b/scite-app/lexilla/test/examples/matlab/SciTE.properties
new file mode 100644
index 0000000..efe83e0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/matlab/SciTE.properties
@@ -0,0 +1,8 @@
+lexer.*.matlab=matlab
+keywords.*.matlab=end for global if
+
+lexer.*.octave=octave
+keywords.*.octave=end for global if
+
+fold=1
+fold.compact=1
diff --git a/scite-app/lexilla/test/examples/mmixal/AllStyles.mms b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms
new file mode 100644
index 0000000..54de34b
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms
@@ -0,0 +1,74 @@
+% Demonstrate each possible style. Does not make sense as code.
+
+% A comment 1
+% Comment
+
+
+% Whitespace 0
+        
+
+
+% Label 2
+label
+
+
+% Not Validated Opcode 3 appears to always validate to either 5 or 6
+% so is never seen on screen.
+
+
+% Division between Label and Opcode 4
+la      
+
+
+% Valid Opcode 5
+        TRAP
+
+
+% Invalid Opcode 6
+        UNKNOWN
+
+
+% Division between Opcode and Operands 7
+        LOC   
+
+
+% Division of Operands 8
+        LOC   0.
+
+
+% Number 9
+        BYTE  0
+
+
+% Reference 10
+        JMP @label
+
+
+% Char 11
+        BYTE 'a'
+
+
+% String 12
+        BYTE "Hello, world!"
+
+
+% Register 13
+        BYTE rA
+
+
+% Hexadecimal Number 14
+        BYTE #FF
+
+
+% Operator 15
+        BYTE  +
+
+
+% Symbol 16
+        TRAP  Fputs
+
+
+% Preprocessor 17
+@include a.mms
+
+
diff --git a/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.folded b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.folded
new file mode 100644
index 0000000..0fab9a3
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.folded
@@ -0,0 +1,75 @@
+ 0 400   0   % Demonstrate each possible style. Does not make sense as code.
+ 0 400   0   
+ 0 400   0   % A comment 1
+ 0 400   0   % Comment
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Whitespace 0
+ 0 400   0           
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Label 2
+ 0 400   0   label
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Not Validated Opcode 3 appears to always validate to either 5 or 6
+ 0 400   0   % so is never seen on screen.
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Division between Label and Opcode 4
+ 0 400   0   la      
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Valid Opcode 5
+ 0 400   0           TRAP
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Invalid Opcode 6
+ 0 400   0           UNKNOWN
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Division between Opcode and Operands 7
+ 0 400   0           LOC   
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Division of Operands 8
+ 0 400   0           LOC   0.
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Number 9
+ 0 400   0           BYTE  0
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Reference 10
+ 0 400   0           JMP @label
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Char 11
+ 0 400   0           BYTE 'a'
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % String 12
+ 0 400   0           BYTE "Hello, world!"
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Register 13
+ 0 400   0           BYTE rA
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Hexadecimal Number 14
+ 0 400   0           BYTE #FF
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Operator 15
+ 0 400   0           BYTE  +
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Symbol 16
+ 0 400   0           TRAP  Fputs
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   % Preprocessor 17
+ 0 400   0   @include a.mms
+ 0 400   0   
+ 0 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.styled b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.styled
new file mode 100644
index 0000000..b3f64d4
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/AllStyles.mms.styled
@@ -0,0 +1,74 @@
+{1}% Demonstrate each possible style. Does not make sense as code.
+{0}
+{1}% A comment 1
+% Comment
+{0}
+
+{1}% Whitespace 0
+{0}        
+
+
+{1}% Label 2
+{2}label{4}
+{0}
+
+{1}% Not Validated Opcode 3 appears to always validate to either 5 or 6
+% so is never seen on screen.
+{0}
+
+{1}% Division between Label and Opcode 4
+{2}la{4}      
+{0}
+
+{1}% Valid Opcode 5
+{0}        {5}TRAP{7}
+{0}
+
+{1}% Invalid Opcode 6
+{0}        {6}UNKNOWN{7}
+{0}
+
+{1}% Division between Opcode and Operands 7
+{0}        {5}LOC{7}   
+{0}
+
+{1}% Division of Operands 8
+{0}        {5}LOC{7}   {9}0{8}.{1}
+{0}
+
+{1}% Number 9
+{0}        {5}BYTE{7}  {9}0{1}
+{0}
+
+{1}% Reference 10
+{0}        {5}JMP{7} {10}@label{1}
+{0}
+
+{1}% Char 11
+{0}        {5}BYTE{7} {11}'a'{1}
+{0}
+
+{1}% String 12
+{0}        {5}BYTE{7} {12}"Hello, world!"{1}
+{0}
+
+{1}% Register 13
+{0}        {5}BYTE{7} {13}rA{1}
+{0}
+
+{1}% Hexadecimal Number 14
+{0}        {5}BYTE{7} {14}#FF{1}
+{0}
+
+{1}% Operator 15
+{0}        {5}BYTE{7}  {15}+{1}
+{0}
+
+{1}% Symbol 16
+{0}        {5}TRAP{7}  {16}Fputs{1}
+{0}
+
+{1}% Preprocessor 17
+{17}@include a.mms
+{0}
+
diff --git a/scite-app/lexilla/test/examples/mmixal/SciTE.properties b/scite-app/lexilla/test/examples/mmixal/SciTE.properties
new file mode 100644
index 0000000..d458a19
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.mms=mmixal
+keywords.*.mms=BYTE GETA JMP LOC PREFIX TRAP
+keywords2.*.mms=rA
+keywords3.*.mms=Fputs StdOut
diff --git a/scite-app/lexilla/test/examples/mmixal/references.mms b/scite-app/lexilla/test/examples/mmixal/references.mms
new file mode 100644
index 0000000..82be6e8
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/references.mms
@@ -0,0 +1,16 @@
+# Bug #2019 Buffer over-read in MMIXAL lexer
+label
+        PREFIX  Foo:
+% Relative reference (uses PREFIX)
+        JMP label
+%
+        JMP @label
+% Absolute reference (does not use PREFIX)
+        JMP :label
+% In register list so treated as register
+        JMP :rA
+% Too long for buffer so truncated
+        JMP l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+% Too long for buffer so truncated then treated as absolute
+        JMP :l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+%
diff --git a/scite-app/lexilla/test/examples/mmixal/references.mms.folded b/scite-app/lexilla/test/examples/mmixal/references.mms.folded
new file mode 100644
index 0000000..1d0073b
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/references.mms.folded
@@ -0,0 +1,17 @@
+ 0 400   0   # Bug #2019 Buffer over-read in MMIXAL lexer
+ 0 400   0   label
+ 0 400   0           PREFIX  Foo:
+ 0 400   0   % Relative reference (uses PREFIX)
+ 0 400   0           JMP label
+ 0 400   0   %
+ 0 400   0           JMP @label
+ 0 400   0   % Absolute reference (does not use PREFIX)
+ 0 400   0           JMP :label
+ 0 400   0   % In register list so treated as register
+ 0 400   0           JMP :rA
+ 0 400   0   % Too long for buffer so truncated
+ 0 400   0           JMP l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+ 0 400   0   % Too long for buffer so truncated then treated as absolute
+ 0 400   0           JMP :l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
+ 0 400   0   %
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/mmixal/references.mms.styled b/scite-app/lexilla/test/examples/mmixal/references.mms.styled
new file mode 100644
index 0000000..78ae29a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/references.mms.styled
@@ -0,0 +1,16 @@
+{1}# Bug #2019 Buffer over-read in MMIXAL lexer
+{2}label{4}
+{0}        {5}PREFIX{7}  {10}Foo:{1}
+% Relative reference (uses PREFIX)
+{0}        {5}JMP{7} {10}label{1}
+%
+{0}        {5}JMP{7} {10}@label{1}
+% Absolute reference (does not use PREFIX)
+{0}        {5}JMP{7} {10}:label{1}
+% In register list so treated as register
+{0}        {5}JMP{7} {13}:rA{1}
+% Too long for buffer so truncated
+{0}        {5}JMP{7} {10}l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890{1}
+% Too long for buffer so truncated then treated as absolute
+{0}        {5}JMP{7} {10}:l1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890{1}
+%
diff --git a/scite-app/lexilla/test/examples/mmixal/x.mms b/scite-app/lexilla/test/examples/mmixal/x.mms
new file mode 100644
index 0000000..538d221
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/x.mms
@@ -0,0 +1,12 @@
+% Some example code
+
+        % Set the address of the program initially to 0x100.
+        LOC   #100
+
+Main    GETA  $255,string
+
+        TRAP  0,Fputs,StdOut
+
+        TRAP  0,Halt,0
+
+string  BYTE  "Hello, world!",#a,0
diff --git a/scite-app/lexilla/test/examples/mmixal/x.mms.folded b/scite-app/lexilla/test/examples/mmixal/x.mms.folded
new file mode 100644
index 0000000..459bdf2
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/x.mms.folded
@@ -0,0 +1,13 @@
+ 0 400   0   % Some example code
+ 0 400   0   
+ 0 400   0           % Set the address of the program initially to 0x100.
+ 0 400   0           LOC   #100
+ 0 400   0   
+ 0 400   0   Main    GETA  $255,string
+ 0 400   0   
+ 0 400   0           TRAP  0,Fputs,StdOut
+ 0 400   0   
+ 0 400   0           TRAP  0,Halt,0
+ 0 400   0   
+ 0 400   0   string  BYTE  "Hello, world!",#a,0
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/mmixal/x.mms.styled b/scite-app/lexilla/test/examples/mmixal/x.mms.styled
new file mode 100644
index 0000000..7221e37
--- /dev/null
+++ b/scite-app/lexilla/test/examples/mmixal/x.mms.styled
@@ -0,0 +1,12 @@
+{1}% Some example code
+{0}
+        {1}% Set the address of the program initially to 0x100.
+{0}        {5}LOC{7}   {14}#100{1}
+{0}
+{2}Main{4}    {5}GETA{7}  {13}$255{15},{10}string{1}
+{0}
+        {5}TRAP{7}  {9}0{15},{16}Fputs{15},{16}StdOut{1}
+{0}
+        {5}TRAP{7}  {9}0{15},{10}Halt{15},{9}0{1}
+{0}
+{2}string{4}  {5}BYTE{7}  {12}"Hello, world!"{15},{14}#a{15},{9}0{1}
diff --git a/scite-app/lexilla/test/examples/nim/SciTE.properties b/scite-app/lexilla/test/examples/nim/SciTE.properties
new file mode 100644
index 0000000..3a02149
--- /dev/null
+++ b/scite-app/lexilla/test/examples/nim/SciTE.properties
@@ -0,0 +1,2 @@
+lexer.*.nim=nim
+keywords.*.nim=else end if let proc
diff --git a/scite-app/lexilla/test/examples/nim/x.nim b/scite-app/lexilla/test/examples/nim/x.nim
new file mode 100644
index 0000000..874940d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/nim/x.nim
@@ -0,0 +1,28 @@
+# Tests for Nim
+let s = "foobar"
+
+# Feature #1260
+{.ident.}
+stdin.readLine.split.map(parseInt).max.`$`.echo(" is the maximum!")
+
+# Feature #1261
+# IsFuncName("proc") so style ticks as SCE_NIM_FUNCNAME:
+proc `$` (x: myDataType): string = ...
+# Style ticks as SCE_NIM_BACKTICKS:
+if `==`( `+`(3,4),7): echo "True"
+
+# Feature #1262
+# Standard raw string identifier:
+let standardDoubleLitRawStr = R"A raw string\"
+let standardTripleLitRawStr = R"""A triple-double raw string\""""
+# Style of 'customIdent' is determined by lexer.nim.raw.strings.highlight.ident. 16 if false, 6 or 10 if true
+let customDoubleLitRawStr = customIdent"A string\"
+let customTripleLitRawStr = customIdent"""A triple-double raw string\""""
+
+# Feature #1268
+10_000
+10__000
+10_
+1....5
+1.ident
+1._ident
diff --git a/scite-app/lexilla/test/examples/nim/x.nim.folded b/scite-app/lexilla/test/examples/nim/x.nim.folded
new file mode 100644
index 0000000..2018456
--- /dev/null
+++ b/scite-app/lexilla/test/examples/nim/x.nim.folded
@@ -0,0 +1,29 @@
+ 1   0   0   # Tests for Nim
+ 0 400   0   let s = "foobar"
+ 1 400   0   
+ 1 400   0   # Feature #1260
+ 0 400   0   {.ident.}
+ 0 400   0   stdin.readLine.split.map(parseInt).max.`$`.echo(" is the maximum!")
+ 1 400   0   
+ 1 400   0   # Feature #1261
+ 1 400   0   # IsFuncName("proc") so style ticks as SCE_NIM_FUNCNAME:
+ 0 400   0   proc `$` (x: myDataType): string = ...
+ 1 400   0   # Style ticks as SCE_NIM_BACKTICKS:
+ 0 400   0   if `==`( `+`(3,4),7): echo "True"
+ 1 400   0   
+ 1 400   0   # Feature #1262
+ 1 400   0   # Standard raw string identifier:
+ 0 400   0   let standardDoubleLitRawStr = R"A raw string\"
+ 0 400   0   let standardTripleLitRawStr = R"""A triple-double raw string\""""
+ 1 400   0   # Style of 'customIdent' is determined by lexer.nim.raw.strings.highlight.ident. 16 if false, 6 or 10 if true
+ 0 400   0   let customDoubleLitRawStr = customIdent"A string\"
+ 0 400   0   let customTripleLitRawStr = customIdent"""A triple-double raw string\""""
+ 1 400   0   
+ 1 400   0   # Feature #1268
+ 0 400   0   10_000
+ 0 400   0   10__000
+ 0 400   0   10_
+ 0 400   0   1....5
+ 0 400   0   1.ident
+ 0 400   0   1._ident
+ 1 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/nim/x.nim.styled b/scite-app/lexilla/test/examples/nim/x.nim.styled
new file mode 100644
index 0000000..3a05c04
--- /dev/null
+++ b/scite-app/lexilla/test/examples/nim/x.nim.styled
@@ -0,0 +1,28 @@
+{3}# Tests for Nim
+{8}let{0} {16}s{0} {15}={0} {6}"foobar"{0}
+
+{3}# Feature #1260
+{15}{.{16}ident{15}.}{0}
+{16}stdin{15}.{16}readLine{15}.{16}split{15}.{16}map{15}({16}parseInt{15}).{16}max{15}.{11}`$`{15}.{16}echo{15}({6}" is the maximum!"{15}){0}
+
+{3}# Feature #1261
+# IsFuncName("proc") so style ticks as SCE_NIM_FUNCNAME:
+{8}proc{0} {12}`$`{0} {15}({16}x{15}:{0} {16}myDataType{15}):{0} {16}string{0} {15}={0} {15}...{0}
+{3}# Style ticks as SCE_NIM_BACKTICKS:
+{8}if{0} {11}`==`{15}({0} {11}`+`{15}({5}3{15},{5}4{15}),{5}7{15}):{0} {16}echo{0} {6}"True"{0}
+
+{3}# Feature #1262
+# Standard raw string identifier:
+{8}let{0} {16}standardDoubleLitRawStr{0} {15}={0} {6}R"A raw string\"{0}
+{8}let{0} {16}standardTripleLitRawStr{0} {15}={0} {10}R"""A triple-double raw string\""""{0}
+{3}# Style of 'customIdent' is determined by lexer.nim.raw.strings.highlight.ident. 16 if false, 6 or 10 if true
+{8}let{0} {16}customDoubleLitRawStr{0} {15}={0} {16}customIdent{6}"A string\"{0}
+{8}let{0} {16}customTripleLitRawStr{0} {15}={0} {16}customIdent{10}"""A triple-double raw string\""""{0}
+
+{3}# Feature #1268
+{5}10_000{0}
+{5}10{16}__000{0}
+{5}10{16}_{0}
+{5}1{15}....{5}5{0}
+{5}1{15}.{16}ident{0}
+{5}1{15}.{16}_ident{0}
diff --git a/scite-app/lexilla/test/examples/perl/SciTE.properties b/scite-app/lexilla/test/examples/perl/SciTE.properties
new file mode 100644
index 0000000..da97ffa
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/SciTE.properties
@@ -0,0 +1,33 @@
+lexer.*.pl=perl
+keywords.*.pl=\
+NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD \
+BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept \
+alarm and atan2 bind binmode bless caller chdir chmod chomp chop \
+chown chr chroot close closedir cmp connect continue cos crypt \
+dbmclose dbmopen defined delete die do dump each else elsif endgrent \
+endhostent endnetent endprotoent endpwent endservent eof eq eval \
+exec exists exit exp fcntl fileno flock for foreach fork format \
+formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname \
+gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername \
+getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent \
+getpwent getpwnam getpwuid getservbyname getservbyport getservent \
+getsockname getsockopt glob gmtime goto grep gt hex if index \
+int ioctl join keys kill last lc lcfirst le length link listen \
+local localtime lock log lstat lt map mkdir msgctl msgget msgrcv \
+msgsnd my ne next no not oct open opendir or ord our pack package \
+pipe pop pos print printf prototype push quotemeta qu \
+rand read readdir readline readlink readpipe recv redo \
+ref rename require reset return reverse rewinddir rindex rmdir \
+scalar seek seekdir select semctl semget semop send setgrent \
+sethostent setnetent setpgrp setpriority setprotoent setpwent \
+setservent setsockopt shift shmctl shmget shmread shmwrite shutdown \
+sin sleep socket socketpair sort splice split sprintf sqrt srand \
+stat study sub substr symlink syscall sysopen sysread sysseek \
+system syswrite tell telldir tie tied time times truncate \
+uc ucfirst umask undef unless unlink unpack unshift untie until \
+use utime values vec wait waitpid wantarray warn while write \
+xor \
+given when default break say state UNITCHECK __SUB__ fc
+
+fold=1
+fold.comment=1
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl
new file mode 100644
index 0000000..a9c80ca
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+#--------------------------------------------------------------------------
+# perl-test-5220delta.pl
+#--------------------------------------------------------------------------
+# REF: https://metacpan.org/pod/distribution/perl/pod/perldelta.pod
+# maybe future ref: https://metacpan.org/pod/distribution/perl/pod/perl5220delta.pod
+# also: http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
+#
+#--------------------------------------------------------------------------
+# Kein-Hong Man <keinhong@gmail.com> Public Domain 20151217
+#--------------------------------------------------------------------------
+# 20151217	initial document
+# 20151218	updated tests and comments
+#--------------------------------------------------------------------------
+
+use v5.22;			# may be needed
+
+#--------------------------------------------------------------------------
+# New bitwise operators
+#--------------------------------------------------------------------------
+
+use feature 'bitwise'		# enable feature, warning enabled
+use experimental "bitwise";	# enable feature, warning disabled
+
+# numerical operands
+10&20  10|20   10^20 ~10
+$a&"8" $a|"8" $a^"8" ~$a ~"8"
+
+# string operands
+'0'&."8" '0'|."8" '0'^."8" ~.'0' ~."8"
+# the following is AMBIGUOUS, perl sees 10 and not .10 only when bitwise feature is enabled
+# so it's feature-setting-dependent, no plans to change current behaviour
+ $a&.10   $a|.10   $a^.10  ~.$a  ~.10
+
+# assignment variants
+$a&=10;    $a|=10;    $a^=10;
+$b&.='20'; $b|.='20'; $b^.='20';
+$c&="30";  $c|="30";  $c^="30";
+$d&.=$e;   $d|.=$e;   $d^.=$e;
+
+#--------------------------------------------------------------------------
+# New double-diamond operator
+#--------------------------------------------------------------------------
+# <<>> is like <> but each element of @ARGV will be treated as an actual file name
+
+# example snippet from brian d foy's blog post
+while( <<>> ) {  # new, safe line input operator
+	...;
+	}
+
+#--------------------------------------------------------------------------
+# New \b boundaries in regular expressions
+#--------------------------------------------------------------------------
+
+qr/\b{gcb}/
+qr/\b{wb}/
+qr/\b{sb}/
+
+#--------------------------------------------------------------------------
+# Non-Capturing Regular Expression Flag
+#--------------------------------------------------------------------------
+# disables capturing and filling in $1, $2, etc
+
+"hello" =~ /(hi|hello)/n; # $1 is not set
+
+#--------------------------------------------------------------------------
+# Aliasing via reference
+#--------------------------------------------------------------------------
+# Variables and subroutines can now be aliased by assigning to a reference
+
+\$c = \$d;
+\&x = \&y;
+
+# Aliasing can also be applied to foreach iterator variables
+
+foreach \%hash (@array_of_hash_refs) { ... }
+
+# example snippet from brian d foy's blog post
+
+use feature qw(refaliasing);
+
+\%other_hash = \%hash;
+
+use v5.22;
+use feature qw(refaliasing);
+
+foreach \my %hash ( @array_of_hashes ) { # named hash control variable
+	foreach my $key ( keys %hash ) { # named hash now!
+		...;
+		}
+	}
+
+#--------------------------------------------------------------------------
+# New :const subroutine attribute
+#--------------------------------------------------------------------------
+
+my $x = 54321;
+*INLINED = sub : const { $x };
+$x++;
+
+# more examples of attributes
+# (not 5.22 stuff, but some general examples for study, useful for
+#  handling subroutine signature and subroutine prototype highlighting)
+
+sub foo : lvalue ;
+
+package X;
+sub Y::x : lvalue { 1 }
+
+package X;
+sub foo { 1 }
+package Y;
+BEGIN { *bar = \&X::foo; }
+package Z;
+sub Y::bar : lvalue ;
+
+# built-in attributes for subroutines:
+lvalue method prototype(..) locked const
+
+#--------------------------------------------------------------------------
+# Repetition in list assignment
+#--------------------------------------------------------------------------
+
+# example snippet from brian d foy's blog post
+use v5.22;
+my(undef, $card_num, (undef)x3, $count) = split /:/;
+
+(undef,undef,$foo) = that_function()
+# is equivalent to 
+((undef)x2, $foo) = that_function()
+
+#--------------------------------------------------------------------------
+# Floating point parsing has been improved
+#--------------------------------------------------------------------------
+# Hexadecimal floating point literals
+
+# some hex floats from a program by Rick Regan
+# appropriated and extended from Lua 5.2.x test cases
+# tested on perl 5.22/cygwin
+
+0x1p-1074;
+0x3.3333333333334p-5;
+0xcc.ccccccccccdp-11;
+0x1p+1;
+0x1p-6;
+0x1.b7p-1;
+0x1.fffffffffffffp+1023;
+0x1p-1022;
+0X1.921FB4D12D84AP+1;
+0x1.999999999999ap-4;
+
+# additional test cases for characterization
+0x1p-1074.		# dot is a string operator
+0x.ABCDEFp10		# legal, dot immediately after 0x
+0x.p10			# perl allows 0x as a zero, then concat with p10 bareword
+0x.p 0x0.p		# dot then bareword
+0x_0_.A_BC___DEF_p1_0	# legal hex float, underscores are mostly allowed
+0x0._ABCDEFp10		# _ABCDEFp10 is a bareword, no underscore allowed after dot
+
+# illegal, but does not use error highlighting
+0x0p1ABC		# illegal, highlighted as 0x0p1 abut with bareword ABC 
+
+# allowed to FAIL for now
+0x0.ABCDEFp_10		# ABCDEFp_10 is a bareword, '_10' exponent not allowed
+0xp 0xp1 0x0.0p		# syntax errors
+0x41.65.65 		# hex dot number, but lexer now fails with 0x41.65 left as a partial hex float
+
+#--------------------------------------------------------------------------
+# Support for ?PATTERN? without explicit operator has been removed
+#--------------------------------------------------------------------------
+# ?PATTERN? must now be written as m?PATTERN?
+
+?PATTERN?	# does not work in current LexPerl anyway, NO ACTION NEEDED
+m?PATTERN?
+
+#--------------------------------------------------------------------------
+# end of test file
+#--------------------------------------------------------------------------
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.folded b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.folded
new file mode 100644
index 0000000..b25368c
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.folded
@@ -0,0 +1,179 @@
+ 2 400 401 + # -*- coding: utf-8 -*-
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5220delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # REF: https://metacpan.org/pod/distribution/perl/pod/perldelta.pod
+ 0 401 401 | # maybe future ref: https://metacpan.org/pod/distribution/perl/pod/perl5220delta.pod
+ 0 401 401 | # also: http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
+ 0 401 401 | #
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # Kein-Hong Man <keinhong@gmail.com> Public Domain 20151217
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # 20151217	initial document
+ 0 401 401 | # 20151218	updated tests and comments
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   use v5.22;			# may be needed
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # New bitwise operators
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   use feature 'bitwise'		# enable feature, warning enabled
+ 0 400 400   use experimental "bitwise";	# enable feature, warning disabled
+ 1 400 400   
+ 0 400 400   # numerical operands
+ 0 400 400   10&20  10|20   10^20 ~10
+ 0 400 400   $a&"8" $a|"8" $a^"8" ~$a ~"8"
+ 1 400 400   
+ 0 400 400   # string operands
+ 0 400 400   '0'&."8" '0'|."8" '0'^."8" ~.'0' ~."8"
+ 2 400 401 + # the following is AMBIGUOUS, perl sees 10 and not .10 only when bitwise feature is enabled
+ 0 401 400 | # so it's feature-setting-dependent, no plans to change current behaviour
+ 0 400 400    $a&.10   $a|.10   $a^.10  ~.$a  ~.10
+ 1 400 400   
+ 0 400 400   # assignment variants
+ 0 400 400   $a&=10;    $a|=10;    $a^=10;
+ 0 400 400   $b&.='20'; $b|.='20'; $b^.='20';
+ 0 400 400   $c&="30";  $c|="30";  $c^="30";
+ 0 400 400   $d&.=$e;   $d|.=$e;   $d^.=$e;
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # New double-diamond operator
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 400 | # <<>> is like <> but each element of @ARGV will be treated as an actual file name
+ 1 400 400   
+ 0 400 400   # example snippet from brian d foy's blog post
+ 2 400 401 + while( <<>> ) {  # new, safe line input operator
+ 0 401 401 | 	...;
+ 0 401 400 | 	}
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # New \b boundaries in regular expressions
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   qr/\b{gcb}/
+ 0 400 400   qr/\b{wb}/
+ 0 400 400   qr/\b{sb}/
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # Non-Capturing Regular Expression Flag
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 400 | # disables capturing and filling in $1, $2, etc
+ 1 400 400   
+ 0 400 400   "hello" =~ /(hi|hello)/n; # $1 is not set
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # Aliasing via reference
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 400 | # Variables and subroutines can now be aliased by assigning to a reference
+ 1 400 400   
+ 0 400 400   \$c = \$d;
+ 0 400 400   \&x = \&y;
+ 1 400 400   
+ 0 400 400   # Aliasing can also be applied to foreach iterator variables
+ 1 400 400   
+ 0 400 400   foreach \%hash (@array_of_hash_refs) { ... }
+ 1 400 400   
+ 0 400 400   # example snippet from brian d foy's blog post
+ 1 400 400   
+ 0 400 400   use feature qw(refaliasing);
+ 1 400 400   
+ 0 400 400   \%other_hash = \%hash;
+ 1 400 400   
+ 0 400 400   use v5.22;
+ 0 400 400   use feature qw(refaliasing);
+ 1 400 400   
+ 2 400 401 + foreach \my %hash ( @array_of_hashes ) { # named hash control variable
+ 2 401 402 + 	foreach my $key ( keys %hash ) { # named hash now!
+ 0 402 402 | 		...;
+ 0 402 401 | 		}
+ 0 401 400 | 	}
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # New :const subroutine attribute
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   my $x = 54321;
+ 0 400 400   *INLINED = sub : const { $x };
+ 0 400 400   $x++;
+ 1 400 400   
+ 2 400 401 + # more examples of attributes
+ 0 401 401 | # (not 5.22 stuff, but some general examples for study, useful for
+ 0 401 400 | #  handling subroutine signature and subroutine prototype highlighting)
+ 1 400 400   
+ 0 400 400   sub foo : lvalue ;
+ 1 400 400   
+ 2 400 401 + package X;
+ 0 401 401 | sub Y::x : lvalue { 1 }
+ 1 401 401 | 
+ 2 400 401 + package X;
+ 0 401 401 | sub foo { 1 }
+ 2 400 401 + package Y;
+ 0 401 401 | BEGIN { *bar = \&X::foo; }
+ 2 400 401 + package Z;
+ 0 401 401 | sub Y::bar : lvalue ;
+ 1 401 401 | 
+ 0 401 401 | # built-in attributes for subroutines:
+ 0 401 401 | lvalue method prototype(..) locked const
+ 1 401 401 | 
+ 2 401 402 + #--------------------------------------------------------------------------
+ 0 402 402 | # Repetition in list assignment
+ 0 402 401 | #--------------------------------------------------------------------------
+ 1 401 401 | 
+ 0 401 401 | # example snippet from brian d foy's blog post
+ 0 401 401 | use v5.22;
+ 0 401 401 | my(undef, $card_num, (undef)x3, $count) = split /:/;
+ 1 401 401 | 
+ 0 401 401 | (undef,undef,$foo) = that_function()
+ 0 401 401 | # is equivalent to 
+ 0 401 401 | ((undef)x2, $foo) = that_function()
+ 1 401 401 | 
+ 2 401 402 + #--------------------------------------------------------------------------
+ 0 402 402 | # Floating point parsing has been improved
+ 0 402 402 | #--------------------------------------------------------------------------
+ 0 402 401 | # Hexadecimal floating point literals
+ 1 401 401 | 
+ 2 401 402 + # some hex floats from a program by Rick Regan
+ 0 402 402 | # appropriated and extended from Lua 5.2.x test cases
+ 0 402 401 | # tested on perl 5.22/cygwin
+ 1 401 401 | 
+ 0 401 401 | 0x1p-1074;
+ 0 401 401 | 0x3.3333333333334p-5;
+ 0 401 401 | 0xcc.ccccccccccdp-11;
+ 0 401 401 | 0x1p+1;
+ 0 401 401 | 0x1p-6;
+ 0 401 401 | 0x1.b7p-1;
+ 0 401 401 | 0x1.fffffffffffffp+1023;
+ 0 401 401 | 0x1p-1022;
+ 0 401 401 | 0X1.921FB4D12D84AP+1;
+ 0 401 401 | 0x1.999999999999ap-4;
+ 1 401 401 | 
+ 0 401 401 | # additional test cases for characterization
+ 0 401 401 | 0x1p-1074.		# dot is a string operator
+ 0 401 401 | 0x.ABCDEFp10		# legal, dot immediately after 0x
+ 0 401 401 | 0x.p10			# perl allows 0x as a zero, then concat with p10 bareword
+ 0 401 401 | 0x.p 0x0.p		# dot then bareword
+ 0 401 401 | 0x_0_.A_BC___DEF_p1_0	# legal hex float, underscores are mostly allowed
+ 0 401 401 | 0x0._ABCDEFp10		# _ABCDEFp10 is a bareword, no underscore allowed after dot
+ 1 401 401 | 
+ 0 401 401 | # illegal, but does not use error highlighting
+ 0 401 401 | 0x0p1ABC		# illegal, highlighted as 0x0p1 abut with bareword ABC 
+ 1 401 401 | 
+ 0 401 401 | # allowed to FAIL for now
+ 0 401 401 | 0x0.ABCDEFp_10		# ABCDEFp_10 is a bareword, '_10' exponent not allowed
+ 0 401 401 | 0xp 0xp1 0x0.0p		# syntax errors
+ 0 401 401 | 0x41.65.65 		# hex dot number, but lexer now fails with 0x41.65 left as a partial hex float
+ 1 401 401 | 
+ 2 401 402 + #--------------------------------------------------------------------------
+ 0 402 402 | # Support for ?PATTERN? without explicit operator has been removed
+ 0 402 402 | #--------------------------------------------------------------------------
+ 0 402 401 | # ?PATTERN? must now be written as m?PATTERN?
+ 1 401 401 | 
+ 0 401 401 | ?PATTERN?	# does not work in current LexPerl anyway, NO ACTION NEEDED
+ 0 401 401 | m?PATTERN?
+ 1 401 401 | 
+ 2 401 402 + #--------------------------------------------------------------------------
+ 0 402 402 | # end of test file
+ 0 402 401 | #--------------------------------------------------------------------------
+ 0 401   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.styled b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.styled
new file mode 100644
index 0000000..4a763a4
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-5220delta.pl.styled
@@ -0,0 +1,178 @@
+{2}# -*- coding: utf-8 -*-
+#--------------------------------------------------------------------------
+# perl-test-5220delta.pl
+#--------------------------------------------------------------------------
+# REF: https://metacpan.org/pod/distribution/perl/pod/perldelta.pod
+# maybe future ref: https://metacpan.org/pod/distribution/perl/pod/perl5220delta.pod
+# also: http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
+#
+#--------------------------------------------------------------------------
+# Kein-Hong Man <keinhong@gmail.com> Public Domain 20151217
+#--------------------------------------------------------------------------
+# 20151217	initial document
+# 20151218	updated tests and comments
+#--------------------------------------------------------------------------
+{0}
+{5}use{0} {6}v5.22{10};{0}			{2}# may be needed
+{0}
+{2}#--------------------------------------------------------------------------
+# New bitwise operators
+#--------------------------------------------------------------------------
+{0}
+{5}use{0} {11}feature{0} {7}'bitwise'{0}		{2}# enable feature, warning enabled
+{5}use{0} {11}experimental{0} {6}"bitwise"{10};{0}	{2}# enable feature, warning disabled
+{0}
+{2}# numerical operands
+{4}10{10}&{4}20{0}  {4}10{10}|{4}20{0}   {4}10{10}^{4}20{0} {10}~{4}10{0}
+{12}$a{10}&{6}"8"{0} {12}$a{10}|{6}"8"{0} {12}$a{10}^{6}"8"{0} {10}~{12}$a{0} {10}~{6}"8"{0}
+
+{2}# string operands
+{7}'0'{10}&.{6}"8"{0} {7}'0'{10}|.{6}"8"{0} {7}'0'{10}^.{6}"8"{0} {10}~.{7}'0'{0} {10}~.{6}"8"{0}
+{2}# the following is AMBIGUOUS, perl sees 10 and not .10 only when bitwise feature is enabled
+# so it's feature-setting-dependent, no plans to change current behaviour
+{0} {12}$a{10}&{4}.10{0}   {12}$a{10}|{4}.10{0}   {12}$a{10}^{4}.10{0}  {10}~.{12}$a{0}  {10}~{4}.10{0}
+
+{2}# assignment variants
+{12}$a{10}&={4}10{10};{0}    {12}$a{10}|={4}10{10};{0}    {12}$a{10}^={4}10{10};{0}
+{12}$b{10}&.={7}'20'{10};{0} {12}$b{10}|.={7}'20'{10};{0} {12}$b{10}^.={7}'20'{10};{0}
+{12}$c{10}&={6}"30"{10};{0}  {12}$c{10}|={6}"30"{10};{0}  {12}$c{10}^={6}"30"{10};{0}
+{12}$d{10}&.={12}$e{10};{0}   {12}$d{10}|.={12}$e{10};{0}   {12}$d{10}^.={12}$e{10};{0}
+
+{2}#--------------------------------------------------------------------------
+# New double-diamond operator
+#--------------------------------------------------------------------------
+# <<>> is like <> but each element of @ARGV will be treated as an actual file name
+{0}
+{2}# example snippet from brian d foy's blog post
+{5}while{10}({0} {10}<<>>{0} {10}){0} {10}{{0}  {2}# new, safe line input operator
+{0}	{10}...;{0}
+	{10}}{0}
+
+{2}#--------------------------------------------------------------------------
+# New \b boundaries in regular expressions
+#--------------------------------------------------------------------------
+{0}
+{29}qr/\b{gcb}/{0}
+{29}qr/\b{wb}/{0}
+{29}qr/\b{sb}/{0}
+
+{2}#--------------------------------------------------------------------------
+# Non-Capturing Regular Expression Flag
+#--------------------------------------------------------------------------
+# disables capturing and filling in $1, $2, etc
+{0}
+{6}"hello"{0} {10}=~{0} {17}/(hi|hello)/n{10};{0} {2}# $1 is not set
+{0}
+{2}#--------------------------------------------------------------------------
+# Aliasing via reference
+#--------------------------------------------------------------------------
+# Variables and subroutines can now be aliased by assigning to a reference
+{0}
+{10}\{12}$c{0} {10}={0} {10}\{12}$d{10};{0}
+{10}\&{11}x{0} {10}={0} {10}\&{11}y{10};{0}
+
+{2}# Aliasing can also be applied to foreach iterator variables
+{0}
+{5}foreach{0} {10}\{14}%hash{0} {10}({13}@array_of_hash_refs{10}){0} {10}{{0} {10}...{0} {10}}{0}
+
+{2}# example snippet from brian d foy's blog post
+{0}
+{5}use{0} {11}feature{0} {30}qw(refaliasing){10};{0}
+
+{10}\{14}%other_hash{0} {10}={0} {10}\{14}%hash{10};{0}
+
+{5}use{0} {6}v5.22{10};{0}
+{5}use{0} {11}feature{0} {30}qw(refaliasing){10};{0}
+
+{5}foreach{0} {10}\{5}my{0} {14}%hash{0} {10}({0} {13}@array_of_hashes{0} {10}){0} {10}{{0} {2}# named hash control variable
+{0}	{5}foreach{0} {5}my{0} {12}$key{0} {10}({0} {5}keys{0} {14}%hash{0} {10}){0} {10}{{0} {2}# named hash now!
+{0}		{10}...;{0}
+		{10}}{0}
+	{10}}{0}
+
+{2}#--------------------------------------------------------------------------
+# New :const subroutine attribute
+#--------------------------------------------------------------------------
+{0}
+{5}my{0} {12}$x{0} {10}={0} {4}54321{10};{0}
+{15}*INLINED{0} {10}={0} {5}sub{0} {10}:{0} {11}const{0} {10}{{0} {12}$x{0} {10}};{0}
+{12}$x{10}++;{0}
+
+{2}# more examples of attributes
+# (not 5.22 stuff, but some general examples for study, useful for
+#  handling subroutine signature and subroutine prototype highlighting)
+{0}
+{5}sub{0} {11}foo{0} {10}:{0} {11}lvalue{0} {10};{0}
+
+{5}package{0} {11}X{10};{0}
+{5}sub{0} {11}Y{10}::{11}x{0} {10}:{0} {11}lvalue{0} {10}{{0} {4}1{0} {10}}{0}
+
+{5}package{0} {11}X{10};{0}
+{5}sub{0} {11}foo{0} {10}{{0} {4}1{0} {10}}{0}
+{5}package{0} {11}Y{10};{0}
+{5}BEGIN{0} {10}{{0} {15}*bar{0} {10}={0} {10}\&{11}X{10}::{11}foo{10};{0} {10}}{0}
+{5}package{0} {11}Z{10};{0}
+{5}sub{0} {11}Y{10}::{11}bar{0} {10}:{0} {11}lvalue{0} {10};{0}
+
+{2}# built-in attributes for subroutines:
+{11}lvalue{0} {11}method{0} {5}prototype{10}(..){0} {11}locked{0} {11}const{0}
+
+{2}#--------------------------------------------------------------------------
+# Repetition in list assignment
+#--------------------------------------------------------------------------
+{0}
+{2}# example snippet from brian d foy's blog post
+{5}use{0} {6}v5.22{10};{0}
+{5}my{10}({5}undef{10},{0} {12}$card_num{10},{0} {10}({5}undef{10})x{4}3{10},{0} {12}$count{10}){0} {10}={0} {5}split{0} {17}/:/{10};{0}
+
+{10}({5}undef{10},{5}undef{10},{12}$foo{10}){0} {10}={0} {11}that_function{10}(){0}
+{2}# is equivalent to 
+{10}(({5}undef{10})x{4}2{10},{0} {12}$foo{10}){0} {10}={0} {11}that_function{10}(){0}
+
+{2}#--------------------------------------------------------------------------
+# Floating point parsing has been improved
+#--------------------------------------------------------------------------
+# Hexadecimal floating point literals
+{0}
+{2}# some hex floats from a program by Rick Regan
+# appropriated and extended from Lua 5.2.x test cases
+# tested on perl 5.22/cygwin
+{0}
+{4}0x1p-1074{10};{0}
+{4}0x3.3333333333334p-5{10};{0}
+{4}0xcc.ccccccccccdp-11{10};{0}
+{4}0x1p+1{10};{0}
+{4}0x1p-6{10};{0}
+{4}0x1.b7p-1{10};{0}
+{4}0x1.fffffffffffffp+1023{10};{0}
+{4}0x1p-1022{10};{0}
+{4}0X1.921FB4D12D84AP+1{10};{0}
+{4}0x1.999999999999ap-4{10};{0}
+
+{2}# additional test cases for characterization
+{4}0x1p-1074{10}.{0}		{2}# dot is a string operator
+{4}0x.ABCDEFp10{0}		{2}# legal, dot immediately after 0x
+{4}0x{10}.{11}p10{0}			{2}# perl allows 0x as a zero, then concat with p10 bareword
+{4}0x{10}.{11}p{0} {4}0x0{10}.{11}p{0}		{2}# dot then bareword
+{4}0x_0_.A_BC___DEF_p1_0{0}	{2}# legal hex float, underscores are mostly allowed
+{4}0x0{10}.{11}_ABCDEFp10{0}		{2}# _ABCDEFp10 is a bareword, no underscore allowed after dot
+{0}
+{2}# illegal, but does not use error highlighting
+{4}0x0p1{11}ABC{0}		{2}# illegal, highlighted as 0x0p1 abut with bareword ABC 
+{0}
+{2}# allowed to FAIL for now
+{4}0x0.ABCDEFp_10{0}		{2}# ABCDEFp_10 is a bareword, '_10' exponent not allowed
+{4}0xp{0} {4}0xp1{0} {4}0x0.0p{0}		{2}# syntax errors
+{4}0x41.65{10}.{4}65{0} 		{2}# hex dot number, but lexer now fails with 0x41.65 left as a partial hex float
+{0}
+{2}#--------------------------------------------------------------------------
+# Support for ?PATTERN? without explicit operator has been removed
+#--------------------------------------------------------------------------
+# ?PATTERN? must now be written as m?PATTERN?
+{0}
+{10}?{11}PATTERN{10}?{0}	{2}# does not work in current LexPerl anyway, NO ACTION NEEDED
+{17}m?PATTERN?{0}
+
+{2}#--------------------------------------------------------------------------
+# end of test file
+#--------------------------------------------------------------------------
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl
new file mode 100644
index 0000000..9cfb488
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl
@@ -0,0 +1,239 @@
+# -*- coding: utf-8 -*-
+#--------------------------------------------------------------------------
+# perl-test-sub-prototypes.pl
+#--------------------------------------------------------------------------
+# compiled all relevant subroutine prototype test cases
+#
+#--------------------------------------------------------------------------
+# Kein-Hong Man <keinhong@gmail.com> Public Domain
+#--------------------------------------------------------------------------
+# 20151227	initial document
+#--------------------------------------------------------------------------
+
+#--------------------------------------------------------------------------
+# test cases for sub syntax scanner
+#--------------------------------------------------------------------------
+# sub syntax: simple and with added module notation
+#--------------------------------------------------------------------------
+
+sub fish($) { 123; }
+sub fish::chips($) { 123; }			# module syntax
+sub fish::chips::sauce($) { 123; }		# multiple module syntax
+
+sub fish :: chips  ::		sauce ($) { 123; }	# added whitespace
+
+sub fish :: # embedded comment
+chips 	# embedded comment
+ :: sauce ($) { 123; }
+
+sub fish :: ($) { 123; }	# incomplete or bad syntax examples
+sub fish :: 123 ($) { 123; }
+sub fish :: chips 123 ($) { 123; }
+sub 123 ($) { 123; }
+
+#--------------------------------------------------------------------------
+# sub syntax: prototype attributes
+#--------------------------------------------------------------------------
+
+sub fish:prototype($) { 123; }
+sub fish : prototype	($) { 123; }		# added whitespace
+
+sub fish:salted($) { 123; }	# wrong attribute example (must use 'prototype')
+sub fish :  123($) { 123; }	# illegal attribute
+sub fish:prototype:salted($) { 123; }	# wrong 'prototype' position
+sub fish:salted salt:prototype($) { 123; }	# wrong attribute syntax
+
+sub fish:const:prototype($) { 123; }		# extra attributes
+sub fish:const:lvalue:prototype($) { 123; }
+sub fish:const:prototype($):lvalue{ 123; }	# might be legal too
+sub fish  :const	:prototype($) { 123; }	# extra whitespace
+
+sub fish  :const	# embedded comment: a constant sub
+:prototype		# embedded comment
+($) { 123; }
+
+#--------------------------------------------------------------------------
+# sub syntax: mixed
+#--------------------------------------------------------------------------
+
+sub fish::chips:prototype($) { 123; }
+sub fish::chips::sauce:prototype($) { 123; }
+sub fish  ::chips  ::sauce	:prototype($) { 123; }	# +whitespace
+
+sub fish::chips::sauce:const:prototype($) { 123; }
+sub fish::chips::sauce	:const	:prototype($) { 123; }	# +whitespace
+
+sub fish		# embedded comment
+::chips	::sauce		# embedded comment
+  : const		# embedded comment
+	: prototype ($) { 123; }
+
+# wrong syntax examples, parentheses must follow ':prototype'
+sub fish :prototype :const ($) { 123;}
+sub fish :prototype ::chips ($) { 123;}
+
+#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# More consistent prototype parsing
+#--------------------------------------------------------------------------
+# - whitespace now allowed, lexer now allows spaces or tabs
+
+sub foo ( $ $ ) {}
+sub foo ( 			 ) {}		# spaces/tabs empty
+sub foo (  *  ) {}
+sub foo (@	) {}
+sub foo (	%) {}
+
+# untested, should probably be \[ but scanner does not check this for now
+sub foo ( \ [ $ @ % & * ] ) {}
+
+#--------------------------------------------------------------------------
+# perl-test-5140delta.pl
+#--------------------------------------------------------------------------
+# new + prototype character, acts like (\[@%])
+#--------------------------------------------------------------------------
+
+# these samples work as before
+sub mylink ($$)          # mylink $old, $new
+sub myvec ($$$)          # myvec $var, $offset, 1
+sub myindex ($$;$)       # myindex &getstring, "substr"
+sub mysyswrite ($$$;$)   # mysyswrite $buf, 0, length($buf) - $off, $off
+sub myreverse (@)        # myreverse $a, $b, $c
+sub myjoin ($@)          # myjoin ":", $a, $b, $c
+sub myopen (*;$)         # myopen HANDLE, $name
+sub mypipe (**)          # mypipe READHANDLE, WRITEHANDLE
+sub mygrep (&@)          # mygrep { /foo/ } $a, $b, $c
+sub myrand (;$)          # myrand 42
+sub mytime ()            # mytime
+
+# backslash group notation to specify more than one allowed argument type
+sub myref (\[$@%&*]) {}
+
+sub mysub (_)            # underscore can be optionally used FIXED 20151211
+
+# these uses the new '+' prototype character
+sub mypop (+)            # mypop @array
+sub mysplice (+$$@)      # mysplice @array, 0, 2, @pushme
+sub mykeys (+)           # mykeys %{$hashref}
+
+#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# Experimental Subroutine signatures (mostly works)
+#--------------------------------------------------------------------------
+# INCLUDED FOR COMPLETENESS ONLY
+# IMPORTANT NOTE the subroutine prototypes lexing implementation has
+# no effect on subroutine signature syntax highlighting
+
+# subroutine signatures mostly looks fine except for the @ and % slurpy
+# notation which are highlighted as operators (all other parameters are
+# highlighted as vars of some sort), a minor aesthetic issue
+
+use feature 'signatures';
+
+sub foo ($left, $right) {		# mandatory positional parameters
+    return $left + $right;
+}
+sub foo ($first, $, $third) {		# ignore second argument
+    return "first=$first, third=$third";
+}
+sub foo ($left, $right = 0) {		# optional parameter with default value
+    return $left + $right;
+}
+my $auto_id = 0;			# default value expression, evaluated if default used only
+sub foo ($thing, $id = $auto_id++) {
+    print "$thing has ID $id";
+}
+sub foo ($first_name, $surname, $nickname = $first_name) {	# 3rd parm may depend on 1st parm
+    print "$first_name $surname is known as \"$nickname\"";
+}
+sub foo ($thing, $ = 1) {		# nameless default parameter
+    print $thing;
+}
+sub foo ($thing, $=) {			# (this does something, I'm not sure what...)
+    print $thing;
+}
+sub foo ($filter, @inputs) {		# additional arguments (slurpy parameter)
+    print $filter->($_) foreach @inputs;
+}
+sub foo ($thing, @) {			# nameless slurpy parameter FAILS for now
+    print $thing;
+}
+sub foo ($filter, %inputs) {		# slurpy parameter, hash type
+    print $filter->($_, $inputs{$_}) foreach sort keys %inputs;
+}
+sub foo ($thing, %) {			# nameless slurpy parm, hash type FAILS for now
+    print $thing;
+}
+sub foo () {				# empty signature no arguments (styled as prototype)
+    return 123;
+}
+
+#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# subs now take a prototype attribute
+#--------------------------------------------------------------------------
+
+sub foo :prototype($) { $_[0] }
+
+sub foo :prototype($$) ($left, $right) {
+    return $left + $right;
+}
+
+sub foo : prototype($$){}		# whitespace allowed
+
+# additional samples from perl-test-cases.pl with ':prototype' added:
+sub mylink :prototype($$) {}		sub myvec :prototype($$$) {}
+sub myindex :prototype($$;$) {}		sub mysyswrite :prototype($$$;$) {}
+sub myreverse :prototype(@) {}		sub myjoin :prototype($@) {}
+sub mypop :prototype(\@) {}		sub mysplice :prototype(\@$$@) {}
+sub mykeys :prototype(\%) {}		sub myopen :prototype(*;$) {}
+sub mypipe :prototype(**) {}		sub mygrep :prototype(&@) {}
+sub myrand :prototype($) {}		sub mytime :prototype() {}
+# backslash group notation to specify more than one allowed argument type
+sub myref :prototype(\[$@%&*]) {}
+
+# additional attributes may complicate scanning for prototype syntax,
+# for example (from https://metacpan.org/pod/perlsub):
+# Lvalue subroutines
+
+my $val;
+sub canmod : lvalue {
+    $val;  # or:  return $val;
+}
+canmod() = 5;   # assigns to $val
+
+#--------------------------------------------------------------------------
+# perl-test-5220delta.pl
+#--------------------------------------------------------------------------
+# New :const subroutine attribute
+#--------------------------------------------------------------------------
+
+my $x = 54321;
+*INLINED = sub : const { $x };
+$x++;
+
+# more examples of attributes
+# (not 5.22 stuff, but some general examples for study, useful for
+#  handling subroutine signature and subroutine prototype highlighting)
+
+sub foo : lvalue ;
+
+package X;
+sub Y::z : lvalue { 1 }
+
+package X;
+sub foo { 1 }
+package Y;
+BEGIN { *bar = \&X::foo; }
+package Z;
+sub Y::bar : lvalue ;
+
+# built-in attributes for subroutines:
+lvalue method prototype(..) locked const
+
+#--------------------------------------------------------------------------
+# end of test file
+#--------------------------------------------------------------------------
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.folded b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.folded
new file mode 100644
index 0000000..aae301a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.folded
@@ -0,0 +1,240 @@
+ 2 400 401 + # -*- coding: utf-8 -*-
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-sub-prototypes.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # compiled all relevant subroutine prototype test cases
+ 0 401 401 | #
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # Kein-Hong Man <keinhong@gmail.com> Public Domain
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # 20151227	initial document
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # test cases for sub syntax scanner
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # sub syntax: simple and with added module notation
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   sub fish($) { 123; }
+ 0 400 400   sub fish::chips($) { 123; }			# module syntax
+ 0 400 400   sub fish::chips::sauce($) { 123; }		# multiple module syntax
+ 1 400 400   
+ 0 400 400   sub fish :: chips  ::		sauce ($) { 123; }	# added whitespace
+ 1 400 400   
+ 0 400 400   sub fish :: # embedded comment
+ 0 400 400   chips 	# embedded comment
+ 0 400 400    :: sauce ($) { 123; }
+ 1 400 400   
+ 0 400 400   sub fish :: ($) { 123; }	# incomplete or bad syntax examples
+ 0 400 400   sub fish :: 123 ($) { 123; }
+ 0 400 400   sub fish :: chips 123 ($) { 123; }
+ 0 400 400   sub 123 ($) { 123; }
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # sub syntax: prototype attributes
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   sub fish:prototype($) { 123; }
+ 0 400 400   sub fish : prototype	($) { 123; }		# added whitespace
+ 1 400 400   
+ 0 400 400   sub fish:salted($) { 123; }	# wrong attribute example (must use 'prototype')
+ 0 400 400   sub fish :  123($) { 123; }	# illegal attribute
+ 0 400 400   sub fish:prototype:salted($) { 123; }	# wrong 'prototype' position
+ 0 400 400   sub fish:salted salt:prototype($) { 123; }	# wrong attribute syntax
+ 1 400 400   
+ 0 400 400   sub fish:const:prototype($) { 123; }		# extra attributes
+ 0 400 400   sub fish:const:lvalue:prototype($) { 123; }
+ 0 400 400   sub fish:const:prototype($):lvalue{ 123; }	# might be legal too
+ 0 400 400   sub fish  :const	:prototype($) { 123; }	# extra whitespace
+ 1 400 400   
+ 0 400 400   sub fish  :const	# embedded comment: a constant sub
+ 0 400 400   :prototype		# embedded comment
+ 0 400 400   ($) { 123; }
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # sub syntax: mixed
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   sub fish::chips:prototype($) { 123; }
+ 0 400 400   sub fish::chips::sauce:prototype($) { 123; }
+ 0 400 400   sub fish  ::chips  ::sauce	:prototype($) { 123; }	# +whitespace
+ 1 400 400   
+ 0 400 400   sub fish::chips::sauce:const:prototype($) { 123; }
+ 0 400 400   sub fish::chips::sauce	:const	:prototype($) { 123; }	# +whitespace
+ 1 400 400   
+ 0 400 400   sub fish		# embedded comment
+ 0 400 400   ::chips	::sauce		# embedded comment
+ 0 400 400     : const		# embedded comment
+ 0 400 400   	: prototype ($) { 123; }
+ 1 400 400   
+ 0 400 400   # wrong syntax examples, parentheses must follow ':prototype'
+ 0 400 400   sub fish :prototype :const ($) { 123;}
+ 0 400 400   sub fish :prototype ::chips ($) { 123;}
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5200delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # More consistent prototype parsing
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 400 | # - whitespace now allowed, lexer now allows spaces or tabs
+ 1 400 400   
+ 0 400 400   sub foo ( $ $ ) {}
+ 0 400 400   sub foo ( 			 ) {}		# spaces/tabs empty
+ 0 400 400   sub foo (  *  ) {}
+ 0 400 400   sub foo (@	) {}
+ 0 400 400   sub foo (	%) {}
+ 1 400 400   
+ 0 400 400   # untested, should probably be \[ but scanner does not check this for now
+ 0 400 400   sub foo ( \ [ $ @ % & * ] ) {}
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5140delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # new + prototype character, acts like (\[@%])
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   # these samples work as before
+ 0 400 400   sub mylink ($$)          # mylink $old, $new
+ 0 400 400   sub myvec ($$$)          # myvec $var, $offset, 1
+ 0 400 400   sub myindex ($$;$)       # myindex &getstring, "substr"
+ 0 400 400   sub mysyswrite ($$$;$)   # mysyswrite $buf, 0, length($buf) - $off, $off
+ 0 400 400   sub myreverse (@)        # myreverse $a, $b, $c
+ 0 400 400   sub myjoin ($@)          # myjoin ":", $a, $b, $c
+ 0 400 400   sub myopen (*;$)         # myopen HANDLE, $name
+ 0 400 400   sub mypipe (**)          # mypipe READHANDLE, WRITEHANDLE
+ 0 400 400   sub mygrep (&@)          # mygrep { /foo/ } $a, $b, $c
+ 0 400 400   sub myrand (;$)          # myrand 42
+ 0 400 400   sub mytime ()            # mytime
+ 1 400 400   
+ 0 400 400   # backslash group notation to specify more than one allowed argument type
+ 0 400 400   sub myref (\[$@%&*]) {}
+ 1 400 400   
+ 0 400 400   sub mysub (_)            # underscore can be optionally used FIXED 20151211
+ 1 400 400   
+ 0 400 400   # these uses the new '+' prototype character
+ 0 400 400   sub mypop (+)            # mypop @array
+ 0 400 400   sub mysplice (+$$@)      # mysplice @array, 0, 2, @pushme
+ 0 400 400   sub mykeys (+)           # mykeys %{$hashref}
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5200delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # Experimental Subroutine signatures (mostly works)
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # INCLUDED FOR COMPLETENESS ONLY
+ 0 401 401 | # IMPORTANT NOTE the subroutine prototypes lexing implementation has
+ 0 401 400 | # no effect on subroutine signature syntax highlighting
+ 1 400 400   
+ 2 400 401 + # subroutine signatures mostly looks fine except for the @ and % slurpy
+ 0 401 401 | # notation which are highlighted as operators (all other parameters are
+ 0 401 400 | # highlighted as vars of some sort), a minor aesthetic issue
+ 1 400 400   
+ 0 400 400   use feature 'signatures';
+ 1 400 400   
+ 2 400 401 + sub foo ($left, $right) {		# mandatory positional parameters
+ 0 401 401 |     return $left + $right;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($first, $, $third) {		# ignore second argument
+ 0 401 401 |     return "first=$first, third=$third";
+ 0 401 400 | }
+ 2 400 401 + sub foo ($left, $right = 0) {		# optional parameter with default value
+ 0 401 401 |     return $left + $right;
+ 0 401 400 | }
+ 0 400 400   my $auto_id = 0;			# default value expression, evaluated if default used only
+ 2 400 401 + sub foo ($thing, $id = $auto_id++) {
+ 0 401 401 |     print "$thing has ID $id";
+ 0 401 400 | }
+ 2 400 401 + sub foo ($first_name, $surname, $nickname = $first_name) {	# 3rd parm may depend on 1st parm
+ 0 401 401 |     print "$first_name $surname is known as \"$nickname\"";
+ 0 401 400 | }
+ 2 400 401 + sub foo ($thing, $ = 1) {		# nameless default parameter
+ 0 401 401 |     print $thing;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($thing, $=) {			# (this does something, I'm not sure what...)
+ 0 401 401 |     print $thing;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($filter, @inputs) {		# additional arguments (slurpy parameter)
+ 0 401 401 |     print $filter->($_) foreach @inputs;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($thing, @) {			# nameless slurpy parameter FAILS for now
+ 0 401 401 |     print $thing;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($filter, %inputs) {		# slurpy parameter, hash type
+ 0 401 401 |     print $filter->($_, $inputs{$_}) foreach sort keys %inputs;
+ 0 401 400 | }
+ 2 400 401 + sub foo ($thing, %) {			# nameless slurpy parm, hash type FAILS for now
+ 0 401 401 |     print $thing;
+ 0 401 400 | }
+ 2 400 401 + sub foo () {				# empty signature no arguments (styled as prototype)
+ 0 401 401 |     return 123;
+ 0 401 400 | }
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5200delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # subs now take a prototype attribute
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   sub foo :prototype($) { $_[0] }
+ 1 400 400   
+ 2 400 401 + sub foo :prototype($$) ($left, $right) {
+ 0 401 401 |     return $left + $right;
+ 0 401 400 | }
+ 1 400 400   
+ 0 400 400   sub foo : prototype($$){}		# whitespace allowed
+ 1 400 400   
+ 0 400 400   # additional samples from perl-test-cases.pl with ':prototype' added:
+ 0 400 400   sub mylink :prototype($$) {}		sub myvec :prototype($$$) {}
+ 0 400 400   sub myindex :prototype($$;$) {}		sub mysyswrite :prototype($$$;$) {}
+ 0 400 400   sub myreverse :prototype(@) {}		sub myjoin :prototype($@) {}
+ 0 400 400   sub mypop :prototype(\@) {}		sub mysplice :prototype(\@$$@) {}
+ 0 400 400   sub mykeys :prototype(\%) {}		sub myopen :prototype(*;$) {}
+ 0 400 400   sub mypipe :prototype(**) {}		sub mygrep :prototype(&@) {}
+ 0 400 400   sub myrand :prototype($) {}		sub mytime :prototype() {}
+ 0 400 400   # backslash group notation to specify more than one allowed argument type
+ 0 400 400   sub myref :prototype(\[$@%&*]) {}
+ 1 400 400   
+ 2 400 401 + # additional attributes may complicate scanning for prototype syntax,
+ 0 401 401 | # for example (from https://metacpan.org/pod/perlsub):
+ 0 401 400 | # Lvalue subroutines
+ 1 400 400   
+ 0 400 400   my $val;
+ 2 400 401 + sub canmod : lvalue {
+ 0 401 401 |     $val;  # or:  return $val;
+ 0 401 400 | }
+ 0 400 400   canmod() = 5;   # assigns to $val
+ 1 400 400   
+ 2 400 401 + #--------------------------------------------------------------------------
+ 0 401 401 | # perl-test-5220delta.pl
+ 0 401 401 | #--------------------------------------------------------------------------
+ 0 401 401 | # New :const subroutine attribute
+ 0 401 400 | #--------------------------------------------------------------------------
+ 1 400 400   
+ 0 400 400   my $x = 54321;
+ 0 400 400   *INLINED = sub : const { $x };
+ 0 400 400   $x++;
+ 1 400 400   
+ 2 400 401 + # more examples of attributes
+ 0 401 401 | # (not 5.22 stuff, but some general examples for study, useful for
+ 0 401 400 | #  handling subroutine signature and subroutine prototype highlighting)
+ 1 400 400   
+ 0 400 400   sub foo : lvalue ;
+ 1 400 400   
+ 2 400 401 + package X;
+ 0 401 401 | sub Y::z : lvalue { 1 }
+ 1 401 401 | 
+ 2 400 401 + package X;
+ 0 401 401 | sub foo { 1 }
+ 2 400 401 + package Y;
+ 0 401 401 | BEGIN { *bar = \&X::foo; }
+ 2 400 401 + package Z;
+ 0 401 401 | sub Y::bar : lvalue ;
+ 1 401 401 | 
+ 0 401 401 | # built-in attributes for subroutines:
+ 0 401 401 | lvalue method prototype(..) locked const
+ 1 401 401 | 
+ 2 401 402 + #--------------------------------------------------------------------------
+ 0 402 402 | # end of test file
+ 0 402 401 | #--------------------------------------------------------------------------
+ 0 401   0 | 
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.styled b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.styled
new file mode 100644
index 0000000..e729080
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/perl-test-sub-prototypes.pl.styled
@@ -0,0 +1,239 @@
+{2}# -*- coding: utf-8 -*-
+#--------------------------------------------------------------------------
+# perl-test-sub-prototypes.pl
+#--------------------------------------------------------------------------
+# compiled all relevant subroutine prototype test cases
+#
+#--------------------------------------------------------------------------
+# Kein-Hong Man <keinhong@gmail.com> Public Domain
+#--------------------------------------------------------------------------
+# 20151227	initial document
+#--------------------------------------------------------------------------
+{0}
+{2}#--------------------------------------------------------------------------
+# test cases for sub syntax scanner
+#--------------------------------------------------------------------------
+# sub syntax: simple and with added module notation
+#--------------------------------------------------------------------------
+{0}
+{5}sub{0} {11}fish{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{10}::{11}chips{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}			{2}# module syntax
+{5}sub{0} {11}fish{10}::{11}chips{10}::{11}sauce{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}		{2}# multiple module syntax
+{0}
+{5}sub{0} {11}fish{0} {10}::{0} {11}chips{0}  {10}::{0}		{11}sauce{0} {40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# added whitespace
+{0}
+{5}sub{0} {11}fish{0} {10}::{0} {2}# embedded comment
+{11}chips{0} 	{2}# embedded comment
+{0} {10}::{0} {11}sauce{0} {40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+
+{5}sub{0} {11}fish{0} {10}::{0} {10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# incomplete or bad syntax examples
+{5}sub{0} {11}fish{0} {10}::{0} {4}123{0} {10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{0} {10}::{0} {11}chips{0} {4}123{0} {10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {4}123{0} {10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}
+
+{2}#--------------------------------------------------------------------------
+# sub syntax: prototype attributes
+#--------------------------------------------------------------------------
+{0}
+{5}sub{0} {11}fish{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{0} {10}:{0} {5}prototype{0}	{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}		{2}# added whitespace
+{0}
+{5}sub{0} {11}fish{10}:{11}salted{10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# wrong attribute example (must use 'prototype')
+{5}sub{0} {11}fish{0} {10}:{0}  {4}123{10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# illegal attribute
+{5}sub{0} {11}fish{10}:{5}prototype{10}:{11}salted{10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# wrong 'prototype' position
+{5}sub{0} {11}fish{10}:{11}salted{0} {11}salt{10}:{5}prototype{10}({12}$){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# wrong attribute syntax
+{0}
+{5}sub{0} {11}fish{10}:{11}const{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}		{2}# extra attributes
+{5}sub{0} {11}fish{10}:{11}const{10}:{11}lvalue{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{10}:{11}const{10}:{5}prototype{40}($){10}:{11}lvalue{10}{{0} {4}123{10};{0} {10}}{0}	{2}# might be legal too
+{5}sub{0} {11}fish{0}  {10}:{11}const{0}	{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# extra whitespace
+{0}
+{5}sub{0} {11}fish{0}  {10}:{11}const{0}	{2}# embedded comment: a constant sub
+{10}:{5}prototype{0}		{2}# embedded comment
+{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+
+{2}#--------------------------------------------------------------------------
+# sub syntax: mixed
+#--------------------------------------------------------------------------
+{0}
+{5}sub{0} {11}fish{10}::{11}chips{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{10}::{11}chips{10}::{11}sauce{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{0}  {10}::{11}chips{0}  {10}::{11}sauce{0}	{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# +whitespace
+{0}
+{5}sub{0} {11}fish{10}::{11}chips{10}::{11}sauce{10}:{11}const{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+{5}sub{0} {11}fish{10}::{11}chips{10}::{11}sauce{0}	{10}:{11}const{0}	{10}:{5}prototype{40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}	{2}# +whitespace
+{0}
+{5}sub{0} {11}fish{0}		{2}# embedded comment
+{10}::{11}chips{0}	{10}::{11}sauce{0}		{2}# embedded comment
+{0}  {10}:{0} {11}const{0}		{2}# embedded comment
+{0}	{10}:{0} {5}prototype{0} {40}($){0} {10}{{0} {4}123{10};{0} {10}}{0}
+
+{2}# wrong syntax examples, parentheses must follow ':prototype'
+{5}sub{0} {11}fish{0} {10}:{5}prototype{0} {10}:{11}const{0} {10}({12}$){0} {10}{{0} {4}123{10};}{0}
+{5}sub{0} {11}fish{0} {10}:{5}prototype{0} {10}::{11}chips{0} {10}({12}$){0} {10}{{0} {4}123{10};}{0}
+
+{2}#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# More consistent prototype parsing
+#--------------------------------------------------------------------------
+# - whitespace now allowed, lexer now allows spaces or tabs
+{0}
+{5}sub{0} {11}foo{0} {40}( $ $ ){0} {10}{}{0}
+{5}sub{0} {11}foo{0} {40}( 			 ){0} {10}{}{0}		{2}# spaces/tabs empty
+{5}sub{0} {11}foo{0} {40}(  *  ){0} {10}{}{0}
+{5}sub{0} {11}foo{0} {40}(@	){0} {10}{}{0}
+{5}sub{0} {11}foo{0} {40}(	%){0} {10}{}{0}
+
+{2}# untested, should probably be \[ but scanner does not check this for now
+{5}sub{0} {11}foo{0} {40}( \ [ $ @ % & * ] ){0} {10}{}{0}
+
+{2}#--------------------------------------------------------------------------
+# perl-test-5140delta.pl
+#--------------------------------------------------------------------------
+# new + prototype character, acts like (\[@%])
+#--------------------------------------------------------------------------
+{0}
+{2}# these samples work as before
+{5}sub{0} {11}mylink{0} {40}($$){0}          {2}# mylink $old, $new
+{5}sub{0} {11}myvec{0} {40}($$$){0}          {2}# myvec $var, $offset, 1
+{5}sub{0} {11}myindex{0} {40}($$;$){0}       {2}# myindex &getstring, "substr"
+{5}sub{0} {11}mysyswrite{0} {40}($$$;$){0}   {2}# mysyswrite $buf, 0, length($buf) - $off, $off
+{5}sub{0} {11}myreverse{0} {40}(@){0}        {2}# myreverse $a, $b, $c
+{5}sub{0} {11}myjoin{0} {40}($@){0}          {2}# myjoin ":", $a, $b, $c
+{5}sub{0} {11}myopen{0} {40}(*;$){0}         {2}# myopen HANDLE, $name
+{5}sub{0} {11}mypipe{0} {40}(**){0}          {2}# mypipe READHANDLE, WRITEHANDLE
+{5}sub{0} {11}mygrep{0} {40}(&@){0}          {2}# mygrep { /foo/ } $a, $b, $c
+{5}sub{0} {11}myrand{0} {40}(;$){0}          {2}# myrand 42
+{5}sub{0} {11}mytime{0} {40}(){0}            {2}# mytime
+{0}
+{2}# backslash group notation to specify more than one allowed argument type
+{5}sub{0} {11}myref{0} {40}(\[$@%&*]){0} {10}{}{0}
+
+{5}sub{0} {11}mysub{0} {40}(_){0}            {2}# underscore can be optionally used FIXED 20151211
+{0}
+{2}# these uses the new '+' prototype character
+{5}sub{0} {11}mypop{0} {40}(+){0}            {2}# mypop @array
+{5}sub{0} {11}mysplice{0} {40}(+$$@){0}      {2}# mysplice @array, 0, 2, @pushme
+{5}sub{0} {11}mykeys{0} {40}(+){0}           {2}# mykeys %{$hashref}
+{0}
+{2}#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# Experimental Subroutine signatures (mostly works)
+#--------------------------------------------------------------------------
+# INCLUDED FOR COMPLETENESS ONLY
+# IMPORTANT NOTE the subroutine prototypes lexing implementation has
+# no effect on subroutine signature syntax highlighting
+{0}
+{2}# subroutine signatures mostly looks fine except for the @ and % slurpy
+# notation which are highlighted as operators (all other parameters are
+# highlighted as vars of some sort), a minor aesthetic issue
+{0}
+{5}use{0} {11}feature{0} {7}'signatures'{10};{0}
+
+{5}sub{0} {11}foo{0} {10}({12}$left{10},{0} {12}$right{10}){0} {10}{{0}		{2}# mandatory positional parameters
+{0}    {5}return{0} {12}$left{0} {10}+{0} {12}$right{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$first{10},{0} {12}$,{0} {12}$third{10}){0} {10}{{0}		{2}# ignore second argument
+{0}    {5}return{0} {6}"first={43}$first{6}, third={43}$third{6}"{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$left{10},{0} {12}$right{0} {10}={0} {4}0{10}){0} {10}{{0}		{2}# optional parameter with default value
+{0}    {5}return{0} {12}$left{0} {10}+{0} {12}$right{10};{0}
+{10}}{0}
+{5}my{0} {12}$auto_id{0} {10}={0} {4}0{10};{0}			{2}# default value expression, evaluated if default used only
+{5}sub{0} {11}foo{0} {10}({12}$thing{10},{0} {12}$id{0} {10}={0} {12}$auto_id{10}++){0} {10}{{0}
+    {5}print{0} {6}"{43}$thing{6} has ID {43}$id{6}"{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$first_name{10},{0} {12}$surname{10},{0} {12}$nickname{0} {10}={0} {12}$first_name{10}){0} {10}{{0}	{2}# 3rd parm may depend on 1st parm
+{0}    {5}print{0} {6}"{43}$first_name{6} {43}$surname{6} is known as \"{43}$nickname{6}\""{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$thing{10},{0} {12}${0} {10}={0} {4}1{10}){0} {10}{{0}		{2}# nameless default parameter
+{0}    {5}print{0} {12}$thing{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$thing{10},{0} {12}$={10}){0} {10}{{0}			{2}# (this does something, I'm not sure what...)
+{0}    {5}print{0} {12}$thing{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$filter{10},{0} {13}@inputs{10}){0} {10}{{0}		{2}# additional arguments (slurpy parameter)
+{0}    {5}print{0} {12}$filter{10}->({12}$_{10}){0} {5}foreach{0} {13}@inputs{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$thing{10},{0} {10}@){0} {10}{{0}			{2}# nameless slurpy parameter FAILS for now
+{0}    {5}print{0} {12}$thing{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$filter{10},{0} {14}%inputs{10}){0} {10}{{0}		{2}# slurpy parameter, hash type
+{0}    {5}print{0} {12}$filter{10}->({12}$_{10},{0} {12}$inputs{10}{{12}$_{10}}){0} {5}foreach{0} {5}sort{0} {5}keys{0} {14}%inputs{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {10}({12}$thing{10},{0} {10}%){0} {10}{{0}			{2}# nameless slurpy parm, hash type FAILS for now
+{0}    {5}print{0} {12}$thing{10};{0}
+{10}}{0}
+{5}sub{0} {11}foo{0} {40}(){0} {10}{{0}				{2}# empty signature no arguments (styled as prototype)
+{0}    {5}return{0} {4}123{10};{0}
+{10}}{0}
+
+{2}#--------------------------------------------------------------------------
+# perl-test-5200delta.pl
+#--------------------------------------------------------------------------
+# subs now take a prototype attribute
+#--------------------------------------------------------------------------
+{0}
+{5}sub{0} {11}foo{0} {10}:{5}prototype{40}($){0} {10}{{0} {12}$_{10}[{4}0{10}]{0} {10}}{0}
+
+{5}sub{0} {11}foo{0} {10}:{5}prototype{40}($$){0} {10}({12}$left{10},{0} {12}$right{10}){0} {10}{{0}
+    {5}return{0} {12}$left{0} {10}+{0} {12}$right{10};{0}
+{10}}{0}
+
+{5}sub{0} {11}foo{0} {10}:{0} {5}prototype{40}($$){10}{}{0}		{2}# whitespace allowed
+{0}
+{2}# additional samples from perl-test-cases.pl with ':prototype' added:
+{5}sub{0} {11}mylink{0} {10}:{5}prototype{40}($$){0} {10}{}{0}		{5}sub{0} {11}myvec{0} {10}:{5}prototype{40}($$$){0} {10}{}{0}
+{5}sub{0} {11}myindex{0} {10}:{5}prototype{40}($$;$){0} {10}{}{0}		{5}sub{0} {11}mysyswrite{0} {10}:{5}prototype{40}($$$;$){0} {10}{}{0}
+{5}sub{0} {11}myreverse{0} {10}:{5}prototype{40}(@){0} {10}{}{0}		{5}sub{0} {11}myjoin{0} {10}:{5}prototype{40}($@){0} {10}{}{0}
+{5}sub{0} {11}mypop{0} {10}:{5}prototype{40}(\@){0} {10}{}{0}		{5}sub{0} {11}mysplice{0} {10}:{5}prototype{40}(\@$$@){0} {10}{}{0}
+{5}sub{0} {11}mykeys{0} {10}:{5}prototype{40}(\%){0} {10}{}{0}		{5}sub{0} {11}myopen{0} {10}:{5}prototype{40}(*;$){0} {10}{}{0}
+{5}sub{0} {11}mypipe{0} {10}:{5}prototype{40}(**){0} {10}{}{0}		{5}sub{0} {11}mygrep{0} {10}:{5}prototype{40}(&@){0} {10}{}{0}
+{5}sub{0} {11}myrand{0} {10}:{5}prototype{40}($){0} {10}{}{0}		{5}sub{0} {11}mytime{0} {10}:{5}prototype{40}(){0} {10}{}{0}
+{2}# backslash group notation to specify more than one allowed argument type
+{5}sub{0} {11}myref{0} {10}:{5}prototype{40}(\[$@%&*]){0} {10}{}{0}
+
+{2}# additional attributes may complicate scanning for prototype syntax,
+# for example (from https://metacpan.org/pod/perlsub):
+# Lvalue subroutines
+{0}
+{5}my{0} {12}$val{10};{0}
+{5}sub{0} {11}canmod{0} {10}:{0} {11}lvalue{0} {10}{{0}
+    {12}$val{10};{0}  {2}# or:  return $val;
+{10}}{0}
+{11}canmod{10}(){0} {10}={0} {4}5{10};{0}   {2}# assigns to $val
+{0}
+{2}#--------------------------------------------------------------------------
+# perl-test-5220delta.pl
+#--------------------------------------------------------------------------
+# New :const subroutine attribute
+#--------------------------------------------------------------------------
+{0}
+{5}my{0} {12}$x{0} {10}={0} {4}54321{10};{0}
+{15}*INLINED{0} {10}={0} {5}sub{0} {10}:{0} {11}const{0} {10}{{0} {12}$x{0} {10}};{0}
+{12}$x{10}++;{0}
+
+{2}# more examples of attributes
+# (not 5.22 stuff, but some general examples for study, useful for
+#  handling subroutine signature and subroutine prototype highlighting)
+{0}
+{5}sub{0} {11}foo{0} {10}:{0} {11}lvalue{0} {10};{0}
+
+{5}package{0} {11}X{10};{0}
+{5}sub{0} {11}Y{10}::{11}z{0} {10}:{0} {11}lvalue{0} {10}{{0} {4}1{0} {10}}{0}
+
+{5}package{0} {11}X{10};{0}
+{5}sub{0} {11}foo{0} {10}{{0} {4}1{0} {10}}{0}
+{5}package{0} {11}Y{10};{0}
+{5}BEGIN{0} {10}{{0} {15}*bar{0} {10}={0} {10}\&{11}X{10}::{11}foo{10};{0} {10}}{0}
+{5}package{0} {11}Z{10};{0}
+{5}sub{0} {11}Y{10}::{11}bar{0} {10}:{0} {11}lvalue{0} {10};{0}
+
+{2}# built-in attributes for subroutines:
+{11}lvalue{0} {11}method{0} {5}prototype{10}(..){0} {11}locked{0} {11}const{0}
+
+{2}#--------------------------------------------------------------------------
+# end of test file
+#--------------------------------------------------------------------------
diff --git a/scite-app/lexilla/test/examples/perl/x.pl b/scite-app/lexilla/test/examples/perl/x.pl
new file mode 100644
index 0000000..19288f2
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/x.pl
@@ -0,0 +1,5 @@
+use strict;
+while ( $r ) {
+  printf ( "Example text \n" );
+  sleep 1;
+}
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/perl/x.pl.folded b/scite-app/lexilla/test/examples/perl/x.pl.folded
new file mode 100644
index 0000000..f05af0b
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/x.pl.folded
@@ -0,0 +1,5 @@
+ 0 400 400   use strict;
+ 2 400 401 + while ( $r ) {
+ 0 401 401 |   printf ( "Example text \n" );
+ 0 401 401 |   sleep 1;
+ 0 401   0 | }
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/perl/x.pl.styled b/scite-app/lexilla/test/examples/perl/x.pl.styled
new file mode 100644
index 0000000..74da4e9
--- /dev/null
+++ b/scite-app/lexilla/test/examples/perl/x.pl.styled
@@ -0,0 +1,5 @@
+{5}use{0} {11}strict{10};{0}
+{5}while{0} {10}({0} {12}$r{0} {10}){0} {10}{{0}
+  {5}printf{0} {10}({0} {6}"Example text \n"{0} {10});{0}
+  {5}sleep{0} {4}1{10};{0}
+{10}}
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/python/AllStyles.py b/scite-app/lexilla/test/examples/python/AllStyles.py
new file mode 100644
index 0000000..a93df75
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/AllStyles.py
@@ -0,0 +1,63 @@
+# Enumerate all styles: 0 to 19
+# comment=1
+
+# whitespace=0
+	# w
+
+# number=2
+37
+
+# double-quoted-string=3
+"str"
+
+# single-quoted-string=4
+'str'
+
+# keyword=5
+pass
+
+# triple-quoted-string=6
+'''str'''
+
+# triple-double-quoted-string=7
+"""str"""
+
+# class-name=8
+class ClassName:
+	pass
+
+# function-name=9
+def function_name():
+	pass
+
+# operator=10
+1 + 3
+
+# identifier=11
+identifier = 2
+
+# comment-block=12
+## block
+
+# unclosed-string=13
+" unclosed
+
+# highlighted-identifier=14
+hilight = 2
+
+# decorator=15
+@staticmethod
+def fn(): pass
+
+a = 1
+# double-quoted-f-string=16
+f"{a}"
+
+# single-quoted-f-string=17
+f'{a}'
+
+# triple-quoted-f-string=18
+f'''{a}'''
+
+# double-triple-quoted-f-string=19
+f"""{a}"""
diff --git a/scite-app/lexilla/test/examples/python/AllStyles.py.folded b/scite-app/lexilla/test/examples/python/AllStyles.py.folded
new file mode 100644
index 0000000..995ea78
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/AllStyles.py.folded
@@ -0,0 +1,64 @@
+ 0 400   0   # Enumerate all styles: 0 to 19
+ 0 400   0   # comment=1
+ 1 400   0   
+ 0 400   0   # whitespace=0
+ 0 400   0   	# w
+ 1 400   0   
+ 0 400   0   # number=2
+ 0 400   0   37
+ 1 400   0   
+ 0 400   0   # double-quoted-string=3
+ 0 400   0   "str"
+ 1 400   0   
+ 0 400   0   # single-quoted-string=4
+ 0 400   0   'str'
+ 1 400   0   
+ 0 400   0   # keyword=5
+ 0 400   0   pass
+ 1 400   0   
+ 0 400   0   # triple-quoted-string=6
+ 0 400   0   '''str'''
+ 1 400   0   
+ 0 400   0   # triple-double-quoted-string=7
+ 0 400   0   """str"""
+ 1 400   0   
+ 0 400   0   # class-name=8
+ 2 400   0 + class ClassName:
+ 0 408   0 | 	pass
+ 1 400   0   
+ 0 400   0   # function-name=9
+ 2 400   0 + def function_name():
+ 0 408   0 | 	pass
+ 1 400   0   
+ 0 400   0   # operator=10
+ 0 400   0   1 + 3
+ 1 400   0   
+ 0 400   0   # identifier=11
+ 0 400   0   identifier = 2
+ 1 400   0   
+ 0 400   0   # comment-block=12
+ 0 400   0   ## block
+ 1 400   0   
+ 0 400   0   # unclosed-string=13
+ 0 400   0   " unclosed
+ 1 400   0   
+ 0 400   0   # highlighted-identifier=14
+ 0 400   0   hilight = 2
+ 1 400   0   
+ 0 400   0   # decorator=15
+ 0 400   0   @staticmethod
+ 0 400   0   def fn(): pass
+ 1 400   0   
+ 0 400   0   a = 1
+ 0 400   0   # double-quoted-f-string=16
+ 0 400   0   f"{a}"
+ 1 400   0   
+ 0 400   0   # single-quoted-f-string=17
+ 0 400   0   f'{a}'
+ 1 400   0   
+ 0 400   0   # triple-quoted-f-string=18
+ 0 400   0   f'''{a}'''
+ 1 400   0   
+ 0 400   0   # double-triple-quoted-f-string=19
+ 0 400   0   f"""{a}"""
+ 1 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/python/AllStyles.py.styled b/scite-app/lexilla/test/examples/python/AllStyles.py.styled
new file mode 100644
index 0000000..e824e9e
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/AllStyles.py.styled
@@ -0,0 +1,63 @@
+{1}# Enumerate all styles: 0 to 19{0}
+{1}# comment=1{0}
+
+{1}# whitespace=0{0}
+	{1}# w{0}
+
+{1}# number=2{0}
+{2}37{0}
+
+{1}# double-quoted-string=3{0}
+{3}"str"{0}
+
+{1}# single-quoted-string=4{0}
+{4}'str'{0}
+
+{1}# keyword=5{0}
+{5}pass{0}
+
+{1}# triple-quoted-string=6{0}
+{6}'''str'''{0}
+
+{1}# triple-double-quoted-string=7{0}
+{7}"""str"""{0}
+
+{1}# class-name=8{0}
+{5}class{0} {8}ClassName{10}:{0}
+	{5}pass{0}
+
+{1}# function-name=9{0}
+{5}def{0} {9}function_name{10}():{0}
+	{5}pass{0}
+
+{1}# operator=10{0}
+{2}1{0} {10}+{0} {2}3{0}
+
+{1}# identifier=11{0}
+{11}identifier{0} {10}={0} {2}2{0}
+
+{1}# comment-block=12{0}
+{12}## block{0}
+
+{1}# unclosed-string=13{0}
+{13}" unclosed
+{0}
+{1}# highlighted-identifier=14{0}
+{14}hilight{0} {10}={0} {2}2{0}
+
+{1}# decorator=15{0}
+{15}@staticmethod{0}
+{5}def{0} {9}fn{10}():{0} {5}pass{0}
+
+{11}a{0} {10}={0} {2}1{0}
+{1}# double-quoted-f-string=16{0}
+{16}f"{{11}a{16}}"{0}
+
+{1}# single-quoted-f-string=17{0}
+{17}f'{{11}a{17}}'{0}
+
+{1}# triple-quoted-f-string=18{0}
+{18}f'''{{11}a{18}}'''{0}
+
+{1}# double-triple-quoted-f-string=19{0}
+{19}f"""{{11}a{19}}"""{0}
diff --git a/scite-app/lexilla/test/examples/python/SciTE.properties b/scite-app/lexilla/test/examples/python/SciTE.properties
new file mode 100644
index 0000000..3cd71b5
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/SciTE.properties
@@ -0,0 +1,5 @@
+lexer.*.py=python
+keywords.*.py=class def else for if import in pass print return while with yield
+keywords2.*.py=hilight
+fold=1
+fold.compact=1
diff --git a/scite-app/lexilla/test/examples/python/x.py b/scite-app/lexilla/test/examples/python/x.py
new file mode 100644
index 0000000..57833c0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/x.py
@@ -0,0 +1,19 @@
+# Convert all punctuation characters except '_', '*', and '.' into spaces.
+def depunctuate(s):
+	'''A docstring'''
+	"""Docstring 2"""
+	d = ""
+	for ch in s:
+		if ch in 'abcde':
+			d = d + ch
+		else:
+			d = d + " "
+	return d
+
+import contextlib
+
+@contextlib.contextmanager
+def singleuse():
+	print("Before")
+	yield
+with singleuse(): pass
diff --git a/scite-app/lexilla/test/examples/python/x.py.folded b/scite-app/lexilla/test/examples/python/x.py.folded
new file mode 100644
index 0000000..7e7dd46
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/x.py.folded
@@ -0,0 +1,20 @@
+ 0 400   0   # Convert all punctuation characters except '_', '*', and '.' into spaces.
+ 2 400   0 + def depunctuate(s):
+ 0 408   0 | 	'''A docstring'''
+ 0 408   0 | 	"""Docstring 2"""
+ 0 408   0 | 	d = ""
+ 2 408   0 + 	for ch in s:
+ 2 410   0 + 		if ch in 'abcde':
+ 0 418   0 | 			d = d + ch
+ 2 410   0 + 		else:
+ 0 418   0 | 			d = d + " "
+ 0 408   0 | 	return d
+ 1 400   0   
+ 0 400   0   import contextlib
+ 1 400   0   
+ 0 400   0   @contextlib.contextmanager
+ 2 400   0 + def singleuse():
+ 0 408   0 | 	print("Before")
+ 0 408   0 | 	yield
+ 0 400   0   with singleuse(): pass
+ 1 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/python/x.py.styled b/scite-app/lexilla/test/examples/python/x.py.styled
new file mode 100644
index 0000000..8ba7513
--- /dev/null
+++ b/scite-app/lexilla/test/examples/python/x.py.styled
@@ -0,0 +1,19 @@
+{1}# Convert all punctuation characters except '_', '*', and '.' into spaces.{0}
+{5}def{0} {9}depunctuate{10}({11}s{10}):{0}
+	{6}'''A docstring'''{0}
+	{7}"""Docstring 2"""{0}
+	{11}d{0} {10}={0} {3}""{0}
+	{5}for{0} {11}ch{0} {5}in{0} {11}s{10}:{0}
+		{5}if{0} {11}ch{0} {5}in{0} {4}'abcde'{10}:{0}
+			{11}d{0} {10}={0} {11}d{0} {10}+{0} {11}ch{0}
+		{5}else{10}:{0}
+			{11}d{0} {10}={0} {11}d{0} {10}+{0} {3}" "{0}
+	{5}return{0} {11}d{0}
+
+{5}import{0} {11}contextlib{0}
+
+{15}@contextlib{10}.{11}contextmanager{0}
+{5}def{0} {9}singleuse{10}():{0}
+	{5}print{10}({3}"Before"{10}){0}
+	{5}yield{0}
+{5}with{0} {11}singleuse{10}():{0} {5}pass{0}
diff --git a/scite-app/lexilla/test/examples/raku/SciTE.properties b/scite-app/lexilla/test/examples/raku/SciTE.properties
new file mode 100644
index 0000000..8e79ca2
--- /dev/null
+++ b/scite-app/lexilla/test/examples/raku/SciTE.properties
@@ -0,0 +1,114 @@
+lexer.*.p6=raku
+# Keywords (base)
+keywords.*.p6=BEGIN CATCH CHECK CONTROL END ENTER EVAL FIRST \
+ INIT KEEP LAST LEAVE NEXT POST PRE START TEMP UNDO after also andthen as \
+ async augment bag before but category circumfix class cmp complex constant \
+ contend default defer div does dynamic else elsif enum eq eqv extra fail \
+ fatal ff fff for gather gcd ge given grammar gt handles has if infix is lcm \
+ le leave leg let lift loop lt macro make maybe method mix mod module multi \
+ ne not o only oo or orelse orwith postcircumfix postfix prefix proto regex \
+ repeat require return-rw returns role rule size_t slang start str submethod \
+ subset supersede take temp term token trusts try unit unless until when \
+ where while with without x xor xx
+# Keywords (functions)
+keywords2.*.p6=ACCEPTS AT-KEY EVALFILE EXISTS-KEY Filetests \
+ IO STORE abs accept acos acosec acosech acosh acotan acotanh alarm and \
+ antipairs asec asech asin asinh atan atan2 atanh base bind binmode bless \
+ break caller ceiling chars chdir chmod chomp chop chr chroot chrs cis close \
+ closedir codes comb conj connect contains continue cos cosec cosech cosh \
+ cotan cotanh crypt dbm defined die do dump each elems eof exec exists exit \
+ exp expmod fc fcntl fileno flat flip flock floor fmt fork formats functions \
+ get getc getpeername getpgrp getppid getpriority getsock gist glob gmtime \
+ goto grep hyper import index int invert ioctl is-prime iterator join keyof \
+ keys kill kv last lazy lc lcfirst lines link list listen local localtime \
+ lock log log10 lsb lstat map match mkdir msb msg my narrow new next no of \
+ open ord ords our pack package pairs path pick pipe polymod pop pos pred \
+ print printf prototype push quoting race rand read readdir readline readlink \
+ readpipe recv redo ref rename requires reset return reverse rewinddir rindex \
+ rmdir roots round samecase say scalar sec sech seek seekdir select semctl \
+ semget semop send set setpgrp setpriority setsockopt shift shm shutdown sign \
+ sin sinh sleep sockets sort splice split sprintf sqrt srand stat state study \
+ sub subst substr substr-rw succ symlink sys syscall system syswrite tan tanh \
+ tc tclc tell telldir tie time times trans trim trim-leading trim-trailing \
+ truncate uc ucfirst unimatch uniname uninames uniprop uniprops unival unlink \
+ unpack unpolar unshift untie use utime values wait waitpid wantarray warn \
+ wordcase words write
+# Keywords (types)
+keywords3.*.p6=AST Any Block Bool CallFrame Callable Code \
+ Collation Compiler Complex ComplexStr Cool CurrentThreadScheduler Date \
+ DateTime Dateish Distribution Distribution::Hash Distribution::Locally \
+ Distribution::Path Duration Encoding Encoding::Registry Endian FatRat \
+ ForeignCode HyperSeq HyperWhatever Instant Int IntStr Junction Label \
+ Lock::Async Macro Method Mu Nil Num NumStr Numeric ObjAt Parameter Perl \
+ PredictiveIterator Proxy RaceSeq Rat RatStr Rational Real Routine \
+ Routine::WrapHandle Scalar Sequence Signature Str StrDistance Stringy Sub \
+ Submethod Telemetry Telemetry::Instrument::Thread \
+ Telemetry::Instrument::ThreadPool Telemetry::Instrument::Usage \
+ Telemetry::Period Telemetry::Sampler UInt ValueObjAt Variable Version \
+ Whatever WhateverCode atomicint bit bool buf buf1 buf16 buf2 buf32 buf4 \
+ buf64 buf8 int int1 int16 int2 int32 int4 int64 int8 long longlong num \
+ num32 num64 rat rat1 rat16 rat2 rat32 rat4 rat64 rat8 uint uint1 uint16 \
+ uint2 uint32 uint4 uint64 uint8 utf16 utf32 utf8
+# Keywords (types composite)
+keywords4.*.p6=Array Associative Bag BagHash Baggy Blob Buf \
+ Capture Enumeration Hash Iterable Iterator List Map Mix MixHash Mixy NFC NFD \
+ NFKC NFKD Pair Positional PositionalBindFailover PseudoStash QuantHash Range \
+ Seq Set SetHash Setty Slip Stash Uni utf8
+# Keywords (types domain specific)
+keywords5.*.p6=Attribute Cancellation Channel CompUnit \
+ CompUnit::Repository CompUnit::Repository::FileSystem \
+ CompUnit::Repository::Installation Distro Grammar IO IO::ArgFiles \
+ IO::CatHandle IO::Handle IO::Notification IO::Path IO::Path::Cygwin \
+ IO::Path::QNX IO::Path::Unix IO::Path::Win32 IO::Pipe IO::Socket \
+ IO::Socket::Async IO::Socket::INET IO::Spec IO::Spec::Cygwin \
+ IO::Spec::QNX IO::Spec::Unix IO::Spec::Win32 IO::Special Kernel Lock \
+ Match Order Pod::Block Pod::Block::Code Pod::Block::Comment \
+ Pod::Block::Declarator Pod::Block::Named Pod::Block::Para Pod::Block::Table \
+ Pod::Defn Pod::FormattingCode Pod::Heading Pod::Item Proc Proc::Async \
+ Promise Regex Scheduler Semaphore Supplier Supplier::Preserving Supply \
+ Systemic Tap Thread ThreadPoolScheduler VM
+# Keywords (types domain exceptions)
+keywords6.*.p6=Backtrace Backtrace::Frame CX::Done CX::Emit \
+ CX::Last CX::Next CX::Proceed CX::Redo CX::Return CX::Succeed CX::Take \
+ CX::Warn Exception Failure X::AdHoc X::Anon::Augment X::Anon::Multi \
+ X::Assignment::RO X::Attribute::NoPackage X::Attribute::Package \
+ X::Attribute::Required X::Attribute::Undeclared X::Augment::NoSuchType \
+ X::Bind X::Bind::NativeType X::Bind::Slice X::Caller::NotDynamic \
+ X::Channel::ReceiveOnClosed X::Channel::SendOnClosed X::Comp \
+ X::Composition::NotComposable X::Constructor::Positional X::Control \
+ X::ControlFlow X::ControlFlow::Return X::DateTime::TimezoneClash \
+ X::Declaration::Scope X::Declaration::Scope::Multi X::Does::TypeObject \
+ X::Dynamic::NotFound X::Eval::NoSuchLang X::Export::NameClash X::IO \
+ X::IO::Chdir X::IO::Chmod X::IO::Copy X::IO::Cwd X::IO::Dir X::IO::DoesNotExist \
+ X::IO::Link X::IO::Mkdir X::IO::Move X::IO::Rename X::IO::Rmdir \
+ X::IO::Symlink X::IO::Unlink X::Inheritance::NotComposed \
+ X::Inheritance::Unsupported X::Method::InvalidQualifier X::Method::NotFound \
+ X::Method::Private::Permission X::Method::Private::Unqualified \
+ X::Mixin::NotComposable X::NYI X::NoDispatcher X::Numeric::Real \
+ X::OS X::Obsolete X::OutOfRange X::Package::Stubbed X::Parameter::Default \
+ X::Parameter::MultipleTypeConstraints X::Parameter::Placeholder \
+ X::Parameter::Twigil X::Parameter::WrongOrder X::Phaser::Multiple \
+ X::Phaser::PrePost X::Placeholder::Block X::Placeholder::Mainline \
+ X::Pod X::Proc::Async X::Proc::Async::AlreadyStarted X::Proc::Async::BindOrUse \
+ X::Proc::Async::CharsOrBytes X::Proc::Async::MustBeStarted \
+ X::Proc::Async::OpenForWriting X::Proc::Async::TapBeforeSpawn \
+ X::Proc::Unsuccessful X::Promise::CauseOnlyValidOnBroken X::Promise::Vowed \
+ X::Redeclaration X::Role::Initialization X::Scheduler::CueInNaNSeconds \
+ X::Seq::Consumed X::Sequence::Deduction X::Signature::NameClash \
+ X::Signature::Placeholder X::Str::Numeric X::StubCode X::Syntax \
+ X::Syntax::Augment::WithoutMonkeyTyping X::Syntax::Comment::Embedded \
+ X::Syntax::Confused X::Syntax::InfixInTermPosition X::Syntax::Malformed \
+ X::Syntax::Missing X::Syntax::NegatedPair X::Syntax::NoSelf \
+ X::Syntax::Number::RadixOutOfRange X::Syntax::P5 X::Syntax::Perl5Var \
+ X::Syntax::Regex::Adverb X::Syntax::Regex::SolitaryQuantifier \
+ X::Syntax::Reserved X::Syntax::Self::WithoutObject \
+ X::Syntax::Signature::InvocantMarker X::Syntax::Term::MissingInitializer \
+ X::Syntax::UnlessElse X::Syntax::Variable::Match X::Syntax::Variable::Numeric \
+ X::Syntax::Variable::Twigil X::Temporal X::Temporal::InvalidFormat \
+ X::TypeCheck X::TypeCheck::Assignment X::TypeCheck::Binding \
+ X::TypeCheck::Return X::TypeCheck::Splice X::Undeclared
+# Keywords (adverbs)
+keywords7.*.p6=D a array b backslash c closure delete double \
+ exec exists f function h hash heredoc k kv p q qq quotewords s scalar single \
+ sym to v val w words ww x
+fold.compact=1
diff --git a/scite-app/lexilla/test/examples/raku/x.p6 b/scite-app/lexilla/test/examples/raku/x.p6
new file mode 100644
index 0000000..0cbdb6a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/raku/x.p6
@@ -0,0 +1,54 @@
+use v6;
+
+# Normal single line comment
+my Int $i = 0;
+my Rat $r = 3.142;
+my Str $s = "Hello, world! \$i == $i and \$r == $r";
+say $s;
+
+#`{{
+*** This is a multi-line comment ***
+}}
+
+my @array = #`[[ inline comment ]] <f fo foo food>;
+my %hash = ( AAA => 1, BBB => 2 );
+
+say q[This back\slash stays];
+say q[This back\\slash stays]; # Identical output
+say Q:q!Just a literal "\n" here!;
+
+=begin pod
+POD Documentation...
+=end pod
+
+say qq:to/END/;
+A multi-line
+string with interpolated vars: $i, $r
+END
+
+sub function {
+	return q:to/END/;
+Here is
+some multi-line
+string
+END
+}
+
+my $func = &function;
+say $func();
+
+grammar Calculator {
+	token TOP					{ <calc-op> }
+	proto rule calc-op			{*}
+		  rule calc-op:sym<add>	{ <num> '+' <num> }
+		  rule calc-op:sym<sub>	{ <num> '-' <num> }
+    token num					{ \d+ }
+}
+
+class Calculations {
+	method TOP              ($/) { make $<calc-op>.made; }
+	method calc-op:sym<add> ($/) { make [+] $<num>; }
+	method calc-op:sym<sub> ($/) { make [-] $<num>; }
+}
+
+say Calculator.parse('2 + 3', actions => Calculations).made;
diff --git a/scite-app/lexilla/test/examples/raku/x.p6.folded b/scite-app/lexilla/test/examples/raku/x.p6.folded
new file mode 100644
index 0000000..6591e04
--- /dev/null
+++ b/scite-app/lexilla/test/examples/raku/x.p6.folded
@@ -0,0 +1,55 @@
+ 0 400 400   use v6;
+ 1 400 400   
+ 0 400 400   # Normal single line comment
+ 0 400 400   my Int $i = 0;
+ 0 400 400   my Rat $r = 3.142;
+ 0 400 400   my Str $s = "Hello, world! \$i == $i and \$r == $r";
+ 0 400 400   say $s;
+ 1 400 400   
+ 2 400 401 + #`{{
+ 0 401 401 | *** This is a multi-line comment ***
+ 0 401 400 | }}
+ 1 400 400   
+ 0 400 400   my @array = #`[[ inline comment ]] <f fo foo food>;
+ 0 400 400   my %hash = ( AAA => 1, BBB => 2 );
+ 1 400 400   
+ 0 400 400   say q[This back\slash stays];
+ 0 400 400   say q[This back\\slash stays]; # Identical output
+ 0 400 400   say Q:q!Just a literal "\n" here!;
+ 1 400 400   
+ 2 400 401 + =begin pod
+ 0 401 401 | POD Documentation...
+ 0 401 400 | =end pod
+ 1 400 400   
+ 0 400 400   say qq:to/END/;
+ 0 400 400   A multi-line
+ 0 400 400   string with interpolated vars: $i, $r
+ 0 400 400   END
+ 1 400 400   
+ 2 400 401 + sub function {
+ 0 401 401 | 	return q:to/END/;
+ 0 401 401 | Here is
+ 0 401 401 | some multi-line
+ 0 401 401 | string
+ 0 401 401 | END
+ 0 401 400 | }
+ 1 400 400   
+ 0 400 400   my $func = &function;
+ 0 400 400   say $func();
+ 1 400 400   
+ 2 400 401 + grammar Calculator {
+ 0 401 401 | 	token TOP					{ <calc-op> }
+ 0 401 401 | 	proto rule calc-op			{*}
+ 0 401 401 | 		  rule calc-op:sym<add>	{ <num> '+' <num> }
+ 0 401 401 | 		  rule calc-op:sym<sub>	{ <num> '-' <num> }
+ 0 401 401 |     token num					{ \d+ }
+ 0 401 400 | }
+ 1 400 400   
+ 2 400 401 + class Calculations {
+ 0 401 401 | 	method TOP              ($/) { make $<calc-op>.made; }
+ 0 401 401 | 	method calc-op:sym<add> ($/) { make [+] $<num>; }
+ 0 401 401 | 	method calc-op:sym<sub> ($/) { make [-] $<num>; }
+ 0 401 400 | }
+ 1 400 400   
+ 0 400 400   say Calculator.parse('2 + 3', actions => Calculations).made;
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/raku/x.p6.styled b/scite-app/lexilla/test/examples/raku/x.p6.styled
new file mode 100644
index 0000000..f239021
--- /dev/null
+++ b/scite-app/lexilla/test/examples/raku/x.p6.styled
@@ -0,0 +1,54 @@
+{20}use{0} {16}v6{18};{0}
+
+{2}# Normal single line comment{0}
+{20}my{0} {22}Int{0} {23}$i{0} {18}={0} {16}0{18};{0}
+{20}my{0} {22}Rat{0} {23}$r{0} {18}={0} {16}3.142{18};{0}
+{20}my{0} {22}Str{0} {23}$s{0} {18}={0} {8}"Hello, world! \$i == {12}$i{8} and \$r == {12}$r{8}"{18};{0}
+{20}say{0} {23}$s{18};{0}
+
+{2}#`{3}{{
+*** This is a multi-line comment ***
+}}{0}
+
+{20}my{0} {24}@array{0} {18}={0} {2}#`{3}[[ inline comment ]]{0} {9}<f fo foo food>{18};{0}
+{20}my{0} {25}%hash{0} {18}={0} {18}({0} {21}AAA{0} {18}=>{0} {16}1{18},{0} {21}BBB{0} {18}=>{0} {16}2{0} {18});{0}
+
+{20}say{0} {9}q[This back\slash stays]{18};{0}
+{20}say{0} {9}q[This back\\slash stays]{18};{0} {2}# Identical output{0}
+{20}say{0} {11}Q{15}:q{11}!Just a literal "\n" here!{18};{0}
+
+{4}=begin pod
+POD Documentation...
+=end pod{0}
+
+{20}say{0} {10}qq{15}:to{10}/END/{18};{0}
+{7}A multi-line
+string with interpolated vars: {12}$i{7}, {12}$r{7}
+END{0}
+
+{20}sub{0} {21}function{0} {18}{{0}
+	{20}return{0} {9}q{15}:to{9}/END/{18};{0}
+{6}Here is
+some multi-line
+string
+END{0}
+{18}}{0}
+
+{20}my{0} {23}$func{0} {18}={0} {26}&function{18};{0}
+{20}say{0} {23}$func{18}();{0}
+
+{19}grammar{0} {27}Calculator{0} {18}{{0}
+	{19}token{0} {21}TOP{0}					{13}{ <calc-op> }{0}
+	{19}proto{0} {19}rule{0} {21}calc-op{0}			{13}{*}{0}
+		  {19}rule{0} {21}calc-op{15}:sym{18}<{21}add{18}>{0}	{13}{ <num> '+' <num> }{0}
+		  {19}rule{0} {21}calc-op{15}:sym{18}<{21}sub{18}>{0}	{13}{ <num> '-' <num> }{0}
+    {19}token{0} {21}num{0}					{13}{ \d+ }{0}
+{18}}{0}
+
+{19}class{0} {28}Calculations{0} {18}{{0}
+	{19}method{0} {21}TOP{0}              {18}({23}$/{18}){0} {18}{{0} {19}make{0} {23}${18}<{23}calc-op{18}>.{21}made{18};{0} {18}}{0}
+	{19}method{0} {21}calc-op{15}:sym{18}<{21}add{18}>{0} {18}({23}$/{18}){0} {18}{{0} {21}make{0} {18}[+]{0} {23}${18}<{23}num{18}>;{0} {18}}{0}
+	{19}method{0} {21}calc-op{15}:sym{18}<{21}sub{18}>{0} {18}({23}$/{18}){0} {18}{{0} {21}make{0} {18}[-]{0} {23}${18}<{23}num{18}>;{0} {18}}{0}
+{18}}{0}
+
+{20}say{0} {21}Calculator{18}.{21}parse{18}({8}'2 + 3'{18},{0} {21}actions{0} {18}=>{0} {21}Calculations{18}).{21}made{18};{0}
diff --git a/scite-app/lexilla/test/examples/ruby/SciTE.properties b/scite-app/lexilla/test/examples/ruby/SciTE.properties
new file mode 100644
index 0000000..896f83f
--- /dev/null
+++ b/scite-app/lexilla/test/examples/ruby/SciTE.properties
@@ -0,0 +1,3 @@
+lexer.*.rb=ruby
+keywords.*.rb=class def end
+fold=1
diff --git a/scite-app/lexilla/test/examples/ruby/x.rb b/scite-app/lexilla/test/examples/ruby/x.rb
new file mode 100644
index 0000000..d1bb0f0
--- /dev/null
+++ b/scite-app/lexilla/test/examples/ruby/x.rb
@@ -0,0 +1,6 @@
+class Demo
+	def test # A test
+		i = 1
+		puts "Example"
+	end
+end
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/ruby/x.rb.folded b/scite-app/lexilla/test/examples/ruby/x.rb.folded
new file mode 100644
index 0000000..7f2e80d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/ruby/x.rb.folded
@@ -0,0 +1,6 @@
+ 2 400   0 + class Demo
+ 2 401   0 + 	def test # A test
+ 0 402   0 | 		i = 1
+ 0 402   0 | 		puts "Example"
+ 0 402   0 | 	end
+ 0 400   0   end
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/ruby/x.rb.styled b/scite-app/lexilla/test/examples/ruby/x.rb.styled
new file mode 100644
index 0000000..904d07d
--- /dev/null
+++ b/scite-app/lexilla/test/examples/ruby/x.rb.styled
@@ -0,0 +1,6 @@
+{5}class{0} {8}Demo{0}
+	{5}def{0} {9}test{0} {2}# A test{0}
+		{11}i{0} {10}={0} {4}1{0}
+		{11}puts{0} {6}"Example"{0}
+	{5}end{0}
+{5}end
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/tcl/SciTE.properties b/scite-app/lexilla/test/examples/tcl/SciTE.properties
new file mode 100644
index 0000000..397bdeb
--- /dev/null
+++ b/scite-app/lexilla/test/examples/tcl/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.tcl=tcl
+keywords.*.tcl=proc set socket vwait
+fold.comment=1
+fold.compact=1
diff --git a/scite-app/lexilla/test/examples/tcl/x.tcl b/scite-app/lexilla/test/examples/tcl/x.tcl
new file mode 100644
index 0000000..d1260fc
--- /dev/null
+++ b/scite-app/lexilla/test/examples/tcl/x.tcl
@@ -0,0 +1,13 @@
+# tcl tests
+
+#simple example
+
+proc Echo_Server {port} {
+    set s [socket -server EchoAccept $port]
+    vwait forever;
+}
+
+# Bug #1947
+
+$s($i,"n")
+set n $showArray($i,"neighbor")
diff --git a/scite-app/lexilla/test/examples/tcl/x.tcl.folded b/scite-app/lexilla/test/examples/tcl/x.tcl.folded
new file mode 100644
index 0000000..671b087
--- /dev/null
+++ b/scite-app/lexilla/test/examples/tcl/x.tcl.folded
@@ -0,0 +1,14 @@
+ 2 400   3 + # tcl tests
+ 1 401   3 | 
+ 0 401   3 | #simple example
+ 1 401   3 | 
+ 2 400   2 + proc Echo_Server {port} {
+ 0 401   2 |     set s [socket -server EchoAccept $port]
+ 0 401   2 |     vwait forever;
+ 0 401   0 | }
+ 1 400   0   
+ 2 400   3 + # Bug #1947
+ 1 401   3 | 
+ 0 400   0   $s($i,"n")
+ 0 400   0   set n $showArray($i,"neighbor")
+ 1 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/tcl/x.tcl.styled b/scite-app/lexilla/test/examples/tcl/x.tcl.styled
new file mode 100644
index 0000000..66af413
--- /dev/null
+++ b/scite-app/lexilla/test/examples/tcl/x.tcl.styled
@@ -0,0 +1,13 @@
+{2}# tcl tests
+{0}
+{2}#simple example
+{0}
+{12}proc{0} {7}Echo_Server{0} {6}{{7}port{6}}{0} {6}{
+{0}    {12}set{0} {7}s{0} {6}[{12}socket{0} {10}-server{0} {7}EchoAccept{0} {8}$port{6}]
+{0}    {12}vwait{0} {7}forever{0};
+{6}}
+{0}
+{2}# Bug #1947
+{0}
+{8}$s{6}({8}$i{6},{5}"n"{6})
+{12}set{0} {7}n{0} {8}$showArray{6}({8}$i{6},{5}"neighbor"{6})
diff --git a/scite-app/lexilla/test/examples/vb/SciTE.properties b/scite-app/lexilla/test/examples/vb/SciTE.properties
new file mode 100644
index 0000000..54fead3
--- /dev/null
+++ b/scite-app/lexilla/test/examples/vb/SciTE.properties
@@ -0,0 +1,2 @@
+lexer.*.vb=vb
+keywords.*.vb=as dim or string
diff --git a/scite-app/lexilla/test/examples/vb/x.vb b/scite-app/lexilla/test/examples/vb/x.vb
new file mode 100644
index 0000000..a672831
--- /dev/null
+++ b/scite-app/lexilla/test/examples/vb/x.vb
@@ -0,0 +1,13 @@
+' String"
+Dim a As String = "hello, world"
+Dim b As String = "hello    world"
+Dim c As String = "Joe said ""Hello"" to me"
+Dim d As String = "\\\\server\\share\\file.txt"
+' Character
+""C "c"C "cc"C
+' Date
+d = #5/31/1993# or # 01/01/0001 12:00:00AM #
+' Number
+123_456___789
+123_
+&b10101_01010
diff --git a/scite-app/lexilla/test/examples/vb/x.vb.folded b/scite-app/lexilla/test/examples/vb/x.vb.folded
new file mode 100644
index 0000000..82a2806
--- /dev/null
+++ b/scite-app/lexilla/test/examples/vb/x.vb.folded
@@ -0,0 +1,14 @@
+ 0 400   0   ' String"
+ 0 400   0   Dim a As String = "hello, world"
+ 0 400   0   Dim b As String = "hello    world"
+ 0 400   0   Dim c As String = "Joe said ""Hello"" to me"
+ 0 400   0   Dim d As String = "\\\\server\\share\\file.txt"
+ 0 400   0   ' Character
+ 0 400   0   ""C "c"C "cc"C
+ 0 400   0   ' Date
+ 0 400   0   d = #5/31/1993# or # 01/01/0001 12:00:00AM #
+ 0 400   0   ' Number
+ 0 400   0   123_456___789
+ 0 400   0   123_
+ 0 400   0   &b10101_01010
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/vb/x.vb.styled b/scite-app/lexilla/test/examples/vb/x.vb.styled
new file mode 100644
index 0000000..1d19c8a
--- /dev/null
+++ b/scite-app/lexilla/test/examples/vb/x.vb.styled
@@ -0,0 +1,13 @@
+{1}' String"
+{3}Dim{0} {7}a{0} {3}As{0} {3}String{0} {6}={0} {4}"hello, world"{0}
+{3}Dim{0} {7}b{0} {3}As{0} {3}String{0} {6}={0} {4}"hello    world"{0}
+{3}Dim{0} {7}c{0} {3}As{0} {3}String{0} {6}={0} {4}"Joe said ""Hello"" to me"{0}
+{3}Dim{0} {7}d{0} {3}As{0} {3}String{0} {6}={0} {4}"\\\\server\\share\\file.txt"{0}
+{1}' Character
+{4}""C{0} {4}"c"C{0} {4}"cc"C{0}
+{1}' Date
+{7}d{0} {6}={0} {8}#5/31/1993#{0} {3}or{0} {8}# 01/01/0001 12:00:00AM #{0}
+{1}' Number
+{2}123_456___789{0}
+{2}123_{0}
+{2}&b10101_01010{0}
diff --git a/scite-app/lexilla/test/examples/yaml/SciTE.properties b/scite-app/lexilla/test/examples/yaml/SciTE.properties
new file mode 100644
index 0000000..f275e02
--- /dev/null
+++ b/scite-app/lexilla/test/examples/yaml/SciTE.properties
@@ -0,0 +1,3 @@
+lexer.*.yaml=yaml
+keywords.*.yaml=true false yes no
+fold=1
diff --git a/scite-app/lexilla/test/examples/yaml/x.yaml b/scite-app/lexilla/test/examples/yaml/x.yaml
new file mode 100644
index 0000000..f0fc751
--- /dev/null
+++ b/scite-app/lexilla/test/examples/yaml/x.yaml
@@ -0,0 +1,12 @@
+# comment
+
+key: value # comment
+
+colon:in:key: value
+
+hanging_value:
+  value
+
+1: 1
+
+true: true
diff --git a/scite-app/lexilla/test/examples/yaml/x.yaml.folded b/scite-app/lexilla/test/examples/yaml/x.yaml.folded
new file mode 100644
index 0000000..67fe96e
--- /dev/null
+++ b/scite-app/lexilla/test/examples/yaml/x.yaml.folded
@@ -0,0 +1,13 @@
+ 0 400   0   # comment
+ 1 400   0   
+ 0 400   0   key: value # comment
+ 1 400   0   
+ 0 400   0   colon:in:key: value
+ 1 400   0   
+ 2 400   0 + hanging_value:
+ 0 402   0 |   value
+ 1 400   0   
+ 0 400   0   1: 1
+ 1 400   0   
+ 0 400   0   true: true
+ 0 400   0   
\ No newline at end of file
diff --git a/scite-app/lexilla/test/examples/yaml/x.yaml.styled b/scite-app/lexilla/test/examples/yaml/x.yaml.styled
new file mode 100644
index 0000000..df14c15
--- /dev/null
+++ b/scite-app/lexilla/test/examples/yaml/x.yaml.styled
@@ -0,0 +1,12 @@
+{1}# comment
+{0}
+{2}key{9}:{0} value {1}# comment
+{0}
+{2}colon:in:key{9}:{0} value
+
+{2}hanging_value{9}:{0}
+  value
+
+{2}1{9}:{4} 1
+{0}
+{2}true{9}:{3} true
diff --git a/scite-app/lexilla/test/makefile b/scite-app/lexilla/test/makefile
new file mode 100644
index 0000000..db96d17
--- /dev/null
+++ b/scite-app/lexilla/test/makefile
@@ -0,0 +1,69 @@
+# Build all the lexer tests using GNU make and either g++ or Clang
+# @file makefile
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Should be run using mingw32-make on Windows, not nmake
+# On Windows g++ is used, on OS X clang, and on Linux g++ is used by default
+# but clang can be used by defining CLANG when invoking make
+# clang works only with libc++, not libstdc++
+
+.PHONY: all test clean
+
+.SUFFIXES: .cxx
+
+WARNINGS = -Wpedantic -Wall -Wextra
+
+ifndef windir
+LIBS += -ldl
+ifeq ($(shell uname),Darwin)
+# On macOS always use Clang
+CLANG = 1
+endif
+endif
+
+EXE = $(if $(windir),TestLexers.exe,TestLexers)
+
+BASE_FLAGS += --std=c++2a
+
+ifdef CLANG
+    CXX = clang++
+    BASE_FLAGS += -fsanitize=address
+endif
+
+ifdef LEXILLA_STATIC
+    DEFINES += -D LEXILLA_STATIC
+    LIBS += ../bin/liblexilla.a
+endif
+
+ifdef windir
+    DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
+else
+    DEL = rm -f
+endif
+
+vpath %.cxx ../access
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+INCLUDES = -I ../../scintilla/include -I ../include -I ../access
+BASE_FLAGS += $(WARNINGS)
+
+all: $(EXE)
+
+test: $(EXE)
+	./$(EXE)
+
+clean:
+	$(DEL) *.o *.obj $(EXE)
+
+%.o: %.cxx
+	$(CXX) $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+
+OBJS = TestLexers.o TestDocument.o LexillaAccess.o
+
+$(EXE): $(OBJS)
+	$(CXX) $(BASE_FLAGS) $(CPPFLAGS) $(CXXFLAGS) $^ $(LIBS) $(LDLIBS) -o $@
+
+TestLexers.o: TestLexers.cxx TestDocument.h
+TestDocument.o: TestDocument.cxx TestDocument.h
diff --git a/scite-app/lexilla/test/testlexers.mak b/scite-app/lexilla/test/testlexers.mak
new file mode 100644
index 0000000..a0b7c3e
--- /dev/null
+++ b/scite-app/lexilla/test/testlexers.mak
@@ -0,0 +1,44 @@
+# Build the lexers test with Microsoft Visual C++ using nmake
+# Tested with Visual C++ 2019
+
+DEL = del /q
+EXE = TestLexers.exe
+
+INCLUDEDIRS = -I ../../scintilla/include -I ../include -I ../access
+
+!IFDEF LEXILLA_STATIC
+STATIC_FLAG = -D LEXILLA_STATIC
+LIBS = ../bin/liblexilla.lib
+!ENDIF
+
+!IFDEF DEBUG
+DEBUG_OPTIONS = -Od -MTd -DDEBUG $(STATIC_FLAG)
+!ELSE
+DEBUG_OPTIONS=-O1 -MT -DNDEBUG $(STATIC_FLAG) -GL
+!ENDIF
+
+CXXFLAGS = /EHsc /std:c++latest $(DEBUG_OPTIONS) $(INCLUDEDIRS)
+
+OBJS = TestLexers.obj TestDocument.obj LexillaAccess.obj
+
+all: $(EXE)
+
+test: $(EXE)
+	$(EXE)
+
+clean:
+	$(DEL) *.o *.obj *.exe
+
+$(EXE): $(OBJS) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LIBS) /Fe$@ $**
+
+.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+{..\access}.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME) $<
+
+.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+
+TestLexers.obj: $*.cxx TestDocument.h
+TestDocument.obj: $*.cxx $*.h
diff --git a/scite-app/lexilla/test/unit/LICENSE_1_0.txt b/scite-app/lexilla/test/unit/LICENSE_1_0.txt
new file mode 100644
index 0000000..36b7cd9
--- /dev/null
+++ b/scite-app/lexilla/test/unit/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/scite-app/lexilla/test/unit/README b/scite-app/lexilla/test/unit/README
new file mode 100644
index 0000000..dce06ad
--- /dev/null
+++ b/scite-app/lexilla/test/unit/README
@@ -0,0 +1,15 @@
+The test/unit directory contains unit tests for Scintilla data structures.
+
+The tests can be run on Windows, OS X, or Linux using g++ and GNU make.
+The Catch test framework is used.
+https://github.com/philsquared/Catch
+The file catch.hpp is under the Boost Software License which is contained in LICENSE_1_0.txt
+
+   To run the tests on OS X or Linux:
+make test
+
+   To run the tests on Windows:
+mingw32-make test
+
+   Visual C++ (2010+) and nmake can also be used on Windows:
+nmake -f test.mak test
diff --git a/scite-app/lexilla/test/unit/Sci.natvis b/scite-app/lexilla/test/unit/Sci.natvis
new file mode 100644
index 0000000..d6ac2b9
--- /dev/null
+++ b/scite-app/lexilla/test/unit/Sci.natvis
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="Scintilla::SplitVector&lt;*&gt;">
+    <DisplayString>{{size = {lengthBody}}}</DisplayString>
+    <Expand>
+      <Item Name="[size]">lengthBody</Item>
+      <Item Name="[part1Length]">part1Length</Item>
+      <Item Name="[gap]">gapLength</Item>
+      <IndexListItems>
+        <Size>lengthBody</Size>
+        <ValueNode>body[($i&lt;part1Length)?$i:$i+gapLength]</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="Scintilla::Partitioning&lt;*&gt;">
+    <DisplayString>{{size = {body->lengthBody}}}</DisplayString>
+    <Expand>
+      <IndexListItems>
+        <Size>body->lengthBody</Size>
+        <ValueNode>body->body[($i&lt;body->part1Length)?$i:$i+body->gapLength]+($i&gt;stepPartition?stepLength:0)</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="std::unique_ptr&lt;*&gt;">
+    <SmartPointer Usage="Minimal">_Mypair._Myval2</SmartPointer>
+    <DisplayString Condition="_Mypair._Myval2 == 0">empty</DisplayString>
+    <DisplayString Condition="_Mypair._Myval2 != 0">unique_ptr {*_Mypair._Myval2}</DisplayString>
+    <Expand>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair._Myval2</ExpandedItem>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair</ExpandedItem>
+    </Expand>
+  </Type>
+</AutoVisualizer>
diff --git a/scite-app/lexilla/test/unit/SciTE.properties b/scite-app/lexilla/test/unit/SciTE.properties
new file mode 100644
index 0000000..cbbe208
--- /dev/null
+++ b/scite-app/lexilla/test/unit/SciTE.properties
@@ -0,0 +1,5 @@
+command.go.*.cxx=./unitTest
+if PLAT_WIN
+	make.command=mingw32-make
+	command.go.*.cxx=unitTest
+command.go.needs.$(file.patterns.cplusplus)=$(make.command)
diff --git a/scite-app/lexilla/test/unit/UnitTester.cxx b/scite-app/lexilla/test/unit/UnitTester.cxx
new file mode 100644
index 0000000..6457036
--- /dev/null
+++ b/scite-app/lexilla/test/unit/UnitTester.cxx
@@ -0,0 +1,24 @@
+/** @file UnitTester.cxx
+ ** UnitTester.cpp : Defines the entry point for the console application.
+ **/
+
+// Catch uses std::uncaught_exception which is deprecated in C++17.
+// This define silences a warning from Visual C++.
+#define _SILENCE_CXX17_UNCAUGHT_EXCEPTION_DEPRECATION_WARNING
+
+#include <cstdio>
+#include <cstdarg>
+
+#include <string_view>
+#include <vector>
+#include <memory>
+
+#define CATCH_CONFIG_WINDOWS_CRTDBG
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+int main(int argc, char* argv[]) {
+	const int result = Catch::Session().run(argc, argv);
+
+	return result;
+}
diff --git a/scite-app/lexilla/test/unit/UnitTester.vcxproj b/scite-app/lexilla/test/unit/UnitTester.vcxproj
new file mode 100644
index 0000000..9116fca
--- /dev/null
+++ b/scite-app/lexilla/test/unit/UnitTester.vcxproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{35688A27-D91B-453A-8A05-65A7F28DEFBF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>UnitTester</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\;..\..\..\scintilla\include\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\;..\..\..\scintilla\include\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\;..\..\..\scintilla\include\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\;..\..\..\scintilla\include\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\lexlib\Accessor.cxx" />
+    <ClCompile Include="..\..\lexlib\CharacterSet.cxx" />
+    <ClCompile Include="..\..\lexlib\LexerBase.cxx" />
+    <ClCompile Include="..\..\lexlib\LexerModule.cxx" />
+    <ClCompile Include="..\..\lexlib\LexerSimple.cxx" />
+    <ClCompile Include="..\..\lexlib\PropSetSimple.cxx" />
+    <ClCompile Include="..\..\lexlib\WordList.cxx" />
+    <ClCompile Include="test*.cxx" />
+    <ClCompile Include="UnitTester.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="Sci.natvis" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/lexilla/test/unit/catch.hpp b/scite-app/lexilla/test/unit/catch.hpp
new file mode 100644
index 0000000..0384171
--- /dev/null
+++ b/scite-app/lexilla/test/unit/catch.hpp
@@ -0,0 +1,17881 @@
+/*
+ *  Catch v2.13.4
+ *  Generated: 2020-12-29 14:48:00.116107
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 13
+#define CATCH_VERSION_PATCH 4
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+#  define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+#  define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+// We have to avoid both ICC and Clang, because they try to mask themselves
+// as gcc, and we want only GCC in this block
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
+#endif
+
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    include <cstddef>
+  #    if __cpp_lib_byte > 0
+  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #    endif
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+        bool empty() const noexcept { return file[0] == '\0'; }
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
+
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
+
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
+
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    // Keep ::type here because we still support C++11
+    template <typename Func, typename... U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream : NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+// end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator, typename Sentinel = InputIterator>
+        std::string rangeToString(InputIterator first, Sentinel last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
+    using std::end;
+
+    namespace detail {
+        template <typename...>
+        struct void_type {
+            using type = void;
+        };
+
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {
+        };
+
+        template <typename T>
+        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
+        };
+    } // namespace detail
+
+    template <typename T>
+    struct is_range : detail::is_range_impl<T> {
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+        template <typename RhsT>
+        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
+        }
+        template <typename RhsT>
+        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
+        }
+        template <typename RhsT>
+        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+#include <chrono>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef const& macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_section.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                return "";
+#else
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+#endif
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_exception.hpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            uint64_t m_ulps;
+            FloatingPointKind m_type;
+        };
+
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // inferring std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        template<typename T, typename Alloc>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T, Alloc> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
+            bool match(std::vector<T, AllocMatch> const& vec) const override {
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T, AllocComp> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename Alloc = std::allocator<T>>
+    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
+        };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
+
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
+
+    const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
+
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
+    public:
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::forward<T>(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::forward<U>(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
+
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = next();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
+
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& rng();
+}
+
+// end catch_context.h
+// start catch_interfaces_config.h
+
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <chrono>
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual double minDuration() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// start catch_random_number_generator.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+// end catch_random_number_generator.h
+#include <random>
+
+namespace Catch {
+namespace Generators {
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_specific.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        double minDuration = -1;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        double minDuration() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    //! Should the reporter show
+    bool shouldShowDuration( IConfig const& config, double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& className,
+                          std::string const& rootName,
+                          SectionNode const& sectionNode);
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
+
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
+
+// start catch_benchmark.hpp
+
+ // Benchmark
+
+// start catch_chronometer.hpp
+
+// User-facing chronometer
+
+
+// start catch_clock.hpp
+
+// Clocks
+
+
+#include <chrono>
+#include <ratio>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_clock.hpp
+// start catch_optimizer.hpp
+
+ // Hinting the optimizer
+
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
+
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
+
+// Invoke with a special case for void
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
+
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_complete_invoke.hpp
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                ClockDuration<Clock> elapsed() const { return finished - started; }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_chronometer.hpp
+// start catch_environment.hpp
+
+// Environment information
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
+        };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
+
+ // Execution plan
+
+
+// start catch_benchmark_function.hpp
+
+ // Dumb std::function implementation for consistent call overhead
+
+
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
+
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
+
+// repeat algorithm
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
+
+// Run a function for a minimum amount of time
+
+
+// start catch_measure.hpp
+
+// Measure
+
+
+// start catch_timing.hpp
+
+// Timing
+
+
+#include <tuple>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_timing.hpp
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), std::move(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
+
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
+
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                throw optimized_away_error{};
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
+
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
+
+ // Environment measurement
+
+
+// start catch_stats.hpp
+
+// Statistical analysis tools
+
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <iterator>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+#include <random>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
+
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
+
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = std::max(cumn(a1), 0);
+                auto hi = std::min(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
+
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
+
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
+
+ // Run and analyse one benchmark
+
+
+// start catch_sample_analysis.hpp
+
+// Benchmark results
+
+
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
+
+// Constructor and destructor helpers
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
+
+                ObjectStorage() : data() {}
+
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
+
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(&data) T(std::move(other.stored_object()));
+                }
+
+                ~ObjectStorage() { destruct_on_exit<T>(); }
+
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (&data) T(std::forward<Args>(args)...);
+                }
+
+                template <bool AllowManualDestruction = !Destruct>
+                typename std::enable_if<AllowManualDestruction>::type destruct()
+                {
+                    stored_object().~T();
+                }
+
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
+
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                T const& stored_object() const {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                TStorage data;
+            };
+        }
+
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
+
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    }
+}
+
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            return lhs.name == rhs.name
+                && lhs.location == rhs.location;
+        }
+    };
+
+    class ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    class  ITracker {
+        NameAndLocation m_nameAndLocation;
+
+    public:
+        ITracker(NameAndLocation const& nameAndLoc) :
+            m_nameAndLocation(nameAndLoc)
+        {}
+
+        // static queries
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+
+        virtual ~ITracker();
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+        virtual bool hasStarted() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+        bool hasStarted() const override {
+            return m_runState != NotStarted;
+        }
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isGeneratorTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+        //! Returns filters active in this tracker
+        std::vector<std::string> const& getFilters() const;
+        //! Returns whitespace-trimmed name of the tracked section
+        std::string const& trimmedName() const;
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+        FatalConditionHandler();
+        static void reset();
+        ~FatalConditionHandler();
+
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions[];
+        static stack_t oldSigStack;
+        static char altStackMem[];
+
+        static void handleSignal( int sig );
+
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+        static void reset();
+    };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset();
+    };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef const& macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+            throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
+
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
+
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto operator + (Column const& other)->Columns;
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+class Spacer : public Column {
+
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
+
+class Columns {
+	std::vector<Column> m_columns;
+
+public:
+
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
+
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <cctype>
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( setReporter, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( config.minDuration, "seconds" )
+                ["-D"]["--min-duration"]
+                ( "show test durations for tests taking at least the given number of seconds" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    double Config::minDuration() const                 { return m_data.minDuration; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) override {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != nullptr) {
+            impl->use( _colourCode );
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        ~Context() override;
+
+    public: // IMutableContext
+        void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+
+#  include <cassert>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if (m_translators.empty()) {
+            std::rethrow_exception(std::current_exception());
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    // Report the error condition
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
+    };
+
+    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        // 32k seems enough for Catch to handle stack overflow,
+        // but the value was found experimentally, so there is no strong guarantee
+        guaranteeSize = 32 * 1024;
+        exceptionHandlerHandle = nullptr;
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        // Pass in guarantee size to be filled
+        SetThreadStackGuarantee(&guaranteeSize);
+    }
+
+    void FatalConditionHandler::reset() {
+        if (isSet) {
+            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+            SetThreadStackGuarantee(&guaranteeSize);
+            exceptionHandlerHandle = nullptr;
+            isSet = false;
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    // 32kb for the alternate stack seems to be sufficient. However, this value
+    // is experimentally determined, so that's not guaranteed.
+    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    void FatalConditionHandler::handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        reset();
+        reportFatal(name);
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = sigStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+    void FatalConditionHandler::reset() {
+        if( isSet ) {
+            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+            }
+            // Return the old stack
+            sigaltstack(&oldSigStack, nullptr);
+            isSet = false;
+        }
+    }
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
+}
+
+namespace Generators {
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters();
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters() {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
+        Option<std::size_t> listedCount;
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
+
+namespace Catch {
+namespace {
+
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
+
+        auto ulpDiff = std::abs(lc - rc);
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
+    }
+
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
+
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
+    }
+
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info ), m_moved()
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w+")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+#endif
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                // Under specific circumstances, the generator we want
+                // to acquire is also the current tracker. If this is
+                // the case, we have to avoid looking through current
+                // tracker's children, and instead return the current
+                // tracker.
+                // A case where this check is important is e.g.
+                //     for (int i = 0; i < 5; ++i) {
+                //         int n = GENERATE(1, 2);
+                //     }
+                //
+                // without it, the code above creates 5 nested generators.
+                if (currentTracker.nameAndLocation() == nameAndLocation) {
+                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
+                    assert(thisTracker);
+                    assert(thisTracker->isGeneratorTracker());
+                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
+                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                } else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // If a generator has a child (it is followed by a section)
+                // and none of its children have started, then we must wait
+                // until later to start consuming its values.
+                // This catches cases where `GENERATE` is placed between two
+                // `SECTION`s.
+                // **The check for m_children.empty cannot be removed**.
+                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
+                const bool should_wait_for_child = [&]() {
+                    // No children -> nobody to wait for
+                    if ( m_children.empty() ) {
+                        return false;
+                    }
+                    // If at least one child started executing, don't wait
+                    if ( std::find_if(
+                             m_children.begin(),
+                             m_children.end(),
+                             []( TestCaseTracking::ITrackerPtr tracker ) {
+                                 return tracker->hasStarted();
+                             } ) != m_children.end() ) {
+                        return false;
+                    }
+
+                    // No children have started. We need to check if they _can_
+                    // start, and thus we should wait for them, or they cannot
+                    // start (due to filters), and we shouldn't wait for them
+                    auto* parent = m_parent;
+                    // This is safe: there is always at least one section
+                    // tracker in a test case tracking tree
+                    while ( !parent->isSectionTracker() ) {
+                        parent = &( parent->parent() );
+                    }
+                    assert( parent &&
+                            "Missing root (test case) level section" );
+
+                    auto const& parentSection =
+                        static_cast<SectionTracker&>( *parent );
+                    auto const& filters = parentSection.getFilters();
+                    // No filters -> no restrictions on running sections
+                    if ( filters.empty() ) {
+                        return true;
+                    }
+
+                    for ( auto const& child : m_children ) {
+                        if ( child->isSectionTracker() &&
+                             std::find( filters.begin(),
+                                        filters.end(),
+                                        static_cast<SectionTracker&>( *child )
+                                            .trimmedName() ) !=
+                                 filters.end() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }();
+
+                // This check is a bit tricky, because m_generator->next()
+                // has a side-effect, where it consumes generator's current
+                // value, but we do not want to invoke the side-effect if
+                // this generator is still waiting for any child to start.
+                if ( should_wait_for_child ||
+                     ( m_runState == CompletedSuccessfully &&
+                       m_generator->next() ) ) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
+                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+        m_reporter->benchmarkPreparing(name);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+    void RunContext::benchmarkFailed(std::string const & error) {
+        m_reporter->benchmarkFailed(error);
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandler fatalConditionHandler; // Handle signals
+        m_activeTestCase->invoke();
+        fatalConditionHandler.reset();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+#include <set>
+#include <iterator>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
+            }
+
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
+                }
+
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
+            }
+
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( m_config ) )
+                return static_cast<int>( *listed );
+
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+#endif
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace Detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new Detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new Detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new Detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    auto StringRef::c_str() const -> char const* {
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
+        return m_start;
+    }
+    auto StringRef::data() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
+            return StringRef();
+        }
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.data(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for (char c : nameAndTags.tags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            // Add all "hidden" tags to make them behave identically
+            tags.insert( tags.end(), { ".", "!hide" } );
+        }
+
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        struct TestHasher {
+            using hash_t = uint64_t;
+
+            explicit TestHasher( hash_t hashSuffix ):
+                m_hashSuffix{ hashSuffix } {}
+
+            uint32_t operator()( TestCase const& t ) const {
+                // FNV-1a hash with multiplication fold.
+                const hash_t prime = 1099511628211u;
+                hash_t hash = 14695981039346656037u;
+                for ( const char c : t.name ) {
+                    hash ^= c;
+                    hash *= prime;
+                }
+                hash ^= m_hashSuffix;
+                hash *= prime;
+                const uint32_t low{ static_cast<uint32_t>( hash ) };
+                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+                return low * high;
+            }
+
+        private:
+            hash_t m_hashSuffix;
+        };
+    } // end unnamed namespace
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+        switch( config.runOrder() ) {
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+
+            case RunTests::InLexicographicalOrder: {
+                std::vector<TestCase> sorted = unsortedTestCases;
+                std::sort( sorted.begin(), sorted.end() );
+                return sorted;
+            }
+
+            case RunTests::InRandomOrder: {
+                seedRng( config );
+                TestHasher h{ config.rngSeed() };
+
+                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
+                std::vector<hashedTest> indexed_tests;
+                indexed_tests.reserve( unsortedTestCases.size() );
+
+                for (auto const& testCase : unsortedTestCases) {
+                    indexed_tests.emplace_back(h(testCase), &testCase);
+                }
+
+                std::sort(indexed_tests.begin(), indexed_tests.end(),
+                          [](hashedTest const& lhs, hashedTest const& rhs) {
+                          if (lhs.first == rhs.first) {
+                              return lhs.second->name < rhs.second->name;
+                          }
+                          return lhs.first < rhs.first;
+                });
+
+                std::vector<TestCase> sorted;
+                sorted.reserve( indexed_tests.size() );
+
+                for (auto const& hashed : indexed_tests) {
+                    sorted.emplace_back(*hashed.second);
+                }
+
+                return sorted;
+            }
+        }
+        return unsortedTestCases;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className(classOrQualifiedMethodName);
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(nameAndLocation),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if (m_filters.empty()
+            || m_filters[0] == ""
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(""); // Root - should never be consulted
+            m_filters.emplace_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+    std::vector<std::string> const& SectionTracker::getFilters() const {
+        return m_filters;
+    }
+
+    std::string const& SectionTracker::trimmedName() const {
+        return m_trimmed_name;
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+        m_realPatternPos = 0;
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
+            }
+
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / ( i + 1u );
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (Catch::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+int StringMaker<float>::precision = 5;
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = 10;
+
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, precision);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+// start catch_config_uncaught_exceptions.hpp
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+// end catch_config_uncaught_exceptions.hpp
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 13, 4, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+#include <type_traits>
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            unsigned char c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    unsigned char nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        std::sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    bool shouldShowDuration( IConfig const& config, double duration ) {
+        if ( config.showDurations() == ShowDurations::Always ) {
+            return true;
+        }
+        if ( config.showDurations() == ShowDurations::Never ) {
+            return false;
+        }
+        const double min = config.minDuration();
+        return min >= 0 && duration >= min;
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            double dur = _sectionStats.durationInSeconds;
+            if ( shouldShowDuration( *m_config, dur ) ) {
+                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    double m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return m_inNanoseconds;
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "us";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    double dur = _sectionStats.durationInSeconds;
+    if (shouldShowDuration(*m_config, dur)) {
+        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters()) {
+        Colour guard(Colour::BrightYellow);
+        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
+    }
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", suiteTime );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection );
+    }
+
+    void JunitReporter::writeSection(  std::string const& className,
+                        std::string const& rootName,
+                        SectionNode const& sectionNode ) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status", "run" );
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode );
+            else
+                writeSection( className, name, *childNode );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
+            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", info.clockResolution)
+            .writeAttribute("estimatedDuration", info.estimatedDuration)
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/scite-app/lexilla/test/unit/makefile b/scite-app/lexilla/test/unit/makefile
new file mode 100644
index 0000000..6e86ccc
--- /dev/null
+++ b/scite-app/lexilla/test/unit/makefile
@@ -0,0 +1,71 @@
+# Build all the unit tests using GNU make and either g++ or clang
+# Should be run using mingw32-make on Windows, not nmake
+# On Windows g++ is used, on OS X clang, and on Linux G++ is used by default
+# but clang can be used by defining CLANG when invoking make
+# clang works only with libc++, not libstdc++
+# Tested with clang 9 and g++ 9
+
+CXXSTD=c++17
+
+ifndef windir
+ifeq ($(shell uname),Darwin)
+# On OS X always use clang as g++ is old version
+CLANG = 1
+USELIBCPP = 1
+endif
+endif
+
+CXXFLAGS += --std=$(CXXSTD)
+
+ifdef CLANG
+CXX = clang++
+ifdef USELIBCPP
+# OS X, use libc++ but don't have sanitizers
+CXXFLAGS += --stdlib=libc++
+LINKFLAGS = -lc++
+else
+# Linux, have sanitizers
+SANITIZE = -fsanitize=address,undefined
+CXXFLAGS += $(SANITIZE)
+endif
+else
+CXX = g++
+endif
+
+ifdef windir
+DEL = del /q
+EXE = unitTest.exe
+else
+DEL = rm -f
+EXE = unitTest
+endif
+
+INCLUDEDIRS = -I ../../include -I ../../src -I../../lexlib -I../../../scintilla/include
+
+CPPFLAGS += $(INCLUDEDIRS)
+CXXFLAGS += -Wall -Wextra
+
+# Files in this directory containing tests
+TESTSRC=test*.cxx
+# Files being tested from scintilla/src directory
+TESTEDSRC=\
+ ../../lexlib/Accessor.cxx \
+ ../../lexlib/CharacterSet.cxx \
+ ../../lexlib/LexerBase.cxx \
+ ../../lexlib/LexerModule.cxx \
+ ../../lexlib/LexerSimple.cxx \
+ ../../lexlib/PropSetSimple.cxx \
+ ../../lexlib/WordList.cxx
+
+TESTS=$(EXE)
+
+all: $(TESTS)
+
+test: $(TESTS)
+	./$(EXE)
+
+clean:
+	$(DEL) $(TESTS) *.o *.obj *.exe
+
+$(EXE): $(TESTSRC) $(TESTEDSRC) unitTest.cxx
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKFLAGS) $^ -o $@
diff --git a/scite-app/lexilla/test/unit/test.mak b/scite-app/lexilla/test/unit/test.mak
new file mode 100644
index 0000000..8a47517
--- /dev/null
+++ b/scite-app/lexilla/test/unit/test.mak
@@ -0,0 +1,34 @@
+# Build all the unit tests with Microsoft Visual C++ using nmake
+# Tested with Visual C++ 2019
+
+DEL = del /q
+EXE = unitTest.exe
+
+INCLUDEDIRS = /I../../include /I../../src /I../../lexlib /I../../../scintilla/include
+
+CXXFLAGS = /EHsc /std:c++17 /D_HAS_AUTO_PTR_ETC=1 /wd 4805 $(INCLUDEDIRS)
+
+# Files in this directory containing tests
+TESTSRC=test*.cxx
+# Files being tested from scintilla/src directory
+TESTEDSRC=\
+ ../../lexlib/Accessor.cxx \
+ ../../lexlib/CharacterSet.cxx \
+ ../../lexlib/LexerBase.cxx \
+ ../../lexlib/LexerModule.cxx \
+ ../../lexlib/LexerSimple.cxx \
+ ../../lexlib/PropSetSimple.cxx \
+ ../../lexlib/WordList.cxx
+
+TESTS=$(EXE)
+
+all: $(TESTS)
+
+test: $(TESTS)
+	$(EXE)
+
+clean:
+	$(DEL) $(TESTS) *.o *.obj *.exe
+
+$(EXE): $(TESTSRC) $(TESTEDSRC) $(@B).obj
+	$(CXX) $(CXXFLAGS) /Fe$@ $**
diff --git a/scite-app/lexilla/test/unit/testCharacterSet.cxx b/scite-app/lexilla/test/unit/testCharacterSet.cxx
new file mode 100644
index 0000000..f0249e9
--- /dev/null
+++ b/scite-app/lexilla/test/unit/testCharacterSet.cxx
@@ -0,0 +1,141 @@
+/** @file testCharacterSet.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <cassert>
+#include <cstring>
+
+#include "CharacterSet.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test CharacterSet.
+
+TEST_CASE("CharacterSet") {
+
+	SECTION("IsEmptyInitially") {
+		CharacterSet cs;
+		for (int i=0; i<0x80; i++) {
+			REQUIRE(!cs.Contains(i));
+		}
+	}
+
+	SECTION("InitialSet") {
+		CharacterSet cs(CharacterSet::setDigits);
+		for (int i=0; i<0x80; i++) {
+			if (i >= '0' && i <= '9')
+				REQUIRE(cs.Contains(i));
+			else
+				REQUIRE(!cs.Contains(i));
+		}
+	}
+
+	SECTION("Set") {
+		CharacterSet cs;
+		cs.Add('a');
+		for (int i=0; i<0x80; i++) {
+			if (i == 'a')
+				REQUIRE(cs.Contains(i));
+			else
+				REQUIRE(!cs.Contains(i));
+		}
+	}
+
+	SECTION("After") {
+		CharacterSet cs;
+		REQUIRE(!cs.Contains(0x100));
+		CharacterSet cs2(CharacterSet::setNone, "", 0x80, true);
+		REQUIRE(cs2.Contains(0x100));
+	}
+}
+
+TEST_CASE("Functions") {
+
+	SECTION("IsASpace") {
+		REQUIRE(IsASpace(' '));
+		REQUIRE(!IsASpace('a'));
+
+		REQUIRE(IsASpaceOrTab(' '));
+		REQUIRE(!IsASpaceOrTab('a'));
+	}
+
+	SECTION("IsADigit") {
+		REQUIRE(!IsADigit(' '));
+		REQUIRE(!IsADigit('a'));
+		REQUIRE(IsADigit('7'));
+
+		REQUIRE(IsADigit('7', 16));
+		REQUIRE(IsADigit('A', 16));
+		REQUIRE(IsADigit('a', 16));
+		REQUIRE(!IsADigit('8', 8));
+	}
+
+	SECTION("IsASCII") {
+		REQUIRE(IsASCII(' '));
+		REQUIRE(IsASCII('a'));
+		REQUIRE(!IsASCII(-1));
+		REQUIRE(!IsASCII(128));
+	}
+
+	SECTION("IsUpperOrLowerCase") {
+		REQUIRE(IsLowerCase('a'));
+		REQUIRE(!IsLowerCase('A'));
+
+		REQUIRE(!IsUpperCase('a'));
+		REQUIRE(IsUpperCase('A'));
+
+		REQUIRE(IsUpperOrLowerCase('a'));
+		REQUIRE(IsUpperOrLowerCase('A'));
+		REQUIRE(!IsUpperOrLowerCase('9'));
+
+		REQUIRE(IsAlphaNumeric('9'));
+		REQUIRE(IsAlphaNumeric('a'));
+		REQUIRE(IsAlphaNumeric('A'));
+		REQUIRE(!IsAlphaNumeric(' '));
+		REQUIRE(!IsAlphaNumeric('+'));
+	}
+
+	SECTION("isoperator") {
+		REQUIRE(isspacechar(' '));
+		REQUIRE(!isspacechar('a'));
+
+		REQUIRE(!iswordchar(' '));
+		REQUIRE(iswordchar('a'));
+		REQUIRE(iswordchar('A'));
+		REQUIRE(iswordchar('.'));
+		REQUIRE(iswordchar('_'));
+
+		REQUIRE(!iswordstart(' '));
+		REQUIRE(iswordstart('a'));
+		REQUIRE(iswordstart('A'));
+		REQUIRE(iswordstart('_'));
+
+		REQUIRE(!isoperator('a'));
+		REQUIRE(isoperator('+'));
+	}
+
+	SECTION("MakeUpperCase") {
+		REQUIRE(MakeUpperCase(' ') == ' ');
+		REQUIRE(MakeUpperCase('A') == 'A');
+		REQUIRE(MakeUpperCase('a') == 'A');
+
+		REQUIRE(MakeLowerCase(' ') == ' ');
+		REQUIRE(MakeLowerCase('A') == 'a');
+		REQUIRE(MakeLowerCase('a') == 'a');
+	}
+
+	SECTION("CompareCaseInsensitive") {
+		REQUIRE(CompareCaseInsensitive(" ", " ") == 0);
+		REQUIRE(CompareCaseInsensitive("A", "A") == 0);
+		REQUIRE(CompareCaseInsensitive("a", "A") == 0);
+		REQUIRE(CompareCaseInsensitive("b", "A") != 0);
+		REQUIRE(CompareCaseInsensitive("aa", "A") != 0);
+
+		REQUIRE(CompareNCaseInsensitive(" ", " ", 1) == 0);
+		REQUIRE(CompareNCaseInsensitive("b", "A", 1) != 0);
+		REQUIRE(CompareNCaseInsensitive("aa", "A", 1) == 0);
+	}
+
+}
\ No newline at end of file
diff --git a/scite-app/lexilla/test/unit/testLexerSimple.cxx b/scite-app/lexilla/test/unit/testLexerSimple.cxx
new file mode 100644
index 0000000..989cb7c
--- /dev/null
+++ b/scite-app/lexilla/test/unit/testLexerSimple.cxx
@@ -0,0 +1,63 @@
+/** @file testLexerSimple.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <cassert>
+#include <cstring>
+
+#include <string_view>
+#include <iostream>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+
+#include "PropSetSimple.h"
+#include "LexerModule.h"
+#include "LexerBase.h"
+#include "LexerSimple.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test LexerSimple.
+
+constexpr const char *propertyName = "lexer.tex.comment.process";
+constexpr const char *propertyValue = "1";
+
+static void ColouriseDocument(Sci_PositionU, Sci_Position, int,	WordList *[], Accessor &) {
+	// Do no styling
+}
+
+LexerModule lmSimpleExample(123456, ColouriseDocument, "simpleexample");
+
+TEST_CASE("LexerNoExceptions") {
+
+	SECTION("Identifier") {
+		LexerSimple lexSimple(&lmSimpleExample);
+		REQUIRE(lexSimple.GetIdentifier() == 123456);
+	}
+
+	SECTION("Identifier") {
+		LexerSimple lexSimple(&lmSimpleExample);
+		REQUIRE(strcmp(lexSimple.GetName(), "simpleexample") == 0);
+	}
+
+	SECTION("SetAndGet") {
+		LexerSimple lexSimple(&lmSimpleExample);
+
+		// New setting -> 0
+		const Sci_Position pos0 = lexSimple.PropertySet(propertyName, "8");
+		REQUIRE(pos0 == 0);
+		// Changed setting -> 0
+		const Sci_Position pos1 = lexSimple.PropertySet(propertyName, propertyValue);
+		REQUIRE(pos1 == 0);
+		// Same setting -> -1
+		const Sci_Position pos2 = lexSimple.PropertySet(propertyName, propertyValue);
+		REQUIRE(pos2 == -1);
+
+		const char *value = lexSimple.PropertyGet(propertyName);
+		REQUIRE(strcmp(propertyValue, value) == 0);
+	}
+
+}
diff --git a/scite-app/lexilla/test/unit/testPropSetSimple.cxx b/scite-app/lexilla/test/unit/testPropSetSimple.cxx
new file mode 100644
index 0000000..ab5dee9
--- /dev/null
+++ b/scite-app/lexilla/test/unit/testPropSetSimple.cxx
@@ -0,0 +1,48 @@
+/** @file testPropSetSimple.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <cassert>
+#include <cstring>
+
+#include <string_view>
+#include <iostream>
+
+#include "PropSetSimple.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test PropSetSimple.
+
+constexpr const char *propertyName = "lexer.tex.comment.process";
+constexpr const char *propertyValue = "1";
+
+TEST_CASE("PropSetSimple") {
+
+	SECTION("IsEmptyInitially") {
+		PropSetSimple pss;
+		const char *value = pss.Get(propertyName);
+		REQUIRE(strcmp("", value) == 0);
+	}
+
+	SECTION("SetAndGet") {
+		PropSetSimple pss;
+		pss.Set(propertyName, propertyValue);
+		const char *value = pss.Get(propertyName);
+		REQUIRE(strcmp(propertyValue, value) == 0);
+	}
+
+	SECTION("GetInt") {
+		PropSetSimple pss;
+		const int valueStart = pss.GetInt(propertyName);
+		REQUIRE(0 == valueStart);
+		const int valueDefault = pss.GetInt(propertyName, 3);
+		REQUIRE(3 == valueDefault);
+		pss.Set(propertyName, propertyValue);
+		const int value = pss.GetInt(propertyName);
+		REQUIRE(1 == value);
+	}
+
+}
diff --git a/scite-app/lexilla/test/unit/testSparseState.cxx b/scite-app/lexilla/test/unit/testSparseState.cxx
new file mode 100644
index 0000000..6339856
--- /dev/null
+++ b/scite-app/lexilla/test/unit/testSparseState.cxx
@@ -0,0 +1,234 @@
+/** @file testSparseState.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <memory>
+
+#include "Sci_Position.h"
+
+#include "SparseState.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test SparseState.
+
+TEST_CASE("SparseState") {
+
+	SparseState<int> ss;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0u == ss.size());
+		int val = ss.ValueAt(0);
+		REQUIRE(0 == val);
+	}
+
+	SECTION("SimpleSetAndGet") {
+		ss.Set(0, 22);
+		ss.Set(1, 23);
+		REQUIRE(2u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(22 == ss.ValueAt(0));
+		REQUIRE(23 == ss.ValueAt(1));
+		REQUIRE(23 == ss.ValueAt(2));
+	}
+
+	SECTION("RetrieveBetween") {
+		ss.Set(0, 10);
+		ss.Set(2, 12);
+		REQUIRE(2u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(10 == ss.ValueAt(0));
+		REQUIRE(10 == ss.ValueAt(1));
+		REQUIRE(12 == ss.ValueAt(2));
+	}
+
+	SECTION("RetrieveBefore") {
+		ss.Set(2, 12);
+		REQUIRE(1u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(0 == ss.ValueAt(0));
+		REQUIRE(0 == ss.ValueAt(1));
+		REQUIRE(12 == ss.ValueAt(2));
+	}
+
+	SECTION("Delete") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Delete(2);
+		REQUIRE(1u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(30 == ss.ValueAt(0));
+		REQUIRE(30 == ss.ValueAt(1));
+		REQUIRE(30 == ss.ValueAt(2));
+	}
+
+	SECTION("DeleteBetween") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Delete(1);
+		REQUIRE(1u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(30 == ss.ValueAt(0));
+		REQUIRE(30 == ss.ValueAt(1));
+		REQUIRE(30 == ss.ValueAt(2));
+	}
+
+	SECTION("ReplaceLast") {
+		ss.Set(0, 30);
+		ss.Set(2, 31);
+		ss.Set(2, 32);
+		REQUIRE(2u == ss.size());
+		REQUIRE(0 == ss.ValueAt(-1));
+		REQUIRE(30 == ss.ValueAt(0));
+		REQUIRE(30 == ss.ValueAt(1));
+		REQUIRE(32 == ss.ValueAt(2));
+		REQUIRE(32 == ss.ValueAt(3));
+	}
+
+	SECTION("OnlyChangeAppended") {
+		ss.Set(0, 30);
+		ss.Set(2, 31);
+		ss.Set(3, 31);
+		REQUIRE(2u == ss.size());
+	}
+
+	SECTION("MergeBetween") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+		REQUIRE(3u == ss.size());
+
+		SparseState<int> ssAdditions(3);
+		ssAdditions.Set(4, 34);
+		REQUIRE(1u == ssAdditions.size());
+		bool mergeChanged = ss.Merge(ssAdditions,5);
+		REQUIRE(false == mergeChanged);
+
+		ssAdditions.Set(4, 44);
+		REQUIRE(1u == ssAdditions.size());
+		mergeChanged = ss.Merge(ssAdditions,5);
+		REQUIRE(true == mergeChanged);
+		REQUIRE(3u == ss.size());
+		REQUIRE(44 == ss.ValueAt(4));
+	}
+
+	SECTION("MergeAtExisting") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+		REQUIRE(3u == ss.size());
+
+		SparseState<int> ssAdditions(4);
+		ssAdditions.Set(4, 34);
+		REQUIRE(1u == ssAdditions.size());
+		bool mergeChanged = ss.Merge(ssAdditions,5);
+		REQUIRE(false == mergeChanged);
+
+		ssAdditions.Set(4, 44);
+		REQUIRE(1u == ssAdditions.size());
+		mergeChanged = ss.Merge(ssAdditions,5);
+		REQUIRE(true == mergeChanged);
+		REQUIRE(3u == ss.size());
+		REQUIRE(44 == ss.ValueAt(4));
+	}
+
+	SECTION("MergeWhichRemoves") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+		REQUIRE(3u == ss.size());
+
+		SparseState<int> ssAdditions(2);
+		ssAdditions.Set(2, 22);
+		REQUIRE(1u == ssAdditions.size());
+		REQUIRE(22 == ssAdditions.ValueAt(2));
+		bool mergeChanged = ss.Merge(ssAdditions,5);
+		REQUIRE(true == mergeChanged);
+		REQUIRE(2u == ss.size());
+		REQUIRE(22 == ss.ValueAt(2));
+	}
+
+	SECTION("MergeIgnoreSome") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+
+		SparseState<int> ssAdditions(2);
+		ssAdditions.Set(2, 32);
+		bool mergeChanged = ss.Merge(ssAdditions,3);
+
+		REQUIRE(false == mergeChanged);
+		REQUIRE(2u == ss.size());
+		REQUIRE(32 == ss.ValueAt(2));
+	}
+
+	SECTION("MergeIgnoreSomeStart") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+
+		SparseState<int> ssAdditions(2);
+		ssAdditions.Set(2, 32);
+		bool mergeChanged = ss.Merge(ssAdditions,2);
+
+		REQUIRE(false == mergeChanged);
+		REQUIRE(2u == ss.size());
+		REQUIRE(32 == ss.ValueAt(2));
+	}
+
+	SECTION("MergeIgnoreRepeat") {
+		ss.Set(0, 30);
+		ss.Set(2, 32);
+		ss.Set(4, 34);
+
+		SparseState<int> ssAdditions(5);
+		// Appending same value as at end of pss.
+		ssAdditions.Set(5, 34);
+		bool mergeChanged = ss.Merge(ssAdditions,6);
+
+		REQUIRE(false == mergeChanged);
+		REQUIRE(3u == ss.size());
+		REQUIRE(34 == ss.ValueAt(4));
+	}
+
+}
+
+TEST_CASE("SparseStateString") {
+
+	SparseState<std::string> ss;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0u == ss.size());
+		std::string val = ss.ValueAt(0);
+		REQUIRE("" == val);
+	}
+
+	SECTION("SimpleSetAndGet") {
+		REQUIRE(0u == ss.size());
+		ss.Set(0, "22");
+		ss.Set(1, "23");
+		REQUIRE(2u == ss.size());
+		REQUIRE("" == ss.ValueAt(-1));
+		REQUIRE("22" == ss.ValueAt(0));
+		REQUIRE("23" == ss.ValueAt(1));
+		REQUIRE("23" == ss.ValueAt(2));
+	}
+
+	SECTION("DeleteBetween") {
+		ss.Set(0, "30");
+		ss.Set(2, "32");
+		ss.Delete(1);
+		REQUIRE(1u == ss.size());
+		REQUIRE("" == ss.ValueAt(-1));
+		REQUIRE("30" == ss.ValueAt(0));
+		REQUIRE("30" == ss.ValueAt(1));
+		REQUIRE("30" == ss.ValueAt(2));
+	}
+
+}
diff --git a/scite-app/lexilla/test/unit/testWordList.cxx b/scite-app/lexilla/test/unit/testWordList.cxx
new file mode 100644
index 0000000..21e11a9
--- /dev/null
+++ b/scite-app/lexilla/test/unit/testWordList.cxx
@@ -0,0 +1,89 @@
+/** @file testWordList.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <string.h>
+
+#include "WordList.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test WordList.
+
+TEST_CASE("WordList") {
+
+	WordList wl;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0 == wl.Length());
+		REQUIRE(!wl.InList("struct"));
+	}
+
+	SECTION("InList") {
+		wl.Set("else struct");
+		REQUIRE(2 == wl.Length());
+		REQUIRE(wl.InList("struct"));
+		REQUIRE(!wl.InList("class"));
+	}
+
+	SECTION("Set") {
+		// Check whether Set returns whether it has changed correctly
+		const bool changed = wl.Set("else struct");
+		REQUIRE(changed);
+		// Changing to same thing
+		const bool changed2 = wl.Set("else struct");
+		REQUIRE(!changed2);
+		// Changed order shouldn't be seen as a change
+		const bool changed3 = wl.Set("struct else");
+		REQUIRE(!changed3);
+		// Removing word is a change
+		const bool changed4 = wl.Set("struct");
+		REQUIRE(changed4);
+	}
+
+	SECTION("WordAt") {
+		wl.Set("else struct");
+		REQUIRE(0 == strcmp(wl.WordAt(0), "else"));
+	}
+
+	SECTION("InListAbbreviated") {
+		wl.Set("else stru~ct w~hile");
+		REQUIRE(wl.InListAbbreviated("else", '~'));
+
+		REQUIRE(wl.InListAbbreviated("struct", '~'));
+		REQUIRE(wl.InListAbbreviated("stru", '~'));
+		REQUIRE(wl.InListAbbreviated("struc", '~'));
+		REQUIRE(!wl.InListAbbreviated("str", '~'));
+
+		REQUIRE(wl.InListAbbreviated("while", '~'));
+		REQUIRE(wl.InListAbbreviated("wh", '~'));
+		// TODO: Next line fails but should allow single character prefixes
+		//REQUIRE(wl.InListAbbreviated("w", '~'));
+		REQUIRE(!wl.InListAbbreviated("", '~'));
+	}
+
+	SECTION("InListAbridged") {
+		wl.Set("list w.~.active bo~k a~z ~_frozen");
+		REQUIRE(wl.InListAbridged("list", '~'));
+
+		REQUIRE(wl.InListAbridged("w.front.active", '~'));
+		REQUIRE(wl.InListAbridged("w.x.active", '~'));
+		REQUIRE(wl.InListAbridged("w..active", '~'));
+		REQUIRE(!wl.InListAbridged("w.active", '~'));
+		REQUIRE(!wl.InListAbridged("w.x.closed", '~'));
+
+		REQUIRE(wl.InListAbridged("book", '~'));
+		REQUIRE(wl.InListAbridged("bok", '~'));
+		REQUIRE(!wl.InListAbridged("bk", '~'));
+
+		REQUIRE(wl.InListAbridged("a_frozen", '~'));
+		REQUIRE(wl.InListAbridged("_frozen", '~'));
+		REQUIRE(!wl.InListAbridged("frozen", '~'));
+
+		REQUIRE(wl.InListAbridged("abcz", '~'));
+		REQUIRE(wl.InListAbridged("abz", '~'));
+		REQUIRE(wl.InListAbridged("az", '~'));
+	}
+}
diff --git a/scite-app/lexilla/test/unit/unitTest.cxx b/scite-app/lexilla/test/unit/unitTest.cxx
new file mode 100644
index 0000000..16b36f4
--- /dev/null
+++ b/scite-app/lexilla/test/unit/unitTest.cxx
@@ -0,0 +1,29 @@
+/** @file unitTest.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+ 
+/*
+    Currently tested:
+        WordList
+        SparseState
+*/
+
+#include <cstdio>
+#include <cstdarg>
+
+#include <string_view>
+#include <vector>
+#include <memory>
+
+#if defined(__GNUC__)
+// Want to avoid misleading indentation warnings in catch.hpp but the pragma
+// may not be available so protect by turning off pragma warnings
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wpragmas"
+#if !defined(__clang__)
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+#endif
+
+#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+#include "catch.hpp"
diff --git a/scite-app/lexilla/tgzsrc b/scite-app/lexilla/tgzsrc
new file mode 100644
index 0000000..9eb4153
--- /dev/null
+++ b/scite-app/lexilla/tgzsrc
@@ -0,0 +1,4 @@
+cd ..
+rm -f lexilla.tgz
+tar --create --exclude \*.o --exclude \*.obj --exclude \*.dll --exclude \*.so --exclude \*.exe --exclude \*.a lexilla/* \
+	| gzip -c >lexilla.tgz
diff --git a/scite-app/lexilla/version.txt b/scite-app/lexilla/version.txt
new file mode 100644
index 0000000..c0556fb
--- /dev/null
+++ b/scite-app/lexilla/version.txt
@@ -0,0 +1 @@
+511
diff --git a/scite-app/lexilla/zipsrc.bat b/scite-app/lexilla/zipsrc.bat
new file mode 100755
index 0000000..808e72d
--- /dev/null
+++ b/scite-app/lexilla/zipsrc.bat
@@ -0,0 +1,18 @@
+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__/*
+cd lexilla
diff --git a/scite-app/scintilla/CONTRIBUTING b/scite-app/scintilla/CONTRIBUTING
new file mode 100644
index 0000000..cf70eaf
--- /dev/null
+++ b/scite-app/scintilla/CONTRIBUTING
@@ -0,0 +1,20 @@
+Fixes should be posted to the Bug Tracker
+http://sourceforge.net/p/scintilla/bugs/
+
+Features should be posted to the Feature Request Tracker
+http://sourceforge.net/p/scintilla/feature-requests/
+
+Either send unified diffs (or patch files) or zip archives with whole files.
+Mercurial patch files are best as they include author information and commit
+messages.
+
+Questions should go to the scintilla-interest mailing list
+https://groups.google.com/forum/#!forum/scintilla-interest
+
+Code should follow the guidelines at
+http://www.scintilla.org/SciCoding.html
+
+Do not use SourceForge's Merge Request mechanism or message sending
+feature as no one is monitoring these.
+The neilh @ scintilla.org account receives much spam and is only checked
+occasionally. Almost all Scintilla mail should go to the mailing list.
\ No newline at end of file
diff --git a/scite-app/scintilla/License.txt b/scite-app/scintilla/License.txt
new file mode 100644
index 0000000..e93ac62
--- /dev/null
+++ b/scite-app/scintilla/License.txt
@@ -0,0 +1,20 @@
+License for Lexilla, Scintilla, and SciTE
+
+Copyright 1998-2021 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/scite-app/scintilla/README b/scite-app/scintilla/README
new file mode 100644
index 0000000..fcdc406
--- /dev/null
+++ b/scite-app/scintilla/README
@@ -0,0 +1,92 @@
+README for building of Scintilla, Lexilla, and SciTE
+
+Scintilla and Lexilla can be built by themselves.
+To build SciTE, Scintilla and Lexilla should first be built.
+
+See lexilla/README for information on building Lexilla.
+
+*** GTK+/Linux version ***
+
+You must first have GTK+ 2.24 or later and GCC (7.1 or better) installed.
+Clang may be used by adding CLANG=1 to the make command line.
+Other C++ compilers may work but may require tweaking the make file.
+Either GTK+ 2.x or 3.x may be used with 2.x the default and 3.x
+chosen with the make argument GTK3=1.
+
+To build Scintilla, use the makefile located in the scintilla/gtk directory
+	cd scintilla/gtk
+	make
+	cd ../..
+
+To build and install SciTE, use the makefile located in the scite/gtk directory
+	cd scite/gtk
+	make
+	sudo make install
+
+This installs SciTE into $prefix/bin. The value of $prefix is determined from
+the location of Gnome if it is installed. This is usually /usr if installed
+with Linux or /usr/local if built from source. If Gnome is not installed
+/usr/bin is used as the prefix. The prefix can be overridden on the command
+line like "make prefix=/opt" but the same value should be used for both make
+and make install as this location is compiled into the executable. The global
+properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
+The language specific properties files are also installed into this directory.
+
+To remove SciTE
+	sudo make uninstall
+
+To clean the object files which may be needed to change $prefix
+	make clean
+
+The current make file supports static and dynamic linking between SciTE, Scintilla, and Lexilla.
+
+
+*** Windows version ***
+
+A C++ 17 compiler is required.
+Visual Studio 2019 is the development system used for most development
+although Mingw-w64 9.2 is also supported.
+
+To build Scintilla, make in the scintilla/win32 directory
+		cd scintilla\win32
+GCC:		mingw32-make
+Visual C++:	nmake -f scintilla.mak
+		cd ..\..
+
+To build SciTE, use the makefiles located in the scite/win32 directory
+		cd scite\win32
+GCC:		mingw32-make
+Visual C++: 	nmake -f scite.mak
+
+An executable SciTE will now be in scite/bin.
+
+*** GTK+/Windows version ***
+
+Mingw-w64 is known to work. Other compilers will probably not work.
+
+Only Scintilla will build with GTK+ on Windows. SciTE will not work.
+
+Make builds both a static library version of Scintilla with lexers (scintilla.a) and
+a shared library without lexers (libscintilla.so or or libscintilla.dll).
+
+To build Scintilla, make in the scintilla/gtk directory
+	cd scintilla\gtk
+	mingw32-make
+
+*** macOS Cocoa version ***
+
+Xcode 9.2 or later may be used to build Scintilla on macOS.
+
+There is no open source version of SciTE for macOS but there is a commercial
+version available through the App Store.
+
+To build Scintilla, run xcodebuild in the scintilla/cocoa/ScintillaFramework or 
+scintilla/cocoa/Scintilla directory
+
+        cd cocoa/Scintilla
+
+	xcodebuild
+
+*** Qt version ***
+
+See the qt/README file to build Scintilla with Qt.
diff --git a/scite-app/scintilla/bin/__init__.py b/scite-app/scintilla/bin/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/scite-app/scintilla/bin/__init__.py
@@ -0,0 +1 @@
+
diff --git a/scite-app/scintilla/bin/empty.txt b/scite-app/scintilla/bin/empty.txt
new file mode 100644
index 0000000..6618385
--- /dev/null
+++ b/scite-app/scintilla/bin/empty.txt
@@ -0,0 +1 @@
+This empty files ensures that the directory is created.
\ No newline at end of file
diff --git a/scite-app/scintilla/call/ScintillaCall.cxx b/scite-app/scintilla/call/ScintillaCall.cxx
new file mode 100644
index 0000000..23de3f0
--- /dev/null
+++ b/scite-app/scintilla/call/ScintillaCall.cxx
@@ -0,0 +1,3329 @@
+// SciTE - Scintilla based Text Editor
+/** @file ScintillaCall.cxx
+ ** Interface to calling a Scintilla instance.
+ **/
+// Copyright 1998-2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. APIFacer.py does the generation. */
+
+#include <cstdint>
+
+#include <string>
+#include <string_view>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+namespace Scintilla {
+
+ScintillaCall::ScintillaCall() noexcept : fn(nullptr), ptr(0), statusLastCall(Status::Ok) {
+}
+
+void ScintillaCall::SetFnPtr(FunctionDirect fn_, intptr_t ptr_) noexcept {
+	fn = fn_;
+	ptr = ptr_;
+}
+
+bool ScintillaCall::IsValid() const noexcept {
+	return fn && ptr;
+}
+
+intptr_t ScintillaCall::Call(Message msg, uintptr_t wParam, intptr_t lParam) {
+	if (!fn)
+		throw Failure(Status::Failure);
+	int status = 0;
+	const intptr_t retVal = fn(ptr, static_cast<unsigned int>(msg), wParam, lParam, &status);
+	statusLastCall = static_cast<Scintilla::Status>(status);
+	if (statusLastCall > Status::Ok && statusLastCall < Status::WarnStart)
+		throw Failure(statusLastCall);
+	return retVal;
+}
+
+intptr_t ScintillaCall::CallPointer(Message msg, uintptr_t wParam, void *s) {
+	return Call(msg, wParam, reinterpret_cast<intptr_t>(s));
+}
+
+intptr_t ScintillaCall::CallString(Message msg, uintptr_t wParam, const char *s) {
+	return Call(msg, wParam, reinterpret_cast<intptr_t>(s));
+}
+
+std::string ScintillaCall::CallReturnString(Message msg, uintptr_t wParam) {
+	size_t len = CallPointer(msg, wParam, nullptr);
+	if (len) {
+		std::string value(len, '\0');
+		CallPointer(msg, wParam, value.data());
+		return value;
+	} else {
+		return std::string();
+	}
+}
+
+// Common APIs made more structured and type-safe
+
+Position ScintillaCall::LineStart(Line line) {
+	return Call(Message::PositionFromLine, line);
+}
+
+Position ScintillaCall::LineEnd(Line line) {
+	return Call(Message::GetLineEndPosition, line);
+}
+
+Span ScintillaCall::SelectionSpan() {
+	return Span(
+		       Call(Message::GetSelectionStart),
+		       Call(Message::GetSelectionEnd));
+}
+
+Span ScintillaCall::TargetSpan() {
+	return Span(
+		       Call(Message::GetTargetStart),
+		       Call(Message::GetTargetEnd));
+}
+
+void ScintillaCall::SetTarget(Span span) {
+	Call(Message::SetTargetRange, span.start, span.end);
+}
+
+void ScintillaCall::ColouriseAll() {
+	Colourise(0, -1);
+}
+
+char ScintillaCall::CharacterAt(Position position) {
+	return static_cast<char>(Call(Message::GetCharAt, position));
+}
+
+int ScintillaCall::UnsignedStyleAt(Position position) {
+	// Returns signed value but easier to use as unsigned
+	return static_cast<unsigned char>(Call(Message::GetStyleAt, position));
+}
+
+std::string ScintillaCall::StringOfSpan(Span span) {
+	if (span.Length() == 0) {
+		return std::string();
+	} else {
+		std::string text(span.Length(), '\0');
+		SetTarget(span);
+		TargetText(text.data());
+		return text;
+	}
+}
+
+Position ScintillaCall::ReplaceTarget(std::string_view text) {
+	return ScintillaCall::CallString(Message::ReplaceTarget, text.length(), text.data());
+}
+
+Position ScintillaCall::ReplaceTargetRE(std::string_view text) {
+	return CallString(Message::ReplaceTargetRE, text.length(), text.data());
+}
+
+Position ScintillaCall::SearchInTarget(std::string_view text) {
+	return CallString(Message::SearchInTarget, text.length(), text.data());
+}
+
+Span ScintillaCall::SpanSearchInTarget(std::string_view text) {
+	const Position posFound = SearchInTarget(text);
+	if (posFound >= 0)
+		return Span(posFound, TargetEnd());
+	else
+		return Span(posFound, 0);
+}
+
+// Generated methods
+
+// ScintillaCall requires automatically generated casts as it is converting
+// specific types to/from generic arguments and return values of 'Call'.
+// Suppress Visual C++ Code Analysis warnings for these casts and pointer returns.
+// 26472 = Don't use a static_cast for arithmetic conversions.
+// 26487 = Don't return a pointer '*' that may be invalid (lifetime.4).
+// 26490 = Don't use reinterpret_cast.
+#if defined(_MSC_VER)
+#pragma warning(disable: 26472 26487 26490)
+#endif
+
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+void ScintillaCall::AddText(Position length, const char *text) {
+	CallString(Message::AddText, length, text);
+}
+
+void ScintillaCall::AddStyledText(Position length, const char *c) {
+	CallString(Message::AddStyledText, length, c);
+}
+
+void ScintillaCall::InsertText(Position pos, const char *text) {
+	CallString(Message::InsertText, pos, text);
+}
+
+void ScintillaCall::ChangeInsertion(Position length, const char *text) {
+	CallString(Message::ChangeInsertion, length, text);
+}
+
+void ScintillaCall::ClearAll() {
+	Call(Message::ClearAll);
+}
+
+void ScintillaCall::DeleteRange(Position start, Position lengthDelete) {
+	Call(Message::DeleteRange, start, lengthDelete);
+}
+
+void ScintillaCall::ClearDocumentStyle() {
+	Call(Message::ClearDocumentStyle);
+}
+
+Position ScintillaCall::Length() {
+	return Call(Message::GetLength);
+}
+
+int ScintillaCall::CharAt(Position pos) {
+	return static_cast<int>(Call(Message::GetCharAt, pos));
+}
+
+Position ScintillaCall::CurrentPos() {
+	return Call(Message::GetCurrentPos);
+}
+
+Position ScintillaCall::Anchor() {
+	return Call(Message::GetAnchor);
+}
+
+int ScintillaCall::StyleAt(Position pos) {
+	return static_cast<int>(Call(Message::GetStyleAt, pos));
+}
+
+void ScintillaCall::Redo() {
+	Call(Message::Redo);
+}
+
+void ScintillaCall::SetUndoCollection(bool collectUndo) {
+	Call(Message::SetUndoCollection, collectUndo);
+}
+
+void ScintillaCall::SelectAll() {
+	Call(Message::SelectAll);
+}
+
+void ScintillaCall::SetSavePoint() {
+	Call(Message::SetSavePoint);
+}
+
+Position ScintillaCall::GetStyledText(void *tr) {
+	return CallPointer(Message::GetStyledText, 0, tr);
+}
+
+bool ScintillaCall::CanRedo() {
+	return Call(Message::CanRedo);
+}
+
+Line ScintillaCall::MarkerLineFromHandle(int markerHandle) {
+	return Call(Message::MarkerLineFromHandle, markerHandle);
+}
+
+void ScintillaCall::MarkerDeleteHandle(int markerHandle) {
+	Call(Message::MarkerDeleteHandle, markerHandle);
+}
+
+int ScintillaCall::MarkerHandleFromLine(Line line, int which) {
+	return static_cast<int>(Call(Message::MarkerHandleFromLine, line, which));
+}
+
+int ScintillaCall::MarkerNumberFromLine(Line line, int which) {
+	return static_cast<int>(Call(Message::MarkerNumberFromLine, line, which));
+}
+
+bool ScintillaCall::UndoCollection() {
+	return Call(Message::GetUndoCollection);
+}
+
+WhiteSpace ScintillaCall::ViewWS() {
+	return static_cast<Scintilla::WhiteSpace>(Call(Message::GetViewWS));
+}
+
+void ScintillaCall::SetViewWS(Scintilla::WhiteSpace viewWS) {
+	Call(Message::SetViewWS, static_cast<uintptr_t>(viewWS));
+}
+
+TabDrawMode ScintillaCall::TabDrawMode() {
+	return static_cast<Scintilla::TabDrawMode>(Call(Message::GetTabDrawMode));
+}
+
+void ScintillaCall::SetTabDrawMode(Scintilla::TabDrawMode tabDrawMode) {
+	Call(Message::SetTabDrawMode, static_cast<uintptr_t>(tabDrawMode));
+}
+
+Position ScintillaCall::PositionFromPoint(int x, int y) {
+	return Call(Message::PositionFromPoint, x, y);
+}
+
+Position ScintillaCall::PositionFromPointClose(int x, int y) {
+	return Call(Message::PositionFromPointClose, x, y);
+}
+
+void ScintillaCall::GotoLine(Line line) {
+	Call(Message::GotoLine, line);
+}
+
+void ScintillaCall::GotoPos(Position caret) {
+	Call(Message::GotoPos, caret);
+}
+
+void ScintillaCall::SetAnchor(Position anchor) {
+	Call(Message::SetAnchor, anchor);
+}
+
+Position ScintillaCall::GetCurLine(Position length, char *text) {
+	return CallPointer(Message::GetCurLine, length, text);
+}
+
+std::string ScintillaCall::GetCurLine(Position length) {
+	return CallReturnString(Message::GetCurLine, length);
+}
+
+Position ScintillaCall::EndStyled() {
+	return Call(Message::GetEndStyled);
+}
+
+void ScintillaCall::ConvertEOLs(Scintilla::EndOfLine eolMode) {
+	Call(Message::ConvertEOLs, static_cast<uintptr_t>(eolMode));
+}
+
+EndOfLine ScintillaCall::EOLMode() {
+	return static_cast<Scintilla::EndOfLine>(Call(Message::GetEOLMode));
+}
+
+void ScintillaCall::SetEOLMode(Scintilla::EndOfLine eolMode) {
+	Call(Message::SetEOLMode, static_cast<uintptr_t>(eolMode));
+}
+
+void ScintillaCall::StartStyling(Position start, int unused) {
+	Call(Message::StartStyling, start, unused);
+}
+
+void ScintillaCall::SetStyling(Position length, int style) {
+	Call(Message::SetStyling, length, style);
+}
+
+bool ScintillaCall::BufferedDraw() {
+	return Call(Message::GetBufferedDraw);
+}
+
+void ScintillaCall::SetBufferedDraw(bool buffered) {
+	Call(Message::SetBufferedDraw, buffered);
+}
+
+void ScintillaCall::SetTabWidth(int tabWidth) {
+	Call(Message::SetTabWidth, tabWidth);
+}
+
+int ScintillaCall::TabWidth() {
+	return static_cast<int>(Call(Message::GetTabWidth));
+}
+
+void ScintillaCall::SetTabMinimumWidth(int pixels) {
+	Call(Message::SetTabMinimumWidth, pixels);
+}
+
+int ScintillaCall::TabMinimumWidth() {
+	return static_cast<int>(Call(Message::GetTabMinimumWidth));
+}
+
+void ScintillaCall::ClearTabStops(Line line) {
+	Call(Message::ClearTabStops, line);
+}
+
+void ScintillaCall::AddTabStop(Line line, int x) {
+	Call(Message::AddTabStop, line, x);
+}
+
+int ScintillaCall::GetNextTabStop(Line line, int x) {
+	return static_cast<int>(Call(Message::GetNextTabStop, line, x));
+}
+
+void ScintillaCall::SetCodePage(int codePage) {
+	Call(Message::SetCodePage, codePage);
+}
+
+void ScintillaCall::SetFontLocale(const char *localeName) {
+	CallString(Message::SetFontLocale, 0, localeName);
+}
+
+int ScintillaCall::FontLocale(char *localeName) {
+	return static_cast<int>(CallPointer(Message::GetFontLocale, 0, localeName));
+}
+
+std::string ScintillaCall::FontLocale() {
+	return CallReturnString(Message::GetFontLocale, 0);
+}
+
+IMEInteraction ScintillaCall::IMEInteraction() {
+	return static_cast<Scintilla::IMEInteraction>(Call(Message::GetIMEInteraction));
+}
+
+void ScintillaCall::SetIMEInteraction(Scintilla::IMEInteraction imeInteraction) {
+	Call(Message::SetIMEInteraction, static_cast<uintptr_t>(imeInteraction));
+}
+
+void ScintillaCall::MarkerDefine(int markerNumber, Scintilla::MarkerSymbol markerSymbol) {
+	Call(Message::MarkerDefine, markerNumber, static_cast<intptr_t>(markerSymbol));
+}
+
+void ScintillaCall::MarkerSetFore(int markerNumber, Colour fore) {
+	Call(Message::MarkerSetFore, markerNumber, fore);
+}
+
+void ScintillaCall::MarkerSetBack(int markerNumber, Colour back) {
+	Call(Message::MarkerSetBack, markerNumber, back);
+}
+
+void ScintillaCall::MarkerSetBackSelected(int markerNumber, Colour back) {
+	Call(Message::MarkerSetBackSelected, markerNumber, back);
+}
+
+void ScintillaCall::MarkerSetForeTranslucent(int markerNumber, ColourAlpha fore) {
+	Call(Message::MarkerSetForeTranslucent, markerNumber, fore);
+}
+
+void ScintillaCall::MarkerSetBackTranslucent(int markerNumber, ColourAlpha back) {
+	Call(Message::MarkerSetBackTranslucent, markerNumber, back);
+}
+
+void ScintillaCall::MarkerSetBackSelectedTranslucent(int markerNumber, ColourAlpha back) {
+	Call(Message::MarkerSetBackSelectedTranslucent, markerNumber, back);
+}
+
+void ScintillaCall::MarkerSetStrokeWidth(int markerNumber, int hundredths) {
+	Call(Message::MarkerSetStrokeWidth, markerNumber, hundredths);
+}
+
+void ScintillaCall::MarkerEnableHighlight(bool enabled) {
+	Call(Message::MarkerEnableHighlight, enabled);
+}
+
+int ScintillaCall::MarkerAdd(Line line, int markerNumber) {
+	return static_cast<int>(Call(Message::MarkerAdd, line, markerNumber));
+}
+
+void ScintillaCall::MarkerDelete(Line line, int markerNumber) {
+	Call(Message::MarkerDelete, line, markerNumber);
+}
+
+void ScintillaCall::MarkerDeleteAll(int markerNumber) {
+	Call(Message::MarkerDeleteAll, markerNumber);
+}
+
+int ScintillaCall::MarkerGet(Line line) {
+	return static_cast<int>(Call(Message::MarkerGet, line));
+}
+
+Line ScintillaCall::MarkerNext(Line lineStart, int markerMask) {
+	return Call(Message::MarkerNext, lineStart, markerMask);
+}
+
+Line ScintillaCall::MarkerPrevious(Line lineStart, int markerMask) {
+	return Call(Message::MarkerPrevious, lineStart, markerMask);
+}
+
+void ScintillaCall::MarkerDefinePixmap(int markerNumber, const char *pixmap) {
+	CallString(Message::MarkerDefinePixmap, markerNumber, pixmap);
+}
+
+void ScintillaCall::MarkerAddSet(Line line, int markerSet) {
+	Call(Message::MarkerAddSet, line, markerSet);
+}
+
+void ScintillaCall::MarkerSetAlpha(int markerNumber, Scintilla::Alpha alpha) {
+	Call(Message::MarkerSetAlpha, markerNumber, static_cast<intptr_t>(alpha));
+}
+
+Layer ScintillaCall::MarkerGetLayer(int markerNumber) {
+	return static_cast<Scintilla::Layer>(Call(Message::MarkerGetLayer, markerNumber));
+}
+
+void ScintillaCall::MarkerSetLayer(int markerNumber, Scintilla::Layer layer) {
+	Call(Message::MarkerSetLayer, markerNumber, static_cast<intptr_t>(layer));
+}
+
+void ScintillaCall::SetMarginTypeN(int margin, Scintilla::MarginType marginType) {
+	Call(Message::SetMarginTypeN, margin, static_cast<intptr_t>(marginType));
+}
+
+MarginType ScintillaCall::MarginTypeN(int margin) {
+	return static_cast<Scintilla::MarginType>(Call(Message::GetMarginTypeN, margin));
+}
+
+void ScintillaCall::SetMarginWidthN(int margin, int pixelWidth) {
+	Call(Message::SetMarginWidthN, margin, pixelWidth);
+}
+
+int ScintillaCall::MarginWidthN(int margin) {
+	return static_cast<int>(Call(Message::GetMarginWidthN, margin));
+}
+
+void ScintillaCall::SetMarginMaskN(int margin, int mask) {
+	Call(Message::SetMarginMaskN, margin, mask);
+}
+
+int ScintillaCall::MarginMaskN(int margin) {
+	return static_cast<int>(Call(Message::GetMarginMaskN, margin));
+}
+
+void ScintillaCall::SetMarginSensitiveN(int margin, bool sensitive) {
+	Call(Message::SetMarginSensitiveN, margin, sensitive);
+}
+
+bool ScintillaCall::MarginSensitiveN(int margin) {
+	return Call(Message::GetMarginSensitiveN, margin);
+}
+
+void ScintillaCall::SetMarginCursorN(int margin, Scintilla::CursorShape cursor) {
+	Call(Message::SetMarginCursorN, margin, static_cast<intptr_t>(cursor));
+}
+
+CursorShape ScintillaCall::MarginCursorN(int margin) {
+	return static_cast<Scintilla::CursorShape>(Call(Message::GetMarginCursorN, margin));
+}
+
+void ScintillaCall::SetMarginBackN(int margin, Colour back) {
+	Call(Message::SetMarginBackN, margin, back);
+}
+
+Colour ScintillaCall::MarginBackN(int margin) {
+	return static_cast<Colour>(Call(Message::GetMarginBackN, margin));
+}
+
+void ScintillaCall::SetMargins(int margins) {
+	Call(Message::SetMargins, margins);
+}
+
+int ScintillaCall::Margins() {
+	return static_cast<int>(Call(Message::GetMargins));
+}
+
+void ScintillaCall::StyleClearAll() {
+	Call(Message::StyleClearAll);
+}
+
+void ScintillaCall::StyleSetFore(int style, Colour fore) {
+	Call(Message::StyleSetFore, style, fore);
+}
+
+void ScintillaCall::StyleSetBack(int style, Colour back) {
+	Call(Message::StyleSetBack, style, back);
+}
+
+void ScintillaCall::StyleSetBold(int style, bool bold) {
+	Call(Message::StyleSetBold, style, bold);
+}
+
+void ScintillaCall::StyleSetItalic(int style, bool italic) {
+	Call(Message::StyleSetItalic, style, italic);
+}
+
+void ScintillaCall::StyleSetSize(int style, int sizePoints) {
+	Call(Message::StyleSetSize, style, sizePoints);
+}
+
+void ScintillaCall::StyleSetFont(int style, const char *fontName) {
+	CallString(Message::StyleSetFont, style, fontName);
+}
+
+void ScintillaCall::StyleSetEOLFilled(int style, bool eolFilled) {
+	Call(Message::StyleSetEOLFilled, style, eolFilled);
+}
+
+void ScintillaCall::StyleResetDefault() {
+	Call(Message::StyleResetDefault);
+}
+
+void ScintillaCall::StyleSetUnderline(int style, bool underline) {
+	Call(Message::StyleSetUnderline, style, underline);
+}
+
+Colour ScintillaCall::StyleGetFore(int style) {
+	return static_cast<Colour>(Call(Message::StyleGetFore, style));
+}
+
+Colour ScintillaCall::StyleGetBack(int style) {
+	return static_cast<Colour>(Call(Message::StyleGetBack, style));
+}
+
+bool ScintillaCall::StyleGetBold(int style) {
+	return Call(Message::StyleGetBold, style);
+}
+
+bool ScintillaCall::StyleGetItalic(int style) {
+	return Call(Message::StyleGetItalic, style);
+}
+
+int ScintillaCall::StyleGetSize(int style) {
+	return static_cast<int>(Call(Message::StyleGetSize, style));
+}
+
+int ScintillaCall::StyleGetFont(int style, char *fontName) {
+	return static_cast<int>(CallPointer(Message::StyleGetFont, style, fontName));
+}
+
+std::string ScintillaCall::StyleGetFont(int style) {
+	return CallReturnString(Message::StyleGetFont, style);
+}
+
+bool ScintillaCall::StyleGetEOLFilled(int style) {
+	return Call(Message::StyleGetEOLFilled, style);
+}
+
+bool ScintillaCall::StyleGetUnderline(int style) {
+	return Call(Message::StyleGetUnderline, style);
+}
+
+CaseVisible ScintillaCall::StyleGetCase(int style) {
+	return static_cast<Scintilla::CaseVisible>(Call(Message::StyleGetCase, style));
+}
+
+CharacterSet ScintillaCall::StyleGetCharacterSet(int style) {
+	return static_cast<Scintilla::CharacterSet>(Call(Message::StyleGetCharacterSet, style));
+}
+
+bool ScintillaCall::StyleGetVisible(int style) {
+	return Call(Message::StyleGetVisible, style);
+}
+
+bool ScintillaCall::StyleGetChangeable(int style) {
+	return Call(Message::StyleGetChangeable, style);
+}
+
+bool ScintillaCall::StyleGetHotSpot(int style) {
+	return Call(Message::StyleGetHotSpot, style);
+}
+
+void ScintillaCall::StyleSetCase(int style, Scintilla::CaseVisible caseVisible) {
+	Call(Message::StyleSetCase, style, static_cast<intptr_t>(caseVisible));
+}
+
+void ScintillaCall::StyleSetSizeFractional(int style, int sizeHundredthPoints) {
+	Call(Message::StyleSetSizeFractional, style, sizeHundredthPoints);
+}
+
+int ScintillaCall::StyleGetSizeFractional(int style) {
+	return static_cast<int>(Call(Message::StyleGetSizeFractional, style));
+}
+
+void ScintillaCall::StyleSetWeight(int style, Scintilla::FontWeight weight) {
+	Call(Message::StyleSetWeight, style, static_cast<intptr_t>(weight));
+}
+
+FontWeight ScintillaCall::StyleGetWeight(int style) {
+	return static_cast<Scintilla::FontWeight>(Call(Message::StyleGetWeight, style));
+}
+
+void ScintillaCall::StyleSetCharacterSet(int style, Scintilla::CharacterSet characterSet) {
+	Call(Message::StyleSetCharacterSet, style, static_cast<intptr_t>(characterSet));
+}
+
+void ScintillaCall::StyleSetHotSpot(int style, bool hotspot) {
+	Call(Message::StyleSetHotSpot, style, hotspot);
+}
+
+void ScintillaCall::SetElementColour(Scintilla::Element element, ColourAlpha colourElement) {
+	Call(Message::SetElementColour, static_cast<uintptr_t>(element), colourElement);
+}
+
+ColourAlpha ScintillaCall::ElementColour(Scintilla::Element element) {
+	return static_cast<ColourAlpha>(Call(Message::GetElementColour, static_cast<uintptr_t>(element)));
+}
+
+void ScintillaCall::ResetElementColour(Scintilla::Element element) {
+	Call(Message::ResetElementColour, static_cast<uintptr_t>(element));
+}
+
+bool ScintillaCall::ElementIsSet(Scintilla::Element element) {
+	return Call(Message::GetElementIsSet, static_cast<uintptr_t>(element));
+}
+
+bool ScintillaCall::ElementAllowsTranslucent(Scintilla::Element element) {
+	return Call(Message::GetElementAllowsTranslucent, static_cast<uintptr_t>(element));
+}
+
+ColourAlpha ScintillaCall::ElementBaseColour(Scintilla::Element element) {
+	return static_cast<ColourAlpha>(Call(Message::GetElementBaseColour, static_cast<uintptr_t>(element)));
+}
+
+void ScintillaCall::SetSelFore(bool useSetting, Colour fore) {
+	Call(Message::SetSelFore, useSetting, fore);
+}
+
+void ScintillaCall::SetSelBack(bool useSetting, Colour back) {
+	Call(Message::SetSelBack, useSetting, back);
+}
+
+Alpha ScintillaCall::SelAlpha() {
+	return static_cast<Scintilla::Alpha>(Call(Message::GetSelAlpha));
+}
+
+void ScintillaCall::SetSelAlpha(Scintilla::Alpha alpha) {
+	Call(Message::SetSelAlpha, static_cast<uintptr_t>(alpha));
+}
+
+bool ScintillaCall::SelEOLFilled() {
+	return Call(Message::GetSelEOLFilled);
+}
+
+void ScintillaCall::SetSelEOLFilled(bool filled) {
+	Call(Message::SetSelEOLFilled, filled);
+}
+
+Layer ScintillaCall::SelectionLayer() {
+	return static_cast<Scintilla::Layer>(Call(Message::GetSelectionLayer));
+}
+
+void ScintillaCall::SetSelectionLayer(Scintilla::Layer layer) {
+	Call(Message::SetSelectionLayer, static_cast<uintptr_t>(layer));
+}
+
+Layer ScintillaCall::CaretLineLayer() {
+	return static_cast<Scintilla::Layer>(Call(Message::GetCaretLineLayer));
+}
+
+void ScintillaCall::SetCaretLineLayer(Scintilla::Layer layer) {
+	Call(Message::SetCaretLineLayer, static_cast<uintptr_t>(layer));
+}
+
+void ScintillaCall::SetCaretFore(Colour fore) {
+	Call(Message::SetCaretFore, fore);
+}
+
+void ScintillaCall::AssignCmdKey(int keyDefinition, int sciCommand) {
+	Call(Message::AssignCmdKey, keyDefinition, sciCommand);
+}
+
+void ScintillaCall::ClearCmdKey(int keyDefinition) {
+	Call(Message::ClearCmdKey, keyDefinition);
+}
+
+void ScintillaCall::ClearAllCmdKeys() {
+	Call(Message::ClearAllCmdKeys);
+}
+
+void ScintillaCall::SetStylingEx(Position length, const char *styles) {
+	CallString(Message::SetStylingEx, length, styles);
+}
+
+void ScintillaCall::StyleSetVisible(int style, bool visible) {
+	Call(Message::StyleSetVisible, style, visible);
+}
+
+int ScintillaCall::CaretPeriod() {
+	return static_cast<int>(Call(Message::GetCaretPeriod));
+}
+
+void ScintillaCall::SetCaretPeriod(int periodMilliseconds) {
+	Call(Message::SetCaretPeriod, periodMilliseconds);
+}
+
+void ScintillaCall::SetWordChars(const char *characters) {
+	CallString(Message::SetWordChars, 0, characters);
+}
+
+int ScintillaCall::WordChars(char *characters) {
+	return static_cast<int>(CallPointer(Message::GetWordChars, 0, characters));
+}
+
+std::string ScintillaCall::WordChars() {
+	return CallReturnString(Message::GetWordChars, 0);
+}
+
+void ScintillaCall::SetCharacterCategoryOptimization(int countCharacters) {
+	Call(Message::SetCharacterCategoryOptimization, countCharacters);
+}
+
+int ScintillaCall::CharacterCategoryOptimization() {
+	return static_cast<int>(Call(Message::GetCharacterCategoryOptimization));
+}
+
+void ScintillaCall::BeginUndoAction() {
+	Call(Message::BeginUndoAction);
+}
+
+void ScintillaCall::EndUndoAction() {
+	Call(Message::EndUndoAction);
+}
+
+void ScintillaCall::IndicSetStyle(int indicator, Scintilla::IndicatorStyle indicatorStyle) {
+	Call(Message::IndicSetStyle, indicator, static_cast<intptr_t>(indicatorStyle));
+}
+
+IndicatorStyle ScintillaCall::IndicGetStyle(int indicator) {
+	return static_cast<Scintilla::IndicatorStyle>(Call(Message::IndicGetStyle, indicator));
+}
+
+void ScintillaCall::IndicSetFore(int indicator, Colour fore) {
+	Call(Message::IndicSetFore, indicator, fore);
+}
+
+Colour ScintillaCall::IndicGetFore(int indicator) {
+	return static_cast<Colour>(Call(Message::IndicGetFore, indicator));
+}
+
+void ScintillaCall::IndicSetUnder(int indicator, bool under) {
+	Call(Message::IndicSetUnder, indicator, under);
+}
+
+bool ScintillaCall::IndicGetUnder(int indicator) {
+	return Call(Message::IndicGetUnder, indicator);
+}
+
+void ScintillaCall::IndicSetHoverStyle(int indicator, Scintilla::IndicatorStyle indicatorStyle) {
+	Call(Message::IndicSetHoverStyle, indicator, static_cast<intptr_t>(indicatorStyle));
+}
+
+IndicatorStyle ScintillaCall::IndicGetHoverStyle(int indicator) {
+	return static_cast<Scintilla::IndicatorStyle>(Call(Message::IndicGetHoverStyle, indicator));
+}
+
+void ScintillaCall::IndicSetHoverFore(int indicator, Colour fore) {
+	Call(Message::IndicSetHoverFore, indicator, fore);
+}
+
+Colour ScintillaCall::IndicGetHoverFore(int indicator) {
+	return static_cast<Colour>(Call(Message::IndicGetHoverFore, indicator));
+}
+
+void ScintillaCall::IndicSetFlags(int indicator, Scintilla::IndicFlag flags) {
+	Call(Message::IndicSetFlags, indicator, static_cast<intptr_t>(flags));
+}
+
+IndicFlag ScintillaCall::IndicGetFlags(int indicator) {
+	return static_cast<Scintilla::IndicFlag>(Call(Message::IndicGetFlags, indicator));
+}
+
+void ScintillaCall::IndicSetStrokeWidth(int indicator, int hundredths) {
+	Call(Message::IndicSetStrokeWidth, indicator, hundredths);
+}
+
+int ScintillaCall::IndicGetStrokeWidth(int indicator) {
+	return static_cast<int>(Call(Message::IndicGetStrokeWidth, indicator));
+}
+
+void ScintillaCall::SetWhitespaceFore(bool useSetting, Colour fore) {
+	Call(Message::SetWhitespaceFore, useSetting, fore);
+}
+
+void ScintillaCall::SetWhitespaceBack(bool useSetting, Colour back) {
+	Call(Message::SetWhitespaceBack, useSetting, back);
+}
+
+void ScintillaCall::SetWhitespaceSize(int size) {
+	Call(Message::SetWhitespaceSize, size);
+}
+
+int ScintillaCall::WhitespaceSize() {
+	return static_cast<int>(Call(Message::GetWhitespaceSize));
+}
+
+void ScintillaCall::SetLineState(Line line, int state) {
+	Call(Message::SetLineState, line, state);
+}
+
+int ScintillaCall::LineState(Line line) {
+	return static_cast<int>(Call(Message::GetLineState, line));
+}
+
+int ScintillaCall::MaxLineState() {
+	return static_cast<int>(Call(Message::GetMaxLineState));
+}
+
+bool ScintillaCall::CaretLineVisible() {
+	return Call(Message::GetCaretLineVisible);
+}
+
+void ScintillaCall::SetCaretLineVisible(bool show) {
+	Call(Message::SetCaretLineVisible, show);
+}
+
+Colour ScintillaCall::CaretLineBack() {
+	return static_cast<Colour>(Call(Message::GetCaretLineBack));
+}
+
+void ScintillaCall::SetCaretLineBack(Colour back) {
+	Call(Message::SetCaretLineBack, back);
+}
+
+int ScintillaCall::CaretLineFrame() {
+	return static_cast<int>(Call(Message::GetCaretLineFrame));
+}
+
+void ScintillaCall::SetCaretLineFrame(int width) {
+	Call(Message::SetCaretLineFrame, width);
+}
+
+void ScintillaCall::StyleSetChangeable(int style, bool changeable) {
+	Call(Message::StyleSetChangeable, style, changeable);
+}
+
+void ScintillaCall::AutoCShow(Position lengthEntered, const char *itemList) {
+	CallString(Message::AutoCShow, lengthEntered, itemList);
+}
+
+void ScintillaCall::AutoCCancel() {
+	Call(Message::AutoCCancel);
+}
+
+bool ScintillaCall::AutoCActive() {
+	return Call(Message::AutoCActive);
+}
+
+Position ScintillaCall::AutoCPosStart() {
+	return Call(Message::AutoCPosStart);
+}
+
+void ScintillaCall::AutoCComplete() {
+	Call(Message::AutoCComplete);
+}
+
+void ScintillaCall::AutoCStops(const char *characterSet) {
+	CallString(Message::AutoCStops, 0, characterSet);
+}
+
+void ScintillaCall::AutoCSetSeparator(int separatorCharacter) {
+	Call(Message::AutoCSetSeparator, separatorCharacter);
+}
+
+int ScintillaCall::AutoCGetSeparator() {
+	return static_cast<int>(Call(Message::AutoCGetSeparator));
+}
+
+void ScintillaCall::AutoCSelect(const char *select) {
+	CallString(Message::AutoCSelect, 0, select);
+}
+
+void ScintillaCall::AutoCSetCancelAtStart(bool cancel) {
+	Call(Message::AutoCSetCancelAtStart, cancel);
+}
+
+bool ScintillaCall::AutoCGetCancelAtStart() {
+	return Call(Message::AutoCGetCancelAtStart);
+}
+
+void ScintillaCall::AutoCSetFillUps(const char *characterSet) {
+	CallString(Message::AutoCSetFillUps, 0, characterSet);
+}
+
+void ScintillaCall::AutoCSetChooseSingle(bool chooseSingle) {
+	Call(Message::AutoCSetChooseSingle, chooseSingle);
+}
+
+bool ScintillaCall::AutoCGetChooseSingle() {
+	return Call(Message::AutoCGetChooseSingle);
+}
+
+void ScintillaCall::AutoCSetIgnoreCase(bool ignoreCase) {
+	Call(Message::AutoCSetIgnoreCase, ignoreCase);
+}
+
+bool ScintillaCall::AutoCGetIgnoreCase() {
+	return Call(Message::AutoCGetIgnoreCase);
+}
+
+void ScintillaCall::UserListShow(int listType, const char *itemList) {
+	CallString(Message::UserListShow, listType, itemList);
+}
+
+void ScintillaCall::AutoCSetAutoHide(bool autoHide) {
+	Call(Message::AutoCSetAutoHide, autoHide);
+}
+
+bool ScintillaCall::AutoCGetAutoHide() {
+	return Call(Message::AutoCGetAutoHide);
+}
+
+void ScintillaCall::AutoCSetOptions(Scintilla::AutoCompleteOption options) {
+	Call(Message::AutoCSetOptions, static_cast<uintptr_t>(options));
+}
+
+AutoCompleteOption ScintillaCall::AutoCGetOptions() {
+	return static_cast<Scintilla::AutoCompleteOption>(Call(Message::AutoCGetOptions));
+}
+
+void ScintillaCall::AutoCSetDropRestOfWord(bool dropRestOfWord) {
+	Call(Message::AutoCSetDropRestOfWord, dropRestOfWord);
+}
+
+bool ScintillaCall::AutoCGetDropRestOfWord() {
+	return Call(Message::AutoCGetDropRestOfWord);
+}
+
+void ScintillaCall::RegisterImage(int type, const char *xpmData) {
+	CallString(Message::RegisterImage, type, xpmData);
+}
+
+void ScintillaCall::ClearRegisteredImages() {
+	Call(Message::ClearRegisteredImages);
+}
+
+int ScintillaCall::AutoCGetTypeSeparator() {
+	return static_cast<int>(Call(Message::AutoCGetTypeSeparator));
+}
+
+void ScintillaCall::AutoCSetTypeSeparator(int separatorCharacter) {
+	Call(Message::AutoCSetTypeSeparator, separatorCharacter);
+}
+
+void ScintillaCall::AutoCSetMaxWidth(int characterCount) {
+	Call(Message::AutoCSetMaxWidth, characterCount);
+}
+
+int ScintillaCall::AutoCGetMaxWidth() {
+	return static_cast<int>(Call(Message::AutoCGetMaxWidth));
+}
+
+void ScintillaCall::AutoCSetMaxHeight(int rowCount) {
+	Call(Message::AutoCSetMaxHeight, rowCount);
+}
+
+int ScintillaCall::AutoCGetMaxHeight() {
+	return static_cast<int>(Call(Message::AutoCGetMaxHeight));
+}
+
+void ScintillaCall::SetIndent(int indentSize) {
+	Call(Message::SetIndent, indentSize);
+}
+
+int ScintillaCall::Indent() {
+	return static_cast<int>(Call(Message::GetIndent));
+}
+
+void ScintillaCall::SetUseTabs(bool useTabs) {
+	Call(Message::SetUseTabs, useTabs);
+}
+
+bool ScintillaCall::UseTabs() {
+	return Call(Message::GetUseTabs);
+}
+
+void ScintillaCall::SetLineIndentation(Line line, int indentation) {
+	Call(Message::SetLineIndentation, line, indentation);
+}
+
+int ScintillaCall::LineIndentation(Line line) {
+	return static_cast<int>(Call(Message::GetLineIndentation, line));
+}
+
+Position ScintillaCall::LineIndentPosition(Line line) {
+	return Call(Message::GetLineIndentPosition, line);
+}
+
+Position ScintillaCall::Column(Position pos) {
+	return Call(Message::GetColumn, pos);
+}
+
+Position ScintillaCall::CountCharacters(Position start, Position end) {
+	return Call(Message::CountCharacters, start, end);
+}
+
+Position ScintillaCall::CountCodeUnits(Position start, Position end) {
+	return Call(Message::CountCodeUnits, start, end);
+}
+
+void ScintillaCall::SetHScrollBar(bool visible) {
+	Call(Message::SetHScrollBar, visible);
+}
+
+bool ScintillaCall::HScrollBar() {
+	return Call(Message::GetHScrollBar);
+}
+
+void ScintillaCall::SetIndentationGuides(Scintilla::IndentView indentView) {
+	Call(Message::SetIndentationGuides, static_cast<uintptr_t>(indentView));
+}
+
+IndentView ScintillaCall::IndentationGuides() {
+	return static_cast<Scintilla::IndentView>(Call(Message::GetIndentationGuides));
+}
+
+void ScintillaCall::SetHighlightGuide(Position column) {
+	Call(Message::SetHighlightGuide, column);
+}
+
+Position ScintillaCall::HighlightGuide() {
+	return Call(Message::GetHighlightGuide);
+}
+
+Position ScintillaCall::LineEndPosition(Line line) {
+	return Call(Message::GetLineEndPosition, line);
+}
+
+int ScintillaCall::CodePage() {
+	return static_cast<int>(Call(Message::GetCodePage));
+}
+
+Colour ScintillaCall::CaretFore() {
+	return static_cast<Colour>(Call(Message::GetCaretFore));
+}
+
+bool ScintillaCall::ReadOnly() {
+	return Call(Message::GetReadOnly);
+}
+
+void ScintillaCall::SetCurrentPos(Position caret) {
+	Call(Message::SetCurrentPos, caret);
+}
+
+void ScintillaCall::SetSelectionStart(Position anchor) {
+	Call(Message::SetSelectionStart, anchor);
+}
+
+Position ScintillaCall::SelectionStart() {
+	return Call(Message::GetSelectionStart);
+}
+
+void ScintillaCall::SetSelectionEnd(Position caret) {
+	Call(Message::SetSelectionEnd, caret);
+}
+
+Position ScintillaCall::SelectionEnd() {
+	return Call(Message::GetSelectionEnd);
+}
+
+void ScintillaCall::SetEmptySelection(Position caret) {
+	Call(Message::SetEmptySelection, caret);
+}
+
+void ScintillaCall::SetPrintMagnification(int magnification) {
+	Call(Message::SetPrintMagnification, magnification);
+}
+
+int ScintillaCall::PrintMagnification() {
+	return static_cast<int>(Call(Message::GetPrintMagnification));
+}
+
+void ScintillaCall::SetPrintColourMode(Scintilla::PrintOption mode) {
+	Call(Message::SetPrintColourMode, static_cast<uintptr_t>(mode));
+}
+
+PrintOption ScintillaCall::PrintColourMode() {
+	return static_cast<Scintilla::PrintOption>(Call(Message::GetPrintColourMode));
+}
+
+Position ScintillaCall::FindText(Scintilla::FindOption searchFlags, void *ft) {
+	return CallPointer(Message::FindText, static_cast<uintptr_t>(searchFlags), ft);
+}
+
+Position ScintillaCall::FormatRange(bool draw, void *fr) {
+	return CallPointer(Message::FormatRange, draw, fr);
+}
+
+Line ScintillaCall::FirstVisibleLine() {
+	return Call(Message::GetFirstVisibleLine);
+}
+
+Position ScintillaCall::GetLine(Line line, char *text) {
+	return CallPointer(Message::GetLine, line, text);
+}
+
+std::string ScintillaCall::GetLine(Line line) {
+	return CallReturnString(Message::GetLine, line);
+}
+
+Line ScintillaCall::LineCount() {
+	return Call(Message::GetLineCount);
+}
+
+void ScintillaCall::AllocateLines(Line lines) {
+	Call(Message::AllocateLines, lines);
+}
+
+void ScintillaCall::SetMarginLeft(int pixelWidth) {
+	Call(Message::SetMarginLeft, 0, pixelWidth);
+}
+
+int ScintillaCall::MarginLeft() {
+	return static_cast<int>(Call(Message::GetMarginLeft));
+}
+
+void ScintillaCall::SetMarginRight(int pixelWidth) {
+	Call(Message::SetMarginRight, 0, pixelWidth);
+}
+
+int ScintillaCall::MarginRight() {
+	return static_cast<int>(Call(Message::GetMarginRight));
+}
+
+bool ScintillaCall::Modify() {
+	return Call(Message::GetModify);
+}
+
+void ScintillaCall::SetSel(Position anchor, Position caret) {
+	Call(Message::SetSel, anchor, caret);
+}
+
+Position ScintillaCall::GetSelText(char *text) {
+	return CallPointer(Message::GetSelText, 0, text);
+}
+
+std::string ScintillaCall::GetSelText() {
+	return CallReturnString(Message::GetSelText, 0);
+}
+
+Position ScintillaCall::GetTextRange(void *tr) {
+	return CallPointer(Message::GetTextRange, 0, tr);
+}
+
+void ScintillaCall::HideSelection(bool hide) {
+	Call(Message::HideSelection, hide);
+}
+
+int ScintillaCall::PointXFromPosition(Position pos) {
+	return static_cast<int>(Call(Message::PointXFromPosition, 0, pos));
+}
+
+int ScintillaCall::PointYFromPosition(Position pos) {
+	return static_cast<int>(Call(Message::PointYFromPosition, 0, pos));
+}
+
+Line ScintillaCall::LineFromPosition(Position pos) {
+	return Call(Message::LineFromPosition, pos);
+}
+
+Position ScintillaCall::PositionFromLine(Line line) {
+	return Call(Message::PositionFromLine, line);
+}
+
+void ScintillaCall::LineScroll(Position columns, Line lines) {
+	Call(Message::LineScroll, columns, lines);
+}
+
+void ScintillaCall::ScrollCaret() {
+	Call(Message::ScrollCaret);
+}
+
+void ScintillaCall::ScrollRange(Position secondary, Position primary) {
+	Call(Message::ScrollRange, secondary, primary);
+}
+
+void ScintillaCall::ReplaceSel(const char *text) {
+	CallString(Message::ReplaceSel, 0, text);
+}
+
+void ScintillaCall::SetReadOnly(bool readOnly) {
+	Call(Message::SetReadOnly, readOnly);
+}
+
+void ScintillaCall::Null() {
+	Call(Message::Null);
+}
+
+bool ScintillaCall::CanPaste() {
+	return Call(Message::CanPaste);
+}
+
+bool ScintillaCall::CanUndo() {
+	return Call(Message::CanUndo);
+}
+
+void ScintillaCall::EmptyUndoBuffer() {
+	Call(Message::EmptyUndoBuffer);
+}
+
+void ScintillaCall::Undo() {
+	Call(Message::Undo);
+}
+
+void ScintillaCall::Cut() {
+	Call(Message::Cut);
+}
+
+void ScintillaCall::Copy() {
+	Call(Message::Copy);
+}
+
+void ScintillaCall::Paste() {
+	Call(Message::Paste);
+}
+
+void ScintillaCall::Clear() {
+	Call(Message::Clear);
+}
+
+void ScintillaCall::SetText(const char *text) {
+	CallString(Message::SetText, 0, text);
+}
+
+Position ScintillaCall::GetText(Position length, char *text) {
+	return CallPointer(Message::GetText, length, text);
+}
+
+std::string ScintillaCall::GetText(Position length) {
+	return CallReturnString(Message::GetText, length);
+}
+
+Position ScintillaCall::TextLength() {
+	return Call(Message::GetTextLength);
+}
+
+void *ScintillaCall::DirectFunction() {
+	return reinterpret_cast<void *>(Call(Message::GetDirectFunction));
+}
+
+void *ScintillaCall::DirectStatusFunction() {
+	return reinterpret_cast<void *>(Call(Message::GetDirectStatusFunction));
+}
+
+void *ScintillaCall::DirectPointer() {
+	return reinterpret_cast<void *>(Call(Message::GetDirectPointer));
+}
+
+void ScintillaCall::SetOvertype(bool overType) {
+	Call(Message::SetOvertype, overType);
+}
+
+bool ScintillaCall::Overtype() {
+	return Call(Message::GetOvertype);
+}
+
+void ScintillaCall::SetCaretWidth(int pixelWidth) {
+	Call(Message::SetCaretWidth, pixelWidth);
+}
+
+int ScintillaCall::CaretWidth() {
+	return static_cast<int>(Call(Message::GetCaretWidth));
+}
+
+void ScintillaCall::SetTargetStart(Position start) {
+	Call(Message::SetTargetStart, start);
+}
+
+Position ScintillaCall::TargetStart() {
+	return Call(Message::GetTargetStart);
+}
+
+void ScintillaCall::SetTargetStartVirtualSpace(Position space) {
+	Call(Message::SetTargetStartVirtualSpace, space);
+}
+
+Position ScintillaCall::TargetStartVirtualSpace() {
+	return Call(Message::GetTargetStartVirtualSpace);
+}
+
+void ScintillaCall::SetTargetEnd(Position end) {
+	Call(Message::SetTargetEnd, end);
+}
+
+Position ScintillaCall::TargetEnd() {
+	return Call(Message::GetTargetEnd);
+}
+
+void ScintillaCall::SetTargetEndVirtualSpace(Position space) {
+	Call(Message::SetTargetEndVirtualSpace, space);
+}
+
+Position ScintillaCall::TargetEndVirtualSpace() {
+	return Call(Message::GetTargetEndVirtualSpace);
+}
+
+void ScintillaCall::SetTargetRange(Position start, Position end) {
+	Call(Message::SetTargetRange, start, end);
+}
+
+Position ScintillaCall::TargetText(char *text) {
+	return CallPointer(Message::GetTargetText, 0, text);
+}
+
+std::string ScintillaCall::TargetText() {
+	return CallReturnString(Message::GetTargetText, 0);
+}
+
+void ScintillaCall::TargetFromSelection() {
+	Call(Message::TargetFromSelection);
+}
+
+void ScintillaCall::TargetWholeDocument() {
+	Call(Message::TargetWholeDocument);
+}
+
+Position ScintillaCall::ReplaceTarget(Position length, const char *text) {
+	return CallString(Message::ReplaceTarget, length, text);
+}
+
+Position ScintillaCall::ReplaceTargetRE(Position length, const char *text) {
+	return CallString(Message::ReplaceTargetRE, length, text);
+}
+
+Position ScintillaCall::SearchInTarget(Position length, const char *text) {
+	return CallString(Message::SearchInTarget, length, text);
+}
+
+void ScintillaCall::SetSearchFlags(Scintilla::FindOption searchFlags) {
+	Call(Message::SetSearchFlags, static_cast<uintptr_t>(searchFlags));
+}
+
+FindOption ScintillaCall::SearchFlags() {
+	return static_cast<Scintilla::FindOption>(Call(Message::GetSearchFlags));
+}
+
+void ScintillaCall::CallTipShow(Position pos, const char *definition) {
+	CallString(Message::CallTipShow, pos, definition);
+}
+
+void ScintillaCall::CallTipCancel() {
+	Call(Message::CallTipCancel);
+}
+
+bool ScintillaCall::CallTipActive() {
+	return Call(Message::CallTipActive);
+}
+
+Position ScintillaCall::CallTipPosStart() {
+	return Call(Message::CallTipPosStart);
+}
+
+void ScintillaCall::CallTipSetPosStart(Position posStart) {
+	Call(Message::CallTipSetPosStart, posStart);
+}
+
+void ScintillaCall::CallTipSetHlt(Position highlightStart, Position highlightEnd) {
+	Call(Message::CallTipSetHlt, highlightStart, highlightEnd);
+}
+
+void ScintillaCall::CallTipSetBack(Colour back) {
+	Call(Message::CallTipSetBack, back);
+}
+
+void ScintillaCall::CallTipSetFore(Colour fore) {
+	Call(Message::CallTipSetFore, fore);
+}
+
+void ScintillaCall::CallTipSetForeHlt(Colour fore) {
+	Call(Message::CallTipSetForeHlt, fore);
+}
+
+void ScintillaCall::CallTipUseStyle(int tabSize) {
+	Call(Message::CallTipUseStyle, tabSize);
+}
+
+void ScintillaCall::CallTipSetPosition(bool above) {
+	Call(Message::CallTipSetPosition, above);
+}
+
+Line ScintillaCall::VisibleFromDocLine(Line docLine) {
+	return Call(Message::VisibleFromDocLine, docLine);
+}
+
+Line ScintillaCall::DocLineFromVisible(Line displayLine) {
+	return Call(Message::DocLineFromVisible, displayLine);
+}
+
+Line ScintillaCall::WrapCount(Line docLine) {
+	return Call(Message::WrapCount, docLine);
+}
+
+void ScintillaCall::SetFoldLevel(Line line, Scintilla::FoldLevel level) {
+	Call(Message::SetFoldLevel, line, static_cast<intptr_t>(level));
+}
+
+FoldLevel ScintillaCall::FoldLevel(Line line) {
+	return static_cast<Scintilla::FoldLevel>(Call(Message::GetFoldLevel, line));
+}
+
+Line ScintillaCall::LastChild(Line line, Scintilla::FoldLevel level) {
+	return Call(Message::GetLastChild, line, static_cast<intptr_t>(level));
+}
+
+Line ScintillaCall::FoldParent(Line line) {
+	return Call(Message::GetFoldParent, line);
+}
+
+void ScintillaCall::ShowLines(Line lineStart, Line lineEnd) {
+	Call(Message::ShowLines, lineStart, lineEnd);
+}
+
+void ScintillaCall::HideLines(Line lineStart, Line lineEnd) {
+	Call(Message::HideLines, lineStart, lineEnd);
+}
+
+bool ScintillaCall::LineVisible(Line line) {
+	return Call(Message::GetLineVisible, line);
+}
+
+bool ScintillaCall::AllLinesVisible() {
+	return Call(Message::GetAllLinesVisible);
+}
+
+void ScintillaCall::SetFoldExpanded(Line line, bool expanded) {
+	Call(Message::SetFoldExpanded, line, expanded);
+}
+
+bool ScintillaCall::FoldExpanded(Line line) {
+	return Call(Message::GetFoldExpanded, line);
+}
+
+void ScintillaCall::ToggleFold(Line line) {
+	Call(Message::ToggleFold, line);
+}
+
+void ScintillaCall::ToggleFoldShowText(Line line, const char *text) {
+	CallString(Message::ToggleFoldShowText, line, text);
+}
+
+void ScintillaCall::FoldDisplayTextSetStyle(Scintilla::FoldDisplayTextStyle style) {
+	Call(Message::FoldDisplayTextSetStyle, static_cast<uintptr_t>(style));
+}
+
+FoldDisplayTextStyle ScintillaCall::FoldDisplayTextGetStyle() {
+	return static_cast<Scintilla::FoldDisplayTextStyle>(Call(Message::FoldDisplayTextGetStyle));
+}
+
+void ScintillaCall::SetDefaultFoldDisplayText(const char *text) {
+	CallString(Message::SetDefaultFoldDisplayText, 0, text);
+}
+
+int ScintillaCall::GetDefaultFoldDisplayText(char *text) {
+	return static_cast<int>(CallPointer(Message::GetDefaultFoldDisplayText, 0, text));
+}
+
+std::string ScintillaCall::GetDefaultFoldDisplayText() {
+	return CallReturnString(Message::GetDefaultFoldDisplayText, 0);
+}
+
+void ScintillaCall::FoldLine(Line line, Scintilla::FoldAction action) {
+	Call(Message::FoldLine, line, static_cast<intptr_t>(action));
+}
+
+void ScintillaCall::FoldChildren(Line line, Scintilla::FoldAction action) {
+	Call(Message::FoldChildren, line, static_cast<intptr_t>(action));
+}
+
+void ScintillaCall::ExpandChildren(Line line, Scintilla::FoldLevel level) {
+	Call(Message::ExpandChildren, line, static_cast<intptr_t>(level));
+}
+
+void ScintillaCall::FoldAll(Scintilla::FoldAction action) {
+	Call(Message::FoldAll, static_cast<uintptr_t>(action));
+}
+
+void ScintillaCall::EnsureVisible(Line line) {
+	Call(Message::EnsureVisible, line);
+}
+
+void ScintillaCall::SetAutomaticFold(Scintilla::AutomaticFold automaticFold) {
+	Call(Message::SetAutomaticFold, static_cast<uintptr_t>(automaticFold));
+}
+
+AutomaticFold ScintillaCall::AutomaticFold() {
+	return static_cast<Scintilla::AutomaticFold>(Call(Message::GetAutomaticFold));
+}
+
+void ScintillaCall::SetFoldFlags(Scintilla::FoldFlag flags) {
+	Call(Message::SetFoldFlags, static_cast<uintptr_t>(flags));
+}
+
+void ScintillaCall::EnsureVisibleEnforcePolicy(Line line) {
+	Call(Message::EnsureVisibleEnforcePolicy, line);
+}
+
+void ScintillaCall::SetTabIndents(bool tabIndents) {
+	Call(Message::SetTabIndents, tabIndents);
+}
+
+bool ScintillaCall::TabIndents() {
+	return Call(Message::GetTabIndents);
+}
+
+void ScintillaCall::SetBackSpaceUnIndents(bool bsUnIndents) {
+	Call(Message::SetBackSpaceUnIndents, bsUnIndents);
+}
+
+bool ScintillaCall::BackSpaceUnIndents() {
+	return Call(Message::GetBackSpaceUnIndents);
+}
+
+void ScintillaCall::SetMouseDwellTime(int periodMilliseconds) {
+	Call(Message::SetMouseDwellTime, periodMilliseconds);
+}
+
+int ScintillaCall::MouseDwellTime() {
+	return static_cast<int>(Call(Message::GetMouseDwellTime));
+}
+
+Position ScintillaCall::WordStartPosition(Position pos, bool onlyWordCharacters) {
+	return Call(Message::WordStartPosition, pos, onlyWordCharacters);
+}
+
+Position ScintillaCall::WordEndPosition(Position pos, bool onlyWordCharacters) {
+	return Call(Message::WordEndPosition, pos, onlyWordCharacters);
+}
+
+bool ScintillaCall::IsRangeWord(Position start, Position end) {
+	return Call(Message::IsRangeWord, start, end);
+}
+
+void ScintillaCall::SetIdleStyling(Scintilla::IdleStyling idleStyling) {
+	Call(Message::SetIdleStyling, static_cast<uintptr_t>(idleStyling));
+}
+
+IdleStyling ScintillaCall::IdleStyling() {
+	return static_cast<Scintilla::IdleStyling>(Call(Message::GetIdleStyling));
+}
+
+void ScintillaCall::SetWrapMode(Scintilla::Wrap wrapMode) {
+	Call(Message::SetWrapMode, static_cast<uintptr_t>(wrapMode));
+}
+
+Wrap ScintillaCall::WrapMode() {
+	return static_cast<Scintilla::Wrap>(Call(Message::GetWrapMode));
+}
+
+void ScintillaCall::SetWrapVisualFlags(Scintilla::WrapVisualFlag wrapVisualFlags) {
+	Call(Message::SetWrapVisualFlags, static_cast<uintptr_t>(wrapVisualFlags));
+}
+
+WrapVisualFlag ScintillaCall::WrapVisualFlags() {
+	return static_cast<Scintilla::WrapVisualFlag>(Call(Message::GetWrapVisualFlags));
+}
+
+void ScintillaCall::SetWrapVisualFlagsLocation(Scintilla::WrapVisualLocation wrapVisualFlagsLocation) {
+	Call(Message::SetWrapVisualFlagsLocation, static_cast<uintptr_t>(wrapVisualFlagsLocation));
+}
+
+WrapVisualLocation ScintillaCall::WrapVisualFlagsLocation() {
+	return static_cast<Scintilla::WrapVisualLocation>(Call(Message::GetWrapVisualFlagsLocation));
+}
+
+void ScintillaCall::SetWrapStartIndent(int indent) {
+	Call(Message::SetWrapStartIndent, indent);
+}
+
+int ScintillaCall::WrapStartIndent() {
+	return static_cast<int>(Call(Message::GetWrapStartIndent));
+}
+
+void ScintillaCall::SetWrapIndentMode(Scintilla::WrapIndentMode wrapIndentMode) {
+	Call(Message::SetWrapIndentMode, static_cast<uintptr_t>(wrapIndentMode));
+}
+
+WrapIndentMode ScintillaCall::WrapIndentMode() {
+	return static_cast<Scintilla::WrapIndentMode>(Call(Message::GetWrapIndentMode));
+}
+
+void ScintillaCall::SetLayoutCache(Scintilla::LineCache cacheMode) {
+	Call(Message::SetLayoutCache, static_cast<uintptr_t>(cacheMode));
+}
+
+LineCache ScintillaCall::LayoutCache() {
+	return static_cast<Scintilla::LineCache>(Call(Message::GetLayoutCache));
+}
+
+void ScintillaCall::SetScrollWidth(int pixelWidth) {
+	Call(Message::SetScrollWidth, pixelWidth);
+}
+
+int ScintillaCall::ScrollWidth() {
+	return static_cast<int>(Call(Message::GetScrollWidth));
+}
+
+void ScintillaCall::SetScrollWidthTracking(bool tracking) {
+	Call(Message::SetScrollWidthTracking, tracking);
+}
+
+bool ScintillaCall::ScrollWidthTracking() {
+	return Call(Message::GetScrollWidthTracking);
+}
+
+int ScintillaCall::TextWidth(int style, const char *text) {
+	return static_cast<int>(CallString(Message::TextWidth, style, text));
+}
+
+void ScintillaCall::SetEndAtLastLine(bool endAtLastLine) {
+	Call(Message::SetEndAtLastLine, endAtLastLine);
+}
+
+bool ScintillaCall::EndAtLastLine() {
+	return Call(Message::GetEndAtLastLine);
+}
+
+int ScintillaCall::TextHeight(Line line) {
+	return static_cast<int>(Call(Message::TextHeight, line));
+}
+
+void ScintillaCall::SetVScrollBar(bool visible) {
+	Call(Message::SetVScrollBar, visible);
+}
+
+bool ScintillaCall::VScrollBar() {
+	return Call(Message::GetVScrollBar);
+}
+
+void ScintillaCall::AppendText(Position length, const char *text) {
+	CallString(Message::AppendText, length, text);
+}
+
+PhasesDraw ScintillaCall::PhasesDraw() {
+	return static_cast<Scintilla::PhasesDraw>(Call(Message::GetPhasesDraw));
+}
+
+void ScintillaCall::SetPhasesDraw(Scintilla::PhasesDraw phases) {
+	Call(Message::SetPhasesDraw, static_cast<uintptr_t>(phases));
+}
+
+void ScintillaCall::SetFontQuality(Scintilla::FontQuality fontQuality) {
+	Call(Message::SetFontQuality, static_cast<uintptr_t>(fontQuality));
+}
+
+FontQuality ScintillaCall::FontQuality() {
+	return static_cast<Scintilla::FontQuality>(Call(Message::GetFontQuality));
+}
+
+void ScintillaCall::SetFirstVisibleLine(Line displayLine) {
+	Call(Message::SetFirstVisibleLine, displayLine);
+}
+
+void ScintillaCall::SetMultiPaste(Scintilla::MultiPaste multiPaste) {
+	Call(Message::SetMultiPaste, static_cast<uintptr_t>(multiPaste));
+}
+
+MultiPaste ScintillaCall::MultiPaste() {
+	return static_cast<Scintilla::MultiPaste>(Call(Message::GetMultiPaste));
+}
+
+int ScintillaCall::Tag(int tagNumber, char *tagValue) {
+	return static_cast<int>(CallPointer(Message::GetTag, tagNumber, tagValue));
+}
+
+std::string ScintillaCall::Tag(int tagNumber) {
+	return CallReturnString(Message::GetTag, tagNumber);
+}
+
+void ScintillaCall::LinesJoin() {
+	Call(Message::LinesJoin);
+}
+
+void ScintillaCall::LinesSplit(int pixelWidth) {
+	Call(Message::LinesSplit, pixelWidth);
+}
+
+void ScintillaCall::SetFoldMarginColour(bool useSetting, Colour back) {
+	Call(Message::SetFoldMarginColour, useSetting, back);
+}
+
+void ScintillaCall::SetFoldMarginHiColour(bool useSetting, Colour fore) {
+	Call(Message::SetFoldMarginHiColour, useSetting, fore);
+}
+
+void ScintillaCall::SetAccessibility(Scintilla::Accessibility accessibility) {
+	Call(Message::SetAccessibility, static_cast<uintptr_t>(accessibility));
+}
+
+Accessibility ScintillaCall::Accessibility() {
+	return static_cast<Scintilla::Accessibility>(Call(Message::GetAccessibility));
+}
+
+void ScintillaCall::LineDown() {
+	Call(Message::LineDown);
+}
+
+void ScintillaCall::LineDownExtend() {
+	Call(Message::LineDownExtend);
+}
+
+void ScintillaCall::LineUp() {
+	Call(Message::LineUp);
+}
+
+void ScintillaCall::LineUpExtend() {
+	Call(Message::LineUpExtend);
+}
+
+void ScintillaCall::CharLeft() {
+	Call(Message::CharLeft);
+}
+
+void ScintillaCall::CharLeftExtend() {
+	Call(Message::CharLeftExtend);
+}
+
+void ScintillaCall::CharRight() {
+	Call(Message::CharRight);
+}
+
+void ScintillaCall::CharRightExtend() {
+	Call(Message::CharRightExtend);
+}
+
+void ScintillaCall::WordLeft() {
+	Call(Message::WordLeft);
+}
+
+void ScintillaCall::WordLeftExtend() {
+	Call(Message::WordLeftExtend);
+}
+
+void ScintillaCall::WordRight() {
+	Call(Message::WordRight);
+}
+
+void ScintillaCall::WordRightExtend() {
+	Call(Message::WordRightExtend);
+}
+
+void ScintillaCall::Home() {
+	Call(Message::Home);
+}
+
+void ScintillaCall::HomeExtend() {
+	Call(Message::HomeExtend);
+}
+
+void ScintillaCall::LineEnd() {
+	Call(Message::LineEnd);
+}
+
+void ScintillaCall::LineEndExtend() {
+	Call(Message::LineEndExtend);
+}
+
+void ScintillaCall::DocumentStart() {
+	Call(Message::DocumentStart);
+}
+
+void ScintillaCall::DocumentStartExtend() {
+	Call(Message::DocumentStartExtend);
+}
+
+void ScintillaCall::DocumentEnd() {
+	Call(Message::DocumentEnd);
+}
+
+void ScintillaCall::DocumentEndExtend() {
+	Call(Message::DocumentEndExtend);
+}
+
+void ScintillaCall::PageUp() {
+	Call(Message::PageUp);
+}
+
+void ScintillaCall::PageUpExtend() {
+	Call(Message::PageUpExtend);
+}
+
+void ScintillaCall::PageDown() {
+	Call(Message::PageDown);
+}
+
+void ScintillaCall::PageDownExtend() {
+	Call(Message::PageDownExtend);
+}
+
+void ScintillaCall::EditToggleOvertype() {
+	Call(Message::EditToggleOvertype);
+}
+
+void ScintillaCall::Cancel() {
+	Call(Message::Cancel);
+}
+
+void ScintillaCall::DeleteBack() {
+	Call(Message::DeleteBack);
+}
+
+void ScintillaCall::Tab() {
+	Call(Message::Tab);
+}
+
+void ScintillaCall::BackTab() {
+	Call(Message::BackTab);
+}
+
+void ScintillaCall::NewLine() {
+	Call(Message::NewLine);
+}
+
+void ScintillaCall::FormFeed() {
+	Call(Message::FormFeed);
+}
+
+void ScintillaCall::VCHome() {
+	Call(Message::VCHome);
+}
+
+void ScintillaCall::VCHomeExtend() {
+	Call(Message::VCHomeExtend);
+}
+
+void ScintillaCall::ZoomIn() {
+	Call(Message::ZoomIn);
+}
+
+void ScintillaCall::ZoomOut() {
+	Call(Message::ZoomOut);
+}
+
+void ScintillaCall::DelWordLeft() {
+	Call(Message::DelWordLeft);
+}
+
+void ScintillaCall::DelWordRight() {
+	Call(Message::DelWordRight);
+}
+
+void ScintillaCall::DelWordRightEnd() {
+	Call(Message::DelWordRightEnd);
+}
+
+void ScintillaCall::LineCut() {
+	Call(Message::LineCut);
+}
+
+void ScintillaCall::LineDelete() {
+	Call(Message::LineDelete);
+}
+
+void ScintillaCall::LineTranspose() {
+	Call(Message::LineTranspose);
+}
+
+void ScintillaCall::LineReverse() {
+	Call(Message::LineReverse);
+}
+
+void ScintillaCall::LineDuplicate() {
+	Call(Message::LineDuplicate);
+}
+
+void ScintillaCall::LowerCase() {
+	Call(Message::LowerCase);
+}
+
+void ScintillaCall::UpperCase() {
+	Call(Message::UpperCase);
+}
+
+void ScintillaCall::LineScrollDown() {
+	Call(Message::LineScrollDown);
+}
+
+void ScintillaCall::LineScrollUp() {
+	Call(Message::LineScrollUp);
+}
+
+void ScintillaCall::DeleteBackNotLine() {
+	Call(Message::DeleteBackNotLine);
+}
+
+void ScintillaCall::HomeDisplay() {
+	Call(Message::HomeDisplay);
+}
+
+void ScintillaCall::HomeDisplayExtend() {
+	Call(Message::HomeDisplayExtend);
+}
+
+void ScintillaCall::LineEndDisplay() {
+	Call(Message::LineEndDisplay);
+}
+
+void ScintillaCall::LineEndDisplayExtend() {
+	Call(Message::LineEndDisplayExtend);
+}
+
+void ScintillaCall::HomeWrap() {
+	Call(Message::HomeWrap);
+}
+
+void ScintillaCall::HomeWrapExtend() {
+	Call(Message::HomeWrapExtend);
+}
+
+void ScintillaCall::LineEndWrap() {
+	Call(Message::LineEndWrap);
+}
+
+void ScintillaCall::LineEndWrapExtend() {
+	Call(Message::LineEndWrapExtend);
+}
+
+void ScintillaCall::VCHomeWrap() {
+	Call(Message::VCHomeWrap);
+}
+
+void ScintillaCall::VCHomeWrapExtend() {
+	Call(Message::VCHomeWrapExtend);
+}
+
+void ScintillaCall::LineCopy() {
+	Call(Message::LineCopy);
+}
+
+void ScintillaCall::MoveCaretInsideView() {
+	Call(Message::MoveCaretInsideView);
+}
+
+Position ScintillaCall::LineLength(Line line) {
+	return Call(Message::LineLength, line);
+}
+
+void ScintillaCall::BraceHighlight(Position posA, Position posB) {
+	Call(Message::BraceHighlight, posA, posB);
+}
+
+void ScintillaCall::BraceHighlightIndicator(bool useSetting, int indicator) {
+	Call(Message::BraceHighlightIndicator, useSetting, indicator);
+}
+
+void ScintillaCall::BraceBadLight(Position pos) {
+	Call(Message::BraceBadLight, pos);
+}
+
+void ScintillaCall::BraceBadLightIndicator(bool useSetting, int indicator) {
+	Call(Message::BraceBadLightIndicator, useSetting, indicator);
+}
+
+Position ScintillaCall::BraceMatch(Position pos, int maxReStyle) {
+	return Call(Message::BraceMatch, pos, maxReStyle);
+}
+
+Position ScintillaCall::BraceMatchNext(Position pos, Position startPos) {
+	return Call(Message::BraceMatchNext, pos, startPos);
+}
+
+bool ScintillaCall::ViewEOL() {
+	return Call(Message::GetViewEOL);
+}
+
+void ScintillaCall::SetViewEOL(bool visible) {
+	Call(Message::SetViewEOL, visible);
+}
+
+void *ScintillaCall::DocPointer() {
+	return reinterpret_cast<void *>(Call(Message::GetDocPointer));
+}
+
+void ScintillaCall::SetDocPointer(void *doc) {
+	CallPointer(Message::SetDocPointer, 0, doc);
+}
+
+void ScintillaCall::SetModEventMask(Scintilla::ModificationFlags eventMask) {
+	Call(Message::SetModEventMask, static_cast<uintptr_t>(eventMask));
+}
+
+Position ScintillaCall::EdgeColumn() {
+	return Call(Message::GetEdgeColumn);
+}
+
+void ScintillaCall::SetEdgeColumn(Position column) {
+	Call(Message::SetEdgeColumn, column);
+}
+
+EdgeVisualStyle ScintillaCall::EdgeMode() {
+	return static_cast<Scintilla::EdgeVisualStyle>(Call(Message::GetEdgeMode));
+}
+
+void ScintillaCall::SetEdgeMode(Scintilla::EdgeVisualStyle edgeMode) {
+	Call(Message::SetEdgeMode, static_cast<uintptr_t>(edgeMode));
+}
+
+Colour ScintillaCall::EdgeColour() {
+	return static_cast<Colour>(Call(Message::GetEdgeColour));
+}
+
+void ScintillaCall::SetEdgeColour(Colour edgeColour) {
+	Call(Message::SetEdgeColour, edgeColour);
+}
+
+void ScintillaCall::MultiEdgeAddLine(Position column, Colour edgeColour) {
+	Call(Message::MultiEdgeAddLine, column, edgeColour);
+}
+
+void ScintillaCall::MultiEdgeClearAll() {
+	Call(Message::MultiEdgeClearAll);
+}
+
+Position ScintillaCall::MultiEdgeColumn(int which) {
+	return Call(Message::GetMultiEdgeColumn, which);
+}
+
+void ScintillaCall::SearchAnchor() {
+	Call(Message::SearchAnchor);
+}
+
+Position ScintillaCall::SearchNext(Scintilla::FindOption searchFlags, const char *text) {
+	return CallString(Message::SearchNext, static_cast<uintptr_t>(searchFlags), text);
+}
+
+Position ScintillaCall::SearchPrev(Scintilla::FindOption searchFlags, const char *text) {
+	return CallString(Message::SearchPrev, static_cast<uintptr_t>(searchFlags), text);
+}
+
+Line ScintillaCall::LinesOnScreen() {
+	return Call(Message::LinesOnScreen);
+}
+
+void ScintillaCall::UsePopUp(Scintilla::PopUp popUpMode) {
+	Call(Message::UsePopUp, static_cast<uintptr_t>(popUpMode));
+}
+
+bool ScintillaCall::SelectionIsRectangle() {
+	return Call(Message::SelectionIsRectangle);
+}
+
+void ScintillaCall::SetZoom(int zoomInPoints) {
+	Call(Message::SetZoom, zoomInPoints);
+}
+
+int ScintillaCall::Zoom() {
+	return static_cast<int>(Call(Message::GetZoom));
+}
+
+void *ScintillaCall::CreateDocument(Position bytes, Scintilla::DocumentOption documentOptions) {
+	return reinterpret_cast<void *>(Call(Message::CreateDocument, bytes, static_cast<intptr_t>(documentOptions)));
+}
+
+void ScintillaCall::AddRefDocument(void *doc) {
+	CallPointer(Message::AddRefDocument, 0, doc);
+}
+
+void ScintillaCall::ReleaseDocument(void *doc) {
+	CallPointer(Message::ReleaseDocument, 0, doc);
+}
+
+DocumentOption ScintillaCall::DocumentOptions() {
+	return static_cast<Scintilla::DocumentOption>(Call(Message::GetDocumentOptions));
+}
+
+ModificationFlags ScintillaCall::ModEventMask() {
+	return static_cast<Scintilla::ModificationFlags>(Call(Message::GetModEventMask));
+}
+
+void ScintillaCall::SetCommandEvents(bool commandEvents) {
+	Call(Message::SetCommandEvents, commandEvents);
+}
+
+bool ScintillaCall::CommandEvents() {
+	return Call(Message::GetCommandEvents);
+}
+
+void ScintillaCall::SetFocus(bool focus) {
+	Call(Message::SetFocus, focus);
+}
+
+bool ScintillaCall::Focus() {
+	return Call(Message::GetFocus);
+}
+
+void ScintillaCall::SetStatus(Scintilla::Status status) {
+	Call(Message::SetStatus, static_cast<uintptr_t>(status));
+}
+
+Status ScintillaCall::Status() {
+	return static_cast<Scintilla::Status>(Call(Message::GetStatus));
+}
+
+void ScintillaCall::SetMouseDownCaptures(bool captures) {
+	Call(Message::SetMouseDownCaptures, captures);
+}
+
+bool ScintillaCall::MouseDownCaptures() {
+	return Call(Message::GetMouseDownCaptures);
+}
+
+void ScintillaCall::SetMouseWheelCaptures(bool captures) {
+	Call(Message::SetMouseWheelCaptures, captures);
+}
+
+bool ScintillaCall::MouseWheelCaptures() {
+	return Call(Message::GetMouseWheelCaptures);
+}
+
+void ScintillaCall::SetCursor(Scintilla::CursorShape cursorType) {
+	Call(Message::SetCursor, static_cast<uintptr_t>(cursorType));
+}
+
+CursorShape ScintillaCall::Cursor() {
+	return static_cast<Scintilla::CursorShape>(Call(Message::GetCursor));
+}
+
+void ScintillaCall::SetControlCharSymbol(int symbol) {
+	Call(Message::SetControlCharSymbol, symbol);
+}
+
+int ScintillaCall::ControlCharSymbol() {
+	return static_cast<int>(Call(Message::GetControlCharSymbol));
+}
+
+void ScintillaCall::WordPartLeft() {
+	Call(Message::WordPartLeft);
+}
+
+void ScintillaCall::WordPartLeftExtend() {
+	Call(Message::WordPartLeftExtend);
+}
+
+void ScintillaCall::WordPartRight() {
+	Call(Message::WordPartRight);
+}
+
+void ScintillaCall::WordPartRightExtend() {
+	Call(Message::WordPartRightExtend);
+}
+
+void ScintillaCall::SetVisiblePolicy(Scintilla::VisiblePolicy visiblePolicy, int visibleSlop) {
+	Call(Message::SetVisiblePolicy, static_cast<uintptr_t>(visiblePolicy), visibleSlop);
+}
+
+void ScintillaCall::DelLineLeft() {
+	Call(Message::DelLineLeft);
+}
+
+void ScintillaCall::DelLineRight() {
+	Call(Message::DelLineRight);
+}
+
+void ScintillaCall::SetXOffset(int xOffset) {
+	Call(Message::SetXOffset, xOffset);
+}
+
+int ScintillaCall::XOffset() {
+	return static_cast<int>(Call(Message::GetXOffset));
+}
+
+void ScintillaCall::ChooseCaretX() {
+	Call(Message::ChooseCaretX);
+}
+
+void ScintillaCall::GrabFocus() {
+	Call(Message::GrabFocus);
+}
+
+void ScintillaCall::SetXCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop) {
+	Call(Message::SetXCaretPolicy, static_cast<uintptr_t>(caretPolicy), caretSlop);
+}
+
+void ScintillaCall::SetYCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop) {
+	Call(Message::SetYCaretPolicy, static_cast<uintptr_t>(caretPolicy), caretSlop);
+}
+
+void ScintillaCall::SetPrintWrapMode(Scintilla::Wrap wrapMode) {
+	Call(Message::SetPrintWrapMode, static_cast<uintptr_t>(wrapMode));
+}
+
+Wrap ScintillaCall::PrintWrapMode() {
+	return static_cast<Scintilla::Wrap>(Call(Message::GetPrintWrapMode));
+}
+
+void ScintillaCall::SetHotspotActiveFore(bool useSetting, Colour fore) {
+	Call(Message::SetHotspotActiveFore, useSetting, fore);
+}
+
+Colour ScintillaCall::HotspotActiveFore() {
+	return static_cast<Colour>(Call(Message::GetHotspotActiveFore));
+}
+
+void ScintillaCall::SetHotspotActiveBack(bool useSetting, Colour back) {
+	Call(Message::SetHotspotActiveBack, useSetting, back);
+}
+
+Colour ScintillaCall::HotspotActiveBack() {
+	return static_cast<Colour>(Call(Message::GetHotspotActiveBack));
+}
+
+void ScintillaCall::SetHotspotActiveUnderline(bool underline) {
+	Call(Message::SetHotspotActiveUnderline, underline);
+}
+
+bool ScintillaCall::HotspotActiveUnderline() {
+	return Call(Message::GetHotspotActiveUnderline);
+}
+
+void ScintillaCall::SetHotspotSingleLine(bool singleLine) {
+	Call(Message::SetHotspotSingleLine, singleLine);
+}
+
+bool ScintillaCall::HotspotSingleLine() {
+	return Call(Message::GetHotspotSingleLine);
+}
+
+void ScintillaCall::ParaDown() {
+	Call(Message::ParaDown);
+}
+
+void ScintillaCall::ParaDownExtend() {
+	Call(Message::ParaDownExtend);
+}
+
+void ScintillaCall::ParaUp() {
+	Call(Message::ParaUp);
+}
+
+void ScintillaCall::ParaUpExtend() {
+	Call(Message::ParaUpExtend);
+}
+
+Position ScintillaCall::PositionBefore(Position pos) {
+	return Call(Message::PositionBefore, pos);
+}
+
+Position ScintillaCall::PositionAfter(Position pos) {
+	return Call(Message::PositionAfter, pos);
+}
+
+Position ScintillaCall::PositionRelative(Position pos, Position relative) {
+	return Call(Message::PositionRelative, pos, relative);
+}
+
+Position ScintillaCall::PositionRelativeCodeUnits(Position pos, Position relative) {
+	return Call(Message::PositionRelativeCodeUnits, pos, relative);
+}
+
+void ScintillaCall::CopyRange(Position start, Position end) {
+	Call(Message::CopyRange, start, end);
+}
+
+void ScintillaCall::CopyText(Position length, const char *text) {
+	CallString(Message::CopyText, length, text);
+}
+
+void ScintillaCall::SetSelectionMode(Scintilla::SelectionMode selectionMode) {
+	Call(Message::SetSelectionMode, static_cast<uintptr_t>(selectionMode));
+}
+
+SelectionMode ScintillaCall::SelectionMode() {
+	return static_cast<Scintilla::SelectionMode>(Call(Message::GetSelectionMode));
+}
+
+bool ScintillaCall::MoveExtendsSelection() {
+	return Call(Message::GetMoveExtendsSelection);
+}
+
+Position ScintillaCall::GetLineSelStartPosition(Line line) {
+	return Call(Message::GetLineSelStartPosition, line);
+}
+
+Position ScintillaCall::GetLineSelEndPosition(Line line) {
+	return Call(Message::GetLineSelEndPosition, line);
+}
+
+void ScintillaCall::LineDownRectExtend() {
+	Call(Message::LineDownRectExtend);
+}
+
+void ScintillaCall::LineUpRectExtend() {
+	Call(Message::LineUpRectExtend);
+}
+
+void ScintillaCall::CharLeftRectExtend() {
+	Call(Message::CharLeftRectExtend);
+}
+
+void ScintillaCall::CharRightRectExtend() {
+	Call(Message::CharRightRectExtend);
+}
+
+void ScintillaCall::HomeRectExtend() {
+	Call(Message::HomeRectExtend);
+}
+
+void ScintillaCall::VCHomeRectExtend() {
+	Call(Message::VCHomeRectExtend);
+}
+
+void ScintillaCall::LineEndRectExtend() {
+	Call(Message::LineEndRectExtend);
+}
+
+void ScintillaCall::PageUpRectExtend() {
+	Call(Message::PageUpRectExtend);
+}
+
+void ScintillaCall::PageDownRectExtend() {
+	Call(Message::PageDownRectExtend);
+}
+
+void ScintillaCall::StutteredPageUp() {
+	Call(Message::StutteredPageUp);
+}
+
+void ScintillaCall::StutteredPageUpExtend() {
+	Call(Message::StutteredPageUpExtend);
+}
+
+void ScintillaCall::StutteredPageDown() {
+	Call(Message::StutteredPageDown);
+}
+
+void ScintillaCall::StutteredPageDownExtend() {
+	Call(Message::StutteredPageDownExtend);
+}
+
+void ScintillaCall::WordLeftEnd() {
+	Call(Message::WordLeftEnd);
+}
+
+void ScintillaCall::WordLeftEndExtend() {
+	Call(Message::WordLeftEndExtend);
+}
+
+void ScintillaCall::WordRightEnd() {
+	Call(Message::WordRightEnd);
+}
+
+void ScintillaCall::WordRightEndExtend() {
+	Call(Message::WordRightEndExtend);
+}
+
+void ScintillaCall::SetWhitespaceChars(const char *characters) {
+	CallString(Message::SetWhitespaceChars, 0, characters);
+}
+
+int ScintillaCall::WhitespaceChars(char *characters) {
+	return static_cast<int>(CallPointer(Message::GetWhitespaceChars, 0, characters));
+}
+
+std::string ScintillaCall::WhitespaceChars() {
+	return CallReturnString(Message::GetWhitespaceChars, 0);
+}
+
+void ScintillaCall::SetPunctuationChars(const char *characters) {
+	CallString(Message::SetPunctuationChars, 0, characters);
+}
+
+int ScintillaCall::PunctuationChars(char *characters) {
+	return static_cast<int>(CallPointer(Message::GetPunctuationChars, 0, characters));
+}
+
+std::string ScintillaCall::PunctuationChars() {
+	return CallReturnString(Message::GetPunctuationChars, 0);
+}
+
+void ScintillaCall::SetCharsDefault() {
+	Call(Message::SetCharsDefault);
+}
+
+int ScintillaCall::AutoCGetCurrent() {
+	return static_cast<int>(Call(Message::AutoCGetCurrent));
+}
+
+int ScintillaCall::AutoCGetCurrentText(char *text) {
+	return static_cast<int>(CallPointer(Message::AutoCGetCurrentText, 0, text));
+}
+
+std::string ScintillaCall::AutoCGetCurrentText() {
+	return CallReturnString(Message::AutoCGetCurrentText, 0);
+}
+
+void ScintillaCall::AutoCSetCaseInsensitiveBehaviour(Scintilla::CaseInsensitiveBehaviour behaviour) {
+	Call(Message::AutoCSetCaseInsensitiveBehaviour, static_cast<uintptr_t>(behaviour));
+}
+
+CaseInsensitiveBehaviour ScintillaCall::AutoCGetCaseInsensitiveBehaviour() {
+	return static_cast<Scintilla::CaseInsensitiveBehaviour>(Call(Message::AutoCGetCaseInsensitiveBehaviour));
+}
+
+void ScintillaCall::AutoCSetMulti(Scintilla::MultiAutoComplete multi) {
+	Call(Message::AutoCSetMulti, static_cast<uintptr_t>(multi));
+}
+
+MultiAutoComplete ScintillaCall::AutoCGetMulti() {
+	return static_cast<Scintilla::MultiAutoComplete>(Call(Message::AutoCGetMulti));
+}
+
+void ScintillaCall::AutoCSetOrder(Scintilla::Ordering order) {
+	Call(Message::AutoCSetOrder, static_cast<uintptr_t>(order));
+}
+
+Ordering ScintillaCall::AutoCGetOrder() {
+	return static_cast<Scintilla::Ordering>(Call(Message::AutoCGetOrder));
+}
+
+void ScintillaCall::Allocate(Position bytes) {
+	Call(Message::Allocate, bytes);
+}
+
+Position ScintillaCall::TargetAsUTF8(char *s) {
+	return CallPointer(Message::TargetAsUTF8, 0, s);
+}
+
+std::string ScintillaCall::TargetAsUTF8() {
+	return CallReturnString(Message::TargetAsUTF8, 0);
+}
+
+void ScintillaCall::SetLengthForEncode(Position bytes) {
+	Call(Message::SetLengthForEncode, bytes);
+}
+
+Position ScintillaCall::EncodedFromUTF8(const char *utf8, char *encoded) {
+	return CallPointer(Message::EncodedFromUTF8, reinterpret_cast<uintptr_t>(utf8), encoded);
+}
+
+std::string ScintillaCall::EncodedFromUTF8(const char *utf8) {
+	return CallReturnString(Message::EncodedFromUTF8, reinterpret_cast<uintptr_t>(utf8));
+}
+
+Position ScintillaCall::FindColumn(Line line, Position column) {
+	return Call(Message::FindColumn, line, column);
+}
+
+CaretSticky ScintillaCall::CaretSticky() {
+	return static_cast<Scintilla::CaretSticky>(Call(Message::GetCaretSticky));
+}
+
+void ScintillaCall::SetCaretSticky(Scintilla::CaretSticky useCaretStickyBehaviour) {
+	Call(Message::SetCaretSticky, static_cast<uintptr_t>(useCaretStickyBehaviour));
+}
+
+void ScintillaCall::ToggleCaretSticky() {
+	Call(Message::ToggleCaretSticky);
+}
+
+void ScintillaCall::SetPasteConvertEndings(bool convert) {
+	Call(Message::SetPasteConvertEndings, convert);
+}
+
+bool ScintillaCall::PasteConvertEndings() {
+	return Call(Message::GetPasteConvertEndings);
+}
+
+void ScintillaCall::ReplaceRectangular(Position length, const char *text) {
+	CallString(Message::ReplaceRectangular, length, text);
+}
+
+void ScintillaCall::SelectionDuplicate() {
+	Call(Message::SelectionDuplicate);
+}
+
+void ScintillaCall::SetCaretLineBackAlpha(Scintilla::Alpha alpha) {
+	Call(Message::SetCaretLineBackAlpha, static_cast<uintptr_t>(alpha));
+}
+
+Alpha ScintillaCall::CaretLineBackAlpha() {
+	return static_cast<Scintilla::Alpha>(Call(Message::GetCaretLineBackAlpha));
+}
+
+void ScintillaCall::SetCaretStyle(Scintilla::CaretStyle caretStyle) {
+	Call(Message::SetCaretStyle, static_cast<uintptr_t>(caretStyle));
+}
+
+CaretStyle ScintillaCall::CaretStyle() {
+	return static_cast<Scintilla::CaretStyle>(Call(Message::GetCaretStyle));
+}
+
+void ScintillaCall::SetIndicatorCurrent(int indicator) {
+	Call(Message::SetIndicatorCurrent, indicator);
+}
+
+int ScintillaCall::IndicatorCurrent() {
+	return static_cast<int>(Call(Message::GetIndicatorCurrent));
+}
+
+void ScintillaCall::SetIndicatorValue(int value) {
+	Call(Message::SetIndicatorValue, value);
+}
+
+int ScintillaCall::IndicatorValue() {
+	return static_cast<int>(Call(Message::GetIndicatorValue));
+}
+
+void ScintillaCall::IndicatorFillRange(Position start, Position lengthFill) {
+	Call(Message::IndicatorFillRange, start, lengthFill);
+}
+
+void ScintillaCall::IndicatorClearRange(Position start, Position lengthClear) {
+	Call(Message::IndicatorClearRange, start, lengthClear);
+}
+
+int ScintillaCall::IndicatorAllOnFor(Position pos) {
+	return static_cast<int>(Call(Message::IndicatorAllOnFor, pos));
+}
+
+int ScintillaCall::IndicatorValueAt(int indicator, Position pos) {
+	return static_cast<int>(Call(Message::IndicatorValueAt, indicator, pos));
+}
+
+Position ScintillaCall::IndicatorStart(int indicator, Position pos) {
+	return Call(Message::IndicatorStart, indicator, pos);
+}
+
+Position ScintillaCall::IndicatorEnd(int indicator, Position pos) {
+	return Call(Message::IndicatorEnd, indicator, pos);
+}
+
+void ScintillaCall::SetPositionCache(int size) {
+	Call(Message::SetPositionCache, size);
+}
+
+int ScintillaCall::PositionCache() {
+	return static_cast<int>(Call(Message::GetPositionCache));
+}
+
+void ScintillaCall::CopyAllowLine() {
+	Call(Message::CopyAllowLine);
+}
+
+void *ScintillaCall::CharacterPointer() {
+	return reinterpret_cast<void *>(Call(Message::GetCharacterPointer));
+}
+
+void *ScintillaCall::RangePointer(Position start, Position lengthRange) {
+	return reinterpret_cast<void *>(Call(Message::GetRangePointer, start, lengthRange));
+}
+
+Position ScintillaCall::GapPosition() {
+	return Call(Message::GetGapPosition);
+}
+
+void ScintillaCall::IndicSetAlpha(int indicator, Scintilla::Alpha alpha) {
+	Call(Message::IndicSetAlpha, indicator, static_cast<intptr_t>(alpha));
+}
+
+Alpha ScintillaCall::IndicGetAlpha(int indicator) {
+	return static_cast<Scintilla::Alpha>(Call(Message::IndicGetAlpha, indicator));
+}
+
+void ScintillaCall::IndicSetOutlineAlpha(int indicator, Scintilla::Alpha alpha) {
+	Call(Message::IndicSetOutlineAlpha, indicator, static_cast<intptr_t>(alpha));
+}
+
+Alpha ScintillaCall::IndicGetOutlineAlpha(int indicator) {
+	return static_cast<Scintilla::Alpha>(Call(Message::IndicGetOutlineAlpha, indicator));
+}
+
+void ScintillaCall::SetExtraAscent(int extraAscent) {
+	Call(Message::SetExtraAscent, extraAscent);
+}
+
+int ScintillaCall::ExtraAscent() {
+	return static_cast<int>(Call(Message::GetExtraAscent));
+}
+
+void ScintillaCall::SetExtraDescent(int extraDescent) {
+	Call(Message::SetExtraDescent, extraDescent);
+}
+
+int ScintillaCall::ExtraDescent() {
+	return static_cast<int>(Call(Message::GetExtraDescent));
+}
+
+int ScintillaCall::MarkerSymbolDefined(int markerNumber) {
+	return static_cast<int>(Call(Message::MarkerSymbolDefined, markerNumber));
+}
+
+void ScintillaCall::MarginSetText(Line line, const char *text) {
+	CallString(Message::MarginSetText, line, text);
+}
+
+int ScintillaCall::MarginGetText(Line line, char *text) {
+	return static_cast<int>(CallPointer(Message::MarginGetText, line, text));
+}
+
+std::string ScintillaCall::MarginGetText(Line line) {
+	return CallReturnString(Message::MarginGetText, line);
+}
+
+void ScintillaCall::MarginSetStyle(Line line, int style) {
+	Call(Message::MarginSetStyle, line, style);
+}
+
+int ScintillaCall::MarginGetStyle(Line line) {
+	return static_cast<int>(Call(Message::MarginGetStyle, line));
+}
+
+void ScintillaCall::MarginSetStyles(Line line, const char *styles) {
+	CallString(Message::MarginSetStyles, line, styles);
+}
+
+int ScintillaCall::MarginGetStyles(Line line, char *styles) {
+	return static_cast<int>(CallPointer(Message::MarginGetStyles, line, styles));
+}
+
+std::string ScintillaCall::MarginGetStyles(Line line) {
+	return CallReturnString(Message::MarginGetStyles, line);
+}
+
+void ScintillaCall::MarginTextClearAll() {
+	Call(Message::MarginTextClearAll);
+}
+
+void ScintillaCall::MarginSetStyleOffset(int style) {
+	Call(Message::MarginSetStyleOffset, style);
+}
+
+int ScintillaCall::MarginGetStyleOffset() {
+	return static_cast<int>(Call(Message::MarginGetStyleOffset));
+}
+
+void ScintillaCall::SetMarginOptions(Scintilla::MarginOption marginOptions) {
+	Call(Message::SetMarginOptions, static_cast<uintptr_t>(marginOptions));
+}
+
+MarginOption ScintillaCall::MarginOptions() {
+	return static_cast<Scintilla::MarginOption>(Call(Message::GetMarginOptions));
+}
+
+void ScintillaCall::AnnotationSetText(Line line, const char *text) {
+	CallString(Message::AnnotationSetText, line, text);
+}
+
+int ScintillaCall::AnnotationGetText(Line line, char *text) {
+	return static_cast<int>(CallPointer(Message::AnnotationGetText, line, text));
+}
+
+std::string ScintillaCall::AnnotationGetText(Line line) {
+	return CallReturnString(Message::AnnotationGetText, line);
+}
+
+void ScintillaCall::AnnotationSetStyle(Line line, int style) {
+	Call(Message::AnnotationSetStyle, line, style);
+}
+
+int ScintillaCall::AnnotationGetStyle(Line line) {
+	return static_cast<int>(Call(Message::AnnotationGetStyle, line));
+}
+
+void ScintillaCall::AnnotationSetStyles(Line line, const char *styles) {
+	CallString(Message::AnnotationSetStyles, line, styles);
+}
+
+int ScintillaCall::AnnotationGetStyles(Line line, char *styles) {
+	return static_cast<int>(CallPointer(Message::AnnotationGetStyles, line, styles));
+}
+
+std::string ScintillaCall::AnnotationGetStyles(Line line) {
+	return CallReturnString(Message::AnnotationGetStyles, line);
+}
+
+int ScintillaCall::AnnotationGetLines(Line line) {
+	return static_cast<int>(Call(Message::AnnotationGetLines, line));
+}
+
+void ScintillaCall::AnnotationClearAll() {
+	Call(Message::AnnotationClearAll);
+}
+
+void ScintillaCall::AnnotationSetVisible(Scintilla::AnnotationVisible visible) {
+	Call(Message::AnnotationSetVisible, static_cast<uintptr_t>(visible));
+}
+
+AnnotationVisible ScintillaCall::AnnotationGetVisible() {
+	return static_cast<Scintilla::AnnotationVisible>(Call(Message::AnnotationGetVisible));
+}
+
+void ScintillaCall::AnnotationSetStyleOffset(int style) {
+	Call(Message::AnnotationSetStyleOffset, style);
+}
+
+int ScintillaCall::AnnotationGetStyleOffset() {
+	return static_cast<int>(Call(Message::AnnotationGetStyleOffset));
+}
+
+void ScintillaCall::ReleaseAllExtendedStyles() {
+	Call(Message::ReleaseAllExtendedStyles);
+}
+
+int ScintillaCall::AllocateExtendedStyles(int numberStyles) {
+	return static_cast<int>(Call(Message::AllocateExtendedStyles, numberStyles));
+}
+
+void ScintillaCall::AddUndoAction(int token, Scintilla::UndoFlags flags) {
+	Call(Message::AddUndoAction, token, static_cast<intptr_t>(flags));
+}
+
+Position ScintillaCall::CharPositionFromPoint(int x, int y) {
+	return Call(Message::CharPositionFromPoint, x, y);
+}
+
+Position ScintillaCall::CharPositionFromPointClose(int x, int y) {
+	return Call(Message::CharPositionFromPointClose, x, y);
+}
+
+void ScintillaCall::SetMouseSelectionRectangularSwitch(bool mouseSelectionRectangularSwitch) {
+	Call(Message::SetMouseSelectionRectangularSwitch, mouseSelectionRectangularSwitch);
+}
+
+bool ScintillaCall::MouseSelectionRectangularSwitch() {
+	return Call(Message::GetMouseSelectionRectangularSwitch);
+}
+
+void ScintillaCall::SetMultipleSelection(bool multipleSelection) {
+	Call(Message::SetMultipleSelection, multipleSelection);
+}
+
+bool ScintillaCall::MultipleSelection() {
+	return Call(Message::GetMultipleSelection);
+}
+
+void ScintillaCall::SetAdditionalSelectionTyping(bool additionalSelectionTyping) {
+	Call(Message::SetAdditionalSelectionTyping, additionalSelectionTyping);
+}
+
+bool ScintillaCall::AdditionalSelectionTyping() {
+	return Call(Message::GetAdditionalSelectionTyping);
+}
+
+void ScintillaCall::SetAdditionalCaretsBlink(bool additionalCaretsBlink) {
+	Call(Message::SetAdditionalCaretsBlink, additionalCaretsBlink);
+}
+
+bool ScintillaCall::AdditionalCaretsBlink() {
+	return Call(Message::GetAdditionalCaretsBlink);
+}
+
+void ScintillaCall::SetAdditionalCaretsVisible(bool additionalCaretsVisible) {
+	Call(Message::SetAdditionalCaretsVisible, additionalCaretsVisible);
+}
+
+bool ScintillaCall::AdditionalCaretsVisible() {
+	return Call(Message::GetAdditionalCaretsVisible);
+}
+
+int ScintillaCall::Selections() {
+	return static_cast<int>(Call(Message::GetSelections));
+}
+
+bool ScintillaCall::SelectionEmpty() {
+	return Call(Message::GetSelectionEmpty);
+}
+
+void ScintillaCall::ClearSelections() {
+	Call(Message::ClearSelections);
+}
+
+void ScintillaCall::SetSelection(Position caret, Position anchor) {
+	Call(Message::SetSelection, caret, anchor);
+}
+
+void ScintillaCall::AddSelection(Position caret, Position anchor) {
+	Call(Message::AddSelection, caret, anchor);
+}
+
+void ScintillaCall::DropSelectionN(int selection) {
+	Call(Message::DropSelectionN, selection);
+}
+
+void ScintillaCall::SetMainSelection(int selection) {
+	Call(Message::SetMainSelection, selection);
+}
+
+int ScintillaCall::MainSelection() {
+	return static_cast<int>(Call(Message::GetMainSelection));
+}
+
+void ScintillaCall::SetSelectionNCaret(int selection, Position caret) {
+	Call(Message::SetSelectionNCaret, selection, caret);
+}
+
+Position ScintillaCall::SelectionNCaret(int selection) {
+	return Call(Message::GetSelectionNCaret, selection);
+}
+
+void ScintillaCall::SetSelectionNAnchor(int selection, Position anchor) {
+	Call(Message::SetSelectionNAnchor, selection, anchor);
+}
+
+Position ScintillaCall::SelectionNAnchor(int selection) {
+	return Call(Message::GetSelectionNAnchor, selection);
+}
+
+void ScintillaCall::SetSelectionNCaretVirtualSpace(int selection, Position space) {
+	Call(Message::SetSelectionNCaretVirtualSpace, selection, space);
+}
+
+Position ScintillaCall::SelectionNCaretVirtualSpace(int selection) {
+	return Call(Message::GetSelectionNCaretVirtualSpace, selection);
+}
+
+void ScintillaCall::SetSelectionNAnchorVirtualSpace(int selection, Position space) {
+	Call(Message::SetSelectionNAnchorVirtualSpace, selection, space);
+}
+
+Position ScintillaCall::SelectionNAnchorVirtualSpace(int selection) {
+	return Call(Message::GetSelectionNAnchorVirtualSpace, selection);
+}
+
+void ScintillaCall::SetSelectionNStart(int selection, Position anchor) {
+	Call(Message::SetSelectionNStart, selection, anchor);
+}
+
+Position ScintillaCall::SelectionNStart(int selection) {
+	return Call(Message::GetSelectionNStart, selection);
+}
+
+Position ScintillaCall::SelectionNStartVirtualSpace(int selection) {
+	return Call(Message::GetSelectionNStartVirtualSpace, selection);
+}
+
+void ScintillaCall::SetSelectionNEnd(int selection, Position caret) {
+	Call(Message::SetSelectionNEnd, selection, caret);
+}
+
+Position ScintillaCall::SelectionNEndVirtualSpace(int selection) {
+	return Call(Message::GetSelectionNEndVirtualSpace, selection);
+}
+
+Position ScintillaCall::SelectionNEnd(int selection) {
+	return Call(Message::GetSelectionNEnd, selection);
+}
+
+void ScintillaCall::SetRectangularSelectionCaret(Position caret) {
+	Call(Message::SetRectangularSelectionCaret, caret);
+}
+
+Position ScintillaCall::RectangularSelectionCaret() {
+	return Call(Message::GetRectangularSelectionCaret);
+}
+
+void ScintillaCall::SetRectangularSelectionAnchor(Position anchor) {
+	Call(Message::SetRectangularSelectionAnchor, anchor);
+}
+
+Position ScintillaCall::RectangularSelectionAnchor() {
+	return Call(Message::GetRectangularSelectionAnchor);
+}
+
+void ScintillaCall::SetRectangularSelectionCaretVirtualSpace(Position space) {
+	Call(Message::SetRectangularSelectionCaretVirtualSpace, space);
+}
+
+Position ScintillaCall::RectangularSelectionCaretVirtualSpace() {
+	return Call(Message::GetRectangularSelectionCaretVirtualSpace);
+}
+
+void ScintillaCall::SetRectangularSelectionAnchorVirtualSpace(Position space) {
+	Call(Message::SetRectangularSelectionAnchorVirtualSpace, space);
+}
+
+Position ScintillaCall::RectangularSelectionAnchorVirtualSpace() {
+	return Call(Message::GetRectangularSelectionAnchorVirtualSpace);
+}
+
+void ScintillaCall::SetVirtualSpaceOptions(Scintilla::VirtualSpace virtualSpaceOptions) {
+	Call(Message::SetVirtualSpaceOptions, static_cast<uintptr_t>(virtualSpaceOptions));
+}
+
+VirtualSpace ScintillaCall::VirtualSpaceOptions() {
+	return static_cast<Scintilla::VirtualSpace>(Call(Message::GetVirtualSpaceOptions));
+}
+
+void ScintillaCall::SetRectangularSelectionModifier(int modifier) {
+	Call(Message::SetRectangularSelectionModifier, modifier);
+}
+
+int ScintillaCall::RectangularSelectionModifier() {
+	return static_cast<int>(Call(Message::GetRectangularSelectionModifier));
+}
+
+void ScintillaCall::SetAdditionalSelFore(Colour fore) {
+	Call(Message::SetAdditionalSelFore, fore);
+}
+
+void ScintillaCall::SetAdditionalSelBack(Colour back) {
+	Call(Message::SetAdditionalSelBack, back);
+}
+
+void ScintillaCall::SetAdditionalSelAlpha(Scintilla::Alpha alpha) {
+	Call(Message::SetAdditionalSelAlpha, static_cast<uintptr_t>(alpha));
+}
+
+Alpha ScintillaCall::AdditionalSelAlpha() {
+	return static_cast<Scintilla::Alpha>(Call(Message::GetAdditionalSelAlpha));
+}
+
+void ScintillaCall::SetAdditionalCaretFore(Colour fore) {
+	Call(Message::SetAdditionalCaretFore, fore);
+}
+
+Colour ScintillaCall::AdditionalCaretFore() {
+	return static_cast<Colour>(Call(Message::GetAdditionalCaretFore));
+}
+
+void ScintillaCall::RotateSelection() {
+	Call(Message::RotateSelection);
+}
+
+void ScintillaCall::SwapMainAnchorCaret() {
+	Call(Message::SwapMainAnchorCaret);
+}
+
+void ScintillaCall::MultipleSelectAddNext() {
+	Call(Message::MultipleSelectAddNext);
+}
+
+void ScintillaCall::MultipleSelectAddEach() {
+	Call(Message::MultipleSelectAddEach);
+}
+
+int ScintillaCall::ChangeLexerState(Position start, Position end) {
+	return static_cast<int>(Call(Message::ChangeLexerState, start, end));
+}
+
+Line ScintillaCall::ContractedFoldNext(Line lineStart) {
+	return Call(Message::ContractedFoldNext, lineStart);
+}
+
+void ScintillaCall::VerticalCentreCaret() {
+	Call(Message::VerticalCentreCaret);
+}
+
+void ScintillaCall::MoveSelectedLinesUp() {
+	Call(Message::MoveSelectedLinesUp);
+}
+
+void ScintillaCall::MoveSelectedLinesDown() {
+	Call(Message::MoveSelectedLinesDown);
+}
+
+void ScintillaCall::SetIdentifier(int identifier) {
+	Call(Message::SetIdentifier, identifier);
+}
+
+int ScintillaCall::Identifier() {
+	return static_cast<int>(Call(Message::GetIdentifier));
+}
+
+void ScintillaCall::RGBAImageSetWidth(int width) {
+	Call(Message::RGBAImageSetWidth, width);
+}
+
+void ScintillaCall::RGBAImageSetHeight(int height) {
+	Call(Message::RGBAImageSetHeight, height);
+}
+
+void ScintillaCall::RGBAImageSetScale(int scalePercent) {
+	Call(Message::RGBAImageSetScale, scalePercent);
+}
+
+void ScintillaCall::MarkerDefineRGBAImage(int markerNumber, const char *pixels) {
+	CallString(Message::MarkerDefineRGBAImage, markerNumber, pixels);
+}
+
+void ScintillaCall::RegisterRGBAImage(int type, const char *pixels) {
+	CallString(Message::RegisterRGBAImage, type, pixels);
+}
+
+void ScintillaCall::ScrollToStart() {
+	Call(Message::ScrollToStart);
+}
+
+void ScintillaCall::ScrollToEnd() {
+	Call(Message::ScrollToEnd);
+}
+
+void ScintillaCall::SetTechnology(Scintilla::Technology technology) {
+	Call(Message::SetTechnology, static_cast<uintptr_t>(technology));
+}
+
+Technology ScintillaCall::Technology() {
+	return static_cast<Scintilla::Technology>(Call(Message::GetTechnology));
+}
+
+void *ScintillaCall::CreateLoader(Position bytes, Scintilla::DocumentOption documentOptions) {
+	return reinterpret_cast<void *>(Call(Message::CreateLoader, bytes, static_cast<intptr_t>(documentOptions)));
+}
+
+void ScintillaCall::FindIndicatorShow(Position start, Position end) {
+	Call(Message::FindIndicatorShow, start, end);
+}
+
+void ScintillaCall::FindIndicatorFlash(Position start, Position end) {
+	Call(Message::FindIndicatorFlash, start, end);
+}
+
+void ScintillaCall::FindIndicatorHide() {
+	Call(Message::FindIndicatorHide);
+}
+
+void ScintillaCall::VCHomeDisplay() {
+	Call(Message::VCHomeDisplay);
+}
+
+void ScintillaCall::VCHomeDisplayExtend() {
+	Call(Message::VCHomeDisplayExtend);
+}
+
+bool ScintillaCall::CaretLineVisibleAlways() {
+	return Call(Message::GetCaretLineVisibleAlways);
+}
+
+void ScintillaCall::SetCaretLineVisibleAlways(bool alwaysVisible) {
+	Call(Message::SetCaretLineVisibleAlways, alwaysVisible);
+}
+
+void ScintillaCall::SetLineEndTypesAllowed(Scintilla::LineEndType lineEndBitSet) {
+	Call(Message::SetLineEndTypesAllowed, static_cast<uintptr_t>(lineEndBitSet));
+}
+
+LineEndType ScintillaCall::LineEndTypesAllowed() {
+	return static_cast<Scintilla::LineEndType>(Call(Message::GetLineEndTypesAllowed));
+}
+
+LineEndType ScintillaCall::LineEndTypesActive() {
+	return static_cast<Scintilla::LineEndType>(Call(Message::GetLineEndTypesActive));
+}
+
+void ScintillaCall::SetRepresentation(const char *encodedCharacter, const char *representation) {
+	CallString(Message::SetRepresentation, reinterpret_cast<uintptr_t>(encodedCharacter), representation);
+}
+
+int ScintillaCall::Representation(const char *encodedCharacter, char *representation) {
+	return static_cast<int>(CallPointer(Message::GetRepresentation, reinterpret_cast<uintptr_t>(encodedCharacter), representation));
+}
+
+std::string ScintillaCall::Representation(const char *encodedCharacter) {
+	return CallReturnString(Message::GetRepresentation, reinterpret_cast<uintptr_t>(encodedCharacter));
+}
+
+void ScintillaCall::ClearRepresentation(const char *encodedCharacter) {
+	Call(Message::ClearRepresentation, reinterpret_cast<uintptr_t>(encodedCharacter));
+}
+
+void ScintillaCall::ClearAllRepresentations() {
+	Call(Message::ClearAllRepresentations);
+}
+
+void ScintillaCall::SetRepresentationAppearance(const char *encodedCharacter, Scintilla::RepresentationAppearance appearance) {
+	Call(Message::SetRepresentationAppearance, reinterpret_cast<uintptr_t>(encodedCharacter), static_cast<intptr_t>(appearance));
+}
+
+RepresentationAppearance ScintillaCall::RepresentationAppearance(const char *encodedCharacter) {
+	return static_cast<Scintilla::RepresentationAppearance>(Call(Message::GetRepresentationAppearance, reinterpret_cast<uintptr_t>(encodedCharacter)));
+}
+
+void ScintillaCall::SetRepresentationColour(const char *encodedCharacter, ColourAlpha colour) {
+	Call(Message::SetRepresentationColour, reinterpret_cast<uintptr_t>(encodedCharacter), colour);
+}
+
+ColourAlpha ScintillaCall::RepresentationColour(const char *encodedCharacter) {
+	return static_cast<ColourAlpha>(Call(Message::GetRepresentationColour, reinterpret_cast<uintptr_t>(encodedCharacter)));
+}
+
+void ScintillaCall::EOLAnnotationSetText(Line line, const char *text) {
+	CallString(Message::EOLAnnotationSetText, line, text);
+}
+
+int ScintillaCall::EOLAnnotationGetText(Line line, char *text) {
+	return static_cast<int>(CallPointer(Message::EOLAnnotationGetText, line, text));
+}
+
+std::string ScintillaCall::EOLAnnotationGetText(Line line) {
+	return CallReturnString(Message::EOLAnnotationGetText, line);
+}
+
+void ScintillaCall::EOLAnnotationSetStyle(Line line, int style) {
+	Call(Message::EOLAnnotationSetStyle, line, style);
+}
+
+int ScintillaCall::EOLAnnotationGetStyle(Line line) {
+	return static_cast<int>(Call(Message::EOLAnnotationGetStyle, line));
+}
+
+void ScintillaCall::EOLAnnotationClearAll() {
+	Call(Message::EOLAnnotationClearAll);
+}
+
+void ScintillaCall::EOLAnnotationSetVisible(Scintilla::EOLAnnotationVisible visible) {
+	Call(Message::EOLAnnotationSetVisible, static_cast<uintptr_t>(visible));
+}
+
+EOLAnnotationVisible ScintillaCall::EOLAnnotationGetVisible() {
+	return static_cast<Scintilla::EOLAnnotationVisible>(Call(Message::EOLAnnotationGetVisible));
+}
+
+void ScintillaCall::EOLAnnotationSetStyleOffset(int style) {
+	Call(Message::EOLAnnotationSetStyleOffset, style);
+}
+
+int ScintillaCall::EOLAnnotationGetStyleOffset() {
+	return static_cast<int>(Call(Message::EOLAnnotationGetStyleOffset));
+}
+
+bool ScintillaCall::SupportsFeature(Scintilla::Supports feature) {
+	return Call(Message::SupportsFeature, static_cast<uintptr_t>(feature));
+}
+
+LineCharacterIndexType ScintillaCall::LineCharacterIndex() {
+	return static_cast<Scintilla::LineCharacterIndexType>(Call(Message::GetLineCharacterIndex));
+}
+
+void ScintillaCall::AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex) {
+	Call(Message::AllocateLineCharacterIndex, static_cast<uintptr_t>(lineCharacterIndex));
+}
+
+void ScintillaCall::ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex) {
+	Call(Message::ReleaseLineCharacterIndex, static_cast<uintptr_t>(lineCharacterIndex));
+}
+
+Line ScintillaCall::LineFromIndexPosition(Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex) {
+	return Call(Message::LineFromIndexPosition, pos, static_cast<intptr_t>(lineCharacterIndex));
+}
+
+Position ScintillaCall::IndexPositionFromLine(Line line, Scintilla::LineCharacterIndexType lineCharacterIndex) {
+	return Call(Message::IndexPositionFromLine, line, static_cast<intptr_t>(lineCharacterIndex));
+}
+
+void ScintillaCall::StartRecord() {
+	Call(Message::StartRecord);
+}
+
+void ScintillaCall::StopRecord() {
+	Call(Message::StopRecord);
+}
+
+int ScintillaCall::Lexer() {
+	return static_cast<int>(Call(Message::GetLexer));
+}
+
+void ScintillaCall::Colourise(Position start, Position end) {
+	Call(Message::Colourise, start, end);
+}
+
+void ScintillaCall::SetProperty(const char *key, const char *value) {
+	CallString(Message::SetProperty, reinterpret_cast<uintptr_t>(key), value);
+}
+
+void ScintillaCall::SetKeyWords(int keyWordSet, const char *keyWords) {
+	CallString(Message::SetKeyWords, keyWordSet, keyWords);
+}
+
+int ScintillaCall::Property(const char *key, char *value) {
+	return static_cast<int>(CallPointer(Message::GetProperty, reinterpret_cast<uintptr_t>(key), value));
+}
+
+std::string ScintillaCall::Property(const char *key) {
+	return CallReturnString(Message::GetProperty, reinterpret_cast<uintptr_t>(key));
+}
+
+int ScintillaCall::PropertyExpanded(const char *key, char *value) {
+	return static_cast<int>(CallPointer(Message::GetPropertyExpanded, reinterpret_cast<uintptr_t>(key), value));
+}
+
+std::string ScintillaCall::PropertyExpanded(const char *key) {
+	return CallReturnString(Message::GetPropertyExpanded, reinterpret_cast<uintptr_t>(key));
+}
+
+int ScintillaCall::PropertyInt(const char *key, int defaultValue) {
+	return static_cast<int>(Call(Message::GetPropertyInt, reinterpret_cast<uintptr_t>(key), defaultValue));
+}
+
+int ScintillaCall::LexerLanguage(char *language) {
+	return static_cast<int>(CallPointer(Message::GetLexerLanguage, 0, language));
+}
+
+std::string ScintillaCall::LexerLanguage() {
+	return CallReturnString(Message::GetLexerLanguage, 0);
+}
+
+void *ScintillaCall::PrivateLexerCall(int operation, void *pointer) {
+	return reinterpret_cast<void *>(CallPointer(Message::PrivateLexerCall, operation, pointer));
+}
+
+int ScintillaCall::PropertyNames(char *names) {
+	return static_cast<int>(CallPointer(Message::PropertyNames, 0, names));
+}
+
+std::string ScintillaCall::PropertyNames() {
+	return CallReturnString(Message::PropertyNames, 0);
+}
+
+TypeProperty ScintillaCall::PropertyType(const char *name) {
+	return static_cast<Scintilla::TypeProperty>(Call(Message::PropertyType, reinterpret_cast<uintptr_t>(name)));
+}
+
+int ScintillaCall::DescribeProperty(const char *name, char *description) {
+	return static_cast<int>(CallPointer(Message::DescribeProperty, reinterpret_cast<uintptr_t>(name), description));
+}
+
+std::string ScintillaCall::DescribeProperty(const char *name) {
+	return CallReturnString(Message::DescribeProperty, reinterpret_cast<uintptr_t>(name));
+}
+
+int ScintillaCall::DescribeKeyWordSets(char *descriptions) {
+	return static_cast<int>(CallPointer(Message::DescribeKeyWordSets, 0, descriptions));
+}
+
+std::string ScintillaCall::DescribeKeyWordSets() {
+	return CallReturnString(Message::DescribeKeyWordSets, 0);
+}
+
+int ScintillaCall::LineEndTypesSupported() {
+	return static_cast<int>(Call(Message::GetLineEndTypesSupported));
+}
+
+int ScintillaCall::AllocateSubStyles(int styleBase, int numberStyles) {
+	return static_cast<int>(Call(Message::AllocateSubStyles, styleBase, numberStyles));
+}
+
+int ScintillaCall::SubStylesStart(int styleBase) {
+	return static_cast<int>(Call(Message::GetSubStylesStart, styleBase));
+}
+
+int ScintillaCall::SubStylesLength(int styleBase) {
+	return static_cast<int>(Call(Message::GetSubStylesLength, styleBase));
+}
+
+int ScintillaCall::StyleFromSubStyle(int subStyle) {
+	return static_cast<int>(Call(Message::GetStyleFromSubStyle, subStyle));
+}
+
+int ScintillaCall::PrimaryStyleFromStyle(int style) {
+	return static_cast<int>(Call(Message::GetPrimaryStyleFromStyle, style));
+}
+
+void ScintillaCall::FreeSubStyles() {
+	Call(Message::FreeSubStyles);
+}
+
+void ScintillaCall::SetIdentifiers(int style, const char *identifiers) {
+	CallString(Message::SetIdentifiers, style, identifiers);
+}
+
+int ScintillaCall::DistanceToSecondaryStyles() {
+	return static_cast<int>(Call(Message::DistanceToSecondaryStyles));
+}
+
+int ScintillaCall::SubStyleBases(char *styles) {
+	return static_cast<int>(CallPointer(Message::GetSubStyleBases, 0, styles));
+}
+
+std::string ScintillaCall::SubStyleBases() {
+	return CallReturnString(Message::GetSubStyleBases, 0);
+}
+
+int ScintillaCall::NamedStyles() {
+	return static_cast<int>(Call(Message::GetNamedStyles));
+}
+
+int ScintillaCall::NameOfStyle(int style, char *name) {
+	return static_cast<int>(CallPointer(Message::NameOfStyle, style, name));
+}
+
+std::string ScintillaCall::NameOfStyle(int style) {
+	return CallReturnString(Message::NameOfStyle, style);
+}
+
+int ScintillaCall::TagsOfStyle(int style, char *tags) {
+	return static_cast<int>(CallPointer(Message::TagsOfStyle, style, tags));
+}
+
+std::string ScintillaCall::TagsOfStyle(int style) {
+	return CallReturnString(Message::TagsOfStyle, style);
+}
+
+int ScintillaCall::DescriptionOfStyle(int style, char *description) {
+	return static_cast<int>(CallPointer(Message::DescriptionOfStyle, style, description));
+}
+
+std::string ScintillaCall::DescriptionOfStyle(int style) {
+	return CallReturnString(Message::DescriptionOfStyle, style);
+}
+
+void ScintillaCall::SetILexer(void *ilexer) {
+	CallPointer(Message::SetILexer, 0, ilexer);
+}
+
+Bidirectional ScintillaCall::Bidirectional() {
+	return static_cast<Scintilla::Bidirectional>(Call(Message::GetBidirectional));
+}
+
+void ScintillaCall::SetBidirectional(Scintilla::Bidirectional bidirectional) {
+	Call(Message::SetBidirectional, static_cast<uintptr_t>(bidirectional));
+}
+
+//--Autogenerated -- end of section automatically generated from Scintilla.iface */
+
+}
diff --git a/scite-app/scintilla/cocoa/InfoBar.h b/scite-app/scintilla/cocoa/InfoBar.h
new file mode 100644
index 0000000..17b543f
--- /dev/null
+++ b/scite-app/scintilla/cocoa/InfoBar.h
@@ -0,0 +1,53 @@
+
+/**
+ * Scintilla source code edit control
+ * @file InfoBar.h - Implements special info bar with zoom info, caret position etc. to be used with
+ *             ScintillaView.
+ *
+ * Mike Lischke <mlischke@sun.com>
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "InfoBarCommunicator.h"
+
+/**
+ * Extended text cell for vertically aligned text.
+ */
+@interface VerticallyCenteredTextFieldCell : NSTextFieldCell {
+	BOOL mIsEditingOrSelecting;
+}
+
+@end
+
+@interface InfoBar : NSView <InfoBarCommunicator> {
+@private
+	NSImage *mBackground;
+	IBDisplay mDisplayMask;
+
+	float mScaleFactor;
+	NSPopUpButton *mZoomPopup;
+
+	int mCurrentCaretX;
+	int mCurrentCaretY;
+	NSTextField *mCaretPositionLabel;
+	NSTextField *mStatusTextLabel;
+
+	id <InfoBarCommunicator> mCallback;
+}
+
+- (void) notify: (NotificationType) type message: (NSString *) message location: (NSPoint) location
+	  value: (float) value;
+- (void) setCallback: (id <InfoBarCommunicator>) callback;
+
+- (void) createItems;
+- (void) positionSubViews;
+- (void) setDisplay: (IBDisplay) display;
+- (void) zoomItemAction: (id) sender;
+- (void) setScaleFactor: (float) newScaleFactor adjustPopup: (BOOL) flag;
+- (void) setCaretPosition: (NSPoint) position;
+- (void) sizeToFit;
+
+@end
diff --git a/scite-app/scintilla/cocoa/InfoBar.mm b/scite-app/scintilla/cocoa/InfoBar.mm
new file mode 100644
index 0000000..11d148f
--- /dev/null
+++ b/scite-app/scintilla/cocoa/InfoBar.mm
@@ -0,0 +1,409 @@
+
+/**
+ * Scintilla source code edit control
+ * @file InfoBar.mm - Implements special info bar with zoom info, caret position etc. to be used with
+ *              ScintillaView.
+ *
+ * Mike Lischke <mlischke@sun.com>
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#include <cmath>
+
+#import "InfoBar.h"
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation VerticallyCenteredTextFieldCell
+
+// Inspired by code from Daniel Jalkut, Red Sweater Software.
+
+- (NSRect) drawingRectForBounds: (NSRect) theRect {
+	// Get the parent's idea of where we should draw
+	NSRect newRect = [super drawingRectForBounds: theRect];
+
+	// When the text field is being edited or selected, we have to turn off the magic because it
+	// screws up the configuration of the field editor. We sneak around this by intercepting
+	// selectWithFrame and editWithFrame and sneaking a reduced, centered rect in at the last minute.
+	if (mIsEditingOrSelecting == NO) {
+		// Get our ideal size for current text
+		NSSize textSize = [self cellSizeForBounds: theRect];
+
+		// Center that in the proposed rect
+		CGFloat heightDelta = newRect.size.height - textSize.height;
+		if (heightDelta > 0) {
+			newRect.size.height -= heightDelta;
+			newRect.origin.y += std::ceil(heightDelta / 2);
+		}
+	}
+
+	return newRect;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) selectWithFrame: (NSRect) aRect inView: (NSView *) controlView editor: (NSText *) textObj
+		delegate: (id) anObject start: (NSInteger) selStart length: (NSInteger) selLength {
+	aRect = [self drawingRectForBounds: aRect];
+	mIsEditingOrSelecting = YES;
+	[super selectWithFrame: aRect
+			inView: controlView
+			editor: textObj
+		      delegate: anObject
+			 start: selStart
+			length: selLength];
+	mIsEditingOrSelecting = NO;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) editWithFrame: (NSRect) aRect inView: (NSView *) controlView editor: (NSText *) textObj
+	      delegate: (id) anObject event: (NSEvent *) theEvent {
+	aRect = [self drawingRectForBounds: aRect];
+	mIsEditingOrSelecting = YES;
+	[super editWithFrame: aRect
+		      inView: controlView
+		      editor: textObj
+		    delegate: anObject
+		       event: theEvent];
+	mIsEditingOrSelecting = NO;
+}
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation InfoBar
+
+- (instancetype) initWithFrame: (NSRect) frame {
+	self = [super initWithFrame: frame];
+	if (self) {
+		NSBundle *bundle = [NSBundle bundleForClass: [InfoBar class]];
+
+		NSString *path = [bundle pathForResource: @"info_bar_bg" ofType: @"tiff" inDirectory: nil];
+		// macOS 10.13 introduced bug where pathForResource: fails on SMB share
+		if (path == nil) {
+			path = [bundle.bundlePath stringByAppendingPathComponent: @"Resources/info_bar_bg.tiff"];
+		}
+		mBackground = [[NSImage alloc] initWithContentsOfFile: path];
+		if (!mBackground.valid)
+			NSLog(@"Background image for info bar is invalid.");
+
+		mScaleFactor = 1.0;
+		mCurrentCaretX = 0;
+		mCurrentCaretY = 0;
+		[self createItems];
+	}
+	return self;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by a connected component (usually the info bar) if something changed there.
+ *
+ * @param type The type of the notification.
+ * @param message Carries the new status message if the type is a status message change.
+ * @param location Carries the new location (e.g. caret) if the type is a caret change or similar type.
+ * @param value Carries the new zoom value if the type is a zoom change.
+ */
+- (void) notify: (NotificationType) type message: (NSString *) message location: (NSPoint) location
+	  value: (float) value {
+	switch (type) {
+	case IBNZoomChanged:
+		[self setScaleFactor: value adjustPopup: YES];
+		break;
+	case IBNCaretChanged:
+		[self setCaretPosition: location];
+		break;
+	case IBNStatusChanged:
+		mStatusTextLabel.stringValue = message;
+		break;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to set a protocol object we can use to send change notifications to.
+ */
+- (void) setCallback: (id <InfoBarCommunicator>) callback {
+	mCallback = callback;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+static NSString *DefaultScaleMenuLabels[] = {
+	@"20%", @"30%", @"50%", @"75%", @"100%", @"130%", @"160%", @"200%", @"250%", @"300%"
+};
+static float DefaultScaleMenuFactors[] = {
+	0.2f, 0.3f, 0.5f, 0.75f, 1.0f, 1.3f, 1.6f, 2.0f, 2.5f, 3.0f
+};
+static unsigned DefaultScaleMenuSelectedItemIndex = 4;
+static float BarFontSize = 10.0;
+
+- (void) createItems {
+	// 1) The zoom popup.
+	unsigned numberOfDefaultItems = sizeof(DefaultScaleMenuLabels) / sizeof(NSString *);
+
+	// Create the popup button.
+	mZoomPopup = [[NSPopUpButton alloc] initWithFrame: NSMakeRect(0.0, 0.0, 1.0, 1.0) pullsDown: NO];
+
+	// No border or background please.
+	[mZoomPopup.cell setBordered: NO];
+	[mZoomPopup.cell setArrowPosition: NSPopUpArrowAtBottom];
+
+	// Fill it.
+	for (unsigned count = 0; count < numberOfDefaultItems; count++) {
+		[mZoomPopup addItemWithTitle: NSLocalizedStringFromTable(DefaultScaleMenuLabels[count], @"ZoomValues", nil)];
+		id currentItem = [mZoomPopup itemAtIndex: count];
+		if (DefaultScaleMenuFactors[count] != 0.0)
+			[currentItem setRepresentedObject: @(DefaultScaleMenuFactors[count])];
+	}
+	[mZoomPopup selectItemAtIndex: DefaultScaleMenuSelectedItemIndex];
+
+	// Hook it up.
+	mZoomPopup.target = self;
+	mZoomPopup.action = @selector(zoomItemAction:);
+
+	// Set a suitable font.
+	mZoomPopup.font = [NSFont menuBarFontOfSize: BarFontSize];
+
+	// Make sure the popup is big enough to fit the cells.
+	[mZoomPopup sizeToFit];
+
+	// Don't let it become first responder
+	[mZoomPopup setRefusesFirstResponder: YES];
+
+	// put it in the scrollview.
+	[self addSubview: mZoomPopup];
+
+	// 2) The caret position label.
+	Class oldCellClass = [NSTextField cellClass];
+	[NSTextField setCellClass: [VerticallyCenteredTextFieldCell class]];
+
+	mCaretPositionLabel = [[NSTextField alloc] initWithFrame: NSMakeRect(0.0, 0.0, 50.0, 1.0)];
+	[mCaretPositionLabel setBezeled: NO];
+	[mCaretPositionLabel setBordered: NO];
+	[mCaretPositionLabel setEditable: NO];
+	[mCaretPositionLabel setSelectable: NO];
+	[mCaretPositionLabel setDrawsBackground: NO];
+	mCaretPositionLabel.font = [NSFont menuBarFontOfSize: BarFontSize];
+
+	NSTextFieldCell *cell = mCaretPositionLabel.cell;
+	cell.placeholderString = @"0:0";
+	cell.alignment = NSTextAlignmentCenter;
+
+	[self addSubview: mCaretPositionLabel];
+
+	// 3) The status text.
+	mStatusTextLabel = [[NSTextField alloc] initWithFrame: NSMakeRect(0.0, 0.0, 1.0, 1.0)];
+	[mStatusTextLabel setBezeled: NO];
+	[mStatusTextLabel setBordered: NO];
+	[mStatusTextLabel setEditable: NO];
+	[mStatusTextLabel setSelectable: NO];
+	[mStatusTextLabel setDrawsBackground: NO];
+	mStatusTextLabel.font = [NSFont menuBarFontOfSize: BarFontSize];
+
+	cell = mStatusTextLabel.cell;
+	cell.placeholderString = @"";
+
+	[self addSubview: mStatusTextLabel];
+
+	// Restore original cell class so that everything else doesn't get broken
+	[NSTextField setCellClass: oldCellClass];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Fill the background.
+ */
+- (void) drawRect: (NSRect) rect {
+	[[NSColor controlBackgroundColor] set];
+	[NSBezierPath fillRect: rect];
+
+	// Since the background is seamless, we don't need to take care for the proper offset.
+	// Simply tile the background over the invalid rectangle.
+	if (mBackground.size.width != 0) {
+		NSPoint target = {rect.origin.x, 0};
+		while (target.x < rect.origin.x + rect.size.width) {
+			[mBackground drawAtPoint: target fromRect: NSZeroRect operation: NSCompositingOperationSourceOver fraction: 1];
+			target.x += mBackground.size.width;
+		}
+	}
+
+	// Draw separator lines between items.
+	NSRect verticalLineRect;
+	CGFloat component = 190.0 / 255.0;
+	NSColor *lineColor = [NSColor colorWithDeviceRed: component green: component blue: component alpha: 1];
+
+	if (mDisplayMask & IBShowZoom) {
+		verticalLineRect = mZoomPopup.frame;
+		verticalLineRect.origin.x += verticalLineRect.size.width + 1.0;
+		verticalLineRect.size.width = 1.0;
+		if (NSIntersectsRect(rect, verticalLineRect)) {
+			[lineColor set];
+			NSRectFill(verticalLineRect);
+		}
+	}
+
+	if (mDisplayMask & IBShowCaretPosition) {
+		verticalLineRect = mCaretPositionLabel.frame;
+		verticalLineRect.origin.x += verticalLineRect.size.width + 1.0;
+		verticalLineRect.size.width = 1.0;
+		if (NSIntersectsRect(rect, verticalLineRect)) {
+			[lineColor set];
+			NSRectFill(verticalLineRect);
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) isOpaque {
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to reposition our content depending on the size of the view.
+ */
+- (void) setFrame: (NSRect) newFrame {
+	super.frame = newFrame;
+	[self positionSubViews];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) positionSubViews {
+	NSRect currentBounds = {{0, 0}, {0, self.frame.size.height}};
+	if (mDisplayMask & IBShowZoom) {
+		[mZoomPopup setHidden: NO];
+		currentBounds.size.width = mZoomPopup.frame.size.width;
+		mZoomPopup.frame = currentBounds;
+		currentBounds.origin.x += currentBounds.size.width + 1; // Add 1 for the separator.
+	} else
+		[mZoomPopup setHidden: YES];
+
+	if (mDisplayMask & IBShowCaretPosition) {
+		[mCaretPositionLabel setHidden: NO];
+		currentBounds.size.width = mCaretPositionLabel.frame.size.width;
+		mCaretPositionLabel.frame = currentBounds;
+		currentBounds.origin.x += currentBounds.size.width + 1;
+	} else
+		[mCaretPositionLabel setHidden: YES];
+
+	if (mDisplayMask & IBShowStatusText) {
+		// The status text always takes the rest of the available space.
+		[mStatusTextLabel setHidden: NO];
+		currentBounds.size.width = self.frame.size.width - currentBounds.origin.x;
+		mStatusTextLabel.frame = currentBounds;
+	} else
+		[mStatusTextLabel setHidden: YES];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to switch the visible parts of the info bar.
+ *
+ * @param display Bitwise ORed IBDisplay values which determine what to show on the bar.
+ */
+- (void) setDisplay: (IBDisplay) display {
+	if (mDisplayMask != display) {
+		mDisplayMask = display;
+		[self positionSubViews];
+		self.needsDisplay = YES;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Handler for selection changes in the zoom menu.
+ */
+- (void) zoomItemAction: (id) sender {
+	NSNumber *selectedFactorObject = [[sender selectedCell] representedObject];
+
+	if (selectedFactorObject == nil) {
+		NSLog(@"Scale popup action: setting arbitrary zoom factors is not yet supported.");
+		return;
+	} else {
+		[self setScaleFactor: selectedFactorObject.floatValue adjustPopup: NO];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setScaleFactor: (float) newScaleFactor adjustPopup: (BOOL) flag {
+	if (mScaleFactor != newScaleFactor) {
+		mScaleFactor = newScaleFactor;
+		if (flag) {
+			unsigned count = 0;
+			unsigned numberOfDefaultItems = sizeof(DefaultScaleMenuFactors) / sizeof(float);
+
+			// We only work with some preset zoom values. If the given value does not correspond
+			// to one then show no selection.
+			while (count < numberOfDefaultItems && (std::abs(newScaleFactor - DefaultScaleMenuFactors[count]) > 0.07))
+				count++;
+			if (count == numberOfDefaultItems)
+				[mZoomPopup selectItemAtIndex: -1];
+			else {
+				[mZoomPopup selectItemAtIndex: count];
+
+				// Set scale factor to found preset value if it comes close.
+				mScaleFactor = DefaultScaleMenuFactors[count];
+			}
+		} else {
+			// Internally set. Notify owner.
+			[mCallback notify: IBNZoomChanged message: nil location: NSZeroPoint value: newScaleFactor];
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called from the notification method to update the caret position display.
+ */
+- (void) setCaretPosition: (NSPoint) position {
+	// Make the position one-based.
+	int newX = (int) position.x + 1;
+	int newY = (int) position.y + 1;
+
+	if (mCurrentCaretX != newX || mCurrentCaretY != newY) {
+		mCurrentCaretX = newX;
+		mCurrentCaretY = newY;
+
+		mCaretPositionLabel.stringValue = [NSString stringWithFormat: @"%d:%d", newX, newY];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Makes the bar resize to the smallest width that can accommodate the currently enabled items.
+ */
+- (void) sizeToFit {
+	NSRect frame = self.frame;
+	frame.size.width = 0;
+	if (mDisplayMask & IBShowZoom)
+		frame.size.width += mZoomPopup.frame.size.width;
+
+	if (mDisplayMask & IBShowCaretPosition)
+		frame.size.width += mCaretPositionLabel.frame.size.width;
+
+	if (mDisplayMask & IBShowStatusText)
+		frame.size.width += mStatusTextLabel.frame.size.width;
+
+	self.frame = frame;
+}
+
+@end
diff --git a/scite-app/scintilla/cocoa/InfoBarCommunicator.h b/scite-app/scintilla/cocoa/InfoBarCommunicator.h
new file mode 100644
index 0000000..5a91dcb
--- /dev/null
+++ b/scite-app/scintilla/cocoa/InfoBarCommunicator.h
@@ -0,0 +1,35 @@
+/*
+ * InfoBarCommunicator.h - Definitions of a communication protocol and other data types used for
+ *                         the info bar implementation.
+ *
+ * Mike Lischke <mlischke@sun.com>
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+typedef NS_OPTIONS(NSUInteger, IBDisplay) {
+	IBShowZoom          = 0x01,
+	IBShowCaretPosition = 0x02,
+	IBShowStatusText    = 0x04,
+	IBShowAll           = 0xFF
+};
+
+/**
+ * The info bar communicator protocol is used for communication between ScintillaView and its
+ * information bar component. Using this protocol decouples any potential info target from the main
+ * ScintillaView implementation. The protocol is used two-way.
+ */
+
+typedef NS_ENUM(NSInteger, NotificationType) {
+	IBNZoomChanged,    // The user selected another zoom value.
+	IBNCaretChanged,   // The caret in the editor changed.
+	IBNStatusChanged,  // The application set a new status message.
+};
+
+@protocol InfoBarCommunicator
+- (void) notify: (NotificationType) type message: (NSString *) message location: (NSPoint) location
+	  value: (float) value;
+- (void) setCallback: (id <InfoBarCommunicator>) callback;
+@end
+
diff --git a/scite-app/scintilla/cocoa/PlatCocoa.h b/scite-app/scintilla/cocoa/PlatCocoa.h
new file mode 100644
index 0000000..bcd9d87
--- /dev/null
+++ b/scite-app/scintilla/cocoa/PlatCocoa.h
@@ -0,0 +1,147 @@
+
+/**
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ * @file PlatCocoa.h
+ */
+
+#ifndef PLATCOCOA_H
+#define PLATCOCOA_H
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+
+#include <sys/time.h>
+
+#include <Cocoa/Cocoa.h>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "QuartzTextLayout.h"
+
+NSRect PRectangleToNSRect(const Scintilla::Internal::PRectangle &rc);
+Scintilla::Internal::PRectangle NSRectToPRectangle(NSRect &rc);
+CFStringEncoding EncodingFromCharacterSet(bool unicode, Scintilla::CharacterSet characterSet);
+
+@interface ScintillaContextMenu : NSMenu {
+	Scintilla::Internal::ScintillaCocoa *owner;
+}
+- (void) handleCommand: (NSMenuItem *) sender;
+- (void) setOwner: (Scintilla::Internal::ScintillaCocoa *) newOwner;
+
+@end
+
+namespace Scintilla::Internal {
+
+// A class to do the actual text rendering for us using Quartz 2D.
+class SurfaceImpl : public Surface {
+private:
+	SurfaceMode mode;
+
+	CGContextRef gc;
+
+	/** The text layout instance */
+	std::unique_ptr<QuartzTextLayout> textLayout;
+	int verticalDeviceResolution;
+
+	/** If the surface is a bitmap context, contains a reference to the bitmap data. */
+	std::unique_ptr<uint8_t[]> bitmapData;
+	/** If the surface is a bitmap context, stores the dimensions of the bitmap. */
+	int bitmapWidth;
+	int bitmapHeight;
+
+	/** Set the CGContext's fill colour to the specified desired colour. */
+	void FillColour(ColourRGBA fill);
+
+	void PenColourAlpha(ColourRGBA fore);
+
+	void SetFillStroke(FillStroke fillStroke);
+
+	// 24-bit RGB+A bitmap data constants
+	static const int BITS_PER_COMPONENT = 8;
+	static const int BITS_PER_PIXEL = BITS_PER_COMPONENT * 4;
+	static const int BYTES_PER_PIXEL = BITS_PER_PIXEL / 8;
+
+	bool UnicodeMode() const noexcept;
+	void Clear();
+
+public:
+	SurfaceImpl();
+	SurfaceImpl(const SurfaceImpl *surface, int width, int height);
+	~SurfaceImpl() override;
+
+	void Init(WindowID wid) override;
+	void Init(SurfaceID sid, WindowID wid) override;
+	std::unique_ptr<Surface> AllocatePixMap(int width, int height) override;
+	std::unique_ptr<SurfaceImpl> AllocatePixMapImplementation(int width, int height);
+	CGContextRef GetContext() { return gc; }
+
+	void SetMode(SurfaceMode mode) override;
+
+	void Release() noexcept override;
+	int SupportsFeature(Scintilla::Supports feature) noexcept override;
+	bool Initialised() override;
+
+	/** Returns a CGImageRef that represents the surface. Returns NULL if this is not possible. */
+	CGImageRef CreateImage();
+	void CopyImageRectangle(SurfaceImpl *source, PRectangle srcRect, PRectangle dstRect);
+
+	int LogPixelsY() override;
+	int PixelDivisions() override;
+	int DeviceHeightFont(int points) override;
+	void LineDraw(Point start, Point end, Stroke stroke) override;
+	void PolyLine(const Point *pts, size_t npts, Stroke stroke) override;
+	void Polygon(const Scintilla::Internal::Point *pts, size_t npts, FillStroke fillStroke) override;
+	void RectangleDraw(PRectangle rc, FillStroke fillStroke) override;
+	void RectangleFrame(PRectangle rc, Stroke stroke) override;
+	void FillRectangle(PRectangle rc, Fill fill) override;
+	void FillRectangleAligned(PRectangle rc, Fill fill) override;
+	void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+	void RoundedRectangle(PRectangle rc, FillStroke fillStroke) override;
+	void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) override;
+	void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) override;
+	void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+	void Ellipse(PRectangle rc, FillStroke fillStroke) override;
+	void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) override;
+	void Copy(PRectangle rc, Scintilla::Internal::Point from, Surface &surfaceSource) override;
+	std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
+	void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore,
+			    ColourRGBA back) override;
+	void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore,
+			     ColourRGBA back) override;
+	void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthText(const Font *font_, std::string_view text) override;
+
+	void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore,
+			    ColourRGBA back) override;
+	void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore,
+			     ColourRGBA back) override;
+	void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
+	XYPOSITION Ascent(const Font *font_) override;
+	XYPOSITION Descent(const Font *font_) override;
+	XYPOSITION InternalLeading(const Font *font_) override;
+	XYPOSITION Height(const Font *font_) override;
+	XYPOSITION AverageCharWidth(const Font *font_) override;
+
+	void SetClip(PRectangle rc) override;
+	void PopClip() override;
+	void FlushCachedState() override;
+	void FlushDrawing() override;
+
+}; // SurfaceImpl class
+
+} // Scintilla namespace
+
+#endif
diff --git a/scite-app/scintilla/cocoa/PlatCocoa.mm b/scite-app/scintilla/cocoa/PlatCocoa.mm
new file mode 100644
index 0000000..aaa8714
--- /dev/null
+++ b/scite-app/scintilla/cocoa/PlatCocoa.mm
@@ -0,0 +1,2393 @@
+/**
+ * Scintilla source code edit control
+ * @file PlatCocoa.mm - implementation of platform facilities on MacOS X/Cocoa
+ *
+ * Written by Mike Lischke
+ * Based on PlatMacOSX.cxx
+ * Based on work by Evan Jones (c) 2002 <ejones@uwaterloo.ca>
+ * Based on PlatGTK.cxx Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <functional>
+#include <memory>
+#include <numeric>
+
+#include <dlfcn.h>
+#include <sys/time.h>
+
+#import <Foundation/NSGeometry.h>
+
+#import "ScintillaTypes.h"
+#import "ScintillaMessages.h"
+#import "ScintillaStructures.h"
+
+#import "Debugging.h"
+#import "Geometry.h"
+#import "Platform.h"
+
+#include "XPM.h"
+#include "UniConversion.h"
+
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+extern sptr_t scintilla_send_message(void *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts a Point as used by Scintilla to a Quartz-style CGPoint.
+ */
+inline CGPoint CGPointFromPoint(Scintilla::Internal::Point pt) {
+	return CGPointMake(pt.x, pt.y);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts a PRectangle as used by Scintilla to standard Obj-C NSRect structure .
+ */
+NSRect PRectangleToNSRect(const PRectangle &rc) {
+	return NSMakeRect(rc.left, rc.top, rc.Width(), rc.Height());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * 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)));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts a PRectangle as used by Scintilla to a Quartz-style rectangle.
+ */
+inline CGRect PRectangleToCGRect(PRectangle &rc) {
+	return CGRectMake(rc.left, rc.top, rc.Width(), rc.Height());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts a PRectangle as used by Scintilla to a Quartz-style rectangle.
+ * Result is inset by strokeWidth / 2 so stroking does not go outside the rectangle.
+ */
+inline CGRect CGRectFromPRectangleInset(PRectangle rc, XYPOSITION strokeWidth) {
+	const XYPOSITION halfStroke = strokeWidth / 2.0f;
+	const CGRect rect = PRectangleToCGRect(rc);
+	return CGRectInset(rect, halfStroke, halfStroke);
+}
+
+//----------------- FontQuartz ---------------------------------------------------------------------
+
+class FontQuartz : public Font {
+public:
+	std::unique_ptr<QuartzTextStyle> style;
+	FontQuartz(const FontParameters &fp) {
+		style = std::make_unique<QuartzTextStyle>();
+		// Create the font with attributes
+		QuartzFont font(fp.faceName, strlen(fp.faceName), fp.size, fp.weight, fp.italic);
+		CTFontRef fontRef = font.getFontID();
+		style->setFontRef(fontRef, fp.characterSet);
+	}
+	FontQuartz(const QuartzTextStyle *style_) {
+		style = std::make_unique<QuartzTextStyle>(style_);
+	}
+};
+
+//--------------------------------------------------------------------------------------------------
+
+static QuartzTextStyle *TextStyleFromFont(const Font *f) noexcept {
+	if (f) {
+		const FontQuartz *pfq = dynamic_cast<const FontQuartz *>(f);
+		if (pfq) {
+			return pfq->style.get();
+		}
+	}
+	return nullptr;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Creates a CTFontRef with the given properties.
+ */
+std::shared_ptr<Font> Font::Allocate(const FontParameters &fp) {
+	return std::make_shared<FontQuartz>(fp);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Bidirectional text support for Arabic and Hebrew.
+
+namespace {
+
+CFIndex IndexFromPosition(std::string_view text, size_t position) {
+	const std::string_view textUptoPosition = text.substr(0, position);
+	return UTF16Length(textUptoPosition);
+}
+
+// Handling representations and tabs
+
+struct Blob {
+	XYPOSITION width;
+	Blob(XYPOSITION width_) : width(width_) {
+	}
+};
+
+static void BlobDealloc(void *refCon) {
+	Blob *blob = static_cast<Blob *>(refCon);
+	delete blob;
+}
+
+static CGFloat BlobGetWidth(void *refCon) {
+	Blob *blob = static_cast<Blob *>(refCon);
+	return blob->width;
+}
+
+class ScreenLineLayout : public IScreenLineLayout {
+	CTLineRef line = NULL;
+	const std::string text;
+public:
+	ScreenLineLayout(const IScreenLine *screenLine);
+	~ScreenLineLayout();
+	// IScreenLineLayout implementation
+	size_t PositionFromX(XYPOSITION xDistance, bool charPosition) override;
+	XYPOSITION XFromPosition(size_t caretPosition) override;
+	std::vector<Interval> FindRangeIntervals(size_t start, size_t end) override;
+};
+
+ScreenLineLayout::ScreenLineLayout(const IScreenLine *screenLine) : text(screenLine->Text()) {
+	const UInt8 *puiBuffer = reinterpret_cast<const UInt8 *>(text.data());
+	std::string_view sv = text;
+
+	// Start with an empty mutable attributed string and add each character to it.
+	CFMutableAttributedStringRef mas = CFAttributedStringCreateMutable(NULL, 0);
+
+	for (size_t bp=0; bp<text.length();) {
+		const unsigned char uch = text[bp];
+		const int utf8Status = UTF8Classify(sv);
+		const unsigned int byteCount = utf8Status & UTF8MaskWidth;
+		XYPOSITION repWidth = screenLine->RepresentationWidth(bp);
+		if (uch == '\t') {
+			// Find the size up to the tab
+			NSMutableAttributedString *nas = (__bridge NSMutableAttributedString *)mas;
+			const NSSize sizeUpTo = [nas size];
+			const XYPOSITION nextTab = screenLine->TabPositionAfter(sizeUpTo.width);
+			repWidth = nextTab - sizeUpTo.width;
+		}
+		CFAttributedStringRef as = NULL;
+		if (repWidth > 0.0f) {
+			CTRunDelegateCallbacks callbacks = {
+				.version = kCTRunDelegateVersion1,
+				.dealloc = BlobDealloc,
+				.getWidth = BlobGetWidth
+			};
+			CTRunDelegateRef runDelegate = CTRunDelegateCreate(&callbacks, new Blob(repWidth));
+			NSMutableAttributedString *masBlob = [[NSMutableAttributedString alloc] initWithString:@"X"];
+			NSRange rangeX = NSMakeRange(0, 1);
+			[masBlob addAttribute: (NSString *)kCTRunDelegateAttributeName value: (__bridge id)runDelegate range:rangeX];
+			CFRelease(runDelegate);
+			as = (CFAttributedStringRef)CFBridgingRetain(masBlob);
+		} else {
+			CFStringRef piece = CFStringCreateWithBytes(NULL,
+								    &puiBuffer[bp],
+								    byteCount,
+								    kCFStringEncodingUTF8,
+								    false);
+			const QuartzTextStyle *qts = TextStyleFromFont(screenLine->FontOfPosition(bp));
+			CFMutableDictionaryRef pieceAttributes = qts->getCTStyle();
+			as = CFAttributedStringCreate(NULL, piece, pieceAttributes);
+			CFRelease(piece);
+		}
+		CFAttributedStringReplaceAttributedString(mas,
+							  CFRangeMake(CFAttributedStringGetLength(mas), 0),
+							  as);
+		bp += byteCount;
+		sv.remove_prefix(byteCount);
+		CFRelease(as);
+	}
+
+	line = CTLineCreateWithAttributedString(mas);
+	CFRelease(mas);
+}
+
+ScreenLineLayout::~ScreenLineLayout() {
+	CFRelease(line);
+}
+
+size_t ScreenLineLayout::PositionFromX(XYPOSITION xDistance, bool charPosition) {
+	if (!line) {
+		return 0;
+	}
+	const CGPoint ptDistance = CGPointMake(xDistance, 0);
+	const CFIndex offset = CTLineGetStringIndexForPosition(line, ptDistance);
+	if (offset == kCFNotFound) {
+		return 0;
+	}
+	// Convert back to UTF-8 positions
+	return UTF8PositionFromUTF16Position(text, offset);
+}
+
+XYPOSITION ScreenLineLayout::XFromPosition(size_t caretPosition) {
+	if (!line) {
+		return 0.0;
+	}
+	// Convert from UTF-8 position
+	const CFIndex caretIndex = IndexFromPosition(text, caretPosition);
+
+	const CGFloat distance = CTLineGetOffsetForStringIndex(line, caretIndex, nullptr);
+	return distance;
+}
+
+void AddToIntervalVector(std::vector<Interval> &vi, XYPOSITION left, XYPOSITION right) {
+	const Interval interval = {left, right};
+	if (vi.empty()) {
+		vi.push_back(interval);
+	} else {
+		Interval &last = vi.back();
+		if (std::abs(last.right-interval.left) < 0.01) {
+			// If new left is very close to previous right then extend last item
+			last.right = interval.right;
+		} else {
+			vi.push_back(interval);
+		}
+	}
+}
+
+std::vector<Interval> ScreenLineLayout::FindRangeIntervals(size_t start, size_t end) {
+	if (!line) {
+		return {};
+	}
+
+	std::vector<Interval> ret;
+
+	// Convert from UTF-8 position
+	const CFIndex startIndex = IndexFromPosition(text, start);
+	const CFIndex endIndex = IndexFromPosition(text, end);
+
+	CFArrayRef runs = CTLineGetGlyphRuns(line);
+	const CFIndex runCount = CFArrayGetCount(runs);
+	for (CFIndex run=0; run<runCount; run++) {
+		CTRunRef aRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runs, run));
+		const CFIndex glyphCount = CTRunGetGlyphCount(aRun);
+		const CFRange rangeAll = CFRangeMake(0, glyphCount);
+		std::vector<CFIndex> indices(glyphCount);
+		CTRunGetStringIndices(aRun, rangeAll, indices.data());
+		std::vector<CGPoint> positions(glyphCount);
+		CTRunGetPositions(aRun, rangeAll, positions.data());
+		std::vector<CGSize> advances(glyphCount);
+		CTRunGetAdvances(aRun, rangeAll, advances.data());
+		for (CFIndex glyph=0; glyph<glyphCount; glyph++) {
+			const CFIndex glyphIndex = indices[glyph];
+			const XYPOSITION xPosition = positions[glyph].x;
+			const XYPOSITION width = advances[glyph].width;
+			if ((glyphIndex >= startIndex) && (glyphIndex < endIndex)) {
+				AddToIntervalVector(ret, xPosition, xPosition + width);
+			}
+		}
+	}
+	return ret;
+}
+
+// Helper for SurfaceImpl::MeasureWidths that examines the glyph runs in a layout
+
+void GetPositions(CTLineRef line, std::vector<CGFloat> &positions) {
+
+	// Find the advances of the text
+	std::vector<CGFloat> lineAdvances(positions.size());
+	CFArrayRef runs = CTLineGetGlyphRuns(line);
+	const CFIndex runCount = CFArrayGetCount(runs);
+	for (CFIndex run=0; run<runCount; run++) {
+		CTRunRef aRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runs, run));
+		const CFIndex glyphCount = CTRunGetGlyphCount(aRun);
+		const CFRange rangeAll = CFRangeMake(0, glyphCount);
+		std::vector<CFIndex> indices(glyphCount);
+		CTRunGetStringIndices(aRun, rangeAll, indices.data());
+		std::vector<CGSize> advances(glyphCount);
+		CTRunGetAdvances(aRun, rangeAll, advances.data());
+		for (CFIndex glyph=0; glyph<glyphCount; glyph++) {
+			const CFIndex glyphIndex = indices[glyph];
+			if (glyphIndex >= positions.size()) {
+				return;
+			}
+			lineAdvances[glyphIndex] = advances[glyph].width;
+		}
+	}
+
+	// Accumulate advances into positions
+	std::partial_sum(lineAdvances.begin(), lineAdvances.end(),
+			 positions.begin(), std::plus<CGFloat>());
+}
+
+const Supports SupportsCocoa[] = {
+	Supports::LineDrawsFinal,
+	Supports::PixelDivisions,
+	Supports::FractionalStrokeWidth,
+	Supports::TranslucentStroke,
+	Supports::PixelModification,
+};
+
+}
+
+//----------------- SurfaceImpl --------------------------------------------------------------------
+
+SurfaceImpl::SurfaceImpl() {
+	gc = NULL;
+
+	textLayout.reset(new QuartzTextLayout());
+	verticalDeviceResolution = 0;
+
+	bitmapData.reset(); // Release will try and delete bitmapData if != nullptr
+	bitmapWidth = 0;
+	bitmapHeight = 0;
+
+	Release();
+}
+
+SurfaceImpl::SurfaceImpl(const SurfaceImpl *surface, int width, int height) {
+
+	textLayout.reset(new QuartzTextLayout());
+
+	// Create a new bitmap context, along with the RAM for the bitmap itself
+	bitmapWidth = width;
+	bitmapHeight = height;
+
+	const int bitmapBytesPerRow = (width * BYTES_PER_PIXEL);
+	const int bitmapByteCount = (bitmapBytesPerRow * height);
+
+	// Create an RGB color space.
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	if (colorSpace == NULL)
+		return;
+
+	// Create the bitmap.
+	bitmapData.reset(new uint8_t[bitmapByteCount]);
+	// create the context
+	gc = CGBitmapContextCreate(bitmapData.get(),
+				   width,
+				   height,
+				   BITS_PER_COMPONENT,
+				   bitmapBytesPerRow,
+				   colorSpace,
+				   kCGImageAlphaPremultipliedLast);
+
+	if (gc == NULL) {
+		// the context couldn't be created for some reason,
+		// and we have no use for the bitmap without the context
+		bitmapData.reset();
+	}
+
+	// the context retains the color space, so we can release it
+	CGColorSpaceRelease(colorSpace);
+
+	if (gc && bitmapData) {
+		// "Erase" to white.
+		CGContextClearRect(gc, CGRectMake(0, 0, width, height));
+		CGContextSetRGBFillColor(gc, 1.0, 1.0, 1.0, 1.0);
+		CGContextFillRect(gc, CGRectMake(0, 0, width, height));
+	}
+
+	mode = surface->mode;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+SurfaceImpl::~SurfaceImpl() {
+	Clear();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool SurfaceImpl::UnicodeMode() const noexcept {
+	return mode.codePage == SC_CP_UTF8;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::Clear() {
+	if (bitmapData) {
+		bitmapData.reset();
+		// We only "own" the graphics context if we are a bitmap context
+		if (gc)
+			CGContextRelease(gc);
+	}
+	gc = NULL;
+
+	bitmapWidth = 0;
+	bitmapHeight = 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::Release() noexcept {
+	Clear();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool SurfaceImpl::Initialised() {
+	// We are initalised if the graphics context is not null
+	return gc != NULL;// || port != NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::Init(WindowID) {
+	// To be able to draw, the surface must get a CGContext handle.  We save the graphics port,
+	// then acquire/release the context on an as-need basis (see above).
+	// XXX Docs on QDBeginCGContext are light, a better way to do this would be good.
+	// AFAIK we should not hold onto a context retrieved this way, thus the need for
+	// acquire/release of the context.
+
+	Release();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::Init(SurfaceID sid, WindowID) {
+	Release();
+	gc = static_cast<CGContextRef>(sid);
+	CGContextSetLineWidth(gc, 1.0);
+}
+
+std::unique_ptr<Surface> SurfaceImpl::AllocatePixMap(int width, int height) {
+	return std::make_unique<SurfaceImpl>(this, width, height);
+}
+
+std::unique_ptr<SurfaceImpl> SurfaceImpl::AllocatePixMapImplementation(int width, int height) {
+	return std::make_unique<SurfaceImpl>(this, width, height);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::SetMode(SurfaceMode mode_) {
+	mode = mode_;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+int SurfaceImpl::SupportsFeature(Supports feature) noexcept {
+	for (const Supports f : SupportsCocoa) {
+		if (f == feature)
+			return 1;
+	}
+	return 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::FillColour(ColourRGBA fill) {
+	// Set the Fill color to match
+	CGContextSetRGBFillColor(gc,
+				 fill.GetRedComponent(),
+				 fill.GetGreenComponent(),
+				 fill.GetBlueComponent(),
+				 fill.GetAlphaComponent());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::PenColourAlpha(ColourRGBA fore) {
+	// Set the Stroke color to match
+	CGContextSetRGBStrokeColor(gc,
+				   fore.GetRedComponent(),
+				   fore.GetGreenComponent(),
+				   fore.GetBlueComponent(),
+				   fore.GetAlphaComponent());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::SetFillStroke(FillStroke fillStroke) {
+	FillColour(fillStroke.fill.colour);
+	PenColourAlpha(fillStroke.stroke.colour);
+	CGContextSetLineWidth(gc, fillStroke.stroke.width);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+CGImageRef SurfaceImpl::CreateImage() {
+	// For now, assume that CreateImage can only be called on PixMap surfaces.
+	if (!bitmapData)
+		return NULL;
+
+	CGContextFlush(gc);
+
+	// Create an RGB color space.
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	if (colorSpace == NULL)
+		return NULL;
+
+	const int bitmapBytesPerRow = bitmapWidth * BYTES_PER_PIXEL;
+	const int bitmapByteCount = bitmapBytesPerRow * bitmapHeight;
+
+	// Make a copy of the bitmap data for the image creation and divorce it
+	// From the SurfaceImpl lifetime
+	CFDataRef dataRef = CFDataCreate(kCFAllocatorDefault, bitmapData.get(), bitmapByteCount);
+
+	// Create a data provider.
+	CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData(dataRef);
+
+	CGImageRef image = NULL;
+	if (dataProvider != NULL) {
+		// Create the CGImage.
+		image = CGImageCreate(bitmapWidth,
+				      bitmapHeight,
+				      BITS_PER_COMPONENT,
+				      BITS_PER_PIXEL,
+				      bitmapBytesPerRow,
+				      colorSpace,
+				      kCGImageAlphaPremultipliedLast,
+				      dataProvider,
+				      NULL,
+				      0,
+				      kCGRenderingIntentDefault);
+	}
+
+	// The image retains the color space, so we can release it.
+	CGColorSpaceRelease(colorSpace);
+	colorSpace = NULL;
+
+	// Done with the data provider.
+	CGDataProviderRelease(dataProvider);
+	dataProvider = NULL;
+
+	// Done with the data provider.
+	CFRelease(dataRef);
+
+	return image;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the vertical logical device resolution of the main monitor.
+ * This is no longer called.
+ * For Cocoa, all screens are treated as 72 DPI, even retina displays.
+ */
+int SurfaceImpl::LogPixelsY() {
+	return 72;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the number of device pixels per logical pixel.
+ * 1 for older displays and 2 for retina displays. Potentially 3 for some phones.
+ */
+int SurfaceImpl::PixelDivisions() {
+	if (gc) {
+		const CGSize szDevice = CGContextConvertSizeToDeviceSpace(gc, CGSizeMake(1.0, 1.0));
+		const int devicePixels = std::round(szDevice.width);
+		assert(devicePixels == 1 || devicePixels == 2);
+		return devicePixels;
+	}
+	return 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts the logical font height in points into a device height.
+ * For Cocoa, points are always used for the result even on retina displays.
+ */
+int SurfaceImpl::DeviceHeightFont(int points) {
+	return points;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::LineDraw(Point start, Point end, Stroke stroke) {
+	PenColourAlpha(stroke.colour);
+	CGContextSetLineWidth(gc, stroke.width);
+
+	CGContextBeginPath(gc);
+	CGContextMoveToPoint(gc, start.x, start.y);
+	CGContextAddLineToPoint(gc, end.x, end.y);
+	CGContextStrokePath(gc);
+
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::PolyLine(const Point *pts, size_t npts, Stroke stroke) {
+	PLATFORM_ASSERT(gc && (npts > 1));
+	if (!gc || (npts <= 1)) {
+		return;
+	}
+	PenColourAlpha(stroke.colour);
+	CGContextSetLineWidth(gc, stroke.width);
+	CGContextBeginPath(gc);
+	CGContextMoveToPoint(gc, pts[0].x, pts[0].y);
+	for (size_t i = 1; i < npts; i++) {
+		CGContextAddLineToPoint(gc, pts[i].x, pts[i].y);
+	}
+	CGContextStrokePath(gc);
+
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::Polygon(const Scintilla::Internal::Point *pts, size_t npts, FillStroke fillStroke) {
+	std::vector<CGPoint> points;
+	std::transform(pts, pts + npts, std::back_inserter(points), CGPointFromPoint);
+
+	CGContextBeginPath(gc);
+
+	SetFillStroke(fillStroke);
+
+	// Draw the polygon
+	CGContextAddLines(gc, points.data(), npts);
+
+	// Explicitly close the path, so it is closed for stroking AND filling (implicit close = filling only)
+	CGContextClosePath(gc);
+	CGContextDrawPath(gc, kCGPathFillStroke);
+
+	// Restore as not all paths set
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::RectangleDraw(PRectangle rc, FillStroke fillStroke) {
+	if (!gc)
+		return;
+	CGContextBeginPath(gc);
+	SetFillStroke(fillStroke);
+
+	CGContextAddRect(gc, CGRectFromPRectangleInset(rc, fillStroke.stroke.width));
+
+	CGContextDrawPath(gc, kCGPathFillStroke);
+
+	// Restore as not all paths set
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::RectangleFrame(PRectangle rc, Stroke stroke) {
+	if (!gc)
+		return;
+
+	CGContextBeginPath(gc);
+	PenColourAlpha(stroke.colour);
+	CGContextSetLineWidth(gc, stroke.width);
+
+	CGContextAddRect(gc, CGRectFromPRectangleInset(rc, stroke.width));
+
+	CGContextDrawPath(gc, kCGPathStroke);
+
+	// Restore as not all paths set
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Fill fill) {
+	if (gc) {
+		FillColour(fill.colour);
+		CGRect rect = PRectangleToCGRect(rc);
+		CGContextFillRect(gc, rect);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::FillRectangleAligned(PRectangle rc, Fill fill) {
+	FillRectangle(PixelAlign(rc, PixelDivisions()), fill);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+static void drawImageRefCallback(void *info, CGContextRef gc) {
+	CGImageRef pattern = static_cast<CGImageRef>(info);
+	CGContextDrawImage(gc, CGRectMake(0, 0, CGImageGetWidth(pattern), CGImageGetHeight(pattern)), pattern);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+static void releaseImageRefCallback(void *info) {
+	CGImageRelease(static_cast<CGImageRef>(info));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
+	SurfaceImpl &patternSurface = static_cast<SurfaceImpl &>(surfacePattern);
+
+	// For now, assume that copy can only be called on PixMap surfaces. Shows up black.
+	CGImageRef image = patternSurface.CreateImage();
+	if (image == NULL) {
+		FillRectangle(rc, ColourRGBA::FromRGB(0));
+		return;
+	}
+
+	const CGPatternCallbacks drawImageCallbacks = { 0, drawImageRefCallback, releaseImageRefCallback };
+
+	CGPatternRef pattern = CGPatternCreate(image,
+					       CGRectMake(0, 0, patternSurface.bitmapWidth, patternSurface.bitmapHeight),
+					       CGAffineTransformIdentity,
+					       patternSurface.bitmapWidth,
+					       patternSurface.bitmapHeight,
+					       kCGPatternTilingNoDistortion,
+					       true,
+					       &drawImageCallbacks
+					      );
+	if (pattern != NULL) {
+		// Create a pattern color space
+		CGColorSpaceRef colorSpace = CGColorSpaceCreatePattern(NULL);
+		if (colorSpace != NULL) {
+
+			CGContextSaveGState(gc);
+			CGContextSetFillColorSpace(gc, colorSpace);
+
+			// Unlike the documentation, you MUST pass in a "components" parameter:
+			// For coloured patterns it is the alpha value.
+			const CGFloat alpha = 1.0;
+			CGContextSetFillPattern(gc, pattern, &alpha);
+			CGContextFillRect(gc, PRectangleToCGRect(rc));
+			CGContextRestoreGState(gc);
+			// Free the color space, the pattern and image
+			CGColorSpaceRelease(colorSpace);
+		} /* colorSpace != NULL */
+		colorSpace = NULL;
+		CGPatternRelease(pattern);
+		pattern = NULL;
+	} /* pattern != NULL */
+}
+
+void SurfaceImpl::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
+	// This is only called from the margin marker drawing code for MarkerSymbol::RoundRect
+	// The Win32 version does
+	//  ::RoundRect(hdc, rc.left + 1, rc.top, rc.right - 1, rc.bottom, 8, 8 );
+	// which is a rectangle with rounded corners each having a radius of 4 pixels.
+	// It would be almost as good just cutting off the corners with lines at
+	// 45 degrees as is done on GTK+.
+
+	// Create a rectangle with semicircles at the corners
+	const int MAX_RADIUS = 4;
+	const int radius = std::min(MAX_RADIUS, static_cast<int>(std::min(rc.Height()/2, rc.Width()/2)));
+
+	// Points go clockwise, starting from just below the top left
+	// Corners are kept together, so we can easily create arcs to connect them
+	CGPoint corners[4][3] = {
+		{
+			{ rc.left, rc.top + radius },
+			{ rc.left, rc.top },
+			{ rc.left + radius, rc.top },
+		},
+		{
+			{ rc.right - radius - 1, rc.top },
+			{ rc.right - 1, rc.top },
+			{ rc.right - 1, rc.top + radius },
+		},
+		{
+			{ rc.right - 1, rc.bottom - radius - 1 },
+			{ rc.right - 1, rc.bottom - 1 },
+			{ rc.right - radius - 1, rc.bottom - 1 },
+		},
+		{
+			{ rc.left + radius, rc.bottom - 1 },
+			{ rc.left, rc.bottom - 1 },
+			{ rc.left, rc.bottom - radius - 1 },
+		},
+	};
+
+	// Align the points in the middle of the pixels
+	for (int i = 0; i < 4; ++ i) {
+		for (int j = 0; j < 3; ++ j) {
+			corners[i][j].x += 0.5;
+			corners[i][j].y += 0.5;
+		}
+	}
+
+	SetFillStroke(fillStroke);
+
+	// Move to the last point to begin the path
+	CGContextBeginPath(gc);
+	CGContextMoveToPoint(gc, corners[3][2].x, corners[3][2].y);
+
+	for (int i = 0; i < 4; ++ i) {
+		CGContextAddLineToPoint(gc, corners[i][0].x, corners[i][0].y);
+		CGContextAddArcToPoint(gc, corners[i][1].x, corners[i][1].y, corners[i][2].x, corners[i][2].y, radius);
+	}
+
+	// Close the path to enclose it for stroking and for filling, then draw it
+	CGContextClosePath(gc);
+	CGContextDrawPath(gc, kCGPathFillStroke);
+
+	// Restore as not all paths set
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+// DrawChamferedRectangle is a helper function for AlphaRectangle that either fills or strokes a
+// rectangle with its corners chamfered at 45 degrees.
+static void DrawChamferedRectangle(CGContextRef gc, PRectangle rc, int cornerSize, CGPathDrawingMode mode) {
+	// Points go clockwise, starting from just below the top left
+	CGPoint corners[4][2] = {
+		{
+			{ rc.left, rc.top + cornerSize },
+			{ rc.left + cornerSize, rc.top },
+		},
+		{
+			{ rc.right - cornerSize - 1, rc.top },
+			{ rc.right - 1, rc.top + cornerSize },
+		},
+		{
+			{ rc.right - 1, rc.bottom - cornerSize - 1 },
+			{ rc.right - cornerSize - 1, rc.bottom - 1 },
+		},
+		{
+			{ rc.left + cornerSize, rc.bottom - 1 },
+			{ rc.left, rc.bottom - cornerSize - 1 },
+		},
+	};
+
+	// Align the points in the middle of the pixels
+	for (int i = 0; i < 4; ++ i) {
+		for (int j = 0; j < 2; ++ j) {
+			corners[i][j].x += 0.5;
+			corners[i][j].y += 0.5;
+		}
+	}
+
+	// Move to the last point to begin the path
+	CGContextBeginPath(gc);
+	CGContextMoveToPoint(gc, corners[3][1].x, corners[3][1].y);
+
+	for (int i = 0; i < 4; ++ i) {
+		CGContextAddLineToPoint(gc, corners[i][0].x, corners[i][0].y);
+		CGContextAddLineToPoint(gc, corners[i][1].x, corners[i][1].y);
+	}
+
+	// Close the path to enclose it for stroking and for filling, then draw it
+	CGContextClosePath(gc);
+	CGContextDrawPath(gc, mode);
+}
+
+void Scintilla::Internal::SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
+	if (gc) {
+		const XYPOSITION halfStroke = fillStroke.stroke.width / 2.0f;
+		// Set the Fill color to match
+		FillColour(fillStroke.fill.colour);
+		PenColourAlpha(fillStroke.stroke.colour);
+		PRectangle rcFill = rc;
+		if (cornerSize == 0) {
+			// A simple rectangle, no rounded corners
+			if (fillStroke.fill.colour == fillStroke.stroke.colour) {
+				// Optimization for simple case
+				CGRect rect = PRectangleToCGRect(rcFill);
+				CGContextFillRect(gc, rect);
+			} else {
+				rcFill.left += fillStroke.stroke.width;
+				rcFill.top += fillStroke.stroke.width;
+				rcFill.right -= fillStroke.stroke.width;
+				rcFill.bottom -= fillStroke.stroke.width;
+				CGRect rect = PRectangleToCGRect(rcFill);
+				CGContextFillRect(gc, rect);
+				CGContextAddRect(gc, CGRectMake(rc.left + halfStroke, rc.top + halfStroke,
+								rc.Width() - fillStroke.stroke.width, rc.Height() - fillStroke.stroke.width));
+				CGContextStrokeRectWithWidth(gc,
+							     CGRectMake(rc.left + halfStroke, rc.top + halfStroke,
+									rc.Width() - fillStroke.stroke.width, rc.Height() - fillStroke.stroke.width),
+							     fillStroke.stroke.width);
+			}
+		} else {
+			// Approximate rounded corners with 45 degree chamfers.
+			// Drawing real circular arcs often leaves some over- or under-drawn pixels.
+			if (fillStroke.fill.colour == fillStroke.stroke.colour) {
+				// Specializing this case avoids a few stray light/dark pixels in corners.
+				rcFill.left -= halfStroke;
+				rcFill.top -= halfStroke;
+				rcFill.right += halfStroke;
+				rcFill.bottom += halfStroke;
+				DrawChamferedRectangle(gc, rcFill, cornerSize, kCGPathFill);
+			} else {
+				rcFill.left += halfStroke;
+				rcFill.top += halfStroke;
+				rcFill.right -= halfStroke;
+				rcFill.bottom -= halfStroke;
+				DrawChamferedRectangle(gc, rcFill, cornerSize-fillStroke.stroke.width, kCGPathFill);
+				DrawChamferedRectangle(gc, rc, cornerSize, kCGPathStroke);
+			}
+		}
+	}
+}
+
+void Scintilla::Internal::SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+	if (!gc) {
+		return;
+	}
+
+	CGPoint ptStart = CGPointMake(rc.left, rc.top);
+	CGPoint ptEnd = CGPointMake(rc.left, rc.bottom);
+	if (options == GradientOptions::leftToRight) {
+		ptEnd = CGPointMake(rc.right, rc.top);
+	}
+
+	std::vector<CGFloat> components;
+	std::vector<CGFloat> locations;
+	for (const ColourStop &stop : stops) {
+		locations.push_back(stop.position);
+		components.push_back(stop.colour.GetRedComponent());
+		components.push_back(stop.colour.GetGreenComponent());
+		components.push_back(stop.colour.GetBlueComponent());
+		components.push_back(stop.colour.GetAlphaComponent());
+	}
+
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	if (!colorSpace) {
+		return;
+	}
+
+	CGGradientRef gradiantRef = CGGradientCreateWithColorComponents(colorSpace,
+									components.data(),
+									locations.data(),
+									locations.size());
+	if (gradiantRef) {
+		CGContextSaveGState(gc);
+		CGRect rect = PRectangleToCGRect(rc);
+		CGContextClipToRect(gc, rect);
+		CGContextBeginPath(gc);
+		CGContextAddRect(gc, rect);
+		CGContextClosePath(gc);
+		CGContextDrawLinearGradient(gc, gradiantRef, ptStart, ptEnd, 0);
+		CGGradientRelease(gradiantRef);
+		CGContextRestoreGState(gc);
+	}
+	CGColorSpaceRelease(colorSpace);
+}
+
+static void ProviderReleaseData(void *, const void *data, size_t) {
+	const unsigned char *pixels = static_cast<const unsigned char *>(data);
+	delete []pixels;
+}
+
+static CGImageRef ImageCreateFromRGBA(int width, int height, const unsigned char *pixelsImage, bool invert) {
+	CGImageRef image = 0;
+
+	// Create an RGB color space.
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	if (colorSpace) {
+		const int bitmapBytesPerRow = width * 4;
+		const int bitmapByteCount = bitmapBytesPerRow * height;
+
+		// Create a data provider.
+		CGDataProviderRef dataProvider = 0;
+		if (invert) {
+			unsigned char *pixelsUpsideDown = new unsigned char[bitmapByteCount];
+
+			for (int y=0; y<height; y++) {
+				int yInverse = height - y - 1;
+				memcpy(pixelsUpsideDown + y * bitmapBytesPerRow,
+				       pixelsImage + yInverse * bitmapBytesPerRow,
+				       bitmapBytesPerRow);
+			}
+
+			dataProvider = CGDataProviderCreateWithData(
+					       NULL, pixelsUpsideDown, bitmapByteCount, ProviderReleaseData);
+		} else {
+			dataProvider = CGDataProviderCreateWithData(
+					       NULL, pixelsImage, bitmapByteCount, NULL);
+
+		}
+		if (dataProvider) {
+			// Create the CGImage.
+			image = CGImageCreate(width,
+					      height,
+					      8,
+					      8 * 4,
+					      bitmapBytesPerRow,
+					      colorSpace,
+					      kCGImageAlphaLast,
+					      dataProvider,
+					      NULL,
+					      0,
+					      kCGRenderingIntentDefault);
+
+			CGDataProviderRelease(dataProvider);
+		}
+
+		// The image retains the color space, so we can release it.
+		CGColorSpaceRelease(colorSpace);
+	}
+	return image;
+}
+
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	CGImageRef image = ImageCreateFromRGBA(width, height, pixelsImage, true);
+	if (image) {
+		CGRect drawRect = CGRectMake(rc.left, rc.top, rc.Width(), rc.Height());
+		CGContextDrawImage(gc, drawRect, image);
+		CGImageRelease(image);
+	}
+}
+
+void SurfaceImpl::Ellipse(PRectangle rc, FillStroke fillStroke) {
+	const CGRect ellipseRect = CGRectFromPRectangleInset(rc, fillStroke.stroke.width / 2.0f);
+	SetFillStroke(fillStroke);
+	CGContextBeginPath(gc);
+	CGContextAddEllipseInRect(gc, ellipseRect);
+	CGContextDrawPath(gc, kCGPathFillStroke);
+	// Restore as not all paths set
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+void SurfaceImpl::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
+	const CGFloat midLine = rc.Centre().y;
+	const CGFloat piOn2 = acos(0.0);
+	const XYPOSITION halfStroke = fillStroke.stroke.width / 2.0f;
+	const float radius = rc.Height() / 2.0f - halfStroke;
+	PRectangle rcInner = rc;
+	rcInner.left += radius;
+	rcInner.right -= radius;
+
+	SetFillStroke(fillStroke);
+	CGContextBeginPath(gc);
+
+	const Ends leftSide = static_cast<Ends>(static_cast<int>(ends) & 0xf);
+	const Ends rightSide = static_cast<Ends>(static_cast<int>(ends) & 0xf0);
+	switch (leftSide) {
+		case Ends::leftFlat:
+			CGContextMoveToPoint(gc, rc.left + halfStroke, rc.top + halfStroke);
+			CGContextAddLineToPoint(gc, rc.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::leftAngle:
+			CGContextMoveToPoint(gc, rcInner.left + halfStroke, rc.top + halfStroke);
+			CGContextAddLineToPoint(gc, rc.left + halfStroke, rc.Centre().y);
+			CGContextAddLineToPoint(gc, rcInner.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			CGContextMoveToPoint(gc, rcInner.left + halfStroke, rc.top + halfStroke);
+			CGContextAddArc(gc, rcInner.left + halfStroke, midLine, radius, -piOn2, piOn2, 1);
+			break;
+	}
+
+	switch (rightSide) {
+		case Ends::rightFlat:
+			CGContextAddLineToPoint(gc, rc.right - halfStroke, rc.bottom - halfStroke);
+			CGContextAddLineToPoint(gc, rc.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::rightAngle:
+			CGContextAddLineToPoint(gc, rcInner.right - halfStroke, rc.bottom - halfStroke);
+			CGContextAddLineToPoint(gc, rc.right - halfStroke, rc.Centre().y);
+			CGContextAddLineToPoint(gc, rcInner.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			CGContextAddLineToPoint(gc, rcInner.right - halfStroke, rc.bottom - halfStroke);
+			CGContextAddArc(gc, rcInner.right - halfStroke, midLine, radius, piOn2, -piOn2, 1);
+			break;
+	}
+
+	// Close the path to enclose it for stroking and for filling, then draw it
+	CGContextClosePath(gc);
+	CGContextDrawPath(gc, kCGPathFillStroke);
+
+	CGContextSetLineWidth(gc, 1.0f);
+}
+
+void SurfaceImpl::CopyImageRectangle(SurfaceImpl *source, PRectangle srcRect, PRectangle dstRect) {
+	CGImageRef image = source->CreateImage();
+
+	CGRect src = PRectangleToCGRect(srcRect);
+	CGRect dst = PRectangleToCGRect(dstRect);
+
+	/* source from QuickDrawToQuartz2D.pdf on developer.apple.com */
+	const float w = static_cast<float>(CGImageGetWidth(image));
+	const float h = static_cast<float>(CGImageGetHeight(image));
+	CGRect drawRect = CGRectMake(0, 0, w, h);
+	if (!CGRectEqualToRect(src, dst)) {
+		CGFloat sx = CGRectGetWidth(dst) / CGRectGetWidth(src);
+		CGFloat sy = CGRectGetHeight(dst) / CGRectGetHeight(src);
+		CGFloat dx = CGRectGetMinX(dst) - (CGRectGetMinX(src) * sx);
+		CGFloat dy = CGRectGetMinY(dst) - (CGRectGetMinY(src) * sy);
+		drawRect = CGRectMake(dx, dy, w*sx, h*sy);
+	}
+	CGContextSaveGState(gc);
+	CGContextClipToRect(gc, dst);
+	CGContextDrawImage(gc, drawRect, image);
+	CGContextRestoreGState(gc);
+	CGImageRelease(image);
+}
+
+void SurfaceImpl::Copy(PRectangle rc, Scintilla::Internal::Point from, Surface &surfaceSource) {
+	// Maybe we have to make the Surface two contexts:
+	// a bitmap context which we do all the drawing on, and then a "real" context
+	// which we copy the output to when we call "Synchronize". Ugh! Gross and slow!
+
+	// For now, assume that copy can only be called on PixMap surfaces
+	SurfaceImpl &source = static_cast<SurfaceImpl &>(surfaceSource);
+
+	// Get the CGImageRef
+	CGImageRef image = source.CreateImage();
+	// If we could not get an image reference, fill the rectangle black
+	if (image == NULL) {
+		FillRectangle(rc, ColourRGBA::FromRGB(0));
+		return;
+	}
+
+	// Now draw the image on the surface
+
+	// Some fancy clipping work is required here: draw only inside of rc
+	CGContextSaveGState(gc);
+	CGContextClipToRect(gc, PRectangleToCGRect(rc));
+
+	//Platform::DebugPrintf(stderr, "Copy: CGContextDrawImage: (%d, %d) - (%d X %d)\n", rc.left - from.x, rc.top - from.y, source.bitmapWidth, source.bitmapHeight );
+	CGContextDrawImage(gc, CGRectMake(rc.left - from.x, rc.top - from.y, source.bitmapWidth, source.bitmapHeight), image);
+
+	// Undo the clipping fun
+	CGContextRestoreGState(gc);
+
+	// Done with the image
+	CGImageRelease(image);
+	image = NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Bidirectional text support for Arabic and Hebrew.
+
+std::unique_ptr<IScreenLineLayout> SurfaceImpl::Layout(const IScreenLine *screenLine) {
+	return std::make_unique<ScreenLineLayout>(screenLine);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				 ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextTransparent(rc, font_, ybase, text, fore);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				  ColourRGBA fore, ColourRGBA back) {
+	CGContextSaveGState(gc);
+	CGContextClipToRect(gc, PRectangleToCGRect(rc));
+	DrawTextNoClip(rc, font_, ybase, text, fore, back);
+	CGContextRestoreGState(gc);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+CFStringEncoding EncodingFromCharacterSet(bool unicode, CharacterSet characterSet) {
+	if (unicode)
+		return kCFStringEncodingUTF8;
+
+	// Unsupported -> Latin1 as reasonably safe
+	enum { notSupported = kCFStringEncodingISOLatin1};
+
+	switch (characterSet) {
+	case CharacterSet::Ansi:
+		return kCFStringEncodingISOLatin1;
+	case CharacterSet::Default:
+		return kCFStringEncodingISOLatin1;
+	case CharacterSet::Baltic:
+		return kCFStringEncodingWindowsBalticRim;
+	case CharacterSet::ChineseBig5:
+		return kCFStringEncodingBig5;
+	case CharacterSet::EastEurope:
+		return kCFStringEncodingWindowsLatin2;
+	case CharacterSet::GB2312:
+		return kCFStringEncodingGB_18030_2000;
+	case CharacterSet::Greek:
+		return kCFStringEncodingWindowsGreek;
+	case CharacterSet::Hangul:
+		return kCFStringEncodingEUC_KR;
+	case CharacterSet::Mac:
+		return kCFStringEncodingMacRoman;
+	case CharacterSet::Oem:
+		return kCFStringEncodingISOLatin1;
+	case CharacterSet::Russian:
+		return kCFStringEncodingKOI8_R;
+	case CharacterSet::Cyrillic:
+		return kCFStringEncodingWindowsCyrillic;
+	case CharacterSet::ShiftJis:
+		return kCFStringEncodingShiftJIS;
+	case CharacterSet::Symbol:
+		return kCFStringEncodingMacSymbol;
+	case CharacterSet::Turkish:
+		return kCFStringEncodingWindowsLatin5;
+	case CharacterSet::Johab:
+		return kCFStringEncodingWindowsKoreanJohab;
+	case CharacterSet::Hebrew:
+		return kCFStringEncodingWindowsHebrew;
+	case CharacterSet::Arabic:
+		return kCFStringEncodingWindowsArabic;
+	case CharacterSet::Vietnamese:
+		return kCFStringEncodingWindowsVietnamese;
+	case CharacterSet::Thai:
+		return kCFStringEncodingISOLatinThai;
+	case CharacterSet::Iso8859_15:
+		return kCFStringEncodingISOLatin1;
+	default:
+		return notSupported;
+	}
+}
+
+void SurfaceImpl::DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				      ColourRGBA fore) {
+	QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return;
+	}
+	CFStringEncoding encoding = EncodingFromCharacterSet(UnicodeMode(), style->getCharacterSet());
+
+	CGColorRef color = CGColorCreateGenericRGB(fore.GetRedComponent(),
+						   fore.GetGreenComponent(),
+						   fore.GetBlueComponent(),
+						   fore.GetAlphaComponent());
+
+	style->setCTStyleColour(color);
+
+	CGColorRelease(color);
+
+	textLayout->setText(text, encoding, style);
+	textLayout->draw(gc, rc.left, ybase);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return;
+	}
+	CFStringEncoding encoding = EncodingFromCharacterSet(UnicodeMode(), style->getCharacterSet());
+	const CFStringEncoding encodingUsed =
+		textLayout->setText(text, encoding, style);
+
+	CTLineRef mLine = textLayout->getCTLine();
+	assert(mLine);
+
+	if (encodingUsed != encoding) {
+		// 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);
+		}
+		return;
+	}
+
+	if (UnicodeMode()) {
+		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+		CFIndex fit = textLayout->getStringLength();
+		int ui=0;
+		int i=0;
+		std::vector<CGFloat> linePositions(fit);
+		GetPositions(mLine, linePositions);
+		while (ui<fit) {
+			const unsigned char uch = text[i];
+			const unsigned int byteCount = UTF8BytesOfLead[uch];
+			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);
+			}
+			ui += codeUnits;
+		}
+		XYPOSITION lastPos = 0.0f;
+		if (i > 0)
+			lastPos = positions[i-1];
+		while (i<text.length()) {
+			positions[i++] = lastPos;
+		}
+	} else if (mode.codePage) {
+		int ui = 0;
+		for (int i=0; i<text.length();) {
+			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);
+			}
+			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);
+		}
+	}
+
+}
+
+XYPOSITION SurfaceImpl::WidthText(const Font *font_, std::string_view text) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return 1;
+	}
+	CFStringEncoding encoding = EncodingFromCharacterSet(UnicodeMode(), style->getCharacterSet());
+	textLayout->setText(text, encoding, style);
+
+	return static_cast<XYPOSITION>(textLayout->MeasureStringWidth());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				 ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextTransparentUTF8(rc, font_, ybase, text, fore);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				  ColourRGBA fore, ColourRGBA back) {
+	CGContextSaveGState(gc);
+	CGContextClipToRect(gc, PRectangleToCGRect(rc));
+	DrawTextNoClipUTF8(rc, font_, ybase, text, fore, back);
+	CGContextRestoreGState(gc);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				      ColourRGBA fore) {
+	QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return;
+	}
+	const CFStringEncoding encoding = kCFStringEncodingUTF8;
+
+	CGColorRef color = CGColorCreateGenericRGB(fore.GetRedComponent(),
+						   fore.GetGreenComponent(),
+						   fore.GetBlueComponent(),
+						   fore.GetAlphaComponent());
+
+	style->setCTStyleColour(color);
+
+	CGColorRelease(color);
+
+	textLayout->setText(text, encoding, style);
+	textLayout->draw(gc, rc.left, ybase);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void SurfaceImpl::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return;
+	}
+	const CFStringEncoding encoding = kCFStringEncodingUTF8;
+	const CFStringEncoding encodingUsed =
+		textLayout->setText(text, encoding, style);
+
+	CTLineRef mLine = textLayout->getCTLine();
+	assert(mLine);
+
+	if (encodingUsed != encoding) {
+		// 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);
+		}
+		return;
+	}
+
+	// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+	CFIndex fit = textLayout->getStringLength();
+	int ui=0;
+	int i=0;
+	std::vector<CGFloat> linePositions(fit);
+	GetPositions(mLine, linePositions);
+	while (ui<fit) {
+		const unsigned char uch = text[i];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		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);
+		}
+		ui += codeUnits;
+	}
+	XYPOSITION lastPos = 0.0f;
+	if (i > 0)
+		lastPos = positions[i-1];
+	while (i<text.length()) {
+		positions[i++] = lastPos;
+	}
+}
+
+XYPOSITION SurfaceImpl::WidthTextUTF8(const Font *font_, std::string_view text) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return 1;
+	}
+	textLayout->setText(text, kCFStringEncodingUTF8, style);
+
+	return static_cast<XYPOSITION>(textLayout->MeasureStringWidth());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+
+// This string contains a good range of characters to test for size.
+const char sizeString[] = "`~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890"
+			  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+XYPOSITION SurfaceImpl::Ascent(const Font *font_) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return 1;
+	}
+
+	float ascent = style->getAscent();
+	return ascent + 0.5f;
+
+}
+
+XYPOSITION SurfaceImpl::Descent(const Font *font_) {
+	const QuartzTextStyle *style = TextStyleFromFont(font_);
+	if (!style) {
+		return 1;
+	}
+
+	float descent = style->getDescent();
+	return descent + 0.5f;
+
+}
+
+XYPOSITION SurfaceImpl::InternalLeading(const Font *) {
+	return 0;
+}
+
+XYPOSITION SurfaceImpl::Height(const Font *font_) {
+
+	return Ascent(font_) + Descent(font_);
+}
+
+XYPOSITION SurfaceImpl::AverageCharWidth(const Font *font_) {
+
+	XYPOSITION width = WidthText(font_, sizeString);
+
+	return std::round(width / strlen(sizeString));
+}
+
+void SurfaceImpl::SetClip(PRectangle rc) {
+	CGContextSaveGState(gc);
+	CGContextClipToRect(gc, PRectangleToCGRect(rc));
+}
+
+void SurfaceImpl::PopClip() {
+	CGContextRestoreGState(gc);
+}
+
+void SurfaceImpl::FlushCachedState() {
+	CGContextSynchronize(gc);
+}
+
+void SurfaceImpl::FlushDrawing() {
+}
+
+std::unique_ptr<Surface> Surface::Allocate(Technology) {
+	return std::make_unique<SurfaceImpl>();
+}
+
+//----------------- Window -------------------------------------------------------------------------
+
+// Cocoa uses different types for windows and views, so a Window may
+// be either an NSWindow or NSView and the code will check the type
+// before performing an action.
+
+Window::~Window() noexcept {
+}
+
+// Window::Destroy needs to see definition of ListBoxImpl so is located after ListBoxImpl
+
+//--------------------------------------------------------------------------------------------------
+
+static CGFloat ScreenMax() {
+	return NSMaxY([NSScreen mainScreen].frame);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+PRectangle Window::GetPosition() const {
+	if (wid) {
+		NSRect rect;
+		id idWin = (__bridge id)(wid);
+		NSWindow *win;
+		if ([idWin isKindOfClass: [NSView class]]) {
+			// NSView
+			NSView *view = idWin;
+			win = view.window;
+			rect = [view convertRect: view.bounds toView: nil];
+			rect = [win convertRectToScreen: rect];
+		} else {
+			// NSWindow
+			win = idWin;
+			rect = win.frame;
+		}
+		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)));
+	} else {
+		return PRectangle(0, 0, 1, 1);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Window::SetPosition(PRectangle rc) {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		if ([idWin isKindOfClass: [NSView class]]) {
+			// NSView
+			// Moves this view inside the parent view
+			NSRect nsrc = NSMakeRect(rc.left, rc.bottom, rc.Width(), rc.Height());
+			NSView *view = idWin;
+			nsrc = [view.window convertRectFromScreen: nsrc];
+			view.frame = nsrc;
+		} else {
+			// NSWindow
+			PLATFORM_ASSERT([idWin isKindOfClass: [NSWindow class]]);
+			NSWindow *win = idWin;
+			CGFloat screenHeight = ScreenMax();
+			NSRect nsrc = NSMakeRect(rc.left, screenHeight - rc.bottom,
+						 rc.Width(), rc.Height());
+			[win setFrame: nsrc display: YES];
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Window::SetPositionRelative(PRectangle rc, const Window *window) {
+	PRectangle rcOther = window->GetPosition();
+	rc.left += rcOther.left;
+	rc.right += rcOther.left;
+	rc.top += rcOther.top;
+	rc.bottom += rcOther.top;
+	SetPosition(rc);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+PRectangle Window::GetClientPosition() const {
+	// This means, in MacOS X terms, get the "frame bounds". Call GetPosition, just like on Win32.
+	return GetPosition();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Window::Show(bool show) {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		if ([idWin isKindOfClass: [NSWindow class]]) {
+			NSWindow *win = idWin;
+			if (show) {
+				[win orderFront: nil];
+			} else {
+				[win orderOut: nil];
+			}
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Invalidates the entire window or view so it is completely redrawn.
+ */
+void Window::InvalidateAll() {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		NSView *container;
+		if ([idWin isKindOfClass: [NSView class]]) {
+			container = idWin;
+		} else {
+			// NSWindow
+			NSWindow *win = idWin;
+			container = win.contentView;
+			container.needsDisplay = YES;
+		}
+		container.needsDisplay = YES;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Invalidates part of the window or view so only this part redrawn.
+ */
+void Window::InvalidateRectangle(PRectangle rc) {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		NSView *container;
+		if ([idWin isKindOfClass: [NSView class]]) {
+			container = idWin;
+		} else {
+			// NSWindow
+			NSWindow *win = idWin;
+			container = win.contentView;
+		}
+		[container setNeedsDisplayInRect: PRectangleToNSRect(rc)];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts the Scintilla cursor enum into an NSCursor and stores it in the associated NSView,
+ * which then will take care to set up a new mouse tracking rectangle.
+ */
+void Window::SetCursor(Cursor curs) {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		if ([idWin isKindOfClass: [SCIContentView class]]) {
+			SCIContentView *container = idWin;
+			[container setCursor: static_cast<int>(curs)];
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+PRectangle Window::GetMonitorRect(Point) {
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		if ([idWin isKindOfClass: [NSView class]]) {
+			NSView *view = idWin;
+			idWin = view.window;
+		}
+		if ([idWin isKindOfClass: [NSWindow class]]) {
+			PRectangle rcPosition = GetPosition();
+
+			NSWindow *win = idWin;
+			NSScreen *screen = win.screen;
+			NSRect rect = screen.visibleFrame;
+			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)));
+			PRectangle rcMonitor(rcWork.left - rcPosition.left,
+					     rcWork.top - rcPosition.top,
+					     rcWork.right - rcPosition.left,
+					     rcWork.bottom - rcPosition.top);
+			return rcMonitor;
+		}
+	}
+	return PRectangle();
+}
+
+//----------------- ImageFromXPM -------------------------------------------------------------------
+
+// Convert an XPM image into an NSImage for use with Cocoa
+
+static NSImage *ImageFromXPM(XPM *pxpm) {
+	NSImage *img = nil;
+	if (pxpm) {
+		const int width = pxpm->GetWidth();
+		const int height = pxpm->GetHeight();
+		PRectangle rcxpm(0, 0, width, height);
+		std::unique_ptr<Surface> surfaceBase(Surface::Allocate(Technology::Default));
+		std::unique_ptr<Surface> surfaceXPM = surfaceBase->AllocatePixMap(width, height);
+		SurfaceImpl *surfaceIXPM = static_cast<SurfaceImpl *>(surfaceXPM.get());
+		CGContextClearRect(surfaceIXPM->GetContext(), CGRectMake(0, 0, width, height));
+		pxpm->Draw(surfaceXPM.get(), rcxpm);
+		CGImageRef imageRef = surfaceIXPM->CreateImage();
+		img = [[NSImage alloc] initWithCGImage: imageRef size: NSZeroSize];
+		CGImageRelease(imageRef);
+	}
+	return img;
+}
+
+//----------------- ListBox and related classes ----------------------------------------------------
+
+//----------------- IListBox -----------------------------------------------------------------------
+
+namespace {
+
+// Unnamed namespace hides local IListBox interface.
+// IListBox is used to cross languages to send events from Objective C++
+// AutoCompletionDelegate and AutoCompletionDataSource to C++ ListBoxImpl.
+
+class IListBox {
+public:
+	virtual int Rows() = 0;
+	virtual NSImage *ImageForRow(NSInteger row) = 0;
+	virtual NSString *TextForRow(NSInteger row) = 0;
+	virtual void DoubleClick() = 0;
+	virtual void SelectionChange() = 0;
+};
+
+}
+
+//----------------- AutoCompletionDelegate ---------------------------------------------------------
+
+// AutoCompletionDelegate is an Objective C++ class so it can implement
+// NSTableViewDelegate and receive tableViewSelectionDidChange events.
+
+@interface AutoCompletionDelegate : NSObject <NSTableViewDelegate> {
+	IListBox *box;
+}
+
+@property IListBox *box;
+
+@end
+
+@implementation AutoCompletionDelegate
+
+@synthesize box;
+
+- (void) tableViewSelectionDidChange: (NSNotification *) notification {
+#pragma unused(notification)
+	if (box) {
+		box->SelectionChange();
+	}
+}
+
+@end
+
+//----------------- AutoCompletionDataSource -------------------------------------------------------
+
+// AutoCompletionDataSource provides data to display in the list box.
+// It is also the target of the NSTableView so it receives double clicks.
+
+@interface AutoCompletionDataSource : NSObject <NSTableViewDataSource> {
+	IListBox *box;
+}
+
+@property IListBox *box;
+
+@end
+
+@implementation AutoCompletionDataSource
+
+@synthesize box;
+
+- (void) doubleClick: (id) sender {
+#pragma unused(sender)
+	if (box) {
+		box->DoubleClick();
+	}
+}
+
+- (id) tableView: (NSTableView *) aTableView objectValueForTableColumn: (NSTableColumn *) aTableColumn row: (NSInteger) rowIndex {
+#pragma unused(aTableView)
+	if (!box)
+		return nil;
+	if ([(NSString *)aTableColumn.identifier isEqualToString: @"icon"]) {
+		return box->ImageForRow(rowIndex);
+	} else {
+		return box->TextForRow(rowIndex);
+	}
+}
+
+- (void) tableView: (NSTableView *) aTableView setObjectValue: anObject forTableColumn: (NSTableColumn *) aTableColumn row: (NSInteger) rowIndex {
+#pragma unused(aTableView)
+#pragma unused(anObject)
+#pragma unused(aTableColumn)
+#pragma unused(rowIndex)
+}
+
+- (NSInteger) numberOfRowsInTableView: (NSTableView *) aTableView {
+#pragma unused(aTableView)
+	if (!box)
+		return 0;
+	return box->Rows();
+}
+
+@end
+
+//----------------- ListBoxImpl --------------------------------------------------------------------
+
+namespace {	// unnamed namespace hides ListBoxImpl and associated classes
+
+struct RowData {
+	int type;
+	std::string text;
+	RowData(int type_, const char *text_) :
+		type(type_), text(text_) {
+	}
+};
+
+class LinesData {
+	std::vector<RowData> lines;
+public:
+	LinesData() {
+	}
+	~LinesData() {
+	}
+	int Length() const {
+		return static_cast<int>(lines.size());
+	}
+	void Clear() {
+		lines.clear();
+	}
+	void Add(int /* index */, int type, char *str) {
+		lines.push_back(RowData(type, str));
+	}
+	int GetType(size_t index) const {
+		if (index < lines.size()) {
+			return lines[index].type;
+		} else {
+			return 0;
+		}
+	}
+	const char *GetString(size_t index) const {
+		if (index < lines.size()) {
+			return lines[index].text.c_str();
+		} else {
+			return 0;
+		}
+	}
+};
+
+class ListBoxImpl : public ListBox, IListBox {
+private:
+	NSMutableDictionary *images;
+	int lineHeight;
+	bool unicodeMode;
+	int desiredVisibleRows;
+	XYPOSITION maxItemWidth;
+	unsigned int aveCharWidth;
+	XYPOSITION maxIconWidth;
+	std::unique_ptr<Font> font;
+	int maxWidth;
+
+	NSTableView *table;
+	NSScrollView *scroller;
+	NSTableColumn *colIcon;
+	NSTableColumn *colText;
+	AutoCompletionDataSource *ds;
+	AutoCompletionDelegate *acd;
+
+	LinesData ld;
+	IListBoxDelegate *delegate;
+
+public:
+	ListBoxImpl() :
+		images(nil),
+		lineHeight(10),
+		unicodeMode(false),
+		desiredVisibleRows(5),
+		maxItemWidth(0),
+		aveCharWidth(8),
+		maxIconWidth(0),
+		maxWidth(2000),
+		table(nil),
+		scroller(nil),
+		colIcon(nil),
+		colText(nil),
+		ds(nil),
+		acd(nil),
+		delegate(nullptr) {
+		images = [[NSMutableDictionary alloc] init];
+	}
+	~ListBoxImpl() override {
+	}
+
+	// ListBox methods
+	void SetFont(const Font *font_) override;
+	void Create(Window &parent, int ctrlID, Scintilla::Internal::Point pt, int lineHeight_, bool unicodeMode_, Technology technology_) override;
+	void SetAverageCharWidth(int width) override;
+	void SetVisibleRows(int rows) override;
+	int GetVisibleRows() const override;
+	PRectangle GetDesiredRect() override;
+	int CaretFromEdge() override;
+	void Clear() noexcept override;
+	void Append(char *s, int type = -1) override;
+	int Length() override;
+	void Select(int n) override;
+	int GetSelection() override;
+	int Find(const char *prefix) override;
+	std::string GetValue(int n) override;
+	void RegisterImage(int type, const char *xpm_data) override;
+	void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override;
+	void ClearRegisteredImages() override;
+	void SetDelegate(IListBoxDelegate *lbDelegate) override {
+		delegate = lbDelegate;
+	}
+	void SetList(const char *list, char separator, char typesep) override;
+	void SetOptions(ListOptions options_) override;
+
+	// To clean up when closed
+	void ReleaseViews();
+
+	// For access from AutoCompletionDataSource implement IListBox
+	int Rows() override;
+	NSImage *ImageForRow(NSInteger row) override;
+	NSString *TextForRow(NSInteger row) override;
+	void DoubleClick() override;
+	void SelectionChange() override;
+};
+
+void ListBoxImpl::Create(Window & /*parent*/, int /*ctrlID*/, Scintilla::Internal::Point pt,
+			 int lineHeight_, bool unicodeMode_, Technology) {
+	lineHeight = lineHeight_;
+	unicodeMode = unicodeMode_;
+	maxWidth = 2000;
+
+	NSRect lbRect = NSMakeRect(pt.x, pt.y, 120, lineHeight * desiredVisibleRows);
+	NSWindow *winLB = [[NSWindow alloc] initWithContentRect: lbRect
+						      styleMask: NSWindowStyleMaskBorderless
+							backing: NSBackingStoreBuffered
+							  defer: NO];
+	[winLB setLevel: NSFloatingWindowLevel];
+	[winLB setHasShadow: YES];
+	NSRect scRect = NSMakeRect(0, 0, lbRect.size.width, lbRect.size.height);
+	scroller = [[NSScrollView alloc] initWithFrame: scRect];
+	[scroller setHasVerticalScroller: YES];
+	table = [[NSTableView alloc] initWithFrame: scRect];
+	[table setHeaderView: nil];
+	scroller.documentView = table;
+	colIcon = [[NSTableColumn alloc] initWithIdentifier: @"icon"];
+	colIcon.width = 20;
+	[colIcon setEditable: NO];
+	[colIcon setHidden: YES];
+	NSImageCell *imCell = [[NSImageCell alloc] init];
+	colIcon.dataCell = imCell;
+	[table addTableColumn: colIcon];
+	colText = [[NSTableColumn alloc] initWithIdentifier: @"name"];
+	colText.resizingMask = NSTableColumnAutoresizingMask;
+	[colText setEditable: NO];
+	[table addTableColumn: colText];
+	ds = [[AutoCompletionDataSource alloc] init];
+	ds.box = this;
+	table.dataSource = ds;	// Weak reference
+	acd = [[AutoCompletionDelegate alloc] init];
+	[acd setBox: this];
+	table.delegate = acd;
+	scroller.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+	[winLB.contentView addSubview: scroller];
+
+	table.target = ds;
+	table.doubleAction = @selector(doubleClick:);
+	table.selectionHighlightStyle = NSTableViewSelectionHighlightStyleSourceList;
+
+	if (@available(macOS 11.0, *)) {
+		[table setStyle: NSTableViewStylePlain];
+	}
+
+	wid = (__bridge_retained WindowID)winLB;
+}
+
+void ListBoxImpl::SetFont(const Font *font_) {
+	// NSCell setFont takes an NSFont* rather than a CTFontRef but they
+	// are the same thing toll-free bridged.
+	QuartzTextStyle *style = TextStyleFromFont(font_);
+	font = std::make_unique<FontQuartz>(style);
+	NSFont *pfont = (__bridge NSFont *)style->getFontRef();
+	[colText.dataCell setFont: pfont];
+	CGFloat itemHeight = std::ceil(pfont.boundingRectForFont.size.height);
+	table.rowHeight = itemHeight;
+}
+
+void ListBoxImpl::SetAverageCharWidth(int width) {
+	aveCharWidth = width;
+}
+
+void ListBoxImpl::SetVisibleRows(int rows) {
+	desiredVisibleRows = rows;
+}
+
+int ListBoxImpl::GetVisibleRows() const {
+	return desiredVisibleRows;
+}
+
+PRectangle ListBoxImpl::GetDesiredRect() {
+	PRectangle rcDesired;
+	rcDesired = GetPosition();
+
+	CGFloat itemHeight;
+	if (@available(macOS 11.0, *)) {
+		itemHeight = table.rowHeight;
+	} else {
+		// There appears to be an extra pixel above and below the row contents
+		itemHeight = table.rowHeight + 2;
+	}
+
+	int rows = Length();
+	if ((rows == 0) || (rows > desiredVisibleRows))
+		rows = desiredVisibleRows;
+
+	rcDesired.bottom = rcDesired.top + static_cast<XYPOSITION>(itemHeight * rows);
+	rcDesired.right = rcDesired.left + maxItemWidth + aveCharWidth;
+	rcDesired.right += 4; // Ensures no truncation of text
+
+	if (Length() > rows) {
+		[scroller setHasVerticalScroller: YES];
+		rcDesired.right += [NSScroller scrollerWidthForControlSize: NSControlSizeRegular
+							     scrollerStyle: NSScrollerStyleLegacy];
+	} else {
+		[scroller setHasVerticalScroller: NO];
+	}
+	rcDesired.right += maxIconWidth;
+	rcDesired.right += 6; // For icon space
+
+	return rcDesired;
+}
+
+int ListBoxImpl::CaretFromEdge() {
+	if (colIcon.hidden)
+		return 3;
+	else
+		return 6 + static_cast<int>(colIcon.width);
+}
+
+void ListBoxImpl::ReleaseViews() {
+	[table setDataSource: nil];
+	table = nil;
+	scroller = nil;
+	colIcon = nil;
+	colText = nil;
+	acd = nil;
+	ds = nil;
+}
+
+void ListBoxImpl::Clear() noexcept {
+	maxItemWidth = 0;
+	maxIconWidth = 0;
+	ld.Clear();
+}
+
+void ListBoxImpl::Append(char *s, int type) {
+	int count = Length();
+	ld.Add(count, type, s);
+
+	Scintilla::Internal::SurfaceImpl surface;
+	XYPOSITION width = surface.WidthText(font.get(), s);
+	if (width > maxItemWidth) {
+		maxItemWidth = width;
+		colText.width = maxItemWidth;
+	}
+	NSImage *img = images[@(type)];
+	if (img) {
+		XYPOSITION widthIcon = static_cast<XYPOSITION>(img.size.width);
+		if (widthIcon > maxIconWidth) {
+			[colIcon setHidden: NO];
+			maxIconWidth = widthIcon;
+			colIcon.width = maxIconWidth;
+		}
+	}
+}
+
+void ListBoxImpl::SetList(const char *list, char separator, char typesep) {
+	Clear();
+	size_t count = strlen(list) + 1;
+	std::vector<char> words(list, list+count);
+	char *startword = words.data();
+	char *numword = nullptr;
+	int i = 0;
+	for (; words[i]; i++) {
+		if (words[i] == separator) {
+			words[i] = '\0';
+			if (numword)
+				*numword = '\0';
+			Append(startword, numword?atoi(numword + 1):-1);
+			startword = words.data() + i + 1;
+			numword = nullptr;
+		} else if (words[i] == typesep) {
+			numword = words.data() + i;
+		}
+	}
+	if (startword) {
+		if (numword)
+			*numword = '\0';
+		Append(startword, numword?atoi(numword + 1):-1);
+	}
+	[table reloadData];
+}
+
+void ListBoxImpl::SetOptions(ListOptions) {
+}
+
+int ListBoxImpl::Length() {
+	return ld.Length();
+}
+
+void ListBoxImpl::Select(int n) {
+	[table selectRowIndexes: [NSIndexSet indexSetWithIndex: n] byExtendingSelection: NO];
+	[table scrollRowToVisible: n];
+}
+
+int ListBoxImpl::GetSelection() {
+	return static_cast<int>(table.selectedRow);
+}
+
+int ListBoxImpl::Find(const char *prefix) {
+	int count = Length();
+	for (int i = 0; i < count; i++) {
+		const char *s = ld.GetString(i);
+		if (s && (s[0] != '\0') && (0 == strncmp(prefix, s, strlen(prefix)))) {
+			return i;
+		}
+	}
+	return - 1;
+}
+
+std::string ListBoxImpl::GetValue(int n) {
+	const char *textString = ld.GetString(n);
+	if (textString) {
+		return textString;
+	}
+	return std::string();
+}
+
+void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
+	XPM xpm(xpm_data);
+	NSImage *img = ImageFromXPM(&xpm);
+	images[@(type)] = img;
+}
+
+void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+	CGImageRef imageRef = ImageCreateFromRGBA(width, height, pixelsImage, false);
+	NSImage *img = [[NSImage alloc] initWithCGImage: imageRef size: NSZeroSize];
+	CGImageRelease(imageRef);
+	images[@(type)] = img;
+}
+
+void ListBoxImpl::ClearRegisteredImages() {
+	[images removeAllObjects];
+}
+
+int ListBoxImpl::Rows() {
+	return ld.Length();
+}
+
+NSImage *ListBoxImpl::ImageForRow(NSInteger row) {
+	return images[@(ld.GetType(row))];
+}
+
+NSString *ListBoxImpl::TextForRow(NSInteger row) {
+	const char *textString = ld.GetString(row);
+	NSString *sTitle;
+	if (unicodeMode)
+		sTitle = @(textString);
+	else
+		sTitle = [NSString stringWithCString: textString encoding: NSWindowsCP1252StringEncoding];
+	return sTitle;
+}
+
+void ListBoxImpl::DoubleClick() {
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::doubleClick);
+		delegate->ListNotify(&event);
+	}
+}
+
+void ListBoxImpl::SelectionChange() {
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
+		delegate->ListNotify(&event);
+	}
+}
+
+} // unnamed namespace
+
+//----------------- ListBox ------------------------------------------------------------------------
+
+// ListBox is implemented by the ListBoxImpl class.
+
+ListBox::ListBox() noexcept {
+}
+
+ListBox::~ListBox() noexcept {
+}
+
+std::unique_ptr<ListBox> ListBox::Allocate() {
+	return std::make_unique<ListBoxImpl>();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Window::Destroy() noexcept {
+	ListBoxImpl *listbox = dynamic_cast<ListBoxImpl *>(this);
+	if (listbox) {
+		listbox->ReleaseViews();
+	}
+	if (wid) {
+		id idWin = (__bridge id)(wid);
+		if ([idWin isKindOfClass: [NSWindow class]]) {
+			[idWin close];
+		}
+	}
+	wid = nullptr;
+}
+
+
+//----------------- ScintillaContextMenu -----------------------------------------------------------
+
+@implementation ScintillaContextMenu :
+NSMenu
+
+// This NSMenu subclass serves also as target for menu commands and forwards them as
+// notification messages to the front end.
+
+- (void) handleCommand: (NSMenuItem *) sender {
+	owner->HandleCommand(sender.tag);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setOwner: (Scintilla::Internal::ScintillaCocoa *) newOwner {
+	owner = newOwner;
+}
+
+@end
+
+//----------------- Menu ---------------------------------------------------------------------------
+
+Menu::Menu() noexcept
+	: mid(0) {
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Menu::CreatePopUp() {
+	Destroy();
+	mid = (__bridge_retained MenuID)[[ScintillaContextMenu alloc] initWithTitle: @""];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Menu::Destroy() noexcept {
+	CFBridgingRelease(mid);
+	mid = nullptr;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Menu::Show(Point, const Window &) {
+	// Cocoa menus are handled a bit differently. We only create the menu. The framework
+	// takes care to show it properly.
+}
+
+//----------------- Platform -----------------------------------------------------------------------
+
+ColourRGBA Platform::Chrome() {
+	return ColourRGBA(0xE0, 0xE0, 0xE0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+ColourRGBA Platform::ChromeHighlight() {
+	return ColourRGBA(0xFF, 0xFF, 0xFF);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the currently set system font for the user.
+ */
+const char *Platform::DefaultFont() {
+	NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey: @"NSFixedPitchFont"];
+	return name.UTF8String;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the currently set system font size for the user.
+ */
+int Platform::DefaultFontSize() {
+	return static_cast<int>([[NSUserDefaults standardUserDefaults]
+				 integerForKey: @"NSFixedPitchFontSize"]);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the time span in which two consecutive mouse clicks must occur to be considered as
+ * double click.
+ *
+ * @return time span in milliseconds
+ */
+unsigned int Platform::DoubleClickTime() {
+	float threshold = [[NSUserDefaults standardUserDefaults] floatForKey:
+								 @"com.apple.mouse.doubleClickThreshold"];
+	if (threshold == 0)
+		threshold = 0.5;
+	return static_cast<unsigned int>(threshold * 1000.0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+//#define TRACE
+#ifdef TRACE
+
+void Platform::DebugDisplay(const char *s) noexcept {
+	fprintf(stderr, "%s", s);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Platform::DebugPrintf(const char *format, ...) noexcept {
+	const int BUF_SIZE = 2000;
+	char buffer[BUF_SIZE];
+
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsnprintf(buffer, BUF_SIZE, format, pArguments);
+	va_end(pArguments);
+	Platform::DebugDisplay(buffer);
+}
+
+#else
+
+void Platform::DebugDisplay(const char *) noexcept {}
+
+void Platform::DebugPrintf(const char *, ...) noexcept {}
+
+#endif
+
+//--------------------------------------------------------------------------------------------------
+
+static bool assertionPopUps = true;
+
+bool Platform::ShowAssertionPopUps(bool assertionPopUps_) noexcept {
+	bool ret = assertionPopUps;
+	assertionPopUps = assertionPopUps_;
+	return ret;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void Platform::Assert(const char *c, const char *file, int line) noexcept {
+	char buffer[2000];
+	snprintf(buffer, sizeof(buffer), "Assertion [%s] failed at %s %d\r\n", c, file, line);
+	Platform::DebugDisplay(buffer);
+#ifdef DEBUG
+	// Jump into debugger in assert on Mac (CL269835)
+	::Debugger();
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
diff --git a/scite-app/scintilla/cocoa/QuartzTextLayout.h b/scite-app/scintilla/cocoa/QuartzTextLayout.h
new file mode 100644
index 0000000..1f7adc2
--- /dev/null
+++ b/scite-app/scintilla/cocoa/QuartzTextLayout.h
@@ -0,0 +1,109 @@
+/*
+ *  QuartzTextLayout.h
+ *
+ *  Original Code by Evan Jones on Wed Oct 02 2002.
+ *  Contributors:
+ *  Shane Caraveo, ActiveState
+ *  Bernd Paradies, Adobe
+ *
+ */
+
+#ifndef QUARTZTEXTLAYOUT_H
+#define QUARTZTEXTLAYOUT_H
+
+#include <Cocoa/Cocoa.h>
+
+#include "QuartzTextStyle.h"
+
+
+class QuartzTextLayout {
+public:
+	/** Create a text layout for drawing. */
+	QuartzTextLayout() : mString(NULL), mLine(NULL), stringLength(0) {
+	}
+
+	~QuartzTextLayout() {
+		if (mString) {
+			CFRelease(mString);
+			mString = NULL;
+		}
+		if (mLine) {
+			CFRelease(mLine);
+			mLine = NULL;
+		}
+	}
+
+	CFStringEncoding setText(std::string_view sv, CFStringEncoding encoding, const QuartzTextStyle *r) {
+		// First clear current values in case of failure.
+		if (mString) {
+			CFRelease(mString);
+			mString = NULL;
+		}
+		if (mLine) {
+			CFRelease(mLine);
+			mLine = NULL;
+		}
+
+		const UInt8 *puiBuffer = reinterpret_cast<const UInt8 *>(sv.data());
+		CFStringRef str = CFStringCreateWithBytes(NULL, puiBuffer, sv.length(), encoding, false);
+		if (!str) {
+			// Failed to decode bytes into string with given encoding so try
+			// MacRoman which should accept any byte.
+			encoding = kCFStringEncodingMacRoman;
+			str = CFStringCreateWithBytes(NULL, puiBuffer, sv.length(), encoding, false);
+		}
+		if (!str) {
+			return encoding;
+		}
+
+		stringLength = CFStringGetLength(str);
+
+		CFMutableDictionaryRef stringAttribs = r->getCTStyle();
+
+		mString = ::CFAttributedStringCreate(NULL, str, stringAttribs);
+
+		mLine = ::CTLineCreateWithAttributedString(mString);
+
+		CFRelease(str);
+		return encoding;
+	}
+
+	/** Draw the text layout into a CGContext at the specified position.
+	* @param gc The CGContext in which to draw the text.
+	* @param x The x axis position to draw the baseline in the current CGContext.
+	* @param y The y axis position to draw the baseline in the current CGContext. */
+	void draw(CGContextRef gc, double x, double y) {
+		if (!mLine)
+			return;
+
+		::CGContextSetTextMatrix(gc, CGAffineTransformMakeScale(1.0, -1.0));
+
+		// Set the text drawing position.
+		::CGContextSetTextPosition(gc, x, y);
+
+		// And finally, draw!
+		::CTLineDraw(mLine, gc);
+	}
+
+	float MeasureStringWidth() {
+		if (mLine == NULL)
+			return 0.0f;
+
+		return static_cast<float>(::CTLineGetTypographicBounds(mLine, NULL, NULL, NULL));
+	}
+
+	CTLineRef getCTLine() {
+		return mLine;
+	}
+
+	CFIndex getStringLength() {
+		return stringLength;
+	}
+
+private:
+	CFAttributedStringRef mString;
+	CTLineRef mLine;
+	CFIndex stringLength;
+};
+
+#endif
diff --git a/scite-app/scintilla/cocoa/QuartzTextStyle.h b/scite-app/scintilla/cocoa/QuartzTextStyle.h
new file mode 100644
index 0000000..b86bb86
--- /dev/null
+++ b/scite-app/scintilla/cocoa/QuartzTextStyle.h
@@ -0,0 +1,95 @@
+/*
+ *  QuartzTextStyle.h
+ *
+ *  Created by Evan Jones on Wed Oct 02 2002.
+ *
+ */
+
+#ifndef QUARTZTEXTSTYLE_H
+#define QUARTZTEXTSTYLE_H
+
+#include "QuartzTextStyleAttribute.h"
+
+class QuartzTextStyle {
+public:
+	QuartzTextStyle() {
+		fontRef = NULL;
+		styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+						      &kCFTypeDictionaryKeyCallBacks,
+						      &kCFTypeDictionaryValueCallBacks);
+
+		characterSet = Scintilla::CharacterSet::Ansi;
+	}
+
+	QuartzTextStyle(const QuartzTextStyle *other) {
+		// Does not copy font colour attribute
+		fontRef = static_cast<CTFontRef>(CFRetain(other->fontRef));
+		styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+						      &kCFTypeDictionaryKeyCallBacks,
+						      &kCFTypeDictionaryValueCallBacks);
+		CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
+		characterSet = other->characterSet;
+	}
+
+	~QuartzTextStyle() {
+		if (styleDict != NULL) {
+			CFRelease(styleDict);
+			styleDict = NULL;
+		}
+
+		if (fontRef) {
+			CFRelease(fontRef);
+			fontRef = NULL;
+		}
+	}
+
+	CFMutableDictionaryRef getCTStyle() const {
+		return styleDict;
+	}
+
+	void setCTStyleColour(CGColor *inColour) {
+		CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, inColour);
+	}
+
+	float getAscent() const {
+		return static_cast<float>(::CTFontGetAscent(fontRef));
+	}
+
+	float getDescent() const {
+		return static_cast<float>(::CTFontGetDescent(fontRef));
+	}
+
+	float getLeading() const {
+		return static_cast<float>(::CTFontGetLeading(fontRef));
+	}
+
+	void setFontRef(CTFontRef inRef, Scintilla::CharacterSet characterSet_) {
+		fontRef = inRef;
+		characterSet = characterSet_;
+
+		if (styleDict != NULL)
+			CFRelease(styleDict);
+
+		styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+						      &kCFTypeDictionaryKeyCallBacks,
+						      &kCFTypeDictionaryValueCallBacks);
+
+		CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
+	}
+
+	CTFontRef getFontRef() const noexcept {
+		return fontRef;
+	}
+
+	Scintilla::CharacterSet getCharacterSet() const noexcept {
+		return characterSet;
+	}
+
+private:
+	CFMutableDictionaryRef styleDict;
+	CTFontRef fontRef;
+	Scintilla::CharacterSet characterSet;
+};
+
+#endif
+
diff --git a/scite-app/scintilla/cocoa/QuartzTextStyleAttribute.h b/scite-app/scintilla/cocoa/QuartzTextStyleAttribute.h
new file mode 100644
index 0000000..d9c0e5a
--- /dev/null
+++ b/scite-app/scintilla/cocoa/QuartzTextStyleAttribute.h
@@ -0,0 +1,72 @@
+/**
+ *  QuartzTextStyleAttribute.h
+ *
+ *  Original Code by Evan Jones on Wed Oct 02 2002.
+ *  Contributors:
+ *  Shane Caraveo, ActiveState
+ *  Bernd Paradies, Adobe
+ *
+ */
+
+
+#ifndef QUARTZTEXTSTYLEATTRIBUTE_H
+#define QUARTZTEXTSTYLEATTRIBUTE_H
+
+class QuartzFont {
+public:
+	/** Create a font style from a name. */
+	QuartzFont(const char *name, size_t length, float size, Scintilla::FontWeight weight, bool italic) {
+		assert(name != NULL && length > 0 && name[length] == '\0');
+
+		CFStringRef fontName = CFStringCreateWithCString(kCFAllocatorDefault, name, kCFStringEncodingMacRoman);
+		assert(fontName != NULL);
+		bool bold = weight > Scintilla::FontWeight::Normal;
+
+		if (bold || italic) {
+			CTFontSymbolicTraits desiredTrait = 0;
+			CTFontSymbolicTraits traitMask = 0;
+
+			// if bold was specified, add the trait
+			if (bold) {
+				desiredTrait |= kCTFontBoldTrait;
+				traitMask |= kCTFontBoldTrait;
+			}
+
+			// if italic was specified, add the trait
+			if (italic) {
+				desiredTrait |= kCTFontItalicTrait;
+				traitMask |= kCTFontItalicTrait;
+			}
+
+			// create a font and then a copy of it with the sym traits
+			CTFontRef iFont = ::CTFontCreateWithName(fontName, size, NULL);
+			fontid = ::CTFontCreateCopyWithSymbolicTraits(iFont, size, NULL, desiredTrait, traitMask);
+			if (fontid) {
+				CFRelease(iFont);
+			} else {
+				// Traits failed so use base font
+				fontid = iFont;
+			}
+		} else {
+			// create the font, no traits
+			fontid = ::CTFontCreateWithName(fontName, size, NULL);
+		}
+
+		if (!fontid) {
+			// Failed to create requested font so use font always present
+			fontid = ::CTFontCreateWithName((CFStringRef)@"Monaco", size, NULL);
+		}
+
+		CFRelease(fontName);
+	}
+
+	CTFontRef getFontID() {
+		return fontid;
+	}
+
+private:
+	CTFontRef fontid;
+};
+
+#endif
+
diff --git a/scite-app/scintilla/cocoa/Scintilla/Info.plist b/scite-app/scintilla/cocoa/Scintilla/Info.plist
new file mode 100644
index 0000000..75fdd65
--- /dev/null
+++ b/scite-app/scintilla/cocoa/Scintilla/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>5.1.1</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020 Neil Hodgson. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..9c13342
--- /dev/null
+++ b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -0,0 +1,724 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		282936DF24E2D55D00C84BA2 /* QuartzTextLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D324E2D55D00C84BA2 /* QuartzTextLayout.h */; };
+		282936E024E2D55D00C84BA2 /* InfoBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 282936D424E2D55D00C84BA2 /* InfoBar.mm */; };
+		282936E124E2D55D00C84BA2 /* QuartzTextStyleAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D524E2D55D00C84BA2 /* QuartzTextStyleAttribute.h */; };
+		282936E224E2D55D00C84BA2 /* ScintillaCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D624E2D55D00C84BA2 /* ScintillaCocoa.h */; };
+		282936E324E2D55D00C84BA2 /* PlatCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 282936D724E2D55D00C84BA2 /* PlatCocoa.mm */; };
+		282936E424E2D55D00C84BA2 /* PlatCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D824E2D55D00C84BA2 /* PlatCocoa.h */; };
+		282936E524E2D55D00C84BA2 /* InfoBarCommunicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D924E2D55D00C84BA2 /* InfoBarCommunicator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		282936E624E2D55D00C84BA2 /* InfoBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936DA24E2D55D00C84BA2 /* InfoBar.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		282936E724E2D55D00C84BA2 /* QuartzTextStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936DB24E2D55D00C84BA2 /* QuartzTextStyle.h */; };
+		282936E824E2D55D00C84BA2 /* ScintillaView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 282936DC24E2D55D00C84BA2 /* ScintillaView.mm */; };
+		282936E924E2D55D00C84BA2 /* ScintillaCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 282936DD24E2D55D00C84BA2 /* ScintillaCocoa.mm */; };
+		282936EA24E2D55D00C84BA2 /* ScintillaView.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936DE24E2D55D00C84BA2 /* ScintillaView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2829372E24E2D58800C84BA2 /* DBCS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936EB24E2D58400C84BA2 /* DBCS.cxx */; };
+		2829372F24E2D58800C84BA2 /* ElapsedPeriod.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936EC24E2D58400C84BA2 /* ElapsedPeriod.h */; };
+		2829373024E2D58800C84BA2 /* CallTip.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936ED24E2D58400C84BA2 /* CallTip.h */; };
+		2829373124E2D58800C84BA2 /* PositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936EE24E2D58400C84BA2 /* PositionCache.h */; };
+		2829373224E2D58800C84BA2 /* KeyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936EF24E2D58400C84BA2 /* KeyMap.h */; };
+		2829373324E2D58800C84BA2 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936F024E2D58400C84BA2 /* LineMarker.cxx */; };
+		2829373524E2D58800C84BA2 /* Style.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936F224E2D58400C84BA2 /* Style.h */; };
+		2829373624E2D58800C84BA2 /* UniqueString.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936F324E2D58400C84BA2 /* UniqueString.cxx */; };
+		2829373724E2D58800C84BA2 /* RunStyles.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936F424E2D58400C84BA2 /* RunStyles.h */; };
+		2829373824E2D58800C84BA2 /* RESearch.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936F524E2D58400C84BA2 /* RESearch.h */; };
+		2829373924E2D58800C84BA2 /* Indicator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936F624E2D58400C84BA2 /* Indicator.cxx */; };
+		2829373A24E2D58800C84BA2 /* MarginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936F724E2D58400C84BA2 /* MarginView.h */; };
+		2829373B24E2D58800C84BA2 /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936F824E2D58400C84BA2 /* Position.h */; };
+		2829373C24E2D58800C84BA2 /* CaseFolder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936F924E2D58400C84BA2 /* CaseFolder.cxx */; };
+		2829373D24E2D58800C84BA2 /* PerLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936FA24E2D58400C84BA2 /* PerLine.h */; };
+		2829373E24E2D58800C84BA2 /* Indicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936FB24E2D58400C84BA2 /* Indicator.h */; };
+		2829373F24E2D58800C84BA2 /* UniConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936FC24E2D58400C84BA2 /* UniConversion.h */; };
+		2829374024E2D58800C84BA2 /* XPM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282936FD24E2D58400C84BA2 /* XPM.cxx */; };
+		2829374124E2D58800C84BA2 /* CharClassify.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936FE24E2D58400C84BA2 /* CharClassify.h */; };
+		2829374224E2D58800C84BA2 /* Decoration.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936FF24E2D58400C84BA2 /* Decoration.h */; };
+		2829374524E2D58800C84BA2 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370224E2D58500C84BA2 /* PositionCache.cxx */; };
+		2829374724E2D58800C84BA2 /* Style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370424E2D58500C84BA2 /* Style.cxx */; };
+		2829374824E2D58800C84BA2 /* RESearch.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370524E2D58500C84BA2 /* RESearch.cxx */; };
+		2829374924E2D58800C84BA2 /* CallTip.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370624E2D58500C84BA2 /* CallTip.cxx */; };
+		2829374A24E2D58800C84BA2 /* ContractionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829370724E2D58500C84BA2 /* ContractionState.h */; };
+		2829374B24E2D58800C84BA2 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370824E2D58500C84BA2 /* Decoration.cxx */; };
+		2829374C24E2D58800C84BA2 /* DBCS.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829370924E2D58500C84BA2 /* DBCS.h */; };
+		2829374D24E2D58800C84BA2 /* AutoComplete.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829370A24E2D58500C84BA2 /* AutoComplete.h */; };
+		2829374E24E2D58800C84BA2 /* KeyMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370B24E2D58500C84BA2 /* KeyMap.cxx */; };
+		2829374F24E2D58800C84BA2 /* ViewStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829370C24E2D58500C84BA2 /* ViewStyle.h */; };
+		2829375024E2D58800C84BA2 /* Selection.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370D24E2D58500C84BA2 /* Selection.cxx */; };
+		2829375124E2D58800C84BA2 /* ContractionState.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370E24E2D58500C84BA2 /* ContractionState.cxx */; };
+		2829375224E2D58800C84BA2 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829370F24E2D58500C84BA2 /* UniConversion.cxx */; };
+		2829375324E2D58800C84BA2 /* PerLine.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371024E2D58500C84BA2 /* PerLine.cxx */; };
+		2829375424E2D58800C84BA2 /* SparseVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371124E2D58500C84BA2 /* SparseVector.h */; };
+		2829375524E2D58800C84BA2 /* EditModel.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371224E2D58500C84BA2 /* EditModel.cxx */; };
+		2829375624E2D58800C84BA2 /* EditView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371324E2D58600C84BA2 /* EditView.h */; };
+		2829375724E2D58800C84BA2 /* CaseConvert.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371424E2D58600C84BA2 /* CaseConvert.cxx */; };
+		2829375824E2D58800C84BA2 /* CharClassify.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371524E2D58600C84BA2 /* CharClassify.cxx */; };
+		2829375924E2D58800C84BA2 /* AutoComplete.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371624E2D58600C84BA2 /* AutoComplete.cxx */; };
+		2829375A24E2D58800C84BA2 /* ViewStyle.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371724E2D58600C84BA2 /* ViewStyle.cxx */; };
+		2829375B24E2D58800C84BA2 /* MarginView.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371824E2D58600C84BA2 /* MarginView.cxx */; };
+		2829375C24E2D58800C84BA2 /* CellBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371924E2D58600C84BA2 /* CellBuffer.h */; };
+		2829375D24E2D58800C84BA2 /* Document.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829371A24E2D58600C84BA2 /* Document.cxx */; };
+		2829375E24E2D58800C84BA2 /* LineMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371B24E2D58600C84BA2 /* LineMarker.h */; };
+		2829375F24E2D58800C84BA2 /* Editor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371C24E2D58600C84BA2 /* Editor.h */; };
+		2829376024E2D58800C84BA2 /* XPM.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371D24E2D58600C84BA2 /* XPM.h */; };
+		2829376124E2D58800C84BA2 /* ScintillaBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371E24E2D58600C84BA2 /* ScintillaBase.h */; };
+		2829376224E2D58800C84BA2 /* Partitioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829371F24E2D58700C84BA2 /* Partitioning.h */; };
+		2829376324E2D58800C84BA2 /* FontQuality.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372024E2D58700C84BA2 /* FontQuality.h */; };
+		2829376424E2D58800C84BA2 /* SplitVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372124E2D58700C84BA2 /* SplitVector.h */; };
+		2829376524E2D58800C84BA2 /* UniqueString.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372224E2D58700C84BA2 /* UniqueString.h */; };
+		2829376624E2D58800C84BA2 /* CaseConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372324E2D58700C84BA2 /* CaseConvert.h */; };
+		2829376724E2D58800C84BA2 /* ScintillaBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829372424E2D58700C84BA2 /* ScintillaBase.cxx */; };
+		2829376824E2D58800C84BA2 /* CaseFolder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372524E2D58700C84BA2 /* CaseFolder.h */; };
+		2829376924E2D58800C84BA2 /* CellBuffer.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829372624E2D58700C84BA2 /* CellBuffer.cxx */; };
+		2829376A24E2D58800C84BA2 /* EditModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372724E2D58700C84BA2 /* EditModel.h */; };
+		2829376B24E2D58800C84BA2 /* Editor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829372824E2D58700C84BA2 /* Editor.cxx */; };
+		2829376C24E2D58800C84BA2 /* Selection.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372924E2D58700C84BA2 /* Selection.h */; };
+		2829376D24E2D58800C84BA2 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829372A24E2D58800C84BA2 /* RunStyles.cxx */; };
+		2829376F24E2D58800C84BA2 /* Document.h in Headers */ = {isa = PBXBuildFile; fileRef = 2829372C24E2D58800C84BA2 /* Document.h */; };
+		2829377024E2D58800C84BA2 /* EditView.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2829372D24E2D58800C84BA2 /* EditView.cxx */; };
+		282937AA24E2D60E00C84BA2 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 282937A924E2D60E00C84BA2 /* res */; };
+		286F8E6325F84F7400EC8D60 /* Sci_Position.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8E5F25F84F7400EC8D60 /* Sci_Position.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		286F8E6425F84F7400EC8D60 /* ILexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8E6025F84F7400EC8D60 /* ILexer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		286F8E6525F84F7400EC8D60 /* ILoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8E6125F84F7400EC8D60 /* ILoader.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		286F8E6625F84F7400EC8D60 /* Scintilla.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8E6225F84F7400EC8D60 /* Scintilla.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		286F8EDE260448C300EC8D60 /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8EDB260448C300EC8D60 /* Platform.h */; };
+		286F8EDF260448C300EC8D60 /* Geometry.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 286F8EDC260448C300EC8D60 /* Geometry.cxx */; };
+		286F8EE0260448C300EC8D60 /* Geometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 286F8EDD260448C300EC8D60 /* Geometry.h */; };
+		287F3C6A246F90240040E76F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C69246F90240040E76F /* Cocoa.framework */; };
+		287F3C6C246F90300040E76F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 287F3C6B246F90300040E76F /* QuartzCore.framework */; };
+		28EA9CAE255894B4007710C4 /* CharacterCategoryMap.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */; };
+		28EA9CAF255894B4007710C4 /* CharacterType.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28EA9CAB255894B4007710C4 /* CharacterType.cxx */; };
+		28EA9CB0255894B4007710C4 /* CharacterCategoryMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */; };
+		28EA9CB1255894B4007710C4 /* CharacterType.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EA9CAD255894B4007710C4 /* CharacterType.h */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		282936D324E2D55D00C84BA2 /* QuartzTextLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextLayout.h; path = ../QuartzTextLayout.h; sourceTree = "<group>"; };
+		282936D424E2D55D00C84BA2 /* InfoBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InfoBar.mm; path = ../InfoBar.mm; sourceTree = "<group>"; };
+		282936D524E2D55D00C84BA2 /* QuartzTextStyleAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyleAttribute.h; path = ../QuartzTextStyleAttribute.h; sourceTree = "<group>"; };
+		282936D624E2D55D00C84BA2 /* ScintillaCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaCocoa.h; path = ../ScintillaCocoa.h; sourceTree = "<group>"; };
+		282936D724E2D55D00C84BA2 /* PlatCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatCocoa.mm; path = ../PlatCocoa.mm; sourceTree = "<group>"; };
+		282936D824E2D55D00C84BA2 /* PlatCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatCocoa.h; path = ../PlatCocoa.h; sourceTree = "<group>"; };
+		282936D924E2D55D00C84BA2 /* InfoBarCommunicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoBarCommunicator.h; path = ../InfoBarCommunicator.h; sourceTree = "<group>"; };
+		282936DA24E2D55D00C84BA2 /* InfoBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoBar.h; path = ../InfoBar.h; sourceTree = "<group>"; };
+		282936DB24E2D55D00C84BA2 /* QuartzTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyle.h; path = ../QuartzTextStyle.h; sourceTree = "<group>"; };
+		282936DC24E2D55D00C84BA2 /* ScintillaView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaView.mm; path = ../ScintillaView.mm; sourceTree = "<group>"; };
+		282936DD24E2D55D00C84BA2 /* ScintillaCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScintillaCocoa.mm; path = ../ScintillaCocoa.mm; sourceTree = "<group>"; };
+		282936DE24E2D55D00C84BA2 /* ScintillaView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaView.h; path = ../ScintillaView.h; sourceTree = "<group>"; };
+		282936EB24E2D58400C84BA2 /* DBCS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DBCS.cxx; path = ../../src/DBCS.cxx; sourceTree = "<group>"; };
+		282936EC24E2D58400C84BA2 /* ElapsedPeriod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ElapsedPeriod.h; path = ../../src/ElapsedPeriod.h; sourceTree = "<group>"; };
+		282936ED24E2D58400C84BA2 /* CallTip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CallTip.h; path = ../../src/CallTip.h; sourceTree = "<group>"; };
+		282936EE24E2D58400C84BA2 /* PositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PositionCache.h; path = ../../src/PositionCache.h; sourceTree = "<group>"; };
+		282936EF24E2D58400C84BA2 /* KeyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyMap.h; path = ../../src/KeyMap.h; sourceTree = "<group>"; };
+		282936F024E2D58400C84BA2 /* LineMarker.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LineMarker.cxx; path = ../../src/LineMarker.cxx; sourceTree = "<group>"; };
+		282936F224E2D58400C84BA2 /* Style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Style.h; path = ../../src/Style.h; sourceTree = "<group>"; };
+		282936F324E2D58400C84BA2 /* UniqueString.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UniqueString.cxx; path = ../../src/UniqueString.cxx; sourceTree = "<group>"; };
+		282936F424E2D58400C84BA2 /* RunStyles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RunStyles.h; path = ../../src/RunStyles.h; sourceTree = "<group>"; };
+		282936F524E2D58400C84BA2 /* RESearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RESearch.h; path = ../../src/RESearch.h; sourceTree = "<group>"; };
+		282936F624E2D58400C84BA2 /* Indicator.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Indicator.cxx; path = ../../src/Indicator.cxx; sourceTree = "<group>"; };
+		282936F724E2D58400C84BA2 /* MarginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MarginView.h; path = ../../src/MarginView.h; sourceTree = "<group>"; };
+		282936F824E2D58400C84BA2 /* Position.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Position.h; path = ../../src/Position.h; sourceTree = "<group>"; };
+		282936F924E2D58400C84BA2 /* CaseFolder.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../src/CaseFolder.cxx; sourceTree = "<group>"; };
+		282936FA24E2D58400C84BA2 /* PerLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerLine.h; path = ../../src/PerLine.h; sourceTree = "<group>"; };
+		282936FB24E2D58400C84BA2 /* Indicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Indicator.h; path = ../../src/Indicator.h; sourceTree = "<group>"; };
+		282936FC24E2D58400C84BA2 /* UniConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniConversion.h; path = ../../src/UniConversion.h; sourceTree = "<group>"; };
+		282936FD24E2D58400C84BA2 /* XPM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XPM.cxx; path = ../../src/XPM.cxx; sourceTree = "<group>"; };
+		282936FE24E2D58400C84BA2 /* CharClassify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharClassify.h; path = ../../src/CharClassify.h; sourceTree = "<group>"; };
+		282936FF24E2D58400C84BA2 /* Decoration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Decoration.h; path = ../../src/Decoration.h; sourceTree = "<group>"; };
+		2829370224E2D58500C84BA2 /* PositionCache.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PositionCache.cxx; path = ../../src/PositionCache.cxx; sourceTree = "<group>"; };
+		2829370424E2D58500C84BA2 /* Style.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Style.cxx; path = ../../src/Style.cxx; sourceTree = "<group>"; };
+		2829370524E2D58500C84BA2 /* RESearch.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/RESearch.cxx; sourceTree = "<group>"; };
+		2829370624E2D58500C84BA2 /* CallTip.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/CallTip.cxx; sourceTree = "<group>"; };
+		2829370724E2D58500C84BA2 /* ContractionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContractionState.h; path = ../../src/ContractionState.h; sourceTree = "<group>"; };
+		2829370824E2D58500C84BA2 /* Decoration.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Decoration.cxx; path = ../../src/Decoration.cxx; sourceTree = "<group>"; };
+		2829370924E2D58500C84BA2 /* DBCS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBCS.h; path = ../../src/DBCS.h; sourceTree = "<group>"; };
+		2829370A24E2D58500C84BA2 /* AutoComplete.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoComplete.h; path = ../../src/AutoComplete.h; sourceTree = "<group>"; };
+		2829370B24E2D58500C84BA2 /* KeyMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeyMap.cxx; path = ../../src/KeyMap.cxx; sourceTree = "<group>"; };
+		2829370C24E2D58500C84BA2 /* ViewStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewStyle.h; path = ../../src/ViewStyle.h; sourceTree = "<group>"; };
+		2829370D24E2D58500C84BA2 /* Selection.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Selection.cxx; path = ../../src/Selection.cxx; sourceTree = "<group>"; };
+		2829370E24E2D58500C84BA2 /* ContractionState.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ContractionState.cxx; path = ../../src/ContractionState.cxx; sourceTree = "<group>"; };
+		2829370F24E2D58500C84BA2 /* UniConversion.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UniConversion.cxx; path = ../../src/UniConversion.cxx; sourceTree = "<group>"; };
+		2829371024E2D58500C84BA2 /* PerLine.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerLine.cxx; path = ../../src/PerLine.cxx; sourceTree = "<group>"; };
+		2829371124E2D58500C84BA2 /* SparseVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparseVector.h; path = ../../src/SparseVector.h; sourceTree = "<group>"; };
+		2829371224E2D58500C84BA2 /* EditModel.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditModel.cxx; path = ../../src/EditModel.cxx; sourceTree = "<group>"; };
+		2829371324E2D58600C84BA2 /* EditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditView.h; path = ../../src/EditView.h; sourceTree = "<group>"; };
+		2829371424E2D58600C84BA2 /* CaseConvert.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaseConvert.cxx; path = ../../src/CaseConvert.cxx; sourceTree = "<group>"; };
+		2829371524E2D58600C84BA2 /* CharClassify.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharClassify.cxx; path = ../../src/CharClassify.cxx; sourceTree = "<group>"; };
+		2829371624E2D58600C84BA2 /* AutoComplete.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AutoComplete.cxx; path = ../../src/AutoComplete.cxx; sourceTree = "<group>"; };
+		2829371724E2D58600C84BA2 /* ViewStyle.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewStyle.cxx; path = ../../src/ViewStyle.cxx; sourceTree = "<group>"; };
+		2829371824E2D58600C84BA2 /* MarginView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MarginView.cxx; path = ../../src/MarginView.cxx; sourceTree = "<group>"; };
+		2829371924E2D58600C84BA2 /* CellBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CellBuffer.h; path = ../../src/CellBuffer.h; sourceTree = "<group>"; };
+		2829371A24E2D58600C84BA2 /* Document.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Document.cxx; path = ../../src/Document.cxx; sourceTree = "<group>"; };
+		2829371B24E2D58600C84BA2 /* LineMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineMarker.h; path = ../../src/LineMarker.h; sourceTree = "<group>"; };
+		2829371C24E2D58600C84BA2 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Editor.h; path = ../../src/Editor.h; sourceTree = "<group>"; };
+		2829371D24E2D58600C84BA2 /* XPM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPM.h; path = ../../src/XPM.h; sourceTree = "<group>"; };
+		2829371E24E2D58600C84BA2 /* ScintillaBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScintillaBase.h; path = ../../src/ScintillaBase.h; sourceTree = "<group>"; };
+		2829371F24E2D58700C84BA2 /* Partitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Partitioning.h; path = ../../src/Partitioning.h; sourceTree = "<group>"; };
+		2829372024E2D58700C84BA2 /* FontQuality.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontQuality.h; path = ../../src/FontQuality.h; sourceTree = "<group>"; };
+		2829372124E2D58700C84BA2 /* SplitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitVector.h; path = ../../src/SplitVector.h; sourceTree = "<group>"; };
+		2829372224E2D58700C84BA2 /* UniqueString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniqueString.h; path = ../../src/UniqueString.h; sourceTree = "<group>"; };
+		2829372324E2D58700C84BA2 /* CaseConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseConvert.h; path = ../../src/CaseConvert.h; sourceTree = "<group>"; };
+		2829372424E2D58700C84BA2 /* ScintillaBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScintillaBase.cxx; path = ../../src/ScintillaBase.cxx; sourceTree = "<group>"; };
+		2829372524E2D58700C84BA2 /* CaseFolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaseFolder.h; path = ../../src/CaseFolder.h; sourceTree = "<group>"; };
+		2829372624E2D58700C84BA2 /* CellBuffer.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/CellBuffer.cxx; sourceTree = "<group>"; };
+		2829372724E2D58700C84BA2 /* EditModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditModel.h; path = ../../src/EditModel.h; sourceTree = "<group>"; };
+		2829372824E2D58700C84BA2 /* Editor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Editor.cxx; path = ../../src/Editor.cxx; sourceTree = "<group>"; };
+		2829372924E2D58700C84BA2 /* Selection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Selection.h; path = ../../src/Selection.h; sourceTree = "<group>"; };
+		2829372A24E2D58800C84BA2 /* RunStyles.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RunStyles.cxx; path = ../../src/RunStyles.cxx; sourceTree = "<group>"; };
+		2829372C24E2D58800C84BA2 /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Document.h; path = ../../src/Document.h; sourceTree = "<group>"; };
+		2829372D24E2D58800C84BA2 /* EditView.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditView.cxx; path = ../../src/EditView.cxx; sourceTree = "<group>"; };
+		282937A924E2D60E00C84BA2 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../res; sourceTree = "<group>"; };
+		282937AF24E2D80E00C84BA2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		286F8E5F25F84F7400EC8D60 /* Sci_Position.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sci_Position.h; path = ../../include/Sci_Position.h; sourceTree = "<group>"; };
+		286F8E6025F84F7400EC8D60 /* ILexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ILexer.h; path = ../../include/ILexer.h; sourceTree = "<group>"; };
+		286F8E6125F84F7400EC8D60 /* ILoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ILoader.h; path = ../../include/ILoader.h; sourceTree = "<group>"; };
+		286F8E6225F84F7400EC8D60 /* Scintilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scintilla.h; path = ../../include/Scintilla.h; sourceTree = "<group>"; };
+		286F8EDB260448C300EC8D60 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Platform.h; path = ../../src/Platform.h; sourceTree = "<group>"; };
+		286F8EDC260448C300EC8D60 /* Geometry.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Geometry.cxx; path = ../../src/Geometry.cxx; sourceTree = "<group>"; };
+		286F8EDD260448C300EC8D60 /* Geometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Geometry.h; path = ../../src/Geometry.h; sourceTree = "<group>"; };
+		287F3C41246F8DC70040E76F /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		287F3C69246F90240040E76F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		287F3C6B246F90300040E76F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		287F3E0F246F9AE50040E76F /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = SOURCE_ROOT; };
+		28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterCategoryMap.cxx; path = ../../src/CharacterCategoryMap.cxx; sourceTree = "<group>"; };
+		28EA9CAB255894B4007710C4 /* CharacterType.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CharacterType.cxx; path = ../../src/CharacterType.cxx; sourceTree = "<group>"; };
+		28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterCategoryMap.h; path = ../../src/CharacterCategoryMap.h; sourceTree = "<group>"; };
+		28EA9CAD255894B4007710C4 /* CharacterType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CharacterType.h; path = ../../src/CharacterType.h; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		287F3C3E246F8DC70040E76F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				287F3C6C246F90300040E76F /* QuartzCore.framework in Frameworks */,
+				287F3C6A246F90240040E76F /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		287F3C37246F8DC70040E76F = {
+			isa = PBXGroup;
+			children = (
+				287F3C4D246F8E4A0040E76F /* Backend */,
+				287F3C4E246F8E560040E76F /* Classes */,
+				287F3C4F246F8E6E0040E76F /* Resources */,
+				287F3C42246F8DC70040E76F /* Products */,
+				287F3C68246F90240040E76F /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		287F3C42246F8DC70040E76F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				287F3C41246F8DC70040E76F /* Scintilla.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		287F3C4D246F8E4A0040E76F /* Backend */ = {
+			isa = PBXGroup;
+			children = (
+				2829371624E2D58600C84BA2 /* AutoComplete.cxx */,
+				2829370A24E2D58500C84BA2 /* AutoComplete.h */,
+				2829370624E2D58500C84BA2 /* CallTip.cxx */,
+				282936ED24E2D58400C84BA2 /* CallTip.h */,
+				2829371424E2D58600C84BA2 /* CaseConvert.cxx */,
+				2829372324E2D58700C84BA2 /* CaseConvert.h */,
+				282936F924E2D58400C84BA2 /* CaseFolder.cxx */,
+				2829372524E2D58700C84BA2 /* CaseFolder.h */,
+				2829372624E2D58700C84BA2 /* CellBuffer.cxx */,
+				2829371924E2D58600C84BA2 /* CellBuffer.h */,
+				28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */,
+				28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */,
+				28EA9CAB255894B4007710C4 /* CharacterType.cxx */,
+				28EA9CAD255894B4007710C4 /* CharacterType.h */,
+				2829371524E2D58600C84BA2 /* CharClassify.cxx */,
+				282936FE24E2D58400C84BA2 /* CharClassify.h */,
+				2829370E24E2D58500C84BA2 /* ContractionState.cxx */,
+				2829370724E2D58500C84BA2 /* ContractionState.h */,
+				282936EB24E2D58400C84BA2 /* DBCS.cxx */,
+				2829370924E2D58500C84BA2 /* DBCS.h */,
+				2829370824E2D58500C84BA2 /* Decoration.cxx */,
+				282936FF24E2D58400C84BA2 /* Decoration.h */,
+				2829371A24E2D58600C84BA2 /* Document.cxx */,
+				2829372C24E2D58800C84BA2 /* Document.h */,
+				2829371224E2D58500C84BA2 /* EditModel.cxx */,
+				2829372724E2D58700C84BA2 /* EditModel.h */,
+				2829372824E2D58700C84BA2 /* Editor.cxx */,
+				2829371C24E2D58600C84BA2 /* Editor.h */,
+				2829372D24E2D58800C84BA2 /* EditView.cxx */,
+				2829371324E2D58600C84BA2 /* EditView.h */,
+				282936EC24E2D58400C84BA2 /* ElapsedPeriod.h */,
+				2829372024E2D58700C84BA2 /* FontQuality.h */,
+				286F8EDC260448C300EC8D60 /* Geometry.cxx */,
+				286F8EDD260448C300EC8D60 /* Geometry.h */,
+				286F8E6025F84F7400EC8D60 /* ILexer.h */,
+				286F8E6125F84F7400EC8D60 /* ILoader.h */,
+				282936F624E2D58400C84BA2 /* Indicator.cxx */,
+				282936FB24E2D58400C84BA2 /* Indicator.h */,
+				2829370B24E2D58500C84BA2 /* KeyMap.cxx */,
+				282936EF24E2D58400C84BA2 /* KeyMap.h */,
+				282936F024E2D58400C84BA2 /* LineMarker.cxx */,
+				2829371B24E2D58600C84BA2 /* LineMarker.h */,
+				2829371824E2D58600C84BA2 /* MarginView.cxx */,
+				282936F724E2D58400C84BA2 /* MarginView.h */,
+				2829371F24E2D58700C84BA2 /* Partitioning.h */,
+				2829371024E2D58500C84BA2 /* PerLine.cxx */,
+				282936FA24E2D58400C84BA2 /* PerLine.h */,
+				286F8EDB260448C300EC8D60 /* Platform.h */,
+				282936F824E2D58400C84BA2 /* Position.h */,
+				2829370224E2D58500C84BA2 /* PositionCache.cxx */,
+				282936EE24E2D58400C84BA2 /* PositionCache.h */,
+				2829370524E2D58500C84BA2 /* RESearch.cxx */,
+				282936F524E2D58400C84BA2 /* RESearch.h */,
+				2829372A24E2D58800C84BA2 /* RunStyles.cxx */,
+				282936F424E2D58400C84BA2 /* RunStyles.h */,
+				286F8E5F25F84F7400EC8D60 /* Sci_Position.h */,
+				286F8E6225F84F7400EC8D60 /* Scintilla.h */,
+				2829372424E2D58700C84BA2 /* ScintillaBase.cxx */,
+				2829371E24E2D58600C84BA2 /* ScintillaBase.h */,
+				2829370D24E2D58500C84BA2 /* Selection.cxx */,
+				2829372924E2D58700C84BA2 /* Selection.h */,
+				2829371124E2D58500C84BA2 /* SparseVector.h */,
+				2829372124E2D58700C84BA2 /* SplitVector.h */,
+				2829370424E2D58500C84BA2 /* Style.cxx */,
+				282936F224E2D58400C84BA2 /* Style.h */,
+				2829370F24E2D58500C84BA2 /* UniConversion.cxx */,
+				282936FC24E2D58400C84BA2 /* UniConversion.h */,
+				282936F324E2D58400C84BA2 /* UniqueString.cxx */,
+				2829372224E2D58700C84BA2 /* UniqueString.h */,
+				2829371724E2D58600C84BA2 /* ViewStyle.cxx */,
+				2829370C24E2D58500C84BA2 /* ViewStyle.h */,
+				282936FD24E2D58400C84BA2 /* XPM.cxx */,
+				2829371D24E2D58600C84BA2 /* XPM.h */,
+			);
+			name = Backend;
+			sourceTree = "<group>";
+		};
+		287F3C4E246F8E560040E76F /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				282936DA24E2D55D00C84BA2 /* InfoBar.h */,
+				282936D424E2D55D00C84BA2 /* InfoBar.mm */,
+				282936D924E2D55D00C84BA2 /* InfoBarCommunicator.h */,
+				287F3E0F246F9AE50040E76F /* module.modulemap */,
+				282936D824E2D55D00C84BA2 /* PlatCocoa.h */,
+				282936D724E2D55D00C84BA2 /* PlatCocoa.mm */,
+				282936D324E2D55D00C84BA2 /* QuartzTextLayout.h */,
+				282936DB24E2D55D00C84BA2 /* QuartzTextStyle.h */,
+				282936D524E2D55D00C84BA2 /* QuartzTextStyleAttribute.h */,
+				282936D624E2D55D00C84BA2 /* ScintillaCocoa.h */,
+				282936DD24E2D55D00C84BA2 /* ScintillaCocoa.mm */,
+				282936DE24E2D55D00C84BA2 /* ScintillaView.h */,
+				282936DC24E2D55D00C84BA2 /* ScintillaView.mm */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		287F3C4F246F8E6E0040E76F /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				282937AF24E2D80E00C84BA2 /* Info.plist */,
+				282937A924E2D60E00C84BA2 /* res */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		287F3C68246F90240040E76F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				287F3C6B246F90300040E76F /* QuartzCore.framework */,
+				287F3C69246F90240040E76F /* Cocoa.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		287F3C3C246F8DC70040E76F /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2829374C24E2D58800C84BA2 /* DBCS.h in Headers */,
+				2829373024E2D58800C84BA2 /* CallTip.h in Headers */,
+				2829374224E2D58800C84BA2 /* Decoration.h in Headers */,
+				2829375624E2D58800C84BA2 /* EditView.h in Headers */,
+				2829375424E2D58800C84BA2 /* SparseVector.h in Headers */,
+				286F8E6325F84F7400EC8D60 /* Sci_Position.h in Headers */,
+				2829373224E2D58800C84BA2 /* KeyMap.h in Headers */,
+				2829376324E2D58800C84BA2 /* FontQuality.h in Headers */,
+				2829373E24E2D58800C84BA2 /* Indicator.h in Headers */,
+				286F8EDE260448C300EC8D60 /* Platform.h in Headers */,
+				2829375C24E2D58800C84BA2 /* CellBuffer.h in Headers */,
+				2829373F24E2D58800C84BA2 /* UniConversion.h in Headers */,
+				2829373D24E2D58800C84BA2 /* PerLine.h in Headers */,
+				2829373724E2D58800C84BA2 /* RunStyles.h in Headers */,
+				28EA9CB0255894B4007710C4 /* CharacterCategoryMap.h in Headers */,
+				282936E624E2D55D00C84BA2 /* InfoBar.h in Headers */,
+				2829375E24E2D58800C84BA2 /* LineMarker.h in Headers */,
+				2829376824E2D58800C84BA2 /* CaseFolder.h in Headers */,
+				286F8E6425F84F7400EC8D60 /* ILexer.h in Headers */,
+				2829376524E2D58800C84BA2 /* UniqueString.h in Headers */,
+				2829375F24E2D58800C84BA2 /* Editor.h in Headers */,
+				2829376624E2D58800C84BA2 /* CaseConvert.h in Headers */,
+				2829374F24E2D58800C84BA2 /* ViewStyle.h in Headers */,
+				282936DF24E2D55D00C84BA2 /* QuartzTextLayout.h in Headers */,
+				2829376A24E2D58800C84BA2 /* EditModel.h in Headers */,
+				282936E724E2D55D00C84BA2 /* QuartzTextStyle.h in Headers */,
+				2829376F24E2D58800C84BA2 /* Document.h in Headers */,
+				2829374A24E2D58800C84BA2 /* ContractionState.h in Headers */,
+				2829376024E2D58800C84BA2 /* XPM.h in Headers */,
+				2829372F24E2D58800C84BA2 /* ElapsedPeriod.h in Headers */,
+				28EA9CB1255894B4007710C4 /* CharacterType.h in Headers */,
+				2829373A24E2D58800C84BA2 /* MarginView.h in Headers */,
+				286F8E6525F84F7400EC8D60 /* ILoader.h in Headers */,
+				282936EA24E2D55D00C84BA2 /* ScintillaView.h in Headers */,
+				282936E124E2D55D00C84BA2 /* QuartzTextStyleAttribute.h in Headers */,
+				2829376224E2D58800C84BA2 /* Partitioning.h in Headers */,
+				286F8E6625F84F7400EC8D60 /* Scintilla.h in Headers */,
+				2829376424E2D58800C84BA2 /* SplitVector.h in Headers */,
+				2829373B24E2D58800C84BA2 /* Position.h in Headers */,
+				282936E224E2D55D00C84BA2 /* ScintillaCocoa.h in Headers */,
+				2829373524E2D58800C84BA2 /* Style.h in Headers */,
+				282936E424E2D55D00C84BA2 /* PlatCocoa.h in Headers */,
+				2829376C24E2D58800C84BA2 /* Selection.h in Headers */,
+				2829376124E2D58800C84BA2 /* ScintillaBase.h in Headers */,
+				2829373824E2D58800C84BA2 /* RESearch.h in Headers */,
+				282936E524E2D55D00C84BA2 /* InfoBarCommunicator.h in Headers */,
+				2829374D24E2D58800C84BA2 /* AutoComplete.h in Headers */,
+				2829374124E2D58800C84BA2 /* CharClassify.h in Headers */,
+				2829373124E2D58800C84BA2 /* PositionCache.h in Headers */,
+				286F8EE0260448C300EC8D60 /* Geometry.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		287F3C40246F8DC70040E76F /* Scintilla */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 287F3C49246F8DC70040E76F /* Build configuration list for PBXNativeTarget "Scintilla" */;
+			buildPhases = (
+				287F3C3C246F8DC70040E76F /* Headers */,
+				287F3C3F246F8DC70040E76F /* Resources */,
+				287F3C3D246F8DC70040E76F /* Sources */,
+				287F3C3E246F8DC70040E76F /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Scintilla;
+			productName = Scintilla;
+			productReference = 287F3C41246F8DC70040E76F /* Scintilla.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		287F3C38246F8DC70040E76F /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1200;
+				ORGANIZATIONNAME = "Neil Hodgson";
+				TargetAttributes = {
+					287F3C40246F8DC70040E76F = {
+						CreatedOnToolsVersion = 11.4.1;
+					};
+				};
+			};
+			buildConfigurationList = 287F3C3B246F8DC70040E76F /* Build configuration list for PBXProject "Scintilla" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 287F3C37246F8DC70040E76F;
+			productRefGroup = 287F3C42246F8DC70040E76F /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				287F3C40246F8DC70040E76F /* Scintilla */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		287F3C3F246F8DC70040E76F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				282937AA24E2D60E00C84BA2 /* res in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		287F3C3D246F8DC70040E76F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2829375024E2D58800C84BA2 /* Selection.cxx in Sources */,
+				2829375224E2D58800C84BA2 /* UniConversion.cxx in Sources */,
+				282936E324E2D55D00C84BA2 /* PlatCocoa.mm in Sources */,
+				282936E924E2D55D00C84BA2 /* ScintillaCocoa.mm in Sources */,
+				2829372E24E2D58800C84BA2 /* DBCS.cxx in Sources */,
+				2829375924E2D58800C84BA2 /* AutoComplete.cxx in Sources */,
+				2829375724E2D58800C84BA2 /* CaseConvert.cxx in Sources */,
+				2829374524E2D58800C84BA2 /* PositionCache.cxx in Sources */,
+				2829375B24E2D58800C84BA2 /* MarginView.cxx in Sources */,
+				2829373924E2D58800C84BA2 /* Indicator.cxx in Sources */,
+				2829375D24E2D58800C84BA2 /* Document.cxx in Sources */,
+				2829375524E2D58800C84BA2 /* EditModel.cxx in Sources */,
+				2829375124E2D58800C84BA2 /* ContractionState.cxx in Sources */,
+				2829374924E2D58800C84BA2 /* CallTip.cxx in Sources */,
+				2829375824E2D58800C84BA2 /* CharClassify.cxx in Sources */,
+				2829373324E2D58800C84BA2 /* LineMarker.cxx in Sources */,
+				2829374E24E2D58800C84BA2 /* KeyMap.cxx in Sources */,
+				2829376D24E2D58800C84BA2 /* RunStyles.cxx in Sources */,
+				28EA9CAF255894B4007710C4 /* CharacterType.cxx in Sources */,
+				2829376B24E2D58800C84BA2 /* Editor.cxx in Sources */,
+				2829373C24E2D58800C84BA2 /* CaseFolder.cxx in Sources */,
+				2829374824E2D58800C84BA2 /* RESearch.cxx in Sources */,
+				2829377024E2D58800C84BA2 /* EditView.cxx in Sources */,
+				2829376724E2D58800C84BA2 /* ScintillaBase.cxx in Sources */,
+				2829374724E2D58800C84BA2 /* Style.cxx in Sources */,
+				2829375A24E2D58800C84BA2 /* ViewStyle.cxx in Sources */,
+				282936E024E2D55D00C84BA2 /* InfoBar.mm in Sources */,
+				28EA9CAE255894B4007710C4 /* CharacterCategoryMap.cxx in Sources */,
+				2829374024E2D58800C84BA2 /* XPM.cxx in Sources */,
+				2829374B24E2D58800C84BA2 /* Decoration.cxx in Sources */,
+				286F8EDF260448C300EC8D60 /* Geometry.cxx in Sources */,
+				2829373624E2D58800C84BA2 /* UniqueString.cxx in Sources */,
+				282936E824E2D55D00C84BA2 /* ScintillaView.mm in Sources */,
+				2829376924E2D58800C84BA2 /* CellBuffer.cxx in Sources */,
+				2829375324E2D58800C84BA2 /* PerLine.cxx in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		287F3C47246F8DC70040E76F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					DEBUG,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		287F3C48246F8DC70040E76F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = macosx;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		287F3C4A246F8DC70040E76F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../src,
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = org.scintilla.Scintilla;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		287F3C4B246F8DC70040E76F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
+				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 5.1.1;
+				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_PREPROCESSOR_DEFINITIONS = NDEBUG;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../src,
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				PRODUCT_BUNDLE_IDENTIFIER = org.scintilla.Scintilla;
+				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		287F3C3B246F8DC70040E76F /* Build configuration list for PBXProject "Scintilla" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				287F3C47246F8DC70040E76F /* Debug */,
+				287F3C48246F8DC70040E76F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		287F3C49246F8DC70040E76F /* Build configuration list for PBXNativeTarget "Scintilla" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				287F3C4A246F8DC70040E76F /* Debug */,
+				287F3C4B246F8DC70040E76F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 287F3C38246F8DC70040E76F /* Project object */;
+}
diff --git a/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..e54af03
--- /dev/null
+++ b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Scintilla.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/scite-app/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/scite-app/scintilla/cocoa/Scintilla/module.modulemap b/scite-app/scintilla/cocoa/Scintilla/module.modulemap
new file mode 100644
index 0000000..d09ce2e
--- /dev/null
+++ b/scite-app/scintilla/cocoa/Scintilla/module.modulemap
@@ -0,0 +1,10 @@
+framework module Scintilla {
+  umbrella header "ScintillaView.h"
+  module InfoBar {
+    header "InfoBar.h"
+  }
+  // ILexer.h is not included as Swift doesn't yet interoperate with C++
+  exclude header "ILexer.h"
+  export *
+  module * { export * }
+}
diff --git a/scite-app/scintilla/cocoa/ScintillaCocoa.h b/scite-app/scintilla/cocoa/ScintillaCocoa.h
new file mode 100644
index 0000000..00a0fbc
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaCocoa.h
@@ -0,0 +1,264 @@
+/*
+ * ScintillaCocoa.h
+ *
+ * Mike Lischke <mlischke@sun.com>
+ *
+ * Based on ScintillaMacOSX.h
+ * Original code by Evan Jones on Sun Sep 01 2002.
+ *  Contributors:
+ *  Shane Caraveo, ActiveState
+ *  Bernd Paradies, Adobe
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdio>
+#include <ctime>
+
+#include <stdexcept>
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "DBCS.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+extern "C" NSString *ScintillaRecPboardType;
+
+@class SCIContentView;
+@class SCIMarginView;
+@class ScintillaView;
+
+@class FindHighlightLayer;
+
+/**
+ * Helper class to be used as timer target (NSTimer).
+ */
+@interface TimerTarget : NSObject {
+	void *mTarget;
+	NSNotificationQueue *notificationQueue;
+}
+- (id) init: (void *) target;
+- (void) timerFired: (NSTimer *) timer;
+- (void) idleTimerFired: (NSTimer *) timer;
+- (void) idleTriggered: (NSNotification *) notification;
+@end
+
+namespace Scintilla::Internal {
+
+/**
+ * Main scintilla class, implemented for OS X (Cocoa).
+ */
+class ScintillaCocoa : public ScintillaBase {
+private:
+	ScintillaView *sciView;
+	TimerTarget *timerTarget;
+	NSEvent *lastMouseEvent;
+
+	id<ScintillaNotificationProtocol> delegate;
+
+	SciNotifyFunc	notifyProc;
+	intptr_t notifyObj;
+
+	bool capturedMouse;
+	bool isFirstResponder;
+	bool isActive;
+
+	bool enteredSetScrollingSize;
+
+	bool GetPasteboardData(NSPasteboard *board, SelectionText *selectedText);
+	void SetPasteboardData(NSPasteboard *board, const SelectionText &selectedText);
+	Sci::Position TargetAsUTF8(char *text) const;
+	Sci::Position EncodedFromUTF8(const char *utf8, char *encoded) const;
+
+	int scrollSpeed;
+	int scrollTicks;
+	CFRunLoopObserverRef observer;
+
+	FindHighlightLayer *layerFindIndicator;
+
+protected:
+	Point GetVisibleOriginInMain() const override;
+	PRectangle GetClientRectangle() const override;
+	PRectangle GetClientDrawingRectangle() override;
+	Point ConvertPoint(NSPoint point);
+	void RedrawRect(PRectangle rc) override;
+	void DiscardOverdraw() override;
+	void Redraw() override;
+
+	void Init();
+	std::unique_ptr<CaseFolder> CaseFolderForEncoding() override;
+	std::string CaseMapString(const std::string &s, CaseMapping caseMapping) override;
+	void CancelModes() override;
+
+public:
+	ScintillaCocoa(ScintillaView *sciView_, SCIContentView *viewContent, SCIMarginView *viewMargin);
+	// Deleted so ScintillaCocoa objects can not be copied.
+	ScintillaCocoa(const ScintillaCocoa &) = delete;
+	ScintillaCocoa &operator=(const ScintillaCocoa &) = delete;
+	~ScintillaCocoa() override;
+	void Finalise() override;
+
+	void SetDelegate(id<ScintillaNotificationProtocol> delegate_);
+	void RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback);
+	sptr_t WndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override;
+
+	NSScrollView *ScrollContainer() const;
+	SCIContentView *ContentView();
+
+	bool SyncPaint(void *gc, PRectangle rc);
+	bool Draw(NSRect rect, CGContextRef gc);
+	void PaintMargin(NSRect aRect);
+
+	sptr_t DefWndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override;
+	void TickFor(TickReason reason) override;
+	bool FineTickerRunning(TickReason reason) override;
+	void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+	void FineTickerCancel(TickReason reason) override;
+	bool SetIdle(bool on) override;
+	void SetMouseCapture(bool on) override;
+	bool HaveMouseCapture() override;
+	void WillDraw(NSRect rect);
+	void ScrollText(Sci::Line linesToMove) override;
+	void SetVerticalScrollPos() override;
+	void SetHorizontalScrollPos() override;
+	bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override;
+	bool SetScrollingSize(void);
+	void Resize();
+	void UpdateForScroll();
+
+	// Notifications for the owner.
+	void NotifyChange() override;
+	void NotifyFocus(bool focus) override;
+	void NotifyParent(Scintilla::NotificationData scn) override;
+	void NotifyURIDropped(const char *uri);
+
+	bool HasSelection();
+	bool CanUndo();
+	bool CanRedo();
+	void CopyToClipboard(const SelectionText &selectedText) override;
+	void Copy() override;
+	bool CanPaste() override;
+	void Paste() override;
+	void Paste(bool rectangular);
+	void CTPaint(void *gc, NSRect rc);
+	void CallTipMouseDown(NSPoint pt);
+	void CreateCallTipWindow(PRectangle rc) override;
+	void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+	void ClaimSelection() override;
+
+	NSPoint GetCaretPosition();
+
+	std::string UTF8FromEncoded(std::string_view encoded) const override;
+	std::string EncodedFromUTF8(std::string_view utf8) const override;
+
+	static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	static sptr_t DirectStatusFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus);
+
+	NSTimer *timers[static_cast<size_t>(TickReason::platform)+1];
+	void TimerFired(NSTimer *timer);
+	void IdleTimerFired();
+	static void UpdateObserver(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *sci);
+	void ObserverAdd();
+	void ObserverRemove();
+	void IdleWork() override;
+	void QueueIdleWork(WorkItems items, Sci::Position upTo) override;
+	ptrdiff_t InsertText(NSString *input, Scintilla::CharacterSource charSource);
+	NSRange PositionsFromCharacters(NSRange rangeCharacters) const;
+	NSRange CharactersFromPositions(NSRange rangePositions) const;
+	NSString *RangeTextAsString(NSRange rangePositions) const;
+	NSInteger VisibleLineForIndex(NSInteger index);
+	NSRange RangeForVisibleLine(NSInteger lineVisible);
+	NSRect FrameForRange(NSRange rangeCharacters);
+	NSRect GetBounds() const;
+	void SelectOnlyMainSelection();
+	void ConvertSelectionVirtualSpace();
+	bool ClearAllSelections();
+	void CompositionStart();
+	void CompositionCommit();
+	void CompositionUndo();
+	void SetDocPointer(Document *document) override;
+
+	bool KeyboardInput(NSEvent *event);
+	void MouseDown(NSEvent *event);
+	void RightMouseDown(NSEvent *event);
+	void MouseMove(NSEvent *event);
+	void MouseUp(NSEvent *event);
+	void MouseEntered(NSEvent *event);
+	void MouseExited(NSEvent *event);
+	void MouseWheel(NSEvent *event);
+
+	// Drag and drop
+	void StartDrag() override;
+	bool GetDragData(id <NSDraggingInfo> info, NSPasteboard &pasteBoard, SelectionText *selectedText);
+	NSDragOperation DraggingEntered(id <NSDraggingInfo> info);
+	NSDragOperation DraggingUpdated(id <NSDraggingInfo> info);
+	void DraggingExited(id <NSDraggingInfo> info);
+	bool PerformDragOperation(id <NSDraggingInfo> info);
+	void DragScroll();
+
+	// Promote some methods needed for NSResponder actions.
+	void SelectAll() override;
+	void DeleteBackward();
+	void Cut() override;
+	void Undo() override;
+	void Redo() override;
+
+	bool ShouldDisplayPopupOnMargin();
+	bool ShouldDisplayPopupOnText();
+	NSMenu *CreateContextMenu(NSEvent *event);
+	void HandleCommand(NSInteger command);
+
+	void SetFirstResponder(bool isFirstResponder_);
+	void ActiveStateChanged(bool isActive_);
+	void SetFocusActiveState();
+	void UpdateBaseElements() override;
+
+	void WindowWillMove();
+
+	// Find indicator
+	void ShowFindIndicatorForRange(NSRange charRange, BOOL retaining);
+	void MoveFindIndicatorWithBounce(BOOL bounce);
+	void HideFindIndicator();
+};
+
+
+}
+
+
diff --git a/scite-app/scintilla/cocoa/ScintillaCocoa.mm b/scite-app/scintilla/cocoa/ScintillaCocoa.mm
new file mode 100644
index 0000000..242cd41
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaCocoa.mm
@@ -0,0 +1,2711 @@
+
+/**
+ * Scintilla source code edit control
+ * @file ScintillaCocoa.mm - Cocoa subclass of ScintillaBase
+ *
+ * Written by Mike Lischke <mlischke@sun.com>
+ *
+ * Loosely based on ScintillaMacOSX.cxx.
+ * Copyright 2003 by Evan Jones <ejones@uwaterloo.ca>
+ * Based on ScintillaGTK.cxx Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed.
+  *
+ * Copyright (c) 2009, 2010 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#include <cmath>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+
+#import <Cocoa/Cocoa.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+#import <QuartzCore/CAGradientLayer.h>
+#endif
+#import <QuartzCore/CAAnimation.h>
+#import <QuartzCore/CATransaction.h>
+
+#import "ScintillaTypes.h"
+#import "ScintillaMessages.h"
+#import "ScintillaStructures.h"
+
+#import "Debugging.h"
+#import "Geometry.h"
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+NSString *ScintillaRecPboardType = @"com.scintilla.utf16-plain-text.rectangular";
+
+//--------------------------------------------------------------------------------------------------
+
+// Define keyboard shortcuts (equivalents) the Mac way.
+#define SCI_CMD ( SCI_CTRL)
+#define SCI_SCMD ( SCI_CMD | SCI_SHIFT)
+#define SCI_SMETA ( SCI_META | SCI_SHIFT)
+
+namespace {
+
+constexpr Keys Key(char ch) {
+    return static_cast<Keys>(ch);
+}
+
+}
+
+static const KeyToCommand macMapDefault[] = {
+	// OS X specific
+	{Keys::Down,      SCI_CTRL,   Message::DocumentEnd},
+	{Keys::Down,      SCI_CSHIFT, Message::DocumentEndExtend},
+	{Keys::Up,        SCI_CTRL,   Message::DocumentStart},
+	{Keys::Up,        SCI_CSHIFT, Message::DocumentStartExtend},
+	{Keys::Left,      SCI_CTRL,   Message::VCHome},
+	{Keys::Left,      SCI_CSHIFT, Message::VCHomeExtend},
+	{Keys::Right,     SCI_CTRL,   Message::LineEnd},
+	{Keys::Right,     SCI_CSHIFT, Message::LineEndExtend},
+
+	// Similar to Windows and GTK+
+	// Where equivalent clashes with OS X standard, use Meta instead
+	{Keys::Down,      SCI_NORM,   Message::LineDown},
+	{Keys::Down,      SCI_SHIFT,  Message::LineDownExtend},
+	{Keys::Down,      SCI_META,   Message::LineScrollDown},
+	{Keys::Down,      SCI_ASHIFT, Message::LineDownRectExtend},
+	{Keys::Up,        SCI_NORM,   Message::LineUp},
+	{Keys::Up,        SCI_SHIFT,  Message::LineUpExtend},
+	{Keys::Up,        SCI_META,   Message::LineScrollUp},
+	{Keys::Up,        SCI_ASHIFT, Message::LineUpRectExtend},
+	{Key('['),           SCI_CTRL,   Message::ParaUp},
+	{Key('['),           SCI_CSHIFT, Message::ParaUpExtend},
+	{Key(']'),           SCI_CTRL,   Message::ParaDown},
+	{Key(']'),           SCI_CSHIFT, Message::ParaDownExtend},
+	{Keys::Left,      SCI_NORM,   Message::CharLeft},
+	{Keys::Left,      SCI_SHIFT,  Message::CharLeftExtend},
+	{Keys::Left,      SCI_ALT,    Message::WordLeft},
+	{Keys::Left,      SCI_META,   Message::WordLeft},
+	{Keys::Left,      SCI_SMETA,  Message::WordLeftExtend},
+	{Keys::Left,      SCI_ASHIFT, Message::CharLeftRectExtend},
+	{Keys::Right,     SCI_NORM,   Message::CharRight},
+	{Keys::Right,     SCI_SHIFT,  Message::CharRightExtend},
+	{Keys::Right,     SCI_ALT,    Message::WordRight},
+	{Keys::Right,     SCI_META,   Message::WordRight},
+	{Keys::Right,     SCI_SMETA,  Message::WordRightExtend},
+	{Keys::Right,     SCI_ASHIFT, Message::CharRightRectExtend},
+	{Key('/'),           SCI_CTRL,   Message::WordPartLeft},
+	{Key('/'),           SCI_CSHIFT, Message::WordPartLeftExtend},
+	{Key('\\'),          SCI_CTRL,   Message::WordPartRight},
+	{Key('\\'),          SCI_CSHIFT, Message::WordPartRightExtend},
+	{Keys::Home,      SCI_NORM,   Message::VCHome},
+	{Keys::Home,      SCI_SHIFT,  Message::VCHomeExtend},
+	{Keys::Home,      SCI_CTRL,   Message::DocumentStart},
+	{Keys::Home,      SCI_CSHIFT, Message::DocumentStartExtend},
+	{Keys::Home,      SCI_ALT,    Message::HomeDisplay},
+	{Keys::Home,      SCI_ASHIFT, Message::VCHomeRectExtend},
+	{Keys::End,       SCI_NORM,   Message::LineEnd},
+	{Keys::End,       SCI_SHIFT,  Message::LineEndExtend},
+	{Keys::End,       SCI_CTRL,   Message::DocumentEnd},
+	{Keys::End,       SCI_CSHIFT, Message::DocumentEndExtend},
+	{Keys::End,       SCI_ALT,    Message::LineEndDisplay},
+	{Keys::End,       SCI_ASHIFT, Message::LineEndRectExtend},
+	{Keys::Prior,     SCI_NORM,   Message::PageUp},
+	{Keys::Prior,     SCI_SHIFT,  Message::PageUpExtend},
+	{Keys::Prior,     SCI_ASHIFT, Message::PageUpRectExtend},
+	{Keys::Next,      SCI_NORM,   Message::PageDown},
+	{Keys::Next,      SCI_SHIFT,  Message::PageDownExtend},
+	{Keys::Next,      SCI_ASHIFT, Message::PageDownRectExtend},
+	{Keys::Delete,    SCI_NORM,   Message::Clear},
+	{Keys::Delete,    SCI_SHIFT,  Message::Cut},
+	{Keys::Delete,    SCI_CTRL,   Message::DelWordRight},
+	{Keys::Delete,    SCI_CSHIFT, Message::DelLineRight},
+	{Keys::Insert,    SCI_NORM,   Message::EditToggleOvertype},
+	{Keys::Insert,    SCI_SHIFT,  Message::Paste},
+	{Keys::Insert,    SCI_CTRL,   Message::Copy},
+	{Keys::Escape,    SCI_NORM,   Message::Cancel},
+	{Keys::Back,      SCI_NORM,   Message::DeleteBack},
+	{Keys::Back,      SCI_SHIFT,  Message::DeleteBack},
+	{Keys::Back,      SCI_CTRL,   Message::DelWordLeft},
+	{Keys::Back,      SCI_ALT,    Message::DelWordLeft},
+	{Keys::Back,      SCI_CSHIFT, Message::DelLineLeft},
+	{Key('z'),           SCI_CMD,    Message::Undo},
+	{Key('z'),           SCI_SCMD,   Message::Redo},
+	{Key('x'),           SCI_CMD,    Message::Cut},
+	{Key('c'),           SCI_CMD,    Message::Copy},
+	{Key('v'),           SCI_CMD,    Message::Paste},
+	{Key('a'),           SCI_CMD,    Message::SelectAll},
+	{Keys::Tab,       SCI_NORM,   Message::Tab},
+	{Keys::Tab,       SCI_SHIFT,  Message::BackTab},
+	{Keys::Return,    SCI_NORM,   Message::NewLine},
+	{Keys::Return,    SCI_SHIFT,  Message::NewLine},
+	{Keys::Add,       SCI_CMD,    Message::ZoomIn},
+	{Keys::Subtract,  SCI_CMD,    Message::ZoomOut},
+	{Keys::Divide,    SCI_CMD,    Message::SetZoom},
+	{Key('l'),           SCI_CMD,    Message::LineCut},
+	{Key('l'),           SCI_CSHIFT, Message::LineDelete},
+	{Key('t'),           SCI_CSHIFT, Message::LineCopy},
+	{Key('t'),           SCI_CTRL,   Message::LineTranspose},
+	{Key('d'),           SCI_CTRL,   Message::SelectionDuplicate},
+	{Key('u'),           SCI_CTRL,   Message::LowerCase},
+	{Key('u'),           SCI_CSHIFT, Message::UpperCase},
+	{Key(0), KeyMod::Norm, static_cast<Message>(0)},
+};
+
+//--------------------------------------------------------------------------------------------------
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+
+// Only implement FindHighlightLayer on OS X 10.6+
+
+/**
+ * Class to display the animated gold roundrect used on OS X for matches.
+ */
+@interface FindHighlightLayer : CAGradientLayer {
+@private
+	NSString *sFind;
+	long positionFind;
+	BOOL retaining;
+	CGFloat widthText;
+	CGFloat heightLine;
+	NSString *sFont;
+	CGFloat fontSize;
+}
+
+@property(copy) NSString *sFind;
+@property(assign) long positionFind;
+@property(assign) BOOL retaining;
+@property(assign) CGFloat widthText;
+@property(assign) CGFloat heightLine;
+@property(copy) NSString *sFont;
+@property(assign) CGFloat fontSize;
+
+- (void) animateMatch: (CGPoint) ptText bounce: (BOOL) bounce;
+- (void) hideMatch;
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation FindHighlightLayer
+
+@synthesize sFind, positionFind, retaining, widthText, heightLine, sFont, fontSize;
+
+- (id) init {
+	if (self = [super init]) {
+		[self setNeedsDisplayOnBoundsChange: YES];
+		// A gold to slightly redder gradient to match other applications
+		CGColorRef colGold = CGColorCreateGenericRGB(1.0, 1.0, 0, 1.0);
+		CGColorRef colGoldRed = CGColorCreateGenericRGB(1.0, 0.8, 0, 1.0);
+		self.colors = @[(__bridge id)colGoldRed, (__bridge id)colGold];
+		CGColorRelease(colGoldRed);
+		CGColorRelease(colGold);
+
+		CGColorRef colGreyBorder = CGColorCreateGenericGray(0.756f, 0.5f);
+		self.borderColor = colGreyBorder;
+		CGColorRelease(colGreyBorder);
+
+		self.borderWidth = 1.0;
+		self.cornerRadius = 5.0f;
+		self.shadowRadius = 1.0f;
+		self.shadowOpacity = 0.9f;
+		self.shadowOffset = CGSizeMake(0.0f, -2.0f);
+		self.anchorPoint = CGPointMake(0.5, 0.5);
+	}
+	return self;
+
+}
+
+
+const CGFloat paddingHighlightX = 4;
+const CGFloat paddingHighlightY = 2;
+
+- (void) drawInContext: (CGContextRef) context {
+	if (!sFind || !sFont)
+		return;
+
+	CFStringRef str = (__bridge CFStringRef)(sFind);
+
+	CFMutableDictionaryRef styleDict = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+					   &kCFTypeDictionaryKeyCallBacks,
+					   &kCFTypeDictionaryValueCallBacks);
+	CGColorRef color = CGColorCreateGenericRGB(0.0, 0.0, 0.0, 1.0);
+	CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, color);
+	CTFontRef fontRef = ::CTFontCreateWithName((CFStringRef)sFont, fontSize, NULL);
+	CFDictionaryAddValue(styleDict, kCTFontAttributeName, fontRef);
+
+	CFAttributedStringRef attrString = ::CFAttributedStringCreate(NULL, str, styleDict);
+	CTLineRef textLine = ::CTLineCreateWithAttributedString(attrString);
+	// Indent from corner of bounds
+	CGContextSetTextPosition(context, paddingHighlightX, 3 + paddingHighlightY);
+	CTLineDraw(textLine, context);
+
+	CFRelease(textLine);
+	CFRelease(attrString);
+	CFRelease(fontRef);
+	CGColorRelease(color);
+	CFRelease(styleDict);
+}
+
+- (void) animateMatch: (CGPoint) ptText bounce: (BOOL) bounce {
+	if (!self.sFind || !(self.sFind).length) {
+		[self hideMatch];
+		return;
+	}
+
+	CGFloat width = self.widthText + paddingHighlightX * 2;
+	CGFloat height = self.heightLine + paddingHighlightY * 2;
+
+	CGFloat flipper = self.geometryFlipped ? -1.0 : 1.0;
+
+	// Adjust for padding
+	ptText.x -= paddingHighlightX;
+	ptText.y += flipper * paddingHighlightY;
+
+	// Shift point to centre as expanding about centre
+	ptText.x += width / 2.0;
+	ptText.y -= flipper * height / 2.0;
+
+	[CATransaction begin];
+	[CATransaction setValue: @0.0f forKey: kCATransactionAnimationDuration];
+	self.bounds = CGRectMake(0, 0, width, height);
+	self.position = ptText;
+	if (bounce) {
+		// Do not reset visibility when just moving
+		self.hidden = NO;
+		self.opacity = 1.0;
+	}
+	[self setNeedsDisplay];
+	[CATransaction commit];
+
+	if (bounce) {
+		CABasicAnimation *animBounce = [CABasicAnimation animationWithKeyPath: @"transform.scale"];
+		animBounce.duration = 0.15;
+		animBounce.autoreverses = YES;
+		animBounce.removedOnCompletion = NO;
+		animBounce.fromValue = @1.0f;
+		animBounce.toValue = @1.25f;
+
+		if (self.retaining) {
+
+			[self addAnimation: animBounce forKey: @"animateFound"];
+
+		} else {
+
+			CABasicAnimation *animFade = [CABasicAnimation animationWithKeyPath: @"opacity"];
+			animFade.duration = 0.1;
+			animFade.beginTime = 0.4;
+			animFade.removedOnCompletion = NO;
+			animFade.fromValue = @1.0f;
+			animFade.toValue = @0.0f;
+
+			CAAnimationGroup *group = [CAAnimationGroup animation];
+			group.duration = 0.5;
+			group.removedOnCompletion = NO;
+			group.fillMode = kCAFillModeForwards;
+			group.animations = @[animBounce, animFade];
+
+			[self addAnimation: group forKey: @"animateFound"];
+		}
+	}
+}
+
+- (void) hideMatch {
+	self.sFind = @"";
+	self.positionFind = Sci::invalidPosition;
+	self.hidden = YES;
+}
+
+@end
+
+#endif
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation TimerTarget
+
+- (id) init: (void *) target {
+	self = [super init];
+	if (self != nil) {
+		mTarget = target;
+
+		// Get the default notification queue for the thread which created the instance (usually the
+		// main thread). We need that later for idle event processing.
+		NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+		notificationQueue = [[NSNotificationQueue alloc] initWithNotificationCenter: center];
+		[center addObserver: self selector: @selector(idleTriggered:) name: @"Idle" object: self];
+	}
+	return self;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) dealloc {
+	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+	[center removeObserver: self];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Method called by owning ScintillaCocoa object when it is destroyed.
+ */
+- (void) ownerDestroyed {
+	mTarget = NULL;
+	notificationQueue = nil;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Method called by a timer installed by ScintillaCocoa. This two step approach is needed because
+ * a native Obj-C class is required as target for the timer.
+ */
+- (void) timerFired: (NSTimer *) timer {
+	if (mTarget)
+		static_cast<ScintillaCocoa *>(mTarget)->TimerFired(timer);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Another timer callback for the idle timer.
+ */
+- (void) idleTimerFired: (NSTimer *) timer {
+#pragma unused(timer)
+	// Idle timer event.
+	// Post a new idle notification, which gets executed when the run loop is idle.
+	// Since we are coalescing on name and sender there will always be only one actual notification
+	// even for multiple requests.
+	NSNotification *notification = [NSNotification notificationWithName: @"Idle" object: self];
+	[notificationQueue enqueueNotification: notification
+				  postingStyle: NSPostWhenIdle
+				  coalesceMask: (NSNotificationCoalescingOnName | NSNotificationCoalescingOnSender)
+				      forModes: @[NSDefaultRunLoopMode, NSModalPanelRunLoopMode]];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Another step for idle events. The timer (for idle events) simply requests a notification on
+ * idle time. Only when this notification is send we actually call back the editor.
+ */
+- (void) idleTriggered: (NSNotification *) notification {
+#pragma unused(notification)
+	if (mTarget)
+		static_cast<ScintillaCocoa *>(mTarget)->IdleTimerFired();
+}
+
+@end
+
+//----------------- ScintillaCocoa -----------------------------------------------------------------
+
+ScintillaCocoa::ScintillaCocoa(ScintillaView *sciView_, SCIContentView *viewContent, SCIMarginView *viewMargin) {
+	vs.marginInside = false;
+
+	// Don't retain since we're owned by view, which would cause a cycle
+	sciView = sciView_;
+	wMain = (__bridge WindowID)viewContent;
+	wMargin = (__bridge WindowID)viewMargin;
+
+	timerTarget = [[TimerTarget alloc] init: this];
+	lastMouseEvent = NULL;
+	delegate = NULL;
+	notifyObj = NULL;
+	notifyProc = NULL;
+	capturedMouse = false;
+	isFirstResponder = false;
+	isActive = false;
+	enteredSetScrollingSize = false;
+	scrollSpeed = 1;
+	scrollTicks = 2000;
+	observer = NULL;
+	layerFindIndicator = NULL;
+	imeInteraction = IMEInteraction::Inline;
+	std::fill(timers, std::end(timers), nil);
+	Init();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+ScintillaCocoa::~ScintillaCocoa() {
+	[timerTarget ownerDestroyed];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Core initialization of the control. Everything that needs to be set up happens here.
+ */
+void ScintillaCocoa::Init() {
+
+	// Tell Scintilla not to buffer: Quartz buffers drawing for us.
+	WndProc(Message::SetBufferedDraw, 0, 0);
+
+	// We are working with Unicode exclusively.
+	WndProc(Message::SetCodePage, SC_CP_UTF8, 0);
+
+	// Add Mac specific key bindings.
+	for (int i = 0; static_cast<int>(macMapDefault[i].key); i++)
+		kmap.AssignCmdKey(macMapDefault[i].key, macMapDefault[i].modifiers, macMapDefault[i].msg);
+
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * We need some clean up. Do it here.
+ */
+void ScintillaCocoa::Finalise() {
+	ObserverRemove();
+	for (size_t tr=static_cast<size_t>(TickReason::caret); tr<=static_cast<size_t>(TickReason::platform); tr++) {
+		FineTickerCancel(static_cast<TickReason>(tr));
+	}
+	ScintillaBase::Finalise();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::UpdateObserver(CFRunLoopObserverRef /* observer */, CFRunLoopActivity /* activity */, void *info) {
+	ScintillaCocoa *sci = static_cast<ScintillaCocoa *>(info);
+	sci->IdleWork();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Add an observer to the run loop to perform styling as high-priority idle task.
+ */
+
+void ScintillaCocoa::ObserverAdd() {
+	if (!observer) {
+		CFRunLoopObserverContext context;
+		context.version = 0;
+		context.info = this;
+		context.retain = NULL;
+		context.release = NULL;
+		context.copyDescription = NULL;
+
+		CFRunLoopRef mainRunLoop = CFRunLoopGetMain();
+		observer = CFRunLoopObserverCreate(NULL, kCFRunLoopEntry | kCFRunLoopBeforeWaiting,
+						   true, 0, UpdateObserver, &context);
+		CFRunLoopAddObserver(mainRunLoop, observer, kCFRunLoopCommonModes);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Remove the run loop observer.
+ */
+void ScintillaCocoa::ObserverRemove() {
+	if (observer) {
+		CFRunLoopRef mainRunLoop = CFRunLoopGetMain();
+		CFRunLoopRemoveObserver(mainRunLoop, observer, kCFRunLoopCommonModes);
+		CFRelease(observer);
+	}
+	observer = NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::IdleWork() {
+	Editor::IdleWork();
+	ObserverRemove();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::QueueIdleWork(WorkItems items, Sci::Position upTo) {
+	Editor::QueueIdleWork(items, upTo);
+	ObserverAdd();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convert a Core Foundation string into a std::string in a particular encoding.
+ */
+
+static std::string EncodedBytesString(CFStringRef cfsRef, CFStringEncoding encoding) {
+	const CFRange rangeAll = {0, CFStringGetLength(cfsRef)};
+	CFIndex usedLen = 0;
+	CFStringGetBytes(cfsRef, rangeAll, encoding, '?', false,
+			 NULL, 0, &usedLen);
+
+	std::string buffer(usedLen, '\0');
+	if (usedLen > 0) {
+		CFStringGetBytes(cfsRef, rangeAll, encoding, '?', false,
+				 reinterpret_cast<UInt8 *>(&buffer[0]), usedLen, NULL);
+	}
+	return buffer;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Create a Core Foundation string from a string.
+ * This is a simple wrapper that specifies common arguments (the default allocator and
+ * false for isExternalRepresentation) and avoids casting since strings in Scintilla
+ * contain char, not UInt8 (unsigned char).
+ */
+
+static CFStringRef CFStringFromString(const char *s, size_t len, CFStringEncoding encoding) {
+	return CFStringCreateWithBytes(kCFAllocatorDefault,
+				       reinterpret_cast<const UInt8 *>(s),
+				       len, encoding, false);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Case folders.
+ */
+
+class CaseFolderDBCS : public CaseFolderTable {
+	CFStringEncoding encoding;
+public:
+	explicit CaseFolderDBCS(CFStringEncoding encoding_) : encoding(encoding_) {
+		StandardASCII();
+	}
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
+		if ((lenMixed == 1) && (sizeFolded > 0)) {
+			folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
+			return 1;
+		} else {
+			CFStringRef cfsVal = CFStringFromString(mixed, lenMixed, encoding);
+			if (!cfsVal) {
+				folded[0] = '\0';
+				return 1;
+			}
+
+			NSString *sMapped = [(__bridge NSString *)cfsVal stringByFoldingWithOptions: NSCaseInsensitiveSearch
+											     locale: [NSLocale currentLocale]];
+
+			std::string encoded = EncodedBytesString((__bridge CFStringRef)sMapped, encoding);
+
+			size_t lenMapped = encoded.length();
+			if (lenMapped < sizeFolded) {
+				memcpy(folded, encoded.c_str(), lenMapped);
+			} else {
+				folded[0] = '\0';
+				lenMapped = 1;
+			}
+			CFRelease(cfsVal);
+			return lenMapped;
+		}
+	}
+};
+
+std::unique_ptr<CaseFolder> ScintillaCocoa::CaseFolderForEncoding() {
+	if (pdoc->dbcsCodePage == SC_CP_UTF8) {
+		return std::make_unique<CaseFolderUnicode>();
+	} else {
+		CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+					    vs.styles[StyleDefault].characterSet);
+		if (pdoc->dbcsCodePage == 0) {
+			std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>();
+			pcf->StandardASCII();
+			// Only for single byte encodings
+			for (int i=0x80; i<0x100; i++) {
+				char sCharacter[2] = "A";
+				sCharacter[0] = static_cast<char>(i);
+				CFStringRef cfsVal = CFStringFromString(sCharacter, 1, encoding);
+				if (!cfsVal)
+					continue;
+
+				NSString *sMapped = [(__bridge NSString *)cfsVal stringByFoldingWithOptions: NSCaseInsensitiveSearch
+												     locale: [NSLocale currentLocale]];
+
+				std::string encoded = EncodedBytesString((__bridge CFStringRef)sMapped, encoding);
+
+				if (encoded.length() == 1) {
+					pcf->SetTranslation(sCharacter[0], encoded[0]);
+				}
+
+				CFRelease(cfsVal);
+			}
+			return pcf;
+		} else {
+			return std::make_unique<CaseFolderDBCS>(encoding);
+		}
+	}
+}
+
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Case-fold the given string depending on the specified case mapping type.
+ */
+std::string ScintillaCocoa::CaseMapString(const std::string &s, CaseMapping caseMapping) {
+	if ((s.size() == 0) || (caseMapping == CaseMapping::same))
+		return s;
+
+	if (IsUnicodeMode()) {
+		std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
+		size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
+						     (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
+		retMapped.resize(lenMapped);
+		return retMapped;
+	}
+
+	CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+				    vs.styles[StyleDefault].characterSet);
+
+	CFStringRef cfsVal = CFStringFromString(s.c_str(), s.length(), encoding);
+	if (!cfsVal) {
+		return s;
+	}
+
+	NSString *sMapped;
+	switch (caseMapping) {
+	case CaseMapping::upper:
+		sMapped = ((__bridge NSString *)cfsVal).uppercaseString;
+		break;
+	case CaseMapping::lower:
+		sMapped = ((__bridge NSString *)cfsVal).lowercaseString;
+		break;
+	default:
+		sMapped = (__bridge NSString *)cfsVal;
+	}
+
+	// Back to encoding
+	std::string result = EncodedBytesString((__bridge CFStringRef)sMapped, encoding);
+	CFRelease(cfsVal);
+	return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Cancel all modes, both for base class and any find indicator.
+ */
+void ScintillaCocoa::CancelModes() {
+	ScintillaBase::CancelModes();
+	HideFindIndicator();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper function to get the scrolling view.
+ */
+NSScrollView *ScintillaCocoa::ScrollContainer() const {
+	NSView *container = (__bridge NSView *)(wMain.GetID());
+	return static_cast<NSScrollView *>(container.superview.superview);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper function to get the inner container which represents the actual "canvas" we work with.
+ */
+SCIContentView *ScintillaCocoa::ContentView() {
+	return (__bridge SCIContentView *)(wMain.GetID());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Return the top left visible point relative to the origin point of the whole document.
+ */
+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));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Instead of returning the size of the inner view we have to return the visible part of it
+ * in order to make scrolling working properly.
+ * The returned value is in document coordinates.
+ */
+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));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Allow for prepared rectangle
+ */
+PRectangle ScintillaCocoa::GetClientDrawingRectangle() {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1080
+	NSView *content = ContentView();
+	if ([content respondsToSelector: @selector(setPreparedContentRect:)]) {
+		NSRect rcPrepared = content.preparedContentRect;
+		if (!NSIsEmptyRect(rcPrepared))
+			return NSRectToPRectangle(rcPrepared);
+	}
+#endif
+	return ScintillaCocoa::GetClientRectangle();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Converts the given point from base coordinates to local coordinates and at the same time into
+ * a native Point structure. Base coordinates are used for the top window used in the view hierarchy.
+ * Returned value is in view coordinates.
+ */
+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));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Do not clip like superclass as Cocoa is not reporting all of prepared area.
+ */
+void ScintillaCocoa::RedrawRect(PRectangle rc) {
+	if (!rc.Empty())
+		wMain.InvalidateRectangle(rc);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::DiscardOverdraw() {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1080
+	// If running on 10.9, reset prepared area to visible area
+	NSView *content = ContentView();
+	if ([content respondsToSelector: @selector(setPreparedContentRect:)]) {
+		content.preparedContentRect = content.visibleRect;
+	}
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Ensure all of prepared content is also redrawn.
+ */
+void ScintillaCocoa::Redraw() {
+	wMargin.InvalidateAll();
+	DiscardOverdraw();
+	wMain.InvalidateAll();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * A function to directly execute code that would usually go the long way via window messages.
+ * However this is a Windows metaphor and not used here, hence we just call our fake
+ * window proc. The given parameters directly reflect the message parameters used on Windows.
+ *
+ * @param ptr The target which is to be called.
+ * @param iMessage A code that indicates which message was sent.
+ * @param wParam One of the two free parameters for the message. Traditionally a word sized parameter
+ *               (hence the w prefix).
+ * @param lParam The other of the two free parameters. A signed long.
+ */
+sptr_t ScintillaCocoa::DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
+				      sptr_t lParam) {
+	ScintillaCocoa *sci = reinterpret_cast<ScintillaCocoa *>(ptr);
+	return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * A function to directly execute code that would usually go the long way via window messages.
+ * Similar to DirectFunction but also returns the status.
+ * However this is a Windows metaphor and not used here, hence we just call our fake
+ * window proc. The given parameters directly reflect the message parameters used on Windows.
+ *
+ * @param ptr The target which is to be called.
+ * @param iMessage A code that indicates which message was sent.
+ * @param wParam One of the two free parameters for the message. Traditionally a word sized parameter
+ *               (hence the w prefix).
+ * @param lParam The other of the two free parameters. A signed long.
+ * @param pStatus Return the status to the caller. A pointer to an int.
+ */
+sptr_t ScintillaCocoa::DirectStatusFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
+				      sptr_t lParam, int *pStatus) {
+	ScintillaCocoa *sci = reinterpret_cast<ScintillaCocoa *>(ptr);
+	const sptr_t returnValue = sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+	*pStatus = static_cast<int>(sci->errorStatus);
+	return returnValue;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * This method is very similar to DirectFunction. On Windows it sends a message (not in the Obj-C sense)
+ * to the target window. Here we simply call our fake window proc.
+ */
+sptr_t scintilla_send_message(void *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	ScintillaView *control = (__bridge ScintillaView *)(sci);
+	return [control message: iMessage wParam: wParam lParam: lParam];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+namespace {
+
+/**
+ * The animated find indicator fails with a "bogus layer size" message on macOS 10.13
+ * and causes drawing failures on macOS 10.12.
+ */
+
+bool SupportAnimatedFind() {
+	return std::floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_12;
+}
+
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * That's our fake window procedure. On Windows each window has a dedicated procedure to handle
+ * commands (also used to synchronize UI and background threads), which is not the case in Cocoa.
+ *
+ * Messages handled here are almost solely for special commands of the backend. Everything which
+ * would be system messages on Windows (e.g. for key down, mouse move etc.) are handled by
+ * directly calling appropriate handlers.
+ */
+sptr_t ScintillaCocoa::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	try {
+		switch (iMessage) {
+		case Message::GetDirectFunction:
+			return reinterpret_cast<sptr_t>(DirectFunction);
+
+		case Message::GetDirectStatusFunction:
+			return reinterpret_cast<sptr_t>(DirectStatusFunction);
+
+		case Message::GetDirectPointer:
+			return reinterpret_cast<sptr_t>(this);
+
+		case Message::SetBidirectional:
+			bidirectional = static_cast<Bidirectional>(wParam);
+			// Invalidate all cached information including layout.
+			DropGraphics();
+			InvalidateStyleRedraw();
+			return 0;
+
+		case Message::TargetAsUTF8:
+			return TargetAsUTF8(CharPtrFromSPtr(lParam));
+
+		case Message::EncodedFromUTF8:
+			return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam),
+					       CharPtrFromSPtr(lParam));
+
+		case Message::SetIMEInteraction:
+			// Only inline IME supported on Cocoa
+			break;
+
+		case Message::GrabFocus:
+			[ContentView().window makeFirstResponder: ContentView()];
+			break;
+
+		case Message::SetBufferedDraw:
+			// Buffered drawing not supported on Cocoa
+			view.bufferedDraw = false;
+			break;
+
+		case Message::FindIndicatorShow:
+			if (SupportAnimatedFind()) {
+				ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), YES);
+			}
+			return 0;
+
+		case Message::FindIndicatorFlash:
+			if (SupportAnimatedFind()) {
+				ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), NO);
+			}
+			return 0;
+
+		case Message::FindIndicatorHide:
+			HideFindIndicator();
+			return 0;
+
+		case Message::SetPhasesDraw: {
+				sptr_t r = ScintillaBase::WndProc(iMessage, wParam, lParam);
+				[sciView updateIndicatorIME];
+				return r;
+			}
+
+		case Message::GetAccessibility:
+			return static_cast<sptr_t>(Accessibility::Enabled);
+
+		default:
+			sptr_t r = ScintillaBase::WndProc(iMessage, wParam, lParam);
+
+			return r;
+		}
+	} catch (std::bad_alloc &) {
+		errorStatus = Status::BadAlloc;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * In Windows lingo this is the handler which handles anything that wasn't handled in the normal
+ * window proc which would usually send the message back to generic window proc that Windows uses.
+ */
+sptr_t ScintillaCocoa::DefWndProc(Message, uptr_t, sptr_t) {
+	return 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Handle any ScintillaCocoa-specific ticking or call superclass.
+ */
+void ScintillaCocoa::TickFor(TickReason reason) {
+	if (reason == TickReason::platform) {
+		DragScroll();
+	} else {
+		Editor::TickFor(reason);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Is a particular timer currently running?
+ */
+bool ScintillaCocoa::FineTickerRunning(TickReason reason) {
+	return timers[static_cast<size_t>(reason)] != nil;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Start a fine-grained timer.
+ */
+void ScintillaCocoa::FineTickerStart(TickReason reason, int millis, int tolerance) {
+	FineTickerCancel(reason);
+	NSTimer *fineTimer = [NSTimer timerWithTimeInterval: millis / 1000.0
+						     target: timerTarget
+						   selector: @selector(timerFired:)
+						   userInfo: nil
+						    repeats: YES];
+	if (tolerance && [fineTimer respondsToSelector: @selector(setTolerance:)]) {
+		fineTimer.tolerance = tolerance / 1000.0;
+	}
+	timers[static_cast<size_t>(reason)] = fineTimer;
+	[NSRunLoop.currentRunLoop addTimer: fineTimer forMode: NSDefaultRunLoopMode];
+	[NSRunLoop.currentRunLoop addTimer: fineTimer forMode: NSModalPanelRunLoopMode];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Cancel a fine-grained timer.
+ */
+void ScintillaCocoa::FineTickerCancel(TickReason reason) {
+	const size_t reasonIndex = static_cast<size_t>(reason);
+	if (timers[reasonIndex]) {
+		[timers[reasonIndex] invalidate];
+		timers[reasonIndex] = nil;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::SetIdle(bool on) {
+	if (idler.state != on) {
+		idler.state = on;
+		if (idler.state) {
+			// Scintilla ticks = milliseconds
+			NSTimer *idleTimer = [NSTimer scheduledTimerWithTimeInterval: timer.tickSize / 1000.0
+									      target: timerTarget
+									    selector: @selector(idleTimerFired:)
+									    userInfo: nil
+									     repeats: YES];
+			[NSRunLoop.currentRunLoop addTimer: idleTimer forMode: NSModalPanelRunLoopMode];
+			idler.idlerID = (__bridge IdlerID)idleTimer;
+		} else if (idler.idlerID != NULL) {
+			[(__bridge NSTimer *)(idler.idlerID) invalidate];
+			idler.idlerID = 0;
+		}
+	}
+	return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::CopyToClipboard(const SelectionText &selectedText) {
+	SetPasteboardData([NSPasteboard generalPasteboard], selectedText);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::Copy() {
+	if (!sel.Empty()) {
+		SelectionText selectedText;
+		CopySelectionRange(&selectedText);
+		CopyToClipboard(selectedText);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::CanPaste() {
+	if (!Editor::CanPaste())
+		return false;
+
+	return GetPasteboardData([NSPasteboard generalPasteboard], NULL);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::Paste() {
+	Paste(false);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Pastes data from the paste board into the editor.
+ */
+void ScintillaCocoa::Paste(bool forceRectangular) {
+	SelectionText selectedText;
+	bool ok = GetPasteboardData([NSPasteboard generalPasteboard], &selectedText);
+	if (forceRectangular)
+		selectedText.rectangular = forceRectangular;
+
+	if (!ok || selectedText.Empty())
+		// No data or no flavor we support.
+		return;
+
+	pdoc->BeginUndoAction();
+	ClearSelection(false);
+	InsertPasteShape(selectedText.Data(), selectedText.Length(),
+			 selectedText.rectangular ? PasteShape::rectangular : PasteShape::stream);
+	pdoc->EndUndoAction();
+
+	Redraw();
+	EnsureCaretVisible();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::CTPaint(void *gc, NSRect rc) {
+#pragma unused(rc)
+	std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(Technology::Default));
+	surfaceWindow->Init(gc, wMain.GetID());
+	surfaceWindow->SetMode(SurfaceMode(ct.codePage, BidirectionalR2L()));
+	ct.PaintCT(surfaceWindow.get());
+	surfaceWindow->Release();
+}
+
+@interface CallTipView : NSControl {
+	ScintillaCocoa *sci;
+}
+
+@end
+
+@implementation CallTipView
+
+- (NSView *) initWithFrame: (NSRect) frame {
+	self = [super initWithFrame: frame];
+
+	if (self) {
+		sci = NULL;
+	}
+
+	return self;
+}
+
+
+- (BOOL) isFlipped {
+	return YES;
+}
+
+- (void) setSci: (ScintillaCocoa *) sci_ {
+	sci = sci_;
+}
+
+- (void) drawRect: (NSRect) needsDisplayInRect {
+	if (sci) {
+		CGContextRef context = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+		sci->CTPaint(context, needsDisplayInRect);
+	}
+}
+
+- (void) mouseDown: (NSEvent *) event {
+	if (sci) {
+		sci->CallTipMouseDown(event.locationInWindow);
+	}
+}
+
+// On OS X, only the key view should modify the cursor so the calltip can't.
+// This view does not become key so resetCursorRects never called.
+- (void) resetCursorRects {
+	//[super resetCursorRects];
+	//[self addCursorRect: [self bounds] cursor: [NSCursor arrowCursor]];
+}
+
+@end
+
+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));
+	ct.MouseClick(location);
+	CallTipClick();
+}
+
+static bool HeightDifferent(WindowID wCallTip, PRectangle rc) {
+	NSWindow *callTip = (__bridge NSWindow *)wCallTip;
+	CGFloat height = NSHeight(callTip.frame);
+	return height != rc.Height();
+}
+
+void ScintillaCocoa::CreateCallTipWindow(PRectangle rc) {
+	if (ct.wCallTip.Created() && HeightDifferent(ct.wCallTip.GetID(), rc)) {
+		ct.wCallTip.Destroy();
+	}
+	if (!ct.wCallTip.Created()) {
+		NSRect ctRect = NSMakeRect(rc.top, rc.bottom, rc.Width(), rc.Height());
+		NSWindow *callTip = [[NSWindow alloc] initWithContentRect: ctRect
+								styleMask: NSWindowStyleMaskBorderless
+								  backing: NSBackingStoreBuffered
+								    defer: NO];
+		[callTip setLevel: NSFloatingWindowLevel];
+		[callTip setHasShadow: YES];
+		NSRect ctContent = NSMakeRect(0, 0, rc.Width(), rc.Height());
+		CallTipView *caption = [[CallTipView alloc] initWithFrame: ctContent];
+		caption.autoresizingMask = NSViewWidthSizable | NSViewMaxYMargin;
+		[caption setSci: this];
+		[callTip.contentView addSubview: caption];
+		[callTip orderFront: caption];
+		ct.wCallTip = (__bridge_retained WindowID)callTip;
+		ct.wDraw = (__bridge WindowID)caption;
+	}
+}
+
+void ScintillaCocoa::AddToPopUp(const char *label, int cmd, bool enabled) {
+	NSMenuItem *item;
+	ScintillaContextMenu *menu = (__bridge ScintillaContextMenu *)(popup.GetID());
+	[menu setOwner: this];
+	[menu setAutoenablesItems: NO];
+
+	if (cmd == 0) {
+		item = [NSMenuItem separatorItem];
+	} else {
+		item = [[NSMenuItem alloc] init];
+		item.title = @(label);
+	}
+	item.target = menu;
+	item.action = @selector(handleCommand:);
+	item.tag = cmd;
+	item.enabled = enabled;
+
+	[menu addItem: item];
+}
+
+// -------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::ClaimSelection() {
+	// Mac OS X does not have a primary selection.
+}
+
+// -------------------------------------------------------------------------------------------------
+
+/**
+ * Returns the current caret position (which is tracked as an offset into the entire text string)
+ * as a row:column pair. The result is zero-based.
+ */
+NSPoint ScintillaCocoa::GetCaretPosition() {
+	const Sci::Line line = static_cast<Sci::Line>(
+		pdoc->LineFromPosition(sel.RangeMain().caret.Position()));
+	NSPoint result;
+
+	result.y = line;
+	result.x = sel.RangeMain().caret.Position() - pdoc->LineStart(line);
+	return result;
+}
+
+// -------------------------------------------------------------------------------------------------
+
+std::string ScintillaCocoa::UTF8FromEncoded(std::string_view encoded) const {
+	if (IsUnicodeMode()) {
+		return std::string(encoded);
+	} else {
+		CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+					    vs.styles[StyleDefault].characterSet);
+		CFStringRef cfsVal = CFStringFromString(encoded.data(), encoded.length(), encoding);
+		std::string utf = EncodedBytesString(cfsVal, kCFStringEncodingUTF8);
+		if (cfsVal)
+			CFRelease(cfsVal);
+		return utf;
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+std::string ScintillaCocoa::EncodedFromUTF8(std::string_view utf8) const {
+	if (IsUnicodeMode()) {
+		return std::string(utf8);
+	} else {
+		CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+					    vs.styles[StyleDefault].characterSet);
+		CFStringRef cfsVal = CFStringFromString(utf8.data(), utf8.length(), kCFStringEncodingUTF8);
+		const std::string sEncoded = EncodedBytesString(cfsVal, encoding);
+		if (cfsVal)
+			CFRelease(cfsVal);
+		return sEncoded;
+	}
+}
+
+// -------------------------------------------------------------------------------------------------
+
+#pragma mark Drag
+
+/**
+ * Triggered by the tick timer on a regular basis to scroll the content during a drag operation.
+ */
+void ScintillaCocoa::DragScroll() {
+	if (!posDrag.IsValid()) {
+		scrollSpeed = 1;
+		scrollTicks = 2000;
+		return;
+	}
+
+	// TODO: does not work for wrapped lines, fix it.
+	Sci::Line line = static_cast<Sci::Line>(pdoc->LineFromPosition(posDrag.Position()));
+	Sci::Line currentVisibleLine = pcs->DisplayFromDoc(line);
+	Sci::Line lastVisibleLine = std::min(topLine + LinesOnScreen(), pcs->LinesDisplayed()) - 2;
+
+	if (currentVisibleLine <= topLine && topLine > 0)
+		ScrollTo(topLine - scrollSpeed);
+	else if (currentVisibleLine >= lastVisibleLine)
+		ScrollTo(topLine + scrollSpeed);
+	else {
+		scrollSpeed = 1;
+		scrollTicks = 2000;
+		return;
+	}
+
+	// TODO: also handle horizontal scrolling.
+
+	if (scrollSpeed == 1) {
+		scrollTicks -= timer.tickSize;
+		if (scrollTicks <= 0) {
+			scrollSpeed = 5;
+			scrollTicks = 2000;
+		}
+	}
+
+}
+
+//----------------- DragProviderSource -------------------------------------------------------
+
+@interface DragProviderSource : NSObject <NSPasteboardItemDataProvider> {
+	SelectionText selectedText;
+}
+
+@end
+
+@implementation DragProviderSource
+
+- (id) initWithSelectedText: (const SelectionText *) other {
+	self = [super init];
+
+	if (self) {
+		selectedText.Copy(*other);
+	}
+
+	return self;
+}
+
+- (void) pasteboard: (NSPasteboard *) pasteboard item: (NSPasteboardItem *) item provideDataForType: (NSString *) type {
+#pragma unused(item)
+	if (selectedText.Length() == 0)
+		return;
+
+	if (([type compare: NSPasteboardTypeString] != NSOrderedSame) &&
+			([type compare: ScintillaRecPboardType] != NSOrderedSame))
+		return;
+
+	CFStringEncoding encoding = EncodingFromCharacterSet(selectedText.codePage == SC_CP_UTF8,
+				    selectedText.characterSet);
+
+	CFStringRef cfsVal = CFStringFromString(selectedText.Data(), selectedText.Length(), encoding);
+	if (!cfsVal)
+		return;
+
+	if ([type compare: NSPasteboardTypeString] == NSOrderedSame) {
+		[pasteboard setString: (__bridge NSString *)cfsVal forType: NSStringPboardType];
+	} else if ([type compare: ScintillaRecPboardType] == NSOrderedSame) {
+		// This is specific to scintilla, allows us to drag rectangular selections around the document.
+		if (selectedText.rectangular)
+			[pasteboard setString: (__bridge NSString *)cfsVal forType: ScintillaRecPboardType];
+	}
+
+	if (cfsVal)
+		CFRelease(cfsVal);
+}
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called when a drag operation was initiated from within Scintilla.
+ */
+void ScintillaCocoa::StartDrag() {
+	if (sel.Empty())
+		return;
+
+	inDragDrop = DragDrop::dragging;
+
+	FineTickerStart(TickReason::platform, timer.tickSize, 0);
+
+	// Put the data to be dragged on the drag pasteboard.
+	SelectionText selectedText;
+	NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard];
+	CopySelectionRange(&selectedText);
+	SetPasteboardData(pasteboard, selectedText);
+
+	// calculate the bounds of the selection
+	PRectangle client = GetTextRectangle();
+	Sci::Position selStart = sel.RangeMain().Start().Position();
+	Sci::Position selEnd = sel.RangeMain().End().Position();
+	Sci::Line startLine = static_cast<Sci::Line>(pdoc->LineFromPosition(selStart));
+	Sci::Line endLine = static_cast<Sci::Line>(pdoc->LineFromPosition(selEnd));
+	Point pt;
+	Sci::Position startPos;
+	Sci::Position endPos;
+	Sci::Position ep;
+	PRectangle rcSel;
+
+	if (startLine==endLine && WndProc(Message::GetWrapMode, 0, 0) != static_cast<sptr_t>(Wrap::None)) {
+		// Komodo bug http://bugs.activestate.com/show_bug.cgi?id=87571
+		// Scintilla bug https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3040200&group_id=2439
+		// If the width on a wrapped-line selection is negative,
+		// find a better bounding rectangle.
+
+		Point ptStart, ptEnd;
+		startPos = WndProc(Message::GetLineSelStartPosition, startLine, 0);
+		endPos =   WndProc(Message::GetLineSelEndPosition,   startLine, 0);
+		// step back a position if we're counting the newline
+		ep =       WndProc(Message::GetLineEndPosition,      startLine, 0);
+		if (endPos > ep) endPos = ep;
+		ptStart = LocationFromPosition(startPos);
+		ptEnd =   LocationFromPosition(endPos);
+		if (ptStart.y == ptEnd.y) {
+			// We're just selecting part of one visible line
+			rcSel.left = ptStart.x;
+			rcSel.right = ptEnd.x < client.right ? ptEnd.x : client.right;
+		} else {
+			// Find the bounding box.
+			startPos = WndProc(Message::PositionFromLine, startLine, 0);
+			rcSel.left = LocationFromPosition(startPos).x;
+			rcSel.right = client.right;
+		}
+		rcSel.top = ptStart.y;
+		rcSel.bottom = ptEnd.y + vs.lineHeight;
+		if (rcSel.bottom > client.bottom) {
+			rcSel.bottom = client.bottom;
+		}
+	} else {
+		rcSel.top = rcSel.bottom = rcSel.right = rcSel.left = -1;
+		for (Sci::Line l = startLine; l <= endLine; l++) {
+			startPos = WndProc(Message::GetLineSelStartPosition, l, 0);
+			endPos = WndProc(Message::GetLineSelEndPosition, l, 0);
+			if (endPos == startPos) continue;
+			// step back a position if we're counting the newline
+			ep = WndProc(Message::GetLineEndPosition, l, 0);
+			if (endPos > ep) endPos = ep;
+			pt = LocationFromPosition(startPos); // top left of line selection
+			if (pt.x < rcSel.left || rcSel.left < 0) rcSel.left = pt.x;
+			if (pt.y < rcSel.top || rcSel.top < 0) rcSel.top = pt.y;
+			pt = LocationFromPosition(endPos); // top right of line selection
+			pt.y += vs.lineHeight; // get to the bottom of the line
+			if (pt.x > rcSel.right || rcSel.right < 0) {
+				if (pt.x > client.right)
+					rcSel.right = client.right;
+				else
+					rcSel.right = pt.x;
+			}
+			if (pt.y > rcSel.bottom || rcSel.bottom < 0) {
+				if (pt.y > client.bottom)
+					rcSel.bottom = client.bottom;
+				else
+					rcSel.bottom = pt.y;
+			}
+		}
+	}
+	// must convert to global coordinates for drag regions, but also save the
+	// image rectangle for further calculations and copy operations
+
+	// Prepare drag image.
+	NSRect selectionRectangle = PRectangleToNSRect(rcSel);
+
+	SCIContentView *content = ContentView();
+
+	// To get a bitmap of the text we're dragging, we just use Paint on a pixmap surface.
+	SurfaceImpl si;
+	si.SetMode(SurfaceMode(CodePage(), BidirectionalR2L()));
+	std::unique_ptr<SurfaceImpl> sw = si.AllocatePixMapImplementation(static_cast<int>(client.Width()), static_cast<int>(client.Height()));
+
+	const bool lastHideSelection = view.hideSelection;
+	view.hideSelection = true;
+	PRectangle imageRect = rcSel;
+	paintState = PaintState::painting;
+	paintingAllText = true;
+	CGContextRef gcsw = sw->GetContext();
+	CGContextTranslateCTM(gcsw, -client.left, -client.top);
+	Paint(sw.get(), client);
+	paintState = PaintState::notPainting;
+	view.hideSelection = lastHideSelection;
+
+	std::unique_ptr<SurfaceImpl> pixmap = si.AllocatePixMapImplementation(static_cast<int>(imageRect.Width()),
+								  static_cast<int>(imageRect.Height()));
+	CGContextRef gc = pixmap->GetContext();
+	// To make Paint() work on a bitmap, we have to flip our coordinates and translate the origin
+	CGContextTranslateCTM(gc, 0, imageRect.Height());
+	CGContextScaleCTM(gc, 1.0, -1.0);
+
+	pixmap->CopyImageRectangle(sw.get(), imageRect, PRectangle(0.0f, 0.0f, imageRect.Width(), imageRect.Height()));
+	// XXX TODO: overwrite any part of the image that is not part of the
+	//           selection to make it transparent.  right now we just use
+	//           the full rectangle which may include non-selected text.
+
+	NSBitmapImageRep *bitmap = NULL;
+	CGImageRef imagePixmap = pixmap->CreateImage();
+	if (imagePixmap)
+		bitmap = [[NSBitmapImageRep alloc] initWithCGImage: imagePixmap];
+	CGImageRelease(imagePixmap);
+
+	NSImage *image = [[NSImage alloc] initWithSize: selectionRectangle.size];
+	[image addRepresentation: bitmap];
+
+	NSImage *dragImage = [[NSImage alloc] initWithSize: selectionRectangle.size];
+	dragImage.backgroundColor = [NSColor clearColor];
+	[dragImage lockFocus];
+	[image drawAtPoint: NSZeroPoint fromRect: NSZeroRect operation: NSCompositingOperationSourceOver fraction: 0.5];
+	[dragImage unlockFocus];
+
+	NSPoint startPoint;
+	startPoint.x = selectionRectangle.origin.x + client.left;
+	startPoint.y = selectionRectangle.origin.y + selectionRectangle.size.height + client.top;
+
+	NSPasteboardItem *pbItem = [NSPasteboardItem new];
+	DragProviderSource *dps = [[DragProviderSource alloc] initWithSelectedText: &selectedText];
+
+	NSArray *pbTypes = selectedText.rectangular ?
+			   @[NSPasteboardTypeString, ScintillaRecPboardType] :
+			   @[NSPasteboardTypeString];
+	[pbItem setDataProvider: dps forTypes: pbTypes];
+	NSDraggingItem *dragItem = [[NSDraggingItem alloc ]initWithPasteboardWriter: pbItem];
+
+	NSScrollView *scrollContainer = ScrollContainer();
+	NSRect contentRect = scrollContainer.contentView.bounds;
+	NSRect draggingRect = NSOffsetRect(selectionRectangle, contentRect.origin.x, contentRect.origin.y);
+	[dragItem setDraggingFrame: draggingRect contents: dragImage];
+	NSDraggingSession *dragSession =
+		[content beginDraggingSessionWithItems: @[dragItem]
+						 event: lastMouseEvent
+						source: content];
+	dragSession.animatesToStartingPositionsOnCancelOrFail = YES;
+	dragSession.draggingFormation = NSDraggingFormationNone;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called when a drag operation reaches the control which was initiated outside.
+ */
+NSDragOperation ScintillaCocoa::DraggingEntered(id <NSDraggingInfo> info) {
+	FineTickerStart(TickReason::platform, timer.tickSize, 0);
+	return DraggingUpdated(info);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called frequently during a drag operation if we are the target. Keep telling the caller
+ * what drag operation we accept and update the drop caret position to indicate the
+ * potential insertion point of the dragged data.
+ */
+NSDragOperation ScintillaCocoa::DraggingUpdated(id <NSDraggingInfo> info) {
+	// Convert the drag location from window coordinates to view coordinates and
+	// from there to a text position to finally set the drag position.
+	Point location = ConvertPoint([info draggingLocation]);
+	SetDragPosition(SPositionFromLocation(location));
+
+	NSDragOperation sourceDragMask = [info draggingSourceOperationMask];
+	if (sourceDragMask == NSDragOperationNone)
+		return sourceDragMask;
+
+	NSPasteboard *pasteboard = [info draggingPasteboard];
+
+	// Return what type of operation we will perform. Prefer move over copy.
+	if ([pasteboard.types containsObject: NSStringPboardType] ||
+			[pasteboard.types containsObject: ScintillaRecPboardType])
+		return (sourceDragMask & NSDragOperationMove) ? NSDragOperationMove : NSDragOperationCopy;
+
+	if ([pasteboard.types containsObject: NSFilenamesPboardType])
+		return (sourceDragMask & NSDragOperationGeneric);
+	return NSDragOperationNone;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Resets the current drag position as we are no longer the drag target.
+ */
+void ScintillaCocoa::DraggingExited(id <NSDraggingInfo> info) {
+#pragma unused(info)
+	SetDragPosition(SelectionPosition(Sci::invalidPosition));
+	FineTickerCancel(TickReason::platform);
+	inDragDrop = DragDrop::none;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Here is where the real work is done. Insert the text from the pasteboard.
+ */
+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);
+	} 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);
+		};
+	}
+
+	return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::SetPasteboardData(NSPasteboard *board, const SelectionText &selectedText) {
+	if (selectedText.Length() == 0)
+		return;
+
+	CFStringEncoding encoding = EncodingFromCharacterSet(selectedText.codePage == SC_CP_UTF8,
+				    selectedText.characterSet);
+
+	CFStringRef cfsVal = CFStringFromString(selectedText.Data(), selectedText.Length(), encoding);
+	if (!cfsVal)
+		return;
+
+	NSArray *pbTypes = selectedText.rectangular ?
+			   @[NSStringPboardType, ScintillaRecPboardType] :
+			   @[NSStringPboardType];
+	[board declareTypes: pbTypes owner: nil];
+
+	if (selectedText.rectangular) {
+		// This is specific to scintilla, allows us to drag rectangular selections around the document.
+		[board setString: (__bridge NSString *)cfsVal forType: ScintillaRecPboardType];
+	}
+
+	[board setString: (__bridge NSString *)cfsVal forType: NSStringPboardType];
+
+	if (cfsVal)
+		CFRelease(cfsVal);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper method to retrieve the best fitting alternative from the general pasteboard.
+ */
+bool ScintillaCocoa::GetPasteboardData(NSPasteboard *board, SelectionText *selectedText) {
+	NSArray *supportedTypes = @[ScintillaRecPboardType,
+				    NSStringPboardType];
+	NSString *bestType = [board availableTypeFromArray: supportedTypes];
+	NSString *data = [board stringForType: bestType];
+
+	if (data != nil) {
+		if (selectedText != nil) {
+			CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+						    vs.styles[StyleDefault].characterSet);
+			CFRange rangeAll = {0, static_cast<CFIndex>(data.length)};
+			CFIndex usedLen = 0;
+			CFStringGetBytes((CFStringRef)data, rangeAll, encoding, '?',
+					 false, NULL, 0, &usedLen);
+
+			std::vector<UInt8> buffer(usedLen);
+
+			CFStringGetBytes((CFStringRef)data, rangeAll, encoding, '?',
+					 false, buffer.data(), usedLen, NULL);
+
+			bool rectangular = bestType == ScintillaRecPboardType;
+
+			std::string dest(reinterpret_cast<const char *>(buffer.data()), usedLen);
+
+			selectedText->Copy(dest, pdoc->dbcsCodePage,
+					   vs.styles[StyleDefault].characterSet, rectangular, false);
+		}
+		return true;
+	}
+
+	return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Returns the target converted to UTF8.
+// Return the length in bytes.
+Sci::Position ScintillaCocoa::TargetAsUTF8(char *text) const {
+	const Sci::Position targetLength = targetRange.Length();
+	if (IsUnicodeMode()) {
+		if (text)
+			pdoc->GetCharRange(text, targetRange.start.Position(), targetLength);
+	} else {
+		// Need to convert
+		const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+						  vs.styles[StyleDefault].characterSet);
+		const std::string s = RangeText(targetRange.start.Position(), targetRange.end.Position());
+		CFStringRef cfsVal = CFStringFromString(s.c_str(), s.length(), encoding);
+		if (!cfsVal) {
+			return 0;
+		}
+
+		const std::string tmputf = EncodedBytesString(cfsVal, kCFStringEncodingUTF8);
+
+		if (text)
+			memcpy(text, tmputf.c_str(), tmputf.length());
+		CFRelease(cfsVal);
+		return tmputf.length();
+	}
+	return targetLength;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Returns the text in the range converted to an NSString.
+NSString *ScintillaCocoa::RangeTextAsString(NSRange rangePositions) const {
+	const std::string text = RangeText(rangePositions.location,
+					   NSMaxRange(rangePositions));
+	if (IsUnicodeMode()) {
+		return @(text.c_str());
+	} else {
+		// Need to convert
+		const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+						  vs.styles[StyleDefault].characterSet);
+		CFStringRef cfsVal = CFStringFromString(text.c_str(), text.length(), encoding);
+
+		return (__bridge NSString *)cfsVal;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Return character range of a line.
+NSRange ScintillaCocoa::RangeForVisibleLine(NSInteger lineVisible) {
+	const Range posRangeLine = RangeDisplayLine(static_cast<Sci::Line>(lineVisible));
+	return CharactersFromPositions(NSMakeRange(posRangeLine.First(),
+				       posRangeLine.Last() - posRangeLine.First()));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Returns visible line number of a text position in characters.
+NSInteger ScintillaCocoa::VisibleLineForIndex(NSInteger index) {
+	const NSRange rangePosition = PositionsFromCharacters(NSMakeRange(index, 0));
+	const Sci::Line lineVisible = DisplayFromPosition(rangePosition.location);
+	return lineVisible;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Returns a rectangle that frames the range for use by the VoiceOver cursor.
+NSRect ScintillaCocoa::FrameForRange(NSRange rangeCharacters) {
+	const NSRange posRange = PositionsFromCharacters(rangeCharacters);
+
+	NSUInteger rangeEnd = NSMaxRange(posRange);
+	const bool endsWithLineEnd = rangeCharacters.length &&
+				     (pdoc->GetColumn(rangeEnd) == 0);
+
+	Point ptStart = LocationFromPosition(posRange.location);
+	Point ptEnd = LocationFromPosition(rangeEnd, PointEnd::endEither);
+
+	NSRect rect = NSMakeRect(ptStart.x, ptStart.y,
+				 ptEnd.x - ptStart.x,
+				 ptEnd.y - ptStart.y);
+
+	rect.size.width += 2;	// Shows the last character better
+	if (endsWithLineEnd) {
+		// Add a block to the right to indicate a line end is selected
+		rect.size.width += 20;
+	}
+
+	rect.size.height += vs.lineHeight;
+
+	// Adjust for margin and scroll
+	rect.origin.x = rect.origin.x - vs.textStart + vs.fixedColumnWidth;
+
+	return rect;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Returns a rectangle that frames the range for use by the VoiceOver cursor.
+NSRect ScintillaCocoa::GetBounds() const {
+	return PRectangleToNSRect(GetClientRectangle());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Translates a UTF8 string into the document encoding.
+// Return the length of the result in bytes.
+Sci::Position ScintillaCocoa::EncodedFromUTF8(const char *utf8, char *encoded) const {
+	const size_t inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8);
+	if (IsUnicodeMode()) {
+		if (encoded)
+			memcpy(encoded, utf8, inputLength);
+		return inputLength;
+	} else {
+		// Need to convert
+		const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+						  vs.styles[StyleDefault].characterSet);
+
+		CFStringRef cfsVal = CFStringFromString(utf8, inputLength, kCFStringEncodingUTF8);
+		const std::string sEncoded = EncodedBytesString(cfsVal, encoding);
+		if (encoded)
+			memcpy(encoded, sEncoded.c_str(), sEncoded.length());
+		CFRelease(cfsVal);
+		return sEncoded.length();
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::SetMouseCapture(bool on) {
+	capturedMouse = on;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::HaveMouseCapture() {
+	return capturedMouse;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Synchronously paint a rectangle of the window.
+ */
+bool ScintillaCocoa::SyncPaint(void *gc, PRectangle rc) {
+	paintState = PaintState::painting;
+	rcPaint = rc;
+	PRectangle rcText = GetTextRectangle();
+	paintingAllText = rcPaint.Contains(rcText);
+	std::unique_ptr<Surface> sw(Surface::Allocate(Technology::Default));
+	CGContextSetAllowsAntialiasing((CGContextRef)gc,
+				       vs.extraFontFlag != FontQuality::QualityNonAntialiased);
+	CGContextSetAllowsFontSmoothing((CGContextRef)gc,
+					vs.extraFontFlag == FontQuality::QualityLcdOptimized);
+	CGContextSetAllowsFontSubpixelPositioning((CGContextRef)gc,
+			vs.extraFontFlag == FontQuality::QualityDefault ||
+			vs.extraFontFlag == FontQuality::QualityLcdOptimized);
+	sw->Init(gc, wMain.GetID());
+	Paint(sw.get(), rc);
+	const bool succeeded = paintState != PaintState::abandoned;
+	sw->Release();
+	paintState = PaintState::notPainting;
+	if (!succeeded) {
+		NSView *marginView = (__bridge NSView *)(wMargin.GetID());
+		[marginView setNeedsDisplay: YES];
+	}
+	return succeeded;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Paint the margin into the SCIMarginView space.
+ */
+void ScintillaCocoa::PaintMargin(NSRect aRect) {
+	CGContextRef gc = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+
+	PRectangle rc = NSRectToPRectangle(aRect);
+	rcPaint = rc;
+	std::unique_ptr<Surface> sw(Surface::Allocate(Technology::Default));
+	if (sw) {
+		CGContextSetAllowsAntialiasing(gc,
+					       vs.extraFontFlag != FontQuality::QualityNonAntialiased);
+		CGContextSetAllowsFontSmoothing(gc,
+						vs.extraFontFlag == FontQuality::QualityLcdOptimized);
+		CGContextSetAllowsFontSubpixelPositioning(gc,
+				vs.extraFontFlag == FontQuality::QualityDefault ||
+				vs.extraFontFlag == FontQuality::QualityLcdOptimized);
+		sw->Init(gc, wMargin.GetID());
+		PaintSelMargin(sw.get(), rc);
+		sw->Release();
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Prepare for drawing.
+ *
+ * @param rect The area that will be drawn, given in the sender's coordinate system.
+ */
+void ScintillaCocoa::WillDraw(NSRect rect) {
+	RefreshStyleData();
+	PRectangle rcWillDraw = NSRectToPRectangle(rect);
+	const Sci::Position posAfterArea = PositionAfterArea(rcWillDraw);
+	const Sci::Position posAfterMax = PositionAfterMaxStyling(posAfterArea, true);
+	pdoc->StyleToAdjustingLineDuration(posAfterMax);
+	StartIdleStyling(posAfterMax < posAfterArea);
+	NotifyUpdateUI();
+	if (WrapLines(WrapScope::wsVisible)) {
+		// Wrap may have reduced number of lines so more lines may need to be styled
+		const Sci::Position posAfterAreaWrapped = PositionAfterArea(rcWillDraw);
+		pdoc->EnsureStyledTo(posAfterAreaWrapped);
+		// The wrapping process has changed the height of some lines so redraw all.
+		Redraw();
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * ScrollText is empty because scrolling is handled by the NSScrollView.
+ */
+void ScintillaCocoa::ScrollText(Sci::Line) {
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Modifies the vertical scroll position to make the current top line show up as such.
+ */
+void ScintillaCocoa::SetVerticalScrollPos() {
+	NSScrollView *scrollView = ScrollContainer();
+	if (scrollView) {
+		NSClipView *clipView = scrollView.contentView;
+		NSRect contentRect = clipView.bounds;
+		[clipView scrollToPoint: NSMakePoint(contentRect.origin.x, topLine * vs.lineHeight)];
+		[scrollView reflectScrolledClipView: clipView];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Modifies the horizontal scroll position to match xOffset.
+ */
+void ScintillaCocoa::SetHorizontalScrollPos() {
+	PRectangle textRect = GetTextRectangle();
+
+	int maxXOffset = scrollWidth - static_cast<int>(textRect.Width());
+	if (maxXOffset < 0)
+		maxXOffset = 0;
+	if (xOffset > maxXOffset)
+		xOffset = maxXOffset;
+	NSScrollView *scrollView = ScrollContainer();
+	if (scrollView) {
+		NSClipView *clipView = scrollView.contentView;
+		NSRect contentRect = clipView.bounds;
+		[clipView scrollToPoint: NSMakePoint(xOffset, contentRect.origin.y)];
+		[scrollView reflectScrolledClipView: clipView];
+	}
+	MoveFindIndicatorWithBounce(NO);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to adjust both scrollers to reflect the current scroll range and position in the editor.
+ * Arguments no longer used as NSScrollView handles details of scroll bar sizes.
+ *
+ * @param nMax Number of lines in the editor.
+ * @param nPage Number of lines per scroll page.
+ * @return True if there was a change, otherwise false.
+ */
+bool ScintillaCocoa::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
+#pragma unused(nMax, nPage)
+	return SetScrollingSize();
+}
+
+bool ScintillaCocoa::SetScrollingSize(void) {
+	bool changes = false;
+	SCIContentView *inner = ContentView();
+	if (!enteredSetScrollingSize) {
+		enteredSetScrollingSize = true;
+		NSScrollView *scrollView = ScrollContainer();
+		NSClipView *clipView = ScrollContainer().contentView;
+		NSRect clipRect = clipView.bounds;
+		CGFloat docHeight = pcs->LinesDisplayed() * vs.lineHeight;
+		if (!endAtLastLine)
+			docHeight += (int(scrollView.bounds.size.height / vs.lineHeight)-3) * vs.lineHeight;
+		// Allow extra space so that last scroll position places whole line at top
+		int clipExtra = int(clipRect.size.height) % vs.lineHeight;
+		docHeight += clipExtra;
+		// Ensure all of clipRect covered by Scintilla drawing
+		if (docHeight < clipRect.size.height)
+			docHeight = clipRect.size.height;
+		CGFloat docWidth = scrollWidth;
+		bool showHorizontalScroll = horizontalScrollBarVisible &&
+					    !Wrapping();
+		if (!showHorizontalScroll)
+			docWidth = clipRect.size.width;
+		NSRect contentRect = {{0, 0}, {docWidth, docHeight}};
+		NSRect contentRectNow = inner.frame;
+		changes = (contentRect.size.width != contentRectNow.size.width) ||
+			  (contentRect.size.height != contentRectNow.size.height);
+		if (changes) {
+			inner.frame = contentRect;
+		}
+		scrollView.hasVerticalScroller = verticalScrollBarVisible;
+		scrollView.hasHorizontalScroller = showHorizontalScroll;
+		SetVerticalScrollPos();
+		enteredSetScrollingSize = false;
+	}
+	[sciView setMarginWidth: vs.fixedColumnWidth];
+	return changes;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::Resize() {
+	SetScrollingSize();
+	ChangeSize();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Update fields to match scroll position after receiving a notification that the user has scrolled.
+ */
+void ScintillaCocoa::UpdateForScroll() {
+	Point ptOrigin = GetVisibleOriginInMain();
+	xOffset = static_cast<int>(ptOrigin.x);
+	Sci::Line newTop = std::min(static_cast<Sci::Line>(ptOrigin.y / vs.lineHeight), MaxScrollPos());
+	SetTopLine(newTop);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Register a delegate that will be called for notifications and commands.
+ * This provides similar functionality to RegisterNotifyCallback but in an
+ * Objective C way.
+ *
+ * @param delegate_ A pointer to an object that implements ScintillaNotificationProtocol.
+ */
+
+void ScintillaCocoa::SetDelegate(id<ScintillaNotificationProtocol> delegate_) {
+	delegate = delegate_;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to register a callback function for a given window. This is used to emulate the way
+ * Windows notifies other controls (mainly up in the view hierarchy) about certain events.
+ *
+ * @param windowid A handle to a window. That value is generic and can be anything. It is passed
+ *                 through to the callback.
+ * @param callback The callback function to be used for future notifications. If NULL then no
+ *                 notifications will be sent anymore.
+ */
+void ScintillaCocoa::RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc callback) {
+	notifyObj = windowid;
+	notifyProc = callback;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::NotifyChange() {
+	if (notifyProc != NULL)
+		notifyProc(notifyObj, WM_COMMAND, Platform::LongFromTwoShorts(static_cast<short>(GetCtrlID()), static_cast<short>(FocusChange::Change)),
+			   (uintptr_t) this);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::NotifyFocus(bool focus) {
+	if (commandEvents && notifyProc)
+		notifyProc(notifyObj, WM_COMMAND, Platform::LongFromTwoShorts(static_cast<short>(GetCtrlID()),
+				static_cast<short>((focus ? FocusChange::Setfocus : FocusChange::Killfocus))),
+			   (uintptr_t) this);
+
+	Editor::NotifyFocus(focus);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to send a notification (as WM_NOTIFY call) to the procedure, which has been set by the call
+ * to RegisterNotifyCallback (so it is not necessarily the parent window).
+ *
+ * @param scn The notification to send.
+ */
+void ScintillaCocoa::NotifyParent(NotificationData scn) {
+	scn.nmhdr.hwndFrom = (void *) this;
+	scn.nmhdr.idFrom = GetCtrlID();
+	if (notifyProc != NULL)
+		notifyProc(notifyObj, WM_NOTIFY, GetCtrlID(), (uintptr_t) &scn);
+	if (delegate)
+		[delegate notification: reinterpret_cast<SCNotification *>(&scn)];
+	if (scn.nmhdr.code == Notification::UpdateUI) {
+		NSView *content = ContentView();
+		if (FlagSet(scn.updated, Update::Content)) {
+			NSAccessibilityPostNotification(content, NSAccessibilityValueChangedNotification);
+		}
+		if (FlagSet(scn.updated, Update::Selection)) {
+			NSAccessibilityPostNotification(content, NSAccessibilitySelectedTextChangedNotification);
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::NotifyURIDropped(const char *uri) {
+	NotificationData scn;
+	scn.nmhdr.code = Notification::URIDropped;
+	scn.text = uri;
+
+	NotifyParent(scn);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::HasSelection() {
+	return !sel.Empty();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::CanUndo() {
+	return pdoc->CanUndo();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::CanRedo() {
+	return pdoc->CanRedo();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::TimerFired(NSTimer *timer) {
+	for (size_t tr=static_cast<size_t>(TickReason::caret); tr<=static_cast<size_t>(TickReason::platform); tr++) {
+		if (timers[tr] == timer) {
+			TickFor(static_cast<TickReason>(tr));
+		}
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::IdleTimerFired() {
+	bool more = Idle();
+	if (!more)
+		SetIdle(false);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Main entry point for drawing the control.
+ *
+ * @param rect The area to paint, given in the sender's coordinate system.
+ * @param gc The context we can use to paint.
+ */
+bool ScintillaCocoa::Draw(NSRect rect, CGContextRef gc) {
+	return SyncPaint(gc, NSRectToPRectangle(rect));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Helper function to translate OS X key codes to Scintilla key codes.
+ */
+static inline Keys KeyTranslate(UniChar unicodeChar, NSEventModifierFlags modifierFlags) {
+	switch (unicodeChar) {
+	case NSDownArrowFunctionKey:
+		return Keys::Down;
+	case NSUpArrowFunctionKey:
+		return Keys::Up;
+	case NSLeftArrowFunctionKey:
+		return Keys::Left;
+	case NSRightArrowFunctionKey:
+		return Keys::Right;
+	case NSHomeFunctionKey:
+		return Keys::Home;
+	case NSEndFunctionKey:
+		return Keys::End;
+	case NSPageUpFunctionKey:
+		return Keys::Prior;
+	case NSPageDownFunctionKey:
+		return Keys::Next;
+	case NSDeleteFunctionKey:
+		return Keys::Delete;
+	case NSInsertFunctionKey:
+		return Keys::Insert;
+	case '\n':
+	case 3:
+		return Keys::Return;
+	case 27:
+		return Keys::Escape;
+	case '+':
+		if (modifierFlags & NSEventModifierFlagNumericPad)
+			return Keys::Add;
+		else
+			return static_cast<Keys>(unicodeChar);
+	case '-':
+		if (modifierFlags & NSEventModifierFlagNumericPad)
+			return Keys::Subtract;
+		else
+			return static_cast<Keys>(unicodeChar);
+	case '/':
+		if (modifierFlags & NSEventModifierFlagNumericPad)
+			return Keys::Divide;
+		else
+			return static_cast<Keys>(unicodeChar);
+	case 127:
+		return Keys::Back;
+	case '\t':
+	case 25: // Shift tab, return to unmodified tab and handle that via modifiers.
+		return Keys::Tab;
+	default:
+		return static_cast<Keys>(unicodeChar);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Translate NSEvent modifier flags into SCI_* modifier flags.
+ *
+ * @param modifiers An integer bit set of NSSEvent modifier flags.
+ * @return A set of SCI_* modifier flags.
+ */
+static KeyMod TranslateModifierFlags(NSUInteger modifiers) {
+	// Signal Control as SCI_META
+	return
+		(((modifiers & NSEventModifierFlagShift) != 0) ? KeyMod::Shift : KeyMod::Norm) |
+		(((modifiers & NSEventModifierFlagCommand) != 0) ? KeyMod::Ctrl : KeyMod::Norm) |
+		(((modifiers & NSEventModifierFlagOption) != 0) ? KeyMod::Alt : KeyMod::Norm) |
+		(((modifiers & NSEventModifierFlagControl) != 0) ? KeyMod::Meta : KeyMod::Norm);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Main keyboard input handling method. It is called for any key down event, including function keys,
+ * numeric keypad input and whatnot.
+ *
+ * @param event The event instance associated with the key down event.
+ * @return True if the input was handled, false otherwise.
+ */
+bool ScintillaCocoa::KeyboardInput(NSEvent *event) {
+	// For now filter out function keys.
+	NSString *input = event.charactersIgnoringModifiers;
+
+	bool handled = false;
+
+	// Handle each entry individually. Usually we only have one entry anyway.
+	for (size_t i = 0; i < input.length; i++) {
+		const UniChar originalKey = [input characterAtIndex: i];
+		NSEventModifierFlags modifierFlags = event.modifierFlags;
+
+		Keys key = KeyTranslate(originalKey, modifierFlags);
+
+		bool consumed = false; // Consumed as command?
+
+		if (KeyDownWithModifiers(key, TranslateModifierFlags(modifierFlags), &consumed))
+			handled = true;
+		if (consumed)
+			handled = true;
+	}
+
+	return handled;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to insert already processed text provided by the Cocoa text input system.
+ */
+ptrdiff_t ScintillaCocoa::InsertText(NSString *input, CharacterSource charSource) {
+	if ([input length] == 0) {
+		return 0;
+	}
+
+	// There may be multiple characters in input so loop over them
+	if (IsUnicodeMode()) {
+		// There may be non-BMP characters as 2 elements in NSString so
+		// convert to UTF-8 and use UTF8BytesOfLead.
+		std::string encoded = EncodedBytesString((__bridge CFStringRef)input,
+							 kCFStringEncodingUTF8);
+		std::string_view sv = encoded;
+		while (sv.length()) {
+			const unsigned char leadByte = sv[0];
+			const unsigned int bytesInCharacter = UTF8BytesOfLead[leadByte];
+			InsertCharacter(sv.substr(0, bytesInCharacter), charSource);
+			sv.remove_prefix(bytesInCharacter);
+		}
+		return encoded.length();
+	} else {
+		const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+									   vs.styles[StyleDefault].characterSet);
+		ptrdiff_t lengthInserted = 0;
+		for (NSInteger i = 0; i < [input length]; i++) {
+			NSString *character = [input substringWithRange:NSMakeRange(i, 1)];
+			std::string encoded = EncodedBytesString((__bridge CFStringRef)character,
+								 encoding);
+			lengthInserted += encoded.length();
+			InsertCharacter(encoded, charSource);
+		}
+
+		return lengthInserted;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convert from a range of characters to a range of bytes.
+ */
+NSRange ScintillaCocoa::PositionsFromCharacters(NSRange rangeCharacters) const {
+	Sci::Position start = pdoc->GetRelativePositionUTF16(0, rangeCharacters.location);
+	if (start == Sci::invalidPosition)
+		start = pdoc->Length();
+	Sci::Position end = pdoc->GetRelativePositionUTF16(start, rangeCharacters.length);
+	if (end == Sci::invalidPosition)
+		end = pdoc->Length();
+	return NSMakeRange(start, end - start);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convert from a range of characters from a range of bytes.
+ */
+NSRange ScintillaCocoa::CharactersFromPositions(NSRange rangePositions) const {
+	const Sci::Position start = pdoc->CountUTF16(0, rangePositions.location);
+	const Sci::Position len = pdoc->CountUTF16(rangePositions.location,
+					  NSMaxRange(rangePositions));
+	return NSMakeRange(start, len);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to ensure that only one selection is active for input composition as composition
+ * does not support multi-typing.
+ */
+void ScintillaCocoa::SelectOnlyMainSelection() {
+	sel.SetSelection(sel.RangeMain());
+	Redraw();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convert virtual space before selection into real space.
+ */
+void ScintillaCocoa::ConvertSelectionVirtualSpace() {
+	ClearBeforeTentativeStart();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Erase all selected text and return whether the selection is now empty.
+ * The selection may not be empty if the selection contained protected text.
+ */
+bool ScintillaCocoa::ClearAllSelections() {
+	ClearSelection(true);
+	return sel.Empty();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Start composing for IME.
+ */
+void ScintillaCocoa::CompositionStart() {
+	if (!sel.Empty()) {
+		NSLog(@"Selection not empty when starting composition");
+	}
+	pdoc->TentativeStart();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Commit the IME text.
+ */
+void ScintillaCocoa::CompositionCommit() {
+	pdoc->TentativeCommit();
+	pdoc->DecorationSetCurrentIndicator(static_cast<int>(IndicatorNumbers::Ime));
+	pdoc->DecorationFillRange(0, 0, pdoc->Length());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Remove the IME text.
+ */
+void ScintillaCocoa::CompositionUndo() {
+	pdoc->TentativeUndo();
+}
+
+//--------------------------------------------------------------------------------------------------
+/**
+ * When switching documents discard any incomplete character composition state as otherwise tries to
+ * act on the new document.
+ */
+void ScintillaCocoa::SetDocPointer(Document *document) {
+	// Drop input composition.
+	NSTextInputContext *inctxt = [NSTextInputContext currentInputContext];
+	[inctxt discardMarkedText];
+	SCIContentView *inner = ContentView();
+	[inner unmarkText];
+	Editor::SetDocPointer(document);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convert NSEvent timestamp NSTimeInterval into unsigned int milliseconds wanted by Editor methods.
+ */
+
+namespace {
+
+unsigned int TimeOfEvent(NSEvent *event) {
+	return static_cast<unsigned int>(event.timestamp * 1000);
+}
+
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by the owning view when the mouse pointer enters the control.
+ */
+void ScintillaCocoa::MouseEntered(NSEvent *event) {
+	if (!HaveMouseCapture()) {
+		WndProc(Message::SetCursor, (long int)CursorShape::Normal, 0);
+
+		// Mouse location is given in screen coordinates and might also be outside of our bounds.
+		Point location = ConvertPoint(event.locationInWindow);
+		ButtonMoveWithModifiers(location,
+					TimeOfEvent(event),
+					TranslateModifierFlags(event.modifierFlags));
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::MouseExited(NSEvent * /* event */) {
+	// Nothing to do here.
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::MouseDown(NSEvent *event) {
+	Point location = ConvertPoint(event.locationInWindow);
+	ButtonDownWithModifiers(location,
+				TimeOfEvent(event),
+				TranslateModifierFlags(event.modifierFlags));
+}
+
+void ScintillaCocoa::RightMouseDown(NSEvent *event) {
+	Point location = ConvertPoint(event.locationInWindow);
+	RightButtonDownWithModifiers(location,
+				     TimeOfEvent(event),
+				     TranslateModifierFlags(event.modifierFlags));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::MouseMove(NSEvent *event) {
+	lastMouseEvent = event;
+
+	ButtonMoveWithModifiers(ConvertPoint(event.locationInWindow),
+				TimeOfEvent(event),
+				TranslateModifierFlags(event.modifierFlags));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::MouseUp(NSEvent *event) {
+	ButtonUpWithModifiers(ConvertPoint(event.locationInWindow),
+		 TimeOfEvent(event),
+		 TranslateModifierFlags(event.modifierFlags));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::MouseWheel(NSEvent *event) {
+	bool command = (event.modifierFlags & NSEventModifierFlagCommand) != 0;
+	int dY = 0;
+
+	// In order to make scrolling with larger offset smoother we scroll less lines the larger the
+	// delta value is.
+	if (event.deltaY < 0)
+		dY = -static_cast<int>(sqrt(-10.0 * event.deltaY));
+	else
+		dY = static_cast<int>(sqrt(10.0 * event.deltaY));
+
+	if (command) {
+		// Zoom! We play with the font sizes in the styles.
+		// Number of steps/line is ignored, we just care if sizing up or down.
+		if (dY > 0.5)
+			KeyCommand(Message::ZoomIn);
+		else if (dY < -0.5)
+			KeyCommand(Message::ZoomOut);
+	} else {
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Helper methods for NSResponder actions.
+
+void ScintillaCocoa::SelectAll() {
+	Editor::SelectAll();
+}
+
+void ScintillaCocoa::DeleteBackward() {
+	KeyDownWithModifiers(Keys::Back, KeyMod::Norm, nil);
+}
+
+void ScintillaCocoa::Cut() {
+	Editor::Cut();
+}
+
+void ScintillaCocoa::Undo() {
+	Editor::Undo();
+}
+
+void ScintillaCocoa::Redo() {
+	Editor::Redo();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+bool ScintillaCocoa::ShouldDisplayPopupOnMargin() {
+	return displayPopupMenu == PopUp::All;
+}
+
+bool ScintillaCocoa::ShouldDisplayPopupOnText() {
+	return displayPopupMenu == PopUp::All || displayPopupMenu == PopUp::Text;
+}
+
+/**
+ * Creates and returns a popup menu, which is then displayed by the Cocoa framework.
+ */
+NSMenu *ScintillaCocoa::CreateContextMenu(NSEvent * /* event */) {
+	// Call ScintillaBase to create the context menu.
+	ContextMenu(Point(0, 0));
+
+	return (__bridge NSMenu *)(popup.GetID());
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * An intermediate function to forward context menu commands from the menu action handler to
+ * scintilla.
+ */
+void ScintillaCocoa::HandleCommand(NSInteger command) {
+	Command(static_cast<int>(command));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Update 'isFirstResponder' and possibly change focus state.
+ */
+void ScintillaCocoa::SetFirstResponder(bool isFirstResponder_) {
+	isFirstResponder = isFirstResponder_;
+	SetFocusActiveState();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Update 'isActive' and possibly change focus state.
+ */
+void ScintillaCocoa::ActiveStateChanged(bool isActive_) {
+	isActive = isActive_;
+	SetFocusActiveState();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Update 'hasFocus' based on first responder and active status.
+ */
+void ScintillaCocoa::SetFocusActiveState() {
+	SetFocusState(isActive && isFirstResponder);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+namespace {
+
+/**
+ * Convert from an NSColor into a ColourRGBA
+ */
+ColourRGBA ColourFromNSColor(NSColor *value) {
+	return ColourRGBA(static_cast<unsigned int>(value.redComponent * componentMaximum),
+			   static_cast<unsigned int>(value.greenComponent * componentMaximum),
+			   static_cast<unsigned int>(value.blueComponent * componentMaximum),
+			   static_cast<unsigned int>(value.alphaComponent * componentMaximum));
+}
+
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Update ViewStyle::elementBaseColours to match system preferences.
+ */
+void ScintillaCocoa::UpdateBaseElements() {
+	NSView *content = ContentView();
+	NSAppearance *saved = [NSAppearance currentAppearance];
+	[NSAppearance setCurrentAppearance:content.effectiveAppearance];
+
+	bool changed = false;
+	if (@available(macOS 10.14, *)) {
+		NSColor *textBack = [NSColor.textBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+		NSColor *noFocusBack = [NSColor.unemphasizedSelectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+		if (vs.selection.layer == Layer::Base) {
+			NSColor *selBack = [NSColor.selectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+			// 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));
+			changed = vs.SetElementBase(Element::SelectionAdditionalBack, ColourFromNSColor(modified)) || changed;
+			changed = vs.SetElementBase(Element::SelectionInactiveBack, ColourFromNSColor(noFocusBack)) || changed;
+		} else {
+			// 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];
+			const ColourRGBA colourAccent = ColourFromNSColor(accent);
+			changed = vs.SetElementBase(Element::SelectionBack, ColourRGBA(colourAccent, alpha));
+			changed = vs.SetElementBase(Element::SelectionAdditionalBack, ColourRGBA(colourAccent, alpha/2)) || changed;
+			changed = vs.SetElementBase(Element::SelectionInactiveBack, ColourRGBA(ColourFromNSColor(noFocusBack), alpha)) || changed;
+
+		}
+	}
+	if (changed) {
+		Redraw();
+	}
+
+	[NSAppearance setCurrentAppearance:saved];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * When the window is about to move, the calltip and autcoimpletion stay in the same spot,
+ * so cancel them.
+ */
+void ScintillaCocoa::WindowWillMove() {
+	AutoCompleteCancel();
+	ct.CallTipCancel();
+}
+
+// If building with old SDK, need to define version number for 10.8
+#ifndef NSAppKitVersionNumber10_8
+#define NSAppKitVersionNumber10_8 1187
+#endif
+
+//--------------------------------------------------------------------------------------------------
+
+void ScintillaCocoa::ShowFindIndicatorForRange(NSRange charRange, BOOL retaining) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+	NSView *content = ContentView();
+	if (!layerFindIndicator) {
+		layerFindIndicator = [[FindHighlightLayer alloc] init];
+		[content setWantsLayer: YES];
+		layerFindIndicator.geometryFlipped = content.layer.geometryFlipped;
+		if (std::floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8) {
+			// Content layer is unflipped on 10.9, but the indicator shows wrong unless flipped
+			layerFindIndicator.geometryFlipped = YES;
+		}
+		[content.layer addSublayer: layerFindIndicator];
+	}
+	[layerFindIndicator removeAnimationForKey: @"animateFound"];
+
+	if (charRange.length) {
+		CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
+					    vs.styles[StyleDefault].characterSet);
+		std::vector<char> buffer(charRange.length);
+		pdoc->GetCharRange(&buffer[0], charRange.location, charRange.length);
+
+		CFStringRef cfsFind = CFStringFromString(&buffer[0], charRange.length, encoding);
+		layerFindIndicator.sFind = (__bridge NSString *)cfsFind;
+		if (cfsFind)
+			CFRelease(cfsFind);
+		layerFindIndicator.retaining = retaining;
+		layerFindIndicator.positionFind = charRange.location;
+		// Message::GetStyleAt reports a signed byte but want an unsigned to index into styles
+		const char styleByte = static_cast<char>(WndProc(Message::GetStyleAt, charRange.location, 0));
+		const long style = static_cast<unsigned char>(styleByte);
+		std::vector<char> bufferFontName(WndProc(Message::StyleGetFont, style, 0) + 1);
+		WndProc(Message::StyleGetFont, style, (sptr_t)&bufferFontName[0]);
+		layerFindIndicator.sFont = @(&bufferFontName[0]);
+
+		layerFindIndicator.fontSize = WndProc(Message::StyleGetSizeFractional, style, 0) /
+					      (float)FontSizeMultiplier;
+		layerFindIndicator.widthText = WndProc(Message::PointXFromPosition, 0, charRange.location + charRange.length) -
+					       WndProc(Message::PointXFromPosition, 0, charRange.location);
+		layerFindIndicator.heightLine = WndProc(Message::TextHeight, 0, 0);
+		MoveFindIndicatorWithBounce(YES);
+	} else {
+		[layerFindIndicator hideMatch];
+	}
+#endif
+}
+
+void ScintillaCocoa::MoveFindIndicatorWithBounce(BOOL bounce) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+	if (layerFindIndicator) {
+		CGPoint ptText = CGPointMake(
+					 WndProc(Message::PointXFromPosition, 0, layerFindIndicator.positionFind),
+					 WndProc(Message::PointYFromPosition, 0, layerFindIndicator.positionFind));
+		ptText.x = ptText.x - vs.fixedColumnWidth + xOffset;
+		ptText.y += topLine * vs.lineHeight;
+		if (!layerFindIndicator.geometryFlipped) {
+			NSView *content = ContentView();
+			ptText.y = content.bounds.size.height - ptText.y;
+		}
+		[layerFindIndicator animateMatch: ptText bounce: bounce];
+	}
+#endif
+}
+
+void ScintillaCocoa::HideFindIndicator() {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+	if (layerFindIndicator) {
+		[layerFindIndicator hideMatch];
+	}
+#endif
+}
+
+
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/AppController.h b/scite-app/scintilla/cocoa/ScintillaTest/AppController.h
new file mode 100644
index 0000000..c644ebb
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/AppController.h
@@ -0,0 +1,31 @@
+/**
+ * AppController.h
+ * SciTest
+ *
+ * Created by Mike Lischke on 01.04.09.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#import <Cocoa/Cocoa.h>
+
+#include <dlfcn.h>
+
+#import "Scintilla/ILexer.h"
+#import "Scintilla/ScintillaView.h"
+#import "Scintilla/InfoBar.h"
+#include <SciLexer.h>
+#include <Lexilla.h>
+
+@interface AppController : NSObject {
+  IBOutlet NSBox *mEditHost;
+  ScintillaView* mEditor;
+  ScintillaView* sciExtra;	// For testing Scintilla tear-down
+}
+
+- (void) awakeFromNib;
+- (void) setupEditor;
+- (IBAction) searchText: (id) sender;
+- (IBAction) addRemoveExtra: (id) sender;
+
+@end
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/AppController.mm b/scite-app/scintilla/cocoa/ScintillaTest/AppController.mm
new file mode 100644
index 0000000..97c7594
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/AppController.mm
@@ -0,0 +1,316 @@
+/**
+ * AppController.mm
+ * ScintillaTest
+ *
+ * Created by Mike Lischke on 01.04.09.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#import "AppController.h"
+
+const char major_keywords[] =
+  "accessible add all alter analyze and as asc asensitive "
+  "before between bigint binary blob both by "
+  "call cascade case change char character check collate column condition connection constraint "
+    "continue convert create cross current_date current_time current_timestamp current_user cursor "
+  "database databases day_hour day_microsecond day_minute day_second dec decimal declare default "
+    "delayed delete desc describe deterministic distinct distinctrow div double drop dual "
+  "each else elseif enclosed escaped exists exit explain "
+  "false fetch float float4 float8 for force foreign from fulltext "
+  "goto grant group "
+  "having high_priority hour_microsecond hour_minute hour_second "
+  "if ignore in index infile inner inout insensitive insert int int1 int2 int3 int4 int8 integer "
+    "interval into is iterate "
+  "join "
+  "key keys kill "
+  "label leading leave left like limit linear lines load localtime localtimestamp lock long "
+    "longblob longtext loop low_priority "
+  "master_ssl_verify_server_cert match mediumblob mediumint mediumtext middleint minute_microsecond "
+    "minute_second mod modifies "
+  "natural not no_write_to_binlog null numeric "
+  "on optimize option optionally or order out outer outfile "
+  "precision primary procedure purge "
+  "range read reads read_only read_write real references regexp release rename repeat replace "
+    "require restrict return revoke right rlike "
+  "schema schemas second_microsecond select sensitive separator set show smallint spatial specific "
+    "sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl "
+    "starting straight_join "
+  "table terminated then tinyblob tinyint tinytext to trailing trigger true "
+  "undo union unique unlock unsigned update upgrade usage use using utc_date utc_time utc_timestamp "
+  "values varbinary varchar varcharacter varying "
+  "when where while with write "
+  "xor "
+  "year_month "
+  "zerofill";
+
+const char procedure_keywords[] = // Not reserved words but intrinsic part of procedure definitions.
+  "begin comment end";
+
+const char client_keywords[] = // Definition of keywords only used by clients, not the server itself.
+  "delimiter";
+
+const char user_keywords[] = // Definition of own keywords, not used by MySQL.
+  "edit";
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation AppController
+
+- (void) awakeFromNib
+{
+  // Manually set up the scintilla editor. Create an instance and dock it to our edit host.
+  // Leave some free space around the new view to avoid overlapping with the box borders.
+  NSRect newFrame = mEditHost.frame;
+  newFrame.size.width -= 2 * newFrame.origin.x;
+  newFrame.size.height -= 3 * newFrame.origin.y;
+  
+  mEditor = [[[ScintillaView alloc] initWithFrame: newFrame] autorelease];
+  
+  [mEditHost.contentView addSubview: mEditor];
+  [mEditor setAutoresizesSubviews: YES];
+  [mEditor setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+  
+  // Let's load some text for the editor, as initial content.
+  NSString *sql = [self exampleText];
+
+  [mEditor setString: sql];
+
+  [self setupEditor];
+  
+  sciExtra = nil;
+}
+
+- (NSString *) exampleText
+{
+  NSError* error = nil;
+
+  NSString* path = [[NSBundle mainBundle] pathForResource: @"TestData"
+                                                   ofType: @"sql" inDirectory: nil];
+
+  NSString *sql = [NSString stringWithContentsOfFile: path
+                                            encoding: NSUTF8StringEncoding
+                                               error: &error];
+
+  if (error && [[error domain] isEqual: NSCocoaErrorDomain])
+    NSLog(@"%@", error);
+  
+  return sql;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Initialize scintilla editor (styles, colors, markers, folding etc.].
+ */
+- (void) setupEditor
+{  
+  // Lexer type is MySQL.
+  void *lexillaDL = dlopen(LEXILLA_LIB LEXILLA_EXTENSION, RTLD_LAZY);
+  if (lexillaDL) {
+    Lexilla::CreateLexerFn createLexer =
+	  reinterpret_cast<Lexilla::CreateLexerFn>(dlsym(lexillaDL, LEXILLA_CREATELEXER));
+    if (createLexer) {
+      Scintilla::ILexer5 *pLexer = createLexer("mysql");
+      [mEditor setReferenceProperty: SCI_SETILEXER parameter: nil value: pLexer];
+    }
+  }
+
+  // Keywords to highlight. Indices are:
+  // 0 - Major keywords (reserved keywords)
+  // 1 - Normal keywords (everything not reserved but integral part of the language)
+  // 2 - Database objects
+  // 3 - Function keywords
+  // 4 - System variable keywords
+  // 5 - Procedure keywords (keywords used in procedures like "begin" and "end")
+  // 6..8 - User keywords 1..3
+  [mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 0 value: major_keywords];
+  [mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 5 value: procedure_keywords];
+  [mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 6 value: client_keywords];
+  [mEditor setReferenceProperty: SCI_SETKEYWORDS parameter: 7 value: user_keywords];
+  
+  // Colors and styles for various syntactic elements. First the default style.
+  [mEditor setStringProperty: SCI_STYLESETFONT parameter: STYLE_DEFAULT value: @"Helvetica"];
+  // [mEditor setStringProperty: SCI_STYLESETFONT parameter: STYLE_DEFAULT value: @"Monospac821 BT"]; // Very pleasing programmer's font.
+  [mEditor setGeneralProperty: SCI_STYLESETSIZE parameter: STYLE_DEFAULT value: 14];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: STYLE_DEFAULT value: [NSColor blackColor]];
+
+  [mEditor setGeneralProperty: SCI_STYLECLEARALL parameter: 0 value: 0];	
+  
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DEFAULT value: [NSColor blackColor]];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_COMMENT fromHTML: @"#097BF7"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_COMMENTLINE fromHTML: @"#097BF7"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_HIDDENCOMMAND fromHTML: @"#097BF7"];
+  [mEditor setColorProperty: SCI_STYLESETBACK parameter: SCE_MYSQL_HIDDENCOMMAND fromHTML: @"#F0F0F0"];
+  
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_VARIABLE fromHTML: @"378EA5"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_SYSTEMVARIABLE fromHTML: @"378EA5"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_KNOWNSYSTEMVARIABLE fromHTML: @"#3A37A5"];
+  
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_NUMBER fromHTML: @"#7F7F00"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_SQSTRING fromHTML: @"#FFAA3E"];
+  
+  // Note: if we were using ANSI quotes we would set the DQSTRING to the same color as the 
+  //       the back tick string.
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DQSTRING fromHTML: @"#274A6D"];
+
+  // Keyword highlighting.
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_MAJORKEYWORD fromHTML: @"#007F00"];
+  [mEditor setGeneralProperty: SCI_STYLESETBOLD parameter: SCE_MYSQL_MAJORKEYWORD value: 1];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_KEYWORD fromHTML: @"#007F00"];
+  [mEditor setGeneralProperty: SCI_STYLESETBOLD parameter: SCE_MYSQL_KEYWORD value: 1];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_PROCEDUREKEYWORD fromHTML: @"#56007F"];
+  [mEditor setGeneralProperty: SCI_STYLESETBOLD parameter: SCE_MYSQL_PROCEDUREKEYWORD value: 1];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_USER1 fromHTML: @"#808080"];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_USER2 fromHTML: @"#808080"];
+  [mEditor setColorProperty: SCI_STYLESETBACK parameter: SCE_MYSQL_USER2 fromHTML: @"#F0E0E0"];
+  
+  // The following 3 styles have no impact as we did not set a keyword list for any of them.
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_DATABASEOBJECT value: [NSColor redColor]];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_FUNCTION value: [NSColor redColor]];
+  
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_IDENTIFIER value: [NSColor blackColor]];
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: SCE_MYSQL_QUOTEDIDENTIFIER fromHTML: @"#274A6D"];
+  [mEditor setGeneralProperty: SCI_STYLESETBOLD parameter: SCE_SQL_OPERATOR value: 1];
+  
+  // Line number style.
+  [mEditor setColorProperty: SCI_STYLESETFORE parameter: STYLE_LINENUMBER fromHTML: @"#F0F0F0"];
+  [mEditor setColorProperty: SCI_STYLESETBACK parameter: STYLE_LINENUMBER fromHTML: @"#808080"];
+  
+  [mEditor setGeneralProperty: SCI_SETMARGINTYPEN parameter: 0 value: SC_MARGIN_NUMBER];
+	[mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 0 value: 35];
+  
+  // Markers.
+  [mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 1 value: 16];
+  
+  // Some special lexer properties.
+  [mEditor setLexerProperty: @"fold" value: @"1"];
+  [mEditor setLexerProperty: @"fold.compact" value: @"0"];
+  [mEditor setLexerProperty: @"fold.comment" value: @"1"];
+  [mEditor setLexerProperty: @"fold.preprocessor" value: @"1"];
+  
+  // Folder setup.
+  [mEditor setGeneralProperty: SCI_SETMARGINWIDTHN parameter: 2 value: 16];
+  [mEditor setGeneralProperty: SCI_SETMARGINMASKN parameter: 2 value: SC_MASK_FOLDERS];
+  [mEditor setGeneralProperty: SCI_SETMARGINSENSITIVEN parameter: 2 value: 1];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDEROPEN value: SC_MARK_BOXMINUS];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDER value: SC_MARK_BOXPLUS];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDERSUB value: SC_MARK_VLINE];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDERTAIL value: SC_MARK_LCORNER];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDEREND value: SC_MARK_BOXPLUSCONNECTED];
+  [mEditor setGeneralProperty: SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDEROPENMID value: SC_MARK_BOXMINUSCONNECTED];
+  [mEditor setGeneralProperty
+   : SCI_MARKERDEFINE parameter: SC_MARKNUM_FOLDERMIDTAIL value: SC_MARK_TCORNER];
+  for (int n= 25; n < 32; ++n) // Markers 25..31 are reserved for folding.
+  {
+    [mEditor setColorProperty: SCI_MARKERSETFORE parameter: n value: [NSColor whiteColor]];
+    [mEditor setColorProperty: SCI_MARKERSETBACK parameter: n value: [NSColor blackColor]];
+  }
+  
+  // Init markers & indicators for highlighting of syntax errors.
+  [mEditor setColorProperty: SCI_INDICSETFORE parameter: 0 value: [NSColor redColor]];
+  [mEditor setGeneralProperty: SCI_INDICSETUNDER parameter: 0 value: 1];
+  [mEditor setGeneralProperty: SCI_INDICSETSTYLE parameter: 0 value: INDIC_SQUIGGLE];
+  
+  [mEditor setColorProperty: SCI_MARKERSETBACK parameter: 0 fromHTML: @"#B1151C"];
+  
+  [mEditor setColorProperty: SCI_SETSELBACK parameter: 1 value: [NSColor selectedTextBackgroundColor]];
+  
+  // Uncomment if you wanna see auto wrapping in action.
+  //[mEditor setGeneralProperty: SCI_SETWRAPMODE parameter: SC_WRAP_WORD value: 0];
+  
+  InfoBar* infoBar = [[[InfoBar alloc] initWithFrame: NSMakeRect(0, 0, 400, 0)] autorelease];
+  [infoBar setDisplay: IBShowAll];
+  [mEditor setInfoBar: infoBar top: NO];
+  [mEditor setStatusText: @"Operation complete"];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/* XPM */
+static const char * box_xpm[] = {
+	"12 12 2 1",
+	" 	c None",
+	".	c #800000",
+	"   .........",
+	"  .   .   ..",
+	" .   .   . .",
+	".........  .",
+	".   .   .  .",
+	".   .   . ..",
+	".   .   .. .",
+	".........  .",
+	".   .   .  .",
+	".   .   . . ",
+	".   .   ..  ",
+	".........   "};
+
+
+- (void) showAutocompletion
+{
+	const char *words = "Babylon-5?1 Battlestar-Galactica Millennium-Falcon?2 Moya?2 Serenity Voyager";
+	[mEditor setGeneralProperty: SCI_AUTOCSETIGNORECASE parameter: 1 value:0];
+	[mEditor setGeneralProperty: SCI_REGISTERIMAGE parameter: 1 value:(sptr_t)box_xpm];
+	const int imSize = 12;
+	[mEditor setGeneralProperty: SCI_RGBAIMAGESETWIDTH parameter: imSize value:0];
+	[mEditor setGeneralProperty: SCI_RGBAIMAGESETHEIGHT parameter: imSize value:0];
+	char image[imSize * imSize * 4];
+	for (size_t y = 0; y < imSize; y++) {
+		for (size_t x = 0; x < imSize; x++) {
+			char *p = image + (y * imSize + x) * 4;
+			p[0] = 0xFF;
+			p[1] = 0xA0;
+			p[2] = 0;
+			p[3] = x * 23;
+		}
+	}
+	[mEditor setGeneralProperty: SCI_REGISTERRGBAIMAGE parameter: 2 value:(sptr_t)image];
+	[mEditor setGeneralProperty: SCI_AUTOCSHOW parameter: 0 value:(sptr_t)words];
+}
+
+- (IBAction) searchText: (id) sender
+{
+  NSSearchField* searchField = (NSSearchField*) sender;
+  [mEditor findAndHighlightText: [searchField stringValue]
+                      matchCase: NO
+                      wholeWord: NO
+                       scrollTo: YES
+                           wrap: YES];
+
+  long matchStart = [mEditor getGeneralProperty: SCI_GETSELECTIONSTART parameter: 0];
+  long matchEnd = [mEditor getGeneralProperty: SCI_GETSELECTIONEND parameter: 0];
+  [mEditor setGeneralProperty: SCI_FINDINDICATORFLASH parameter: matchStart value:matchEnd];
+
+  if ([[searchField stringValue] isEqualToString: @"XX"])
+    [self showAutocompletion];
+}
+
+- (IBAction) addRemoveExtra: (id) sender
+{
+	if (sciExtra) {
+		[sciExtra removeFromSuperview];
+		sciExtra = nil;
+	} else {
+		NSRect newFrame = mEditHost.frame;
+		newFrame.origin.x += newFrame.size.width + 5;
+		newFrame.origin.y += 46;
+		newFrame.size.width = 96;
+		newFrame.size.height -= 60;
+
+		sciExtra = [[[ScintillaView alloc] initWithFrame: newFrame] autorelease];
+		[[[mEditHost window]contentView] addSubview: sciExtra];
+		[sciExtra setGeneralProperty: SCI_SETWRAPMODE parameter: SC_WRAP_WORD value: 1];
+		NSString *sql = [self exampleText];
+		[sciExtra setString: sql];
+	}
+}
+
+-(IBAction) setFontQuality: (id) sender
+{
+    [ScintillaView directCall:mEditor message:SCI_SETFONTQUALITY wParam:[sender tag] lParam:0];
+}
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/Info.plist b/scite-app/scintilla/cocoa/ScintillaTest/Info.plist
new file mode 100644
index 0000000..ef71339
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/Scintilla-Info.plist b/scite-app/scintilla/cocoa/ScintillaTest/Scintilla-Info.plist
new file mode 100644
index 0000000..2c67ffb
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/Scintilla-Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.sun.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..4e1d2dd
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
@@ -0,0 +1,453 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
+		271FA52C0F850BE20033D021 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 271FA52B0F850BE20033D021 /* AppController.mm */; };
+		2791F4490FC1A8E9009DBCF9 /* TestData.sql in Resources */ = {isa = PBXBuildFile; fileRef = 2791F4480FC1A8E9009DBCF9 /* TestData.sql */; };
+		286F8E5125F8474400EC8D60 /* Scintilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 286F8E4E25F845B000EC8D60 /* Scintilla.framework */; };
+		286F8E5225F8474400EC8D60 /* Scintilla.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 286F8E4E25F845B000EC8D60 /* Scintilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		286F8E7525F8506B00EC8D60 /* liblexilla.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 286F8E7325F8504800EC8D60 /* liblexilla.dylib */; };
+		286F8E7625F8506B00EC8D60 /* liblexilla.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 286F8E7325F8504800EC8D60 /* liblexilla.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
+		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		286F8E4D25F845B000EC8D60 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 286F8E4925F845B000EC8D60 /* Scintilla.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 287F3C41246F8DC70040E76F;
+			remoteInfo = Scintilla;
+		};
+		286F8E7225F8504800EC8D60 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 286F8E6E25F8504800EC8D60 /* Lexilla.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 280262A5246DF655000DF3B8;
+			remoteInfo = lexilla;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		272133C20F973596006BE49A /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				286F8E7625F8506B00EC8D60 /* liblexilla.dylib in CopyFiles */,
+				286F8E5225F8474400EC8D60 /* Scintilla.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		271FA52A0F850BE20033D021 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
+		271FA52B0F850BE20033D021 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; wrapsLines = 0; };
+		2791F4480FC1A8E9009DBCF9 /* TestData.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestData.sql; sourceTree = "<group>"; };
+		286F8E4925F845B000EC8D60 /* Scintilla.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Scintilla.xcodeproj; path = ../Scintilla/Scintilla.xcodeproj; sourceTree = "<group>"; };
+		286F8E6E25F8504800EC8D60 /* Lexilla.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lexilla.xcodeproj; path = ../../../lexilla/src/Lexilla/Lexilla.xcodeproj; sourceTree = "<group>"; };
+		28E78A40224C33FE00456881 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		28E78A41224C33FE00456881 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		32CA4F630368D1EE00C91783 /* ScintillaTest_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScintillaTest_Prefix.pch; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8D1107320486CEB800E47090 /* ScintillaTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScintillaTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				286F8E5125F8474400EC8D60 /* Scintilla.framework in Frameworks */,
+				286F8E7525F8506B00EC8D60 /* liblexilla.dylib in Frameworks */,
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				271FA52A0F850BE20033D021 /* AppController.h */,
+				271FA52B0F850BE20033D021 /* AppController.mm */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* ScintillaTest.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		286F8E4A25F845B000EC8D60 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				286F8E4E25F845B000EC8D60 /* Scintilla.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		286F8E6F25F8504800EC8D60 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				286F8E7325F8504800EC8D60 /* liblexilla.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* ScintillaTest */ = {
+			isa = PBXGroup;
+			children = (
+				286F8E6E25F8504800EC8D60 /* Lexilla.xcodeproj */,
+				286F8E4925F845B000EC8D60 /* Scintilla.xcodeproj */,
+				080E96DDFE201D6D7F000001 /* Classes */,
+				29B97315FDCFA39411CA2CEA /* Other Sources */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = ScintillaTest;
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				32CA4F630368D1EE00C91783 /* ScintillaTest_Prefix.pch */,
+				29B97316FDCFA39411CA2CEA /* main.m */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				2791F4480FC1A8E9009DBCF9 /* TestData.sql */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* ScintillaTest */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ScintillaTest" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				272133C20F973596006BE49A /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ScintillaTest;
+			productInstallPath = "$(HOME)/Applications";
+			productName = ScintillaTest;
+			productReference = 8D1107320486CEB800E47090 /* ScintillaTest.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1240;
+			};
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScintillaTest" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = en;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				Base,
+				en,
+			);
+			mainGroup = 29B97314FDCFA39411CA2CEA /* ScintillaTest */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 286F8E6F25F8504800EC8D60 /* Products */;
+					ProjectRef = 286F8E6E25F8504800EC8D60 /* Lexilla.xcodeproj */;
+				},
+				{
+					ProductGroup = 286F8E4A25F845B000EC8D60 /* Products */;
+					ProjectRef = 286F8E4925F845B000EC8D60 /* Scintilla.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* ScintillaTest */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		286F8E4E25F845B000EC8D60 /* Scintilla.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Scintilla.framework;
+			remoteRef = 286F8E4D25F845B000EC8D60 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		286F8E7325F8504800EC8D60 /* liblexilla.dylib */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.dylib";
+			path = liblexilla.dylib;
+			remoteRef = 286F8E7225F8504800EC8D60 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
+				2791F4490FC1A8E9009DBCF9 /* TestData.sql in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072D0486CEB800E47090 /* main.m in Sources */,
+				271FA52C0F850BE20033D021 /* AppController.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				28E78A40224C33FE00456881 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				28E78A41224C33FE00456881 /* en */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		C01FCF4B08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = SCI_LEXER;
+				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.sun.${PRODUCT_NAME:identifier}";
+				PRODUCT_NAME = ScintillaTest;
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "";
+			};
+			name = Debug;
+		};
+		C01FCF4C08A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = SCI_LEXER;
+				HEADER_SEARCH_PATHS = "";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = "";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.sun.${PRODUCT_NAME:identifier}";
+				PRODUCT_NAME = ScintillaTest;
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "";
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
+				SDKROOT = macosx;
+				SYSTEM_HEADER_SEARCH_PATHS = "../../../lexilla/**";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				OTHER_LDFLAGS = "";
+				SDKROOT = macosx;
+				SYSTEM_HEADER_SEARCH_PATHS = "../../../lexilla/**";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ScintillaTest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Debug */,
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScintillaTest" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..b325882
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:ScintillaTest.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest_Prefix.pch b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest_Prefix.pch
new file mode 100644
index 0000000..6c74b52
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/ScintillaTest_Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'ScintillaTest' target in the 'ScintillaTest' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/TestData.sql b/scite-app/scintilla/cocoa/ScintillaTest/TestData.sql
new file mode 100644
index 0000000..2e2ebfc
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/TestData.sql
@@ -0,0 +1,215 @@
+-- MySQL Administrator dump 1.4
+--
+-- ------------------------------------------------------
+-- Server version	5.0.45
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI_QUOTES' */;
+
+/**
+ * Foldable multiline comment.
+ */
+
+-- {
+-- Create schema sakila
+-- }
+
+CREATE DATABASE IF NOT EXISTS sakila;
+USE sakila;
+DROP TABLE IF EXISTS "sakila"."actor_info";
+DROP VIEW IF EXISTS "sakila"."actor_info";
+CREATE TABLE "sakila"."actor_info" (
+  "actor_id" smallint(5) unsigned,
+  "first_name" varchar(45),
+  "last_name" varchar(45),
+  "film_info" varchar(341)
+);
+DROP TABLE IF EXISTS "sakila"."actor";
+CREATE TABLE  "sakila"."actor" (
+  "actor_id" smallint(5) unsigned NOT NULL auto_increment,
+  "first_name" varchar(45) NOT NULL,
+  "last_name" varchar(45) NOT NULL,
+  "last_update" timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  ("actor_id"),
+  KEY "idx_actor_last_name" ("last_name")
+) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8;
+INSERT INTO "sakila"."actor" VALUES  (1,'PENELOPE','GUINESS','2006-02-15 04:34:33'),
+ (2,'NICK','WAHLBERG','2006-02-15 04:34:33'),
+ (3,'ED','CHASE','2006-02-15 04:34:33'),
+ (4,'JENNIFER','DAVIS','2006-02-15 04:34:33'),
+ (149,'RUSSELL','TEMPLE','2006-02-15 04:34:33'),
+ (150,'JAYNE','NOLTE','2006-02-15 04:34:33'),
+ (151,'GEOFFREY','HESTON','2006-02-15 04:34:33'),
+ (152,'BEN','HARRIS','2006-02-15 04:34:33'),
+ (153,'MINNIE','KILMER','2006-02-15 04:34:33'),
+ (154,'MERYL','GIBSON','2006-02-15 04:34:33'),
+ (155,'IAN','TANDY','2006-02-15 04:34:33'),
+ (156,'FAY','WOOD','2006-02-15 04:34:33'),
+ (157,'GRETA','MALDEN','2006-02-15 04:34:33'),
+ (158,'VIVIEN','BASINGER','2006-02-15 04:34:33'),
+ (159,'LAURA','BRODY','2006-02-15 04:34:33'),
+ (160,'CHRIS','DEPP','2006-02-15 04:34:33'),
+ (161,'HARVEY','HOPE','2006-02-15 04:34:33'),
+ (162,'OPRAH','KILMER','2006-02-15 04:34:33'),
+ (163,'CHRISTOPHER','WEST','2006-02-15 04:34:33'),
+ (164,'HUMPHREY','WILLIS','2006-02-15 04:34:33'),
+ (165,'AL','GARLAND','2006-02-15 04:34:33'),
+ (166,'NICK','DEGENERES','2006-02-15 04:34:33'),
+ (167,'LAURENCE','BULLOCK','2006-02-15 04:34:33'),
+ (168,'WILL','WILSON','2006-02-15 04:34:33'),
+ (169,'KENNETH','HOFFMAN','2006-02-15 04:34:33'),
+ (170,'MENA','HOPPER','2006-02-15 04:34:33'),
+ (171,'OLYMPIA','PFEIFFER','2006-02-15 04:34:33'),
+ (190,'AUDREY','BAILEY','2006-02-15 04:34:33'),
+ (191,'GREGORY','GOODING','2006-02-15 04:34:33'),
+ (192,'JOHN','SUVARI','2006-02-15 04:34:33'),
+ (193,'BURT','TEMPLE','2006-02-15 04:34:33'),
+ (194,'MERYL','ALLEN','2006-02-15 04:34:33'),
+ (195,'JAYNE','SILVERSTONE','2006-02-15 04:34:33'),
+ (196,'BELA','WALKEN','2006-02-15 04:34:33'),
+ (197,'REESE','WEST','2006-02-15 04:34:33'),
+ (198,'MARY','KEITEL','2006-02-15 04:34:33'),
+ (199,'JULIA','FAWCETT','2006-02-15 04:34:33'),
+ (200,'THORA','TEMPLE','2006-02-15 04:34:33');
+
+DROP TRIGGER /*!50030 IF EXISTS */ "sakila"."payment_date";
+
+DELIMITER $$
+
+CREATE DEFINER = "root"@"localhost" TRIGGER  "sakila"."payment_date" BEFORE INSERT ON "payment" FOR EACH ROW SET NEW.payment_date = NOW() $$
+
+DELIMITER ;
+
+
+DROP TABLE IF EXISTS "sakila"."sales_by_store";
+DROP VIEW IF EXISTS "sakila"."sales_by_store";
+CREATE ALGORITHM=UNDEFINED DEFINER="root"@"localhost" SQL SECURITY DEFINER VIEW "sakila"."sales_by_store" AS select concat("c"."city",_utf8',',"cy"."country") AS "store",concat("m"."first_name",_utf8' ',"m"."last_name") AS "manager",sum("p"."amount") AS "total_sales" from ((((((("sakila"."payment" "p" join "sakila"."rental" "r" on(("p"."rental_id" = "r"."rental_id"))) join "sakila"."inventory" "i" on(("r"."inventory_id" = "i"."inventory_id"))) join "sakila"."store" "s" on(("i"."store_id" = "s"."store_id"))) join "sakila"."address" "a" on(("s"."address_id" = "a"."address_id"))) join "sakila"."city" "c" on(("a"."city_id" = "c"."city_id"))) join "sakila"."country" "cy" on(("c"."country_id" = "cy"."country_id"))) join "sakila"."staff" "m" on(("s"."manager_staff_id" = "m"."staff_id"))) group by "s"."store_id" order by "cy"."country","c"."city";
+
+--
+-- View structure for view `staff_list`
+--
+
+CREATE VIEW staff_list 
+AS 
+SELECT s.staff_id AS ID, CONCAT(s.first_name, _utf8' ', s.last_name) AS name, a.address AS address, a.postal_code AS `zip code`, a.phone AS phone,
+	city.city AS city, country.country AS country, s.store_id AS SID 
+FROM staff AS s JOIN address AS a ON s.address_id = a.address_id JOIN city ON a.city_id = city.city_id 
+	JOIN country ON city.country_id = country.country_id;
+
+--
+-- View structure for view `actor_info`
+--
+
+CREATE DEFINER=CURRENT_USER SQL SECURITY INVOKER VIEW actor_info 
+AS
+SELECT      
+a.actor_id,
+a.first_name,
+a.last_name,
+GROUP_CONCAT(DISTINCT CONCAT(c.name, ': ',
+		(SELECT GROUP_CONCAT(f.title ORDER BY f.title SEPARATOR ', ')
+                    FROM sakila.film f
+                    INNER JOIN sakila.film_category fc
+                      ON f.film_id = fc.film_id
+                    INNER JOIN sakila.film_actor fa
+                      ON f.film_id = fa.film_id
+                    WHERE fc.category_id = c.category_id
+                    AND fa.actor_id = a.actor_id
+                 )
+             )
+             ORDER BY c.name SEPARATOR '; ')
+AS film_info
+FROM sakila.actor a
+LEFT JOIN sakila.film_actor fa
+  ON a.actor_id = fa.actor_id
+LEFT JOIN sakila.film_category fc
+  ON fa.film_id = fc.film_id
+LEFT JOIN sakila.category c
+  ON fc.category_id = c.category_id
+GROUP BY a.actor_id, a.first_name, a.last_name;
+
+DELIMITER $$
+
+CREATE FUNCTION get_customer_balance(p_customer_id INT, p_effective_date DATETIME) RETURNS DECIMAL(5,2)
+    DETERMINISTIC
+    READS SQL DATA
+BEGIN
+
+       #OK, WE NEED TO CALCULATE THE CURRENT BALANCE GIVEN A CUSTOMER_ID AND A DATE
+       #THAT WE WANT THE BALANCE TO BE EFFECTIVE FOR. THE BALANCE IS:
+       #   1) RENTAL FEES FOR ALL PREVIOUS RENTALS
+       #   2) ONE DOLLAR FOR EVERY DAY THE PREVIOUS RENTALS ARE OVERDUE
+       #   3) IF A FILM IS MORE THAN RENTAL_DURATION * 2 OVERDUE, CHARGE THE REPLACEMENT_COST
+       #   4) SUBTRACT ALL PAYMENTS MADE BEFORE THE DATE SPECIFIED
+
+  DECLARE v_rentfees DECIMAL(5,2); #FEES PAID TO RENT THE VIDEOS INITIALLY
+  DECLARE v_overfees INTEGER;      #LATE FEES FOR PRIOR RENTALS
+  DECLARE v_payments DECIMAL(5,2); #SUM OF PAYMENTS MADE PREVIOUSLY
+
+  SELECT IFNULL(SUM(film.rental_rate),0) INTO v_rentfees
+    FROM film, inventory, rental
+    WHERE film.film_id = inventory.film_id
+      AND inventory.inventory_id = rental.inventory_id
+      AND rental.rental_date <= p_effective_date
+      AND rental.customer_id = p_customer_id;
+
+  SELECT IFNULL(SUM(IF((TO_DAYS(rental.return_date) - TO_DAYS(rental.rental_date)) > film.rental_duration,
+        ((TO_DAYS(rental.return_date) - TO_DAYS(rental.rental_date)) - film.rental_duration),0)),0) INTO v_overfees
+    FROM rental, inventory, film
+    WHERE film.film_id = inventory.film_id
+      AND inventory.inventory_id = rental.inventory_id
+      AND rental.rental_date <= p_effective_date
+      AND rental.customer_id = p_customer_id;
+
+
+  SELECT IFNULL(SUM(payment.amount),0) INTO v_payments
+    FROM payment
+
+    WHERE payment.payment_date <= p_effective_date
+    AND payment.customer_id = p_customer_id;
+
+  RETURN v_rentfees + v_overfees - v_payments;
+END $$
+
+DELIMITER ;
+
+DELIMITER $$
+
+CREATE FUNCTION inventory_in_stock(p_inventory_id INT) RETURNS BOOLEAN
+READS SQL DATA
+BEGIN
+    DECLARE v_rentals INT;
+    DECLARE v_out     INT;
+
+    #AN ITEM IS IN-STOCK IF THERE ARE EITHER NO ROWS IN THE rental TABLE
+    #FOR THE ITEM OR ALL ROWS HAVE return_date POPULATED
+
+    SELECT COUNT(*) INTO v_rentals
+    FROM rental
+    WHERE inventory_id = p_inventory_id;
+
+    IF v_rentals = 0 THEN
+      RETURN TRUE;
+    END IF;
+
+    SELECT COUNT(rental_id) INTO v_out
+    FROM inventory LEFT JOIN rental USING(inventory_id)
+    WHERE inventory.inventory_id = p_inventory_id
+    AND rental.return_date IS NULL;
+
+    IF v_out > 0 THEN
+      RETURN FALSE;
+    ELSE
+      RETURN TRUE;
+    END IF;
+END $$
+
+DELIMITER ;
+
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/InfoPlist.strings b/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/InfoPlist.strings
new file mode 100644
index 0000000..5e45963
Binary files /dev/null and b/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/InfoPlist.strings differ
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/MainMenu.xib b/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/MainMenu.xib
new file mode 100644
index 0000000..d2292d8
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/en.lproj/MainMenu.xib
@@ -0,0 +1,609 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <menu title="AMainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+            <items>
+                <menuItem title="NewApplication" id="56">
+                    <menu key="submenu" title="NewApplication" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About NewApplication" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Preferences…" keyEquivalent="," id="129" userLabel="121"/>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide NewApplication" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit NewApplication" keyEquivalent="q" id="136" userLabel="1111">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="New" keyEquivalent="n" id="82" userLabel="9">
+                                <connections>
+                                    <action selector="newDocument:" target="-1" id="373"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open…" keyEquivalent="o" id="72">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="374"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79" userLabel="7">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73" userLabel="1">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save" keyEquivalent="s" id="75" userLabel="3">
+                                <connections>
+                                    <action selector="saveDocument:" target="-1" id="362"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save As…" keyEquivalent="S" id="80" userLabel="8">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="saveDocumentAs:" target="-1" id="363"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Revert to Saved" id="112" userLabel="10">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="74" userLabel="2">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Page Setup..." keyEquivalent="P" id="77" userLabel="5">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="runPageLayout:" target="-1" id="87"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78" userLabel="6">
+                                <connections>
+                                    <action selector="print:" target="-1" id="86"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="217">
+                    <menu key="submenu" title="Edit" id="205">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="207">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="223"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="215">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="redo:" target="-1" id="231"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="206">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="228"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="197">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="224"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="203">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="226"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="202">
+                                <connections>
+                                    <action selector="delete:" target="-1" id="235"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="198">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="232"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="214">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Find" id="218">
+                                <menu key="submenu" title="Find" id="220">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="216">
+                                <menu key="submenu" title="Spelling and Grammar" id="200">
+                                    <items>
+                                        <menuItem title="Show Spelling…" keyEquivalent=":" id="204">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="230"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling" keyEquivalent=";" id="201">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="225"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219">
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="346">
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="348">
+                                <menu key="submenu" title="Substitutions" id="349">
+                                    <items>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="211">
+                                <menu key="submenu" title="Speech" id="212">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="196">
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="233"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="195">
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="227"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Format" id="375">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Format" id="376">
+                        <items>
+                            <menuItem title="Font" id="377">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Font" systemMenu="font" id="388">
+                                    <items>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
+                                            <connections>
+                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
+                                            <connections>
+                                                <action selector="addFontTrait:" target="420" id="421"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
+                                            <connections>
+                                                <action selector="addFontTrait:" target="420" id="422"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392">
+                                            <connections>
+                                                <action selector="underline:" target="-1" id="432"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="393"/>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
+                                            <connections>
+                                                <action selector="modifyFont:" target="420" id="425"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
+                                            <connections>
+                                                <action selector="modifyFont:" target="420" id="423"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="396"/>
+                                        <menuItem title="Kern" id="397">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Kern" id="415">
+                                                <items>
+                                                    <menuItem title="Use Default" id="416">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="417">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Tighten" id="418">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="tightenKerning:" target="-1" id="431"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Loosen" id="419">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="loosenKerning:" target="-1" id="435"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Ligature" id="398">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Ligature" id="411">
+                                                <items>
+                                                    <menuItem title="Use Default" id="412">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="413">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use All" id="414">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Baseline" id="399">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Baseline" id="405">
+                                                <items>
+                                                    <menuItem title="Use Default" id="406">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="unscript:" target="-1" id="437"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Superscript" id="407">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="superscript:" target="-1" id="430"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Subscript" id="408">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="subscript:" target="-1" id="429"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Raise" id="409">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Lower" id="410">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Font Quality" id="469">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Font Quality" id="470">
+                                                <items>
+                                                    <menuItem title="Default" id="471">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="setFontQuality:" target="450" id="475"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Non-antialiased" tag="1" id="472">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="setFontQuality:" target="450" id="476"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Antialiased" tag="2" id="473">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="setFontQuality:" target="450" id="477"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="LCD Optimized" tag="3" id="474">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="setFontQuality:" target="450" id="478"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="400"/>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
+                                            <connections>
+                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="402"/>
+                                        <menuItem title="Copy Style" keyEquivalent="c" id="403">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyFont:" target="-1" id="428"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Style" keyEquivalent="v" id="404">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteFont:" target="-1" id="436"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Text" id="378">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Text" id="379">
+                                    <items>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="380">
+                                            <connections>
+                                                <action selector="alignLeft:" target="-1" id="442"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Center" keyEquivalent="|" id="381">
+                                            <connections>
+                                                <action selector="alignCenter:" target="-1" id="445"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Justify" id="382">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="alignJustified:" target="-1" id="443"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="383">
+                                            <connections>
+                                                <action selector="alignRight:" target="-1" id="447"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="384"/>
+                                        <menuItem title="Show Ruler" id="385">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleRuler:" target="-1" id="446"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="386">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyRuler:" target="-1" id="444"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="387">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteRuler:" target="-1" id="448"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="295">
+                    <menu key="submenu" title="View" id="296">
+                        <items>
+                            <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298">
+                                <connections>
+                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="K3d-cY-vZn"/>
+                            <menuItem title="Add or Remove Extra Scintilla" keyEquivalent="d" id="zQU-z1-l5t">
+                                <connections>
+                                    <action selector="addRemoveExtra:" target="450" id="9HG-Le-GbA"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="103" userLabel="1">
+                    <menu key="submenu" title="Help" id="106" userLabel="2">
+                        <items>
+                            <menuItem title="NewApplication Help" keyEquivalent="?" id="111">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="360"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="58" width="982" height="692"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="982" height="692"/>
+                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <box autoresizesSubviews="NO" borderType="line" title="Scintilla Editor" id="451">
+                        <rect key="frame" x="17" y="16" width="844" height="606"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <view key="contentView" id="e8h-ir-tqU">
+                            <rect key="frame" x="1" y="1" width="842" height="590"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        </view>
+                    </box>
+                    <button verticalHuggingPriority="750" id="452">
+                        <rect key="frame" x="872" y="12" width="96" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Quit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="453">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="terminate:" target="-3" id="455"/>
+                        </connections>
+                    </button>
+                    <searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" id="466">
+                        <rect key="frame" x="20" y="630" width="287" height="22"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" bezelStyle="round" id="467">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </searchFieldCell>
+                        <connections>
+                            <action selector="searchText:" target="450" id="468"/>
+                        </connections>
+                    </searchField>
+                </subviews>
+            </view>
+        </window>
+        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="450" customClass="AppController">
+            <connections>
+                <outlet property="mEditHost" destination="451" id="454"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
diff --git a/scite-app/scintilla/cocoa/ScintillaTest/main.m b/scite-app/scintilla/cocoa/ScintillaTest/main.m
new file mode 100644
index 0000000..9b0c585
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaTest/main.m
@@ -0,0 +1,15 @@
+/**
+ * main.m
+ * ScintillaTest
+ *
+ * Created by Mike Lischke on 02.04.09.
+ * Copyright Sun Microsystems, Inc 2009. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, char *argv[])
+{
+    return NSApplicationMain(argc,  (const char **) argv);
+}
diff --git a/scite-app/scintilla/cocoa/ScintillaView.h b/scite-app/scintilla/cocoa/ScintillaView.h
new file mode 100644
index 0000000..7cce93e
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaView.h
@@ -0,0 +1,168 @@
+
+/**
+ * Declaration of the native Cocoa View that serves as container for the scintilla parts.
+ * @file ScintillaView.h
+ *
+ * Created by Mike Lischke.
+ *
+ * Copyright 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009, 2011 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#import <Cocoa/Cocoa.h>
+
+#import "Scintilla.h"
+
+#import "InfoBarCommunicator.h"
+
+/**
+ * Scintilla sends these two messages to the notify handler. Please refer
+ * to the Windows API doc for details about the message format.
+ */
+#define WM_COMMAND 1001
+#define WM_NOTIFY 1002
+
+/**
+ * On the Mac, there is no WM_COMMAND or WM_NOTIFY message that can be sent
+ * back to the parent. Therefore, there must be a callback handler that acts
+ * like a Windows WndProc, where Scintilla can send notifications to. Use
+ * ScintillaView registerNotifyCallback() to register such a handler.
+ * Message format is:
+ * <br>
+ * WM_COMMAND: HIWORD (wParam) = notification code, LOWORD (wParam) = control ID, lParam = ScintillaCocoa*
+ * <br>
+ * WM_NOTIFY: wParam = control ID, lParam = ptr to SCNotification structure, with hwndFrom set to ScintillaCocoa*
+ */
+typedef void(*SciNotifyFunc)(intptr_t windowid, unsigned int iMessage, uintptr_t wParam, uintptr_t lParam);
+
+extern NSString *const SCIUpdateUINotification;
+
+@protocol ScintillaNotificationProtocol
+- (void) notification: (SCNotification *) notification;
+@end
+
+/**
+ * SCIScrollView provides pre-macOS 10.14 tiling behavior.
+ */
+@interface SCIScrollView : NSScrollView;
+
+@end
+
+/**
+ * SCIMarginView draws line numbers and other margins next to the text view.
+ */
+@interface SCIMarginView : NSRulerView;
+
+@end
+
+/**
+ * SCIContentView is the Cocoa interface to the Scintilla backend. It handles text input and
+ * provides a canvas for painting the output.
+ */
+@interface SCIContentView : NSView <
+	NSTextInputClient,
+	NSUserInterfaceValidations,
+	NSDraggingSource,
+	NSDraggingDestination,
+	NSAccessibilityStaticText>;
+
+- (void) setCursor: (int) cursor; // Needed by ScintillaCocoa
+
+@end
+
+/**
+ * ScintillaView is the class instantiated by client code.
+ * It contains an NSScrollView which contains a SCIMarginView and a SCIContentView.
+ * It is responsible for providing an API and communicating to a delegate.
+ */
+@interface ScintillaView : NSView <InfoBarCommunicator, ScintillaNotificationProtocol>;
+
+@property(nonatomic, unsafe_unretained) id<ScintillaNotificationProtocol> delegate;
+@property(nonatomic, readonly) NSScrollView *scrollView;
+
++ (Class) contentViewClass;
+
+- (void) notify: (NotificationType) type message: (NSString *) message location: (NSPoint) location
+	  value: (float) value;
+- (void) setCallback: (id <InfoBarCommunicator>) callback;
+
+- (void) suspendDrawing: (BOOL) suspend;
+- (void) notification: (SCNotification *) notification;
+
+- (void) updateIndicatorIME;
+
+// Scroller handling
+- (void) setMarginWidth: (int) width;
+- (SCIContentView *) content;
+- (void) updateMarginCursors;
+
+// NSTextView compatibility layer.
+- (NSString *) string;
+- (void) setString: (NSString *) aString;
+- (void) insertText: (id) aString;
+- (void) setEditable: (BOOL) editable;
+- (BOOL) isEditable;
+- (NSRange) selectedRange;
+- (NSRange) selectedRangePositions;
+
+- (NSString *) selectedString;
+
+- (void) deleteRange: (NSRange) range;
+
+- (void) setFontName: (NSString *) font
+		size: (int) size
+		bold: (BOOL) bold
+	      italic: (BOOL) italic;
+
+// Native call through to the backend.
++ (sptr_t) directCall: (ScintillaView *) sender message: (unsigned int) message wParam: (uptr_t) wParam
+	       lParam: (sptr_t) lParam;
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam lParam: (sptr_t) lParam;
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam;
+- (sptr_t) message: (unsigned int) message;
+
+// Back end properties getters and setters.
+- (void) setGeneralProperty: (int) property parameter: (long) parameter value: (long) value;
+- (void) setGeneralProperty: (int) property value: (long) value;
+
+- (long) getGeneralProperty: (int) property;
+- (long) getGeneralProperty: (int) property parameter: (long) parameter;
+- (long) getGeneralProperty: (int) property parameter: (long) parameter extra: (long) extra;
+- (long) getGeneralProperty: (int) property ref: (const void *) ref;
+- (void) setColorProperty: (int) property parameter: (long) parameter value: (NSColor *) value;
+- (void) setColorProperty: (int) property parameter: (long) parameter fromHTML: (NSString *) fromHTML;
+- (NSColor *) getColorProperty: (int) property parameter: (long) parameter;
+- (void) setReferenceProperty: (int) property parameter: (long) parameter value: (const void *) value;
+- (const void *) getReferenceProperty: (int) property parameter: (long) parameter;
+- (void) setStringProperty: (int) property parameter: (long) parameter value: (NSString *) value;
+- (NSString *) getStringProperty: (int) property parameter: (long) parameter;
+- (void) setLexerProperty: (NSString *) name value: (NSString *) value;
+- (NSString *) getLexerProperty: (NSString *) name;
+
+// The delegate property should be used instead of registerNotifyCallback which is deprecated.
+- (void) registerNotifyCallback: (intptr_t) windowid value: (SciNotifyFunc) callback __attribute__ ( (deprecated)) ;
+
+- (void) setInfoBar: (NSView <InfoBarCommunicator> *) aView top: (BOOL) top;
+- (void) setStatusText: (NSString *) text;
+
+- (BOOL) findAndHighlightText: (NSString *) searchText
+		    matchCase: (BOOL) matchCase
+		    wholeWord: (BOOL) wholeWord
+		     scrollTo: (BOOL) scrollTo
+			 wrap: (BOOL) wrap;
+
+- (BOOL) findAndHighlightText: (NSString *) searchText
+		    matchCase: (BOOL) matchCase
+		    wholeWord: (BOOL) wholeWord
+		     scrollTo: (BOOL) scrollTo
+			 wrap: (BOOL) wrap
+		    backwards: (BOOL) backwards;
+
+- (int) findAndReplaceText: (NSString *) searchText
+		    byText: (NSString *) newText
+		 matchCase: (BOOL) matchCase
+		 wholeWord: (BOOL) wholeWord
+		     doAll: (BOOL) doAll;
+
+@end
diff --git a/scite-app/scintilla/cocoa/ScintillaView.mm b/scite-app/scintilla/cocoa/ScintillaView.mm
new file mode 100644
index 0000000..f82872d
--- /dev/null
+++ b/scite-app/scintilla/cocoa/ScintillaView.mm
@@ -0,0 +1,2213 @@
+
+/**
+ * Implementation of the native Cocoa View that serves as container for the scintilla parts.
+ * @file ScintillaView.mm
+ *
+ * Created by Mike Lischke.
+ *
+ * Copyright 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009, 2011 Sun Microsystems, Inc. All rights reserved.
+ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
+ */
+
+#include <cmath>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+
+#import "ScintillaTypes.h"
+#import "ScintillaMessages.h"
+#import "ScintillaStructures.h"
+
+#import "Debugging.h"
+#import "Geometry.h"
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+// Add backend property to ScintillaView as a private category.
+// Specified here as backend accessed by SCIMarginView and SCIContentView.
+@interface ScintillaView()
+@property(nonatomic, readonly) Scintilla::Internal::ScintillaCocoa *backend;
+@end
+
+// Two additional cursors we need, which aren't provided by Cocoa.
+static NSCursor *reverseArrowCursor;
+static NSCursor *waitCursor;
+
+NSString *const SCIUpdateUINotification = @"SCIUpdateUI";
+
+/**
+ * Provide an NSCursor object that matches the Window::Cursor enumeration.
+ */
+static NSCursor *cursorFromEnum(Window::Cursor cursor) {
+	switch (cursor) {
+	case Window::Cursor::text:
+		return [NSCursor IBeamCursor];
+	case Window::Cursor::arrow:
+		return [NSCursor arrowCursor];
+	case Window::Cursor::wait:
+		return waitCursor;
+	case Window::Cursor::horizontal:
+		return [NSCursor resizeLeftRightCursor];
+	case Window::Cursor::vertical:
+		return [NSCursor resizeUpDownCursor];
+	case Window::Cursor::reverseArrow:
+		return reverseArrowCursor;
+	case Window::Cursor::up:
+	default:
+		return [NSCursor arrowCursor];
+	}
+}
+
+@implementation SCIScrollView
+- (void) tile {
+	[super tile];
+
+#if defined(MAC_OS_X_VERSION_10_14)
+	if (std::floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_13) {
+		NSRect frame = self.contentView.frame;
+		frame.origin.x = self.verticalRulerView.requiredThickness;
+		frame.size.width -= frame.origin.x;
+		self.contentView.frame = frame;
+	}
+#endif
+}
+@end
+
+// Add marginWidth and owner properties as a private category.
+@interface SCIMarginView()
+@property(assign) int marginWidth;
+@property(nonatomic, weak) ScintillaView *owner;
+@end
+
+@implementation SCIMarginView {
+	int marginWidth;
+	ScintillaView *__weak owner;
+	NSMutableArray *currentCursors;
+}
+
+@synthesize marginWidth, owner;
+
+- (instancetype) initWithScrollView: (NSScrollView *) aScrollView {
+	self = [super initWithScrollView: aScrollView orientation: NSVerticalRuler];
+	if (self != nil) {
+		owner = nil;
+		marginWidth = 20;
+		currentCursors = [NSMutableArray arrayWithCapacity: 0];
+		for (size_t i=0; i<=SC_MAX_MARGIN; i++) {
+			[currentCursors addObject: reverseArrowCursor];
+		}
+		self.clientView = aScrollView.documentView;
+		if ([self respondsToSelector: @selector(setAccessibilityLabel:)])
+			self.accessibilityLabel = @"Scintilla Margin";
+	}
+	return self;
+}
+
+
+- (void) setFrame: (NSRect) frame {
+	super.frame = frame;
+
+	[self.window invalidateCursorRectsForView: self];
+}
+
+- (CGFloat) requiredThickness {
+	return marginWidth;
+}
+
+- (void) drawHashMarksAndLabelsInRect: (NSRect) aRect {
+	if (owner) {
+		NSRect contentRect = self.scrollView.contentView.bounds;
+		NSRect marginRect = self.bounds;
+		// Ensure paint to bottom of view to avoid glitches
+		if (marginRect.size.height > contentRect.size.height) {
+			// Legacy scroll bar mode leaves a poorly painted corner
+			aRect = marginRect;
+		}
+		owner.backend->PaintMargin(aRect);
+	}
+}
+
+/**
+ * Called by the framework if it wants to show a context menu for the margin.
+ */
+- (NSMenu *) menuForEvent: (NSEvent *) theEvent {
+	NSMenu *menu = [owner menuForEvent: theEvent];
+	if (menu) {
+		return menu;
+	} else if (owner.backend->ShouldDisplayPopupOnMargin()) {
+		return owner.backend->CreateContextMenu(theEvent);
+	} else {
+		return nil;
+	}
+}
+
+- (void) mouseDown: (NSEvent *) theEvent {
+	NSClipView *textView = self.scrollView.contentView;
+	[textView.window makeFirstResponder: textView];
+	owner.backend->MouseDown(theEvent);
+}
+
+- (void) rightMouseDown: (NSEvent *) theEvent {
+	[NSMenu popUpContextMenu: [self menuForEvent: theEvent] withEvent: theEvent forView: self];
+
+	owner.backend->RightMouseDown(theEvent);
+}
+
+- (void) mouseDragged: (NSEvent *) theEvent {
+	owner.backend->MouseMove(theEvent);
+}
+
+- (void) mouseMoved: (NSEvent *) theEvent {
+	owner.backend->MouseMove(theEvent);
+}
+
+- (void) mouseUp: (NSEvent *) theEvent {
+	owner.backend->MouseUp(theEvent);
+}
+
+// Not a simple button so return failure
+- (BOOL) accessibilityPerformPress {
+	return NO;
+}
+
+/**
+ * This method is called to give us the opportunity to define our mouse sensitive rectangle.
+ */
+- (void) resetCursorRects {
+	[super resetCursorRects];
+
+	int x = 0;
+	NSRect marginRect = self.bounds;
+	size_t co = currentCursors.count;
+	for (size_t i=0; i<co; i++) {
+		long cursType = owner.backend->WndProc(Message::GetMarginCursorN, i, 0);
+		long width =owner.backend->WndProc(Message::GetMarginWidthN, i, 0);
+		NSCursor *cc = cursorFromEnum(static_cast<Window::Cursor>(cursType));
+		currentCursors[i] = cc;
+		marginRect.origin.x = x;
+		marginRect.size.width = width;
+		[self addCursorRect: marginRect cursor: cc];
+		[cc setOnMouseEntered: YES];
+		x += width;
+	}
+}
+
+@end
+
+// Add owner property as a private category.
+@interface SCIContentView()
+@property(nonatomic, weak) ScintillaView *owner;
+@end
+
+@implementation SCIContentView {
+	ScintillaView *__weak mOwner;
+	NSCursor *mCurrentCursor;
+	NSTrackingArea *trackingArea;
+
+	// Set when we are in composition mode and partial input is displayed.
+	NSRange mMarkedTextRange;
+}
+
+@synthesize owner = mOwner;
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSView *) initWithFrame: (NSRect) frame {
+	self = [super initWithFrame: frame];
+
+	if (self != nil) {
+		// Some initialization for our view.
+		mCurrentCursor = [NSCursor arrowCursor];
+		trackingArea = nil;
+		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+
+		[self registerForDraggedTypes: @[NSStringPboardType, ScintillaRecPboardType, NSFilenamesPboardType]];
+
+		// Set up accessibility in the text role
+		if ([self respondsToSelector: @selector(setAccessibilityElement:)]) {
+			self.accessibilityElement = TRUE;
+			self.accessibilityEnabled = TRUE;
+			self.accessibilityLabel = NSLocalizedString(@"Scintilla", nil);	// No real localization
+			self.accessibilityRoleDescription = @"source code editor";
+			self.accessibilityRole = NSAccessibilityTextAreaRole;
+			self.accessibilityIdentifier = @"Scintilla";
+		}
+	}
+
+	return self;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * When the view is resized or scrolled we need to update our tracking area.
+ */
+- (void) updateTrackingAreas {
+	if (trackingArea) {
+		[self removeTrackingArea: trackingArea];
+	}
+
+	int opts = (NSTrackingActiveAlways | NSTrackingInVisibleRect | NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved);
+	trackingArea = [[NSTrackingArea alloc] initWithRect: self.bounds
+						    options: opts
+						      owner: self
+						   userInfo: nil];
+	[self addTrackingArea: trackingArea];
+	[super updateTrackingAreas];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * When the view is resized we need to let the backend know.
+ */
+- (void) setFrame: (NSRect) frame {
+	super.frame = frame;
+
+	mOwner.backend->Resize();
+
+	[super prepareContentInRect: [self visibleRect]];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by the backend if a new cursor must be set for the view.
+ */
+- (void) setCursor: (int) cursor {
+	Window::Cursor eCursor = (Window::Cursor)cursor;
+	mCurrentCursor = cursorFromEnum(eCursor);
+
+	// Trigger recreation of the cursor rectangle(s).
+	[self.window invalidateCursorRectsForView: self];
+	[mOwner updateMarginCursors];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * This method is called to give us the opportunity to define our mouse sensitive rectangle.
+ */
+- (void) resetCursorRects {
+	[super resetCursorRects];
+
+	// We only have one cursor rect: our bounds.
+	const NSRect visibleBounds = mOwner.backend->GetBounds();
+	[self addCursorRect: visibleBounds cursor: mCurrentCursor];
+	[mCurrentCursor setOnMouseEntered: YES];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called before repainting.
+ */
+- (void) viewWillDraw {
+	if (!mOwner) {
+		[super viewWillDraw];
+		return;
+	}
+
+	const NSRect *rects;
+	NSInteger nRects = 0;
+	[self getRectsBeingDrawn: &rects count: &nRects];
+	if (nRects > 0) {
+		NSRect rectUnion = rects[0];
+		for (int i=0; i<nRects; i++) {
+			rectUnion = NSUnionRect(rectUnion, rects[i]);
+		}
+		mOwner.backend->WillDraw(rectUnion);
+	}
+	[super viewWillDraw];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called before responsive scrolling overdraw.
+ */
+- (void) prepareContentInRect: (NSRect) rect {
+	if (mOwner)
+		mOwner.backend->WillDraw(rect);
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1080
+	[super prepareContentInRect: rect];
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Gets called by the runtime when the effective appearance changes.
+ */
+- (void) viewDidChangeEffectiveAppearance {
+	if (mOwner.backend) {
+		mOwner.backend->UpdateBaseElements();
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Gets called by the runtime when the view needs repainting.
+ */
+- (void) drawRect: (NSRect) rect {
+	CGContextRef context = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+
+	if (!mOwner.backend->Draw(rect, context)) {
+		dispatch_async(dispatch_get_main_queue(), ^ {
+			[self setNeedsDisplay: YES];
+		});
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Windows uses a client coordinate system where the upper left corner is the origin in a window
+ * (and so does Scintilla). We have to adjust for that. However by returning YES here, we are
+ * already done with that.
+ * Note that because of returning YES here most coordinates we use now (e.g. for painting,
+ * invalidating rectangles etc.) are given with +Y pointing down!
+ */
+- (BOOL) isFlipped {
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) isOpaque {
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Implement the "click through" behavior by telling the caller we accept the first mouse event too.
+ */
+- (BOOL) acceptsFirstMouse: (NSEvent *) theEvent {
+#pragma unused(theEvent)
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Make this view accepting events as first responder.
+ */
+- (BOOL) acceptsFirstResponder {
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by the framework if it wants to show a context menu for the editor.
+ */
+- (NSMenu *) menuForEvent: (NSEvent *) theEvent {
+	NSMenu *menu = [mOwner menuForEvent: theEvent];
+	if (menu) {
+		return menu;
+	} else if (mOwner.backend->ShouldDisplayPopupOnText()) {
+		return mOwner.backend->CreateContextMenu(theEvent);
+	} else {
+		return nil;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// Adoption of NSTextInputClient protocol.
+
+- (NSAttributedString *) attributedSubstringForProposedRange: (NSRange) aRange actualRange: (NSRangePointer) actualRange {
+	const NSInteger lengthCharacters = self.accessibilityNumberOfCharacters;
+	if (aRange.location > lengthCharacters) {
+		return nil;
+	}
+	const NSRange posRange = mOwner.backend->PositionsFromCharacters(aRange);
+	// The backend validated aRange and may have removed characters beyond the end of the document.
+	const NSRange charRange = mOwner.backend->CharactersFromPositions(posRange);
+	if (!NSEqualRanges(aRange, charRange)) {
+		*actualRange = charRange;
+	}
+
+	[mOwner message: SCI_SETTARGETRANGE wParam: posRange.location lParam: NSMaxRange(posRange)];
+	std::string text([mOwner message: SCI_TARGETASUTF8], 0);
+	[mOwner message: SCI_TARGETASUTF8 wParam: 0 lParam: reinterpret_cast<sptr_t>(&text[0])];
+	text = FixInvalidUTF8(text);
+	NSString *result = @(text.c_str());
+	NSMutableAttributedString *asResult = [[NSMutableAttributedString alloc] initWithString: result];
+
+	const NSRange rangeAS = NSMakeRange(0, asResult.length);
+	// SCI_GETSTYLEAT reports a signed byte but want an unsigned to index into styles
+	const char styleByte = static_cast<char>([mOwner message: SCI_GETSTYLEAT wParam: posRange.location]);
+	const long style = static_cast<unsigned char>(styleByte);
+	std::string fontName([mOwner message: SCI_STYLEGETFONT wParam: style lParam: 0], 0);
+	[mOwner message: SCI_STYLEGETFONT wParam: style lParam: (sptr_t)&fontName[0]];
+	const CGFloat fontSize = [mOwner message: SCI_STYLEGETSIZEFRACTIONAL wParam: style] / 100.0f;
+	NSString *sFontName = @(fontName.c_str());
+	NSFont *font = [NSFont fontWithName: sFontName size: fontSize];
+	if (font) {
+		[asResult addAttribute: NSFontAttributeName value: font range: rangeAS];
+	}
+
+	return asResult;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSUInteger) characterIndexForPoint: (NSPoint) point {
+	const NSRect rectPoint = {point, NSZeroSize};
+	const NSRect rectInWindow = [self.window convertRectFromScreen: rectPoint];
+	const NSRect rectLocal = [self.superview.superview convertRect: rectInWindow fromView: nil];
+
+	const long position = [mOwner message: SCI_CHARPOSITIONFROMPOINT
+				       wParam: rectLocal.origin.x
+				       lParam: rectLocal.origin.y];
+	if (position == Sci::invalidPosition) {
+		return NSNotFound;
+	} else {
+		const NSRange index = mOwner.backend->CharactersFromPositions(NSMakeRange(position, 0));
+		return index.location;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) doCommandBySelector: (SEL) selector {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+	if ([self respondsToSelector: selector])
+		[self performSelector: selector withObject: nil];
+#pragma clang diagnostic pop
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSRect) firstRectForCharacterRange: (NSRange) aRange actualRange: (NSRangePointer) actualRange {
+#pragma unused(actualRange)
+	const NSRange posRange = mOwner.backend->PositionsFromCharacters(aRange);
+
+	NSRect rect;
+	rect.origin.x = [mOwner message: SCI_POINTXFROMPOSITION wParam: 0 lParam: posRange.location];
+	rect.origin.y = [mOwner message: SCI_POINTYFROMPOSITION wParam: 0 lParam: posRange.location];
+	const NSUInteger rangeEnd = NSMaxRange(posRange);
+	rect.size.width = [mOwner message: SCI_POINTXFROMPOSITION wParam: 0 lParam: rangeEnd] - rect.origin.x;
+	rect.size.height = [mOwner message: SCI_POINTYFROMPOSITION wParam: 0 lParam: rangeEnd] - rect.origin.y;
+	rect.size.height += [mOwner message: SCI_TEXTHEIGHT wParam: 0 lParam: 0];
+	const NSRect rectInWindow = [self.superview.superview convertRect: rect toView: nil];
+	const NSRect rectScreen = [self.window convertRectToScreen: rectInWindow];
+
+	return rectScreen;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) hasMarkedText {
+	return mMarkedTextRange.length > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * General text input. Used to insert new text at the current input position, replacing the current
+ * selection if there is any.
+ * First removes the replacementRange.
+ */
+- (void) insertText: (id) aString replacementRange: (NSRange) replacementRange {
+	if ((mMarkedTextRange.location != NSNotFound) && (replacementRange.location != NSNotFound)) {
+		NSLog(@"Trying to insertText when there is both a marked range and a replacement range");
+	}
+
+	// Remove any previously marked text first.
+	mOwner.backend->CompositionUndo();
+	if (mMarkedTextRange.location != NSNotFound) {
+		const NSRange posRangeMark = mOwner.backend->PositionsFromCharacters(mMarkedTextRange);
+		[mOwner message: SCI_SETEMPTYSELECTION wParam: posRangeMark.location];
+	}
+	mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+
+	if (replacementRange.location == (NSNotFound-1))
+		// This occurs when the accent popup is visible and menu selected.
+		// Its replacing a non-existent position so do nothing.
+		return;
+
+	if (replacementRange.location != NSNotFound) {
+		const NSRange posRangeReplacement = mOwner.backend->PositionsFromCharacters(replacementRange);
+		[mOwner message: SCI_DELETERANGE
+			 wParam: posRangeReplacement.location
+			 lParam: posRangeReplacement.length];
+		[mOwner message: SCI_SETEMPTYSELECTION wParam: posRangeReplacement.location];
+	}
+
+	NSString *newText = @"";
+	if ([aString isKindOfClass: [NSString class]])
+		newText = (NSString *) aString;
+	else if ([aString isKindOfClass: [NSAttributedString class]])
+		newText = (NSString *) [aString string];
+
+	mOwner.backend->InsertText(newText, CharacterSource::DirectInput);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSRange) markedRange {
+	return mMarkedTextRange;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSRange) selectedRange {
+	const NSRange posRangeSel = [mOwner selectedRangePositions];
+	if (posRangeSel.length == 0) {
+		NSTextInputContext *tic = [NSTextInputContext currentInputContext];
+		// Chinese input causes malloc crash when empty selection returned with actual
+		// position so return NSNotFound.
+		// If this is applied to European input, it stops the accented character
+		// chooser from appearing.
+		// May need to add more input source names.
+		if ([tic.selectedKeyboardInputSource
+				isEqualToString: @"com.apple.inputmethod.TCIM.Cangjie"]) {
+			return NSMakeRange(NSNotFound, 0);
+		}
+	}
+	return mOwner.backend->CharactersFromPositions(posRangeSel);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by the input manager to set text which might be combined with further input to form
+ * the final text (e.g. composition of ^ and a to â).
+ *
+ * @param aString The text to insert, either what has been marked already or what is selected already
+ *                or simply added at the current insertion point. Depending on what is available.
+ * @param range The range of the new text to select (given relative to the insertion point of the new text).
+ * @param replacementRange The range to remove before insertion.
+ */
+- (void) setMarkedText: (id) aString selectedRange: (NSRange) range replacementRange: (NSRange) replacementRange {
+	NSString *newText = @"";
+	if ([aString isKindOfClass: [NSString class]])
+		newText = (NSString *) aString;
+	else if ([aString isKindOfClass: [NSAttributedString class]])
+		newText = (NSString *) [aString string];
+
+	// Replace marked text if there is one.
+	if (mMarkedTextRange.length > 0) {
+		mOwner.backend->CompositionUndo();
+		if (replacementRange.location != NSNotFound) {
+			// This situation makes no sense and has not occurred in practice.
+			NSLog(@"Can not handle a replacement range when there is also a marked range");
+		} else {
+			replacementRange = mMarkedTextRange;
+			const NSRange posRangeMark = mOwner.backend->PositionsFromCharacters(mMarkedTextRange);
+			[mOwner message: SCI_SETEMPTYSELECTION wParam: posRangeMark.location];
+		}
+	} else {
+		// Must perform deletion before entering composition mode or else
+		// both document and undo history will not contain the deleted text
+		// leading to an inaccurate and unusable undo history.
+
+		// Convert selection virtual space into real space
+		mOwner.backend->ConvertSelectionVirtualSpace();
+
+		if (replacementRange.location != NSNotFound) {
+			const NSRange posRangeReplacement = mOwner.backend->PositionsFromCharacters(replacementRange);
+			[mOwner message: SCI_DELETERANGE
+				 wParam: posRangeReplacement.location
+				 lParam: posRangeReplacement.length];
+		} else { // No marked or replacement range, so replace selection
+			if (!mOwner.backend->ScintillaCocoa::ClearAllSelections()) {
+				// Some of the selection is protected so can not perform composition here
+				return;
+			}
+			// Ensure only a single selection.
+			mOwner.backend->SelectOnlyMainSelection();
+			const NSRange posRangeSel = [mOwner selectedRangePositions];
+			replacementRange = mOwner.backend->CharactersFromPositions(posRangeSel);
+		}
+	}
+
+	// To support IME input to multiple selections, the following code would
+	// need to insert newText at each selection, mark each piece of new text and then
+	// select range relative to each insertion.
+
+	if (newText.length) {
+		// Switching into composition.
+		mOwner.backend->CompositionStart();
+
+		NSRange posRangeCurrent = mOwner.backend->PositionsFromCharacters(NSMakeRange(replacementRange.location, 0));
+		// Note: Scintilla internally works almost always with bytes instead chars, so we need to take
+		//       this into account when determining selection ranges and such.
+		ptrdiff_t lengthInserted = mOwner.backend->InsertText(newText, CharacterSource::TentativeInput);
+		posRangeCurrent.length = lengthInserted;
+		mMarkedTextRange = mOwner.backend->CharactersFromPositions(posRangeCurrent);
+		// Mark the just inserted text. Keep the marked range for later reset.
+		[mOwner setGeneralProperty: SCI_SETINDICATORCURRENT value: INDICATOR_IME];
+		[mOwner setGeneralProperty: SCI_INDICATORFILLRANGE
+				 parameter: posRangeCurrent.location
+				     value: posRangeCurrent.length];
+	} else {
+		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+		// Re-enable undo action collection if composition ended (indicated by an empty mark string).
+		mOwner.backend->CompositionCommit();
+	}
+
+	// Select the part which is indicated in the given range. It does not scroll the caret into view.
+	if (range.length > 0) {
+		// range is in characters so convert to bytes for selection.
+		range.location += replacementRange.location;
+		NSRange posRangeSelect = mOwner.backend->PositionsFromCharacters(range);
+		[mOwner setGeneralProperty: SCI_SETSELECTION parameter: NSMaxRange(posRangeSelect) value: posRangeSelect.location];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) unmarkText {
+	if (mMarkedTextRange.length > 0) {
+		mOwner.backend->CompositionCommit();
+		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSArray *) validAttributesForMarkedText {
+	return @[];
+}
+
+// End of the NSTextInputClient protocol adoption.
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Generic input method. It is used to pass on keyboard input to Scintilla. The control itself only
+ * handles shortcuts. The input is then forwarded to the Cocoa text input system, which in turn does
+ * its own input handling (character composition via NSTextInputClient protocol):
+ */
+- (void) keyDown: (NSEvent *) theEvent {
+	bool handled = false;
+	if (mMarkedTextRange.length == 0)
+		handled = mOwner.backend->KeyboardInput(theEvent);
+	if (!handled) {
+		NSArray *events = @[theEvent];
+		[self interpretKeyEvents: events];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseDown: (NSEvent *) theEvent {
+	mOwner.backend->MouseDown(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseDragged: (NSEvent *) theEvent {
+	mOwner.backend->MouseMove(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseUp: (NSEvent *) theEvent {
+	mOwner.backend->MouseUp(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseMoved: (NSEvent *) theEvent {
+	mOwner.backend->MouseMove(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseEntered: (NSEvent *) theEvent {
+	mOwner.backend->MouseEntered(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) mouseExited: (NSEvent *) theEvent {
+	mOwner.backend->MouseExited(theEvent);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Implementing scrollWheel makes scrolling work better even if just
+ * calling super.
+ * Mouse wheel with command key may magnify text if enabled.
+ * Pinch gestures and key commands can also be used for magnification.
+ */
+- (void) scrollWheel: (NSEvent *) theEvent {
+#ifdef SCROLL_WHEEL_MAGNIFICATION
+	if (([theEvent modifierFlags] & NSEventModifierFlagCommand) != 0) {
+		mOwner.backend->MouseWheel(theEvent);
+		return;
+	}
+#endif
+	[super scrollWheel: theEvent];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Ensure scrolling is aligned to whole lines instead of starting part-way through a line
+ */
+- (NSRect) adjustScroll: (NSRect) proposedVisibleRect {
+	if (!mOwner)
+		return proposedVisibleRect;
+	NSRect rc = proposedVisibleRect;
+	// Snap to lines
+	NSRect contentRect = self.bounds;
+	if ((rc.origin.y > 0) && (NSMaxY(rc) < contentRect.size.height)) {
+		// 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;
+	}
+	// 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));
+	}
+	return rc;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * The editor is getting the foreground control (the one getting the input focus).
+ */
+- (BOOL) becomeFirstResponder {
+	mOwner.backend->SetFirstResponder(true);
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * The editor is losing the input focus.
+ */
+- (BOOL) resignFirstResponder {
+	mOwner.backend->SetFirstResponder(false);
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Implement NSDraggingSource.
+ */
+
+- (NSDragOperation) draggingSession: (NSDraggingSession *) session
+	sourceOperationMaskForDraggingContext: (NSDraggingContext) context {
+#pragma unused(session)
+	switch (context) {
+	case NSDraggingContextOutsideApplication:
+		return NSDragOperationCopy | NSDragOperationMove | NSDragOperationDelete;
+
+	case NSDraggingContextWithinApplication:
+	default:
+		return NSDragOperationCopy | NSDragOperationMove | NSDragOperationDelete;
+	}
+}
+
+- (void) draggingSession: (NSDraggingSession *) session
+	    movedToPoint: (NSPoint) screenPoint {
+#pragma unused(session, screenPoint)
+}
+
+- (void) draggingSession: (NSDraggingSession *) session
+	    endedAtPoint: (NSPoint) screenPoint
+	       operation: (NSDragOperation) operation {
+#pragma unused(session, screenPoint)
+	if (operation == NSDragOperationDelete) {
+		mOwner.backend->WndProc(Message::Clear, 0, 0);
+	}
+}
+
+/**
+ * Implement NSDraggingDestination.
+ */
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called when an external drag operation enters the view.
+ */
+- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>) sender {
+	return mOwner.backend->DraggingEntered(sender);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called frequently during an external drag operation if we are the target.
+ */
+- (NSDragOperation) draggingUpdated: (id <NSDraggingInfo>) sender {
+	return mOwner.backend->DraggingUpdated(sender);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Drag image left the view. Clean up if necessary.
+ */
+- (void) draggingExited: (id <NSDraggingInfo>) sender {
+	mOwner.backend->DraggingExited(sender);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) prepareForDragOperation: (id <NSDraggingInfo>) sender {
+#pragma unused(sender)
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) performDragOperation: (id <NSDraggingInfo>) sender {
+	return mOwner.backend->PerformDragOperation(sender);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Drag operation is done. Notify editor.
+ */
+- (void) concludeDragOperation: (id <NSDraggingInfo>) sender {
+	// Clean up is the same as if we are no longer the drag target.
+	mOwner.backend->DraggingExited(sender);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+// NSResponder actions.
+
+- (void) selectAll: (id) sender {
+#pragma unused(sender)
+	mOwner.backend->SelectAll();
+}
+
+- (void) deleteBackward: (id) sender {
+#pragma unused(sender)
+	mOwner.backend->DeleteBackward();
+}
+
+- (void) cut: (id) sender {
+#pragma unused(sender)
+	mOwner.backend->Cut();
+}
+
+- (void) copy: (id) sender {
+#pragma unused(sender)
+	mOwner.backend->Copy();
+}
+
+- (void) paste: (id) sender {
+#pragma unused(sender)
+	if (mMarkedTextRange.location != NSNotFound) {
+		[[NSTextInputContext currentInputContext] discardMarkedText];
+		mOwner.backend->CompositionCommit();
+		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+	}
+	mOwner.backend->Paste();
+}
+
+- (void) undo: (id) sender {
+#pragma unused(sender)
+	if (mMarkedTextRange.location != NSNotFound) {
+		[[NSTextInputContext currentInputContext] discardMarkedText];
+		mOwner.backend->CompositionCommit();
+		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
+	}
+	mOwner.backend->Undo();
+}
+
+- (void) redo: (id) sender {
+#pragma unused(sender)
+	mOwner.backend->Redo();
+}
+
+- (BOOL) canUndo {
+	return mOwner.backend->CanUndo() && (mMarkedTextRange.location == NSNotFound);
+}
+
+- (BOOL) canRedo {
+	return mOwner.backend->CanRedo();
+}
+
+- (BOOL) validateUserInterfaceItem: (id <NSValidatedUserInterfaceItem>) anItem {
+	SEL action = anItem.action;
+	if (action==@selector(undo:)) {
+		return [self canUndo];
+	} else if (action==@selector(redo:)) {
+		return [self canRedo];
+	} else if (action==@selector(cut:) || action==@selector(copy:) || action==@selector(clear:)) {
+		return mOwner.backend->HasSelection();
+	} else if (action==@selector(paste:)) {
+		return mOwner.backend->CanPaste();
+	}
+	return YES;
+}
+
+- (void) clear: (id) sender {
+	[self deleteBackward: sender];
+}
+
+- (BOOL) isEditable {
+	return mOwner.backend->WndProc(Message::GetReadOnly, 0, 0) == 0;
+}
+
+#pragma mark - NSAccessibility
+
+//--------------------------------------------------------------------------------------------------
+
+// Adoption of NSAccessibility protocol.
+// NSAccessibility wants to pass ranges in UTF-16 code units, not bytes (like Scintilla)
+// or characters.
+// Needs more testing with non-ASCII and non-BMP text.
+// Needs to take account of folding and wraping.
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Text of the whole document as a string.
+ */
+- (id) accessibilityValue {
+	const sptr_t length = [mOwner message: SCI_GETLENGTH];
+	return mOwner.backend->RangeTextAsString(NSMakeRange(0, length));
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Line of the caret.
+ */
+- (NSInteger) accessibilityInsertionPointLineNumber {
+	const Sci::Position caret = [mOwner message: SCI_GETCURRENTPOS];
+	const NSRange rangeCharactersCaret = mOwner.backend->CharactersFromPositions(NSMakeRange(caret, 0));
+	return mOwner.backend->VisibleLineForIndex(rangeCharactersCaret.location);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Not implemented and not called by VoiceOver.
+ */
+- (NSRange) accessibilityRangeForPosition: (NSPoint) point {
+	return NSMakeRange(0, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Number of characters in the whole document.
+ */
+- (NSInteger) accessibilityNumberOfCharacters {
+	sptr_t length = [mOwner message: SCI_GETLENGTH];
+	const NSRange posRange = mOwner.backend->CharactersFromPositions(NSMakeRange(length, 0));
+	return posRange.location;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : The selection text as a string.
+ */
+- (NSString *) accessibilitySelectedText {
+	const sptr_t positionBegin = [mOwner message: SCI_GETSELECTIONSTART];
+	const sptr_t positionEnd = [mOwner message: SCI_GETSELECTIONEND];
+	const NSRange posRangeSel = NSMakeRange(positionBegin, positionEnd-positionBegin);
+	return mOwner.backend->RangeTextAsString(posRangeSel);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : The character range of the main selection.
+ */
+- (NSRange) accessibilitySelectedTextRange {
+	const sptr_t positionBegin = [mOwner message: SCI_GETSELECTIONSTART];
+	const sptr_t positionEnd = [mOwner message: SCI_GETSELECTIONEND];
+	const NSRange posRangeSel = NSMakeRange(positionBegin, positionEnd-positionBegin);
+	return mOwner.backend->CharactersFromPositions(posRangeSel);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : The setter for accessibilitySelectedTextRange.
+ * This method is the only setter required for reasonable VoiceOver behaviour.
+ */
+- (void) setAccessibilitySelectedTextRange: (NSRange) range {
+	NSRange rangePositions = mOwner.backend->PositionsFromCharacters(range);
+	[mOwner message: SCI_SETSELECTION wParam: rangePositions.location lParam: NSMaxRange(rangePositions)];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Range of the glyph at a character index.
+ * Currently doesn't try to handle composite characters.
+ */
+- (NSRange) accessibilityRangeForIndex: (NSInteger) index {
+	sptr_t length = [mOwner message: SCI_GETLENGTH];
+	const NSRange rangeLength = mOwner.backend->CharactersFromPositions(NSMakeRange(length, 0));
+	NSRange rangePositions = NSMakeRange(length, 0);
+	if (index < rangeLength.location) {
+		rangePositions = mOwner.backend->PositionsFromCharacters(NSMakeRange(index, 1));
+	}
+	return mOwner.backend->CharactersFromPositions(rangePositions);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : All the text ranges.
+ * Currently only returns the main selection.
+ */
+- (NSArray<NSValue *> *) accessibilitySelectedTextRanges {
+	const sptr_t positionBegin = [mOwner message: SCI_GETSELECTIONSTART];
+	const sptr_t positionEnd = [mOwner message: SCI_GETSELECTIONEND];
+	const NSRange posRangeSel = NSMakeRange(positionBegin, positionEnd-positionBegin);
+	NSRange rangeCharacters = mOwner.backend->CharactersFromPositions(posRangeSel);
+	NSValue *valueRange = [NSValue valueWithRange: (NSRange)rangeCharacters];
+	return @[valueRange];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Character range currently visible.
+ */
+- (NSRange) accessibilityVisibleCharacterRange {
+	const sptr_t lineTopVisible = [mOwner message: SCI_GETFIRSTVISIBLELINE];
+	const sptr_t lineTop = [mOwner message: SCI_DOCLINEFROMVISIBLE wParam: lineTopVisible];
+	const sptr_t lineEndVisible = lineTopVisible + [mOwner message: SCI_LINESONSCREEN] - 1;
+	const sptr_t lineEnd = [mOwner message: SCI_DOCLINEFROMVISIBLE wParam: lineEndVisible];
+	const sptr_t posStartView = [mOwner message: SCI_POSITIONFROMLINE wParam: lineTop];
+	const sptr_t posEndView = [mOwner message: SCI_GETLINEENDPOSITION wParam: lineEnd];
+	const NSRange posRangeSel = NSMakeRange(posStartView, posEndView-posStartView);
+	return mOwner.backend->CharactersFromPositions(posRangeSel);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Character range of a line.
+ */
+- (NSRange) accessibilityRangeForLine: (NSInteger) line {
+	return mOwner.backend->RangeForVisibleLine(line);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Line number of a text position in characters.
+ */
+- (NSInteger) accessibilityLineForIndex: (NSInteger) index {
+	return mOwner.backend->VisibleLineForIndex(index);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : A rectangle that covers a range which will be shown as the
+ * VoiceOver cursor.
+ * Producing a nice rectangle is a little tricky particularly when including new
+ * lines. Needs to improve the case where parts of two lines are included.
+ */
+- (NSRect) accessibilityFrameForRange: (NSRange) range {
+	const NSRect rectInView = mOwner.backend->FrameForRange(range);
+	const NSRect rectInWindow = [self.superview.superview convertRect: rectInView toView: nil];
+	return [self.window convertRectToScreen: rectInWindow];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : A range of text as a string.
+ */
+- (NSString *) accessibilityStringForRange: (NSRange) range {
+	const NSRange posRange = mOwner.backend->PositionsFromCharacters(range);
+	return mOwner.backend->RangeTextAsString(posRange);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : A range of text as an attributed string.
+ * Currently no attributes are set.
+ */
+- (NSAttributedString *) accessibilityAttributedStringForRange: (NSRange) range {
+	const NSRange posRange = mOwner.backend->PositionsFromCharacters(range);
+	NSString *result = mOwner.backend->RangeTextAsString(posRange);
+	return [[NSMutableAttributedString alloc] initWithString: result];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * NSAccessibility : Show the context menu at the caret.
+ */
+- (BOOL) accessibilityPerformShowMenu {
+	const sptr_t caret = [mOwner message: SCI_GETCURRENTPOS];
+	NSRect rect;
+	rect.origin.x = [mOwner message: SCI_POINTXFROMPOSITION wParam: 0 lParam: caret];
+	rect.origin.y = [mOwner message: SCI_POINTYFROMPOSITION wParam: 0 lParam: caret];
+	rect.origin.y += [mOwner message: SCI_TEXTHEIGHT wParam: 0 lParam: 0];
+	rect.size.width = 1.0;
+	rect.size.height = 1.0;
+	NSRect rectInWindow = [self.superview.superview convertRect: rect toView: nil];
+	NSPoint pt = rectInWindow.origin;
+	NSEvent *event = [NSEvent mouseEventWithType: NSEventTypeRightMouseDown
+					    location: pt
+				       modifierFlags: 0
+					   timestamp: 0
+					windowNumber: self.window.windowNumber
+					     context: nil
+					 eventNumber: 0
+					  clickCount: 1
+					    pressure: 0.0];
+	NSMenu *menu = mOwner.backend->CreateContextMenu(event);
+	[NSMenu popUpContextMenu: menu withEvent: event forView: self];
+	return YES;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+
+@end
+
+//--------------------------------------------------------------------------------------------------
+
+@implementation ScintillaView {
+	// The back end is kind of a controller and model in one.
+	// It uses the content view for display.
+	Scintilla::Internal::ScintillaCocoa *mBackend;
+
+	// This is the actual content to which the backend renders itself.
+	SCIContentView *mContent;
+
+	NSScrollView *scrollView;
+	SCIMarginView *marginView;
+
+	CGFloat zoomDelta;
+
+	// Area to display additional controls (e.g. zoom info, caret position, status info).
+	NSView <InfoBarCommunicator> *mInfoBar;
+	BOOL mInfoBarAtTop;
+
+	id<ScintillaNotificationProtocol> __unsafe_unretained mDelegate;
+}
+
+@synthesize backend = mBackend;
+@synthesize delegate = mDelegate;
+@synthesize scrollView;
+
+/**
+ * ScintillaView is a composite control made from an NSView and an embedded NSView that is
+ * used as canvas for the output (by the backend, using its CGContext), plus other elements
+ * (scrollers, info bar).
+ */
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Initialize custom cursor.
+ */
++ (void) initialize {
+	if (self == [ScintillaView class]) {
+		NSBundle *bundle = [NSBundle bundleForClass: [ScintillaView class]];
+
+		NSString *path = [bundle pathForResource: @"mac_cursor_busy" ofType: @"tiff" inDirectory: nil];
+		NSImage *image = [[NSImage alloc] initWithContentsOfFile: path];
+		waitCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(2, 2)];
+
+		path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"tiff" inDirectory: nil];
+		image = [[NSImage alloc] initWithContentsOfFile: path];
+		reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(15, 2)];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specify the SCIContentView class. Can be overridden in a subclass to provide an SCIContentView subclass.
+ */
+
++ (Class) contentViewClass {
+	return [SCIContentView class];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Receives zoom messages, for example when a "pinch zoom" is performed on the trackpad.
+ */
+- (void) magnifyWithEvent: (NSEvent *) event {
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
+	zoomDelta += event.magnification * 10.0;
+
+	if (std::abs(zoomDelta)>=1.0) {
+		long zoomFactor = static_cast<long>([self getGeneralProperty: SCI_GETZOOM] + zoomDelta);
+		[self setGeneralProperty: SCI_SETZOOM parameter: zoomFactor value: 0];
+		zoomDelta = 0.0;
+	}
+#endif
+}
+
+- (void) beginGestureWithEvent: (NSEvent *) event {
+// Scintilla is only interested in this event as the starft of a zoom
+#pragma unused(event)
+	zoomDelta = 0.0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sends a new notification of the given type to the default notification center.
+ */
+- (void) sendNotification: (NSString *) notificationName {
+	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+	[center postNotificationName: notificationName object: self];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Called by a connected component (usually the info bar) if something changed there.
+ *
+ * @param type The type of the notification.
+ * @param message Carries the new status message if the type is a status message change.
+ * @param location Carries the new location (e.g. caret) if the type is a caret change or similar type.
+ * @param value Carries the new zoom value if the type is a zoom change.
+ */
+- (void) notify: (NotificationType) type message: (NSString *) message location: (NSPoint) location
+	  value: (float) value {
+// These parameters are just to conform to the protocol
+#pragma unused(message)
+#pragma unused(location)
+	switch (type) {
+	case IBNZoomChanged: {
+			// Compute point increase/decrease based on default font size.
+			long fontSize = [self getGeneralProperty: SCI_STYLEGETSIZE parameter: STYLE_DEFAULT];
+			int zoom = (int)(fontSize * (value - 1));
+			[self setGeneralProperty: SCI_SETZOOM value: zoom];
+			break;
+		}
+	default:
+		break;
+	};
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setCallback: (id <InfoBarCommunicator>) callback {
+// Not used. Only here to satisfy protocol.
+#pragma unused(callback)
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Prevents drawing of the inner view to avoid flickering when doing many visual updates
+ * (like clearing all marks and setting new ones etc.).
+ */
+- (void) suspendDrawing: (BOOL) suspend {
+	if (suspend)
+		[self.window disableFlushWindow];
+	else
+		[self.window enableFlushWindow];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Method receives notifications from Scintilla (e.g. for handling clicks on the
+ * folder margin or changes in the editor).
+ * A delegate can be set to receive all notifications. If set no handling takes place here, except
+ * for action pertaining to internal stuff (like the info bar).
+ */
+- (void) notification: (SCNotification *) scn {
+	// Parent notification. Details are passed as SCNotification structure.
+
+	if (mDelegate != nil) {
+		[mDelegate notification: scn];
+		if (scn->nmhdr.code != static_cast<unsigned int>(Notification::Zoom) &&
+		    scn->nmhdr.code != static_cast<unsigned int>(Notification::UpdateUI))
+			return;
+	}
+
+	switch (static_cast<Notification>(scn->nmhdr.code)) {
+	case Notification::MarginClick: {
+			if (scn->margin == 2) {
+				// Click on the folder margin. Toggle the current line if possible.
+				long line = [self getGeneralProperty: SCI_LINEFROMPOSITION parameter: scn->position];
+				[self setGeneralProperty: SCI_TOGGLEFOLD value: line];
+			}
+			break;
+		};
+	case Notification::Modified: {
+			// Decide depending on the modification type what to do.
+			// There can be more than one modification carried by one notification.
+			if (scn->modificationType &
+				static_cast<int>((ModificationFlags::InsertText | ModificationFlags::DeleteText)))
+				[self sendNotification: NSTextDidChangeNotification];
+			break;
+		}
+	case Notification::Zoom: {
+			// A zoom change happened. Notify info bar if there is one.
+			float zoom = [self getGeneralProperty: SCI_GETZOOM parameter: 0];
+			long fontSize = [self getGeneralProperty: SCI_STYLEGETSIZE parameter: STYLE_DEFAULT];
+			float factor = (zoom / fontSize) + 1;
+			[mInfoBar notify: IBNZoomChanged message: nil location: NSZeroPoint value: factor];
+			break;
+		}
+	case Notification::UpdateUI: {
+			// Triggered whenever changes in the UI state need to be reflected.
+			// These can be: caret changes, selection changes etc.
+			NSPoint caretPosition = mBackend->GetCaretPosition();
+			[mInfoBar notify: IBNCaretChanged message: nil location: caretPosition value: 0];
+			[self sendNotification: SCIUpdateUINotification];
+			if (scn->updated & static_cast<int>((Update::Selection | Update::Content))) {
+				[self sendNotification: NSTextViewDidChangeSelectionNotification];
+			}
+			break;
+		}
+	case Notification::FocusOut:
+		[self sendNotification: NSTextDidEndEditingNotification];
+		break;
+	case Notification::FocusIn: // Nothing to do for now.
+		break;
+	default:
+		break;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Setup a special indicator used in the editor to provide visual feedback for
+ * input composition, depending on language, keyboard etc.
+ */
+- (void) updateIndicatorIME {
+	[self setColorProperty: SCI_INDICSETFORE parameter: INDICATOR_IME fromHTML: @"#FF0000"];
+	const bool drawInBackground = [self message: SCI_GETPHASESDRAW] != 0;
+	[self setGeneralProperty: SCI_INDICSETUNDER parameter: INDICATOR_IME value: drawInBackground];
+	[self setGeneralProperty: SCI_INDICSETSTYLE parameter: INDICATOR_IME value: INDIC_PLAIN];
+	[self setGeneralProperty: SCI_INDICSETALPHA parameter: INDICATOR_IME value: 100];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Initialization of the view. Used to setup a few other things we need.
+ */
+- (instancetype) initWithFrame: (NSRect) frame {
+	self = [super initWithFrame: frame];
+	if (self) {
+		mContent = [[[[self class] contentViewClass] alloc] initWithFrame: NSZeroRect];
+		mContent.owner = self;
+
+		// Initialize the scrollers but don't show them yet.
+		// Pick an arbitrary size, just to make NSScroller selecting the proper scroller direction
+		// (horizontal or vertical).
+		NSRect scrollerRect = NSMakeRect(0, 0, 100, 10);
+		scrollView = (NSScrollView *)[[SCIScrollView alloc] initWithFrame: scrollerRect];
+#if defined(MAC_OS_X_VERSION_10_14)
+		// Let SCIScrollView account for other subviews such as vertical ruler by turning off
+		// automaticallyAdjustsContentInsets.
+		if (std::floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_13) {
+			scrollView.contentView.automaticallyAdjustsContentInsets = NO;
+			scrollView.contentView.contentInsets = NSEdgeInsetsMake(0., 0., 0., 0.);
+		}
+#endif
+		scrollView.documentView = mContent;
+		[scrollView setHasVerticalScroller: YES];
+		[scrollView setHasHorizontalScroller: YES];
+		scrollView.autoresizingMask = NSViewWidthSizable|NSViewHeightSizable;
+		//[scrollView setScrollerStyle:NSScrollerStyleLegacy];
+		//[scrollView setScrollerKnobStyle:NSScrollerKnobStyleDark];
+		//[scrollView setHorizontalScrollElasticity:NSScrollElasticityNone];
+		[self addSubview: scrollView];
+
+		marginView = [[SCIMarginView alloc] initWithScrollView: scrollView];
+		marginView.owner = self;
+		marginView.ruleThickness = marginView.requiredThickness;
+		scrollView.verticalRulerView = marginView;
+		[scrollView setHasHorizontalRuler: NO];
+		[scrollView setHasVerticalRuler: YES];
+		[scrollView setRulersVisible: YES];
+
+		mBackend = new ScintillaCocoa(self, mContent, marginView);
+
+		// Establish a connection from the back end to this container so we can handle situations
+		// which require our attention.
+		mBackend->SetDelegate(self);
+
+		[self updateIndicatorIME];
+
+		NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+		[center addObserver: self
+			   selector: @selector(applicationDidResignActive:)
+			       name: NSApplicationDidResignActiveNotification
+			     object: nil];
+
+		[center addObserver: self
+			   selector: @selector(applicationDidBecomeActive:)
+			       name: NSApplicationDidBecomeActiveNotification
+			     object: nil];
+
+		[center addObserver: self
+			   selector: @selector(windowWillMove:)
+			       name: NSWindowWillMoveNotification
+			     object: self.window];
+
+		[center addObserver: self
+			   selector: @selector(defaultsDidChange:)
+			       name: NSSystemColorsDidChangeNotification
+			     object: self.window];
+
+		[scrollView.contentView setPostsBoundsChangedNotifications: YES];
+		[center addObserver: self
+			   selector: @selector(scrollerAction:)
+			       name: NSViewBoundsDidChangeNotification
+			     object: scrollView.contentView];
+
+		mBackend->UpdateBaseElements();
+	}
+	return self;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) dealloc {
+	[[NSNotificationCenter defaultCenter] removeObserver: self];
+	mBackend->Finalise();
+	delete mBackend;
+	mBackend = NULL;
+	mContent.owner = nil;
+	[marginView setClientView: nil];
+	[scrollView removeFromSuperview];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) applicationDidResignActive: (NSNotification *) note {
+#pragma unused(note)
+	mBackend->ActiveStateChanged(false);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) applicationDidBecomeActive: (NSNotification *) note {
+#pragma unused(note)
+	mBackend->ActiveStateChanged(true);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) windowWillMove: (NSNotification *) note {
+#pragma unused(note)
+	mBackend->WindowWillMove();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) defaultsDidChange: (NSNotification *) note {
+#pragma unused(note)
+	mBackend->UpdateBaseElements();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) viewDidMoveToWindow {
+	[super viewDidMoveToWindow];
+
+	[self positionSubViews];
+
+	// Enable also mouse move events for our window (and so this view).
+	[self.window setAcceptsMouseMovedEvents: YES];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to position and size the parts of the editor (content, scrollers, info bar).
+ */
+- (void) positionSubViews {
+	CGFloat scrollerWidth = [NSScroller scrollerWidthForControlSize: NSControlSizeRegular
+							  scrollerStyle: NSScrollerStyleLegacy];
+
+	NSSize size = self.frame.size;
+	NSRect barFrame = {{0, size.height - scrollerWidth}, {size.width, scrollerWidth}};
+	BOOL infoBarVisible = mInfoBar != nil && !mInfoBar.hidden;
+
+	// Horizontal offset of the content. Almost always 0 unless the vertical scroller
+	// is on the left side.
+	CGFloat contentX = 0;
+	NSRect scrollRect = {{contentX, 0}, {size.width, size.height}};
+
+	// Info bar frame.
+	if (infoBarVisible) {
+		scrollRect.size.height -= scrollerWidth;
+		// Initial value already is as if the bar is at top.
+		if (!mInfoBarAtTop) {
+			scrollRect.origin.y += scrollerWidth;
+			barFrame.origin.y = 0;
+		}
+	}
+
+	if (!NSEqualRects(scrollView.frame, scrollRect)) {
+		scrollView.frame = scrollRect;
+	}
+
+	if (infoBarVisible)
+		mInfoBar.frame = barFrame;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Set the width of the margin.
+ */
+- (void) setMarginWidth: (int) width {
+	if (marginView.ruleThickness != width) {
+		marginView.marginWidth = width;
+		marginView.ruleThickness = marginView.requiredThickness;
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Triggered by one of the scrollers when it gets manipulated by the user. Notify the backend
+ * about the change.
+ */
+- (void) scrollerAction: (id) sender {
+#pragma unused(sender)
+	mBackend->UpdateForScroll();
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Used to reposition our content depending on the size of the view.
+ */
+- (void) setFrame: (NSRect) newFrame {
+	NSRect previousFrame = self.frame;
+	super.frame = newFrame;
+	[self positionSubViews];
+	if (!NSEqualRects(previousFrame, newFrame)) {
+		mBackend->Resize();
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Getter for the currently selected text in raw form (no formatting information included).
+ * If there is no text available an empty string is returned.
+ */
+- (NSString *) selectedString {
+	NSString *result = @"";
+
+	const long length = mBackend->WndProc(Message::GetSelText, 0, 0);
+	if (length > 0) {
+		std::string buffer(length + 1, '\0');
+		try {
+			mBackend->WndProc(Message::GetSelText, length + 1, (sptr_t) &buffer[0]);
+
+			result = @(buffer.c_str());
+		} catch (...) {
+		}
+	}
+
+	return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Delete a range from the document.
+ */
+- (void) deleteRange: (NSRange) aRange {
+	if (aRange.length > 0) {
+		NSRange posRange = mBackend->PositionsFromCharacters(aRange);
+		[self message: SCI_DELETERANGE wParam: posRange.location lParam: posRange.length];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Getter for the current text in raw form (no formatting information included).
+ * If there is no text available an empty string is returned.
+ */
+- (NSString *) string {
+	NSString *result = @"";
+
+	const long length = mBackend->WndProc(Message::GetLength, 0, 0);
+	if (length > 0) {
+		std::string buffer(length + 1, '\0');
+		try {
+			mBackend->WndProc(Message::GetText, length + 1, (sptr_t) &buffer[0]);
+
+			result = @(buffer.c_str());
+		} catch (...) {
+		}
+	}
+
+	return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Setter for the current text (no formatting included).
+ */
+- (void) setString: (NSString *) aString {
+	const char *text = aString.UTF8String;
+	mBackend->WndProc(Message::SetText, 0, (long) text);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) insertString: (NSString *) aString atOffset: (int) offset {
+	const char *text = aString.UTF8String;
+	mBackend->WndProc(Message::AddText, offset, (long) text);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setEditable: (BOOL) editable {
+	mBackend->WndProc(Message::SetReadOnly, editable ? 0 : 1, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (BOOL) isEditable {
+	return mBackend->WndProc(Message::GetReadOnly, 0, 0) == 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (SCIContentView *) content {
+	return mContent;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) updateMarginCursors {
+	[self.window invalidateCursorRectsForView: marginView];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Direct call into the backend to allow uninterpreted access to it. The values to be passed in and
+ * the result heavily depend on the message that is used for the call. Refer to the Scintilla
+ * documentation to learn what can be used here.
+ */
++ (sptr_t) directCall: (ScintillaView *) sender message: (unsigned int) message wParam: (uptr_t) wParam
+	       lParam: (sptr_t) lParam {
+	return ScintillaCocoa::DirectFunction(
+		       reinterpret_cast<sptr_t>(sender->mBackend), message, wParam, lParam);
+}
+
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam lParam: (sptr_t) lParam {
+	return mBackend->WndProc(static_cast<Message>(message), wParam, lParam);
+}
+
+- (sptr_t) message: (unsigned int) message wParam: (uptr_t) wParam {
+	return mBackend->WndProc(static_cast<Message>(message), wParam, 0);
+}
+
+- (sptr_t) message: (unsigned int) message {
+	return mBackend->WndProc(static_cast<Message>(message), 0, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * This is a helper method to set properties in the backend, with native parameters.
+ *
+ * @param property Main property like SCI_STYLESETFORE for which a value is to be set.
+ * @param parameter Additional info for this property like a parameter or index.
+ * @param value The actual value. It depends on the property what this parameter means.
+ */
+- (void) setGeneralProperty: (int) property parameter: (long) parameter value: (long) value {
+	mBackend->WndProc(static_cast<Message>(property), parameter, value);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * A simplified version for setting properties which only require one parameter.
+ *
+ * @param property Main property like SCI_STYLESETFORE for which a value is to be set.
+ * @param value The actual value. It depends on the property what this parameter means.
+ */
+- (void) setGeneralProperty: (int) property value: (long) value {
+	mBackend->WndProc(static_cast<Message>(property), value, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * This is a helper method to get a property in the backend, with native parameters.
+ *
+ * @param property Main property like SCI_STYLESETFORE for which a value is to get.
+ * @param parameter Additional info for this property like a parameter or index.
+ * @param extra Yet another parameter if needed.
+ * @result A generic value which must be interpreted depending on the property queried.
+ */
+- (long) getGeneralProperty: (int) property parameter: (long) parameter extra: (long) extra {
+	return mBackend->WndProc(static_cast<Message>(property), parameter, extra);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convenience function to avoid unneeded extra parameter.
+ */
+- (long) getGeneralProperty: (int) property parameter: (long) parameter {
+	return mBackend->WndProc(static_cast<Message>(property), parameter, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Convenience function to avoid unneeded parameters.
+ */
+- (long) getGeneralProperty: (int) property {
+	return mBackend->WndProc(static_cast<Message>(property), 0, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Use this variant if you have to pass in a reference to something (e.g. a text range).
+ */
+- (long) getGeneralProperty: (int) property ref: (const void *) ref {
+	return mBackend->WndProc(static_cast<Message>(property), 0, (sptr_t) ref);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * 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);
+
+	long color = (blue << 16) + (green << 8) + red;
+	mBackend->WndProc(static_cast<Message>(property), parameter, color);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Another color property setting, which allows to specify the color as string like in HTML
+ * documents (i.e. with leading # and either 3 hex digits or 6).
+ */
+- (void) setColorProperty: (int) property parameter: (long) parameter fromHTML: (NSString *) fromHTML {
+	if (fromHTML.length > 3 && [fromHTML characterAtIndex: 0] == '#') {
+		bool longVersion = fromHTML.length > 6;
+		int index = 1;
+
+		char value[3] = {0, 0, 0};
+		value[0] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		if (longVersion)
+			value[1] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		else
+			value[1] = value[0];
+
+		unsigned rawRed;
+		[[NSScanner scannerWithString: @(value)] scanHexInt: &rawRed];
+
+		value[0] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		if (longVersion)
+			value[1] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		else
+			value[1] = value[0];
+
+		unsigned rawGreen;
+		[[NSScanner scannerWithString: @(value)] scanHexInt: &rawGreen];
+
+		value[0] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		if (longVersion)
+			value[1] = static_cast<char>([fromHTML characterAtIndex: index++]);
+		else
+			value[1] = value[0];
+
+		unsigned rawBlue;
+		[[NSScanner scannerWithString: @(value)] scanHexInt: &rawBlue];
+
+		long color = (rawBlue << 16) + (rawGreen << 8) + rawRed;
+		mBackend->WndProc(static_cast<Message>(property), parameter, color);
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property getter for colors.
+ */
+- (NSColor *) getColorProperty: (int) property parameter: (long) parameter {
+	long color = mBackend->WndProc(static_cast<Message>(property), parameter, 0);
+	CGFloat red = (color & 0xFF) / 255.0;
+	CGFloat green = ((color >> 8) & 0xFF) / 255.0;
+	CGFloat blue = ((color >> 16) & 0xFF) / 255.0;
+	NSColor *result = [NSColor colorWithDeviceRed: red green: green blue: blue alpha: 1];
+	return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property setter for references (pointers, addresses).
+ */
+- (void) setReferenceProperty: (int) property parameter: (long) parameter value: (const void *) value {
+	mBackend->WndProc(static_cast<Message>(property), parameter, (sptr_t) value);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property getter for references (pointers, addresses).
+ */
+- (const void *) getReferenceProperty: (int) property parameter: (long) parameter {
+	return (const void *) mBackend->WndProc(static_cast<Message>(property), parameter, 0);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property setter for string values.
+ */
+- (void) setStringProperty: (int) property parameter: (long) parameter value: (NSString *) value {
+	const char *rawValue = value.UTF8String;
+	mBackend->WndProc(static_cast<Message>(property), parameter, (sptr_t) rawValue);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property getter for string values.
+ */
+- (NSString *) getStringProperty: (int) property parameter: (long) parameter {
+	const char *rawValue = (const char *) mBackend->WndProc(static_cast<Message>(property), parameter, 0);
+	return @(rawValue);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property setter for lexer properties, which are commonly passed as strings.
+ */
+- (void) setLexerProperty: (NSString *) name value: (NSString *) value {
+	const char *rawName = name.UTF8String;
+	const char *rawValue = value.UTF8String;
+	mBackend->WndProc(Message::SetProperty, (sptr_t) rawName, (sptr_t) rawValue);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Specialized property getter for references (pointers, addresses).
+ */
+- (NSString *) getLexerProperty: (NSString *) name {
+	const char *rawName = name.UTF8String;
+	const char *result = (const char *) mBackend->WndProc(Message::SetProperty, (sptr_t) rawName, 0);
+	return @(result);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sets the notification callback
+ */
+- (void) registerNotifyCallback: (intptr_t) windowid value: (SciNotifyFunc) callback {
+	mBackend->RegisterNotifyCallback(windowid, callback);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sets the new control which is displayed as info bar at the top or bottom of the editor.
+ * Set newBar to nil if you want to hide the bar again.
+ * The info bar's height is set to the height of the scrollbar.
+ */
+- (void) setInfoBar: (NSView <InfoBarCommunicator> *) newBar top: (BOOL) top {
+	if (mInfoBar != newBar) {
+		[mInfoBar removeFromSuperview];
+
+		mInfoBar = newBar;
+		mInfoBarAtTop = top;
+		if (mInfoBar != nil) {
+			[self addSubview: mInfoBar];
+			[mInfoBar setCallback: self];
+		}
+
+		[self positionSubViews];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Sets the edit's info bar status message. This call only has an effect if there is an info bar.
+ */
+- (void) setStatusText: (NSString *) text {
+	if (mInfoBar != nil)
+		[mInfoBar notify: IBNStatusChanged message: text location: NSZeroPoint value: 0];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (NSRange) selectedRange {
+	return [mContent selectedRange];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Return the main selection as an NSRange of positions (not characters).
+ * Unlike selectedRange, this can return empty ranges inside the document.
+ */
+
+- (NSRange) selectedRangePositions {
+	const sptr_t positionBegin = [self message: SCI_GETSELECTIONSTART];
+	const sptr_t positionEnd = [self message: SCI_GETSELECTIONEND];
+	return NSMakeRange(positionBegin, positionEnd-positionBegin);
+}
+
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) insertText: (id) aString {
+	if ([aString isKindOfClass: [NSString class]])
+		mBackend->InsertText(aString, CharacterSource::DirectInput);
+	else if ([aString isKindOfClass: [NSAttributedString class]])
+		mBackend->InsertText([aString string], CharacterSource::DirectInput);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * For backwards compatibility.
+ */
+- (BOOL) findAndHighlightText: (NSString *) searchText
+		    matchCase: (BOOL) matchCase
+		    wholeWord: (BOOL) wholeWord
+		     scrollTo: (BOOL) scrollTo
+			 wrap: (BOOL) wrap {
+	return [self findAndHighlightText: searchText
+				matchCase: matchCase
+				wholeWord: wholeWord
+				 scrollTo: scrollTo
+				     wrap: wrap
+				backwards: NO];
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Searches and marks the first occurrence of the given text and optionally scrolls it into view.
+ *
+ * @result YES if something was found, NO otherwise.
+ */
+- (BOOL) findAndHighlightText: (NSString *) searchText
+		    matchCase: (BOOL) matchCase
+		    wholeWord: (BOOL) wholeWord
+		     scrollTo: (BOOL) scrollTo
+			 wrap: (BOOL) wrap
+		    backwards: (BOOL) backwards {
+	FindOption searchFlags = FindOption::None;
+	if (matchCase)
+		searchFlags = searchFlags | FindOption::MatchCase;
+	if (wholeWord)
+		searchFlags = searchFlags | FindOption::WholeWord;
+
+	long selectionStart = [self getGeneralProperty: SCI_GETSELECTIONSTART parameter: 0];
+	long selectionEnd = [self getGeneralProperty: SCI_GETSELECTIONEND parameter: 0];
+
+	// Sets the start point for the coming search to the beginning of the current selection.
+	// For forward searches we have therefore to set the selection start to the current selection end
+	// for proper incremental search. This does not harm as we either get a new selection if something
+	// is found or the previous selection is restored.
+	if (!backwards)
+		[self getGeneralProperty: SCI_SETSELECTIONSTART parameter: selectionEnd];
+	[self setGeneralProperty: SCI_SEARCHANCHOR value: 0];
+	sptr_t result;
+	const char *textToSearch = searchText.UTF8String;
+
+	// The following call will also set the selection if something was found.
+	if (backwards) {
+		result = [ScintillaView directCall: self
+					   message: SCI_SEARCHPREV
+					    wParam: (uptr_t) searchFlags
+					    lParam: (sptr_t) textToSearch];
+		if (result < 0 && wrap) {
+			// Try again from the end of the document if nothing could be found so far and
+			// wrapped search is set.
+			[self getGeneralProperty: SCI_SETSELECTIONSTART parameter: [self getGeneralProperty: SCI_GETTEXTLENGTH parameter: 0]];
+			[self setGeneralProperty: SCI_SEARCHANCHOR value: 0];
+			result = [ScintillaView directCall: self
+						   message: SCI_SEARCHNEXT
+						    wParam: (uptr_t) searchFlags
+						    lParam: (sptr_t) textToSearch];
+		}
+	} else {
+		result = [ScintillaView directCall: self
+					   message: SCI_SEARCHNEXT
+					    wParam: (uptr_t) searchFlags
+					    lParam: (sptr_t) textToSearch];
+		if (result < 0 && wrap) {
+			// Try again from the start of the document if nothing could be found so far and
+			// wrapped search is set.
+			[self getGeneralProperty: SCI_SETSELECTIONSTART parameter: 0];
+			[self setGeneralProperty: SCI_SEARCHANCHOR value: 0];
+			result = [ScintillaView directCall: self
+						   message: SCI_SEARCHNEXT
+						    wParam: (uptr_t) searchFlags
+						    lParam: (sptr_t) textToSearch];
+		}
+	}
+
+	if (result >= 0) {
+		if (scrollTo)
+			[self setGeneralProperty: SCI_SCROLLCARET value: 0];
+	} else {
+		// Restore the former selection if we did not find anything.
+		[self setGeneralProperty: SCI_SETSELECTIONSTART value: selectionStart];
+		[self setGeneralProperty: SCI_SETSELECTIONEND value: selectionEnd];
+	}
+	return (result >= 0) ? YES : NO;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Searches the given text and replaces
+ *
+ * @result Number of entries replaced, 0 if none.
+ */
+- (int) findAndReplaceText: (NSString *) searchText
+		    byText: (NSString *) newText
+		 matchCase: (BOOL) matchCase
+		 wholeWord: (BOOL) wholeWord
+		     doAll: (BOOL) doAll {
+	// The current position is where we start searching for single occurrences. Otherwise we start at
+	// the beginning of the document.
+	long startPosition;
+	if (doAll)
+		startPosition = 0; // Start at the beginning of the text if we replace all occurrences.
+	else
+		// For a single replacement we start at the current caret position.
+		startPosition = [self getGeneralProperty: SCI_GETCURRENTPOS];
+	long endPosition = [self getGeneralProperty: SCI_GETTEXTLENGTH];
+
+	FindOption searchFlags = FindOption::None;
+	if (matchCase)
+		searchFlags = searchFlags | FindOption::MatchCase;
+	if (wholeWord)
+		searchFlags = searchFlags | FindOption::WholeWord;
+	[self setGeneralProperty: SCI_SETSEARCHFLAGS value: (long)searchFlags];
+	[self setGeneralProperty: SCI_SETTARGETSTART value: startPosition];
+	[self setGeneralProperty: SCI_SETTARGETEND value: endPosition];
+
+	const char *textToSearch = searchText.UTF8String;
+	long sourceLength = strlen(textToSearch); // Length in bytes.
+	const char *replacement = newText.UTF8String;
+	long targetLength = strlen(replacement);  // Length in bytes.
+	sptr_t result;
+
+	int replaceCount = 0;
+	if (doAll) {
+		while (true) {
+			result = [ScintillaView directCall: self
+						   message: SCI_SEARCHINTARGET
+						    wParam: sourceLength
+						    lParam: (sptr_t) textToSearch];
+			if (result < 0)
+				break;
+
+			replaceCount++;
+			[ScintillaView directCall: self
+					  message: SCI_REPLACETARGET
+					   wParam: targetLength
+					   lParam: (sptr_t) replacement];
+
+			// The replacement changes the target range to the replaced text. Continue after that till the end.
+			// The text length might be changed by the replacement so make sure the target end is the actual
+			// text end.
+			[self setGeneralProperty: SCI_SETTARGETSTART value: [self getGeneralProperty: SCI_GETTARGETEND]];
+			[self setGeneralProperty: SCI_SETTARGETEND value: [self getGeneralProperty: SCI_GETTEXTLENGTH]];
+		}
+	} else {
+		result = [ScintillaView directCall: self
+					   message: SCI_SEARCHINTARGET
+					    wParam: sourceLength
+					    lParam: (sptr_t) textToSearch];
+		replaceCount = (result < 0) ? 0 : 1;
+
+		if (replaceCount > 0) {
+			[ScintillaView directCall: self
+					  message: SCI_REPLACETARGET
+					   wParam: targetLength
+					   lParam: (sptr_t) replacement];
+
+			// For a single replace we set the new selection to the replaced text.
+			[self setGeneralProperty: SCI_SETSELECTIONSTART value: [self getGeneralProperty: SCI_GETTARGETSTART]];
+			[self setGeneralProperty: SCI_SETSELECTIONEND value: [self getGeneralProperty: SCI_GETTARGETEND]];
+		}
+	}
+
+	return replaceCount;
+}
+
+//--------------------------------------------------------------------------------------------------
+
+- (void) setFontName: (NSString *) font
+		size: (int) size
+		bold: (BOOL) bold
+	      italic: (BOOL) italic {
+	for (int i = 0; i < 128; i++) {
+		[self setGeneralProperty: SCI_STYLESETFONT
+			       parameter: i
+				   value: (sptr_t)font.UTF8String];
+		[self setGeneralProperty: SCI_STYLESETSIZE
+			       parameter: i
+				   value: size];
+		[self setGeneralProperty: SCI_STYLESETBOLD
+			       parameter: i
+				   value: bold];
+		[self setGeneralProperty: SCI_STYLESETITALIC
+			       parameter: i
+				   value: italic];
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+
+@end
+
diff --git a/scite-app/scintilla/cocoa/checkbuildosx.sh b/scite-app/scintilla/cocoa/checkbuildosx.sh
new file mode 100755
index 0000000..6dc063b
--- /dev/null
+++ b/scite-app/scintilla/cocoa/checkbuildosx.sh
@@ -0,0 +1,66 @@
+# Script to build Scintilla for OS X with most supported build files.
+# Current directory should be scintilla/cocoa before running.
+
+cd ../..
+
+# ************************************************************
+# Target 1: Unit tests
+
+echo Unit tests
+
+cd scintilla/test/unit
+make clean
+make test
+cd ../../..
+
+# ************************************************************
+# Target 2: build framework and test app with Xcode targeting OS X 10.n with n from 9 to 5
+# Only SDK versions that are installed will be built
+# Clean both then build both -- if perform clean in ScintillaTest, also cleans ScintillaFramework
+# which can cause double build
+
+echo Building Cocoa-native ScintillaFramework and ScintillaTest
+for sdk in macosx10.15 macosx10.14
+do
+    xcodebuild -showsdks | grep $sdk
+    if [ "$(xcodebuild -showsdks | grep $sdk)" != "" ]
+    then
+        echo Building with $sdk
+        cd scintilla/cocoa/ScintillaFramework
+        xcodebuild clean
+        cd ../ScintillaTest
+        xcodebuild clean
+        cd ../ScintillaFramework
+        xcodebuild -sdk $sdk
+        cd ../ScintillaTest
+        xcodebuild -sdk $sdk
+        cd ../../..
+    else
+        echo Warning $sdk not available
+    fi
+done
+
+# ************************************************************
+# Target 3: Qt builds
+# Requires Qt development libraries and qmake to be installed
+
+echo Building Qt and PySide
+
+cd scintilla/qt
+cd ScintillaEditBase
+qmake -spec macx-xcode
+xcodebuild clean
+xcodebuild
+cd ..
+
+cd ScintillaEdit
+python3 WidgetGen.py
+qmake -spec macx-xcode
+xcodebuild clean
+xcodebuild
+cd ..
+
+cd ScintillaEditPy
+python2 sepbuild.py
+cd ..
+cd ../..
diff --git a/scite-app/scintilla/cocoa/res/info_bar_bg.png b/scite-app/scintilla/cocoa/res/info_bar_bg.png
new file mode 100644
index 0000000..d2be6c4
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/info_bar_bg.png differ
diff --git a/scite-app/scintilla/cocoa/res/info_bar_bg@2x.png b/scite-app/scintilla/cocoa/res/info_bar_bg@2x.png
new file mode 100644
index 0000000..ff74c80
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/info_bar_bg@2x.png differ
diff --git a/scite-app/scintilla/cocoa/res/mac_cursor_busy.png b/scite-app/scintilla/cocoa/res/mac_cursor_busy.png
new file mode 100644
index 0000000..93b2a49
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/mac_cursor_busy.png differ
diff --git a/scite-app/scintilla/cocoa/res/mac_cursor_busy@2x.png b/scite-app/scintilla/cocoa/res/mac_cursor_busy@2x.png
new file mode 100644
index 0000000..7a0e12e
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/mac_cursor_busy@2x.png differ
diff --git a/scite-app/scintilla/cocoa/res/mac_cursor_flipped.png b/scite-app/scintilla/cocoa/res/mac_cursor_flipped.png
new file mode 100644
index 0000000..e1ee686
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/mac_cursor_flipped.png differ
diff --git a/scite-app/scintilla/cocoa/res/mac_cursor_flipped@2x.png b/scite-app/scintilla/cocoa/res/mac_cursor_flipped@2x.png
new file mode 100644
index 0000000..6fedb33
Binary files /dev/null and b/scite-app/scintilla/cocoa/res/mac_cursor_flipped@2x.png differ
diff --git a/scite-app/scintilla/cppcheck.suppress b/scite-app/scintilla/cppcheck.suppress
new file mode 100644
index 0000000..e282ef6
--- /dev/null
+++ b/scite-app/scintilla/cppcheck.suppress
@@ -0,0 +1,54 @@
+// File to suppress cppcheck warnings for files that will not be fixed.
+// Does not suppress warnings where an additional occurrence of the warning may be of interest.
+
+// Coding style is to use assignments in constructor when there are many
+// members to initialize or the initialization is complex or has comments.
+useInitializationList
+
+// These may be interesting but its not clear without examining each instance closely
+// Would have to ensure that any_of/all_of has same early/late exits as current code and
+// produces same result on empty collections
+useStlAlgorithm
+
+// Written with variable for consistency
+knownArgument:scintilla/src/SparseVector.h
+
+// This is an internal error in cppcheck
+internalAstError:scintilla\src\PerLine.cxx
+
+// Treats boolean access as narrowing value: if (x) { if (x != ']')
+knownConditionTrueFalse:scintilla\src\RESearch.cxx
+
+// cppcheck appears to be confused about bool versus pointer
+identicalInnerCondition:scintilla\gtk\ScintillaGTKAccessible.cxx
+
+// Some non-explicit constructors are used for conversions or are private to lexers
+noExplicitConstructor
+
+// MarginView access to all bits is safe and is better defined in later versions of C++
+shiftTooManyBitsSigned:scintilla/src/MarginView.cxx
+
+// DLL entry points are unused inside Scintilla
+unusedFunction:scintilla\win32\ScintillaDLL.cxx
+
+// Doesn't see change: int x = 1; if (b) { x = y; } if (x > 3) {
+knownConditionTrueFalse:scintilla\win32\PlatWin.cxx
+
+// The styler parameter is not const as LexAccessor::operator[] is not const
+constParameter:scintilla/lexlib/StyleContext.cxx
+
+// ScintillaDocument is providing an API and there are no consumers of the API inside Scintilla
+unusedFunction:scintilla/qt/ScintillaEdit/ScintillaDocument.cpp
+
+// moc_ files show #error as they are not built with standard context
+preprocessorErrorDirective:scintilla/qt/*.cpp
+
+// moc_ files are not understood by cppcheck
+noValidConfiguration
+
+// The performance cost of by-value passing is often small and using a reference decreases
+// code legibility.
+passedByValue
+
+// Suppress everything in catch.hpp as won't be changing
+*:scintilla/test/unit/catch.hpp
diff --git a/scite-app/scintilla/delbin.bat b/scite-app/scintilla/delbin.bat
new file mode 100755
index 0000000..533e67b
--- /dev/null
+++ b/scite-app/scintilla/delbin.bat
@@ -0,0 +1 @@
+@del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.ipdb *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog >NUL:
diff --git a/scite-app/scintilla/doc/AddSource.txt b/scite-app/scintilla/doc/AddSource.txt
new file mode 100644
index 0000000..777f6f2
--- /dev/null
+++ b/scite-app/scintilla/doc/AddSource.txt
@@ -0,0 +1,30 @@
+Some of the build files adapt to adding and removing source code files but most
+must be modified by hand. Here is a list of directories and the build files that
+must be modified or possibly need to be modified.
+The Cocoa project.pbxproj file is complex and should be modified with Xcode.
+The other build files can be edited manually.
+
+src:
+	cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj
+	gtk/makefile
+	qt/ScintillaEdit/ScintillaEdit.pro
+	qt/ScintillaEditBase/ScintillaEditBase.pro
+	win32/makefile
+	win32/scintilla.mak
+	-- possibly:
+	test/unit/makefile
+	test/unit/test.mak
+
+cocoa:
+	cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj
+
+gtk:
+	gtk/makefile
+
+qt:
+	qt/ScintillaEdit/ScintillaEdit.pro
+	qt/ScintillaEditBase/ScintillaEditBase.pro
+
+win32:
+	win32/makefile
+	win32/scintilla.mak
diff --git a/scite-app/scintilla/doc/Design.html b/scite-app/scintilla/doc/Design.html
new file mode 100644
index 0000000..c74498e
--- /dev/null
+++ b/scite-app/scintilla/doc/Design.html
@@ -0,0 +1,246 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla and SciTE
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          Component Design</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Top level structure
+    </h2>
+    <p>
+       Scintilla consists of three major layers of C++ code
+    </p>
+    <ul>
+      <li>
+        Portability Library
+      </li>
+      <li>
+        Core Code
+      </li>
+      <li>
+        Platform Events and API
+      </li>
+    </ul>
+    <p>
+       The primary purpose of this structure is to separate the platform dependent code from the
+      platform independent core code. This makes it easier to port Scintilla to a new platform and
+      ensures that most readers of the code do not have to deal with platform details. To minimise
+      portability problems and avoid code bloat, a conservative subset of C++ is used in Scintilla
+      with no exception handling, run time type information or use of the standard C++
+      library and with limited use of templates.
+    </p>
+    <p>
+       The currently supported platforms, Windows, GTK/Linux, Cocoa, Qt, and wxWidgets are fairly similar in
+      many ways.
+      Each has windows, menus and bitmaps. These features generally work in similar ways so each
+      has a way to move a window or draw a red line. Sometimes one platform requires a sequence of
+      calls rather than a single call. At other times, the differences are more profound. Reading
+      the Windows clipboard occurs synchronously but reading the GTK clipboard requires a request
+      call that will be asynchronously answered with a message containing the clipboard data.
+      The wxWidgets platform is available from the <a href="http://wxwidgets.org/">wxWidgets site</a>
+    </p>
+    <br />
+    <h3>
+       Portability Library
+    </h3>
+    <p>
+       This is a fairly small and thin layer over the platform's native capabilities.
+    </p>
+    <p>
+       The portability library is defined in Geometry.h and Platform.h and is implemented once for each platform.
+      PlatWin.cxx defines the Windows variants of the methods and PlatGTK.cxx the GTK variants.
+    </p>
+    <p>
+       Several of the classes here hold platform specific object identifiers and act as proxies to
+      these platform objects. Most client code can thus manipulate the platform objects without
+      caring which is the current platform. Sometimes client code needs access to the underlying
+      object identifiers and this is provided by the GetID method. The underlying types of the
+      platform specific identifiers are typedefed to common names to allow them to be transferred
+      around in client code where needed.
+    </p>
+    <h4>
+       Point, PRectangle
+    </h4>
+    <p>
+       These are simple classes provided to hold the commonly used geometric primitives. A
+      PRectangle follows the Mac / Windows convention of not including its bottom and right sides
+      instead of including all its sides as is normal in GTK. It is not called Rectangle as this may be
+      the name of a macro on Windows.
+    </p>
+    <h4>
+       ColourDesired
+    </h4>
+    <p>
+       This is a simple class holding an expected colour. It is internally represented as a single
+      32 bit integer in BGR format with 8 bits per colour, but also provides a convenient API to fetch
+      each component separately.
+       As a platform might not be able to represent the exact desired colour if it doesn't have 24 bit
+      depth available, it might not actually represent the exact desired colour but select a best fit
+      that it can actually render.
+    </p>
+    <h4>
+       Font
+    </h4>
+    <p>
+       Font holds a platform specific font identifier - HFONT for Windows, PangoFontDescription* for GTK. It
+      does not own the identifier and so will not delete the platform font object in its
+      destructor. Client code should call Destroy at appropriate times.
+    </p>
+    <h4>
+       Surface
+    </h4>
+    <p>
+       Surface is an abstraction over each platform's concept of somewhere that graphical drawing
+      operations can be done. It may wrap an already created drawing place such as a window or be
+      used to create a bitmap that can be drawn into and later copied onto another surface. On
+      Windows it wraps a HDC and possibly a HBITMAP. On GTK it wraps a cairo_surface_t*.
+      Other platform specific objects are created (and correctly destroyed) whenever
+      required to perform drawing actions.
+    </p>
+    <p>
+       Drawing operations provided include drawing filled and unfilled polygons, lines, rectangles,
+      ellipses and text. The height and width of text as well as other details can be measured.
+      Operations can be clipped to a rectangle. Most of the calls are stateless with all parameters
+      being passed at each call. The exception to this is line drawing which is performed by
+      calling MoveTo and then LineTo.
+    </p>
+    <h4>
+       Window
+    </h4>
+    <p>
+       Window acts as a proxy to a platform window allowing operations such as showing, moving,
+      redrawing, and destroying to be performed. It contains a platform specific window identifier
+      - HWND for Windows, GtkWidget* for GTK.
+    </p>
+    <h4>
+       ListBox
+    </h4>
+    <p>
+       ListBox is a subclass of Window and acts as a proxy to a platform listbox adding methods for
+      operations such as adding, retrieving, and selecting items.
+    </p>
+    <h4>
+       Menu
+    </h4>
+    <p>
+       Menu is a small helper class for constructing popup menus. It contains the platform specific
+      menu identifier - HMENU for Windows, GtkMenu* for GTK. Most of the work in
+      constructing menus requires access to platform events and so is done in the Platform Events
+      and API layer.
+    </p>
+    <h4>
+       Platform
+    </h4>
+    <p>
+       The Platform class is used to access the facilities of the platform. System wide parameters
+      such as double click speed and chrome colour are available from Platform. Utility functions
+      such as DebugPrintf are also available from Platform.
+    </p>
+    <h3>
+       Core Code
+    </h3>
+    <p>
+       The bulk of Scintilla's code is platform independent. This is made up of the CellBuffer,
+      ContractionState, Document, Editor, Indicator, LineMarker, Style, ViewStyle, KeyMap,
+      ScintillaBase, CallTip,
+      and AutoComplete primary classes.
+    </p>
+    <h4>
+       CellBuffer
+    </h4>
+    <p>
+       A CellBuffer holds text and styling information, the undo stack, the assignment of line
+      markers to lines, and the fold structure.
+    </p>
+    <p>
+       A cell contains a character byte and its associated style byte. The current state of the
+      cell buffer is the sequence of cells that make up the text and a sequence of line information
+      containing the starting position of each line and any markers assigned to each line.
+    </p>
+    <p>
+       The undo stack holds a sequence of actions on the cell buffer. Each action is one of a text
+      insertion, a text deletion or an undo start action. The start actions are used to group
+      sequences of text insertions and deletions together so they can be undone together. To
+      perform an undo operation, each insertion or deletion is undone in reverse sequence.
+      Similarly, redo reapplies each action to the buffer in sequence. Whenever a character is
+      inserted in the buffer either directly through a call such as InsertString or through undo or
+      redo, its styling byte is initially set to zero. Client code is responsible for styling each
+      character whenever convenient. Styling information is not stored in undo actions.
+    </p>
+    <h4>
+       Document
+    </h4>
+    <p>
+       A document contains a CellBuffer and deals with some higher level abstractions such as
+      words, DBCS character sequences and line end character sequences. It is responsible for
+      managing the styling process and for notifying other objects when changes occur to the
+      document.
+    </p>
+    <h4>
+       Editor
+    </h4>
+    <p>
+       The Editor object is central to Scintilla. It is responsible for displaying a document and
+      responding to user actions and requests from the container. It uses ContractionState, Indicator,
+      LineMarker, Style, and ViewStyle objects to display the document and a KeyMap class to
+      map key presses to functions.
+      The visibility of each line is kept in the ContractionState which is also responsible for mapping
+      from display lines to documents lines and vice versa.
+    </p>
+    <p>
+       There may be multiple Editor objects attached to one Document object. Changes to a
+       document are broadcast to the editors through the DocWatcher mechanism.
+    </p>
+    <h4>
+       ScintillaBase
+    </h4>
+    <p>
+       ScintillaBase is a subclass of Editor and adds extra windowing features including display of
+      calltips, autocompletion lists and context menus. These features use CallTip and AutoComplete
+      objects. This class is optional so a lightweight implementation of Scintilla may bypass it if
+      the added functionality is not required.
+    </p>
+    <h3>
+       Platform Events and API
+    </h3>
+    <p>
+       Each platform uses different mechanisms for receiving events. On Windows, events are
+      received through messages and COM. On GTK, callback functions are used.
+    </p>
+    <p>
+       For each platform, a class is derived from ScintillaBase (and thus from Editor). This is
+      ScintillaWin on Windows and ScintillaGTK on GTK. These classes are responsible for
+      connecting to the platforms event mechanism and also to implement some virtual methods in
+      Editor and ScintillaBase which are different on the platforms. For example, this layer has to
+      support this difference between the synchronous Windows clipboard and the asynchronous GTK
+      clipboard.
+    </p>
+    <p>
+       The external API is defined in this layer as each platform has different preferred styles of
+      API - messages on Windows and function calls on GTK. This also allows multiple APIs to be
+      defined on a platform. The currently available API on GTK is similar to the Windows API and
+      does not follow platform conventions well. A second API could be implemented here that did
+      follow platform conventions.
+    </p>
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/Icons.html b/scite-app/scintilla/doc/Icons.html
new file mode 100644
index 0000000..d6053f1
--- /dev/null
+++ b/scite-app/scintilla/doc/Icons.html
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla icons
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Icons
+    </h2>
+    <p>
+       These images may be used under the same license as Scintilla.
+    </p>
+    <p>
+       Drawn by Iago Rubio, Philippe Lhoste, and Neil Hodgson.
+    </p>
+    <p>
+       <a href="http://prdownloads.sourceforge.net/scintilla/icons1.zip?download">zip format</a> (70K)
+    </p>
+    <table>
+    <tr>
+    <td>For autocompletion lists</td>
+    <td colspan="3">For margin markers</td>
+    </tr>
+    <tr>
+    <td>12x12</td>
+    <td>16x16</td>
+    <td>24x24</td>
+    <td>32x32</td>
+    </tr>
+    <tr>
+    <td valign="top"><img src="12.png" /></td>
+    <td valign="top"><img src="16.png" /></td>
+    <td valign="top"><img src="24.png" /></td>
+    <td valign="top"><img src="32.png" /></td>
+    </tr>
+    </table>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/Indicators.png b/scite-app/scintilla/doc/Indicators.png
new file mode 100644
index 0000000..541e3de
Binary files /dev/null and b/scite-app/scintilla/doc/Indicators.png differ
diff --git a/scite-app/scintilla/doc/Lexer.txt b/scite-app/scintilla/doc/Lexer.txt
new file mode 100644
index 0000000..9b9e54f
--- /dev/null
+++ b/scite-app/scintilla/doc/Lexer.txt
@@ -0,0 +1,226 @@
+How to write a scintilla lexer
+
+A lexer for a particular language determines how a specified range of
+text shall be colored.  Writing a lexer is relatively straightforward
+because the lexer need only color given text.  The harder job of
+determining how much text actually needs to be colored is handled by
+Scintilla itself, that is, the lexer's caller.
+
+
+Parameters
+
+The lexer for language LLL has the following prototype:
+
+    static void ColouriseLLLDoc (
+        unsigned int startPos, int length,
+        int initStyle,
+        WordList *keywordlists[],
+        Accessor &styler);
+
+The styler parameter is an Accessor object.  The lexer must use this
+object to access the text to be colored.  The lexer gets the character
+at position i using styler.SafeGetCharAt(i);
+
+The startPos and length parameters indicate the range of text to be
+recolored; the lexer must determine the proper color for all characters
+in positions startPos through startPos+length.
+
+The initStyle parameter indicates the initial state, that is, the state
+at the character before startPos. States also indicate the coloring to
+be used for a particular range of text.
+
+Note:  the character at StartPos is assumed to start a line, so if a
+newline terminates the initStyle state the lexer should enter its
+default state (or whatever state should follow initStyle).
+
+The keywordlists parameter specifies the keywords that the lexer must
+recognize.  A WordList class object contains methods that simplify
+the recognition of keywords.  Present lexers use a helper function
+called classifyWordLLL to recognize keywords.  These functions show how
+to use the keywordlists parameter to recognize keywords.  This
+documentation will not discuss keywords further.
+
+
+The lexer code
+
+The task of a lexer can be summarized briefly: for each range r of
+characters that are to be colored the same, the lexer should call
+
+    styler.ColourTo(i, state)
+
+where i is the position of the last character of the range r.  The lexer
+should set the state variable to the coloring state of the character at
+position i and continue until the entire text has been colored.
+
+Note 1:  the styler (Accessor) object remembers the i parameter in the
+previous calls to styler.ColourTo, so the single i parameter suffices to
+indicate a range of characters.
+
+Note 2: As a side effect of calling styler.ColourTo(i,state), the
+coloring states of all characters in the range are remembered so that
+Scintilla may set the initStyle parameter correctly on future calls to
+the
+lexer.
+
+
+Lexer organization
+
+There are at least two ways to organize the code of each lexer.  Present
+lexers use what might be called a "character-based" approach: the outer
+loop iterates over characters, like this:
+
+  lengthDoc = startPos + length ;
+  for (unsigned int i = startPos; i < lengthDoc; i++) {
+    chNext = styler.SafeGetCharAt(i + 1);
+    << handle special cases >>
+    switch(state) {
+      // Handlers examine only ch and chNext.
+      // Handlers call styler.ColorTo(i,state) if the state changes.
+      case state_1: << handle ch in state 1 >>
+      case state_2: << handle ch in state 2 >>
+      ...
+      case state_n: << handle ch in state n >>
+    }
+    chPrev = ch;
+  }
+  styler.ColourTo(lengthDoc - 1, state);
+
+
+An alternative would be to use a "state-based" approach.  The outer loop
+would iterate over states, like this:
+
+  lengthDoc = startPos+lenth ;
+  for ( unsigned int i = startPos ;; ) {
+    char ch = styler.SafeGetCharAt(i);
+    int new_state = 0 ;
+    switch ( state ) {
+      // scanners set new_state if they set the next state.
+      case state_1: << scan to the end of state 1 >> break ;
+      case state_2: << scan to the end of state 2 >> break ;
+      case default_state:
+        << scan to the next non-default state and set new_state >>
+    }
+    styler.ColourTo(i, state);
+    if ( i >= lengthDoc ) break ;
+    if ( ! new_state ) {
+      ch = styler.SafeGetCharAt(i);
+      << set state based on ch in the default state >>
+    }
+  }
+  styler.ColourTo(lengthDoc - 1, state);
+
+This approach might seem to be more natural.  State scanners are simpler
+than character scanners because less needs to be done.  For example,
+there is no need to test for the start of a C string inside the scanner
+for a C comment.  Also this way makes it natural to define routines that
+could be used by more than one scanner; for example, a scanToEndOfLine
+routine.
+
+However, the special cases handled in the main loop in the
+character-based approach would have to be handled by each state scanner,
+so both approaches have advantages.  These special cases are discussed
+below.
+
+Special case: Lead characters
+
+Lead bytes are part of DBCS processing for languages such as Japanese
+using an encoding such as Shift-JIS. In these encodings, extended
+(16-bit) characters are encoded as a lead byte followed by a trail byte.
+
+Lead bytes are rarely of any lexical significance, normally only being
+allowed within strings and comments. In such contexts, lexers should
+ignore ch if styler.IsLeadByte(ch) returns TRUE.
+
+Note: UTF-8 is simpler than Shift-JIS, so no special handling is
+applied for it. All UTF-8 extended characters are >= 128 and none are
+lexically significant in programming languages which, so far, use only
+characters in ASCII for operators, comment markers, etc.
+
+
+Special case: Folding
+
+Folding may be performed in the lexer function. It is better to use a
+separate folder function as that avoids some troublesome interaction
+between styling and folding. The folder function will be run after the
+lexer function if folding is enabled. The rest of this section explains
+how to perform folding within the lexer function.
+
+During initialization, lexers that support folding set
+
+    bool fold = styler.GetPropertyInt("fold");
+
+If folding is enabled in the editor, fold will be TRUE and the lexer
+should call:
+
+    styler.SetLevel(line, level);
+
+at the end of each line and just before exiting.
+
+The line parameter is simply the count of the number of newlines seen.
+It's initial value is styler.GetLine(startPos) and it is incremented
+(after calling styler.SetLevel) whenever a newline is seen.
+
+The level parameter is the desired indentation level in the low 12 bits,
+along with flag bits in the upper four bits. The indentation level
+depends on the language.  For C++, it is incremented when the lexer sees
+a '{' and decremented when the lexer sees a '}' (outside of strings and
+comments, of course).
+
+The following flag bits, defined in Scintilla.h, may be set or cleared
+in the flags parameter. The SC_FOLDLEVELWHITEFLAG flag is set if the
+lexer considers that the line contains nothing but whitespace.  The
+SC_FOLDLEVELHEADERFLAG flag indicates that the line is a fold point.
+This normally means that the next line has a greater level than present
+line.  However, the lexer may have some other basis for determining a
+fold point.  For example, a lexer might create a header line for the
+first line of a function definition rather than the last.
+
+The SC_FOLDLEVELNUMBERMASK mask denotes the level number in the low 12
+bits of the level param. This mask may be used to isolate either flags
+or level numbers.
+
+For example, the C++ lexer contains the following code when a newline is
+seen:
+
+  if (fold) {
+    int lev = levelPrev;
+
+    // Set the "all whitespace" bit if the line is blank.
+    if (visChars == 0)
+      lev |= SC_FOLDLEVELWHITEFLAG;
+
+    // Set the "header" bit if needed.
+    if ((levelCurrent > levelPrev) && (visChars > 0))
+      lev |= SC_FOLDLEVELHEADERFLAG;
+      styler.SetLevel(lineCurrent, lev);
+
+    // reinitialize the folding vars describing the present line.
+    lineCurrent++;
+    visChars = 0;  // Number of non-whitespace characters on the line.
+    levelPrev = levelCurrent;
+  }
+
+The following code appears in the C++ lexer just before exit:
+
+  // Fill in the real level of the next line, keeping the current flags
+  // as they will be filled in later.
+  if (fold) {
+    // Mask off the level number, leaving only the previous flags.
+    int flagsNext = styler.LevelAt(lineCurrent);
+    flagsNext &= ~SC_FOLDLEVELNUMBERMASK;
+    styler.SetLevel(lineCurrent, levelPrev | flagsNext);
+  }
+
+
+Don't worry about performance
+
+The writer of a lexer may safely ignore performance considerations: the
+cost of redrawing the screen is several orders of magnitude greater than
+the cost of function calls, etc.  Moreover, Scintilla performs all the
+important optimizations; Scintilla ensures that a lexer will be called
+only to recolor text that actually needs to be recolored.  Finally, it
+is not necessary to avoid extra calls to styler.ColourTo: the sytler
+object buffers calls to ColourTo to avoid multiple updates of the
+screen.
+
+Page contributed by Edward K. Ream
\ No newline at end of file
diff --git a/scite-app/scintilla/doc/Markers.png b/scite-app/scintilla/doc/Markers.png
new file mode 100644
index 0000000..b1d0120
Binary files /dev/null and b/scite-app/scintilla/doc/Markers.png differ
diff --git a/scite-app/scintilla/doc/Privacy.html b/scite-app/scintilla/doc/Privacy.html
new file mode 100644
index 0000000..85cb801
--- /dev/null
+++ b/scite-app/scintilla/doc/Privacy.html
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Privacy Policy
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Privacy Policy for scintilla.org
+    </h2>
+    <h3>
+       Information Collected
+    </h3>
+    <p>
+      Logs are collected to allow analysis of which pages are viewed.
+      The advertisements collect viewing information through Google Analytics which is
+      used by Google and advertisers.
+      No personally identifiable information is collected by scintilla.org.
+    </p>
+    <h3>
+       External Links
+    </h3>
+    <p>
+       Other web sites are linked to from this site.
+       These web sites have their own privacy policies which may differ significantly to those of scintilla.org.
+    </p>
+    <h3>
+       Cookies
+    </h3>
+    <p>
+       A cookie is a text file placed on the hard drive of a computer by some web pages which is used to remember
+       when a particular user returns to that site.
+       The advertisements shown on the main pages may use cookies.
+    </p>
+    <h3>
+       Contact
+    </h3>
+    <p>
+       This web site is the responsibility of Neil Hodgson.
+       Most queries about the site contents should go to one of the mailing lists mentioned on the main pages.
+       Queries about the privacy policy may be sent to neilh @ scintilla.org.
+    </p>
+    <h3>
+       Changes to this Policy
+    </h3>
+    <p>
+       This policy may change. If it does then this page will be updated and the date at the bottom will change.
+    </p>
+    <p>
+       This policy was last updated 2 June 2015.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/SciBreak.jpg b/scite-app/scintilla/doc/SciBreak.jpg
new file mode 100644
index 0000000..b63b09f
Binary files /dev/null and b/scite-app/scintilla/doc/SciBreak.jpg differ
diff --git a/scite-app/scintilla/doc/SciCoding.html b/scite-app/scintilla/doc/SciCoding.html
new file mode 100644
index 0000000..e27cf5b
--- /dev/null
+++ b/scite-app/scintilla/doc/SciCoding.html
@@ -0,0 +1,296 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla and SciTE Code Style Preferences
+    </title>
+	<style>
+	.S0 {
+		color: #808080;
+	}
+	.S1 {
+		font-family: Comic Sans MS;
+		color: #007F00;
+		font-size: 9pt;
+	}
+	.S2 {
+		font-family: Comic Sans MS;
+		color: #007F00;
+		font-size: 9pt;
+	}
+	.S3 {
+		font-family: Comic Sans MS;
+		color: #3F703F;
+		font-size: 9pt;
+	}
+	.S4 {
+		color: #007F7F;
+	}
+	.S5 {
+		font-weight: bold;
+		color: #00007F;
+	}
+	.S6 {
+		color: #7F007F;
+	}
+	.S7 {
+		color: #7F007F;
+	}
+	.S8 {
+		color: #804080;
+	}
+	.S9 {
+		color: #7F7F00;
+	}
+	.S10 {
+		font-weight: bold;
+		color: #000000;
+	}
+	.S12 {
+		font-family: Courier New;
+		color: #000000;
+		background: #E0C0E0;
+		font-size: 10pt;
+	}
+	.S13 {
+		font-family: Courier New;
+		color: #007F00;
+		background: #E0FFE0;
+		font-size: 10pt;
+	}
+	.S14 {
+		font-family: Courier New;
+		color: #3F7F3F;
+		background: #E0F0FF;
+		font-size: 10pt;
+	}
+	.S15 {
+		font-family: Comic Sans MS;
+		color: #3F703F;
+		font-size: 9pt;
+	}
+	SPAN {
+		font-family: Verdana;
+		font-size: 10pt;
+	}
+	</style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Code Style
+    </h2>
+    <h3>
+       Introduction
+    </h3>
+	<p>
+	The source code of Scintilla and SciTE follow my preferences.
+	Some of these decisions are arbitrary and based on my sense of aesthetics
+	but its good to have all the code look the same even if its not exactly how
+	everyone would prefer.
+	</p>
+	<p>
+	Code that does not follow these conventions will be accepted, but will be modified
+	as time goes by to fit the conventions. Scintilla code follows the conventions more
+	closely than SciTE except for lexers which are relatively independent modules.
+	Lexers that are maintained by others are left as they are submitted except that
+	warnings will be fixed so the whole project can compile cleanly.
+	</p>
+	<p>
+	The <a href="http://astyle.sourceforge.net/">AStyle</a> formatting
+	program with '--style=attach --indent=force-tab=8 --keep-one-line-blocks
+--pad-header --unpad-paren --pad-comma --indent-cases --align-pointer=name --pad-method-prefix
+--pad-return-type --pad-param-type --align-method-colon --pad-method-colon=after' arguments formats code in much the right way although
+	there are a few bugs in AStyle.
+	</p>
+    <h3>
+       Language features
+    </h3>
+	<p>
+	Design goals for Scintilla and SciTE include portability to currently available C++
+	compilers on diverse platforms with high performance and low resource usage.
+	Scintilla has stricter portability requirements to SciTE as it may be ported to
+	low capability platforms.
+	Scintilla code must build with C++17 which can be checked with "g++ --std=c++17".
+	SciTE can use C++17 features that are widely available from g++ 7.1, MSVC 2017.6 and Clang 5.0 compilers.
+	</p>
+	<p>
+	To achieve portability, only a subset of C++ features are used.
+	Exceptions and templates may be used but, since Scintilla can be used from C as well as
+	C++, exceptions may not be thrown out of Scintilla and all exceptions should be caught
+	before returning from Scintilla.
+	A 'Scintilla' name space is used. This helps with name clashes on OS X.
+	</p>
+	<p>
+	The goto statement is not used because of bad memories from my first job
+	maintaining FORTRAN programs. The union feature is not used as it can lead to
+	non-type-safe value access.
+	</p>
+	<p>
+	The SCI_METHOD preprocessor definition should be used when implementing
+	interfaces which include it like ILexer and only there.
+	</p>
+	<p>
+	Headers should always be included in the same order as given by the
+	scripts/HeaderOrder.txt file.
+	</p>
+    <h3>
+       Casting
+    </h3>
+	<p>
+	Do not use old C style casts like (char *)s. Instead use the most strict form of C++
+	cast possible like const_cast&lt;char *&gt;(s). Use static_cast and const_cast
+	where possible rather than reinterpret_cast.
+	</p>
+	<p>
+	The benefit to using the new style casts is that they explicitly detail what evil is
+	occurring and act as signals that something potentially unsafe is being done.
+	</p>
+	<p>
+	Code that treats const seriously is easier to reason about both for humans
+	and compilers, so use const parameters and avoid const_cast.
+	</p>
+    <h3>
+       Warnings
+    </h3>
+	<p>
+	To help ensure code is well written and portable, it is compiled with almost all
+	warnings turned on. This sometimes results in warnings about code that is
+	completely good (false positives) but changing the code to avoid the warnings
+	is generally fast and has little impact on readability.
+	</p>
+	<p>
+	Initialise all variables and minimise the scope of variables. If a variable is defined
+	just before its use then it can't be misused by code before that point.
+	Use loop declarations that are compatible with both the C++ standard and currently
+	available compilers.
+	</p>
+    <h3>
+       Allocation
+    </h3>
+	<p>
+	Memory exhaustion can occur in many Scintilla methods.
+	This should be checked for and handled but once it has happened, it is very difficult to do
+	anything as Scintilla's data structures may be in an inconsistent state.
+	Fixed length buffers are often used as these are simple and avoid the need to
+	worry about memory exhaustion but then require that buffer lengths are
+	respected.
+	</p>
+	<p>
+	The C++ new and delete operators are preferred over C's malloc and free
+	as new and delete are type safe.
+	</p>
+    <h3>
+       Bracketing
+    </h3>
+	<p>
+	Start brackets, '{', should be located on the line of the control structure they
+	start and end brackets, '}', should be at the indented start of a line. When there is
+	an else clause, this occurs on the same line as the '}'.
+	This format uses less lines than alternatives, allowing more code to be seen on screen.
+	Fully bracketed control
+	structures are preferred because this makes it more likely that modifications will
+	be correct and it allows Scintilla's folder to work. No braces on returned
+	expressions as return is a keyword, not a function call.
+	</p>
+<SPAN class=S0></SPAN><SPAN class=S5>bool</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>fn</SPAN><SPAN class=S10>(</SPAN><SPAN class=S5>int</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>a</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>if</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>a</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>();</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>t</SPAN><SPAN class=S10>();</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>else</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>u</SPAN><SPAN class=S10>();</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>return</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>!</SPAN><SPAN class=S11>a</SPAN><SPAN class=S10>;</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+</SPAN>    <h3>
+       Spacing
+    </h3>
+	<p>
+	Spaces on both sides of '=' and comparison operators and no attempt to line up '='.
+	No space before or after '(', when used in calls, but a space after every ','.
+	No spaces between tokens in short expressions but may be present in
+	longer expressions. Space before '{'. No space before ';'.
+	No space after '*' when used to mean pointer and no space after '[' or ']'.
+	One space between keywords and '('.
+	</p>
+<SPAN class=S0></SPAN><SPAN class=S5>void</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>StoreConditionally</SPAN><SPAN class=S10>(</SPAN><SPAN class=S5>int</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>c</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>const</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>char</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>*</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>if</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>c</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>&amp;&amp;</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>baseSegment</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>==</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>trustSegment</SPAN><SPAN class=S10>[</SPAN><SPAN class=S6>"html"</SPAN><SPAN class=S10>]))</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>baseSegment</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>+</SPAN><SPAN class=S4>1</SPAN><SPAN class=S10>;</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>Store</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>baseSegment</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S6>"html"</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S10>}</SPAN>
+    <h3>
+       Names
+    </h3>
+	<p>
+	Identifiers use mixed case and no underscores.
+	Class, function and method names start with an uppercase letter and use
+	further upper case letters to distinguish words. Variables start with a lower
+	case letter and use upper case letters to distinguish words.
+	Loop counters and similar variables can have simple names like 'i'.
+	Function calls should be differentiated from method calls with an initial '::'
+	global scope modifier.
+	</p>
+<SPAN class=S0></SPAN><SPAN class=S5>class</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>StorageZone</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S5>public</SPAN><SPAN class=S10>:</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>void</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>Store</SPAN><SPAN class=S10>(</SPAN><SPAN class=S5>const</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>char</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>*</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>Media</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>*</SPAN><SPAN class=S11>mediaStore</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>GetBaseMedia</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>zoneDefault</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>for</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S5>int</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>i</SPAN><SPAN class=S10>=</SPAN><SPAN class=S11>mediaStore</SPAN><SPAN class=S10>-&gt;</SPAN><SPAN class=S11>cursor</SPAN><SPAN class=S10>;</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>mediaStore</SPAN><SPAN class=S10>[</SPAN><SPAN class=S11>i</SPAN><SPAN class=S10>],</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>i</SPAN><SPAN class=S10>++)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>mediaStore</SPAN><SPAN class=S10>-&gt;</SPAN><SPAN class=S11>Persist</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>s</SPAN><SPAN class=S10>[</SPAN><SPAN class=S11>i</SPAN><SPAN class=S10>]);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S10>};</SPAN>
+    <h3>
+       Submitting a lexer
+    </h3>
+
+	<p>Lexers have been moved to the separate <a href="https://www.scintilla.org/Lexilla.html">Lexilla</a> project
+	which is on GitHub which may have updated instructions.</p>
+	<p>Add an issue or pull request on the <a href="https://github.com/ScintillaOrg/lexilla">Lexilla project page</a>.</p>
+	<p>Define all of the lexical states in a modified LexicalStyles.iface.</p>
+	<p>Ensure there are no warnings under the compiler you use. Warnings from other compilers
+	will be noted on the feature request.</p>
+	<p>sc.ch is an int: do not pass this around as a char.</p>
+	<p>The ctype functions like isalnum and isdigit only work on ASCII (0..127) and may cause
+	undefined behaviour including crashes if used on other values. Check with IsASCII before calling is*.</p>
+	<p>Functions, structs and classes in lexers should be in an unnamed namespace (see LexCPP)
+	or be marked "static" so they will not leak into other lexers.</p>
+	<p>If you copy from an existing lexer, remove any code that is not needed since it makes it
+	more difficult to maintain and review.</p>
+	<p>When modifying an existing lexer, try to maintain as much compatibility as possible.
+	Do not renumber lexical styles as current client code may be built against the earlier values.</p>
+    <h4>
+       Properties
+    </h4>
+	<p>
+	Properties provided by a new lexer should follow the naming conventions
+	and should include a comment suitable for showing to end users.
+	The convention is for properties that control styling to be named
+	lexer.&lt;lexername&gt;.* and those that control folding to be named
+	fold.&lt;lexername&gt;.*.
+	Examples are "lexer.python.literals.binary" and "fold.haskell.imports".
+	</p>
+	<p>
+	The properties "fold" and "fold.comment" are generic and can be used by
+	any lexer.
+	</p>
+	<p>
+	See LexPython for examples of properties in an object lexer and LexHTML for a functional lexer.
+	</p>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/SciRest.jpg b/scite-app/scintilla/doc/SciRest.jpg
new file mode 100644
index 0000000..4b05223
Binary files /dev/null and b/scite-app/scintilla/doc/SciRest.jpg differ
diff --git a/scite-app/scintilla/doc/SciTEIco.png b/scite-app/scintilla/doc/SciTEIco.png
new file mode 100644
index 0000000..90ab9ff
Binary files /dev/null and b/scite-app/scintilla/doc/SciTEIco.png differ
diff --git a/scite-app/scintilla/doc/SciWord.jpg b/scite-app/scintilla/doc/SciWord.jpg
new file mode 100644
index 0000000..60e70e8
Binary files /dev/null and b/scite-app/scintilla/doc/SciWord.jpg differ
diff --git a/scite-app/scintilla/doc/Scintilla5Migration.html b/scite-app/scintilla/doc/Scintilla5Migration.html
new file mode 100644
index 0000000..3f8b916
--- /dev/null
+++ b/scite-app/scintilla/doc/Scintilla5Migration.html
@@ -0,0 +1,225 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator"
+    content="HTML Tidy for Windows (vers 1st August 2002), see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+
+    <title>Migration to Scintilla 5.x.</title>
+
+    <style type="text/css">
+<!--
+/*<![CDATA[*/
+	CODE { font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	CODE.example { background: #EBFFF7;}
+	CODE.windows { background: #E7F0FF;}
+	CODE.unix { background: #FFFFD7;}
+	A:visited { color: blue; }
+	A:hover { text-decoration: underline ! important; }
+	A.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.seealso { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.toc { text-decoration: none; }
+	A.jump { text-decoration: none; }
+	LI.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	H2 { background: #E0EAFF; }
+
+	table {
+		border: 0px;
+		border-collapse: collapse;
+	}
+
+        div.console {
+            font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;
+            color: #008000;
+            font-weight: bold;
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+        }
+        span.console {
+            font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace;
+            color: #008000;
+            font-weight: bold;
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.1em 0em;
+            padding: 0.1em 0.3em;
+        }
+
+        .name {
+		color: #B08000;
+        }
+/*]]>*/
+-->
+    </style>
+  </head>
+
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0"
+    summary="Banner">
+      <tr>
+        <td><img src="SciTEIco.png" border="3" height="64" width="64" alt="Lexilla icon" /></td>
+
+        <td><a href="index.html"
+        style="color:white;text-decoration:none;font-size:200%">Scintilla</a></td>
+      </tr>
+    </table>
+
+    <h1>Migrating Applications to Scintilla 5 with Lexilla.</h1>
+
+    <h2>Introduction</h2>
+
+    <p>With Scintilla 5.0, all lexers were moved from Scintilla into the Lexilla library
+    which is a <a href="https://www.scintilla.org/Lexilla.html">separate project</a>.
+    Lexilla may be either a static library
+    that is linked into an application or a shared library that is loaded at runtime.</p>
+
+    <p>Lexilla has its own <a href="LexillaDoc.html">documentation</a>.</p>
+
+    <h2>Basics</h2>
+
+    <p>With Scintilla 4.x, it was most common for applications to set a lexer either by lexer name or lexer ID (<span class="name">SCLEX_...</span>) by calling
+    <code>SCI_SETLEXERLANGUAGE("&lt;name&gt;")</code> or <code>SCI_SETLEXER(SCLEX_*)</code>.</p>
+
+    <p>With Scintilla 5, the normal technique s to call Lexilla's <span class="name">CreateLexer</span> function
+    with a lexer name then apply the result with
+    Scintilla's <span class="name">SCI_SETILEXER</span> method:<br />
+    <code>ILexer5 *pLexer = CreateLexer("&lt;name&gt;")<br />
+    SCI_SETILEXER(pLexer)</code></p>
+
+    <p>Lexer names are now strongly preferred to lexer IDs and applications should switch where possible.
+    Some lexers will not have lexer IDs but all will have names.</p>
+
+    <p>Applications may be written in C++ or C; may contain a statically linked Lexilla library or load a Lexilla
+    shared library; and may use the raw Lexilla API or the LexillaAccess C++ helper module.</p>
+
+    <h2>From C++: LexillaAccess</h2>
+
+    <p>The easiest technique is to implement in C++ using LexillaAccess and load a Lexilla shared library.</p>
+    
+    <p>LexillaAccess simplifies use of Lexilla, hides operating system differences, and allows loading
+    multiple libraries that support the Lexilla protocol.
+    It is defined in lexilla/access/LexillaAccess.h and the source code is in lexilla/access/LexillaAccess.cxx.
+    Add these to the build dependencies of the project or build file.</p>
+    
+    <p>Both SciTE and TestLexers (used to test Lexilla) in lexilla/test use LexillaAccess.
+    TestLexers is much simpler than SciTE so can be a good example to examine.</p>
+    
+    <h3>Building</h3>
+
+    <p>Header files for lexers and for using Lexilla will be included so build files will need to reference these new locations.
+    LexillaAccess.cxx should be added to the set of source files.
+    In make, for example, this may appear similar to:</p>
+
+    <code class="example">
+    LEXILLA_DIR ?= $(srcdir)/../../lexilla<br />
+    INCLUDES += -I $(LEXILLA_DIR)/include  -I $(LEXILLA_DIR)/access<br />
+    SOURCES += $(LEXILLA_DIR)/access/LexillaAccess.cxx<br />
+    </code>
+
+    <h3>Steps in code</h3>
+
+    <p>Set the directory to search for Lexilla when full paths aren't provided.
+    This may be a known good system or user directory or the directory of the application
+    depending on the operating system conventions.</p>
+    <code class="example">
+    std::string homeDirectory = "/Users/Me/bin";<br />
+    Lexilla::SetDefaultDirectory(homeDirectory);<br />
+    </code>
+    <p>Load Lexilla or another library that implements the Lexilla protocol.
+    The name "." means the standard name and extension (liblexilla.so / liblexilla.dylib / lexilla.dll)
+    in the default directory so is often a good choice. Names without extensions have the operating system's preferred
+    shared library extension added.
+    A full path can also be used.
+    Multiple libraries can be loaded at once by listing them separated by ';'.
+    Something like one of these lines:</p>
+    <code class="example">
+    Lexilla::Load(".");<br />
+    Lexilla::Load("lexilla;lexpeg;XMLexers");<br />
+    Lexilla::Load("/usr/lib/liblexilla.so;/home/aardvark/bin/libpeg.so");<br />
+    </code>
+    <p>Choose the name of the lexer to use. This may be determined from the file extension or some other mechanism.</p>
+    <code class="example">
+    std::string lexerName = "cpp";<br />
+    </code>
+    <p>Create a lexer and apply it to a Scintilla instance.</p>
+    <code class="example">
+    Scintilla::ILexer5 *pLexer = Lexilla::MakeLexer(lexerName);<br />
+    CallScintilla(scintilla, SCI_SETILEXER, 0, pLexer);<br />
+    </code>
+    <p>Some applications may use integer lexer IDs from SciLexer.h with an "SCLEX_" prefix like
+    <span class="name">SCLEX_CPP</span>.
+    These can be converted to a name with NameFromID before passing to MakeLexer.</p>
+    <code class="example">
+    Scintilla::ILexer5 *pLexer = Lexilla::MakeLexer(Lexilla::NameFromID(SCLEX_CPP));<br />
+    </code>
+
+    <h2>From C: Lexilla.h and system APIs</h2>
+
+    <p>Applications written in C or C++ can use the raw Lexilla API which is defined in lexilla/include/Lexilla.h.
+    Since the ILexer interface is difficult to define for C, C applications should treat the result of CreateLexer as a
+    <code>void*</code> that is simply passed through to Scintilla.
+    If there is a need to call methods on the lexer
+    before passing it to Scintilla then it would be best to use some C++ code although it may be possible
+    for a sufficiently motivated developer to call methods on the lexer from C.</p>
+
+    <p>There is an example for using Lexilla from C in examples/CheckLexilla.</p>
+   
+    <h3>Steps in code</h3>
+
+    <p>Include the system header for loading shared objects.
+    This depends on the operating system: &lt;windows.h&gt; for <code class="windows">Windows</code> or
+    &lt;dlfcn.h&gt; for <code class="unix">Unix</code>.</p>
+    <code class="windows">#include &lt;windows.h&gt;<br /></code>
+    <code class="unix">#include &lt;dlfcn.h&gt;<br /></code>
+    <p>Define a path to the Lexilla shared library.
+    This may be a known good system or user directory or the directory of the application
+    depending on the operating system conventions.</p>
+    <code class="example">
+    #include "Lexilla.h"<br />
+    char szLexillaPath[] = "../../bin/" LEXILLA_LIB LEXILLA_EXTENSION;<br />
+    </code>
+    <p>Load Lexilla using the appropriate operating system function: either LoadLibrary on Windows or
+    dlopen on Unix.</p>
+    <code class="windows">HMODULE lexillaLibrary = LoadLibrary(szLexillaPath);<br /></code>
+    <code class="unix">void *lexillaLibrary = dlopen(szLexillaPath, RTLD_LAZY);<br /></code>
+    <p>Find the CreateLexer function inside the shared library using either GetProcAddress on Windows or
+    dlsym on Unix.</p>
+    <code class="windows">FARPROC fun = GetProcAddress(lexillaLibrary, LEXILLA_CREATELEXER);<br /></code>
+    <code class="unix">void *fun = dlsym(lexillaLibrary, LEXILLA_CREATELEXER);<br /></code>
+    <p>Cast this to the correct type.</p>
+    <code class="example">CreateLexerFn lexerCreate = (CreateLexerFn)(fun);<br /></code>
+    <p>Choose the name of the lexer to use. This may be determined from the file extension or some other mechanism.</p>
+    <code class="example">char lexerName[] = "cpp";<br /></code>
+    <p>Create a lexer and apply it to a Scintilla instance.</p>
+    <code class="example">
+    void *pLexer = lexerCreate(lexerName);<br />
+    CallScintilla(scintilla, SCI_SETILEXER, 0, pLexer);<br />
+    </code>
+
+    <p>If the application uses integer lexer IDs then find the <span class="name">LEXILLA_LEXERNAMEFROMID</span>
+    function, cast to <span class="name">LexerNameFromIDFn</span> then call with the ID before using the result to call
+    <span class="name">CreateLexer</span>.</p>
+    <code class="windows">FARPROC funName = GetProcAddress(lexillaLibrary, LEXILLA_LEXERNAMEFROMID);<br /></code>
+    <code class="unix">void *funName = dlsym(lexillaLibrary, LEXILLA_LEXERNAMEFROMID);<br /></code>
+    <code class="example">LexerNameFromIDFn lexerNameFromID = (LexerNameFromIDFn)(funName);<br /></code>
+    <code class="example">const char *name = lexerNameFromID(lexerID);<br /></code>
+
+    <h2>Static linking</h2>
+
+    <p>Lexilla may be linked directly into an application or built into a static library that is then
+    linked into the application, then there is no need to load a shared library and
+    <span class="name">CreateLexer</span> can be directly called.</p>
+
+    <p>It is possible to link Lexilla into an application and then dynamically load other
+    shared libraries that implement the Lexilla protocol.
+    SciTE on Windows implements this as an option when built with STATIC_BUILD defined.</p>
+
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/ScintillaDoc.html b/scite-app/scintilla/doc/ScintillaDoc.html
new file mode 100644
index 0000000..531fca5
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaDoc.html
@@ -0,0 +1,9618 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator"
+    content="HTML Tidy for Windows (vers 1st August 2002), see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+
+    <title>Scintilla Documentation</title>
+
+    <style type="text/css">
+<!--
+/*<![CDATA[*/
+	CODE { font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A:visited { color: blue; }
+	A:hover { text-decoration: underline ! important; }
+	A.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.element { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.seealso { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	A.toc { text-decoration: none; }
+	A.jump { text-decoration: none; }
+	LI.message { text-decoration: none; font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+	H2 { background: #E0EAFF; }
+
+	table {
+		border: 0px;
+		border-collapse: collapse;
+	}
+
+	table.categories {
+		border: 0px;
+		border-collapse: collapse;
+	}
+	table.categories td {
+		padding: 4px 12px;
+	}
+
+	table.standard {
+		border-collapse: collapse;
+	}
+	table.standard th {
+		background: #404040;
+		color: #FFFFFF;
+		padding: 1px 5px 1px 5px;
+	}
+	table.standard tr:nth-child(odd) {background: #D7D7D7}
+	table.standard tr:nth-child(even) {background: #F0F0F0}
+	table.standard td {
+		padding: 1px 5px 1px 5px;
+	}
+	tr.section {
+		border-top:1px solid #808080;
+	}
+	.S0 {
+		color: #808080;
+	}
+	.S2 {
+		font-family: Georgia, 'DejaVu Serif';
+		color: #007F00;
+		font-size: 9pt;
+	}
+	.S3 {
+		font-family: Georgia, 'DejaVu Serif';
+		color: #3F703F;
+		font-size: 9pt;
+	}
+	.S4 {
+		color: #007F7F;
+	}
+	.S5 {
+		font-weight: bold;
+		color: #00007F;
+	}
+	.S9 {
+		color: #7F7F00;
+	}
+	.S10 {
+		font-weight: bold;
+		color: #000000;
+	}
+	.S17 {
+		font-family: Georgia, 'DejaVu Serif';
+		color: #3060A0;
+		font-size: 9pt;
+	}
+	DIV.highlighted {
+		background: #F7FCF7;
+		border: 1px solid #C0D7C0;
+		margin: 0.3em 3em;
+		padding: 0.3em 0.6em;
+		font-family: 'Verdana';
+		color: #000000;
+		font-size: 10pt;
+	}
+	.provisional {
+		background: #FFB000;
+        }
+	.deprecated {
+		text-decoration: line-through red;
+        }
+	A.discouraged {
+		text-decoration: line-through #FFB000;
+        }
+	.discouraged {
+		text-decoration: line-through #FFB000;
+        }
+	.parameter {
+		font-style:italic;
+        }
+/*]]>*/
+-->
+    </style>
+  </head>
+
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0"
+    summary="Banner">
+      <tr>
+        <td><img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" /></td>
+
+        <td><a href="index.html"
+        style="color:white;text-decoration:none;font-size:200%">Scintilla</a></td>
+      </tr>
+    </table>
+
+    <h1>Scintilla Documentation</h1>
+
+    <p>Last edited 17 July 2021 NH</p>
+
+    <p style="background:#90F0C0">Scintilla 5 has moved the lexers from Scintilla into a new
+    <a href="Lexilla.html">Lexilla</a> project.<br />
+    There is <a class="jump" href="Scintilla5Migration.html">a guide to migrating to Lexilla</a>.</p>
+    <p>There is <a class="jump" href="Design.html">an overview of the internal design of
+    Scintilla</a>.<br />
+     <a class="jump" href="ScintillaUsage.html">Some notes on using Scintilla</a>.<br />
+     <a class="jump" href="Steps.html">How to use the Scintilla Edit Control on Windows</a>.<br />
+     <a class="jump" href="https://www.scintilla.org/dmapp.zip">A simple sample using Scintilla from
+    C++ on Windows</a>.<br />
+     <a class="jump" href="https://www.scintilla.org/SciTry.vb">A simple sample using Scintilla from
+    Visual Basic</a>.<br />
+     <a class="jump" href="https://www.scintilla.org/bait.zip">Bait is a tiny sample using Scintilla
+     on GTK</a>.<br />
+     <a class="jump" href="https://www.scintilla.org/ScintillaTest.zip">ScintillaTest is a more complete
+     GTK sample which can be used to find bugs or prototype new features.</a><br />
+     <a class="jump" href="Lexer.txt">A detailed description of how to write a lexer, including a
+    discussion of folding</a>.<br />
+     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-container_lexer.html">
+     How to implement a lexer in the container</a>.<br />
+     <a class="jump" href="http://sphere.sourceforge.net/flik/docs/scintilla-folding.html">
+     How to implement folding</a>.<br />
+     <a class="jump" href="https://github.com/geany/geany/files/5204338/Scintilla-var.aq-Tutorial.pdf">
+     Beginner's Guide to lexing and folding</a>.<br />
+     The <a class="jump" href="SciCoding.html">coding style</a> used in Scintilla and SciTE is
+    worth following if you want to contribute code to Scintilla but is not compulsory.</p>
+
+    <h2>Introduction</h2>
+
+    <p>The Windows version of Scintilla is a Windows Control. As such, its primary programming
+    interface is through Windows messages. Early versions of Scintilla emulated much of the API
+    defined by the standard Windows Edit and RichEdit controls but those APIs are now deprecated in
+    favour of Scintilla's own, more consistent API. In addition to messages performing the actions
+    of a normal Edit control, Scintilla allows control of syntax styling, folding, markers, autocompletion
+    and call tips.</p>
+
+    <p>The GTK version also uses messages in a similar way to the Windows version. This is
+    different to normal GTK practice but made it easier to implement rapidly.</p>
+
+    <p>Scintilla also builds with Cocoa on OS X and with Qt, and follows the conventions of
+    those platforms.</p>
+
+    <p>Scintilla provides only limited experimental support on Windows for right-to-left languages
+    like Arabic and Hebrew.
+    While text in these languages may appear correct, interaction with this text may not work
+    correctly as occurs with other editors.</p>
+
+    <p>This documentation describes the individual messages and notifications used by Scintilla. It
+    does not describe how to link them together to form a useful editor. For now, the best way to
+    work out how to develop using Scintilla is to see how SciTE uses it. SciTE exercises most of
+    Scintilla's facilities.</p>
+
+    <p>There is a more type-safe binding of this API that can be used from C++.
+    It is implemented in the ScintillaTypes.h, ScintillaMessages.h, ScintillaStructures.h, and ScintillaCall.h headers
+    and call/ScintillaCall.cxx.
+    The ScintillaTypes.h, ScintillaMessages.h, and ScintillaStructures.h headers can be used without ScintillaCall
+    but ScintillaCall makes it easier to use the other headers by wrapping the messages in methods
+    which also avoids much type casting.
+    ScintillaCall throws Scintilla::Failure exceptions when a call fails.
+    </p>
+
+    <p>In the descriptions that follow, the messages are described as function calls with zero, one
+    or two arguments. These two arguments are the standard <code>wParam</code> and
+    <code>lParam</code> familiar to Windows programmers. These parameters are integers that
+    are large enough to hold pointers, and the return value is also an integer large enough to contain a
+    pointer.
+    Although the commands only use the
+    arguments described, because all messages have two arguments whether Scintilla uses them or
+    not, it is strongly recommended that any unused arguments are set to 0. This allows future
+    enhancement of messages without the risk of breaking existing code. Common argument types
+    are:</p>
+
+    <table class="standard" summary="Common argument types">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>bool</code></th>
+
+          <td>Arguments expect the values 0 for <code>false</code> and 1 for
+          <code>true</code>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>int</code></th>
+
+          <td>Arguments are 32-bit or 64-bit signed integers depending on the platform.
+          Equivalent to <code>intptr_t</code>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>position</code></th>
+
+          <td>Positions and lengths in document.
+          Equivalent to <code>intptr_t</code>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>line</code></th>
+
+          <td>A line number in the document.
+          Equivalent to <code>intptr_t</code>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>const&nbsp;char&nbsp;*</code></th>
+
+          <td>Arguments point at text that is being passed to Scintilla but not modified. The text
+          may be zero terminated or another argument may specify the character count, the
+          description will make this clear.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>char *</code></th>
+
+          <td>Arguments point at text buffers that Scintilla will fill with text. In some cases,
+          another argument will tell Scintilla the buffer size. In others, you must make sure that
+          the buffer is big enough to hold the requested text. If a NULL pointer (0) is passed
+          then, for SCI_* calls, the length that should be allocated, not including any terminating
+          NUL, is returned. Some calls (marked "NUL-terminated") add a NUL character to the result but other calls do
+          not: to generically handle both types, allocate one more byte than indicated and set it to NUL.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>pointer</code></th>
+
+          <td>A memory address.
+          In some cases this is a pointer to a sequence of char inside Scintilla that will only be available for a limited period.
+          Equivalent to void *.</td>
+        </tr>
+
+        <tr>
+          <th align="left" id="colour"><code>colour</code></th>
+
+          <td>Colours are set using the RGB format (Red, Green, Blue). The intensity of each colour
+          is set in the range 0 to 255. If you have three such intensities, they are combined as:
+          red | (green &lt;&lt; 8) | (blue &lt;&lt; 16). If you set all intensities to 255, the
+          colour is white. If you set all intensities to 0, the colour is black. When you set a
+          colour, you are making a request. What you will get depends on the capabilities of the
+          system and the current screen mode.</td>
+        </tr>
+
+        <tr>
+          <th align="left" id="colouralpha"><code>colouralpha</code></th>
+
+          <td>Colours are set using the RGBA format (Red, Green, Blue, Alpha).
+          This is similar to <a class="seealso" href="#colour">colour</a> but with a byte
+          of <a class="seealso" href="#colour">alpha</a> added. They are combined as:
+          red | (green &lt;&lt; 8) | (blue &lt;&lt; 16) | (alpha &lt;&lt; 24).
+          Fully opaque uses an alpha of 255.
+        </tr>
+
+        <tr>
+          <th align="left" id="alpha"><code>alpha</code></th>
+
+          <td>Translucency is set using an alpha value.
+		Alpha ranges from 0 (<code>SC_ALPHA_TRANSPARENT</code>) which is completely transparent to
+                   255 (<code>SC_ALPHA_OPAQUE</code>) which is opaque.
+		Previous versions used the value 256 (<code>SC_ALPHA_NOALPHA</code>) to indicate that drawing was to be
+		performed opaquely on the base layer. This is now discouraged and code should use the <code>&hellip;LAYER&hellip;</code>
+		methods to choose the layer.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>&lt;unused&gt;</code></th>
+
+          <td>This is an unused argument. Setting it to 0 will ensure compatibility with future
+          enhancements.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <h2>Lexilla</h2>
+
+    <p>For Scintilla 5.0, lexers have been split off into a separate <a href="Lexilla.html">Lexilla</a> library.
+    Scintilla is responsible for the GUI and calling lexers with Lexilla providing the lexers.</p>
+
+    <p>Lexilla is built as both a shared library and static library and applications may choose to
+    link to one or the other.</p>
+
+    <p>See the <a href="LexillaDoc.html">Lexilla documentation</a> for instructions on building and using Lexilla.</p>
+
+    <p>Lexilla follows the external lexer protocol so can be loaded by applications that support this.
+    As the protocol only supports object lexers, an additional function <code>CreateLexer(const char *name)</code>
+    is exposed which will create a lexer object (ILexer5 *) for any object lexer or function lexer.
+    </p>
+   
+    <p>Lexer libraries that provide the same functions as Lexilla may provide lexers for use by Scintilla,
+    augmenting or replacing those provided by Lexilla.</p>
+
+    <p>A lexer created by Lexilla may be used in Scintilla by calling
+    <a class="seealso" href="#SCI_SETILEXER">SCI_SETILEXER</a>.</p>
+
+    <h2 id="MessageCategories">Contents</h2>
+
+    <table class="categories" summary="Message categories">
+      <tbody>
+        <tr>
+          <td>&cir; <a class="toc" href="#TextRetrievalAndModification">Text retrieval and
+          modification</a></td>
+
+          <td>&cir; <a class="toc" href="#Searching">Searching and replacing</a></td>
+
+          <td>&cir; <a class="toc" href="#Overtype">Overtype</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#CutCopyAndPaste">Cut, copy and paste</a></td>
+
+          <td>&cir; <a class="toc" href="#ErrorHandling">Error handling</a></td>
+
+          <td>&cir; <a class="toc" href="#UndoAndRedo">Undo and Redo</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#SelectionAndInformation">Selection and information</a></td>
+
+          <td>&cir; <a class="toc" href="#ByCharacterOrCodeUnit">By character or UTF-16 code unit</a></td>
+
+          <td>&cir; <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#ScrollingAndAutomaticScrolling">Scrolling and automatic scrolling</a></td>
+
+          <td>&cir; <a class="toc" href="#WhiteSpace">White space</a></td>
+
+          <td>&cir; <a class="toc" href="#Cursor">Cursor</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#MouseCapture">Mouse capture</a></td>
+
+          <td>&cir; <a class="toc" href="#LineEndings">Line endings</a></td>
+
+          <td>&cir; <a class="toc" href="#Words">Words</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#Styling">Styling</a></td>
+
+          <td>&cir; <a class="toc" href="#StyleDefinition">Style definition</a></td>
+
+          <td>&cir; <a class="toc" href="#ElementColours">Element colours</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#CaretAndSelectionStyles">Selection, caret, and hotspot styles</a></td>
+
+          <td>&cir; <a class="toc" href="#CharacterRepresentations">Character representations</a></td>
+
+          <td>&cir; <a class="toc" href="#Margins">Margins</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#Annotations">Annotations</a></td>
+
+          <td>&cir; <a class="toc" href="#OtherSettings">Other settings</a></td>
+
+          <td>&cir; <a class="toc" href="#BraceHighlighting">Brace highlighting</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#TabsAndIndentationGuides">Tabs and Indentation
+          Guides</a></td>
+
+          <td>&cir; <a class="toc" href="#Markers">Markers</a></td>
+
+          <td>&cir; <a class="toc" href="#Indicators">Indicators</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#Autocompletion">Autocompletion</a></td>
+
+          <td>&cir; <a class="toc" href="#UserLists">User lists</a></td>
+
+          <td>&cir; <a class="toc" href="#CallTips">Call tips</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#KeyboardCommands">Keyboard commands</a></td>
+
+          <td>&cir; <a class="toc" href="#KeyBindings">Key bindings</a></td>
+
+          <td>&cir; <a class="toc" href="#PopupEditMenu">Popup edit menu</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#MacroRecording">Macro recording</a></td>
+
+          <td>&cir; <a class="toc" href="#Printing">Printing</a></td>
+
+          <td>&cir; <a class="toc" href="#DirectAccess">Direct access</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#MultipleViews">Multiple views</a></td>
+
+          <td>&cir; <a class="toc" href="#BackgroundLoadSave">Background loading and saving</a></td>
+
+          <td>&cir; <a class="toc" href="#Folding">Folding</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#LineWrapping">Line wrapping</a></td>
+
+          <td>&cir; <a class="toc" href="#Zooming">Zooming</a></td>
+
+          <td>&cir; <a class="toc" href="#LongLines">Long lines</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#Accessibility">Accessibility</a></td>
+
+          <td>&cir; <a class="toc" href="#Lexer">Lexer</a></td>
+
+          <td>&cir; <a class="toc" href="#LexerObjects">Lexer objects</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#Notifications">Notifications</a></td>
+
+          <td>&cir; <a class="toc" href="#Images">Images</a></td>
+
+          <td>&cir; <a class="toc" href="#GTK">GTK</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#ProvisionalMessages"><span class="provisional">Provisional messages</span></a></td>
+
+          <td>&cir; <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td>
+
+          <td>&cir; <a class="toc" href="#EditMessagesNeverSupportedByScintilla">Edit messages never
+          supported by Scintilla</a></td>
+
+        </tr>
+
+        <tr>
+          <td>&cir; <a class="toc" href="#RemovedFeatures">Removed features</a></td>
+
+          <td>&cir; <a class="toc" href="#BuildingScintilla">Building Scintilla</a></td>
+
+          <td>&cir; <a class="toc" href="#EndOfLineAnnotations">End of Line Annotations</a></td>
+
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Messages with names of the form <code>SCI_SETxxxxx</code> often have a companion
+    <code>SCI_GETxxxxx</code>. To save tedious repetition, if the <code>SCI_GETxxxxx</code> message
+    returns the value set by the <code>SCI_SETxxxxx</code> message, the <code>SET</code> routine is
+    described and the <code>GET</code> routine is left to your imagination.</p>
+
+    <h2 id="TextRetrievalAndModification">Text retrieval and modification</h2>
+
+    <p>Each byte in a Scintilla document is associated with a byte of styling
+    information. The combination of a character byte and a style byte is called a cell. Style bytes
+    are interpreted an index into an array of styles.</p>
+
+    <p>In this document, 'character' normally refers to a byte even when multi-byte characters are used.
+    Lengths measure the numbers of bytes, not the amount of characters in those bytes.</p>
+
+    <p>Positions within the Scintilla document refer to a character or the gap before that
+    character. The first character in a document is 0, the second 1 and so on. If a document
+    contains <code>nLen</code> characters, the last character is numbered <code>nLen</code>-1.
+    The caret exists between character positions and can be located from before the first character (0)
+    to after the last character (<code>nLen</code>).</p>
+
+    <p>There are places where the caret can not go where two character bytes make up one character.
+    This occurs when a DBCS character from a language like Japanese is included in the document or
+    when line ends are marked with the CP/M standard of a carriage return followed by a line feed.
+    The <code>INVALID_POSITION</code> constant (-1) represents an invalid position within the
+    document.</p>
+
+    <p>All lines of text in Scintilla are the same height, and this height is calculated from the
+    largest font in any current style. This restriction is for performance; if lines differed in
+    height then calculations involving positioning of text would require the text to be styled
+    first.</p>
+    <code><a class="message" href="#SCI_GETTEXT">SCI_GETTEXT(position length, char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETTEXT">SCI_SETTEXT(&lt;unused&gt;, const char *text)</a><br />
+     <a class="message" href="#SCI_SETSAVEPOINT">SCI_SETSAVEPOINT</a><br />
+     <a class="message" href="#SCI_GETLINE">SCI_GETLINE(line line, char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_REPLACESEL">SCI_REPLACESEL(&lt;unused&gt;, const char
+    *text)</a><br />
+     <a class="message" href="#SCI_SETREADONLY">SCI_SETREADONLY(bool readOnly)</a><br />
+     <a class="message" href="#SCI_GETREADONLY">SCI_GETREADONLY &rarr; bool</a><br />
+     <a class="message" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE(&lt;unused&gt;, Sci_TextRange *tr) &rarr; position</a><br />
+     <a class="message" href="#SCI_ALLOCATE">SCI_ALLOCATE(position bytes)</a><br />
+     <a class="message" href="#SCI_ALLOCATELINES">SCI_ALLOCATELINES(line lines)</a><br />
+     <a class="message" href="#SCI_ADDTEXT">SCI_ADDTEXT(position length, const char *text)</a><br />
+     <a class="message" href="#SCI_ADDSTYLEDTEXT">SCI_ADDSTYLEDTEXT(position length, cell *c)</a><br />
+     <a class="message" href="#SCI_APPENDTEXT">SCI_APPENDTEXT(position length, const char *text)</a><br />
+     <a class="message" href="#SCI_INSERTTEXT">SCI_INSERTTEXT(position pos, const char *text)</a><br />
+     <a class="message" href="#SCI_CHANGEINSERTION">SCI_CHANGEINSERTION(position length, const char *text)</a><br />
+     <a class="message" href="#SCI_CLEARALL">SCI_CLEARALL</a><br />
+     <a class="message" href="#SCI_DELETERANGE">SCI_DELETERANGE(position start, position lengthDelete)</a><br />
+     <a class="message" href="#SCI_CLEARDOCUMENTSTYLE">SCI_CLEARDOCUMENTSTYLE</a><br />
+     <a class="message" href="#SCI_GETCHARAT">SCI_GETCHARAT(position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSTYLEAT">SCI_GETSTYLEAT(position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT(&lt;unused&gt;, Sci_TextRange *tr) &rarr; position</a><br />
+     <a class="message" href="#SCI_RELEASEALLEXTENDEDSTYLES">SCI_RELEASEALLEXTENDEDSTYLES</a><br />
+     <a class="message" href="#SCI_ALLOCATEEXTENDEDSTYLES">SCI_ALLOCATEEXTENDEDSTYLES(int numberStyles) &rarr; int</a><br />
+     <a class="message" href="#SCI_TARGETASUTF8">SCI_TARGETASUTF8(&lt;unused&gt;, char *s) &rarr; position</a><br />
+     <a class="message" href="#SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(position bytes)</a><br />
+    </code>
+
+    <p><b id="SCI_GETTEXT">SCI_GETTEXT(position length, char *text NUL-terminated) &rarr; position</b><br />
+     This returns at most <code class="parameter">length</code>-1 characters of text from the start of the document plus one
+    terminating 0 character. When <code class="parameter">length</code>-1 is beyond document length, it returns document length.
+    To collect all the text in a document, use <code>SCI_GETLENGTH</code>
+    to get the number of characters in the document (<code>nLen</code>), allocate a character
+    buffer of length <code>nLen+1</code> bytes, then call <code>SCI_GETTEXT(nLen+1, char
+    *text)</code>. If the text argument is 0 then the length that should be allocated to store the
+    entire document is returned.
+    If you then save the text, you should use <code>SCI_SETSAVEPOINT</code> to mark
+    the text as unmodified.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>,
+    <a class="seealso" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>,
+    <a class="seealso" href="#SCI_GETLINE">SCI_GETLINE</a>,
+    <a class="seealso "href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>,
+    <a class="seealso" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a></code></p>
+
+    <p><b id="SCI_SETTEXT">SCI_SETTEXT(&lt;unused&gt;, const char *text)</b><br />
+     This replaces all the text in the document with the zero terminated text string you pass
+    in.</p>
+
+    <p><b id="SCI_SETSAVEPOINT">SCI_SETSAVEPOINT</b><br />
+     This message tells Scintilla that the current state of the document is unmodified. This is
+    usually done when the file is saved or loaded, hence the name "save point". As Scintilla
+    performs undo and redo operations, it notifies the container that it has entered or left the
+    save point with <code><a class="message"
+    href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a></code> and <code><a class="message"
+    href="#SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</a></code> <a class="jump"
+    href="#Notifications">notification messages</a>, allowing the container to know if the file
+    should be considered dirty or not.</p>
+
+    <p>See also: <code><a class="message" href="#SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</a>, <a
+    class="message" href="#SCI_GETMODIFY">SCI_GETMODIFY</a></code></p>
+
+    <p><b id="SCI_GETLINE">SCI_GETLINE(line line, char *text) &rarr; position</b><br />
+     This fills the buffer defined by text with the contents of the nominated line (lines start at
+    0). The buffer is not terminated by a 0 character. It is up to you to make sure that the buffer
+    is long enough for the text, use <a class="message"
+    href="#SCI_LINELENGTH"><code>SCI_LINELENGTH(line line)</code></a>. The returned value is the
+    number of characters copied to the buffer. The returned text includes any end of line
+    characters. If you ask for a line number outside the range of lines in the document, 0
+    characters are copied. If the text argument is 0 then the length that should be allocated
+    to store the entire line is returned.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>,
+    <a class="seealso" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>,
+    <a class="seealso" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a>,
+    <a class="seealso" href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>,
+    <a class="seealso" href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_REPLACESEL">SCI_REPLACESEL(&lt;unused&gt;, const char *text)</b><br />
+     The currently selected text between the <a class="jump" href="#SelectionAndInformation">anchor
+    and the current position</a> is replaced by the 0 terminated text string. If the anchor and
+    current position are the same, the text is inserted at the caret position. The caret is
+    positioned after the inserted text and the caret is scrolled into view.</p>
+
+    <p><b id="SCI_SETREADONLY">SCI_SETREADONLY(bool readOnly)</b><br />
+     <b id="SCI_GETREADONLY">SCI_GETREADONLY &rarr; bool</b><br />
+     These messages set and get the read-only flag for the document. If you mark a document as read
+    only, attempts to modify the text cause the <a class="message"
+    href="#SCN_MODIFYATTEMPTRO"><code>SCN_MODIFYATTEMPTRO</code></a> notification.</p>
+
+    <p><b id="SCI_GETTEXTRANGE">SCI_GETTEXTRANGE(&lt;unused&gt;, <a class="jump" href="#Sci_TextRange">Sci_TextRange</a> *tr) &rarr; position</b><br />
+     This collects the text between the positions <code>cpMin</code> and <code>cpMax</code> and
+    copies it to <code>lpstrText</code> (see <code>struct Sci_TextRange</code> in
+    <code>Scintilla.h</code>). If <code>cpMax</code> is -1, text is returned to the end of the
+    document. The text is 0 terminated, so you must supply a buffer that is at least 1 character
+    longer than the number of characters you wish to read. The return value is the length of the
+    returned text not including the terminating 0.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>,
+    <a class="seealso" href="#SCI_GETLINE">SCI_GETLINE</a>,
+    <a class="seealso" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>,
+    <a class="seealso" href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>,
+    <a class="seealso" href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT(&lt;unused&gt;, <a class="jump" href="#Sci_TextRange">Sci_TextRange</a> *tr) &rarr; position</b><br />
+     This collects styled text into a buffer using two bytes for each cell, with the character at
+    the lower address of each pair and the style byte at the upper address. Characters between the
+    positions <code>cpMin</code> and <code>cpMax</code> are copied to <code>lpstrText</code> (see
+    <code>struct Sci_TextRange</code> in <code>Scintilla.h</code>). Two 0 bytes are added to the end of
+    the text, so the buffer that <code>lpstrText</code> points at must be at least
+    <code>2*(cpMax-cpMin)+2</code> bytes long. No check is made for sensible values of
+    <code>cpMin</code> or <code>cpMax</code>. Positions outside the document return character codes
+    and style bytes of 0.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>,
+    <a class="seealso" href="#SCI_GETLINE">SCI_GETLINE</a>,
+    <a class="seealso" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>,
+    <a class="seealso" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a>,
+    <a class="seealso" href="#SCI_GETTEXT">SCI_GETTEXT</a></code></p>
+
+    <p><b id="SCI_ALLOCATE">SCI_ALLOCATE(position bytes)</b><br />
+     Allocate a document buffer large enough to store a given number of bytes.
+     The document will not be made smaller than its current contents.</p>
+
+    <p><b id="SCI_ALLOCATELINES">SCI_ALLOCATELINES(line lines)</b><br />
+     Allocate line indices to match the <code class="parameter">lines</code> argument.
+     This is an optimization that can prevent multiple reallocations of the indices as text is inserted
+     if the application can estimate the number of lines in the document.
+     The number of lines will not be reduced by this call.</p>
+
+    <p><b id="SCI_ADDTEXT">SCI_ADDTEXT(position length, const char *text)</b><br />
+     This inserts the first <code class="parameter">length</code> characters from the string
+     <code class="parameter">text</code>
+    at the current position. This will include any 0's in the string that you might have expected
+    to stop the insert operation. The current position is set at the end of the inserted text,
+    but it is not scrolled into view.</p>
+
+    <p><b id="SCI_ADDSTYLEDTEXT">SCI_ADDSTYLEDTEXT(position length, cell *c)</b><br />
+     This behaves just like <code>SCI_ADDTEXT</code>, but inserts styled text.</p>
+
+    <p><b id="SCI_APPENDTEXT">SCI_APPENDTEXT(position length, const char *text)</b><br />
+     This adds the first <code class="parameter">length</code> characters from the string
+     <code class="parameter">text</code> to the end
+    of the document. This will include any 0's in the string that you might have expected to stop
+    the operation. The current selection is not changed and the new text is not scrolled into
+    view.</p>
+
+    <p><b id="SCI_INSERTTEXT">SCI_INSERTTEXT(position pos, const char *text)</b><br />
+     This inserts the zero terminated <code class="parameter">text</code> string at position <code class="parameter">pos</code> or at
+    the current position if <code class="parameter">pos</code> is -1. If the current position is after the insertion point
+    then it is moved along with its surrounding text but no scrolling is performed.</p>
+
+    <p><b id="SCI_CHANGEINSERTION">SCI_CHANGEINSERTION(position length, const char *text)</b><br />
+     This may only be called from a <a class="message" href="#SC_MOD_INSERTCHECK">SC_MOD_INSERTCHECK</a>
+     notification handler and will change the text being inserted to that provided.</p>
+
+    <p><b id="SCI_CLEARALL">SCI_CLEARALL</b><br />
+     Unless the document is read-only, this deletes all the text.</p>
+
+    <p><b id="SCI_DELETERANGE">SCI_DELETERANGE(position start, position lengthDelete)</b><br />
+     Deletes a range of text in the document.</p>
+
+    <p><b id="SCI_CLEARDOCUMENTSTYLE">SCI_CLEARDOCUMENTSTYLE</b><br />
+     When wanting to completely restyle the document, for example after choosing a lexer, the
+    <code>SCI_CLEARDOCUMENTSTYLE</code> can be used to clear all styling information and reset the
+    folding state.</p>
+
+    <p><b id="SCI_GETCHARAT">SCI_GETCHARAT(position pos) &rarr; int</b><br />
+     This returns the character at <code class="parameter">pos</code> in the document or 0 if <code class="parameter">pos</code> is
+    negative or past the end of the document.</p>
+
+    <p><b id="SCI_GETSTYLEAT">SCI_GETSTYLEAT(position pos) &rarr; int</b><br />
+     This returns the style at <code class="parameter">pos</code> in the document, or 0 if <code class="parameter">pos</code> is
+    negative or past the end of the document.</p>
+
+    <p><b id="SCI_RELEASEALLEXTENDEDSTYLES">SCI_RELEASEALLEXTENDEDSTYLES</b><br />
+    <b id="SCI_ALLOCATEEXTENDEDSTYLES">SCI_ALLOCATEEXTENDEDSTYLES(int numberStyles) &rarr; int</b><br />
+     Extended styles are used for features like textual margins and annotations as well as internally by Scintilla.
+     They are outside the range 0..255 used for the styles bytes associated with document bytes.
+     These functions manage the use of extended styles to ensures that components cooperate in defining styles.
+     <code>SCI_RELEASEALLEXTENDEDSTYLES</code> releases any extended styles allocated by the container.
+     <code>SCI_ALLOCATEEXTENDEDSTYLES</code> allocates a range of style numbers after the byte style values and returns
+     the number of the first allocated style.
+     Ranges for margin and annotation styles should be allocated before calling
+     <a class="seealso" href="#SCI_MARGINSETSTYLEOFFSET">SCI_MARGINSETSTYLEOFFSET</a> or
+     <a class="seealso" href="#SCI_ANNOTATIONSETSTYLEOFFSET">SCI_ANNOTATIONSETSTYLEOFFSET</a>.</p>
+
+    <p><b id="Sci_TextRange">Sci_TextRange</b> and <b id="Sci_CharacterRange">Sci_CharacterRange</b><br />
+     These structures are defined to be exactly the same shape as the Win32 <code>TEXTRANGE</code>
+    and <code>CHARRANGE</code>, so that older code that treats Scintilla as a RichEdit will
+    work.</p>
+    <p>In a future release the type <code>Sci_PositionCR</code> will be redefined to be 64-bits when Scintilla is
+    built for 64-bits on all platforms.</p>
+<pre>
+typedef long Sci_PositionCR;
+
+struct Sci_CharacterRange {
+    Sci_PositionCR cpMin;
+    Sci_PositionCR cpMax;
+};
+
+struct Sci_TextRange {
+    struct Sci_CharacterRange chrg;
+    char *lpstrText;
+};
+</pre>
+
+    <h3 id="EncodedAccess">Specific to GTK, Cocoa and Windows only: Access to encoded text</h3>
+
+    <p><b id="SCI_TARGETASUTF8">SCI_TARGETASUTF8(&lt;unused&gt;, char *s) &rarr; position</b><br />
+     This method retrieves the value of the target encoded as UTF-8 which is the default
+     encoding of GTK so is useful for retrieving text for use in other parts of the user interface,
+     such as find and replace dialogs. The length of the encoded text in bytes is returned.
+     Cocoa uses UTF-16 which is easily converted from UTF-8 so this method can be used to perform the
+     more complex work of transcoding from the various encodings supported.
+    </p>
+
+    <p><b id="SCI_ENCODEDFROMUTF8">SCI_ENCODEDFROMUTF8(const char *utf8, char *encoded) &rarr; position</b><br />
+     <b id="SCI_SETLENGTHFORENCODE">SCI_SETLENGTHFORENCODE(position bytes)</b><br />
+     <code>SCI_ENCODEDFROMUTF8</code> converts a UTF-8 string into the document's
+     encoding which is useful for taking the results of a find dialog, for example, and receiving
+     a string of bytes that can be searched for in the document. Since the text can contain nul bytes,
+     the <code>SCI_SETLENGTHFORENCODE</code> method can be used to set the
+     length that will be converted. If set to -1, the length is determined by finding a nul byte.
+     The length of the converted string is returned.
+    </p>
+
+
+    <h2 id="Searching">Searching</h2>
+    <p>
+    There are methods to search for text and for regular expressions.
+    Most applications should use
+    <a class="seealso" href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET</a>
+    as the basis for their search implementations.
+    Other calls augment this or were implemented before <code>SCI_SEARCHINTARGET</code>.
+    </p>
+    <p>
+    The base regular expression support
+    is limited and should only be used for simple cases and initial development.
+    The C++ runtime &lt;regex&gt; library may be used by setting the <code>SCFIND_CXX11REGEX</code> search flag.
+    The C++11 &lt;regex&gt; support may be disabled by
+    compiling Scintilla with <code>NO_CXX11_REGEX</code> defined.
+    A different regular expression
+    library can be <a class="jump" href="#AlternativeRegEx">integrated into Scintilla</a>
+    or can be called from the container using direct access to the buffer contents through
+    <a class="seealso" href="#SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER</a>.
+    </p>
+
+    <h3 id="SearchAndReplaceUsingTheTarget">Search and replace using the target</h3>
+
+    <p>Searching can be performed within the target range with <code>SCI_SEARCHINTARGET</code>,
+    which uses a counted string to allow searching for null characters. It returns the
+    position of the start of the matching text range or -1 for failure, in which case the target is not moved. The flags used by
+    <code>SCI_SEARCHINTARGET</code> such as <code>SCFIND_MATCHCASE</code>,
+    <code>SCFIND_WHOLEWORD</code>, <code>SCFIND_WORDSTART</code>, and <code>SCFIND_REGEXP</code>
+    can be set with <code>SCI_SETSEARCHFLAGS</code>.</p>
+    <code>
+     <a class="message" href="#SCI_SETTARGETSTART">SCI_SETTARGETSTART(position start)</a><br />
+     <a class="message" href="#SCI_GETTARGETSTART">SCI_GETTARGETSTART &rarr; position</a><br />
+     <a class="message" href="#SCI_SETTARGETSTARTVIRTUALSPACE">SCI_SETTARGETSTARTVIRTUALSPACE(position space)</a><br />
+     <a class="message" href="#SCI_GETTARGETSTARTVIRTUALSPACE">SCI_GETTARGETSTARTVIRTUALSPACE &rarr; position</a><br />
+     <a class="message" href="#SCI_SETTARGETEND">SCI_SETTARGETEND(position end)</a><br />
+     <a class="message" href="#SCI_GETTARGETEND">SCI_GETTARGETEND &rarr; position</a><br />
+     <a class="message" href="#SCI_SETTARGETENDVIRTUALSPACE">SCI_SETTARGETENDVIRTUALSPACE(position space)</a><br />
+     <a class="message" href="#SCI_GETTARGETENDVIRTUALSPACE">SCI_GETTARGETENDVIRTUALSPACE &rarr; position</a><br />
+     <a class="message" href="#SCI_SETTARGETRANGE">SCI_SETTARGETRANGE(position start, position end)</a><br />
+     <a class="message" href="#SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</a><br />
+     <a class="message" href="#SCI_TARGETWHOLEDOCUMENT">SCI_TARGETWHOLEDOCUMENT</a><br />
+     <a class="message" href="#SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</a><br />
+     <a class="message" href="#SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS &rarr; int</a><br />
+     <a class="message" href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(position length, const char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETTARGETTEXT">SCI_GETTARGETTEXT(&lt;unused&gt;, char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_REPLACETARGET">SCI_REPLACETARGET(position length, const char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_REPLACETARGETRE">SCI_REPLACETARGETRE(position length, const char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETTAG">SCI_GETTAG(int tagNumber, char *tagValue) &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETTARGETSTART">SCI_SETTARGETSTART(position start)</b><br />
+     <b id="SCI_GETTARGETSTART">SCI_GETTARGETSTART &rarr; position</b><br />
+     <b id="SCI_SETTARGETSTARTVIRTUALSPACE">SCI_SETTARGETSTARTVIRTUALSPACE(position space)</b><br />
+     <b id="SCI_GETTARGETSTARTVIRTUALSPACE">SCI_GETTARGETSTARTVIRTUALSPACE &rarr; position</b><br />
+     <b id="SCI_SETTARGETEND">SCI_SETTARGETEND(position end)</b><br />
+     <b id="SCI_GETTARGETEND">SCI_GETTARGETEND &rarr; position</b><br />
+     <b id="SCI_SETTARGETENDVIRTUALSPACE">SCI_SETTARGETENDVIRTUALSPACE(position space)</b><br />
+     <b id="SCI_GETTARGETENDVIRTUALSPACE">SCI_GETTARGETENDVIRTUALSPACE &rarr; position</b><br />
+     <b id="SCI_SETTARGETRANGE">SCI_SETTARGETRANGE(position start, position end)</b><br />
+     These functions set and return the start and end of the target. When searching
+     you can set start greater than end to find the last matching text in the
+    target rather than the first matching text.
+    Setting a target position with <code>SCI_SETTARGETSTART</code>, <code>SCI_SETTARGETEND</code>, or <code>SCI_SETTARGETRANGE</code>
+    sets the virtual space to 0.
+    The target is also set by a successful
+    <code>SCI_SEARCHINTARGET</code>.</p>
+    <p>The virtual space of the target range can be set and retrieved with the corresponding <code>...VIRTUALSPACE</code>
+    methods. This allows text to be inserted in virtual space more easily.</p>
+
+     <p><b id="SCI_TARGETFROMSELECTION">SCI_TARGETFROMSELECTION</b><br />
+     Set the target start and end to the start and end positions of the selection.</p>
+
+     <p><b id="SCI_TARGETWHOLEDOCUMENT">SCI_TARGETWHOLEDOCUMENT</b><br />
+     Set the target start to the start of the document and target end to the end of the document.</p>
+
+    <p><b id="SCI_SETSEARCHFLAGS">SCI_SETSEARCHFLAGS(int searchFlags)</b><br />
+     <b id="SCI_GETSEARCHFLAGS">SCI_GETSEARCHFLAGS &rarr; int</b><br />
+     These get and set the <a class="jump" href="#searchFlags"><code class="parameter">searchFlags</code></a> used by
+    <code>SCI_SEARCHINTARGET</code>. There are several option flags including a simple regular
+    expression search.</p>
+
+    <p><b id="SCI_SEARCHINTARGET">SCI_SEARCHINTARGET(position length, const char *text) &rarr; position</b><br />
+     This searches for the first occurrence of a text string in the target defined by
+    <code>SCI_SETTARGETSTART</code> and <code>SCI_SETTARGETEND</code>. The text string is not zero
+    terminated; the size is set by <code class="parameter">length</code>. The search is modified by the search flags
+    set by <code>SCI_SETSEARCHFLAGS</code>. If the search succeeds, the target is set to the found
+    text and the return value is the position of the start of the matching text. If the search
+    fails, the result is -1.</p>
+
+    <p><b id="SCI_GETTARGETTEXT">SCI_GETTARGETTEXT(&lt;unused&gt;, char *text) &rarr; position</b><br />
+     Retrieve the value in the target.</p>
+
+    <p><b id="SCI_REPLACETARGET">SCI_REPLACETARGET(position length, const char *text) &rarr; position</b><br />
+     If <code class="parameter">length</code> is -1, <code class="parameter">text</code> is a zero terminated string, otherwise
+    <code class="parameter">length</code> sets the number of character to replace the target with.
+           After replacement, the target range refers to the replacement text.
+           The return value
+    is the length of the replacement string.<br />
+    Note that the recommended way to delete text in the document is to set the target to the text to be removed,
+    and to perform a replace target with an empty string.</p>
+
+    <p><b id="SCI_REPLACETARGETRE">SCI_REPLACETARGETRE(position length, const char *text) &rarr; position</b><br />
+     This replaces the target using regular expressions. If <code class="parameter">length</code> is -1,
+    <code class="parameter">text</code> is a zero terminated string, otherwise <code class="parameter">length</code> is the number of
+    characters to use. The replacement string is formed from the text string with any sequences of
+    <code>\1</code> through <code>\9</code> replaced by tagged matches from the most recent regular
+    expression search. <code>\0</code> is replaced with all the matched text from the most recent search.
+           After replacement, the target range refers to the replacement text.
+           The return value is the length of the replacement string.</p>
+
+    <p><b id="SCI_GETTAG">SCI_GETTAG(int tagNumber, char *tagValue NUL-terminated) &rarr; int</b><br />
+     Discover what text was matched by tagged expressions in a regular expression search.
+     This is useful if the application wants to interpret the replacement string itself.</p>
+
+    <p>See also: <a class="message" href="#SCI_FINDTEXT"><code>SCI_FINDTEXT</code></a></p>
+
+    <p><b id="searchFlags"><code class="parameter">searchFlags</code></b><br />
+     Several of the search routines use flag options, which include a simple regular expression
+    search. Combine the flag options by adding them:</p>
+
+    <table class="standard" summary="Search flags">
+      <tbody>
+        <tr>
+          <td><code>SCFIND_NONE</code></td>
+
+          <td>Default setting is case-insensitive literal match.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_MATCHCASE</code></td>
+
+          <td>A match only occurs with text that matches the case of the search string.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_WHOLEWORD</code></td>
+
+          <td>A match only occurs if the characters before and after are not word characters as defined
+	  by <a class="message" href="#SCI_SETWORDCHARS"><code>SCI_SETWORDCHARS</code></a>.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_WORDSTART</code></td>
+
+          <td>A match only occurs if the character before is not a word character as defined
+	  by <a class="message" href="#SCI_SETWORDCHARS"><code>SCI_SETWORDCHARS</code></a>.</td>
+        </tr>
+
+        <tr>
+          <td><code>SCFIND_REGEXP</code></td>
+
+          <td>The search string should be interpreted as a regular expression.
+            Uses Scintilla's base implementation unless combined with <code>SCFIND_CXX11REGEX</code>.</td>
+        </tr>
+        <tr>
+          <td><code>SCFIND_POSIX</code></td>
+
+          <td>Treat regular expression in a more POSIX compatible manner
+            by interpreting bare ( and ) for tagged sections rather than \( and \).
+            Has no effect when <code>SCFIND_CXX11REGEX</code> is set.</td>
+        </tr>
+        <tr>
+          <td><code>SCFIND_CXX11REGEX</code></td>
+
+          <td>This flag may be set to use C++11 &lt;regex&gt; instead of Scintilla's basic regular expressions.
+            If the regular expression is invalid then -1 is returned and status is set to
+            <code>SC_STATUS_WARN_REGEX</code>.
+            The ECMAScript flag is set on the regex object and UTF-8 documents will exhibit Unicode-compliant
+            behaviour. For MSVC, where wchar_t is 16-bits, the regular expression ".." will match a single
+            astral-plane character. There may be other differences between compilers.
+            Must also have <code>SCFIND_REGEXP</code> set.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>In a regular expression, using Scintilla's base implementation,
+    special characters interpreted are:</p>
+
+    <table class="standard" summary="Regular expression synopsis">
+      <tbody>
+        <tr>
+          <td><code>.</code></td>
+
+          <td>Matches any character</td>
+        </tr>
+
+        <tr>
+          <td><code>\(</code></td>
+
+          <td>This marks the start of a region for tagging a match.</td>
+        </tr>
+
+        <tr>
+          <td><code>\)</code></td>
+
+          <td>This marks the end of a tagged region.</td>
+        </tr>
+
+        <tr>
+          <td><code>\n</code></td>
+
+          <td>Where <code>n</code> is 1 through 9 refers to the first through ninth tagged region
+          when replacing. For example, if the search string was <code>Fred\([1-9]\)XXX</code> and
+          the replace string was <code>Sam\1YYY</code>, when applied to <code>Fred2XXX</code> this
+          would generate <code>Sam2YYY</code>.
+	  <code>\0</code> refers to all of the matching text.</td>
+        </tr>
+
+        <tr>
+          <td><code>\&lt;</code></td>
+
+          <td>This matches the start of a word using Scintilla's definitions of words.</td>
+        </tr>
+
+        <tr>
+          <td><code>\&gt;</code></td>
+
+          <td>This matches the end of a word using Scintilla's definition of words.</td>
+        </tr>
+
+        <tr>
+          <td><code>\x</code></td>
+
+          <td>This allows you to use a character x that would otherwise have a special meaning. For
+          example, \[ would be interpreted as [ and not as the start of a character set.</td>
+        </tr>
+
+        <tr>
+          <td><code>[...]</code></td>
+
+          <td>This indicates a set of characters, for example, [abc] means any of the characters a,
+          b or c. You can also use ranges, for example [a-z] for any lower case character.</td>
+        </tr>
+
+        <tr>
+          <td><code>[^...]</code></td>
+
+          <td>The complement of the characters in the set. For example, [^A-Za-z] means any
+          character except an alphabetic character.</td>
+        </tr>
+
+        <tr>
+          <td><code>^</code></td>
+
+          <td>This matches the start of a line (unless used inside a set, see above).</td>
+        </tr>
+
+        <tr>
+          <td><code>$</code></td>
+
+          <td>This matches the end of a line.</td>
+        </tr>
+
+        <tr>
+          <td><code>*</code></td>
+
+          <td>This matches 0 or more times. For example, <code>Sa*m</code> matches <code>Sm</code>,
+          <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td>
+        </tr>
+
+        <tr>
+          <td><code>+</code></td>
+
+          <td>This matches 1 or more times. For example, <code>Sa+m</code> matches
+          <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Regular expressions will only match ranges within a single line, never matching over multiple lines.</p>
+
+    <p>When using <code>SCFIND_CXX11REGEX</code> more features are available,
+    generally similar to regular expression support in JavaScript.
+    See the documentation of your C++ runtime for details on what is supported.</p>
+
+    <code><a class="message" href="#SCI_FINDTEXT">SCI_FINDTEXT(int searchFlags, Sci_TextToFind *ft) &rarr; position</a><br />
+     <a class="message" href="#SCI_SEARCHANCHOR">SCI_SEARCHANCHOR</a><br />
+     <a class="message" href="#SCI_SEARCHNEXT">SCI_SEARCHNEXT(int searchFlags, const char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_SEARCHPREV">SCI_SEARCHPREV(int searchFlags, const char *text) &rarr; position</a><br />
+    </code>
+
+    <p><b id="SCI_FINDTEXT">SCI_FINDTEXT(int searchFlags, <a class="jump" href="#Sci_TextToFind">Sci_TextToFind</a> *ft) &rarr; position</b><br />
+     This message searches for text in the document. It does not use or move the current selection.
+    The <a class="jump" href="#searchFlags"><code class="parameter">searchFlags</code></a> argument controls the
+    search type, which includes regular expression searches.</p>
+
+    <p>You can
+    search backwards to find the previous occurrence of a search string by setting the end of the
+    search range before the start.</p>
+
+    <p>The <code>Sci_TextToFind</code> structure is defined in <code>Scintilla.h</code>; set
+    <code>chrg.cpMin</code> and <code>chrg.cpMax</code> with the range of positions in the document
+    to search. You can search backwards by
+    setting <code>chrg.cpMax</code> less than <code>chrg.cpMin</code>.
+    Set the <code>lpstrText</code> member of <code>Sci_TextToFind</code> to point at a zero terminated
+    text string holding the search pattern. If your language makes the use of <code>Sci_TextToFind</code>
+    difficult, you should consider using <code>SCI_SEARCHINTARGET</code> instead.</p>
+
+    <p>The return value is -1 if the search fails or the position of the start of the found text if
+    it succeeds. The <code>chrgText.cpMin</code> and <code>chrgText.cpMax</code> members of
+    <code>Sci_TextToFind</code> are filled in with the start and end positions of the found text.</p>
+
+    <p>See also: <code><a class="message"
+    href="#SCI_SEARCHINTARGET">SCI_SEARCHINTARGET</a></code></p>
+
+    <p><b id="Sci_TextToFind">Sci_TextToFind</b><br />
+     This structure is defined to have exactly the same shape as the Win32 structure
+    <code>FINDTEXTEX</code> for old code that treated Scintilla as a RichEdit control.</p>
+<pre>
+struct Sci_TextToFind {
+    struct <a class="jump" href="#Sci_CharacterRange">Sci_CharacterRange</a> chrg;     // range to search
+    const char *lpstrText;                // the search pattern (zero terminated)
+    struct Sci_CharacterRange chrgText; // returned as position of matching text
+};
+</pre>
+
+    <p><b id="SCI_SEARCHANCHOR">SCI_SEARCHANCHOR</b><br />
+     <b id="SCI_SEARCHNEXT">SCI_SEARCHNEXT(int searchFlags, const char *text) &rarr; position</b><br />
+     <b id="SCI_SEARCHPREV">SCI_SEARCHPREV(int searchFlags, const char *text) &rarr; position</b><br />
+     These messages provide relocatable search support. This allows multiple incremental
+    interactive searches to be macro recorded while still setting the selection to found text so
+    the find/select operation is self-contained. These three messages send <a class="message"
+    href="#SCN_MACRORECORD"><code>SCN_MACRORECORD</code></a> <a class="jump"
+    href="#Notifications">notifications</a> if macro recording is enabled.</p>
+
+    <p><code>SCI_SEARCHANCHOR</code> sets the search start point used by
+    <code>SCI_SEARCHNEXT</code> and <code>SCI_SEARCHPREV</code> to the start of the current
+    selection, that is, the end of the selection that is nearer to the start of the document. You
+    should always call this before calling either of <code>SCI_SEARCHNEXT</code> or
+    <code>SCI_SEARCHPREV</code>.</p>
+
+    <p><code>SCI_SEARCHNEXT</code> and <code>SCI_SEARCHPREV</code> search for the next and previous
+    occurrence of the zero terminated search string pointed at by text. The search is modified by
+    the <a class="jump" href="#searchFlags"><code class="parameter">searchFlags</code></a>. </p>
+
+    <p>The return value is -1 if nothing is found, otherwise the return value is the start position
+    of the matching text. The selection is updated to show the matched text, but is not scrolled
+    into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SEARCHINTARGET"><code>SCI_SEARCHINTARGET</code></a>,
+    <a class="message" href="#SCI_FINDTEXT"><code>SCI_FINDTEXT</code></a></p>
+
+    <h2 id="Overtype">Overtype</h2>
+
+    <code><a class="message" href="#SCI_SETOVERTYPE">SCI_SETOVERTYPE(bool overType)</a><br />
+     <a class="message" href="#SCI_GETOVERTYPE">SCI_GETOVERTYPE &rarr; bool</a><br />
+    </code>
+
+    <p><b id="SCI_SETOVERTYPE">SCI_SETOVERTYPE(bool overType)</b><br />
+     <b id="SCI_GETOVERTYPE">SCI_GETOVERTYPE &rarr; bool</b><br />
+     When overtype is enabled, each typed character replaces the character to the right of the text
+    caret. When overtype is disabled, characters are inserted at the caret.
+    <code>SCI_GETOVERTYPE</code> returns <code>true</code> (1) if overtyping is active, otherwise
+    <code>false</code> (0) will be returned. Use <code>SCI_SETOVERTYPE</code> to set the overtype
+    mode.</p>
+
+    <h2 id="CutCopyAndPaste">Cut, copy and paste</h2>
+
+    <code><a class="message" href="#SCI_CUT">SCI_CUT</a><br />
+     <a class="message" href="#SCI_COPY">SCI_COPY</a><br />
+     <a class="message" href="#SCI_PASTE">SCI_PASTE</a><br />
+     <a class="message" href="#SCI_CLEAR">SCI_CLEAR</a><br />
+     <a class="message" href="#SCI_CANPASTE">SCI_CANPASTE &rarr; bool</a><br />
+     <a class="message" href="#SCI_COPYRANGE">SCI_COPYRANGE(position start, position end)</a><br />
+     <a class="message" href="#SCI_COPYTEXT">SCI_COPYTEXT(position length, const char *text)</a><br />
+     <a class="message" href="#SCI_COPYALLOWLINE">SCI_COPYALLOWLINE</a><br />
+     <a class="message" href="#SCI_SETPASTECONVERTENDINGS">SCI_SETPASTECONVERTENDINGS(bool convert)</a><br />
+     <a class="message" href="#SCI_GETPASTECONVERTENDINGS">SCI_GETPASTECONVERTENDINGS &rarr; bool</a><br />
+     <a class="message" href="#SCI_REPLACERECTANGULAR">SCI_REPLACERECTANGULAR(position length, const char *text)</a><br />
+    </code>
+
+    <p><b id="SCI_CUT">SCI_CUT</b><br />
+     <b id="SCI_COPY">SCI_COPY</b><br />
+     <b id="SCI_PASTE">SCI_PASTE</b><br />
+     <b id="SCI_CLEAR">SCI_CLEAR</b><br />
+     <b id="SCI_CANPASTE">SCI_CANPASTE &rarr; bool</b><br />
+     <b id="SCI_COPYALLOWLINE">SCI_COPYALLOWLINE</b><br />
+     These commands perform the standard tasks of cutting and copying data to the clipboard,
+    pasting from the clipboard into the document, and clearing the document.
+    <code>SCI_CANPASTE</code> returns non-zero if the document isn't read-only and if the selection
+    doesn't contain protected text. If you need a "can copy" or "can cut", use
+    <code>SCI_GETSELECTIONEMPTY()</code>, which will be zero if there are any non-empty
+    selection ranges implying that a copy or cut to the clipboard should work.</p>
+
+    <p>GTK does not really support <code>SCI_CANPASTE</code> and always returns <code>true</code>
+    unless the document is read-only.</p>
+
+    <p>On X, the clipboard is asynchronous and may require several messages between
+    the destination and source applications. Data from SCI_PASTE will not arrive in the
+    document immediately.</p>
+
+    <p><code>SCI_COPYALLOWLINE</code> works the same as SCI_COPY except that if the
+    selection is empty then the current line is copied. On Windows, an extra "MSDEVLineSelect" marker
+    is added to the clipboard which is then used in <code>SCI_PASTE</code> to paste
+    the whole line before the current line.</p>
+
+     <b id="SCI_COPYRANGE">SCI_COPYRANGE(position start, position end)</b><br />
+     <b id="SCI_COPYTEXT">SCI_COPYTEXT(position length, const char *text)</b><br />
+    <p><code>SCI_COPYRANGE</code> copies a range of text from the document to
+    the system clipboard and <code>SCI_COPYTEXT</code> copies a supplied piece of
+    text to the system clipboard.</p>
+
+    <p><b id="SCI_SETPASTECONVERTENDINGS">SCI_SETPASTECONVERTENDINGS(bool convert)</b><br />
+     <b id="SCI_GETPASTECONVERTENDINGS">SCI_GETPASTECONVERTENDINGS &rarr; bool</b><br />
+     If this property is set then when text is pasted any line ends are converted to match the document's
+     end of line mode as set with
+     <a class="seealso" href="#SCI_SETEOLMODE">SCI_SETEOLMODE</a>.
+     Defaults to true.</p>
+
+    <p><b id="SCI_REPLACERECTANGULAR">SCI_REPLACERECTANGULAR(position length, const char *text)</b><br/>
+      Replaces the selected text or empty selection with the given text.
+      The insertion is performed similarly to rectangular pastes: new lines in the given text are interpreted as
+      moving to the next line without inserting new lines unless at the end of the document.</p>
+
+    <h2 id="ErrorHandling">Error handling</h2>
+
+    <code><a class="message" href="#SCI_SETSTATUS">SCI_SETSTATUS(int status)</a><br />
+     <a class="message" href="#SCI_GETSTATUS">SCI_GETSTATUS &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETSTATUS">SCI_SETSTATUS(int status)</b><br />
+     <b id="SCI_GETSTATUS">SCI_GETSTATUS &rarr; int</b><br />
+     If an error occurs, Scintilla may set an internal error number that can be retrieved with
+    <code>SCI_GETSTATUS</code>.
+    To clear the error status call <code>SCI_SETSTATUS(0)</code>.
+    Status values from 1 to 999 are errors and status <code>SC_STATUS_WARN_START</code> (1000)
+    and above are warnings.
+    The currently defined statuses are:
+    </p>
+
+    <table class="standard" summary="Status values">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_STATUS_OK</code></th>
+          <td>0</td>
+          <td>No failures</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_STATUS_FAILURE</code></th>
+          <td>1</td>
+          <td>Generic failure</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_STATUS_BADALLOC</code></th>
+          <td>2</td>
+          <td>Memory is exhausted</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_STATUS_WARN_REGEX</code></th>
+          <td>1001</td>
+          <td>Regular expression is invalid</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <h2 id="UndoAndRedo">Undo and Redo</h2>
+
+    <p>Scintilla has multiple level undo and redo. It will continue to collect undoable actions
+    until memory runs out. Scintilla saves actions that change the document. Scintilla does not
+    save caret and selection movements, view scrolling and the like. Sequences of typing or
+    deleting are compressed into single transactions to make it easier to undo and redo at a sensible
+    level of detail. Sequences of actions can be combined into transactions that are undone as a unit.
+    These sequences occur between <code>SCI_BEGINUNDOACTION</code> and
+    <code>SCI_ENDUNDOACTION</code> messages. These transactions can be nested and only the top-level
+    sequences are undone as units.</p>
+    <code><a class="message" href="#SCI_UNDO">SCI_UNDO</a><br />
+     <a class="message" href="#SCI_CANUNDO">SCI_CANUNDO &rarr; bool</a><br />
+     <a class="message" href="#SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</a><br />
+     <a class="message" href="#SCI_REDO">SCI_REDO</a><br />
+     <a class="message" href="#SCI_CANREDO">SCI_CANREDO &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETUNDOCOLLECTION">SCI_SETUNDOCOLLECTION(bool collectUndo)</a><br />
+     <a class="message" href="#SCI_GETUNDOCOLLECTION">SCI_GETUNDOCOLLECTION &rarr; bool</a><br />
+     <a class="message" href="#SCI_BEGINUNDOACTION">SCI_BEGINUNDOACTION</a><br />
+     <a class="message" href="#SCI_ENDUNDOACTION">SCI_ENDUNDOACTION</a><br />
+     <a class="message" href="#SCI_ADDUNDOACTION">SCI_ADDUNDOACTION(int token, int flags)</a><br />
+    </code>
+
+    <p><b id="SCI_UNDO">SCI_UNDO</b><br />
+     <b id="SCI_CANUNDO">SCI_CANUNDO &rarr; bool</b><br />
+     <code>SCI_UNDO</code> undoes one action, or if the undo buffer has reached a
+    <code>SCI_ENDUNDOACTION</code> point, all the actions back to the corresponding
+    <code>SCI_BEGINUNDOACTION</code>.</p>
+
+    <p><code>SCI_CANUNDO</code> returns 0 if there is nothing to undo, and 1 if there is. You would
+    typically use the result of this message to enable/disable the Edit menu Undo command.</p>
+
+    <p><b id="SCI_REDO">SCI_REDO</b><br />
+     <b id="SCI_CANREDO">SCI_CANREDO &rarr; bool</b><br />
+     <code>SCI_REDO</code> undoes the effect of the last <code>SCI_UNDO</code> operation.</p>
+
+    <p><code>SCI_CANREDO</code> returns 0 if there is no action to redo and 1 if there are undo
+    actions to redo. You could typically use the result of this message to enable/disable the Edit
+    menu Redo command.</p>
+
+    <p><b id="SCI_EMPTYUNDOBUFFER">SCI_EMPTYUNDOBUFFER</b><br />
+     This command tells Scintilla to forget any saved undo or redo history. It also sets the save
+    point to the start of the undo buffer, so the document will appear to be unmodified. This does
+    not cause the <code><a class="message"
+    href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a></code> notification to be sent to the
+    container.</p>
+
+    <p>See also: <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a></p>
+
+    <p><b id="SCI_SETUNDOCOLLECTION">SCI_SETUNDOCOLLECTION(bool collectUndo)</b><br />
+     <b id="SCI_GETUNDOCOLLECTION">SCI_GETUNDOCOLLECTION &rarr; bool</b><br />
+     You can control whether Scintilla collects undo information with
+    <code>SCI_SETUNDOCOLLECTION</code>. Pass in <code>true</code> (1) to collect information and
+    <code>false</code> (0) to stop collecting. If you stop collection, you should also use
+    <code>SCI_EMPTYUNDOBUFFER</code> to avoid the undo buffer being unsynchronized with the data in
+    the buffer.</p>
+
+    <p>You might wish to turn off saving undo information if you use the Scintilla to store text
+    generated by a program (a Log view) or in a display window where text is often deleted and
+    regenerated.</p>
+
+    <p><b id="SCI_BEGINUNDOACTION">SCI_BEGINUNDOACTION</b><br />
+     <b id="SCI_ENDUNDOACTION">SCI_ENDUNDOACTION</b><br />
+     Send these two messages to Scintilla to mark the beginning and end of a set of operations that
+    you want to undo all as one operation but that you have to generate as several operations.
+    Alternatively, you can use these to mark a set of operations that you do not want to have
+    combined with the preceding or following operations if they are undone.</p>
+
+    <p><b id="SCI_ADDUNDOACTION">SCI_ADDUNDOACTION(int token, int flags)</b><br />
+     The container can add its own actions into the undo stack by calling
+     <code>SCI_ADDUNDOACTION</code> and an <code>SCN_MODIFIED</code>
+     notification will be sent to the container with the
+     <a class="message" href="#SC_MOD_CONTAINER"><code>SC_MOD_CONTAINER</code></a>
+     flag when it is time to undo (<code>SC_PERFORMED_UNDO</code>) or
+     redo (<code>SC_PERFORMED_REDO</code>) the action. The token argument supplied is
+     returned in the <code>token</code> field of the notification.</p>
+     <p>For example, if the container wanted to allow undo and redo of a 'toggle bookmark' command then
+     it could call <code>SCI_ADDUNDOACTION(line, 0)</code> each time the command is performed.
+     Then when it receives a notification to undo or redo it toggles a bookmark on the line given by
+     the token field. If there are different types of commands or parameters that need to be stored into the undo
+     stack then the container should maintain a stack of its own for the document and use the current
+     position in that stack as the argument to <code>SCI_ADDUNDOACTION(line)</code>.
+     <code>SCI_ADDUNDOACTION</code> commands are not combined together
+     into a single undo transaction unless grouped with <code>SCI_BEGINUNDOACTION</code>
+     and <code>SCI_ENDUNDOACTION</code>.</p>
+
+     <p>The flags argument can be <code>UNDO_MAY_COALESCE</code> (1) if the container action may be
+     coalesced along with any insertion and deletion actions into a single compound action, otherwise
+     <code>UNDO_NONE</code> (0).
+     Coalescing treats coalescible container actions as transparent so will still only group together insertions that
+     look like typing or deletions that look like multiple uses of the Backspace or Delete keys.
+     </p>
+    <h2 id="SelectionAndInformation">Selection and information</h2>
+
+    <p>Scintilla maintains a selection that stretches between two points, the anchor and the
+    current position. If the anchor and the current position are the same, there is no selected
+    text. Positions in the document range from 0 (before the first character), to the document size
+    (after the last character). If you use messages, there is nothing to stop you setting a
+    position that is in the middle of a CRLF pair, or in the middle of a 2 byte character. However,
+    keyboard commands will not move the caret into such positions.</p>
+    <code><a class="message" href="#SCI_GETTEXTLENGTH">SCI_GETTEXTLENGTH &rarr; position</a><br />
+     <a class="message" href="#SCI_GETLENGTH">SCI_GETLENGTH &rarr; position</a><br />
+     <a class="message" href="#SCI_GETLINECOUNT">SCI_GETLINECOUNT &rarr; line</a><br />
+     <a class="message" href="#SCI_LINESONSCREEN">SCI_LINESONSCREEN &rarr; line</a><br />
+     <a class="message" href="#SCI_GETMODIFY">SCI_GETMODIFY &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETSEL">SCI_SETSEL(position anchor, position caret)</a><br />
+     <a class="message" href="#SCI_GOTOPOS">SCI_GOTOPOS(position caret)</a><br />
+     <a class="message" href="#SCI_GOTOLINE">SCI_GOTOLINE(line line)</a><br />
+     <a class="message" href="#SCI_SETCURRENTPOS">SCI_SETCURRENTPOS(position caret)</a><br />
+     <a class="message" href="#SCI_GETCURRENTPOS">SCI_GETCURRENTPOS &rarr; position</a><br />
+     <a class="message" href="#SCI_SETANCHOR">SCI_SETANCHOR(position anchor)</a><br />
+     <a class="message" href="#SCI_GETANCHOR">SCI_GETANCHOR &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONSTART">SCI_SETSELECTIONSTART(position anchor)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONSTART">SCI_GETSELECTIONSTART &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONEND">SCI_SETSELECTIONEND(position caret)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONEND">SCI_GETSELECTIONEND &rarr; position</a><br />
+     <a class="message" href="#SCI_SETEMPTYSELECTION">SCI_SETEMPTYSELECTION(position caret)</a><br />
+     <a class="message" href="#SCI_SELECTALL">SCI_SELECTALL</a><br />
+     <a class="message" href="#SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION(position pos) &rarr; line</a><br />
+     <a class="message" href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_LINELENGTH">SCI_LINELENGTH(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETCOLUMN">SCI_GETCOLUMN(position pos) &rarr; position</a><br />
+     <a class="message" href="#SCI_FINDCOLUMN">SCI_FINDCOLUMN(line line, position column) &rarr; position</a><br />
+     <a class="message" href="#SCI_POSITIONFROMPOINT">SCI_POSITIONFROMPOINT(int x, int y) &rarr; position</a><br />
+     <a class="message" href="#SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE(int x, int y) &rarr; position</a><br />
+     <a class="message" href="#SCI_CHARPOSITIONFROMPOINT">SCI_CHARPOSITIONFROMPOINT(int x, int y) &rarr; position</a><br />
+     <a class="message" href="#SCI_CHARPOSITIONFROMPOINTCLOSE">SCI_CHARPOSITIONFROMPOINTCLOSE(int x, int y) &rarr; position</a><br />
+     <a class="message" href="#SCI_POINTXFROMPOSITION">SCI_POINTXFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_POINTYFROMPOSITION">SCI_POINTYFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</a><br />
+     <a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT(&lt;unused&gt;, char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE(position length, char *text) &rarr; position</a><br />
+     <a class="message" href="#SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int selectionMode)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_GETMOVEEXTENDSSELECTION">SCI_GETMOVEEXTENDSSELECTION &rarr; bool</a><br />
+     <a class="message" href="#SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</a><br />
+     <a class="message" href="#SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(position pos) &rarr; position</a><br />
+     <a class="message" href="#SCI_POSITIONAFTER">SCI_POSITIONAFTER(position pos) &rarr; position</a><br />
+     <a class="message" href="#SCI_TEXTWIDTH">SCI_TEXTWIDTH(int style, const char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_TEXTHEIGHT">SCI_TEXTHEIGHT(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_CHOOSECARETX">SCI_CHOOSECARETX</a><br />
+     <a class="message" href="#SCI_MOVESELECTEDLINESUP">SCI_MOVESELECTEDLINESUP</a><br />
+     <a class="message" href="#SCI_MOVESELECTEDLINESDOWN">SCI_MOVESELECTEDLINESDOWN</a><br />
+     <a class="message" href="#SCI_SETMOUSESELECTIONRECTANGULARSWITCH">SCI_SETMOUSESELECTIONRECTANGULARSWITCH(bool mouseSelectionRectangularSwitch)</a><br />
+     <a class="message" href="#SCI_GETMOUSESELECTIONRECTANGULARSWITCH">SCI_GETMOUSESELECTIONRECTANGULARSWITCH &rarr; bool</a><br />
+    </code>
+
+    <p><b id="SCI_GETTEXTLENGTH">SCI_GETTEXTLENGTH &rarr; position</b><br />
+     <b id="SCI_GETLENGTH">SCI_GETLENGTH &rarr; position</b><br />
+     Both these messages return the length of the document in bytes.</p>
+
+    <p><b id="SCI_GETLINECOUNT">SCI_GETLINECOUNT &rarr; line</b><br />
+     This returns the number of lines in the document. An empty document contains 1 line. A
+    document holding only an end of line sequence has 2 lines.</p>
+
+    <p><b id="SCI_LINESONSCREEN">SCI_LINESONSCREEN &rarr; line</b><br />
+     This returns the number of complete lines visible on the screen. With a constant line height,
+    this is the vertical space available divided by the line separation. Unless you arrange to size
+    your window to an integral number of lines, there may be a partial line visible at the bottom
+    of the view.</p>
+
+    <p><b id="SCI_GETMODIFY">SCI_GETMODIFY &rarr; bool</b><br />
+     This returns non-zero if the document is modified and 0 if it is unmodified. The modified
+    status of a document is determined by the undo position relative to the save point. The save
+    point is set by <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a>,
+    usually when you have saved data to a file.</p>
+
+    <p>If you need to be notified when the document becomes modified, Scintilla notifies the
+    container that it has entered or left the save point with the <a class="message"
+    href="#SCN_SAVEPOINTREACHED"><code>SCN_SAVEPOINTREACHED</code></a> and <a class="message"
+    href="#SCN_SAVEPOINTLEFT"><code>SCN_SAVEPOINTLEFT</code></a> <a class="jump"
+    href="#Notifications">notification messages</a>.</p>
+
+    <p><b id="SCI_SETSEL">SCI_SETSEL(position anchor, position caret)</b><br />
+     This message sets both the anchor and the current position. If <code class="parameter">caret</code> is
+    negative, it means the end of the document. If <code class="parameter">anchor</code> is negative, it means
+    remove any selection (i.e. set the anchor to the same position as <code class="parameter">caret</code>). The
+    caret is scrolled into view after this operation.</p>
+
+    <p><b id="SCI_GOTOPOS">SCI_GOTOPOS(position caret)</b><br />
+     This removes any selection, sets the caret at <code class="parameter">caret</code> and scrolls the view to make
+    the caret visible, if necessary. It is equivalent to
+    <code>SCI_SETSEL(caret, caret)</code>. The anchor position is set the same as the current
+    position.</p>
+
+    <p><b id="SCI_GOTOLINE">SCI_GOTOLINE(line line)</b><br />
+     This removes any selection and sets the caret at the start of line number <code class="parameter">line</code>
+    and scrolls the view (if needed) to make it visible. The anchor position is set the same as the
+    current position. If <code class="parameter">line</code> is outside the lines in the document (first line is 0),
+    the line set is the first or last.</p>
+
+    <p><b id="SCI_SETCURRENTPOS">SCI_SETCURRENTPOS(position caret)</b><br />
+     This sets the current position and creates a selection between the anchor and the current
+    position. The caret is not scrolled into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETCURRENTPOS">SCI_GETCURRENTPOS &rarr; position</b><br />
+     This returns the current position.</p>
+
+    <p><b id="SCI_SETANCHOR">SCI_SETANCHOR(position anchor)</b><br />
+     This sets the anchor position and creates a selection between the anchor position and the
+    current position. The caret is not scrolled into view.</p>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETANCHOR">SCI_GETANCHOR &rarr; position</b><br />
+     This returns the current anchor position.</p>
+
+    <p><b id="SCI_SETSELECTIONSTART">SCI_SETSELECTIONSTART(position anchor)</b><br />
+     <b id="SCI_SETSELECTIONEND">SCI_SETSELECTIONEND(position caret)</b><br />
+     These set the selection based on the assumption that the anchor position is less than the
+    current position. They do not make the caret visible. The table shows the positions of the
+    anchor and the current position after using these messages.</p>
+
+    <table class="standard" summary="SetSelection caret positioning">
+      <thead align="center">
+        <tr>
+          <th>
+	  New value for
+          </th>
+
+          <th>anchor</th>
+
+          <th>caret</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <th><code>SCI_SETSELECTIONSTART</code></th>
+
+          <td><code class="parameter">anchor</code></td>
+
+          <td><code>Max(</code><code class="parameter">anchor</code><code>, current)</code></td>
+        </tr>
+
+        <tr>
+          <th><code>SCI_SETSELECTIONEND</code></th>
+
+          <td><code>Min(anchor, </code><code class="parameter">caret</code><code>)</code></td>
+
+          <td><code class="parameter">caret</code></td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>See also: <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a></p>
+
+    <p><b id="SCI_GETSELECTIONSTART">SCI_GETSELECTIONSTART &rarr; position</b><br />
+     <b id="SCI_GETSELECTIONEND">SCI_GETSELECTIONEND &rarr; position</b><br />
+     These return the start and end of the selection without regard to which end is the current
+    position and which is the anchor. <code>SCI_GETSELECTIONSTART</code> returns the smaller of the
+    current position or the anchor position. <code>SCI_GETSELECTIONEND</code> returns the larger of
+    the two values.</p>
+
+    <p><b id="SCI_SETEMPTYSELECTION">SCI_SETEMPTYSELECTION(position caret)</b><br />
+     This removes any selection and sets the caret at <code class="parameter">caret</code>. The caret is not scrolled into view.</p>
+
+    <p><b id="SCI_SELECTALL">SCI_SELECTALL</b><br />
+     This selects all the text in the document. The current position is not scrolled into view.</p>
+
+    <p><b id="SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION(position pos) &rarr; line</b><br />
+     This message returns the line that contains the position <code class="parameter">pos</code> in the document. The
+    return value is 0 if <code class="parameter">pos</code> &lt;= 0. The return value is the last line if
+    <code class="parameter">pos</code> is beyond the end of the document.</p>
+
+    <p><b id="SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE(line line) &rarr; position</b><br />
+     This returns the document position that corresponds with the start of the line. If
+    <code class="parameter">line</code> is negative, the position of the line holding the start of the selection is
+    returned. If <code class="parameter">line</code> is greater than the lines in the document, the return value is
+    -1. If <code class="parameter">line</code> is equal to the number of lines in the document (i.e. 1 line past the
+    last line), the return value is the end of the document.</p>
+
+    <p><b id="SCI_GETLINEENDPOSITION">SCI_GETLINEENDPOSITION(line line) &rarr; position</b><br />
+     This returns the position at the end of the line, before any line end characters. If <code class="parameter">line</code>
+    is the last line in the document (which does not have any end of line characters) or greater,
+    the result is the size of the document.
+    If <code class="parameter">line</code> is negative the result is undefined.</p>
+
+    <p><b id="SCI_LINELENGTH">SCI_LINELENGTH(line line) &rarr; position</b><br />
+     This returns the length of the line, including any line end characters. If <code class="parameter">line</code>
+    is negative or beyond the last line in the document, the result is 0. If you want the length of
+    the line not including any end of line characters, use <a class="message"
+    href="#SCI_GETLINEENDPOSITION"><code>SCI_GETLINEENDPOSITION(line)</code></a> - <a class="message"
+    href="#SCI_POSITIONFROMLINE"><code>SCI_POSITIONFROMLINE(line)</code></a>.</p>
+
+    <p><b id="SCI_GETSELTEXT">SCI_GETSELTEXT(&lt;unused&gt;, char *text NUL-terminated) &rarr; position</b><br />
+     This copies the currently selected text and a terminating 0 byte to the <code class="parameter">text</code>
+    buffer. The buffer size should be determined by calling with a NULL pointer for the <code class="parameter">text</code> argument
+    <code>SCI_GETSELTEXT(0,0)</code>.
+    This allows for rectangular and discontiguous selections as well as simple selections.
+    See <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection</a> for information on
+    how multiple and rectangular selections and virtual space are copied.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETCURLINE">SCI_GETCURLINE</a>,
+    <a class="seealso" href="#SCI_GETLINE">SCI_GETLINE</a>,
+    <a class="seealso" href="#SCI_GETTEXT">SCI_GETTEXT</a>,
+    <a class="seealso" href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>,
+    <a class="seealso" href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a>
+    </code></p>
+
+    <p><b id="SCI_GETCURLINE">SCI_GETCURLINE(position length, char *text NUL-terminated) &rarr; position</b><br />
+     This retrieves the text of the line containing the caret and returns the position within the
+    line of the caret. Pass in <code>char* text</code> pointing at a buffer large enough to hold
+    the text you wish to retrieve and a terminating 0 character.
+    Set <code class="parameter">length</code> to the
+    length of the buffer which must be at least 1 to hold the terminating 0 character.
+    If the text argument is 0 then the length that should be allocated
+    to store the entire current line is returned.</p>
+
+    <p>See also: <code><a class="seealso" href="#SCI_GETSELTEXT">SCI_GETSELTEXT</a>, <a
+    class="seealso" href="#SCI_GETLINE">SCI_GETLINE</a>, <a class="seealso"
+    href="#SCI_GETTEXT">SCI_GETTEXT</a>, <a class="seealso"
+    href="#SCI_GETSTYLEDTEXT">SCI_GETSTYLEDTEXT</a>, <a class="seealso"
+    href="#SCI_GETTEXTRANGE">SCI_GETTEXTRANGE</a></code></p>
+
+    <p><b id="SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE &rarr; bool</b><br />
+     This returns 1 if the current selection is in rectangle mode, 0 if not.</p>
+
+    <p><b id="SCI_SETSELECTIONMODE">SCI_SETSELECTIONMODE(int selectionMode)</b><br />
+    <b id="SCI_GETSELECTIONMODE">SCI_GETSELECTIONMODE &rarr; int</b><br />
+    The two functions set and get the selection mode, which can be
+     stream (<code>SC_SEL_STREAM</code>=0) or
+     rectangular (<code>SC_SEL_RECTANGLE</code>=1) or
+     by lines (<code>SC_SEL_LINES</code>=2)
+     or thin rectangular (<code>SC_SEL_THIN</code>=3).
+     When set in these modes, regular caret moves will extend or reduce the selection,
+     until the mode is cancelled by a call with same value or with <code>SCI_CANCEL</code>.
+     The get function returns the current mode even if the selection was made by mouse
+     or with regular extended moves.
+     <code>SC_SEL_THIN</code> is the mode after a rectangular selection has been typed into and ensures
+     that no characters are selected.</p>
+
+    <p><b id="SCI_GETMOVEEXTENDSSELECTION">SCI_GETMOVEEXTENDSSELECTION &rarr; bool</b><br />
+     This returns 1 if regular caret moves will extend or reduce the selection, 0 if not.
+     <code>SCI_SETSELECTIONMODE</code> toggles this setting between on and off.</p>
+
+    <p><b id="SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(line line) &rarr; position</b><br />
+    <b id="SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(line line) &rarr; position</b><br />
+    Retrieve the position of the start and end of the selection at the given line with
+    <code>INVALID_POSITION</code> returned if no selection on this line.</p>
+
+    <p><b id="SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</b><br />
+     If the caret is off the top or bottom of the view, it is moved to the nearest line that is
+    visible to its current position. Any selection is lost.</p>
+
+    <p><b id="SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(position pos) &rarr; position</b><br />
+     <b id="SCI_POSITIONAFTER">SCI_POSITIONAFTER(position pos) &rarr; position</b><br />
+     These messages return the position before and after another position
+     in the document taking into account the current code page. The minimum
+     position returned is 0 and the maximum is the last position in the document.
+     If called with a position within a multi byte character will return the position
+     of the start/end of that character.</p>
+
+    <p><b id="SCI_TEXTWIDTH">SCI_TEXTWIDTH(int style, const char *text) &rarr; int</b><br />
+     This returns the pixel width of a string drawn in the given <code class="parameter">style</code> which can
+    be used, for example, to decide how wide to make the line number margin in order to display a
+    given number of numerals.</p>
+
+    <p><b id="SCI_TEXTHEIGHT">SCI_TEXTHEIGHT(line line) &rarr; int</b><br />
+     This returns the height in pixels of a particular line. Currently all lines are the same
+    height.</p>
+
+    <p><b id="SCI_GETCOLUMN">SCI_GETCOLUMN(position pos) &rarr; position</b><br />
+     This message returns the column number of a position <code class="parameter">pos</code> within the document
+    taking the width of tabs into account. This returns the column number of the last tab on the
+    line before <code class="parameter">pos</code>, plus the number of characters between the last tab and
+    <code class="parameter">pos</code>. If there are no tab characters on the line, the return value is the number of
+    characters up to the position on the line. In both cases, double byte characters count as a
+    single character. This is probably only useful with monospaced fonts.</p>
+
+    <p><b id="SCI_FINDCOLUMN">SCI_FINDCOLUMN(line line, position column) &rarr; position</b><br />
+     This message returns the position of a <code class="parameter">column</code> on a <code class="parameter">line</code>
+    taking the width of tabs into account. It treats a multi-byte character as a single column.
+    Column numbers, like lines start at 0.</p>
+
+    <p><b id="SCI_POSITIONFROMPOINT">SCI_POSITIONFROMPOINT(int x, int y) &rarr; position</b><br />
+     <b id="SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE(int x, int y) &rarr; position</b><br />
+     <code>SCI_POSITIONFROMPOINT</code> finds the closest character position to a point and
+    <code>SCI_POSITIONFROMPOINTCLOSE</code> is similar but returns -1 if the point is outside the
+    window or not close to any characters.</p>
+
+    <p><b id="SCI_CHARPOSITIONFROMPOINT">SCI_CHARPOSITIONFROMPOINT(int x, int y) &rarr; position</b><br />
+     <b id="SCI_CHARPOSITIONFROMPOINTCLOSE">SCI_CHARPOSITIONFROMPOINTCLOSE(int x, int y) &rarr; position</b><br />
+     <code>SCI_CHARPOSITIONFROMPOINT</code> finds the closest character to a point and
+    <code>SCI_CHARPOSITIONFROMPOINTCLOSE</code> is similar but returns -1 if the point is outside the
+    window or not close to any characters. This is similar to the previous methods but finds characters rather than
+    inter-character positions.</p>
+
+    <p><b id="SCI_POINTXFROMPOSITION">SCI_POINTXFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</b><br />
+     <b id="SCI_POINTYFROMPOSITION">SCI_POINTYFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</b><br />
+     These messages return the x and y display pixel location of text at position <code class="parameter">pos</code>
+    in the document.</p>
+
+    <p><b id="SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</b><br />
+     The normal state is to make the selection visible by drawing it as set by <a class="message"
+    href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a> and <a class="message"
+    href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a>. However, if you hide the selection, it
+    is drawn as normal text.</p>
+
+    <p><b id="SCI_CHOOSECARETX">SCI_CHOOSECARETX</b><br />
+     Scintilla remembers the x value of the last position horizontally moved to explicitly by the
+    user and this value is then used when moving vertically such as by using the up and down keys.
+    This message sets the current x position of the caret as the remembered value.</p>
+
+    <p><b id="SCI_MOVESELECTEDLINESUP">SCI_MOVESELECTEDLINESUP</b><br />
+     Move the selected lines up one line, shifting the line above after the selection.
+     The selection will be automatically extended to the beginning of the selection's first line and the end of the selection's last line.
+     If nothing was selected, the line the cursor is currently at will be selected.</p>
+
+    <p><b id="SCI_MOVESELECTEDLINESDOWN">SCI_MOVESELECTEDLINESDOWN</b><br />
+     Move the selected lines down one line, shifting the line below before the selection.
+     The selection will be automatically extended to the beginning of the selection's first line and the end of the selection's last line.
+     If nothing was selected, the line the cursor is currently at will be selected.</p>
+
+    <p><b id="SCI_SETMOUSESELECTIONRECTANGULARSWITCH">SCI_SETMOUSESELECTIONRECTANGULARSWITCH(bool
+     mouseSelectionRectangularSwitch)</b><br />
+    <b id="SCI_GETMOUSESELECTIONRECTANGULARSWITCH">SCI_GETMOUSESELECTIONRECTANGULARSWITCH &rarr; bool</b><br />
+     Enable or disable the ability to switch to rectangular selection mode while making a selection with the mouse.
+     When this option is turned on, mouse selections in stream mode can be switched to rectangular mode by pressing
+     the corresponding modifier key. They then stick to rectangular mode even when the modifier key is released again.
+     When this option is turned off, mouse selections will always stick to the mode the selection was started in. It
+     is off by default.</p>
+
+    <h2 id="ByCharacterOrCodeUnit">By character or UTF-16 code unit</h2>
+
+    <p>Most Scintilla APIs use byte positions but some applications want to use positions based on counting
+    (UTF-32) characters or (UTF-16) code units
+    or need to communicate with other code written in terms of characters or code units.
+    With only byte positions, this may require examining many bytes to count characters or code units in the document
+    but this may be sped up in some cases by indexing the line starts by character or code unit.</p>
+
+    <code>
+     <a class="message" href="#SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(position pos, position relative) &rarr; position</a><br />
+     <a class="message" href="#SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(position pos, position relative) &rarr; position</a><br />
+     <a class="message" href="#SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(position start, position end) &rarr; position</a><br />
+     <a class="message" href="#SCI_COUNTCODEUNITS">SCI_COUNTCODEUNITS(position start, position end) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETLINECHARACTERINDEX">SCI_GETLINECHARACTERINDEX &rarr; int</a><br />
+     <a class="message" href="#SCI_ALLOCATELINECHARACTERINDEX">SCI_ALLOCATELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
+     <a class="message" href="#SCI_RELEASELINECHARACTERINDEX">SCI_RELEASELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
+     <a class="message" href="#SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(position pos, int lineCharacterIndex) &rarr; line</a><br />
+     <a class="message" href="#SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(line line, int lineCharacterIndex) &rarr; position</a><br />
+    </code>
+
+    <p><b id="SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(position pos, position relative) &rarr; position</b><br />
+     Count a number of whole characters before or after the argument position and return that position.
+     The minimum position returned is 0 and the maximum is the last position in the document.
+     If the position goes past the document end then 0 is returned.
+     </p>
+
+    <p><b id="SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(position start, position end) &rarr; position</b><br />
+     Returns the number of whole characters between two positions.</p>
+
+    <p><b id="SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(position pos, position relative) &rarr; position</b><br />
+    <b id="SCI_COUNTCODEUNITS">SCI_COUNTCODEUNITS(position start, position end) &rarr; position</b><br />
+     These are the UTF-16 versions of <code>SCI_POSITIONRELATIVE</code> and <code>SCI_COUNTCHARACTERS</code>
+     working in terms of UTF-16 code units.</p>
+
+    <p><b id="SCI_GETLINECHARACTERINDEX">SCI_GETLINECHARACTERINDEX &rarr; int</b><br />
+     Returns which if any indexes are active. It may be <code>SC_LINECHARACTERINDEX_NONE</code> (0) or one or more
+     of <code>SC_LINECHARACTERINDEX_UTF32</code> (1) if whole characters are indexed or
+     <code>SC_LINECHARACTERINDEX_UTF16</code> (2) if UTF-16 code units are indexed.
+     Character indexes are currently only supported for UTF-8 documents.</p>
+
+    <p><b id="SCI_ALLOCATELINECHARACTERINDEX">SCI_ALLOCATELINECHARACTERINDEX(int lineCharacterIndex)</b><br />
+    <b id="SCI_RELEASELINECHARACTERINDEX">SCI_RELEASELINECHARACTERINDEX(int lineCharacterIndex)</b><br />
+     Allocate or release one or more indexes using same enumeration as <code>SCI_GETLINECHARACTERINDEX</code>.
+     Different aspects of an application may need indexes for different periods and should allocate for those periods.
+     Indexes use additional memory so releasing them can help minimize memory but they also take time to recalculate.
+     Scintilla may also allocate indexes to support features like accessibility or input method editors.
+     Only one index of each type is created for a document at a time.</p>
+
+    <p><b id="SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(position pos, int lineCharacterIndex) &rarr; line</b><br />
+    <b id="SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(line line, int lineCharacterIndex) &rarr; position</b><br />
+     The document line of a particular character or code unit may be found by calling <code>SCI_LINEFROMINDEXPOSITION</code> with one of
+     <code>SC_LINECHARACTERINDEX_UTF32</code> (1) or <code>SC_LINECHARACTERINDEX_UTF16</code> (2).
+     The inverse action, finds the starting position of a document line either in characters or code units from the document start by calling
+     <code>SCI_INDEXPOSITIONFROMLINE</code> with the same <code class="parameter">lineCharacterIndex</code> argument.</p>
+
+    <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</h2>
+
+    <code>
+     <a class="message" href="#SCI_SETMULTIPLESELECTION">SCI_SETMULTIPLESELECTION(bool multipleSelection)</a><br />
+     <a class="message" href="#SCI_GETMULTIPLESELECTION">SCI_GETMULTIPLESELECTION &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETADDITIONALSELECTIONTYPING">SCI_SETADDITIONALSELECTIONTYPING(bool additionalSelectionTyping)</a><br />
+     <a class="message" href="#SCI_GETADDITIONALSELECTIONTYPING">SCI_GETADDITIONALSELECTIONTYPING &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETMULTIPASTE">SCI_SETMULTIPASTE(int multiPaste)</a><br />
+     <a class="message" href="#SCI_GETMULTIPASTE">SCI_GETMULTIPASTE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETVIRTUALSPACEOPTIONS">SCI_SETVIRTUALSPACEOPTIONS(int virtualSpaceOptions)</a><br />
+     <a class="message" href="#SCI_GETVIRTUALSPACEOPTIONS">SCI_GETVIRTUALSPACEOPTIONS &rarr; int</a><br />
+     <a class="message" href="#SCI_SETRECTANGULARSELECTIONMODIFIER">SCI_SETRECTANGULARSELECTIONMODIFIER(int modifier)</a><br />
+     <a class="message" href="#SCI_GETRECTANGULARSELECTIONMODIFIER">SCI_GETRECTANGULARSELECTIONMODIFIER &rarr; int</a><br />
+     <br />
+
+     <a class="message" href="#SCI_GETSELECTIONS">SCI_GETSELECTIONS &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSELECTIONEMPTY">SCI_GETSELECTIONEMPTY &rarr; bool</a><br />
+     <a class="message" href="#SCI_CLEARSELECTIONS">SCI_CLEARSELECTIONS</a><br />
+     <a class="message" href="#SCI_SETSELECTION">SCI_SETSELECTION(position caret, position anchor)</a><br />
+     <a class="message" href="#SCI_ADDSELECTION">SCI_ADDSELECTION(position caret, position anchor)</a><br />
+     <a class="message" href="#SCI_DROPSELECTIONN">SCI_DROPSELECTIONN(int selection)</a><br />
+     <a class="message" href="#SCI_SETMAINSELECTION">SCI_SETMAINSELECTION(int selection)</a><br />
+     <a class="message" href="#SCI_GETMAINSELECTION">SCI_GETMAINSELECTION &rarr; int</a><br />
+     <br />
+
+     <a class="message" href="#SCI_SETSELECTIONNCARET">SCI_SETSELECTIONNCARET(int selection, position caret)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNCARET">SCI_GETSELECTIONNCARET(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONNCARETVIRTUALSPACE">SCI_SETSELECTIONNCARETVIRTUALSPACE(int selection, position space)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNCARETVIRTUALSPACE">SCI_GETSELECTIONNCARETVIRTUALSPACE(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONNANCHOR">SCI_SETSELECTIONNANCHOR(int selection, position anchor)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNANCHOR">SCI_GETSELECTIONNANCHOR(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONNANCHORVIRTUALSPACE">SCI_SETSELECTIONNANCHORVIRTUALSPACE(int selection, position space)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNANCHORVIRTUALSPACE">SCI_GETSELECTIONNANCHORVIRTUALSPACE(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONNSTART">SCI_SETSELECTIONNSTART(int selection, position anchor)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNSTART">SCI_GETSELECTIONNSTART(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNSTARTVIRTUALSPACE">SCI_GETSELECTIONNSTARTVIRTUALSPACE(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETSELECTIONNEND">SCI_SETSELECTIONNEND(int selection, position caret)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNEND">SCI_GETSELECTIONNEND(int selection) &rarr; position</a><br />
+     <a class="message" href="#SCI_GETSELECTIONNENDVIRTUALSPACE">SCI_GETSELECTIONNENDVIRTUALSPACE(int selection) &rarr; position</a><br />
+     <br />
+
+     <a class="message" href="#SCI_SETRECTANGULARSELECTIONCARET">SCI_SETRECTANGULARSELECTIONCARET(position caret)</a><br />
+     <a class="message" href="#SCI_GETRECTANGULARSELECTIONCARET">SCI_GETRECTANGULARSELECTIONCARET &rarr; position</a><br />
+     <a class="message" href="#SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE">SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE(position space)</a><br />
+     <a class="message" href="#SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE">SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE &rarr; position</a><br />
+     <a class="message" href="#SCI_SETRECTANGULARSELECTIONANCHOR">SCI_SETRECTANGULARSELECTIONANCHOR(position anchor)</a><br />
+     <a class="message" href="#SCI_GETRECTANGULARSELECTIONANCHOR">SCI_GETRECTANGULARSELECTIONANCHOR &rarr; position</a><br />
+     <a class="message" href="#SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE">SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE(position space)</a><br />
+     <a class="message" href="#SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE">SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE &rarr; position</a><br />
+     <br />
+
+     <a class="element" href="#SC_ELEMENT_SELECTION_ADDITIONAL_TEXT">SC_ELEMENT_SELECTION_ADDITIONAL_TEXT : colouralpha</a><br />
+     <a class="element" href="#SC_ELEMENT_SELECTION_ADDITIONAL_BACK">SC_ELEMENT_SELECTION_ADDITIONAL_BACK : colouralpha</a><br />
+     <a class="discouraged message" href="#SCI_SETADDITIONALSELALPHA">SCI_SETADDITIONALSELALPHA(alpha alpha)</a><br />
+     <a class="discouraged message" href="#SCI_GETADDITIONALSELALPHA">SCI_GETADDITIONALSELALPHA &rarr; int</a><br />
+     <a class="discouraged message" href="#SCI_SETADDITIONALSELFORE">SCI_SETADDITIONALSELFORE(colour fore)</a><br />
+     <a class="discouraged message" href="#SCI_SETADDITIONALSELBACK">SCI_SETADDITIONALSELBACK(colour back)</a><br />
+     <a class="element" href="#SC_ELEMENT_CARET_ADDITIONAL">SC_ELEMENT_CARET_ADDITIONAL : colouralpha</a><br />
+     <a class="discouraged message" href="#SCI_SETADDITIONALCARETFORE">SCI_SETADDITIONALCARETFORE(colour fore)</a><br />
+     <a class="discouraged message" href="#SCI_GETADDITIONALCARETFORE">SCI_GETADDITIONALCARETFORE &rarr; colour</a><br />
+     <a class="message" href="#SCI_SETADDITIONALCARETSBLINK">SCI_SETADDITIONALCARETSBLINK(bool additionalCaretsBlink)</a><br />
+     <a class="message" href="#SCI_GETADDITIONALCARETSBLINK">SCI_GETADDITIONALCARETSBLINK &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETADDITIONALCARETSVISIBLE">SCI_SETADDITIONALCARETSVISIBLE(bool additionalCaretsVisible)</a><br />
+     <a class="message" href="#SCI_GETADDITIONALCARETSVISIBLE">SCI_GETADDITIONALCARETSVISIBLE &rarr; bool</a><br />
+     <br />
+
+     <a class="message" href="#SCI_SWAPMAINANCHORCARET">SCI_SWAPMAINANCHORCARET</a><br />
+     <a class="message" href="#SCI_ROTATESELECTION">SCI_ROTATESELECTION</a><br />
+     <a class="message" href="#SCI_MULTIPLESELECTADDNEXT">SCI_MULTIPLESELECTADDNEXT</a><br />
+     <a class="message" href="#SCI_MULTIPLESELECTADDEACH">SCI_MULTIPLESELECTADDEACH</a><br />
+    </code>
+
+    <p>
+    There may be multiple selections active at one time.
+    More selections are made by holding down the Ctrl key while dragging with the mouse.
+    The most recent selection is the main selection and determines which part of the document is shown automatically.
+    Any selection apart from the main selection is called an additional selection.
+    The calls in the previous section operate on the main selection.
+    There is always at least one selection.
+    The selection can be simplified down to just the main selection by
+    <a class="message" href="#SCI_CANCEL"><code>SCI_CANCEL</code></a>
+    which is normally mapped to the Esc key.
+    </p>
+
+    <p>
+    Rectangular selections are handled as multiple selections although the original rectangular range is remembered so that
+    subsequent operations may be handled differently for rectangular selections. For example, pasting a rectangular selection
+    places each piece in a vertical column.
+    </p>
+
+    <p>
+    Virtual space is space beyond the end of each line. The caret may be moved into virtual space but no real space will be
+    added to the document until there is some text typed or some other text insertion command is used.
+    </p>
+
+    <p>When discontiguous selections are copied to the clipboard, each selection is added to the clipboard text
+    in order with no delimiting characters.
+    For rectangular selections the document's line end is added after each line's text. Rectangular selections
+    are always copied from top line to bottom, not in the in order of selection.Virtual space is not copied.</p>
+
+    <p>
+    <b id="SCI_SETMULTIPLESELECTION">SCI_SETMULTIPLESELECTION(bool multipleSelection)</b><br />
+    <b id="SCI_GETMULTIPLESELECTION">SCI_GETMULTIPLESELECTION &rarr; bool</b><br />
+     Enable or disable multiple selection. When multiple selection is disabled, it is not possible to select
+     multiple ranges by holding down the Ctrl key while dragging with the mouse.</p>
+
+    <p>
+    <b id="SCI_SETADDITIONALSELECTIONTYPING">SCI_SETADDITIONALSELECTIONTYPING(bool additionalSelectionTyping)</b><br />
+    <b id="SCI_GETADDITIONALSELECTIONTYPING">SCI_GETADDITIONALSELECTIONTYPING &rarr; bool</b><br />
+     Whether typing, new line, cursor left/right/up/down, backspace, delete, home, and end work
+     with multiple selections simultaneously.
+     Also allows selection and word and line deletion commands.</p>
+
+    <p>
+    <b id="SCI_SETMULTIPASTE">SCI_SETMULTIPASTE(int multiPaste)</b><br />
+    <b id="SCI_GETMULTIPASTE">SCI_GETMULTIPASTE &rarr; int</b><br />
+     When pasting into multiple selections, the pasted text can go into just the main selection with <code>SC_MULTIPASTE_ONCE</code>=0
+     or into each selection with <code>SC_MULTIPASTE_EACH</code>=1. <code>SC_MULTIPASTE_ONCE</code> is the default.</p>
+
+    <p>
+    <b id="SCI_SETVIRTUALSPACEOPTIONS">SCI_SETVIRTUALSPACEOPTIONS(int virtualSpaceOptions)</b><br />
+    <b id="SCI_GETVIRTUALSPACEOPTIONS">SCI_GETVIRTUALSPACEOPTIONS &rarr; int</b><br />
+     Virtual space can be enabled or disabled for rectangular selections or in other circumstances or in both.
+     There are three bit flags <code>SCVS_RECTANGULARSELECTION</code>=1,
+     <code>SCVS_USERACCESSIBLE</code>=2, and
+     <code>SCVS_NOWRAPLINESTART</code>=4 which can be set independently.
+     <code>SCVS_NONE</code>=0, the default, disables all use of virtual space.</p>
+     <p><code>SCVS_NOWRAPLINESTART</code> prevents left arrow movement and selection
+     from wrapping to the previous line.
+     This is most commonly desired in conjunction with virtual space but is an independent
+     setting so works without virtual space.</p>
+
+    <p>
+    <b id="SCI_SETRECTANGULARSELECTIONMODIFIER">SCI_SETRECTANGULARSELECTIONMODIFIER(int modifier)</b><br />
+    <b id="SCI_GETRECTANGULARSELECTIONMODIFIER">SCI_GETRECTANGULARSELECTIONMODIFIER &rarr; int</b><br />
+     On GTK and Qt, the key used to indicate that a rectangular selection should be created when combined with a mouse drag can be set.
+     The three possible values are <code>SCMOD_CTRL</code>=2, <code>SCMOD_ALT</code>=4 (default) or <code>SCMOD_SUPER</code>=8.
+     Since <code>SCMOD_ALT</code> may already be used by a window manager, the window manager may need configuring to allow this choice.
+     <code>SCMOD_SUPER</code> is often a system dependent modifier key such as the Left Windows key on a Windows keyboard or the
+     Command key on a Mac.</p>
+
+    <p>
+    <b id="SCI_GETSELECTIONS">SCI_GETSELECTIONS &rarr; int</b><br />
+     Return the number of selections currently active. There is always at least one selection.</p>
+
+    <p>
+    <b id="SCI_GETSELECTIONEMPTY">SCI_GETSELECTIONEMPTY &rarr; bool</b><br />
+     Return 1 if every selected range is empty else 0.</p>
+
+    <p>
+    <b id="SCI_CLEARSELECTIONS">SCI_CLEARSELECTIONS</b><br />
+     Set a single empty selection at 0 as the only selection.</p>
+
+    <p>
+    <b id="SCI_SETSELECTION">SCI_SETSELECTION(position caret, position anchor)</b><br />
+     Set a single selection from <code class="parameter">anchor</code> to <code class="parameter">caret</code> as the only selection.</p>
+
+    <p>
+    <b id="SCI_ADDSELECTION">SCI_ADDSELECTION(position caret, position anchor)</b><br />
+     Add a new selection from <code class="parameter">anchor</code> to <code class="parameter">caret</code> as the main selection retaining all other
+     selections as additional selections.
+     Since there is always at least one selection, to set a list of selections, the first selection should be
+     added with <code>SCI_SETSELECTION</code> and later selections added with <code>SCI_ADDSELECTION</code></p>
+
+    <p>
+    <b id="SCI_DROPSELECTIONN">SCI_DROPSELECTIONN(int selection)</b><br />
+     If there are multiple selections, remove the indicated selection.
+     If this was the main selection then make the previous selection the main and if it was the first then the last selection becomes main.
+     If there is only one selection, or there is no selection <code class="parameter">selection</code>, then there is no effect.</p>
+
+    <p>
+    <b id="SCI_SETMAINSELECTION">SCI_SETMAINSELECTION(int selection)</b><br />
+    <b id="SCI_GETMAINSELECTION">SCI_GETMAINSELECTION &rarr; int</b><br />
+     One of the selections is the main selection which is used to determine what range of text is automatically visible.
+     The main selection may be displayed in different colours or with a differently styled caret.
+     Only an already existing selection can be made main.</p>
+
+    <p>
+     <b id="SCI_SETSELECTIONNCARET">SCI_SETSELECTIONNCARET(int selection, position caret)</b><br />
+     <b id="SCI_GETSELECTIONNCARET">SCI_GETSELECTIONNCARET(int selection) &rarr; position</b><br />
+     <b id="SCI_SETSELECTIONNCARETVIRTUALSPACE">SCI_SETSELECTIONNCARETVIRTUALSPACE(int selection, position space)</b><br />
+     <b id="SCI_GETSELECTIONNCARETVIRTUALSPACE">SCI_GETSELECTIONNCARETVIRTUALSPACE(int selection) &rarr; position</b><br />
+     <b id="SCI_SETSELECTIONNANCHOR">SCI_SETSELECTIONNANCHOR(int selection, position anchor)</b><br />
+     <b id="SCI_GETSELECTIONNANCHOR">SCI_GETSELECTIONNANCHOR(int selection) &rarr; position</b><br />
+     <b id="SCI_SETSELECTIONNANCHORVIRTUALSPACE">SCI_SETSELECTIONNANCHORVIRTUALSPACE(int selection, position space)</b><br />
+     <b id="SCI_GETSELECTIONNANCHORVIRTUALSPACE">SCI_GETSELECTIONNANCHORVIRTUALSPACE(int selection) &rarr; position</b><br />
+     Set or query the position and amount of virtual space for the caret and anchor of each already existing selection.</p>
+
+    <p>
+     <b id="SCI_SETSELECTIONNSTART">SCI_SETSELECTIONNSTART(int selection, position anchor)</b><br />
+     <b id="SCI_GETSELECTIONNSTART">SCI_GETSELECTIONNSTART(int selection) &rarr; position</b><br />
+     <b id="SCI_GETSELECTIONNSTARTVIRTUALSPACE">SCI_GETSELECTIONNSTARTVIRTUALSPACE(int selection) &rarr; position</b><br />
+     <b id="SCI_SETSELECTIONNEND">SCI_SETSELECTIONNEND(int selection, position caret)</b><br />
+     <b id="SCI_GETSELECTIONNEND">SCI_GETSELECTIONNEND(int selection) &rarr; position</b><br />
+     <b id="SCI_GETSELECTIONNENDVIRTUALSPACE">SCI_GETSELECTIONNENDVIRTUALSPACE(int selection) &rarr; position</b><br />
+     Set or query the start and end position of each already existing selection.
+     Query the virtual space at start and end of each selection.
+     Mostly of use to query each range for its text. The <code class="parameter">selection</code> parameter is zero-based. </p>
+
+    <p>
+     <b id="SCI_SETRECTANGULARSELECTIONCARET">SCI_SETRECTANGULARSELECTIONCARET(position caret)</b><br />
+     <b id="SCI_GETRECTANGULARSELECTIONCARET">SCI_GETRECTANGULARSELECTIONCARET &rarr; position</b><br />
+     <b id="SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE">SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE(position space)</b><br />
+     <b id="SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE">SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE &rarr; position</b><br />
+     <b id="SCI_SETRECTANGULARSELECTIONANCHOR">SCI_SETRECTANGULARSELECTIONANCHOR(position anchor)</b><br />
+     <b id="SCI_GETRECTANGULARSELECTIONANCHOR">SCI_GETRECTANGULARSELECTIONANCHOR &rarr; position</b><br />
+     <b id="SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE">SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE(position space)</b><br />
+     <b id="SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE">SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE &rarr; position</b><br />
+     Set or query the position and amount of virtual space for the caret and anchor of the rectangular selection.
+     After setting the rectangular selection, this is broken down into multiple selections, one for each line.</p>
+
+    <p>
+     <b id="SC_ELEMENT_SELECTION_ADDITIONAL_TEXT">SC_ELEMENT_SELECTION_ADDITIONAL_TEXT : colouralpha</b><br />
+     <b id="SC_ELEMENT_SELECTION_ADDITIONAL_BACK">SC_ELEMENT_SELECTION_ADDITIONAL_BACK : colouralpha</b><br />
+     <b id="SCI_SETADDITIONALSELALPHA">SCI_SETADDITIONALSELALPHA(<a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     <b id="SCI_GETADDITIONALSELALPHA">SCI_GETADDITIONALSELALPHA &rarr; int</b><br />
+     <b id="SCI_SETADDITIONALSELFORE">SCI_SETADDITIONALSELFORE(<a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_SETADDITIONALSELBACK">SCI_SETADDITIONALSELBACK(<a class="jump" href="#colour">colour</a> back)</b><br />
+     Modify the appearance of additional selections so that they can be differentiated from the main selection which has its appearance set with
+     <a class="element" href="#SC_ELEMENT_SELECTION_TEXT"><code>SC_ELEMENT_SELECTION_TEXT</code></a>,
+     <a class="element" href="#SC_ELEMENT_SELECTION_BACK"><code>SC_ELEMENT_SELECTION_BACK</code></a>,
+     <a class="message" href="#SCI_SETSELALPHA"><code>SCI_SETSELALPHA</code></a>,
+     <a class="message" href="#SCI_GETSELALPHA"><code>SCI_GETSELALPHA</code></a>,
+     <a class="message" href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a>, and
+     <a class="message" href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a>.
+     The element APIs are preferred and the following messages discouraged.
+     The additional selection background is drawn on the layer defined for all selection backgrounds by
+     <a class="message" href="#SCI_SETSELECTIONLAYER"><code>SCI_SETSELECTIONLAYER</code></a>.
+     <code>SCI_SETADDITIONALSELFORE</code> and
+     <code>SCI_SETADDITIONALSELBACK</code> calls have no
+     effect until <a class="message" href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a>
+     and <a class="message" href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a> are
+     called with <code class="parameter">useSetting</code> value set to true. Subsequent calls to
+     <a class="message" href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a>,
+     and <a class="message" href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a> will
+     overwrite the values set by <code>SCI_SETADDITIONALSEL*</code> functions.</p>
+
+    <p>
+     <b id="SC_ELEMENT_CARET_ADDITIONAL">SC_ELEMENT_CARET_ADDITIONAL : colouralpha</b><br />
+     <b id="SCI_SETADDITIONALCARETFORE">SCI_SETADDITIONALCARETFORE(<a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_GETADDITIONALCARETFORE">SCI_GETADDITIONALCARETFORE &rarr; colour</b><br />
+     <b id="SCI_SETADDITIONALCARETSBLINK">SCI_SETADDITIONALCARETSBLINK(bool additionalCaretsBlink)</b><br />
+     <b id="SCI_GETADDITIONALCARETSBLINK">SCI_GETADDITIONALCARETSBLINK &rarr; bool</b><br />
+     Modify the appearance of additional carets so that they can be differentiated from the main caret which has its appearance set with
+     <a class="element" href="#SC_ELEMENT_CARET"><code>SC_ELEMENT_CARET</code></a>,
+     <a class="message" href="#SCI_SETCARETFORE"><code>SCI_SETCARETFORE</code></a>,
+     <a class="message" href="#SCI_GETCARETFORE"><code>SCI_GETCARETFORE</code></a>,
+     <a class="message" href="#SCI_SETCARETPERIOD"><code>SCI_SETCARETPERIOD</code></a>, and
+     <a class="message" href="#SCI_GETCARETPERIOD"><code>SCI_GETCARETPERIOD</code></a>.</p>
+
+    <p>
+     <b id="SCI_SETADDITIONALCARETSVISIBLE">SCI_SETADDITIONALCARETSVISIBLE(bool additionalCaretsVisible)</b><br />
+     <b id="SCI_GETADDITIONALCARETSVISIBLE">SCI_GETADDITIONALCARETSVISIBLE &rarr; bool</b><br />
+     Determine whether to show additional carets (defaults to <code>true</code>).</p>
+
+    <p>
+     <b id="SCI_SWAPMAINANCHORCARET">SCI_SWAPMAINANCHORCARET</b><br />
+     <b id="SCI_ROTATESELECTION">SCI_ROTATESELECTION</b><br />
+     <b id="SCI_MULTIPLESELECTADDNEXT">SCI_MULTIPLESELECTADDNEXT</b><br />
+     <b id="SCI_MULTIPLESELECTADDEACH">SCI_MULTIPLESELECTADDEACH</b><br />
+     These commands may be assigned to keys to make it possible to manipulate multiple selections.
+     <code>SCI_SWAPMAINANCHORCARET</code> moves the caret to the opposite end of the main selection.
+     <code>SCI_ROTATESELECTION</code> makes the next selection be the main selection.<br />
+     <code>SCI_MULTIPLESELECTADDNEXT</code> adds the next occurrence of the main selection
+     within the target to the set of selections as main. If the current selection is empty then select word around caret.
+      The current <a class="jump" href="#searchFlags"><code>searchFlags</code></a>
+      are used so the application may choose case sensitivity and word search options.<br />
+     <code>SCI_MULTIPLESELECTADDEACH</code> is similar to
+     <code>SCI_MULTIPLESELECTADDNEXT</code> but adds multiple occurrences instead of just one.
+     </p>
+
+    <h2 id="ScrollingAndAutomaticScrolling">Scrolling and automatic scrolling</h2>
+    <code>
+     <a class="message" href="#SCI_SETFIRSTVISIBLELINE">SCI_SETFIRSTVISIBLELINE(line displayLine)</a><br />
+     <a class="message" href="#SCI_GETFIRSTVISIBLELINE">SCI_GETFIRSTVISIBLELINE &rarr; line</a><br />
+     <a class="message" href="#SCI_SETXOFFSET">SCI_SETXOFFSET(int xOffset)</a><br />
+     <a class="message" href="#SCI_GETXOFFSET">SCI_GETXOFFSET &rarr; int</a><br />
+     <a class="message" href="#SCI_LINESCROLL">SCI_LINESCROLL(position columns, line lines)</a><br />
+     <a class="message" href="#SCI_SCROLLCARET">SCI_SCROLLCARET</a><br />
+     <a class="message" href="#SCI_SCROLLRANGE">SCI_SCROLLRANGE(position secondary, position primary)</a><br />
+     <a class="message" href="#SCI_SETXCARETPOLICY">SCI_SETXCARETPOLICY(int caretPolicy, int
+    caretSlop)</a><br />
+     <a class="message" href="#SCI_SETYCARETPOLICY">SCI_SETYCARETPOLICY(int caretPolicy, int
+    caretSlop)</a><br />
+     <a class="message" href="#SCI_SETVISIBLEPOLICY">SCI_SETVISIBLEPOLICY(int visiblePolicy, int
+    visibleSlop)</a><br />
+     <a class="message" href="#SCI_SETHSCROLLBAR">SCI_SETHSCROLLBAR(bool visible)</a><br />
+     <a class="message" href="#SCI_GETHSCROLLBAR">SCI_GETHSCROLLBAR &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETVSCROLLBAR">SCI_SETVSCROLLBAR(bool visible)</a><br />
+     <a class="message" href="#SCI_GETVSCROLLBAR">SCI_GETVSCROLLBAR &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH(int pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETSCROLLWIDTH">SCI_GETSCROLLWIDTH &rarr; int</a><br />
+     <a class="message" href="#SCI_SETSCROLLWIDTHTRACKING">SCI_SETSCROLLWIDTHTRACKING(bool tracking)</a><br />
+     <a class="message" href="#SCI_GETSCROLLWIDTHTRACKING">SCI_GETSCROLLWIDTHTRACKING &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETENDATLASTLINE">SCI_SETENDATLASTLINE(bool
+    endAtLastLine)</a><br />
+     <a class="message" href="#SCI_GETENDATLASTLINE">SCI_GETENDATLASTLINE &rarr; bool</a><br />
+    </code>
+
+    <p><b id="SCI_SETFIRSTVISIBLELINE">SCI_SETFIRSTVISIBLELINE(line displayLine)</b><br />
+     <b id="SCI_GETFIRSTVISIBLELINE">SCI_GETFIRSTVISIBLELINE &rarr; line</b><br />
+     These messages retrieve and set the line number of the first visible line in the Scintilla view. The first line
+    in the document is numbered 0. The value is a visible line rather than a document line.</p>
+
+    <p><b id="SCI_SETXOFFSET">SCI_SETXOFFSET(int xOffset)</b><br />
+     <b id="SCI_GETXOFFSET">SCI_GETXOFFSET &rarr; int</b><br />
+     The <code class="parameter">xOffset</code> is the horizontal scroll position in pixels of the start of the text
+    view. A value of 0 is the normal position with the first text column visible at the left of the
+    view.</p>
+
+    <p><b id="SCI_LINESCROLL">SCI_LINESCROLL(position columns, line lines)</b><br />
+     This will attempt to scroll the display by the number of columns and lines that you specify.
+    Positive line values increase the line number at the top of the screen (i.e. they move the text
+    upwards as far as the user is concerned), Negative line values do the reverse.</p>
+
+    <p>The column measure is the width of a space in the default style. Positive values increase
+    the column at the left edge of the view (i.e. they move the text leftwards as far as the user
+    is concerned). Negative values do the reverse.</p>
+
+    <p>See also: <a class="message" href="#SCI_SETXOFFSET"><code>SCI_SETXOFFSET</code></a></p>
+
+    <p><b id="SCI_SCROLLCARET">SCI_SCROLLCARET</b><br />
+     If the current position (this is the caret if there is no selection) is not visible, the view
+    is scrolled to make it visible according to the current caret policy.</p>
+
+    <p><b id="SCI_SCROLLRANGE">SCI_SCROLLRANGE(position secondary, position primary)</b><br />
+     Scroll the argument positions and the range between them into view giving
+     priority to the primary position then the secondary position.
+     The behaviour is similar to <a class="message" href="#SCI_SCROLLCARET"><code>SCI_SCROLLCARET</code></a>
+     with the primary position used instead of the caret. An effort is then made to ensure that the secondary
+     position and range between are also visible.
+     This may be used to make a search match visible.</p>
+
+    <p><b id="SCI_SETXCARETPOLICY">SCI_SETXCARETPOLICY(int caretPolicy, int caretSlop)</b><br />
+     <b id="SCI_SETYCARETPOLICY">SCI_SETYCARETPOLICY(int caretPolicy, int caretSlop)</b><br />
+     These set the caret policy. The value of <code class="parameter">caretPolicy</code> is a combination of
+    <code>CARET_SLOP</code>, <code>CARET_STRICT</code>, <code>CARET_JUMPS</code> and
+    <code>CARET_EVEN</code>.</p>
+
+    <table class="standard" summary="Caret policy">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>CARET_SLOP</code></th>
+
+          <td>If set, we can define a slop value: <code class="parameter">caretSlop</code>. This value defines an
+          unwanted zone (UZ) where the caret is... unwanted. This zone is defined as a number of
+          pixels near the vertical margins, and as a number of lines near the horizontal margins.
+          By keeping the caret away from the edges, it is seen within its context. This makes it
+          likely that the identifier that the caret is on can be completely seen, and that the
+          current line is seen with some of the lines following it, which are often dependent on
+          that line.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_STRICT</code></th>
+
+          <td>If set, the policy set by <code>CARET_SLOP</code> is enforced... strictly. The caret
+          is centred on the display if <code class="parameter">caretSlop</code> is not set, and cannot go in the UZ
+          if <code class="parameter">caretSlop</code> is set.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_JUMPS</code></th>
+
+          <td>If set, the display is moved more energetically so the caret can move in the same
+          direction longer before the policy is applied again. '3UZ' notation is used to indicate
+          three time the size of the UZ as a distance to the margin.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>CARET_EVEN</code></th>
+
+          <td>If not set, instead of having symmetrical UZs, the left and bottom UZs are extended
+          up to right and top UZs respectively. This way, we favour the displaying of useful
+          information: the beginning of lines, where most code reside, and the lines after the
+          caret, for example, the body of a function.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+
+    <table class="standard" summary="Caret positioning">
+      <thead align="center">
+        <tr>
+          <th>slop</th>
+
+          <th>strict</th>
+
+          <th>jumps</th>
+
+          <th>even</th>
+
+          <th>Caret can go to the margin</th>
+
+          <th>On reaching limit (going out of visibility<br />
+           or going into the UZ) display is...</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret on top/on right</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved by one position</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret on top/on right</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>centred on the caret</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>0</td>
+
+          <td>Caret is always on top/on right of display</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>1</td>
+
+          <td>No, caret is always centred</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret out of the asymmetrical UZ</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret out of the UZ</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret at 3UZ of the top or right margin</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>Yes</td>
+
+          <td>moved to put caret at 3UZ of the margin</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>-</td>
+
+          <td>0</td>
+
+          <td>Caret is always at UZ of top/right margin</td>
+
+          <td>-</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>1</td>
+
+          <td>No, kept out of UZ</td>
+
+          <td>moved by one position</td>
+        </tr>
+
+        <tr>
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>1</td>
+
+          <td>0</td>
+
+          <td>No, kept out of UZ</td>
+
+          <td>moved to put caret at 3UZ of the margin</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETVISIBLEPOLICY">SCI_SETVISIBLEPOLICY(int visiblePolicy, int visibleSlop)</b><br />
+     This determines how the vertical positioning is determined when <a class="message"
+    href="#SCI_ENSUREVISIBLEENFORCEPOLICY"><code>SCI_ENSUREVISIBLEENFORCEPOLICY</code></a> is
+    called. It takes <code>VISIBLE_SLOP</code> and <code>VISIBLE_STRICT</code> flags for the <code class="parameter">visiblePolicy</code>
+    parameter. It is similar in operation to <a class="message"
+    href="#SCI_SETYCARETPOLICY"><code>SCI_SETYCARETPOLICY(int caretPolicy, int
+    caretSlop)</code></a>.</p>
+
+    <p><b id="SCI_SETHSCROLLBAR">SCI_SETHSCROLLBAR(bool visible)</b><br />
+     <b id="SCI_GETHSCROLLBAR">SCI_GETHSCROLLBAR &rarr; bool</b><br />
+     The horizontal scroll bar is only displayed if it is needed for the assumed width.
+     If you never wish to see it, call
+    <code>SCI_SETHSCROLLBAR(0)</code>. Use <code>SCI_SETHSCROLLBAR(1)</code> to enable it again.
+    <code>SCI_GETHSCROLLBAR</code> returns the current state. The default state is to display it
+    when needed.</p>
+    <p>See also: <a class="seealso" href="#SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH</a>.</p>
+
+    <p><b id="SCI_SETVSCROLLBAR">SCI_SETVSCROLLBAR(bool visible)</b><br />
+     <b id="SCI_GETVSCROLLBAR">SCI_GETVSCROLLBAR &rarr; bool</b><br />
+     By default, the vertical scroll bar is always displayed when required. You can choose to hide
+    or show it with <code>SCI_SETVSCROLLBAR</code> and get the current state with
+    <code>SCI_GETVSCROLLBAR</code>.</p>
+
+    <p>See also: <a class="message" href="#SCI_LINESCROLL"><code>SCI_LINESCROLL</code></a></p>
+
+    <p><b id="SCI_SETSCROLLWIDTH">SCI_SETSCROLLWIDTH(int pixelWidth)</b><br />
+     <b id="SCI_GETSCROLLWIDTH">SCI_GETSCROLLWIDTH &rarr; int</b><br />
+     For performance, Scintilla does not measure the display width of the document to determine
+     the properties of the horizontal scroll bar. Instead, an assumed width is used.
+     These messages set and get the document width in pixels assumed by Scintilla.
+     The default value is 2000.
+     To ensure the width of the currently visible lines can be scrolled use
+     <a class="message" href="#SCI_SETSCROLLWIDTHTRACKING"><code>SCI_SETSCROLLWIDTHTRACKING</code></a></p>
+
+    <p><b id="SCI_SETSCROLLWIDTHTRACKING">SCI_SETSCROLLWIDTHTRACKING(bool tracking)</b><br />
+     <b id="SCI_GETSCROLLWIDTHTRACKING">SCI_GETSCROLLWIDTHTRACKING &rarr; bool</b><br />
+     If scroll width tracking is enabled then the scroll width is adjusted to ensure that all of the lines currently
+     displayed can be completely scrolled. This mode never adjusts the scroll width to be narrower.</p>
+
+    <p><b id="SCI_SETENDATLASTLINE">SCI_SETENDATLASTLINE(bool endAtLastLine)</b><br />
+     <b id="SCI_GETENDATLASTLINE">SCI_GETENDATLASTLINE &rarr; bool</b><br />
+     <code>SCI_SETENDATLASTLINE</code> sets the scroll range so that maximum scroll position has
+    the last line at the bottom of the view (default). Setting this to <code>false</code> allows
+    scrolling one page below the last line.</p>
+
+    <h2 id="WhiteSpace">White space</h2>
+    <code><a class="message" href="#SCI_SETVIEWWS">SCI_SETVIEWWS(int viewWS)</a><br />
+     <a class="message" href="#SCI_GETVIEWWS">SCI_GETVIEWWS &rarr; int</a><br />
+     <a class="element" href="#SC_ELEMENT_WHITE_SPACE">SC_ELEMENT_WHITE_SPACE : colouralpha</a><br />
+     <a class="discouraged message" href="#SCI_SETWHITESPACEFORE">SCI_SETWHITESPACEFORE(bool
+    useSetting, colour fore)</a><br />
+     <a class="element" href="#SC_ELEMENT_WHITE_SPACE_BACK">SC_ELEMENT_WHITE_SPACE_BACK : colouralpha</a><br />
+     <a class="discouraged message" href="#SCI_SETWHITESPACEBACK">SCI_SETWHITESPACEBACK(bool
+    useSetting, colour back)</a><br />
+     <a class="message" href="#SCI_SETWHITESPACESIZE">SCI_SETWHITESPACESIZE(int
+    size)</a><br />
+     <a class="message" href="#SCI_GETWHITESPACESIZE">SCI_GETWHITESPACESIZE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETTABDRAWMODE">SCI_SETTABDRAWMODE(int tabDrawMode)</a><br />
+     <a class="message" href="#SCI_GETTABDRAWMODE">SCI_GETTABDRAWMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETEXTRAASCENT">SCI_SETEXTRAASCENT(int extraAscent)</a><br />
+     <a class="message" href="#SCI_GETEXTRAASCENT">SCI_GETEXTRAASCENT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETEXTRADESCENT">SCI_SETEXTRADESCENT(int extraDescent)</a><br />
+     <a class="message" href="#SCI_GETEXTRADESCENT">SCI_GETEXTRADESCENT &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETVIEWWS">SCI_SETVIEWWS(int viewWS)</b><br />
+     <b id="SCI_GETVIEWWS">SCI_GETVIEWWS &rarr; int</b><br />
+     White space can be made visible which may be useful for languages in which white space is
+    significant, such as Python. Space characters appear as small centred dots and tab characters
+    as light arrows pointing to the right. There are also ways to control the display of <a
+    class="jump" href="#LineEndings">end of line characters</a>. The two messages set and get the
+    white space display mode. The <code class="parameter">viewWS</code> argument can be one of:</p>
+
+    <table class="standard" summary="White space policy">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SCWS_INVISIBLE</code></th>
+
+          <td>0</td>
+
+          <td>The normal display mode with white space displayed as an empty background
+          colour.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCWS_VISIBLEALWAYS</code></th>
+
+          <td>1</td>
+
+          <td>White space characters are drawn as dots and arrows,</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCWS_VISIBLEAFTERINDENT</code></th>
+
+          <td>2</td>
+
+          <td>White space used for indentation is displayed normally but after the first visible
+          character, it is shown as dots and arrows.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCWS_VISIBLEONLYININDENT</code></th>
+
+          <td>3</td>
+
+          <td>White space used for indentation is displayed as dots and arrows.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The effect of using any other <code class="parameter">viewWS</code> value is undefined.</p>
+
+    <p>
+     <b id="SC_ELEMENT_WHITE_SPACE">SC_ELEMENT_WHITE_SPACE : colouralpha</b><br />
+     <b id="SCI_SETWHITESPACEFORE">SCI_SETWHITESPACEFORE(bool useSetting, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SC_ELEMENT_WHITE_SPACE_BACK">SC_ELEMENT_WHITE_SPACE_BACK : colouralpha</b><br />
+     <b id="SCI_SETWHITESPACEBACK">SCI_SETWHITESPACEBACK(bool useSetting, <a class="jump" href="#colour">colour</a> back)</b><br />
+     By default, the colour of visible white space is determined by the lexer in use. The
+    foreground and/or background colour of all visible white space can be set globally, overriding
+    the lexer's colours with <a href="#SCI_SETELEMENTCOLOUR"><code>SC_ELEMENT_WHITE_SPACE</code></a>
+    and <a href="#SCI_SETELEMENTCOLOUR"><code>SC_ELEMENT_WHITE_SPACE_BACK</code></a>.
+    .<br />
+    <code>SCI_SETWHITESPACEFORE</code> and <code>SCI_SETWHITESPACEBACK</code> also
+    change the white space colours but the element APIs are preferred with <code>SC_ELEMENT_WHITE_SPACE</code>
+    allowing translucency.</p>
+
+     <p><b id="SCI_SETWHITESPACESIZE">SCI_SETWHITESPACESIZE(int size)</b><br />
+     <b id="SCI_GETWHITESPACESIZE">SCI_GETWHITESPACESIZE &rarr; int</b><br />
+     <code>SCI_SETWHITESPACESIZE</code> sets the size of the dots used for mark space characters.
+     The <code>SCI_GETWHITESPACESIZE</code> message retrieves the current size.
+     The value 0 is valid and makes the dots invisible.
+    </p>
+
+    <p><b id="SCI_SETTABDRAWMODE">SCI_SETTABDRAWMODE(int tabDrawMode)</b><br />
+     <b id="SCI_GETTABDRAWMODE">SCI_GETTABDRAWMODE &rarr; int</b><br />
+    These two messages get and set how tab characters are drawn when white space is visible.
+    The <code class="parameter">tabDrawMode</code> argument can be one of:</p>
+
+    <table class="standard" summary="White space policy">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SCTD_LONGARROW</code></th>
+
+          <td>0</td>
+
+          <td>The default mode of an arrow stretching until the tabstop.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SCTD_STRIKEOUT</code></th>
+
+          <td>1</td>
+
+          <td>A horizontal line stretching until the tabstop.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The effect of using any other <code class="parameter">tabDrawMode</code> value is undefined.</p>
+
+    <p>
+     <b id="SCI_SETEXTRAASCENT">SCI_SETEXTRAASCENT(int extraAscent)</b><br />
+     <b id="SCI_GETEXTRAASCENT">SCI_GETEXTRAASCENT &rarr; int</b><br />
+     <b id="SCI_SETEXTRADESCENT">SCI_SETEXTRADESCENT(int extraDescent)</b><br />
+     <b id="SCI_GETEXTRADESCENT">SCI_GETEXTRADESCENT &rarr; int</b><br />
+     Text is drawn with the base of each character on a 'baseline'. The height of a line is found from the maximum
+     that any style extends above the baseline (its 'ascent'), added to the maximum that any style extends below the
+     baseline (its 'descent').
+     Space may be added to the maximum ascent (<code>SCI_SETEXTRAASCENT</code>) and the
+     maximum descent (<code>SCI_SETEXTRADESCENT</code>) to allow for more space between lines.
+     This may done to make the text easier to read or to accommodate underlines or highlights.
+    </p>
+
+    <h2 id="Cursor">Cursor</h2>
+    <a class="message" href="#SCI_SETCURSOR">SCI_SETCURSOR(int cursorType)</a><br />
+     <a class="message" href="#SCI_GETCURSOR">SCI_GETCURSOR &rarr; int</a><br />
+
+    <p><b id="SCI_SETCURSOR">SCI_SETCURSOR(int cursorType)</b><br />
+     <b id="SCI_GETCURSOR">SCI_GETCURSOR &rarr; int</b><br />
+     The cursor is normally chosen in a context sensitive way, so it will be different over the
+    margin than when over the text. When performing a slow action, you may wish to change to a wait
+    cursor. You set the cursor type with <code>SCI_SETCURSOR</code>. The <code class="parameter">cursorType</code>
+    argument can be:</p>
+
+    <table class="standard" summary="Mouse cursors">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_CURSORNORMAL</code></th>
+
+          <td>-1</td>
+
+          <td>The normal cursor is displayed.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_CURSORWAIT</code></th>
+
+          <td>&nbsp;4</td>
+
+          <td>The wait cursor is displayed when the mouse is over or owned by the Scintilla
+          window.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Cursor values 1 through 7 have defined cursors, but only <code>SC_CURSORWAIT</code> is
+    usefully controllable. Other values of <code class="parameter">cursorType</code> cause a pointer to be displayed.
+    The <code>SCI_GETCURSOR</code> message returns the last cursor type you set, or
+    <code>SC_CURSORNORMAL</code> (-1) if you have not set a cursor type.</p>
+
+    <h2 id="MouseCapture">Mouse capture</h2>
+    <a class="message" href="#SCI_SETMOUSEDOWNCAPTURES">SCI_SETMOUSEDOWNCAPTURES(bool captures)</a><br />
+     <a class="message" href="#SCI_GETMOUSEDOWNCAPTURES">SCI_GETMOUSEDOWNCAPTURES &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETMOUSEWHEELCAPTURES">SCI_SETMOUSEWHEELCAPTURES(bool captures)</a><br />
+     <a class="message" href="#SCI_GETMOUSEWHEELCAPTURES">SCI_GETMOUSEWHEELCAPTURES &rarr; bool</a><br />
+
+    <p><b id="SCI_SETMOUSEDOWNCAPTURES">SCI_SETMOUSEDOWNCAPTURES(bool captures)</b><br />
+     <b id="SCI_GETMOUSEDOWNCAPTURES">SCI_GETMOUSEDOWNCAPTURES &rarr; bool</b><br />
+     When the mouse is pressed inside Scintilla, it is captured so future mouse movement events are
+    sent to Scintilla. This behaviour may be turned off with
+    <code>SCI_SETMOUSEDOWNCAPTURES(0)</code>.</p>
+
+    <p><b id="SCI_SETMOUSEWHEELCAPTURES">SCI_SETMOUSEWHEELCAPTURES(bool captures)</b><br />
+     <b id="SCI_GETMOUSEWHEELCAPTURES">SCI_GETMOUSEWHEELCAPTURES &rarr; bool</b><br />
+     On Windows, Scintilla captures all <code>WM_MOUSEWHEEL</code> messages if it has the
+     focus, even if the mouse pointer is nowhere near the Scintilla editor window. This
+     behaviour can be changed with <code>SCI_SETMOUSEWHEELCAPTURES(0)</code> so that
+     Scintilla passes the <code>WM_MOUSEWHEEL</code> messages to its parent window.
+     Scintilla will still react to the mouse wheel if the mouse pointer is over
+     the editor window.</p>
+
+    <h2 id="LineEndings">Line endings</h2>
+
+    <p>Scintilla can handle the major line end conventions and, depending on settings and
+    the current lexer also support additional Unicode line ends.</p>
+
+    <p>Scintilla can interpret any of the Macintosh (\r), Unix (\n) and Windows (\r\n)
+    line ends.
+    When the user presses the Enter key, one of these line
+    end strings is inserted into the buffer. The default is \r\n in Windows and \n in Unix, but
+    this can be changed with the <code>SCI_SETEOLMODE</code> message. You can also convert the
+    entire document to one of these line endings with <code>SCI_CONVERTEOLS</code>. Finally, you
+    can choose to display the line endings with <code>SCI_SETVIEWEOL</code>.</p>
+
+    <p>For the UTF-8 encoding, three additional Unicode line ends,
+    Next Line (<code>NEL=U+0085</code>), Line Separator (<code>LS=U+2028</code>), and Paragraph Separator (<code>PS=U+2029</code>)
+    may optionally be interpreted when Unicode line ends is turned on and the current lexer also supports
+    Unicode line ends.</p>
+
+    <a class="message" href="#SCI_SETEOLMODE">SCI_SETEOLMODE(int eolMode)</a><br />
+     <a class="message" href="#SCI_GETEOLMODE">SCI_GETEOLMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_CONVERTEOLS">SCI_CONVERTEOLS(int eolMode)</a><br />
+     <a class="message" href="#SCI_SETVIEWEOL">SCI_SETVIEWEOL(bool visible)</a><br />
+     <a class="message" href="#SCI_GETVIEWEOL">SCI_GETVIEWEOL &rarr; bool</a><br />
+
+     <a class="message" href="#SCI_GETLINEENDTYPESSUPPORTED">SCI_GETLINEENDTYPESSUPPORTED &rarr; int</a><br />
+     <a class="message" href="#SCI_SETLINEENDTYPESALLOWED">SCI_SETLINEENDTYPESALLOWED(int lineEndBitSet)</a><br />
+     <a class="message" href="#SCI_GETLINEENDTYPESALLOWED">SCI_GETLINEENDTYPESALLOWED &rarr; int</a><br />
+     <a class="message" href="#SCI_GETLINEENDTYPESACTIVE">SCI_GETLINEENDTYPESACTIVE &rarr; int</a><br />
+
+    <p><b id="SCI_SETEOLMODE">SCI_SETEOLMODE(int eolMode)</b><br />
+     <b id="SCI_GETEOLMODE">SCI_GETEOLMODE &rarr; int</b><br />
+     <code>SCI_SETEOLMODE</code> sets the characters that are added into the document when the user
+    presses the Enter key. You can set <code class="parameter">eolMode</code> to one of <code>SC_EOL_CRLF</code> (0),
+    <code>SC_EOL_CR</code> (1), or <code>SC_EOL_LF</code> (2). The <code>SCI_GETEOLMODE</code>
+    message retrieves the current state.</p>
+
+    <p><b id="SCI_CONVERTEOLS">SCI_CONVERTEOLS(int eolMode)</b><br />
+     This message changes all the end of line characters in the document to match
+    <code class="parameter">eolMode</code>. Valid values are: <code>SC_EOL_CRLF</code> (0), <code>SC_EOL_CR</code>
+    (1), or <code>SC_EOL_LF</code> (2).</p>
+
+    <p><b id="SCI_SETVIEWEOL">SCI_SETVIEWEOL(bool visible)</b><br />
+     <b id="SCI_GETVIEWEOL">SCI_GETVIEWEOL &rarr; bool</b><br />
+     Normally, the end of line characters are hidden, but <code>SCI_SETVIEWEOL</code> allows you to
+    display (or hide) them by setting <code class="parameter">visible</code> <code>true</code> (or
+    <code>false</code>). The visible rendering of the end of line characters is similar to
+    <code>(CR)</code>, <code>(LF)</code>, or <code>(CR)(LF)</code>. <code>SCI_GETVIEWEOL</code>
+    returns the current state.</p>
+
+    <p><b id="SCI_GETLINEENDTYPESSUPPORTED">SCI_GETLINEENDTYPESSUPPORTED &rarr; int</b><br />
+     <code>SCI_GETLINEENDTYPESSUPPORTED</code> reports the different types of line ends supported
+     by the current lexer. This is a bit set although there is currently only a single choice
+     with either <code>SC_LINE_END_TYPE_DEFAULT</code> (0) or <code>SC_LINE_END_TYPE_UNICODE</code> (1).
+     These values are also used by the other messages concerned with Unicode line ends.</p>
+
+    <p><b id="SCI_SETLINEENDTYPESALLOWED">SCI_SETLINEENDTYPESALLOWED(int lineEndBitSet)</b><br />
+     <b id="SCI_GETLINEENDTYPESALLOWED">SCI_GETLINEENDTYPESALLOWED &rarr; int</b><br />
+     By default, only the ASCII line ends are interpreted. Unicode line ends may be requested with
+     <code>SCI_SETLINEENDTYPESALLOWED(SC_LINE_END_TYPE_UNICODE)</code>
+     but this will be ineffective unless the lexer also allows you Unicode line ends.
+    <code>SCI_GETLINEENDTYPESALLOWED</code> returns the current state.</p>
+
+    <p><b id="SCI_GETLINEENDTYPESACTIVE">SCI_GETLINEENDTYPESACTIVE &rarr; int</b><br />
+     <code>SCI_GETLINEENDTYPESACTIVE</code> reports the set of line ends currently interpreted
+     by Scintilla. It is <code>SCI_GETLINEENDTYPESSUPPORTED &amp; SCI_GETLINEENDTYPESALLOWED</code>.</p>
+
+    <h2 id="Words">Words</h2>
+
+    <p>There is support for selecting, navigating by, and searching for words.</p>
+
+    <p>
+    Words are contiguous sequences of characters from a particular set of characters.
+    4 categories define words: word, whitespace, punctuation, and line ends with each category
+    having a role in word functions.
+    Double clicking selects the word at that point, which may be a sequence of word, punctuation,
+    or whitespace bytes.
+    Line ends are not selected by double clicking but do act as word separators.
+    </p>
+
+    <p>Words are defined in terms of characters and the sets of characters in each category can be customised to an extent.
+    The NUL character (0) is always a space as the APIs to set categories use NUL-terminated strings.
+    For single-byte encodings a category may be assigned to any character (1 to 0xFF).
+    For multi-byte encodings a category may be assigned to characters from 1 to 0x7F with static behaviour from 0x80.
+    For UTF-8, characters from 0x80 will use a category based on their Unicode general category.
+    For Asian encodings, code pages 932, 936, 949, 950, and 1361, characters from 0x80 are treated as word characters.
+    </p>
+
+    <p>Identifiers in programming languages are often sequences of words with capitalisation
+     (aCamelCaseIdentifier) or underscores (an_under_bar_ident) used to mark word boundaries.
+     The <code>SCI_WORDPART*</code> commands are used for moving between word parts:
+     <a class="message" href="#SCI_WORDPARTLEFT"><code>SCI_WORDPARTLEFT</code></a>,
+     <a class="message" href="#SCI_WORDPARTLEFTEXTEND"><code>SCI_WORDPARTLEFTEXTEND</code></a>,
+     <a class="message" href="#SCI_WORDPARTRIGHT"><code>SCI_WORDPARTRIGHT</code></a>, and
+     <a class="message" href="#SCI_WORDPARTRIGHTEXTEND"><code>SCI_WORDPARTRIGHTEXTEND</code></a>.
+     </p>
+
+     <a class="message" href="#SCI_WORDENDPOSITION">SCI_WORDENDPOSITION(position pos, bool onlyWordCharacters) &rarr; position</a><br />
+     <a class="message" href="#SCI_WORDSTARTPOSITION">SCI_WORDSTARTPOSITION(position pos, bool onlyWordCharacters) &rarr; position</a><br />
+     <a class="message" href="#SCI_ISRANGEWORD">SCI_ISRANGEWORD(position start, position end) &rarr; bool</a><br />
+
+     <a class="message" href="#SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char *characters)</a><br />
+     <a class="message" href="#SCI_GETWORDCHARS">SCI_GETWORDCHARS(&lt;unused&gt;, char *characters) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETWHITESPACECHARS">SCI_SETWHITESPACECHARS(&lt;unused&gt;, const char *characters)</a><br />
+     <a class="message" href="#SCI_GETWHITESPACECHARS">SCI_GETWHITESPACECHARS(&lt;unused&gt;, char *characters) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETPUNCTUATIONCHARS">SCI_SETPUNCTUATIONCHARS(&lt;unused&gt;, const char *characters)</a><br />
+     <a class="message" href="#SCI_GETPUNCTUATIONCHARS">SCI_GETPUNCTUATIONCHARS(&lt;unused&gt;, char *characters) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETCHARSDEFAULT">SCI_SETCHARSDEFAULT</a><br />
+     <a class="message" href="#SCI_SETCHARACTERCATEGORYOPTIMIZATION">SCI_SETCHARACTERCATEGORYOPTIMIZATION(int countCharacters)</a><br />
+     <a class="message" href="#SCI_GETCHARACTERCATEGORYOPTIMIZATION">SCI_GETCHARACTERCATEGORYOPTIMIZATION &rarr; int</a><br />
+
+    <p><b id="SCI_WORDENDPOSITION">SCI_WORDENDPOSITION(position pos, bool onlyWordCharacters) &rarr; position</b><br />
+     <b id="SCI_WORDSTARTPOSITION">SCI_WORDSTARTPOSITION(position pos, bool onlyWordCharacters) &rarr; position</b><br />
+     These messages return the start and end of words using the same definition of words as used
+    internally within Scintilla. You can set your own list of characters that count as words with
+    <a class="message" href="#SCI_SETWORDCHARS"><code>SCI_SETWORDCHARS</code></a>. The position
+    sets the start or the search, which is forwards when searching for the end and backwards when
+    searching for the start.</p>
+
+    <p><b id="SCI_ISRANGEWORD">SCI_ISRANGEWORD(position start, position end) &rarr; bool</b><br />
+     Is the range start..end a word or set of words? This message checks that start is at a word start transition and that
+     end is at a word end transition. It does not check whether there are any spaces inside the range.</p>
+
+     <a class="message" href="#SCI_ISRANGEWORD">SCI_ISRANGEWORD(position start, position end) &rarr; bool</a><br />
+
+    <p>Set <code class="parameter">onlyWordCharacters</code> to <code>true</code> (1) to stop searching at the first
+    non-word character in the search direction. If <code class="parameter">onlyWordCharacters</code> is
+    <code>false</code> (0), the first character in the search direction sets the type of the search
+    as word or non-word and the search stops at the first non-matching character. Searches are also
+    terminated by the start or end of the document.</p>
+
+    <p>If "w" represents word characters and "." represents non-word characters and "|" represents
+    the position and <code>true</code> or <code>false</code> is the state of
+    <code class="parameter">onlyWordCharacters</code>:</p>
+
+    <table class="standard" summary="Word start and end positions">
+      <thead align="center">
+        <tr>
+          <th>Initial state</th>
+
+          <th>end, true</th>
+
+          <th>end, false</th>
+
+          <th>start, true</th>
+
+          <th>start, false</th>
+        </tr>
+      </thead>
+
+      <tbody align="center">
+        <tr>
+          <td>..ww..|..ww..</td>
+
+          <td>..ww..|..ww..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..ww..|..ww..</td>
+
+          <td>..ww|....ww..</td>
+        </tr>
+
+        <tr>
+          <td>....ww|ww....</td>
+
+          <td>....wwww|....</td>
+
+          <td>....wwww|....</td>
+
+          <td>....|wwww....</td>
+
+          <td>....|wwww....</td>
+        </tr>
+
+        <tr>
+          <td>..ww|....ww..</td>
+
+          <td>..ww|....ww..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..|ww....ww..</td>
+
+          <td>..|ww....ww..</td>
+        </tr>
+
+        <tr>
+          <td>..ww....|ww..</td>
+
+          <td>..ww....ww|..</td>
+
+          <td>..ww....ww|..</td>
+
+          <td>..ww....|ww..</td>
+
+          <td>..ww|....ww..</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETWORDCHARS">SCI_SETWORDCHARS(&lt;unused&gt;, const char *characters)</b><br />
+     This message defines which characters are members of the word category.
+     The character categories are set to default values before processing this function.
+    For example, if you don't allow '_' in your set of characters
+    use:<br />
+     <code>SCI_SETWORDCHARS(0, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")</code>;</p>
+
+    <p><b id="SCI_GETWORDCHARS">SCI_GETWORDCHARS(&lt;unused&gt;, char *characters) &rarr; int</b><br />
+     This fills the <code class="parameter">characters</code> parameter with all the characters included in words.
+     The <code class="parameter">characters</code> parameter must be large enough to hold all of the characters.
+     If the <code class="parameter">characters</code> parameter is 0 then the length that should be allocated
+     to store the entire set is returned.</p>
+
+    <p>For multi-byte encodings, this API will not return meaningful values for 0x80 and above.</p>
+
+    <p><b id="SCI_SETWHITESPACECHARS">SCI_SETWHITESPACECHARS(&lt;unused&gt;, const char *characters)</b><br />
+    <b id="SCI_GETWHITESPACECHARS">SCI_GETWHITESPACECHARS(&lt;unused&gt;, char *characters) &rarr; int</b><br />
+     Similar to <code>SCI_SETWORDCHARS</code>, this message allows the user to define which chars Scintilla considers
+          as whitespace.  Setting the whitespace chars allows the user to fine-tune Scintilla's behaviour doing
+          such things as moving the cursor to the start or end of a word; for example, by defining punctuation chars
+          as whitespace, they will be skipped over when the user presses ctrl+left or ctrl+right.
+          This function should be called after <code>SCI_SETWORDCHARS</code> as it will
+          reset the whitespace characters to the default set.
+	  <code>SCI_GETWHITESPACECHARS</code> behaves similarly to <code>SCI_GETWORDCHARS</code>.</p>
+
+    <p><b id="SCI_SETPUNCTUATIONCHARS">SCI_SETPUNCTUATIONCHARS(&lt;unused&gt;, const char *characters)</b><br />
+    <b id="SCI_GETPUNCTUATIONCHARS">SCI_GETPUNCTUATIONCHARS(&lt;unused&gt;, char *characters) &rarr; int</b><br />
+     Similar to <code>SCI_SETWORDCHARS</code> and <code>SCI_SETWHITESPACECHARS</code>, this message
+     allows the user to define which chars Scintilla considers as punctuation.
+	  <code>SCI_GETPUNCTUATIONCHARS</code> behaves similarly to <code>SCI_GETWORDCHARS</code>.</p>
+
+    <p><b id="SCI_SETCHARSDEFAULT">SCI_SETCHARSDEFAULT</b><br />
+     Use the default sets of word and whitespace characters. This sets whitespace to space, tab and other
+     characters with codes less than 0x20, with word characters set to alphanumeric and '_'.
+    </p>
+
+    <p><b id="SCI_SETCHARACTERCATEGORYOPTIMIZATION">SCI_SETCHARACTERCATEGORYOPTIMIZATION(int countCharacters)</b><br />
+    <b id="SCI_GETCHARACTERCATEGORYOPTIMIZATION">SCI_GETCHARACTERCATEGORYOPTIMIZATION &rarr; int</b><br />
+      Optimize speed of character category features like determining whether a character is a space or number at the expense of memory.
+      Mostly used for Unicode documents.
+      The <code class="parameter">countCharacters</code> parameter determines how many character starting from 0 are added to a look-up table with one byte used for each character.
+      It is reasonable to cover the set of characters likely to be used in a document so 0x100 for simple Roman text,
+      0x1000 to cover most simple alphabets, 0x10000 to cover most of East Asian languages, and 0x110000 to cover all possible characters.
+    </p>
+
+    <p>Word keyboard commands are:</p>
+    <ul>
+    <li class="message" id="SCI_WORDLEFT">SCI_WORDLEFT</li>
+    <li class="message" id="SCI_WORDLEFTEXTEND">SCI_WORDLEFTEXTEND</li>
+    <li class="message" id="SCI_WORDRIGHT">SCI_WORDRIGHT</li>
+    <li class="message" id="SCI_WORDRIGHTEXTEND">SCI_WORDRIGHTEXTEND</li>
+    <li class="message" id="SCI_WORDLEFTEND">SCI_WORDLEFTEND</li>
+    <li class="message" id="SCI_WORDLEFTENDEXTEND">SCI_WORDLEFTENDEXTEND</li>
+    <li class="message" id="SCI_WORDRIGHTEND">SCI_WORDRIGHTEND</li>
+    <li class="message" id="SCI_WORDRIGHTENDEXTEND">SCI_WORDRIGHTENDEXTEND</li>
+    <li class="message" id="SCI_WORDPARTLEFT">SCI_WORDPARTLEFT</li>
+    <li class="message" id="SCI_WORDPARTLEFTEXTEND">SCI_WORDPARTLEFTEXTEND</li>
+    <li class="message" id="SCI_WORDPARTRIGHT">SCI_WORDPARTRIGHT</li>
+    <li class="message" id="SCI_WORDPARTRIGHTEXTEND">SCI_WORDPARTRIGHTEXTEND</li>
+    <li class="message" id="SCI_DELWORDLEFT">SCI_DELWORDLEFT</li>
+    <li class="message" id="SCI_DELWORDRIGHT">SCI_DELWORDRIGHT</li>
+    <li class="message" id="SCI_DELWORDRIGHTEND">SCI_DELWORDRIGHTEND</li>
+    </ul>
+
+    <h2 id="Styling">Styling</h2>
+
+    <p>The styling messages allow you to assign styles to text. If your styling needs can be met by
+    one of the standard lexers, or if you can write your own, then a lexer is probably the easiest
+    way to style your document. If you choose to use the container to do the styling you can use
+    the <a class="message" href="#SCI_SETILEXER"><code>SCI_SETILEXER</code></a> command to select
+    <code>NULL</code>, in which case the container is sent a <a class="message"
+    href="#SCN_STYLENEEDED"><code>SCN_STYLENEEDED</code></a> <a class="jump"
+    href="#Notifications">notification</a> each time text needs styling for display. As another
+    alternative, you might use idle time to style the document. Even if you use a lexer, you might
+    use the styling commands to mark errors detected by a compiler. The following commands can be
+    used.</p>
+    <code><a class="message" href="#SCI_GETENDSTYLED">SCI_GETENDSTYLED &rarr; position</a><br />
+     <a class="message" href="#SCI_STARTSTYLING">SCI_STARTSTYLING(position start, int unused)</a><br />
+     <a class="message" href="#SCI_SETSTYLING">SCI_SETSTYLING(position length, int style)</a><br />
+     <a class="message" href="#SCI_SETSTYLINGEX">SCI_SETSTYLINGEX(position length, const char
+    *styles)</a><br />
+     <a class="message" href="#SCI_SETIDLESTYLING">SCI_SETIDLESTYLING(int idleStyling)</a><br />
+     <a class="message" href="#SCI_GETIDLESTYLING">SCI_GETIDLESTYLING &rarr; int</a><br />
+     <a class="message" href="#SCI_SETLINESTATE">SCI_SETLINESTATE(line line, int state)</a><br />
+     <a class="message" href="#SCI_GETLINESTATE">SCI_GETLINESTATE(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETMAXLINESTATE">SCI_GETMAXLINESTATE &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_GETENDSTYLED">SCI_GETENDSTYLED &rarr; position</b><br />
+     Scintilla keeps a record of the last character that is likely to be styled correctly. This is
+    moved forwards when characters after it are styled and moved backwards if changes are made to
+    the text of the document before it. Before drawing text, this position is checked to see if any
+    styling is needed and, if so, a <code><a class="message"
+    href="#SCN_STYLENEEDED">SCN_STYLENEEDED</a></code> notification message is sent to the
+    container. The container can send <code>SCI_GETENDSTYLED</code> to work out where it needs to
+    start styling. Scintilla will always ask to style whole lines.</p>
+
+    <p><b id="SCI_STARTSTYLING">SCI_STARTSTYLING(position start, int unused)</b><br />
+     This prepares for styling by setting the styling position <code class="parameter">start</code> to start at.
+     The unused argument was used in earlier versions but is now ignored.
+     After
+    <code>SCI_STARTSTYLING</code>, send multiple <code>SCI_SETSTYLING</code> messages for each
+    lexical entity to style or send <code>SCI_SETSTYLINGEX</code> to style in blocks.</p>
+
+    <p><b id="SCI_SETSTYLING">SCI_SETSTYLING(position length, int style)</b><br />
+     This message sets the style of <code class="parameter">length</code> characters starting at the styling position
+    and then increases the styling position by <code class="parameter">length</code>, ready for the next call.
+    <code>SCI_STARTSTYLING</code> should be called before the first call to this.
+    </p>
+
+    <p><b id="SCI_SETSTYLINGEX">SCI_SETSTYLINGEX(position length, const char *styles)</b><br />
+     As an alternative to <code>SCI_SETSTYLING</code>, which applies the same style to each byte,
+    you can use this message which specifies the styles for each of <code class="parameter">length</code> bytes from
+    the styling position and then increases the styling position by <code class="parameter">length</code>, ready for
+    the next call.
+    <code>SCI_STARTSTYLING</code> should be called before the first call to this.
+    </p>
+
+    <p><b id="SCI_SETIDLESTYLING">SCI_SETIDLESTYLING(int idleStyling)</b><br />
+     <b id="SCI_GETIDLESTYLING">SCI_GETIDLESTYLING &rarr; int</b><br />
+     By default, <code>SC_IDLESTYLING_NONE</code> (0),
+     syntax styling is performed for all the currently visible text before displaying it.
+     On very large files, this may make scrolling down slow.
+     With <code>SC_IDLESTYLING_TOVISIBLE</code> (1),
+     a small amount of styling is performed before display and then
+     further styling is performed incrementally in the background as an idle-time task.
+     This may result in the text initially appearing uncoloured and then, some time later, it is coloured.
+     Text after the currently visible portion may be styled in the background with <code>SC_IDLESTYLING_AFTERVISIBLE</code> (2).
+     To style both before and after the visible text in the background use <code>SC_IDLESTYLING_ALL</code> (3).
+    </p>
+    <p>
+     Since wrapping also needs to perform styling and also uses idle time, this setting has no effect when
+     the document is displayed wrapped.
+    </p>
+
+    <p><b id="SCI_SETLINESTATE">SCI_SETLINESTATE(line line, int state)</b><br />
+     <b id="SCI_GETLINESTATE">SCI_GETLINESTATE(line line) &rarr; int</b><br />
+     As well as the 8 bits of lexical state stored for each character there is also an integer
+    stored for each line. This can be used for longer lived parse states such as what the current
+    scripting language is in an ASP page. Use <code>SCI_SETLINESTATE</code> to set the integer
+    value and <code>SCI_GETLINESTATE</code> to get the value.
+    Changing the value produces a <a class="message" href="#SC_MOD_CHANGELINESTATE">SC_MOD_CHANGELINESTATE</a> notification.
+    </p>
+
+    <p><b id="SCI_GETMAXLINESTATE">SCI_GETMAXLINESTATE &rarr; int</b><br />
+     This returns the last line that has any line state.</p>
+
+    <h2 id="StyleDefinition">Style definition</h2>
+
+    <p>While the style setting messages mentioned above change the style numbers associated with
+    text, these messages define how those style numbers are interpreted visually. There are 256
+    lexer styles that can be set, numbered 0 to <code>STYLE_MAX</code> (255).
+    There are also some
+    predefined numbered styles starting at 32, The following <code>STYLE_</code>* constants are
+    defined.</p>
+
+    <table class="standard" summary="Preset styles">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>STYLE_DEFAULT</code></th>
+
+          <td>32</td>
+
+          <td>This style defines the attributes that all styles receive when the
+          <code>SCI_STYLECLEARALL</code> message is used.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_LINENUMBER</code></th>
+
+          <td>33</td>
+
+          <td>This style sets the attributes of the text used to display line numbers in a line
+          number margin. The background colour set for this style also sets the background colour
+          for all margins that do not have any folding mask bits set. That is, any margin for which
+          <code>mask &amp; SC_MASK_FOLDERS</code> is 0. See <a class="message"
+          href="#SCI_SETMARGINMASKN"><code>SCI_SETMARGINMASKN</code></a> for more about masks.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_BRACELIGHT</code></th>
+
+          <td>34</td>
+
+          <td>This style sets the attributes used when highlighting braces with the <a
+          class="message" href="#BraceHighlighting"><code>SCI_BRACEHIGHLIGHT</code></a> message and
+          when highlighting the corresponding indentation with <a class="message"
+          href="#SCI_SETHIGHLIGHTGUIDE"><code>SCI_SETHIGHLIGHTGUIDE</code></a>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_BRACEBAD</code></th>
+
+          <td>35</td>
+
+          <td>This style sets the display attributes used when marking an unmatched brace with the
+          <a class="message" href="#BraceHighlighting"><code>SCI_BRACEBADLIGHT</code></a>
+          message.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_CONTROLCHAR</code></th>
+
+          <td>36</td>
+
+          <td>This style sets the font used when drawing control characters.
+            Only the font, size, bold, italics, and character set attributes are used and not
+            the colour attributes. See
+          also: <a class="message"
+          href="#SCI_SETCONTROLCHARSYMBOL"><code>SCI_SETCONTROLCHARSYMBOL</code></a>.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_INDENTGUIDE</code></th>
+
+          <td>37</td>
+
+          <td>This style sets the foreground and background colours used when drawing the
+          indentation guides.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_CALLTIP</code></th>
+
+          <td>38</td>
+
+          <td> Call tips normally use the font attributes defined by <code>STYLE_DEFAULT</code>.
+          Use of <a class="seealso" href="#SCI_CALLTIPUSESTYLE"><code>SCI_CALLTIPUSESTYLE</code></a>
+            causes call tips to use this style instead. Only the font face name, font size,
+          foreground and background colours and character set attributes are used.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_FOLDDISPLAYTEXT</code></th>
+
+          <td>39</td>
+
+          <td>This is the style used for drawing text tags attached to folded text.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_LASTPREDEFINED</code></th>
+
+          <td>39</td>
+
+          <td>To make it easier for client code to discover the range of styles that are
+          predefined, this is set to the style number of the last predefined style.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>STYLE_MAX</code></th>
+
+          <td>255</td>
+
+          <td>This is not a style but is the number of the maximum style that can be set. Styles
+          between <code>STYLE_LASTPREDEFINED</code> and <code>STYLE_MAX</code> may be used.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>For each style you can set the font name, size and use of bold, italic and underline,
+    foreground and background colour and the character set. You can also choose to hide text with a
+    given style, display all characters as upper or lower case and fill from the last character on
+    a line to the end of the line (for embedded languages). There is also an experimental attribute
+    to make text read-only.</p>
+
+    <p>It is entirely up to you how you use styles. If you want to use syntax colouring you might
+    use style 0 for white space, style 1 for numbers, style 2 for keywords, style 3 for strings,
+    style 4 for preprocessor, style 5 for operators, and so on.</p>
+    <code><a class="message" href="#SCI_STYLERESETDEFAULT">SCI_STYLERESETDEFAULT</a><br />
+    <a class="message" href="#SCI_STYLECLEARALL">SCI_STYLECLEARALL</a><br />
+    <a class="message" href="#SCI_STYLESETFONT">SCI_STYLESETFONT(int style, const char
+    *fontName)</a><br />
+    <a class="message" href="#SCI_STYLEGETFONT">SCI_STYLEGETFONT(int style, char *fontName) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETSIZE">SCI_STYLESETSIZE(int style, int
+    sizePoints)</a><br />
+    <a class="message" href="#SCI_STYLEGETSIZE">SCI_STYLEGETSIZE(int style) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETSIZEFRACTIONAL">SCI_STYLESETSIZEFRACTIONAL(int style, int
+    sizeHundredthPoints)</a><br />
+    <a class="message" href="#SCI_STYLEGETSIZEFRACTIONAL">SCI_STYLEGETSIZEFRACTIONAL(int style) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETBOLD">SCI_STYLESETBOLD(int style, bool
+    bold)</a><br />
+    <a class="message" href="#SCI_STYLEGETBOLD">SCI_STYLEGETBOLD(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_STYLESETWEIGHT">SCI_STYLESETWEIGHT(int style, int
+    weight)</a><br />
+    <a class="message" href="#SCI_STYLEGETWEIGHT">SCI_STYLEGETWEIGHT(int style) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETITALIC">SCI_STYLESETITALIC(int style, bool
+    italic)</a><br />
+    <a class="message" href="#SCI_STYLEGETITALIC">SCI_STYLEGETITALIC(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_STYLESETUNDERLINE">SCI_STYLESETUNDERLINE(int style, bool
+    underline)</a><br />
+    <a class="message" href="#SCI_STYLEGETUNDERLINE">SCI_STYLEGETUNDERLINE(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_STYLESETFORE">SCI_STYLESETFORE(int style, colour fore)</a><br />
+    <a class="message" href="#SCI_STYLEGETFORE">SCI_STYLEGETFORE(int style) &rarr; colour</a><br />
+    <a class="message" href="#SCI_STYLESETBACK">SCI_STYLESETBACK(int style, colour back)</a><br />
+    <a class="message" href="#SCI_STYLEGETBACK">SCI_STYLEGETBACK(int style) &rarr; colour</a><br />
+    <a class="message" href="#SCI_STYLESETEOLFILLED">SCI_STYLESETEOLFILLED(int style, bool
+    eolFilled)</a><br />
+    <a class="message" href="#SCI_STYLEGETEOLFILLED">SCI_STYLEGETEOLFILLED(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET(int style,
+    int characterSet)</a><br />
+    <a class="message" href="#SCI_STYLEGETCHARACTERSET">SCI_STYLEGETCHARACTERSET(int style) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETCASE">SCI_STYLESETCASE(int style, int
+    caseVisible)</a><br />
+    <a class="message" href="#SCI_STYLEGETCASE">SCI_STYLEGETCASE(int style) &rarr; int</a><br />
+    <a class="message" href="#SCI_STYLESETVISIBLE">SCI_STYLESETVISIBLE(int style, bool
+    visible)</a><br />
+    <a class="message" href="#SCI_STYLEGETVISIBLE">SCI_STYLEGETVISIBLE(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_STYLESETCHANGEABLE">SCI_STYLESETCHANGEABLE(int style, bool
+    changeable)</a><br />
+    <a class="message" href="#SCI_STYLEGETCHANGEABLE">SCI_STYLEGETCHANGEABLE(int style) &rarr; bool</a><br />
+     <a class="message" href="#SCI_STYLESETHOTSPOT">SCI_STYLESETHOTSPOT(int style, bool
+    hotspot)</a><br />
+    <a class="message" href="#SCI_STYLEGETHOTSPOT">SCI_STYLEGETHOTSPOT(int style) &rarr; bool</a><br />
+    <a class="message" href="#SCI_SETFONTLOCALE">SCI_SETFONTLOCALE(&lt;unused&gt;, const char *localeName)</a><br />
+    <a class="message" href="#SCI_GETFONTLOCALE">SCI_GETFONTLOCALE(&lt;unused&gt;, char *localeName) &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_STYLERESETDEFAULT">SCI_STYLERESETDEFAULT</b><br />
+     This message resets <code>STYLE_DEFAULT</code> to its state when Scintilla was
+    initialised.</p>
+
+    <p><b id="SCI_STYLECLEARALL">SCI_STYLECLEARALL</b><br />
+     This message sets all styles to have the same attributes as <code>STYLE_DEFAULT</code>. If you
+    are setting up Scintilla for syntax colouring, it is likely that the lexical styles you set
+    will be very similar. One way to set the styles is to:<br />
+     1. Set <code>STYLE_DEFAULT</code> to the common features of all styles.<br />
+     2. Use <code>SCI_STYLECLEARALL</code> to copy this to all styles.<br />
+     3. Set the style attributes that make your lexical styles different.</p>
+
+    <p><b id="SCI_STYLESETFONT">SCI_STYLESETFONT(int style, const char *fontName)</b><br />
+    <b id="SCI_STYLEGETFONT">SCI_STYLEGETFONT(int style, char *fontName NUL-terminated) &rarr; int</b><br />
+    <b id="SCI_STYLESETSIZE">SCI_STYLESETSIZE(int style, int sizePoints)</b><br />
+    <b id="SCI_STYLEGETSIZE">SCI_STYLEGETSIZE(int style) &rarr; int</b><br />
+    <b id="SCI_STYLESETSIZEFRACTIONAL">SCI_STYLESETSIZEFRACTIONAL(int style, int sizeHundredthPoints)</b><br />
+    <b id="SCI_STYLEGETSIZEFRACTIONAL">SCI_STYLEGETSIZEFRACTIONAL(int style) &rarr; int</b><br />
+    <b id="SCI_STYLESETBOLD">SCI_STYLESETBOLD(int style, bool bold)</b><br />
+    <b id="SCI_STYLEGETBOLD">SCI_STYLEGETBOLD(int style) &rarr; bool</b><br />
+    <b id="SCI_STYLESETWEIGHT">SCI_STYLESETWEIGHT(int style, int weight)</b><br />
+    <b id="SCI_STYLEGETWEIGHT">SCI_STYLEGETWEIGHT(int style) &rarr; int</b><br />
+    <b id="SCI_STYLESETITALIC">SCI_STYLESETITALIC(int style, bool italic)</b><br />
+    <b id="SCI_STYLEGETITALIC">SCI_STYLEGETITALIC(int style) &rarr; bool</b><br />
+     These messages (plus <a class="message"
+    href="#SCI_STYLESETCHARACTERSET"><code>SCI_STYLESETCHARACTERSET</code></a>) set the font
+    attributes that are used to match the fonts you request to those available.</p>
+    <p>The
+    <code class="parameter">fontName</code> is a zero terminated string holding the name of a font. Under Windows,
+    only the first 32 characters of the name are used, the name is decoded as UTF-8, and the name is not case sensitive. For
+    internal caching, Scintilla tracks fonts by name and does care about the casing of font names,
+    so please be consistent.
+    On GTK, Pango is used to display text and the name is sent directly to Pango without transformation.
+    On Qt, the name is decoded as UTF-8.
+    On Cocoa, the name is decoded as MacRoman.</p>
+    <p>Sizes can be set to a whole number of points with <code>SCI_STYLESETSIZE</code>
+    or to a fractional point size in hundredths of a point with <code>SCI_STYLESETSIZEFRACTIONAL</code>
+    by multiplying the size by 100 (<code>SC_FONT_SIZE_MULTIPLIER</code>).
+    For example, a text size of 9.4 points is set with <code>SCI_STYLESETSIZEFRACTIONAL(&lt;style&gt;, 940)</code>.
+    </p>
+    <p>The weight or boldness of a font can be set with <code>SCI_STYLESETBOLD</code>
+    or <code>SCI_STYLESETWEIGHT</code>. The weight is a number between 1 and 999 with 1 being very light
+    and 999 very heavy. While any value can be used, fonts often only support between 2 and 4 weights with three weights
+    being common enough to have symbolic names:
+    <code>SC_WEIGHT_NORMAL</code> (400),
+    <code>SC_WEIGHT_SEMIBOLD</code> (600), and
+    <code>SC_WEIGHT_BOLD</code> (700).
+    The <code>SCI_STYLESETBOLD</code> message takes a boolean argument with 0 choosing <code>SC_WEIGHT_NORMAL</code>
+    and 1 <code>SC_WEIGHT_BOLD</code>.
+    </p>
+
+    <p><b id="SCI_STYLESETUNDERLINE">SCI_STYLESETUNDERLINE(int style, bool
+    underline)</b><br />
+    <b id="SCI_STYLEGETUNDERLINE">SCI_STYLEGETUNDERLINE(int style) &rarr; bool</b><br />
+    You can set a style to be underlined. The underline is drawn in the foreground colour. All
+    characters with a style that includes the underline attribute are underlined, even if they are
+    white space.</p>
+
+    <p><b id="SCI_STYLESETFORE">SCI_STYLESETFORE(int style, <a class="jump" href="#colour">colour</a> fore)</b><br />
+    <b id="SCI_STYLEGETFORE">SCI_STYLEGETFORE(int style) &rarr; colour</b><br />
+    <b id="SCI_STYLESETBACK">SCI_STYLESETBACK(int style, <a class="jump" href="#colour">colour</a> back)</b><br />
+    <b id="SCI_STYLEGETBACK">SCI_STYLEGETBACK(int style) &rarr; colour</b><br />
+    Text is drawn in the foreground colour. The space in each character cell that is not occupied
+    by the character is drawn in the background colour.</p>
+
+    <p><b id="SCI_STYLESETEOLFILLED">SCI_STYLESETEOLFILLED(int style, bool
+    eolFilled)</b><br />
+    <b id="SCI_STYLEGETEOLFILLED">SCI_STYLEGETEOLFILLED(int style) &rarr; bool</b><br />
+    If the last character in the line has a style with this attribute set, the remainder of the
+    line up to the right edge of the window is filled with the background colour set for the last
+    character. This is useful when a document contains embedded sections in another language such
+    as HTML pages with embedded JavaScript. By setting <code class="parameter">eolFilled</code> to <code>true</code>
+    and a consistent background colour (different from the background colour set for the HTML
+    styles) to all JavaScript styles then JavaScript sections will be easily distinguished from
+    HTML.</p>
+
+    <p><b id="SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET(int style, int
+    characterSet)</b><br />
+    <b id="SCI_STYLEGETCHARACTERSET">SCI_STYLEGETCHARACTERSET(int style) &rarr; int</b><br />
+    You can set a style to use a different character set than the default. The places where such
+    characters sets are likely to be useful are comments and literal strings. For example,
+    <code>SCI_STYLESETCHARACTERSET(SCE_C_STRING, SC_CHARSET_RUSSIAN)</code> would ensure that
+    strings in Russian would display correctly in C and C++ (<code>SCE_C_STRING</code> is the style
+    number used by the C and C++ lexer to display literal strings; it has the value 6). This
+    feature works differently on Windows and GTK.<br />
+    The default character set is <code>SC_CHARSET_DEFAULT</code>.</p>
+    <p><code>SC_CHARSET_ANSI</code> and <code>SC_CHARSET_DEFAULT</code> specify European Windows code page 1252 unless the code page is set.</p>
+
+<table class="standard" summary="Character Sets supported"><tbody>
+  <tr>
+    <th>Character Set</th>
+    <th>Windows</th>
+    <th>GTK</th>
+    <th>Cocoa</th></tr></tbody>
+  <tbody>
+  <tr>
+    <td><code>SC_CHARSET_ANSI</code></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td>
+    <td>&#10003; (8859-1)</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_ARABIC</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_BALTIC</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_CHINESEBIG5</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_DEFAULT</code></td>
+    <td>&#10003;</td>
+    <td>&#10003; (8859-1)</td>
+    <td>&#10003; (8859-1)</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_EASTEUROPE</code></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_GB2312</code></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_GREEK</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_HANGUL</code></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_HEBREW</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_JOHAB</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_MAC</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_OEM</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_RUSSIAN</code></td>
+    <td>&#10003; (cp1251)</td>
+    <td>&#10003; (koi8-r)</td>
+    <td>&#10003; (cp1251)</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_SHIFTJIS</code></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_SYMBOL</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_THAI</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_TURKISH</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_VIETNAMESE</code></td>
+    <td>&#10003;</td>
+    <td></td>
+    <td>&#10003;</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_OEM866</code></td>
+    <td></td>
+    <td>&#10003; (cp866)</td>
+    <td></td></tr>
+   <tr>
+    <td><code>SC_CHARSET_CYRILLIC</code></td>
+    <td></td>
+    <td>&#10003; (cp1251)</td>
+    <td>&#10003; (cp1251)</td></tr>
+   <tr>
+    <td><code>SC_CHARSET_8859_15</code></td>
+    <td></td>
+    <td>&#10003;</td>
+    <td>&#10003;</td></tr>
+</tbody></table>
+
+    <p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int style, int caseVisible)</b><br />
+    <b id="SCI_STYLEGETCASE">SCI_STYLEGETCASE(int style) &rarr; int</b><br />
+    The value of <code>caseVisible</code> determines how text is displayed. You can set upper case
+    (<code>SC_CASE_UPPER</code>, 1) or lower case (<code>SC_CASE_LOWER</code>, 2) or camel case (<code>SC_CASE_CAMEL</code>, 3)
+    or display normally (<code>SC_CASE_MIXED</code>, 0). This does not change the stored text, only how it is
+    displayed.</p>
+
+    <p><b id="SCI_STYLESETVISIBLE">SCI_STYLESETVISIBLE(int style, bool visible)</b><br />
+    <b id="SCI_STYLEGETVISIBLE">SCI_STYLEGETVISIBLE(int style) &rarr; bool</b><br />
+    Text is normally visible. However, you can completely hide it by giving it a style with the
+    <code class="parameter">visible</code> set to 0. This could be used to hide embedded formatting instructions or
+    hypertext keywords in HTML or XML.
+    Invisible text may not be deleted by user actions but the application may delete invisible text by calling
+    <a class="seealso" href="#SCI_DELETERANGE">SCI_DELETERANGE</a>.</p>
+
+    <p><b id="SCI_STYLESETCHANGEABLE">SCI_STYLESETCHANGEABLE(int style, bool
+    changeable)</b><br />
+    <b id="SCI_STYLEGETCHANGEABLE">SCI_STYLEGETCHANGEABLE(int style) &rarr; bool</b><br />
+    This is an experimental and incompletely implemented style attribute. The default setting is
+    <code class="parameter">changeable</code> set <code>true</code> but when set <code>false</code> it makes text
+    read-only. The user can not move the caret within not-changeable text and not-changeable
+    text may not be deleted by the user.
+    The application may delete not-changeable text by calling
+    <a class="seealso" href="#SCI_DELETERANGE">SCI_DELETERANGE</a>.</p>
+
+    <p><b id="SCI_STYLESETHOTSPOT">SCI_STYLESETHOTSPOT(int style, bool
+    hotspot)</b><br />
+    <b id="SCI_STYLEGETHOTSPOT">SCI_STYLEGETHOTSPOT(int style) &rarr; bool</b><br />
+    This style is used to mark ranges of text that can detect mouse clicks.
+    The cursor changes to a hand over hotspots, and the foreground, and background colours
+    may change and an underline appear to indicate that these areas are sensitive to clicking.
+    This may be used to allow hyperlinks to other documents.</p>
+
+    <p><b id="SCI_SETFONTLOCALE">SCI_SETFONTLOCALE(&lt;unused&gt;, const char *localeName)</b><br />
+    <b id="SCI_GETFONTLOCALE">SCI_GETFONTLOCALE(&lt;unused&gt;, char *localeName NUL-terminated) &rarr; int</b><br />
+     These messages set the locale used for font selection with language-dependent glyphs.
+     It may, depending on platform and other circumstances influence the display of text, so setting "zh-Hant" may result in traditional
+     Chinese display and "zh-Hans" may result in simplified Chinese display.
+     It is currently only implemented for Win32 using DirectWrite where the value is passed as the localeName argument to CreateTextFormat.
+     The default value is US English "en-us".
+    </p>
+
+    <h2 id="ElementColours">Element colours</h2>
+
+    <p>The colours of some visual elements can be changed with these methods.
+    The available elements often have a defined default colour, sometimes from the system but also from Scintilla.
+    There may be a range of colours and setting an element colour overrides these colours.</p>
+
+    <code>
+    <a class="message" href="#SCI_SETELEMENTCOLOUR">SCI_SETELEMENTCOLOUR(int element, colouralpha colourElement)</a><br />
+    <a class="message" href="#SCI_GETELEMENTCOLOUR">SCI_GETELEMENTCOLOUR(int element) &rarr; colouralpha</a><br />
+    <a class="message" href="#SCI_RESETELEMENTCOLOUR">SCI_RESETELEMENTCOLOUR(int element)</a><br />
+    <a class="message" href="#SCI_GETELEMENTISSET">SCI_GETELEMENTISSET(int element) &rarr; bool</a><br />
+    <a class="message" href="#SCI_GETELEMENTALLOWSTRANSLUCENT">SCI_GETELEMENTALLOWSTRANSLUCENT(int element) &rarr; bool</a><br />
+    <a class="message" href="#SCI_GETELEMENTBASECOLOUR">SCI_GETELEMENTBASECOLOUR(int element) &rarr; colouralpha</a><br />
+    </code>
+
+    <p>
+    <b id="SCI_SETELEMENTCOLOUR">SCI_SETELEMENTCOLOUR(int element, <a class="jump" href="#colouralpha">colouralpha</a> colourElement)</b><br />
+    <b id="SCI_GETELEMENTCOLOUR">SCI_GETELEMENTCOLOUR(int element) &rarr; colouralpha</b><br />
+     This changes the colour of the indicated visual element overriding any current colour.
+     If the element supports translucency, then the alpha portion of the value is used.
+     An opaque alpha value (0xff) should always be included when an opaque colour is desired as the value 0
+     is completely transparent and thus invisible.
+     </p>
+
+    <p>
+    <b id="SCI_RESETELEMENTCOLOUR">SCI_RESETELEMENTCOLOUR(int element)</b><br />
+     This removes the element colour returning to the default colour or set of colours.
+     </p>
+
+    <p>
+    <b id="SCI_GETELEMENTISSET">SCI_GETELEMENTISSET(int element) &rarr; bool</b><br />
+     Returns true when an element colour has been set. When false indicates that a default colour or set of colours is displayed.
+     </p>
+
+    <p>
+    <b id="SCI_GETELEMENTALLOWSTRANSLUCENT">SCI_GETELEMENTALLOWSTRANSLUCENT(int element) &rarr; bool</b><br />
+     Returns true when the element currently allows translucent drawing when an alpha component is included.
+     This may change based on circumstances - different platforms or graphics technologies may implement translucency
+     and newer versions of Scintilla may implement translucency for elements that did not previously support it. 
+     </p>
+     
+    <p>
+    <b id="SCI_GETELEMENTBASECOLOUR">SCI_GETELEMENTBASECOLOUR(int element) &rarr; colouralpha</b><br />
+     Returns the default colour of an element.
+     This may be a value defined by Scintilla or it may be derived from the operating system or platform.
+     Which values are set from the operating system may differ between operating systems and operating system versions. 
+     When undefined the return value is 0 which is equivalent to completely transparent black.
+     These colours may be useful when defining styles with similarities such as synthesizing dark
+     mode styles that use the same colours as the system</p>
+     <p>On Win32, autocompletion list colours like <code>SC_ELEMENT_LIST</code> are currently provided by the platform layer and
+     on Cocoa, selection background colours like <code>SC_ELEMENT_SELECTION_BACK</code> are provided.
+     </p>
+
+     <table class="standard" summary="Elements">
+      <thead align="left">
+        <tr>
+          <th><code>SC_ELEMENT_</code>*</th>
+
+          <th>Value</th>
+
+          <th>Translucent?</th>
+
+          <th>Active</th>
+
+          <th>Base</th>
+
+          <th>Description</th>
+        </tr>
+      </thead>
+       <tbody valign="top">
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_LIST</code></th>
+           <td>0</td>
+           <td>Opaque</td>
+           <td>Win32</td>
+           <td>Win32</td>
+           <td>Text colour in autocompletion lists</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_LIST_BACK</code></th>
+           <td>1</td>
+           <td>Opaque</td>
+           <td>Win32</td>
+           <td>Win32</td>
+           <td>Background colour of autocompletion lists</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_LIST_SELECTED</code></th>
+           <td>2</td>
+           <td>Opaque</td>
+           <td>Win32</td>
+           <td>Win32</td>
+           <td>Text colour of selected item in autocompletion lists</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_LIST_SELECTED_BACK</code></th>
+           <td>3</td>
+           <td>Opaque</td>
+           <td>Win32</td>
+           <td>Win32</td>
+           <td>Background colour of selected item in autocompletion lists</td>
+         </tr>
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_SELECTION_TEXT</code></th>
+           <td>10</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Text colour of main selection</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_BACK</code></th>
+           <td>11</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td>Cocoa</td>
+           <td>Background colour of main selection</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_ADDITIONAL_TEXT</code></th>
+           <td>12</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Text colour of additional selections</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_ADDITIONAL_BACK</code></th>
+           <td>13</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td>Cocoa</td>
+           <td>Background colour of additional selections</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_SECONDARY_TEXT</code></th>
+           <td>14</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Text colour of selections when another window contains the primary selection</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_SECONDARY_BACK</code></th>
+           <td>15</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Background colour of selections when another window contains the primary selection</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_INACTIVE_TEXT</code></th>
+           <td>16</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Text colour of selections when another window has focus</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_SELECTION_INACTIVE_BACK</code></th>
+           <td>17</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td>Cocoa</td>
+           <td>Background colour of selections when another window has focus</td>
+         </tr>
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_CARET</code></th>
+           <td>40</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Colour of caret for main selection</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_CARET_ADDITIONAL</code></th>
+           <td>41</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Colour of caret for additional selections</td>
+         </tr>
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_CARET_LINE_BACK</code></th>
+           <td>50</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Colour of caret line background</td>
+         </tr>
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_WHITE_SPACE</code></th>
+           <td>60</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Colour of visible white space</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_WHITE_SPACE_BACK</code></th>
+           <td>61</td>
+           <td>Opaque</td>
+           <td>All</td>
+           <td></td>
+           <td>Colour of visible white space background</td>
+         </tr>
+         <tr class="section">
+           <th align="left"><code>SC_ELEMENT_HOT_SPOT_ACTIVE</code></th>
+           <td>70</td>
+           <td>Translucent</td>
+           <td>All</td>
+           <td></td>
+           <td>Text colour of active hot spot</td>
+         </tr>
+         <tr>
+           <th align="left"><code>SC_ELEMENT_HOT_SPOT_ACTIVE_BACK</code></th>
+           <td>71</td>
+           <td>Opaque</td>
+           <td>All</td>
+           <td></td>
+           <td>Background colour of active hot spot</td>
+         </tr>
+       </tbody>
+     </table>
+
+    <h2 id="CaretAndSelectionStyles">Selection, caret, and hotspot styles</h2>
+
+    <p>The selection is shown by changing the text and/or background colours.
+    If the selected text colour is not set then that attribute is not changed for the selection.
+    The default is to show the
+    selection by changing the background and leaving the foreground the same as when
+    it was not selected. When there is no selection, the current insertion point is marked by the
+    text caret. This is a vertical line that is normally blinking on and off to attract the users
+    attention.</p>
+    <p>On most platforms, a default grey selection background is used but, on macOS, the system-defined
+    selection background is used. The application can call APIs to change the colours used.</p>
+    <code>
+    <a class="element" href="#SC_ELEMENT_SELECTION_TEXT">SC_ELEMENT_SELECTION_TEXT : colouralpha</a><br />
+    <a class="discouraged message" href="#SCI_SETSELFORE">SCI_SETSELFORE(bool useSetting, colour fore)</a><br />
+    <a class="element" href="#SC_ELEMENT_SELECTION_BACK">SC_ELEMENT_SELECTION_BACK : colouralpha</a><br />
+    <a class="discouraged message" href="#SCI_SETSELBACK">SCI_SETSELBACK(bool useSetting, colour back)</a><br />
+    <a class="message" href="#SCI_SETSELECTIONLAYER">SCI_SETSELECTIONLAYER(int layer)</a><br />
+    <a class="message" href="#SCI_GETSELECTIONLAYER">SCI_GETSELECTIONLAYER &rarr; int</a><br />
+    <a class="discouraged message" href="#SCI_SETSELALPHA">SCI_SETSELALPHA(alpha alpha)</a><br />
+    <a class="discouraged message" href="#SCI_GETSELALPHA">SCI_GETSELALPHA &rarr; int</a><br />
+    <a class="message" href="#SCI_SETSELEOLFILLED">SCI_SETSELEOLFILLED(bool filled)</a><br />
+    <a class="message" href="#SCI_GETSELEOLFILLED">SCI_GETSELEOLFILLED &rarr; bool</a><br />
+    <br />
+    <a class="element" href="#SC_ELEMENT_CARET">SC_ELEMENT_CARET : colouralpha</a><br />
+    <a class="discouraged message" href="#SCI_SETCARETFORE">SCI_SETCARETFORE(colour fore)</a><br />
+    <a class="discouraged message" href="#SCI_GETCARETFORE">SCI_GETCARETFORE &rarr; colour</a><br />
+    <br />
+    <a class="element" href="#SC_ELEMENT_SELECTION_SECONDARY_TEXT">SC_ELEMENT_SELECTION_SECONDARY_TEXT : colouralpha</a><br />
+    <a class="element" href="#SC_ELEMENT_SELECTION_SECONDARY_BACK">SC_ELEMENT_SELECTION_SECONDARY_BACK : colouralpha</a><br />
+    <br />
+    <a class="element" href="#SC_ELEMENT_SELECTION_INACTIVE_TEXT">SC_ELEMENT_SELECTION_INACTIVE_TEXT : colouralpha</a><br />
+    <a class="element" href="#SC_ELEMENT_SELECTION_INACTIVE_BACK">SC_ELEMENT_SELECTION_INACTIVE_BACK : colouralpha</a><br />
+    <br />
+    <a class="element" href="#SC_ELEMENT_CARET_LINE_BACK">SC_ELEMENT_CARET_LINE_BACK : colouralpha</a><br />
+    <a class="message" href="#SCI_SETCARETLINELAYER">SCI_SETCARETLINELAYER(int layer)</a><br />
+    <a class="message" href="#SCI_GETCARETLINELAYER">SCI_GETCARETLINELAYER &rarr; int</a><br />
+    <a class="discouraged message" href="#SCI_SETCARETLINEVISIBLE">SCI_SETCARETLINEVISIBLE(bool show)</a><br />
+    <a class="discouraged message" href="#SCI_GETCARETLINEVISIBLE">SCI_GETCARETLINEVISIBLE &rarr; bool</a><br />
+    <a class="discouraged message" href="#SCI_SETCARETLINEBACK">SCI_SETCARETLINEBACK(colour back)</a><br />
+    <a class="discouraged message" href="#SCI_GETCARETLINEBACK">SCI_GETCARETLINEBACK &rarr; colour</a><br />
+    <a class="discouraged message" href="#SCI_SETCARETLINEBACKALPHA">SCI_SETCARETLINEBACKALPHA(alpha alpha)</a><br />
+    <a class="discouraged message" href="#SCI_GETCARETLINEBACKALPHA">SCI_GETCARETLINEBACKALPHA &rarr; int</a><br />
+    <a class="message" href="#SCI_SETCARETLINEFRAME">SCI_SETCARETLINEFRAME(int width)</a><br />
+    <a class="message" href="#SCI_GETCARETLINEFRAME">SCI_GETCARETLINEFRAME &rarr; int</a><br />
+    <a class="message" href="#SCI_SETCARETLINEVISIBLEALWAYS">SCI_SETCARETLINEVISIBLEALWAYS(bool alwaysVisible)</a><br />
+    <a class="message" href="#SCI_GETCARETLINEVISIBLEALWAYS">SCI_GETCARETLINEVISIBLEALWAYS &rarr; bool</a><br />
+    <br />
+    <a class="message" href="#SCI_SETCARETPERIOD">SCI_SETCARETPERIOD(int periodMilliseconds)</a><br />
+    <a class="message" href="#SCI_GETCARETPERIOD">SCI_GETCARETPERIOD &rarr; int</a><br />
+    <a class="message" href="#SCI_SETCARETSTYLE">SCI_SETCARETSTYLE(int caretStyle)</a><br />
+    <a class="message" href="#SCI_GETCARETSTYLE">SCI_GETCARETSTYLE &rarr; int</a><br />
+    <a class="message" href="#SCI_SETCARETWIDTH">SCI_SETCARETWIDTH(int pixelWidth)</a><br />
+    <a class="message" href="#SCI_GETCARETWIDTH">SCI_GETCARETWIDTH &rarr; int</a><br />
+     <a class="message" href="#SCI_SETCARETSTICKY">SCI_SETCARETSTICKY(int useCaretStickyBehaviour)</a><br />
+     <a class="message" href="#SCI_GETCARETSTICKY">SCI_GETCARETSTICKY &rarr; int</a><br />
+     <a class="message" href="#SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</a><br />
+    <br />
+    <a class="element" href="#SC_ELEMENT_HOT_SPOT_ACTIVE">SC_ELEMENT_HOT_SPOT_ACTIVE : colouralpha</a><br />
+    <a class="discouraged message" href="#SCI_SETHOTSPOTACTIVEFORE">SCI_SETHOTSPOTACTIVEFORE(bool useSetting, colour fore)</a><br />
+    <a class="discouraged message" href="#SCI_GETHOTSPOTACTIVEFORE">SCI_GETHOTSPOTACTIVEFORE &rarr; colour</a><br />
+    <a class="element" href="#SC_ELEMENT_HOT_SPOT_ACTIVE_BACK">SC_ELEMENT_HOT_SPOT_ACTIVE_BACK : colouralpha</a><br />
+    <a class="discouraged message" href="#SCI_SETHOTSPOTACTIVEBACK">SCI_SETHOTSPOTACTIVEBACK(bool useSetting, colour back)</a><br />
+    <a class="discouraged message" href="#SCI_GETHOTSPOTACTIVEBACK">SCI_GETHOTSPOTACTIVEBACK &rarr; colour</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTACTIVEUNDERLINE">SCI_SETHOTSPOTACTIVEUNDERLINE(bool underline)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTACTIVEUNDERLINE">SCI_GETHOTSPOTACTIVEUNDERLINE &rarr; bool</a><br />
+    <a class="message" href="#SCI_SETHOTSPOTSINGLELINE">SCI_SETHOTSPOTSINGLELINE(bool singleLine)</a><br />
+    <a class="message" href="#SCI_GETHOTSPOTSINGLELINE">SCI_GETHOTSPOTSINGLELINE &rarr; bool</a><br />
+    </code>
+
+    <p>
+     <b id="SC_ELEMENT_SELECTION_TEXT">SC_ELEMENT_SELECTION_TEXT : colouralpha</b><br />
+     <b id="SCI_SETSELFORE">SCI_SETSELFORE(bool useSetting, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SC_ELEMENT_SELECTION_BACK">SC_ELEMENT_SELECTION_BACK : colouralpha</b><br />
+     <b id="SCI_SETSELBACK">SCI_SETSELBACK(bool useSetting, <a class="jump" href="#colour">colour</a> back)</b><br />
+     You can choose to override the default selection colouring with these elements and messages.
+     The <a href="#ElementColours">element APIs</a> are now preferred as they handle translucency + layering and
+     cooperation with defaults better.
+     With the messages, the colour
+    you provide is used if you set <code class="parameter">useSetting</code> to <code>true</code>. If it is
+    set to <code>false</code>, the default styled colouring is used and the
+    <code class="parameter">fore</code> or <code class="parameter">back</code>
+    argument has no effect.</p>
+
+     <p><b id="SCI_SETSELECTIONLAYER">SCI_SETSELECTIONLAYER(int layer)</b><br />
+     <b id="SCI_GETSELECTIONLAYER">SCI_GETSELECTIONLAYER &rarr; int</b><br />
+     The selection background can be drawn translucently over the text
+     or opaquely on the base layer.
+     The <code class="parameter">layer</code> argument can be one of:</p>
+
+    <table class="standard" summary="Layer">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_LAYER_BASE</code></th>
+
+          <td>0</td>
+
+          <td>Draw the selection background opaquely on the base layer</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_UNDER_TEXT</code></th>
+
+          <td>1</td>
+
+          <td>Draw the selection background translucently under the text.<br />
+	  This will not work in single phase drawing mode (<code class="deprecated">SC_PHASES_ONE</code>)
+	  as there is no under-text phase.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_OVER_TEXT</code></th>
+
+          <td>2</td>
+
+          <td>Draw the selection background translucently over the text.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+     <p><b id="SCI_SETSELALPHA">SCI_SETSELALPHA(<a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     <b id="SCI_GETSELALPHA">SCI_GETSELALPHA &rarr; int</b><br />
+     These APIs are now discouraged and should be replaced with 
+     a combination of setting the layer with SCI_SETSELECTIONLAYER and
+     setting translucency through the SC_ELEMENT_SELECTION_BACK element.</p>
+
+     <p><b id="SCI_SETSELEOLFILLED">SCI_SETSELEOLFILLED(bool filled)</b><br />
+     <b id="SCI_GETSELEOLFILLED">SCI_GETSELEOLFILLED &rarr; bool</b><br />
+     The selection can be drawn up to the right hand border by setting this property.</p>
+
+    <p>
+     <b id="SC_ELEMENT_CARET">SC_ELEMENT_CARET : colouralpha</b><br />
+     <b id="SCI_SETCARETFORE">SCI_SETCARETFORE(<a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_GETCARETFORE">SCI_GETCARETFORE &rarr; colour</b><br />
+     The colour of the caret can be set with
+     <a class="message" href="#SCI_SETELEMENTCOLOUR"><code>SCI_SETELEMENTCOLOUR(SC_ELEMENT_CARET)</code></a> or
+     <code>SCI_SETCARETFORE</code> and retrieved with
+     <a class="message" href="#SCI_GETELEMENTCOLOUR"><code>SCI_GETELEMENTCOLOUR(SC_ELEMENT_CARET)</code></a> or
+     <code>SCI_GETCARETFORE</code>.
+     The element APIs are preferred and allow setting the translucency of carets.</p>
+
+    <p>
+     <b id="SC_ELEMENT_SELECTION_SECONDARY_TEXT">SC_ELEMENT_SELECTION_SECONDARY_TEXT : colouralpha</b><br />
+     <b id="SC_ELEMENT_SELECTION_SECONDARY_BACK">SC_ELEMENT_SELECTION_SECONDARY_BACK : colouralpha</b><br />
+     On Unix systems running with the X window system or Wayland there is a 'primary selection' which is the text most recently
+     selected in any application and which can be pasted by a middle button click.
+     When working with a selection, it is commonly the primary selection so Scintilla draws the primary selection with the main and additional
+     colours defined earlier. When another application takes over the primary selection, these <code>_SECONDARY</code> colours are used.
+     They are commonly defined as grey to highlight that it is the selection in the other application that is now available as primary.
+     </p>
+
+    <p>
+     <b id="SC_ELEMENT_SELECTION_INACTIVE_TEXT">SC_ELEMENT_SELECTION_INACTIVE_TEXT : colouralpha</b><br />
+     <b id="SC_ELEMENT_SELECTION_INACTIVE_BACK">SC_ELEMENT_SELECTION_INACTIVE_BACK : colouralpha</b><br />
+     When a window no longer has the keyboard focus, it is customary to make its selection less noticeable by colouring it grey.
+     These elements define the colours to be used for selections without focus.
+     </p>
+
+    <p>
+    <b id="SC_ELEMENT_CARET_LINE_BACK">SC_ELEMENT_CARET_LINE_BACK : colouralpha</b><br />
+    <b id="SCI_SETCARETLINELAYER">SCI_SETCARETLINELAYER(int layer)</b><br />
+    <b id="SCI_GETCARETLINELAYER">SCI_GETCARETLINELAYER &rarr; int</b><br />
+     You can choose to make the background colour of the line containing the caret different by setting the
+     <code>SC_ELEMENT_CARET_LINE_BACK</code> element with
+     <a class="message" href="#SCI_SETELEMENTCOLOUR"><code>SCI_SETELEMENTCOLOUR(SC_ELEMENT_CARET_LINE_BACK)</code></a>.
+    This effect may be drawn translucently over the text or opaquely on the base layer with <code>SCI_SETCARETLINELAYER</code>.
+    Background colouring has highest priority when a line has markers that would otherwise change
+    the background colour. When drawn translucently other background colours can show through.
+    The <code class="parameter">layer</code> argument can be one of:</p>
+
+    <table class="standard" summary="Layer">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_LAYER_BASE</code></th>
+
+          <td>0</td>
+
+          <td>Draw the selection background opaquely on the base layer</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_UNDER_TEXT</code></th>
+
+          <td>1</td>
+
+          <td>Draw the selection background translucently under the text.<br />
+	  This will not work in single phase drawing mode (<code class="deprecated">SC_PHASES_ONE</code>)
+	  as there is no under-text phase.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_OVER_TEXT</code></th>
+
+          <td>2</td>
+
+          <td>Draw the selection background translucently over the text.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETCARETLINEVISIBLE">SCI_SETCARETLINEVISIBLE(bool show)</b><br />
+     <b id="SCI_GETCARETLINEVISIBLE">SCI_GETCARETLINEVISIBLE &rarr; bool</b><br />
+     <b id="SCI_SETCARETLINEBACK">SCI_SETCARETLINEBACK(<a class="jump" href="#colour">colour</a> back)</b><br />
+     <b id="SCI_GETCARETLINEBACK">SCI_GETCARETLINEBACK &rarr; colour</b><br />
+     <b id="SCI_SETCARETLINEBACKALPHA">SCI_SETCARETLINEBACKALPHA(<a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     <b id="SCI_GETCARETLINEBACKALPHA">SCI_GETCARETLINEBACKALPHA &rarr; int</b><br />
+     These APIs are discouraged. It is better to use the <code>SC_ELEMENT_CARET_LINE_BACK</code>
+     element mentioned in the previous section.<br />
+     You can choose to make the background colour of the line containing the caret different with
+    these messages. To do this, set the desired background colour with
+    <code>SCI_SETCARETLINEBACK</code>, then use <code>SCI_SETCARETLINEVISIBLE(true)</code> to
+    enable the effect. You can cancel the effect with <code>SCI_SETCARETLINEVISIBLE(false)</code>.
+    The two <code>SCI_GETCARET*</code> functions return the state and the colour. This form of
+    background colouring has highest priority when a line has markers that would otherwise change
+    the background colour.
+           The caret line may also be drawn translucently which allows other background colours to show
+           through. This is done by setting the alpha (translucency) value by calling
+           SCI_SETCARETLINEBACKALPHA. When the alpha is not SC_ALPHA_NOALPHA,
+           the caret line is drawn after all other features so will affect the colour of all other features.
+          </p>
+
+     <p>
+     <b id="SCI_SETCARETLINEFRAME">SCI_SETCARETLINEFRAME(int width)</b><br />
+     <b id="SCI_GETCARETLINEFRAME">SCI_GETCARETLINEFRAME &rarr; int</b><br />
+           <code>SCI_SETCARETLINEFRAME</code> can be used to display the caret line framed
+           instead of filling the whole background. Set width != 0 to enable this option and width = 0 to disable it.
+     </p>
+
+    <p><b id="SCI_SETCARETLINEVISIBLEALWAYS">SCI_SETCARETLINEVISIBLEALWAYS(bool alwaysVisible)</b><br />
+     <b id="SCI_GETCARETLINEVISIBLEALWAYS">SCI_GETCARETLINEVISIBLEALWAYS &rarr; bool</b><br />
+     Choose to make the caret line always visible even when the window is not in focus.
+     Default behaviour <code>SCI_SETCARETLINEVISIBLEALWAYS(false)</code> the caret line is only visible when the window is in focus.
+          </p>
+
+    <p><b id="SCI_SETCARETPERIOD">SCI_SETCARETPERIOD(int periodMilliseconds)</b><br />
+     <b id="SCI_GETCARETPERIOD">SCI_GETCARETPERIOD &rarr; int</b><br />
+     The rate at which the caret blinks can be set with <code>SCI_SETCARETPERIOD</code> which
+    determines the time in milliseconds that the caret is visible or invisible before changing
+    state. Setting the period to 0 stops the caret blinking. The default value is 500 milliseconds.
+    <code>SCI_GETCARETPERIOD</code> returns the current setting.</p>
+
+    <p><b id="SCI_SETCARETSTYLE">SCI_SETCARETSTYLE(int caretStyle)</b><br />
+     <b id="SCI_GETCARETSTYLE">SCI_GETCARETSTYLE &rarr; int</b><br />
+     The style of the caret can be set with <code>SCI_SETCARETSTYLE</code>.
+     There are separate styles for insert mode (lower 4-bits, <code>CARETSTYLE_INS_MASK</code>) and
+     overtype mode (bit 4).
+
+     <table class="standard" summary="Caret Styles">
+       <tbody valign="top">
+         <tr>
+           <th align="left"><code>CARETSTYLE_INVISIBLE</code></th>
+           <td>0</td>
+           <td>Carets are not drawn at all.</td>
+         </tr>
+         <tr>
+           <th align="left"><code>CARETSTYLE_LINE</code></th>
+           <td>1</td>
+           <td>Draws insertion carets as lines. This is the default.</td>
+         </tr>
+         <tr>
+           <th align="left"><code>CARETSTYLE_BLOCK</code></th>
+           <td>2</td>
+           <td>Draws insertion carets as blocks.</td>
+         </tr>
+         <tr>
+           <th align="left"><code>CARETSTYLE_OVERSTRIKE_BAR</code></th>
+           <td>0</td>
+           <td>Draws an overstrike caret as a bar. This is the default.</td>
+         </tr>
+         <tr>
+           <th align="left"><code>CARETSTYLE_OVERSTRIKE_BLOCK</code></th>
+           <td>16</td>
+           <td>Draws an overstrike caret as a block. This should be ored with one of the first three styles.</td>
+         </tr>
+         <tr>
+           <th align="left"><code>CARETSTYLE_BLOCK_AFTER</code></th>
+           <td>256</td>
+           <td>When the caret end of a range is at the end and a block caret style is chosen, draws the block
+           outside the selection instead of inside. This can be ored with <code>CARETSTYLE_BLOCK</code> or <code>CARETSTYLE_CURSES</code>.</td>
+         </tr>
+       </tbody>
+     </table>
+
+    <p>The block caret draws most combining and multibyte character sequences successfully,
+    though some fonts like Thai Fonts (and possibly others) can sometimes appear strange when
+    the cursor is positioned at these characters, which may result in only drawing a part of the
+    cursor character sequence. This is most notable on Windows platforms.</p>
+
+    <p><b id="SCI_SETCARETWIDTH">SCI_SETCARETWIDTH(int pixelWidth)</b><br />
+     <b id="SCI_GETCARETWIDTH">SCI_GETCARETWIDTH &rarr; int</b><br />
+     The width of the line caret can be set with <code>SCI_SETCARETWIDTH</code> to a value of
+    between 0 and 20 pixels. The default width is 1 pixel. You can read back the current width with
+    <code>SCI_GETCARETWIDTH</code>. A width of 0 makes the caret invisible,
+    similar to setting the caret style to CARETSTYLE_INVISIBLE (though not interchangeable).
+    This setting only affects the width of the cursor when the cursor style is set to line caret
+    mode, it does not affect the width for a block caret.</p>
+
+    <p><b id="SCI_SETCARETSTICKY">SCI_SETCARETSTICKY(int useCaretStickyBehaviour)</b><br />
+    <b id="SCI_GETCARETSTICKY">SCI_GETCARETSTICKY &rarr; int</b><br />
+    <b id="SCI_TOGGLECARETSTICKY">SCI_TOGGLECARETSTICKY</b><br />
+    These messages set, get or toggle the caretSticky setting which controls when the last position
+    of the caret on the line is saved.</p>
+
+    <p>When set to <code>SC_CARETSTICKY_OFF</code> (0), the sticky flag is off; all text changes
+    (and all caret position changes) will remember the
+    caret's new horizontal position when moving to different lines. This is the default.</p>
+
+    <p>When set to <code>SC_CARETSTICKY_ON</code> (1), the sticky flag is on, and the only thing which will cause the editor to remember the
+    horizontal caret position is moving the caret with mouse or keyboard (left/right arrow keys, home/end keys, etc). </p>
+
+    <p>When set to <code>SC_CARETSTICKY_WHITESPACE</code> (2), the caret acts like mode 0 (sticky off) except under one
+    special case; when space or tab characters are inserted. (Including pasting <b>only space/tabs</b> -- undo, redo,
+    etc. do not exhibit this behaviour..).</p>
+
+    <p><code>SCI_TOGGLECARETSTICKY</code> switches from <code>SC_CARETSTICKY_ON</code> and <code>SC_CARETSTICKY_WHITESPACE</code>
+    to <code>SC_CARETSTICKY_OFF</code> and from <code>SC_CARETSTICKY_OFF</code> to <code>SC_CARETSTICKY_ON</code>.</p>
+
+    <p>
+    <b id="SC_ELEMENT_HOT_SPOT_ACTIVE">SC_ELEMENT_HOT_SPOT_ACTIVE : colouralpha</b><br />
+    <b id="SCI_SETHOTSPOTACTIVEFORE">SCI_SETHOTSPOTACTIVEFORE(bool useSetting, <a class="jump" href="#colour">colour</a> fore)</b><br />
+    <b id="SCI_GETHOTSPOTACTIVEFORE">SCI_GETHOTSPOTACTIVEFORE &rarr; colour</b><br />
+    <b id="SC_ELEMENT_HOT_SPOT_ACTIVE_BACK">SC_ELEMENT_HOT_SPOT_ACTIVE_BACK : colouralpha</b><br />
+    <b id="SCI_SETHOTSPOTACTIVEBACK">SCI_SETHOTSPOTACTIVEBACK(bool useSetting,
+    <a class="jump" href="#colour">colour</a> back)</b><br />
+    <b id="SCI_GETHOTSPOTACTIVEBACK">SCI_GETHOTSPOTACTIVEBACK &rarr; colour</b><br />
+    <b id="SCI_SETHOTSPOTACTIVEUNDERLINE">SCI_SETHOTSPOTACTIVEUNDERLINE(bool underline)</b><br />
+     <b id="SCI_GETHOTSPOTACTIVEUNDERLINE">SCI_GETHOTSPOTACTIVEUNDERLINE &rarr; bool</b><br />
+    <b id="SCI_SETHOTSPOTSINGLELINE">SCI_SETHOTSPOTSINGLELINE(bool singleLine)</b><br />
+     <b id="SCI_GETHOTSPOTSINGLELINE">SCI_GETHOTSPOTSINGLELINE &rarr; bool</b><br />
+    While the cursor hovers over text in a style with the hotspot attribute set,
+    the default colouring can be modified and an underline drawn with these settings.
+    Single line mode stops a hotspot from wrapping onto next line.</p>
+
+    <h2 id="CharacterRepresentations">Character representations</h2>
+
+    <p>Some characters, such as control characters and invalid bytes, do not have a visual glyph or use a glyph that is hard to distinguish.</p>
+
+    <p>Control characters (characters with codes less than 32, or between 128 and 159 in some encodings)
+    are displayed by Scintilla using their mnemonics inverted in a rounded rectangle. These mnemonics come from the
+    early days of signalling, though some are still used (LF = Line Feed, BS = Back Space, CR =
+    Carriage Return, for example).</p>
+
+    <p>For the low 'C0' values: "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".</p>
+
+    <p>For the high 'C1' values:
+       "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".</p>
+
+    <p>Invalid bytes are shown in a similar way with an 'x' followed by their value in hexadecimal, like "xFE".</p>
+
+    <code>
+     <a class="message" href="#SCI_SETREPRESENTATION">SCI_SETREPRESENTATION(const char *encodedCharacter, const char *representation)</a><br />
+     <a class="message" href="#SCI_GETREPRESENTATION">SCI_GETREPRESENTATION(const char *encodedCharacter, char *representation) &rarr; int</a><br />
+     <a class="message" href="#SCI_CLEARREPRESENTATION">SCI_CLEARREPRESENTATION(const char *encodedCharacter)</a><br />
+     <a class="message" href="#SCI_CLEARALLREPRESENTATIONS">SCI_CLEARALLREPRESENTATIONS</a><br />
+     <a class="message" href="#SCI_SETREPRESENTATIONAPPEARANCE">SCI_SETREPRESENTATIONAPPEARANCE(const char *encodedCharacter, int appearance)</a><br />
+     <a class="message" href="#SCI_GETREPRESENTATIONAPPEARANCE">SCI_GETREPRESENTATIONAPPEARANCE(const char *encodedCharacter) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETREPRESENTATIONCOLOUR">SCI_SETREPRESENTATIONCOLOUR(const char *encodedCharacter, colouralpha colour)</a><br />
+     <a class="message" href="#SCI_GETREPRESENTATIONCOLOUR">SCI_GETREPRESENTATIONCOLOUR(const char *encodedCharacter) &rarr; colouralpha</a><br />
+     <a class="message" href="#SCI_SETCONTROLCHARSYMBOL">SCI_SETCONTROLCHARSYMBOL(int symbol)</a><br />
+     <a class="message" href="#SCI_GETCONTROLCHARSYMBOL">SCI_GETCONTROLCHARSYMBOL &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETREPRESENTATION">SCI_SETREPRESENTATION(const char *encodedCharacter, const char *representation)</b><br />
+     <b id="SCI_GETREPRESENTATION">SCI_GETREPRESENTATION(const char *encodedCharacter, char *representation NUL-terminated) &rarr; int</b><br />
+     <b id="SCI_CLEARREPRESENTATION">SCI_CLEARREPRESENTATION(const char *encodedCharacter)</b><br />
+    Any character, including those normally displayed  as mnemonics may be represented by a
+    Unicode string inverted in a rounded rectangle.</p>
+
+    <p>For example, the Ohm sign &#x2126; U+2126 looks very similar to the Greek Omega character &#x3a9; U+03C9 so,
+    for the UTF-8 encoding, to distinguish the Ohm sign as "U+2126 &#x2126;" this call could be made:
+    <code>SCI_SETREPRESENTATION("\xe2\x84\xa6", "U+2126 \xe2\x84\xa6")</code></p>
+
+    <p>The <code class="parameter">encodedCharacter</code> parameter is a NUL-terminated string of the bytes for one character in the
+    current encoding. This can not be used to set a representation for multiple-character strings. </p>
+
+    <p>The <code class="parameter">representation</code> parameter is a NUL-terminated UTF-8 string with a maximum length of 200 bytes.</p>
+
+    <p>One exception to the single character restriction is that the two character sequence "\r\n" (Carriage Return + Line Feed)
+    can have a representation that is visible in line end viewing (<a class="seealso" href="#SCI_SETVIEWEOL">SCI_SETVIEWEOL</a>) mode.
+    If there is no representation for "\r\n" then the individual '\r' and '\n' representations will be seen.</p>
+
+    <p>The NUL (0) character is a special case since the <code class="parameter">encodedCharacter</code> parameter is NUL terminated, the NUL
+    character is specified as an empty string.</p>
+
+    <p><b id="SCI_CLEARALLREPRESENTATIONS">SCI_CLEARALLREPRESENTATIONS</b><br />
+    Reset representations to defaults with <code>SCI_CLEARALLREPRESENTATIONS</code>.</p>
+
+    <p><b id="SCI_SETREPRESENTATIONAPPEARANCE">SCI_SETREPRESENTATIONAPPEARANCE(const char *encodedCharacter, int appearance)</b><br />
+     <b id="SCI_GETREPRESENTATIONAPPEARANCE">SCI_GETREPRESENTATIONAPPEARANCE(const char *encodedCharacter) &rarr; int</b><br />
+    The appearance may be changed using these flags. If a colour is set and the appearance is set without
+    <code>SC_REPRESENTATION_COLOUR</code> then the representation will show in the colour of the underlying text.</p>
+
+    <table class="standard" summary="Layer">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_REPRESENTATION_PLAIN</code></th>
+
+          <td>0</td>
+
+          <td>Draw the representation text with no decorations.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_REPRESENTATION_BLOB</code></th>
+
+          <td>1</td>
+
+          <td>Draw the representation text inverted in a rounded rectangle. This is the default appearance.</td>
+        </tr>
+
+        <tr class="section">
+          <th align="left"><code>SC_REPRESENTATION_COLOUR</code></th>
+
+          <td>0x10</td>
+
+          <td>Draw the representation in the colour set with <a class="seealso" href="#SCI_SETREPRESENTATIONCOLOUR">SCI_SETREPRESENTATIONCOLOUR</a>
+	  instead of in the colour of the style of the text being represented.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+
+    <p><b id="SCI_SETREPRESENTATIONCOLOUR">SCI_SETREPRESENTATIONCOLOUR(const char *encodedCharacter, colouralpha colour)</b><br />
+     <b id="SCI_GETREPRESENTATIONCOLOUR">SCI_GETREPRESENTATIONCOLOUR(const char *encodedCharacter) &rarr; colouralpha</b><br />
+    The colour and translucency of a representation may be set.</p>
+
+    <p><b id="SCI_SETCONTROLCHARSYMBOL">SCI_SETCONTROLCHARSYMBOL(int symbol)</b><br />
+     <b id="SCI_GETCONTROLCHARSYMBOL">SCI_GETCONTROLCHARSYMBOL &rarr; int</b><br />
+    The mnemonics may be replaced by a nominated symbol with an ASCII code in the
+    range 32 to 255. If you set a symbol value less than 32, all control characters are displayed
+    as mnemonics. The symbol you set is rendered in the font of the style set for the character.
+    You can read back the current symbol with the <code>SCI_GETCONTROLCHARSYMBOL</code> message.
+    The default symbol value is 0.</p>
+
+    <h2 id="Margins">Margins</h2>
+
+    <p>There may be multiple margins to the left of the text display plus a gap either side of the text.
+    5 margins are allocated initially numbered from 0 to <code>SC_MAX_MARGIN</code> (4)
+    but this may be changed by calling
+    <a class="message" href="#SCI_SETMARGINS"><code>SCI_SETMARGINS</code></a>.
+    Each margin can be set to display only symbols, line numbers, or text with
+    <a class="message" href="#SCI_SETMARGINTYPEN"><code>SCI_SETMARGINTYPEN</code></a>.
+    Textual margins may also display symbols.
+    The markers
+    that can be displayed in each margin are set with <a class="message"
+    href="#SCI_SETMARGINMASKN"><code>SCI_SETMARGINMASKN</code></a>. Any markers not associated with
+    a visible margin will be displayed as changes in background colour in the text. A width in
+    pixels can be set for each margin. Margins with a zero width are ignored completely. You can
+    choose if a mouse click in a margin sends a <a class="message"
+    href="#SCN_MARGINCLICK"><code>SCN_MARGINCLICK</code></a> or <a class="message"
+    href="#SCN_MARGINRIGHTCLICK"><code>SCN_MARGINRIGHTCLICK</code></a> notification to the container or
+    selects a line of text.</p>
+
+    <p>Using a margin number outside the valid range has no
+    effect. By default, margin 0 is set to display line numbers, but is given a width of 0, so it
+    is hidden. Margin 1 is set to display non-folding symbols and is given a width of 16 pixels, so
+    it is visible. Margin 2 is set to display the folding symbols, but is given a width of 0, so it
+    is hidden. Of course, you can set the margins to be whatever you wish.</p>
+
+    <p>Styled text margins used to show revision and blame information:</p>
+    <p><img src="styledmargin.png" alt="Styled text margins used to show revision and blame information" /></p>
+
+    <code>
+     <a class="message" href="#SCI_SETMARGINS">SCI_SETMARGINS(int margins)</a><br />
+     <a class="message" href="#SCI_GETMARGINS">SCI_GETMARGINS &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINTYPEN">SCI_SETMARGINTYPEN(int margin, int marginType)</a><br />
+     <a class="message" href="#SCI_GETMARGINTYPEN">SCI_GETMARGINTYPEN(int margin) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINWIDTHN">SCI_SETMARGINWIDTHN(int margin, int
+    pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETMARGINWIDTHN">SCI_GETMARGINWIDTHN(int margin) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINMASKN">SCI_SETMARGINMASKN(int margin, int
+    mask)</a><br />
+     <a class="message" href="#SCI_GETMARGINMASKN">SCI_GETMARGINMASKN(int margin) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINSENSITIVEN">SCI_SETMARGINSENSITIVEN(int margin, bool
+    sensitive)</a><br />
+     <a class="message" href="#SCI_GETMARGINSENSITIVEN">SCI_GETMARGINSENSITIVEN(int margin) &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETMARGINCURSORN">SCI_SETMARGINCURSORN(int margin, int
+    cursor)</a><br />
+     <a class="message" href="#SCI_GETMARGINCURSORN">SCI_GETMARGINCURSORN(int margin) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINBACKN">SCI_SETMARGINBACKN(int margin, colour back)</a><br />
+     <a class="message" href="#SCI_GETMARGINBACKN">SCI_GETMARGINBACKN(int margin) &rarr; colour</a><br />
+     <a class="message" href="#SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int
+    pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETMARGINLEFT">SCI_GETMARGINLEFT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINRIGHT">SCI_SETMARGINRIGHT(&lt;unused&gt;, int
+    pixelWidth)</a><br />
+     <a class="message" href="#SCI_GETMARGINRIGHT">SCI_GETMARGINRIGHT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETFOLDMARGINCOLOUR">SCI_SETFOLDMARGINCOLOUR(bool useSetting, colour back)</a><br />
+     <a class="message" href="#SCI_SETFOLDMARGINHICOLOUR">SCI_SETFOLDMARGINHICOLOUR(bool useSetting, colour fore)</a><br />
+     <a class="message" href="#SCI_MARGINSETTEXT">SCI_MARGINSETTEXT(line line, const char *text)</a><br />
+     <a class="message" href="#SCI_MARGINGETTEXT">SCI_MARGINGETTEXT(line line, char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARGINSETSTYLE">SCI_MARGINSETSTYLE(line line, int style)</a><br />
+     <a class="message" href="#SCI_MARGINGETSTYLE">SCI_MARGINGETSTYLE(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARGINSETSTYLES">SCI_MARGINSETSTYLES(line line, const char *styles)</a><br />
+     <a class="message" href="#SCI_MARGINGETSTYLES">SCI_MARGINGETSTYLES(line line, char *styles) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARGINTEXTCLEARALL">SCI_MARGINTEXTCLEARALL</a><br />
+     <a class="message" href="#SCI_MARGINSETSTYLEOFFSET">SCI_MARGINSETSTYLEOFFSET(int style)</a><br />
+     <a class="message" href="#SCI_MARGINGETSTYLEOFFSET">SCI_MARGINGETSTYLEOFFSET &rarr; int</a><br />
+     <a class="message" href="#SCI_SETMARGINOPTIONS">SCI_SETMARGINOPTIONS(int marginOptions)</a><br />
+     <a class="message" href="#SCI_GETMARGINOPTIONS">SCI_GETMARGINOPTIONS &rarr; int</a><br />
+    </code>
+
+<p><b id="SCI_SETMARGINS">SCI_SETMARGINS(int margins)</b><br />
+     <b id="SCI_GETMARGINS">SCI_GETMARGINS &rarr; int</b><br />
+     Allocate the number of margins or find the number of margins currently allocated.</p>
+
+    <p><b id="SCI_SETMARGINTYPEN">SCI_SETMARGINTYPEN(int margin, int marginType)</b><br />
+     <b id="SCI_GETMARGINTYPEN">SCI_GETMARGINTYPEN(int margin) &rarr; int</b><br />
+     These two routines set and get the type of a margin. The margin argument should be 0, 1, 2, 3 or 4.
+    You can use the predefined constants <code>SC_MARGIN_SYMBOL</code> (0) and
+    <code>SC_MARGIN_NUMBER</code> (1) to set a margin as either a line number or a symbol margin.
+    A margin with application defined text may use <code>SC_MARGIN_TEXT</code> (4) or
+    <code>SC_MARGIN_RTEXT</code> (5) to right justify the text.
+    By convention, margin 0 is used for line numbers and the next two are used for symbols. You can
+    also use the constants <code>SC_MARGIN_BACK</code> (2), <code>SC_MARGIN_FORE</code> (3),
+    and <code>SC_MARGIN_COLOUR</code> (6) for
+    symbol margins that set their background colour to match the STYLE_DEFAULT background and
+    foreground colours or a specified colour.</p>
+
+    <p><b id="SCI_SETMARGINWIDTHN">SCI_SETMARGINWIDTHN(int margin, int pixelWidth)</b><br />
+     <b id="SCI_GETMARGINWIDTHN">SCI_GETMARGINWIDTHN(int margin) &rarr; int</b><br />
+     These routines set and get the width of a margin in pixels. A margin with zero width is
+    invisible. By default, Scintilla sets margin 1 for symbols with a width of 16 pixels, so this
+    is a reasonable guess if you are not sure what would be appropriate. Line number margins widths
+    should take into account the number of lines in the document and the line number style. You
+    could use something like <a class="message"
+    href="#SCI_TEXTWIDTH"><code>SCI_TEXTWIDTH(STYLE_LINENUMBER, "_99999")</code></a> to get a
+    suitable width.</p>
+
+    <p><b id="SCI_SETMARGINMASKN">SCI_SETMARGINMASKN(int margin, int mask)</b><br />
+     <b id="SCI_GETMARGINMASKN">SCI_GETMARGINMASKN(int margin) &rarr; int</b><br />
+     The mask is a 32-bit value. Each bit corresponds to one of 32 logical symbols that can be
+    displayed in a margin that is enabled for symbols. There is a useful constant,
+    <code>SC_MASK_FOLDERS</code> (0xFE000000 or -33554432), that is a mask for the 7 logical
+    symbols used to denote folding. You can assign a wide range of symbols and colours to each of
+    the 32 logical symbols, see <a href="#Markers">Markers</a> for more information. If <code>(mask
+    &amp; SC_MASK_FOLDERS)==0</code>, the margin background colour is controlled by style 33 (<a
+    class="message" href="#StyleDefinition"><code>STYLE_LINENUMBER</code></a>).</p>
+
+    <p>You add logical markers to a line with <a class="message"
+    href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. If a line has an associated marker that
+    does not appear in the mask of any margin with a non-zero width, the marker changes the
+    background colour of the line. For example, suppose you decide to use logical marker 10 to mark
+    lines with a syntax error and you want to show such lines by changing the background colour.
+    The mask for this marker is 1 shifted left 10 times (1&lt;&lt;10) which is 0x400. If you make
+    sure that no symbol margin includes 0x400 in its mask, any line with the marker gets the
+    background colour changed.</p>
+
+    <p>To set a non-folding margin 1 use <code>SCI_SETMARGINMASKN(1, ~SC_MASK_FOLDERS)</code>
+    which is the default set by Scintilla.
+    To set a folding margin 2 use <code>SCI_SETMARGINMASKN(2, SC_MASK_FOLDERS)</code>.
+    <code>~SC_MASK_FOLDERS</code> is 0x1FFFFFF in hexadecimal or 33554431
+    decimal. Of course, you may need to display all 32 symbols in a margin, in which case use
+    <code>SCI_SETMARGINMASKN(margin, -1)</code>.</p>
+
+    <p><b id="SCI_SETMARGINSENSITIVEN">SCI_SETMARGINSENSITIVEN(int margin, bool
+    sensitive)</b><br />
+     <b id="SCI_GETMARGINSENSITIVEN">SCI_GETMARGINSENSITIVEN(int margin) &rarr; bool</b><br />
+     Each of the five margins can be set sensitive or insensitive to mouse clicks. A click in a
+    sensitive margin sends a <a class="message"
+    href="#SCN_MARGINCLICK"><code>SCN_MARGINCLICK</code></a> or <a class="message"
+    href="#SCN_MARGINRIGHTCLICK"><code>SCN_MARGINRIGHTCLICK</code></a> <a class="jump"
+    href="#Notifications">notification</a> to the container. Margins that are not sensitive act as
+    selection margins which make it easy to select ranges of lines. By default, all margins are
+    insensitive.</p>
+
+    <p><b id="SCI_SETMARGINCURSORN">SCI_SETMARGINCURSORN(int margin, int
+    cursor)</b><br />
+     <b id="SCI_GETMARGINCURSORN">SCI_GETMARGINCURSORN(int margin) &rarr; int</b><br />
+     A reversed arrow cursor is normally shown over all margins. This may be changed to a normal arrow with
+     <code>SCI_SETMARGINCURSORN(margin, SC_CURSORARROW)</code> or restored to a
+     reversed arrow with
+     <code>SCI_SETMARGINCURSORN(margin, SC_CURSORREVERSEARROW)</code>.</p>
+    <p><b id="SCI_SETMARGINBACKN">SCI_SETMARGINBACKN(int margin, <a class="jump" href="#colour">colour</a> back)</b><br />
+     <b id="SCI_GETMARGINBACKN">SCI_GETMARGINBACKN(int margin) &rarr; colour</b><br />
+     A margin of type <code>SC_MARGIN_COLOUR</code>
+     may have its colour set with <code>SCI_SETMARGINBACKN</code>.</p>
+
+    <p><b id="SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int pixelWidth)</b><br />
+     <b id="SCI_GETMARGINLEFT">SCI_GETMARGINLEFT &rarr; int</b><br />
+     <b id="SCI_SETMARGINRIGHT">SCI_SETMARGINRIGHT(&lt;unused&gt;, int pixelWidth)</b><br />
+     <b id="SCI_GETMARGINRIGHT">SCI_GETMARGINRIGHT &rarr; int</b><br />
+     These messages set and get the width of the blank margin on both sides of the text in pixels.
+    The default is to one pixel on each side.</p>
+
+    <p><b id="SCI_SETFOLDMARGINCOLOUR">SCI_SETFOLDMARGINCOLOUR(bool useSetting, <a class="jump" href="#colour">colour</a> back)</b><br />
+     <b id="SCI_SETFOLDMARGINHICOLOUR">SCI_SETFOLDMARGINHICOLOUR(bool useSetting, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     These messages allow changing the colour of the fold margin and fold margin highlight.
+     On Windows the fold margin colour defaults to ::GetSysColor(COLOR_3DFACE) and the fold margin highlight
+     colour to ::GetSysColor(COLOR_3DHIGHLIGHT).</p>
+
+    <p>
+     <b id="SCI_MARGINSETTEXT">SCI_MARGINSETTEXT(line line, const char *text)</b><br />
+     <b id="SCI_MARGINGETTEXT">SCI_MARGINGETTEXT(line line, char *text) &rarr; int</b><br />
+     <b id="SCI_MARGINSETSTYLE">SCI_MARGINSETSTYLE(line line, int style)</b><br />
+     <b id="SCI_MARGINGETSTYLE">SCI_MARGINGETSTYLE(line line) &rarr; int</b><br />
+     <b id="SCI_MARGINSETSTYLES">SCI_MARGINSETSTYLES(line line, const char *styles)</b><br />
+     <b id="SCI_MARGINGETSTYLES">SCI_MARGINGETSTYLES(line line, char *styles) &rarr; int</b><br />
+     <b id="SCI_MARGINTEXTCLEARALL">SCI_MARGINTEXTCLEARALL</b><br />
+     Text margins are created with the type SC_MARGIN_TEXT or SC_MARGIN_RTEXT.
+     A different string may be set for each line with <code>SCI_MARGINSETTEXT</code>.
+     The whole of the text margin on a line may be displayed in a particular style with
+     <code>SCI_MARGINSETSTYLE</code> or each character may be individually styled with
+     <code>SCI_MARGINSETSTYLES</code> which uses an array of bytes with each byte setting the style
+     of the corresponding text byte similar to <code>SCI_SETSTYLINGEX</code>.
+     Setting a text margin will cause a
+     <a class="message" href="#SC_MOD_CHANGEMARGIN"><code>SC_MOD_CHANGEMARGIN</code></a>
+     notification to be sent.
+    </p>
+    <p>
+    Only some style attributes are active in text margins: font, size/sizeFractional, bold/weight, italics, fore, back, and characterSet.
+    </p>
+    <p>
+     <b id="SCI_MARGINSETSTYLEOFFSET">SCI_MARGINSETSTYLEOFFSET(int style)</b><br />
+     <b id="SCI_MARGINGETSTYLEOFFSET">SCI_MARGINGETSTYLEOFFSET &rarr; int</b><br />
+    Margin styles may be completely separated from standard text styles by setting a style offset. For example,
+    <code>SCI_MARGINSETSTYLEOFFSET(256)</code> would allow the margin styles to be numbered from
+    256 up to 511 so they do not overlap styles set by lexers. Each style number set with <code>SCI_MARGINSETSTYLE</code>
+    or <code>SCI_MARGINSETSTYLES</code> has the offset added before looking up the style.
+    </p>
+    <p>
+    Always call <a class="seealso" href="#SCI_ALLOCATEEXTENDEDSTYLES">SCI_ALLOCATEEXTENDEDSTYLES</a>
+    before <code>SCI_MARGINSETSTYLEOFFSET</code> and use the result as the argument to <code>SCI_MARGINSETSTYLEOFFSET</code>.
+    </p>
+    <p>
+     <b id="SCI_SETMARGINOPTIONS">SCI_SETMARGINOPTIONS(int marginOptions)</b><br />
+     <b id="SCI_GETMARGINOPTIONS">SCI_GETMARGINOPTIONS &rarr; int</b><br />
+    Define margin options by enabling appropriate bit flags. At the moment, only one flag is available
+    <code>SC_MARGINOPTION_SUBLINESELECT</code>=1, which controls how wrapped lines are selected when clicking
+    on margin in front of them. If <code>SC_MARGINOPTION_SUBLINESELECT</code> is set only sub line of wrapped
+    line is selected, otherwise whole wrapped line is selected. Margin options are set to
+    <code>SC_MARGINOPTION_NONE</code>=0 by default.
+    </p>
+
+    <h2 id="Annotations">Annotations</h2>
+
+    <p>Annotations are read-only lines of text underneath each line of editable text.
+    An annotation may consist of multiple lines separated by '\n'.
+    Annotations can be used to display an assembler version of code for debugging or to show diagnostic messages inline or to
+    line up different versions of text in a merge tool.</p>
+    <p>Annotations count as display lines for the methods
+    <a class="message" href="#SCI_VISIBLEFROMDOCLINE"><code>SCI_VISIBLEFROMDOCLINE</code></a> and
+    <a class="message" href="#SCI_DOCLINEFROMVISIBLE"><code>SCI_DOCLINEFROMVISIBLE</code></a></p>
+    <p>Annotations used for inline diagnostics:</p>
+    <p><img src="annotations.png" alt="Annotations used for inline diagnostics" /></p>
+
+    <code>
+     <a class="message" href="#SCI_ANNOTATIONSETTEXT">SCI_ANNOTATIONSETTEXT(line line, const char *text)</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETTEXT">SCI_ANNOTATIONGETTEXT(line line, char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_ANNOTATIONSETSTYLE">SCI_ANNOTATIONSETSTYLE(line line, int style)</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETSTYLE">SCI_ANNOTATIONGETSTYLE(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_ANNOTATIONSETSTYLES">SCI_ANNOTATIONSETSTYLES(line line, const char *styles)</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETSTYLES">SCI_ANNOTATIONGETSTYLES(line line, char *styles) &rarr; int</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETLINES">SCI_ANNOTATIONGETLINES(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_ANNOTATIONCLEARALL">SCI_ANNOTATIONCLEARALL</a><br />
+     <a class="message" href="#SCI_ANNOTATIONSETVISIBLE">SCI_ANNOTATIONSETVISIBLE(int visible)</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETVISIBLE">SCI_ANNOTATIONGETVISIBLE &rarr; int</a><br />
+     <a class="message" href="#SCI_ANNOTATIONSETSTYLEOFFSET">SCI_ANNOTATIONSETSTYLEOFFSET(int style)</a><br />
+     <a class="message" href="#SCI_ANNOTATIONGETSTYLEOFFSET">SCI_ANNOTATIONGETSTYLEOFFSET &rarr; int</a><br />
+    </code>
+
+    <p>
+     <b id="SCI_ANNOTATIONSETTEXT">SCI_ANNOTATIONSETTEXT(line line, const char *text)</b><br />
+     <b id="SCI_ANNOTATIONGETTEXT">SCI_ANNOTATIONGETTEXT(line line, char *text) &rarr; int</b><br />
+     <b id="SCI_ANNOTATIONSETSTYLE">SCI_ANNOTATIONSETSTYLE(line line, int style)</b><br />
+     <b id="SCI_ANNOTATIONGETSTYLE">SCI_ANNOTATIONGETSTYLE(line line) &rarr; int</b><br />
+     <b id="SCI_ANNOTATIONSETSTYLES">SCI_ANNOTATIONSETSTYLES(line line, const char *styles)</b><br />
+     <b id="SCI_ANNOTATIONGETSTYLES">SCI_ANNOTATIONGETSTYLES(line line, char *styles) &rarr; int</b><br />
+     <b id="SCI_ANNOTATIONGETLINES">SCI_ANNOTATIONGETLINES(line line) &rarr; int</b><br />
+     <b id="SCI_ANNOTATIONCLEARALL">SCI_ANNOTATIONCLEARALL</b><br />
+     A different string may be set for each line with <code>SCI_ANNOTATIONSETTEXT</code>.
+     To clear annotations call <code>SCI_ANNOTATIONSETTEXT</code> with a NULL pointer.
+     The whole of the text ANNOTATION on a line may be displayed in a particular style with
+     <code>SCI_ANNOTATIONSETSTYLE</code> or each character may be individually styled with
+     <code>SCI_ANNOTATIONSETSTYLES</code> which uses an array of bytes with each byte setting the style
+     of the corresponding text byte similar to <code>SCI_SETSTYLINGEX</code>. The text must be set first as it
+     specifies how long the annotation is so how many bytes of styling to read.
+     Setting an annotation will cause a
+     <a class="message" href="#SC_MOD_CHANGEANNOTATION"><code>SC_MOD_CHANGEANNOTATION</code></a>
+     notification to be sent.
+    </p>
+    <p>
+    The number of lines annotating a line can be retrieved with <code>SCI_ANNOTATIONGETLINES</code>.
+    All the lines can be cleared of annotations with <code>SCI_ANNOTATIONCLEARALL</code>
+    which is equivalent to clearing each line (setting to 0) and then deleting other memory used for this feature.
+    </p>
+    <p>
+    Only some style attributes are active in annotations: font, size/sizeFractional, bold/weight, italics, fore, back, and characterSet.
+    </p>
+    <p>
+     <b id="SCI_ANNOTATIONSETVISIBLE">SCI_ANNOTATIONSETVISIBLE(int visible)</b><br />
+     <b id="SCI_ANNOTATIONGETVISIBLE">SCI_ANNOTATIONGETVISIBLE &rarr; int</b><br />
+     Annotations can be made visible in a view and there is a choice of display style when visible.
+     The two messages set and get the annotation display mode. The <code class="parameter">visible</code>
+     argument can be one of:</p>
+
+    <table class="standard" summary="Annotation visibility">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>ANNOTATION_HIDDEN</code></th>
+
+          <td>0</td>
+
+          <td>Annotations are not displayed.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>ANNOTATION_STANDARD</code></th>
+
+          <td>1</td>
+
+          <td>Annotations are drawn left justified with no adornment.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>ANNOTATION_BOXED</code></th>
+
+          <td>2</td>
+
+          <td>Annotations are indented to match the text and are surrounded by a box.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>ANNOTATION_INDENTED</code></th>
+
+          <td>3</td>
+
+          <td>Annotations are indented to match the text.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>
+     <b id="SCI_ANNOTATIONSETSTYLEOFFSET">SCI_ANNOTATIONSETSTYLEOFFSET(int style)</b><br />
+     <b id="SCI_ANNOTATIONGETSTYLEOFFSET">SCI_ANNOTATIONGETSTYLEOFFSET &rarr; int</b><br />
+    Annotation styles may be completely separated from standard text styles by setting a style offset. For example,
+    <code>SCI_ANNOTATIONSETSTYLEOFFSET(512)</code> would allow the annotation styles to be numbered from
+    512 up to 767 so they do not overlap styles set by lexers (or margins if margins offset is 256).
+    Each style number set with <code>SCI_ANNOTATIONSETSTYLE</code>
+    or <code>SCI_ANNOTATIONSETSTYLES</code> has the offset added before looking up the style.
+    </p>
+    <p>
+    Always call <a class="seealso" href="#SCI_ALLOCATEEXTENDEDSTYLES">SCI_ALLOCATEEXTENDEDSTYLES</a>
+    before <code>SCI_ANNOTATIONSETSTYLEOFFSET</code> and use the result as the argument to <code>SCI_ANNOTATIONSETSTYLEOFFSET</code>.
+    </p>
+
+    <h2 id="EndOfLineAnnotations">End of Line Annotations</h2>
+
+    <p>End of Line Annotations are read-only lines of text at the end of each line of editable text.
+    End of Line Annotations can be used to display an assembler version of code for debugging or to show diagnostic messages inline or to
+    line up different versions of text in a merge tool.</p>
+
+    <p>End of Line Annotations used to display an assembler version of code for debugging</p>
+    <p><img src="eolannotation.png" alt="End of Line Annotations used to display an assembler version of code for debugging" /></p>
+
+    <code>
+     <a class="message" href="#SCI_EOLANNOTATIONSETTEXT">SCI_EOLANNOTATIONSETTEXT(line line, const char *text)</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONGETTEXT">SCI_EOLANNOTATIONGETTEXT(line line, char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONSETSTYLE">SCI_EOLANNOTATIONSETSTYLE(line line, int style)</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONGETSTYLE">SCI_EOLANNOTATIONGETSTYLE(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONCLEARALL">SCI_EOLANNOTATIONCLEARALL</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONSETVISIBLE">SCI_EOLANNOTATIONSETVISIBLE(int visible)</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONGETVISIBLE">SCI_EOLANNOTATIONGETVISIBLE &rarr; int</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONSETSTYLEOFFSET">SCI_EOLANNOTATIONSETSTYLEOFFSET(int style)</a><br />
+     <a class="message" href="#SCI_EOLANNOTATIONGETSTYLEOFFSET">SCI_EOLANNOTATIONGETSTYLEOFFSET &rarr; int</a><br />
+    </code>
+
+    <p>
+     <b id="SCI_EOLANNOTATIONSETTEXT">SCI_EOLANNOTATIONSETTEXT(line line, const char *text)</b><br />
+     <b id="SCI_EOLANNOTATIONGETTEXT">SCI_EOLANNOTATIONGETTEXT(line line, char *text) &rarr; int</b><br />
+     <b id="SCI_EOLANNOTATIONSETSTYLE">SCI_EOLANNOTATIONSETSTYLE(line line, int style)</b><br />
+     <b id="SCI_EOLANNOTATIONGETSTYLE">SCI_EOLANNOTATIONGETSTYLE(line line) &rarr; int</b><br />
+     <b id="SCI_EOLANNOTATIONCLEARALL">SCI_EOLANNOTATIONCLEARALL</b><br />
+     A different string may be set for each line with <code>SCI_EOLANNOTATIONSETTEXT</code>.
+     The text argument is always in UTF-8, not the document encoding.
+     To clear end of line annotations call <code>SCI_EOLANNOTATIONSETTEXT</code> with a NULL pointer.
+     The whole of the text EOLANNOTATION on a line may be displayed in a particular style with
+     <code>SCI_EOLANNOTATIONSETSTYLE</code>.
+     Setting an end of line annotation will cause a
+     <a class="message" href="#SC_MOD_CHANGEEOLANNOTATION"><code>SC_MOD_CHANGEEOLANNOTATION</code></a>
+     notification to be sent.
+    </p>
+    <p>
+    All the lines can be cleared of end of line annotations with <code>SCI_EOLANNOTATIONCLEARALL</code>
+    which is equivalent to clearing each line (setting to 0) and then deleting other memory used for this feature.
+    </p>
+    <p>
+    Only some style attributes are active in end of line annotations: font, size/sizeFractional, bold/weight, italics, fore, back, and characterSet.
+    </p>
+    <p>
+     <b id="SCI_EOLANNOTATIONSETVISIBLE">SCI_EOLANNOTATIONSETVISIBLE(int visible)</b><br />
+     <b id="SCI_EOLANNOTATIONGETVISIBLE">SCI_EOLANNOTATIONGETVISIBLE &rarr; int</b><br />
+     End of Line Annotations can be made visible in a view and there is a choice of display style when visible.
+     The two messages set and get the annotation display mode. The <code class="parameter">visible</code>
+     argument can be one of:</p>
+
+    <table class="standard" summary="End of Line Annotation visibility">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>EOLANNOTATION_HIDDEN</code></th>
+
+          <td>0x0</td>
+
+          <td>End of Line Annotations are not displayed.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_STANDARD</code></th>
+
+          <td>0x1</td>
+
+          <td>End of Line Annotations are drawn left justified with no adornment.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_BOXED</code></th>
+
+          <td>0x2</td>
+
+          <td>End of Line Annotations are indented to match the text and are surrounded by a box.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_STADIUM</code></th>
+
+          <td>0x100</td>
+
+          <td>Surround with a &#x25D6;stadium&#x25D7; - a rectangle with rounded ends.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_FLAT_CIRCLE</code></th>
+
+          <td>0x101</td>
+
+          <td>Surround with a |shape&#x25D7; with flat left end and curved right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_ANGLE_CIRCLE</code></th>
+
+          <td>0x102</td>
+
+          <td>Surround with a &#x25C4;shape&#x25D7; with angled left end and curved right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_CIRCLE_FLAT</code></th>
+
+          <td>0x110</td>
+
+          <td>Surround with a &#x25D6;shape| with curved left end and flat right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_FLATS</code></th>
+
+          <td>0x111</td>
+
+          <td>Surround with a |shape| with flat ends.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_ANGLE_FLAT</code></th>
+
+          <td>0x112</td>
+
+          <td>Surround with a &#x25C4;shape| with angled left end and flat right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_CIRCLE_ANGLE</code></th>
+
+          <td>0x120</td>
+
+          <td>Surround with a &#x25D6;shape&#x25B6; with curved left end and angled right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_FLAT_ANGLE</code></th>
+
+          <td>0x121</td>
+
+          <td>Surround with a |shape&#x25B6; with flat left end and angled right end.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>EOLANNOTATION_ANGLES</code></th>
+
+          <td>0x122</td>
+
+          <td>Surround with a &#x25C4;shape&#x25B6; with angles on each end.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p>Different shapes available for EOL annotations.
+    Only one shape can currently be used for the whole document - this illustration was produced by trickery.</p>
+    <p><img src="StadiumVariants.png" alt="Different shapes available for EOL annotations" /></p>
+
+    <p>
+     <b id="SCI_EOLANNOTATIONSETSTYLEOFFSET">SCI_EOLANNOTATIONSETSTYLEOFFSET(int style)</b><br />
+     <b id="SCI_EOLANNOTATIONGETSTYLEOFFSET">SCI_EOLANNOTATIONGETSTYLEOFFSET &rarr; int</b><br />
+    End of Line Annotation styles may be completely separated from standard text styles by setting a style offset. For example,
+    <code>SCI_EOLANNOTATIONSETSTYLEOFFSET(512)</code> would allow the end of line  annotation styles to be numbered from
+    512 up to 767 so they do not overlap styles set by lexers (or margins if margins offset is 256).
+    Each style number set with <code>SCI_EOLANNOTATIONSETSTYLE</code> has the offset added before looking up the style.
+    </p>
+    <p>
+    Always call <a class="seealso" href="#SCI_ALLOCATEEXTENDEDSTYLES">SCI_ALLOCATEEXTENDEDSTYLES</a>
+    before <code>SCI_EOLANNOTATIONSETSTYLEOFFSET</code> and use the result as the argument to <code>SCI_EOLANNOTATIONSETSTYLEOFFSET</code>.
+    </p>
+    <h2 id="OtherSettings">Other settings</h2>
+    <code>
+     <a class="message" href="#SCI_SETBUFFEREDDRAW">SCI_SETBUFFEREDDRAW(bool buffered)</a><br />
+     <a class="message" href="#SCI_GETBUFFEREDDRAW">SCI_GETBUFFEREDDRAW &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETPHASESDRAW">SCI_SETPHASESDRAW(int phases)</a><br />
+     <a class="message" href="#SCI_GETPHASESDRAW">SCI_GETPHASESDRAW &rarr; int</a><br />
+     <a class="message" href="#SCI_SETTECHNOLOGY">SCI_SETTECHNOLOGY(int technology)</a><br />
+     <a class="message" href="#SCI_GETTECHNOLOGY">SCI_GETTECHNOLOGY &rarr; int</a><br />
+     <a class="message" href="#SCI_SETFONTQUALITY">SCI_SETFONTQUALITY(int fontQuality)</a><br />
+     <a class="message" href="#SCI_GETFONTQUALITY">SCI_GETFONTQUALITY &rarr; int</a><br />
+     <a class="message" href="#SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</a><br />
+     <a class="message" href="#SCI_GETCODEPAGE">SCI_GETCODEPAGE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</a><br />
+     <a class="message" href="#SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION &rarr; int</a><br />
+    </code>
+<div  class="provisional">
+    <code>
+     <a class="message" href="#SCI_SETBIDIRECTIONAL"><span class="provisional">SCI_SETBIDIRECTIONAL(int bidirectional)</span></a><br />
+     <a class="message" href="#SCI_GETBIDIRECTIONAL">SCI_GETBIDIRECTIONAL &rarr; int</a><br />
+    </code>
+</div>
+    <code>
+     <a class="message" href="#SCI_GRABFOCUS">SCI_GRABFOCUS</a><br />
+     <a class="message" href="#SCI_SETFOCUS">SCI_SETFOCUS(bool focus)</a><br />
+     <a class="message" href="#SCI_GETFOCUS">SCI_GETFOCUS &rarr; bool</a><br />
+     <a class="message" href="#SCI_SUPPORTSFEATURE">SCI_SUPPORTSFEATURE(int feature) &rarr; bool</a><br />
+    </code>
+
+    <p>To forward a message <code>(WM_XXXX, WPARAM, LPARAM)</code> to Scintilla, you can use
+    <code>SendMessage(hScintilla, WM_XXXX, WPARAM, LPARAM)</code> where <code>hScintilla</code> is
+    the handle to the Scintilla window you created as your editor.</p>
+
+    <p>On Windows, the top level window should forward any <code>WM_SETTINGCHANGE</code>,
+    <code>WM_SYSCOLORCHANGE</code>, and
+    <code>WM_DPICHANGED</code> messages to Scintilla as this allows Scintilla to respond to changes to
+    mouse settings, monitor resolution, colour scheme and similar system properties.</p>
+
+    <p><b id="SCI_SETBUFFEREDDRAW">SCI_SETBUFFEREDDRAW(bool buffered)</b><br />
+     <b id="SCI_GETBUFFEREDDRAW">SCI_GETBUFFEREDDRAW &rarr; bool</b><br />
+     These messages turn buffered drawing on or off and report the buffered drawing state. Buffered
+    drawing draws each line into a bitmap rather than directly to the screen and then copies the
+    bitmap to the screen. This avoids flickering although it does take longer. The default is for
+    drawing to be buffered on Win32 and GTK and to not be buffered on Cocoa and Qt.
+    Buffered drawing is not supported on Cocoa.
+    </p>
+
+    <p>Current platforms perform window buffering so it is almost always better for this option to be turned off.
+    For Win32 and GTK, client code should turn off buffering at initialisation.
+    There are some older platforms and unusual modes where buffering may still be useful.
+    </p>
+
+    <p><b id="SCI_SETPHASESDRAW">SCI_SETPHASESDRAW(int phases)</b><br />
+     <b id="SCI_GETPHASESDRAW">SCI_GETPHASESDRAW &rarr; int</b><br />
+     There are several orders in which the text area may be drawn offering a trade-off between speed
+     and allowing all pixels of text to be seen even when they overlap other elements.</p>
+     <p>In single phase drawing (<code class="deprecated">SC_PHASES_ONE</code>) each
+     run of characters in one style is drawn along with its background.
+     If a character overhangs the end of a run, such as in "<i>V</i>_" where the
+     "<i>V</i>" is in a different style from the "_", then this can cause the right hand
+     side of the "<i>V</i>" to be overdrawn by the background of the "_" which
+     cuts it off.</p>
+     <p>
+     Single phase drawing is deprecated and should not be used by applications.
+     </p>
+     <p>Two phase drawing (<code>SC_PHASES_TWO</code>)
+     fixes this by drawing all the backgrounds of a line first and then drawing the text
+     in transparent mode. Lines are drawn separately and no line will overlap another
+     so any pixels that overlap into another line such as extreme ascenders and
+     descenders on characters will be cut off.
+     Two phase drawing may flicker more than single phase
+     unless buffered drawing is on or the platform is naturally buffered.
+     The default is for drawing to be two phase.</p>
+     <p>Multiple phase drawing (<code>SC_PHASES_MULTIPLE</code>)
+     draws the whole area multiple times, once for each feature, building up
+     the appearance in layers or phases. The coloured backgrounds for all lines are
+     drawn before any text and then all the text is drawn in transparent mode over this
+     combined background without clipping text to the line boundaries. This allows
+     extreme ascenders and descenders to overflow into the adjacent lines.
+     This mode is incompatible with buffered drawing and will act as <code>SC_PHASES_TWO</code>
+     if buffered drawing is turned on.
+     Multiple phase drawing is slower than two phase drawing.
+     Setting the layout cache with
+     <a class="message" href="#SCI_SETLAYOUTCACHE"><code>
+     SCI_SETLAYOUTCACHE(SC_CACHE_PAGE)</code></a>
+     or higher can ensure that multiple phase drawing is not significantly slower.</p>
+
+    <p><b id="SCI_SETTECHNOLOGY">SCI_SETTECHNOLOGY(int technology)</b><br />
+     <b id="SCI_GETTECHNOLOGY">SCI_GETTECHNOLOGY &rarr; int</b><br />
+    The technology property allows choosing between different drawing APIs and options.
+    On most platforms, the only choice is <code>SC_TECHNOLOGY_DEFAULT</code> (0).
+    On Windows Vista or later, <code>SC_TECHNOLOGY_DIRECTWRITE</code> (1),
+    <code>SC_TECHNOLOGY_DIRECTWRITERETAIN</code> (2), or
+    <code>SC_TECHNOLOGY_DIRECTWRITEDC</code> (3)
+    can be chosen to use the Direct2D and DirectWrite APIs for higher quality antialiased drawing.
+    <code>SC_TECHNOLOGY_DIRECTWRITERETAIN</code> differs from
+    <code>SC_TECHNOLOGY_DIRECTWRITE</code> by requesting that the frame
+    is retained after being presented which may prevent drawing failures on some cards and drivers.
+    <code>SC_TECHNOLOGY_DIRECTWRITEDC</code> differs from
+    <code>SC_TECHNOLOGY_DIRECTWRITE</code> by using DirectWrite to draw into a GDI DC.
+    </p>
+    <p>
+    On Win32, buffered drawing is set to a reasonable value for the technology: on for GDI and off for Direct2D
+    as Direct2D performs its own buffering.
+    This can be changed after setting technology with
+    <a class="seealso" href="#SCI_SETBUFFEREDDRAW">SCI_SETBUFFEREDDRAW</a>.
+    </p>
+    <p>
+    When using DirectWrite, you can use
+    <a class="message" href="#SCI_SETFONTLOCALE"><code>SCI_SETFONTLOCALE</code></a>
+    to set an appropriate font locale to draw text with expected language-dependent glyphs.
+    </p>
+
+    <p><b id="SCI_SETFONTQUALITY">SCI_SETFONTQUALITY(int fontQuality)</b><br />
+     <b id="SCI_GETFONTQUALITY">SCI_GETFONTQUALITY &rarr; int</b><br />
+     Manage font quality (antialiasing method). Currently, the following values are available on Windows:
+     <code>SC_EFF_QUALITY_DEFAULT</code> (backward compatible),
+     <code>SC_EFF_QUALITY_NON_ANTIALIASED</code>,
+     <code>SC_EFF_QUALITY_ANTIALIASED</code>,
+     <code>SC_EFF_QUALITY_LCD_OPTIMIZED</code>.</p>
+     <p>In case it is necessary to squeeze more options into this property, only a limited number of bits defined
+     by <code>SC_EFF_QUALITY_MASK</code> (0xF) will be used for quality.</p>
+
+    <p><b id="SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</b><br />
+     <b id="SCI_GETCODEPAGE">SCI_GETCODEPAGE &rarr; int</b><br />
+     Scintilla supports UTF-8, Japanese, Chinese and Korean DBCS along with single byte encodings like Latin-1.
+     UTF-8 (<code>SC_CP_UTF8</code>) is the default. Use this message with
+    <code class="parameter">codePage</code> set to the code page number to set Scintilla to use code page information
+    to ensure multiple byte characters are treated as one character rather than multiple. This also stops
+    the caret from moving between the bytes in a multi-byte character.
+    Do not use this message to choose between different single byte character sets - use
+    <a class="seealso" href="#SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET</a>.
+    Call with
+    <code class="parameter">codePage</code> set to zero to disable multi-byte support.</p>
+
+    <p>Code page <code>SC_CP_UTF8</code> (65001) sets Scintilla into Unicode mode with the document
+    treated as a sequence of characters expressed in UTF-8. The text is converted to the platform's
+    normal Unicode encoding before being drawn by the OS and thus can display Hebrew, Arabic,
+    Cyrillic, and Han characters. Languages which can use two characters stacked vertically in one
+    horizontal space, such as Thai, will mostly work but there are some issues where the characters
+    are drawn separately leading to visual glitches. Bi-directional text is not supported. </p>
+
+    <p>Code page can be set to 65001 (UTF-8), 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK),
+    949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab).</p>
+
+    <p><b id="SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</b><br />
+     <b id="SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION &rarr; int</b><br />
+     When entering text in Chinese, Japanese, or Korean an Input Method Editor (IME) may be displayed.
+     The IME may be an extra window appearing above Scintilla or may be displayed by Scintilla itself
+     as text. On some platforms there is a choice between the two techniques.
+     A windowed IME <code>SC_IME_WINDOWED</code> (0) may be more similar in appearance and
+     behaviour to the IME in other applications.
+     An inline IME <code>SC_IME_INLINE</code> (1) may work better with some Scintilla features such as
+     rectangular and multiple selection.</p>
+     <p>The windowed behaviour can be chosen with <code>SCI_SETIMEINTERACTION(SC_IME_WINDOWED)</code>
+     and the inline behaviour with <code>SCI_SETIMEINTERACTION(SC_IME_INLINE)</code>.
+     Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.</p>
+     <p>When the inline IME mode is active, characters are added tentatively before being finalised and an
+     <a class="message" href="#SCN_CHARADDED">SCN_CHARADDED</a>
+     notification (with <code class="parameter">characterSource</code> set to <code>SC_CHARACTERSOURCE_TENTATIVE_INPUT</code>) is sent for each character.</p>
+
+<div  class="provisional">
+    <a href="#ProvisionalMessages">These bidirectional features are experimental and incomplete.</a><br />
+    <p><b id="SCI_SETBIDIRECTIONAL">SCI_SETBIDIRECTIONAL(int bidirectional)</b><br />
+     <b id="SCI_GETBIDIRECTIONAL">SCI_GETBIDIRECTIONAL &rarr; int</b><br />
+     Some languages, like Arabic and Hebrew, are written from right to left instead of from left to right as English is.
+     Documents that use multiple languages may contain both directions and this is termed "bidirectional".
+     The default text direction may be right to left or left to right.
+     Scintilla only correctly displays bidirectional text on some platforms.
+     Currently, there is experimental support for bidirectional text on Win32 using DirectWrite and on macOS using Cocoa.
+     Only UTF-8 documents will show bidirectional behaviour and only in <code>SC_BIDIRECTIONAL_L2R</code> mode.
+     Some features, such as virtual space may not work with
+     bidirectional text or may work only in some circumstances.
+     <code>SC_BIDIRECTIONAL_R2L</code> may be implemented in the future.</p>
+     <p>There are additional processing and storage costs to bidirectional text.
+     As some applications may not want to pay the costs, bidirectional support must be explicitly enabled by calling
+     <code>SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R)</code> (1) which chooses left to right as the default direction or
+     <code>SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_R2L)</code> (2) for default right to left.
+     On Win32, this should be done after setting the technology to <code>SC_TECHNOLOGY_DIRECTWRITE</code>,
+     <code>SC_TECHNOLOGY_DIRECTWRITERETAIN</code>, or
+     <code>SC_TECHNOLOGY_DIRECTWRITEDC</code>.</p>
+     <p>If the call succeeded <code>SCI_GETBIDIRECTIONAL</code> will return the same value otherwise
+     <code>SC_BIDIRECTIONAL_DISABLED</code> (0) is returned.
+     </p>
+</div>
+
+    <p><b id="SCI_GRABFOCUS">SCI_GRABFOCUS</b><br />
+     <b id="SCI_SETFOCUS">SCI_SETFOCUS(bool focus)</b><br />
+     <b id="SCI_GETFOCUS">SCI_GETFOCUS &rarr; bool</b><br />
+     Scintilla can be told to grab the focus with <code>SCI_GRABFOCUS</code>.
+     This is needed more on GTK where focus handling is more complicated than on Windows.</p>
+
+    <p>The internal focus flag can be set with <code>SCI_SETFOCUS</code>. This is used by clients
+    that have complex focus requirements such as having their own window that gets the real focus
+    but with the need to indicate that Scintilla has the logical focus.</p>
+
+    <p><b id="SCI_SUPPORTSFEATURE">SCI_SUPPORTSFEATURE(int feature) &rarr; bool</b><br />
+     Different platforms support different features and <code>SCI_SUPPORTSFEATURE</code>
+     can be used to check which are currently available.
+     For example, on Win32, Direct2D supports drawing translucent lines but GDI does not so
+     <code>SCI_SUPPORTSFEATURE(SC_SUPPORTS_TRANSLUCENT_STROKE)</code>
+     will return 1 for Direct2D and 0 for GDI. Its possible that translucent line drawing will be implemented in a future
+     revision to the GDI platform layer or will be implemented on particular Windows versions.
+     This call allows applications to tailor their settings: perhaps displaying a box with translucent coloured fill on Direct2D but
+     a hollow box on GDI.</p>
+     <p>The features that can be queried are:</p>
+    <table class="standard" summary="Search flags">
+      <tbody>
+        <tr>
+          <td><code>SC_SUPPORTS_LINE_DRAWS_FINAL</code></td>
+          <td>0</td>
+          <td>Whether drawing a line draws its final position. Only false on Win32 GDI.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_SUPPORTS_PIXEL_DIVISIONS</code></td>
+          <td>1</td>
+          <td>Are logical pixels larger than physical pixels? Currently only true for macOS Cocoa with 'retina' displays.
+          When true, creating pixmaps at twice the resolution can produce clearer output with less blur.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_SUPPORTS_FRACTIONAL_STROKE_WIDTH</code></td>
+          <td>2</td>
+          <td>Can lines be drawn with fractional widths like 1.5 or 0.5 pixels?</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_SUPPORTS_TRANSLUCENT_STROKE</code></td>
+          <td>3</td>
+          <td>Can translucent lines, polygons, ellipses, and text be drawn?</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_SUPPORTS_PIXEL_MODIFICATION</code></td>
+          <td>4</td>
+          <td>Can individual pixels be modified? This is false for character cell platforms like curses.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <h2 id="BraceHighlighting">Brace highlighting</h2>
+    <code><a class="message" href="#SCI_BRACEHIGHLIGHT">SCI_BRACEHIGHLIGHT(position posA, position
+    posB)</a><br />
+     <a class="message" href="#SCI_BRACEBADLIGHT">SCI_BRACEBADLIGHT(position pos)</a><br />
+     <a class="message" href="#SCI_BRACEHIGHLIGHTINDICATOR">SCI_BRACEHIGHLIGHTINDICATOR(bool useSetting, int indicator)</a><br />
+     <a class="message" href="#SCI_BRACEBADLIGHTINDICATOR">SCI_BRACEBADLIGHTINDICATOR(bool useSetting, int indicator)</a><br />
+     <a class="message" href="#SCI_BRACEMATCH">SCI_BRACEMATCH(position pos, int maxReStyle) &rarr; position</a><br />
+     <a class="message" href="#SCI_BRACEMATCHNEXT">SCI_BRACEMATCHNEXT(position pos, position startPos) &rarr; position</a><br />
+    </code>
+
+    <p><b id="SCI_BRACEHIGHLIGHT">SCI_BRACEHIGHLIGHT(position posA, position posB)</b><br />
+     Up to two characters can be highlighted in a 'brace highlighting style', which is defined as
+    style number <a class="message" href="#StyleDefinition"><code>STYLE_BRACELIGHT</code></a> (34).
+    If you have enabled indent guides, you may also wish to highlight the indent that corresponds
+    with the brace. You can locate the column with <a class="message"
+    href="#SCI_GETCOLUMN"><code>SCI_GETCOLUMN</code></a> and highlight the indent with <a
+    class="message" href="#SCI_SETHIGHLIGHTGUIDE"><code>SCI_SETHIGHLIGHTGUIDE</code></a>.</p>
+
+    <p><b id="SCI_BRACEBADLIGHT">SCI_BRACEBADLIGHT(position pos)</b><br />
+     If there is no matching brace then the <a class="jump" href="#StyleDefinition">brace
+    badlighting style</a>, style <code>STYLE_BRACEBAD</code> (35), can be used to show the brace
+    that is unmatched. Using a position of <code>INVALID_POSITION</code> (-1) removes the
+    highlight.</p>
+
+    <p><b id="SCI_BRACEHIGHLIGHTINDICATOR">SCI_BRACEHIGHLIGHTINDICATOR(bool useSetting, int indicator)</b><br />
+     Use specified indicator to highlight matching braces instead of changing their style.</p>
+
+    <p><b id="SCI_BRACEBADLIGHTINDICATOR">SCI_BRACEBADLIGHTINDICATOR(bool useSetting, int indicator)</b><br />
+     Use specified indicator to highlight non matching brace instead of changing its style.</p>
+
+    <p><b id="SCI_BRACEMATCH">SCI_BRACEMATCH(position pos, int maxReStyle) &rarr; position</b><br />
+     The <code>SCI_BRACEMATCH</code> message finds a corresponding matching brace given
+    <code class="parameter">pos</code>, the position of one brace. The brace characters handled are '(', ')', '[',
+    ']', '{', '}', '&lt;', and '&gt;'. The search is forwards from an opening brace and backwards
+    from a closing brace. If the character at position is not a brace character, or a matching
+    brace cannot be found, the return value is -1. Otherwise, the return value is the position of
+    the matching brace.</p>
+
+    <p>A match only occurs if the style of the matching brace is the same as the starting brace or
+    the matching brace is beyond the end of styling. Nested braces are handled correctly. The
+    <code class="parameter">maxReStyle</code> parameter must currently be 0 - it may be used in the future to limit
+    the length of brace searches.</p>
+
+    <p><b id="SCI_BRACEMATCHNEXT">SCI_BRACEMATCHNEXT(position pos, position startPos) &rarr; position</b><br />
+     Similar to <code>SCI_BRACEMATCH</code>, but matching starts at the explicit start position <code>startPos</code>
+     instead of the implicitly next position <code>pos &plusmn; 1</code>.</p>
+
+    <h2 id="TabsAndIndentationGuides">Tabs and Indentation Guides</h2>
+
+    <p>Indentation (the white space at the start of a line) is often used by programmers to clarify
+    program structure and in some languages, for example Python, it may be part of the language
+    syntax. Tabs are normally used in editors to insert a tab character or to pad text with spaces
+    up to the next tab.</p>
+
+    <p>When Scintilla is laying out a section of text, text after a tab character will usually be
+    displayed at the next multiple of TABWIDTH columns from the left. However, it is also possible
+    to explicitly set tabstops in pixels for each line.</p>
+
+    <p>Scintilla can be set to treat tab and backspace in the white space at the start of a line in
+    a special way: inserting a tab indents the line to the next indent position rather than just
+    inserting a tab at the current character position and backspace unindents the line rather than
+    deleting a character. Scintilla can also display indentation guides (vertical lines) to help
+    you to generate code.</p>
+    <code>
+     <a class="message" href="#SCI_SETTABWIDTH">SCI_SETTABWIDTH(int tabWidth)</a><br />
+     <a class="message" href="#SCI_GETTABWIDTH">SCI_GETTABWIDTH &rarr; int</a><br />
+     <a class="message" href="#SCI_SETTABMINIMUMWIDTH">SCI_SETTABMINIMUMWIDTH(int pixels)</a><br />
+     <a class="message" href="#SCI_GETTABMINIMUMWIDTH">SCI_GETTABMINIMUMWIDTH &rarr; int</a><br />
+     <a class="message" href="#SCI_CLEARTABSTOPS">SCI_CLEARTABSTOPS(line line)</a><br />
+     <a class="message" href="#SCI_ADDTABSTOP">SCI_ADDTABSTOP(line line, int x)</a><br />
+     <a class="message" href="#SCI_GETNEXTTABSTOP">SCI_GETNEXTTABSTOP(line line, int x) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETUSETABS">SCI_SETUSETABS(bool useTabs)</a><br />
+     <a class="message" href="#SCI_GETUSETABS">SCI_GETUSETABS &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETINDENT">SCI_SETINDENT(int indentSize)</a><br />
+     <a class="message" href="#SCI_GETINDENT">SCI_GETINDENT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETTABINDENTS">SCI_SETTABINDENTS(bool tabIndents)</a><br />
+     <a class="message" href="#SCI_GETTABINDENTS">SCI_GETTABINDENTS &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETBACKSPACEUNINDENTS">SCI_SETBACKSPACEUNINDENTS(bool
+    bsUnIndents)</a><br />
+     <a class="message" href="#SCI_GETBACKSPACEUNINDENTS">SCI_GETBACKSPACEUNINDENTS &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETLINEINDENTATION">SCI_SETLINEINDENTATION(line line, int
+    indentation)</a><br />
+     <a class="message" href="#SCI_GETLINEINDENTATION">SCI_GETLINEINDENTATION(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETLINEINDENTPOSITION">SCI_GETLINEINDENTPOSITION(line line) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETINDENTATIONGUIDES">SCI_SETINDENTATIONGUIDES(int indentView)</a><br />
+     <a class="message" href="#SCI_GETINDENTATIONGUIDES">SCI_GETINDENTATIONGUIDES &rarr; int</a><br />
+     <a class="message" href="#SCI_SETHIGHLIGHTGUIDE">SCI_SETHIGHLIGHTGUIDE(position column)</a><br />
+     <a class="message" href="#SCI_GETHIGHLIGHTGUIDE">SCI_GETHIGHLIGHTGUIDE &rarr; position</a><br />
+    </code>
+
+    <p><b id="SCI_SETTABMINIMUMWIDTH">SCI_SETTABMINIMUMWIDTH(int pixels)</b><br />
+     <b id="SCI_GETTABMINIMUMWIDTH">SCI_GETTABMINIMUMWIDTH &rarr; int</b><br />
+     <code>SCI_SETTABMINIMUMWIDTH</code> sets the minimum size of a tab in pixels to ensure that the tab
+     can be seen. The default value is 2. This is particularly useful with proportional fonts with fractional widths where
+     the character before the tab may end a fraction of a pixel before a tab stop, causing the tab to only be a fraction of
+     a pixel wide without this setting.
+     Where displaying a miniaturized version of the document, setting this to 0 may make the miniaturized
+     version lay out more like the normal size version.</p>
+
+    <p><b id="SCI_SETTABWIDTH">SCI_SETTABWIDTH(int tabWidth)</b><br />
+     <b id="SCI_GETTABWIDTH">SCI_GETTABWIDTH &rarr; int</b><br />
+     <code>SCI_SETTABWIDTH</code> sets the size of a tab as a multiple of the size of a space
+    character in <code>STYLE_DEFAULT</code>. The default tab width is 8 characters. There are no
+    limits on tab sizes, but values less than 1 or large values may have undesirable effects.</p>
+
+    <p><b id="SCI_CLEARTABSTOPS">SCI_CLEARTABSTOPS(line line)</b><br />
+     <b id="SCI_ADDTABSTOP">SCI_ADDTABSTOP(line line, int x)</b><br />
+     <b id="SCI_GETNEXTTABSTOP">SCI_GETNEXTTABSTOP(line line, int x) &rarr; int</b><br />
+     <code>SCI_CLEARTABSTOPS</code> clears explicit tabstops on a line. <code>SCI_ADDTABSTOP</code>
+    adds an explicit tabstop at the specified distance from the left (in pixels), and
+    <code>SCI_GETNEXTTABSTOP</code> gets the next explicit tabstop position set after the given x position,
+    or zero if there aren't any.
+    Changing tab stops produces a <a class="message" href="#SC_MOD_CHANGETABSTOPS">SC_MOD_CHANGETABSTOPS</a> notification.
+    </p>
+
+    <p><b id="SCI_SETUSETABS">SCI_SETUSETABS(bool useTabs)</b><br />
+     <b id="SCI_GETUSETABS">SCI_GETUSETABS &rarr; bool</b><br />
+     <code>SCI_SETUSETABS</code> determines whether indentation should be created out of a mixture
+    of tabs and spaces or be based purely on spaces. Set <code class="parameter">useTabs</code> to <code>false</code>
+    (0) to create all tabs and indents out of spaces. The default is <code>true</code>. You can use
+    <a class="message" href="#SCI_GETCOLUMN"><code>SCI_GETCOLUMN</code></a> to get the column of a
+    position taking the width of a tab into account.</p>
+    <p><b id="SCI_SETINDENT">SCI_SETINDENT(int indentSize)</b><br />
+     <b id="SCI_GETINDENT">SCI_GETINDENT &rarr; int</b><br />
+     <code>SCI_SETINDENT</code> sets the size of indentation in terms of the width of a space in <a
+    class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>. If you set a width of
+    0, the indent size is the same as the tab size. There are no limits on indent sizes, but values
+    less than 0 or large values may have undesirable effects.
+    </p>
+
+    <p><b id="SCI_SETTABINDENTS">SCI_SETTABINDENTS(bool tabIndents)</b><br />
+     <b id="SCI_GETTABINDENTS">SCI_GETTABINDENTS &rarr; bool</b><br />
+     <b id="SCI_SETBACKSPACEUNINDENTS">SCI_SETBACKSPACEUNINDENTS(bool bsUnIndents)</b><br />
+     <b id="SCI_GETBACKSPACEUNINDENTS">SCI_GETBACKSPACEUNINDENTS &rarr; bool</b><br />
+    </p>
+
+    <p>Inside indentation white space, the tab and backspace keys can be made to indent and
+    unindent rather than insert a tab character or delete a character with the
+    <code>SCI_SETTABINDENTS</code> and <code>SCI_SETBACKSPACEUNINDENTS</code> functions.</p>
+
+    <p><b id="SCI_SETLINEINDENTATION">SCI_SETLINEINDENTATION(line line, int indentation)</b><br />
+     <b id="SCI_GETLINEINDENTATION">SCI_GETLINEINDENTATION(line line) &rarr; int</b><br />
+     The amount of indentation on a line can be discovered and set with
+    <code>SCI_GETLINEINDENTATION</code> and <code>SCI_SETLINEINDENTATION</code>. The indentation is
+    measured in character columns, which correspond to the width of space characters.</p>
+
+    <p><b id="SCI_GETLINEINDENTPOSITION">SCI_GETLINEINDENTPOSITION(line line) &rarr; position</b><br />
+     This returns the position at the end of indentation of a line.</p>
+
+    <p><b id="SCI_SETINDENTATIONGUIDES">SCI_SETINDENTATIONGUIDES(int indentView)</b><br />
+     <b id="SCI_GETINDENTATIONGUIDES">SCI_GETINDENTATIONGUIDES &rarr; int</b><br />
+     Indentation guides are dotted vertical lines that appear within indentation white space every
+    indent size columns. They make it easy to see which constructs line up especially when they
+    extend over multiple pages. Style <a class="message"
+    href="#StyleDefinition"><code>STYLE_INDENTGUIDE</code></a> (37) is used to specify the
+    foreground and background colour of the indentation guides.</p>
+
+    <p>There are 4 indentation guide views.
+    SC_IV_NONE turns the feature off but the other 3 states determine how far the guides appear on
+    empty lines. </p>
+    <table class="standard" summary="Search flags">
+      <tbody>
+        <tr>
+          <td><code>SC_IV_NONE</code></td>
+          <td>No indentation guides are shown.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_REAL</code></td>
+          <td>Indentation guides are shown inside real indentation white space.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_LOOKFORWARD</code></td>
+          <td>Indentation guides are shown beyond the actual indentation up to the level of the
+          next non-empty line.
+          If the previous non-empty line was a fold header then indentation guides are shown for
+          one more level of indent than that line. This setting is good for Python.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_IV_LOOKBOTH</code></td>
+          <td>Indentation guides are shown beyond the actual indentation up to the level of the
+          next non-empty line or previous non-empty line whichever is the greater.
+          This setting is good for most languages.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETHIGHLIGHTGUIDE">SCI_SETHIGHLIGHTGUIDE(position column)</b><br />
+     <b id="SCI_GETHIGHLIGHTGUIDE">SCI_GETHIGHLIGHTGUIDE &rarr; position</b><br />
+     When brace highlighting occurs, the indentation guide corresponding to the braces may be
+    highlighted with the brace highlighting style, <a class="message"
+    href="#StyleDefinition"><code>STYLE_BRACELIGHT</code></a> (34). Set <code class="parameter">column</code> to 0 to
+    cancel this highlight.</p>
+
+    <h2 id="Markers">Markers</h2>
+
+    <p>There are 32 markers, numbered 0 to <code>MARKER_MAX</code> (31), and you can assign any combination of them to each
+    line in the document. Markers appear in the <a class="jump" href="#Margins">selection
+    margin</a> to the left of the text. If the selection margin is set to zero width, the
+    background colour of the whole line is changed instead. Marker numbers 25 to 31 are used by
+    Scintilla in folding margins, and have symbolic names of the form <code>SC_MARKNUM_</code>*,
+    for example <code>SC_MARKNUM_FOLDEROPEN</code>.</p>
+
+    <p>Marker numbers 0 to 24 have no pre-defined function; you can use them to mark syntax errors
+    or the current point of execution, break points, or whatever you need marking. If you do not
+    need folding, you can use all 32 for any purpose you wish.</p>
+
+    <p>Each marker number has a symbol associated with it. You can also set the foreground and
+    background colour for each marker number, so you can use the same symbol more than once with
+    different colouring for different uses. Scintilla has a set of symbols you can assign
+    (<code>SC_MARK_</code>*) or you can use characters. By default, all 32 markers are set to
+    <code>SC_MARK_CIRCLE</code> with a black foreground and a white background.</p>
+
+    <p>The markers are drawn in the order of their numbers, so higher numbered markers appear on
+    top of lower numbered ones. Markers try to move with their text by tracking where the start of
+    their line moves. When a line is deleted, its markers are combined, by an <code>OR</code>
+    operation, with the markers of the next line.</p>
+    <code><a class="message" href="#SCI_MARKERDEFINE">SCI_MARKERDEFINE(int markerNumber, int
+    markerSymbol)</a><br />
+     <a class="message" href="#SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber,
+    const char *pixmap)</a><br />
+     <a class="message" href="#SCI_RGBAIMAGESETWIDTH">SCI_RGBAIMAGESETWIDTH(int width)</a><br />
+     <a class="message" href="#SCI_RGBAIMAGESETHEIGHT">SCI_RGBAIMAGESETHEIGHT(int height)</a><br />
+     <a class="message" href="#SCI_RGBAIMAGESETSCALE">SCI_RGBAIMAGESETSCALE(int scalePercent)</a><br />
+     <a class="message" href="#SCI_MARKERDEFINERGBAIMAGE">SCI_MARKERDEFINERGBAIMAGE(int markerNumber,
+    const char *pixels)</a><br />
+     <a class="message" href="#SCI_MARKERSYMBOLDEFINED">SCI_MARKERSYMBOLDEFINED(int markerNumber) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, colour fore)</a><br />
+     <a class="message" href="#SCI_MARKERSETFORETRANSLUCENT">SCI_MARKERSETFORETRANSLUCENT(int markerNumber, colouralpha fore)</a><br />
+     <a class="message" href="#SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, colour back)</a><br />
+     <a class="message" href="#SCI_MARKERSETBACKTRANSLUCENT">SCI_MARKERSETBACKTRANSLUCENT(int markerNumber, colouralpha back)</a><br />
+    <a class="message" href="#SCI_MARKERSETBACKSELECTED">SCI_MARKERSETBACKSELECTED(int markerNumber, colour
+    back)</a><br />
+    <a class="message" href="#SCI_MARKERSETBACKSELECTEDTRANSLUCENT">SCI_MARKERSETBACKSELECTEDTRANSLUCENT(int markerNumber, colouralpha
+    back)</a><br />
+    <a class="message" href="#SCI_MARKERSETSTROKEWIDTH">SCI_MARKERSETSTROKEWIDTH(int markerNumber, int hundredths)</a><br />
+    <a class="message" href="#SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(bool enabled)</a><br />
+     <a class="message" href="#SCI_MARKERSETLAYER">SCI_MARKERSETLAYER(int markerNumber, int layer)</a><br />
+     <a class="message" href="#SCI_MARKERGETLAYER">SCI_MARKERGETLAYER(int markerNumber) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber, alpha alpha)</a><br />
+     <a class="message" href="#SCI_MARKERADD">SCI_MARKERADD(line line, int markerNumber) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARKERADDSET">SCI_MARKERADDSET(line line, int markerSet)</a><br />
+     <a class="message" href="#SCI_MARKERDELETE">SCI_MARKERDELETE(line line, int
+    markerNumber)</a><br />
+     <a class="message" href="#SCI_MARKERDELETEALL">SCI_MARKERDELETEALL(int markerNumber)</a><br />
+     <a class="message" href="#SCI_MARKERGET">SCI_MARKERGET(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARKERNEXT">SCI_MARKERNEXT(line lineStart, int markerMask) &rarr; line</a><br />
+     <a class="message" href="#SCI_MARKERPREVIOUS">SCI_MARKERPREVIOUS(line lineStart, int markerMask) &rarr; line</a><br />
+     <a class="message" href="#SCI_MARKERLINEFROMHANDLE">SCI_MARKERLINEFROMHANDLE(int markerHandle) &rarr; line</a><br />
+     <a class="message" href="#SCI_MARKERDELETEHANDLE">SCI_MARKERDELETEHANDLE(int markerHandle)</a><br />
+     <a class="message" href="#SCI_MARKERHANDLEFROMLINE">SCI_MARKERHANDLEFROMLINE(line line, int which) &rarr; int</a><br />
+     <a class="message" href="#SCI_MARKERNUMBERFROMLINE">SCI_MARKERNUMBERFROMLINE(line line, int which) &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_MARKERDEFINE">SCI_MARKERDEFINE(int markerNumber, int markerSymbol)</b><br />
+     This message associates a marker number in the range 0 to 31 with one of the marker symbols or
+    an ASCII character. The general-purpose marker symbols currently available are:<br />
+    <code>SC_MARK_CIRCLE</code>,
+    <code>SC_MARK_ROUNDRECT</code>,
+    <code>SC_MARK_ARROW</code>,
+    <code>SC_MARK_SMALLRECT</code>,
+    <code>SC_MARK_SHORTARROW</code>,
+    <code>SC_MARK_EMPTY</code>,
+    <code>SC_MARK_ARROWDOWN</code>,
+    <code>SC_MARK_MINUS</code>,
+    <code>SC_MARK_PLUS</code>,
+    <code>SC_MARK_ARROWS</code>,
+    <code>SC_MARK_DOTDOTDOT</code>,
+    <code>SC_MARK_BACKGROUND</code>,
+    <code>SC_MARK_LEFTRECT</code>,
+    <code>SC_MARK_FULLRECT</code>,
+    <code>SC_MARK_BOOKMARK</code>,
+    <code>SC_MARK_VERTICALBOOKMARK</code>, and
+    <code>SC_MARK_UNDERLINE</code>.
+    </p>
+
+    <p>The <code>SC_MARK_BACKGROUND</code> marker changes the background colour of the line only.
+          The <code>SC_MARK_FULLRECT</code> symbol mirrors this, changing only the margin background colour.
+          <code>SC_MARK_UNDERLINE</code> draws an underline across the text.
+    The <code>SC_MARK_EMPTY</code> symbol is invisible, allowing client code to track the movement
+    of lines. You would also use it if you changed the folding style and wanted one or more of the
+    <code>SC_FOLDERNUM_</code>* markers to have no associated symbol.</p>
+
+    <p>Applications may use the marker symbol <code>SC_MARK_AVAILABLE</code> to indicate that
+    plugins may allocate that marker number.
+    </p>
+
+    <p>There are also marker symbols designed for use in the folding margin in a flattened tree
+    style.<br />
+    <code>SC_MARK_BOXMINUS</code>,
+    <code>SC_MARK_BOXMINUSCONNECTED</code>,
+    <code>SC_MARK_BOXPLUS</code>,
+    <code>SC_MARK_BOXPLUSCONNECTED</code>,
+    <code>SC_MARK_CIRCLEMINUS</code>,
+    <code>SC_MARK_CIRCLEMINUSCONNECTED</code>,
+    <code>SC_MARK_CIRCLEPLUS</code>,
+    <code>SC_MARK_CIRCLEPLUSCONNECTED</code>,
+    <code>SC_MARK_LCORNER</code>,
+    <code>SC_MARK_LCORNERCURVE</code>,
+    <code>SC_MARK_TCORNER</code>,
+    <code>SC_MARK_TCORNERCURVE</code>, and
+    <code>SC_MARK_VLINE</code>.</p>
+    Characters can be used as markers by adding the Unicode code point of the character to
+    <code>SC_MARK_CHARACTER</code> (10000). For example, to use '&#9637;' SQUARE WITH VERTICAL FILL
+    (Unicode code point 9637) as marker number 1 use:<br />
+    <code>SCI_MARKERDEFINE(1, SC_MARK_CHARACTER+9637)</code>. <br />
+
+    <p>The marker numbers <code>SC_MARKNUM_FOLDER</code> and <code>SC_MARKNUM_FOLDEROPEN</code> are
+    used for showing that a fold is present and open or closed. Any symbols may be assigned for
+    this purpose although the (<code>SC_MARK_PLUS</code>, <code>SC_MARK_MINUS</code>) pair or the
+    (<code>SC_MARK_ARROW</code>, <code>SC_MARK_ARROWDOWN</code>) pair are good choices. As well as
+    these two, more assignments are needed for the flattened tree style:
+    <code>SC_MARKNUM_FOLDEREND</code>, <code>SC_MARKNUM_FOLDERMIDTAIL</code>,
+    <code>SC_MARKNUM_FOLDEROPENMID</code>, <code>SC_MARKNUM_FOLDERSUB</code>, and
+    <code>SC_MARKNUM_FOLDERTAIL</code>. The bits used for folding are specified by
+    <code>SC_MASK_FOLDERS</code>, which is commonly used as an argument to
+    <code>SCI_SETMARGINMASKN</code> when defining a margin to be used for folding.</p>
+
+    <p>This table shows which <code>SC_MARK_</code>* symbols should be assigned to which
+    <code>SC_MARKNUM_</code>* marker numbers to obtain four folding styles: Arrow (mimics
+    Macintosh), plus/minus shows folded lines as '+' and opened folds as '-', Circle tree, Box
+    tree.</p>
+
+    <table class="standard" summary="Markers used for folding">
+      <thead align="left">
+        <tr>
+          <th><code>SC_MARKNUM_</code>*</th>
+
+          <th>Arrow</th>
+
+          <th>Plus/minus</th>
+
+          <th>Circle tree</th>
+
+          <th>Box tree</th>
+        </tr>
+      </thead>
+
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>FOLDEROPEN</code></th>
+
+          <td><code>ARROWDOWN</code></td>
+
+          <td><code>MINUS</code></td>
+
+          <td><code>CIRCLEMINUS</code></td>
+
+          <td><code>BOXMINUS</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDER</code></th>
+
+          <td><code>ARROW</code></td>
+
+          <td><code>PLUS</code></td>
+
+          <td><code>CIRCLEPLUS</code></td>
+
+          <td><code>BOXPLUS</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERSUB</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>VLINE</code></td>
+
+          <td><code>VLINE</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERTAIL</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>LCORNERCURVE</code></td>
+
+          <td><code>LCORNER</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDEREND</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>CIRCLEPLUSCONNECTED</code></td>
+
+          <td><code>BOXPLUSCONNECTED</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDEROPENMID</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>CIRCLEMINUSCONNECTED</code></td>
+
+          <td><code>BOXMINUSCONNECTED</code></td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>FOLDERMIDTAIL</code></th>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>EMPTY</code></td>
+
+          <td><code>TCORNERCURVE</code></td>
+
+          <td><code>TCORNER</code></td>
+        </tr>
+      </tbody>
+    </table>
+    <p><img src="Markers.png" alt="Marker samples" /></p>
+
+    <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char
+    *pixmap)</b><br />
+     Markers can be set to pixmaps with this message. The
+     <a class="jump" href="#XPM">XPM format</a> is used for the pixmap.
+    Pixmaps use the <code>SC_MARK_PIXMAP</code> marker symbol. </p>
+
+    <p>
+    <b id="SCI_RGBAIMAGESETWIDTH">SCI_RGBAIMAGESETWIDTH(int width)</b><br />
+    <b id="SCI_RGBAIMAGESETHEIGHT">SCI_RGBAIMAGESETHEIGHT(int height)</b><br />
+    <b id="SCI_RGBAIMAGESETSCALE">SCI_RGBAIMAGESETSCALE(int scalePercent)</b><br />
+    <b id="SCI_MARKERDEFINERGBAIMAGE">SCI_MARKERDEFINERGBAIMAGE(int markerNumber, const char *pixels)</b><br />
+     Markers can be set to translucent pixmaps with this message. The
+     <a class="jump" href="#RGBA">RGBA format</a> is used for the pixmap.
+     The width and height must previously been set with the <code>SCI_RGBAIMAGESETWIDTH</code> and
+     <code>SCI_RGBAIMAGESETHEIGHT</code> messages.</p>
+     <p>A scale factor in percent may be set with <code>SCI_RGBAIMAGESETSCALE</code>. This is useful on OS X with
+     a retina display where each display unit is 2 pixels: use a factor of 200 so that each image pixel is displayed using a screen pixel.
+     The default scale, 100, will stretch each image pixel to cover 4 screen pixels on a retina display.</p>
+    <p>Pixmaps use the <code>SC_MARK_RGBAIMAGE</code> marker symbol. </p>
+
+    <p><b id="SCI_MARKERSYMBOLDEFINED">SCI_MARKERSYMBOLDEFINED(int markerNumber) &rarr; int</b><br />
+     Returns the symbol defined for a markerNumber with <code>SCI_MARKERDEFINE</code>
+     or <code>SC_MARK_PIXMAP</code> if defined with <code>SCI_MARKERDEFINEPIXMAP</code>
+     or <code>SC_MARK_RGBAIMAGE</code> if defined with <code>SCI_MARKERDEFINERGBAIMAGE</code>.</p>
+
+    <p>
+     <b id="SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_MARKERSETFORETRANSLUCENT">SCI_MARKERSETFORETRANSLUCENT(int markerNumber, <a class="jump" href="#colouralpha">colouralpha</a> fore)</b><br />
+     <b id="SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, <a class="jump" href="#colour">colour</a> back)</b><br />
+     <b id="SCI_MARKERSETBACKTRANSLUCENT">SCI_MARKERSETBACKTRANSLUCENT(int markerNumber, <a class="jump" href="#colouralpha">colouralpha</a> back)</b><br />
+     These messages set the foreground and background colour of a marker number.
+     The <code>TRANSLUCENT</code> variants can define different degrees of opacity.<br />
+     <b id="SCI_MARKERSETBACKSELECTED">SCI_MARKERSETBACKSELECTED(int markerNumber, <a class="jump" href="#colour">colour</a> back)</b><br />
+     <b id="SCI_MARKERSETBACKSELECTEDTRANSLUCENT">SCI_MARKERSETBACKSELECTEDTRANSLUCENT(int markerNumber, <a class="jump" href="#colouralpha">colouralpha</a> back)</b><br />
+     This message sets the highlight background colour of a marker number when its folding block is selected. The default colour is #FF0000.</p>
+
+     <p><b id="SCI_MARKERSETSTROKEWIDTH">SCI_MARKERSETSTROKEWIDTH(int markerNumber, int hundredths)</b><br />
+     This message sets the stroke width used to draw the marker in hundredths of a pixel.
+     The default value is 100 indicating a single pixel wide line.</p>
+
+     <p><b id="SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(bool enabled)</b><br />
+     This message allows to enable/disable the highlight folding block when it is selected. (i.e. block that contains the caret)</p>
+
+     <p>
+     <b id="SCI_MARKERSETLAYER">SCI_MARKERSETLAYER(int markerNumber, int layer)</b><br />
+     <b id="SCI_MARKERGETLAYER">SCI_MARKERGETLAYER(int markerNumber) &rarr; int</b><br />
+     <b id="SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber,
+     <a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     When markers are drawn in the content area, either because there is no margin for them or
+     they are of <code>SC_MARK_BACKGROUND</code> or <code>SC_MARK_UNDERLINE</code> types, they may be drawn translucently over text
+     or opaquely on the base layer.
+     The layer to draw on is defined by <code>SCI_MARKERSETLAYER</code>.
+     The degree of translucency can be chosen by setting an alpha value.
+     This is only for the content area - in margins, translucency is achieved through the <code>SCI_MARKERSET&hellip;TRANSLUCENT</code>
+     methods.
+     The <code class="parameter">layer</code> argument can be one of:</p>
+
+    <table class="standard" summary="Layer">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_LAYER_BASE</code></th>
+
+          <td>0</td>
+
+          <td>Draw the selection background opaquely on the base layer</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_UNDER_TEXT</code></th>
+
+          <td>1</td>
+
+          <td>Draw the selection background translucently under the text.<br />
+	  This will not work in single phase drawing mode (<code class="deprecated">SC_PHASES_ONE</code>)
+	  as there is no under-text phase.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_LAYER_OVER_TEXT</code></th>
+
+          <td>2</td>
+
+          <td>Draw the selection background translucently over the text.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_MARKERADD">SCI_MARKERADD(line line, int markerNumber) &rarr; int</b><br />
+     This message adds marker number <code class="parameter">markerNumber</code> to a line. The message returns -1 if
+    this fails (illegal line number, out of memory) or it returns a marker handle number that
+    identifies the added marker. You can use this returned handle with <a class="seealso"
+    href="#SCI_MARKERLINEFROMHANDLE"><code>SCI_MARKERLINEFROMHANDLE</code></a> to find where a
+    marker is after moving or combining lines and with <a class="message"
+    href="#SCI_MARKERDELETEHANDLE"><code>SCI_MARKERDELETEHANDLE</code></a> to delete the marker
+    based on its handle. The message does not check the value of markerNumber, nor does it
+    check if the line already contains the marker.</p>
+
+    <p><b id="SCI_MARKERADDSET">SCI_MARKERADDSET(line line, int markerSet)</b><br />
+     This message can add one or more markers to a line with a single call, specified in the same "one-bit-per-marker" 32-bit integer format returned by
+    <a class="message" href="#SCI_MARKERGET"><code>SCI_MARKERGET</code></a>
+    (and used by the mask-based marker search functions
+    <a class="message" href="#SCI_MARKERNEXT"><code>SCI_MARKERNEXT</code></a> and
+    <a class="message" href="#SCI_MARKERPREVIOUS"><code>SCI_MARKERPREVIOUS</code></a>).
+    As with
+    <a class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>, no check is made
+    to see if any of the markers are already present on the targeted line.</p>
+
+    <p><b id="SCI_MARKERDELETE">SCI_MARKERDELETE(line line, int markerNumber)</b><br />
+     This searches the given line number for the given marker number and deletes it if it is
+    present. If you added the same marker more than once to the line, this will delete one copy
+    each time it is used. If you pass in a marker number of -1, all markers are deleted from the
+    line.</p>
+
+    <p><b id="SCI_MARKERDELETEALL">SCI_MARKERDELETEALL(int markerNumber)</b><br />
+     This removes markers of the given number from all lines. If markerNumber is -1, it deletes all
+    markers from all lines.</p>
+
+    <p><b id="SCI_MARKERGET">SCI_MARKERGET(line line) &rarr; int</b><br />
+     This returns a 32-bit integer that indicates which markers were present on the line. Bit 0 is
+    set if marker 0 is present, bit 1 for marker 1 and so on.</p>
+
+    <p><b id="SCI_MARKERNEXT">SCI_MARKERNEXT(line lineStart, int markerMask) &rarr; line</b><br />
+     <b id="SCI_MARKERPREVIOUS">SCI_MARKERPREVIOUS(line lineStart, int markerMask) &rarr; line</b><br />
+     These messages search efficiently for lines that include a given set of markers. The search
+    starts at line number <code class="parameter">lineStart</code> and continues forwards to the end of the file
+    (<code>SCI_MARKERNEXT</code>) or backwards to the start of the file
+    (<code>SCI_MARKERPREVIOUS</code>). The <code class="parameter">markerMask</code> argument should have one bit set
+    for each marker you wish to find. Set bit 0 to find marker 0, bit 1 for marker 1 and so on. The
+    message returns the line number of the first line that contains one of the markers in
+    <code class="parameter">markerMask</code> or -1 if no marker is found.</p>
+
+    <p><b id="SCI_MARKERLINEFROMHANDLE">SCI_MARKERLINEFROMHANDLE(int markerHandle) &rarr; line</b><br />
+     The <code class="parameter">markerHandle</code> argument is an identifier for a marker returned by <a
+    class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. This function searches
+    the document for the marker with this handle and returns the line number that contains it or -1
+    if it is not found.</p>
+
+    <p><b id="SCI_MARKERDELETEHANDLE">SCI_MARKERDELETEHANDLE(int markerHandle)</b><br />
+     The <code class="parameter">markerHandle</code> argument is an identifier for a marker returned by <a
+    class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>. This function searches
+    the document for the marker with this handle and deletes the marker if it is found.</p>
+
+    <p><b id="SCI_MARKERHANDLEFROMLINE">SCI_MARKERHANDLEFROMLINE(line line, int which) &rarr; int</b><br />
+    <b id="SCI_MARKERNUMBERFROMLINE">SCI_MARKERNUMBERFROMLINE(line line, int which) &rarr; int</b><br />
+	 These messages returns the Nth marker handle or marker number in a given <code class="parameter">line</code>.
+	 Handles are returned by <a class="message" href="#SCI_MARKERADD"><code>SCI_MARKERADD</code></a>.
+	 If <code class="parameter">which</code> is greater or equal to the number of markers on a line, this returns -1;</p>
+
+    <h2 id="Indicators">Indicators</h2>
+
+    <p>Indicators are used to display additional information over the top of styling.
+    They can be used to show, for example, syntax errors, deprecated names and bad indentation
+    by drawing underlines under text or boxes around text.</p>
+
+    <p>Indicators may have a different "hover" colour and style when the mouse is over them or the caret is moved into them.
+    This may be used, for example, to indicate that a URL can be clicked.</p>
+
+    <p>Indicators may be displayed as simple underlines, squiggly underlines, a
+    line of small 'T' shapes, a line of diagonal hatching, a strike-out or a rectangle around the text.
+    They may also be invisible when used to track pieces of content for the application as <code>INDIC_HIDDEN</code>.</p>
+
+    <p>The <code>SCI_INDIC*</code> messages allow you to get and set the visual appearance of the
+    indicators. They all use an <code class="parameter">indicator</code> argument in the range 0 to <code>INDICATOR_MAX</code>(35)
+    to set the indicator to style. To prevent interference the set of indicators is divided up into a range for use
+    by lexers (0..7) a range for use by containers
+    (8=<code>INDICATOR_CONTAINER</code> .. 31=<code>INDICATOR_IME-1</code>)
+    and a range for IME indicators (32=<code>INDICATOR_IME</code> .. 35=<code>INDICATOR_IME_MAX</code>).</p>
+
+    <p>The <code>INDICATOR_*</code> values used for dividing up indicators
+    were previously <code>INDIC_CONTAINER</code>, <code>INDIC_IME</code>,
+    <code>INDIC_IME_MAX</code>, and <code>INDIC_MAX</code>
+    but these were confused with indicator styles so the new names should be used.</p>
+
+    <p>Indicators are stored in a format similar to run length encoding which is efficient in both
+    speed and storage for sparse information.</p>
+    <p>An indicator may store different values for each range but normally all values are drawn the same.
+    The <a class="seealso" href="#SCI_INDICSETFLAGS">SCI_INDICSETFLAGS</a>
+    API may be used to display different colours for different values.</p>
+
+    <p>Originally, Scintilla used a different technique for indicators but this
+    has been <a href="#RemovedFeatures">removed</a>
+    and the APIs perform <a href="#StyleByteIndicators">no action</a>.
+    While both techniques were supported, the term "modern indicators" was used for the
+    newer implementation.</p>
+
+    <code><a class="message" href="#SCI_INDICSETSTYLE">SCI_INDICSETSTYLE(int indicator, int
+    indicatorStyle)</a><br />
+     <a class="message" href="#SCI_INDICGETSTYLE">SCI_INDICGETSTYLE(int indicator) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICSETFORE">SCI_INDICSETFORE(int indicator, colour
+    fore)</a><br />
+     <a class="message" href="#SCI_INDICGETFORE">SCI_INDICGETFORE(int indicator) &rarr; colour</a><br />
+     <a class="message" href="#SCI_INDICSETSTROKEWIDTH">SCI_INDICSETSTROKEWIDTH(int indicator, int hundredths)</a><br />
+     <a class="message" href="#SCI_INDICGETSTROKEWIDTH">SCI_INDICGETSTROKEWIDTH(int indicator) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICSETALPHA">SCI_INDICSETALPHA(int indicator, alpha alpha)</a><br />
+     <a class="message" href="#SCI_INDICGETALPHA">SCI_INDICGETALPHA(int indicator) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA(int indicator, alpha alpha)</a><br />
+     <a class="message" href="#SCI_INDICGETOUTLINEALPHA">SCI_INDICGETOUTLINEALPHA(int indicator) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICSETUNDER">SCI_INDICSETUNDER(int indicator, bool under)</a><br />
+     <a class="message" href="#SCI_INDICGETUNDER">SCI_INDICGETUNDER(int indicator) &rarr; bool</a><br />
+    <a class="message" href="#SCI_INDICSETHOVERSTYLE">SCI_INDICSETHOVERSTYLE(int indicator, int
+    indicatorStyle)</a><br />
+     <a class="message" href="#SCI_INDICGETHOVERSTYLE">SCI_INDICGETHOVERSTYLE(int indicator) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICSETHOVERFORE">SCI_INDICSETHOVERFORE(int indicator, colour
+    fore)</a><br />
+     <a class="message" href="#SCI_INDICGETHOVERFORE">SCI_INDICGETHOVERFORE(int indicator) &rarr; colour</a><br />
+     <a class="message" href="#SCI_INDICSETFLAGS">SCI_INDICSETFLAGS(int indicator, int flags)</a><br />
+     <a class="message" href="#SCI_INDICGETFLAGS">SCI_INDICGETFLAGS(int indicator) &rarr; int</a><br />
+     <br />
+
+     <a class="message" href="#SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</a><br />
+     <a class="message" href="#SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETINDICATORVALUE">SCI_SETINDICATORVALUE(int value)</a><br />
+     <a class="message" href="#SCI_GETINDICATORVALUE">SCI_GETINDICATORVALUE &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE(position start, position lengthFill)</a><br />
+     <a class="message" href="#SCI_INDICATORCLEARRANGE">SCI_INDICATORCLEARRANGE(position start, position lengthClear)</a><br />
+     <a class="message" href="#SCI_INDICATORALLONFOR">SCI_INDICATORALLONFOR(position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICATORVALUEAT">SCI_INDICATORVALUEAT(int indicator, position pos) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDICATORSTART">SCI_INDICATORSTART(int indicator, position pos) &rarr; position</a><br />
+     <a class="message" href="#SCI_INDICATOREND">SCI_INDICATOREND(int indicator, position pos) &rarr; position</a><br />
+
+     <a class="message" href="#SCI_FINDINDICATORSHOW">SCI_FINDINDICATORSHOW(position start, position end)</a><br />
+     <a class="message" href="#SCI_FINDINDICATORFLASH">SCI_FINDINDICATORFLASH(position start, position end)</a><br />
+     <a class="message" href="#SCI_FINDINDICATORHIDE">SCI_FINDINDICATORHIDE</a><br />
+    </code>
+
+    <p><b id="SCI_INDICSETSTYLE">SCI_INDICSETSTYLE(int indicator, int
+    indicatorStyle)</b><br />
+     <b id="SCI_INDICGETSTYLE">SCI_INDICGETSTYLE(int indicator) &rarr; int</b><br />
+     These two messages set and get the style for a particular indicator. The indicator styles
+    currently available are:<br />
+
+    <img src="Indicators.png" alt="Indicator samples" /></p>
+
+    <table class="standard" summary="Indicators">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Visual effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>INDIC_PLAIN</code></td>
+
+          <td align="center">0</td>
+
+          <td>Underlined with a single, straight line.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_SQUIGGLE</code></td>
+
+          <td align="center">1</td>
+
+          <td>A squiggly underline. Requires 3 pixels of descender space.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_TT</code></td>
+
+          <td align="center">2</td>
+
+          <td>A line of small T shapes.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_DIAGONAL</code></td>
+
+          <td align="center">3</td>
+
+          <td>Diagonal hatching.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_STRIKE</code></td>
+
+          <td align="center">4</td>
+
+          <td>Strike out.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_HIDDEN</code></td>
+
+          <td align="center">5</td>
+
+          <td>An indicator with no visual effect.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_BOX</code></td>
+
+          <td align="center">6</td>
+
+          <td>A rectangle around the text.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_ROUNDBOX</code></td>
+
+          <td align="center">7</td>
+
+          <td>A rectangle with rounded corners around the text using translucent drawing with the
+              interior usually more transparent than the border. You can use
+              <a class="seealso" href="#SCI_INDICSETALPHA">SCI_INDICSETALPHA</a> and
+			  <a class="seealso" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA</a>
+              to control the alpha transparency values. The default alpha values are 30 for fill colour and 50 for outline colour.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_STRAIGHTBOX</code></td>
+
+          <td align="center">8</td>
+
+          <td>A rectangle around the text using translucent drawing with the
+              interior usually more transparent than the border. You can use
+              <a class="seealso" href="#SCI_INDICSETALPHA">SCI_INDICSETALPHA</a> and
+			  <a class="seealso" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA</a>
+              to control the alpha transparency values. The default alpha values are 30 for fill colour and 50 for outline colour.
+              This indicator does not colour the top pixel of the line so that indicators on contiguous lines are visually distinct
+              and disconnected.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_FULLBOX</code></td>
+
+          <td align="center">16</td>
+
+          <td>A rectangle around the text using translucent drawing similar to <code>INDIC_STRAIGHTBOX</code>
+              but covering the entire character area.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_DASH</code></td>
+
+          <td align="center">9</td>
+
+          <td>A dashed underline.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_DOTS</code></td>
+
+          <td align="center">10</td>
+
+          <td>A dotted underline.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_SQUIGGLELOW</code></td>
+
+          <td align="center">11</td>
+
+          <td>Similar to <code>INDIC_SQUIGGLE</code> but only using 2 vertical pixels
+	  so will fit under small fonts.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_DOTBOX</code></td>
+
+          <td align="center">12</td>
+
+          <td>A dotted rectangle around the text using translucent drawing.
+          Translucency alternates between the alpha and outline alpha settings with the top-left pixel using the alpha setting.
+              <a class="seealso" href="#SCI_INDICSETALPHA">SCI_INDICSETALPHA</a> and
+              <a class="seealso" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA</a>
+              control the alpha transparency values. The default values are 30 for alpha and 50 for outline alpha.
+              To avoid excessive memory allocation the maximum width of a dotted box is 4000 pixels.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_GRADIENT</code></td>
+
+          <td align="center">20</td>
+
+          <td>A vertical gradient between a colour and alpha at top to fully transparent at bottom.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_GRADIENTCENTRE</code></td>
+
+          <td align="center">21</td>
+
+          <td>A vertical gradient with the specified colour and alpha in the middle
+          fading to fully transparent at top and bottom.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_SQUIGGLEPIXMAP</code></td>
+
+          <td align="center">13</td>
+
+          <td>A version of <code>INDIC_SQUIGGLE</code> that draws using a pixmap instead of
+	  as a series of line segments for performance.
+	  Measured to be between 3 and 6 times faster than <code>INDIC_SQUIGGLE</code> on GTK.
+	  Appearance will not be as good as <code>INDIC_SQUIGGLE</code> on OS X in HiDPI mode.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_COMPOSITIONTHICK</code></td>
+
+          <td align="center">14</td>
+
+          <td>A 2-pixel thick underline located at the bottom of the line to try to avoid touching the character base.
+	  Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated.
+	  This is similar to an appearance used for the target in Asian language input composition.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_COMPOSITIONTHIN</code></td>
+
+          <td align="center">15</td>
+
+          <td>A 1-pixel thick underline located just before the bottom of the line.
+	  Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated.
+	  This is similar to an appearance used for non-target ranges in Asian language input composition.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_TEXTFORE</code></td>
+
+          <td align="center">17</td>
+
+          <td>Change the colour of the text to the indicator's fore colour.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_POINT</code></td>
+
+          <td align="center">18</td>
+
+          <td>Draw a triangle below the start of the indicator range.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>INDIC_POINTCHARACTER</code></td>
+
+          <td align="center">19</td>
+
+          <td>Draw a triangle below the centre of the first character of the indicator range.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p>The default indicator styles are equivalent to:<br />
+     <code>SCI_INDICSETSTYLE(0, INDIC_SQUIGGLE);</code><br />
+     <code>SCI_INDICSETSTYLE(1, INDIC_TT);</code><br />
+     <code>SCI_INDICSETSTYLE(2, INDIC_PLAIN);</code></p>
+
+    <p><b id="SCI_INDICSETFORE">SCI_INDICSETFORE(int indicator, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_INDICGETFORE">SCI_INDICGETFORE(int indicator) &rarr; colour</b><br />
+     These two messages set and get the colour used to draw an indicator. The default indicator
+    colours are equivalent to:<br />
+     <code>SCI_INDICSETFORE(0, 0x007f00);</code> (dark green)<br />
+     <code>SCI_INDICSETFORE(1, 0xff0000);</code> (light blue)<br />
+     <code>SCI_INDICSETFORE(2, 0x0000ff);</code> (light red)</p>
+
+     <a class="message" href="#SCI_INDICSETSTROKEWIDTH">SCI_INDICSETSTROKEWIDTH(int indicator, int hundredths)</a><br />
+     <a class="message" href="#SCI_INDICGETSTROKEWIDTH">SCI_INDICGETSTROKEWIDTH(int indicator) &rarr; int</a><br />
+    <p><b id="SCI_INDICSETSTROKEWIDTH">SCI_INDICSETSTROKEWIDTH(int indicator, int hundredths)</b><br />
+     <b id="SCI_INDICGETSTROKEWIDTH">SCI_INDICGETSTROKEWIDTH(int indicator) &rarr; int</b><br />
+     These two messages set and get the stroke width used to draw an indicator in hundredths of a pixel.
+     The default value is 100 indicating a width of one pixel.
+     Some indicator styles do not support setting stroke width, generally where it makes no sense (<code>INDIC_POINT</code>) or
+     wasn't simple (<code>INDIC_SQUIGGLEPIXMAP</code>).
+     The indicators supporting stroke width are:
+     <code>INDIC_PLAIN</code>, <code>INDIC_SQUIGGLE</code>, <code>INDIC_TT</code>, <code>INDIC_DIAGONAL</code>,
+     <code>INDIC_STRIKE</code>, <code>INDIC_BOX</code>, <code>INDIC_ROUNDBOX</code>, <code>INDIC_STRAIGHTBOX</code>,
+     <code>INDIC_FULLBOX</code>, <code>INDIC_DASH</code>, <code>INDIC_DOTS</code>, <code>INDIC_SQUIGGLELOW</code>.
+     </p>
+     <p>Fractional pixel widths are possible such as 50 for half a pixel wide. 
+     On many systems a half pixel value will appear as a fainter line but it allows drawing very thin lines on systems with multiple physical pixels
+     per logical pixel.
+     Half (logical) pixel lines are available on macOS with 'retina' displays,
+     see <a class="seealso" href="#SCI_SUPPORTSFEATURE">SC_SUPPORTS_PIXEL_DIVISIONS</a>.</p>
+
+    <p><b id="SCI_INDICSETALPHA">SCI_INDICSETALPHA(int indicator, <a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     <b id="SCI_INDICGETALPHA">SCI_INDICGETALPHA(int indicator) &rarr; int</b><br />
+     These two messages set and get the alpha transparency used for drawing the
+     fill colour of the INDIC_ROUNDBOX and INDIC_STRAIGHTBOX rectangle. The alpha value can range from
+     0 (completely transparent) to 255 (no transparency).
+     </p>
+
+    <p><b id="SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA(int indicator, <a class="jump" href="#alpha">alpha</a> alpha)</b><br />
+     <b id="SCI_INDICGETOUTLINEALPHA">SCI_INDICGETOUTLINEALPHA(int indicator) &rarr; int</b><br />
+     These two messages set and get the alpha transparency used for drawing the
+     outline colour of the INDIC_ROUNDBOX and INDIC_STRAIGHTBOX rectangle. The alpha value can range from
+     0 (completely transparent) to 255 (no transparency).
+     </p>
+
+    <p><b id="SCI_INDICSETUNDER">SCI_INDICSETUNDER(int indicator, bool under)</b><br />
+     <b id="SCI_INDICGETUNDER">SCI_INDICGETUNDER(int indicator) &rarr; bool</b><br />
+     These two messages set and get whether an indicator is drawn under text or over(default).
+     Drawing under text does not work with the deprecated <a class="message" href="#SCI_SETPHASESDRAW">single phase drawing</a>
+     mode.</p>
+
+    <p><b id="SCI_INDICSETHOVERSTYLE">SCI_INDICSETHOVERSTYLE(int indicator, int
+    indicatorStyle)</b><br />
+     <b id="SCI_INDICGETHOVERSTYLE">SCI_INDICGETHOVERSTYLE(int indicator) &rarr; int</b><br />
+     <b id="SCI_INDICSETHOVERFORE">SCI_INDICSETHOVERFORE(int indicator, <a class="jump" href="#colour">colour</a> fore)</b><br />
+     <b id="SCI_INDICGETHOVERFORE">SCI_INDICGETHOVERFORE(int indicator) &rarr; colour</b><br />
+     These messages set and get the colour and style used to draw indicators when the mouse is over them or the caret moved into them.
+     The mouse cursor also changes when an indicator is drawn in hover style.
+     The default is for the hover appearance to be the same as the normal appearance and calling
+     <a class="seealso" href="#SCI_INDICSETFORE">SCI_INDICSETFORE</a> or
+     <a class="seealso" href="#SCI_INDICSETSTYLE">SCI_INDICSETSTYLE</a> will
+     also reset the hover attribute.</p>
+
+    <p><b id="SCI_INDICSETFLAGS">SCI_INDICSETFLAGS(int indicator, int flags)</b><br />
+     <b id="SCI_INDICGETFLAGS">SCI_INDICGETFLAGS(int indicator) &rarr; int</b><br />
+     These messages set and get the flags associated with an indicator.
+     There is currently one flag defined, <code>SC_INDICFLAG_VALUEFORE</code>: when this flag is set
+     the colour used by the indicator is not from the indicator's fore setting but instead from the value of the indicator at
+     that point in the file. <code>SC_INDICFLAG_NONE</code> is the default.
+     This allows many colours to be displayed for a single indicator. The value is an <a class="jump"
+    href="#colour">RGB integer colour</a> that has been ored with <code>SC_INDICVALUEBIT</code>(0x1000000)
+    when calling <a class="seealso" href="#SCI_SETINDICATORVALUE">SCI_SETINDICATORVALUE</a>.
+    To find the colour from the value, and the value with <code>SC_INDICVALUEMASK</code>(0xFFFFFF).
+     </p>
+
+    <p>
+    <b id="SCI_SETINDICATORCURRENT">SCI_SETINDICATORCURRENT(int indicator)</b><br />
+    <b id="SCI_GETINDICATORCURRENT">SCI_GETINDICATORCURRENT &rarr; int</b><br />
+    These two messages set and get the indicator that will be affected by calls to
+    <a class="message" href="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE(position start, position lengthFill)</a> and
+    <a class="message" href="#SCI_INDICATORCLEARRANGE">SCI_INDICATORCLEARRANGE(position start, position lengthClear)</a>.
+    </p>
+
+    <p>
+    <b id="SCI_SETINDICATORVALUE">SCI_SETINDICATORVALUE(int value)</b><br />
+    <b id="SCI_GETINDICATORVALUE">SCI_GETINDICATORVALUE &rarr; int</b><br />
+    These two messages set and get the value that will be set by calls to
+    <a class="seealso" href="#SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE</a>.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORFILLRANGE">SCI_INDICATORFILLRANGE(position start, position lengthFill)</b><br />
+    <b id="SCI_INDICATORCLEARRANGE">SCI_INDICATORCLEARRANGE(position start, position lengthClear)</b><br />
+    These two messages fill or clear a range for the current indicator.
+    <code>SCI_INDICATORFILLRANGE</code> fills with the current value.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORALLONFOR">SCI_INDICATORALLONFOR(position pos) &rarr; int</b><br />
+    Retrieve a bitmap value representing which indicators are non-zero at a position.
+    Only the first 32 indicators are represented in the result so no IME indicators are included.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORVALUEAT">SCI_INDICATORVALUEAT(int indicator, position pos) &rarr; int</b><br />
+    Retrieve the value of a particular indicator at a position.
+    </p>
+
+    <p>
+    <b id="SCI_INDICATORSTART">SCI_INDICATORSTART(int indicator, position pos) &rarr; position</b><br />
+    <b id="SCI_INDICATOREND">SCI_INDICATOREND(int indicator, position pos) &rarr; position</b><br />
+    Find the start or end of a range with one value from a position within the range.
+    Can be used to iterate through the document to discover all the indicator positions.
+    </p>
+
+    <h3 id="FindIndicators">OS X Find Indicator</h3>
+
+    <p>On OS X search matches are highlighted with an animated gold rounded rectangle.
+    The indicator shows, then briefly grows 25% and shrinks to the original size to draw the user's attention.
+    While this feature is currently only implemented on OS X, it may be implemented on other platforms
+    in the future.</p>
+
+    <p><b id="SCI_FINDINDICATORSHOW">SCI_FINDINDICATORSHOW(position start, position end)</b><br />
+     <b id="SCI_FINDINDICATORFLASH">SCI_FINDINDICATORFLASH(position start, position end)</b><br />
+     These two messages show and animate the find indicator. The indicator remains visible with
+     <code>SCI_FINDINDICATORSHOW</code> and fades out after showing for half a second with
+     <code>SCI_FINDINDICATORFLASH</code>.
+     <code>SCI_FINDINDICATORSHOW</code> behaves similarly to the OS X TextEdit and Safari applications
+     and is best suited to editing documentation where the search target is often a word.
+     <code>SCI_FINDINDICATORFLASH</code> is similar to Xcode and is suited to editing source code
+     where the match will often be located next to operators which would otherwise be hidden under the indicator's
+     padding.
+     </p>
+
+    <p><b id="SCI_FINDINDICATORHIDE">SCI_FINDINDICATORHIDE</b><br />
+     This message hides the find indicator.
+     </p>
+
+    <p>Earlier versions of Scintilla allowed <a href="#StyleByteIndicators">partitioning style bytes</a>
+    between style numbers and indicators and provided APIs for setting and querying this.</p>
+
+
+    <h2 id="Autocompletion">Autocompletion</h2>
+
+    <p>Autocompletion displays a list box showing likely identifiers based upon the user's typing.
+    The user chooses the currently selected item by pressing the tab character or another character
+    that is a member of the fillup character set defined with <code>SCI_AUTOCSETFILLUPS</code>.
+    Autocompletion is triggered by your application. For example, in C if you detect that the user
+    has just typed <code>fred.</code> you could look up <code>fred</code>, and if it has a known
+    list of members, you could offer them in an autocompletion list. Alternatively, you could
+    monitor the user's typing and offer a list of likely items once their typing has narrowed down
+    the choice to a reasonable list. As yet another alternative, you could define a key code to
+    activate the list.</p>
+
+    <p>When the user makes a selection from the list the container is sent a <code><a class="message"
+    href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code> <a class="jump"
+    href="#Notifications">notification message</a>. On return from the notification Scintilla will insert
+     the selected text and the container is sent a <code><a class="message"
+    href="#SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED</a></code> <a class="jump"
+    href="#Notifications">notification message</a> unless the autocompletion list has been cancelled, for example by the container sending
+     <code><a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a></code>. </p>
+
+    <p>To make use of autocompletion you must monitor each character added to the document. See
+    <code>SciTEBase::CharAdded()</code> in SciTEBase.cxx for an example of autocompletion.</p>
+    <code><a class="message" href="#SCI_AUTOCSHOW">SCI_AUTOCSHOW(position lengthEntered, const char
+    *itemList)</a><br />
+     <a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a><br />
+     <a class="message" href="#SCI_AUTOCACTIVE">SCI_AUTOCACTIVE &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCPOSSTART">SCI_AUTOCPOSSTART &rarr; position</a><br />
+     <a class="message" href="#SCI_AUTOCCOMPLETE">SCI_AUTOCCOMPLETE</a><br />
+     <a class="message" href="#SCI_AUTOCSTOPS">SCI_AUTOCSTOPS(&lt;unused&gt;, const char
+    *characterSet)</a><br />
+     <a class="message" href="#SCI_AUTOCSETSEPARATOR">SCI_AUTOCSETSEPARATOR(int
+    separatorCharacter)</a><br />
+     <a class="message" href="#SCI_AUTOCGETSEPARATOR">SCI_AUTOCGETSEPARATOR &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSELECT">SCI_AUTOCSELECT(&lt;unused&gt;, const char
+    *select)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCURRENT">SCI_AUTOCGETCURRENT &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCGETCURRENTTEXT">SCI_AUTOCGETCURRENTTEXT(&lt;unused&gt;, char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETCANCELATSTART">SCI_AUTOCSETCANCELATSTART(bool
+    cancel)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCANCELATSTART">SCI_AUTOCGETCANCELATSTART &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCSETFILLUPS">SCI_AUTOCSETFILLUPS(&lt;unused&gt;, const char
+    *characterSet)</a><br />
+     <a class="message" href="#SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE(bool
+    chooseSingle)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCHOOSESINGLE">SCI_AUTOCGETCHOOSESINGLE &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCSETIGNORECASE">SCI_AUTOCSETIGNORECASE(bool
+    ignoreCase)</a><br />
+     <a class="message" href="#SCI_AUTOCGETIGNORECASE">SCI_AUTOCGETIGNORECASE &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR">SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR(int behaviour)</a><br />
+     <a class="message" href="#SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR">SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETMULTI">SCI_AUTOCSETMULTI(int multi)</a><br />
+     <a class="message" href="#SCI_AUTOCGETMULTI">SCI_AUTOCGETMULTI &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETORDER">SCI_AUTOCSETORDER(int order)</a><br />
+     <a class="message" href="#SCI_AUTOCGETORDER">SCI_AUTOCGETORDER &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETAUTOHIDE">SCI_AUTOCSETAUTOHIDE(bool autoHide)</a><br />
+     <a class="message" href="#SCI_AUTOCGETAUTOHIDE">SCI_AUTOCGETAUTOHIDE &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCSETDROPRESTOFWORD">SCI_AUTOCSETDROPRESTOFWORD(bool
+    dropRestOfWord)</a><br />
+     <a class="message" href="#SCI_AUTOCGETDROPRESTOFWORD">SCI_AUTOCGETDROPRESTOFWORD &rarr; bool</a><br />
+     <a class="message" href="#SCI_AUTOCSETOPTIONS">SCI_AUTOCSETOPTIONS(int options)</a><br />
+     <a class="message" href="#SCI_AUTOCGETOPTIONS">SCI_AUTOCGETOPTIONS &rarr; int</a><br />
+     <a class="message" href="#SCI_REGISTERIMAGE">SCI_REGISTERIMAGE(int type, const char *xpmData)</a><br />
+     <a class="message" href="#SCI_REGISTERRGBAIMAGE">SCI_REGISTERRGBAIMAGE(int type, const char *pixels)</a><br />
+     <a class="message" href="#SCI_CLEARREGISTEREDIMAGES">SCI_CLEARREGISTEREDIMAGES</a><br />
+     <a class="message" href="#SCI_AUTOCSETTYPESEPARATOR">SCI_AUTOCSETTYPESEPARATOR(int separatorCharacter)</a><br />
+     <a class="message" href="#SCI_AUTOCGETTYPESEPARATOR">SCI_AUTOCGETTYPESEPARATOR &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</a><br />
+     <a class="message" href="#SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT &rarr; int</a><br />
+     <a class="message" href="#SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAXWIDTH(int characterCount)</a><br />
+     <a class="message" href="#SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAXWIDTH &rarr; int</a><br />
+     <a class="element" href="#SC_ELEMENT_LIST">SC_ELEMENT_LIST : colouralpha</a><br />
+     <a class="element" href="#SC_ELEMENT_LIST_BACK">SC_ELEMENT_LIST_BACK : colouralpha</a><br />
+     <a class="element" href="#SC_ELEMENT_LIST_SELECTED">SC_ELEMENT_LIST_SELECTED : colouralpha</a><br />
+     <a class="element" href="#SC_ELEMENT_LIST_SELECTED_BACK">SC_ELEMENT_LIST_SELECTED_BACK : colouralpha</a><br />
+    </code>
+
+    <p><b id="SCI_AUTOCSHOW">SCI_AUTOCSHOW(position lengthEntered, const char *itemList)</b><br />
+     This message causes a list to be displayed. <code class="parameter">lengthEntered</code> is the number of
+    characters of the word already entered and <code class="parameter">itemList</code> is the list of words separated by
+    separator characters. The initial separator character is a space but this can be set or got
+    with <a class="message" href="#SCI_AUTOCSETSEPARATOR"><code>SCI_AUTOCSETSEPARATOR</code></a>
+    and <a class="message"
+    href="#SCI_AUTOCGETSEPARATOR"><code>SCI_AUTOCGETSEPARATOR</code></a>.</p>
+
+    <p>With default settings, the list of words should be in sorted order.
+    If set to ignore case mode with <a class="message" href="#SCI_AUTOCSETIGNORECASE"><code>SCI_AUTOCSETIGNORECASE</code></a>, then
+    strings are matched after being converted to upper case. One result of this is that the list
+    should be sorted with the punctuation characters '[', '\', ']', '^', '_', and '`' sorted after
+    letters.
+    Alternative handling of list order may be specified with  <a class="seealso" href="#SCI_AUTOCSETORDER">SCI_AUTOCSETORDER</a>
+    </p>
+
+    <p><b id="SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</b><br />
+     This message cancels any displayed autocompletion list. When in autocompletion mode, the list
+    should disappear when the user types a character that can not be part of the autocompletion,
+    such as '.', '(' or '[' when typing an identifier. A set of characters that will cancel
+    autocompletion can be specified with <a class="message"
+    href="#SCI_AUTOCSTOPS"><code>SCI_AUTOCSTOPS</code></a>.</p>
+
+    <p><b id="SCI_AUTOCACTIVE">SCI_AUTOCACTIVE &rarr; bool</b><br />
+     This message returns non-zero if there is an active autocompletion list and zero if there is
+    not.</p>
+
+    <p><b id="SCI_AUTOCPOSSTART">SCI_AUTOCPOSSTART &rarr; position</b><br />
+     This returns the value of the current position when <code>SCI_AUTOCSHOW</code> started display
+    of the list.</p>
+
+    <p><b id="SCI_AUTOCCOMPLETE">SCI_AUTOCCOMPLETE</b><br />
+     This message triggers autocompletion. This has the same effect as the tab key.</p>
+
+    <p><b id="SCI_AUTOCSTOPS">SCI_AUTOCSTOPS(&lt;unused&gt;, const char *characterSet)</b><br />
+     The <code class="parameter">characterSet</code> argument is a string containing a list of characters that will
+    automatically cancel the autocompletion list. When you start the editor, this list is
+    empty.</p>
+
+    <p><b id="SCI_AUTOCSETSEPARATOR">SCI_AUTOCSETSEPARATOR(int separatorCharacter)</b><br />
+     <b id="SCI_AUTOCGETSEPARATOR">SCI_AUTOCGETSEPARATOR &rarr; int</b><br />
+     These two messages set and get the separator character used to separate words in the
+    <code>SCI_AUTOCSHOW</code> list. The default is the space character.</p>
+
+    <p><b id="SCI_AUTOCSELECT">SCI_AUTOCSELECT(&lt;unused&gt;, const char *select)</b><br />
+     <b id="SCI_AUTOCGETCURRENT">SCI_AUTOCGETCURRENT &rarr; int</b><br />
+     This message selects an item in the autocompletion list. It searches the list of words for the
+    first that matches <code class="parameter">select</code>. By default, comparisons are case sensitive, but you can
+    change this with <a class="message"
+    href="#SCI_AUTOCSETIGNORECASE"><code>SCI_AUTOCSETIGNORECASE</code></a>. The match is character
+    by character for the length of the <code class="parameter">select</code> string. That is, if select is "Fred" it
+    will match "Frederick" if this is the first item in the list that begins with "Fred". If an
+    item is found, it is selected. If the item is not found, the autocompletion list closes if
+    auto-hide is true (see <a class="message"
+    href="#SCI_AUTOCSETAUTOHIDE"><code>SCI_AUTOCSETAUTOHIDE</code></a>).<br />
+    The current selection index can be retrieved with <code>SCI_AUTOCGETCURRENT</code>.</p>
+
+    <p><b id="SCI_AUTOCGETCURRENTTEXT">SCI_AUTOCGETCURRENTTEXT(&lt;unused&gt;, char *text NUL-terminated) &rarr; int</b><br />
+     This message retrieves the current selected text in the autocompletion list. Normally the
+    <a class="message" href="#SCN_AUTOCSELECTION"><code>SCN_AUTOCSELECTION</code></a> notification
+    is used instead.</p>
+
+    <p>The value is copied to the <code class="parameter">text</code> buffer, returning the length (not including the
+    terminating 0). If not found, an empty string is copied to the buffer and 0 is returned.</p>
+
+    <p>If the value argument is 0 then the length that should be allocated to store the value is
+    returned; again, the terminating 0 is not included.</p>
+
+    <p><b id="SCI_AUTOCSETCANCELATSTART">SCI_AUTOCSETCANCELATSTART(bool cancel)</b><br />
+     <b id="SCI_AUTOCGETCANCELATSTART">SCI_AUTOCGETCANCELATSTART &rarr; bool</b><br />
+     The default behaviour is for the list to be cancelled if the caret moves to the location it
+    was at when the list was displayed. By calling this message with a <code>false</code> argument,
+    the list is not cancelled until the caret moves at least one character before the word being
+    completed.</p>
+
+    <p><b id="SCI_AUTOCSETFILLUPS">SCI_AUTOCSETFILLUPS(&lt;unused&gt;, const char *characterSet)</b><br />
+     If a fillup character is typed with an autocompletion list active, the currently selected item
+    in the list is added into the document, then the fillup character is added. Common fillup
+    characters are '(', '[' and '.' but others are possible depending on the language. By default,
+    no fillup characters are set.</p>
+
+    <p><b id="SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE(bool chooseSingle)</b><br />
+     <b id="SCI_AUTOCGETCHOOSESINGLE">SCI_AUTOCGETCHOOSESINGLE &rarr; bool</b><br />
+     If you use <code>SCI_AUTOCSETCHOOSESINGLE(1)</code> and a list has only one item, it is
+    automatically added and no list is displayed. The default is to display the list even if there
+    is only a single item.</p>
+
+    <p><b id="SCI_AUTOCSETIGNORECASE">SCI_AUTOCSETIGNORECASE(bool ignoreCase)</b><br />
+     <b id="SCI_AUTOCGETIGNORECASE">SCI_AUTOCGETIGNORECASE &rarr; bool</b><br />
+     By default, matching of characters to list members is case sensitive. These messages let you
+    set and get case sensitivity.</p>
+
+    <p><b id="SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR">SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR(int behaviour)</b><br />
+    <b id="SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR">SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR &rarr; int</b><br />
+    When autocompletion is set to ignore case (<code>SCI_AUTOCSETIGNORECASE</code>), by default it will
+    nonetheless select the first list member that matches in a case sensitive way to entered characters.
+    This corresponds to a behaviour property of <code>SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE</code> (0).
+    If you want autocompletion to ignore case at all, choose <code>SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE</code> (1).</p>
+
+    <p><b id="SCI_AUTOCSETMULTI">SCI_AUTOCSETMULTI(int multi)</b><br />
+    <b id="SCI_AUTOCGETMULTI">SCI_AUTOCGETMULTI &rarr; int</b><br />
+    When autocompleting with multiple selections present, the autocompleted text can go into just the main selection with
+    <code>SC_MULTIAUTOC_ONCE</code> (0) or into each selection with <code>SC_MULTIAUTOC_EACH</code> (1).
+    The default is <code>SC_MULTIAUTOC_ONCE</code>.</p>
+
+    <p><b id="SCI_AUTOCSETORDER">SCI_AUTOCSETORDER(int order)</b><br />
+    <b id="SCI_AUTOCGETORDER">SCI_AUTOCGETORDER &rarr; int</b><br />
+    The default setting <code>SC_ORDER_PRESORTED</code> (0) requires that the list be provided in alphabetical sorted order.
+   </p>
+    <p>Sorting the list can be done by Scintilla instead of the application with <code>SC_ORDER_PERFORMSORT</code> (1).
+    This will take additional time.
+   </p>
+    <p>Applications that wish to prioritize some values and show the list in order of priority instead
+    of alphabetical order can use <code>SC_ORDER_CUSTOM</code> (2).
+    This requires extra processing in <a class="seealso" href="#SCI_AUTOCSHOW">SCI_AUTOCSHOW</a> to create a sorted index.
+   </p>
+    <p>Setting the order should be done before calling <a class="seealso" href="#SCI_AUTOCSHOW">SCI_AUTOCSHOW</a>.
+   </p>
+
+    <p><b id="SCI_AUTOCSETAUTOHIDE">SCI_AUTOCSETAUTOHIDE(bool autoHide)</b><br />
+     <b id="SCI_AUTOCGETAUTOHIDE">SCI_AUTOCGETAUTOHIDE &rarr; bool</b><br />
+     By default, the list is cancelled if there are no viable matches (the user has typed
+    characters that no longer match a list entry). If you want to keep displaying the original
+    list, set <code class="parameter">autoHide</code> to <code>false</code>. This also effects <a class="seealso"
+    href="#SCI_AUTOCSELECT"><code>SCI_AUTOCSELECT</code></a>.</p>
+
+    <p><b id="SCI_AUTOCSETDROPRESTOFWORD">SCI_AUTOCSETDROPRESTOFWORD(bool dropRestOfWord)</b><br />
+     <b id="SCI_AUTOCGETDROPRESTOFWORD">SCI_AUTOCGETDROPRESTOFWORD &rarr; bool</b><br />
+     When an item is selected, any word characters following the caret are first erased if
+    <code class="parameter">dropRestOfWord</code> is set <code>true</code>. The default is <code>false</code>.</p>
+
+    <p><b id="SCI_AUTOCSETOPTIONS">SCI_AUTOCSETOPTIONS(int options)</b><br />
+     <b id="SCI_AUTOCGETOPTIONS">SCI_AUTOCGETOPTIONS &rarr; int</b><br />
+     Set options for autocompletion from the following list.</p>
+
+    <table class="standard" summary="Autocompletion options">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Purpose</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_AUTOCOMPLETE_NORMAL</code></td>
+
+          <td align="center">0</td>
+
+          <td>Display autocompletion using default settings.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_AUTOCOMPLETE_FIXED_SIZE</code></td>
+
+          <td align="center">1</td>
+
+          <td>On Win32 only, use a fixed size list instead of one that can be resized by the user.
+	  This also avoids a header rectangle above the list.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p>
+      <b id="SCI_REGISTERIMAGE">SCI_REGISTERIMAGE(int type, const char *xpmData)</b><br />
+      <b id="SCI_REGISTERRGBAIMAGE">SCI_REGISTERRGBAIMAGE(int type, const char *pixels)</b><br />
+      <b id="SCI_CLEARREGISTEREDIMAGES">SCI_CLEARREGISTEREDIMAGES</b><br />
+      <b id="SCI_AUTOCSETTYPESEPARATOR">SCI_AUTOCSETTYPESEPARATOR(int separatorCharacter)</b><br />
+      <b id="SCI_AUTOCGETTYPESEPARATOR">SCI_AUTOCGETTYPESEPARATOR &rarr; int</b><br />
+
+      Autocompletion list items may display an image as well as text. Each image is first registered with an integer
+      type. Then this integer is included in the text of the list separated by a '?' from the text. For example,
+      "fclose?2 fopen" displays image 2 before the string "fclose" and no image before "fopen".
+      The images are in either the <a class="jump" href="#XPM">XPM format</a> (<code>SCI_REGISTERIMAGE</code>) or
+      <a class="jump" href="#RGBA">RGBA format</a> (<code>SCI_REGISTERRGBAIMAGE</code>).
+      For <code>SCI_REGISTERRGBAIMAGE</code> the width and height must previously been set with
+      the <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and
+      <a class="message" href="#SCI_RGBAIMAGESETHEIGHT"><code>SCI_RGBAIMAGESETHEIGHT</code></a> messages.
+      The set of registered images can be cleared with <code>SCI_CLEARREGISTEREDIMAGES</code> and the '?' separator changed
+      with <code>SCI_AUTOCSETTYPESEPARATOR</code>.
+    </p>
+
+    <p>
+      <b id="SCI_AUTOCSETMAXHEIGHT">SCI_AUTOCSETMAXHEIGHT(int rowCount)</b><br />
+      <b id="SCI_AUTOCGETMAXHEIGHT">SCI_AUTOCGETMAXHEIGHT &rarr; int</b><br />
+
+      Get or set the maximum number of rows that will be visible in an autocompletion list. If there are more rows in the list, then a vertical
+      scrollbar is shown. The default is 5.
+     </p>
+
+    <p>
+      <b id="SCI_AUTOCSETMAXWIDTH">SCI_AUTOCSETMAXWIDTH(int characterCount)</b><br />
+      <b id="SCI_AUTOCGETMAXWIDTH">SCI_AUTOCGETMAXWIDTH &rarr; int</b><br />
+
+      Get or set the maximum width of an autocompletion list expressed as the number of characters in the longest item that will be totally visible.
+      If zero (the default) then the list's width is calculated to fit the item with the most characters. Any items that cannot be fully displayed within
+      the available width are indicated by the presence of ellipsis.
+     </p>
+
+    <p>
+     <b id="SC_ELEMENT_LIST">SC_ELEMENT_LIST : colouralpha</b><br />
+     <b id="SC_ELEMENT_LIST_BACK">SC_ELEMENT_LIST_BACK : colouralpha</b><br />
+     <b id="SC_ELEMENT_LIST_SELECTED">SC_ELEMENT_LIST_SELECTED : colouralpha</b><br />
+     <b id="SC_ELEMENT_LIST_SELECTED_BACK">SC_ELEMENT_LIST_SELECTED_BACK : colouralpha</b><br />
+     The colours used for autocompletion lists may be customised on Win32 using
+     <a class="message" href="#SCI_SETELEMENTCOLOUR"><code>SCI_SETELEMENTCOLOUR</code></a>.
+     </p>
+
+    <h2 id="UserLists">User lists</h2>
+
+    <p>User lists use the same internal mechanisms as autocompletion lists, and all the calls
+    listed for autocompletion work on them; you cannot display a user list at the same time as an
+    autocompletion list is active. They differ in the following respects:</p>
+
+    <code><a class="message" href="#SCI_USERLISTSHOW">SCI_USERLISTSHOW(int listType, const char *itemList)</a><br /></code>
+
+    <p>o The <code><a class="message"
+    href="#SCI_AUTOCSETCHOOSESINGLE">SCI_AUTOCSETCHOOSESINGLE</a></code> message has no
+    effect.<br />
+     o When the user makes a selection you are sent a <code><a class="jump"
+    href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a></code> <a class="jump"
+    href="#Notifications">notification message</a> rather than <code><a class="jump"
+    href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code>.</p>
+
+    <p>BEWARE: if you have set fillup characters or stop characters, these will still be active
+    with the user list, and may result in items being selected or the user list cancelled due to
+    the user typing into the editor.</p>
+
+    <p><b id="SCI_USERLISTSHOW">SCI_USERLISTSHOW(int listType, const char *itemList)</b><br />
+     The <code class="parameter">listType</code> parameter is returned to the container as the <code>wParam</code>
+    field of the <a class="message" href="#SCNotification"><code>SCNotification</code></a>
+    structure. It must be greater than 0 as this is how Scintilla tells the difference between an
+    autocompletion list and a user list. If you have different types of list, for example a list of
+    buffers and a list of macros, you can use <code class="parameter">listType</code> to tell which one has returned
+    a selection. </p>
+
+    <h2 id="CallTips">Call tips</h2>
+
+    <p>Call tips are small windows displaying the arguments to a function and are displayed after
+    the user has typed the name of the function. They normally display characters using the font
+    facename, size and character set defined by
+    <code><a class="message" href="#StyleDefinition">STYLE_DEFAULT</a></code>. You can choose to
+    use <code><a class="message" href="#StyleDefinition">STYLE_CALLTIP</a></code> to define the
+    facename, size, foreground and background colours and character set with
+    <code><a class="seealso" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE</a></code>.
+    This also enables support for Tab characters.
+
+    There is some interaction between call tips and autocompletion lists in that showing a
+    call tip cancels any active autocompletion list, and vice versa.</p>
+
+    <p>Call tips can highlight part of the text within them. You could use this to highlight the
+    current argument to a function by counting the number of commas (or whatever separator your
+    language uses). See <code>SciTEBase::CharAdded()</code> in <code>SciTEBase.cxx</code> for an
+    example of call tip use.</p>
+
+    <p>The mouse may be clicked on call tips and this causes a
+    <code><a class="message" href="#SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</a></code>
+    notification to be sent to the container. Small up and down arrows may be displayed within
+    a call tip by, respectively, including the characters '\001', or '\002'. This is useful
+    for showing that there are overloaded variants of one function name and that the user can
+    click on the arrows to cycle through the overloads.</p>
+
+    <p>Alternatively, call tips can be displayed when you leave the mouse pointer for a while over
+    a word in response to the <code><a class="message"
+    href="#SCN_DWELLSTART">SCN_DWELLSTART</a></code> <a class="jump"
+    href="#Notifications">notification</a> and cancelled in response to <code><a class="message"
+    href="#SCN_DWELLEND">SCN_DWELLEND</a></code>. This method could be used in a debugger to give
+    the value of a variable, or during editing to give information about the word under the
+    pointer.</p>
+    <code><a class="message" href="#SCI_CALLTIPSHOW">SCI_CALLTIPSHOW(position pos, const char
+    *definition)</a><br />
+     <a class="message" href="#SCI_CALLTIPCANCEL">SCI_CALLTIPCANCEL</a><br />
+     <a class="message" href="#SCI_CALLTIPACTIVE">SCI_CALLTIPACTIVE &rarr; bool</a><br />
+     <a class="message" href="#SCI_CALLTIPPOSSTART">SCI_CALLTIPPOSSTART &rarr; position</a><br />
+     <a class="message" href="#SCI_CALLTIPSETPOSSTART">SCI_CALLTIPSETPOSSTART(position posStart)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETHLT">SCI_CALLTIPSETHLT(position highlightStart, position
+    highlightEnd)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETBACK">SCI_CALLTIPSETBACK(colour back)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETFORE">SCI_CALLTIPSETFORE(colour fore)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETFOREHLT">SCI_CALLTIPSETFOREHLT(colour fore)</a><br />
+     <a class="message" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE(int tabSize)</a><br />
+     <a class="message" href="#SCI_CALLTIPSETPOSITION">SCI_CALLTIPSETPOSITION(bool above)</a><br />
+    </code>
+
+    <p><b id="SCI_CALLTIPSHOW">SCI_CALLTIPSHOW(position pos, const char *definition)</b><br />
+     This message starts the process by displaying the call tip window. If a call tip is already
+    active, this has no effect.<br />
+     <code class="parameter">pos</code> is the position in the document at which to align the call tip. The call
+    tip text is aligned to start 1 line below this character unless you have included up and/or
+    down arrows in the call tip text in which case the tip is aligned to the right-hand edge of
+    the rightmost arrow. The assumption is that you will start the text with something like
+    "\001 1 of 3 \002".<br />
+     <code class="parameter">definition</code> is the call tip text. This can contain multiple lines separated by
+    '\n' (Line Feed, ASCII code 10) characters. Do not include '\r' (Carriage Return, ASCII
+     code 13), as this will most likely print as an empty box. '\t' (Tab, ASCII code 9) is
+     supported if you set a tabsize with
+    <code><a class="seealso" href="#SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE</a></code>.<br />
+    The position of the caret is remembered here so that the call tip can be cancelled automatically if subsequent deletion
+    moves the caret before this position.</p>
+
+    <p><b id="SCI_CALLTIPCANCEL">SCI_CALLTIPCANCEL</b><br />
+     This message cancels any displayed call tip. Scintilla will also cancel call tips for you if
+    you use any keyboard commands that are not compatible with editing the argument list of a
+    function.
+    Call tips are cancelled if you delete back past the position where the caret was when the tip was triggered.</p>
+
+    <p><b id="SCI_CALLTIPACTIVE">SCI_CALLTIPACTIVE &rarr; bool</b><br />
+     This returns 1 if a call tip is active and 0 if it is not active.</p>
+
+    <p><b id="SCI_CALLTIPPOSSTART">SCI_CALLTIPPOSSTART &rarr; position</b><br />
+    <b id="SCI_CALLTIPSETPOSSTART">SCI_CALLTIPSETPOSSTART(position posStart)</b><br />
+     This message returns or sets the value of the current position when <code>SCI_CALLTIPSHOW</code>
+    started to display the tip.</p>
+
+    <p><b id="SCI_CALLTIPSETHLT">SCI_CALLTIPSETHLT(position highlightStart, position highlightEnd)</b><br />
+     This sets the region of the call tips text to display in a highlighted style.
+    <code class="parameter">highlightStart</code> is the zero-based index into the string of the first character to
+    highlight and <code class="parameter">highlightEnd</code> is the index of the first character after the highlight.
+    <code class="parameter">highlightEnd</code> must be greater than <code class="parameter">highlightStart</code>;
+    <code>highlightEnd-highlightStart</code> is the
+    number of characters to highlight. Highlights can extend over line ends if this is
+    required.</p>
+
+    <p>Unhighlighted text is drawn in a mid grey. Selected text is drawn in a dark blue. The
+    background is white. These can be changed with
+    <code>SCI_CALLTIPSETBACK</code>,
+    <code>SCI_CALLTIPSETFORE</code>, and
+    <code>SCI_CALLTIPSETFOREHLT</code>.
+    </p>
+
+    <p><b id="SCI_CALLTIPSETBACK">SCI_CALLTIPSETBACK(<a class="jump" href="#colour">colour</a> back)</b><br />
+     The background colour of call tips can be set with this message; the default colour is white.
+    It is not a good idea to set a dark colour as the background as the default colour for normal
+    calltip text is mid grey and the default colour for highlighted text is dark blue. This also
+    sets the background colour of <code>STYLE_CALLTIP</code>.</p>
+
+    <p><b id="SCI_CALLTIPSETFORE">SCI_CALLTIPSETFORE(<a class="jump" href="#colour">colour</a> fore)</b><br />
+     The colour of call tip text can be set with this message; the default colour is mid grey.
+    This also sets the foreground colour of <code>STYLE_CALLTIP</code>.</p>
+
+    <p><b id="SCI_CALLTIPSETFOREHLT">SCI_CALLTIPSETFOREHLT(<a class="jump" href="#colour">colour</a> fore)</b><br />
+     The colour of highlighted call tip text can be set with this message; the default colour
+    is dark blue.</p>
+
+    <p><b id="SCI_CALLTIPUSESTYLE">SCI_CALLTIPUSESTYLE(int tabSize)</b><br />
+     This message changes the style used for call tips from <code>STYLE_DEFAULT</code> to
+    <code>STYLE_CALLTIP</code> and sets a tab size in screen pixels. If <code class="parameter">tabsize</code> is
+    less than 1, Tab characters are not treated specially. Once this call has been used, the
+    call tip foreground and background colours are also taken from the style.</p>
+
+    <p><b id="SCI_CALLTIPSETPOSITION">SCI_CALLTIPSETPOSITION(bool above)</b><br />
+     By default the calltip is displayed below the text, setting above to <code>true</code>
+    (1) will display it above the text.</p>
+
+
+    <h2 id="KeyboardCommands">Keyboard commands</h2>
+
+    <p>To allow the container application to perform any of the actions available to the user with
+    keyboard, all the keyboard actions are messages. They do not take any parameters. These
+    commands are also used when redefining the key bindings with the <a class="message"
+    href="#SCI_ASSIGNCMDKEY"><code>SCI_ASSIGNCMDKEY</code></a> message.</p>
+
+    <table border="0" summary="Keyboard commands">
+      <tbody>
+        <tr>
+          <td><code>SCI_LINEDOWN</code></td>
+
+          <td><code>SCI_LINEDOWNEXTEND</code></td>
+
+          <td><code>SCI_LINEDOWNRECTEXTEND</code></td>
+
+          <td><code>SCI_LINESCROLLDOWN</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEUP</code></td>
+
+          <td><code>SCI_LINEUPEXTEND</code></td>
+
+          <td><code>SCI_LINEUPRECTEXTEND</code></td>
+
+          <td><code>SCI_LINESCROLLUP</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PARADOWN</code></td>
+
+          <td><code>SCI_PARADOWNEXTEND</code></td>
+
+          <td><code>SCI_PARAUP</code></td>
+
+          <td><code>SCI_PARAUPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_CHARLEFT</code></td>
+
+          <td><code>SCI_CHARLEFTEXTEND</code></td>
+
+          <td><code>SCI_CHARLEFTRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_CHARRIGHT</code></td>
+
+          <td><code>SCI_CHARRIGHTEXTEND</code></td>
+
+          <td><code>SCI_CHARRIGHTRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDLEFT</code></td>
+
+          <td><code>SCI_WORDLEFTEXTEND</code></td>
+
+          <td><code>SCI_WORDRIGHT</code></td>
+
+          <td><code>SCI_WORDRIGHTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDLEFTEND</code></td>
+
+          <td><code>SCI_WORDLEFTENDEXTEND</code></td>
+
+          <td><code>SCI_WORDRIGHTEND</code></td>
+
+          <td><code>SCI_WORDRIGHTENDEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_WORDPARTLEFT</code></td>
+
+          <td><code>SCI_WORDPARTLEFTEXTEND</code></td>
+
+          <td><code>SCI_WORDPARTRIGHT</code></td>
+
+          <td><code>SCI_WORDPARTRIGHTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_HOME</code></td>
+
+          <td><code>SCI_HOMEEXTEND</code></td>
+
+          <td><code>SCI_HOMERECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_HOMEDISPLAY</code></td>
+
+          <td><code>SCI_HOMEDISPLAYEXTEND</code></td>
+
+          <td><code>SCI_HOMEWRAP</code></td>
+
+          <td><code>SCI_HOMEWRAPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_VCHOME</code></td>
+
+          <td><code>SCI_VCHOMEEXTEND</code></td>
+
+          <td><code>SCI_VCHOMERECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_VCHOMEWRAP</code></td>
+
+          <td><code>SCI_VCHOMEWRAPEXTEND</code></td>
+
+          <td><code>SCI_VCHOMEDISPLAY</code></td>
+
+          <td><code>SCI_VCHOMEDISPLAYEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEEND</code></td>
+
+          <td><code>SCI_LINEENDEXTEND</code></td>
+
+          <td><code>SCI_LINEENDRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LINEENDDISPLAY</code></td>
+
+          <td><code>SCI_LINEENDDISPLAYEXTEND</code></td>
+
+          <td><code>SCI_LINEENDWRAP</code></td>
+
+          <td><code>SCI_LINEENDWRAPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DOCUMENTSTART</code></td>
+
+          <td><code>SCI_DOCUMENTSTARTEXTEND</code></td>
+
+          <td><code>SCI_DOCUMENTEND</code></td>
+
+          <td><code>SCI_DOCUMENTENDEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PAGEUP</code></td>
+
+          <td><code>SCI_PAGEUPEXTEND</code></td>
+
+          <td><code>SCI_PAGEUPRECTEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_PAGEDOWN</code></td>
+
+          <td><code>SCI_PAGEDOWNEXTEND</code></td>
+
+          <td><code>SCI_PAGEDOWNRECTEXTEND</code></td>
+        </tr>
+
+
+        <tr>
+          <td><code>SCI_STUTTEREDPAGEUP</code></td>
+
+          <td><code>SCI_STUTTEREDPAGEUPEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_STUTTEREDPAGEDOWN</code></td>
+
+          <td><code>SCI_STUTTEREDPAGEDOWNEXTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELETEBACK</code></td>
+
+          <td><code>SCI_DELETEBACKNOTLINE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELWORDLEFT</code></td>
+
+          <td><code>SCI_DELWORDRIGHT</code></td>
+
+          <td><code>SCI_DELWORDRIGHTEND</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_DELLINELEFT</code></td>
+
+          <td><code>SCI_DELLINERIGHT</code></td>
+
+          <td><code>SCI_LINEDELETE</code></td>
+
+          <td><code>SCI_LINECUT</code></td>
+        </tr>
+
+        <tr>
+
+          <td><code>SCI_LINECOPY</code></td>
+
+          <td><code>SCI_LINETRANSPOSE</code></td>
+
+          <td><code>SCI_LINEREVERSE</code></td>
+
+          <td><code>SCI_LINEDUPLICATE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_LOWERCASE</code></td>
+
+          <td><code>SCI_UPPERCASE</code></td>
+
+          <td><code>SCI_CANCEL</code></td>
+
+          <td><code>SCI_EDITTOGGLEOVERTYPE</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_NEWLINE</code></td>
+
+          <td><code>SCI_FORMFEED</code></td>
+
+          <td><code>SCI_TAB</code></td>
+
+          <td><code>SCI_BACKTAB</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_SELECTIONDUPLICATE</code></td>
+
+          <td><code>SCI_VERTICALCENTRECARET</code></td>
+
+        </tr>
+
+        <tr>
+          <td><code>SCI_MOVESELECTEDLINESUP</code></td>
+
+          <td><code>SCI_MOVESELECTEDLINESDOWN</code></td>
+        </tr>
+
+        <tr>
+          <td><code>SCI_SCROLLTOSTART</code></td>
+
+          <td><code>SCI_SCROLLTOEND</code></td>
+        </tr>
+     </tbody>
+    </table>
+
+    <p>The <code>SCI_*EXTEND</code> messages extend the selection.</p>
+
+    <p>The <code>SCI_*RECTEXTEND</code> messages extend the rectangular selection
+    (and convert regular selection to rectangular one, if any).</p>
+
+    <p>The <code>SCI_WORDPART*</code> commands are used to move between word segments marked by
+    capitalisation (aCamelCaseIdentifier) or underscores (an_under_bar_ident).</p>
+
+    <p>The <code>SCI_WORD[LEFT|RIGHT]END*</code> commands are
+    similar to <code>SCI_WORD[LEFT|RIGHT]*</code> but move between word ends instead of word starts.</p>
+
+    <p>The <code>SCI_HOME*</code> commands move the caret to the start of the line, while the
+    <code>SCI_VCHOME*</code> commands move the caret to the first non-blank character of the line
+    (ie. just after the indentation) unless it is already there; in this case, it acts as SCI_HOME*.</p>
+
+    <p>The <code>SCI_[HOME|LINEEND]DISPLAY*</code> commands are used when in line wrap mode to
+    allow movement to the start or end of display lines as opposed to the normal
+    <code>SCI_[HOME|LINEEND]</code> commands which move to the start or end of document lines.</p>
+
+    <p>The <code>SCI_[[VC]HOME|LINEEND]WRAP*</code> commands are like their namesakes
+    <code>SCI_[[VC]HOME|LINEEND]*</code> except they behave differently when word-wrap is enabled:
+     They go first to the start / end of the display line, like <code>SCI_[HOME|LINEEND]DISPLAY*</code>,
+     but if the cursor is already at the point, it goes on to the start or end of the document line,
+     as appropriate for <code>SCI_[[VC]HOME|LINEEND]*</code>.
+     </p>
+
+    <p>The <code>SCI_SCROLLTO[START|END]</code> commands scroll the document to the start
+    or end without changing the selection. These commands match OS X platform conventions for the behaviour of the
+    <code>home</code> and <code>end</code> keys. Scintilla can be made to match OS X applications
+    by binding the <code>home</code> and <code>end</code> keys to these commands.
+     </p>
+
+    <p class="message" id="SCI_CANCEL">The <code>SCI_CANCEL</code> command cancels autocompletion and
+    calltip display and drops any additional selections.
+     </p>
+
+    <h2 id="KeyBindings">Key bindings</h2>
+
+    <p>There is a default binding of keys to commands that is defined in the Scintilla source in
+    the file <code>KeyMap.cxx</code> by the constant <code>KeyMap::MapDefault[]</code>. This table
+    maps key definitions to <code>SCI_*</code> messages with no parameters (mostly the <a
+    class="jump" href="#KeyboardCommands">keyboard commands</a> discussed above, but any Scintilla
+    command that has no arguments can be mapped). You can change the mapping to suit your own
+    requirements.</p>
+    <code><a class="message" href="#SCI_ASSIGNCMDKEY">SCI_ASSIGNCMDKEY(int keyDefinition, int
+    sciCommand)</a><br />
+     <a class="message" href="#SCI_CLEARCMDKEY">SCI_CLEARCMDKEY(int keyDefinition)</a><br />
+     <a class="message" href="#SCI_CLEARALLCMDKEYS">SCI_CLEARALLCMDKEYS</a><br />
+     <a class="message" href="#SCI_NULL">SCI_NULL</a><br />
+    </code>
+
+    <p><b id="keyDefinition">keyDefinition</b><br />
+     A key definition contains the key code in the low 16-bits and the key modifiers in the high
+    16-bits. To combine <code>keyCode</code> and <code>keyMod</code> set:<br />
+    <br />
+     <code>keyDefinition = keyCode + (keyMod &lt;&lt; 16)</code></p>
+
+    <p>The key code is a visible or control character or a key from the <code>SCK_*</code>
+    enumeration, which contains:<br />
+     <code>SCK_ADD</code>, <code>SCK_BACK</code>, <code>SCK_DELETE</code>, <code>SCK_DIVIDE</code>,
+    <code>SCK_DOWN</code>, <code>SCK_END</code>, <code>SCK_ESCAPE</code>, <code>SCK_HOME</code>,
+    <code>SCK_INSERT</code>, <code>SCK_LEFT</code>, <code>SCK_MENU</code>, <code>SCK_NEXT</code> (Page Down),
+    <code>SCK_PRIOR</code> (Page Up), <code>SCK_RETURN</code>, <code>SCK_RIGHT</code>,
+    <code>SCK_RWIN</code>,
+    <code>SCK_SUBTRACT</code>, <code>SCK_TAB</code>, <code>SCK_UP</code>, and
+    <code>SCK_WIN</code>.</p>
+
+    <p>The modifiers are a combination of zero or more of <code>SCMOD_ALT</code>,
+    <code>SCMOD_CTRL</code>, <code>SCMOD_SHIFT</code>,
+    <code>SCMOD_META</code>, and <code>SCMOD_SUPER</code>.
+    On OS X, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to
+    <code>SCMOD_META</code>.
+    <code>SCMOD_SUPER</code> is only available on GTK which is commonly the Windows key.
+    If you are building a table, you might
+    want to use <code>SCMOD_NORM</code>, which has the value 0, to mean no modifiers.</p>
+
+    <p>On Win32, the numeric keypad with Alt pressed can be used to enter characters by number.
+    This can produce unexpected results in non-numlock mode when function keys are assigned so
+    potentially problematic keys are ignored. For example, setting
+    <code>SCMOD_ALT</code>,<code>SCK_UP</code> will only be active for the Up key on the
+    main cursor keys, not the numeric keypad.</p>
+
+    <p><b id="SCI_ASSIGNCMDKEY">SCI_ASSIGNCMDKEY(int <a class="jump"
+    href="#keyDefinition">keyDefinition</a>, int sciCommand)</b><br />
+     This assigns the given key definition to a Scintilla command identified by
+    <code class="parameter">sciCommand</code>. <code class="parameter">sciCommand</code> can be any <code>SCI_*</code> command that has
+    no arguments.</p>
+
+    <p><b id="SCI_CLEARCMDKEY">SCI_CLEARCMDKEY(int <a class="jump"
+    href="#keyDefinition">keyDefinition</a>)</b><br />
+     This makes the given key definition do nothing by assigning the action <code>SCI_NULL</code>
+    to it.</p>
+
+    <p><b id="SCI_CLEARALLCMDKEYS">SCI_CLEARALLCMDKEYS</b><br />
+     This command removes all keyboard command mapping by setting an empty mapping table.</p>
+
+    <p><b id="SCI_NULL">SCI_NULL</b><br />
+     The <code>SCI_NULL</code> does nothing and is the value assigned to keys that perform no
+    action. SCI_NULL ensures that keys do not propagate to the parent window as that may
+    cause focus to move. If you want the standard platform behaviour use the constant 0 instead.</p>
+
+    <h2 id="PopupEditMenu">Popup edit menu</h2>
+
+    <code><a class="message" href="#SCI_USEPOPUP">SCI_USEPOPUP(int popUpMode)</a><br />
+    </code>
+
+    <p><b id="SCI_USEPOPUP">SCI_USEPOPUP(int popUpMode)</b><br />
+     Clicking the wrong button on the mouse pops up a short default editing menu. This may be
+    turned off with <code>SCI_USEPOPUP(SC_POPUP_NEVER)</code>. If you turn it off, context menu commands (in
+    Windows, <code>WM_CONTEXTMENU</code>) will not be handled by Scintilla, so the parent of the
+    Scintilla window will have the opportunity to handle the message.</p>
+
+        <table class="standard" summary="Display context menu mode">
+          <tbody>
+            <tr>
+              <th align="left">Symbol</th>
+
+              <th>Value</th>
+
+              <th align="left">Meaning</th>
+
+            </tr>
+          </tbody>
+
+          <tbody valign="top">
+            <tr>
+              <td align="left"><code>SC_POPUP_NEVER</code></td>
+
+              <td align="center">0</td>
+
+              <td>Never show default editing menu.</td>
+
+            </tr>
+
+            <tr>
+              <td align="left"><code>SC_POPUP_ALL</code></td>
+
+              <td align="center">1</td>
+
+              <td>Show default editing menu if clicking on scintilla.</td>
+
+            </tr>
+
+            <tr>
+              <td align="left"><code>SC_POPUP_TEXT</code></td>
+
+              <td align="center">2</td>
+
+              <td>Show default editing menu only if clicking on text area.</td>
+
+            </tr>
+
+          </tbody>
+        </table>
+
+    <h2 id="MacroRecording">Macro recording</h2>
+
+    <p>Start and stop macro recording mode. In macro recording mode, actions are reported to the
+    container through <code><a class="message" href="#SCN_MACRORECORD">SCN_MACRORECORD</a></code>
+    <a class="jump" href="#Notifications">notifications</a>. It is then up to the container to
+    record these actions for future replay.</p>
+
+    <code><a class="message" href="#SCI_STARTRECORD">SCI_STARTRECORD</a><br />
+     <a class="message" href="#SCI_STOPRECORD">SCI_STOPRECORD</a><br />
+    </code>
+
+    <p><b id="SCI_STARTRECORD">SCI_STARTRECORD</b><br />
+     <b id="SCI_STOPRECORD">SCI_STOPRECORD</b><br />
+     These two messages turn macro recording on and off.</p>
+
+    <h2 id="Printing">Printing</h2>
+
+    <p><code>SCI_FORMATRANGE</code> can be used to draw the text onto a display surface
+    which can include a printer display surface. Printed output shows text styling as on the
+    screen, but it hides all margins except a line number margin. All special marker effects are
+    removed and the selection and caret are hidden.</p>
+
+    <p>Different platforms use different display surface ID types to print on. On Windows, these are
+    <code>HDC</code>s., on GTK 3.x <code>cairo_t *</code>,
+    and on Cocoa <code>CGContextRef</code> is used.</p>
+
+    <code><a class="message" href="#SCI_FORMATRANGE">SCI_FORMATRANGE(bool draw, Sci_RangeToFormat *fr) &rarr; position</a><br />
+     <a class="message" href="#SCI_SETPRINTMAGNIFICATION">SCI_SETPRINTMAGNIFICATION(int
+    magnification)</a><br />
+     <a class="message" href="#SCI_GETPRINTMAGNIFICATION">SCI_GETPRINTMAGNIFICATION &rarr; int</a><br />
+     <a class="message" href="#SCI_SETPRINTCOLOURMODE">SCI_SETPRINTCOLOURMODE(int mode)</a><br />
+     <a class="message" href="#SCI_GETPRINTCOLOURMODE">SCI_GETPRINTCOLOURMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETPRINTWRAPMODE">SCI_SETPRINTWRAPMODE(int wrapMode)</a><br />
+     <a class="message" href="#SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_FORMATRANGE">SCI_FORMATRANGE(bool draw, Sci_RangeToFormat *fr) &rarr; position</b><br />
+     This call renders a range of text into a device context. If you use
+    this for printing, you will probably want to arrange a page header and footer; Scintilla does
+    not do this for you. See <code>SciTEWin::Print()</code> in <code>SciTEWinDlg.cxx</code> for an
+    example. Each use of this message renders a range of text into a rectangular area and returns
+    the position in the document of the next character to print.</p>
+
+    <p><code class="parameter">draw</code> controls if any output is done. Set this to false if you are paginating
+    (for example, if you use this with MFC you will need to paginate in
+    <code>OnBeginPrinting()</code> before you output each page.</p>
+<pre>
+struct Sci_Rectangle { int left; int top; int right; int bottom; };
+
+struct Sci_RangeToFormat {
+    Sci_SurfaceID hdc;        // The Surface ID we print to
+    Sci_SurfaceID hdcTarget;  // The Surface ID we use for measuring (may be same as hdc)
+    Sci_Rectangle rc;         // Rectangle in which to print
+    Sci_Rectangle rcPage;     // Physically printable page size
+    Sci_CharacterRange chrg;  // Range of characters to print
+};
+</pre>
+
+    <p>On Windows, <code>hdc</code> and <code>hdcTarget</code> should both be set to the device context handle
+    of the output device (usually a printer). If you print to a metafile these will not be the same
+    as Windows metafiles (unlike extended metafiles) do not implement the full API for returning
+    information. In this case, set <code>hdcTarget</code> to the screen DC.<br />
+     <code>rcPage</code> is the rectangle <code>{0, 0, maxX, maxY}</code> where <code>maxX+1</code>
+    and <code>maxY+1</code> are the number of physically printable pixels in x and y.<br />
+     <code>rc</code> is the rectangle to render the text in (which will, of course, fit within the
+    rectangle defined by rcPage).<br />
+     <code>chrg.cpMin</code> and <code>chrg.cpMax</code> define the start position and maximum
+    position of characters to output. All of each line within this character range is drawn.</p>
+
+    <p>On Cocoa, the surface IDs for printing (<code>draw=1</code>) should be the graphics port of the current context
+    (<code>(CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]</code>) when the view's drawRect method is called.
+    The Surface IDs are not really used for measurement (<code>draw=0</code>) but can be set
+    to a bitmap context (created with <code>CGBitmapContextCreate</code>) to avoid runtime warnings.</p>
+
+    <p>On GTK, the surface IDs to use can be found from the printing context with
+    <code>gtk_print_context_get_cairo_context(context)</code>.</p>
+
+     <p><code>chrg.cpMin</code> and <code>chrg.cpMax</code> define the start position and maximum
+    position of characters to output. All of each line within this character range is drawn.</p>
+
+    <p>When printing, the most tedious part is always working out what the margins should be to
+    allow for the non-printable area of the paper and printing a header and footer. If you look at
+    the printing code in SciTE, you will find that most of it is taken up with this. The loop that
+    causes Scintilla to render text is quite simple if you strip out all the margin, non-printable
+    area, header and footer code.</p>
+
+    <p><b id="SCI_SETPRINTMAGNIFICATION">SCI_SETPRINTMAGNIFICATION(int magnification)</b><br />
+     <b id="SCI_GETPRINTMAGNIFICATION">SCI_GETPRINTMAGNIFICATION &rarr; int</b><br />
+     <code>SCI_GETPRINTMAGNIFICATION</code> lets you to print at a different size than the screen
+    font. <code class="parameter">magnification</code> is the number of points to add to the size of each screen
+    font. A value of -3 or -4 gives reasonably small print. You can get this value with
+    <code>SCI_GETPRINTMAGNIFICATION</code>.</p>
+
+    <p><b id="SCI_SETPRINTCOLOURMODE">SCI_SETPRINTCOLOURMODE(int mode)</b><br />
+     <b id="SCI_GETPRINTCOLOURMODE">SCI_GETPRINTCOLOURMODE &rarr; int</b><br />
+     These two messages set and get the method used to render coloured text on a printer that is
+    probably using white paper. It is especially important to consider the treatment of colour if
+    you use a dark or black screen background. Printing white on black uses up toner and ink very
+    many times faster than the other way around. You can set the mode to one of:</p>
+
+    <table class="standard" summary="Colour printing modes">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Purpose</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_PRINT_NORMAL</code></td>
+
+          <td align="center">0</td>
+
+          <td>Print using the current screen colours with the exception of line number margins which print on a white background.
+		  This is the default.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_INVERTLIGHT</code></td>
+
+          <td align="center">1</td>
+
+          <td>If you use a dark screen background this saves ink by inverting the light value of
+          all colours and printing on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_BLACKONWHITE</code></td>
+
+          <td align="center">2</td>
+
+          <td>Print all text as black on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_COLOURONWHITE</code></td>
+
+          <td align="center">3</td>
+
+          <td>Everything prints in its own colour on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_COLOURONWHITEDEFAULTBG</code></td>
+
+          <td align="center">4</td>
+
+          <td>Everything prints in its own foreground colour but all styles up to and including STYLE_LINENUMBER will print
+		  on a white background.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PRINT_SCREENCOLOURS</code></td>
+
+          <td align="center">5</td>
+
+          <td>Print using the current screen colours for both foreground and background.
+		  This is the only mode that does not set the background colour of the line number margin to white.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETPRINTWRAPMODE">SCI_SETPRINTWRAPMODE(int wrapMode)</b><br />
+     <b id="SCI_GETPRINTWRAPMODE">SCI_GETPRINTWRAPMODE &rarr; int</b><br />
+     These two functions get and set the printer wrap mode. <code class="parameter">wrapMode</code> can be
+     set to <code>SC_WRAP_NONE</code> (0) or <code>SC_WRAP_WORD</code> (1).
+     The default is
+     <code>SC_WRAP_WORD</code>, which wraps printed output so that all characters fit
+     into the print rectangle. If you set <code>SC_WRAP_NONE</code>, each line of text
+     generates one line of output and the line is truncated if it is too long to fit
+     into the print area.<br />
+     <code>SC_WRAP_WORD</code> tries to wrap only between words as indicated by
+     white space or style changes although if a word is longer than a line, it will be wrapped before
+     the line end. <br />
+     <code>SC_WRAP_CHAR</code> is not supported for printing.</p>
+
+    <h2 id="DirectAccess">Direct access</h2>
+    <code>
+     <a class="message" href="#SCI_GETDIRECTFUNCTION">SCI_GETDIRECTFUNCTION &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETDIRECTSTATUSFUNCTION">SCI_GETDIRECTSTATUSFUNCTION &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETDIRECTPOINTER">SCI_GETDIRECTPOINTER &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETRANGEPOINTER">SCI_GETRANGEPOINTER(position start, position lengthRange) &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETGAPPOSITION">SCI_GETGAPPOSITION &rarr; position</a><br />
+    </code>
+
+    <p>On Windows, the message-passing scheme used to communicate between the container and
+    Scintilla is mediated by the operating system <code>SendMessage</code> function and can lead to
+    bad performance when calling intensively. To avoid this overhead, Scintilla provides messages
+    that allow you to call the Scintilla message function directly. The code to do this in C/C++ is
+    of the form:</p>
+<pre>
+#include "Scintilla.h"
+SciFnDirect pSciMsg = (SciFnDirect)SendMessage(hSciWnd, SCI_GETDIRECTFUNCTION, 0, 0);
+sptr_t pSciWndData = (sptr_t)SendMessage(hSciWnd, SCI_GETDIRECTPOINTER, 0, 0);
+
+// now a wrapper to call Scintilla directly
+sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
+    return pSciMsg(pSciWndData, iMessage, wParam, lParam);
+}
+</pre>
+
+    <p><code>SciFnDirect</code>, <code>SciFnDirectStatus</code>, <code>sptr_t</code> and <code>uptr_t</code> are declared in
+    <code>Scintilla.h</code>. <code class="parameter">hSciWnd</code> is the window handle returned when you created
+    the Scintilla window.</p>
+
+    <p>While faster, this direct calling will cause problems if performed from a different thread
+    to the native thread of the Scintilla window in which case <code>SendMessage(hSciWnd, SCI_*,
+    wParam, lParam)</code> should be used to synchronize with the window's thread.</p>
+
+    <p>This feature also works on other platforms but has less impact on speed.</p>
+
+    <p>On Windows, Scintilla exports a function called
+    <code>Scintilla_DirectFunction</code> that can be used the same as the function returned by
+    <code>SCI_GETDIRECTFUNCTION</code>. This saves you the call to
+    <code>SCI_GETDIRECTFUNCTION</code> and the need to call Scintilla indirectly via the function
+    pointer.</p>
+
+    <p><b id="SCI_GETDIRECTFUNCTION">SCI_GETDIRECTFUNCTION &rarr; pointer</b><br />
+     This message returns the address of the function to call to handle Scintilla messages without
+    the overhead of passing through the Windows messaging system. You need only call this once,
+    regardless of the number of Scintilla windows you create.</p>
+
+    <p><b id="SCI_GETDIRECTSTATUSFUNCTION">SCI_GETDIRECTSTATUSFUNCTION &rarr; pointer</b><br />
+     This is similar to <code>SCI_GETDIRECTFUNCTION</code> but the returned function
+     is of type <code>SciFnDirectStatus</code> which also returns the status to the caller through a
+     pointer to an int.
+     This saves performing an extra call to retrieve the status in many situations so can be faster.</p>
+
+    <p><b id="SCI_GETDIRECTPOINTER">SCI_GETDIRECTPOINTER &rarr; pointer</b><br />
+     This returns a pointer to data that identifies which Scintilla window is in use. You must call
+    this once for each Scintilla window you create. When you call the direct function, you must
+    pass in the direct pointer associated with the target window.</p>
+
+    <p><b id="SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER &rarr; pointer</b><br />
+    <b id="SCI_GETRANGEPOINTER">SCI_GETRANGEPOINTER(position start, position lengthRange) &rarr; pointer</b><br />
+    <b id="SCI_GETGAPPOSITION">SCI_GETGAPPOSITION &rarr; position</b><br />
+     Grant temporary direct read-only access to the memory used by Scintilla to store
+     the document.</p>
+     <p><code>SCI_GETCHARACTERPOINTER</code> moves the gap within Scintilla so that the
+     text of the document is stored consecutively
+     and ensure there is a NUL character after the text, then returns a pointer to the first character.
+     Applications may then pass this to a function that accepts a character pointer such as a regular
+     expression search or a parser. The pointer should <em>not</em> be written to as that may desynchronize
+     the internal state of Scintilla.</p>
+     <p>Since any action in Scintilla may change its internal state
+     this pointer becomes invalid after any call or by allowing user interface activity. The application
+     should reacquire the pointer after making any call to Scintilla or performing any user-interface calls such
+     as modifying a progress indicator.</p>
+     <p>This call takes similar time to inserting a character at the end of the document and this may
+     include moving the document contents. Specifically, all the characters after the document gap
+     are moved to before the gap. This compacted state should persist over calls and user interface
+     actions that do not change the document contents so reacquiring the pointer afterwards is very
+     quick. If this call is used to implement a global replace operation, then each replacement will
+     move the gap so if <code>SCI_GETCHARACTERPOINTER</code> is called after
+     each replacement then the operation will become O(n^2) rather than O(n). Instead, all
+     matches should be found and remembered, then all the replacements performed.</p>
+
+     <p><code>SCI_GETRANGEPOINTER</code> provides direct access to just the
+     range requested. The gap is not moved unless it is within the requested range so this call
+     can be faster than <code>SCI_GETCHARACTERPOINTER</code>.
+     This can be used by application code that is able to act on blocks of text or ranges of lines.</p>
+
+     <p><code>SCI_GETGAPPOSITION</code> returns the current gap position.
+     This is a hint that applications can use to avoid calling <code>SCI_GETRANGEPOINTER</code>
+     with a range that contains the gap and consequent costs of moving the gap.</p>
+
+    <h2 id="MultipleViews">Multiple views</h2>
+
+    <p>A Scintilla window and the document that it displays are separate entities. When you create
+    a new window, you also create a new, empty document. Each document has a reference count that
+    is initially set to 1. The document also has a list of the Scintilla windows that are linked to
+    it so when any window changes the document, all other windows in which it appears are notified
+    to cause them to update. The system is arranged in this way so that you can work with many
+    documents in a single Scintilla window and so you can display a single document in multiple
+    windows (for use with splitter windows).</p>
+
+    <p>These messages use <code>pointer</code> returns and arguments to refer to documents.
+    They point to internal objects inside Scintilla and should be treated as an opaque <code>void*</code>. That
+    is, you can use and store the pointer as described in this section but you should not
+    dereference it.</p>
+    <code><a class="message" href="#SCI_GETDOCPOINTER">SCI_GETDOCPOINTER &rarr; pointer</a><br />
+     <a class="message" href="#SCI_SETDOCPOINTER">SCI_SETDOCPOINTER(&lt;unused&gt;, pointer doc)</a><br />
+     <a class="message" href="#SCI_CREATEDOCUMENT">SCI_CREATEDOCUMENT(position bytes, int documentOptions) &rarr; pointer</a><br />
+     <a class="message" href="#SCI_ADDREFDOCUMENT">SCI_ADDREFDOCUMENT(&lt;unused&gt;, pointer doc)</a><br />
+     <a class="message" href="#SCI_RELEASEDOCUMENT">SCI_RELEASEDOCUMENT(&lt;unused&gt;, pointer doc)</a><br />
+     <a class="message" href="#SCI_GETDOCUMENTOPTIONS">SCI_GETDOCUMENTOPTIONS &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_GETDOCPOINTER">SCI_GETDOCPOINTER &rarr; pointer</b><br />
+     This returns a pointer to the document currently in use by the window. It has no other
+    effect.</p>
+
+    <p><b id="SCI_SETDOCPOINTER">SCI_SETDOCPOINTER(&lt;unused&gt;, pointer doc)</b><br />
+     This message does the following:<br />
+     1. It removes the current window from the list held by the current document.<br />
+     2. It reduces the reference count of the current document by 1.<br />
+     3. If the reference count reaches 0, the document is deleted.<br />
+     4. <code class="parameter">doc</code> is set as the new document for the window.<br />
+     5. If <code class="parameter">doc</code> was 0, a new, empty document is created and attached to the
+    window.<br />
+     6. If <code class="parameter">doc</code> was not 0, its reference count is increased by 1.</p>
+
+    <p><b id="SCI_CREATEDOCUMENT">SCI_CREATEDOCUMENT(position bytes, int documentOptions) &rarr; pointer</b><br />
+     This message creates a new, empty document and returns a pointer to it. This document is not
+     selected into the editor and starts with a reference count of 1. This means that you have
+     ownership of it and must either reduce its reference count by 1 after using
+    <code>SCI_SETDOCPOINTER</code> so that the Scintilla window owns it or you must make sure that
+     you reduce the reference count by 1 with <code>SCI_RELEASEDOCUMENT</code> before you close the
+     application to avoid memory leaks. The <code class="parameter">bytes</code> argument determines
+     the initial memory allocation for the document as it is more efficient
+     to allocate once rather than rely on the buffer growing as data is added.
+     If <code>SCI_CREATEDOCUMENT</code> fails then 0 is returned.</p>
+
+    <p id="documentOptions">The <code class="parameter">documentOptions</code> argument
+    chooses between different document capabilities which affect memory allocation and performance with
+    <code>SC_DOCUMENTOPTION_DEFAULT</code> (0) choosing standard options.
+    <code>SC_DOCUMENTOPTION_STYLES_NONE</code> (0x1) stops allocation of memory to style characters
+    which saves significant memory, often 40% with the whole document treated as being style 0.
+    Lexers may still produce visual styling by using indicators.
+    <span><code>SC_DOCUMENTOPTION_TEXT_LARGE</code> (0x100) accommodates documents larger than 2 GigaBytes
+    in 64-bit executables.</span>
+    </p>
+
+    <p>With <code>SC_DOCUMENTOPTION_STYLES_NONE</code>, lexers are still active and may display
+    indicators. Some may produce folding information although most require lexical styles to correctly determine folding.
+    Its often more efficient to set the null lexer <code>NULL</code> so no lexer is run.
+    </p>
+
+    <p>For many applications lexing documents larger than 4GB will be too sluggish so
+    <code>SC_DOCUMENTOPTION_STYLES_NONE</code>
+    and the null lexer <code>"null"</code> can be used. Another approach is to turn on idle styling with
+    <a class="seealso" href="#SCI_SETIDLESTYLING"><code>SCI_SETIDLESTYLING</code></a>.
+    </p>
+
+    <table class="standard" summary="Document options">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th align="left">Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+
+        <tr>
+          <td align="left">SC_DOCUMENTOPTION_DEFAULT</td>
+          <td align="left">0</td>
+          <td align="left">Standard behaviour</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_DOCUMENTOPTION_STYLES_NONE</td>
+          <td align="left">0x1</td>
+          <td align="left">Stop allocation of memory for styles and treat all text as style 0.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_DOCUMENTOPTION_TEXT_LARGE</td>
+          <td align="left">0x100</td>
+          <td align="left">Allow document to be larger than 2 GB.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_ADDREFDOCUMENT">SCI_ADDREFDOCUMENT(&lt;unused&gt;, pointer doc)</b><br />
+     This increases the reference count of a document by 1. If you want to replace the current
+    document in the Scintilla window and take ownership of the current document, for example if you
+    are editing many documents in one window, do the following:<br />
+     1. Use <code>SCI_GETDOCPOINTER</code> to get a pointer to the document,
+    <code class="parameter">doc</code>.<br />
+     2. Use <code>SCI_ADDREFDOCUMENT(0, doc)</code> to increment the reference count.<br />
+     3. Use <code>SCI_SETDOCPOINTER(0, docNew)</code> to set a different document or
+    <code>SCI_SETDOCPOINTER(0, 0)</code> to set a new, empty document.</p>
+
+    <p><b id="SCI_RELEASEDOCUMENT">SCI_RELEASEDOCUMENT(&lt;unused&gt;, pointer doc)</b><br />
+     This message reduces the reference count of the document identified by <code class="parameter">doc</code>. doc
+    must be the result of <code>SCI_GETDOCPOINTER</code> or <code>SCI_CREATEDOCUMENT</code> and
+    must point at a document that still exists. If you call this on a document with a reference
+    count of 1 that is still attached to a Scintilla window, bad things will happen. To keep the
+    world spinning in its orbit you must balance each call to <code>SCI_CREATEDOCUMENT</code> or
+    <code>SCI_ADDREFDOCUMENT</code> with a call to <code>SCI_RELEASEDOCUMENT</code>.</p>
+
+    <p><b id="SCI_GETDOCUMENTOPTIONS">SCI_GETDOCUMENTOPTIONS &rarr; int</b><br />
+     Returns the options that were used to create the document.</p>
+
+    <h2 id="BackgroundLoadSave">Background loading and saving</h2>
+
+    <p>To ensure a responsive user interface, applications may decide to load and save documents using a separate thread
+    from the user interface.</p>
+
+    <h3 id="BackgroundLoad">Loading in the background</h3>
+
+    <code><a class="message" href="#SCI_CREATELOADER">SCI_CREATELOADER(position bytes, int documentOptions) &rarr; pointer</a><br />
+    </code>
+
+    <p>An application can load all of a file into a buffer it allocates on a background thread and then add the data in that buffer
+    into a Scintilla document on the user interface thread. That technique uses extra memory to store a complete copy of the
+    file and also means that the time that Scintilla takes to perform initial line end discovery blocks the user interface.</p>
+
+    <p>To avoid these issues, a loader object may be created and used to load the file. The loader object supports the ILoader interface.</p>
+
+    <p><b id="SCI_CREATELOADER">SCI_CREATELOADER(position bytes, int documentOptions) &rarr; pointer</b><br />
+     Create an object that supports the <code>ILoader</code> interface which can be used to load data and then
+     be turned into a Scintilla document object for attachment to a view object.
+     The <code class="parameter">bytes</code> argument determines the initial memory allocation for the document as it is more efficient
+     to allocate once rather than rely on the buffer growing as data is added.
+     If <code>SCI_CREATELOADER</code> fails then 0 is returned.</p>
+
+    <p>The <code class="parameter">documentOptions</code> argument
+    is described in the <a class="seealso" href="#documentOptions"><code>SCI_CREATEDOCUMENT</code></a> section.</p>
+
+<h4>ILoader</h4>
+
+<div class="highlighted">
+<span class="S5">class</span><span class="S0"> </span>ILoader<span class="S0"> </span><span class="S10">{</span><br />
+<span class="S5">public</span><span class="S10">:</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Release<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S2">// Returns a status code from SC_STATUS_*</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AddData<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>data<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>length<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>ConvertToDocument<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S10">};</span><br />
+</div>
+
+    <p>The application should call the <code>AddData</code> method with each block of data read from the file.
+    <code>AddData</code> will return SC_STATUS_OK unless a failure, such as memory exhaustion occurs.
+    If a failure occurs in <code>AddData</code> or in a file reading call then loading can be abandoned and the loader released with
+    the <code>Release</code> call.
+    When the whole file has been read, <code>ConvertToDocument</code> should be called to produce a Scintilla
+    document pointer. The newly created document will have a reference count of 1 in the same way as a document pointer
+    returned from
+    <a class="seealso" href="#SCI_CREATEDOCUMENT">SCI_CREATEDOCUMENT</a>.
+    There is no need to call <code>Release</code> after <code>ConvertToDocument</code>.</p>
+
+    <h3 id="BackgroundSave">Saving in the background</h3>
+
+    <p>An application that wants to save in the background should lock the document with <code>SCI_SETREADONLY(1)</code>
+    to prevent modifications and retrieve a pointer to the unified document contents with
+    <a class="seealso" href="#SCI_GETCHARACTERPOINTER">SCI_GETCHARACTERPOINTER</a>.
+    The buffer of a locked document will not move so the pointer is valid until the application calls <code>SCI_SETREADONLY(0)</code>.</p>
+
+    <p>If the user tries to performs a modification while the document is locked then a <code><a class="message"
+    href="#SCN_MODIFYATTEMPTRO">SCN_MODIFYATTEMPTRO</a></code> notification is sent to the application.
+    The application may then decide to ignore the modification or to terminate the background saving thread and reenable
+    modification before returning from the notification.</p>
+
+    <h2 id="Folding">Folding</h2>
+
+    <p>The fundamental operation in folding is making lines invisible or visible. Line visibility
+    is a property of the view rather than the document so each view may be displaying a different
+    set of lines. From the point of view of the user, lines are hidden and displayed using fold
+    points. Generally, the fold points of a document are based on the hierarchical structure of the
+    document contents. In Python, the hierarchy is determined by indentation and in C++ by brace
+    characters. This hierarchy can be represented within a Scintilla document object by attaching a
+    numeric "fold level" to each line. The fold level is most easily set by a lexer, but you can
+    also set it with messages.</p>
+
+    <p>It is up to your code to set the connection between user actions and folding and unfolding.
+    The best way to see how this is done is to search the SciTE source code for the messages used
+    in this section of the documentation and see how they are used. You will also need to use
+    markers and a folding margin to complete your folding implementation.
+    The <code>"fold"</code> property should be set to <code>"1"</code> with
+    <code>SCI_SETPROPERTY("fold", "1")</code> to enable folding. </p>
+    <code><a class="message" href="#SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(line docLine) &rarr; line</a><br />
+     <a class="message" href="#SCI_DOCLINEFROMVISIBLE">SCI_DOCLINEFROMVISIBLE(line displayLine) &rarr; line</a><br />
+     <a class="message" href="#SCI_SHOWLINES">SCI_SHOWLINES(line lineStart, line lineEnd)</a><br />
+     <a class="message" href="#SCI_HIDELINES">SCI_HIDELINES(line lineStart, line lineEnd)</a><br />
+     <a class="message" href="#SCI_GETLINEVISIBLE">SCI_GETLINEVISIBLE(line line) &rarr; bool</a><br />
+     <a class="message" href="#SCI_GETALLLINESVISIBLE">SCI_GETALLLINESVISIBLE &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETFOLDLEVEL">SCI_SETFOLDLEVEL(line line, int level)</a><br />
+     <a class="message" href="#SCI_GETFOLDLEVEL">SCI_GETFOLDLEVEL(line line) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETAUTOMATICFOLD">SCI_SETAUTOMATICFOLD(int automaticFold)</a><br />
+     <a class="message" href="#SCI_GETAUTOMATICFOLD">SCI_GETAUTOMATICFOLD &rarr; int</a><br />
+     <a class="message" href="#SCI_SETFOLDFLAGS">SCI_SETFOLDFLAGS(int flags)</a><br />
+     <a class="message" href="#SCI_GETLASTCHILD">SCI_GETLASTCHILD(line line, int level) &rarr; line</a><br />
+     <a class="message" href="#SCI_GETFOLDPARENT">SCI_GETFOLDPARENT(line line) &rarr; line</a><br />
+     <a class="message" href="#SCI_SETFOLDEXPANDED">SCI_SETFOLDEXPANDED(line line, bool
+    expanded)</a><br />
+     <a class="message" href="#SCI_GETFOLDEXPANDED">SCI_GETFOLDEXPANDED(line line) &rarr; bool</a><br />
+     <a class="message" href="#SCI_CONTRACTEDFOLDNEXT">SCI_CONTRACTEDFOLDNEXT(line lineStart) &rarr; line</a><br />
+     <a class="message" href="#SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(line line)</a><br />
+     <a class="message" href="#SCI_TOGGLEFOLDSHOWTEXT">SCI_TOGGLEFOLDSHOWTEXT(line line, const char *text)</a><br />
+     <a class="message" href="#SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</a><br />
+     <a class="message" href="#SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETDEFAULTFOLDDISPLAYTEXT">SCI_SETDEFAULTFOLDDISPLAYTEXT(&lt;unused&gt;, const char *text)</a><br />
+     <a class="message" href="#SCI_GETDEFAULTFOLDDISPLAYTEXT">SCI_GETDEFAULTFOLDDISPLAYTEXT(&lt;unused&gt;, char *text) &rarr; int</a><br />
+     <a class="message" href="#SCI_FOLDLINE">SCI_FOLDLINE(line line, int action)</a><br />
+     <a class="message" href="#SCI_FOLDCHILDREN">SCI_FOLDCHILDREN(line line, int action)</a><br />
+     <a class="message" href="#SCI_FOLDALL">SCI_FOLDALL(int action)</a><br />
+     <a class="message" href="#SCI_EXPANDCHILDREN">SCI_EXPANDCHILDREN(line line, int level)</a><br />
+     <a class="message" href="#SCI_ENSUREVISIBLE">SCI_ENSUREVISIBLE(line line)</a><br />
+     <a class="message" href="#SCI_ENSUREVISIBLEENFORCEPOLICY">SCI_ENSUREVISIBLEENFORCEPOLICY(line
+    line)</a><br />
+    </code>
+
+    <p><b id="SCI_VISIBLEFROMDOCLINE">SCI_VISIBLEFROMDOCLINE(line docLine) &rarr; line</b><br />
+     When some lines are hidden and/or annotations are displayed, then a particular line in the
+     document may be displayed at a
+    different position to its document position. If no lines are hidden and there are no annotations,
+    this message returns
+    <code class="parameter">docLine</code>. Otherwise, this returns the display line (counting the very first visible
+    line as 0). The display line of an invisible line is the same as the previous visible line. The
+    display line number of the first line in the document is 0. If lines are hidden and
+    <code class="parameter">docLine</code> is outside the range of lines in the document, the return value is -1.
+    Lines can occupy more than one display line if they wrap.</p>
+
+    <p><b id="SCI_DOCLINEFROMVISIBLE">SCI_DOCLINEFROMVISIBLE(line displayLine) &rarr; line</b><br />
+     When some lines are hidden and/or annotations are displayed, then a particular line in the
+     document may be displayed at a
+    different position to its document position. This message returns the document line number that
+    corresponds to a display line (counting the display line of the first line in the document as
+    0). If <code class="parameter">displayLine</code> is less than or equal to 0, the result is 0. If
+    <code class="parameter">displayLine</code> is greater than or equal to the number of displayed lines, the result
+    is the number of lines in the document.</p>
+
+    <p><b id="SCI_SHOWLINES">SCI_SHOWLINES(line lineStart, line lineEnd)</b><br />
+     <b id="SCI_HIDELINES">SCI_HIDELINES(line lineStart, line lineEnd)</b><br />
+     <b id="SCI_GETLINEVISIBLE">SCI_GETLINEVISIBLE(line line) &rarr; bool</b><br />
+     <b id="SCI_GETALLLINESVISIBLE">SCI_GETALLLINESVISIBLE &rarr; bool</b><br />
+     The first two messages mark a range of lines as visible or invisible and then redraw the
+    display.
+    <code>SCI_GETLINEVISIBLE</code> reports on the visible state of a line and returns 1 if it is
+    visible and 0 if it is not visible.
+    <code>SCI_GETALLLINESVISIBLE</code> returns 1 if all lines are visible and 0
+    if some lines are hidden.
+    These messages have no effect on fold levels or fold
+    flags. The first line can not be hidden.</p>
+
+    <p><b id="SCI_SETFOLDLEVEL">SCI_SETFOLDLEVEL(line line, int level)</b><br />
+     <b id="SCI_GETFOLDLEVEL">SCI_GETFOLDLEVEL(line line) &rarr; int</b><br />
+     These two messages set and get a 32-bit value that contains the fold level of a line and some
+    flags associated with folding. The fold level is a number in the range 0 to
+    <code>SC_FOLDLEVELNUMBERMASK</code> (0x0FFF). However, the initial fold level is set to
+    <code>SC_FOLDLEVELBASE</code> (0x400) to allow unsigned arithmetic on folding levels. There are
+    two addition flag bits. <code>SC_FOLDLEVELWHITEFLAG</code> indicates that the line is blank and
+    allows it to be treated slightly different then its level may indicate. For example, blank
+    lines should generally not be fold points and will be considered part of the preceding section even though
+    they may have a lesser fold level.
+    <code>SC_FOLDLEVELHEADERFLAG</code> indicates that the line is a header (fold point).
+    <code>SC_FOLDLEVELNONE</code> is a default level that may occur before folding.
+    </p>
+
+    <p>Use <code>SCI_GETFOLDLEVEL(line) &amp; SC_FOLDLEVELNUMBERMASK</code> to get the fold level
+    of a line. Likewise, use <code>SCI_GETFOLDLEVEL(line) &amp; SC_FOLDLEVEL*FLAG</code> to get the
+    state of the flags. To set the fold level you must or in the associated flags. For instance, to
+    set the level to <code>thisLevel</code> and mark a line as being a fold point use:
+    <code>SCI_SETFOLDLEVEL(line, thisLevel | SC_FOLDLEVELHEADERFLAG)</code>.</p>
+    If you use a lexer, you should not need to use <code>SCI_SETFOLDLEVEL</code> as this is far
+    better handled by the lexer. You will need to use <code>SCI_GETFOLDLEVEL</code> to decide how
+    to handle user folding requests. If you do change the fold levels, the folding margin will
+    update to match your changes.
+
+    <p><b id="SCI_SETFOLDFLAGS">SCI_SETFOLDFLAGS(int flags)</b><br />
+     In addition to showing markers in the folding margin, you can indicate folds to the user by
+    drawing lines in the text area. The lines are drawn in the foreground colour set for <a
+    class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>. Bits set in
+    <code class="parameter">flags</code> determine where folding lines are drawn:<br />
+    </p>
+
+    <table class="standard" summary="Fold flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th align="left">Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left">SC_FOLDFLAG_NONE</td>
+          <td align="left">0</td>
+          <td align="left">Default value.</td>
+        </tr>
+
+        <tr>
+          <td align="left"></td>
+          <td align="left">1</td>
+          <td align="left">Experimental feature that has been removed.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LINEBEFORE_EXPANDED</td>
+          <td align="left">2</td>
+          <td align="left">Draw above if expanded</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LINEBEFORE_CONTRACTED</td>
+          <td align="left">4</td>
+          <td align="left">Draw above if not expanded</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LINEAFTER_EXPANDED</td>
+          <td align="left">8</td>
+          <td align="left">Draw below if expanded</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LINEAFTER_CONTRACTED</td>
+          <td align="left">16</td>
+          <td align="left">Draw below if not expanded</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LEVELNUMBERS</td>
+          <td align="left">64</td>
+          <td align="left">Display hexadecimal fold levels in line margin to aid debugging of
+          folding. The appearance of this feature may change in the future.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDFLAG_LINESTATE</td>
+          <td align="left">128</td>
+          <td align="left">Display hexadecimal line state in line margin to aid debugging of lexing and folding.
+	  May not be used at the same time as <code>SC_FOLDFLAG_LEVELNUMBERS</code>.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>This message causes the display to redraw.</p>
+
+    <p><b id="SCI_GETLASTCHILD">SCI_GETLASTCHILD(line line, int level) &rarr; line</b><br />
+     This message searches for the next line after <code class="parameter">line</code>, that has a folding level
+    that is less than or equal to <code class="parameter">level</code> and then returns the previous line number. If
+    you set <code class="parameter">level</code> to -1, <code class="parameter">level</code> is set to the folding level of line
+    <code class="parameter">line</code>. If <code>from</code> is a fold point, <code>SCI_GETLASTCHILD(from,
+    -1)</code> returns the last line that would be in made visible or hidden by toggling the fold
+    state.</p>
+
+    <p><b id="SCI_GETFOLDPARENT">SCI_GETFOLDPARENT(line line) &rarr; line</b><br />
+     This message returns the line number of the first line before <code class="parameter">line</code> that is
+    marked as a fold point with <code>SC_FOLDLEVELHEADERFLAG</code> and has a fold level less than
+    the <code class="parameter">line</code>. If no line is found, or if the header flags and fold levels are
+    inconsistent, the return value is -1.</p>
+
+    <p><b id="SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(line line)</b><br />
+    <b id="SCI_TOGGLEFOLDSHOWTEXT">SCI_TOGGLEFOLDSHOWTEXT(line line, const char *text)</b><br />
+     Each fold point may be either expanded, displaying all its child lines, or contracted, hiding
+    all the child lines. These messages toggle the folding state of the given line as long as it has
+    the <code>SC_FOLDLEVELHEADERFLAG</code> set. These messages take care of folding or expanding
+    all the lines that depend on the line. The display updates after this message.</p>
+    <p>An optional text tag may be shown to the right of the folded text with the
+    <code class="parameter">text</code> argument to
+    <code>SCI_TOGGLEFOLDSHOWTEXT</code>.
+    The default text for all header lines can be set with <code><a class="seealso" href="#SCI_SETDEFAULTFOLDDISPLAYTEXT">SCI_SETDEFAULTFOLDDISPLAYTEXT</a></code>.
+    The text is drawn with the
+    <code><a class="message" href="#StyleDefinition">STYLE_FOLDDISPLAYTEXT</a></code> style.</p>
+
+    <p><b id="SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</b><br />
+    <b id="SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE &rarr; int</b><br />
+    These message changes the appearance of fold text tags.</p>
+    <table class="standard" summary="Fold flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th align="left">Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left">SC_FOLDDISPLAYTEXT_HIDDEN</td>
+          <td align="left">0</td>
+          <td align="left">Do not display the text tags. This is the default.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDDISPLAYTEXT_STANDARD</td>
+          <td align="left">1</td>
+          <td align="left">Display the text tags.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDDISPLAYTEXT_BOXED</td>
+          <td align="left">2</td>
+          <td align="left">Display the text tags with a box drawn around them.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETDEFAULTFOLDDISPLAYTEXT">SCI_SETDEFAULTFOLDDISPLAYTEXT(&lt;unused&gt;, const char *text)</b><br />
+     <b id="SCI_GETDEFAULTFOLDDISPLAYTEXT">SCI_GETDEFAULTFOLDDISPLAYTEXT(&lt;unused&gt;, char *text) &rarr; int</b><br />
+     These messages set and get the default text displayed at the right of the folded text.</p>
+
+    <p><b id="SCI_SETFOLDEXPANDED">SCI_SETFOLDEXPANDED(line line, bool expanded)</b><br />
+     <b id="SCI_GETFOLDEXPANDED">SCI_GETFOLDEXPANDED(line line) &rarr; bool</b><br />
+     These messages set and get the expanded state of a single line. The set message has no effect
+    on the visible state of the line or any lines that depend on it. It does change the markers in
+    the folding margin. If you ask for the expansion state of a line that is outside the document,
+    the result is <code>false</code> (0).</p>
+
+    <p>If you just want to toggle the fold state of one line and handle all the lines that are
+    dependent on it, it is much easier to use <code>SCI_TOGGLEFOLD</code>. You would use the
+    <code>SCI_SETFOLDEXPANDED</code> message to process many folds without updating the display
+    until you had finished. See <code>SciTEBase::FoldAll()</code> and
+    <code>SciTEBase::Expand()</code> for examples of the use of these messages.</p>
+
+    <p><b id="SCI_FOLDLINE">SCI_FOLDLINE(line line, int action)</b><br />
+    <b id="SCI_FOLDCHILDREN">SCI_FOLDCHILDREN(line line, int action)</b><br />
+    <b id="SCI_FOLDALL">SCI_FOLDALL(int action)</b><br />
+    These messages provide a higher-level approach to folding instead of setting expanded flags and showing
+    or hiding individual lines.</p>
+    <p>An individual fold can be contracted/expanded/toggled with <code>SCI_FOLDLINE</code>.
+    To affect all child folds as well call <code>SCI_FOLDCHILDREN</code>.</p>
+    <p>To affect the entire document call <code>SCI_FOLDALL</code>. With <code>SC_FOLDACTION_TOGGLE</code>
+    the first fold header in the document is examined to decide whether to expand or contract.
+    </p>
+    <table class="standard" summary="Fold flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th align="left">Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left">SC_FOLDACTION_CONTRACT</td>
+          <td align="left">0</td>
+          <td align="left">Contract.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDACTION_EXPAND</td>
+          <td align="left">1</td>
+          <td align="left">Expand.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_FOLDACTION_TOGGLE</td>
+          <td align="left">2</td>
+          <td align="left">Toggle between contracted and expanded.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_EXPANDCHILDREN">SCI_EXPANDCHILDREN(line line, int level)</b><br />
+    This is used to respond to a change to a line causing its fold level or whether it is a header to change,
+    perhaps when adding or removing a '{'.</p>
+    <p>By the time the container has received the notification that the line has changed,
+    the fold level has already been set, so the container has to use the previous level in this call
+    so that any range hidden underneath this line can be shown.
+    </p>
+
+    <p><b id="SCI_SETAUTOMATICFOLD">SCI_SETAUTOMATICFOLD(int automaticFold)</b><br />
+    <b id="SCI_GETAUTOMATICFOLD">SCI_GETAUTOMATICFOLD &rarr; int</b><br />
+    Instead of implementing all the logic for handling folding in the container, Scintilla can provide behaviour
+    that is adequate for many applications. The <code class="parameter">automaticFold</code> argument is a bit set defining
+    which of the 3 pieces of folding implementation should be enabled. Most applications should be able to use the
+    <code>SC_AUTOMATICFOLD_SHOW</code> and <code>SC_AUTOMATICFOLD_CHANGE</code>
+    flags unless they wish to implement quite different behaviour such as defining their own fold structure.
+    <code>SC_AUTOMATICFOLD_CLICK</code> is more likely to be set off when an application would
+    like to add or change click behaviour such as showing method headers only when Shift+Alt is used in
+    conjunction with a click.
+    </p>
+    <table class="standard" summary="Fold flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th align="left">Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left">SC_AUTOMATICFOLD_NONE</td>
+          <td align="left">0</td>
+          <td align="left">Value with no automatic behaviour.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_AUTOMATICFOLD_SHOW</td>
+          <td align="left">1</td>
+          <td align="left">Automatically show lines as needed.
+          This avoids sending the <code>SCN_NEEDSHOWN</code> notification.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_AUTOMATICFOLD_CLICK</td>
+          <td align="left">2</td>
+          <td align="left">Handle clicks in fold margin automatically.
+          This avoids sending the <code>SCN_MARGINCLICK</code> notification for folding margins.</td>
+        </tr>
+
+        <tr>
+          <td align="left">SC_AUTOMATICFOLD_CHANGE</td>
+          <td align="left">4</td>
+          <td align="left">Show lines as needed when fold structure is changed.
+          The <code>SCN_MODIFIED</code> notification is still sent unless it is disabled by the
+          container.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCI_CONTRACTEDFOLDNEXT">SCI_CONTRACTEDFOLDNEXT(line lineStart) &rarr; line</b><br />
+     Search efficiently for lines that are contracted fold headers.
+     This is useful when saving the user's folding when switching documents or saving folding with a file.
+     The search starts at line number <code class="parameter">lineStart</code> and continues forwards to the end of the file.
+     <code class="parameter">lineStart</code> is returned if it is a contracted fold header otherwise the next contracted
+     fold header is returned. If there are no more contracted fold headers then -1 is returned.</p>
+
+    <p><b id="SCI_ENSUREVISIBLE">SCI_ENSUREVISIBLE(line line)</b><br />
+     <b id="SCI_ENSUREVISIBLEENFORCEPOLICY">SCI_ENSUREVISIBLEENFORCEPOLICY(line line)</b><br />
+     A line may be hidden because more than one of its parent lines is contracted. Both these
+    message travels up the fold hierarchy, expanding any contracted folds until they reach the top
+    level. The line will then be visible. If you use <code>SCI_ENSUREVISIBLEENFORCEPOLICY</code>,
+    the vertical caret policy set by <a class="message"
+    href="#SCI_SETVISIBLEPOLICY"><code>SCI_SETVISIBLEPOLICY</code></a> is then applied.</p>
+
+    <h2 id="LineWrapping">Line wrapping</h2>
+
+    <code><a class="message" href="#SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</a><br />
+     <a class="message" href="#SCI_GETWRAPMODE">SCI_GETWRAPMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</a><br />
+     <a class="message" href="#SCI_GETWRAPVISUALFLAGS">SCI_GETWRAPVISUALFLAGS &rarr; int</a><br />
+     <a class="message" href="#SCI_SETWRAPVISUALFLAGSLOCATION">SCI_SETWRAPVISUALFLAGSLOCATION(int wrapVisualFlagsLocation)</a><br />
+     <a class="message" href="#SCI_GETWRAPVISUALFLAGSLOCATION">SCI_GETWRAPVISUALFLAGSLOCATION &rarr; int</a><br />
+     <a class="message" href="#SCI_SETWRAPINDENTMODE">SCI_SETWRAPINDENTMODE(int wrapIndentMode)</a><br />
+     <a class="message" href="#SCI_GETWRAPINDENTMODE">SCI_GETWRAPINDENTMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETWRAPSTARTINDENT">SCI_SETWRAPSTARTINDENT(int indent)</a><br />
+     <a class="message" href="#SCI_GETWRAPSTARTINDENT">SCI_GETWRAPSTARTINDENT &rarr; int</a><br />
+     <a class="message" href="#SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</a><br />
+     <a class="message" href="#SCI_GETLAYOUTCACHE">SCI_GETLAYOUTCACHE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETPOSITIONCACHE">SCI_SETPOSITIONCACHE(int size)</a><br />
+     <a class="message" href="#SCI_GETPOSITIONCACHE">SCI_GETPOSITIONCACHE &rarr; int</a><br />
+     <a class="message" href="#SCI_LINESSPLIT">SCI_LINESSPLIT(int pixelWidth)</a><br />
+     <a class="message" href="#SCI_LINESJOIN">SCI_LINESJOIN</a><br />
+     <a class="message" href="#SCI_WRAPCOUNT">SCI_WRAPCOUNT(line docLine) &rarr; line</a><br />
+    </code>
+
+    <p>By default, Scintilla does not wrap lines of text. If you enable line wrapping, lines wider
+    than the window width are continued on the following lines. Lines are broken after space or tab
+    characters or between runs of different styles. If this is not possible because a word in one
+    style is wider than the window then the break occurs after the last character that completely
+    fits on the line. The horizontal scroll bar does not appear when wrap mode is on.</p>
+
+        <p>For wrapped lines Scintilla can draw visual flags (little arrows) at end of a a subline of a
+        wrapped line and at begin of the next subline. These can be enabled individually, but if Scintilla
+        draws the visual flag at the beginning of the next subline this subline will be indented by one char.
+        Independent from drawing a visual flag at the begin the subline can have an indention.</p>
+
+    <p>Much of the time used by Scintilla is spent on laying out and drawing text. The same text
+    layout calculations may be performed many times even when the data used in these calculations
+    does not change. To avoid these unnecessary calculations in some circumstances, the line layout
+    cache can store the results of the calculations. The cache is invalidated whenever the
+    underlying data, such as the contents or styling of the document changes. Caching the layout of
+    the whole document has the most effect, making dynamic line wrap as much as 20 times faster but
+    this requires 7 times the memory required by the document contents plus around 80 bytes per
+    line.</p>
+
+    <p>Wrapping is not performed immediately there is a change but is delayed until the display
+    is redrawn. This delay improves performance by allowing a set of changes to be performed
+    and then wrapped and displayed once. Because of this, some operations may not occur as
+    expected. If a file is read and the scroll position moved to a particular line in the text,
+    such as occurs when a container tries to restore a previous editing session, then
+    the scroll position will have been determined before wrapping so an unexpected range
+    of text will be displayed. To scroll to the position correctly, delay the scroll until the
+    wrapping has been performed by waiting for an initial
+    <a class="message" href="#SCN_PAINTED">SCN_PAINTED</a> notification.</p>
+
+    <p><b id="SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</b><br />
+     <b id="SCI_GETWRAPMODE">SCI_GETWRAPMODE &rarr; int</b><br />
+     Set wrapMode to <code>SC_WRAP_WORD</code> (1) to enable wrapping
+     on word or style boundaries, <code>SC_WRAP_CHAR</code> (2) to enable wrapping
+     between any characters, <code>SC_WRAP_WHITESPACE</code> (3) to enable
+     wrapping on whitespace, and <code>SC_WRAP_NONE</code> (0) to disable line
+     wrapping. <code>SC_WRAP_CHAR</code> is preferred for Asian languages where
+     there is no white space between words.
+    </p>
+
+
+    <p><b id="SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</b><br />
+     <b id="SCI_GETWRAPVISUALFLAGS">SCI_GETWRAPVISUALFLAGS &rarr; int</b><br />
+                You can enable the drawing of visual flags to indicate a line is wrapped. Bits set in
+                wrapVisualFlags determine which visual flags are drawn.
+    </p>
+    <table class="standard" summary="Wrap visual flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_NONE</code></td>
+          <td align="center">0</td>
+          <td>No visual flags</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_END</code></td>
+          <td align="center">1</td>
+          <td>Visual flag at end of subline of a wrapped line.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_START</code></td>
+          <td align="center">2</td>
+          <td>Visual flag at begin of subline of a wrapped line.<br />
+                                             Subline is indented by at least 1 to make room for the flag.<br />
+                                </td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAG_MARGIN</code></td>
+          <td align="center">4</td>
+          <td>Visual flag in line number margin.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETWRAPVISUALFLAGSLOCATION">SCI_SETWRAPVISUALFLAGSLOCATION(int wrapVisualFlagsLocation)</b><br />
+     <b id="SCI_GETWRAPVISUALFLAGSLOCATION">SCI_GETWRAPVISUALFLAGSLOCATION &rarr; int</b><br />
+                You can set whether the visual flags to indicate a line is wrapped are drawn near the border or near the text.
+                Bits set in wrapVisualFlagsLocation set the location to near the text for the corresponding visual flag.
+    </p>
+
+    <table class="standard" summary="Wrap visual flags locations">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_DEFAULT</code></td>
+          <td align="center">0</td>
+          <td>Visual flags drawn near border</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_END_BY_TEXT</code></td>
+          <td align="center">1</td>
+          <td>Visual flag at end of subline drawn near text</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPVISUALFLAGLOC_START_BY_TEXT</code></td>
+          <td align="center">2</td>
+          <td>Visual flag at beginning of subline drawn near text</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETWRAPINDENTMODE">SCI_SETWRAPINDENTMODE(int wrapIndentMode)</b><br />
+     <b id="SCI_GETWRAPINDENTMODE">SCI_GETWRAPINDENTMODE &rarr; int</b><br />
+                Wrapped sublines can be indented to the position of their first subline or one more indent level.
+	  The default is <code>SC_WRAPINDENT_FIXED</code>.
+                The modes are:
+    </p>
+
+    <table class="standard" summary="Wrap visual flags locations">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Effect</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_WRAPINDENT_FIXED</code></td>
+          <td align="center">0</td>
+          <td>
+              Wrapped sublines aligned to left of window plus amount set by
+              <a class="seealso" href="#SCI_SETWRAPSTARTINDENT">SCI_SETWRAPSTARTINDENT</a>
+          </td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPINDENT_SAME</code></td>
+          <td align="center">1</td>
+          <td>Wrapped sublines are aligned to first subline indent</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPINDENT_INDENT</code></td>
+          <td align="center">2</td>
+          <td>Wrapped sublines are aligned to first subline indent plus one more level of indentation</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_WRAPINDENT_DEEPINDENT</code></td>
+          <td align="center">3</td>
+          <td>Wrapped sublines are aligned to first subline indent plus two more levels of indentation</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETWRAPSTARTINDENT">SCI_SETWRAPSTARTINDENT(int indent)</b><br />
+     <b id="SCI_GETWRAPSTARTINDENT">SCI_GETWRAPSTARTINDENT &rarr; int</b><br />
+     <code>SCI_SETWRAPSTARTINDENT</code> sets the size of indentation of sublines for
+                 wrapped lines in terms of the average character width in
+                <a class="message" href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>.
+                There are no limits on indent sizes, but values        less than 0 or large values may have
+                undesirable effects.<br />
+                The indention of sublines is independent of visual flags, but if
+                <code>SC_WRAPVISUALFLAG_START</code> is set an indent of at least 1 is used.
+     </p>
+
+    <p><b id="SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</b><br />
+     <b id="SCI_GETLAYOUTCACHE">SCI_GETLAYOUTCACHE &rarr; int</b><br />
+     You can set <code class="parameter">cacheMode</code> to one of the symbols in the table:</p>
+
+    <table class="standard" summary="Line caching styles">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Layout cached for these lines</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_CACHE_NONE</code></td>
+
+          <td align="center">0</td>
+
+          <td>No lines are cached.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_CARET</code></td>
+
+          <td align="center">1</td>
+
+          <td>One line is cached. This is the default.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_PAGE</code></td>
+
+          <td align="center">2</td>
+
+          <td>Visible lines plus the line containing the caret.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_CACHE_DOCUMENT</code></td>
+
+          <td align="center">3</td>
+
+          <td>All lines in the document.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETPOSITIONCACHE">SCI_SETPOSITIONCACHE(int size)</b><br />
+     <b id="SCI_GETPOSITIONCACHE">SCI_GETPOSITIONCACHE &rarr; int</b><br />
+     The position cache stores position information for short runs of text
+     so that their layout can be determined more quickly if the run recurs.
+     The size in entries of this cache can be set with <code>SCI_SETPOSITIONCACHE</code>.</p>
+
+    <p><b id="SCI_LINESSPLIT">SCI_LINESSPLIT(int pixelWidth)</b><br />
+     Split a range of lines indicated by the target into lines that are at most pixelWidth wide.
+     Splitting occurs on word boundaries wherever possible in a similar manner to line wrapping.
+     When <code class="parameter">pixelWidth</code> is 0 then the width of the window is used.
+     </p>
+
+    <p><b id="SCI_LINESJOIN">SCI_LINESJOIN</b><br />
+     Join a range of lines indicated by the target into one line by
+     removing line end characters.
+     Where this would lead to no space between words, an extra space is inserted.
+     </p>
+
+    <p><b id="SCI_WRAPCOUNT">SCI_WRAPCOUNT(line docLine) &rarr; line</b><br />
+    Document lines can occupy more than one display line if they wrap and this
+    returns the number of display lines needed to wrap a document line.</p>
+
+    <h2 id="Zooming">Zooming</h2>
+
+    <p>Scintilla incorporates a "zoom factor" that lets you make all the text in the document
+    larger or smaller in steps of one point. The displayed point size never goes below 2, whatever
+    zoom factor you set. You can set zoom factors in the range -10 to +20 points.</p>
+    <code><a class="message" href="#SCI_ZOOMIN">SCI_ZOOMIN</a><br />
+     <a class="message" href="#SCI_ZOOMOUT">SCI_ZOOMOUT</a><br />
+     <a class="message" href="#SCI_SETZOOM">SCI_SETZOOM(int zoomInPoints)</a><br />
+     <a class="message" href="#SCI_GETZOOM">SCI_GETZOOM &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_ZOOMIN">SCI_ZOOMIN</b><br />
+     <b id="SCI_ZOOMOUT">SCI_ZOOMOUT</b><br />
+     <code>SCI_ZOOMIN</code> increases the zoom factor by one point if the current zoom factor is
+    less than 20 points. <code>SCI_ZOOMOUT</code> decreases the zoom factor by one point if the
+    current zoom factor is greater than -10 points.</p>
+
+    <p><b id="SCI_SETZOOM">SCI_SETZOOM(int zoomInPoints)</b><br />
+     <b id="SCI_GETZOOM">SCI_GETZOOM &rarr; int</b><br />
+     These messages let you set and get the zoom factor directly. There is no limit set on the
+    factors you can set, so limiting yourself to -10 to +20 to match the incremental zoom functions
+    is a good idea.</p>
+
+    <h2 id="LongLines">Long lines</h2>
+
+    <p>You can choose to mark lines that exceed a given length by drawing a vertical line or by
+    colouring the background of characters that exceed the set length.</p>
+    <code><a class="message" href="#SCI_SETEDGEMODE">SCI_SETEDGEMODE(int edgeMode)</a><br />
+     <a class="message" href="#SCI_GETEDGEMODE">SCI_GETEDGEMODE &rarr; int</a><br />
+     <a class="message" href="#SCI_SETEDGECOLUMN">SCI_SETEDGECOLUMN(position column)</a><br />
+     <a class="message" href="#SCI_GETEDGECOLUMN">SCI_GETEDGECOLUMN &rarr; position</a><br />
+     <a class="message" href="#SCI_SETEDGECOLOUR">SCI_SETEDGECOLOUR(colour edgeColour)</a><br />
+     <a class="message" href="#SCI_GETEDGECOLOUR">SCI_GETEDGECOLOUR &rarr; colour</a><br />
+     <br />
+     <a class="message" href="#SCI_MULTIEDGEADDLINE">SCI_MULTIEDGEADDLINE(position column, colour edgeColour)</a><br />
+     <a class="message" href="#SCI_MULTIEDGECLEARALL">SCI_MULTIEDGECLEARALL</a><br />
+     <a class="message" href="#SCI_GETMULTIEDGECOLUMN">SCI_GETMULTIEDGECOLUMN(int which) &rarr; position</a>
+     <br />
+    </code>
+
+    <p><b id="SCI_SETEDGEMODE">SCI_SETEDGEMODE(int edgeMode)</b><br />
+     <b id="SCI_GETEDGEMODE">SCI_GETEDGEMODE &rarr; int</b><br />
+     These two messages set and get the mode used to display long lines. You can set one of the
+    values in the table:</p>
+
+    <table class="standard" summary="Long line styles">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Long line display mode</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>EDGE_NONE</code></td>
+
+          <td align="center">0</td>
+
+          <td>Long lines are not marked. This is the default state.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_LINE</code></td>
+
+          <td align="center">1</td>
+
+          <td>A vertical line is drawn at the column number set by <code>SCI_SETEDGECOLUMN</code>.
+          This works well for monospaced fonts. The line is drawn at a position based on the width
+          of a space character in <a class="message"
+          href="#StyleDefinition"><code>STYLE_DEFAULT</code></a>, so it may not work very well if
+          your styles use proportional fonts or if your style have varied font sizes or you use a
+          mixture of bold, italic and normal text.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_BACKGROUND</code></td>
+
+          <td align="center">2</td>
+
+          <td>The background colour of characters after the column limit is changed to the colour
+          set by <code>SCI_SETEDGECOLOUR</code>. This is recommended for proportional fonts.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>EDGE_MULTILINE</code></td>
+
+          <td align="center">3</td>
+
+          <td>This is similar to <code>EDGE_LINE</code> but in contrary to showing only one single
+          line a configurable set of vertical lines can be shown simultaneously. This <code>edgeMode
+          </code> uses a completely independent dataset that can only be configured by using the
+          <code>SCI_MULTIEDGE*</code> messages.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCI_SETEDGECOLUMN">SCI_SETEDGECOLUMN(position column)</b><br />
+     <b id="SCI_GETEDGECOLUMN">SCI_GETEDGECOLUMN &rarr; position</b><br />
+     These messages set and get the column number at which to display the long line marker. When
+    drawing lines, the column sets a position in units of the width of a space character in
+    <code>STYLE_DEFAULT</code>. When setting the background colour, the column is a character count
+    (allowing for tabs) into the line.</p>
+
+    <p><b id="SCI_SETEDGECOLOUR">SCI_SETEDGECOLOUR(<a class="jump" href="#colour">colour</a> edgeColour)</b><br />
+     <b id="SCI_GETEDGECOLOUR">SCI_GETEDGECOLOUR &rarr; colour</b><br />
+     These messages set and get the colour of the marker used to show that a line has exceeded the
+    length set by <code>SCI_SETEDGECOLUMN</code>.</p>
+
+    <p><b id="SCI_MULTIEDGEADDLINE">SCI_MULTIEDGEADDLINE(position column,
+    <a class="jump" href="#colour">colour</a> edgeColour)</b><br />
+     <b id="SCI_MULTIEDGECLEARALL">SCI_MULTIEDGECLEARALL</b><br />
+     <b id="SCI_GETMULTIEDGECOLUMN">SCI_GETMULTIEDGECOLUMN(int which) &rarr; position</b><br />
+     <code>SCI_MULTIEDGEADDLINE</code> adds a new vertical edge to the view. The edge will be
+    displayed at the given column number. The resulting edge position depends on the metric
+    of a space character in <code>STYLE_DEFAULT</code>. All the edges can be cleared with
+    <code>SCI_MULTIEDGECLEARALL</code>. <code>SCI_GETMULTIEDGECOLUMN</code> returns the column of the
+    Nth vertical edge (indexed from 0). If <code class="parameter">which</code> is greater or equal
+    to the number of vertical edges, this returns -1.</p>
+
+    <h2 id="Accessibility">Accessibility</h2>
+
+    <p>Scintilla supports some platform accessibility features.
+    This support differs between platforms.
+    On GTK and Cocoa the platform accessibility APIs are implemented sufficiently to
+    make screen readers work.
+    On Win32, the system caret is manipulated to help screen readers.
+    </p>
+
+    <code><a class="message" href="#SCI_SETACCESSIBILITY">SCI_SETACCESSIBILITY(int accessibility)</a><br />
+     <a class="message" href="#SCI_GETACCESSIBILITY">SCI_GETACCESSIBILITY &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETACCESSIBILITY">SCI_SETACCESSIBILITY(int accessibility)</b><br />
+     <b id="SCI_GETACCESSIBILITY">SCI_GETACCESSIBILITY &rarr; int</b><br />
+     These messages may enable or disable accessibility and report its current status.</p>
+
+    <p>On most platforms, accessibility is either implemented or not implemented and this can be
+    discovered with <code>SCI_GETACCESSIBILITY</code> with
+    <code>SCI_SETACCESSIBILITY</code> performing no action.
+    On GTK, there are storage and performance costs to accessibility, so it can be disabled
+    by calling <code>SCI_SETACCESSIBILITY</code>.
+    </p>
+
+    <table class="standard" summary="Accessibility status">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Accessibility status</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_ACCESSIBILITY_DISABLED</code></td>
+
+          <td align="center">0</td>
+
+          <td>Accessibility is disabled.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_ACCESSIBILITY_ENABLED</code></td>
+
+          <td align="center">1</td>
+
+          <td>Accessibility is enabled.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <h2 id="Lexer">Lexer</h2>
+
+    <p>
+    To style files in different languages, different 'lexers' are used.
+    These are objects that are called by Scintilla with a range of text and some context information and which
+    then set styles and folding information for that range.
+    Lexers for Scintilla are now provided by the <a href="Lexilla.html">Lexilla</a> project.
+    Before 5.0, lexers were built into most versions of Scintilla.</p>
+
+     <a class="message" href="#SCI_GETLEXER">SCI_GETLEXER &rarr; int</a><br />
+     <a class="message" href="#SCI_GETLEXERLANGUAGE">SCI_GETLEXERLANGUAGE(&lt;unused&gt;, char *language) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETILEXER">SCI_SETILEXER(&lt;unused&gt;, pointer ilexer)</a><br />
+     <a class="message" href="#SCI_COLOURISE">SCI_COLOURISE(position start, position end)</a><br />
+     <a class="message" href="#SCI_CHANGELEXERSTATE">SCI_CHANGELEXERSTATE(position start, position end) &rarr; int</a><br />
+     <a class="message" href="#SCI_PROPERTYNAMES">SCI_PROPERTYNAMES(&lt;unused&gt;, char *names) &rarr; int</a><br />
+     <a class="message" href="#SCI_PROPERTYTYPE">SCI_PROPERTYTYPE(const char *name) &rarr; int</a><br />
+     <a class="message" href="#SCI_DESCRIBEPROPERTY">SCI_DESCRIBEPROPERTY(const char *name, char *description) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETPROPERTY">SCI_SETPROPERTY(const char *key, const char *value)</a><br />
+     <a class="message" href="#SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETPROPERTYINT">SCI_GETPROPERTYINT(const char *key, int defaultValue) &rarr; int</a><br />
+     <a class="message" href="#SCI_DESCRIBEKEYWORDSETS">SCI_DESCRIBEKEYWORDSETS(&lt;unused&gt;, char *descriptions) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETKEYWORDS">SCI_SETKEYWORDS(int keyWordSet, const char
+    *keyWords)</a><br />
+
+     <a class="message" href="#SCI_GETSUBSTYLEBASES">SCI_GETSUBSTYLEBASES(&lt;unused&gt;, char *styles) &rarr; int</a><br />
+     <a class="message" href="#SCI_DISTANCETOSECONDARYSTYLES">SCI_DISTANCETOSECONDARYSTYLES &rarr; int</a><br />
+     <a class="message" href="#SCI_ALLOCATESUBSTYLES">SCI_ALLOCATESUBSTYLES(int styleBase, int numberStyles) &rarr; int</a><br />
+     <a class="message" href="#SCI_FREESUBSTYLES">SCI_FREESUBSTYLES</a><br />
+     <a class="message" href="#SCI_GETSUBSTYLESSTART">SCI_GETSUBSTYLESSTART(int styleBase) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSUBSTYLESLENGTH">SCI_GETSUBSTYLESLENGTH(int styleBase) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSTYLEFROMSUBSTYLE">SCI_GETSTYLEFROMSUBSTYLE(int subStyle) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETPRIMARYSTYLEFROMSTYLE">SCI_GETPRIMARYSTYLEFROMSTYLE(int style) &rarr; int</a><br />
+     <a class="message" href="#SCI_SETIDENTIFIERS">SCI_SETIDENTIFIERS(int style, const char *identifiers)</a><br />
+     <a class="message" href="#SCI_PRIVATELEXERCALL">SCI_PRIVATELEXERCALL(int operation, pointer pointer) &rarr; pointer</a><br />
+     <a class="message" href="#SCI_GETNAMEDSTYLES">SCI_GETNAMEDSTYLES &rarr; int</a><br />
+     <a class="message" href="#SCI_NAMEOFSTYLE">SCI_NAMEOFSTYLE(int style, char *name) &rarr; int</a><br />
+     <a class="message" href="#SCI_TAGSOFSTYLE">SCI_TAGSOFSTYLE(int style, char *tags) &rarr; int</a><br />
+     <a class="message" href="#SCI_DESCRIPTIONOFSTYLE">SCI_DESCRIPTIONOFSTYLE(int style, char *description) &rarr; int</a><br />
+
+    <p><b id="SCI_GETLEXER">SCI_GETLEXER &rarr; int</b><br />
+     You can retrieve an integer lexer ID for the current lexer from the <code>SCLEX_*</code> enumeration
+    in <code>SciLexer.h</code>. Some lexers may not have a lexer ID, just a lexer name in which case 0 is returned.</p>
+
+    <p><b id="SCI_GETLEXERLANGUAGE">SCI_GETLEXERLANGUAGE(&lt;unused&gt;, char *language NUL-terminated) &rarr; int</b><br />
+     <code>SCI_GETLEXERLANGUAGE</code>returns the name of the current lexer which must be set with <code>SCI_SETILEXER</code>.
+    To locate the name for a lexer, open the relevant
+    <code>lexilla/lexers/Lex*.cxx</code> file and search for <code>LexerModule</code>. The third argument in the
+    <code>LexerModule</code> constructor is the name to use.</p>
+
+     <p><b id="SCI_SETILEXER">SCI_SETILEXER(&lt;unused&gt;, pointer ilexer)</b><br />
+     <code>SCI_SETILEXER</code> allows setting a lexer as an <code>ILexer5*</code>.
+     The lexer may be implemented by an application or a shared library such as Lexilla.</p>
+
+    <p>To test if your lexer assignment worked, use <a class="seealso"
+    href="#SCI_GETLEXER"><code>SCI_GETLEXER</code></a> before and after setting the new lexer to
+    see if the lexer number changed.</p>
+
+    <p><code>SCI_GETLEXERLANGUAGE</code> retrieves the name of the lexer.</p>
+
+    <p><b id="SCI_COLOURISE">SCI_COLOURISE(position start, position end)</b><br />
+     This requests the current lexer or the container (if the lexer is set to
+    <code>NULL</code>) to style the document between <code class="parameter">start</code> and
+    <code class="parameter">end</code>. If <code class="parameter">end</code> is -1, the document is styled from
+    <code class="parameter">start</code> to the end. If the <code>"fold"</code> property is set to
+    <code>"1"</code> and your lexer or container supports folding, fold levels are also set. This
+    message causes a redraw.</p>
+
+    <p><b id="SCI_CHANGELEXERSTATE">SCI_CHANGELEXERSTATE(position start, position end) &rarr; int</b><br />
+    Indicate that the internal state of a lexer has changed over a range and therefore
+    there may be a need to redraw.</p>
+
+    <p><b id="SCI_PROPERTYNAMES">SCI_PROPERTYNAMES(&lt;unused&gt;, char *names NUL-terminated) &rarr; int</b><br />
+    <b id="SCI_PROPERTYTYPE">SCI_PROPERTYTYPE(const char *name) &rarr; int</b><br />
+    <b id="SCI_DESCRIBEPROPERTY">SCI_DESCRIBEPROPERTY(const char *name, char *description NUL-terminated) &rarr; int</b><br />
+    Information may be retrieved about the properties that can be set for the current lexer.
+    This information is only available for newer lexers.
+    <code>SCI_PROPERTYNAMES</code> returns a string with all of the valid properties separated by "\n".
+    If the lexer does not support this call then an empty string is returned.
+    Properties may be boolean (<code>SC_TYPE_BOOLEAN</code>), integer (<code>SC_TYPE_INTEGER</code>),
+    or string (<code>SC_TYPE_STRING</code>) and this is found with <code>SCI_PROPERTYTYPE</code>.
+    A description of a property in English is returned by <code>SCI_DESCRIBEPROPERTY</code>.</p>
+
+    <p><b id="SCI_SETPROPERTY">SCI_SETPROPERTY(const char *key, const char *value)</b><br />
+     You can communicate settings to lexers with keyword:value string pairs. There is no limit to
+    the number of keyword pairs you can set, other than available memory. <code class="parameter">key</code> is a
+    case sensitive keyword, <code class="parameter">value</code> is a string that is associated with the keyword. If
+    there is already a value string associated with the keyword, it is replaced. If you pass a zero
+    length string, the message does nothing. Both <code class="parameter">key</code> and <code class="parameter">value</code> are used
+    without modification; extra spaces at the beginning or end of <code class="parameter">key</code> are
+    significant.</p>
+
+    <p>The <code class="parameter">value</code> string can refer to other keywords. For example,
+    <code>SCI_SETPROPERTY("foldTimes10", "$(fold)0")</code> stores the string
+    <code>"$(fold)0"</code>, but when this is accessed, the <code>$(fold)</code> is replaced by the
+    value of the <code>"fold"</code> keyword (or by nothing if this keyword does not exist).</p>
+
+    <p>Currently the "fold" property is defined for most of the lexers to set the fold structure if
+    set to "1". <code>SCLEX_PYTHON</code> understands <code>"tab.timmy.whinge.level"</code> as a
+    setting that determines how to indicate bad indentation. Most keywords have values that are
+    interpreted as integers. Search the lexer sources for <code>GetPropertyInt</code> to see how
+    properties are used.</p>
+
+    <p>There is a convention for naming properties used by lexers so that the set of properties can be found by scripts.
+    Property names should start with "lexer.&lt;lexer&gt;." or "fold.&lt;lexer&gt;." when they apply to one
+    lexer or start with "lexer." or "fold." if they apply to multiple lexers.</p>
+
+    <p>Applications may discover the set of properties used by searching the source code of lexers for lines that contain
+    <code>GetProperty</code> and a double quoted string and extract the value of the double quoted string as the property name.
+    The <code>scintilla/scripts/LexGen.py</code> script does this and can be used as an example.
+    Documentation for the property may be located above the call as a multi-line comment starting with
+    <br/><code>// property &lt;property-name&gt;</code></p>
+
+    <p><b id="SCI_GETPROPERTY">SCI_GETPROPERTY(const char *key, char *value NUL-terminated) &rarr; int</b><br />
+    Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied
+    buffer and return the length (not including the terminating 0).  If not found, copy an empty string
+    to the buffer and return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will not be performed.</p>
+
+    <p>If the value argument is 0 then the length that should be allocated to store the value is returned;
+    again, the terminating 0 is not included.</p>
+
+    <p><b id="SCI_GETPROPERTYEXPANDED">SCI_GETPROPERTYEXPANDED(const char *key, char *value) &rarr; int</b><br />
+    Lookup a keyword:value pair using the specified key; if found, copy the value to the user-supplied
+    buffer and return the length (not including the terminating 0).  If not found, copy an empty string
+    to the buffer and return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will be performed.</p>
+
+    <p>If the value argument is 0 then the length that should be allocated to store the value (including any indicated keyword replacement)
+    is returned; again, the terminating 0 is not included.</p>
+
+    <p><b id="SCI_GETPROPERTYINT">SCI_GETPROPERTYINT(const char *key, int defaultValue) &rarr; int</b><br />
+    Lookup a keyword:value pair using the specified key; if found, interpret the value as an integer and return it.
+    If not found (or the value is an empty string) then return the supplied default.  If the keyword:value pair is found but is not
+    a number, then return 0.</p>
+
+    <p>Note that  "keyword replacement" as described in <a class="message" href="#SCI_SETPROPERTY">
+    <code>SCI_SETPROPERTY</code></a> will be performed before any numeric interpretation.</p>
+
+    <p><b id="SCI_SETKEYWORDS">SCI_SETKEYWORDS(int keyWordSet, const char *keyWords)</b><br />
+     You can set up to 9 lists of keywords for use by the current lexer.
+     <code class="parameter">keyWordSet</code> can be 0 to 8 (actually 0 to <code>KEYWORDSET_MAX</code>)
+    and selects which keyword list to replace. <code class="parameter">keyWords</code> is a list of keywords
+    separated by spaces, tabs, <code>"\n"</code> or <code>"\r"</code> or any combination of these.
+    It is expected that the keywords will be composed of standard ASCII printing characters,
+    but there is nothing to stop you using any non-separator character codes from 1 to 255
+    (except common sense).</p>
+
+    <p>How these keywords are used is entirely up to the lexer. Some languages, such as HTML may
+    contain embedded languages, VBScript and JavaScript are common for HTML. For HTML, key word set
+    0 is for HTML, 1 is for JavaScript and 2 is for VBScript, 3 is for Python, 4 is for PHP and 5
+    is for SGML and DTD keywords. Review the lexer code to see examples of keyword list. A fully
+    conforming lexer sets the fourth argument of the <code>LexerModule</code> constructor to be a
+    list of strings that describe the uses of the keyword lists.</p>
+
+    <p>Alternatively, you might use set 0 for general keywords, set 1 for keywords that cause
+    indentation and set 2 for keywords that cause unindentation. Yet again, you might have a simple
+    lexer that colours keywords and you could change languages by changing the keywords in set 0.
+    There is nothing to stop you building your own keyword lists into the lexer, but this means
+    that the lexer must be rebuilt if more keywords are added.</p>
+
+    <p><b id="SCI_DESCRIBEKEYWORDSETS">SCI_DESCRIBEKEYWORDSETS(&lt;unused&gt;, char *descriptions NUL-terminated) &rarr; int</b><br />
+    A description of all of the keyword sets separated by "\n" is returned by <code>SCI_DESCRIBEKEYWORDSETS</code>.</p>
+
+    <h3 id="Substyles">Substyles</h3>
+    <p>Lexers may support several different sublanguages and each sublanguage may want to style some number of
+    sets of identifiers (or similar lexemes such as documentation keywords) uniquely. Preallocating a large number for each
+    purpose would exhaust the number of allowed styles quickly.
+    This is alleviated by substyles which allow the application to determine how many sets of identifiers to allocate for
+    each purpose.
+    Lexers have to explicitly support this feature by implementing particular methods.</p>
+
+    <p><b id="SCI_GETSUBSTYLEBASES">SCI_GETSUBSTYLEBASES(&lt;unused&gt;, char *styles NUL-terminated) &rarr; int</b><br />
+     Fill <code class="parameter">styles</code> with a byte for each style that can be split into substyles.</p>
+
+    <p><b id="SCI_DISTANCETOSECONDARYSTYLES">SCI_DISTANCETOSECONDARYSTYLES &rarr; int</b><br />
+     Returns the distance between a primary style and its corresponding secondary style.</p>
+
+    <p><b id="SCI_ALLOCATESUBSTYLES">SCI_ALLOCATESUBSTYLES(int styleBase, int numberStyles) &rarr; int</b><br />
+     Allocate some number of substyles for a particular base style returning the first substyle number allocated.
+     Substyles are allocated contiguously.</p>
+
+    <p><b id="SCI_FREESUBSTYLES">SCI_FREESUBSTYLES</b><br />
+     Free all allocated substyles.</p>
+
+    <p><b id="SCI_GETSUBSTYLESSTART">SCI_GETSUBSTYLESSTART(int styleBase) &rarr; int</b><br />
+    <b id="SCI_GETSUBSTYLESLENGTH">SCI_GETSUBSTYLESLENGTH(int styleBase) &rarr; int</b><br />
+     Return the start and length of the substyles allocated for a base style.</p>
+
+    <p><b id="SCI_GETSTYLEFROMSUBSTYLE">SCI_GETSTYLEFROMSUBSTYLE(int subStyle) &rarr; int</b><br />
+     For a sub style, return the base style, else return the argument.</p>
+
+    <p><b id="SCI_GETPRIMARYSTYLEFROMSTYLE">SCI_GETPRIMARYSTYLEFROMSTYLE(int style) &rarr; int</b><br />
+     For a secondary style, return the primary style, else return the argument.</p>
+
+    <p><b id="SCI_SETIDENTIFIERS">SCI_SETIDENTIFIERS(int style, const char *identifiers)</b><br />
+     Similar to <code>SCI_SETKEYWORDS</code> but for substyles.
+     The prefix feature available with <code>SCI_SETKEYWORDS</code> is not implemented for <code>SCI_SETIDENTIFIERS</code>.</p>
+
+    <p><b id="SCI_PRIVATELEXERCALL">SCI_PRIVATELEXERCALL(int operation, pointer pointer) &rarr; pointer</b><br />
+     Call into a lexer in a way not understood by Scintilla.</p>
+
+    <h3 id="StyleMetadata">Style Metadata</h3>
+    <p>Lexers may provide information on the styles they use.
+    Lexers have to explicitly support this feature by implementing particular methods.</p>
+
+    <p><b id="SCI_GETNAMEDSTYLES">SCI_GETNAMEDSTYLES &rarr; int</b><br />
+     Retrieve the number of named styles for the lexer.</p>
+
+    <p><b id="SCI_NAMEOFSTYLE">SCI_NAMEOFSTYLE(int style, char *name) &rarr; int</b><br />
+     Retrieve the name of a style. This is a C preprocessor symbol like "SCE_C_COMMENTDOC".</p>
+
+    <p><b id="SCI_TAGSOFSTYLE">SCI_TAGSOFSTYLE(int style, char *tags) &rarr; int</b><br />
+     Retrieve the tags of a style. This is a space-separated set of words like "comment documentation".</p>
+
+    <p><b id="SCI_DESCRIPTIONOFSTYLE">SCI_DESCRIPTIONOFSTYLE(int style, char *description) &rarr; int</b><br />
+     Retrieve an English-language description of a style which may be suitable for display in a user interface.
+     This looks like "Doc comment: block comments beginning with /** or /*!".</p>
+
+    <h2 id="LexerObjects">Lexer Objects</h2>
+
+    <p>Lexers are programmed as objects that implement the ILexer5 interface and that interact
+    with the document they are lexing through the IDocument interface.
+    Previously lexers were defined by providing lexing and folding functions but creating an object
+    to handle the interaction of a lexer with a document allows the lexer to store state information that
+    can be used during lexing. For example a C++ lexer may store a set of preprocessor definitions
+    or variable declarations and style these depending on their role.</p>
+
+    <p>ILexer4 is extended with the ILexer5 interface to support use of Lexilla.</p>
+
+    <p>A set of helper classes allows older lexers defined by functions to be used in Scintilla.</p>
+<h4>ILexer4</h4>
+
+<div class="highlighted">
+<span class="S5">class</span><span class="S0"> </span>ILexer4<span class="S0"> </span><span class="S10">{</span><br />
+<span class="S5">public</span><span class="S10">:</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Version<span class="S10">()</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Release<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PropertyNames<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PropertyType<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>name<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DescribeProperty<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>name<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PropertySet<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>key<span class="S10">,</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>val<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DescribeWordListSets<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>WordListSet<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>n<span class="S10">,</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>wl<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Lex<span class="S10">(</span>Sci_PositionU<span class="S0"> </span>startPos<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>lengthDoc<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>initStyle<span class="S10">,</span><span class="S0"> </span>IDocument<span class="S0"> </span><span class="S10">*</span>pAccess<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Fold<span class="S10">(</span>Sci_PositionU<span class="S0"> </span>startPos<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>lengthDoc<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>initStyle<span class="S10">,</span><span class="S0"> </span>IDocument<span class="S0"> </span><span class="S10">*</span>pAccess<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PrivateCall<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>operation<span class="S10">,</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span><span class="S10">*</span>pointer<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineEndTypesSupported<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AllocateSubStyles<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>styleBase<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>numberStyles<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SubStylesStart<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>styleBase<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SubStylesLength<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>styleBase<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>StyleFromSubStyle<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>subStyle<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PrimaryStyleFromStyle<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>style<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>FreeSubStyles<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetIdentifiers<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>style<span class="S10">,</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>identifiers<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DistanceToSecondaryStyles<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetSubStyleBases<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>NamedStyles<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>NameOfStyle<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>style<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>TagsOfStyle<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>style<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DescriptionOfStyle<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>style<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S10">};</span><br />
+</div>
+
+<h4>ILexer5</h4>
+
+<div class="highlighted">
+<span><span class="S5">class</span><span class="S0"> </span>ILexer5<span class="S0"> </span><span class="S10">:</span><span class="S0"> </span><span class="S5">public</span><span class="S0"> </span>ILexer4<span class="S0"> </span><span class="S10">{</span><br />
+<span class="S5">public</span><span class="S10">:</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetName<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> &nbsp;</span>GetIdentifier<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>PropertyGet<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>key<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S10">};</span><br />
+<span class="S0"></span></span>
+</div>
+
+<p>
+The types <code>Sci_Position</code> and <code>Sci_PositionU</code> are used for positions and line numbers in the document.
+With Scintilla 4, 64-bit builds define these as 64-bit types to allow future implementation of documents larger than 2 GB.
+</p>
+
+<p>
+Methods that return strings as <code>const char *</code> are not required to maintain separate allocations indefinitely:
+lexer implementations may own a single buffer that is reused for each call.
+Callers should make an immediate copy of returned strings.
+</p>
+
+<p>
+The return values from PropertySet and WordListSet are used to indicate whether the change requires
+performing lexing or folding over any of the document. It is the position at which to restart lexing and folding or -1
+if the change does not require any extra work on the document.
+A simple approach is to return 0 if there is any possibility that a change requires lexing the document again while an
+optimisation could be to remember where a setting first affects the document and return that position.
+</p>
+
+<p><code>Version</code> returns an enumerated value specifying which version of the interface is implemented:
+<code>lvRelease5</code> for <code>ILexer5</code> and <code>lvRelease4</code> for <code>ILexer4</code>.
+<code>ILexer5</code> must be provided for Scintilla version 5.0 or later.
+</p>
+
+<p><code>Release</code> is called to destroy the lexer object.</p>
+
+<p><code>PrivateCall</code> allows for direct communication between the
+application and a lexer. An example would be where an application
+maintains a single large data structure containing symbolic information
+about system headers (like Windows.h) and provides this to the lexer
+where it can be applied to each document. This avoids the costs of
+constructing the system header information for each document. This is
+invoked with the <code>SCI_PRIVATELEXERCALL</code> API.</p>
+
+<p><code>Fold</code> is called with the exact range that needs folding.
+Previously, lexers were called with a range that started one line before the range that
+needs to be folded as this allowed fixing up the last line from the previous folding.
+The new approach allows the lexer to decide whether to backtrack or to handle this
+more efficiently.</p>
+
+<p><code>NamedStyles</code>, <code>NameOfStyle</code>,
+<code>TagsOfStyle</code>, and <code>DescriptionOfStyle</code>
+are used to provide information on the set of styles used by this lexer.
+<code>NameOfStyle</code> is the C-language identifier like "<code>SCE_LUA_COMMENT</code>".
+<code>TagsOfStyle</code> is a set of tags describing the style in a standardized way like "<code>literal string multiline raw</code>".
+A set of common tags and conventions for combining them is <a  class="jump" href="StyleMetadata.html">described here</a>.
+<code>DescriptionOfStyle</code> is an English description of the style like "<code>Function or method name definition</code>".
+</p>
+
+<p><code>GetName</code> and <code>GetIdentifier</code> may be called
+to discover the identity of a lexer and be used to implement
+<a class="seealso" href="#SCI_GETLEXERLANGUAGE">SCI_GETLEXERLANGUAGE</a> and
+<a class="seealso" href="#SCI_GETLEXER">SCI_GETLEXER</a>.</p>
+
+<p><code>PropertyGet</code> may be called
+to discover the value of a property stored by a lexer and be used to implement
+<a class="seealso" href="#SCI_GETPROPERTY">SCI_GETPROPERTY</a>.</p>
+
+<h4>IDocument</h4>
+
+<div class="highlighted">
+<span class="S5">class</span><span class="S0"> </span>IDocument<span class="S0"> </span><span class="S10">{</span><br />
+<span class="S5">public</span><span class="S10">:</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Version<span class="S10">()</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetErrorStatus<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>status<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Length<span class="S10">()</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetCharRange<span class="S10">(</span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>buffer<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>position<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>lengthRetrieve<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>StyleAt<span class="S10">(</span>Sci_Position<span class="S0"> </span>position<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineFromPosition<span class="S10">(</span>Sci_Position<span class="S0"> </span>position<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineStart<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetLevel<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetLevel<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>level<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetLineState<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetLineState<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>state<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>StartStyling<span class="S10">(</span>Sci_Position<span class="S0"> </span>position<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">bool</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetStyleFor<span class="S10">(</span>Sci_Position<span class="S0"> </span>length<span class="S10">,</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span>style<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">bool</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>SetStyles<span class="S10">(</span>Sci_Position<span class="S0"> </span>length<span class="S10">,</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>styles<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DecorationSetCurrentIndicator<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>indicator<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>DecorationFillRange<span class="S10">(</span>Sci_Position<span class="S0"> </span>position<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>value<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>fillLength<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>ChangeLexerState<span class="S10">(</span>Sci_Position<span class="S0"> </span>start<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>end<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>CodePage<span class="S10">()</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">bool</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>IsDBCSLeadByte<span class="S10">(</span><span class="S5">char</span><span class="S0"> </span>ch<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>BufferPointer<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetLineIndentation<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineEnd<span class="S10">(</span>Sci_Position<span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetRelativePosition<span class="S10">(</span>Sci_Position<span class="S0"> </span>positionStart<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>characterOffset<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetCharacterAndWidth<span class="S10">(</span>Sci_Position<span class="S0"> </span>position<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span><span class="S10">*</span>pWidth<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S10">};</span><br />
+</div>
+
+<p>Scintilla tries to minimize the consequences of modifying text to
+only relex and redraw the line of the change where possible. Lexer
+objects contain their own private extra state which can affect later
+lines. For example, if the C++ lexer is greying out inactive code
+segments then changing the statement <code>#define BEOS 0</code> to <code>#define
+ BEOS 1</code> may require restyling and redisplaying later parts of the
+ document. The lexer can call <code>ChangeLexerState</code> to signal to
+ the document that it should relex and display more.</p>
+
+<p>For <code>StartStyling</code> the mask argument has no effect. It was used in version 3.4.2 and earlier.</p>
+
+<p><code>SetErrorStatus</code> is used to notify the document of
+exceptions. Exceptions should not be thrown over build boundaries as the
+ two sides may be built with different compilers or incompatible
+exception options.</p>
+
+<p>
+To allow lexers to determine the end position of a line and thus more easily support Unicode line ends
+<code>IDocument</code> includes <code>LineEnd</code> which should be used rather than testing for specific
+line end characters.</p>
+<p><code>GetRelativePosition</code> navigates the document by whole characters,
+returning <code>INVALID_POSITION</code> for movement beyond the start and end of the document.</p>
+<p><code>GetCharacterAndWidth</code> provides a standard
+conversion from UTF-8 bytes to a UTF-32 character or from DBCS to a 16 bit value.
+Bytes in invalid UTF-8 are reported individually with values 0xDC80+byteValue, which are
+not valid Unicode code points.
+The <code class="parameter">pWidth</code> argument can be NULL if the caller does not need to know the number of
+bytes in the character.
+</p>
+
+<p>The <code>ILexer5</code> and <code>IDocument</code>  interfaces may be
+expanded in the future with extended versions (<code>ILexer6</code>...).
+ The <code>Version</code> method indicates which interface is
+implemented and thus which methods may be called.</p>
+
+    <h2 id="Notifications">Notifications</h2>
+
+    <p>Notifications are sent (fired) from the Scintilla control to its container when an event has
+    occurred that may interest the container.</p>
+    <p>Notifications are sent using the
+    <code>WM_NOTIFY</code> message on Windows.</p>
+    <p>On GTK, the "sci-notify" signal is sent and the signal handler should have the signature
+    <code>handler(GtkWidget *, gint, SCNotification *notification, gpointer  userData)</code>.</p>
+    <p>On Cocoa, a delegate implementing the <code>ScintillaNotificationProtocol</code>
+    may be set to receive notifications or the <code>ScintillaView</code> class may be subclassed and the
+    <code>notification:</code> method overridden. Overriding <code>notification:</code> allows the
+    subclass to control whether default handling is performed.</p>
+    <p>The container is
+    passed a <code>SCNotification</code> structure containing information about the event.</p>
+<pre id="SCNotification">
+struct Sci_NotifyHeader {   // This matches the Win32 NMHDR structure
+    void *hwndFrom;     // environment specific window handle/pointer
+    uptr_t idFrom;        // CtrlID of the window issuing the notification
+    unsigned int code;  // The SCN_* notification code
+};
+
+struct SCNotification {
+	struct Sci_NotifyHeader nmhdr;
+	Sci_Position position;
+	/* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */
+	/* SCN_MARGINRIGHTCLICK, SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, */
+	/* SCN_CALLTIPCLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, */
+	/* SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+	/* SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_AUTOCSELECTIONCHANGE */
+
+	int ch;
+	/* SCN_CHARADDED, SCN_KEY, SCN_AUTOCCOMPLETE, SCN_AUTOCSELECTION, */
+	/* SCN_USERLISTSELECTION */
+	int modifiers;
+	/* SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, */
+	/* SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+
+	int modificationType;	/* SCN_MODIFIED */
+	const char *text;
+	/* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED, */
+	/* SCN_AUTOCSELECTIONCHANGE */
+
+	Sci_Position length;		/* SCN_MODIFIED */
+	Sci_Position linesAdded;	/* SCN_MODIFIED */
+	int message;	/* SCN_MACRORECORD */
+	uptr_t wParam;	/* SCN_MACRORECORD */
+	sptr_t lParam;	/* SCN_MACRORECORD */
+	Sci_Position line;		/* SCN_MODIFIED */
+	int foldLevelNow;	/* SCN_MODIFIED */
+	int foldLevelPrev;	/* SCN_MODIFIED */
+	int margin;		/* SCN_MARGINCLICK, SCN_MARGINRIGHTCLICK */
+	int listType;	/* SCN_USERLISTSELECTION, SCN_AUTOCSELECTIONCHANGE */
+	int x;			/* SCN_DWELLSTART, SCN_DWELLEND */
+	int y;		/* SCN_DWELLSTART, SCN_DWELLEND */
+	int token;		/* SCN_MODIFIED with SC_MOD_CONTAINER */
+	int annotationLinesAdded;	/* SCN_MODIFIED with SC_MOD_CHANGEANNOTATION */
+	int updated;	/* SCN_UPDATEUI */
+	int listCompletionMethod;
+	/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION */
+	int characterSource;	/* SCN_CHARADDED */
+};
+</pre>
+
+    <p>The notification messages that your container can choose to handle and the messages
+    associated with them are:</p>
+    <code><a class="message" href="#SCN_STYLENEEDED">SCN_STYLENEEDED</a><br />
+     <a class="message" href="#SCN_CHARADDED">SCN_CHARADDED</a><br />
+     <a class="message" href="#SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</a><br />
+     <a class="message" href="#SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</a><br />
+     <a class="message" href="#SCN_MODIFYATTEMPTRO">SCN_MODIFYATTEMPTRO</a><br />
+     <a class="message" href="#SCN_KEY">SCN_KEY</a><br />
+     <a class="message" href="#SCN_DOUBLECLICK">SCN_DOUBLECLICK</a><br />
+     <a class="message" href="#SCN_UPDATEUI">SCN_UPDATEUI</a><br />
+     <a class="message" href="#SCN_MODIFIED">SCN_MODIFIED</a><br />
+     <a class="message" href="#SCN_MACRORECORD">SCN_MACRORECORD</a><br />
+     <a class="message" href="#SCN_MARGINCLICK">SCN_MARGINCLICK</a><br />
+     <a class="message" href="#SCN_NEEDSHOWN">SCN_NEEDSHOWN</a><br />
+     <a class="message" href="#SCN_PAINTED">SCN_PAINTED</a><br />
+     <a class="message" href="#SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</a><br />
+     <a class="message" href="#SCN_URIDROPPED">SCN_URIDROPPED</a><br />
+     <a class="message" href="#SCN_DWELLSTART">SCN_DWELLSTART</a><br />
+     <a class="message" href="#SCN_DWELLEND">SCN_DWELLEND</a><br />
+     <a class="message" href="#SCN_ZOOM">SCN_ZOOM</a><br />
+     <a class="message" href="#SCN_HOTSPOTCLICK">SCN_HOTSPOTCLICK</a><br />
+     <a class="message" href="#SCN_HOTSPOTDOUBLECLICK">SCN_HOTSPOTDOUBLECLICK</a><br />
+     <a class="message" href="#SCN_HOTSPOTRELEASECLICK">SCN_HOTSPOTRELEASECLICK</a><br />
+     <a class="message" href="#SCN_INDICATORCLICK">SCN_INDICATORCLICK</a><br />
+     <a class="message" href="#SCN_INDICATORRELEASE">SCN_INDICATORRELEASE</a><br />
+     <a class="message" href="#SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</a><br />
+     <a class="message" href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a><br />
+     <a class="message" href="#SCN_AUTOCCANCELLED">SCN_AUTOCCANCELLED</a><br />
+     <a class="message" href="#SCN_AUTOCCHARDELETED">SCN_AUTOCCHARDELETED</a><br />
+     <a class="message" href="#SCN_FOCUSIN">SCN_FOCUSIN</a><br />
+     <a class="message" href="#SCN_FOCUSOUT">SCN_FOCUSOUT</a><br />
+     <a class="message" href="#SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED</a><br />
+     <a class="message" href="#SCN_MARGINRIGHTCLICK">SCN_MARGINRIGHTCLICK</a><br />
+     <a class="message" href="#SCN_AUTOCSELECTIONCHANGE">SCN_AUTOCSELECTIONCHANGE</a><br />
+    </code>
+
+    <p>The following <code>SCI_*</code> messages are associated with these notifications:</p>
+    <code><a class="message" href="#SCI_SETMODEVENTMASK">SCI_SETMODEVENTMASK(int eventMask)</a><br />
+     <a class="message" href="#SCI_GETMODEVENTMASK">SCI_GETMODEVENTMASK &rarr; int</a><br />
+     <a class="message" href="#SCI_SETCOMMANDEVENTS">SCI_SETCOMMANDEVENTS(bool commandEvents)</a><br />
+     <a class="message" href="#SCI_GETCOMMANDEVENTS">SCI_GETCOMMANDEVENTS &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME(int periodMilliseconds)</a><br />
+     <a class="message" href="#SCI_GETMOUSEDWELLTIME">SCI_GETMOUSEDWELLTIME &rarr; int</a><br />
+     <a class="message" href="#SCI_SETIDENTIFIER">SCI_SETIDENTIFIER(int identifier)</a><br />
+     <a class="message" href="#SCI_GETIDENTIFIER">SCI_GETIDENTIFIER &rarr; int</a><br />
+    </code>
+
+    <p>The following additional notifications are sent using a secondary "command" method and should
+    be avoided in new code as the primary "notification" method provides all the same events with richer
+    information.
+    The <code>WM_COMMAND</code> message is used on Windows.
+    This emulates the Windows Edit control. Only the lower
+    16 bits of the control's ID is passed in these notifications.</p>
+    <p>On GTK, the "command" signal is sent and the signal handler should have the signature
+    <code>handler(GtkWidget *, gint wParam, gpointer lParam, gpointer userData)</code>.</p>
+    <code><a class="message" href="#SCEN_CHANGE">SCEN_CHANGE</a><br />
+     <a class="message" href="#SCEN_SETFOCUS">SCEN_SETFOCUS</a><br />
+     <a class="message" href="#SCEN_KILLFOCUS">SCEN_KILLFOCUS</a><br />
+    </code>
+
+    <p><b id="SCI_SETIDENTIFIER">SCI_SETIDENTIFIER(int identifier)</b><br />
+     <b id="SCI_GETIDENTIFIER">SCI_GETIDENTIFIER &rarr; int</b><br />
+     These two messages set and get the identifier of the Scintilla instance which is included in notifications as the
+     <code>idFrom</code> field.
+     When an application creates multiple Scintilla widgets, this allows the source of each notification to be found.
+     On Windows, this value is initialised in the <code>CreateWindow</code> call and stored as the
+     <code>GWLP_ID</code> attribute of the window.
+     The value should be small, preferably less than 16 bits,
+     rather than a pointer as some of the functions will only transmit 16 or 32 bits.
+    </p>
+
+    <p><b id="SCN_STYLENEEDED">SCN_STYLENEEDED</b><br />
+     If you used <code><a class="message"
+    href="#SCI_SETILEXER">SCI_SETILEXER</a>(NULL)</code> to make the container act as the
+    lexer, you will receive this notification when Scintilla is about to display or print text that
+    requires styling. You are required to style the text from the line that contains the position
+    returned by <a class="seealso" href="#SCI_GETENDSTYLED"><code>SCI_GETENDSTYLED</code></a> up to
+    the position passed in <code>SCNotification.position</code>. Symbolically, you need code of the
+    form:</p>
+<pre>
+    startPos = <a class="seealso" href="#SCI_GETENDSTYLED">SCI_GETENDSTYLED</a>()
+    lineNumber = <a class="seealso"
+href="#SCI_LINEFROMPOSITION">SCI_LINEFROMPOSITION</a>(startPos);
+    startPos = <a class="seealso"
+href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE</a>(lineNumber);
+    MyStyleRoutine(startPos, SCNotification.position);
+</pre>
+
+    <p><b id="SCN_CHARADDED">SCN_CHARADDED</b><br />
+     This is sent when the user types an ordinary text character (as opposed to a command
+    character) that is entered into the text. The container can use this to decide to display a <a
+    class="jump" href="#CallTips">call tip</a> or an <a class="jump" href="#Autocompletion">auto
+    completion list</a>. The character is in <code>SCNotification::ch</code>.
+        For single byte character sets, this is the byte value of the character;
+        for UTF-8, it is the Unicode code point;
+        for DBCS, it is (first byte * 256 + second byte) for 2 byte characters and the byte value for 1 byte characters.
+        This notification is sent before the character has been styled so processing that depends on
+        styling should instead be performed in the SCN_UPDATEUI notification.</p>
+    <p>The <code>SCNotification::characterSource</code> field is the source of the character.</p>
+
+    <table class="standard" summary="Character Source">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+          <th>Value</th>
+          <th align="left">Meaning</th>
+        </tr>
+      </tbody>
+      <tbody>
+        <tr>
+          <td><code>SC_CHARACTERSOURCE_DIRECT_INPUT</code></td>
+          <td>0</td>
+          <td>Direct input characters, including characters generated by calling keyboard commands like <a class="seealso" href="#SCI_NEWLINE">SCI_NEWLINE</a>.</td>
+        </tr>
+
+        <tr>
+          <td><code>SC_CHARACTERSOURCE_TENTATIVE_INPUT</code></td>
+          <td>1</td>
+          <td>Tentative input characters. They are used by IME (inline mode, see <a class="seealso" href="#SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION</a>)
+          to composite final string, normally different from final composited string (which is the string that has been truly added into current document),
+          and may be withdrawn when the user cancels typing (e.g. by pressing Esc key).
+          Some system (at least Cocoa) also use tentative input for non-IME features like using dead key to composite diacritical marks (grave accent, etc.).
+          These characters are not added to macro recording. Most applications can simply ignore the notification when this value is set.
+          </td>
+        </tr>
+
+        <tr>
+          <td><code>SC_CHARACTERSOURCE_IME_RESULT</code></td>
+          <td>2</td>
+          <td>IME (either inline or windowed mode) full composited string. Modern IME is able to composite English word or sentence,
+          when this value is set, current character may not a Chinese, Japanese or Korean character.
+          Currently, this is only set on Windows.</td>
+        </tr>
+
+      </tbody>
+    </table>
+
+    <p><b id="SCN_SAVEPOINTREACHED">SCN_SAVEPOINTREACHED</b><br />
+     <b id="SCN_SAVEPOINTLEFT">SCN_SAVEPOINTLEFT</b><br />
+     Sent to the container when the save point is entered or left, allowing the container to
+    display a "document dirty" indicator and change its menus.<br />
+     See also: <a class="message" href="#SCI_SETSAVEPOINT"><code>SCI_SETSAVEPOINT</code></a>, <a
+    class="message" href="#SCI_GETMODIFY"><code>SCI_GETMODIFY</code></a></p>
+
+    <p><b id="SCN_MODIFYATTEMPTRO">SCN_MODIFYATTEMPTRO</b><br />
+     When in read-only mode, this notification is sent to the container if the user tries to change
+    the text. This can be used to check the document out of a version control system. You can set
+    the read-only state of a document with <code><a class="message"
+    href="#SCI_SETREADONLY">SCI_SETREADONLY</a></code>.</p>
+
+    <p><b id="SCN_KEY">SCN_KEY</b><br />
+     Reports all keys pressed but not consumed by Scintilla. Used on GTK because of
+     some problems with keyboard focus and is not sent by the Windows version. <code>SCNotification::ch</code> holds the key code and
+    <code>SCNotification.modifiers</code> holds the modifiers. This notification is sent if the
+    modifiers include <code>SCMOD_ALT</code> or <code>SCMOD_CTRL</code> and the key code is less
+    than 256.</p>
+
+    <p><b id="SCN_DOUBLECLICK">SCN_DOUBLECLICK</b><br />
+     The mouse button was double clicked in editor. The <code>position</code> field is set to the text position of the
+    double click, the <code>line</code> field is set to the line of the double click, and
+    the <code>modifiers</code> field is set to the key modifiers
+    held down in a similar manner to <a class="message" href="#SCN_KEY">SCN_KEY</a>.</p>
+
+    <p><b id="SCN_UPDATEUI">SCN_UPDATEUI</b><br />
+     Either the text or styling of the document has changed or the selection range or scroll position may have changed.
+     Now would be a good time to update any container UI elements that depend on document or view state.
+     As it is sometimes difficult to determine whether a change has occurred, these events may also fire when there
+     has been no actual change.
+     The <code>updated</code> field is set to the bit set of things changed since the previous notification.</p>
+    <table class="standard" summary="Modify notification type flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Meaning</th>
+
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+
+        <tr>
+          <td align="left"><code>SC_UPDATE_NONE</code></td>
+
+          <td align="center">0x00</td>
+
+          <td>Value without any changes.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_UPDATE_CONTENT</code></td>
+
+          <td align="center">0x01</td>
+
+          <td>Contents, styling or markers may have been changed.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_UPDATE_SELECTION</code></td>
+
+          <td align="center">0x02</td>
+
+          <td>Selection may have been changed.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_UPDATE_V_SCROLL</code></td>
+
+          <td align="center">0x04</td>
+
+          <td>May have scrolled vertically.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_UPDATE_H_SCROLL</code></td>
+
+          <td align="center">0x08</td>
+
+          <td>May have scrolled horizontally.</td>
+
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_MODIFIED">SCN_MODIFIED</b><br />
+     This notification is sent when the text or styling of the document changes or is about to
+    change. You can set a mask for the notifications that are sent to the container with <a
+    class="message" href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>. The
+    notification structure contains information about what changed, how the change occurred and
+    whether this changed the number of lines in the document. No modifications may be performed
+    while in a <code>SCN_MODIFIED</code> event. The <code>SCNotification</code> fields used
+    are:</p>
+
+    <table class="standard" summary="Modify notification types">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>modificationType</code></td>
+
+          <td align="left">A set of flags that identify the change(s) made. See the next
+          table.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">Start position of a text or styling change. Set to 0 if not used.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>length</code></td>
+
+          <td align="left">Length of the change in bytes when the text or styling
+          changes. Set to 0 if not used.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>linesAdded</code></td>
+
+          <td align="left">Number of added lines. If negative, the number of deleted lines. Set to
+          0 if not used or no lines added or deleted.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">Valid for text changes, not for style changes. If we are collecting undo
+          information this holds a pointer to the text that is handed to the Undo system, otherwise
+          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>line</code></td>
+
+          <td align="left">The line number at which a fold level or marker change occurred. This is
+          0 if unused and may be -1 if more than one line changed.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>foldLevelNow</code></td>
+
+          <td align="left">The new fold level applied to the line or 0 if this field is
+          unused.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>foldLevelPrev</code></td>
+
+          <td align="left">The previous folding level of the line or 0 if this field is
+          unused.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>The <code>SCNotification.modificationType</code> field has bits set to tell you what has
+    been done. The <code>SC_MOD_*</code> bits correspond to actions. The
+    <code>SC_PERFORMED_*</code> bits tell you if the action was done by the user, or the result of
+    Undo or Redo of a previous action.</p>
+
+    <table class="standard" summary="Modify notification type flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Meaning</th>
+
+          <th align="left">SCNotification fields</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_MOD_NONE</code></td>
+
+          <td align="right">0x00</td>
+
+          <td>Base value with no fields valid. Will not occur but is useful in tests.</td>
+
+          <td></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_INSERTTEXT</code></td>
+
+          <td align="right">0x01</td>
+
+          <td>Text has been inserted into the document.</td>
+
+          <td><code>position, length, text, linesAdded</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_DELETETEXT</code></td>
+
+          <td align="right">0x02</td>
+
+          <td>Text has been removed from the document.</td>
+
+          <td><code>position, length, text, linesAdded</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGESTYLE</code></td>
+
+          <td align="right">0x04</td>
+
+          <td>A style change has occurred.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEFOLD</code></td>
+
+          <td align="right">0x08</td>
+
+          <td>A folding change has occurred.</td>
+
+          <td><code>line, foldLevelNow, foldLevelPrev</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_USER</code></td>
+
+          <td align="right">0x10</td>
+
+          <td>Information: the operation was done by the user.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_UNDO</code></td>
+
+          <td align="right">0x20</td>
+
+          <td>Information: this was the result of an Undo.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_PERFORMED_REDO</code></td>
+
+          <td align="right">0x40</td>
+
+          <td>Information: this was the result of a Redo.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MULTISTEPUNDOREDO</code></td>
+
+          <td align="right">0x80</td>
+
+          <td>This is part of a multi-step Undo or Redo transaction.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_LASTSTEPINUNDOREDO</code></td>
+
+          <td align="right">0x100</td>
+
+          <td>This is the final step in an Undo or Redo transaction.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEMARKER</code></td>
+
+          <td align="right">0x200</td>
+
+          <td>One or more markers has changed in a line.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_BEFOREINSERT</code></td>
+
+          <td align="right">0x400</td>
+
+          <td>Text is about to be inserted into the document.</td>
+
+          <td><code>position, if performed by user then text in bytes, length in bytes</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_BEFOREDELETE</code></td>
+
+          <td align="right">0x800</td>
+
+          <td>Text is about to be deleted from the document.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MOD_CHANGEINDICATOR</code></td>
+
+          <td align="right">0x4000</td>
+
+          <td>An indicator has been added or removed from a range of text.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CHANGELINESTATE">SC_MOD_CHANGELINESTATE</code></td>
+
+          <td align="right">0x8000</td>
+
+          <td>A line state has changed because <a class="seealso" href="#SCI_SETLINESTATE">SCI_SETLINESTATE</a>
+          was called.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CHANGETABSTOPS">SC_MOD_CHANGETABSTOPS</code></td>
+
+          <td align="right">0x200000</td>
+
+          <td>The explicit tab stops on a line have changed because <a class="seealso" href="#SCI_CLEARTABSTOPS">SCI_CLEARTABSTOPS</a> or
+          <a class="seealso" href="#SCI_ADDTABSTOP">SCI_ADDTABSTOP</a> was called.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_LEXERSTATE">SC_MOD_LEXERSTATE</code></td>
+
+          <td align="right">0x80000</td>
+
+          <td>The internal state of a lexer has changed over a range.</td>
+
+          <td><code>position, length</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CHANGEMARGIN">SC_MOD_CHANGEMARGIN</code></td>
+
+          <td align="right">0x10000</td>
+
+          <td>A text margin has changed.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CHANGEANNOTATION">SC_MOD_CHANGEANNOTATION</code></td>
+
+          <td align="right">0x20000</td>
+
+          <td>An annotation has changed.</td>
+
+          <td><code>line</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_INSERTCHECK">SC_MOD_INSERTCHECK</code></td>
+
+          <td align="right">0x100000</td>
+
+          <td>Text is about to be inserted. The handler may change the text being inserted by calling
+	  <a class="seealso" href="#SCI_CHANGEINSERTION">SCI_CHANGEINSERTION</a>.
+	  No other modifications may be made in this handler.</td>
+
+          <td><code>position, length, text</code></td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MULTILINEUNDOREDO</code></td>
+
+          <td align="right">0x1000</td>
+
+          <td>This is part of an Undo or Redo with multi-line changes.</td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_STARTACTION</code></td>
+
+          <td align="right">0x2000</td>
+
+          <td>This is set on a SC_PERFORMED_USER action when it is the
+          first or only step in an undo transaction. This can be used to integrate the Scintilla
+          undo stack with an undo stack in the container application by adding a Scintilla
+          action to the container's stack for the currently opened container transaction or
+          to open a new container transaction if there is no open container transaction.
+          </td>
+
+          <td>None</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code id="SC_MOD_CONTAINER">SC_MOD_CONTAINER</code></td>
+
+          <td align="right">0x40000</td>
+
+          <td>This is set on for actions that the container stored into the undo stack with
+	  <a class="message" href="#SCI_ADDUNDOACTION"><code>SCI_ADDUNDOACTION</code></a>.
+          </td>
+
+          <td>token</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_MODEVENTMASKALL</code></td>
+
+          <td align="right">0x1FFFFF</td>
+
+          <td>This is a mask for all valid flags. This is the default mask state set by <a
+          class="message" href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>.</td>
+
+          <td>None</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCEN_CHANGE">SCEN_CHANGE</b><br />
+     <code>SCEN_CHANGE</code> (768) is fired when the text (not the style) of the document changes.
+    This notification is sent using the <code>WM_COMMAND</code> message on Windows and the
+    "command" signal on GTK as this is the behaviour of the standard Edit control
+    (<code>SCEN_CHANGE</code> has the same value as the Windows Edit control
+    <code>EN_CHANGE</code>). No other information is sent. If you need more detailed information
+    use <a class="message" href="#SCN_MODIFIED"><code>SCN_MODIFIED</code></a>. You can filter the
+    types of changes you are notified about with <a class="message"
+    href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a> and
+    <a class="message"
+    href="#SCI_SETCOMMANDEVENTS"><code>SCI_SETCOMMANDEVENTS</code></a>.</p>
+
+    <p><b id="SCI_SETMODEVENTMASK">SCI_SETMODEVENTMASK(int eventMask)</b><br />
+     <b id="SCI_GETMODEVENTMASK">SCI_GETMODEVENTMASK &rarr; int</b><br />
+     These messages set and get an event mask that determines which document change events are
+    notified to the container with <a class="message"
+    href="#SCN_MODIFIED"><code>SCN_MODIFIED</code></a> and <a class="message"
+    href="#SCEN_CHANGE"><code>SCEN_CHANGE</code></a>. For example, a container may decide to see
+    only notifications about changes to text and not styling changes by calling
+    <code>SCI_SETMODEVENTMASK(SC_MOD_INSERTTEXT|SC_MOD_DELETETEXT)</code>.</p>
+
+    <p>The possible notification types are the same as the <code>modificationType</code> bit flags
+    used by <code>SCN_MODIFIED</code>: <code>SC_MOD_INSERTTEXT</code>,
+    <code>SC_MOD_DELETETEXT</code>, <code>SC_MOD_CHANGESTYLE</code>,
+    <code>SC_MOD_CHANGEFOLD</code>, <code>SC_PERFORMED_USER</code>, <code>SC_PERFORMED_UNDO</code>,
+    <code>SC_PERFORMED_REDO</code>, <code>SC_MULTISTEPUNDOREDO</code>,
+    <code>SC_LASTSTEPINUNDOREDO</code>, <code>SC_MOD_CHANGEMARKER</code>,
+    <code>SC_MOD_BEFOREINSERT</code>, <code>SC_MOD_BEFOREDELETE</code>,
+    <code>SC_MULTILINEUNDOREDO</code>, and <code>SC_MODEVENTMASKALL</code>.</p>
+
+    <p><b id="SCI_SETCOMMANDEVENTS">SCI_SETCOMMANDEVENTS(bool commandEvents)</b><br />
+     <b id="SCI_GETCOMMANDEVENTS">SCI_GETCOMMANDEVENTS &rarr; bool</b><br />
+     These messages set and get whether <code>SCEN_*</code> command events are
+    sent to the container. For <code>SCEN_CHANGE</code> this acts as an additional filter over
+    <a class="message" href="#SCI_SETMODEVENTMASK"><code>SCI_SETMODEVENTMASK</code></a>.
+    Most applications should set this off to avoid overhead and only use
+    <a class="message" href="#SCN_MODIFIED"><code>SCN_MODIFIED</code></a>.</p>
+
+    <p><b id="SCEN_SETFOCUS">SCEN_SETFOCUS</b><br />
+     <b id="SCEN_KILLFOCUS">SCEN_KILLFOCUS</b><br />
+     <code>SCEN_SETFOCUS</code> (512) is fired when Scintilla receives focus and
+    <code>SCEN_KILLFOCUS</code> (256) when it loses focus. These notifications are sent using the
+    <code>WM_COMMAND</code> message on Windows and the "command" signal on GTK as this is the
+    behaviour of the standard Edit control. Unfortunately, these codes do not match the Windows Edit
+    notification codes <code>EN_SETFOCUS</code> (256) and <code>EN_KILLFOCUS</code> (512). It is
+    now too late to change the Scintilla codes as clients depend on the current values.</p>
+
+    <p><b id="SCN_MACRORECORD">SCN_MACRORECORD</b><br />
+     The <code><a class="message" href="#SCI_STARTRECORD">SCI_STARTRECORD</a></code> and <a
+    class="message" href="#SCI_STOPRECORD"><code>SCI_STOPRECORD</code></a> messages enable and
+    disable macro recording. When enabled, each time a recordable change occurs, the
+    <code>SCN_MACRORECORD</code> notification is sent to the container. It is up to the container
+    to record the action. To see the complete list of <code>SCI_*</code> messages that are
+    recordable, search the Scintilla source <code>Editor.cxx</code> for
+    <code>Editor::NotifyMacroRecord</code>. The fields of <code>SCNotification</code> set in this
+    notification are:</p>
+
+    <table class="standard" summary="Macro record notification data">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>message</code></td>
+
+          <td align="left">The <code>SCI_*</code> message that caused the notification.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>wParam</code></td>
+
+          <td align="left">The value of <code>wParam</code> in the <code>SCI_*</code> message.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>lParam</code></td>
+
+          <td align="left">The value of <code>lParam</code> in the <code>SCI_*</code> message.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_MARGINCLICK">SCN_MARGINCLICK</b><br />
+     <b id="SCN_MARGINRIGHTCLICK">SCN_MARGINRIGHTCLICK</b><br />
+     These notifications tell the container that the mouse was clicked or right clicked inside a <a class="jump"
+    href="#Margins">margin</a> that was marked as sensitive (see <a class="message"
+    href="#SCI_SETMARGINSENSITIVEN"><code>SCI_SETMARGINSENSITIVEN</code></a>). This can be used to
+    perform folding or to place breakpoints. The following <code>SCNotification</code> fields are
+    used:</p>
+
+    <table class="standard" summary="Margin click notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>modifiers</code></td>
+
+          <td align="left">The appropriate combination of <code>SCI_SHIFT</code>,
+          <code>SCI_CTRL</code> and <code>SCI_ALT</code> to indicate the keys that were held down
+          at the time of the margin click.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">The position of the start of the line in the document that corresponds
+          to the margin click.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>margin</code></td>
+
+          <td align="left">The margin number that was clicked.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_NEEDSHOWN">SCN_NEEDSHOWN</b><br />
+     Scintilla has determined that a range of lines that is currently invisible should be made
+    visible. An example of where this may be needed is if the end of line of a contracted fold
+    point is deleted. This message is sent to the container in case it wants to make the line
+    visible in some unusual way such as making the whole document visible. Most containers will
+    just ensure each line in the range is visible by calling <a class="message"
+    href="#SCI_ENSUREVISIBLE"><code>SCI_ENSUREVISIBLE</code></a>. The <code>position</code> and
+    <code>length</code> fields of <code>SCNotification</code> indicate the range of the document
+    that should be made visible. The container code will be similar to the following code
+    skeleton:</p>
+<pre>
+firstLine = SCI_LINEFROMPOSITION(scn.position)
+lastLine = SCI_LINEFROMPOSITION(scn.position+scn.length-1)
+for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
+</pre>
+
+    <p><b id="SCN_PAINTED">SCN_PAINTED</b><br />
+     Painting has just been done. Useful when you want to update some other widgets based on a
+    change in Scintilla, but want to have the paint occur first to appear more responsive. There is
+    no other information in <code>SCNotification</code>.</p>
+
+    <p><b id="SCN_USERLISTSELECTION">SCN_USERLISTSELECTION</b><br />
+     The user has selected an item in a <a class="jump" href="#UserLists">user list</a>. The
+    <code>SCNotification</code> fields used are:</p>
+
+    <table class="standard" summary="User list notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>listType</code></td>
+
+          <td align="left">This is set to the <code class="parameter">listType</code> parameter from the <a
+          class="message" href="#SCI_USERLISTSHOW"><code>SCI_USERLISTSHOW</code></a> message that
+          initiated the list.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">The text of the selection.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">The position the list was displayed at.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>ch</code></td>
+
+          <td align="left">If a fillup character was the method of selection, the used
+            character, otherwise 0.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>listCompletionMethod</code></td>
+
+          <td align="left">A value indicating the way in which the completion
+            occurred. See the table below.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+
+     See the <code><a class="jump" href="#SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED</a></code> notification
+    for the possible values for <code>listCompletionMethod.</code>
+    <p><b id="SCN_URIDROPPED">SCN_URIDROPPED</b><br />
+     Only on the GTK version. Indicates that the user has dragged a URI such as a file name or Web
+    address onto Scintilla. The container could interpret this as a request to open the file. The
+    <code>text</code> field of <code>SCNotification</code> points at the URI text.</p>
+
+    <p><b id="SCN_DWELLSTART">SCN_DWELLSTART</b><br />
+     <b id="SCN_DWELLEND">SCN_DWELLEND</b><br />
+     <code>SCN_DWELLSTART</code> is generated when the user keeps the mouse in one position for the
+    dwell period (see <code><a class="message"
+    href="#SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME</a></code>). <code>SCN_DWELLEND</code> is
+    generated after a <code>SCN_DWELLSTART</code> and the mouse is moved or other activity such as
+    key press indicates the dwell is over. Both notifications set the same fields in
+    <code>SCNotification</code>:</p>
+
+    <table class="standard" summary="Mouse dwell notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">This is the nearest position in the document to the position where the
+          mouse pointer was lingering.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>x, y</code></td>
+
+          <td align="left">Where the pointer lingered. The <code>position</code> field is set to
+          <code><a class="message"
+          href="#SCI_POSITIONFROMPOINTCLOSE">SCI_POSITIONFROMPOINTCLOSE</a>(x, y)</code>.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+
+    <p><b id="SCI_SETMOUSEDWELLTIME">SCI_SETMOUSEDWELLTIME(int periodMilliseconds)</b><br />
+     <b id="SCI_GETMOUSEDWELLTIME">SCI_GETMOUSEDWELLTIME &rarr; int</b><br />
+     These two messages set and get the time the mouse must sit still, in milliseconds, to generate
+    a <code><a class="message" href="#SCN_DWELLSTART">SCN_DWELLSTART</a></code> notification. If
+    set to <code>SC_TIME_FOREVER</code>, the default, no dwell events are generated.</p>
+
+    <p><b id="SCN_ZOOM">SCN_ZOOM</b><br />
+     This notification is generated when the user zooms the display using the keyboard or the
+    <code><a class="seealso" href="#SCI_SETZOOM">SCI_SETZOOM</a></code> method is called. This
+    notification can be used to recalculate positions, such as the width of the line number margin
+    to maintain sizes in terms of characters rather than pixels. <code>SCNotification</code> has no
+    additional information.</p>
+
+    <p>
+    <b id="SCN_HOTSPOTCLICK">SCN_HOTSPOTCLICK</b><br />
+    <b id="SCN_HOTSPOTDOUBLECLICK">SCN_HOTSPOTDOUBLECLICK</b><br />
+    <b id="SCN_HOTSPOTRELEASECLICK">SCN_HOTSPOTRELEASECLICK</b><br />
+     These notifications are generated when the user clicks or double clicks on
+     text that is in a style with the hotspot attribute set.
+    This notification can be used to link to variable definitions or web pages.
+    In the notification handler, you should avoid calling any function that modifies the current selection or caret position.
+    The <code>position</code> field is set the text position of the click or
+    double click and the <code>modifiers</code> field set to the key modifiers
+    held down in a similar manner to <a class="message" href="#SCN_KEY">SCN_KEY</a>.
+    Only the state of the Ctrl key is reported for <code>SCN_HOTSPOTRELEASECLICK</code>.</p>
+
+    <p>
+    <b id="SCN_INDICATORCLICK">SCN_INDICATORCLICK</b><br />
+    <b id="SCN_INDICATORRELEASE">SCN_INDICATORRELEASE</b><br />
+     These notifications are generated when the user clicks or releases the mouse on
+     text that has an indicator.
+    The <code>position</code> field is set the text position of the click or
+    double click and the <code>modifiers</code> field set to the key modifiers
+    held down in a similar manner to <a class="message" href="#SCN_KEY">SCN_KEY</a>.</p>
+
+    <p><b id="SCN_CALLTIPCLICK">SCN_CALLTIPCLICK</b><br />
+     This notification is generated when the user clicks on a calltip.
+    This notification can be used to display the next function prototype when a
+    function name is overloaded with different arguments.
+    The <code>position</code> field is set to 1 if the click is in an up arrow,
+    2 if in a down arrow, and 0 if elsewhere.</p>
+
+    <p><b id="SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</b><br />
+     The user has selected an item in an <a class="jump" href="#Autocompletion">autocompletion list</a>. The
+     notification is sent before the selection is inserted. Automatic insertion can be cancelled by sending a
+     <code><a class="message" href="#SCI_AUTOCCANCEL">SCI_AUTOCCANCEL</a></code> message
+     before returning from the notification. The <code>SCNotification</code> fields used are:</p>
+
+    <table class="standard" summary="Autocompletion list notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">The start position of the word being completed.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">The text of the selection.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>ch</code></td>
+
+          <td align="left">If a fillup character was the method of selection, the used
+            character, otherwise 0.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>listCompletionMethod</code></td>
+
+          <td align="left">A value indicating the way in which the completion
+            occurred. See the table below.</td>
+        </tr>
+      </tbody>
+    </table>
+    <br />
+    <table class="standard" summary="Modify notification type flags">
+      <tbody>
+        <tr>
+          <th align="left">Symbol</th>
+
+          <th>Value</th>
+
+          <th align="left">Meaning</th>
+
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>SC_AC_FILLUP</code></td>
+
+          <td align="center">1</td>
+
+          <td>A fillup character triggered the completion. The character used is
+            in ch. </td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_AC_DOUBLECLICK</code></td>
+
+          <td align="center">2</td>
+
+          <td>A double-click triggered the completion. ch is 0.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_AC_TAB</code></td>
+
+          <td align="center">3</td>
+
+          <td>The tab key or SCI_TAB triggered the completion. ch is 0.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_AC_NEWLINE</code></td>
+
+          <td align="center">4</td>
+
+          <td>A new line or SCI_NEWLINE triggered the completion. ch is 0.</td>
+
+        </tr>
+
+        <tr>
+          <td align="left"><code>SC_AC_COMMAND</code></td>
+
+          <td align="center">5</td>
+
+          <td>The
+    <code>
+     <a class="seealso" href="#SCI_AUTOCSELECT">SCI_AUTOCSELECT</a></code> message
+          triggered the completion. ch is 0.</td>
+
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_AUTOCCANCELLED">SCN_AUTOCCANCELLED</b><br />
+     The user has cancelled an <a class="jump" href="#Autocompletion">autocompletion list</a>.
+     There is no other information in SCNotification.</p>
+
+    <p><b id="SCN_AUTOCCHARDELETED">SCN_AUTOCCHARDELETED</b><br />
+     The user deleted a character while autocompletion list was active.
+     There is no other information in SCNotification.</p>
+
+
+    <p><b id="SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED<br />
+    </b>This notification is generated after an autocompletion has inserted its
+    text. The fields are identical to the
+    <code>
+     <a class="jump" href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code>
+     notification.</p>
+
+    <p><b id="SCN_AUTOCSELECTIONCHANGE">SCN_AUTOCSELECTIONCHANGE<br />
+    </b>This notification is sent when items are highlighted in an autocompletion or user list.
+     The
+    <code>SCNotification</code> fields used are:</p>
+
+    <table class="standard" summary="User list notification">
+      <tbody>
+        <tr>
+          <th align="left">Field</th>
+
+          <th align="left">Usage</th>
+        </tr>
+      </tbody>
+
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>listType</code></td>
+
+          <td align="left">This is set to the <code class="parameter">listType</code> parameter from the <a
+          class="message" href="#SCI_USERLISTSHOW"><code>SCI_USERLISTSHOW</code></a> message
+	  or 0 for an autocompletion.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>text</code></td>
+
+          <td align="left">The text of the selection.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>position</code></td>
+
+          <td align="left">The position the list was displayed at.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p><b id="SCN_FOCUSIN">SCN_FOCUSIN</b><br />
+    <b id="SCN_FOCUSOUT">SCN_FOCUSOUT</b><br />
+    <code>SCN_FOCUSIN</code> (2028) is fired when Scintilla receives focus and
+    <code>SCN_FOCUSOUT</code> (2029) when it loses focus.</p>
+
+    <h2 id="Images">Images</h2>
+
+    <p>Two formats are supported for images used in margin markers and autocompletion lists, RGBA and XPM.</p>
+
+    <h3 id="RGBA">RGBA</h3>
+
+    <p>The RGBA format allows translucency with an <a class="jump" href="#alpha">alpha</a>
+    value for each pixel. It is simpler than
+    <code>XPM</code> and more capable.</p>
+
+    <p>The data is a sequence of 4 byte pixel values starting with the pixels for the top line, with the
+    leftmost pixel first, then continuing with the pixels for subsequent lines. There is no gap between
+    lines for alignment reasons.</p>
+
+    <p>Each pixel consists of, in order, a red byte, a green byte, a blue byte and an alpha byte.
+    The colour bytes are not premultiplied by the alpha value. That is, a fully red pixel that is
+    25% opaque will be [FF, 00, 00, 3F]</p>
+
+    <p>Since the RGBA pixel data does not include any size information the
+    width and height must previously been set with the
+    <a class="message" href="#SCI_RGBAIMAGESETWIDTH"><code>SCI_RGBAIMAGESETWIDTH</code></a> and
+    <a class="message" href="#SCI_RGBAIMAGESETHEIGHT"><code>SCI_RGBAIMAGESETHEIGHT</code></a> messages.</p>
+
+    <p>GUI platforms often include functions for reading image file formats like PNG into memory
+    in the RGBA form or a similar form.
+    If there is no suitable platform support, the <a href="http://lodev.org/lodepng/">LodePNG and picoPNG</a> libraries are small libraries
+    for loading and decoding PNG files available under a BSD-style license.</p>
+
+    <p>RGBA format is supported on Windows, GTK and OS X Cocoa.</p>
+
+    <h3 id="XPM">XPM</h3>
+
+    <p>The XPM format is
+    <a class="jump" href="http://en.wikipedia.org/wiki/X_PixMap">described here</a>.
+    Scintilla is only able to handle XPM pixmaps that use one character per pixel with no named colours.
+    There may be a completely transparent colour named "None".</p>
+    <p>There are two forms of data structure used for XPM images, the first "lines form" format is well suited
+    to embedding an image inside C source code and the "text form" is suited to reading from a file.
+    In the lines form, an array of strings is used with the first string indicating the dimensions and number of colours
+    used. This is followed by a string for each colour and that section is followed by the image with one string per line.
+    The text form contains the same data as one null terminated block formatted as C source code starting
+    with a "/* XPM */" comment to mark the format.</p>
+    <p>Either format may be used with Scintilla APIs with the bytes at the location pointed to examined
+    to determine which format: if the bytes start with "/* XPM */" then it is treated as text form,
+    otherwise it is treated as lines form.</p>
+
+    <p>XPM format is supported on all platforms.</p>
+
+    <h2 id="GTK">GTK</h2>
+    <p>On GTK, the following functions create a Scintilla widget, communicate with it and allow
+    resources to be released after all Scintilla widgets have been destroyed.</p>
+    <code><a class="message" href="#scintilla_new">GtkWidget *scintilla_new()</a><br />
+     <a class="message" href="#scintilla_set_id">void scintilla_set_id(ScintillaObject *sci, uptr_t id)</a><br />
+     <a class="message" href="#scintilla_send_message">sptr_t scintilla_send_message(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam)</a><br />
+     <a class="message" href="#scintilla_release_resources">void scintilla_release_resources()</a><br />
+     </code>
+
+    <p><b id="scintilla_new">GtkWidget *scintilla_new()</b><br />
+    Create a new Scintilla widget. The returned pointer can be added to a container and displayed in the same way as other
+    widgets.</p>
+
+    <p><b id="scintilla_set_id">void scintilla_set_id(ScintillaObject *sci, uptr_t id)</b><br />
+    Set the control ID which will be used in the idFrom field of the Sci_NotifyHeader structure of all
+    notifications for this instance.
+    This is equivalent to <a class="seealso" href="#SCI_SETIDENTIFIER">SCI_SETIDENTIFIER</a>.</p>
+
+    <p><b id="scintilla_send_message">sptr_t scintilla_send_message(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam)</b><br />
+    The main entry point allows sending any of the messages described in this document.</p>
+
+    <p><b id="scintilla_release_resources">void scintilla_release_resources()</b><br />
+    Call this to free any remaining resources after all the Scintilla widgets have been destroyed.</p>
+
+    <h2 id="ProvisionalMessages">Provisional messages</h2>
+
+    <p>Complex new features may be added as 'provisional' to allow further changes to the API.
+    Provisional features may even be removed if experience shows they are a mistake.</p>
+
+    <p>Provisional features are displayed in this document with <span class="provisional">a distinctive background colour</span>.</p>
+
+    <p>Some developers may want to only use features that are stable and have graduated from
+    provisional status. To avoid using provisional messages compile with the symbol
+    <code>SCI_DISABLE_PROVISIONAL</code> defined.</p>
+
+    <h2 id="DeprecatedMessages">Deprecated and discouraged messages and notifications</h2>
+
+    <p>The following messages are currently supported to emulate existing Windows controls, but
+    they will be removed in future versions of Scintilla. If you use these messages you should
+    replace them with the Scintilla equivalent.</p>
+<pre>
+WM_GETTEXT(int length, char *text)
+WM_SETTEXT(&lt;unused&gt;, const char *text)
+EM_GETLINE(int line, char *text)
+EM_REPLACESEL(&lt;unused&gt;, const char *text)
+EM_SETREADONLY
+EM_GETTEXTRANGE(&lt;unused&gt;, TEXTRANGE *tr)
+WM_CUT
+WM_COPY
+WM_PASTE
+WM_CLEAR
+WM_UNDO
+EM_CANUNDO
+EM_EMPTYUNDOBUFFER
+WM_GETTEXTLENGTH
+EM_GETFIRSTVISIBLELINE
+EM_GETLINECOUNT
+EM_GETMODIFY
+EM_SETMODIFY(bool isModified)
+EM_GETRECT(RECT *rect)
+EM_GETSEL(int *start, int *end)
+EM_EXGETSEL(&lt;unused&gt;, CHARRANGE *cr)
+EM_SETSEL(int start, int end)
+EM_EXSETSEL(&lt;unused&gt;, CHARRANGE *cr)
+EM_GETSELTEXT(&lt;unused&gt;, char *text)
+EM_LINEFROMCHAR(int position)
+EM_EXLINEFROMCHAR(int position)
+EM_LINEINDEX(int line)
+EM_LINELENGTH(int position)
+EM_SCROLL(int line)
+EM_LINESCROLL(int column, int line)
+EM_SCROLLCARET()
+EM_CANPASTE
+EM_CHARFROMPOS(&lt;unused&gt;, POINT *location)
+EM_POSFROMCHAR(int position, POINT *location)
+EM_SELECTIONTYPE
+EM_HIDESELECTION(bool hide)
+EM_FINDTEXT(int flags, FINDTEXTEX *ft)
+EM_FINDTEXTEX(int flags, FINDTEXTEX *ft)
+EM_GETMARGINS
+EM_SETMARGINS(EC_LEFTMARGIN or EC_RIGHTMARGIN or EC_USEFONTINFO, int val)
+EM_FORMATRANGE
+</pre>
+
+    <p>The following are features that are only included if you define
+    <code>INCLUDE_DEPRECATED_FEATURES</code> in <code>Scintilla.h</code>. To ensure future
+    compatibility you should change them as indicated.</p>
+
+    <code>
+     <a class="message" href="#SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</a><br />
+     <a class="message" href="#SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETTWOPHASEDRAW">SCI_SETTWOPHASEDRAW(bool twoPhase)</a><br />
+     <a class="message" href="#SCI_GETTWOPHASEDRAW">SCI_GETTWOPHASEDRAW &rarr; bool</a><br />
+     <a class="message" href="#SCI_SETSTYLEBITS">SCI_SETSTYLEBITS(int bits)</a><br />
+     <a class="message" href="#SCI_GETSTYLEBITS">SCI_GETSTYLEBITS &rarr; int</a><br />
+     <a class="message" href="#SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</b> Deprecated<br />
+     <b id="SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE &rarr; bool</b> Deprecated<br />
+     On Windows, Scintilla no longer supports narrow character windows so input is always treated as Unicode.</p>
+
+    <p><b id="SCI_SETTWOPHASEDRAW">SCI_SETTWOPHASEDRAW(bool twoPhase)</b><br />
+     <b id="SCI_GETTWOPHASEDRAW">SCI_GETTWOPHASEDRAW &rarr; bool</b><br />
+     This property has been replaced with the preceding PHASESDRAW property which is more general,
+     allowing multiple phase drawing as well as one and two phase drawing.</p>
+
+    <p>Single phase drawing <code>SC_PHASES_ONE</code>, is deprecated and should be replaced with
+    2-phase <code>SC_PHASES_TWO</code> or multi-phase <code>SC_PHASES_MULTIPLE</code> drawing.
+    </p>
+
+    <p>The following are features that should be removed from calling code but are still
+    defined to avoid breaking callers.</p>
+
+    <p id="StyleByteIndicators"><b id="SCI_SETSTYLEBITS">SCI_SETSTYLEBITS(int bits)</b> Deprecated<br />
+    <b id="SCI_GETSTYLEBITS">SCI_GETSTYLEBITS &rarr; int</b> Deprecated<br />
+    <b id="SCI_GETSTYLEBITSNEEDED">SCI_GETSTYLEBITSNEEDED &rarr; int</b> Deprecated<br />
+    <code>INDIC0_MASK</code>, <code>INDIC1_MASK</code>, <code>INDIC2_MASK</code>, <code>INDICS_MASK</code> Deprecated<br />
+     Scintilla no longer supports style byte indicators. The last version to support style byte indicators was 3.4.2.
+     Any use of these symbols should be removed and replaced with <a href="#Indicators">standard indicators</a>.
+    <code>SCI_GETSTYLEBITS</code> and <code>SCI_GETSTYLEBITSNEEDED</code> always return 8,
+    indicating that 8 bits are used for styling and there are 256 styles.</p>
+    
+    <p>Discouraged APIs are a step before deprecation. A new preferred API has been implemented that new code should use
+    but the old API is unlikely to be removed.
+    Discouraged APIs are marked with a <span class="discouraged">orange strikethrough</span> and their documentation mentions the preferred API.
+    </p>
+
+    <h2 id="EditMessagesNeverSupportedByScintilla">Edit messages never supported by Scintilla</h2>
+<pre>
+EM_GETWORDBREAKPROC EM_GETWORDBREAKPROCEX
+EM_SETWORDBREAKPROC EM_SETWORDBREAKPROCEX
+EM_GETWORDWRAPMODE EM_SETWORDWRAPMODE
+EM_LIMITTEXT EM_EXLIMITTEXT
+EM_SETRECT EM_SETRECTNP
+EM_FMTLINES
+EM_GETHANDLE EM_SETHANDLE
+EM_GETPASSWORDCHAR EM_SETPASSWORDCHAR
+EM_SETTABSTOPS
+EM_FINDWORDBREAK
+EM_GETCHARFORMAT EM_SETCHARFORMAT
+EM_GETOLEINTERFACE EM_SETOLEINTERFACE
+EM_SETOLECALLBACK
+EM_GETPARAFORMAT EM_SETPARAFORMAT
+EM_PASTESPECIAL
+EM_REQUESTRESIZE
+EM_GETBKGNDCOLOR EM_SETBKGNDCOLOR
+EM_STREAMIN EM_STREAMOUT
+EM_GETIMECOLOR EM_SETIMECOLOR
+EM_GETIMEOPTIONS EM_SETIMEOPTIONS
+EM_GETOPTIONS EM_SETOPTIONS
+EM_GETPUNCTUATION EM_SETPUNCTUATION
+EM_GETTHUMB
+EM_GETEVENTMASK
+EM_SETEVENTMASK
+EM_DISPLAYBAND
+EM_SETTARGETDEVICE
+</pre>
+
+    <p>Scintilla tries to be a superset of the standard windows Edit and RichEdit controls wherever
+    that makes sense. As it is not intended for use in a word processor, some edit messages can not
+    be sensibly handled. Unsupported messages have no effect.</p>
+
+    <h2 id="RemovedFeatures">Removed features</h2>
+
+    <p>These features have now been removed completely.</p>
+
+    <p><b id="SC_CP_DBCS">SC_CP_DBCS</b> Removed in 2016 with release 3.7.1<br />
+     This was used to set a DBCS (Double Byte Character Set) mode on GTK.
+     An explicit DBCS code page should be used when calling <a class="seealso" href="#SCI_SETCODEPAGE">SCI_SETCODEPAGE</a></p>
+
+    <p><b id="SCI_SETUSEPALETTE">SCI_SETUSEPALETTE(bool usePalette)</b> Removed in 2016 with release 3.7.1<br />
+    <b id="SCI_GETUSEPALETTE">SCI_GETUSEPALETTE &rarr; bool</b> Removed in 2016 with release 3.7.1<br />
+     Scintilla no longer supports palette mode. The last version to support palettes was 2.29.
+     Any calls to these methods must be removed.</p>
+
+    <p>Previous versions of Scintilla allowed indicators to be stored in bits of each style byte.
+    This was deprecated in 2007 and removed in 2014 with release 3.4.3.
+    All uses of style byte indicators should be replaced with <a href="#Indicators">standard indicators</a>.</p>
+
+    <h2 id="BuildingScintilla">Building Scintilla</h2>
+
+    <p>To build Scintilla or SciTE, see the README file present in both the Scintilla and SciTE
+    directories.
+    The compiler must support C++17.
+    For Windows, GCC 7.1 or Microsoft Visual C++ 2017.5 can be used
+    for building. For GTK, GCC 7.1 or newer should be used. GTK 2.24 and 3.x are
+    supported with glib 2.22+. The version of GTK installed should be detected automatically.
+    When both GTK 2 and GTK 3 are present, building for GTK 3.x requires defining GTK3
+    on the command line.</p>
+
+    <p>Adding and removing source files from Scintilla may require modifying build files.
+    This is addressed in <a class="jump" href="AddSource.txt">AddSource.txt</a>.</p>
+
+    <h3>Static linking</h3>
+
+    <p>On Windows, Scintilla is normally used as a dynamic library as a .DLL file. If you want to
+    link Scintilla directly into your application .EXE or .DLL file, then you can link to the static library
+    bin/libscintilla.lib (or .a if using GCC) and call <code>Scintilla_RegisterClasses</code>.
+    <code>Scintilla_RegisterClasses</code> takes the <code>HINSTANCE</code> of your
+    application and ensures that the "Scintilla" window class is registered.</p>
+    <p>When producing a stand-alone Scintilla DLL, the ScintillaDLL.cxx file should be compiled and
+    linked in to provide <code>DllMain</code> and <code>Scintilla_RegisterClasses</code>.</p>
+
+    <h3>Ensuring lexers are linked into Scintilla</h3>
+
+    <p>Depending on the compiler and linker used, the lexers may be stripped out. This is most
+    often caused when building a static library. To ensure the lexers are linked in, the
+    <code>Scintilla_LinkLexers()</code> function may be called.</p>
+
+    <h3>Changing set of lexers</h3>
+
+    <p>To change the set of lexers in Scintilla, add and remove lexer source files
+    (<code>Lex*.cxx</code>) from the <code>scintilla/lexers directory</code> and run the
+    <code>scripts/LexGen.py</code> script from the <code>scripts</code> directory to update the make files
+    and <code>Catalogue.cxx</code>. <code>LexGen.py</code> requires Python 3.6 or later. If you do
+    not have access to Python, you can hand edit <code>Catalogue.cxx</code> in a simple-minded way,
+    following the patterns of other lexers. The important thing is to include
+    <code>LINK_LEXER(lmMyLexer);</code> to correspond with the <code>LexerModule
+    lmMyLexer(...);</code> in your lexer source code.</p>
+
+    <h3>Building with an alternative Regular Expression implementation</h3>
+
+ <p id="AlternativeRegEx">A simple interface provides support for switching the Regular Expressions engine at
+ compile time. You must implement <code>RegexSearchBase</code> for your chosen engine,
+ look at the built-in implementation <code>BuiltinRegex</code> to see how this is done.
+ You then need to implement the factory method <code>CreateRegexSearch</code>
+ to create an instance of your class. You must disable the built-in implementation by defining
+ <code>SCI_OWNREGEX</code>.</p>
+
+    <h3>Preprocessors affect building</h3>
+
+    <table class="standard" summary="Building preprocessors">
+      <tbody>
+        <tr>
+          <th align="left">Preprocessor</th>
+          <th align="left">Description</th>
+        </tr>
+      </tbody>
+      <tbody valign="top">
+        <tr>
+          <td align="left"><code>NO_CXX11_REGEX</code></td>
+          <td>Build Scintilla without C++11 <code>std::regex</code>.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>REGEX_MULTILINE</code></td>
+          <td>Enable using C++11 multiline regex.</td>
+        </tr>
+        <tr>
+          <td align="left"><code> SCI_OWNREGEX</code></td>
+          <td>Build Scintilla with customised regex engine.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>SCI_DISABLE_AUTOGENERATED</code></td>
+          <td>No auto-generated constants or macros.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>SCI_DISABLE_PROVISIONAL</code></td>
+          <td>Build Scintilla without provisional features.</td>
+        </tr>
+        <tr>
+          <td align="left"><code>INCLUDE_DEPRECATED_FEATURES</code></td>
+          <td>Expose deprecated features from Scintilla headers.</td>
+        </tr>
+
+        <tr>
+          <td align="left"><code>DISABLE_D2D</code></td>
+          <td>(Win32) Build Scintilla without Direct2D/DirectWrite.</td>
+        </tr>
+      </tbody>
+    </table>
+
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/ScintillaDownload.html b/scite-app/scintilla/doc/ScintillaDownload.html
new file mode 100644
index 0000000..48b673d
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaDownload.html
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Download Scintilla
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Download
+          Scintilla</font></a>
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
+      <tr>
+        <td>
+          <font size="4"> <a href="https://www.scintilla.org/scintilla511.zip">
+	Windows</a>&nbsp;&nbsp;
+	<a href="https://www.scintilla.org/scintilla511.tgz">
+          GTK/Linux</a>&nbsp;&nbsp;
+	</font>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Download.
+    </h2>
+    <p>
+       The <a href="License.txt">license</a> for using Scintilla or SciTE is similar to that of Python
+      containing very few restrictions.
+    </p>
+    <h3>
+       Release 5.1.1
+    </h3>
+    <h4>
+       Source Code
+    </h4>
+       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/scintilla511.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla511.tgz">tgz format</a> (1.2M) 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>
+       Windows Executable Code
+    </h4>
+       There is no download available containing only the Scintilla DLL.
+       However, it is included in the <a href="SciTEDownload.html">SciTE
+       executable full download</a> as SciLexer.DLL.
+    <p>
+       <a href="SciTEDownload.html">SciTE</a> is a good demonstration of Scintilla.
+    </p>
+    <p>
+       Previous versions can be downloaded from the <a href="ScintillaHistory.html">history
+      page</a>.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/ScintillaHistory.html b/scite-app/scintilla/doc/ScintillaHistory.html
new file mode 100644
index 0000000..7b237d8
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaHistory.html
@@ -0,0 +1,13324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla
+    </title>
+    <style type="text/css">
+        table {
+            border-collapse: collapse;
+            font-size: 80%;
+        }
+        td {
+            xborder: 1px solid #1F1F1F;
+            padding: 0px 4px;
+        }
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla</font></a>
+        </td>
+      </tr>
+    </table>
+    <h1>History of Scintilla</h1>
+    <h2>Contributors</h2>
+    <p>
+       Thanks to all the people that have contributed patches, bug reports and suggestions.
+    </p>
+    <p>
+       Source code and documentation have been contributed by
+    </p>
+    <table>
+      <tr>
+	<td>Atsuo Ishimoto</td>
+	<td>Mark Hammond</td>
+	<td>Francois Le Coguiec</td>
+	<td>Dale Nagata</td>
+      </tr><tr>
+	<td>Ralf Reinhardt</td>
+	<td>Philippe Lhoste</td>
+	<td>Andrew McKinlay</td>
+	<td>Stephan R. A. Deibel</td>
+      </tr><tr>
+	<td>Hans Eckardt</td>
+	<td>Vassili Bourdo</td>
+	<td>Maksim Lin</td>
+	<td>Robin Dunn</td>
+      </tr><tr>
+	<td>John Ehresman</td>
+	<td>Steffen Goeldner</td>
+	<td>Deepak S.</td>
+	<td><a href="http://www.develop.com">DevelopMentor</a></td>
+      </tr><tr>
+	<td>Yann Gaillard</td>
+	<td>Aubin Paul</td>
+	<td>Jason Diamond</td>
+	<td>Ahmad Baitalmal</td>
+      </tr><tr>
+	<td>Paul Winwood</td>
+	<td>Maxim Baranov</td>
+	<td>Ragnar Højland</td>
+	<td>Christian Obrecht</td>
+      </tr><tr>
+	<td>Andreas Neukoetter</td>
+	<td>Adam Gates</td>
+	<td>Steve Lhomme</td>
+	<td>Ferdinand Prantl</td>
+      </tr><tr>
+	<td>Jan Dries</td>
+	<td>Markus Gritsch</td>
+	<td>Tahir Karaca</td>
+	<td>Ahmad Zawawi</td>
+      </tr><tr>
+	<td>Laurent le Tynevez</td>
+	<td>Walter Braeu</td>
+	<td>Ashley Cambrell</td>
+	<td>Garrett Serack</td>
+      </tr><tr>
+	<td>Holger Schmidt</td>
+	<td><a href="http://www.activestate.com">ActiveState</a></td>
+	<td>James Larcombe</td>
+	<td>Alexey Yutkin</td>
+      </tr><tr>
+	<td>Jan Hercek</td>
+	<td>Richard Pecl</td>
+	<td>Edward K. Ream</td>
+	<td>Valery Kondakoff</td>
+      </tr><tr>
+	<td>Smári McCarthy</td>
+	<td>Clemens Wyss</td>
+	<td>Simon Steele</td>
+	<td>Serge A. Baranov</td>
+      </tr><tr>
+	<td>Xavier Nodet</td>
+	<td>Willy Devaux</td>
+	<td>David Clain</td>
+	<td>Brendon Yenson</td>
+      </tr><tr>
+	<td><a href="http://www.baanboard.com">Vamsi Potluru</a></td>
+	<td>Praveen Ambekar</td>
+	<td>Alan Knowles</td>
+	<td>Kengo Jinno</td>
+      </tr><tr>
+	<td>Valentin Valchev</td>
+	<td>Marcos E. Wurzius</td>
+	<td>Martin Alderson</td>
+	<td>Robert Gustavsson</td>
+      </tr><tr>
+	<td>José Fonseca</td>
+	<td>Holger Kiemes</td>
+	<td>Francis Irving</td>
+	<td>Scott Kirkwood</td>
+      </tr><tr>
+	<td>Brian Quinlan</td>
+	<td>Ubi</td>
+	<td>Michael R. Duerig</td>
+	<td>Deepak T</td>
+      </tr><tr>
+	<td>Don Paul Beletsky</td>
+	<td>Gerhard Kalab</td>
+	<td>Olivier Dagenais</td>
+	<td>Josh Wingstrom</td>
+      </tr><tr>
+	<td>Bruce Dodson</td>
+	<td>Sergey Koshcheyev</td>
+	<td>Chuan-jian Shen</td>
+	<td>Shane Caraveo</td>
+      </tr><tr>
+	<td>Alexander Scripnik</td>
+	<td>Ryan Christianson</td>
+	<td>Martin Steffensen</td>
+	<td>Jakub Vrána</td>
+      </tr><tr>
+	<td>The Black Horus</td>
+	<td>Bernd Kreuss</td>
+	<td>Thomas Lauer</td>
+	<td>Mike Lansdaal</td>
+      </tr><tr>
+	<td>Yukihiro Nakai</td>
+	<td>Jochen Tucht</td>
+	<td>Greg Smith</td>
+	<td>Steve Schoettler</td>
+      </tr><tr>
+	<td>Mauritius Thinnes</td>
+	<td>Darren Schroeder</td>
+	<td>Pedro Guerreiro</td>
+	<td>Steven te Brinke</td>
+      </tr><tr>
+	<td>Dan Petitt</td>
+	<td>Biswapesh Chattopadhyay</td>
+	<td>Kein-Hong Man</td>
+	<td>Patrizio Bekerle</td>
+      </tr><tr>
+	<td>Nigel Hathaway</td>
+	<td>Hrishikesh Desai</td>
+	<td>Sergey Puljajev</td>
+	<td>Mathias Rauen</td>
+      </tr><tr>
+	<td><a href="http://www.spaceblue.com">Angelo Mandato</a></td>
+	<td>Denis Sureau</td>
+	<td>Kaspar Schiess</td>
+	<td>Christoph Hösler</td>
+      </tr><tr>
+	<td>João Paulo F Farias</td>
+	<td>Ron Schofield</td>
+	<td>Stefan Wosnik</td>
+	<td>Marius Gheorghe</td>
+      </tr><tr>
+	<td>Naba Kumar</td>
+	<td>Sean O'Dell</td>
+	<td>Stefanos Togoulidis</td>
+	<td>Hans Hagen</td>
+      </tr><tr>
+	<td>Jim Cape</td>
+	<td>Roland Walter</td>
+	<td>Brian Mosher</td>
+	<td>Nicholas Nemtsev</td>
+      </tr><tr>
+	<td>Roy Wood</td>
+	<td>Peter-Henry Mander</td>
+	<td>Robert Boucher</td>
+	<td>Christoph Dalitz</td>
+      </tr><tr>
+	<td>April White</td>
+	<td>S. Umar</td>
+	<td>Trent Mick</td>
+	<td>Filip Yaghob</td>
+      </tr><tr>
+	<td>Avi Yegudin</td>
+	<td>Vivi Orunitia</td>
+	<td>Manfred Becker</td>
+	<td>Dimitris Keletsekis</td>
+      </tr><tr>
+	<td>Yuiga</td>
+	<td>Davide Scola</td>
+	<td>Jason Boggs</td>
+	<td>Reinhold Niesner</td>
+      </tr><tr>
+	<td>Jos van der Zande</td>
+	<td>Pescuma</td>
+	<td>Pavol Bosik</td>
+	<td>Johannes Schmid</td>
+      </tr><tr>
+	<td>Blair McGlashan</td>
+	<td>Mikael Hultgren</td>
+	<td>Florian Balmer</td>
+	<td>Hadar Raz</td>
+      </tr><tr>
+	<td>Herr Pfarrer</td>
+	<td>Ben Key</td>
+	<td>Gene Barry</td>
+	<td>Niki Spahiev</td>
+      </tr><tr>
+	<td>Carsten Sperber</td>
+	<td>Phil Reid</td>
+	<td>Iago Rubio</td>
+	<td>Régis Vaquette</td>
+      </tr><tr>
+	<td>Massimo Corà</td>
+	<td>Elias Pschernig</td>
+	<td>Chris Jones</td>
+	<td>Josiah Reynolds</td>
+      </tr><tr>
+	<td>Robert Roessler <a href="http://www.rftp.com">rftp.com</a></td>
+	<td>Steve Donovan</td>
+	<td>Jan Martin Pettersen</td>
+	<td>Sergey Philippov</td>
+      </tr><tr>
+	<td>Borujoa</td>
+	<td>Michael Owens</td>
+	<td>Franck Marcia</td>
+	<td>Massimo Maria Ghisalberti</td>
+      </tr><tr>
+	<td>Frank Wunderlich</td>
+	<td>Josepmaria Roca</td>
+	<td>Tobias Engvall</td>
+	<td>Suzumizaki Kimitaka</td>
+      </tr><tr>
+	<td>Michael Cartmell</td>
+	<td>Pascal Hurni</td>
+	<td>Andre</td>
+	<td>Randy Butler</td>
+      </tr><tr>
+	<td>Georg Ritter</td>
+	<td>Michael Goffioul</td>
+	<td>Ben Harper</td>
+	<td>Adam Strzelecki</td>
+      </tr><tr>
+	<td>Kamen Stanev</td>
+	<td>Steve Menard</td>
+	<td>Oliver Yeoh</td>
+	<td>Eric Promislow</td>
+      </tr><tr>
+	<td>Joseph Galbraith</td>
+	<td>Jeffrey Ren</td>
+	<td>Armel Asselin</td>
+	<td>Jim Pattee</td>
+      </tr><tr>
+	<td>Friedrich Vedder</td>
+	<td>Sebastian Pipping</td>
+	<td>Andre Arpin</td>
+	<td>Stanislav Maslovski</td>
+      </tr><tr>
+	<td>Martin Stone</td>
+	<td>Fabien Proriol</td>
+	<td>mimir</td>
+	<td>Nicola Civran</td>
+      </tr><tr>
+	<td>Snow</td>
+	<td>Mitchell Foral</td>
+	<td>Pieter Holtzhausen</td>
+	<td>Waldemar Augustyn</td>
+      </tr><tr>
+	<td>Jason Haslam</td>
+	<td>Sebastian Steinlechner</td>
+	<td>Chris Rickard</td>
+	<td>Rob McMullen</td>
+      </tr><tr>
+	<td>Stefan Schwendeler</td>
+	<td>Cristian Adam</td>
+	<td>Nicolas Chachereau</td>
+	<td>Istvan Szollosi</td>
+      </tr><tr>
+	<td>Xie Renhui</td>
+	<td>Enrico Tröger</td>
+	<td>Todd Whiteman</td>
+	<td>Yuval Papish</td>
+      </tr><tr>
+	<td>instanton</td>
+	<td>Sergio Lucato</td>
+	<td>VladVRO</td>
+	<td>Dmitry Maslov</td>
+      </tr><tr>
+	<td>chupakabra</td>
+	<td>Juan Carlos Arevalo Baeza</td>
+	<td>Nick Treleaven</td>
+	<td>Stephen Stagg</td>
+      </tr><tr>
+	<td>Jean-Paul Iribarren</td>
+	<td>Tim Gerundt</td>
+	<td>Sam Harwell</td>
+	<td>Boris</td>
+      </tr><tr>
+	<td>Jason Oster</td>
+	<td>Gertjan Kloosterman</td>
+	<td>alexbodn</td>
+	<td>Sergiu Dotenco</td>
+      </tr><tr>
+	<td>Anders Karlsson</td>
+	<td>ozlooper</td>
+	<td>Marko Njezic</td>
+	<td>Eugen Bitter</td>
+      </tr><tr>
+	<td>Christoph Baumann</td>
+	<td>Christopher Bean</td>
+	<td>Sergey Kishchenko</td>
+	<td>Kai Liu</td>
+      </tr><tr>
+	<td>Andreas Rumpf</td>
+	<td>James Moffatt</td>
+	<td>Yuzhou Xin</td>
+	<td>Nic Jansma</td>
+      </tr><tr>
+	<td>Evan Jones</td>
+	<td>Mike Lischke</td>
+	<td>Eric Kidd</td>
+	<td>maXmo</td>
+      </tr><tr>
+	<td>David Severwright</td>
+	<td>Jon Strait</td>
+	<td>Oliver Kiddle</td>
+	<td>Etienne Girondel</td>
+      </tr><tr>
+	<td>Haimag Ren</td>
+	<td>Andrey Moskalyov</td>
+	<td>Xavi</td>
+	<td>Toby Inkster</td>
+      </tr><tr>
+	<td>Eric Forgeot</td>
+	<td>Colomban Wendling</td>
+	<td>Neo</td>
+	<td>Jordan Russell</td>
+      </tr><tr>
+	<td>Farshid Lashkari</td>
+	<td>Sam Rawlins</td>
+	<td>Michael Mullin</td>
+	<td>Carlos SS</td>
+      </tr><tr>
+	<td>vim</td>
+	<td>Martial Demolins</td>
+	<td>Tino Weinkauf</td>
+	<td>Jérôme Laforge</td>
+      </tr><tr>
+	<td>Udo Lechner</td>
+	<td>Marco Falda</td>
+	<td>Dariusz Knociński</td>
+	<td>Ben Fisher</td>
+      </tr><tr>
+	<td>Don Gobin</td>
+	<td>John Yeung</td>
+	<td>Adobe</td>
+	<td>Elizabeth A. Irizarry</td>
+      </tr><tr>
+	<td>Mike Schroeder</td>
+	<td>Morten MacFly</td>
+	<td>Jaime Gimeno</td>
+	<td>Thomas Linder Puls</td>
+      </tr><tr>
+	<td>Artyom Zuikov</td>
+	<td>Gerrit</td>
+	<td>Occam's Razor</td>
+	<td>Ben Bluemel</td>
+      </tr><tr>
+	<td>David Wolfendale</td>
+	<td>Chris Angelico</td>
+	<td>Marat Dukhan</td>
+	<td>Stefan Weil</td>
+      </tr><tr>
+	<td>Rex Conn</td>
+	<td>Ross McKay</td>
+	<td>Bruno Barbieri</td>
+	<td>Gordon Smith</td>
+      </tr><tr>
+	<td>dimitar</td>
+	<td>Sébastien Granjoux</td>
+	<td>zeniko</td>
+	<td>James Ribe</td>
+      </tr><tr>
+	<td>Markus Nißl</td>
+	<td>Martin Panter</td>
+	<td>Mark Yen</td>
+	<td>Philippe Elsass</td>
+      </tr><tr>
+	<td>Dimitar Zhekov</td>
+	<td>Fan Yang</td>
+	<td>Denis Shelomovskij</td>
+	<td>darmar</td>
+      </tr><tr>
+	<td>John Vella</td>
+	<td>Chinh Nguyen</td>
+	<td>Sakshi Verma</td>
+	<td>Joel B. Mohler</td>
+      </tr><tr>
+	<td>Isiledhel</td>
+	<td>Vidya Wasi</td>
+	<td>G. Hu</td>
+	<td>Byron Hawkins</td>
+      </tr><tr>
+	<td>Alpha</td>
+	<td>John Donoghue</td>
+	<td>kudah</td>
+	<td>Igor Shaula</td>
+      </tr><tr>
+	<td>Pavel Bulochkin</td>
+	<td>Yosef Or Boczko</td>
+	<td>Brian Griffin</td>
+	<td>Özgür Emir</td>
+      </tr><tr>
+	<td>Neomi</td>
+	<td>OmegaPhil</td>
+	<td>SiegeLord</td>
+	<td>Erik</td>
+      </tr><tr>
+	<td>TJF</td>
+	<td>Mark Robinson</td>
+	<td>Thomas Martitz</td>
+	<td>felix</td>
+      </tr><tr>
+	<td>Christian Walther</td>
+	<td>Ebben</td>
+	<td>Robert Gieseke</td>
+	<td>Mike M</td>
+      </tr><tr>
+	<td>nkmathew</td>
+	<td>Andreas Tscharner</td>
+	<td>Lee Wilmott</td>
+	<td>johnsonj</td>
+      </tr><tr>
+	<td>Vicente</td>
+	<td>Nick Gravgaard</td>
+	<td>Ian Goldby</td>
+	<td>Holger Stenger</td>
+      </tr><tr>
+	<td>danselmi</td>
+	<td>Mat Berchtold</td>
+	<td>Michael Staszewski</td>
+	<td>Baurzhan Muftakhidinov</td>
+      </tr><tr>
+	<td>Erik Angelin</td>
+	<td>Yusuf Ramazan Karagöz</td>
+	<td>Markus Heidelberg</td>
+	<td>Joe Mueller</td>
+      </tr><tr>
+	<td>Mika Attila</td>
+	<td>JoMazM</td>
+	<td>Markus Moser</td>
+	<td>Stefan Küng</td>
+      </tr><tr>
+	<td>Jiří Techet</td>
+	<td>Jonathan Hunt</td>
+	<td>Serg Stetsuk</td>
+	<td>Jordan Jueckstock</td>
+      </tr><tr>
+	<td>Yury Dubinsky</td>
+	<td>Sam Hocevar</td>
+	<td>Luyomi</td>
+	<td>Matt Gilarde</td>
+      </tr><tr>
+	<td>Mark C</td>
+	<td>Johannes Sasongko</td>
+	<td>fstirlitz</td>
+	<td>Robin Haberkorn</td>
+      </tr><tr>
+	<td>Pavel Sountsov</td>
+	<td>Dirk Lorenzen</td>
+	<td>Kasper B. Graversen</td>
+	<td>Chris Mayo</td>
+      </tr><tr>
+	<td>Van de Bugger</td>
+	<td>Tse Kit Yam</td>
+	<td><a href="https://www.smartsharesystems.com/">SmartShare Systems</a></td>
+	<td>Morten Brørup</td>
+      </tr><tr>
+	<td>Alexey Denisov</td>
+	<td>Justin Dailey</td>
+	<td>oirfeodent</td>
+	<td>A-R-C-A</td>
+      </tr><tr>
+	<td>Roberto Rossi</td>
+	<td>Kenny Liu</td>
+	<td>Iain Clarke</td>
+	<td>desto</td>
+      </tr><tr>
+	<td>John Flatness</td>
+	<td>Thorsten Kani</td>
+	<td>Bernhard M. Wiedemann</td>
+	<td>Baldur Karlsson</td>
+      </tr><tr>
+	<td>Martin Kleusberg</td>
+	<td>Jannick</td>
+	<td>Zufu Liu</td>
+	<td>Simon Sobisch</td>
+      </tr><tr>
+	<td>Georger Araújo</td>
+	<td>Tobias Kühne</td>
+	<td>Dimitar Radev</td>
+	<td>Liang Bai</td>
+      </tr><tr>
+	<td>Gunter Königsmann</td>
+	<td>Nicholai Benalal</td>
+	<td>Uniface</td>
+	<td>Raghda Morsy</td>
+      </tr><tr>
+	<td>Giuseppe Corbelli</td>
+	<td>Andreas Rönnquist</td>
+	<td>Henrik Hank</td>
+	<td>Luke Rasmussen</td>
+      </tr><tr>
+	<td>Philipp</td>
+	<td>maboroshin</td>
+	<td>Gokul Krishnan</td>
+	<td>John Horigan</td>
+      </tr><tr>
+	<td>jj5</td>
+	<td>Jad Altahan</td>
+	<td>Andrea Ricchi</td>
+	<td>Juarez Rudsatz</td>
+      </tr><tr>
+	<td>Wil van Antwerpen</td>
+	<td>Hodong Kim</td>
+	<td>Michael Conrad</td>
+	<td>Dejan Budimir</td>
+      </tr><tr>
+	<td>Andreas Falkenhahn</td>
+	<td>Mark Reay</td>
+	<td>David Shuman</td>
+	<td>McLoo</td>
+      </tr><tr>
+	<td>Shmuel Zeigerman</td>
+	<td>Chris Graham</td>
+	<td>Hugues Larrive</td>
+	<td>Prakash Sahni</td>
+      </tr><tr>
+	<td>Michel Sauvard</td>
+	<td>uhf7</td>
+	<td>gnombat</td>
+	<td>Derek Brown</td>
+      </tr><tr>
+	<td>cshnik</td>
+	<td>Petko Georgiev</td>
+	<td>YX Hao</td>
+	<td>Damiano Lombardi</td>
+      </tr><tr>
+	<td>Michael Neuroth</td>
+    </tr>
+    </table>
+    <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla511.zip">Release 5.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 July 2021.
+	</li>
+	<li>
+	In DBCS encodings, treat valid DBCS lead byte followed by invalid trail byte as single byte.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1408/">Feature #1408</a>.
+	</li>
+	<li>
+	Searching was optimized for documents that contain mostly ASCII text and is often 2-3 times faster.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1381/">Feature #1381</a>.
+	</li>
+	<li>
+	Word searching behaves more consistently at start and end of document.
+	</li>
+	<li>
+	Add SCI_ALLOCATELINES to allocate indices to hold some number of lines.
+	This can decrease reallocation overhead when the application can count or estimate the number of lines in huge files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1370/">Feature #1370</a>.
+	</li>
+	<li>
+	Add SCI_AUTOCSETOPTIONS to allow choosing a non-resizeable autocompletion list
+	on Win32.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1284/">Feature #1284</a>.
+	</li>
+	<li>
+	On Win32, when technology is changed, buffering is set to a reasonable value for the technology:
+	on for GDI and off for Direct2D as Direct2D performs its own buffering.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1400/">Feature #1400</a>.
+	</li>
+	<li>
+	On Win32, implement WM_SETREDRAW to turn off scroll bar updates.
+	This can be used to reduce overhead when making many changes.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1411/">Feature #1411</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla510.zip">Release 5.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 June 2021.
+	</li>
+	<li>
+	This is a stable release. Interfaces with lexers and between platform-independent code
+	and platform layers should remain compatible through 5.x releases.
+	</li>
+	<li>
+	Add SciFnDirectStatus, a direct access function which also returns status.
+	It can be retrieved with SCI_GETDIRECTSTATUSFUNCTION.
+	This can avoid calling SCI_GETSTATUS after every API to determine failure so can
+	improve performance.
+	</li>
+	<li>
+	Add more type-safe wrappers to the API.
+	These are defined in include/ScintillaCall.h and implemented in call/ScintillaCall.cxx.
+	ScintillaCall throws Scintilla::Failure exceptions when a call fails.
+	</li>
+	<li>
+	Add APIs for setting appearance (traditional blob or plain text) and colour of representations
+	and support setting a representation for the "\r\n" line end sequence.
+	</li>
+	<li>
+	Add SCI_REPLACERECTANGULAR to insert text like a rectangular paste.
+	</li>
+	<li>
+	Fixed bug with SCI_GETLASTCHILD.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2260/">Bug #2260</a>.
+	</li>
+	<li>
+	Fixed gcc link-time-optimization (LTO) compilation.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2259/">Bug #2259</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla503.zip">Release 5.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2021.
+	</li>
+	<li>
+	A more type-safe binding of Scintilla's API that can be used from C++ is implemented in the
+	ScintillaTypes.h, ScintillaMessages.h, and ScintillaStructures.h headers.
+	</li>
+	<li>
+	Change the way that selections and carets are drawn to use the element APIs.
+	The selection background colour may default to use platform APIs to discover global
+	or user settings and may change in response to those settings changing.
+	The SCI_SETSELECTIONLAYER method defines whether the selection background is drawn
+	translucently over or under text or opaquely underneath other drawing.
+	</li>
+	<li>
+	Change caret line drawing to use SC_ELEMENT_CARET_LINE_BACK element and
+	SCI_SETCARETLINELAYER method.
+	Older caret line APIs SCI_SETCARETLINEVISIBLE, SCI_SETCARETLINEBACK,
+	SCI_SETCARETLINEBACKALPHA now discouraged.
+	</li>
+	<li>
+	Add SCI_MARKERSETLAYER to define layer on which to draw content area markers.
+	This replaces the use of SC_ALPHA_NOALPHA for markers.
+	</li>
+	<li>
+	Add SCI_GETELEMENTBASECOLOUR to return the default values for element colours.
+	</li>
+	<li>
+	Add SC_ELEMENT_WHITE_SPACE to set the colour of visible whitespace including translucency.
+	</li>
+	<li>
+	Add elements for hot spots SC_ELEMENT_HOT_SPOT_ACTIVE and
+	SC_ELEMENT_HOT_SPOT_ACTIVE_BACK.
+	</li>
+	<li>
+	Make idle actions wrapping and background styling smoother by
+	measuring per-byte instead of per-line and allowing just one line to be
+	processed in a time slice.
+	Very long lines will not distort estimation	or block interaction as much.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1373/">Feature #1373</a>.
+	</li>
+	<li>
+	On GTK 3 with Wayland, fix primary selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2227/">Bug #2227</a>.
+	</li>
+	<li>
+	Update to Unicode 13.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1379/">Feature #1379</a>.
+	</li>
+	<li>
+	Include modifiers in SCN_INDICATORRELEASE notification.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2254/">Bug #2254</a>.
+	</li>
+	<li>
+	On Win32 enable hardware-enforced stack protection.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1405/">Feature #1405</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla502.zip">Release 5.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 April 2021.
+	</li>
+	<li>
+	On Cocoa with macOS 11, use plain style for autocompletion to fix problems with truncating text
+	and padding. This makes autocompletion look the same on macOS 11 as macOS 10.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2248/">Bug #2248</a>.
+	</li>
+	<li>
+	On Windows, fix encoding used for text display with DirectWrite.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2246/">Bug #2246</a>.
+	</li>
+	<li>
+	Implement font locale SCI_SETFONTLOCALE. Initially only for DirectWrite on Win32.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2027/">Bug #2027</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla501.zip">Release 5.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 April 2021.
+	</li>
+	<li>
+	Remove SetLexer, SetLexerLanguage, and LoadLexerLibrary methods.
+	These have been superceded by Lexilla and the SetILexer API.
+	</li>
+	<li>
+	Improve the platform layer interface.
+	Add support for stroke width and translucency to drawing methods.
+	Allow clipping to nest.
+	Add methods for UTF-8 text.
+	Add methods for encoding conversion.
+	Use these changes to improve appearance.
+	</li>
+	<li>
+	Add SCI_SUPPORTSFEATURE method to allow applications to determine which features are available
+	and to then choose workarounds for missing features like translucent drawing.
+	</li>
+	<li>
+	Add colouralpha type to Scintilla.iface for APIs that set both colour and transparency together as an RGBA value.
+	</li>
+	<li>
+	Add SCI_INDICSETSTROKEWIDTH to set stroke width of indicators.
+	</li>
+	<li>
+	Add methods to set translucency and stroke width of markers.
+	SCI_MARKERSETFORETRANSLUCENT, SCI_MARKERSETBACKTRANSLUCENT,
+	SCI_MARKERSETBACKSELECTEDTRANSLUCENT, SCI_MARKERSETSTROKEWIDTH.
+	</li>
+	<li>
+	Add shapes with curved and rounded ends to EOL annotations as EOLANNOTATION_*.
+	</li>
+	<li>
+	Add SCI_SETELEMENTCOLOUR and related APIs to change colours of visible elements.
+	Implement SC_ELEMENT_LIST* to change colours of autocompletion lists.
+	</li>
+	<li>
+	Support Unicode characters as margin markers with SC_MARK_CHARACTER.
+	</li>
+	<li>
+	EOL annotation text is now always treated as UTF-8 instead of in the document encoding.
+	</li>
+	<li>
+	Change graphics coordinates from float (32-bit) to double (64-bit).
+	Fixes uneven line heights in large documents on Cocoa.
+	Increases memory use.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2224/">Bug #2224</a>.
+	</li>
+	<li>
+	On Cocoa, fix drawing in revealed area after enlarging window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2238/">Bug #2238</a>.
+	</li>
+	<li>
+	On Win32, fix crash with SC_TECHNOLOGY_DIRECTWRITERETAIN.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2243/">Bug #2243</a>.
+	</li>
+	<li>
+	On GTK, changes in system font settings (such as from Tweak) are detected and position
+	caches are invalidated since different font display options, such as antialiasing, change
+	character shape and thus positions.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite500.zip">Release 5.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 March 2021.
+	</li>
+	<li>
+	First version that separates Lexilla from Scintilla.
+	Each of the 3 projects now has a separate history page but history before 5.0.0 remains combined.
+	</li>
+	<li>
+	Fix Alt+End (move to wrapped line end) for Japanese UTF-8 text..
+	<a href="https://sourceforge.net/p/scintilla/bugs/2231/">Bug #2231</a>.
+	</li>
+	<li>
+	SciTE uses the "null" lexer when it doesn't have a lexer assigned to a file.
+	This avoids activating a Lua script lexer if one is assigned.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite446.zip">Release 4.4.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 December 2020.
+	</li>
+	<li>
+	Fix building with Xcode 12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2187/">Bug #2187</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite445.zip">Release 4.4.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 September 2020.
+	</li>
+	<li>
+	Lexilla interface supports setting initialisation properties on lexer libraries with
+	SetLibraryProperty and GetLibraryPropertyNames functions.
+	These are called by SciTE which will forward properties to lexer libraries that are prefixed with
+	"lexilla.context.".
+	</li>
+	<li>
+	Allow cross-building for GTK by choosing pkg-config.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
+	</li>
+	<li>
+	On GTK, allow setting CPPFLAGS (and LDFLAGS for SciTE) to support hardening.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2191/">Bug #2191</a>.
+	</li>
+	<li>
+	Changed SciTE's indent.auto mode to set tab size to indent size when file uses tabs for indentation.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2198/">Bug #2198</a>.
+	</li>
+	<li>
+	Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based on
+	width of text.
+	</li>
+	<li>
+	Fixed bug on Win32 where cursor was flickering between hand and text over an
+	indicator with hover style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2170/">Bug #2170</a>.
+	</li>
+	<li>
+	Fixed bug where hovered indicator was not returning to non-hover
+	appearance when mouse moved out of window or into margin.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2193/">Bug #2193</a>.
+	</li>
+	<li>
+	Fixed bug where a hovered INDIC_TEXTFORE indicator was not applying the hover
+	colour to the whole range.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2199/">Bug #2199</a>.
+	</li>
+	<li>
+	Fixed bug where gradient indicators were not showing hovered appearance.
+	</li>
+	<li>
+	Fixed bug where layout caching was ineffective.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2197/">Bug #2197</a>.
+	</li>
+	<li>
+	For SciTE, don't show the output pane for quiet jobs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Support command.quiet for SciTE on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Fixed a bug in SciTE with stack balance when a syntax error in the Lua startup script
+	caused continuing failures to find functions after the syntax error was corrected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	Added method for iterating through multiple vertical edges: SCI_GETMULTIEDGECOLUMN.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1350/">Feature #1350</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite444.zip">Release 4.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 July 2020.
+	</li>
+	<li>
+	End of line annotations implemented.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2141/">Bug #2141</a>.
+	</li>
+	<li>
+	Add SCI_BRACEMATCHNEXT API.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1368/">Feature #1368</a>.
+	</li>
+	<li>
+	The latex lexer supports lstlisting environment that is similar to verbatim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1358/">Feature #1358</a>.
+	</li>
+	<li>
+	For SciTE on Linux, place liblexilla.so and libscintilla.so in /usr/lib/scite.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2184/">Bug #2184</a>.
+	</li>
+	<li>
+	Round SCI_TEXTWIDTH instead of truncating as this may be more accurate when sizing application
+	elements to match text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1355/">Feature #1355</a>.
+	</li>
+	<li>
+	Display DEL control character as visible "DEL" block like other control characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1369/">Feature #1369</a>.
+	</li>
+	<li>
+	Allow caret width to be up to 20 pixels.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1361/">Feature #1361</a>.
+	</li>
+	<li>
+	SciTE on Windows adds create.hidden.console option to stop console window flashing
+	when Lua script calls os.execute or io.popen.
+	</li>
+	<li>
+	Fix translucent rectangle drawing on Qt. When drawing a translucent selection, there were edge
+	artifacts as the calls used were drawing outlines over fill areas. Make bottom and right borders on
+	INDIC_ROUNDBOX be same intensity as top and left.
+	Replaced some deprecated Qt calls with currently supported calls.
+	</li>
+	<li>
+	Fix printing on Windows to use correct text size.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2185/">Bug #2185</a>.
+	</li>
+	<li>
+	Fix bug on Win32 where calling WM_GETTEXT for more text than in document could return
+	less text than in document.
+	</li>
+	<li>
+	Fixed a bug in SciTE with Lua stack balance causing failure to find
+	functions after reloading script.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite443.zip">Release 4.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 June 2020.
+	</li>
+	<li>
+	Fix syntax highlighting for SciTE on Windows by setting executable directory for loading Lexilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2181/">Bug #2181</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite442.zip">Release 4.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2020.
+	</li>
+	<li>
+	On Cocoa using Xcode changed Lexilla.dylib install path to @rpath as would otherwise try /usr/lib which
+	won't work for sandboxed applications.
+	</li>
+	<li>
+	On Cocoa using Xcode made work on old versions of macOS by specifying deployment target as 10.8
+	instead of 10.15.
+	</li>
+	<li>
+	On Win32 fix static linking of Lexilla by specifying calling convention in Lexilla.h.
+	</li>
+	<li>
+	SciTE now uses default shared library extension even when directory contains '.'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite440.zip">Release 4.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2020.
+	</li>
+	<li>
+	Added Xcode project files for Lexilla and Scintilla with no lexers (cocoa/Scintilla).
+	</li>
+	<li>
+	For GTK, build a shared library with no lexers libscintilla.so or libscintilla.dll.
+	</li>
+	<li>
+	Lexilla used as a shared library for most builds of SciTE except for the single file executable on Win32.
+	On GTK, Scintilla shared library used.
+	LexillaLibrary code can be copied out of SciTE for other applications that want to interface to Lexilla.
+	</li>
+	<li>
+	Constants in Scintilla.h can be disabled with SCI_DISABLE_AUTOGENERATED.
+	</li>
+	<li>
+	Implement per-monitor DPI Awareness on Win32 so both Scintilla and SciTE
+	will adapt to the display scale when moved between monitors.
+	Applications should forward WM_DPICHANGED to Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2171/">Bug #2171</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2063/">Bug #2063</a>.
+	</li>
+	<li>
+	Optimized performance when opening huge files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1347/">Feature #1347</a>.
+	</li>
+	<li>
+	Add Appearance and Contrast properties to SciTE that allow customising visuals for dark mode and
+	high contrast modes.
+	</li>
+	<li>
+	Fixed bug in Batch lexer where a single character line with a single character line end continued
+	state onto the next line.
+	</li>
+	<li>
+	Added SCE_ERR_GCC_EXCERPT style for GCC 9 diagnostics in errorlist lexer.
+	</li>
+	<li>
+	Fixed buffer over-read bug with absolute references in MMIXAL lexer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2019/">Bug #2019</a>.
+	</li>
+	<li>
+	Fixed bug with GTK on recent Linux distributions where underscores were invisible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
+	</li>
+	<li>
+	Fixed GTK on Linux bug when pasting from closed application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2175/">Bug #2175</a>.
+	</li>
+	<li>
+	Fixed bug in SciTE with Lua stack balance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	For macOS, SciTE reverts to running python (2) due to python3 not being available in the sandbox.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite433.zip">Release 4.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 April 2020.
+	</li>
+	<li>
+	Added Visual Studio project files for Lexilla and Scintilla with no lexers.
+	</li>
+	<li>
+	Add methods for iterating through the marker handles and marker numbers on a line:
+	SCI_MARKERHANDLEFROMLINE and SCI_MARKERNUMBERFROMLINE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1344/">Feature #1344</a>.
+	</li>
+	<li>
+	Assembler lexers asm and as can change comment character with lexer.as.comment.character property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1314/">Feature #1314</a>.
+	</li>
+	<li>
+	Fix brace styling in Batch lexer so that brace matching works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1624/">Bug #1624</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1906/">Bug #1906</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1997/">Bug #1997</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2065/">Bug #2065</a>.
+	</li>
+	<li>
+	Change Perl lexer to style all line ends of comment lines in comment line style.
+	Previously, the last character was in default style which made the characters in
+	\r\n line ends have mismatching styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2164/">Bug #2164</a>.
+	</li>
+	<li>
+	When a lexer has been set with SCI_SETILEXER, fix SCI_GETLEXER and avoid
+	sending SCN_STYLENEEDED notifications.
+	</li>
+	<li>
+	On Win32 fix handling Japanese IME input when both GCS_COMPSTR and
+	GCS_RESULTSTR set.
+	</li>
+	<li>
+	With Qt on Win32 add support for line copy format on clipboard, compatible with Visual Studio.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2167/">Bug #2167</a>.
+	</li>
+	<li>
+	On Qt with default encoding (ISO 8859-1) fix bug where 'µ' (Micro Sign) case-insensitively matches '?'
+	<a href="https://sourceforge.net/p/scintilla/bugs/2168/">Bug #2168</a>.
+	</li>
+	<li>
+	On GTK with Wayland fix display of windowed IME.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2149/">Bug #2149</a>.
+	</li>
+	<li>
+	For Python programs, SciTE defaults to running python3 on Unix and pyw on Windows which will run
+	the most recently installed Python in many cases.
+	Set the "python.command" property to override this.
+	Scripts distributed with Scintilla and SciTE are checked with Python 3 and may not work with Python 2.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite432.zip">Release 4.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 March 2020.
+	</li>
+	<li>
+	On Win32 fix new bug that treated all dropped text as rectangular.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite431.zip">Release 4.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 March 2020.
+	</li>
+	<li>
+	Add default argument for StyleContext::GetRelative.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1336/">Feature #1336</a>.
+	</li>
+	<li>
+	Fix drag and drop between different encodings on Win32 by always providing CF_UNICODETEXT only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2151/">Bug #2151</a>.
+	</li>
+	<li>
+	Automatically scroll while dragging text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/497/">Feature #497</a>.
+	</li>
+	<li>
+	On Win32, the numeric keypad with Alt pressed can be used to enter characters by number.
+	This can produce unexpected results in non-numlock mode when function keys are assigned.
+	Potentially problematic keys like Alt+KeypadUp are now ignored.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2152/">Bug #2152</a>.
+	</li>
+	<li>
+	Crash fixed with Direct2D on Win32 when updating driver.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2138/">Bug #2138</a>.
+	</li>
+	<li>
+	For SciTE on Win32, fix crashes when Lua script closes application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2155/">Bug #2155</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite430.zip">Release 4.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 January 2020.
+	</li>
+	<li>
+	Lexers made available as Lexilla library.
+	TestLexers program with tests for Lexilla and lexers added in lexilla/test.
+	</li>
+	<li>
+	SCI_SETILEXER implemented to use lexers from Lexilla or other sources.
+	</li>
+	<li>
+	ILexer5 interface defined provisionally to support use of Lexilla.
+	The details of this interface may change before being stabilised in Scintilla 5.0.
+	</li>
+	<li>
+	SCI_LOADLEXERLIBRARY implemented on Cocoa.
+	</li>
+	<li>
+	Build Scintilla with SCI_EMPTYCATALOGUE to avoid making lexers available.
+	</li>
+	<li>
+	Lexer and folder added for Raku language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1328/">Feature #1328</a>.
+	</li>
+	<li>
+	Don't clear clipboard before copying text with Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2147/">Bug #2147</a>.
+	</li>
+	<li>
+	On Win32, remove support for CF_TEXT clipboard format as Windows will convert to
+	CF_UNICODETEXT.
+	</li>
+	<li>
+	Improve IME behaviour on GTK.
+	Set candidate position for windowed IME.
+	Improve location of candidate window.
+	Prevent movement of candidate window while typing.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2135/">Bug #2135</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite423.zip">Release 4.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 December 2019.
+	</li>
+	<li>
+	Fix failure in SciTE's Complete Symbol command.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite422.zip">Release 4.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2019.
+	</li>
+	<li>
+	Move rather than grow selection when insertion at start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2140/">Bug #2140</a>.
+	</li>
+	<li>
+	Allow target to have virtual space.
+	Add methods for finding the virtual space at start and end of multiple selections.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1316/">Feature #1316</a>.
+	</li>
+	<li>
+	SciTE on Win32 adds mouse button "Forward" and "Backward" key definitions for use in
+	properties like user.shortcuts.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1317/">Feature #1317</a>.
+	</li>
+	<li>
+	Lexer and folder added for Hollywood language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1324/">Feature #1324</a>.
+	</li>
+	<li>
+	HTML lexer treats custom tags from HTML5 as known tags. These contain "-" like "custom-tag".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1299/">Feature #1299</a>.
+	</li>
+	<li>
+	HTML lexer fixes bug with some non-alphabetic characters in unknown tags.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1320/">Feature #1320</a>.
+	</li>
+	<li>
+	Fix bug in properties file lexer where long lines were only styled for the first 1024 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1933/">Bug #1933</a>.
+	</li>
+	<li>
+	Ruby lexer recognizes squiggly heredocs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1326/">Feature #1326</a>.
+	</li>
+	<li>
+	Avoid unnecessary IME caret movement on Win32.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1304/">Feature #1304</a>.
+	</li>
+	<li>
+	Clear IME state when switching language on Win32.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>.
+	</li>
+	<li>
+	Fixed drawing of translucent rounded rectangles on Win32 with Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2144/">Bug #2144</a>.
+	</li>
+	<li>
+	Setting rectangular selection made faster.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>.
+	</li>
+	<li>
+	SciTE reassigns *.s extension to the GNU Assembler language from the S+ statistical language.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite421.zip">Release 4.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 October 2019.
+	</li>
+	<li>
+	Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs.
+	This allows minimaps or overviews to be layed out to match the full size editing view.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2118/">Bug #2118</a>.
+	</li>
+	<li>
+	SciTE enables use of SCI_ commands in user.context.menu.
+	</li>
+ 	<li>
+	XML folder adds fold.xml.at.tag.open option to fold tags at the start of the tag "&lt;" instead of the end "&gt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2128/">Bug #2128</a>.
+	</li>
+ 	<li>
+	Metapost lexer fixes crash with 'interface=none' comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2129/">Bug #2129</a>.
+	</li>
+ 	<li>
+	Perl lexer supports indented here-docs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2121/">Bug #2121</a>.
+	</li>
+ 	<li>
+	Perl folder folds qw arrays.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1306/">Feature #1306</a>.
+	</li>
+ 	<li>
+	TCL folder can turn off whitespace flag by setting fold.compact property to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2131/">Bug #2131</a>.
+	</li>
+ 	<li>
+	Optimize setting up keyword lists in lexers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1305/">Feature #1305</a>.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 12.1.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1315/">Feature #1315</a>.
+	</li>
+ 	<li>
+	On Win32, stop the IME candidate window moving unnecessarily and position it better.<br />
+	Stop candidate window overlapping composition text and taskbar.<br />
+	Position candidate window closer to composition text.<br />
+	Stop candidate window moving while typing.<br />
+	Align candidate window to target part of composition text.<br />
+	Stop Google IME on Windows 7 moving while typing.<br />
+	<a href="https://sourceforge.net/p/scintilla/bugs/2120/">Bug #2120</a>.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1300/">Feature #1300</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite420.zip">Release 4.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 July 2019.
+	</li>
+ 	<li>
+	Scintilla.iface adds line and pointer types, increases use of the position type, uses enumeration
+	types in methods and properties, and adds enumeration aliases to produce better CamelCase
+	identifiers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1297/">Feature #1297</a>.
+	</li>
+ 	<li>
+	Source of input (direct / IME composition / IME result) reported in SCN_CHARADDED so applications
+	can treat temporary IME composition input differently.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2038/">Bug #2038</a>.
+	</li>
+ 	<li>
+	Lexer added for DataFlex.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1295/">Feature #1295</a>.
+	</li>
+ 	<li>
+	Matlab lexer now treats keywords as case-sensitive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2112/">Bug #2112</a>.
+	</li>
+ 	<li>
+	SQL lexer fixes single quoted strings where '" (quote, double quote) was seen as continuing the string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2098/">Bug #2098</a>.
+	</li>
+ 	<li>
+	Platform layers should use InsertCharacter method to perform keyboard and IME input, replacing
+	AddCharUTF method.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1293/">Feature #1293</a>.
+	</li>
+ 	<li>
+	Add CARETSTYLE_BLOCK_AFTER option to always display block caret after selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1924/">Bug #1924</a>.
+	</li>
+ 	<li>
+	On Win32, limit text returned from WM_GETTEXT to the length specified in wParam.
+	This could cause failures when using assistive technologies like NVDA.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2110/">Bug #2110</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2114/">Bug #2114</a>.
+	</li>
+ 	<li>
+	Fix deletion of isolated invalid bytes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2116/">Bug #2116</a>.
+	</li>
+ 	<li>
+	Fix position of line caret when overstrike caret set to block.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2106/">Bug #2106</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite417.zip">Release 4.1.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 June 2019.
+	</li>
+	<li>
+	Fixes an incorrect default setting in SciTE which caused multiple visual features to fail to display.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite416.zip">Release 4.1.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 June 2019.
+	</li>
+	<li>
+	For Visual C++ 2019, /std:c++latest now includes some C++20 features so switch to /std:c++17.
+	</li>
+	<li>
+	SciTE supports editing files larger than 2 gigabytes when built as a 64-bit application.
+	</li>
+ 	<li>
+	Lexer added for X12.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1280/">Feature #1280</a>.
+	</li>
+ 	<li>
+	CMake folder folds function - endfunction.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1289/">Feature #1289</a>.
+	</li>
+ 	<li>
+	VB lexer adds support for VB2017 binary literal &amp;B and digit separators 123_456.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1288/">Feature #1288</a>.
+	</li>
+	<li>
+	Improved performance of line folding code on large files when no folds are contracted.
+	This improves the time taken to open or close large files.
+	</li>
+	<li>
+	Fix bug where changing identifier sets in lexers preserved previous identifiers.
+	</li>
+	<li>
+	Fixed bug where changing to Unicode would rediscover line end positions even if still
+	sticking to ASCII (not Unicode NEL, LS, PS) line ends.
+	Only noticeable on huge files with over 100,000 lines.
+	</li>
+ 	<li>
+	Changed behaviour of SCI_STYLESETCASE(*,SC_CASE_CAMEL) so that it only treats 'a-zA-Z'
+	as word characters because this covers the feature's intended use (viewing case-insensitive ASCII-only
+	keywords in a specified casing style) and simplifies the behaviour and code.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1238/">Feature #1238</a>.
+	</li>
+ 	<li>
+	In SciTE added Camel case option "case:c" for styles to show keywords with initial capital.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite415.zip">Release 4.1.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2019.
+	</li>
+ 	<li>
+	On Win32, removed special handling of non-0 wParam to WM_PAINT.
+	</li>
+ 	<li>
+	Implement high-priority idle on Win32 to make redraw smoother and more efficient.
+	</li>
+	<li>
+	Add vertical bookmark symbol SC_MARK_VERTICALBOOKMARK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1276/">Feature #1276</a>.
+	</li>
+ 	<li>
+	Set default fold display text SCI_SETDEFAULTFOLDDISPLAYTEXT(text).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1272/">Feature #1272</a>.
+	</li>
+ 	<li>
+	Add SCI_SETCHARACTERCATEGORYOPTIMIZATION API to optimize speed
+	of character category features like determining whether a character is a space or number
+	at the expense of memory.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1259/">Feature #1259</a>.
+	</li>
+ 	<li>
+	Improve the styling of numbers in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1268/">Feature #1268</a>.
+	</li>
+ 	<li>
+	Fix exception when inserting DBCS text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2093/">Bug #2093</a>.
+	</li>
+	<li>
+	Improve performance of accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2094/">Bug #2094</a>.
+	</li>
+ 	<li>
+	Fix text reported for deletion with accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2095/">Bug #2095</a>.
+	</li>
+ 	<li>
+	Fix flicker when inserting primary selection on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2087/">Bug #2087</a>.
+	</li>
+ 	<li>
+	Support coloured text in Windows 8.1+.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1277/">Feature #1277</a>.
+	</li>
+ 	<li>
+	Avoid potential long hangs with idle styling for huge documents on Cocoa and GTK.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite414.zip">Release 4.1.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 March 2019.
+	</li>
+	<li>
+	Calltips implemented on Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1548/">Bug #1548</a>.
+	</li>
+ 	<li>
+	Block caret in overtype mode SCI_SETCARETSTYLE(caretStyle | CARETSTYLE_OVERSTRIKE_BLOCK).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1217/">Feature #1217</a>.
+	</li>
+ 	<li>
+	SciTE supports changing caret style via caret.style property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1264/">Feature #1624</a>.
+	</li>
+ 	<li>
+	Lexer added for .NET's Common Intermediate Language CIL.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1265/">Feature #1265</a>.
+	</li>
+ 	<li>
+	The C++ lexer, with styling.within.preprocessor on, now interprets "(" in preprocessor "#if("
+	as an operator instead of part of the directive. This improves folding as well which could become
+	unbalanced.
+	</li>
+ 	<li>
+	Fix raw strings in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1253/">Feature #1253</a>.
+	</li>
+ 	<li>
+	Fix inconsistency with dot styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1260/">Feature #1260</a>.
+	</li>
+ 	<li>
+	Enhance the styling of backticks in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1261/">Feature #1261</a>.
+	</li>
+ 	<li>
+	Enhance raw string identifier styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1262/">Feature #1262</a>.
+	</li>
+ 	<li>
+	Fix fold behaviour with comments in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1254/">Feature #1254</a>.
+	</li>
+ 	<li>
+	Fix TCL lexer recognizing '"' after "," inside a bracketed substitution.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1947/">Bug #1947</a>.
+	</li>
+ 	<li>
+	Fix garbage text from SCI_MOVESELECTEDLINESUP and SCI_MOVESELECTEDLINESDOWN
+	for rectangular or thin selection by performing no action.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2078/">Bug #2078</a>.
+	</li>
+ 	<li>
+	Ensure container notified if Insert pressed when caret off-screen.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2083/">Bug #2083</a>.
+	</li>
+ 	<li>
+	Fix memory leak when checking running instance on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1267/">Feature #1267</a>.
+	</li>
+	<li>
+	Platform layer font cache removed on Win32 as there is a platform-independent cache.
+	</li>
+	<li>
+	SciTE for GTK easier to build on macOS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2084/">Bug #2084</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite413.zip">Release 4.1.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 January 2019.
+	</li>
+	<li>
+	Add SCI_SETCOMMANDEVENTS API to allow turning off command events as they
+	can be a significant performance cost.
+	</li>
+	<li>
+	Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
+	still remaining responsive.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 11.
+	</li>
+	<li>
+	Errorlist lexer recognizes negative line numbers as some programs show whole-file
+	errors occurring on line -1.
+	SciTE's parsing of diagnostics also updated to handle this case.
+	</li>
+ 	<li>
+	Added "nim" lexer (SCLEX_NIM) for the Nim language which was previously called Nimrod.
+	For compatibility, the old "nimrod" lexer is still present but is deprecated and will be removed at the
+	next major version.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1242/">Feature #1242</a>.
+	</li>
+ 	<li>
+	The Bash lexer implements substyles for multiple sets of keywords and supports SCI_PROPERTYNAMES.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2054/">Bug #2054</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets continued preprocessor lines correctly by reading all of
+	the logical line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2062/">Bug #2062</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets preprocessor arithmetic expressions containing multiplicative and additive
+	operators correctly by following operator precedence rules.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2069/">Bug #2069</a>.
+	</li>
+ 	<li>
+	The EDIFACT lexer handles message groups as well as messages.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1247/">Feature #1247</a>.
+	</li>
+ 	<li>
+	For SciTE's Find in Files, allow case-sensitivity and whole-word options when running
+	a user defined command.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2053/">Bug #2053</a>.
+	</li>
+	<li>
+	Notify with SC_UPDATE_SELECTION when user performs a multiple selection add.
+	</li>
+	<li>
+	On macOS 10.14 Cocoa, fix incorrect horizontal offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2022/">Bug #2022</a>.
+	</li>
+	<li>
+	On Cocoa, fix a crash that occurred when entering a dead key diacritic then a character
+	that can not take that diacritic, such as option+e (acute accent) followed by g.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2061/">Bug #2061</a>.
+	</li>
+	<li>
+	On Cocoa, use dark info bar background when system is set to Dark Appearance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2055/">Bug #2055</a>.
+	</li>
+	<li>
+	Fixed a crash on Cocoa in bidirectional mode where some patterns of invalid UTF-8
+	caused failures to create Unicode strings.
+	</li>
+	<li>
+	SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
+	</li>
+	<li>
+	Improve performance of text insertion when Unicode line indexing off.
+	</li>
+	<li>
+	For Qt on Windows, stop specifying -std:c++latest as that is no longer needed
+	to enable C++17 with MSVC 2017 and Qt 5.12 and it caused duplicate flag warnings.
+	</li>
+	<li>
+	On Linux, enable Lua to access dynamic libraries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2058/">Bug #2058</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite412.zip">Release 4.1.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 October 2018.
+	</li>
+	<li>
+	C++ lexer fixes evaluation of "#elif".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
+	</li>
+	<li>
+	Markdown lexer fixes highlighting of non-ASCII characters in links.
+	</li>
+	<li>
+	SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips
+	and disables F5 while command running.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite411.zip">Release 4.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 September 2018.
+	</li>
+	<li>
+	Optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units added.
+	This can improve performance for clients that provide UTF-32 or UTF-16 interfaces or that need to interoperate
+	with UTF-32 or UTF-16 components.
+	</li>
+	<li>
+	Lexers added for SAS and Stata.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
+	</li>
+	<li>
+	Shell folder folds "if", "do", and "case".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1144/">Feature #1144.</a>
+	</li>
+	<li>
+	SciTE's menukey feature implemented on Windows.
+	</li>
+	<li>
+	For SciTE on Windows, user defined strip lists are now scrollable.
+	Cursor no longer flickers in edit and combo boxes.
+	Focus in and out events occur for combo boxes.
+	</li>
+	<li>
+	Fix a leak in the bidirectional code on Win32.
+	</li>
+	<li>
+	Fix crash on Win32 when switching technology to default after setting bidirectional mode.
+	</li>
+	<li>
+	Fix margin cursor on Cocoa to point more accurately.
+	</li>
+	<li>
+	Fix SciTE crash on GTK+ when using director interface.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite410.zip">Release 4.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 June 2018.
+	</li>
+	<li>
+	Experimental and incomplete support added for bidirectional text on Windows using DirectWrite and Cocoa for
+	UTF-8 documents by calling SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R).
+	This allows documents that contain Arabic or Hebrew to be edited more easily in a way that is similar
+	to other editors.
+	</li>
+	<li>
+	INDIC_GRADIENT and INDIC_GRADIENTCENTRE indicator types added.
+	INDIC_GRADIENT starts with a specified colour and alpha at top of line and fades
+	to fully transparent at bottom.
+	INDIC_GRADIENTCENTRE starts with a specified colour and alpha at centre of line and fades
+	to fully transparent at top and bottom.
+	</li>
+	<li>
+	Wrap indent mode SC_WRAPINDENT_DEEPINDENT added which indents two tabs from previous line.
+	</li>
+	<li>
+	Indicators are drawn for line end characters when displayed.
+	</li>
+	<li>
+	Most invalid bytes in DBCS encodings are displayed as blobs to make problems clear
+	and ensure something is shown.
+	</li>
+	<li>
+	On Cocoa, invalid text in DBCS encodings will be interpreted through the
+	single-byte MacRoman encoding as that will accept any byte.
+	</li>
+	<li>
+	Diff lexer adds styles for diffs containing patches.
+	</li>
+	<li>
+	Crashes fixed on macOS for invalid DBCS characters when dragging text,
+	changing case of text, case-insensitive searching, and retrieving text as UTF-8.
+	</li>
+	<li>
+	Regular expression crash fixed on macOS when linking to libstdc++.
+	</li>
+	<li>
+	SciTE on GTK+, when running in single-instance mode, now forwards all command line arguments
+	to the already running instance.
+	This allows "SciTE filename -goto:line" to work.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite405.zip">Release 4.0.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 May 2018.
+	</li>
+	<li>
+	Add experimental SC_DOCUMENTOPTION_TEXT_LARGE option to accommodate documents larger than
+	2 GigaBytes.
+	</li>
+	<li>
+	Additional print option SC_PRINT_SCREENCOLOURS prints with the same colours used on screen
+	including line numbers.
+	</li>
+	<li>
+	SciTE can read settings in EditorConfig format when enabled with editor.config.enable property.
+	</li>
+	<li>
+	EDIFACT lexer adds property lexer.edifact.highlight.un.all to highlight all UN* segments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	Fortran folder understands "change team" and "endteam".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1216/">Feature #1216.</a>
+	</li>
+	<li>
+	Set the last X chosen when SCI_REPLACESEL called to ensure macros work
+	when text insertion followed by caret up or down.
+	</li>
+	<li>
+	Bugs fixed in regular expression searches in Scintilla where some matches did not occur in an
+	effort to avoid infinite loops when replacing on empty matches like "^" and "$".
+	Applications should always handle empty matches in a way that avoids infinite loops, commonly
+	by incrementing the search position after replacing an empty match.
+	SciTE fixes a bug where replacing "^" always matched on the first line even when it was an
+	"in selection" replace and the selection started after the line start.
+	</li>
+	<li>
+	Bug fixed in SciTE where invalid numeric properties could crash.
+	</li>
+	<li>
+	Runtime warnings fixed with SciTE on GTK after using Find in Files.
+	</li>
+	<li>
+	SciTE on Windows find and replace strips place caret at end of text after search.
+	</li>
+	<li>
+	Bug fixed with SciTE on macOS where corner debris appeared in the margin when scrolling.
+	Fixed by not completely hiding the status bar so the curved corner is no longer part of the
+	scrolling region.
+	By default, 4 pixels of the status bar remain visible and this can be changed with
+	the statusbar.minimum.height property or turned off if the debris are not a problem by
+	setting the property to 0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite404.zip">Release 4.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 April 2018.
+	</li>
+	<li>
+	On Win32, the standard makefiles build a libscintilla static library as well as the existing dynamic libraries.
+	The statically linked version of SciTE, Sc1, links to this static library. A new file, ScintillaDLL.cxx, provides
+	the DllMain function required for a stand-alone Scintilla DLL. Build and project files should include this
+	file when producing a DLL and omit it when producing a static library or linking Scintilla statically.
+	The STATIC_BUILD preprocessor symbol is no longer used.
+	</li>
+	<li>
+	On Win32, Direct2D support is no longer automatically detected during build.
+	DISABLE_D2D may still be defined to remove Direct2D features.
+	</li>
+	<li>
+	In some cases, invalid UTF-8 is handled in a way that is a little friendlier.
+	For example, when copying to the clipboard on Windows, an invalid lead byte will be copied as the
+	equivalent ISO 8859-1 character and will not hide the following byte.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1211/">Feature #1211.</a>
+	</li>
+	<li>
+	Lexer added for the Maxima computer algebra language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1210/">Feature #1210.</a>
+	</li>
+	<li>
+	Fix hang in Lua lexer when lexing a label upto the terminating "::".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1999/">Bug #1999</a>.
+	</li>
+	<li>
+	Lua lexer matches identifier chains with dots and colons.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1952/">Bug #1952</a>.
+	</li>
+	<li>
+	For rectangular selections, pressing Home or End now moves the caret to the Home or End
+	position instead of the limit of the rectangular selection.
+	</li>
+	<li>
+	Fix move-extends-selection mode for rectangular and line selections.
+	</li>
+	<li>
+	On GTK+, change lifetime of selection widget to avoid runtime warnings.
+	</li>
+	<li>
+	Fix building on Mingw/MSYS to perform file copies and deletions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1993/">Bug #1993</a>.
+	</li>
+	<li>
+	SciTE can match a wider variety of file patterns where '*' is in the middle of
+	the pattern and where there are multiple '*'.
+	A '?' matches any single character.
+	</li>
+	<li>
+	SciTE on Windows can execute Python scripts directly by name when on path.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1209/">Feature #1209.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files checks for cancel after every 10,000 lines read so
+	can be stopped on huge files.
+	</li>
+	<li>
+	SciTE remembers entered values in lists in more cases for find, replace and find in files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1715/">Bug #1715</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite403.zip">Release 4.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 February 2018.
+	</li>
+	<li>
+	Features from C++14 and C++17 are used more often, with build files now specifying
+	c++17, gnu++17, c++1z, or std:c++latest (MSVC).
+	Requires Microsoft Visual C++ 2017.5, GCC 7, Xcode 9.2 or Clang 4.0 or newer.
+	</li>
+	<li>
+	SCI_CREATEDOCUMENT adds a bytes argument to allocate memory for an initial size.
+	SCI_CREATELOADER and SCI_CREATEDOCUMENT add a documentOption argument to
+	allow choosing different document capabilities.
+	</li>
+	<li>
+	Add SC_DOCUMENTOPTION_STYLES_NONE option to stop allocating memory for styles.
+	</li>
+	<li>
+	Add SCI_GETMOVEEXTENDSSELECTION to allow applications to add more
+	complex selection commands.
+	</li>
+	<li>
+	SciTE property bookmark.symbol allows choosing symbol used for bookmarks.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1208/">Feature #1208.</a>
+	</li>
+	<li>
+	Improve VHDL lexer's handling of character literals and escape characters in strings.
+	</li>
+	<li>
+	Fix double tap word selection on Windows 10 1709 Fall Creators Update.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1983/">Bug #1983</a>.
+	</li>
+	<li>
+	Fix closing autocompletion lists on Cocoa for macOS 10.13 where the window
+	was emptying but staying visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1981/">Bug #1981</a>.
+	</li>
+	<li>
+	Fix drawing failure on Cocoa with animated find indicator in large files with macOS 10.12
+	by disabling animation.
+	</li>
+	<li>
+	SciTE on GTK+ installs its desktop file as non-executable and supports the common
+	LDLIBS make variable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1989/">Bug #1989</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1990/">Bug #1990</a>.
+	</li>
+	<li>
+	SciTE shows correct column number when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1991/">Bug #1991</a>.
+	</li>
+	<li>
+	SciTE preserves selection positions when saving with strip.trailing.spaces
+	and virtual space turned on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1992/">Bug #1992</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite402.zip">Release 4.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 October 2017.
+	</li>
+	<li>
+	Fix HTML lexer handling of Django so that nesting a  &#123;&#123; &#125;&#125; or &#123;% %&#125;
+	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
+	</li>
+	<li>
+	The Matlab folder now treats "while" as a fold start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1985/">Bug #1985</a>.
+	</li>
+	<li>
+	Fix failure on Cocoa with animated find indicator in large files with macOS 10.13
+	by disabling animation on 10.13.
+	</li>
+	<li>
+	Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite401.zip">Release 4.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 October 2017.
+	</li>
+	<li>
+	The ILoader interface is defined in its own header ILoader.h as it is not
+	related to lexing so doesn't belong in ILexer.h.
+	</li>
+	<li>
+	The Scintilla namespace is always active for internal symbols and for the lexer interfaces
+	ILexer4 and IDocument.
+	</li>
+	<li>
+	The Baan lexer checks that matches to 3rd set of keywords are function calls and leaves as identifiers if not.
+	Baan lexer and folder support #context_on / #context_off preprocessor feature.
+	</li>
+	<li>
+	The C++ lexer improved preprocessor conformance.<br />
+	Default value of 0 for undefined preprocessor symbols.<br />
+	#define A is treated as #define A 1.<br />
+	"defined A" removes "A" before replacing "defined" with value.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1966/">Bug #1966</a>.
+	</li>
+	<li>
+	The Python folder treats triple-quoted f-strings like triple-quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1977/">Bug #1977</a>.
+	</li>
+	<li>
+	The SQL lexer uses sql.backslash.escapes for double quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1968/">Bug #1968</a>.
+	</li>
+	<li>
+	Minor undefined behaviour fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1978">Bug #1978</a>.
+	</li>
+	<li>
+	On Cocoa, improve scrolling on macOS 10.12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1885">Bug #1885</a>.
+	</li>
+	<li>
+	On Cocoa, fix line selection by clicking in the margin when scrolled.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1971">Bug #1971</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite400.zip">Release 4.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 August 2017.
+	</li>
+	<li>
+	This is an unstable release with changes to interfaces used for lexers and platform access.
+	Some more changes may occur to internal and external interfaces before stability is regained with 4.1.0.
+	</li>
+	<li>
+	Uses C++14 features. Requires Microsoft Visual C++ 2017, GCC 7, and Clang 4.0 or newer.
+	</li>
+	<li>
+	Support dropped for GTK+ versions before 2.24.
+	</li>
+	<li>
+	The lexer interfaces ILexer and ILexerWithSubStyles, along with additional style metadata methods, were merged into ILexer4.
+	Most lexers will need to be updated to match the new interfaces.
+	</li>
+	<li>
+	The IDocumentWithLineEnd interface was merged into IDocument.
+	</li>
+	<li>
+	The platform layer interface has changed with unused methods removed, a new mechanism for
+	reporting events, removal of methods that take individual keyboard modifiers, and removal of old timer methods.
+	</li>
+	<li>
+	<a href="StyleMetadata.html">Style metadata</a> may be retrieved from lexers that support this through the SCI_GETNAMEDSTYLES, SCI_NAMEOFSTYLE,
+	SCI_TAGSOFSTYLE, and SCI_DESCRIPTIONOFSTYLE APIs.
+	</li>
+	<li>
+	The Cocoa platform layer uses Automatic Reference Counting (ARC).
+	</li>
+	<li>
+	The default encoding in Scintilla is UTF-8.
+	</li>
+	<li>
+	An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
+	</li>
+	<li>
+	The data parameter to ILoader::AddData made const.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1955/">Bug #1955</a>.
+	</li>
+	<li>
+	SciTE's embedded Lua interpreter updated to Lua 5.3.
+	</li>
+	<li>
+	SciTE allows event handlers to be arbitrary callables, not just functions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1190/">Feature #1190.</a>
+	</li>
+	<li>
+	SciTE allows user.shortcuts to be defined with symbolic Scintilla messages like
+	'Ctrl+L|SCI_LINEDELETE|'.
+	</li>
+	<li>
+	The Matlab lexer treats 'end' as a number rather than a keyword when used as a index.
+	This also stops incorrect folding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1951/">Bug #1951</a>.
+	</li>
+	<li>
+	The Matlab folder implements "fold", "fold.comment", and "fold.compact" properties.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1965/">Bug #1965</a>.
+	</li>
+	<li>
+	The Rust lexer recognizes 'usize' numeric literal suffixes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>.
+	</li>
+	<li>
+	Ensure redraw when application changes overtype mode so caret change visible even when not blinking.
+	Notify application with SC_UPDATE_SELECTION when overtype changed - previously
+	sent SC_UPDATE_CONTENT.
+	</li>
+	<li>
+	Fix drawing failure when in wrap mode for delete to start/end of line which
+	affects later lines but did not redraw them.
+	Also fixed drawing for wrap mode on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
+	</li>
+	<li>
+	On GTK+ fix drawing problems including incorrect scrollbar redrawing and flickering of text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1876">Bug #1876</a>.
+	</li>
+	<li>
+	On Linux, both for GTK+ and Qt, the default modifier key for rectangular selection is now Alt.
+	This is the same as Windows and macOS.
+	This was changed from Ctrl as window managers are less likely to intercept Alt+Drag for
+	moving windows than in the past.
+	</li>
+	<li>
+	On Cocoa, fix doCommandBySelector but avoid double effect of 'delete'
+	key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1958">Bug #1958</a>.
+	</li>
+	<li>
+	On Qt, the updateUi signal includes the 'updated' flags.
+	No updateUi signal is sent for focus in events.
+	These changes make Qt behave more like the other platforms.
+	</li>
+	<li>
+	On Qt, dropping files on Scintilla now fires the SCN_URIDROPPED notification
+	instead of inserting text.
+	</li>
+	<li>
+	On Qt, focus changes send the focusChanged signal.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1957/">Bug #1957</a>.
+	</li>
+	<li>
+	On Qt, mouse tracking is reenabled when the window is reshown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>.
+	</li>
+	<li>
+	On Windows, the DirectWrite modes SC_TECHNOLOGY_DIRECTWRITEDC and
+	SC_TECHNOLOGY_DIRECTWRITERETAIN are no longer provisional.
+	</li>
+	<li>
+	SciTE on macOS fixes a crash when platform-specific and platform-independent
+	session restoration clashed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1960/">Bug #1960</a>.
+	</li>
+	<li>
+	SciTE on GTK+ implements find.close.on.find.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1152/">Bug #1152</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1254/">Bug #1254</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1762/">Bug #1762</a>,
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/849/">Feature #849</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla376.zip">Release 3.7.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 August 2017.
+	</li>
+	<li>
+	This is the first release of the
+	<a href="https://scintilla.sourceforge.io/LongTermDownload.html">long term branch</a>
+	which avoids using features from C++14 or later in order to support older systems.
+	</li>
+	<li>
+	The Baan lexer correctly highlights numbers when followed by an operator.
+	</li>
+	<li>
+	On Cocoa, fix a bug with retrieving encoded bytes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite375.zip">Release 3.7.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2017.
+	</li>
+	<li>
+	This is the final release of SciTE 3.x.
+	</li>
+	<li>
+	Support dropped for Microsoft Visual C++ 2013 due to increased use of C++11 features.
+	</li>
+	<li>
+	Added a caret line frame as an alternative visual for highlighting the caret line.
+	</li>
+	<li>
+	Added "Reverse Selected Lines" feature.
+	</li>
+	<li>
+	SciTE adds "Select All Bookmarks" command.
+	</li>
+	<li>
+	SciTE adds a save.path.suggestion setting to suggest a file name when saving an
+	unnamed buffer.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 9.
+	</li>
+	<li>
+	The Baan lexer recognizes numeric literals in a more compliant manner including
+	hexadecimal numbers and exponentials.
+	</li>
+	<li>
+	The Bash lexer recognizes strings in lists in more cases.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1944/">Bug #1944</a>.
+	</li>
+	<li>
+	The Fortran lexer recognizes a preprocessor line after a line continuation &amp;.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1935/">Bug #1935</a>.
+	</li>
+	<li>
+	The Fortran folder can fold comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1936/">Bug #1936</a>.
+	</li>
+	<li>
+	The PowerShell lexer recognizes escaped quotes in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1929/">Bug #1929</a>.
+	</li>
+	<li>
+	The Python lexer recognizes identifiers more accurately when they include non-ASCII characters.
+	</li>
+	<li>
+	The Python folder treats comments at the end of the file as separate from the preceding structure.
+	</li>
+	<li>
+	The YAML lexer recognizes comments in more situations and styles a
+	"..." line like a "---" line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1931/">Bug #1931</a>.
+	</li>
+	<li>
+	Update scroll bar when annotations added, removed, or visibility changed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1187/">Feature #1187.</a>
+	</li>
+	<li>
+	Canceling modes with the Esc key preserves a rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1940/">Bug #1940</a>.
+	</li>
+	<li>
+	Builds are made with a sorted list of lexers to be more reproducible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1946/">Bug #1946</a>.
+	</li>
+	<li>
+	On Cocoa, a leak of mouse tracking areas was fixed.
+	</li>
+	<li>
+	On Cocoa, the autocompletion is 4 pixels wider to avoid text truncation.
+	</li>
+	<li>
+	On Windows, stop drawing a focus rectangle on the autocompletion list and
+	raise the default list length to 9 items.
+	</li>
+	<li>
+	SciTE examines at most 1 MB of a file to automatically determine indentation
+	for indent.auto to avoid a lengthy pause when loading very large files.
+	</li>
+	<li>
+	SciTE user interface uses lighter colours and fewer 3D elements to match current desktop environments.
+	</li>
+	<li>
+	SciTE sets buffer dirty and shows message when file deleted if load.on.activate on.
+	</li>
+	<li>
+	SciTE on Windows Find strip Find button works in incremental no-close mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1926/">Bug #1926</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite374.zip">Release 3.7.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2017.
+	</li>
+	<li>
+	Requires a C++11 compiler. GCC 4.8 and MSVC 2015 are supported.
+	</li>
+	<li>
+	Support dropped for Windows NT 4.
+	</li>
+	<li>
+	Accessibility support may be queried with SCI_GETACCESSIBILITY.
+	On GTK+, accessibility may be disabled by calling SCI_SETACCESSIBILITY.
+	</li>
+	<li>
+	Lexer added for "indent" language which is styled as plain text but folded by indentation level.
+	</li>
+	<li>
+	The Progress ABL lexer handles nested comments where comment starts or ends
+	are adjacent like "/*/*" or "*/*/".
+	</li>
+	<li>
+	In the Python lexer, improve f-string support.
+	Add support for multiline expressions in triple quoted f-strings.
+	Handle nested "()", "[]", and "{}" in f-string expressions and terminate expression colouring at ":" or "!".
+	End f-string if ending quote is seen in a "{}" expression.
+	Fix terminating single quoted f-string at EOL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1918/">Bug #1918</a>.
+	</li>
+	<li>
+	The VHDL folder folds an "entity" on the first line of the file.
+	</li>
+	<li>
+	For IMEs, do not clear selected text when there is no composition text to show.
+	</li>
+	<li>
+	Fix to crash with fold tags where line inserted at start.
+	</li>
+	<li>
+	Fix to stream selection mode when moving caret up or down.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1905/">Bug #1905</a>.
+	</li>
+	<li>
+	Drawing fixes for fold tags include fully drawing lines and not overlapping some
+	drawing and ensuring edges and mark underlines are visible.
+	</li>
+	<li>
+	Fix Cocoa failure to display accented character chooser for European
+	languages by partially reverting a change made to prevent a crash with
+	Chinese input by special-casing the Cangjie input source.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	Fix potential problems with IME on Cocoa when document contains invalid
+	UTF-8.
+	</li>
+	<li>
+	Fix crash on Cocoa with OS X 10.9 due to accessibility API not available.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1915/">Bug #1915</a>.
+	</li>
+	<li>
+	Improved speed of accessibility code on GTK+ by using additional memory
+	as a cache.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1910/">Bug #1910</a>.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ &lt; 3.3.6 caused by previous bug fix.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Fix to prevent double scrolling on GTK+ with X11.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+	<li>
+	SciTE on GTK+ adds an "accessibility" property to allow disabling accessibility
+	on GTK+ as an optimization.
+	</li>
+	<li>
+	SciTE on GTK+ has changed file chooser behaviour for some actions:
+	overwriting an existing file shows a warning;
+	the default session file name "SciTE.session" is shown and a "*.session" filter is applied;
+	appropriate filters are applied when exporting;
+	the current file name is displayed in "Save As" even when that file no longer exists.
+	</li>
+	<li>
+	SciTE fixed a bug where, on GTK+, when the output pane had focus, menu commands
+	performed by mouse were sent instead to the edit pane.
+	</li>
+	<li>
+	SciTE on Windows 8+ further restricts the paths searched for DLLs to the application
+	and system directories which may prevent some binary planting attacks.
+	</li>
+	<li>
+	Fix failure to load Direct2D on Windows when used on old versions of Windows.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1653/">Bug #1653</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite373.zip">Release 3.7.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 February 2017.
+	</li>
+	<li>
+	Display block caret over the character at the end of a selection to be similar
+	to other editors.
+	</li>
+	<li>
+	In SciTE can choose colours for fold markers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1172/">Feature #1172.</a>
+	</li>
+	<li>
+	In SciTE can hide buffer numbers in tabs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1173/">Feature #1173.</a>
+	</li>
+	<li>
+	The Diff lexer recognizes deleted lines that start with "--- ".
+	</li>
+	<li>
+	The Lua lexer requires the first line to start with "#!" to be treated as a shebang comment,
+	not just "#".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1900/">Bug #1900</a>.
+	</li>
+	<li>
+	The Matlab lexer requires block comment start and end to be alone on a line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1902/">Bug #1902</a>.
+	</li>
+	<li>
+	The Python lexer supports f-strings with new styles, allows Unicode identifiers,
+	and no longer allows @1 to be a decorator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1848/">Bug #1848</a>.
+	</li>
+	<li>
+	Fix folding inconsistency when fold header added above a folded part.
+	Avoid unnecessary unfolding when a deletion does not include a line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1896/">Bug #1896</a>.
+	</li>
+	<li>
+	Fix finalization crash on Cocoa.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1909/">Bug #1909</a>.
+	</li>
+	<li>
+	SciTE on GTK+ can have a wide divider between the panes with the
+	split.wide property.
+	</li>
+	<li>
+	Fix display of autocompletion lists and calltips on GTK+ 3.22 on Wayland.
+	Newer APIs used on GTK+ 3.22 as older APIs were deprecated.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ due to signal receipt after destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Make trackpad scrolling work on Wayland.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite372.zip">Release 3.7.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 December 2016.
+	</li>
+	<li>
+	Minimize redrawing for SCI_SETSELECTIONN* APIs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>.
+	</li>
+	<li>
+	Use more precision to allow selecting individual lines in files with
+	more than 16.7 million lines.
+	</li>
+	<li>
+	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
+	</li>
+	<li>
+	For Cocoa, fix crash on view destruction with macOS 10.12.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1891/">Bug #1891</a>.
+	</li>
+	<li>
+	Fix crash on GTK+ &lt;3.8 due to incorrect lifetime of accessibility object.
+	More accurate reporting of attribute ranges and deletion lengths for accessibility.
+	</li>
+	<li>
+	In SciTE, if a Lua script causes a Scintilla failure exception, display error
+	message in output pane instead of exiting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1773/">Bug #1773</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite371.zip">Release 3.7.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 December 2016.
+	</li>
+	<li>
+	The Scintilla namespace is no longer applied to struct definitions in Scintilla.h even
+	when SCI_NAMESPACE defined.
+	Client code should not define SCI_NAMESPACE.
+	</li>
+	<li>
+	Structure names in Scintilla.h without prefixes are deprecated and will now only
+	be usable with INCLUDE_DEPRECATED_FEATURES defined.<br />
+	Use the newer names with the "Sci_" prefix:<br />
+	CharacterRange &rarr; Sci_CharacterRange<br />
+	TextRange &rarr; Sci_TextRange<br />
+	TextToFind &rarr; Sci_TextToFind<br />
+	RangeToFormat &rarr; Sci_RangeToFormat<br />
+	NotifyHeader &rarr; Sci_NotifyHeader
+	</li>
+	<li>
+	Previously deprecated features SC_CP_DBCS, SCI_SETUSEPALETTE. and SCI_GETUSEPALETTE
+	have been removed and can no longer be used in client code.
+	</li>
+	<li>
+	Single phase drawing SC_PHASES_ONE is deprecated along with the
+	SCI_SETTWOPHASEDRAW and SCI_GETTWOPHASEDRAW messages.
+	</li>
+	<li>
+	Accessibility support allowing screen readers to work added on GTK+ and Cocoa.
+	</li>
+	<li>
+	Textual tags may be displayed to the right on folded lines with SCI_TOGGLEFOLDSHOWTEXT.
+	This is commonly something like "{ ... }" or "&lt;tr&gt;...&lt;/tr&gt;".
+	It is displayed with the STYLE_FOLDDISPLAYTEXT style and may have a box drawn around it
+	with SCI_FOLDDISPLAYTEXTSETSTYLE.
+	</li>
+	<li>
+	A mouse right-click over the margin may send an SCN_MARGINRIGHTCLICK event.
+	This only occurs when popup menus are turned off.
+	SCI_USEPOPUP now has three states: SC_POPUP_NEVER, SC_POPUP_ALL, or SC_POPUP_TEXT.
+	</li>
+	<li>
+	INDIC_POINT and INDIC_POINTCHARACTER indicators added to display small arrows
+	underneath positions or characters.
+	</li>
+	<li>
+	Added alternate appearance for visible tabs which looks like a horizontal line.
+	Controlled with SCI_SETTABDRAWMODE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1165/">Feature #1165.</a>
+	</li>
+	<li>
+	On Cocoa, a modulemap file is included to allow Scintilla to be treated as a module.
+	This makes it easier to use Scintilla from the Swift language.
+	</li>
+	<li>
+	Baan folder accommodates sections and lexer fixes definition of SCE_BAAN_FUNCDEF.
+	</li>
+	<li>
+	EDIFACT lexer and folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	JSON folder fixed where it didn't resume folding with the correct fold level.
+	</li>
+	<li>
+	Matlab folder based on syntax instead of indentation so more accurate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1692/">Bug #1692</a>.
+	</li>
+	<li>
+	YAML lexer fixed style of references and keywords when followed by a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1872/">Bug #1872</a>.
+	</li>
+	<li>
+	Margin click to select line now clears rectangular and additional selections.
+	</li>
+	<li>
+	Fixed a NULL access bug on GTK+ where the scrollbars could be used during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1873/">Bug #1873</a>.
+	</li>
+	<li>
+	A potential bug on GTK+ fixed where asynchronous clipboard could be delivered after its
+	target Scintilla instance was destroyed.
+	</li>
+	<li>
+	Cocoa IME made more compliant with documented behaviour to avoid bugs that caused
+	huge allocations.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	On Win32 fix EM_SETSEL to match Microsoft documentation..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1886/">Bug #1886</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows localizing tool bar tool tips.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1167/">Feature #1167.</a>
+	</li>
+	<li>
+	SciTE on Windows restores focus to edit pane after closing user strip.
+	</li>
+	<li>
+	SciTE measures files larger that 2 GB which allows it to refuse to open huge files more consistently
+	and to show better warning messages.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite370.zip">Release 3.7.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 October 2016.
+	</li>
+	<li>
+	Word selection, navigation, and manipulation is now performed on characters instead of bytes
+	leading to more natural behaviour for multi-byte encodings like UTF-8.
+	For UTF-8 characters 0x80 and above, classification into word; punctuation; space; or line-end
+	is based on the Unicode general category of the character and is not customizable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1832/">Bug #1832</a>.
+	</li>
+	<li>
+	Two enums changed in Scintilla.iface which may lead to changed bindings.
+	There were 2 FontQuality enums and the first is now PhasesDraw.
+	The prefix for FoldAction was SC_FOLDACTION and is now SC_FOLDACTION_
+	which is similar to other enums.
+	These changes do not affect the standard C/C++ binding.
+	</li>
+	<li>
+	EDGE_MULTILINE and SCI_MULTIEDGEADDLINE added to allow displaying multiple
+	vertical edges simultaneously.
+	</li>
+	<li>
+	The number of margins can be changed with SCI_SETMARGINS.
+	</li>
+	<li>
+	Margin type SC_MARGIN_COLOUR added so that the application may
+	choose any colour for a margin with SCI_SETMARGINBACKN.
+	</li>
+	<li>
+	On Win32, mouse wheel scrolling can be restricted to only occur when the mouse is
+	within the window.
+	</li>
+	<li>
+	The WordList class in lexlib used by lexers adds an InListAbridged method for
+	matching keywords that have particular prefixes and/or suffixes.
+	</li>
+	<li>
+	The Baan lexer was changed significantly with more lexical states, keyword sets,
+	and support for abridged keywords.
+	</li>
+	<li>
+	The CoffeeScript lexer styles interpolated code in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1865/">Bug #1865</a>.
+	</li>
+	<li>
+	The Progress lexer "progress" has been replaced with a new lexer "abl"
+	(Advanced Business Language)
+	with a different set of lexical states and more functionality.
+	The lexical state prefix has changed from SCE_4GL_ to SCE_ABL_.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1143/">Feature #1143.</a>
+	</li>
+	<li>
+	The PowerShell lexer understands the grave accent escape character.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1868/">Bug #1868</a>.
+	</li>
+	<li>
+	The YAML lexer recognizes inline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1660/">Bug #1660</a>.
+	</li>
+	<li>
+	SciTE on Windows can retain coloured selection when inactive with
+	selection.always.visible property.
+	</li>
+	<li>
+	SciTE on Windows adds a state to close.on.find to close the find strip when
+	a match is found.
+	</li>
+	<li>
+	Fix caret position after left or right movement with rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1861/">Bug #1861</a>.
+	</li>
+	<li>
+	In SciTE, optional prefix argument added to scite.ConstantName method.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1860/">Bug #1860</a>.
+	</li>
+	<li>
+	On Cocoa, include ILexer.h in the public headers of the framework.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1855/">Bug #1855</a>.
+	</li>
+	<li>
+	On Cocoa, allow subclass of SCIContentView to set cursor.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1863/">Bug #1863</a>.
+	</li>
+	<li>
+	On Cocoa, recognize the numeric keypad '+', '-', and '/' keys as
+	SCK_ADD, SCK_SUBTRACT, and SCK_DIVIDE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1867/">Bug #1867</a>.
+	</li>
+	<li>
+	On GTK+ 3.21+ fix incorrect font size in auto-completion list.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1859/">Bug #1859</a>.
+	</li>
+	<li>
+	Fix SciTE crash when command.mode ends with comma.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1857/">Bug #1857</a>.
+	</li>
+	<li>
+	SciTE on Windows has a full size toolbar icon for "Close".
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite367.zip">Release 3.6.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 September 2016.
+	</li>
+	<li>
+	C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
+	</li>
+	<li>
+	SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
+	This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
+	Projects which want to default to DBCS code pages in East Asian locales should set the code page and
+	character set explicitly.
+	</li>
+	<li>
+	SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
+	Most commonly wanted when virtual space is used.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
+	</li>
+	<li>
+	The C++ lexer can fold on #else and #elif with the fold.cpp.preprocessor.at.else property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
+	</li>
+	<li>
+	The errorlist lexer detects warnings from Visual C++ which do not contain line numbers.
+	</li>
+	<li>
+	The HTML lexer no longer treats "&lt;?" inside a string in a script as potentially starting an XML document.
+	<a href="https://sourceforge.net/p/scintilla/bugs/767/">Bug #767</a>.
+	</li>
+	<li>
+	The HTML lexer fixes a problem resuming at a script start where the starting state continued
+	past where it should.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1849/">Bug #1849</a>.
+	</li>
+	<li>
+	When inserting spaces for virtual space and the position is in indentation and tabs are enabled
+	for indentation then use tabs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1850/">Bug #1850</a>.
+	</li>
+	<li>
+	Fix fold expand when some child text not styled.
+	Caused by fixes for Bug #1799.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1842/">Bug #1842</a>.
+	</li>
+	<li>
+	Fix key binding bug on Cocoa for control+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1854/">Bug #1854</a>.
+	</li>
+	<li>
+	Fix scroll bar size warnings on GTK+ caused by #1831.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
+	</li>
+	<li>
+	Small fixes for GTK+ makefile.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1844/">Bug #1844</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1845/">Bug #1845</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1846/">Bug #1846</a>.
+	</li>
+	<li>
+	Fix SciTE indentation after code like "void function () {}".
+	</li>
+	<li>
+	Fix SciTE global regex replace of "^" with something which missed the line after empty
+	lines with LF line ends.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1839/">Bug #1839</a>.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.20 bug where toggle buttons on find and replace strips
+	did not show active state.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1853/">Bug #1853</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite366.zip">Release 3.6.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 May 2016.
+	</li>
+	<li>
+	C++ 11 &lt;regex&gt; support built by default. Can be disabled by defining NO_CXX11_REGEX.
+	</li>
+	<li>
+	SciTE_USERHOME environment variable allows separate location for writeable properties files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/965/">Feature #965.</a>
+	</li>
+	<li>
+	GObject introspection supports notify and command events.
+	</li>
+	<li>
+	The Progress lexer now allows comments preceded by a tab.
+	</li>
+	<li>
+	Scripts reading Scintilla.iface file include comments for enu and lex definitions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1829/">Bug #1829</a>.
+	</li>
+	<li>
+	Fix crashes on GTK+ if idle work active when destroyed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1827/">Bug #1827</a>.
+	</li>
+	<li>
+	Fixed bugs when used on GTK+ 3.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1825/">Bug #1825</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1831/">Bug #1831</a>.
+	</li>
+	<li>
+	Fix SciTE search field background with dark theme on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1826/">Bug #1826</a>.
+	</li>
+	<li>
+	Fixed bug on Win32 that allowed resizing autocompletion from bottom when it was
+	located above the caret.
+	</li>
+	<li>
+	On Win32, when using a screen reader and selecting text using Shift+Arrow,
+	fix bug when scrolling made the caret stay at the same screen location
+	so the screen reader did not speak the added or removed selection.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite365.zip">Release 3.6.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 April 2016.
+	</li>
+	<li>
+	JSON lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1140/">Feature #1140.</a>
+	</li>
+	<li>
+	The C++ lexer fixes a bug with multi-line strings with line continuation where the string style
+	overflowed after an edit.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1824/">Bug #1824</a>.
+	</li>
+	<li>
+	The Python lexer treats '@' as an operator except when it is the first visible character on a line.
+	This is for Python 3.5.
+	</li>
+	<li>
+	The Rust lexer allows '?' as an operator.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1146/">Feature #1146.</a>
+	</li>
+	<li>
+	Doubled size of compiled regex buffer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1822/">Bug #1822</a>.
+	</li>
+	<li>
+	For GTK+, the Super modifier key can be used in key bindings.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1142/">Feature #1142.</a>
+	</li>
+	<li>
+	For GTK+, fix some crashes when using multiple threads.
+	</li>
+	<li>
+	Platform layer font cache removed on GTK+ as platform-independent caches are used.
+	This avoids the use of thread locking and initialization of threads so any GTK+
+	applications that rely on Scintilla initializing threads will have to do that themselves.
+	</li>
+	<li>
+	SciTE bug fixed with exported HTML where extra line shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1816/">Bug #1816</a>.
+	</li>
+	<li>
+	SciTE on Windows fixes bugs with pop-up menus in the find and replace strips.
+	For the replace strip, menu choices change the state.
+	For the find strip, menu choices are reflected in the appearance of their corresponding buttons.
+	</li>
+	<li>
+	SciTE on Windows on high DPI displays fixes the height of edit boxes in user strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite364.zip">Release 3.6.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 March 2016.
+	</li>
+	<li>
+	SciTE allows setting the autocompletion type separator character.
+	</li>
+	<li>
+	The C++ folder folds code on '(' and ')' to allow multi-line calls to be folded.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1138/">Feature #1138.</a>
+	</li>
+	<li>
+	For the HTML lexer, limit the extent of Mako line comments to finish before
+	the line end characters.
+	</li>
+	<li>
+	Folds unfolded when two fold regions are merged by either deleting an intervening line
+	or changing its fold level by adding characters.
+	This was fixed both in Scintilla and in SciTE's equivalent code.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1799/">Bug #1799</a>.<br />
+	</li>
+	<li>
+	The Progress lexer supports hexadecimal numeric literals,
+	single-line comments, abbreviated keywords and
+	extends nested comments to unlimited levels.
+	</li>
+	<li>
+	Ruby lexer treats alternate hash key syntax "key:" as a symbol.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1810/">Bug #1810</a>.
+	</li>
+	<li>
+	Rust lexer handles bracketed Unicode string escapes like "\u{123abc}".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1809/">Bug #1809</a>.
+	</li>
+	<li>
+	For GTK+ on Windows fix 64-bit build which was broken in 3.6.3.
+	</li>
+	<li>
+	For Qt, release builds have assertions turned off.
+	</li>
+	<li>
+	For Qt on Windows, fix compilation failure for Qt 4.x.
+	</li>
+	<li>
+	IME target range displayed on Qt for OS X.
+	</li>
+	<li>
+	On Windows, make clipboard operations more robust by retrying OpenClipboard if it fails
+	as this may occur when another application has opened the clipboard.
+	</li>
+	<li>
+	On Windows back out change that removed use of def file to ensure
+	Scintilla_DirectFunction exported without name mangling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1813/">Bug #1813</a>.
+	</li>
+	<li>
+	On GTK+ and Qt over Win32 in Korean fix bug caused by last release's word input change.
+	</li>
+	<li>
+	For SciTE, more descriptive error messages are displayed when there are problems loading the
+	Lua startup script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1139/">Feature #1139.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite363.zip">Release 3.6.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 18 January 2016.
+	</li>
+	<li>
+	Allow painting without first styling all visible text then styling in the background
+	using idle-time. This helps performance when scrolling down in very large documents.
+	Can also incrementally style after the visible area to the end of the document so that
+	the document is already styled when the user scrolls to it.
+	</li>
+	<li>
+	Support GObject introspection on GTK+.
+	</li>
+	<li>
+	SciTE supports pasting to each selection with the selection.multipaste setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1123/">Feature #1123.</a>
+	</li>
+	<li>
+	SciTE can optionally display a read-only indicator on tabs and in the Buffers menu.
+	</li>
+	<li>
+	Bash lexer flags incomplete here doc delimiters as syntax errors.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1789/">Bug #1789</a>.<br />
+	Support added for using '#' in non-comment ways as is possible with zsh.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1794/">Bug #1794</a>.<br />
+	Recognize more characters as here-doc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1778/">Bug #1778</a>.
+	</li>
+	<li>
+	Errorlist lexer highlights warning messages from the Microsoft linker.
+	</li>
+	<li>
+	Errorlist lexer fixes bug with final line in escape sequence recognition mode.
+	</li>
+	<li>
+	Lua lexer includes '&amp;' and '|' bitwise operators for Lua 5.3.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1790/">Bug #1790</a>.
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.20 and 5.22.<br />
+	Allow '_' for subroutine prototypes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1791/">Bug #1791</a>.<br />
+	Double-diamond operator &lt;&lt;&gt;&gt;.<br />
+	Hexadecimal floating point literals.<br />
+	Repetition in list assignment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1793/">Bug #1793</a>.<br />
+	Highlight changed subroutine prototype syntax for Perl 5.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1797/">Bug #1797</a>.<br />
+	Fix module ::-syntax when special characters such as 'x' are used.<br />
+	Added ' and " detection as prefix chars for x repetition operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1800/">Bug #1800</a>.
+	</li>
+	<li>
+	Visual Prolog lexer recognizes numbers more accurately and allows non-ASCII verbatim
+	quoting characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1130/">Feature #1130.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION when the application changes multiple
+	selection.
+	</li>
+	<li>
+	Expand folded areas before deleting fold header line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1796/">Bug #1796</a>.
+	</li>
+	<li>
+	Treat Unicode line ends like common line ends when maintaining fold state.
+	</li>
+	<li>
+	Highlight whole run for hover indicator when wrapped.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1784/">Bug #1784</a>.
+	</li>
+	<li>
+	On Cocoa, fix crash when autocompletion list closed during scroll bounce-back.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1788/">Bug #1788</a>.
+	</li>
+	<li>
+	On Windows, fix non-BMP input through WM_CHAR and allow WM_UNICHAR to work
+	with non-BMP characters and on non-Unicode documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1779/">Bug #1779</a>.
+	</li>
+	<li>
+	On Windows using DirectWrite, for ligatures and other character clusters,
+	display caret and selections part-way through clusters so that the caret doesn't stick
+	to the end of the cluster making it easier to understand editing actions.
+	</li>
+	<li>
+	On Windows, Scintilla no longer uses a .DEF file during linking as it duplicates
+	source code directives.
+	</li>
+	<li>
+	On GTK+ and Qt, Korean input by word fixed.
+	</li>
+	<li>
+	On GTK+, Qt, and Win32 block IME input when document is read-only or any selected text
+	is protected.
+	</li>
+	<li>
+	On GTK+ on OS X, fix warning during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1777/">Bug #1777</a>.
+	</li>
+	<li>
+	Fix SciTE crashes when using LPEG lexers.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite362.zip">Release 3.6.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 November 2015.
+	</li>
+	<li>
+	Whitespace may be made visible just in indentation.
+	</li>
+	<li>
+	Whitespace dots are centred when larger than 1 pixel.
+	</li>
+	<li>
+	The Scintilla framework on Cocoa now contains version numbers.
+	</li>
+	<li>
+	SciTE's standard properties collect values from all active .properties file to produce the Language menu
+	and the file types pull-down in the File open dialog.
+	</li>
+	<li>
+	The single executable version of SciTE, Sc1, uses 'module' statements within its embedded
+	properties. This makes it act more like the full distribution allowing languages to be turned on
+	and off by setting imports.include and imports.exclude.
+	The default imports.exclude property adds eiffel, erlang, ps, and pov so these languages are
+	turned off by default.
+	</li>
+	<li>
+	SciTE adds an output.blank.margin.left property to allow setting the output pane
+	margin to a different width than the edit pane.
+	</li>
+	<li>
+	CoffeeScript lexer highlights ranges correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1765/">Bug #1765</a>.
+	</li>
+	<li>
+	Markdown lexer treats line starts consistently to always highlight *foo* or similar at line start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1766/">Bug #1766</a>.
+	</li>
+	<li>
+	Optimize marker redrawing by only drawing affected lines when markers shown in the text.
+	</li>
+	<li>
+	On Cocoa, timers and idling now work in modal dialogs. This also stops some crashes.
+	</li>
+	<li>
+	On Cocoa, fix crashes when deleting a ScintillaView. These crashes could occur when scrolling
+	at the time the ScintillaView was deleted although there may have been other cases.
+	</li>
+	<li>
+	On GTK+ 2.x, fix height of lines in autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1774/">Bug #1774</a>.
+	</li>
+	<li>
+	Fix bug with SCI_LINEENDDISPLAY where the caret moved to the next document line instead of the
+	end of the display line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1772/">Bug #1772</a>.
+	</li>
+	<li>
+	Report error (SC_STATUS_FAILURE) when negative length passed to SCI_SETSTYLING.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1768/">Bug #1768</a>.
+	</li>
+	<li>
+	When SC_MARK_UNDERLINE is not assigned to a margin, stop drawing the whole line.
+	</li>
+	<li>
+	When reverting an untitled document in SciTE, just clear it with no message about a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1764/">Bug #1764</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows use of Ctrl+A (Select All) inside find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1769/">Bug #1769</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite361.zip">Release 3.6.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 September 2015.
+	</li>
+	<li>
+	The oldest version of GTK+ supported now is 2.18 and for glib it is 2.22.
+	</li>
+	<li>
+	On GTK+, SC_CHARSET_OEM866 added to allow editing Russian files encoded in code page 866.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1019/">Feature #1019.</a>
+	</li>
+	<li>
+	On Windows, reconversion is performed when requested by the IME.
+	</li>
+	<li>
+	CoffeeScript lexer adds lexical class for instance properties and fixes some cases of regex highlighting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1749/">Bug #1749</a>.
+	</li>
+	<li>
+	The errorlist lexer understands some ANSI escape sequences to change foreground colour and intensity.
+	This is sufficient to colour diagnostic output from gcc and clang when -fdiagnostics-color set.
+	</li>
+	<li>
+	The errorlist lexer allows the line number to be 0 in GCC errors as some tools report whole file
+	errors as line 0.
+	</li>
+	<li>
+	MySql lexer fixes empty comments /**/ so the comment state does not continue.
+	</li>
+	<li>
+	VHDL folder supports "protected" keyword.
+	</li>
+	<li>
+	Treat CRLF line end as two characters in SCI_COUNTCHARACTERS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1757/">Bug #1757</a>.
+	</li>
+	<li>
+	On GTK+ 3.x, fix height of lines in autocompletion lists to match the font.
+	Switch from deprecated style calls to CSS styling.
+	Removed setting list colours on GTK+ 3.16+ as no longer appears needed.
+	</li>
+	<li>
+	On GTK+, avoid "Invalid rectangle passed" warning messages by never reporting the client
+	rectangle with a negative width or height.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1743/">Bug #1743</a>.
+	</li>
+	<li>
+	On Cocoa, copy Sci_Position.h into the framework so clients can build.
+	</li>
+	<li>
+	On Cocoa fix bug with drag and drop that could lead to crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1751/">Bug #1751</a>.
+	</li>
+	<li>
+	Fix SciTE disk exhaustion bug by reporting failures when writing files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1760/">Bug #1760</a>.
+	</li>
+	<li>
+	Fix find strip in SciTE on Windows XP to be visible.
+	</li>
+	<li>
+	SciTE on Windows changes the way it detects that a tool has finished executing to ensure all output data
+	from the process is read.
+	</li>
+	<li>
+	SciTE on Windows improves the time taken to read output from tools that produce a large amount
+	of output by a factor of around 10.
+	</li>
+	<li>
+	On GTK+ the keyboard command for View | End of Line was changed to Ctrl+Shift+N
+	to avoid clash with Search | Selection Add Next.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1750/">Bug #1750</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite360.zip?download">Release 3.6.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 August 2015.
+	</li>
+	<li>
+	External interfaces use the Sci_Position and Sci_PositionU typedefs instead of int and unsigned int
+	to allow for changes to a 64-bit interface on 64-bit platforms in the future.
+	Applications and external lexers should start using the new type names so that
+	they will be compatible when the 64-bit change occurs.
+	There is also Sci_PositionCR (long) for use in the Sci_CharacterRange struct which will
+	also eventually become 64-bit.
+	</li>
+	<li>
+	Multiple selection now works over more key commands.
+	The new multiple-selection handling commands include horizontal movement and selection commands,
+	line up and down movement and selection commands, word and line deletion commands, and
+	line end insertion.
+	This change in behaviours is conditional on setting the SCI_SETADDITIONALSELECTIONTYPING property.
+	</li>
+	<li>
+	Autocompletion lists send an SCN_AUTOCCOMPLETED notification after the text has been inserted.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1109/">Feature #1109.</a>
+	</li>
+	<li>
+	The case mode style attribute can now be SC_CASE_CAMEL.
+	</li>
+	<li>
+	The Python lexer supports substyles for identifiers.
+	</li>
+	<li>
+	SciTE adds support for substyles.
+	</li>
+	<li>
+	SciTE's Export as RTF and Copy as RTF commands support UTF-8.
+	</li>
+	<li>
+	SciTE can display autocompletion on all IME input with ime.autocomplete property.
+	</li>
+	<li>
+	SciTE properties files now discard trailing white space on variable names.
+	</li>
+	<li>
+	Calling SCI_SETIDENTIFIERS resets styling to ensure any added identifier are highlighted.
+	</li>
+	<li>
+	Avoid candidate box randomly popping up away from edit pane with (especially
+	Japanese) IME input.
+	</li>
+	<li>
+	On Cocoa fix problems with positioning of autocompletion lists near screen edge
+	or under dock. Cancel autocompletion when window moved.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1740/">Bug #1740</a>.
+	</li>
+	<li>
+	Fix drawing problem when control characters are in a hidden style as they then
+	have a zero width rectangle to draw but modify that rectangle in a way that
+	clears some pixels.
+	</li>
+	<li>
+	Report error when attempt to resize buffer to more than 2GB with SC_STATUS_FAILURE.
+	</li>
+	<li>
+	Fix bug on GTK+ with scroll bars leaking.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1742/">Bug #1742</a>.
+	</li>
+	<li>
+	LexOthers.cxx file split into one file per lexer: LexBatch, LexDiff,
+	LexErrorList, LexMake, LexNull, and LexProps.
+	</li>
+	<li>
+	SciTE exporters handle styles &gt; 127 correctly now.
+	</li>
+	<li>
+	SciTE on Windows can scale window element sizes based on the system DPI setting.
+	</li>
+	<li>
+	SciTE implements find.in.files.close.on.find on all platforms, not just Windows.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite357.zip?download">Release 3.5.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2015.
+	</li>
+	<li>
+	Added SCI_MULTIPLESELECTADDNEXT to add the next occurrence of the main selection within the
+	target to the set of selections as main. If the current selection is empty then select word around caret.
+	SCI_MULTIPLESELECTADDEACH adds each occurrence of the main selection within the
+	target to the set of selections.
+	</li>
+	<li>
+	SciTE adds "Selection Add Next" and "Selection Add Each" commands to the Search menu.
+	</li>
+	<li>
+	Added SCI_ISRANGEWORD to determine if the parameters are at the start and end of a word.
+	</li>
+	<li>
+	Added SCI_TARGETWHOLEDOCUMENT to set the target to the whole document.
+	</li>
+	<li>
+	Verilog lexer recognizes protected regions and the folder folds protected regions.
+	</li>
+	<li>
+	A performance problem with markers when deleting many lines was fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1733/">Bug #1733</a>.
+	</li>
+	<li>
+	On Cocoa fix crash when ScintillaView destroyed if no autocompletion ever displayed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1728/">Bug #1728</a>.
+	</li>
+	<li>
+	On Cocoa fix crash in drag and drop.
+	</li>
+	<li>
+	On GTK+ 3.4+, when there are both horizontal and vertical scrollbars, draw the lower-right corner
+	so that it does not appear black when text selected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1611/">Bug #1611</a>.
+	</li>
+	<li>
+	Fixed most calls deprecated in GTK+ 3.16. Does not fix style override calls
+	as they are more complex.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x uses a different technique for highlighting the search strip when there is
+	no match which is more compatible with future and past versions and different themes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2015.
+	</li>
+	<li>
+	On Qt, use fractional positioning calls and avoid rounding to ensure consistency.
+	</li>
+	<li>
+	SCI_TARGETASUTF8 and SCI_ENCODEDFROMUTF8 implemented on
+	Win32 as well as GTK+ and Cocoa.
+	</li>
+	<li>
+	C++ lexer fixes empty backquoted string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1711/">Bug #1711</a>.
+	</li>
+	<li>
+	C++ lexer fixes #undef directive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1719/">Bug #1719</a>.
+	</li>
+	<li>
+	Fortran folder fixes handling of "selecttype" and "selectcase".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1724/">Bug #1724</a>.
+	</li>
+	<li>
+	Verilog folder folds interface definitions.
+	</li>
+	<li>
+	VHDL folder folds units declarations and fixes a case insensitivity bug with not treating "IS" the same as "is".
+	</li>
+	<li>
+	Fix bug when drawing text margins in buffered mode which would use default
+	encoding instead of chosen encoding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1703/">Bug #1703</a>.
+	</li>
+	<li>
+	Fix bug with Korean Hanja conversions in DBCS encoding on Windows.
+	</li>
+	<li>
+	Fix for reading a UTF-16 file in SciTE where a non-BMP character is split over a read buffer boundary.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1710/">Bug #1710</a>.
+	</li>
+	<li>
+	Fix bug on GTK+ 2.x for Windows where there was an ABI difference between
+	compiler version.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1726/">Bug #1726</a>.
+	</li>
+	<li>
+	Fix undo bug on Cocoa that could lose data..
+	</li>
+	<li>
+	Fix link error on Windows when SCI_NAMESPACE used.
+	</li>
+	<li>
+	Fix exporting from SciTE when using Scintillua for lexing.
+	</li>
+	<li>
+	SciTE does not report twice that a search string can not be found when "Replace" pressed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1716/">Bug #1716</a>.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x disables arrow in search combo when no entries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1717/">Bug #1717</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2015.
+	</li>
+	<li>
+	Scintilla on Windows is now always a wide character window so SCI_SETKEYSUNICODE has no effect
+	and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called.
+	</li>
+	<li>
+	The wxWidgets-specific ascent member of Font has been removed which breaks
+	compatibility with current wxStyledTextCtrl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1682/">Bug #1682</a>.
+	</li>
+	<li>
+	IME on Qt supports multiple carets and behaves more like other platforms.
+	</li>
+	<li>
+	Always use inline IME on GTK+ for Korean.
+	</li>
+	<li>
+	SQL lexer fixes handling of '+' and '-' in numbers so the '-' in '1-1' is seen as an operator and for
+	'1--comment' the comment is recognized.
+	</li>
+	<li>
+	TCL lexer reverts change to string handling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer fixes bugs with macro styling.
+	Verilog folder fixes bugs with `end completing an `if* instead of `endif and fold.at.else, and implements
+	folding at preprocessor `else.
+	</li>
+	<li>
+	VHDL lexer supports extended identifiers.
+	</li>
+	<li>
+	Fix bug on Cocoa where the calltip would display incorrectly when
+	switching calltips and the new calltip required a taller window.
+	</li>
+	<li>
+	Fix leak on Cocoa with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1706/">Bug #1706</a>.
+	</li>
+	<li>
+	Fix potential crash on Cocoa with drag and drop.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1709/">Bug #1709</a>.
+	</li>
+	<li>
+	Fix bug on Windows when compiling with MinGW-w64 which caused text to not be drawn
+	when in wrap mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1705/">Bug #1705</a>.
+	</li>
+	<li>
+	Fix SciTE bug with missing file open filters and add hex to excluded set of properties files so that its
+	settings don't appear.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1707/">Bug #1707</a>.
+	</li>
+	<li>
+	Fix SciTE bug where files without extensions like "makefile" were not highlighted correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite354.zip?download">Release 3.5.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2015.
+	</li>
+	<li>
+	Indicators may have a different colour and style when the mouse is over them or the caret is moved into them.
+	</li>
+	<li>
+	An indicator may display in a large variety of colours with the SC_INDICFLAG_VALUEFORE
+	flag taking the colour from the indicator's value, which may differ for every character, instead of its
+	foreground colour attribute.
+	</li>
+	<li>
+	On Cocoa, additional IME methods implemented so that more commands are enabled.
+	For Japanese: Reverse Conversion, Convert to Related Character, and Search Similar Kanji
+	can now be performed.
+	The global definition hotkey Command+Control+D and the equivalent three finger tap gesture
+	can be used.
+	</li>
+	<li>
+	Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed.
+	</li>
+	<li>
+	On Windows, for Korean, the VK_HANJA key is implemented to choose Hanja for Hangul and
+	to convert from Hanja to Hangul.
+	</li>
+	<li>
+	C++ lexer adds lexer.cpp.verbatim.strings.allow.escapes option that allows verbatim (@") strings
+	to contain escape sequences. This should remain off (0) for C# and be turned on (1) for Objective C.
+	</li>
+	<li>
+	Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>.
+	</li>
+	<li>
+	Ruby folder can fold multiline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1697/">Bug #1697</a>.
+	</li>
+	<li>
+	SQL lexer fixes a bug with the q-quote operator.
+	</li>
+	<li>
+	TCL lexer fixes a bug with some strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer handles escaped identifiers that begin with \ and end with space like \reset* .
+	Verilog folder fixes one bug with inconsistent folding when fold.comment is on and another
+	with typedef class statements creating a fold point, expecting an endclass statement.
+	</li>
+	<li>
+	VHDL folder fixes hang in folding when document starts with "entity".
+	</li>
+	<li>
+	Add new indicators INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, and INDIC_TEXTFORE.
+	INDIC_COMPOSITIONTHIN is a thin underline that mimics the appearance of non-target segments in OS X IME.
+	INDIC_FULLBOX is similar to INDIC_STRAIGHTBOX but covers the entire character area which means that
+	indicators with this style on contiguous lines may touch. INDIC_TEXTFORE changes the text foreground colour.
+	</li>
+	<li>
+	Fix adaptive scrolling speed for GTK+ on OS X with GTK Quartz backend (as opposed to X11 backend).
+	<a href="https://sourceforge.net/p/scintilla/bugs/1696/">Bug #1696</a>.
+	</li>
+	<li>
+	Fix position of autocompletion and calltips on Cocoa when there were two screens stacked vertically.
+	</li>
+	<li>
+	Fix crash in SciTE when saving large files in background when closing application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1691/">Bug #1691</a>.
+	</li>
+	<li>
+	Fix decoding of MSVC warnings in SciTE so that files in the C:\Program Files (x86)\ directory can be opened.
+	This is a common location of system include files.
+	</li>
+	<li>
+	Fix compilation failure of C++11 &lt;regex&gt; on Windows using gcc.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 January 2015.
+	</li>
+	<li>
+	Support removed for Windows 95, 98, and ME.
+	</li>
+	<li>
+	Lexers added for Motorola S-Record files, Intel hex files, and Tektronix extended hex files with folding for Intel hex files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1091/">Feature #1091.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1093/">Feature #1093.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1095/">Feature #1095.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1096/">Feature #1096.</a>
+	</li>
+	<li>
+	C++ folder allows folding on square brackets '['.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1087/">Feature #1087.</a>
+	</li>
+	<li>
+	Shell lexer fixes three issues with here-documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1672/">Bug #1672</a>.
+	</li>
+	<li>
+	Verilog lexer highlights doc comment keywords; has separate styles for input, output, and inout ports
+	(lexer.verilog.portstyling); fixes a bug in highlighting numbers; can treat upper-case identifiers as
+	keywords (lexer.verilog.allupperkeywords); and can use different styles for code that is inactive due
+	to preprocessor commands (lexer.verilog.track.preprocessor, lexer.verilog.update.preprocessor).
+	</li>
+	<li>
+	When the calltip window is taller than the Scintilla window, leave it in a
+	position that avoids overlapping the Scintilla text.
+	</li>
+	<li>
+	When a text margin is displayed, for annotation lines, use the background colour of the base line.
+	</li>
+	<li>
+	On Windows GDI, assume font names are encoded in UTF-8. This matches the Direct2D code path.
+	</li>
+	<li>
+	Fix paste for GTK+ on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1677/">Bug #1677</a>.
+	</li>
+	<li>
+	Reverted a fix on Qt where Qt 5.3 has returned to the behaviour of 4.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	When the mouse is on the line between margin and text changed to treat as within text.
+	This makes the PLAT_CURSES character cell platform work better.
+	</li>
+	<li>
+	Fix a crash in SciTE when the command line is just "-close:".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1675/">Bug #1675</a>.
+	</li>
+	<li>
+	Fix unexpected dialog in SciTE on Windows when the command line has a quoted filename then ends with a space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1673/">Bug #1673</a>.
+	</li>
+	<li>
+	On Windows and GTK+, use indicators for inline IME.
+	</li>
+	<li>
+	SciTE shuts down quicker when there is no user-written OnClose function and no directors are attached.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite352.zip?download">Release 3.5.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 December 2014.
+	</li>
+	<li>
+	For OS X Cocoa switch C++ runtime to libc++ to enable use of features that will never
+	be added to libstdc++ including those part of C++11.
+	Scintilla will now run only on OS X 10.7 or later and only in 64-bit mode.
+	</li>
+	<li>
+	Include support for using C++11 &lt;regex&gt; for regular expression searches.
+	Enabling this requires rebuilding Scintilla with a non-default option.
+	This is a provisional feature and may change API before being made permanent.
+	</li>
+	<li>
+	Allocate indicators used for Input Method Editors after 31 which was the previous limit of indicators to
+	ensure no clash between the use of indicators for IME and for the application.
+	</li>
+	<li>
+	ANNOTATION_INDENTED added which is similar to ANNOTATION_BOXED in terms of positioning
+	but does not show a border.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1086/">Feature #1086.</a>
+	</li>
+	<li>
+	Allow platform overrides for drawing tab arrows, wrap markers, and line markers.
+	Size of double click detection area is a variable.
+	These enable better visuals and behaviour for PLAT_CURSES as it is character cell based.
+	</li>
+	<li>
+	CoffeeScript lexer fixes "/*" to not be a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1420/">Bug #1420</a>.
+	</li>
+	<li>
+	VHDL folder fixes "block" keyword.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1664/">Bug #1664</a>.
+	</li>
+	<li>
+	Prevent caret blinking when holding down Delete key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1657/">Bug #1657</a>.
+	</li>
+	<li>
+	On Windows, allow right click selection in popup menu.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1080/">Feature #1080.</a>
+	</li>
+	<li>
+	On Windows, only call ShowCaret in GDI mode as it interferes with caret drawing when using Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1643/">Bug #1643</a>.
+	</li>
+	<li>
+	On Windows, another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITEDC added
+	which may avoid drawing failures in some circumstances by drawing into a GDI DC.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows, avoid processing mouse move events where the mouse has not moved as these can
+	cause unexpected dwell start notifications.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1670/">Bug #1670</a>.
+	</li>
+	<li>
+	For GTK+ on Windows, avoid extra space when pasting from external application.
+	</li>
+	<li>
+	On GTK+ 2.x allow Scintilla to be used inside tool tips by changing when preedit window created.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1662/">Bug #1662</a>.
+	</li>
+	<li>
+	Support MinGW compilation under Linux.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1077/">Feature #1077.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 September 2014.
+	</li>
+	<li>
+	BibTeX lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1071/">Feature #1071.</a>
+	</li>
+	<li>
+	SQL lexer supports the q-quote operator as SCE_SQL_QOPERATOR(24).
+	</li>
+	<li>
+	VHDL lexer supports block comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1527/">Bug #1527</a>.
+	</li>
+	<li>
+	VHDL folder fixes case where "component" used before name.
+	<a href="https://sourceforge.net/p/scintilla/bugs/613/">Bug #613</a>.
+	</li>
+	<li>
+	Restore fractional pixel tab positioning which was truncated to whole pixels in 3.5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1652/">Bug #1652</a>.
+	</li>
+	<li>
+	Allow choice between windowed and inline IME on some platforms.
+	</li>
+	<li>
+	On GTK+ cache autocomplete window to avoid platform bug where windows
+	were sometimes lost.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1649/">Bug #1649</a>.
+	</li>
+	<li>
+	On GTK+ size autocomplete window more accurately.
+	</li>
+	<li>
+	On Windows only unregister windows classes registered.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1639/">Bug #1639</a>.
+	</li>
+	<li>
+	On Windows another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITERETAIN added
+	which may avoid drawing failures on some cards and drivers.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows support the Visual Studio 2010+ clipboard format that indicates a line copy.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1636/">Bug #1636</a>.
+	</li>
+	<li>
+	SciTE session files remember the scroll position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite350.zip?download">Release 3.5.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 August 2014.
+	</li>
+	<li>
+	Text may share space vertically so that extreme ascenders and descenders are
+	not cut off by calling SCI_SETPHASESDRAW(SC_PHASES_MULTIPLE).
+	</li>
+	<li>
+	Separate timers are used for each type of periodic activity and they are turned on and off
+	as required. This saves power as there are fewer wake ups.
+	On recent releases of OS X Cocoa and Windows, coalescing timers are used to further
+	save power.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1086/">Bug #1086</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1532/">Bug #1532</a>.
+	</li>
+	<li>
+	Explicit tab stops may be set for each line.
+	</li>
+	<li>
+	On Windows and GTK+, when using Korean input methods, IME composition is moved from a
+	separate window into the Scintilla window.
+	</li>
+	<li>
+	SciTE adds a "Clean" command to the "Tools" menu which is meant to be bound to a command like
+	"make clean".
+	</li>
+	<li>
+	Lexer added for Windows registry files.
+	</li>
+	<li>
+	HTML lexer fixes a crash with SGML after a Mako comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1622/">Bug #1622</a>.
+	</li>
+	<li>
+	KiXtart lexer adds a block comment state.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1053/">Feature #1053.</a>
+	</li>
+	<li>
+	Matlab lexer fixes transpose operations like "X{1}'".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1629/">Bug #1629</a>.
+	</li>
+	<li>
+	Ruby lexer fixes bugs with the syntax of symbols including allowing a symbol to end with '?'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1627/">Bug #1627</a>.
+	</li>
+	<li>
+	Rust lexer supports byte string literals, naked CR can be escaped in strings, and files starting with
+	"#![" are not treated as starting with a hashbang comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1063/">Feature #1063.</a>
+	</li>
+	<li>
+	Bug fixed where style data was stale when deleting a rectangular selection.
+	</li>
+	<li>
+	Bug fixed where annotations disappeared when SCI_CLEARDOCUMENTSTYLE called.
+	</li>
+	<li>
+	Bug fixed where selection not redrawn after SCI_DELWORDRIGHT.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1633/">Bug #1633</a>.
+	</li>
+	<li>
+	Change the function prototypes to be complete for functions exported as "C".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1618/">Bug #1618</a>.
+	</li>
+	<li>
+	Fix a memory leak on GTK+ with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1638/">Bug #1638</a>.
+	</li>
+	<li>
+	On GTK+, use the full character width for the overstrike caret for multibyte characters.
+	</li>
+	<li>
+	On Qt, set list icon size to largest icon. Add padding on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1634/">Bug #1634</a>.
+	</li>
+	<li>
+	On Qt, fix building on FreeBSD 9.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1635/">Bug #1635</a>.
+	</li>
+	<li>
+	On Qt, add a get_character method on the document.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1064/">Feature #1064.</a>
+	</li>
+	<li>
+	On Qt, add SCI_* for methods to ScintillaConstants.py.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1065/">Feature #1065.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed with Insert Abbreviation command.
+	</li>
+	<li>
+	For SciTE with read-only files and are.you.sure=0 reenable choice to save to another
+	location when using Save or Close commands.
+	</li>
+	<li>
+	Fix SciTE bug where toggle bookmark did not work after multiple lines with bookmarks merged.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1617/">Bug #1617</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite344.zip?download">Release 3.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 July 2014.
+	</li>
+	<li>
+	Style byte indicators removed. They were deprecated in 2007. Standard indicators should be used instead.
+	Some elements used by lexers no longer take number of bits or mask arguments so lexers may need to be
+	updated for LexAccessor::StartAt,  LexAccessor::SetFlags (removed),  LexerModule::LexerModule.
+	</li>
+	<li>
+	When multiple selections are active, autocompletion text may be inserted at each selection with new
+	SCI_AUTOCSETMULTI method.
+	</li>
+	<li>
+	C++ lexer fixes crash for "#define x(".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1614/">Bug #1614</a>.
+	</li>
+	<li>
+	C++ lexer fixes raw string recognition so that R"xxx(blah)xxx" is styled as SCE_C_STRINGRAW.
+	</li>
+	<li>
+	The Postscript lexer no longer marks token edges with indicators as this used style byte indicators.
+	</li>
+	<li>
+	The Scriptol lexer no longer displays indicators for poor indentation as this used style byte indicators.
+	</li>
+	<li>
+	TCL lexer fixes names of keyword sets.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1615/">Bug #1615</a>.
+	</li>
+	<li>
+	Shell lexer fixes fold matching problem caused by "&lt;&lt;&lt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1605/">Bug #1605</a>.
+	</li>
+	<li>
+	Fix bug where indicators were not removed when fold highlighting on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1604/">Bug #1604</a>.
+	</li>
+	<li>
+	Fix bug on Cocoa where emoji were treated as being zero width.
+	</li>
+	<li>
+	Fix crash on GTK+ with Ubuntu 12.04 and overlay scroll bars.
+	</li>
+	<li>
+	Avoid creating a Cairo context when measuring text on GTK+ as future versions of GTK+
+	may prohibit calling gdk_cairo_create except inside drawing handlers. This prohibition may
+	be required on Wayland.
+	</li>
+	<li>
+	On Cocoa, the registerNotifyCallback method is now marked as deprecated so client code that
+	uses it will display an error message.
+	Client code should use the delegate mechanism or subclassing instead.
+	The method will be removed in the next version.
+	</li>
+	<li>
+	On Cocoa, package Scintilla more in compliance with platform conventions.
+	Only publish public headers in the framework headers directory.
+	Only define the Scintilla namespace in Scintilla.h when compiling as C++.
+	Use the Cocoa NS_ENUM and NS_OPTIONS macros for exposed enumerations.
+	Hide internal methods from public headers.
+	These changes are aimed towards publishing Scintilla as a module which will allow it to
+	be used from the Swift programming language, although more changes will be needed here.
+	</li>
+	<li>
+	Fix crash in SciTE when stream comment performed at line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1610/">Bug #1610</a>.
+	</li>
+	<li>
+	For SciTE on Windows, display error message when common dialogs fail.
+	<a href="https://sourceforge.net/p/scintilla/bugs/156/">Bug #156</a>.
+	</li>
+	<li>
+	For SciTE on GTK+ fix bug with initialization of toggle buttons in find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1612/">Bug #1612</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 May 2014.
+	</li>
+	<li>
+	Fix hangs and crashes in DLL at shutdown on Windows when using Direct2D.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite342.zip?download">Release 3.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2014.
+	</li>
+	<li>
+	Insertions can be filtered or modified by calling SCI_CHANGEINSERTION inside a handler for
+	SC_MOD_INSERTCHECK.
+	</li>
+	<li>
+	DMIS lexer added. DMIS is a language for coordinate measuring machines.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1049/">Feature #1049.</a>
+	</li>
+	<li>
+	Line state may be displayed in the line number margin to aid in debugging lexing and folding with
+	SC_FOLDFLAG_LINESTATE (128).
+	</li>
+	<li>
+	C++ lexer understands more preprocessor statements. #if defined SYMBOL is understood.
+	Some macros with arguments can be understood and these may be predefined in keyword set 4
+	(keywords5 for SciTE)
+	with syntax similar to CHECKVERSION(x)=(x&lt;3).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1051/">Feature #1051.</a>
+	</li>
+	<li>
+	C++ lexer can highlight task marker keywords in comments as SCE_C_TASKMARKER.
+	</li>
+	<li>
+	C++ lexer can optionally highlight escape sequences in strings as SCE_C_ESCAPESEQUENCE.
+	</li>
+	<li>
+	C++ lexer supports Go back quoted raw string literals with lexer.cpp.backquoted.strings option.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1047/">Feature #1047.</a>
+	</li>
+	<li>
+	SciTE performs word and search match highlighting as an idle task to improve interactivity
+	and allow use of these features on large files.
+	</li>
+	<li>
+	Bug fixed on Cocoa where previous caret lines were visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1593/">Bug #1593</a>.
+	</li>
+	<li>
+	Bug fixed where caret remained invisible when period set to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1592/">Bug #1592</a>.
+	</li>
+	<li>
+	Fixed display flashing when scrolling with GTK+ 3.10.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1567/">Bug #1567</a>.
+	</li>
+	<li>
+	Fixed calls and constants deprecated in GTK+ 3.10.
+	</li>
+	<li>
+	Fixed bug on Windows where WM_GETTEXT did not provide data in UTF-16 for Unicode window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/685/">Bug #685</a>.
+	</li>
+	<li>
+	For SciTE, protect access to variables used by threads with a mutex to prevent data races.
+	</li>
+	<li>
+	For SciTE on GTK+ fix thread object leaks.
+	Display the version of GTK+ compiled against in the about box.
+	</li>
+	<li>
+	For SciTE on GTK+ 3.10, fix the size of the tab bar's content and use
+	freedesktop.org standard icon names where possible.
+	</li>
+	<li>
+	For SciTE on Windows, fix bug where invoking help resubmitted the
+	running program.
+	<a href="https://sourceforge.net/p/scintilla/bugs/272/">Bug #272</a>.
+	</li>
+	<li>
+	SciTE's highlight current word feature no longer matches the selection when it contains space.
+	</li>
+	<li>
+	For building SciTE in Visual C++, the win\SciTE.vcxproj project file should be used.
+	The boundscheck directory and its project and solution files have been removed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite341.zip?download">Release 3.4.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 April 2014.
+	</li>
+	<li>
+	Display Unicode line ends as [LS], [PS], and [NEL] blobs.
+	</li>
+	<li>
+	Bug fixed where cursor down failed on wrapped lines.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1585/">Bug #1585</a>.
+	</li>
+	<li>
+	Caret positioning changed a little to appear inside characters less often by
+	rounding the caret position to the pixel grid instead of truncating.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1588/">Bug #1588</a>.
+	</li>
+	<li>
+	Bug fixed where automatic indentation wrong when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1586/">Bug #1586</a>.
+	</li>
+	<li>
+	Bug fixed on Windows where WM_LBUTTONDBLCLK was no longer sent to window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1587/">Bug #1587</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE on Windows XP where black stripes appeared inside the find and
+	replace strips.
+	</li>
+	<li>
+	Crash fixed in SciTE with recursive properties files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1507/">Bug #1507</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE where Ctrl+E before an unmatched end brace jumps to file start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/315/">Bug #315</a>.
+	</li>
+	<li>
+	Fixed scrolling on Cocoa to avoid display glitches and be smoother.
+	</li>
+	<li>
+	Fixed crash on Cocoa when character composition used when autocompletion list active.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite340.zip?download">Release 3.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 March 2014.
+	</li>
+	<li>
+	The Unicode line ends and substyles features added as provisional in 3.2.5 are now finalized.
+	There are now no provisional features.
+	</li>
+	<li>
+	Added wrap mode SC_WRAP_WHITESPACE which only wraps on whitespace, not on style changes.
+	</li>
+	<li>
+	SciTE find and replace strips can perform incremental searching and temporary highlighting of all
+	matches with the find.strip.incremental, replace.strip.incremental, and find.indicator.incremental settings.
+	</li>
+	<li>
+	SciTE default settings changed to use strips for find and replace and to draw with Direct2D and
+	DirectWrite on Windows.
+	</li>
+	<li>
+	SciTE on Windows scales image buttons on the find and replace strips to match the current system scale factor.
+	</li>
+	<li>
+	Additional assembler lexer variant As(SCLEX_AS) for Unix assembly code which uses '#' for comments and
+	';' to separate statements.
+	</li>
+	<li>
+	Fix Coffeescript lexer for keyword style extending past end of word.
+	Also fixes styling 0...myArray.length all as a number.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1583/">Bug #1583</a>.
+	</li>
+	<li>
+	Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs.
+	</li>
+	<li>
+	Deleting a whole line deletes the annotations on that line instead of the annotations on the next line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1577/">Bug #1577</a>.
+	</li>
+	<li>
+	Changed position of tall calltips to prefer lower half of screen to cut off end instead of start.
+	</li>
+	<li>
+	Fix Qt bug where double click treated as triple click.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	On Qt, selecting an item in an autocompletion list that is not currently visible positions it at the top.
+	</li>
+	<li>
+	Fix bug on Windows when resizing autocompletion list with only short strings caused the list to move.
+	</li>
+	<li>
+	On Cocoa reduce scrollable height by one line to fix bugs with moving caret
+	up or down.
+	</li>
+	<li>
+	On Cocoa fix calltips which did not appear when they were created in an off-screen position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite339.zip?download">Release 3.3.9</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 January 2014.
+	</li>
+	<li>
+	Fix 3.3.8 bug where external lexers became inaccessible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1574/">Bug #1574</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite338.zip?download">Release 3.3.8</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2014.
+	</li>
+	<li>
+	DropSelectionN API added to drop a selection from a multiple selection.
+	</li>
+	<li>
+	CallTipSetPosStart API added to change the position at which backspacing removes the calltip.
+	</li>
+	<li>
+	SC_MARK_BOOKMARK marker symbol added which looks like bookmark ribbons used in
+	book reading applications.
+	</li>
+	<li>
+	Basic lexer highlights hex, octal, and binary numbers in FreeBASIC which use the prefixes
+	&amp;h, &amp;o and &amp;b respectively.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1041/">Feature #1041.</a>
+	</li>
+	<li>
+	C++ lexer fixes bug where keyword followed immediately by quoted string continued
+	keyword style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1564/">Bug #1564</a>.
+	</li>
+	<li>
+	Matlab lexer treats '!' differently for Matlab and Octave languages.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1571/">Bug #1571</a>.
+	</li>
+	<li>
+	Rust lexer improved with nested comments, more compliant doc-comment detection,
+	octal literals, NUL characters treated as valid, and highlighting of raw string literals and float literals fixed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1038/">Feature #1038.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1570/">Bug #1570</a>.
+	</li>
+	<li>
+	On Qt expose the EOLMode on the document object.
+	</li>
+	<li>
+	Fix hotspot clicking where area was off by half a character width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1562/">Bug #1562</a>.
+	</li>
+	<li>
+	Tweaked scroll positioning by either 2 pixels or 1 pixel when caret is at left or right of view
+	to ensure caret is inside visible area.
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for Shift+Tab inside text.
+	</li>
+	<li>
+	On Windows update the system caret position when scrolling to help screen readers
+	see the scroll quickly.
+	</li>
+	<li>
+	On Cocoa, GTK+, and Windows/Direct2D draw circles more accurately so that
+	circular folding margin markers appear circular, of consistent size, and centred.
+	Make SC_MARK_ARROWS drawing more even.
+	Fix corners of SC_MARK_ROUNDRECT with Direct2D to be similar to other platforms.
+	</li>
+	<li>
+	SciTE uses a bookmark ribbon symbol for bookmarks as it scales better to higher resolutions
+	than the previous blue gem bitmap.
+	</li>
+	<li>
+	SciTE will change the width of margins while running when the margin.width and fold.margin.width
+	properties are changed.
+	</li>
+	<li>
+	SciTE on Windows can display a larger tool bar with the toolbar.large property.
+	</li>
+	<li>
+	SciTE displays a warning message when asked to open a directory.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1568/">Bug #1568</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 December 2013.
+	</li>
+	<li>
+	Lexer added for DMAP language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1026/">Feature #1026.</a>
+	</li>
+	<li>
+	Basic lexer supports multiline comments in FreeBASIC.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1023/">Feature #1023.</a>
+	</li>
+	<li>
+	Bash lexer allows '#' inside words..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1553/">Bug #1553</a>.
+	</li>
+	<li>
+	C++ lexer recognizes C++11 user-defined literals and applies lexical class SCE_C_USERLITERAL.
+	</li>
+	<li>
+	C++ lexer allows single quote characters as digit separators in numeric literals like 123'456 as this is
+	included in C++14.
+	</li>
+	<li>
+	C++ lexer fixes bug with #include statements without " or &gt; terminating filename.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>.
+	</li>
+	<li>
+	C++ lexer fixes split of Doxygen keywords @code{.fileExtension} and @param[in,out].
+	<a href="https://sourceforge.net/p/scintilla/bugs/1551/">Bug #1551</a>.
+	</li>
+	<li>
+	C++ lexer styles Doxygen keywords at end of document.
+	</li>
+	<li>
+	Cmake lexer fixes bug with empty comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1550/">Bug #1550</a>.
+	</li>
+	<li>
+	Fortran folder improved. Treats "else" as fold header.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/962/">Feature #962.</a>
+	</li>
+	<li>
+	Fix bug with adjacent instances of the same indicator with different values where only the first was drawn.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1560/">Bug #1560</a>.
+	</li>
+	<li>
+	For DirectWrite, use the GDI ClearType gamma value for SC_EFF_QUALITY_LCD_OPTIMIZED as
+	this results in text that is similar in colour intensity to GDI.
+	For the duller default DirectWrite ClearType text appearance, use SC_EFF_QUALITY_DEFAULT.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/887/">Feature #887.</a>
+	</li>
+	<li>
+	Fix another problem with drawing on Windows with Direct2D when returning from lock screen.
+	The whole window is redrawn as just redrawing the initially required area left other areas black.
+	</li>
+	<li>
+	When scroll width is tracked, take width of annotation lines into account.
+	</li>
+	<li>
+	For Cocoa on OS X 10.9, responsive scrolling is supported.
+	</li>
+	<li>
+	On Cocoa, apply font quality setting to line numbers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1544/">Bug #1544</a>.
+	</li>
+	<li>
+	On Cocoa, clicking in margin now sets focus.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
+	</li>
+	<li>
+	On Cocoa, correct cursor displayed in margin after showing dialog.
+	</li>
+	<li>
+	On Cocoa, multipaste mode now works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
+	</li>
+	<li>
+	On GTK+, chain up to superclass finalize so that all finalization is performed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1549/">Bug #1549</a>.
+	</li>
+	<li>
+	On GTK+, fix horizontal scroll bar range to not be double the needed width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1546/">Bug #1546</a>.
+	</li>
+	<li>
+	On OS X GTK+, report control key as SCI_META for mouse down events.
+	</li>
+	<li>
+	On Qt, bug fixed with drawing of scrollbars, where previous contents were not drawn over with some
+	themes.
+	</li>
+	<li>
+	On Qt, bug fixed with finding monitor rectangle which could lead to autocomplete showing at wrong location.
+	</li>
+	<li>
+	SciTE fix for multiple message boxes when failing to save a file with save.on.deactivate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1540/">Bug #1540</a>.
+	</li>
+	<li>
+	SciTE on GTK+ fixes SIGCHLD handling so that Lua scripts can determine the exit status of processes
+	they start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1557/">Bug #1557</a>.
+	</li>
+	<li>
+	SciTE on Windows XP fixes bad display of find and replace values when using strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 October 2013.
+	</li>
+	<li>
+	Added functions to help convert between substyles and base styles and between secondary and primary styles.
+	SCI_GETSTYLEFROMSUBSTYLE finds the base style of substyles.
+	Can be used to treat all substyles of a style equivalent to that style.
+	SCI_GETPRIMARYSTYLEFROMSTYLE finds the primary style of secondary styles.
+	StyleFromSubStyle and PrimaryStyleFromStyle methods were added to ILexerWithSubStyles so each lexer can implement these.
+	</li>
+	<li>
+	Lexer added for Rust language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1024/">Feature #1024.</a>
+	</li>
+	<li>
+	Avoid false matches in errorlist lexer which is used for the SciTE output pane
+	by stricter checking of ctags lines.
+	</li>
+	<li>
+	Perl lexer fixes bugs with multi-byte characters, including in HEREDOCs and PODs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1528/">Bug #1528</a>.
+	</li>
+	<li>
+	SQL folder folds 'create view' statements.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1020/">Feature #1020.</a>
+	</li>
+	<li>
+	Visual Prolog lexer updated with better support for string literals and Unicode.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1025/">Feature #1025.</a>
+	</li>
+	<li>
+	For SCI_SETIDENTIFIERS, \t, \r, and \n are allowed as well as space between identifiers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1521/">Bug #1521</a>.
+	</li>
+	<li>
+	Gaining and losing focus is now reported as a notification with the code set to SCN_FOCUSIN
+	or SCN_FOCUSOUT.
+	This allows clients to uniformly use notifications instead of commands.
+	Since there is no longer a need for commands they will be deprecated in a future version.
+	Clients should switch any code that currently uses SCEN_SETFOCUS or SCEN_KILLFOCUS.
+	</li>
+	<li>
+	On Cocoa, clients should use the delegate mechanism or subclass ScintillaView in preference
+	to registerNotifyCallback: which will be deprecated in the future.
+	</li>
+	<li>
+	On Cocoa, the ScintillaView.h header hides internal implementation details from Platform.h and ScintillaCocoa.h.
+	InnerView was renamed to SCIContentView and MarginView was renamed to SCIMarginView.
+	dealloc removed from @interface.
+	</li>
+	<li>
+	On Cocoa, clients may customize SCIContentView by subclassing both SCIContentView and ScintillaView
+	and implementing the contentViewClass class method on the ScintillaView subclass to return the class of
+	the SCIContentView subclass.
+	</li>
+	<li>
+	On Cocoa, fixed appearance of alpha rectangles to use specified alpha and colour for outline as well as corner size.
+	This makes INDIC_STRAIGHTBOX and INDIC_ROUNDBOX look correct.
+	</li>
+	<li>
+	On Cocoa, memory leak fixed for MarginView.
+	</li>
+	<li>
+	On Cocoa, make drag and drop work when destination view is empty.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1534/">Bug #1534</a>.
+	</li>
+	<li>
+	On Cocoa, drag image fixed when view scrolled.
+	</li>
+	<li>
+	On Cocoa, SCI_POSITIONFROMPOINTCLOSE fixed when view scrolled.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1021/">Feature #1021.</a>
+	</li>
+	<li>
+	On Cocoa, don't send selection change notification when scrolling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1522/">Bug #1522</a>.
+	</li>
+	<li>
+	On Qt, turn off idle events on destruction to prevent repeatedly calling idle.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit changed to use signed first parameter.
+	</li>
+	<li>
+	Compilation errors fixed on Windows and GTK+ with SCI_NAMESPACE.
+	</li>
+	<li>
+	On Windows, building with gcc will check if Direct2D headers are available and enable Direct2D if they are.
+	</li>
+	<li>
+	Avoid attempts to redraw empty areas when lexing beyond the currently visible lines.
+	</li>
+	<li>
+	Control more attributes of indicators in SciTE with find.mark.indicator and highlight.current.word.indicator
+	properties.
+	</li>
+	<li>
+	Fix SciTE bug with buffers becoming read-only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1525/">Bug #1525</a>.
+	</li>
+	<li>
+	Fix linking SciTE on non-Linux Unix systems with GNU toolchain by linking to libdl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1523/">Bug #1523</a>.
+	</li>
+	<li>
+	On Windows, SciTE's Incremental Search displays match failures by changing the background colour
+	instead of not adding the character that caused failure.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.x incremental search to change foreground colour when no match as
+	changing background colour is difficult.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite335.zip?download">Release 3.3.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2013.
+	</li>
+	<li>
+	Characters may be represented by strings.
+	In Unicode mode C1 control characters are represented by their mnemonics.
+	</li>
+	<li>
+	Added SCI_POSITIONRELATIVE to optimize navigation by character.
+	</li>
+	<li>
+	Option to allow mouse selection to switch to rectangular by pressing Alt after start of gesture.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Lexer added for KVIrc script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1008/">Feature #1008.</a>
+	</li>
+	<li>
+	Bash lexer fixed quoted HereDoc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1500/">Bug #1500</a>.
+	</li>
+	<li>
+	MS SQL lexer fixed ';' to appear as an operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1509/">Bug #1509</a>.
+	</li>
+	<li>
+	Structured Text lexer fixed styling of enumeration members.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1508/">Bug #1508</a>.
+	</li>
+	<li>
+	Fixed bug with horizontal caret position when margin changed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1512/">Bug #1512</a>.
+	</li>
+	<li>
+	Fixed bug on Cocoa where coordinates were relative to text subview instead of whole view.
+	</li>
+	<li>
+	Ensure selection redrawn correctly in two cases.
+	When switching from stream to rectangular selection with Alt+Shift+Up.
+	When reducing the range of an additional selection by moving mouse up.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Copy and paste of rectangular selections compatible with Borland Delphi IDE on Windows.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1002/">Feature #1002.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1513/">Bug #1513</a>.
+	</li>
+	<li>
+	Initialize extended styles to the default style.
+	</li>
+	<li>
+	On Windows, fix painting on an explicit HDC when first paint attempt abandoned.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit made to work on 64-bit Unix systems.
+	</li>
+	<li>
+	Easier access to printing on Qt with formatRange method.
+	</li>
+	<li>
+	Fixed SciTE failure to save initial buffer in single buffer mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339</a>.
+	</li>
+	<li>
+	Fixed compilation problem with Visual C++ in non-English locales.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1506/">Bug #1506</a>.
+	</li>
+	<li>
+	Disable Direct2D when compiling with MinGW gcc on Windows because of changes in the recent MinGW release.
+	</li>
+	<li>
+	SciTE crash fixed for negative line.margin.width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1504/">Bug #1504</a>.
+	</li>
+	<li>
+	SciTE fix for infinite dialog boxes when failing to automatically save a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1503/">Bug #1503</a>.
+	</li>
+	<li>
+	SciTE settings buffered.draw, two.phase.draw, and technology are applied to the
+	output pane as well as the edit pane.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite334.zip?download">Release 3.3.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 July 2013.
+	</li>
+	<li>
+	Handling of UTF-8 and DBCS text in lexers improved with methods ForwardBytes and
+	GetRelativeCharacter added to StyleContext.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	For Unicode text, case-insensitive searching and making text upper or lower case is now
+	compliant with Unicode standards on all platforms and is much faster for non-ASCII characters.
+	</li>
+	<li>
+	A CategoriseCharacter function was added to return the Unicode general category of a character
+	which can be useful in lexers.
+	</li>
+	<li>
+	On Cocoa, the LCD Optimized font quality level turns font smoothing on.
+	</li>
+	<li>
+	SciTE 'immediate' subsystem added to allow scripts that work while tools are executed.
+	</li>
+	<li>
+	Font quality exposed in SciTE as font.quality setting.
+	</li>
+	<li>
+	On Cocoa, message:... methods simplify direct access to Scintilla and avoid call layers..
+	</li>
+	<li>
+	A68K lexer updated.
+	</li>
+	<li>
+	CoffeeScript lexer fixes a bug with comment blocks.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1495/">Bug #1495</a>
+	</li>
+	<li>
+	ECL lexer regular expression code fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1491/">Bug #1491</a>.
+	</li>
+	<li>
+	errorlist lexer only recognizes Perl diagnostics when there is a filename between
+	"at" and "line". Had been triggering for MSVC errors containing "at line".
+	</li>
+	<li>
+	Haskell lexer fixed to avoid unnecessary full redraws.
+	Don't highlight CPP inside comments when styling.within.preprocessor is on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459</a>.
+	</li>
+	<li>
+	Lua lexer fixes bug in labels with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Perl lexer fixes bug in string interpolation with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Fixed bugs with case conversion when the result was longer or shorter than the original text.
+	Could access past end of string potentially crashing.
+	Selection now updated to result length.
+	</li>
+	<li>
+	Fixed bug where data being inserted and removed was not being reported in
+	notification messages. Bug was introduced in 3.3.2.
+	</li>
+	<li>
+	Word wrap bug fixed where the last line could be shown twice.
+	</li>
+	<li>
+	Word wrap bug fixed for lines wrapping too short on Windows and GTK+.
+	</li>
+	<li>
+	Word wrap performance improved.
+	</li>
+	<li>
+	Minor memory leak fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1487/">Bug #1487</a>.
+	</li>
+	<li>
+	On Cocoa, fixed insertText: method which was broken when implementing a newer protocol.
+	</li>
+	<li>
+	On Cocoa, fixed a crash when performing string folding for bytes that do not represent a character
+	in the current encoding.
+	</li>
+	<li>
+	On Qt, fixed layout problem when QApplication construction delayed.
+	</li>
+	<li>
+	On Qt, find_text reports failure with -1 as first element of return value.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where a tool command could be performed using the keyboard while one was
+	already running leading to confusion and crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1486/">Bug #1486</a>.
+	</li>
+	<li>
+	Fixed SciTE bug in Copy as RTF which was limited to first 32 styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1011/">Bug #1011</a>.
+	</li>
+	<li>
+	Fixed SciTE on Windows user strip height when the system text scaling factor is 125% or 150%.
+	</li>
+	<li>
+	Compile time checks for Digital Mars C++ removed.
+	</li>
+	<li>
+	Visual C++ 2013 supported.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1492/">Bug #1492</a>.
+	</li>
+	<li>
+	Python scripts used for building and maintenance improved and moved into scripts directory.
+	</li>
+	<li>
+	Testing scripts now work on Linux using Qt and PySide.
+	</li>
+	<li>
+	Tk platform defined.
+	Implementation for Tk will be available separately from main Scintilla distribution.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite333.zip?download">Release 3.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2013.
+	</li>
+	<li>
+	Lexer and folder added for Structured Text language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/959/">Feature #959.</a>
+	</li>
+	<li>
+	Out of bounds access fixed for GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1480/">Bug #1480</a>.
+	</li>
+	<li>
+	Crash fixed for GTK+ on Windows paste.
+	</li>
+	<li>
+	Bug fixed with incorrect event copying on GTK+ 3.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1481/">Bug #1481</a>.
+	</li>
+	<li>
+	Bug fixed with right to left locales, like Hebrew, on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1477/">Bug #1477</a>.
+	</li>
+	<li>
+	Bug fixed with undo grouping of tab and backtab commands.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1478/">Bug #1478</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite332.zip?download">Release 3.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2013.
+	</li>
+	<li>
+	Basic implementations of common folding methods added to Scintilla to make it
+	easier for containers to implement folding.
+	</li>
+	<li>
+	Add indicator INDIC_COMPOSITIONTHICK, a thick low underline, to mimic an
+	appearance used for Asian language input composition.
+	</li>
+	<li>
+	On Cocoa, implement font quality setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/988/">Feature #988.</a>
+	</li>
+	<li>
+	On Cocoa, implement automatic enabling of commands and added clear command.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/987/">Feature #987.</a>
+	</li>
+	<li>
+	C++ lexer adds style for preprocessor doc comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/990/">Feature #990.</a>
+	</li>
+	<li>
+	Haskell lexer and folder improved. Separate mode for literate Haskell "literatehaskell" SCLEX_LITERATEHASKELL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459 </a>.
+	</li>
+	<li>
+	LaTeX lexer bug fixed for Unicode character following '\'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1468/">Bug #1468 </a>.
+	</li>
+	<li>
+	PowerShell lexer recognizes here strings and doccomment keywords.
+	#region folding added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/985/">Feature #985.</a>
+	</li>
+	<li>
+	Fix multi-typing when two carets are located in virtual space on one line so that spaces
+	are preserved.
+	</li>
+	<li>
+	Fixes to input composition on Cocoa and implementation of accented character input through
+	press and hold. Set selection correctly so that changes to pieces of composition text are easier to perform.
+	Restore undo collection after a sequence of composition actions.
+	Composition popups appear near input.
+	</li>
+	<li>
+	Fix lexer problem where no line end was seen at end of document.
+	</li>
+	<li>
+	Fix crash on Cocoa when view deallocated.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1466/">Bug #1466</a>.
+	</li>
+	<li>
+	Fix Qt window positioning to not assume the top right of a monitor is at 0, 0.
+	</li>
+	<li>
+	Fix Qt to not track mouse when widget is hidden.
+	</li>
+	<li>
+	Qt now supports Qt 5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1448/">Bug #1448</a>.
+	</li>
+	<li>
+	Fix drawing on Windows with Direct2D when returning from lock screen.
+	The render target had to be recreated and an area would be black since the drawing was not retried.
+	</li>
+	<li>
+	Fix display of DBCS documents on Windows Direct2D/DirectWrite with default character set.
+	</li>
+	<li>
+	For SciTE on Windows, fixed most-recently-used menu when files opened through check.if.already.opened.
+	</li>
+	<li>
+	In SciTE, do not call OnSave twice when files saved asynchronously.
+	</li>
+	<li>
+	Scintilla no longer builds with Visual C++ 6.0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite331.zip?download">Release 3.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 April 2013.
+	</li>
+	<li>
+	Autocompletion lists can now appear in priority order or be sorted by Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/981/">Feature #981.</a>
+	</li>
+	<li>
+	Most lexers now lex an extra NUL byte at the end of the
+	document which makes it more likely they will classify keywords at document end correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/588/">Bug #588.</a>
+	</li>
+	<li>
+	Haskell lexer improved in several ways.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459.</a>
+	</li>
+	<li>
+	Matlab/Octave lexer recognizes block comments and ... comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1414/">Bug #1414.</a>
+	</li>
+	<li>
+	Ruby lexer crash fixed with keyword at start of document.
+	</li>
+	<li>
+	The PLAT_NCURSES platform now called PLAT_CURSES as may work on other implementations.
+	</li>
+	<li>
+	Bug on Cocoa fixed where input composition with multiple selection or virtual space selection
+	could make undo stop working.
+	</li>
+	<li>
+	Direct2D/DirectWrite mode on Windows now displays documents in non-Latin1 8-bit encodings correctly.
+	</li>
+	<li>
+	Character positioning corrected in Direct2D/DirectWrite mode on Windows to avoid text moving and cutting off
+	lower parts of characters.
+	</li>
+	<li>
+	Position of calltip and autocompletion lists fixed on Cocoa.
+	</li>
+	<li>
+	While regular expression search in DBCS text is still not working, matching partial characters is now avoided
+	by moving end of match to end of character.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite330.zip?download">Release 3.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 March 2013.
+	</li>
+	<li>
+	Overlay scrollers and kinetic scrolling implemented on Cocoa.
+	</li>
+	<li>
+	To improve display smoothness, styling and UI Update notifications will, when possible, be performed in
+	a high-priority idle task on Cocoa instead of during painting.
+	Performing these jobs inside painting can cause paints to be abandoned and a new paint scheduled.
+	On GTK+, the high-priority idle task is used in more cases.
+	</li>
+	<li>
+	SCI_SCROLLRANGE added to scroll the view to display a range of text.
+	If the whole range can not be displayed, priority is given to one end.
+	</li>
+	<li>
+	C++ lexer no longer recognizes raw (R"") strings when the first character after "
+	is invalid.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1454/">Bug #1454.</a>
+	</li>
+	<li>
+	HTML lexer recognizes JavaScript RegEx literals in more contexts.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1412/">Bug #1412.</a>
+	</li>
+	<li>
+	Fixed automatic display of folded text when return pressed at end of fold header and
+	first folded line was blank.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1455/">Bug #1455.</a>
+	</li>
+	<li>
+	SCI_VISIBLEFROMDOCLINE fixed to never return a line beyond the document end.
+	</li>
+	<li>
+	SCI_LINESCROLL fixed for a negative column offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1450/">Bug #1450.</a>
+	</li>
+	<li>
+	On GTK+, fix tab markers so visible if indent markers are visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1453/">Bug #1453.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite325.zip?download">Release 3.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 February 2013.
+	</li>
+	<li>
+	To allow cooperation between different uses of extended (beyond 255) styles they should be allocated
+	using SCI_ALLOCATEEXTENDEDSTYLES.
+	</li>
+	<li>
+	For Unicode documents, lexers that use StyleContext will retrieve whole characters
+	instead of bytes.
+	LexAccessor provides a LineEnd method which can be a more efficient way to
+	handle line ends and can enable Unicode line ends.
+	</li>
+	<li>
+	The C++ lexer understands the #undef directive when determining preprocessor definitions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/978/">Feature #978.</a>
+	</li>
+	<li>
+	The errorlist lexer recognizes gcc include path diagnostics that appear before an error.
+	</li>
+	<li>
+	Folding implemented for GetText (PO)  translation language.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1437/">Bug #1437.</a>
+	</li>
+	<li>
+	HTML lexer does not interrupt comment style for processing instructions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1447/">Bug #1447.</a>
+	</li>
+	<li>
+	Fix SciTE forgetting caret x-position when switching documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1442/">Bug #1442.</a>
+	</li>
+	<li>
+	Fixed bug where vertical scrollbar thumb appeared at beginning of document when
+	scrollbar shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1446/">Bug #1446.</a>
+	</li>
+	<li>
+	Fixed brace-highlighting bug on OS X 10.8 where matching brace is on a different line.
+	</li>
+	<li>
+	<a href="ScintillaDoc.html#ProvisionalMessages">Provisional features</a>
+	are new features that may change or be removed if they cause problems but should become
+	permanent if they work well.
+	For this release <a href="ScintillaDoc.html#SCI_GETLINEENDTYPESSUPPORTED">Unicode line ends</a> and
+	<a href="ScintillaDoc.html#Substyles">substyles</a>
+	are provisional features.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite324.zip?download">Release 3.2.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 January 2013.
+	</li>
+	<li>
+	Caret line highlight can optionally remain visible when window does not have focus.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/964/">Feature #964.</a>
+	</li>
+	<li>
+	Delegate mechanism for notifications added on Cocoa.
+	</li>
+	<li>
+	NUL characters in selection are copied to clipboard as spaces to avoid truncating
+	at the NUL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1289/">Bug #1289.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with showing inactive sections when preprocessor lines contain trailing comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1413/">Bug #1413.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with JavaScript regular expressions with '/' in character ranges.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1415/">Bug #1415.</a>
+	</li>
+	<li>
+	LaTeX folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	LaTeX lexer improves styling of math environments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	MySQL lexer implements hidden commands.
+	</li>
+	<li>
+	Only produce a single undo step when autocompleting a single word.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1421/">Bug #1421.</a>
+	</li>
+	<li>
+	Fixed crash when printing lines longer than 8000 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1430/">Bug #1430.</a>
+	</li>
+	<li>
+	Fixed problem in character movement extends selection mode where reversing
+	direction collapsed the selection.
+	</li>
+	<li>
+	Memory issues fixed on Cocoa, involving object ownership,
+	lifetime of timers, and images held by the info bar.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1436/">Bug #1436.</a>
+	</li>
+	<li>
+	Cocoa key binding for Alt+Delete changed to delete previous word to be more compatible with
+	platform standards.
+	</li>
+	<li>
+	Fixed crash on Cocoa with scrollbar when there is no scrolling possible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1416/">Bug #1416.</a>
+	</li>
+	<li>
+	On Cocoa with retina display fixed positioning of autocompletion lists.
+	</li>
+	<li>
+	Fixed SciTE on Windows failure to run a batch file with a name containing a space by
+	quoting the path in the properties file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1423/">Bug #1423.</a>
+	</li>
+	<li>
+	Fixed scaling bug when printing on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1427/">Bug #1427.</a>
+	</li>
+	<li>
+	SciTE on GTK toolbar.detachable feature removed.
+	</li>
+	<li>
+	Fixed some background saving bugs in SciTE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1366/">Bug #1366.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite323.zip?download">Release 3.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 October 2012.
+	</li>
+	<li>
+	Improve speed when performing multiple searches.
+	</li>
+	<li>
+	SciTE adds definition of PLAT_UNIX for both PLAT_GTK and PLAT_MAC to allow consolidation of
+	settings valid on all Unix variants.
+	</li>
+	<li>
+	Signal autoCompleteCancelled added on Qt.
+	</li>
+	<li>
+	Bash lexer supports nested delimiter pairs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3569352&group_id=2439">Feature #3569352.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1515556&group_id=2439">Bug #1515556.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3008483&group_id=2439">Bug #3008483.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515392&group_id=2439">Bug #3515392.</a>
+	</li>
+	<li>
+	For C/C++, recognize exponent in floating point hexadecimal literals.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3576454&group_id=2439">Bug #3576454.</a>
+	</li>
+	<li>
+	For C #include statements, do not treat // in the path as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519260&group_id=2439">Bug #3519260.</a>
+	</li>
+	<li>
+	Lexer for GetText translations (PO) improved with additional styles and single instance limitation fixed.
+	</li>
+	<li>
+	Ruby for loop folding fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3240902&group_id=2439">Bug #3240902.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567391&group_id=2439">Bug #3567391.</a>
+	</li>
+	<li>
+	Ruby recognition of here-doc after class or instance variable fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567809&group_id=2439">Bug #3567809.</a>
+	</li>
+	<li>
+	SQL folding of loop and case fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567905&group_id=2439">Bug #3567905.</a>
+	</li>
+	<li>
+	SQL folding of case with assignment fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3571820&group_id=2439">Bug #3571820.</a>
+	</li>
+	<li>
+	Fix hang when removing all characters from indicator at end of document.
+	</li>
+	<li>
+	Fix failure of \xhh in regular expression search for values greater than 0x79.
+	</li>
+	<li>
+	On Cocoa on OS X 10.8, fix inverted drawing of find indicator.
+	</li>
+	<li>
+	On Cocoa, fix double drawing when horizontal scroll range small and user swipes horizontally.
+	</li>
+	<li>
+	On Cocoa, remove incorrect setting of save point when reading information through 'string' and 'selectedString'.
+	</li>
+	<li>
+	On Cocoa, fix incorrect memory management of infoBar.
+	</li>
+	<li>
+	On GTK+ 3 Ubuntu, fix crash when drawing margin.
+	</li>
+	<li>
+	On ncurses, fix excessive spacing with italics line end.
+	</li>
+	<li>
+	On Windows, search for D2D1.DLL and DWRITE.DLL in system directory to avoid loading from earlier
+	in path where could be planted by malware.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite322.zip?download">Release 3.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2012.
+	</li>
+	<li>
+	Retina display support for Cocoa. Text size fixed.
+	Scale factor for images implemented so they can be displayed in high definition.
+	</li>
+	<li>
+	Implement INDIC_SQUIGGLEPIXMAP as a faster version of INDIC_SQUIGGLE.
+	Avoid poor drawing at right of INDIC_SQUIGGLE.
+	Align INDIC_DOTBOX to pixel grid for full intensity.
+	</li>
+	<li>
+	Implement SCI_GETSELECTIONEMPTY API.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Added SCI_VCHOMEDISPLAY and SCI_VCHOMEDISPLAYEXTEND key commands.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3561433&group_id=2439">Feature #3561433.</a>
+	</li>
+	<li>
+	Allow specifying SciTE Find in Files directory with find.in.directory property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3558594&group_id=2439">Feature #3558594.</a>
+	</li>
+	<li>
+	Override SciTE global strip.trailing.spaces with strip.trailing.spaces by pattern files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3556320&group_id=2439">Feature #3556320.</a>
+	</li>
+	<li>
+	Fix long XML script tag handling in XML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3534190&group_id=2439">Bug #3534190.</a>
+	</li>
+	<li>
+	Fix rectangular selection range after backspace.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543097&group_id=2439">Bug #3543097.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for backspace in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Avoid problems when calltip highlight range is negative.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	On Cocoa, fix image drawing code so that image is not accessed after being freed
+	and is drawn in the correct location.
+	</li>
+	<li>
+	On Cocoa, limit horizontal touch scrolling to existing established width.
+	</li>
+	<li>
+	On Cocoa, decrease sensitivity of pinch-zoom.
+	</li>
+	<li>
+	Fix Cocoa drawing where style changes were not immediately visible.
+	</li>
+	<li>
+	Fix Cocoa memory leak due to reference cycle.
+	</li>
+	<li>
+	Fix Cocoa bug where notifications were sent after Scintilla was freed.
+	</li>
+	<li>
+	SciTE on OS X user shortcuts treats "Ctrl+D" as equivalent to "Ctrl+d".
+	</li>
+	<li>
+	On Windows, saving SciTE's Lua startup script causes it to run.
+	</li>
+	<li>
+	Limit time allowed to highlight current word in SciTE to 0.25 seconds to remain responsive.
+	</li>
+	<li>
+	Fixed SciTE read-only mode to stick with buffer.
+	</li>
+	<li>
+	For SciTE on Windows, enable Ctrl+Z, Ctrl+X, and Ctrl+C (Undo, Cut, and Copy) in the
+	editable fields of find and replace strips
+	</li>
+	<li>
+	Remove limit on logical line length in SciTE .properties files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3544312&group_id=2439">Bug #3544312.</a>
+	</li>
+	<li>
+	Improve performance of SciTE Save As command.
+	</li>
+	<li>
+	Fix SciTE crash with empty .properties files. Bug #3545938.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3555308&group_id=2439">Bug #3555308.</a>
+	</li>
+	<li>
+	Fix repeated letter in SciTE calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	Refine build time checking for Direct2D and DirectWrite.
+	</li>
+	<li>
+	Avoid potential build problems on Windows with MultiMon.h by explicitly checking for multi-monitor APIs.
+	</li>
+	<li>
+	Automatically disable themed drawing in SciTE when building on Windows 2000.
+	Reenable building for Windows NT 4 on NT 4 .
+	</li>
+	<li>
+	Added ncurses platform definitions. Implementation is maintained separately as
+	<a href="https://orbitalquark.github.io/scinterm">Scinterm</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite321.zip?download">Release 3.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 July 2012.
+	</li>
+	<li>
+	In Scintilla.iface, specify features as properties instead of functions where possible and fix some enumerations.
+	</li>
+	<li>
+	In SciTE Lua scripts, string properties in Scintilla API can be retrieved as well as set using property notation.
+	</li>
+	<li>
+	Added character class APIs: SCI_SETPUNCTUATIONCHARS, SCI_GETWORDCHARS, SCI_GETWHITESPACECHARS,
+	and SCI_GETPUNCTUATIONCHARS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3529805&group_id=2439">Feature #3529805.</a>
+	</li>
+	<li>
+	Less/Hss support added to CSS lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3532413&group_id=2439">Feature #3532413.</a>
+	</li>
+	<li>
+	C++ lexer style SCE_C_PREPROCESSORCOMMENT added for stream comments in preprocessor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487406&group_id=2439">Bug #3487406.</a>
+	</li>
+	<li>
+	Fix incorrect styling of inactive code in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3533036&group_id=2439">Bug #3533036.</a>
+	</li>
+	<li>
+	Fix incorrect styling by C++ lexer after empty lines in preprocessor style.
+	</li>
+	<li>
+	C++ lexer option "lexer.cpp.allow.dollars" fixed so can be turned off after being on.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3541461&group_id=2439">Bug #3541461.</a>
+	</li>
+	<li>
+	Fortran fixed format lexer fixed to style comments from column 73.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran folder folds CRITICAL .. END CRITICAL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran lexer fixes styling after comment line ending with '&amp;'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3087226&group_id=2439">Bug #3087226.</a>
+	</li>
+	<li>
+	Fortran lexer styles preprocessor lines so they do not trigger incorrect folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2906275&group_id=2439">Bug #2906275.</a>
+	</li>
+	<li>
+	Fortran folder fixes folding of nested ifs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809176&group_id=2439">Bug #2809176.</a>
+	</li>
+	<li>
+	HTML folder fixes folding of CDATA when fold.html.preprocessor=0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540491&group_id=2439">Bug #3540491.</a>
+	</li>
+	<li>
+	On Cocoa, fix autocompletion font lifetime issue and row height computation.
+	</li>
+	<li>
+	In 'choose single' mode, autocompletion will close an existing list if asked to display a single entry list.
+	</li>
+	<li>
+	Fixed SCI_MARKERDELETE to only delete one marker per call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3535806&group_id=2439">Bug #3535806.</a>
+	</li>
+	<li>
+	Properly position caret after undoing coalesced delete operations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3523326&group_id=2439">Bug #3523326.</a>
+	</li>
+	<li>
+	Ensure margin is redrawn when SCI_MARGINSETSTYLE called.
+	</li>
+	<li>
+	Fix clicks in first pixel of margins to send SCN_MARGINCLICK.
+	</li>
+	<li>
+	Fix infinite loop when drawing block caret for a zero width space character at document start.
+	</li>
+	<li>
+	Crash fixed for deleting negative range.
+	</li>
+	<li>
+	For characters that overlap the beginning of their space such as italics descenders and bold serifs, allow start
+	of text to draw 1 pixel into margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=699587&group_id=2439">Bug #699587.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537799&group_id=2439">Bug #3537799.</a>
+	</li>
+	<li>
+	Fixed problems compiling Scintilla for Qt with GCC 4.7.1 x64.
+	</li>
+	<li>
+	Fixed problem with determining GTK+ sub-platform caused when adding Qt support in 3.2.0.
+	</li>
+	<li>
+	Fix incorrect measurement of untitled file in SciTE on Linux leading to message "File ...' is 2147483647 bytes long".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537764&group_id=2439">Bug #3537764.</a>
+	</li>
+	<li>
+	In SciTE, fix open of selected filename with line number to go to that line.
+	</li>
+	<li>
+	Fix problem with last visible buffer closing in SciTE causing invisible buffers to be active.
+	</li>
+	<li>
+	Avoid blinking of SciTE's current word highlight when output pane changes.
+	</li>
+	<li>
+	SciTE properties files can be longer than 60K.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite320.zip?download">Release 3.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2012.
+	</li>
+	<li>
+	Platform layer added for the Qt open-source cross-platform application and user interface framework
+	for development in C++ or in Python with the PySide bindings for Qt.
+	</li>
+	<li>
+	Direct access provided to the document bytes for ranges within Scintilla.
+	This is similar to the existing SCI_GETCHARACTERPOINTER API but allows for better performance.
+	</li>
+	<li>
+	Ctrl+Double Click and Ctrl+Triple Click add the word or line to the set of selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3520037&group_id=2439">Feature #3520037.</a>
+	</li>
+	<li>
+	A SCI_DELETERANGE API was added for deleting a range of text.
+	</li>
+	<li>
+	Line wrap markers may now be drawn in the line number margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3518198&group_id=2439">Feature #3518198.</a>
+	</li>
+	<li>
+	SciTE on OS X adds option to hide hidden files in the open dialog box.
+	</li>
+	<li>
+	Lexer added for OScript language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523197&group_id=2439">Feature #3523197.</a>
+	</li>
+	<li>
+	Lexer added for Visual Prolog language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523018&group_id=2439">Feature #3523018.</a>
+	</li>
+	<li>
+	UTF-8 validity is checked more stringently and consistently. All 66 non-characters are now treated as invalid.
+	</li>
+	<li>
+	HTML lexer bug fixed with inconsistent highlighting for PHP when attribute on separate line from tag.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520027&group_id=2439">Bug #3520027.</a>
+	</li>
+	<li>
+	HTML lexer bug fixed for JavaScript block comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520032&group_id=2439">Bug #3520032.</a>
+	</li>
+	<li>
+	Annotation drawing bug fixed when box displayed with different colours on different lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519872&group_id=2439">Bug #3519872.</a>
+	</li>
+	<li>
+	On Windows with Direct2D, fix drawing with 125% and 150% DPI system settings.
+	</li>
+	<li>
+	Virtual space selection bug fixed for rectangular selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519246&group_id=2439">Bug #3519246.</a>
+	</li>
+	<li>
+	Replacing multiple selection with newline changed to only affect main selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522251&group_id=2439">Bug #3522251.</a>
+	</li>
+	<li>
+	Replacing selection with newline changed to group deletion and insertion as a single undo action.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522250&group_id=2439">Bug #3522250.</a>
+	</li>
+	<li>
+	Auto-completion lists on GTK+ 3 set height correctly instead of showing too few lines.
+	</li>
+	<li>
+	Mouse wheel scrolling changed to avoid GTK+ bug in recent distributions.
+	</li>
+	<li>
+	IME bug on Windows fixed for horizontal jump.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3529728&group_id=2439">Bug #3529728.</a>
+	</li>
+	<li>
+	SciTE case-insensitive autocompletion filters equal identifiers better.
+	Calltip arrows work with bare word identifiers.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3517810&group_id=2439">Bug #3517810.</a>
+	</li>
+	<li>
+	SciTE bug fixed where shbang lines not setting file type when switching
+	to file loaded in background.
+	</li>
+	<li>
+	SciTE on GTK+ shows open and save dialogs with the directory of the current file displayed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite310.zip?download">Release 3.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 April 2012.
+	</li>
+	<li>
+	Animated find indicator added on Cocoa.
+	</li>
+	<li>
+	Buttons can be made default in SciTE user strips.
+	</li>
+	<li>
+	SciTE allows find and replace histories to be saved in session.
+	</li>
+	<li>
+	Option added to allow case-insensitive selection in auto-completion lists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3516538&group_id=2439">Bug #3516538.</a>
+	</li>
+	<li>
+	Replace \0 by complete found text in regular expressions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3510979&group_id=2439">Feature #3510979.</a>
+	</li>
+	<li>
+	Fixed single quoted strings in bash lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	</li>
+	<li>
+	Incorrect highlighting fixed in C++ lexer for continued lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3509317&group_id=2439">Bug #3509317.</a>
+	</li>
+	<li>
+	Hang fixed in diff lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3508602&group_id=2439">Bug #3508602.</a>
+	</li>
+	<li>
+	Folding improved for SQL CASE/MERGE statement.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3503277&group_id=2439">Bug #3503277.</a>
+	</li>
+	<li>
+	Fix extra drawing of selection inside word wrap indentation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515555&group_id=2439">Bug #3515555.</a>
+	</li>
+	<li>
+	Fix problem with determining the last line that needs styling when drawing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix problems with drawing in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix printing crash when using Direct2D to display on-screen.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3513946&group_id=2439">Bug #3513946.</a>
+	</li>
+	<li>
+	Fix SciTE bug where background.*.size disabled restoration of bookmarks and positions from session.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514885&group_id=2439">Bug #3514885.</a>
+	</li>
+	<li>
+	Fixed the Move Selected Lines command when last line does not end with a line end character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3511023&group_id=2439">Bug #3511023.</a>
+	</li>
+	<li>
+	Fix word wrap indentation printing to use printer settings instead of screen settings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512961&group_id=2439">Bug #3512961.</a>
+	</li>
+	<li>
+	Fix SciTE bug where executing an empty command prevented executing further commands
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512976&group_id=2439">Bug #3512976.</a>
+	</li>
+	<li>
+	Fix SciTE bugs with focus in user strips and made strips more robust with invalid definitions.
+	</li>
+	<li>
+	Suppress SciTE regular expression option when searching with find next selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3510985&group_id=2439">Bug #3510985.</a>
+	</li>
+	<li>
+	SciTE Find in Files command matches empty pattern to all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495918&group_id=2439">Feature #3495918.</a>
+	</li>
+	<li>
+	Fix scroll with mouse wheel on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3501321&group_id=2439">Bug #3501321.</a>
+	</li>
+	<li>
+	Fix column finding method so that tab is counted correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3483713&group_id=2439">Bug #3483713.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite304.zip?download">Release 3.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2012.
+	</li>
+	<li>
+	SciTE scripts can create user interfaces as strips.
+	</li>
+	<li>
+	SciTE can save files automatically in the background.
+	</li>
+	<li>
+	Pinch zoom implemented on Cocoa.
+	</li>
+	<li>
+	ECL lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488209&group_id=2439">Feature #3488209.</a>
+	</li>
+	<li>
+	CPP lexer fixes styling after document comment keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495445&group_id=2439">Bug #3495445.</a>
+	</li>
+	<li>
+	Pascal folder improves handling of some constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486385&group_id=2439">Feature #3486385.</a>
+	</li>
+	<li>
+	XML lexer avoids entering a bad mode due to complex preprocessor instructions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488060&group_id=2439">Bug #3488060.</a>
+	</li>
+	<li>
+	Duplicate command is always remembered as a distinct command for undo.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495836&group_id=2439">Bug #3495836.</a>
+	</li>
+	<li>
+	SciTE xml.auto.close.tags no longer closes with PHP code similar to &lt;a $this-&gt;
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488067&group_id=2439">Bug #3488067.</a>
+	</li>
+	<li>
+	Fix bug where setting an indicator for the whole document would fail.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487440&group_id=2439">Bug #3487440.</a>
+	</li>
+	<li>
+	Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3496403&group_id=2439">Bug #3496403.</a>
+	</li>
+	<li>
+	Differences between buffered and unbuffered mode on Direct2D eliminated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495791&group_id=2439">Bug #3495791.</a>
+	</li>
+	<li>
+	Font leading implemented for Direct2D to improve display of character blobs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494744&group_id=2439">Bug #3494744.</a>
+	</li>
+	<li>
+	Fractional widths used for line numbers, character markers and other situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	Translucent rectangles drawn using Direct2D with sharper corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	RGBA markers drawn sharper when centred using Direct2D.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494202&group_id=2439">Bug #3494202.</a>
+	</li>
+	<li>
+	RGBA markers are drawn centred when taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494184&group_id=2439">Bug #3494184.</a>
+	</li>
+	<li>
+	Image marker drawing problem fixed for markers taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3493503&group_id=2439">Bug #3493503.</a>
+	</li>
+	<li>
+	Markers are drawn horizontally off-centre based on margin type instead of dimensions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488696&group_id=2439">Bug #3488696.</a>
+	</li>
+	<li>
+	Fold tail markers drawn vertically centred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488289&group_id=2439">Feature #3488289.</a>
+	</li>
+	<li>
+	On Windows, Scintilla is more responsive in wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487397&group_id=2439">Bug #3487397.</a>
+	</li>
+	<li>
+	Unimportant "Gdk-CRITICAL" messages are no longer displayed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488481&group_id=2439">Bug #3488481.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480635&group_id=2439">Bug #3480635.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3486657&group_id=2439">Bug #3486657.</a>
+	</li>
+	<li>
+	Fixed problems with multiple clicks in margin and with mouse actions combined with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484370&group_id=2439">Bug #3484370.</a>
+	</li>
+	<li>
+	Fixed bug with using page up and down and not returning to original line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3485669&group_id=2439">Bug #3485669.</a>
+	</li>
+	<li>
+	Down arrow with wrapped text no longer skips lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1776560&group_id=2439">Bug #1776560.</a>
+	</li>
+	<li>
+	Fix problem with dwell ending immediately due to word wrap.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484416&group_id=2439">Bug #3484416.</a>
+	</li>
+	<li>
+	Wrapped lines are rewrapped more consistently while resizing window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484179&group_id=2439">Bug #3484179.</a>
+	</li>
+	<li>
+	Selected line ends are highlighted more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484330&group_id=2439">Bug #3484330.</a>
+	</li>
+	<li>
+	Fix grey background on files that use shbang to choose language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3482777&group_id=2439">Bug #3482777.</a>
+	</li>
+	<li>
+	Fix failure messages from empty commands in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480645&group_id=2439">Bug #3480645.</a>
+	</li>
+	<li>
+	Redrawing reduced for some marker calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3493530&group_id=2439">Feature #3493530.</a>
+	</li>
+	<li>
+	Match brace and select brace commands work in SciTE output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486598&group_id=2439">Feature #3486598.</a>
+	</li>
+	<li>
+	Performing SciTE "Show Calltip" command when a calltip is already visible shows the next calltip.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3487017&group_id=2439">Feature #3487017.</a>
+	</li>
+	<li>
+	SciTE allows saving file even when file unchanged.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486654&group_id=2439">Feature #3486654.</a>
+	</li>
+	<li>
+	SciTE allows optional use of character escapes in calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495239&group_id=2439">Feature #3495239.</a>
+	</li>
+	<li>
+	SciTE can open file:// URLs with Ctrl+Shift+O.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495389&group_id=2439">Feature #3495389.</a>
+	</li>
+	<li>
+	Key modifiers updated for GTK+ on OS X to match upstream changes.
+	</li>
+	<li>
+	SciTE hang when marking all occurrences of regular expressions fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite303.zip?download">Release 3.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2012.
+	</li>
+	<li>
+	Printing works on GTK+ version 2.x as well as 3.x.
+	</li>
+	<li>
+	Lexer added for the AviSynth language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3475611&group_id=2439">Feature #3475611.</a>
+	</li>
+	<li>
+	Lexer added for the Take Command / TCC scripting language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3462462&group_id=2439">Feature #3462462.</a>
+	</li>
+	<li>
+	CSS lexer gains support for SCSS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3268017&group_id=2439">Feature #3268017.</a>
+	</li>
+	<li>
+	CPP lexer fixes problems in the preprocessor structure caused by continuation lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3458508&group_id=2439">Bug #3458508.</a>
+	</li>
+	<li>
+	Errorlist lexer handles column numbers for GCC format diagnostics.
+	In SciTE, Next Message goes to column where this can be decoded from GCC format diagnostics.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3453075&group_id=2439">Feature #3453075.</a>
+	</li>
+	<li>
+	HTML folder fixes spurious folds on some tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459262&group_id=2439">Bug #3459262.</a>
+	</li>
+	<li>
+	Ruby lexer fixes bug where '=' at start of file caused whole file to appear as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3452488&group_id=2439">Bug #3452488.</a>
+	</li>
+	<li>
+	SQL folder folds blocks of single line comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3467425&group_id=2439">Feature #3467425.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, defer invalidation of render target until completion of painting to avoid failures.
+	</li>
+	<li>
+	Further support of fractional positioning. Spaces, tabs, and single character tokens can take fractional space
+	and wrapped lines are positioned taking fractional positions into account.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, fix extra carets appearing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	For autocompletion lists Page Up and Down move by the list height instead of by 5 lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3455493&group_id=2439">Bug #3455493.</a>
+	</li>
+	<li>
+	For SCI_LINESCROLLDOWN/UP don't select into virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3451681&group_id=2439">Bug #3451681.</a>
+	</li>
+	<li>
+	Fix fold highlight not being fully drawn.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469936&group_id=2439">Bug #3469936.</a>
+	</li>
+	<li>
+	Fix selection margin appearing black when starting in wrap mode.
+	</li>
+	<li>
+	Fix crash when changing end of document after adding an annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476637&group_id=2439">Bug #3476637.</a>
+	</li>
+	<li>
+	Fix problems with building to make RPMs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476149&group_id=2439">Bug #3476149.</a>
+	</li>
+	<li>
+	Fix problem with building on GTK+ where recent distributions could not find gmodule.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469056&group_id=2439">Bug #3469056.</a>
+	</li>
+	<li>
+	Fix problem with installing SciTE on GTK+ due to icon definition in .desktop file including an extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476117&group_id=2439">Bug #3476117.</a>
+	</li>
+	<li>
+	Fix SciTE bug where new buffers inherited some properties from previously opened file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3457060&group_id=2439">Bug #3457060.</a>
+	</li>
+	<li>
+	Fix focus when closing tab in SciTE with middle click. Focus moves to edit pane instead of staying on tab bar.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix bug where Open Selected Filename for URL would append a file extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3459185&group_id=2439">Feature #3459185.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix key handling of control characters in Parameters dialog so normal editing (Ctrl+C, ...) works.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459345&group_id=2439">Bug #3459345.</a>
+	</li>
+	<li>
+	Fix SciTE bug where files became read-only after saving. Drop the "*" dirty marker after save completes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467432&group_id=2439">Bug #3467432.</a>
+	</li>
+	<li>
+	For SciTE handling of diffs with "+++" and "---" lines, also handle case where not followed by tab.
+	Go to correct line for diff "+++" message.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467143&group_id=2439">Bug #3467143.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467178&group_id=2439">Bug #3467178.</a>
+	</li>
+	<li>
+	SciTE on GTK+ now performs threaded actions even on GTK+ versions before 2.12.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite302.zip?download">Release 3.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 December 2011.
+	</li>
+	<li>
+	SciTE saves files in the background without blocking the user interface.
+	</li>
+	<li>
+	Printing implemented in SciTE on GTK+ 3.x.
+	</li>
+	<li>
+	ILoader interface for background loading finalized and documented.
+	</li>
+	<li>
+	CoffeeScript lexer added.
+	</li>
+	<li>
+	C++ lexer fixes crash with "#if defined( XXX 1".
+	</li>
+	<li>
+	Crash with Direct2D on Windows fixed.
+	</li>
+	<li>
+	Backspace removing protected range fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3445911&group_id=2439">Bug #3445911.</a>
+	</li>
+	<li>
+	Cursor setting failure on Windows when screen saver on fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3438780&group_id=2439">Bug #3438780.</a>
+	</li>
+	<li>
+	SciTE on GTK+ hang fixed with -open:file option.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441980&group_id=2439">Bug #3441980.</a>
+	</li>
+	<li>
+	Failure to evaluate shbang fixed in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441801&group_id=2439">Bug #3441801.</a>
+	</li>
+	<li>
+	SciTE failure to treat files starting with "&lt;?xml" as XML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440718&group_id=2439">Bug #3440718.</a>
+	</li>
+	<li>
+	Made untitled tab saveable when created by closing all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440244&group_id=2439">Bug #3440244.</a>
+	</li>
+	<li>
+	SciTE crash fixed when using Scintillua.
+	</li>
+	<li>
+	SciTE revert command fixed so that undo works on individual actions instead of undoing to revert point.
+	</li>
+	<li>
+	Focus loss in SciTE when opening a recent file fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	Fixed SciTE SelLength property to measure characters instead of bytes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283519&group_id=2439">Bug #3283519.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite301.zip?download">Release 3.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 November 2011.
+	</li>
+	<li>
+	SciTE on Windows now runs Lua scripts directly on the main thread instead of starting them on a
+	secondary thread and then moving back to the main thread.
+	</li>
+	<li>
+	Highlight "else" as a keyword for TCL in the same way as other languages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1836954&group_id=2439">Bug #1836954.</a>
+	</li>
+	<li>
+	Fix problems with setting fonts for autocompletion lists on Windows where
+	font handles were copied and later deleted causing a system default font to be used.
+	</li>
+	<li>
+	Fix font size used on Windows for Asian language input methods which sometimes led to IME not being visible.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3436753&group_id=2439">Bug #3436753.</a>
+	</li>
+	<li>
+	Fixed polygon drawing on Windows so fold symbols are visible again.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433558&group_id=2439">Bug #3433558.</a>
+	</li>
+	<li>
+	Changed background drawing on GTK+ to allow for fractional character positioning as occurs on OS X
+	as this avoids faint lines at lexeme boundaries.
+	</li>
+	<li>
+	Ensure pixmaps allocated before painting as there was a crash when Scintilla drew without common initialization calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3432354&group_id=2439">Bug #3432354.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows bug causing wrong caret position after indenting a selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433433&group_id=2439">Bug #3433433.</a>
+	</li>
+	<li>
+	Fixed SciTE session saving to store buffer position matching buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3434372&group_id=2439">Bug #3434372.</a>
+	</li>
+	<li>
+	Fixed leak of document objects in SciTE.
+	</li>
+	<li>
+	Recognize URL characters '?' and '%' for Open Selected command in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3429409&group_id=2439">Bug #3429409.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite300.zip?download">Release 3.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 November 2011.
+	</li>
+	<li>
+	Carbon platform support removed. OS X applications should switch to Cocoa.
+	</li>
+	<li>
+	On Windows Vista or newer, drawing may be performed with Direct2D and DirectWrite instead of GDI.
+	</li>
+	<li>
+	Cairo is now used for all drawing on GTK+. GDK drawing was removed.
+	</li>
+	<li>
+	Paletted display support removed.
+	</li>
+	<li>
+	Fractional font sizes can be specified.
+	</li>
+	<li>
+	Different weights of text supported on some platforms instead of just normal and bold.
+	</li>
+	<li>
+	Sub-pixel character positioning supported.
+	</li>
+	<li>
+	SciTE loads files in the background without blocking the user interface.
+	</li>
+	<li>
+	SciTE can display diagnostic messages interleaved with the text of files immediately after the
+	line referred to by the diagnostic.
+	</li>
+	<li>
+	New API to see if all lines are visible which can be used to optimize processing fold structure notifications.
+	</li>
+	<li>
+	Scrolling optimized by avoiding invalidation of fold margin when redrawing whole window.
+	</li>
+	<li>
+	Optimized SCI_MARKERNEXT.
+	</li>
+	<li>
+	C++ lexer supports Pike hash quoted strings when turned on with lexer.cpp.hashquoted.strings.
+	</li>
+	<li>
+	Fixed incorrect line height with annotations in wrapped mode when there are multiple views.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388159&group_id=2439">Bug #3388159.</a>
+	</li>
+	<li>
+	Calltips may be displayed above the text as well as below.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3410830&group_id=2439">Bug #3410830.</a>
+	</li>
+	<li>
+	For huge files SciTE only examines the first megabyte for newline discovery.
+	</li>
+	<li>
+	SciTE on GTK+ removes the fileselector.show.hidden property and check box as this was buggy and GTK+ now
+	supports an equivalent feature.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3413630&group_id=2439">Bug #3413630.</a>
+	</li>
+	<li>
+	SciTE on GTK+ supports mnemonics in dynamic menus.
+	</li>
+	<li>
+	SciTE on GTK+ displays the user's home directory as '~' in menus to make them shorter.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite229.zip?download">Release 2.29</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 September 2011.
+	</li>
+	<li>
+	To automatically discover the encoding of a file when opening it, SciTE can run a program set with command.discover.properties.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3324341&group_id=2439">Feature #3324341.</a>
+	</li>
+	<li>
+	Cairo always used for drawing on GTK+.
+	</li>
+	<li>
+	The set of properties files imported by SciTE can be controlled with the properties imports.include and imports.exclude.
+	The import statement has been extended to allow "import *".
+	The properties files for some languages are no longer automatically loaded by default. The properties files affected are
+	avenue, baan, escript, lot, metapost, and mmixal.
+	</li>
+	<li>
+	C++ lexer fixed a bug with raw strings being recognized too easily.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388122&group_id=2439">Bug #3388122.</a>
+	</li>
+	<li>
+	LaTeX lexer improved with more states and fixes to most outstanding bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1493111&group_id=2439">Bug #1493111.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1856356&group_id=2439">Bug #1856356.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081692&group_id=2439">Bug #3081692.</a>
+	</li>
+	<li>
+	Lua lexer updates for Lua 5.2 beta with goto labels and "\z" string escape.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3386330&group_id=2439">Feature #3386330.</a>
+	</li>
+	<li>
+	Perl string styling highlights interpolated variables.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3394258&group_id=2439">Feature #3394258.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3076629&group_id=2439">Bug #3076629.</a>
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.14.0 with 0X and 0B numeric literal prefixes, break keyword and "+" supported in subroutine prototypes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3388802&group_id=2439">Feature #3388802.</a>
+	</li>
+	<li>
+	Perl bug fixed with CRLF line endings.
+	</li>
+	<li>
+	Markdown lexer fixed to not change state with "_" in middle of word.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3398184&group_id=2439">Bug #3398184.</a>
+	</li>
+	<li>
+	Cocoa restores compatibility with OS X 10.5.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow near start when scrolled horizontally.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3389055&group_id=2439">Bug #3389055.</a>
+	</li>
+	<li>
+	Indicators that finish at the end of the document no longer expand when text is appended.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3378718&group_id=2439">Bug #3378718.</a>
+	</li>
+	<li>
+	SparseState merge fixed to check if other range is empty.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3387053&group_id=2439">Bug #3387053.</a>
+	</li>
+	<li>
+	On Windows, autocompletion lists will scroll instead of document when mouse wheel spun.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3403600&group_id=2439">Feature #3403600.</a>
+	</li>
+	<li>
+	SciTE performs more rapid polling for command completion so will return faster and report more accurate times.
+	</li>
+	<li>
+	SciTE resizes panes proportionally when switched between horizontal and vertical layout.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3376784&group_id=2439">Feature #3376784.</a>
+	</li>
+	<li>
+	SciTE on GTK+ opens multiple files into a single instance more reliably.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3363754&group_id=2439">Bug #3363754.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite228.zip?download">Release 2.28</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 August 2011.
+	</li>
+	<li>
+	GTK+ Cairo support works back to GTK+ version 2.8. Requires changing Scintilla source code to enable before GTK+ 2.22.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3322351&group_id=2439">Bug #3322351.</a>
+	</li>
+	<li>
+	Translucent images in RGBA format can be used for margin markers and in autocompletion lists.
+	</li>
+	<li>
+	INDIC_DOTBOX added as a translucent dotted rectangular indicator.
+	</li>
+	<li>
+	Asian text input using IME works for GTK+ 3.x and GTK+ 2.x with Cairo.
+	</li>
+	<li>
+	On GTK+, IME works for Ctrl+Shift+U Unicode input in Scintilla. For SciTE, Ctrl+Shift+U is still Make Selection Uppercase.
+	</li>
+	<li>
+	Key bindings for GTK+ on OS X made compatible with Cocoa port and platform conventions.
+	</li>
+	<li>
+	Cocoa port supports different character encodings, improves scrolling performance and drag image appearance.
+	The control ID is included in WM_COMMAND notifications. Text may be deleted by dragging to the trash.
+	ScrollToStart and ScrollToEnd key commands added to simplify implementation of standard OS X Home and End
+	behaviour.
+	</li>
+	<li>
+	SciTE on GTK+ uses a paned widget to contain the edit and output panes instead of custom code.
+	This allows the divider to be moved easily on GTK+ 3 and its appearance follows GTK+ conventions more closely.
+	</li>
+	<li>
+	SciTE builds and installs on BSD.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324644&group_id=2439">Bug #3324644.</a>
+	</li>
+	<li>
+	Cobol supports fixed format comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3014850&group_id=2439">Bug #3014850.</a>
+	</li>
+	<li>
+	Mako template language block syntax extended and ## comments recognized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3325178&group_id=2439">Feature #3325178.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3318818&group_id=2439">Bug #3318818.</a>
+	</li>
+	<li>
+	Folding of Mako template language within HTML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324563&group_id=2439">Bug #3324563.</a>
+	</li>
+	<li>
+	Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of
+	keywords following '.'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3325333&group_id=2439">Bug #3325333.</a>
+	</li>
+	<li>
+	Python folder fixes bug where fold would not extend to final line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3349157&group_id=2439">Bug #3349157.</a>
+	</li>
+	<li>
+	SciTE treats LPEG lexers the same as script lexers by setting all 8 style bits.
+	</li>
+	<li>
+	For Cocoa, crashes with unsupported font variants and memory leaks for colour objects fixed.
+	</li>
+	<li>
+	Shift-JIS lead byte ranges modified to match Windows.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315756&group_id=2439">Bug #3315756.</a>
+	</li>
+	<li>
+	Bug fixed with annotations beyond end of document.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3347268&group_id=2439">Bug #3347268.</a>
+	</li>
+	<li>
+	Incorrect drawing fixed for combination of background colour change and translucent selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377116&group_id=2439">Bug #3377116.</a>
+	</li>
+	<li>
+	Lexers initialized correctly when started at position other than start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377148&group_id=2439">Bug #3377148.</a>
+	</li>
+	<li>
+	Fold highlight drawing fixed for some situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323015&group_id=2439">Bug #3323015.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323805&group_id=2439">Bug #3323805.</a>
+	</li>
+	<li>
+	Case insensitive search fixed for cases where folded character uses fewer bytes than base character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3362038&group_id=2439">Bug #3362038.</a>
+	</li>
+	<li>
+	SciTE bookmark.alpha setting fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3373907&group_id=2439">Bug #3373907.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite227.zip?download">Release 2.27</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2011.
+	</li>
+	<li>
+	On recent GTK+ 2.x versions when using Cairo, bug fixed where wrong colours were drawn.
+	</li>
+	<li>
+	SciTE on GTK+ slow performance in menu maintenance fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315233&group_id=2439">Bug #3315233.</a>
+	</li>
+	<li>
+	Cocoa platform supports 64-bit builds and uses only non-deprecated APIs.
+	Asian Input Method Editors are supported.
+	Autocompletion lists and calltips implemented.
+	Control identifier used in notifications.
+	</li>
+	<li>
+	On Cocoa, rectangular selection now uses Option/Alt key to be compatible with Apple Human
+	Interface Guidelines and other applications.
+	The Control key is reported with an SCMOD_META modifier bit.
+	</li>
+	<li>
+	API added for setting and retrieving the identifier number used in notifications.
+	</li>
+	<li>
+	SCI_SETEMPTYSELECTION added to set selection without scrolling or redrawing more than needed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3314877&group_id=2439">Feature #3314877.</a>
+	</li>
+	<li>
+	Added new indicators. INDIC_DASH and INDIC_DOTS are variants of underlines.
+	INDIC_SQUIGGLELOW indicator added as shorter alternative to INDIC_SQUIGGLE for small fonts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314591&group_id=2439">Bug #3314591</a>
+	</li>
+	<li>
+	Margin line selection can be changed to select display lines instead of document lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	On Windows, SciTE can perform reverse searches by pressing Shift+Enter
+	in the Find or Replace strips or dialogs.
+	</li>
+	<li>
+	Matlab lexer does not special case '\' in single quoted strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=948757&group_id=2439">Bug #948757</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1755950&group_id=2439">Bug #1755950</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1888738&group_id=2439">Bug #1888738</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3316852&group_id=2439">Bug #3316852.</a>
+	</li>
+	<li>
+	Verilog lexer supports SystemVerilog folding and keywords.
+	</li>
+	<li>
+	Font leak fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+	<li>
+	Automatic scrolling works for long wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	Multiple typing works for cases where selections collapse together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3309906&group_id=2439">Bug #3309906.</a>
+	</li>
+	<li>
+	Fold expanded when needed in word wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	</li>
+	<li>
+	Bug fixed with edge drawn in wrong place on wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314807&group_id=2439">Bug #3314807.</a>
+	</li>
+	<li>
+	Bug fixed with unnecessary scrolling for SCI_GOTOLINE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3303406&group_id=2439">Bug #3303406.</a>
+	</li>
+	<li>
+	Bug fixed where extra step needed to undo SCI_CLEAR in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3159691&group_id=2439">Bug #3159691.</a>
+	</li>
+	<li>
+	Regular expression search fixed for \$ on last line of search range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313746&group_id=2439">Bug #3313746.</a>
+	</li>
+	<li>
+	SciTE performance improved when switching to a tab with a very large file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3311421&group_id=2439">Bug #3311421.</a>
+	</li>
+	<li>
+	On Windows, SciTE advanced search remembers the "Search only in this style" setting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313344&group_id=2439">Bug #3313344.</a>
+	</li>
+	<li>
+	On GTK+, SciTE opens help using "xdg-open" instead of "netscape" as "netscape" no longer commonly installed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314377&group_id=2439">Bug #3314377.</a>
+	</li>
+	<li>
+	SciTE script lexers can use 256 styles.
+	</li>
+	<li>
+	SciTE word highlight works for words containing DBCS characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315173&group_id=2439">Bug #3315173.</a>
+	</li>
+	<li>
+	Compilation fixed for wxWidgets.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite226.zip?download">Release 2.26</a>
+    </h3>
+    <ul>
+	<li>
+	Released 25 May 2011.
+	</li>
+	<li>
+	Folding margin symbols can be highlighted for the current folding block.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3147069&group_id=2439">Feature #3147069.</a>
+	</li>
+	<li>
+	Selected lines can be moved up or down together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3304850&group_id=2439">Feature #3304850.</a>
+	</li>
+	<li>
+	SciTE can highlight all occurrences of the current word or selected text.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3291636&group_id=2439">Feature #3291636.</a>
+	</li>
+	<li>
+	Experimental GTK+ 3.0 support: build with "make GTK3=1".
+	</li>
+	<li>
+	INDIC_STRAIGHTBOX added. Is similar to INDIC_ROUNDBOX but without rounded corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3290435&group_id=2439">Bug #3290435.</a>
+	</li>
+	<li>
+	Can show brace matching and mismatching with indicators instead of text style.
+	Translucency of outline can be altered for INDIC_ROUNDBOX and INDIC_STRAIGHTBOX.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3290434&group_id=2439">Feature #3290434.</a>
+	</li>
+	<li>
+	SciTE can automatically indent python by examining previous line for scope-starting ':' with indent.python.colon.
+	</li>
+	<li>
+	Batch file lexer allows braces '(' or ')' inside variable names.
+	</li>
+	<li>
+	The cpp lexer only recognizes Vala triple quoted strings when lexer.cpp.triplequoted.strings property is set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3239234&group_id=2439">Bug #3239234.</a>
+	</li>
+	<li>
+	Make file lexer treats a variable with a nested variable like $(f$(qx)b) as one variable.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3298223&group_id=2439">Bug #3298223.</a>
+	</li>
+	<li>
+	Folding bug fixed for JavaScript with nested PHP.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3193530&group_id=2439">Bug #3193530.</a>
+	</li>
+	<li>
+	HTML lexer styles Django's {# #} comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3013798&group_id=2439">Bug #3013798.</a>
+	</li>
+	<li>
+	HTML lexer styles JavaScript regular expression correctly for /abc/i.test('abc');.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3209108&group_id=2439">Bug #3209108.</a>
+	</li>
+	<li>
+	Inno Setup Script lexer now works properly when it restarts from middle of [CODE] section.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283880&group_id=2439">Bug #3283880.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3129044&group_id=2439">Bug #3129044.</a>
+	</li>
+	<li>
+	Lua lexer updated for Lua 5.2 with hexadecimal floating-point numbers and '\*' whitespace escaping in strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3243811&group_id=2439">Feature #3243811.</a>
+	</li>
+	<li>
+	Perl folding folds "here doc"s and adds options fold.perl.at.else and fold.perl.comment.explicit. Fold structure for Perl fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3112671&group_id=2439">Feature #3112671.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	Python lexer supports cpdef keyword for Cython.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3279728&group_id=2439">Bug #3279728.</a>
+	</li>
+	<li>
+	SQL folding option lexer.sql.fold.at.else renamed to fold.sql.at.else.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3271474&group_id=2439">Bug #3271474.</a>
+	</li>
+	<li>
+	SQL lexer no longer treats ';' as terminating a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3196071&group_id=2439">Bug #3196071.</a>
+	</li>
+	<li>
+	Text drawing and measurement segmented into smaller runs to avoid platform bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3277449&group_id=2439">Bug #3277449.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3165743&group_id=2439">Bug #3165743.</a>
+	</li>
+	<li>
+	SciTE on Windows adds temp.files.sync.load property to open dropped temporary files synchronously as they may
+	be removed before they can be opened asynchronously.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3072009&group_id=2439">Bug #3072009.</a>
+	</li>
+	<li>
+	Bug fixed with indentation guides ignoring first line in SC_IV_LOOKBOTH mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291317&group_id=2439">Bug #3291317.</a>
+	</li>
+	<li>
+	Bugs fixed in backward regex search.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3292659&group_id=2439">Bug #3292659.</a>
+	</li>
+	<li>
+	Bugs with display of folding structure fixed for wrapped lines and where there is a fold header but no body.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	SciTE on Windows cursor changes to an arrow now when over horizontal splitter near top of window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3286620&group_id=2439">Bug #3286620.</a>
+	</li>
+	<li>
+	Fixed default widget size problem on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3267892&group_id=2439">Bug #3267892.</a>
+	</li>
+	<li>
+	Fixed font size when using Cairo on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3272662&group_id=2439">Bug #3272662.</a>
+	</li>
+	<li>
+	Fixed primary selection and cursor issues on GTK+ when unrealized then realized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3256153&group_id=2439">Bug #3256153.</a>
+	</li>
+	<li>
+	Right click now cancels selection on GTK+ like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3235190&group_id=2439">Bug #3235190.</a>
+	</li>
+	<li>
+	SciTE on GTK+ implements z-order buffer switching like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3228384&group_id=2439">Bug #3228384.</a>
+	</li>
+	<li>
+	Improve selection position after SciTE Insert Abbreviation command when abbreviation expansion includes '|'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite225.zip?download">Release 2.25</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2011.
+	</li>
+	<li>
+	SparseState class makes it easier to write lexers which have to remember complex state between lines.
+	</li>
+	<li>
+	Visual Studio project (.dsp) files removed. The make files should be used instead as described in the README.
+	</li>
+	<li>
+	Modula 3 lexer added along with SciTE support.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3173374&group_id=2439">Feature #3173374.</a>
+	</li>
+	<li>
+	Asm, Basic, and D lexers add extra folding properties.
+	</li>
+	<li>
+	Raw string literals for C++0x supported in C++ lexer.
+	</li>
+	<li>
+	Triple-quoted strings used in Vala language supported in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3177601&group_id=2439">Feature #3177601.</a>
+	</li>
+	<li>
+ 	The errorlist lexer used in SciTE's output pane colours lines that start with '&lt;' as diff deletions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3172878&group_id=2439">Feature #3172878.</a>
+	</li>
+	<li>
+ 	The Fortran lexer correctly folds type-bound procedures from Fortran 2003.
+	</li>
+	<li>
+	LPeg lexer support‎ improved in SciTE.
+	</li>
+	<li>
+	SciTE on Windows-64 fixes for menu localization and Lua scripts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3204502&group_id=2439">Bug #3204502.</a>
+	</li>
+	<li>
+	SciTE on Windows avoids locking folders when using the open or save dialogs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1795484&group_id=2439">Bug #1795484.</a>
+	</li>
+	<li>
+	Diff lexer fixes problem where diffs of diffs producing lines that start with "----".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3197952&group_id=2439">Bug #3197952.</a>
+	</li>
+	<li>
+	Bug fixed when searching upwards in Chinese code page 936.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3176271&group_id=2439">Bug #3176271.</a>
+	</li>
+	<li>
+	On Cocoa, translucent drawing performed as on other platforms instead of 2.5 times less translucent.
+	</li>
+	<li>
+	Performance issue and potential bug fixed on GTK+ with caret line for long lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite224.zip?download">Release 2.24</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 February 2011.
+	</li>
+	<li>
+	Fixed memory leak in GTK+ Cairo code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3157655&group_id=2439">Feature #3157655.</a>
+	</li>
+	<li>
+	Insert Abbreviation dialog added to SciTE on GTK+.
+	</li>
+	<li>
+	SCN_UPDATEUI notifications received when window scrolled. An 'updated' bit mask indicates which
+	types of update have occurred from SC_UPDATE_SELECTION, SC_UPDATE_CONTENT, SC_UPDATE_H_SCROLL
+	or SC_UPDATE_V_SCROLL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3125977&group_id=2439">Feature #3125977.</a>
+	</li>
+	<li>
+	On Windows, to ensure reverse arrow cursor matches platform default, it is now generated by
+	reflecting the platform arrow cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3143968&group_id=2439">Feature #3143968.</a>
+	</li>
+	<li>
+	Can choose mouse cursor used in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3161326&group_id=2439">Feature #3161326.</a>
+	</li>
+	<li>
+	On GTK+, SciTE sets a mime type of text/plain in its .desktop file so that it will appear in the shell context menu.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3137126&group_id=2439">Feature #3137126.</a>
+	</li>
+	<li>
+	Bash folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118223&group_id=2439">Feature #3118223.</a>
+	</li>
+	<li>
+	C++ folder adds fold.cpp.syntax.based, fold.cpp.comment.multiline, fold.cpp.explicit.start, fold.cpp.explicit.end,
+	and fold.cpp.explicit.anywhere properties to allow more control over folding and choice of explicit fold markers.
+	</li>
+	<li>
+	C++ lexer fixed to always handle single quote strings continued past a line end.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3150522&group_id=2439">Bug #3150522.</a>
+	</li>
+	<li>
+	Ruby folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118224&group_id=2439">Feature #3118224.</a>
+	</li>
+	<li>
+	SQL lexer allows '.' to be part of words.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3103129&group_id=2439">Feature #3103129.</a>
+	</li>
+	<li>
+	SQL folder handles case statements in more situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3135027&group_id=2439">Feature #3135027.</a>
+	</li>
+	<li>
+	SQL folder adds fold points inside expressions based on bracket structure.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3165488&group_id=2439">Feature #3165488.</a>
+	</li>
+	<li>
+	SQL folder drops fold.sql.exists property as 'exists' is handled automatically.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3164194&group_id=2439">Bug #3164194.</a>
+	</li>
+	<li>
+	SciTE only forwards properties to lexers when they have been explicitly set so the defaults set by lexers are used
+	rather than 0.
+	</li>
+	<li>
+	Mouse double click word selection chooses the word around the character under the mouse rather than
+	the inter-character position under the mouse. This makes double clicking select what the user is pointing
+	at and avoids selecting adjacent non-word characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3111174&group_id=2439">Bug #3111174.</a>
+	</li>
+	<li>
+	Fixed mouse double click to always perform word select, not line select.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3143635&group_id=2439">Bug #3143635.</a>
+	</li>
+	<li>
+	Right click cancels autocompletion.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3144531&group_id=2439">Bug #3144531.</a>
+	</li>
+	<li>
+	Fixed multiPaste to work when additionalSelectionTyping off.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3126221&group_id=2439">Bug #3126221.</a>
+	</li>
+	<li>
+	Fixed virtual space problems when text modified at caret.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3154986&group_id=2439">Bug #3154986.</a>
+	</li>
+	<li>
+	Fixed memory leak in lexer object code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3133672&group_id=2439">Bug #3133672.</a>
+	</li>
+	<li>
+	Fixed SciTE on GTK+ search failure when using regular expression.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3156217&group_id=2439">Bug #3156217.</a>
+	</li>
+	<li>
+	Avoid unnecessary full window redraw for SCI_GOTOPOS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3146650&group_id=2439">Feature #3146650.</a>
+	</li>
+	<li>
+	Avoid unnecessary redraw when indicator fill range makes no real change.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite223.zip?download">Release 2.23</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2010.
+	</li>
+	<li>
+	On GTK+ version 2.22 and later, drawing is performed with Cairo rather than GDK.
+	This is in preparation for GTK+ 3.0 which will no longer support GDK drawing.
+	The appearance of some elements will be different with Cairo as it is anti-aliased and uses sub-pixel positioning.
+	Cairo may be turned on for GTK+ versions before 2.22 by defining USE_CAIRO although this has not
+	been extensively tested.
+	</li>
+	<li>
+	New lexer a68k for Motorola 68000 assembler.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101598&group_id=2439">Feature #3101598.</a>
+	</li>
+	<li>
+	Borland C++ is no longer supported for building Scintilla or SciTE on Windows.
+	</li>
+	<li>
+	Performance improved when creating large rectangular selections.
+	</li>
+	<li>
+	PHP folder recognizes #region and #endregion comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101624&group_id=2439">Feature #3101624.</a>
+	</li>
+	<li>
+	SQL lexer has a lexer.sql.numbersign.comment option to turn off use of '#' comments
+	as these are a non-standard feature only available in some implementations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3098071&group_id=2439">Feature #3098071.</a>
+	</li>
+	<li>
+	SQL folder recognizes case statements and understands the fold.at.else property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3107362&group_id=2439">Bug #3107362.</a>
+	</li>
+	<li>
+	SQL folder fixes bugs with end statements when fold.sql.only.begin=1.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed with multi-line tab bar not adjusting correctly when maximizing and demaximizing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3097517&group_id=2439">Bug #3097517.</a>
+	</li>
+	<li>
+	Crash fixed on GTK+ when Scintilla widget destroyed while it still has an outstanding style idle pending.
+	</li>
+	<li>
+	Bug fixed where searching backwards in DBCS text (code page 936 or similar) failed to find occurrences at the start of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3103936&group_id=2439">Bug #3103936.</a>
+	</li>
+	<li>
+	SciTE on Windows supports Unicode file names when executing help applications with winhelp and htmlhelp subsystems.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite222.zip?download">Release 2.22</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 October 2010.
+	</li>
+	<li>
+	SciTE includes support for integrating with Scintillua which allows lexers to be implemented in Lua as a
+	Parsing Expression Grammar (PEG).
+	</li>
+	<li>
+	Regular expressions allow use of '?' for non-greedy matches or to match 0 or 1 instances of an item.
+	</li>
+	<li>
+	SCI_CONTRACTEDFOLDNEXT added to allow rapid retrieval of folding state.
+	</li>
+	<li>
+	SCN_HOTSPOTRELEASECLICK notification added which is similar to SCN_HOTSPOTCLICK but occurs
+	when the mouse is released.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3082409&group_id=2439">Feature #3082409.</a>
+	</li>
+	<li>
+	Command added for centring current line in window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3064696&group_id=2439">Feature #3064696.</a>
+	</li>
+	<li>
+	SciTE performance improved by not examining document for line ends when switching buffers and not
+	storing folds when folding turned off.
+	</li>
+	<li>
+	Bug fixed where scrolling to ensure the caret is visible did not take into account all pixels of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081721&group_id=2439">Bug #3081721.</a>
+	</li>
+	<li>
+	Bug fixed for autocompletion list overlapping text when WS_EX_CLIENTEDGE used.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079778&group_id=2439">Bug #3079778.</a>
+	</li>
+	<li>
+	After autocompletion, the caret's X is updated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079114&group_id=2439">Bug #3079114.</a>
+	</li>
+	<li>
+	On Windows, default to the system caret blink time.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3079784&group_id=2439">Feature #3079784.</a>
+	</li>
+	<li>
+	PgUp/PgDn fixed to allow virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3077452&group_id=2439">Bug #3077452.</a>
+	</li>
+	<li>
+	Crash fixed when AddMark and AddMarkSet called with negative argument.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3075074&group_id=2439">Bug #3075074.</a>
+	</li>
+	<li>
+	Dwell notifications fixed so that they do not occur when the mouse is outside Scintilla.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a>
+	</li>
+	<li>
+	Bash lexer bug fixed for here docs starting with &lt;&lt;-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3063822&group_id=2439">Bug #3063822.</a>
+	</li>
+	<li>
+	C++ lexer bug fixed for // comments that are continued onto a second line by a \.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a>
+	</li>
+	<li>
+	C++ lexer fixes wrong highlighting for float literals containing +/-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058924&group_id=2439">Bug #3058924.</a>
+	</li>
+	<li>
+	JavaScript lexer recognize regexes following return keyword.‎
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3062287&group_id=2439">Bug #3062287.</a>
+	</li>
+	<li>
+	Ruby lexer handles % quoting better and treats range dots as operators in 1..2 and 1...2.
+	Ruby folder handles "if" keyword used as a modifier even when it is separated from the modified statement by an escaped new line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2093767&group_id=2439">Bug #2093767.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058496&group_id=2439">Bug #3058496.</a>
+	</li>
+	<li>
+	Bug fixed where upwards search failed with DBCS code pages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3065912&group_id=2439">Bug #3065912.</a>
+	</li>
+	<li>
+	SciTE has a default Lua startup script name distributed in SciTEGlobal.properties.
+	No error message is displayed if this file does not exist.
+	</li>
+	<li>
+	SciTE on Windows tab control height is calculated better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635702&group_id=2439">Bug #2635702.</a>
+	</li>
+	<li>
+	SciTE on Windows uses better themed check buttons in find and replace strips.
+	</li>
+	<li>
+	SciTE on Windows fixes bug with Find strip appearing along with Incremental Find strip.
+	</li>
+	<li>
+	SciTE setting find.close.on.find added to allow preventing the Find dialog from closing.
+	</li>
+	<li>
+	SciTE on Windows attempts to rerun commands that fail by prepending them with "cmd.exe /c".
+	This allows commands built in to the command processor like "dir" to run.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite221.zip?download">Release 2.21</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 September 2010.
+	</li>
+	<li>
+	Asian Double Byte Character Set (DBCS) support improved.
+	Case insensitive search works and other operations are much faster.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2999125&group_id=2439">Bug #2999125,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2774616&group_id=2439">Bug #2774616,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2991942&group_id=2439">Bug #2991942,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005688&group_id=2439">Bug #3005688.</a>
+	</li>
+	<li>
+	Scintilla on GTK+ uses only non-deprecated APIs (for GTK+ 2.20) except for GdkFont and GdkFont use can be disabled
+	with the preprocessor symbol DISABLE_GDK_FONT.
+	</li>
+	<li>
+	IDocument interface used by lexers adds BufferPointer and GetLineIndentation methods.
+	</li>
+	<li>
+	On Windows, clicking sets focus before processing the click or sending notifications.
+	</li>
+	<li>
+	Bug on OS X (macosx platform) fixed where drag/drop overwrote clipboard.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3039732&group_id=2439">Bug #3039732.</a>
+	</li>
+	<li>
+	GTK+ drawing bug when the view was horizontally scrolled more than 32000 pixels fixed.
+	</li>
+	<li>
+	SciTE bug fixed with invoking Complete Symbol from output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3050957&group_id=2439">Bug #3050957.</a>
+	</li>
+	<li>
+	Bug fixed where it was not possible to disable folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3040649&group_id=2439">Bug #3040649.</a>
+	</li>
+	<li>
+	Bug fixed with pressing Enter on a folded fold header line not opening the fold.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3043419&group_id=2439">Bug #3043419.</a>
+	</li>
+	<li>
+	SciTE 'Match case' option in find and replace user interfaces changed to 'Case sensitive' to allow use of 'v'
+	rather than 'c' as the mnemonic.
+	</li>
+	<li>
+	SciTE displays stack trace for Lua when error occurs..
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3051397&group_id=2439">Bug #3051397.</a>
+	</li>
+	<li>
+	SciTE on Windows fixes bug where double clicking on error message left focus in output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1264835&group_id=2439">Bug #1264835.</a>
+	</li>
+	<li>
+	SciTE on Windows uses SetDllDirectory to avoid a security problem.
+	</li>
+	<li>
+	C++ lexer crash fixed with preprocessor expression that looked like division by 0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3056825&group_id=2439">Bug #3056825.</a>
+	</li>
+	<li>
+	Haskell lexer improved.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3039490&group_id=2439">Feature #3039490.</a>
+	</li>
+	<li>
+	HTML lexing fixed around Django {% %} tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3034853&group_id=2439">Bug #3034853.</a>
+	</li>
+	<li>
+	HTML JavaScript lexing fixed when line end escaped.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3038381&group_id=2439">Bug #3038381.</a>
+	</li>
+	<li>
+	HTML lexer stores line state produced by a line on that line rather than on the next line.
+	</li>
+	<li>
+	Markdown lexer fixes infinite loop.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3045386&group_id=2439">Bug #3045386.</a>
+	</li>
+	<li>
+	MySQL folding bugs with END statements fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3031742&group_id=2439">Bug #3031742.</a>
+	</li>
+	<li>
+	PowerShell lexer allows '_' as a word character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3042228&group_id=2439">Feature #3042228.</a>
+	</li>
+	<li>
+	SciTE on GTK+ abandons processing of subsequent commands if a command.go.needs command fails.
+	</li>
+	<li>
+	When SciTE is closed, all buffers now receive an OnClose call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3033857&group_id=2439">Bug #3033857.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite220.zip?download">Release 2.20</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 July 2010.
+	</li>
+	<li>
+	Lexers are implemented as objects so that they may retain extra state.
+	The interfaces defined for this are tentative and may change before the next release.
+	Compatibility classes allow current lexers compiled into Scintilla to run with few changes.
+	The interface to external lexers has changed and existing external lexers will need to have changes
+	made and be recompiled.
+	A single lexer object is attached to a document whereas previously lexers were attached to views
+	which could lead to different lexers being used for split views with confusing results.
+	</li>
+	<li>
+	C++ lexer understands the preprocessor enough to grey-out inactive code due to conditional compilation.
+	</li>
+	<li>
+	SciTE can use strips within the main window for find and replace rather than dialogs.
+	On Windows SciTE always uses a strip for incremental search.
+	</li>
+	<li>
+	Lexer added for Txt2Tags language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3018736&group_id=2439">Feature #3018736.</a>
+	</li>
+	<li>
+	Sticky caret feature enhanced with additional SC_CARETSTICKY_WHITESPACE mode .
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3027559&group_id=2439">Feature #3027559.</a>
+	</li>
+	<li>
+	Bash lexer implements basic parsing of compound commands and constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3033135&group_id=2439">Feature #3033135.</a>
+	</li>
+	<li>
+	C++ folder allows disabling explicit fold comments.
+	</li>
+	<li>
+	Perl folder works for array blocks, adjacent package statements, nested PODs, and terminates package folding at __DATA__, ^D and ^Z.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3030887&group_id=2439">Feature #3030887.</a>
+	</li>
+	<li>
+	PowerShell lexer supports multiline &lt;# .. #&gt; comments and adds 2 keyword classes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3015176&group_id=2439">Feature #3015176.</a>
+	</li>
+	<li>
+	Lexing performed incrementally when needed by wrapping to make user interface more responsive.
+	</li>
+	<li>
+	SciTE setting replaceselection:yes works on GTK+.
+	</li>
+	<li>
+	SciTE Lua scripts calling io.open or io.popen on Windows have arguments treated as UTF-8 and converted to Unicode
+	so that non-ASCII file paths will work. Lua files with non-ASCII paths run.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3016951&group_id=2439">Bug #3016951.</a>
+	</li>
+	<li>
+	Crash fixed when searching for empty string.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017572&group_id=2439">Bug #3017572.</a>
+	</li>
+	<li>
+	Bugs fixed with folding and lexing when Enter pressed at start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3032652&group_id=2439">Bug #3032652.</a>
+	</li>
+	<li>
+	Bug fixed with line selection mode not affecting selection range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021480&group_id=2439">Bug #3021480.</a>
+	</li>
+	<li>
+	Bug fixed where indicator alpha was limited to 100 rather than 255.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021473&group_id=2439">Bug #3021473.</a>
+	</li>
+	<li>
+	Bug fixed where changing annotation did not cause automatic redraw.
+	</li>
+	<li>
+	Regular expression bug fixed when a character range included non-ASCII characters.
+	</li>
+	<li>
+	Compilation failure with recent compilers fixed on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3022027&group_id=2439">Bug #3022027.</a>
+	</li>
+	<li>
+	Bug fixed on Windows with multiple monitors where autocomplete pop up would appear off-screen
+	or straddling monitors.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017512&group_id=2439">Bug #3017512.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where changing directory to a Unicode path failed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011987&group_id=2439">Bug #3011987.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where combo boxes were not allowing Unicode characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012986&group_id=2439">Bug #3012986.</a>
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed when dragging files into SciTE on KDE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3026555&group_id=2439">Bug #3026555.</a>
+	</li>
+	<li>
+	SciTE bug fixed where closing untitled file could lose data if attempt to name file same as another buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011680&group_id=2439">Bug #3011680.</a>
+	</li>
+	<li>
+	COBOL number masks now correctly highlighted.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012164&group_id=2439">Bug #3012164.</a>
+	</li>
+	<li>
+	PHP comments can include &lt;?PHP without triggering state change.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2854183&group_id=2439">Bug #2854183.</a>
+	</li>
+	<li>
+	VHDL lexer styles unclosed string correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3029627&group_id=2439">Bug #3029627.</a>
+	</li>
+	<li>
+	Memory leak fixed in list boxes on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3007669&group_id=2439">Bug #3007669.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite212.zip?download">Release 2.12</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2010.
+	</li>
+	<li>
+	Drawing optimizations improve speed and fix some visible flashing when scrolling.
+	</li>
+	<li>
+	Copy Path command added to File menu in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986745&group_id=2439">Feature #2986745.</a>
+	</li>
+	<li>
+	Optional warning displayed by SciTE when saving a file which has been modified by another process.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2975041&group_id=2439">Feature #2975041.</a>
+	</li>
+	<li>
+	Flagship lexer for xBase languages updated to follow the language much more closely.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2992689&group_id=2439">Feature #2992689.</a>
+	</li>
+	<li>
+	HTML lexer highlights Django templates in more regions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3002874&group_id=2439">Feature #3002874.</a>
+	</li>
+	<li>
+	Dropping files on SciTE on Windows, releases the drag object earlier and opens the files asynchronously,
+	leading to smoother user experience.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986724&group_id=2439">Feature #2986724.</a>
+	</li>
+	<li>
+	SciTE HTML exports take the Use Monospaced Font setting into account.
+	</li>
+	<li>
+	SciTE window title "[n of m]" localized.
+	</li>
+	<li>
+	When new line inserted at start of line, markers are moved down.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986727&group_id=2439">Bug #2986727.</a>
+	</li>
+	<li>
+	On Windows, dropped text has its line ends converted, similar to pasting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005328&group_id=2439">Bug #3005328.</a>
+	</li>
+	<li>
+	Fixed bug with middle-click paste in block select mode where text was pasted next to selection rather than at cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2984460&group_id=2439">Bug #2984460.</a>
+	</li>
+	<li>
+	Fixed SciTE crash where a style had a size parameter without a value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3003834&group_id=2439">Bug #3003834.</a>
+	</li>
+	<li>
+	Debug assertions in multiple lexers fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3000566&group_id=2439">Bug #3000566.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where @font-face displayed incorrectly
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994224&group_id=2439">Bug #2994224.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where open comment caused highlighting error.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1683672&group_id=2439">Bug #1683672.</a>
+	</li>
+	<li>
+	Shell file lexer fixed highlight glitch with here docs where the first line is a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830239&group_id=2439">Bug #2830239.</a>
+	</li>
+	<li>
+	Bug fixed in SciTE openpath property that caused Open Selected File to fail to open the selected file.
+	</li>
+	<li>
+	Bug fixed in SciTE FileExt property when file name with no extension evaluated to whole path.
+	</li>
+	<li>
+	Fixed SciTE on Windows printing bug where the $(CurrentTime), $(CurrentPage) variables were not expanded.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994612&group_id=2439">Bug #2994612.</a>
+	</li>
+	<li>
+	SciTE compiles for 64-bit Windows and runs without crashing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986312&group_id=2439">Bug #2986312.</a>
+	</li>
+	<li>
+	Full Screen mode in Windows Vista/7 improved to hide Start button and size borders a little better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3002813&group_id=2439">Bug #3002813.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite211.zip?download">Release 2.11</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 April 2010.
+	</li>
+	<li>
+	Fixes compatibility of Scintilla.h with the C language.
+	</li>
+	<li>
+	With a rectangular selection SCI_GETSELECTIONSTART and SCI_GETSELECTIONEND return limits of the
+	rectangular selection rather than the limits of the main selection.
+	</li>
+	<li>
+	When SciTE on Windows is minimized to tray, only takes a single click to restore rather than a double click.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=981917&group_id=2439">Feature #981917.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite210.zip?download">Release 2.10</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 April 2010.
+	</li>
+	<li>
+	Version 1.x of GTK+ is no longer supported.
+	</li>
+	<li>
+	SciTE is no longer supported on Windows 95, 98 or ME.
+	</li>
+	<li>
+	Case-insensitive search works for non-ASCII characters in UTF-8 and 8-bit encodings.
+	Non-regex search in DBCS encodings is always case-sensitive.
+	</li>
+	<li>
+	Non-ASCII characters may be changed to upper and lower case.
+	</li>
+	<li>
+	SciTE on Windows can access all files including those with names outside the user's preferred character encoding.
+	</li>
+	<li>
+	SciTE may be extended with lexers written in Lua.
+	</li>
+	<li>
+	When there are multiple selections, the paste command can go either to the main selection or to each
+	selection. This is controlled with SCI_SETMULTIPASTE.
+	</li>
+	<li>
+	More forms of bad UTF-8 are detected including overlong sequences, surrogates, and characters outside
+	the valid range. Bad UTF-8 bytes are now displayed as 2 hex digits preceded by 'x'.
+	</li>
+	<li>
+	SCI_GETTAG retrieves the value of captured expressions within regular expression searches.
+	</li>
+	<li>
+	Django template highlighting added to the HTML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2974889&group_id=2439">Feature #2974889.</a>
+	</li>
+	<li>
+	Verilog line comments can be folded.
+	</li>
+	<li>
+	SciTE on Windows allows specifying a filter for the Save As dialog.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2943445&group_id=2439">Feature #2943445.</a>
+	</li>
+	<li>
+	Bug fixed when multiple selection disabled where rectangular selections could be expanded into multiple selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2948260&group_id=2439">Bug #2948260.</a>
+	</li>
+	<li>
+	Bug fixed when document horizontally scrolled and up/down-arrow did not return to the same
+	column after horizontal scroll occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2950799&group_id=2439">Bug #2950799.</a>
+	</li>
+	<li>
+	Bug fixed to remove hotspot highlight when mouse is moved out of the document. Windows only fix.
+	<a href="https://sourceforge.net/tracker/?func=detail&aid=2951353&group_id=2439&atid=102439">Bug #2951353.</a>
+	</li>
+	<li>
+	R lexer now performs case-sensitive check for keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2956543&group_id=2439">Bug #2956543.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ where text disappeared when a wrap occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2958043&group_id=2439">Bug #2958043.</a>
+	</li>
+	<li>
+	Bug fixed where regular expression replace cannot escape the '\' character by using '\\'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2959876&group_id=2439">Bug #2959876.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ when virtual space disabled, middle-click could still paste text beyond end of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2971618&group_id=2439">Bug #2971618.</a>
+	</li>
+	<li>
+	SciTE crash fixed when double clicking on a malformed error message in the output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2976551&group_id=2439">Bug #2976551.</a>
+	</li>
+	<li>
+	Improved performance on GTK+ when changing parameters associated with scroll bars to the same value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2964357&group_id=2439">Bug #2964357.</a>
+	</li>
+	<li>
+	Fixed bug with pressing Shift+Tab with a rectangular selection so that it performs an un-indent
+	similar to how Tab performs an indent.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite203.zip?download">Release 2.03</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 February 2010.
+	</li>
+	<li>
+	Added SCI_SETFIRSTVISIBLELINE to match SCI_GETFIRSTVISIBLELINE.
+	</li>
+	<li>
+	Erlang lexer extended set of numeric bases recognized; separate style for module:function_name; detects
+	built-in functions, known module attributes, and known preprocessor instructions; recognizes EDoc and EDoc macros;
+	separates types of comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942448&group_id=2439">Bug #2942448.</a>
+	</li>
+	<li>
+	Python lexer extended with lexer.python.strings.over.newline option that allows non-triple-quoted strings to extend
+	past line ends. This allows use of the Ren'Py language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2945550&group_id=2439">Feature #2945550.</a>
+	</li>
+	<li>
+	Fixed bugs with cursor movement after deleting a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942131&group_id=2439">Bug #2942131.</a>
+	</li>
+	<li>
+	Fixed bug where calling SCI_SETSEL when there is a rectangular selection left
+	the additional selections selected.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2947064&group_id=2439">Bug #2947064.</a>
+	</li>
+	<li>
+	Fixed macro recording bug where not all bytes in multi-byte character insertions were reported through
+	SCI_REPLACESEL.
+	</li>
+	<li>
+	Fixed SciTE bug where using Ctrl+Enter followed by Ctrl+Space produced an autocompletion list
+	with only a single line containing all the identifiers.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where running a tool made the user interface completely unresponsive.
+	</li>
+	<li>
+	Fixed SciTE on Windows Copy to RTF bug.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2108574&group_id=2439">Bug #2108574.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite202.zip?download">Release 2.02</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 January 2010.
+	</li>
+	<li>
+	Markdown lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2844081&group_id=2439">Feature #2844081.</a>
+	</li>
+	<li>
+	On GTK+, include code that understands the ranges of lead bytes for code pages 932, 936, and 950
+	so that most Chinese and Japanese text can be used on systems that are not set to the corresponding locale.
+	</li>
+	<li>
+	Allow changing the size of dots in visible whitespace using SCI_SETWHITESPACESIZE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2839427&group_id=2439">Feature #2839427.</a>
+	</li>
+	<li>
+	Additional carets can be hidden with SCI_SETADDITIONALCARETSVISIBLE.
+	</li>
+	<li>
+	Can choose anti-aliased, non-anti-aliased or lcd-optimized text using SCI_SETFONTQUALITY.
+	</li>
+	<li>
+	Retrieve the current selected text in the autocompletion list with SCI_AUTOCGETCURRENTTEXT.
+	</li>
+	<li>
+	Retrieve the name of the current lexer with SCI_GETLEXERLANGUAGE.
+	</li>
+	<li>
+	Progress 4GL lexer improves handling of comments in preprocessor declaration.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2902206&group_id=2439">Feature #2902206.</a>
+	</li>
+	<li>
+	HTML lexer extended to handle Mako template language.
+	</li>
+	<li>
+	SQL folder extended for SQL Anywhere "EXISTS" and "ENDIF" keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2887524&group_id=2439">Feature #2887524.</a>
+	</li>
+	<li>
+	SciTE adds APIPath and AbbrevPath variables.
+	</li>
+	<li>
+	SciTE on GTK+ uses pipes instead of temporary files for running tools. This should be more secure.
+	</li>
+	<li>
+	Fixed crash when calling SCI_STYLEGETFONT for a style which does not have a font set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2857425&group_id=2439">Bug #2857425.</a>
+	</li>
+	<li>
+	Fixed crash caused by not having sufficient styles allocated after choosing a lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2881279&group_id=2439">Bug #2881279.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE using autocomplete word when word characters includes space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2840141&group_id=2439">Bug #2840141.</a>
+	</li>
+	<li>
+	Fixed bug with handling upper-case file extensions SciTE on GTK+.
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions with folded folds where it would not
+	be scrolled to the correct location.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882775&group_id=2439">Bug #2882775.</a>
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions when file no longer exists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2883437&group_id=2439">Bug #2883437.</a>
+	</li>
+	<li>
+	Fixed SciTE export to HTML using the wrong background colour.
+	</li>
+	<li>
+	Fixed crash when adding an annotation and then adding a new line after the annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929708&group_id=2439">Bug #2929708.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE setting a property to nil from Lua.
+	</li>
+	<li>
+	SCI_GETSELTEXT fixed to return correct length.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929441&group_id=2439">Bug #2929441.</a>
+	</li>
+	<li>
+	Fixed text positioning problems with selection in some circumstances.
+	</li>
+	<li>
+	Fixed text positioning problems with ligatures on GTK+.
+	</li>
+	<li>
+	Fixed problem pasting into rectangular selection with caret at bottom caused text to go from the caret down
+	rather than replacing the selection.
+	</li>
+	<li>
+	Fixed problem replacing in a rectangular selection where only the final line was changed.
+	</li>
+	<li>
+	Fixed inability to select a rectangular area using Alt+Shift+Click at both corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2899746&group_id=2439">Bug #2899746.</a>
+	</li>
+	<li>
+	Fixed problem moving to start/end of a rectangular selection with left/right key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871358&group_id=2439">Bug #2871358.</a>
+	</li>
+	<li>
+	Fixed problem with Select All when there's a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2930488&group_id=2439">Bug #2930488.</a>
+	</li>
+	<li>
+	Fixed SCI_LINEDUPLICATE on a rectangular selection to not produce multiple discontinuous selections.
+	</li>
+	<li>
+	Virtual space removed when performing delete word left or delete line left.
+	Virtual space converted to real space for delete word right.
+	Preserve virtual space when pressing Delete key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882566&group_id=2439">Bug #2882566.</a>
+	</li>
+	<li>
+	Fixed problem where Shift+Alt+Down did not move through wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871749&group_id=2439">Bug #2871749.</a>
+	</li>
+	<li>
+	Fixed incorrect background colour when using coloured lines with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2914691&group_id=2439">Bug #2914691.</a>
+	</li>
+	<li>
+	Fixed failure to display wrap symbol for SC_WRAPVISUALFLAGLOC_END_BY_TEXT.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2936108&group_id=2439">Bug #2936108.</a>
+	</li>
+	<li>
+	Fixed blank background colour with EOLFilled style on last line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2890105&group_id=2439">Bug #2890105.</a>
+	</li>
+	<li>
+	Fixed problem in VB lexer with keyword at end of file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2901239&group_id=2439">Bug #2901239.</a>
+	</li>
+	<li>
+	Fixed SciTE bug where double clicking on a tab closed the file.
+	</li>
+	<li>
+	Fixed SciTE brace matching commands to only work when the caret is next to the brace, not when
+	it is in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2885560&group_id=2439">Bug #2885560.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows Vista to access files in the Program Files directory rather than allow Windows
+	to virtualize access.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2916685&group_id=2439">Bug #2916685.</a>
+	</li>
+	<li>
+	Fixed NSIS folder to handle keywords that start with '!'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2872157&group_id=2439">Bug #2872157.</a>
+	</li>
+	<li>
+	Changed linkage of Scintilla_LinkLexers to "C" so that it can be used by clients written in C.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2844718&group_id=2439">Bug #2844718.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite201.zip?download">Release 2.01</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 August 2009.
+	</li>
+	<li>
+	Fix to positioning rectangular paste when viewing line ends.
+	</li>
+	<li>
+	Don't insert new lines and indentation for line ends at end of rectangular paste.
+	</li>
+	<li>
+	When not in additional selection typing mode, cutting a rectangular selection removes all of the selected text.
+	</li>
+	<li>
+	Rectangular selections are copied to the clipboard in document order, not in the order of selection.
+	</li>
+	<li>
+	SCI_SETCURRENTPOS and SCI_SETANCHOR work in rectangular mode.
+	</li>
+	<li>
+	On GTK+, drag and drop to a later position in the document now drops at the position.
+	</li>
+	<li>
+	Fix bug where missing property did not use default value.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite200.zip?download">Release 2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 August 2009.
+	</li>
+	<li>
+	Multiple pieces of text can be selected simultaneously by holding control while dragging the mouse.
+	Typing, backspace and delete may affect all selections together.
+	</li>
+	<li>
+	Virtual space allows selecting beyond the last character on a line.
+	</li>
+	<li>
+	SciTE on GTK+ path bar is now optional and defaults to off.
+	</li>
+	<li>
+	MagikSF lexer recognizes numbers correctly.
+	</li>
+	<li>
+	Folding of Python comments and blank lines improved. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=210240&group_id=2439">Bug #210240.</a>
+	</li>
+	<li>
+	Bug fixed where background colour of last character in document leaked past that character.
+	</li>
+	<li>
+	Crash fixed when adding marker beyond last line in document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830307&group_id=2439">Bug #2830307.</a>
+	</li>
+	<li>
+	Resource leak fixed in SciTE for Windows when printing fails. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2816524&group_id=2439">Bug #2816524.</a>
+	</li>
+	<li>
+	Bug fixed on Windows where the system caret was destroyed during destruction when another window
+	was using the system caret. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830223&group_id=2439">Bug #2830223.</a>
+	</li>
+	<li>
+	Bug fixed where indentation guides were drawn over text when the indentation used a style with a different
+	space width to the default style.
+	</li>
+	<li>
+	SciTE bug fixed where box comment added a bare line feed rather than the chosen line end. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2818104&group_id=2439">Bug #2818104.</a>
+	</li>
+	<li>
+	Reverted fix that led to wrapping whole document when displaying the first line of the document.
+	</li>
+	<li>
+	Export to LaTeX in SciTE fixed to work in more cases and not use as much space. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1286548&group_id=2439">Bug #1286548.</a>
+	</li>
+	<li>
+	Bug fixed where EN_CHANGE notification was sent when performing a paste operation in a
+	read-only document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2825485&group_id=2439">Bug #2825485.</a>
+	</li>
+	<li>
+	Refactored code so that Scintilla exposes less of its internal implementation and uses the C++ standard
+	library for some basic collections. Projects that linked to Scintilla's SString or PropSet classes
+	should copy this code from a previous version of Scintilla or from SciTE.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite179.zip?download">Release 1.79</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 July 2009.
+	</li>
+	<li>
+	Memory exhaustion and other exceptions handled by placing an error value into the
+	status property rather than crashing.
+	Scintilla now builds with exception handling enabled and requires exception handling to be enabled. <br />
+	This is a major change and application developers should consider how they will deal with Scintilla exhausting
+	memory since Scintilla may not be in a stable state.
+	</li>
+	<li>
+	Deprecated APIs removed. The symbols removed are:
+	<ul>
+ <li>SCI_SETCARETPOLICY</li>
+<li> CARET_CENTER</li>
+<li> CARET_XEVEN</li>
+<li> CARET_XJUMPS</li>
+<li> SC_FOLDFLAG_BOX</li>
+<li> SC_FOLDLEVELBOXHEADERFLAG</li>
+<li> SC_FOLDLEVELBOXFOOTERFLAG</li>
+<li> SC_FOLDLEVELCONTRACTED</li>
+<li> SC_FOLDLEVELUNINDENT</li>
+<li> SCN_POSCHANGED</li>
+<li> SCN_CHECKBRACE</li>
+<li> SCLEX_ASP</li>
+<li> SCLEX_PHP</li>
+</ul>
+	</li>
+	<li>
+	Cocoa platform added.
+	</li>
+	<li>
+	Names of struct types in Scintilla.h now start with "Sci_" to avoid possible clashes with platform
+	definitions. Currently, the old names still work but these will be phased out.
+	</li>
+	<li>
+	When lines are wrapped, subsequent lines may be indented to match the indent of the initial line,
+	or one more indentation level. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2796119&group_id=2439">Feature #2796119.</a>
+	</li>
+	<li>
+	APIs added for finding the character at a point rather than an inter-character position. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2646738&group_id=2439">Feature #2646738.</a>
+	</li>
+	<li>
+	A new marker SC_MARK_BACKGROUND_UNDERLINE is drawn in the text area as an underline
+	the full width of the window.
+	</li>
+	<li>
+	Batch file lexer understands variables surrounded by '!'.
+	</li>
+	<li>
+	CAML lexer also supports SML.
+	</li>
+	<li>
+	D lexer handles string and numeric literals more accurately. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2793782&group_id=2439">Feature #2793782.</a>
+	</li>
+	<li>
+	Forth lexer is now case-insensitive and better supports numbers like $hex and %binary. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2804894&group_id=2439">Feature #2804894.</a>
+	</li>
+	<li>
+	Lisp lexer treats '[', ']', '{', and '}' as balanced delimiters which is common usage. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794989&group_id=2439">Feature #2794989.</a>
+	<br />
+	It treats keyword argument names as being equivalent to symbols. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794901&group_id=2439">Feature #2794901.</a>
+	</li>
+	<li>
+	Pascal lexer bug fixed to prevent hang when 'interface' near beginning of file. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2802863&group_id=2439">Bug #2802863.</a>
+	</li>
+	<li>
+	Perl lexer bug fixed where previous lexical states persisted causing "/" special case styling and
+	subroutine prototype styling to not be correct. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809168&group_id=2439">Bug #2809168.</a>
+	</li>
+	<li>
+	XML lexer fixes bug where Unicode entities like '&amp;—' were broken into fragments. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2804760&group_id=2439">Bug #2804760.</a>
+	</li>
+	<li>
+	SciTE on GTK+ enables scrolling the tab bar on recent versions of GTK+. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2061821&group_id=2439">Feature #2061821.</a>
+	</li>
+	<li>
+	SciTE on Windows allows tab bar tabs to be reordered by drag and drop.
+	</li>
+	<li>
+	Unit test script for Scintilla on Windows included with source code.
+	</li>
+	<li>
+	User defined menu items are now localized when there is a matching translation.
+	</li>
+	<li>
+	Width of icon column of autocompletion lists on GTK+ made more consistent.
+	</li>
+	<li>
+	Bug with slicing UTF-8 text into character fragments when there is a sequence of 100 or more 3 byte characters. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2780566&group_id=2439">Bug #2780566.</a>
+	</li>
+	<li>
+	Folding bugs introduced in 1.78 fixed. Some of the fix was generic and there was also a specific fix for C++.
+	</li>
+	<li>
+	Bug fixed where a rectangular paste was not padding the line with sufficient spaces to align the pasted text.
+	</li>
+	<li>
+	Bug fixed with showing all text on each line of multi-line annotations when styling the whole annotation using SCI_ANNOTATIONSETSTYLE. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2789430&group_id=2439">Bug #2789430.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite178.zip?download">Release 1.78</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 28 April 2009.
+	</li>
+	<li>
+	Annotation lines may be added to each line.
+	</li>
+	<li>
+	A text margin may be defined with different text on each line.
+	</li>
+	<li>
+	Application actions may be added to the undo history.
+	</li>
+	<li>
+	Can query the symbol defined for a marker.
+	An available symbol added for applications to indicate that plugins may allocate a marker.
+	</li>
+	<li>
+	Can increase the amount of font ascent and descent.
+	</li>
+	<li>
+	COBOL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Nimrod lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2642620&group_id=2439">Feature #2642620.</a>
+	</li>
+	<li>
+	PowerPro lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2195308&group_id=2439">Feature #2195308.</a>
+	</li>
+	<li>
+	SML lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2710950&group_id=2439">Feature #2710950.</a>
+	</li>
+	<li>
+	SORCUS Installation file lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2343375&group_id=2439">Feature #2343375.</a>
+	</li>
+	<li>
+	TACL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	TAL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Rewritten Pascal lexer with improved folding and other fixes. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2190650&group_id=2439">Feature #2190650.</a>
+	</li>
+	<li>
+	INDIC_ROUNDBOX translucency level can be modified. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2586290&group_id=2439">Feature #2586290.</a>
+	</li>
+	<li>
+	C++ lexer treats angle brackets in #include directives as quotes when styling.within.preprocessor. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2551033&group_id=2439">Bug #2551033.</a>
+	</li>
+	<li>
+	Inno Setup lexer is sensitive to whether within the [Code] section and handles comments better. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2552973&group_id=2439">Bug #2552973.</a>
+	</li>
+	<li>
+	HTML lexer does not go into script mode when script tag is self-closing.
+	</li>
+	<li>
+	HTML folder fixed where confused by comments when fold.html.preprocessor off. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2532774&group_id=2439">Bug #2532774.</a>
+	</li>
+	<li>
+	Perl lexer fixes problem with string matching caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2648342&group_id=2439">Bug #2648342.</a>
+	</li>
+	<li>
+	Progress lexer fixes problem with "last-event:function" phrase. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2483619&group_id=2439">Bug #2483619.</a>
+	</li>
+	<li>
+	Properties file lexer extended to handle RFC2822 text when lexer.props.allow.initial.spaces on.
+	</li>
+	<li>
+	Python lexer adds options for Python 3 and Cython.
+	</li>
+	<li>
+	Shell lexer fixes heredoc problem caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635257&group_id=2439">Bug #2635257.</a>
+	</li>
+	<li>
+	TeX lexer handles comment at end of line correctly. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2698766&group_id=2439">Bug #2698766.</a>
+	</li>
+	<li>
+	SciTE retains selection range when performing a replace selection command. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2339160&group_id=2439">Feature #2339160.</a>
+	</li>
+	<li>
+	SciTE definition of word characters fixed to match documentation. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2464531&group_id=2439">Bug #2464531.</a>
+	</li>
+	<li>
+	SciTE on GTK+ performing Search or Replace when dialog already shown now brings dialog to foreground.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2634224&group_id=2439">Bug #2634224.</a>
+	</li>
+	<li>
+	Fixed encoding bug with calltips on GTK+.
+	</li>
+	<li>
+	Block caret drawn in correct place on wrapped lines. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2126144&group_id=2439">Bug #2126144.</a>
+	</li>
+	<li>
+	Compilation for 64 bit Windows works using MinGW. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2515578&group_id=2439">Bug #2515578.</a>
+	</li>
+	<li>
+	Incorrect memory freeing fixed on OS X.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2354098&group_id=2439">Bug #2354098</a>,
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2671749&group_id=2439">Bug #2671749.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed on startup when child process exits before initialization complete.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2716987&group_id=2439">Bug #2716987.</a>
+	</li>
+	<li>
+	Crash fixed when AutoCompleteGetCurrent called with no active autocompletion.
+	</li>
+	<li>
+	Flickering diminished when pressing Tab. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2723006&group_id=2439">Bug #2723006.</a>
+	</li>
+	<li>
+	Namespace compilation issues with GTK+ on OS X fixed.
+	</li>
+	<li>
+	Increased maximum length of SciTE's Language menu on GTK+ to 100 items. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2528241&group_id=2439">Bug #2528241.</a>
+	</li>
+	<li>
+	Fixed incorrect Python lexing for multi-line continued strings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2450963&group_id=2439">Bug #2450963.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite177.zip?download">Release 1.77</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 October 2008.
+	</li>
+	<li>
+	Direct temporary access to Scintilla's text buffer to allow simple efficient interfacing
+	to libraries like regular expression libraries.
+	</li>
+	<li>
+	Scintilla on Windows can interpret keys as Unicode even when a narrow character
+	window with SCI_SETKEYSUNICODE.
+	</li>
+	<li>
+	Notification sent when autocompletion cancelled.
+	</li>
+	<li>
+	MySQL lexer added.
+	</li>
+	<li>
+	Lexer for gettext .po files added.
+	</li>
+	<li>
+	Abaqus lexer handles program structure more correctly.
+	</li>
+	<li>
+	Assembler lexer works with non-ASCII text.
+	</li>
+	<li>
+	C++ lexer allows mixed case doc comment tags.
+	</li>
+	<li>
+	CSS lexer updated and works with non-ASCII.
+	</li>
+	<li>
+	Diff lexer adds style for changed lines, handles subversion diffs better and
+	fixes styling and folding for lines containing chunk dividers ("---").
+	</li>
+	<li>
+	FORTRAN lexer accepts more styles of compiler directive.
+	</li>
+	<li>
+	Haskell lexer allows hexadecimal literals.
+	</li>
+	<li>
+	HTML lexer improves PHP and JavaScript folding.
+	PHP heredocs, nowdocs, strings and comments processed more accurately.
+	Internet Explorer's non-standard &gt;comment&lt; tag supported.
+	Script recognition in XML can be controlled with lexer.xml.allow.scripts property.
+	</li>
+	<li>
+	Lua lexer styles last character correctly.
+	</li>
+	<li>
+	Perl lexer update.
+	</li>
+	<li>
+	Comment folding implemented for Ruby.
+	</li>
+	<li>
+	Better TeX folding.
+	</li>
+	<li>
+	Verilog lexer updated.
+	</li>
+	<li>
+	Windows Batch file lexer handles %~ and %*.
+	</li>
+	<li>
+	YAML lexer allows non-ASCII text.
+	</li>
+	<li>
+	SciTE on GTK+ implements "Replace in Buffers" in advanced mode.
+	</li>
+	<li>
+	The extender OnBeforeSave method can override the default file saving behaviour by retuning true.
+	</li>
+	<li>
+	Window position and recent files list may be saved into the session file.
+	</li>
+	<li>
+	Right button press outside the selection moves the caret.
+	</li>
+	<li>
+	SciTE load.on.activate works when closing a document reveals a changed document.
+	</li>
+	<li>
+	SciTE bug fixed where eol.mode not used for initial buffer.
+	</li>
+	<li>
+	SciTE bug fixed where a file could be saved as the same name as another
+	buffer leading to confusing behaviour.
+	</li>
+	<li>
+	Fixed display bug for long lines in same style on Windows.
+	</li>
+	<li>
+	Fixed SciTE crash when finding matching preprocessor command used on some files.
+	</li>
+	<li>
+	Drawing performance improved for files with many blank lines.
+	</li>
+	<li>
+	Folding bugs fixed where changing program text produced a decrease in fold level on a fold header line.
+	</li>
+	<li>
+	Clearing document style now clears all indicators.
+	</li>
+	<li>
+	SciTE's embedded Lua updated to 5.1.4.
+	</li>
+	<li>
+	SciTE will compile with versions of GTK+ before 2.8 again.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where multiple files not opened.
+	</li>
+	<li>
+	Bug fixed with SCI_VCHOMEWRAP and SCI_VCHOMEWRAPEXTEND on white last line.
+	</li>
+	<li>
+	Regular expression bug fixed where "^[^(]+$" matched empty lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite176.zip?download">Release 1.76</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 16 March 2008.
+	</li>
+	<li>
+	Support for PowerShell.
+	</li>
+	<li>
+	Lexer added for Magik.
+	</li>
+	<li>
+	Director extension working on GTK+.
+	</li>
+	<li>
+	Director extension may set focus to SciTE through "focus:" message on GTK+.
+	</li>
+	<li>
+	C++ folder handles final line better in some cases.
+	</li>
+	<li>
+	SCI_COPYALLOWLINE added which is similar to SCI_COPY except that if the selection is empty then
+	the line holding the caret is copied. On Windows an extra clipboard format allows pasting this as a whole
+	line before the current selection. This behaviour is compatible with Visual Studio.
+	</li>
+	<li>
+	On Windows, the horizontal scroll bar can handle wider files.
+	</li>
+	<li>
+	On Windows, a system palette leak was fixed. Should not affect many as palette mode is rarely used.
+	</li>
+	<li>
+	Install command on GTK+ no longer tries to set explicit owner.
+	</li>
+	<li>
+	Perl lexer handles defined-or operator "//".
+	</li>
+	<li>
+	Octave lexer fixes "!=" operator.
+	</li>
+	<li>
+	Optimized selection change drawing to not redraw as much when not needed.
+	</li>
+	<li>
+	SciTE on GTK+ no longer echoes Lua commands so is same as on Windows.
+	</li>
+	<li>
+	Automatic vertical scrolling limited to one line at a time so is not too fast.
+	</li>
+	<li>
+	Crash fixed when line states set beyond end of line states. This occurred when lexers did not
+	set a line state for each line.
+	</li>
+	<li>
+	Crash in SciTE on Windows fixed when search for 513 character string fails.
+	</li>
+	<li>
+	SciTE disables translucent features on Windows 9x due to crashes reported when using translucency.
+	</li>
+	<li>
+	Bug fixed where whitespace background was not seen on wrapped lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite175.zip?download">Release 1.75</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 22 November 2007.
+	</li>
+	<li>
+	Some WordList and PropSet functionality moved from Scintilla to SciTE.
+	Projects that link to Scintilla's code for these classes may need to copy
+	code from SciTE.
+	</li>
+	<li>
+	Borland C++ can no longer build Scintilla.
+	</li>
+	<li>
+	Invalid bytes in UTF-8 mode are displayed as hex blobs. This also prevents crashes due to
+	passing invalid UTF-8 to platform calls.
+	</li>
+	<li>
+	Indentation guides enhanced to be visible on completely empty lines when possible.
+	</li>
+	<li>
+	The horizontal scroll bar may grow to match the widest line displayed.
+	</li>
+	<li>
+	Allow autocomplete pop ups to appear outside client rectangle in some cases.
+	</li>
+	<li>
+	When line state changed, SC_MOD_CHANGELINESTATE modification notification sent and
+	margin redrawn.
+	</li>
+	<li>
+	SciTE scripts can access the menu command values IDM_*.
+	</li>
+	<li>
+	SciTE's statement.end property has been implemented again.
+	</li>
+	<li>
+	SciTE shows paths and matches in different styles for Find In Files.
+	</li>
+	<li>
+	Incremental search in SciTE for Windows is modeless to make it easier to exit.
+	</li>
+	<li>
+	Folding performance improved.
+	</li>
+	<li>
+	SciTE for GTK+ now includes a Browse button in the Find In Files dialog.
+	</li>
+	<li>
+	On Windows versions that support Unicode well, Scintilla is a wide character window
+	which allows input for some less common languages like Armenian, Devanagari,
+	Tamil, and Georgian. To fully benefit, applications should use wide character calls.
+	</li>
+	<li>
+	Lua function names are exported from SciTE to allow some extension libraries to work.
+	</li>
+	<li>
+	Lexers added for Abaqus, Ansys APDL, Asymptote, and R.
+	</li>
+	<li>
+	SCI_DELWORDRIGHTEND added for closer compatibility with GTK+ entry widget.
+	</li>
+	<li>
+	The styling buffer may now use all 8 bits in each byte for lexical states with 0 bits for indicators.
+	</li>
+	<li>
+	Multiple characters may be set for SciTE's calltip.&lt;lexer&gt;.parameters.start property.
+	</li>
+	<li>
+	Bash lexer handles octal literals.
+	</li>
+	<li>
+	C++/JavaScript lexer recognizes regex literals in more situations.
+	</li>
+	<li>
+	Haskell lexer fixed for quoted strings.
+	</li>
+	<li>
+	HTML/XML lexer does not notice XML indicator if there is
+	non-whitespace between the "&lt;?" and "XML".
+	ASP problem fixed where &lt;/ is used inside a comment.
+	</li>
+	<li>
+	Error messages from Lua 5.1 are recognized.
+	</li>
+	<li>
+	Folding implemented for Metapost.
+	</li>
+	<li>
+	Perl lexer enhanced for handling minus-prefixed barewords,
+	underscores in numeric literals and vector/version strings,
+	^D and ^Z similar to __END__,
+	subroutine prototypes as a new lexical class,
+	formats and format blocks as new lexical classes, and
+	'/' suffixed keywords and barewords.
+	</li>
+	<li>
+	Python lexer styles all of a decorator in the decorator style rather than just the name.
+	</li>
+	<li>
+	YAML lexer styles colons as operators.
+	</li>
+	<li>
+	Fixed SciTE bug where undo would group together multiple separate modifications.
+	</li>
+	<li>
+	Bug fixed where setting background colour of calltip failed.
+	</li>
+	<li>
+	SciTE allows wildcard suffixes for file pattern based properties.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where user not prompted to save untitled buffer.
+	</li>
+	<li>
+	SciTE bug fixed where property values from one file were not seen by lower priority files.
+	</li>
+	<li>
+	Bug fixed when showing selection with a foreground colour change which highlighted
+	an incorrect range in some positions.
+	</li>
+	<li>
+	Cut now invokes SCN_MODIFYATTEMPTRO notification.
+	</li>
+	<li>
+	Bug fixed where caret not shown at beginning of wrapped lines.
+	Caret made visible in some cases after wrapping and scroll bar updated after wrapping.
+	</li>
+	<li>
+	Modern indicators now work on wrapped lines.
+	</li>
+	<li>
+	Some crashes fixed for 64-bit GTK+.
+	</li>
+	<li>
+	On GTK+ clipboard features improved for VMWare tools copy and paste.
+	SciTE exports the clipboard more consistently on shut down.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite174.zip?download">Release 1.74</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 June 2007.
+	</li>
+	<li>
+	OS X support.
+	</li>
+	<li>
+	Indicators changed to be a separate data structure allowing more indicators. Storing indicators in high bits
+	of styling bytes is deprecated and will be removed in the next version.
+	</li>
+	<li>
+	Unicode support extended to all Unicode characters not just the Basic Multilingual Plane.
+	</li>
+	<li>
+	Performance improved on wide lines by breaking long runs in a single style into shorter segments.
+	</li>
+	<li>
+	Performance improved by caching layout of short text segments.
+	</li>
+	<li>
+	SciTE includes Lua 5.1.
+	</li>
+	<li>
+	Caret may be displayed as a block.
+	</li>
+	<li>
+	Lexer added for GAP.
+	</li>
+	<li>
+	Lexer added for PL/M.
+	</li>
+	<li>
+	Lexer added for Progress.
+	</li>
+	<li>
+	SciTE session files have changed format to be like other SciTE .properties files
+	and now use the extension .session.
+	Bookmarks and folds may optionally be saved in session files.
+	Session files created with previous versions of SciTE will not load into this version.
+	</li>
+	<li>
+	SciTE's extension and scripting interfaces add OnKey, OnDwellStart, and OnClose methods.
+	</li>
+	<li>
+	On GTK+, copying to the clipboard does not include the text/urilist type since this caused problems when
+	pasting into Open Office.
+	</li>
+	<li>
+	On GTK+, Scintilla defaults caret blink rate to platform preference.
+	</li>
+	<li>
+	Dragging does not start until the mouse has been dragged a certain amount.
+	This stops spurious drags when just clicking inside the selection.
+	</li>
+	<li>
+	Bug fixed where brace highlight not shown when caret line background set.
+	</li>
+	<li>
+	Bug fixed in Ruby lexer where out of bounds access could occur.
+	</li>
+	<li>
+	Bug fixed in XML folding where tags were not being folded because they are singletons in HTML.
+	</li>
+	<li>
+	Bug fixed when many font names used.
+	</li>
+	<li>
+	Layout bug fixed on GTK+ where fonts have ligatures available.
+	</li>
+	<li>
+	Bug fixed with SCI_LINETRANSPOSE on a blank line.
+	</li>
+	<li>
+	SciTE hang fixed when using UNC path with directory properties feature.
+	</li>
+	<li>
+	Bug on Windows fixed by examining dropped text for Unicode even in non-Unicode mode so it
+	can work when source only provides Unicode or when using an encoding different from the
+	system default.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where Stop Executing did not work when more than a single process started.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where mouse wheel was not switching between buffers.
+	</li>
+	<li>
+	Minor line end fix to PostScript lexer.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite173.zip?download">Release 1.73</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 March 2007.
+	</li>
+	<li>
+	SciTE adds a Directory properties file to configure behaviour for files in a directory and its subdirectories.
+	</li>
+	<li>
+	Style changes may be made during text modification events.
+	</li>
+	<li>
+	Regular expressions recognize \d, \D, \s, \S, \w, \W, and \xHH.
+	</li>
+	<li>
+	Support for cmake language added.
+	</li>
+	<li>
+	More Scintilla properties can be queried.
+	</li>
+	<li>
+	Edge line drawn under text.
+	</li>
+	<li>
+	A savesession command added to SciTE director interface.
+	</li>
+	<li>
+	SciTE File | Encoding menu item names changed to be less confusing.
+	</li>
+	<li>
+	SciTE on GTK+ dialog buttons reordered to follow guidelines.
+	</li>
+	<li>
+	SciTE on GTK+ removed GTK+ 1.x compatible file dialog code.
+	</li>
+	<li>
+	SciTE on GTK+ recognizes key names KeypadMultiply and KeypadDivide.
+	</li>
+	<li>
+	Background colour of line wrapping visual flag changed to STYLE_DEFAULT.
+	</li>
+	<li>
+	Makefile lexing enhanced for ':=' operator and when lines start with tab.
+	</li>
+	<li>
+	TADS3 lexer and folder improved.
+	</li>
+	<li>
+	SCN_DOUBLECLICK notification may set SCI_SHIFT, SCI_CTRL, and SCI_ALT flags on modifiers field.
+	</li>
+	<li>
+	Slow folding of large constructs in Python fixed.
+	</li>
+	<li>
+	MSSQL folding fixed to be case-insensitive and fold at more keywords.
+	</li>
+	<li>
+	SciTE's brace matching works better for HTML.
+	</li>
+	<li>
+	Determining API list items checks for specified parameters start character before default '('.
+	</li>
+	<li>
+	Hang fixed in HTML lexer.
+	</li>
+	<li>
+	Bug fixed in with LineTranspose command where markers could move to different line.
+	</li>
+	<li>
+	Memory released when buffer completely emptied.
+	</li>
+	<li>
+	If translucency not available on Windows, draw rectangular outline instead.
+	</li>
+	<li>
+	Bash lexer handles "-x" in "--x-includes..." better.
+	</li>
+	<li>
+	AutoIt3 lexer fixes string followed by '+'.
+	</li>
+	<li>
+	LinesJoin fixed where it stopped early due to not adjusting for inserted spaces..
+	</li>
+	<li>
+	StutteredPageDown fixed when lines wrapped.
+	</li>
+	<li>
+	FormatRange fixed to not double count line number width which could lead to a large space.
+	</li>
+	<li>
+	SciTE Export As PDF and Latex commands fixed to format floating point numbers with '.' even in locales
+	that use ','.
+	</li>
+	<li>
+	SciTE bug fixed where File | New could produce buffer with contents of previous file when using read-only mode.
+	</li>
+	<li>
+	SciTE retains current scroll position when switching buffers and fold.on.open set.
+	</li>
+	<li>
+	SciTE crash fixed where '*' used to invoke parameters dialog.
+	</li>
+	<li>
+	SciTE bugs when writing large UCS-2 files fixed.
+	</li>
+	<li>
+	Bug fixed when scrolling inside a SCN_PAINTED event by invalidating window
+	rather than trying to perform synchronous painting.
+	</li>
+	<li>
+	SciTE for GTK+ View | Full Screen works on recent versions of GTK+.
+	</li>
+	<li>
+	SciTE for Windows enables and disables toolbar commands correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite172.zip?download">Release 1.72</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 15 January 2007.
+	</li>
+	<li>
+	Performance of per-line data improved.
+	</li>
+	<li>
+	SC_STARTACTION flag set on the first modification notification in an undo
+	transaction to help synchronize the container's undo stack with Scintilla's.
+	</li>
+	<li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li>
+	<li>
+	Scintilla supports extending appearance of selection to right hand margin.
+	</li>
+	<li>
+	Incremental search available on GTK+.
+	</li>
+	<li>
+	SciTE Indentation Settings dialog available on GTK+ and adds a "Convert" button.
+	</li>
+	<li>
+	Find in Files can optionally ignore binary files or directories that start with ".".
+	</li>
+	<li>
+	Lexer added for "D" language.
+	</li>
+	<li>
+	Export as HTML shows folding with underline lines and +/- symbols.
+	</li>
+	<li>
+	Ruby lexer interprets interpolated strings as expressions.
+	</li>
+	<li>
+	Lua lexer fixes some cases of numeric literals.
+	</li>
+	<li>
+	C++ folder fixes bug with "@" in doc comments.
+	</li>
+	<li>
+	NSIS folder handles !if and related commands.
+	</li>
+	<li>
+	Inno setup lexer adds styling for single and double quoted strings.
+	</li>
+	<li>
+	Matlab lexer handles backslashes in string literals correctly.
+	</li>
+	<li>
+	HTML lexer fixed to allow "?&gt;" in comments in Basic script.
+	</li>
+	<li>
+	Added key codes for Windows key and Menu key.
+	</li>
+	<li>
+	Lua script method scite.MenuCommand(x) performs a menu command.
+	</li>
+	<li>
+	SciTE bug fixed with box comment command near start of file setting selection to end of file.
+	</li>
+	<li>
+	SciTE on GTK+, fixed loop that occurred with automatic loading for an unreadable file.
+	</li>
+	<li>
+	SciTE asks whether to save files when Windows shuts down.
+	</li>
+	<li>
+	Save Session on Windows now defaults the extension to "ses".
+	</li>
+	<li>
+	Bug fixed with single character keywords.
+	</li>
+	<li>
+	Fixed infinite loop for SCI_GETCOLUMN for position beyond end of document.
+	</li>
+	<li>
+	Fixed failure to accept typing on Solaris/GTK+ when using default ISO-8859-1 encoding.
+	</li>
+	<li>
+	Fixed warning from Lua in SciTE when creating a new buffer when already have
+	maximum number of buffers open.
+	</li>
+	<li>
+	Crash fixed with "%%" at end of batch file.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite171.zip?download">Release 1.71</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 21 August 2006.
+	</li>
+	<!--li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li-->
+	<li>
+	Double click notification includes line and position.
+	</li>
+	<li>
+	VB lexer bugs fixed for preprocessor directive below a comment or some other states and
+	to use string not closed style back to the starting quote when there are internal doubled quotes.
+	</li>
+	<li>
+	C++ lexer allows identifiers to contain '$' and non-ASCII characters such as UTF-8.
+	The '$' character can be disallowed with lexer.cpp.allow.dollars=0.
+	</li>
+	<li>
+	Perl lexer allows UTF-8 identifiers and has some other small improvements.
+	</li>
+	<li>
+	SciTE's $(CurrentWord) uses word.characters.&lt;filepattern&gt; to define the word
+	rather than a hardcoded list of word characters.
+	</li>
+	<li>
+	SciTE Export as HTML adds encoding information for UTF-8 file and fixes DOCTYPE.
+	</li>
+	<li>
+	SciTE session and .recent files default to the user properties directory rather than global
+	properties directory.
+	</li>
+	<li>
+	Left and right scroll events handled correctly on GTK+ and horizontal scroll bar has more sensible
+	distances for page and arrow clicks.
+	</li>
+	<li>
+	SciTE on GTK+ tab bar fixed to work on recent versions of GTK+.
+	</li>
+	<li>
+	On GTK+, if the approximate character set conversion is unavailable, a second attempt is made
+	without approximations. This may allow keyboard input and paste to work on older systems.
+	</li>
+	<li>
+	SciTE on GTK+ can redefine the Insert key.
+	</li>
+	<li>
+	SciTE scripting interface bug fixed where some string properties could not be changed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite170.zip?download">Release 1.70</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 20 June 2006.
+	</li>
+	<li>
+	On GTK+, character set conversion is performed using an option that allows approximate conversions rather
+	than failures when a character can not be converted. This may lead to similar characters being inserted or
+	when no similar character is available a '?' may be inserted.
+	</li>
+	<li>
+	On GTK+, the internationalized IM (Input Method) feature is used for all typed input for all character sets.
+	</li>
+	<li>
+	Scintilla has new margin types SC_MARGIN_BACK and SC_MARGIN_FORE that use the default
+	style's background and foreground colours (normally white and black) as the background to the margin.
+	</li>
+	<li>
+	Scintilla/GTK+ allows file drops on Windows when drop is of type DROPFILES_DND
+	as well as text/uri-list.
+	</li>
+	<li>
+	Code page can only be set to one of the listed valid values.
+	</li>
+	<li>
+	Text wrapping fixed for cases where insertion was not wide enough to trigger
+	wrapping before being styled but was after styling.
+	</li>
+	<li>
+	SciTE find marks are removed before printing or exporting to avoid producing incorrect styles.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite169.zip?download">Release 1.69</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2006.
+	</li>
+	<li>
+	SciTE supports z-order based buffer switching on Ctrl+Tab.
+	</li>
+	<li>
+	Translucent support for selection and whole line markers.
+	</li>
+	<li>
+	SciTE may have per-language abbreviations files.
+	</li>
+	<li>
+	Support for Spice language.
+	</li>
+	<li>
+	On GTK+ autocompletion lists are optimized and use correct selection colours.
+	</li>
+	<li>
+	On GTK+ the URI data type is preferred in drag and drop so that applications
+	will see files dragged from the shell rather than dragging the text of the file name
+	into the document.
+	</li>
+	<li>
+	Increased number of margins to 5.
+	</li>
+	<li>
+	Basic lexer allows include directive $include: "file name".
+	</li>
+	<li>
+	SQL lexer no longer bases folding on indentation.
+	</li>
+	<li>
+	Line ends are transformed when copied to clipboard on
+	Windows/GTK+2 as well as Windows/GTK+ 1.
+	</li>
+	<li>
+	Lexing code masks off the indicator bits on the start style before calling the lexer
+	to avoid confusing the lexer when an application has used an indicator.
+	</li>
+	<li>
+	SciTE savebefore:yes only saves the file when it has been changed.
+	</li>
+	<li>
+	SciTE adds output.initial.hide setting to allow setting the size of the output pane
+	without it showing initially.
+	</li>
+	<li>
+	SciTE on Windows Go To dialog allows line number with more digits.
+	</li>
+	<li>
+	Bug in HTML lexer fixed where a segment of PHP could switch scripting language
+	based on earlier text on that line.
+	</li>
+	<li>
+	Memory bug fixed when freeing regions on GTK+.
+	Other minor bugs fixed on GTK+.
+	</li>
+	<li>
+	Deprecated GTK+ calls in Scintilla replaced with current calls.
+	</li>
+	<li>
+	Fixed a SciTE bug where closing the final buffer, if read-only, left the text present in an
+	untitled buffer.
+	</li>
+	<li>
+	Bug fixed in bash lexer that prevented folding.
+	</li>
+	<li>
+	Crash fixed in bash lexer when backslash at end of file.
+	</li>
+	<li>
+	Crash on recent releases of GTK+ 2.x avoided by changing default font from X
+	core font to Pango font "!Sans".
+	</li>
+	<li>
+	Fix for SciTE properties files where multiline properties continued over completely blank lines.
+	</li>
+	<li>
+	Bug fixed in SciTE/GTK+ director interface where more data available than
+	buffer size.
+	</li>
+	<li>
+	Minor visual fixes to SciTE splitter on GTK+.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite168.zip?download">Release 1.68</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 9 March 2006.
+	</li>
+	<li>
+	Translucent drawing implemented for caret line and box indicators.
+	</li>
+	<li>
+	Lexer specifically for TCL is much more accurate than reusing C++ lexer.
+	</li>
+	<li>
+	Support for Inno Setup scripts.
+	</li>
+	<li>
+	Support for Opal language.
+	</li>
+	<li>
+	Calltips may use a new style, STYLE_CALLTIP which allows choosing a
+	different font for calltips.
+	</li>
+	<li>
+	Python lexer styles comments on decorators.
+	</li>
+	<li>
+	HTML lexer refined handling of "?>" and "%>" within server
+	side scripts.
+	</li>
+	<li>
+	Batch file lexer improved.
+	</li>
+	<li>
+	Eiffel lexer doesn't treat '.' as a name character.
+	</li>
+	<li>
+	Lua lexer handles length operator, #, and hex literals.
+	</li>
+	<li>
+	Properties file lexer has separate style for keys.
+	</li>
+	<li>
+	PL/SQL folding improved.
+	</li>
+	<li>
+	SciTE Replace dialog always searches in forwards direction.
+	</li>
+	<li>
+	SciTE can detect language of file from initial #! line.
+	</li>
+	<li>
+	SciTE on GTK+ supports output.scroll=2 setting.
+	</li>
+	<li>
+	SciTE can perform an import a properties file from the command line.
+	</li>
+	<li>
+	Set of word characters used for regular expression \&lt; and \&gt;.
+	</li>
+	<li>
+	Bug fixed with SCI_COPYTEXT stopping too early.
+	</li>
+	<li>
+	Bug fixed with splitting lines so that all lines are split.
+	</li>
+	<li>
+	SciTE calls OnSwitchFile when closing one buffer causes a switch to another.
+	</li>
+	<li>
+	SciTE bug fixed where properties were being reevaluated without good reason
+	after running a macro.
+	</li>
+	<li>
+	Crash fixed when clearing document with some lines contracted in word wrap mode.
+	</li>
+	<li>
+	Palette expands as more entries are needed.
+	</li>
+	<li>
+	SCI_POSITIONFROMPOINT returns more reasonable value when close to
+	last text on a line.
+	</li>
+	<li>
+	On Windows, long pieces of text may be drawn in segments if they fail to draw
+	as a whole.
+	</li>
+	<li>
+	Bug fixed with bad drawing when some visual changes made inside SCN_UPDATEUI
+	notification.
+	</li>
+	<li>
+	SciTE bug fixed with groupundo setting.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite167.zip?download">Release 1.67</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 17 December 2005.
+	</li>
+	<li>
+	Scintilla checks the paint region more accurately when seeing if an area is being
+	repainted. Platform layer implementations may need to change for this to take
+	effect. This fixes some drawing and styling bugs. Also optimized some parts of
+	marker code to only redraw the line of the marker rather than whole of the margin.
+	</li>
+	<li>
+	Quoted identifier style for SQL. SQL folding performed more simply.
+	</li>
+	<li>
+	Ruby lexer improved to better handle here documents and non-ASCII
+	characters.
+	</li>
+	<li>
+	Lua lexer supports long string and block comment syntax from Lua 5.1.
+	</li>
+	<li>
+	Bash lexer handles here documents better.
+	</li>
+	<li>
+	JavaScript lexing recognizes regular expressions more accurately and includes flag
+	characters in the regular expression style. This is both in JavaScript files and when
+	JavaScript is embedded in HTML.
+	</li>
+	<li>
+	Scintilla API provided to reveal how many style bits are needed for the
+	current lexer.
+	</li>
+	<li>
+	Selection duplicate added.
+	</li>
+	<li>
+	Scintilla API for adding a set of markers to a line.
+	</li>
+	<li>
+	DBCS encodings work on Windows 9x.
+	</li>
+	<li>
+	Convention defined for property names to be used by lexers and folders
+	so they can be automatically discovered and forwarded from containers.
+	</li>
+	<li>
+	Default bookmark in SciTE changed to a blue sphere image.
+	</li>
+	<li>
+	SciTE stores the time of last asking for a save separately for each buffer
+	which fixes bugs with automatic reloading.
+	</li>
+	<li>
+	On Windows, pasted text has line ends converted to current preference.
+	GTK+ already did this.
+	</li>
+	<li>
+	Kid template language better handled by HTML lexer by finishing ASP Python
+	mode when a ?> is found.
+	</li>
+	<li>
+	SciTE counts number of characters in a rectangular selection correctly.
+	</li>
+	<li>
+	64-bit compatibility improved. One change that may affect user code is that
+	the notification message header changed to include a pointer-sized id field
+	to match the current Windows definition.
+	</li>
+	<li>
+	Empty ranges can no longer be dragged.
+	</li>
+	<li>
+	Crash fixed when calls made that use layout inside the painted notification.
+	</li>
+	<li>
+	Bug fixed where Scintilla created pixmap buffers that were too large leading
+	to failures when many instances used.
+	</li>
+	<li>
+	SciTE sets the directory of a new file to the directory of the currently
+	active file.
+	</li>
+	<li>
+	SciTE allows choosing a code page for the output pane.
+	</li>
+	<li>
+	SciTE HTML exporter no longer honours monospaced font setting.
+	</li>
+	<li>
+	Line layout cache in page mode caches the line of the caret. An assertion is
+	now used to ensure that the layout reentrancy problem that caused this
+	is easier to find.
+	</li>
+	<li>
+	Speed optimized for long lines and lines containing many control characters.
+	</li>
+	<li>
+	Bug fixed in brace matching in DBCS files where byte inside character
+	is same as brace.
+	</li>
+	<li>
+	Indent command does not indent empty lines.
+	</li>
+	<li>
+	SciTE bug fixed for commands that operate on files with empty extensions.
+	</li>
+	<li>
+	SciTE bug fixed where monospaced option was copied for subsequently opened files.
+	</li>
+	<li>
+	SciTE on Windows bug fixed in the display of a non-ASCII search string
+	which can not be found.
+	</li>
+	<li>
+	Bugs fixed with nested calls displaying a new calltip while one is already
+	displayed.
+	</li>
+	<li>
+	Bug fixed when styling PHP strings.
+	</li>
+	<li>
+	Bug fixed when styling C++ continued preprocessor lines.
+	</li>
+	<li>
+	SciTE bug fixed where opening file from recently used list reset choice of
+	language.
+	</li>
+	<li>
+	SciTE bug fixed when compiled with NO_EXTENSIONS and
+	closing one file closes the application.
+	</li>
+	<li>
+	SciTE crash fixed for error messages that look like Lua messages but aren't
+	in the same order.
+	</li>
+	<li>
+	Remaining fold box support deprecated. The symbols SC_FOLDLEVELBOXHEADERFLAG,
+   SC_FOLDLEVELBOXFOOTERFLAG, SC_FOLDLEVELCONTRACTED,
+   SC_FOLDLEVELUNINDENT, and SC_FOLDFLAG_BOX are deprecated.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite166.zip?download">Release 1.66</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 26 August 2005.
+	</li>
+	<li>
+	New, more ambitious Ruby lexer.
+	</li>
+	<li>
+	SciTE Find in Files dialog has options for matching case and whole words which are
+	enabled when the internal find command is used.
+	</li>
+	<li>
+	SciTE output pane can display automatic completion after "$(" typed.
+	An initial ">" on a line is ignored when Enter pressed.
+	</li>
+	<li>
+	C++ lexer recognizes keywords within line doc comments. It continues styles over line
+	end characters more consistently so that eolfilled style can be used for preprocessor lines
+	and line comments.
+	</li>
+	<li>
+	VB lexer improves handling of file numbers and date literals.
+	</li>
+	<li>
+	Lua folder handles repeat until, nested comments and nested strings.
+	</li>
+	<li>
+	POV lexer improves handling of comment lines.
+	</li>
+	<li>
+	AU3 lexer and folder updated. COMOBJ style added.
+	</li>
+	<li>
+	Bug fixed with text display on GTK+ with Pango 1.8.
+	</li>
+	<li>
+	Caret painting avoided when not focused.
+	</li>
+	<li>
+	SciTE on GTK+ handles file names used to reference properties as case-sensitive.
+	</li>
+	<li>
+	SciTE on GTK+ Save As and Export commands set the file name field.
+	On GTK+ the Export commands modify the file name in the same way as on Windows.
+	</li>
+	<li>
+	Fixed SciTE problem where confirmation was not displaying when closing a file where all
+	contents had been deleted.
+	</li>
+	<li>
+	Middle click on SciTE tab now closes correct buffer on Windows when tool bar is visible.
+	</li>
+	<li>
+	SciTE bugs fixed where files contained in directory that includes '.' character.
+	</li>
+	<li>
+	SciTE bug fixed where import in user options was reading file from directory of
+	global options.
+	</li>
+	<li>
+	SciTE calltip bug fixed where single line calltips had arrow displayed incorrectly.
+	</li>
+	<li>
+	SciTE folding bug fixed where empty lines were shown for no reason.
+	</li>
+	<li>
+	Bug fixed where 2 byte per pixel XPM images caused crash although they are still not
+	displayed.
+	</li>
+	<li>
+	Autocompletion list size tweaked.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite165.zip?download">Release 1.65</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 August 2005.
+	</li>
+	<li>
+	FreeBasic support.
+	</li>
+	<li>
+	SciTE on Windows handles command line arguments
+	"-" (read standard input into buffer),
+	"--" (read standard input into output pane) and
+	"-@" (read file names from standard input and open each).
+	</li>
+	<li>
+	SciTE includes a simple implementation of Find in Files which is used if no find.command is set.
+	</li>
+	<li>
+	SciTE can close tabs with a mouse middle click.
+	</li>
+	<li>
+	SciTE includes a save.all.for.build setting.
+	</li>
+	<li>
+	Folder for MSSQL.
+	</li>
+	<li>
+	Batch file lexer understands more of the syntax and the behaviour of built in commands.
+	</li>
+	<li>
+	Perl lexer handles here docs better; disambiguates barewords, quote-like delimiters, and repetition operators;
+	handles Pods after __END__; recognizes numbers better; and handles some typeglob special variables.
+	</li>
+	<li>
+	Lisp adds more lexical states.
+	</li>
+	<li>
+	PHP allows spaces after &lt;&lt;&lt;.
+	</li>
+	<li>
+	TADS3 has a simpler set of states and recognizes identifiers.
+	</li>
+	<li>
+	Avenue elseif folds better.
+	</li>
+	<li>
+	Errorlist lexer treats lines starting with '+++' and '---' as separate
+	styles from '+' and '-' as they indicate file names in diffs.
+	</li>
+	<li>
+	SciTE error recognizer handles file paths in extra explanatory lines from MSVC
+	and in '+++' and '---' lines from diff.
+	</li>
+	<li>
+	Bugs fixed in SciTE and Scintilla folding behaviour when text pasted before
+	folded text caused unnecessary
+	unfolding and cutting text could lead to text being irretrievably hidden.
+	</li>
+	<li>
+	SciTE on Windows uses correct font for dialogs and better font for tab bar
+	allowing better localization
+	</li>
+	<li>
+	When Windows is used with a secondary monitor before the primary
+	monitor, autocompletion lists are not forced onto the primary monitor.
+	</li>
+	<li>
+	Scintilla calltip bug fixed where down arrow setting wrong value in notification
+	if not in first line. SciTE bug fixed where second arrow only shown on multiple line
+	calltip and was therefore misinterpreting the notification value.
+	</li>
+	<li>
+	Lexers will no longer be re-entered recursively during, for example, fold level setting.
+	</li>
+	<li>
+	Undo of typing in overwrite mode undoes one character at a time rather than requiring a removal
+	and addition step for each character.
+	</li>
+	<li>
+	EM_EXSETSEL(0,-1) fixed.
+	</li>
+	<li>
+	Bug fixed where part of a rectangular selection was not shown as selected.
+	</li>
+	<li>
+	Autocomplete window size fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite164.zip?download">Release 1.64</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 6 June 2005.
+	</li>
+	<li>
+	TADS3 support
+	</li>
+	<li>
+	Smalltalk support.
+	</li>
+	<li>
+	Rebol support.
+	</li>
+	<li>
+	Flagship (Clipper / XBase) support.
+	</li>
+	<li>
+	CSound support.
+	</li>
+	<li>
+	SQL enhanced to support SQL*Plus.
+	</li>
+	<li>
+	SC_MARK_FULLRECT margin marker fills the whole marker margin for marked
+	lines with a colour.
+	</li>
+	<li>
+	Performance improved for some large undo and redo operations and modification flags
+	added in notifications.
+	</li>
+	<li>
+	SciTE adds command equivalents for fold margin mouse actions.
+	</li>
+	<li>
+	SciTE adds OnUpdateUI to set of events that can be handled by a Lua script.
+	</li>
+	<li>
+	Properties set in Scintilla can be read.
+	</li>
+	<li>
+	GTK+ SciTE exit confirmation adds Cancel button.
+	</li>
+	<li>
+	More accurate lexing of numbers in PHP and Caml.
+	</li>
+	<li>
+	Perl can fold POD and package sections. POD verbatim section style.
+	Globbing syntax recognized better.
+	</li>
+	<li>
+	Context menu moved slightly on GTK+ so that it will be under the mouse and will
+	stay open if just clicked rather than held.
+	</li>
+	<li>
+	Rectangular selection paste works the same whichever direction the selection was dragged in.
+	</li>
+	<li>
+	EncodedFromUTF8 handles -1 length argument as documented.
+	</li>
+	<li>
+	Undo and redo can cause SCN_MODIFYATTEMPTRO notifications.
+	</li>
+	<li>
+	Indicators display correctly when they start at the second character on a line.
+	</li>
+	<li>
+	SciTE Export As HTML uses standards compliant CSS.
+	</li>
+	<li>
+	SciTE automatic indentation handles keywords for indentation better.
+	</li>
+	<li>
+	SciTE fold.comment.python property removed as does not work.
+	</li>
+	<li>
+	Fixed problem with character set conversion when pasting on GTK+.
+	</li>
+	<li>
+	SciTE default character set changed from ANSI_CHARSET to DEFAULT_CHARSET.
+	</li>
+	<li>
+	Fixed crash when creating empty autocompletion list.
+	</li>
+	<li>
+	Autocomplete window size made larger under some conditions to make truncation less common.
+	</li>
+	<li>
+	Bug fixed where changing case of a selection did not affect initial character of lines
+	in multi-byte encodings.
+	</li>
+	<li>
+	Bug fixed where rectangular selection not displayed after Alt+Shift+Click.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite163.zip?download">Release 1.63</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 4 April 2005.
+	</li>
+	<li>
+	Autocompletion on Windows changed to use pop up window, be faster,
+	allow choice of maximum width and height, and to highlight only the text of the
+	selected item rather than both the text and icon if any.
+	</li>
+	<li>
+	Extra items can be added to the context menu in SciTE.
+	</li>
+	<li>
+	Character wrap mode in Scintilla helps East Asian languages.
+	</li>
+	<li>
+	Lexer added for Haskell.
+	</li>
+	<li>
+	Objective Caml support.
+	</li>
+	<li>
+	BlitzBasic and PureBasic support.
+	</li>
+	<li>
+	CSS support updated to handle CSS2.
+	</li>
+	<li>
+	C++ lexer is more selective about document comment keywords.
+	</li>
+	<li>
+	AutoIt 3 lexer improved.
+	</li>
+	<li>
+	Lua lexer styles end of line characters on comment and preprocessor
+	lines so that the eolfilled style can be applied to them.
+	</li>
+	<li>
+	NSIS support updated for line continuations, box comments, SectionGroup and
+	PageEx, and with more up-to-date properties.
+	</li>
+	<li>
+	Clarion lexer updated to perform folding and have more styles.
+	</li>
+	<li>
+	SQL lexer gains second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer recognizes Borland Delphi error messages.
+	</li>
+	<li>
+	Method added for determining number of visual lines occupied by a document
+	line due to wrapping.
+	</li>
+	<li>
+	Sticky caret mode does not modify the preferred caret x position when typing
+	and may be useful for typing columns of text.
+	</li>
+	<li>
+	Dwell end notification sent when scroll occurs.
+	</li>
+	<li>
+	On GTK+, Scintilla requisition height is screen height rather than large fixed value.
+	</li>
+	<li>
+	Case insensitive autocompletion prefers exact case match.
+	</li>
+	<li>
+	SCI_PARADOWN and SCI_PARAUP treat lines containing only white
+	space as empty and handle text hidden by folding.
+	</li>
+	<li>
+	Scintilla on Windows supports WM_PRINTCLIENT although there are some
+	limitations.
+	</li>
+	<li>
+	SCN_AUTOCSELECTION notification sent when user selects from autoselection list.
+	</li>
+	<li>
+	SciTE's standard properties file sets buffers to 10, uses Pango fonts on GTK+ and
+	has dropped several languages to make the menu fit on screen.
+	</li>
+	<li>
+	SciTE's encoding cookie detection loosened so that common XML files will load
+	in UTF-8 if that is their declared encoding.
+	</li>
+	<li>
+	SciTE on GTK+ changes menus and toolbars to not be detachable unless turned
+	on with a property. Menus no longer tear off. The toolbar may be set to use the
+	default theme icons rather than SciTE's set. Changed key for View | End of Line
+	because of a conflict. Language menu can contain more items.
+	</li>
+	<li>
+	SciTE on GTK+ 2.x allows the height and width of the file open file chooser to
+	be set, for the show hidden files check box to be set from an option and for it
+	to be opened in the directory of the current file explicitly. Enter key works in
+	save chooser.
+	</li>
+	<li>
+	Scintilla lexers should no longer see bits in style bytes that are outside the set
+	they modify so should be able to correctly lex documents where the container
+	has used indicators.
+	</li>
+	<li>
+	SciTE no longer asks to save before performing a revert.
+	</li>
+	<li>
+	SciTE director interface adds a reloadproperties command to reload properties
+	from files.
+	</li>
+	<li>
+	Allow build on CYGWIN platform.
+	</li>
+	<li>
+	Allow use from LccWin compiler.
+	</li>
+	<li>
+	SCI_COLOURISE for SCLEX_CONTAINER causes a
+	SCN_STYLENEEDED notification.
+	</li>
+	<li>
+	Bugs fixed in lexing of HTML/ASP/JScript.
+	</li>
+	<li>
+	Fix for folding becoming confused.
+	</li>
+	<li>
+	On Windows, fixes for Japanese Input Method Editor and for 8 bit Katakana
+	characters.
+	</li>
+	<li>
+	Fixed buffer size bug avoided when typing long words by making buffer bigger.
+	</li>
+	<li>
+	Undo after automatic indentation more sensible.
+	</li>
+	<li>
+	SciTE menus on GTK+ uses Shift and Ctrl rather than old style abbreviations.
+	</li>
+	<li>
+	SciTE full screen mode on Windows calculates size more correctly.
+	</li>
+	<li>
+	SciTE on Windows menus work better with skinning applications.
+	</li>
+	<li>
+	Searching bugs fixed.
+	</li>
+	<li>
+	Colours reallocated when changing image using SCI_REGISTERIMAGE.
+	</li>
+	<li>
+	Caret stays visible when Enter held down.
+	</li>
+	<li>
+	Undo of automatic indentation more reasonable.
+	</li>
+	<li>
+	High processor usage fixed in background wrapping under some
+	circumstances.
+	</li>
+	<li>
+	Crashing bug fixed on AMD64.
+	</li>
+	<li>
+	SciTE crashing bug fixed when position.height or position.width not set.
+	</li>
+	<li>
+	Crashing bug on GTK+ fixed when setting cursor and window is NULL.
+	</li>
+	<li>
+	Crashing bug on GTK+ preedit window fixed.
+	</li>
+	<li>
+	SciTE crashing bug fixed in incremental search on Windows ME.
+	</li>
+	<li>
+	SciTE on Windows has a optional find and replace dialogs that can search through
+	all buffers and search within a particular style number.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite162.zip?download">Release 1.62</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 October 2004.
+	</li>
+	<li>
+	Lexer added for ASN.1.
+	</li>
+	<li>
+	Lexer added for VHDL.
+	</li>
+	<li>
+	On Windows, an invisible system caret is used to allow screen readers to determine
+	where the caret is. The visible caret is still drawn by the painting code.
+	</li>
+	<li>
+	On GTK+, Scintilla has methods to read the target as UTF-8 and to convert
+	a string from UTF-8 to the document encoding. This eases integration with
+	containers that use the UTF-8 encoding which is the API encoding for GTK+ 2.
+	</li>
+	<li>
+	SciTE on GTK+2 and Windows NT/2000/XP allows search and replace of Unicode text.
+	</li>
+	<li>
+	SciTE calltips allow setting the characters used to start and end parameter lists and
+	to separate parameters.
+	</li>
+	<li>
+	FindColumn method converts a line and column into a position, taking into account
+	tabs and multi-byte characters.
+	</li>
+	<li>
+	On Windows, when Scintilla copies text to the clipboard as Unicode, it avoids
+	adding an ANSI copy as the system will automatically convert as required in
+	a context-sensitive manner.
+	</li>
+	<li>
+	SciTE indent.auto setting automatically determines indent.size and use.tabs from
+	document contents.
+	</li>
+	<li>
+	SciTE defines a CurrentMessage property that holds the most recently selected
+	output pane message.
+	</li>
+	<li>
+	SciTE Lua scripting enhanced with
+	<ul>
+	<li>A Lua table called 'buffer' is associated with each buffer and can be used to
+	maintain buffer-specific state.</li>
+	<li>A 'scite' object allows interaction with the application such as opening
+	files from script.</li>
+	<li>Dynamic properties can be reset by assigning nil to a given key in
+	the props table.</li>
+	<li>An 'OnClear' event fires whenever properties and extension scripts are
+	about to be reloaded.</li>
+	<li>On Windows, loadlib is enabled and can be used to access Lua
+	binary modules / DLLs.</li></ul>
+	</li>
+	<li>
+	SciTE Find in Files on Windows can be used in a modeless way and gains a '..'
+	button to move up to the parent directory. It is also wider so that longer paths
+	can be seen.
+	</li>
+	<li>
+	Close buttons added to dialogs in SciTE on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ 2 has a "hidden files" check box in file open dialog.
+	</li>
+	<li>
+	SciTE use.monospaced setting removed. More information in the
+	<a href="SciTEFAQ.html">FAQ</a>.
+	</li>
+	<li>
+	APDL lexer updated with more lexical classes
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Ada lexer fixed to support non-ASCII text.
+	</li>
+	<li>
+	Cpp lexer now only matches exactly three slashes as starting a doc-comment so that
+	lines of slashes are seen as a normal comment.
+	Line ending characters are appear in default style on preprocessor and single line
+	comment lines.
+	</li>
+	<li>
+	CSS lexer updated to support CSS2 including second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer now understands Java stack trace lines.
+	</li>
+	<li>
+	SciTE's handling of HTML Tidy messages jumps to column as well as line indicated.
+	</li>
+	<li>
+	Lisp lexer allows multiline strings.
+	</li>
+	<li>
+	Lua lexer treats .. as an operator when between identifiers.
+	</li>
+	<li>
+	PHP lexer handles 'e' in numerical literals.
+	</li>
+	<li>
+	PowerBasic lexer updated for macros and optimized.
+	</li>
+	<li>
+	Properties file folder changed to leave lines before a header at the base level
+	and thus avoid a vertical line when using connected folding symbols.
+	</li>
+	<li>
+	GTK+ on Windows version uses Alt for rectangular selection to be compatible with
+	platform convention.
+	</li>
+	<li>
+	SciTE abbreviations file moved from system directory to user directory
+	so each user can have separate abbreviations.
+	</li>
+	<li>
+	SciTE on GTK+ has improved .desktop file and make install support that may
+	lead to better integration with system shell.
+	</li>
+	<li>
+	Disabling of themed background drawing on GTK+ extended to all cases.
+	</li>
+	<li>
+	SciTE date formatting on Windows performed with the user setting rather than the
+	system setting.
+	</li>
+	<li>
+	GTK+ 2 redraw while scrolling fixed.
+	</li>
+	<li>
+	Recursive property definitions are safer, avoiding expansion when detected.
+	</li>
+	<li>
+	SciTE thread synchronization for scripts no longer uses HWND_MESSAGE
+	so is compatible with older versions of Windows.
+	Other Lua scripting bugs fixed.
+	</li>
+	<li>
+	SciTE on Windows localization of menu accelerators changed to be compatible
+	with alternative UI themes.
+	</li>
+	<li>
+	SciTE on Windows full screen mode now fits better when menu different height
+	to title bar height.
+	</li>
+	<li>
+	SC_MARK_EMPTY marker is now invisible and does not change the background
+	colour.
+	</li>
+	<li>
+	Bug fixed in HTML lexer to allow use of &lt;?xml in strings in scripts without
+	triggering xml mode.
+	</li>
+	<li>
+	Bug fixed in SciTE abbreviation expansion that could break indentation or crash.
+	</li>
+	<li>
+	Bug fixed when searching for a whole word string that ends one character before
+	end of document.
+	</li>
+	<li>
+	Drawing bug fixed when indicators drawn on wrapped lines.
+	</li>
+	<li>
+	Bug fixed when double clicking a hotspot.
+	</li>
+	<li>
+	Bug fixed where autocompletion would remove typed text if no match found.
+	</li>
+	<li>
+	Bug fixed where display does not scroll when inserting in long wrapped line.
+	</li>
+	<li>
+	Bug fixed where SCI_MARKERDELETEALL would only remove one of the markers
+	on a line that contained multiple markers with the same number.
+	</li>
+	<li>
+	Bug fixed where markers would move when converting line endings.
+	</li>
+	<li>
+	Bug fixed where SCI_LINEENDWRAP would move too far when line ends are visible.
+	</li>
+	<li>
+	Bugs fixed where calltips with unicode or other non-ASCII text would display
+	incorrectly.
+	</li>
+	<li>
+	Bug fixed in determining if at save point after undoing from save point and then
+	performing changes.
+	</li>
+	<li>
+	Bug fixed on GTK+ using unsupported code pages where extraneous text could
+	be drawn.
+	</li>
+	<li>
+	Bug fixed in drag and drop code on Windows where dragging from SciTE to
+	Firefox could hang both applications.
+	</li>
+	<li>
+	Crashing bug fixed on GTK+ when no font allocation succeeds.
+	</li>
+	<li>
+	Crashing bug fixed when autocompleting word longer than 1000 characters.
+	</li>
+	<li>
+	SciTE crashing bug fixed when both Find and Replace dialogs shown by disallowing
+	this situation.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite161.zip?download">Release 1.61</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2004.
+	</li>
+	<li>
+	Improvements to selection handling on GTK+.
+	</li>
+	<li>
+	SciTE on GTK+ 2.4 uses the improved file chooser which allows
+	file extension filters, multiple selection, and remembers favourite
+	directories.
+	</li>
+	<li>
+	SciTE Load Session and Save Session commands available on GTK+.
+	</li>
+	<li>
+	SciTE lists Lua Startup Script in Options menu when loaded.
+	</li>
+	<li>
+	In SciTE, OnUserListSelection can be implemented in Lua.
+	</li>
+	<li>
+	SciTE on Windows has a context menu on the file tabs.
+	</li>
+	<li>
+	SQL lexer allows '#' comments and optionally '\' quoting inside strings.
+	</li>
+	<li>
+	Mssql lexer improved.
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Perl lexer recognizes regular expression use better.
+	</li>
+	<li>
+	Errorlist lexer understands Lua tracebacks and copes with findstr
+	output for file names that end with digits.
+	</li>
+	<li>
+	Drawing of lines on GTK+ improved and made more like Windows
+	without final point.
+	</li>
+	<li>
+	SciTE on GTK+ uses a high resolution window icon.
+	</li>
+	<li>
+	SciTE can be set to warn before loading files larger than a particular size.
+	</li>
+	<li>
+	SciTE Lua scripting bugs fixed included a crashing bug when using
+	an undefined function name that would go before first actual name.
+	</li>
+	<li>
+	SciTE bug fixed where a modified buffer was not saved if it was
+	the last buffer and was not current when the New command used.
+	</li>
+	<li>
+	SciTE monofont mode no longer affects line numbers.
+	</li>
+	<li>
+	Crashing bug in SciTE avoided by not allowing both the Find and Replace
+	dialogs to be visible at one time.
+	</li>
+	<li>
+	Crashing bug in SciTE fixed when Lua scripts were being run
+	concurrently.
+	</li>
+	<li>
+	Bug fixed that caused incorrect line number width in SciTE.
+	</li>
+	<li>
+	PHP folding bug fixed.
+	</li>
+	<li>
+	Regression fixed when setting word characters to not include
+	some of the standard word characters.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite160.zip?download">Release 1.60</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 May 2004.
+	</li>
+	<li>
+	SciTE can be scripted using the Lua programming language.
+	</li>
+	<li>
+	command.mode is a better way to specify tool command options in SciTE.
+	</li>
+	<li>
+	Continuation markers can be displayed so that you can see which lines are wrapped.
+	</li>
+	<li>
+	Lexer for Gui4Cli language.
+	</li>
+	<li>
+	Lexer for Kix language.
+	</li>
+	<li>
+	Lexer for Specman E language.
+	</li>
+	<li>
+	Lexer for AutoIt3 language.
+	</li>
+	<li>
+	Lexer for APDL language.
+	</li>
+	<li>
+	Lexer for Bash language. Also reasonable for other Unix shells.
+	</li>
+	<li>
+	SciTE can load lexers implemented in external shared libraries.
+	</li>
+	<li>
+	Perl treats "." not as part of an identifier and interprets '/' and '->'
+	correctly in more circumstances.
+	</li>
+	<li>
+	PHP recognizes variables within strings.
+	</li>
+	<li>
+	NSIS has properties "nsis.uservars" and "nsis.ignorecase".
+	</li>
+	<li>
+	MSSQL lexer adds keyword list for operators and stored procedures,
+	defines '(', ')', and ',' as operators and changes some other details.
+	</li>
+	<li>
+	Input method preedit window on GTK+ 2 may support some Asian languages.
+	</li>
+	<li>
+	Platform interface adds an extra platform-specific flag to Font::Create.
+	Used on wxWidgets to choose antialiased text display but may be used for
+	any task that a platform needs.
+	</li>
+	<li>
+	OnBeforeSave method added to Extension interface.
+	</li>
+	<li>
+	Scintilla methods that return strings can be called with a NULL pointer
+	to find out how long the string should be.
+	</li>
+	<li>
+	Visual Studio .NET project file now in VS .NET 2003 format so can not be used
+	directly in VS .NET 2002.
+	</li>
+	<li>
+	Scintilla can be built with GTK+ 2 on Windows.
+	</li>
+	<li>
+	Updated RPM spec for SciTE on GTK+.
+	</li>
+	<li>
+	GTK+ makefile for SciTE allows selection of destination directory, creates destination
+	directories and sets file modes and owners better.
+	</li>
+	<li>
+	Tab indents now go to next tab multiple rather than add tab size.
+	</li>
+	<li>
+	SciTE abbreviations now use the longest possible match rather than the shortest.
+	</li>
+	<li>
+	Autocompletion does not remove prefix when actioned with no choice selected.
+	</li>
+	<li>
+	Autocompletion cancels when moving beyond the start position, not at the start position.
+	</li>
+	<li>
+	SciTE now shows only calltips for functions that match exactly, not
+	those that match as a prefix.
+	</li>
+	<li>
+	SciTE can repair box comment sections where some lines were added without
+	the box comment middle line prefix.
+	</li>
+	<li>
+	Alt+ works in user.shortcuts on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ enables replace in selection for rectangular selections.
+	</li>
+	<li>
+	Key bindings for command.shortcut implemented in a way that doesn't break
+	when the menus are localized.
+	</li>
+	<li>
+	Drawing of background on GTK+ faster as theme drawing disabled.
+	</li>
+	<li>
+	On GTK+, calltips are moved back onto the screen if they extend beyond the screen bounds.
+	</li>
+	<li>
+	On Windows, the Scintilla object is destroyed on WM_NCDESTROY rather than
+	WM_DESTROY which arrives earlier. This fixes some problems when Scintilla was subclassed.
+	</li>
+	<li>
+	The zorder switching feature removed due to number of crashing bugs.
+	</li>
+	<li>
+	Code for XPM images made more robust.
+	</li>
+	<li>
+	Bug fixed with primary selection on GTK+.
+	</li>
+	<li>
+	On GTK+ 2, copied or cut text can still be pasted after the Scintilla widget is destroyed.
+	</li>
+	<li>
+	Styling change not visible problem fixed when line was cached.
+	</li>
+	<li>
+	Bug in SciTE on Windows fixed where clipboard commands stopped working.
+	</li>
+	<li>
+	Crashing bugs in display fixed in line layout cache.
+	</li>
+	<li>
+	Crashing bug may be fixed on AMD64 processor on GTK+.
+	</li>
+	<li>
+	Rare hanging crash fixed in Python lexer.
+	</li>
+	<li>
+	Display bugs fixed with DBCS characters on GTK+.
+	</li>
+	<li>
+	Autocompletion lists on GTK+ 2 are not sorted by the ListModel as the
+	contents are sorted correctly by Scintilla.
+	</li>
+	<li>
+	SciTE fixed to not open extra untitled buffers with check.if.already.open.
+	</li>
+	<li>
+	Sizing bug fixed on GTK+ when window resized while unmapped.
+	</li>
+	<li>
+	Text drawing crashing bug fixed on GTK+ with non-Pango fonts and long strings.
+	</li>
+	<li>
+	Fixed some issues if characters are unsigned.
+	</li>
+	<li>
+	Fixes in NSIS support.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite159.zip?download">Release 1.59</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 February 2004.
+	</li>
+	<li>
+	SciTE Options and Language menus reduced in length by commenting
+	out some languages. Languages can be enabled by editing the global
+	properties file.
+	</li>
+	<li>
+	Verilog language supported.
+	</li>
+	<li>
+	Lexer for Microsoft dialect of SQL. SciTE properties file available from extras page.
+	</li>
+	<li>
+	Perl lexer disambiguates '/' better.
+	</li>
+	<li>
+	NSIS lexer improved with a lexical class for numbers, option for ignoring case
+	of keywords, and folds only occurring when folding keyword first on line.
+	</li>
+	<li>
+	PowerBasic lexer improved with styles for constants and assembler and
+	folding improvements.
+	</li>
+	<li>
+	On GTK+, input method support only invoked for Asian languages and not
+	European languages as the old European keyboard code works better.
+	</li>
+	<li>
+	Scintilla can be requested to allocate a certain amount and so avoid repeated
+	reallocations and memory inefficiencies. SciTE uses this and so should require
+	less memory.
+	</li>
+	<li>
+	SciTE's "toggle current fold" works when invoked on child line as well as
+	fold header.
+	</li>
+	<li>
+	SciTE output pane scrolling can be set to not scroll back to start after
+	completion of command.
+	</li>
+	<li>
+	SciTE has a $(SessionPath) property.
+	</li>
+	<li>
+	SciTE on Windows can use VK_* codes for keys in user.shortcuts.
+	</li>
+	<li>
+	Stack overwrite bug fixed in SciTE's command to move to the end of a
+	preprocessor conditional.
+	</li>
+	<li>
+	Bug fixed where vertical selection appeared to select a different set of characters
+	then would be used by, for example, a copy.
+	</li>
+	<li>
+	SciTE memory leak fixed in fold state remembering.
+	</li>
+	<li>
+	Bug fixed where changing the style of some text outside the
+	standard StyleNeeded notification would not be visible.
+	</li>
+	<li>
+	On GTK+ 2 g_iconv is used in preference to iconv, as it is provided by GTK+
+	so should avoid problems finding the iconv library.
+	</li>
+	<li>
+	On GTK+ fixed a style reference count bug.
+	</li>
+	<li>
+	Memory corruption bug fixed with GetSelText.
+	</li>
+	<li>
+	On Windows Scintilla deletes memory on WM_NCDESTROY rather than
+	the earlier WM_DESTROY to avoid problems when the window is subclassed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite158.zip?download">Release 1.58</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 January 2004.
+	</li>
+	<li>
+	Method to discover the currently highlighted element in an autocompletion list.
+	</li>
+	<li>
+	On GTK+, the lexers are now included in the scintilla.a library file. This
+	will require changes to the make files of dependent projects.
+	</li>
+	<li>
+	Octave support added alongside related Matlab language and Matlab support improved.
+	</li>
+	<li>
+	VB lexer gains an unterminated string state and 4 sets of keywords.
+	</li>
+	<li>
+	Ruby lexer handles $' correctly.
+	</li>
+	<li>
+	Error line handling improved for FORTRAN compilers from Absoft and Intel.
+	</li>
+	<li>
+	International input enabled on GTK+ 2 although there is no way to choose an
+	input method.
+	</li>
+	<li>
+	MultiplexExtension in SciTE allows multiple extensions to be used at once.
+	</li>
+	<li>
+	Regular expression replace interprets backslash expressions \a, \b, \f, \n, \r, \t,
+	and \v in the replacement value.
+	</li>
+	<li>
+	SciTE Replace dialog displays number of replacements made when Replace All or
+	Replace in Selection performed.
+	</li>
+	<li>
+	Localization files may contain a translation.encoding setting which is used
+	on GTK+ 2 to automatically reencode the translation to UTF-8 so it will be
+	the localized text will be displayed correctly.
+	</li>
+	<li>
+	SciTE on GTK+ implements check.if.already.open.
+	</li>
+	<li>
+	Make files for Mac OS X made more robust.
+	</li>
+	<li>
+	Performance improved in SciTE when switching buffers when there
+	is a rectangular selection.
+	</li>
+	<li>
+	Fixed failure to display some text when wrapped.
+	</li>
+	<li>
+	SciTE crashes from Ctrl+Tab buffer cycling fixed.
+	May still be some rare bugs here.
+	</li>
+	<li>
+	Crash fixed when decoding an error message that appears similar to a
+	Borland error message.
+	</li>
+	<li>
+	Fix to auto-scrolling allows containers to implement enhanced double click selection.
+	</li>
+	<li>
+	Hang fixed in idle word wrap.
+	</li>
+	<li>
+	Crash fixed in hotspot display code..
+	</li>
+	<li>
+	SciTE on Windows Incremental Search no longer moves caret back.
+	</li>
+	<li>
+	SciTE hang fixed when performing a replace with a find string that
+	matched zero length strings such as ".*".
+	</li>
+	<li>
+	SciTE no longer styles the whole file when saving buffer fold state
+	as that was slow.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite157.zip?download">Release 1.57</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 27 November 2003.
+	</li>
+	<li>
+	SciTE remembers folding of each buffer.
+	</li>
+	<li>
+	Lexer for Erlang language.
+	</li>
+	<li>
+	Scintilla allows setting the set of white space characters.
+	</li>
+	<li>
+	Scintilla has 'stuttered' page movement commands to first move
+	to top or bottom within current visible lines before scrolling.
+	</li>
+	<li>
+	Scintilla commands for moving to end of words.
+	</li>
+	<li>
+	Incremental line wrap enabled on Windows.
+	</li>
+	<li>
+	SciTE PDF exporter produces output that is more compliant with reader
+	applications, is smaller and allows more configuration.
+	HTML exporter optimizes size of output files.
+	</li>
+	<li>
+	SciTE defines properties PLAT_WINNT and PLAT_WIN95 on the
+	corresponding platforms.
+	</li>
+	<li>
+	SciTE can adjust the line margin width to fit the largest line number.
+	The line.numbers property is split between line.margin.visible and
+	line.margin.width.
+	</li>
+	<li>
+	SciTE on GTK+ allows user defined menu accelerators.
+	Alt can be included in user.shortcuts.
+	</li>
+	<li>
+	SciTE Language menu can have items commented out.
+	</li>
+	<li>
+	SciTE on Windows Go to dialog allows choosing a column number as
+	well as a line number.
+	</li>
+	<li>
+	SciTE on GTK+ make file uses prefix setting more consistently.
+	</li>
+	<li>
+	Bug fixed that caused word wrapping to fail to display all text.
+	</li>
+	<li>
+	Crashing bug fixed in GTK+ version of Scintilla when using GDK fonts
+	and opening autocompletion.
+	</li>
+	<li>
+	Bug fixed in Scintilla SCI_GETSELTEXT where an extra NUL
+	was included at end of returned string
+	</li>
+	<li>
+	Crashing bug fixed in SciTE z-order switching implementation.
+	</li>
+	<li>
+	Hanging bug fixed in Perl lexer.
+	</li>
+	<li>
+	SciTE crashing bug fixed for using 'case' without argument in style definition.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite156.zip?download">Release 1.56</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 October 2003.
+	</li>
+	<li>
+	Rectangular selection can be performed using the keyboard.
+	Greater programmatic control over rectangular selection.
+	This has caused several changes to key bindings.
+	</li>
+	<li>
+	SciTE Replace In Selection works on rectangular selections.
+	</li>
+	<li>
+	Improved lexer for TeX, new lexer for Metapost and other support for these
+	languages.
+	</li>
+	<li>
+	Lexer for PowerBasic.
+	</li>
+	<li>
+	Lexer for Forth.
+	</li>
+	<li>
+	YAML lexer improved to include error styling.
+	</li>
+	<li>
+	Perl lexer improved to correctly handle more cases.
+	</li>
+	<li>
+	Assembler lexer updated to support single-quote strings and fix some
+	problems.
+	</li>
+	<li>
+	SciTE on Windows can switch between buffers in order of use (z-order) rather
+	than static order.
+	</li>
+	<li>
+	SciTE supports adding an extension for "Open Selected Filename".
+	The openpath setting works on GTK+.
+	</li>
+	<li>
+	SciTE can Export as XML.
+	</li>
+	<li>
+	SciTE $(SelHeight) variable gives a more natural result for empty and whole line
+	selections.
+	</li>
+	<li>
+	Fixes to wrapping problems, such as only first display line being visible in some
+	cases.
+	</li>
+	<li>
+	Fixes to hotspot to only highlight when over the hotspot, only use background
+	colour when set and option to limit hotspots to a single line.
+	</li>
+	<li>
+	Small fixes to FORTRAN lexing and folding.
+	</li>
+	<li>
+	SQL lexer treats single quote strings as a separate class to double quote strings..
+	</li>
+	<li>
+	Scintilla made compatible with expectations of container widget in GTK+ 2.3.
+	</li>
+	<li>
+	Fix to strip out pixmap ID when automatically choosing from an autocompletion
+	list with only one element.
+	</li>
+	<li>
+	SciTE bug fixed where UTF-8 files longer than 128K were gaining more than one
+	BOM.
+	</li>
+	<li>
+	Crashing bug fixed in SciTE on GTK+ where using "Stop Executing" twice leads
+	to all applications exiting.
+	</li>
+	<li>
+	Bug fixed in autocompletion scrolling on GTK+ 2 with a case sensitive list.
+	The ListBox::Sort method is no longer needed or available so platform
+	maintainers should remove it.
+	</li>
+	<li>
+	SciTE check.if.already.open setting removed from GTK+ version as unmaintained.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite155.zip?download">Release 1.55</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 25 September 2003.
+      </li>
+      <li>
+	Fix a crashing bug in indicator display in Scintilla.
+      </li>
+      <li>
+	GTK+ version now defaults to building for GTK+ 2 rather than 1.
+      </li>
+      <li>
+	Mingw make file detects compiler version and avoids options
+	that are cause problems for some versions.
+      </li>
+      <li>
+	Large performance improvement on GTK+ 2 for long lines.
+      </li>
+      <li>
+	Incremental line wrap on GTK+.
+      </li>
+      <li>
+	International text entry works much better on GTK+ with particular
+	improvements for Baltic languages and languages that use 'dead' accents.
+	NUL key events such as those generated by some function keys, ignored.
+      </li>
+      <li>
+	Unicode clipboard support on GTK+.
+      </li>
+      <li>
+	Indicator type INDIC_BOX draws a rectangle around the text.
+      </li>
+      <li>
+	Clarion language support.
+      </li>
+      <li>
+	YAML language support.
+      </li>
+      <li>
+	MPT LOG language support.
+      </li>
+      <li>
+	On Windows, SciTE can switch buffers based on activation order rather
+	than buffer number.
+      </li>
+      <li>
+	SciTE save.on.deactivate saves all buffers rather than just the current buffer.
+      </li>
+      <li>
+	Lua lexer handles non-ASCII characters correctly.
+      </li>
+      <li>
+	Error lexer understands Borland errors with pathnames that contain space.
+      </li>
+      <li>
+	On GTK+ 2, autocompletion uses TreeView rather than deprecated CList.
+      </li>
+      <li>
+	SciTE autocompletion removed when expand abbreviation command used.
+      </li>
+      <li>
+	SciTE calltips support overloaded functions.
+      </li>
+      <li>
+	When Save fails in SciTE, choice offered to Save As.
+      </li>
+      <li>
+	SciTE message boxes on Windows may be moved to front when needed.
+      </li>
+      <li>
+	Indicators drawn correctly on wrapped lines.
+      </li>
+      <li>
+	Regular expression search no longer matches characters with high bit
+	set to characters without high bit set.
+      </li>
+      <li>
+	Hang fixed in backwards search in multi byte character documents.
+      </li>
+      <li>
+	Hang fixed in SciTE Mark All command when wrap around turned off.
+      </li>
+      <li>
+	SciTE Incremental Search no longer uses hot keys on Windows.
+      </li>
+      <li>
+	Calltips draw non-ASCII characters correctly rather than as arrows.
+      </li>
+      <li>
+	SciTE crash fixed when going to an error message with empty file name.
+      </li>
+      <li>
+	Bugs fixed in XPM image handling code.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite154.zip?download">Release 1.54</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 12 August 2003.
+      </li>
+      <li>
+	SciTE on GTK+ 2.x can display a tab bar.
+      </li>
+      <li>
+	SciTE on Windows provides incremental search.
+      </li>
+      <li>
+	Lexer for PostScript.
+      </li>
+      <li>
+	Lexer for the NSIS scripting language.
+      </li>
+      <li>
+	New lexer for POV-Ray Scene Description Language
+	replaces previous implementation.
+      </li>
+      <li>
+	Lexer for the MMIX Assembler language.
+      </li>
+      <li>
+	Lexer for the Scriptol language.
+      </li>
+      <li>
+	Incompatibility: SQL keywords are specified in lower case rather than upper case.
+	SQL lexer allows double quoted strings.
+      </li>
+      <li>
+	Pascal lexer: character constants that start with '#' understood,
+	'@' only allowed within assembler blocks,
+	'$' can be the start of a number,
+	initial '.' in 0..constant not treated as part of a number,
+	and assembler blocks made more distinctive.
+      </li>
+      <li>
+	Lua lexer allows '.' in keywords.
+	Multi-line strings and comments can be folded.
+      </li>
+      <li>
+	CSS lexer handles multiple psuedoclasses.
+      </li>
+      <li>
+	Properties file folder works for INI file format.
+      </li>
+      <li>
+	Hidden indicator style allows the container to mark text within Scintilla
+	without there being any visual effect.
+      </li>
+      <li>
+	SciTE does not prompt to save changes when the buffer is empty and untitled.
+      </li>
+      <li>
+	Modification notifications caused by SCI_INSERTSTYLEDSTRING
+	now include the contents of the insertion.
+      </li>
+      <li>
+	SCI_MARKERDELETEALL deletes all the markers on a line
+	rather than just the first match.
+      </li>
+      <li>
+	Better handling of 'dead' accents on GTK+ 2 for languages
+	that use accented characters.
+      </li>
+      <li>
+	SciTE now uses value of output.vertical.size property.
+      </li>
+      <li>
+	Crash fixed in SciTE autocompletion on long lines.
+      </li>
+      <li>
+	Crash fixed in SciTE comment command on long lines.
+      </li>
+      <li>
+	Bug fixed with backwards regular expression search skipping
+	every second match.
+      </li>
+      <li>
+	Hang fixed with regular expression replace where both target and replacement were empty.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite153.zip?download">Release 1.53</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 May 2003.
+      </li>
+      <li>
+	On GTK+ 2, encodings other than ASCII, Latin1, and Unicode are
+	supported for both display and input using iconv.
+      </li>
+      <li>
+	External lexers supported on GTK+/Linux.
+	External lexers must now be explicitly loaded with SCI_LOADLEXERLIBRARY
+	rather than relying upon a naming convention and automatic loading.
+      </li>
+      <li>
+	Support of Lout typesetting language.
+      </li>
+      <li>
+	Support of E-Scripts language used in the POL Ultima Online Emulator.
+      </li>
+      <li>
+	Scrolling and drawing performance on GTK+ enhanced, particularly for GTK+ 2.x
+	with an extra window for the text area avoiding conflicts with the scroll bars.
+      </li>
+      <li>
+	CopyText and CopyRange methods in Scintilla allow container to
+	easily copy to the system clipboard.
+      </li>
+      <li>
+	Line Copy command implemented and bound to Ctrl+Shift+T.
+      </li>
+      <li>
+	Scintilla APIs PositionBefore and PositionAfter can be used to iterate through
+	a document taking into account the encoding and multi-byte characters.
+      </li>
+      <li>
+	C++ folder can fold on the "} else {" line of an if statement by setting
+	fold.at.else property to 1.
+      </li>
+      <li>
+	C++ lexer allows an extra set of keywords.
+      </li>
+      <li>
+	Property names and thus abbreviations may be non-ASCII.
+      </li>
+      <li>
+	Removed attempt to load a file when setting properties that was
+	part of an old scripting experiment.
+      </li>
+      <li>
+	SciTE no longer warns about a file not existing when opening
+	properties files from the Options menu as there is a good chance
+	the user wants to create one.
+      </li>
+      <li>
+	Bug fixed with brace recognition in multi-byte encoded files where a partial
+	character matched a brace byte.
+      </li>
+      <li>
+	More protection against infinite loops or recursion with recursive property definitions.
+      </li>
+      <li>
+	On Windows, cursor will no longer disappear over margins in custom builds when
+	cursor resource not present. The Windows default cursor is displayed instead.
+      </li>
+      <li>
+	load.on.activate fixed in SciTE as was broken in 1.52.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite152.zip?download">Release 1.52</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2003.
+      </li>
+      <li>
+	Pango font support on GTK+ 2.
+	Unicode input improved on GTK+ 2.
+      </li>
+      <li>
+	Hotspot style implemented in Scintilla.
+      </li>
+      <li>
+	Small up and down arrows can be displayed in calltips and the container
+	is notified when the mouse is clicked on a calltip.
+	Normal and selected calltip text colours can be set.
+      </li>
+      <li>
+	POSIX compatibility flag in Scintilla regular expression search
+	interprets bare ( and ) as tagged sections.
+      </li>
+      <li>
+	Error message lexer tightened to yield fewer false matches.
+	Recognition of Lahey and Intel FORTRAN error formats.
+      </li>
+      <li>
+	Scintilla keyboard commands for moving to start and end of
+	screen lines rather than document lines, unless already there
+	where these keys move to the start or end of the document line.
+      </li>
+      <li>
+	Line joining command.
+      </li>
+      <li>
+	Lexer for POV-Ray.
+      </li>
+      <li>
+	Calltips on Windows are no longer clipped by the parent window.
+      </li>
+      <li>
+	Autocompletion lists are cancelled when focus leaves their parent window.
+      </li>
+      <li>
+	Move to next/previous empty line delimited paragraph key commands.
+      </li>
+      <li>
+	SciTE hang fixed with recursive property definitions by placing limit
+	on number of substitutions performed.
+      </li>
+      <li>
+	SciTE Export as PDF reenabled and works.
+      </li>
+      <li>
+	Added loadsession: command line command to SciTE.
+      </li>
+      <li>
+	SciTE option to quit application when last document closed.
+      </li>
+      <li>
+	SciTE option to ask user if it is OK to reload a file that has been
+	modified outside SciTE.
+      </li>
+      <li>
+	SciTE option to automatically save before running particular command tools
+	or to ask user or to not save.
+      </li>
+      <li>
+	SciTE on Windows 9x will write a Ctrl+Z to the process input pipe before
+	closing the pipe when running tool commands that take input.
+      </li>
+      <li>
+	Added a manifest resource to SciTE on Windows to enable Windows XP
+	themed UI.
+      </li>
+      <li>
+	SciTE calltips handle nested calls and other situations better.
+      </li>
+      <li>
+	CSS lexer improved.
+      </li>
+      <li>
+	Interface to platform layer changed - Surface initialization now requires
+	a WindowID parameter.
+      </li>
+      <li>
+	Bug fixed with drawing or measuring long pieces of text on Windows 9x
+	by truncating the pieces.
+      </li>
+      <li>
+	Bug fixed with SciTE on GTK+ where a user shortcut for a visible character
+	inserted the character as well as executing the command.
+      </li>
+      <li>
+	Bug fixed where primary selection on GTK+ was reset by
+	Scintilla during creation.
+      </li>
+      <li>
+	Bug fixed where SciTE would close immediately on startup
+	when using save.session.
+      </li>
+      <li>
+	Crash fixed when entering '\' in LaTeX file.
+      </li>
+      <li>
+	Hang fixed when '#' last character in VB file.
+      </li>
+      <li>
+	Crash fixed in error message lexer.
+      </li>
+      <li>
+	Crash fixed when searching for long regular expressions.
+      </li>
+      <li>
+	Pressing return when nothing selected in user list sends notification with
+	empty text rather than random text.
+      </li>
+      <li>
+	Mouse debouncing disabled on Windows as it interfered with some
+	mouse utilities.
+      </li>
+      <li>
+	Bug fixed where overstrike mode inserted before rather than replaced last
+	character in document.
+      </li>
+      <li>
+	Bug fixed with syntax highlighting of Japanese text.
+      </li>
+      <li>
+	Bug fixed in split lines function.
+      </li>
+      <li>
+	Cosmetic fix to SciTE tab bar on Windows when window resized.
+	Focus sticks to either pane more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite151.zip?download">Release 1.51</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 February 2003.
+      </li>
+      <li>
+	Two phase drawing avoids cutting off text that overlaps runs by drawing
+	all the backgrounds of a line then drawing all the text transparently.
+	Single phase drawing is an option.
+      </li>
+      <li>
+	Scintilla method to split lines at a particular width by adding new line
+	characters.
+      </li>
+      <li>
+	The character used in autocompletion lists to separate the text from the image
+	number can be changed.
+      </li>
+      <li>
+	The scrollbar range will automatically expand when the caret is moved
+	beyond the current range.
+	The scroll bar is updated when SCI_SETXOFFSET is called.
+      </li>
+      <li>
+	Mouse cursors on GTK+ improved to be consistent with other applications
+	and the Windows version.
+      </li>
+      <li>
+	Horizontal scrollbar on GTK+ now disappears in wrapped mode.
+      </li>
+      <li>
+	Scintilla on GTK+ 2: mouse wheel scrolling, cursor over scrollbars, focus,
+	and syntax highlighting now work.
+	gtk_selection_notify avoided for compatibility with GTK+ 2.2.
+      </li>
+      <li>
+	Fold margin colours can now be set.
+      </li>
+      <li>
+	SciTE can be built for GTK+ 2.
+      </li>
+      <li>
+	SciTE can optionally preserve the undo history over an automatic file reload.
+      </li>
+      <li>
+	Tags can optionally be case insensitive in XML and HTML.
+      </li>
+      <li>
+	SciTE on Windows handles input to tool commands in a way that should avoid
+	deadlock. Output from tools can be used to replace the selection.
+      </li>
+      <li>
+	SciTE on GTK+ automatically substitutes '|' for '/' in menu items as '/'
+	is used to define the menu hierarchy.
+      </li>
+      <li>
+	Optional buffer number in SciTE title bar.
+      </li>
+      <li>
+	Crash fixed in SciTE brace matching.
+      </li>
+      <li>
+	Bug fixed where automatic scrolling past end of document
+	flipped back to the beginning.
+      </li>
+      <li>
+	Bug fixed where wrapping caused text to disappear.
+      </li>
+      <li>
+	Bug fixed on Windows where images in autocompletion lists were
+	shown on the wrong item.
+      </li>
+      <li>
+	Crash fixed due to memory bug in autocompletion lists on Windows.
+      </li>
+      <li>
+	Crash fixed when double clicking some error messages.
+      </li>
+      <li>
+	Bug fixed in word part movement where sometimes no movement would occur.
+      </li>
+      <li>
+	Bug fixed on Windows NT where long text runs were truncated by
+	treating NT differently to 9x where there is a limitation.
+      </li>
+      <li>
+	Text in not-changeable style works better but there remain some cases where
+	it is still possible to delete text protected this way.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite150.zip?download">Release 1.50</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 January 2003.
+      </li>
+      <li>
+	Autocompletion lists may have a per-item pixmap.
+      </li>
+      <li>
+	Autocompletion lists allow Unicode text on Windows.
+      </li>
+      <li>
+	Scintilla documentation rewritten.
+      </li>
+      <li>
+	Additional DBCS encoding support in Scintilla on GTK+ primarily aimed at
+	Japanese EUC encoding.
+      </li>
+      <li>
+	CSS (Cascading Style Sheets) lexer added.
+      </li>
+      <li>
+	diff lexer understands some more formats.
+      </li>
+      <li>
+	Fold box feature is an alternative way to show the structure of code.
+      </li>
+      <li>
+	Avenue lexer supports multiple keyword lists.
+      </li>
+      <li>
+	The caret may now be made invisible by setting the caret width to 0.
+      </li>
+      <li>
+	Python folder attaches comments before blocks to the next block rather
+	than the previous block.
+      </li>
+      <li>
+	SciTE openpath property on Windows searches a path for files that are
+	the subject of the Open Selected Filename command.
+      </li>
+      <li>
+        The localization file name can be changed with the locale.properties property.
+      </li>
+      <li>
+	On Windows, SciTE can pipe the result of a string expression into a command line tool.
+      </li>
+      <li>
+	On Windows, SciTE's Find dialog has a Mark All button.
+      </li>
+      <li>
+	On Windows, there is an Insert Abbreviation command that allows a choice from
+	the defined abbreviations and inserts the selection into the abbreviation at the
+	position of a '|'.
+      </li>
+      <li>
+	Minor fixes to Fortran lexer.
+      </li>
+      <li>
+	fold.html.preprocessor decides whether to fold &lt;? and ?&gt;.
+	Minor improvements to PHP folding.
+      </li>
+      <li>
+	Maximum number of keyword lists allowed increased from 6 to 9.
+      </li>
+      <li>
+	Duplicate line command added with default assignment to Ctrl+D.
+      </li>
+      <li>
+	SciTE sets $(Replacements) to the number of replacements made by the
+	Replace All command. $(CurrentWord) is set to the word before the caret if the caret
+	is at the end of a word.
+      </li>
+      <li>
+	Opening a SciTE session now loads files in remembered order, sets the current file
+	as remembered, and moves the caret to the remembered line.
+      </li>
+      <li>
+	Bugs fixed with printing on Windows where line wrapping was causing some text
+	to not print.
+      </li>
+      <li>
+	Bug fixed with Korean Input Method Editor on Windows.
+      </li>
+      <li>
+	Bugs fixed with line wrap which would sometimes choose different break positions
+	after switching focus away and back.
+      </li>
+      <li>
+	Bug fixed where wheel scrolling had no effect on GTK+ after opening a fold.
+      </li>
+      <li>
+	Bug fixed with file paths containing non-ASCII characters on Windows.
+      </li>
+      <li>
+	Crash fixed with printing on Windows after defining pixmap marker.
+      </li>
+      <li>
+	Crash fixed in makefile lexer when first character on line was '='.
+      </li>
+      <li>
+	Bug fixed where local properties were not always being applied.
+      </li>
+      <li>
+	Ctrl+Keypad* fold command works on GTK+.
+      </li>
+      <li>
+	Hangs fixed in SciTE's Replace All command when replacing regular expressions '^'
+	or '$'.
+      </li>
+      <li>
+	SciTE monospace setting behaves more sensibly.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite149.zip?download">Release 1.49</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 November 2002.
+      </li>
+      <li>
+	Unicode supported on GTK+. To perform well, this added a font cache to GTK+
+	and to make that safe, a mutex is used. The mutex requires the application to link in
+	the threading library by evaluating `glib-config --libs gthread`. A Unicode locale
+	should also be set up by a call like setlocale(LC_CTYPE, "en_US.UTF-8").
+	scintilla_release_resources function added to release mutex.
+      </li>
+      <li>
+	FORTRAN and assembler lexers added along with other support for these
+	languages in SciTE.
+      </li>
+      <li>
+	Ada lexer improved handling of based numbers, identifier validity and attributes
+	distinguished from character literals.
+      </li>
+      <li>
+	Lua lexer handles block comments and a deep level of nesting for literal strings
+	and block comments.
+      </li>
+      <li>
+	Errorlist lexer recognizes PHP error messages.
+      </li>
+      <li>
+	Variant of the C++ lexer with case insensitive keywords
+	called cppnocase. Whitespace in preprocessor text handled more correctly.
+      </li>
+      <li>
+	Folder added for Perl.
+      </li>
+      <li>
+	Compilation with GCC 3.2 supported.
+      </li>
+      <li>
+	Markers can be pixmaps.
+      </li>
+      <li>
+	Lines are wrapped when printing.
+	Bug fixed which printed line numbers in different styles.
+      </li>
+      <li>
+	Text can be appended to end with AppendText method.
+      </li>
+      <li>
+	ChooseCaretX method added.
+      </li>
+      <li>
+	Vertical scroll bar can be turned off with SetVScrollBar method.
+      </li>
+      <li>
+	SciTE Save All command saves all buffers.
+      </li>
+      <li>
+	SciTE localization compares keys case insensitively to make translations more flexible.
+      </li>
+      <li>
+	SciTE detects a utf-8 coding cookie "coding: utf-8" in first two
+	lines and goes into Unicode mode.
+      </li>
+      <li>
+	SciTE key bindings are definable.
+      </li>
+      <li>
+	SciTE Find in Files dialog can display directory browser to
+	choose directory to search.
+      </li>
+      <li>
+	SciTE enabling of undo and redo toolbar buttons improved.
+      </li>
+      <li>
+	SciTE on Windows file type filters in open dialog sorted.
+      </li>
+      <li>
+	Fixed crashing bug when using automatic tag closing in XML or HTML.
+      </li>
+      <li>
+	Fixed bug on Windows causing very long (&gt;64K) lines to not display.
+      </li>
+      <li>
+	Fixed bug in backwards regular expression searching.
+      </li>
+      <li>
+	Fixed bug in calltips where wrong argument was highlighted.
+      </li>
+      <li>
+	Fixed bug in tab timmy feature when file has line feed line endings.
+      </li>
+      <li>
+	Fixed bug in compiling without INCLUDE_DEPRECATED_FEATURES
+	defined.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite148.zip?download">Release 1.48</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 9 September 2002.
+      </li>
+      <li>
+	Improved Pascal lexer with context sensitive keywords
+	and separate folder which handles  //{ and //} folding comments and
+	{$region} and {$end} folding directives.
+	The "case" statement now folds correctly.
+      </li>
+      <li>
+	C++ lexer correctly handles comments on preprocessor lines.
+      </li>
+      <li>
+	New commands for moving to beginning and end of display lines when in line
+	wrap mode. Key bindings added for these commands.
+      </li>
+      <li>
+	New marker symbols that look like ">>>" and "..." which can be used for
+	interactive shell prompts for Python.
+      </li>
+      <li>
+	The foreground and background colours of visible whitespace can be chosen
+	independent of the colours chosen for the lexical class of that whitespace.
+      </li>
+      <li>
+	Per line data optimized by using an exponential allocation scheme.
+      </li>
+      <li>
+	SciTE API file loading optimized.
+      </li>
+      <li>
+	SciTE for GTK+ subsystem 2 documented. The exit status of commands
+	is decoded into more understandable fields.
+      </li>
+      <li>
+	SciTE find dialog remembers previous find string when there is no selection.
+	Find in Selection button disabled when selection is rectangular as command
+	did not work.
+      </li>
+      <li>
+	Shift+Enter made equivalent to Enter to avoid users having to let go of
+	the shift key when typing. Avoids the possibility of entering single carriage
+	returns in a file that contains CR+LF line ends.
+      </li>
+      <li>
+	Autocompletion does not immediately disappear when the length parameter
+	to SCI_AUTOCSHOW is 0.
+      </li>
+      <li>
+	SciTE focuses on the editor pane when File | New executed and when the
+	output pane is closed with F8. Double clicking on a non-highlighted output
+	pane line selects the word under the cursor rather than seeking the next
+	highlighted line.
+      </li>
+      <li>
+	SciTE director interface implements an "askproperty" command.
+      </li>
+      <li>
+	SciTE's Export as LaTeX output improved.
+      </li>
+      <li>
+	Better choice of autocompletion displaying above the caret rather then
+	below when that is more sensible.
+      </li>
+      <li>
+	Bug fixed where context menu would not be completely visible if invoked
+	when cursor near bottom or left of screen.
+      </li>
+      <li>
+	Crashing bug fixed when displaying long strings on GTK+ caused failure of X server
+	by displaying long text in segments.
+      </li>
+      <li>
+	Crashing bug fixed on GTK+ when a Scintilla window was removed from its parent
+	but was still the selection owner.
+      </li>
+      <li>
+	Bug fixed on Windows in Unicode mode where not all characters on a line
+	were displayed when that line contained some characters not in ASCII.
+      </li>
+      <li>
+	Crashing bug fixed in SciTE on Windows with clearing output while running command.
+      </li>
+      <li>
+	Bug fixed in SciTE for GTK+ with command completion not detected when
+	no output was produced by the command.
+      </li>
+      <li>
+	Bug fixed in SciTE for Windows where menus were not shown translated.
+      </li>
+      <li>
+	Bug fixed where words failed to display in line wrapping mode with visible
+	line ends.
+      </li>
+      <li>
+	Bug fixed in SciTE where files opened from a session file were not closed.
+      </li>
+      <li>
+	Cosmetic flicker fixed when using Ctrl+Up and Ctrl+Down with some caret policies.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite147.zip?download">Release 1.47</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 August 2002.
+      </li>
+      <li>
+	Support for GTK+ 2 in Scintilla. International input methods not supported
+	on GTK+2.
+      </li>
+      <li>
+	Line wrapping performance improved greatly.
+      </li>
+      <li>
+	New caret policy implementation that treats horizontal and vertical
+	positioning equivalently and independently. Old caret policy methods
+	deprecated and not all options work correctly with old methods.
+      </li>
+      <li>
+	Extra fold points for C, C++, Java, ... for fold comments //{ .. //} and
+	#if / #ifdef .. #endif and the #region .. #endregion feature of C#.
+      </li>
+      <li>
+	Scintilla method to find the height in pixels of a line. Currently returns the
+	same result for every line as all lines are same height.
+      </li>
+      <li>
+	Separate make file, scintilla_vc6.mak, for Scintilla to use Visual C++
+	version 6 since main makefile now assumes VS .NET.
+	VS .NET project files available for combined Scintilla and
+	SciTE in scite/boundscheck.
+      </li>
+      <li>
+	SciTE automatically recognizes Unicode files based
+	on their Byte Order Marks and switches to Unicode mode.
+	On Windows, where SciTE supports Unicode display, this
+	allows display of non European characters.
+	The file is saved back into the same character encoding unless
+	the user decides to switch using the File | Encoding menu.
+      </li>
+      <li>
+	Handling of character input changed so that a fillup character, typically '('
+	displays a calltip when an autocompletion list was being displayed.
+      </li>
+      <li>
+	Multiline strings lexed better for C++ and Lua.
+      </li>
+      <li>
+	Regular expressions in JavaScript within hypertext files are lexed better.
+      </li>
+      <li>
+	On Windows, Scintilla exports a function called Scintilla_DirectFunction
+	that can be used the same as the function returned by GetDirectFunction.
+      </li>
+      <li>
+	Scintilla converts line endings of text obtained from the clipboard to
+	the current default line endings.
+      </li>
+      <li>
+	New SciTE property ensure.final.line.end can ensure that saved files
+	always end with a new line as this is required by some tools.
+	The ensure.consistent.line.ends property ensures all line ends are the
+	current default when saving files.
+	The strip.trailing.spaces property now works on the buffer so the
+	buffer in memory and the file on disk are the same after a save is performed.
+      </li>
+      <li>
+	The SciTE expand abbreviation command again allows '|' characters
+	in expansions to be quoted by using '||'.
+      </li>
+      <li>
+	SciTE on Windows can send data to the find tool through standard
+	input rather than using a command line argument to avoid problems
+	with quoting command line arguments.
+      </li>
+      <li>
+	The Stop Executing command in SciTE on Windows improved to send
+	a Ctrl+Z character to the tool. Better messages when stopping a tool.
+      </li>
+      <li>
+	Autocompletion can automatically "fill up" when one of a set of characters is
+	type with the autocomplete.&lt;lexer&gt;.fillups property.
+      </li>
+      <li>
+	New predefined properties in SciTE, SelectionStartColumn, SelectionStartLine,
+	SelectionEndColumn, SelectionEndLine can be used to integrate with other
+	applications.
+      </li>
+      <li>
+	Environment variables are available as properties in SciTE.
+      </li>
+      <li>
+	SciTE on Windows keeps status line more current.
+      </li>
+      <li>
+	Abbreviations work in SciTE on Linux when first opened.
+      </li>
+      <li>
+	File saving fixed in SciTE to ensure files are not closed when they can not be
+	saved because of file permissions. Also fixed a problem with buffers that
+	caused files to not be saved.
+      </li>
+      <li>
+	SciTE bug fixed where monospace mode not remembered when saving files.
+	Some searching options now remembered when switching files.
+      </li>
+      <li>
+	SciTE on Linux now waits on child termination when it shuts a child down
+	to avoid zombies.
+      </li>
+      <li>
+	SciTE on Linux has a Print menu command that defaults to invoking a2ps.
+      </li>
+      <li>
+	Fixed incorrect highlighting of indentation guides in SciTE for Python.
+      </li>
+      <li>
+	Crash fixed in Scintilla when calling GetText for 0 characters.
+      </li>
+      <li>
+	Exporting as LaTeX improved when processing backslashes and tabs
+	and setting up font.
+      </li>
+      <li>
+	Crash fixed in SciTE when exporting or copying as RTF.
+      </li>
+      <li>
+	SciTE session loading fixed to handle more than 10 files in session.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite146.zip?download">Release 1.46</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 10 May 2002.
+      </li>
+      <li>
+	Set of lexers compiled into Scintilla can now be changed by adding and
+	removing lexer source files from scintilla/src and running LexGen.py.
+      </li>
+      <li>
+	SCN_ZOOM notification provided by Scintilla when user changes zoom level.
+	Method to determine width of strings in pixels so that elements can be sized
+	relative to text size.
+	SciTE changed to keep line number column displaying a given
+	number of characters.
+      </li>
+      <li>
+	The logical width of the document used to determine scroll bar range can be set.
+      </li>
+      <li>
+	Setting to allow vertical scrolling to display last line at top rather than
+	bottom of window.
+      </li>
+      <li>
+	Read-only mode improved to avoid changing the selection in most cases
+	when a modification is attempted. Drag and drop cursors display correctly
+	for read-only in some cases.
+      </li>
+      <li>
+	Visual C++ options in make files changed to suit Visual Studio .NET.
+      </li>
+      <li>
+	Scintilla.iface includes feature types for enumerations and lexers.
+      </li>
+      <li>
+	Lua lexer improves handling of literal strings and copes with nested literal strings.
+      </li>
+      <li>
+	Diff lexer changed to treat lines starting with "***" similarly to "---".
+	Symbolic names defined for lexical classes.
+      </li>
+      <li>
+	nncrontab lexer improved.
+      </li>
+      <li>
+	Turkish fonts (iso8859-9) supported on GTK+.
+      </li>
+      <li>
+	Automatic close tag feature for XML and HTML in SciTE.
+      </li>
+      <li>
+	Automatic indentation in SciTE improved.
+      </li>
+      <li>
+	Maximum number of buffers available in SciTE increased. May be up to 100
+	although other restrictions on menu length limit the real maximum.
+      </li>
+      <li>
+	Save a Copy command added to SciTE.
+      </li>
+      <li>
+	Export as TeX command added to SciTE.
+      </li>
+      <li>
+	Export as HTML command in SciTE respects Use Monospaced Font and
+	background colour settings.
+      </li>
+      <li>
+	Compilation problem on Solaris fixed.
+      </li>
+      <li>
+	Order of files displayed for SciTE's previous and next menu and key commands
+	are now consistent.
+      </li>
+      <li>
+	Saving of MRU in recent file changed so files open when SciTE quit
+	are remembered.
+      </li>
+      <li>
+	More variants of ctags tags handled by Open Selected Filename in SciTE.
+      </li>
+      <li>
+	JavaScript embedded in XML highlighted again.
+      </li>
+      <li>
+	SciTE status bar updated after changing parameters in case they are being
+	displayed in status bar.
+      </li>
+      <li>
+	Crash fixed when handling some multi-byte languages.
+      </li>
+      <li>
+	Crash fixed when replacing end of line characters.
+      </li>
+      <li>
+	Bug in SciTE fixed in multiple buffer mode where automatic loading
+	turned on could lead to losing file contents.
+      </li>
+      <li>
+	Bug in SciTE on GTK+ fixed where dismissing dialogs with close box led to
+	those dialogs never being shown again.
+      </li>
+      <li>
+	Bug in SciTE on Windows fixed where position.tile with default positions
+	led to SciTE being positioned off-screen.
+      </li>
+      <li>
+	Bug fixed in read-only mode, clearing all deletes contraction state data
+	leading to it not being synchronized with text.
+      </li>
+      <li>
+	Crash fixed in SciTE on Windows when tab bar displayed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite145.zip?download">Release 1.45</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 15 March 2002.
+      </li>
+      <li>
+	Line layout cache implemented to improve performance by maintaining
+	the positioning of characters on lines. Can be set to cache nothing,
+	the line with the caret, the visible page or the whole document.
+      </li>
+      <li>
+	Support, including a new lexer, added for Matlab programs.
+      </li>
+      <li>
+	Lua folder supports folding {} ranges and compact mode.
+	Lua lexer styles floating point numbers in number style instead of
+	setting the '.' in operator style.
+	Up to 6 sets of keywords.
+	Better support for [[ although only works well
+	when all on one line.
+      </li>
+      <li>
+	Python lexer improved to handle floating point numbers that contain negative
+	exponents and that start with '.'.
+      </li>
+      <li>
+	When performing a rectangular paste, the caret now remains at the
+	insertion point.
+      </li>
+      <li>
+	On Windows with a wheel mouse, page-at-a-time mode is recognized.
+      </li>
+      <li>
+	Read-only mode added to SciTE with a property to initialize it and another property,
+	$(ReadOnly) available to show this mode in the status bar.
+      </li>
+      <li>
+	SciTE status bar can show the number of lines in the selection
+	with the $(SelHeight) property.
+      </li>
+      <li>
+	SciTE's "Export as HTML" command uses the current character set to produce
+	correct output for non-Western-European character sets, such as Russian.
+      </li>
+      <li>
+	SciTE's "Export as RTF" fixed to produce correct output when file contains '\'.
+      </li>
+      <li>
+	SciTE goto command accepts a column as well as a line.
+	If given a column, it selects the word at that column.
+      </li>
+      <li>
+	SciTE's Build, Compile and Go commands are now disabled if no
+	action has been assigned to them.
+      </li>
+      <li>
+	The Refresh button in the status bar has been removed from SciTE on Windows.
+      </li>
+      <li>
+	Bug fixed in line wrap mode where cursor up or down command did not work.
+      </li>
+      <li>
+	Some styling bugs fixed that were due to a compilation problem with
+	gcc and inline functions with same name but different code.
+      </li>
+      <li>
+	The way that lexers loop over text was changed to avoid accessing beyond the
+	end or setting beyond the end. May fix some bugs and make the code safer but
+	may also cause new bugs.
+      </li>
+      <li>
+	Bug fixed in HTML lexer's handling of SGML.
+      </li>
+      <li>
+	Bug fixed on GTK+/X where lines wider than 32767 pixels did not display.
+      </li>
+      <li>
+	SciTE bug fixed with file name generation for standard property files.
+      </li>
+      <li>
+	SciTE bug fixed with Open Selected Filename command when used with
+	file name and line number combination.
+      </li>
+      <li>
+	In SciTE, indentation and tab settings stored with buffers so maintained correctly
+	as buffers selected.
+	The properties used to initialize these settings can now be set separately for different
+	file patterns.
+      </li>
+      <li>
+	Thread safety improved on Windows with a critical section protecting the font
+	cache and initialization of globals performed within Scintilla_RegisterClasses.
+	New Scintilla_ReleaseResources call provided to allow explicit freeing of resources
+	when statically bound into another application. Resources automatically freed
+	in DLL version. The window classes are now unregistered as part of resource
+	freeing which fixes bugs that occurred in some containers such as Internet Explorer.
+      </li>
+      <li>
+	'make install' fixed on Solaris.
+      </li>
+      <li>
+	Bug fixed that could lead to a file being opened twice in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite144.zip?download">Release 1.44</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 4 February 2002.
+      </li>
+      <li>
+	Crashing bug fixed in Editor::Paint.
+      </li>
+      <li>
+	Lua lexer no longer treats '.' as a word character and
+	handles 6 keyword sets.
+      </li>
+      <li>
+	WordStartPosition and WordEndPosition take an onlyWordCharacters
+	argument.
+      </li>
+      <li>
+	SciTE option for simplified automatic indentation which repeats
+	the indentation of the previous line.
+      </li>
+      <li>
+	Compilation fix on Alpha because of 64 bit.
+      </li>
+      <li>
+	Compilation fix for static linking.
+      </li>
+      <li>
+	Limited maximum line length handled to 8000 characters as previous
+	value of 16000 was causing stack exhaustion crashes for some.
+      </li>
+      <li>
+	When whole document line selected, only the last display line gets
+	the extra selected rectangle at the right hand side rather than
+	every display line.
+      </li>
+      <li>
+	Caret disappearing bug fixed for the case that the caret was not on the
+	first display line of a document line.
+      </li>
+      <li>
+	SciTE bug fixed where untitled buffer containing text was sometimes
+	deleted without chance to save.
+      </li>
+      <li>
+	SciTE bug fixed where use.monospaced not working with
+	multiple buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite143.zip?download">Release 1.43</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 19 January 2002.
+      </li>
+      <li>
+	Line wrapping robustness and performance improved in Scintilla.
+      </li>
+      <li>
+	Line wrapping option added to SciTE for both edit and output panes.
+      </li>
+      <li>
+	Static linking on Windows handles cursor resource better.
+	Documentation of static linking improved.
+      </li>
+      <li>
+	Autocompletion has an option to delete any word characters after the caret
+	upon selecting an item.
+      </li>
+      <li>
+	FOX version identified by PLAT_FOX in Platform.h.
+      </li>
+      <li>
+	Calltips in SciTE use the calltip.&lt;lexer&gt;.word.characters setting to
+	correctly find calltips for functions that include characters like '$' which
+	is not normally considered a word character.
+      </li>
+      <li>
+	SciTE has a command to show help on itself which gets hooked up to displaying
+	SciTEDoc.html.
+      </li>
+      <li>
+	SciTE option calltip.&lt;lexer&gt;.end.definition to display help text on a
+	second line of calltip.
+      </li>
+      <li>
+	Fixed the handling of the Buffers menu on GTK+ to ensure current buffer
+	indicated and no warnings occur.
+	Changed some menu items on GTK+ version to be same as Windows version.
+      </li>
+      <li>
+	use.monospaced property for SciTE determines initial state of Use Monospaced Font
+	setting.
+      </li>
+      <li>
+	The SciTE Complete Symbol command now works when there are no word
+	characters before the caret, even though it is slow to display the whole set of
+	symbols.
+      </li>
+      <li>
+	Function names removed from SciTE's list of PHP keywords. The full list of
+	predefined functions is available from another web site mentioned on the
+	Extras page.
+      </li>
+      <li>
+	Crashing bug at startup on GTK+ for some configurations fixed.
+      </li>
+      <li>
+	Crashing bug on GTK+ on 64 bit platforms fixed.
+      </li>
+      <li>
+	Compilation problem with some compilers fixed in GTK+.
+      </li>
+      <li>
+	Japanese text entry improved on Windows 9x.
+      </li>
+      <li>
+        SciTE recent files directory problem on Windows when HOME and SciTE_HOME
+	environment variables not set is now the directory of the executable.
+      </li>
+      <li>
+	Session files no longer include untitled buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite142.zip?download">Release 1.42</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 December 2001.
+      </li>
+      <li>
+	Better localization support including context menus and most messages.
+	Translations of the SciTE user interface available for Bulgarian,
+	French, German, Italian, Russian, and Turkish.
+      </li>
+      <li>
+	Can specify a character to use to indicate control characters
+	rather than having them displayed as mnemonics.
+      </li>
+      <li>
+	Scintilla key command for backspace that will not delete line
+	end characters.
+      </li>
+      <li>
+	Scintilla method to find start and end of words.
+      </li>
+      <li>
+	SciTE on GTK+ now supports the load.on.activate and save.on.deactivate
+	properties in an equivalent way to the Windows version.
+      </li>
+      <li>
+	The output pane of SciTE on Windows is now interactive so command line
+	utilities that prompt for input or confirmation can be used.
+      </li>
+      <li>
+	SciTE on Windows can choose directory for a "Find in Files"
+	command like the GTK+ version could.
+      </li>
+      <li>
+	SciTE can now load a set of API files rather than just one file.
+      </li>
+      <li>
+	ElapsedTime class added to Platform for accurate measurement of durations.
+	Used for debugging and for showing the user how long commands take in SciTE.
+      </li>
+      <li>
+	Baan lexer added.
+      </li>
+      <li>
+	In C++ lexer, document comment keywords no longer have to be at the start
+	of the line.
+      </li>
+      <li>
+	PHP lexer changed to match keywords case insensitively.
+      </li>
+      <li>
+	More shell keywords added.
+      </li>
+      <li>
+	SciTE support for VoiceXML added to xml.properties.
+      </li>
+       <li>
+	In SciTE the selection is not copied to the find field of the Search and Replace
+	dialogs if it contains end of line characters.
+      </li>
+      <li>
+	SciTE on Windows has a menu item to decide whether to respond to other
+	instances which are performing their check.if.already.open check.
+      </li>
+      <li>
+	SciTE accelerator key for Box Comment command changed to avoid problems
+	in non-English locales.
+      </li>
+      <li>
+	SciTE context menu includes Close command for the editor pane and
+	Hide command for the output pane.
+      </li>
+      <li>
+	output: command added to SciTE director interface to add text to the
+	output pane. The director interface can execute commands (such as tool
+	commands with subsystem set to 3) by sending a macro:run message.
+      </li>
+      <li>
+	SciTE on GTK+ will defer to the Window Manager for position if position.left or
+	position.top not set and for size if position.width or position.height not set.
+      </li>
+      <li>
+	SciTE on Windows has a position.tile property to place a second instance
+	to the right of the first.
+      </li>
+      <li>
+	 Scintilla on Windows again supports EM_GETSEL and EM_SETSEL.
+      </li>
+      <li>
+	Problem fixed in Scintilla on Windows where control ID is no longer cached
+	as it could be changed by external code.
+      </li>
+      <li>
+	Problems fixed in SciTE on Windows when finding any other open instances at
+	start up when check.if.already.open is true.
+      </li>
+      <li>
+	Bugs fixed in SciTE where command strings were not always having
+	variables evaluated.
+      </li>
+      <li>
+	Bugs fixed with displaying partial double-byte and Unicode characters
+	in rectangular selections and at the edge when edge mode is EDGE_BACKGROUND.
+	Column numbers reported by GetColumn treat multiple byte characters as one column
+	rather than counting bytes.
+      </li>
+      <li>
+	Bug fixed with caret movement over folded lines.
+      </li>
+      <li>
+        Another bug fixed with tracking selection in secondary views when performing
+	modifications.
+      </li>
+      <li>
+	Horizontal scrolling and display of long lines optimized.
+      </li>
+      <li>
+	Cursor setting in Scintilla on GTK+ optimized.
+      </li>
+      <li>
+	Experimental changeable style attribute.
+	Set to false to make text read-only.
+	Currently only stops caret from being within not-changeable
+	text and does not yet stop deleting a range that contains
+	not-changeable text.
+	Can be used from SciTE by adding notchangeable to style entries.
+      </li>
+      <li>
+	Experimental line wrapping.
+	Currently has performance and appearance problems.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite141.zip?download">Release 1.41</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 6 November 2001.
+      </li>
+      <li>
+        Changed Platform.h to not include platform	headers. This lessens likelihood and impact of
+	name clashes from system headers and also speeds up compilation.
+	Renamed DrawText to DrawTextNoClip to avoid name clash.
+      </li>
+      <li>
+        Changed way word functions work to treat a sequence of punctuation as
+	a word. This is more sensible and also more compatible with other editors.
+      </li>
+      <li>
+        Cursor changes over the margins and selection on GTK+ platform.
+      </li>
+      <li>
+        SC_MARK_BACKGROUND is a marker that only changes the line's background colour.
+      </li>
+      <li>
+	Enhanced Visual Basic lexer handles character date and octal literals,
+	and bracketed keywords for VB.NET. There are two VB lexers, vb and vbscript
+	with type indication characters like ! and $ allowed at the end of identifiers
+	in vb but not vbscript. Lexer states now separate from those used for C++ and
+	names start with SCE_B.
+      </li>
+      <li>
+         Lexer added for Bullant language.
+      </li>
+      <li>
+         The horizontal scroll position, xOffset, is now exposed through the API.
+      </li>
+      <li>
+         The SCN_POSCHANGED notification is deprecated as it was causing confusion.
+	 Use SCN_UPDATEUI  instead.
+      </li>
+      <li>
+         Compilation problems fixed for some versions of gcc.
+      </li>
+      <li>
+        Support for WM_GETTEXT restored on Windows.
+      </li>
+      <li>
+        Double clicking on an autocompletion list entry works on GTK+.
+      </li>
+      <li>
+        Bug fixed with case insensitive sorts for autocompletion lists.
+      </li>
+      <li>
+        Bug fixed with tracking selection in secondary views when performing modifications.
+      </li>
+      <li>
+        SciTE's abbreviation expansion feature will now indent expansions to the current
+	indentation level if indent.automatic is on.
+      </li>
+      <li>
+        SciTE allows setting up of parameters to commands from a dialog and can also
+       show this dialog automatically to prompt for arguments when running a command.
+      </li>
+      <li>
+        SciTE's Language menu (formerly Options | Use Lexer) is now defined by the
+	menu.language property rather than being hardcoded.
+      </li>
+      <li>
+        The user interface of SciTE can be localized to a particular language by editing
+	a locale.properties file.
+      </li>
+      <li>
+        On Windows, SciTE will try to move to the front when opening a new file from
+	the shell and using check.if.already.open.
+      </li>
+      <li>
+        SciTE can display the file name and directory in the title bar in the form
+	"file @ directory" when title.full.path=2.
+      </li>
+      <li>
+        The SciTE time.commands property reports the time taken by a command as well
+	as its status when completed.
+      </li>
+      <li>
+        The SciTE find.files property is now a list separated by '|' characters and this list is
+	added into the Files pull down of the Find in Files dialog.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite140.zip?download">Release 1.40</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 September 2001.
+      </li>
+      <li>
+	Removal of emulation of Win32 RichEdit control in core of Scintilla.
+	<em>This change may be incompatible with existing client code.</em>
+	Some emulation still done in Windows platform layer.
+      </li>
+      <li>
+	SGML support in the HTML/XML lexer.
+      </li>
+      <li>
+	SciTE's "Stop Executing" command will terminate GUI programs on
+	Windows NT and Windows 2000.
+      </li>
+      <li>
+	StyleContext class helps construct lexers that are simple and accurate.
+	Used in the C++, Eiffel, and Python lexers.
+      </li>
+      <li>
+	Clipboard operations in GTK+ version convert between platform '\n' line endings and
+	currently chosen line endings.
+      </li>
+      <li>
+	Any character in range 0..255 can be used as a marker.
+	This can be used to support numbered bookmarks, for example.
+      </li>
+      <li>
+	The default scripting language for ASP can be set.
+      </li>
+      <li>
+	New lexer and other support for crontab files used with the nncron scheduler.
+      </li>
+      <li>
+	Folding of Python improved.
+      </li>
+      <li>
+	The ` character is treated as a Python operator.
+      </li>
+      <li>
+	Line continuations ("\" at end of line) handled inside Python strings.
+      </li>
+      <li>
+	More consistent handling of line continuation ('\' at end of line) in
+	C++ lexer.
+	This fixes macro definitions that span more than one line.
+      </li>
+      <li>
+	C++ lexer can understand Doxygen keywords in doc comments.
+      </li>
+      <li>
+	SciTE on Windows allows choosing to open the "open" dialog on the directory
+	of the current file rather than in the default directory.
+      </li>
+      <li>
+	SciTE on Windows handles command line arguments in "check.if.already.open"
+	correctly when the current directory of the new instance is different to the
+	already open instance of SciTE.
+      </li>
+      <li>
+	"cwd" command (change working directory) defined for SciTE director interface.
+      </li>
+      <li>
+	SciTE "Export As HTML" produces better, more compliant, and shorter files.
+      </li>
+      <li>
+	SciTE on Windows allows several options for determining default file name
+	for exported files.
+      </li>
+      <li>
+	Automatic indentation of Python in SciTE fixed.
+      </li>
+      <li>
+	Exported HTML can support folding.
+      </li>
+      <li>
+	Bug fixed in SCI_GETTEXT macro command of director interface.
+      </li>
+      <li>
+	Cursor leak fixed on GTK+.
+      </li>
+      <li>
+	During SciTE shutdown, "identity" messages are no longer sent over the director interface.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite139.zip?download">Release 1.39</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 22 August 2001.
+      </li>
+      <li>
+	Windows version requires msvcrt.dll to be available so will not work
+	on original Windows 95 version 1. The msvcrt.dll file is installed
+	by almost everything including Internet Explorer so should be available.
+      </li>
+      <li>
+	Flattened tree control style folding margin. The SciTE fold.plus option is
+	now fold.symbols and has more values for the new styles.
+      </li>
+      <li>
+	Mouse dwell events are generated when the user holds the mouse steady
+	over Scintilla.
+      </li>
+      <li>
+      PositionFromPointClose is like PositionFromPoint but returns
+      INVALID_POSITION when point outside window or after end of line.
+      </li>
+      <li>
+      Input of Hungarian and Russian characters in GTK+ version works by
+      truncating input to 8 bits if in the range of normal characters.
+      </li>
+      <li>
+      Better choices for font descriptors on GTK+ for most character sets.
+      </li>
+      <li>
+      GTK+ Scintilla is destroyed upon receiving destroy signal rather than
+      destroy_event signal.
+      </li>
+      <li>
+      Style setting that force upper or lower case text.
+      </li>
+      <li>
+      Case-insensitive autocompletion lists work correctly.
+      </li>
+      <li>
+      Keywords can be prefix based so ^GTK_ will treat all words that start
+      with GTK_ as keywords.
+      </li>
+      <li>
+      Horizontal scrolling can be jumpy rather than gradual.
+      </li>
+      <li>
+      GetSelText places a '\0' in the buffer if the selection is empty..
+      </li>
+      <li>
+      EnsureVisible split into two methods EnsureVisible which will not scroll to show
+      the line and EnsureVisibleEnforcePolicy which may scroll.
+      </li>
+      <li>
+      Python folder has options to fold multi-line comments and triple quoted strings.
+      </li>
+      <li>
+      C++ lexer handles keywords before '.' like "this.x" in Java as keywords.
+      Compact folding mode option chooses whether blank lines after a structure are
+      folded with that structure. Second set of keywords with separate style supported.
+      </li>
+      <li>
+      Ruby lexer handles multi-line comments.
+      </li>
+      <li>
+      VB has folder.
+      </li>
+      <li>
+      PHP lexer has an operator style, handles "&lt;?" and "?&gt;" inside strings
+      and some comments.
+      </li>
+      <li>
+      TCL lexer which is just an alias for the C++ lexer so does not really
+      understand TCL syntax.
+      </li>
+      <li>
+      Error lines lexer has styles for Lua error messages and .NET stack traces.
+      </li>
+      <li>
+      Makefile lexer has a target style.
+      </li>
+      <li>
+      Lua lexer handles some [[]] string literals.
+      </li>
+      <li>
+      HTML and XML lexer have a SCE_H_SGML state for tags that
+      start with "&lt;!".
+      </li>
+      <li>
+      Fixed Scintilla bugs with folding. When modifications were performed near
+      folded regions sometimes no unfolding occurred when it should have. Deleting a
+      fold causing character sometimes failed to update fold information correctly.
+      </li>
+      <li>
+      Better support for Scintilla on GTK+ for Win32 including separate
+      PLAT_GTK_WIN32 definition and correct handling of rectangular selection
+      with clipboard operations.
+      </li>
+      <li>
+      SciTE has a Tools | Switch Pane (Ctrl+F6) command to switch focus between
+      edit and output panes.
+      </li>
+      <li>
+      SciTE option output.scroll allows automatic scrolling of output pane to
+      be turned off.
+      </li>
+      <li>
+      Commands can be typed into the SciTE output pane similar to a shell window.
+      </li>
+      <li>
+      SciTE properties magnification and output magnification set initial zoom levels.
+      </li>
+      <li>
+      Option for SciTE comment block command to place comments at start of line.
+      </li>
+      <li>
+       SciTE for Win32 has an option to minimize to the tray rather than the task bar.
+      </li>
+      <li>
+      Close button on SciTE tool bar for Win32.
+      </li>
+      <li>
+      SciTE compiles with GCC 3.0.
+      </li>
+      <li>
+      SciTE's automatic indentation of C++ handles braces without preceding keyword
+      correctly.
+      </li>
+      <li>
+      Bug fixed with GetLine method writing past the end of where it should.
+      </li>
+      <li>
+      Bug fixed with mouse drag automatic scrolling when some lines were folded.
+      </li>
+      <li>
+      Bug fixed because caret XEven setting was inverted.
+      </li>
+      <li>
+      Bug fixed where caret was initially visible even though window was not focussed.
+      </li>
+      <li>
+      Bug fixed where some file names could end with "\\" which caused slow
+      downs on Windows 9x.
+      </li>
+      <li>
+      On Win32, SciTE Replace dialog starts with focus on replacement text.
+      </li>
+      <li>
+      SciTE Go to dialog displays correct current line.
+      </li>
+      <li>
+      Fixed bug with SciTE opening multiple files at once.
+      </li>
+      <li>
+      Fixed bug with Unicode key values reported to container truncated.
+      </li>
+      <li>
+      Fixed bug with unnecessary save point notifications.
+      </li>
+      <li>
+      Fixed bugs with indenting and unindenting at start of line.
+      </li>
+      <li>
+      Monospace Font setting behaves more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite138.zip?download">Release 1.38</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 May 2001.
+      </li>
+      <li>
+	Loadable lexer plugins on Windows.
+      </li>
+      <li>
+	Ruby lexer and support.
+      </li>
+      <li>
+	Lisp lexer and support.
+      </li>
+      <li>
+	Eiffel lexer and support.
+      </li>
+      <li>
+	Modes for better handling of Tab and BackSpace keys within
+	indentation. Mode to avoid autocompletion list cancelling when
+	there are no viable matches.
+      </li>
+      <li>
+	ReplaceTarget replaced with two calls ReplaceTarget
+	(which is incompatible with previous ReplaceTarget) and
+	ReplaceTargetRE. Both of these calls have a count first
+	parameter which allows using strings containing nulls.
+	SearchInTarget and SetSearchFlags functions allow
+	specifying a search in several simple steps which helps
+	some clients which can not create structs or pointers easily.
+      </li>
+      <li>
+	Asian language input through an Input Method Editor works
+	on Windows 2000.
+      </li>
+      <li>
+	On Windows, control characters can be entered through use of
+	the numeric keypad in conjunction with the Alt key.
+      </li>
+      <li>
+	Document memory allocation changed to grow exponentially
+	which reduced time to load a 30 Megabyte file from
+	1000 seconds to 25. Change means more memory may be used.
+      </li>
+      <li>
+	Word part movement keys now handled in Scintilla rather than
+	SciTE.
+      </li>
+      <li>
+	Regular expression '^' and '$' work more often allowing insertion
+	of text at start or end of line with a replace command.
+	Backslash quoted control characters \a, \b, \f, \t, and \v
+	recognized within sets.
+      </li>
+      <li>
+	Session files for SciTE.
+      </li>
+      <li>
+	Export as PDF command hidden in SciTE as it often failed.
+	Code still present so can be turned on by those willing to cope.
+      </li>
+      <li>
+	Bug fixed in HTML lexer handling % before &gt; as end ASP
+	even when no start ASP encountered.
+        Bug fixed when scripts ended with a quoted string and
+        end tag was not seen.
+      </li>
+      <li>
+	Bug fixed on Windows where context menu key caused menu to
+	appear in corner of screen rather than within window.
+      </li>
+      <li>
+	Bug fixed in SciTE's Replace All command not processing
+	whole file when replace string longer than search string.
+      </li>
+      <li>
+	Bug fixed in SciTE's MRU list repeating entries if Ctrl+Tab
+	used when all entries filled.
+      </li>
+      <li>
+	ConvertEOLs call documentation fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite137.zip?download">Release 1.37</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2001.
+      </li>
+      <li>
+	Bug fixed with scroll bars being invisible on GTK+ 1.2.9.
+      </li>
+      <li>
+	Scintilla and SciTE support find and replace using simple regular
+	expressions with tagged expressions. SciTE supports C '\' escapes
+	in the Find and Replace dialogs.
+	Replace in Selection available in SciTE.
+      </li>
+      <li>
+	Scintilla has a 'target' feature for replacing code rapidly without
+	causing display updates.
+      </li>
+      <li>
+	Scintilla and SciTE on GTK+ support file dropping from file managers
+	such as Nautilus and gmc. Files or other URIs dropped on Scintilla
+	result in a URIDropped notification.
+      </li>
+      <li>
+	Lexers may have separate Lex and Fold functions.
+      </li>
+      <li>
+	Lexer infrastructure improved to allow for plug in lexers and for referring
+	to lexers by name rather than by ID.
+      </li>
+      <li>
+	Ada lexer and support added.
+      </li>
+      <li>
+	Option in both Scintilla and SciTE to treat both left and right margin
+	as equally important when repositioning visible area in response to
+	caret movement. Default is to prefer visible area positioning which
+	minimizes the horizontal scroll position thus favouring the left margin.
+      </li>
+      <li>
+	Caret line highlighting.
+      </li>
+      <li>
+	Commands to delete from the caret to the end of line and
+	from the caret to the beginning of line.
+      </li>
+      <li>
+	SciTE has commands for inserting and removing block comments and
+	for inserting stream comments.
+      </li>
+      <li>
+	SciTE Director interface uses C++ '\' escapes to send control characters.
+      </li>
+      <li>
+	SciTE Director interface adds more commands including support for macros.
+      </li>
+      <li>
+	SciTE has menu options for recording and playing macros which are visible
+	when used with a companion program that supports these features.
+      </li>
+      <li>
+	SciTE has an Expand Abbreviation command.
+	Abbreviations are stored in a global abbrev.properties file.
+      </li>
+      <li>
+	SciTE has a Full Screen command to switch between a normal window
+	size and using the full screen. On Windows, the menu bar can be turned
+	off when in full screen mode.
+      </li>
+      <li>
+	SciTE has a Use monospaced font command to switch between the normal
+	set of fonts and one size of a particular fixed width font.
+      </li>
+      <li>
+	SciTE's use of tabs can be controlled for particular file names
+	as well as globally.
+      </li>
+      <li>
+	The contents of SciTE's status bar can be defined by a property and
+	include variables. On Windows, several status bar definitions can be active
+	with a click on the status bar cycling through them.
+      </li>
+      <li>
+	Copy as RTF command in SciTE on Windows to allow pasting
+	styled text into word processors.
+      </li>
+      <li>
+	SciTE can allow the use of non-alphabetic characters in
+	Complete Symbol lists and can automatically display this autocompletion
+	list when a trigger character such as '.' is typed.
+	Complete word can be set to pop up when the user is typing a word and
+	there is only one matching word in the document.
+      </li>
+      <li>
+	SciTE lists the imported properties files on a menu to allow rapid
+	access to them.
+      </li>
+      <li>
+	SciTE on GTK+ improvements to handling accelerator keys and focus
+	in dialogs. Message boxes respond to key presses without the Alt key as
+	they have no text entries to accept normal keystrokes.
+      </li>
+      <li>
+	SciTE on GTK+ sets the application icon.
+      </li>
+      <li>
+	SciTE allows setting the colours used to indicate the current
+	error line.
+      </li>
+      <li>
+	Variables within PHP strings have own style. Keyword list updated.
+      </li>
+      <li>
+	Keyword list for Lua updated for Lua 4.0.
+      </li>
+      <li>
+	Bug fixed in rectangular selection where rectangle still appeared
+	selected after using cursor keys to move caret.
+      </li>
+      <li>
+	Bug fixed in C++ lexer when deleting a '{' controlling a folded range
+	led to that range becoming permanently invisible.
+      </li>
+      <li>
+	Bug fixed in Batch lexer where comments were not recognized.
+      </li>
+      <li>
+	Bug fixed with undo actions coalescing into steps incorrectly.
+      </li>
+      <li>
+	Bug fixed with Scintilla on GTK+ positioning scroll bars 1 pixel
+	over the Scintilla window leading to their sides being chopped off.
+      </li>
+      <li>
+	Bugs fixed in SciTE when doing some actions led to the start
+	or end of the file being displayed rather than the current location.
+      </li>
+      <li>
+	Appearance of calltips fixed to look like document text including
+	any zoom factor. Positioned to be outside current line even when
+	multiple fonts and sizes used.
+      </li>
+      <li>
+	Bug fixed in Scintilla macro support where typing Enter caused both a newline
+	command and newline character insertion to be recorded.
+      </li>
+      <li>
+	Bug fixed in SciTE on GTK+ where focus was moving
+	between widgets incorrectly.
+      </li>
+      <li>
+	Bug fixed with fold symbols sometimes not updating when
+	the text changed.
+      </li>
+      <li>
+	Bugs fixed in SciTE's handling of folding commands.
+      </li>
+      <li>
+	Deprecated undo collection enumeration removed from API.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite136.zip?download">Release 1.36</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 March 2001.
+      </li>
+      <li>
+	Scintilla supports GTK+ on Win32.
+      </li>
+      <li>
+	Some untested work on making Scintilla and SciTE 64 bit compatible.
+	For users on GTK+ this requires including Scintilla.h before
+	ScintillaWidget.h.
+      </li>
+      <li>
+	HTML lexer allows folding HTML.
+      </li>
+      <li>
+	New lexer for Avenue files which are used in the ESRI ArcView GIS.
+      </li>
+      <li>
+	DOS Batch file lexer has states for '@', external commands, variables and
+	operators.
+      </li>
+      <li>
+	C++ lexer can fold comments of /* .. */ form.
+      </li>
+      <li>
+	Better disabling of pop up menu items in Scintilla when in read-only mode.
+      </li>
+      <li>
+	Starting to move to Doxygen compatible commenting.
+      </li>
+      <li>
+	Director interface on Windows enables another application to control SciTE.
+      </li>
+      <li>
+	Opening SciTE on Windows 9x sped up greatly for some cases.
+      </li>
+      <li>
+	The command.build.directory property allows SciTE to run the build
+	command in a different directory to the source files.
+      </li>
+      <li>
+	SciTE on Windows allows setting foreground and background colours
+	for printed headers and footers.
+      </li>
+      <li>
+	Bug fixed in finding calltips in SciTE which led to no calltips for some identifiers.
+      </li>
+      <li>
+	Documentation added for lexers and for the extension and director interfaces.
+      </li>
+      <li>
+	SciTE menus rearranged with new View menu taking over some of the items that
+	were under the Options menu. Clear All Bookmarks command added.
+      </li>
+      <li>
+	Clear Output command in SciTE.
+      </li>
+      <li>
+	SciTE on Windows gains an Always On Top command.
+      </li>
+      <li>
+	Bug fixed in SciTE with attempts to define properties recursively.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where only one level of substitution was done.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where extensions were not being
+	matched in a case insensitive manner.
+      </li>
+      <li>
+	Bug fixed in SciTE on Windows where the Go to dialog displays the correct
+	line number.
+      </li>
+      <li>
+	In SciTE, if fold.on.open set then switching buffers also performs fold.
+      </li>
+      <li>
+	Bug fixed in Scintilla where ensuring a line was visible in the presence of folding
+	operated on the document line instead of the visible line.
+      </li>
+      <li>
+	SciTE command line processing modified to operate on arguments in order and in
+	two phases. First any arguments before the first file name are processed, then the
+	UI is opened, then the remaining arguments are processed. Actions defined for the
+	Director interface (currently only "open") may also be used on the command line.
+	For example, "SciTE -open:x.txt" will start SciTE and open x.txt.
+      </li>
+      <li>
+	Numbered menu items SciTE's Buffers menu and the Most Recently Used portion
+	of the File menu go from 1..0 rather than 0..9.
+      </li>
+      <li>
+	The tab bar in SciTE for Windows has numbers.
+	The tab.hide.one option hides the tab bar until there is more than one buffer open.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite135.zip?download">Release 1.35</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 January 2001.
+      </li>
+      <li>
+        Rewritten and simplified widget code for the GTK+ version to enhance
+        solidity and make more fully compliant with platform norms. This includes more
+        normal handling of keystrokes so they are forwarded to containers correctly.
+      </li>
+      <li>
+        User defined lists can be shown.
+      </li>
+      <li>
+        Many fixes to the Perl lexer.
+      </li>
+      <li>
+        Pascal lexer handles comments more correctly.
+      </li>
+      <li>
+        C/C++/Java/JavaScipt lexer has a state for line doc comments.
+      </li>
+      <li>
+        Error output lexer understands Sun CC messages.
+      </li>
+      <li>
+        Make file lexer has variable, preprocessor, and operator states.
+      </li>
+      <li>
+        Wider area given to an italics character that is at the end of a line to prevent it
+	being cut off.
+      </li>
+      <li>
+        Call to move the caret inside the currently visible area.
+      </li>
+      <li>
+        Paste Rectangular will space fill on the left hand side of the pasted text as
+	needed to ensure it is kept rectangular.
+      </li>
+      <li>
+        Cut and Paste Rectangular does nothing in read-only mode.
+      </li>
+      <li>
+        Undo batching changed so that a paste followed by typing creates two undo actions..
+      </li>
+      <li>
+        A "visibility policy" setting for Scintilla determines which range of lines are displayed
+	when a particular line is moved to. Also exposed as a property in SciTE.
+      </li>
+      <li>
+        SciTE command line allows property settings.
+      </li>
+      <li>
+        SciTE has a View Output command to hide or show the output pane.
+      </li>
+      <li>
+        SciTE's Edit menu has been split in two with searching commands moved to a
+	new Search menu. Find Previous and Previous Bookmark are in the Search menu.
+      </li>
+      <li>
+        SciTE on Windows has options for setting print margins, headers and footers.
+      </li>
+      <li>
+        SciTE on Windows has tooltips for toolbar.
+      </li>
+      <li>
+        SciTE on GTK+ has properties for setting size of file selector.
+      </li>
+      <li>
+        Visual and audio cues in SciTE on Windows enhanced.
+      </li>
+      <li>
+        Fixed performance problem in SciTE for GTK+ by dropping the extra 3D
+        effect on the content windows.
+      </li>
+      <li>
+        Fixed problem in SciTE where choosing a specific lexer then meant
+        that no lexer was chosen when files opened.
+      </li>
+      <li>
+        Default selection colour changed to be visible on low colour displays.
+      </li>
+      <li>
+        Fixed problems with automatically reloading changed documents in SciTE on
+        Windows.
+      </li>
+      <li>
+        Fixed problem with uppercase file extensions in SciTE.
+      </li>
+      <li>
+        Fixed some problems when using characters >= 128, some of which were being
+        incorrectly treated as spaces.
+      </li>
+      <li>
+        Fixed handling multiple line tags, non-inline scripts, and XML end tags /&gt; in HTML/XML lexer.
+      </li>
+      <li>
+        Bookmarks in SciTE no longer disappear when switching between buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite134.zip?download">Release 1.34</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 November 2000.
+      </li>
+      <li>
+        Pascal lexer.
+      </li>
+      <li>
+        Export as PDF in SciTE.
+      </li>
+      <li>
+        Support for the OpenVMS operating system in SciTE.
+      </li>
+      <li>
+        SciTE for GTK+ can check for another instance of SciTE
+	editing a file and switch to it rather than open a second instance
+	on one file.
+      </li>
+      <li>
+        Fixes to quoting and here documents in the Perl lexer.
+      </li>
+      <li>
+        SciTE on Windows can give extra visual and audio cues when a
+	warning is shown or find restarts from beginning of file.
+      </li>
+      <li>
+        Open Selected Filename command in SciTE. Also understands some
+	warning message formats.
+      </li>
+      <li>
+        Wider area for line numbers when printing.
+      </li>
+      <li>
+        Better scrolling performance on GTK+.
+      </li>
+      <li>
+        Fixed problem where rectangles with negative coordinates were
+	invalidated leading to trouble with platforms that use
+	unsigned coordinates.
+      </li>
+      <li>
+        GTK+ Scintilla uses more compliant signalling code so that keyboard
+	events should propagate to containers.
+      </li>
+      <li>
+        Bug fixed with opening full or partial paths.
+      </li>
+      <li>
+        Improved handling of paths in error messages in SciTE.
+      </li>
+      <li>
+        Better handling of F6 in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite133.zip?download">Release 1.33</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 2000.
+      </li>
+      <li>
+        XIM support for the GTK+ version of Scintilla ensures that more non-English
+        characters can be typed.
+      </li>
+      <li>
+        Caret may be 1, 2, or 3 pixels wide.
+      </li>
+      <li>
+        Cursor may be switched to wait image during lengthy processing.
+      </li>
+      <li>
+        Scintilla's internal focus flag is exposed for clients where focus is handled in
+        complex ways.
+      </li>
+      <li>
+        Error status defined for Scintilla to hold indication that an operation failed and the reason
+        for that failure. No detection yet implemented but clients may start using the interface
+        so as to be ready for when it does.
+      </li>
+      <li>
+        Context sensitive help in SciTE.
+      </li>
+      <li>
+        CurrentWord property available in SciTE holding the value of the word the
+        caret is within or near.
+      </li>
+      <li>
+        Apache CONF file lexer.
+      </li>
+      <li>
+        Changes to Python lexer to allow 'as' as a context sensitive keyword and the
+        string forms starting with u, r, and ur to be recognized.
+      </li>
+      <li>
+        SCN_POSCHANGED notification now working and SCN_PAINTED notification added.
+      </li>
+      <li>
+        Word part movement commands for cursoring between the parts of reallyLongCamelIdentifiers and
+        other_ways_of_making_words.
+      </li>
+      <li>
+        When text on only one line is selected, Shift+Tab moves to the previous tab stop.
+      </li>
+      <li>
+        Tab control available for Windows version of SciTE listing all the buffers
+        and making it easy to switch between them.
+      </li>
+      <li>
+        SciTE can be set to automatically determine the line ending type from the contents of a
+        file when it is opened.
+      </li>
+      <li>
+        Dialogs in GTK+ version of SciTE made more modal and have accelerator keys.
+      </li>
+      <li>
+        Find in Files command in GTK+ version of SciTE allows choice of directory.
+      </li>
+      <li>
+        On Windows, multiple files can be opened at once.
+      </li>
+      <li>
+        SciTE source broken up into more files.
+      </li>
+      <li>
+        Scintilla headers made safe for C language, not just C++.
+      </li>
+      <li>
+        New printing modes - force background to white and force default background to white.
+      </li>
+      <li>
+        Automatic unfolding not occurring when Enter pressed at end of line bug fixed.
+      </li>
+      <li>
+        Bugs fixed in line selection.
+      </li>
+      <li>
+        Bug fixed with escapes in PHP strings in the HTML lexer.
+      </li>
+      <li>
+        Bug fixed in SciTE for GTK+ opening files when given full paths.
+      </li>
+      <li>
+        Bug fixed in autocompletion where user backspaces into existing text.
+      </li>
+      <li>
+        Bugs fixed in opening files and ensuring they are saved before running.
+        A case bug also fixed here.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite132.zip?download">Release 1.32</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 8 September 2000.
+      </li>
+      <li>
+        Fixes bugs in complete word and related code. Protection against a bug when
+	receiving a bad argument.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite131.zip?download">Release 1.31</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 September 2000.
+      </li>
+      <li>
+        Scintilla is available as a COM control from the scintillactrl module in CVS.
+      </li>
+      <li>
+        Style setting to underline text. Exposed in SciTE as "underlined".
+      </li>
+      <li>
+        Style setting to make text invisible.
+      </li>
+      <li>
+        SciTE has an extensibility interface that can be used to implement features such as
+        a scripting language or remote control. An example use of this is the extlua module
+        available from CVS which allows SciTE to be scripted in Lua.
+      </li>
+      <li>
+        Many minor fixes to all of the lexers.
+      </li>
+      <li>
+        New lexer for diff and patch files.
+      </li>
+      <li>
+        Error message lexer understands Perl error messages.
+      </li>
+      <li>
+        C/C++/Java lexer now supports C#, specifically verbatim strings and
+	@ quoting of identifiers that are the same as keywords. SciTE has
+	a set of keywords for C# and a build command set up for C#.
+      </li>
+      <li>
+        Scintilla property to see whether in overtype or insert state.
+      </li>
+      <li>
+         PosChanged notification fired when caret moved.
+      </li>
+      <li>
+        Comboboxes in dialogs in SciTE on Windows can be horizontally scrolled.
+      </li>
+      <li>
+        Autocompletion and calltips can treat the document as case sensitive or
+        case insensitive.
+      </li>
+      <li>
+        Autocompletion can be set to automatically choose the only
+	element in a single element list.
+      </li>
+      <li>
+        Set of characters that automatically complete an autocompletion list
+	can be set.
+      </li>
+      <li>
+        SciTE command to display calltip - useful when dropped because of
+	editing.
+      </li>
+      <li>
+        SciTE has a Revert command to go back to the last saved version.
+      </li>
+      <li>
+        SciTE has an Export as RTF command. Save as HTML is renamed
+	to Export as HTML and is located on the Export sub menu.
+      </li>
+      <li>
+        SciTE command "Complete Word" searches document for any
+	words starting with characters before caret.
+      </li>
+      <li>
+        SciTE options for changing aspects of the formatting of files exported
+	as HTML or RTF.
+      </li>
+      <li>
+        SciTE "character.set" option for choosing the character
+	set for all fonts.
+      </li>
+      <li>
+        SciTE has a "Toggle all folds" command.
+      </li>
+      <li>
+        The makefiles have changed. The makefile_vc and
+	makefile_bor files in scintilla/win32 and scite/win32 have been
+	merged into scintilla/win32/scintilla.mak and scite/win32/scite.mak.
+	DEBUG may be defined for all make files and this will turn on
+	assertions and for some make files will choose other debugging
+	options.
+      </li>
+      <li>
+         To make debugging easier and allow good use of BoundsChecker
+	 there is a Visual C++ project file in scite/boundscheck that builds
+	 all of Scintilla and SciTE into one executable.
+      </li>
+      <li>
+         The size of the SciTE output window can be set with the
+	 output.horizontal.size and output.vertical.size settings.
+      </li>
+      <li>
+         SciTE status bar indicator for insert or overwrite mode.
+      </li>
+      <li>
+        Performance improvements to autocompletion and calltips.
+      </li>
+      <li>
+        A caret redraw problem when undoing is fixed.
+      </li>
+      <li>
+        Crash with long lines fixed.
+      </li>
+      <li>
+        Bug fixed with merging markers when lines merged.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite130.zip?download">Release 1.30</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 26 July 2000.
+      </li>
+      <li>
+        Much better support for PHP which is now an integral part of the HTML support.
+      </li>
+      <li>
+        Start replacement of Windows-specific APIs with cross platform APIs.
+        In 1.30, the new APIs are introduced but the old APIs are still available.
+        For the GTK+ version, may have to include "WinDefs.h" explicitly to
+        use the old APIs.
+      </li>
+      <li>
+        "if" and "import" statements in SciTE properties files allows modularization into
+        language-specific properties files and choices based upon platform.
+        This means that SciTE is delivered with 9 language-specific properties files
+        as well as the standard SciTEGlobal.properties file.
+      </li>
+      <li>
+        Much lower resource usage on Windows 9x.
+      </li>
+      <li>
+        "/p" option in SciTE on Windows for printing a file and then exiting.
+      </li>
+      <li>
+        Options for printing with inverted brightness (when the screen is set to use
+        a dark background) and to force black on white printing.
+      </li>
+      <li>
+        Option for printing magnified or miniaturized from screen settings.
+      </li>
+      <li>
+        In SciTE, Ctrl+F3 and Ctrl+Shift+F3 find the selection in the forwards and backwards
+        directions respectively.
+      </li>
+      <li>
+        Auto-completion lists may be set to cancel when the cursor goes before
+        its start position or before the start of string being completed.
+      </li>
+      <li>
+        Auto-completion lists automatically size more sensibly.
+      </li>
+      <li>
+        SCI_CLEARDOCUMENTSTYLE zeroes all style bytes, ensures all
+        lines are shown and deletes all folding information.
+      </li>
+      <li>
+        On Windows, auto-completion lists are visually outdented rather than indented.
+      </li>
+      <li>
+        Close all command in SciTE.
+      </li>
+      <li>
+        On Windows multiple files can be dragged into SciTE.
+      </li>
+      <li>
+        When saving a file, the SciTE option save.deletes.first deletes it before doing the save.
+        This allows saving with a different capitalization on Windows.
+      </li>
+      <li>
+        When use tabs option is off pressing the tab key inserts spaces.
+      </li>
+      <li>
+        Bug in indicators leading to extra line drawn fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite128.zip?download">Release 1.28</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 June 2000.
+      </li>
+      <li>
+         Fixes crash in indentation guides when indent size set to 0.
+      </li>
+      <li>
+         Fixes to installation on GTK+/Linux. User properties file on GTK+ has a dot at front of name:
+         .SciTEUser.properties. Global properties file location configurable at compile time
+         defaulting to $prefix/share/scite. $prefix determined from Gnome if present else its
+         /usr/local and can be overridden by installer. Gnome menu integration performed in
+         make install if Gnome present.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite127.zip?download">Release 1.27</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 23 June 2000.
+      </li>
+      <li>
+         Indentation guides. View whitespace mode may be set to not display whitespace
+	 in indentation.
+      </li>
+      <li>
+        Set methods have corresponding gets for UndoCollection, BufferedDraw,
+	CodePage, UsePalette, ReadOnly, CaretFore, and ModEventMask.
+      </li>
+      <li>
+        Caret is continuously on rather than blinking while typing or holding down
+	delete or backspace. And is now always shown if non blinking when focused on GTK+.
+      </li>
+      <li>
+        Bug fixed in SciTE with file extension comparison now done in case insensitive way.
+      </li>
+      <li>
+        Bugs fixed in SciTE's file path handling on Windows.
+      </li>
+      <li>
+        Bug fixed with preprocessor '#' last visible character causing hang.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite126.zip?download">Release 1.26</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 13 June 2000.
+      </li>
+      <li>
+         Support for the Lua language in both Scintilla and SciTE.
+      </li>
+      <li>
+        Multiple buffers may be open in SciTE.
+      </li>
+      <li>
+        Each style may have a character set configured. This may determine
+	the characters that are displayed by the style.
+      </li>
+      <li>
+         In the C++ lexer, lexing of preprocessor source may either treat it all as being in
+	 the preprocessor class or only the initial # and preprocessor command word as
+	 being in the preprocessor class.
+      </li>
+      <li>
+        Scintilla provides SCI_CREATEDOCUMENT, SCI_ADDREFDOCUMENT, and
+	SCI_RELEASEDOCUMENT to make it easier for a container to deal with multiple
+	documents.
+      </li>
+      <li>
+        GTK+ specific definitions in Scintilla.h were removed to ScintillaWidget.h. All GTK+ clients will need to
+	#include "ScintillaWidget.h".
+      </li>
+      <li>
+        For GTK+, tools can be executed in the background by setting subsystem to 2.
+      </li>
+      <li>
+        Keys in the properties files are now case sensitive. This leads to a performance increase.
+      </li>
+      <li>
+        Menu to choose which lexer to use on a file.
+      </li>
+      <li>
+        Tab size dialog on Windows.
+      </li>
+      <li>
+        File dialogs enlarged on GTK+.
+      </li>
+      <li>
+         Match Brace command bound to Ctrl+E on both platforms with Ctrl+] a synonym on Windows.
+         Ctrl+Shift+E is select to matching brace. Brace matching tries to match to either the inside or the
+         outside, depending on whether the cursor is inside or outside the braces initially.
+	View End of Line bound to Ctrl+Shift+O.
+      </li>
+      <li>
+        The Home key may be bound to move the caret to either the start of the line or the start of the
+        text on the line.
+      </li>
+      <li>
+        Visual C++ project file for SciTE.
+      </li>
+      <li>
+        Bug fixed with current x location after Tab key.
+      </li>
+      <li>
+        Bug fixed with hiding fold margin by setting fold.margin.width to 0.
+      </li>
+      <li>
+        Bugs fixed with file name confusion on Windows when long and short names used, or different capitalizations,
+	or relative paths.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite125.zip?download">Release 1.25</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 May 2000.
+      </li>
+      <li>
+        Some Unicode support on Windows. Treats buffer and API as UTF-8 and displays
+	through UCS-2 of Windows.
+      </li>
+      <li>
+        Automatic indentation. Indentation size can be different to tab size.
+      </li>
+      <li>
+        Tool bar.
+      </li>
+      <li>
+        Status bar now on Windows as well as GTK+.
+      </li>
+      <li>
+        Input fields in Find and Replace dialogs now have history on both Windows and
+	GTK+.
+      </li>
+      <li>
+        Auto completion list items may be separated by a chosen character to allow spaces
+	in items. The selected item may be changed through the API.
+      </li>
+      <li>
+        Horizontal scrollbar can be turned off.
+      </li>
+      <li>
+        Property to remove trailing spaces when saving file.
+      </li>
+      <li>
+        On Windows, changed font size calculation to be more compatible with
+	other applications.
+      </li>
+      <li>
+        On GTK+, SciTE's global properties files are looked for in the directory specified in the
+	SCITE_HOME environment variable if it is set. This allows hiding in a dot directory.
+      </li>
+      <li>
+        Keyword lists in SciTE updated for JavaScript to include those destined to be used in
+	the future. IDL includes XPIDL keywords as well as MSIDL keywords.
+      </li>
+      <li>
+        Zoom level can be set and queried through API.
+      </li>
+      <li>
+        New notification sent before insertions and deletions.
+      </li>
+      <li>
+        LaTeX lexer.
+      </li>
+      <li>
+        Fixes to folding including when deletions and additions are performed.
+      </li>
+      <li>
+        Fix for crash with very long lines.
+      </li>
+      <li>
+        Fix to affect all of rectangular selections with deletion and case changing.
+      </li>
+      <li>
+        Removed non-working messages that had been included only for Richedit compatibility.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite124.zip">Release 1.24</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 March 2000.
+      </li>
+      <li>
+        Added lexing of IDL based on C++ lexer with extra UUID lexical class.
+      </li>
+      <li>
+        Functions and associated keys for Line Delete, Line Cut, Line Transpose,
+	Selection Lower Case and Selection Upper Case.
+      </li>
+      <li>
+        Property setting for SciTE, eol.mode, chooses initial state of line end characters.
+      </li>
+      <li>
+        Fixed bugs in undo history with small almost-contiguous changes being incorrectly coalesced.
+      </li>
+      <li>
+        Fixed bugs with incorrect expansion of ContractionState data structures causing crash.
+      </li>
+      <li>
+        Fixed bugs relating to null fonts.
+      </li>
+      <li>
+        Fixed bugs where recolourization was not done sometimes when required.
+      </li>
+      <li>
+        Fixed compilation problems with SVector.h.
+      </li>
+      <li>
+        Fixed bad setting of fold points in Python.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite123.zip?download">Release 1.23</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 March 2000.
+      </li>
+      <li>
+        Directory structure to separate on basis of product (Scintilla, SciTE, DMApp)
+	and environment (Cross-platform, Win32, GTK+).
+      </li>
+      <li>
+        Download packaging to allow download of the source or platform dependent executables.
+      </li>
+      <li>
+        Source code now available from CVS at SourceForge.
+      </li>
+      <li>
+        Very simple Windows-only demonstration application DMApp is available from cvs as dmapp.
+      </li>
+      <li>
+        Lexing functionality may optionally be included in Scintilla rather than be provided by
+        the container.
+      </li>
+      <li>
+        Set of lexers included is determined at link time by defining which of the Lex* object files
+	are linked in.
+      </li>
+      <li>
+        On Windows, the SciLexer.DLL extends Scintilla.DLL with the standard lexers.
+      </li>
+      <li>
+        Enhanced HTML lexer styles embedded VBScript and Python.
+	ASP segments are styled and ASP scripts in JavaScript, VBScript and Python are styled.
+      </li>
+      <li>
+        PLSQL and PHP supported.
+      </li>
+      <li>
+        Maximum number of lexical states extended to 128.
+      </li>
+      <li>
+        Lexers may store per line parse state for multiple line features such as ASP script language choice.
+      </li>
+      <li>
+        Lexing API simplified.
+      </li>
+      <li>
+        Project file for Visual C++.
+      </li>
+      <li>
+        Can now cycle through all recent files with Ctrl+Tab in SciTE.
+      </li>
+      <li>
+        Bookmarks in SciTE.
+      </li>
+      <li>
+        Drag and drop copy works when dragging to the edge of the selection.
+      </li>
+      <li>
+        Fixed bug with value sizes in properties file.
+      </li>
+      <li>
+        Fixed bug with last line in properties file not being used.
+      </li>
+      <li>
+        Bug with multiple views of one document fixed.
+      </li>
+      <li>
+        Keypad now works on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE122.zip?download">Release 1.22</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 February 2000.
+      </li>
+      <li>
+        wxWindows platform defined.
+	Implementation for wxWindows will be available separately
+	from main Scintilla distribution.
+      </li>
+      <li>
+        Line folding in Scintilla.
+      </li>
+      <li>
+        SciTE performs syntax directed folding for C/C++/Java/JavaScript and for Python.
+      </li>
+      <li>
+        Optional macro recording support.
+      </li>
+      <li>
+        User properties file (SciTEUser.properties) allows for customization by the user
+	that is not overwritten with each installation of SciTE.
+      </li>
+      <li>
+        Python lexer detects and highlights inconsistent indentation.
+      </li>
+      <li>
+        Margin API made more orthogonal. SCI_SETMARGINWIDTH and SCI_SETLINENUMBERWIDTH
+        are deprecated in favour of this new API.
+      </li>
+      <li>
+        Margins may be made sensitive to forward mouse click events to container.
+      </li>
+      <li>
+        SQL lexer and styles included.
+      </li>
+      <li>
+        Perl lexer handles regular expressions better.
+      </li>
+      <li>
+        Caret policy determines how closely caret is tracked by visible area.
+      </li>
+      <li>
+        New marker shapes: arrow pointing down, plus and minus.
+      </li>
+      <li>
+        Optionally display full path in title rather than just file name.
+      </li>
+      <li>
+        Container is notified when Scintilla gains or loses focus.
+      </li>
+      <li>
+        SciTE handles focus in a more standard way and applies the main
+	edit commands to the focused pane.
+      </li>
+      <li>
+        Container is notified when Scintilla determines that a line needs to be made visible.
+      </li>
+      <li>
+        Document watchers receive notification when document about to be deleted.
+      </li>
+      <li>
+        Document interface allows access to list of watchers.
+      </li>
+      <li>
+        Line end determined correctly for lines ending with only a '\n'.
+      </li>
+      <li>
+        Search variant that searches form current selection and sets selection.
+      </li>
+      <li>
+        SciTE understands format of diagnostic messages from WScript.
+      </li>
+      <li>
+        SciTE remembers top line of window for each file in MRU list so switching to a recent file
+	is more likely to show the same text as when the file was previously visible.
+      </li>
+      <li>
+        Document reference count now initialized correctly.
+      </li>
+      <li>
+        Setting a null document pointer creates an empty document.
+      </li>
+      <li>
+        WM_GETTEXT can no longer overrun buffer.
+      </li>
+      <li>
+        Polygon drawing bug fixed on GTK+.
+      </li>
+      <li>
+        Java and JavaScript lexers merged into C++ lexer.
+      </li>
+      <li>
+        C++ lexer indicates unterminated strings by colouring the end of the line
+	rather than changing the rest of the file to string style. This is less
+	obtrusive and helps the folding.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE121.zip?download">Release 1.21</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 2 February 2000.
+      </li>
+      <li>
+        Blank margins on left and right side of text.
+      </li>
+      <li>
+        SCN_CHECKBRACE renamed SCN_UPDATEUI and made more efficient.
+      </li>
+      <li>
+        SciTE source code refactored into platform independent and platform specific classes.
+      </li>
+      <li>
+        XML and Perl subset lexers in SciTE.
+      </li>
+      <li>
+        Large improvement to lexing speed.
+      </li>
+      <li>
+        A new subsystem, 2, allows use of ShellExec on Windows.
+      </li>
+      <li>
+        Borland compatible makefile.
+      </li>
+      <li>
+        Status bar showing caret position in GTK+ version of SciTE.
+      </li>
+      <li>
+        Bug fixes to selection drawing when part of selection outside window, mouse release over
+        scroll bars, and scroll positioning after deletion.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE120.zip">Release 1.2</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 January 2000.
+      </li>
+      <li>
+        Multiple views of one document.
+      </li>
+      <li>
+        Rectangular selection, cut, copy, paste, drag and drop.
+      </li>
+      <li>
+        Long line indication.
+      </li>
+      <li>
+        Reverse searching
+      </li>
+      <li>
+        Line end conversion.
+      </li>
+      <li>
+        Generic autocompletion and calltips in SciTE.
+      </li>
+      <li>
+        Call tip background colour can be set.
+      </li>
+      <li>
+        SCI_MARKERPREV for moving to a previous marker.
+      </li>
+      <li>
+        Caret kept more within window where possible.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE115.zip">Release 1.15</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 15 December 1999.
+      </li>
+      <li>
+        Brace highlighting and badlighting (for mismatched braces).
+      </li>
+      <li>
+        Visible line ends.
+      </li>
+      <li>
+        Multiple line call tips.
+      </li>
+      <li>
+        Printing now works from SciTE on Windows.
+      </li>
+      <li>
+        SciTE has a global "*" lexer style that is used as the basis for all the lexers' styles.
+      </li>
+      <li>
+        Fixes some warnings on GTK+ 1.2.6.
+      </li>
+      <li>
+        Better handling of modal dialogs on GTK+.
+      </li>
+      <li>
+        Resize handle drawn on pane splitter in SciTE on GTK+ so it looks more like a regular GTK+
+        *paned widget.
+      </li>
+      <li>
+        SciTE does not place window origin offscreen if no properties file found on GTK+.
+      </li>
+      <li>
+        File open filter remembered in SciTE on Windows.
+      </li>
+      <li>
+        New mechanism using style numbers 32 to 36 standardizes the setting of styles for brace
+        highlighting, brace badlighting, line numbers, control characters and the default style.
+      </li>
+      <li>
+        Old messages SCI_SETFORE .. SCI_SETFONT have been replaced by the default style 32. The old
+        messages are deprecated and will disappear in a future version.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE114.zip">Release 1.14</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 20 November 1999.
+      </li>
+      <li>
+        Fixes a scrolling bug reported on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE113.zip">Release 1.13</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 18 November 1999.
+      </li>
+      <li>
+        Fixes compilation problems with the mingw32 GCC 2.95.2 on Windows.
+      </li>
+      <li>
+        Control characters are now visible.
+      </li>
+      <li>
+        Performance has improved, particularly for scrolling.
+      </li>
+      <li>
+        Windows RichEdit emulation is more accurate. This may break client code that uses these
+        messages: EM_GETLINE, EM_GETLINECOUNT, EM_EXGETSEL, EM_EXSETSEL, EM_EXLINEFROMCHAR,
+        EM_LINELENGTH, EM_LINEINDEX, EM_CHARFROMPOS, EM_POSFROMCHAR, and EM_GETTEXTRANGE.
+      </li>
+      <li>
+        Menus rearranged and accelerator keys set for all static items.
+      </li>
+      <li>
+        Placement of space indicators in view whitespace mode is more accurate with some fonts.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE112.zip">Release 1.12</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 November 1999.
+      </li>
+      <li>
+        Packaging error in 1.11 meant that the compilation error was not fixed in that release.
+        Linux/GTK+ should compile with GCC 2.95 this time.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE111.zip">Release 1.11</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 7 November 1999.
+      </li>
+      <li>
+        Fixed a compilation bug in ScintillaGTK.cxx.
+      </li>
+      <li>
+        Added a README file to explain how to build.
+      </li>
+      <li>
+        GTK+/Linux downloads now include documentation.
+      </li>
+      <li>
+        Binary only Sc1.EXE one file download for Windows.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE110.zip">Release 1.1</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 1999.
+      </li>
+      <li>
+        Major restructuring for better modularity and platform independence.
+      </li>
+      <li>
+        Inter-application drag and drop.
+      </li>
+      <li>
+        Printing support in Scintilla on Windows.
+      </li>
+      <li>
+        Styles can select colouring to end of line. This can be used when a file contains more than
+        one language to differentiate between the areas in each language. An example is the HTML +
+        JavaScript styling in SciTE.
+      </li>
+      <li>
+        Actions can be grouped in the undo stack, so they will be undone together. This grouping is
+        hierarchical so higher level actions such as replace all can be undone in one go. Call to
+        discover whether there are any actions to redo.
+      </li>
+      <li>
+        The set of characters that define words can be changed.
+      </li>
+      <li>
+        Markers now have identifiers and can be found and deleted by their identifier. The empty
+        marker type can be used to make a marker that is invisible and which is only used to trace
+        where a particular line moves to.
+      </li>
+      <li>
+        Double click notification.
+      </li>
+      <li>
+        HTML styling in SciTE also styles embedded JavaScript.
+      </li>
+      <li>
+        Additional tool commands can be added to SciTE.
+      </li>
+      <li>
+        SciTE option to allow reloading if changed upon application activation and saving on
+        application deactivation. Not yet working on GTK+ version.
+      </li>
+      <li>
+        Entry fields in search dialogs remember last 10 user entries. Not working in all cases in
+        Windows version.
+      </li>
+      <li>
+        SciTE can save a styled copy of the current file in HTML format. As SciTE does not yet
+        support printing, this can be used to print a file by then using a browser to print the
+        HTML file.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE102.zip">Release 1.02</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 October 1999.
+      </li>
+      <li>
+        GTK+ version compiles with GCC 2.95.
+      </li>
+      <li>
+        Properly deleting objects when window destroyed under GTK+.
+      </li>
+      <li>
+        If the selection is not empty backspace deletes the selection.
+      </li>
+      <li>
+        Some X style middle mouse button handling for copying the primary selection to and from
+        Scintilla. Does not work in all cases.
+      </li>
+      <li>
+        HTML styling in SciTE.
+      </li>
+      <li>
+        Stopped dirty flag being set in SciTE when results pane modified.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE101.zip">Release 1.01</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 September 1999.
+      </li>
+      <li>
+        Better DBCS support on Windows including IME.
+      </li>
+      <li>
+        Wheel mouse support for scrolling and zooming on Windows. Zooming with Ctrl+KeypadPlus and
+        Ctrl+KeypadMinus.
+      </li>
+      <li>
+        Performance improvements especially on GTK+.
+      </li>
+      <li>
+        Caret blinking and settable colour on both GTK+ and Windows.
+      </li>
+      <li>
+        Drag and drop within a Scintilla window. On Windows, files can be dragged into SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE100.zip">Release 1.0</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 17 May 1999.
+      </li>
+      <li>
+        Changed name of "Tide" to "SciTE" to avoid clash with a TCL based IDE. "SciTE" is a
+        SCIntilla based Text Editor and is Latin meaning something like "understanding in a neat
+        way" and is also an Old English version of the word "shit".
+      </li>
+      <li>
+        There is a SCI_AUTOCSTOPS message for defining a string of characters that will stop
+        autocompletion mode. Autocompletion mode is cancelled when any cursor movement occurs apart
+        from backspace.
+      </li>
+      <li>
+        GTK+ version now splits horizontally as well as vertically and all dialogs cancel when the
+        escape key is pressed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.93</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 12 May 1999.
+      </li>
+      <li>
+        A bit more robust than 0.92 and supports SCI_MARKERNEXT message.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.92</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 11 May 1999.
+      </li>
+      <li>
+        GTK+ version now contains all features of Windows version with some very small differences.
+        Executing programs works much better now.
+      </li>
+      <li>
+        New palette code to allow more colours to be displayed in 256 colour screen modes. A line
+        number column can be displayed to the left of the selection margin.
+      </li>
+      <li>
+        The code that maps from line numbers to text positions and back has been completely
+        rewritten to be faster, and to allow markers to move with the text.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide91.zip">Beta release 0.91</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30 April 1999, containing fixes to text measuring to make Scintilla work better
+        with bitmap fonts. Also some small fixes to make compiling work with Visual C++.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide90.zip">Beta release 0.90</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 April 1999, containing working GTK+/Linux version.
+      </li>
+      <li>
+        The Java, C++ and Python lexers recognize operators as distinct from default allowing them
+        to be highlighted.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide82.zip">Beta release 0.82</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 April 1999, to fix a problem with handling the Enter key in PythonWin. Also
+        fixes some problems with cmd key mapping.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide81.zip">Beta release 0.81</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30th March 1999, containing bug fixes and a few more features.
+      </li>
+      <li>
+        Static linking supported and Tidy.EXE, a statically linked version of Tide.EXE. Changes to
+        compiler flags in the makefiles to optimize for size.
+      </li>
+      <li>
+        Scintilla supports a 'savepoint' in the undo stack which can be set by the container when
+        the document is saved. Notifications are sent to the container when the savepoint is
+        entered or left, allowing the container to to display a dirty indicator and change its
+        menus.
+      </li>
+      <li>
+        When Scintilla is set to read-only mode, a notification is sent to the container should the
+        user try to edit the document. This can be used to check the document out of a version
+        control system.
+      </li>
+      <li>
+        There is an API for setting the appearance of indicators.
+      </li>
+      <li>
+        The keyboard mapping can be redefined or removed so it can be implemented completely by the
+        container. All of the keyboard commands are now commands which can be sent by the
+        container.
+      </li>
+      <li>
+        A home command like Visual C++ with one hit going to the start of the text on the line and
+        the next going to the left margin is available. I do not personally like this but my
+        fingers have become trained to it by much repetition.
+      </li>
+      <li>
+        SCI_MARKERDELETEALL has an argument in wParam which is the number of the type marker to
+        delete with -1 performing the old action of removing all marker types.
+      </li>
+      <li>
+        Tide now understands both the file name and line numbers in error messages in most cases.
+      </li>
+      <li>
+        Tide remembers the current lines of files in the recently used list.
+      </li>
+      <li>
+        Tide has a Find in Files command.
+      </li>
+    </ul>
+    <h3>
+       Beta release 0.80
+    </h3>
+    <ul>
+      <li>
+        This was the first public release on 14th March 1999, containing a mostly working Win32
+        Scintilla DLL and Tide EXE.
+      </li>
+    </ul>
+    <h3>
+       Beta releases of SciTE were called Tide
+    </h3>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/ScintillaRelated.html b/scite-app/scintilla/doc/ScintillaRelated.html
new file mode 100644
index 0000000..afb43a6
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaRelated.html
@@ -0,0 +1,549 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla and SciTE Related Sites
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Related Sites
+    </h2>
+    <h3>
+       Ports and Bindings of Scintilla
+    </h3>
+    <p>
+	<a href="https://orbitalquark.github.io/scinterm">Scinterm</a>
+	is an implementation of Scintilla for the ncurses platform.
+    </p>
+    <p>
+	<a href="http://www.morphos-team.net/releasenotes/3.0">Scintilla.mcc</a>
+	is a port to MorphOS.
+    </p>
+    <p>
+	<a href="https://metacpan.org/pod/Wx::Scintilla">Wx::Scintilla</a>
+	is a Perl Binding for Scintilla on wxWidgets.
+    </p>
+    <p>
+	<a href="http://codebrainz.github.com/GtkScintilla/">GtkScintilla</a>
+	is a GTK+ widget which enables easily adding a powerful
+	source code editor to your applications. Harnessing the abilities
+	of the Scintilla editing component, GtkScintilla adds a familiar
+	GTK+/GObject API, making the widget comfortable to use in
+	these programs, using all the typical GObject conventions.
+    </p>
+    <p>
+	<a href="http://www.mewsoft.com/forums/source-code-editor-activex-control-released-scintilla-activex-wrapper-control&amp;action=ViewTopic&amp;Topic=1494&amp;Forum=1&amp;Page=1&amp;Period=0a&amp;Lang=English">Editawy</a>
+	is an ActiveX Control wrapper that support all Scintilla functions and additional high level functions.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/jintilla/">Jintilla</a>
+	is a JNI wrapper that allows Scintilla to be used in Java with
+	both SWT and AWT.
+    </p>
+    <p>
+	<a href="http://delphisci.sourceforge.net/">Delphi Scintilla Interface Components</a>
+	is a FREE collection of components that makes it easy to use the
+         Scintilla source code editing control from within Delphi and C++ Builder.
+    </p>
+    <p>
+	<a href="http://wxcode.sourceforge.net/showcomp.php?name=wxStEdit">wxStEdit</a>
+	is a library and sample program that provides extra features over wxStyledTextControl.
+    </p>
+    <p>
+	<a href="http://www.naughter.com/scintilla.html">CScintillaCtrl, CScintillaView &amp; CScintillaDoc</a>
+	are freeware MFC classes to encapsulate Scintilla.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/scide/">ScintillaNet
+	</a> is an encapsulation of Scintilla for use within the .NET framework.
+    </p>
+    <p>
+	<a href="https://riverbankcomputing.com/software/qscintilla/intro">QScintilla
+	</a> is a port of Scintilla to the Qt platform. It has a similar license to Qt: GPL for use in
+	free software and commercial for use in close-source applications.
+    </p>
+    <p>
+	<a href="http://www.adapower.com/gwindows/">
+	GWindows</a> is a Win32 RAD GUI Framework for Ada 95 that
+	includes a binding of Scintilla.
+    </p>
+    <p>
+	<a href="http://scintilla.cvs.sourceforge.net/viewvc/scintilla/ScintillaVB/">ScintillaVB</a>
+	is an ActiveX control written in VB that encapsulates Scintilla.
+    </p>
+    <p>
+	<a href="http://savannah.nongnu.org/projects/fxscintilla/">FXScintilla
+	</a> is a port of Scintilla to the FOX platform. FXRuby includes Ruby
+	bindings for FXScintilla.
+    </p>
+    <p>
+	<a href="http://www.pnotepad.org/scintilla/">Delphi wrapper</a> for
+	Scintilla which is also usable from Borland C++ Builder.
+    </p>
+    <p>
+       The wxStyledTextCtrl editor component  in the
+       <a href="http://www.wxwidgets.org/">wxWidgets</a> cross platform toolkit is based on Scintilla.<br />
+       A Python binding for wxStyledTextCtrl is part of <a href="http://wxpython.org/">wxPython</a>.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/moleskine/">gtkscintilla</a>
+	is an alternative GTK class implementation for scintilla.
+	This implementation acts more like a Gtk+ object, with many methods rather
+	than just scintilla_send_message() and is available as a shared library.
+	This implementation works with GTK 1.x.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/moleskine/">gtkscintilla2</a>
+	is an alternative GTK class implementation for scintilla
+	similar to the above, but for GTK 2.x.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/moleskine/">pygtkscintilla</a>
+	is a Python binding for gtk1.x scintilla that uses
+	gtkscintilla instead of the default GTK class.
+    </p>
+    <p>
+	<a href="http://scintilla.cvs.sourceforge.net/viewvc/scintilla/scintillactrl/">ScintillaCtrl</a>
+	is an unmaintained ActiveX control wrapper for Scintilla.
+    </p>
+    <h3>
+       Projects using Scintilla
+    </h3>
+    <p>
+	<a href="https://www.javacardos.com/tools">JCIDE</a>
+	is an IDE designed specifically for the Java Card programming language.
+    </p>
+    <p>
+	<a href="http://www.microissuer.com/?p=176">Snooper</a>
+	is an IDE for the smart card industry.
+    </p>
+    <p>
+	<a href="https://github.com/martinrotter/textilosaurus">Textilosaurus</a>
+	is simple cross-platform UTF-8 text editor based on Qt and Scintilla.
+    </p>
+    <p>
+	<a href="http://stefanstools.sourceforge.net/BowPad.html">BowPad</a>
+	is a small and fast text editor with a modern ribbon user interface (Windows7 or later).
+    </p>
+    <p>
+	<a href="http://studio.zerobrane.com">ZeroBrane Studio Lua IDE</a>
+	is a lightweight Lua IDE with code completion, syntax highlighting, live
+	coding, remote debugger, and code analyzer (Windows, OSX, and Linux).
+    </p>
+    <p>
+	<a href="http://www.xml-buddy.com/">XML Validator Buddy</a>
+	is an XML/JSON editor and XML validator for Windows.
+    </p>
+    <p>
+	<a href="http://sciteco.sf.net/">SciTECO</a>
+	is an advanced TECO dialect and interactive screen editor based on Scintilla.
+    </p>
+    <p>
+	<a href="http://www.qgis.org/">Quantum GIS</a>
+	is a user friendly Open Source Geographic Information System (GIS).
+    </p>
+    <p>
+	<a href="https://gitorious.org/qgrinui">QGrinUI</a>
+	searches for a regex within all relevant files in a directory and shows matches using
+	SciTE through the director interface.
+    </p>
+    <p>
+	<a href="https://orbitalquark.github.io/textadept">Textadept</a>
+	is a remarkably extensible cross-platform text editor for programmers written (mostly) in
+	Lua using LPeg to handle the lexers.
+    </p>
+    <p>
+	<a href="https://orbitalquark.github.io/scintillua">Scintillua</a>
+	is an external Scintilla lexer that uses Lua LPeg lexers for lexing.
+    </p>
+    <p>
+	<a href="http://www.morphos-team.net/releasenotes/3.0">Scribble</a>
+	is a text editor included in MorphOS.
+    </p>
+    <p>
+	<a href="http://mysqlworkbench.org/">MySQL Workbench</a>
+	is a cross-platform, visual database design, sql coding and administration tool.
+    </p>
+    <p>
+	<a href="http://liveditor.com/index.php">LIVEditor</a>
+	is for web front end coders editing html/css/js code.
+    </p>
+    <p>
+	<a href="http://padre.perlide.org/">Padre</a>
+	is a wxWidgets-based Perl IDE.
+    </p>
+    <p>
+	<a href="http://www.manoscoder.gr/wintools/viewtopic.php?f=20&t=84">CoderStudio</a>
+	is an IDE for plain C and Assembly programming similar to Visual Studio.
+    </p>
+    <p>
+	<a href="http://www.sparxsystems.com/products/ea/index.html">Enterprise Architect</a>
+	is a UML 2.1 analysis and design tool.
+    </p>
+    <p>
+	<a href="https://launchpad.net/codeassistor">The CodeAssistor Editor</a>
+	is a small and simple source code editor for MacOSX, Windows, and GTK/Linux.
+    </p>
+    <p>
+	<a href="http://www.topwizprogramming.com/freecode_pbeditor.html">PBEditor</a>
+	is a text editor for PowerBuilder.
+    </p>
+    <p>
+	<a href="https://www.cryptool.org/en/">CrypTool</a>
+	is an application for applying and analyzing cryptographic algorithms.
+    </p>
+    <p>
+	<a href="http://code.google.com/p/fxite/">FXiTe</a>
+	is an advanced cross-platform text editor built with the Fox GUI toolkit
+	and the FXScintilla text widget.
+    </p>
+    <p>
+	<a href="http://www.jabaco.org/">Jabaco</a>
+	is a simple programming language with a Visual Basic like syntax.
+    </p>
+    <p>
+	<a href="http://www.daansystems.com/lispide/">LispIDE</a>
+	is a basic Lisp editor for Windows 2000, XP and Vista.
+    </p>
+    <p>
+	<a href="https://www.assembla.com/wiki/show/FileWorkbench">File Workbench:</a>
+	a file manager / text editor environment with Squirrel scripting.
+    </p>
+    <p>
+	<a href="http://kephra.sf.net">Kephra</a>
+	is a free, easy and comfortable cross-platform editor written in Perl.
+    </p>
+    <p>
+	<a href="http://universalindent.sourceforge.net/">UniversalIndentGUI</a>
+	is a cross platform GUI for several code formatters, beautifiers and indenters
+	like GreatCode, AStyle (Artistic Styler), GNU Indent, BCPP and so on.
+    </p>
+    <p>
+	<a href="http://elementaryreports.com/">Elementary Reports</a>
+	is designed to reduce the time to compose detailed and professional primary school reports.
+    </p>
+    <p>
+	<a href="http://stepaheadsoftware.com/products/vcw/vcw.htm">Visual Classworks</a>
+	Visual class modeling and coding in C++ via 'live'
+	UML style class diagrams.
+    </p>
+    <p>
+	<a href="http://stepaheadsoftware.com/products/javelin/javelin.htm">Javelin</a>
+	Visual Class modeling and coding in Java via 'live' UML style
+	class diagrams.
+    </p>
+    <p>
+	The <a href="http://www.adobe.com/devnet/bridge.html">ExtendScript Toolkit</a>
+	is a development and debugging tool for JavaScript
+	scripts included with Adobe CS3 Suites.
+    </p>
+    <p>
+	<a href="https://tortoisesvn.net/">TortoiseSVN</a>
+	is a Windows GUI client for the Subversion source control software.
+    </p>
+    <p>
+	<a href="http://www.geany.org/">Geany</a>
+	is a small and fast GTK2 based IDE, which has only a few dependencies from other packages.
+    </p>
+    <p>
+	<a href="http://www.elliecomputing.com/products/merge_overview.asp">ECMerge</a>
+	is a commercial graphical and batch diff / merge tool for Windows, Linux and Solaris
+	(aiming to target all major platforms).
+    </p>
+    <p>
+	<a href="http://pype.sourceforge.net/">PyPE</a>
+	is an editor written in Python with the wxPython GUI toolkit.
+    </p>
+    <p>
+	<a href="http://home.mweb.co.za/sd/sdonovan/sciboo.html">Sciboo</a>
+	is an editor based on ScintillaNET.
+    </p>
+    <p>
+	<a href="https://sourceforge.net/projects/tsct/">The Scite Config Tool</a>
+	is a graphical user interface for changing SciTE properties files.
+    </p>
+    <p>
+	<a href="http://totalcmd.net/plugring/SciLister.html">Scintilla Lister</a>
+	is a plugin for Total Commander allowing viewing all documents with syntax highlighting
+	inside Total Commander.
+    </p>
+    <p>
+	<a href="http://chscite.sourceforge.net">ChSciTE</a>
+	is a free IDE for C/C++ interpreter Ch. It runs cross platform.
+	Ch is for cross-platform scripting, shell
+	programming, 2D/3D plotting, numerical computing, and embedded
+	scripting.
+    </p>
+    <p>
+       <a href="http://codeblocks.org/">
+       Code::Blocks</a> is an open source, cross platform free C++ IDE.
+    </p>
+    <p>
+       <a href="https://notepad-plus-plus.org/">
+       Notepad++</a> is a free source code editor under Windows.
+    </p>
+    <p>
+       <a href="http://gubed.mccabe.nu/">
+       Gubed</a> is a cross platform program to debug PHP scripts.
+    </p>
+    <p>
+       <a href="http://www.lesser-software.com/lswdnl.htm">
+       LSW DotNet-Lab</a> is a development environment for the .NET platform.
+    </p>
+    <p>
+       <a href="https://github.com/dtrebilco/glintercept">
+       GLIntercept</a> is an OpenGL function call interceptor that uses SciTE as a
+       run-time shader editor.
+    </p>
+    <p>
+       <a href="http://wxguide.sourceforge.net/indexedit.html">
+       wyoEditor</a> is "A nice editor with a well designed and consistent look and feel".
+    </p>
+    <p>
+       <a href="http://www.flos-freeware.ch/notepad2.html">
+       Notepad2</a> is "Yet another Notepad replacement".
+    </p>
+    <p>
+       <a href="http://pycrash.sourceforge.net/index.php?type=3">
+       PyCrash Viewer</a> can examine crash dumps of Python programs.
+    </p>
+    <p>
+       <a href="http://www.cabletest.com/en/featured_products_MPT2.aspx">
+       MPT series Wire Analyzers</a> use Scintilla and SciTE.
+    </p>
+    <p>
+       <a href="http://www.mygenerationsoftware.com">MyGeneration</a>
+	is a .NET based code generator.
+    </p>
+    <p>
+       <a href="http://cssed.sourceforge.net">CSSED</a>
+	is a tiny GTK2 CSS editor.
+    </p>
+    <p>
+       <a href="http://wxghostscript.sourceforge.net/">
+        IdePS</a>
+	is a free Integrated Development Environment for PostScript
+    </p>
+    <p>
+       <a href="http://cute.sourceforge.net/">
+        CUTE</a>
+	is a user-friendly source code editor easily extended using Python.
+    </p>
+    <p>
+       <a href="http://www.spaceblue.com/products/venis/index.html">
+        Venis IX</a>,
+	the Visual Environment for NSIS (Nullsoft Scriptable Install System).
+    </p>
+    <p>
+       <a href="http://eric-ide.python-projects.org/">Eric3</a>
+       is a Python IDE written using PyQt and QScintilla.
+    </p>
+    <p>
+       <a href="http://www.computersciencelab.com/CppIde.htm">CPPIDE</a>
+       is part of some commercial high-school oriented programming course software.
+    </p>
+    <p>
+       <a href="http://www.blazingtools.com/is.html">Instant Source</a>
+       is a commercial tool for looking at the HTML on web sites.
+    </p>
+    <p>
+       <a href="http://www.codejoin.com/radon/">RAD.On++</a>
+       is a free C++ Rapid Application Developer for Win32.
+    </p>
+    <p>
+       <a href="http://wxbasic.sourceforge.net/">wxBasic</a> is an open source
+       Basic interpreter that uses the wxWidgets toolkit. A small IDE is under construction.
+    </p>
+    <p>
+       <a href="http://visual-mingw.sourceforge.net/">Visual MinGW</a> is an
+       IDE for the MinGW compiler system.This runs on Windows with gcc.
+    </p>
+    <p>
+       The <a href="http://archaeopteryx.com/">Wing IDE</a> is a
+       complete integrated development environment for the Python programming
+       language.
+       Available on Intel based Linux and Windows and on MacOS X through XDarwin.
+    </p>
+    <p>
+	<a href="http://www.spheredev.org/">Sphere</a>
+	is 2D RPG engine with a development environment.
+    </p>
+    <p>
+	<a href="http://gaiacrtn.free.fr/practical-ruby/index.html">Practical Ruby</a>
+	is an IDE for Ruby on Windows.
+    </p>
+    <p>
+	<a href="http://www.gnuenterprise.org/">GNUe</a>
+	is a suite of tools and applications for solving the needs of the enterprise.
+    </p>
+    <p>
+	<a href="http://silvercity.sourceforge.net/">SilverCity</a>
+	is a lexing package that can provide lexical analysis for over 20 programming
+	and markup languages.
+    </p>
+    <p>
+	<a href="http://hapdebugger.sourceforge.net/">HAP Python Remote Debugger</a>
+	is a Python debugger that can run on one Windows machine debugging a Python program running
+	on either the same or another machine.
+    </p>
+    <p>
+	<a href="http://sourceforge.net/projects/pycrust/">PyCrust</a> is an interactive
+	Python shell based on wxPython.
+    </p>
+    <p>
+	<a href="http://www.activestate.com/Products/Komodo/">Komodo</a>
+	is a cross-platform multi-language development environment built
+	as an application of Mozilla.
+    </p>
+    <p>
+	<a href="http://llt.chez-alice.fr/">Filerx</a>
+	is a project manager for SciTE on Windows.
+	Open source and includes an implementation of SciTE's Director interface so
+	will be of interest to others wanting to control SciTE.
+    </p>
+    <p>
+	<a href="http://anjuta.org/">Anjuta</a>
+	is an open source C/C++ IDE for Linux/GNOME.
+    </p>
+    <p>
+       A <a href="https://www.burgaud.com">version of SciTE for Win32</a> enhanced
+       with a tab control to allow easy movement between buffers.
+       Go to the "Goodies" area on this site.
+    </p>
+    <p>
+       <a href="http://suneido.com">
+       Suneido</a> is an integrated application platform currently available for Win32 that includes an
+       object-oriented language, client-server database, and user interface and reporting frameworks.
+    </p>
+    <p>
+       <a href="http://www.allitis.com/agast/home.html">
+       Agast</a> is an authoring system for adventure games which includes
+       a customised version of SciTE.
+    </p>
+    <p>
+       <a href="http://boa-constructor.sourceforge.net/">Boa Constructor</a> is a RAD GUI
+       Building IDE for the wxWidgets cross platform platform. Written using wxPython with the
+       wxStyledTextCtrl used as its editor.
+    </p>
+    <p>
+       <a href="https://www.python.org/download/windows/">PythonWin</a>, a Win32 IDE for Python, uses
+      Scintilla for both its editing and interactive windows.
+    </p>
+    <h3>
+       Editing Components
+    </h3>
+    <p>
+       <a href="https://codemirror.net/">CodeMirror</a>
+       is a versatile text editor implemented in JavaScript for the browser.
+    </p>
+    <p>
+       <a href="http://www.soft-gems.net/index.php/controls/unicodeeditor-formerly-unicode-syntax-editor">UniCodeEditor</a>
+       is a Unicode aware syntax editor control for Delphi and C++ Builder.
+    </p>
+    <p>
+       <a href="https://wiki.gnome.org/Projects/GtkSourceView">GtkSourceView</a>
+	is a text widget that extends the standard GTK+ 2.x text widget and improves it
+	by implementing syntax highlighting and other features typical of a source editor.
+    </p>
+    <p>
+       <a href="http://aeditor.rubyforge.org/">AEditor</a>
+       is a free source code editing component implemented in Ruby.
+    </p>
+    <p>
+       <a href="http://www.actiprosoftware.com/products/controls/wpf/syntaxeditor">SyntaxEditor</a>
+       is a commercial native .Net source code editing component.
+    </p>
+    <p>
+       <a href="http://jedit.sourceforge.net/">jEdit</a> is a good Open Source syntax colouring
+      editor written in and for Java.
+    </p>
+    <p>
+       <a href="http://www.gtk.org/">GTK+</a>, the GIMP Toolkit, contains a rich text editing
+      widget.<br />
+       <a href="https://wiki.gnome.org/Apps/Gedit">Gedit</a> is an editor for GTK+/GNOME.<br />
+    <!--
+       <a href="http://www.daimi.au.dk/~mailund/gtk.html">GtkEditor</a> is a source code editing
+      widget based on the GTK+ text widget.<br />
+       <a href="http://gide.gdev.net/">gIDE</a> is an IDE based on GTK+.<br />
+       <a href="http://www.bahnhof.se/~mikeh/linux_software.html">GtkExText</a> is a source code
+      oriented text widget for GTK+.
+    -->
+    </p>
+    <p>
+       <a href="http://www.codeguru.com/">CodeGuru</a> has source code for several Win32 MFC based
+      editors.
+    </p>
+    <a href="http://sourceforge.net/projects/synedit/">SynEdit</a> is a Win32 edit control written
+    in Delphi.
+    <p>
+       <a href="http://www.tetradyne.com/srcvwax.htm">SourceView</a> is a commercial editing
+      component for Win32.
+    </p>
+    <h3>
+       Documents
+    </h3>
+    <p>
+       <a href="http://www.finseth.com/craft/">The Craft of Text Editing</a>
+       describes how EMACS works, <i>Craig A. Finseth</i>
+    </p>
+    <p>
+       <a href="http://www.cs.cmu.edu/~wjh/papers/byte.html">Data Structures in a Bit-Mapped Text
+      Editor</a>, <i>Wilfred J. Hanson</i>, Byte January 1987
+    </p>
+    <p>
+       Text Editors: Algorithms and Architectures, <i>Ray Vald&eacute;s</i>, Dr. Dobbs Journal
+      April 1993
+    </p>
+    <p>
+       Macintosh User Interface Guidelines and TextEdit chapters of Inside Macintosh
+    </p>
+    <h3>
+       Development Tools
+    </h3>
+    <p>
+       Scintilla and SciTE were developed using the
+       <a href="http://www.mingw.org/">Mingw version of GCC</a>.
+    </p>
+    <p>
+       <a href="http://astyle.sourceforge.net/">AStyle</a> is a source code formatter for C++ and
+      Java code. SciTE has an Indent command defined for .cxx files that uses AStyle.
+    </p>
+    <p>
+       <a href="http://winmerge.org/">WinMerge</a> is an interactive diff / merge
+       for Windows. I prefer code submissions in the form of source files rather than diffs and then run
+       WinMerge over the files to work out how to merge.
+    </p>
+    <p>
+       <a href="https://www.python.org">Python</a> is my favourite programming language. Scintilla
+      was started after I tried to improve the editor built into <a
+      href="https://www.python.org/download/windows/">PythonWin</a>, but was frustrated by the limitations of
+      the Windows Richedit control which PythonWin used.
+    </p>
+    <p>
+       <a href="http://www.cse.yorku.ca/~oz/">regex</a> is a public domain
+       implementation of regular expression pattern matching used in Scintilla.
+    </p>
+    <p>
+       Inspirational coding soundscapes by <a href="http://www.davidbridie.com/">David Bridie</a>.
+    </p>
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/ScintillaToDo.html b/scite-app/scintilla/doc/ScintillaToDo.html
new file mode 100644
index 0000000..4aa9318
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaToDo.html
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+        #menu {
+            margin: 0;
+            padding: .5em 0;
+            list-style-type: none;
+            font-size: larger;
+            background: #CCCCCC;
+        }
+        #menu li {
+            margin: 0;
+            padding: 0 .5em;
+            display: inline;
+        }
+    </style>
+    <title>
+      Scintilla and SciTE To Do
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <ul id="menu">
+      <li><a href="https://sourceforge.net/p/scintilla/bugs/">Bugs</a></li>
+      <li><a href="https://sourceforge.net/p/scintilla/feature-requests/">Feature Requests</a></li>
+    </ul>
+    <h2>
+       Bugs and To Do List
+    </h2>
+    <h3>
+       Feedback
+    </h3>
+    <p>
+	Issues can be reported on the <a href="https://sourceforge.net/p/scintilla/bugs/">Bug Tracker</a>
+	and features requested on the <a href="https://sourceforge.net/p/scintilla/feature-requests/">Feature Request Tracker</a>.
+    </p>
+    <h3>
+       Scintilla To Do
+    </h3>
+    <p>
+       Folding for languages that don't have it yet and good folding for languages
+       that inherited poor folding from another languages folding code.
+    </p>
+    <p>
+       Simple pattern based styling.
+    </p>
+    <p>
+       Different height lines based upon tallest text on the line rather than on the tallest style
+      possible.
+    </p>
+    <p>
+       Composition of lexing for mixed languages (such as ASP+ over COBOL) by
+       combining lexers.
+    </p>
+    <p>
+	Stream folding which could be used to fold up the contents of HTML elements.
+    </p>
+    <p>
+	Printing of highlight lines and folding margin.
+    </p>
+    <p>
+	Flow diagrams inside editor similar to
+	GRASP.
+    </p>
+    <p>
+	More lexers for other languages.
+    </p>
+    <h3>
+	SciTE To Do
+    </h3>
+    <p>
+	Good regular expression support through a plugin.
+    </p>
+    <p>
+	Allow file name based selection on all properties rather than just a chosen few.
+    </p>
+    <p>
+	Opening from and saving to FTP servers.
+    </p>
+    <p>
+	Setting to fold away comments upon opening.
+    </p>
+    <p>
+	User defined fold ranges.
+    </p>
+    <p>
+	Silent mode that does not display any message boxes.
+    </p>
+    <h3>
+	Features I am unlikely to do
+    </h3>
+    <p>
+	These are features I don't like or don't think are important enough to work on.
+	Implementations are welcome from others though.
+    </p>
+    <p>
+	Mouse wheel panning (press the mouse wheel and then move the mouse) on
+	Windows.
+    </p>
+    <p>
+	Adding options to the save dialog to save in a particular encoding or with a
+	chosen line ending.
+    </p>
+    <h3>
+       Directions
+    </h3>
+    <p>
+       The main point of this development is Scintilla, and this is where most effort will
+       go. SciTE will get new features, but only when they make my life easier - I am
+       not intending to make it grow up to be a huge full-function IDE like Visual
+       Cafe. The lines I've currently decided not to step over in SciTE are any sort of
+       project facility and any configuration dialogs. SciTE for Windows now has a
+       Director interface for communicating with a separate project manager
+       application.
+    </p>
+    <p>
+       If you are interested in contributing code, do not feel any need to make it cross
+       platform.
+      Just code it for your platform and I'll either reimplement for the other platform or
+      ensure that there is no effect on the other platform.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/scintilla/doc/ScintillaUsage.html b/scite-app/scintilla/doc/ScintillaUsage.html
new file mode 100644
index 0000000..47db0be
--- /dev/null
+++ b/scite-app/scintilla/doc/ScintillaUsage.html
@@ -0,0 +1,376 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      Scintilla Usage Notes
+    </title>
+<style type="text/css">
+SPAN {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: 9pt;
+}
+.S0 {
+    color: #808080;
+    font-family: Verdana, Arial, Helvetica;
+}
+.S1 {
+    font-family: Comic Sans MS, Times New Roman, Times;
+    color: #007F00;
+    font-size: 8pt;
+}
+.S2 {
+    font-family: Comic Sans MS, Times New Roman, Times;
+    color: #007F00;
+    font-size: 8pt;
+}
+.S3 {
+    font-family: Verdana, Arial, Helvetica;
+    color: #7F7F7F;
+}
+.S4 {
+    font-family: Verdana, Arial, Helvetica;
+    color: #007F7F;
+}
+.S5 {
+    color: #00007F;
+    font-weight: bold;
+    font-family: Verdana, Arial, Helvetica;
+}
+.S6 {
+    color: #7F007F;
+    font-family: Courier New, Courier;
+}
+.S7 {
+    color: #7F007F;
+    font-family: Courier New, Courier;
+}
+.S8 {
+    color: #007F7F;
+}
+.S9 {
+    color: #7F7F00;
+}
+.S10 {
+    font-weight: bold;
+}
+</style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          Usage Notes</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Implementing Auto-Indent
+    </h2>
+    <p>
+       The key idea is to use the SCN_CHARADDED notification to add indentation after a newline.
+    </p>
+    <p>
+       The lParam on the notification is a pointer to a SCNotification structure whose ch member
+      specifies the character added. If a newline was added, the previous line can be retrieved and
+      the same indentation can be added to the new line.
+    </p>
+    <p>
+       Here is the relevant portion of code from SciTE: (SciTE.cxx SciTEWindow::CharAdded)
+    </p>
+    <span class='S5'>if</span><span class='S0'>&nbsp;</span> <span class='S10'>(</span><span
+    class='S11'>ch</span><span class='S0'>&nbsp;</span> <span class='S10'>==</span><span
+    class='S0'>&nbsp;</span> <span class='S7'>'\r'</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>||</span><span class='S0'>&nbsp;</span> <span class='S11'>ch</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>==</span><span class='S0'>&nbsp;</span> <span
+    class='S7'>'\n'</span><span class='S10'>)</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>char</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>linebuf</span><span class='S10'>[</span><span class='S4'>1000</span><span
+    class='S10'>];</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>int</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>curLine</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>GetCurrentLineNumber</span><span
+    class='S10'>();</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>int</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>lineLength</span><span class='S0'>&nbsp;</span> <span class='S10'>
+    =</span><span class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span
+    class='S10'>(</span><span class='S11'>SCI_LINELENGTH</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>curLine</span><span class='S10'>);</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S2'>
+    //Platform::DebugPrintf("[CR]&nbsp;%d&nbsp;len&nbsp;=&nbsp;%d\n",&nbsp;curLine,&nbsp;lineLength);</span><span
+     class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>if</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>(</span><span class='S11'>curLine</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>&gt;</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>&amp;&amp;</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>lineLength</span><span class='S0'>&nbsp;</span> <span class='S10'>
+    &lt;=</span><span class='S0'>&nbsp;</span> <span class='S4'>2</span><span
+    class='S10'>)</span><span class='S0'>&nbsp;</span> <span class='S10'>{</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>int</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>prevLineLength</span><span class='S0'>&nbsp;</span> <span class='S10'>
+    =</span><span class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span
+    class='S10'>(</span><span class='S11'>SCI_LINELENGTH</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>curLine</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>-</span><span class='S0'>&nbsp;</span> <span class='S4'>1</span><span
+    class='S10'>);</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>if</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>(</span><span class='S11'>prevLineLength</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>&lt;</span><span class='S0'>&nbsp;</span> <span class='S5'>sizeof</span><span
+    class='S10'>(</span><span class='S11'>linebuf</span><span class='S10'>))</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>WORD</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>buflen</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>=</span><span class='S0'>&nbsp;</span> <span class='S5'>sizeof</span><span
+    class='S10'>(</span><span class='S11'>linebuf</span><span class='S10'>);</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>memcpy</span><span
+    class='S10'>(</span><span class='S11'>linebuf</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>&amp;</span><span class='S11'>buflen</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S5'>sizeof</span><span
+    class='S10'>(</span><span class='S11'>buflen</span><span class='S10'>));</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>
+    SendEditor</span><span class='S10'>(</span><span class='S11'>EM_GETLINE</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S11'>curLine</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>-</span><span class='S0'>&nbsp;</span> <span
+    class='S4'>1</span><span class='S10'>,</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S5'>reinterpret_cast</span><span class='S10'>&lt;</span><span
+    class='S11'>LPARAM</span><span class='S10'>&gt;(</span><span class='S5'>static_cast</span><span
+    class='S10'>&lt;</span><span class='S5'>char</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>*&gt;(</span><span class='S11'>linebuf</span><span class='S10'>)));</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>linebuf</span><span
+    class='S10'>[</span><span class='S11'>prevLineLength</span><span class='S10'>]</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>=</span><span class='S0'>&nbsp;</span> <span
+    class='S7'>'\0'</span><span class='S10'>;</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>for</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>(</span><span class='S5'>int</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>pos</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>=</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S10'>;</span><span class='S0'>&nbsp;</span> <span class='S11'>linebuf</span><span
+    class='S10'>[</span><span class='S11'>pos</span><span class='S10'>];</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>pos</span><span class='S10'>++)</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span
+    class='S5'>if</span><span class='S0'>&nbsp;</span> <span class='S10'>(</span><span
+    class='S11'>linebuf</span><span class='S10'>[</span><span class='S11'>pos</span><span
+    class='S10'>]</span><span class='S0'>&nbsp;</span> <span class='S10'>!=</span><span
+    class='S0'>&nbsp;</span> <span class='S7'>'&nbsp;'</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>&amp;&amp;</span><span class='S0'>&nbsp;</span> <span class='S11'>
+    linebuf</span><span class='S10'>[</span><span class='S11'>pos</span><span
+    class='S10'>]</span><span class='S0'>&nbsp;</span> <span class='S10'>!=</span><span
+    class='S0'>&nbsp;</span> <span class='S7'>'\t'</span><span class='S10'>)</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S11'>linebuf</span><span class='S10'>[</span><span class='S11'>pos</span><span
+    class='S10'>]</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S7'>'\0'</span><span class='S10'>;</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S10'>}</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>
+    SendEditor</span><span class='S10'>(</span><span class='S11'>EM_REPLACESEL</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S5'>
+    reinterpret_cast</span><span class='S10'>&lt;</span><span class='S11'>LPARAM</span><span
+    class='S10'>&gt;(</span><span class='S5'>static_cast</span><span class='S10'>&lt;</span><span
+    class='S5'>char</span><span class='S0'>&nbsp;</span> <span class='S10'>*&gt;(</span><span
+    class='S11'>linebuf</span><span class='S10'>)));</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S10'>}</span><span class='S0'><br />
+    </span> <span class='S10'>}</span><br />
+
+    <p style="margin-bottom: 0in">
+       Of course, fancier handling could be implemented. For example, if the previous line was the
+      start of a control construct, the next line could be automatically indented one tab further.
+      (Assuming that is your indenting style.)
+    </p>
+    <h2>
+       Implementing Syntax Styling
+    </h2>
+    <p>
+       Syntax styling is handled by the SCN_STYLENEEDED notification. Scintilla keeps track of the
+      end of the styled text - this is retrieved with SCI_GETENDSTYLED. In response to the
+      SCN_STYLENEEDED notification, you should apply styles to the text from ENDSTYLED to the
+      position specified by the notification.
+    </p>
+    <p>
+       Here is the relevant portion of code from SciTE: (SciTE.cxx)
+    </p>
+    <span class='S5'>void</span><span class='S0'>&nbsp;</span> <span class='S11'>
+    SciTEWindow</span><span class='S10'>::</span><span class='S11'>Notify</span><span
+    class='S10'>(</span><span class='S11'>SCNotification</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>*</span><span class='S11'>notification</span><span class='S10'>)</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>switch</span><span class='S0'>&nbsp;</span>
+    <span class='S10'>(</span><span class='S11'>notification</span><span
+    class='S10'>-&gt;</span><span class='S11'>nmhdr.code</span><span class='S10'>)</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>case</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>SCN_STYLENEEDED</span><span class='S10'>:</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span
+    class='S5'>if</span><span class='S0'>&nbsp;</span> <span class='S10'>(</span><span
+    class='S11'>notification</span><span class='S10'>-&gt;</span><span
+    class='S11'>nmhdr.idFrom</span><span class='S0'>&nbsp;</span> <span class='S10'>==</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>IDM_SRCWIN</span><span class='S10'>)</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>{</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S5'>int</span><span class='S0'>&nbsp;</span> <span class='S11'>
+    endStyled</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span class='S10'>(</span><span
+    class='S11'>SCI_GETENDSTYLED</span><span class='S10'>);</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S5'>int</span><span class='S0'>&nbsp;</span> <span class='S11'>
+    lineEndStyled</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span class='S10'>(</span><span
+    class='S11'>EM_LINEFROMCHAR</span><span class='S10'>,</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>endStyled</span><span class='S10'>);</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S11'>endStyled</span><span class='S0'>&nbsp;</span> <span class='S10'>
+    =</span><span class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span
+    class='S10'>(</span><span class='S11'>EM_LINEINDEX</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>lineEndStyled</span><span class='S10'>);</span><span
+    class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+    <span class='S11'>Colourise</span><span class='S10'>(</span><span
+    class='S11'>endStyled</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>notification</span><span class='S10'>-&gt;</span><span
+    class='S11'>position</span><span class='S10'>);</span><br />
+
+    <p>
+       Colourize(start, end) retrieves the specified range of text and then calls ColourizeDoc in
+      keywords.cxx. It starts the process by calling:
+    </p>
+    &nbsp;&nbsp;&nbsp;&nbsp;<span class='S11'>SendMessage</span><span class='S10'>(</span><span
+    class='S11'>hwnd</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>SCI_STARTSTYLING</span><span class='S10'>,</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>startPos</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S4'>31</span><span class='S10'>);</span><br />
+
+    <p>
+       and then for each token of the text, calling:
+    </p>
+    &nbsp;&nbsp;&nbsp;&nbsp;<span class='S11'>SendMessage</span><span class='S10'>(</span><span
+    class='S11'>hwnd</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>SCI_SETSTYLING</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>length</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>style</span><span class='S10'>);</span><br />
+
+    <p>
+       where style is a number from 0 to 31 whose appearance has been defined using the
+      SCI_STYLESET... messages.
+    </p>
+    <h2>
+       Implementing Calltips
+    </h2>
+    <p>
+       Again, the SCN_CHARADDED notification is used to catch when an opening parenthesis is added.
+      The preceding word can then be retrieved from the current line:
+    </p>
+    &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>char</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>linebuf</span><span class='S10'>[</span><span class='S4'>1000</span><span
+    class='S10'>];</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>int</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>current</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span class='S10'>(</span><span
+    class='S11'>SCI_GETCURLINE</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S5'>sizeof</span><span class='S10'>(</span><span class='S11'>linebuf</span><span
+    class='S10'>),</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S5'>
+    reinterpret_cast</span><span class='S10'>&lt;</span><span class='S11'>LPARAM</span><span
+    class='S10'>&gt;(</span><span class='S5'>static_cast</span><span class='S10'>&lt;</span><span
+    class='S5'>char</span><span class='S0'>&nbsp;</span> <span class='S10'>*&gt;(</span><span
+    class='S11'>linebuf</span><span class='S10'>)));</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>int</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>pos</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SendEditor</span><span class='S10'>(</span><span
+    class='S11'>SCI_GETCURRENTPOS</span><span class='S10'>);</span><span class='S0'><br />
+    <br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>int</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>startword</span><span class='S0'>&nbsp;</span> <span class='S10'>=</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>current</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>-</span><span class='S0'>&nbsp;</span> <span class='S4'>1</span><span
+    class='S10'>;</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>while</span><span class='S0'>&nbsp;</span>
+    <span class='S10'>(</span><span class='S11'>startword</span><span class='S0'>&nbsp;</span>
+    <span class='S10'>&gt;</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>&amp;&amp;</span><span class='S0'>&nbsp;</span>
+    <span class='S11'>isalpha</span><span class='S10'>(</span><span class='S11'>linebuf</span><span
+    class='S10'>[</span><span class='S11'>startword</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>-</span><span class='S0'>&nbsp;</span> <span class='S4'>1</span><span
+    class='S10'>]))</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>
+    startword</span><span class='S10'>--;</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S11'>linebuf</span><span class='S10'>[</span><span
+    class='S11'>current</span><span class='S0'>&nbsp;</span> <span class='S10'>-</span><span
+    class='S0'>&nbsp;</span> <span class='S4'>1</span><span class='S10'>]</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>=</span><span class='S0'>&nbsp;</span> <span
+    class='S7'>'\0'</span><span class='S10'>;</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>char</span><span class='S10'>*</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>word</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>=</span><span class='S0'>&nbsp;</span> <span class='S11'>linebuf</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>+</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>startword</span><span class='S10'>;</span><br />
+
+    <p>
+       Then if a calltip is available it can be displayed. The calltip appears immediately below
+      the position specified. The calltip can be multiple lines separated by newlines (\n).
+    </p>
+    &nbsp;&nbsp;&nbsp;&nbsp;<span class='S11'>pos</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>=</span><span class='S0'>&nbsp;</span> <span class='S11'>SendMessage</span><span
+    class='S10'>(</span><span class='S11'>hwnd</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SCI_GETCURRENTPOS</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S4'>0</span><span
+    class='S10'>);</span><span class='S0'><br />
+    </span> &nbsp;&nbsp;&nbsp;&nbsp;<span class='S11'>SendMessageText</span><span
+    class='S10'>(</span><span class='S11'>hwnd</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>SCI_CALLTIPSHOW</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S11'>pos</span><span
+    class='S0'>&nbsp;</span> <span class='S10'>-</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>wordLen</span><span class='S0'>&nbsp;</span> <span class='S10'>-</span><span
+    class='S0'>&nbsp;</span> <span class='S4'>1</span><span class='S10'>,</span><span
+    class='S0'>&nbsp;</span> <span class='S11'>calltip</span><span class='S10'>);</span><br />
+
+    <p>
+       The calltip can be removed when a closing parenthesis is entered:
+    </p>
+    &nbsp;&nbsp;&nbsp;&nbsp;<span class='S5'>if</span><span class='S0'>&nbsp;</span> <span
+    class='S10'>(</span><span class='S11'>SendMessage</span><span class='S10'>(</span><span
+    class='S11'>hwnd</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S11'>SCI_CALLTIPACTIVE</span><span class='S10'>,</span><span class='S0'>&nbsp;</span>
+    <span class='S4'>0</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S4'>0</span><span class='S10'>))</span><span class='S0'><br />
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S11'>
+    SendMessage</span><span class='S10'>(</span><span class='S11'>hwnd</span><span
+    class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S11'>
+    SCI_CALLTIPCANCEL</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
+    class='S4'>0</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S4'>
+    0</span><span class='S10'>);</span><br />
+
+    <p>
+       Obviously, it is up the application to look after supplying the appropriate calltip text.
+    </p>
+    <p>
+       SciTE goes one step further, counting the commas between arguments and highlighting the
+      corresponding part of the calltip. This code is in ContinueCallTip.
+    </p>
+    <p>
+       <i>Page contributed by Andrew McKinlay.</i>
+    </p>
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/StadiumVariants.png b/scite-app/scintilla/doc/StadiumVariants.png
new file mode 100644
index 0000000..14977a8
Binary files /dev/null and b/scite-app/scintilla/doc/StadiumVariants.png differ
diff --git a/scite-app/scintilla/doc/Steps.html b/scite-app/scintilla/doc/Steps.html
new file mode 100644
index 0000000..ff88e88
--- /dev/null
+++ b/scite-app/scintilla/doc/Steps.html
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"><title>How to use the Scintilla Edit Control in windows?</title></head><body bgcolor="#ffffff">
+	<p><h2>How to use the Scintilla Edit Control in windows?</h2>
+		<p>
+			This should be a little step by step explanation how to use Scintilla in the windows environment.
+		</p>
+	</p>
+	<p><h2>How to create Scintilla Edit Control?</h2>
+		<p>
+			First of all, load the Scintilla DLL with something like:
+		</p>
+		<pre>
+
+	hmod = LoadLibrary(&quot;SciLexer.DLL&quot;);
+		if (hmod==NULL)
+		{
+			MessageBox(hwndParent,
+			&quot;The Scintilla DLL could not be loaded.&quot;,
+			&quot;Error loading Scintilla&quot;,
+			MB_OK | MB_ICONERROR);
+		}
+		</pre>
+		<p>
+			If the DLL was loaded successfully, then the DLL has registered (yes, by itself) a new
+			window class. The new class called &quot;Scintilla&quot; is the new scintilla edit control.
+		</p>
+		<p>
+			Now you can use this new control just like any other windows control.
+		</p>
+		<pre>
+
+	hwndScintilla = CreateWindowEx(0,
+		&quot;Scintilla&quot;,&quot;&quot;, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPCHILDREN,
+		10,10,500,400,hwndParent,(HMENU)GuiID, hInstance,NULL);
+		</pre>
+		<p>
+			Note the new window class name: &quot;Scintilla&quot;. By reaching this point you actually included
+			a Scintilla Edit Control to your windows program.
+		</p>
+	</p>
+	<p><h2>How to control the Scintilla Edit Control?</h2>
+		<p>
+			You can control Scintilla by sending commands to the Edit Control.
+			There a 2 ways of doing this. A simple and fast way.
+		</p>
+		<p><h3>The simple way to control Scintilla</h3>
+			<p>
+				The simple way is just like with any other windows control. You can send messages to the
+				Scintilla Edit Control and receive notifications from the control. (Note that the notifications
+				are sent to the parent window of the Scintilla Edit Control.)
+			</p>
+			<p>
+				The Scintilla Edit Control knows a special message for each command.
+				To send commands to the Scintilla Edit Control you can use the SendMessage function.
+			</p>
+			<pre>
+
+	SendMessage(hwndScintilla,sci_command,wparam,lparam);
+			</pre>
+			<p>
+				like:
+			</p>
+			<pre>
+
+	SendMessage(hwndScintilla,SCI_CREATEDOCUMENT, 0, 0);
+			</pre>
+			<p>
+				Some of the commands will return a value and unused parameters should be set to NULL.
+			</p>
+		</p>
+		<p><h3>The fast way to control Scintilla</h3>
+			<p>
+				The fast way of controlling the Scintilla Edit Control  is to call message handling function by yourself.
+				You can retrieve a pointer to the message handling function of the Scintilla Edit Control and
+				call it directly to execute a command. This way is much more faster than the SendMessage() way.
+			</p>
+			<p>
+				1st you have to use the SCI_GETDIRECTFUNCTION and SCI_GETDIRECTPOINTER commands to
+				retrieve the pointer to the function and a pointer which must be the first parameter when calling the retrieved
+				function pointer.
+				You have to do this with the SendMessage way :)
+			</p>
+			<p>
+				The whole thing has to look like this:
+			</p>
+			<pre>
+
+	int (*fn)(void*,int,int,int);
+	void * ptr;
+	int canundo;
+
+	fn = (int (__cdecl *)(void *,int,int,int))SendMessage(
+		hwndScintilla,SCI_GETDIRECTFUNCTION,0,0);
+	ptr = (void *)SendMessage(hwndScintilla,SCI_GETDIRECTPOINTER,0,0);
+
+	canundo = fn(ptr,SCI_CANUNDO,0,0);
+			</pre>
+			<p>
+				with &quot;fn&quot; as the function pointer to the message handling function of the Scintilla Control
+				and &quot;ptr&quot; as the pointer that must be used as 1st parameter.
+				The next parameters are the Scintilla Command with its two (optional) parameters.
+			</p>
+
+		</p>
+		<p><h3>How will I receive notifications?</h3>
+			<p>
+				Whenever an event occurs where Scintilla wants to inform you about something, the Scintilla Edit Control
+				will send notification to the parent window. This is done by a WM_NOTITY message.
+				When receiving that message, you have to look in the xxx struct for the actual message.
+			</p>
+			<p>
+				So in Scintillas parent window message handling function you have to include some code like this:
+			</p>
+			<pre>
+	NMHDR *lpnmhdr;
+
+	[...]
+
+	case WM_NOTIFY:
+		lpnmhdr = (LPNMHDR) lParam;
+
+		if(lpnmhdr-&gt;hwndFrom==hwndScintilla)
+		{
+			switch(lpnmhdr-&gt;code)
+			{
+				case SCN_CHARADDED:
+					/* Hey, Scintilla just told me that a new */
+					/* character was added to the Edit Control.*/
+					/* Now i do something cool with that char. */
+				break;
+			}
+		}
+	break;
+			</pre>
+		</p>
+	</p>
+
+    <p>
+       <i>Page contributed by Holger Schmidt.</i>
+    </p>
+</body></html>
+
diff --git a/scite-app/scintilla/doc/StyleMetadata.html b/scite-app/scintilla/doc/StyleMetadata.html
new file mode 100644
index 0000000..79742be
--- /dev/null
+++ b/scite-app/scintilla/doc/StyleMetadata.html
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+        <head>
+                <meta name="generator" content="HTML Tidy, see www.w3.org" />
+                <meta name="generator" content="SciTE" />
+                <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <title>
+                        Scintilla Style Metadata
+                </title>
+                <style type="text/css">
+<!--
+/*<![CDATA[*/
+	CODE { font-weight: bold; font-family: Menlo,Consolas,Bitstream Vera Sans Mono,Courier New,monospace; }
+/*]]>*/
+-->
+                </style>
+        </head>
+<body bgcolor="#FFFFFF" text="#000000">
+        <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+                <tr>
+                <td>
+                <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+                </td>
+                <td>
+                <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla</font></a>
+                </td>
+                </tr>
+        </table>
+        <h2>
+                Language Types
+        </h2>
+        <p>
+                Scintilla contains lexers for various types of languages:
+                <ul>
+                        <li>Programming languages like C++, Java, and Python.</li>
+                        <li>Assembler languages are low-level programming languages which may additionally include instructions and registers.</li>
+                        <li>Markup languages like HTML, TeX, and Markdown.</li>
+                        <li>Data languages like EDIFACT and YAML.</li>
+                </ul>
+        </p>
+        <p>
+                Some languages can be used in different ways. JavaScript is a programming language but also
+                the basis of JSON data files. Similarly,
+                <a href="https://en.wikipedia.org/wiki/S-expression">Lisp s expressions</a> can be used for both source code and data.
+        </p>
+        <p>
+                Each language type has common elements such as identifiers in programming languages.
+                These common elements should be identified so that languages can be displayed with common
+                styles for these elements.
+                Style tags are used for this purpose in Scintilla.
+        </p>
+        <h2>
+                Style Tags
+        </h2>
+        <p>
+                Every style has a list of tags where a tag is a lower-case word containing only the common ASCII letters 'a'-'z'
+                such as "comment" or "operator".
+        </p>
+        <p>
+                Tags are ordered from most important to least important.
+        </p>
+        <p>
+                While applications may assign visual attributes for tag lists in many different ways, one reasonable technique is to
+                apply tag-specific attributes in reverse order so that earlier and more important tags override less important tags.
+                For example, the tag list <code>"error comment documentation keyword"</code> with
+                a set of tag attributes <br />
+                <code>{ comment=fore:green,back:very-light-green,font:Serif documentation=fore:light-green error=strikethrough keyword=bold }</code><br />
+                could be rendered as <br />
+                <code>bold,fore:light-green,back:very-light-green,font:Serif,strikethrough</code>.
+        </p>
+        <p>
+                Alternative renderings could check for multi-tag combinations like
+                <code>{ comment.documentation=fore:light-green comment.line=dark-green comment=green }.</code>
+        </p>
+        <p>
+                Commonly, a tag list will contain an optional embedded language; optional statuses; a base type; and a set of type modifiers:<br />
+                <code>embedded-language? status* base-type modifiers*</code>
+        </p>
+        <h3>Embedded language</h3>
+        <p>
+                The embedded language may be a source <code>(client | server)</code> followed by a language name
+                <code>(javascript | php | python | basic)</code>.
+                This may be extended in the future with other programming languages and style-definition languages like CSS.
+        </p>
+        <h3>Status</h3>
+        <p>
+                The statuses may be <code>(error | unused | predefined | inactive)</code>.<br />
+                The <code>error</code> status is used for lexical statuses that indicate errors in the source code such as unterminated quoted strings.<br />
+                The <code>unused</code> status may indicate a gap in the lexical states, possibly because an old lexical class is no longer used or an upcoming lexical class may fill that position.<br />
+                The <code>predefined</code> status indicates a style in the range 32.39 that is used for non-lexical purposes in Scintilla.<br />
+                The <code>inactive</code> status is used for text that is not currently interpreted such as C++ code that is contained within a '#if 0' preprocessor block.
+        </p>
+        <h3>Basic Types</h3>
+        <p>
+                The basic types for programming languages are <code>(default | operator | keyword | identifier | literal | comment | preprocessor | label)</code>.<br />
+                The <code>default</code> type is commonly used for spaces and tabs between tokens although it may cover other characters in some languages.
+        </p>
+        <p>
+                Assembler languages add <code>(instruction | register)</code>. to the basic types from programming languages.<br />
+        </p>
+        <p>
+                The basic types for markup languages are <code>(default | tag | attribute | comment | preprocessor)</code>.<br />
+        </p>
+        <p>
+                The basic types for data languages are <code>(default | key | data | comment)</code>.<br />
+        </p>
+        <h3>Comments</h3>
+        <p>
+                Programming languages may differentiate between line and stream comments and treat documentation comments as distinct from other comments.
+                Documentation comments may be marked up with documentation keywords.<br />
+                The additional attributes commonly used are <code>(line | documentation | keyword | taskmarker)</code>.
+        </p>
+        <h3>Literals</h3>
+        <p>
+                Programming and assembler languages contain a rich set of literals including numbers like <code>7</code> and <code>3.89e23</code>; <code>"string\n"</code>; and <code>nullptr</code>
+                and differentiating between these is often wanted.<br />
+                The common literal types are <code>(numeric | boolean | string | regex | date | time | uuid | nil | compound)</code>.<br />
+                Numeric literal types are subdivided into <code>(integer | real)</code>.<br />
+                String literal types may add (perhaps multiple) further attributes from <code> (heredoc | character | escapesequence | interpolated | multiline | raw)</code>.<br />
+        </p>
+        <p>
+                An escape sequence within an interpolated heredoc may thus be <code>literal string heredoc escapesequence</code>.
+        </p>
+        <h3>
+                List of known tags
+        </h3>
+        <table>
+                <tr><td><code>attribute</code></td><td>Markup attribute</td></tr>
+                <tr><td><code>basic</code></td><td>Embedded Basic</td></tr>
+                <tr><td><code>boolean</code></td><td>True or false literal</td></tr>
+                <tr><td><code>character</code></td><td>Single character literal as opposed to a string literal</td></tr>
+                <tr><td><code>client</code></td><td>Script executed on client</td></tr>
+                <tr><td><code>comment</code></td><td>The standard comment type in a language: may be stream or line</td></tr>
+                <tr><td><code>compound</code></td><td>Literal containing multiple subliterals such as a tuple or complex number</td></tr>
+                <tr><td><code>data</code></td><td>A value in a data file</td></tr>
+                <tr><td><code>date</code></td><td>Literal representing a data such as '19/November/1975'</td></tr>
+                <tr><td><code>default</code></td><td>Starting state commonly also used for white space</td></tr>
+                <tr><td><code>documentation</code></td><td>Comment that can be extracted into documentation</td></tr>
+                <tr><td><code>error</code></td><td>State indicating an invalid or erroneous element</td></tr>
+                <tr><td><code>escapesequence</code></td><td>Parts of a string that are not literal such as '\t' for tab in C</td></tr>
+                <tr><td><code>heredoc</code></td><td>Lengthy text literal marked by a word at both ends</td></tr>
+                <tr><td><code>identifier</code></td><td>Name that identifies an object or class of object</td></tr>
+                <tr><td><code>inactive</code></td><td>Code that is not currently interpreted</td></tr>
+                <tr><td><code>instruction</code></td><td>Mnemonic in assembler languages like 'addc'</td></tr>
+                <tr><td><code>integer</code></td><td>Numeric literal with no fraction or exponent like '738'</td></tr>
+                <tr><td><code>interpolated</code></td><td>String that can contain expressions</td></tr>
+                <tr><td><code>javascript</code></td><td>Embedded Javascript</td></tr>
+                <tr><td><code>key</code></td><td>Element which allows finding associated data</td></tr>
+                <tr><td><code>keyword</code></td><td>Reserved word with special meaning like 'while'</td></tr>
+                <tr><td><code>label</code></td><td>Destination for jumps in programming and assembler languages</td></tr>
+                <tr><td><code>line</code></td><td>Differentiates between stream comments and line comments in languages that have both</td></tr>
+                <tr><td><code>literal</code></td><td>Fixed value in source code</td></tr>
+                <tr><td><code>multiline</code></td><td>Differentiates between single line and multiline elements, commonly strings</td></tr>
+                <tr><td><code>nil</code></td><td>Literal for the null pointer such as nullptr in C++ or NULL in C</td></tr>
+                <tr><td><code>numeric</code></td><td>Literal number like '16'</td></tr>
+                <tr><td><code>operator</code></td><td>Punctuation character such as '&amp;' or '['</td></tr>
+                <tr><td><code>php</code></td><td>Embedded PHP</td></tr>
+                <tr><td><code>predefined</code></td><td>Style in the range 32.39 that is used for non-lexical purposes</td></tr>
+                <tr><td><code>preprocessor</code></td><td>Element that is recognized in an early stage of translation</td></tr>
+                <tr><td><code>python</code></td><td>Embedded Python</td></tr>
+                <tr><td><code>raw</code></td><td>String type that avoids interpretation: may be used for regular expressions in languages without a specific regex type</td></tr>
+                <tr><td><code>real</code></td><td>Numeric literal which may have a fraction or exponent like '3.84e-15'</td></tr>
+                <tr><td><code>regex</code></td><td>Regular expression literal like '^[a-z]+'</td></tr>
+                <tr><td><code>register</code></td><td>CPU register in assembler languages</td></tr>
+                <tr><td><code>server</code></td><td>Script executed on server</td></tr>
+                <tr><td><code>string</code></td><td>Sequence of characters</td></tr>
+                <tr><td><code>tag</code></td><td>Markup tag like '&lt;br /&gt;'</td></tr>
+                <tr><td><code>taskmarker</code></td><td>Word in comment that marks future work like 'FIXME'</td></tr>
+                <tr><td><code>time</code></td><td>Literal representing a time such as '9:34:31'</td></tr>
+                <tr><td><code>unused</code></td><td>Style that is not currently used</td></tr>
+                <tr><td><code>uuid</code></td><td>Universally unique identifier often used in interface definition files which may look like '{098f2470-bae0-11cd-b579-08002b30bfeb}'</td></tr>
+        </table>
+        <h2>
+                Extension
+        </h2>
+        <p>
+                Each element in this scheme may be extended in the future. This may be done by revising this document to provide a common approach to new features.
+                Individual lexers may also choose to expose unique language features through new tags.
+        </p>
+        <h2>
+                Translation
+        </h2>
+        <p>
+                Tags could be exposed directly in user interfaces or configuration languages.
+                However, an application may also translate these to match its naming schema.
+                Capitalization and punctuation could be different (like <code>Here-Doc</code> instead of <code>heredoc</code>),
+                terminology changed ("constant" instead of "literal"),
+                or human language changed from English to Chinese or Spanish.
+        </p>
+        <p>
+                Starting from a common set of tags makes these modifications tractable.
+        </p>
+        <h2>
+                Open issues
+        </h2>
+        <p>
+                The C++ lexer (for example) has inactive states and dynamically allocated substyles.
+                These should be exposed through the metadata mechanism but are not currently.
+        </p>
+</body>
+</html>
diff --git a/scite-app/scintilla/doc/annotations.png b/scite-app/scintilla/doc/annotations.png
new file mode 100644
index 0000000..23e5feb
Binary files /dev/null and b/scite-app/scintilla/doc/annotations.png differ
diff --git a/scite-app/scintilla/doc/eolannotation.png b/scite-app/scintilla/doc/eolannotation.png
new file mode 100644
index 0000000..5dacbf5
Binary files /dev/null and b/scite-app/scintilla/doc/eolannotation.png differ
diff --git a/scite-app/scintilla/doc/index.html b/scite-app/scintilla/doc/index.html
new file mode 100644
index 0000000..f3fe83b
--- /dev/null
+++ b/scite-app/scintilla/doc/index.html
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <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="20210726" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type="text/css">
+        #versionlist {
+            margin: 0;
+            padding: .5em;
+            list-style-type: none;
+            color: #FFCC99;
+            background: #000000;
+        }
+        #versionlist li {
+            margin-bottom: .5em;
+        }
+        #menu {
+            margin: 0;
+            padding: .5em 0;
+            list-style-type: none;
+            font-size: larger;
+            background: #CCCCCC;
+        }
+        #menu li {
+            margin: 0;
+            padding: 0 .5em;
+            display: inline;
+        }
+    </style>
+    <script type="text/javascript">
+   	function IsRemote() {
+		var loc = '' + window.location;
+		return (loc.indexOf('http:')) != -1 || (loc.indexOf('https:') != -1);
+   	}
+    </script>
+     <title>
+       Scintilla and SciTE
+     </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="256">
+          <img src="SciWord.jpg" height="78" width="256" alt="Scintilla" />
+        </td>
+        <td width="40%" align="left">
+          <font color="#FFCC99" size="4"> A free source code editing component for Win32,
+          GTK, and OS X</font>
+        </td>
+        <td width="40%" align="right">
+          <font color="#FFCC99" size="3"> Release version 5.1.1<br />
+           Site last modified July 26 2021</font>
+        </td>
+        <td width="20%">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="100%" style="background: url(https://www.scintilla.org/SciBreak.jpg) no-repeat;height:150px;">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <ul id="versionlist">
+      <li>Version 5.1.1 searches faster and improves accuracy for invalid DBCS text.</li>
+      <li>Version 5.1.0 is a stable release: the interfaces between Scintilla and Lexilla and between
+      platform-independent code and platform layers should remain compatible through 5.x releases.
+      The typesafe C++ projection of the API is extended with the ScintillaCall module to include
+      methods for calling each API.</li>
+      <li>Version 5.0.3 adds a more typesafe projection of the API for C++ client code.
+      The colours used for selections, carets, and hot spots can now be controlled with the 'elements'
+      APIs which allows better control over translucency and may default to platform colours such
+      as using the system defined selection background colour on macOS.</li>
+      <li>Version 5.0.2 fixes text encoding for display and adds font locale support on Windows.
+      Autocompletion lists improved on macOS 11.</li>
+      <li>Version 5.0.1 has significantly changed the interface between platform layers and platform-independent code
+      with more drawing capabilities. This includes ubiquitous translucency and variable stroke width to better support High DPI displays.</li>
+      <li>Version 5.0.0 is an unstable release with lexers unbundled.</li>
+    </ul>
+    <ul id="menu">
+      <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
+      <li id="remote2"><a href="https://www.scintilla.org/ScintillaDownload.html">Download</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaDoc.html">Documentation</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaToDo.html">Bugs</a></li>
+      <li id="remote3"><a href="https://www.scintilla.org/Lexilla.html">Lexilla</a></li>
+      <li id="remote4"><a href="https://www.scintilla.org/SciTE.html">SciTE</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaHistory.html">History</a></li>
+      <li><a href="https://www.scintilla.org/ScintillaRelated.html">Related</a></li>
+      <li id="remote5"><a href="https://www.scintilla.org/Privacy.html">Privacy</a></li>
+    </ul>
+<script type="text/javascript" language="JavaScript"><!--
+if (!IsRemote()) { //if NOT remote...
+    document.getElementById('remote1').style.display='none';
+    document.getElementById('remote2').style.display='none';
+    document.getElementById('remote3').style.display='none';
+    document.getElementById('remote4').style.display='none';
+    document.getElementById('remote5').style.display='none';
+}
+//--></script>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaDoc.html">Scintilla</a> is a free source code editing component.
+       It comes with complete source code and a <a href="https://www.scintilla.org/License.txt">license</a> that
+       permits use in any free project or commercial product.
+    </p>
+    <p>
+       As well as features found in standard text editing components, Scintilla includes features
+       especially useful when editing and debugging source code.
+       These include support for syntax styling, error indicators, code completion and call tips.
+       The selection margin can contain markers like those used in debuggers to indicate
+       breakpoints and the current line. Styling choices are more open than with many editors,
+       allowing the use of proportional fonts, bold and italics, multiple foreground and background
+       colours and multiple fonts.
+    </p>
+    <p>
+       Current development occurs on the default branch as 5.* which requires a recent
+       C++ compiler that supports C++17.
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/Lexilla.html">Lexilla</a> is a library of lexers that can
+       be used with Scintilla.
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/SciTE.html">SciTE</a> is a SCIntilla based Text Editor. Originally built to
+      demonstrate Scintilla, it has grown to be a generally useful editor with facilities for
+      building and running programs. It is best used for jobs with simple configurations - I use it
+      for building test and demonstration programs as well as SciTE and Scintilla, themselves.
+    </p>
+    <p>
+       Development of Scintilla started as an effort to improve the text editor in PythonWin. After
+      being frustrated by problems in the Richedit control used by PythonWin, it looked like the
+      best way forward was to write a new edit control. The biggest problem with Richedit and other
+      similar controls is that they treat styling changes as important persistent changes to the
+      document so they are saved into the undo stack and set the document's dirty flag. For source
+      code, styling should not be persisted as it can be mechanically recreated.
+    </p>
+    <p>
+       Scintilla and SciTE are currently available for Intel Win32, macOS, and Linux compatible operating
+      systems with GTK. They have been run on Windows XP, Windows 7, macOS 10.9+, and on Ubuntu 18.04
+      with GTK 2.24. <a href="https://www.scintilla.org/SciTEImage.html">Here is a screenshot of
+      SciTE.</a><br />
+    </p>
+    <p>
+       You can <a href="https://www.scintilla.org/ScintillaDownload.html">download Scintilla.</a>
+    </p>
+    <p>
+       The source code can be downloaded via Mercurial at the Source Forge
+	<a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a>.
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaRelated.html">Related sites.</a>
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaToDo.html">Bugs and To Do list.</a>
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/ScintillaHistory.html">History and contribution credits.</a>
+    </p>
+    <p>
+       <a href="https://www.scintilla.org/Icons.html">Icons that can be used with Scintilla.</a>
+    </p>
+    <p>
+       The <a href="https://scintilla.sourceforge.io/LongTermDownload.html">LongTerm3</a>
+       branch of Scintilla avoids using features from C++14 or later in order to support older systems.
+    </p>
+    <p>
+      Questions and comments about Scintilla should be directed to the
+      <a href="https://groups.google.com/forum/#!forum/scintilla-interest">scintilla-interest</a>
+      mailing list,
+      which is for discussion of Scintilla and related projects, their bugs and future features.
+      This is a low traffic list, averaging less than 20 messages per week.
+      To avoid spam, only list members can write to the list.
+      New versions of Scintilla are announced on scintilla-interest and may also be received by SourceForge
+      members by clicking on the Monitor column icon for "scintilla" on
+      <a href="https://sourceforge.net/project/showfiles.php?group_id=2439">the downloads page</a>.
+      Messages sent to my personal email address that could have been sent to the list
+      may receive no response.
+      <br />
+    </p>
+There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a>
+hosted on
+<script type="text/javascript" language="JavaScript">
+<!--
+if (IsRemote()) {
+    document.write('<a href="https://sourceforge.net/projects/scintilla/">');
+    document.write('<img src="https://sflogo.sourceforge.net/sflogo.php?group_id=2439&amp;type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a> ');
+} else {
+    document.write('<a href="https://sourceforge.net/projects/scintilla/">SourceForge<\/a>');
+}
+//-->
+</script>
+<noscript>
+<a href="https://sourceforge.net/projects/scintilla/">
+<img src="https://sflogo.sourceforge.net/sflogo.php?group_id=2439&amp;type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
+</noscript>
+  </body>
+</html>
+
diff --git a/scite-app/scintilla/doc/styledmargin.png b/scite-app/scintilla/doc/styledmargin.png
new file mode 100644
index 0000000..30ccbfd
Binary files /dev/null and b/scite-app/scintilla/doc/styledmargin.png differ
diff --git a/scite-app/scintilla/gtk/Converter.h b/scite-app/scintilla/gtk/Converter.h
new file mode 100755
index 0000000..30bb781
--- /dev/null
+++ b/scite-app/scintilla/gtk/Converter.h
@@ -0,0 +1,75 @@
+// Scintilla source code edit control
+// Converter.h - Encapsulation of iconv
+// Copyright 2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CONVERTER_H
+#define CONVERTER_H
+
+namespace Scintilla {
+
+const GIConv iconvhBad = (GIConv)(-1);
+const gsize sizeFailure = static_cast<gsize>(-1);
+/**
+ * Encapsulate g_iconv safely.
+ */
+class Converter {
+	GIConv iconvh;
+	void OpenHandle(const char *fullDestination, const char *charSetSource) noexcept {
+		iconvh = g_iconv_open(fullDestination, charSetSource);
+	}
+	bool Succeeded() const noexcept {
+		return iconvh != iconvhBad;
+	}
+public:
+	Converter() noexcept {
+		iconvh = iconvhBad;
+	}
+	Converter(const char *charSetDestination, const char *charSetSource, bool transliterations) {
+		iconvh = iconvhBad;
+		Open(charSetDestination, charSetSource, transliterations);
+	}
+	// Deleted so Converter objects can not be copied.
+	Converter(const Converter &) = delete;
+	Converter(Converter &&) = delete;
+	Converter &operator=(const Converter &) = delete;
+	Converter &operator=(Converter &&) = delete;
+	~Converter() {
+		Close();
+	}
+	operator bool() const noexcept {
+		return Succeeded();
+	}
+	void Open(const char *charSetDestination, const char *charSetSource, bool transliterations) {
+		Close();
+		if (*charSetSource) {
+			// Try allowing approximate transliterations
+			if (transliterations) {
+				std::string fullDest(charSetDestination);
+				fullDest.append("//TRANSLIT");
+				OpenHandle(fullDest.c_str(), charSetSource);
+			}
+			if (!Succeeded()) {
+				// Transliterations failed so try basic name
+				OpenHandle(charSetDestination, charSetSource);
+			}
+		}
+	}
+	void Close() noexcept {
+		if (Succeeded()) {
+			g_iconv_close(iconvh);
+			iconvh = iconvhBad;
+		}
+	}
+	gsize Convert(char **src, gsize *srcleft, char **dst, gsize *dstleft) const noexcept {
+		if (!Succeeded()) {
+			return sizeFailure;
+		} else {
+			return g_iconv(iconvh, src, srcleft, dst, dstleft);
+		}
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/gtk/DepGen.py b/scite-app/scintilla/gtk/DepGen.py
new file mode 100644
index 0000000..948d998
--- /dev/null
+++ b/scite-app/scintilla/gtk/DepGen.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+# DepGen.py - produce a make dependencies file for Scintilla
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 3.6 or later
+
+import sys
+
+sys.path.append("..")
+
+from scripts import Dependencies
+
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
+
+def Generate():
+	sources = ["../src/*.cxx"]
+	includes = ["../include", "../src"]
+
+	deps = Dependencies.FindDependencies(["../gtk/*.cxx"] + sources, ["../gtk"] + includes, ".o", "../gtk/")
+	Dependencies.UpdateDependencies("../gtk/deps.mak", deps, topComment)
+
+if __name__ == "__main__":
+	Generate()
\ No newline at end of file
diff --git a/scite-app/scintilla/gtk/PlatGTK.cxx b/scite-app/scintilla/gtk/PlatGTK.cxx
new file mode 100755
index 0000000..7a53bc2
--- /dev/null
+++ b/scite-app/scintilla/gtk/PlatGTK.cxx
@@ -0,0 +1,2179 @@
+// Scintilla source code edit control
+// PlatGTK.cxx - implementation of platform facilities on GTK+/Linux
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <sstream>
+
+#include <glib.h>
+#include <gmodule.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+#include "XPM.h"
+#include "UniConversion.h"
+
+#include "Converter.h"
+
+#ifdef _MSC_VER
+// Ignore unreferenced local functions in GTK+ headers
+#pragma warning(disable: 4505)
+#endif
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+namespace {
+
+constexpr double kPi = 3.14159265358979323846;
+
+constexpr double degrees = kPi / 180.0;
+
+// The Pango version guard for pango_units_from_double and pango_units_to_double
+// is more complex than simply implementing these here.
+
+constexpr int pangoUnitsFromDouble(double d) noexcept {
+	return static_cast<int>(d * PANGO_SCALE + 0.5);
+}
+
+constexpr float floatFromPangoUnits(int pu) noexcept {
+	return static_cast<float>(pu) / PANGO_SCALE;
+}
+
+struct IntegerRectangle {
+	int left;
+	int top;
+	int right;
+	int bottom;
+
+	explicit IntegerRectangle(PRectangle rc) noexcept :
+		left(static_cast<int>(rc.left)), top(static_cast<int>(rc.top)),
+		right(static_cast<int>(rc.right)), bottom(static_cast<int>(rc.bottom)) {
+	}
+	int Width() const noexcept { return right - left; }
+	int Height() const noexcept { return bottom - top; }
+};
+
+GdkWindow *WindowFromWidget(GtkWidget *w) noexcept {
+	return gtk_widget_get_window(w);
+}
+
+GtkWidget *PWidget(WindowID wid) noexcept {
+	return static_cast<GtkWidget *>(wid);
+}
+
+enum class EncodingType { singleByte, utf8, dbcs };
+
+// Holds a PangoFontDescription*.
+class FontHandle : public Font {
+public:
+	PangoFontDescription *pfd = nullptr;
+	CharacterSet characterSet;
+	FontHandle() noexcept : pfd(nullptr), characterSet(CharacterSet::Ansi) {
+	}
+	FontHandle(PangoFontDescription *pfd_, CharacterSet characterSet_) noexcept {
+		pfd = pfd_;
+		characterSet = characterSet_;
+	}
+	FontHandle(const FontParameters &fp) {
+		pfd = pango_font_description_new();
+		if (pfd) {
+			pango_font_description_set_family(pfd,
+				(fp.faceName[0] == '!') ? fp.faceName + 1 : fp.faceName);
+			pango_font_description_set_size(pfd, pangoUnitsFromDouble(fp.size));
+			pango_font_description_set_weight(pfd, static_cast<PangoWeight>(fp.weight));
+			pango_font_description_set_style(pfd, fp.italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+		}
+		characterSet = fp.characterSet;
+	}
+	// Deleted so FontHandle objects can not be copied.
+	FontHandle(const FontHandle &) = delete;
+	FontHandle(FontHandle &&) = delete;
+	FontHandle &operator=(const FontHandle &) = delete;
+	FontHandle &operator=(FontHandle &&) = delete;
+	~FontHandle() {
+		if (pfd)
+			pango_font_description_free(pfd);
+		pfd = nullptr;
+	}
+};
+
+// X has a 16 bit coordinate space, so stop drawing here to avoid wrapping
+constexpr int maxCoordinate = 32000;
+
+const FontHandle *PFont(const Font *f) noexcept {
+	return dynamic_cast<const FontHandle *>(f);
+}
+
+}
+
+std::shared_ptr<Font> Font::Allocate(const FontParameters &fp) {
+	return std::make_shared<FontHandle>(fp);
+}
+
+// Required on OS X
+namespace Scintilla {
+
+// SurfaceID is a cairo_t*
+class SurfaceImpl : public Surface {
+	SurfaceMode mode;
+	EncodingType et= EncodingType::singleByte;
+	WindowID widSave = nullptr;
+	cairo_t *context = nullptr;
+	cairo_surface_t *psurf = nullptr;
+	bool inited = false;
+	bool createdGC = false;
+	PangoContext *pcontext = nullptr;
+	PangoLayout *layout = nullptr;
+	Converter conv;
+	CharacterSet characterSet = static_cast<CharacterSet>(-1);
+	void PenColourAlpha(ColourRGBA fore) noexcept;
+	void SetConverter(CharacterSet characterSet_);
+	void CairoRectangle(PRectangle rc) noexcept;
+public:
+	SurfaceImpl() noexcept;
+	SurfaceImpl(cairo_t *context_, int width, int height, SurfaceMode mode_, WindowID wid) noexcept;
+	// Deleted so SurfaceImpl objects can not be copied.
+	SurfaceImpl(const SurfaceImpl&) = delete;
+	SurfaceImpl(SurfaceImpl&&) = delete;
+	SurfaceImpl&operator=(const SurfaceImpl&) = delete;
+	SurfaceImpl&operator=(SurfaceImpl&&) = delete;
+	~SurfaceImpl() override;
+
+	void Init(WindowID wid) override;
+	void Init(SurfaceID sid, WindowID wid) override;
+	std::unique_ptr<Surface> AllocatePixMap(int width, int height) override;
+
+	void SetMode(SurfaceMode mode_) override;
+
+	void Clear() noexcept;
+	void Release() noexcept override;
+	int SupportsFeature(Supports feature) noexcept override;
+	bool Initialised() override;
+	int LogPixelsY() override;
+	int PixelDivisions() override;
+	int DeviceHeightFont(int points) override;
+	void LineDraw(Point start, Point end, Stroke stroke) override;
+	void PolyLine(const Point *pts, size_t npts, Stroke stroke) override;
+	void Polygon(const Point *pts, size_t npts, FillStroke fillStroke) override;
+	void RectangleDraw(PRectangle rc, FillStroke fillStroke) override;
+	void RectangleFrame(PRectangle rc, Stroke stroke) override;
+	void FillRectangle(PRectangle rc, Fill fill) override;
+	void FillRectangleAligned(PRectangle rc, Fill fill) override;
+	void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+	void RoundedRectangle(PRectangle rc, FillStroke fillStroke) override;
+	void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) override;
+	void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) override;
+	void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+	void Ellipse(PRectangle rc, FillStroke fillStroke) override;
+	void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) override;
+	void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
+
+	std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
+	void DrawTextBase(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore);
+	void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthText(const Font *font_, std::string_view text) override;
+
+	void DrawTextBaseUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore);
+	void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
+	XYPOSITION Ascent(const Font *font_) override;
+	XYPOSITION Descent(const Font *font_) override;
+	XYPOSITION InternalLeading(const Font *font_) override;
+	XYPOSITION Height(const Font *font_) override;
+	XYPOSITION AverageCharWidth(const Font *font_) override;
+
+	void SetClip(PRectangle rc) override;
+	void PopClip() override;
+	void FlushCachedState() override;
+	void FlushDrawing() override;
+};
+
+const Supports SupportsGTK[] = {
+	Supports::LineDrawsFinal,
+	Supports::FractionalStrokeWidth,
+	Supports::TranslucentStroke,
+	Supports::PixelModification,
+};
+
+}
+
+const char *CharacterSetID(CharacterSet characterSet) noexcept {
+	switch (characterSet) {
+	case CharacterSet::Ansi:
+		return "";
+	case CharacterSet::Default:
+		return "ISO-8859-1";
+	case CharacterSet::Baltic:
+		return "ISO-8859-13";
+	case CharacterSet::ChineseBig5:
+		return "BIG-5";
+	case CharacterSet::EastEurope:
+		return "ISO-8859-2";
+	case CharacterSet::GB2312:
+		return "CP936";
+	case CharacterSet::Greek:
+		return "ISO-8859-7";
+	case CharacterSet::Hangul:
+		return "CP949";
+	case CharacterSet::Mac:
+		return "MACINTOSH";
+	case CharacterSet::Oem:
+		return "ASCII";
+	case CharacterSet::Russian:
+		return "KOI8-R";
+	case CharacterSet::Oem866:
+		return "CP866";
+	case CharacterSet::Cyrillic:
+		return "CP1251";
+	case CharacterSet::ShiftJis:
+		return "SHIFT-JIS";
+	case CharacterSet::Symbol:
+		return "";
+	case CharacterSet::Turkish:
+		return "ISO-8859-9";
+	case CharacterSet::Johab:
+		return "CP1361";
+	case CharacterSet::Hebrew:
+		return "ISO-8859-8";
+	case CharacterSet::Arabic:
+		return "ISO-8859-6";
+	case CharacterSet::Vietnamese:
+		return "";
+	case CharacterSet::Thai:
+		return "ISO-8859-11";
+	case CharacterSet::Iso8859_15:
+		return "ISO-8859-15";
+	default:
+		return "";
+	}
+}
+
+void SurfaceImpl::PenColourAlpha(ColourRGBA fore) noexcept {
+	if (context) {
+		cairo_set_source_rgba(context,
+			fore.GetRedComponent(),
+			fore.GetGreenComponent(),
+			fore.GetBlueComponent(),
+			fore.GetAlphaComponent());
+	}
+}
+
+void SurfaceImpl::SetConverter(CharacterSet characterSet_) {
+	if (characterSet != characterSet_) {
+		characterSet = characterSet_;
+		conv.Open("UTF-8", CharacterSetID(characterSet), false);
+	}
+}
+
+void SurfaceImpl::CairoRectangle(PRectangle rc) noexcept {
+	cairo_rectangle(context, rc.left, rc.top, rc.Width(), rc.Height());
+}
+
+SurfaceImpl::SurfaceImpl() noexcept {
+}
+
+SurfaceImpl::SurfaceImpl(cairo_t *context_, int width, int height, SurfaceMode mode_, WindowID wid) noexcept {
+	if (height > 0 && width > 0) {
+		cairo_surface_t *psurfContext = cairo_get_target(context_);
+		psurf = cairo_surface_create_similar(
+			psurfContext,
+			CAIRO_CONTENT_COLOR_ALPHA, width, height);
+		context = cairo_create(psurf);
+		pcontext = gtk_widget_create_pango_context(PWidget(wid));
+		PLATFORM_ASSERT(pcontext);
+		layout = pango_layout_new(pcontext);
+		PLATFORM_ASSERT(layout);
+		cairo_rectangle(context, 0, 0, width, height);
+		cairo_set_source_rgb(context, 1.0, 0, 0);
+		cairo_fill(context);
+		cairo_set_line_width(context, 1);
+		createdGC = true;
+		inited = true;
+		mode = mode_;
+	}
+}
+
+SurfaceImpl::~SurfaceImpl() {
+	Clear();
+}
+
+void SurfaceImpl::Clear() noexcept {
+	et = EncodingType::singleByte;
+	if (createdGC) {
+		createdGC = false;
+		cairo_destroy(context);
+	}
+	context = nullptr;
+	if (psurf)
+		cairo_surface_destroy(psurf);
+	psurf = nullptr;
+	if (layout)
+		g_object_unref(layout);
+	layout = nullptr;
+	if (pcontext)
+		g_object_unref(pcontext);
+	pcontext = nullptr;
+	conv.Close();
+	characterSet = static_cast<CharacterSet>(-1);
+	inited = false;
+	createdGC = false;
+}
+
+void SurfaceImpl::Release() noexcept {
+	Clear();
+}
+
+bool SurfaceImpl::Initialised() {
+	if (inited && context) {
+		if (cairo_status(context) == CAIRO_STATUS_SUCCESS) {
+			// Even when status is success, the target surface may have been
+			// finished which may cause an assertion to fail crashing the application.
+			// The cairo_surface_has_show_text_glyphs call checks the finished flag
+			// and when set, sets the status to CAIRO_STATUS_SURFACE_FINISHED
+			// which leads to warning messages instead of crashes.
+			// Performing the check in this method as it is called rarely and has no
+			// other side effects.
+			cairo_surface_t *psurfContext = cairo_get_target(context);
+			if (psurfContext) {
+				cairo_surface_has_show_text_glyphs(psurfContext);
+			}
+		}
+		return cairo_status(context) == CAIRO_STATUS_SUCCESS;
+	}
+	return inited;
+}
+
+void SurfaceImpl::Init(WindowID wid) {
+	widSave = wid;
+	Release();
+	PLATFORM_ASSERT(wid);
+	// if we are only created from a window ID, we can't perform drawing
+	psurf = nullptr;
+	context = nullptr;
+	createdGC = false;
+	pcontext = gtk_widget_create_pango_context(PWidget(wid));
+	PLATFORM_ASSERT(pcontext);
+	layout = pango_layout_new(pcontext);
+	PLATFORM_ASSERT(layout);
+	inited = true;
+}
+
+void SurfaceImpl::Init(SurfaceID sid, WindowID wid) {
+	widSave = wid;
+	PLATFORM_ASSERT(sid);
+	Release();
+	PLATFORM_ASSERT(wid);
+	context = cairo_reference(static_cast<cairo_t *>(sid));
+	pcontext = gtk_widget_create_pango_context(PWidget(wid));
+	// update the Pango context in case sid isn't the widget's surface
+	pango_cairo_update_context(context, pcontext);
+	layout = pango_layout_new(pcontext);
+	cairo_set_line_width(context, 1);
+	createdGC = true;
+	inited = true;
+}
+
+std::unique_ptr<Surface> SurfaceImpl::AllocatePixMap(int width, int height) {
+	// widSave must be alive now so safe for creating a PangoContext
+	return std::make_unique<SurfaceImpl>(context, width, height, mode, widSave);
+}
+
+void SurfaceImpl::SetMode(SurfaceMode mode_) {
+	mode = mode_;
+	if (mode.codePage == SC_CP_UTF8) {
+		et = EncodingType::utf8;
+	} else if (mode.codePage) {
+		et = EncodingType::dbcs;
+	} else {
+		et = EncodingType::singleByte;
+	}
+}
+
+int SurfaceImpl::SupportsFeature(Supports feature) noexcept {
+	for (const Supports f : SupportsGTK) {
+		if (f == feature)
+			return 1;
+	}
+	return 0;
+}
+
+int SurfaceImpl::LogPixelsY() {
+	return 72;
+}
+
+int SurfaceImpl::PixelDivisions() {
+	// GTK uses device pixels.
+	return 1;
+}
+
+int SurfaceImpl::DeviceHeightFont(int points) {
+	const int logPix = LogPixelsY();
+	return (points * logPix + logPix / 2) / 72;
+}
+
+void SurfaceImpl::LineDraw(Point start, Point end, Stroke stroke) {
+	PLATFORM_ASSERT(context);
+	if (!context)
+		return;
+	PenColourAlpha(stroke.colour);
+	cairo_set_line_width(context, stroke.width);
+	cairo_move_to(context, start.x, start.y);
+	cairo_line_to(context, end.x, end.y);
+	cairo_stroke(context);
+}
+
+void SurfaceImpl::PolyLine(const Point *pts, size_t npts, Stroke stroke) {
+	// TODO: set line joins and caps
+	PLATFORM_ASSERT(context && npts > 1);
+	if (!context)
+		return;
+	PenColourAlpha(stroke.colour);
+	cairo_set_line_width(context, stroke.width);
+	cairo_move_to(context, pts[0].x, pts[0].y);
+	for (size_t i = 1; i < npts; i++) {
+		cairo_line_to(context, pts[i].x, pts[i].y);
+	}
+	cairo_stroke(context);
+}
+
+void SurfaceImpl::Polygon(const Point *pts, size_t npts, FillStroke fillStroke) {
+	PLATFORM_ASSERT(context);
+	PenColourAlpha(fillStroke.fill.colour);
+	cairo_move_to(context, pts[0].x, pts[0].y);
+	for (size_t i = 1; i < npts; i++) {
+		cairo_line_to(context, pts[i].x, pts[i].y);
+	}
+	cairo_close_path(context);
+	cairo_fill_preserve(context);
+	PenColourAlpha(fillStroke.stroke.colour);
+	cairo_set_line_width(context, fillStroke.stroke.width);
+	cairo_stroke(context);
+}
+
+void SurfaceImpl::RectangleDraw(PRectangle rc, FillStroke fillStroke) {
+	if (context) {
+		CairoRectangle(rc.Inset(fillStroke.stroke.width / 2));
+		PenColourAlpha(fillStroke.fill.colour);
+		cairo_fill_preserve(context);
+		PenColourAlpha(fillStroke.stroke.colour);
+		cairo_set_line_width(context, fillStroke.stroke.width);
+		cairo_stroke(context);
+	}
+}
+
+void SurfaceImpl::RectangleFrame(PRectangle rc, Stroke stroke) {
+	if (context) {
+		CairoRectangle(rc.Inset(stroke.width / 2));
+		PenColourAlpha(stroke.colour);
+		cairo_set_line_width(context, stroke.width);
+		cairo_stroke(context);
+	}
+}
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Fill fill) {
+	PenColourAlpha(fill.colour);
+	if (context && (rc.left < maxCoordinate)) {	// Protect against out of range
+		CairoRectangle(rc);
+		cairo_fill(context);
+	}
+}
+
+void SurfaceImpl::FillRectangleAligned(PRectangle rc, Fill fill) {
+	FillRectangle(PixelAlign(rc, 1), fill);
+}
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
+	SurfaceImpl &surfi = dynamic_cast<SurfaceImpl &>(surfacePattern);
+	if (context && surfi.psurf) {
+		// Tile pattern over rectangle
+		cairo_set_source_surface(context, surfi.psurf, rc.left, rc.top);
+		cairo_pattern_set_extend(cairo_get_source(context), CAIRO_EXTEND_REPEAT);
+		cairo_rectangle(context, rc.left, rc.top, rc.Width(), rc.Height());
+		cairo_fill(context);
+	}
+}
+
+void SurfaceImpl::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
+	if (((rc.right - rc.left) > 4) && ((rc.bottom - rc.top) > 4)) {
+		// Approximate a round rect with some cut off corners
+		Point pts[] = {
+			Point(rc.left + 2, rc.top),
+			Point(rc.right - 2, rc.top),
+			Point(rc.right, rc.top + 2),
+			Point(rc.right, rc.bottom - 2),
+			Point(rc.right - 2, rc.bottom),
+			Point(rc.left + 2, rc.bottom),
+			Point(rc.left, rc.bottom - 2),
+			Point(rc.left, rc.top + 2),
+		};
+		Polygon(pts, std::size(pts), fillStroke);
+	} else {
+		RectangleDraw(rc, fillStroke);
+	}
+}
+
+static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, double radius) noexcept {
+	cairo_new_sub_path(context);
+	cairo_arc(context, left + width - radius, top + radius, radius, -90 * degrees, 0 * degrees);
+	cairo_arc(context, left + width - radius, top + height - radius, radius, 0 * degrees, 90 * degrees);
+	cairo_arc(context, left + radius, top + height - radius, radius, 90 * degrees, 180 * degrees);
+	cairo_arc(context, left + radius, top + radius, radius, 180 * degrees, 270 * degrees);
+	cairo_close_path(context);
+}
+
+void SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
+	if (context && rc.Width() > 0) {
+		const float halfStroke = fillStroke.stroke.width / 2.0f;
+		const float doubleStroke = fillStroke.stroke.width * 2.0f;
+		PenColourAlpha(fillStroke.fill.colour);
+		if (cornerSize > 0)
+			PathRoundRectangle(context, rc.left + fillStroke.stroke.width, rc.top + fillStroke.stroke.width,
+				rc.Width() - doubleStroke, rc.Height() - doubleStroke, cornerSize);
+		else
+			cairo_rectangle(context, rc.left + fillStroke.stroke.width, rc.top + fillStroke.stroke.width,
+				rc.Width() - doubleStroke, rc.Height() - doubleStroke);
+		cairo_fill(context);
+
+		PenColourAlpha(fillStroke.stroke.colour);
+		if (cornerSize > 0)
+			PathRoundRectangle(context, rc.left + halfStroke, rc.top + halfStroke,
+				rc.Width() - fillStroke.stroke.width, rc.Height() - fillStroke.stroke.width, cornerSize);
+		else
+			cairo_rectangle(context, rc.left + halfStroke, rc.top + halfStroke,
+				rc.Width() - fillStroke.stroke.width, rc.Height() - fillStroke.stroke.width);
+		cairo_set_line_width(context, fillStroke.stroke.width);
+		cairo_stroke(context);
+	}
+}
+
+void SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+	if (context) {
+		cairo_pattern_t *pattern;
+		switch (options) {
+		case GradientOptions::leftToRight:
+			pattern = cairo_pattern_create_linear(rc.left, rc.top, rc.right, rc.top);
+			break;
+		case GradientOptions::topToBottom:
+		default:
+			pattern = cairo_pattern_create_linear(rc.left, rc.top, rc.left, rc.bottom);
+			break;
+		}
+		for (const ColourStop &stop : stops) {
+			cairo_pattern_add_color_stop_rgba(pattern, stop.position,
+							  stop.colour.GetRedComponent(),
+							  stop.colour.GetGreenComponent(),
+							  stop.colour.GetBlueComponent(),
+							  stop.colour.GetAlphaComponent());
+		}
+		cairo_rectangle(context, rc.left, rc.top, rc.Width(), rc.Height());
+		cairo_set_source(context, pattern);
+		cairo_fill(context);
+		cairo_pattern_destroy(pattern);
+	}
+}
+
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	PLATFORM_ASSERT(context);
+	if (rc.Width() > width)
+		rc.left += (rc.Width() - width) / 2;
+	rc.right = rc.left + width;
+	if (rc.Height() > height)
+		rc.top += (rc.Height() - height) / 2;
+	rc.bottom = rc.top + height;
+
+	const int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
+	const int ucs = stride * height;
+	std::vector<unsigned char> image(ucs);
+	for (ptrdiff_t iy=0; iy<height; iy++) {
+		unsigned char *pixel = &image[0] + iy*stride;
+		RGBAImage::BGRAFromRGBA(pixel, pixelsImage, width);
+		pixelsImage += RGBAImage::bytesPerPixel * width;
+	}
+
+	cairo_surface_t *psurfImage = cairo_image_surface_create_for_data(&image[0], CAIRO_FORMAT_ARGB32, width, height, stride);
+	cairo_set_source_surface(context, psurfImage, rc.left, rc.top);
+	cairo_rectangle(context, rc.left, rc.top, rc.Width(), rc.Height());
+	cairo_fill(context);
+
+	cairo_surface_destroy(psurfImage);
+}
+
+void SurfaceImpl::Ellipse(PRectangle rc, FillStroke fillStroke) {
+	PLATFORM_ASSERT(context);
+	PenColourAlpha(fillStroke.fill.colour);
+	cairo_arc(context, (rc.left + rc.right) / 2, (rc.top + rc.bottom) / 2,
+		  (std::min(rc.Width(), rc.Height()) - fillStroke.stroke.width) / 2, 0, 2*kPi);
+	cairo_fill_preserve(context);
+	PenColourAlpha(fillStroke.stroke.colour);
+	cairo_set_line_width(context, fillStroke.stroke.width);
+	cairo_stroke(context);
+}
+
+void SurfaceImpl::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
+	const XYPOSITION midLine = rc.Centre().y;
+	const XYPOSITION halfStroke = fillStroke.stroke.width / 2.0f;
+	const XYPOSITION radius = rc.Height() / 2.0f - halfStroke;
+	PRectangle rcInner = rc;
+	rcInner.left += radius;
+	rcInner.right -= radius;
+
+	cairo_new_sub_path(context);
+
+	const Ends leftSide = static_cast<Ends>(static_cast<int>(ends) & 0xf);
+	const Ends rightSide = static_cast<Ends>(static_cast<int>(ends) & 0xf0);
+	switch (leftSide) {
+		case Ends::leftFlat:
+			cairo_move_to(context, rc.left + halfStroke, rc.top + halfStroke);
+			cairo_line_to(context, rc.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::leftAngle:
+			cairo_move_to(context, rcInner.left + halfStroke, rc.top + halfStroke);
+			cairo_line_to(context, rc.left + halfStroke, rc.Centre().y);
+			cairo_line_to(context, rcInner.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			cairo_move_to(context, rcInner.left + halfStroke, rc.top + halfStroke);
+			cairo_arc_negative(context, rcInner.left + halfStroke, midLine, radius,
+				270 * degrees, 90 * degrees);
+			break;
+	}
+
+	switch (rightSide) {
+		case Ends::rightFlat:
+			cairo_line_to(context, rc.right - halfStroke, rc.bottom - halfStroke);
+			cairo_line_to(context, rc.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::rightAngle:
+			cairo_line_to(context, rcInner.right - halfStroke, rc.bottom - halfStroke);
+			cairo_line_to(context, rc.right - halfStroke, rc.Centre().y);
+			cairo_line_to(context, rcInner.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			cairo_line_to(context, rcInner.right - halfStroke, rc.bottom - halfStroke);
+			cairo_arc_negative(context, rcInner.right - halfStroke, midLine, radius,
+				90 * degrees, 270 * degrees);
+			break;
+	}
+
+	// Close the path to enclose it for stroking and for filling, then draw it
+	cairo_close_path(context);
+	PenColourAlpha(fillStroke.fill.colour);
+	cairo_fill_preserve(context);
+
+	PenColourAlpha(fillStroke.stroke.colour);
+	cairo_set_line_width(context, fillStroke.stroke.width);
+	cairo_stroke(context);
+}
+
+void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
+	SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfaceSource);
+	const bool canDraw = surfi.psurf != nullptr;
+	if (canDraw) {
+		PLATFORM_ASSERT(context);
+		cairo_set_source_surface(context, surfi.psurf,
+					 rc.left - from.x, rc.top - from.y);
+		cairo_rectangle(context, rc.left, rc.top, rc.Width(), rc.Height());
+		cairo_fill(context);
+	}
+}
+
+std::unique_ptr<IScreenLineLayout> SurfaceImpl::Layout(const IScreenLine *) {
+	return {};
+}
+
+std::string UTF8FromLatin1(std::string_view text) {
+	std::string utfForm(text.length()*2 + 1, '\0');
+	size_t lenU = 0;
+	for (const char ch : text) {
+		const unsigned char uch = ch;
+		if (uch < 0x80) {
+			utfForm[lenU++] = uch;
+		} else {
+			utfForm[lenU++] = static_cast<char>(0xC0 | (uch >> 6));
+			utfForm[lenU++] = static_cast<char>(0x80 | (uch & 0x3f));
+		}
+	}
+	utfForm.resize(lenU);
+	return utfForm;
+}
+
+namespace {
+
+std::string UTF8FromIconv(const Converter &conv, std::string_view text) {
+	if (conv) {
+		std::string utfForm(text.length()*3+1, '\0');
+		char *pin = const_cast<char *>(text.data());
+		gsize inLeft = text.length();
+		char *putf = &utfForm[0];
+		char *pout = putf;
+		gsize outLeft = text.length()*3+1;
+		const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft);
+		if (conversions != sizeFailure) {
+			*pout = '\0';
+			utfForm.resize(pout - putf);
+			return utfForm;
+		}
+	}
+	return std::string();
+}
+
+// Work out how many bytes are in a character by trying to convert using iconv,
+// returning the first length that succeeds.
+size_t MultiByteLenFromIconv(const Converter &conv, const char *s, size_t len) noexcept {
+	for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) {
+		char wcForm[2] {};
+		char *pin = const_cast<char *>(s);
+		gsize inLeft = lenMB;
+		char *pout = wcForm;
+		gsize outLeft = 2;
+		const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft);
+		if (conversions != sizeFailure) {
+			return lenMB;
+		}
+	}
+	return 1;
+}
+
+}
+
+void SurfaceImpl::DrawTextBase(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+			       ColourRGBA fore) {
+	if (context) {
+		PenColourAlpha(fore);
+		const XYPOSITION xText = rc.left;
+		if (PFont(font_)->pfd) {
+			std::string utfForm;
+			if (et == EncodingType::utf8) {
+				pango_layout_set_text(layout, text.data(), text.length());
+			} else {
+				SetConverter(PFont(font_)->characterSet);
+				utfForm = UTF8FromIconv(conv, text);
+				if (utfForm.empty()) {	// iconv failed so treat as Latin1
+					utfForm = UTF8FromLatin1(text);
+				}
+				pango_layout_set_text(layout, utfForm.c_str(), utfForm.length());
+			}
+			pango_layout_set_font_description(layout, PFont(font_)->pfd);
+			pango_cairo_update_layout(context, layout);
+			PangoLayoutLine *pll = pango_layout_get_line_readonly(layout, 0);
+			cairo_move_to(context, xText, ybase);
+			pango_cairo_show_layout_line(context, pll);
+		}
+	}
+}
+
+void SurfaceImpl::DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				 ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextBase(rc, font_, ybase, text, fore);
+}
+
+// On GTK+, exactly same as DrawTextNoClip
+void SurfaceImpl::DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				  ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextBase(rc, font_, ybase, text, fore);
+}
+
+void SurfaceImpl::DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+				      ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (size_t i=0; i<text.length(); i++) {
+		if (text[i] != ' ') {
+			DrawTextBase(rc, font_, ybase, text, fore);
+			return;
+		}
+	}
+}
+
+class ClusterIterator {
+	PangoLayoutIter *iter;
+	PangoRectangle pos;
+	size_t lenPositions;
+public:
+	bool finished;
+	XYPOSITION positionStart;
+	XYPOSITION position;
+	XYPOSITION distance;
+	int curIndex;
+	ClusterIterator(PangoLayout *layout, size_t len) noexcept : lenPositions(len), finished(false),
+		positionStart(0), position(0), distance(0), curIndex(0) {
+		iter = pango_layout_get_iter(layout);
+		pango_layout_iter_get_cluster_extents(iter, nullptr, &pos);
+	}
+	// Deleted so ClusterIterator objects can not be copied.
+	ClusterIterator(const ClusterIterator&) = delete;
+	ClusterIterator(ClusterIterator&&) = delete;
+	ClusterIterator&operator=(const ClusterIterator&) = delete;
+	ClusterIterator&operator=(ClusterIterator&&) = delete;
+
+	~ClusterIterator() {
+		pango_layout_iter_free(iter);
+	}
+
+	void Next() noexcept {
+		positionStart = position;
+		if (pango_layout_iter_next_cluster(iter)) {
+			pango_layout_iter_get_cluster_extents(iter, nullptr, &pos);
+			position = floatFromPangoUnits(pos.x);
+			curIndex = pango_layout_iter_get_index(iter);
+		} else {
+			finished = true;
+			position = floatFromPangoUnits(pos.x + pos.width);
+			curIndex = lenPositions;
+		}
+		distance = position - positionStart;
+	}
+};
+
+void SurfaceImpl::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	if (PFont(font_)->pfd) {
+		pango_layout_set_font_description(layout, PFont(font_)->pfd);
+		if (et == EncodingType::utf8) {
+			// Simple and direct as UTF-8 is native Pango encoding
+			int i = 0;
+			pango_layout_set_text(layout, text.data(), text.length());
+			ClusterIterator iti(layout, text.length());
+			while (!iti.finished) {
+				iti.Next();
+				const int places = iti.curIndex - i;
+				while (i < iti.curIndex) {
+					// Evenly distribute space among bytes of this cluster.
+					// Would be better to find number of characters and then
+					// divide evenly between characters with each byte of a character
+					// being at the same position.
+					positions[i] = iti.position - (iti.curIndex - 1 - i) * iti.distance / places;
+					i++;
+				}
+			}
+			PLATFORM_ASSERT(static_cast<size_t>(i) == text.length());
+		} else {
+			int positionsCalculated = 0;
+			if (et == EncodingType::dbcs) {
+				SetConverter(PFont(font_)->characterSet);
+				std::string utfForm = UTF8FromIconv(conv, text);
+				if (!utfForm.empty()) {
+					// Convert to UTF-8 so can ask Pango for widths, then
+					// Loop through UTF-8 and DBCS forms, taking account of different
+					// character byte lengths.
+					Converter convMeasure("UCS-2", CharacterSetID(characterSet), false);
+					pango_layout_set_text(layout, utfForm.c_str(), strlen(utfForm.c_str()));
+					int i = 0;
+					int clusterStart = 0;
+					ClusterIterator iti(layout, strlen(utfForm.c_str()));
+					while (!iti.finished) {
+						iti.Next();
+						const int clusterEnd = iti.curIndex;
+						const int places = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart);
+						int place = 1;
+						while (clusterStart < clusterEnd) {
+							size_t lenChar = MultiByteLenFromIconv(convMeasure, text.data()+i, text.length()-i);
+							while (lenChar--) {
+								positions[i++] = iti.position - (places - place) * iti.distance / places;
+								positionsCalculated++;
+							}
+							clusterStart += UTF8BytesOfLead[static_cast<unsigned char>(utfForm[clusterStart])];
+							place++;
+						}
+					}
+					PLATFORM_ASSERT(static_cast<size_t>(i) == text.length());
+				}
+			}
+			if (positionsCalculated < 1) {
+				const size_t lenPositions = text.length();
+				// Either 8-bit or DBCS conversion failed so treat as 8-bit.
+				SetConverter(PFont(font_)->characterSet);
+				const bool rtlCheck = PFont(font_)->characterSet == CharacterSet::Hebrew ||
+							    PFont(font_)->characterSet == CharacterSet::Arabic;
+				std::string utfForm = UTF8FromIconv(conv, text);
+				if (utfForm.empty()) {
+					utfForm = UTF8FromLatin1(text);
+				}
+				pango_layout_set_text(layout, utfForm.c_str(), utfForm.length());
+				size_t i = 0;
+				int clusterStart = 0;
+				// Each 8-bit input character may take 1 or 2 bytes in UTF-8
+				// and groups of up to 3 may be represented as ligatures.
+				ClusterIterator iti(layout, utfForm.length());
+				while (!iti.finished) {
+					iti.Next();
+					const int clusterEnd = iti.curIndex;
+					const int ligatureLength = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart);
+					if (rtlCheck && ((clusterEnd <= clusterStart) || (ligatureLength == 0) || (ligatureLength > 3))) {
+						// Something has gone wrong: exit quickly but pretend all the characters are equally spaced:
+						int widthLayout = 0;
+						pango_layout_get_size(layout, &widthLayout, nullptr);
+						const XYPOSITION widthTotal = floatFromPangoUnits(widthLayout);
+						for (size_t bytePos=0; bytePos<lenPositions; bytePos++) {
+							positions[bytePos] = widthTotal / lenPositions * (bytePos + 1);
+						}
+						return;
+					}
+					PLATFORM_ASSERT(ligatureLength > 0 && ligatureLength <= 3);
+					for (int charInLig=0; charInLig<ligatureLength; charInLig++) {
+						positions[i++] = iti.position - (ligatureLength - 1 - charInLig) * iti.distance / ligatureLength;
+					}
+					clusterStart = clusterEnd;
+				}
+				while (i < lenPositions) {
+					// If something failed, fill in rest of the positions
+					positions[i++] = clusterStart;
+				}
+				PLATFORM_ASSERT(i == text.length());
+			}
+		}
+	} else {
+		// No font so return an ascending range of values
+		for (size_t i = 0; i < text.length(); i++) {
+			positions[i] = i + 1;
+		}
+	}
+}
+
+XYPOSITION SurfaceImpl::WidthText(const Font *font_, std::string_view text) {
+	if (PFont(font_)->pfd) {
+		std::string utfForm;
+		pango_layout_set_font_description(layout, PFont(font_)->pfd);
+		if (et == EncodingType::utf8) {
+			pango_layout_set_text(layout, text.data(), text.length());
+		} else {
+			SetConverter(PFont(font_)->characterSet);
+			utfForm = UTF8FromIconv(conv, text);
+			if (utfForm.empty()) {	// iconv failed so treat as Latin1
+				utfForm = UTF8FromLatin1(text);
+			}
+			pango_layout_set_text(layout, utfForm.c_str(), utfForm.length());
+		}
+		PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout, 0);
+		PangoRectangle pos {};
+		pango_layout_line_get_extents(pangoLine, nullptr, &pos);
+		return floatFromPangoUnits(pos.width);
+	}
+	return 1;
+}
+
+void SurfaceImpl::DrawTextBaseUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	if (context) {
+		PenColourAlpha(fore);
+		const XYPOSITION xText = rc.left;
+		if (PFont(font_)->pfd) {
+			pango_layout_set_text(layout, text.data(), text.length());
+			pango_layout_set_font_description(layout, PFont(font_)->pfd);
+			pango_cairo_update_layout(context, layout);
+			PangoLayoutLine *pll = pango_layout_get_line_readonly(layout, 0);
+			cairo_move_to(context, xText, ybase);
+			pango_cairo_show_layout_line(context, pll);
+		}
+	}
+}
+
+void SurfaceImpl::DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextBaseUTF8(rc, font_, ybase, text, fore);
+}
+
+// On GTK+, exactly same as DrawTextNoClip
+void SurfaceImpl::DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	FillRectangleAligned(rc, back);
+	DrawTextBaseUTF8(rc, font_, ybase, text, fore);
+}
+
+void SurfaceImpl::DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (size_t i = 0; i < text.length(); i++) {
+		if (text[i] != ' ') {
+			DrawTextBaseUTF8(rc, font_, ybase, text, fore);
+			return;
+		}
+	}
+}
+
+void SurfaceImpl::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	if (PFont(font_)->pfd) {
+		pango_layout_set_font_description(layout, PFont(font_)->pfd);
+		// Simple and direct as UTF-8 is native Pango encoding
+		int i = 0;
+		pango_layout_set_text(layout, text.data(), text.length());
+		ClusterIterator iti(layout, text.length());
+		while (!iti.finished) {
+			iti.Next();
+			const int places = iti.curIndex - i;
+			while (i < iti.curIndex) {
+				// Evenly distribute space among bytes of this cluster.
+				// Would be better to find number of characters and then
+				// divide evenly between characters with each byte of a character
+				// being at the same position.
+				positions[i] = iti.position - (iti.curIndex - 1 - i) * iti.distance / places;
+				i++;
+			}
+		}
+		PLATFORM_ASSERT(static_cast<size_t>(i) == text.length());
+	} else {
+		// No font so return an ascending range of values
+		for (size_t i = 0; i < text.length(); i++) {
+			positions[i] = i + 1;
+		}
+	}
+}
+
+XYPOSITION SurfaceImpl::WidthTextUTF8(const Font *font_, std::string_view text) {
+	if (PFont(font_)->pfd) {
+		pango_layout_set_font_description(layout, PFont(font_)->pfd);
+		pango_layout_set_text(layout, text.data(), text.length());
+		PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout, 0);
+		PangoRectangle pos{};
+		pango_layout_line_get_extents(pangoLine, nullptr, &pos);
+		return floatFromPangoUnits(pos.width);
+	}
+	return 1;
+}
+
+// Ascent and descent determined by Pango font metrics.
+
+XYPOSITION SurfaceImpl::Ascent(const Font *font_) {
+	XYPOSITION ascent = 0;
+	if (PFont(font_)->pfd) {
+		PangoFontMetrics *metrics = pango_context_get_metrics(pcontext,
+					    PFont(font_)->pfd, pango_context_get_language(pcontext));
+		ascent = std::round(floatFromPangoUnits(
+					    pango_font_metrics_get_ascent(metrics)));
+		pango_font_metrics_unref(metrics);
+	}
+	if (ascent == 0) {
+		ascent = 1;
+	}
+	return ascent;
+}
+
+XYPOSITION SurfaceImpl::Descent(const Font *font_) {
+	if (PFont(font_)->pfd) {
+		PangoFontMetrics *metrics = pango_context_get_metrics(pcontext,
+					    PFont(font_)->pfd, pango_context_get_language(pcontext));
+		const XYPOSITION descent = std::round(floatFromPangoUnits(
+				pango_font_metrics_get_descent(metrics)));
+		pango_font_metrics_unref(metrics);
+		return descent;
+	}
+	return 0;
+}
+
+XYPOSITION SurfaceImpl::InternalLeading(const Font *) {
+	return 0;
+}
+
+XYPOSITION SurfaceImpl::Height(const Font *font_) {
+	return Ascent(font_) + Descent(font_);
+}
+
+XYPOSITION SurfaceImpl::AverageCharWidth(const Font *font_) {
+	return WidthText(font_, "n");
+}
+
+void SurfaceImpl::SetClip(PRectangle rc) {
+	PLATFORM_ASSERT(context);
+	cairo_save(context);
+	CairoRectangle(rc);
+	cairo_clip(context);
+}
+
+void SurfaceImpl::PopClip() {
+	PLATFORM_ASSERT(context);
+	cairo_restore(context);
+}
+
+void SurfaceImpl::FlushCachedState() {}
+
+void SurfaceImpl::FlushDrawing() {
+}
+
+std::unique_ptr<Surface> Surface::Allocate(Technology) {
+	return std::make_unique<SurfaceImpl>();
+}
+
+Window::~Window() noexcept {}
+
+void Window::Destroy() noexcept {
+	if (wid) {
+		ListBox *listbox = dynamic_cast<ListBox *>(this);
+		if (listbox) {
+			gtk_widget_hide(GTK_WIDGET(wid));
+			// clear up window content
+			listbox->Clear();
+			// resize the window to the smallest possible size for it to adapt
+			// to future content
+			gtk_window_resize(GTK_WINDOW(wid), 1, 1);
+		} else {
+			gtk_widget_destroy(GTK_WIDGET(wid));
+		}
+		wid = nullptr;
+	}
+}
+
+PRectangle Window::GetPosition() const {
+	// Before any size allocated pretend its 1000 wide so not scrolled
+	PRectangle rc(0, 0, 1000, 1000);
+	if (wid) {
+		GtkAllocation allocation;
+		gtk_widget_get_allocation(PWidget(wid), &allocation);
+		rc.left = static_cast<XYPOSITION>(allocation.x);
+		rc.top = static_cast<XYPOSITION>(allocation.y);
+		if (allocation.width > 20) {
+			rc.right = rc.left + allocation.width;
+			rc.bottom = rc.top + allocation.height;
+		}
+	}
+	return rc;
+}
+
+void Window::SetPosition(PRectangle rc) {
+	GtkAllocation alloc {};
+	alloc.x = static_cast<int>(rc.left);
+	alloc.y = static_cast<int>(rc.top);
+	alloc.width = static_cast<int>(rc.Width());
+	alloc.height = static_cast<int>(rc.Height());
+	gtk_widget_size_allocate(PWidget(wid), &alloc);
+}
+
+namespace {
+
+GdkRectangle MonitorRectangleForWidget(GtkWidget *wid) noexcept {
+	GdkWindow *wnd = WindowFromWidget(wid);
+	GdkRectangle rcScreen = GdkRectangle();
+#if GTK_CHECK_VERSION(3,22,0)
+	GdkDisplay *pdisplay = gtk_widget_get_display(wid);
+	GdkMonitor *monitor = gdk_display_get_monitor_at_window(pdisplay, wnd);
+	gdk_monitor_get_geometry(monitor, &rcScreen);
+#else
+	GdkScreen *screen = gtk_widget_get_screen(wid);
+	const gint monitor_num = gdk_screen_get_monitor_at_window(screen, wnd);
+	gdk_screen_get_monitor_geometry(screen, monitor_num, &rcScreen);
+#endif
+	return rcScreen;
+}
+
+}
+
+void Window::SetPositionRelative(PRectangle rc, const Window *relativeTo) {
+	const IntegerRectangle irc(rc);
+	int ox = 0;
+	int oy = 0;
+	GdkWindow *wndRelativeTo = WindowFromWidget(PWidget(relativeTo->wid));
+	gdk_window_get_origin(wndRelativeTo, &ox, &oy);
+	ox += irc.left;
+	oy += irc.top;
+
+	const GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo->wid));
+
+	/* do some corrections to fit into screen */
+	const int sizex = irc.Width();
+	const int sizey = irc.Height();
+	if (sizex > rcMonitor.width || ox < rcMonitor.x)
+		ox = rcMonitor.x; /* the best we can do */
+	else if (ox + sizex > rcMonitor.x + rcMonitor.width)
+		ox = rcMonitor.x + rcMonitor.width - sizex;
+	if (sizey > rcMonitor.height || oy < rcMonitor.y)
+		oy = rcMonitor.y;
+	else if (oy + sizey > rcMonitor.y + rcMonitor.height)
+		oy = rcMonitor.y + rcMonitor.height - sizey;
+
+	gtk_window_move(GTK_WINDOW(PWidget(wid)), ox, oy);
+
+	gtk_window_resize(GTK_WINDOW(wid), sizex, sizey);
+}
+
+PRectangle Window::GetClientPosition() const {
+	// On GTK+, the client position is the window position
+	return GetPosition();
+}
+
+void Window::Show(bool show) {
+	if (show)
+		gtk_widget_show(PWidget(wid));
+}
+
+void Window::InvalidateAll() {
+	if (wid) {
+		gtk_widget_queue_draw(PWidget(wid));
+	}
+}
+
+void Window::InvalidateRectangle(PRectangle rc) {
+	if (wid) {
+		const IntegerRectangle irc(rc);
+		gtk_widget_queue_draw_area(PWidget(wid),
+					   irc.left, irc.top,
+					   irc.Width(), irc.Height());
+	}
+}
+
+void Window::SetCursor(Cursor curs) {
+	// We don't set the cursor to same value numerous times under gtk because
+	// it stores the cursor in the window once it's set
+	if (curs == cursorLast)
+		return;
+
+	cursorLast = curs;
+	GdkDisplay *pdisplay = gtk_widget_get_display(PWidget(wid));
+
+	GdkCursor *gdkCurs;
+	switch (curs) {
+	case Cursor::text:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_XTERM);
+		break;
+	case Cursor::arrow:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
+		break;
+	case Cursor::up:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_CENTER_PTR);
+		break;
+	case Cursor::wait:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_WATCH);
+		break;
+	case Cursor::hand:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_HAND2);
+		break;
+	case Cursor::reverseArrow:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_RIGHT_PTR);
+		break;
+	default:
+		gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
+		cursorLast = Cursor::arrow;
+		break;
+	}
+
+	if (WindowFromWidget(PWidget(wid)))
+		gdk_window_set_cursor(WindowFromWidget(PWidget(wid)), gdkCurs);
+#if GTK_CHECK_VERSION(3,0,0)
+	g_object_unref(gdkCurs);
+#else
+	gdk_cursor_unref(gdkCurs);
+#endif
+}
+
+/* Returns rectangle of monitor pt is on, both rect and pt are in Window's
+   gdk window coordinates */
+PRectangle Window::GetMonitorRect(Point pt) {
+	gint x_offset, y_offset;
+
+	gdk_window_get_origin(WindowFromWidget(PWidget(wid)), &x_offset, &y_offset);
+
+	GdkRectangle rect {};
+
+#if GTK_CHECK_VERSION(3,22,0)
+	GdkDisplay *pdisplay = gtk_widget_get_display(PWidget(wid));
+	GdkMonitor *monitor = gdk_display_get_monitor_at_point(pdisplay,
+			      pt.x + x_offset, pt.y + y_offset);
+	gdk_monitor_get_geometry(monitor, &rect);
+#else
+	GdkScreen *screen = gtk_widget_get_screen(PWidget(wid));
+	const gint monitor_num = gdk_screen_get_monitor_at_point(screen,
+				 pt.x + x_offset, pt.y + y_offset);
+	gdk_screen_get_monitor_geometry(screen, monitor_num, &rect);
+#endif
+	rect.x -= x_offset;
+	rect.y -= y_offset;
+	return PRectangle::FromInts(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
+}
+
+typedef std::map<int, RGBAImage *> ImageMap;
+
+struct ListImage {
+	const RGBAImage *rgba_data;
+	GdkPixbuf *pixbuf;
+};
+
+static void list_image_free(gpointer, gpointer value, gpointer) noexcept {
+	ListImage *list_image = static_cast<ListImage *>(value);
+	if (list_image->pixbuf)
+		g_object_unref(list_image->pixbuf);
+	g_free(list_image);
+}
+
+ListBox::ListBox() noexcept {
+}
+
+ListBox::~ListBox() noexcept {
+}
+
+enum {
+	PIXBUF_COLUMN,
+	TEXT_COLUMN,
+	N_COLUMNS
+};
+
+class ListBoxX : public ListBox {
+	WindowID widCached;
+	WindowID frame;
+	WindowID list;
+	WindowID scroller;
+	void *pixhash;
+	GtkCellRenderer *pixbuf_renderer;
+	GtkCellRenderer *renderer;
+	RGBAImageSet images;
+	int desiredVisibleRows;
+	unsigned int maxItemCharacters;
+	unsigned int aveCharWidth;
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkCssProvider *cssProvider;
+#endif
+public:
+	IListBoxDelegate *delegate;
+
+	ListBoxX() noexcept : widCached(nullptr), frame(nullptr), list(nullptr), scroller(nullptr),
+		pixhash(nullptr), pixbuf_renderer(nullptr),
+		renderer(nullptr),
+		desiredVisibleRows(5), maxItemCharacters(0),
+		aveCharWidth(1),
+#if GTK_CHECK_VERSION(3,0,0)
+		cssProvider(nullptr),
+#endif
+		delegate(nullptr) {
+	}
+	// Deleted so ListBoxX objects can not be copied.
+	ListBoxX(const ListBoxX&) = delete;
+	ListBoxX(ListBoxX&&) = delete;
+	ListBoxX&operator=(const ListBoxX&) = delete;
+	ListBoxX&operator=(ListBoxX&&) = delete;
+	~ListBoxX() noexcept override {
+		if (pixhash) {
+			g_hash_table_foreach((GHashTable *) pixhash, list_image_free, nullptr);
+			g_hash_table_destroy((GHashTable *) pixhash);
+		}
+		if (widCached) {
+			gtk_widget_destroy(GTK_WIDGET(widCached));
+			wid = widCached = nullptr;
+		}
+#if GTK_CHECK_VERSION(3,0,0)
+		if (cssProvider) {
+			g_object_unref(cssProvider);
+			cssProvider = nullptr;
+		}
+#endif
+	}
+	void SetFont(const Font *font) override;
+	void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, Technology technology_) override;
+	void SetAverageCharWidth(int width) override;
+	void SetVisibleRows(int rows) override;
+	int GetVisibleRows() const override;
+	int GetRowHeight();
+	PRectangle GetDesiredRect() override;
+	int CaretFromEdge() override;
+	void Clear() noexcept override;
+	void Append(char *s, int type = -1) override;
+	int Length() override;
+	void Select(int n) override;
+	int GetSelection() override;
+	int Find(const char *prefix) override;
+	std::string GetValue(int n) override;
+	void RegisterRGBA(int type, std::unique_ptr<RGBAImage> image);
+	void RegisterImage(int type, const char *xpm_data) override;
+	void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override;
+	void ClearRegisteredImages() override;
+	void SetDelegate(IListBoxDelegate *lbDelegate) override;
+	void SetList(const char *listText, char separator, char typesep) override;
+	void SetOptions(ListOptions options_) override;
+};
+
+std::unique_ptr<ListBox> ListBox::Allocate() {
+	return std::make_unique<ListBoxX>();
+}
+
+static int treeViewGetRowHeight(GtkTreeView *view) {
+#if GTK_CHECK_VERSION(3,0,0)
+	// This version sometimes reports erroneous results on GTK2, but the GTK2
+	// version is inaccurate for GTK 3.14.
+	GdkRectangle rect;
+	GtkTreePath *path = gtk_tree_path_new_first();
+	gtk_tree_view_get_background_area(view, path, nullptr, &rect);
+	gtk_tree_path_free(path);
+	return rect.height;
+#else
+	int row_height=0;
+	int vertical_separator=0;
+	int expander_size=0;
+	GtkTreeViewColumn *column = gtk_tree_view_get_column(view, 0);
+	gtk_tree_view_column_cell_get_size(column, nullptr, nullptr, nullptr, nullptr, &row_height);
+	gtk_widget_style_get(GTK_WIDGET(view),
+			     "vertical-separator", &vertical_separator,
+			     "expander-size", &expander_size, nullptr);
+	row_height += vertical_separator;
+	row_height = std::max(row_height, expander_size);
+	return row_height;
+#endif
+}
+
+// SmallScroller, a GtkScrolledWindow that can shrink very small, as
+// gtk_widget_set_size_request() cannot shrink widgets on GTK3
+typedef struct {
+	GtkScrolledWindow parent;
+	/* Workaround ABI issue with Windows GTK2 bundle and GCC > 3.
+	   See http://lists.geany.org/pipermail/devel/2015-April/thread.html#9379
+
+	   GtkScrolledWindow contains a bitfield, and GCC 3.4 and 4.8 don't agree
+	   on the size of the structure (regardless of -mms-bitfields):
+	   - GCC 3.4 has sizeof(GtkScrolledWindow)=88
+	   - GCC 4.8 has sizeof(GtkScrolledWindow)=84
+	   As Windows GTK2 bundle is built with GCC 3, it requires types derived
+	   from GtkScrolledWindow to be at least 88 bytes, which means we need to
+	   add some fake padding to fill in the extra 4 bytes.
+	   There is however no other issue with the layout difference as we never
+	   access any GtkScrolledWindow fields ourselves. */
+	int padding;
+} SmallScroller;
+typedef GtkScrolledWindowClass SmallScrollerClass;
+
+G_DEFINE_TYPE(SmallScroller, small_scroller, GTK_TYPE_SCROLLED_WINDOW)
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void small_scroller_get_preferred_height(GtkWidget *widget, gint *min, gint *nat) {
+	GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
+	if (GTK_IS_TREE_VIEW(child)) {
+		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(child));
+		int n_rows = gtk_tree_model_iter_n_children(model, nullptr);
+		int row_height = treeViewGetRowHeight(GTK_TREE_VIEW(child));
+
+		*min = MAX(1, row_height);
+		*nat = MAX(*min, n_rows * row_height);
+	} else {
+		GTK_WIDGET_CLASS(small_scroller_parent_class)->get_preferred_height(widget, min, nat);
+		if (*min > 1)
+			*min = 1;
+	}
+}
+#else
+static void small_scroller_size_request(GtkWidget *widget, GtkRequisition *req) {
+	GTK_WIDGET_CLASS(small_scroller_parent_class)->size_request(widget, req);
+	req->height = 1;
+}
+#endif
+
+static void small_scroller_class_init(SmallScrollerClass *klass) {
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS(klass)->get_preferred_height = small_scroller_get_preferred_height;
+#else
+	GTK_WIDGET_CLASS(klass)->size_request = small_scroller_size_request;
+#endif
+}
+
+static void small_scroller_init(SmallScroller *) {}
+
+static gboolean ButtonPress(GtkWidget *, GdkEventButton *ev, gpointer p) {
+	try {
+		ListBoxX *lb = static_cast<ListBoxX *>(p);
+		if (ev->type == GDK_2BUTTON_PRESS && lb->delegate) {
+			ListBoxEvent event(ListBoxEvent::EventType::doubleClick);
+			lb->delegate->ListNotify(&event);
+			return TRUE;
+		}
+
+	} catch (...) {
+		// No pointer back to Scintilla to save status
+	}
+	return FALSE;
+}
+
+static gboolean ButtonRelease(GtkWidget *, GdkEventButton *ev, gpointer p) {
+	try {
+		ListBoxX *lb = static_cast<ListBoxX *>(p);
+		if (ev->type != GDK_2BUTTON_PRESS && lb->delegate) {
+			ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
+			lb->delegate->ListNotify(&event);
+			return TRUE;
+		}
+	} catch (...) {
+		// No pointer back to Scintilla to save status
+	}
+	return FALSE;
+}
+
+/* Change the active colour to the selected colour so the listbox uses the colour
+scheme that it would use if it had the focus. */
+static void StyleSet(GtkWidget *w, GtkStyle *, void *) {
+
+	g_return_if_fail(w != nullptr);
+
+	/* Copy the selected colour to active.  Note that the modify calls will cause
+	recursive calls to this function after the value is updated and w->style to
+	be set to a new object */
+
+#if GTK_CHECK_VERSION(3,16,0)
+	// On recent releases of GTK+, it does not appear necessary to set the list box colours.
+	// This may be because of common themes and may be needed with other themes.
+	// The *override* calls are deprecated now, so only call them for older versions of GTK+.
+#elif GTK_CHECK_VERSION(3,0,0)
+	GtkStyleContext *styleContext = gtk_widget_get_style_context(w);
+	if (styleContext == nullptr)
+		return;
+
+	GdkRGBA colourForeSelected;
+	gtk_style_context_get_color(styleContext, GTK_STATE_FLAG_SELECTED, &colourForeSelected);
+	GdkRGBA colourForeActive;
+	gtk_style_context_get_color(styleContext, GTK_STATE_FLAG_ACTIVE, &colourForeActive);
+	if (!gdk_rgba_equal(&colourForeSelected, &colourForeActive))
+		gtk_widget_override_color(w, GTK_STATE_FLAG_ACTIVE, &colourForeSelected);
+
+	styleContext = gtk_widget_get_style_context(w);
+	if (styleContext == nullptr)
+		return;
+
+	GdkRGBA colourBaseSelected;
+	gtk_style_context_get_background_color(styleContext, GTK_STATE_FLAG_SELECTED, &colourBaseSelected);
+	GdkRGBA colourBaseActive;
+	gtk_style_context_get_background_color(styleContext, GTK_STATE_FLAG_ACTIVE, &colourBaseActive);
+	if (!gdk_rgba_equal(&colourBaseSelected, &colourBaseActive))
+		gtk_widget_override_background_color(w, GTK_STATE_FLAG_ACTIVE, &colourBaseSelected);
+#else
+	GtkStyle *style = gtk_widget_get_style(w);
+	if (style == nullptr)
+		return;
+	if (!gdk_color_equal(&style->base[GTK_STATE_SELECTED], &style->base[GTK_STATE_ACTIVE]))
+		gtk_widget_modify_base(w, GTK_STATE_ACTIVE, &style->base[GTK_STATE_SELECTED]);
+	style = gtk_widget_get_style(w);
+	if (style == nullptr)
+		return;
+	if (!gdk_color_equal(&style->text[GTK_STATE_SELECTED], &style->text[GTK_STATE_ACTIVE]))
+		gtk_widget_modify_text(w, GTK_STATE_ACTIVE, &style->text[GTK_STATE_SELECTED]);
+#endif
+}
+
+void ListBoxX::Create(Window &parent, int, Point, int, bool, Technology) {
+	if (widCached != nullptr) {
+		wid = widCached;
+		return;
+	}
+
+#if GTK_CHECK_VERSION(3,0,0)
+	if (!cssProvider) {
+		cssProvider = gtk_css_provider_new();
+	}
+#endif
+
+	wid = widCached = gtk_window_new(GTK_WINDOW_POPUP);
+
+	frame = gtk_frame_new(nullptr);
+	gtk_widget_show(PWidget(frame));
+	gtk_container_add(GTK_CONTAINER(GetID()), PWidget(frame));
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 0);
+
+	scroller = g_object_new(small_scroller_get_type(), nullptr);
+	gtk_container_set_border_width(GTK_CONTAINER(scroller), 0);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller),
+				       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_container_add(GTK_CONTAINER(frame), PWidget(scroller));
+	gtk_widget_show(PWidget(scroller));
+
+	/* Tree and its model */
+	GtkListStore *store =
+		gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+	list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	g_signal_connect(G_OBJECT(list), "style-set", G_CALLBACK(StyleSet), nullptr);
+
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkStyleContext *styleContext = gtk_widget_get_style_context(GTK_WIDGET(list));
+	if (styleContext) {
+		gtk_style_context_add_provider(styleContext, GTK_STYLE_PROVIDER(cssProvider),
+					       GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	}
+#endif
+
+	GtkTreeSelection *selection =
+		gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE);
+	gtk_tree_view_set_reorderable(GTK_TREE_VIEW(list), FALSE);
+
+	/* Columns */
+	GtkTreeViewColumn *column = gtk_tree_view_column_new();
+	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_title(column, "Autocomplete");
+
+	pixbuf_renderer = gtk_cell_renderer_pixbuf_new();
+	gtk_cell_renderer_set_fixed_size(pixbuf_renderer, 0, -1);
+	gtk_tree_view_column_pack_start(column, pixbuf_renderer, FALSE);
+	gtk_tree_view_column_add_attribute(column, pixbuf_renderer,
+					   "pixbuf", PIXBUF_COLUMN);
+
+	renderer = gtk_cell_renderer_text_new();
+	gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1);
+	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+	gtk_tree_view_column_add_attribute(column, renderer,
+					   "text", TEXT_COLUMN);
+
+	gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(list), "fixed-height-mode"))
+		g_object_set(G_OBJECT(list), "fixed-height-mode", TRUE, nullptr);
+
+	GtkWidget *widget = PWidget(list);	// No code inside the G_OBJECT macro
+	gtk_container_add(GTK_CONTAINER(PWidget(scroller)), widget);
+	gtk_widget_show(widget);
+	g_signal_connect(G_OBJECT(widget), "button_press_event",
+			 G_CALLBACK(ButtonPress), this);
+	g_signal_connect(G_OBJECT(widget), "button_release_event",
+			 G_CALLBACK(ButtonRelease), this);
+
+	GtkWidget *top = gtk_widget_get_toplevel(static_cast<GtkWidget *>(parent.GetID()));
+	gtk_window_set_transient_for(GTK_WINDOW(static_cast<GtkWidget *>(wid)),
+				     GTK_WINDOW(top));
+}
+
+void ListBoxX::SetFont(const Font *font) {
+	// Only do for Pango font as there have been crashes for GDK fonts
+	if (Created() && PFont(font)->pfd) {
+		// Current font is Pango font
+#if GTK_CHECK_VERSION(3,0,0)
+		if (cssProvider) {
+			PangoFontDescription *pfd = PFont(font)->pfd;
+			std::ostringstream ssFontSetting;
+			ssFontSetting << "GtkTreeView, treeview { ";
+			ssFontSetting << "font-family: " << pango_font_description_get_family(pfd) <<  "; ";
+			ssFontSetting << "font-size:";
+			ssFontSetting << static_cast<double>(pango_font_description_get_size(pfd)) / PANGO_SCALE;
+			// On GTK < 3.21.0 the units are incorrectly parsed, so a font size in points
+			// need to use the "px" unit.  Normally we only get fonts in points here, so
+			// don't bother to handle the case the font is actually in pixels on < 3.21.0.
+			if (gtk_check_version(3, 21, 0) != nullptr || // on < 3.21.0
+					pango_font_description_get_size_is_absolute(pfd)) {
+				ssFontSetting << "px; ";
+			} else {
+				ssFontSetting << "pt; ";
+			}
+			ssFontSetting << "font-weight:"<< pango_font_description_get_weight(pfd) << "; ";
+			ssFontSetting << "}";
+			gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(cssProvider),
+							ssFontSetting.str().c_str(), -1, nullptr);
+		}
+#else
+		gtk_widget_modify_font(PWidget(list), PFont(font)->pfd);
+#endif
+		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), -1);
+		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1);
+	}
+}
+
+void ListBoxX::SetAverageCharWidth(int width) {
+	aveCharWidth = width;
+}
+
+void ListBoxX::SetVisibleRows(int rows) {
+	desiredVisibleRows = rows;
+}
+
+int ListBoxX::GetVisibleRows() const {
+	return desiredVisibleRows;
+}
+
+int ListBoxX::GetRowHeight() {
+	return treeViewGetRowHeight(GTK_TREE_VIEW(list));
+}
+
+PRectangle ListBoxX::GetDesiredRect() {
+	// Before any size allocated pretend its 100 wide so not scrolled
+	PRectangle rc(0, 0, 100, 100);
+	if (wid) {
+		int rows = Length();
+		if ((rows == 0) || (rows > desiredVisibleRows))
+			rows = desiredVisibleRows;
+
+		GtkRequisition req;
+		// This, apparently unnecessary call, ensures gtk_tree_view_column_cell_get_size
+		// returns reasonable values.
+#if GTK_CHECK_VERSION(3,0,0)
+		gtk_widget_get_preferred_size(GTK_WIDGET(frame), nullptr, &req);
+#else
+		gtk_widget_size_request(GTK_WIDGET(frame), &req);
+#endif
+		int height;
+
+		// First calculate height of the clist for our desired visible
+		// row count otherwise it tries to expand to the total # of rows
+		// Get cell height
+		const int row_height = GetRowHeight();
+#if GTK_CHECK_VERSION(3,0,0)
+		GtkStyleContext *styleContextFrame = gtk_widget_get_style_context(PWidget(frame));
+		GtkStateFlags stateFlagsFrame = gtk_style_context_get_state(styleContextFrame);
+		GtkBorder padding, border, border_border = { 0, 0, 0, 0 };
+		gtk_style_context_get_padding(styleContextFrame, stateFlagsFrame, &padding);
+		gtk_style_context_get_border(styleContextFrame, stateFlagsFrame, &border);
+
+#	if GTK_CHECK_VERSION(3,20,0)
+		// on GTK 3.20 the frame border is in a sub-node "border".
+		// Unfortunately we need to be built against 3.20 to be able to support this, as it requires
+		// new API.
+		GtkStyleContext *styleContextFrameBorder = gtk_style_context_new();
+		GtkWidgetPath *widget_path = gtk_widget_path_copy(gtk_style_context_get_path(styleContextFrame));
+		gtk_widget_path_append_type(widget_path, GTK_TYPE_BORDER); // dummy type
+		gtk_widget_path_iter_set_object_name(widget_path, -1, "border");
+		gtk_style_context_set_path(styleContextFrameBorder, widget_path);
+		gtk_widget_path_free(widget_path);
+		gtk_style_context_get_border(styleContextFrameBorder, stateFlagsFrame, &border_border);
+		g_object_unref(styleContextFrameBorder);
+#	else // < 3.20
+		if (gtk_check_version(3, 20, 0) == nullptr) {
+			// default to 1px all around as it's likely what it is, and so we don't miss 2px height
+			// on GTK 3.20 when built against an earlier version.
+			border_border.top = border_border.bottom = border_border.left = border_border.right = 1;
+		}
+#	endif
+
+		height = (rows * row_height
+			  + padding.top + padding.bottom
+			  + border.top + border.bottom
+			  + border_border.top + border_border.bottom
+			  + 2 * gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))));
+#else
+		height = (rows * row_height
+			  + 2 * (PWidget(frame)->style->ythickness
+				 + GTK_CONTAINER(PWidget(list))->border_width));
+#endif
+		rc.bottom = height;
+
+		int width = maxItemCharacters;
+		if (width < 12)
+			width = 12;
+		rc.right = width * (aveCharWidth + aveCharWidth / 3);
+		// Add horizontal padding and borders
+		int horizontal_separator=0;
+		gtk_widget_style_get(PWidget(list),
+				     "horizontal-separator", &horizontal_separator, nullptr);
+		rc.right += horizontal_separator;
+#if GTK_CHECK_VERSION(3,0,0)
+		rc.right += (padding.left + padding.right
+			     + border.left + border.right
+			     + border_border.left + border_border.right
+			     + 2 * gtk_container_get_border_width(GTK_CONTAINER(PWidget(list))));
+#else
+		rc.right += 2 * (PWidget(frame)->style->xthickness
+				 + GTK_CONTAINER(PWidget(list))->border_width);
+#endif
+		if (Length() > rows) {
+			// Add the width of the scrollbar
+			GtkWidget *vscrollbar =
+				gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(scroller));
+#if GTK_CHECK_VERSION(3,0,0)
+			gtk_widget_get_preferred_size(vscrollbar, nullptr, &req);
+#else
+			gtk_widget_size_request(vscrollbar, &req);
+#endif
+			rc.right += req.width;
+		}
+	}
+	return rc;
+}
+
+int ListBoxX::CaretFromEdge() {
+	gint renderer_width, renderer_height;
+	gtk_cell_renderer_get_fixed_size(pixbuf_renderer, &renderer_width,
+					 &renderer_height);
+	return 4 + renderer_width;
+}
+
+void ListBoxX::Clear() noexcept {
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+	gtk_list_store_clear(GTK_LIST_STORE(model));
+	maxItemCharacters = 0;
+}
+
+static void init_pixmap(ListImage *list_image) noexcept {
+	if (list_image->rgba_data) {
+		// Drop any existing pixmap/bitmap as data may have changed
+		if (list_image->pixbuf)
+			g_object_unref(list_image->pixbuf);
+		list_image->pixbuf =
+			gdk_pixbuf_new_from_data(list_image->rgba_data->Pixels(),
+						 GDK_COLORSPACE_RGB,
+						 TRUE,
+						 8,
+						 list_image->rgba_data->GetWidth(),
+						 list_image->rgba_data->GetHeight(),
+						 list_image->rgba_data->GetWidth() * 4,
+						 nullptr,
+						 nullptr);
+	}
+}
+
+#define SPACING 5
+
+void ListBoxX::Append(char *s, int type) {
+	ListImage *list_image = nullptr;
+	if ((type >= 0) && pixhash) {
+		list_image = static_cast<ListImage *>(g_hash_table_lookup((GHashTable *) pixhash,
+						      GINT_TO_POINTER(type)));
+	}
+	GtkTreeIter iter {};
+	GtkListStore *store =
+		GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list)));
+	gtk_list_store_append(GTK_LIST_STORE(store), &iter);
+	if (list_image) {
+		if (nullptr == list_image->pixbuf)
+			init_pixmap(list_image);
+		if (list_image->pixbuf) {
+			gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+					   PIXBUF_COLUMN, list_image->pixbuf,
+					   TEXT_COLUMN, s, -1);
+
+			const gint pixbuf_width = gdk_pixbuf_get_width(list_image->pixbuf);
+			gint renderer_height, renderer_width;
+			gtk_cell_renderer_get_fixed_size(pixbuf_renderer,
+							 &renderer_width, &renderer_height);
+			if (pixbuf_width > renderer_width)
+				gtk_cell_renderer_set_fixed_size(pixbuf_renderer,
+								 pixbuf_width, -1);
+		} else {
+			gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+					   TEXT_COLUMN, s, -1);
+		}
+	} else {
+		gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+				   TEXT_COLUMN, s, -1);
+	}
+	const size_t len = strlen(s);
+	if (maxItemCharacters < len)
+		maxItemCharacters = len;
+}
+
+int ListBoxX::Length() {
+	if (wid)
+		return gtk_tree_model_iter_n_children(gtk_tree_view_get_model
+						      (GTK_TREE_VIEW(list)), nullptr);
+	return 0;
+}
+
+void ListBoxX::Select(int n) {
+	GtkTreeIter iter {};
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+	GtkTreeSelection *selection =
+		gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+
+	if (n < 0) {
+		gtk_tree_selection_unselect_all(selection);
+		return;
+	}
+
+	const bool valid = gtk_tree_model_iter_nth_child(model, &iter, nullptr, n) != FALSE;
+	if (valid) {
+		gtk_tree_selection_select_iter(selection, &iter);
+
+		// Move the scrollbar to show the selection.
+		const int total = Length();
+#if GTK_CHECK_VERSION(3,0,0)
+		GtkAdjustment *adj =
+			gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(list));
+#else
+		GtkAdjustment *adj =
+			gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(list));
+#endif
+		gfloat value = (static_cast<gfloat>(n) / total) * (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_lower(adj))
+			       + gtk_adjustment_get_lower(adj) - gtk_adjustment_get_page_size(adj) / 2;
+		// Get cell height
+		const int row_height = GetRowHeight();
+
+		int rows = Length();
+		if ((rows == 0) || (rows > desiredVisibleRows))
+			rows = desiredVisibleRows;
+		if (rows & 0x1) {
+			// Odd rows to display -- We are now in the middle.
+			// Align it so that we don't chop off rows.
+			value += static_cast<gfloat>(row_height) / 2.0f;
+		}
+		// Clamp it.
+		value = (value < 0)? 0 : value;
+		value = (value > (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)))?
+			(gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)) : value;
+
+		// Set it.
+		gtk_adjustment_set_value(adj, value);
+	} else {
+		gtk_tree_selection_unselect_all(selection);
+	}
+
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
+		delegate->ListNotify(&event);
+	}
+}
+
+int ListBoxX::GetSelection() {
+	int index = -1;
+	GtkTreeIter iter {};
+	GtkTreeModel *model {};
+	GtkTreeSelection *selection;
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
+		const int *indices = gtk_tree_path_get_indices(path);
+		// Don't free indices.
+		if (indices)
+			index = indices[0];
+		gtk_tree_path_free(path);
+	}
+	return index;
+}
+
+int ListBoxX::Find(const char *prefix) {
+	GtkTreeIter iter {};
+	GtkTreeModel *model =
+		gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+	bool valid = gtk_tree_model_get_iter_first(model, &iter) != FALSE;
+	int i = 0;
+	while (valid) {
+		gchar *s = nullptr;
+		gtk_tree_model_get(model, &iter, TEXT_COLUMN, &s, -1);
+		if (s && (0 == strncmp(prefix, s, strlen(prefix)))) {
+			g_free(s);
+			return i;
+		}
+		g_free(s);
+		valid = gtk_tree_model_iter_next(model, &iter) != FALSE;
+		i++;
+	}
+	return -1;
+}
+
+std::string ListBoxX::GetValue(int n) {
+	char *text = nullptr;
+	GtkTreeIter iter {};
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+	const bool valid = gtk_tree_model_iter_nth_child(model, &iter, nullptr, n) != FALSE;
+	if (valid) {
+		gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1);
+	}
+	std::string value;
+	if (text) {
+		value = text;
+	}
+	g_free(text);
+	return value;
+}
+
+// g_return_if_fail causes unnecessary compiler warning in release compile.
+#ifdef _MSC_VER
+#pragma warning(disable: 4127)
+#endif
+
+void ListBoxX::RegisterRGBA(int type, std::unique_ptr<RGBAImage> image) {
+	images.AddImage(type, std::move(image));
+	const RGBAImage * const observe = images.Get(type);
+
+	if (!pixhash) {
+		pixhash = g_hash_table_new(g_direct_hash, g_direct_equal);
+	}
+	ListImage *list_image = static_cast<ListImage *>(g_hash_table_lookup((GHashTable *) pixhash,
+				GINT_TO_POINTER(type)));
+	if (list_image) {
+		// Drop icon already registered
+		if (list_image->pixbuf)
+			g_object_unref(list_image->pixbuf);
+		list_image->pixbuf = nullptr;
+		list_image->rgba_data = observe;
+	} else {
+		list_image = g_new0(ListImage, 1);
+		list_image->rgba_data = observe;
+		g_hash_table_insert((GHashTable *) pixhash, GINT_TO_POINTER(type),
+				    (gpointer) list_image);
+	}
+}
+
+void ListBoxX::RegisterImage(int type, const char *xpm_data) {
+	g_return_if_fail(xpm_data);
+	XPM xpmImage(xpm_data);
+	RegisterRGBA(type, std::make_unique<RGBAImage>(xpmImage));
+}
+
+void ListBoxX::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+	RegisterRGBA(type, std::make_unique<RGBAImage>(width, height, 1.0f, pixelsImage));
+}
+
+void ListBoxX::ClearRegisteredImages() {
+	images.Clear();
+}
+
+void ListBoxX::SetDelegate(IListBoxDelegate *lbDelegate) {
+	delegate = lbDelegate;
+}
+
+void ListBoxX::SetList(const char *listText, char separator, char typesep) {
+	Clear();
+	const size_t count = strlen(listText) + 1;
+	std::vector<char> words(listText, listText+count);
+	char *startword = &words[0];
+	char *numword = nullptr;
+	int i = 0;
+	for (; words[i]; i++) {
+		if (words[i] == separator) {
+			words[i] = '\0';
+			if (numword)
+				*numword = '\0';
+			Append(startword, numword?atoi(numword + 1):-1);
+			startword = &words[0] + i + 1;
+			numword = nullptr;
+		} else if (words[i] == typesep) {
+			numword = &words[0] + i;
+		}
+	}
+	if (startword) {
+		if (numword)
+			*numword = '\0';
+		Append(startword, numword?atoi(numword + 1):-1);
+	}
+}
+
+void ListBoxX::SetOptions(ListOptions) {
+}
+
+Menu::Menu() noexcept : mid(nullptr) {}
+
+void Menu::CreatePopUp() {
+	Destroy();
+	mid = gtk_menu_new();
+	g_object_ref_sink(G_OBJECT(mid));
+}
+
+void Menu::Destroy() noexcept {
+	if (mid)
+		g_object_unref(G_OBJECT(mid));
+	mid = nullptr;
+}
+
+#if !GTK_CHECK_VERSION(3,22,0)
+static void MenuPositionFunc(GtkMenu *, gint *x, gint *y, gboolean *, gpointer userData) noexcept {
+	sptr_t intFromPointer = GPOINTER_TO_INT(userData);
+	*x = intFromPointer & 0xffff;
+	*y = intFromPointer >> 16;
+}
+#endif
+
+void Menu::Show(Point pt, const Window &w) {
+	GtkMenu *widget = static_cast<GtkMenu *>(mid);
+	gtk_widget_show_all(GTK_WIDGET(widget));
+#if GTK_CHECK_VERSION(3,22,0)
+	// Rely on GTK+ to do the right thing with positioning
+	gtk_menu_popup_at_pointer(widget, nullptr);
+#else
+	const GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(w.GetID()));
+	GtkRequisition requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_preferred_size(GTK_WIDGET(widget), nullptr, &requisition);
+#else
+	gtk_widget_size_request(GTK_WIDGET(widget), &requisition);
+#endif
+	if ((pt.x + requisition.width) > rcMonitor.x + rcMonitor.width) {
+		pt.x = rcMonitor.x + rcMonitor.width - requisition.width;
+	}
+	if ((pt.y + requisition.height) > rcMonitor.y + rcMonitor.height) {
+		pt.y = rcMonitor.y + rcMonitor.height - requisition.height;
+	}
+	gtk_menu_popup(widget, nullptr, nullptr, MenuPositionFunc,
+		       GINT_TO_POINTER((static_cast<int>(pt.y) << 16) | static_cast<int>(pt.x)), 0,
+		       gtk_get_current_event_time());
+#endif
+}
+
+ColourRGBA Platform::Chrome() {
+	return ColourRGBA(0xe0, 0xe0, 0xe0);
+}
+
+ColourRGBA Platform::ChromeHighlight() {
+	return ColourRGBA(0xff, 0xff, 0xff);
+}
+
+const char *Platform::DefaultFont() {
+#ifdef G_OS_WIN32
+	return "Lucida Console";
+#else
+	return "!Sans";
+#endif
+}
+
+int Platform::DefaultFontSize() {
+#ifdef G_OS_WIN32
+	return 10;
+#else
+	return 12;
+#endif
+}
+
+unsigned int Platform::DoubleClickTime() {
+	return 500; 	// Half a second
+}
+
+void Platform::DebugDisplay(const char *s) noexcept {
+	fprintf(stderr, "%s", s);
+}
+
+//#define TRACE
+
+#ifdef TRACE
+void Platform::DebugPrintf(const char *format, ...) noexcept {
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer, format, pArguments);
+	va_end(pArguments);
+	Platform::DebugDisplay(buffer);
+}
+#else
+void Platform::DebugPrintf(const char *, ...) noexcept {}
+
+#endif
+
+// Not supported for GTK+
+static bool assertionPopUps = true;
+
+bool Platform::ShowAssertionPopUps(bool assertionPopUps_) noexcept {
+	const bool ret = assertionPopUps;
+	assertionPopUps = assertionPopUps_;
+	return ret;
+}
+
+void Platform::Assert(const char *c, const char *file, int line) noexcept {
+	char buffer[2000];
+	g_snprintf(buffer, sizeof(buffer), "Assertion [%s] failed at %s %d\r\n", c, file, line);
+	Platform::DebugDisplay(buffer);
+	abort();
+}
+
+void Platform_Initialise() {
+}
+
+void Platform_Finalise() {
+}
diff --git a/scite-app/scintilla/gtk/ScintillaGTK.cxx b/scite-app/scintilla/gtk/ScintillaGTK.cxx
new file mode 100755
index 0000000..0a054c8
--- /dev/null
+++ b/scite-app/scintilla/gtk/ScintillaGTK.cxx
@@ -0,0 +1,3305 @@
+// Scintilla source code edit control
+// ScintillaGTK.cxx - GTK+ specific subclass of ScintillaBase
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+#include <cmath>
+
+#include <stdexcept>
+#include <new>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include <glib.h>
+#include <gmodule.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#if defined(GDK_WINDOWING_WAYLAND)
+#include <gdk/gdkwayland.h>
+#endif
+
+#if defined(_WIN32)
+// On Win32 use windows.h to access clipboard (rectangular format) and systems parameters
+#undef NOMINMAX
+#define NOMINMAX
+#include <windows.h>
+#endif
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+#include "ScintillaGTK.h"
+#include "scintilla-marshal.h"
+#include "ScintillaGTKAccessible.h"
+
+#include "Converter.h"
+
+#define IS_WIDGET_REALIZED(w) (gtk_widget_get_realized(GTK_WIDGET(w)))
+#define IS_WIDGET_MAPPED(w) (gtk_widget_get_mapped(GTK_WIDGET(w)))
+
+#define SC_INDICATOR_INPUT INDICATOR_IME
+#define SC_INDICATOR_TARGET INDICATOR_IME+1
+#define SC_INDICATOR_CONVERTED INDICATOR_IME+2
+#define SC_INDICATOR_UNKNOWN INDICATOR_IME_MAX
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+// From PlatGTK.cxx
+extern std::string UTF8FromLatin1(std::string_view text);
+extern void Platform_Initialise();
+extern void Platform_Finalise();
+
+namespace {
+
+enum {
+	COMMAND_SIGNAL,
+	NOTIFY_SIGNAL,
+	LAST_SIGNAL
+};
+
+gint scintilla_signals[LAST_SIGNAL] = { 0 };
+
+enum {
+	TARGET_STRING,
+	TARGET_TEXT,
+	TARGET_COMPOUND_TEXT,
+	TARGET_UTF8_STRING,
+	TARGET_URI
+};
+
+const GtkTargetEntry clipboardCopyTargets[] = {
+	{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
+	{ (gchar *) "STRING", 0, TARGET_STRING },
+};
+constexpr gint nClipboardCopyTargets = static_cast<gint>(std::size(clipboardCopyTargets));
+
+const GtkTargetEntry clipboardPasteTargets[] = {
+	{ (gchar *) "text/uri-list", 0, TARGET_URI },
+	{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
+	{ (gchar *) "STRING", 0, TARGET_STRING },
+};
+constexpr gint nClipboardPasteTargets = static_cast<gint>(std::size(clipboardPasteTargets));
+
+const GdkDragAction actionCopyOrMove = static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE);
+
+GdkWindow *WindowFromWidget(GtkWidget *w) noexcept {
+	return gtk_widget_get_window(w);
+}
+
+GtkWidget *PWidget(const Window &w) noexcept {
+	return static_cast<GtkWidget *>(w.GetID());
+}
+
+GdkWindow *PWindow(const Window &w) noexcept {
+	GtkWidget *widget = static_cast<GtkWidget *>(w.GetID());
+	return gtk_widget_get_window(widget);
+}
+
+void UnRefCursor(GdkCursor *cursor) noexcept {
+#if GTK_CHECK_VERSION(3,0,0)
+	g_object_unref(cursor);
+#else
+	gdk_cursor_unref(cursor);
+#endif
+}
+
+void MapWidget(GtkWidget *widget) noexcept {
+	if (widget &&
+		gtk_widget_get_visible(GTK_WIDGET(widget)) &&
+		!IS_WIDGET_MAPPED(widget)) {
+		gtk_widget_map(widget);
+	}
+}
+
+const guchar *DataOfGSD(GtkSelectionData *sd) noexcept {
+	return gtk_selection_data_get_data(sd);
+}
+
+gint LengthOfGSD(GtkSelectionData *sd) noexcept {
+	return gtk_selection_data_get_length(sd);
+}
+
+GdkAtom TypeOfGSD(GtkSelectionData *sd) noexcept {
+	return gtk_selection_data_get_data_type(sd);
+}
+
+GdkAtom SelectionOfGSD(GtkSelectionData *sd) noexcept {
+	return gtk_selection_data_get_selection(sd);
+}
+
+}
+
+FontOptions::FontOptions(GtkWidget *widget) noexcept {
+	PangoContext *pcontext = gtk_widget_create_pango_context(widget);
+	PLATFORM_ASSERT(pcontext);
+	const cairo_font_options_t *options = pango_cairo_context_get_font_options(pcontext);
+	// options is owned by the PangoContext so must not be freed.
+	if (options) {
+		// options is NULL on Win32
+		antialias = cairo_font_options_get_antialias(options);
+		order = cairo_font_options_get_subpixel_order(options);
+		hint = cairo_font_options_get_hint_style(options);
+	}
+	g_object_unref(pcontext);
+}
+
+bool FontOptions::operator==(const FontOptions &other) const noexcept {
+	return antialias == other.antialias &&
+		order == other.order &&
+		hint == other.hint;
+}
+
+ScintillaGTK *ScintillaGTK::FromWidget(GtkWidget *widget) noexcept {
+	ScintillaObject *scio = SCINTILLA(widget);
+	return static_cast<ScintillaGTK *>(scio->pscin);
+}
+
+ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) :
+	adjustmentv(nullptr), adjustmenth(nullptr),
+	verticalScrollBarWidth(30), horizontalScrollBarHeight(30),
+	evbtn(nullptr),
+	buttonMouse(0),
+	capturedMouse(false), dragWasDropped(false),
+	lastKey(0), rectangularSelectionModifier(SCMOD_CTRL),
+	parentClass(nullptr),
+	atomSought(nullptr),
+	preeditInitialized(false),
+	im_context(nullptr),
+	lastNonCommonScript(G_UNICODE_SCRIPT_INVALID_CODE),
+	lastWheelMouseTime(0),
+	lastWheelMouseDirection(0),
+	wheelMouseIntensity(0),
+	smoothScrollY(0),
+	smoothScrollX(0),
+	rgnUpdate(nullptr),
+	repaintFullWindow(false),
+	styleIdleID(0),
+	accessibilityEnabled(SC_ACCESSIBILITY_ENABLED),
+	accessible(nullptr) {
+	sci = sci_;
+	wMain = GTK_WIDGET(sci);
+
+	rectangularSelectionModifier = SCMOD_ALT;
+
+#if PLAT_GTK_WIN32
+	// There does not seem to be a real standard for indicating that the clipboard
+	// contains a rectangular selection, so copy Developer Studio.
+	cfColumnSelect = static_cast<CLIPFORMAT>(
+				 ::RegisterClipboardFormatW(L"MSDEVColumnSelect"));
+
+	// Get intellimouse parameters when running on win32; otherwise use
+	// reasonable default
+#ifndef SPI_GETWHEELSCROLLLINES
+#define SPI_GETWHEELSCROLLLINES   104
+#endif
+	::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &linesPerScroll, 0);
+#else
+	linesPerScroll = 4;
+#endif
+	primarySelection = false;
+
+	Init();
+}
+
+ScintillaGTK::~ScintillaGTK() {
+	if (styleIdleID) {
+		g_source_remove(styleIdleID);
+		styleIdleID = 0;
+	}
+	if (evbtn) {
+		gdk_event_free(evbtn);
+		evbtn = nullptr;
+	}
+	ClearPrimarySelection();
+	wPreedit.Destroy();
+}
+
+void ScintillaGTK::RealizeThis(GtkWidget *widget) {
+	//Platform::DebugPrintf("ScintillaGTK::realize this\n");
+	gtk_widget_set_realized(widget, TRUE);
+	GdkWindowAttr attrs {};
+	attrs.window_type = GDK_WINDOW_CHILD;
+	GtkAllocation allocation;
+	gtk_widget_get_allocation(widget, &allocation);
+	attrs.x = allocation.x;
+	attrs.y = allocation.y;
+	attrs.width = allocation.width;
+	attrs.height = allocation.height;
+	attrs.wclass = GDK_INPUT_OUTPUT;
+	attrs.visual = gtk_widget_get_visual(widget);
+#if !GTK_CHECK_VERSION(3,0,0)
+	attrs.colormap = gtk_widget_get_colormap(widget);
+#endif
+	attrs.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK;
+	GdkDisplay *pdisplay = gtk_widget_get_display(widget);
+	GdkCursor *cursor = gdk_cursor_new_for_display(pdisplay, GDK_XTERM);
+	attrs.cursor = cursor;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
+			      GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_CURSOR));
+#if GTK_CHECK_VERSION(3,8,0)
+	gtk_widget_register_window(widget, gtk_widget_get_window(widget));
+#else
+	gdk_window_set_user_data(gtk_widget_get_window(widget), widget);
+#endif
+#if !GTK_CHECK_VERSION(3,18,0)
+	gtk_style_context_set_background(gtk_widget_get_style_context(widget),
+					 gtk_widget_get_window(widget));
+#endif
+	gdk_window_show(gtk_widget_get_window(widget));
+	UnRefCursor(cursor);
+#else
+	widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attrs,
+					GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR);
+	gdk_window_set_user_data(widget->window, widget);
+	widget->style = gtk_style_attach(widget->style, widget->window);
+	gdk_window_set_background(widget->window, &widget->style->bg[GTK_STATE_NORMAL]);
+	gdk_window_show(widget->window);
+	UnRefCursor(cursor);
+#endif
+
+	preeditInitialized = false;
+	gtk_widget_realize(PWidget(wPreedit));
+	gtk_widget_realize(PWidget(wPreeditDraw));
+
+	im_context = gtk_im_multicontext_new();
+	g_signal_connect(G_OBJECT(im_context), "commit",
+			 G_CALLBACK(Commit), this);
+	g_signal_connect(G_OBJECT(im_context), "preedit_changed",
+			 G_CALLBACK(PreeditChanged), this);
+	gtk_im_context_set_client_window(im_context, WindowFromWidget(widget));
+
+	GtkWidget *widtxt = PWidget(wText);	//	// No code inside the G_OBJECT macro
+	g_signal_connect_after(G_OBJECT(widtxt), "style_set",
+			       G_CALLBACK(ScintillaGTK::StyleSetText), nullptr);
+	g_signal_connect_after(G_OBJECT(widtxt), "realize",
+			       G_CALLBACK(ScintillaGTK::RealizeText), nullptr);
+	gtk_widget_realize(widtxt);
+	gtk_widget_realize(PWidget(scrollbarv));
+	gtk_widget_realize(PWidget(scrollbarh));
+
+	cursor = gdk_cursor_new_for_display(pdisplay, GDK_XTERM);
+	gdk_window_set_cursor(PWindow(wText), cursor);
+	UnRefCursor(cursor);
+
+	cursor = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
+	gdk_window_set_cursor(PWindow(scrollbarv), cursor);
+	UnRefCursor(cursor);
+
+	cursor = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR);
+	gdk_window_set_cursor(PWindow(scrollbarh), cursor);
+	UnRefCursor(cursor);
+}
+
+void ScintillaGTK::Realize(GtkWidget *widget) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	sciThis->RealizeThis(widget);
+}
+
+void ScintillaGTK::UnRealizeThis(GtkWidget *widget) {
+	try {
+		if (IS_WIDGET_MAPPED(widget)) {
+			gtk_widget_unmap(widget);
+		}
+		gtk_widget_set_realized(widget, FALSE);
+		gtk_widget_unrealize(PWidget(wText));
+		if (PWidget(scrollbarv))
+			gtk_widget_unrealize(PWidget(scrollbarv));
+		if (PWidget(scrollbarh))
+			gtk_widget_unrealize(PWidget(scrollbarh));
+		gtk_widget_unrealize(PWidget(wPreedit));
+		gtk_widget_unrealize(PWidget(wPreeditDraw));
+		g_object_unref(im_context);
+		im_context = nullptr;
+		if (GTK_WIDGET_CLASS(parentClass)->unrealize)
+			GTK_WIDGET_CLASS(parentClass)->unrealize(widget);
+
+		Finalise();
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::UnRealize(GtkWidget *widget) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	sciThis->UnRealizeThis(widget);
+}
+
+void ScintillaGTK::MapThis() {
+	try {
+		//Platform::DebugPrintf("ScintillaGTK::map this\n");
+		gtk_widget_set_mapped(PWidget(wMain), TRUE);
+		MapWidget(PWidget(wText));
+		MapWidget(PWidget(scrollbarh));
+		MapWidget(PWidget(scrollbarv));
+		wMain.SetCursor(Window::Cursor::arrow);
+		scrollbarv.SetCursor(Window::Cursor::arrow);
+		scrollbarh.SetCursor(Window::Cursor::arrow);
+		ChangeSize();
+		gdk_window_show(PWindow(wMain));
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::Map(GtkWidget *widget) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	sciThis->MapThis();
+}
+
+void ScintillaGTK::UnMapThis() {
+	try {
+		//Platform::DebugPrintf("ScintillaGTK::unmap this\n");
+		gtk_widget_set_mapped(PWidget(wMain), FALSE);
+		DropGraphics();
+		gdk_window_hide(PWindow(wMain));
+		gtk_widget_unmap(PWidget(wText));
+		if (PWidget(scrollbarh))
+			gtk_widget_unmap(PWidget(scrollbarh));
+		if (PWidget(scrollbarv))
+			gtk_widget_unmap(PWidget(scrollbarv));
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::UnMap(GtkWidget *widget) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	sciThis->UnMapThis();
+}
+
+void ScintillaGTK::ForAll(GtkCallback callback, gpointer callback_data) {
+	try {
+		(*callback)(PWidget(wText), callback_data);
+		if (PWidget(scrollbarv))
+			(*callback)(PWidget(scrollbarv), callback_data);
+		if (PWidget(scrollbarh))
+			(*callback)(PWidget(scrollbarh), callback_data);
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data) {
+	ScintillaGTK *sciThis = FromWidget(GTK_WIDGET(container));
+
+	if (callback && include_internals) {
+		sciThis->ForAll(callback, callback_data);
+	}
+}
+
+namespace {
+
+class PreEditString {
+public:
+	gchar *str;
+	gint cursor_pos;
+	PangoAttrList *attrs;
+	gboolean validUTF8;
+	glong uniStrLen;
+	gunichar *uniStr;
+	GUnicodeScript pscript;
+
+	explicit PreEditString(GtkIMContext *im_context) noexcept {
+		gtk_im_context_get_preedit_string(im_context, &str, &attrs, &cursor_pos);
+		validUTF8 = g_utf8_validate(str, strlen(str), nullptr);
+		uniStr = g_utf8_to_ucs4_fast(str, static_cast<glong>(strlen(str)), &uniStrLen);
+		pscript = g_unichar_get_script(uniStr[0]);
+	}
+	// Deleted so PreEditString objects can not be copied.
+	PreEditString(const PreEditString&) = delete;
+	PreEditString(PreEditString&&) = delete;
+	PreEditString&operator=(const PreEditString&) = delete;
+	PreEditString&operator=(PreEditString&&) = delete;
+	~PreEditString() {
+		g_free(str);
+		g_free(uniStr);
+		pango_attr_list_unref(attrs);
+	}
+};
+
+}
+
+gint ScintillaGTK::FocusInThis(GtkWidget *) {
+	try {
+		SetFocusState(true);
+
+		if (im_context) {
+			gtk_im_context_focus_in(im_context);
+			PreEditString pes(im_context);
+			if (PWidget(wPreedit)) {
+				if (!preeditInitialized) {
+					GtkWidget *top = gtk_widget_get_toplevel(PWidget(wMain));
+					gtk_window_set_transient_for(GTK_WINDOW(PWidget(wPreedit)), GTK_WINDOW(top));
+					preeditInitialized = true;
+				}
+
+				if (strlen(pes.str) > 0) {
+					gtk_widget_show(PWidget(wPreedit));
+				} else {
+					gtk_widget_hide(PWidget(wPreedit));
+				}
+			}
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gint ScintillaGTK::FocusIn(GtkWidget *widget, GdkEventFocus * /*event*/) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->FocusInThis(widget);
+}
+
+gint ScintillaGTK::FocusOutThis(GtkWidget *) {
+	try {
+		SetFocusState(false);
+
+		if (PWidget(wPreedit))
+			gtk_widget_hide(PWidget(wPreedit));
+		if (im_context)
+			gtk_im_context_focus_out(im_context);
+
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gint ScintillaGTK::FocusOut(GtkWidget *widget, GdkEventFocus * /*event*/) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->FocusOutThis(widget);
+}
+
+void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	requisition->width = 1;
+	requisition->height = 1;
+	GtkRequisition child_requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarh), nullptr, &child_requisition);
+	gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarv), nullptr, &child_requisition);
+#else
+	gtk_widget_size_request(PWidget(sciThis->scrollbarh), &child_requisition);
+	gtk_widget_size_request(PWidget(sciThis->scrollbarv), &child_requisition);
+#endif
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+void ScintillaGTK::GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth) {
+	GtkRequisition requisition;
+	SizeRequest(widget, &requisition);
+	*minimalWidth = *naturalWidth = requisition.width;
+}
+
+void ScintillaGTK::GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight) {
+	GtkRequisition requisition;
+	SizeRequest(widget, &requisition);
+	*minimalHeight = *naturalHeight = requisition.height;
+}
+
+#endif
+
+void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		gtk_widget_set_allocation(widget, allocation);
+		if (IS_WIDGET_REALIZED(widget))
+			gdk_window_move_resize(WindowFromWidget(widget),
+					       allocation->x,
+					       allocation->y,
+					       allocation->width,
+					       allocation->height);
+
+		sciThis->Resize(allocation->width, allocation->height);
+
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::Init() {
+	parentClass = static_cast<GtkWidgetClass *>(
+			      g_type_class_ref(gtk_container_get_type()));
+
+	gint maskSmooth = 0;
+#if defined(GDK_WINDOWING_WAYLAND)
+	GdkDisplay *pdisplay = gdk_display_get_default();
+	if (GDK_IS_WAYLAND_DISPLAY(pdisplay)) {
+		// On Wayland, touch pads only produce smooth scroll events
+		maskSmooth = GDK_SMOOTH_SCROLL_MASK;
+	}
+#endif
+
+	gtk_widget_set_can_focus(PWidget(wMain), TRUE);
+	gtk_widget_set_sensitive(PWidget(wMain), TRUE);
+	gtk_widget_set_events(PWidget(wMain),
+			      GDK_EXPOSURE_MASK
+			      | GDK_SCROLL_MASK
+			      | maskSmooth
+			      | GDK_STRUCTURE_MASK
+			      | GDK_KEY_PRESS_MASK
+			      | GDK_KEY_RELEASE_MASK
+			      | GDK_FOCUS_CHANGE_MASK
+			      | GDK_LEAVE_NOTIFY_MASK
+			      | GDK_BUTTON_PRESS_MASK
+			      | GDK_BUTTON_RELEASE_MASK
+			      | GDK_POINTER_MOTION_MASK
+			      | GDK_POINTER_MOTION_HINT_MASK);
+
+	wText = gtk_drawing_area_new();
+	gtk_widget_set_parent(PWidget(wText), PWidget(wMain));
+	GtkWidget *widtxt = PWidget(wText);	// No code inside the G_OBJECT macro
+	gtk_widget_show(widtxt);
+#if GTK_CHECK_VERSION(3,0,0)
+	g_signal_connect(G_OBJECT(widtxt), "draw",
+			 G_CALLBACK(ScintillaGTK::DrawText), this);
+#else
+	g_signal_connect(G_OBJECT(widtxt), "expose_event",
+			 G_CALLBACK(ScintillaGTK::ExposeText), this);
+#endif
+#if GTK_CHECK_VERSION(3,0,0)
+	// we need a runtime check because we don't want double buffering when
+	// running on >= 3.9.2
+	if (gtk_check_version(3, 9, 2) != nullptr /* on < 3.9.2 */)
+#endif
+	{
+#if !GTK_CHECK_VERSION(3,14,0)
+		// Avoid background drawing flash/missing redraws
+		gtk_widget_set_double_buffered(widtxt, FALSE);
+#endif
+	}
+	gtk_widget_set_events(widtxt, GDK_EXPOSURE_MASK);
+	gtk_widget_set_size_request(widtxt, 100, 100);
+	adjustmentv = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0));
+#if GTK_CHECK_VERSION(3,0,0)
+	scrollbarv = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT(adjustmentv));
+#else
+	scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv));
+#endif
+	gtk_widget_set_can_focus(PWidget(scrollbarv), FALSE);
+	g_signal_connect(G_OBJECT(adjustmentv), "value_changed",
+			 G_CALLBACK(ScrollSignal), this);
+	gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain));
+	gtk_widget_show(PWidget(scrollbarv));
+
+	adjustmenth = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0));
+#if GTK_CHECK_VERSION(3,0,0)
+	scrollbarh = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT(adjustmenth));
+#else
+	scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth));
+#endif
+	gtk_widget_set_can_focus(PWidget(scrollbarh), FALSE);
+	g_signal_connect(G_OBJECT(adjustmenth), "value_changed",
+			 G_CALLBACK(ScrollHSignal), this);
+	gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain));
+	gtk_widget_show(PWidget(scrollbarh));
+
+	gtk_widget_grab_focus(PWidget(wMain));
+
+	gtk_drag_dest_set(GTK_WIDGET(PWidget(wMain)),
+			  GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets,
+			  actionCopyOrMove);
+
+	/* create pre-edit window */
+	wPreedit = gtk_window_new(GTK_WINDOW_POPUP);
+	wPreeditDraw = gtk_drawing_area_new();
+	GtkWidget *predrw = PWidget(wPreeditDraw);      // No code inside the G_OBJECT macro
+#if GTK_CHECK_VERSION(3,0,0)
+	g_signal_connect(G_OBJECT(predrw), "draw",
+			 G_CALLBACK(DrawPreedit), this);
+#else
+	g_signal_connect(G_OBJECT(predrw), "expose_event",
+			 G_CALLBACK(ExposePreedit), this);
+#endif
+	gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), predrw);
+	gtk_widget_show(predrw);
+
+	// Set caret period based on GTK settings
+	gboolean blinkOn = false;
+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(
+			G_OBJECT(gtk_settings_get_default())), "gtk-cursor-blink")) {
+		g_object_get(G_OBJECT(
+				     gtk_settings_get_default()), "gtk-cursor-blink", &blinkOn, nullptr);
+	}
+	if (blinkOn &&
+			g_object_class_find_property(G_OBJECT_GET_CLASS(
+						G_OBJECT(gtk_settings_get_default())), "gtk-cursor-blink-time")) {
+		gint value;
+		g_object_get(G_OBJECT(
+				     gtk_settings_get_default()), "gtk-cursor-blink-time", &value, nullptr);
+		caret.period = static_cast<int>(value / 1.75);
+	} else {
+		caret.period = 0;
+	}
+
+	for (size_t tr = static_cast<size_t>(TickReason::caret); tr <= static_cast<size_t>(TickReason::dwell); tr++) {
+		timers[tr].reason = static_cast<TickReason>(tr);
+		timers[tr].scintilla = this;
+	}
+	vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(IndicatorStyle::Hidden, ColourRGBA(0, 0, 0xff));
+	vs.indicators[SC_INDICATOR_INPUT] = Indicator(IndicatorStyle::Dots, ColourRGBA(0, 0, 0xff));
+	vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(IndicatorStyle::CompositionThick, ColourRGBA(0, 0, 0xff));
+	vs.indicators[SC_INDICATOR_TARGET] = Indicator(IndicatorStyle::StraightBox, ColourRGBA(0, 0, 0xff));
+
+	fontOptionsPrevious = FontOptions(PWidget(wText));
+}
+
+void ScintillaGTK::Finalise() {
+	for (size_t tr = static_cast<size_t>(TickReason::caret); tr <= static_cast<size_t>(TickReason::dwell); tr++) {
+		FineTickerCancel(static_cast<TickReason>(tr));
+	}
+	if (accessible) {
+		gtk_accessible_set_widget(GTK_ACCESSIBLE(accessible), nullptr);
+		g_object_unref(accessible);
+		accessible = nullptr;
+	}
+
+	ScintillaBase::Finalise();
+}
+
+bool ScintillaGTK::AbandonPaint() {
+	if ((paintState == PaintState::painting) && !paintingAllText) {
+		repaintFullWindow = true;
+	}
+	return false;
+}
+
+void ScintillaGTK::DisplayCursor(Window::Cursor c) {
+	if (cursorMode == CursorShape::Normal)
+		wText.SetCursor(c);
+	else
+		wText.SetCursor(static_cast<Window::Cursor>(cursorMode));
+}
+
+bool ScintillaGTK::DragThreshold(Point ptStart, Point ptNow) {
+	return gtk_drag_check_threshold(GTK_WIDGET(PWidget(wMain)),
+		static_cast<gint>(ptStart.x), static_cast<gint>(ptStart.y),
+		static_cast<gint>(ptNow.x), static_cast<gint>(ptNow.y));
+}
+
+void ScintillaGTK::StartDrag() {
+	PLATFORM_ASSERT(evbtn);
+	dragWasDropped = false;
+	inDragDrop = DragDrop::dragging;
+	GtkTargetList *tl = gtk_target_list_new(clipboardCopyTargets, nClipboardCopyTargets);
+#if GTK_CHECK_VERSION(3,10,0)
+	gtk_drag_begin_with_coordinates(GTK_WIDGET(PWidget(wMain)),
+					tl,
+					actionCopyOrMove,
+					buttonMouse,
+					evbtn,
+					-1, -1);
+#else
+	gtk_drag_begin(GTK_WIDGET(PWidget(wMain)),
+		       tl,
+		       actionCopyOrMove,
+		       buttonMouse,
+		       evbtn);
+#endif
+}
+
+namespace Scintilla::Internal {
+
+std::string ConvertText(const char *s, size_t len, const char *charSetDest,
+			const char *charSetSource, bool transliterations, bool silent) {
+	// s is not const because of different versions of iconv disagreeing about const
+	std::string destForm;
+	Converter conv(charSetDest, charSetSource, transliterations);
+	if (conv) {
+		gsize outLeft = len*3+1;
+		destForm = std::string(outLeft, '\0');
+		// g_iconv does not actually write to its input argument so safe to cast away const
+		char *pin = const_cast<char *>(s);
+		gsize inLeft = len;
+		char *putf = &destForm[0];
+		char *pout = putf;
+		const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft);
+		if (conversions == sizeFailure) {
+			if (!silent) {
+				if (len == 1)
+					fprintf(stderr, "iconv %s->%s failed for %0x '%s'\n",
+						charSetSource, charSetDest, static_cast<unsigned char>(*s), s);
+				else
+					fprintf(stderr, "iconv %s->%s failed for %s\n",
+						charSetSource, charSetDest, s);
+			}
+			destForm = std::string();
+		} else {
+			destForm.resize(pout - putf);
+		}
+	} else {
+		fprintf(stderr, "Can not iconv %s %s\n", charSetDest, charSetSource);
+	}
+	return destForm;
+}
+}
+
+// Returns the target converted to UTF8.
+// Return the length in bytes.
+Sci::Position ScintillaGTK::TargetAsUTF8(char *text) const {
+	const Sci::Position targetLength = targetRange.Length();
+	if (IsUnicodeMode()) {
+		if (text) {
+			pdoc->GetCharRange(text, targetRange.start.Position(), targetLength);
+		}
+	} else {
+		// Need to convert
+		const char *charSetBuffer = CharacterSetID();
+		if (*charSetBuffer) {
+			std::string s = RangeText(targetRange.start.Position(), targetRange.end.Position());
+			std::string tmputf = ConvertText(&s[0], targetLength, "UTF-8", charSetBuffer, false);
+			if (text) {
+				memcpy(text, tmputf.c_str(), tmputf.length());
+			}
+			return tmputf.length();
+		} else {
+			if (text) {
+				pdoc->GetCharRange(text, targetRange.start.Position(), targetLength);
+			}
+		}
+	}
+	return targetLength;
+}
+
+// Translates a nul terminated UTF8 string into the document encoding.
+// Return the length of the result in bytes.
+Sci::Position ScintillaGTK::EncodedFromUTF8(const char *utf8, char *encoded) const {
+	const Sci::Position inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8);
+	if (IsUnicodeMode()) {
+		if (encoded) {
+			memcpy(encoded, utf8, inputLength);
+		}
+		return inputLength;
+	} else {
+		// Need to convert
+		const char *charSetBuffer = CharacterSetID();
+		if (*charSetBuffer) {
+			std::string tmpEncoded = ConvertText(utf8, inputLength, charSetBuffer, "UTF-8", true);
+			if (encoded) {
+				memcpy(encoded, tmpEncoded.c_str(), tmpEncoded.length());
+			}
+			return tmpEncoded.length();
+		} else {
+			if (encoded) {
+				memcpy(encoded, utf8, inputLength);
+			}
+			return inputLength;
+		}
+	}
+	// Fail
+	return 0;
+}
+
+bool ScintillaGTK::ValidCodePage(int codePage) const {
+	return codePage == 0
+	       || codePage == SC_CP_UTF8
+	       || codePage == 932
+	       || codePage == 936
+	       || codePage == 949
+	       || codePage == 950
+	       || codePage == 1361;
+}
+
+std::string ScintillaGTK::UTF8FromEncoded(std::string_view encoded) const {
+	if (IsUnicodeMode()) {
+		return std::string(encoded);
+	} else {
+		const char *charSetBuffer = CharacterSetID();
+		return ConvertText(encoded.data(), encoded.length(), "UTF-8", charSetBuffer, true);
+	}
+}
+
+std::string ScintillaGTK::EncodedFromUTF8(std::string_view utf8) const {
+	if (IsUnicodeMode()) {
+		return std::string(utf8);
+	} else {
+		const char *charSetBuffer = CharacterSetID();
+		return ConvertText(utf8.data(), utf8.length(), charSetBuffer, "UTF-8", true);
+	}
+}
+
+sptr_t ScintillaGTK::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	try {
+		switch (iMessage) {
+
+		case Message::GrabFocus:
+			gtk_widget_grab_focus(PWidget(wMain));
+			break;
+
+		case Message::GetDirectFunction:
+			return reinterpret_cast<sptr_t>(DirectFunction);
+
+		case Message::GetDirectStatusFunction:
+			return reinterpret_cast<sptr_t>(DirectStatusFunction);
+
+		case Message::GetDirectPointer:
+			return reinterpret_cast<sptr_t>(this);
+
+		case Message::TargetAsUTF8:
+			return TargetAsUTF8(CharPtrFromSPtr(lParam));
+
+		case Message::EncodedFromUTF8:
+			return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam),
+					       CharPtrFromSPtr(lParam));
+
+		case Message::SetRectangularSelectionModifier:
+			rectangularSelectionModifier = static_cast<int>(wParam);
+			break;
+
+		case Message::GetRectangularSelectionModifier:
+			return rectangularSelectionModifier;
+
+		case Message::SetReadOnly: {
+				const sptr_t ret = ScintillaBase::WndProc(iMessage, wParam, lParam);
+				if (accessible) {
+					ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible);
+					if (sciAccessible) {
+						sciAccessible->NotifyReadOnly();
+					}
+				}
+				return ret;
+			}
+
+		case Message::GetAccessibility:
+			return accessibilityEnabled;
+
+		case Message::SetAccessibility:
+			accessibilityEnabled = static_cast<int>(wParam);
+			if (accessible) {
+				ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible);
+				if (sciAccessible) {
+					sciAccessible->SetAccessibility(accessibilityEnabled);
+				}
+			}
+			break;
+
+		default:
+			return ScintillaBase::WndProc(iMessage, wParam, lParam);
+		}
+	} catch (std::bad_alloc &) {
+		errorStatus = Status::BadAlloc;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return 0;
+}
+
+sptr_t ScintillaGTK::DefWndProc(Message, uptr_t, sptr_t) {
+	return 0;
+}
+
+bool ScintillaGTK::FineTickerRunning(TickReason reason) {
+	return timers[static_cast<size_t>(reason)].timer != 0;
+}
+
+void ScintillaGTK::FineTickerStart(TickReason reason, int millis, int /* tolerance */) {
+	FineTickerCancel(reason);
+	const size_t reasonIndex = static_cast<size_t>(reason);
+	timers[reasonIndex].timer = gdk_threads_add_timeout(millis, TimeOut, &timers[reasonIndex]);
+}
+
+void ScintillaGTK::FineTickerCancel(TickReason reason) {
+	const size_t reasonIndex = static_cast<size_t>(reason);
+	if (timers[reasonIndex].timer) {
+		g_source_remove(timers[reasonIndex].timer);
+		timers[reasonIndex].timer = 0;
+	}
+}
+
+bool ScintillaGTK::SetIdle(bool on) {
+	if (on) {
+		// Start idler, if it's not running.
+		if (!idler.state) {
+			idler.state = true;
+			idler.idlerID = GUINT_TO_POINTER(
+						gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE, IdleCallback, this, nullptr));
+		}
+	} else {
+		// Stop idler, if it's running
+		if (idler.state) {
+			idler.state = false;
+			g_source_remove(GPOINTER_TO_UINT(idler.idlerID));
+		}
+	}
+	return true;
+}
+
+void ScintillaGTK::SetMouseCapture(bool on) {
+	if (mouseDownCaptures) {
+		if (on) {
+			gtk_grab_add(GTK_WIDGET(PWidget(wMain)));
+		} else {
+			gtk_grab_remove(GTK_WIDGET(PWidget(wMain)));
+		}
+	}
+	capturedMouse = on;
+}
+
+bool ScintillaGTK::HaveMouseCapture() {
+	return capturedMouse;
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+namespace {
+
+// Is crcTest completely in crcContainer?
+bool CRectContains(const cairo_rectangle_t &crcContainer, const cairo_rectangle_t &crcTest) {
+	return
+		(crcTest.x >= crcContainer.x) && ((crcTest.x + crcTest.width) <= (crcContainer.x + crcContainer.width)) &&
+		(crcTest.y >= crcContainer.y) && ((crcTest.y + crcTest.height) <= (crcContainer.y + crcContainer.height));
+}
+
+// Is crcTest completely in crcListContainer?
+// May incorrectly return false if complex shape
+bool CRectListContains(const cairo_rectangle_list_t *crcListContainer, const cairo_rectangle_t &crcTest) {
+	for (int r=0; r<crcListContainer->num_rectangles; r++) {
+		if (CRectContains(crcListContainer->rectangles[r], crcTest))
+			return true;
+	}
+	return false;
+}
+
+}
+
+#endif
+
+bool ScintillaGTK::PaintContains(PRectangle rc) {
+	// This allows optimization when a rectangle is completely in the update region.
+	// It is OK to return false when too difficult to determine as that just performs extra drawing
+	bool contains = true;
+	if (paintState == PaintState::painting) {
+		if (!rcPaint.Contains(rc)) {
+			contains = false;
+		} else if (rgnUpdate) {
+#if GTK_CHECK_VERSION(3,0,0)
+			cairo_rectangle_t grc = {rc.left, rc.top,
+						 rc.right - rc.left, rc.bottom - rc.top
+						};
+			contains = CRectListContains(rgnUpdate, grc);
+#else
+			GdkRectangle grc = {static_cast<gint>(rc.left), static_cast<gint>(rc.top),
+					    static_cast<gint>(rc.right - rc.left), static_cast<gint>(rc.bottom - rc.top)
+					   };
+			if (gdk_region_rect_in(rgnUpdate, &grc) != GDK_OVERLAP_RECTANGLE_IN) {
+				contains = false;
+			}
+#endif
+		}
+	}
+	return contains;
+}
+
+// Redraw all of text area. This paint will not be abandoned.
+void ScintillaGTK::FullPaint() {
+	wText.InvalidateAll();
+}
+
+PRectangle ScintillaGTK::GetClientRectangle() const {
+	PRectangle rc = wMain.GetClientPosition();
+	if (verticalScrollBarVisible)
+		rc.right -= verticalScrollBarWidth;
+	if (horizontalScrollBarVisible && !Wrapping())
+		rc.bottom -= horizontalScrollBarHeight;
+	// Move to origin
+	rc.right -= rc.left;
+	rc.bottom -= rc.top;
+	if (rc.bottom < 0)
+		rc.bottom = 0;
+	if (rc.right < 0)
+		rc.right = 0;
+	rc.left = 0;
+	rc.top = 0;
+	return rc;
+}
+
+void ScintillaGTK::ScrollText(Sci::Line linesToMove) {
+	NotifyUpdateUI();
+
+#if GTK_CHECK_VERSION(3,22,0)
+	Redraw();
+#else
+	GtkWidget *wi = PWidget(wText);
+	if (IS_WIDGET_REALIZED(wi)) {
+		const Sci::Line diff = vs.lineHeight * -linesToMove;
+		gdk_window_scroll(WindowFromWidget(wi), 0, static_cast<gint>(-diff));
+		gdk_window_process_updates(WindowFromWidget(wi), FALSE);
+	}
+#endif
+}
+
+void ScintillaGTK::SetVerticalScrollPos() {
+	DwellEnd(true);
+	gtk_adjustment_set_value(GTK_ADJUSTMENT(adjustmentv), static_cast<gdouble>(topLine));
+}
+
+void ScintillaGTK::SetHorizontalScrollPos() {
+	DwellEnd(true);
+	gtk_adjustment_set_value(GTK_ADJUSTMENT(adjustmenth), xOffset);
+}
+
+bool ScintillaGTK::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
+	bool modified = false;
+	const int pageScroll = static_cast<int>(LinesToScroll());
+
+	if (gtk_adjustment_get_upper(adjustmentv) != (nMax + 1) ||
+			gtk_adjustment_get_page_size(adjustmentv) != nPage ||
+			gtk_adjustment_get_page_increment(adjustmentv) != pageScroll) {
+		gtk_adjustment_set_upper(adjustmentv, nMax + 1.0);
+		gtk_adjustment_set_page_size(adjustmentv, static_cast<gdouble>(nPage));
+		gtk_adjustment_set_page_increment(adjustmentv, pageScroll);
+#if !GTK_CHECK_VERSION(3,18,0)
+		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmentv));
+#endif
+		modified = true;
+	}
+
+	const PRectangle rcText = GetTextRectangle();
+	int horizEndPreferred = scrollWidth;
+	if (horizEndPreferred < 0)
+		horizEndPreferred = 0;
+	const unsigned int pageWidth = static_cast<unsigned int>(rcText.Width());
+	const unsigned int pageIncrement = pageWidth / 3;
+	const unsigned int charWidth = static_cast<unsigned int>(vs.styles[STYLE_DEFAULT].aveCharWidth);
+	if (gtk_adjustment_get_upper(adjustmenth) != horizEndPreferred ||
+			gtk_adjustment_get_page_size(adjustmenth) != pageWidth ||
+			gtk_adjustment_get_page_increment(adjustmenth) != pageIncrement ||
+			gtk_adjustment_get_step_increment(adjustmenth) != charWidth) {
+		gtk_adjustment_set_upper(adjustmenth, horizEndPreferred);
+		gtk_adjustment_set_page_size(adjustmenth, pageWidth);
+		gtk_adjustment_set_page_increment(adjustmenth, pageIncrement);
+		gtk_adjustment_set_step_increment(adjustmenth, charWidth);
+#if !GTK_CHECK_VERSION(3,18,0)
+		gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth));
+#endif
+		modified = true;
+	}
+	if (modified && (paintState == PaintState::painting)) {
+		repaintFullWindow = true;
+	}
+
+	return modified;
+}
+
+void ScintillaGTK::ReconfigureScrollBars() {
+	const PRectangle rc = wMain.GetClientPosition();
+	Resize(static_cast<int>(rc.Width()), static_cast<int>(rc.Height()));
+}
+
+void ScintillaGTK::NotifyChange() {
+	g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0,
+		      Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain));
+}
+
+void ScintillaGTK::NotifyFocus(bool focus) {
+	if (commandEvents)
+		g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0,
+			      Platform::LongFromTwoShorts
+			      (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain));
+	Editor::NotifyFocus(focus);
+}
+
+void ScintillaGTK::NotifyParent(NotificationData scn) {
+	scn.nmhdr.hwndFrom = PWidget(wMain);
+	scn.nmhdr.idFrom = GetCtrlID();
+	g_signal_emit(G_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], 0,
+		      GetCtrlID(), &scn);
+}
+
+void ScintillaGTK::NotifyKey(Keys key, KeyMod modifiers) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::Key;
+	scn.ch = static_cast<int>(key);
+	scn.modifiers = modifiers;
+
+	NotifyParent(scn);
+}
+
+void ScintillaGTK::NotifyURIDropped(const char *list) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::URIDropped;
+	scn.text = list;
+
+	NotifyParent(scn);
+}
+
+const char *CharacterSetID(CharacterSet characterSet);
+
+const char *ScintillaGTK::CharacterSetID() const {
+	return ::CharacterSetID(vs.styles[STYLE_DEFAULT].characterSet);
+}
+
+class CaseFolderDBCS : public CaseFolderTable {
+	const char *charSet;
+public:
+	explicit CaseFolderDBCS(const char *charSet_) noexcept : charSet(charSet_) {
+		StandardASCII();
+	}
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
+		if ((lenMixed == 1) && (sizeFolded > 0)) {
+			folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
+			return 1;
+		} else if (*charSet) {
+			std::string sUTF8 = ConvertText(mixed, lenMixed,
+							"UTF-8", charSet, false);
+			if (!sUTF8.empty()) {
+				gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length());
+				size_t lenMapped = strlen(mapped);
+				if (lenMapped < sizeFolded) {
+					memcpy(folded, mapped,  lenMapped);
+				} else {
+					folded[0] = '\0';
+					lenMapped = 1;
+				}
+				g_free(mapped);
+				return lenMapped;
+			}
+		}
+		// Something failed so return a single NUL byte
+		folded[0] = '\0';
+		return 1;
+	}
+};
+
+std::unique_ptr<CaseFolder> ScintillaGTK::CaseFolderForEncoding() {
+	if (pdoc->dbcsCodePage == SC_CP_UTF8) {
+		return std::make_unique<CaseFolderUnicode>();
+	} else {
+		const char *charSetBuffer = CharacterSetID();
+		if (charSetBuffer) {
+			if (pdoc->dbcsCodePage == 0) {
+				std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>();
+				pcf->StandardASCII();
+				// Only for single byte encodings
+				for (int i=0x80; i<0x100; i++) {
+					char sCharacter[2] = "A";
+					sCharacter[0] = i;
+					// Silent as some bytes have no assigned character
+					std::string sUTF8 = ConvertText(sCharacter, 1,
+									"UTF-8", charSetBuffer, false, true);
+					if (!sUTF8.empty()) {
+						gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length());
+						if (mapped) {
+							std::string mappedBack = ConvertText(mapped, strlen(mapped),
+											     charSetBuffer, "UTF-8", false, true);
+							if ((mappedBack.length() == 1) && (mappedBack[0] != sCharacter[0])) {
+								pcf->SetTranslation(sCharacter[0], mappedBack[0]);
+							}
+							g_free(mapped);
+						}
+					}
+				}
+				return pcf;
+			} else {
+				return std::make_unique<CaseFolderDBCS>(charSetBuffer);
+			}
+		}
+		return nullptr;
+	}
+}
+
+namespace {
+
+struct CaseMapper {
+	gchar *mapped;	// Must be freed with g_free
+	CaseMapper(const std::string &sUTF8, bool toUpperCase) noexcept {
+		if (toUpperCase) {
+			mapped = g_utf8_strup(sUTF8.c_str(), sUTF8.length());
+		} else {
+			mapped = g_utf8_strdown(sUTF8.c_str(), sUTF8.length());
+		}
+	}
+	// Deleted so CaseMapper objects can not be copied.
+	CaseMapper(const CaseMapper&) = delete;
+	CaseMapper(CaseMapper&&) = delete;
+	CaseMapper&operator=(const CaseMapper&) = delete;
+	CaseMapper&operator=(CaseMapper&&) = delete;
+	~CaseMapper() noexcept {
+		g_free(mapped);
+	}
+};
+
+}
+
+std::string ScintillaGTK::CaseMapString(const std::string &s, CaseMapping caseMapping) {
+	if ((s.size() == 0) || (caseMapping == CaseMapping::same))
+		return s;
+
+	if (IsUnicodeMode()) {
+		std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
+		const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
+					 (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
+		retMapped.resize(lenMapped);
+		return retMapped;
+	}
+
+	const char *charSetBuffer = CharacterSetID();
+
+	if (!*charSetBuffer) {
+		CaseMapper mapper(s, caseMapping == CaseMapping::upper);
+		return std::string(mapper.mapped, strlen(mapper.mapped));
+	} else {
+		// Change text to UTF-8
+		std::string sUTF8 = ConvertText(s.c_str(), s.length(),
+						"UTF-8", charSetBuffer, false);
+		CaseMapper mapper(sUTF8, caseMapping == CaseMapping::upper);
+		return ConvertText(mapper.mapped, strlen(mapper.mapped), charSetBuffer, "UTF-8", false);
+	}
+}
+
+int ScintillaGTK::KeyDefault(Keys key, KeyMod modifiers) {
+	// Pass up to container in case it is an accelerator
+	NotifyKey(key, modifiers);
+	return 0;
+}
+
+void ScintillaGTK::CopyToClipboard(const SelectionText &selectedText) {
+	SelectionText *clipText = new SelectionText();
+	clipText->Copy(selectedText);
+	StoreOnClipboard(clipText);
+}
+
+void ScintillaGTK::Copy() {
+	if (!sel.Empty()) {
+		SelectionText *clipText = new SelectionText();
+		CopySelectionRange(clipText);
+		StoreOnClipboard(clipText);
+#if PLAT_GTK_WIN32
+		if (sel.IsRectangular()) {
+			::OpenClipboard(NULL);
+			::SetClipboardData(cfColumnSelect, 0);
+			::CloseClipboard();
+		}
+#endif
+	}
+}
+
+namespace {
+
+// Helper class for the asynchronous paste not to risk calling in a destroyed ScintillaGTK
+
+class SelectionReceiver : GObjectWatcher {
+	ScintillaGTK *sci;
+
+	void Destroyed() noexcept override {
+		sci = nullptr;
+	}
+
+public:
+	SelectionReceiver(ScintillaGTK *sci_) :
+		GObjectWatcher(G_OBJECT(sci_->MainObject())),
+		sci(sci_) {
+	}
+
+	static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) noexcept {
+		SelectionReceiver *self = static_cast<SelectionReceiver *>(data);
+		if (self->sci) {
+			self->sci->ReceivedClipboard(clipboard, selection_data);
+		}
+		delete self;
+	}
+};
+
+}
+
+void ScintillaGTK::RequestSelection(GdkAtom atomSelection) {
+	atomSought = atomUTF8;
+	GtkClipboard *clipBoard =
+		gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), atomSelection);
+	if (clipBoard) {
+		gtk_clipboard_request_contents(clipBoard, atomSought,
+					       SelectionReceiver::ClipboardReceived,
+					       new SelectionReceiver(this));
+	}
+}
+
+void ScintillaGTK::Paste() {
+	RequestSelection(GDK_SELECTION_CLIPBOARD);
+}
+
+void ScintillaGTK::CreateCallTipWindow(PRectangle rc) {
+	if (!ct.wCallTip.Created()) {
+		ct.wCallTip = gtk_window_new(GTK_WINDOW_POPUP);
+		ct.wDraw = gtk_drawing_area_new();
+		GtkWidget *widcdrw = PWidget(ct.wDraw);	//	// No code inside the G_OBJECT macro
+		gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw);
+#if GTK_CHECK_VERSION(3,0,0)
+		g_signal_connect(G_OBJECT(widcdrw), "draw",
+				 G_CALLBACK(ScintillaGTK::DrawCT), &ct);
+#else
+		g_signal_connect(G_OBJECT(widcdrw), "expose_event",
+				 G_CALLBACK(ScintillaGTK::ExposeCT), &ct);
+#endif
+		g_signal_connect(G_OBJECT(widcdrw), "button_press_event",
+				 G_CALLBACK(ScintillaGTK::PressCT), this);
+		gtk_widget_set_events(widcdrw,
+				      GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
+		GtkWidget *top = gtk_widget_get_toplevel(PWidget(wMain));
+		gtk_window_set_transient_for(GTK_WINDOW(PWidget(ct.wCallTip)), GTK_WINDOW(top));
+	}
+	const int width = static_cast<int>(rc.Width());
+	const int height = static_cast<int>(rc.Height());
+	gtk_widget_set_size_request(PWidget(ct.wDraw), width, height);
+	ct.wDraw.Show();
+	if (PWindow(ct.wCallTip)) {
+		gdk_window_resize(PWindow(ct.wCallTip), width, height);
+	}
+}
+
+void ScintillaGTK::AddToPopUp(const char *label, int cmd, bool enabled) {
+	GtkWidget *menuItem;
+	if (label[0])
+		menuItem = gtk_menu_item_new_with_label(label);
+	else
+		menuItem = gtk_separator_menu_item_new();
+	gtk_menu_shell_append(GTK_MENU_SHELL(popup.GetID()), menuItem);
+	g_object_set_data(G_OBJECT(menuItem), "CmdNum", GINT_TO_POINTER(cmd));
+	g_signal_connect(G_OBJECT(menuItem), "activate", G_CALLBACK(PopUpCB), this);
+
+	if (cmd) {
+		if (menuItem)
+			gtk_widget_set_sensitive(menuItem, enabled);
+	}
+}
+
+bool ScintillaGTK::OwnPrimarySelection() {
+	return primarySelection;
+}
+
+void ScintillaGTK::ClearPrimarySelection() {
+	if (primarySelection) {
+		inClearSelection++;
+		// Calls PrimaryClearSelection: primarySelection -> false
+		gtk_clipboard_clear(gtk_clipboard_get(GDK_SELECTION_PRIMARY));
+		inClearSelection--;
+	}
+}
+
+void ScintillaGTK::PrimaryGetSelectionThis(GtkClipboard *clip, GtkSelectionData *selection_data, guint info) {
+	try {
+		if (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY) {
+			if (primary.Empty()) {
+				CopySelectionRange(&primary);
+			}
+			GetSelection(selection_data, info, &primary);
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::PrimaryGetSelection(GtkClipboard *clip, GtkSelectionData *selection_data, guint info, gpointer pSci) {
+	static_cast<ScintillaGTK *>(pSci)->PrimaryGetSelectionThis(clip, selection_data, info);
+}
+
+void ScintillaGTK::PrimaryClearSelectionThis(GtkClipboard *clip) {
+	try {
+		primarySelection = false;
+		primary.Clear();
+		if (!inClearSelection) {
+			// Called because of another application or window claiming primary selection
+			// so redraw to show selection in secondary colour.
+			Redraw();
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::PrimaryClearSelection(GtkClipboard *clip, gpointer pSci) {
+	static_cast<ScintillaGTK *>(pSci)->PrimaryClearSelectionThis(clip);
+}
+
+void ScintillaGTK::ClaimSelection() {
+	// X Windows has a 'primary selection' as well as the clipboard.
+	// Whenever the user selects some text, we become the primary selection
+	ClearPrimarySelection();
+	if (!sel.Empty()) {
+		if (gtk_clipboard_set_with_data(
+			gtk_clipboard_get(GDK_SELECTION_PRIMARY),
+			clipboardCopyTargets, nClipboardCopyTargets,
+			PrimaryGetSelection,
+			PrimaryClearSelection,
+			this)) {
+			primarySelection = true;
+		}
+	}
+}
+
+bool ScintillaGTK::IsStringAtom(GdkAtom type) {
+	return (type == GDK_TARGET_STRING) || (type == atomUTF8) || (type == atomUTF8Mime);
+}
+
+// Detect rectangular text, convert line ends to current mode, convert from or to UTF-8
+void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText) {
+	const char *data = reinterpret_cast<const char *>(DataOfGSD(selectionData));
+	int len = LengthOfGSD(selectionData);
+	GdkAtom selectionTypeData = TypeOfGSD(selectionData);
+
+	// Return empty string if selection is not a string
+	if (!IsStringAtom(selectionTypeData)) {
+		selText.Clear();
+		return;
+	}
+
+	// Check for "\n\0" ending to string indicating that selection is rectangular
+	bool isRectangular;
+#if PLAT_GTK_WIN32
+	isRectangular = ::IsClipboardFormatAvailable(cfColumnSelect) != 0;
+#else
+	isRectangular = ((len > 2) && (data[len - 1] == 0 && data[len - 2] == '\n'));
+	if (isRectangular)
+		len--;	// Forget the extra '\0'
+#endif
+
+#if PLAT_GTK_WIN32
+	// Win32 includes an ending '\0' byte in 'len' for clipboard text from
+	// external applications; ignore it.
+	if ((len > 0) && (data[len - 1] == '\0'))
+		len--;
+#endif
+
+	std::string dest(data, len);
+	if (selectionTypeData == GDK_TARGET_STRING) {
+		if (IsUnicodeMode()) {
+			// Unknown encoding so assume in Latin1
+			dest = UTF8FromLatin1(dest);
+			selText.Copy(dest, CpUtf8, CharacterSet::Ansi, isRectangular, false);
+		} else {
+			// Assume buffer is in same encoding as selection
+			selText.Copy(dest, pdoc->dbcsCodePage,
+				     vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false);
+		}
+	} else {	// UTF-8
+		const char *charSetBuffer = CharacterSetID();
+		if (!IsUnicodeMode() && *charSetBuffer) {
+			// Convert to locale
+			dest = ConvertText(dest.c_str(), dest.length(), charSetBuffer, "UTF-8", true);
+			selText.Copy(dest, pdoc->dbcsCodePage,
+				     vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false);
+		} else {
+			selText.Copy(dest, CpUtf8, CharacterSet::Ansi, isRectangular, false);
+		}
+	}
+}
+
+void ScintillaGTK::InsertSelection(GtkClipboard *clipBoard, GtkSelectionData *selectionData) {
+	const gint length = gtk_selection_data_get_length(selectionData);
+	if (length >= 0) {
+		GdkAtom selection = gtk_selection_data_get_selection(selectionData);
+		SelectionText selText;
+		GetGtkSelectionText(selectionData, selText);
+
+		UndoGroup ug(pdoc);
+		if (selection == GDK_SELECTION_CLIPBOARD) {
+			ClearSelection(multiPasteMode == MultiPaste::Each);
+		}
+
+		InsertPasteShape(selText.Data(), selText.Length(),
+				 selText.rectangular ? PasteShape::rectangular : PasteShape::stream);
+		EnsureCaretVisible();
+	} else {
+		GdkAtom target = gtk_selection_data_get_target(selectionData);
+		if (target == atomUTF8) {
+			// In case data is actually only stored as text/plain;charset=utf-8 not UTF8_STRING
+			gtk_clipboard_request_contents(clipBoard, atomUTF8Mime,
+					 SelectionReceiver::ClipboardReceived,
+					 new SelectionReceiver(this)
+			);
+		}
+	}
+	Redraw();
+}
+
+GObject *ScintillaGTK::MainObject() const noexcept {
+	return G_OBJECT(PWidget(wMain));
+}
+
+void ScintillaGTK::ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept {
+	try {
+		InsertSelection(clipBoard, selection_data);
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) {
+	try {
+		if ((SelectionOfGSD(selection_data) == GDK_SELECTION_CLIPBOARD) ||
+				(SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY)) {
+			if ((atomSought == atomUTF8) && (LengthOfGSD(selection_data) <= 0)) {
+				atomSought = atomString;
+				gtk_selection_convert(GTK_WIDGET(PWidget(wMain)),
+						      SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME);
+			} else if ((LengthOfGSD(selection_data) > 0) && IsStringAtom(TypeOfGSD(selection_data))) {
+				GtkClipboard *clipBoard = gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), SelectionOfGSD(selection_data));
+				InsertSelection(clipBoard, selection_data);
+			}
+		}
+//	else fprintf(stderr, "Target non string %d %d\n", (int)(selection_data->type),
+//		(int)(atomUTF8));
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) {
+	dragWasDropped = true;
+	if (TypeOfGSD(selection_data) == atomUriList || TypeOfGSD(selection_data) == atomDROPFILES_DND) {
+		const char *data = reinterpret_cast<const char *>(DataOfGSD(selection_data));
+		std::vector<char> drop(data, data + LengthOfGSD(selection_data));
+		drop.push_back('\0');
+		NotifyURIDropped(&drop[0]);
+	} else if (IsStringAtom(TypeOfGSD(selection_data))) {
+		if (LengthOfGSD(selection_data) > 0) {
+			SelectionText selText;
+			GetGtkSelectionText(selection_data, selText);
+			DropAt(posDrop, selText.Data(), selText.Length(), false, selText.rectangular);
+		}
+	} else if (LengthOfGSD(selection_data) > 0) {
+		//~ fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type));
+	}
+	Redraw();
+}
+
+
+
+void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text) {
+#if PLAT_GTK_WIN32
+	// GDK on Win32 expands any \n into \r\n, so make a copy of
+	// the clip text now with newlines converted to \n.  Use { } to hide symbols
+	// from code below
+	std::unique_ptr<SelectionText> newline_normalized;
+	{
+		std::string tmpstr = Document::TransformLineEnds(text->Data(), text->Length(), EndOfLine::Lf);
+		newline_normalized.reset(new SelectionText());
+		newline_normalized->Copy(tmpstr, CpUtf8, CharacterSet::Ansi, text->rectangular, false);
+		text = newline_normalized.get();
+	}
+#endif
+
+	// Convert text to utf8 if it isn't already
+	std::unique_ptr<SelectionText> converted;
+	if ((text->codePage != SC_CP_UTF8) && (info == TARGET_UTF8_STRING)) {
+		const char *charSet = ::CharacterSetID(text->characterSet);
+		if (*charSet) {
+			std::string tmputf = ConvertText(text->Data(), text->Length(), "UTF-8", charSet, false);
+			converted = std::make_unique<SelectionText>();
+			converted->Copy(tmputf, CpUtf8, CharacterSet::Ansi, text->rectangular, false);
+			text = converted.get();
+		}
+	}
+
+	// Here is a somewhat evil kludge.
+	// As I can not work out how to store data on the clipboard in multiple formats
+	// and need some way to mark the clipping as being stream or rectangular,
+	// the terminating \0 is included in the length for rectangular clippings.
+	// All other tested applications behave benignly by ignoring the \0.
+	// The #if is here because on Windows cfColumnSelect clip entry is used
+	// instead as standard indicator of rectangularness (so no need to kludge)
+	const char *textData = text->Data();
+	gint len = static_cast<gint>(text->Length());
+#if PLAT_GTK_WIN32 == 0
+	if (text->rectangular)
+		len++;
+#endif
+
+	if (info == TARGET_UTF8_STRING) {
+		gtk_selection_data_set_text(selection_data, textData, len);
+	} else {
+		gtk_selection_data_set(selection_data,
+				       static_cast<GdkAtom>(GDK_SELECTION_TYPE_STRING),
+				       8, reinterpret_cast<const guchar *>(textData), len);
+	}
+}
+
+void ScintillaGTK::StoreOnClipboard(SelectionText *clipText) {
+	GtkClipboard *clipBoard =
+		gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_CLIPBOARD);
+	if (clipBoard == nullptr) // Occurs if widget isn't in a toplevel
+		return;
+
+	if (gtk_clipboard_set_with_data(clipBoard, clipboardCopyTargets, nClipboardCopyTargets,
+					ClipboardGetSelection, ClipboardClearSelection, clipText)) {
+		gtk_clipboard_set_can_store(clipBoard, clipboardCopyTargets, nClipboardCopyTargets);
+	}
+}
+
+void ScintillaGTK::ClipboardGetSelection(GtkClipboard *, GtkSelectionData *selection_data, guint info, void *data) {
+	GetSelection(selection_data, info, static_cast<SelectionText *>(data));
+}
+
+void ScintillaGTK::ClipboardClearSelection(GtkClipboard *, void *data) {
+	SelectionText *obj = static_cast<SelectionText *>(data);
+	delete obj;
+}
+
+void ScintillaGTK::UnclaimSelection(GdkEventSelection *selection_event) {
+	try {
+		//Platform::DebugPrintf("UnclaimSelection\n");
+		if (selection_event->selection == GDK_SELECTION_PRIMARY) {
+			//Platform::DebugPrintf("UnclaimPrimarySelection\n");
+			if (!OwnPrimarySelection()) {
+				primary.Clear();
+				primarySelection = false;
+				FullPaint();
+			}
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::Resize(int width, int height) {
+	//Platform::DebugPrintf("Resize %d %d\n", width, height);
+	//printf("Resize %d %d\n", width, height);
+
+	// GTK+ 3 warns when we allocate smaller than the minimum allocation,
+	// so we use these variables to store the minimum scrollbar lengths.
+	int minVScrollBarHeight, minHScrollBarWidth;
+
+	// Not always needed, but some themes can have different sizes of scrollbars
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkRequisition minimum, requisition;
+	gtk_widget_get_preferred_size(PWidget(scrollbarv), &minimum, &requisition);
+	minVScrollBarHeight = minimum.height;
+	verticalScrollBarWidth = requisition.width;
+	gtk_widget_get_preferred_size(PWidget(scrollbarh), &minimum, &requisition);
+	minHScrollBarWidth = minimum.width;
+	horizontalScrollBarHeight = requisition.height;
+#else
+	minVScrollBarHeight = minHScrollBarWidth = 1;
+	verticalScrollBarWidth = GTK_WIDGET(PWidget(scrollbarv))->requisition.width;
+	horizontalScrollBarHeight = GTK_WIDGET(PWidget(scrollbarh))->requisition.height;
+#endif
+
+	// These allocations should never produce negative sizes as they would wrap around to huge
+	// unsigned numbers inside GTK+ causing warnings.
+	const bool showSBHorizontal = horizontalScrollBarVisible && !Wrapping();
+
+	GtkAllocation alloc = {};
+	if (showSBHorizontal) {
+		gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh)));
+		alloc.x = 0;
+		alloc.y = height - horizontalScrollBarHeight;
+		alloc.width = std::max(minHScrollBarWidth, width - verticalScrollBarWidth);
+		alloc.height = horizontalScrollBarHeight;
+		gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarh)), &alloc);
+	} else {
+		gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarh)));
+		horizontalScrollBarHeight = 0; // in case horizontalScrollBarVisible is true.
+	}
+
+	if (verticalScrollBarVisible) {
+		gtk_widget_show(GTK_WIDGET(PWidget(scrollbarv)));
+		alloc.x = width - verticalScrollBarWidth;
+		alloc.y = 0;
+		alloc.width = verticalScrollBarWidth;
+		alloc.height = std::max(minVScrollBarHeight, height - horizontalScrollBarHeight);
+		gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarv)), &alloc);
+	} else {
+		gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarv)));
+		verticalScrollBarWidth = 0;
+	}
+	if (IS_WIDGET_MAPPED(PWidget(wMain))) {
+		ChangeSize();
+	}
+
+	alloc.x = 0;
+	alloc.y = 0;
+	alloc.width = 1;
+	alloc.height = 1;
+#if GTK_CHECK_VERSION(3, 0, 0)
+	// please GTK 3.20 and ask wText what size it wants, although we know it doesn't really need
+	// anything special as it's ours.
+	gtk_widget_get_preferred_size(PWidget(wText), &requisition, nullptr);
+	alloc.width = requisition.width;
+	alloc.height = requisition.height;
+#endif
+	alloc.width = std::max(alloc.width, width - verticalScrollBarWidth);
+	alloc.height = std::max(alloc.height, height - horizontalScrollBarHeight);
+	gtk_widget_size_allocate(GTK_WIDGET(PWidget(wText)), &alloc);
+}
+
+namespace {
+
+void SetAdjustmentValue(GtkAdjustment *object, int value) noexcept {
+	GtkAdjustment *adjustment = GTK_ADJUSTMENT(object);
+	const int maxValue = static_cast<int>(
+				     gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment));
+
+	if (value > maxValue)
+		value = maxValue;
+	if (value < 0)
+		value = 0;
+	gtk_adjustment_set_value(adjustment, value);
+}
+
+int modifierTranslated(int sciModifier) noexcept {
+	switch (sciModifier) {
+	case SCMOD_SHIFT:
+		return GDK_SHIFT_MASK;
+	case SCMOD_CTRL:
+		return GDK_CONTROL_MASK;
+	case SCMOD_ALT:
+		return GDK_MOD1_MASK;
+	case SCMOD_SUPER:
+		return GDK_MOD4_MASK;
+	default:
+		return 0;
+	}
+}
+
+Point PointOfEvent(const GdkEventButton *event) noexcept {
+	// Use floor as want to round in the same direction (-infinity) so
+	// there is no stickiness crossing 0.0.
+	return Point(static_cast<XYPOSITION>(std::floor(event->x)), static_cast<XYPOSITION>(std::floor(event->y)));
+}
+
+}
+
+gint ScintillaGTK::PressThis(GdkEventButton *event) {
+	try {
+		//Platform::DebugPrintf("Press %x time=%d state = %x button = %x\n",this,event->time, event->state, event->button);
+		// Do not use GTK+ double click events as Scintilla has its own double click detection
+		if (event->type != GDK_BUTTON_PRESS)
+			return FALSE;
+
+		if (evbtn) {
+			gdk_event_free(evbtn);
+		}
+		evbtn = gdk_event_copy(reinterpret_cast<GdkEvent *>(event));
+		buttonMouse = event->button;
+		const Point pt = PointOfEvent(event);
+		const PRectangle rcClient = GetClientRectangle();
+		//Platform::DebugPrintf("Press %0d,%0d in %0d,%0d %0d,%0d\n",
+		//	pt.x, pt.y, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
+		if ((pt.x > rcClient.right) || (pt.y > rcClient.bottom)) {
+			Platform::DebugPrintf("Bad location\n");
+			return FALSE;
+		}
+
+		const bool shift = (event->state & GDK_SHIFT_MASK) != 0;
+		bool ctrl = (event->state & GDK_CONTROL_MASK) != 0;
+		// On X, instead of sending literal modifiers use the user specified
+		// modifier, defaulting to control instead of alt.
+		// This is because most X window managers grab alt + click for moving
+		const bool alt = (event->state & modifierTranslated(rectangularSelectionModifier)) != 0;
+
+		gtk_widget_grab_focus(PWidget(wMain));
+		if (event->button == 1) {
+#if PLAT_GTK_MACOSX
+			const bool meta = ctrl;
+			// GDK reports the Command modifier key as GDK_MOD2_MASK for button events,
+			// not GDK_META_MASK like in key events.
+			ctrl = (event->state & GDK_MOD2_MASK) != 0;
+#else
+			const bool meta = false;
+#endif
+			ButtonDownWithModifiers(pt, event->time, ModifierFlags(shift, ctrl, alt, meta));
+		} else if (event->button == 2) {
+			// Grab the primary selection if it exists
+			const SelectionPosition pos = SPositionFromLocation(pt, false, false, UserVirtualSpace());
+			if (OwnPrimarySelection() && primary.Empty())
+				CopySelectionRange(&primary);
+
+			sel.Clear();
+			SetSelection(pos, pos);
+			RequestSelection(GDK_SELECTION_PRIMARY);
+		} else if (event->button == 3) {
+			if (!PointInSelection(pt))
+				SetEmptySelection(PositionFromLocation(pt));
+			if (ShouldDisplayPopup(pt)) {
+				// PopUp menu
+				// Convert to screen
+				int ox = 0;
+				int oy = 0;
+				gdk_window_get_origin(PWindow(wMain), &ox, &oy);
+				ContextMenu(Point(pt.x + ox, pt.y + oy));
+			} else {
+#if PLAT_GTK_MACOSX
+				const bool meta = ctrl;
+				// GDK reports the Command modifier key as GDK_MOD2_MASK for button events,
+				// not GDK_META_MASK like in key events.
+				ctrl = (event->state & GDK_MOD2_MASK) != 0;
+#else
+				const bool meta = false;
+#endif
+				RightButtonDownWithModifiers(pt, event->time, ModifierFlags(shift, ctrl, alt, meta));
+				return FALSE;
+			}
+		} else if (event->button == 4) {
+			// Wheel scrolling up (only GTK 1.x does it this way)
+			if (ctrl)
+				SetAdjustmentValue(adjustmenth, xOffset - 6);
+			else
+				SetAdjustmentValue(adjustmentv, static_cast<int>(topLine) - 3);
+		} else if (event->button == 5) {
+			// Wheel scrolling down (only GTK 1.x does it this way)
+			if (ctrl)
+				SetAdjustmentValue(adjustmenth, xOffset + 6);
+			else
+				SetAdjustmentValue(adjustmentv, static_cast<int>(topLine) + 3);
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return TRUE;
+}
+
+gint ScintillaGTK::Press(GtkWidget *widget, GdkEventButton *event) {
+	if (event->window != WindowFromWidget(widget))
+		return FALSE;
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->PressThis(event);
+}
+
+gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		//Platform::DebugPrintf("Release %x %d %d\n",sciThis,event->time,event->state);
+		if (!sciThis->HaveMouseCapture())
+			return FALSE;
+		if (event->button == 1) {
+			Point pt = PointOfEvent(event);
+			//Platform::DebugPrintf("Up %x %x %d %d %d\n",
+			//	sciThis,event->window,event->time, pt.x, pt.y);
+			if (event->window != PWindow(sciThis->wMain))
+				// If mouse released on scroll bar then the position is relative to the
+				// scrollbar, not the drawing window so just repeat the most recent point.
+				pt = sciThis->ptMouseLast;
+			const KeyMod modifiers = ModifierFlags(
+						      (event->state & GDK_SHIFT_MASK) != 0,
+						      (event->state & GDK_CONTROL_MASK) != 0,
+						      (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0);
+			sciThis->ButtonUpWithModifiers(pt, event->time, modifiers);
+		}
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+// win32gtk and GTK >= 2 use SCROLL_* events instead of passing the
+// button4/5/6/7 events to the GTK app
+gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+
+		if (widget == nullptr || event == nullptr)
+			return FALSE;
+
+#if defined(GDK_WINDOWING_WAYLAND)
+		if (event->direction == GDK_SCROLL_SMOOTH && GDK_IS_WAYLAND_WINDOW(event->window)) {
+			const int smoothScrollFactor = 4;
+			sciThis->smoothScrollY += event->delta_y * smoothScrollFactor;
+			sciThis->smoothScrollX += event->delta_x * smoothScrollFactor;;
+			if (ABS(sciThis->smoothScrollY) >= 1.0) {
+				const int scrollLines = std::trunc(sciThis->smoothScrollY);
+				sciThis->ScrollTo(sciThis->topLine + scrollLines);
+				sciThis->smoothScrollY -= scrollLines;
+			}
+			if (ABS(sciThis->smoothScrollX) >= 1.0) {
+				const int scrollPixels = std::trunc(sciThis->smoothScrollX);
+				sciThis->HorizontalScrollTo(sciThis->xOffset + scrollPixels);
+				sciThis->smoothScrollX -= scrollPixels;
+			}
+			return TRUE;
+		}
+#endif
+
+		// Compute amount and direction to scroll (even tho on win32 there is
+		// intensity of scrolling info in the native message, gtk doesn't
+		// support this so we simulate similarly adaptive scrolling)
+		// Note that this is disabled on OS X (Darwin) with the X11 backend
+		// where the X11 server already has an adaptive scrolling algorithm
+		// that fights with this one
+		int cLineScroll;
+#if defined(__APPLE__) && !defined(GDK_WINDOWING_QUARTZ)
+		cLineScroll = sciThis->linesPerScroll;
+		if (cLineScroll == 0)
+			cLineScroll = 4;
+		sciThis->wheelMouseIntensity = cLineScroll;
+#else
+		const gint64 curTime = g_get_monotonic_time();
+		const gint64 timeDelta = curTime - sciThis->lastWheelMouseTime;
+		if ((event->direction == sciThis->lastWheelMouseDirection) && (timeDelta < 250000)) {
+			if (sciThis->wheelMouseIntensity < 12)
+				sciThis->wheelMouseIntensity++;
+			cLineScroll = sciThis->wheelMouseIntensity;
+		} else {
+			cLineScroll = sciThis->linesPerScroll;
+			if (cLineScroll == 0)
+				cLineScroll = 4;
+			sciThis->wheelMouseIntensity = cLineScroll;
+		}
+		sciThis->lastWheelMouseTime = curTime;
+#endif
+		if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_LEFT) {
+			cLineScroll *= -1;
+		}
+		sciThis->lastWheelMouseDirection = event->direction;
+
+		// Note:  Unpatched versions of win32gtk don't set the 'state' value so
+		// only regular scrolling is supported there.  Also, unpatched win32gtk
+		// issues spurious button 2 mouse events during wheeling, which can cause
+		// problems (a patch for both was submitted by archaeopteryx.com on 13Jun2001)
+
+		// Data zoom not supported
+		if (event->state & GDK_SHIFT_MASK) {
+			return FALSE;
+		}
+
+#if GTK_CHECK_VERSION(3,4,0)
+		// Smooth scrolling not supported
+		if (event->direction == GDK_SCROLL_SMOOTH) {
+			return FALSE;
+		}
+#endif
+
+		// Horizontal scrolling
+		if (event->direction == GDK_SCROLL_LEFT || event->direction == GDK_SCROLL_RIGHT) {
+			sciThis->HorizontalScrollTo(sciThis->xOffset + cLineScroll);
+
+			// Text font size zoom
+		} else if (event->state & GDK_CONTROL_MASK) {
+			if (cLineScroll < 0) {
+				sciThis->KeyCommand(Message::ZoomIn);
+			} else {
+				sciThis->KeyCommand(Message::ZoomOut);
+			}
+
+			// Regular scrolling
+		} else {
+			sciThis->ScrollTo(sciThis->topLine + cLineScroll);
+		}
+		return TRUE;
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		//Platform::DebugPrintf("Motion %x %d\n",sciThis,event->time);
+		if (event->window != WindowFromWidget(widget))
+			return FALSE;
+		int x = 0;
+		int y = 0;
+		GdkModifierType state {};
+		if (event->is_hint) {
+#if GTK_CHECK_VERSION(3,0,0)
+			gdk_window_get_device_position(event->window,
+						       event->device, &x, &y, &state);
+#else
+			gdk_window_get_pointer(event->window, &x, &y, &state);
+#endif
+		} else {
+			x = static_cast<int>(event->x);
+			y = static_cast<int>(event->y);
+			state = static_cast<GdkModifierType>(event->state);
+		}
+		//Platform::DebugPrintf("Move %x %x %d %c %d %d\n",
+		//	sciThis,event->window,event->time,event->is_hint? 'h' :'.', x, y);
+		const Point pt(static_cast<XYPOSITION>(x), static_cast<XYPOSITION>(y));
+		const KeyMod modifiers = ModifierFlags(
+					      (event->state & GDK_SHIFT_MASK) != 0,
+					      (event->state & GDK_CONTROL_MASK) != 0,
+					      (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0);
+		sciThis->ButtonMoveWithModifiers(pt, event->time, modifiers);
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+namespace {
+
+// Map the keypad keys to their equivalent functions
+int KeyTranslate(int keyIn) noexcept {
+	switch (keyIn) {
+#if GTK_CHECK_VERSION(3,0,0)
+	case GDK_KEY_ISO_Left_Tab:
+		return SCK_TAB;
+	case GDK_KEY_KP_Down:
+		return SCK_DOWN;
+	case GDK_KEY_KP_Up:
+		return SCK_UP;
+	case GDK_KEY_KP_Left:
+		return SCK_LEFT;
+	case GDK_KEY_KP_Right:
+		return SCK_RIGHT;
+	case GDK_KEY_KP_Home:
+		return SCK_HOME;
+	case GDK_KEY_KP_End:
+		return SCK_END;
+	case GDK_KEY_KP_Page_Up:
+		return SCK_PRIOR;
+	case GDK_KEY_KP_Page_Down:
+		return SCK_NEXT;
+	case GDK_KEY_KP_Delete:
+		return SCK_DELETE;
+	case GDK_KEY_KP_Insert:
+		return SCK_INSERT;
+	case GDK_KEY_KP_Enter:
+		return SCK_RETURN;
+
+	case GDK_KEY_Down:
+		return SCK_DOWN;
+	case GDK_KEY_Up:
+		return SCK_UP;
+	case GDK_KEY_Left:
+		return SCK_LEFT;
+	case GDK_KEY_Right:
+		return SCK_RIGHT;
+	case GDK_KEY_Home:
+		return SCK_HOME;
+	case GDK_KEY_End:
+		return SCK_END;
+	case GDK_KEY_Page_Up:
+		return SCK_PRIOR;
+	case GDK_KEY_Page_Down:
+		return SCK_NEXT;
+	case GDK_KEY_Delete:
+		return SCK_DELETE;
+	case GDK_KEY_Insert:
+		return SCK_INSERT;
+	case GDK_KEY_Escape:
+		return SCK_ESCAPE;
+	case GDK_KEY_BackSpace:
+		return SCK_BACK;
+	case GDK_KEY_Tab:
+		return SCK_TAB;
+	case GDK_KEY_Return:
+		return SCK_RETURN;
+	case GDK_KEY_KP_Add:
+		return SCK_ADD;
+	case GDK_KEY_KP_Subtract:
+		return SCK_SUBTRACT;
+	case GDK_KEY_KP_Divide:
+		return SCK_DIVIDE;
+	case GDK_KEY_Super_L:
+		return SCK_WIN;
+	case GDK_KEY_Super_R:
+		return SCK_RWIN;
+	case GDK_KEY_Menu:
+		return SCK_MENU;
+
+#else
+
+	case GDK_ISO_Left_Tab:
+		return SCK_TAB;
+	case GDK_KP_Down:
+		return SCK_DOWN;
+	case GDK_KP_Up:
+		return SCK_UP;
+	case GDK_KP_Left:
+		return SCK_LEFT;
+	case GDK_KP_Right:
+		return SCK_RIGHT;
+	case GDK_KP_Home:
+		return SCK_HOME;
+	case GDK_KP_End:
+		return SCK_END;
+	case GDK_KP_Page_Up:
+		return SCK_PRIOR;
+	case GDK_KP_Page_Down:
+		return SCK_NEXT;
+	case GDK_KP_Delete:
+		return SCK_DELETE;
+	case GDK_KP_Insert:
+		return SCK_INSERT;
+	case GDK_KP_Enter:
+		return SCK_RETURN;
+
+	case GDK_Down:
+		return SCK_DOWN;
+	case GDK_Up:
+		return SCK_UP;
+	case GDK_Left:
+		return SCK_LEFT;
+	case GDK_Right:
+		return SCK_RIGHT;
+	case GDK_Home:
+		return SCK_HOME;
+	case GDK_End:
+		return SCK_END;
+	case GDK_Page_Up:
+		return SCK_PRIOR;
+	case GDK_Page_Down:
+		return SCK_NEXT;
+	case GDK_Delete:
+		return SCK_DELETE;
+	case GDK_Insert:
+		return SCK_INSERT;
+	case GDK_Escape:
+		return SCK_ESCAPE;
+	case GDK_BackSpace:
+		return SCK_BACK;
+	case GDK_Tab:
+		return SCK_TAB;
+	case GDK_Return:
+		return SCK_RETURN;
+	case GDK_KP_Add:
+		return SCK_ADD;
+	case GDK_KP_Subtract:
+		return SCK_SUBTRACT;
+	case GDK_KP_Divide:
+		return SCK_DIVIDE;
+	case GDK_Super_L:
+		return SCK_WIN;
+	case GDK_Super_R:
+		return SCK_RWIN;
+	case GDK_Menu:
+		return SCK_MENU;
+#endif
+	default:
+		return keyIn;
+	}
+}
+
+}
+
+gboolean ScintillaGTK::KeyThis(GdkEventKey *event) {
+	try {
+		//fprintf(stderr, "SC-key: %d %x [%s]\n",
+		//	event->keyval, event->state, (event->length > 0) ? event->string : "empty");
+		if (gtk_im_context_filter_keypress(im_context, event)) {
+			return 1;
+		}
+		if (!event->keyval) {
+			return true;
+		}
+
+		const bool shift = (event->state & GDK_SHIFT_MASK) != 0;
+		bool ctrl = (event->state & GDK_CONTROL_MASK) != 0;
+		const bool alt = (event->state & GDK_MOD1_MASK) != 0;
+		const bool super = (event->state & GDK_MOD4_MASK) != 0;
+		guint key = event->keyval;
+		if ((ctrl || alt) && (key < 128))
+			key = toupper(key);
+#if GTK_CHECK_VERSION(3,0,0)
+		else if (!ctrl && (key >= GDK_KEY_KP_Multiply && key <= GDK_KEY_KP_9))
+#else
+		else if (!ctrl && (key >= GDK_KP_Multiply && key <= GDK_KP_9))
+#endif
+			key &= 0x7F;
+		// Hack for keys over 256 and below command keys but makes Hungarian work.
+		// This will have to change for Unicode
+		else if (key >= 0xFE00)
+			key = KeyTranslate(key);
+
+		bool consumed = false;
+#if !(PLAT_GTK_MACOSX)
+		const bool meta = false;
+#else
+		const bool meta = ctrl;
+		ctrl = (event->state & GDK_META_MASK) != 0;
+#endif
+		const bool added = KeyDownWithModifiers(static_cast<Keys>(key), ModifierFlags(shift, ctrl, alt, meta, super), &consumed) != 0;
+		if (!consumed)
+			consumed = added;
+		//fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed);
+		if (event->keyval == 0xffffff && event->length > 0) {
+			ClearSelection();
+			const Sci::Position lengthInserted = pdoc->InsertString(CurrentPosition(), event->string, strlen(event->string));
+			if (lengthInserted > 0) {
+				MovePositionTo(CurrentPosition() + lengthInserted);
+			}
+		}
+		return consumed;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gboolean ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->KeyThis(event);
+}
+
+gboolean ScintillaGTK::KeyRelease(GtkWidget *widget, GdkEventKey *event) {
+	//Platform::DebugPrintf("SC-keyrel: %d %x %3s\n",event->keyval, event->state, event->string);
+	ScintillaGTK *sciThis = FromWidget(widget);
+	if (gtk_im_context_filter_keypress(sciThis->im_context, event)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawPreeditThis(GtkWidget *, cairo_t *cr) {
+	try {
+		PreEditString pes(im_context);
+		PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str);
+		pango_layout_set_attributes(layout, pes.attrs);
+
+		cairo_move_to(cr, 0, 0);
+		pango_cairo_show_layout(cr, layout);
+
+		g_object_unref(layout);
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return TRUE;
+}
+
+gboolean ScintillaGTK::DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis) {
+	return sciThis->DrawPreeditThis(widget, cr);
+}
+
+#else
+
+gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *) {
+	try {
+		PreEditString pes(im_context);
+		PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str);
+		pango_layout_set_attributes(layout, pes.attrs);
+
+		cairo_t *context = gdk_cairo_create(WindowFromWidget(widget));
+		cairo_move_to(context, 0, 0);
+		pango_cairo_show_layout(context, layout);
+		cairo_destroy(context);
+		g_object_unref(layout);
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return TRUE;
+}
+
+gboolean ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) {
+	return sciThis->ExposePreeditThis(widget, ose);
+}
+
+#endif
+
+bool ScintillaGTK::KoreanIME() {
+	PreEditString pes(im_context);
+	if (pes.pscript != G_UNICODE_SCRIPT_COMMON)
+		lastNonCommonScript = pes.pscript;
+	return lastNonCommonScript == G_UNICODE_SCRIPT_HANGUL;
+}
+
+void ScintillaGTK::MoveImeCarets(Sci::Position pos) {
+	// Move carets relatively by bytes
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Position positionInsert = sel.Range(r).Start().Position();
+		sel.Range(r).caret.SetPosition(positionInsert + pos);
+		sel.Range(r).anchor.SetPosition(positionInsert + pos);
+	}
+}
+
+void ScintillaGTK::DrawImeIndicator(int indicator, Sci::Position len) {
+	// Emulate the visual style of IME characters with indicators.
+	// Draw an indicator on the character before caret by the character bytes of len
+	// so it should be called after InsertCharacter().
+	// It does not affect caret positions.
+	if (indicator < 8 || indicator > INDICATOR_MAX) {
+		return;
+	}
+	pdoc->DecorationSetCurrentIndicator(indicator);
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Position positionInsert = sel.Range(r).Start().Position();
+		pdoc->DecorationFillRange(positionInsert - len, 1, len);
+	}
+}
+
+namespace {
+
+std::vector<int> MapImeIndicators(PangoAttrList *attrs, const char *u8Str) {
+	// Map input style to scintilla ime indicator.
+	// Attrs position points between UTF-8 bytes.
+	// Indicator index to be returned is character based though.
+	const glong charactersLen = g_utf8_strlen(u8Str, strlen(u8Str));
+	std::vector<int> indicator(charactersLen, SC_INDICATOR_UNKNOWN);
+
+	PangoAttrIterator *iterunderline = pango_attr_list_get_iterator(attrs);
+	if (iterunderline) {
+		do {
+			const PangoAttribute  *attrunderline = pango_attr_iterator_get(iterunderline, PANGO_ATTR_UNDERLINE);
+			if (attrunderline) {
+				const glong start = g_utf8_strlen(u8Str, attrunderline->start_index);
+				const glong end = g_utf8_strlen(u8Str, attrunderline->end_index);
+				const int ulinevalue = reinterpret_cast<const PangoAttrInt *>(attrunderline)->value;
+				const PangoUnderline uline = static_cast<PangoUnderline>(ulinevalue);
+				for (glong i=start; i < end; ++i) {
+					switch (uline) {
+					case PANGO_UNDERLINE_NONE:
+						indicator[i] = SC_INDICATOR_UNKNOWN;
+						break;
+					case PANGO_UNDERLINE_SINGLE: // normal input
+						indicator[i] = SC_INDICATOR_INPUT;
+						break;
+					case PANGO_UNDERLINE_DOUBLE:
+					case PANGO_UNDERLINE_LOW:
+					case PANGO_UNDERLINE_ERROR:
+					default:
+						break;
+					}
+				}
+			}
+		} while (pango_attr_iterator_next(iterunderline));
+		pango_attr_iterator_destroy(iterunderline);
+	}
+
+	PangoAttrIterator *itercolor = pango_attr_list_get_iterator(attrs);
+	if (itercolor) {
+		do {
+			const PangoAttribute *backcolor = pango_attr_iterator_get(itercolor, PANGO_ATTR_BACKGROUND);
+			if (backcolor) {
+				const glong start = g_utf8_strlen(u8Str, backcolor->start_index);
+				const glong end = g_utf8_strlen(u8Str, backcolor->end_index);
+				for (glong i=start; i < end; ++i) {
+					indicator[i] = SC_INDICATOR_TARGET;  // target converted
+				}
+			}
+		} while (pango_attr_iterator_next(itercolor));
+		pango_attr_iterator_destroy(itercolor);
+	}
+	return indicator;
+}
+
+}
+
+void ScintillaGTK::SetCandidateWindowPos() {
+	// Composition box accompanies candidate box.
+	const Point pt = PointMainCaret();
+	GdkRectangle imeBox = {0}; // No need to set width
+	imeBox.x = static_cast<gint>(pt.x);
+	imeBox.y = static_cast<gint>(pt.y + std::max(4, vs.lineHeight/4));
+	// prevent overlapping with current line
+	imeBox.height = vs.lineHeight;
+	gtk_im_context_set_cursor_location(im_context, &imeBox);
+}
+
+void ScintillaGTK::CommitThis(char *commitStr) {
+	try {
+		//~ fprintf(stderr, "Commit '%s'\n", commitStr);
+		view.imeCaretBlockOverride = false;
+
+		if (pdoc->TentativeActive()) {
+			pdoc->TentativeUndo();
+		}
+
+		const char *charSetSource = CharacterSetID();
+
+		glong uniStrLen = 0;
+		gunichar *uniStr = g_utf8_to_ucs4_fast(commitStr, static_cast<glong>(strlen(commitStr)), &uniStrLen);
+		for (glong i = 0; i < uniStrLen; i++) {
+			gchar u8Char[UTF8MaxBytes+2] = {0};
+			const gint u8CharLen = g_unichar_to_utf8(uniStr[i], u8Char);
+			std::string docChar = u8Char;
+			if (!IsUnicodeMode())
+				docChar = ConvertText(u8Char, u8CharLen, charSetSource, "UTF-8", true);
+
+			InsertCharacter(docChar, CharacterSource::DirectInput);
+		}
+		g_free(uniStr);
+		ShowCaretAtCurrentPosition();
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::Commit(GtkIMContext *, char  *str, ScintillaGTK *sciThis) {
+	sciThis->CommitThis(str);
+}
+
+void ScintillaGTK::PreeditChangedInlineThis() {
+	// Copy & paste by johnsonj with a lot of helps of Neil
+	// Great thanks for my foreruners, jiniya and BLUEnLIVE
+	try {
+		if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
+			gtk_im_context_reset(im_context);
+			return;
+		}
+
+		view.imeCaretBlockOverride = false; // If backspace.
+
+		bool initialCompose = false;
+		if (pdoc->TentativeActive()) {
+			pdoc->TentativeUndo();
+		} else {
+			// No tentative undo means start of this composition so
+			// fill in any virtual spaces.
+			initialCompose = true;
+		}
+
+		PreEditString preeditStr(im_context);
+		const char *charSetSource = CharacterSetID();
+
+		if (!preeditStr.validUTF8 || (charSetSource == nullptr)) {
+			ShowCaretAtCurrentPosition();
+			return;
+		}
+
+		if (preeditStr.uniStrLen == 0) {
+			ShowCaretAtCurrentPosition();
+			return;
+		}
+
+		if (initialCompose) {
+			ClearBeforeTentativeStart();
+		}
+
+		SetCandidateWindowPos();
+		pdoc->TentativeStart(); // TentativeActive() from now on
+
+		std::vector<int> indicator = MapImeIndicators(preeditStr.attrs, preeditStr.str);
+
+		for (glong i = 0; i < preeditStr.uniStrLen; i++) {
+			gchar u8Char[UTF8MaxBytes+2] = {0};
+			const gint u8CharLen = g_unichar_to_utf8(preeditStr.uniStr[i], u8Char);
+			std::string docChar = u8Char;
+			if (!IsUnicodeMode())
+				docChar = ConvertText(u8Char, u8CharLen, charSetSource, "UTF-8", true);
+
+			InsertCharacter(docChar, CharacterSource::TentativeInput);
+
+			DrawImeIndicator(indicator[i], docChar.size());
+		}
+
+		// Move caret to ime cursor position.
+		const int imeEndToImeCaretU32 = preeditStr.cursor_pos - preeditStr.uniStrLen;
+		const Sci::Position imeCaretPosDoc = pdoc->GetRelativePosition(CurrentPosition(), imeEndToImeCaretU32);
+
+		MoveImeCarets(- CurrentPosition() + imeCaretPosDoc);
+
+		if (KoreanIME()) {
+#if !PLAT_GTK_WIN32
+			if (preeditStr.cursor_pos > 0) {
+				int oneCharBefore = pdoc->GetRelativePosition(CurrentPosition(), -1);
+				MoveImeCarets(- CurrentPosition() + oneCharBefore);
+			}
+#endif
+			view.imeCaretBlockOverride = true;
+		}
+
+		EnsureCaretVisible();
+		ShowCaretAtCurrentPosition();
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::PreeditChangedWindowedThis() {
+	try {
+		PreEditString pes(im_context);
+		if (strlen(pes.str) > 0) {
+			SetCandidateWindowPos();
+
+			PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str);
+			pango_layout_set_attributes(layout, pes.attrs);
+
+			gint w, h;
+			pango_layout_get_pixel_size(layout, &w, &h);
+			g_object_unref(layout);
+
+			gint x, y;
+			gdk_window_get_origin(PWindow(wText), &x, &y);
+
+			Point pt = PointMainCaret();
+			if (pt.x < 0)
+				pt.x = 0;
+			if (pt.y < 0)
+				pt.y = 0;
+
+			gtk_window_move(GTK_WINDOW(PWidget(wPreedit)), x + static_cast<gint>(pt.x), y + static_cast<gint>(pt.y));
+			gtk_window_resize(GTK_WINDOW(PWidget(wPreedit)), w, h);
+			gtk_widget_show(PWidget(wPreedit));
+			gtk_widget_queue_draw_area(PWidget(wPreeditDraw), 0, 0, w, h);
+		} else {
+			gtk_widget_hide(PWidget(wPreedit));
+		}
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::PreeditChanged(GtkIMContext *, ScintillaGTK *sciThis) {
+	if ((sciThis->imeInteraction == IMEInteraction::Inline) || (sciThis->KoreanIME())) {
+		sciThis->PreeditChangedInlineThis();
+	} else {
+		sciThis->PreeditChangedWindowedThis();
+	}
+}
+
+void ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void *) {
+	RealizeText(widget, nullptr);
+}
+
+void ScintillaGTK::RealizeText(GtkWidget *widget, void *) {
+	// Set NULL background to avoid automatic clearing so Scintilla responsible for all drawing
+	if (WindowFromWidget(widget)) {
+#if GTK_CHECK_VERSION(3,22,0)
+		// Appears unnecessary
+#elif GTK_CHECK_VERSION(3,0,0)
+		gdk_window_set_background_pattern(WindowFromWidget(widget), nullptr);
+#else
+		gdk_window_set_back_pixmap(WindowFromWidget(widget), nullptr, FALSE);
+#endif
+	}
+}
+
+static GObjectClass *scintilla_class_parent_class;
+
+void ScintillaGTK::Dispose(GObject *object) {
+	try {
+		ScintillaObject *scio = SCINTILLA(object);
+		ScintillaGTK *sciThis = static_cast<ScintillaGTK *>(scio->pscin);
+
+		if (PWidget(sciThis->scrollbarv)) {
+			gtk_widget_unparent(PWidget(sciThis->scrollbarv));
+			sciThis->scrollbarv = nullptr;
+		}
+
+		if (PWidget(sciThis->scrollbarh)) {
+			gtk_widget_unparent(PWidget(sciThis->scrollbarh));
+			sciThis->scrollbarh = nullptr;
+		}
+
+		scintilla_class_parent_class->dispose(object);
+	} catch (...) {
+		// Its dying so nowhere to save the status
+	}
+}
+
+void ScintillaGTK::Destroy(GObject *object) {
+	try {
+		ScintillaObject *scio = SCINTILLA(object);
+
+		// This avoids a double destruction
+		if (!scio->pscin)
+			return;
+		ScintillaGTK *sciThis = static_cast<ScintillaGTK *>(scio->pscin);
+		//Platform::DebugPrintf("Destroying %x %x\n", sciThis, object);
+		sciThis->Finalise();
+
+		delete sciThis;
+		scio->pscin = nullptr;
+		scintilla_class_parent_class->finalize(object);
+	} catch (...) {
+		// Its dead so nowhere to save the status
+	}
+}
+
+void ScintillaGTK::CheckForFontOptionChange() {
+	const FontOptions fontOptionsNow(PWidget(wText));
+	if (!(fontOptionsNow == fontOptionsPrevious)) {
+		// Clear position caches
+		InvalidateStyleData();
+	}
+	fontOptionsPrevious = fontOptionsNow;
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawTextThis(cairo_t *cr) {
+	try {
+		CheckForFontOptionChange();
+
+		paintState = PaintState::painting;
+		repaintFullWindow = false;
+
+		rcPaint = GetClientRectangle();
+
+		PLATFORM_ASSERT(rgnUpdate == nullptr);
+		rgnUpdate = cairo_copy_clip_rectangle_list(cr);
+		if (rgnUpdate && rgnUpdate->status != CAIRO_STATUS_SUCCESS) {
+			// If not successful then ignore
+			fprintf(stderr, "DrawTextThis failed to copy update region %d [%d]\n", rgnUpdate->status, rgnUpdate->num_rectangles);
+			cairo_rectangle_list_destroy(rgnUpdate);
+			rgnUpdate = 0;
+		}
+
+		double x1, y1, x2, y2;
+		cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+		rcPaint.left = x1;
+		rcPaint.top = y1;
+		rcPaint.right = x2;
+		rcPaint.bottom = y2;
+		PRectangle rcClient = GetClientRectangle();
+		paintingAllText = rcPaint.Contains(rcClient);
+		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(Technology::Default));
+		surfaceWindow->Init(cr, PWidget(wText));
+		Paint(surfaceWindow.get(), rcPaint);
+		surfaceWindow->Release();
+		if ((paintState == PaintState::abandoned) || repaintFullWindow) {
+			// Painting area was insufficient to cover new styling or brace highlight positions
+			FullPaint();
+		}
+		paintState = PaintState::notPainting;
+		repaintFullWindow = false;
+
+		if (rgnUpdate) {
+			cairo_rectangle_list_destroy(rgnUpdate);
+		}
+		rgnUpdate = 0;
+		paintState = PaintState::notPainting;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+
+	return FALSE;
+}
+
+gboolean ScintillaGTK::DrawText(GtkWidget *, cairo_t *cr, ScintillaGTK *sciThis) {
+	return sciThis->DrawTextThis(cr);
+}
+
+gboolean ScintillaGTK::DrawThis(cairo_t *cr) {
+	try {
+#ifdef GTK_STYLE_CLASS_SCROLLBARS_JUNCTION /* GTK >= 3.4 */
+		// if both scrollbars are visible, paint the little square on the bottom right corner
+		if (verticalScrollBarVisible && horizontalScrollBarVisible && !Wrapping()) {
+			GtkStyleContext *styleContext = gtk_widget_get_style_context(PWidget(wMain));
+			PRectangle rc = GetClientRectangle();
+
+			gtk_style_context_save(styleContext);
+			gtk_style_context_add_class(styleContext, GTK_STYLE_CLASS_SCROLLBARS_JUNCTION);
+
+			gtk_render_background(styleContext, cr, rc.right, rc.bottom,
+					      verticalScrollBarWidth, horizontalScrollBarHeight);
+			gtk_render_frame(styleContext, cr, rc.right, rc.bottom,
+					 verticalScrollBarWidth, horizontalScrollBarHeight);
+
+			gtk_style_context_restore(styleContext);
+		}
+#endif
+
+		gtk_container_propagate_draw(
+			GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarh), cr);
+		gtk_container_propagate_draw(
+			GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarv), cr);
+// Starting from the following version, the expose event are not propagated
+// for double buffered non native windows, so we need to call it ourselves
+// or keep the default handler
+#if GTK_CHECK_VERSION(3,0,0)
+		// we want to forward on any >= 3.9.2 runtime
+		if (gtk_check_version(3, 9, 2) == nullptr) {
+			gtk_container_propagate_draw(
+				GTK_CONTAINER(PWidget(wMain)), PWidget(wText), cr);
+		}
+#endif
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gboolean ScintillaGTK::DrawMain(GtkWidget *widget, cairo_t *cr) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->DrawThis(cr);
+}
+
+#else
+
+gboolean ScintillaGTK::ExposeTextThis(GtkWidget * /*widget*/, GdkEventExpose *ose) {
+	try {
+		CheckForFontOptionChange();
+
+		paintState = PaintState::painting;
+
+		rcPaint = PRectangle::FromInts(
+				  ose->area.x,
+				  ose->area.y,
+				  ose->area.x + ose->area.width,
+				  ose->area.y + ose->area.height);
+
+		PLATFORM_ASSERT(rgnUpdate == nullptr);
+		rgnUpdate = gdk_region_copy(ose->region);
+		const PRectangle rcClient = GetClientRectangle();
+		paintingAllText = rcPaint.Contains(rcClient);
+		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(Technology::Default));
+		cairo_t *cr = gdk_cairo_create(PWindow(wText));
+		surfaceWindow->Init(cr, PWidget(wText));
+		Paint(surfaceWindow.get(), rcPaint);
+		surfaceWindow->Release();
+		cairo_destroy(cr);
+		if ((paintState == PaintState::abandoned) || repaintFullWindow) {
+			// Painting area was insufficient to cover new styling or brace highlight positions
+			FullPaint();
+		}
+		paintState = PaintState::notPainting;
+		repaintFullWindow = false;
+
+		if (rgnUpdate) {
+			gdk_region_destroy(rgnUpdate);
+		}
+		rgnUpdate = nullptr;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+
+	return FALSE;
+}
+
+gboolean ScintillaGTK::ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) {
+	return sciThis->ExposeTextThis(widget, ose);
+}
+
+gboolean ScintillaGTK::ExposeMain(GtkWidget *widget, GdkEventExpose *ose) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	//Platform::DebugPrintf("Expose Main %0d,%0d %0d,%0d\n",
+	//ose->area.x, ose->area.y, ose->area.width, ose->area.height);
+	return sciThis->Expose(widget, ose);
+}
+
+gboolean ScintillaGTK::Expose(GtkWidget *, GdkEventExpose *ose) {
+	try {
+		//fprintf(stderr, "Expose %0d,%0d %0d,%0d\n",
+		//ose->area.x, ose->area.y, ose->area.width, ose->area.height);
+
+		// The text is painted in ExposeText
+		gtk_container_propagate_expose(
+			GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarh), ose);
+		gtk_container_propagate_expose(
+			GTK_CONTAINER(PWidget(wMain)), PWidget(scrollbarv), ose);
+
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+#endif
+
+void ScintillaGTK::ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) {
+	try {
+		sciThis->ScrollTo(static_cast<int>(gtk_adjustment_get_value(adj)), false);
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) {
+	try {
+		sciThis->HorizontalScrollTo(static_cast<int>(gtk_adjustment_get_value(adj)));
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::SelectionReceived(GtkWidget *widget,
+				     GtkSelectionData *selection_data, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	//Platform::DebugPrintf("Selection received\n");
+	sciThis->ReceivedSelection(selection_data);
+}
+
+void ScintillaGTK::SelectionGet(GtkWidget *widget,
+				GtkSelectionData *selection_data, guint info, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		//Platform::DebugPrintf("Selection get\n");
+		if (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY) {
+			if (sciThis->primary.Empty()) {
+				sciThis->CopySelectionRange(&sciThis->primary);
+			}
+			sciThis->GetSelection(selection_data, info, &sciThis->primary);
+		}
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+gint ScintillaGTK::SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	//Platform::DebugPrintf("Selection clear\n");
+	sciThis->UnclaimSelection(selection_event);
+	if (GTK_WIDGET_CLASS(sciThis->parentClass)->selection_clear_event) {
+		return GTK_WIDGET_CLASS(sciThis->parentClass)->selection_clear_event(widget, selection_event);
+	}
+	return TRUE;
+}
+
+gboolean ScintillaGTK::DragMotionThis(GdkDragContext *context,
+				      gint x, gint y, guint dragtime) {
+	try {
+		const Point npt = Point::FromInts(x, y);
+		SetDragPosition(SPositionFromLocation(npt, false, false, UserVirtualSpace()));
+		GdkDragAction preferredAction = gdk_drag_context_get_suggested_action(context);
+		const GdkDragAction actions = gdk_drag_context_get_actions(context);
+		const SelectionPosition pos = SPositionFromLocation(npt);
+		if ((inDragDrop == DragDrop::dragging) && (PositionInSelection(pos.Position()))) {
+			// Avoid dragging selection onto itself as that produces a move
+			// with no real effect but which creates undo actions.
+			preferredAction = static_cast<GdkDragAction>(0);
+		} else if (actions == actionCopyOrMove) {
+			preferredAction = GDK_ACTION_MOVE;
+		}
+		gdk_drag_status(context, preferredAction, dragtime);
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+gboolean ScintillaGTK::DragMotion(GtkWidget *widget, GdkDragContext *context,
+				  gint x, gint y, guint dragtime) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	return sciThis->DragMotionThis(context, x, y, dragtime);
+}
+
+void ScintillaGTK::DragLeave(GtkWidget *widget, GdkDragContext * /*context*/, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
+		//Platform::DebugPrintf("DragLeave %x\n", sciThis);
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::DragEnd(GtkWidget *widget, GdkDragContext * /*context*/) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		// If drag did not result in drop here or elsewhere
+		if (!sciThis->dragWasDropped)
+			sciThis->SetEmptySelection(sciThis->posDrag);
+		sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
+		//Platform::DebugPrintf("DragEnd %x %d\n", sciThis, sciThis->dragWasDropped);
+		sciThis->inDragDrop = DragDrop::none;
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+gboolean ScintillaGTK::Drop(GtkWidget *widget, GdkDragContext * /*context*/,
+			    gint, gint, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		//Platform::DebugPrintf("Drop %x\n", sciThis);
+		sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+	return FALSE;
+}
+
+void ScintillaGTK::DragDataReceived(GtkWidget *widget, GdkDragContext * /*context*/,
+				    gint, gint, GtkSelectionData *selection_data, guint /*info*/, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		sciThis->ReceivedDrop(selection_data);
+		sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+void ScintillaGTK::DragDataGet(GtkWidget *widget, GdkDragContext *context,
+			       GtkSelectionData *selection_data, guint info, guint) {
+	ScintillaGTK *sciThis = FromWidget(widget);
+	try {
+		sciThis->dragWasDropped = true;
+		if (!sciThis->sel.Empty()) {
+			sciThis->GetSelection(selection_data, info, &sciThis->drag);
+		}
+		const GdkDragAction action = gdk_drag_context_get_selected_action(context);
+		if (action == GDK_ACTION_MOVE) {
+			for (size_t r=0; r<sciThis->sel.Count(); r++) {
+				if (sciThis->posDrop >= sciThis->sel.Range(r).Start()) {
+					if (sciThis->posDrop > sciThis->sel.Range(r).End()) {
+						sciThis->posDrop.Add(-sciThis->sel.Range(r).Length());
+					} else {
+						sciThis->posDrop.Add(-SelectionRange(sciThis->posDrop, sciThis->sel.Range(r).Start()).Length());
+					}
+				}
+			}
+			sciThis->ClearSelection();
+		}
+		sciThis->SetDragPosition(SelectionPosition(Sci::invalidPosition));
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+}
+
+int ScintillaGTK::TimeOut(gpointer ptt) {
+	TimeThunk *tt = static_cast<TimeThunk *>(ptt);
+	tt->scintilla->TickFor(tt->reason);
+	return 1;
+}
+
+gboolean ScintillaGTK::IdleCallback(gpointer pSci) {
+	ScintillaGTK *sciThis = static_cast<ScintillaGTK *>(pSci);
+	// Idler will be automatically stopped, if there is nothing
+	// to do while idle.
+	const bool ret = sciThis->Idle();
+	if (ret == false) {
+		// FIXME: This will remove the idler from GTK, we don't want to
+		// remove it as it is removed automatically when this function
+		// returns false (although, it should be harmless).
+		sciThis->SetIdle(false);
+	}
+	return ret;
+}
+
+gboolean ScintillaGTK::StyleIdle(gpointer pSci) {
+	ScintillaGTK *sciThis = static_cast<ScintillaGTK *>(pSci);
+	sciThis->IdleWork();
+	// Idler will be automatically stopped
+	return FALSE;
+}
+
+void ScintillaGTK::IdleWork() {
+	Editor::IdleWork();
+	styleIdleID = 0;
+}
+
+void ScintillaGTK::QueueIdleWork(WorkItems items, Sci::Position upTo) {
+	Editor::QueueIdleWork(items, upTo);
+	if (!styleIdleID) {
+		// Only allow one style needed to be queued
+		styleIdleID = gdk_threads_add_idle_full(G_PRIORITY_HIGH_IDLE, StyleIdle, this, nullptr);
+	}
+}
+
+void ScintillaGTK::SetDocPointer(Document *document) {
+	Document *oldDoc = nullptr;
+	ScintillaGTKAccessible *sciAccessible = nullptr;
+	if (accessible) {
+		sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible);
+		if (sciAccessible && pdoc) {
+			oldDoc = pdoc;
+			if (oldDoc) {
+				oldDoc->AddRef();
+			}
+		}
+	}
+
+	Editor::SetDocPointer(document);
+
+	if (sciAccessible) {
+		// the accessible needs have the old Document, but also the new one active
+		sciAccessible->ChangeDocument(oldDoc, pdoc);
+	}
+	if (oldDoc) {
+		oldDoc->Release();
+	}
+}
+
+void ScintillaGTK::PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis) {
+	guint const action = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(menuItem), "CmdNum"));
+	if (action) {
+		sciThis->Command(action);
+	}
+}
+
+gboolean ScintillaGTK::PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis) {
+	try {
+		if (event->window != WindowFromWidget(widget))
+			return FALSE;
+		if (event->type != GDK_BUTTON_PRESS)
+			return FALSE;
+		const Point pt = PointOfEvent(event);
+		sciThis->ct.MouseClick(pt);
+		sciThis->CallTipClick();
+	} catch (...) {
+	}
+	return TRUE;
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+gboolean ScintillaGTK::DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip) {
+	try {
+		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(Technology::Default));
+		surfaceWindow->Init(cr, widget);
+		surfaceWindow->SetMode(SurfaceMode(ctip->codePage, false));
+		ctip->PaintCT(surfaceWindow.get());
+		surfaceWindow->Release();
+	} catch (...) {
+		// No pointer back to Scintilla to save status
+	}
+	return TRUE;
+}
+
+#else
+
+gboolean ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, CallTip *ctip) {
+	try {
+		std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(Technology::Default));
+		cairo_t *cr = gdk_cairo_create(WindowFromWidget(widget));
+		surfaceWindow->Init(cr, widget);
+		surfaceWindow->SetMode(SurfaceMode(ctip->codePage, false));
+		ctip->PaintCT(surfaceWindow.get());
+		surfaceWindow->Release();
+		cairo_destroy(cr);
+	} catch (...) {
+		// No pointer back to Scintilla to save status
+	}
+	return TRUE;
+}
+
+#endif
+
+AtkObject *ScintillaGTK::GetAccessibleThis(GtkWidget *widget) {
+	return ScintillaGTKAccessible::WidgetGetAccessibleImpl(widget, &accessible, scintilla_class_parent_class);
+}
+
+AtkObject *ScintillaGTK::GetAccessible(GtkWidget *widget) {
+	return FromWidget(widget)->GetAccessibleThis(widget);
+}
+
+sptr_t ScintillaGTK::DirectFunction(
+	sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	ScintillaGTK *sci = reinterpret_cast<ScintillaGTK *>(ptr);
+	return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+sptr_t ScintillaGTK::DirectStatusFunction(
+	sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus) {
+	ScintillaGTK *sci = reinterpret_cast<ScintillaGTK *>(ptr);
+	const sptr_t returnValue = sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+	*pStatus = static_cast<int>(sci->errorStatus);
+	return returnValue;
+}
+
+/* legacy name for scintilla_object_send_message */
+sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
+	return psci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+gintptr scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	return scintilla_send_message(sci, iMessage, wParam, lParam);
+}
+
+static void scintilla_class_init(ScintillaClass *klass);
+static void scintilla_init(ScintillaObject *sci);
+
+/* legacy name for scintilla_object_get_type */
+GType scintilla_get_type() {
+	static GType scintilla_type = 0;
+	try {
+
+		if (!scintilla_type) {
+			scintilla_type = g_type_from_name("ScintillaObject");
+			if (!scintilla_type) {
+				static GTypeInfo scintilla_info = {
+					(guint16) sizeof(ScintillaObjectClass),
+					nullptr, //(GBaseInitFunc)
+					nullptr, //(GBaseFinalizeFunc)
+					(GClassInitFunc) scintilla_class_init,
+					nullptr, //(GClassFinalizeFunc)
+					nullptr, //gconstpointer data
+					(guint16) sizeof(ScintillaObject),
+					0, //n_preallocs
+					(GInstanceInitFunc) scintilla_init,
+					nullptr //(GTypeValueTable*)
+				};
+				scintilla_type = g_type_register_static(
+							 GTK_TYPE_CONTAINER, "ScintillaObject", &scintilla_info, (GTypeFlags) 0);
+			}
+		}
+
+	} catch (...) {
+	}
+	return scintilla_type;
+}
+
+GType scintilla_object_get_type() {
+	return scintilla_get_type();
+}
+
+void ScintillaGTK::ClassInit(OBJECT_CLASS *object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) {
+	Platform_Initialise();
+	atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE);
+	atomUTF8Mime = gdk_atom_intern("text/plain;charset=utf-8", FALSE);
+	atomString = GDK_SELECTION_TYPE_STRING;
+	atomUriList = gdk_atom_intern("text/uri-list", FALSE);
+	atomDROPFILES_DND = gdk_atom_intern("DROPFILES_DND", FALSE);
+
+	// Define default signal handlers for the class:  Could move more
+	// of the signal handlers here (those that currently attached to wDraw
+	// in Init() may require coordinate translation?)
+
+	object_class->dispose = Dispose;
+	object_class->finalize = Destroy;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->get_preferred_width = GetPreferredWidth;
+	widget_class->get_preferred_height = GetPreferredHeight;
+#else
+	widget_class->size_request = SizeRequest;
+#endif
+	widget_class->size_allocate = SizeAllocate;
+#if GTK_CHECK_VERSION(3,0,0)
+	widget_class->draw = DrawMain;
+#else
+	widget_class->expose_event = ExposeMain;
+#endif
+	widget_class->motion_notify_event = Motion;
+	widget_class->button_press_event = Press;
+	widget_class->button_release_event = MouseRelease;
+	widget_class->scroll_event = ScrollEvent;
+	widget_class->key_press_event = KeyPress;
+	widget_class->key_release_event = KeyRelease;
+	widget_class->focus_in_event = FocusIn;
+	widget_class->focus_out_event = FocusOut;
+	widget_class->selection_received = SelectionReceived;
+	widget_class->selection_get = SelectionGet;
+	widget_class->selection_clear_event = SelectionClear;
+
+	widget_class->drag_data_received = DragDataReceived;
+	widget_class->drag_motion = DragMotion;
+	widget_class->drag_leave = DragLeave;
+	widget_class->drag_end = DragEnd;
+	widget_class->drag_drop = Drop;
+	widget_class->drag_data_get = DragDataGet;
+
+	widget_class->realize = Realize;
+	widget_class->unrealize = UnRealize;
+	widget_class->map = Map;
+	widget_class->unmap = UnMap;
+
+	widget_class->get_accessible = GetAccessible;
+
+	container_class->forall = MainForAll;
+}
+
+static void scintilla_class_init(ScintillaClass *klass) {
+	try {
+		OBJECT_CLASS *object_class = (OBJECT_CLASS *) klass;
+		GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
+		GtkContainerClass *container_class = (GtkContainerClass *) klass;
+
+		const GSignalFlags sigflags = static_cast<GSignalFlags>(G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST);
+		scintilla_signals[COMMAND_SIGNAL] = g_signal_new(
+				"command",
+				G_TYPE_FROM_CLASS(object_class),
+				sigflags,
+				G_STRUCT_OFFSET(ScintillaClass, command),
+				nullptr, //(GSignalAccumulator)
+				nullptr, //(gpointer)
+				scintilla_marshal_VOID__INT_OBJECT,
+				G_TYPE_NONE,
+				2, G_TYPE_INT, GTK_TYPE_WIDGET);
+
+		scintilla_signals[NOTIFY_SIGNAL] = g_signal_new(
+				SCINTILLA_NOTIFY,
+				G_TYPE_FROM_CLASS(object_class),
+				sigflags,
+				G_STRUCT_OFFSET(ScintillaClass, notify),
+				nullptr, //(GSignalAccumulator)
+				nullptr, //(gpointer)
+				scintilla_marshal_VOID__INT_BOXED,
+				G_TYPE_NONE,
+				2, G_TYPE_INT, SCINTILLA_TYPE_NOTIFICATION);
+
+		klass->command = nullptr;
+		klass->notify = nullptr;
+		scintilla_class_parent_class = G_OBJECT_CLASS(g_type_class_peek_parent(klass));
+		ScintillaGTK::ClassInit(object_class, widget_class, container_class);
+	} catch (...) {
+	}
+}
+
+static void scintilla_init(ScintillaObject *sci) {
+	try {
+		gtk_widget_set_can_focus(GTK_WIDGET(sci), TRUE);
+		sci->pscin = new ScintillaGTK(sci);
+	} catch (...) {
+	}
+}
+
+/* legacy name for scintilla_object_new */
+GtkWidget *scintilla_new() {
+	GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), nullptr));
+	gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
+
+	return widget;
+}
+
+GtkWidget *scintilla_object_new() {
+	return scintilla_new();
+}
+
+void scintilla_set_id(ScintillaObject *sci, uptr_t id) {
+	ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
+	psci->ctrlID = static_cast<int>(id);
+}
+
+void scintilla_release_resources(void) {
+	try {
+		Platform_Finalise();
+	} catch (...) {
+	}
+}
+
+/* Define a dummy boxed type because g-ir-scanner is unable to
+ * recognize gpointer-derived types. Note that SCNotificaiton
+ * is always allocated on stack so copying is not appropriate. */
+static void *copy_(void *src) { return src; }
+static void free_(void *) { }
+
+GType scnotification_get_type(void) {
+	static gsize type_id = 0;
+	if (g_once_init_enter(&type_id)) {
+		const gsize id = (gsize) g_boxed_type_register_static(
+					 g_intern_static_string("SCNotification"),
+					 (GBoxedCopyFunc) copy_,
+					 (GBoxedFreeFunc) free_);
+		g_once_init_leave(&type_id, id);
+	}
+	return (GType) type_id;
+}
diff --git a/scite-app/scintilla/gtk/ScintillaGTK.h b/scite-app/scintilla/gtk/ScintillaGTK.h
new file mode 100755
index 0000000..2db733c
--- /dev/null
+++ b/scite-app/scintilla/gtk/ScintillaGTK.h
@@ -0,0 +1,323 @@
+// Scintilla source code edit control
+// ScintillaGTK.h - GTK+ specific subclass of ScintillaBase
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLAGTK_H
+#define SCINTILLAGTK_H
+
+namespace Scintilla::Internal {
+
+class ScintillaGTKAccessible;
+
+#define OBJECT_CLASS GObjectClass
+
+struct FontOptions {
+	cairo_antialias_t antialias {};
+	cairo_subpixel_order_t order {};
+	cairo_hint_style_t hint {};
+	FontOptions() noexcept = default;
+	explicit FontOptions(GtkWidget *widget) noexcept;
+	bool operator==(const FontOptions &other) const noexcept;
+};
+
+class ScintillaGTK : public ScintillaBase {
+	friend class ScintillaGTKAccessible;
+
+	_ScintillaObject *sci;
+	Window wText;
+	Window scrollbarv;
+	Window scrollbarh;
+	GtkAdjustment *adjustmentv;
+	GtkAdjustment *adjustmenth;
+	int verticalScrollBarWidth;
+	int horizontalScrollBarHeight;
+
+	SelectionText primary;
+
+	GdkEvent *evbtn;
+	guint buttonMouse;
+	bool capturedMouse;
+	bool dragWasDropped;
+	int lastKey;
+	int rectangularSelectionModifier;
+
+	GtkWidgetClass *parentClass;
+
+	static inline GdkAtom atomUTF8 {};
+	static inline GdkAtom atomUTF8Mime {};
+	static inline GdkAtom atomString {};
+	static inline GdkAtom atomUriList {};
+	static inline GdkAtom atomDROPFILES_DND {};
+	GdkAtom atomSought;
+	size_t inClearSelection = 0;
+
+#if PLAT_GTK_WIN32
+	CLIPFORMAT cfColumnSelect;
+#endif
+
+	bool preeditInitialized;
+	Window wPreedit;
+	Window wPreeditDraw;
+	GtkIMContext *im_context;
+	GUnicodeScript lastNonCommonScript;
+
+	// Wheel mouse support
+	unsigned int linesPerScroll;
+	gint64 lastWheelMouseTime;
+	gint lastWheelMouseDirection;
+	gint wheelMouseIntensity;
+	gdouble smoothScrollY;
+	gdouble smoothScrollX;
+
+#if GTK_CHECK_VERSION(3,0,0)
+	cairo_rectangle_list_t *rgnUpdate;
+#else
+	GdkRegion *rgnUpdate;
+#endif
+	bool repaintFullWindow;
+
+	guint styleIdleID;
+	FontOptions fontOptionsPrevious;
+	int accessibilityEnabled;
+	AtkObject *accessible;
+
+public:
+	explicit ScintillaGTK(_ScintillaObject *sci_);
+	// Deleted so ScintillaGTK objects can not be copied.
+	ScintillaGTK(const ScintillaGTK &) = delete;
+	ScintillaGTK(ScintillaGTK &&) = delete;
+	ScintillaGTK &operator=(const ScintillaGTK &) = delete;
+	ScintillaGTK &operator=(ScintillaGTK &&) = delete;
+	virtual ~ScintillaGTK();
+	static ScintillaGTK *FromWidget(GtkWidget *widget) noexcept;
+	static void ClassInit(OBJECT_CLASS *object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class);
+private:
+	void Init();
+	void Finalise() override;
+	bool AbandonPaint() override;
+	void DisplayCursor(Window::Cursor c) override;
+	bool DragThreshold(Point ptStart, Point ptNow) override;
+	void StartDrag() override;
+	Sci::Position TargetAsUTF8(char *text) const;
+	Sci::Position EncodedFromUTF8(const char *utf8, char *encoded) const;
+	bool ValidCodePage(int codePage) const override;
+	std::string UTF8FromEncoded(std::string_view encoded) const override;
+	std::string EncodedFromUTF8(std::string_view utf8) const override;
+public: 	// Public for scintilla_send_message
+	sptr_t WndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) override;
+private:
+	sptr_t DefWndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) override;
+	struct TimeThunk {
+		TickReason reason;
+		ScintillaGTK *scintilla;
+		guint timer;
+		TimeThunk() noexcept : reason(TickReason::caret), scintilla(nullptr), timer(0) {}
+	};
+	TimeThunk timers[static_cast<size_t>(TickReason::dwell)+1];
+	bool FineTickerRunning(TickReason reason) override;
+	void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+	void FineTickerCancel(TickReason reason) override;
+	bool SetIdle(bool on) override;
+	void SetMouseCapture(bool on) override;
+	bool HaveMouseCapture() override;
+	bool PaintContains(PRectangle rc) override;
+	void FullPaint();
+	PRectangle GetClientRectangle() const override;
+	void ScrollText(Sci::Line linesToMove) override;
+	void SetVerticalScrollPos() override;
+	void SetHorizontalScrollPos() override;
+	bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override;
+	void ReconfigureScrollBars() override;
+	void NotifyChange() override;
+	void NotifyFocus(bool focus) override;
+	void NotifyParent(Scintilla::NotificationData scn) override;
+	void NotifyKey(Scintilla::Keys key, Scintilla::KeyMod modifiers);
+	void NotifyURIDropped(const char *list);
+	const char *CharacterSetID() const;
+	std::unique_ptr<CaseFolder> CaseFolderForEncoding() override;
+	std::string CaseMapString(const std::string &s, CaseMapping caseMapping) override;
+	int KeyDefault(Scintilla::Keys key, Scintilla::KeyMod modifiers) override;
+	void CopyToClipboard(const SelectionText &selectedText) override;
+	void Copy() override;
+	void RequestSelection(GdkAtom atomSelection);
+	void Paste() override;
+	void CreateCallTipWindow(PRectangle rc) override;
+	void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+	bool OwnPrimarySelection();
+	void ClaimSelection() override;
+	static bool IsStringAtom(GdkAtom type);
+	void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText);
+	void InsertSelection(GtkClipboard *clipBoard, GtkSelectionData *selectionData);
+public:	// Public for SelectionReceiver
+	GObject *MainObject() const noexcept;
+	void ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept;
+private:
+	void ReceivedSelection(GtkSelectionData *selection_data);
+	void ReceivedDrop(GtkSelectionData *selection_data);
+	static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text);
+	void StoreOnClipboard(SelectionText *clipText);
+	static void ClipboardGetSelection(GtkClipboard *clip, GtkSelectionData *selection_data, guint info, void *data);
+	static void ClipboardClearSelection(GtkClipboard *clip, void *data);
+
+	void ClearPrimarySelection();
+	void PrimaryGetSelectionThis(GtkClipboard *clip, GtkSelectionData *selection_data, guint info);
+	static void PrimaryGetSelection(GtkClipboard *clip, GtkSelectionData *selection_data, guint info, gpointer pSci);
+	void PrimaryClearSelectionThis(GtkClipboard *clip);
+	static void PrimaryClearSelection(GtkClipboard *clip, gpointer pSci);
+
+	void UnclaimSelection(GdkEventSelection *selection_event);
+	void Resize(int width, int height);
+
+	// Callback functions
+	void RealizeThis(GtkWidget *widget);
+	static void Realize(GtkWidget *widget);
+	void UnRealizeThis(GtkWidget *widget);
+	static void UnRealize(GtkWidget *widget);
+	void MapThis();
+	static void Map(GtkWidget *widget);
+	void UnMapThis();
+	static void UnMap(GtkWidget *widget);
+	gint FocusInThis(GtkWidget *widget);
+	static gint FocusIn(GtkWidget *widget, GdkEventFocus *event);
+	gint FocusOutThis(GtkWidget *widget);
+	static gint FocusOut(GtkWidget *widget, GdkEventFocus *event);
+	static void SizeRequest(GtkWidget *widget, GtkRequisition *requisition);
+#if GTK_CHECK_VERSION(3,0,0)
+	static void GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth);
+	static void GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight);
+#endif
+	static void SizeAllocate(GtkWidget *widget, GtkAllocation *allocation);
+	void CheckForFontOptionChange();
+#if GTK_CHECK_VERSION(3,0,0)
+	gboolean DrawTextThis(cairo_t *cr);
+	static gboolean DrawText(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis);
+	gboolean DrawThis(cairo_t *cr);
+	static gboolean DrawMain(GtkWidget *widget, cairo_t *cr);
+#else
+	gboolean ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose);
+	static gboolean ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis);
+	gboolean Expose(GtkWidget *widget, GdkEventExpose *ose);
+	static gboolean ExposeMain(GtkWidget *widget, GdkEventExpose *ose);
+#endif
+	void ForAll(GtkCallback callback, gpointer callback_data);
+	static void MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
+
+	static void ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis);
+	static void ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis);
+	gint PressThis(GdkEventButton *event);
+	static gint Press(GtkWidget *widget, GdkEventButton *event);
+	static gint MouseRelease(GtkWidget *widget, GdkEventButton *event);
+	static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event);
+	static gint Motion(GtkWidget *widget, GdkEventMotion *event);
+	gboolean KeyThis(GdkEventKey *event);
+	static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event);
+	static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event);
+#if GTK_CHECK_VERSION(3,0,0)
+	gboolean DrawPreeditThis(GtkWidget *widget, cairo_t *cr);
+	static gboolean DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis);
+#else
+	gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose);
+	static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis);
+#endif
+	AtkObject *GetAccessibleThis(GtkWidget *widget);
+	static AtkObject *GetAccessible(GtkWidget *widget);
+
+	bool KoreanIME();
+	void CommitThis(char *commitStr);
+	static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis);
+	void PreeditChangedInlineThis();
+	void PreeditChangedWindowedThis();
+	static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis);
+	void MoveImeCarets(Sci::Position pos);
+	void DrawImeIndicator(int indicator, Sci::Position len);
+	void SetCandidateWindowPos();
+
+	static void StyleSetText(GtkWidget *widget, GtkStyle *previous, void *);
+	static void RealizeText(GtkWidget *widget, void *);
+	static void Dispose(GObject *object);
+	static void Destroy(GObject *object);
+	static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data,
+				      guint time);
+	static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data,
+				 guint info, guint time);
+	static gint SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event);
+	gboolean DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime);
+	static gboolean DragMotion(GtkWidget *widget, GdkDragContext *context,
+				   gint x, gint y, guint dragtime);
+	static void DragLeave(GtkWidget *widget, GdkDragContext *context,
+			      guint time);
+	static void DragEnd(GtkWidget *widget, GdkDragContext *context);
+	static gboolean Drop(GtkWidget *widget, GdkDragContext *context,
+			     gint x, gint y, guint time);
+	static void DragDataReceived(GtkWidget *widget, GdkDragContext *context,
+				     gint x, gint y, GtkSelectionData *selection_data, guint info, guint time);
+	static void DragDataGet(GtkWidget *widget, GdkDragContext *context,
+				GtkSelectionData *selection_data, guint info, guint time);
+	static gboolean TimeOut(gpointer ptt);
+	static gboolean IdleCallback(gpointer pSci);
+	static gboolean StyleIdle(gpointer pSci);
+	void IdleWork() override;
+	void QueueIdleWork(WorkItems items, Sci::Position upTo) override;
+	void SetDocPointer(Document *document) override;
+	static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis);
+
+#if GTK_CHECK_VERSION(3,0,0)
+	static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip);
+#else
+	static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ctip);
+#endif
+	static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis);
+
+	static sptr_t DirectFunction(sptr_t ptr,
+				     unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	static sptr_t DirectStatusFunction(sptr_t ptr,
+				     unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus);
+};
+
+// helper class to watch a GObject lifetime and get notified when it dies
+class GObjectWatcher {
+	GObject *weakRef;
+
+	void WeakNotifyThis(GObject *obj G_GNUC_UNUSED) {
+		PLATFORM_ASSERT(obj == weakRef);
+
+		Destroyed();
+		weakRef = nullptr;
+	}
+
+	static void WeakNotify(gpointer data, GObject *obj) {
+		static_cast<GObjectWatcher *>(data)->WeakNotifyThis(obj);
+	}
+
+public:
+	GObjectWatcher(GObject *obj) :
+		weakRef(obj) {
+		g_object_weak_ref(weakRef, WeakNotify, this);
+	}
+
+	// Deleted so GObjectWatcher objects can not be copied.
+	GObjectWatcher(const GObjectWatcher&) = delete;
+	GObjectWatcher(GObjectWatcher&&) = delete;
+	GObjectWatcher&operator=(const GObjectWatcher&) = delete;
+	GObjectWatcher&operator=(GObjectWatcher&&) = delete;
+
+	virtual ~GObjectWatcher() {
+		if (weakRef) {
+			g_object_weak_unref(weakRef, WeakNotify, this);
+		}
+	}
+
+	virtual void Destroyed() {}
+
+	bool IsDestroyed() const {
+		return weakRef != nullptr;
+	}
+};
+
+std::string ConvertText(const char *s, size_t len, const char *charSetDest,
+			const char *charSetSource, bool transliterations, bool silent=false);
+
+}
+
+#endif
diff --git a/scite-app/scintilla/gtk/ScintillaGTKAccessible.cxx b/scite-app/scintilla/gtk/ScintillaGTKAccessible.cxx
new file mode 100644
index 0000000..bff9a45
--- /dev/null
+++ b/scite-app/scintilla/gtk/ScintillaGTKAccessible.cxx
@@ -0,0 +1,1262 @@
+/* Scintilla source code edit control */
+/* ScintillaGTKAccessible.cxx - GTK+ accessibility for ScintillaGTK */
+/* Copyright 2016 by Colomban Wendling <colomban@geany.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
+
+// REFERENCES BETWEEN THE DIFFERENT OBJECTS
+//
+// ScintillaGTKAccessible is the actual implementation, as a C++ class.
+// ScintillaObjectAccessible is the GObject derived from AtkObject that
+// implements the various ATK interfaces, through ScintillaGTKAccessible.
+// This follows the same pattern as ScintillaGTK and ScintillaObject.
+//
+// ScintillaGTK owns a strong reference to the ScintillaObjectAccessible, and
+// is both responsible for creating and destroying that object.
+//
+// ScintillaObjectAccessible owns a strong reference to ScintillaGTKAccessible,
+// and is responsible for creating and destroying that object.
+//
+// ScintillaGTKAccessible has weak references to both the ScintillaGTK and
+// the ScintillaObjectAccessible objects associated, but does not own any
+// strong references to those objects.
+//
+// The chain of ownership is as follows:
+// ScintillaGTK -> ScintillaObjectAccessible -> ScintillaGTKAccessible
+
+// DETAILS ON THE GOBJECT TYPE IMPLEMENTATION
+//
+// On GTK < 3.2, we need to use the AtkObjectFactory.  We need to query
+// the factory to see what type we should derive from, thus making use of
+// dynamic inheritance.  It's tricky, but it works so long as it's done
+// carefully enough.
+//
+// On GTK 3.2 through 3.6, we need to hack around because GTK stopped
+// registering its accessible types in the factory, so we can't query
+// them that way.  Unfortunately, the accessible types aren't exposed
+// yet (not until 3.8), so there's no proper way to know which type to
+// inherit from.  To work around this, we instantiate the parent's
+// AtkObject temporarily, and use it's type.  It means creating an extra
+// throwaway object and being able to pass the type information up to the
+// type registration code, but it's the only solution I could find.
+//
+// On GTK 3.8 onward, we use the proper exposed GtkContainerAccessible as
+// parent, and so a straightforward class.
+//
+// To hide and contain the complexity in type creation arising from the
+// hackish support for GTK 3.2 to 3.8, the actual implementation for the
+// widget's get_accessible() is located in the accessibility layer itself.
+
+// Initially based on GtkTextViewAccessible from GTK 3.20
+// Inspiration for the GTK < 3.2 part comes from Evince 2.24, thanks.
+
+// FIXME: optimize character/byte offset conversion (with a cache?)
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <new>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+// whether we have widget_set() and widget_unset()
+#define HAVE_WIDGET_SET_UNSET (GTK_CHECK_VERSION(3, 3, 6))
+// whether GTK accessibility is available through the ATK factory
+#define HAVE_GTK_FACTORY (! GTK_CHECK_VERSION(3, 1, 9))
+// whether we have gtk-a11y.h and the public GTK accessible types
+#define HAVE_GTK_A11Y_H (GTK_CHECK_VERSION(3, 7, 6))
+
+#if HAVE_GTK_A11Y_H
+# include <gtk/gtk-a11y.h>
+#endif
+
+#if defined(_WIN32)
+// On Win32 use windows.h to access CLIPFORMAT
+#undef NOMINMAX
+#define NOMINMAX
+#include <windows.h>
+#endif
+
+// ScintillaGTK.h and stuff it needs
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+#include "ScintillaGTK.h"
+#include "ScintillaGTKAccessible.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+struct ScintillaObjectAccessiblePrivate {
+	ScintillaGTKAccessible *pscin;
+};
+
+typedef GtkAccessible ScintillaObjectAccessible;
+typedef GtkAccessibleClass ScintillaObjectAccessibleClass;
+
+#define SCINTILLA_OBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SCINTILLA_TYPE_OBJECT_ACCESSIBLE, ScintillaObjectAccessible))
+#define SCINTILLA_TYPE_OBJECT_ACCESSIBLE (scintilla_object_accessible_get_type(0))
+
+// We can't use priv member because of dynamic inheritance, so we don't actually know the offset.  Meh.
+#define SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(inst) (G_TYPE_INSTANCE_GET_PRIVATE((inst), SCINTILLA_TYPE_OBJECT_ACCESSIBLE, ScintillaObjectAccessiblePrivate))
+
+static GType scintilla_object_accessible_get_type(GType parent_type);
+
+ScintillaGTKAccessible *ScintillaGTKAccessible::FromAccessible(GtkAccessible *accessible) {
+	// FIXME: do we need the check below?  GTK checks that in all methods, so maybe
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+	if (! widget) {
+		return nullptr;
+	}
+
+	return SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible)->pscin;
+}
+
+ScintillaGTKAccessible::ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_) :
+		accessible(accessible_),
+		sci(ScintillaGTK::FromWidget(widget_)),
+		old_pos(-1) {
+	SetAccessibility(true);
+	g_signal_connect(widget_, "sci-notify", G_CALLBACK(SciNotify), this);
+}
+
+ScintillaGTKAccessible::~ScintillaGTKAccessible() {
+	if (gtk_accessible_get_widget(accessible)) {
+		g_signal_handlers_disconnect_matched(sci->sci, G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
+	}
+}
+
+gchar *ScintillaGTKAccessible::GetTextRangeUTF8(Sci::Position startByte, Sci::Position endByte) {
+	g_return_val_if_fail(startByte >= 0, nullptr);
+	// FIXME: should we swap start/end if necessary?
+	g_return_val_if_fail(endByte >= startByte, nullptr);
+
+	gchar *utf8Text = nullptr;
+	const char *charSetBuffer;
+
+	// like TargetAsUTF8, but avoids a double conversion
+	if (sci->IsUnicodeMode() || ! *(charSetBuffer = sci->CharacterSetID())) {
+		int len = endByte - startByte;
+		utf8Text = (char *) g_malloc(len + 1);
+		sci->pdoc->GetCharRange(utf8Text, startByte, len);
+		utf8Text[len] = '\0';
+	} else {
+		// Need to convert
+		std::string s = sci->RangeText(startByte, endByte);
+		std::string tmputf = ConvertText(&s[0], s.length(), "UTF-8", charSetBuffer, false);
+		size_t len = tmputf.length();
+		utf8Text = (char *) g_malloc(len + 1);
+		memcpy(utf8Text, tmputf.c_str(), len);
+		utf8Text[len] = '\0';
+	}
+
+	return utf8Text;
+}
+
+gchar *ScintillaGTKAccessible::GetText(int startChar, int endChar) {
+	Sci::Position startByte, endByte;
+	if (endChar == -1) {
+		startByte = ByteOffsetFromCharacterOffset(startChar);
+		endByte = sci->pdoc->Length();
+	} else {
+		ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
+	}
+	return GetTextRangeUTF8(startByte, endByte);
+}
+
+gchar *ScintillaGTKAccessible::GetTextAfterOffset(int charOffset,
+		AtkTextBoundary boundaryType, int *startChar, int *endChar) {
+	g_return_val_if_fail(charOffset >= 0, nullptr);
+
+	Sci::Position startByte, endByte;
+	Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+
+	switch (boundaryType) {
+		case ATK_TEXT_BOUNDARY_CHAR:
+			startByte = PositionAfter(byteOffset);
+			endByte = PositionAfter(startByte);
+			// FIXME: optimize conversion back, as we can reasonably assume +1 char?
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_START:
+			startByte = sci->WndProc(Message::WordEndPosition, byteOffset, 1);
+			startByte = sci->WndProc(Message::WordEndPosition, startByte, 0);
+			endByte = sci->WndProc(Message::WordEndPosition, startByte, 1);
+			endByte = sci->WndProc(Message::WordEndPosition, endByte, 0);
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_END:
+			startByte = sci->WndProc(Message::WordEndPosition, byteOffset, 0);
+			startByte = sci->WndProc(Message::WordEndPosition, startByte, 1);
+			endByte = sci->WndProc(Message::WordEndPosition, startByte, 0);
+			endByte = sci->WndProc(Message::WordEndPosition, endByte, 1);
+			break;
+
+		case ATK_TEXT_BOUNDARY_LINE_START: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			startByte = sci->WndProc(Message::PositionFromLine, line + 1, 0);
+			endByte = sci->WndProc(Message::PositionFromLine, line + 2, 0);
+			break;
+		}
+
+		case ATK_TEXT_BOUNDARY_LINE_END: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			startByte = sci->WndProc(Message::GetLineEndPosition, line, 0);
+			endByte = sci->WndProc(Message::GetLineEndPosition, line + 1, 0);
+			break;
+		}
+
+		default:
+			*startChar = *endChar = -1;
+			return nullptr;
+	}
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetTextRangeUTF8(startByte, endByte);
+}
+
+gchar *ScintillaGTKAccessible::GetTextBeforeOffset(int charOffset,
+		AtkTextBoundary boundaryType, int *startChar, int *endChar) {
+	g_return_val_if_fail(charOffset >= 0, nullptr);
+
+	Sci::Position startByte, endByte;
+	Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+
+	switch (boundaryType) {
+		case ATK_TEXT_BOUNDARY_CHAR:
+			endByte = PositionBefore(byteOffset);
+			startByte = PositionBefore(endByte);
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_START:
+			endByte = sci->WndProc(Message::WordStartPosition, byteOffset, 0);
+			endByte = sci->WndProc(Message::WordStartPosition, endByte, 1);
+			startByte = sci->WndProc(Message::WordStartPosition, endByte, 0);
+			startByte = sci->WndProc(Message::WordStartPosition, startByte, 1);
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_END:
+			endByte = sci->WndProc(Message::WordStartPosition, byteOffset, 1);
+			endByte = sci->WndProc(Message::WordStartPosition, endByte, 0);
+			startByte = sci->WndProc(Message::WordStartPosition, endByte, 1);
+			startByte = sci->WndProc(Message::WordStartPosition, startByte, 0);
+			break;
+
+		case ATK_TEXT_BOUNDARY_LINE_START: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			endByte = sci->WndProc(Message::PositionFromLine, line, 0);
+			if (line > 0) {
+				startByte = sci->WndProc(Message::PositionFromLine, line - 1, 0);
+			} else {
+				startByte = endByte;
+			}
+			break;
+		}
+
+		case ATK_TEXT_BOUNDARY_LINE_END: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			if (line > 0) {
+				endByte = sci->WndProc(Message::GetLineEndPosition, line - 1, 0);
+			} else {
+				endByte = 0;
+			}
+			if (line > 1) {
+				startByte = sci->WndProc(Message::GetLineEndPosition, line - 2, 0);
+			} else {
+				startByte = endByte;
+			}
+			break;
+		}
+
+		default:
+			*startChar = *endChar = -1;
+			return nullptr;
+	}
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetTextRangeUTF8(startByte, endByte);
+}
+
+gchar *ScintillaGTKAccessible::GetTextAtOffset(int charOffset,
+		AtkTextBoundary boundaryType, int *startChar, int *endChar) {
+	g_return_val_if_fail(charOffset >= 0, nullptr);
+
+	Sci::Position startByte, endByte;
+	Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+
+	switch (boundaryType) {
+		case ATK_TEXT_BOUNDARY_CHAR:
+			startByte = byteOffset;
+			endByte = sci->WndProc(Message::PositionAfter, byteOffset, 0);
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_START:
+			startByte = sci->WndProc(Message::WordStartPosition, byteOffset, 1);
+			endByte = sci->WndProc(Message::WordEndPosition, byteOffset, 1);
+			if (! sci->WndProc(Message::IsRangeWord, startByte, endByte)) {
+				// if the cursor was not on a word, forward back
+				startByte = sci->WndProc(Message::WordStartPosition, startByte, 0);
+				startByte = sci->WndProc(Message::WordStartPosition, startByte, 1);
+			}
+			endByte = sci->WndProc(Message::WordEndPosition, endByte, 0);
+			break;
+
+		case ATK_TEXT_BOUNDARY_WORD_END:
+			startByte = sci->WndProc(Message::WordStartPosition, byteOffset, 1);
+			endByte = sci->WndProc(Message::WordEndPosition, byteOffset, 1);
+			if (! sci->WndProc(Message::IsRangeWord, startByte, endByte)) {
+				// if the cursor was not on a word, forward back
+				endByte = sci->WndProc(Message::WordEndPosition, endByte, 0);
+				endByte = sci->WndProc(Message::WordEndPosition, endByte, 1);
+			}
+			startByte = sci->WndProc(Message::WordStartPosition, startByte, 0);
+			break;
+
+		case ATK_TEXT_BOUNDARY_LINE_START: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			startByte = sci->WndProc(Message::PositionFromLine, line, 0);
+			endByte = sci->WndProc(Message::PositionFromLine, line + 1, 0);
+			break;
+		}
+
+		case ATK_TEXT_BOUNDARY_LINE_END: {
+			int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			if (line > 0) {
+				startByte = sci->WndProc(Message::GetLineEndPosition, line - 1, 0);
+			} else {
+				startByte = 0;
+			}
+			endByte = sci->WndProc(Message::GetLineEndPosition, line, 0);
+			break;
+		}
+
+		default:
+			*startChar = *endChar = -1;
+			return nullptr;
+	}
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetTextRangeUTF8(startByte, endByte);
+}
+
+#if ATK_CHECK_VERSION(2, 10, 0)
+gchar *ScintillaGTKAccessible::GetStringAtOffset(int charOffset,
+		AtkTextGranularity granularity, int *startChar, int *endChar) {
+	g_return_val_if_fail(charOffset >= 0, nullptr);
+
+	Sci::Position startByte, endByte;
+	Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+
+	switch (granularity) {
+		case ATK_TEXT_GRANULARITY_CHAR:
+			startByte = byteOffset;
+			endByte = sci->WndProc(Message::PositionAfter, byteOffset, 0);
+			break;
+		case ATK_TEXT_GRANULARITY_WORD:
+			startByte = sci->WndProc(Message::WordStartPosition, byteOffset, 1);
+			endByte = sci->WndProc(Message::WordEndPosition, byteOffset, 1);
+			break;
+		case ATK_TEXT_GRANULARITY_LINE: {
+			gint line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+			startByte = sci->WndProc(Message::PositionFromLine, line, 0);
+			endByte = sci->WndProc(Message::GetLineEndPosition, line, 0);
+			break;
+		}
+		default:
+			*startChar = *endChar = -1;
+			return nullptr;
+	}
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetTextRangeUTF8(startByte, endByte);
+}
+#endif
+
+gunichar ScintillaGTKAccessible::GetCharacterAtOffset(int charOffset) {
+	g_return_val_if_fail(charOffset >= 0, 0);
+
+	Sci::Position startByte = ByteOffsetFromCharacterOffset(charOffset);
+	Sci::Position endByte = PositionAfter(startByte);
+	gchar *ch = GetTextRangeUTF8(startByte, endByte);
+	gunichar unichar = g_utf8_get_char_validated(ch, -1);
+	g_free(ch);
+
+	return unichar;
+}
+
+gint ScintillaGTKAccessible::GetCharacterCount() {
+	return sci->pdoc->CountCharacters(0, sci->pdoc->Length());
+}
+
+gint ScintillaGTKAccessible::GetCaretOffset() {
+	return CharacterOffsetFromByteOffset(sci->WndProc(Message::GetCurrentPos, 0, 0));
+}
+
+gboolean ScintillaGTKAccessible::SetCaretOffset(int charOffset) {
+	sci->WndProc(Message::GotoPos, ByteOffsetFromCharacterOffset(charOffset), 0);
+	return TRUE;
+}
+
+gint ScintillaGTKAccessible::GetOffsetAtPoint(gint x, gint y, AtkCoordType coords) {
+	gint x_widget, y_widget, x_window, y_window;
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+
+	GdkWindow *window = gtk_widget_get_window(widget);
+	gdk_window_get_origin(window, &x_widget, &y_widget);
+	if (coords == ATK_XY_SCREEN) {
+		x = x - x_widget;
+		y = y - y_widget;
+	} else if (coords == ATK_XY_WINDOW) {
+		window = gdk_window_get_toplevel(window);
+		gdk_window_get_origin(window, &x_window, &y_window);
+
+		x = x - x_widget + x_window;
+		y = y - y_widget + y_window;
+	} else {
+		return -1;
+	}
+
+	// FIXME: should we handle scrolling?
+	return CharacterOffsetFromByteOffset(sci->WndProc(Message::CharPositionFromPointClose, x, y));
+}
+
+void ScintillaGTKAccessible::GetCharacterExtents(int charOffset,
+		gint *x, gint *y, gint *width, gint *height, AtkCoordType coords) {
+	*x = *y = *height = *width = 0;
+
+	Sci::Position byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+
+	// FIXME: should we handle scrolling?
+	*x = sci->WndProc(Message::PointXFromPosition, 0, byteOffset);
+	*y = sci->WndProc(Message::PointYFromPosition, 0, byteOffset);
+
+	int line = sci->WndProc(Message::LineFromPosition, byteOffset, 0);
+	*height = sci->WndProc(Message::TextHeight, line, 0);
+
+	int nextByteOffset = PositionAfter(byteOffset);
+	int next_x = sci->WndProc(Message::PointXFromPosition, 0, nextByteOffset);
+	if (next_x > *x) {
+		*width = next_x - *x;
+	} else if (nextByteOffset > byteOffset) {
+		/* maybe next position was on the next line or something.
+		 * just compute the expected character width */
+		int style = StyleAt(byteOffset, true);
+		int len = nextByteOffset - byteOffset;
+		char *ch = new char[len + 1];
+		sci->pdoc->GetCharRange(ch, byteOffset, len);
+		ch[len] = '\0';
+		*width = sci->TextWidth(style, ch);
+		delete[] ch;
+	}
+
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+	GdkWindow *window = gtk_widget_get_window(widget);
+	int x_widget, y_widget;
+	gdk_window_get_origin(window, &x_widget, &y_widget);
+	if (coords == ATK_XY_SCREEN) {
+		*x += x_widget;
+		*y += y_widget;
+	} else if (coords == ATK_XY_WINDOW) {
+		window = gdk_window_get_toplevel(window);
+		int x_window, y_window;
+		gdk_window_get_origin(window, &x_window, &y_window);
+
+		*x += x_widget - x_window;
+		*y += y_widget - y_window;
+	} else {
+		*x = *y = *height = *width = 0;
+	}
+}
+
+static AtkAttributeSet *AddTextAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, gchar *value) {
+	AtkAttribute *at = g_new(AtkAttribute, 1);
+	at->name = g_strdup(atk_text_attribute_get_name(attr));
+	at->value = value;
+
+	return g_slist_prepend(attributes, at);
+}
+
+static AtkAttributeSet *AddTextIntAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, gint i) {
+	return AddTextAttribute(attributes, attr, g_strdup(atk_text_attribute_get_value(attr, i)));
+}
+
+static AtkAttributeSet *AddTextColorAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, ColourRGBA colour) {
+	return AddTextAttribute(attributes, attr,
+		g_strdup_printf("%u,%u,%u", colour.GetRed() * 257, colour.GetGreen() * 257, colour.GetBlue() * 257));
+}
+
+AtkAttributeSet *ScintillaGTKAccessible::GetAttributesForStyle(unsigned int styleNum) {
+	AtkAttributeSet *attr_set = nullptr;
+
+	if (styleNum >= sci->vs.styles.size())
+		return nullptr;
+	Style &style = sci->vs.styles[styleNum];
+
+	attr_set = AddTextAttribute(attr_set, ATK_TEXT_ATTR_FAMILY_NAME, g_strdup(style.fontName));
+	attr_set = AddTextAttribute(attr_set, ATK_TEXT_ATTR_SIZE, g_strdup_printf("%d", style.size / SC_FONT_SIZE_MULTIPLIER));
+	attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_WEIGHT, CLAMP(static_cast<int>(style.weight), 100, 1000));
+	attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_STYLE, style.italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+	attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_UNDERLINE, style.underline ? PANGO_UNDERLINE_SINGLE : PANGO_UNDERLINE_NONE);
+	attr_set = AddTextColorAttribute(attr_set, ATK_TEXT_ATTR_FG_COLOR, style.fore);
+	attr_set = AddTextColorAttribute(attr_set, ATK_TEXT_ATTR_BG_COLOR, style.back);
+	attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_INVISIBLE, style.visible ? 0 : 1);
+	attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_EDITABLE, style.changeable ? 1 : 0);
+
+	return attr_set;
+}
+
+AtkAttributeSet *ScintillaGTKAccessible::GetRunAttributes(int charOffset, int *startChar, int *endChar) {
+	g_return_val_if_fail(charOffset >= -1, nullptr);
+
+	Sci::Position byteOffset;
+	if (charOffset == -1) {
+		byteOffset = sci->WndProc(Message::GetCurrentPos, 0, 0);
+	} else {
+		byteOffset = ByteOffsetFromCharacterOffset(charOffset);
+	}
+	int length = sci->pdoc->Length();
+
+	g_return_val_if_fail(byteOffset <= length, nullptr);
+
+	const char style = StyleAt(byteOffset, true);
+	// compute the range for this style
+	Sci::Position startByte = byteOffset;
+	// when going backwards, we know the style is already computed
+	while (startByte > 0 && sci->pdoc->StyleAt((startByte) - 1) == style)
+		(startByte)--;
+	Sci::Position endByte = byteOffset + 1;
+	while (endByte < length && StyleAt(endByte, true) == style)
+		(endByte)++;
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetAttributesForStyle((unsigned int) style);
+}
+
+AtkAttributeSet *ScintillaGTKAccessible::GetDefaultAttributes() {
+	return GetAttributesForStyle(0);
+}
+
+gint ScintillaGTKAccessible::GetNSelections() {
+	return sci->sel.Empty() ? 0 : sci->sel.Count();
+}
+
+gchar *ScintillaGTKAccessible::GetSelection(gint selection_num, int *startChar, int *endChar) {
+	if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count())
+		return nullptr;
+
+	Sci::Position startByte = sci->sel.Range(selection_num).Start().Position();
+	Sci::Position endByte = sci->sel.Range(selection_num).End().Position();
+
+	CharacterRangeFromByteRange(startByte, endByte, startChar, endChar);
+	return GetTextRangeUTF8(startByte, endByte);
+}
+
+gboolean ScintillaGTKAccessible::AddSelection(int startChar, int endChar) {
+	size_t n_selections = sci->sel.Count();
+	Sci::Position startByte, endByte;
+	ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
+	// use WndProc() to set the selections so it notifies as needed
+	if (n_selections > 1 || ! sci->sel.Empty()) {
+		sci->WndProc(Message::AddSelection, startByte, endByte);
+	} else {
+		sci->WndProc(Message::SetSelection, startByte, endByte);
+	}
+
+	return TRUE;
+}
+
+gboolean ScintillaGTKAccessible::RemoveSelection(gint selection_num) {
+	size_t n_selections = sci->sel.Count();
+	if (selection_num < 0 || (unsigned int) selection_num >= n_selections)
+		return FALSE;
+
+	if (n_selections > 1) {
+		sci->WndProc(Message::DropSelectionN, selection_num, 0);
+	} else if (sci->sel.Empty()) {
+		return FALSE;
+	} else {
+		sci->WndProc(Message::ClearSelections, 0, 0);
+	}
+
+	return TRUE;
+}
+
+gboolean ScintillaGTKAccessible::SetSelection(gint selection_num, int startChar, int endChar) {
+	if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count())
+		return FALSE;
+
+	Sci::Position startByte, endByte;
+	ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
+
+	sci->WndProc(Message::SetSelectionNStart, selection_num, startByte);
+	sci->WndProc(Message::SetSelectionNEnd, selection_num, endByte);
+
+	return TRUE;
+}
+
+void ScintillaGTKAccessible::AtkTextIface::init(::AtkTextIface *iface) {
+	iface->get_text = GetText;
+	iface->get_text_after_offset = GetTextAfterOffset;
+	iface->get_text_at_offset = GetTextAtOffset;
+	iface->get_text_before_offset = GetTextBeforeOffset;
+#if ATK_CHECK_VERSION(2, 10, 0)
+	iface->get_string_at_offset = GetStringAtOffset;
+#endif
+	iface->get_character_at_offset = GetCharacterAtOffset;
+	iface->get_character_count = GetCharacterCount;
+	iface->get_caret_offset = GetCaretOffset;
+	iface->set_caret_offset = SetCaretOffset;
+	iface->get_offset_at_point = GetOffsetAtPoint;
+	iface->get_character_extents = GetCharacterExtents;
+	iface->get_n_selections = GetNSelections;
+	iface->get_selection = GetSelection;
+	iface->add_selection = AddSelection;
+	iface->remove_selection = RemoveSelection;
+	iface->set_selection = SetSelection;
+	iface->get_run_attributes = GetRunAttributes;
+	iface->get_default_attributes = GetDefaultAttributes;
+}
+
+/* atkeditabletext.h */
+
+void ScintillaGTKAccessible::SetTextContents(const gchar *contents) {
+	// FIXME: it's probably useless to check for READONLY here, SETTEXT probably does it just fine?
+	if (! sci->pdoc->IsReadOnly()) {
+		sci->WndProc(Message::SetText, 0, (sptr_t) contents);
+	}
+}
+
+bool ScintillaGTKAccessible::InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes) {
+	if (sci->pdoc->IsReadOnly()) {
+		return false;
+	}
+
+	// like EncodedFromUTF8(), but avoids an extra copy
+	// FIXME: update target?
+	const char *charSetBuffer;
+	if (sci->IsUnicodeMode() || ! *(charSetBuffer = sci->CharacterSetID())) {
+		sci->pdoc->InsertString(bytePos, utf8, lengthBytes);
+	} else {
+		// conversion needed
+		std::string encoded = ConvertText(utf8, lengthBytes, charSetBuffer, "UTF-8", true);
+		sci->pdoc->InsertString(bytePos, encoded.c_str(), encoded.length());
+	}
+
+	return true;
+}
+
+void ScintillaGTKAccessible::InsertText(const gchar *text, int lengthBytes, int *charPosition) {
+	Sci::Position bytePosition = ByteOffsetFromCharacterOffset(*charPosition);
+
+	// FIXME: should we update the target?
+	if (InsertStringUTF8(bytePosition, text, lengthBytes)) {
+		(*charPosition) += sci->pdoc->CountCharacters(bytePosition, lengthBytes);
+	}
+}
+
+void ScintillaGTKAccessible::CopyText(int startChar, int endChar) {
+	Sci::Position startByte, endByte;
+	ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
+	sci->CopyRangeToClipboard(startByte, endByte);
+}
+
+void ScintillaGTKAccessible::CutText(int startChar, int endChar) {
+	g_return_if_fail(endChar >= startChar);
+
+	if (! sci->pdoc->IsReadOnly()) {
+		// FIXME: have a byte variant of those and convert only once?
+		CopyText(startChar, endChar);
+		DeleteText(startChar, endChar);
+	}
+}
+
+void ScintillaGTKAccessible::DeleteText(int startChar, int endChar) {
+	g_return_if_fail(endChar >= startChar);
+
+	if (! sci->pdoc->IsReadOnly()) {
+		Sci::Position startByte, endByte;
+		ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte);
+
+		if (! sci->RangeContainsProtected(startByte, endByte)) {
+			// FIXME: restore the target?
+			sci->pdoc->DeleteChars(startByte, endByte - startByte);
+		}
+	}
+}
+
+void ScintillaGTKAccessible::PasteText(int charPosition) {
+	if (sci->pdoc->IsReadOnly())
+		return;
+
+	// Helper class holding the position for the asynchronous paste operation.
+	// We can only hope that when the callback gets called scia is still valid, but ScintillaGTK
+	// has always done that without problems, so let's guess it's a fairly safe bet.
+	struct Helper : GObjectWatcher {
+		ScintillaGTKAccessible *scia;
+		Sci::Position bytePosition;
+
+		void Destroyed() override {
+			scia = nullptr;
+		}
+
+		Helper(ScintillaGTKAccessible *scia_, Sci::Position bytePos_) :
+			GObjectWatcher(G_OBJECT(scia_->sci->sci)),
+			scia(scia_),
+			bytePosition(bytePos_) {
+		}
+
+		void TextReceived(GtkClipboard *, const gchar *text) {
+			if (text) {
+				size_t len = strlen(text);
+				std::string convertedText;
+				if (len > 0 && scia->sci->convertPastes) {
+					// Convert line endings of the paste into our local line-endings mode
+					convertedText = Document::TransformLineEnds(text, len, scia->sci->pdoc->eolMode);
+					len = convertedText.length();
+					text = convertedText.c_str();
+				}
+				scia->InsertStringUTF8(bytePosition, text, static_cast<Sci::Position>(len));
+			}
+		}
+
+		static void TextReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data) {
+			Helper *helper = static_cast<Helper*>(data);
+			try {
+				if (helper->scia != nullptr) {
+					helper->TextReceived(clipboard, text);
+				}
+			} catch (...) {}
+			delete helper;
+		}
+	};
+
+	Helper *helper = new Helper(this, ByteOffsetFromCharacterOffset(charPosition));
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+	GtkClipboard *clipboard = gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD);
+	gtk_clipboard_request_text(clipboard, helper->TextReceivedCallback, helper);
+}
+
+void ScintillaGTKAccessible::AtkEditableTextIface::init(::AtkEditableTextIface *iface) {
+	iface->set_text_contents = SetTextContents;
+	iface->insert_text = InsertText;
+	iface->copy_text = CopyText;
+	iface->cut_text = CutText;
+	iface->delete_text = DeleteText;
+	iface->paste_text = PasteText;
+	//~ iface->set_run_attributes = SetRunAttributes;
+}
+
+bool ScintillaGTKAccessible::Enabled() const {
+	return sci->accessibilityEnabled == SC_ACCESSIBILITY_ENABLED;
+}
+
+// Callbacks
+
+void ScintillaGTKAccessible::UpdateCursor() {
+	Sci::Position pos = sci->WndProc(Message::GetCurrentPos, 0, 0);
+	if (old_pos != pos) {
+		int charPosition = CharacterOffsetFromByteOffset(pos);
+		g_signal_emit_by_name(accessible, "text-caret-moved", charPosition);
+		old_pos = pos;
+	}
+
+	size_t n_selections = sci->sel.Count();
+	size_t prev_n_selections = old_sels.size();
+	bool selection_changed = n_selections != prev_n_selections;
+
+	old_sels.resize(n_selections);
+	for (size_t i = 0; i < n_selections; i++) {
+		SelectionRange &sel = sci->sel.Range(i);
+
+		if (i < prev_n_selections && ! selection_changed) {
+			SelectionRange &old_sel = old_sels[i];
+			// do not consider a caret move to be a selection change
+			selection_changed = ((! old_sel.Empty() || ! sel.Empty()) && ! (old_sel == sel));
+		}
+
+		old_sels[i] = sel;
+	}
+
+	if (selection_changed)
+		g_signal_emit_by_name(accessible, "text-selection-changed");
+}
+
+void ScintillaGTKAccessible::ChangeDocument(Document *oldDoc, Document *newDoc) {
+	if (!Enabled()) {
+		return;
+	}
+
+	if (oldDoc == newDoc) {
+		return;
+	}
+
+	if (oldDoc) {
+		int charLength = oldDoc->CountCharacters(0, oldDoc->Length());
+		g_signal_emit_by_name(accessible, "text-changed::delete", 0, charLength);
+	}
+
+	if (newDoc) {
+		PLATFORM_ASSERT(newDoc == sci->pdoc);
+
+		int charLength = newDoc->CountCharacters(0, newDoc->Length());
+		g_signal_emit_by_name(accessible, "text-changed::insert", 0, charLength);
+
+		if ((oldDoc ? oldDoc->IsReadOnly() : false) != newDoc->IsReadOnly()) {
+			NotifyReadOnly();
+		}
+
+		// update cursor and selection
+		old_pos = -1;
+		old_sels.clear();
+		UpdateCursor();
+	}
+}
+
+void ScintillaGTKAccessible::NotifyReadOnly() {
+	bool readonly = sci->pdoc->IsReadOnly();
+	atk_object_notify_state_change(ATK_OBJECT(accessible), ATK_STATE_EDITABLE, ! readonly);
+#if ATK_CHECK_VERSION(2, 16, 0)
+	atk_object_notify_state_change(ATK_OBJECT(accessible), ATK_STATE_READ_ONLY, readonly);
+#endif
+}
+
+void ScintillaGTKAccessible::SetAccessibility(bool enabled) {
+	// Called by ScintillaGTK when application has enabled or disabled accessibility
+	if (enabled)
+		sci->pdoc->AllocateLineCharacterIndex(LineCharacterIndexType::Utf32);
+	else
+		sci->pdoc->ReleaseLineCharacterIndex(LineCharacterIndexType::Utf32);
+}
+
+void ScintillaGTKAccessible::Notify(GtkWidget *, gint, NotificationData *nt) {
+	if (!Enabled())
+		return;
+	switch (nt->nmhdr.code) {
+		case Notification::Modified: {
+			if (FlagSet(nt->modificationType, ModificationFlags::InsertText)) {
+				int startChar = CharacterOffsetFromByteOffset(nt->position);
+				int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length);
+				g_signal_emit_by_name(accessible, "text-changed::insert", startChar, lengthChar);
+				UpdateCursor();
+			}
+			if (FlagSet(nt->modificationType, ModificationFlags::BeforeDelete)) {
+				int startChar = CharacterOffsetFromByteOffset(nt->position);
+				int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length);
+				g_signal_emit_by_name(accessible, "text-changed::delete", startChar, lengthChar);
+			}
+			if (FlagSet(nt->modificationType, ModificationFlags::DeleteText)) {
+				UpdateCursor();
+			}
+			if (FlagSet(nt->modificationType, ModificationFlags::ChangeStyle)) {
+				g_signal_emit_by_name(accessible, "text-attributes-changed");
+			}
+		} break;
+		case Notification::UpdateUI: {
+			if (FlagSet(nt->updated, Update::Selection)) {
+				UpdateCursor();
+			}
+		} break;
+		default:
+			break;
+	}
+}
+
+// ATK method wrappers
+
+// wraps a call from the accessible object to the ScintillaGTKAccessible, and avoid leaking any exception
+#define WRAPPER_METHOD_BODY(accessible, call, defret) \
+	try { \
+		ScintillaGTKAccessible *thisAccessible = FromAccessible(reinterpret_cast<GtkAccessible*>(accessible)); \
+		if (thisAccessible) { \
+			return thisAccessible->call; \
+		} else { \
+			return defret; \
+		} \
+	} catch (...) { \
+		return defret; \
+	}
+
+// AtkText
+gchar *ScintillaGTKAccessible::AtkTextIface::GetText(AtkText *text, int start_offset, int end_offset) {
+	WRAPPER_METHOD_BODY(text, GetText(start_offset, end_offset), nullptr);
+}
+gchar *ScintillaGTKAccessible::AtkTextIface::GetTextAfterOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset) {
+	WRAPPER_METHOD_BODY(text, GetTextAfterOffset(offset, boundary_type, start_offset, end_offset), nullptr)
+}
+gchar *ScintillaGTKAccessible::AtkTextIface::GetTextBeforeOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset) {
+	WRAPPER_METHOD_BODY(text, GetTextBeforeOffset(offset, boundary_type, start_offset, end_offset), nullptr)
+}
+gchar *ScintillaGTKAccessible::AtkTextIface::GetTextAtOffset(AtkText *text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) {
+	WRAPPER_METHOD_BODY(text, GetTextAtOffset(offset, boundary_type, start_offset, end_offset), nullptr)
+}
+#if ATK_CHECK_VERSION(2, 10, 0)
+gchar *ScintillaGTKAccessible::AtkTextIface::GetStringAtOffset(AtkText *text, gint offset, AtkTextGranularity granularity, gint *start_offset, gint *end_offset) {
+	WRAPPER_METHOD_BODY(text, GetStringAtOffset(offset, granularity, start_offset, end_offset), nullptr)
+}
+#endif
+gunichar ScintillaGTKAccessible::AtkTextIface::GetCharacterAtOffset(AtkText *text, gint offset) {
+	WRAPPER_METHOD_BODY(text, GetCharacterAtOffset(offset), 0)
+}
+gint ScintillaGTKAccessible::AtkTextIface::GetCharacterCount(AtkText *text) {
+	WRAPPER_METHOD_BODY(text, GetCharacterCount(), 0)
+}
+gint ScintillaGTKAccessible::AtkTextIface::GetCaretOffset(AtkText *text) {
+	WRAPPER_METHOD_BODY(text, GetCaretOffset(), 0)
+}
+gboolean ScintillaGTKAccessible::AtkTextIface::SetCaretOffset(AtkText *text, gint offset) {
+	WRAPPER_METHOD_BODY(text, SetCaretOffset(offset), FALSE)
+}
+gint ScintillaGTKAccessible::AtkTextIface::GetOffsetAtPoint(AtkText *text, gint x, gint y, AtkCoordType coords) {
+	WRAPPER_METHOD_BODY(text, GetOffsetAtPoint(x, y, coords), -1)
+}
+void ScintillaGTKAccessible::AtkTextIface::GetCharacterExtents(AtkText *text, gint offset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords) {
+	WRAPPER_METHOD_BODY(text, GetCharacterExtents(offset, x, y, width, height, coords), )
+}
+AtkAttributeSet *ScintillaGTKAccessible::AtkTextIface::GetRunAttributes(AtkText *text, gint offset, gint *start_offset, gint *end_offset) {
+	WRAPPER_METHOD_BODY(text, GetRunAttributes(offset, start_offset, end_offset), nullptr)
+}
+AtkAttributeSet *ScintillaGTKAccessible::AtkTextIface::GetDefaultAttributes(AtkText *text) {
+	WRAPPER_METHOD_BODY(text, GetDefaultAttributes(), nullptr)
+}
+gint ScintillaGTKAccessible::AtkTextIface::GetNSelections(AtkText *text) {
+	WRAPPER_METHOD_BODY(text, GetNSelections(), 0)
+}
+gchar *ScintillaGTKAccessible::AtkTextIface::GetSelection(AtkText *text, gint selection_num, gint *start_pos, gint *end_pos) {
+	WRAPPER_METHOD_BODY(text, GetSelection(selection_num, start_pos, end_pos), nullptr)
+}
+gboolean ScintillaGTKAccessible::AtkTextIface::AddSelection(AtkText *text, gint start, gint end) {
+	WRAPPER_METHOD_BODY(text, AddSelection(start, end), FALSE)
+}
+gboolean ScintillaGTKAccessible::AtkTextIface::RemoveSelection(AtkText *text, gint selection_num) {
+	WRAPPER_METHOD_BODY(text, RemoveSelection(selection_num), FALSE)
+}
+gboolean ScintillaGTKAccessible::AtkTextIface::SetSelection(AtkText *text, gint selection_num, gint start, gint end) {
+	WRAPPER_METHOD_BODY(text, SetSelection(selection_num, start, end), FALSE)
+}
+// AtkEditableText
+void ScintillaGTKAccessible::AtkEditableTextIface::SetTextContents(AtkEditableText *text, const gchar *contents) {
+	WRAPPER_METHOD_BODY(text, SetTextContents(contents), )
+}
+void ScintillaGTKAccessible::AtkEditableTextIface::InsertText(AtkEditableText *text, const gchar *contents, gint length, gint *position) {
+	WRAPPER_METHOD_BODY(text, InsertText(contents, length, position), )
+}
+void ScintillaGTKAccessible::AtkEditableTextIface::CopyText(AtkEditableText *text, gint start, gint end) {
+	WRAPPER_METHOD_BODY(text, CopyText(start, end), )
+}
+void ScintillaGTKAccessible::AtkEditableTextIface::CutText(AtkEditableText *text, gint start, gint end) {
+	WRAPPER_METHOD_BODY(text, CutText(start, end), )
+}
+void ScintillaGTKAccessible::AtkEditableTextIface::DeleteText(AtkEditableText *text, gint start, gint end) {
+	WRAPPER_METHOD_BODY(text, DeleteText(start, end), )
+}
+void ScintillaGTKAccessible::AtkEditableTextIface::PasteText(AtkEditableText *text, gint position) {
+	WRAPPER_METHOD_BODY(text, PasteText(position), )
+}
+
+// GObject glue
+
+#if HAVE_GTK_FACTORY
+static GType scintilla_object_accessible_factory_get_type(void);
+#endif
+
+static void scintilla_object_accessible_init(ScintillaObjectAccessible *accessible);
+static void scintilla_object_accessible_class_init(ScintillaObjectAccessibleClass *klass);
+static gpointer scintilla_object_accessible_parent_class = nullptr;
+
+
+// @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
+static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
+	static gsize type_id_result = 0;
+
+	if (g_once_init_enter(&type_id_result)) {
+		GTypeInfo tinfo = {
+			0,															/* class size */
+			(GBaseInitFunc) nullptr,										/* base init */
+			(GBaseFinalizeFunc) nullptr,									/* base finalize */
+			(GClassInitFunc) scintilla_object_accessible_class_init,	/* class init */
+			(GClassFinalizeFunc) nullptr,									/* class finalize */
+			nullptr,														/* class data */
+			0,															/* instance size */
+			0,															/* nb preallocs */
+			(GInstanceInitFunc) scintilla_object_accessible_init,		/* instance init */
+			nullptr														/* value table */
+		};
+
+		const GInterfaceInfo atk_text_info = {
+			(GInterfaceInitFunc) ScintillaGTKAccessible::AtkTextIface::init,
+			(GInterfaceFinalizeFunc) nullptr,
+			nullptr
+		};
+
+		const GInterfaceInfo atk_editable_text_info = {
+			(GInterfaceInitFunc) ScintillaGTKAccessible::AtkEditableTextIface::init,
+			(GInterfaceFinalizeFunc) nullptr,
+			nullptr
+		};
+
+#if HAVE_GTK_A11Y_H
+		// good, we have gtk-a11y.h, we can use that
+		GType derived_atk_type = GTK_TYPE_CONTAINER_ACCESSIBLE;
+		tinfo.class_size = sizeof (GtkContainerAccessibleClass);
+		tinfo.instance_size = sizeof (GtkContainerAccessible);
+#else // ! HAVE_GTK_A11Y_H
+# if HAVE_GTK_FACTORY
+		// Figure out the size of the class and instance we are deriving from through the registry
+		GType derived_type = g_type_parent(SCINTILLA_TYPE_OBJECT);
+		AtkObjectFactory *factory = atk_registry_get_factory(atk_get_default_registry(), derived_type);
+		GType derived_atk_type = atk_object_factory_get_accessible_type(factory);
+# else // ! HAVE_GTK_FACTORY
+		// We're kind of screwed and can't determine the parent (no registry, and no public type)
+		// Hack your way around by requiring the caller to give us our parent type.  The caller
+		// might be able to trick its way into doing that, by e.g. instantiating the parent's
+		// accessible type and get its GType.  It's ugly but we can't do better on GTK 3.2 to 3.6.
+		g_assert(parent_type != 0);
+
+		GType derived_atk_type = parent_type;
+# endif // ! HAVE_GTK_FACTORY
+
+		GTypeQuery query;
+		g_type_query(derived_atk_type, &query);
+		tinfo.class_size = query.class_size;
+		tinfo.instance_size = query.instance_size;
+#endif // ! HAVE_GTK_A11Y_H
+
+		GType type_id = g_type_register_static(derived_atk_type, "ScintillaObjectAccessible", &tinfo, (GTypeFlags) 0);
+		g_type_add_interface_static(type_id, ATK_TYPE_TEXT, &atk_text_info);
+		g_type_add_interface_static(type_id, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
+
+		g_once_init_leave(&type_id_result, type_id);
+	}
+
+	return type_id_result;
+}
+
+static AtkObject *scintilla_object_accessible_new(GType parent_type, GObject *obj) {
+	g_return_val_if_fail(SCINTILLA_IS_OBJECT(obj), nullptr);
+
+	AtkObject *accessible = (AtkObject *) g_object_new(scintilla_object_accessible_get_type(parent_type),
+#if HAVE_WIDGET_SET_UNSET
+		"widget", obj,
+#endif
+		nullptr);
+	atk_object_initialize(accessible, obj);
+
+	return accessible;
+}
+
+// implementation for gtk_widget_get_accessible().
+// See the comment at the top of the file for details on the implementation
+// @p widget the widget.
+// @p cache pointer to store the AtkObject between repeated calls.  Might or might not be filled.
+// @p widget_parent_class pointer to the widget's parent class (to chain up method calls).
+AtkObject *ScintillaGTKAccessible::WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class G_GNUC_UNUSED) {
+	if (*cache != nullptr) {
+		return *cache;
+	}
+
+#if HAVE_GTK_A11Y_H // just instantiate the accessible
+	*cache = scintilla_object_accessible_new(0, G_OBJECT(widget));
+#elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate
+	static gsize registered = 0;
+
+	if (g_once_init_enter(&registered)) {
+		// Figure out whether accessibility is enabled by looking at the type of the accessible
+		// object which would be created for the parent type of ScintillaObject.
+		GType derived_type = g_type_parent(SCINTILLA_TYPE_OBJECT);
+
+		AtkRegistry *registry = atk_get_default_registry();
+		AtkObjectFactory *factory = atk_registry_get_factory(registry, derived_type);
+		GType derived_atk_type = atk_object_factory_get_accessible_type(factory);
+		if (g_type_is_a(derived_atk_type, GTK_TYPE_ACCESSIBLE)) {
+			atk_registry_set_factory_type(registry, SCINTILLA_TYPE_OBJECT,
+			                              scintilla_object_accessible_factory_get_type());
+		}
+		g_once_init_leave(&registered, 1);
+	}
+	AtkObject *obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget);
+	*cache = static_cast<AtkObject*>(g_object_ref(obj));
+#else // no public API, no factory, so guess from the parent and instantiate
+	static GType parent_atk_type = 0;
+
+	if (parent_atk_type == 0) {
+		AtkObject *parent_obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget);
+		if (parent_obj) {
+			parent_atk_type = G_OBJECT_TYPE(parent_obj);
+
+			// Figure out whether accessibility is enabled by looking at the type of the accessible
+			// object which would be created for the parent type of ScintillaObject.
+			if (g_type_is_a(parent_atk_type, GTK_TYPE_ACCESSIBLE)) {
+				*cache = scintilla_object_accessible_new(parent_atk_type, G_OBJECT(widget));
+			} else {
+				*cache = static_cast<AtkObject*>(g_object_ref(parent_obj));
+			}
+		}
+	}
+#endif
+	return *cache;
+}
+
+static AtkStateSet *scintilla_object_accessible_ref_state_set(AtkObject *accessible) {
+	AtkStateSet *state_set = ATK_OBJECT_CLASS(scintilla_object_accessible_parent_class)->ref_state_set(accessible);
+
+	GtkWidget *widget = gtk_accessible_get_widget(GTK_ACCESSIBLE(accessible));
+	if (widget == nullptr) {
+		atk_state_set_add_state(state_set, ATK_STATE_DEFUNCT);
+	} else {
+		if (! scintilla_send_message(SCINTILLA_OBJECT(widget), static_cast<int>(Message::GetReadOnly), 0, 0))
+			atk_state_set_add_state(state_set, ATK_STATE_EDITABLE);
+#if ATK_CHECK_VERSION(2, 16, 0)
+		else
+			atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
+#endif
+		atk_state_set_add_state(state_set, ATK_STATE_MULTI_LINE);
+		atk_state_set_add_state(state_set, ATK_STATE_MULTISELECTABLE);
+		atk_state_set_add_state(state_set, ATK_STATE_SELECTABLE_TEXT);
+		/*atk_state_set_add_state(state_set, ATK_STATE_SUPPORTS_AUTOCOMPLETION);*/
+	}
+
+	return state_set;
+}
+
+static void scintilla_object_accessible_widget_set(GtkAccessible *accessible) {
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+	if (widget == nullptr)
+		return;
+
+	ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible);
+	if (priv->pscin)
+		delete priv->pscin;
+	priv->pscin = new ScintillaGTKAccessible(accessible, widget);
+}
+
+#if HAVE_WIDGET_SET_UNSET
+static void scintilla_object_accessible_widget_unset(GtkAccessible *accessible) {
+	GtkWidget *widget = gtk_accessible_get_widget(accessible);
+	if (widget == nullptr)
+		return;
+
+	ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible);
+	delete priv->pscin;
+	priv->pscin = 0;
+}
+#endif
+
+static void scintilla_object_accessible_initialize(AtkObject *obj, gpointer data) {
+	ATK_OBJECT_CLASS(scintilla_object_accessible_parent_class)->initialize(obj, data);
+
+#if ! HAVE_WIDGET_SET_UNSET
+	scintilla_object_accessible_widget_set(GTK_ACCESSIBLE(obj));
+#endif
+
+	obj->role = ATK_ROLE_TEXT;
+}
+
+static void scintilla_object_accessible_finalize(GObject *object) {
+	ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(object);
+
+	if (priv->pscin) {
+		delete priv->pscin;
+		priv->pscin = nullptr;
+	}
+
+	G_OBJECT_CLASS(scintilla_object_accessible_parent_class)->finalize(object);
+}
+
+static void scintilla_object_accessible_class_init(ScintillaObjectAccessibleClass *klass) {
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+	AtkObjectClass *object_class = ATK_OBJECT_CLASS(klass);
+
+#if HAVE_WIDGET_SET_UNSET
+	GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS(klass);
+	accessible_class->widget_set = scintilla_object_accessible_widget_set;
+	accessible_class->widget_unset = scintilla_object_accessible_widget_unset;
+#endif
+
+	object_class->ref_state_set = scintilla_object_accessible_ref_state_set;
+	object_class->initialize = scintilla_object_accessible_initialize;
+
+	gobject_class->finalize = scintilla_object_accessible_finalize;
+
+	scintilla_object_accessible_parent_class = g_type_class_peek_parent(klass);
+
+	g_type_class_add_private(klass, sizeof (ScintillaObjectAccessiblePrivate));
+}
+
+static void scintilla_object_accessible_init(ScintillaObjectAccessible *accessible) {
+	ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible);
+
+	priv->pscin = nullptr;
+}
+
+#if HAVE_GTK_FACTORY
+// Object factory
+typedef AtkObjectFactory ScintillaObjectAccessibleFactory;
+typedef AtkObjectFactoryClass ScintillaObjectAccessibleFactoryClass;
+
+G_DEFINE_TYPE(ScintillaObjectAccessibleFactory, scintilla_object_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
+
+static void scintilla_object_accessible_factory_init(ScintillaObjectAccessibleFactory *) {
+}
+
+static GType scintilla_object_accessible_factory_get_accessible_type(void) {
+	return SCINTILLA_TYPE_OBJECT_ACCESSIBLE;
+}
+
+static AtkObject *scintilla_object_accessible_factory_create_accessible(GObject *obj) {
+	return scintilla_object_accessible_new(0, obj);
+}
+
+static void scintilla_object_accessible_factory_class_init(AtkObjectFactoryClass * klass) {
+	klass->create_accessible = scintilla_object_accessible_factory_create_accessible;
+	klass->get_accessible_type = scintilla_object_accessible_factory_get_accessible_type;
+}
+#endif
diff --git a/scite-app/scintilla/gtk/ScintillaGTKAccessible.h b/scite-app/scintilla/gtk/ScintillaGTKAccessible.h
new file mode 100644
index 0000000..169dd50
--- /dev/null
+++ b/scite-app/scintilla/gtk/ScintillaGTKAccessible.h
@@ -0,0 +1,194 @@
+/* Scintilla source code edit control */
+/* ScintillaGTKAccessible.h - GTK+ accessibility for ScintillaGTK */
+/* Copyright 2016 by Colomban Wendling <colomban@geany.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
+
+#ifndef SCINTILLAGTKACCESSIBLE_H
+#define SCINTILLAGTKACCESSIBLE_H
+
+namespace Scintilla::Internal {
+
+#ifndef ATK_CHECK_VERSION
+# define ATK_CHECK_VERSION(x, y, z) 0
+#endif
+
+class ScintillaGTKAccessible {
+private:
+	// weak references to related objects
+	GtkAccessible *accessible;
+	ScintillaGTK *sci;
+
+	// local state for comparing
+	Sci::Position old_pos;
+	std::vector<SelectionRange> old_sels;
+
+	bool Enabled() const;
+	void UpdateCursor();
+	void Notify(GtkWidget *widget, gint code, Scintilla::NotificationData *nt);
+	static void SciNotify(GtkWidget *widget, gint code, Scintilla::NotificationData *nt, gpointer data) {
+		try {
+			static_cast<ScintillaGTKAccessible*>(data)->Notify(widget, code, nt);
+		} catch (...) {}
+	}
+
+	Sci::Position ByteOffsetFromCharacterOffset(Sci::Position startByte, int characterOffset) {
+		if (!FlagSet(sci->pdoc->LineCharacterIndex(), Scintilla::LineCharacterIndexType::Utf32)) {
+			return startByte + characterOffset;
+		}
+		if (characterOffset > 0) {
+			// Try and reduce the range by reverse-looking into the character offset cache
+			Sci::Line lineStart = sci->pdoc->LineFromPosition(startByte);
+			Sci::Position posStart = sci->pdoc->IndexLineStart(lineStart, Scintilla::LineCharacterIndexType::Utf32);
+			Sci::Line line = sci->pdoc->LineFromPositionIndex(posStart + characterOffset, Scintilla::LineCharacterIndexType::Utf32);
+			if (line != lineStart) {
+				startByte += sci->pdoc->LineStart(line) - sci->pdoc->LineStart(lineStart);
+				characterOffset -= sci->pdoc->IndexLineStart(line, Scintilla::LineCharacterIndexType::Utf32) - posStart;
+			}
+		}
+		Sci::Position pos = sci->pdoc->GetRelativePosition(startByte, characterOffset);
+		if (pos == INVALID_POSITION) {
+			// clamp invalid positions inside the document
+			if (characterOffset > 0) {
+				return sci->pdoc->Length();
+			} else {
+				return 0;
+			}
+		}
+		return pos;
+	}
+
+	Sci::Position ByteOffsetFromCharacterOffset(Sci::Position characterOffset) {
+		return ByteOffsetFromCharacterOffset(0, characterOffset);
+	}
+
+	Sci::Position CharacterOffsetFromByteOffset(Sci::Position byteOffset) {
+		if (!FlagSet(sci->pdoc->LineCharacterIndex(), Scintilla::LineCharacterIndexType::Utf32)) {
+			return byteOffset;
+		}
+		const Sci::Line line = sci->pdoc->LineFromPosition(byteOffset);
+		const Sci::Position lineStart = sci->pdoc->LineStart(line);
+		return sci->pdoc->IndexLineStart(line, Scintilla::LineCharacterIndexType::Utf32) + sci->pdoc->CountCharacters(lineStart, byteOffset);
+	}
+
+	void CharacterRangeFromByteRange(Sci::Position startByte, Sci::Position endByte, int *startChar, int *endChar) {
+		*startChar = CharacterOffsetFromByteOffset(startByte);
+		*endChar = *startChar + sci->pdoc->CountCharacters(startByte, endByte);
+	}
+
+	void ByteRangeFromCharacterRange(int startChar, int endChar, Sci::Position& startByte, Sci::Position& endByte) {
+		startByte = ByteOffsetFromCharacterOffset(startChar);
+		endByte = ByteOffsetFromCharacterOffset(startByte, endChar - startChar);
+	}
+
+	Sci::Position PositionBefore(Sci::Position pos) {
+		return sci->pdoc->MovePositionOutsideChar(pos - 1, -1, true);
+	}
+
+	Sci::Position PositionAfter(Sci::Position pos) {
+		return sci->pdoc->MovePositionOutsideChar(pos + 1, 1, true);
+	}
+
+	int StyleAt(Sci::Position position, bool ensureStyle = false) {
+		if (ensureStyle)
+			sci->pdoc->EnsureStyledTo(position);
+		return sci->pdoc->StyleAt(position);
+	}
+
+	// For AtkText
+	gchar *GetTextRangeUTF8(Sci::Position startByte, Sci::Position endByte);
+	gchar *GetText(int startChar, int endChar);
+	gchar *GetTextAfterOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar);
+	gchar *GetTextBeforeOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar);
+	gchar *GetTextAtOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar);
+#if ATK_CHECK_VERSION(2, 10, 0)
+	gchar *GetStringAtOffset(int charOffset, AtkTextGranularity granularity, int *startChar, int *endChar);
+#endif
+	gunichar GetCharacterAtOffset(int charOffset);
+	gint GetCharacterCount();
+	gint GetCaretOffset();
+	gboolean SetCaretOffset(int charOffset);
+	gint GetOffsetAtPoint(gint x, gint y, AtkCoordType coords);
+	void GetCharacterExtents(int charOffset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords);
+	AtkAttributeSet *GetAttributesForStyle(unsigned int styleNum);
+	AtkAttributeSet *GetRunAttributes(int charOffset, int *startChar, int *endChar);
+	AtkAttributeSet *GetDefaultAttributes();
+	gint GetNSelections();
+	gchar *GetSelection(gint selection_num, int *startChar, int *endChar);
+	gboolean AddSelection(int startChar, int endChar);
+	gboolean RemoveSelection(int selection_num);
+	gboolean SetSelection(gint selection_num, int startChar, int endChar);
+	// for AtkEditableText
+	bool InsertStringUTF8(Sci::Position bytePos, const gchar *utf8, Sci::Position lengthBytes);
+	void SetTextContents(const gchar *contents);
+	void InsertText(const gchar *text, int lengthBytes, int *charPosition);
+	void CopyText(int startChar, int endChar);
+	void CutText(int startChar, int endChar);
+	void DeleteText(int startChar, int endChar);
+	void PasteText(int charPosition);
+
+public:
+	ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_);
+	~ScintillaGTKAccessible();
+
+	static ScintillaGTKAccessible *FromAccessible(GtkAccessible *accessible);
+	static ScintillaGTKAccessible *FromAccessible(AtkObject *accessible) {
+		return FromAccessible(GTK_ACCESSIBLE(accessible));
+	}
+	// So ScintillaGTK can notify us
+	void ChangeDocument(Document *oldDoc, Document *newDoc);
+	void NotifyReadOnly();
+	void SetAccessibility(bool enabled);
+
+	// Helper GtkWidget methods
+	static AtkObject *WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class);
+
+	// ATK methods
+
+	class AtkTextIface {
+	public:
+		static void init(::AtkTextIface *iface);
+
+	private:
+		AtkTextIface();
+
+		static gchar *GetText(AtkText *text, int start_offset, int end_offset);
+		static gchar *GetTextAfterOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset);
+		static gchar *GetTextBeforeOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset);
+		static gchar *GetTextAtOffset(AtkText *text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset);
+#if ATK_CHECK_VERSION(2, 10, 0)
+		static gchar *GetStringAtOffset(AtkText *text, gint offset, AtkTextGranularity granularity, gint *start_offset, gint *end_offset);
+#endif
+		static gunichar GetCharacterAtOffset(AtkText *text, gint offset);
+		static gint GetCharacterCount(AtkText *text);
+		static gint GetCaretOffset(AtkText *text);
+		static gboolean SetCaretOffset(AtkText *text, gint offset);
+		static gint GetOffsetAtPoint(AtkText *text, gint x, gint y, AtkCoordType coords);
+		static void GetCharacterExtents(AtkText *text, gint offset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords);
+		static AtkAttributeSet *GetRunAttributes(AtkText *text, gint offset, gint *start_offset, gint *end_offset);
+		static AtkAttributeSet *GetDefaultAttributes(AtkText *text);
+		static gint GetNSelections(AtkText *text);
+		static gchar *GetSelection(AtkText *text, gint selection_num, gint *start_pos, gint *end_pos);
+		static gboolean AddSelection(AtkText *text, gint start, gint end);
+		static gboolean RemoveSelection(AtkText *text, gint selection_num);
+		static gboolean SetSelection(AtkText *text, gint selection_num, gint start, gint end);
+	};
+	class AtkEditableTextIface {
+	public:
+		static void init(::AtkEditableTextIface *iface);
+
+	private:
+		AtkEditableTextIface();
+
+		static void SetTextContents(AtkEditableText *text, const gchar *contents);
+		static void InsertText(AtkEditableText *text, const gchar *contents, gint length, gint *position);
+		static void CopyText(AtkEditableText *text, gint start, gint end);
+		static void CutText(AtkEditableText *text, gint start, gint end);
+		static void DeleteText(AtkEditableText *text, gint start, gint end);
+		static void PasteText(AtkEditableText *text, gint position);
+	};
+};
+
+}
+
+
+#endif
diff --git a/scite-app/scintilla/gtk/deps.mak b/scite-app/scintilla/gtk/deps.mak
new file mode 100644
index 0000000..30c6412
--- /dev/null
+++ b/scite-app/scintilla/gtk/deps.mak
@@ -0,0 +1,485 @@
+# Created by DepGen.py. To recreate, run DepGen.py.
+PlatGTK.o: \
+	PlatGTK.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../include/Scintilla.h \
+	../include/Sci_Position.h \
+	../include/ScintillaWidget.h \
+	../src/XPM.h \
+	../src/UniConversion.h \
+	Converter.h
+ScintillaGTK.o: \
+	ScintillaGTK.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../include/Scintilla.h \
+	../include/ScintillaWidget.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/CaseConvert.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h \
+	ScintillaGTK.h \
+	scintilla-marshal.h \
+	ScintillaGTKAccessible.h \
+	Converter.h
+ScintillaGTKAccessible.o: \
+	ScintillaGTKAccessible.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../include/Scintilla.h \
+	../include/ScintillaWidget.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/CaseConvert.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h \
+	ScintillaGTK.h \
+	ScintillaGTKAccessible.h
+AutoComplete.o: \
+	../src/AutoComplete.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/Position.h \
+	../src/AutoComplete.h
+CallTip.o: \
+	../src/CallTip.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/CallTip.h
+CaseConvert.o: \
+	../src/CaseConvert.cxx \
+	../src/CaseConvert.h \
+	../src/UniConversion.h
+CaseFolder.o: \
+	../src/CaseFolder.cxx \
+	../src/CaseFolder.h \
+	../src/CaseConvert.h
+CellBuffer.o: \
+	../src/CellBuffer.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/UniConversion.h
+CharacterCategoryMap.o: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+CharacterType.o: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
+CharClassify.o: \
+	../src/CharClassify.cxx \
+	../src/CharacterType.h \
+	../src/CharClassify.h
+ContractionState.o: \
+	../src/ContractionState.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ContractionState.h
+DBCS.o: \
+	../src/DBCS.cxx \
+	../src/DBCS.h
+Decoration.o: \
+	../src/Decoration.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/Decoration.h
+Document.o: \
+	../src/Document.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/RESearch.h \
+	../src/UniConversion.h \
+	../src/ElapsedPeriod.h
+EditModel.o: \
+	../src/EditModel.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h
+Editor.o: \
+	../src/Editor.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/DBCS.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/ElapsedPeriod.h
+EditView.o: \
+	../src/EditView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/ElapsedPeriod.h
+Geometry.o: \
+	../src/Geometry.cxx \
+	../src/Geometry.h
+Indicator.o: \
+	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Indicator.h \
+	../src/XPM.h
+KeyMap.o: \
+	../src/KeyMap.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/KeyMap.h
+LineMarker.o: \
+	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/UniConversion.h
+MarginView.o: \
+	../src/MarginView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h
+PerLine.o: \
+	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h
+PositionCache.o: \
+	../src/PositionCache.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h
+RESearch.o: \
+	../src/RESearch.cxx \
+	../src/Position.h \
+	../src/CharClassify.h \
+	../src/RESearch.h
+RunStyles.o: \
+	../src/RunStyles.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h
+ScintillaBase.o: \
+	../src/ScintillaBase.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h
+Selection.o: \
+	../src/Selection.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/Selection.h
+Style.o: \
+	../src/Style.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Style.h
+UniConversion.o: \
+	../src/UniConversion.cxx \
+	../src/UniConversion.h
+UniqueString.o: \
+	../src/UniqueString.cxx \
+	../src/UniqueString.h
+ViewStyle.o: \
+	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/Indicator.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h
+XPM.o: \
+	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h
diff --git a/scite-app/scintilla/gtk/makefile b/scite-app/scintilla/gtk/makefile
new file mode 100644
index 0000000..1befa11
--- /dev/null
+++ b/scite-app/scintilla/gtk/makefile
@@ -0,0 +1,171 @@
+# Make file for Scintilla on Linux, macOS, or Windows
+# @file makefile
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile assumes GCC 9.0+ is used and changes will be needed to use other compilers.
+# Clang 9.0+ can be used with CLANG=1 on command line.
+# Builds for GTK+ 2 and 3. GTK 3 requires GTK3=1 on command line.
+# Also works with ming32-make on Windows.
+
+.PHONY: static shared all clean analyze depend
+
+.SUFFIXES: .cxx .c .o .h .a .list
+
+srcdir ?= .
+basedir = $(srcdir)/..
+
+WARNINGS = -Wpedantic -Wall
+ifdef CLANG
+CXX = clang++
+CC = clang
+WARNINGS += -Wno-deprecated-register
+ifdef windir
+# Turn off some warnings that occur when Clang is being used on Windows where it
+# is including Microsoft headers.
+# incompatible-ms-struct is because more complex structs are not quite the same as MSVC
+WARNINGS += -Wno-incompatible-ms-struct
+# language-extension-token is because of __int64 in glib-2.0 glibconfig.h
+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
+SANITIZE = address
+#SANITIZE = undefined
+BASE_FLAGS += -fsanitize=$(SANITIZE)
+endif
+ARFLAGS = rc
+RANLIB ?= ranlib
+PKG_CONFIG ?= pkg-config
+
+GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
+
+# Environment variable windir always defined on Win32
+
+# Enable Position Independent Code except on Windows where it is the default so the flag produces a warning
+ifndef windir
+BASE_FLAGS += -fPIC
+endif
+
+LDFLAGS += -dynamiclib
+LDFLAGS += -shared
+
+# Take care of changing Unix style '/' directory separator to '\' on Windows
+normalize = $(if $(windir),$(subst /,\,$1),$1)
+
+PYTHON = $(if $(windir),pyw,python3)
+
+SHAREDEXTENSION = $(if $(windir),dll,so)
+
+ifdef windir
+CC = gcc
+DEL = del /q
+else
+DEL = rm -f
+endif
+COMPLIB=$(basedir)/bin/scintilla.a
+COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
+
+vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
+vpath %.c $(srcdir)
+vpath %.cxx $(srcdir) $(basedir)/src
+
+INCLUDES=-I $(basedir)/include -I $(basedir)/src
+DEFINES += -DGTK
+BASE_FLAGS += $(WARNINGS)
+
+ifdef NO_CXX11_REGEX
+DEFINES += -DNO_CXX11_REGEX
+endif
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
+CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
+
+CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gmodule-no-export-2.0)
+MARSHALLER=scintilla-marshal.o
+
+all: $(COMPLIB) $(COMPONENT)
+
+static: $(COMPLIB)
+
+shared: $(COMPONENT)
+
+clean:
+	$(DEL) *.o $(call normalize,$(COMPLIB)) $(call normalize,$(COMPONENT)) *.plist
+
+%.o: %.cxx
+	$(CXX) $(CPPFLAGS) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
+
+GLIB_GENMARSHAL = glib-genmarshal
+GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
+
+%.h: %.list
+	$(GLIB_GENMARSHAL) --header $(GLIB_GENMARSHAL_FLAGS) $< > $@
+%.c: %.list
+	$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
+
+analyze:
+	clang --analyze $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(basedir)/src/*.cxx
+
+depend deps.mak:
+	$(PYTHON) DepGen.py
+
+LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(basedir)/lexers/Lex*.cxx)))))
+
+# Required for base Scintilla
+SRC_OBJS = \
+	AutoComplete.o \
+	CallTip.o \
+	CaseConvert.o \
+	CaseFolder.o \
+	CellBuffer.o \
+	CharacterCategoryMap.o \
+	CharacterType.o \
+	CharClassify.o \
+	ContractionState.o \
+	DBCS.o \
+	Decoration.o \
+	Document.o \
+	EditModel.o \
+	Editor.o \
+	EditView.o \
+	Geometry.o \
+	Indicator.o \
+	KeyMap.o \
+	LineMarker.o \
+	MarginView.o \
+	PerLine.o \
+	PositionCache.o \
+	RESearch.o \
+	RunStyles.o \
+	Selection.o \
+	Style.o \
+	UniConversion.o \
+	UniqueString.o \
+	ViewStyle.o \
+	XPM.o
+
+GTK_OBJS = \
+	ScintillaBase.o \
+	PlatGTK.o \
+	ScintillaGTK.o \
+	ScintillaGTKAccessible.o
+
+$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+	$(RANLIB) $@
+
+$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
+
+# Automatically generate header dependencies with "make deps"
+include deps.mak
diff --git a/scite-app/scintilla/gtk/scintilla-marshal.c b/scite-app/scintilla/gtk/scintilla-marshal.c
new file mode 100644
index 0000000..ea013eb
--- /dev/null
+++ b/scite-app/scintilla/gtk/scintilla-marshal.c
@@ -0,0 +1,122 @@
+#include <glib-object.h>
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+/* VOID:INT,OBJECT (scintilla-marshal.list:1) */
+void
+scintilla_marshal_VOID__INT_OBJECT (GClosure     *closure,
+                                    GValue       *return_value G_GNUC_UNUSED,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                    gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1,
+                                                 gint arg1,
+                                                 gpointer arg2,
+                                                 gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_OBJECT callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/* VOID:INT,BOXED (scintilla-marshal.list:2) */
+void
+scintilla_marshal_VOID__INT_BOXED (GClosure     *closure,
+                                   GValue       *return_value G_GNUC_UNUSED,
+                                   guint         n_param_values,
+                                   const GValue *param_values,
+                                   gpointer      invocation_hint G_GNUC_UNUSED,
+                                   gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1,
+                                                gint arg1,
+                                                gpointer arg2,
+                                                gpointer data2);
+  GCClosure *cc = (GCClosure *) closure;
+  gpointer data1, data2;
+  GMarshalFunc_VOID__INT_BOXED callback;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__INT_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_int (param_values + 1),
+            g_marshal_value_peek_boxed (param_values + 2),
+            data2);
+}
+
diff --git a/scite-app/scintilla/gtk/scintilla-marshal.h b/scite-app/scintilla/gtk/scintilla-marshal.h
new file mode 100644
index 0000000..cac17ad
--- /dev/null
+++ b/scite-app/scintilla/gtk/scintilla-marshal.h
@@ -0,0 +1,30 @@
+/* This file is generated, all changes will be lost */
+#ifndef __SCINTILLA_MARSHAL_MARSHAL_H__
+#define __SCINTILLA_MARSHAL_MARSHAL_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* VOID:INT,OBJECT (scintilla-marshal.list:1) */
+extern
+void scintilla_marshal_VOID__INT_OBJECT (GClosure     *closure,
+                                         GValue       *return_value,
+                                         guint         n_param_values,
+                                         const GValue *param_values,
+                                         gpointer      invocation_hint,
+                                         gpointer      marshal_data);
+
+/* VOID:INT,BOXED (scintilla-marshal.list:2) */
+extern
+void scintilla_marshal_VOID__INT_BOXED (GClosure     *closure,
+                                        GValue       *return_value,
+                                        guint         n_param_values,
+                                        const GValue *param_values,
+                                        gpointer      invocation_hint,
+                                        gpointer      marshal_data);
+
+
+G_END_DECLS
+
+#endif /* __SCINTILLA_MARSHAL_MARSHAL_H__ */
diff --git a/scite-app/scintilla/gtk/scintilla-marshal.list b/scite-app/scintilla/gtk/scintilla-marshal.list
new file mode 100644
index 0000000..b2e2a21
--- /dev/null
+++ b/scite-app/scintilla/gtk/scintilla-marshal.list
@@ -0,0 +1,2 @@
+VOID:INT,OBJECT
+VOID:INT,BOXED
diff --git a/scite-app/scintilla/include/ILexer.h b/scite-app/scintilla/include/ILexer.h
new file mode 100644
index 0000000..bc9ee1a
--- /dev/null
+++ b/scite-app/scintilla/include/ILexer.h
@@ -0,0 +1,85 @@
+// Scintilla source code edit control
+/** @file ILexer.h
+ ** Interface between Scintilla and lexers.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef ILEXER_H
+#define ILEXER_H
+
+#include "Sci_Position.h"
+
+namespace Scintilla {
+
+enum { dvRelease4=2 };
+
+class IDocument {
+public:
+	virtual int SCI_METHOD Version() const = 0;
+	virtual void SCI_METHOD SetErrorStatus(int status) = 0;
+	virtual Sci_Position SCI_METHOD Length() const = 0;
+	virtual void SCI_METHOD GetCharRange(char *buffer, Sci_Position position, Sci_Position lengthRetrieve) const = 0;
+	virtual char SCI_METHOD StyleAt(Sci_Position position) const = 0;
+	virtual Sci_Position SCI_METHOD LineFromPosition(Sci_Position position) const = 0;
+	virtual Sci_Position SCI_METHOD LineStart(Sci_Position line) const = 0;
+	virtual int SCI_METHOD GetLevel(Sci_Position line) const = 0;
+	virtual int SCI_METHOD SetLevel(Sci_Position line, int level) = 0;
+	virtual int SCI_METHOD GetLineState(Sci_Position line) const = 0;
+	virtual int SCI_METHOD SetLineState(Sci_Position line, int state) = 0;
+	virtual void SCI_METHOD StartStyling(Sci_Position position) = 0;
+	virtual bool SCI_METHOD SetStyleFor(Sci_Position length, char style) = 0;
+	virtual bool SCI_METHOD SetStyles(Sci_Position length, const char *styles) = 0;
+	virtual void SCI_METHOD DecorationSetCurrentIndicator(int indicator) = 0;
+	virtual void SCI_METHOD DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) = 0;
+	virtual void SCI_METHOD ChangeLexerState(Sci_Position start, Sci_Position end) = 0;
+	virtual int SCI_METHOD CodePage() const = 0;
+	virtual bool SCI_METHOD IsDBCSLeadByte(char ch) const = 0;
+	virtual const char * SCI_METHOD BufferPointer() = 0;
+	virtual int SCI_METHOD GetLineIndentation(Sci_Position line) = 0;
+	virtual Sci_Position SCI_METHOD LineEnd(Sci_Position line) const = 0;
+	virtual Sci_Position SCI_METHOD GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const = 0;
+	virtual int SCI_METHOD GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const = 0;
+};
+
+enum { lvRelease4=2, lvRelease5=3 };
+
+class ILexer4 {
+public:
+	virtual int SCI_METHOD Version() const = 0;
+	virtual void SCI_METHOD Release() = 0;
+	virtual const char * SCI_METHOD PropertyNames() = 0;
+	virtual int SCI_METHOD PropertyType(const char *name) = 0;
+	virtual const char * SCI_METHOD DescribeProperty(const char *name) = 0;
+	virtual Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) = 0;
+	virtual const char * SCI_METHOD DescribeWordListSets() = 0;
+	virtual Sci_Position SCI_METHOD WordListSet(int n, const char *wl) = 0;
+	virtual void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
+	virtual void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
+	virtual void * SCI_METHOD PrivateCall(int operation, void *pointer) = 0;
+	virtual int SCI_METHOD LineEndTypesSupported() = 0;
+	virtual int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) = 0;
+	virtual int SCI_METHOD SubStylesStart(int styleBase) = 0;
+	virtual int SCI_METHOD SubStylesLength(int styleBase) = 0;
+	virtual int SCI_METHOD StyleFromSubStyle(int subStyle) = 0;
+	virtual int SCI_METHOD PrimaryStyleFromStyle(int style) = 0;
+	virtual void SCI_METHOD FreeSubStyles() = 0;
+	virtual void SCI_METHOD SetIdentifiers(int style, const char *identifiers) = 0;
+	virtual int SCI_METHOD DistanceToSecondaryStyles() = 0;
+	virtual const char * SCI_METHOD GetSubStyleBases() = 0;
+	virtual int SCI_METHOD NamedStyles() = 0;
+	virtual const char * SCI_METHOD NameOfStyle(int style) = 0;
+	virtual const char * SCI_METHOD TagsOfStyle(int style) = 0;
+	virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0;
+};
+
+class ILexer5 : public ILexer4 {
+public:
+	virtual const char * SCI_METHOD GetName() = 0;
+	virtual int SCI_METHOD  GetIdentifier() = 0;
+	virtual const char * SCI_METHOD PropertyGet(const char *key) = 0;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/ILoader.h b/scite-app/scintilla/include/ILoader.h
new file mode 100644
index 0000000..2fa69f5
--- /dev/null
+++ b/scite-app/scintilla/include/ILoader.h
@@ -0,0 +1,25 @@
+// Scintilla source code edit control
+/** @file ILoader.h
+ ** Interface for loading into a Scintilla document from a background thread.
+ **/
+// Copyright 1998-2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef ILOADER_H
+#define ILOADER_H
+
+#include "Sci_Position.h"
+
+namespace Scintilla {
+
+class ILoader {
+public:
+	virtual int SCI_METHOD Release() = 0;
+	// Returns a status code from SC_STATUS_*
+	virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
+	virtual void * SCI_METHOD ConvertToDocument() = 0;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/Sci_Position.h b/scite-app/scintilla/include/Sci_Position.h
new file mode 100644
index 0000000..abd0f34
--- /dev/null
+++ b/scite-app/scintilla/include/Sci_Position.h
@@ -0,0 +1,29 @@
+// Scintilla source code edit control
+/** @file Sci_Position.h
+ ** Define the Sci_Position type used in Scintilla's external interfaces.
+ ** These need to be available to clients written in C so are not in a C++ namespace.
+ **/
+// Copyright 2015 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCI_POSITION_H
+#define SCI_POSITION_H
+
+#include <stddef.h>
+
+// Basic signed type used throughout interface
+typedef ptrdiff_t Sci_Position;
+
+// Unsigned variant used for ILexer::Lex and ILexer::Fold
+typedef size_t Sci_PositionU;
+
+// For Sci_CharacterRange  which is defined as long to be compatible with Win32 CHARRANGE
+typedef long Sci_PositionCR;
+
+#ifdef _WIN32
+	#define SCI_METHOD __stdcall
+#else
+	#define SCI_METHOD
+#endif
+
+#endif
diff --git a/scite-app/scintilla/include/Scintilla.h b/scite-app/scintilla/include/Scintilla.h
new file mode 100644
index 0000000..97fbd3b
--- /dev/null
+++ b/scite-app/scintilla/include/Scintilla.h
@@ -0,0 +1,1371 @@
+/* Scintilla source code edit control */
+/** @file Scintilla.h
+ ** Interface to the edit control.
+ **/
+/* Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. HFacer.py does the generation. */
+
+#ifndef SCINTILLA_H
+#define SCINTILLA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_WIN32)
+/* Return false on failure: */
+int Scintilla_RegisterClasses(void *hInstance);
+int Scintilla_ReleaseResources(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+// Include header that defines basic numeric types.
+#include <stdint.h>
+
+// Define uptr_t, an unsigned integer type large enough to hold a pointer.
+typedef uintptr_t uptr_t;
+// Define sptr_t, a signed integer large enough to hold a pointer.
+typedef intptr_t sptr_t;
+
+#include "Sci_Position.h"
+
+typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus);
+
+#ifndef SCI_DISABLE_AUTOGENERATED
+
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+#define INVALID_POSITION -1
+#define SCI_START 2000
+#define SCI_OPTIONAL_START 3000
+#define SCI_LEXER_START 4000
+#define SCI_ADDTEXT 2001
+#define SCI_ADDSTYLEDTEXT 2002
+#define SCI_INSERTTEXT 2003
+#define SCI_CHANGEINSERTION 2672
+#define SCI_CLEARALL 2004
+#define SCI_DELETERANGE 2645
+#define SCI_CLEARDOCUMENTSTYLE 2005
+#define SCI_GETLENGTH 2006
+#define SCI_GETCHARAT 2007
+#define SCI_GETCURRENTPOS 2008
+#define SCI_GETANCHOR 2009
+#define SCI_GETSTYLEAT 2010
+#define SCI_REDO 2011
+#define SCI_SETUNDOCOLLECTION 2012
+#define SCI_SELECTALL 2013
+#define SCI_SETSAVEPOINT 2014
+#define SCI_GETSTYLEDTEXT 2015
+#define SCI_CANREDO 2016
+#define SCI_MARKERLINEFROMHANDLE 2017
+#define SCI_MARKERDELETEHANDLE 2018
+#define SCI_MARKERHANDLEFROMLINE 2732
+#define SCI_MARKERNUMBERFROMLINE 2733
+#define SCI_GETUNDOCOLLECTION 2019
+#define SCWS_INVISIBLE 0
+#define SCWS_VISIBLEALWAYS 1
+#define SCWS_VISIBLEAFTERINDENT 2
+#define SCWS_VISIBLEONLYININDENT 3
+#define SCI_GETVIEWWS 2020
+#define SCI_SETVIEWWS 2021
+#define SCTD_LONGARROW 0
+#define SCTD_STRIKEOUT 1
+#define SCI_GETTABDRAWMODE 2698
+#define SCI_SETTABDRAWMODE 2699
+#define SCI_POSITIONFROMPOINT 2022
+#define SCI_POSITIONFROMPOINTCLOSE 2023
+#define SCI_GOTOLINE 2024
+#define SCI_GOTOPOS 2025
+#define SCI_SETANCHOR 2026
+#define SCI_GETCURLINE 2027
+#define SCI_GETENDSTYLED 2028
+#define SC_EOL_CRLF 0
+#define SC_EOL_CR 1
+#define SC_EOL_LF 2
+#define SCI_CONVERTEOLS 2029
+#define SCI_GETEOLMODE 2030
+#define SCI_SETEOLMODE 2031
+#define SCI_STARTSTYLING 2032
+#define SCI_SETSTYLING 2033
+#define SCI_GETBUFFEREDDRAW 2034
+#define SCI_SETBUFFEREDDRAW 2035
+#define SCI_SETTABWIDTH 2036
+#define SCI_GETTABWIDTH 2121
+#define SCI_SETTABMINIMUMWIDTH 2724
+#define SCI_GETTABMINIMUMWIDTH 2725
+#define SCI_CLEARTABSTOPS 2675
+#define SCI_ADDTABSTOP 2676
+#define SCI_GETNEXTTABSTOP 2677
+#define SC_CP_UTF8 65001
+#define SCI_SETCODEPAGE 2037
+#define SCI_SETFONTLOCALE 2760
+#define SCI_GETFONTLOCALE 2761
+#define SC_IME_WINDOWED 0
+#define SC_IME_INLINE 1
+#define SCI_GETIMEINTERACTION 2678
+#define SCI_SETIMEINTERACTION 2679
+#define SC_ALPHA_TRANSPARENT 0
+#define SC_ALPHA_OPAQUE 255
+#define SC_ALPHA_NOALPHA 256
+#define SC_CURSORNORMAL -1
+#define SC_CURSORARROW 2
+#define SC_CURSORWAIT 4
+#define SC_CURSORREVERSEARROW 7
+#define MARKER_MAX 31
+#define SC_MARK_CIRCLE 0
+#define SC_MARK_ROUNDRECT 1
+#define SC_MARK_ARROW 2
+#define SC_MARK_SMALLRECT 3
+#define SC_MARK_SHORTARROW 4
+#define SC_MARK_EMPTY 5
+#define SC_MARK_ARROWDOWN 6
+#define SC_MARK_MINUS 7
+#define SC_MARK_PLUS 8
+#define SC_MARK_VLINE 9
+#define SC_MARK_LCORNER 10
+#define SC_MARK_TCORNER 11
+#define SC_MARK_BOXPLUS 12
+#define SC_MARK_BOXPLUSCONNECTED 13
+#define SC_MARK_BOXMINUS 14
+#define SC_MARK_BOXMINUSCONNECTED 15
+#define SC_MARK_LCORNERCURVE 16
+#define SC_MARK_TCORNERCURVE 17
+#define SC_MARK_CIRCLEPLUS 18
+#define SC_MARK_CIRCLEPLUSCONNECTED 19
+#define SC_MARK_CIRCLEMINUS 20
+#define SC_MARK_CIRCLEMINUSCONNECTED 21
+#define SC_MARK_BACKGROUND 22
+#define SC_MARK_DOTDOTDOT 23
+#define SC_MARK_ARROWS 24
+#define SC_MARK_PIXMAP 25
+#define SC_MARK_FULLRECT 26
+#define SC_MARK_LEFTRECT 27
+#define SC_MARK_AVAILABLE 28
+#define SC_MARK_UNDERLINE 29
+#define SC_MARK_RGBAIMAGE 30
+#define SC_MARK_BOOKMARK 31
+#define SC_MARK_VERTICALBOOKMARK 32
+#define SC_MARK_CHARACTER 10000
+#define SC_MARKNUM_FOLDEREND 25
+#define SC_MARKNUM_FOLDEROPENMID 26
+#define SC_MARKNUM_FOLDERMIDTAIL 27
+#define SC_MARKNUM_FOLDERTAIL 28
+#define SC_MARKNUM_FOLDERSUB 29
+#define SC_MARKNUM_FOLDER 30
+#define SC_MARKNUM_FOLDEROPEN 31
+#define SC_MASK_FOLDERS 0xFE000000
+#define SCI_MARKERDEFINE 2040
+#define SCI_MARKERSETFORE 2041
+#define SCI_MARKERSETBACK 2042
+#define SCI_MARKERSETBACKSELECTED 2292
+#define SCI_MARKERSETFORETRANSLUCENT 2294
+#define SCI_MARKERSETBACKTRANSLUCENT 2295
+#define SCI_MARKERSETBACKSELECTEDTRANSLUCENT 2296
+#define SCI_MARKERSETSTROKEWIDTH 2297
+#define SCI_MARKERENABLEHIGHLIGHT 2293
+#define SCI_MARKERADD 2043
+#define SCI_MARKERDELETE 2044
+#define SCI_MARKERDELETEALL 2045
+#define SCI_MARKERGET 2046
+#define SCI_MARKERNEXT 2047
+#define SCI_MARKERPREVIOUS 2048
+#define SCI_MARKERDEFINEPIXMAP 2049
+#define SCI_MARKERADDSET 2466
+#define SCI_MARKERSETALPHA 2476
+#define SCI_MARKERGETLAYER 2734
+#define SCI_MARKERSETLAYER 2735
+#define SC_MAX_MARGIN 4
+#define SC_MARGIN_SYMBOL 0
+#define SC_MARGIN_NUMBER 1
+#define SC_MARGIN_BACK 2
+#define SC_MARGIN_FORE 3
+#define SC_MARGIN_TEXT 4
+#define SC_MARGIN_RTEXT 5
+#define SC_MARGIN_COLOUR 6
+#define SCI_SETMARGINTYPEN 2240
+#define SCI_GETMARGINTYPEN 2241
+#define SCI_SETMARGINWIDTHN 2242
+#define SCI_GETMARGINWIDTHN 2243
+#define SCI_SETMARGINMASKN 2244
+#define SCI_GETMARGINMASKN 2245
+#define SCI_SETMARGINSENSITIVEN 2246
+#define SCI_GETMARGINSENSITIVEN 2247
+#define SCI_SETMARGINCURSORN 2248
+#define SCI_GETMARGINCURSORN 2249
+#define SCI_SETMARGINBACKN 2250
+#define SCI_GETMARGINBACKN 2251
+#define SCI_SETMARGINS 2252
+#define SCI_GETMARGINS 2253
+#define STYLE_DEFAULT 32
+#define STYLE_LINENUMBER 33
+#define STYLE_BRACELIGHT 34
+#define STYLE_BRACEBAD 35
+#define STYLE_CONTROLCHAR 36
+#define STYLE_INDENTGUIDE 37
+#define STYLE_CALLTIP 38
+#define STYLE_FOLDDISPLAYTEXT 39
+#define STYLE_LASTPREDEFINED 39
+#define STYLE_MAX 255
+#define SC_CHARSET_ANSI 0
+#define SC_CHARSET_DEFAULT 1
+#define SC_CHARSET_BALTIC 186
+#define SC_CHARSET_CHINESEBIG5 136
+#define SC_CHARSET_EASTEUROPE 238
+#define SC_CHARSET_GB2312 134
+#define SC_CHARSET_GREEK 161
+#define SC_CHARSET_HANGUL 129
+#define SC_CHARSET_MAC 77
+#define SC_CHARSET_OEM 255
+#define SC_CHARSET_RUSSIAN 204
+#define SC_CHARSET_OEM866 866
+#define SC_CHARSET_CYRILLIC 1251
+#define SC_CHARSET_SHIFTJIS 128
+#define SC_CHARSET_SYMBOL 2
+#define SC_CHARSET_TURKISH 162
+#define SC_CHARSET_JOHAB 130
+#define SC_CHARSET_HEBREW 177
+#define SC_CHARSET_ARABIC 178
+#define SC_CHARSET_VIETNAMESE 163
+#define SC_CHARSET_THAI 222
+#define SC_CHARSET_8859_15 1000
+#define SCI_STYLECLEARALL 2050
+#define SCI_STYLESETFORE 2051
+#define SCI_STYLESETBACK 2052
+#define SCI_STYLESETBOLD 2053
+#define SCI_STYLESETITALIC 2054
+#define SCI_STYLESETSIZE 2055
+#define SCI_STYLESETFONT 2056
+#define SCI_STYLESETEOLFILLED 2057
+#define SCI_STYLERESETDEFAULT 2058
+#define SCI_STYLESETUNDERLINE 2059
+#define SC_CASE_MIXED 0
+#define SC_CASE_UPPER 1
+#define SC_CASE_LOWER 2
+#define SC_CASE_CAMEL 3
+#define SCI_STYLEGETFORE 2481
+#define SCI_STYLEGETBACK 2482
+#define SCI_STYLEGETBOLD 2483
+#define SCI_STYLEGETITALIC 2484
+#define SCI_STYLEGETSIZE 2485
+#define SCI_STYLEGETFONT 2486
+#define SCI_STYLEGETEOLFILLED 2487
+#define SCI_STYLEGETUNDERLINE 2488
+#define SCI_STYLEGETCASE 2489
+#define SCI_STYLEGETCHARACTERSET 2490
+#define SCI_STYLEGETVISIBLE 2491
+#define SCI_STYLEGETCHANGEABLE 2492
+#define SCI_STYLEGETHOTSPOT 2493
+#define SCI_STYLESETCASE 2060
+#define SC_FONT_SIZE_MULTIPLIER 100
+#define SCI_STYLESETSIZEFRACTIONAL 2061
+#define SCI_STYLEGETSIZEFRACTIONAL 2062
+#define SC_WEIGHT_NORMAL 400
+#define SC_WEIGHT_SEMIBOLD 600
+#define SC_WEIGHT_BOLD 700
+#define SCI_STYLESETWEIGHT 2063
+#define SCI_STYLEGETWEIGHT 2064
+#define SCI_STYLESETCHARACTERSET 2066
+#define SCI_STYLESETHOTSPOT 2409
+#define SC_ELEMENT_LIST 0
+#define SC_ELEMENT_LIST_BACK 1
+#define SC_ELEMENT_LIST_SELECTED 2
+#define SC_ELEMENT_LIST_SELECTED_BACK 3
+#define SC_ELEMENT_SELECTION_TEXT 10
+#define SC_ELEMENT_SELECTION_BACK 11
+#define SC_ELEMENT_SELECTION_ADDITIONAL_TEXT 12
+#define SC_ELEMENT_SELECTION_ADDITIONAL_BACK 13
+#define SC_ELEMENT_SELECTION_SECONDARY_TEXT 14
+#define SC_ELEMENT_SELECTION_SECONDARY_BACK 15
+#define SC_ELEMENT_SELECTION_INACTIVE_TEXT 16
+#define SC_ELEMENT_SELECTION_INACTIVE_BACK 17
+#define SC_ELEMENT_CARET 40
+#define SC_ELEMENT_CARET_ADDITIONAL 41
+#define SC_ELEMENT_CARET_LINE_BACK 50
+#define SC_ELEMENT_WHITE_SPACE 60
+#define SC_ELEMENT_WHITE_SPACE_BACK 61
+#define SC_ELEMENT_HOT_SPOT_ACTIVE 70
+#define SC_ELEMENT_HOT_SPOT_ACTIVE_BACK 71
+#define SCI_SETELEMENTCOLOUR 2753
+#define SCI_GETELEMENTCOLOUR 2754
+#define SCI_RESETELEMENTCOLOUR 2755
+#define SCI_GETELEMENTISSET 2756
+#define SCI_GETELEMENTALLOWSTRANSLUCENT 2757
+#define SCI_GETELEMENTBASECOLOUR 2758
+#define SCI_SETSELFORE 2067
+#define SCI_SETSELBACK 2068
+#define SCI_GETSELALPHA 2477
+#define SCI_SETSELALPHA 2478
+#define SCI_GETSELEOLFILLED 2479
+#define SCI_SETSELEOLFILLED 2480
+#define SC_LAYER_BASE 0
+#define SC_LAYER_UNDER_TEXT 1
+#define SC_LAYER_OVER_TEXT 2
+#define SCI_GETSELECTIONLAYER 2762
+#define SCI_SETSELECTIONLAYER 2763
+#define SCI_GETCARETLINELAYER 2764
+#define SCI_SETCARETLINELAYER 2765
+#define SCI_SETCARETFORE 2069
+#define SCI_ASSIGNCMDKEY 2070
+#define SCI_CLEARCMDKEY 2071
+#define SCI_CLEARALLCMDKEYS 2072
+#define SCI_SETSTYLINGEX 2073
+#define SCI_STYLESETVISIBLE 2074
+#define SCI_GETCARETPERIOD 2075
+#define SCI_SETCARETPERIOD 2076
+#define SCI_SETWORDCHARS 2077
+#define SCI_GETWORDCHARS 2646
+#define SCI_SETCHARACTERCATEGORYOPTIMIZATION 2720
+#define SCI_GETCHARACTERCATEGORYOPTIMIZATION 2721
+#define SCI_BEGINUNDOACTION 2078
+#define SCI_ENDUNDOACTION 2079
+#define INDIC_PLAIN 0
+#define INDIC_SQUIGGLE 1
+#define INDIC_TT 2
+#define INDIC_DIAGONAL 3
+#define INDIC_STRIKE 4
+#define INDIC_HIDDEN 5
+#define INDIC_BOX 6
+#define INDIC_ROUNDBOX 7
+#define INDIC_STRAIGHTBOX 8
+#define INDIC_DASH 9
+#define INDIC_DOTS 10
+#define INDIC_SQUIGGLELOW 11
+#define INDIC_DOTBOX 12
+#define INDIC_SQUIGGLEPIXMAP 13
+#define INDIC_COMPOSITIONTHICK 14
+#define INDIC_COMPOSITIONTHIN 15
+#define INDIC_FULLBOX 16
+#define INDIC_TEXTFORE 17
+#define INDIC_POINT 18
+#define INDIC_POINTCHARACTER 19
+#define INDIC_GRADIENT 20
+#define INDIC_GRADIENTCENTRE 21
+#define INDIC_CONTAINER 8
+#define INDIC_IME 32
+#define INDIC_IME_MAX 35
+#define INDIC_MAX 35
+#define INDICATOR_CONTAINER 8
+#define INDICATOR_IME 32
+#define INDICATOR_IME_MAX 35
+#define INDICATOR_MAX 35
+#define SCI_INDICSETSTYLE 2080
+#define SCI_INDICGETSTYLE 2081
+#define SCI_INDICSETFORE 2082
+#define SCI_INDICGETFORE 2083
+#define SCI_INDICSETUNDER 2510
+#define SCI_INDICGETUNDER 2511
+#define SCI_INDICSETHOVERSTYLE 2680
+#define SCI_INDICGETHOVERSTYLE 2681
+#define SCI_INDICSETHOVERFORE 2682
+#define SCI_INDICGETHOVERFORE 2683
+#define SC_INDICVALUEBIT 0x1000000
+#define SC_INDICVALUEMASK 0xFFFFFF
+#define SC_INDICFLAG_NONE 0
+#define SC_INDICFLAG_VALUEFORE 1
+#define SCI_INDICSETFLAGS 2684
+#define SCI_INDICGETFLAGS 2685
+#define SCI_INDICSETSTROKEWIDTH 2751
+#define SCI_INDICGETSTROKEWIDTH 2752
+#define SCI_SETWHITESPACEFORE 2084
+#define SCI_SETWHITESPACEBACK 2085
+#define SCI_SETWHITESPACESIZE 2086
+#define SCI_GETWHITESPACESIZE 2087
+#define SCI_SETLINESTATE 2092
+#define SCI_GETLINESTATE 2093
+#define SCI_GETMAXLINESTATE 2094
+#define SCI_GETCARETLINEVISIBLE 2095
+#define SCI_SETCARETLINEVISIBLE 2096
+#define SCI_GETCARETLINEBACK 2097
+#define SCI_SETCARETLINEBACK 2098
+#define SCI_GETCARETLINEFRAME 2704
+#define SCI_SETCARETLINEFRAME 2705
+#define SCI_STYLESETCHANGEABLE 2099
+#define SCI_AUTOCSHOW 2100
+#define SCI_AUTOCCANCEL 2101
+#define SCI_AUTOCACTIVE 2102
+#define SCI_AUTOCPOSSTART 2103
+#define SCI_AUTOCCOMPLETE 2104
+#define SCI_AUTOCSTOPS 2105
+#define SCI_AUTOCSETSEPARATOR 2106
+#define SCI_AUTOCGETSEPARATOR 2107
+#define SCI_AUTOCSELECT 2108
+#define SCI_AUTOCSETCANCELATSTART 2110
+#define SCI_AUTOCGETCANCELATSTART 2111
+#define SCI_AUTOCSETFILLUPS 2112
+#define SCI_AUTOCSETCHOOSESINGLE 2113
+#define SCI_AUTOCGETCHOOSESINGLE 2114
+#define SCI_AUTOCSETIGNORECASE 2115
+#define SCI_AUTOCGETIGNORECASE 2116
+#define SCI_USERLISTSHOW 2117
+#define SCI_AUTOCSETAUTOHIDE 2118
+#define SCI_AUTOCGETAUTOHIDE 2119
+#define SC_AUTOCOMPLETE_NORMAL 0
+#define SC_AUTOCOMPLETE_FIXED_SIZE 1
+#define SCI_AUTOCSETOPTIONS 2638
+#define SCI_AUTOCGETOPTIONS 2639
+#define SCI_AUTOCSETDROPRESTOFWORD 2270
+#define SCI_AUTOCGETDROPRESTOFWORD 2271
+#define SCI_REGISTERIMAGE 2405
+#define SCI_CLEARREGISTEREDIMAGES 2408
+#define SCI_AUTOCGETTYPESEPARATOR 2285
+#define SCI_AUTOCSETTYPESEPARATOR 2286
+#define SCI_AUTOCSETMAXWIDTH 2208
+#define SCI_AUTOCGETMAXWIDTH 2209
+#define SCI_AUTOCSETMAXHEIGHT 2210
+#define SCI_AUTOCGETMAXHEIGHT 2211
+#define SCI_SETINDENT 2122
+#define SCI_GETINDENT 2123
+#define SCI_SETUSETABS 2124
+#define SCI_GETUSETABS 2125
+#define SCI_SETLINEINDENTATION 2126
+#define SCI_GETLINEINDENTATION 2127
+#define SCI_GETLINEINDENTPOSITION 2128
+#define SCI_GETCOLUMN 2129
+#define SCI_COUNTCHARACTERS 2633
+#define SCI_COUNTCODEUNITS 2715
+#define SCI_SETHSCROLLBAR 2130
+#define SCI_GETHSCROLLBAR 2131
+#define SC_IV_NONE 0
+#define SC_IV_REAL 1
+#define SC_IV_LOOKFORWARD 2
+#define SC_IV_LOOKBOTH 3
+#define SCI_SETINDENTATIONGUIDES 2132
+#define SCI_GETINDENTATIONGUIDES 2133
+#define SCI_SETHIGHLIGHTGUIDE 2134
+#define SCI_GETHIGHLIGHTGUIDE 2135
+#define SCI_GETLINEENDPOSITION 2136
+#define SCI_GETCODEPAGE 2137
+#define SCI_GETCARETFORE 2138
+#define SCI_GETREADONLY 2140
+#define SCI_SETCURRENTPOS 2141
+#define SCI_SETSELECTIONSTART 2142
+#define SCI_GETSELECTIONSTART 2143
+#define SCI_SETSELECTIONEND 2144
+#define SCI_GETSELECTIONEND 2145
+#define SCI_SETEMPTYSELECTION 2556
+#define SCI_SETPRINTMAGNIFICATION 2146
+#define SCI_GETPRINTMAGNIFICATION 2147
+#define SC_PRINT_NORMAL 0
+#define SC_PRINT_INVERTLIGHT 1
+#define SC_PRINT_BLACKONWHITE 2
+#define SC_PRINT_COLOURONWHITE 3
+#define SC_PRINT_COLOURONWHITEDEFAULTBG 4
+#define SC_PRINT_SCREENCOLOURS 5
+#define SCI_SETPRINTCOLOURMODE 2148
+#define SCI_GETPRINTCOLOURMODE 2149
+#define SCFIND_NONE 0x0
+#define SCFIND_WHOLEWORD 0x2
+#define SCFIND_MATCHCASE 0x4
+#define SCFIND_WORDSTART 0x00100000
+#define SCFIND_REGEXP 0x00200000
+#define SCFIND_POSIX 0x00400000
+#define SCFIND_CXX11REGEX 0x00800000
+#define SCI_FINDTEXT 2150
+#define SCI_FORMATRANGE 2151
+#define SCI_GETFIRSTVISIBLELINE 2152
+#define SCI_GETLINE 2153
+#define SCI_GETLINECOUNT 2154
+#define SCI_ALLOCATELINES 2089
+#define SCI_SETMARGINLEFT 2155
+#define SCI_GETMARGINLEFT 2156
+#define SCI_SETMARGINRIGHT 2157
+#define SCI_GETMARGINRIGHT 2158
+#define SCI_GETMODIFY 2159
+#define SCI_SETSEL 2160
+#define SCI_GETSELTEXT 2161
+#define SCI_GETTEXTRANGE 2162
+#define SCI_HIDESELECTION 2163
+#define SCI_POINTXFROMPOSITION 2164
+#define SCI_POINTYFROMPOSITION 2165
+#define SCI_LINEFROMPOSITION 2166
+#define SCI_POSITIONFROMLINE 2167
+#define SCI_LINESCROLL 2168
+#define SCI_SCROLLCARET 2169
+#define SCI_SCROLLRANGE 2569
+#define SCI_REPLACESEL 2170
+#define SCI_SETREADONLY 2171
+#define SCI_NULL 2172
+#define SCI_CANPASTE 2173
+#define SCI_CANUNDO 2174
+#define SCI_EMPTYUNDOBUFFER 2175
+#define SCI_UNDO 2176
+#define SCI_CUT 2177
+#define SCI_COPY 2178
+#define SCI_PASTE 2179
+#define SCI_CLEAR 2180
+#define SCI_SETTEXT 2181
+#define SCI_GETTEXT 2182
+#define SCI_GETTEXTLENGTH 2183
+#define SCI_GETDIRECTFUNCTION 2184
+#define SCI_GETDIRECTSTATUSFUNCTION 2772
+#define SCI_GETDIRECTPOINTER 2185
+#define SCI_SETOVERTYPE 2186
+#define SCI_GETOVERTYPE 2187
+#define SCI_SETCARETWIDTH 2188
+#define SCI_GETCARETWIDTH 2189
+#define SCI_SETTARGETSTART 2190
+#define SCI_GETTARGETSTART 2191
+#define SCI_SETTARGETSTARTVIRTUALSPACE 2728
+#define SCI_GETTARGETSTARTVIRTUALSPACE 2729
+#define SCI_SETTARGETEND 2192
+#define SCI_GETTARGETEND 2193
+#define SCI_SETTARGETENDVIRTUALSPACE 2730
+#define SCI_GETTARGETENDVIRTUALSPACE 2731
+#define SCI_SETTARGETRANGE 2686
+#define SCI_GETTARGETTEXT 2687
+#define SCI_TARGETFROMSELECTION 2287
+#define SCI_TARGETWHOLEDOCUMENT 2690
+#define SCI_REPLACETARGET 2194
+#define SCI_REPLACETARGETRE 2195
+#define SCI_SEARCHINTARGET 2197
+#define SCI_SETSEARCHFLAGS 2198
+#define SCI_GETSEARCHFLAGS 2199
+#define SCI_CALLTIPSHOW 2200
+#define SCI_CALLTIPCANCEL 2201
+#define SCI_CALLTIPACTIVE 2202
+#define SCI_CALLTIPPOSSTART 2203
+#define SCI_CALLTIPSETPOSSTART 2214
+#define SCI_CALLTIPSETHLT 2204
+#define SCI_CALLTIPSETBACK 2205
+#define SCI_CALLTIPSETFORE 2206
+#define SCI_CALLTIPSETFOREHLT 2207
+#define SCI_CALLTIPUSESTYLE 2212
+#define SCI_CALLTIPSETPOSITION 2213
+#define SCI_VISIBLEFROMDOCLINE 2220
+#define SCI_DOCLINEFROMVISIBLE 2221
+#define SCI_WRAPCOUNT 2235
+#define SC_FOLDLEVELNONE 0x0
+#define SC_FOLDLEVELBASE 0x400
+#define SC_FOLDLEVELWHITEFLAG 0x1000
+#define SC_FOLDLEVELHEADERFLAG 0x2000
+#define SC_FOLDLEVELNUMBERMASK 0x0FFF
+#define SCI_SETFOLDLEVEL 2222
+#define SCI_GETFOLDLEVEL 2223
+#define SCI_GETLASTCHILD 2224
+#define SCI_GETFOLDPARENT 2225
+#define SCI_SHOWLINES 2226
+#define SCI_HIDELINES 2227
+#define SCI_GETLINEVISIBLE 2228
+#define SCI_GETALLLINESVISIBLE 2236
+#define SCI_SETFOLDEXPANDED 2229
+#define SCI_GETFOLDEXPANDED 2230
+#define SCI_TOGGLEFOLD 2231
+#define SCI_TOGGLEFOLDSHOWTEXT 2700
+#define SC_FOLDDISPLAYTEXT_HIDDEN 0
+#define SC_FOLDDISPLAYTEXT_STANDARD 1
+#define SC_FOLDDISPLAYTEXT_BOXED 2
+#define SCI_FOLDDISPLAYTEXTSETSTYLE 2701
+#define SCI_FOLDDISPLAYTEXTGETSTYLE 2707
+#define SCI_SETDEFAULTFOLDDISPLAYTEXT 2722
+#define SCI_GETDEFAULTFOLDDISPLAYTEXT 2723
+#define SC_FOLDACTION_CONTRACT 0
+#define SC_FOLDACTION_EXPAND 1
+#define SC_FOLDACTION_TOGGLE 2
+#define SCI_FOLDLINE 2237
+#define SCI_FOLDCHILDREN 2238
+#define SCI_EXPANDCHILDREN 2239
+#define SCI_FOLDALL 2662
+#define SCI_ENSUREVISIBLE 2232
+#define SC_AUTOMATICFOLD_NONE 0x0000
+#define SC_AUTOMATICFOLD_SHOW 0x0001
+#define SC_AUTOMATICFOLD_CLICK 0x0002
+#define SC_AUTOMATICFOLD_CHANGE 0x0004
+#define SCI_SETAUTOMATICFOLD 2663
+#define SCI_GETAUTOMATICFOLD 2664
+#define SC_FOLDFLAG_NONE 0x0000
+#define SC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
+#define SC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
+#define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
+#define SC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
+#define SC_FOLDFLAG_LEVELNUMBERS 0x0040
+#define SC_FOLDFLAG_LINESTATE 0x0080
+#define SCI_SETFOLDFLAGS 2233
+#define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
+#define SCI_SETTABINDENTS 2260
+#define SCI_GETTABINDENTS 2261
+#define SCI_SETBACKSPACEUNINDENTS 2262
+#define SCI_GETBACKSPACEUNINDENTS 2263
+#define SC_TIME_FOREVER 10000000
+#define SCI_SETMOUSEDWELLTIME 2264
+#define SCI_GETMOUSEDWELLTIME 2265
+#define SCI_WORDSTARTPOSITION 2266
+#define SCI_WORDENDPOSITION 2267
+#define SCI_ISRANGEWORD 2691
+#define SC_IDLESTYLING_NONE 0
+#define SC_IDLESTYLING_TOVISIBLE 1
+#define SC_IDLESTYLING_AFTERVISIBLE 2
+#define SC_IDLESTYLING_ALL 3
+#define SCI_SETIDLESTYLING 2692
+#define SCI_GETIDLESTYLING 2693
+#define SC_WRAP_NONE 0
+#define SC_WRAP_WORD 1
+#define SC_WRAP_CHAR 2
+#define SC_WRAP_WHITESPACE 3
+#define SCI_SETWRAPMODE 2268
+#define SCI_GETWRAPMODE 2269
+#define SC_WRAPVISUALFLAG_NONE 0x0000
+#define SC_WRAPVISUALFLAG_END 0x0001
+#define SC_WRAPVISUALFLAG_START 0x0002
+#define SC_WRAPVISUALFLAG_MARGIN 0x0004
+#define SCI_SETWRAPVISUALFLAGS 2460
+#define SCI_GETWRAPVISUALFLAGS 2461
+#define SC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
+#define SC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
+#define SC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002
+#define SCI_SETWRAPVISUALFLAGSLOCATION 2462
+#define SCI_GETWRAPVISUALFLAGSLOCATION 2463
+#define SCI_SETWRAPSTARTINDENT 2464
+#define SCI_GETWRAPSTARTINDENT 2465
+#define SC_WRAPINDENT_FIXED 0
+#define SC_WRAPINDENT_SAME 1
+#define SC_WRAPINDENT_INDENT 2
+#define SC_WRAPINDENT_DEEPINDENT 3
+#define SCI_SETWRAPINDENTMODE 2472
+#define SCI_GETWRAPINDENTMODE 2473
+#define SC_CACHE_NONE 0
+#define SC_CACHE_CARET 1
+#define SC_CACHE_PAGE 2
+#define SC_CACHE_DOCUMENT 3
+#define SCI_SETLAYOUTCACHE 2272
+#define SCI_GETLAYOUTCACHE 2273
+#define SCI_SETSCROLLWIDTH 2274
+#define SCI_GETSCROLLWIDTH 2275
+#define SCI_SETSCROLLWIDTHTRACKING 2516
+#define SCI_GETSCROLLWIDTHTRACKING 2517
+#define SCI_TEXTWIDTH 2276
+#define SCI_SETENDATLASTLINE 2277
+#define SCI_GETENDATLASTLINE 2278
+#define SCI_TEXTHEIGHT 2279
+#define SCI_SETVSCROLLBAR 2280
+#define SCI_GETVSCROLLBAR 2281
+#define SCI_APPENDTEXT 2282
+#define SC_PHASES_ONE 0
+#define SC_PHASES_TWO 1
+#define SC_PHASES_MULTIPLE 2
+#define SCI_GETPHASESDRAW 2673
+#define SCI_SETPHASESDRAW 2674
+#define SC_EFF_QUALITY_MASK 0xF
+#define SC_EFF_QUALITY_DEFAULT 0
+#define SC_EFF_QUALITY_NON_ANTIALIASED 1
+#define SC_EFF_QUALITY_ANTIALIASED 2
+#define SC_EFF_QUALITY_LCD_OPTIMIZED 3
+#define SCI_SETFONTQUALITY 2611
+#define SCI_GETFONTQUALITY 2612
+#define SCI_SETFIRSTVISIBLELINE 2613
+#define SC_MULTIPASTE_ONCE 0
+#define SC_MULTIPASTE_EACH 1
+#define SCI_SETMULTIPASTE 2614
+#define SCI_GETMULTIPASTE 2615
+#define SCI_GETTAG 2616
+#define SCI_LINESJOIN 2288
+#define SCI_LINESSPLIT 2289
+#define SCI_SETFOLDMARGINCOLOUR 2290
+#define SCI_SETFOLDMARGINHICOLOUR 2291
+#define SC_ACCESSIBILITY_DISABLED 0
+#define SC_ACCESSIBILITY_ENABLED 1
+#define SCI_SETACCESSIBILITY 2702
+#define SCI_GETACCESSIBILITY 2703
+#define SCI_LINEDOWN 2300
+#define SCI_LINEDOWNEXTEND 2301
+#define SCI_LINEUP 2302
+#define SCI_LINEUPEXTEND 2303
+#define SCI_CHARLEFT 2304
+#define SCI_CHARLEFTEXTEND 2305
+#define SCI_CHARRIGHT 2306
+#define SCI_CHARRIGHTEXTEND 2307
+#define SCI_WORDLEFT 2308
+#define SCI_WORDLEFTEXTEND 2309
+#define SCI_WORDRIGHT 2310
+#define SCI_WORDRIGHTEXTEND 2311
+#define SCI_HOME 2312
+#define SCI_HOMEEXTEND 2313
+#define SCI_LINEEND 2314
+#define SCI_LINEENDEXTEND 2315
+#define SCI_DOCUMENTSTART 2316
+#define SCI_DOCUMENTSTARTEXTEND 2317
+#define SCI_DOCUMENTEND 2318
+#define SCI_DOCUMENTENDEXTEND 2319
+#define SCI_PAGEUP 2320
+#define SCI_PAGEUPEXTEND 2321
+#define SCI_PAGEDOWN 2322
+#define SCI_PAGEDOWNEXTEND 2323
+#define SCI_EDITTOGGLEOVERTYPE 2324
+#define SCI_CANCEL 2325
+#define SCI_DELETEBACK 2326
+#define SCI_TAB 2327
+#define SCI_BACKTAB 2328
+#define SCI_NEWLINE 2329
+#define SCI_FORMFEED 2330
+#define SCI_VCHOME 2331
+#define SCI_VCHOMEEXTEND 2332
+#define SCI_ZOOMIN 2333
+#define SCI_ZOOMOUT 2334
+#define SCI_DELWORDLEFT 2335
+#define SCI_DELWORDRIGHT 2336
+#define SCI_DELWORDRIGHTEND 2518
+#define SCI_LINECUT 2337
+#define SCI_LINEDELETE 2338
+#define SCI_LINETRANSPOSE 2339
+#define SCI_LINEREVERSE 2354
+#define SCI_LINEDUPLICATE 2404
+#define SCI_LOWERCASE 2340
+#define SCI_UPPERCASE 2341
+#define SCI_LINESCROLLDOWN 2342
+#define SCI_LINESCROLLUP 2343
+#define SCI_DELETEBACKNOTLINE 2344
+#define SCI_HOMEDISPLAY 2345
+#define SCI_HOMEDISPLAYEXTEND 2346
+#define SCI_LINEENDDISPLAY 2347
+#define SCI_LINEENDDISPLAYEXTEND 2348
+#define SCI_HOMEWRAP 2349
+#define SCI_HOMEWRAPEXTEND 2450
+#define SCI_LINEENDWRAP 2451
+#define SCI_LINEENDWRAPEXTEND 2452
+#define SCI_VCHOMEWRAP 2453
+#define SCI_VCHOMEWRAPEXTEND 2454
+#define SCI_LINECOPY 2455
+#define SCI_MOVECARETINSIDEVIEW 2401
+#define SCI_LINELENGTH 2350
+#define SCI_BRACEHIGHLIGHT 2351
+#define SCI_BRACEHIGHLIGHTINDICATOR 2498
+#define SCI_BRACEBADLIGHT 2352
+#define SCI_BRACEBADLIGHTINDICATOR 2499
+#define SCI_BRACEMATCH 2353
+#define SCI_BRACEMATCHNEXT 2369
+#define SCI_GETVIEWEOL 2355
+#define SCI_SETVIEWEOL 2356
+#define SCI_GETDOCPOINTER 2357
+#define SCI_SETDOCPOINTER 2358
+#define SCI_SETMODEVENTMASK 2359
+#define EDGE_NONE 0
+#define EDGE_LINE 1
+#define EDGE_BACKGROUND 2
+#define EDGE_MULTILINE 3
+#define SCI_GETEDGECOLUMN 2360
+#define SCI_SETEDGECOLUMN 2361
+#define SCI_GETEDGEMODE 2362
+#define SCI_SETEDGEMODE 2363
+#define SCI_GETEDGECOLOUR 2364
+#define SCI_SETEDGECOLOUR 2365
+#define SCI_MULTIEDGEADDLINE 2694
+#define SCI_MULTIEDGECLEARALL 2695
+#define SCI_GETMULTIEDGECOLUMN 2749
+#define SCI_SEARCHANCHOR 2366
+#define SCI_SEARCHNEXT 2367
+#define SCI_SEARCHPREV 2368
+#define SCI_LINESONSCREEN 2370
+#define SC_POPUP_NEVER 0
+#define SC_POPUP_ALL 1
+#define SC_POPUP_TEXT 2
+#define SCI_USEPOPUP 2371
+#define SCI_SELECTIONISRECTANGLE 2372
+#define SCI_SETZOOM 2373
+#define SCI_GETZOOM 2374
+#define SC_DOCUMENTOPTION_DEFAULT 0
+#define SC_DOCUMENTOPTION_STYLES_NONE 0x1
+#define SC_DOCUMENTOPTION_TEXT_LARGE 0x100
+#define SCI_CREATEDOCUMENT 2375
+#define SCI_ADDREFDOCUMENT 2376
+#define SCI_RELEASEDOCUMENT 2377
+#define SCI_GETDOCUMENTOPTIONS 2379
+#define SCI_GETMODEVENTMASK 2378
+#define SCI_SETCOMMANDEVENTS 2717
+#define SCI_GETCOMMANDEVENTS 2718
+#define SCI_SETFOCUS 2380
+#define SCI_GETFOCUS 2381
+#define SC_STATUS_OK 0
+#define SC_STATUS_FAILURE 1
+#define SC_STATUS_BADALLOC 2
+#define SC_STATUS_WARN_START 1000
+#define SC_STATUS_WARN_REGEX 1001
+#define SCI_SETSTATUS 2382
+#define SCI_GETSTATUS 2383
+#define SCI_SETMOUSEDOWNCAPTURES 2384
+#define SCI_GETMOUSEDOWNCAPTURES 2385
+#define SCI_SETMOUSEWHEELCAPTURES 2696
+#define SCI_GETMOUSEWHEELCAPTURES 2697
+#define SCI_SETCURSOR 2386
+#define SCI_GETCURSOR 2387
+#define SCI_SETCONTROLCHARSYMBOL 2388
+#define SCI_GETCONTROLCHARSYMBOL 2389
+#define SCI_WORDPARTLEFT 2390
+#define SCI_WORDPARTLEFTEXTEND 2391
+#define SCI_WORDPARTRIGHT 2392
+#define SCI_WORDPARTRIGHTEXTEND 2393
+#define VISIBLE_SLOP 0x01
+#define VISIBLE_STRICT 0x04
+#define SCI_SETVISIBLEPOLICY 2394
+#define SCI_DELLINELEFT 2395
+#define SCI_DELLINERIGHT 2396
+#define SCI_SETXOFFSET 2397
+#define SCI_GETXOFFSET 2398
+#define SCI_CHOOSECARETX 2399
+#define SCI_GRABFOCUS 2400
+#define CARET_SLOP 0x01
+#define CARET_STRICT 0x04
+#define CARET_JUMPS 0x10
+#define CARET_EVEN 0x08
+#define SCI_SETXCARETPOLICY 2402
+#define SCI_SETYCARETPOLICY 2403
+#define SCI_SETPRINTWRAPMODE 2406
+#define SCI_GETPRINTWRAPMODE 2407
+#define SCI_SETHOTSPOTACTIVEFORE 2410
+#define SCI_GETHOTSPOTACTIVEFORE 2494
+#define SCI_SETHOTSPOTACTIVEBACK 2411
+#define SCI_GETHOTSPOTACTIVEBACK 2495
+#define SCI_SETHOTSPOTACTIVEUNDERLINE 2412
+#define SCI_GETHOTSPOTACTIVEUNDERLINE 2496
+#define SCI_SETHOTSPOTSINGLELINE 2421
+#define SCI_GETHOTSPOTSINGLELINE 2497
+#define SCI_PARADOWN 2413
+#define SCI_PARADOWNEXTEND 2414
+#define SCI_PARAUP 2415
+#define SCI_PARAUPEXTEND 2416
+#define SCI_POSITIONBEFORE 2417
+#define SCI_POSITIONAFTER 2418
+#define SCI_POSITIONRELATIVE 2670
+#define SCI_POSITIONRELATIVECODEUNITS 2716
+#define SCI_COPYRANGE 2419
+#define SCI_COPYTEXT 2420
+#define SC_SEL_STREAM 0
+#define SC_SEL_RECTANGLE 1
+#define SC_SEL_LINES 2
+#define SC_SEL_THIN 3
+#define SCI_SETSELECTIONMODE 2422
+#define SCI_GETSELECTIONMODE 2423
+#define SCI_GETMOVEEXTENDSSELECTION 2706
+#define SCI_GETLINESELSTARTPOSITION 2424
+#define SCI_GETLINESELENDPOSITION 2425
+#define SCI_LINEDOWNRECTEXTEND 2426
+#define SCI_LINEUPRECTEXTEND 2427
+#define SCI_CHARLEFTRECTEXTEND 2428
+#define SCI_CHARRIGHTRECTEXTEND 2429
+#define SCI_HOMERECTEXTEND 2430
+#define SCI_VCHOMERECTEXTEND 2431
+#define SCI_LINEENDRECTEXTEND 2432
+#define SCI_PAGEUPRECTEXTEND 2433
+#define SCI_PAGEDOWNRECTEXTEND 2434
+#define SCI_STUTTEREDPAGEUP 2435
+#define SCI_STUTTEREDPAGEUPEXTEND 2436
+#define SCI_STUTTEREDPAGEDOWN 2437
+#define SCI_STUTTEREDPAGEDOWNEXTEND 2438
+#define SCI_WORDLEFTEND 2439
+#define SCI_WORDLEFTENDEXTEND 2440
+#define SCI_WORDRIGHTEND 2441
+#define SCI_WORDRIGHTENDEXTEND 2442
+#define SCI_SETWHITESPACECHARS 2443
+#define SCI_GETWHITESPACECHARS 2647
+#define SCI_SETPUNCTUATIONCHARS 2648
+#define SCI_GETPUNCTUATIONCHARS 2649
+#define SCI_SETCHARSDEFAULT 2444
+#define SCI_AUTOCGETCURRENT 2445
+#define SCI_AUTOCGETCURRENTTEXT 2610
+#define SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE 0
+#define SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE 1
+#define SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR 2634
+#define SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR 2635
+#define SC_MULTIAUTOC_ONCE 0
+#define SC_MULTIAUTOC_EACH 1
+#define SCI_AUTOCSETMULTI 2636
+#define SCI_AUTOCGETMULTI 2637
+#define SC_ORDER_PRESORTED 0
+#define SC_ORDER_PERFORMSORT 1
+#define SC_ORDER_CUSTOM 2
+#define SCI_AUTOCSETORDER 2660
+#define SCI_AUTOCGETORDER 2661
+#define SCI_ALLOCATE 2446
+#define SCI_TARGETASUTF8 2447
+#define SCI_SETLENGTHFORENCODE 2448
+#define SCI_ENCODEDFROMUTF8 2449
+#define SCI_FINDCOLUMN 2456
+#define SC_CARETSTICKY_OFF 0
+#define SC_CARETSTICKY_ON 1
+#define SC_CARETSTICKY_WHITESPACE 2
+#define SCI_GETCARETSTICKY 2457
+#define SCI_SETCARETSTICKY 2458
+#define SCI_TOGGLECARETSTICKY 2459
+#define SCI_SETPASTECONVERTENDINGS 2467
+#define SCI_GETPASTECONVERTENDINGS 2468
+#define SCI_REPLACERECTANGULAR 2771
+#define SCI_SELECTIONDUPLICATE 2469
+#define SCI_SETCARETLINEBACKALPHA 2470
+#define SCI_GETCARETLINEBACKALPHA 2471
+#define CARETSTYLE_INVISIBLE 0
+#define CARETSTYLE_LINE 1
+#define CARETSTYLE_BLOCK 2
+#define CARETSTYLE_OVERSTRIKE_BAR 0
+#define CARETSTYLE_OVERSTRIKE_BLOCK 0x10
+#define CARETSTYLE_INS_MASK 0xF
+#define CARETSTYLE_BLOCK_AFTER 0x100
+#define SCI_SETCARETSTYLE 2512
+#define SCI_GETCARETSTYLE 2513
+#define SCI_SETINDICATORCURRENT 2500
+#define SCI_GETINDICATORCURRENT 2501
+#define SCI_SETINDICATORVALUE 2502
+#define SCI_GETINDICATORVALUE 2503
+#define SCI_INDICATORFILLRANGE 2504
+#define SCI_INDICATORCLEARRANGE 2505
+#define SCI_INDICATORALLONFOR 2506
+#define SCI_INDICATORVALUEAT 2507
+#define SCI_INDICATORSTART 2508
+#define SCI_INDICATOREND 2509
+#define SCI_SETPOSITIONCACHE 2514
+#define SCI_GETPOSITIONCACHE 2515
+#define SCI_COPYALLOWLINE 2519
+#define SCI_GETCHARACTERPOINTER 2520
+#define SCI_GETRANGEPOINTER 2643
+#define SCI_GETGAPPOSITION 2644
+#define SCI_INDICSETALPHA 2523
+#define SCI_INDICGETALPHA 2524
+#define SCI_INDICSETOUTLINEALPHA 2558
+#define SCI_INDICGETOUTLINEALPHA 2559
+#define SCI_SETEXTRAASCENT 2525
+#define SCI_GETEXTRAASCENT 2526
+#define SCI_SETEXTRADESCENT 2527
+#define SCI_GETEXTRADESCENT 2528
+#define SCI_MARKERSYMBOLDEFINED 2529
+#define SCI_MARGINSETTEXT 2530
+#define SCI_MARGINGETTEXT 2531
+#define SCI_MARGINSETSTYLE 2532
+#define SCI_MARGINGETSTYLE 2533
+#define SCI_MARGINSETSTYLES 2534
+#define SCI_MARGINGETSTYLES 2535
+#define SCI_MARGINTEXTCLEARALL 2536
+#define SCI_MARGINSETSTYLEOFFSET 2537
+#define SCI_MARGINGETSTYLEOFFSET 2538
+#define SC_MARGINOPTION_NONE 0
+#define SC_MARGINOPTION_SUBLINESELECT 1
+#define SCI_SETMARGINOPTIONS 2539
+#define SCI_GETMARGINOPTIONS 2557
+#define SCI_ANNOTATIONSETTEXT 2540
+#define SCI_ANNOTATIONGETTEXT 2541
+#define SCI_ANNOTATIONSETSTYLE 2542
+#define SCI_ANNOTATIONGETSTYLE 2543
+#define SCI_ANNOTATIONSETSTYLES 2544
+#define SCI_ANNOTATIONGETSTYLES 2545
+#define SCI_ANNOTATIONGETLINES 2546
+#define SCI_ANNOTATIONCLEARALL 2547
+#define ANNOTATION_HIDDEN 0
+#define ANNOTATION_STANDARD 1
+#define ANNOTATION_BOXED 2
+#define ANNOTATION_INDENTED 3
+#define SCI_ANNOTATIONSETVISIBLE 2548
+#define SCI_ANNOTATIONGETVISIBLE 2549
+#define SCI_ANNOTATIONSETSTYLEOFFSET 2550
+#define SCI_ANNOTATIONGETSTYLEOFFSET 2551
+#define SCI_RELEASEALLEXTENDEDSTYLES 2552
+#define SCI_ALLOCATEEXTENDEDSTYLES 2553
+#define UNDO_NONE 0
+#define UNDO_MAY_COALESCE 1
+#define SCI_ADDUNDOACTION 2560
+#define SCI_CHARPOSITIONFROMPOINT 2561
+#define SCI_CHARPOSITIONFROMPOINTCLOSE 2562
+#define SCI_SETMOUSESELECTIONRECTANGULARSWITCH 2668
+#define SCI_GETMOUSESELECTIONRECTANGULARSWITCH 2669
+#define SCI_SETMULTIPLESELECTION 2563
+#define SCI_GETMULTIPLESELECTION 2564
+#define SCI_SETADDITIONALSELECTIONTYPING 2565
+#define SCI_GETADDITIONALSELECTIONTYPING 2566
+#define SCI_SETADDITIONALCARETSBLINK 2567
+#define SCI_GETADDITIONALCARETSBLINK 2568
+#define SCI_SETADDITIONALCARETSVISIBLE 2608
+#define SCI_GETADDITIONALCARETSVISIBLE 2609
+#define SCI_GETSELECTIONS 2570
+#define SCI_GETSELECTIONEMPTY 2650
+#define SCI_CLEARSELECTIONS 2571
+#define SCI_SETSELECTION 2572
+#define SCI_ADDSELECTION 2573
+#define SCI_DROPSELECTIONN 2671
+#define SCI_SETMAINSELECTION 2574
+#define SCI_GETMAINSELECTION 2575
+#define SCI_SETSELECTIONNCARET 2576
+#define SCI_GETSELECTIONNCARET 2577
+#define SCI_SETSELECTIONNANCHOR 2578
+#define SCI_GETSELECTIONNANCHOR 2579
+#define SCI_SETSELECTIONNCARETVIRTUALSPACE 2580
+#define SCI_GETSELECTIONNCARETVIRTUALSPACE 2581
+#define SCI_SETSELECTIONNANCHORVIRTUALSPACE 2582
+#define SCI_GETSELECTIONNANCHORVIRTUALSPACE 2583
+#define SCI_SETSELECTIONNSTART 2584
+#define SCI_GETSELECTIONNSTART 2585
+#define SCI_GETSELECTIONNSTARTVIRTUALSPACE 2726
+#define SCI_SETSELECTIONNEND 2586
+#define SCI_GETSELECTIONNENDVIRTUALSPACE 2727
+#define SCI_GETSELECTIONNEND 2587
+#define SCI_SETRECTANGULARSELECTIONCARET 2588
+#define SCI_GETRECTANGULARSELECTIONCARET 2589
+#define SCI_SETRECTANGULARSELECTIONANCHOR 2590
+#define SCI_GETRECTANGULARSELECTIONANCHOR 2591
+#define SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE 2592
+#define SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE 2593
+#define SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2594
+#define SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE 2595
+#define SCVS_NONE 0
+#define SCVS_RECTANGULARSELECTION 1
+#define SCVS_USERACCESSIBLE 2
+#define SCVS_NOWRAPLINESTART 4
+#define SCI_SETVIRTUALSPACEOPTIONS 2596
+#define SCI_GETVIRTUALSPACEOPTIONS 2597
+#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598
+#define SCI_GETRECTANGULARSELECTIONMODIFIER 2599
+#define SCI_SETADDITIONALSELFORE 2600
+#define SCI_SETADDITIONALSELBACK 2601
+#define SCI_SETADDITIONALSELALPHA 2602
+#define SCI_GETADDITIONALSELALPHA 2603
+#define SCI_SETADDITIONALCARETFORE 2604
+#define SCI_GETADDITIONALCARETFORE 2605
+#define SCI_ROTATESELECTION 2606
+#define SCI_SWAPMAINANCHORCARET 2607
+#define SCI_MULTIPLESELECTADDNEXT 2688
+#define SCI_MULTIPLESELECTADDEACH 2689
+#define SCI_CHANGELEXERSTATE 2617
+#define SCI_CONTRACTEDFOLDNEXT 2618
+#define SCI_VERTICALCENTRECARET 2619
+#define SCI_MOVESELECTEDLINESUP 2620
+#define SCI_MOVESELECTEDLINESDOWN 2621
+#define SCI_SETIDENTIFIER 2622
+#define SCI_GETIDENTIFIER 2623
+#define SCI_RGBAIMAGESETWIDTH 2624
+#define SCI_RGBAIMAGESETHEIGHT 2625
+#define SCI_RGBAIMAGESETSCALE 2651
+#define SCI_MARKERDEFINERGBAIMAGE 2626
+#define SCI_REGISTERRGBAIMAGE 2627
+#define SCI_SCROLLTOSTART 2628
+#define SCI_SCROLLTOEND 2629
+#define SC_TECHNOLOGY_DEFAULT 0
+#define SC_TECHNOLOGY_DIRECTWRITE 1
+#define SC_TECHNOLOGY_DIRECTWRITERETAIN 2
+#define SC_TECHNOLOGY_DIRECTWRITEDC 3
+#define SCI_SETTECHNOLOGY 2630
+#define SCI_GETTECHNOLOGY 2631
+#define SCI_CREATELOADER 2632
+#define SCI_FINDINDICATORSHOW 2640
+#define SCI_FINDINDICATORFLASH 2641
+#define SCI_FINDINDICATORHIDE 2642
+#define SCI_VCHOMEDISPLAY 2652
+#define SCI_VCHOMEDISPLAYEXTEND 2653
+#define SCI_GETCARETLINEVISIBLEALWAYS 2654
+#define SCI_SETCARETLINEVISIBLEALWAYS 2655
+#define SC_LINE_END_TYPE_DEFAULT 0
+#define SC_LINE_END_TYPE_UNICODE 1
+#define SCI_SETLINEENDTYPESALLOWED 2656
+#define SCI_GETLINEENDTYPESALLOWED 2657
+#define SCI_GETLINEENDTYPESACTIVE 2658
+#define SCI_SETREPRESENTATION 2665
+#define SCI_GETREPRESENTATION 2666
+#define SCI_CLEARREPRESENTATION 2667
+#define SCI_CLEARALLREPRESENTATIONS 2770
+#define SC_REPRESENTATION_PLAIN 0
+#define SC_REPRESENTATION_BLOB 1
+#define SC_REPRESENTATION_COLOUR 0x10
+#define SCI_SETREPRESENTATIONAPPEARANCE 2766
+#define SCI_GETREPRESENTATIONAPPEARANCE 2767
+#define SCI_SETREPRESENTATIONCOLOUR 2768
+#define SCI_GETREPRESENTATIONCOLOUR 2769
+#define SCI_EOLANNOTATIONSETTEXT 2740
+#define SCI_EOLANNOTATIONGETTEXT 2741
+#define SCI_EOLANNOTATIONSETSTYLE 2742
+#define SCI_EOLANNOTATIONGETSTYLE 2743
+#define SCI_EOLANNOTATIONCLEARALL 2744
+#define EOLANNOTATION_HIDDEN 0x0
+#define EOLANNOTATION_STANDARD 0x1
+#define EOLANNOTATION_BOXED 0x2
+#define EOLANNOTATION_STADIUM 0x100
+#define EOLANNOTATION_FLAT_CIRCLE 0x101
+#define EOLANNOTATION_ANGLE_CIRCLE 0x102
+#define EOLANNOTATION_CIRCLE_FLAT 0x110
+#define EOLANNOTATION_FLATS 0x111
+#define EOLANNOTATION_ANGLE_FLAT 0x112
+#define EOLANNOTATION_CIRCLE_ANGLE 0x120
+#define EOLANNOTATION_FLAT_ANGLE 0x121
+#define EOLANNOTATION_ANGLES 0x122
+#define SCI_EOLANNOTATIONSETVISIBLE 2745
+#define SCI_EOLANNOTATIONGETVISIBLE 2746
+#define SCI_EOLANNOTATIONSETSTYLEOFFSET 2747
+#define SCI_EOLANNOTATIONGETSTYLEOFFSET 2748
+#define SC_SUPPORTS_LINE_DRAWS_FINAL 0
+#define SC_SUPPORTS_PIXEL_DIVISIONS 1
+#define SC_SUPPORTS_FRACTIONAL_STROKE_WIDTH 2
+#define SC_SUPPORTS_TRANSLUCENT_STROKE 3
+#define SC_SUPPORTS_PIXEL_MODIFICATION 4
+#define SCI_SUPPORTSFEATURE 2750
+#define SC_LINECHARACTERINDEX_NONE 0
+#define SC_LINECHARACTERINDEX_UTF32 1
+#define SC_LINECHARACTERINDEX_UTF16 2
+#define SCI_GETLINECHARACTERINDEX 2710
+#define SCI_ALLOCATELINECHARACTERINDEX 2711
+#define SCI_RELEASELINECHARACTERINDEX 2712
+#define SCI_LINEFROMINDEXPOSITION 2713
+#define SCI_INDEXPOSITIONFROMLINE 2714
+#define SCI_STARTRECORD 3001
+#define SCI_STOPRECORD 3002
+#define SCI_GETLEXER 4002
+#define SCI_COLOURISE 4003
+#define SCI_SETPROPERTY 4004
+#define KEYWORDSET_MAX 8
+#define SCI_SETKEYWORDS 4005
+#define SCI_GETPROPERTY 4008
+#define SCI_GETPROPERTYEXPANDED 4009
+#define SCI_GETPROPERTYINT 4010
+#define SCI_GETLEXERLANGUAGE 4012
+#define SCI_PRIVATELEXERCALL 4013
+#define SCI_PROPERTYNAMES 4014
+#define SC_TYPE_BOOLEAN 0
+#define SC_TYPE_INTEGER 1
+#define SC_TYPE_STRING 2
+#define SCI_PROPERTYTYPE 4015
+#define SCI_DESCRIBEPROPERTY 4016
+#define SCI_DESCRIBEKEYWORDSETS 4017
+#define SCI_GETLINEENDTYPESSUPPORTED 4018
+#define SCI_ALLOCATESUBSTYLES 4020
+#define SCI_GETSUBSTYLESSTART 4021
+#define SCI_GETSUBSTYLESLENGTH 4022
+#define SCI_GETSTYLEFROMSUBSTYLE 4027
+#define SCI_GETPRIMARYSTYLEFROMSTYLE 4028
+#define SCI_FREESUBSTYLES 4023
+#define SCI_SETIDENTIFIERS 4024
+#define SCI_DISTANCETOSECONDARYSTYLES 4025
+#define SCI_GETSUBSTYLEBASES 4026
+#define SCI_GETNAMEDSTYLES 4029
+#define SCI_NAMEOFSTYLE 4030
+#define SCI_TAGSOFSTYLE 4031
+#define SCI_DESCRIPTIONOFSTYLE 4032
+#define SCI_SETILEXER 4033
+#define SC_MOD_NONE 0x0
+#define SC_MOD_INSERTTEXT 0x1
+#define SC_MOD_DELETETEXT 0x2
+#define SC_MOD_CHANGESTYLE 0x4
+#define SC_MOD_CHANGEFOLD 0x8
+#define SC_PERFORMED_USER 0x10
+#define SC_PERFORMED_UNDO 0x20
+#define SC_PERFORMED_REDO 0x40
+#define SC_MULTISTEPUNDOREDO 0x80
+#define SC_LASTSTEPINUNDOREDO 0x100
+#define SC_MOD_CHANGEMARKER 0x200
+#define SC_MOD_BEFOREINSERT 0x400
+#define SC_MOD_BEFOREDELETE 0x800
+#define SC_MULTILINEUNDOREDO 0x1000
+#define SC_STARTACTION 0x2000
+#define SC_MOD_CHANGEINDICATOR 0x4000
+#define SC_MOD_CHANGELINESTATE 0x8000
+#define SC_MOD_CHANGEMARGIN 0x10000
+#define SC_MOD_CHANGEANNOTATION 0x20000
+#define SC_MOD_CONTAINER 0x40000
+#define SC_MOD_LEXERSTATE 0x80000
+#define SC_MOD_INSERTCHECK 0x100000
+#define SC_MOD_CHANGETABSTOPS 0x200000
+#define SC_MOD_CHANGEEOLANNOTATION 0x400000
+#define SC_MODEVENTMASKALL 0x7FFFFF
+#define SC_UPDATE_NONE 0x0
+#define SC_UPDATE_CONTENT 0x1
+#define SC_UPDATE_SELECTION 0x2
+#define SC_UPDATE_V_SCROLL 0x4
+#define SC_UPDATE_H_SCROLL 0x8
+#define SCEN_CHANGE 768
+#define SCEN_SETFOCUS 512
+#define SCEN_KILLFOCUS 256
+#define SCK_DOWN 300
+#define SCK_UP 301
+#define SCK_LEFT 302
+#define SCK_RIGHT 303
+#define SCK_HOME 304
+#define SCK_END 305
+#define SCK_PRIOR 306
+#define SCK_NEXT 307
+#define SCK_DELETE 308
+#define SCK_INSERT 309
+#define SCK_ESCAPE 7
+#define SCK_BACK 8
+#define SCK_TAB 9
+#define SCK_RETURN 13
+#define SCK_ADD 310
+#define SCK_SUBTRACT 311
+#define SCK_DIVIDE 312
+#define SCK_WIN 313
+#define SCK_RWIN 314
+#define SCK_MENU 315
+#define SCMOD_NORM 0
+#define SCMOD_SHIFT 1
+#define SCMOD_CTRL 2
+#define SCMOD_ALT 4
+#define SCMOD_SUPER 8
+#define SCMOD_META 16
+#define SC_AC_FILLUP 1
+#define SC_AC_DOUBLECLICK 2
+#define SC_AC_TAB 3
+#define SC_AC_NEWLINE 4
+#define SC_AC_COMMAND 5
+#define SC_CHARACTERSOURCE_DIRECT_INPUT 0
+#define SC_CHARACTERSOURCE_TENTATIVE_INPUT 1
+#define SC_CHARACTERSOURCE_IME_RESULT 2
+#define SCN_STYLENEEDED 2000
+#define SCN_CHARADDED 2001
+#define SCN_SAVEPOINTREACHED 2002
+#define SCN_SAVEPOINTLEFT 2003
+#define SCN_MODIFYATTEMPTRO 2004
+#define SCN_KEY 2005
+#define SCN_DOUBLECLICK 2006
+#define SCN_UPDATEUI 2007
+#define SCN_MODIFIED 2008
+#define SCN_MACRORECORD 2009
+#define SCN_MARGINCLICK 2010
+#define SCN_NEEDSHOWN 2011
+#define SCN_PAINTED 2013
+#define SCN_USERLISTSELECTION 2014
+#define SCN_URIDROPPED 2015
+#define SCN_DWELLSTART 2016
+#define SCN_DWELLEND 2017
+#define SCN_ZOOM 2018
+#define SCN_HOTSPOTCLICK 2019
+#define SCN_HOTSPOTDOUBLECLICK 2020
+#define SCN_CALLTIPCLICK 2021
+#define SCN_AUTOCSELECTION 2022
+#define SCN_INDICATORCLICK 2023
+#define SCN_INDICATORRELEASE 2024
+#define SCN_AUTOCCANCELLED 2025
+#define SCN_AUTOCCHARDELETED 2026
+#define SCN_HOTSPOTRELEASECLICK 2027
+#define SCN_FOCUSIN 2028
+#define SCN_FOCUSOUT 2029
+#define SCN_AUTOCCOMPLETED 2030
+#define SCN_MARGINRIGHTCLICK 2031
+#define SCN_AUTOCSELECTIONCHANGE 2032
+#ifndef SCI_DISABLE_PROVISIONAL
+#define SC_BIDIRECTIONAL_DISABLED 0
+#define SC_BIDIRECTIONAL_L2R 1
+#define SC_BIDIRECTIONAL_R2L 2
+#define SCI_GETBIDIRECTIONAL 2708
+#define SCI_SETBIDIRECTIONAL 2709
+#endif
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
+
+#endif
+
+/* These structures are defined to be exactly the same shape as the Win32
+ * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
+ * So older code that treats Scintilla as a RichEdit will work. */
+
+struct Sci_CharacterRange {
+	Sci_PositionCR cpMin;
+	Sci_PositionCR cpMax;
+};
+
+struct Sci_TextRange {
+	struct Sci_CharacterRange chrg;
+	char *lpstrText;
+};
+
+struct Sci_TextToFind {
+	struct Sci_CharacterRange chrg;
+	const char *lpstrText;
+	struct Sci_CharacterRange chrgText;
+};
+
+typedef void *Sci_SurfaceID;
+
+struct Sci_Rectangle {
+	int left;
+	int top;
+	int right;
+	int bottom;
+};
+
+/* This structure is used in printing and requires some of the graphics types
+ * from Platform.h.  Not needed by most client code. */
+
+struct Sci_RangeToFormat {
+	Sci_SurfaceID hdc;
+	Sci_SurfaceID hdcTarget;
+	struct Sci_Rectangle rc;
+	struct Sci_Rectangle rcPage;
+	struct Sci_CharacterRange chrg;
+};
+
+#ifndef __cplusplus
+/* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This
+ * is not required in C++ code and actually seems to break ScintillaEditPy */
+typedef struct Sci_NotifyHeader Sci_NotifyHeader;
+typedef struct SCNotification SCNotification;
+#endif
+
+struct Sci_NotifyHeader {
+	/* Compatible with Windows NMHDR.
+	 * hwndFrom is really an environment specific window handle or pointer
+	 * but most clients of Scintilla.h do not have this type visible. */
+	void *hwndFrom;
+	uptr_t idFrom;
+	unsigned int code;
+};
+
+struct SCNotification {
+	Sci_NotifyHeader nmhdr;
+	Sci_Position position;
+	/* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */
+	/* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */
+	/* SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, SCN_HOTSPOTRELEASECLICK, */
+	/* SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+	/* SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+
+	int ch;
+	/* SCN_CHARADDED, SCN_KEY, SCN_AUTOCCOMPLETED, SCN_AUTOCSELECTION, */
+	/* SCN_USERLISTSELECTION */
+	int modifiers;
+	/* SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, */
+	/* SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+
+	int modificationType;	/* SCN_MODIFIED */
+	const char *text;
+	/* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED */
+
+	Sci_Position length;		/* SCN_MODIFIED */
+	Sci_Position linesAdded;	/* SCN_MODIFIED */
+	int message;	/* SCN_MACRORECORD */
+	uptr_t wParam;	/* SCN_MACRORECORD */
+	sptr_t lParam;	/* SCN_MACRORECORD */
+	Sci_Position line;		/* SCN_MODIFIED */
+	int foldLevelNow;	/* SCN_MODIFIED */
+	int foldLevelPrev;	/* SCN_MODIFIED */
+	int margin;		/* SCN_MARGINCLICK */
+	int listType;	/* SCN_USERLISTSELECTION */
+	int x;			/* SCN_DWELLSTART, SCN_DWELLEND */
+	int y;		/* SCN_DWELLSTART, SCN_DWELLEND */
+	int token;		/* SCN_MODIFIED with SC_MOD_CONTAINER */
+	Sci_Position annotationLinesAdded;	/* SCN_MODIFIED with SC_MOD_CHANGEANNOTATION */
+	int updated;	/* SCN_UPDATEUI */
+	int listCompletionMethod;
+	/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */
+	int characterSource;	/* SCN_CHARADDED */
+};
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+
+#define SCI_SETKEYSUNICODE 2521
+#define SCI_GETKEYSUNICODE 2522
+
+#define SCI_GETTWOPHASEDRAW 2283
+#define SCI_SETTWOPHASEDRAW 2284
+
+#define CharacterRange Sci_CharacterRange
+#define TextRange Sci_TextRange
+#define TextToFind Sci_TextToFind
+#define RangeToFormat Sci_RangeToFormat
+#define NotifyHeader Sci_NotifyHeader
+
+#define SCI_SETSTYLEBITS 2090
+#define SCI_GETSTYLEBITS 2091
+#define SCI_GETSTYLEBITSNEEDED 4011
+
+#define INDIC0_MASK 0x20
+#define INDIC1_MASK 0x40
+#define INDIC2_MASK 0x80
+#define INDICS_MASK 0xE0
+
+#endif
+
+#endif
diff --git a/scite-app/scintilla/include/Scintilla.iface b/scite-app/scintilla/include/Scintilla.iface
new file mode 100644
index 0000000..cc7dedf
--- /dev/null
+++ b/scite-app/scintilla/include/Scintilla.iface
@@ -0,0 +1,3368 @@
+## First line may be used for shbang
+
+## This file defines the interface to Scintilla
+
+## Copyright 2000-2003 by Neil Hodgson <neilh@scintilla.org>
+## The License.txt file describes the conditions under which this software may be distributed.
+
+## A line starting with ## is a pure comment and should be stripped by readers.
+## A line starting with #! is for future shbang use
+## A line starting with # followed by a space is a documentation comment and refers
+## to the next feature definition.
+
+## Each feature is defined by a line starting with fun, get, set, val, evt, enu, lex, or ali.
+##     cat -> start a category
+##     fun -> a function
+##     get -> a property get function
+##     set -> a property set function
+##     val -> definition of a constant
+##     evt -> an event
+##     enu -> associate an enumeration with a set of vals with a prefix
+##     lex -> associate a lexer with the lexical classes it produces
+##     ali -> add an alias for a val, commonly adding '_' to separate words
+##
+## All other feature names should be ignored. They may be defined in the future.
+## A property may have a set function, a get function or both. Each will have
+## "Get" or "Set" in their names and the corresponding name will have the obvious switch.
+## A property may be subscripted, in which case the first parameter is the subscript.
+## fun, get, and set features have a strict syntax:
+## <featureType><ws><returnType><ws><name>[=<number](<param>,<param>)
+## where <ws> stands for white space.
+## param may be empty (null value) or is <paramType><ws><paramName>[=<value>]
+## Additional white space is allowed between elements.
+## The syntax for evt is <featureType><ws><returnType><ws><name>[=<number]([<param>[,<param>]*])
+## Feature names that contain an underscore are defined by Windows, so in these
+## cases, using the Windows definition is preferred where available.
+## The feature numbers are stable so features will not be renumbered.
+## Features may be removed but they will go through a period of deprecation
+## before removal which is signalled by moving them into the Deprecated category.
+##
+## enu has the syntax enu<ws><enumeration>=<prefix>[<ws><prefix>]* where all the val
+## features in this file starting with a given <prefix> are considered part of the
+## enumeration.
+##
+## lex has the syntax lex<ws><name>=<lexerVal><ws><prefix>[<ws><prefix>]*
+## where name is a reasonably capitalised (Python, XML) identifier or UI name,
+## lexerVal is the val used to specify the lexer, and the list of prefixes is similar
+## to enu. The name may not be the same as that used within the lexer so the lexerVal
+## should be used to tie these entities together.
+
+## Types: Never start with a capital letter
+##     void
+##     int
+##     bool -> integer, 1=true, 0=false
+##     position -> intptr_t position in a document
+##     line -> intptr_t line in a document
+##     colour -> colour integer containing red, green, and blue bytes with red as least-significant and blue as most.
+##     colouralpha -> colour integer containing red, green, blue, and alpha bytes with red as least-significant and alpha as most.
+##     string -> pointer to const character
+##     stringresult -> pointer to character, NULL-> return size of result
+##     cells -> pointer to array of cells, each cell containing a style byte and character byte
+##     pointer -> void* pointer that may point to a document, loader, internal text storage or similar
+##     textrange -> range of a min and a max position with an output string
+##     findtext -> searchrange, text -> foundposition
+##     keymod -> integer containing key in low half and modifiers in high half
+##     formatrange
+## Enumeration types always start with a capital letter
+## Types no longer used:
+##     findtextex -> searchrange
+##     charrange -> range of a min and a max position
+##     charrangeresult -> like charrange, but output param
+##     countedstring
+##     point -> x,y
+##     pointresult  -> like point, but output param
+##     rectangle -> left,top,right,bottom
+## Client code should ignore definitions containing types it does not understand, except
+## for possibly #defining the constants
+
+## Line numbers and positions start at 0.
+## String arguments may contain NUL ('\0') characters where the calls provide a length
+## argument and retrieve NUL characters. APIs marked as NUL-terminated also have a
+## NUL appended but client code should calculate the size that will be returned rather
+## than relying upon the NUL whenever possible. Allow for the extra NUL character when
+## allocating buffers. The size to allocate for a stringresult (not including NUL) can be
+## determined by calling with a NULL (0) pointer.
+
+cat Basics
+
+################################################
+## For Scintilla.h
+val INVALID_POSITION=-1
+# Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
+# as many EM_ messages can be used although that use is deprecated.
+val SCI_START=2000
+val SCI_OPTIONAL_START=3000
+val SCI_LEXER_START=4000
+
+# Add text to the document at current position.
+fun void AddText=2001(position length, string text)
+
+# Add array of cells to document.
+fun void AddStyledText=2002(position length, cells c)
+
+# Insert string at a position.
+fun void InsertText=2003(position pos, string text)
+
+# Change the text that is being inserted in response to SC_MOD_INSERTCHECK
+fun void ChangeInsertion=2672(position length, string text)
+
+# Delete all text in the document.
+fun void ClearAll=2004(,)
+
+# Delete a range of text in the document.
+fun void DeleteRange=2645(position start, position lengthDelete)
+
+# Set all style bytes to 0, remove all folding information.
+fun void ClearDocumentStyle=2005(,)
+
+# Returns the number of bytes in the document.
+get position GetLength=2006(,)
+
+# Returns the character byte at the position.
+get int GetCharAt=2007(position pos,)
+
+# Returns the position of the caret.
+get position GetCurrentPos=2008(,)
+
+# Returns the position of the opposite end of the selection to the caret.
+get position GetAnchor=2009(,)
+
+# Returns the style byte at the position.
+get int GetStyleAt=2010(position pos,)
+
+# Redoes the next action on the undo history.
+fun void Redo=2011(,)
+
+# Choose between collecting actions into the undo
+# history and discarding them.
+set void SetUndoCollection=2012(bool collectUndo,)
+
+# Select all the text in the document.
+fun void SelectAll=2013(,)
+
+# Remember the current position in the undo history as the position
+# at which the document was saved.
+fun void SetSavePoint=2014(,)
+
+# Retrieve a buffer of cells.
+# Returns the number of bytes in the buffer not including terminating NULs.
+fun position GetStyledText=2015(, textrange tr)
+
+# Are there any redoable actions in the undo history?
+fun bool CanRedo=2016(,)
+
+# Retrieve the line number at which a particular marker is located.
+fun line MarkerLineFromHandle=2017(int markerHandle,)
+
+# Delete a marker.
+fun void MarkerDeleteHandle=2018(int markerHandle,)
+
+# Retrieve marker handles of a line
+fun int MarkerHandleFromLine=2732(line line, int which)
+
+# Retrieve marker number of a marker handle
+fun int MarkerNumberFromLine=2733(line line, int which)
+
+# Is undo history being collected?
+get bool GetUndoCollection=2019(,)
+
+enu WhiteSpace=SCWS_
+val SCWS_INVISIBLE=0
+val SCWS_VISIBLEALWAYS=1
+val SCWS_VISIBLEAFTERINDENT=2
+val SCWS_VISIBLEONLYININDENT=3
+
+ali SCWS_VISIBLEALWAYS=VISIBLE_ALWAYS
+ali SCWS_VISIBLEAFTERINDENT=VISIBLE_AFTER_INDENT
+ali SCWS_VISIBLEONLYININDENT=VISIBLE_ONLY_IN_INDENT
+
+# Are white space characters currently visible?
+# Returns one of SCWS_* constants.
+get WhiteSpace GetViewWS=2020(,)
+
+# Make white space characters invisible, always visible or visible outside indentation.
+set void SetViewWS=2021(WhiteSpace viewWS,)
+
+enu TabDrawMode=SCTD_
+val SCTD_LONGARROW=0
+val SCTD_STRIKEOUT=1
+
+ali SCTD_LONGARROW=LONG_ARROW
+ali SCTD_STRIKEOUT=STRIKE_OUT
+
+# Retrieve the current tab draw mode.
+# Returns one of SCTD_* constants.
+get TabDrawMode GetTabDrawMode=2698(,)
+
+# Set how tabs are drawn when visible.
+set void SetTabDrawMode=2699(TabDrawMode tabDrawMode,)
+
+# Find the position from a point within the window.
+fun position PositionFromPoint=2022(int x, int y)
+
+# Find the position from a point within the window but return
+# INVALID_POSITION if not close to text.
+fun position PositionFromPointClose=2023(int x, int y)
+
+# Set caret to start of a line and ensure it is visible.
+fun void GotoLine=2024(line line,)
+
+# Set caret to a position and ensure it is visible.
+fun void GotoPos=2025(position caret,)
+
+# Set the selection anchor to a position. The anchor is the opposite
+# end of the selection from the caret.
+set void SetAnchor=2026(position anchor,)
+
+# Retrieve the text of the line containing the caret.
+# Returns the index of the caret on the line.
+# Result is NUL-terminated.
+fun position GetCurLine=2027(position length, stringresult text)
+
+# Retrieve the position of the last correctly styled character.
+get position GetEndStyled=2028(,)
+
+enu EndOfLine=SC_EOL_
+val SC_EOL_CRLF=0
+val SC_EOL_CR=1
+val SC_EOL_LF=2
+
+ali SC_EOL_CRLF=CR_LF
+
+# Convert all line endings in the document to one mode.
+fun void ConvertEOLs=2029(EndOfLine eolMode,)
+
+# Retrieve the current end of line mode - one of CRLF, CR, or LF.
+get EndOfLine GetEOLMode=2030(,)
+
+# Set the current end of line mode.
+set void SetEOLMode=2031(EndOfLine eolMode,)
+
+# Set the current styling position to start.
+# The unused parameter is no longer used and should be set to 0.
+fun void StartStyling=2032(position start, int unused)
+
+# Change style from current styling position for length characters to a style
+# and move the current styling position to after this newly styled segment.
+fun void SetStyling=2033(position length, int style)
+
+# Is drawing done first into a buffer or direct to the screen?
+get bool GetBufferedDraw=2034(,)
+
+# If drawing is buffered then each line of text is drawn into a bitmap buffer
+# before drawing it to the screen to avoid flicker.
+set void SetBufferedDraw=2035(bool buffered,)
+
+# Change the visible size of a tab to be a multiple of the width of a space character.
+set void SetTabWidth=2036(int tabWidth,)
+
+# Retrieve the visible size of a tab.
+get int GetTabWidth=2121(,)
+
+# Set the minimum visual width of a tab.
+set void SetTabMinimumWidth=2724(int pixels,)
+
+# Get the minimum visual width of a tab.
+get int GetTabMinimumWidth=2725(,)
+
+# Clear explicit tabstops on a line.
+fun void ClearTabStops=2675(line line,)
+
+# Add an explicit tab stop for a line.
+fun void AddTabStop=2676(line line, int x)
+
+# Find the next explicit tab stop position on a line after a position.
+fun int GetNextTabStop=2677(line line, int x)
+
+# The SC_CP_UTF8 value can be used to enter Unicode mode.
+# This is the same value as CP_UTF8 in Windows
+val SC_CP_UTF8=65001
+
+# Set the code page used to interpret the bytes of the document as characters.
+# The SC_CP_UTF8 value can be used to enter Unicode mode.
+set void SetCodePage=2037(int codePage,)
+
+# Set the locale for displaying text.
+set void SetFontLocale=2760(, string localeName)
+
+# Get the locale for displaying text.
+get int GetFontLocale=2761(, stringresult localeName)
+
+enu IMEInteraction=SC_IME_
+val SC_IME_WINDOWED=0
+val SC_IME_INLINE=1
+
+# Is the IME displayed in a window or inline?
+get IMEInteraction GetIMEInteraction=2678(,)
+
+# Choose to display the IME in a window or inline.
+set void SetIMEInteraction=2679(IMEInteraction imeInteraction,)
+
+enu Alpha=SC_ALPHA_
+val SC_ALPHA_TRANSPARENT=0
+val SC_ALPHA_OPAQUE=255
+val SC_ALPHA_NOALPHA=256
+
+ali SC_ALPHA_NOALPHA=NO_ALPHA
+
+enu CursorShape=SC_CURSOR
+val SC_CURSORNORMAL=-1
+val SC_CURSORARROW=2
+val SC_CURSORWAIT=4
+val SC_CURSORREVERSEARROW=7
+
+ali SC_CURSORREVERSEARROW=REVERSE_ARROW
+
+enu MarkerSymbol=SC_MARK_
+val MARKER_MAX=31
+val SC_MARK_CIRCLE=0
+val SC_MARK_ROUNDRECT=1
+val SC_MARK_ARROW=2
+val SC_MARK_SMALLRECT=3
+val SC_MARK_SHORTARROW=4
+val SC_MARK_EMPTY=5
+val SC_MARK_ARROWDOWN=6
+val SC_MARK_MINUS=7
+val SC_MARK_PLUS=8
+
+# Shapes used for outlining column.
+val SC_MARK_VLINE=9
+val SC_MARK_LCORNER=10
+val SC_MARK_TCORNER=11
+val SC_MARK_BOXPLUS=12
+val SC_MARK_BOXPLUSCONNECTED=13
+val SC_MARK_BOXMINUS=14
+val SC_MARK_BOXMINUSCONNECTED=15
+val SC_MARK_LCORNERCURVE=16
+val SC_MARK_TCORNERCURVE=17
+val SC_MARK_CIRCLEPLUS=18
+val SC_MARK_CIRCLEPLUSCONNECTED=19
+val SC_MARK_CIRCLEMINUS=20
+val SC_MARK_CIRCLEMINUSCONNECTED=21
+
+# Invisible mark that only sets the line background colour.
+val SC_MARK_BACKGROUND=22
+val SC_MARK_DOTDOTDOT=23
+val SC_MARK_ARROWS=24
+val SC_MARK_PIXMAP=25
+val SC_MARK_FULLRECT=26
+val SC_MARK_LEFTRECT=27
+val SC_MARK_AVAILABLE=28
+val SC_MARK_UNDERLINE=29
+val SC_MARK_RGBAIMAGE=30
+val SC_MARK_BOOKMARK=31
+val SC_MARK_VERTICALBOOKMARK=32
+
+val SC_MARK_CHARACTER=10000
+
+ali SC_MARK_ROUNDRECT=ROUND_RECT
+ali SC_MARK_SMALLRECT=SMALL_RECT
+ali SC_MARK_SHORTARROW=SHORT_ARROW
+ali SC_MARK_ARROWDOWN=ARROW_DOWN
+ali SC_MARK_VLINE=V_LINE
+ali SC_MARK_LCORNER=L_CORNER
+ali SC_MARK_TCORNER=T_CORNER
+ali SC_MARK_BOXPLUS=BOX_PLUS
+ali SC_MARK_BOXPLUSCONNECTED=BOX_PLUS_CONNECTED
+ali SC_MARK_BOXMINUS=BOX_MINUS
+ali SC_MARK_BOXMINUSCONNECTED=BOX_MINUS_CONNECTED
+ali SC_MARK_LCORNERCURVE=L_CORNER_CURVE
+ali SC_MARK_TCORNERCURVE=T_CORNER_CURVE
+ali SC_MARK_CIRCLEPLUS=CIRCLE_PLUS
+ali SC_MARK_CIRCLEPLUSCONNECTED=CIRCLE_PLUS_CONNECTED
+ali SC_MARK_CIRCLEMINUS=CIRCLE_MINUS
+ali SC_MARK_CIRCLEMINUSCONNECTED=CIRCLE_MINUS_CONNECTED
+ali SC_MARK_DOTDOTDOT=DOT_DOT_DOT
+ali SC_MARK_FULLRECT=FULL_RECT
+ali SC_MARK_LEFTRECT=LEFT_RECT
+ali SC_MARK_RGBAIMAGE=RGBA_IMAGE
+ali SC_MARK_VERTICALBOOKMARK=VERTICAL_BOOKMARK
+
+enu MarkerOutline=SC_MARKNUM_
+# Markers used for outlining column.
+val SC_MARKNUM_FOLDEREND=25
+val SC_MARKNUM_FOLDEROPENMID=26
+val SC_MARKNUM_FOLDERMIDTAIL=27
+val SC_MARKNUM_FOLDERTAIL=28
+val SC_MARKNUM_FOLDERSUB=29
+val SC_MARKNUM_FOLDER=30
+val SC_MARKNUM_FOLDEROPEN=31
+
+ali SC_MARKNUM_FOLDEREND=FOLDER_END
+ali SC_MARKNUM_FOLDEROPENMID=FOLDER_OPEN_MID
+ali SC_MARKNUM_FOLDERMIDTAIL=FOLDER_MID_TAIL
+ali SC_MARKNUM_FOLDERTAIL=FOLDER_TAIL
+ali SC_MARKNUM_FOLDERSUB=FOLDER_SUB
+ali SC_MARKNUM_FOLDEROPEN=FOLDER_OPEN
+
+# SC_MASK_FOLDERS doesn't go in an enumeration as larger than max 32-bit positive integer
+val SC_MASK_FOLDERS=0xFE000000
+
+# Set the symbol used for a particular marker number.
+fun void MarkerDefine=2040(int markerNumber, MarkerSymbol markerSymbol)
+
+# Set the foreground colour used for a particular marker number.
+set void MarkerSetFore=2041(int markerNumber, colour fore)
+
+# Set the background colour used for a particular marker number.
+set void MarkerSetBack=2042(int markerNumber, colour back)
+
+# Set the background colour used for a particular marker number when its folding block is selected.
+set void MarkerSetBackSelected=2292(int markerNumber, colour back)
+
+# Set the foreground colour used for a particular marker number.
+set void MarkerSetForeTranslucent=2294(int markerNumber, colouralpha fore)
+
+# Set the background colour used for a particular marker number.
+set void MarkerSetBackTranslucent=2295(int markerNumber, colouralpha back)
+
+# Set the background colour used for a particular marker number when its folding block is selected.
+set void MarkerSetBackSelectedTranslucent=2296(int markerNumber, colouralpha back)
+
+# Set the width of strokes used in .01 pixels so 50  = 1/2 pixel width.
+set void MarkerSetStrokeWidth=2297(int markerNumber, int hundredths)
+
+# Enable/disable highlight for current folding block (smallest one that contains the caret)
+fun void MarkerEnableHighlight=2293(bool enabled,)
+
+# Add a marker to a line, returning an ID which can be used to find or delete the marker.
+fun int MarkerAdd=2043(line line, int markerNumber)
+
+# Delete a marker from a line.
+fun void MarkerDelete=2044(line line, int markerNumber)
+
+# Delete all markers with a particular number from all lines.
+fun void MarkerDeleteAll=2045(int markerNumber,)
+
+# Get a bit mask of all the markers set on a line.
+fun int MarkerGet=2046(line line,)
+
+# Find the next line at or after lineStart that includes a marker in mask.
+# Return -1 when no more lines.
+fun line MarkerNext=2047(line lineStart, int markerMask)
+
+# Find the previous line before lineStart that includes a marker in mask.
+fun line MarkerPrevious=2048(line lineStart, int markerMask)
+
+# Define a marker from a pixmap.
+fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap)
+
+# Add a set of markers to a line.
+fun void MarkerAddSet=2466(line line, int markerSet)
+
+# Set the alpha used for a marker that is drawn in the text area, not the margin.
+set void MarkerSetAlpha=2476(int markerNumber, Alpha alpha)
+
+# Get the layer used for a marker that is drawn in the text area, not the margin.
+get Layer MarkerGetLayer=2734(int markerNumber,)
+
+# Set the layer used for a marker that is drawn in the text area, not the margin.
+set void MarkerSetLayer=2735(int markerNumber, Layer layer)
+
+val SC_MAX_MARGIN=4
+
+enu MarginType=SC_MARGIN_
+val SC_MARGIN_SYMBOL=0
+val SC_MARGIN_NUMBER=1
+val SC_MARGIN_BACK=2
+val SC_MARGIN_FORE=3
+val SC_MARGIN_TEXT=4
+val SC_MARGIN_RTEXT=5
+val SC_MARGIN_COLOUR=6
+
+ali SC_MARGIN_RTEXT=R_TEXT
+
+# Set a margin to be either numeric or symbolic.
+set void SetMarginTypeN=2240(int margin, MarginType marginType)
+
+# Retrieve the type of a margin.
+get MarginType GetMarginTypeN=2241(int margin,)
+
+# Set the width of a margin to a width expressed in pixels.
+set void SetMarginWidthN=2242(int margin, int pixelWidth)
+
+# Retrieve the width of a margin in pixels.
+get int GetMarginWidthN=2243(int margin,)
+
+# Set a mask that determines which markers are displayed in a margin.
+set void SetMarginMaskN=2244(int margin, int mask)
+
+# Retrieve the marker mask of a margin.
+get int GetMarginMaskN=2245(int margin,)
+
+# Make a margin sensitive or insensitive to mouse clicks.
+set void SetMarginSensitiveN=2246(int margin, bool sensitive)
+
+# Retrieve the mouse click sensitivity of a margin.
+get bool GetMarginSensitiveN=2247(int margin,)
+
+# Set the cursor shown when the mouse is inside a margin.
+set void SetMarginCursorN=2248(int margin, CursorShape cursor)
+
+# Retrieve the cursor shown in a margin.
+get CursorShape GetMarginCursorN=2249(int margin,)
+
+# Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.
+set void SetMarginBackN=2250(int margin, colour back)
+
+# Retrieve the background colour of a margin
+get colour GetMarginBackN=2251(int margin,)
+
+# Allocate a non-standard number of margins.
+set void SetMargins=2252(int margins,)
+
+# How many margins are there?.
+get int GetMargins=2253(,)
+
+# Styles in range 32..39 are predefined for parts of the UI and are not used as normal styles.
+enu StylesCommon=STYLE_
+val STYLE_DEFAULT=32
+val STYLE_LINENUMBER=33
+val STYLE_BRACELIGHT=34
+val STYLE_BRACEBAD=35
+val STYLE_CONTROLCHAR=36
+val STYLE_INDENTGUIDE=37
+val STYLE_CALLTIP=38
+val STYLE_FOLDDISPLAYTEXT=39
+val STYLE_LASTPREDEFINED=39
+val STYLE_MAX=255
+
+ali STYLE_LINENUMBER=LINE_NUMBER
+ali STYLE_BRACELIGHT=BRACE_LIGHT
+ali STYLE_BRACEBAD=BRACE_BAD
+ali STYLE_CONTROLCHAR=CONTROL_CHAR
+ali STYLE_INDENTGUIDE=INDENT_GUIDE
+ali STYLE_CALLTIP=CALL_TIP
+ali STYLE_FOLDDISPLAYTEXT=FOLD_DISPLAY_TEXT
+ali STYLE_LASTPREDEFINED=LAST_PREDEFINED
+
+# Character set identifiers are used in StyleSetCharacterSet.
+# The values are the same as the Windows *_CHARSET values.
+enu CharacterSet=SC_CHARSET_
+val SC_CHARSET_ANSI=0
+val SC_CHARSET_DEFAULT=1
+val SC_CHARSET_BALTIC=186
+val SC_CHARSET_CHINESEBIG5=136
+val SC_CHARSET_EASTEUROPE=238
+val SC_CHARSET_GB2312=134
+val SC_CHARSET_GREEK=161
+val SC_CHARSET_HANGUL=129
+val SC_CHARSET_MAC=77
+val SC_CHARSET_OEM=255
+val SC_CHARSET_RUSSIAN=204
+val SC_CHARSET_OEM866=866
+val SC_CHARSET_CYRILLIC=1251
+val SC_CHARSET_SHIFTJIS=128
+val SC_CHARSET_SYMBOL=2
+val SC_CHARSET_TURKISH=162
+val SC_CHARSET_JOHAB=130
+val SC_CHARSET_HEBREW=177
+val SC_CHARSET_ARABIC=178
+val SC_CHARSET_VIETNAMESE=163
+val SC_CHARSET_THAI=222
+val SC_CHARSET_8859_15=1000
+
+ali SC_CHARSET_CHINESEBIG5=CHINESE_BIG5
+ali SC_CHARSET_EASTEUROPE=EAST_EUROPE
+ali SC_CHARSET_GB2312=G_B_2312
+ali SC_CHARSET_OEM866=OEM_866
+ali SC_CHARSET_SHIFTJIS=SHIFT_JIS
+ali SC_CHARSET_8859_15=ISO_8859_15
+
+# Clear all the styles and make equivalent to the global default style.
+fun void StyleClearAll=2050(,)
+
+# Set the foreground colour of a style.
+set void StyleSetFore=2051(int style, colour fore)
+
+# Set the background colour of a style.
+set void StyleSetBack=2052(int style, colour back)
+
+# Set a style to be bold or not.
+set void StyleSetBold=2053(int style, bool bold)
+
+# Set a style to be italic or not.
+set void StyleSetItalic=2054(int style, bool italic)
+
+# Set the size of characters of a style.
+set void StyleSetSize=2055(int style, int sizePoints)
+
+# Set the font of a style.
+set void StyleSetFont=2056(int style, string fontName)
+
+# Set a style to have its end of line filled or not.
+set void StyleSetEOLFilled=2057(int style, bool eolFilled)
+
+# Reset the default style to its state at startup
+fun void StyleResetDefault=2058(,)
+
+# Set a style to be underlined or not.
+set void StyleSetUnderline=2059(int style, bool underline)
+
+enu CaseVisible=SC_CASE_
+val SC_CASE_MIXED=0
+val SC_CASE_UPPER=1
+val SC_CASE_LOWER=2
+val SC_CASE_CAMEL=3
+
+# Get the foreground colour of a style.
+get colour StyleGetFore=2481(int style,)
+
+# Get the background colour of a style.
+get colour StyleGetBack=2482(int style,)
+
+# Get is a style bold or not.
+get bool StyleGetBold=2483(int style,)
+
+# Get is a style italic or not.
+get bool StyleGetItalic=2484(int style,)
+
+# Get the size of characters of a style.
+get int StyleGetSize=2485(int style,)
+
+# Get the font of a style.
+# Returns the length of the fontName
+# Result is NUL-terminated.
+get int StyleGetFont=2486(int style, stringresult fontName)
+
+# Get is a style to have its end of line filled or not.
+get bool StyleGetEOLFilled=2487(int style,)
+
+# Get is a style underlined or not.
+get bool StyleGetUnderline=2488(int style,)
+
+# Get is a style mixed case, or to force upper or lower case.
+get CaseVisible StyleGetCase=2489(int style,)
+
+# Get the character get of the font in a style.
+get CharacterSet StyleGetCharacterSet=2490(int style,)
+
+# Get is a style visible or not.
+get bool StyleGetVisible=2491(int style,)
+
+# Get is a style changeable or not (read only).
+# Experimental feature, currently buggy.
+get bool StyleGetChangeable=2492(int style,)
+
+# Get is a style a hotspot or not.
+get bool StyleGetHotSpot=2493(int style,)
+
+# Set a style to be mixed case, or to force upper or lower case.
+set void StyleSetCase=2060(int style, CaseVisible caseVisible)
+
+val SC_FONT_SIZE_MULTIPLIER=100
+
+# Set the size of characters of a style. Size is in points multiplied by 100.
+set void StyleSetSizeFractional=2061(int style, int sizeHundredthPoints)
+
+# Get the size of characters of a style in points multiplied by 100
+get int StyleGetSizeFractional=2062(int style,)
+
+enu FontWeight=SC_WEIGHT_
+val SC_WEIGHT_NORMAL=400
+val SC_WEIGHT_SEMIBOLD=600
+val SC_WEIGHT_BOLD=700
+
+ali SC_WEIGHT_SEMIBOLD=SEMI_BOLD
+
+# Set the weight of characters of a style.
+set void StyleSetWeight=2063(int style, FontWeight weight)
+
+# Get the weight of characters of a style.
+get FontWeight StyleGetWeight=2064(int style,)
+
+# Set the character set of the font in a style.
+set void StyleSetCharacterSet=2066(int style, CharacterSet characterSet)
+
+# Set a style to be a hotspot or not.
+set void StyleSetHotSpot=2409(int style, bool hotspot)
+
+enu Element=SC_ELEMENT_
+val SC_ELEMENT_LIST=0
+val SC_ELEMENT_LIST_BACK=1
+val SC_ELEMENT_LIST_SELECTED=2
+val SC_ELEMENT_LIST_SELECTED_BACK=3
+val SC_ELEMENT_SELECTION_TEXT=10
+val SC_ELEMENT_SELECTION_BACK=11
+val SC_ELEMENT_SELECTION_ADDITIONAL_TEXT=12
+val SC_ELEMENT_SELECTION_ADDITIONAL_BACK=13
+val SC_ELEMENT_SELECTION_SECONDARY_TEXT=14
+val SC_ELEMENT_SELECTION_SECONDARY_BACK=15
+val SC_ELEMENT_SELECTION_INACTIVE_TEXT=16
+val SC_ELEMENT_SELECTION_INACTIVE_BACK=17
+val SC_ELEMENT_CARET=40
+val SC_ELEMENT_CARET_ADDITIONAL=41
+val SC_ELEMENT_CARET_LINE_BACK=50
+val SC_ELEMENT_WHITE_SPACE=60
+val SC_ELEMENT_WHITE_SPACE_BACK=61
+val SC_ELEMENT_HOT_SPOT_ACTIVE=70
+val SC_ELEMENT_HOT_SPOT_ACTIVE_BACK=71
+
+# Set the colour of an element. Translucency (alpha) may or may not be significant
+# and this may depend on the platform. The alpha byte should commonly be 0xff for opaque.
+set void SetElementColour=2753(Element element, colouralpha colourElement)
+
+# Get the colour of an element.
+get colouralpha GetElementColour=2754(Element element,)
+
+# Use the default or platform-defined colour for an element.
+fun void ResetElementColour=2755(Element element,)
+
+# Get whether an element has been set by SetElementColour.
+# When false, a platform-defined or default colour is used.
+get bool GetElementIsSet=2756(Element element,)
+
+# Get whether an element supports translucency.
+get bool GetElementAllowsTranslucent=2757(Element element,)
+
+# Get the colour of an element.
+get colouralpha GetElementBaseColour=2758(Element element,)
+
+# Set the foreground colour of the main and additional selections and whether to use this setting.
+fun void SetSelFore=2067(bool useSetting, colour fore)
+
+# Set the background colour of the main and additional selections and whether to use this setting.
+fun void SetSelBack=2068(bool useSetting, colour back)
+
+# Get the alpha of the selection.
+get Alpha GetSelAlpha=2477(,)
+
+# Set the alpha of the selection.
+set void SetSelAlpha=2478(Alpha alpha,)
+
+# Is the selection end of line filled?
+get bool GetSelEOLFilled=2479(,)
+
+# Set the selection to have its end of line filled or not.
+set void SetSelEOLFilled=2480(bool filled,)
+
+enu Layer=SC_LAYER_
+val SC_LAYER_BASE=0
+val SC_LAYER_UNDER_TEXT=1
+val SC_LAYER_OVER_TEXT=2
+
+# Get the layer for drawing selections
+get Layer GetSelectionLayer=2762(,)
+
+# Set the layer for drawing selections: either opaquely on base layer or translucently over text
+set void SetSelectionLayer=2763(Layer layer,)
+
+# Get the layer of the background of the line containing the caret.
+get Layer GetCaretLineLayer=2764(,)
+
+# Set the layer of the background of the line containing the caret.
+set void SetCaretLineLayer=2765(Layer layer,)
+
+# Set the foreground colour of the caret.
+set void SetCaretFore=2069(colour fore,)
+
+# When key+modifier combination keyDefinition is pressed perform sciCommand.
+fun void AssignCmdKey=2070(keymod keyDefinition, int sciCommand)
+
+# When key+modifier combination keyDefinition is pressed do nothing.
+fun void ClearCmdKey=2071(keymod keyDefinition,)
+
+# Drop all key mappings.
+fun void ClearAllCmdKeys=2072(,)
+
+# Set the styles for a segment of the document.
+fun void SetStylingEx=2073(position length, string styles)
+
+# Set a style to be visible or not.
+set void StyleSetVisible=2074(int style, bool visible)
+
+# Get the time in milliseconds that the caret is on and off.
+get int GetCaretPeriod=2075(,)
+
+# Get the time in milliseconds that the caret is on and off. 0 = steady on.
+set void SetCaretPeriod=2076(int periodMilliseconds,)
+
+# Set the set of characters making up words for when moving or selecting by word.
+# First sets defaults like SetCharsDefault.
+set void SetWordChars=2077(, string characters)
+
+# Get the set of characters making up words for when moving or selecting by word.
+# Returns the number of characters
+get int GetWordChars=2646(, stringresult characters)
+
+# Set the number of characters to have directly indexed categories
+set void SetCharacterCategoryOptimization=2720(int countCharacters,)
+
+# Get the number of characters to have directly indexed categories
+get int GetCharacterCategoryOptimization=2721(,)
+
+# Start a sequence of actions that is undone and redone as a unit.
+# May be nested.
+fun void BeginUndoAction=2078(,)
+
+# End a sequence of actions that is undone and redone as a unit.
+fun void EndUndoAction=2079(,)
+
+# Indicator style enumeration and some constants
+enu IndicatorStyle=INDIC_
+val INDIC_PLAIN=0
+val INDIC_SQUIGGLE=1
+val INDIC_TT=2
+val INDIC_DIAGONAL=3
+val INDIC_STRIKE=4
+val INDIC_HIDDEN=5
+val INDIC_BOX=6
+val INDIC_ROUNDBOX=7
+val INDIC_STRAIGHTBOX=8
+val INDIC_DASH=9
+val INDIC_DOTS=10
+val INDIC_SQUIGGLELOW=11
+val INDIC_DOTBOX=12
+val INDIC_SQUIGGLEPIXMAP=13
+val INDIC_COMPOSITIONTHICK=14
+val INDIC_COMPOSITIONTHIN=15
+val INDIC_FULLBOX=16
+val INDIC_TEXTFORE=17
+val INDIC_POINT=18
+val INDIC_POINTCHARACTER=19
+val INDIC_GRADIENT=20
+val INDIC_GRADIENTCENTRE=21
+
+# INDIC_CONTAINER, INDIC_IME, INDIC_IME_MAX, and INDIC_MAX are indicator numbers,
+# not IndicatorStyles so should not really be in the INDIC_ enumeration.
+# They are redeclared in IndicatorNumbers INDICATOR_.
+val INDIC_CONTAINER=8
+val INDIC_IME=32
+val INDIC_IME_MAX=35
+val INDIC_MAX=35
+
+enu IndicatorNumbers=INDICATOR_
+val INDICATOR_CONTAINER=8
+val INDICATOR_IME=32
+val INDICATOR_IME_MAX=35
+val INDICATOR_MAX=35
+
+ali INDIC_TT=T_T
+ali INDIC_ROUNDBOX=ROUND_BOX
+ali INDIC_STRAIGHTBOX=STRAIGHT_BOX
+ali INDIC_SQUIGGLELOW=SQUIGGLE_LOW
+ali INDIC_DOTBOX=DOT_BOX
+ali INDIC_SQUIGGLEPIXMAP=SQUIGGLE_PIXMAP
+ali INDIC_COMPOSITIONTHICK=COMPOSITION_THICK
+ali INDIC_COMPOSITIONTHIN=COMPOSITION_THIN
+ali INDIC_FULLBOX=FULL_BOX
+ali INDIC_TEXTFORE=TEXT_FORE
+ali INDIC_POINTCHARACTER=POINT_CHARACTER
+ali INDIC_GRADIENTCENTRE=GRADIENT_CENTRE
+
+# Set an indicator to plain, squiggle or TT.
+set void IndicSetStyle=2080(int indicator, IndicatorStyle indicatorStyle)
+
+# Retrieve the style of an indicator.
+get IndicatorStyle IndicGetStyle=2081(int indicator,)
+
+# Set the foreground colour of an indicator.
+set void IndicSetFore=2082(int indicator, colour fore)
+
+# Retrieve the foreground colour of an indicator.
+get colour IndicGetFore=2083(int indicator,)
+
+# Set an indicator to draw under text or over(default).
+set void IndicSetUnder=2510(int indicator, bool under)
+
+# Retrieve whether indicator drawn under or over text.
+get bool IndicGetUnder=2511(int indicator,)
+
+# Set a hover indicator to plain, squiggle or TT.
+set void IndicSetHoverStyle=2680(int indicator, IndicatorStyle indicatorStyle)
+
+# Retrieve the hover style of an indicator.
+get IndicatorStyle IndicGetHoverStyle=2681(int indicator,)
+
+# Set the foreground hover colour of an indicator.
+set void IndicSetHoverFore=2682(int indicator, colour fore)
+
+# Retrieve the foreground hover colour of an indicator.
+get colour IndicGetHoverFore=2683(int indicator,)
+
+enu IndicValue=SC_INDICVALUE
+val SC_INDICVALUEBIT=0x1000000
+val SC_INDICVALUEMASK=0xFFFFFF
+
+enu IndicFlag=SC_INDICFLAG_
+val SC_INDICFLAG_NONE=0
+val SC_INDICFLAG_VALUEFORE=1
+
+ali SC_INDICFLAG_VALUEFORE=VALUE_FORE
+
+# Set the attributes of an indicator.
+set void IndicSetFlags=2684(int indicator, IndicFlag flags)
+
+# Retrieve the attributes of an indicator.
+get IndicFlag IndicGetFlags=2685(int indicator,)
+
+# Set the stroke width of an indicator in hundredths of a pixel.
+set void IndicSetStrokeWidth=2751(int indicator, int hundredths)
+
+# Retrieve the stroke width of an indicator.
+get int IndicGetStrokeWidth=2752(int indicator,)
+
+# Set the foreground colour of all whitespace and whether to use this setting.
+fun void SetWhitespaceFore=2084(bool useSetting, colour fore)
+
+# Set the background colour of all whitespace and whether to use this setting.
+fun void SetWhitespaceBack=2085(bool useSetting, colour back)
+
+# Set the size of the dots used to mark space characters.
+set void SetWhitespaceSize=2086(int size,)
+
+# Get the size of the dots used to mark space characters.
+get int GetWhitespaceSize=2087(,)
+
+# Used to hold extra styling information for each line.
+set void SetLineState=2092(line line, int state)
+
+# Retrieve the extra styling information for a line.
+get int GetLineState=2093(line line,)
+
+# Retrieve the last line number that has line state.
+get int GetMaxLineState=2094(,)
+
+# Is the background of the line containing the caret in a different colour?
+get bool GetCaretLineVisible=2095(,)
+
+# Display the background of the line containing the caret in a different colour.
+set void SetCaretLineVisible=2096(bool show,)
+
+# Get the colour of the background of the line containing the caret.
+get colour GetCaretLineBack=2097(,)
+
+# Set the colour of the background of the line containing the caret.
+set void SetCaretLineBack=2098(colour back,)
+
+# Retrieve the caret line frame width.
+# Width = 0 means this option is disabled.
+get int GetCaretLineFrame=2704(,)
+
+# Display the caret line framed.
+# Set width != 0 to enable this option and width = 0 to disable it.
+set void SetCaretLineFrame=2705(int width,)
+
+# Set a style to be changeable or not (read only).
+# Experimental feature, currently buggy.
+set void StyleSetChangeable=2099(int style, bool changeable)
+
+# Display a auto-completion list.
+# The lengthEntered parameter indicates how many characters before
+# the caret should be used to provide context.
+fun void AutoCShow=2100(position lengthEntered, string itemList)
+
+# Remove the auto-completion list from the screen.
+fun void AutoCCancel=2101(,)
+
+# Is there an auto-completion list visible?
+fun bool AutoCActive=2102(,)
+
+# Retrieve the position of the caret when the auto-completion list was displayed.
+fun position AutoCPosStart=2103(,)
+
+# User has selected an item so remove the list and insert the selection.
+fun void AutoCComplete=2104(,)
+
+# Define a set of character that when typed cancel the auto-completion list.
+fun void AutoCStops=2105(, string characterSet)
+
+# Change the separator character in the string setting up an auto-completion list.
+# Default is space but can be changed if items contain space.
+set void AutoCSetSeparator=2106(int separatorCharacter,)
+
+# Retrieve the auto-completion list separator character.
+get int AutoCGetSeparator=2107(,)
+
+# Select the item in the auto-completion list that starts with a string.
+fun void AutoCSelect=2108(, string select)
+
+# Should the auto-completion list be cancelled if the user backspaces to a
+# position before where the box was created.
+set void AutoCSetCancelAtStart=2110(bool cancel,)
+
+# Retrieve whether auto-completion cancelled by backspacing before start.
+get bool AutoCGetCancelAtStart=2111(,)
+
+# Define a set of characters that when typed will cause the autocompletion to
+# choose the selected item.
+set void AutoCSetFillUps=2112(, string characterSet)
+
+# Should a single item auto-completion list automatically choose the item.
+set void AutoCSetChooseSingle=2113(bool chooseSingle,)
+
+# Retrieve whether a single item auto-completion list automatically choose the item.
+get bool AutoCGetChooseSingle=2114(,)
+
+# Set whether case is significant when performing auto-completion searches.
+set void AutoCSetIgnoreCase=2115(bool ignoreCase,)
+
+# Retrieve state of ignore case flag.
+get bool AutoCGetIgnoreCase=2116(,)
+
+# Display a list of strings and send notification when user chooses one.
+fun void UserListShow=2117(int listType, string itemList)
+
+# Set whether or not autocompletion is hidden automatically when nothing matches.
+set void AutoCSetAutoHide=2118(bool autoHide,)
+
+# Retrieve whether or not autocompletion is hidden automatically when nothing matches.
+get bool AutoCGetAutoHide=2119(,)
+
+# Define option flags for autocompletion lists
+enu AutoCompleteOption=SC_AUTOCOMPLETE_
+val SC_AUTOCOMPLETE_NORMAL=0
+# Win32 specific:
+val SC_AUTOCOMPLETE_FIXED_SIZE=1
+
+# Set autocompletion options.
+set void AutoCSetOptions=2638(AutoCompleteOption options,)
+
+# Retrieve autocompletion options.
+get AutoCompleteOption AutoCGetOptions=2639(,)
+
+# Set whether or not autocompletion deletes any word characters
+# after the inserted text upon completion.
+set void AutoCSetDropRestOfWord=2270(bool dropRestOfWord,)
+
+# Retrieve whether or not autocompletion deletes any word characters
+# after the inserted text upon completion.
+get bool AutoCGetDropRestOfWord=2271(,)
+
+# Register an XPM image for use in autocompletion lists.
+fun void RegisterImage=2405(int type, string xpmData)
+
+# Clear all the registered XPM images.
+fun void ClearRegisteredImages=2408(,)
+
+# Retrieve the auto-completion list type-separator character.
+get int AutoCGetTypeSeparator=2285(,)
+
+# Change the type-separator character in the string setting up an auto-completion list.
+# Default is '?' but can be changed if items contain '?'.
+set void AutoCSetTypeSeparator=2286(int separatorCharacter,)
+
+# Set the maximum width, in characters, of auto-completion and user lists.
+# Set to 0 to autosize to fit longest item, which is the default.
+set void AutoCSetMaxWidth=2208(int characterCount,)
+
+# Get the maximum width, in characters, of auto-completion and user lists.
+get int AutoCGetMaxWidth=2209(,)
+
+# Set the maximum height, in rows, of auto-completion and user lists.
+# The default is 5 rows.
+set void AutoCSetMaxHeight=2210(int rowCount,)
+
+# Set the maximum height, in rows, of auto-completion and user lists.
+get int AutoCGetMaxHeight=2211(,)
+
+# Set the number of spaces used for one level of indentation.
+set void SetIndent=2122(int indentSize,)
+
+# Retrieve indentation size.
+get int GetIndent=2123(,)
+
+# Indentation will only use space characters if useTabs is false, otherwise
+# it will use a combination of tabs and spaces.
+set void SetUseTabs=2124(bool useTabs,)
+
+# Retrieve whether tabs will be used in indentation.
+get bool GetUseTabs=2125(,)
+
+# Change the indentation of a line to a number of columns.
+set void SetLineIndentation=2126(line line, int indentation)
+
+# Retrieve the number of columns that a line is indented.
+get int GetLineIndentation=2127(line line,)
+
+# Retrieve the position before the first non indentation character on a line.
+get position GetLineIndentPosition=2128(line line,)
+
+# Retrieve the column number of a position, taking tab width into account.
+get position GetColumn=2129(position pos,)
+
+# Count characters between two positions.
+fun position CountCharacters=2633(position start, position end)
+
+# Count code units between two positions.
+fun position CountCodeUnits=2715(position start, position end)
+
+# Show or hide the horizontal scroll bar.
+set void SetHScrollBar=2130(bool visible,)
+# Is the horizontal scroll bar visible?
+get bool GetHScrollBar=2131(,)
+
+enu IndentView=SC_IV_
+val SC_IV_NONE=0
+val SC_IV_REAL=1
+val SC_IV_LOOKFORWARD=2
+val SC_IV_LOOKBOTH=3
+
+ali SC_IV_LOOKFORWARD=LOOK_FORWARD
+ali SC_IV_LOOKBOTH=LOOK_BOTH
+
+# Show or hide indentation guides.
+set void SetIndentationGuides=2132(IndentView indentView,)
+
+# Are the indentation guides visible?
+get IndentView GetIndentationGuides=2133(,)
+
+# Set the highlighted indentation guide column.
+# 0 = no highlighted guide.
+set void SetHighlightGuide=2134(position column,)
+
+# Get the highlighted indentation guide column.
+get position GetHighlightGuide=2135(,)
+
+# Get the position after the last visible characters on a line.
+get position GetLineEndPosition=2136(line line,)
+
+# Get the code page used to interpret the bytes of the document as characters.
+get int GetCodePage=2137(,)
+
+# Get the foreground colour of the caret.
+get colour GetCaretFore=2138(,)
+
+# In read-only mode?
+get bool GetReadOnly=2140(,)
+
+# Sets the position of the caret.
+set void SetCurrentPos=2141(position caret,)
+
+# Sets the position that starts the selection - this becomes the anchor.
+set void SetSelectionStart=2142(position anchor,)
+
+# Returns the position at the start of the selection.
+get position GetSelectionStart=2143(,)
+
+# Sets the position that ends the selection - this becomes the caret.
+set void SetSelectionEnd=2144(position caret,)
+
+# Returns the position at the end of the selection.
+get position GetSelectionEnd=2145(,)
+
+# Set caret to a position, while removing any existing selection.
+fun void SetEmptySelection=2556(position caret,)
+
+# Sets the print magnification added to the point size of each style for printing.
+set void SetPrintMagnification=2146(int magnification,)
+
+# Returns the print magnification.
+get int GetPrintMagnification=2147(,)
+
+enu PrintOption=SC_PRINT_
+# PrintColourMode - use same colours as screen.
+# with the exception of line number margins, which use a white background
+val SC_PRINT_NORMAL=0
+# PrintColourMode - invert the light value of each style for printing.
+val SC_PRINT_INVERTLIGHT=1
+# PrintColourMode - force black text on white background for printing.
+val SC_PRINT_BLACKONWHITE=2
+# PrintColourMode - text stays coloured, but all background is forced to be white for printing.
+val SC_PRINT_COLOURONWHITE=3
+# PrintColourMode - only the default-background is forced to be white for printing.
+val SC_PRINT_COLOURONWHITEDEFAULTBG=4
+# PrintColourMode - use same colours as screen, including line number margins.
+val SC_PRINT_SCREENCOLOURS=5
+
+ali SC_PRINT_INVERTLIGHT=INVERT_LIGHT
+ali SC_PRINT_BLACKONWHITE=BLACK_ON_WHITE
+ali SC_PRINT_COLOURONWHITE=COLOUR_ON_WHITE
+ali SC_PRINT_COLOURONWHITEDEFAULTBG=COLOUR_ON_WHITE_DEFAULT_B_G
+ali SC_PRINT_SCREENCOLOURS=SCREEN_COLOURS
+
+# Modify colours when printing for clearer printed text.
+set void SetPrintColourMode=2148(PrintOption mode,)
+
+# Returns the print colour mode.
+get PrintOption GetPrintColourMode=2149(,)
+
+enu FindOption=SCFIND_
+val SCFIND_NONE=0x0
+val SCFIND_WHOLEWORD=0x2
+val SCFIND_MATCHCASE=0x4
+val SCFIND_WORDSTART=0x00100000
+val SCFIND_REGEXP=0x00200000
+val SCFIND_POSIX=0x00400000
+val SCFIND_CXX11REGEX=0x00800000
+
+ali SCFIND_WHOLEWORD=WHOLE_WORD
+ali SCFIND_MATCHCASE=MATCH_CASE
+ali SCFIND_WORDSTART=WORD_START
+ali SCFIND_REGEXP=REG_EXP
+ali SCFIND_CXX11REGEX=CXX11_REG_EX
+
+# Find some text in the document.
+fun position FindText=2150(FindOption searchFlags, findtext ft)
+
+# On Windows, will draw the document into a display context such as a printer.
+fun position FormatRange=2151(bool draw, formatrange fr)
+
+# Retrieve the display line at the top of the display.
+get line GetFirstVisibleLine=2152(,)
+
+# Retrieve the contents of a line.
+# Returns the length of the line.
+fun position GetLine=2153(line line, stringresult text)
+
+# Returns the number of lines in the document. There is always at least one.
+get line GetLineCount=2154(,)
+
+# Enlarge the number of lines allocated.
+set void AllocateLines=2089(line lines,)
+
+# Sets the size in pixels of the left margin.
+set void SetMarginLeft=2155(, int pixelWidth)
+
+# Returns the size in pixels of the left margin.
+get int GetMarginLeft=2156(,)
+
+# Sets the size in pixels of the right margin.
+set void SetMarginRight=2157(, int pixelWidth)
+
+# Returns the size in pixels of the right margin.
+get int GetMarginRight=2158(,)
+
+# Is the document different from when it was last saved?
+get bool GetModify=2159(,)
+
+# Select a range of text.
+fun void SetSel=2160(position anchor, position caret)
+
+# Retrieve the selected text.
+# Return the length of the text.
+# Result is NUL-terminated.
+fun position GetSelText=2161(, stringresult text)
+
+# Retrieve a range of text.
+# Return the length of the text.
+fun position GetTextRange=2162(, textrange tr)
+
+# Draw the selection either highlighted or in normal (non-highlighted) style.
+fun void HideSelection=2163(bool hide,)
+
+# Retrieve the x value of the point in the window where a position is displayed.
+fun int PointXFromPosition=2164(, position pos)
+
+# Retrieve the y value of the point in the window where a position is displayed.
+fun int PointYFromPosition=2165(, position pos)
+
+# Retrieve the line containing a position.
+fun line LineFromPosition=2166(position pos,)
+
+# Retrieve the position at the start of a line.
+fun position PositionFromLine=2167(line line,)
+
+# Scroll horizontally and vertically.
+fun void LineScroll=2168(position columns, line lines)
+
+# Ensure the caret is visible.
+fun void ScrollCaret=2169(,)
+
+# Scroll the argument positions and the range between them into view giving
+# priority to the primary position then the secondary position.
+# This may be used to make a search match visible.
+fun void ScrollRange=2569(position secondary, position primary)
+
+# Replace the selected text with the argument text.
+fun void ReplaceSel=2170(, string text)
+
+# Set to read only or read write.
+set void SetReadOnly=2171(bool readOnly,)
+
+# Null operation.
+fun void Null=2172(,)
+
+# Will a paste succeed?
+fun bool CanPaste=2173(,)
+
+# Are there any undoable actions in the undo history?
+fun bool CanUndo=2174(,)
+
+# Delete the undo history.
+fun void EmptyUndoBuffer=2175(,)
+
+# Undo one action in the undo history.
+fun void Undo=2176(,)
+
+# Cut the selection to the clipboard.
+fun void Cut=2177(,)
+
+# Copy the selection to the clipboard.
+fun void Copy=2178(,)
+
+# Paste the contents of the clipboard into the document replacing the selection.
+fun void Paste=2179(,)
+
+# Clear the selection.
+fun void Clear=2180(,)
+
+# Replace the contents of the document with the argument text.
+fun void SetText=2181(, string text)
+
+# Retrieve all the text in the document.
+# Returns number of characters retrieved.
+# Result is NUL-terminated.
+fun position GetText=2182(position length, stringresult text)
+
+# Retrieve the number of characters in the document.
+get position GetTextLength=2183(,)
+
+# Retrieve a pointer to a function that processes messages for this Scintilla.
+get pointer GetDirectFunction=2184(,)
+
+# Retrieve a pointer to a function that processes messages for this Scintilla and returns status.
+get pointer GetDirectStatusFunction=2772(,)
+
+# Retrieve a pointer value to use as the first argument when calling
+# the function returned by GetDirectFunction.
+get pointer GetDirectPointer=2185(,)
+
+# Set to overtype (true) or insert mode.
+set void SetOvertype=2186(bool overType,)
+
+# Returns true if overtype mode is active otherwise false is returned.
+get bool GetOvertype=2187(,)
+
+# Set the width of the insert mode caret.
+set void SetCaretWidth=2188(int pixelWidth,)
+
+# Returns the width of the insert mode caret.
+get int GetCaretWidth=2189(,)
+
+# Sets the position that starts the target which is used for updating the
+# document without affecting the scroll position.
+set void SetTargetStart=2190(position start,)
+
+# Get the position that starts the target.
+get position GetTargetStart=2191(,)
+
+# Sets the virtual space of the target start
+set void SetTargetStartVirtualSpace=2728(position space,)
+
+# Get the virtual space of the target start
+get position GetTargetStartVirtualSpace=2729(,)
+
+# Sets the position that ends the target which is used for updating the
+# document without affecting the scroll position.
+set void SetTargetEnd=2192(position end,)
+
+# Get the position that ends the target.
+get position GetTargetEnd=2193(,)
+
+# Sets the virtual space of the target end
+set void SetTargetEndVirtualSpace=2730(position space,)
+
+# Get the virtual space of the target end
+get position GetTargetEndVirtualSpace=2731(,)
+
+# Sets both the start and end of the target in one call.
+fun void SetTargetRange=2686(position start, position end)
+
+# Retrieve the text in the target.
+get position GetTargetText=2687(, stringresult text)
+
+# Make the target range start and end be the same as the selection range start and end.
+fun void TargetFromSelection=2287(,)
+
+# Sets the target to the whole document.
+fun void TargetWholeDocument=2690(,)
+
+# Replace the target text with the argument text.
+# Text is counted so it can contain NULs.
+# Returns the length of the replacement text.
+fun position ReplaceTarget=2194(position length, string text)
+
+# Replace the target text with the argument text after \d processing.
+# Text is counted so it can contain NULs.
+# Looks for \d where d is between 1 and 9 and replaces these with the strings
+# matched in the last search operation which were surrounded by \( and \).
+# Returns the length of the replacement text including any change
+# caused by processing the \d patterns.
+fun position ReplaceTargetRE=2195(position length, string text)
+
+# Search for a counted string in the target and set the target to the found
+# range. Text is counted so it can contain NULs.
+# Returns start of found range or -1 for failure in which case target is not moved.
+fun position SearchInTarget=2197(position length, string text)
+
+# Set the search flags used by SearchInTarget.
+set void SetSearchFlags=2198(FindOption searchFlags,)
+
+# Get the search flags used by SearchInTarget.
+get FindOption GetSearchFlags=2199(,)
+
+# Show a call tip containing a definition near position pos.
+fun void CallTipShow=2200(position pos, string definition)
+
+# Remove the call tip from the screen.
+fun void CallTipCancel=2201(,)
+
+# Is there an active call tip?
+fun bool CallTipActive=2202(,)
+
+# Retrieve the position where the caret was before displaying the call tip.
+fun position CallTipPosStart=2203(,)
+
+# Set the start position in order to change when backspacing removes the calltip.
+set void CallTipSetPosStart=2214(position posStart,)
+
+# Highlight a segment of the definition.
+fun void CallTipSetHlt=2204(position highlightStart, position highlightEnd)
+
+# Set the background colour for the call tip.
+set void CallTipSetBack=2205(colour back,)
+
+# Set the foreground colour for the call tip.
+set void CallTipSetFore=2206(colour fore,)
+
+# Set the foreground colour for the highlighted part of the call tip.
+set void CallTipSetForeHlt=2207(colour fore,)
+
+# Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
+set void CallTipUseStyle=2212(int tabSize,)
+
+# Set position of calltip, above or below text.
+set void CallTipSetPosition=2213(bool above,)
+
+# Find the display line of a document line taking hidden lines into account.
+fun line VisibleFromDocLine=2220(line docLine,)
+
+# Find the document line of a display line taking hidden lines into account.
+fun line DocLineFromVisible=2221(line displayLine,)
+
+# The number of display lines needed to wrap a document line
+fun line WrapCount=2235(line docLine,)
+
+enu FoldLevel=SC_FOLDLEVEL
+val SC_FOLDLEVELNONE=0x0
+val SC_FOLDLEVELBASE=0x400
+val SC_FOLDLEVELWHITEFLAG=0x1000
+val SC_FOLDLEVELHEADERFLAG=0x2000
+val SC_FOLDLEVELNUMBERMASK=0x0FFF
+
+ali SC_FOLDLEVELWHITEFLAG=WHITE_FLAG
+ali SC_FOLDLEVELHEADERFLAG=HEADER_FLAG
+ali SC_FOLDLEVELNUMBERMASK=NUMBER_MASK
+
+# Set the fold level of a line.
+# This encodes an integer level along with flags indicating whether the
+# line is a header and whether it is effectively white space.
+set void SetFoldLevel=2222(line line, FoldLevel level)
+
+# Retrieve the fold level of a line.
+get FoldLevel GetFoldLevel=2223(line line,)
+
+# Find the last child line of a header line.
+get line GetLastChild=2224(line line, FoldLevel level)
+
+# Find the parent line of a child line.
+get line GetFoldParent=2225(line line,)
+
+# Make a range of lines visible.
+fun void ShowLines=2226(line lineStart, line lineEnd)
+
+# Make a range of lines invisible.
+fun void HideLines=2227(line lineStart, line lineEnd)
+
+# Is a line visible?
+get bool GetLineVisible=2228(line line,)
+
+# Are all lines visible?
+get bool GetAllLinesVisible=2236(,)
+
+# Show the children of a header line.
+set void SetFoldExpanded=2229(line line, bool expanded)
+
+# Is a header line expanded?
+get bool GetFoldExpanded=2230(line line,)
+
+# Switch a header line between expanded and contracted.
+fun void ToggleFold=2231(line line,)
+
+# Switch a header line between expanded and contracted and show some text after the line.
+fun void ToggleFoldShowText=2700(line line, string text)
+
+enu FoldDisplayTextStyle=SC_FOLDDISPLAYTEXT_
+val SC_FOLDDISPLAYTEXT_HIDDEN=0
+val SC_FOLDDISPLAYTEXT_STANDARD=1
+val SC_FOLDDISPLAYTEXT_BOXED=2
+
+# Set the style of fold display text.
+set void FoldDisplayTextSetStyle=2701(FoldDisplayTextStyle style,)
+
+# Get the style of fold display text.
+get FoldDisplayTextStyle FoldDisplayTextGetStyle=2707(,)
+
+# Set the default fold display text.
+fun void SetDefaultFoldDisplayText=2722(, string text)
+
+# Get the default fold display text.
+fun int GetDefaultFoldDisplayText=2723(, stringresult text)
+
+enu FoldAction=SC_FOLDACTION_
+val SC_FOLDACTION_CONTRACT=0
+val SC_FOLDACTION_EXPAND=1
+val SC_FOLDACTION_TOGGLE=2
+
+# Expand or contract a fold header.
+fun void FoldLine=2237(line line, FoldAction action)
+
+# Expand or contract a fold header and its children.
+fun void FoldChildren=2238(line line, FoldAction action)
+
+# Expand a fold header and all children. Use the level argument instead of the line's current level.
+fun void ExpandChildren=2239(line line, FoldLevel level)
+
+# Expand or contract all fold headers.
+fun void FoldAll=2662(FoldAction action,)
+
+# Ensure a particular line is visible by expanding any header line hiding it.
+fun void EnsureVisible=2232(line line,)
+
+enu AutomaticFold=SC_AUTOMATICFOLD_
+val SC_AUTOMATICFOLD_NONE=0x0000
+val SC_AUTOMATICFOLD_SHOW=0x0001
+val SC_AUTOMATICFOLD_CLICK=0x0002
+val SC_AUTOMATICFOLD_CHANGE=0x0004
+
+# Set automatic folding behaviours.
+set void SetAutomaticFold=2663(AutomaticFold automaticFold,)
+
+# Get automatic folding behaviours.
+get AutomaticFold GetAutomaticFold=2664(,)
+
+enu FoldFlag=SC_FOLDFLAG_
+val SC_FOLDFLAG_NONE=0x0000
+val SC_FOLDFLAG_LINEBEFORE_EXPANDED=0x0002
+val SC_FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004
+val SC_FOLDFLAG_LINEAFTER_EXPANDED=0x0008
+val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010
+val SC_FOLDFLAG_LEVELNUMBERS=0x0040
+val SC_FOLDFLAG_LINESTATE=0x0080
+
+ali SC_FOLDFLAG_LINEBEFORE_EXPANDED=LINE_BEFORE_EXPANDED
+ali SC_FOLDFLAG_LINEBEFORE_CONTRACTED=LINE_BEFORE_CONTRACTED
+ali SC_FOLDFLAG_LINEAFTER_EXPANDED=LINE_AFTER_EXPANDED
+ali SC_FOLDFLAG_LINEAFTER_CONTRACTED=LINE_AFTER_CONTRACTED
+ali SC_FOLDFLAG_LEVELNUMBERS=LEVEL_NUMBERS
+ali SC_FOLDFLAG_LINESTATE=LINE_STATE
+
+# Set some style options for folding.
+set void SetFoldFlags=2233(FoldFlag flags,)
+
+# Ensure a particular line is visible by expanding any header line hiding it.
+# Use the currently set visibility policy to determine which range to display.
+fun void EnsureVisibleEnforcePolicy=2234(line line,)
+
+# Sets whether a tab pressed when caret is within indentation indents.
+set void SetTabIndents=2260(bool tabIndents,)
+
+# Does a tab pressed when caret is within indentation indent?
+get bool GetTabIndents=2261(,)
+
+# Sets whether a backspace pressed when caret is within indentation unindents.
+set void SetBackSpaceUnIndents=2262(bool bsUnIndents,)
+
+# Does a backspace pressed when caret is within indentation unindent?
+get bool GetBackSpaceUnIndents=2263(,)
+
+val SC_TIME_FOREVER=10000000
+
+# Sets the time the mouse must sit still to generate a mouse dwell event.
+set void SetMouseDwellTime=2264(int periodMilliseconds,)
+
+# Retrieve the time the mouse must sit still to generate a mouse dwell event.
+get int GetMouseDwellTime=2265(,)
+
+# Get position of start of word.
+fun position WordStartPosition=2266(position pos, bool onlyWordCharacters)
+
+# Get position of end of word.
+fun position WordEndPosition=2267(position pos, bool onlyWordCharacters)
+
+# Is the range start..end considered a word?
+fun bool IsRangeWord=2691(position start, position end)
+
+enu IdleStyling=SC_IDLESTYLING_
+val SC_IDLESTYLING_NONE=0
+val SC_IDLESTYLING_TOVISIBLE=1
+val SC_IDLESTYLING_AFTERVISIBLE=2
+val SC_IDLESTYLING_ALL=3
+
+ali SC_IDLESTYLING_TOVISIBLE=TO_VISIBLE
+ali SC_IDLESTYLING_AFTERVISIBLE=AFTER_VISIBLE
+
+# Sets limits to idle styling.
+set void SetIdleStyling=2692(IdleStyling idleStyling,)
+
+# Retrieve the limits to idle styling.
+get IdleStyling GetIdleStyling=2693(,)
+
+enu Wrap=SC_WRAP_
+val SC_WRAP_NONE=0
+val SC_WRAP_WORD=1
+val SC_WRAP_CHAR=2
+val SC_WRAP_WHITESPACE=3
+
+ali SC_WRAP_WHITESPACE=WHITE_SPACE
+
+# Sets whether text is word wrapped.
+set void SetWrapMode=2268(Wrap wrapMode,)
+
+# Retrieve whether text is word wrapped.
+get Wrap GetWrapMode=2269(,)
+
+enu WrapVisualFlag=SC_WRAPVISUALFLAG_
+val SC_WRAPVISUALFLAG_NONE=0x0000
+val SC_WRAPVISUALFLAG_END=0x0001
+val SC_WRAPVISUALFLAG_START=0x0002
+val SC_WRAPVISUALFLAG_MARGIN=0x0004
+
+# Set the display mode of visual flags for wrapped lines.
+set void SetWrapVisualFlags=2460(WrapVisualFlag wrapVisualFlags,)
+
+# Retrive the display mode of visual flags for wrapped lines.
+get WrapVisualFlag GetWrapVisualFlags=2461(,)
+
+enu WrapVisualLocation=SC_WRAPVISUALFLAGLOC_
+val SC_WRAPVISUALFLAGLOC_DEFAULT=0x0000
+val SC_WRAPVISUALFLAGLOC_END_BY_TEXT=0x0001
+val SC_WRAPVISUALFLAGLOC_START_BY_TEXT=0x0002
+
+# Set the location of visual flags for wrapped lines.
+set void SetWrapVisualFlagsLocation=2462(WrapVisualLocation wrapVisualFlagsLocation,)
+
+# Retrive the location of visual flags for wrapped lines.
+get WrapVisualLocation GetWrapVisualFlagsLocation=2463(,)
+
+# Set the start indent for wrapped lines.
+set void SetWrapStartIndent=2464(int indent,)
+
+# Retrive the start indent for wrapped lines.
+get int GetWrapStartIndent=2465(,)
+
+enu WrapIndentMode=SC_WRAPINDENT_
+val SC_WRAPINDENT_FIXED=0
+val SC_WRAPINDENT_SAME=1
+val SC_WRAPINDENT_INDENT=2
+val SC_WRAPINDENT_DEEPINDENT=3
+
+ali SC_WRAPINDENT_DEEPINDENT=DEEP_INDENT
+
+# Sets how wrapped sublines are placed. Default is fixed.
+set void SetWrapIndentMode=2472(WrapIndentMode wrapIndentMode,)
+
+# Retrieve how wrapped sublines are placed. Default is fixed.
+get WrapIndentMode GetWrapIndentMode=2473(,)
+
+enu LineCache=SC_CACHE_
+val SC_CACHE_NONE=0
+val SC_CACHE_CARET=1
+val SC_CACHE_PAGE=2
+val SC_CACHE_DOCUMENT=3
+
+# Sets the degree of caching of layout information.
+set void SetLayoutCache=2272(LineCache cacheMode,)
+
+# Retrieve the degree of caching of layout information.
+get LineCache GetLayoutCache=2273(,)
+
+# Sets the document width assumed for scrolling.
+set void SetScrollWidth=2274(int pixelWidth,)
+
+# Retrieve the document width assumed for scrolling.
+get int GetScrollWidth=2275(,)
+
+# Sets whether the maximum width line displayed is used to set scroll width.
+set void SetScrollWidthTracking=2516(bool tracking,)
+
+# Retrieve whether the scroll width tracks wide lines.
+get bool GetScrollWidthTracking=2517(,)
+
+# Measure the pixel width of some text in a particular style.
+# NUL terminated text argument.
+# Does not handle tab or control characters.
+fun int TextWidth=2276(int style, string text)
+
+# Sets the scroll range so that maximum scroll position has
+# the last line at the bottom of the view (default).
+# Setting this to false allows scrolling one page below the last line.
+set void SetEndAtLastLine=2277(bool endAtLastLine,)
+
+# Retrieve whether the maximum scroll position has the last
+# line at the bottom of the view.
+get bool GetEndAtLastLine=2278(,)
+
+# Retrieve the height of a particular line of text in pixels.
+fun int TextHeight=2279(line line,)
+
+# Show or hide the vertical scroll bar.
+set void SetVScrollBar=2280(bool visible,)
+
+# Is the vertical scroll bar visible?
+get bool GetVScrollBar=2281(,)
+
+# Append a string to the end of the document without changing the selection.
+fun void AppendText=2282(position length, string text)
+
+enu PhasesDraw=SC_PHASES_
+val SC_PHASES_ONE=0
+val SC_PHASES_TWO=1
+val SC_PHASES_MULTIPLE=2
+
+# How many phases is drawing done in?
+get PhasesDraw GetPhasesDraw=2673(,)
+
+# In one phase draw, text is drawn in a series of rectangular blocks with no overlap.
+# In two phase draw, text is drawn in a series of lines allowing runs to overlap horizontally.
+# In multiple phase draw, each element is drawn over the whole drawing area, allowing text
+# to overlap from one line to the next.
+set void SetPhasesDraw=2674(PhasesDraw phases,)
+
+# Control font anti-aliasing.
+
+enu FontQuality=SC_EFF_
+val SC_EFF_QUALITY_MASK=0xF
+val SC_EFF_QUALITY_DEFAULT=0
+val SC_EFF_QUALITY_NON_ANTIALIASED=1
+val SC_EFF_QUALITY_ANTIALIASED=2
+val SC_EFF_QUALITY_LCD_OPTIMIZED=3
+
+# Choose the quality level for text from the FontQuality enumeration.
+set void SetFontQuality=2611(FontQuality fontQuality,)
+
+# Retrieve the quality level for text.
+get FontQuality GetFontQuality=2612(,)
+
+# Scroll so that a display line is at the top of the display.
+set void SetFirstVisibleLine=2613(line displayLine,)
+
+enu MultiPaste=SC_MULTIPASTE_
+val SC_MULTIPASTE_ONCE=0
+val SC_MULTIPASTE_EACH=1
+
+# Change the effect of pasting when there are multiple selections.
+set void SetMultiPaste=2614(MultiPaste multiPaste,)
+
+# Retrieve the effect of pasting when there are multiple selections.
+get MultiPaste GetMultiPaste=2615(,)
+
+# Retrieve the value of a tag from a regular expression search.
+# Result is NUL-terminated.
+get int GetTag=2616(int tagNumber, stringresult tagValue)
+
+# Join the lines in the target.
+fun void LinesJoin=2288(,)
+
+# Split the lines in the target into lines that are less wide than pixelWidth
+# where possible.
+fun void LinesSplit=2289(int pixelWidth,)
+
+# Set one of the colours used as a chequerboard pattern in the fold margin
+fun void SetFoldMarginColour=2290(bool useSetting, colour back)
+# Set the other colour used as a chequerboard pattern in the fold margin
+fun void SetFoldMarginHiColour=2291(bool useSetting, colour fore)
+
+enu Accessibility=SC_ACCESSIBILITY_
+val SC_ACCESSIBILITY_DISABLED=0
+val SC_ACCESSIBILITY_ENABLED=1
+
+# Enable or disable accessibility.
+set void SetAccessibility=2702(Accessibility accessibility,)
+
+# Report accessibility status.
+get Accessibility GetAccessibility=2703(,)
+
+## New messages go here
+
+## Start of key messages
+# Move caret down one line.
+fun void LineDown=2300(,)
+
+# Move caret down one line extending selection to new caret position.
+fun void LineDownExtend=2301(,)
+
+# Move caret up one line.
+fun void LineUp=2302(,)
+
+# Move caret up one line extending selection to new caret position.
+fun void LineUpExtend=2303(,)
+
+# Move caret left one character.
+fun void CharLeft=2304(,)
+
+# Move caret left one character extending selection to new caret position.
+fun void CharLeftExtend=2305(,)
+
+# Move caret right one character.
+fun void CharRight=2306(,)
+
+# Move caret right one character extending selection to new caret position.
+fun void CharRightExtend=2307(,)
+
+# Move caret left one word.
+fun void WordLeft=2308(,)
+
+# Move caret left one word extending selection to new caret position.
+fun void WordLeftExtend=2309(,)
+
+# Move caret right one word.
+fun void WordRight=2310(,)
+
+# Move caret right one word extending selection to new caret position.
+fun void WordRightExtend=2311(,)
+
+# Move caret to first position on line.
+fun void Home=2312(,)
+
+# Move caret to first position on line extending selection to new caret position.
+fun void HomeExtend=2313(,)
+
+# Move caret to last position on line.
+fun void LineEnd=2314(,)
+
+# Move caret to last position on line extending selection to new caret position.
+fun void LineEndExtend=2315(,)
+
+# Move caret to first position in document.
+fun void DocumentStart=2316(,)
+
+# Move caret to first position in document extending selection to new caret position.
+fun void DocumentStartExtend=2317(,)
+
+# Move caret to last position in document.
+fun void DocumentEnd=2318(,)
+
+# Move caret to last position in document extending selection to new caret position.
+fun void DocumentEndExtend=2319(,)
+
+# Move caret one page up.
+fun void PageUp=2320(,)
+
+# Move caret one page up extending selection to new caret position.
+fun void PageUpExtend=2321(,)
+
+# Move caret one page down.
+fun void PageDown=2322(,)
+
+# Move caret one page down extending selection to new caret position.
+fun void PageDownExtend=2323(,)
+
+# Switch from insert to overtype mode or the reverse.
+fun void EditToggleOvertype=2324(,)
+
+# Cancel any modes such as call tip or auto-completion list display.
+fun void Cancel=2325(,)
+
+# Delete the selection or if no selection, the character before the caret.
+fun void DeleteBack=2326(,)
+
+# If selection is empty or all on one line replace the selection with a tab character.
+# If more than one line selected, indent the lines.
+fun void Tab=2327(,)
+
+# Dedent the selected lines.
+fun void BackTab=2328(,)
+
+# Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
+fun void NewLine=2329(,)
+
+# Insert a Form Feed character.
+fun void FormFeed=2330(,)
+
+# Move caret to before first visible character on line.
+# If already there move to first character on line.
+fun void VCHome=2331(,)
+
+# Like VCHome but extending selection to new caret position.
+fun void VCHomeExtend=2332(,)
+
+# Magnify the displayed text by increasing the sizes by 1 point.
+fun void ZoomIn=2333(,)
+
+# Make the displayed text smaller by decreasing the sizes by 1 point.
+fun void ZoomOut=2334(,)
+
+# Delete the word to the left of the caret.
+fun void DelWordLeft=2335(,)
+
+# Delete the word to the right of the caret.
+fun void DelWordRight=2336(,)
+
+# Delete the word to the right of the caret, but not the trailing non-word characters.
+fun void DelWordRightEnd=2518(,)
+
+# Cut the line containing the caret.
+fun void LineCut=2337(,)
+
+# Delete the line containing the caret.
+fun void LineDelete=2338(,)
+
+# Switch the current line with the previous.
+fun void LineTranspose=2339(,)
+
+# Reverse order of selected lines.
+fun void LineReverse=2354(,)
+
+# Duplicate the current line.
+fun void LineDuplicate=2404(,)
+
+# Transform the selection to lower case.
+fun void LowerCase=2340(,)
+
+# Transform the selection to upper case.
+fun void UpperCase=2341(,)
+
+# Scroll the document down, keeping the caret visible.
+fun void LineScrollDown=2342(,)
+
+# Scroll the document up, keeping the caret visible.
+fun void LineScrollUp=2343(,)
+
+# Delete the selection or if no selection, the character before the caret.
+# Will not delete the character before at the start of a line.
+fun void DeleteBackNotLine=2344(,)
+
+# Move caret to first position on display line.
+fun void HomeDisplay=2345(,)
+
+# Move caret to first position on display line extending selection to
+# new caret position.
+fun void HomeDisplayExtend=2346(,)
+
+# Move caret to last position on display line.
+fun void LineEndDisplay=2347(,)
+
+# Move caret to last position on display line extending selection to new
+# caret position.
+fun void LineEndDisplayExtend=2348(,)
+
+# Like Home but when word-wrap is enabled goes first to start of display line
+# HomeDisplay, then to start of document line Home.
+fun void HomeWrap=2349(,)
+
+# Like HomeExtend but when word-wrap is enabled extends first to start of display line
+# HomeDisplayExtend, then to start of document line HomeExtend.
+fun void HomeWrapExtend=2450(,)
+
+# Like LineEnd but when word-wrap is enabled goes first to end of display line
+# LineEndDisplay, then to start of document line LineEnd.
+fun void LineEndWrap=2451(,)
+
+# Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+# LineEndDisplayExtend, then to start of document line LineEndExtend.
+fun void LineEndWrapExtend=2452(,)
+
+# Like VCHome but when word-wrap is enabled goes first to start of display line
+# VCHomeDisplay, then behaves like VCHome.
+fun void VCHomeWrap=2453(,)
+
+# Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+# VCHomeDisplayExtend, then behaves like VCHomeExtend.
+fun void VCHomeWrapExtend=2454(,)
+
+# Copy the line containing the caret.
+fun void LineCopy=2455(,)
+
+# Move the caret inside current view if it's not there already.
+fun void MoveCaretInsideView=2401(,)
+
+# How many characters are on a line, including end of line characters?
+fun position LineLength=2350(line line,)
+
+# Highlight the characters at two positions.
+fun void BraceHighlight=2351(position posA, position posB)
+
+# Use specified indicator to highlight matching braces instead of changing their style.
+fun void BraceHighlightIndicator=2498(bool useSetting, int indicator)
+
+# Highlight the character at a position indicating there is no matching brace.
+fun void BraceBadLight=2352(position pos,)
+
+# Use specified indicator to highlight non matching brace instead of changing its style.
+fun void BraceBadLightIndicator=2499(bool useSetting, int indicator)
+
+# Find the position of a matching brace or INVALID_POSITION if no match.
+# The maxReStyle must be 0 for now. It may be defined in a future release.
+fun position BraceMatch=2353(position pos, int maxReStyle)
+
+# Similar to BraceMatch, but matching starts at the explicit start position.
+fun position BraceMatchNext=2369(position pos, position startPos)
+
+# Are the end of line characters visible?
+get bool GetViewEOL=2355(,)
+
+# Make the end of line characters visible or invisible.
+set void SetViewEOL=2356(bool visible,)
+
+# Retrieve a pointer to the document object.
+get pointer GetDocPointer=2357(,)
+
+# Change the document object used.
+set void SetDocPointer=2358(, pointer doc)
+
+# Set which document modification events are sent to the container.
+set void SetModEventMask=2359(ModificationFlags eventMask,)
+
+enu EdgeVisualStyle=EDGE_
+val EDGE_NONE=0
+val EDGE_LINE=1
+val EDGE_BACKGROUND=2
+val EDGE_MULTILINE=3
+
+ali EDGE_MULTILINE=MULTI_LINE
+
+# Retrieve the column number which text should be kept within.
+get position GetEdgeColumn=2360(,)
+
+# Set the column number of the edge.
+# If text goes past the edge then it is highlighted.
+set void SetEdgeColumn=2361(position column,)
+
+# Retrieve the edge highlight mode.
+get EdgeVisualStyle GetEdgeMode=2362(,)
+
+# The edge may be displayed by a line (EDGE_LINE/EDGE_MULTILINE) or by highlighting text that
+# goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
+set void SetEdgeMode=2363(EdgeVisualStyle edgeMode,)
+
+# Retrieve the colour used in edge indication.
+get colour GetEdgeColour=2364(,)
+
+# Change the colour used in edge indication.
+set void SetEdgeColour=2365(colour edgeColour,)
+
+# Add a new vertical edge to the view.
+fun void MultiEdgeAddLine=2694(position column, colour edgeColour)
+
+# Clear all vertical edges.
+fun void MultiEdgeClearAll=2695(,)
+
+# Get multi edge positions.
+get position GetMultiEdgeColumn=2749(int which,)
+
+# Sets the current caret position to be the search anchor.
+fun void SearchAnchor=2366(,)
+
+# Find some text starting at the search anchor.
+# Does not ensure the selection is visible.
+fun position SearchNext=2367(FindOption searchFlags, string text)
+
+# Find some text starting at the search anchor and moving backwards.
+# Does not ensure the selection is visible.
+fun position SearchPrev=2368(FindOption searchFlags, string text)
+
+# Retrieves the number of lines completely visible.
+get line LinesOnScreen=2370(,)
+
+enu PopUp=SC_POPUP_
+val SC_POPUP_NEVER=0
+val SC_POPUP_ALL=1
+val SC_POPUP_TEXT=2
+
+# Set whether a pop up menu is displayed automatically when the user presses
+# the wrong mouse button on certain areas.
+fun void UsePopUp=2371(PopUp popUpMode,)
+
+# Is the selection rectangular? The alternative is the more common stream selection.
+get bool SelectionIsRectangle=2372(,)
+
+# Set the zoom level. This number of points is added to the size of all fonts.
+# It may be positive to magnify or negative to reduce.
+set void SetZoom=2373(int zoomInPoints,)
+# Retrieve the zoom level.
+get int GetZoom=2374(,)
+
+enu DocumentOption=SC_DOCUMENTOPTION_
+val SC_DOCUMENTOPTION_DEFAULT=0
+val SC_DOCUMENTOPTION_STYLES_NONE=0x1
+val SC_DOCUMENTOPTION_TEXT_LARGE=0x100
+
+# Create a new document object.
+# Starts with reference count of 1 and not selected into editor.
+fun pointer CreateDocument=2375(position bytes, DocumentOption documentOptions)
+# Extend life of document.
+fun void AddRefDocument=2376(, pointer doc)
+# Release a reference to the document, deleting document if it fades to black.
+fun void ReleaseDocument=2377(, pointer doc)
+
+# Get which document options are set.
+get DocumentOption GetDocumentOptions=2379(,)
+
+# Get which document modification events are sent to the container.
+get ModificationFlags GetModEventMask=2378(,)
+
+# Set whether command events are sent to the container.
+set void SetCommandEvents=2717(bool commandEvents,)
+
+# Get whether command events are sent to the container.
+get bool GetCommandEvents=2718(,)
+
+# Change internal focus flag.
+set void SetFocus=2380(bool focus,)
+# Get internal focus flag.
+get bool GetFocus=2381(,)
+
+enu Status=SC_STATUS_
+val SC_STATUS_OK=0
+val SC_STATUS_FAILURE=1
+val SC_STATUS_BADALLOC=2
+val SC_STATUS_WARN_START=1000
+val SC_STATUS_WARN_REGEX=1001
+
+ali SC_STATUS_BADALLOC=BAD_ALLOC
+ali SC_STATUS_WARN_REGEX=REG_EX
+
+# Change error status - 0 = OK.
+set void SetStatus=2382(Status status,)
+# Get error status.
+get Status GetStatus=2383(,)
+
+# Set whether the mouse is captured when its button is pressed.
+set void SetMouseDownCaptures=2384(bool captures,)
+# Get whether mouse gets captured.
+get bool GetMouseDownCaptures=2385(,)
+
+# Set whether the mouse wheel can be active outside the window.
+set void SetMouseWheelCaptures=2696(bool captures,)
+# Get whether mouse wheel can be active outside the window.
+get bool GetMouseWheelCaptures=2697(,)
+
+# Sets the cursor to one of the SC_CURSOR* values.
+set void SetCursor=2386(CursorShape cursorType,)
+# Get cursor type.
+get CursorShape GetCursor=2387(,)
+
+# Change the way control characters are displayed:
+# If symbol is < 32, keep the drawn way, else, use the given character.
+set void SetControlCharSymbol=2388(int symbol,)
+# Get the way control characters are displayed.
+get int GetControlCharSymbol=2389(,)
+
+# Move to the previous change in capitalisation.
+fun void WordPartLeft=2390(,)
+# Move to the previous change in capitalisation extending selection
+# to new caret position.
+fun void WordPartLeftExtend=2391(,)
+# Move to the change next in capitalisation.
+fun void WordPartRight=2392(,)
+# Move to the next change in capitalisation extending selection
+# to new caret position.
+fun void WordPartRightExtend=2393(,)
+
+# Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
+enu VisiblePolicy=VISIBLE_
+val VISIBLE_SLOP=0x01
+val VISIBLE_STRICT=0x04
+
+# Set the way the display area is determined when a particular line
+# is to be moved to by Find, FindNext, GotoLine, etc.
+fun void SetVisiblePolicy=2394(VisiblePolicy visiblePolicy, int visibleSlop)
+
+# Delete back from the current position to the start of the line.
+fun void DelLineLeft=2395(,)
+
+# Delete forwards from the current position to the end of the line.
+fun void DelLineRight=2396(,)
+
+# Set the xOffset (ie, horizontal scroll position).
+set void SetXOffset=2397(int xOffset,)
+
+# Get the xOffset (ie, horizontal scroll position).
+get int GetXOffset=2398(,)
+
+# Set the last x chosen value to be the caret x position.
+fun void ChooseCaretX=2399(,)
+
+# Set the focus to this Scintilla widget.
+fun void GrabFocus=2400(,)
+
+enu CaretPolicy=CARET_
+# Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
+# If CARET_SLOP is set, we can define a slop value: caretSlop.
+# This value defines an unwanted zone (UZ) where the caret is... unwanted.
+# This zone is defined as a number of pixels near the vertical margins,
+# and as a number of lines near the horizontal margins.
+# By keeping the caret away from the edges, it is seen within its context,
+# so it is likely that the identifier that the caret is on can be completely seen,
+# and that the current line is seen with some of the lines following it which are
+# often dependent on that line.
+val CARET_SLOP=0x01
+# If CARET_STRICT is set, the policy is enforced... strictly.
+# The caret is centred on the display if slop is not set,
+# and cannot go in the UZ if slop is set.
+val CARET_STRICT=0x04
+# If CARET_JUMPS is set, the display is moved more energetically
+# so the caret can move in the same direction longer before the policy is applied again.
+val CARET_JUMPS=0x10
+# If CARET_EVEN is not set, instead of having symmetrical UZs,
+# the left and bottom UZs are extended up to right and top UZs respectively.
+# This way, we favour the displaying of useful information: the beginning of lines,
+# where most code reside, and the lines after the caret, eg. the body of a function.
+val CARET_EVEN=0x08
+
+# Set the way the caret is kept visible when going sideways.
+# The exclusion zone is given in pixels.
+fun void SetXCaretPolicy=2402(CaretPolicy caretPolicy, int caretSlop)
+
+# Set the way the line the caret is on is kept visible.
+# The exclusion zone is given in lines.
+fun void SetYCaretPolicy=2403(CaretPolicy caretPolicy, int caretSlop)
+
+# Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
+set void SetPrintWrapMode=2406(Wrap wrapMode,)
+
+# Is printing line wrapped?
+get Wrap GetPrintWrapMode=2407(,)
+
+# Set a fore colour for active hotspots.
+set void SetHotspotActiveFore=2410(bool useSetting, colour fore)
+
+# Get the fore colour for active hotspots.
+get colour GetHotspotActiveFore=2494(,)
+
+# Set a back colour for active hotspots.
+set void SetHotspotActiveBack=2411(bool useSetting, colour back)
+
+# Get the back colour for active hotspots.
+get colour GetHotspotActiveBack=2495(,)
+
+# Enable / Disable underlining active hotspots.
+set void SetHotspotActiveUnderline=2412(bool underline,)
+
+# Get whether underlining for active hotspots.
+get bool GetHotspotActiveUnderline=2496(,)
+
+# Limit hotspots to single line so hotspots on two lines don't merge.
+set void SetHotspotSingleLine=2421(bool singleLine,)
+
+# Get the HotspotSingleLine property
+get bool GetHotspotSingleLine=2497(,)
+
+# Move caret down one paragraph (delimited by empty lines).
+fun void ParaDown=2413(,)
+
+# Extend selection down one paragraph (delimited by empty lines).
+fun void ParaDownExtend=2414(,)
+
+# Move caret up one paragraph (delimited by empty lines).
+fun void ParaUp=2415(,)
+
+# Extend selection up one paragraph (delimited by empty lines).
+fun void ParaUpExtend=2416(,)
+
+# Given a valid document position, return the previous position taking code
+# page into account. Returns 0 if passed 0.
+fun position PositionBefore=2417(position pos,)
+
+# Given a valid document position, return the next position taking code
+# page into account. Maximum value returned is the last position in the document.
+fun position PositionAfter=2418(position pos,)
+
+# Given a valid document position, return a position that differs in a number
+# of characters. Returned value is always between 0 and last position in document.
+fun position PositionRelative=2670(position pos, position relative)
+
+# Given a valid document position, return a position that differs in a number
+# of UTF-16 code units. Returned value is always between 0 and last position in document.
+# The result may point half way (2 bytes) inside a non-BMP character.
+fun position PositionRelativeCodeUnits=2716(position pos, position relative)
+
+# Copy a range of text to the clipboard. Positions are clipped into the document.
+fun void CopyRange=2419(position start, position end)
+
+# Copy argument text to the clipboard.
+fun void CopyText=2420(position length, string text)
+
+enu SelectionMode=SC_SEL_
+val SC_SEL_STREAM=0
+val SC_SEL_RECTANGLE=1
+val SC_SEL_LINES=2
+val SC_SEL_THIN=3
+
+# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or
+# by lines (SC_SEL_LINES).
+set void SetSelectionMode=2422(SelectionMode selectionMode,)
+
+# Get the mode of the current selection.
+get SelectionMode GetSelectionMode=2423(,)
+
+# Get whether or not regular caret moves will extend or reduce the selection.
+get bool GetMoveExtendsSelection=2706(,)
+
+# Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
+fun position GetLineSelStartPosition=2424(line line,)
+
+# Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
+fun position GetLineSelEndPosition=2425(line line,)
+
+## RectExtended rectangular selection moves
+# Move caret down one line, extending rectangular selection to new caret position.
+fun void LineDownRectExtend=2426(,)
+
+# Move caret up one line, extending rectangular selection to new caret position.
+fun void LineUpRectExtend=2427(,)
+
+# Move caret left one character, extending rectangular selection to new caret position.
+fun void CharLeftRectExtend=2428(,)
+
+# Move caret right one character, extending rectangular selection to new caret position.
+fun void CharRightRectExtend=2429(,)
+
+# Move caret to first position on line, extending rectangular selection to new caret position.
+fun void HomeRectExtend=2430(,)
+
+# Move caret to before first visible character on line.
+# If already there move to first character on line.
+# In either case, extend rectangular selection to new caret position.
+fun void VCHomeRectExtend=2431(,)
+
+# Move caret to last position on line, extending rectangular selection to new caret position.
+fun void LineEndRectExtend=2432(,)
+
+# Move caret one page up, extending rectangular selection to new caret position.
+fun void PageUpRectExtend=2433(,)
+
+# Move caret one page down, extending rectangular selection to new caret position.
+fun void PageDownRectExtend=2434(,)
+
+
+# Move caret to top of page, or one page up if already at top of page.
+fun void StutteredPageUp=2435(,)
+
+# Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
+fun void StutteredPageUpExtend=2436(,)
+
+# Move caret to bottom of page, or one page down if already at bottom of page.
+fun void StutteredPageDown=2437(,)
+
+# Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
+fun void StutteredPageDownExtend=2438(,)
+
+
+# Move caret left one word, position cursor at end of word.
+fun void WordLeftEnd=2439(,)
+
+# Move caret left one word, position cursor at end of word, extending selection to new caret position.
+fun void WordLeftEndExtend=2440(,)
+
+# Move caret right one word, position cursor at end of word.
+fun void WordRightEnd=2441(,)
+
+# Move caret right one word, position cursor at end of word, extending selection to new caret position.
+fun void WordRightEndExtend=2442(,)
+
+# Set the set of characters making up whitespace for when moving or selecting by word.
+# Should be called after SetWordChars.
+set void SetWhitespaceChars=2443(, string characters)
+
+# Get the set of characters making up whitespace for when moving or selecting by word.
+get int GetWhitespaceChars=2647(, stringresult characters)
+
+# Set the set of characters making up punctuation characters
+# Should be called after SetWordChars.
+set void SetPunctuationChars=2648(, string characters)
+
+# Get the set of characters making up punctuation characters
+get int GetPunctuationChars=2649(, stringresult characters)
+
+# Reset the set of characters for whitespace and word characters to the defaults.
+fun void SetCharsDefault=2444(,)
+
+# Get currently selected item position in the auto-completion list
+get int AutoCGetCurrent=2445(,)
+
+# Get currently selected item text in the auto-completion list
+# Returns the length of the item text
+# Result is NUL-terminated.
+get int AutoCGetCurrentText=2610(, stringresult text)
+
+enu CaseInsensitiveBehaviour=SC_CASEINSENSITIVEBEHAVIOUR_
+val SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0
+val SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE=1
+
+ali SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=RESPECT_CASE
+ali SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE=IGNORE_CASE
+
+# Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
+set void AutoCSetCaseInsensitiveBehaviour=2634(CaseInsensitiveBehaviour behaviour,)
+
+# Get auto-completion case insensitive behaviour.
+get CaseInsensitiveBehaviour AutoCGetCaseInsensitiveBehaviour=2635(,)
+
+enu MultiAutoComplete=SC_MULTIAUTOC_
+val SC_MULTIAUTOC_ONCE=0
+val SC_MULTIAUTOC_EACH=1
+
+# Change the effect of autocompleting when there are multiple selections.
+set void AutoCSetMulti=2636(MultiAutoComplete multi,)
+
+# Retrieve the effect of autocompleting when there are multiple selections.
+get MultiAutoComplete AutoCGetMulti=2637(,)
+
+enu Ordering=SC_ORDER_
+val SC_ORDER_PRESORTED=0
+val SC_ORDER_PERFORMSORT=1
+val SC_ORDER_CUSTOM=2
+
+ali SC_ORDER_PRESORTED=PRE_SORTED
+ali SC_ORDER_PERFORMSORT=PERFORM_SORT
+
+# Set the way autocompletion lists are ordered.
+set void AutoCSetOrder=2660(Ordering order,)
+
+# Get the way autocompletion lists are ordered.
+get Ordering AutoCGetOrder=2661(,)
+
+# Enlarge the document to a particular size of text bytes.
+fun void Allocate=2446(position bytes,)
+
+# Returns the target converted to UTF8.
+# Return the length in bytes.
+fun position TargetAsUTF8=2447(, stringresult s)
+
+# Set the length of the utf8 argument for calling EncodedFromUTF8.
+# Set to -1 and the string will be measured to the first nul.
+fun void SetLengthForEncode=2448(position bytes,)
+
+# Translates a UTF8 string into the document encoding.
+# Return the length of the result in bytes.
+# On error return 0.
+fun position EncodedFromUTF8=2449(string utf8, stringresult encoded)
+
+# Find the position of a column on a line taking into account tabs and
+# multi-byte characters. If beyond end of line, return line end position.
+fun position FindColumn=2456(line line, position column)
+
+enu CaretSticky=SC_CARETSTICKY_
+val SC_CARETSTICKY_OFF=0
+val SC_CARETSTICKY_ON=1
+val SC_CARETSTICKY_WHITESPACE=2
+
+ali SC_CARETSTICKY_WHITESPACE=WHITE_SPACE
+
+# Can the caret preferred x position only be changed by explicit movement commands?
+get CaretSticky GetCaretSticky=2457(,)
+
+# Stop the caret preferred x position changing when the user types.
+set void SetCaretSticky=2458(CaretSticky useCaretStickyBehaviour,)
+
+# Switch between sticky and non-sticky: meant to be bound to a key.
+fun void ToggleCaretSticky=2459(,)
+
+# Enable/Disable convert-on-paste for line endings
+set void SetPasteConvertEndings=2467(bool convert,)
+
+# Get convert-on-paste setting
+get bool GetPasteConvertEndings=2468(,)
+
+# Replace the selection with text like a rectangular paste.
+fun void ReplaceRectangular=2771(position length, string text)
+
+# Duplicate the selection. If selection empty duplicate the line containing the caret.
+fun void SelectionDuplicate=2469(,)
+
+# Set background alpha of the caret line.
+set void SetCaretLineBackAlpha=2470(Alpha alpha,)
+
+# Get the background alpha of the caret line.
+get Alpha GetCaretLineBackAlpha=2471(,)
+
+enu CaretStyle=CARETSTYLE_
+val CARETSTYLE_INVISIBLE=0
+val CARETSTYLE_LINE=1
+val CARETSTYLE_BLOCK=2
+val CARETSTYLE_OVERSTRIKE_BAR=0
+val CARETSTYLE_OVERSTRIKE_BLOCK=0x10
+val CARETSTYLE_INS_MASK=0xF
+val CARETSTYLE_BLOCK_AFTER=0x100
+
+# Set the style of the caret to be drawn.
+set void SetCaretStyle=2512(CaretStyle caretStyle,)
+
+# Returns the current style of the caret.
+get CaretStyle GetCaretStyle=2513(,)
+
+# Set the indicator used for IndicatorFillRange and IndicatorClearRange
+set void SetIndicatorCurrent=2500(int indicator,)
+
+# Get the current indicator
+get int GetIndicatorCurrent=2501(,)
+
+# Set the value used for IndicatorFillRange
+set void SetIndicatorValue=2502(int value,)
+
+# Get the current indicator value
+get int GetIndicatorValue=2503(,)
+
+# Turn a indicator on over a range.
+fun void IndicatorFillRange=2504(position start, position lengthFill)
+
+# Turn a indicator off over a range.
+fun void IndicatorClearRange=2505(position start, position lengthClear)
+
+# Are any indicators present at pos?
+fun int IndicatorAllOnFor=2506(position pos,)
+
+# What value does a particular indicator have at a position?
+fun int IndicatorValueAt=2507(int indicator, position pos)
+
+# Where does a particular indicator start?
+fun position IndicatorStart=2508(int indicator, position pos)
+
+# Where does a particular indicator end?
+fun position IndicatorEnd=2509(int indicator, position pos)
+
+# Set number of entries in position cache
+set void SetPositionCache=2514(int size,)
+
+# How many entries are allocated to the position cache?
+get int GetPositionCache=2515(,)
+
+# Copy the selection, if selection empty copy the line with the caret
+fun void CopyAllowLine=2519(,)
+
+# Compact the document buffer and return a read-only pointer to the
+# characters in the document.
+get pointer GetCharacterPointer=2520(,)
+
+# Return a read-only pointer to a range of characters in the document.
+# May move the gap so that the range is contiguous, but will only move up
+# to lengthRange bytes.
+get pointer GetRangePointer=2643(position start, position lengthRange)
+
+# Return a position which, to avoid performance costs, should not be within
+# the range of a call to GetRangePointer.
+get position GetGapPosition=2644(,)
+
+# Set the alpha fill colour of the given indicator.
+set void IndicSetAlpha=2523(int indicator, Alpha alpha)
+
+# Get the alpha fill colour of the given indicator.
+get Alpha IndicGetAlpha=2524(int indicator,)
+
+# Set the alpha outline colour of the given indicator.
+set void IndicSetOutlineAlpha=2558(int indicator, Alpha alpha)
+
+# Get the alpha outline colour of the given indicator.
+get Alpha IndicGetOutlineAlpha=2559(int indicator,)
+
+# Set extra ascent for each line
+set void SetExtraAscent=2525(int extraAscent,)
+
+# Get extra ascent for each line
+get int GetExtraAscent=2526(,)
+
+# Set extra descent for each line
+set void SetExtraDescent=2527(int extraDescent,)
+
+# Get extra descent for each line
+get int GetExtraDescent=2528(,)
+
+# Which symbol was defined for markerNumber with MarkerDefine
+fun int MarkerSymbolDefined=2529(int markerNumber,)
+
+# Set the text in the text margin for a line
+set void MarginSetText=2530(line line, string text)
+
+# Get the text in the text margin for a line
+get int MarginGetText=2531(line line, stringresult text)
+
+# Set the style number for the text margin for a line
+set void MarginSetStyle=2532(line line, int style)
+
+# Get the style number for the text margin for a line
+get int MarginGetStyle=2533(line line,)
+
+# Set the style in the text margin for a line
+set void MarginSetStyles=2534(line line, string styles)
+
+# Get the styles in the text margin for a line
+get int MarginGetStyles=2535(line line, stringresult styles)
+
+# Clear the margin text on all lines
+fun void MarginTextClearAll=2536(,)
+
+# Get the start of the range of style numbers used for margin text
+set void MarginSetStyleOffset=2537(int style,)
+
+# Get the start of the range of style numbers used for margin text
+get int MarginGetStyleOffset=2538(,)
+
+enu MarginOption=SC_MARGINOPTION_
+val SC_MARGINOPTION_NONE=0
+val SC_MARGINOPTION_SUBLINESELECT=1
+
+ali SC_MARGINOPTION_SUBLINESELECT=SUB_LINE_SELECT
+
+# Set the margin options.
+set void SetMarginOptions=2539(MarginOption marginOptions,)
+
+# Get the margin options.
+get MarginOption GetMarginOptions=2557(,)
+
+# Set the annotation text for a line
+set void AnnotationSetText=2540(line line, string text)
+
+# Get the annotation text for a line
+get int AnnotationGetText=2541(line line, stringresult text)
+
+# Set the style number for the annotations for a line
+set void AnnotationSetStyle=2542(line line, int style)
+
+# Get the style number for the annotations for a line
+get int AnnotationGetStyle=2543(line line,)
+
+# Set the annotation styles for a line
+set void AnnotationSetStyles=2544(line line, string styles)
+
+# Get the annotation styles for a line
+get int AnnotationGetStyles=2545(line line, stringresult styles)
+
+# Get the number of annotation lines for a line
+get int AnnotationGetLines=2546(line line,)
+
+# Clear the annotations from all lines
+fun void AnnotationClearAll=2547(,)
+
+enu AnnotationVisible=ANNOTATION_
+val ANNOTATION_HIDDEN=0
+val ANNOTATION_STANDARD=1
+val ANNOTATION_BOXED=2
+val ANNOTATION_INDENTED=3
+
+# Set the visibility for the annotations for a view
+set void AnnotationSetVisible=2548(AnnotationVisible visible,)
+
+# Get the visibility for the annotations for a view
+get AnnotationVisible AnnotationGetVisible=2549(,)
+
+# Get the start of the range of style numbers used for annotations
+set void AnnotationSetStyleOffset=2550(int style,)
+
+# Get the start of the range of style numbers used for annotations
+get int AnnotationGetStyleOffset=2551(,)
+
+# Release all extended (>255) style numbers
+fun void ReleaseAllExtendedStyles=2552(,)
+
+# Allocate some extended (>255) style numbers and return the start of the range
+fun int AllocateExtendedStyles=2553(int numberStyles,)
+
+enu UndoFlags=UNDO_
+val UNDO_NONE=0
+val UNDO_MAY_COALESCE=1
+
+# Add a container action to the undo stack
+fun void AddUndoAction=2560(int token, UndoFlags flags)
+
+# Find the position of a character from a point within the window.
+fun position CharPositionFromPoint=2561(int x, int y)
+
+# Find the position of a character from a point within the window.
+# Return INVALID_POSITION if not close to text.
+fun position CharPositionFromPointClose=2562(int x, int y)
+
+# Set whether switching to rectangular mode while selecting with the mouse is allowed.
+set void SetMouseSelectionRectangularSwitch=2668(bool mouseSelectionRectangularSwitch,)
+
+# Whether switching to rectangular mode while selecting with the mouse is allowed.
+get bool GetMouseSelectionRectangularSwitch=2669(,)
+
+# Set whether multiple selections can be made
+set void SetMultipleSelection=2563(bool multipleSelection,)
+
+# Whether multiple selections can be made
+get bool GetMultipleSelection=2564(,)
+
+# Set whether typing can be performed into multiple selections
+set void SetAdditionalSelectionTyping=2565(bool additionalSelectionTyping,)
+
+# Whether typing can be performed into multiple selections
+get bool GetAdditionalSelectionTyping=2566(,)
+
+# Set whether additional carets will blink
+set void SetAdditionalCaretsBlink=2567(bool additionalCaretsBlink,)
+
+# Whether additional carets will blink
+get bool GetAdditionalCaretsBlink=2568(,)
+
+# Set whether additional carets are visible
+set void SetAdditionalCaretsVisible=2608(bool additionalCaretsVisible,)
+
+# Whether additional carets are visible
+get bool GetAdditionalCaretsVisible=2609(,)
+
+# How many selections are there?
+get int GetSelections=2570(,)
+
+# Is every selected range empty?
+get bool GetSelectionEmpty=2650(,)
+
+# Clear selections to a single empty stream selection
+fun void ClearSelections=2571(,)
+
+# Set a simple selection
+fun void SetSelection=2572(position caret, position anchor)
+
+# Add a selection
+fun void AddSelection=2573(position caret, position anchor)
+
+# Drop one selection
+fun void DropSelectionN=2671(int selection,)
+
+# Set the main selection
+set void SetMainSelection=2574(int selection,)
+
+# Which selection is the main selection
+get int GetMainSelection=2575(,)
+
+# Set the caret position of the nth selection.
+set void SetSelectionNCaret=2576(int selection, position caret)
+
+# Return the caret position of the nth selection.
+get position GetSelectionNCaret=2577(int selection,)
+
+# Set the anchor position of the nth selection.
+set void SetSelectionNAnchor=2578(int selection, position anchor)
+
+# Return the anchor position of the nth selection.
+get position GetSelectionNAnchor=2579(int selection,)
+
+# Set the virtual space of the caret of the nth selection.
+set void SetSelectionNCaretVirtualSpace=2580(int selection, position space)
+
+# Return the virtual space of the caret of the nth selection.
+get position GetSelectionNCaretVirtualSpace=2581(int selection,)
+
+# Set the virtual space of the anchor of the nth selection.
+set void SetSelectionNAnchorVirtualSpace=2582(int selection, position space)
+
+# Return the virtual space of the anchor of the nth selection.
+get position GetSelectionNAnchorVirtualSpace=2583(int selection,)
+
+# Sets the position that starts the selection - this becomes the anchor.
+set void SetSelectionNStart=2584(int selection, position anchor)
+
+# Returns the position at the start of the selection.
+get position GetSelectionNStart=2585(int selection,)
+
+# Returns the virtual space at the start of the selection.
+get position GetSelectionNStartVirtualSpace=2726(int selection,)
+
+# Sets the position that ends the selection - this becomes the currentPosition.
+set void SetSelectionNEnd=2586(int selection, position caret)
+
+# Returns the virtual space at the end of the selection.
+get position GetSelectionNEndVirtualSpace=2727(int selection,)
+
+# Returns the position at the end of the selection.
+get position GetSelectionNEnd=2587(int selection,)
+
+# Set the caret position of the rectangular selection.
+set void SetRectangularSelectionCaret=2588(position caret,)
+
+# Return the caret position of the rectangular selection.
+get position GetRectangularSelectionCaret=2589(,)
+
+# Set the anchor position of the rectangular selection.
+set void SetRectangularSelectionAnchor=2590(position anchor,)
+
+# Return the anchor position of the rectangular selection.
+get position GetRectangularSelectionAnchor=2591(,)
+
+# Set the virtual space of the caret of the rectangular selection.
+set void SetRectangularSelectionCaretVirtualSpace=2592(position space,)
+
+# Return the virtual space of the caret of the rectangular selection.
+get position GetRectangularSelectionCaretVirtualSpace=2593(,)
+
+# Set the virtual space of the anchor of the rectangular selection.
+set void SetRectangularSelectionAnchorVirtualSpace=2594(position space,)
+
+# Return the virtual space of the anchor of the rectangular selection.
+get position GetRectangularSelectionAnchorVirtualSpace=2595(,)
+
+enu VirtualSpace=SCVS_
+val SCVS_NONE=0
+val SCVS_RECTANGULARSELECTION=1
+val SCVS_USERACCESSIBLE=2
+val SCVS_NOWRAPLINESTART=4
+
+ali SCVS_RECTANGULARSELECTION=RECTANGULAR_SELECTION
+ali SCVS_USERACCESSIBLE=USER_ACCESSIBLE
+ali SCVS_NOWRAPLINESTART=NO_WRAP_LINE_START
+
+# Set options for virtual space behaviour.
+set void SetVirtualSpaceOptions=2596(VirtualSpace virtualSpaceOptions,)
+
+# Return options for virtual space behaviour.
+get VirtualSpace GetVirtualSpaceOptions=2597(,)
+
+# On GTK, allow selecting the modifier key to use for mouse-based
+# rectangular selection. Often the window manager requires Alt+Mouse Drag
+# for moving windows.
+# Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER.
+
+set void SetRectangularSelectionModifier=2598(int modifier,)
+
+# Get the modifier key used for rectangular selection.
+get int GetRectangularSelectionModifier=2599(,)
+
+# Set the foreground colour of additional selections.
+# Must have previously called SetSelFore with non-zero first argument for this to have an effect.
+set void SetAdditionalSelFore=2600(colour fore,)
+
+# Set the background colour of additional selections.
+# Must have previously called SetSelBack with non-zero first argument for this to have an effect.
+set void SetAdditionalSelBack=2601(colour back,)
+
+# Set the alpha of the selection.
+set void SetAdditionalSelAlpha=2602(Alpha alpha,)
+
+# Get the alpha of the selection.
+get Alpha GetAdditionalSelAlpha=2603(,)
+
+# Set the foreground colour of additional carets.
+set void SetAdditionalCaretFore=2604(colour fore,)
+
+# Get the foreground colour of additional carets.
+get colour GetAdditionalCaretFore=2605(,)
+
+# Set the main selection to the next selection.
+fun void RotateSelection=2606(,)
+
+# Swap that caret and anchor of the main selection.
+fun void SwapMainAnchorCaret=2607(,)
+
+# Add the next occurrence of the main selection to the set of selections as main.
+# If the current selection is empty then select word around caret.
+fun void MultipleSelectAddNext=2688(,)
+
+# Add each occurrence of the main selection in the target to the set of selections.
+# If the current selection is empty then select word around caret.
+fun void MultipleSelectAddEach=2689(,)
+
+# Indicate that the internal state of a lexer has changed over a range and therefore
+# there may be a need to redraw.
+fun int ChangeLexerState=2617(position start, position end)
+
+# Find the next line at or after lineStart that is a contracted fold header line.
+# Return -1 when no more lines.
+fun line ContractedFoldNext=2618(line lineStart,)
+
+# Centre current line in window.
+fun void VerticalCentreCaret=2619(,)
+
+# Move the selected lines up one line, shifting the line above after the selection
+fun void MoveSelectedLinesUp=2620(,)
+
+# Move the selected lines down one line, shifting the line below before the selection
+fun void MoveSelectedLinesDown=2621(,)
+
+# Set the identifier reported as idFrom in notification messages.
+set void SetIdentifier=2622(int identifier,)
+
+# Get the identifier.
+get int GetIdentifier=2623(,)
+
+# Set the width for future RGBA image data.
+set void RGBAImageSetWidth=2624(int width,)
+
+# Set the height for future RGBA image data.
+set void RGBAImageSetHeight=2625(int height,)
+
+# Set the scale factor in percent for future RGBA image data.
+set void RGBAImageSetScale=2651(int scalePercent,)
+
+# Define a marker from RGBA data.
+# It has the width and height from RGBAImageSetWidth/Height
+fun void MarkerDefineRGBAImage=2626(int markerNumber, string pixels)
+
+# Register an RGBA image for use in autocompletion lists.
+# It has the width and height from RGBAImageSetWidth/Height
+fun void RegisterRGBAImage=2627(int type, string pixels)
+
+# Scroll to start of document.
+fun void ScrollToStart=2628(,)
+
+# Scroll to end of document.
+fun void ScrollToEnd=2629(,)
+
+enu Technology=SC_TECHNOLOGY_
+val SC_TECHNOLOGY_DEFAULT=0
+val SC_TECHNOLOGY_DIRECTWRITE=1
+val SC_TECHNOLOGY_DIRECTWRITERETAIN=2
+val SC_TECHNOLOGY_DIRECTWRITEDC=3
+
+ali SC_TECHNOLOGY_DIRECTWRITE=DIRECT_WRITE
+ali SC_TECHNOLOGY_DIRECTWRITERETAIN=DIRECT_WRITE_RETAIN
+ali SC_TECHNOLOGY_DIRECTWRITEDC=DIRECT_WRITE_D_C
+
+# Set the technology used.
+set void SetTechnology=2630(Technology technology,)
+
+# Get the tech.
+get Technology GetTechnology=2631(,)
+
+# Create an ILoader*.
+fun pointer CreateLoader=2632(position bytes, DocumentOption documentOptions)
+
+# On OS X, show a find indicator.
+fun void FindIndicatorShow=2640(position start, position end)
+
+# On OS X, flash a find indicator, then fade out.
+fun void FindIndicatorFlash=2641(position start, position end)
+
+# On OS X, hide the find indicator.
+fun void FindIndicatorHide=2642(,)
+
+# Move caret to before first visible character on display line.
+# If already there move to first character on display line.
+fun void VCHomeDisplay=2652(,)
+
+# Like VCHomeDisplay but extending selection to new caret position.
+fun void VCHomeDisplayExtend=2653(,)
+
+# Is the caret line always visible?
+get bool GetCaretLineVisibleAlways=2654(,)
+
+# Sets the caret line to always visible.
+set void SetCaretLineVisibleAlways=2655(bool alwaysVisible,)
+
+# Line end types which may be used in addition to LF, CR, and CRLF
+# SC_LINE_END_TYPE_UNICODE includes U+2028 Line Separator,
+# U+2029 Paragraph Separator, and U+0085 Next Line
+enu LineEndType=SC_LINE_END_TYPE_
+val SC_LINE_END_TYPE_DEFAULT=0
+val SC_LINE_END_TYPE_UNICODE=1
+
+# Set the line end types that the application wants to use. May not be used if incompatible with lexer or encoding.
+set void SetLineEndTypesAllowed=2656(LineEndType lineEndBitSet,)
+
+# Get the line end types currently allowed.
+get LineEndType GetLineEndTypesAllowed=2657(,)
+
+# Get the line end types currently recognised. May be a subset of the allowed types due to lexer limitation.
+get LineEndType GetLineEndTypesActive=2658(,)
+
+# Set the way a character is drawn.
+set void SetRepresentation=2665(string encodedCharacter, string representation)
+
+# Get the way a character is drawn.
+# Result is NUL-terminated.
+get int GetRepresentation=2666(string encodedCharacter, stringresult representation)
+
+# Remove a character representation.
+fun void ClearRepresentation=2667(string encodedCharacter,)
+
+# Clear representations to default.
+fun void ClearAllRepresentations=2770(,)
+
+# Can draw representations in various ways
+enu RepresentationAppearance=SC_REPRESENTATION
+val SC_REPRESENTATION_PLAIN=0
+val SC_REPRESENTATION_BLOB=1
+val SC_REPRESENTATION_COLOUR=0x10
+
+# Set the appearance of a representation.
+set void SetRepresentationAppearance=2766(string encodedCharacter, RepresentationAppearance appearance)
+
+# Get the appearance of a representation.
+get RepresentationAppearance GetRepresentationAppearance=2767(string encodedCharacter,)
+
+# Set the colour of a representation.
+set void SetRepresentationColour=2768(string encodedCharacter, colouralpha colour)
+
+# Get the colour of a representation.
+get colouralpha GetRepresentationColour=2769(string encodedCharacter,)
+
+# Set the end of line annotation text for a line
+set void EOLAnnotationSetText=2740(line line, string text)
+
+# Get the end of line annotation text for a line
+get int EOLAnnotationGetText=2741(line line, stringresult text)
+
+# Set the style number for the end of line annotations for a line
+set void EOLAnnotationSetStyle=2742(line line, int style)
+
+# Get the style number for the end of line annotations for a line
+get int EOLAnnotationGetStyle=2743(line line,)
+
+# Clear the end of annotations from all lines
+fun void EOLAnnotationClearAll=2744(,)
+
+enu EOLAnnotationVisible=EOLANNOTATION_
+val EOLANNOTATION_HIDDEN=0x0
+val EOLANNOTATION_STANDARD=0x1
+val EOLANNOTATION_BOXED=0x2
+val EOLANNOTATION_STADIUM=0x100
+val EOLANNOTATION_FLAT_CIRCLE=0x101
+val EOLANNOTATION_ANGLE_CIRCLE=0x102
+val EOLANNOTATION_CIRCLE_FLAT=0x110
+val EOLANNOTATION_FLATS=0x111
+val EOLANNOTATION_ANGLE_FLAT=0x112
+val EOLANNOTATION_CIRCLE_ANGLE=0x120
+val EOLANNOTATION_FLAT_ANGLE=0x121
+val EOLANNOTATION_ANGLES=0x122
+
+# Set the visibility for the end of line annotations for a view
+set void EOLAnnotationSetVisible=2745(EOLAnnotationVisible visible,)
+
+# Get the visibility for the end of line annotations for a view
+get EOLAnnotationVisible EOLAnnotationGetVisible=2746(,)
+
+# Get the start of the range of style numbers used for end of line annotations
+set void EOLAnnotationSetStyleOffset=2747(int style,)
+
+# Get the start of the range of style numbers used for end of line annotations
+get int EOLAnnotationGetStyleOffset=2748(,)
+
+enu Supports=SC_SUPPORTS_
+val SC_SUPPORTS_LINE_DRAWS_FINAL=0
+val SC_SUPPORTS_PIXEL_DIVISIONS=1
+val SC_SUPPORTS_FRACTIONAL_STROKE_WIDTH=2
+val SC_SUPPORTS_TRANSLUCENT_STROKE=3
+val SC_SUPPORTS_PIXEL_MODIFICATION=4
+
+# Get whether a feature is supported
+get bool SupportsFeature=2750(Supports feature,)
+
+enu LineCharacterIndexType=SC_LINECHARACTERINDEX_
+val SC_LINECHARACTERINDEX_NONE=0
+val SC_LINECHARACTERINDEX_UTF32=1
+val SC_LINECHARACTERINDEX_UTF16=2
+
+# Retrieve line character index state.
+get LineCharacterIndexType GetLineCharacterIndex=2710(,)
+
+# Request line character index be created or its use count increased.
+fun void AllocateLineCharacterIndex=2711(LineCharacterIndexType lineCharacterIndex,)
+
+# Decrease use count of line character index and remove if 0.
+fun void ReleaseLineCharacterIndex=2712(LineCharacterIndexType lineCharacterIndex,)
+
+# Retrieve the document line containing a position measured in index units.
+fun line LineFromIndexPosition=2713(position pos, LineCharacterIndexType lineCharacterIndex)
+
+# Retrieve the position measured in index units at the start of a document line.
+fun position IndexPositionFromLine=2714(line line, LineCharacterIndexType lineCharacterIndex)
+
+# Start notifying the container of all key presses and commands.
+fun void StartRecord=3001(,)
+
+# Stop notifying the container of all key presses and commands.
+fun void StopRecord=3002(,)
+
+# Retrieve the lexing language of the document.
+get int GetLexer=4002(,)
+
+# Colourise a segment of the document using the current lexing language.
+fun void Colourise=4003(position start, position end)
+
+# Set up a value that may be used by a lexer for some optional feature.
+set void SetProperty=4004(string key, string value)
+
+# Maximum value of keywordSet parameter of SetKeyWords.
+val KEYWORDSET_MAX=8
+
+# Set up the key words used by the lexer.
+set void SetKeyWords=4005(int keyWordSet, string keyWords)
+
+# Retrieve a "property" value previously set with SetProperty.
+# Result is NUL-terminated.
+get int GetProperty=4008(string key, stringresult value)
+
+# Retrieve a "property" value previously set with SetProperty,
+# with "$()" variable replacement on returned buffer.
+# Result is NUL-terminated.
+get int GetPropertyExpanded=4009(string key, stringresult value)
+
+# Retrieve a "property" value previously set with SetProperty,
+# interpreted as an int AFTER any "$()" variable replacement.
+get int GetPropertyInt=4010(string key, int defaultValue)
+
+# Retrieve the name of the lexer.
+# Return the length of the text.
+# Result is NUL-terminated.
+get int GetLexerLanguage=4012(, stringresult language)
+
+# For private communication between an application and a known lexer.
+fun pointer PrivateLexerCall=4013(int operation, pointer pointer)
+
+# Retrieve a '\n' separated list of properties understood by the current lexer.
+# Result is NUL-terminated.
+fun int PropertyNames=4014(, stringresult names)
+
+enu TypeProperty=SC_TYPE_
+val SC_TYPE_BOOLEAN=0
+val SC_TYPE_INTEGER=1
+val SC_TYPE_STRING=2
+
+# Retrieve the type of a property.
+fun TypeProperty PropertyType=4015(string name,)
+
+# Describe a property.
+# Result is NUL-terminated.
+fun int DescribeProperty=4016(string name, stringresult description)
+
+# Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
+# Result is NUL-terminated.
+fun int DescribeKeyWordSets=4017(, stringresult descriptions)
+
+# Bit set of LineEndType enumertion for which line ends beyond the standard
+# LF, CR, and CRLF are supported by the lexer.
+get int GetLineEndTypesSupported=4018(,)
+
+# Allocate a set of sub styles for a particular base style, returning start of range
+fun int AllocateSubStyles=4020(int styleBase, int numberStyles)
+
+# The starting style number for the sub styles associated with a base style
+get int GetSubStylesStart=4021(int styleBase,)
+
+# The number of sub styles associated with a base style
+get int GetSubStylesLength=4022(int styleBase,)
+
+# For a sub style, return the base style, else return the argument.
+get int GetStyleFromSubStyle=4027(int subStyle,)
+
+# For a secondary style, return the primary style, else return the argument.
+get int GetPrimaryStyleFromStyle=4028(int style,)
+
+# Free allocated sub styles
+fun void FreeSubStyles=4023(,)
+
+# Set the identifiers that are shown in a particular style
+set void SetIdentifiers=4024(int style, string identifiers)
+
+# Where styles are duplicated by a feature such as active/inactive code
+# return the distance between the two types.
+get int DistanceToSecondaryStyles=4025(,)
+
+# Get the set of base styles that can be extended with sub styles
+# Result is NUL-terminated.
+get int GetSubStyleBases=4026(, stringresult styles)
+
+# Retrieve the number of named styles for the lexer.
+get int GetNamedStyles=4029(,)
+
+# Retrieve the name of a style.
+# Result is NUL-terminated.
+fun int NameOfStyle=4030(int style, stringresult name)
+
+# Retrieve a ' ' separated list of style tags like "literal quoted string".
+# Result is NUL-terminated.
+fun int TagsOfStyle=4031(int style, stringresult tags)
+
+# Retrieve a description of a style.
+# Result is NUL-terminated.
+fun int DescriptionOfStyle=4032(int style, stringresult description)
+
+# Set the lexer from an ILexer*.
+set void SetILexer=4033(, pointer ilexer)
+
+# Notifications
+# Type of modification and the action which caused the modification.
+# These are defined as a bit mask to make it easy to specify which notifications are wanted.
+# One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
+enu ModificationFlags=SC_MOD_ SC_PERFORMED_ SC_MULTISTEPUNDOREDO SC_LASTSTEPINUNDOREDO SC_MULTILINEUNDOREDO SC_STARTACTION SC_MODEVENTMASKALL
+val SC_MOD_NONE=0x0
+val SC_MOD_INSERTTEXT=0x1
+val SC_MOD_DELETETEXT=0x2
+val SC_MOD_CHANGESTYLE=0x4
+val SC_MOD_CHANGEFOLD=0x8
+val SC_PERFORMED_USER=0x10
+val SC_PERFORMED_UNDO=0x20
+val SC_PERFORMED_REDO=0x40
+val SC_MULTISTEPUNDOREDO=0x80
+val SC_LASTSTEPINUNDOREDO=0x100
+val SC_MOD_CHANGEMARKER=0x200
+val SC_MOD_BEFOREINSERT=0x400
+val SC_MOD_BEFOREDELETE=0x800
+val SC_MULTILINEUNDOREDO=0x1000
+val SC_STARTACTION=0x2000
+val SC_MOD_CHANGEINDICATOR=0x4000
+val SC_MOD_CHANGELINESTATE=0x8000
+val SC_MOD_CHANGEMARGIN=0x10000
+val SC_MOD_CHANGEANNOTATION=0x20000
+val SC_MOD_CONTAINER=0x40000
+val SC_MOD_LEXERSTATE=0x80000
+val SC_MOD_INSERTCHECK=0x100000
+val SC_MOD_CHANGETABSTOPS=0x200000
+val SC_MOD_CHANGEEOLANNOTATION=0x400000
+val SC_MODEVENTMASKALL=0x7FFFFF
+
+ali SC_MOD_INSERTTEXT=INSERT_TEXT
+ali SC_MOD_DELETETEXT=DELETE_TEXT
+ali SC_MOD_CHANGESTYLE=CHANGE_STYLE
+ali SC_MOD_CHANGEFOLD=CHANGE_FOLD
+ali SC_MULTISTEPUNDOREDO=MULTI_STEP_UNDO_REDO
+ali SC_LASTSTEPINUNDOREDO=LAST_STEP_IN_UNDO_REDO
+ali SC_MOD_CHANGEMARKER=CHANGE_MARKER
+ali SC_MOD_BEFOREINSERT=BEFORE_INSERT
+ali SC_MOD_BEFOREDELETE=BEFORE_DELETE
+ali SC_MULTILINEUNDOREDO=MULTILINE_UNDO_REDO
+ali SC_STARTACTION=START_ACTION
+ali SC_MOD_CHANGEINDICATOR=CHANGE_INDICATOR
+ali SC_MOD_CHANGELINESTATE=CHANGE_LINE_STATE
+ali SC_MOD_CHANGEMARGIN=CHANGE_MARGIN
+ali SC_MOD_CHANGEANNOTATION=CHANGE_ANNOTATION
+ali SC_MOD_LEXERSTATE=LEXER_STATE
+ali SC_MOD_INSERTCHECK=INSERT_CHECK
+ali SC_MOD_CHANGETABSTOPS=CHANGE_TAB_STOPS
+ali SC_MOD_CHANGEEOLANNOTATION=CHANGE_E_O_L_ANNOTATION
+ali SC_MODEVENTMASKALL=EVENT_MASK_ALL
+
+enu Update=SC_UPDATE_
+val SC_UPDATE_NONE=0x0
+val SC_UPDATE_CONTENT=0x1
+val SC_UPDATE_SELECTION=0x2
+val SC_UPDATE_V_SCROLL=0x4
+val SC_UPDATE_H_SCROLL=0x8
+
+# For compatibility, these go through the COMMAND notification rather than NOTIFY
+# and should have had exactly the same values as the EN_* constants.
+# Unfortunately the SETFOCUS and KILLFOCUS are flipped over from EN_*
+# As clients depend on these constants, this will not be changed.
+enu FocusChange=SCEN_
+val SCEN_CHANGE=768
+val SCEN_SETFOCUS=512
+val SCEN_KILLFOCUS=256
+
+# Symbolic key codes and modifier flags.
+# ASCII and other printable characters below 256.
+# Extended keys above 300.
+
+enu Keys=SCK_
+val SCK_DOWN=300
+val SCK_UP=301
+val SCK_LEFT=302
+val SCK_RIGHT=303
+val SCK_HOME=304
+val SCK_END=305
+val SCK_PRIOR=306
+val SCK_NEXT=307
+val SCK_DELETE=308
+val SCK_INSERT=309
+val SCK_ESCAPE=7
+val SCK_BACK=8
+val SCK_TAB=9
+val SCK_RETURN=13
+val SCK_ADD=310
+val SCK_SUBTRACT=311
+val SCK_DIVIDE=312
+val SCK_WIN=313
+val SCK_RWIN=314
+val SCK_MENU=315
+
+ali SCK_RWIN=R_WIN
+
+enu KeyMod=SCMOD_
+val SCMOD_NORM=0
+val SCMOD_SHIFT=1
+val SCMOD_CTRL=2
+val SCMOD_ALT=4
+val SCMOD_SUPER=8
+val SCMOD_META=16
+
+enu CompletionMethods=SC_AC_
+val SC_AC_FILLUP=1
+val SC_AC_DOUBLECLICK=2
+val SC_AC_TAB=3
+val SC_AC_NEWLINE=4
+val SC_AC_COMMAND=5
+
+ali SC_AC_FILLUP=FILL_UP
+ali SC_AC_DOUBLECLICK=DOUBLE_CLICK
+
+# characterSource for SCN_CHARADDED
+enu CharacterSource=SC_CHARACTERSOURCE_
+# Direct input characters.
+val SC_CHARACTERSOURCE_DIRECT_INPUT=0
+# IME (inline mode) or dead key tentative input characters.
+val SC_CHARACTERSOURCE_TENTATIVE_INPUT=1
+# IME (either inline or windowed mode) full composited string.
+val SC_CHARACTERSOURCE_IME_RESULT=2
+
+# Events
+
+evt void StyleNeeded=2000(int position)
+evt void CharAdded=2001(int ch, int characterSource)
+evt void SavePointReached=2002(void)
+evt void SavePointLeft=2003(void)
+evt void ModifyAttemptRO=2004(void)
+# GTK Specific to work around focus and accelerator problems:
+evt void Key=2005(int ch, int modifiers)
+evt void DoubleClick=2006(int modifiers, int position, int line)
+evt void UpdateUI=2007(int updated)
+evt void Modified=2008(int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev, int token, int annotationLinesAdded)
+evt void MacroRecord=2009(int message, int wParam, int lParam)
+evt void MarginClick=2010(int modifiers, int position, int margin)
+evt void NeedShown=2011(int position, int length)
+evt void Painted=2013(void)
+evt void UserListSelection=2014(int listType, string text, int position, int ch, CompletionMethods listCompletionMethod)
+evt void URIDropped=2015(string text)
+evt void DwellStart=2016(int position, int x, int y)
+evt void DwellEnd=2017(int position, int x, int y)
+evt void Zoom=2018(void)
+evt void HotSpotClick=2019(int modifiers, int position)
+evt void HotSpotDoubleClick=2020(int modifiers, int position)
+evt void CallTipClick=2021(int position)
+evt void AutoCSelection=2022(string text, int position, int ch, CompletionMethods listCompletionMethod)
+evt void IndicatorClick=2023(int modifiers, int position)
+evt void IndicatorRelease=2024(int modifiers, int position)
+evt void AutoCCancelled=2025(void)
+evt void AutoCCharDeleted=2026(void)
+evt void HotSpotReleaseClick=2027(int modifiers, int position)
+evt void FocusIn=2028(void)
+evt void FocusOut=2029(void)
+evt void AutoCCompleted=2030(string text, int position, int ch, CompletionMethods listCompletionMethod)
+evt void MarginRightClick=2031(int modifiers, int position, int margin)
+evt void AutoCSelectionChange=2032(int listType, string text, int position)
+
+cat Provisional
+
+enu Bidirectional=SC_BIDIRECTIONAL_
+val SC_BIDIRECTIONAL_DISABLED=0
+val SC_BIDIRECTIONAL_L2R=1
+val SC_BIDIRECTIONAL_R2L=2
+
+# Retrieve bidirectional text display state.
+get Bidirectional GetBidirectional=2708(,)
+
+# Set bidirectional text display state.
+set void SetBidirectional=2709(Bidirectional bidirectional,)
+
+cat Deprecated
+
+# Divide each styling byte into lexical class bits (default: 5) and indicator
+# bits (default: 3). If a lexer requires more than 32 lexical states, then this
+# is used to expand the possible states.
+set void SetStyleBits=2090(int bits,)
+
+# Retrieve number of bits in style bytes used to hold the lexical state.
+get int GetStyleBits=2091(,)
+
+# Retrieve the number of bits the current lexer needs for styling.
+get int GetStyleBitsNeeded=4011(,)
+
+# Deprecated in 3.5.5
+
+# Always interpret keyboard input as Unicode
+set void SetKeysUnicode=2521(bool keysUnicode,)
+
+# Are keys always interpreted as Unicode?
+get bool GetKeysUnicode=2522(,)
+
+# Is drawing done in two phases with backgrounds drawn before foregrounds?
+get bool GetTwoPhaseDraw=2283(,)
+
+# In twoPhaseDraw mode, drawing is performed in two phases, first the background
+# and then the foreground. This avoids chopping off characters that overlap the next run.
+set void SetTwoPhaseDraw=2284(bool twoPhase,)
+
+val INDIC0_MASK=0x20
+val INDIC1_MASK=0x40
+val INDIC2_MASK=0x80
+val INDICS_MASK=0xE0
diff --git a/scite-app/scintilla/include/ScintillaCall.h b/scite-app/scintilla/include/ScintillaCall.h
new file mode 100644
index 0000000..098b9ec
--- /dev/null
+++ b/scite-app/scintilla/include/ScintillaCall.h
@@ -0,0 +1,881 @@
+// SciTE - Scintilla based Text Editor
+/** @file ScintillaCall.h
+ ** Interface to calling a Scintilla instance.
+ **/
+// Copyright 1998-2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. APIFacer.py does the generation. */
+
+#ifndef SCINTILLACALL_H
+#define SCINTILLACALL_H
+
+namespace Scintilla {
+
+enum class Message;	// Declare in case ScintillaMessages.h not included
+
+using FunctionDirect = intptr_t(*)(intptr_t ptr, unsigned int iMessage, uintptr_t wParam, intptr_t lParam, int *pStatus);
+
+struct Failure {
+	Scintilla::Status status;
+	explicit Failure(Scintilla::Status status_) noexcept : status(status_) {
+	}
+};
+
+struct Span {
+	// An ordered range
+	// end may be less than start when, for example, searching backwards
+	Position start;
+	Position end;
+	explicit Span(Position position) noexcept : start(position), end(position) {
+	}
+	Span(Position start_, Position end_) noexcept : start(start_), end(end_) {
+	}
+	Position Length() const noexcept {
+		if (end > start)
+			return end - start;
+		else
+			return start - end;
+	}
+	bool operator==(const Span &other) const noexcept {
+		return (other.start == start) && (other.end == end);
+	}
+};
+
+class ScintillaCall {
+	FunctionDirect fn;
+	intptr_t ptr;
+	intptr_t CallPointer(Message msg, uintptr_t wParam, void *s);
+	intptr_t CallString(Message msg, uintptr_t wParam, const char *s);
+	std::string CallReturnString(Message msg, uintptr_t wParam);
+public:
+	Scintilla::Status statusLastCall;
+	ScintillaCall() noexcept;
+	// All standard methods are fine
+
+	void SetFnPtr(FunctionDirect fn_, intptr_t ptr_) noexcept;
+	bool IsValid() const noexcept;
+	intptr_t Call(Message msg, uintptr_t wParam=0, intptr_t lParam=0);
+
+	// Common APIs made more structured and type-safe
+	Position LineStart(Line line);
+	Position LineEnd(Line line);
+	Span SelectionSpan();
+	Span TargetSpan();
+	void SetTarget(Span span);
+	void ColouriseAll();
+	char CharacterAt(Position position);
+	int UnsignedStyleAt(Position position);
+	std::string StringOfSpan(Span span);
+	Position ReplaceTarget(std::string_view text);
+	Position ReplaceTargetRE(std::string_view text);
+	Position SearchInTarget(std::string_view text);
+	Span SpanSearchInTarget(std::string_view text);
+
+	// Generated APIs
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+//**\(\*\n\)
+	void AddText(Position length, const char *text);
+	void AddStyledText(Position length, const char *c);
+	void InsertText(Position pos, const char *text);
+	void ChangeInsertion(Position length, const char *text);
+	void ClearAll();
+	void DeleteRange(Position start, Position lengthDelete);
+	void ClearDocumentStyle();
+	Position Length();
+	int CharAt(Position pos);
+	Position CurrentPos();
+	Position Anchor();
+	int StyleAt(Position pos);
+	void Redo();
+	void SetUndoCollection(bool collectUndo);
+	void SelectAll();
+	void SetSavePoint();
+	Position GetStyledText(void *tr);
+	bool CanRedo();
+	Line MarkerLineFromHandle(int markerHandle);
+	void MarkerDeleteHandle(int markerHandle);
+	int MarkerHandleFromLine(Line line, int which);
+	int MarkerNumberFromLine(Line line, int which);
+	bool UndoCollection();
+	Scintilla::WhiteSpace ViewWS();
+	void SetViewWS(Scintilla::WhiteSpace viewWS);
+	Scintilla::TabDrawMode TabDrawMode();
+	void SetTabDrawMode(Scintilla::TabDrawMode tabDrawMode);
+	Position PositionFromPoint(int x, int y);
+	Position PositionFromPointClose(int x, int y);
+	void GotoLine(Line line);
+	void GotoPos(Position caret);
+	void SetAnchor(Position anchor);
+	Position GetCurLine(Position length, char *text);
+	std::string GetCurLine(Position length);
+	Position EndStyled();
+	void ConvertEOLs(Scintilla::EndOfLine eolMode);
+	Scintilla::EndOfLine EOLMode();
+	void SetEOLMode(Scintilla::EndOfLine eolMode);
+	void StartStyling(Position start, int unused);
+	void SetStyling(Position length, int style);
+	bool BufferedDraw();
+	void SetBufferedDraw(bool buffered);
+	void SetTabWidth(int tabWidth);
+	int TabWidth();
+	void SetTabMinimumWidth(int pixels);
+	int TabMinimumWidth();
+	void ClearTabStops(Line line);
+	void AddTabStop(Line line, int x);
+	int GetNextTabStop(Line line, int x);
+	void SetCodePage(int codePage);
+	void SetFontLocale(const char *localeName);
+	int FontLocale(char *localeName);
+	std::string FontLocale();
+	Scintilla::IMEInteraction IMEInteraction();
+	void SetIMEInteraction(Scintilla::IMEInteraction imeInteraction);
+	void MarkerDefine(int markerNumber, Scintilla::MarkerSymbol markerSymbol);
+	void MarkerSetFore(int markerNumber, Colour fore);
+	void MarkerSetBack(int markerNumber, Colour back);
+	void MarkerSetBackSelected(int markerNumber, Colour back);
+	void MarkerSetForeTranslucent(int markerNumber, ColourAlpha fore);
+	void MarkerSetBackTranslucent(int markerNumber, ColourAlpha back);
+	void MarkerSetBackSelectedTranslucent(int markerNumber, ColourAlpha back);
+	void MarkerSetStrokeWidth(int markerNumber, int hundredths);
+	void MarkerEnableHighlight(bool enabled);
+	int MarkerAdd(Line line, int markerNumber);
+	void MarkerDelete(Line line, int markerNumber);
+	void MarkerDeleteAll(int markerNumber);
+	int MarkerGet(Line line);
+	Line MarkerNext(Line lineStart, int markerMask);
+	Line MarkerPrevious(Line lineStart, int markerMask);
+	void MarkerDefinePixmap(int markerNumber, const char *pixmap);
+	void MarkerAddSet(Line line, int markerSet);
+	void MarkerSetAlpha(int markerNumber, Scintilla::Alpha alpha);
+	Scintilla::Layer MarkerGetLayer(int markerNumber);
+	void MarkerSetLayer(int markerNumber, Scintilla::Layer layer);
+	void SetMarginTypeN(int margin, Scintilla::MarginType marginType);
+	Scintilla::MarginType MarginTypeN(int margin);
+	void SetMarginWidthN(int margin, int pixelWidth);
+	int MarginWidthN(int margin);
+	void SetMarginMaskN(int margin, int mask);
+	int MarginMaskN(int margin);
+	void SetMarginSensitiveN(int margin, bool sensitive);
+	bool MarginSensitiveN(int margin);
+	void SetMarginCursorN(int margin, Scintilla::CursorShape cursor);
+	Scintilla::CursorShape MarginCursorN(int margin);
+	void SetMarginBackN(int margin, Colour back);
+	Colour MarginBackN(int margin);
+	void SetMargins(int margins);
+	int Margins();
+	void StyleClearAll();
+	void StyleSetFore(int style, Colour fore);
+	void StyleSetBack(int style, Colour back);
+	void StyleSetBold(int style, bool bold);
+	void StyleSetItalic(int style, bool italic);
+	void StyleSetSize(int style, int sizePoints);
+	void StyleSetFont(int style, const char *fontName);
+	void StyleSetEOLFilled(int style, bool eolFilled);
+	void StyleResetDefault();
+	void StyleSetUnderline(int style, bool underline);
+	Colour StyleGetFore(int style);
+	Colour StyleGetBack(int style);
+	bool StyleGetBold(int style);
+	bool StyleGetItalic(int style);
+	int StyleGetSize(int style);
+	int StyleGetFont(int style, char *fontName);
+	std::string StyleGetFont(int style);
+	bool StyleGetEOLFilled(int style);
+	bool StyleGetUnderline(int style);
+	Scintilla::CaseVisible StyleGetCase(int style);
+	Scintilla::CharacterSet StyleGetCharacterSet(int style);
+	bool StyleGetVisible(int style);
+	bool StyleGetChangeable(int style);
+	bool StyleGetHotSpot(int style);
+	void StyleSetCase(int style, Scintilla::CaseVisible caseVisible);
+	void StyleSetSizeFractional(int style, int sizeHundredthPoints);
+	int StyleGetSizeFractional(int style);
+	void StyleSetWeight(int style, Scintilla::FontWeight weight);
+	Scintilla::FontWeight StyleGetWeight(int style);
+	void StyleSetCharacterSet(int style, Scintilla::CharacterSet characterSet);
+	void StyleSetHotSpot(int style, bool hotspot);
+	void SetElementColour(Scintilla::Element element, ColourAlpha colourElement);
+	ColourAlpha ElementColour(Scintilla::Element element);
+	void ResetElementColour(Scintilla::Element element);
+	bool ElementIsSet(Scintilla::Element element);
+	bool ElementAllowsTranslucent(Scintilla::Element element);
+	ColourAlpha ElementBaseColour(Scintilla::Element element);
+	void SetSelFore(bool useSetting, Colour fore);
+	void SetSelBack(bool useSetting, Colour back);
+	Scintilla::Alpha SelAlpha();
+	void SetSelAlpha(Scintilla::Alpha alpha);
+	bool SelEOLFilled();
+	void SetSelEOLFilled(bool filled);
+	Scintilla::Layer SelectionLayer();
+	void SetSelectionLayer(Scintilla::Layer layer);
+	Scintilla::Layer CaretLineLayer();
+	void SetCaretLineLayer(Scintilla::Layer layer);
+	void SetCaretFore(Colour fore);
+	void AssignCmdKey(int keyDefinition, int sciCommand);
+	void ClearCmdKey(int keyDefinition);
+	void ClearAllCmdKeys();
+	void SetStylingEx(Position length, const char *styles);
+	void StyleSetVisible(int style, bool visible);
+	int CaretPeriod();
+	void SetCaretPeriod(int periodMilliseconds);
+	void SetWordChars(const char *characters);
+	int WordChars(char *characters);
+	std::string WordChars();
+	void SetCharacterCategoryOptimization(int countCharacters);
+	int CharacterCategoryOptimization();
+	void BeginUndoAction();
+	void EndUndoAction();
+	void IndicSetStyle(int indicator, Scintilla::IndicatorStyle indicatorStyle);
+	Scintilla::IndicatorStyle IndicGetStyle(int indicator);
+	void IndicSetFore(int indicator, Colour fore);
+	Colour IndicGetFore(int indicator);
+	void IndicSetUnder(int indicator, bool under);
+	bool IndicGetUnder(int indicator);
+	void IndicSetHoverStyle(int indicator, Scintilla::IndicatorStyle indicatorStyle);
+	Scintilla::IndicatorStyle IndicGetHoverStyle(int indicator);
+	void IndicSetHoverFore(int indicator, Colour fore);
+	Colour IndicGetHoverFore(int indicator);
+	void IndicSetFlags(int indicator, Scintilla::IndicFlag flags);
+	Scintilla::IndicFlag IndicGetFlags(int indicator);
+	void IndicSetStrokeWidth(int indicator, int hundredths);
+	int IndicGetStrokeWidth(int indicator);
+	void SetWhitespaceFore(bool useSetting, Colour fore);
+	void SetWhitespaceBack(bool useSetting, Colour back);
+	void SetWhitespaceSize(int size);
+	int WhitespaceSize();
+	void SetLineState(Line line, int state);
+	int LineState(Line line);
+	int MaxLineState();
+	bool CaretLineVisible();
+	void SetCaretLineVisible(bool show);
+	Colour CaretLineBack();
+	void SetCaretLineBack(Colour back);
+	int CaretLineFrame();
+	void SetCaretLineFrame(int width);
+	void StyleSetChangeable(int style, bool changeable);
+	void AutoCShow(Position lengthEntered, const char *itemList);
+	void AutoCCancel();
+	bool AutoCActive();
+	Position AutoCPosStart();
+	void AutoCComplete();
+	void AutoCStops(const char *characterSet);
+	void AutoCSetSeparator(int separatorCharacter);
+	int AutoCGetSeparator();
+	void AutoCSelect(const char *select);
+	void AutoCSetCancelAtStart(bool cancel);
+	bool AutoCGetCancelAtStart();
+	void AutoCSetFillUps(const char *characterSet);
+	void AutoCSetChooseSingle(bool chooseSingle);
+	bool AutoCGetChooseSingle();
+	void AutoCSetIgnoreCase(bool ignoreCase);
+	bool AutoCGetIgnoreCase();
+	void UserListShow(int listType, const char *itemList);
+	void AutoCSetAutoHide(bool autoHide);
+	bool AutoCGetAutoHide();
+	void AutoCSetOptions(Scintilla::AutoCompleteOption options);
+	Scintilla::AutoCompleteOption AutoCGetOptions();
+	void AutoCSetDropRestOfWord(bool dropRestOfWord);
+	bool AutoCGetDropRestOfWord();
+	void RegisterImage(int type, const char *xpmData);
+	void ClearRegisteredImages();
+	int AutoCGetTypeSeparator();
+	void AutoCSetTypeSeparator(int separatorCharacter);
+	void AutoCSetMaxWidth(int characterCount);
+	int AutoCGetMaxWidth();
+	void AutoCSetMaxHeight(int rowCount);
+	int AutoCGetMaxHeight();
+	void SetIndent(int indentSize);
+	int Indent();
+	void SetUseTabs(bool useTabs);
+	bool UseTabs();
+	void SetLineIndentation(Line line, int indentation);
+	int LineIndentation(Line line);
+	Position LineIndentPosition(Line line);
+	Position Column(Position pos);
+	Position CountCharacters(Position start, Position end);
+	Position CountCodeUnits(Position start, Position end);
+	void SetHScrollBar(bool visible);
+	bool HScrollBar();
+	void SetIndentationGuides(Scintilla::IndentView indentView);
+	Scintilla::IndentView IndentationGuides();
+	void SetHighlightGuide(Position column);
+	Position HighlightGuide();
+	Position LineEndPosition(Line line);
+	int CodePage();
+	Colour CaretFore();
+	bool ReadOnly();
+	void SetCurrentPos(Position caret);
+	void SetSelectionStart(Position anchor);
+	Position SelectionStart();
+	void SetSelectionEnd(Position caret);
+	Position SelectionEnd();
+	void SetEmptySelection(Position caret);
+	void SetPrintMagnification(int magnification);
+	int PrintMagnification();
+	void SetPrintColourMode(Scintilla::PrintOption mode);
+	Scintilla::PrintOption PrintColourMode();
+	Position FindText(Scintilla::FindOption searchFlags, void *ft);
+	Position FormatRange(bool draw, void *fr);
+	Line FirstVisibleLine();
+	Position GetLine(Line line, char *text);
+	std::string GetLine(Line line);
+	Line LineCount();
+	void AllocateLines(Line lines);
+	void SetMarginLeft(int pixelWidth);
+	int MarginLeft();
+	void SetMarginRight(int pixelWidth);
+	int MarginRight();
+	bool Modify();
+	void SetSel(Position anchor, Position caret);
+	Position GetSelText(char *text);
+	std::string GetSelText();
+	Position GetTextRange(void *tr);
+	void HideSelection(bool hide);
+	int PointXFromPosition(Position pos);
+	int PointYFromPosition(Position pos);
+	Line LineFromPosition(Position pos);
+	Position PositionFromLine(Line line);
+	void LineScroll(Position columns, Line lines);
+	void ScrollCaret();
+	void ScrollRange(Position secondary, Position primary);
+	void ReplaceSel(const char *text);
+	void SetReadOnly(bool readOnly);
+	void Null();
+	bool CanPaste();
+	bool CanUndo();
+	void EmptyUndoBuffer();
+	void Undo();
+	void Cut();
+	void Copy();
+	void Paste();
+	void Clear();
+	void SetText(const char *text);
+	Position GetText(Position length, char *text);
+	std::string GetText(Position length);
+	Position TextLength();
+	void *DirectFunction();
+	void *DirectStatusFunction();
+	void *DirectPointer();
+	void SetOvertype(bool overType);
+	bool Overtype();
+	void SetCaretWidth(int pixelWidth);
+	int CaretWidth();
+	void SetTargetStart(Position start);
+	Position TargetStart();
+	void SetTargetStartVirtualSpace(Position space);
+	Position TargetStartVirtualSpace();
+	void SetTargetEnd(Position end);
+	Position TargetEnd();
+	void SetTargetEndVirtualSpace(Position space);
+	Position TargetEndVirtualSpace();
+	void SetTargetRange(Position start, Position end);
+	Position TargetText(char *text);
+	std::string TargetText();
+	void TargetFromSelection();
+	void TargetWholeDocument();
+	Position ReplaceTarget(Position length, const char *text);
+	Position ReplaceTargetRE(Position length, const char *text);
+	Position SearchInTarget(Position length, const char *text);
+	void SetSearchFlags(Scintilla::FindOption searchFlags);
+	Scintilla::FindOption SearchFlags();
+	void CallTipShow(Position pos, const char *definition);
+	void CallTipCancel();
+	bool CallTipActive();
+	Position CallTipPosStart();
+	void CallTipSetPosStart(Position posStart);
+	void CallTipSetHlt(Position highlightStart, Position highlightEnd);
+	void CallTipSetBack(Colour back);
+	void CallTipSetFore(Colour fore);
+	void CallTipSetForeHlt(Colour fore);
+	void CallTipUseStyle(int tabSize);
+	void CallTipSetPosition(bool above);
+	Line VisibleFromDocLine(Line docLine);
+	Line DocLineFromVisible(Line displayLine);
+	Line WrapCount(Line docLine);
+	void SetFoldLevel(Line line, Scintilla::FoldLevel level);
+	Scintilla::FoldLevel FoldLevel(Line line);
+	Line LastChild(Line line, Scintilla::FoldLevel level);
+	Line FoldParent(Line line);
+	void ShowLines(Line lineStart, Line lineEnd);
+	void HideLines(Line lineStart, Line lineEnd);
+	bool LineVisible(Line line);
+	bool AllLinesVisible();
+	void SetFoldExpanded(Line line, bool expanded);
+	bool FoldExpanded(Line line);
+	void ToggleFold(Line line);
+	void ToggleFoldShowText(Line line, const char *text);
+	void FoldDisplayTextSetStyle(Scintilla::FoldDisplayTextStyle style);
+	Scintilla::FoldDisplayTextStyle FoldDisplayTextGetStyle();
+	void SetDefaultFoldDisplayText(const char *text);
+	int GetDefaultFoldDisplayText(char *text);
+	std::string GetDefaultFoldDisplayText();
+	void FoldLine(Line line, Scintilla::FoldAction action);
+	void FoldChildren(Line line, Scintilla::FoldAction action);
+	void ExpandChildren(Line line, Scintilla::FoldLevel level);
+	void FoldAll(Scintilla::FoldAction action);
+	void EnsureVisible(Line line);
+	void SetAutomaticFold(Scintilla::AutomaticFold automaticFold);
+	Scintilla::AutomaticFold AutomaticFold();
+	void SetFoldFlags(Scintilla::FoldFlag flags);
+	void EnsureVisibleEnforcePolicy(Line line);
+	void SetTabIndents(bool tabIndents);
+	bool TabIndents();
+	void SetBackSpaceUnIndents(bool bsUnIndents);
+	bool BackSpaceUnIndents();
+	void SetMouseDwellTime(int periodMilliseconds);
+	int MouseDwellTime();
+	Position WordStartPosition(Position pos, bool onlyWordCharacters);
+	Position WordEndPosition(Position pos, bool onlyWordCharacters);
+	bool IsRangeWord(Position start, Position end);
+	void SetIdleStyling(Scintilla::IdleStyling idleStyling);
+	Scintilla::IdleStyling IdleStyling();
+	void SetWrapMode(Scintilla::Wrap wrapMode);
+	Scintilla::Wrap WrapMode();
+	void SetWrapVisualFlags(Scintilla::WrapVisualFlag wrapVisualFlags);
+	Scintilla::WrapVisualFlag WrapVisualFlags();
+	void SetWrapVisualFlagsLocation(Scintilla::WrapVisualLocation wrapVisualFlagsLocation);
+	Scintilla::WrapVisualLocation WrapVisualFlagsLocation();
+	void SetWrapStartIndent(int indent);
+	int WrapStartIndent();
+	void SetWrapIndentMode(Scintilla::WrapIndentMode wrapIndentMode);
+	Scintilla::WrapIndentMode WrapIndentMode();
+	void SetLayoutCache(Scintilla::LineCache cacheMode);
+	Scintilla::LineCache LayoutCache();
+	void SetScrollWidth(int pixelWidth);
+	int ScrollWidth();
+	void SetScrollWidthTracking(bool tracking);
+	bool ScrollWidthTracking();
+	int TextWidth(int style, const char *text);
+	void SetEndAtLastLine(bool endAtLastLine);
+	bool EndAtLastLine();
+	int TextHeight(Line line);
+	void SetVScrollBar(bool visible);
+	bool VScrollBar();
+	void AppendText(Position length, const char *text);
+	Scintilla::PhasesDraw PhasesDraw();
+	void SetPhasesDraw(Scintilla::PhasesDraw phases);
+	void SetFontQuality(Scintilla::FontQuality fontQuality);
+	Scintilla::FontQuality FontQuality();
+	void SetFirstVisibleLine(Line displayLine);
+	void SetMultiPaste(Scintilla::MultiPaste multiPaste);
+	Scintilla::MultiPaste MultiPaste();
+	int Tag(int tagNumber, char *tagValue);
+	std::string Tag(int tagNumber);
+	void LinesJoin();
+	void LinesSplit(int pixelWidth);
+	void SetFoldMarginColour(bool useSetting, Colour back);
+	void SetFoldMarginHiColour(bool useSetting, Colour fore);
+	void SetAccessibility(Scintilla::Accessibility accessibility);
+	Scintilla::Accessibility Accessibility();
+	void LineDown();
+	void LineDownExtend();
+	void LineUp();
+	void LineUpExtend();
+	void CharLeft();
+	void CharLeftExtend();
+	void CharRight();
+	void CharRightExtend();
+	void WordLeft();
+	void WordLeftExtend();
+	void WordRight();
+	void WordRightExtend();
+	void Home();
+	void HomeExtend();
+	void LineEnd();
+	void LineEndExtend();
+	void DocumentStart();
+	void DocumentStartExtend();
+	void DocumentEnd();
+	void DocumentEndExtend();
+	void PageUp();
+	void PageUpExtend();
+	void PageDown();
+	void PageDownExtend();
+	void EditToggleOvertype();
+	void Cancel();
+	void DeleteBack();
+	void Tab();
+	void BackTab();
+	void NewLine();
+	void FormFeed();
+	void VCHome();
+	void VCHomeExtend();
+	void ZoomIn();
+	void ZoomOut();
+	void DelWordLeft();
+	void DelWordRight();
+	void DelWordRightEnd();
+	void LineCut();
+	void LineDelete();
+	void LineTranspose();
+	void LineReverse();
+	void LineDuplicate();
+	void LowerCase();
+	void UpperCase();
+	void LineScrollDown();
+	void LineScrollUp();
+	void DeleteBackNotLine();
+	void HomeDisplay();
+	void HomeDisplayExtend();
+	void LineEndDisplay();
+	void LineEndDisplayExtend();
+	void HomeWrap();
+	void HomeWrapExtend();
+	void LineEndWrap();
+	void LineEndWrapExtend();
+	void VCHomeWrap();
+	void VCHomeWrapExtend();
+	void LineCopy();
+	void MoveCaretInsideView();
+	Position LineLength(Line line);
+	void BraceHighlight(Position posA, Position posB);
+	void BraceHighlightIndicator(bool useSetting, int indicator);
+	void BraceBadLight(Position pos);
+	void BraceBadLightIndicator(bool useSetting, int indicator);
+	Position BraceMatch(Position pos, int maxReStyle);
+	Position BraceMatchNext(Position pos, Position startPos);
+	bool ViewEOL();
+	void SetViewEOL(bool visible);
+	void *DocPointer();
+	void SetDocPointer(void *doc);
+	void SetModEventMask(Scintilla::ModificationFlags eventMask);
+	Position EdgeColumn();
+	void SetEdgeColumn(Position column);
+	Scintilla::EdgeVisualStyle EdgeMode();
+	void SetEdgeMode(Scintilla::EdgeVisualStyle edgeMode);
+	Colour EdgeColour();
+	void SetEdgeColour(Colour edgeColour);
+	void MultiEdgeAddLine(Position column, Colour edgeColour);
+	void MultiEdgeClearAll();
+	Position MultiEdgeColumn(int which);
+	void SearchAnchor();
+	Position SearchNext(Scintilla::FindOption searchFlags, const char *text);
+	Position SearchPrev(Scintilla::FindOption searchFlags, const char *text);
+	Line LinesOnScreen();
+	void UsePopUp(Scintilla::PopUp popUpMode);
+	bool SelectionIsRectangle();
+	void SetZoom(int zoomInPoints);
+	int Zoom();
+	void *CreateDocument(Position bytes, Scintilla::DocumentOption documentOptions);
+	void AddRefDocument(void *doc);
+	void ReleaseDocument(void *doc);
+	Scintilla::DocumentOption DocumentOptions();
+	Scintilla::ModificationFlags ModEventMask();
+	void SetCommandEvents(bool commandEvents);
+	bool CommandEvents();
+	void SetFocus(bool focus);
+	bool Focus();
+	void SetStatus(Scintilla::Status status);
+	Scintilla::Status Status();
+	void SetMouseDownCaptures(bool captures);
+	bool MouseDownCaptures();
+	void SetMouseWheelCaptures(bool captures);
+	bool MouseWheelCaptures();
+	void SetCursor(Scintilla::CursorShape cursorType);
+	Scintilla::CursorShape Cursor();
+	void SetControlCharSymbol(int symbol);
+	int ControlCharSymbol();
+	void WordPartLeft();
+	void WordPartLeftExtend();
+	void WordPartRight();
+	void WordPartRightExtend();
+	void SetVisiblePolicy(Scintilla::VisiblePolicy visiblePolicy, int visibleSlop);
+	void DelLineLeft();
+	void DelLineRight();
+	void SetXOffset(int xOffset);
+	int XOffset();
+	void ChooseCaretX();
+	void GrabFocus();
+	void SetXCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop);
+	void SetYCaretPolicy(Scintilla::CaretPolicy caretPolicy, int caretSlop);
+	void SetPrintWrapMode(Scintilla::Wrap wrapMode);
+	Scintilla::Wrap PrintWrapMode();
+	void SetHotspotActiveFore(bool useSetting, Colour fore);
+	Colour HotspotActiveFore();
+	void SetHotspotActiveBack(bool useSetting, Colour back);
+	Colour HotspotActiveBack();
+	void SetHotspotActiveUnderline(bool underline);
+	bool HotspotActiveUnderline();
+	void SetHotspotSingleLine(bool singleLine);
+	bool HotspotSingleLine();
+	void ParaDown();
+	void ParaDownExtend();
+	void ParaUp();
+	void ParaUpExtend();
+	Position PositionBefore(Position pos);
+	Position PositionAfter(Position pos);
+	Position PositionRelative(Position pos, Position relative);
+	Position PositionRelativeCodeUnits(Position pos, Position relative);
+	void CopyRange(Position start, Position end);
+	void CopyText(Position length, const char *text);
+	void SetSelectionMode(Scintilla::SelectionMode selectionMode);
+	Scintilla::SelectionMode SelectionMode();
+	bool MoveExtendsSelection();
+	Position GetLineSelStartPosition(Line line);
+	Position GetLineSelEndPosition(Line line);
+	void LineDownRectExtend();
+	void LineUpRectExtend();
+	void CharLeftRectExtend();
+	void CharRightRectExtend();
+	void HomeRectExtend();
+	void VCHomeRectExtend();
+	void LineEndRectExtend();
+	void PageUpRectExtend();
+	void PageDownRectExtend();
+	void StutteredPageUp();
+	void StutteredPageUpExtend();
+	void StutteredPageDown();
+	void StutteredPageDownExtend();
+	void WordLeftEnd();
+	void WordLeftEndExtend();
+	void WordRightEnd();
+	void WordRightEndExtend();
+	void SetWhitespaceChars(const char *characters);
+	int WhitespaceChars(char *characters);
+	std::string WhitespaceChars();
+	void SetPunctuationChars(const char *characters);
+	int PunctuationChars(char *characters);
+	std::string PunctuationChars();
+	void SetCharsDefault();
+	int AutoCGetCurrent();
+	int AutoCGetCurrentText(char *text);
+	std::string AutoCGetCurrentText();
+	void AutoCSetCaseInsensitiveBehaviour(Scintilla::CaseInsensitiveBehaviour behaviour);
+	Scintilla::CaseInsensitiveBehaviour AutoCGetCaseInsensitiveBehaviour();
+	void AutoCSetMulti(Scintilla::MultiAutoComplete multi);
+	Scintilla::MultiAutoComplete AutoCGetMulti();
+	void AutoCSetOrder(Scintilla::Ordering order);
+	Scintilla::Ordering AutoCGetOrder();
+	void Allocate(Position bytes);
+	Position TargetAsUTF8(char *s);
+	std::string TargetAsUTF8();
+	void SetLengthForEncode(Position bytes);
+	Position EncodedFromUTF8(const char *utf8, char *encoded);
+	std::string EncodedFromUTF8(const char *utf8);
+	Position FindColumn(Line line, Position column);
+	Scintilla::CaretSticky CaretSticky();
+	void SetCaretSticky(Scintilla::CaretSticky useCaretStickyBehaviour);
+	void ToggleCaretSticky();
+	void SetPasteConvertEndings(bool convert);
+	bool PasteConvertEndings();
+	void ReplaceRectangular(Position length, const char *text);
+	void SelectionDuplicate();
+	void SetCaretLineBackAlpha(Scintilla::Alpha alpha);
+	Scintilla::Alpha CaretLineBackAlpha();
+	void SetCaretStyle(Scintilla::CaretStyle caretStyle);
+	Scintilla::CaretStyle CaretStyle();
+	void SetIndicatorCurrent(int indicator);
+	int IndicatorCurrent();
+	void SetIndicatorValue(int value);
+	int IndicatorValue();
+	void IndicatorFillRange(Position start, Position lengthFill);
+	void IndicatorClearRange(Position start, Position lengthClear);
+	int IndicatorAllOnFor(Position pos);
+	int IndicatorValueAt(int indicator, Position pos);
+	Position IndicatorStart(int indicator, Position pos);
+	Position IndicatorEnd(int indicator, Position pos);
+	void SetPositionCache(int size);
+	int PositionCache();
+	void CopyAllowLine();
+	void *CharacterPointer();
+	void *RangePointer(Position start, Position lengthRange);
+	Position GapPosition();
+	void IndicSetAlpha(int indicator, Scintilla::Alpha alpha);
+	Scintilla::Alpha IndicGetAlpha(int indicator);
+	void IndicSetOutlineAlpha(int indicator, Scintilla::Alpha alpha);
+	Scintilla::Alpha IndicGetOutlineAlpha(int indicator);
+	void SetExtraAscent(int extraAscent);
+	int ExtraAscent();
+	void SetExtraDescent(int extraDescent);
+	int ExtraDescent();
+	int MarkerSymbolDefined(int markerNumber);
+	void MarginSetText(Line line, const char *text);
+	int MarginGetText(Line line, char *text);
+	std::string MarginGetText(Line line);
+	void MarginSetStyle(Line line, int style);
+	int MarginGetStyle(Line line);
+	void MarginSetStyles(Line line, const char *styles);
+	int MarginGetStyles(Line line, char *styles);
+	std::string MarginGetStyles(Line line);
+	void MarginTextClearAll();
+	void MarginSetStyleOffset(int style);
+	int MarginGetStyleOffset();
+	void SetMarginOptions(Scintilla::MarginOption marginOptions);
+	Scintilla::MarginOption MarginOptions();
+	void AnnotationSetText(Line line, const char *text);
+	int AnnotationGetText(Line line, char *text);
+	std::string AnnotationGetText(Line line);
+	void AnnotationSetStyle(Line line, int style);
+	int AnnotationGetStyle(Line line);
+	void AnnotationSetStyles(Line line, const char *styles);
+	int AnnotationGetStyles(Line line, char *styles);
+	std::string AnnotationGetStyles(Line line);
+	int AnnotationGetLines(Line line);
+	void AnnotationClearAll();
+	void AnnotationSetVisible(Scintilla::AnnotationVisible visible);
+	Scintilla::AnnotationVisible AnnotationGetVisible();
+	void AnnotationSetStyleOffset(int style);
+	int AnnotationGetStyleOffset();
+	void ReleaseAllExtendedStyles();
+	int AllocateExtendedStyles(int numberStyles);
+	void AddUndoAction(int token, Scintilla::UndoFlags flags);
+	Position CharPositionFromPoint(int x, int y);
+	Position CharPositionFromPointClose(int x, int y);
+	void SetMouseSelectionRectangularSwitch(bool mouseSelectionRectangularSwitch);
+	bool MouseSelectionRectangularSwitch();
+	void SetMultipleSelection(bool multipleSelection);
+	bool MultipleSelection();
+	void SetAdditionalSelectionTyping(bool additionalSelectionTyping);
+	bool AdditionalSelectionTyping();
+	void SetAdditionalCaretsBlink(bool additionalCaretsBlink);
+	bool AdditionalCaretsBlink();
+	void SetAdditionalCaretsVisible(bool additionalCaretsVisible);
+	bool AdditionalCaretsVisible();
+	int Selections();
+	bool SelectionEmpty();
+	void ClearSelections();
+	void SetSelection(Position caret, Position anchor);
+	void AddSelection(Position caret, Position anchor);
+	void DropSelectionN(int selection);
+	void SetMainSelection(int selection);
+	int MainSelection();
+	void SetSelectionNCaret(int selection, Position caret);
+	Position SelectionNCaret(int selection);
+	void SetSelectionNAnchor(int selection, Position anchor);
+	Position SelectionNAnchor(int selection);
+	void SetSelectionNCaretVirtualSpace(int selection, Position space);
+	Position SelectionNCaretVirtualSpace(int selection);
+	void SetSelectionNAnchorVirtualSpace(int selection, Position space);
+	Position SelectionNAnchorVirtualSpace(int selection);
+	void SetSelectionNStart(int selection, Position anchor);
+	Position SelectionNStart(int selection);
+	Position SelectionNStartVirtualSpace(int selection);
+	void SetSelectionNEnd(int selection, Position caret);
+	Position SelectionNEndVirtualSpace(int selection);
+	Position SelectionNEnd(int selection);
+	void SetRectangularSelectionCaret(Position caret);
+	Position RectangularSelectionCaret();
+	void SetRectangularSelectionAnchor(Position anchor);
+	Position RectangularSelectionAnchor();
+	void SetRectangularSelectionCaretVirtualSpace(Position space);
+	Position RectangularSelectionCaretVirtualSpace();
+	void SetRectangularSelectionAnchorVirtualSpace(Position space);
+	Position RectangularSelectionAnchorVirtualSpace();
+	void SetVirtualSpaceOptions(Scintilla::VirtualSpace virtualSpaceOptions);
+	Scintilla::VirtualSpace VirtualSpaceOptions();
+	void SetRectangularSelectionModifier(int modifier);
+	int RectangularSelectionModifier();
+	void SetAdditionalSelFore(Colour fore);
+	void SetAdditionalSelBack(Colour back);
+	void SetAdditionalSelAlpha(Scintilla::Alpha alpha);
+	Scintilla::Alpha AdditionalSelAlpha();
+	void SetAdditionalCaretFore(Colour fore);
+	Colour AdditionalCaretFore();
+	void RotateSelection();
+	void SwapMainAnchorCaret();
+	void MultipleSelectAddNext();
+	void MultipleSelectAddEach();
+	int ChangeLexerState(Position start, Position end);
+	Line ContractedFoldNext(Line lineStart);
+	void VerticalCentreCaret();
+	void MoveSelectedLinesUp();
+	void MoveSelectedLinesDown();
+	void SetIdentifier(int identifier);
+	int Identifier();
+	void RGBAImageSetWidth(int width);
+	void RGBAImageSetHeight(int height);
+	void RGBAImageSetScale(int scalePercent);
+	void MarkerDefineRGBAImage(int markerNumber, const char *pixels);
+	void RegisterRGBAImage(int type, const char *pixels);
+	void ScrollToStart();
+	void ScrollToEnd();
+	void SetTechnology(Scintilla::Technology technology);
+	Scintilla::Technology Technology();
+	void *CreateLoader(Position bytes, Scintilla::DocumentOption documentOptions);
+	void FindIndicatorShow(Position start, Position end);
+	void FindIndicatorFlash(Position start, Position end);
+	void FindIndicatorHide();
+	void VCHomeDisplay();
+	void VCHomeDisplayExtend();
+	bool CaretLineVisibleAlways();
+	void SetCaretLineVisibleAlways(bool alwaysVisible);
+	void SetLineEndTypesAllowed(Scintilla::LineEndType lineEndBitSet);
+	Scintilla::LineEndType LineEndTypesAllowed();
+	Scintilla::LineEndType LineEndTypesActive();
+	void SetRepresentation(const char *encodedCharacter, const char *representation);
+	int Representation(const char *encodedCharacter, char *representation);
+	std::string Representation(const char *encodedCharacter);
+	void ClearRepresentation(const char *encodedCharacter);
+	void ClearAllRepresentations();
+	void SetRepresentationAppearance(const char *encodedCharacter, Scintilla::RepresentationAppearance appearance);
+	Scintilla::RepresentationAppearance RepresentationAppearance(const char *encodedCharacter);
+	void SetRepresentationColour(const char *encodedCharacter, ColourAlpha colour);
+	ColourAlpha RepresentationColour(const char *encodedCharacter);
+	void EOLAnnotationSetText(Line line, const char *text);
+	int EOLAnnotationGetText(Line line, char *text);
+	std::string EOLAnnotationGetText(Line line);
+	void EOLAnnotationSetStyle(Line line, int style);
+	int EOLAnnotationGetStyle(Line line);
+	void EOLAnnotationClearAll();
+	void EOLAnnotationSetVisible(Scintilla::EOLAnnotationVisible visible);
+	Scintilla::EOLAnnotationVisible EOLAnnotationGetVisible();
+	void EOLAnnotationSetStyleOffset(int style);
+	int EOLAnnotationGetStyleOffset();
+	bool SupportsFeature(Scintilla::Supports feature);
+	Scintilla::LineCharacterIndexType LineCharacterIndex();
+	void AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	void ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	Line LineFromIndexPosition(Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex);
+	Position IndexPositionFromLine(Line line, Scintilla::LineCharacterIndexType lineCharacterIndex);
+	void StartRecord();
+	void StopRecord();
+	int Lexer();
+	void Colourise(Position start, Position end);
+	void SetProperty(const char *key, const char *value);
+	void SetKeyWords(int keyWordSet, const char *keyWords);
+	int Property(const char *key, char *value);
+	std::string Property(const char *key);
+	int PropertyExpanded(const char *key, char *value);
+	std::string PropertyExpanded(const char *key);
+	int PropertyInt(const char *key, int defaultValue);
+	int LexerLanguage(char *language);
+	std::string LexerLanguage();
+	void *PrivateLexerCall(int operation, void *pointer);
+	int PropertyNames(char *names);
+	std::string PropertyNames();
+	Scintilla::TypeProperty PropertyType(const char *name);
+	int DescribeProperty(const char *name, char *description);
+	std::string DescribeProperty(const char *name);
+	int DescribeKeyWordSets(char *descriptions);
+	std::string DescribeKeyWordSets();
+	int LineEndTypesSupported();
+	int AllocateSubStyles(int styleBase, int numberStyles);
+	int SubStylesStart(int styleBase);
+	int SubStylesLength(int styleBase);
+	int StyleFromSubStyle(int subStyle);
+	int PrimaryStyleFromStyle(int style);
+	void FreeSubStyles();
+	void SetIdentifiers(int style, const char *identifiers);
+	int DistanceToSecondaryStyles();
+	int SubStyleBases(char *styles);
+	std::string SubStyleBases();
+	int NamedStyles();
+	int NameOfStyle(int style, char *name);
+	std::string NameOfStyle(int style);
+	int TagsOfStyle(int style, char *tags);
+	std::string TagsOfStyle(int style);
+	int DescriptionOfStyle(int style, char *description);
+	std::string DescriptionOfStyle(int style);
+	void SetILexer(void *ilexer);
+	Scintilla::Bidirectional Bidirectional();
+	void SetBidirectional(Scintilla::Bidirectional bidirectional);
+
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
+
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/ScintillaMessages.h b/scite-app/scintilla/include/ScintillaMessages.h
new file mode 100644
index 0000000..9293a5a
--- /dev/null
+++ b/scite-app/scintilla/include/ScintillaMessages.h
@@ -0,0 +1,788 @@
+// Scintilla source code edit control
+/** @file ScintillaMessages.h
+ ** Enumerate the messages that can be sent to Scintilla.
+ **/
+// Copyright 1998-2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. ScintillaAPIFacer.py does the generation. */
+
+#ifndef SCINTILLAMESSAGES_H
+#define SCINTILLAMESSAGES_H
+
+namespace Scintilla {
+
+// Enumerations
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+enum class Message {
+	AddText = 2001,
+	AddStyledText = 2002,
+	InsertText = 2003,
+	ChangeInsertion = 2672,
+	ClearAll = 2004,
+	DeleteRange = 2645,
+	ClearDocumentStyle = 2005,
+	GetLength = 2006,
+	GetCharAt = 2007,
+	GetCurrentPos = 2008,
+	GetAnchor = 2009,
+	GetStyleAt = 2010,
+	Redo = 2011,
+	SetUndoCollection = 2012,
+	SelectAll = 2013,
+	SetSavePoint = 2014,
+	GetStyledText = 2015,
+	CanRedo = 2016,
+	MarkerLineFromHandle = 2017,
+	MarkerDeleteHandle = 2018,
+	MarkerHandleFromLine = 2732,
+	MarkerNumberFromLine = 2733,
+	GetUndoCollection = 2019,
+	GetViewWS = 2020,
+	SetViewWS = 2021,
+	GetTabDrawMode = 2698,
+	SetTabDrawMode = 2699,
+	PositionFromPoint = 2022,
+	PositionFromPointClose = 2023,
+	GotoLine = 2024,
+	GotoPos = 2025,
+	SetAnchor = 2026,
+	GetCurLine = 2027,
+	GetEndStyled = 2028,
+	ConvertEOLs = 2029,
+	GetEOLMode = 2030,
+	SetEOLMode = 2031,
+	StartStyling = 2032,
+	SetStyling = 2033,
+	GetBufferedDraw = 2034,
+	SetBufferedDraw = 2035,
+	SetTabWidth = 2036,
+	GetTabWidth = 2121,
+	SetTabMinimumWidth = 2724,
+	GetTabMinimumWidth = 2725,
+	ClearTabStops = 2675,
+	AddTabStop = 2676,
+	GetNextTabStop = 2677,
+	SetCodePage = 2037,
+	SetFontLocale = 2760,
+	GetFontLocale = 2761,
+	GetIMEInteraction = 2678,
+	SetIMEInteraction = 2679,
+	MarkerDefine = 2040,
+	MarkerSetFore = 2041,
+	MarkerSetBack = 2042,
+	MarkerSetBackSelected = 2292,
+	MarkerSetForeTranslucent = 2294,
+	MarkerSetBackTranslucent = 2295,
+	MarkerSetBackSelectedTranslucent = 2296,
+	MarkerSetStrokeWidth = 2297,
+	MarkerEnableHighlight = 2293,
+	MarkerAdd = 2043,
+	MarkerDelete = 2044,
+	MarkerDeleteAll = 2045,
+	MarkerGet = 2046,
+	MarkerNext = 2047,
+	MarkerPrevious = 2048,
+	MarkerDefinePixmap = 2049,
+	MarkerAddSet = 2466,
+	MarkerSetAlpha = 2476,
+	MarkerGetLayer = 2734,
+	MarkerSetLayer = 2735,
+	SetMarginTypeN = 2240,
+	GetMarginTypeN = 2241,
+	SetMarginWidthN = 2242,
+	GetMarginWidthN = 2243,
+	SetMarginMaskN = 2244,
+	GetMarginMaskN = 2245,
+	SetMarginSensitiveN = 2246,
+	GetMarginSensitiveN = 2247,
+	SetMarginCursorN = 2248,
+	GetMarginCursorN = 2249,
+	SetMarginBackN = 2250,
+	GetMarginBackN = 2251,
+	SetMargins = 2252,
+	GetMargins = 2253,
+	StyleClearAll = 2050,
+	StyleSetFore = 2051,
+	StyleSetBack = 2052,
+	StyleSetBold = 2053,
+	StyleSetItalic = 2054,
+	StyleSetSize = 2055,
+	StyleSetFont = 2056,
+	StyleSetEOLFilled = 2057,
+	StyleResetDefault = 2058,
+	StyleSetUnderline = 2059,
+	StyleGetFore = 2481,
+	StyleGetBack = 2482,
+	StyleGetBold = 2483,
+	StyleGetItalic = 2484,
+	StyleGetSize = 2485,
+	StyleGetFont = 2486,
+	StyleGetEOLFilled = 2487,
+	StyleGetUnderline = 2488,
+	StyleGetCase = 2489,
+	StyleGetCharacterSet = 2490,
+	StyleGetVisible = 2491,
+	StyleGetChangeable = 2492,
+	StyleGetHotSpot = 2493,
+	StyleSetCase = 2060,
+	StyleSetSizeFractional = 2061,
+	StyleGetSizeFractional = 2062,
+	StyleSetWeight = 2063,
+	StyleGetWeight = 2064,
+	StyleSetCharacterSet = 2066,
+	StyleSetHotSpot = 2409,
+	SetElementColour = 2753,
+	GetElementColour = 2754,
+	ResetElementColour = 2755,
+	GetElementIsSet = 2756,
+	GetElementAllowsTranslucent = 2757,
+	GetElementBaseColour = 2758,
+	SetSelFore = 2067,
+	SetSelBack = 2068,
+	GetSelAlpha = 2477,
+	SetSelAlpha = 2478,
+	GetSelEOLFilled = 2479,
+	SetSelEOLFilled = 2480,
+	GetSelectionLayer = 2762,
+	SetSelectionLayer = 2763,
+	GetCaretLineLayer = 2764,
+	SetCaretLineLayer = 2765,
+	SetCaretFore = 2069,
+	AssignCmdKey = 2070,
+	ClearCmdKey = 2071,
+	ClearAllCmdKeys = 2072,
+	SetStylingEx = 2073,
+	StyleSetVisible = 2074,
+	GetCaretPeriod = 2075,
+	SetCaretPeriod = 2076,
+	SetWordChars = 2077,
+	GetWordChars = 2646,
+	SetCharacterCategoryOptimization = 2720,
+	GetCharacterCategoryOptimization = 2721,
+	BeginUndoAction = 2078,
+	EndUndoAction = 2079,
+	IndicSetStyle = 2080,
+	IndicGetStyle = 2081,
+	IndicSetFore = 2082,
+	IndicGetFore = 2083,
+	IndicSetUnder = 2510,
+	IndicGetUnder = 2511,
+	IndicSetHoverStyle = 2680,
+	IndicGetHoverStyle = 2681,
+	IndicSetHoverFore = 2682,
+	IndicGetHoverFore = 2683,
+	IndicSetFlags = 2684,
+	IndicGetFlags = 2685,
+	IndicSetStrokeWidth = 2751,
+	IndicGetStrokeWidth = 2752,
+	SetWhitespaceFore = 2084,
+	SetWhitespaceBack = 2085,
+	SetWhitespaceSize = 2086,
+	GetWhitespaceSize = 2087,
+	SetLineState = 2092,
+	GetLineState = 2093,
+	GetMaxLineState = 2094,
+	GetCaretLineVisible = 2095,
+	SetCaretLineVisible = 2096,
+	GetCaretLineBack = 2097,
+	SetCaretLineBack = 2098,
+	GetCaretLineFrame = 2704,
+	SetCaretLineFrame = 2705,
+	StyleSetChangeable = 2099,
+	AutoCShow = 2100,
+	AutoCCancel = 2101,
+	AutoCActive = 2102,
+	AutoCPosStart = 2103,
+	AutoCComplete = 2104,
+	AutoCStops = 2105,
+	AutoCSetSeparator = 2106,
+	AutoCGetSeparator = 2107,
+	AutoCSelect = 2108,
+	AutoCSetCancelAtStart = 2110,
+	AutoCGetCancelAtStart = 2111,
+	AutoCSetFillUps = 2112,
+	AutoCSetChooseSingle = 2113,
+	AutoCGetChooseSingle = 2114,
+	AutoCSetIgnoreCase = 2115,
+	AutoCGetIgnoreCase = 2116,
+	UserListShow = 2117,
+	AutoCSetAutoHide = 2118,
+	AutoCGetAutoHide = 2119,
+	AutoCSetOptions = 2638,
+	AutoCGetOptions = 2639,
+	AutoCSetDropRestOfWord = 2270,
+	AutoCGetDropRestOfWord = 2271,
+	RegisterImage = 2405,
+	ClearRegisteredImages = 2408,
+	AutoCGetTypeSeparator = 2285,
+	AutoCSetTypeSeparator = 2286,
+	AutoCSetMaxWidth = 2208,
+	AutoCGetMaxWidth = 2209,
+	AutoCSetMaxHeight = 2210,
+	AutoCGetMaxHeight = 2211,
+	SetIndent = 2122,
+	GetIndent = 2123,
+	SetUseTabs = 2124,
+	GetUseTabs = 2125,
+	SetLineIndentation = 2126,
+	GetLineIndentation = 2127,
+	GetLineIndentPosition = 2128,
+	GetColumn = 2129,
+	CountCharacters = 2633,
+	CountCodeUnits = 2715,
+	SetHScrollBar = 2130,
+	GetHScrollBar = 2131,
+	SetIndentationGuides = 2132,
+	GetIndentationGuides = 2133,
+	SetHighlightGuide = 2134,
+	GetHighlightGuide = 2135,
+	GetLineEndPosition = 2136,
+	GetCodePage = 2137,
+	GetCaretFore = 2138,
+	GetReadOnly = 2140,
+	SetCurrentPos = 2141,
+	SetSelectionStart = 2142,
+	GetSelectionStart = 2143,
+	SetSelectionEnd = 2144,
+	GetSelectionEnd = 2145,
+	SetEmptySelection = 2556,
+	SetPrintMagnification = 2146,
+	GetPrintMagnification = 2147,
+	SetPrintColourMode = 2148,
+	GetPrintColourMode = 2149,
+	FindText = 2150,
+	FormatRange = 2151,
+	GetFirstVisibleLine = 2152,
+	GetLine = 2153,
+	GetLineCount = 2154,
+	AllocateLines = 2089,
+	SetMarginLeft = 2155,
+	GetMarginLeft = 2156,
+	SetMarginRight = 2157,
+	GetMarginRight = 2158,
+	GetModify = 2159,
+	SetSel = 2160,
+	GetSelText = 2161,
+	GetTextRange = 2162,
+	HideSelection = 2163,
+	PointXFromPosition = 2164,
+	PointYFromPosition = 2165,
+	LineFromPosition = 2166,
+	PositionFromLine = 2167,
+	LineScroll = 2168,
+	ScrollCaret = 2169,
+	ScrollRange = 2569,
+	ReplaceSel = 2170,
+	SetReadOnly = 2171,
+	Null = 2172,
+	CanPaste = 2173,
+	CanUndo = 2174,
+	EmptyUndoBuffer = 2175,
+	Undo = 2176,
+	Cut = 2177,
+	Copy = 2178,
+	Paste = 2179,
+	Clear = 2180,
+	SetText = 2181,
+	GetText = 2182,
+	GetTextLength = 2183,
+	GetDirectFunction = 2184,
+	GetDirectStatusFunction = 2772,
+	GetDirectPointer = 2185,
+	SetOvertype = 2186,
+	GetOvertype = 2187,
+	SetCaretWidth = 2188,
+	GetCaretWidth = 2189,
+	SetTargetStart = 2190,
+	GetTargetStart = 2191,
+	SetTargetStartVirtualSpace = 2728,
+	GetTargetStartVirtualSpace = 2729,
+	SetTargetEnd = 2192,
+	GetTargetEnd = 2193,
+	SetTargetEndVirtualSpace = 2730,
+	GetTargetEndVirtualSpace = 2731,
+	SetTargetRange = 2686,
+	GetTargetText = 2687,
+	TargetFromSelection = 2287,
+	TargetWholeDocument = 2690,
+	ReplaceTarget = 2194,
+	ReplaceTargetRE = 2195,
+	SearchInTarget = 2197,
+	SetSearchFlags = 2198,
+	GetSearchFlags = 2199,
+	CallTipShow = 2200,
+	CallTipCancel = 2201,
+	CallTipActive = 2202,
+	CallTipPosStart = 2203,
+	CallTipSetPosStart = 2214,
+	CallTipSetHlt = 2204,
+	CallTipSetBack = 2205,
+	CallTipSetFore = 2206,
+	CallTipSetForeHlt = 2207,
+	CallTipUseStyle = 2212,
+	CallTipSetPosition = 2213,
+	VisibleFromDocLine = 2220,
+	DocLineFromVisible = 2221,
+	WrapCount = 2235,
+	SetFoldLevel = 2222,
+	GetFoldLevel = 2223,
+	GetLastChild = 2224,
+	GetFoldParent = 2225,
+	ShowLines = 2226,
+	HideLines = 2227,
+	GetLineVisible = 2228,
+	GetAllLinesVisible = 2236,
+	SetFoldExpanded = 2229,
+	GetFoldExpanded = 2230,
+	ToggleFold = 2231,
+	ToggleFoldShowText = 2700,
+	FoldDisplayTextSetStyle = 2701,
+	FoldDisplayTextGetStyle = 2707,
+	SetDefaultFoldDisplayText = 2722,
+	GetDefaultFoldDisplayText = 2723,
+	FoldLine = 2237,
+	FoldChildren = 2238,
+	ExpandChildren = 2239,
+	FoldAll = 2662,
+	EnsureVisible = 2232,
+	SetAutomaticFold = 2663,
+	GetAutomaticFold = 2664,
+	SetFoldFlags = 2233,
+	EnsureVisibleEnforcePolicy = 2234,
+	SetTabIndents = 2260,
+	GetTabIndents = 2261,
+	SetBackSpaceUnIndents = 2262,
+	GetBackSpaceUnIndents = 2263,
+	SetMouseDwellTime = 2264,
+	GetMouseDwellTime = 2265,
+	WordStartPosition = 2266,
+	WordEndPosition = 2267,
+	IsRangeWord = 2691,
+	SetIdleStyling = 2692,
+	GetIdleStyling = 2693,
+	SetWrapMode = 2268,
+	GetWrapMode = 2269,
+	SetWrapVisualFlags = 2460,
+	GetWrapVisualFlags = 2461,
+	SetWrapVisualFlagsLocation = 2462,
+	GetWrapVisualFlagsLocation = 2463,
+	SetWrapStartIndent = 2464,
+	GetWrapStartIndent = 2465,
+	SetWrapIndentMode = 2472,
+	GetWrapIndentMode = 2473,
+	SetLayoutCache = 2272,
+	GetLayoutCache = 2273,
+	SetScrollWidth = 2274,
+	GetScrollWidth = 2275,
+	SetScrollWidthTracking = 2516,
+	GetScrollWidthTracking = 2517,
+	TextWidth = 2276,
+	SetEndAtLastLine = 2277,
+	GetEndAtLastLine = 2278,
+	TextHeight = 2279,
+	SetVScrollBar = 2280,
+	GetVScrollBar = 2281,
+	AppendText = 2282,
+	GetPhasesDraw = 2673,
+	SetPhasesDraw = 2674,
+	SetFontQuality = 2611,
+	GetFontQuality = 2612,
+	SetFirstVisibleLine = 2613,
+	SetMultiPaste = 2614,
+	GetMultiPaste = 2615,
+	GetTag = 2616,
+	LinesJoin = 2288,
+	LinesSplit = 2289,
+	SetFoldMarginColour = 2290,
+	SetFoldMarginHiColour = 2291,
+	SetAccessibility = 2702,
+	GetAccessibility = 2703,
+	LineDown = 2300,
+	LineDownExtend = 2301,
+	LineUp = 2302,
+	LineUpExtend = 2303,
+	CharLeft = 2304,
+	CharLeftExtend = 2305,
+	CharRight = 2306,
+	CharRightExtend = 2307,
+	WordLeft = 2308,
+	WordLeftExtend = 2309,
+	WordRight = 2310,
+	WordRightExtend = 2311,
+	Home = 2312,
+	HomeExtend = 2313,
+	LineEnd = 2314,
+	LineEndExtend = 2315,
+	DocumentStart = 2316,
+	DocumentStartExtend = 2317,
+	DocumentEnd = 2318,
+	DocumentEndExtend = 2319,
+	PageUp = 2320,
+	PageUpExtend = 2321,
+	PageDown = 2322,
+	PageDownExtend = 2323,
+	EditToggleOvertype = 2324,
+	Cancel = 2325,
+	DeleteBack = 2326,
+	Tab = 2327,
+	BackTab = 2328,
+	NewLine = 2329,
+	FormFeed = 2330,
+	VCHome = 2331,
+	VCHomeExtend = 2332,
+	ZoomIn = 2333,
+	ZoomOut = 2334,
+	DelWordLeft = 2335,
+	DelWordRight = 2336,
+	DelWordRightEnd = 2518,
+	LineCut = 2337,
+	LineDelete = 2338,
+	LineTranspose = 2339,
+	LineReverse = 2354,
+	LineDuplicate = 2404,
+	LowerCase = 2340,
+	UpperCase = 2341,
+	LineScrollDown = 2342,
+	LineScrollUp = 2343,
+	DeleteBackNotLine = 2344,
+	HomeDisplay = 2345,
+	HomeDisplayExtend = 2346,
+	LineEndDisplay = 2347,
+	LineEndDisplayExtend = 2348,
+	HomeWrap = 2349,
+	HomeWrapExtend = 2450,
+	LineEndWrap = 2451,
+	LineEndWrapExtend = 2452,
+	VCHomeWrap = 2453,
+	VCHomeWrapExtend = 2454,
+	LineCopy = 2455,
+	MoveCaretInsideView = 2401,
+	LineLength = 2350,
+	BraceHighlight = 2351,
+	BraceHighlightIndicator = 2498,
+	BraceBadLight = 2352,
+	BraceBadLightIndicator = 2499,
+	BraceMatch = 2353,
+	BraceMatchNext = 2369,
+	GetViewEOL = 2355,
+	SetViewEOL = 2356,
+	GetDocPointer = 2357,
+	SetDocPointer = 2358,
+	SetModEventMask = 2359,
+	GetEdgeColumn = 2360,
+	SetEdgeColumn = 2361,
+	GetEdgeMode = 2362,
+	SetEdgeMode = 2363,
+	GetEdgeColour = 2364,
+	SetEdgeColour = 2365,
+	MultiEdgeAddLine = 2694,
+	MultiEdgeClearAll = 2695,
+	GetMultiEdgeColumn = 2749,
+	SearchAnchor = 2366,
+	SearchNext = 2367,
+	SearchPrev = 2368,
+	LinesOnScreen = 2370,
+	UsePopUp = 2371,
+	SelectionIsRectangle = 2372,
+	SetZoom = 2373,
+	GetZoom = 2374,
+	CreateDocument = 2375,
+	AddRefDocument = 2376,
+	ReleaseDocument = 2377,
+	GetDocumentOptions = 2379,
+	GetModEventMask = 2378,
+	SetCommandEvents = 2717,
+	GetCommandEvents = 2718,
+	SetFocus = 2380,
+	GetFocus = 2381,
+	SetStatus = 2382,
+	GetStatus = 2383,
+	SetMouseDownCaptures = 2384,
+	GetMouseDownCaptures = 2385,
+	SetMouseWheelCaptures = 2696,
+	GetMouseWheelCaptures = 2697,
+	SetCursor = 2386,
+	GetCursor = 2387,
+	SetControlCharSymbol = 2388,
+	GetControlCharSymbol = 2389,
+	WordPartLeft = 2390,
+	WordPartLeftExtend = 2391,
+	WordPartRight = 2392,
+	WordPartRightExtend = 2393,
+	SetVisiblePolicy = 2394,
+	DelLineLeft = 2395,
+	DelLineRight = 2396,
+	SetXOffset = 2397,
+	GetXOffset = 2398,
+	ChooseCaretX = 2399,
+	GrabFocus = 2400,
+	SetXCaretPolicy = 2402,
+	SetYCaretPolicy = 2403,
+	SetPrintWrapMode = 2406,
+	GetPrintWrapMode = 2407,
+	SetHotspotActiveFore = 2410,
+	GetHotspotActiveFore = 2494,
+	SetHotspotActiveBack = 2411,
+	GetHotspotActiveBack = 2495,
+	SetHotspotActiveUnderline = 2412,
+	GetHotspotActiveUnderline = 2496,
+	SetHotspotSingleLine = 2421,
+	GetHotspotSingleLine = 2497,
+	ParaDown = 2413,
+	ParaDownExtend = 2414,
+	ParaUp = 2415,
+	ParaUpExtend = 2416,
+	PositionBefore = 2417,
+	PositionAfter = 2418,
+	PositionRelative = 2670,
+	PositionRelativeCodeUnits = 2716,
+	CopyRange = 2419,
+	CopyText = 2420,
+	SetSelectionMode = 2422,
+	GetSelectionMode = 2423,
+	GetMoveExtendsSelection = 2706,
+	GetLineSelStartPosition = 2424,
+	GetLineSelEndPosition = 2425,
+	LineDownRectExtend = 2426,
+	LineUpRectExtend = 2427,
+	CharLeftRectExtend = 2428,
+	CharRightRectExtend = 2429,
+	HomeRectExtend = 2430,
+	VCHomeRectExtend = 2431,
+	LineEndRectExtend = 2432,
+	PageUpRectExtend = 2433,
+	PageDownRectExtend = 2434,
+	StutteredPageUp = 2435,
+	StutteredPageUpExtend = 2436,
+	StutteredPageDown = 2437,
+	StutteredPageDownExtend = 2438,
+	WordLeftEnd = 2439,
+	WordLeftEndExtend = 2440,
+	WordRightEnd = 2441,
+	WordRightEndExtend = 2442,
+	SetWhitespaceChars = 2443,
+	GetWhitespaceChars = 2647,
+	SetPunctuationChars = 2648,
+	GetPunctuationChars = 2649,
+	SetCharsDefault = 2444,
+	AutoCGetCurrent = 2445,
+	AutoCGetCurrentText = 2610,
+	AutoCSetCaseInsensitiveBehaviour = 2634,
+	AutoCGetCaseInsensitiveBehaviour = 2635,
+	AutoCSetMulti = 2636,
+	AutoCGetMulti = 2637,
+	AutoCSetOrder = 2660,
+	AutoCGetOrder = 2661,
+	Allocate = 2446,
+	TargetAsUTF8 = 2447,
+	SetLengthForEncode = 2448,
+	EncodedFromUTF8 = 2449,
+	FindColumn = 2456,
+	GetCaretSticky = 2457,
+	SetCaretSticky = 2458,
+	ToggleCaretSticky = 2459,
+	SetPasteConvertEndings = 2467,
+	GetPasteConvertEndings = 2468,
+	ReplaceRectangular = 2771,
+	SelectionDuplicate = 2469,
+	SetCaretLineBackAlpha = 2470,
+	GetCaretLineBackAlpha = 2471,
+	SetCaretStyle = 2512,
+	GetCaretStyle = 2513,
+	SetIndicatorCurrent = 2500,
+	GetIndicatorCurrent = 2501,
+	SetIndicatorValue = 2502,
+	GetIndicatorValue = 2503,
+	IndicatorFillRange = 2504,
+	IndicatorClearRange = 2505,
+	IndicatorAllOnFor = 2506,
+	IndicatorValueAt = 2507,
+	IndicatorStart = 2508,
+	IndicatorEnd = 2509,
+	SetPositionCache = 2514,
+	GetPositionCache = 2515,
+	CopyAllowLine = 2519,
+	GetCharacterPointer = 2520,
+	GetRangePointer = 2643,
+	GetGapPosition = 2644,
+	IndicSetAlpha = 2523,
+	IndicGetAlpha = 2524,
+	IndicSetOutlineAlpha = 2558,
+	IndicGetOutlineAlpha = 2559,
+	SetExtraAscent = 2525,
+	GetExtraAscent = 2526,
+	SetExtraDescent = 2527,
+	GetExtraDescent = 2528,
+	MarkerSymbolDefined = 2529,
+	MarginSetText = 2530,
+	MarginGetText = 2531,
+	MarginSetStyle = 2532,
+	MarginGetStyle = 2533,
+	MarginSetStyles = 2534,
+	MarginGetStyles = 2535,
+	MarginTextClearAll = 2536,
+	MarginSetStyleOffset = 2537,
+	MarginGetStyleOffset = 2538,
+	SetMarginOptions = 2539,
+	GetMarginOptions = 2557,
+	AnnotationSetText = 2540,
+	AnnotationGetText = 2541,
+	AnnotationSetStyle = 2542,
+	AnnotationGetStyle = 2543,
+	AnnotationSetStyles = 2544,
+	AnnotationGetStyles = 2545,
+	AnnotationGetLines = 2546,
+	AnnotationClearAll = 2547,
+	AnnotationSetVisible = 2548,
+	AnnotationGetVisible = 2549,
+	AnnotationSetStyleOffset = 2550,
+	AnnotationGetStyleOffset = 2551,
+	ReleaseAllExtendedStyles = 2552,
+	AllocateExtendedStyles = 2553,
+	AddUndoAction = 2560,
+	CharPositionFromPoint = 2561,
+	CharPositionFromPointClose = 2562,
+	SetMouseSelectionRectangularSwitch = 2668,
+	GetMouseSelectionRectangularSwitch = 2669,
+	SetMultipleSelection = 2563,
+	GetMultipleSelection = 2564,
+	SetAdditionalSelectionTyping = 2565,
+	GetAdditionalSelectionTyping = 2566,
+	SetAdditionalCaretsBlink = 2567,
+	GetAdditionalCaretsBlink = 2568,
+	SetAdditionalCaretsVisible = 2608,
+	GetAdditionalCaretsVisible = 2609,
+	GetSelections = 2570,
+	GetSelectionEmpty = 2650,
+	ClearSelections = 2571,
+	SetSelection = 2572,
+	AddSelection = 2573,
+	DropSelectionN = 2671,
+	SetMainSelection = 2574,
+	GetMainSelection = 2575,
+	SetSelectionNCaret = 2576,
+	GetSelectionNCaret = 2577,
+	SetSelectionNAnchor = 2578,
+	GetSelectionNAnchor = 2579,
+	SetSelectionNCaretVirtualSpace = 2580,
+	GetSelectionNCaretVirtualSpace = 2581,
+	SetSelectionNAnchorVirtualSpace = 2582,
+	GetSelectionNAnchorVirtualSpace = 2583,
+	SetSelectionNStart = 2584,
+	GetSelectionNStart = 2585,
+	GetSelectionNStartVirtualSpace = 2726,
+	SetSelectionNEnd = 2586,
+	GetSelectionNEndVirtualSpace = 2727,
+	GetSelectionNEnd = 2587,
+	SetRectangularSelectionCaret = 2588,
+	GetRectangularSelectionCaret = 2589,
+	SetRectangularSelectionAnchor = 2590,
+	GetRectangularSelectionAnchor = 2591,
+	SetRectangularSelectionCaretVirtualSpace = 2592,
+	GetRectangularSelectionCaretVirtualSpace = 2593,
+	SetRectangularSelectionAnchorVirtualSpace = 2594,
+	GetRectangularSelectionAnchorVirtualSpace = 2595,
+	SetVirtualSpaceOptions = 2596,
+	GetVirtualSpaceOptions = 2597,
+	SetRectangularSelectionModifier = 2598,
+	GetRectangularSelectionModifier = 2599,
+	SetAdditionalSelFore = 2600,
+	SetAdditionalSelBack = 2601,
+	SetAdditionalSelAlpha = 2602,
+	GetAdditionalSelAlpha = 2603,
+	SetAdditionalCaretFore = 2604,
+	GetAdditionalCaretFore = 2605,
+	RotateSelection = 2606,
+	SwapMainAnchorCaret = 2607,
+	MultipleSelectAddNext = 2688,
+	MultipleSelectAddEach = 2689,
+	ChangeLexerState = 2617,
+	ContractedFoldNext = 2618,
+	VerticalCentreCaret = 2619,
+	MoveSelectedLinesUp = 2620,
+	MoveSelectedLinesDown = 2621,
+	SetIdentifier = 2622,
+	GetIdentifier = 2623,
+	RGBAImageSetWidth = 2624,
+	RGBAImageSetHeight = 2625,
+	RGBAImageSetScale = 2651,
+	MarkerDefineRGBAImage = 2626,
+	RegisterRGBAImage = 2627,
+	ScrollToStart = 2628,
+	ScrollToEnd = 2629,
+	SetTechnology = 2630,
+	GetTechnology = 2631,
+	CreateLoader = 2632,
+	FindIndicatorShow = 2640,
+	FindIndicatorFlash = 2641,
+	FindIndicatorHide = 2642,
+	VCHomeDisplay = 2652,
+	VCHomeDisplayExtend = 2653,
+	GetCaretLineVisibleAlways = 2654,
+	SetCaretLineVisibleAlways = 2655,
+	SetLineEndTypesAllowed = 2656,
+	GetLineEndTypesAllowed = 2657,
+	GetLineEndTypesActive = 2658,
+	SetRepresentation = 2665,
+	GetRepresentation = 2666,
+	ClearRepresentation = 2667,
+	ClearAllRepresentations = 2770,
+	SetRepresentationAppearance = 2766,
+	GetRepresentationAppearance = 2767,
+	SetRepresentationColour = 2768,
+	GetRepresentationColour = 2769,
+	EOLAnnotationSetText = 2740,
+	EOLAnnotationGetText = 2741,
+	EOLAnnotationSetStyle = 2742,
+	EOLAnnotationGetStyle = 2743,
+	EOLAnnotationClearAll = 2744,
+	EOLAnnotationSetVisible = 2745,
+	EOLAnnotationGetVisible = 2746,
+	EOLAnnotationSetStyleOffset = 2747,
+	EOLAnnotationGetStyleOffset = 2748,
+	SupportsFeature = 2750,
+	GetLineCharacterIndex = 2710,
+	AllocateLineCharacterIndex = 2711,
+	ReleaseLineCharacterIndex = 2712,
+	LineFromIndexPosition = 2713,
+	IndexPositionFromLine = 2714,
+	StartRecord = 3001,
+	StopRecord = 3002,
+	GetLexer = 4002,
+	Colourise = 4003,
+	SetProperty = 4004,
+	SetKeyWords = 4005,
+	GetProperty = 4008,
+	GetPropertyExpanded = 4009,
+	GetPropertyInt = 4010,
+	GetLexerLanguage = 4012,
+	PrivateLexerCall = 4013,
+	PropertyNames = 4014,
+	PropertyType = 4015,
+	DescribeProperty = 4016,
+	DescribeKeyWordSets = 4017,
+	GetLineEndTypesSupported = 4018,
+	AllocateSubStyles = 4020,
+	GetSubStylesStart = 4021,
+	GetSubStylesLength = 4022,
+	GetStyleFromSubStyle = 4027,
+	GetPrimaryStyleFromStyle = 4028,
+	FreeSubStyles = 4023,
+	SetIdentifiers = 4024,
+	DistanceToSecondaryStyles = 4025,
+	GetSubStyleBases = 4026,
+	GetNamedStyles = 4029,
+	NameOfStyle = 4030,
+	TagsOfStyle = 4031,
+	DescriptionOfStyle = 4032,
+	SetILexer = 4033,
+	GetBidirectional = 2708,
+	SetBidirectional = 2709,
+};
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/ScintillaStructures.h b/scite-app/scintilla/include/ScintillaStructures.h
new file mode 100644
index 0000000..6bd16e8
--- /dev/null
+++ b/scite-app/scintilla/include/ScintillaStructures.h
@@ -0,0 +1,103 @@
+// Scintilla source code edit control
+/** @file ScintillaStructures.h
+ ** Structures used to communicate with Scintilla.
+ ** The same structures are defined for C in Scintilla.h.
+ ** Uses definitions from ScintillaTypes.h.
+ **/
+// Copyright 2021 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLASTRUCTURES_H
+#define SCINTILLASTRUCTURES_H
+
+namespace Scintilla {
+
+using PositionCR = long;
+
+struct CharacterRange {
+	PositionCR cpMin;
+	PositionCR cpMax;
+};
+
+struct TextRange {
+	CharacterRange chrg;
+	char *lpstrText;
+};
+
+struct TextToFind {
+	CharacterRange chrg;
+	const char *lpstrText;
+	CharacterRange chrgText;
+};
+
+using SurfaceID = void *;
+
+struct Rectangle {
+	int left;
+	int top;
+	int right;
+	int bottom;
+};
+
+/* This structure is used in printing. Not needed by most client code. */
+
+struct RangeToFormat {
+	SurfaceID hdc;
+	SurfaceID hdcTarget;
+	Rectangle rc;
+	Rectangle rcPage;
+	CharacterRange chrg;
+};
+
+struct NotifyHeader {
+	/* Compatible with Windows NMHDR.
+	 * hwndFrom is really an environment specific window handle or pointer
+	 * but most clients of Scintilla.h do not have this type visible. */
+	void *hwndFrom;
+	uptr_t idFrom;
+	Notification code;
+};
+
+struct NotificationData {
+	NotifyHeader nmhdr;
+	Position position;
+	/* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */
+	/* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */
+	/* SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, SCN_HOTSPOTRELEASECLICK, */
+	/* SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+	/* SCN_USERLISTSELECTION, SCN_AUTOCSELECTION */
+
+	int ch;
+	/* SCN_CHARADDED, SCN_KEY, SCN_AUTOCCOMPLETED, SCN_AUTOCSELECTION, */
+	/* SCN_USERLISTSELECTION */
+	KeyMod modifiers;
+	/* SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, */
+	/* SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE, */
+
+	ModificationFlags modificationType;	/* SCN_MODIFIED */
+	const char *text;
+	/* SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED */
+
+	Position length;		/* SCN_MODIFIED */
+	Position linesAdded;	/* SCN_MODIFIED */
+	Message message;	/* SCN_MACRORECORD */
+	uptr_t wParam;	/* SCN_MACRORECORD */
+	sptr_t lParam;	/* SCN_MACRORECORD */
+	Position line;		/* SCN_MODIFIED */
+	FoldLevel foldLevelNow;	/* SCN_MODIFIED */
+	FoldLevel foldLevelPrev;	/* SCN_MODIFIED */
+	int margin;		/* SCN_MARGINCLICK */
+	int listType;	/* SCN_USERLISTSELECTION */
+	int x;			/* SCN_DWELLSTART, SCN_DWELLEND */
+	int y;		/* SCN_DWELLSTART, SCN_DWELLEND */
+	int token;		/* SCN_MODIFIED with SC_MOD_CONTAINER */
+	Position annotationLinesAdded;	/* SCN_MODIFIED with SC_MOD_CHANGEANNOTATION */
+	Update updated;	/* SCN_UPDATEUI */
+	CompletionMethods listCompletionMethod;
+	/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */
+	CharacterSource characterSource;	/* SCN_CHARADDED */
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/ScintillaTypes.h b/scite-app/scintilla/include/ScintillaTypes.h
new file mode 100644
index 0000000..830ccad
--- /dev/null
+++ b/scite-app/scintilla/include/ScintillaTypes.h
@@ -0,0 +1,803 @@
+// Scintilla source code edit control
+/** @file ScintillaTypes.h
+ ** Types used to communicate with Scintilla.
+ **/
+// Copyright 1998-2019 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/* Most of this file is automatically generated from the Scintilla.iface interface definition
+ * file which contains any comments about the definitions. ScintillaAPIFacer.py does the generation. */
+
+#ifndef SCINTILLATYPES_H
+#define SCINTILLATYPES_H
+
+namespace Scintilla {
+
+// Enumerations
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+
+enum class WhiteSpace {
+	Invisible = 0,
+	VisibleAlways = 1,
+	VisibleAfterIndent = 2,
+	VisibleOnlyInIndent = 3,
+};
+
+enum class TabDrawMode {
+	LongArrow = 0,
+	StrikeOut = 1,
+};
+
+enum class EndOfLine {
+	CrLf = 0,
+	Cr = 1,
+	Lf = 2,
+};
+
+enum class IMEInteraction {
+	Windowed = 0,
+	Inline = 1,
+};
+
+enum class Alpha {
+	Transparent = 0,
+	Opaque = 255,
+	NoAlpha = 256,
+};
+
+enum class CursorShape {
+	Normal = -1,
+	Arrow = 2,
+	Wait = 4,
+	ReverseArrow = 7,
+};
+
+enum class MarkerSymbol {
+	Circle = 0,
+	RoundRect = 1,
+	Arrow = 2,
+	SmallRect = 3,
+	ShortArrow = 4,
+	Empty = 5,
+	ArrowDown = 6,
+	Minus = 7,
+	Plus = 8,
+	VLine = 9,
+	LCorner = 10,
+	TCorner = 11,
+	BoxPlus = 12,
+	BoxPlusConnected = 13,
+	BoxMinus = 14,
+	BoxMinusConnected = 15,
+	LCornerCurve = 16,
+	TCornerCurve = 17,
+	CirclePlus = 18,
+	CirclePlusConnected = 19,
+	CircleMinus = 20,
+	CircleMinusConnected = 21,
+	Background = 22,
+	DotDotDot = 23,
+	Arrows = 24,
+	Pixmap = 25,
+	FullRect = 26,
+	LeftRect = 27,
+	Available = 28,
+	Underline = 29,
+	RgbaImage = 30,
+	Bookmark = 31,
+	VerticalBookmark = 32,
+	Character = 10000,
+};
+
+enum class MarkerOutline {
+	FolderEnd = 25,
+	FolderOpenMid = 26,
+	FolderMidTail = 27,
+	FolderTail = 28,
+	FolderSub = 29,
+	Folder = 30,
+	FolderOpen = 31,
+};
+
+enum class MarginType {
+	Symbol = 0,
+	Number = 1,
+	Back = 2,
+	Fore = 3,
+	Text = 4,
+	RText = 5,
+	Colour = 6,
+};
+
+enum class StylesCommon {
+	Default = 32,
+	LineNumber = 33,
+	BraceLight = 34,
+	BraceBad = 35,
+	ControlChar = 36,
+	IndentGuide = 37,
+	CallTip = 38,
+	FoldDisplayText = 39,
+	LastPredefined = 39,
+	Max = 255,
+};
+
+enum class CharacterSet {
+	Ansi = 0,
+	Default = 1,
+	Baltic = 186,
+	ChineseBig5 = 136,
+	EastEurope = 238,
+	GB2312 = 134,
+	Greek = 161,
+	Hangul = 129,
+	Mac = 77,
+	Oem = 255,
+	Russian = 204,
+	Oem866 = 866,
+	Cyrillic = 1251,
+	ShiftJis = 128,
+	Symbol = 2,
+	Turkish = 162,
+	Johab = 130,
+	Hebrew = 177,
+	Arabic = 178,
+	Vietnamese = 163,
+	Thai = 222,
+	Iso8859_15 = 1000,
+};
+
+enum class CaseVisible {
+	Mixed = 0,
+	Upper = 1,
+	Lower = 2,
+	Camel = 3,
+};
+
+enum class FontWeight {
+	Normal = 400,
+	SemiBold = 600,
+	Bold = 700,
+};
+
+enum class Element {
+	List = 0,
+	ListBack = 1,
+	ListSelected = 2,
+	ListSelectedBack = 3,
+	SelectionText = 10,
+	SelectionBack = 11,
+	SelectionAdditionalText = 12,
+	SelectionAdditionalBack = 13,
+	SelectionSecondaryText = 14,
+	SelectionSecondaryBack = 15,
+	SelectionInactiveText = 16,
+	SelectionInactiveBack = 17,
+	Caret = 40,
+	CaretAdditional = 41,
+	CaretLineBack = 50,
+	WhiteSpace = 60,
+	WhiteSpaceBack = 61,
+	HotSpotActive = 70,
+	HotSpotActiveBack = 71,
+};
+
+enum class Layer {
+	Base = 0,
+	UnderText = 1,
+	OverText = 2,
+};
+
+enum class IndicatorStyle {
+	Plain = 0,
+	Squiggle = 1,
+	TT = 2,
+	Diagonal = 3,
+	Strike = 4,
+	Hidden = 5,
+	Box = 6,
+	RoundBox = 7,
+	StraightBox = 8,
+	Dash = 9,
+	Dots = 10,
+	SquiggleLow = 11,
+	DotBox = 12,
+	SquigglePixmap = 13,
+	CompositionThick = 14,
+	CompositionThin = 15,
+	FullBox = 16,
+	TextFore = 17,
+	Point = 18,
+	PointCharacter = 19,
+	Gradient = 20,
+	GradientCentre = 21,
+};
+
+enum class IndicatorNumbers {
+	Container = 8,
+	Ime = 32,
+	ImeMax = 35,
+	Max = 35,
+};
+
+enum class IndicValue {
+	Bit = 0x1000000,
+	Mask = 0xFFFFFF,
+};
+
+enum class IndicFlag {
+	None = 0,
+	ValueFore = 1,
+};
+
+enum class AutoCompleteOption {
+	Normal = 0,
+	FixedSize = 1,
+};
+
+enum class IndentView {
+	None = 0,
+	Real = 1,
+	LookForward = 2,
+	LookBoth = 3,
+};
+
+enum class PrintOption {
+	Normal = 0,
+	InvertLight = 1,
+	BlackOnWhite = 2,
+	ColourOnWhite = 3,
+	ColourOnWhiteDefaultBG = 4,
+	ScreenColours = 5,
+};
+
+enum class FindOption {
+	None = 0x0,
+	WholeWord = 0x2,
+	MatchCase = 0x4,
+	WordStart = 0x00100000,
+	RegExp = 0x00200000,
+	Posix = 0x00400000,
+	Cxx11RegEx = 0x00800000,
+};
+
+enum class FoldLevel {
+	None = 0x0,
+	Base = 0x400,
+	WhiteFlag = 0x1000,
+	HeaderFlag = 0x2000,
+	NumberMask = 0x0FFF,
+};
+
+enum class FoldDisplayTextStyle {
+	Hidden = 0,
+	Standard = 1,
+	Boxed = 2,
+};
+
+enum class FoldAction {
+	Contract = 0,
+	Expand = 1,
+	Toggle = 2,
+};
+
+enum class AutomaticFold {
+	None = 0x0000,
+	Show = 0x0001,
+	Click = 0x0002,
+	Change = 0x0004,
+};
+
+enum class FoldFlag {
+	None = 0x0000,
+	LineBeforeExpanded = 0x0002,
+	LineBeforeContracted = 0x0004,
+	LineAfterExpanded = 0x0008,
+	LineAfterContracted = 0x0010,
+	LevelNumbers = 0x0040,
+	LineState = 0x0080,
+};
+
+enum class IdleStyling {
+	None = 0,
+	ToVisible = 1,
+	AfterVisible = 2,
+	All = 3,
+};
+
+enum class Wrap {
+	None = 0,
+	Word = 1,
+	Char = 2,
+	WhiteSpace = 3,
+};
+
+enum class WrapVisualFlag {
+	None = 0x0000,
+	End = 0x0001,
+	Start = 0x0002,
+	Margin = 0x0004,
+};
+
+enum class WrapVisualLocation {
+	Default = 0x0000,
+	EndByText = 0x0001,
+	StartByText = 0x0002,
+};
+
+enum class WrapIndentMode {
+	Fixed = 0,
+	Same = 1,
+	Indent = 2,
+	DeepIndent = 3,
+};
+
+enum class LineCache {
+	None = 0,
+	Caret = 1,
+	Page = 2,
+	Document = 3,
+};
+
+enum class PhasesDraw {
+	One = 0,
+	Two = 1,
+	Multiple = 2,
+};
+
+enum class FontQuality {
+	QualityMask = 0xF,
+	QualityDefault = 0,
+	QualityNonAntialiased = 1,
+	QualityAntialiased = 2,
+	QualityLcdOptimized = 3,
+};
+
+enum class MultiPaste {
+	Once = 0,
+	Each = 1,
+};
+
+enum class Accessibility {
+	Disabled = 0,
+	Enabled = 1,
+};
+
+enum class EdgeVisualStyle {
+	None = 0,
+	Line = 1,
+	Background = 2,
+	MultiLine = 3,
+};
+
+enum class PopUp {
+	Never = 0,
+	All = 1,
+	Text = 2,
+};
+
+enum class DocumentOption {
+	Default = 0,
+	StylesNone = 0x1,
+	TextLarge = 0x100,
+};
+
+enum class Status {
+	Ok = 0,
+	Failure = 1,
+	BadAlloc = 2,
+	WarnStart = 1000,
+	RegEx = 1001,
+};
+
+enum class VisiblePolicy {
+	Slop = 0x01,
+	Strict = 0x04,
+};
+
+enum class CaretPolicy {
+	Slop = 0x01,
+	Strict = 0x04,
+	Jumps = 0x10,
+	Even = 0x08,
+};
+
+enum class SelectionMode {
+	Stream = 0,
+	Rectangle = 1,
+	Lines = 2,
+	Thin = 3,
+};
+
+enum class CaseInsensitiveBehaviour {
+	RespectCase = 0,
+	IgnoreCase = 1,
+};
+
+enum class MultiAutoComplete {
+	Once = 0,
+	Each = 1,
+};
+
+enum class Ordering {
+	PreSorted = 0,
+	PerformSort = 1,
+	Custom = 2,
+};
+
+enum class CaretSticky {
+	Off = 0,
+	On = 1,
+	WhiteSpace = 2,
+};
+
+enum class CaretStyle {
+	Invisible = 0,
+	Line = 1,
+	Block = 2,
+	OverstrikeBar = 0,
+	OverstrikeBlock = 0x10,
+	InsMask = 0xF,
+	BlockAfter = 0x100,
+};
+
+enum class MarginOption {
+	None = 0,
+	SubLineSelect = 1,
+};
+
+enum class AnnotationVisible {
+	Hidden = 0,
+	Standard = 1,
+	Boxed = 2,
+	Indented = 3,
+};
+
+enum class UndoFlags {
+	None = 0,
+	MayCoalesce = 1,
+};
+
+enum class VirtualSpace {
+	None = 0,
+	RectangularSelection = 1,
+	UserAccessible = 2,
+	NoWrapLineStart = 4,
+};
+
+enum class Technology {
+	Default = 0,
+	DirectWrite = 1,
+	DirectWriteRetain = 2,
+	DirectWriteDC = 3,
+};
+
+enum class LineEndType {
+	Default = 0,
+	Unicode = 1,
+};
+
+enum class RepresentationAppearance {
+	Plain = 0,
+	Blob = 1,
+	Colour = 0x10,
+};
+
+enum class EOLAnnotationVisible {
+	Hidden = 0x0,
+	Standard = 0x1,
+	Boxed = 0x2,
+	Stadium = 0x100,
+	FlatCircle = 0x101,
+	AngleCircle = 0x102,
+	CircleFlat = 0x110,
+	Flats = 0x111,
+	AngleFlat = 0x112,
+	CircleAngle = 0x120,
+	FlatAngle = 0x121,
+	Angles = 0x122,
+};
+
+enum class Supports {
+	LineDrawsFinal = 0,
+	PixelDivisions = 1,
+	FractionalStrokeWidth = 2,
+	TranslucentStroke = 3,
+	PixelModification = 4,
+};
+
+enum class LineCharacterIndexType {
+	None = 0,
+	Utf32 = 1,
+	Utf16 = 2,
+};
+
+enum class TypeProperty {
+	Boolean = 0,
+	Integer = 1,
+	String = 2,
+};
+
+enum class ModificationFlags {
+	None = 0x0,
+	InsertText = 0x1,
+	DeleteText = 0x2,
+	ChangeStyle = 0x4,
+	ChangeFold = 0x8,
+	User = 0x10,
+	Undo = 0x20,
+	Redo = 0x40,
+	MultiStepUndoRedo = 0x80,
+	LastStepInUndoRedo = 0x100,
+	ChangeMarker = 0x200,
+	BeforeInsert = 0x400,
+	BeforeDelete = 0x800,
+	MultilineUndoRedo = 0x1000,
+	StartAction = 0x2000,
+	ChangeIndicator = 0x4000,
+	ChangeLineState = 0x8000,
+	ChangeMargin = 0x10000,
+	ChangeAnnotation = 0x20000,
+	Container = 0x40000,
+	LexerState = 0x80000,
+	InsertCheck = 0x100000,
+	ChangeTabStops = 0x200000,
+	ChangeEOLAnnotation = 0x400000,
+	EventMaskAll = 0x7FFFFF,
+};
+
+enum class Update {
+	None = 0x0,
+	Content = 0x1,
+	Selection = 0x2,
+	VScroll = 0x4,
+	HScroll = 0x8,
+};
+
+enum class FocusChange {
+	Change = 768,
+	Setfocus = 512,
+	Killfocus = 256,
+};
+
+enum class Keys {
+	Down = 300,
+	Up = 301,
+	Left = 302,
+	Right = 303,
+	Home = 304,
+	End = 305,
+	Prior = 306,
+	Next = 307,
+	Delete = 308,
+	Insert = 309,
+	Escape = 7,
+	Back = 8,
+	Tab = 9,
+	Return = 13,
+	Add = 310,
+	Subtract = 311,
+	Divide = 312,
+	Win = 313,
+	RWin = 314,
+	Menu = 315,
+};
+
+enum class KeyMod {
+	Norm = 0,
+	Shift = 1,
+	Ctrl = 2,
+	Alt = 4,
+	Super = 8,
+	Meta = 16,
+};
+
+enum class CompletionMethods {
+	FillUp = 1,
+	DoubleClick = 2,
+	Tab = 3,
+	Newline = 4,
+	Command = 5,
+};
+
+enum class CharacterSource {
+	DirectInput = 0,
+	TentativeInput = 1,
+	ImeResult = 2,
+};
+
+enum class Bidirectional {
+	Disabled = 0,
+	L2R = 1,
+	R2L = 2,
+};
+
+enum class Notification {
+	StyleNeeded = 2000,
+	CharAdded = 2001,
+	SavePointReached = 2002,
+	SavePointLeft = 2003,
+	ModifyAttemptRO = 2004,
+	Key = 2005,
+	DoubleClick = 2006,
+	UpdateUI = 2007,
+	Modified = 2008,
+	MacroRecord = 2009,
+	MarginClick = 2010,
+	NeedShown = 2011,
+	Painted = 2013,
+	UserListSelection = 2014,
+	URIDropped = 2015,
+	DwellStart = 2016,
+	DwellEnd = 2017,
+	Zoom = 2018,
+	HotSpotClick = 2019,
+	HotSpotDoubleClick = 2020,
+	CallTipClick = 2021,
+	AutoCSelection = 2022,
+	IndicatorClick = 2023,
+	IndicatorRelease = 2024,
+	AutoCCancelled = 2025,
+	AutoCCharDeleted = 2026,
+	HotSpotReleaseClick = 2027,
+	FocusIn = 2028,
+	FocusOut = 2029,
+	AutoCCompleted = 2030,
+	MarginRightClick = 2031,
+	AutoCSelectionChange = 2032,
+};
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
+
+using Position = intptr_t;
+using Line = intptr_t;
+using Colour = int;
+using ColourAlpha = int;
+using uptr_t = uintptr_t;
+using sptr_t = intptr_t;
+
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+//**1 \(\*\n\)
+constexpr Position InvalidPosition = -1;
+constexpr int CpUtf8 = 65001;
+constexpr int MarkerMax = 31;
+constexpr int MaskFolders = 0xFE000000;
+constexpr int MaxMargin = 4;
+constexpr int FontSizeMultiplier = 100;
+constexpr int TimeForever = 10000000;
+constexpr int KeywordsetMax = 8;
+
+//--Autogenerated -- end of section automatically generated from Scintilla.iface
+
+constexpr int IndicatorMax = static_cast<int>(IndicatorNumbers::Max);
+
+// Functions to manipulate fields from a MarkerOutline
+
+inline int operator<<(int i, MarkerOutline marker) noexcept {
+	return i << static_cast<int>(marker);
+}
+
+// Functions to manipulate fields from a FindOption
+
+constexpr FindOption operator|(FindOption a, FindOption b) noexcept {
+	return static_cast<FindOption>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+inline FindOption &operator|=(FindOption &self, FindOption a) noexcept {
+	self = self | a;
+	return self;
+}
+
+// Functions to retrieve and manipulate fields from a FoldLevel
+
+constexpr FoldLevel operator&(FoldLevel lhs, FoldLevel rhs) noexcept {
+	return static_cast<FoldLevel>(static_cast<int>(lhs) & static_cast<int>(rhs));
+}
+
+constexpr FoldLevel LevelNumberPart(FoldLevel level) noexcept {
+	return level & FoldLevel::NumberMask;
+}
+
+constexpr int LevelNumber(FoldLevel level) noexcept {
+	return static_cast<int>(LevelNumberPart(level));
+}
+
+constexpr bool LevelIsHeader(FoldLevel level) noexcept {
+	return (level & FoldLevel::HeaderFlag) == FoldLevel::HeaderFlag;
+}
+
+constexpr bool LevelIsWhitespace(FoldLevel level) noexcept {
+	return (level & FoldLevel::WhiteFlag) == FoldLevel::WhiteFlag;
+}
+
+// Functions to manipulate fields from a FoldFlag
+
+constexpr FoldFlag operator|(FoldFlag a, FoldFlag b) noexcept {
+	return static_cast<FoldFlag>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a FontQuality
+
+constexpr FontQuality operator&(FontQuality a, FontQuality b) noexcept {
+	return static_cast<FontQuality>(static_cast<int>(a) & static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a DocumentOption
+
+constexpr DocumentOption operator|(DocumentOption a, DocumentOption b) noexcept {
+	return static_cast<DocumentOption>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a CaretPolicy
+
+constexpr CaretPolicy operator|(CaretPolicy a, CaretPolicy b) noexcept {
+	return static_cast<CaretPolicy>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a CaretStyle
+
+constexpr CaretStyle operator|(CaretStyle a, CaretStyle b) noexcept {
+	return static_cast<CaretStyle>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+constexpr CaretStyle operator&(CaretStyle a, CaretStyle b) noexcept {
+	return static_cast<CaretStyle>(static_cast<int>(a) & static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a LineEndType
+
+constexpr LineEndType operator&(LineEndType a, LineEndType b) noexcept {
+	return static_cast<LineEndType>(static_cast<int>(a) & static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a RepresentationAppearance
+
+constexpr RepresentationAppearance operator|(RepresentationAppearance a, RepresentationAppearance b) noexcept {
+	return static_cast<RepresentationAppearance>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a LineCharacterIndexType
+
+constexpr LineCharacterIndexType operator|(LineCharacterIndexType a, LineCharacterIndexType b) noexcept {
+	return static_cast<LineCharacterIndexType>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a ModificationFlags
+
+constexpr ModificationFlags operator|(ModificationFlags a, ModificationFlags b) noexcept {
+	return static_cast<ModificationFlags>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+constexpr ModificationFlags operator&(ModificationFlags a, ModificationFlags b) noexcept {
+	return static_cast<ModificationFlags>(static_cast<int>(a) & static_cast<int>(b));
+}
+
+inline ModificationFlags &operator|=(ModificationFlags &self, ModificationFlags a) noexcept {
+	self = self | a;
+	return self;
+}
+
+// Functions to manipulate fields from a Update
+
+constexpr Update operator|(Update a, Update b) noexcept {
+	return static_cast<Update>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+// Functions to manipulate fields from a KeyMod
+
+constexpr KeyMod operator|(KeyMod a, KeyMod b) noexcept {
+	return static_cast<KeyMod>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+constexpr KeyMod operator&(KeyMod a, KeyMod b) noexcept {
+	return static_cast<KeyMod>(static_cast<int>(a) & static_cast<int>(b));
+}
+
+// Test if an enum class value has some bit flag(s) of test set.
+template <typename T>
+constexpr bool FlagSet(T value, T test) {
+	return (static_cast<int>(value) & static_cast<int>(test)) != 0;
+}
+
+}
+
+#endif
diff --git a/scite-app/scintilla/include/ScintillaWidget.h b/scite-app/scintilla/include/ScintillaWidget.h
new file mode 100644
index 0000000..1721f65
--- /dev/null
+++ b/scite-app/scintilla/include/ScintillaWidget.h
@@ -0,0 +1,72 @@
+/* Scintilla source code edit control */
+/* @file ScintillaWidget.h
+ * Definition of Scintilla widget for GTK+.
+ * Only needed by GTK+ code but is harmless on other platforms.
+ * This comment is not a doc-comment as that causes warnings from g-ir-scanner.
+ */
+/* Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */
+
+#ifndef SCINTILLAWIDGET_H
+#define SCINTILLAWIDGET_H
+
+#if defined(GTK)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SCINTILLA(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, scintilla_get_type ())
+
+#define SCINTILLA_TYPE_OBJECT             (scintilla_object_get_type())
+#define SCINTILLA_OBJECT(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), SCINTILLA_TYPE_OBJECT, ScintillaObject))
+#define SCINTILLA_IS_OBJECT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SCINTILLA_TYPE_OBJECT))
+#define SCINTILLA_OBJECT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), SCINTILLA_TYPE_OBJECT, ScintillaObjectClass))
+#define SCINTILLA_IS_OBJECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), SCINTILLA_TYPE_OBJECT))
+#define SCINTILLA_OBJECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), SCINTILLA_TYPE_OBJECT, ScintillaObjectClass))
+
+typedef struct _ScintillaObject ScintillaObject;
+typedef struct _ScintillaClass  ScintillaObjectClass;
+
+struct _ScintillaObject {
+	GtkContainer cont;
+	void *pscin;
+};
+
+struct _ScintillaClass {
+	GtkContainerClass parent_class;
+
+	void (* command) (ScintillaObject *sci, int cmd, GtkWidget *window);
+	void (* notify) (ScintillaObject *sci, int id, SCNotification *scn);
+};
+
+GType		scintilla_object_get_type		(void);
+GtkWidget*	scintilla_object_new			(void);
+gintptr		scintilla_object_send_message	(ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam);
+
+
+GType		scnotification_get_type			(void);
+#define SCINTILLA_TYPE_NOTIFICATION        (scnotification_get_type())
+
+#ifndef G_IR_SCANNING
+/* The legacy names confuse the g-ir-scanner program */
+typedef struct _ScintillaClass  ScintillaClass;
+
+GType		scintilla_get_type	(void);
+GtkWidget*	scintilla_new		(void);
+void		scintilla_set_id	(ScintillaObject *sci, uptr_t id);
+sptr_t		scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+void		scintilla_release_resources(void);
+#endif
+
+#define SCINTILLA_NOTIFY "sci-notify"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif
diff --git a/scite-app/scintilla/qt/README b/scite-app/scintilla/qt/README
new file mode 100644
index 0000000..3ad22e5
--- /dev/null
+++ b/scite-app/scintilla/qt/README
@@ -0,0 +1,38 @@
+README for building of Scintilla on Qt
+
+There are three different Scintilla libraries that can be produced:
+
+	ScintillaEditBase
+A basic widget callable from C++ which is small and can be used just as is
+or with higher level functionality added.
+
+	ScintillaEdit
+A more complete C++ widget with a method for every Scintilla API and a
+secondary API allowing direct access to document objects.
+
+	ScintillaEditPy
+A Python callable version of ScintillaEdit using the PySide bindings.
+
+	Building a library
+
+ScintillaEditBase can be built without performing any generation steps.
+The ScintillaEditBase/ScintillaEditBase.pro project can be loaded into
+Qt Creator and the "Build All" command performed.
+Alternatively, run "qmake" to build make files and then use the platform
+make to build. Most commonly, use "make" on Unix and "nmake"
+on Windows.
+
+On Linux, qmake may be called qmake-qt5 or qmake-qt4.
+
+ScintillaEdit requires a generation command be run first. From the
+ScintillaEdit directory:
+
+python WidgetGen.py
+
+After the generation command has run, the ScintillaEdit.h and
+ScintillaEdit.cpp files will have been populated with the Scintilla API
+methods.
+To build, use Qt Creator or qmake and make as for ScintillaEditBase.
+
+ScintillaEditPy is more complex and instructions are found in
+ScintillaEditPy/README.
diff --git a/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp b/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp
new file mode 100644
index 0000000..8d50eab
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -0,0 +1,286 @@
+// @file ScintillaDocument.cpp
+// Wrapper for Scintilla document object so it can be manipulated independently.
+// Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ScintillaDocument.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "ILoader.h"
+#include "ILexer.h"
+#include "Scintilla.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+class WatcherHelper : public DocWatcher {
+    ScintillaDocument *owner;
+public:
+    explicit WatcherHelper(ScintillaDocument *owner_);
+    virtual ~WatcherHelper();
+
+    void NotifyModifyAttempt(Document *doc, void *userData) override;
+    void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) override;
+    void NotifyModified(Document *doc, DocModification mh, void *userData) override;
+    void NotifyDeleted(Document *doc, void *userData) noexcept override;
+    void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) override;
+    void NotifyLexerChanged(Document *doc, void *userData) override;
+    void NotifyErrorOccurred(Document *doc, void *userData, Status status) override;
+};
+
+WatcherHelper::WatcherHelper(ScintillaDocument *owner_) : owner(owner_) {
+}
+
+WatcherHelper::~WatcherHelper() {
+}
+
+void WatcherHelper::NotifyModifyAttempt(Document *, void *) {
+    emit owner->modify_attempt();
+}
+
+void WatcherHelper::NotifySavePoint(Document *, void *, bool atSavePoint) {
+    emit owner->save_point(atSavePoint);
+}
+
+void WatcherHelper::NotifyModified(Document *, DocModification mh, void *) {
+    int length = mh.length;
+    if (!mh.text)
+        length = 0;
+    QByteArray ba = QByteArray::fromRawData(mh.text, length);
+    emit owner->modified(mh.position, static_cast<int>(mh.modificationType), ba, length,
+			 mh.linesAdded, mh.line, static_cast<int>(mh.foldLevelNow), static_cast<int>(mh.foldLevelPrev));
+}
+
+void WatcherHelper::NotifyDeleted(Document *, void *) noexcept {
+}
+
+void WatcherHelper::NotifyStyleNeeded(Document *, void *, Sci::Position endPos) {
+    emit owner->style_needed(endPos);
+}
+
+void WatcherHelper::NotifyLexerChanged(Document *, void *) {
+    emit owner->lexer_changed();
+}
+
+void WatcherHelper::NotifyErrorOccurred(Document *, void *, Status status) {
+    emit owner->error_occurred(static_cast<int>(status));
+}
+
+ScintillaDocument::ScintillaDocument(QObject *parent, void *pdoc_) :
+    QObject(parent), pdoc(pdoc_), docWatcher(nullptr) {
+    if (!pdoc) {
+	pdoc = new Document(DocumentOption::Default);
+    }
+    docWatcher = new WatcherHelper(this);
+    (static_cast<Document *>(pdoc))->AddRef();
+    (static_cast<Document *>(pdoc))->AddWatcher(docWatcher, pdoc);
+}
+
+ScintillaDocument::~ScintillaDocument() {
+    Document *doc = static_cast<Document *>(pdoc);
+    if (doc) {
+        doc->RemoveWatcher(docWatcher, doc);
+        doc->Release();
+    }
+    pdoc = nullptr;
+    delete docWatcher;
+    docWatcher = nullptr;
+}
+
+void *ScintillaDocument::pointer() {
+    return pdoc;
+}
+
+int ScintillaDocument::line_from_position(int pos) {
+    return (static_cast<Document *>(pdoc))->LineFromPosition(pos);
+}
+
+bool ScintillaDocument::is_cr_lf(int pos) {
+    return (static_cast<Document *>(pdoc))->IsCrLf(pos);
+}
+
+bool ScintillaDocument::delete_chars(int pos, int len) {
+    return (static_cast<Document *>(pdoc))->DeleteChars(pos, len);
+}
+
+int ScintillaDocument::undo() {
+    return (static_cast<Document *>(pdoc))->Undo();
+}
+
+int ScintillaDocument::redo() {
+    return (static_cast<Document *>(pdoc))->Redo();
+}
+
+bool ScintillaDocument::can_undo() {
+    return (static_cast<Document *>(pdoc))->CanUndo();
+}
+
+bool ScintillaDocument::can_redo() {
+    return (static_cast<Document *>(pdoc))->CanRedo();
+}
+
+void ScintillaDocument::delete_undo_history() {
+    (static_cast<Document *>(pdoc))->DeleteUndoHistory();
+}
+
+bool ScintillaDocument::set_undo_collection(bool collect_undo) {
+    return (static_cast<Document *>(pdoc))->SetUndoCollection(collect_undo);
+}
+
+bool ScintillaDocument::is_collecting_undo() {
+    return (static_cast<Document *>(pdoc))->IsCollectingUndo();
+}
+
+void ScintillaDocument::begin_undo_action() {
+    (static_cast<Document *>(pdoc))->BeginUndoAction();
+}
+
+void ScintillaDocument::end_undo_action() {
+    (static_cast<Document *>(pdoc))->EndUndoAction();
+}
+
+void ScintillaDocument::set_save_point() {
+    (static_cast<Document *>(pdoc))->SetSavePoint();
+}
+
+bool ScintillaDocument::is_save_point() {
+    return (static_cast<Document *>(pdoc))->IsSavePoint();
+}
+
+void ScintillaDocument::set_read_only(bool read_only) {
+    (static_cast<Document *>(pdoc))->SetReadOnly(read_only);
+}
+
+bool ScintillaDocument::is_read_only() {
+    return (static_cast<Document *>(pdoc))->IsReadOnly();
+}
+
+void ScintillaDocument::insert_string(int position, QByteArray &str) {
+    (static_cast<Document *>(pdoc))->InsertString(position, str.data(), str.size());
+}
+
+QByteArray ScintillaDocument::get_char_range(int position, int length) {
+    Document *doc = static_cast<Document *>(pdoc);
+
+    if (position < 0 || length <= 0 || position + length > doc->Length())
+        return QByteArray();
+
+    QByteArray ba(length, '\0');
+    doc->GetCharRange(ba.data(), position, length);
+    return ba;
+}
+
+char ScintillaDocument::style_at(int position) {
+    return (static_cast<Document *>(pdoc))->StyleAt(position);
+}
+
+int ScintillaDocument::line_start(int lineno) {
+    return (static_cast<Document *>(pdoc))->LineStart(lineno);
+}
+
+int ScintillaDocument::line_end(int lineno) {
+    return (static_cast<Document *>(pdoc))->LineEnd(lineno);
+}
+
+int ScintillaDocument::line_end_position(int pos) {
+    return (static_cast<Document *>(pdoc))->LineEndPosition(pos);
+}
+
+int ScintillaDocument::length() {
+    return (static_cast<Document *>(pdoc))->Length();
+}
+
+int ScintillaDocument::lines_total() {
+    return (static_cast<Document *>(pdoc))->LinesTotal();
+}
+
+void ScintillaDocument::start_styling(int position) {
+    (static_cast<Document *>(pdoc))->StartStyling(position);
+}
+
+bool ScintillaDocument::set_style_for(int length, char style) {
+    return (static_cast<Document *>(pdoc))->SetStyleFor(length, style);
+}
+
+int ScintillaDocument::get_end_styled() {
+    return (static_cast<Document *>(pdoc))->GetEndStyled();
+}
+
+void ScintillaDocument::ensure_styled_to(int position) {
+    (static_cast<Document *>(pdoc))->EnsureStyledTo(position);
+}
+
+void ScintillaDocument::set_current_indicator(int indic) {
+    (static_cast<Document *>(pdoc))->decorations->SetCurrentIndicator(indic);
+}
+
+void ScintillaDocument::decoration_fill_range(int position, int value, int fillLength) {
+    (static_cast<Document *>(pdoc))->DecorationFillRange(position, value, fillLength);
+}
+
+int ScintillaDocument::decorations_value_at(int indic, int position) {
+    return (static_cast<Document *>(pdoc))->decorations->ValueAt(indic, position);
+}
+
+int ScintillaDocument::decorations_start(int indic, int position) {
+    return (static_cast<Document *>(pdoc))->decorations->Start(indic, position);
+}
+
+int ScintillaDocument::decorations_end(int indic, int position) {
+    return (static_cast<Document *>(pdoc))->decorations->End(indic, position);
+}
+
+int ScintillaDocument::get_code_page() {
+    return (static_cast<Document *>(pdoc))->CodePage();
+}
+
+void ScintillaDocument::set_code_page(int code_page) {
+    (static_cast<Document *>(pdoc))->dbcsCodePage = code_page;
+}
+
+int ScintillaDocument::get_eol_mode() {
+    return static_cast<int>((static_cast<Document *>(pdoc))->eolMode);
+}
+
+void ScintillaDocument::set_eol_mode(int eol_mode) {
+    (static_cast<Document *>(pdoc))->eolMode = static_cast<EndOfLine>(eol_mode);
+}
+
+int ScintillaDocument::move_position_outside_char(int pos, int move_dir, bool check_line_end) {
+    return (static_cast<Document *>(pdoc))->MovePositionOutsideChar(pos, move_dir, check_line_end);
+}
+
+int ScintillaDocument::get_character(int pos) {
+    return (static_cast<Document *>(pdoc))->GetCharacterAndWidth(pos, nullptr);
+}
diff --git a/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.h b/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.h
new file mode 100644
index 0000000..9a28689
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/ScintillaDocument.h
@@ -0,0 +1,91 @@
+// @file ScintillaDocument.h
+// Wrapper for Scintilla document object so it can be manipulated independently.
+// Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+
+#ifndef SCINTILLADOCUMENT_H
+#define SCINTILLADOCUMENT_H
+
+#include <QObject>
+
+class WatcherHelper;
+
+#ifndef EXPORT_IMPORT_API
+#ifdef WIN32
+#ifdef MAKING_LIBRARY
+#define EXPORT_IMPORT_API __declspec(dllexport)
+#else
+// Defining dllimport upsets moc
+#define EXPORT_IMPORT_API __declspec(dllimport)
+//#define EXPORT_IMPORT_API
+#endif
+#else
+#define EXPORT_IMPORT_API
+#endif
+#endif
+
+class EXPORT_IMPORT_API ScintillaDocument : public QObject
+{
+    Q_OBJECT
+
+    void *pdoc;
+    WatcherHelper *docWatcher;
+
+public:
+    explicit ScintillaDocument(QObject *parent = 0, void *pdoc_=0);
+    virtual ~ScintillaDocument();
+    void *pointer();
+
+    int line_from_position(int pos);
+    bool is_cr_lf(int pos);
+    bool delete_chars(int pos, int len);
+    int undo();
+    int redo();
+    bool can_undo();
+    bool can_redo();
+    void delete_undo_history();
+    bool set_undo_collection(bool collect_undo);
+    bool is_collecting_undo();
+    void begin_undo_action();
+    void end_undo_action();
+    void set_save_point();
+    bool is_save_point();
+    void set_read_only(bool read_only);
+    bool is_read_only();
+    void insert_string(int position, QByteArray &str);
+    QByteArray get_char_range(int position, int length);
+    char style_at(int position);
+    int line_start(int lineno);
+    int line_end(int lineno);
+    int line_end_position(int pos);
+    int length();
+    int lines_total();
+    void start_styling(int position);
+    bool set_style_for(int length, char style);
+    int get_end_styled();
+    void ensure_styled_to(int position);
+    void set_current_indicator(int indic);
+    void decoration_fill_range(int position, int value, int fillLength);
+    int decorations_value_at(int indic, int position);
+    int decorations_start(int indic, int position);
+    int decorations_end(int indic, int position);
+    int get_code_page();
+    void set_code_page(int code_page);
+    int get_eol_mode();
+    void set_eol_mode(int eol_mode);
+    int move_position_outside_char(int pos, int move_dir, bool check_line_end);
+
+    int get_character(int pos); // Calls GetCharacterAndWidth(pos, NULL)
+
+signals:
+    void modify_attempt();
+    void save_point(bool atSavePoint);
+    void modified(int position, int modification_type, const QByteArray &text, int length,
+		  int linesAdded, int line, int foldLevelNow, int foldLevelPrev);
+    void style_needed(int pos);
+    void lexer_changed();
+    void error_occurred(int status);
+
+    friend class ::WatcherHelper;
+};
+
+#endif /* SCINTILLADOCUMENT_H */
diff --git a/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.cpp.template b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.cpp.template
new file mode 100644
index 0000000..9cebc83
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.cpp.template
@@ -0,0 +1,86 @@
+// @file ScintillaEdit.cpp
+// Extended version of ScintillaEditBase with a method for each API
+// Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+
+#include "ScintillaEdit.h"
+
+using namespace Scintilla;
+
+ScintillaEdit::ScintillaEdit(QWidget *parent) : ScintillaEditBase(parent) {
+}
+
+ScintillaEdit::~ScintillaEdit() {
+}
+
+QByteArray ScintillaEdit::TextReturner(int message, uptr_t wParam) const {
+    int length = send(message, wParam, 0);
+    QByteArray ba(length, '\0');
+    send(message, wParam, (sptr_t)ba.data());
+    // Remove extra NULs
+    if (ba.size() > 0 && ba.at(ba.size()-1) == 0)
+        ba.chop(1);
+    return ba;
+}
+
+QPair<int, int>ScintillaEdit::find_text(int flags, const char *text, int cpMin, int cpMax) {
+    struct Sci_TextToFind ft = {{0, 0}, 0, {0, 0}};
+    ft.chrg.cpMin = cpMin;
+    ft.chrg.cpMax = cpMax;
+    ft.chrgText.cpMin = cpMin;
+    ft.chrgText.cpMax = cpMax;
+    ft.lpstrText = text;
+
+    int start = send(SCI_FINDTEXT, flags, (uptr_t) (&ft));
+
+    return QPair<int,int>(start, ft.chrgText.cpMax);
+}
+
+QByteArray ScintillaEdit::get_text_range(int start, int end) {
+    if (start > end)
+        start = end;
+
+    int length = end-start;
+    QByteArray ba(length+1, '\0');
+    struct Sci_TextRange tr = {{start, end}, ba.data()};
+
+    send(SCI_GETTEXTRANGE, 0, (sptr_t)&tr);
+    ba.chop(1); // Remove extra NUL
+
+    return ba;
+}
+
+ScintillaDocument *ScintillaEdit::get_doc() {
+    return new ScintillaDocument(0, (void *)send(SCI_GETDOCPOINTER, 0, 0));
+}
+
+void ScintillaEdit::set_doc(ScintillaDocument *pdoc_) {
+    send(SCI_SETDOCPOINTER, 0, (sptr_t)(pdoc_->pointer()));
+}
+
+long ScintillaEdit::format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
+                                 const QRect& print_rect, const QRect& page_rect,
+                                 long range_start, long range_end)
+{
+    Sci_RangeToFormat to_format;
+
+    to_format.hdc = target;
+    to_format.hdcTarget = measure;
+
+    to_format.rc.left = print_rect.left();
+    to_format.rc.top = print_rect.top();
+    to_format.rc.right = print_rect.right();
+    to_format.rc.bottom = print_rect.bottom();
+
+    to_format.rcPage.left = page_rect.left();
+    to_format.rcPage.top = page_rect.top();
+    to_format.rcPage.right = page_rect.right();
+    to_format.rcPage.bottom = page_rect.bottom();
+
+    to_format.chrg.cpMin = range_start;
+    to_format.chrg.cpMax = range_end;
+
+    return send(SCI_FORMATRANGE, draw, reinterpret_cast<sptr_t>(&to_format));
+}
+
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
diff --git a/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.h.template b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.h.template
new file mode 100644
index 0000000..1444e90
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.h.template
@@ -0,0 +1,73 @@
+// @file ScintillaEdit.h
+// Extended version of ScintillaEditBase with a method for each API
+// Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+
+#ifndef SCINTILLAEDIT_H
+#define SCINTILLAEDIT_H
+
+#include <QPair>
+
+#include "ScintillaEditBase.h"
+#include "ScintillaDocument.h"
+
+#ifndef EXPORT_IMPORT_API
+#ifdef WIN32
+#ifdef MAKING_LIBRARY
+#define EXPORT_IMPORT_API __declspec(dllexport)
+#else
+// Defining dllimport upsets moc
+#define EXPORT_IMPORT_API __declspec(dllimport)
+//#define EXPORT_IMPORT_API
+#endif
+#else
+#define EXPORT_IMPORT_API
+#endif
+#endif
+
+class EXPORT_IMPORT_API ScintillaEdit : public ScintillaEditBase {
+	Q_OBJECT
+
+public:
+	ScintillaEdit(QWidget *parent = 0);
+	virtual ~ScintillaEdit();
+
+	QByteArray TextReturner(int message, uptr_t wParam) const;
+
+	QPair<int, int>find_text(int flags, const char *text, int cpMin, int cpMax);
+	QByteArray get_text_range(int start, int end);
+        ScintillaDocument *get_doc();
+        void set_doc(ScintillaDocument *pdoc_);
+
+	// Same as previous two methods but with Qt style names
+	QPair<int, int>findText(int flags, const char *text, int cpMin, int cpMax) {
+		return find_text(flags, text, cpMin, cpMax);
+	}
+
+	QByteArray textRange(int start, int end) {
+		return get_text_range(start, end);
+	}
+
+	// Exposing the FORMATRANGE api with both underscore & qt style names
+	long format_range(bool draw, QPaintDevice* target, QPaintDevice* measure,
+			   const QRect& print_rect, const QRect& page_rect,
+                          long range_start, long range_end);
+	long formatRange(bool draw, QPaintDevice* target, QPaintDevice* measure,
+                         const QRect& print_rect, const QRect& page_rect,
+                         long range_start, long range_end) {
+		return format_range(draw, target, measure, print_rect, page_rect,
+		                    range_start, range_end);
+	}
+
+/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
+
+};
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#if !defined(__clang__) && (__GNUC__ >= 8)
+#pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+#endif
+
+#endif /* SCINTILLAEDIT_H */
diff --git a/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.pro b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
new file mode 100644
index 0000000..4f34e8b
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
@@ -0,0 +1,75 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-05-05T12:41:23
+#
+#-------------------------------------------------
+
+QT       += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ScintillaEdit
+TEMPLATE = lib
+CONFIG += lib_bundle
+CONFIG += c++1z
+
+VERSION = 5.1.1
+
+SOURCES += \
+    ScintillaEdit.cpp \
+    ScintillaDocument.cpp \
+    ../ScintillaEditBase/PlatQt.cpp \
+    ../ScintillaEditBase/ScintillaQt.cpp \
+    ../ScintillaEditBase/ScintillaEditBase.cpp \
+    ../../src/XPM.cxx \
+    ../../src/ViewStyle.cxx \
+    ../../src/UniqueString.cxx \
+    ../../src/UniConversion.cxx \
+    ../../src/Style.cxx \
+    ../../src/Selection.cxx \
+    ../../src/ScintillaBase.cxx \
+    ../../src/RunStyles.cxx \
+    ../../src/RESearch.cxx \
+    ../../src/PositionCache.cxx \
+    ../../src/PerLine.cxx \
+    ../../src/MarginView.cxx \
+    ../../src/LineMarker.cxx \
+    ../../src/KeyMap.cxx \
+    ../../src/Indicator.cxx \
+    ../../src/Geometry.cxx \
+    ../../src/EditView.cxx \
+    ../../src/Editor.cxx \
+    ../../src/EditModel.cxx \
+    ../../src/Document.cxx \
+    ../../src/Decoration.cxx \
+    ../../src/DBCS.cxx \
+    ../../src/ContractionState.cxx \
+    ../../src/CharClassify.cxx \
+    ../../src/CharacterType.cxx \
+    ../../src/CharacterCategoryMap.cxx \
+    ../../src/CellBuffer.cxx \
+    ../../src/CaseFolder.cxx \
+    ../../src/CaseConvert.cxx \
+    ../../src/CallTip.cxx \
+    ../../src/AutoComplete.cxx
+
+HEADERS  += \
+    ScintillaEdit.h \
+    ScintillaDocument.h \
+    ../ScintillaEditBase/ScintillaEditBase.h \
+    ../ScintillaEditBase/ScintillaQt.h
+
+OTHER_FILES +=
+
+INCLUDEPATH += ../ScintillaEditBase ../../include ../../src
+
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG=1
+}
+
+DESTDIR = ../../bin
+DLLDESTDIR = ../../bin
+
+macx {
+	QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/
+}
diff --git a/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.py b/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.py
new file mode 100644
index 0000000..62f8ec8
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python3
+# WidgetGen.py - regenerate the ScintillaWidgetCpp.cpp and ScintillaWidgetCpp.h files
+# Check that API includes all gtkscintilla2 functions
+
+import sys
+import os
+import getopt
+
+scintillaDirectory = "../.."
+scintillaScriptsDirectory = os.path.join(scintillaDirectory, "scripts")
+sys.path.append(scintillaScriptsDirectory)
+import Face
+from FileGenerator import GenerateFile
+
+def underscoreName(s):
+	# Name conversion fixes to match gtkscintilla2
+	irregular = ['WS', 'EOL', 'AutoC', 'KeyWords', 'BackSpace', 'UnIndents', 'RE', 'RGBA']
+	for word in irregular:
+		replacement = word[0] + word[1:].lower()
+		s = s.replace(word, replacement)
+
+	out = ""
+	for c in s:
+		if c.isupper():
+			if out:
+				out += "_"
+			out += c.lower()
+		else:
+			out += c
+	return out
+
+def normalisedName(s, options, role=None):
+	if options["qtStyle"]:
+		if role == "get":
+			s = s.replace("Get", "")
+		return s[0].lower() + s[1:]
+	else:
+		return underscoreName(s)
+
+typeAliases = {
+	"position": "int",
+	"line": "int",
+	"pointer": "int",
+	"colour": "int",
+	"colouralpha": "int",
+	"keymod": "int",
+	"string": "const char *",
+	"stringresult": "const char *",
+	"cells": "const char *",
+}
+
+def cppAlias(s):
+	if s in typeAliases:
+		return typeAliases[s]
+	elif Face.IsEnumeration(s):
+		return "int"
+	else:
+		return s
+
+understoodTypes = ["", "void", "int", "bool", "position", "line", "pointer",
+	"colour", "colouralpha", "keymod", "string", "stringresult", "cells"]
+
+def understoodType(t):
+	return t in understoodTypes or Face.IsEnumeration(t)
+
+def checkTypes(name, v):
+	understandAllTypes = True
+	if not understoodType(v["ReturnType"]):
+		#~ print("Do not understand", v["ReturnType"], "for", name)
+		understandAllTypes = False
+	if not understoodType(v["Param1Type"]):
+		#~ print("Do not understand", v["Param1Type"], "for", name)
+		understandAllTypes = False
+	if not understoodType(v["Param2Type"]):
+		#~ print("Do not understand", v["Param2Type"], "for", name)
+		understandAllTypes = False
+	return understandAllTypes
+
+def arguments(v, stringResult, options):
+	ret = ""
+	p1Type = cppAlias(v["Param1Type"])
+	if p1Type == "int":
+		p1Type = "sptr_t"
+	if p1Type:
+		ret = ret + p1Type + " " + normalisedName(v["Param1Name"], options)
+	p2Type = cppAlias(v["Param2Type"])
+	if p2Type == "int":
+		p2Type = "sptr_t"
+	if p2Type and not stringResult:
+		if p1Type:
+			ret = ret + ", "
+		ret = ret + p2Type + " " + normalisedName(v["Param2Name"], options)
+	return ret
+
+def printPyFile(f, options):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			feat = v["FeatureType"]
+			if feat in ["val"]:
+				out.append(name + "=" + v["Value"])
+			if feat in ["evt"]:
+				out.append("SCN_" + name.upper() + "=" + v["Value"])
+			if feat in ["fun"]:
+				out.append("SCI_" + name.upper() + "=" + v["Value"])
+	return out
+
+def printHFile(f, options):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			feat = v["FeatureType"]
+			if feat in ["fun", "get", "set"]:
+				if checkTypes(name, v):
+					constDeclarator = " const" if feat == "get" else ""
+					returnType = cppAlias(v["ReturnType"])
+					if returnType == "int":
+						returnType = "sptr_t"
+					stringResult = v["Param2Type"] == "stringresult"
+					if stringResult:
+						returnType = "QByteArray"
+					out.append("\t" + returnType + " " + normalisedName(name, options, feat) + "(" +
+						arguments(v, stringResult, options)+
+						")" + constDeclarator + ";")
+	return out
+
+def methodNames(f, options):
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			feat = v["FeatureType"]
+			if feat in ["fun", "get", "set"]:
+				if checkTypes(name, v):
+					yield normalisedName(name, options)
+
+def printCPPFile(f, options):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			feat = v["FeatureType"]
+			if feat in ["fun", "get", "set"]:
+				if checkTypes(name, v):
+					constDeclarator = " const" if feat == "get" else ""
+					featureDefineName = "SCI_" + name.upper()
+					returnType = cppAlias(v["ReturnType"])
+					if returnType == "int":
+						returnType = "sptr_t"
+					stringResult = v["Param2Type"] == "stringresult"
+					if stringResult:
+						returnType = "QByteArray"
+					returnStatement = ""
+					if returnType != "void":
+						returnStatement = "return "
+					out.append(returnType + " ScintillaEdit::" + normalisedName(name, options, feat) + "(" +
+						arguments(v, stringResult, options) +
+						")" + constDeclarator + " {")
+					returns = ""
+					if stringResult:
+						returns += "    " + returnStatement + "TextReturner(" + featureDefineName + ", "
+						if "*" in cppAlias(v["Param1Type"]):
+							returns += "(sptr_t)"
+						if v["Param1Name"]:
+							returns += normalisedName(v["Param1Name"], options)
+						else:
+							returns += "0"
+						returns += ");"
+					else:
+						returns += "    " + returnStatement + "send(" + featureDefineName + ", "
+						if "*" in cppAlias(v["Param1Type"]):
+							returns += "(sptr_t)"
+						if v["Param1Name"]:
+							returns += normalisedName(v["Param1Name"], options)
+						else:
+							returns += "0"
+						returns += ", "
+						if "*" in cppAlias(v["Param2Type"]):
+							returns += "(sptr_t)"
+						if v["Param2Name"]:
+							returns += normalisedName(v["Param2Name"], options)
+						else:
+							returns += "0"
+						returns += ");"
+					out.append(returns)
+					out.append("}")
+					out.append("")
+	return out
+
+def gtkNames():
+	# The full path on my machine: should be altered for anyone else
+	p = "C:/Users/Neil/Downloads/wingide-source-4.0.1-1/wingide-source-4.0.1-1/external/gtkscintilla2/gtkscintilla.c"
+	with open(p) as f:
+		for l in f.readlines():
+			if "gtk_scintilla_" in l:
+				name = l.split()[1][14:]
+				if '(' in name:
+					name = name.split('(')[0]
+					yield name
+
+def usage():
+	print("WidgetGen.py [-c|--clean][-h|--help][-u|--underscore-names]")
+	print("")
+	print("Generate full APIs for ScintillaEdit class and ScintillaConstants.py.")
+	print("")
+	print("options:")
+	print("")
+	print("-c --clean remove all generated code from files")
+	print("-h --help  display this text")
+	print("-u --underscore-names  use method_names consistent with GTK+ standards")
+
+def readInterface(cleanGenerated):
+	f = Face.Face()
+	if not cleanGenerated:
+		f.ReadFromFile("../../include/Scintilla.iface")
+	return f
+
+def main(argv):
+	# Using local path for gtkscintilla2 so don't default to checking
+	checkGTK = False
+	cleanGenerated = False
+	qtStyleInterface = True
+	# The --gtk-check option checks for full coverage of the gtkscintilla2 API but
+	# depends on a particular directory so is not mentioned in --help.
+	opts, args = getopt.getopt(argv, "hcgu", ["help", "clean", "gtk-check", "underscore-names"])
+	for opt, arg in opts:
+		if opt in ("-h", "--help"):
+			usage()
+			sys.exit()
+		elif opt in ("-c", "--clean"):
+			cleanGenerated = True
+		elif opt in ("-g", "--gtk-check"):
+			checkGTK = True
+		elif opt in ("-u", "--underscore-names"):
+			qtStyleInterface = False
+
+	options = {"qtStyle": qtStyleInterface}
+	f = readInterface(cleanGenerated)
+	try:
+		GenerateFile("ScintillaEdit.cpp.template", "ScintillaEdit.cpp",
+			"/* ", True, printCPPFile(f, options))
+		GenerateFile("ScintillaEdit.h.template", "ScintillaEdit.h",
+			"/* ", True, printHFile(f, options))
+		GenerateFile("../ScintillaEditPy/ScintillaConstants.py.template",
+			"../ScintillaEditPy/ScintillaConstants.py",
+			"# ", True, printPyFile(f, options))
+		if checkGTK:
+			names = set(methodNames(f))
+			#~ print("\n".join(names))
+			namesGtk = set(gtkNames())
+			for name in namesGtk:
+				if name not in names:
+					print(name, "not found in Qt version")
+			for name in names:
+				if name not in namesGtk:
+					print(name, "not found in GTK+ version")
+	except:
+		raise
+
+	if cleanGenerated:
+		for file in ["ScintillaEdit.cpp", "ScintillaEdit.h", "../ScintillaEditPy/ScintillaConstants.py"]:
+			try:
+				os.remove(file)
+			except OSError:
+				pass
+
+if __name__ == "__main__":
+	main(sys.argv[1:])
diff --git a/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.pyc b/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.pyc
new file mode 100644
index 0000000..c7b49a6
Binary files /dev/null and b/scite-app/scintilla/qt/ScintillaEdit/WidgetGen.pyc differ
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/Notes.txt b/scite-app/scintilla/qt/ScintillaEditBase/Notes.txt
new file mode 100644
index 0000000..4abc9bb
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/Notes.txt
@@ -0,0 +1,18 @@
+
+Issues with Scintilla for Qt
+
+Qt reports character descenders are 1 pixel shorter than they really are.
+There is a tweak in the code to add a pixel in. This may have to be reviewed for Qt 5.
+There's a comment in the Qt code for Windows:
+       // ### we subtract 1 to even out the historical +1 in QFontMetrics's
+       // ### height=asc+desc+1 equation. Fix in Qt5.
+
+The clocks used aren't great. QTime is a time since midnight clock so wraps around and
+is only accurate to, at best, milliseconds.
+
+On OS X drawing text into a pixmap moves it around 1 pixel to the right compared to drawing
+it directly onto a window. Buffered drawing turned off by default to avoid this.
+Reported as QTBUG-19483.
+
+Only one QPainter can be active on any widget at a time. Scintilla only draws into one
+widget but reenters for measurement.
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.cpp b/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.cpp
new file mode 100644
index 0000000..2d49dcb
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.cpp
@@ -0,0 +1,1355 @@
+// @file PlatQt.cpp
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// Scintilla platform layer for Qt
+
+#include <cstdio>
+
+#include "PlatQt.h"
+#include "Scintilla.h"
+#include "UniConversion.h"
+#include "DBCS.h"
+
+#include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QScreen>
+#endif
+#include <QFont>
+#include <QColor>
+#include <QRect>
+#include <QPaintDevice>
+#include <QPaintEngine>
+#include <QWidget>
+#include <QPixmap>
+#include <QPainter>
+#include <QPainterPath>
+#include <QMenu>
+#include <QAction>
+#include <QTime>
+#include <QMessageBox>
+#include <QTextCodec>
+#include <QListWidget>
+#include <QVarLengthArray>
+#include <QScrollBar>
+#include <QDesktopWidget>
+#include <QTextLayout>
+#include <QTextLine>
+#include <QLibrary>
+
+using namespace Scintilla;
+
+namespace Scintilla::Internal {
+
+//----------------------------------------------------------------------
+
+// Convert from a Scintilla characterSet value to a Qt codec name.
+const char *CharacterSetID(CharacterSet characterSet)
+{
+	switch (characterSet) {
+		//case CharacterSet::Ansi:
+		//	return "";
+	case CharacterSet::Default:
+		return "ISO 8859-1";
+	case CharacterSet::Baltic:
+		return "ISO 8859-13";
+	case CharacterSet::ChineseBig5:
+		return "Big5";
+	case CharacterSet::EastEurope:
+		return "ISO 8859-2";
+	case CharacterSet::GB2312:
+		return "GB18030-0";
+	case CharacterSet::Greek:
+		return "ISO 8859-7";
+	case CharacterSet::Hangul:
+		return "CP949";
+	case CharacterSet::Mac:
+		return "Apple Roman";
+		//case SC_CHARSET_OEM:
+		//	return "ASCII";
+	case CharacterSet::Russian:
+		return "KOI8-R";
+	case CharacterSet::Cyrillic:
+		return "Windows-1251";
+	case CharacterSet::ShiftJis:
+		return "Shift-JIS";
+		//case SC_CHARSET_SYMBOL:
+		//        return "";
+	case CharacterSet::Turkish:
+		return "ISO 8859-9";
+		//case SC_CHARSET_JOHAB:
+		//        return "CP1361";
+	case CharacterSet::Hebrew:
+		return "ISO 8859-8";
+	case CharacterSet::Arabic:
+		return "ISO 8859-6";
+	case CharacterSet::Vietnamese:
+		return "Windows-1258";
+	case CharacterSet::Thai:
+		return "TIS-620";
+	case CharacterSet::Iso8859_15:
+		return "ISO 8859-15";
+	default:
+		return "ISO 8859-1";
+	}
+}
+
+QString UnicodeFromText(QTextCodec *codec, std::string_view text) {
+	return codec->toUnicode(text.data(), static_cast<int>(text.length()));
+}
+
+static QFont::StyleStrategy ChooseStrategy(FontQuality eff)
+{
+	switch (eff) {
+		case FontQuality::QualityDefault:         return QFont::PreferDefault;
+		case FontQuality::QualityNonAntialiased: return QFont::NoAntialias;
+		case FontQuality::QualityAntialiased:     return QFont::PreferAntialias;
+		case FontQuality::QualityLcdOptimized:   return QFont::PreferAntialias;
+		default:                             return QFont::PreferDefault;
+	}
+}
+
+class FontAndCharacterSet : public Font {
+public:
+	CharacterSet characterSet = CharacterSet::Ansi;
+	QFont *pfont = nullptr;
+	FontAndCharacterSet(const FontParameters &fp) {
+		pfont = new QFont;
+		pfont->setStyleStrategy(ChooseStrategy(fp.extraFontFlag));
+		pfont->setFamily(QString::fromUtf8(fp.faceName));
+		pfont->setPointSizeF(fp.size);
+		pfont->setBold(static_cast<int>(fp.weight) > 500);
+		pfont->setItalic(fp.italic);
+
+		characterSet = fp.characterSet;
+	}
+	~FontAndCharacterSet() {
+		delete pfont;
+		pfont = nullptr;
+	}
+};
+
+namespace {
+
+const Supports SupportsQt[] = {
+	Supports::LineDrawsFinal,
+	Supports::FractionalStrokeWidth,
+	Supports::TranslucentStroke,
+	Supports::PixelModification,
+};
+
+const FontAndCharacterSet *AsFontAndCharacterSet(const Font *f) {
+	return dynamic_cast<const FontAndCharacterSet *>(f);
+}
+
+QFont *FontPointer(const Font *f)
+{
+	return AsFontAndCharacterSet(f)->pfont;
+}
+
+}
+
+std::shared_ptr<Font> Font::Allocate(const FontParameters &fp)
+{
+	return std::make_shared<FontAndCharacterSet>(fp);
+}
+
+SurfaceImpl::SurfaceImpl()
+{}
+
+SurfaceImpl::SurfaceImpl(int width, int height, SurfaceMode mode_)
+{
+	if (width < 1) width = 1;
+	if (height < 1) height = 1;
+	deviceOwned = true;
+	device = new QPixmap(width, height);
+	mode = mode_;
+}
+
+SurfaceImpl::~SurfaceImpl()
+{
+	Clear();
+}
+
+void SurfaceImpl::Clear()
+{
+	if (painterOwned && painter) {
+		delete painter;
+	}
+
+	if (deviceOwned && device) {
+		delete device;
+	}
+	device = nullptr;
+	painter = nullptr;
+	deviceOwned = false;
+	painterOwned = false;
+}
+
+void SurfaceImpl::Init(WindowID wid)
+{
+	Release();
+	device = static_cast<QWidget *>(wid);
+}
+
+void SurfaceImpl::Init(SurfaceID sid, WindowID /*wid*/)
+{
+	Release();
+	device = static_cast<QPaintDevice *>(sid);
+}
+
+std::unique_ptr<Surface> SurfaceImpl::AllocatePixMap(int width, int height)
+{
+	return std::make_unique<SurfaceImpl>(width, height, mode);
+}
+
+void SurfaceImpl::SetMode(SurfaceMode mode_)
+{
+	mode = mode_;
+}
+
+void SurfaceImpl::Release() noexcept
+{
+	Clear();
+}
+
+int SurfaceImpl::SupportsFeature(Supports feature) noexcept
+{
+	for (const Supports f : SupportsQt) {
+		if (f == feature)
+			return 1;
+	}
+	return 0;
+}
+
+bool SurfaceImpl::Initialised()
+{
+	return device != nullptr;
+}
+
+void SurfaceImpl::PenColour(ColourRGBA fore)
+{
+	QPen penOutline(QColorFromColourRGBA(fore));
+	penOutline.setCapStyle(Qt::FlatCap);
+	GetPainter()->setPen(penOutline);
+}
+
+void SurfaceImpl::PenColourWidth(ColourRGBA fore, XYPOSITION strokeWidth) {
+	QPen penOutline(QColorFromColourRGBA(fore));
+	penOutline.setCapStyle(Qt::FlatCap);
+	penOutline.setJoinStyle(Qt::MiterJoin);
+	penOutline.setWidthF(strokeWidth);
+	GetPainter()->setPen(penOutline);
+}
+
+void SurfaceImpl::BrushColour(ColourRGBA back)
+{
+	GetPainter()->setBrush(QBrush(QColorFromColourRGBA(back)));
+}
+
+void SurfaceImpl::SetCodec(const Font *font)
+{
+	const FontAndCharacterSet *pfacs = AsFontAndCharacterSet(font);
+	if (pfacs && pfacs->pfont) {
+		const char *csid = "UTF-8";
+		if (!(mode.codePage == SC_CP_UTF8))
+			csid = CharacterSetID(pfacs->characterSet);
+		if (csid != codecName) {
+			codecName = csid;
+			codec = QTextCodec::codecForName(csid);
+		}
+	}
+}
+
+void SurfaceImpl::SetFont(const Font *font)
+{
+	const FontAndCharacterSet *pfacs = AsFontAndCharacterSet(font);
+	if (pfacs && pfacs->pfont) {
+		GetPainter()->setFont(*(pfacs->pfont));
+		SetCodec(font);
+	}
+}
+
+int SurfaceImpl::LogPixelsY()
+{
+	return device->logicalDpiY();
+}
+
+int SurfaceImpl::PixelDivisions()
+{
+	// Qt uses device pixels.
+	return 1;
+}
+
+int SurfaceImpl::DeviceHeightFont(int points)
+{
+	return points;
+}
+
+void SurfaceImpl::LineDraw(Point start, Point end, Stroke stroke)
+{
+	PenColourWidth(stroke.colour, stroke.width);
+	QLineF line(start.x, start.y, end.x, end.y);
+	GetPainter()->drawLine(line);
+}
+
+void SurfaceImpl::PolyLine(const Point *pts, size_t npts, Stroke stroke)
+{
+	// TODO: set line joins and caps
+	PenColourWidth(stroke.colour, stroke.width);
+	std::vector<QPointF> qpts;
+	std::transform(pts, pts + npts, std::back_inserter(qpts), QPointFFromPoint);
+	GetPainter()->drawPolyline(&qpts[0], static_cast<int>(npts));
+}
+
+void SurfaceImpl::Polygon(const Point *pts, size_t npts, FillStroke fillStroke)
+{
+	PenColourWidth(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+
+	std::vector<QPointF> qpts;
+	std::transform(pts, pts + npts, std::back_inserter(qpts), QPointFFromPoint);
+
+	GetPainter()->drawPolygon(&qpts[0], static_cast<int>(npts));
+}
+
+void SurfaceImpl::RectangleDraw(PRectangle rc, FillStroke fillStroke)
+{
+	PenColourWidth(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+	const QRectF rect = QRectFFromPRect(rc.Inset(fillStroke.stroke.width / 2));
+	GetPainter()->drawRect(rect);
+}
+
+void SurfaceImpl::RectangleFrame(PRectangle rc, Stroke stroke) {
+	PenColourWidth(stroke.colour, stroke.width);
+	// Default QBrush is Qt::NoBrush so does not fill
+	GetPainter()->setBrush(QBrush());
+	const QRectF rect = QRectFFromPRect(rc.Inset(stroke.width / 2));
+	GetPainter()->drawRect(rect);
+}
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Fill fill)
+{
+	GetPainter()->fillRect(QRectFFromPRect(rc), QColorFromColourRGBA(fill.colour));
+}
+
+void SurfaceImpl::FillRectangleAligned(PRectangle rc, Fill fill)
+{
+	FillRectangle(PixelAlign(rc, 1), fill);
+}
+
+void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern)
+{
+	// Tile pattern over rectangle
+	SurfaceImpl *surface = dynamic_cast<SurfaceImpl *>(&surfacePattern);
+	// Currently assumes 8x8 pattern
+	int widthPat = 8;
+	int heightPat = 8;
+	for (int xTile = rc.left; xTile < rc.right; xTile += widthPat) {
+		int widthx = (xTile + widthPat > rc.right) ? rc.right - xTile : widthPat;
+		for (int yTile = rc.top; yTile < rc.bottom; yTile += heightPat) {
+			int heighty = (yTile + heightPat > rc.bottom) ? rc.bottom - yTile : heightPat;
+			QRect source(0, 0, widthx, heighty);
+			QRect target(xTile, yTile, widthx, heighty);
+			QPixmap *pixmap = static_cast<QPixmap *>(surface->GetPaintDevice());
+			GetPainter()->drawPixmap(target, *pixmap, source);
+		}
+	}
+}
+
+void SurfaceImpl::RoundedRectangle(PRectangle rc, FillStroke fillStroke)
+{
+	PenColourWidth(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+	GetPainter()->drawRoundedRect(QRectFFromPRect(rc), 3.0f, 3.0f);
+}
+
+void SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke)
+{
+	QColor qFill = QColorFromColourRGBA(fillStroke.fill.colour);
+	QBrush brushFill(qFill);
+	GetPainter()->setBrush(brushFill);
+	if (fillStroke.fill.colour == fillStroke.stroke.colour) {
+		painter->setPen(Qt::NoPen);
+		QRectF rect = QRectFFromPRect(rc);
+		if (cornerSize > 0.0f) {
+			// A radius of 1 shows no curve so add 1
+			qreal radius = cornerSize+1;
+			GetPainter()->drawRoundedRect(rect, radius, radius);
+		} else {
+			GetPainter()->fillRect(rect, brushFill);
+		}
+	} else {
+		QColor qOutline = QColorFromColourRGBA(fillStroke.stroke.colour);
+		QPen penOutline(qOutline);
+		penOutline.setWidthF(fillStroke.stroke.width);
+		GetPainter()->setPen(penOutline);
+
+		QRectF rect = QRectFFromPRect(rc.Inset(fillStroke.stroke.width / 2));
+		if (cornerSize > 0.0f) {
+			// A radius of 1 shows no curve so add 1
+			qreal radius = cornerSize+1;
+			GetPainter()->drawRoundedRect(rect, radius, radius);
+		} else {
+			GetPainter()->drawRect(rect);
+		}
+	}
+}
+
+void SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+	QRectF rect = QRectFFromPRect(rc);
+	QLinearGradient linearGradient;
+	switch (options) {
+	case GradientOptions::leftToRight:
+		linearGradient = QLinearGradient(rc.left, rc.top, rc.right, rc.top);
+		break;
+	case GradientOptions::topToBottom:
+	default:
+		linearGradient = QLinearGradient(rc.left, rc.top, rc.left, rc.bottom);
+		break;
+	}
+	linearGradient.setSpread(QGradient::RepeatSpread);
+	for (const ColourStop &stop : stops) {
+		linearGradient.setColorAt(stop.position, QColorFromColourRGBA(stop.colour));
+	}
+	QBrush brush = QBrush(linearGradient);
+	GetPainter()->fillRect(rect, brush);
+}
+
+static std::vector<unsigned char> ImageByteSwapped(int width, int height, const unsigned char *pixelsImage)
+{
+	// Input is RGBA, but Format_ARGB32 is BGRA, so swap the red bytes and blue bytes
+	size_t bytes = width * height * 4;
+	std::vector<unsigned char> imageBytes(pixelsImage, pixelsImage+bytes);
+	for (size_t i=0; i<bytes; i+=4)
+		std::swap(imageBytes[i], imageBytes[i+2]);
+	return imageBytes;
+}
+
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage)
+{
+	std::vector<unsigned char> imageBytes = ImageByteSwapped(width, height, pixelsImage);
+	QImage image(&imageBytes[0], width, height, QImage::Format_ARGB32);
+	QPoint pt(rc.left, rc.top);
+	GetPainter()->drawImage(pt, image);
+}
+
+void SurfaceImpl::Ellipse(PRectangle rc, FillStroke fillStroke)
+{
+	PenColourWidth(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+	const QRectF rect = QRectFFromPRect(rc.Inset(fillStroke.stroke.width / 2));
+	GetPainter()->drawEllipse(rect);
+}
+
+void SurfaceImpl::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
+	const XYPOSITION halfStroke = fillStroke.stroke.width / 2.0f;
+	const XYPOSITION radius = rc.Height() / 2.0f - halfStroke;
+	PRectangle rcInner = rc;
+	rcInner.left += radius;
+	rcInner.right -= radius;
+	const XYPOSITION arcHeight = rc.Height() - fillStroke.stroke.width;
+
+	PenColourWidth(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+
+	QPainterPath path;
+
+	const Ends leftSide = static_cast<Ends>(static_cast<int>(ends) & 0xf);
+	const Ends rightSide = static_cast<Ends>(static_cast<int>(ends) & 0xf0);
+	switch (leftSide) {
+		case Ends::leftFlat:
+			path.moveTo(rc.left + halfStroke, rc.top + halfStroke);
+			path.lineTo(rc.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::leftAngle:
+			path.moveTo(rcInner.left + halfStroke, rc.top + halfStroke);
+			path.lineTo(rc.left + halfStroke, rc.Centre().y);
+			path.lineTo(rcInner.left + halfStroke, rc.bottom - halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			path.moveTo(rcInner.left + halfStroke, rc.top + halfStroke);
+			QRectF rectangleArc(rc.left + halfStroke, rc.top + halfStroke,
+					    arcHeight, arcHeight);
+			path.arcTo(rectangleArc, 90, 180);
+			break;
+	}
+
+	switch (rightSide) {
+		case Ends::rightFlat:
+			path.lineTo(rc.right - halfStroke, rc.bottom - halfStroke);
+			path.lineTo(rc.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::rightAngle:
+			path.lineTo(rcInner.right - halfStroke, rc.bottom - halfStroke);
+			path.lineTo(rc.right - halfStroke, rc.Centre().y);
+			path.lineTo(rcInner.right - halfStroke, rc.top + halfStroke);
+			break;
+		case Ends::semiCircles:
+		default:
+			path.lineTo(rcInner.right - halfStroke, rc.bottom - halfStroke);
+			QRectF rectangleArc(rc.right - arcHeight - halfStroke, rc.top + halfStroke,
+					    arcHeight, arcHeight);
+			path.arcTo(rectangleArc, 270, 180);
+			break;
+	}
+
+	// Close the path to enclose it for stroking and for filling, then draw it
+	path.closeSubpath();
+	GetPainter()->drawPath(path);
+}
+
+void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource)
+{
+	SurfaceImpl *source = dynamic_cast<SurfaceImpl *>(&surfaceSource);
+	QPixmap *pixmap = static_cast<QPixmap *>(source->GetPaintDevice());
+
+	GetPainter()->drawPixmap(rc.left, rc.top, *pixmap, from.x, from.y, -1, -1);
+}
+
+std::unique_ptr<IScreenLineLayout> SurfaceImpl::Layout(const IScreenLine *)
+{
+	return {};
+}
+
+void SurfaceImpl::DrawTextNoClip(PRectangle rc,
+				 const Font *font,
+                                 XYPOSITION ybase,
+				 std::string_view text,
+				 ColourRGBA fore,
+				 ColourRGBA back)
+{
+	SetFont(font);
+	PenColour(fore);
+
+	GetPainter()->setBackground(QColorFromColourRGBA(back));
+	GetPainter()->setBackgroundMode(Qt::OpaqueMode);
+	QString su = UnicodeFromText(codec, text);
+	GetPainter()->drawText(QPointF(rc.left, ybase), su);
+}
+
+void SurfaceImpl::DrawTextClipped(PRectangle rc,
+				  const Font *font,
+                                  XYPOSITION ybase,
+				  std::string_view text,
+				  ColourRGBA fore,
+				  ColourRGBA back)
+{
+	SetClip(rc);
+	DrawTextNoClip(rc, font, ybase, text, fore, back);
+	PopClip();
+}
+
+void SurfaceImpl::DrawTextTransparent(PRectangle rc,
+				      const Font *font,
+                                      XYPOSITION ybase,
+				      std::string_view text,
+	ColourRGBA fore)
+{
+	SetFont(font);
+	PenColour(fore);
+
+	GetPainter()->setBackgroundMode(Qt::TransparentMode);
+	QString su = UnicodeFromText(codec, text);
+	GetPainter()->drawText(QPointF(rc.left, ybase), su);
+}
+
+void SurfaceImpl::SetClip(PRectangle rc)
+{
+	GetPainter()->save();
+	GetPainter()->setClipRect(QRectFFromPRect(rc));
+}
+
+void SurfaceImpl::PopClip()
+{
+	GetPainter()->restore();
+}
+
+void SurfaceImpl::MeasureWidths(const Font *font,
+				std::string_view text,
+                                XYPOSITION *positions)
+{
+	if (!font)
+		return;
+	SetCodec(font);
+	QString su = UnicodeFromText(codec, text);
+	QTextLayout tlay(su, *FontPointer(font), GetPaintDevice());
+	tlay.beginLayout();
+	QTextLine tl = tlay.createLine();
+	tlay.endLayout();
+	if (mode.codePage == SC_CP_UTF8) {
+		int fit = su.size();
+		int ui=0;
+		size_t i=0;
+		while (ui<fit) {
+			const unsigned char uch = text[i];
+			const unsigned int byteCount = UTF8BytesOfLead[uch];
+			const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
+			qreal xPosition = tl.cursorToX(ui+codeUnits);
+			for (size_t bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
+				positions[i++] = xPosition;
+			}
+			ui += codeUnits;
+		}
+		XYPOSITION lastPos = 0;
+		if (i > 0)
+			lastPos = positions[i-1];
+		while (i<text.length()) {
+			positions[i++] = lastPos;
+		}
+	} else if (mode.codePage) {
+		// DBCS
+		int ui = 0;
+		for (size_t i=0; i<text.length();) {
+			size_t lenChar = DBCSIsLeadByte(mode.codePage, text[i]) ? 2 : 1;
+			qreal xPosition = tl.cursorToX(ui+1);
+			for (unsigned int bytePos=0; (bytePos<lenChar) && (i<text.length()); bytePos++) {
+				positions[i++] = xPosition;
+			}
+			ui++;
+		}
+	} else {
+		// Single byte encoding
+		for (int i=0; i<static_cast<int>(text.length()); i++) {
+			positions[i] = tl.cursorToX(i+1);
+		}
+	}
+}
+
+XYPOSITION SurfaceImpl::WidthText(const Font *font, std::string_view text)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	SetCodec(font);
+	QString su = UnicodeFromText(codec, text);
+	return metrics.width(su);
+}
+
+void SurfaceImpl::DrawTextNoClipUTF8(PRectangle rc,
+				 const Font *font,
+				 XYPOSITION ybase,
+				 std::string_view text,
+				 ColourRGBA fore,
+				 ColourRGBA back)
+{
+	SetFont(font);
+	PenColour(fore);
+
+	GetPainter()->setBackground(QColorFromColourRGBA(back));
+	GetPainter()->setBackgroundMode(Qt::OpaqueMode);
+	QString su = QString::fromUtf8(text.data(), static_cast<int>(text.length()));
+	GetPainter()->drawText(QPointF(rc.left, ybase), su);
+}
+
+void SurfaceImpl::DrawTextClippedUTF8(PRectangle rc,
+				  const Font *font,
+				  XYPOSITION ybase,
+				  std::string_view text,
+				  ColourRGBA fore,
+				  ColourRGBA back)
+{
+	SetClip(rc);
+	DrawTextNoClip(rc, font, ybase, text, fore, back);
+	PopClip();
+}
+
+void SurfaceImpl::DrawTextTransparentUTF8(PRectangle rc,
+				      const Font *font,
+				      XYPOSITION ybase,
+				      std::string_view text,
+	ColourRGBA fore)
+{
+	SetFont(font);
+	PenColour(fore);
+
+	GetPainter()->setBackgroundMode(Qt::TransparentMode);
+	QString su = QString::fromUtf8(text.data(), static_cast<int>(text.length()));
+	GetPainter()->drawText(QPointF(rc.left, ybase), su);
+}
+
+void SurfaceImpl::MeasureWidthsUTF8(const Font *font,
+				std::string_view text,
+				XYPOSITION *positions)
+{
+	if (!font)
+		return;
+	QString su = QString::fromUtf8(text.data(), static_cast<int>(text.length()));
+	QTextLayout tlay(su, *FontPointer(font), GetPaintDevice());
+	tlay.beginLayout();
+	QTextLine tl = tlay.createLine();
+	tlay.endLayout();
+	int fit = su.size();
+	int ui=0;
+	size_t i=0;
+	while (ui<fit) {
+		const unsigned char uch = text[i];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
+		qreal xPosition = tl.cursorToX(ui+codeUnits);
+		for (size_t bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
+			positions[i++] = xPosition;
+		}
+		ui += codeUnits;
+	}
+	XYPOSITION lastPos = 0;
+	if (i > 0)
+		lastPos = positions[i-1];
+	while (i<text.length()) {
+		positions[i++] = lastPos;
+	}
+}
+
+XYPOSITION SurfaceImpl::WidthTextUTF8(const Font *font, std::string_view text)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	QString su = QString::fromUtf8(text.data(), static_cast<int>(text.length()));
+	return metrics.width(su);
+}
+
+XYPOSITION SurfaceImpl::Ascent(const Font *font)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	return metrics.ascent();
+}
+
+XYPOSITION SurfaceImpl::Descent(const Font *font)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	// Qt returns 1 less than true descent
+	// See: QFontEngineWin::descent which says:
+	// ### we subtract 1 to even out the historical +1 in QFontMetrics's
+	// ### height=asc+desc+1 equation. Fix in Qt5.
+	return metrics.descent() + 1;
+}
+
+XYPOSITION SurfaceImpl::InternalLeading(const Font * /* font */)
+{
+	return 0;
+}
+
+XYPOSITION SurfaceImpl::Height(const Font *font)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	return metrics.height();
+}
+
+XYPOSITION SurfaceImpl::AverageCharWidth(const Font *font)
+{
+	QFontMetricsF metrics(*FontPointer(font), device);
+	return metrics.averageCharWidth();
+}
+
+void SurfaceImpl::FlushCachedState()
+{
+	if (device->paintingActive()) {
+		GetPainter()->setPen(QPen());
+		GetPainter()->setBrush(QBrush());
+	}
+}
+
+void SurfaceImpl::FlushDrawing()
+{
+}
+
+QPaintDevice *SurfaceImpl::GetPaintDevice()
+{
+	return device;
+}
+
+QPainter *SurfaceImpl::GetPainter()
+{
+	Q_ASSERT(device);
+	if (!painter) {
+		if (device->paintingActive()) {
+			painter = device->paintEngine()->painter();
+		} else {
+			painterOwned = true;
+			painter = new QPainter(device);
+		}
+
+		// Set text antialiasing unconditionally.
+		// The font's style strategy will override.
+		painter->setRenderHint(QPainter::TextAntialiasing, true);
+
+		painter->setRenderHint(QPainter::Antialiasing, true);
+	}
+
+	return painter;
+}
+
+std::unique_ptr<Surface> Surface::Allocate(Technology)
+{
+	return std::make_unique<SurfaceImpl>();
+}
+
+
+//----------------------------------------------------------------------
+
+namespace {
+
+QWidget *window(WindowID wid) noexcept
+{
+	return static_cast<QWidget *>(wid);
+}
+
+QRect ScreenRectangleForPoint(QPoint posGlobal)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+	const QScreen *screen = QGuiApplication::screenAt(posGlobal);
+	return screen->availableGeometry();
+#else
+	const QDesktopWidget *desktop = QApplication::desktop();
+	return desktop->availableGeometry(posGlobal);
+#endif
+}
+
+}
+
+Window::~Window() noexcept {}
+
+void Window::Destroy() noexcept
+{
+	if (wid)
+		delete window(wid);
+	wid = nullptr;
+}
+PRectangle Window::GetPosition() const
+{
+	// Before any size allocated pretend its 1000 wide so not scrolled
+	return wid ? PRectFromQRect(window(wid)->frameGeometry()) : PRectangle(0, 0, 1000, 1000);
+}
+
+void Window::SetPosition(PRectangle rc)
+{
+	if (wid)
+		window(wid)->setGeometry(QRectFromPRect(rc));
+}
+
+void Window::SetPositionRelative(PRectangle rc, const Window *relativeTo)
+{
+	QPoint oPos = window(relativeTo->wid)->mapToGlobal(QPoint(0,0));
+	int ox = oPos.x();
+	int oy = oPos.y();
+	ox += rc.left;
+	oy += rc.top;
+
+	const QRect rectDesk = ScreenRectangleForPoint(QPoint(ox, oy));
+	/* do some corrections to fit into screen */
+	int sizex = rc.right - rc.left;
+	int sizey = rc.bottom - rc.top;
+	int screenWidth = rectDesk.width();
+	if (ox < rectDesk.x())
+		ox = rectDesk.x();
+	if (sizex > screenWidth)
+		ox = rectDesk.x(); /* the best we can do */
+	else if (ox + sizex > rectDesk.right())
+		ox = rectDesk.right() - sizex;
+	if (oy + sizey > rectDesk.bottom())
+		oy = rectDesk.bottom() - sizey;
+
+	Q_ASSERT(wid);
+	window(wid)->move(ox, oy);
+	window(wid)->resize(sizex, sizey);
+}
+
+PRectangle Window::GetClientPosition() const
+{
+	// The client position is the window position
+	return GetPosition();
+}
+
+void Window::Show(bool show)
+{
+	if (wid)
+		window(wid)->setVisible(show);
+}
+
+void Window::InvalidateAll()
+{
+	if (wid)
+		window(wid)->update();
+}
+
+void Window::InvalidateRectangle(PRectangle rc)
+{
+	if (wid)
+		window(wid)->update(QRectFromPRect(rc));
+}
+
+void Window::SetCursor(Cursor curs)
+{
+	if (wid) {
+		Qt::CursorShape shape;
+
+		switch (curs) {
+			case Cursor::text:  shape = Qt::IBeamCursor;        break;
+			case Cursor::arrow: shape = Qt::ArrowCursor;        break;
+			case Cursor::up:    shape = Qt::UpArrowCursor;      break;
+			case Cursor::wait:  shape = Qt::WaitCursor;         break;
+			case Cursor::horizontal: shape = Qt::SizeHorCursor; break;
+			case Cursor::vertical:  shape = Qt::SizeVerCursor;  break;
+			case Cursor::hand:  shape = Qt::PointingHandCursor; break;
+			default:            shape = Qt::ArrowCursor;        break;
+		}
+
+		QCursor cursor = QCursor(shape);
+
+		if (curs != cursorLast) {
+			window(wid)->setCursor(cursor);
+			cursorLast = curs;
+		}
+	}
+}
+
+/* Returns rectangle of monitor pt is on, both rect and pt are in Window's
+   window coordinates */
+PRectangle Window::GetMonitorRect(Point pt)
+{
+	const QPoint posGlobal = window(wid)->mapToGlobal(QPoint(pt.x, pt.y));
+	const QPoint originGlobal = window(wid)->mapToGlobal(QPoint(0, 0));
+	QRect rectScreen = ScreenRectangleForPoint(posGlobal);
+	rectScreen.translate(-originGlobal.x(), -originGlobal.y());
+	return PRectFromQRect(rectScreen);
+}
+
+//----------------------------------------------------------------------
+class ListWidget : public QListWidget {
+public:
+	explicit ListWidget(QWidget *parent);
+	virtual ~ListWidget();
+
+	void setDelegate(IListBoxDelegate *lbDelegate);
+
+	int currentSelection();
+
+protected:
+	void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override;
+	void mouseDoubleClickEvent(QMouseEvent *event) override;
+	QStyleOptionViewItem viewOptions() const override;
+
+private:
+	IListBoxDelegate *delegate;
+};
+
+class ListBoxImpl : public ListBox {
+public:
+	ListBoxImpl() noexcept;
+	~ListBoxImpl() noexcept override = default;
+
+	void SetFont(const Font *font) override;
+	void Create(Window &parent, int ctrlID, Point location,
+						int lineHeight, bool unicodeMode_, Technology technology) override;
+	void SetAverageCharWidth(int width) override;
+	void SetVisibleRows(int rows) override;
+	int GetVisibleRows() const override;
+	PRectangle GetDesiredRect() override;
+	int CaretFromEdge() override;
+	void Clear() noexcept override;
+	void Append(char *s, int type = -1) override;
+	int Length() override;
+	void Select(int n) override;
+	int GetSelection() override;
+	int Find(const char *prefix) override;
+	std::string GetValue(int n) override;
+	void RegisterImage(int type, const char *xpmData) override;
+	void RegisterRGBAImage(int type, int width, int height,
+		const unsigned char *pixelsImage) override;
+	virtual void RegisterQPixmapImage(int type, const QPixmap& pm);
+	void ClearRegisteredImages() override;
+	void SetDelegate(IListBoxDelegate *lbDelegate) override;
+	void SetList(const char *list, char separator, char typesep) override;
+	void SetOptions(ListOptions options_) override;
+
+	ListWidget *GetWidget() const noexcept;
+private:
+	bool unicodeMode;
+	int visibleRows;
+	QMap<int,QPixmap> images;
+};
+ListBoxImpl::ListBoxImpl() noexcept
+: unicodeMode(false), visibleRows(5)
+{}
+
+void ListBoxImpl::Create(Window &parent,
+                         int /*ctrlID*/,
+                         Point location,
+                         int /*lineHeight*/,
+                         bool unicodeMode_,
+			 Technology)
+{
+	unicodeMode = unicodeMode_;
+
+	QWidget *qparent = static_cast<QWidget *>(parent.GetID());
+	ListWidget *list = new ListWidget(qparent);
+
+#if defined(Q_OS_WIN)
+	// On Windows, Qt::ToolTip causes a crash when the list is clicked on
+	// so Qt::Tool is used.
+	list->setParent(nullptr, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+		| Qt::WindowDoesNotAcceptFocus
+#endif
+	);
+#else
+	// On OS X, Qt::Tool takes focus so main window loses focus so
+	// keyboard stops working. Qt::ToolTip works but its only really
+	// documented for tooltips.
+	// On Linux / X this setting allows clicking on list items.
+	list->setParent(nullptr, Qt::ToolTip | Qt::FramelessWindowHint);
+#endif
+	list->setAttribute(Qt::WA_ShowWithoutActivating);
+	list->setFocusPolicy(Qt::NoFocus);
+	list->setUniformItemSizes(true);
+	list->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+	list->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	list->move(location.x, location.y);
+
+	int maxIconWidth = 0;
+	int maxIconHeight = 0;
+	foreach (QPixmap im, images) {
+		if (maxIconWidth < im.width())
+			maxIconWidth = im.width();
+		if (maxIconHeight < im.height())
+			maxIconHeight = im.height();
+	}
+	list->setIconSize(QSize(maxIconWidth, maxIconHeight));
+
+	wid = list;
+}
+void ListBoxImpl::SetFont(const Font *font)
+{
+	ListWidget *list = GetWidget();
+	const FontAndCharacterSet *pfacs = AsFontAndCharacterSet(font);
+	if (pfacs && pfacs->pfont) {
+		list->setFont(*(pfacs->pfont));
+	}
+}
+void ListBoxImpl::SetAverageCharWidth(int /*width*/) {}
+
+void ListBoxImpl::SetVisibleRows(int rows)
+{
+	visibleRows = rows;
+}
+
+int ListBoxImpl::GetVisibleRows() const
+{
+	return visibleRows;
+}
+PRectangle ListBoxImpl::GetDesiredRect()
+{
+	ListWidget *list = GetWidget();
+	int rows = Length();
+	if (rows == 0 || rows > visibleRows) {
+		rows = visibleRows;
+	}
+	int rowHeight = list->sizeHintForRow(0);
+	int height = (rows * rowHeight) + (2 * list->frameWidth());
+
+	QStyle *style = QApplication::style();
+	int width = list->sizeHintForColumn(0) + (2 * list->frameWidth());
+	if (Length() > rows) {
+		width += style->pixelMetric(QStyle::PM_ScrollBarExtent);
+	}
+
+	return PRectangle(0, 0, width, height);
+}
+int ListBoxImpl::CaretFromEdge()
+{
+	ListWidget *list = GetWidget();
+	int maxIconWidth = 0;
+	foreach (QPixmap im, images) {
+		if (maxIconWidth < im.width())
+			maxIconWidth = im.width();
+	}
+
+	int extra;
+	// The 12 is from trial and error on OS X and the 7
+	// is from trial and error on Windows - there may be
+	// a better programmatic way to find any padding factors.
+#ifdef Q_OS_DARWIN
+	extra = 12;
+#else
+	extra = 7;
+#endif
+	return maxIconWidth + (2 * list->frameWidth()) + extra;
+}
+void ListBoxImpl::Clear() noexcept
+{
+	ListWidget *list = GetWidget();
+	list->clear();
+}
+void ListBoxImpl::Append(char *s, int type)
+{
+	ListWidget *list = GetWidget();
+	QString str = unicodeMode ? QString::fromUtf8(s) : QString::fromLocal8Bit(s);
+	QIcon icon;
+	if (type >= 0) {
+		Q_ASSERT(images.contains(type));
+		icon = images.value(type);
+	}
+	new QListWidgetItem(icon, str, list);
+}
+int ListBoxImpl::Length()
+{
+	ListWidget *list = GetWidget();
+	return list->count();
+}
+void ListBoxImpl::Select(int n)
+{
+	ListWidget *list = GetWidget();
+	QModelIndex index = list->model()->index(n, 0);
+	if (index.isValid()) {
+		QRect row_rect = list->visualRect(index);
+		if (!list->viewport()->rect().contains(row_rect)) {
+			list->scrollTo(index, QAbstractItemView::PositionAtTop);
+		}
+	}
+	list->setCurrentRow(n);
+}
+int ListBoxImpl::GetSelection()
+{
+	ListWidget *list = GetWidget();
+	return list->currentSelection();
+}
+int ListBoxImpl::Find(const char *prefix)
+{
+	ListWidget *list = GetWidget();
+	QString sPrefix = unicodeMode ? QString::fromUtf8(prefix) : QString::fromLocal8Bit(prefix);
+	QList<QListWidgetItem *> ms = list->findItems(sPrefix, Qt::MatchStartsWith);
+	int result = -1;
+	if (!ms.isEmpty()) {
+		result = list->row(ms.first());
+	}
+
+	return result;
+}
+std::string ListBoxImpl::GetValue(int n)
+{
+	ListWidget *list = GetWidget();
+	QListWidgetItem *item = list->item(n);
+	QString str = item->data(Qt::DisplayRole).toString();
+	QByteArray bytes = unicodeMode ? str.toUtf8() : str.toLocal8Bit();
+	return std::string(bytes.constData());
+}
+
+void ListBoxImpl::RegisterQPixmapImage(int type, const QPixmap& pm)
+{
+	images[type] = pm;
+	ListWidget *list = GetWidget();
+	if (list) {
+		QSize iconSize = list->iconSize();
+		if (pm.width() > iconSize.width() || pm.height() > iconSize.height())
+			list->setIconSize(QSize(qMax(pm.width(), iconSize.width()),
+						 qMax(pm.height(), iconSize.height())));
+	}
+
+}
+
+void ListBoxImpl::RegisterImage(int type, const char *xpmData)
+{
+	RegisterQPixmapImage(type, QPixmap(reinterpret_cast<const char * const *>(xpmData)));
+}
+
+void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage)
+{
+	std::vector<unsigned char> imageBytes = ImageByteSwapped(width, height, pixelsImage);
+	QImage image(&imageBytes[0], width, height, QImage::Format_ARGB32);
+	RegisterQPixmapImage(type, QPixmap::fromImage(image));
+}
+
+void ListBoxImpl::ClearRegisteredImages()
+{
+	images.clear();
+	ListWidget *list = GetWidget();
+	if (list)
+		list->setIconSize(QSize(0, 0));
+}
+void ListBoxImpl::SetDelegate(IListBoxDelegate *lbDelegate)
+{
+	ListWidget *list = GetWidget();
+	list->setDelegate(lbDelegate);
+}
+void ListBoxImpl::SetList(const char *list, char separator, char typesep)
+{
+	// This method is *not* platform dependent.
+	// It is borrowed from the GTK implementation.
+	Clear();
+	size_t count = strlen(list) + 1;
+	std::vector<char> words(list, list+count);
+	char *startword = &words[0];
+	char *numword = nullptr;
+	int i = 0;
+	for (; words[i]; i++) {
+		if (words[i] == separator) {
+			words[i] = '\0';
+			if (numword)
+				*numword = '\0';
+			Append(startword, numword?atoi(numword + 1):-1);
+			startword = &words[0] + i + 1;
+			numword = nullptr;
+		} else if (words[i] == typesep) {
+			numword = &words[0] + i;
+		}
+	}
+	if (startword) {
+		if (numword)
+			*numword = '\0';
+		Append(startword, numword?atoi(numword + 1):-1);
+	}
+}
+void ListBoxImpl::SetOptions(ListOptions)
+{
+}
+ListWidget *ListBoxImpl::GetWidget() const noexcept
+{
+	return static_cast<ListWidget *>(wid);
+}
+
+ListBox::ListBox() noexcept {}
+ListBox::~ListBox() noexcept {}
+
+std::unique_ptr<ListBox> ListBox::Allocate()
+{
+	return std::make_unique<ListBoxImpl>();
+}
+ListWidget::ListWidget(QWidget *parent)
+: QListWidget(parent), delegate(nullptr)
+{}
+ListWidget::~ListWidget() {}
+
+void ListWidget::setDelegate(IListBoxDelegate *lbDelegate)
+{
+	delegate = lbDelegate;
+}
+
+void ListWidget::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) {
+	QListWidget::selectionChanged(selected, deselected);
+	if (delegate) {
+		const int selection = currentSelection();
+		if (selection >= 0) {
+			ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
+			delegate->ListNotify(&event);
+		}
+	}
+}
+
+int ListWidget::currentSelection() {
+	const QModelIndexList indices = selectionModel()->selectedRows();
+	foreach (const QModelIndex ind, indices) {
+		return ind.row();
+	}
+	return -1;
+}
+
+void ListWidget::mouseDoubleClickEvent(QMouseEvent * /* event */)
+{
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::doubleClick);
+		delegate->ListNotify(&event);
+	}
+}
+
+QStyleOptionViewItem ListWidget::viewOptions() const
+{
+	QStyleOptionViewItem result = QListWidget::viewOptions();
+	result.state |= QStyle::State_Active;
+	return result;
+}
+//----------------------------------------------------------------------
+Menu::Menu() noexcept : mid(nullptr) {}
+void Menu::CreatePopUp()
+{
+	Destroy();
+	mid = new QMenu();
+}
+
+void Menu::Destroy() noexcept
+{
+	if (mid) {
+		QMenu *menu = static_cast<QMenu *>(mid);
+		delete menu;
+	}
+	mid = nullptr;
+}
+void Menu::Show(Point pt, const Window & /*w*/)
+{
+	QMenu *menu = static_cast<QMenu *>(mid);
+	menu->exec(QPoint(pt.x, pt.y));
+	Destroy();
+}
+
+//----------------------------------------------------------------------
+
+ColourRGBA Platform::Chrome()
+{
+	QColor c(Qt::gray);
+	return ColourRGBA(c.red(), c.green(), c.blue());
+}
+
+ColourRGBA Platform::ChromeHighlight()
+{
+	QColor c(Qt::lightGray);
+	return ColourRGBA(c.red(), c.green(), c.blue());
+}
+
+const char *Platform::DefaultFont()
+{
+	static char fontNameDefault[200] = "";
+	if (!fontNameDefault[0]) {
+		QFont font = QApplication::font();
+		strcpy(fontNameDefault, font.family().toUtf8());
+	}
+	return fontNameDefault;
+}
+
+int Platform::DefaultFontSize()
+{
+	QFont font = QApplication::font();
+	return font.pointSize();
+}
+
+unsigned int Platform::DoubleClickTime()
+{
+	return QApplication::doubleClickInterval();
+}
+
+void Platform::DebugDisplay(const char *s) noexcept
+{
+	qWarning("Scintilla: %s", s);
+}
+
+void Platform::DebugPrintf(const char *format, ...) noexcept
+{
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer, format, pArguments);
+	va_end(pArguments);
+	Platform::DebugDisplay(buffer);
+}
+
+bool Platform::ShowAssertionPopUps(bool /*assertionPopUps*/) noexcept
+{
+	return false;
+}
+
+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);
+	if (Platform::ShowAssertionPopUps(false)) {
+		QMessageBox mb("Assertion Failure", buffer, QMessageBox::NoIcon,
+			QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+		mb.exec();
+	} else {
+		strcat(buffer, "\n");
+		Platform::DebugDisplay(buffer);
+	}
+}
+
+}
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.h b/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.h
new file mode 100644
index 0000000..02f3b0f
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/PlatQt.h
@@ -0,0 +1,162 @@
+// @file PlatQt.h
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// Scintilla platform layer for Qt
+
+#ifndef PLATQT_H
+#define PLATQT_H
+
+#include <cstddef>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <memory>
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "Platform.h"
+
+#include <QUrl>
+#include <QPaintDevice>
+#include <QPainter>
+#include <QHash>
+
+namespace Scintilla::Internal {
+
+const char *CharacterSetID(Scintilla::CharacterSet characterSet);
+
+inline QColor QColorFromColourRGBA(ColourRGBA ca)
+{
+	return QColor(ca.GetRed(), ca.GetGreen(), ca.GetBlue(), ca.GetAlpha());
+}
+
+inline QRect QRectFromPRect(PRectangle pr)
+{
+	return QRect(pr.left, pr.top, pr.Width(), pr.Height());
+}
+
+inline QRectF QRectFFromPRect(PRectangle pr)
+{
+	return QRectF(pr.left, pr.top, pr.Width(), pr.Height());
+}
+
+inline PRectangle PRectFromQRect(QRect qr)
+{
+	return PRectangle(qr.x(), qr.y(), qr.x() + qr.width(), qr.y() + qr.height());
+}
+
+inline Point PointFromQPoint(QPoint qp)
+{
+	return Point(qp.x(), qp.y());
+}
+
+inline QPointF QPointFFromPoint(Point qp)
+{
+	return QPointF(qp.x, qp.y);
+}
+
+constexpr PRectangle RectangleInset(PRectangle rc, XYPOSITION delta) noexcept {
+	return PRectangle(rc.left + delta, rc.top + delta, rc.right - delta, rc.bottom - delta);
+}
+
+class SurfaceImpl : public Surface {
+private:
+	QPaintDevice *device = nullptr;
+	QPainter *painter = nullptr;
+	bool deviceOwned = false;
+	bool painterOwned = false;
+	SurfaceMode mode;
+	const char *codecName = nullptr;
+	QTextCodec *codec = nullptr;
+
+	void Clear();
+
+public:
+	SurfaceImpl();
+	SurfaceImpl(int width, int height, SurfaceMode mode_);
+	virtual ~SurfaceImpl();
+
+	void Init(WindowID wid) override;
+	void Init(SurfaceID sid, WindowID wid) override;
+	std::unique_ptr<Surface> AllocatePixMap(int width, int height) override;
+
+	void SetMode(SurfaceMode mode) override;
+
+	void Release() noexcept override;
+	int SupportsFeature(Scintilla::Supports feature) noexcept override;
+	bool Initialised() override;
+	void PenColour(ColourRGBA fore);
+	void PenColourWidth(ColourRGBA fore, XYPOSITION strokeWidth);
+	int LogPixelsY() override;
+	int PixelDivisions() override;
+	int DeviceHeightFont(int points) override;
+	void LineDraw(Point start, Point end, Stroke stroke) override;
+	void PolyLine(const Point *pts, size_t npts, Stroke stroke) override;
+	void Polygon(const Point *pts, size_t npts, FillStroke fillStroke) override;
+	void RectangleDraw(PRectangle rc, FillStroke fillStroke) override;
+	void RectangleFrame(PRectangle rc, Stroke stroke) override;
+	void FillRectangle(PRectangle rc, Fill fill) override;
+	void FillRectangleAligned(PRectangle rc, Fill fill) override;
+	void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+	void RoundedRectangle(PRectangle rc, FillStroke fillStroke) override;
+	void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) override;
+	void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) override;
+	void DrawRGBAImage(PRectangle rc, int width, int height,
+		const unsigned char *pixelsImage) override;
+	void Ellipse(PRectangle rc, FillStroke fillStroke) override;
+	void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) override;
+	void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
+
+	std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
+	void DrawTextNoClip(PRectangle rc, const Font *font, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClipped(PRectangle rc, const Font *font, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparent(PRectangle rc, const Font *font, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore) override;
+	void MeasureWidths(const Font *font, std::string_view text,
+		XYPOSITION *positions) override;
+	XYPOSITION WidthText(const Font *font, std::string_view text) override;
+
+	void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase,
+		std::string_view text, ColourRGBA fore) override;
+	void MeasureWidthsUTF8(const Font *font_, std::string_view text,
+		XYPOSITION *positions) override;
+	XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
+	XYPOSITION Ascent(const Font *font) override;
+	XYPOSITION Descent(const Font *font) override;
+	XYPOSITION InternalLeading(const Font *font) override;
+	XYPOSITION Height(const Font *font) override;
+	XYPOSITION AverageCharWidth(const Font *font) override;
+
+	void SetClip(PRectangle rc) override;
+	void PopClip() override;
+	void FlushCachedState() override;
+	void FlushDrawing() override;
+
+	void BrushColour(ColourRGBA back);
+	void SetCodec(const Font *font);
+	void SetFont(const Font *font);
+
+	QPaintDevice *GetPaintDevice();
+	void SetPainter(QPainter *painter);
+	QPainter *GetPainter();
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
new file mode 100644
index 0000000..509f76d
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -0,0 +1,843 @@
+//
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// @file ScintillaEditBase.cpp - Qt widget that wraps ScintillaQt and provides events and scrolling
+
+#include "ScintillaEditBase.h"
+#include "ScintillaQt.h"
+#include "PlatQt.h"
+
+#include <QApplication>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QInputContext>
+#endif
+#include <QPainter>
+#include <QVarLengthArray>
+#include <QScrollBar>
+#include <QTextFormat>
+
+#define INDIC_INPUTMETHOD 24
+
+#define SC_INDICATOR_INPUT INDICATOR_IME
+#define SC_INDICATOR_TARGET INDICATOR_IME+1
+#define SC_INDICATOR_CONVERTED INDICATOR_IME+2
+#define SC_INDICATOR_UNKNOWN INDICATOR_IME_MAX
+
+// Q_WS_MAC and Q_WS_X11 aren't defined in Qt5
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#ifdef Q_OS_MAC
+#define Q_WS_MAC 1
+#endif
+
+#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN)
+#define Q_WS_X11 1
+#endif
+#endif // QT_VERSION >= 5.0.0
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+ScintillaEditBase::ScintillaEditBase(QWidget *parent)
+: QAbstractScrollArea(parent), sqt(nullptr), preeditPos(-1), wheelDelta(0)
+{
+	sqt = new ScintillaQt(this);
+
+	time.start();
+
+	// Set Qt defaults.
+	setAcceptDrops(true);
+	setMouseTracking(true);
+	setAutoFillBackground(false);
+	setFrameStyle(QFrame::NoFrame);
+	setFocusPolicy(Qt::StrongFocus);
+	setAttribute(Qt::WA_StaticContents);
+	viewport()->setAutoFillBackground(false);
+	setAttribute(Qt::WA_KeyCompression);
+	setAttribute(Qt::WA_InputMethodEnabled);
+
+	sqt->vs.indicators[SC_INDICATOR_UNKNOWN] = Indicator(IndicatorStyle::Hidden, ColourRGBA(0, 0, 0xff));
+	sqt->vs.indicators[SC_INDICATOR_INPUT] = Indicator(IndicatorStyle::Dots, ColourRGBA(0, 0, 0xff));
+	sqt->vs.indicators[SC_INDICATOR_CONVERTED] = Indicator(IndicatorStyle::CompositionThick, ColourRGBA(0, 0, 0xff));
+	sqt->vs.indicators[SC_INDICATOR_TARGET] = Indicator(IndicatorStyle::StraightBox, ColourRGBA(0, 0, 0xff));
+
+	connect(sqt, SIGNAL(notifyParent(Scintilla::NotificationData)),
+		this, SLOT(notifyParent(Scintilla::NotificationData)));
+
+	// Connect scroll bars.
+	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+	        this, SLOT(scrollVertical(int)));
+	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+	        this, SLOT(scrollHorizontal(int)));
+
+	// Connect pass-through signals.
+	connect(sqt, SIGNAL(horizontalRangeChanged(int,int)),
+	        this, SIGNAL(horizontalRangeChanged(int,int)));
+	connect(sqt, SIGNAL(verticalRangeChanged(int,int)),
+	        this, SIGNAL(verticalRangeChanged(int,int)));
+	connect(sqt, SIGNAL(horizontalScrolled(int)),
+	        this, SIGNAL(horizontalScrolled(int)));
+	connect(sqt, SIGNAL(verticalScrolled(int)),
+	        this, SIGNAL(verticalScrolled(int)));
+
+	connect(sqt, SIGNAL(notifyChange()),
+	        this, SIGNAL(notifyChange()));
+
+	connect(sqt, SIGNAL(command(Scintilla::uptr_t, Scintilla::sptr_t)),
+		this, SLOT(event_command(Scintilla::uptr_t, Scintilla::sptr_t)));
+
+	connect(sqt, SIGNAL(aboutToCopy(QMimeData *)),
+	        this, SIGNAL(aboutToCopy(QMimeData *)));
+}
+
+ScintillaEditBase::~ScintillaEditBase() {}
+
+sptr_t ScintillaEditBase::send(
+	unsigned int iMessage,
+	uptr_t wParam,
+	sptr_t lParam) const
+{
+	return sqt->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+sptr_t ScintillaEditBase::sends(
+    unsigned int iMessage,
+    uptr_t wParam,
+    const char *s) const
+{
+	return sqt->WndProc(static_cast<Message>(iMessage), wParam, (sptr_t)s);
+}
+
+void ScintillaEditBase::scrollHorizontal(int value)
+{
+	sqt->HorizontalScrollTo(value);
+}
+
+void ScintillaEditBase::scrollVertical(int value)
+{
+	sqt->ScrollTo(value);
+}
+
+bool ScintillaEditBase::event(QEvent *event)
+{
+	bool result = false;
+
+	if (event->type() == QEvent::KeyPress) {
+		// Circumvent the tab focus convention.
+		keyPressEvent(static_cast<QKeyEvent *>(event));
+		result = event->isAccepted();
+	} else if (event->type() == QEvent::Show) {
+		setMouseTracking(true);
+		result = QAbstractScrollArea::event(event);
+	} else if (event->type() == QEvent::Hide) {
+		setMouseTracking(false);
+		result = QAbstractScrollArea::event(event);
+	} else {
+		result = QAbstractScrollArea::event(event);
+	}
+
+	return result;
+}
+
+void ScintillaEditBase::paintEvent(QPaintEvent *event)
+{
+	sqt->PartialPaint(PRectFromQRect(event->rect()));
+}
+
+namespace {
+
+bool isWheelEventHorizontal(QWheelEvent *event) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+	return event->angleDelta().y() == 0;
+#else
+	return event->orientation() == Qt::Horizontal;
+#endif
+}
+
+int wheelEventYDelta(QWheelEvent *event) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+	return event->angleDelta().y();
+#else
+	return event->delta();
+#endif
+}
+
+}
+
+void ScintillaEditBase::wheelEvent(QWheelEvent *event)
+{
+	if (isWheelEventHorizontal(event)) {
+		if (horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff)
+			event->ignore();
+		else
+			QAbstractScrollArea::wheelEvent(event);
+	} else {
+		if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+			// Zoom! We play with the font sizes in the styles.
+			// Number of steps/line is ignored, we just care if sizing up or down
+			if (wheelEventYDelta(event) > 0) {
+				sqt->KeyCommand(Message::ZoomIn);
+			} else {
+				sqt->KeyCommand(Message::ZoomOut);
+			}
+		} else {
+			// Ignore wheel events when the scroll bars are disabled.
+			if (verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
+				event->ignore();
+			} else {
+				// Scroll
+				QAbstractScrollArea::wheelEvent(event);
+			}
+		}
+	}
+}
+
+void ScintillaEditBase::focusInEvent(QFocusEvent *event)
+{
+	sqt->SetFocusState(true);
+
+	QAbstractScrollArea::focusInEvent(event);
+}
+
+void ScintillaEditBase::focusOutEvent(QFocusEvent *event)
+{
+	sqt->SetFocusState(false);
+
+	QAbstractScrollArea::focusOutEvent(event);
+}
+
+void ScintillaEditBase::resizeEvent(QResizeEvent *)
+{
+	sqt->ChangeSize();
+	emit resized();
+}
+
+void ScintillaEditBase::keyPressEvent(QKeyEvent *event)
+{
+	// All keystrokes containing the meta modifier are
+	// assumed to be shortcuts not handled by scintilla.
+	if (QApplication::keyboardModifiers() & Qt::MetaModifier) {
+		QAbstractScrollArea::keyPressEvent(event);
+		emit keyPressed(event);
+		return;
+	}
+
+	int key = 0;
+	switch (event->key()) {
+		case Qt::Key_Down:          key = SCK_DOWN;     break;
+		case Qt::Key_Up:            key = SCK_UP;       break;
+		case Qt::Key_Left:          key = SCK_LEFT;     break;
+		case Qt::Key_Right:         key = SCK_RIGHT;    break;
+		case Qt::Key_Home:          key = SCK_HOME;     break;
+		case Qt::Key_End:           key = SCK_END;      break;
+		case Qt::Key_PageUp:        key = SCK_PRIOR;    break;
+		case Qt::Key_PageDown:      key = SCK_NEXT;     break;
+		case Qt::Key_Delete:        key = SCK_DELETE;   break;
+		case Qt::Key_Insert:        key = SCK_INSERT;   break;
+		case Qt::Key_Escape:        key = SCK_ESCAPE;   break;
+		case Qt::Key_Backspace:     key = SCK_BACK;     break;
+		case Qt::Key_Plus:          key = SCK_ADD;      break;
+		case Qt::Key_Minus:         key = SCK_SUBTRACT; break;
+		case Qt::Key_Backtab:       // fall through
+		case Qt::Key_Tab:           key = SCK_TAB;      break;
+		case Qt::Key_Enter:         // fall through
+		case Qt::Key_Return:        key = SCK_RETURN;   break;
+		case Qt::Key_Control:       key = 0;            break;
+		case Qt::Key_Alt:           key = 0;            break;
+		case Qt::Key_Shift:         key = 0;            break;
+		case Qt::Key_Meta:          key = 0;            break;
+		default:                    key = event->key(); break;
+	}
+
+	bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
+	bool ctrl  = QApplication::keyboardModifiers() & Qt::ControlModifier;
+	bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
+
+	bool consumed = false;
+	bool added = sqt->KeyDownWithModifiers(static_cast<Keys>(key),
+					       ScintillaQt::ModifierFlags(shift, ctrl, alt),
+					       &consumed) != 0;
+	if (!consumed)
+		consumed = added;
+
+	if (!consumed) {
+		// Don't insert text if the control key was pressed unless
+		// it was pressed in conjunction with alt for AltGr emulation.
+		bool input = (!ctrl || alt);
+
+		// Additionally, on non-mac platforms, don't insert text
+		// if the alt key was pressed unless control is also present.
+		// On mac alt can be used to insert special characters.
+#ifndef Q_WS_MAC
+		input &= (!alt || ctrl);
+#endif
+
+		QString text = event->text();
+		if (input && !text.isEmpty() && text[0].isPrint()) {
+			QByteArray utext = sqt->BytesForDocument(text);
+			sqt->InsertCharacter(std::string_view(utext.data(), utext.size()), CharacterSource::DirectInput);
+		} else {
+			event->ignore();
+		}
+	}
+
+	emit keyPressed(event);
+}
+
+#ifdef Q_WS_X11
+static int modifierTranslated(int sciModifier)
+{
+	switch (sciModifier) {
+		case SCMOD_SHIFT:
+			return Qt::ShiftModifier;
+		case SCMOD_CTRL:
+			return Qt::ControlModifier;
+		case SCMOD_ALT:
+			return Qt::AltModifier;
+		case SCMOD_SUPER:
+			return Qt::MetaModifier;
+		default:
+			return 0;
+	}
+}
+#endif
+
+void ScintillaEditBase::mousePressEvent(QMouseEvent *event)
+{
+	Point pos = PointFromQPoint(event->pos());
+
+	emit buttonPressed(event);
+
+	if (event->button() == Qt::MiddleButton &&
+	    QApplication::clipboard()->supportsSelection()) {
+		SelectionPosition selPos = sqt->SPositionFromLocation(
+					pos, false, false, sqt->UserVirtualSpace());
+		sqt->sel.Clear();
+		sqt->SetSelection(selPos, selPos);
+		sqt->PasteFromMode(QClipboard::Selection);
+		return;
+	}
+
+	if (event->button() == Qt::LeftButton) {
+		bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
+		bool ctrl  = QApplication::keyboardModifiers() & Qt::ControlModifier;
+#ifdef Q_WS_X11
+		// On X allow choice of rectangular modifier since most window
+		// managers grab alt + click for moving windows.
+		bool alt   = QApplication::keyboardModifiers() & modifierTranslated(sqt->rectangularSelectionModifier);
+#else
+		bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
+#endif
+
+		sqt->ButtonDownWithModifiers(pos, time.elapsed(), ScintillaQt::ModifierFlags(shift, ctrl, alt));
+	}
+
+	if (event->button() == Qt::RightButton) {
+		sqt->RightButtonDownWithModifiers(pos, time.elapsed(), ModifiersOfKeyboard());
+	}
+}
+
+void ScintillaEditBase::mouseReleaseEvent(QMouseEvent *event)
+{
+	Point point = PointFromQPoint(event->pos());
+	if (event->button() == Qt::LeftButton)
+		sqt->ButtonUpWithModifiers(point, time.elapsed(), ModifiersOfKeyboard());
+
+	int pos = send(SCI_POSITIONFROMPOINT, point.x, point.y);
+	sptr_t line = send(SCI_LINEFROMPOSITION, pos);
+	int modifiers = QApplication::keyboardModifiers();
+
+	emit textAreaClicked(line, modifiers);
+	emit buttonReleased(event);
+}
+
+void ScintillaEditBase::mouseDoubleClickEvent(QMouseEvent *event)
+{
+	// Scintilla does its own double-click detection.
+	mousePressEvent(event);
+}
+
+void ScintillaEditBase::mouseMoveEvent(QMouseEvent *event)
+{
+	Point pos = PointFromQPoint(event->pos());
+
+	bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
+	bool ctrl  = QApplication::keyboardModifiers() & Qt::ControlModifier;
+#ifdef Q_WS_X11
+	// On X allow choice of rectangular modifier since most window
+	// managers grab alt + click for moving windows.
+	bool alt   = QApplication::keyboardModifiers() & modifierTranslated(sqt->rectangularSelectionModifier);
+#else
+	bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
+#endif
+
+	const KeyMod modifiers = ScintillaQt::ModifierFlags(shift, ctrl, alt);
+
+	sqt->ButtonMoveWithModifiers(pos, time.elapsed(), modifiers);
+}
+
+void ScintillaEditBase::contextMenuEvent(QContextMenuEvent *event)
+{
+	Point pos = PointFromQPoint(event->globalPos());
+	Point pt = PointFromQPoint(event->pos());
+	if (!sqt->PointInSelection(pt)) {
+		sqt->SetEmptySelection(sqt->PositionFromLocation(pt));
+	}
+	if (sqt->ShouldDisplayPopup(pt)) {
+		sqt->ContextMenu(pos);
+	}
+}
+
+void ScintillaEditBase::dragEnterEvent(QDragEnterEvent *event)
+{
+	if (event->mimeData()->hasUrls()) {
+		event->acceptProposedAction();
+	} else if (event->mimeData()->hasText()) {
+		event->acceptProposedAction();
+
+		Point point = PointFromQPoint(event->pos());
+		sqt->DragEnter(point);
+	} else {
+		event->ignore();
+	}
+}
+
+void ScintillaEditBase::dragLeaveEvent(QDragLeaveEvent * /* event */)
+{
+	sqt->DragLeave();
+}
+
+void ScintillaEditBase::dragMoveEvent(QDragMoveEvent *event)
+{
+	if (event->mimeData()->hasUrls()) {
+		event->acceptProposedAction();
+	} else if (event->mimeData()->hasText()) {
+		event->acceptProposedAction();
+
+		Point point = PointFromQPoint(event->pos());
+		sqt->DragMove(point);
+	} else {
+		event->ignore();
+	}
+}
+
+void ScintillaEditBase::dropEvent(QDropEvent *event)
+{
+	if (event->mimeData()->hasUrls()) {
+		event->acceptProposedAction();
+		sqt->DropUrls(event->mimeData());
+	} else if (event->mimeData()->hasText()) {
+		event->acceptProposedAction();
+
+		Point point = PointFromQPoint(event->pos());
+		bool move = (event->source() == this &&
+                 event->proposedAction() == Qt::MoveAction);
+		sqt->Drop(point, event->mimeData(), move);
+	} else {
+		event->ignore();
+	}
+}
+
+bool ScintillaEditBase::IsHangul(const QChar qchar)
+{
+	int unicode = (int)qchar.unicode();
+	// Korean character ranges used for preedit chars.
+	// http://www.programminginkorean.com/programming/hangul-in-unicode/
+	const bool HangulJamo = (0x1100 <= unicode && unicode <= 0x11FF);
+	const bool HangulCompatibleJamo = (0x3130 <= unicode && unicode <= 0x318F);
+	const bool HangulJamoExtendedA = (0xA960 <= unicode && unicode <= 0xA97F);
+	const bool HangulJamoExtendedB = (0xD7B0 <= unicode && unicode <= 0xD7FF);
+	const bool HangulSyllable = (0xAC00 <= unicode && unicode <= 0xD7A3);
+	return HangulJamo || HangulCompatibleJamo  || HangulSyllable ||
+				HangulJamoExtendedA || HangulJamoExtendedB;
+}
+
+void ScintillaEditBase::MoveImeCarets(int offset)
+{
+	// Move carets relatively by bytes
+	for (size_t r=0; r < sqt->sel.Count(); r++) {
+		int positionInsert = sqt->sel.Range(r).Start().Position();
+		sqt->sel.Range(r).caret.SetPosition(positionInsert + offset);
+		sqt->sel.Range(r).anchor.SetPosition(positionInsert + offset);
+ 	}
+}
+
+void ScintillaEditBase::DrawImeIndicator(int indicator, int len)
+{
+	// Emulate the visual style of IME characters with indicators.
+	// Draw an indicator on the character before caret by the character bytes of len
+	// so it should be called after InsertCharacter().
+	// It does not affect caret positions.
+	if (indicator < 8 || indicator > INDICATOR_MAX) {
+		return;
+	}
+	sqt->pdoc->DecorationSetCurrentIndicator(indicator);
+	for (size_t r=0; r< sqt-> sel.Count(); r++) {
+		int positionInsert = sqt->sel.Range(r).Start().Position();
+		sqt->pdoc->DecorationFillRange(positionInsert - len, 1, len);
+	}
+}
+
+static int GetImeCaretPos(QInputMethodEvent *event)
+{
+	foreach (QInputMethodEvent::Attribute attr, event->attributes()) {
+		if (attr.type == QInputMethodEvent::Cursor)
+			return attr.start;
+	}
+	return 0;
+}
+
+static std::vector<int> MapImeIndicators(QInputMethodEvent *event)
+{
+	std::vector<int> imeIndicator(event->preeditString().size(), SC_INDICATOR_UNKNOWN);
+	foreach (QInputMethodEvent::Attribute attr, event->attributes()) {
+		if (attr.type == QInputMethodEvent::TextFormat) {
+			QTextFormat format = attr.value.value<QTextFormat>();
+			QTextCharFormat charFormat = format.toCharFormat();
+
+			int indicator = SC_INDICATOR_UNKNOWN;
+			switch (charFormat.underlineStyle()) {
+				case QTextCharFormat::NoUnderline: // win32, linux
+					indicator = SC_INDICATOR_TARGET;
+					break;
+				case QTextCharFormat::SingleUnderline: // osx
+				case QTextCharFormat::DashUnderline: // win32, linux
+					indicator = SC_INDICATOR_INPUT;
+					break;
+				case QTextCharFormat::DotLine:
+				case QTextCharFormat::DashDotLine:
+				case QTextCharFormat::WaveUnderline:
+				case QTextCharFormat::SpellCheckUnderline:
+					indicator = SC_INDICATOR_CONVERTED;
+					break;
+
+				default:
+					indicator = SC_INDICATOR_UNKNOWN;
+			}
+
+			if (format.hasProperty(QTextFormat::BackgroundBrush)) // win32, linux
+				indicator = SC_INDICATOR_TARGET;
+
+#ifdef Q_OS_OSX
+			if (charFormat.underlineStyle() == QTextCharFormat::SingleUnderline) {
+				QColor uc = charFormat.underlineColor();
+				if (uc.lightness() < 2) { // osx
+					indicator = SC_INDICATOR_TARGET;
+				}
+			}
+#endif
+
+			for (int i = attr.start; i < attr.start+attr.length; i++) {
+				imeIndicator[i] = indicator;
+			}
+		}
+	}
+	return imeIndicator;
+}
+
+void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
+{
+	// Copy & paste by johnsonj with a lot of helps of Neil
+	// Great thanks for my forerunners, jiniya and BLUEnLIVE
+
+	if (sqt->pdoc->IsReadOnly() || sqt->SelectionContainsProtected()) {
+		// Here, a canceling and/or completing composition function is needed.
+		return;
+	}
+
+	bool initialCompose = false;
+	if (sqt->pdoc->TentativeActive()) {
+		sqt->pdoc->TentativeUndo();
+	} else {
+		// No tentative undo means start of this composition so
+		// Fill in any virtual spaces.
+		initialCompose = true;
+	}
+
+	sqt->view.imeCaretBlockOverride = false;
+
+	if (!event->commitString().isEmpty()) {
+		const QString commitStr = event->commitString();
+		const unsigned int commitStrLen = commitStr.length();
+
+		for (unsigned int i = 0; i < commitStrLen;) {
+			const unsigned int ucWidth = commitStr.at(i).isHighSurrogate() ? 2 : 1;
+			const QString oneCharUTF16 = commitStr.mid(i, ucWidth);
+			const QByteArray oneChar = sqt->BytesForDocument(oneCharUTF16);
+
+			sqt->InsertCharacter(std::string_view(oneChar.data(), oneChar.length()), CharacterSource::DirectInput);
+			i += ucWidth;
+		}
+
+	} else if (!event->preeditString().isEmpty()) {
+		const QString preeditStr = event->preeditString();
+		const unsigned int preeditStrLen = preeditStr.length();
+		if (preeditStrLen == 0) {
+			sqt->ShowCaretAtCurrentPosition();
+			return;
+		}
+
+		if (initialCompose)
+			sqt->ClearBeforeTentativeStart();
+		sqt->pdoc->TentativeStart(); // TentativeActive() from now on.
+
+		std::vector<int> imeIndicator = MapImeIndicators(event);
+
+		for (unsigned int i = 0; i < preeditStrLen;) {
+			const unsigned int ucWidth = preeditStr.at(i).isHighSurrogate() ? 2 : 1;
+			const QString oneCharUTF16 = preeditStr.mid(i, ucWidth);
+			const QByteArray oneChar = sqt->BytesForDocument(oneCharUTF16);
+			const int oneCharLen = oneChar.length();
+
+			sqt->InsertCharacter(std::string_view(oneChar.data(), oneCharLen), CharacterSource::TentativeInput);
+
+			DrawImeIndicator(imeIndicator[i], oneCharLen);
+			i += ucWidth;
+		}
+
+		// Move IME carets.
+		int imeCaretPos = GetImeCaretPos(event);
+		int imeEndToImeCaretU16 = imeCaretPos - preeditStrLen;
+		int imeCaretPosDoc = sqt->pdoc->GetRelativePositionUTF16(sqt->CurrentPosition(), imeEndToImeCaretU16);
+
+		MoveImeCarets(- sqt->CurrentPosition() + imeCaretPosDoc);
+
+		if (IsHangul(preeditStr.at(0))) {
+#ifndef Q_OS_WIN
+			if (imeCaretPos > 0) {
+				int oneCharBefore = sqt->pdoc->GetRelativePosition(sqt->CurrentPosition(), -1);
+				MoveImeCarets(- sqt->CurrentPosition() + oneCharBefore);
+			}
+#endif
+			sqt->view.imeCaretBlockOverride = true;
+		}
+
+		// Set candidate box position for Qt::ImMicroFocus.
+		preeditPos = sqt->CurrentPosition();
+		sqt->EnsureCaretVisible();
+		updateMicroFocus();
+	}
+	sqt->ShowCaretAtCurrentPosition();
+}
+
+QVariant ScintillaEditBase::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+	int pos = send(SCI_GETCURRENTPOS);
+	int line = send(SCI_LINEFROMPOSITION, pos);
+
+	switch (query) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+		// Qt 5 renamed ImMicroFocus to ImCursorRectangle then deprecated
+		// ImMicroFocus. Its the same value (2) and same description.
+		case Qt::ImCursorRectangle:
+		{
+			int startPos = (preeditPos >= 0) ? preeditPos : pos;
+			Point pt = sqt->LocationFromPosition(startPos);
+			int width = send(SCI_GETCARETWIDTH);
+			int height = send(SCI_TEXTHEIGHT, line);
+			return QRect(pt.x, pt.y, width, height);
+		}
+#else
+		case Qt::ImMicroFocus:
+		{
+			int startPos = (preeditPos >= 0) ? preeditPos : pos;
+			Point pt = sqt->LocationFromPosition(startPos);
+			int width = send(SCI_GETCARETWIDTH);
+			int height = send(SCI_TEXTHEIGHT, line);
+			return QRect(pt.x, pt.y, width, height);
+		}
+#endif
+
+		case Qt::ImFont:
+		{
+			char fontName[64];
+			int style = send(SCI_GETSTYLEAT, pos);
+			int len = send(SCI_STYLEGETFONT, style, (sptr_t)fontName);
+			int size = send(SCI_STYLEGETSIZE, style);
+			bool italic = send(SCI_STYLEGETITALIC, style);
+			int weight = send(SCI_STYLEGETBOLD, style) ? QFont::Bold : -1;
+			return QFont(QString::fromUtf8(fontName, len), size, weight, italic);
+		}
+
+		case Qt::ImCursorPosition:
+		{
+			int paraStart = sqt->pdoc->ParaUp(pos);
+			return pos - paraStart;
+		}
+
+		case Qt::ImSurroundingText:
+		{
+			int paraStart = sqt->pdoc->ParaUp(pos);
+			int paraEnd = sqt->pdoc->ParaDown(pos);
+			QVarLengthArray<char,1024> buffer(paraEnd - paraStart + 1);
+
+			Sci_CharacterRange charRange;
+			charRange.cpMin = paraStart;
+			charRange.cpMax = paraEnd;
+
+			Sci_TextRange textRange;
+			textRange.chrg = charRange;
+			textRange.lpstrText = buffer.data();
+
+			send(SCI_GETTEXTRANGE, 0, (sptr_t)&textRange);
+
+			return sqt->StringFromDocument(buffer.constData());
+		}
+
+		case Qt::ImCurrentSelection:
+		{
+			QVarLengthArray<char,1024> buffer(send(SCI_GETSELTEXT));
+			send(SCI_GETSELTEXT, 0, (sptr_t)buffer.data());
+
+			return sqt->StringFromDocument(buffer.constData());
+		}
+
+		default:
+			return QVariant();
+	}
+}
+
+void ScintillaEditBase::notifyParent(NotificationData scn)
+{
+	emit notify(&scn);
+	switch (scn.nmhdr.code) {
+		case Notification::StyleNeeded:
+			emit styleNeeded(scn.position);
+			break;
+
+		case Notification::CharAdded:
+			emit charAdded(scn.ch);
+			break;
+
+		case Notification::SavePointReached:
+			emit savePointChanged(false);
+			break;
+
+		case Notification::SavePointLeft:
+			emit savePointChanged(true);
+			break;
+
+		case Notification::ModifyAttemptRO:
+			emit modifyAttemptReadOnly();
+			break;
+
+		case Notification::Key:
+			emit key(scn.ch);
+			break;
+
+		case Notification::DoubleClick:
+			emit doubleClick(scn.position, scn.line);
+			break;
+
+		case Notification::UpdateUI:
+			emit updateUi(scn.updated);
+			break;
+
+		case Notification::Modified:
+		{
+			const bool added = FlagSet(scn.modificationType, ModificationFlags::InsertText);
+			const bool deleted = FlagSet(scn.modificationType, ModificationFlags::DeleteText);
+
+			int length = send(SCI_GETTEXTLENGTH);
+			bool firstLineAdded = (added && length == 1) ||
+			                      (deleted && length == 0);
+
+			if (scn.linesAdded != 0) {
+				emit linesAdded(scn.linesAdded);
+			} else if (firstLineAdded) {
+				emit linesAdded(added ? 1 : -1);
+			}
+
+			const QByteArray bytes = QByteArray::fromRawData(scn.text, scn.length);
+			emit modified(scn.modificationType, scn.position, scn.length,
+			              scn.linesAdded, bytes, scn.line,
+			              scn.foldLevelNow, scn.foldLevelPrev);
+			break;
+		}
+
+		case Notification::MacroRecord:
+			emit macroRecord(scn.message, scn.wParam, scn.lParam);
+			break;
+
+		case Notification::MarginClick:
+			emit marginClicked(scn.position, scn.modifiers, scn.margin);
+			break;
+
+		case Notification::NeedShown:
+			emit needShown(scn.position, scn.length);
+			break;
+
+		case Notification::Painted:
+			emit painted();
+			break;
+
+		case Notification::UserListSelection:
+			emit userListSelection();
+			break;
+
+		case Notification::URIDropped:
+			emit uriDropped(QString::fromUtf8(scn.text));
+			break;
+
+		case Notification::DwellStart:
+			emit dwellStart(scn.x, scn.y);
+			break;
+
+		case Notification::DwellEnd:
+			emit dwellEnd(scn.x, scn.y);
+			break;
+
+		case Notification::Zoom:
+			emit zoom(send(SCI_GETZOOM));
+			break;
+
+		case Notification::HotSpotClick:
+			emit hotSpotClick(scn.position, scn.modifiers);
+			break;
+
+		case Notification::HotSpotDoubleClick:
+			emit hotSpotDoubleClick(scn.position, scn.modifiers);
+			break;
+
+		case Notification::CallTipClick:
+			emit callTipClick();
+			break;
+
+		case Notification::AutoCSelection:
+			emit autoCompleteSelection(scn.lParam, QString::fromUtf8(scn.text));
+			break;
+
+		case Notification::AutoCCancelled:
+			emit autoCompleteCancelled();
+			break;
+
+		case Notification::FocusIn:
+			emit focusChanged(true);
+			break;
+
+		case Notification::FocusOut:
+			emit focusChanged(false);
+			break;
+
+		default:
+			return;
+	}
+}
+
+void ScintillaEditBase::event_command(uptr_t wParam, sptr_t lParam)
+{
+	emit command(wParam, lParam);
+}
+
+KeyMod ScintillaEditBase::ModifiersOfKeyboard() const
+{
+	const bool shift = QApplication::keyboardModifiers() & Qt::ShiftModifier;
+	const bool ctrl  = QApplication::keyboardModifiers() & Qt::ControlModifier;
+	const bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
+
+	return ScintillaQt::ModifierFlags(shift, ctrl, alt);
+}
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h
new file mode 100644
index 0000000..9acc9c3
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -0,0 +1,167 @@
+//
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// @file ScintillaEditBase.h - Qt widget that wraps ScintillaQt and provides events and scrolling
+
+
+#ifndef SCINTILLAEDITBASE_H
+#define SCINTILLAEDITBASE_H
+
+#include <cstddef>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <memory>
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "Platform.h"
+#include "Scintilla.h"
+
+#include <QAbstractScrollArea>
+#include <QMimeData>
+#include <QElapsedTimer>
+
+namespace Scintilla::Internal {
+
+class ScintillaQt;
+class SurfaceImpl;
+
+}
+
+#ifndef EXPORT_IMPORT_API
+#ifdef WIN32
+#ifdef MAKING_LIBRARY
+#define EXPORT_IMPORT_API __declspec(dllexport)
+#else
+// Defining dllimport upsets moc
+#define EXPORT_IMPORT_API __declspec(dllimport)
+//#define EXPORT_IMPORT_API
+#endif
+#else
+#define EXPORT_IMPORT_API
+#endif
+#endif
+
+class EXPORT_IMPORT_API ScintillaEditBase : public QAbstractScrollArea {
+	Q_OBJECT
+
+public:
+	explicit ScintillaEditBase(QWidget *parent = 0);
+	virtual ~ScintillaEditBase();
+
+	virtual sptr_t send(
+		unsigned int iMessage,
+		uptr_t wParam = 0,
+		sptr_t lParam = 0) const;
+
+	virtual sptr_t sends(
+		unsigned int iMessage,
+		uptr_t wParam = 0,
+		const char *s = 0) const;
+
+public slots:
+	// Scroll events coming from GUI to be sent to Scintilla.
+	void scrollHorizontal(int value);
+	void scrollVertical(int value);
+
+	// Emit Scintilla notifications as signals.
+	void notifyParent(Scintilla::NotificationData scn);
+	void event_command(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+signals:
+	void horizontalScrolled(int value);
+	void verticalScrolled(int value);
+	void horizontalRangeChanged(int max, int page);
+	void verticalRangeChanged(int max, int page);
+	void notifyChange();
+	void linesAdded(Scintilla::Position linesAdded);
+
+	// Clients can use this hook to add additional
+	// formats (e.g. rich text) to the MIME data.
+	void aboutToCopy(QMimeData *data);
+
+	// Scintilla Notifications
+	void styleNeeded(Scintilla::Position position);
+	void charAdded(int ch);
+	void savePointChanged(bool dirty);
+	void modifyAttemptReadOnly();
+	void key(int key);
+	void doubleClick(Scintilla::Position position, Scintilla::Position line);
+	void updateUi(Scintilla::Update updated);
+	void modified(Scintilla::ModificationFlags type, Scintilla::Position position, Scintilla::Position length, Scintilla::Position linesAdded,
+		      const QByteArray &text, Scintilla::Position line, Scintilla::FoldLevel foldNow, Scintilla::FoldLevel foldPrev);
+	void macroRecord(Scintilla::Message message, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	void marginClicked(Scintilla::Position position, Scintilla::KeyMod modifiers, int margin);
+	void textAreaClicked(Scintilla::Position line, int modifiers);
+	void needShown(Scintilla::Position position, Scintilla::Position length);
+	void painted();
+	void userListSelection(); // Wants some args.
+	void uriDropped(const QString &uri);
+	void dwellStart(int x, int y);
+	void dwellEnd(int x, int y);
+	void zoom(int zoom);
+	void hotSpotClick(Scintilla::Position position, Scintilla::KeyMod modifiers);
+	void hotSpotDoubleClick(Scintilla::Position position, Scintilla::KeyMod modifiers);
+	void callTipClick();
+	void autoCompleteSelection(Scintilla::Position position, const QString &text);
+	void autoCompleteCancelled();
+	void focusChanged(bool focused);
+
+	// Base notifications for compatibility with other Scintilla implementations
+	void notify(Scintilla::NotificationData *pscn);
+	void command(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+	// GUI event notifications needed under Qt
+	void buttonPressed(QMouseEvent *event);
+	void buttonReleased(QMouseEvent *event);
+	void keyPressed(QKeyEvent *event);
+	void resized();
+
+protected:
+	bool event(QEvent *event) override;
+	void paintEvent(QPaintEvent *event) override;
+	void wheelEvent(QWheelEvent *event) override;
+	void focusInEvent(QFocusEvent *event) override;
+	void focusOutEvent(QFocusEvent *event) override;
+	void resizeEvent(QResizeEvent *event) override;
+	void keyPressEvent(QKeyEvent *event) override;
+	void mousePressEvent(QMouseEvent *event) override;
+	void mouseReleaseEvent(QMouseEvent *event) override;
+	void mouseDoubleClickEvent(QMouseEvent *event) override;
+	void mouseMoveEvent(QMouseEvent *event) override;
+	void contextMenuEvent(QContextMenuEvent *event) override;
+	void dragEnterEvent(QDragEnterEvent *event) override;
+	void dragLeaveEvent(QDragLeaveEvent *event) override;
+	void dragMoveEvent(QDragMoveEvent *event) override;
+	void dropEvent(QDropEvent *event) override;
+	void inputMethodEvent(QInputMethodEvent *event) override;
+	QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+	void scrollContentsBy(int, int) override {}
+
+private:
+	Scintilla::Internal::ScintillaQt *sqt;
+
+	QElapsedTimer time;
+
+	int preeditPos;
+	QString preeditString;
+
+	int wheelDelta;
+
+	static bool IsHangul(const QChar qchar);
+	void MoveImeCarets(int offset);
+	void DrawImeIndicator(int indicator, int len);
+	Scintilla::KeyMod ModifiersOfKeyboard() const;
+};
+
+#endif /* SCINTILLAEDITBASE_H */
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
new file mode 100644
index 0000000..152ba54
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -0,0 +1,103 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-05-05T12:41:23
+#
+#-------------------------------------------------
+
+QT       += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ScintillaEditBase
+TEMPLATE = lib
+CONFIG += lib_bundle
+CONFIG += c++1z
+
+VERSION = 5.1.1
+
+SOURCES += \
+    PlatQt.cpp \
+    ScintillaQt.cpp \
+    ScintillaEditBase.cpp \
+    ../../src/XPM.cxx \
+    ../../src/ViewStyle.cxx \
+    ../../src/UniqueString.cxx \
+    ../../src/UniConversion.cxx \
+    ../../src/Style.cxx \
+    ../../src/Selection.cxx \
+    ../../src/ScintillaBase.cxx \
+    ../../src/RunStyles.cxx \
+    ../../src/RESearch.cxx \
+    ../../src/PositionCache.cxx \
+    ../../src/PerLine.cxx \
+    ../../src/MarginView.cxx \
+    ../../src/LineMarker.cxx \
+    ../../src/KeyMap.cxx \
+    ../../src/Indicator.cxx \
+    ../../src/Geometry.cxx \
+    ../../src/EditView.cxx \
+    ../../src/Editor.cxx \
+    ../../src/EditModel.cxx \
+    ../../src/Document.cxx \
+    ../../src/Decoration.cxx \
+    ../../src/DBCS.cxx \
+    ../../src/ContractionState.cxx \
+    ../../src/CharClassify.cxx \
+    ../../src/CharacterType.cxx \
+    ../../src/CharacterCategoryMap.cxx \
+    ../../src/CellBuffer.cxx \
+    ../../src/CaseFolder.cxx \
+    ../../src/CaseConvert.cxx \
+    ../../src/CallTip.cxx \
+    ../../src/AutoComplete.cxx
+
+HEADERS  += \
+    PlatQt.h \
+    ScintillaQt.h \
+    ScintillaEditBase.h \
+    ../../src/XPM.h \
+    ../../src/ViewStyle.h \
+    ../../src/UniConversion.h \
+    ../../src/Style.h \
+    ../../src/SplitVector.h \
+    ../../src/Selection.h \
+    ../../src/ScintillaBase.h \
+    ../../src/RunStyles.h \
+    ../../src/RESearch.h \
+    ../../src/PositionCache.h \
+    ../../src/Platform.h \
+    ../../src/PerLine.h \
+    ../../src/Partitioning.h \
+    ../../src/LineMarker.h \
+    ../../src/KeyMap.h \
+    ../../src/Indicator.h \
+    ../../src/Geometry.h \
+    ../../src/FontQuality.h \
+    ../../src/Editor.h \
+    ../../src/Document.h \
+    ../../src/Decoration.h \
+    ../../src/ContractionState.h \
+    ../../src/CharClassify.h \
+    ../../src/CharacterType.h \
+    ../../src/CharacterCategoryMap.h \
+    ../../src/CellBuffer.h \
+    ../../src/CaseFolder.h \
+    ../../src/CaseConvert.h \
+    ../../src/CallTip.h \
+    ../../src/AutoComplete.h \
+    ../../include/Scintilla.h \
+    ../../include/ILexer.h
+
+OTHER_FILES +=
+
+INCLUDEPATH += ../../include ../../src
+
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG=1
+}
+
+DESTDIR = ../../bin
+
+macx {
+	QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/
+}
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.cpp b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.cpp
new file mode 100644
index 0000000..383f32c
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -0,0 +1,864 @@
+//
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// @file ScintillaQt.cpp - Qt specific subclass of ScintillaBase
+
+#include "ScintillaQt.h"
+#include "PlatQt.h"
+
+#include <QApplication>
+#include <QDrag>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QInputContext>
+#endif
+#include <QMimeData>
+#include <QMenu>
+#include <QTextCodec>
+#include <QScrollBar>
+#include <QTimer>
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+ScintillaQt::ScintillaQt(QAbstractScrollArea *parent)
+: QObject(parent), scrollArea(parent), vMax(0),  hMax(0), vPage(0), hPage(0),
+ haveMouseCapture(false), dragWasDropped(false)
+{
+
+	wMain = scrollArea->viewport();
+
+	imeInteraction = IMEInteraction::Inline;
+
+	// On OS X drawing text into a pixmap moves it around 1 pixel to
+	// the right compared to drawing it directly onto a window.
+	// Buffered drawing turned off by default to avoid this.
+	view.bufferedDraw = false;
+
+	Init();
+
+	std::fill(timers, std::end(timers), 0);
+}
+
+ScintillaQt::~ScintillaQt()
+{
+	CancelTimers();
+	ChangeIdle(false);
+}
+
+void ScintillaQt::execCommand(QAction *action)
+{
+	int command = action->data().toInt();
+	Command(command);
+}
+
+#if defined(Q_OS_WIN)
+static const QString sMSDEVColumnSelect("MSDEVColumnSelect");
+static const QString sWrappedMSDEVColumnSelect("application/x-qt-windows-mime;value=\"MSDEVColumnSelect\"");
+static const QString sVSEditorLineCutCopy("VisualStudioEditorOperationsLineCutCopyClipboardTag");
+static const QString sWrappedVSEditorLineCutCopy("application/x-qt-windows-mime;value=\"VisualStudioEditorOperationsLineCutCopyClipboardTag\"");
+#elif defined(Q_OS_MAC)
+static const QString sScintillaRecPboardType("com.scintilla.utf16-plain-text.rectangular");
+static const QString sScintillaRecMimeType("text/x-scintilla.utf16-plain-text.rectangular");
+#else
+// Linux
+static const QString sMimeRectangularMarker("text/x-rectangular-marker");
+#endif
+
+#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+
+class ScintillaRectangularMime : public QMacPasteboardMime {
+public:
+	ScintillaRectangularMime() : QMacPasteboardMime(MIME_ALL) {
+	}
+
+	QString convertorName() {
+		return QString("ScintillaRectangularMime");
+	}
+
+	bool canConvert(const QString &mime, QString flav) {
+		return mimeFor(flav) == mime;
+	}
+
+	QString mimeFor(QString flav) {
+		if (flav == sScintillaRecPboardType)
+			return sScintillaRecMimeType;
+		return QString();
+	}
+
+	QString flavorFor(const QString &mime) {
+		if (mime == sScintillaRecMimeType)
+			return sScintillaRecPboardType;
+		return QString();
+	}
+
+	QVariant convertToMime(const QString & /* mime */, QList<QByteArray> data, QString /* flav */) {
+		QByteArray all;
+		foreach (QByteArray i, data) {
+			all += i;
+		}
+		return QVariant(all);
+	}
+
+	QList<QByteArray> convertFromMime(const QString & /* mime */, QVariant data, QString /* flav */) {
+		QByteArray a = data.toByteArray();
+		QList<QByteArray> l;
+		l.append(a);
+		return l;
+	}
+
+};
+
+// The Mime object registers itself but only want one for all Scintilla instances.
+// Should delete at exit to help memory leak detection but that would be extra work
+// and, since the clipboard exists after last Scintilla instance, may be complex.
+static ScintillaRectangularMime *singletonMime = 0;
+
+#endif
+
+void ScintillaQt::Init()
+{
+	rectangularSelectionModifier = SCMOD_ALT;
+
+#if defined(Q_OS_MAC) && QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+	if (!singletonMime) {
+		singletonMime = new ScintillaRectangularMime();
+
+		QStringList slTypes(sScintillaRecPboardType);
+		qRegisterDraggedTypes(slTypes);
+	}
+#endif
+
+	connect(QApplication::clipboard(), SIGNAL(selectionChanged()),
+		this, SLOT(SelectionChanged()));
+}
+
+void ScintillaQt::Finalise()
+{
+	CancelTimers();
+	ScintillaBase::Finalise();
+}
+
+void ScintillaQt::SelectionChanged()
+{
+	bool nowPrimary = QApplication::clipboard()->ownsSelection();
+	if (nowPrimary != primarySelection) {
+		primarySelection = nowPrimary;
+		Redraw();
+	}
+}
+
+bool ScintillaQt::DragThreshold(Point ptStart, Point ptNow)
+{
+	int xMove = std::abs(ptStart.x - ptNow.x);
+	int yMove = std::abs(ptStart.y - ptNow.y);
+	return (xMove > QApplication::startDragDistance()) ||
+		(yMove > QApplication::startDragDistance());
+}
+
+static QString StringFromSelectedText(const SelectionText &selectedText)
+{
+	if (selectedText.codePage == SC_CP_UTF8) {
+		return QString::fromUtf8(selectedText.Data(), static_cast<int>(selectedText.Length()));
+	} else {
+		QTextCodec *codec = QTextCodec::codecForName(
+				CharacterSetID(selectedText.characterSet));
+		return codec->toUnicode(selectedText.Data(), static_cast<int>(selectedText.Length()));
+	}
+}
+
+static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] QString su)
+{
+#if defined(Q_OS_WIN)
+	// Add an empty marker
+	mimeData->setData(sMSDEVColumnSelect, QByteArray());
+#elif defined(Q_OS_MAC)
+	// OS X gets marker + data to work with other implementations.
+	// Don't understand how this works but it does - the
+	// clipboard format is supposed to be UTF-16, not UTF-8.
+	mimeData->setData(sScintillaRecMimeType, su.toUtf8());
+#else
+	// Linux
+	// Add an empty marker
+	mimeData->setData(sMimeRectangularMarker, QByteArray());
+#endif
+}
+
+static void AddLineCutCopyToMime([[maybe_unused]] QMimeData *mimeData)
+{
+#if defined(Q_OS_WIN)
+	// Add an empty marker
+	mimeData->setData(sVSEditorLineCutCopy, QByteArray());
+#endif
+}
+
+static bool IsRectangularInMime(const QMimeData *mimeData)
+{
+	QStringList formats = mimeData->formats();
+	for (int i = 0; i < formats.size(); ++i) {
+#if defined(Q_OS_WIN)
+		// Windows rectangular markers
+		// If rectangular copies made by this application, see base name.
+		if (formats[i] == sMSDEVColumnSelect)
+			return true;
+		// Otherwise see wrapped name.
+		if (formats[i] == sWrappedMSDEVColumnSelect)
+			return true;
+#elif defined(Q_OS_MAC)
+		if (formats[i] == sScintillaRecMimeType)
+			return true;
+#else
+		// Linux
+		if (formats[i] == sMimeRectangularMarker)
+			return true;
+#endif
+	}
+	return false;
+}
+
+static bool IsLineCutCopyInMime(const QMimeData *mimeData)
+{
+	QStringList formats = mimeData->formats();
+	for (int i = 0; i < formats.size(); ++i) {
+#if defined(Q_OS_WIN)
+		// Visual Studio Line Cut/Copy markers
+		// If line cut/copy made by this application, see base name.
+		if (formats[i] == sVSEditorLineCutCopy)
+			return true;
+		// Otherwise see wrapped name.
+		if (formats[i] == sWrappedVSEditorLineCutCopy)
+			return true;
+#endif
+	}
+	return false;
+}
+
+bool ScintillaQt::ValidCodePage(int codePage) const
+{
+	return codePage == 0
+	|| codePage == SC_CP_UTF8
+	|| codePage == 932
+	|| codePage == 936
+	|| codePage == 949
+	|| codePage == 950
+	|| codePage == 1361;
+}
+
+std::string ScintillaQt::UTF8FromEncoded(std::string_view encoded) const {
+	if (IsUnicodeMode()) {
+		return std::string(encoded);
+	} else {
+		QTextCodec *codec = QTextCodec::codecForName(
+				CharacterSetID(CharacterSetOfDocument()));
+		QString text = codec->toUnicode(encoded.data(), static_cast<int>(encoded.length()));
+		return text.toStdString();
+	}
+}
+
+std::string ScintillaQt::EncodedFromUTF8(std::string_view utf8) const {
+	if (IsUnicodeMode()) {
+		return std::string(utf8);
+	} else {
+		QString text = QString::fromUtf8(utf8.data(), static_cast<int>(utf8.length()));
+		QTextCodec *codec = QTextCodec::codecForName(
+				CharacterSetID(CharacterSetOfDocument()));
+		QByteArray ba = codec->fromUnicode(text);
+		return std::string(ba.data(), ba.length());
+	}
+}
+
+void ScintillaQt::ScrollText(Sci::Line linesToMove)
+{
+	int dy = vs.lineHeight * (linesToMove);
+	scrollArea->viewport()->scroll(0, dy);
+}
+
+void ScintillaQt::SetVerticalScrollPos()
+{
+	scrollArea->verticalScrollBar()->setValue(topLine);
+	emit verticalScrolled(topLine);
+}
+
+void ScintillaQt::SetHorizontalScrollPos()
+{
+	scrollArea->horizontalScrollBar()->setValue(xOffset);
+	emit horizontalScrolled(xOffset);
+}
+
+bool ScintillaQt::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage)
+{
+	bool modified = false;
+
+	int vNewPage = nPage;
+	int vNewMax = nMax - vNewPage + 1;
+	if (vMax != vNewMax || vPage != vNewPage) {
+		vMax = vNewMax;
+		vPage = vNewPage;
+		modified = true;
+
+		scrollArea->verticalScrollBar()->setMaximum(vMax);
+		scrollArea->verticalScrollBar()->setPageStep(vPage);
+		emit verticalRangeChanged(vMax, vPage);
+	}
+
+	int hNewPage = GetTextRectangle().Width();
+	int hNewMax = (scrollWidth > hNewPage) ? scrollWidth - hNewPage : 0;
+	int charWidth = vs.styles[STYLE_DEFAULT].aveCharWidth;
+	if (hMax != hNewMax || hPage != hNewPage ||
+	    scrollArea->horizontalScrollBar()->singleStep() != charWidth) {
+		hMax = hNewMax;
+		hPage = hNewPage;
+		modified = true;
+
+		scrollArea->horizontalScrollBar()->setMaximum(hMax);
+		scrollArea->horizontalScrollBar()->setPageStep(hPage);
+		scrollArea->horizontalScrollBar()->setSingleStep(charWidth);
+		emit horizontalRangeChanged(hMax, hPage);
+	}
+
+	return modified;
+}
+
+void ScintillaQt::ReconfigureScrollBars()
+{
+	if (verticalScrollBarVisible) {
+		scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+	} else {
+		scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	}
+
+	if (horizontalScrollBarVisible && !Wrapping()) {
+		scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+	} else {
+		scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	}
+}
+
+void ScintillaQt::CopyToModeClipboard(const SelectionText &selectedText, QClipboard::Mode clipboardMode_)
+{
+	QClipboard *clipboard = QApplication::clipboard();
+	QString su = StringFromSelectedText(selectedText);
+	QMimeData *mimeData = new QMimeData();
+	mimeData->setText(su);
+	if (selectedText.rectangular) {
+		AddRectangularToMime(mimeData, su);
+	}
+
+	if (selectedText.lineCopy) {
+		AddLineCutCopyToMime(mimeData);
+	}
+
+	// Allow client code to add additional data (e.g rich text).
+	emit aboutToCopy(mimeData);
+
+	clipboard->setMimeData(mimeData, clipboardMode_);
+}
+
+void ScintillaQt::Copy()
+{
+	if (!sel.Empty()) {
+		SelectionText st;
+		CopySelectionRange(&st);
+		CopyToClipboard(st);
+	}
+}
+
+void ScintillaQt::CopyToClipboard(const SelectionText &selectedText)
+{
+	CopyToModeClipboard(selectedText, QClipboard::Clipboard);
+}
+
+void ScintillaQt::PasteFromMode(QClipboard::Mode clipboardMode_)
+{
+	QClipboard *clipboard = QApplication::clipboard();
+	const QMimeData *mimeData = clipboard->mimeData(clipboardMode_);
+	bool isRectangular = IsRectangularInMime(mimeData);
+	bool isLine = SelectionEmpty() && IsLineCutCopyInMime(mimeData);
+	QString text = clipboard->text(clipboardMode_);
+	QByteArray utext = BytesForDocument(text);
+	std::string dest(utext.constData(), utext.length());
+	SelectionText selText;
+	selText.Copy(dest, pdoc->dbcsCodePage, CharacterSetOfDocument(), isRectangular, false);
+
+	UndoGroup ug(pdoc);
+	ClearSelection(multiPasteMode == MultiPaste::Each);
+	InsertPasteShape(selText.Data(), selText.Length(),
+		isRectangular ? PasteShape::rectangular : (isLine ? PasteShape::line : PasteShape::stream));
+	EnsureCaretVisible();
+}
+
+void ScintillaQt::Paste()
+{
+	PasteFromMode(QClipboard::Clipboard);
+}
+
+void ScintillaQt::ClaimSelection()
+{
+	if (QApplication::clipboard()->supportsSelection()) {
+		// X Windows has a 'primary selection' as well as the clipboard.
+		// Whenever the user selects some text, we become the primary selection
+		if (!sel.Empty()) {
+			primarySelection = true;
+			SelectionText st;
+			CopySelectionRange(&st);
+			CopyToModeClipboard(st, QClipboard::Selection);
+		} else {
+			primarySelection = false;
+		}
+	}
+}
+
+void ScintillaQt::NotifyChange()
+{
+	emit notifyChange();
+	emit command(
+			Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE),
+			reinterpret_cast<sptr_t>(wMain.GetID()));
+}
+
+void ScintillaQt::NotifyFocus(bool focus)
+{
+	if (commandEvents) {
+		emit command(
+				Platform::LongFromTwoShorts
+						(GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS),
+				reinterpret_cast<sptr_t>(wMain.GetID()));
+	}
+
+	Editor::NotifyFocus(focus);
+}
+
+void ScintillaQt::NotifyParent(NotificationData scn)
+{
+	scn.nmhdr.hwndFrom = wMain.GetID();
+	scn.nmhdr.idFrom = GetCtrlID();
+	emit notifyParent(scn);
+}
+
+void ScintillaQt::NotifyURIDropped(const char *uri)
+{
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::URIDropped;
+	scn.text = uri;
+
+	NotifyParent(scn);
+}
+
+bool ScintillaQt::FineTickerRunning(TickReason reason)
+{
+	return timers[static_cast<size_t>(reason)] != 0;
+}
+
+void ScintillaQt::FineTickerStart(TickReason reason, int millis, int /* tolerance */)
+{
+	FineTickerCancel(reason);
+	timers[static_cast<size_t>(reason)] = startTimer(millis);
+}
+
+// CancelTimers cleans up all fine-ticker timers and is non-virtual to avoid warnings when
+// called during destruction.
+void ScintillaQt::CancelTimers()
+{
+	for (size_t tr = static_cast<size_t>(TickReason::caret); tr <= static_cast<size_t>(TickReason::dwell); tr++) {
+		if (timers[tr]) {
+			killTimer(timers[tr]);
+			timers[tr] = 0;
+		}
+	}
+}
+
+void ScintillaQt::FineTickerCancel(TickReason reason)
+{
+	const size_t reasonIndex = static_cast<size_t>(reason);
+	if (timers[reasonIndex]) {
+		killTimer(timers[reasonIndex]);
+		timers[reasonIndex] = 0;
+	}
+}
+
+void ScintillaQt::onIdle()
+{
+	bool continueIdling = Idle();
+	if (!continueIdling) {
+		SetIdle(false);
+	}
+}
+
+bool ScintillaQt::ChangeIdle(bool on)
+{
+	QTimer *qIdle;
+	if (on) {
+		// Start idler, if it's not running.
+		if (!idler.state) {
+			idler.state = true;
+			qIdle = new QTimer;
+			connect(qIdle, SIGNAL(timeout()), this, SLOT(onIdle()));
+			qIdle->start(0);
+			idler.idlerID = qIdle;
+		}
+	} else {
+		// Stop idler, if it's running
+		if (idler.state) {
+			idler.state = false;
+			qIdle = static_cast<QTimer *>(idler.idlerID);
+			qIdle->stop();
+			disconnect(qIdle, SIGNAL(timeout()), nullptr, nullptr);
+			delete qIdle;
+			idler.idlerID = {};
+		}
+	}
+	return true;
+}
+
+bool ScintillaQt::SetIdle(bool on)
+{
+	return ChangeIdle(on);
+}
+
+CharacterSet ScintillaQt::CharacterSetOfDocument() const
+{
+	return vs.styles[STYLE_DEFAULT].characterSet;
+}
+
+const char *ScintillaQt::CharacterSetIDOfDocument() const
+{
+	return CharacterSetID(CharacterSetOfDocument());
+}
+
+QString ScintillaQt::StringFromDocument(const char *s) const
+{
+	if (IsUnicodeMode()) {
+		return QString::fromUtf8(s);
+	} else {
+		QTextCodec *codec = QTextCodec::codecForName(
+				CharacterSetID(CharacterSetOfDocument()));
+		return codec->toUnicode(s);
+	}
+}
+
+QByteArray ScintillaQt::BytesForDocument(const QString &text) const
+{
+	if (IsUnicodeMode()) {
+		return text.toUtf8();
+	} else {
+		QTextCodec *codec = QTextCodec::codecForName(
+				CharacterSetID(CharacterSetOfDocument()));
+		return codec->fromUnicode(text);
+	}
+}
+
+
+class CaseFolderDBCS : public CaseFolderTable {
+	QTextCodec *codec;
+public:
+	explicit CaseFolderDBCS(QTextCodec *codec_) : codec(codec_) {
+		StandardASCII();
+	}
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
+		if ((lenMixed == 1) && (sizeFolded > 0)) {
+			folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
+			return 1;
+		} else if (codec) {
+			QString su = codec->toUnicode(mixed, static_cast<int>(lenMixed));
+			QString suFolded = su.toCaseFolded();
+			QByteArray bytesFolded = codec->fromUnicode(suFolded);
+
+			if (bytesFolded.length() < static_cast<int>(sizeFolded)) {
+				memcpy(folded, bytesFolded,  bytesFolded.length());
+				return bytesFolded.length();
+			}
+		}
+		// Something failed so return a single NUL byte
+		folded[0] = '\0';
+		return 1;
+	}
+};
+
+std::unique_ptr<CaseFolder> ScintillaQt::CaseFolderForEncoding()
+{
+	if (pdoc->dbcsCodePage == SC_CP_UTF8) {
+		return std::make_unique<CaseFolderUnicode>();
+	} else {
+		const char *charSetBuffer = CharacterSetIDOfDocument();
+		if (charSetBuffer) {
+			if (pdoc->dbcsCodePage == 0) {
+				std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>();
+				pcf->StandardASCII();
+				QTextCodec *codec = QTextCodec::codecForName(charSetBuffer);
+				// Only for single byte encodings
+				for (int i=0x80; i<0x100; i++) {
+					char sCharacter[2] = "A";
+					sCharacter[0] = static_cast<char>(i);
+					QString su = codec->toUnicode(sCharacter, 1);
+					QString suFolded = su.toCaseFolded();
+					if (codec->canEncode(suFolded)) {
+						QByteArray bytesFolded = codec->fromUnicode(suFolded);
+						if (bytesFolded.length() == 1) {
+							pcf->SetTranslation(sCharacter[0], bytesFolded[0]);
+						}
+					}
+				}
+				return pcf;
+			} else {
+				return std::make_unique<CaseFolderDBCS>(QTextCodec::codecForName(charSetBuffer));
+			}
+		}
+		return nullptr;
+	}
+}
+
+std::string ScintillaQt::CaseMapString(const std::string &s, CaseMapping caseMapping)
+{
+	if ((s.size() == 0) || (caseMapping == CaseMapping::same))
+		return s;
+
+	if (IsUnicodeMode()) {
+		std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
+		size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
+			(caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
+		retMapped.resize(lenMapped);
+		return retMapped;
+	}
+
+	QTextCodec *codec = QTextCodec::codecForName(CharacterSetIDOfDocument());
+	QString text = codec->toUnicode(s.c_str(), static_cast<int>(s.length()));
+
+	if (caseMapping == CaseMapping::upper) {
+		text = text.toUpper();
+	} else {
+		text = text.toLower();
+	}
+
+	QByteArray bytes = BytesForDocument(text);
+	return std::string(bytes.data(), bytes.length());
+}
+
+void ScintillaQt::SetMouseCapture(bool on)
+{
+	// This is handled automatically by Qt
+	if (mouseDownCaptures) {
+		haveMouseCapture = on;
+	}
+}
+
+bool ScintillaQt::HaveMouseCapture()
+{
+	return haveMouseCapture;
+}
+
+void ScintillaQt::StartDrag()
+{
+	inDragDrop = DragDrop::dragging;
+	dropWentOutside = true;
+	if (drag.Length()) {
+		QMimeData *mimeData = new QMimeData;
+		QString sText = StringFromSelectedText(drag);
+		mimeData->setText(sText);
+		if (drag.rectangular) {
+			AddRectangularToMime(mimeData, sText);
+		}
+		// This QDrag is not freed as that causes a crash on Linux
+		QDrag *dragon = new QDrag(scrollArea);
+		dragon->setMimeData(mimeData);
+
+		Qt::DropAction dropAction = dragon->exec(Qt::CopyAction|Qt::MoveAction);
+		if ((dropAction == Qt::MoveAction) && dropWentOutside) {
+			// Remove dragged out text
+			ClearSelection();
+		}
+	}
+	inDragDrop = DragDrop::none;
+	SetDragPosition(SelectionPosition(Sci::invalidPosition));
+}
+
+class CallTipImpl : public QWidget {
+public:
+	CallTipImpl(CallTip *pct_)
+		: QWidget(nullptr, Qt::ToolTip),
+		  pct(pct_)
+	{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+		setWindowFlag(Qt::WindowTransparentForInput);
+#endif
+	}
+
+	void paintEvent(QPaintEvent *) override
+	{
+		if (pct->inCallTipMode) {
+			std::unique_ptr<Surface> surfaceWindow = Surface::Allocate(Technology::Default);
+			surfaceWindow->Init(this);
+			surfaceWindow->SetMode(SurfaceMode(pct->codePage, false));
+			pct->PaintCT(surfaceWindow.get());
+		}
+	}
+
+private:
+	CallTip *pct;
+};
+
+void ScintillaQt::CreateCallTipWindow(PRectangle rc)
+{
+
+	if (!ct.wCallTip.Created()) {
+		QWidget *pCallTip = new CallTipImpl(&ct);
+		ct.wCallTip = pCallTip;
+		pCallTip->move(rc.left, rc.top);
+		pCallTip->resize(rc.Width(), rc.Height());
+	}
+}
+
+void ScintillaQt::AddToPopUp(const char *label,
+                             int cmd,
+                             bool enabled)
+{
+	QMenu *menu = static_cast<QMenu *>(popup.GetID());
+	QString text(label);
+
+	if (text.isEmpty()) {
+		menu->addSeparator();
+	} else {
+		QAction *action = menu->addAction(text);
+		action->setData(cmd);
+		action->setEnabled(enabled);
+	}
+
+	// Make sure the menu's signal is connected only once.
+	menu->disconnect();
+	connect(menu, SIGNAL(triggered(QAction *)),
+	        this, SLOT(execCommand(QAction *)));
+}
+
+sptr_t ScintillaQt::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam)
+{
+	try {
+		switch (iMessage) {
+
+		case Message::SetIMEInteraction:
+			// Only inline IME supported on Qt
+			break;
+
+		case Message::GrabFocus:
+			scrollArea->setFocus(Qt::OtherFocusReason);
+			break;
+
+		case Message::GetDirectFunction:
+			return reinterpret_cast<sptr_t>(DirectFunction);
+
+		case Message::GetDirectStatusFunction:
+			return reinterpret_cast<sptr_t>(DirectStatusFunction);
+
+		case Message::GetDirectPointer:
+			return reinterpret_cast<sptr_t>(this);
+
+		default:
+			return ScintillaBase::WndProc(iMessage, wParam, lParam);
+		}
+	} catch (std::bad_alloc &) {
+		errorStatus = Status::BadAlloc;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return 0;
+}
+
+sptr_t ScintillaQt::DefWndProc(Message, uptr_t, sptr_t)
+{
+	return 0;
+}
+
+sptr_t ScintillaQt::DirectFunction(
+    sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam)
+{
+	ScintillaQt *sci = reinterpret_cast<ScintillaQt *>(ptr);
+	return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+sptr_t ScintillaQt::DirectStatusFunction(
+    sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus)
+{
+	ScintillaQt *sci = reinterpret_cast<ScintillaQt *>(ptr);
+	const sptr_t returnValue = sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+	*pStatus = static_cast<int>(sci->errorStatus);
+	return returnValue;
+}
+
+// Additions to merge in Scientific Toolworks widget structure
+
+void ScintillaQt::PartialPaint(const PRectangle &rect)
+{
+	rcPaint = rect;
+	paintState = PaintState::painting;
+	PRectangle rcClient = GetClientRectangle();
+	paintingAllText = rcPaint.Contains(rcClient);
+
+	AutoSurface surfacePaint(this);
+	Paint(surfacePaint, rcPaint);
+	surfacePaint->Release();
+
+	if (paintState == PaintState::abandoned) {
+		// FIXME: Failure to paint the requested rectangle in each
+		// paint event causes flicker on some platforms (Mac?)
+		// Paint rect immediately.
+		paintState = PaintState::painting;
+		paintingAllText = true;
+
+		AutoSurface surface(this);
+		Paint(surface, rcPaint);
+		surface->Release();
+
+		// Queue a full repaint.
+		scrollArea->viewport()->update();
+	}
+
+	paintState = PaintState::notPainting;
+}
+
+void ScintillaQt::DragEnter(const Point &point)
+{
+	SetDragPosition(SPositionFromLocation(point,
+					      false, false, UserVirtualSpace()));
+}
+
+void ScintillaQt::DragMove(const Point &point)
+{
+	SetDragPosition(SPositionFromLocation(point,
+					      false, false, UserVirtualSpace()));
+}
+
+void ScintillaQt::DragLeave()
+{
+	SetDragPosition(SelectionPosition(Sci::invalidPosition));
+}
+
+void ScintillaQt::Drop(const Point &point, const QMimeData *data, bool move)
+{
+	QString text = data->text();
+	bool rectangular = IsRectangularInMime(data);
+	QByteArray bytes = BytesForDocument(text);
+	int len = bytes.length();
+
+	SelectionPosition movePos = SPositionFromLocation(point,
+				false, false, UserVirtualSpace());
+
+	DropAt(movePos, bytes, len, move, rectangular);
+}
+
+void ScintillaQt::DropUrls(const QMimeData *data)
+{
+	foreach(const QUrl &url, data->urls()) {
+		NotifyURIDropped(url.toString().toUtf8().constData());
+	}
+}
+
+void ScintillaQt::timerEvent(QTimerEvent *event)
+{
+	for (size_t tr=static_cast<size_t>(TickReason::caret); tr<=static_cast<size_t>(TickReason::dwell); tr++) {
+		if (timers[tr] == event->timerId()) {
+			TickFor(static_cast<TickReason>(tr));
+		}
+	}
+}
diff --git a/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.h b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.h
new file mode 100644
index 0000000..a4b59e0
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditBase/ScintillaQt.h
@@ -0,0 +1,184 @@
+//
+//          Copyright (c) 1990-2011, Scientific Toolworks, Inc.
+//
+// The License.txt file describes the conditions under which this software may be distributed.
+//
+// Author: Jason Haslam
+//
+// Additions Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+// @file ScintillaQt.h - Qt specific subclass of ScintillaBase
+
+#ifndef SCINTILLAQT_H
+#define SCINTILLAQT_H
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+#include <cstdio>
+#include <ctime>
+#include <cmath>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "Scintilla.h"
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+#include "ILoader.h"
+#include "ILexer.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "AutoComplete.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "ScintillaBase.h"
+#include "CaseConvert.h"
+
+#include <QObject>
+#include <QAbstractScrollArea>
+#include <QAction>
+#include <QClipboard>
+#include <QPaintEvent>
+
+class ScintillaEditBase;
+
+namespace Scintilla::Internal {
+
+class ScintillaQt : public QObject, public ScintillaBase {
+	Q_OBJECT
+
+public:
+	explicit ScintillaQt(QAbstractScrollArea *parent);
+	virtual ~ScintillaQt();
+
+signals:
+	void horizontalScrolled(int value);
+	void verticalScrolled(int value);
+	void horizontalRangeChanged(int max, int page);
+	void verticalRangeChanged(int max, int page);
+
+	void notifyParent(Scintilla::NotificationData scn);
+	void notifyChange();
+
+	// Clients can use this hook to add additional
+	// formats (e.g. rich text) to the MIME data.
+	void aboutToCopy(QMimeData *data);
+
+	void command(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+private slots:
+	void onIdle();
+	void execCommand(QAction *action);
+	void SelectionChanged();
+
+private:
+	void Init();
+	void Finalise() override;
+	bool DragThreshold(Point ptStart, Point ptNow) override;
+	bool ValidCodePage(int codePage) const override;
+	std::string UTF8FromEncoded(std::string_view encoded) const override;
+	std::string EncodedFromUTF8(std::string_view utf8) const override;
+
+private:
+	void ScrollText(Sci::Line linesToMove) override;
+	void SetVerticalScrollPos() override;
+	void SetHorizontalScrollPos() override;
+	bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override;
+	void ReconfigureScrollBars() override;
+	void CopyToModeClipboard(const SelectionText &selectedText, QClipboard::Mode clipboardMode_);
+	void Copy() override;
+	void CopyToClipboard(const SelectionText &selectedText) override;
+	void PasteFromMode(QClipboard::Mode clipboardMode_);
+	void Paste() override;
+	void ClaimSelection() override;
+	void NotifyChange() override;
+	void NotifyFocus(bool focus) override;
+	void NotifyParent(Scintilla::NotificationData scn) override;
+	void NotifyURIDropped(const char *uri);
+	int timers[static_cast<size_t>(TickReason::dwell)+1];
+	bool FineTickerRunning(TickReason reason) override;
+	void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+	void CancelTimers();
+	void FineTickerCancel(TickReason reason) override;
+	bool ChangeIdle(bool on);
+	bool SetIdle(bool on) override;
+	void SetMouseCapture(bool on) override;
+	bool HaveMouseCapture() override;
+	void StartDrag() override;
+	Scintilla::CharacterSet CharacterSetOfDocument() const;
+	const char *CharacterSetIDOfDocument() const;
+	QString StringFromDocument(const char *s) const;
+	QByteArray BytesForDocument(const QString &text) const;
+	std::unique_ptr<CaseFolder> CaseFolderForEncoding() override;
+	std::string CaseMapString(const std::string &s, CaseMapping caseMapping) override;
+
+	void CreateCallTipWindow(PRectangle rc) override;
+	void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+	sptr_t WndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override;
+	sptr_t DefWndProc(Scintilla::Message iMessage, uptr_t wParam, sptr_t lParam) override;
+
+	static sptr_t DirectFunction(sptr_t ptr,
+				     unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	static sptr_t DirectStatusFunction(sptr_t ptr,
+				     unsigned int iMessage, uptr_t wParam, sptr_t lParam, int *pStatus);
+
+protected:
+
+	void PartialPaint(const PRectangle &rect);
+
+	void DragEnter(const Point &point);
+	void DragMove(const Point &point);
+	void DragLeave();
+	void Drop(const Point &point, const QMimeData *data, bool move);
+	void DropUrls(const QMimeData *data);
+
+	void timerEvent(QTimerEvent *event) override;
+
+private:
+	QAbstractScrollArea *scrollArea;
+
+	int vMax, hMax;   // Scroll bar maximums.
+	int vPage, hPage; // Scroll bar page sizes.
+
+	bool haveMouseCapture;
+	bool dragWasDropped;
+	int rectangularSelectionModifier;
+
+	friend class ::ScintillaEditBase;
+};
+
+}
+
+#endif /* SCINTILLAQT_H */
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/README b/scite-app/scintilla/qt/ScintillaEditPy/README
new file mode 100644
index 0000000..d0c653d
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/README
@@ -0,0 +1,87 @@
+README for building of ScintillaEditPy on Qt with PySide
+
+This directory is for building a Python encapsulation of Scintilla for use
+with PySide. For C++ libraries see the README in the parent directory.
+
+	Prerequisites
+
+PySide and ScintillaEditPy currently only support Python 2.x.
+
+CMake may be used to rebuild PySide and is required on Windows.
+It can be downloaded from
+http://www.cmake.org/cmake/resources/software.html
+
+On Windows, PySide only supports Visual C++ 2008. The "Visual Studio 2008
+Command Prompt" should be used to run all build commands.
+Visual C++ 2008 Express Edition can be downloaded from
+http://msdn.microsoft.com/en-us/express/future/bb421473
+
+Download and install PySide. Instructions are on the PySide web site
+http://developer.qt.nokia.com/wiki/Category:LanguageBindings::PySide::Downloads
+
+For Linux, there may be both PySide library packages and PySide development
+files. Both should be installed as ScintillaEditPy needs the headers and
+libraries from the development package and runs with the normal library package.
+On apt-based systems, the packages are libshiboken-dev, shiboken, libpyside-dev,
+and python-pyside. python-dev is also needed for Python language headers.
+On yum-based systems the packages are shiboken-devel, python-pyside-devel,
+and python-devel.
+The qmake program may be called qmake-qt5 or qmake-qt4.
+It can be found with:
+which qmake-qt5 || which qmake-qt4 || which qmake
+
+On Windows, the PySide library packages can be downloaded from
+http://developer.qt.nokia.com/wiki/PySide_Binaries_Windows
+The PySide development files must be built from source using CMake as
+described on the PySide site. This will create a Unix-style set of [bin, include,
+lib, and share] directories in packaging\setuptools\install-py<ver>-qt<qver>.
+There is no standard place for the PySide development files so copy them
+to "\usr", creating it if needed.
+
+On OS X, a combined package with PySide libraries and PySide development
+files can be downloaded from
+http://developer.qt.nokia.com/wiki/PySide_Binaries_MacOSX
+This package works best in combination with the Qt libraries for Mac from
+http://qt.nokia.com/downloads/downloads#qt-lib
+
+The path should be modified so that a Python 2.x interpreter and Qt's "qmake"
+program can be run by typing "python" or "qmake".
+
+	Building
+
+There are several steps to building and they are encapsulated in the sepbuild.py
+script which is run:
+
+python sepbuild.py
+
+This script first runs the WidgetGen.py script to fill out the ScintillaEdit.h,
+ScintillaEdit.cpp and ScintillaConstants.py files.
+
+A short file "sepbuild.pri" is written out which contains a series of version and
+path properties discovered by sepbuild.py which are used by qmake.
+
+Then it runs PySide's "shiboken" program to create C++ code that will act as a
+bridge between Python and the C++ libraries. This code goes into the
+ScintillaEditPy/ScintillaEditPy directory. Several log files are produced which can
+help uncover problems in the bridge if it fails to build.
+
+The qmake program is run to produce make files from ScintillaEditPy.pro.
+
+The system make program is then run to build the library. The library is located in
+the scintilla/bin directory as ScintillaEditPy.so for Unix systems and
+ScintillaEditPy.pyd for Windows.
+
+A demonstration program can be run:
+
+python testsepq.py
+
+The individual steps in the script can be run manually if wanted although the
+shiboken program has complex arguments and differs between systems so run
+sepbuild.py and copy the section starting with a line containing "generatorrunner"
+and continuing to "typesystem_ScintillaEdit.xml".
+
+On Windows, it is more difficult to set up an environment to debug ScintillaEditPy
+since all the libraries have to be debug or all have to be release. The easy path
+is to always build for release with "nmake release".
+
+To remove generated code, run "python sepbuild.py --clean".
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/ScintillaConstants.py.template b/scite-app/scintilla/qt/ScintillaEditPy/ScintillaConstants.py.template
new file mode 100644
index 0000000..31b8239
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/ScintillaConstants.py.template
@@ -0,0 +1,6 @@
+# ScintillaConstants.py
+# Define all the symbolic constants from Scintilla.iface so Python code can use them
+# Copyright (c) 2011 Archaeopteryx Software, Inc. d/b/a Wingware
+
+# ++Autogenerated -- start of section automatically generated from Scintilla.iface */
+# --Autogenerated -- end of section automatically generated from Scintilla.iface */
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/ScintillaEditPy.pro b/scite-app/scintilla/qt/ScintillaEditPy/ScintillaEditPy.pro
new file mode 100644
index 0000000..96f3ae8
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/ScintillaEditPy.pro
@@ -0,0 +1,128 @@
+TEMPLATE = lib
+QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = ScintillaEditPy
+
+# Clear debug & release so that sepbuild.pri can set one or the other
+CONFIG -= debug release
+CONFIG += c++1z
+
+include(sepbuild.pri)
+
+VERSION = $$SCINTILLA_VERSION
+
+win32 {
+	DebugBuild {
+		TARGET_EXT = _d.pyd
+	}
+	else {
+		TARGET_EXT = .pyd
+	}
+}
+
+INCLUDEPATH += ../ScintillaEdit
+INCLUDEPATH += ../ScintillaEditBase
+INCLUDEPATH += ../../include ../../lexlib ../../src
+
+INCLUDEPATH += $$PY_INCLUDES
+
+INCLUDEPATH += $$SHIBOKEN_INCLUDES
+INCLUDEPATH += $$PYSIDE_INCLUDES
+INCLUDEPATH += $$PYSIDE_INCLUDES/QtCore
+INCLUDEPATH += $$PYSIDE_INCLUDES/QtGui
+
+unix:!mac {
+	LIBS += `pkg-config pyside --libs`
+}
+unix:linux-* {
+	# gcc on freebsd 9.2, at least, doesn't support -Wno-empty-body
+	# g++ 7.x has deprecated std::auto_ptr but that is used by code generated by Shiboken so
+	# turn off warning.
+	QMAKE_CXXFLAGS += -Wno-register -Wno-unused-parameter -Wno-empty-body -Wno-deprecated-declarations -Wno-deprecated-copy --std=gnu++17
+	LIBS += -ldl
+}
+
+macx {
+	# Only build for x64 for now
+	# QMAKE_CFLAGS = -arch i386 -arch x86_64
+	# QMAKE_CXXFLAGS = -arch i386 -arch x86_64
+	# QMAKE_LFLAGS = -arch i386 -arch x86_64
+	LIBS += -L$$PY_LIBDIR -lpython$$PY_VERSION_SUFFIX
+	LIBS += -L$$PYSIDE_LIB -L$$SHIBOKEN_LIB
+	debug {
+		LIBS += -lshiboken-python$$PY_VERSION_SUFFIX-dbg
+		LIBS += -lpyside-python$$PY_VERSION_SUFFIX-dbg
+	}
+	else {
+		LIBS += -lshiboken-python$$PY_VERSION_SUFFIX
+		LIBS += -lpyside-python$$PY_VERSION_SUFFIX
+	}
+}
+
+win32 {
+	DebugBuild {
+		DEFINES += DEBUG
+		LIBS += -lQtCored4
+	}
+	else {
+		LIBS += -lQtCore
+	}
+	LIBS += -L$$PY_PREFIX/libs # Note python lib is pulled in via a #pragma
+	LIBS += -L$$PYSIDE_LIB -L$$SHIBOKEN_LIB
+	# PySide uses x.y suffix on Windows even though Python uses xy
+	DebugBuild {
+		LIBS += -lshiboken-python$${PY_VERSION}_d
+		LIBS += -lpyside-python$${PY_VERSION}_d
+	}
+	else {
+		LIBS += -lshiboken-python$${PY_VERSION}
+		LIBS += -lpyside-python$${PY_VERSION}
+	}
+}
+
+# Wrapper sources; notifyheader commented out due to shiboken bug
+SOURCES += \
+	ScintillaEditPy/scintillaeditpy_module_wrapper.cpp \
+	ScintillaEditPy/sci_notifyheader_wrapper.cpp \
+	ScintillaEditPy/scnotification_wrapper.cpp \
+	ScintillaEditPy/scintillaeditbase_wrapper.cpp \
+	ScintillaEditPy/scintillaedit_wrapper.cpp \
+	ScintillaEditPy/scintilladocument_wrapper.cpp
+
+# ScintillaEdit sources
+
+SOURCES += \
+    ../ScintillaEdit/ScintillaEdit.cpp \
+    ../ScintillaEdit/ScintillaDocument.cpp \
+    ../ScintillaEditBase/PlatQt.cpp \
+    ../ScintillaEditBase/ScintillaQt.cpp \
+    ../ScintillaEditBase/ScintillaEditBase.cpp \
+    $$files(../../src/*.cxx, false) \
+    $$files(../../lexlib/*.cxx, false) \
+    $$files(../../lexers/*.cxx, false)
+
+
+# HEADERS is used to find what needs to be run through moc
+HEADERS  += \
+    ../ScintillaEdit/ScintillaEdit.h \
+    ../ScintillaEdit/ScintillaDocument.h \
+    ../ScintillaEditBase/ScintillaQt.h \
+    ../ScintillaEditBase/ScintillaEditBase.h
+
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
+CONFIG(release, debug|release) {
+    DEFINES += NDEBUG=1
+}
+
+DESTDIR = ../../bin
+
+unix:!mac {
+	# Rename to not have 'lib' at start
+	QMAKE_POST_LINK += rm -rf ../../bin/ScintillaEditPy.so && ln -s libScintillaEditPy.so ../../bin/ScintillaEditPy.so
+}
+
+macx {
+	# Rename to .so and not have 'lib' at start
+	QMAKE_POST_LINK += rm -rf ../../bin/ScintillaEditPy.so && ln -s libScintillaEditPy.dylib ../../bin/ScintillaEditPy.so
+}
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/global.h b/scite-app/scintilla/qt/ScintillaEditPy/global.h
new file mode 100644
index 0000000..8b4be84
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/global.h
@@ -0,0 +1,4 @@
+#include "pyside_global.h"
+
+#include "ScintillaEditBase.h"
+#include "ScintillaEdit.h"
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/moc_ScintillaEdit.cpp b/scite-app/scintilla/qt/ScintillaEditPy/moc_ScintillaEdit.cpp
new file mode 100644
index 0000000..cd5a829
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/moc_ScintillaEdit.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'ScintillaEdit.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "../ScintillaEdit/ScintillaEdit.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'ScintillaEdit.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.7. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_ScintillaEdit[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_ScintillaEdit[] = {
+    "ScintillaEdit\0"
+};
+
+void ScintillaEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData ScintillaEdit::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject ScintillaEdit::staticMetaObject = {
+    { &ScintillaEditBase::staticMetaObject, qt_meta_stringdata_ScintillaEdit,
+      qt_meta_data_ScintillaEdit, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &ScintillaEdit::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *ScintillaEdit::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *ScintillaEdit::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_ScintillaEdit))
+        return static_cast<void*>(const_cast< ScintillaEdit*>(this));
+    return ScintillaEditBase::qt_metacast(_clname);
+}
+
+int ScintillaEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = ScintillaEditBase::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/sepbuild.py b/scite-app/scintilla/qt/ScintillaEditPy/sepbuild.py
new file mode 100644
index 0000000..7eae634
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/sepbuild.py
@@ -0,0 +1,345 @@
+#!/usr/bin/env python2
+import distutils.sysconfig
+import getopt
+import glob
+import os
+import platform
+import shutil
+import subprocess
+import stat
+import sys
+
+# ScintillaEditPy can only be built against Python 2.x so fail if Python 3.x
+assert sys.version_info < (3,0), "sepbuild.py requires Python 2.x"
+
+sys.path.append(os.path.join("..", "ScintillaEdit"))
+import WidgetGen
+
+scintillaDirectory = "../.."
+scintillaScriptsDirectory = os.path.join(scintillaDirectory, "scripts")
+sys.path.append(scintillaScriptsDirectory)
+from FileGenerator import GenerateFile
+
+# Decide up front which platform, treat anything other than Windows or OS X as Linux
+PLAT_WINDOWS = platform.system() == "Windows"
+PLAT_DARWIN = platform.system() == "Darwin"
+PLAT_LINUX = not (PLAT_DARWIN or PLAT_WINDOWS)
+
+def IsFileNewer(name1, name2):
+	""" Returns whether file with name1 is newer than file with name2.  Returns 1
+	if name2 doesn't exist. """
+
+	if not os.path.exists(name1):
+		return 0
+
+	if not os.path.exists(name2):
+		return 1
+
+	mod_time1 = os.stat(name1)[stat.ST_MTIME]
+	mod_time2 = os.stat(name2)[stat.ST_MTIME]
+	return (mod_time1 > mod_time2)
+
+def textFromRun(args):
+	proc = subprocess.Popen(args, shell=isinstance(args, str), stdout=subprocess.PIPE)
+	(stdoutdata, stderrdata) = proc.communicate()
+	if proc.returncode:
+		print("Warning  - failed to run '" + " ".join(args) + "'")
+		raise OSError(proc.returncode)
+	return stdoutdata
+
+def runProgram(args, exitOnFailure):
+	print(" ".join(args))
+	retcode = subprocess.call(" ".join(args), shell=True, stderr=subprocess.STDOUT)
+	if retcode:
+		print("Failed in " + " ".join(args) + " return code = " + str(retcode))
+		if exitOnFailure:
+			sys.exit()
+
+def usage():
+	print("sepbuild.py [-h|--help][-c|--clean][-u|--underscore-names]")
+	print("")
+	print("Generate PySide wappers and build them.")
+	print("")
+	print("options:")
+	print("")
+	print("-c --clean remove all object and generated files")
+	print("-b --pyside-base  Location of the PySide+Qt4 sandbox to use")
+	print("-h --help  display this text")
+	print("-d --debug=yes|no  force debug build (or non-debug build)")
+	print("-u --underscore-names  use method_names consistent with GTK+ standards")
+
+modifyFunctionElement = """		<modify-function signature="%s">%s
+		</modify-function>"""
+
+injectCode = """
+			<inject-code class="target" position="beginning">%s
+			</inject-code>"""
+
+injectCheckN = """
+				if (!cppArg%d) {
+					PyErr_SetString(PyExc_ValueError, "Null string argument");
+					return 0;
+				}"""
+
+def methodSignature(name, v, options):
+	argTypes = ""
+	p1Type = WidgetGen.cppAlias(v["Param1Type"])
+	if p1Type == "int":
+		p1Type = "sptr_t"
+	if p1Type:
+		argTypes = argTypes + p1Type
+	p2Type = WidgetGen.cppAlias(v["Param2Type"])
+	if p2Type == "int":
+		p2Type = "sptr_t"
+	if p2Type and v["Param2Type"] != "stringresult":
+		if p1Type:
+			argTypes = argTypes + ", "
+		argTypes = argTypes + p2Type
+	methodName = WidgetGen.normalisedName(name, options, v["FeatureType"])
+	constDeclarator = " const" if v["FeatureType"] == "get" else ""
+	return methodName + "(" + argTypes + ")" + constDeclarator
+
+def printTypeSystemFile(f, options):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			feat = v["FeatureType"]
+			if feat in ["fun", "get", "set"]:
+				checks = ""
+				if v["Param1Type"] == "string":
+					checks = checks + (injectCheckN % 0)
+				if v["Param2Type"] == "string":
+					if v["Param1Type"] == "":	# Only arg 2 -> treat as first
+						checks = checks + (injectCheckN % 0)
+					else:
+						checks = checks + (injectCheckN % 1)
+				if checks:
+					inject = injectCode % checks
+					out.append(modifyFunctionElement % (methodSignature(name, v, options), inject))
+				#if v["Param1Type"] == "string":
+				#	out.append("<string-xml>" + name + "</string-xml>\n")
+	return out
+
+def doubleBackSlashes(s):
+	# Quote backslashes so qmake does not produce warnings
+	return s.replace("\\", "\\\\")
+
+class SepBuilder:
+	def __init__(self):
+		# Discover configuration parameters
+		self.ScintillaEditIncludes = [".", "../ScintillaEdit", "../ScintillaEditBase", "../../include"]
+		if PLAT_WINDOWS:
+			self.MakeCommand = "nmake"
+			self.MakeTarget = "release"
+		else:
+			self.MakeCommand = "make"
+			self.MakeTarget = ""
+
+		if PLAT_DARWIN:
+			self.QMakeOptions = "-spec macx-g++"
+		else:
+			self.QMakeOptions = ""
+
+		# Default to debug build if running in a debug build interpreter
+		self.DebugBuild = hasattr(sys, 'getobjects')
+
+		# Python
+		self.PyVersion = "%d.%d" % sys.version_info[:2]
+		self.PyVersionSuffix = distutils.sysconfig.get_config_var("VERSION")
+		self.PyIncludes = distutils.sysconfig.get_python_inc()
+		self.PyPrefix = distutils.sysconfig.get_config_var("prefix")
+		self.PyLibDir = distutils.sysconfig.get_config_var(
+			("LIBDEST" if sys.platform == 'win32' else "LIBDIR"))
+
+		# Scintilla
+		with open("../../version.txt") as f:
+			version = f.read()
+			self.ScintillaVersion = version[0] + '.' + version[1] + '.' + version[2]
+
+		# Find out what qmake is called
+		self.QMakeCommand = "qmake"
+		if not PLAT_WINDOWS:
+			# On Unix qmake may not be present but qmake-qt4 may be so check
+			pathToQMake = textFromRun("which qmake-qt4 || which qmake").rstrip()
+			self.QMakeCommand = os.path.basename(pathToQMake)
+
+		# Qt default location from qmake
+		self._SetQtIncludeBase(textFromRun(self.QMakeCommand + " -query QT_INSTALL_HEADERS").rstrip())
+
+		# PySide default location
+		# No standard for installing PySide development headers and libs on Windows so
+		# choose /usr to be like Linux
+		self._setPySideBase('\\usr' if PLAT_WINDOWS else '/usr')
+
+		self.ProInclude = "sepbuild.pri"
+
+		self.qtStyleInterface = True
+
+	def _setPySideBase(self, base):
+
+		self.PySideBase = base
+		def _try_pkgconfig(var, package, *relpath):
+			try:
+				return textFromRun(["pkg-config", "--variable=" + var, package]).rstrip()
+			except OSError:
+				return os.path.join(self.PySideBase, *relpath)
+		self.PySideTypeSystem = _try_pkgconfig("typesystemdir", "pyside",
+		                                       "share", "PySide", "typesystems")
+		self.PySideIncludeBase = _try_pkgconfig("includedir", "pyside",
+		                                        "include", "PySide")
+		self.ShibokenIncludeBase = _try_pkgconfig("includedir", "shiboken",
+		                                          "include", "shiboken")
+		self.PySideIncludes = [
+			self.ShibokenIncludeBase,
+			self.PySideIncludeBase,
+			os.path.join(self.PySideIncludeBase, "QtCore"),
+			os.path.join(self.PySideIncludeBase, "QtGui")]
+
+		self.PySideLibDir = _try_pkgconfig("libdir", "pyside", "lib")
+		self.ShibokenLibDir = _try_pkgconfig("libdir", "shiboken", "lib")
+		self.AllIncludes = os.pathsep.join(self.QtIncludes + self.ScintillaEditIncludes + self.PySideIncludes)
+
+		self.ShibokenGenerator = "shiboken"
+		# Is this still needed? It doesn't work with latest shiboken sources
+		#if PLAT_DARWIN:
+		#	# On OS X, can not automatically find Shiboken dylib so provide a full path
+		#	self.ShibokenGenerator = os.path.join(self.PySideLibDir, "generatorrunner", "shiboken")
+
+	def generateAPI(self, args):
+		os.chdir(os.path.join("..", "ScintillaEdit"))
+		if not self.qtStyleInterface:
+			args.insert(0, '--underscore-names')
+		WidgetGen.main(args)
+		f = WidgetGen.readInterface(False)
+		os.chdir(os.path.join("..", "ScintillaEditPy"))
+		options = {"qtStyle": self.qtStyleInterface}
+		GenerateFile("typesystem_ScintillaEdit.xml.template", "typesystem_ScintillaEdit.xml",
+			"<!-- ", True, printTypeSystemFile(f, options))
+
+	def runGenerator(self):
+		generatorrunner = "shiboken"
+		for name in ('shiboken', 'generatorrunner'):
+			if PLAT_WINDOWS:
+				name += '.exe'
+			name = os.path.join(self.PySideBase, "bin", name)
+			if os.path.exists(name):
+				generatorrunner = name
+				break
+
+		args = [
+			generatorrunner,
+			"--generator-set=" + self.ShibokenGenerator,
+			"global.h ",
+			"--avoid-protected-hack",
+			"--enable-pyside-extensions",
+			"--include-paths=" + self.AllIncludes,
+			"--typesystem-paths=" + self.PySideTypeSystem,
+			"--output-directory=.",
+			"typesystem_ScintillaEdit.xml"]
+		print(" ".join(args))
+		retcode = subprocess.call(" ".join(args), shell=True, stderr=subprocess.STDOUT)
+		if retcode:
+			print("Error - failed in generatorrunner " + str(retcode))
+			sys.exit()
+
+	def writeVariables(self):
+		# Write variables needed into file to be included from project so it does not have to discover much
+		with open(self.ProInclude, "w") as f:
+			f.write("SCINTILLA_VERSION=" + self.ScintillaVersion + "\n")
+			f.write("PY_VERSION=" + self.PyVersion + "\n")
+			f.write("PY_VERSION_SUFFIX=" + self.PyVersionSuffix + "\n")
+			f.write("PY_PREFIX=" + doubleBackSlashes(self.PyPrefix) + "\n")
+			f.write("PY_INCLUDES=" + doubleBackSlashes(self.PyIncludes) + "\n")
+			f.write("PY_LIBDIR=" + doubleBackSlashes(self.PyLibDir) + "\n")
+			f.write("PYSIDE_INCLUDES=" + doubleBackSlashes(self.PySideIncludeBase) + "\n")
+			f.write("PYSIDE_LIB=" + doubleBackSlashes(self.PySideLibDir) + "\n")
+			f.write("SHIBOKEN_INCLUDES=" + doubleBackSlashes(self.ShibokenIncludeBase) + "\n")
+			f.write("SHIBOKEN_LIB=" + doubleBackSlashes(self.ShibokenLibDir) + "\n")
+			if self.DebugBuild:
+				f.write("CONFIG += debug\n")
+			else:
+				f.write("CONFIG += release\n")
+
+	def make(self):
+		runProgram([self.QMakeCommand, self.QMakeOptions], exitOnFailure=True)
+		runProgram([self.MakeCommand, self.MakeTarget], exitOnFailure=True)
+
+	def cleanEverything(self):
+		self.generateAPI(["--clean"])
+		runProgram([self.MakeCommand, "distclean"], exitOnFailure=False)
+		filesToRemove = [self.ProInclude, "typesystem_ScintillaEdit.xml",
+			"../../bin/ScintillaEditPy.so", "../../bin/ScintillaConstants.py"]
+		for file in filesToRemove:
+			try:
+				os.remove(file)
+			except OSError:
+				pass
+		for logFile in glob.glob("*.log"):
+			try:
+				os.remove(logFile)
+			except OSError:
+				pass
+		shutil.rmtree("debug", ignore_errors=True)
+		shutil.rmtree("release", ignore_errors=True)
+		shutil.rmtree("ScintillaEditPy", ignore_errors=True)
+
+	def buildEverything(self):
+		cleanGenerated = False
+		opts, args = getopt.getopt(sys.argv[1:], "hcdub",
+					["help", "clean", "debug=",
+					"underscore-names", "pyside-base="])
+		for opt, arg in opts:
+			if opt in ("-h", "--help"):
+				usage()
+				sys.exit()
+			elif opt in ("-c", "--clean"):
+				cleanGenerated = True
+			elif opt in ("-d", "--debug"):
+				self.DebugBuild = (arg == '' or arg.lower() == 'yes')
+				if self.DebugBuild and sys.platform == 'win32':
+					self.MakeTarget = 'debug'
+			elif opt in ("-b", '--pyside-base'):
+				self._SetQtIncludeBase(os.path.join(os.path.normpath(arg), 'include'))
+				self._setPySideBase(os.path.normpath(arg))
+			elif opt in ("-u", "--underscore-names"):
+				self.qtStyleInterface = False
+
+		if cleanGenerated:
+			self.cleanEverything()
+		else:
+			self.writeVariables()
+			self.generateAPI([""])
+			self.runGenerator()
+			self.make()
+			self.copyScintillaConstants()
+
+	def copyScintillaConstants(self):
+
+		orig = 'ScintillaConstants.py'
+		dest = '../../bin/' + orig
+		if IsFileNewer(dest, orig):
+			return
+
+		f = open(orig, 'r')
+		contents = f.read()
+		f.close()
+
+		f = open(dest, 'w')
+		f.write(contents)
+		f.close()
+
+	def _SetQtIncludeBase(self, base):
+
+		self.QtIncludeBase = base
+		self.QtIncludes = [self.QtIncludeBase] + [os.path.join(self.QtIncludeBase, sub) for sub in ["QtCore", "QtGui"]]
+		# Set path so correct qmake is found
+		path = os.environ.get('PATH', '').split(os.pathsep)
+		qt_bin_dir = os.path.join(os.path.dirname(base), 'bin')
+		if qt_bin_dir not in path:
+			path.insert(0, qt_bin_dir)
+			os.environ['PATH'] = os.pathsep.join(path)
+
+if __name__ == "__main__":
+	sepBuild = SepBuilder()
+	sepBuild.buildEverything()
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/testsepq.py b/scite-app/scintilla/qt/ScintillaEditPy/testsepq.py
new file mode 100644
index 0000000..26b05ef
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/testsepq.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+import sys
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+import ScintillaConstants as sci
+
+sys.path.append("../..")
+from bin import ScintillaEditPy
+
+txtInit =	"int main(int argc, char **argv) {\n" \
+		"    // Start up the gnome\n" \
+		"    gnome_init(\"stest\", \"1.0\", argc, argv);\n}\n";
+
+keywords = \
+		"and and_eq asm auto bitand bitor bool break " \
+		"case catch char class compl const const_cast continue " \
+		"default delete do double dynamic_cast else enum explicit export extern false float for " \
+		"friend goto if inline int long mutable namespace new not not_eq " \
+		"operator or or_eq private protected public " \
+		"register reinterpret_cast return short signed sizeof static static_cast struct switch " \
+		"template this throw true try typedef typeid typename union unsigned using " \
+		"virtual void volatile wchar_t while xor xor_eq";
+
+def uriDropped():
+	print "uriDropped"
+
+class Form(QDialog):
+
+	def __init__(self, parent=None):
+		super(Form, self).__init__(parent)
+		self.resize(460,300)
+		# Create widgets
+		self.edit = ScintillaEditPy.ScintillaEdit(self)
+		self.edit.uriDropped.connect(uriDropped)
+		self.edit.command.connect(self.receive_command)
+		self.edit.notify.connect(self.receive_notification)
+
+		self.edit.styleClearAll()
+		self.edit.setMarginWidthN(0, 35)
+		self.edit.setScrollWidth(200)
+		self.edit.setScrollWidthTracking(1)
+		self.edit.setLexer(sci.SCLEX_CPP)
+		self.edit.styleSetFore(sci.SCE_C_COMMENT, 0x008000)
+		self.edit.styleSetFore(sci.SCE_C_COMMENTLINE, 0x008000)
+		self.edit.styleSetFore(sci.SCE_C_COMMENTDOC, 0x008040)
+		self.edit.styleSetItalic(sci.SCE_C_COMMENTDOC, 1)
+		self.edit.styleSetFore(sci.SCE_C_NUMBER, 0x808000)
+		self.edit.styleSetFore(sci.SCE_C_WORD, 0x800000)
+		self.edit.styleSetBold(sci.SCE_C_WORD, True)
+		self.edit.styleSetFore(sci.SCE_C_STRING, 0x800080)
+		self.edit.styleSetFore(sci.SCE_C_PREPROCESSOR, 0x008080)
+		self.edit.styleSetBold(sci.SCE_C_OPERATOR, True)
+		self.edit.setMultipleSelection(1)
+		self.edit.setVirtualSpaceOptions(
+			sci.SCVS_RECTANGULARSELECTION | sci.SCVS_USERACCESSIBLE)
+		self.edit.setAdditionalSelectionTyping(1)
+
+		self.edit.styleSetFore(sci.STYLE_INDENTGUIDE, 0x808080)
+		self.edit.setIndentationGuides(sci.SC_IV_LOOKBOTH)
+
+		self.edit.setKeyWords(0, keywords)
+		self.edit.addText(len(txtInit), txtInit)
+		self.edit.setSel(1,10)
+		retriever = str(self.edit.getLine(1))
+		print(type(retriever), len(retriever))
+		print('[' + retriever + ']')
+		someText = str(self.edit.textRange(2,5))
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.getCurLine(100)
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.styleFont(1)
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.getSelText()
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.tag(1)
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.autoCCurrentText()
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.annotationText(1)
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.annotationStyles(1)
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.describeKeyWordSets()
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.propertyNames()
+		print(len(someText), '[' + someText + ']')
+		self.edit.setProperty("fold", "1")
+		someText = self.edit.property("fold")
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.propertyExpanded("fold")
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.lexerLanguage()
+		print(len(someText), '[' + someText + ']')
+		someText = self.edit.describeProperty("styling.within.preprocessor")
+		print(len(someText), '[' + someText + ']')
+
+		xx = self.edit.findText(0, "main", 0, 25)
+		print(type(xx), xx)
+		print("isBold", self.edit.styleBold(sci.SCE_C_WORD))
+
+		# Retrieve the document and write into it
+		doc = self.edit.get_doc()
+		doc.insert_string(40, "***")
+		stars = doc.get_char_range(40,3)
+		assert stars == "***"
+
+		# Create a new independent document and attach it to the editor
+		doc = ScintillaEditPy.ScintillaDocument()
+		doc.insert_string(0, "/***/\nif(a)\n")
+		self.edit.set_doc(doc)
+		self.edit.setLexer(sci.SCLEX_CPP)
+
+	def Call(self, message, wParam=0, lParam=0):
+		return self.edit.send(message, wParam, lParam)
+
+	def resizeEvent(self, e):
+		self.edit.resize(e.size().width(), e.size().height())
+
+	def receive_command(self, wParam, lParam):
+		# Show underline at start when focussed
+		notifyCode = wParam >> 16
+		if (notifyCode == sci.SCEN_SETFOCUS) or (notifyCode == sci.SCEN_KILLFOCUS):
+			self.edit.setIndicatorCurrent(sci.INDIC_CONTAINER);
+			self.edit.indicatorClearRange(0, self.edit.length())
+			if notifyCode == sci.SCEN_SETFOCUS:
+				self.edit.indicatorFillRange(0, 2);
+
+	def receive_notification(self, scn):
+		if scn.nmhdr.code == sci.SCN_CHARADDED:
+			print "Char %02X" % scn.ch
+		elif scn.nmhdr.code == sci.SCN_SAVEPOINTREACHED:
+			print "Saved"
+		elif scn.nmhdr.code == sci.SCN_SAVEPOINTLEFT:
+			print "Unsaved"
+		elif scn.nmhdr.code == sci.SCN_MODIFIED:
+			print "Modified"
+		elif scn.nmhdr.code == sci.SCN_UPDATEUI:
+			print "Update UI"
+		elif scn.nmhdr.code == sci.SCN_PAINTED:
+			#print "Painted"
+			pass
+		else:
+			print "Notification", scn.nmhdr.code
+			pass
+
+if __name__ == '__main__':
+    # Create the Qt Application
+    app = QApplication(sys.argv)
+    # Create and show the form
+    form = Form()
+    form.show()
+    # Run the main Qt loop
+    sys.exit(app.exec_())
diff --git a/scite-app/scintilla/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/scite-app/scintilla/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
new file mode 100644
index 0000000..f7196a2
--- /dev/null
+++ b/scite-app/scintilla/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<typesystem package="ScintillaEditPy">
+	<load-typesystem name="typesystem_core.xml" generate="no" />
+	<load-typesystem name="typesystem_gui_common.xml" generate="no"/>
+	<primitive-type name="sptr_t"/>
+	<primitive-type name="uptr_t"/>
+	<value-type name="Sci_NotifyHeader" />
+	<rejection class="Sci_NotifyHeader" field-name="hwndFrom" />
+	<value-type name="SCNotification" />
+	<object-type name="ScintillaEditBase" />
+	<object-type name="ScintillaEdit">
+	<!-- ++Autogenerated start of section automatically generated from Scintilla.iface -->
+	<!-- ~~Autogenerated end of section automatically generated from Scintilla.iface -->
+
+	<!-- Custom implementation of get and set_margin_mask_n: mask is defined
+	     as an int but is really a bitfield and the numeric value can be
+	     greater than max value of an int -->
+		<modify-function signature="set_margin_mask_n(sptr_t, sptr_t)">
+			<inject-code>
+				int margin = PyInt_AsLong(%PYARG_1);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+				unsigned long mask = PyInt_AsUnsignedLongMask(%PYARG_2);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+
+				%CPPSELF-&gt;set_margin_mask_n(margin, static_cast&lt;int&gt;(mask));
+				Py_RETURN_NONE;
+			</inject-code>
+		</modify-function>
+		<modify-function signature="get_margin_mask_n(sptr_t) const">
+			<inject-code>
+				int margin = PyInt_AsLong(%PYARG_1);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+				unsigned int mask = (unsigned int)%CPPSELF-&gt;get_margin_mask_n(margin);
+				%PYARG_0 = PyInt_FromSize_t(mask);
+			</inject-code>
+		</modify-function>
+		<modify-function signature="setMarginMaskN(sptr_t, sptr_t)">
+			<inject-code>
+				int margin = PyInt_AsLong(%PYARG_1);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+				unsigned long mask = PyInt_AsUnsignedLongMask(%PYARG_2);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+
+				%CPPSELF-&gt;setMarginMaskN(margin, static_cast&lt;int&gt;(mask));
+				Py_RETURN_NONE;
+			</inject-code>
+		</modify-function>
+		<modify-function signature="marginMaskN(sptr_t) const">
+			<inject-code>
+				int margin = PyInt_AsLong(%PYARG_1);
+				if (margin == -1 &amp;&amp; PyErr_Occurred())
+					return NULL;
+				unsigned int mask = (unsigned int)%CPPSELF-&gt;marginMaskN(margin);
+				%PYARG_0 = PyInt_FromSize_t(mask);
+			</inject-code>
+		</modify-function>
+
+	</object-type>
+	<object-type name="ScintillaDocument" />
+</typesystem>
diff --git a/scite-app/scintilla/scripts/CheckMentioned.py b/scite-app/scintilla/scripts/CheckMentioned.py
new file mode 100644
index 0000000..d2c71dc
--- /dev/null
+++ b/scite-app/scintilla/scripts/CheckMentioned.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+# CheckMentioned.py
+# Find all the symbols in scintilla/include/Scintilla.h and check if they
+# are mentioned in scintilla/doc/ScintillaDoc.html.
+# Requires Python 3.6 or later
+
+import re, string, sys
+
+srcRoot = "../.."
+
+sys.path.append(srcRoot + "/scintilla/scripts")
+
+import Face
+
+uninteresting = {
+	"SCINTILLA_H", "SCI_START", "SCI_LEXER_START", "SCI_OPTIONAL_START",
+	# These archaic names are #defined to the Sci_ prefixed modern equivalents.
+	# They are not documented so they are not used in new code.
+	"CharacterRange", "TextRange", "TextToFind", "RangeToFormat", "NotifyHeader",
+}
+
+incFileName = srcRoot + "/scintilla/include/Scintilla.h"
+docFileName = srcRoot + "/scintilla/doc/ScintillaDoc.html"
+identCharacters = "_" + string.ascii_letters + string.digits
+
+# Convert all punctuation characters except '_' into spaces.
+def depunctuate(s):
+	d = ""
+	for ch in s:
+		if ch in identCharacters:
+			d = d + ch
+		else:
+			d = d + " "
+	return d
+
+symbols = {}
+with open(incFileName, "rt") as incFile:
+	for line in incFile.readlines():
+		if line.startswith("#define"):
+			identifier = line.split()[1]
+			symbols[identifier] = 0
+
+with open(docFileName, "rt") as docFile:
+	for line in docFile.readlines():
+		for word in depunctuate(line).split():
+			if word in symbols.keys():
+				symbols[word] = 1
+
+def convertIFaceTypeToC(t):
+	if t == "keymod":
+		return "int "
+	elif t == "string":
+		return "const char *"
+	elif t == "stringresult":
+		return "char *"
+	elif t == "cells":
+		return "cell *"
+	elif t == "textrange":
+		return "Sci_TextRange *"
+	elif t == "findtext":
+		return "Sci_TextToFind *"
+	elif t == "formatrange":
+		return "Sci_RangeToFormat *"
+	elif Face.IsEnumeration(t):
+		return "int "
+	return t + " "
+
+def makeParm(t, n, v):
+	return (convertIFaceTypeToC(t) + n).rstrip()
+
+def makeSig(params):
+	p1 = makeParm(params["Param1Type"], params["Param1Name"], params["Param1Value"])
+	p2 = makeParm(params["Param2Type"], params["Param2Name"], params["Param2Value"])
+
+	retType = params["ReturnType"]
+	if retType in ["void", "string", "stringresult"]:
+		retType = ""
+	elif Face.IsEnumeration(retType):
+		retType = "int"
+	if retType:
+		retType = " &rarr; " + retType
+
+	if p1 == "" and p2 == "":
+		return retType
+
+	if p1 == "":
+		p1 = "&lt;unused&gt;"
+	joiner = ""
+	if p2 != "":
+		joiner = ", "
+	return "(" + p1 + joiner + p2 + ")" + retType
+
+pathIface = srcRoot + "/scintilla/include/Scintilla.iface"
+
+def retrieveFeatures():
+	face = Face.Face()
+	face.ReadFromFile(pathIface)
+	sciToFeature = {}
+	sccToValue = { "true":"1", "false":"0", "EN_SETFOCUS":"256", "EN_KILLFOCUS":"512"}
+	for name in face.order:
+		v = face.features[name]
+		if v["FeatureType"] in ["fun", "get", "set"]:
+			featureDefineName = "SCI_" + name.upper()
+			sciToFeature[featureDefineName] = name
+		elif v["FeatureType"] in ["val"]:
+			featureDefineName = name.upper()
+			sccToValue[featureDefineName] = v["Value"]
+		elif v["FeatureType"] in ["evt"]:
+			featureDefineName = "SCN_" + name.upper()
+			sccToValue[featureDefineName] = v["Value"]
+	return (face, sciToFeature, sccToValue)
+
+def flattenSpaces(s):
+	return s.replace("\n", " ").replace("  ", " ").replace("  ", " ").replace("  ", " ").strip()
+
+def printCtag(ident, path):
+	print(ident.strip() + "\t" + path + "\t" + "/^" + ident + "$/")
+
+showCTags = True
+
+def checkDocumentation():
+	with open(docFileName, "rt") as docFile:
+		docs = docFile.read()
+
+	face, sciToFeature, sccToValue = retrieveFeatures()
+
+	headers = {}
+	definitions = {}
+
+	# Examine header sections which point to definitions
+	#<a class="message" href="#SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</a><br />
+	dirPattern = re.compile(r'<a class="message" href="#([A-Z0-9_]+)">([A-Z][A-Za-z0-9_() *&;,\n]+)</a>')
+	for api, sig in re.findall(dirPattern, docs):
+		sigApi = re.split('\W+', sig)[0]
+		sigFlat = flattenSpaces(sig)
+		sigFlat = sigFlat.replace('colouralpha ', 'xxxx ')	# Temporary to avoid next line
+		sigFlat = sigFlat.replace('alpha ', 'int ')
+		sigFlat = sigFlat.replace('xxxx ', 'colouralpha ')
+
+		sigFlat = sigFlat.replace("document *", "int ")
+		sigFlat = sigFlat.rstrip()
+		if '(' in sigFlat or api.startswith("SCI_"):
+			name = sciToFeature[api]
+			sigFromFace = api + makeSig(face.features[name])
+			if sigFlat != sigFromFace:
+				print(sigFlat, "|", sigFromFace)
+				if showCTags:
+					printCtag(api, docFileName)
+				#~ printCtag(" " + name, pathIface)
+		if api != sigApi:
+			print(sigApi, ";;", sig, ";;", api)
+		headers[api] = 1
+	# Warns for most keyboard commands so not enabled
+	#~ for api in sorted(sciToFeature.keys()):
+		#~ if api not in headers:
+			#~ print("No header for ", api)
+
+	# Examine  definitions
+	#<b id="SCI_SETLAYOUTCACHE">SCI_SETLAYOUTCACHE(int cacheMode)</b>
+	defPattern = re.compile(r'<b id="([A-Z_0-9]+)">([A-Z][A-Za-z0-9_() *#\"=<>/&;,\n-]+?)</b>')
+	for api, sig in re.findall(defPattern, docs):
+		sigFlat = flattenSpaces(sig)
+		if '<a' in sigFlat	:	# Remove anchors
+			sigFlat = re.sub('<a.*>(.+)</a>', '\\1', sigFlat)
+		sigFlat = sigFlat.replace('colouralpha ', 'xxxx ')	# Temporary to avoid next line
+		sigFlat = sigFlat.replace('alpha ', 'int ')
+		sigFlat = sigFlat.replace('xxxx ', 'colouralpha ')
+		sigFlat = sigFlat.replace("document *", "int ")
+
+		sigFlat = sigFlat.replace(' NUL-terminated', '')
+		sigFlat = sigFlat.rstrip()
+		#~ sigFlat = sigFlat.replace(' NUL-terminated', '')
+		sigApi = re.split('\W+', sigFlat)[0]
+		#~ print(sigFlat, ";;", sig, ";;", api)
+		if '(' in sigFlat or api.startswith("SCI_"):
+			try:
+				name = sciToFeature[api]
+				sigFromFace = api + makeSig(face.features[name])
+				if sigFlat != sigFromFace:
+					print(sigFlat, "|", sigFromFace)
+					if showCTags:
+						printCtag('="' + api, docFileName)
+					#~ printCtag(" " + name, pathIface)
+			except KeyError:
+				pass		# Feature removed but still has documentation
+		if api != sigApi:
+			print(sigApi, ";;", sig, ";;", api)
+		definitions[api] = 1
+	# Warns for most keyboard commands so not enabled
+	#~ for api in sorted(sciToFeature.keys()):
+		#~ if api not in definitions:
+			#~ print("No definition for ", api)
+
+	outName = docFileName.replace("Doc", "Dox")
+	with open(outName, "wt") as docFile:
+		docFile.write(docs)
+
+	# Examine  constant definitions
+	#<code>SC_CARETSTICKY_WHITESPACE</code> (2)
+	constPattern = re.compile(r'<code>(\w+)</code> *\((\w+)\)')
+	for name, val in re.findall(constPattern, docs):
+		try:
+			valOfName = sccToValue[name]
+			if val != valOfName:
+				print(val, "<-", name, ";;", valOfName)
+		except KeyError:
+			print("***", val, "<-", name)
+			
+	for name in sccToValue.keys():
+		if name not in ["SCI_OPTIONAL_START", "SCI_LEXER_START"] and name not in docs:
+			print(f"Unknown {name}")
+
+for identifier in sorted(symbols.keys()):
+	if not symbols[identifier] and identifier not in uninteresting:
+		print(identifier)
+
+checkDocumentation()
diff --git a/scite-app/scintilla/scripts/Dependencies.py b/scite-app/scintilla/scripts/Dependencies.py
new file mode 100644
index 0000000..135c57a
--- /dev/null
+++ b/scite-app/scintilla/scripts/Dependencies.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python3
+# Dependencies.py - discover, read, and write dependencies file for make.
+# The format like the output from "g++ -MM" which produces a
+# list of header (.h) files used by source files (.cxx).
+# As a module, provides
+#	FindPathToHeader(header, includePath) -> path
+#	FindHeadersInFile(filePath) -> [headers]
+#	FindHeadersInFileRecursive(filePath, includePath, renames) -> [paths]
+#	FindDependencies(sourceGlobs, includePath, objExt, startDirectory, renames) -> [dependencies]
+#	ExtractDependencies(input) -> [dependencies]
+#	TextFromDependencies(dependencies)
+#	WriteDependencies(output, dependencies)
+#	UpdateDependencies(filepath, dependencies)
+#	PathStem(p) -> stem
+#	InsertSynonym(dependencies, current, additional) -> [dependencies]
+# If run as a script reads from stdin and writes to stdout.
+# Only tested with ASCII file names.
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 2.7 or later
+
+import codecs, glob, os, sys
+
+if __name__ == "__main__":
+	import FileGenerator
+else:
+	from . import FileGenerator
+
+continuationLineEnd = " \\"
+
+def FindPathToHeader(header, includePath):
+	for incDir in includePath:
+		relPath = os.path.join(incDir, header)
+		if os.path.exists(relPath):
+			return relPath
+	return ""
+
+fhifCache = {}	# Remember the includes in each file. ~5x speed up.
+def FindHeadersInFile(filePath):
+	if filePath not in fhifCache:
+		headers = []
+		with codecs.open(filePath, "r", "utf-8") as f:
+			for line in f:
+				if line.strip().startswith("#include"):
+					parts = line.split()
+					if len(parts) > 1:
+						header = parts[1]
+						if header[0] != '<':	# No system headers
+							headers.append(header.strip('"'))
+		fhifCache[filePath] = headers
+	return fhifCache[filePath]
+
+def FindHeadersInFileRecursive(filePath, includePath, renames):
+	headerPaths = []
+	for header in FindHeadersInFile(filePath):
+		if header in renames:
+			header = renames[header]
+		relPath = FindPathToHeader(header, includePath)
+		if relPath and relPath not in headerPaths:
+				headerPaths.append(relPath)
+				subHeaders = FindHeadersInFileRecursive(relPath, includePath, renames)
+				headerPaths.extend(sh for sh in subHeaders if sh not in headerPaths)
+	return headerPaths
+
+def RemoveStart(relPath, start):
+	if relPath.startswith(start):
+		return relPath[len(start):]
+	return relPath
+
+def ciKey(f):
+	return f.lower()
+
+def FindDependencies(sourceGlobs, includePath, objExt, startDirectory, renames={}):
+	deps = []
+	for sourceGlob in sourceGlobs:
+		sourceFiles = glob.glob(sourceGlob)
+		# Sorting the files minimizes deltas as order returned by OS may be arbitrary
+		sourceFiles.sort(key=ciKey)
+		for sourceName in sourceFiles:
+			objName = os.path.splitext(os.path.basename(sourceName))[0]+objExt
+			headerPaths = FindHeadersInFileRecursive(sourceName, includePath, renames)
+			depsForSource = [sourceName] + headerPaths
+			depsToAppend = [RemoveStart(fn.replace("\\", "/"), startDirectory) for
+				fn in depsForSource]
+			deps.append([objName, depsToAppend])
+	return deps
+
+def PathStem(p):
+	""" Return the stem of a filename: "CallTip.o" -> "CallTip" """
+	return os.path.splitext(os.path.basename(p))[0]
+
+def InsertSynonym(dependencies, current, additional):
+	""" Insert a copy of one object file with dependencies under a different name.
+	Used when one source file is used to create two object files with different
+	preprocessor definitions. """
+	result = []
+	for dep in dependencies:
+		result.append(dep)
+		if (dep[0] == current):
+			depAdd = [additional, dep[1]]
+			result.append(depAdd)
+	return result
+
+def ExtractDependencies(input):
+	""" Create a list of dependencies from input list of lines
+	Each element contains the name of the object and a list of
+	files that it depends on.
+	Dependencies that contain "/usr/" are removed as they are system headers. """
+
+	deps = []
+	for line in input:
+		headersLine = line.startswith(" ") or line.startswith("\t")
+		line = line.strip()
+		line = line.rstrip("\\ ")
+		fileNames = line.strip().split(" ")
+		if not headersLine:
+			# its a source file line, there may be headers too
+			sourceLine = fileNames[0].rstrip(":")
+			fileNames = fileNames[1:]
+			deps.append([sourceLine, []])
+		deps[-1][1].extend(header for header in fileNames if "/usr/" not in header)
+	return deps
+
+def TextFromDependencies(dependencies):
+	""" Convert a list of dependencies to text. """
+	text = ""
+	indentHeaders = "\t"
+	joinHeaders = continuationLineEnd + os.linesep + indentHeaders
+	for dep in dependencies:
+		object, headers = dep
+		text += object + ":"
+		for header in headers:
+			text += joinHeaders
+			text += header
+		if headers:
+			text += os.linesep
+	return text
+
+def UpdateDependencies(filepath, dependencies, comment=""):
+	""" Write a dependencies file if different from dependencies. """
+	FileGenerator.UpdateFile(os.path.abspath(filepath), comment.rstrip() + os.linesep +
+		TextFromDependencies(dependencies))
+
+def WriteDependencies(output, dependencies):
+	""" Write a list of dependencies out to a stream. """
+	output.write(TextFromDependencies(dependencies))
+
+if __name__ == "__main__":
+	""" Act as a filter that reformats input dependencies to one per line. """
+	inputLines = sys.stdin.readlines()
+	deps = ExtractDependencies(inputLines)
+	WriteDependencies(sys.stdout, deps)
diff --git a/scite-app/scintilla/scripts/Face.py b/scite-app/scintilla/scripts/Face.py
new file mode 100644
index 0000000..1559dfc
--- /dev/null
+++ b/scite-app/scintilla/scripts/Face.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python3
+# Face.py - module for reading and parsing Scintilla.iface file
+# Implemented 2000 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+# Requires Python 2.7 or later
+
+def sanitiseLine(line):
+	if line[-1:] == '\n': line = line[:-1]
+	if line.find("##") != -1:
+		line = line[:line.find("##")]
+	line = line.strip()
+	return line
+
+def decodeFunction(featureVal):
+	retType, rest = featureVal.split(" ", 1)
+	nameIdent, params = rest.split("(")
+	name, value = nameIdent.split("=")
+	params, rest = params.split(")")
+	param1, param2 = params.split(",")
+	return retType, name, value, param1, param2
+
+def decodeEvent(featureVal):
+	retType, rest = featureVal.split(" ", 1)
+	nameIdent, params = rest.split("(")
+	name, value = nameIdent.split("=")
+	return retType, name, value
+
+def decodeParam(p):
+	param = p.strip()
+	type = ""
+	name = ""
+	value = ""
+	if " " in param:
+		type, nv = param.split(" ")
+		if "=" in nv:
+			name, value = nv.split("=")
+		else:
+			name = nv
+	return type, name, value
+
+def IsEnumeration(t):
+	return t[:1].isupper()
+
+def PascalCase(s):
+	capitalized = s.title()
+	# Remove '_' except between digits
+	pascalCase = ""
+	characterPrevious = " "
+	# Loop until penultimate character
+	for i in range(len(capitalized)-1):
+		character = capitalized[i]
+		characterNext = capitalized[i+1]
+		if character != "_" or (
+			characterPrevious.isnumeric() and characterNext.isnumeric()):
+			pascalCase += character
+		characterPrevious = character
+	# Add last character - not between digits so no special treatment
+	pascalCase += capitalized[-1]
+	return pascalCase
+
+class Face:
+
+	def __init__(self):
+		self.order = []
+		self.features = {}
+		self.values = {}
+		self.events = {}
+		self.aliases = {}
+
+	def ReadFromFile(self, name):
+		currentCategory = ""
+		currentComment = []
+		currentCommentFinished = 0
+		file = open(name)
+		for line in file.readlines():
+			line = sanitiseLine(line)
+			if line:
+				if line[0] == "#":
+					if line[1] == " ":
+						if currentCommentFinished:
+							currentComment = []
+							currentCommentFinished = 0
+						currentComment.append(line[2:])
+				else:
+					currentCommentFinished = 1
+					featureType, featureVal = line.split(" ", 1)
+					if featureType in ["fun", "get", "set"]:
+						try:
+							retType, name, value, param1, param2 = decodeFunction(featureVal)
+						except ValueError:
+							print("Failed to decode %s" % line)
+							raise
+						p1 = decodeParam(param1)
+						p2 = decodeParam(param2)
+						self.features[name] = {
+							"FeatureType": featureType,
+							"ReturnType": retType,
+							"Value": value,
+							"Param1Type": p1[0], "Param1Name": p1[1], "Param1Value": p1[2],
+							"Param2Type": p2[0], "Param2Name": p2[1], "Param2Value": p2[2],
+							"Category": currentCategory, "Comment": currentComment
+						}
+						if value in self.values:
+							raise Exception("Duplicate value " + value + " " + name)
+						self.values[value] = 1
+						self.order.append(name)
+						currentComment = []
+					elif featureType == "evt":
+						retType, name, value = decodeEvent(featureVal)
+						self.features[name] = {
+							"FeatureType": featureType,
+							"ReturnType": retType,
+							"Value": value,
+							"Category": currentCategory, "Comment": currentComment
+						}
+						if value in self.events:
+							raise Exception("Duplicate event " + value + " " + name)
+						self.events[value] = 1
+						self.order.append(name)
+					elif featureType == "cat":
+						currentCategory = featureVal
+					elif featureType == "val":
+						try:
+							name, value = featureVal.split("=", 1)
+						except ValueError:
+							print("Failure %s" % featureVal)
+							raise Exception()
+						self.features[name] = {
+							"FeatureType": featureType,
+							"Category": currentCategory,
+							"Value": value }
+						self.order.append(name)
+					elif featureType == "enu" or featureType == "lex":
+						name, value = featureVal.split("=", 1)
+						self.features[name] = {
+							"FeatureType": featureType,
+							"Category": currentCategory,
+							"Value": value,
+							"Comment": currentComment }
+						self.order.append(name)
+						currentComment = []
+					elif featureType == "ali":
+						# Enumeration alias
+						name, value = featureVal.split("=", 1)
+						self.aliases[name] = value
+						currentComment = []
+
diff --git a/scite-app/scintilla/scripts/FileGenerator.py b/scite-app/scintilla/scripts/FileGenerator.py
new file mode 100644
index 0000000..aaa0a8a
--- /dev/null
+++ b/scite-app/scintilla/scripts/FileGenerator.py
@@ -0,0 +1,223 @@
+#!/usr/bin/env python3
+# FileGenerator.py - implemented 2013 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Generate or regenerate source files based on comments in those files.
+# May be modified in-place or a template may be generated into a complete file.
+# Requires Python 2.7 or later
+# The files are copied to a string apart from sections between a
+# ++Autogenerated comment and a --Autogenerated comment which is
+# generated by the CopyWithInsertion function. After the whole string is
+# instantiated, it is compared with the target file and if different the file
+# is rewritten.
+
+from __future__ import with_statement
+
+import codecs, os, re, string, sys
+
+lineEnd = "\r\n" if sys.platform == "win32" else "\n"
+
+def UpdateFile(filename, updated):
+    """ If the file contents are different to updated then copy updated into the
+    file else leave alone so Mercurial and make don't treat it as modified. """
+    newOrChanged = "Changed"
+    try:
+        with codecs.open(filename, "r", "utf-8") as infile:
+            original = infile.read()
+        if updated == original:
+            # Same as before so don't write
+            return
+        os.unlink(filename)
+    except IOError: # File is not there yet
+        newOrChanged = "New"
+    with codecs.open(filename, "w", "utf-8") as outfile:
+        outfile.write(updated)
+    print("%s %s" % (newOrChanged, filename))
+
+# Automatically generated sections contain start and end comments,
+# a definition line and the results.
+# The results are replaced by regenerating based on the definition line.
+# The definition line is a comment prefix followed by "**".
+# If there is a digit after the ** then this indicates which list to use
+# and the digit and next character are not part of the definition
+# Backslash is used as an escape within the definition line.
+# The part between \( and \) is repeated for each item in the list.
+# \* is replaced by each list item. \t, and \n are tab and newline.
+# If there is no definition line than the first list is copied verbatim.
+# If retainDefs then the comments controlling generation are copied.
+def CopyWithInsertion(input, commentPrefix, retainDefs, lists):
+    copying = 1
+    generated = False
+    listid = 0
+    output = []
+    for line in input.splitlines(0):
+        isStartGenerated = line.lstrip().startswith(commentPrefix + "++Autogenerated")
+        if copying and not isStartGenerated:
+            output.append(line)
+        if isStartGenerated:
+            if retainDefs:
+                output.append(line)
+            copying = 0
+            generated = False
+        elif not copying and not generated:
+            # Generating
+            if line.startswith(commentPrefix + "**"):
+                # Pattern to transform input data
+                if retainDefs:
+                    output.append(line)
+                definition = line[len(commentPrefix + "**"):]
+                if (commentPrefix == "<!--") and (" -->" in definition):
+                    definition = definition.replace(" -->", "")
+                listid = 0
+                if definition[0] in string.digits:
+                    listid = int(definition[:1])
+                    definition = definition[2:]
+                # Hide double slashes as a control character
+                definition = definition.replace("\\\\", "\001")
+                # Do some normal C style transforms
+                definition = definition.replace("\\n", "\n")
+                definition = definition.replace("\\t", "\t")
+                # Get the doubled backslashes back as single backslashes
+                definition = definition.replace("\001", "\\")
+                startRepeat = definition.find("\\(")
+                endRepeat = definition.find("\\)")
+                intro = definition[:startRepeat]
+                out = ""
+                if intro.endswith("\n"):
+                    pos = 0
+                else:
+                    pos = len(intro)
+                out += intro
+                middle = definition[startRepeat+2:endRepeat]
+                for i in lists[listid]:
+                    item = middle.replace("\\*", i)
+                    if pos and (pos + len(item) >= 80):
+                        out += "\\\n"
+                        pos = 0
+                    out += item
+                    pos += len(item)
+                    if item.endswith("\n"):
+                        pos = 0
+                outro = definition[endRepeat+2:]
+                out += outro
+                out = out.replace("\n", lineEnd) # correct EOLs in generated content
+                output.append(out)
+            else:
+                # Simple form with no rule to transform input
+                output.extend(lists[0])
+            generated = True
+        if line.lstrip().startswith(commentPrefix + "--Autogenerated") or \
+            line.lstrip().startswith(commentPrefix + "~~Autogenerated"):
+            copying = 1
+            if retainDefs:
+                output.append(line)
+    output = [line.rstrip(" \t") for line in output] # trim trailing whitespace
+    return lineEnd.join(output) + lineEnd
+
+def GenerateFile(inpath, outpath, commentPrefix, retainDefs, *lists):
+    """Generate 'outpath' from 'inpath'.
+    """
+
+    try:
+        with codecs.open(inpath, "r", "UTF-8") as infile:
+            original = infile.read()
+        updated = CopyWithInsertion(original, commentPrefix,
+            retainDefs, lists)
+        UpdateFile(outpath, updated)
+    except IOError:
+        print("Can not open %s" % inpath)
+
+def Generate(inpath, outpath, commentPrefix, *lists):
+    """Generate 'outpath' from 'inpath'.
+    """
+    GenerateFile(inpath, outpath, commentPrefix, inpath == outpath, *lists)
+
+def Regenerate(filename, commentPrefix, *lists):
+    """Regenerate the given file.
+    """
+    Generate(filename, filename, commentPrefix, *lists)
+
+def UpdateLineInPlistFile(path, key, value):
+    """Replace a single string value preceded by 'key' in an XML plist file.
+    """
+    lines = []
+    keyCurrent = ""
+    with codecs.open(path, "rb", "utf-8") as f:
+        for l in f.readlines():
+            ls = l.strip()
+            if ls.startswith("<key>"):
+                keyCurrent = ls.replace("<key>", "").replace("</key>", "")
+            elif ls.startswith("<string>"):
+                if keyCurrent == key:
+                    start, tag, rest = l.partition("<string>")
+                    _val, etag, end = rest.partition("</string>")
+                    l = start + tag + value + etag + end
+            lines.append(l)
+    contents = "".join(lines)
+    UpdateFile(path, contents)
+
+def UpdateLineInFile(path, linePrefix, lineReplace):
+    lines = []
+    updated = False
+    with codecs.open(path, "r", "utf-8") as f:
+        for l in f.readlines():
+            l = l.rstrip()
+            if not updated and l.startswith(linePrefix):
+                lines.append(lineReplace)
+                updated = True
+            else:
+                lines.append(l)
+    if not updated:
+        print(f"{path}:0: Can't find '{linePrefix}'")
+    contents = lineEnd.join(lines) + lineEnd
+    UpdateFile(path, contents)
+
+def ReadFileAsList(path):
+    """Read all the lnes in the file and return as a list of strings without line ends.
+    """
+    with codecs.open(path, "rU", "utf-8") as f:
+        return [l.rstrip('\n') for l in f]
+
+def UpdateFileFromLines(path, lines, lineEndToUse):
+    """Join the lines with the lineEndToUse then update file if the result is different.
+    """
+    contents = lineEndToUse.join(lines) + lineEndToUse
+    UpdateFile(path, contents)
+
+def FindSectionInList(lines, markers):
+    """Find a section defined by an initial start marker, an optional secondary
+    marker and an end marker.
+    The section is between the secondary/initial start and the end.
+    Report as a slice object so the section can be extracted or replaced.
+    Raises an exception if the markers can't be found.
+    """
+    start = -1
+    end = -1
+    state = 0
+    for i, l in enumerate(lines):
+        if markers[0] in l:
+            if markers[1]:
+                state = 1
+            else:
+                start = i+1
+                state = 2
+        elif state == 1:
+            if markers[1] in l:
+                start = i+1
+                state = 2
+        elif state == 2:
+            if markers[2] in l:
+                end = i
+                state = 3
+    # Check that section was found
+    if start == -1:
+        raise Exception("Could not find start marker(s) |" + markers[0] + "|" + markers[1] + "|")
+    if end == -1:
+        raise Exception("Could not find end marker " + markers[2])
+    return slice(start, end)
+
+def ReplaceREInFile(path, match, replace, count=1):
+    with codecs.open(path, "r", "utf-8") as f:
+        contents = f.read()
+    contents = re.sub(match, replace, contents, count)
+    UpdateFile(path, contents)
diff --git a/scite-app/scintilla/scripts/GenerateCaseConvert.py b/scite-app/scintilla/scripts/GenerateCaseConvert.py
new file mode 100644
index 0000000..3c0193e
--- /dev/null
+++ b/scite-app/scintilla/scripts/GenerateCaseConvert.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+# Script to generate CaseConvert.cxx from Python's Unicode data
+# Should be run rarely when a Python with a new version of Unicode data is available.
+# Requires Python 3.3 or later
+# Should not be run with old versions of Python.
+
+# Current best approach divides case conversions into two cases:
+# simple symmetric and complex.
+# Simple symmetric is where a lower and upper case pair convert to each
+# other and the folded form is the same as the lower case.
+# There are 1006 symmetric pairs.
+# These are further divided into ranges (stored as lower, upper, range length,
+# range pitch and singletons (stored as lower, upper).
+# Complex is for cases that don't fit the above: where there are multiple
+# characters in one of the forms or fold is different to lower or
+# lower(upper(x)) or upper(lower(x)) are not x. These are represented as UTF-8
+# strings with original, folded, upper, and lower separated by '|'.
+# There are 126 complex cases.
+
+import itertools, string, sys
+
+from FileGenerator import Regenerate
+
+def contiguousRanges(l, diff):
+    # l is s list of lists
+    # group into lists where first element of each element differs by diff
+    out = [[l[0]]]
+    for s in l[1:]:
+        if s[0] != out[-1][-1][0] + diff:
+            out.append([])
+        out[-1].append(s)
+    return out
+
+def flatten(listOfLists):
+    "Flatten one level of nesting"
+    return itertools.chain.from_iterable(listOfLists)
+
+def conversionSets():
+    # For all Unicode characters, see whether they have case conversions
+    # Return 2 sets: one of simple symmetric conversion cases and another
+    # with complex cases.
+    complexes = []
+    symmetrics = []
+    for ch in range(sys.maxunicode + 1):
+        if ch >= 0xd800 and ch <= 0xDBFF:
+            continue
+        if ch >= 0xdc00 and ch <= 0xDFFF:
+            continue
+        uch = chr(ch)
+
+        fold = uch.casefold()
+        upper = uch.upper()
+        lower = uch.lower()
+        symmetric = False
+        if uch != upper and len(upper) == 1 and uch == lower and uch == fold:
+            lowerUpper = upper.lower()
+            foldUpper = upper.casefold()
+            if lowerUpper == foldUpper and lowerUpper == uch:
+                symmetric = True
+                symmetrics.append((ch, ord(upper), ch - ord(upper)))
+        if uch != lower and len(lower) == 1 and uch == upper and lower == fold:
+            upperLower = lower.upper()
+            if upperLower == uch:
+                symmetric = True
+
+        if fold == uch:
+            fold = ""
+        if upper == uch:
+            upper = ""
+        if lower == uch:
+            lower = ""
+
+        if (fold or upper or lower) and not symmetric:
+            complexes.append((uch, fold, upper, lower))
+
+    return symmetrics, complexes
+
+def groupRanges(symmetrics):
+    # Group the symmetrics into groups where possible, returning a list
+    # of ranges and a list of symmetrics that didn't fit into a range
+
+    def distance(s):
+        return s[2]
+
+    groups = []
+    uniquekeys = []
+    for k, g in itertools.groupby(symmetrics, distance):
+        groups.append(list(g))      # Store group iterator as a list
+        uniquekeys.append(k)
+
+    contiguousGroups = flatten([contiguousRanges(g, 1) for g in groups])
+    longGroups = [(x[0][0], x[0][1], len(x), 1) for x in contiguousGroups if len(x) > 4]
+
+    oneDiffs = [s for s in symmetrics if s[2] == 1]
+    contiguousOnes = flatten([contiguousRanges(g, 2) for g in [oneDiffs]])
+    longOneGroups = [(x[0][0], x[0][1], len(x), 2) for x in contiguousOnes if len(x) > 4]
+
+    rangeGroups = sorted(longGroups+longOneGroups, key=lambda s: s[0])
+
+    rangeCoverage = list(flatten([range(r[0], r[0]+r[2]*r[3], r[3]) for r in rangeGroups]))
+
+    nonRanges = [(l, u) for l, u, _d in symmetrics if l not in rangeCoverage]
+
+    return rangeGroups, nonRanges
+
+def escape(s):
+    return "".join((chr(c) if chr(c) in string.ascii_letters else "\\x%x" % c) for c in s.encode('utf-8'))
+
+def updateCaseConvert():
+    symmetrics, complexes = conversionSets()
+
+    rangeGroups, nonRanges = groupRanges(symmetrics)
+
+    print(len(rangeGroups), "ranges")
+    rangeLines = ["%d,%d,%d,%d," % x for x in rangeGroups]
+
+    print(len(nonRanges), "non ranges")
+    nonRangeLines = ["%d,%d," % x for x in nonRanges]
+
+    print(len(symmetrics), "symmetric")
+
+    complexLines = ['"%s|%s|%s|%s|"' % tuple(escape(t) for t in x) for x in complexes]
+    print(len(complexLines), "complex")
+
+    Regenerate("../src/CaseConvert.cxx", "//", rangeLines, nonRangeLines, complexLines)
+
+updateCaseConvert()
diff --git a/scite-app/scintilla/scripts/GenerateCharacterCategory.py b/scite-app/scintilla/scripts/GenerateCharacterCategory.py
new file mode 100644
index 0000000..806dea2
--- /dev/null
+++ b/scite-app/scintilla/scripts/GenerateCharacterCategory.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# Script to generate scintilla/src/CharacterCategoryMap.cxx and lexilla/lexlib/CharacterCategory.cxx
+# from Python's Unicode data
+# Should be run rarely when a Python with a new version of Unicode data is available.
+# Requires Python 3.3 or later
+# Should not be run with old versions of Python.
+
+import pathlib, platform, sys, unicodedata
+
+from FileGenerator import Regenerate
+
+def findCategories(filename):
+    with filename.open(encoding="UTF-8") as infile:
+        lines = [x.strip() for x in infile.readlines() if "\tcc" in x]
+    values = "".join(lines).replace(" ","").split(",")
+    print("Categrories:", values)
+    return [v[2:] for v in values]
+
+def updateCharacterCategory(filename):
+    values = ["// Created with Python %s,  Unicode %s" % (
+        platform.python_version(), unicodedata.unidata_version)]
+
+    startRange = 0
+    category = unicodedata.category(chr(startRange))
+    table = []
+    for ch in range(sys.maxunicode):
+        uch = chr(ch)
+        current = unicodedata.category(uch)
+        if current != category:
+            value = startRange * 32 + categories.index(category)
+            table.append(value)
+            category = current
+            startRange = ch
+    value = startRange * 32 + categories.index(category)
+    table.append(value)
+
+    # the sentinel value is used to simplify CharacterCategoryMap::Optimize()
+    category = 'Cn'
+    value = (sys.maxunicode + 1)*32 + categories.index(category)
+    table.append(value)
+
+    values.extend(["%d," % value for value in table])
+
+    Regenerate(filename, "//", values)
+
+
+scintillaDirectory = pathlib.Path(__file__).resolve().parent.parent
+
+categories = findCategories(scintillaDirectory / "src" / "CharacterCategoryMap.h")
+
+updateCharacterCategory(scintillaDirectory / "src" / "CharacterCategoryMap.cxx")
+
+updateCharacterCategory(scintillaDirectory.parent / "lexilla" / "lexlib" / "CharacterCategory.cxx")
diff --git a/scite-app/scintilla/scripts/HFacer.py b/scite-app/scintilla/scripts/HFacer.py
new file mode 100755
index 0000000..0a4f325
--- /dev/null
+++ b/scite-app/scintilla/scripts/HFacer.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+# HFacer.py - regenerate the Scintilla.h and SciLexer.h files from the Scintilla.iface interface
+# definition file.
+# Implemented 2000 by Neil Hodgson neilh@scintilla.org
+# Requires Python 3.6 or later
+
+import pathlib
+import Face
+import FileGenerator
+
+def printHFile(f):
+	out = []
+	previousCategory = ""
+	anyProvisional = False
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			if v["Category"] == "Provisional" and previousCategory != "Provisional":
+				out.append("#ifndef SCI_DISABLE_PROVISIONAL")
+				anyProvisional = True
+			previousCategory = v["Category"]
+			if v["FeatureType"] in ["fun", "get", "set"]:
+				featureDefineName = "SCI_" + name.upper()
+				out.append("#define " + featureDefineName + " " + v["Value"])
+			elif v["FeatureType"] in ["evt"]:
+				featureDefineName = "SCN_" + name.upper()
+				out.append("#define " + featureDefineName + " " + v["Value"])
+			elif v["FeatureType"] in ["val"]:
+				out.append("#define " + name + " " + v["Value"])
+	if anyProvisional:
+		out.append("#endif")
+	return out
+
+def RegenerateAll(root, showMaxID):
+	f = Face.Face()
+	f.ReadFromFile(root / "include/Scintilla.iface")
+	FileGenerator.Regenerate(root / "include/Scintilla.h", "/* ", printHFile(f))
+	if showMaxID:
+		valueSet = set(int(x) for x in f.values if int(x) < 3000)
+		maximumID = max(valueSet)
+		print("Maximum ID is %d" % maximumID)
+		#~ valuesUnused = sorted(x for x in range(2001,maximumID) if x not in valueSet)
+		#~ print("\nUnused values")
+		#~ valueToName = {}
+		#~ for name, feature in f.features.items():
+			#~ try:
+				#~ value = int(feature["Value"])
+				#~ valueToName[value] = name
+			#~ except ValueError:
+				#~ pass
+		#~ for v in valuesUnused:
+			#~ prev = valueToName.get(v-1, "") 
+			#~ print(v, prev)
+
+if __name__ == "__main__":
+	RegenerateAll(pathlib.Path(__file__).resolve().parent.parent, True)
diff --git a/scite-app/scintilla/scripts/HeaderCheck.py b/scite-app/scintilla/scripts/HeaderCheck.py
new file mode 100644
index 0000000..e24cfa1
--- /dev/null
+++ b/scite-app/scintilla/scripts/HeaderCheck.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+# Script to check that headers are in a consistent order
+# Canonical header order is defined in a file, normally scripts/HeaderOrder.txt
+# Requires Python 3.6 or later
+
+import pathlib, sys
+
+def IsHeader(x):
+    return x.strip().startswith("#") and \
+        ("include" in x or "import" in x) and \
+        "dllimport" not in x
+
+def HeaderFromIncludeLine(s):
+    #\s*#\s*(include|import)\s+\S+\s*
+    return s.strip()[1:].strip()[7:].strip()
+
+def ExtractHeaders(file):
+    with file.open(encoding="cp437") as infile:
+        return [HeaderFromIncludeLine(l) for l in infile if IsHeader(l)]
+
+def ExtractWithPrefix(file, prefix):
+    with file.open(encoding="cp437") as infile:
+        return [l.strip()[len(prefix):] for l in infile if l.startswith(prefix)]
+
+def ExcludeName(name, excludes):
+    return any(exclude in name for exclude in excludes)
+
+def SortLike(incs, order):
+    return sorted(incs, key = lambda i: order.index(i))
+
+basePrefix = "//base:"
+sourcePrefix = "//source:"
+excludePrefix = "//exclude:"
+
+def CheckFiles(headerOrderTxt):
+    headerOrderFile = pathlib.Path(headerOrderTxt).resolve()
+    bases = ExtractWithPrefix(headerOrderFile, basePrefix)
+    base = bases[0] if len(bases) > 0 else ".."
+    orderDirectory = headerOrderFile.parent
+    root = (orderDirectory / base).resolve()
+
+    # Find all the source code files
+    patterns = ExtractWithPrefix(headerOrderFile, sourcePrefix)
+    excludes = ExtractWithPrefix(headerOrderFile, excludePrefix)
+
+    filePaths = []
+    for p in patterns:
+        filePaths += root.glob(p)
+    headerOrder = ExtractHeaders(headerOrderFile)
+    originalOrder = headerOrder[:]
+    orderedPaths = [p for p in sorted(filePaths) if not ExcludeName(str(p), excludes)]
+    allIncs = set()
+    for f in orderedPaths:
+        #~ print("   File ", f.relative_to(root))
+        incs = ExtractHeaders(f)
+        allIncs = allIncs.union(set(incs))
+
+        m = 0
+        i = 0
+        # Detect headers not in header order list and insert at OK position
+        needs = []
+        while i < len(incs):
+            if m == len(headerOrder):
+                #~ print("**** extend", incs[i:])
+                headerOrder.extend(incs[i:])
+                needs.extend(incs[i:])
+                break
+            if headerOrder[m] == incs[i]:
+                #~ print("equal", headerOrder[m])
+                i += 1
+                m += 1
+            else:
+                if headerOrder[m] not in incs:
+                    #~ print("skip", headerOrder[m])
+                    m += 1
+                elif incs[i] not in headerOrder:
+                    #~ print(str(f) + ":1: Add master", incs[i])
+                    headerOrder.insert(m, incs[i])
+                    needs.append(incs[i])
+                    i += 1
+                    m += 1
+                else:
+                    i += 1
+        if needs:
+            print(f"{f}:1: needs these headers:")
+            for header in needs:
+                print("#include " + header)
+
+        # Detect out of order
+        ordered = SortLike(incs, headerOrder)
+        if incs != ordered:
+            print(f"{f}:1: is out of order")
+            fOrdered = pathlib.Path(str(f) + ".ordered")
+            with fOrdered.open("w") as headerOut:
+                for header in ordered:
+                    headerOut.write("#include " + header + "\n")
+            print(f"{fOrdered}:1: is ordered")
+
+    if headerOrder != originalOrder:
+        newIncludes = set(headerOrder) - set(originalOrder)
+        headerOrderNew = orderDirectory / "NewOrder.txt"
+        print(f"{headerOrderFile}:1: changed to {headerOrderNew}")
+        print(f"   Added {', '.join(newIncludes)}.")
+        with headerOrderNew.open("w") as headerOut:
+            for header in headerOrder:
+                headerOut.write("#include " + header + "\n")
+
+    unused = sorted(set(headerOrder) - allIncs)
+    if unused:
+        print("In HeaderOrder.txt but not used")
+        print("\n".join(unused))
+
+if len(sys.argv) > 1:
+    CheckFiles(sys.argv[1])
+else:
+    CheckFiles("HeaderOrder.txt")
diff --git a/scite-app/scintilla/scripts/HeaderOrder.txt b/scite-app/scintilla/scripts/HeaderOrder.txt
new file mode 100644
index 0000000..c2b198e
--- /dev/null
+++ b/scite-app/scintilla/scripts/HeaderOrder.txt
@@ -0,0 +1,175 @@
+// Define the standard order in which to include header files
+// All platform headers should be included before Scintilla headers
+// and each of these groups are then divided into directory groups.
+
+// Base of the repository relative to this file
+
+//base:..
+
+// File patterns to check:
+//source:include/*.h
+//source:src/*.cxx
+//source:lexlib/*.cxx
+//source:lexers/*.cxx
+//source:win32/*.cxx
+//source:gtk/*.cxx
+//source:cocoa/*.mm
+//source:cocoa/*.h
+//source:test/unit/*.cxx
+//source:lexilla/src/*.cxx
+//source:lexilla/test/*.cxx
+
+// C standard library
+#include <stddef.h>
+#include <stdint.h>
+
+// C++ wrappers of C standard library
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+#include <cmath>
+#include <climits>
+
+// C++ standard library
+#include <stdexcept>
+#include <new>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+#include <memory>
+#include <numeric>
+#include <chrono>
+#include <regex>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <iomanip>
+#include <mutex>
+
+// POSIX
+#include <dlfcn.h>
+#include <sys/time.h>
+
+// GTK headers
+#include <glib.h>
+#include <gmodule.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkwayland.h>
+#include <gtk/gtk-a11y.h>
+
+// Windows headers
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+#include <zmouse.h>
+#include <ole2.h>
+#include <d2d1.h>
+#include <dwrite.h>
+
+// Cocoa headers
+#include <Cocoa/Cocoa.h>
+#import <Foundation/NSGeometry.h>
+#import <QuartzCore/CAGradientLayer.h>
+#import <QuartzCore/CAAnimation.h>
+#import <QuartzCore/CATransaction.h>
+
+// Scintilla headers
+
+// Non-platform-specific headers
+
+// Exported headers
+
+#include "Sci_Position.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+// src platform interface
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+
+// src
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "SparseVector.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "XPM.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "RESearch.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "DBCS.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "ElapsedPeriod.h"
+
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+// Platform-specific headers
+
+// win32
+#include "PlatWin.h"
+#include "HanjaDic.h"
+#include "ScintillaWin.h"
+
+// gtk
+#include "ScintillaGTK.h"
+#include "scintilla-marshal.h"
+#include "ScintillaGTKAccessible.h"
+#include "Converter.h"
+
+// cocoa
+#include "QuartzTextStyle.h"
+#include "QuartzTextStyleAttribute.h"
+#include "QuartzTextLayout.h"
+#import "InfoBarCommunicator.h"
+#include "InfoBar.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+
+// Catch testing framework
+#include "catch.hpp"
+
diff --git a/scite-app/scintilla/scripts/LexGen.py b/scite-app/scintilla/scripts/LexGen.py
new file mode 100644
index 0000000..a862b62
--- /dev/null
+++ b/scite-app/scintilla/scripts/LexGen.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# LexGen.py - implemented 2002 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Update Scintilla files.
+# Update version numbers and modification dates in documentation and header files. 
+# Update make dependencies.
+# Requires Python 3.6 or later
+
+from FileGenerator import UpdateLineInFile, ReplaceREInFile, UpdateLineInPlistFile
+import ScintillaData
+import HFacer
+import os
+import pathlib
+import sys
+
+baseDirectory = os.path.dirname(os.path.dirname(ScintillaData.__file__))
+sys.path.append(baseDirectory)
+
+import win32.DepGen
+import gtk.DepGen
+
+def UpdateVersionNumbers(sci, root):
+    UpdateLineInFile(root / "win32/ScintRes.rc", "#define VERSION_SCINTILLA",
+        "#define VERSION_SCINTILLA \"" + sci.versionDotted + "\"")
+    UpdateLineInFile(root / "win32/ScintRes.rc", "#define VERSION_WORDS",
+        "#define VERSION_WORDS " + sci.versionCommad)
+    UpdateLineInFile(root / "qt/ScintillaEditBase/ScintillaEditBase.pro",
+        "VERSION =",
+        "VERSION = " + sci.versionDotted)
+    UpdateLineInFile(root / "qt/ScintillaEdit/ScintillaEdit.pro",
+        "VERSION =",
+        "VERSION = " + sci.versionDotted)
+    UpdateLineInFile(root / "doc/ScintillaDownload.html", "       Release",
+        "       Release " + sci.versionDotted)
+    ReplaceREInFile(root / "doc/ScintillaDownload.html",
+        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/\g<1>" +  sci.version,
+        0)
+    UpdateLineInFile(root / "doc/index.html",
+        '          <font color="#FFCC99" size="3"> Release version',
+        '          <font color="#FFCC99" size="3"> Release version ' +\
+        sci.versionDotted + '<br />')
+    UpdateLineInFile(root / "doc/index.html",
+        '           Site last modified',
+        '           Site last modified ' + sci.mdyModified + '</font>')
+    UpdateLineInFile(root / "doc/ScintillaHistory.html",
+        '	Released ',
+        '	Released ' + sci.dmyModified + '.')
+
+    cocoa = root / "cocoa"
+
+    UpdateLineInPlistFile(cocoa / "Scintilla" / "Info.plist",
+        "CFBundleShortVersionString", sci.versionDotted)
+    ReplaceREInFile(cocoa / "Scintilla"/ "Scintilla.xcodeproj" / "project.pbxproj",
+        "CURRENT_PROJECT_VERSION = [0-9.]+;",
+        f'CURRENT_PROJECT_VERSION = {sci.versionDotted};',
+        0)
+
+def RegenerateAll(rootDirectory):
+    
+    root = pathlib.Path(rootDirectory)
+
+    scintillaBase = root.resolve()
+
+    sci = ScintillaData.ScintillaData(scintillaBase)
+
+    startDir = os.getcwd()
+    os.chdir(os.path.join(scintillaBase, "win32"))
+    win32.DepGen.Generate()
+    os.chdir(os.path.join(scintillaBase, "gtk"))
+    gtk.DepGen.Generate()
+    os.chdir(startDir)
+
+    UpdateVersionNumbers(sci, root)
+
+    HFacer.RegenerateAll(root, False)
+
+if __name__=="__main__":
+    RegenerateAll(pathlib.Path(__file__).resolve().parent.parent)
diff --git a/scite-app/scintilla/scripts/ScintillaAPIFacer.py b/scite-app/scintilla/scripts/ScintillaAPIFacer.py
new file mode 100644
index 0000000..9fe5f56
--- /dev/null
+++ b/scite-app/scintilla/scripts/ScintillaAPIFacer.py
@@ -0,0 +1,283 @@
+#!/usr/bin/env python3
+# ScintillaAPIFacer.py - regenerate the ScintillaTypes.h, and ScintillaMessages.h
+# from the Scintilla.iface interface definition file.
+# Implemented 2019 by Neil Hodgson neilh@scintilla.org
+# Requires Python 3.6 or later
+
+import pathlib
+
+import Face
+import FileGenerator
+import HFacer
+
+namespace = "Scintilla::"
+
+typeAliases = {
+	# Convert iface types to C++ types
+	# bool and void are OK as is
+	"cells": "const char *",
+	"colour": "Colour",
+	"colouralpha": "ColourAlpha",
+	"findtext": "void *",
+	"formatrange": "void *",
+	"int": "int",
+	"keymod": "int",
+	"line": "Line",
+	"pointer": "void *",
+	"position": "Position",
+	"string": "const char *",
+	"stringresult": "char *",
+	"textrange": "void *",
+}
+
+basicTypes = [
+	"bool",
+	"char *",
+	"Colour",
+	"ColourAlpha",
+	"const char *",
+	"int",
+	"intptr_t",
+	"Line",
+	"Position",
+	"void",
+	"void *",
+]
+
+deadValues = [
+	"INDIC_CONTAINER",
+	"INDIC_IME",
+	"INDIC_IME_MAX",
+	"INDIC_MAX",
+]
+
+def ActualTypeName(type, identifier=None):
+	if type in typeAliases:
+		return typeAliases[type]
+	else:
+		return type
+
+def IsEnumeration(s):
+	if s in ["Position", "Line", "Colour", "ColourAlpha"]:
+		return False
+	return s[:1].isupper()
+
+def JoinTypeAndIdentifier(type, identifier):
+	# Add a space to separate type from identifier unless type is pointer
+	if type.endswith("*"):
+		return type + identifier
+	else:
+		return type + " " + identifier
+
+def ParametersArgsCallname(v):
+	parameters = ""
+	args = ""
+	callName = "Call"
+
+	param1TypeBase = v["Param1Type"]
+	param1Name = v["Param1Name"]
+	param1Type = ActualTypeName(param1TypeBase, param1Name)
+	param1Arg = ""
+	if param1Type:
+		castName = param1Name
+		if param1Type.endswith("*"):
+			castName = "reinterpret_cast<uintptr_t>(" + param1Name + ")"
+		elif param1Type not in basicTypes:
+			castName = "static_cast<uintptr_t>(" + param1Name + ")"
+		if IsEnumeration(param1TypeBase):
+			param1Type = namespace + param1Type
+		param1Arg = JoinTypeAndIdentifier(param1Type, param1Name)
+		parameters = param1Arg
+		args = castName
+
+	param2TypeBase = v["Param2Type"]
+	param2Name = v["Param2Name"]
+	param2Type = ActualTypeName(param2TypeBase, param2Name)
+	param2Arg = ""
+	if param2Type:
+		castName = param2Name
+		if param2Type.endswith("*"):
+			if param2Type == "const char *":
+				callName = "CallString"
+			else:
+				callName = "CallPointer"
+		elif param2Type not in basicTypes:
+			castName = "static_cast<intptr_t>(" + param2Name + ")"
+		if IsEnumeration(param2TypeBase):
+			param2Type = namespace + param2Type
+		param2Arg = JoinTypeAndIdentifier(param2Type, param2Name)
+		if param1Arg:
+			parameters = parameters + ", "
+		parameters = parameters + param2Arg
+		if not args:
+			args = args + "0"
+		if args:
+			args = args + ", "
+		args = args + castName
+
+	if args:
+		args = ", " + args
+	return (parameters, args, callName)
+
+def ParametersExceptLast(parameters):
+	if "," in parameters:
+		return parameters[:parameters.rfind(",")]
+	else:
+		return ""
+
+def HMessages(f):
+	out = ["enum class Message {"]
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			if v["FeatureType"] in ["fun", "get", "set"]:
+				out.append("\t" + name + " = " + v["Value"] + ",")
+	out.append("};")
+	return out
+
+def HEnumerations(f):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			# Only want non-deprecated enumerations and lexers are not part of Scintilla API
+			if v["FeatureType"] in ["enu"] and name != "Lexer":
+				out.append("")
+				prefixes = v["Value"].split()
+				#out.append("enum class " + name + " {" + " // " + ",".join(prefixes))
+				out.append("enum class " + name + " {")
+				for valueName in f.order:
+					prefixMatched = ""
+					for p in prefixes:
+						if valueName.startswith(p) and valueName not in deadValues:
+							prefixMatched = p
+					if prefixMatched:
+						vEnum = f.features[valueName]
+						valueNameNoPrefix = ""
+						if valueName in f.aliases:
+							valueNameNoPrefix = f.aliases[valueName]
+						else:
+							valueNameNoPrefix = valueName[len(prefixMatched):]
+							if not valueNameNoPrefix:	# Removed whole name
+								valueNameNoPrefix = valueName
+							if valueNameNoPrefix.startswith("SC_"):
+								valueNameNoPrefix = valueNameNoPrefix[len("SC_"):]
+						pascalName = Face.PascalCase(valueNameNoPrefix)
+						out.append("\t" + pascalName + " = " + vEnum["Value"] + ",")
+				out.append("};")
+
+	out.append("")
+	out.append("enum class Notification {")
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			if v["FeatureType"] in ["evt"]:
+				out.append("\t" + name + " = " + v["Value"] + ",")
+	out.append("};")
+
+	return out
+
+def HConstants(f):
+	# Constants not in an eumeration
+	out = []
+	allEnumPrefixes = [
+		"SCE_", # Lexical styles
+		"SCI_", # Message number allocation
+		"SCEN_", # Notifications sent with WM_COMMAND
+	]
+	for _n, v in f.features.items():
+		if v["Category"] != "Deprecated":
+			# Only want non-deprecated enumerations and lexers are not part of Scintilla API
+			if v["FeatureType"] in ["enu"]:
+				allEnumPrefixes.extend(v["Value"].split())
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			# Only want non-deprecated enumerations and lexers are not part of Scintilla API
+			if v["FeatureType"] in ["val"]:
+				hasPrefix = False
+				for prefix in allEnumPrefixes:
+					if name.startswith(prefix):
+						hasPrefix = True
+				if not hasPrefix:
+					if name.startswith("SC_"):
+						name = name[3:]
+					type = "int"
+					if name == "INVALID_POSITION":
+						type = "Position"
+					out.append("constexpr " + type + " " + Face.PascalCase(name) + " = " + v["Value"] + ";")
+	return out
+
+def HMethods(f):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			if v["FeatureType"] in ["fun", "get", "set"]:
+				if v["FeatureType"] == "get" and name.startswith("Get"):
+					name = name[len("Get"):]
+				retType = ActualTypeName(v["ReturnType"])
+				if IsEnumeration(retType):
+					retType = namespace + retType
+				parameters, args, callName = ParametersArgsCallname(v)
+
+				out.append("\t" + JoinTypeAndIdentifier(retType, name) + "(" + parameters + ");")
+
+				# Extra method for stringresult that returns std::string
+				if v["Param2Type"] == "stringresult":
+					out.append("\t" + JoinTypeAndIdentifier("std::string", name) + \
+						"(" + ParametersExceptLast(parameters) + ");")
+	return out
+
+def CXXMethods(f):
+	out = []
+	for name in f.order:
+		v = f.features[name]
+		if v["Category"] != "Deprecated":
+			if v["FeatureType"] in ["fun", "get", "set"]:
+				msgName = "Message::" + name
+				if v["FeatureType"] == "get" and name.startswith("Get"):
+					name = name[len("Get"):]
+				retType = ActualTypeName(v["ReturnType"])
+				parameters, args, callName = ParametersArgsCallname(v)
+				returnIfNeeded = "return " if retType != "void" else ""
+
+				out.append(JoinTypeAndIdentifier(retType, "ScintillaCall::" + name) + "(" + parameters + ")" + " {")
+				retCast = ""
+				retCastEnd = ""
+				if retType not in basicTypes or retType in ["int", "Colour", "ColourAlpha"]:
+					if IsEnumeration(retType):
+						retType = namespace + retType
+					retCast = "static_cast<" + retType + ">("
+					retCastEnd = ")"
+				elif retType in ["void *"]:
+					retCast = "reinterpret_cast<" + retType + ">("
+					retCastEnd = ")"
+				out.append("\t" + returnIfNeeded + retCast + callName + "(" + msgName + args + ")" + retCastEnd + ";")
+				out.append("}")
+				out.append("")
+
+				# Extra method for stringresult that returns std::string
+				if v["Param2Type"] == "stringresult":
+					paramList = ParametersExceptLast(parameters)
+					argList = ParametersExceptLast(args)
+					out.append(JoinTypeAndIdentifier("std::string", "ScintillaCall::" + name) + \
+						"(" + paramList + ") {")
+					out.append("\treturn CallReturnString(" + msgName + argList + ");")
+					out.append("}")
+					out.append("")
+
+	return out
+
+def RegenerateAll(root):
+	HFacer.RegenerateAll(root, False)
+	f = Face.Face()
+	include = root / "include"
+	f.ReadFromFile(include / "Scintilla.iface")
+	FileGenerator.Regenerate(include / "ScintillaMessages.h", "//", HMessages(f))
+	FileGenerator.Regenerate(include / "ScintillaTypes.h", "//", HEnumerations(f), HConstants(f))
+	FileGenerator.Regenerate(include / "ScintillaCall.h", "//", HMethods(f))
+	FileGenerator.Regenerate(root / "call" / "ScintillaCall.cxx", "//", CXXMethods(f))
+
+if __name__ == "__main__":
+	RegenerateAll(pathlib.Path(__file__).resolve().parent.parent)
diff --git a/scite-app/scintilla/scripts/ScintillaData.py b/scite-app/scintilla/scripts/ScintillaData.py
new file mode 100644
index 0000000..355b5d4
--- /dev/null
+++ b/scite-app/scintilla/scripts/ScintillaData.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+# ScintillaData.py - implemented 2013 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Common code used by Scintilla and SciTE for source file regeneration.
+# The ScintillaData object exposes information about Scintilla as properties:
+# Version properties
+#     version
+#     versionDotted
+#     versionCommad
+#
+# Date last modified
+#     dateModified
+#     yearModified
+#     mdyModified
+#     dmyModified
+#     myModified
+
+# This file can be run to see the data it provides.
+# Requires Python 3.6 or later
+
+import datetime, pathlib, sys
+
+def FindCredits(historyFile, removeLinks=True):
+    credits = []
+    stage = 0
+    with historyFile.open(encoding="utf-8") as f:
+        for l in f.readlines():
+            l = l.strip()
+            if stage == 0 and l == "<table>":
+                stage = 1
+            elif stage == 1 and l == "</table>":
+                stage = 2
+            if stage == 1 and l.startswith("<td>"):
+                credit = l[4:-5]
+                if removeLinks and "<a" in l:
+                    title, _a, rest = credit.partition("<a href=")
+                    urlplus, _bracket, end = rest.partition(">")
+                    name = end.split("<")[0]
+                    url = urlplus[1:-1]
+                    credit = title.strip()
+                    if credit:
+                        credit += " "
+                    credit += name + " " + url
+                credits.append(credit)
+    return credits
+
+class ScintillaData:
+    def __init__(self, scintillaRoot):
+        # Discover version information
+        self.version = (scintillaRoot / "version.txt").read_text().strip()
+        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
+            self.version[2]
+        self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
+
+        with (scintillaRoot / "doc" / "index.html").open() as f:
+            self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
+                [0].split('\"')[3]
+            # 20130602
+            # index.html, SciTE.html
+            dtModified = datetime.datetime.strptime(self.dateModified, "%Y%m%d")
+            self.yearModified = self.dateModified[0:4]
+            monthModified = dtModified.strftime("%B")
+            dayModified = "%d" % dtModified.day
+            self.mdyModified = monthModified + " " + dayModified + " " + self.yearModified
+            # May 22 2013
+            # index.html, SciTE.html
+            self.dmyModified = dayModified + " " + monthModified + " " + self.yearModified
+            # 22 May 2013
+            # ScintillaHistory.html -- only first should change
+            self.myModified = monthModified + " " + self.yearModified
+
+        self.credits = FindCredits(scintillaRoot / "doc" / "ScintillaHistory.html")
+
+if __name__=="__main__":
+    sci = ScintillaData(pathlib.Path(__file__).resolve().parent.parent)
+    print("Version   %s   %s   %s" % (sci.version, sci.versionDotted, sci.versionCommad))
+    print("Date last modified    %s   %s   %s   %s   %s" % (
+        sci.dateModified, sci.yearModified, sci.mdyModified, sci.dmyModified, sci.myModified))
+    print("Credits:")
+    for c in sci.credits:
+        sys.stdout.buffer.write(b"    " + c.encode("utf-8") + b"\n")
diff --git a/scite-app/scintilla/scripts/__init__.py b/scite-app/scintilla/scripts/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/scite-app/scintilla/scripts/archive.sh b/scite-app/scintilla/scripts/archive.sh
new file mode 100644
index 0000000..cafa393
--- /dev/null
+++ b/scite-app/scintilla/scripts/archive.sh
@@ -0,0 +1,5 @@
+# Up to parent directory of scintilla
+cd ../..
+
+# Archive Scintilla to scintilla.tgz
+hg archive --repository scintilla scintilla.tgz
diff --git a/scite-app/scintilla/src/AutoComplete.cxx b/scite-app/scintilla/src/AutoComplete.cxx
new file mode 100644
index 0000000..87077e9
--- /dev/null
+++ b/scite-app/scintilla/src/AutoComplete.cxx
@@ -0,0 +1,298 @@
+// Scintilla source code edit control
+/** @file AutoComplete.cxx
+ ** Defines the auto completion list box.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterType.h"
+#include "Position.h"
+#include "AutoComplete.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+AutoComplete::AutoComplete() :
+	active(false),
+	separator(' '),
+	typesep('?'),
+	ignoreCase(false),
+	chooseSingle(false),
+	options(AutoCompleteOption::Normal),
+	posStart(0),
+	startLen(0),
+	cancelAtStartPos(true),
+	autoHide(true),
+	dropRestOfWord(false),
+	ignoreCaseBehaviour(CaseInsensitiveBehaviour::RespectCase),
+	widthLBDefault(100),
+	heightLBDefault(100),
+	autoSort(Ordering::PreSorted) {
+	lb = ListBox::Allocate();
+}
+
+AutoComplete::~AutoComplete() {
+	if (lb) {
+		lb->Destroy();
+	}
+}
+
+bool AutoComplete::Active() const noexcept {
+	return active;
+}
+
+void AutoComplete::Start(Window &parent, int ctrlID,
+	Sci::Position position, Point location, Sci::Position startLen_,
+	int lineHeight, bool unicodeMode, Technology technology, ListOptions listOptions) {
+	if (active) {
+		Cancel();
+	}
+	lb->SetOptions(listOptions);
+	lb->Create(parent, ctrlID, location, lineHeight, unicodeMode, technology);
+	lb->Clear();
+	active = true;
+	startLen = startLen_;
+	posStart = position;
+}
+
+void AutoComplete::SetStopChars(const char *stopChars_) {
+	stopChars = stopChars_;
+}
+
+bool AutoComplete::IsStopChar(char ch) const noexcept {
+	return ch && (stopChars.find(ch) != std::string::npos);
+}
+
+void AutoComplete::SetFillUpChars(const char *fillUpChars_) {
+	fillUpChars = fillUpChars_;
+}
+
+bool AutoComplete::IsFillUpChar(char ch) const noexcept {
+	return ch && (fillUpChars.find(ch) != std::string::npos);
+}
+
+void AutoComplete::SetSeparator(char separator_) {
+	separator = separator_;
+}
+
+char AutoComplete::GetSeparator() const noexcept {
+	return separator;
+}
+
+void AutoComplete::SetTypesep(char separator_) {
+	typesep = separator_;
+}
+
+char AutoComplete::GetTypesep() const noexcept {
+	return typesep;
+}
+
+struct Sorter {
+	AutoComplete *ac;
+	const char *list;
+	std::vector<int> indices;
+
+	Sorter(AutoComplete *ac_, const char *list_) : ac(ac_), list(list_) {
+		int i = 0;
+		while (list[i]) {
+			indices.push_back(i); // word start
+			while (list[i] != ac->GetTypesep() && list[i] != ac->GetSeparator() && list[i])
+				++i;
+			indices.push_back(i); // word end
+			if (list[i] == ac->GetTypesep()) {
+				while (list[i] != ac->GetSeparator() && list[i])
+					++i;
+			}
+			if (list[i] == ac->GetSeparator()) {
+				++i;
+				// preserve trailing separator as blank entry
+				if (!list[i]) {
+					indices.push_back(i);
+					indices.push_back(i);
+				}
+			}
+		}
+		indices.push_back(i); // index of last position
+	}
+
+	bool operator()(int a, int b) noexcept {
+		const int lenA = indices[a * 2 + 1] - indices[a * 2];
+		const int lenB = indices[b * 2 + 1] - indices[b * 2];
+		const int len  = std::min(lenA, lenB);
+		int cmp;
+		if (ac->ignoreCase)
+			cmp = CompareNCaseInsensitive(list + indices[a * 2], list + indices[b * 2], len);
+		else
+			cmp = strncmp(list + indices[a * 2], list + indices[b * 2], len);
+		if (cmp == 0)
+			cmp = lenA - lenB;
+		return cmp < 0;
+	}
+};
+
+void AutoComplete::SetList(const char *list) {
+	if (autoSort == Ordering::PreSorted) {
+		lb->SetList(list, separator, typesep);
+		sortMatrix.clear();
+		for (int i = 0; i < lb->Length(); ++i)
+			sortMatrix.push_back(i);
+		return;
+	}
+
+	Sorter IndexSort(this, list);
+	sortMatrix.clear();
+	for (int i = 0; i < static_cast<int>(IndexSort.indices.size()) / 2; ++i)
+		sortMatrix.push_back(i);
+	std::sort(sortMatrix.begin(), sortMatrix.end(), IndexSort);
+	if (autoSort == Ordering::Custom || sortMatrix.size() < 2) {
+		lb->SetList(list, separator, typesep);
+		PLATFORM_ASSERT(lb->Length() == static_cast<int>(sortMatrix.size()));
+		return;
+	}
+
+	std::string sortedList;
+	char item[maxItemLen];
+	for (size_t i = 0; i < sortMatrix.size(); ++i) {
+		int wordLen = IndexSort.indices[sortMatrix[i] * 2 + 2] - IndexSort.indices[sortMatrix[i] * 2];
+		if (wordLen > maxItemLen-2)
+			wordLen = maxItemLen - 2;
+		memcpy(item, list + IndexSort.indices[sortMatrix[i] * 2], wordLen);
+		if ((i+1) == sortMatrix.size()) {
+			// Last item so remove separator if present
+			if ((wordLen > 0) && (item[wordLen-1] == separator))
+				wordLen--;
+		} else {
+			// Item before last needs a separator
+			if ((wordLen == 0) || (item[wordLen-1] != separator)) {
+				item[wordLen] = separator;
+				wordLen++;
+			}
+		}
+		item[wordLen] = '\0';
+		sortedList += item;
+	}
+	for (int i = 0; i < static_cast<int>(sortMatrix.size()); ++i)
+		sortMatrix[i] = i;
+	lb->SetList(sortedList.c_str(), separator, typesep);
+}
+
+int AutoComplete::GetSelection() const {
+	return lb->GetSelection();
+}
+
+std::string AutoComplete::GetValue(int item) const {
+	return lb->GetValue(item);
+}
+
+void AutoComplete::Show(bool show) {
+	lb->Show(show);
+	if (show)
+		lb->Select(0);
+}
+
+void AutoComplete::Cancel() {
+	if (lb->Created()) {
+		lb->Clear();
+		lb->Destroy();
+		active = false;
+	}
+}
+
+
+void AutoComplete::Move(int delta) {
+	const int count = lb->Length();
+	int current = lb->GetSelection();
+	current += delta;
+	if (current >= count)
+		current = count - 1;
+	if (current < 0)
+		current = 0;
+	lb->Select(current);
+}
+
+void AutoComplete::Select(const char *word) {
+	const size_t lenWord = strlen(word);
+	int location = -1;
+	int start = 0; // lower bound of the api array block to search
+	int end = lb->Length() - 1; // upper bound of the api array block to search
+	while ((start <= end) && (location == -1)) { // Binary searching loop
+		int pivot = (start + end) / 2;
+		std::string item = GetValue(sortMatrix[pivot]);
+		int cond;
+		if (ignoreCase)
+			cond = CompareNCaseInsensitive(word, item.c_str(), lenWord);
+		else
+			cond = strncmp(word, item.c_str(), lenWord);
+		if (!cond) {
+			// Find first match
+			while (pivot > start) {
+				item = lb->GetValue(sortMatrix[pivot-1]);
+				if (ignoreCase)
+					cond = CompareNCaseInsensitive(word, item.c_str(), lenWord);
+				else
+					cond = strncmp(word, item.c_str(), lenWord);
+				if (0 != cond)
+					break;
+				--pivot;
+			}
+			location = pivot;
+			if (ignoreCase
+				&& ignoreCaseBehaviour == CaseInsensitiveBehaviour::RespectCase) {
+				// Check for exact-case match
+				for (; pivot <= end; pivot++) {
+					item = lb->GetValue(sortMatrix[pivot]);
+					if (!strncmp(word, item.c_str(), lenWord)) {
+						location = pivot;
+						break;
+					}
+					if (CompareNCaseInsensitive(word, item.c_str(), lenWord))
+						break;
+				}
+			}
+		} else if (cond < 0) {
+			end = pivot - 1;
+		} else if (cond > 0) {
+			start = pivot + 1;
+		}
+	}
+	if (location == -1) {
+		if (autoHide)
+			Cancel();
+		else
+			lb->Select(-1);
+	} else {
+		if (autoSort == Ordering::Custom) {
+			// Check for a logically earlier match
+			for (int i = location + 1; i <= end; ++i) {
+				std::string item = lb->GetValue(sortMatrix[i]);
+				if (CompareNCaseInsensitive(word, item.c_str(), lenWord))
+					break;
+				if (sortMatrix[i] < sortMatrix[location] && !strncmp(word, item.c_str(), lenWord))
+					location = i;
+			}
+		}
+		lb->Select(sortMatrix[location]);
+	}
+}
+
diff --git a/scite-app/scintilla/src/AutoComplete.h b/scite-app/scintilla/src/AutoComplete.h
new file mode 100644
index 0000000..fa8f572
--- /dev/null
+++ b/scite-app/scintilla/src/AutoComplete.h
@@ -0,0 +1,93 @@
+// Scintilla source code edit control
+/** @file AutoComplete.h
+ ** Defines the auto completion list box.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef AUTOCOMPLETE_H
+#define AUTOCOMPLETE_H
+
+namespace Scintilla::Internal {
+
+/**
+ */
+class AutoComplete {
+	bool active;
+	std::string stopChars;
+	std::string fillUpChars;
+	char separator;
+	char typesep; // Type separator
+	enum { maxItemLen=1000 };
+	std::vector<int> sortMatrix;
+
+public:
+
+	bool ignoreCase;
+	bool chooseSingle;
+	AutoCompleteOption options;
+	std::unique_ptr<ListBox> lb;
+	Sci::Position posStart;
+	Sci::Position startLen;
+	/// Should autocompletion be cancelled if editor's currentPos <= startPos?
+	bool cancelAtStartPos;
+	bool autoHide;
+	bool dropRestOfWord;
+	Scintilla::CaseInsensitiveBehaviour ignoreCaseBehaviour;
+	int widthLBDefault;
+	int heightLBDefault;
+	/** Ordering::PreSorted:   Assume the list is presorted; selection will fail if it is not alphabetical<br />
+	 *  Ordering::PerformSort: Sort the list alphabetically; start up performance cost for sorting<br />
+	 *  Ordering::Custom:      Handle non-alphabetical entries; start up performance cost for generating a sorted lookup table
+	 */
+	Scintilla::Ordering autoSort;
+
+	AutoComplete();
+	~AutoComplete();
+
+	/// Is the auto completion list displayed?
+	bool Active() const noexcept;
+
+	/// Display the auto completion list positioned to be near a character position
+	void Start(Window &parent, int ctrlID, Sci::Position position, Point location,
+		Sci::Position startLen_, int lineHeight, bool unicodeMode, Scintilla::Technology technology,
+		ListOptions listOptions);
+
+	/// The stop chars are characters which, when typed, cause the auto completion list to disappear
+	void SetStopChars(const char *stopChars_);
+	bool IsStopChar(char ch) const noexcept;
+
+	/// The fillup chars are characters which, when typed, fill up the selected word
+	void SetFillUpChars(const char *fillUpChars_);
+	bool IsFillUpChar(char ch) const noexcept;
+
+	/// The separator character is used when interpreting the list in SetList
+	void SetSeparator(char separator_);
+	char GetSeparator() const noexcept;
+
+	/// The typesep character is used for separating the word from the type
+	void SetTypesep(char separator_);
+	char GetTypesep() const noexcept;
+
+	/// The list string contains a sequence of words separated by the separator character
+	void SetList(const char *list);
+
+	/// Return the position of the currently selected list item
+	int GetSelection() const;
+
+	/// Return the value of an item in the list
+	std::string GetValue(int item) const;
+
+	void Show(bool show);
+	void Cancel();
+
+	/// Move the current list element by delta, scrolling appropriately
+	void Move(int delta);
+
+	/// Select a list element that starts with word as the current element
+	void Select(const char *word);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CallTip.cxx b/scite-app/scintilla/src/CallTip.cxx
new file mode 100644
index 0000000..18cadde
--- /dev/null
+++ b/scite-app/scintilla/src/CallTip.cxx
@@ -0,0 +1,356 @@
+// Scintilla source code edit control
+/** @file CallTip.cxx
+ ** Code for displaying call tips.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Position.h"
+#include "CallTip.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+size_t Chunk::Length() const noexcept {
+	return end - start;
+}
+
+CallTip::CallTip() noexcept {
+	wCallTip = {};
+	inCallTipMode = false;
+	posStartCallTip = 0;
+	rectUp = PRectangle(0,0,0,0);
+	rectDown = PRectangle(0,0,0,0);
+	lineHeight = 1;
+	offsetMain = 0;
+	tabSize = 0;
+	above = false;
+	useStyleCallTip = false;    // for backwards compatibility
+
+	insetX = 5;
+	widthArrow = 14;
+	borderHeight = 2; // Extra line for border and an empty line at top and bottom.
+	verticalOffset = 1;
+
+#ifdef __APPLE__
+	// proper apple colours for the default
+	colourBG = ColourRGBA(0xff, 0xff, 0xc6);
+	colourUnSel = ColourRGBA(0, 0, 0);
+#else
+	colourBG = ColourRGBA(0xff, 0xff, 0xff);
+	colourUnSel = ColourRGBA(0x80, 0x80, 0x80);
+#endif
+	colourSel = ColourRGBA(0, 0, 0x80);
+	colourShade = ColourRGBA(0, 0, 0);
+	colourLight = ColourRGBA(0xc0, 0xc0, 0xc0);
+	codePage = 0;
+	clickPlace = 0;
+}
+
+CallTip::~CallTip() {
+	wCallTip.Destroy();
+}
+
+// We ignore tabs unless a tab width has been set.
+bool CallTip::IsTabCharacter(char ch) const noexcept {
+	return (tabSize > 0) && (ch == '\t');
+}
+
+int CallTip::NextTabPos(int x) const noexcept {
+	if (tabSize > 0) {              // paranoia... not called unless this is true
+		x -= insetX;                // position relative to text
+		x = (x + tabSize) / tabSize;  // tab "number"
+		return tabSize*x + insetX;  // position of next tab
+	} else {
+		return x + 1;                 // arbitrary
+	}
+}
+
+namespace {
+
+// Although this test includes 0, we should never see a \0 character.
+constexpr bool IsArrowCharacter(char ch) noexcept {
+	return (ch == 0) || (ch == '\001') || (ch == '\002');
+}
+
+void DrawArrow(Surface *surface, const PRectangle &rc, bool upArrow, ColourRGBA colourBG, ColourRGBA colourUnSel) {
+	surface->FillRectangle(rc, colourBG);
+	const PRectangle rcClientInner = Clamp(rc.Inset(1), Edge::right, rc.right - 2);
+	surface->FillRectangle(rcClientInner, colourUnSel);
+
+	const XYPOSITION width = std::floor(rcClientInner.Width());
+	const XYPOSITION halfWidth = std::floor(width / 2) - 1;
+	const XYPOSITION quarterWidth = std::floor(halfWidth / 2);
+	const XYPOSITION centreX = rcClientInner.left + width / 2;
+	const XYPOSITION centreY = std::floor((rcClientInner.top + rcClientInner.bottom) / 2);
+
+	constexpr XYPOSITION pixelMove = 0.0f;
+	if (upArrow) {      // Up arrow
+		Point pts[] = {
+			Point(centreX - halfWidth + pixelMove, centreY + quarterWidth + 0.5f),
+			Point(centreX + halfWidth + pixelMove, centreY + quarterWidth + 0.5f),
+			Point(centreX + pixelMove, centreY - halfWidth + quarterWidth + 0.5f),
+		};
+		surface->Polygon(pts, std::size(pts), FillStroke(colourBG));
+	} else {            // Down arrow
+		Point pts[] = {
+			Point(centreX - halfWidth + pixelMove, centreY - quarterWidth + 0.5f),
+			Point(centreX + halfWidth + pixelMove, centreY - quarterWidth + 0.5f),
+			Point(centreX + pixelMove, centreY + halfWidth - quarterWidth + 0.5f),
+		};
+		surface->Polygon(pts, std::size(pts), FillStroke(colourBG));
+	}
+}
+
+}
+
+// Draw a section of the call tip that does not include \n in one colour.
+// The text may include tabs or arrow characters.
+int CallTip::DrawChunk(Surface *surface, int x, std::string_view sv,
+	int ytext, PRectangle rcClient, bool asHighlight, bool draw) {
+
+	if (sv.empty()) {
+		return x;
+	}
+
+	// Divide the text into sections that are all text, or that are
+	// single arrows or single tab characters (if tabSize > 0).
+	// Start with single element 0 to simplify append checks.
+	std::vector<size_t> ends(1);
+	for (size_t i=0; i<sv.length(); i++) {
+		if (IsArrowCharacter(sv[i]) || IsTabCharacter(sv[i])) {
+			if (ends.back() != i)
+				ends.push_back(i);
+			ends.push_back(i+1);
+		}
+	}
+	if (ends.back() != sv.length())
+		ends.push_back(sv.length());
+	ends.erase(ends.begin());	// Remove initial 0.
+
+	size_t startSeg = 0;
+	for (const size_t endSeg : ends) {
+		assert(endSeg > 0);
+		int xEnd;
+		if (IsArrowCharacter(sv[startSeg])) {
+			xEnd = x + widthArrow;
+			const bool upArrow = sv[startSeg] == '\001';
+			rcClient.left = static_cast<XYPOSITION>(x);
+			rcClient.right = static_cast<XYPOSITION>(xEnd);
+			if (draw) {
+				DrawArrow(surface, rcClient, upArrow, colourBG, colourUnSel);
+			}
+			offsetMain = xEnd;
+			if (upArrow) {
+				rectUp = rcClient;
+			} else {
+				rectDown = rcClient;
+			}
+		} else if (IsTabCharacter(sv[startSeg])) {
+			xEnd = NextTabPos(x);
+		} else {
+			const std::string_view segText = sv.substr(startSeg, endSeg - startSeg);
+			xEnd = x + static_cast<int>(std::lround(surface->WidthText(font.get(), segText)));
+			if (draw) {
+				rcClient.left = static_cast<XYPOSITION>(x);
+				rcClient.right = static_cast<XYPOSITION>(xEnd);
+				surface->DrawTextTransparent(rcClient, font.get(), static_cast<XYPOSITION>(ytext),
+									segText, asHighlight ? colourSel : colourUnSel);
+			}
+		}
+		x = xEnd;
+		startSeg = endSeg;
+	}
+	return x;
+}
+
+int CallTip::PaintContents(Surface *surfaceWindow, bool draw) {
+	const PRectangle rcClientPos = wCallTip.GetClientPosition();
+	const PRectangle rcClientSize(0.0f, 0.0f, rcClientPos.right - rcClientPos.left,
+	                        rcClientPos.bottom - rcClientPos.top);
+	PRectangle rcClient(1.0f, 1.0f, rcClientSize.right - 1, rcClientSize.bottom - 1);
+
+	// To make a nice small call tip window, it is only sized to fit most normal characters without accents
+	const int ascent = static_cast<int>(std::round(surfaceWindow->Ascent(font.get()) - surfaceWindow->InternalLeading(font.get())));
+
+	// For each line...
+	// Draw the definition in three parts: before highlight, highlighted, after highlight
+	int ytext = static_cast<int>(rcClient.top) + ascent + 1;
+	rcClient.bottom = ytext + surfaceWindow->Descent(font.get()) + 1;
+	std::string_view remaining(val);
+	int maxWidth = 0;
+	size_t lineStart = 0;
+	while (!remaining.empty()) {
+		const std::string_view chunkVal = remaining.substr(0, remaining.find_first_of('\n'));
+		remaining.remove_prefix(chunkVal.length());
+		if (!remaining.empty()) {
+			remaining.remove_prefix(1);	// Skip \n
+		}
+
+		const Chunk chunkLine(lineStart, lineStart + chunkVal.length());
+		Chunk chunkHighlight(
+			std::clamp(highlight.start, chunkLine.start, chunkLine.end),
+			std::clamp(highlight.end, chunkLine.start, chunkLine.end)
+		);
+		chunkHighlight.start -= lineStart;
+		chunkHighlight.end -= lineStart;
+
+		rcClient.top = static_cast<XYPOSITION>(ytext - ascent - 1);
+
+		int x = insetX;     // start each line at this inset
+
+		x = DrawChunk(surfaceWindow, x,
+			chunkVal.substr(0, chunkHighlight.start),
+			ytext, rcClient, false, draw);
+		x = DrawChunk(surfaceWindow, x,
+			chunkVal.substr(chunkHighlight.start, chunkHighlight.Length()),
+			ytext, rcClient, true, draw);
+		x = DrawChunk(surfaceWindow, x,
+			chunkVal.substr(chunkHighlight.end),
+			ytext, rcClient, false, draw);
+
+		ytext += lineHeight;
+		rcClient.bottom += lineHeight;
+		maxWidth = std::max(maxWidth, x);
+		lineStart += chunkVal.length() + 1;
+	}
+	return maxWidth;
+}
+
+void CallTip::PaintCT(Surface *surfaceWindow) {
+	if (val.empty())
+		return;
+	const PRectangle rcClientPos = wCallTip.GetClientPosition();
+	const PRectangle rcClientSize(0.0f, 0.0f, rcClientPos.right - rcClientPos.left,
+	                        rcClientPos.bottom - rcClientPos.top);
+	const PRectangle rcClient(1.0f, 1.0f, rcClientSize.right - 1, rcClientSize.bottom - 1);
+
+	surfaceWindow->FillRectangle(rcClient, colourBG);
+
+	offsetMain = insetX;    // initial alignment assuming no arrows
+	PaintContents(surfaceWindow, true);
+
+#if !defined(__APPLE__) && !PLAT_CURSES
+	// OSX doesn't put borders on "help tags"
+	// Draw a raised border around the edges of the window
+	constexpr XYPOSITION border = 1.0f;
+	surfaceWindow->FillRectangle(Side(rcClientSize, Edge::left, border), colourLight);
+	surfaceWindow->FillRectangle(Side(rcClientSize, Edge::right, border), colourShade);
+	surfaceWindow->FillRectangle(Side(rcClientSize, Edge::bottom, border), colourShade);
+	surfaceWindow->FillRectangle(Side(rcClientSize, Edge::top, border), colourLight);
+#endif
+}
+
+void CallTip::MouseClick(Point pt) noexcept {
+	clickPlace = 0;
+	if (rectUp.Contains(pt))
+		clickPlace = 1;
+	if (rectDown.Contains(pt))
+		clickPlace = 2;
+}
+
+PRectangle CallTip::CallTipStart(Sci::Position pos, Point pt, int textHeight, const char *defn,
+                                 const char *faceName, int size,
+                                 int codePage_, CharacterSet characterSet,
+                                 Technology technology,
+                                 const char *localeName,
+                                 const Window &wParent) {
+	clickPlace = 0;
+	val = defn;
+	codePage = codePage_;
+	std::unique_ptr<Surface> surfaceMeasure = Surface::Allocate(technology);
+	surfaceMeasure->Init(wParent.GetID());
+	surfaceMeasure->SetMode(SurfaceMode(codePage, false));
+	highlight = Chunk();
+	inCallTipMode = true;
+	posStartCallTip = pos;
+	const XYPOSITION deviceHeight = static_cast<XYPOSITION>(surfaceMeasure->DeviceHeightFont(size));
+	const FontParameters fp(faceName, deviceHeight / FontSizeMultiplier, FontWeight::Normal,
+		false, FontQuality::QualityDefault, technology, characterSet, localeName);
+	font = Font::Allocate(fp);
+	// Look for multiple lines in the text
+	// Only support \n here - simply means container must avoid \r!
+	const int numLines = 1 + static_cast<int>(std::count(val.begin(), val.end(), '\n'));
+	rectUp = PRectangle(0,0,0,0);
+	rectDown = PRectangle(0,0,0,0);
+	offsetMain = insetX;            // changed to right edge of any arrows
+	lineHeight = static_cast<int>(std::lround(surfaceMeasure->Height(font.get())));
+#if !PLAT_CURSES
+	widthArrow = lineHeight * 9 / 10;
+#endif
+	const int width = PaintContents(surfaceMeasure.get(), false) + insetX;
+
+	// The returned
+	// rectangle is aligned to the right edge of the last arrow encountered in
+	// the tip text, else to the tip text left edge.
+	const int height = lineHeight * numLines - static_cast<int>(surfaceMeasure->InternalLeading(font.get())) + borderHeight * 2;
+	if (above) {
+		return PRectangle(pt.x - offsetMain, pt.y - verticalOffset - height, pt.x + width - offsetMain, pt.y - verticalOffset);
+	} else {
+		return PRectangle(pt.x - offsetMain, pt.y + verticalOffset + textHeight, pt.x + width - offsetMain, pt.y + verticalOffset + textHeight + height);
+	}
+}
+
+void CallTip::CallTipCancel() {
+	inCallTipMode = false;
+	if (wCallTip.Created()) {
+		wCallTip.Destroy();
+	}
+}
+
+void CallTip::SetHighlight(size_t start, size_t end) {
+	// Avoid flashing by checking something has really changed
+	if ((start != highlight.start) || (end != highlight.end)) {
+		highlight.start = start;
+		highlight.end = (end > start) ? end : start;
+		if (wCallTip.Created()) {
+			wCallTip.InvalidateAll();
+		}
+	}
+}
+
+// Set the tab size (sizes > 0 enable the use of tabs). This also enables the
+// use of the StyleCallTip.
+void CallTip::SetTabSize(int tabSz) noexcept {
+	tabSize = tabSz;
+	useStyleCallTip = true;
+}
+
+// Set the calltip position, below the text by default or if above is false
+// else above the text.
+void CallTip::SetPosition(bool aboveText) noexcept {
+	above = aboveText;
+}
+
+bool CallTip::UseStyleCallTip() const noexcept {
+	return useStyleCallTip; 
+}
+
+// It might be better to have two access functions for this and to use
+// them for all settings of colours.
+void CallTip::SetForeBack(const ColourRGBA &fore, const ColourRGBA &back) noexcept {
+	colourBG = back;
+	colourUnSel = fore;
+}
diff --git a/scite-app/scintilla/src/CallTip.h b/scite-app/scintilla/src/CallTip.h
new file mode 100644
index 0000000..f2889d4
--- /dev/null
+++ b/scite-app/scintilla/src/CallTip.h
@@ -0,0 +1,99 @@
+// Scintilla source code edit control
+/** @file CallTip.h
+ ** Interface to the call tip control.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CALLTIP_H
+#define CALLTIP_H
+
+namespace Scintilla::Internal {
+
+struct Chunk {
+	size_t start;
+	size_t end;
+	constexpr Chunk(size_t start_=0, size_t end_=0) noexcept : start(start_), end(end_) {
+		assert(start <= end);
+	}
+	size_t Length() const noexcept;
+};
+
+/**
+ */
+class CallTip {
+	Chunk highlight;    // character offset to start and end of highlighted text
+	std::string val;
+	std::shared_ptr<Font> font;
+	PRectangle rectUp;      // rectangle of last up angle in the tip
+	PRectangle rectDown;    // rectangle of last down arrow in the tip
+	int lineHeight;         // vertical line spacing
+	int offsetMain;         // The alignment point of the call tip
+	int tabSize;            // Tab size in pixels, <=0 no TAB expand
+	bool useStyleCallTip;   // if true, StyleCallTip should be used
+	bool above;		// if true, display calltip above text
+
+	int DrawChunk(Surface *surface, int x, std::string_view sv,
+		int ytext, PRectangle rcClient, bool asHighlight, bool draw);
+	int PaintContents(Surface *surfaceWindow, bool draw);
+	bool IsTabCharacter(char ch) const noexcept;
+	int NextTabPos(int x) const noexcept;
+
+public:
+	Window wCallTip;
+	Window wDraw;
+	bool inCallTipMode;
+	Sci::Position posStartCallTip;
+	ColourRGBA colourBG;
+	ColourRGBA colourUnSel;
+	ColourRGBA colourSel;
+	ColourRGBA colourShade;
+	ColourRGBA colourLight;
+	int codePage;
+	int clickPlace;
+
+	int insetX; // text inset in x from calltip border
+	int widthArrow;
+	int borderHeight;
+	int verticalOffset; // pixel offset up or down of the calltip with respect to the line
+
+	CallTip() noexcept;
+	// Deleted so CallTip objects can not be copied.
+	CallTip(const CallTip &) = delete;
+	CallTip(CallTip &&) = delete;
+	CallTip &operator=(const CallTip &) = delete;
+	CallTip &operator=(CallTip &&) = delete;
+	~CallTip();
+
+	void PaintCT(Surface *surfaceWindow);
+
+	void MouseClick(Point pt) noexcept;
+
+	/// Setup the calltip and return a rectangle of the area required.
+	PRectangle CallTipStart(Sci::Position pos, Point pt, int textHeight, const char *defn,
+		const char *faceName, int size, int codePage_,
+		Scintilla::CharacterSet characterSet, Scintilla::Technology technology, const char *localeName,
+		const Window &wParent);
+
+	void CallTipCancel();
+
+	/// Set a range of characters to be displayed in a highlight style.
+	/// Commonly used to highlight the current parameter.
+	void SetHighlight(size_t start, size_t end);
+
+	/// Set the tab size in pixels for the call tip. 0 or -ve means no tab expand.
+	void SetTabSize(int tabSz) noexcept;
+
+	/// Set calltip position.
+	void SetPosition(bool aboveText) noexcept;
+
+	/// Used to determine which STYLE_xxxx to use for call tip information
+	bool UseStyleCallTip() const noexcept;
+
+	// Modify foreground and background colours
+	void SetForeBack(const ColourRGBA &fore, const ColourRGBA &back) noexcept;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CaseConvert.cxx b/scite-app/scintilla/src/CaseConvert.cxx
new file mode 100644
index 0000000..fd1bee2
--- /dev/null
+++ b/scite-app/scintilla/src/CaseConvert.cxx
@@ -0,0 +1,835 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file CaseConvert.cxx
+ ** Case fold characters and convert them to upper or lower case.
+ ** Tables automatically regenerated by scripts/GenerateCaseConvert.py
+ ** Should only be rarely regenerated for new versions of Unicode.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+
+#include "CaseConvert.h"
+#include "UniConversion.h"
+
+using namespace Scintilla::Internal;
+
+namespace {
+	// Use an unnamed namespace to protect the declarations from name conflicts
+
+// Unicode code points are ordered by groups and follow patterns.
+// Most characters (pitch==1) are in ranges for a particular alphabet and their
+// upper case forms are a fixed distance away.
+// Another pattern (pitch==2) is where each lower case letter is preceded by
+// the upper case form. These are also grouped into ranges.
+
+int symmetricCaseConversionRanges[] = {
+//lower, upper, range length, range pitch
+//++Autogenerated -- start of section automatically generated
+//**\(\*\n\)
+97,65,26,1,
+224,192,23,1,
+248,216,7,1,
+257,256,24,2,
+314,313,8,2,
+331,330,23,2,
+462,461,8,2,
+479,478,9,2,
+505,504,20,2,
+547,546,9,2,
+583,582,5,2,
+945,913,17,1,
+963,931,9,1,
+985,984,12,2,
+1072,1040,32,1,
+1104,1024,16,1,
+1121,1120,17,2,
+1163,1162,27,2,
+1218,1217,7,2,
+1233,1232,48,2,
+1377,1329,38,1,
+4304,7312,43,1,
+7681,7680,75,2,
+7841,7840,48,2,
+7936,7944,8,1,
+7952,7960,6,1,
+7968,7976,8,1,
+7984,7992,8,1,
+8000,8008,6,1,
+8032,8040,8,1,
+8560,8544,16,1,
+9424,9398,26,1,
+11312,11264,47,1,
+11393,11392,50,2,
+11520,4256,38,1,
+42561,42560,23,2,
+42625,42624,14,2,
+42787,42786,7,2,
+42803,42802,31,2,
+42879,42878,5,2,
+42903,42902,10,2,
+42933,42932,6,2,
+65345,65313,26,1,
+66600,66560,40,1,
+66776,66736,36,1,
+68800,68736,51,1,
+71872,71840,32,1,
+93792,93760,32,1,
+125218,125184,34,1,
+
+//--Autogenerated -- end of section automatically generated
+};
+
+// Code points that are symmetric but don't fit into a range of similar characters
+// are listed here.
+
+int symmetricCaseConversions[] = {
+//lower, upper
+//++Autogenerated -- start of section automatically generated
+//**1 \(\*\n\)
+255,376,
+307,306,
+309,308,
+311,310,
+378,377,
+380,379,
+382,381,
+384,579,
+387,386,
+389,388,
+392,391,
+396,395,
+402,401,
+405,502,
+409,408,
+410,573,
+414,544,
+417,416,
+419,418,
+421,420,
+424,423,
+429,428,
+432,431,
+436,435,
+438,437,
+441,440,
+445,444,
+447,503,
+454,452,
+457,455,
+460,458,
+477,398,
+499,497,
+501,500,
+572,571,
+575,11390,
+576,11391,
+578,577,
+592,11375,
+593,11373,
+594,11376,
+595,385,
+596,390,
+598,393,
+599,394,
+601,399,
+603,400,
+604,42923,
+608,403,
+609,42924,
+611,404,
+613,42893,
+614,42922,
+616,407,
+617,406,
+618,42926,
+619,11362,
+620,42925,
+623,412,
+625,11374,
+626,413,
+629,415,
+637,11364,
+640,422,
+642,42949,
+643,425,
+647,42929,
+648,430,
+649,580,
+650,433,
+651,434,
+652,581,
+658,439,
+669,42930,
+670,42928,
+881,880,
+883,882,
+887,886,
+891,1021,
+892,1022,
+893,1023,
+940,902,
+941,904,
+942,905,
+943,906,
+972,908,
+973,910,
+974,911,
+983,975,
+1010,1017,
+1011,895,
+1016,1015,
+1019,1018,
+1231,1216,
+4349,7357,
+4350,7358,
+4351,7359,
+7545,42877,
+7549,11363,
+7566,42950,
+8017,8025,
+8019,8027,
+8021,8029,
+8023,8031,
+8048,8122,
+8049,8123,
+8050,8136,
+8051,8137,
+8052,8138,
+8053,8139,
+8054,8154,
+8055,8155,
+8056,8184,
+8057,8185,
+8058,8170,
+8059,8171,
+8060,8186,
+8061,8187,
+8112,8120,
+8113,8121,
+8144,8152,
+8145,8153,
+8160,8168,
+8161,8169,
+8165,8172,
+8526,8498,
+8580,8579,
+11361,11360,
+11365,570,
+11366,574,
+11368,11367,
+11370,11369,
+11372,11371,
+11379,11378,
+11382,11381,
+11500,11499,
+11502,11501,
+11507,11506,
+11559,4295,
+11565,4301,
+42874,42873,
+42876,42875,
+42892,42891,
+42897,42896,
+42899,42898,
+42900,42948,
+42947,42946,
+42952,42951,
+42954,42953,
+42998,42997,
+43859,42931,
+
+//--Autogenerated -- end of section automatically generated
+};
+
+// Characters that have complex case conversions are listed here.
+// This includes cases where more than one character is needed for a conversion,
+// folding is different to lowering, or (as appropriate) upper(lower(x)) != x or
+// lower(upper(x)) != x.
+
+const char *complexCaseConversions =
+// Original | Folded | Upper | Lower |
+//++Autogenerated -- start of section automatically generated
+//**2 \(\*\n\)
+"\xc2\xb5|\xce\xbc|\xce\x9c||"
+"\xc3\x9f|ss|SS||"
+"\xc4\xb0|i\xcc\x87||i\xcc\x87|"
+"\xc4\xb1||I||"
+"\xc5\x89|\xca\xbcn|\xca\xbcN||"
+"\xc5\xbf|s|S||"
+"\xc7\x85|\xc7\x86|\xc7\x84|\xc7\x86|"
+"\xc7\x88|\xc7\x89|\xc7\x87|\xc7\x89|"
+"\xc7\x8b|\xc7\x8c|\xc7\x8a|\xc7\x8c|"
+"\xc7\xb0|j\xcc\x8c|J\xcc\x8c||"
+"\xc7\xb2|\xc7\xb3|\xc7\xb1|\xc7\xb3|"
+"\xcd\x85|\xce\xb9|\xce\x99||"
+"\xce\x90|\xce\xb9\xcc\x88\xcc\x81|\xce\x99\xcc\x88\xcc\x81||"
+"\xce\xb0|\xcf\x85\xcc\x88\xcc\x81|\xce\xa5\xcc\x88\xcc\x81||"
+"\xcf\x82|\xcf\x83|\xce\xa3||"
+"\xcf\x90|\xce\xb2|\xce\x92||"
+"\xcf\x91|\xce\xb8|\xce\x98||"
+"\xcf\x95|\xcf\x86|\xce\xa6||"
+"\xcf\x96|\xcf\x80|\xce\xa0||"
+"\xcf\xb0|\xce\xba|\xce\x9a||"
+"\xcf\xb1|\xcf\x81|\xce\xa1||"
+"\xcf\xb4|\xce\xb8||\xce\xb8|"
+"\xcf\xb5|\xce\xb5|\xce\x95||"
+"\xd6\x87|\xd5\xa5\xd6\x82|\xd4\xb5\xd5\x92||"
+"\xe1\x8e\xa0|||\xea\xad\xb0|"
+"\xe1\x8e\xa1|||\xea\xad\xb1|"
+"\xe1\x8e\xa2|||\xea\xad\xb2|"
+"\xe1\x8e\xa3|||\xea\xad\xb3|"
+"\xe1\x8e\xa4|||\xea\xad\xb4|"
+"\xe1\x8e\xa5|||\xea\xad\xb5|"
+"\xe1\x8e\xa6|||\xea\xad\xb6|"
+"\xe1\x8e\xa7|||\xea\xad\xb7|"
+"\xe1\x8e\xa8|||\xea\xad\xb8|"
+"\xe1\x8e\xa9|||\xea\xad\xb9|"
+"\xe1\x8e\xaa|||\xea\xad\xba|"
+"\xe1\x8e\xab|||\xea\xad\xbb|"
+"\xe1\x8e\xac|||\xea\xad\xbc|"
+"\xe1\x8e\xad|||\xea\xad\xbd|"
+"\xe1\x8e\xae|||\xea\xad\xbe|"
+"\xe1\x8e\xaf|||\xea\xad\xbf|"
+"\xe1\x8e\xb0|||\xea\xae\x80|"
+"\xe1\x8e\xb1|||\xea\xae\x81|"
+"\xe1\x8e\xb2|||\xea\xae\x82|"
+"\xe1\x8e\xb3|||\xea\xae\x83|"
+"\xe1\x8e\xb4|||\xea\xae\x84|"
+"\xe1\x8e\xb5|||\xea\xae\x85|"
+"\xe1\x8e\xb6|||\xea\xae\x86|"
+"\xe1\x8e\xb7|||\xea\xae\x87|"
+"\xe1\x8e\xb8|||\xea\xae\x88|"
+"\xe1\x8e\xb9|||\xea\xae\x89|"
+"\xe1\x8e\xba|||\xea\xae\x8a|"
+"\xe1\x8e\xbb|||\xea\xae\x8b|"
+"\xe1\x8e\xbc|||\xea\xae\x8c|"
+"\xe1\x8e\xbd|||\xea\xae\x8d|"
+"\xe1\x8e\xbe|||\xea\xae\x8e|"
+"\xe1\x8e\xbf|||\xea\xae\x8f|"
+"\xe1\x8f\x80|||\xea\xae\x90|"
+"\xe1\x8f\x81|||\xea\xae\x91|"
+"\xe1\x8f\x82|||\xea\xae\x92|"
+"\xe1\x8f\x83|||\xea\xae\x93|"
+"\xe1\x8f\x84|||\xea\xae\x94|"
+"\xe1\x8f\x85|||\xea\xae\x95|"
+"\xe1\x8f\x86|||\xea\xae\x96|"
+"\xe1\x8f\x87|||\xea\xae\x97|"
+"\xe1\x8f\x88|||\xea\xae\x98|"
+"\xe1\x8f\x89|||\xea\xae\x99|"
+"\xe1\x8f\x8a|||\xea\xae\x9a|"
+"\xe1\x8f\x8b|||\xea\xae\x9b|"
+"\xe1\x8f\x8c|||\xea\xae\x9c|"
+"\xe1\x8f\x8d|||\xea\xae\x9d|"
+"\xe1\x8f\x8e|||\xea\xae\x9e|"
+"\xe1\x8f\x8f|||\xea\xae\x9f|"
+"\xe1\x8f\x90|||\xea\xae\xa0|"
+"\xe1\x8f\x91|||\xea\xae\xa1|"
+"\xe1\x8f\x92|||\xea\xae\xa2|"
+"\xe1\x8f\x93|||\xea\xae\xa3|"
+"\xe1\x8f\x94|||\xea\xae\xa4|"
+"\xe1\x8f\x95|||\xea\xae\xa5|"
+"\xe1\x8f\x96|||\xea\xae\xa6|"
+"\xe1\x8f\x97|||\xea\xae\xa7|"
+"\xe1\x8f\x98|||\xea\xae\xa8|"
+"\xe1\x8f\x99|||\xea\xae\xa9|"
+"\xe1\x8f\x9a|||\xea\xae\xaa|"
+"\xe1\x8f\x9b|||\xea\xae\xab|"
+"\xe1\x8f\x9c|||\xea\xae\xac|"
+"\xe1\x8f\x9d|||\xea\xae\xad|"
+"\xe1\x8f\x9e|||\xea\xae\xae|"
+"\xe1\x8f\x9f|||\xea\xae\xaf|"
+"\xe1\x8f\xa0|||\xea\xae\xb0|"
+"\xe1\x8f\xa1|||\xea\xae\xb1|"
+"\xe1\x8f\xa2|||\xea\xae\xb2|"
+"\xe1\x8f\xa3|||\xea\xae\xb3|"
+"\xe1\x8f\xa4|||\xea\xae\xb4|"
+"\xe1\x8f\xa5|||\xea\xae\xb5|"
+"\xe1\x8f\xa6|||\xea\xae\xb6|"
+"\xe1\x8f\xa7|||\xea\xae\xb7|"
+"\xe1\x8f\xa8|||\xea\xae\xb8|"
+"\xe1\x8f\xa9|||\xea\xae\xb9|"
+"\xe1\x8f\xaa|||\xea\xae\xba|"
+"\xe1\x8f\xab|||\xea\xae\xbb|"
+"\xe1\x8f\xac|||\xea\xae\xbc|"
+"\xe1\x8f\xad|||\xea\xae\xbd|"
+"\xe1\x8f\xae|||\xea\xae\xbe|"
+"\xe1\x8f\xaf|||\xea\xae\xbf|"
+"\xe1\x8f\xb0|||\xe1\x8f\xb8|"
+"\xe1\x8f\xb1|||\xe1\x8f\xb9|"
+"\xe1\x8f\xb2|||\xe1\x8f\xba|"
+"\xe1\x8f\xb3|||\xe1\x8f\xbb|"
+"\xe1\x8f\xb4|||\xe1\x8f\xbc|"
+"\xe1\x8f\xb5|||\xe1\x8f\xbd|"
+"\xe1\x8f\xb8|\xe1\x8f\xb0|\xe1\x8f\xb0||"
+"\xe1\x8f\xb9|\xe1\x8f\xb1|\xe1\x8f\xb1||"
+"\xe1\x8f\xba|\xe1\x8f\xb2|\xe1\x8f\xb2||"
+"\xe1\x8f\xbb|\xe1\x8f\xb3|\xe1\x8f\xb3||"
+"\xe1\x8f\xbc|\xe1\x8f\xb4|\xe1\x8f\xb4||"
+"\xe1\x8f\xbd|\xe1\x8f\xb5|\xe1\x8f\xb5||"
+"\xe1\xb2\x80|\xd0\xb2|\xd0\x92||"
+"\xe1\xb2\x81|\xd0\xb4|\xd0\x94||"
+"\xe1\xb2\x82|\xd0\xbe|\xd0\x9e||"
+"\xe1\xb2\x83|\xd1\x81|\xd0\xa1||"
+"\xe1\xb2\x84|\xd1\x82|\xd0\xa2||"
+"\xe1\xb2\x85|\xd1\x82|\xd0\xa2||"
+"\xe1\xb2\x86|\xd1\x8a|\xd0\xaa||"
+"\xe1\xb2\x87|\xd1\xa3|\xd1\xa2||"
+"\xe1\xb2\x88|\xea\x99\x8b|\xea\x99\x8a||"
+"\xe1\xba\x96|h\xcc\xb1|H\xcc\xb1||"
+"\xe1\xba\x97|t\xcc\x88|T\xcc\x88||"
+"\xe1\xba\x98|w\xcc\x8a|W\xcc\x8a||"
+"\xe1\xba\x99|y\xcc\x8a|Y\xcc\x8a||"
+"\xe1\xba\x9a|a\xca\xbe|A\xca\xbe||"
+"\xe1\xba\x9b|\xe1\xb9\xa1|\xe1\xb9\xa0||"
+"\xe1\xba\x9e|ss||\xc3\x9f|"
+"\xe1\xbd\x90|\xcf\x85\xcc\x93|\xce\xa5\xcc\x93||"
+"\xe1\xbd\x92|\xcf\x85\xcc\x93\xcc\x80|\xce\xa5\xcc\x93\xcc\x80||"
+"\xe1\xbd\x94|\xcf\x85\xcc\x93\xcc\x81|\xce\xa5\xcc\x93\xcc\x81||"
+"\xe1\xbd\x96|\xcf\x85\xcc\x93\xcd\x82|\xce\xa5\xcc\x93\xcd\x82||"
+"\xe1\xbe\x80|\xe1\xbc\x80\xce\xb9|\xe1\xbc\x88\xce\x99||"
+"\xe1\xbe\x81|\xe1\xbc\x81\xce\xb9|\xe1\xbc\x89\xce\x99||"
+"\xe1\xbe\x82|\xe1\xbc\x82\xce\xb9|\xe1\xbc\x8a\xce\x99||"
+"\xe1\xbe\x83|\xe1\xbc\x83\xce\xb9|\xe1\xbc\x8b\xce\x99||"
+"\xe1\xbe\x84|\xe1\xbc\x84\xce\xb9|\xe1\xbc\x8c\xce\x99||"
+"\xe1\xbe\x85|\xe1\xbc\x85\xce\xb9|\xe1\xbc\x8d\xce\x99||"
+"\xe1\xbe\x86|\xe1\xbc\x86\xce\xb9|\xe1\xbc\x8e\xce\x99||"
+"\xe1\xbe\x87|\xe1\xbc\x87\xce\xb9|\xe1\xbc\x8f\xce\x99||"
+"\xe1\xbe\x88|\xe1\xbc\x80\xce\xb9|\xe1\xbc\x88\xce\x99|\xe1\xbe\x80|"
+"\xe1\xbe\x89|\xe1\xbc\x81\xce\xb9|\xe1\xbc\x89\xce\x99|\xe1\xbe\x81|"
+"\xe1\xbe\x8a|\xe1\xbc\x82\xce\xb9|\xe1\xbc\x8a\xce\x99|\xe1\xbe\x82|"
+"\xe1\xbe\x8b|\xe1\xbc\x83\xce\xb9|\xe1\xbc\x8b\xce\x99|\xe1\xbe\x83|"
+"\xe1\xbe\x8c|\xe1\xbc\x84\xce\xb9|\xe1\xbc\x8c\xce\x99|\xe1\xbe\x84|"
+"\xe1\xbe\x8d|\xe1\xbc\x85\xce\xb9|\xe1\xbc\x8d\xce\x99|\xe1\xbe\x85|"
+"\xe1\xbe\x8e|\xe1\xbc\x86\xce\xb9|\xe1\xbc\x8e\xce\x99|\xe1\xbe\x86|"
+"\xe1\xbe\x8f|\xe1\xbc\x87\xce\xb9|\xe1\xbc\x8f\xce\x99|\xe1\xbe\x87|"
+"\xe1\xbe\x90|\xe1\xbc\xa0\xce\xb9|\xe1\xbc\xa8\xce\x99||"
+"\xe1\xbe\x91|\xe1\xbc\xa1\xce\xb9|\xe1\xbc\xa9\xce\x99||"
+"\xe1\xbe\x92|\xe1\xbc\xa2\xce\xb9|\xe1\xbc\xaa\xce\x99||"
+"\xe1\xbe\x93|\xe1\xbc\xa3\xce\xb9|\xe1\xbc\xab\xce\x99||"
+"\xe1\xbe\x94|\xe1\xbc\xa4\xce\xb9|\xe1\xbc\xac\xce\x99||"
+"\xe1\xbe\x95|\xe1\xbc\xa5\xce\xb9|\xe1\xbc\xad\xce\x99||"
+"\xe1\xbe\x96|\xe1\xbc\xa6\xce\xb9|\xe1\xbc\xae\xce\x99||"
+"\xe1\xbe\x97|\xe1\xbc\xa7\xce\xb9|\xe1\xbc\xaf\xce\x99||"
+"\xe1\xbe\x98|\xe1\xbc\xa0\xce\xb9|\xe1\xbc\xa8\xce\x99|\xe1\xbe\x90|"
+"\xe1\xbe\x99|\xe1\xbc\xa1\xce\xb9|\xe1\xbc\xa9\xce\x99|\xe1\xbe\x91|"
+"\xe1\xbe\x9a|\xe1\xbc\xa2\xce\xb9|\xe1\xbc\xaa\xce\x99|\xe1\xbe\x92|"
+"\xe1\xbe\x9b|\xe1\xbc\xa3\xce\xb9|\xe1\xbc\xab\xce\x99|\xe1\xbe\x93|"
+"\xe1\xbe\x9c|\xe1\xbc\xa4\xce\xb9|\xe1\xbc\xac\xce\x99|\xe1\xbe\x94|"
+"\xe1\xbe\x9d|\xe1\xbc\xa5\xce\xb9|\xe1\xbc\xad\xce\x99|\xe1\xbe\x95|"
+"\xe1\xbe\x9e|\xe1\xbc\xa6\xce\xb9|\xe1\xbc\xae\xce\x99|\xe1\xbe\x96|"
+"\xe1\xbe\x9f|\xe1\xbc\xa7\xce\xb9|\xe1\xbc\xaf\xce\x99|\xe1\xbe\x97|"
+"\xe1\xbe\xa0|\xe1\xbd\xa0\xce\xb9|\xe1\xbd\xa8\xce\x99||"
+"\xe1\xbe\xa1|\xe1\xbd\xa1\xce\xb9|\xe1\xbd\xa9\xce\x99||"
+"\xe1\xbe\xa2|\xe1\xbd\xa2\xce\xb9|\xe1\xbd\xaa\xce\x99||"
+"\xe1\xbe\xa3|\xe1\xbd\xa3\xce\xb9|\xe1\xbd\xab\xce\x99||"
+"\xe1\xbe\xa4|\xe1\xbd\xa4\xce\xb9|\xe1\xbd\xac\xce\x99||"
+"\xe1\xbe\xa5|\xe1\xbd\xa5\xce\xb9|\xe1\xbd\xad\xce\x99||"
+"\xe1\xbe\xa6|\xe1\xbd\xa6\xce\xb9|\xe1\xbd\xae\xce\x99||"
+"\xe1\xbe\xa7|\xe1\xbd\xa7\xce\xb9|\xe1\xbd\xaf\xce\x99||"
+"\xe1\xbe\xa8|\xe1\xbd\xa0\xce\xb9|\xe1\xbd\xa8\xce\x99|\xe1\xbe\xa0|"
+"\xe1\xbe\xa9|\xe1\xbd\xa1\xce\xb9|\xe1\xbd\xa9\xce\x99|\xe1\xbe\xa1|"
+"\xe1\xbe\xaa|\xe1\xbd\xa2\xce\xb9|\xe1\xbd\xaa\xce\x99|\xe1\xbe\xa2|"
+"\xe1\xbe\xab|\xe1\xbd\xa3\xce\xb9|\xe1\xbd\xab\xce\x99|\xe1\xbe\xa3|"
+"\xe1\xbe\xac|\xe1\xbd\xa4\xce\xb9|\xe1\xbd\xac\xce\x99|\xe1\xbe\xa4|"
+"\xe1\xbe\xad|\xe1\xbd\xa5\xce\xb9|\xe1\xbd\xad\xce\x99|\xe1\xbe\xa5|"
+"\xe1\xbe\xae|\xe1\xbd\xa6\xce\xb9|\xe1\xbd\xae\xce\x99|\xe1\xbe\xa6|"
+"\xe1\xbe\xaf|\xe1\xbd\xa7\xce\xb9|\xe1\xbd\xaf\xce\x99|\xe1\xbe\xa7|"
+"\xe1\xbe\xb2|\xe1\xbd\xb0\xce\xb9|\xe1\xbe\xba\xce\x99||"
+"\xe1\xbe\xb3|\xce\xb1\xce\xb9|\xce\x91\xce\x99||"
+"\xe1\xbe\xb4|\xce\xac\xce\xb9|\xce\x86\xce\x99||"
+"\xe1\xbe\xb6|\xce\xb1\xcd\x82|\xce\x91\xcd\x82||"
+"\xe1\xbe\xb7|\xce\xb1\xcd\x82\xce\xb9|\xce\x91\xcd\x82\xce\x99||"
+"\xe1\xbe\xbc|\xce\xb1\xce\xb9|\xce\x91\xce\x99|\xe1\xbe\xb3|"
+"\xe1\xbe\xbe|\xce\xb9|\xce\x99||"
+"\xe1\xbf\x82|\xe1\xbd\xb4\xce\xb9|\xe1\xbf\x8a\xce\x99||"
+"\xe1\xbf\x83|\xce\xb7\xce\xb9|\xce\x97\xce\x99||"
+"\xe1\xbf\x84|\xce\xae\xce\xb9|\xce\x89\xce\x99||"
+"\xe1\xbf\x86|\xce\xb7\xcd\x82|\xce\x97\xcd\x82||"
+"\xe1\xbf\x87|\xce\xb7\xcd\x82\xce\xb9|\xce\x97\xcd\x82\xce\x99||"
+"\xe1\xbf\x8c|\xce\xb7\xce\xb9|\xce\x97\xce\x99|\xe1\xbf\x83|"
+"\xe1\xbf\x92|\xce\xb9\xcc\x88\xcc\x80|\xce\x99\xcc\x88\xcc\x80||"
+"\xe1\xbf\x93|\xce\xb9\xcc\x88\xcc\x81|\xce\x99\xcc\x88\xcc\x81||"
+"\xe1\xbf\x96|\xce\xb9\xcd\x82|\xce\x99\xcd\x82||"
+"\xe1\xbf\x97|\xce\xb9\xcc\x88\xcd\x82|\xce\x99\xcc\x88\xcd\x82||"
+"\xe1\xbf\xa2|\xcf\x85\xcc\x88\xcc\x80|\xce\xa5\xcc\x88\xcc\x80||"
+"\xe1\xbf\xa3|\xcf\x85\xcc\x88\xcc\x81|\xce\xa5\xcc\x88\xcc\x81||"
+"\xe1\xbf\xa4|\xcf\x81\xcc\x93|\xce\xa1\xcc\x93||"
+"\xe1\xbf\xa6|\xcf\x85\xcd\x82|\xce\xa5\xcd\x82||"
+"\xe1\xbf\xa7|\xcf\x85\xcc\x88\xcd\x82|\xce\xa5\xcc\x88\xcd\x82||"
+"\xe1\xbf\xb2|\xe1\xbd\xbc\xce\xb9|\xe1\xbf\xba\xce\x99||"
+"\xe1\xbf\xb3|\xcf\x89\xce\xb9|\xce\xa9\xce\x99||"
+"\xe1\xbf\xb4|\xcf\x8e\xce\xb9|\xce\x8f\xce\x99||"
+"\xe1\xbf\xb6|\xcf\x89\xcd\x82|\xce\xa9\xcd\x82||"
+"\xe1\xbf\xb7|\xcf\x89\xcd\x82\xce\xb9|\xce\xa9\xcd\x82\xce\x99||"
+"\xe1\xbf\xbc|\xcf\x89\xce\xb9|\xce\xa9\xce\x99|\xe1\xbf\xb3|"
+"\xe2\x84\xa6|\xcf\x89||\xcf\x89|"
+"\xe2\x84\xaa|k||k|"
+"\xe2\x84\xab|\xc3\xa5||\xc3\xa5|"
+"\xea\xad\xb0|\xe1\x8e\xa0|\xe1\x8e\xa0||"
+"\xea\xad\xb1|\xe1\x8e\xa1|\xe1\x8e\xa1||"
+"\xea\xad\xb2|\xe1\x8e\xa2|\xe1\x8e\xa2||"
+"\xea\xad\xb3|\xe1\x8e\xa3|\xe1\x8e\xa3||"
+"\xea\xad\xb4|\xe1\x8e\xa4|\xe1\x8e\xa4||"
+"\xea\xad\xb5|\xe1\x8e\xa5|\xe1\x8e\xa5||"
+"\xea\xad\xb6|\xe1\x8e\xa6|\xe1\x8e\xa6||"
+"\xea\xad\xb7|\xe1\x8e\xa7|\xe1\x8e\xa7||"
+"\xea\xad\xb8|\xe1\x8e\xa8|\xe1\x8e\xa8||"
+"\xea\xad\xb9|\xe1\x8e\xa9|\xe1\x8e\xa9||"
+"\xea\xad\xba|\xe1\x8e\xaa|\xe1\x8e\xaa||"
+"\xea\xad\xbb|\xe1\x8e\xab|\xe1\x8e\xab||"
+"\xea\xad\xbc|\xe1\x8e\xac|\xe1\x8e\xac||"
+"\xea\xad\xbd|\xe1\x8e\xad|\xe1\x8e\xad||"
+"\xea\xad\xbe|\xe1\x8e\xae|\xe1\x8e\xae||"
+"\xea\xad\xbf|\xe1\x8e\xaf|\xe1\x8e\xaf||"
+"\xea\xae\x80|\xe1\x8e\xb0|\xe1\x8e\xb0||"
+"\xea\xae\x81|\xe1\x8e\xb1|\xe1\x8e\xb1||"
+"\xea\xae\x82|\xe1\x8e\xb2|\xe1\x8e\xb2||"
+"\xea\xae\x83|\xe1\x8e\xb3|\xe1\x8e\xb3||"
+"\xea\xae\x84|\xe1\x8e\xb4|\xe1\x8e\xb4||"
+"\xea\xae\x85|\xe1\x8e\xb5|\xe1\x8e\xb5||"
+"\xea\xae\x86|\xe1\x8e\xb6|\xe1\x8e\xb6||"
+"\xea\xae\x87|\xe1\x8e\xb7|\xe1\x8e\xb7||"
+"\xea\xae\x88|\xe1\x8e\xb8|\xe1\x8e\xb8||"
+"\xea\xae\x89|\xe1\x8e\xb9|\xe1\x8e\xb9||"
+"\xea\xae\x8a|\xe1\x8e\xba|\xe1\x8e\xba||"
+"\xea\xae\x8b|\xe1\x8e\xbb|\xe1\x8e\xbb||"
+"\xea\xae\x8c|\xe1\x8e\xbc|\xe1\x8e\xbc||"
+"\xea\xae\x8d|\xe1\x8e\xbd|\xe1\x8e\xbd||"
+"\xea\xae\x8e|\xe1\x8e\xbe|\xe1\x8e\xbe||"
+"\xea\xae\x8f|\xe1\x8e\xbf|\xe1\x8e\xbf||"
+"\xea\xae\x90|\xe1\x8f\x80|\xe1\x8f\x80||"
+"\xea\xae\x91|\xe1\x8f\x81|\xe1\x8f\x81||"
+"\xea\xae\x92|\xe1\x8f\x82|\xe1\x8f\x82||"
+"\xea\xae\x93|\xe1\x8f\x83|\xe1\x8f\x83||"
+"\xea\xae\x94|\xe1\x8f\x84|\xe1\x8f\x84||"
+"\xea\xae\x95|\xe1\x8f\x85|\xe1\x8f\x85||"
+"\xea\xae\x96|\xe1\x8f\x86|\xe1\x8f\x86||"
+"\xea\xae\x97|\xe1\x8f\x87|\xe1\x8f\x87||"
+"\xea\xae\x98|\xe1\x8f\x88|\xe1\x8f\x88||"
+"\xea\xae\x99|\xe1\x8f\x89|\xe1\x8f\x89||"
+"\xea\xae\x9a|\xe1\x8f\x8a|\xe1\x8f\x8a||"
+"\xea\xae\x9b|\xe1\x8f\x8b|\xe1\x8f\x8b||"
+"\xea\xae\x9c|\xe1\x8f\x8c|\xe1\x8f\x8c||"
+"\xea\xae\x9d|\xe1\x8f\x8d|\xe1\x8f\x8d||"
+"\xea\xae\x9e|\xe1\x8f\x8e|\xe1\x8f\x8e||"
+"\xea\xae\x9f|\xe1\x8f\x8f|\xe1\x8f\x8f||"
+"\xea\xae\xa0|\xe1\x8f\x90|\xe1\x8f\x90||"
+"\xea\xae\xa1|\xe1\x8f\x91|\xe1\x8f\x91||"
+"\xea\xae\xa2|\xe1\x8f\x92|\xe1\x8f\x92||"
+"\xea\xae\xa3|\xe1\x8f\x93|\xe1\x8f\x93||"
+"\xea\xae\xa4|\xe1\x8f\x94|\xe1\x8f\x94||"
+"\xea\xae\xa5|\xe1\x8f\x95|\xe1\x8f\x95||"
+"\xea\xae\xa6|\xe1\x8f\x96|\xe1\x8f\x96||"
+"\xea\xae\xa7|\xe1\x8f\x97|\xe1\x8f\x97||"
+"\xea\xae\xa8|\xe1\x8f\x98|\xe1\x8f\x98||"
+"\xea\xae\xa9|\xe1\x8f\x99|\xe1\x8f\x99||"
+"\xea\xae\xaa|\xe1\x8f\x9a|\xe1\x8f\x9a||"
+"\xea\xae\xab|\xe1\x8f\x9b|\xe1\x8f\x9b||"
+"\xea\xae\xac|\xe1\x8f\x9c|\xe1\x8f\x9c||"
+"\xea\xae\xad|\xe1\x8f\x9d|\xe1\x8f\x9d||"
+"\xea\xae\xae|\xe1\x8f\x9e|\xe1\x8f\x9e||"
+"\xea\xae\xaf|\xe1\x8f\x9f|\xe1\x8f\x9f||"
+"\xea\xae\xb0|\xe1\x8f\xa0|\xe1\x8f\xa0||"
+"\xea\xae\xb1|\xe1\x8f\xa1|\xe1\x8f\xa1||"
+"\xea\xae\xb2|\xe1\x8f\xa2|\xe1\x8f\xa2||"
+"\xea\xae\xb3|\xe1\x8f\xa3|\xe1\x8f\xa3||"
+"\xea\xae\xb4|\xe1\x8f\xa4|\xe1\x8f\xa4||"
+"\xea\xae\xb5|\xe1\x8f\xa5|\xe1\x8f\xa5||"
+"\xea\xae\xb6|\xe1\x8f\xa6|\xe1\x8f\xa6||"
+"\xea\xae\xb7|\xe1\x8f\xa7|\xe1\x8f\xa7||"
+"\xea\xae\xb8|\xe1\x8f\xa8|\xe1\x8f\xa8||"
+"\xea\xae\xb9|\xe1\x8f\xa9|\xe1\x8f\xa9||"
+"\xea\xae\xba|\xe1\x8f\xaa|\xe1\x8f\xaa||"
+"\xea\xae\xbb|\xe1\x8f\xab|\xe1\x8f\xab||"
+"\xea\xae\xbc|\xe1\x8f\xac|\xe1\x8f\xac||"
+"\xea\xae\xbd|\xe1\x8f\xad|\xe1\x8f\xad||"
+"\xea\xae\xbe|\xe1\x8f\xae|\xe1\x8f\xae||"
+"\xea\xae\xbf|\xe1\x8f\xaf|\xe1\x8f\xaf||"
+"\xef\xac\x80|ff|FF||"
+"\xef\xac\x81|fi|FI||"
+"\xef\xac\x82|fl|FL||"
+"\xef\xac\x83|ffi|FFI||"
+"\xef\xac\x84|ffl|FFL||"
+"\xef\xac\x85|st|ST||"
+"\xef\xac\x86|st|ST||"
+"\xef\xac\x93|\xd5\xb4\xd5\xb6|\xd5\x84\xd5\x86||"
+"\xef\xac\x94|\xd5\xb4\xd5\xa5|\xd5\x84\xd4\xb5||"
+"\xef\xac\x95|\xd5\xb4\xd5\xab|\xd5\x84\xd4\xbb||"
+"\xef\xac\x96|\xd5\xbe\xd5\xb6|\xd5\x8e\xd5\x86||"
+"\xef\xac\x97|\xd5\xb4\xd5\xad|\xd5\x84\xd4\xbd||"
+
+//--Autogenerated -- end of section automatically generated
+;
+
+class CaseConverter : public ICaseConverter {
+	// Maximum length of a case conversion result is 6 bytes in UTF-8
+	enum { maxConversionLength=6 };
+	struct ConversionString {
+		char conversion[maxConversionLength+1];
+		ConversionString() noexcept : conversion{} {
+		}
+	};
+	// Conversions are initially store in a vector of structs but then decomposed into
+	// parallel arrays as that is about 10% faster to search.
+	struct CharacterConversion {
+		int character;
+		ConversionString conversion;
+		CharacterConversion() noexcept : character(0) {
+			// Empty case: NUL -> "".
+		}
+		CharacterConversion(int character_, std::string_view conversion_) noexcept : character(character_) {
+			assert(conversion_.length() <= maxConversionLength);
+			try {
+				// This can never fail as std::string_view::copy should only throw
+				// std::out_of_range if pos > size() and pos == 0 here
+				conversion_.copy(conversion.conversion, conversion_.length());
+			} catch (...) {
+				// Ignore any exception
+			}
+		}
+		bool operator<(const CharacterConversion &other) const noexcept {
+			return character < other.character;
+		}
+	};
+	typedef std::vector<CharacterConversion> CharacterToConversion;
+	CharacterToConversion characterToConversion;
+	// The parallel arrays
+	std::vector<int> characters;
+	std::vector<ConversionString> conversions;
+
+public:
+	CaseConverter() noexcept {
+	}
+	virtual ~CaseConverter() = default;
+	bool Initialised() const noexcept {
+		return !characters.empty();
+	}
+	void Add(int character, const char *conversion) {
+		characterToConversion.emplace_back(character, conversion);
+	}
+	const char *Find(int character) {
+		const std::vector<int>::iterator it = std::lower_bound(characters.begin(), characters.end(), character);
+		if (it == characters.end())
+			return nullptr;
+		else if (*it == character)
+			return conversions[it - characters.begin()].conversion;
+		else
+			return nullptr;
+	}
+	size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) override {
+		size_t lenConverted = 0;
+		size_t mixedPos = 0;
+		unsigned char bytes[UTF8MaxBytes + 1]{};
+		while (mixedPos < lenMixed) {
+			const unsigned char leadByte = mixed[mixedPos];
+			const char *caseConverted = nullptr;
+			size_t lenMixedChar = 1;
+			if (UTF8IsAscii(leadByte)) {
+				caseConverted = Find(leadByte);
+			} else {
+				bytes[0] = leadByte;
+				const int widthCharBytes = UTF8BytesOfLead[leadByte];
+				for (int b=1; b<widthCharBytes; b++) {
+					bytes[b] = (mixedPos+b < lenMixed) ? mixed[mixedPos+b] : 0;
+				}
+				const int classified = UTF8Classify(bytes, widthCharBytes);
+				if (!(classified & UTF8MaskInvalid)) {
+					// valid UTF-8
+					lenMixedChar = classified & UTF8MaskWidth;
+					const int character = UnicodeFromUTF8(bytes);
+					caseConverted = Find(character);
+				}
+			}
+			if (caseConverted) {
+				// Character has a conversion so copy that conversion in
+				while (*caseConverted) {
+					converted[lenConverted++] = *caseConverted++;
+					if (lenConverted >= sizeConverted)
+						return 0;
+				}
+			} else {
+				// Character has no conversion so copy the input to output
+				for (size_t i=0; i<lenMixedChar; i++) {
+					converted[lenConverted++] = mixed[mixedPos+i];
+					if (lenConverted >= sizeConverted)
+						return 0;
+				}
+			}
+			mixedPos += lenMixedChar;
+		}
+		return lenConverted;
+	}
+	void FinishedAdding() {
+		std::sort(characterToConversion.begin(), characterToConversion.end());
+		characters.reserve(characterToConversion.size());
+		conversions.reserve(characterToConversion.size());
+		for (const CharacterConversion &chConv : characterToConversion) {
+			characters.push_back(chConv.character);
+			conversions.push_back(chConv.conversion);
+		}
+		// Empty the original calculated data completely
+		CharacterToConversion().swap(characterToConversion);
+	}
+};
+
+CaseConverter caseConvFold;
+CaseConverter caseConvUp;
+CaseConverter caseConvLow;
+
+void AddSymmetric(CaseConversion conversion, int lower,int upper) {
+	char lowerUTF8[UTF8MaxBytes+1];
+	UTF8FromUTF32Character(lower, lowerUTF8);
+	char upperUTF8[UTF8MaxBytes+1];
+	UTF8FromUTF32Character(upper, upperUTF8);
+
+	switch (conversion) {
+	case CaseConversion::fold:
+		caseConvFold.Add(upper, lowerUTF8);
+		break;
+	case CaseConversion::upper:
+		caseConvUp.Add(lower, upperUTF8);
+		break;
+	case CaseConversion::lower:
+		caseConvLow.Add(upper, lowerUTF8);
+		break;
+	}
+}
+
+void SetupConversions(CaseConversion conversion) {
+	// First initialize for the symmetric ranges
+	for (size_t i=0; i<std::size(symmetricCaseConversionRanges);) {
+		const int lower = symmetricCaseConversionRanges[i++];
+		const int upper = symmetricCaseConversionRanges[i++];
+		const int length = symmetricCaseConversionRanges[i++];
+		const int pitch = symmetricCaseConversionRanges[i++];
+		for (int j=0; j<length*pitch; j+=pitch) {
+			AddSymmetric(conversion, lower+j, upper+j);
+		}
+	}
+	// Add the symmetric singletons
+	for (size_t i=0; i<std::size(symmetricCaseConversions);) {
+		const int lower = symmetricCaseConversions[i++];
+		const int upper = symmetricCaseConversions[i++];
+		AddSymmetric(conversion, lower, upper);
+	}
+	// Add the complex cases
+	const char *sComplex = complexCaseConversions;
+	while (*sComplex) {
+		// Longest ligature is 3 character so 5 for safety
+		constexpr size_t lenUTF8 = 5*UTF8MaxBytes+1;
+		unsigned char originUTF8[lenUTF8]{};
+		char foldedUTF8[lenUTF8]{};
+		char lowerUTF8[lenUTF8]{};
+		char upperUTF8[lenUTF8]{};
+		size_t i = 0;
+		while (*sComplex && *sComplex != '|') {
+			originUTF8[i++] = *sComplex;
+			sComplex++;
+		}
+		sComplex++;
+		originUTF8[i] = 0;
+		i = 0;
+		while (*sComplex && *sComplex != '|') {
+			foldedUTF8[i++] = *sComplex;
+			sComplex++;
+		}
+		sComplex++;
+		foldedUTF8[i] = 0;
+		i = 0;
+		while (*sComplex && *sComplex != '|') {
+			upperUTF8[i++] = *sComplex;
+			sComplex++;
+		}
+		sComplex++;
+		upperUTF8[i] = 0;
+		i = 0;
+		while (*sComplex && *sComplex != '|') {
+			lowerUTF8[i++] = *sComplex;
+			sComplex++;
+		}
+		sComplex++;
+		lowerUTF8[i] = 0;
+
+		const int character = UnicodeFromUTF8(originUTF8);
+
+		if (conversion == CaseConversion::fold && foldedUTF8[0]) {
+			caseConvFold.Add(character, foldedUTF8);
+		}
+
+		if (conversion == CaseConversion::upper && upperUTF8[0]) {
+			caseConvUp.Add(character, upperUTF8);
+		}
+
+		if (conversion == CaseConversion::lower && lowerUTF8[0]) {
+			caseConvLow.Add(character, lowerUTF8);
+		}
+	}
+
+	switch (conversion) {
+	case CaseConversion::fold:
+		caseConvFold.FinishedAdding();
+		break;
+	case CaseConversion::upper:
+		caseConvUp.FinishedAdding();
+		break;
+	case CaseConversion::lower:
+		caseConvLow.FinishedAdding();
+		break;
+	}
+}
+
+CaseConverter *ConverterForConversion(CaseConversion conversion) noexcept {
+	switch (conversion) {
+	case CaseConversion::fold:
+		return &caseConvFold;
+	case CaseConversion::upper:
+		return &caseConvUp;
+	case CaseConversion::lower:
+		return &caseConvLow;
+	}
+	return nullptr;
+}
+
+}
+
+namespace Scintilla::Internal {
+
+ICaseConverter *ConverterFor(CaseConversion conversion) {
+	CaseConverter *pCaseConv = ConverterForConversion(conversion);
+	if (!pCaseConv->Initialised())
+		SetupConversions(conversion);
+	return pCaseConv;
+}
+
+const char *CaseConvert(int character, CaseConversion conversion) {
+	CaseConverter *pCaseConv = ConverterForConversion(conversion);
+	if (!pCaseConv->Initialised())
+		SetupConversions(conversion);
+	return pCaseConv->Find(character);
+}
+
+size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, CaseConversion conversion) {
+	CaseConverter *pCaseConv = ConverterForConversion(conversion);
+	if (!pCaseConv->Initialised())
+		SetupConversions(conversion);
+	return pCaseConv->CaseConvertString(converted, sizeConverted, mixed, lenMixed);
+}
+
+std::string CaseConvertString(const std::string &s, CaseConversion conversion) {
+	std::string retMapped(s.length() * maxExpansionCaseConversion, 0);
+	const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(),
+		conversion);
+	retMapped.resize(lenMapped);
+	return retMapped;
+}
+
+}
diff --git a/scite-app/scintilla/src/CaseConvert.h b/scite-app/scintilla/src/CaseConvert.h
new file mode 100644
index 0000000..ca45f17
--- /dev/null
+++ b/scite-app/scintilla/src/CaseConvert.h
@@ -0,0 +1,46 @@
+// Scintilla source code edit control
+// Encoding: UTF-8
+/** @file CaseConvert.h
+ ** Performs Unicode case conversions.
+ ** Does not handle locale-sensitive case conversion.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CASECONVERT_H
+#define CASECONVERT_H
+
+namespace Scintilla::Internal {
+
+enum class CaseConversion {
+	fold,
+	upper,
+	lower
+};
+
+class ICaseConverter {
+public:
+	virtual size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) = 0;
+};
+
+ICaseConverter *ConverterFor(CaseConversion conversion);
+
+// Returns a UTF-8 string. Empty when no conversion
+const char *CaseConvert(int character, CaseConversion conversion);
+
+// When performing CaseConvertString, the converted value may be up to 3 times longer than the input.
+// Ligatures are often decomposed into multiple characters and long cases include:
+// ΐ "\xce\x90" folds to ΐ "\xce\xb9\xcc\x88\xcc\x81"
+constexpr size_t maxExpansionCaseConversion = 3;
+
+// Converts a mixed case string using a particular conversion.
+// Result may be a different length to input and the length is the return value.
+// If there is not enough space then 0 is returned.
+size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed, CaseConversion conversion);
+
+// Converts a mixed case string using a particular conversion.
+std::string CaseConvertString(const std::string &s, CaseConversion conversion);
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CaseFolder.cxx b/scite-app/scintilla/src/CaseFolder.cxx
new file mode 100644
index 0000000..47f3195
--- /dev/null
+++ b/scite-app/scintilla/src/CaseFolder.cxx
@@ -0,0 +1,66 @@
+// Scintilla source code edit control
+/** @file CaseFolder.cxx
+ ** Classes for case folding.
+ **/
+// Copyright 1998-2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdexcept>
+#include <vector>
+#include <algorithm>
+
+#include "CaseFolder.h"
+#include "CaseConvert.h"
+
+using namespace Scintilla::Internal;
+
+CaseFolder::~CaseFolder() {
+}
+
+CaseFolderTable::CaseFolderTable() noexcept : mapping{}  {
+	for (size_t iChar=0; iChar<sizeof(mapping); iChar++) {
+		mapping[iChar] = static_cast<char>(iChar);
+	}
+}
+
+CaseFolderTable::~CaseFolderTable() {
+}
+
+size_t CaseFolderTable::Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
+	if (lenMixed > sizeFolded) {
+		return 0;
+	} else {
+		for (size_t i=0; i<lenMixed; i++) {
+			folded[i] = mapping[static_cast<unsigned char>(mixed[i])];
+		}
+		return lenMixed;
+	}
+}
+
+void CaseFolderTable::SetTranslation(char ch, char chTranslation) noexcept {
+	mapping[static_cast<unsigned char>(ch)] = chTranslation;
+}
+
+void CaseFolderTable::StandardASCII() noexcept {
+	for (size_t iChar=0; iChar<sizeof(mapping); iChar++) {
+		if (iChar >= 'A' && iChar <= 'Z') {
+			mapping[iChar] = static_cast<char>(iChar - 'A' + 'a');
+		} else {
+			mapping[iChar] = static_cast<char>(iChar);
+		}
+	}
+}
+
+CaseFolderUnicode::CaseFolderUnicode() {
+	StandardASCII();
+	converter = ConverterFor(CaseConversion::fold);
+}
+
+size_t CaseFolderUnicode::Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
+	if ((lenMixed == 1) && (sizeFolded > 0)) {
+		folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
+		return 1;
+	} else {
+		return converter->CaseConvertString(folded, sizeFolded, mixed, lenMixed);
+	}
+}
diff --git a/scite-app/scintilla/src/CaseFolder.h b/scite-app/scintilla/src/CaseFolder.h
new file mode 100644
index 0000000..1169f9b
--- /dev/null
+++ b/scite-app/scintilla/src/CaseFolder.h
@@ -0,0 +1,41 @@
+// Scintilla source code edit control
+/** @file CaseFolder.h
+ ** Classes for case folding.
+ **/
+// Copyright 1998-2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CASEFOLDER_H
+#define CASEFOLDER_H
+
+namespace Scintilla::Internal {
+
+class CaseFolder {
+public:
+	virtual ~CaseFolder();
+	virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) = 0;
+};
+
+class CaseFolderTable : public CaseFolder {
+protected:
+	char mapping[256];
+public:
+	CaseFolderTable() noexcept;
+	~CaseFolderTable() override;
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override;
+	void SetTranslation(char ch, char chTranslation) noexcept;
+	void StandardASCII() noexcept;
+};
+
+class ICaseConverter;
+
+class CaseFolderUnicode : public CaseFolderTable {
+	ICaseConverter *converter;
+public:
+	CaseFolderUnicode();
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CellBuffer.cxx b/scite-app/scintilla/src/CellBuffer.cxx
new file mode 100644
index 0000000..d94ffaa
--- /dev/null
+++ b/scite-app/scintilla/src/CellBuffer.cxx
@@ -0,0 +1,1344 @@
+// Scintilla source code edit control
+/** @file CellBuffer.cxx
+ ** Manages a buffer of cells.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "CellBuffer.h"
+#include "UniConversion.h"
+
+namespace Scintilla::Internal {
+
+struct CountWidths {
+	// Measures the number of characters in a string divided into those
+	// from the Base Multilingual Plane and those from other planes.
+	Sci::Position countBasePlane;
+	Sci::Position countOtherPlanes;
+	CountWidths(Sci::Position countBasePlane_=0, Sci::Position countOtherPlanes_=0) noexcept :
+		countBasePlane(countBasePlane_),
+		countOtherPlanes(countOtherPlanes_) {
+	}
+	CountWidths operator-() const noexcept {
+		return CountWidths(-countBasePlane , -countOtherPlanes);
+	}
+	Sci::Position WidthUTF32() const noexcept {
+		// All code points take one code unit in UTF-32.
+		return countBasePlane + countOtherPlanes;
+	}
+	Sci::Position WidthUTF16() const noexcept {
+		// UTF-16 takes 2 code units for other planes
+		return countBasePlane + 2 * countOtherPlanes;
+	}
+	void CountChar(int lenChar) noexcept {
+		if (lenChar == 4) {
+			countOtherPlanes++;
+		} else {
+			countBasePlane++;
+		}
+	}
+};
+
+class ILineVector {
+public:
+	virtual void Init() = 0;
+	virtual void SetPerLine(PerLine *pl) noexcept = 0;
+	virtual void InsertText(Sci::Line line, Sci::Position delta) noexcept = 0;
+	virtual void InsertLine(Sci::Line line, Sci::Position position, bool lineStart) = 0;
+	virtual void InsertLines(Sci::Line line, const Sci::Position *positions, size_t lines, bool lineStart) = 0;
+	virtual void SetLineStart(Sci::Line line, Sci::Position position) noexcept = 0;
+	virtual void RemoveLine(Sci::Line line) = 0;
+	virtual Sci::Line Lines() const noexcept = 0;
+	virtual void AllocateLines(Sci::Line lines) = 0;
+	virtual Sci::Line LineFromPosition(Sci::Position pos) const noexcept = 0;
+	virtual Sci::Position LineStart(Sci::Line line) const noexcept = 0;
+	virtual void InsertCharacters(Sci::Line line, CountWidths delta) noexcept = 0;
+	virtual void SetLineCharactersWidth(Sci::Line line, CountWidths width) noexcept = 0;
+	virtual Scintilla::LineCharacterIndexType LineCharacterIndex() const noexcept = 0;
+	virtual bool AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex, Sci::Line lines) = 0;
+	virtual bool ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex) = 0;
+	virtual Sci::Position IndexLineStart(Sci::Line line, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept = 0;
+	virtual Sci::Line LineFromPositionIndex(Sci::Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept = 0;
+	virtual ~ILineVector() {}
+};
+
+}
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+template <typename POS>
+class LineStartIndex {
+public:
+	int refCount;
+	Partitioning<POS> starts;
+
+	LineStartIndex() : refCount(0), starts(4) {
+		// Minimal initial allocation
+	}
+	// Deleted so LineStartIndex objects can not be copied.
+	LineStartIndex(const LineStartIndex &) = delete;
+	LineStartIndex(LineStartIndex &&) = delete;
+	void operator=(const LineStartIndex &) = delete;
+	void operator=(LineStartIndex &&) = delete;
+	virtual ~LineStartIndex() {
+	}
+	bool Allocate(Sci::Line lines) {
+		refCount++;
+		Sci::Position length = starts.PositionFromPartition(starts.Partitions());
+		for (Sci::Line line = starts.Partitions(); line < lines; line++) {
+			// Produce an ascending sequence that will be filled in with correct widths later
+			length++;
+			starts.InsertPartition(static_cast<POS>(line), static_cast<POS>(length));
+		}
+		return refCount == 1;
+	}
+	bool Release() {
+		if (refCount == 1) {
+			starts.DeleteAll();
+		}
+		refCount--;
+		return refCount == 0;
+	}
+	bool Active() const noexcept {
+		return refCount > 0;
+	}
+	Sci::Position LineWidth(Sci::Line line) const noexcept {
+		return starts.PositionFromPartition(static_cast<POS>(line) + 1) -
+			starts.PositionFromPartition(static_cast<POS>(line));
+	}
+	void SetLineWidth(Sci::Line line, Sci::Position width) noexcept {
+		const Sci::Position widthCurrent = LineWidth(line);
+		starts.InsertText(static_cast<POS>(line), static_cast<POS>(width - widthCurrent));
+	}
+	void AllocateLines(Sci::Line lines) {
+		if (lines > starts.Partitions()) {
+			starts.ReAllocate(lines);
+		}
+	}
+	void InsertLines(Sci::Line line, Sci::Line lines) {
+		// Insert multiple lines with each temporarily 1 character wide.
+		// The line widths will be fixed up by later measuring code.
+		const POS lineAsPos = static_cast<POS>(line);
+		const POS lineStart = starts.PositionFromPartition(lineAsPos - 1) + 1;
+		for (POS l = 0; l < static_cast<POS>(lines); l++) {
+			starts.InsertPartition(lineAsPos + l, lineStart + l);
+		}
+	}
+};
+
+template <typename POS>
+class LineVector : public ILineVector {
+	Partitioning<POS> starts;
+	PerLine *perLine;
+	LineStartIndex<POS> startsUTF16;
+	LineStartIndex<POS> startsUTF32;
+	LineCharacterIndexType activeIndices;
+
+	void SetActiveIndices() noexcept {
+		activeIndices =
+			  (startsUTF32.Active() ? LineCharacterIndexType::Utf32 : LineCharacterIndexType::None)
+			| (startsUTF16.Active() ? LineCharacterIndexType::Utf16 : LineCharacterIndexType::None);
+	}
+
+public:
+	LineVector() : starts(256), perLine(nullptr), activeIndices(LineCharacterIndexType::None) {
+	}
+	// Deleted so LineVector objects can not be copied.
+	LineVector(const LineVector &) = delete;
+	LineVector(LineVector &&) = delete;
+	LineVector &operator=(const LineVector &) = delete;
+	LineVector &operator=(LineVector &&) = delete;
+	~LineVector() override {
+	}
+	void Init() override {
+		starts.DeleteAll();
+		if (perLine) {
+			perLine->Init();
+		}
+		startsUTF32.starts.DeleteAll();
+		startsUTF16.starts.DeleteAll();
+	}
+	void SetPerLine(PerLine *pl) noexcept override {
+		perLine = pl;
+	}
+	void InsertText(Sci::Line line, Sci::Position delta) noexcept override {
+		starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta));
+	}
+	void InsertLine(Sci::Line line, Sci::Position position, bool lineStart) override {
+		const POS lineAsPos = static_cast<POS>(line);
+		starts.InsertPartition(lineAsPos, static_cast<POS>(position));
+		if (activeIndices != LineCharacterIndexType::None) {
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+				startsUTF32.InsertLines(line, 1);
+			}
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+				startsUTF16.InsertLines(line, 1);
+			}
+		}
+		if (perLine) {
+			if ((line > 0) && lineStart)
+				line--;
+			perLine->InsertLine(line);
+		}
+	}
+	void InsertLines(Sci::Line line, const Sci::Position *positions, size_t lines, bool lineStart) override {
+		const POS lineAsPos = static_cast<POS>(line);
+		if constexpr (sizeof(Sci::Position) == sizeof(POS)) {
+			starts.InsertPartitions(lineAsPos, positions, lines);
+		} else {
+			starts.InsertPartitionsWithCast(lineAsPos, positions, lines);
+		}
+		if (activeIndices != LineCharacterIndexType::None) {
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+				startsUTF32.InsertLines(line, lines);
+			}
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+				startsUTF16.InsertLines(line, lines);
+			}
+		}
+		if (perLine) {
+			if ((line > 0) && lineStart)
+				line--;
+			perLine->InsertLines(line, lines);
+		}
+	}
+	void SetLineStart(Sci::Line line, Sci::Position position) noexcept override {
+		starts.SetPartitionStartPosition(static_cast<POS>(line), static_cast<POS>(position));
+	}
+	void RemoveLine(Sci::Line line) override {
+		starts.RemovePartition(static_cast<POS>(line));
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+			startsUTF32.starts.RemovePartition(static_cast<POS>(line));
+		}
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+			startsUTF16.starts.RemovePartition(static_cast<POS>(line));
+		}
+		if (perLine) {
+			perLine->RemoveLine(line);
+		}
+	}
+	Sci::Line Lines() const noexcept override {
+		return static_cast<Sci::Line>(starts.Partitions());
+	}
+	void AllocateLines(Sci::Line lines) override {
+		if (lines > Lines()) {
+			starts.ReAllocate(lines);
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+				startsUTF32.AllocateLines(lines);
+			}
+			if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+				startsUTF16.AllocateLines(lines);
+			}
+		}
+	}
+	Sci::Line LineFromPosition(Sci::Position pos) const noexcept override {
+		return static_cast<Sci::Line>(starts.PartitionFromPosition(static_cast<POS>(pos)));
+	}
+	Sci::Position LineStart(Sci::Line line) const noexcept override {
+		return starts.PositionFromPartition(static_cast<POS>(line));
+	}
+	void InsertCharacters(Sci::Line line, CountWidths delta) noexcept override {
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+			startsUTF32.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF32()));
+		}
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+			startsUTF16.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF16()));
+		}
+	}
+	void SetLineCharactersWidth(Sci::Line line, CountWidths width) noexcept override {
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
+			assert(startsUTF32.starts.Partitions() == starts.Partitions());
+			startsUTF32.SetLineWidth(line, width.WidthUTF32());
+		}
+		if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
+			assert(startsUTF16.starts.Partitions() == starts.Partitions());
+			startsUTF16.SetLineWidth(line, width.WidthUTF16());
+		}
+	}
+
+	LineCharacterIndexType LineCharacterIndex() const noexcept override {
+		return activeIndices;
+	}
+	bool AllocateLineCharacterIndex(LineCharacterIndexType lineCharacterIndex, Sci::Line lines) override {
+		const LineCharacterIndexType activeIndicesStart = activeIndices;
+		if (FlagSet(lineCharacterIndex, LineCharacterIndexType::Utf32)) {
+			startsUTF32.Allocate(lines);
+			assert(startsUTF32.starts.Partitions() == starts.Partitions());
+		}
+		if (FlagSet(lineCharacterIndex, LineCharacterIndexType::Utf16)) {
+			startsUTF16.Allocate(lines);
+			assert(startsUTF16.starts.Partitions() == starts.Partitions());
+		}
+		SetActiveIndices();
+		return activeIndicesStart != activeIndices;
+	}
+	bool ReleaseLineCharacterIndex(LineCharacterIndexType lineCharacterIndex) override {
+		const LineCharacterIndexType activeIndicesStart = activeIndices;
+		if (FlagSet(lineCharacterIndex, LineCharacterIndexType::Utf32)) {
+			startsUTF32.Release();
+		}
+		if (FlagSet(lineCharacterIndex, LineCharacterIndexType::Utf16)) {
+			startsUTF16.Release();
+		}
+		SetActiveIndices();
+		return activeIndicesStart != activeIndices;
+	}
+	Sci::Position IndexLineStart(Sci::Line line, LineCharacterIndexType lineCharacterIndex) const noexcept override {
+		if (lineCharacterIndex == LineCharacterIndexType::Utf32) {
+			return startsUTF32.starts.PositionFromPartition(static_cast<POS>(line));
+		} else {
+			return startsUTF16.starts.PositionFromPartition(static_cast<POS>(line));
+		}
+	}
+	Sci::Line LineFromPositionIndex(Sci::Position pos, LineCharacterIndexType lineCharacterIndex) const noexcept override {
+		if (lineCharacterIndex == LineCharacterIndexType::Utf32) {
+			return static_cast<Sci::Line>(startsUTF32.starts.PartitionFromPosition(static_cast<POS>(pos)));
+		} else {
+			return static_cast<Sci::Line>(startsUTF16.starts.PartitionFromPosition(static_cast<POS>(pos)));
+		}
+	}
+};
+
+Action::Action() noexcept {
+	at = ActionType::start;
+	position = 0;
+	lenData = 0;
+	mayCoalesce = false;
+}
+
+Action::~Action() {
+}
+
+void Action::Create(ActionType at_, Sci::Position position_, const char *data_, Sci::Position lenData_, bool mayCoalesce_) {
+	data = nullptr;
+	position = position_;
+	at = at_;
+	if (lenData_) {
+		data = std::make_unique<char[]>(lenData_);
+		memcpy(&data[0], data_, lenData_);
+	}
+	lenData = lenData_;
+	mayCoalesce = mayCoalesce_;
+}
+
+void Action::Clear() noexcept {
+	data = nullptr;
+	lenData = 0;
+}
+
+// The undo history stores a sequence of user operations that represent the user's view of the
+// commands executed on the text.
+// Each user operation contains a sequence of text insertion and text deletion actions.
+// All the user operations are stored in a list of individual actions with 'start' actions used
+// as delimiters between user operations.
+// Initially there is one start action in the history.
+// As each action is performed, it is recorded in the history. The action may either become
+// part of the current user operation or may start a new user operation. If it is to be part of the
+// current operation, then it overwrites the current last action. If it is to be part of a new
+// operation, it is appended after the current last action.
+// After writing the new action, a new start action is appended at the end of the history.
+// The decision of whether to start a new user operation is based upon two factors. If a
+// compound operation has been explicitly started by calling BeginUndoAction and no matching
+// EndUndoAction (these calls nest) has been called, then the action is coalesced into the current
+// operation. If there is no outstanding BeginUndoAction call then a new operation is started
+// unless it looks as if the new action is caused by the user typing or deleting a stream of text.
+// Sequences that look like typing or deletion are coalesced into a single user operation.
+
+UndoHistory::UndoHistory() {
+
+	actions.resize(3);
+	maxAction = 0;
+	currentAction = 0;
+	undoSequenceDepth = 0;
+	savePoint = 0;
+	tentativePoint = -1;
+
+	actions[currentAction].Create(ActionType::start);
+}
+
+UndoHistory::~UndoHistory() {
+}
+
+void UndoHistory::EnsureUndoRoom() {
+	// Have to test that there is room for 2 more actions in the array
+	// as two actions may be created by the calling function
+	if (static_cast<size_t>(currentAction) >= (actions.size() - 2)) {
+		// Run out of undo nodes so extend the array
+		actions.resize(actions.size() * 2);
+	}
+}
+
+const char *UndoHistory::AppendAction(ActionType at, Sci::Position position, const char *data, Sci::Position lengthData,
+	bool &startSequence, bool mayCoalesce) {
+	EnsureUndoRoom();
+	//Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction);
+	//Platform::DebugPrintf("^ %d action %d %d\n", actions[currentAction - 1].at,
+	//	actions[currentAction - 1].position, actions[currentAction - 1].lenData);
+	if (currentAction < savePoint) {
+		savePoint = -1;
+	}
+	int oldCurrentAction = currentAction;
+	if (currentAction >= 1) {
+		if (0 == undoSequenceDepth) {
+			// Top level actions may not always be coalesced
+			int targetAct = -1;
+			const Action *actPrevious = &(actions[currentAction + targetAct]);
+			// Container actions may forward the coalesce state of Scintilla Actions.
+			while ((actPrevious->at == ActionType::container) && actPrevious->mayCoalesce) {
+				targetAct--;
+				actPrevious = &(actions[currentAction + targetAct]);
+			}
+			// See if current action can be coalesced into previous action
+			// Will work if both are inserts or deletes and position is same
+			if ((currentAction == savePoint) || (currentAction == tentativePoint)) {
+				currentAction++;
+			} else if (!actions[currentAction].mayCoalesce) {
+				// Not allowed to coalesce if this set
+				currentAction++;
+			} else if (!mayCoalesce || !actPrevious->mayCoalesce) {
+				currentAction++;
+			} else if (at == ActionType::container || actions[currentAction].at == ActionType::container) {
+				;	// A coalescible containerAction
+			} else if ((at != actPrevious->at) && (actPrevious->at != ActionType::start)) {
+				currentAction++;
+			} else if ((at == ActionType::insert) &&
+			           (position != (actPrevious->position + actPrevious->lenData))) {
+				// Insertions must be immediately after to coalesce
+				currentAction++;
+			} else if (at == ActionType::remove) {
+				if ((lengthData == 1) || (lengthData == 2)) {
+					if ((position + lengthData) == actPrevious->position) {
+						; // Backspace -> OK
+					} else if (position == actPrevious->position) {
+						; // Delete -> OK
+					} else {
+						// Removals must be at same position to coalesce
+						currentAction++;
+					}
+				} else {
+					// Removals must be of one character to coalesce
+					currentAction++;
+				}
+			} else {
+				// Action coalesced.
+			}
+
+		} else {
+			// Actions not at top level are always coalesced unless this is after return to top level
+			if (!actions[currentAction].mayCoalesce)
+				currentAction++;
+		}
+	} else {
+		currentAction++;
+	}
+	startSequence = oldCurrentAction != currentAction;
+	const int actionWithData = currentAction;
+	actions[currentAction].Create(at, position, data, lengthData, mayCoalesce);
+	currentAction++;
+	actions[currentAction].Create(ActionType::start);
+	maxAction = currentAction;
+	return actions[actionWithData].data.get();
+}
+
+void UndoHistory::BeginUndoAction() {
+	EnsureUndoRoom();
+	if (undoSequenceDepth == 0) {
+		if (actions[currentAction].at != ActionType::start) {
+			currentAction++;
+			actions[currentAction].Create(ActionType::start);
+			maxAction = currentAction;
+		}
+		actions[currentAction].mayCoalesce = false;
+	}
+	undoSequenceDepth++;
+}
+
+void UndoHistory::EndUndoAction() {
+	PLATFORM_ASSERT(undoSequenceDepth > 0);
+	EnsureUndoRoom();
+	undoSequenceDepth--;
+	if (0 == undoSequenceDepth) {
+		if (actions[currentAction].at != ActionType::start) {
+			currentAction++;
+			actions[currentAction].Create(ActionType::start);
+			maxAction = currentAction;
+		}
+		actions[currentAction].mayCoalesce = false;
+	}
+}
+
+void UndoHistory::DropUndoSequence() {
+	undoSequenceDepth = 0;
+}
+
+void UndoHistory::DeleteUndoHistory() {
+	for (int i = 1; i < maxAction; i++)
+		actions[i].Clear();
+	maxAction = 0;
+	currentAction = 0;
+	actions[currentAction].Create(ActionType::start);
+	savePoint = 0;
+	tentativePoint = -1;
+}
+
+void UndoHistory::SetSavePoint() noexcept {
+	savePoint = currentAction;
+}
+
+bool UndoHistory::IsSavePoint() const noexcept {
+	return savePoint == currentAction;
+}
+
+void UndoHistory::TentativeStart() {
+	tentativePoint = currentAction;
+}
+
+void UndoHistory::TentativeCommit() {
+	tentativePoint = -1;
+	// Truncate undo history
+	maxAction = currentAction;
+}
+
+bool UndoHistory::TentativeActive() const noexcept {
+	return tentativePoint >= 0; 
+}
+
+int UndoHistory::TentativeSteps() noexcept {
+	// Drop any trailing startAction
+	if (actions[currentAction].at == ActionType::start && currentAction > 0)
+		currentAction--;
+	if (tentativePoint >= 0)
+		return currentAction - tentativePoint;
+	else
+		return -1;
+}
+
+bool UndoHistory::CanUndo() const noexcept {
+	return (currentAction > 0) && (maxAction > 0);
+}
+
+int UndoHistory::StartUndo() {
+	// Drop any trailing startAction
+	if (actions[currentAction].at == ActionType::start && currentAction > 0)
+		currentAction--;
+
+	// Count the steps in this action
+	int act = currentAction;
+	while (actions[act].at != ActionType::start && act > 0) {
+		act--;
+	}
+	return currentAction - act;
+}
+
+const Action &UndoHistory::GetUndoStep() const {
+	return actions[currentAction];
+}
+
+void UndoHistory::CompletedUndoStep() {
+	currentAction--;
+}
+
+bool UndoHistory::CanRedo() const noexcept {
+	return maxAction > currentAction;
+}
+
+int UndoHistory::StartRedo() {
+	// Drop any leading startAction
+	if (currentAction < maxAction && actions[currentAction].at == ActionType::start)
+		currentAction++;
+
+	// Count the steps in this action
+	int act = currentAction;
+	while (act < maxAction && actions[act].at != ActionType::start) {
+		act++;
+	}
+	return act - currentAction;
+}
+
+const Action &UndoHistory::GetRedoStep() const {
+	return actions[currentAction];
+}
+
+void UndoHistory::CompletedRedoStep() {
+	currentAction++;
+}
+
+CellBuffer::CellBuffer(bool hasStyles_, bool largeDocument_) :
+	hasStyles(hasStyles_), largeDocument(largeDocument_) {
+	readOnly = false;
+	utf8Substance = false;
+	utf8LineEnds = LineEndType::Default;
+	collectingUndo = true;
+	if (largeDocument)
+		plv = std::make_unique<LineVector<Sci::Position>>();
+	else
+		plv = std::make_unique<LineVector<int>>();
+}
+
+CellBuffer::~CellBuffer() {
+}
+
+char CellBuffer::CharAt(Sci::Position position) const noexcept {
+	return substance.ValueAt(position);
+}
+
+unsigned char CellBuffer::UCharAt(Sci::Position position) const noexcept {
+	return substance.ValueAt(position);
+}
+
+void CellBuffer::GetCharRange(char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const {
+	if (lengthRetrieve <= 0)
+		return;
+	if (position < 0)
+		return;
+	if ((position + lengthRetrieve) > substance.Length()) {
+		Platform::DebugPrintf("Bad GetCharRange %.0f for %.0f of %.0f\n",
+				      static_cast<double>(position),
+				      static_cast<double>(lengthRetrieve),
+				      static_cast<double>(substance.Length()));
+		return;
+	}
+	substance.GetRange(buffer, position, lengthRetrieve);
+}
+
+char CellBuffer::StyleAt(Sci::Position position) const noexcept {
+	return hasStyles ? style.ValueAt(position) : 0;
+}
+
+void CellBuffer::GetStyleRange(unsigned char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const {
+	if (lengthRetrieve < 0)
+		return;
+	if (position < 0)
+		return;
+	if (!hasStyles) {
+		std::fill(buffer, buffer + lengthRetrieve, static_cast<unsigned char>(0));
+		return;
+	}
+	if ((position + lengthRetrieve) > style.Length()) {
+		Platform::DebugPrintf("Bad GetStyleRange %.0f for %.0f of %.0f\n",
+				      static_cast<double>(position),
+				      static_cast<double>(lengthRetrieve),
+				      static_cast<double>(style.Length()));
+		return;
+	}
+	style.GetRange(reinterpret_cast<char *>(buffer), position, lengthRetrieve);
+}
+
+const char *CellBuffer::BufferPointer() {
+	return substance.BufferPointer();
+}
+
+const char *CellBuffer::RangePointer(Sci::Position position, Sci::Position rangeLength) noexcept {
+	return substance.RangePointer(position, rangeLength);
+}
+
+Sci::Position CellBuffer::GapPosition() const noexcept {
+	return substance.GapPosition();
+}
+
+SplitView CellBuffer::AllView() const noexcept {
+	const size_t length = substance.Length();
+	size_t length1 = substance.GapPosition();
+	if (length1 == 0) {
+		// Assign segment2 to segment1 / length1 to avoid useless test against 0 length1
+		length1 = length;
+	}
+	return SplitView {
+		substance.ElementPointer(0),
+		length1,
+		substance.ElementPointer(length1) - length1,
+		length
+	};
+}
+
+// The char* returned is to an allocation owned by the undo history
+const char *CellBuffer::InsertString(Sci::Position position, const char *s, Sci::Position insertLength, bool &startSequence) {
+	// InsertString and DeleteChars are the bottleneck though which all changes occur
+	const char *data = s;
+	if (!readOnly) {
+		if (collectingUndo) {
+			// Save into the undo/redo stack, but only the characters - not the formatting
+			// This takes up about half load time
+			data = uh.AppendAction(ActionType::insert, position, s, insertLength, startSequence);
+		}
+
+		BasicInsertString(position, s, insertLength);
+	}
+	return data;
+}
+
+bool CellBuffer::SetStyleAt(Sci::Position position, char styleValue) noexcept {
+	if (!hasStyles) {
+		return false;
+	}
+	const char curVal = style.ValueAt(position);
+	if (curVal != styleValue) {
+		style.SetValueAt(position, styleValue);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool CellBuffer::SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue) noexcept {
+	if (!hasStyles) {
+		return false;
+	}
+	bool changed = false;
+	PLATFORM_ASSERT(lengthStyle == 0 ||
+		(lengthStyle > 0 && lengthStyle + position <= style.Length()));
+	while (lengthStyle--) {
+		const char curVal = style.ValueAt(position);
+		if (curVal != styleValue) {
+			style.SetValueAt(position, styleValue);
+			changed = true;
+		}
+		position++;
+	}
+	return changed;
+}
+
+// The char* returned is to an allocation owned by the undo history
+const char *CellBuffer::DeleteChars(Sci::Position position, Sci::Position deleteLength, bool &startSequence) {
+	// InsertString and DeleteChars are the bottleneck though which all changes occur
+	PLATFORM_ASSERT(deleteLength > 0);
+	const char *data = nullptr;
+	if (!readOnly) {
+		if (collectingUndo) {
+			// Save into the undo/redo stack, but only the characters - not the formatting
+			// The gap would be moved to position anyway for the deletion so this doesn't cost extra
+			data = substance.RangePointer(position, deleteLength);
+			data = uh.AppendAction(ActionType::remove, position, data, deleteLength, startSequence);
+		}
+
+		BasicDeleteChars(position, deleteLength);
+	}
+	return data;
+}
+
+Sci::Position CellBuffer::Length() const noexcept {
+	return substance.Length();
+}
+
+void CellBuffer::Allocate(Sci::Position newSize) {
+	substance.ReAllocate(newSize);
+	if (hasStyles) {
+		style.ReAllocate(newSize);
+	}
+}
+
+void CellBuffer::SetUTF8Substance(bool utf8Substance_) noexcept {
+	utf8Substance = utf8Substance_;
+}
+
+void CellBuffer::SetLineEndTypes(LineEndType utf8LineEnds_) {
+	if (utf8LineEnds != utf8LineEnds_) {
+		const LineCharacterIndexType indexes = plv->LineCharacterIndex();
+		utf8LineEnds = utf8LineEnds_;
+		ResetLineEnds();
+		AllocateLineCharacterIndex(indexes);
+	}
+}
+
+bool CellBuffer::ContainsLineEnd(const char *s, Sci::Position length) const noexcept {
+	unsigned char chBeforePrev = 0;
+	unsigned char chPrev = 0;
+	for (Sci::Position i = 0; i < length; i++) {
+		const unsigned char ch = s[i];
+		if ((ch == '\r') || (ch == '\n')) {
+			return true;
+		} else if (utf8LineEnds == LineEndType::Unicode) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
+				return true;
+			}
+		}
+		chBeforePrev = chPrev;
+		chPrev = ch;
+	}
+	return false;
+}
+
+void CellBuffer::SetPerLine(PerLine *pl) noexcept {
+	plv->SetPerLine(pl);
+}
+
+LineCharacterIndexType CellBuffer::LineCharacterIndex() const noexcept {
+	return plv->LineCharacterIndex();
+}
+
+void CellBuffer::AllocateLineCharacterIndex(LineCharacterIndexType lineCharacterIndex) {
+	if (utf8Substance) {
+		if (plv->AllocateLineCharacterIndex(lineCharacterIndex, Lines())) {
+			// Changed so recalculate whole file
+			RecalculateIndexLineStarts(0, Lines() - 1);
+		}
+	}
+}
+
+void CellBuffer::ReleaseLineCharacterIndex(LineCharacterIndexType lineCharacterIndex) {
+	plv->ReleaseLineCharacterIndex(lineCharacterIndex);
+}
+
+Sci::Line CellBuffer::Lines() const noexcept {
+	return plv->Lines();
+}
+
+void CellBuffer::AllocateLines(Sci::Line lines) {
+	plv->AllocateLines(lines);
+}
+
+Sci::Position CellBuffer::LineStart(Sci::Line line) const noexcept {
+	if (line < 0)
+		return 0;
+	else if (line >= Lines())
+		return Length();
+	else
+		return plv->LineStart(line);
+}
+
+Sci::Line CellBuffer::LineFromPosition(Sci::Position pos) const noexcept {
+	return plv->LineFromPosition(pos);
+}
+
+Sci::Position CellBuffer::IndexLineStart(Sci::Line line, LineCharacterIndexType lineCharacterIndex) const noexcept {
+	return plv->IndexLineStart(line, lineCharacterIndex);
+}
+
+Sci::Line CellBuffer::LineFromPositionIndex(Sci::Position pos, LineCharacterIndexType lineCharacterIndex) const noexcept {
+	return plv->LineFromPositionIndex(pos, lineCharacterIndex);
+}
+
+bool CellBuffer::IsReadOnly() const noexcept {
+	return readOnly;
+}
+
+void CellBuffer::SetReadOnly(bool set) noexcept {
+	readOnly = set;
+}
+
+bool CellBuffer::IsLarge() const noexcept {
+	return largeDocument;
+}
+
+bool CellBuffer::HasStyles() const noexcept {
+	return hasStyles;
+}
+
+void CellBuffer::SetSavePoint() {
+	uh.SetSavePoint();
+}
+
+bool CellBuffer::IsSavePoint() const noexcept {
+	return uh.IsSavePoint();
+}
+
+void CellBuffer::TentativeStart() {
+	uh.TentativeStart();
+}
+
+void CellBuffer::TentativeCommit() {
+	uh.TentativeCommit();
+}
+
+int CellBuffer::TentativeSteps() noexcept {
+	return uh.TentativeSteps();
+}
+
+bool CellBuffer::TentativeActive() const noexcept {
+	return uh.TentativeActive();
+}
+
+// Without undo
+
+void CellBuffer::InsertLine(Sci::Line line, Sci::Position position, bool lineStart) {
+	plv->InsertLine(line, position, lineStart);
+}
+
+void CellBuffer::RemoveLine(Sci::Line line) {
+	plv->RemoveLine(line);
+}
+
+bool CellBuffer::UTF8LineEndOverlaps(Sci::Position position) const noexcept {
+	const unsigned char bytes[] = {
+		static_cast<unsigned char>(substance.ValueAt(position-2)),
+		static_cast<unsigned char>(substance.ValueAt(position-1)),
+		static_cast<unsigned char>(substance.ValueAt(position)),
+		static_cast<unsigned char>(substance.ValueAt(position+1)),
+	};
+	return UTF8IsSeparator(bytes) || UTF8IsSeparator(bytes+1) || UTF8IsNEL(bytes+1);
+}
+
+bool CellBuffer::UTF8IsCharacterBoundary(Sci::Position position) const {
+	assert(position >= 0 && position <= Length());
+	if (position > 0) {
+		std::string back;
+		for (int i = 0; i < UTF8MaxBytes; i++) {
+			const Sci::Position posBack = position - i;
+			if (posBack < 0) {
+				return false;
+			}
+			back.insert(0, 1, substance.ValueAt(posBack));
+			if (!UTF8IsTrailByte(back.front())) {
+				if (i > 0) {
+					// Have reached a non-trail
+					const int cla = UTF8Classify(back);
+					if ((cla & UTF8MaskInvalid) || (cla != i)) {
+						return false;
+					}
+				}
+				break;
+			}
+		}
+	}
+	if (position < Length()) {
+		const unsigned char fore = substance.ValueAt(position);
+		if (UTF8IsTrailByte(fore)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void CellBuffer::ResetLineEnds() {
+	// Reinitialize line data -- too much work to preserve
+	const Sci::Line lines = plv->Lines();
+	plv->Init();
+	plv->AllocateLines(lines);
+
+	constexpr Sci::Position position = 0;
+	const Sci::Position length = Length();
+	plv->InsertText(0, length);
+	Sci::Line lineInsert = 1;
+	constexpr bool atLineStart = true;
+	unsigned char chBeforePrev = 0;
+	unsigned char chPrev = 0;
+	for (Sci::Position i = 0; i < length; i++) {
+		const unsigned char ch = substance.ValueAt(position + i);
+		if (ch == '\r') {
+			InsertLine(lineInsert, (position + i) + 1, atLineStart);
+			lineInsert++;
+		} else if (ch == '\n') {
+			if (chPrev == '\r') {
+				// Patch up what was end of line
+				plv->SetLineStart(lineInsert - 1, (position + i) + 1);
+			} else {
+				InsertLine(lineInsert, (position + i) + 1, atLineStart);
+				lineInsert++;
+			}
+		} else if (utf8LineEnds == LineEndType::Unicode) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
+				InsertLine(lineInsert, (position + i) + 1, atLineStart);
+				lineInsert++;
+			}
+		}
+		chBeforePrev = chPrev;
+		chPrev = ch;
+	}
+}
+
+namespace {
+
+CountWidths CountCharacterWidthsUTF8(std::string_view sv) noexcept {
+	CountWidths cw;
+	size_t remaining = sv.length();
+	while (remaining > 0) {
+		const int utf8Status = UTF8Classify(sv);
+		const int lenChar = utf8Status & UTF8MaskWidth;
+		cw.CountChar(lenChar);
+		sv.remove_prefix(lenChar);
+		remaining -= lenChar;
+	}
+	return cw;
+}
+
+}
+
+bool CellBuffer::MaintainingLineCharacterIndex() const noexcept {
+	return plv->LineCharacterIndex() != LineCharacterIndexType::None;
+}
+
+void CellBuffer::RecalculateIndexLineStarts(Sci::Line lineFirst, Sci::Line lineLast) {
+	std::string text;
+	Sci::Position posLineEnd = LineStart(lineFirst);
+	for (Sci::Line line = lineFirst; line <= lineLast; line++) {
+		// Find line start and end, retrieve text of line, count characters and update line width
+		const Sci::Position posLineStart = posLineEnd;
+		posLineEnd = LineStart(line+1);
+		const Sci::Position width = posLineEnd - posLineStart;
+		text.resize(width);
+		GetCharRange(text.data(), posLineStart, width);
+		const CountWidths cw = CountCharacterWidthsUTF8(text);
+		plv->SetLineCharactersWidth(line, cw);
+	}
+}
+
+void CellBuffer::BasicInsertString(Sci::Position position, const char *s, Sci::Position insertLength) {
+	if (insertLength == 0)
+		return;
+	PLATFORM_ASSERT(insertLength > 0);
+
+	const unsigned char chAfter = substance.ValueAt(position);
+	bool breakingUTF8LineEnd = false;
+	if (utf8LineEnds == LineEndType::Unicode && UTF8IsTrailByte(chAfter)) {
+		breakingUTF8LineEnd = UTF8LineEndOverlaps(position);
+	}
+
+	const Sci::Line linePosition = plv->LineFromPosition(position);
+	Sci::Line lineInsert = linePosition + 1;
+
+	// A simple insertion is one that inserts valid text on a single line at a character boundary
+	bool simpleInsertion = false;
+
+	const bool maintainingIndex = MaintainingLineCharacterIndex();
+
+	// Check for breaking apart a UTF-8 sequence and inserting invalid UTF-8
+	if (utf8Substance && maintainingIndex) {
+		// Actually, don't need to check that whole insertion is valid just that there
+		// are no potential fragments at ends.
+		simpleInsertion = UTF8IsCharacterBoundary(position) &&
+			UTF8IsValid(std::string_view(s, insertLength));
+	}
+
+	substance.InsertFromArray(position, s, 0, insertLength);
+	if (hasStyles) {
+		style.InsertValue(position, insertLength, 0);
+	}
+
+	const bool atLineStart = plv->LineStart(lineInsert-1) == position;
+	// Point all the lines after the insertion point further along in the buffer
+	plv->InsertText(lineInsert-1, insertLength);
+	unsigned char chBeforePrev = substance.ValueAt(position - 2);
+	unsigned char chPrev = substance.ValueAt(position - 1);
+	if (chPrev == '\r' && chAfter == '\n') {
+		// Splitting up a crlf pair at position
+		InsertLine(lineInsert, position, false);
+		lineInsert++;
+	}
+	if (breakingUTF8LineEnd) {
+		RemoveLine(lineInsert);
+	}
+
+	constexpr size_t PositionBlockSize = 128;
+	Sci::Position positions[PositionBlockSize]{};
+	size_t nPositions = 0;
+	const Sci::Line lineStart = lineInsert;
+
+	// s may not NULL-terminated, ensure *ptr == '\n' or *next == '\n' is valid.
+	const char * const end = s + insertLength - 1;
+	const char *ptr = s;
+	unsigned char ch = 0;
+
+	if (chPrev == '\r' && *ptr == '\n') {
+		++ptr;
+		// Patch up what was end of line
+		plv->SetLineStart(lineInsert - 1, (position + ptr - s));
+		simpleInsertion = false;
+	}
+
+	if (ptr < end) {
+		uint8_t eolTable[256]{};
+		eolTable[static_cast<uint8_t>('\n')] = 1;
+		eolTable[static_cast<uint8_t>('\r')] = 2;
+		if (utf8LineEnds == LineEndType::Unicode) {
+			// see UniConversion.h for LS, PS and NEL
+			eolTable[0x85] = 4;
+			eolTable[0xa8] = 3;
+			eolTable[0xa9] = 3;
+		}
+
+		do {
+			// skip to line end
+			ch = *ptr++;
+			uint8_t type;
+			while ((type = eolTable[ch]) == 0 && ptr < end) {
+				chBeforePrev = chPrev;
+				chPrev = ch;
+				ch = *ptr++;
+			}
+			switch (type) {
+			case 2: // '\r'
+				if (*ptr == '\n') {
+					++ptr;
+				}
+				[[fallthrough]];
+			case 1: // '\n'
+				positions[nPositions++] = position + ptr - s;
+				if (nPositions == PositionBlockSize) {
+					plv->InsertLines(lineInsert, positions, nPositions, atLineStart);
+					lineInsert += nPositions;
+					nPositions = 0;
+				}
+				break;
+			case 3:
+			case 4:
+				// LS, PS and NEL
+				if ((type == 3 && chPrev == 0x80 && chBeforePrev == 0xe2) || (type == 4 && chPrev == 0xc2)) {
+					positions[nPositions++] = position + ptr - s;
+					if (nPositions == PositionBlockSize) {
+						plv->InsertLines(lineInsert, positions, nPositions, atLineStart);
+						lineInsert += nPositions;
+						nPositions = 0;
+					}
+				}
+				break;
+			}
+
+			chBeforePrev = chPrev;
+			chPrev = ch;
+		} while (ptr < end);
+	}
+
+	if (nPositions != 0) {
+		plv->InsertLines(lineInsert, positions, nPositions, atLineStart);
+		lineInsert += nPositions;
+	}
+
+	ch = *end;
+	if (ptr == end) {
+		++ptr;
+		if (ch == '\r' || ch == '\n') {
+			InsertLine(lineInsert, (position + ptr - s), atLineStart);
+			lineInsert++;
+		} else if (utf8LineEnds == LineEndType::Unicode && !UTF8IsAscii(ch)) {
+			if (UTF8IsMultibyteLineEnd(chBeforePrev, chPrev, ch)) {
+				InsertLine(lineInsert, (position + ptr - s), atLineStart);
+				lineInsert++;
+			}
+		}
+	}
+
+	// Joining two lines where last insertion is cr and following substance starts with lf
+	if (chAfter == '\n') {
+		if (ch == '\r') {
+			// End of line already in buffer so drop the newly created one
+			RemoveLine(lineInsert - 1);
+			simpleInsertion = false;
+		}
+	} else if (utf8LineEnds == LineEndType::Unicode && !UTF8IsAscii(chAfter)) {
+		chBeforePrev = chPrev;
+		chPrev = ch;
+		// May have end of UTF-8 line end in buffer and start in insertion
+		for (int j = 0; j < UTF8SeparatorLength-1; j++) {
+			const unsigned char chAt = substance.ValueAt(position + insertLength + j);
+			const unsigned char back3[3] = {chBeforePrev, chPrev, chAt};
+			if (UTF8IsSeparator(back3)) {
+				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
+				lineInsert++;
+			}
+			if ((j == 0) && UTF8IsNEL(back3+1)) {
+				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
+				lineInsert++;
+			}
+			chBeforePrev = chPrev;
+			chPrev = chAt;
+		}
+	}
+	if (maintainingIndex) {
+		if (simpleInsertion && (lineInsert == lineStart)) {
+			const CountWidths cw = CountCharacterWidthsUTF8(std::string_view(s, insertLength));
+			plv->InsertCharacters(linePosition, cw);
+		} else {
+			RecalculateIndexLineStarts(linePosition, lineInsert - 1);
+		}
+	}
+}
+
+void CellBuffer::BasicDeleteChars(Sci::Position position, Sci::Position deleteLength) {
+	if (deleteLength == 0)
+		return;
+
+	Sci::Line lineRecalculateStart = Sci::invalidPosition;
+
+	if ((position == 0) && (deleteLength == substance.Length())) {
+		// If whole buffer is being deleted, faster to reinitialise lines data
+		// than to delete each line.
+		plv->Init();
+	} else {
+		// Have to fix up line positions before doing deletion as looking at text in buffer
+		// to work out which lines have been removed
+
+		const Sci::Line linePosition = plv->LineFromPosition(position);
+		Sci::Line lineRemove = linePosition + 1;
+
+		plv->InsertText(lineRemove-1, - (deleteLength));
+		const unsigned char chPrev = substance.ValueAt(position - 1);
+		const unsigned char chBefore = chPrev;
+		unsigned char chNext = substance.ValueAt(position);
+
+		// Check for breaking apart a UTF-8 sequence
+		// Needs further checks that text is UTF-8 or that some other break apart is occurring
+		if (utf8Substance && MaintainingLineCharacterIndex()) {
+			const Sci::Position posEnd = position + deleteLength;
+			const Sci::Line lineEndRemove = plv->LineFromPosition(posEnd);
+			const bool simpleDeletion =
+				(linePosition == lineEndRemove) &&
+				UTF8IsCharacterBoundary(position) && UTF8IsCharacterBoundary(posEnd);
+			if (simpleDeletion) {
+				std::string text(deleteLength, '\0');
+				GetCharRange(text.data(), position, deleteLength);
+				if (UTF8IsValid(text)) {
+					// Everything is good
+					const CountWidths cw = CountCharacterWidthsUTF8(text);
+					plv->InsertCharacters(linePosition, -cw);
+				} else {
+					lineRecalculateStart = linePosition;
+				}
+			} else {
+				lineRecalculateStart = linePosition;
+			}
+		}
+
+		bool ignoreNL = false;
+		if (chPrev == '\r' && chNext == '\n') {
+			// Move back one
+			plv->SetLineStart(lineRemove, position);
+			lineRemove++;
+			ignoreNL = true; 	// First \n is not real deletion
+		}
+		if (utf8LineEnds == LineEndType::Unicode && UTF8IsTrailByte(chNext)) {
+			if (UTF8LineEndOverlaps(position)) {
+				RemoveLine(lineRemove);
+			}
+		}
+
+		unsigned char ch = chNext;
+		for (Sci::Position i = 0; i < deleteLength; i++) {
+			chNext = substance.ValueAt(position + i + 1);
+			if (ch == '\r') {
+				if (chNext != '\n') {
+					RemoveLine(lineRemove);
+				}
+			} else if (ch == '\n') {
+				if (ignoreNL) {
+					ignoreNL = false; 	// Further \n are real deletions
+				} else {
+					RemoveLine(lineRemove);
+				}
+			} else if (utf8LineEnds == LineEndType::Unicode) {
+				if (!UTF8IsAscii(ch)) {
+					const unsigned char next3[3] = {ch, chNext,
+						static_cast<unsigned char>(substance.ValueAt(position + i + 2))};
+					if (UTF8IsSeparator(next3) || UTF8IsNEL(next3)) {
+						RemoveLine(lineRemove);
+					}
+				}
+			}
+
+			ch = chNext;
+		}
+		// May have to fix up end if last deletion causes cr to be next to lf
+		// or removes one of a crlf pair
+		const char chAfter = substance.ValueAt(position + deleteLength);
+		if (chBefore == '\r' && chAfter == '\n') {
+			// Using lineRemove-1 as cr ended line before start of deletion
+			RemoveLine(lineRemove - 1);
+			plv->SetLineStart(lineRemove - 1, position + 1);
+		}
+	}
+	substance.DeleteRange(position, deleteLength);
+	if (lineRecalculateStart >= 0) {
+		RecalculateIndexLineStarts(lineRecalculateStart, lineRecalculateStart);
+	}
+	if (hasStyles) {
+		style.DeleteRange(position, deleteLength);
+	}
+}
+
+bool CellBuffer::SetUndoCollection(bool collectUndo) {
+	collectingUndo = collectUndo;
+	uh.DropUndoSequence();
+	return collectingUndo;
+}
+
+bool CellBuffer::IsCollectingUndo() const noexcept {
+	return collectingUndo;
+}
+
+void CellBuffer::BeginUndoAction() {
+	uh.BeginUndoAction();
+}
+
+void CellBuffer::EndUndoAction() {
+	uh.EndUndoAction();
+}
+
+void CellBuffer::AddUndoAction(Sci::Position token, bool mayCoalesce) {
+	bool startSequence;
+	uh.AppendAction(ActionType::container, token, nullptr, 0, startSequence, mayCoalesce);
+}
+
+void CellBuffer::DeleteUndoHistory() {
+	uh.DeleteUndoHistory();
+}
+
+bool CellBuffer::CanUndo() const noexcept {
+	return uh.CanUndo();
+}
+
+int CellBuffer::StartUndo() {
+	return uh.StartUndo();
+}
+
+const Action &CellBuffer::GetUndoStep() const {
+	return uh.GetUndoStep();
+}
+
+void CellBuffer::PerformUndoStep() {
+	const Action &actionStep = uh.GetUndoStep();
+	if (actionStep.at == ActionType::insert) {
+		if (substance.Length() < actionStep.lenData) {
+			throw std::runtime_error(
+				"CellBuffer::PerformUndoStep: deletion must be less than document length.");
+		}
+		BasicDeleteChars(actionStep.position, actionStep.lenData);
+	} else if (actionStep.at == ActionType::remove) {
+		BasicInsertString(actionStep.position, actionStep.data.get(), actionStep.lenData);
+	}
+	uh.CompletedUndoStep();
+}
+
+bool CellBuffer::CanRedo() const noexcept {
+	return uh.CanRedo();
+}
+
+int CellBuffer::StartRedo() {
+	return uh.StartRedo();
+}
+
+const Action &CellBuffer::GetRedoStep() const {
+	return uh.GetRedoStep();
+}
+
+void CellBuffer::PerformRedoStep() {
+	const Action &actionStep = uh.GetRedoStep();
+	if (actionStep.at == ActionType::insert) {
+		BasicInsertString(actionStep.position, actionStep.data.get(), actionStep.lenData);
+	} else if (actionStep.at == ActionType::remove) {
+		BasicDeleteChars(actionStep.position, actionStep.lenData);
+	}
+	uh.CompletedRedoStep();
+}
+
diff --git a/scite-app/scintilla/src/CellBuffer.h b/scite-app/scintilla/src/CellBuffer.h
new file mode 100644
index 0000000..d8914d7
--- /dev/null
+++ b/scite-app/scintilla/src/CellBuffer.h
@@ -0,0 +1,244 @@
+// Scintilla source code edit control
+/** @file CellBuffer.h
+ ** Manages the text of the document.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CELLBUFFER_H
+#define CELLBUFFER_H
+
+namespace Scintilla::Internal {
+
+// Interface to per-line data that wants to see each line insertion and deletion
+class PerLine {
+public:
+	virtual ~PerLine() {}
+	virtual void Init()=0;
+	virtual void InsertLine(Sci::Line line)=0;
+	virtual void InsertLines(Sci::Line line, Sci::Line lines) = 0;
+	virtual void RemoveLine(Sci::Line line)=0;
+};
+
+/**
+ * The line vector contains information about each of the lines in a cell buffer.
+ */
+class ILineVector;
+
+enum class ActionType { insert, remove, start, container };
+
+/**
+ * Actions are used to store all the information required to perform one undo/redo step.
+ */
+class Action {
+public:
+	ActionType at;
+	Sci::Position position;
+	std::unique_ptr<char[]> data;
+	Sci::Position lenData;
+	bool mayCoalesce;
+
+	Action() noexcept;
+	// Deleted so Action objects can not be copied.
+	Action(const Action &other) = delete;
+	Action &operator=(const Action &other) = delete;
+	Action &operator=(const Action &&other) = delete;
+	// Move constructor allows vector to be resized without reallocating.
+	Action(Action &&other) noexcept = default;
+	~Action();
+	void Create(ActionType at_, Sci::Position position_=0, const char *data_=nullptr, Sci::Position lenData_=0, bool mayCoalesce_=true);
+	void Clear() noexcept;
+};
+
+/**
+ *
+ */
+class UndoHistory {
+	std::vector<Action> actions;
+	int maxAction;
+	int currentAction;
+	int undoSequenceDepth;
+	int savePoint;
+	int tentativePoint;
+
+	void EnsureUndoRoom();
+
+public:
+	UndoHistory();
+	// Deleted so UndoHistory objects can not be copied.
+	UndoHistory(const UndoHistory &) = delete;
+	UndoHistory(UndoHistory &&) = delete;
+	void operator=(const UndoHistory &) = delete;
+	void operator=(UndoHistory &&) = delete;
+	~UndoHistory();
+
+	const char *AppendAction(ActionType at, Sci::Position position, const char *data, Sci::Position lengthData, bool &startSequence, bool mayCoalesce=true);
+
+	void BeginUndoAction();
+	void EndUndoAction();
+	void DropUndoSequence();
+	void DeleteUndoHistory();
+
+	/// The save point is a marker in the undo stack where the container has stated that
+	/// the buffer was saved. Undo and redo can move over the save point.
+	void SetSavePoint() noexcept;
+	bool IsSavePoint() const noexcept;
+
+	// Tentative actions are used for input composition so that it can be undone cleanly
+	void TentativeStart();
+	void TentativeCommit();
+	bool TentativeActive() const noexcept;
+	int TentativeSteps() noexcept;
+
+	/// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is
+	/// called that many times. Similarly for redo.
+	bool CanUndo() const noexcept;
+	int StartUndo();
+	const Action &GetUndoStep() const;
+	void CompletedUndoStep();
+	bool CanRedo() const noexcept;
+	int StartRedo();
+	const Action &GetRedoStep() const;
+	void CompletedRedoStep();
+};
+
+struct SplitView {
+	const char *segment1 = nullptr;
+	size_t length1 = 0;
+	const char *segment2 = nullptr;
+	size_t length = 0;
+
+	bool operator==(const SplitView &other) const noexcept {
+		return segment1 == other.segment1 && length1 == other.length1 &&
+			segment2 == other.segment2 && length == other.length;
+	}
+	bool operator!=(const SplitView &other) const noexcept {
+		return !(*this == other);
+	}
+
+	char CharAt(size_t position) const noexcept {
+		if (position < length1) {
+			return segment1[position];
+		}
+		if (position < length) {
+			return segment2[position];
+		}
+		return 0;
+	}
+};
+
+
+/**
+ * Holder for an expandable array of characters that supports undo and line markers.
+ * Based on article "Data Structures in a Bit-Mapped Text Editor"
+ * by Wilfred J. Hansen, Byte January 1987, page 183.
+ */
+class CellBuffer {
+private:
+	bool hasStyles;
+	bool largeDocument;
+	SplitVector<char> substance;
+	SplitVector<char> style;
+	bool readOnly;
+	bool utf8Substance;
+	Scintilla::LineEndType utf8LineEnds;
+
+	bool collectingUndo;
+	UndoHistory uh;
+
+	std::unique_ptr<ILineVector> plv;
+
+	bool UTF8LineEndOverlaps(Sci::Position position) const noexcept;
+	bool UTF8IsCharacterBoundary(Sci::Position position) const;
+	void ResetLineEnds();
+	void RecalculateIndexLineStarts(Sci::Line lineFirst, Sci::Line lineLast);
+	bool MaintainingLineCharacterIndex() const noexcept;
+	/// Actions without undo
+	void BasicInsertString(Sci::Position position, const char *s, Sci::Position insertLength);
+	void BasicDeleteChars(Sci::Position position, Sci::Position deleteLength);
+
+public:
+
+	CellBuffer(bool hasStyles_, bool largeDocument_);
+	// Deleted so CellBuffer objects can not be copied.
+	CellBuffer(const CellBuffer &) = delete;
+	CellBuffer(CellBuffer &&) = delete;
+	void operator=(const CellBuffer &) = delete;
+	void operator=(CellBuffer &&) = delete;
+	~CellBuffer();
+
+	/// Retrieving positions outside the range of the buffer works and returns 0
+	char CharAt(Sci::Position position) const noexcept;
+	unsigned char UCharAt(Sci::Position position) const noexcept;
+	void GetCharRange(char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const;
+	char StyleAt(Sci::Position position) const noexcept;
+	void GetStyleRange(unsigned char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const;
+	const char *BufferPointer();
+	const char *RangePointer(Sci::Position position, Sci::Position rangeLength) noexcept;
+	Sci::Position GapPosition() const noexcept;
+	SplitView AllView() const noexcept;
+
+	Sci::Position Length() const noexcept;
+	void Allocate(Sci::Position newSize);
+	void SetUTF8Substance(bool utf8Substance_) noexcept;
+	Scintilla::LineEndType GetLineEndTypes() const noexcept { return utf8LineEnds; }
+	void SetLineEndTypes(Scintilla::LineEndType utf8LineEnds_);
+	bool ContainsLineEnd(const char *s, Sci::Position length) const noexcept;
+	void SetPerLine(PerLine *pl) noexcept;
+	Scintilla::LineCharacterIndexType LineCharacterIndex() const noexcept;
+	void AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	void ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	Sci::Line Lines() const noexcept;
+	void AllocateLines(Sci::Line lines);
+	Sci::Position LineStart(Sci::Line line) const noexcept;
+	Sci::Position IndexLineStart(Sci::Line line, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
+	Sci::Line LineFromPosition(Sci::Position pos) const noexcept;
+	Sci::Line LineFromPositionIndex(Sci::Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
+	void InsertLine(Sci::Line line, Sci::Position position, bool lineStart);
+	void RemoveLine(Sci::Line line);
+	const char *InsertString(Sci::Position position, const char *s, Sci::Position insertLength, bool &startSequence);
+
+	/// Setting styles for positions outside the range of the buffer is safe and has no effect.
+	/// @return true if the style of a character is changed.
+	bool SetStyleAt(Sci::Position position, char styleValue) noexcept;
+	bool SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue) noexcept;
+
+	const char *DeleteChars(Sci::Position position, Sci::Position deleteLength, bool &startSequence);
+
+	bool IsReadOnly() const noexcept;
+	void SetReadOnly(bool set) noexcept;
+	bool IsLarge() const noexcept;
+	bool HasStyles() const noexcept;
+
+	/// The save point is a marker in the undo stack where the container has stated that
+	/// the buffer was saved. Undo and redo can move over the save point.
+	void SetSavePoint();
+	bool IsSavePoint() const noexcept;
+
+	void TentativeStart();
+	void TentativeCommit();
+	bool TentativeActive() const noexcept;
+	int TentativeSteps() noexcept;
+
+	bool SetUndoCollection(bool collectUndo);
+	bool IsCollectingUndo() const noexcept;
+	void BeginUndoAction();
+	void EndUndoAction();
+	void AddUndoAction(Sci::Position token, bool mayCoalesce);
+	void DeleteUndoHistory();
+
+	/// To perform an undo, StartUndo is called to retrieve the number of steps, then UndoStep is
+	/// called that many times. Similarly for redo.
+	bool CanUndo() const noexcept;
+	int StartUndo();
+	const Action &GetUndoStep() const;
+	void PerformUndoStep();
+	bool CanRedo() const noexcept;
+	int StartRedo();
+	const Action &GetRedoStep() const;
+	void PerformRedoStep();
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CharClassify.cxx b/scite-app/scintilla/src/CharClassify.cxx
new file mode 100644
index 0000000..caff785
--- /dev/null
+++ b/scite-app/scintilla/src/CharClassify.cxx
@@ -0,0 +1,60 @@
+// Scintilla source code edit control
+/** @file CharClassify.cxx
+ ** Character classifications used by Document and RESearch.
+ **/
+// Copyright 2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include <stdexcept>
+
+#include "CharacterType.h"
+#include "CharClassify.h"
+
+using namespace Scintilla::Internal;
+
+CharClassify::CharClassify() : charClass{} {
+	SetDefaultCharClasses(true);
+}
+
+void CharClassify::SetDefaultCharClasses(bool includeWordClass) {
+	// Initialize all char classes to default values
+	for (int ch = 0; ch < maxChar; ch++) {
+		if (ch == '\r' || ch == '\n')
+			charClass[ch] = CharacterClass::newLine;
+		else if (ch < 0x20 || ch == ' ')
+			charClass[ch] = CharacterClass::space;
+		else if (includeWordClass && (ch >= 0x80 || IsAlphaNumeric(ch) || ch == '_'))
+			charClass[ch] = CharacterClass::word;
+		else
+			charClass[ch] = CharacterClass::punctuation;
+	}
+}
+
+void CharClassify::SetCharClasses(const unsigned char *chars, CharacterClass newCharClass) {
+	// Apply the newCharClass to the specified chars
+	if (chars) {
+		while (*chars) {
+			charClass[*chars] = newCharClass;
+			chars++;
+		}
+	}
+}
+
+int CharClassify::GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const noexcept {
+	// Get characters belonging to the given char class; return the number
+	// of characters (if the buffer is NULL, don't write to it).
+	int count = 0;
+	for (int ch = maxChar - 1; ch >= 0; --ch) {
+		if (charClass[ch] == characterClass) {
+			++count;
+			if (buffer) {
+				*buffer = static_cast<unsigned char>(ch);
+				buffer++;
+			}
+		}
+	}
+	return count;
+}
diff --git a/scite-app/scintilla/src/CharClassify.h b/scite-app/scintilla/src/CharClassify.h
new file mode 100644
index 0000000..9fc1be2
--- /dev/null
+++ b/scite-app/scintilla/src/CharClassify.h
@@ -0,0 +1,32 @@
+// Scintilla source code edit control
+/** @file CharClassify.h
+ ** Character classifications used by Document and RESearch.
+ **/
+// Copyright 2006-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHARCLASSIFY_H
+#define CHARCLASSIFY_H
+
+namespace Scintilla::Internal {
+
+enum class CharacterClass : unsigned char { space, newLine, word, punctuation };
+
+class CharClassify {
+public:
+	CharClassify();
+
+	void SetDefaultCharClasses(bool includeWordClass);
+	void SetCharClasses(const unsigned char *chars, CharacterClass newCharClass);
+	int GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const noexcept;
+	CharacterClass GetClass(unsigned char ch) const noexcept { return charClass[ch];}
+	bool IsWord(unsigned char ch) const noexcept { return charClass[ch] == CharacterClass::word;}
+
+private:
+	static constexpr int maxChar=256;
+	CharacterClass charClass[maxChar];
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CharacterCategoryMap.cxx b/scite-app/scintilla/src/CharacterCategoryMap.cxx
new file mode 100644
index 0000000..015b1de
--- /dev/null
+++ b/scite-app/scintilla/src/CharacterCategoryMap.cxx
@@ -0,0 +1,4105 @@
+// Scintilla source code edit control
+/** @file CharacterCategoryMap.cxx
+ ** Returns the Unicode general category of a character.
+ ** Table automatically regenerated by scripts/GenerateCharacterCategory.py
+ ** Should only be rarely regenerated for new versions of Unicode.
+ ** Similar code to Lexilla's lexilla/lexlib/CharacterCategory.cxx but renamed
+ ** to avoid problems with builds that statically include both Scintilla and Lexilla.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <vector>
+#include <algorithm>
+#include <iterator>
+
+#include "CharacterCategoryMap.h"
+
+namespace Scintilla::Internal {
+
+namespace {
+	// Use an unnamed namespace to protect the declarations from name conflicts
+
+const int catRanges[] = {
+//++Autogenerated -- start of section automatically generated
+// Created with Python 3.9.4,  Unicode 13.0.0
+25,
+1046,
+1073,
+1171,
+1201,
+1293,
+1326,
+1361,
+1394,
+1425,
+1452,
+1489,
+1544,
+1873,
+1938,
+2033,
+2080,
+2925,
+2961,
+2990,
+3028,
+3051,
+3092,
+3105,
+3949,
+3986,
+4014,
+4050,
+4089,
+5142,
+5169,
+5203,
+5333,
+5361,
+5396,
+5429,
+5444,
+5487,
+5522,
+5562,
+5589,
+5620,
+5653,
+5682,
+5706,
+5780,
+5793,
+5841,
+5908,
+5930,
+5956,
+6000,
+6026,
+6129,
+6144,
+6898,
+6912,
+7137,
+7922,
+7937,
+8192,
+8225,
+8256,
+8289,
+8320,
+8353,
+8384,
+8417,
+8448,
+8481,
+8512,
+8545,
+8576,
+8609,
+8640,
+8673,
+8704,
+8737,
+8768,
+8801,
+8832,
+8865,
+8896,
+8929,
+8960,
+8993,
+9024,
+9057,
+9088,
+9121,
+9152,
+9185,
+9216,
+9249,
+9280,
+9313,
+9344,
+9377,
+9408,
+9441,
+9472,
+9505,
+9536,
+9569,
+9600,
+9633,
+9664,
+9697,
+9728,
+9761,
+9792,
+9825,
+9856,
+9889,
+9920,
+9953,
+10016,
+10049,
+10080,
+10113,
+10144,
+10177,
+10208,
+10241,
+10272,
+10305,
+10336,
+10369,
+10400,
+10433,
+10464,
+10497,
+10560,
+10593,
+10624,
+10657,
+10688,
+10721,
+10752,
+10785,
+10816,
+10849,
+10880,
+10913,
+10944,
+10977,
+11008,
+11041,
+11072,
+11105,
+11136,
+11169,
+11200,
+11233,
+11264,
+11297,
+11328,
+11361,
+11392,
+11425,
+11456,
+11489,
+11520,
+11553,
+11584,
+11617,
+11648,
+11681,
+11712,
+11745,
+11776,
+11809,
+11840,
+11873,
+11904,
+11937,
+11968,
+12001,
+12032,
+12097,
+12128,
+12161,
+12192,
+12225,
+12320,
+12385,
+12416,
+12449,
+12480,
+12545,
+12576,
+12673,
+12736,
+12865,
+12896,
+12961,
+12992,
+13089,
+13184,
+13249,
+13280,
+13345,
+13376,
+13409,
+13440,
+13473,
+13504,
+13569,
+13600,
+13633,
+13696,
+13729,
+13760,
+13825,
+13856,
+13953,
+13984,
+14017,
+14048,
+14113,
+14180,
+14208,
+14241,
+14340,
+14464,
+14498,
+14529,
+14560,
+14594,
+14625,
+14656,
+14690,
+14721,
+14752,
+14785,
+14816,
+14849,
+14880,
+14913,
+14944,
+14977,
+15008,
+15041,
+15072,
+15105,
+15136,
+15169,
+15200,
+15233,
+15296,
+15329,
+15360,
+15393,
+15424,
+15457,
+15488,
+15521,
+15552,
+15585,
+15616,
+15649,
+15680,
+15713,
+15744,
+15777,
+15808,
+15841,
+15904,
+15938,
+15969,
+16000,
+16033,
+16064,
+16161,
+16192,
+16225,
+16256,
+16289,
+16320,
+16353,
+16384,
+16417,
+16448,
+16481,
+16512,
+16545,
+16576,
+16609,
+16640,
+16673,
+16704,
+16737,
+16768,
+16801,
+16832,
+16865,
+16896,
+16929,
+16960,
+16993,
+17024,
+17057,
+17088,
+17121,
+17152,
+17185,
+17216,
+17249,
+17280,
+17313,
+17344,
+17377,
+17408,
+17441,
+17472,
+17505,
+17536,
+17569,
+17600,
+17633,
+17664,
+17697,
+17728,
+17761,
+17792,
+17825,
+17856,
+17889,
+17920,
+17953,
+17984,
+18017,
+18240,
+18305,
+18336,
+18401,
+18464,
+18497,
+18528,
+18657,
+18688,
+18721,
+18752,
+18785,
+18816,
+18849,
+18880,
+18913,
+21124,
+21153,
+22019,
+22612,
+22723,
+23124,
+23555,
+23732,
+23939,
+23988,
+24003,
+24052,
+24581,
+28160,
+28193,
+28224,
+28257,
+28291,
+28340,
+28352,
+28385,
+28445,
+28483,
+28513,
+28625,
+28640,
+28701,
+28820,
+28864,
+28913,
+28928,
+29053,
+29056,
+29117,
+29120,
+29185,
+29216,
+29789,
+29792,
+30081,
+31200,
+31233,
+31296,
+31393,
+31488,
+31521,
+31552,
+31585,
+31616,
+31649,
+31680,
+31713,
+31744,
+31777,
+31808,
+31841,
+31872,
+31905,
+31936,
+31969,
+32000,
+32033,
+32064,
+32097,
+32128,
+32161,
+32192,
+32225,
+32384,
+32417,
+32466,
+32480,
+32513,
+32544,
+32609,
+32672,
+34305,
+35840,
+35873,
+35904,
+35937,
+35968,
+36001,
+36032,
+36065,
+36096,
+36129,
+36160,
+36193,
+36224,
+36257,
+36288,
+36321,
+36352,
+36385,
+36416,
+36449,
+36480,
+36513,
+36544,
+36577,
+36608,
+36641,
+36672,
+36705,
+36736,
+36769,
+36800,
+36833,
+36864,
+36897,
+36949,
+36965,
+37127,
+37184,
+37217,
+37248,
+37281,
+37312,
+37345,
+37376,
+37409,
+37440,
+37473,
+37504,
+37537,
+37568,
+37601,
+37632,
+37665,
+37696,
+37729,
+37760,
+37793,
+37824,
+37857,
+37888,
+37921,
+37952,
+37985,
+38016,
+38049,
+38080,
+38113,
+38144,
+38177,
+38208,
+38241,
+38272,
+38305,
+38336,
+38369,
+38400,
+38433,
+38464,
+38497,
+38528,
+38561,
+38592,
+38625,
+38656,
+38689,
+38720,
+38753,
+38784,
+38817,
+38848,
+38881,
+38912,
+38977,
+39008,
+39041,
+39072,
+39105,
+39136,
+39169,
+39200,
+39233,
+39264,
+39297,
+39328,
+39361,
+39424,
+39457,
+39488,
+39521,
+39552,
+39585,
+39616,
+39649,
+39680,
+39713,
+39744,
+39777,
+39808,
+39841,
+39872,
+39905,
+39936,
+39969,
+40000,
+40033,
+40064,
+40097,
+40128,
+40161,
+40192,
+40225,
+40256,
+40289,
+40320,
+40353,
+40384,
+40417,
+40448,
+40481,
+40512,
+40545,
+40576,
+40609,
+40640,
+40673,
+40704,
+40737,
+40768,
+40801,
+40832,
+40865,
+40896,
+40929,
+40960,
+40993,
+41024,
+41057,
+41088,
+41121,
+41152,
+41185,
+41216,
+41249,
+41280,
+41313,
+41344,
+41377,
+41408,
+41441,
+41472,
+41505,
+41536,
+41569,
+41600,
+41633,
+41664,
+41697,
+41728,
+41761,
+41792,
+41825,
+41856,
+41889,
+41920,
+41953,
+41984,
+42017,
+42048,
+42081,
+42112,
+42145,
+42176,
+42209,
+42240,
+42273,
+42304,
+42337,
+42368,
+42401,
+42432,
+42465,
+42525,
+42528,
+43773,
+43811,
+43857,
+44033,
+45361,
+45388,
+45437,
+45493,
+45555,
+45597,
+45605,
+47052,
+47077,
+47121,
+47141,
+47217,
+47237,
+47313,
+47333,
+47389,
+47620,
+48509,
+48612,
+48753,
+48829,
+49178,
+49362,
+49457,
+49523,
+49553,
+49621,
+49669,
+50033,
+50074,
+50109,
+50129,
+50180,
+51203,
+51236,
+51557,
+52232,
+52561,
+52676,
+52741,
+52772,
+55953,
+55972,
+56005,
+56250,
+56277,
+56293,
+56483,
+56549,
+56629,
+56645,
+56772,
+56840,
+57156,
+57269,
+57316,
+57361,
+57821,
+57850,
+57860,
+57893,
+57924,
+58885,
+59773,
+59812,
+62661,
+63012,
+63069,
+63496,
+63812,
+64869,
+65155,
+65237,
+65265,
+65347,
+65405,
+65445,
+65491,
+65540,
+66245,
+66371,
+66405,
+66691,
+66725,
+66819,
+66853,
+67037,
+67089,
+67581,
+67588,
+68389,
+68509,
+68561,
+68605,
+68612,
+68989,
+70660,
+71357,
+71364,
+71965,
+72293,
+72794,
+72805,
+73830,
+73860,
+75589,
+75622,
+75653,
+75684,
+75718,
+75813,
+76070,
+76197,
+76230,
+76292,
+76325,
+76548,
+76869,
+76945,
+77000,
+77329,
+77347,
+77380,
+77861,
+77894,
+77981,
+77988,
+78269,
+78308,
+78397,
+78436,
+79165,
+79172,
+79421,
+79428,
+79485,
+79556,
+79709,
+79749,
+79780,
+79814,
+79909,
+80061,
+80102,
+80189,
+80230,
+80293,
+80324,
+80381,
+80614,
+80669,
+80772,
+80861,
+80868,
+80965,
+81053,
+81096,
+81412,
+81491,
+81546,
+81749,
+81779,
+81796,
+81841,
+81861,
+81917,
+81957,
+82022,
+82077,
+82084,
+82301,
+82404,
+82493,
+82532,
+83261,
+83268,
+83517,
+83524,
+83613,
+83620,
+83709,
+83716,
+83805,
+83845,
+83901,
+83910,
+84005,
+84093,
+84197,
+84285,
+84325,
+84445,
+84517,
+84573,
+84772,
+84925,
+84932,
+84989,
+85192,
+85509,
+85572,
+85669,
+85713,
+85757,
+86053,
+86118,
+86173,
+86180,
+86493,
+86500,
+86621,
+86628,
+87357,
+87364,
+87613,
+87620,
+87709,
+87716,
+87901,
+87941,
+87972,
+88006,
+88101,
+88285,
+88293,
+88358,
+88413,
+88422,
+88485,
+88541,
+88580,
+88637,
+89092,
+89157,
+89245,
+89288,
+89617,
+89651,
+89693,
+89892,
+89925,
+90141,
+90149,
+90182,
+90269,
+90276,
+90557,
+90596,
+90685,
+90724,
+91453,
+91460,
+91709,
+91716,
+91805,
+91812,
+91997,
+92037,
+92068,
+92102,
+92133,
+92166,
+92197,
+92349,
+92390,
+92477,
+92518,
+92581,
+92637,
+92837,
+92902,
+92957,
+93060,
+93149,
+93156,
+93253,
+93341,
+93384,
+93717,
+93732,
+93770,
+93981,
+94277,
+94308,
+94365,
+94372,
+94589,
+94660,
+94781,
+94788,
+94941,
+95012,
+95101,
+95108,
+95165,
+95172,
+95261,
+95332,
+95421,
+95492,
+95613,
+95684,
+96093,
+96198,
+96261,
+96294,
+96381,
+96454,
+96573,
+96582,
+96677,
+96733,
+96772,
+96829,
+96998,
+97053,
+97480,
+97802,
+97909,
+98099,
+98133,
+98173,
+98309,
+98342,
+98437,
+98468,
+98749,
+98756,
+98877,
+98884,
+99645,
+99652,
+100189,
+100260,
+100293,
+100390,
+100541,
+100549,
+100669,
+100677,
+100829,
+101029,
+101117,
+101124,
+101245,
+101380,
+101445,
+101533,
+101576,
+101917,
+102129,
+102154,
+102389,
+102404,
+102437,
+102470,
+102545,
+102564,
+102845,
+102852,
+102973,
+102980,
+103741,
+103748,
+104093,
+104100,
+104285,
+104325,
+104356,
+104390,
+104421,
+104454,
+104637,
+104645,
+104678,
+104765,
+104774,
+104837,
+104925,
+105126,
+105213,
+105412,
+105469,
+105476,
+105541,
+105629,
+105672,
+106013,
+106020,
+106109,
+106501,
+106566,
+106628,
+106941,
+106948,
+107069,
+107076,
+108389,
+108452,
+108486,
+108581,
+108733,
+108742,
+108861,
+108870,
+108965,
+108996,
+109045,
+109085,
+109188,
+109286,
+109322,
+109540,
+109637,
+109725,
+109768,
+110090,
+110389,
+110404,
+110621,
+110629,
+110662,
+110749,
+110756,
+111357,
+111428,
+112221,
+112228,
+112541,
+112548,
+112605,
+112644,
+112893,
+112965,
+113021,
+113126,
+113221,
+113341,
+113349,
+113405,
+113414,
+113693,
+113864,
+114205,
+114246,
+114321,
+114365,
+114724,
+116261,
+116292,
+116357,
+116605,
+116723,
+116740,
+116931,
+116965,
+117233,
+117256,
+117585,
+117661,
+118820,
+118909,
+118916,
+118973,
+118980,
+119165,
+119172,
+119965,
+119972,
+120029,
+120036,
+120357,
+120388,
+120453,
+120740,
+120797,
+120836,
+121021,
+121027,
+121085,
+121093,
+121309,
+121352,
+121693,
+121732,
+121885,
+122884,
+122933,
+123025,
+123509,
+123537,
+123573,
+123653,
+123733,
+123912,
+124234,
+124565,
+124581,
+124629,
+124645,
+124693,
+124709,
+124749,
+124782,
+124813,
+124846,
+124870,
+124932,
+125213,
+125220,
+126397,
+126501,
+126950,
+126981,
+127153,
+127173,
+127236,
+127397,
+127773,
+127781,
+128957,
+128981,
+129221,
+129269,
+129469,
+129493,
+129553,
+129717,
+129841,
+129917,
+131076,
+132454,
+132517,
+132646,
+132677,
+132870,
+132901,
+132966,
+133029,
+133092,
+133128,
+133457,
+133636,
+133830,
+133893,
+133956,
+134085,
+134180,
+134214,
+134308,
+134374,
+134596,
+134693,
+134820,
+135237,
+135270,
+135333,
+135398,
+135589,
+135620,
+135654,
+135688,
+136006,
+136101,
+136149,
+136192,
+137437,
+137440,
+137501,
+137632,
+137693,
+137729,
+139121,
+139139,
+139169,
+139268,
+149821,
+149828,
+149981,
+150020,
+150269,
+150276,
+150333,
+150340,
+150493,
+150532,
+151869,
+151876,
+152029,
+152068,
+153149,
+153156,
+153309,
+153348,
+153597,
+153604,
+153661,
+153668,
+153821,
+153860,
+154365,
+154372,
+156221,
+156228,
+156381,
+156420,
+158589,
+158629,
+158737,
+159018,
+159677,
+159748,
+160277,
+160605,
+160768,
+163549,
+163585,
+163805,
+163852,
+163876,
+183733,
+183761,
+183780,
+184342,
+184356,
+185197,
+185230,
+185277,
+185348,
+187761,
+187849,
+187940,
+188221,
+188420,
+188861,
+188868,
+188997,
+189117,
+189444,
+190021,
+190129,
+190205,
+190468,
+191045,
+191133,
+191492,
+191933,
+191940,
+192061,
+192069,
+192157,
+192516,
+194181,
+194246,
+194277,
+194502,
+194757,
+194790,
+194853,
+195217,
+195299,
+195345,
+195443,
+195460,
+195493,
+195549,
+195592,
+195933,
+196106,
+196445,
+196625,
+196812,
+196849,
+196965,
+197082,
+197117,
+197128,
+197469,
+197636,
+198755,
+198788,
+200509,
+200708,
+200869,
+200932,
+202021,
+202052,
+202109,
+202244,
+204509,
+204804,
+205821,
+205829,
+205926,
+206053,
+206118,
+206237,
+206342,
+206405,
+206438,
+206629,
+206749,
+206869,
+206909,
+206993,
+207048,
+207364,
+208349,
+208388,
+208573,
+208900,
+210333,
+210436,
+211293,
+211464,
+211786,
+211837,
+211925,
+212996,
+213733,
+213798,
+213861,
+213917,
+213969,
+214020,
+215718,
+215749,
+215782,
+215813,
+216061,
+216069,
+216102,
+216133,
+216166,
+216229,
+216486,
+216677,
+217021,
+217061,
+217096,
+217437,
+217608,
+217949,
+218129,
+218339,
+218385,
+218589,
+218629,
+219079,
+219109,
+219197,
+221189,
+221318,
+221348,
+222853,
+222886,
+222917,
+223078,
+223109,
+223142,
+223301,
+223334,
+223396,
+223645,
+223752,
+224081,
+224309,
+224613,
+224917,
+225213,
+225285,
+225350,
+225380,
+226342,
+226373,
+226502,
+226565,
+226630,
+226661,
+226756,
+226824,
+227140,
+228549,
+228582,
+228613,
+228678,
+228773,
+228806,
+228837,
+228934,
+229021,
+229265,
+229380,
+230534,
+230789,
+231046,
+231109,
+231197,
+231281,
+231432,
+231773,
+231844,
+231944,
+232260,
+233219,
+233425,
+233473,
+233789,
+233984,
+235389,
+235424,
+235537,
+235805,
+236037,
+236145,
+236165,
+236582,
+236613,
+236836,
+236965,
+236996,
+237189,
+237220,
+237286,
+237317,
+237380,
+237437,
+237569,
+238979,
+240993,
+241411,
+241441,
+242531,
+243717,
+245597,
+245605,
+245760,
+245793,
+245824,
+245857,
+245888,
+245921,
+245952,
+245985,
+246016,
+246049,
+246080,
+246113,
+246144,
+246177,
+246208,
+246241,
+246272,
+246305,
+246336,
+246369,
+246400,
+246433,
+246464,
+246497,
+246528,
+246561,
+246592,
+246625,
+246656,
+246689,
+246720,
+246753,
+246784,
+246817,
+246848,
+246881,
+246912,
+246945,
+246976,
+247009,
+247040,
+247073,
+247104,
+247137,
+247168,
+247201,
+247232,
+247265,
+247296,
+247329,
+247360,
+247393,
+247424,
+247457,
+247488,
+247521,
+247552,
+247585,
+247616,
+247649,
+247680,
+247713,
+247744,
+247777,
+247808,
+247841,
+247872,
+247905,
+247936,
+247969,
+248000,
+248033,
+248064,
+248097,
+248128,
+248161,
+248192,
+248225,
+248256,
+248289,
+248320,
+248353,
+248384,
+248417,
+248448,
+248481,
+248512,
+248545,
+248576,
+248609,
+248640,
+248673,
+248704,
+248737,
+248768,
+248801,
+248832,
+248865,
+248896,
+248929,
+248960,
+248993,
+249024,
+249057,
+249088,
+249121,
+249152,
+249185,
+249216,
+249249,
+249280,
+249313,
+249344,
+249377,
+249408,
+249441,
+249472,
+249505,
+249536,
+249569,
+249600,
+249633,
+249664,
+249697,
+249728,
+249761,
+249792,
+249825,
+249856,
+249889,
+249920,
+249953,
+249984,
+250017,
+250048,
+250081,
+250112,
+250145,
+250176,
+250209,
+250240,
+250273,
+250304,
+250337,
+250368,
+250401,
+250432,
+250465,
+250496,
+250529,
+250816,
+250849,
+250880,
+250913,
+250944,
+250977,
+251008,
+251041,
+251072,
+251105,
+251136,
+251169,
+251200,
+251233,
+251264,
+251297,
+251328,
+251361,
+251392,
+251425,
+251456,
+251489,
+251520,
+251553,
+251584,
+251617,
+251648,
+251681,
+251712,
+251745,
+251776,
+251809,
+251840,
+251873,
+251904,
+251937,
+251968,
+252001,
+252032,
+252065,
+252096,
+252129,
+252160,
+252193,
+252224,
+252257,
+252288,
+252321,
+252352,
+252385,
+252416,
+252449,
+252480,
+252513,
+252544,
+252577,
+252608,
+252641,
+252672,
+252705,
+252736,
+252769,
+252800,
+252833,
+252864,
+252897,
+252928,
+252961,
+252992,
+253025,
+253056,
+253089,
+253120,
+253153,
+253184,
+253217,
+253248,
+253281,
+253312,
+253345,
+253376,
+253409,
+253440,
+253473,
+253504,
+253537,
+253568,
+253601,
+253632,
+253665,
+253696,
+253729,
+253760,
+253793,
+253824,
+253857,
+253888,
+253921,
+254208,
+254465,
+254685,
+254720,
+254941,
+254977,
+255232,
+255489,
+255744,
+256001,
+256221,
+256256,
+256477,
+256513,
+256797,
+256800,
+256861,
+256864,
+256925,
+256928,
+256989,
+256992,
+257025,
+257280,
+257537,
+258013,
+258049,
+258306,
+258561,
+258818,
+259073,
+259330,
+259585,
+259773,
+259777,
+259840,
+259970,
+260020,
+260033,
+260084,
+260161,
+260285,
+260289,
+260352,
+260482,
+260532,
+260609,
+260765,
+260801,
+260864,
+261021,
+261044,
+261121,
+261376,
+261556,
+261661,
+261697,
+261821,
+261825,
+261888,
+262018,
+262068,
+262141,
+262166,
+262522,
+262668,
+262865,
+262927,
+262960,
+262989,
+263023,
+263088,
+263117,
+263151,
+263185,
+263447,
+263480,
+263514,
+263670,
+263697,
+263983,
+264016,
+264049,
+264171,
+264241,
+264338,
+264365,
+264398,
+264433,
+264786,
+264817,
+264843,
+264881,
+265206,
+265242,
+265405,
+265434,
+265738,
+265763,
+265821,
+265866,
+266066,
+266157,
+266190,
+266211,
+266250,
+266578,
+266669,
+266702,
+266749,
+266755,
+267197,
+267283,
+268317,
+268805,
+269223,
+269349,
+269383,
+269477,
+269885,
+270357,
+270400,
+270453,
+270560,
+270613,
+270657,
+270688,
+270785,
+270848,
+270945,
+270997,
+271008,
+271061,
+271122,
+271136,
+271317,
+271488,
+271541,
+271552,
+271605,
+271616,
+271669,
+271680,
+271829,
+271841,
+271872,
+272001,
+272036,
+272161,
+272213,
+272257,
+272320,
+272402,
+272544,
+272577,
+272725,
+272754,
+272789,
+272833,
+272885,
+272906,
+273417,
+274528,
+274561,
+274601,
+274730,
+274773,
+274845,
+274962,
+275125,
+275282,
+275349,
+275474,
+275509,
+275570,
+275605,
+275666,
+275701,
+275922,
+275957,
+276946,
+277013,
+277074,
+277109,
+277138,
+277173,
+278162,
+286741,
+286989,
+287022,
+287053,
+287086,
+287125,
+287762,
+287829,
+288045,
+288078,
+288117,
+290706,
+290741,
+291698,
+292501,
+293778,
+293973,
+296189,
+296981,
+297341,
+297994,
+299925,
+302410,
+303125,
+308978,
+309013,
+309298,
+309333,
+311058,
+311317,
+314866,
+314901,
+322829,
+322862,
+322893,
+322926,
+322957,
+322990,
+323021,
+323054,
+323085,
+323118,
+323149,
+323182,
+323213,
+323246,
+323274,
+324245,
+325650,
+325805,
+325838,
+325874,
+326861,
+326894,
+326925,
+326958,
+326989,
+327022,
+327053,
+327086,
+327117,
+327150,
+327186,
+327701,
+335890,
+340077,
+340110,
+340141,
+340174,
+340205,
+340238,
+340269,
+340302,
+340333,
+340366,
+340397,
+340430,
+340461,
+340494,
+340525,
+340558,
+340589,
+340622,
+340653,
+340686,
+340717,
+340750,
+340786,
+342797,
+342830,
+342861,
+342894,
+342930,
+343949,
+343982,
+344018,
+352277,
+353810,
+354485,
+354546,
+354741,
+355997,
+356053,
+357085,
+357109,
+360448,
+361981,
+361985,
+363517,
+363520,
+363553,
+363584,
+363681,
+363744,
+363777,
+363808,
+363841,
+363872,
+363905,
+363936,
+364065,
+364096,
+364129,
+364192,
+364225,
+364419,
+364480,
+364577,
+364608,
+364641,
+364672,
+364705,
+364736,
+364769,
+364800,
+364833,
+364864,
+364897,
+364928,
+364961,
+364992,
+365025,
+365056,
+365089,
+365120,
+365153,
+365184,
+365217,
+365248,
+365281,
+365312,
+365345,
+365376,
+365409,
+365440,
+365473,
+365504,
+365537,
+365568,
+365601,
+365632,
+365665,
+365696,
+365729,
+365760,
+365793,
+365824,
+365857,
+365888,
+365921,
+365952,
+365985,
+366016,
+366049,
+366080,
+366113,
+366144,
+366177,
+366208,
+366241,
+366272,
+366305,
+366336,
+366369,
+366400,
+366433,
+366464,
+366497,
+366528,
+366561,
+366592,
+366625,
+366656,
+366689,
+366720,
+366753,
+366784,
+366817,
+366848,
+366881,
+366912,
+366945,
+366976,
+367009,
+367040,
+367073,
+367104,
+367137,
+367168,
+367201,
+367232,
+367265,
+367296,
+367329,
+367360,
+367393,
+367424,
+367457,
+367488,
+367521,
+367552,
+367585,
+367616,
+367649,
+367680,
+367713,
+367797,
+367968,
+368001,
+368032,
+368065,
+368101,
+368192,
+368225,
+368285,
+368433,
+368554,
+368593,
+368641,
+369885,
+369889,
+369949,
+370081,
+370141,
+370180,
+371997,
+372195,
+372241,
+372285,
+372709,
+372740,
+373501,
+373764,
+374013,
+374020,
+374269,
+374276,
+374525,
+374532,
+374781,
+374788,
+375037,
+375044,
+375293,
+375300,
+375549,
+375556,
+375805,
+375813,
+376849,
+376911,
+376944,
+376975,
+377008,
+377041,
+377135,
+377168,
+377201,
+377231,
+377264,
+377297,
+377580,
+377617,
+377676,
+377713,
+377743,
+377776,
+377809,
+377871,
+377904,
+377933,
+377966,
+377997,
+378030,
+378061,
+378094,
+378125,
+378158,
+378193,
+378339,
+378385,
+378700,
+378769,
+378892,
+378929,
+378957,
+378993,
+379413,
+379473,
+379517,
+380949,
+381789,
+381813,
+384669,
+385045,
+391901,
+392725,
+393117,
+393238,
+393265,
+393365,
+393379,
+393412,
+393449,
+393485,
+393518,
+393549,
+393582,
+393613,
+393646,
+393677,
+393710,
+393741,
+393774,
+393813,
+393869,
+393902,
+393933,
+393966,
+393997,
+394030,
+394061,
+394094,
+394124,
+394157,
+394190,
+394261,
+394281,
+394565,
+394694,
+394764,
+394787,
+394965,
+395017,
+395107,
+395140,
+395185,
+395221,
+395293,
+395300,
+398077,
+398117,
+398196,
+398243,
+398308,
+398348,
+398372,
+401265,
+401283,
+401380,
+401437,
+401572,
+402973,
+402980,
+406013,
+406037,
+406090,
+406229,
+406532,
+407573,
+408733,
+409092,
+409621,
+410621,
+410634,
+410965,
+411914,
+412181,
+412202,
+412693,
+413706,
+414037,
+415274,
+415765,
+425988,
+636949,
+638980,
+1310653,
+1310724,
+1311395,
+1311428,
+1348029,
+1348117,
+1349885,
+1350148,
+1351427,
+1351633,
+1351684,
+1360259,
+1360305,
+1360388,
+1360904,
+1361220,
+1361309,
+1361920,
+1361953,
+1361984,
+1362017,
+1362048,
+1362081,
+1362112,
+1362145,
+1362176,
+1362209,
+1362240,
+1362273,
+1362304,
+1362337,
+1362368,
+1362401,
+1362432,
+1362465,
+1362496,
+1362529,
+1362560,
+1362593,
+1362624,
+1362657,
+1362688,
+1362721,
+1362752,
+1362785,
+1362816,
+1362849,
+1362880,
+1362913,
+1362944,
+1362977,
+1363008,
+1363041,
+1363072,
+1363105,
+1363136,
+1363169,
+1363200,
+1363233,
+1363264,
+1363297,
+1363328,
+1363361,
+1363396,
+1363429,
+1363463,
+1363569,
+1363589,
+1363921,
+1363939,
+1363968,
+1364001,
+1364032,
+1364065,
+1364096,
+1364129,
+1364160,
+1364193,
+1364224,
+1364257,
+1364288,
+1364321,
+1364352,
+1364385,
+1364416,
+1364449,
+1364480,
+1364513,
+1364544,
+1364577,
+1364608,
+1364641,
+1364672,
+1364705,
+1364736,
+1364769,
+1364800,
+1364833,
+1364867,
+1364933,
+1364996,
+1367241,
+1367557,
+1367633,
+1367837,
+1368084,
+1368803,
+1369108,
+1369152,
+1369185,
+1369216,
+1369249,
+1369280,
+1369313,
+1369344,
+1369377,
+1369408,
+1369441,
+1369472,
+1369505,
+1369536,
+1369569,
+1369664,
+1369697,
+1369728,
+1369761,
+1369792,
+1369825,
+1369856,
+1369889,
+1369920,
+1369953,
+1369984,
+1370017,
+1370048,
+1370081,
+1370112,
+1370145,
+1370176,
+1370209,
+1370240,
+1370273,
+1370304,
+1370337,
+1370368,
+1370401,
+1370432,
+1370465,
+1370496,
+1370529,
+1370560,
+1370593,
+1370624,
+1370657,
+1370688,
+1370721,
+1370752,
+1370785,
+1370816,
+1370849,
+1370880,
+1370913,
+1370944,
+1370977,
+1371008,
+1371041,
+1371072,
+1371105,
+1371136,
+1371169,
+1371200,
+1371233,
+1371264,
+1371297,
+1371328,
+1371361,
+1371392,
+1371425,
+1371456,
+1371489,
+1371520,
+1371553,
+1371584,
+1371617,
+1371651,
+1371681,
+1371936,
+1371969,
+1372000,
+1372033,
+1372064,
+1372129,
+1372160,
+1372193,
+1372224,
+1372257,
+1372288,
+1372321,
+1372352,
+1372385,
+1372419,
+1372468,
+1372512,
+1372545,
+1372576,
+1372609,
+1372644,
+1372672,
+1372705,
+1372736,
+1372769,
+1372864,
+1372897,
+1372928,
+1372961,
+1372992,
+1373025,
+1373056,
+1373089,
+1373120,
+1373153,
+1373184,
+1373217,
+1373248,
+1373281,
+1373312,
+1373345,
+1373376,
+1373409,
+1373440,
+1373473,
+1373504,
+1373665,
+1373696,
+1373857,
+1373888,
+1373921,
+1373952,
+1373985,
+1374016,
+1374049,
+1374080,
+1374113,
+1374144,
+1374177,
+1374237,
+1374272,
+1374305,
+1374336,
+1374465,
+1374496,
+1374529,
+1374589,
+1375904,
+1375937,
+1375972,
+1376003,
+1376065,
+1376100,
+1376325,
+1376356,
+1376453,
+1376484,
+1376613,
+1376644,
+1377382,
+1377445,
+1377510,
+1377557,
+1377669,
+1377725,
+1377802,
+1378005,
+1378067,
+1378101,
+1378141,
+1378308,
+1379985,
+1380125,
+1380358,
+1380420,
+1382022,
+1382533,
+1382621,
+1382865,
+1382920,
+1383261,
+1383429,
+1384004,
+1384209,
+1384292,
+1384337,
+1384356,
+1384421,
+1384456,
+1384772,
+1385669,
+1385937,
+1385988,
+1386725,
+1387078,
+1387165,
+1387505,
+1387524,
+1388477,
+1388549,
+1388646,
+1388676,
+1390181,
+1390214,
+1390277,
+1390406,
+1390469,
+1390534,
+1390641,
+1391069,
+1391075,
+1391112,
+1391453,
+1391569,
+1391620,
+1391781,
+1391811,
+1391844,
+1392136,
+1392452,
+1392637,
+1392644,
+1393957,
+1394150,
+1394213,
+1394278,
+1394341,
+1394429,
+1394692,
+1394789,
+1394820,
+1395077,
+1395110,
+1395165,
+1395208,
+1395549,
+1395601,
+1395716,
+1396227,
+1396260,
+1396469,
+1396548,
+1396582,
+1396613,
+1396646,
+1396676,
+1398277,
+1398308,
+1398341,
+1398436,
+1398501,
+1398564,
+1398725,
+1398788,
+1398821,
+1398852,
+1398909,
+1399652,
+1399715,
+1399761,
+1399812,
+1400166,
+1400197,
+1400262,
+1400337,
+1400388,
+1400419,
+1400486,
+1400517,
+1400573,
+1400868,
+1401085,
+1401124,
+1401341,
+1401380,
+1401597,
+1401860,
+1402109,
+1402116,
+1402365,
+1402369,
+1403764,
+1403779,
+1403905,
+1404195,
+1404244,
+1404317,
+1404417,
+1406980,
+1408102,
+1408165,
+1408198,
+1408261,
+1408294,
+1408369,
+1408390,
+1408421,
+1408477,
+1408520,
+1408861,
+1409028,
+1766557,
+1766916,
+1767677,
+1767780,
+1769373,
+1769499,
+1835036,
+2039812,
+2051549,
+2051588,
+2055005,
+2056193,
+2056445,
+2056801,
+2056989,
+2057124,
+2057157,
+2057188,
+2057522,
+2057540,
+2057981,
+2057988,
+2058173,
+2058180,
+2058237,
+2058244,
+2058333,
+2058340,
+2058429,
+2058436,
+2061908,
+2062429,
+2062948,
+2074574,
+2074605,
+2074653,
+2075140,
+2077213,
+2077252,
+2079005,
+2080260,
+2080659,
+2080693,
+2080733,
+2080773,
+2081297,
+2081517,
+2081550,
+2081585,
+2081629,
+2081797,
+2082321,
+2082348,
+2082411,
+2082477,
+2082510,
+2082541,
+2082574,
+2082605,
+2082638,
+2082669,
+2082702,
+2082733,
+2082766,
+2082797,
+2082830,
+2082861,
+2082894,
+2082925,
+2082958,
+2082993,
+2083053,
+2083086,
+2083121,
+2083243,
+2083345,
+2083453,
+2083473,
+2083596,
+2083629,
+2083662,
+2083693,
+2083726,
+2083757,
+2083790,
+2083825,
+2083922,
+2083948,
+2083986,
+2084093,
+2084113,
+2084147,
+2084177,
+2084253,
+2084356,
+2084541,
+2084548,
+2088893,
+2088954,
+2088989,
+2089009,
+2089107,
+2089137,
+2089229,
+2089262,
+2089297,
+2089330,
+2089361,
+2089388,
+2089425,
+2089480,
+2089809,
+2089874,
+2089969,
+2090016,
+2090861,
+2090897,
+2090926,
+2090964,
+2090987,
+2091028,
+2091041,
+2091885,
+2091922,
+2091950,
+2091986,
+2092013,
+2092046,
+2092081,
+2092109,
+2092142,
+2092177,
+2092228,
+2092547,
+2092580,
+2094019,
+2094084,
+2095101,
+2095172,
+2095389,
+2095428,
+2095645,
+2095684,
+2095901,
+2095940,
+2096061,
+2096147,
+2096210,
+2096244,
+2096277,
+2096307,
+2096381,
+2096405,
+2096434,
+2096565,
+2096637,
+2096954,
+2097045,
+2097117,
+2097156,
+2097565,
+2097572,
+2098429,
+2098436,
+2099069,
+2099076,
+2099165,
+2099172,
+2099677,
+2099716,
+2100189,
+2101252,
+2105213,
+2105361,
+2105469,
+2105578,
+2107037,
+2107125,
+2107401,
+2109098,
+2109237,
+2109770,
+2109845,
+2109949,
+2109973,
+2110397,
+2110485,
+2110525,
+2112021,
+2113445,
+2113501,
+2117636,
+2118589,
+2118660,
+2120253,
+2120709,
+2120746,
+2121629,
+2121732,
+2122762,
+2122909,
+2123172,
+2123817,
+2123844,
+2124105,
+2124157,
+2124292,
+2125509,
+2125693,
+2125828,
+2126813,
+2126833,
+2126852,
+2128029,
+2128132,
+2128401,
+2128425,
+2128605,
+2129920,
+2131201,
+2132484,
+2135005,
+2135048,
+2135389,
+2135552,
+2136733,
+2136833,
+2138013,
+2138116,
+2139421,
+2139652,
+2141341,
+2141681,
+2141725,
+2146308,
+2156285,
+2156548,
+2157277,
+2157572,
+2157853,
+2162692,
+2162909,
+2162948,
+2163005,
+2163012,
+2164445,
+2164452,
+2164541,
+2164612,
+2164669,
+2164708,
+2165469,
+2165489,
+2165514,
+2165764,
+2166517,
+2166570,
+2166788,
+2167805,
+2168042,
+2168349,
+2169860,
+2170493,
+2170500,
+2170589,
+2170730,
+2170884,
+2171594,
+2171805,
+2171889,
+2171908,
+2172765,
+2172913,
+2172957,
+2174980,
+2176797,
+2176906,
+2176964,
+2177034,
+2177565,
+2177610,
+2179076,
+2179109,
+2179229,
+2179237,
+2179325,
+2179461,
+2179588,
+2179741,
+2179748,
+2179869,
+2179876,
+2180829,
+2180869,
+2180989,
+2181093,
+2181130,
+2181437,
+2181649,
+2181949,
+2182148,
+2183082,
+2183153,
+2183172,
+2184106,
+2184221,
+2185220,
+2185493,
+2185508,
+2186405,
+2186493,
+2186602,
+2186769,
+2187005,
+2187268,
+2189021,
+2189105,
+2189316,
+2190045,
+2190090,
+2190340,
+2190973,
+2191114,
+2191364,
+2191965,
+2192177,
+2192317,
+2192682,
+2192925,
+2195460,
+2197821,
+2199552,
+2201213,
+2201601,
+2203261,
+2203466,
+2203652,
+2204805,
+2204957,
+2205192,
+2205533,
+2214922,
+2215933,
+2215940,
+2217309,
+2217317,
+2217388,
+2217437,
+2217476,
+2217565,
+2220036,
+2220970,
+2221284,
+2221341,
+2221572,
+2222277,
+2222634,
+2222769,
+2222941,
+2225668,
+2226346,
+2226589,
+2227204,
+2227965,
+2228230,
+2228261,
+2228294,
+2228324,
+2230021,
+2230513,
+2230749,
+2230858,
+2231496,
+2231837,
+2232293,
+2232390,
+2232420,
+2233862,
+2233957,
+2234086,
+2234149,
+2234225,
+2234298,
+2234321,
+2234461,
+2234810,
+2234845,
+2234884,
+2235709,
+2235912,
+2236253,
+2236421,
+2236516,
+2237669,
+2237830,
+2237861,
+2238141,
+2238152,
+2238481,
+2238596,
+2238630,
+2238692,
+2238749,
+2238980,
+2240101,
+2240145,
+2240196,
+2240253,
+2240517,
+2240582,
+2240612,
+2242150,
+2242245,
+2242534,
+2242596,
+2242737,
+2242853,
+2242993,
+2243014,
+2243045,
+2243080,
+2243396,
+2243441,
+2243460,
+2243505,
+2243613,
+2243626,
+2244285,
+2244612,
+2245213,
+2245220,
+2246022,
+2246117,
+2246214,
+2246277,
+2246310,
+2246341,
+2246417,
+2246597,
+2246653,
+2248708,
+2248957,
+2248964,
+2249021,
+2249028,
+2249181,
+2249188,
+2249693,
+2249700,
+2250033,
+2250077,
+2250244,
+2251749,
+2251782,
+2251877,
+2252157,
+2252296,
+2252637,
+2252805,
+2252870,
+2252957,
+2252964,
+2253245,
+2253284,
+2253373,
+2253412,
+2254141,
+2254148,
+2254397,
+2254404,
+2254493,
+2254500,
+2254685,
+2254693,
+2254756,
+2254790,
+2254853,
+2254886,
+2255037,
+2255078,
+2255165,
+2255206,
+2255325,
+2255364,
+2255421,
+2255590,
+2255645,
+2255780,
+2255942,
+2256029,
+2256069,
+2256317,
+2256389,
+2256573,
+2260996,
+2262694,
+2262789,
+2263046,
+2263109,
+2263206,
+2263237,
+2263268,
+2263409,
+2263560,
+2263889,
+2263965,
+2263985,
+2264005,
+2264036,
+2264157,
+2265092,
+2266630,
+2266725,
+2266918,
+2266949,
+2266982,
+2267109,
+2267174,
+2267205,
+2267268,
+2267345,
+2267364,
+2267421,
+2267656,
+2267997,
+2273284,
+2274790,
+2274885,
+2275037,
+2275078,
+2275205,
+2275270,
+2275301,
+2275377,
+2276100,
+2276229,
+2276317,
+2277380,
+2278918,
+2279013,
+2279270,
+2279333,
+2279366,
+2279397,
+2279473,
+2279556,
+2279613,
+2279944,
+2280285,
+2280465,
+2280893,
+2281476,
+2282853,
+2282886,
+2282917,
+2282950,
+2283013,
+2283206,
+2283237,
+2283268,
+2283325,
+2283528,
+2283869,
+2285572,
+2286461,
+2286501,
+2286598,
+2286661,
+2286790,
+2286821,
+2287005,
+2287112,
+2287434,
+2287505,
+2287605,
+2287645,
+2293764,
+2295174,
+2295269,
+2295558,
+2295589,
+2295665,
+2295709,
+2298880,
+2299905,
+2300936,
+2301258,
+2301565,
+2301924,
+2302205,
+2302244,
+2302301,
+2302340,
+2302621,
+2302628,
+2302717,
+2302724,
+2303494,
+2303709,
+2303718,
+2303805,
+2303845,
+2303910,
+2303941,
+2303972,
+2304006,
+2304036,
+2304070,
+2304101,
+2304145,
+2304253,
+2304520,
+2304861,
+2307076,
+2307357,
+2307396,
+2308646,
+2308741,
+2308893,
+2308933,
+2308998,
+2309125,
+2309156,
+2309201,
+2309220,
+2309254,
+2309309,
+2310148,
+2310181,
+2310500,
+2311781,
+2311974,
+2312004,
+2312037,
+2312177,
+2312421,
+2312477,
+2312708,
+2312741,
+2312934,
+2312997,
+2313092,
+2314565,
+2314982,
+2315013,
+2315089,
+2315172,
+2315217,
+2315389,
+2316292,
+2318141,
+2326532,
+2326845,
+2326852,
+2328038,
+2328069,
+2328317,
+2328325,
+2328518,
+2328549,
+2328580,
+2328625,
+2328797,
+2329096,
+2329418,
+2330045,
+2330129,
+2330180,
+2331165,
+2331205,
+2331933,
+2331942,
+2331973,
+2332198,
+2332229,
+2332294,
+2332325,
+2332413,
+2334724,
+2334973,
+2334980,
+2335069,
+2335076,
+2336293,
+2336509,
+2336581,
+2336637,
+2336645,
+2336733,
+2336741,
+2336964,
+2336997,
+2337053,
+2337288,
+2337629,
+2337796,
+2338013,
+2338020,
+2338109,
+2338116,
+2339142,
+2339325,
+2339333,
+2339421,
+2339430,
+2339493,
+2339526,
+2339557,
+2339588,
+2339645,
+2339848,
+2340189,
+2350084,
+2350693,
+2350758,
+2350833,
+2350909,
+2356740,
+2356797,
+2357258,
+2357941,
+2358195,
+2358325,
+2358877,
+2359281,
+2359300,
+2388829,
+2392073,
+2395645,
+2395665,
+2395837,
+2396164,
+2402461,
+2490372,
+2524669,
+2524698,
+2524989,
+2654212,
+2672893,
+2949124,
+2967357,
+2967556,
+2968573,
+2968584,
+2968925,
+2969041,
+2969117,
+2972164,
+2973149,
+2973189,
+2973361,
+2973405,
+2973700,
+2975237,
+2975473,
+2975637,
+2975747,
+2975889,
+2975925,
+2975965,
+2976264,
+2976605,
+2976618,
+2976861,
+2976868,
+2977565,
+2977700,
+2978333,
+3000320,
+3001345,
+3002378,
+3003121,
+3003261,
+3006468,
+3008893,
+3008997,
+3009028,
+3009062,
+3010845,
+3011045,
+3011171,
+3011613,
+3013635,
+3013713,
+3013731,
+3013765,
+3013821,
+3014150,
+3014237,
+3014660,
+3211037,
+3211268,
+3250909,
+3252228,
+3252541,
+3538948,
+3548157,
+3549700,
+3549821,
+3550340,
+3550493,
+3550724,
+3563421,
+3637252,
+3640701,
+3640836,
+3641277,
+3641348,
+3641661,
+3641860,
+3642205,
+3642261,
+3642277,
+3642353,
+3642394,
+3642525,
+3801109,
+3808989,
+3809301,
+3810557,
+3810613,
+3812518,
+3812581,
+3812693,
+3812774,
+3812986,
+3813221,
+3813493,
+3813541,
+3813781,
+3814725,
+3814869,
+3816765,
+3817493,
+3819589,
+3819701,
+3819741,
+3824650,
+3825309,
+3825685,
+3828477,
+3828746,
+3829565,
+3833856,
+3834689,
+3835520,
+3836353,
+3836605,
+3836609,
+3837184,
+3838017,
+3838848,
+3838909,
+3838912,
+3839005,
+3839040,
+3839101,
+3839136,
+3839229,
+3839264,
+3839421,
+3839424,
+3839681,
+3839837,
+3839841,
+3839901,
+3839905,
+3840157,
+3840161,
+3840512,
+3841345,
+3842176,
+3842269,
+3842272,
+3842429,
+3842464,
+3842749,
+3842752,
+3843005,
+3843009,
+3843840,
+3843933,
+3843936,
+3844093,
+3844096,
+3844285,
+3844288,
+3844349,
+3844416,
+3844669,
+3844673,
+3845504,
+3846337,
+3847168,
+3848001,
+3848832,
+3849665,
+3850496,
+3851329,
+3852160,
+3852993,
+3853824,
+3854657,
+3855581,
+3855616,
+3856434,
+3856449,
+3857266,
+3857281,
+3857472,
+3858290,
+3858305,
+3859122,
+3859137,
+3859328,
+3860146,
+3860161,
+3860978,
+3860993,
+3861184,
+3862002,
+3862017,
+3862834,
+3862849,
+3863040,
+3863858,
+3863873,
+3864690,
+3864705,
+3864896,
+3864929,
+3864989,
+3865032,
+3866645,
+3883013,
+3884789,
+3884901,
+3886517,
+3886757,
+3886805,
+3887237,
+3887285,
+3887345,
+3887517,
+3887973,
+3888157,
+3888165,
+3888669,
+3932165,
+3932413,
+3932421,
+3932989,
+3933029,
+3933277,
+3933285,
+3933373,
+3933381,
+3933565,
+3940356,
+3941821,
+3941893,
+3942115,
+3942365,
+3942408,
+3942749,
+3942852,
+3942901,
+3942941,
+3954692,
+3956101,
+3956232,
+3956573,
+3956723,
+3956765,
+3997700,
+4004029,
+4004074,
+4004357,
+4004605,
+4005888,
+4006977,
+4008069,
+4008291,
+4008349,
+4008456,
+4008797,
+4008913,
+4008989,
+4034090,
+4035989,
+4036010,
+4036115,
+4036138,
+4036285,
+4038698,
+4040149,
+4040170,
+4040669,
+4046852,
+4047005,
+4047012,
+4047901,
+4047908,
+4047997,
+4048004,
+4048061,
+4048100,
+4048157,
+4048164,
+4048509,
+4048516,
+4048669,
+4048676,
+4048733,
+4048740,
+4048797,
+4048964,
+4049021,
+4049124,
+4049181,
+4049188,
+4049245,
+4049252,
+4049309,
+4049316,
+4049437,
+4049444,
+4049533,
+4049540,
+4049597,
+4049636,
+4049693,
+4049700,
+4049757,
+4049764,
+4049821,
+4049828,
+4049885,
+4049892,
+4049949,
+4049956,
+4050045,
+4050052,
+4050109,
+4050148,
+4050301,
+4050308,
+4050557,
+4050564,
+4050717,
+4050724,
+4050877,
+4050884,
+4050941,
+4050948,
+4051293,
+4051300,
+4051869,
+4052004,
+4052125,
+4052132,
+4052317,
+4052324,
+4052893,
+4054546,
+4054621,
+4063253,
+4064669,
+4064789,
+4067997,
+4068373,
+4068861,
+4068917,
+4069405,
+4069429,
+4069917,
+4069941,
+4071133,
+4071434,
+4071861,
+4077021,
+4078805,
+4079741,
+4080149,
+4081565,
+4081685,
+4081981,
+4082197,
+4082269,
+4082709,
+4082909,
+4087829,
+4095860,
+4096021,
+4119325,
+4119573,
+4119997,
+4120085,
+4120509,
+4120597,
+4124317,
+4124693,
+4127549,
+4127765,
+4128157,
+4128789,
+4129181,
+4129301,
+4131101,
+4131349,
+4131677,
+4131861,
+4133149,
+4133397,
+4134365,
+4134421,
+4134493,
+4136981,
+4140861,
+4140885,
+4143517,
+4143541,
+4147869,
+4148245,
+4148701,
+4148757,
+4148925,
+4149013,
+4149117,
+4149269,
+4149501,
+4149781,
+4150589,
+4150805,
+4151037,
+4151317,
+4151421,
+4151829,
+4152061,
+4153365,
+4158077,
+4158101,
+4159869,
+4161032,
+4161373,
+4194308,
+5561309,
+5562372,
+5695165,
+5695492,
+5702621,
+5702660,
+5887069,
+5887492,
+6126653,
+6225924,
+6243293,
+6291460,
+6449533,
+29360186,
+29360221,
+29361178,
+29364253,
+29368325,
+29376029,
+31457308,
+33554397,
+33554460,
+35651549,
+35651613,
+//--Autogenerated -- end of section automatically generated
+};
+
+constexpr int maxUnicode = 0x10ffff;
+constexpr int maskCategory = 0x1F;
+
+}
+
+// Each element in catRanges is the start of a range of Unicode characters in
+// one general category.
+// The value is comprised of a 21-bit character value shifted 5 bits and a 5 bit
+// category matching the CharacterCategory enumeration.
+// Initial version has 3249 entries and adds about 13K to the executable.
+// The array is in ascending order so can be searched using binary search.
+// Therefore the average call takes log2(3249) = 12 comparisons.
+// For speed, it may be useful to make a linear table for the common values,
+// possibly for 0..0xff for most Western European text or 0..0xfff for most
+// alphabetic languages.
+
+CharacterCategory CategoriseCharacter(int character) {
+	if (character < 0 || character > maxUnicode)
+		return ccCn;
+	const int baseValue = character * (maskCategory+1) + maskCategory;
+	const int *placeAfter = std::lower_bound(catRanges, std::end(catRanges), baseValue);
+	return static_cast<CharacterCategory>(*(placeAfter-1) & maskCategory);
+}
+
+// Implementation of character sets recommended for identifiers in Unicode Standard Annex #31.
+// http://unicode.org/reports/tr31/
+
+namespace {
+
+enum class OtherID { oidNone, oidStart, oidContinue };
+
+// Some characters are treated as valid for identifiers even
+// though most characters from their category are not.
+// Values copied from http://www.unicode.org/Public/9.0.0/ucd/PropList.txt
+OtherID OtherIDOfCharacter(int character) noexcept {
+	if (
+		(character == 0x1885) ||	// MONGOLIAN LETTER ALI GALI BALUDA
+		(character == 0x1886) ||	// MONGOLIAN LETTER ALI GALI THREE BALUDA
+		(character == 0x2118) ||	// SCRIPT CAPITAL P
+		(character == 0x212E) ||	// ESTIMATED SYMBOL
+		(character == 0x309B) ||	// KATAKANA-HIRAGANA VOICED SOUND MARK
+		(character == 0x309C)) {	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+		return OtherID::oidStart;
+	} else if (
+		(character == 0x00B7) ||	// MIDDLE DOT
+		(character == 0x0387) ||	// GREEK ANO TELEIA
+		((character >= 0x1369) && (character <= 0x1371)) ||	// ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE
+		(character == 0x19DA)) {	// NEW TAI LUE THAM DIGIT ONE
+		return OtherID::oidContinue;
+	} else {
+		return OtherID::oidNone;
+	}
+}
+
+// Determine if a character is in  Ll|Lu|Lt|Lm|Lo|Nl|Mn|Mc|Nd|Pc and has
+// Pattern_Syntax|Pattern_White_Space.
+// As of Unicode 9, only VERTICAL TILDE which is in Lm and has Pattern_Syntax matches.
+// Should really generate from PropList.txt a list of Pattern_Syntax and Pattern_White_Space.
+constexpr bool IsIdPattern(int character) noexcept {
+	return character == 0x2E2F;
+}
+
+bool OmitXidStart(int character) noexcept {
+	switch (character) {
+	case 0x037A:	// GREEK YPOGEGRAMMENI
+	case 0x0E33:	// THAI CHARACTER SARA AM
+	case 0x0EB3:	// LAO VOWEL SIGN AM
+	case 0x309B:	// KATAKANA-HIRAGANA VOICED SOUND MARK
+	case 0x309C:	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+	case 0xFC5E:	// ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+	case 0xFC5F:	// ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+	case 0xFC60:	// ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+	case 0xFC61:	// ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+	case 0xFC62:	// ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+	case 0xFC63:	// ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+	case 0xFDFA:	// ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
+	case 0xFDFB:	// ARABIC LIGATURE JALLAJALALOUHOU
+	case 0xFE70:	// ARABIC FATHATAN ISOLATED FORM
+	case 0xFE72:	// ARABIC DAMMATAN ISOLATED FORM
+	case 0xFE74:	// ARABIC KASRATAN ISOLATED FORM
+	case 0xFE76:	// ARABIC FATHA ISOLATED FORM
+	case 0xFE78:	// ARABIC DAMMA ISOLATED FORM
+	case 0xFE7A:	// ARABIC KASRA ISOLATED FORM
+	case 0xFE7C:	// ARABIC SHADDA ISOLATED FORM
+	case 0xFE7E:	// ARABIC SUKUN ISOLATED FORM
+	case 0xFF9E:	// HALFWIDTH KATAKANA VOICED SOUND MARK
+	case 0xFF9F:	// HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool OmitXidContinue(int character) noexcept {
+	switch (character) {
+	case 0x037A:	// GREEK YPOGEGRAMMENI
+	case 0x309B:	// KATAKANA-HIRAGANA VOICED SOUND MARK
+	case 0x309C:	// KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+	case 0xFC5E:	// ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+	case 0xFC5F:	// ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+	case 0xFC60:	// ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+	case 0xFC61:	// ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+	case 0xFC62:	// ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+	case 0xFC63:	// ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+	case 0xFDFA:	// ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
+	case 0xFDFB:	// ARABIC LIGATURE JALLAJALALOUHOU
+	case 0xFE70:	// ARABIC FATHATAN ISOLATED FORM
+	case 0xFE72:	// ARABIC DAMMATAN ISOLATED FORM
+	case 0xFE74:	// ARABIC KASRATAN ISOLATED FORM
+	case 0xFE76:	// ARABIC FATHA ISOLATED FORM
+	case 0xFE78:	// ARABIC DAMMA ISOLATED FORM
+	case 0xFE7A:	// ARABIC KASRA ISOLATED FORM
+	case 0xFE7C:	// ARABIC SHADDA ISOLATED FORM
+	case 0xFE7E:	// ARABIC SUKUN ISOLATED FORM
+		return true;
+	default:
+		return false;
+	}
+}
+
+}
+
+// UAX #31 defines ID_Start as
+// [[:L:][:Nl:][:Other_ID_Start:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
+bool IsIdStart(int character) {
+	if (IsIdPattern(character)) {
+		return false;
+	}
+	const OtherID oid = OtherIDOfCharacter(character);
+	if (oid == OtherID::oidStart) {
+		return true;
+	}
+	const CharacterCategory c = CategoriseCharacter(character);
+	return (c == ccLl || c == ccLu || c == ccLt || c == ccLm || c == ccLo
+		|| c == ccNl);
+}
+
+// UAX #31 defines ID_Continue as
+// [[:ID_Start:][:Mn:][:Mc:][:Nd:][:Pc:][:Other_ID_Continue:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
+bool IsIdContinue(int character) {
+	if (IsIdPattern(character)) {
+		return false;
+	}
+	const OtherID oid = OtherIDOfCharacter(character);
+	if (oid != OtherID::oidNone) {
+		return true;
+	}
+	const CharacterCategory c = CategoriseCharacter(character);
+	return (c == ccLl || c == ccLu || c == ccLt || c == ccLm || c == ccLo
+		|| c == ccNl || c == ccMn || c == ccMc || c == ccNd || c == ccPc);
+}
+
+// XID_Start is ID_Start modified for Normalization Form KC in UAX #31
+bool IsXidStart(int character) {
+	if (OmitXidStart(character)) {
+		return false;
+	} else {
+		return IsIdStart(character);
+	}
+}
+
+// XID_Continue is ID_Continue modified for Normalization Form KC in UAX #31
+bool IsXidContinue(int character) {
+	if (OmitXidContinue(character)) {
+		return false;
+	} else {
+		return IsIdContinue(character);
+	}
+}
+
+CharacterCategoryMap::CharacterCategoryMap() {
+	Optimize(256);
+}
+
+int CharacterCategoryMap::Size() const noexcept {
+	return static_cast<int>(dense.size());
+}
+
+void CharacterCategoryMap::Optimize(int countCharacters) {
+	const int characters = std::clamp(countCharacters, 256, maxUnicode + 1);
+	dense.resize(characters);
+
+	int end = 0;
+	int index = 0;
+	int current = catRanges[index];
+	++index;
+	do {
+		const int next = catRanges[index];
+		const unsigned char category = current & maskCategory;
+		current >>= 5;
+		end = std::min(characters, next >> 5);
+		while (current < end) {
+			dense[current++] = category;
+		}
+		current = next;
+		++index;
+	} while (characters > end);
+}
+
+}
diff --git a/scite-app/scintilla/src/CharacterCategoryMap.h b/scite-app/scintilla/src/CharacterCategoryMap.h
new file mode 100644
index 0000000..b3b03eb
--- /dev/null
+++ b/scite-app/scintilla/src/CharacterCategoryMap.h
@@ -0,0 +1,52 @@
+// Scintilla source code edit control
+/** @file CharacterCategoryMap.h
+ ** Returns the Unicode general category of a character.
+ ** Similar code to Lexilla's lexilla/lexlib/CharacterCategory.h but renamed
+ ** to avoid problems with builds that statically include both Scintilla and Lexilla.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHARACTERCATEGORYMAP_H
+#define CHARACTERCATEGORYMAP_H
+
+namespace Scintilla::Internal {
+
+enum CharacterCategory {
+	ccLu, ccLl, ccLt, ccLm, ccLo,
+	ccMn, ccMc, ccMe,
+	ccNd, ccNl, ccNo,
+	ccPc, ccPd, ccPs, ccPe, ccPi, ccPf, ccPo,
+	ccSm, ccSc, ccSk, ccSo,
+	ccZs, ccZl, ccZp,
+	ccCc, ccCf, ccCs, ccCo, ccCn
+};
+
+CharacterCategory CategoriseCharacter(int character);
+
+// Common definitions of allowable characters in identifiers from UAX #31.
+bool IsIdStart(int character);
+bool IsIdContinue(int character);
+bool IsXidStart(int character);
+bool IsXidContinue(int character);
+
+class CharacterCategoryMap {
+private:
+	std::vector<unsigned char> dense;
+public:
+	CharacterCategoryMap();
+	CharacterCategory CategoryFor(int character) const {
+		if (static_cast<size_t>(character) < dense.size()) {
+			return static_cast<CharacterCategory>(dense[character]);
+		} else {
+			// binary search through ranges
+			return CategoriseCharacter(character);
+		}
+	}
+	int Size() const noexcept;
+	void Optimize(int countCharacters);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/CharacterType.cxx b/scite-app/scintilla/src/CharacterType.cxx
new file mode 100644
index 0000000..2991ac3
--- /dev/null
+++ b/scite-app/scintilla/src/CharacterType.cxx
@@ -0,0 +1,51 @@
+// Scintilla source code edit control
+/** @file CharacterType.cxx
+ ** Tests for character type and case-insensitive comparisons.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+
+#include "CharacterType.h"
+
+using namespace Scintilla::Internal;
+
+namespace Scintilla::Internal {
+
+int CompareCaseInsensitive(const char *a, const char *b) noexcept {
+	while (*a && *b) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+	}
+	// Either *a or *b is nul
+	return *a - *b;
+}
+
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
+	while (*a && *b && len) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+		len--;
+	}
+	if (len == 0)
+		return 0;
+	else
+		// Either *a or *b is nul
+		return *a - *b;
+}
+
+}
diff --git a/scite-app/scintilla/src/CharacterType.h b/scite-app/scintilla/src/CharacterType.h
new file mode 100644
index 0000000..dcef6aa
--- /dev/null
+++ b/scite-app/scintilla/src/CharacterType.h
@@ -0,0 +1,112 @@
+// Scintilla source code edit control
+/** @file CharacterType.h
+ ** Tests for character type and case-insensitive comparisons.
+ **/
+// Copyright 2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHARACTERTYPE_H
+#define CHARACTERTYPE_H
+
+namespace Scintilla::Internal {
+
+// Functions for classifying characters
+
+constexpr bool IsASpace(int ch) noexcept {
+    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
+constexpr bool IsASpaceOrTab(int ch) noexcept {
+	return (ch == ' ') || (ch == '\t');
+}
+
+constexpr bool IsADigit(int ch) noexcept {
+	return (ch >= '0') && (ch <= '9');
+}
+
+constexpr bool IsADigit(int ch, int base) noexcept {
+	if (base <= 10) {
+		return (ch >= '0') && (ch < '0' + base);
+	} else {
+		return ((ch >= '0') && (ch <= '9')) ||
+		       ((ch >= 'A') && (ch < 'A' + base - 10)) ||
+		       ((ch >= 'a') && (ch < 'a' + base - 10));
+	}
+}
+
+constexpr bool IsASCII(int ch) noexcept {
+	return (ch >= 0) && (ch < 0x80);
+}
+
+constexpr bool IsLowerCase(int ch) noexcept {
+	return (ch >= 'a') && (ch <= 'z');
+}
+
+constexpr bool IsUpperCase(int ch) noexcept {
+	return (ch >= 'A') && (ch <= 'Z');
+}
+
+constexpr bool IsUpperOrLowerCase(int ch) noexcept {
+	return IsUpperCase(ch) || IsLowerCase(ch);
+}
+
+constexpr bool IsAlphaNumeric(int ch) noexcept {
+	return
+		((ch >= '0') && (ch <= '9')) ||
+		((ch >= 'a') && (ch <= 'z')) ||
+		((ch >= 'A') && (ch <= 'Z'));
+}
+
+/**
+ * Check if a character is a space.
+ * This is ASCII specific but is safe with chars >= 0x80.
+ */
+constexpr bool isspacechar(int ch) noexcept {
+    return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
+constexpr bool iswordchar(int ch) noexcept {
+	return IsAlphaNumeric(ch) || ch == '.' || ch == '_';
+}
+
+constexpr bool iswordstart(int ch) noexcept {
+	return IsAlphaNumeric(ch) || ch == '_';
+}
+
+constexpr bool isoperator(int ch) noexcept {
+	if (IsAlphaNumeric(ch))
+		return false;
+	if (ch == '%' || ch == '^' || ch == '&' || ch == '*' ||
+	        ch == '(' || ch == ')' || ch == '-' || ch == '+' ||
+	        ch == '=' || ch == '|' || ch == '{' || ch == '}' ||
+	        ch == '[' || ch == ']' || ch == ':' || ch == ';' ||
+	        ch == '<' || ch == '>' || ch == ',' || ch == '/' ||
+	        ch == '?' || ch == '!' || ch == '.' || ch == '~')
+		return true;
+	return false;
+}
+
+// Simple case functions for ASCII supersets.
+
+template <typename T>
+constexpr T MakeUpperCase(T ch) noexcept {
+	if (ch < 'a' || ch > 'z')
+		return ch;
+	else
+		return ch - 'a' + 'A';
+}
+
+template <typename T>
+constexpr T MakeLowerCase(T ch) noexcept {
+	if (ch < 'A' || ch > 'Z')
+		return ch;
+	else
+		return ch - 'A' + 'a';
+}
+
+int CompareCaseInsensitive(const char *a, const char *b) noexcept;
+int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept;
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/ContractionState.cxx b/scite-app/scintilla/src/ContractionState.cxx
new file mode 100644
index 0000000..199b3cb
--- /dev/null
+++ b/scite-app/scintilla/src/ContractionState.cxx
@@ -0,0 +1,422 @@
+// Scintilla source code edit control
+/** @file ContractionState.cxx
+ ** Manages visibility of lines for folding and wrapping.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "SparseVector.h"
+#include "ContractionState.h"
+
+using namespace Scintilla::Internal;
+
+namespace {
+
+template <typename LINE>
+class ContractionState final : public IContractionState {
+	// These contain 1 element for every document line.
+	std::unique_ptr<RunStyles<LINE, char>> visible;
+	std::unique_ptr<RunStyles<LINE, char>> expanded;
+	std::unique_ptr<RunStyles<LINE, int>> heights;
+	std::unique_ptr<SparseVector<UniqueString>> foldDisplayTexts;
+	std::unique_ptr<Partitioning<LINE>> displayLines;
+	LINE linesInDocument;
+
+	void EnsureData();
+
+	bool OneToOne() const noexcept {
+		// True when each document line is exactly one display line so need for
+		// complex data structures.
+		return visible == nullptr;
+	}
+
+	void InsertLine(Sci::Line lineDoc);
+	void DeleteLine(Sci::Line lineDoc);
+
+public:
+	ContractionState() noexcept;
+	// Deleted so ContractionState objects can not be copied.
+	ContractionState(const ContractionState &) = delete;
+	void operator=(const ContractionState &) = delete;
+	ContractionState(ContractionState &&) = delete;
+	void operator=(ContractionState &&) = delete;
+	~ContractionState() override;
+
+	void Clear() noexcept override;
+
+	Sci::Line LinesInDoc() const noexcept override;
+	Sci::Line LinesDisplayed() const noexcept override;
+	Sci::Line DisplayFromDoc(Sci::Line lineDoc) const noexcept override;
+	Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const noexcept override;
+	Sci::Line DocFromDisplay(Sci::Line lineDisplay) const noexcept override;
+
+	void InsertLines(Sci::Line lineDoc, Sci::Line lineCount) override;
+	void DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) override;
+
+	bool GetVisible(Sci::Line lineDoc) const noexcept override;
+	bool SetVisible(Sci::Line lineDocStart, Sci::Line lineDocEnd, bool isVisible) override;
+	bool HiddenLines() const noexcept override;
+
+	const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept override;
+	bool SetFoldDisplayText(Sci::Line lineDoc, const char *text) override;
+
+	bool GetExpanded(Sci::Line lineDoc) const noexcept override;
+	bool SetExpanded(Sci::Line lineDoc, bool isExpanded) override;
+	Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept override;
+
+	int GetHeight(Sci::Line lineDoc) const noexcept override;
+	bool SetHeight(Sci::Line lineDoc, int height) override;
+
+	void ShowAll() noexcept override;
+
+	void Check() const noexcept;
+};
+
+template <typename LINE>
+ContractionState<LINE>::ContractionState() noexcept : linesInDocument(1) {
+}
+
+template <typename LINE>
+ContractionState<LINE>::~ContractionState() {
+	Clear();
+}
+
+template <typename LINE>
+void ContractionState<LINE>::EnsureData() {
+	if (OneToOne()) {
+		visible = std::make_unique<RunStyles<LINE, char>>();
+		expanded = std::make_unique<RunStyles<LINE, char>>();
+		heights = std::make_unique<RunStyles<LINE, int>>();
+		foldDisplayTexts = std::make_unique<SparseVector<UniqueString>>();
+		displayLines = std::make_unique<Partitioning<LINE>>(4);
+		InsertLines(0, linesInDocument);
+	}
+}
+
+template <typename LINE>
+void ContractionState<LINE>::InsertLine(Sci::Line lineDoc) {
+	if (OneToOne()) {
+		linesInDocument++;
+	} else {
+		const LINE lineDocCast = static_cast<LINE>(lineDoc);
+		visible->InsertSpace(lineDocCast, 1);
+		visible->SetValueAt(lineDocCast, 1);
+		expanded->InsertSpace(lineDocCast, 1);
+		expanded->SetValueAt(lineDocCast, 1);
+		heights->InsertSpace(lineDocCast, 1);
+		heights->SetValueAt(lineDocCast, 1);
+		foldDisplayTexts->InsertSpace(lineDocCast, 1);
+		foldDisplayTexts->SetValueAt(lineDocCast, nullptr);
+		const Sci::Line lineDisplay = DisplayFromDoc(lineDoc);
+		displayLines->InsertPartition(lineDocCast, static_cast<LINE>(lineDisplay));
+		displayLines->InsertText(lineDocCast, 1);
+	}
+}
+
+template <typename LINE>
+void ContractionState<LINE>::DeleteLine(Sci::Line lineDoc) {
+	if (OneToOne()) {
+		linesInDocument--;
+	} else {
+		const LINE lineDocCast = static_cast<LINE>(lineDoc);
+		if (GetVisible(lineDoc)) {
+			displayLines->InsertText(lineDocCast, -heights->ValueAt(lineDocCast));
+		}
+		displayLines->RemovePartition(lineDocCast);
+		visible->DeleteRange(lineDocCast, 1);
+		expanded->DeleteRange(lineDocCast, 1);
+		heights->DeleteRange(lineDocCast, 1);
+		foldDisplayTexts->DeletePosition(lineDocCast);
+	}
+}
+
+template <typename LINE>
+void ContractionState<LINE>::Clear() noexcept {
+	visible.reset();
+	expanded.reset();
+	heights.reset();
+	foldDisplayTexts.reset();
+	displayLines.reset();
+	linesInDocument = 1;
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::LinesInDoc() const noexcept {
+	if (OneToOne()) {
+		return linesInDocument;
+	} else {
+		return displayLines->Partitions() - 1;
+	}
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::LinesDisplayed() const noexcept {
+	if (OneToOne()) {
+		return linesInDocument;
+	} else {
+		return displayLines->PositionFromPartition(static_cast<LINE>(LinesInDoc()));
+	}
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::DisplayFromDoc(Sci::Line lineDoc) const noexcept {
+	if (OneToOne()) {
+		return (lineDoc <= linesInDocument) ? lineDoc : linesInDocument;
+	} else {
+		if (lineDoc > displayLines->Partitions())
+			lineDoc = displayLines->Partitions();
+		return displayLines->PositionFromPartition(static_cast<LINE>(lineDoc));
+	}
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::DisplayLastFromDoc(Sci::Line lineDoc) const noexcept {
+	return DisplayFromDoc(lineDoc) + GetHeight(lineDoc) - 1;
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::DocFromDisplay(Sci::Line lineDisplay) const noexcept {
+	if (OneToOne()) {
+		return lineDisplay;
+	} else {
+		if (lineDisplay <= 0) {
+			return 0;
+		}
+		if (lineDisplay > LinesDisplayed()) {
+			return displayLines->PartitionFromPosition(static_cast<LINE>(LinesDisplayed()));
+		}
+		const Sci::Line lineDoc = displayLines->PartitionFromPosition(static_cast<LINE>(lineDisplay));
+		PLATFORM_ASSERT(GetVisible(lineDoc));
+		return lineDoc;
+	}
+}
+
+template <typename LINE>
+void ContractionState<LINE>::InsertLines(Sci::Line lineDoc, Sci::Line lineCount) {
+	if (OneToOne()) {
+		linesInDocument += static_cast<LINE>(lineCount);
+	} else {
+		for (Sci::Line l = 0; l < lineCount; l++) {
+			InsertLine(lineDoc + l);
+		}
+	}
+	Check();
+}
+
+template <typename LINE>
+void ContractionState<LINE>::DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) {
+	if (OneToOne()) {
+		linesInDocument -= static_cast<LINE>(lineCount);
+	} else {
+		for (Sci::Line l = 0; l < lineCount; l++) {
+			DeleteLine(lineDoc);
+		}
+	}
+	Check();
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::GetVisible(Sci::Line lineDoc) const noexcept {
+	if (OneToOne()) {
+		return true;
+	} else {
+		if (lineDoc >= visible->Length())
+			return true;
+		return visible->ValueAt(static_cast<LINE>(lineDoc)) == 1;
+	}
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::SetVisible(Sci::Line lineDocStart, Sci::Line lineDocEnd, bool isVisible) {
+	if (OneToOne() && isVisible) {
+		return false;
+	} else {
+		EnsureData();
+		Sci::Line delta = 0;
+		Check();
+		if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < LinesInDoc())) {
+			for (Sci::Line line = lineDocStart; line <= lineDocEnd; line++) {
+				if (GetVisible(line) != isVisible) {
+					const int heightLine = heights->ValueAt(static_cast<LINE>(line));
+					const int difference = isVisible ? heightLine : -heightLine;
+					visible->SetValueAt(static_cast<LINE>(line), isVisible ? 1 : 0);
+					displayLines->InsertText(static_cast<LINE>(line), difference);
+					delta += difference;
+				}
+			}
+		} else {
+			return false;
+		}
+		Check();
+		return delta != 0;
+	}
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::HiddenLines() const noexcept {
+	if (OneToOne()) {
+		return false;
+	} else {
+		return !visible->AllSameAs(1);
+	}
+}
+
+template <typename LINE>
+const char *ContractionState<LINE>::GetFoldDisplayText(Sci::Line lineDoc) const noexcept {
+	Check();
+	return foldDisplayTexts->ValueAt(lineDoc).get();
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::SetFoldDisplayText(Sci::Line lineDoc, const char *text) {
+	EnsureData();
+	const char *foldText = foldDisplayTexts->ValueAt(lineDoc).get();
+	if (!foldText || !text || 0 != strcmp(text, foldText)) {
+		UniqueString uns = IsNullOrEmpty(text) ? UniqueString() : UniqueStringCopy(text);
+		foldDisplayTexts->SetValueAt(lineDoc, std::move(uns));
+		Check();
+		return true;
+	} else {
+		Check();
+		return false;
+	}
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::GetExpanded(Sci::Line lineDoc) const noexcept {
+	if (OneToOne()) {
+		return true;
+	} else {
+		Check();
+		return expanded->ValueAt(static_cast<LINE>(lineDoc)) == 1;
+	}
+}
+
+template <typename LINE>
+bool ContractionState<LINE>::SetExpanded(Sci::Line lineDoc, bool isExpanded) {
+	if (OneToOne() && isExpanded) {
+		return false;
+	} else {
+		EnsureData();
+		if (isExpanded != (expanded->ValueAt(static_cast<LINE>(lineDoc)) == 1)) {
+			expanded->SetValueAt(static_cast<LINE>(lineDoc), isExpanded ? 1 : 0);
+			Check();
+			return true;
+		} else {
+			Check();
+			return false;
+		}
+	}
+}
+
+template <typename LINE>
+Sci::Line ContractionState<LINE>::ContractedNext(Sci::Line lineDocStart) const noexcept {
+	if (OneToOne()) {
+		return -1;
+	} else {
+		Check();
+		if (!expanded->ValueAt(static_cast<LINE>(lineDocStart))) {
+			return lineDocStart;
+		} else {
+			const Sci::Line lineDocNextChange = expanded->EndRun(static_cast<LINE>(lineDocStart));
+			if (lineDocNextChange < LinesInDoc())
+				return lineDocNextChange;
+			else
+				return -1;
+		}
+	}
+}
+
+template <typename LINE>
+int ContractionState<LINE>::GetHeight(Sci::Line lineDoc) const noexcept {
+	if (OneToOne()) {
+		return 1;
+	} else {
+		return heights->ValueAt(static_cast<LINE>(lineDoc));
+	}
+}
+
+// Set the number of display lines needed for this line.
+// Return true if this is a change.
+template <typename LINE>
+bool ContractionState<LINE>::SetHeight(Sci::Line lineDoc, int height) {
+	if (OneToOne() && (height == 1)) {
+		return false;
+	} else if (lineDoc < LinesInDoc()) {
+		EnsureData();
+		if (GetHeight(lineDoc) != height) {
+			if (GetVisible(lineDoc)) {
+				displayLines->InsertText(static_cast<LINE>(lineDoc), height - GetHeight(lineDoc));
+			}
+			heights->SetValueAt(static_cast<LINE>(lineDoc), height);
+			Check();
+			return true;
+		} else {
+			Check();
+			return false;
+		}
+	} else {
+		return false;
+	}
+}
+
+template <typename LINE>
+void ContractionState<LINE>::ShowAll() noexcept {
+	const LINE lines = static_cast<LINE>(LinesInDoc());
+	Clear();
+	linesInDocument = lines;
+}
+
+// Debugging checks
+
+template <typename LINE>
+void ContractionState<LINE>::Check() const noexcept {
+#ifdef CHECK_CORRECTNESS
+	for (Sci::Line vline = 0; vline < LinesDisplayed(); vline++) {
+		const Sci::Line lineDoc = DocFromDisplay(vline);
+		PLATFORM_ASSERT(GetVisible(lineDoc));
+	}
+	for (Sci::Line lineDoc = 0; lineDoc < LinesInDoc(); lineDoc++) {
+		const Sci::Line displayThis = DisplayFromDoc(lineDoc);
+		const Sci::Line displayNext = DisplayFromDoc(lineDoc + 1);
+		const Sci::Line height = displayNext - displayThis;
+		PLATFORM_ASSERT(height >= 0);
+		if (GetVisible(lineDoc)) {
+			PLATFORM_ASSERT(GetHeight(lineDoc) == height);
+		} else {
+			PLATFORM_ASSERT(0 == height);
+		}
+	}
+#endif
+}
+
+}
+
+namespace Scintilla::Internal {
+
+std::unique_ptr<IContractionState> ContractionStateCreate(bool largeDocument) {
+	if (largeDocument)
+		return std::make_unique<ContractionState<Sci::Line>>();
+	else
+		return std::make_unique<ContractionState<int>>();
+}
+
+}
diff --git a/scite-app/scintilla/src/ContractionState.h b/scite-app/scintilla/src/ContractionState.h
new file mode 100644
index 0000000..55c390c
--- /dev/null
+++ b/scite-app/scintilla/src/ContractionState.h
@@ -0,0 +1,51 @@
+// Scintilla source code edit control
+/** @file ContractionState.h
+ ** Manages visibility of lines for folding and wrapping.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CONTRACTIONSTATE_H
+#define CONTRACTIONSTATE_H
+
+namespace Scintilla::Internal {
+
+/**
+*/
+class IContractionState {
+public:
+	virtual ~IContractionState() {};
+
+	virtual void Clear()=0;
+
+	virtual Sci::Line LinesInDoc() const noexcept=0;
+	virtual Sci::Line LinesDisplayed() const noexcept=0;
+	virtual Sci::Line DisplayFromDoc(Sci::Line lineDoc) const noexcept=0;
+	virtual Sci::Line DisplayLastFromDoc(Sci::Line lineDoc) const noexcept=0;
+	virtual Sci::Line DocFromDisplay(Sci::Line lineDisplay) const noexcept=0;
+
+	virtual void InsertLines(Sci::Line lineDoc, Sci::Line lineCount)=0;
+	virtual void DeleteLines(Sci::Line lineDoc, Sci::Line lineCount)=0;
+
+	virtual bool GetVisible(Sci::Line lineDoc) const noexcept=0;
+	virtual bool SetVisible(Sci::Line lineDocStart, Sci::Line lineDocEnd, bool isVisible)=0;
+	virtual bool HiddenLines() const noexcept=0;
+
+	virtual const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept=0;
+	virtual bool SetFoldDisplayText(Sci::Line lineDoc, const char *text)=0;
+
+	virtual bool GetExpanded(Sci::Line lineDoc) const noexcept=0;
+	virtual bool SetExpanded(Sci::Line lineDoc, bool isExpanded)=0;
+	virtual Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept =0;
+
+	virtual int GetHeight(Sci::Line lineDoc) const noexcept=0;
+	virtual bool SetHeight(Sci::Line lineDoc, int height)=0;
+
+	virtual void ShowAll() noexcept=0;
+};
+
+std::unique_ptr<IContractionState> ContractionStateCreate(bool largeDocument);
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/DBCS.cxx b/scite-app/scintilla/src/DBCS.cxx
new file mode 100644
index 0000000..e3ae3d7
--- /dev/null
+++ b/scite-app/scintilla/src/DBCS.cxx
@@ -0,0 +1,54 @@
+// Scintilla source code edit control
+/** @file DBCS.cxx
+ ** Functions to handle DBCS double byte encodings like Shift-JIS.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include "DBCS.h"
+
+using namespace Scintilla::Internal;
+
+namespace Scintilla::Internal {
+
+bool DBCSIsLeadByte(int codePage, char ch) noexcept {
+	// Byte ranges found in Wikipedia articles with relevant search strings in each case
+	const unsigned char uch = ch;
+	switch (codePage) {
+	case 932:
+		// Shift_jis
+		return ((uch >= 0x81) && (uch <= 0x9F)) ||
+			((uch >= 0xE0) && (uch <= 0xFC));
+		// Lead bytes F0 to FC may be a Microsoft addition.
+	case 936:
+		// GBK
+		return (uch >= 0x81) && (uch <= 0xFE);
+	case 949:
+		// Korean Wansung KS C-5601-1987
+		return (uch >= 0x81) && (uch <= 0xFE);
+	case 950:
+		// Big5
+		return (uch >= 0x81) && (uch <= 0xFE);
+	case 1361:
+		// Korean Johab KS C-5601-1992
+		return
+			((uch >= 0x84) && (uch <= 0xD3)) ||
+			((uch >= 0xD8) && (uch <= 0xDE)) ||
+			((uch >= 0xE0) && (uch <= 0xF9));
+	}
+	return false;
+}
+
+bool IsDBCSValidSingleByte(int codePage, int ch) noexcept {
+	switch (codePage) {
+	case 932:
+		return ch == 0x80
+			|| (ch >= 0xA0 && ch <= 0xDF)
+			|| (ch >= 0xFD);
+
+	default:
+		return false;
+	}
+}
+
+}
diff --git a/scite-app/scintilla/src/DBCS.h b/scite-app/scintilla/src/DBCS.h
new file mode 100644
index 0000000..ceeb759
--- /dev/null
+++ b/scite-app/scintilla/src/DBCS.h
@@ -0,0 +1,26 @@
+// Scintilla source code edit control
+/** @file DBCS.h
+ ** Functions to handle DBCS double byte encodings like Shift-JIS.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DBCS_H
+#define DBCS_H
+
+namespace Scintilla::Internal {
+
+constexpr bool IsDBCSCodePage(int codePage) noexcept {
+	return codePage == 932
+	       || codePage == 936
+	       || codePage == 949
+	       || codePage == 950
+	       || codePage == 1361;
+}
+
+bool DBCSIsLeadByte(int codePage, char ch) noexcept;
+bool IsDBCSValidSingleByte(int codePage, int ch) noexcept;
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Debugging.h b/scite-app/scintilla/src/Debugging.h
new file mode 100644
index 0000000..5221ff8
--- /dev/null
+++ b/scite-app/scintilla/src/Debugging.h
@@ -0,0 +1,44 @@
+// Scintilla source code edit control
+/** @file Debugging.h
+ ** Assert and debug trace functions.
+ ** Implemented in each platform layer.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DEBUGGING_H
+#define DEBUGGING_H
+
+namespace Scintilla::Internal {
+
+#if defined(__clang__)
+# if __has_feature(attribute_analyzer_noreturn)
+#  define CLANG_ANALYZER_NORETURN __attribute__((analyzer_noreturn))
+# else
+#  define CLANG_ANALYZER_NORETURN
+# endif
+#else
+# define CLANG_ANALYZER_NORETURN
+#endif
+
+/**
+ * Platform namespace used to segregate debugging functions.
+ */
+namespace Platform {
+
+void DebugDisplay(const char *s) noexcept;
+void DebugPrintf(const char *format, ...) noexcept;
+bool ShowAssertionPopUps(bool assertionPopUps_) noexcept;
+void Assert(const char *c, const char *file, int line) noexcept CLANG_ANALYZER_NORETURN;
+
+}
+
+#ifdef  NDEBUG
+#define PLATFORM_ASSERT(c) ((void)0)
+#else
+#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Internal::Platform::Assert(#c, __FILE__, __LINE__))
+#endif
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Decoration.cxx b/scite-app/scintilla/src/Decoration.cxx
new file mode 100644
index 0000000..77b2894
--- /dev/null
+++ b/scite-app/scintilla/src/Decoration.cxx
@@ -0,0 +1,319 @@
+/** @file Decoration.cxx
+ ** Visual elements added over text.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "Decoration.h"
+
+using namespace Scintilla::Internal;
+
+namespace {
+
+template <typename POS>
+class Decoration : public IDecoration {
+	int indicator;
+public:
+	RunStyles<POS, int> rs;
+
+	explicit Decoration(int indicator_) : indicator(indicator_) {
+	}
+	~Decoration() override {
+	}
+
+	bool Empty() const noexcept override {
+		return (rs.Runs() == 1) && (rs.AllSameAs(0));
+	}
+	int Indicator() const noexcept override {
+		return indicator;
+	}
+	Sci::Position Length() const noexcept override {
+		return rs.Length();
+	}
+	int ValueAt(Sci::Position position) const noexcept override {
+		return rs.ValueAt(static_cast<POS>(position));
+	}
+	Sci::Position StartRun(Sci::Position position) const noexcept override {
+		return rs.StartRun(static_cast<POS>(position));
+	}
+	Sci::Position EndRun(Sci::Position position) const noexcept override {
+		return rs.EndRun(static_cast<POS>(position));
+	}
+	void SetValueAt(Sci::Position position, int value) override {
+		rs.SetValueAt(static_cast<POS>(position), value);
+	}
+	void InsertSpace(Sci::Position position, Sci::Position insertLength) override {
+		rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength));
+	}
+	Sci::Position Runs() const noexcept override {
+		return rs.Runs();
+	}
+};
+
+template <typename POS>
+class DecorationList : public IDecorationList {
+	int currentIndicator;
+	int currentValue;
+	Decoration<POS> *current;	// Cached so FillRange doesn't have to search for each call.
+	Sci::Position lengthDocument;
+	// Ordered by indicator
+	std::vector<std::unique_ptr<Decoration<POS>>> decorationList;
+	std::vector<const IDecoration*> decorationView;	// Read-only view of decorationList
+	bool clickNotified;
+
+	Decoration<POS> *DecorationFromIndicator(int indicator) noexcept;
+	Decoration<POS> *Create(int indicator, Sci::Position length);
+	void Delete(int indicator);
+	void DeleteAnyEmpty();
+	void SetView();
+public:
+
+	DecorationList();
+	~DecorationList() override;
+
+	const std::vector<const IDecoration*> &View() const noexcept override {
+		return decorationView;
+	}
+
+	void SetCurrentIndicator(int indicator) override;
+	int GetCurrentIndicator() const noexcept override { return currentIndicator; }
+
+	void SetCurrentValue(int value) override;
+	int GetCurrentValue() const noexcept override { return currentValue; }
+
+	// Returns changed=true if some values may have changed
+	FillResult<Sci::Position> FillRange(Sci::Position position, int value, Sci::Position fillLength) override;
+
+	void InsertSpace(Sci::Position position, Sci::Position insertLength) override;
+	void DeleteRange(Sci::Position position, Sci::Position deleteLength) override;
+
+	void DeleteLexerDecorations() override;
+
+	int AllOnFor(Sci::Position position) const noexcept override;
+	int ValueAt(int indicator, Sci::Position position) noexcept override;
+	Sci::Position Start(int indicator, Sci::Position position) noexcept override;
+	Sci::Position End(int indicator, Sci::Position position) noexcept override;
+
+	bool ClickNotified() const noexcept override {
+		return clickNotified;
+	}
+	void SetClickNotified(bool notified) noexcept override {
+		clickNotified = notified;
+	}
+};
+
+template <typename POS>
+DecorationList<POS>::DecorationList() : currentIndicator(0), currentValue(1), current(nullptr),
+	lengthDocument(0), clickNotified(false) {
+}
+
+template <typename POS>
+DecorationList<POS>::~DecorationList() {
+	current = nullptr;
+}
+
+template <typename POS>
+Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) noexcept {
+	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
+		if (deco->Indicator() == indicator) {
+			return deco.get();
+		}
+	}
+	return nullptr;
+}
+
+template <typename POS>
+Decoration<POS> *DecorationList<POS>::Create(int indicator, Sci::Position length) {
+	currentIndicator = indicator;
+	std::unique_ptr<Decoration<POS>> decoNew = std::make_unique<Decoration<POS>>(indicator);
+	decoNew->rs.InsertSpace(0, static_cast<POS>(length));
+
+	typename std::vector<std::unique_ptr<Decoration<POS>>>::iterator it = std::lower_bound(
+		decorationList.begin(), decorationList.end(), decoNew,
+		[](const std::unique_ptr<Decoration<POS>> &a, const std::unique_ptr<Decoration<POS>> &b) noexcept {
+		return a->Indicator() < b->Indicator();
+	});
+	typename std::vector<std::unique_ptr<Decoration<POS>>>::iterator itAdded =
+		decorationList.insert(it, std::move(decoNew));
+
+	SetView();
+
+	return itAdded->get();
+}
+
+template <typename POS>
+void DecorationList<POS>::Delete(int indicator) {
+	decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
+		[indicator](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
+		return deco->Indicator() == indicator;
+	}), decorationList.end());
+	current = nullptr;
+	SetView();
+}
+
+template <typename POS>
+void DecorationList<POS>::SetCurrentIndicator(int indicator) {
+	currentIndicator = indicator;
+	current = DecorationFromIndicator(indicator);
+	currentValue = 1;
+}
+
+template <typename POS>
+void DecorationList<POS>::SetCurrentValue(int value) {
+	currentValue = value ? value : 1;
+}
+
+template <typename POS>
+FillResult<Sci::Position> DecorationList<POS>::FillRange(Sci::Position position, int value, Sci::Position fillLength) {
+	if (!current) {
+		current = DecorationFromIndicator(currentIndicator);
+		if (!current) {
+			current = Create(currentIndicator, lengthDocument);
+		}
+	}
+	// Converting result from POS to Sci::Position as callers not polymorphic.
+	const FillResult<POS> frInPOS = current->rs.FillRange(static_cast<POS>(position), value, static_cast<POS>(fillLength));
+	const FillResult<Sci::Position> fr { frInPOS.changed, frInPOS.position, frInPOS.fillLength };
+		if (current->Empty()) {
+		Delete(currentIndicator);
+	}
+	return fr;
+}
+
+template <typename POS>
+void DecorationList<POS>::InsertSpace(Sci::Position position, Sci::Position insertLength) {
+	const bool atEnd = position == lengthDocument;
+	lengthDocument += insertLength;
+	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
+		deco->rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength));
+		if (atEnd) {
+			deco->rs.FillRange(static_cast<POS>(position), 0, static_cast<POS>(insertLength));
+		}
+	}
+}
+
+template <typename POS>
+void DecorationList<POS>::DeleteRange(Sci::Position position, Sci::Position deleteLength) {
+	lengthDocument -= deleteLength;
+	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
+		deco->rs.DeleteRange(static_cast<POS>(position), static_cast<POS>(deleteLength));
+	}
+	DeleteAnyEmpty();
+	if (decorationList.size() != decorationView.size()) {
+		// One or more empty decorations deleted so update view.
+		current = nullptr;
+		SetView();
+	}
+}
+
+template <typename POS>
+void DecorationList<POS>::DeleteLexerDecorations() {
+	decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
+		[](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
+		return deco->Indicator() < static_cast<int>(Scintilla::IndicatorNumbers::Container);
+	}), decorationList.end());
+	current = nullptr;
+	SetView();
+}
+
+template <typename POS>
+void DecorationList<POS>::DeleteAnyEmpty() {
+	if (lengthDocument == 0) {
+		decorationList.clear();
+	} else {
+		decorationList.erase(std::remove_if(decorationList.begin(), decorationList.end(),
+			[](const std::unique_ptr<Decoration<POS>> &deco) noexcept {
+			return deco->Empty();
+		}), decorationList.end());
+	}
+}
+
+template <typename POS>
+void DecorationList<POS>::SetView() {
+	decorationView.clear();
+	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
+		decorationView.push_back(deco.get());
+	}
+}
+
+template <typename POS>
+int DecorationList<POS>::AllOnFor(Sci::Position position) const noexcept {
+	int mask = 0;
+	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
+		if (deco->rs.ValueAt(static_cast<POS>(position))) {
+			if (deco->Indicator() < static_cast<int>(Scintilla::IndicatorNumbers::Ime)) {
+				mask |= 1 << deco->Indicator();
+			}
+		}
+	}
+	return mask;
+}
+
+template <typename POS>
+int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) noexcept {
+	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
+	if (deco) {
+		return deco->rs.ValueAt(static_cast<POS>(position));
+	}
+	return 0;
+}
+
+template <typename POS>
+Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) noexcept {
+	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
+	if (deco) {
+		return deco->rs.StartRun(static_cast<POS>(position));
+	}
+	return 0;
+}
+
+template <typename POS>
+Sci::Position DecorationList<POS>::End(int indicator, Sci::Position position) noexcept {
+	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
+	if (deco) {
+		return deco->rs.EndRun(static_cast<POS>(position));
+	}
+	return 0;
+}
+
+}
+
+namespace Scintilla::Internal {
+
+std::unique_ptr<IDecoration> DecorationCreate(bool largeDocument, int indicator) {
+	if (largeDocument)
+		return std::make_unique<Decoration<Sci::Position>>(indicator);
+	else
+		return std::make_unique<Decoration<int>>(indicator);
+}
+
+std::unique_ptr<IDecorationList> DecorationListCreate(bool largeDocument) {
+	if (largeDocument)
+		return std::make_unique<DecorationList<Sci::Position>>();
+	else
+		return std::make_unique<DecorationList<int>>();
+}
+
+}
+
diff --git a/scite-app/scintilla/src/Decoration.h b/scite-app/scintilla/src/Decoration.h
new file mode 100644
index 0000000..c8faafe
--- /dev/null
+++ b/scite-app/scintilla/src/Decoration.h
@@ -0,0 +1,59 @@
+/** @file Decoration.h
+ ** Visual elements added over text.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DECORATION_H
+#define DECORATION_H
+
+namespace Scintilla::Internal {
+
+class IDecoration {
+public:
+	virtual ~IDecoration() {}
+	virtual bool Empty() const noexcept = 0;
+	virtual int Indicator() const noexcept = 0;
+	virtual Sci::Position Length() const noexcept = 0;
+	virtual int ValueAt(Sci::Position position) const noexcept = 0;
+	virtual Sci::Position StartRun(Sci::Position position) const noexcept = 0;
+	virtual Sci::Position EndRun(Sci::Position position) const noexcept = 0;
+	virtual void SetValueAt(Sci::Position position, int value) = 0;
+	virtual void InsertSpace(Sci::Position position, Sci::Position insertLength) = 0;
+	virtual Sci::Position Runs() const noexcept = 0;
+};
+
+class IDecorationList {
+public:
+	virtual ~IDecorationList() {}
+
+	virtual const std::vector<const IDecoration*> &View() const noexcept = 0;
+
+	virtual void SetCurrentIndicator(int indicator) = 0;
+	virtual int GetCurrentIndicator() const noexcept = 0;
+
+	virtual void SetCurrentValue(int value) = 0;
+	virtual int GetCurrentValue() const noexcept = 0;
+
+	// Returns with changed=true if some values may have changed
+	virtual FillResult<Sci::Position> FillRange(Sci::Position position, int value, Sci::Position fillLength) = 0;
+	virtual void InsertSpace(Sci::Position position, Sci::Position insertLength) = 0;
+	virtual void DeleteRange(Sci::Position position, Sci::Position deleteLength) = 0;
+	virtual void DeleteLexerDecorations() = 0;
+
+	virtual int AllOnFor(Sci::Position position) const noexcept = 0;
+	virtual int ValueAt(int indicator, Sci::Position position) noexcept = 0;
+	virtual Sci::Position Start(int indicator, Sci::Position position) noexcept = 0;
+	virtual Sci::Position End(int indicator, Sci::Position position) noexcept = 0;
+
+	virtual bool ClickNotified() const noexcept = 0;
+	virtual void SetClickNotified(bool notified) noexcept = 0;
+};
+
+std::unique_ptr<IDecoration> DecorationCreate(bool largeDocument, int indicator);
+
+std::unique_ptr<IDecorationList> DecorationListCreate(bool largeDocument);
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Document.cxx b/scite-app/scintilla/src/Document.cxx
new file mode 100644
index 0000000..b5ec9a2
--- /dev/null
+++ b/scite-app/scintilla/src/Document.cxx
@@ -0,0 +1,3410 @@
+// Scintilla source code edit control
+/** @file Document.cxx
+ ** Text document that handles notifications, DBCS, styling, words and end of line.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+
+#ifndef NO_CXX11_REGEX
+#include <regex>
+#endif
+
+#include "ScintillaTypes.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "RESearch.h"
+#include "UniConversion.h"
+#include "ElapsedPeriod.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+void LexInterface::Colourise(Sci::Position start, Sci::Position end) {
+	if (pdoc && instance && !performingStyle) {
+		// Protect against reentrance, which may occur, for example, when
+		// fold points are discovered while performing styling and the folding
+		// code looks for child lines which may trigger styling.
+		performingStyle = true;
+
+		const Sci::Position lengthDoc = pdoc->Length();
+		if (end == -1)
+			end = lengthDoc;
+		const Sci::Position len = end - start;
+
+		PLATFORM_ASSERT(len >= 0);
+		PLATFORM_ASSERT(start + len <= lengthDoc);
+
+		int styleStart = 0;
+		if (start > 0)
+			styleStart = pdoc->StyleAt(start - 1);
+
+		if (len > 0) {
+			instance->Lex(start, len, styleStart, pdoc);
+			instance->Fold(start, len, styleStart, pdoc);
+		}
+
+		performingStyle = false;
+	}
+}
+
+LineEndType LexInterface::LineEndTypesSupported() {
+	if (instance) {
+		return static_cast<LineEndType>(instance->LineEndTypesSupported());
+	}
+	return LineEndType::Default;
+}
+
+ActionDuration::ActionDuration(double duration_, double minDuration_, double maxDuration_) noexcept :
+	duration(duration_), minDuration(minDuration_), maxDuration(maxDuration_) {
+}
+
+void ActionDuration::AddSample(size_t numberActions, double durationOfActions) noexcept {
+	// Only adjust for multiple actions to avoid instability
+	if (numberActions < 8)
+		return;
+
+	// Alpha value for exponential smoothing.
+	// Most recent value contributes 25% to smoothed value.
+	constexpr double alpha = 0.25;
+
+	const double durationOne = durationOfActions / numberActions;
+	duration = std::clamp(alpha * durationOne + (1.0 - alpha) * duration,
+		minDuration, maxDuration);
+}
+
+double ActionDuration::Duration() const noexcept {
+	return duration;
+}
+
+size_t ActionDuration::ActionsInAllowedTime(double secondsAllowed) const noexcept {
+	return std::lround(secondsAllowed / Duration());
+}
+
+Document::Document(DocumentOption options) :
+	cb(!FlagSet(options, DocumentOption::StylesNone), FlagSet(options, DocumentOption::TextLarge)),
+	durationStyleOneByte(0.000001, 0.0000001, 0.00001) {
+	refCount = 0;
+#ifdef _WIN32
+	eolMode = EndOfLine::CrLf;
+#else
+	eolMode = EndOfLine::Lf;
+#endif
+	dbcsCodePage = CpUtf8;
+	lineEndBitSet = LineEndType::Default;
+	endStyled = 0;
+	styleClock = 0;
+	enteredModification = 0;
+	enteredStyling = 0;
+	enteredReadOnlyCount = 0;
+	insertionSet = false;
+	tabInChars = 8;
+	indentInChars = 0;
+	actualIndentInChars = 8;
+	useTabs = true;
+	tabIndents = true;
+	backspaceUnindents = false;
+
+	matchesValid = false;
+
+	perLineData[ldMarkers] = std::make_unique<LineMarkers>();
+	perLineData[ldLevels] = std::make_unique<LineLevels>();
+	perLineData[ldState] = std::make_unique<LineState>();
+	perLineData[ldMargin] = std::make_unique<LineAnnotation>();
+	perLineData[ldAnnotation] = std::make_unique<LineAnnotation>();
+	perLineData[ldEOLAnnotation] = std::make_unique<LineAnnotation>();
+
+	decorations = DecorationListCreate(IsLarge());
+
+	cb.SetPerLine(this);
+	cb.SetUTF8Substance(CpUtf8 == dbcsCodePage);
+}
+
+Document::~Document() {
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifyDeleted(this, watcher.userData);
+	}
+}
+
+// Increase reference count and return its previous value.
+int Document::AddRef() {
+	return refCount++;
+}
+
+// Decrease reference count and return its previous value.
+// Delete the document if reference count reaches zero.
+int SCI_METHOD Document::Release() {
+	const int curRefCount = --refCount;
+	if (curRefCount == 0)
+		delete this;
+	return curRefCount;
+}
+
+void Document::Init() {
+	for (const std::unique_ptr<PerLine> &pl : perLineData) {
+		if (pl)
+			pl->Init();
+	}
+}
+
+void Document::InsertLine(Sci::Line line) {
+	for (const std::unique_ptr<PerLine> &pl : perLineData) {
+		if (pl)
+			pl->InsertLine(line);
+	}
+}
+
+void Document::InsertLines(Sci::Line line, Sci::Line lines) {
+	for (const auto &pl : perLineData) {
+		if (pl)
+			pl->InsertLines(line, lines);
+	}
+}
+
+void Document::RemoveLine(Sci::Line line) {
+	for (const std::unique_ptr<PerLine> &pl : perLineData) {
+		if (pl)
+			pl->RemoveLine(line);
+	}
+}
+
+LineMarkers *Document::Markers() const noexcept {
+	return dynamic_cast<LineMarkers *>(perLineData[ldMarkers].get());
+}
+
+LineLevels *Document::Levels() const noexcept {
+	return dynamic_cast<LineLevels *>(perLineData[ldLevels].get());
+}
+
+LineState *Document::States() const noexcept {
+	return dynamic_cast<LineState *>(perLineData[ldState].get());
+}
+
+LineAnnotation *Document::Margins() const noexcept {
+	return dynamic_cast<LineAnnotation *>(perLineData[ldMargin].get());
+}
+
+LineAnnotation *Document::Annotations() const noexcept {
+	return dynamic_cast<LineAnnotation *>(perLineData[ldAnnotation].get());
+}
+
+LineAnnotation *Document::EOLAnnotations() const noexcept {
+	return dynamic_cast<LineAnnotation *>(perLineData[ldEOLAnnotation].get());
+}
+
+LineEndType Document::LineEndTypesSupported() const {
+	if ((CpUtf8 == dbcsCodePage) && pli)
+		return pli->LineEndTypesSupported();
+	else
+		return LineEndType::Default;
+}
+
+bool Document::SetDBCSCodePage(int dbcsCodePage_) {
+	if (dbcsCodePage != dbcsCodePage_) {
+		dbcsCodePage = dbcsCodePage_;
+		SetCaseFolder(nullptr);
+		cb.SetLineEndTypes(lineEndBitSet & LineEndTypesSupported());
+		cb.SetUTF8Substance(CpUtf8 == dbcsCodePage);
+		ModifiedAt(0);	// Need to restyle whole document
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool Document::SetLineEndTypesAllowed(LineEndType lineEndBitSet_) {
+	if (lineEndBitSet != lineEndBitSet_) {
+		lineEndBitSet = lineEndBitSet_;
+		const LineEndType lineEndBitSetActive = lineEndBitSet & LineEndTypesSupported();
+		if (lineEndBitSetActive != cb.GetLineEndTypes()) {
+			ModifiedAt(0);
+			cb.SetLineEndTypes(lineEndBitSetActive);
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return false;
+	}
+}
+
+void Document::SetSavePoint() {
+	cb.SetSavePoint();
+	NotifySavePoint(true);
+}
+
+void Document::TentativeUndo() {
+	if (!TentativeActive())
+		return;
+	CheckReadOnly();
+	if (enteredModification == 0) {
+		enteredModification++;
+		if (!cb.IsReadOnly()) {
+			const bool startSavePoint = cb.IsSavePoint();
+			bool multiLine = false;
+			const int steps = cb.TentativeSteps();
+			//Platform::DebugPrintf("Steps=%d\n", steps);
+			for (int step = 0; step < steps; step++) {
+				const Sci::Line prevLinesTotal = LinesTotal();
+				const Action &action = cb.GetUndoStep();
+				if (action.at == ActionType::remove) {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeInsert | ModificationFlags::Undo, action));
+				} else if (action.at == ActionType::container) {
+					DocModification dm(ModificationFlags::Container | ModificationFlags::Undo);
+					dm.token = action.position;
+					NotifyModified(dm);
+				} else {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeDelete | ModificationFlags::Undo, action));
+				}
+				cb.PerformUndoStep();
+				if (action.at != ActionType::container) {
+					ModifiedAt(action.position);
+				}
+
+				ModificationFlags modFlags = ModificationFlags::Undo;
+				// With undo, an insertion action becomes a deletion notification
+				if (action.at == ActionType::remove) {
+					modFlags |= ModificationFlags::InsertText;
+				} else if (action.at == ActionType::insert) {
+					modFlags |= ModificationFlags::DeleteText;
+				}
+				if (steps > 1)
+					modFlags |= ModificationFlags::MultiStepUndoRedo;
+				const Sci::Line linesAdded = LinesTotal() - prevLinesTotal;
+				if (linesAdded != 0)
+					multiLine = true;
+				if (step == steps - 1) {
+					modFlags |= ModificationFlags::LastStepInUndoRedo;
+					if (multiLine)
+						modFlags |= ModificationFlags::MultilineUndoRedo;
+				}
+				NotifyModified(DocModification(modFlags, action.position, action.lenData,
+											   linesAdded, action.data.get()));
+			}
+
+			const bool endSavePoint = cb.IsSavePoint();
+			if (startSavePoint != endSavePoint)
+				NotifySavePoint(endSavePoint);
+
+			cb.TentativeCommit();
+		}
+		enteredModification--;
+	}
+}
+
+int Document::GetMark(Sci::Line line) const noexcept {
+	return Markers()->MarkValue(line);
+}
+
+Sci::Line Document::MarkerNext(Sci::Line lineStart, int mask) const noexcept {
+	return Markers()->MarkerNext(lineStart, mask);
+}
+
+int Document::AddMark(Sci::Line line, int markerNum) {
+	if (line >= 0 && line <= LinesTotal()) {
+		const int prev = Markers()->AddMark(line, markerNum, LinesTotal());
+		const DocModification mh(ModificationFlags::ChangeMarker, LineStart(line), 0, 0, nullptr, line);
+		NotifyModified(mh);
+		return prev;
+	} else {
+		return -1;
+	}
+}
+
+void Document::AddMarkSet(Sci::Line line, int valueSet) {
+	if (line < 0 || line > LinesTotal()) {
+		return;
+	}
+	unsigned int m = valueSet;
+	for (int i = 0; m; i++, m >>= 1) {
+		if (m & 1)
+			Markers()->AddMark(line, i, LinesTotal());
+	}
+	const DocModification mh(ModificationFlags::ChangeMarker, LineStart(line), 0, 0, nullptr, line);
+	NotifyModified(mh);
+}
+
+void Document::DeleteMark(Sci::Line line, int markerNum) {
+	Markers()->DeleteMark(line, markerNum, false);
+	const DocModification mh(ModificationFlags::ChangeMarker, LineStart(line), 0, 0, nullptr, line);
+	NotifyModified(mh);
+}
+
+void Document::DeleteMarkFromHandle(int markerHandle) {
+	Markers()->DeleteMarkFromHandle(markerHandle);
+	DocModification mh(ModificationFlags::ChangeMarker);
+	mh.line = -1;
+	NotifyModified(mh);
+}
+
+void Document::DeleteAllMarks(int markerNum) {
+	bool someChanges = false;
+	for (Sci::Line line = 0; line < LinesTotal(); line++) {
+		if (Markers()->DeleteMark(line, markerNum, true))
+			someChanges = true;
+	}
+	if (someChanges) {
+		DocModification mh(ModificationFlags::ChangeMarker);
+		mh.line = -1;
+		NotifyModified(mh);
+	}
+}
+
+Sci::Line Document::LineFromHandle(int markerHandle) const noexcept {
+	return Markers()->LineFromHandle(markerHandle);
+}
+
+int Document::MarkerNumberFromLine(Sci::Line line, int which) const noexcept {
+	return Markers()->NumberFromLine(line, which);
+}
+
+int Document::MarkerHandleFromLine(Sci::Line line, int which) const noexcept {
+	return Markers()->HandleFromLine(line, which);
+}
+
+Sci_Position SCI_METHOD Document::LineStart(Sci_Position line) const {
+	return cb.LineStart(line);
+}
+
+bool Document::IsLineStartPosition(Sci::Position position) const {
+	return LineStart(LineFromPosition(position)) == position;
+}
+
+Sci_Position SCI_METHOD Document::LineEnd(Sci_Position line) const {
+	if (line >= LinesTotal() - 1) {
+		return LineStart(line + 1);
+	} else {
+		Sci::Position position = LineStart(line + 1);
+		if (LineEndType::Unicode == cb.GetLineEndTypes()) {
+			const unsigned char bytes[] = {
+				cb.UCharAt(position-3),
+				cb.UCharAt(position-2),
+				cb.UCharAt(position-1),
+			};
+			if (UTF8IsSeparator(bytes)) {
+				return position - UTF8SeparatorLength;
+			}
+			if (UTF8IsNEL(bytes+1)) {
+				return position - UTF8NELLength;
+			}
+		}
+		position--; // Back over CR or LF
+		// When line terminator is CR+LF, may need to go back one more
+		if ((position > LineStart(line)) && (cb.CharAt(position - 1) == '\r')) {
+			position--;
+		}
+		return position;
+	}
+}
+
+void SCI_METHOD Document::SetErrorStatus(int status) {
+	// Tell the watchers an error has occurred.
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifyErrorOccurred(this, watcher.userData, static_cast<Status>(status));
+	}
+}
+
+Sci_Position SCI_METHOD Document::LineFromPosition(Sci_Position pos) const {
+	return cb.LineFromPosition(pos);
+}
+
+Sci::Line Document::SciLineFromPosition(Sci::Position pos) const noexcept {
+	// Avoids casting in callers for this very common function
+	return cb.LineFromPosition(pos);
+}
+
+Sci::Position Document::LineEndPosition(Sci::Position position) const {
+	return LineEnd(LineFromPosition(position));
+}
+
+bool Document::IsLineEndPosition(Sci::Position position) const {
+	return LineEnd(LineFromPosition(position)) == position;
+}
+
+bool Document::IsPositionInLineEnd(Sci::Position position) const {
+	return position >= LineEnd(LineFromPosition(position));
+}
+
+Sci::Position Document::VCHomePosition(Sci::Position position) const {
+	const Sci::Line line = SciLineFromPosition(position);
+	const Sci::Position startPosition = LineStart(line);
+	const Sci::Position endLine = LineEnd(line);
+	Sci::Position startText = startPosition;
+	while (startText < endLine && (cb.CharAt(startText) == ' ' || cb.CharAt(startText) == '\t'))
+		startText++;
+	if (position == startText)
+		return startPosition;
+	else
+		return startText;
+}
+
+Sci::Position Document::IndexLineStart(Sci::Line line, LineCharacterIndexType lineCharacterIndex) const noexcept {
+	return cb.IndexLineStart(line, lineCharacterIndex);
+}
+
+Sci::Line Document::LineFromPositionIndex(Sci::Position pos, LineCharacterIndexType lineCharacterIndex) const noexcept {
+	return cb.LineFromPositionIndex(pos, lineCharacterIndex);
+}
+
+Sci::Line Document::LineFromPositionAfter(Sci::Line line, Sci::Position length) const noexcept {
+	const Sci::Position posAfter = cb.LineStart(line) + length;
+	if (posAfter >= LengthNoExcept()) {
+		return LinesTotal();
+	}
+	const Sci::Line lineAfter = SciLineFromPosition(posAfter);
+	if (lineAfter > line) {
+		return lineAfter;
+	} else {
+		// Want to make some progress so return next line
+		return lineAfter + 1;
+	}
+}
+
+int SCI_METHOD Document::SetLevel(Sci_Position line, int level) {
+	const int prev = Levels()->SetLevel(line, level, LinesTotal());
+	if (prev != level) {
+		DocModification mh(ModificationFlags::ChangeFold | ModificationFlags::ChangeMarker,
+		                   LineStart(line), 0, 0, nullptr, line);
+		mh.foldLevelNow = static_cast<FoldLevel>(level);
+		mh.foldLevelPrev = static_cast<FoldLevel>(prev);
+		NotifyModified(mh);
+	}
+	return prev;
+}
+
+int SCI_METHOD Document::GetLevel(Sci_Position line) const {
+	return Levels()->GetLevel(line);
+}
+
+FoldLevel Document::GetFoldLevel(Sci_Position line) const {
+	return static_cast<FoldLevel>(Levels()->GetLevel(line));
+}
+
+void Document::ClearLevels() {
+	Levels()->ClearLevels();
+}
+
+static bool IsSubordinate(FoldLevel levelStart, FoldLevel levelTry) noexcept {
+	if (LevelIsWhitespace(levelTry))
+		return true;
+	else
+		return LevelNumber(levelStart) < LevelNumber(levelTry);
+}
+
+Sci::Line Document::GetLastChild(Sci::Line lineParent, std::optional<FoldLevel> level, Sci::Line lastLine) {
+	const FoldLevel levelStart = LevelNumberPart(level ? *level : GetFoldLevel(lineParent));
+	const Sci::Line maxLine = LinesTotal();
+	const Sci::Line lookLastLine = (lastLine != -1) ? std::min(LinesTotal() - 1, lastLine) : -1;
+	Sci::Line lineMaxSubord = lineParent;
+	while (lineMaxSubord < maxLine - 1) {
+		EnsureStyledTo(LineStart(lineMaxSubord + 2));
+		if (!IsSubordinate(levelStart, GetFoldLevel(lineMaxSubord + 1)))
+			break;
+		if ((lookLastLine != -1) && (lineMaxSubord >= lookLastLine) && !LevelIsWhitespace(GetFoldLevel(lineMaxSubord)))
+			break;
+		lineMaxSubord++;
+	}
+	if (lineMaxSubord > lineParent) {
+		if (levelStart > LevelNumberPart(GetFoldLevel(lineMaxSubord + 1))) {
+			// Have chewed up some whitespace that belongs to a parent so seek back
+			if (LevelIsWhitespace(GetFoldLevel(lineMaxSubord))) {
+				lineMaxSubord--;
+			}
+		}
+	}
+	return lineMaxSubord;
+}
+
+Sci::Line Document::GetFoldParent(Sci::Line line) const {
+	const FoldLevel level = LevelNumberPart(GetFoldLevel(line));
+	Sci::Line lineLook = line - 1;
+	while ((lineLook > 0) && (
+	            (!LevelIsHeader(GetFoldLevel(lineLook))) ||
+	            (LevelNumberPart(GetFoldLevel(lineLook)) >= level))
+	      ) {
+		lineLook--;
+	}
+	if (LevelIsHeader(GetFoldLevel(lineLook)) &&
+	        (LevelNumberPart(GetFoldLevel(lineLook)) < level)) {
+		return lineLook;
+	} else {
+		return -1;
+	}
+}
+
+void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine) {
+	const FoldLevel level = GetFoldLevel(line);
+	const Sci::Line lookLastLine = std::max(line, lastLine) + 1;
+
+	Sci::Line lookLine = line;
+	FoldLevel lookLineLevel = level;
+	FoldLevel lookLineLevelNum = LevelNumberPart(lookLineLevel);
+	while ((lookLine > 0) && (LevelIsWhitespace(lookLineLevel) ||
+		(LevelIsHeader(lookLineLevel) && (lookLineLevelNum >= LevelNumberPart(GetFoldLevel(lookLine + 1)))))) {
+		lookLineLevel = GetFoldLevel(--lookLine);
+		lookLineLevelNum = LevelNumberPart(lookLineLevel);
+	}
+
+	Sci::Line beginFoldBlock = LevelIsHeader(lookLineLevel) ? lookLine : GetFoldParent(lookLine);
+	if (beginFoldBlock == -1) {
+		highlightDelimiter.Clear();
+		return;
+	}
+
+	Sci::Line endFoldBlock = GetLastChild(beginFoldBlock, {}, lookLastLine);
+	Sci::Line firstChangeableLineBefore = -1;
+	if (endFoldBlock < line) {
+		lookLine = beginFoldBlock - 1;
+		lookLineLevel = GetFoldLevel(lookLine);
+		lookLineLevelNum = LevelNumberPart(lookLineLevel);
+		while ((lookLine >= 0) && (lookLineLevelNum >= FoldLevel::Base)) {
+			if (LevelIsHeader(lookLineLevel)) {
+				if (GetLastChild(lookLine, {}, lookLastLine) == line) {
+					beginFoldBlock = lookLine;
+					endFoldBlock = line;
+					firstChangeableLineBefore = line - 1;
+				}
+			}
+			if ((lookLine > 0) && (lookLineLevelNum == FoldLevel::Base) && (LevelNumberPart(GetFoldLevel(lookLine - 1)) > lookLineLevelNum))
+				break;
+			lookLineLevel = GetFoldLevel(--lookLine);
+			lookLineLevelNum = LevelNumberPart(lookLineLevel);
+		}
+	}
+	if (firstChangeableLineBefore == -1) {
+		for (lookLine = line - 1, lookLineLevel = GetFoldLevel(lookLine), lookLineLevelNum = LevelNumberPart(lookLineLevel);
+			lookLine >= beginFoldBlock;
+			lookLineLevel = GetFoldLevel(--lookLine), lookLineLevelNum = LevelNumberPart(lookLineLevel)) {
+			if (LevelIsWhitespace(lookLineLevel) || (lookLineLevelNum > LevelNumberPart(level))) {
+				firstChangeableLineBefore = lookLine;
+				break;
+			}
+		}
+	}
+	if (firstChangeableLineBefore == -1)
+		firstChangeableLineBefore = beginFoldBlock - 1;
+
+	Sci::Line firstChangeableLineAfter = -1;
+	for (lookLine = line + 1, lookLineLevel = GetFoldLevel(lookLine), lookLineLevelNum = LevelNumberPart(lookLineLevel);
+		lookLine <= endFoldBlock;
+		lookLineLevel = GetFoldLevel(++lookLine), lookLineLevelNum = LevelNumberPart(lookLineLevel)) {
+		if (LevelIsHeader(lookLineLevel) && (lookLineLevelNum < LevelNumberPart(GetFoldLevel(lookLine + 1)))) {
+			firstChangeableLineAfter = lookLine;
+			break;
+		}
+	}
+	if (firstChangeableLineAfter == -1)
+		firstChangeableLineAfter = endFoldBlock + 1;
+
+	highlightDelimiter.beginFoldBlock = beginFoldBlock;
+	highlightDelimiter.endFoldBlock = endFoldBlock;
+	highlightDelimiter.firstChangeableLineBefore = firstChangeableLineBefore;
+	highlightDelimiter.firstChangeableLineAfter = firstChangeableLineAfter;
+}
+
+Sci::Position Document::ClampPositionIntoDocument(Sci::Position pos) const noexcept {
+	return std::clamp<Sci::Position>(pos, 0, LengthNoExcept());
+}
+
+bool Document::IsCrLf(Sci::Position pos) const noexcept {
+	if (pos < 0)
+		return false;
+	if (pos >= (LengthNoExcept() - 1))
+		return false;
+	return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n');
+}
+
+int Document::LenChar(Sci::Position pos) const noexcept {
+	if (pos < 0 || pos >= LengthNoExcept()) {
+		// Returning 1 instead of 0 to defend against hanging with a loop that goes (or starts) out of bounds.
+		return 1;
+	} else if (IsCrLf(pos)) {
+		return 2;
+	}
+
+	const unsigned char leadByte = cb.UCharAt(pos);
+	if (!dbcsCodePage || UTF8IsAscii(leadByte)) {
+		// Common case: ASCII character
+		return 1;
+	}
+	if (CpUtf8 == dbcsCodePage) {
+		const int widthCharBytes = UTF8BytesOfLead[leadByte];
+		unsigned char charBytes[UTF8MaxBytes] = { leadByte, 0, 0, 0 };
+		for (int b = 1; b < widthCharBytes; b++) {
+			charBytes[b] = cb.UCharAt(pos + b);
+		}
+		const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+		if (utf8status & UTF8MaskInvalid) {
+			// Treat as invalid and use up just one byte
+			return 1;
+		} else {
+			return utf8status & UTF8MaskWidth;
+		}
+	} else {
+		if (IsDBCSLeadByteNoExcept(leadByte) && IsDBCSTrailByteNoExcept(cb.CharAt(pos + 1))) {
+			return 2;
+		} else {
+			return 1;
+		}
+	}
+}
+
+bool Document::InGoodUTF8(Sci::Position pos, Sci::Position &start, Sci::Position &end) const noexcept {
+	Sci::Position trail = pos;
+	while ((trail>0) && (pos-trail < UTF8MaxBytes) && UTF8IsTrailByte(cb.UCharAt(trail-1)))
+		trail--;
+	start = (trail > 0) ? trail-1 : trail;
+
+	const unsigned char leadByte = cb.UCharAt(start);
+	const int widthCharBytes = UTF8BytesOfLead[leadByte];
+	if (widthCharBytes == 1) {
+		return false;
+	} else {
+		const int trailBytes = widthCharBytes - 1;
+		const Sci::Position len = pos - start;
+		if (len > trailBytes)
+			// pos too far from lead
+			return false;
+		unsigned char charBytes[UTF8MaxBytes] = {leadByte,0,0,0};
+		for (Sci::Position b=1; b<widthCharBytes && ((start+b) < cb.Length()); b++)
+			charBytes[b] = cb.CharAt(start+b);
+		const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+		if (utf8status & UTF8MaskInvalid)
+			return false;
+		end = start + widthCharBytes;
+		return true;
+	}
+}
+
+// Normalise a position so that it is not part way through a multi-byte character.
+// This can occur in two situations -
+// When lines are terminated with \r\n pairs which should be treated as one character.
+// When displaying DBCS text such as Japanese.
+// If moving, move the position in the indicated direction.
+Sci::Position Document::MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd) const noexcept {
+	//Platform::DebugPrintf("NoCRLF %d %d\n", pos, moveDir);
+	// If out of range, just return minimum/maximum value.
+	if (pos <= 0)
+		return 0;
+	if (pos >= LengthNoExcept())
+		return LengthNoExcept();
+
+	// PLATFORM_ASSERT(pos > 0 && pos < LengthNoExcept());
+	if (checkLineEnd && IsCrLf(pos - 1)) {
+		if (moveDir > 0)
+			return pos + 1;
+		else
+			return pos - 1;
+	}
+
+	if (dbcsCodePage) {
+		if (CpUtf8 == dbcsCodePage) {
+			const unsigned char ch = cb.UCharAt(pos);
+			// If ch is not a trail byte then pos is valid intercharacter position
+			if (UTF8IsTrailByte(ch)) {
+				Sci::Position startUTF = pos;
+				Sci::Position endUTF = pos;
+				if (InGoodUTF8(pos, startUTF, endUTF)) {
+					// ch is a trail byte within a UTF-8 character
+					if (moveDir > 0)
+						pos = endUTF;
+					else
+						pos = startUTF;
+				}
+				// Else invalid UTF-8 so return position of isolated trail byte
+			}
+		} else {
+			// Anchor DBCS calculations at start of line because start of line can
+			// not be a DBCS trail byte.
+			const Sci::Position posStartLine = cb.LineStart(cb.LineFromPosition(pos));
+			if (pos == posStartLine)
+				return pos;
+
+			// Step back until a non-lead-byte is found.
+			Sci::Position posCheck = pos;
+			while ((posCheck > posStartLine) && IsDBCSLeadByteNoExcept(cb.CharAt(posCheck-1)))
+				posCheck--;
+
+			// Check from known start of character.
+			while (posCheck < pos) {
+				const int mbsize = IsDBCSDualByteAt(posCheck) ? 2 : 1;
+				if (posCheck + mbsize == pos) {
+					return pos;
+				} else if (posCheck + mbsize > pos) {
+					if (moveDir > 0) {
+						return posCheck + mbsize;
+					} else {
+						return posCheck;
+					}
+				}
+				posCheck += mbsize;
+			}
+		}
+	}
+
+	return pos;
+}
+
+// NextPosition moves between valid positions - it can not handle a position in the middle of a
+// multi-byte character. It is used to iterate through text more efficiently than MovePositionOutsideChar.
+// A \r\n pair is treated as two characters.
+Sci::Position Document::NextPosition(Sci::Position pos, int moveDir) const noexcept {
+	// If out of range, just return minimum/maximum value.
+	const int increment = (moveDir > 0) ? 1 : -1;
+	if (pos + increment <= 0)
+		return 0;
+	if (pos + increment >= cb.Length())
+		return cb.Length();
+
+	if (dbcsCodePage) {
+		if (CpUtf8 == dbcsCodePage) {
+			if (increment == 1) {
+				// Simple forward movement case so can avoid some checks
+				const unsigned char leadByte = cb.UCharAt(pos);
+				if (UTF8IsAscii(leadByte)) {
+					// Single byte character or invalid
+					pos++;
+				} else {
+					const int widthCharBytes = UTF8BytesOfLead[leadByte];
+					unsigned char charBytes[UTF8MaxBytes] = {leadByte,0,0,0};
+					for (int b=1; b<widthCharBytes; b++)
+						charBytes[b] = cb.CharAt(pos+b);
+					const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+					if (utf8status & UTF8MaskInvalid)
+						pos++;
+					else
+						pos += utf8status & UTF8MaskWidth;
+				}
+			} else {
+				// Examine byte before position
+				pos--;
+				const unsigned char ch = cb.UCharAt(pos);
+				// If ch is not a trail byte then pos is valid intercharacter position
+				if (UTF8IsTrailByte(ch)) {
+					// If ch is a trail byte in a valid UTF-8 character then return start of character
+					Sci::Position startUTF = pos;
+					Sci::Position endUTF = pos;
+					if (InGoodUTF8(pos, startUTF, endUTF)) {
+						pos = startUTF;
+					}
+					// Else invalid UTF-8 so return position of isolated trail byte
+				}
+			}
+		} else {
+			if (moveDir > 0) {
+				const int mbsize = IsDBCSDualByteAt(pos) ? 2 : 1;
+				pos += mbsize;
+				if (pos > cb.Length())
+					pos = cb.Length();
+			} else {
+				// Anchor DBCS calculations at start of line because start of line can
+				// not be a DBCS trail byte.
+				const Sci::Position posStartLine = cb.LineStart(cb.LineFromPosition(pos));
+				// See http://msdn.microsoft.com/en-us/library/cc194792%28v=MSDN.10%29.aspx
+				// http://msdn.microsoft.com/en-us/library/cc194790.aspx
+				if ((pos - 1) <= posStartLine) {
+					return pos - 1;
+				} else if (IsDBCSLeadByteNoExcept(cb.CharAt(pos - 1))) {
+					// Should actually be trail byte
+					if (IsDBCSDualByteAt(pos - 2)) {
+						return pos - 2;
+					} else {
+						// Invalid byte pair so treat as one byte wide
+						return pos - 1;
+					}
+				} else {
+					// Otherwise, step back until a non-lead-byte is found.
+					Sci::Position posTemp = pos - 1;
+					while (posStartLine <= --posTemp && IsDBCSLeadByteNoExcept(cb.CharAt(posTemp)))
+						;
+					// Now posTemp+1 must point to the beginning of a character,
+					// so figure out whether we went back an even or an odd
+					// number of bytes and go back 1 or 2 bytes, respectively.
+					const Sci::Position widthLast = ((pos - posTemp) & 1) + 1;
+					if ((widthLast == 2) && (IsDBCSDualByteAt(pos - widthLast))) {
+						return pos - widthLast;
+					}
+					// Byte before pos may be valid character or may be an invalid second byte
+					return pos - 1;
+				}
+			}
+		}
+	} else {
+		pos += increment;
+	}
+
+	return pos;
+}
+
+bool Document::NextCharacter(Sci::Position &pos, int moveDir) const noexcept {
+	// Returns true if pos changed
+	Sci::Position posNext = NextPosition(pos, moveDir);
+	if (posNext == pos) {
+		return false;
+	} else {
+		pos = posNext;
+		return true;
+	}
+}
+
+Document::CharacterExtracted Document::CharacterAfter(Sci::Position position) const noexcept {
+	if (position >= LengthNoExcept()) {
+		return CharacterExtracted(unicodeReplacementChar, 0);
+	}
+	const unsigned char leadByte = cb.UCharAt(position);
+	if (!dbcsCodePage || UTF8IsAscii(leadByte)) {
+		// Common case: ASCII character
+		return CharacterExtracted(leadByte, 1);
+	}
+	if (CpUtf8 == dbcsCodePage) {
+		const int widthCharBytes = UTF8BytesOfLead[leadByte];
+		unsigned char charBytes[UTF8MaxBytes] = { leadByte, 0, 0, 0 };
+		for (int b = 1; b<widthCharBytes; b++)
+			charBytes[b] = cb.UCharAt(position + b);
+		const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+		if (utf8status & UTF8MaskInvalid) {
+			// Treat as invalid and use up just one byte
+			return CharacterExtracted(unicodeReplacementChar, 1);
+		} else {
+			return CharacterExtracted(UnicodeFromUTF8(charBytes), utf8status & UTF8MaskWidth);
+		}
+	} else {
+		if (IsDBCSLeadByteNoExcept(leadByte)) {
+			const unsigned char trailByte = cb.UCharAt(position + 1);
+			if (IsDBCSTrailByteNoExcept(trailByte)) {
+				return CharacterExtracted::DBCS(leadByte, trailByte);
+			}
+		}
+		return CharacterExtracted(leadByte, 1);
+	}
+}
+
+Document::CharacterExtracted Document::CharacterBefore(Sci::Position position) const noexcept {
+	if (position <= 0) {
+		return CharacterExtracted(unicodeReplacementChar, 0);
+	}
+	const unsigned char previousByte = cb.UCharAt(position - 1);
+	if (0 == dbcsCodePage) {
+		return CharacterExtracted(previousByte, 1);
+	}
+	if (CpUtf8 == dbcsCodePage) {
+		if (UTF8IsAscii(previousByte)) {
+			return CharacterExtracted(previousByte, 1);
+		}
+		position--;
+		// If previousByte is not a trail byte then its invalid
+		if (UTF8IsTrailByte(previousByte)) {
+			// If previousByte is a trail byte in a valid UTF-8 character then find start of character
+			Sci::Position startUTF = position;
+			Sci::Position endUTF = position;
+			if (InGoodUTF8(position, startUTF, endUTF)) {
+				const Sci::Position widthCharBytes = endUTF - startUTF;
+				unsigned char charBytes[UTF8MaxBytes] = { 0, 0, 0, 0 };
+				for (Sci::Position b = 0; b<widthCharBytes; b++)
+					charBytes[b] = cb.UCharAt(startUTF + b);
+				const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+				if (utf8status & UTF8MaskInvalid) {
+					// Treat as invalid and use up just one byte
+					return CharacterExtracted(unicodeReplacementChar, 1);
+				} else {
+					return CharacterExtracted(UnicodeFromUTF8(charBytes), utf8status & UTF8MaskWidth);
+				}
+			}
+			// Else invalid UTF-8 so return position of isolated trail byte
+		}
+		return CharacterExtracted(unicodeReplacementChar, 1);
+	} else {
+		// Moving backwards in DBCS is complex so use NextPosition
+		const Sci::Position posStartCharacter = NextPosition(position, -1);
+		return CharacterAfter(posStartCharacter);
+	}
+}
+
+// Return -1  on out-of-bounds
+Sci_Position SCI_METHOD Document::GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const {
+	Sci::Position pos = positionStart;
+	if (dbcsCodePage) {
+		const int increment = (characterOffset > 0) ? 1 : -1;
+		while (characterOffset != 0) {
+			const Sci::Position posNext = NextPosition(pos, increment);
+			if (posNext == pos)
+				return Sci::invalidPosition;
+			pos = posNext;
+			characterOffset -= increment;
+		}
+	} else {
+		pos = positionStart + characterOffset;
+		if ((pos < 0) || (pos > Length()))
+			return Sci::invalidPosition;
+	}
+	return pos;
+}
+
+Sci::Position Document::GetRelativePositionUTF16(Sci::Position positionStart, Sci::Position characterOffset) const noexcept {
+	Sci::Position pos = positionStart;
+	if (dbcsCodePage) {
+		const int increment = (characterOffset > 0) ? 1 : -1;
+		while (characterOffset != 0) {
+			const Sci::Position posNext = NextPosition(pos, increment);
+			if (posNext == pos)
+				return Sci::invalidPosition;
+			if (std::abs(pos-posNext) > 3)	// 4 byte character = 2*UTF16.
+				characterOffset -= increment;
+			pos = posNext;
+			characterOffset -= increment;
+		}
+	} else {
+		pos = positionStart + characterOffset;
+		if ((pos < 0) || (pos > LengthNoExcept()))
+			return Sci::invalidPosition;
+	}
+	return pos;
+}
+
+int SCI_METHOD Document::GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const {
+	int bytesInCharacter = 1;
+	const unsigned char leadByte = cb.UCharAt(position);
+	int character = leadByte;
+	if (dbcsCodePage && !UTF8IsAscii(leadByte)) {
+		if (CpUtf8 == dbcsCodePage) {
+			const int widthCharBytes = UTF8BytesOfLead[leadByte];
+			unsigned char charBytes[UTF8MaxBytes] = {leadByte,0,0,0};
+			for (int b=1; b<widthCharBytes; b++)
+				charBytes[b] = cb.UCharAt(position+b);
+			const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+			if (utf8status & UTF8MaskInvalid) {
+				// Report as singleton surrogate values which are invalid Unicode
+				character =  0xDC80 + leadByte;
+			} else {
+				bytesInCharacter = utf8status & UTF8MaskWidth;
+				character = UnicodeFromUTF8(charBytes);
+			}
+		} else {
+			if (IsDBCSLeadByteNoExcept(leadByte)) {
+				const unsigned char trailByte = cb.UCharAt(position + 1);
+				if (IsDBCSTrailByteNoExcept(trailByte)) {
+					bytesInCharacter = 2;
+					character = (leadByte << 8) | trailByte;
+				}
+			}
+		}
+	}
+	if (pWidth) {
+		*pWidth = bytesInCharacter;
+	}
+	return character;
+}
+
+int SCI_METHOD Document::CodePage() const {
+	return dbcsCodePage;
+}
+
+bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const {
+	// Used by lexers so must match IDocument method exactly
+	return IsDBCSLeadByteNoExcept(ch);
+}
+
+bool Document::IsDBCSLeadByteNoExcept(char ch) const noexcept {
+	// Used inside core Scintilla
+	// Byte ranges found in Wikipedia articles with relevant search strings in each case
+	const unsigned char uch = ch;
+	switch (dbcsCodePage) {
+		case 932:
+			// Shift_jis
+			return ((uch >= 0x81) && (uch <= 0x9F)) ||
+				((uch >= 0xE0) && (uch <= 0xFC));
+				// Lead bytes F0 to FC may be a Microsoft addition.
+		case 936:
+			// GBK
+			return (uch >= 0x81) && (uch <= 0xFE);
+		case 949:
+			// Korean Wansung KS C-5601-1987
+			return (uch >= 0x81) && (uch <= 0xFE);
+		case 950:
+			// Big5
+			return (uch >= 0x81) && (uch <= 0xFE);
+		case 1361:
+			// Korean Johab KS C-5601-1992
+			return
+				((uch >= 0x84) && (uch <= 0xD3)) ||
+				((uch >= 0xD8) && (uch <= 0xDE)) ||
+				((uch >= 0xE0) && (uch <= 0xF9));
+	}
+	return false;
+}
+
+bool Document::IsDBCSTrailByteNoExcept(char ch) const noexcept {
+	const unsigned char trail = ch;
+	switch (dbcsCodePage) {
+	case 932:
+		// Shift_jis
+		return (trail != 0x7F) &&
+			((trail >= 0x40) && (trail <= 0xFC));
+	case 936:
+		// GBK
+		return (trail != 0x7F) &&
+			((trail >= 0x40) && (trail <= 0xFE));
+	case 949:
+		// Korean Wansung KS C-5601-1987
+		return
+			((trail >= 0x41) && (trail <= 0x5A)) ||
+			((trail >= 0x61) && (trail <= 0x7A)) ||
+			((trail >= 0x81) && (trail <= 0xFE));
+	case 950:
+		// Big5
+		return
+			((trail >= 0x40) && (trail <= 0x7E)) ||
+			((trail >= 0xA1) && (trail <= 0xFE));
+	case 1361:
+		// Korean Johab KS C-5601-1992
+		return
+			((trail >= 0x31) && (trail <= 0x7E)) ||
+			((trail >= 0x81) && (trail <= 0xFE));
+	}
+	return false;
+}
+
+int Document::DBCSDrawBytes(std::string_view text) const noexcept {
+	if (text.length() <= 1) {
+		return static_cast<int>(text.length());
+	}
+	if (IsDBCSLeadByteNoExcept(text[0])) {
+		return IsDBCSTrailByteNoExcept(text[1]) ? 2 : 1;
+	} else {
+		return 1;
+	}
+}
+
+bool Document::IsDBCSDualByteAt(Sci::Position pos) const noexcept {
+	return IsDBCSLeadByteNoExcept(cb.CharAt(pos))
+		&& IsDBCSTrailByteNoExcept(cb.CharAt(pos + 1));
+}
+
+static constexpr bool IsSpaceOrTab(int ch) noexcept {
+	return ch == ' ' || ch == '\t';
+}
+
+// Need to break text into segments near lengthSegment but taking into
+// account the encoding to not break inside a UTF-8 or DBCS character
+// and also trying to avoid breaking inside a pair of combining characters.
+// The segment length must always be long enough (more than 4 bytes)
+// so that there will be at least one whole character to make a segment.
+// For UTF-8, text must consist only of valid whole characters.
+// In preference order from best to worst:
+//   1) Break after space
+//   2) Break before punctuation
+//   3) Break after whole character
+
+int Document::SafeSegment(const char *text, int length, int lengthSegment) const noexcept {
+	if (length <= lengthSegment)
+		return length;
+	int lastSpaceBreak = -1;
+	int lastPunctuationBreak = -1;
+	int lastEncodingAllowedBreak = 0;
+	for (int j=0; j < lengthSegment;) {
+		const unsigned char ch = text[j];
+		if (j > 0) {
+			if (IsSpaceOrTab(text[j - 1]) && !IsSpaceOrTab(text[j])) {
+				lastSpaceBreak = j;
+			}
+			if (ch < 'A') {
+				lastPunctuationBreak = j;
+			}
+		}
+		lastEncodingAllowedBreak = j;
+
+		if (dbcsCodePage == CpUtf8) {
+			j += UTF8BytesOfLead[ch];
+		} else if (dbcsCodePage) {
+			j += IsDBCSLeadByteNoExcept(ch) ? 2 : 1;
+		} else {
+			j++;
+		}
+	}
+	if (lastSpaceBreak >= 0) {
+		return lastSpaceBreak;
+	} else if (lastPunctuationBreak >= 0) {
+		return lastPunctuationBreak;
+	}
+	return lastEncodingAllowedBreak;
+}
+
+EncodingFamily Document::CodePageFamily() const noexcept {
+	if (CpUtf8 == dbcsCodePage)
+		return EncodingFamily::unicode;
+	else if (dbcsCodePage)
+		return EncodingFamily::dbcs;
+	else
+		return EncodingFamily::eightBit;
+}
+
+void Document::ModifiedAt(Sci::Position pos) noexcept {
+	if (endStyled > pos)
+		endStyled = pos;
+}
+
+void Document::CheckReadOnly() {
+	if (cb.IsReadOnly() && enteredReadOnlyCount == 0) {
+		enteredReadOnlyCount++;
+		NotifyModifyAttempt();
+		enteredReadOnlyCount--;
+	}
+}
+
+// Document only modified by gateways DeleteChars, InsertString, Undo, Redo, and SetStyleAt.
+// SetStyleAt does not change the persistent state of a document
+
+bool Document::DeleteChars(Sci::Position pos, Sci::Position len) {
+	if (pos < 0)
+		return false;
+	if (len <= 0)
+		return false;
+	if ((pos + len) > LengthNoExcept())
+		return false;
+	CheckReadOnly();
+	if (enteredModification != 0) {
+		return false;
+	} else {
+		enteredModification++;
+		if (!cb.IsReadOnly()) {
+			NotifyModified(
+			    DocModification(
+			        ModificationFlags::BeforeDelete | ModificationFlags::User,
+			        pos, len,
+			        0, 0));
+			const Sci::Line prevLinesTotal = LinesTotal();
+			const bool startSavePoint = cb.IsSavePoint();
+			bool startSequence = false;
+			const char *text = cb.DeleteChars(pos, len, startSequence);
+			if (startSavePoint && cb.IsCollectingUndo())
+				NotifySavePoint(false);
+			if ((pos < LengthNoExcept()) || (pos == 0))
+				ModifiedAt(pos);
+			else
+				ModifiedAt(pos-1);
+			NotifyModified(
+			    DocModification(
+			        ModificationFlags::DeleteText | ModificationFlags::User |
+					(startSequence?ModificationFlags::StartAction:ModificationFlags::None),
+			        pos, len,
+			        LinesTotal() - prevLinesTotal, text));
+		}
+		enteredModification--;
+	}
+	return !cb.IsReadOnly();
+}
+
+/**
+ * Insert a string with a length.
+ */
+Sci::Position Document::InsertString(Sci::Position position, const char *s, Sci::Position insertLength) {
+	if (insertLength <= 0) {
+		return 0;
+	}
+	CheckReadOnly();	// Application may change read only state here
+	if (cb.IsReadOnly()) {
+		return 0;
+	}
+	if (enteredModification != 0) {
+		return 0;
+	}
+	enteredModification++;
+	insertionSet = false;
+	insertion.clear();
+	NotifyModified(
+		DocModification(
+			ModificationFlags::InsertCheck,
+			position, insertLength,
+			0, s));
+	if (insertionSet) {
+		s = insertion.c_str();
+		insertLength = insertion.length();
+	}
+	NotifyModified(
+		DocModification(
+			ModificationFlags::BeforeInsert | ModificationFlags::User,
+			position, insertLength,
+			0, s));
+	const Sci::Line prevLinesTotal = LinesTotal();
+	const bool startSavePoint = cb.IsSavePoint();
+	bool startSequence = false;
+	const char *text = cb.InsertString(position, s, insertLength, startSequence);
+	if (startSavePoint && cb.IsCollectingUndo())
+		NotifySavePoint(false);
+	ModifiedAt(position);
+	NotifyModified(
+		DocModification(
+			ModificationFlags::InsertText | ModificationFlags::User |
+			(startSequence?ModificationFlags::StartAction:ModificationFlags::None),
+			position, insertLength,
+			LinesTotal() - prevLinesTotal, text));
+	if (insertionSet) {	// Free memory as could be large
+		std::string().swap(insertion);
+	}
+	enteredModification--;
+	return insertLength;
+}
+
+void Document::ChangeInsertion(const char *s, Sci::Position length) {
+	insertionSet = true;
+	insertion.assign(s, length);
+}
+
+int SCI_METHOD Document::AddData(const char *data, Sci_Position length) {
+	try {
+		const Sci::Position position = Length();
+		InsertString(position, data, length);
+	} catch (std::bad_alloc &) {
+		return static_cast<int>(Status::BadAlloc);
+	} catch (...) {
+		return static_cast<int>(Status::Failure);
+	}
+	return static_cast<int>(Status::Ok);
+}
+
+void * SCI_METHOD Document::ConvertToDocument() {
+	return this;
+}
+
+Sci::Position Document::Undo() {
+	Sci::Position newPos = -1;
+	CheckReadOnly();
+	if ((enteredModification == 0) && (cb.IsCollectingUndo())) {
+		enteredModification++;
+		if (!cb.IsReadOnly()) {
+			const bool startSavePoint = cb.IsSavePoint();
+			bool multiLine = false;
+			const int steps = cb.StartUndo();
+			//Platform::DebugPrintf("Steps=%d\n", steps);
+			Sci::Position coalescedRemovePos = -1;
+			Sci::Position coalescedRemoveLen = 0;
+			Sci::Position prevRemoveActionPos = -1;
+			Sci::Position prevRemoveActionLen = 0;
+			for (int step = 0; step < steps; step++) {
+				const Sci::Line prevLinesTotal = LinesTotal();
+				const Action &action = cb.GetUndoStep();
+				if (action.at == ActionType::remove) {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeInsert | ModificationFlags::Undo, action));
+				} else if (action.at == ActionType::container) {
+					DocModification dm(ModificationFlags::Container | ModificationFlags::Undo);
+					dm.token = action.position;
+					NotifyModified(dm);
+					if (!action.mayCoalesce) {
+						coalescedRemovePos = -1;
+						coalescedRemoveLen = 0;
+						prevRemoveActionPos = -1;
+						prevRemoveActionLen = 0;
+					}
+				} else {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeDelete | ModificationFlags::Undo, action));
+				}
+				cb.PerformUndoStep();
+				if (action.at != ActionType::container) {
+					ModifiedAt(action.position);
+					newPos = action.position;
+				}
+
+				ModificationFlags modFlags = ModificationFlags::Undo;
+				// With undo, an insertion action becomes a deletion notification
+				if (action.at == ActionType::remove) {
+					newPos += action.lenData;
+					modFlags |= ModificationFlags::InsertText;
+					if ((coalescedRemoveLen > 0) &&
+						(action.position == prevRemoveActionPos || action.position == (prevRemoveActionPos + prevRemoveActionLen))) {
+						coalescedRemoveLen += action.lenData;
+						newPos = coalescedRemovePos + coalescedRemoveLen;
+					} else {
+						coalescedRemovePos = action.position;
+						coalescedRemoveLen = action.lenData;
+					}
+					prevRemoveActionPos = action.position;
+					prevRemoveActionLen = action.lenData;
+				} else if (action.at == ActionType::insert) {
+					modFlags |= ModificationFlags::DeleteText;
+					coalescedRemovePos = -1;
+					coalescedRemoveLen = 0;
+					prevRemoveActionPos = -1;
+					prevRemoveActionLen = 0;
+				}
+				if (steps > 1)
+					modFlags |= ModificationFlags::MultiStepUndoRedo;
+				const Sci::Line linesAdded = LinesTotal() - prevLinesTotal;
+				if (linesAdded != 0)
+					multiLine = true;
+				if (step == steps - 1) {
+					modFlags |= ModificationFlags::LastStepInUndoRedo;
+					if (multiLine)
+						modFlags |= ModificationFlags::MultilineUndoRedo;
+				}
+				NotifyModified(DocModification(modFlags, action.position, action.lenData,
+											   linesAdded, action.data.get()));
+			}
+
+			const bool endSavePoint = cb.IsSavePoint();
+			if (startSavePoint != endSavePoint)
+				NotifySavePoint(endSavePoint);
+		}
+		enteredModification--;
+	}
+	return newPos;
+}
+
+Sci::Position Document::Redo() {
+	Sci::Position newPos = -1;
+	CheckReadOnly();
+	if ((enteredModification == 0) && (cb.IsCollectingUndo())) {
+		enteredModification++;
+		if (!cb.IsReadOnly()) {
+			const bool startSavePoint = cb.IsSavePoint();
+			bool multiLine = false;
+			const int steps = cb.StartRedo();
+			for (int step = 0; step < steps; step++) {
+				const Sci::Line prevLinesTotal = LinesTotal();
+				const Action &action = cb.GetRedoStep();
+				if (action.at == ActionType::insert) {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeInsert | ModificationFlags::Redo, action));
+				} else if (action.at == ActionType::container) {
+					DocModification dm(ModificationFlags::Container | ModificationFlags::Redo);
+					dm.token = action.position;
+					NotifyModified(dm);
+				} else {
+					NotifyModified(DocModification(
+									ModificationFlags::BeforeDelete | ModificationFlags::Redo, action));
+				}
+				cb.PerformRedoStep();
+				if (action.at != ActionType::container) {
+					ModifiedAt(action.position);
+					newPos = action.position;
+				}
+
+				ModificationFlags modFlags = ModificationFlags::Redo;
+				if (action.at == ActionType::insert) {
+					newPos += action.lenData;
+					modFlags |= ModificationFlags::InsertText;
+				} else if (action.at == ActionType::remove) {
+					modFlags |= ModificationFlags::DeleteText;
+				}
+				if (steps > 1)
+					modFlags |= ModificationFlags::MultiStepUndoRedo;
+				const Sci::Line linesAdded = LinesTotal() - prevLinesTotal;
+				if (linesAdded != 0)
+					multiLine = true;
+				if (step == steps - 1) {
+					modFlags |= ModificationFlags::LastStepInUndoRedo;
+					if (multiLine)
+						modFlags |= ModificationFlags::MultilineUndoRedo;
+				}
+				NotifyModified(
+					DocModification(modFlags, action.position, action.lenData,
+									linesAdded, action.data.get()));
+			}
+
+			const bool endSavePoint = cb.IsSavePoint();
+			if (startSavePoint != endSavePoint)
+				NotifySavePoint(endSavePoint);
+		}
+		enteredModification--;
+	}
+	return newPos;
+}
+
+void Document::DelChar(Sci::Position pos) {
+	DeleteChars(pos, LenChar(pos));
+}
+
+void Document::DelCharBack(Sci::Position pos) {
+	if (pos <= 0) {
+		return;
+	} else if (IsCrLf(pos - 2)) {
+		DeleteChars(pos - 2, 2);
+	} else if (dbcsCodePage) {
+		const Sci::Position startChar = NextPosition(pos, -1);
+		DeleteChars(startChar, pos - startChar);
+	} else {
+		DeleteChars(pos - 1, 1);
+	}
+}
+
+static constexpr Sci::Position NextTab(Sci::Position pos, Sci::Position tabSize) noexcept {
+	return ((pos / tabSize) + 1) * tabSize;
+}
+
+static std::string CreateIndentation(Sci::Position indent, int tabSize, bool insertSpaces) {
+	std::string indentation;
+	if (!insertSpaces) {
+		while (indent >= tabSize) {
+			indentation += '\t';
+			indent -= tabSize;
+		}
+	}
+	while (indent > 0) {
+		indentation += ' ';
+		indent--;
+	}
+	return indentation;
+}
+
+int SCI_METHOD Document::GetLineIndentation(Sci_Position line) {
+	int indent = 0;
+	if ((line >= 0) && (line < LinesTotal())) {
+		const Sci::Position lineStart = LineStart(line);
+		const Sci::Position length = Length();
+		for (Sci::Position i = lineStart; i < length; i++) {
+			const char ch = cb.CharAt(i);
+			if (ch == ' ')
+				indent++;
+			else if (ch == '\t')
+				indent = static_cast<int>(NextTab(indent, tabInChars));
+			else
+				return indent;
+		}
+	}
+	return indent;
+}
+
+Sci::Position Document::SetLineIndentation(Sci::Line line, Sci::Position indent) {
+	const int indentOfLine = GetLineIndentation(line);
+	if (indent < 0)
+		indent = 0;
+	if (indent != indentOfLine) {
+		std::string linebuf = CreateIndentation(indent, tabInChars, !useTabs);
+		const Sci::Position thisLineStart = LineStart(line);
+		const Sci::Position indentPos = GetLineIndentPosition(line);
+		UndoGroup ug(this);
+		DeleteChars(thisLineStart, indentPos - thisLineStart);
+		return thisLineStart + InsertString(thisLineStart, linebuf.c_str(),
+			linebuf.length());
+	} else {
+		return GetLineIndentPosition(line);
+	}
+}
+
+Sci::Position Document::GetLineIndentPosition(Sci::Line line) const {
+	if (line < 0)
+		return 0;
+	Sci::Position pos = LineStart(line);
+	const Sci::Position length = Length();
+	while ((pos < length) && IsSpaceOrTab(cb.CharAt(pos))) {
+		pos++;
+	}
+	return pos;
+}
+
+Sci::Position Document::GetColumn(Sci::Position pos) {
+	Sci::Position column = 0;
+	const Sci::Line line = SciLineFromPosition(pos);
+	if ((line >= 0) && (line < LinesTotal())) {
+		for (Sci::Position i = LineStart(line); i < pos;) {
+			const char ch = cb.CharAt(i);
+			if (ch == '\t') {
+				column = NextTab(column, tabInChars);
+				i++;
+			} else if (ch == '\r') {
+				return column;
+			} else if (ch == '\n') {
+				return column;
+			} else if (i >= Length()) {
+				return column;
+			} else {
+				column++;
+				i = NextPosition(i, 1);
+			}
+		}
+	}
+	return column;
+}
+
+Sci::Position Document::CountCharacters(Sci::Position startPos, Sci::Position endPos) const noexcept {
+	startPos = MovePositionOutsideChar(startPos, 1, false);
+	endPos = MovePositionOutsideChar(endPos, -1, false);
+	Sci::Position count = 0;
+	Sci::Position i = startPos;
+	while (i < endPos) {
+		count++;
+		i = NextPosition(i, 1);
+	}
+	return count;
+}
+
+Sci::Position Document::CountUTF16(Sci::Position startPos, Sci::Position endPos) const noexcept {
+	startPos = MovePositionOutsideChar(startPos, 1, false);
+	endPos = MovePositionOutsideChar(endPos, -1, false);
+	Sci::Position count = 0;
+	Sci::Position i = startPos;
+	while (i < endPos) {
+		count++;
+		const Sci::Position next = NextPosition(i, 1);
+		if ((next - i) > 3)
+			count++;
+		i = next;
+	}
+	return count;
+}
+
+Sci::Position Document::FindColumn(Sci::Line line, Sci::Position column) {
+	Sci::Position position = LineStart(line);
+	if ((line >= 0) && (line < LinesTotal())) {
+		Sci::Position columnCurrent = 0;
+		while ((columnCurrent < column) && (position < Length())) {
+			const char ch = cb.CharAt(position);
+			if (ch == '\t') {
+				columnCurrent = NextTab(columnCurrent, tabInChars);
+				if (columnCurrent > column)
+					return position;
+				position++;
+			} else if (ch == '\r') {
+				return position;
+			} else if (ch == '\n') {
+				return position;
+			} else {
+				columnCurrent++;
+				position = NextPosition(position, 1);
+			}
+		}
+	}
+	return position;
+}
+
+void Document::Indent(bool forwards, Sci::Line lineBottom, Sci::Line lineTop) {
+	// Dedent - suck white space off the front of the line to dedent by equivalent of a tab
+	for (Sci::Line line = lineBottom; line >= lineTop; line--) {
+		const Sci::Position indentOfLine = GetLineIndentation(line);
+		if (forwards) {
+			if (LineStart(line) < LineEnd(line)) {
+				SetLineIndentation(line, indentOfLine + IndentSize());
+			}
+		} else {
+			SetLineIndentation(line, indentOfLine - IndentSize());
+		}
+	}
+}
+
+// Convert line endings for a piece of text to a particular mode.
+// Stop at len or when a NUL is found.
+std::string Document::TransformLineEnds(const char *s, size_t len, EndOfLine eolModeWanted) {
+	std::string dest;
+	for (size_t i = 0; (i < len) && (s[i]); i++) {
+		if (s[i] == '\n' || s[i] == '\r') {
+			if (eolModeWanted == EndOfLine::Cr) {
+				dest.push_back('\r');
+			} else if (eolModeWanted == EndOfLine::Lf) {
+				dest.push_back('\n');
+			} else { // eolModeWanted == EndOfLine::CrLf
+				dest.push_back('\r');
+				dest.push_back('\n');
+			}
+			if ((s[i] == '\r') && (i+1 < len) && (s[i+1] == '\n')) {
+				i++;
+			}
+		} else {
+			dest.push_back(s[i]);
+		}
+	}
+	return dest;
+}
+
+void Document::ConvertLineEnds(EndOfLine eolModeSet) {
+	UndoGroup ug(this);
+
+	for (Sci::Position pos = 0; pos < Length(); pos++) {
+		if (cb.CharAt(pos) == '\r') {
+			if (cb.CharAt(pos + 1) == '\n') {
+				// CRLF
+				if (eolModeSet == EndOfLine::Cr) {
+					DeleteChars(pos + 1, 1); // Delete the LF
+				} else if (eolModeSet == EndOfLine::Lf) {
+					DeleteChars(pos, 1); // Delete the CR
+				} else {
+					pos++;
+				}
+			} else {
+				// CR
+				if (eolModeSet == EndOfLine::CrLf) {
+					pos += InsertString(pos + 1, "\n", 1); // Insert LF
+				} else if (eolModeSet == EndOfLine::Lf) {
+					pos += InsertString(pos, "\n", 1); // Insert LF
+					DeleteChars(pos, 1); // Delete CR
+					pos--;
+				}
+			}
+		} else if (cb.CharAt(pos) == '\n') {
+			// LF
+			if (eolModeSet == EndOfLine::CrLf) {
+				pos += InsertString(pos, "\r", 1); // Insert CR
+			} else if (eolModeSet == EndOfLine::Cr) {
+				pos += InsertString(pos, "\r", 1); // Insert CR
+				DeleteChars(pos, 1); // Delete LF
+				pos--;
+			}
+		}
+	}
+
+}
+
+DocumentOption Document::Options() const noexcept {
+	return (IsLarge() ? DocumentOption::TextLarge : DocumentOption::Default) |
+		(cb.HasStyles() ? DocumentOption::Default : DocumentOption::StylesNone);
+}
+
+bool Document::IsWhiteLine(Sci::Line line) const {
+	Sci::Position currentChar = LineStart(line);
+	const Sci::Position endLine = LineEnd(line);
+	while (currentChar < endLine) {
+		if (!IsSpaceOrTab(cb.CharAt(currentChar))) {
+			return false;
+		}
+		++currentChar;
+	}
+	return true;
+}
+
+Sci::Position Document::ParaUp(Sci::Position pos) const {
+	Sci::Line line = SciLineFromPosition(pos);
+	line--;
+	while (line >= 0 && IsWhiteLine(line)) { // skip empty lines
+		line--;
+	}
+	while (line >= 0 && !IsWhiteLine(line)) { // skip non-empty lines
+		line--;
+	}
+	line++;
+	return LineStart(line);
+}
+
+Sci::Position Document::ParaDown(Sci::Position pos) const {
+	Sci::Line line = SciLineFromPosition(pos);
+	while (line < LinesTotal() && !IsWhiteLine(line)) { // skip non-empty lines
+		line++;
+	}
+	while (line < LinesTotal() && IsWhiteLine(line)) { // skip empty lines
+		line++;
+	}
+	if (line < LinesTotal())
+		return LineStart(line);
+	else // end of a document
+		return LineEnd(line-1);
+}
+
+CharacterClass Document::WordCharacterClass(unsigned int ch) const {
+	if (dbcsCodePage && (ch >= 0x80)) {
+		if (CpUtf8 == dbcsCodePage) {
+			// Use hard coded Unicode class
+			const CharacterCategory cc = charMap.CategoryFor(ch);
+			switch (cc) {
+
+				// Separator, Line/Paragraph
+			case ccZl:
+			case ccZp:
+				return CharacterClass::newLine;
+
+				// Separator, Space
+			case ccZs:
+				// Other
+			case ccCc:
+			case ccCf:
+			case ccCs:
+			case ccCo:
+			case ccCn:
+				return CharacterClass::space;
+
+				// Letter
+			case ccLu:
+			case ccLl:
+			case ccLt:
+			case ccLm:
+			case ccLo:
+				// Number
+			case ccNd:
+			case ccNl:
+			case ccNo:
+				// Mark - includes combining diacritics
+			case ccMn:
+			case ccMc:
+			case ccMe:
+				return CharacterClass::word;
+
+				// Punctuation
+			case ccPc:
+			case ccPd:
+			case ccPs:
+			case ccPe:
+			case ccPi:
+			case ccPf:
+			case ccPo:
+				// Symbol
+			case ccSm:
+			case ccSc:
+			case ccSk:
+			case ccSo:
+				return CharacterClass::punctuation;
+
+			}
+		} else {
+			// Asian DBCS
+			return CharacterClass::word;
+		}
+	}
+	return charClass.GetClass(static_cast<unsigned char>(ch));
+}
+
+/**
+ * Used by commands that want to select whole words.
+ * Finds the start of word at pos when delta < 0 or the end of the word when delta >= 0.
+ */
+Sci::Position Document::ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters) const {
+	CharacterClass ccStart = CharacterClass::word;
+	if (delta < 0) {
+		if (!onlyWordCharacters) {
+			const CharacterExtracted ce = CharacterBefore(pos);
+			ccStart = WordCharacterClass(ce.character);
+		}
+		while (pos > 0) {
+			const CharacterExtracted ce = CharacterBefore(pos);
+			if (WordCharacterClass(ce.character) != ccStart)
+				break;
+			pos -= ce.widthBytes;
+		}
+	} else {
+		if (!onlyWordCharacters && pos < LengthNoExcept()) {
+			const CharacterExtracted ce = CharacterAfter(pos);
+			ccStart = WordCharacterClass(ce.character);
+		}
+		while (pos < LengthNoExcept()) {
+			const CharacterExtracted ce = CharacterAfter(pos);
+			if (WordCharacterClass(ce.character) != ccStart)
+				break;
+			pos += ce.widthBytes;
+		}
+	}
+	return MovePositionOutsideChar(pos, delta, true);
+}
+
+/**
+ * Find the start of the next word in either a forward (delta >= 0) or backwards direction
+ * (delta < 0).
+ * This is looking for a transition between character classes although there is also some
+ * additional movement to transit white space.
+ * Used by cursor movement by word commands.
+ */
+Sci::Position Document::NextWordStart(Sci::Position pos, int delta) const {
+	if (delta < 0) {
+		while (pos > 0) {
+			const CharacterExtracted ce = CharacterBefore(pos);
+			if (WordCharacterClass(ce.character) != CharacterClass::space)
+				break;
+			pos -= ce.widthBytes;
+		}
+		if (pos > 0) {
+			CharacterExtracted ce = CharacterBefore(pos);
+			const CharacterClass ccStart = WordCharacterClass(ce.character);
+			while (pos > 0) {
+				ce = CharacterBefore(pos);
+				if (WordCharacterClass(ce.character) != ccStart)
+					break;
+				pos -= ce.widthBytes;
+			}
+		}
+	} else {
+		CharacterExtracted ce = CharacterAfter(pos);
+		const CharacterClass ccStart = WordCharacterClass(ce.character);
+		while (pos < LengthNoExcept()) {
+			ce = CharacterAfter(pos);
+			if (WordCharacterClass(ce.character) != ccStart)
+				break;
+			pos += ce.widthBytes;
+		}
+		while (pos < LengthNoExcept()) {
+			ce = CharacterAfter(pos);
+			if (WordCharacterClass(ce.character) != CharacterClass::space)
+				break;
+			pos += ce.widthBytes;
+		}
+	}
+	return pos;
+}
+
+/**
+ * Find the end of the next word in either a forward (delta >= 0) or backwards direction
+ * (delta < 0).
+ * This is looking for a transition between character classes although there is also some
+ * additional movement to transit white space.
+ * Used by cursor movement by word commands.
+ */
+Sci::Position Document::NextWordEnd(Sci::Position pos, int delta) const {
+	if (delta < 0) {
+		if (pos > 0) {
+			CharacterExtracted ce = CharacterBefore(pos);
+			const CharacterClass ccStart = WordCharacterClass(ce.character);
+			if (ccStart != CharacterClass::space) {
+				while (pos > 0) {
+					ce = CharacterBefore(pos);
+					if (WordCharacterClass(ce.character) != ccStart)
+						break;
+					pos -= ce.widthBytes;
+				}
+			}
+			while (pos > 0) {
+				ce = CharacterBefore(pos);
+				if (WordCharacterClass(ce.character) != CharacterClass::space)
+					break;
+				pos -= ce.widthBytes;
+			}
+		}
+	} else {
+		while (pos < LengthNoExcept()) {
+			const CharacterExtracted ce = CharacterAfter(pos);
+			if (WordCharacterClass(ce.character) != CharacterClass::space)
+				break;
+			pos += ce.widthBytes;
+		}
+		if (pos < LengthNoExcept()) {
+			CharacterExtracted ce = CharacterAfter(pos);
+			const CharacterClass ccStart = WordCharacterClass(ce.character);
+			while (pos < LengthNoExcept()) {
+				ce = CharacterAfter(pos);
+				if (WordCharacterClass(ce.character) != ccStart)
+					break;
+				pos += ce.widthBytes;
+			}
+		}
+	}
+	return pos;
+}
+
+namespace {
+
+constexpr bool IsWordEdge(CharacterClass cc, CharacterClass ccNext) noexcept {
+	return (cc != ccNext) &&
+		(cc == CharacterClass::word || cc == CharacterClass::punctuation);
+}
+
+}
+
+/**
+ * Check that the character at the given position is a word or punctuation character and that
+ * the previous character is of a different character class.
+ */
+bool Document::IsWordStartAt(Sci::Position pos) const {
+	if (pos >= LengthNoExcept())
+		return false;
+	if (pos >= 0) {
+		const CharacterExtracted cePos = CharacterAfter(pos);
+		// At start of document, treat as if space before so can be word start
+		const CharacterExtracted cePrev = (pos > 0) ?
+			CharacterBefore(pos) : CharacterExtracted(' ', 1);
+		return IsWordEdge(WordCharacterClass(cePos.character), WordCharacterClass(cePrev.character));
+	}
+	return true;
+}
+
+/**
+ * Check that the character before the given position is a word or punctuation character and that
+ * the next character is of a different character class.
+ */
+bool Document::IsWordEndAt(Sci::Position pos) const {
+	if (pos <= 0)
+		return false;
+	if (pos <= LengthNoExcept()) {
+		// At end of document, treat as if space after so can be word end
+		const CharacterExtracted cePos = (pos < LengthNoExcept()) ?
+			CharacterAfter(pos) : CharacterExtracted(' ', 1);
+		const CharacterExtracted cePrev = CharacterBefore(pos);
+		return IsWordEdge(WordCharacterClass(cePrev.character), WordCharacterClass(cePos.character));
+	}
+	return true;
+}
+
+/**
+ * Check that the given range is has transitions between character classes at both
+ * ends and where the characters on the inside are word or punctuation characters.
+ */
+bool Document::IsWordAt(Sci::Position start, Sci::Position end) const {
+	return (start < end) && IsWordStartAt(start) && IsWordEndAt(end);
+}
+
+bool Document::MatchesWordOptions(bool word, bool wordStart, Sci::Position pos, Sci::Position length) const {
+	return (!word && !wordStart) ||
+			(word && IsWordAt(pos, pos + length)) ||
+			(wordStart && IsWordStartAt(pos));
+}
+
+bool Document::HasCaseFolder() const noexcept {
+	return pcf != nullptr;
+}
+
+void Document::SetCaseFolder(std::unique_ptr<CaseFolder> pcf_) noexcept {
+	pcf = std::move(pcf_);
+}
+
+Document::CharacterExtracted Document::ExtractCharacter(Sci::Position position) const noexcept {
+	const unsigned char leadByte = cb.UCharAt(position);
+	if (UTF8IsAscii(leadByte)) {
+		// Common case: ASCII character
+		return CharacterExtracted(leadByte, 1);
+	}
+	const int widthCharBytes = UTF8BytesOfLead[leadByte];
+	unsigned char charBytes[UTF8MaxBytes] = { leadByte, 0, 0, 0 };
+	for (int b=1; b<widthCharBytes; b++)
+		charBytes[b] = cb.UCharAt(position + b);
+	const int utf8status = UTF8Classify(charBytes, widthCharBytes);
+	if (utf8status & UTF8MaskInvalid) {
+		// Treat as invalid and use up just one byte
+		return CharacterExtracted(unicodeReplacementChar, 1);
+	} else {
+		return CharacterExtracted(UnicodeFromUTF8(charBytes), utf8status & UTF8MaskWidth);
+	}
+}
+
+namespace {
+
+// Equivalent of memchr over the split view
+ptrdiff_t SplitFindChar(const SplitView &view, size_t start, size_t length, int ch) noexcept {
+	size_t range1Length = 0;
+	if (start < view.length1) {
+		range1Length = std::min(length, view.length1 - start);
+		const char *match = static_cast<const char *>(memchr(view.segment1 + start, ch, range1Length));
+		if (match) {
+			return match - view.segment1;
+		}
+		start += range1Length;
+	}
+	const char *match2 = static_cast<const char *>(memchr(view.segment2 + start, ch, length - range1Length));
+	if (match2) {
+		return match2 - view.segment2;
+	}
+	return -1;
+}
+
+// Equivalent of memcmp over the split view
+// This does not call memcmp as search texts are commonly too short to overcome the
+// call overhead.
+bool SplitMatch(const SplitView &view, size_t start, std::string_view text) noexcept {
+	for (size_t i = 0; i < text.length(); i++) {
+		if (view.CharAt(i + start) != text[i]) {
+			return false;
+		}
+	}
+	return true;
+}
+
+}
+
+/**
+ * Find text in document, supporting both forward and backward
+ * searches (just pass minPos > maxPos to do a backward search)
+ * Has not been tested with backwards DBCS searches yet.
+ */
+Sci::Position Document::FindText(Sci::Position minPos, Sci::Position maxPos, const char *search,
+                        FindOption flags, Sci::Position *length) {
+	if (*length <= 0)
+		return minPos;
+	const bool caseSensitive = FlagSet(flags, FindOption::MatchCase);
+	const bool word = FlagSet(flags, FindOption::WholeWord);
+	const bool wordStart = FlagSet(flags, FindOption::WordStart);
+	const bool regExp = FlagSet(flags, FindOption::RegExp);
+	if (regExp) {
+		if (!regex)
+			regex = std::unique_ptr<RegexSearchBase>(CreateRegexSearch(&charClass));
+		return regex->FindText(this, minPos, maxPos, search, caseSensitive, word, wordStart, flags, length);
+	} else {
+
+		const bool forward = minPos <= maxPos;
+		const int increment = forward ? 1 : -1;
+
+		// Range endpoints should not be inside DBCS characters, but just in case, move them.
+		const Sci::Position startPos = MovePositionOutsideChar(minPos, increment, false);
+		const Sci::Position endPos = MovePositionOutsideChar(maxPos, increment, false);
+
+		// Compute actual search ranges needed
+		const Sci::Position lengthFind = *length;
+
+		//Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind);
+		const Sci::Position limitPos = std::max(startPos, endPos);
+		Sci::Position pos = startPos;
+		if (!forward) {
+			// Back all of a character
+			pos = NextPosition(pos, increment);
+		}
+		const SplitView cbView = cb.AllView();
+		if (caseSensitive) {
+			const Sci::Position endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos;
+			const unsigned char charStartSearch =  search[0];
+			if (forward && ((0 == dbcsCodePage) || (CpUtf8 == dbcsCodePage && !UTF8IsTrailByte(charStartSearch)))) {
+				// This is a fast case where there is no need to test byte values to iterate
+				// so becomes the equivalent of a memchr+memcmp loop. 
+				// UTF-8 search will not be self-synchronizing when starts with trail byte
+				const std::string_view suffix(search + 1, lengthFind - 1);
+				while (pos < endSearch) {
+					pos = SplitFindChar(cbView, pos, limitPos - pos, charStartSearch);
+					if (pos < 0) {
+						break;
+					}
+					if (SplitMatch(cbView, pos + 1, suffix) && MatchesWordOptions(word, wordStart, pos, lengthFind)) {
+						return pos;
+					}
+					pos++;
+				}
+			} else {
+				while (forward ? (pos < endSearch) : (pos >= endSearch)) {
+					const unsigned char leadByte = cbView.CharAt(pos);
+					if (leadByte == charStartSearch) {
+						bool found = (pos + lengthFind) <= limitPos;
+						// SplitMatch could be called here but it is slower with g++ -O2
+						for (int indexSearch = 1; (indexSearch < lengthFind) && found; indexSearch++) {
+							found = cbView.CharAt(pos + indexSearch) == search[indexSearch];
+						}
+						if (found && MatchesWordOptions(word, wordStart, pos, lengthFind)) {
+							return pos;
+						}
+					}
+					if (forward && UTF8IsAscii(leadByte)) {
+						pos++;
+					} else {
+						if (dbcsCodePage) {
+							if (!NextCharacter(pos, increment)) {
+								break;
+							}
+						} else {
+							pos += increment;
+						}
+					}
+				}
+			}
+		} else if (CpUtf8 == dbcsCodePage) {
+			constexpr size_t maxFoldingExpansion = 4;
+			std::vector<char> searchThing((lengthFind+1) * UTF8MaxBytes * maxFoldingExpansion + 1);
+			const size_t lenSearch =
+				pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
+			while (forward ? (pos < endPos) : (pos >= endPos)) {
+				int widthFirstCharacter = 0;
+				Sci::Position posIndexDocument = pos;
+				size_t indexSearch = 0;
+				bool characterMatches = true;
+				for (;;) {
+					const unsigned char leadByte = cbView.CharAt(posIndexDocument);
+					char bytes[UTF8MaxBytes + 1];
+					int widthChar = 1;
+					if (!UTF8IsAscii(leadByte)) {
+						const int widthCharBytes = UTF8BytesOfLead[leadByte];
+						bytes[0] = leadByte;
+						for (int b=1; b<widthCharBytes; b++) {
+							bytes[b] = cbView.CharAt(posIndexDocument+b);
+						}
+						widthChar = UTF8Classify(reinterpret_cast<const unsigned char *>(bytes), widthCharBytes) & UTF8MaskWidth;
+					}
+					if (!widthFirstCharacter) {
+						widthFirstCharacter = widthChar;
+					}
+					if ((posIndexDocument + widthChar) > limitPos) {
+						break;
+					}
+					size_t lenFlat = 1;
+					if (widthChar == 1) {
+						characterMatches = searchThing[indexSearch] == MakeLowerCase(leadByte);
+					} else {
+						char folded[UTF8MaxBytes * maxFoldingExpansion + 1];
+						lenFlat = pcf->Fold(folded, sizeof(folded), bytes, widthChar);
+						// memcmp may examine lenFlat bytes in both arguments so assert it doesn't read past end of searchThing
+						assert((indexSearch + lenFlat) <= searchThing.size());
+						// Does folded match the buffer
+						characterMatches = 0 == memcmp(folded, &searchThing[0] + indexSearch, lenFlat);
+					}
+					if (!characterMatches) {
+						break;
+					}
+					posIndexDocument += widthChar;
+					indexSearch += lenFlat;
+					if (indexSearch >= lenSearch) {
+						break;
+					}
+				}
+				if (characterMatches && (indexSearch == lenSearch)) {
+					if (MatchesWordOptions(word, wordStart, pos, posIndexDocument - pos)) {
+						*length = posIndexDocument - pos;
+						return pos;
+					}
+				}
+				if (forward) {
+					pos += widthFirstCharacter;
+				} else {
+					if (!NextCharacter(pos, increment)) {
+						break;
+					}
+				}
+			}
+		} else if (dbcsCodePage) {
+			constexpr size_t maxBytesCharacter = 2;
+			constexpr size_t maxFoldingExpansion = 4;
+			std::vector<char> searchThing((lengthFind+1) * maxBytesCharacter * maxFoldingExpansion + 1);
+			const size_t lenSearch = pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
+			while (forward ? (pos < endPos) : (pos >= endPos)) {
+				int widthFirstCharacter = 0;
+				Sci::Position indexDocument = 0;
+				size_t indexSearch = 0;
+				bool characterMatches = true;
+				while (((pos + indexDocument) < limitPos) &&
+					(indexSearch < lenSearch)) {
+					const unsigned char leadByte = cbView.CharAt(pos + indexDocument);
+					const int widthChar = (!UTF8IsAscii(leadByte) && IsDBCSLeadByteNoExcept(leadByte)) ? 2 : 1;
+					if (!widthFirstCharacter) {
+						widthFirstCharacter = widthChar;
+					}
+					if ((pos + indexDocument + widthChar) > limitPos) {
+						break;
+					}
+					size_t lenFlat = 1;
+					if (widthChar == 1) {
+						characterMatches = searchThing[indexSearch] == MakeLowerCase(leadByte);
+					} else {
+						char bytes[maxBytesCharacter + 1];
+						bytes[0] = leadByte;
+						bytes[1] = cbView.CharAt(pos + indexDocument + 1);
+						char folded[maxBytesCharacter * maxFoldingExpansion + 1];
+						lenFlat = pcf->Fold(folded, sizeof(folded), bytes, widthChar);
+						// memcmp may examine lenFlat bytes in both arguments so assert it doesn't read past end of searchThing
+						assert((indexSearch + lenFlat) <= searchThing.size());
+						// Does folded match the buffer
+						characterMatches = 0 == memcmp(folded, &searchThing[0] + indexSearch, lenFlat);
+					}
+					if (!characterMatches) {
+						break;
+					}
+					indexDocument += widthChar;
+					indexSearch += lenFlat;
+				}
+				if (characterMatches && (indexSearch == lenSearch)) {
+					if (MatchesWordOptions(word, wordStart, pos, indexDocument)) {
+						*length = indexDocument;
+						return pos;
+					}
+				}
+				if (forward) {
+					pos += widthFirstCharacter;
+				} else {
+					if (!NextCharacter(pos, increment)) {
+						break;
+					}
+				}
+			}
+		} else {
+			const Sci::Position endSearch = (startPos <= endPos) ? endPos - lengthFind + 1 : endPos;
+			std::vector<char> searchThing(lengthFind + 1);
+			pcf->Fold(&searchThing[0], searchThing.size(), search, lengthFind);
+			while (forward ? (pos < endSearch) : (pos >= endSearch)) {
+				bool found = (pos + lengthFind) <= limitPos;
+				for (int indexSearch = 0; (indexSearch < lengthFind) && found; indexSearch++) {
+					const char ch = cbView.CharAt(pos + indexSearch);
+					const char chTest = searchThing[indexSearch];
+					if (UTF8IsAscii(ch)) {
+						found = chTest == MakeLowerCase(ch);
+					} else {
+						char folded[2];
+						pcf->Fold(folded, sizeof(folded), &ch, 1);
+						found = folded[0] == chTest;
+					}
+				}
+				if (found && MatchesWordOptions(word, wordStart, pos, lengthFind)) {
+					return pos;
+				}
+				pos += increment;
+			}
+		}
+	}
+	//Platform::DebugPrintf("Not found\n");
+	return -1;
+}
+
+const char *Document::SubstituteByPosition(const char *text, Sci::Position *length) {
+	if (regex)
+		return regex->SubstituteByPosition(this, text, length);
+	else
+		return nullptr;
+}
+
+LineCharacterIndexType Document::LineCharacterIndex() const noexcept {
+	return cb.LineCharacterIndex();
+}
+
+void Document::AllocateLineCharacterIndex(LineCharacterIndexType lineCharacterIndex) {
+	return cb.AllocateLineCharacterIndex(lineCharacterIndex);
+}
+
+void Document::ReleaseLineCharacterIndex(LineCharacterIndexType lineCharacterIndex) {
+	return cb.ReleaseLineCharacterIndex(lineCharacterIndex);
+}
+
+Sci::Line Document::LinesTotal() const noexcept {
+	return cb.Lines();
+}
+
+void Document::AllocateLines(Sci::Line lines) {
+	cb.AllocateLines(lines);
+}
+
+void Document::SetDefaultCharClasses(bool includeWordClass) {
+    charClass.SetDefaultCharClasses(includeWordClass);
+}
+
+void Document::SetCharClasses(const unsigned char *chars, CharacterClass newCharClass) {
+    charClass.SetCharClasses(chars, newCharClass);
+}
+
+int Document::GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const {
+    return charClass.GetCharsOfClass(characterClass, buffer);
+}
+
+void Document::SetCharacterCategoryOptimization(int countCharacters) {
+	charMap.Optimize(countCharacters);
+}
+
+int Document::CharacterCategoryOptimization() const noexcept {
+	return charMap.Size();
+}
+
+void SCI_METHOD Document::StartStyling(Sci_Position position) {
+	endStyled = position;
+}
+
+bool SCI_METHOD Document::SetStyleFor(Sci_Position length, char style) {
+	if (enteredStyling != 0) {
+		return false;
+	} else {
+		enteredStyling++;
+		const Sci::Position prevEndStyled = endStyled;
+		if (cb.SetStyleFor(endStyled, length, style)) {
+			const DocModification mh(ModificationFlags::ChangeStyle | ModificationFlags::User,
+			                   prevEndStyled, length);
+			NotifyModified(mh);
+		}
+		endStyled += length;
+		enteredStyling--;
+		return true;
+	}
+}
+
+bool SCI_METHOD Document::SetStyles(Sci_Position length, const char *styles) {
+	if (enteredStyling != 0) {
+		return false;
+	} else {
+		enteredStyling++;
+		bool didChange = false;
+		Sci::Position startMod = 0;
+		Sci::Position endMod = 0;
+		for (int iPos = 0; iPos < length; iPos++, endStyled++) {
+			PLATFORM_ASSERT(endStyled < Length());
+			if (cb.SetStyleAt(endStyled, styles[iPos])) {
+				if (!didChange) {
+					startMod = endStyled;
+				}
+				didChange = true;
+				endMod = endStyled;
+			}
+		}
+		if (didChange) {
+			const DocModification mh(ModificationFlags::ChangeStyle | ModificationFlags::User,
+			                   startMod, endMod - startMod + 1);
+			NotifyModified(mh);
+		}
+		enteredStyling--;
+		return true;
+	}
+}
+
+void Document::EnsureStyledTo(Sci::Position pos) {
+	if ((enteredStyling == 0) && (pos > GetEndStyled())) {
+		IncrementStyleClock();
+		if (pli && !pli->UseContainerLexing()) {
+			const Sci::Line lineEndStyled = SciLineFromPosition(GetEndStyled());
+			const Sci::Position endStyledTo = LineStart(lineEndStyled);
+			pli->Colourise(endStyledTo, pos);
+		} else {
+			// Ask the watchers to style, and stop as soon as one responds.
+			for (std::vector<WatcherWithUserData>::iterator it = watchers.begin();
+				(pos > GetEndStyled()) && (it != watchers.end()); ++it) {
+				it->watcher->NotifyStyleNeeded(this, it->userData, pos);
+			}
+		}
+	}
+}
+
+void Document::StyleToAdjustingLineDuration(Sci::Position pos) {
+	const Sci::Position stylingStart = GetEndStyled();
+	ElapsedPeriod epStyling;
+	EnsureStyledTo(pos);
+	durationStyleOneByte.AddSample(pos - stylingStart, epStyling.Duration());
+}
+
+void Document::LexerChanged() {
+	// Tell the watchers the lexer has changed.
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifyLexerChanged(this, watcher.userData);
+	}
+}
+
+LexInterface *Document::GetLexInterface() const noexcept {
+	return pli.get();
+}
+
+void Document::SetLexInterface(std::unique_ptr<LexInterface> pLexInterface) noexcept {
+	pli = std::move(pLexInterface);
+}
+
+int SCI_METHOD Document::SetLineState(Sci_Position line, int state) {
+	const int statePrevious = States()->SetLineState(line, state);
+	if (state != statePrevious) {
+		const DocModification mh(ModificationFlags::ChangeLineState, LineStart(line), 0, 0, nullptr,
+			static_cast<Sci::Line>(line));
+		NotifyModified(mh);
+	}
+	return statePrevious;
+}
+
+int SCI_METHOD Document::GetLineState(Sci_Position line) const {
+	return States()->GetLineState(line);
+}
+
+Sci::Line Document::GetMaxLineState() const noexcept {
+	return States()->GetMaxLineState();
+}
+
+void SCI_METHOD Document::ChangeLexerState(Sci_Position start, Sci_Position end) {
+	const DocModification mh(ModificationFlags::LexerState, start,
+		end-start, 0, 0, 0);
+	NotifyModified(mh);
+}
+
+StyledText Document::MarginStyledText(Sci::Line line) const noexcept {
+	const LineAnnotation *pla = Margins();
+	return StyledText(pla->Length(line), pla->Text(line),
+		pla->MultipleStyles(line), pla->Style(line), pla->Styles(line));
+}
+
+void Document::MarginSetText(Sci::Line line, const char *text) {
+	Margins()->SetText(line, text);
+	const DocModification mh(ModificationFlags::ChangeMargin, LineStart(line),
+		0, 0, 0, line);
+	NotifyModified(mh);
+}
+
+void Document::MarginSetStyle(Sci::Line line, int style) {
+	Margins()->SetStyle(line, style);
+	NotifyModified(DocModification(ModificationFlags::ChangeMargin, LineStart(line),
+		0, 0, 0, line));
+}
+
+void Document::MarginSetStyles(Sci::Line line, const unsigned char *styles) {
+	Margins()->SetStyles(line, styles);
+	NotifyModified(DocModification(ModificationFlags::ChangeMargin, LineStart(line),
+		0, 0, 0, line));
+}
+
+void Document::MarginClearAll() {
+	const Sci::Line maxEditorLine = LinesTotal();
+	for (Sci::Line l=0; l<maxEditorLine; l++)
+		MarginSetText(l, nullptr);
+	// Free remaining data
+	Margins()->ClearAll();
+}
+
+StyledText Document::AnnotationStyledText(Sci::Line line) const noexcept {
+	const LineAnnotation *pla = Annotations();
+	return StyledText(pla->Length(line), pla->Text(line),
+		pla->MultipleStyles(line), pla->Style(line), pla->Styles(line));
+}
+
+void Document::AnnotationSetText(Sci::Line line, const char *text) {
+	if (line >= 0 && line < LinesTotal()) {
+		const Sci::Line linesBefore = AnnotationLines(line);
+		Annotations()->SetText(line, text);
+		const int linesAfter = AnnotationLines(line);
+		DocModification mh(ModificationFlags::ChangeAnnotation, LineStart(line),
+			0, 0, 0, line);
+		mh.annotationLinesAdded = linesAfter - linesBefore;
+		NotifyModified(mh);
+	}
+}
+
+void Document::AnnotationSetStyle(Sci::Line line, int style) {
+	if (line >= 0 && line < LinesTotal()) {
+		Annotations()->SetStyle(line, style);
+		const DocModification mh(ModificationFlags::ChangeAnnotation, LineStart(line),
+			0, 0, 0, line);
+		NotifyModified(mh);
+	}
+}
+
+void Document::AnnotationSetStyles(Sci::Line line, const unsigned char *styles) {
+	if (line >= 0 && line < LinesTotal()) {
+		Annotations()->SetStyles(line, styles);
+	}
+}
+
+int Document::AnnotationLines(Sci::Line line) const noexcept {
+	return Annotations()->Lines(line);
+}
+
+void Document::AnnotationClearAll() {
+	const Sci::Line maxEditorLine = LinesTotal();
+	for (Sci::Line l=0; l<maxEditorLine; l++)
+		AnnotationSetText(l, nullptr);
+	// Free remaining data
+	Annotations()->ClearAll();
+}
+
+StyledText Document::EOLAnnotationStyledText(Sci::Line line) const noexcept {
+	const LineAnnotation *pla = EOLAnnotations();
+	return StyledText(pla->Length(line), pla->Text(line),
+		pla->MultipleStyles(line), pla->Style(line), pla->Styles(line));
+}
+
+void Document::EOLAnnotationSetText(Sci::Line line, const char *text) {
+	if (line >= 0 && line < LinesTotal()) {
+		EOLAnnotations()->SetText(line, text);
+		const DocModification mh(ModificationFlags::ChangeEOLAnnotation, LineStart(line),
+			0, 0, 0, line);
+		NotifyModified(mh);
+	}
+}
+
+void Document::EOLAnnotationSetStyle(Sci::Line line, int style) {
+	if (line >= 0 && line < LinesTotal()) {
+		EOLAnnotations()->SetStyle(line, style);
+		const DocModification mh(ModificationFlags::ChangeEOLAnnotation, LineStart(line),
+			0, 0, 0, line);
+		NotifyModified(mh);
+	}
+}
+
+void Document::EOLAnnotationClearAll() {
+	const Sci::Line maxEditorLine = LinesTotal();
+	for (Sci::Line l=0; l<maxEditorLine; l++)
+		EOLAnnotationSetText(l, nullptr);
+	// Free remaining data
+	EOLAnnotations()->ClearAll();
+}
+
+void Document::IncrementStyleClock() noexcept {
+	styleClock = (styleClock + 1) % 0x100000;
+}
+
+void SCI_METHOD Document::DecorationSetCurrentIndicator(int indicator) {
+	decorations->SetCurrentIndicator(indicator);
+}
+
+void SCI_METHOD Document::DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) {
+	const FillResult<Sci::Position> fr = decorations->FillRange(
+		position, value, fillLength);
+	if (fr.changed) {
+		const DocModification mh(ModificationFlags::ChangeIndicator | ModificationFlags::User,
+							fr.position, fr.fillLength);
+		NotifyModified(mh);
+	}
+}
+
+bool Document::AddWatcher(DocWatcher *watcher, void *userData) {
+	const WatcherWithUserData wwud(watcher, userData);
+	std::vector<WatcherWithUserData>::iterator it =
+		std::find(watchers.begin(), watchers.end(), wwud);
+	if (it != watchers.end())
+		return false;
+	watchers.push_back(wwud);
+	return true;
+}
+
+bool Document::RemoveWatcher(DocWatcher *watcher, void *userData) noexcept {
+	try {
+		// This can never fail as WatcherWithUserData constructor and == are noexcept
+		// but std::find is not noexcept.
+		std::vector<WatcherWithUserData>::iterator it =
+			std::find(watchers.begin(), watchers.end(), WatcherWithUserData(watcher, userData));
+		if (it != watchers.end()) {
+			watchers.erase(it);
+			return true;
+		}
+	} catch (...) {
+		// Ignore any exception
+	}
+	return false;
+}
+
+void Document::NotifyModifyAttempt() {
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifyModifyAttempt(this, watcher.userData);
+	}
+}
+
+void Document::NotifySavePoint(bool atSavePoint) {
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifySavePoint(this, watcher.userData, atSavePoint);
+	}
+}
+
+void Document::NotifyModified(DocModification mh) {
+	if (FlagSet(mh.modificationType, ModificationFlags::InsertText)) {
+		decorations->InsertSpace(mh.position, mh.length);
+	} else if (FlagSet(mh.modificationType, ModificationFlags::DeleteText)) {
+		decorations->DeleteRange(mh.position, mh.length);
+	}
+	for (const WatcherWithUserData &watcher : watchers) {
+		watcher.watcher->NotifyModified(this, mh, watcher.userData);
+	}
+}
+
+// Used for word part navigation.
+static bool IsASCIIPunctuationCharacter(unsigned int ch) noexcept {
+	switch (ch) {
+	case '!':
+	case '"':
+	case '#':
+	case '$':
+	case '%':
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case ';':
+	case '<':
+	case '=':
+	case '>':
+	case '?':
+	case '@':
+	case '[':
+	case '\\':
+	case ']':
+	case '^':
+	case '_':
+	case '`':
+	case '{':
+	case '|':
+	case '}':
+	case '~':
+		return true;
+	default:
+		return false;
+	}
+}
+
+bool Document::IsWordPartSeparator(unsigned int ch) const {
+	return (WordCharacterClass(ch) == CharacterClass::word) && IsASCIIPunctuationCharacter(ch);
+}
+
+Sci::Position Document::WordPartLeft(Sci::Position pos) const {
+	if (pos > 0) {
+		pos -= CharacterBefore(pos).widthBytes;
+		CharacterExtracted ceStart = CharacterAfter(pos);
+		if (IsWordPartSeparator(ceStart.character)) {
+			while (pos > 0 && IsWordPartSeparator(CharacterAfter(pos).character)) {
+				pos -= CharacterBefore(pos).widthBytes;
+			}
+		}
+		if (pos > 0) {
+			ceStart = CharacterAfter(pos);
+			pos -= CharacterBefore(pos).widthBytes;
+			if (IsLowerCase(ceStart.character)) {
+				while (pos > 0 && IsLowerCase(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (!IsUpperCase(CharacterAfter(pos).character) && !IsLowerCase(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else if (IsUpperCase(ceStart.character)) {
+				while (pos > 0 && IsUpperCase(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (!IsUpperCase(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else if (IsADigit(ceStart.character)) {
+				while (pos > 0 && IsADigit(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (!IsADigit(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else if (IsASCIIPunctuationCharacter(ceStart.character)) {
+				while (pos > 0 && IsASCIIPunctuationCharacter(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (!IsASCIIPunctuationCharacter(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else if (isspacechar(ceStart.character)) {
+				while (pos > 0 && isspacechar(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (!isspacechar(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else if (!IsASCII(ceStart.character)) {
+				while (pos > 0 && !IsASCII(CharacterAfter(pos).character))
+					pos -= CharacterBefore(pos).widthBytes;
+				if (IsASCII(CharacterAfter(pos).character))
+					pos += CharacterAfter(pos).widthBytes;
+			} else {
+				pos += CharacterAfter(pos).widthBytes;
+			}
+		}
+	}
+	return pos;
+}
+
+Sci::Position Document::WordPartRight(Sci::Position pos) const {
+	CharacterExtracted ceStart = CharacterAfter(pos);
+	const Sci::Position length = LengthNoExcept();
+	if (IsWordPartSeparator(ceStart.character)) {
+		while (pos < length && IsWordPartSeparator(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+		ceStart = CharacterAfter(pos);
+	}
+	if (!IsASCII(ceStart.character)) {
+		while (pos < length && !IsASCII(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+	} else if (IsLowerCase(ceStart.character)) {
+		while (pos < length && IsLowerCase(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+	} else if (IsUpperCase(ceStart.character)) {
+		if (IsLowerCase(CharacterAfter(pos + ceStart.widthBytes).character)) {
+			pos += CharacterAfter(pos).widthBytes;
+			while (pos < length && IsLowerCase(CharacterAfter(pos).character))
+				pos += CharacterAfter(pos).widthBytes;
+		} else {
+			while (pos < length && IsUpperCase(CharacterAfter(pos).character))
+				pos += CharacterAfter(pos).widthBytes;
+		}
+		if (IsLowerCase(CharacterAfter(pos).character) && IsUpperCase(CharacterBefore(pos).character))
+			pos -= CharacterBefore(pos).widthBytes;
+	} else if (IsADigit(ceStart.character)) {
+		while (pos < length && IsADigit(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+	} else if (IsASCIIPunctuationCharacter(ceStart.character)) {
+		while (pos < length && IsASCIIPunctuationCharacter(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+	} else if (isspacechar(ceStart.character)) {
+		while (pos < length && isspacechar(CharacterAfter(pos).character))
+			pos += CharacterAfter(pos).widthBytes;
+	} else {
+		pos += CharacterAfter(pos).widthBytes;
+	}
+	return pos;
+}
+
+static constexpr bool IsLineEndChar(char c) noexcept {
+	return (c == '\n' || c == '\r');
+}
+
+Sci::Position Document::ExtendStyleRange(Sci::Position pos, int delta, bool singleLine) noexcept {
+	const int sStart = cb.StyleAt(pos);
+	if (delta < 0) {
+		while (pos > 0 && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))))
+			pos--;
+		pos++;
+	} else {
+		while (pos < (LengthNoExcept()) && (cb.StyleAt(pos) == sStart) && (!singleLine || !IsLineEndChar(cb.CharAt(pos))))
+			pos++;
+	}
+	return pos;
+}
+
+static char BraceOpposite(char ch) noexcept {
+	switch (ch) {
+	case '(':
+		return ')';
+	case ')':
+		return '(';
+	case '[':
+		return ']';
+	case ']':
+		return '[';
+	case '{':
+		return '}';
+	case '}':
+		return '{';
+	case '<':
+		return '>';
+	case '>':
+		return '<';
+	default:
+		return '\0';
+	}
+}
+
+// TODO: should be able to extend styled region to find matching brace
+Sci::Position Document::BraceMatch(Sci::Position position, Sci::Position /*maxReStyle*/, Sci::Position startPos, bool useStartPos) noexcept {
+	const char chBrace = CharAt(position);
+	const char chSeek = BraceOpposite(chBrace);
+	if (chSeek == '\0')
+		return - 1;
+	const int styBrace = StyleIndexAt(position);
+	int direction = -1;
+	if (chBrace == '(' || chBrace == '[' || chBrace == '{' || chBrace == '<')
+		direction = 1;
+	int depth = 1;
+	position = useStartPos ? startPos : NextPosition(position, direction);
+	while ((position >= 0) && (position < LengthNoExcept())) {
+		const char chAtPos = CharAt(position);
+		const int styAtPos = StyleIndexAt(position);
+		if ((position > GetEndStyled()) || (styAtPos == styBrace)) {
+			if (chAtPos == chBrace)
+				depth++;
+			if (chAtPos == chSeek)
+				depth--;
+			if (depth == 0)
+				return position;
+		}
+		const Sci::Position positionBeforeMove = position;
+		position = NextPosition(position, direction);
+		if (position == positionBeforeMove)
+			break;
+	}
+	return - 1;
+}
+
+/**
+ * Implementation of RegexSearchBase for the default built-in regular expression engine
+ */
+class BuiltinRegex : public RegexSearchBase {
+public:
+	explicit BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
+	BuiltinRegex(const BuiltinRegex &) = delete;
+	BuiltinRegex(BuiltinRegex &&) = delete;
+	BuiltinRegex &operator=(const BuiltinRegex &) = delete;
+	BuiltinRegex &operator=(BuiltinRegex &&) = delete;
+	~BuiltinRegex() override = default;
+
+	Sci::Position FindText(Document *doc, Sci::Position minPos, Sci::Position maxPos, const char *s,
+                        bool caseSensitive, bool word, bool wordStart, FindOption flags,
+                        Sci::Position *length) override;
+
+	const char *SubstituteByPosition(Document *doc, const char *text, Sci::Position *length) override;
+
+private:
+	RESearch search;
+	std::string substituted;
+};
+
+namespace {
+
+/**
+* RESearchRange keeps track of search range.
+*/
+class RESearchRange {
+public:
+	const Document *doc;
+	int increment;
+	Sci::Position startPos;
+	Sci::Position endPos;
+	Sci::Line lineRangeStart;
+	Sci::Line lineRangeEnd;
+	Sci::Line lineRangeBreak;
+	RESearchRange(const Document *doc_, Sci::Position minPos, Sci::Position maxPos) noexcept : doc(doc_) {
+		increment = (minPos <= maxPos) ? 1 : -1;
+
+		// Range endpoints should not be inside DBCS characters or between a CR and LF,
+		// but just in case, move them.
+		startPos = doc->MovePositionOutsideChar(minPos, 1, true);
+		endPos = doc->MovePositionOutsideChar(maxPos, 1, true);
+
+		lineRangeStart = doc->SciLineFromPosition(startPos);
+		lineRangeEnd = doc->SciLineFromPosition(endPos);
+		lineRangeBreak = lineRangeEnd + increment;
+	}
+	Range LineRange(Sci::Line line) const {
+		Range range(doc->LineStart(line), doc->LineEnd(line));
+		if (increment == 1) {
+			if (line == lineRangeStart)
+				range.start = startPos;
+			if (line == lineRangeEnd)
+				range.end = endPos;
+		} else {
+			if (line == lineRangeEnd)
+				range.start = endPos;
+			if (line == lineRangeStart)
+				range.end = startPos;
+		}
+		return range;
+	}
+};
+
+// Define a way for the Regular Expression code to access the document
+class DocumentIndexer : public CharacterIndexer {
+	Document *pdoc;
+	Sci::Position end;
+public:
+	DocumentIndexer(Document *pdoc_, Sci::Position end_) noexcept :
+		pdoc(pdoc_), end(end_) {
+	}
+
+	DocumentIndexer(const DocumentIndexer &) = delete;
+	DocumentIndexer(DocumentIndexer &&) = delete;
+	DocumentIndexer &operator=(const DocumentIndexer &) = delete;
+	DocumentIndexer &operator=(DocumentIndexer &&) = delete;
+
+	~DocumentIndexer() override = default;
+
+	char CharAt(Sci::Position index) const noexcept override {
+		if (index < 0 || index >= end)
+			return 0;
+		else
+			return pdoc->CharAt(index);
+	}
+};
+
+#ifndef NO_CXX11_REGEX
+
+class ByteIterator {
+public:
+	typedef std::bidirectional_iterator_tag iterator_category;
+	typedef char value_type;
+	typedef ptrdiff_t difference_type;
+	typedef char* pointer;
+	typedef char& reference;
+
+	const Document *doc;
+	Sci::Position position;
+
+	ByteIterator(const Document *doc_=nullptr, Sci::Position position_=0) noexcept :
+		doc(doc_), position(position_) {
+	}
+	ByteIterator(const ByteIterator &other) noexcept {
+		doc = other.doc;
+		position = other.position;
+	}
+	ByteIterator(ByteIterator &&other) noexcept {
+		doc = other.doc;
+		position = other.position;
+	}
+	ByteIterator &operator=(const ByteIterator &other) noexcept {
+		if (this != &other) {
+			doc = other.doc;
+			position = other.position;
+		}
+		return *this;
+	}
+	ByteIterator &operator=(ByteIterator &&) noexcept = default;
+	~ByteIterator() = default;
+	char operator*() const noexcept {
+		return doc->CharAt(position);
+	}
+	ByteIterator &operator++() noexcept {
+		position++;
+		return *this;
+	}
+	ByteIterator operator++(int) noexcept {
+		ByteIterator retVal(*this);
+		position++;
+		return retVal;
+	}
+	ByteIterator &operator--() noexcept {
+		position--;
+		return *this;
+	}
+	bool operator==(const ByteIterator &other) const noexcept {
+		return doc == other.doc && position == other.position;
+	}
+	bool operator!=(const ByteIterator &other) const noexcept {
+		return doc != other.doc || position != other.position;
+	}
+	Sci::Position Pos() const noexcept {
+		return position;
+	}
+	Sci::Position PosRoundUp() const noexcept {
+		return position;
+	}
+};
+
+// On Windows, wchar_t is 16 bits wide and on Unix it is 32 bits wide.
+// Would be better to use sizeof(wchar_t) or similar to differentiate
+// but easier for now to hard-code platforms.
+// C++11 has char16_t and char32_t but neither Clang nor Visual C++
+// appear to allow specializing basic_regex over these.
+
+#ifdef _WIN32
+#define WCHAR_T_IS_16 1
+#else
+#define WCHAR_T_IS_16 0
+#endif
+
+#if WCHAR_T_IS_16
+
+// On Windows, report non-BMP characters as 2 separate surrogates as that
+// matches wregex since it is based on wchar_t.
+class UTF8Iterator {
+	// These 3 fields determine the iterator position and are used for comparisons
+	const Document *doc;
+	Sci::Position position;
+	size_t characterIndex;
+	// Remaining fields are derived from the determining fields so are excluded in comparisons
+	unsigned int lenBytes;
+	size_t lenCharacters;
+	wchar_t buffered[2];
+public:
+	typedef std::bidirectional_iterator_tag iterator_category;
+	typedef wchar_t value_type;
+	typedef ptrdiff_t difference_type;
+	typedef wchar_t* pointer;
+	typedef wchar_t& reference;
+
+	UTF8Iterator(const Document *doc_=nullptr, Sci::Position position_=0) noexcept :
+		doc(doc_), position(position_), characterIndex(0), lenBytes(0), lenCharacters(0), buffered{} {
+		buffered[0] = 0;
+		buffered[1] = 0;
+		if (doc) {
+			ReadCharacter();
+		}
+	}
+	UTF8Iterator(const UTF8Iterator &other) noexcept : buffered{} {
+		doc = other.doc;
+		position = other.position;
+		characterIndex = other.characterIndex;
+		lenBytes = other.lenBytes;
+		lenCharacters = other.lenCharacters;
+		buffered[0] = other.buffered[0];
+		buffered[1] = other.buffered[1];
+	}
+	UTF8Iterator(UTF8Iterator &&other) noexcept = default;
+	UTF8Iterator &operator=(const UTF8Iterator &other) noexcept {
+		if (this != &other) {
+			doc = other.doc;
+			position = other.position;
+			characterIndex = other.characterIndex;
+			lenBytes = other.lenBytes;
+			lenCharacters = other.lenCharacters;
+			buffered[0] = other.buffered[0];
+			buffered[1] = other.buffered[1];
+		}
+		return *this;
+	}
+	UTF8Iterator &operator=(UTF8Iterator &&) noexcept = default;
+	~UTF8Iterator() = default;
+	wchar_t operator*() const noexcept {
+		assert(lenCharacters != 0);
+		return buffered[characterIndex];
+	}
+	UTF8Iterator &operator++() noexcept {
+		if ((characterIndex + 1) < (lenCharacters)) {
+			characterIndex++;
+		} else {
+			position += lenBytes;
+			ReadCharacter();
+			characterIndex = 0;
+		}
+		return *this;
+	}
+	UTF8Iterator operator++(int) noexcept {
+		UTF8Iterator retVal(*this);
+		if ((characterIndex + 1) < (lenCharacters)) {
+			characterIndex++;
+		} else {
+			position += lenBytes;
+			ReadCharacter();
+			characterIndex = 0;
+		}
+		return retVal;
+	}
+	UTF8Iterator &operator--() noexcept {
+		if (characterIndex) {
+			characterIndex--;
+		} else {
+			position = doc->NextPosition(position, -1);
+			ReadCharacter();
+			characterIndex = lenCharacters - 1;
+		}
+		return *this;
+	}
+	bool operator==(const UTF8Iterator &other) const noexcept {
+		// Only test the determining fields, not the character widths and values derived from this
+		return doc == other.doc &&
+			position == other.position &&
+			characterIndex == other.characterIndex;
+	}
+	bool operator!=(const UTF8Iterator &other) const noexcept {
+		// Only test the determining fields, not the character widths and values derived from this
+		return doc != other.doc ||
+			position != other.position ||
+			characterIndex != other.characterIndex;
+	}
+	Sci::Position Pos() const noexcept {
+		return position;
+	}
+	Sci::Position PosRoundUp() const noexcept {
+		if (characterIndex)
+			return position + lenBytes;	// Force to end of character
+		else
+			return position;
+	}
+private:
+	void ReadCharacter() noexcept {
+		const Document::CharacterExtracted charExtracted = doc->ExtractCharacter(position);
+		lenBytes = charExtracted.widthBytes;
+		if (charExtracted.character == unicodeReplacementChar) {
+			lenCharacters = 1;
+			buffered[0] = static_cast<wchar_t>(charExtracted.character);
+		} else {
+			lenCharacters = UTF16FromUTF32Character(charExtracted.character, buffered);
+		}
+	}
+};
+
+#else
+
+// On Unix, report non-BMP characters as single characters
+
+class UTF8Iterator {
+	const Document *doc;
+	Sci::Position position;
+public:
+	typedef std::bidirectional_iterator_tag iterator_category;
+	typedef wchar_t value_type;
+	typedef ptrdiff_t difference_type;
+	typedef wchar_t* pointer;
+	typedef wchar_t& reference;
+
+	UTF8Iterator(const Document *doc_=nullptr, Sci::Position position_=0) noexcept :
+		doc(doc_), position(position_) {
+	}
+	UTF8Iterator(const UTF8Iterator &other) noexcept {
+		doc = other.doc;
+		position = other.position;
+	}
+	UTF8Iterator(UTF8Iterator &&other) noexcept = default;
+	UTF8Iterator &operator=(const UTF8Iterator &other) noexcept {
+		if (this != &other) {
+			doc = other.doc;
+			position = other.position;
+		}
+		return *this;
+	}
+	UTF8Iterator &operator=(UTF8Iterator &&) noexcept = default;
+	~UTF8Iterator() = default;
+	wchar_t operator*() const noexcept {
+		const Document::CharacterExtracted charExtracted = doc->ExtractCharacter(position);
+		return charExtracted.character;
+	}
+	UTF8Iterator &operator++() noexcept {
+		position = doc->NextPosition(position, 1);
+		return *this;
+	}
+	UTF8Iterator operator++(int) noexcept {
+		UTF8Iterator retVal(*this);
+		position = doc->NextPosition(position, 1);
+		return retVal;
+	}
+	UTF8Iterator &operator--() noexcept {
+		position = doc->NextPosition(position, -1);
+		return *this;
+	}
+	bool operator==(const UTF8Iterator &other) const noexcept {
+		return doc == other.doc && position == other.position;
+	}
+	bool operator!=(const UTF8Iterator &other) const noexcept {
+		return doc != other.doc || position != other.position;
+	}
+	Sci::Position Pos() const noexcept {
+		return position;
+	}
+	Sci::Position PosRoundUp() const noexcept {
+		return position;
+	}
+};
+
+#endif
+
+std::regex_constants::match_flag_type MatchFlags(const Document *doc, Sci::Position startPos, Sci::Position endPos) {
+	std::regex_constants::match_flag_type flagsMatch = std::regex_constants::match_default;
+	if (!doc->IsLineStartPosition(startPos))
+		flagsMatch |= std::regex_constants::match_not_bol;
+	if (!doc->IsLineEndPosition(endPos))
+		flagsMatch |= std::regex_constants::match_not_eol;
+	return flagsMatch;
+}
+
+template<typename Iterator, typename Regex>
+bool MatchOnLines(const Document *doc, const Regex &regexp, const RESearchRange &resr, RESearch &search) {
+	std::match_results<Iterator> match;
+
+	// MSVC and libc++ have problems with ^ and $ matching line ends inside a range.
+	// CRLF line ends are also a problem as ^ and $ only treat LF as a line end.
+	// The std::regex::multiline option was added to C++17 to improve behaviour but
+	// has not been implemented by compiler runtimes with MSVC always in multiline
+	// mode and libc++ and libstdc++ always in single-line mode.
+	// If multiline regex worked well then the line by line iteration could be removed
+	// for the forwards case and replaced with the following 4 lines:
+#ifdef REGEX_MULTILINE
+	Iterator itStart(doc, resr.startPos);
+	Iterator itEnd(doc, resr.endPos);
+	const std::regex_constants::match_flag_type flagsMatch = MatchFlags(doc, resr.startPos, resr.endPos);
+	const bool matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
+#else
+	// Line by line.
+	bool matched = false;
+	for (Sci::Line line = resr.lineRangeStart; line != resr.lineRangeBreak; line += resr.increment) {
+		const Range lineRange = resr.LineRange(line);
+		Iterator itStart(doc, lineRange.start);
+		Iterator itEnd(doc, lineRange.end);
+		std::regex_constants::match_flag_type flagsMatch = MatchFlags(doc, lineRange.start, lineRange.end);
+		matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
+		// Check for the last match on this line.
+		if (matched) {
+			if (resr.increment == -1) {
+				while (matched) {
+					Iterator itNext(doc, match[0].second.PosRoundUp());
+					flagsMatch = MatchFlags(doc, itNext.Pos(), lineRange.end);
+					std::match_results<Iterator> matchNext;
+					matched = std::regex_search(itNext, itEnd, matchNext, regexp, flagsMatch);
+					if (matched) {
+						if (match[0].first == match[0].second) {
+							// Empty match means failure so exit
+							return false;
+						}
+						match = matchNext;
+					}
+				}
+				matched = true;
+			}
+			break;
+		}
+	}
+#endif
+	if (matched) {
+		for (size_t co = 0; co < match.size(); co++) {
+			search.bopat[co] = match[co].first.Pos();
+			search.eopat[co] = match[co].second.PosRoundUp();
+			const Sci::Position lenMatch = search.eopat[co] - search.bopat[co];
+			search.pat[co].resize(lenMatch);
+			for (Sci::Position iPos = 0; iPos < lenMatch; iPos++) {
+				search.pat[co][iPos] = doc->CharAt(iPos + search.bopat[co]);
+			}
+		}
+	}
+	return matched;
+}
+
+Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci::Position maxPos, const char *s,
+	bool caseSensitive, Sci::Position *length, RESearch &search) {
+	const RESearchRange resr(doc, minPos, maxPos);
+	try {
+		//ElapsedPeriod ep;
+		std::regex::flag_type flagsRe = std::regex::ECMAScript;
+		// Flags that appear to have no effect:
+		// | std::regex::collate | std::regex::extended;
+		if (!caseSensitive)
+			flagsRe = flagsRe | std::regex::icase;
+
+		// Clear the RESearch so can fill in matches
+		search.Clear();
+
+		bool matched = false;
+		if (CpUtf8 == doc->dbcsCodePage) {
+			const std::wstring ws = WStringFromUTF8(s);
+			std::wregex regexp;
+			regexp.assign(ws, flagsRe);
+			matched = MatchOnLines<UTF8Iterator>(doc, regexp, resr, search);
+
+		} else {
+			std::regex regexp;
+			regexp.assign(s, flagsRe);
+			matched = MatchOnLines<ByteIterator>(doc, regexp, resr, search);
+		}
+
+		Sci::Position posMatch = -1;
+		if (matched) {
+			posMatch = search.bopat[0];
+			*length = search.eopat[0] - search.bopat[0];
+		}
+		// Example - search in doc/ScintillaHistory.html for
+		// [[:upper:]]eta[[:space:]]
+		// On MacBook, normally around 1 second but with locale imbued -> 14 seconds.
+		//const double durSearch = ep.Duration(true);
+		//Platform::DebugPrintf("Search:%9.6g \n", durSearch);
+		return posMatch;
+	} catch (std::regex_error &) {
+		// Failed to create regular expression
+		throw RegexError();
+	} catch (...) {
+		// Failed in some other way
+		return -1;
+	}
+}
+
+#endif
+
+}
+
+Sci::Position BuiltinRegex::FindText(Document *doc, Sci::Position minPos, Sci::Position maxPos, const char *s,
+                        bool caseSensitive, bool, bool, FindOption flags,
+                        Sci::Position *length) {
+
+#ifndef NO_CXX11_REGEX
+	if (FlagSet(flags, FindOption::Cxx11RegEx)) {
+			return Cxx11RegexFindText(doc, minPos, maxPos, s,
+			caseSensitive, length, search);
+	}
+#endif
+
+	const RESearchRange resr(doc, minPos, maxPos);
+
+	const bool posix = FlagSet(flags, FindOption::Posix);
+
+	const char *errmsg = search.Compile(s, *length, caseSensitive, posix);
+	if (errmsg) {
+		return -1;
+	}
+	// Find a variable in a property file: \$(\([A-Za-z0-9_.]+\))
+	// Replace first '.' with '-' in each property file variable reference:
+	//     Search: \$(\([A-Za-z0-9_-]+\)\.\([A-Za-z0-9_.]+\))
+	//     Replace: $(\1-\2)
+	Sci::Position pos = -1;
+	Sci::Position lenRet = 0;
+	const bool searchforLineStart = s[0] == '^';
+	const char searchEnd = s[*length - 1];
+	const char searchEndPrev = (*length > 1) ? s[*length - 2] : '\0';
+	const bool searchforLineEnd = (searchEnd == '$') && (searchEndPrev != '\\');
+	for (Sci::Line line = resr.lineRangeStart; line != resr.lineRangeBreak; line += resr.increment) {
+		Sci::Position startOfLine = doc->LineStart(line);
+		Sci::Position endOfLine = doc->LineEnd(line);
+		if (resr.increment == 1) {
+			if (line == resr.lineRangeStart) {
+				if ((resr.startPos != startOfLine) && searchforLineStart)
+					continue;	// Can't match start of line if start position after start of line
+				startOfLine = resr.startPos;
+			}
+			if (line == resr.lineRangeEnd) {
+				if ((resr.endPos != endOfLine) && searchforLineEnd)
+					continue;	// Can't match end of line if end position before end of line
+				endOfLine = resr.endPos;
+			}
+		} else {
+			if (line == resr.lineRangeEnd) {
+				if ((resr.endPos != startOfLine) && searchforLineStart)
+					continue;	// Can't match start of line if end position after start of line
+				startOfLine = resr.endPos;
+			}
+			if (line == resr.lineRangeStart) {
+				if ((resr.startPos != endOfLine) && searchforLineEnd)
+					continue;	// Can't match end of line if start position before end of line
+				endOfLine = resr.startPos;
+			}
+		}
+
+		const DocumentIndexer di(doc, endOfLine);
+		int success = search.Execute(di, startOfLine, endOfLine);
+		if (success) {
+			pos = search.bopat[0];
+			// Ensure only whole characters selected
+			search.eopat[0] = doc->MovePositionOutsideChar(search.eopat[0], 1, false);
+			lenRet = search.eopat[0] - search.bopat[0];
+			// There can be only one start of a line, so no need to look for last match in line
+			if ((resr.increment == -1) && !searchforLineStart) {
+				// Check for the last match on this line.
+				int repetitions = 1000;	// Break out of infinite loop
+				while (success && (search.eopat[0] <= endOfLine) && (repetitions--)) {
+					success = search.Execute(di, pos+1, endOfLine);
+					if (success) {
+						if (search.eopat[0] <= minPos) {
+							pos = search.bopat[0];
+							lenRet = search.eopat[0] - search.bopat[0];
+						} else {
+							success = 0;
+						}
+					}
+				}
+			}
+			break;
+		}
+	}
+	*length = lenRet;
+	return pos;
+}
+
+const char *BuiltinRegex::SubstituteByPosition(Document *doc, const char *text, Sci::Position *length) {
+	substituted.clear();
+	const DocumentIndexer di(doc, doc->Length());
+	search.GrabMatches(di);
+	for (Sci::Position j = 0; j < *length; j++) {
+		if (text[j] == '\\') {
+			if (text[j + 1] >= '0' && text[j + 1] <= '9') {
+				const unsigned int patNum = text[j + 1] - '0';
+				const Sci::Position len = search.eopat[patNum] - search.bopat[patNum];
+				if (!search.pat[patNum].empty())	// Will be null if try for a match that did not occur
+					substituted.append(search.pat[patNum].c_str(), len);
+				j++;
+			} else {
+				j++;
+				switch (text[j]) {
+				case 'a':
+					substituted.push_back('\a');
+					break;
+				case 'b':
+					substituted.push_back('\b');
+					break;
+				case 'f':
+					substituted.push_back('\f');
+					break;
+				case 'n':
+					substituted.push_back('\n');
+					break;
+				case 'r':
+					substituted.push_back('\r');
+					break;
+				case 't':
+					substituted.push_back('\t');
+					break;
+				case 'v':
+					substituted.push_back('\v');
+					break;
+				case '\\':
+					substituted.push_back('\\');
+					break;
+				default:
+					substituted.push_back('\\');
+					j--;
+				}
+			}
+		} else {
+			substituted.push_back(text[j]);
+		}
+	}
+	*length = substituted.length();
+	return substituted.c_str();
+}
+
+#ifndef SCI_OWNREGEX
+
+RegexSearchBase *Scintilla::Internal::CreateRegexSearch(CharClassify *charClassTable) {
+	return new BuiltinRegex(charClassTable);
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Document.h b/scite-app/scintilla/src/Document.h
new file mode 100644
index 0000000..7984ad0
--- /dev/null
+++ b/scite-app/scintilla/src/Document.h
@@ -0,0 +1,604 @@
+// Scintilla source code edit control
+/** @file Document.h
+ ** Text document that handles notifications, DBCS, styling, words and end of line.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DOCUMENT_H
+#define DOCUMENT_H
+
+namespace Scintilla::Internal {
+
+class DocWatcher;
+class DocModification;
+class Document;
+class LineMarkers;
+class LineLevels;
+class LineState;
+class LineAnnotation;
+
+enum class EncodingFamily { eightBit, unicode, dbcs };
+
+/**
+ * The range class represents a range of text in a document.
+ * The two values are not sorted as one end may be more significant than the other
+ * as is the case for the selection where the end position is the position of the caret.
+ * If either position is invalidPosition then the range is invalid and most operations will fail.
+ */
+class Range {
+public:
+	Sci::Position start;
+	Sci::Position end;
+
+	explicit Range(Sci::Position pos=0) noexcept :
+		start(pos), end(pos) {
+	}
+	Range(Sci::Position start_, Sci::Position end_) noexcept :
+		start(start_), end(end_) {
+	}
+
+	bool operator==(const Range &other) const noexcept {
+		return (start == other.start) && (end == other.end);
+	}
+
+	bool Valid() const noexcept {
+		return (start != Sci::invalidPosition) && (end != Sci::invalidPosition);
+	}
+
+	Sci::Position First() const noexcept {
+		return (start <= end) ? start : end;
+	}
+
+	Sci::Position Last() const noexcept {
+		return (start > end) ? start : end;
+	}
+
+	// Is the position within the range?
+	bool Contains(Sci::Position pos) const noexcept {
+		if (start < end) {
+			return (pos >= start && pos <= end);
+		} else {
+			return (pos <= start && pos >= end);
+		}
+	}
+
+	// Is the character after pos within the range?
+	bool ContainsCharacter(Sci::Position pos) const noexcept {
+		if (start < end) {
+			return (pos >= start && pos < end);
+		} else {
+			return (pos < start && pos >= end);
+		}
+	}
+
+	bool Contains(Range other) const noexcept {
+		return Contains(other.start) && Contains(other.end);
+	}
+
+	bool Overlaps(Range other) const noexcept {
+		return
+		Contains(other.start) ||
+		Contains(other.end) ||
+		other.Contains(start) ||
+		other.Contains(end);
+	}
+};
+
+/**
+ * Interface class for regular expression searching
+ */
+class RegexSearchBase {
+public:
+	virtual ~RegexSearchBase() {}
+
+	virtual Sci::Position FindText(Document *doc, Sci::Position minPos, Sci::Position maxPos, const char *s,
+                        bool caseSensitive, bool word, bool wordStart, Scintilla::FindOption flags, Sci::Position *length) = 0;
+
+	///@return String with the substitutions, must remain valid until the next call or destruction
+	virtual const char *SubstituteByPosition(Document *doc, const char *text, Sci::Position *length) = 0;
+};
+
+/// Factory function for RegexSearchBase
+extern RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable);
+
+struct StyledText {
+	size_t length;
+	const char *text;
+	bool multipleStyles;
+	size_t style;
+	const unsigned char *styles;
+	StyledText(size_t length_, const char *text_, bool multipleStyles_, int style_, const unsigned char *styles_) noexcept :
+		length(length_), text(text_), multipleStyles(multipleStyles_), style(style_), styles(styles_) {
+	}
+	// Return number of bytes from start to before '\n' or end of text.
+	// Return 1 when start is outside text
+	size_t LineLength(size_t start) const noexcept {
+		size_t cur = start;
+		while ((cur < length) && (text[cur] != '\n'))
+			cur++;
+		return cur-start;
+	}
+	size_t StyleAt(size_t i) const noexcept {
+		return multipleStyles ? styles[i] : style;
+	}
+};
+
+class HighlightDelimiter {
+public:
+	HighlightDelimiter() noexcept : isEnabled(false) {
+		Clear();
+	}
+
+	void Clear() noexcept {
+		beginFoldBlock = -1;
+		endFoldBlock = -1;
+		firstChangeableLineBefore = -1;
+		firstChangeableLineAfter = -1;
+	}
+
+	bool NeedsDrawing(Sci::Line line) const noexcept {
+		return isEnabled && (line <= firstChangeableLineBefore || line >= firstChangeableLineAfter);
+	}
+
+	bool IsFoldBlockHighlighted(Sci::Line line) const noexcept {
+		return isEnabled && beginFoldBlock != -1 && beginFoldBlock <= line && line <= endFoldBlock;
+	}
+
+	bool IsHeadOfFoldBlock(Sci::Line line) const noexcept {
+		return beginFoldBlock == line && line < endFoldBlock;
+	}
+
+	bool IsBodyOfFoldBlock(Sci::Line line) const noexcept {
+		return beginFoldBlock != -1 && beginFoldBlock < line && line < endFoldBlock;
+	}
+
+	bool IsTailOfFoldBlock(Sci::Line line) const noexcept {
+		return beginFoldBlock != -1 && beginFoldBlock < line && line == endFoldBlock;
+	}
+
+	Sci::Line beginFoldBlock;	// Begin of current fold block
+	Sci::Line endFoldBlock;	// End of current fold block
+	Sci::Line firstChangeableLineBefore;	// First line that triggers repaint before starting line that determined current fold block
+	Sci::Line firstChangeableLineAfter;	// First line that triggers repaint after starting line that determined current fold block
+	bool isEnabled;
+};
+
+class LexInterface {
+protected:
+	Document *pdoc;
+	Scintilla::ILexer5 *instance;
+	bool performingStyle;	///< Prevent reentrance
+public:
+	explicit LexInterface(Document *pdoc_) noexcept : pdoc(pdoc_), instance(nullptr), performingStyle(false) {
+	}
+	virtual ~LexInterface() {
+	}
+	void Colourise(Sci::Position start, Sci::Position end);
+	virtual Scintilla::LineEndType LineEndTypesSupported();
+	bool UseContainerLexing() const noexcept {
+		return instance == nullptr;
+	}
+};
+
+struct RegexError : public std::runtime_error {
+	RegexError() : std::runtime_error("regex failure") {}
+};
+
+/**
+ * The ActionDuration class stores the average time taken for some action such as styling or
+ * wrapping a line. It is used to decide how many repetitions of that action can be performed
+ * on idle to maximize efficiency without affecting application responsiveness.
+ * The duration changes if the time for the action changes. For example, if a simple lexer is
+ * changed to a complex lexer. Changes are damped and clamped to avoid short periods of easy
+ * or difficult processing moving the value too far leading to inefficiency or poor user
+ * experience.
+ */
+
+class ActionDuration {
+	double duration;
+	const double minDuration;
+	const double maxDuration;
+public:
+	ActionDuration(double duration_, double minDuration_, double maxDuration_) noexcept;
+	void AddSample(size_t numberActions, double durationOfActions) noexcept;
+	double Duration() const noexcept;
+	size_t ActionsInAllowedTime(double secondsAllowed) const noexcept;
+};
+
+/**
+ */
+class Document : PerLine, public Scintilla::IDocument, public Scintilla::ILoader {
+
+public:
+	/** Used to pair watcher pointer with user data. */
+	struct WatcherWithUserData {
+		DocWatcher *watcher;
+		void *userData;
+		WatcherWithUserData(DocWatcher *watcher_=nullptr, void *userData_=nullptr) noexcept :
+			watcher(watcher_), userData(userData_) {
+		}
+		bool operator==(const WatcherWithUserData &other) const noexcept {
+			return (watcher == other.watcher) && (userData == other.userData);
+		}
+	};
+
+private:
+	int refCount;
+	CellBuffer cb;
+	CharClassify charClass;
+	CharacterCategoryMap charMap;
+	std::unique_ptr<CaseFolder> pcf;
+	Sci::Position endStyled;
+	int styleClock;
+	int enteredModification;
+	int enteredStyling;
+	int enteredReadOnlyCount;
+
+	bool insertionSet;
+	std::string insertion;
+
+	std::vector<WatcherWithUserData> watchers;
+
+	// ldSize is not real data - it is for dimensions and loops
+	enum lineData { ldMarkers, ldLevels, ldState, ldMargin, ldAnnotation, ldEOLAnnotation, ldSize };
+	std::unique_ptr<PerLine> perLineData[ldSize];
+	LineMarkers *Markers() const noexcept;
+	LineLevels *Levels() const noexcept;
+	LineState *States() const noexcept;
+	LineAnnotation *Margins() const noexcept;
+	LineAnnotation *Annotations() const noexcept;
+	LineAnnotation *EOLAnnotations() const noexcept;
+
+	bool matchesValid;
+	std::unique_ptr<RegexSearchBase> regex;
+	std::unique_ptr<LexInterface> pli;
+
+public:
+
+	struct CharacterExtracted {
+		unsigned int character;
+		unsigned int widthBytes;
+		CharacterExtracted(unsigned int character_, unsigned int widthBytes_) noexcept :
+			character(character_), widthBytes(widthBytes_) {
+		}
+		// For DBCS characters turn 2 bytes into an int
+		static CharacterExtracted DBCS(unsigned char lead, unsigned char trail) noexcept {
+			return CharacterExtracted((lead << 8) | trail, 2);
+		}
+	};
+
+	Scintilla::EndOfLine eolMode;
+	/// Can also be SC_CP_UTF8 to enable UTF-8 mode
+	int dbcsCodePage;
+	Scintilla::LineEndType lineEndBitSet;
+	int tabInChars;
+	int indentInChars;
+	int actualIndentInChars;
+	bool useTabs;
+	bool tabIndents;
+	bool backspaceUnindents;
+	ActionDuration durationStyleOneByte;
+
+	std::unique_ptr<IDecorationList> decorations;
+
+	Document(Scintilla::DocumentOption options);
+	// Deleted so Document objects can not be copied.
+	Document(const Document &) = delete;
+	Document(Document &&) = delete;
+	void operator=(const Document &) = delete;
+	Document &operator=(Document &&) = delete;
+	~Document() override;
+
+	int AddRef();
+	int SCI_METHOD Release() override;
+
+	// From PerLine
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	Scintilla::LineEndType LineEndTypesSupported() const;
+	bool SetDBCSCodePage(int dbcsCodePage_);
+	Scintilla::LineEndType GetLineEndTypesAllowed() const noexcept { return cb.GetLineEndTypes(); }
+	bool SetLineEndTypesAllowed(Scintilla::LineEndType lineEndBitSet_);
+	Scintilla::LineEndType GetLineEndTypesActive() const noexcept { return cb.GetLineEndTypes(); }
+
+	int SCI_METHOD Version() const override {
+		return Scintilla::dvRelease4;
+	}
+
+	void SCI_METHOD SetErrorStatus(int status) override;
+
+	Sci_Position SCI_METHOD LineFromPosition(Sci_Position pos) const override;
+	Sci::Line SciLineFromPosition(Sci::Position pos) const noexcept;	// Avoids casting LineFromPosition
+	Sci::Position ClampPositionIntoDocument(Sci::Position pos) const noexcept;
+	bool ContainsLineEnd(const char *s, Sci::Position length) const noexcept { return cb.ContainsLineEnd(s, length); }
+	bool IsCrLf(Sci::Position pos) const noexcept;
+	int LenChar(Sci::Position pos) const noexcept;
+	bool InGoodUTF8(Sci::Position pos, Sci::Position &start, Sci::Position &end) const noexcept;
+	Sci::Position MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd=true) const noexcept;
+	Sci::Position NextPosition(Sci::Position pos, int moveDir) const noexcept;
+	bool NextCharacter(Sci::Position &pos, int moveDir) const noexcept;	// Returns true if pos changed
+	Document::CharacterExtracted CharacterAfter(Sci::Position position) const noexcept;
+	Document::CharacterExtracted CharacterBefore(Sci::Position position) const noexcept;
+	Sci_Position SCI_METHOD GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const override;
+	Sci::Position GetRelativePositionUTF16(Sci::Position positionStart, Sci::Position characterOffset) const noexcept;
+	int SCI_METHOD GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const override;
+	int SCI_METHOD CodePage() const override;
+	bool SCI_METHOD IsDBCSLeadByte(char ch) const override;
+	bool IsDBCSLeadByteNoExcept(char ch) const noexcept;
+	bool IsDBCSTrailByteNoExcept(char ch) const noexcept;
+	int DBCSDrawBytes(std::string_view text) const noexcept;
+	bool IsDBCSDualByteAt(Sci::Position pos) const noexcept;
+	int SafeSegment(const char *text, int length, int lengthSegment) const noexcept;
+	EncodingFamily CodePageFamily() const noexcept;
+
+	// Gateways to modifying document
+	void ModifiedAt(Sci::Position pos) noexcept;
+	void CheckReadOnly();
+	bool DeleteChars(Sci::Position pos, Sci::Position len);
+	Sci::Position InsertString(Sci::Position position, const char *s, Sci::Position insertLength);
+	void ChangeInsertion(const char *s, Sci::Position length);
+	int SCI_METHOD AddData(const char *data, Sci_Position length) override;
+	void * SCI_METHOD ConvertToDocument() override;
+	Sci::Position Undo();
+	Sci::Position Redo();
+	bool CanUndo() const noexcept { return cb.CanUndo(); }
+	bool CanRedo() const noexcept { return cb.CanRedo(); }
+	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
+	bool SetUndoCollection(bool collectUndo) {
+		return cb.SetUndoCollection(collectUndo);
+	}
+	bool IsCollectingUndo() const noexcept { return cb.IsCollectingUndo(); }
+	void BeginUndoAction() { cb.BeginUndoAction(); }
+	void EndUndoAction() { cb.EndUndoAction(); }
+	void AddUndoAction(Sci::Position token, bool mayCoalesce) { cb.AddUndoAction(token, mayCoalesce); }
+	void SetSavePoint();
+	bool IsSavePoint() const noexcept { return cb.IsSavePoint(); }
+
+	void TentativeStart() { cb.TentativeStart(); }
+	void TentativeCommit() { cb.TentativeCommit(); }
+	void TentativeUndo();
+	bool TentativeActive() const noexcept { return cb.TentativeActive(); }
+
+	const char * SCI_METHOD BufferPointer() override { return cb.BufferPointer(); }
+	const char *RangePointer(Sci::Position position, Sci::Position rangeLength) noexcept { return cb.RangePointer(position, rangeLength); }
+	Sci::Position GapPosition() const noexcept { return cb.GapPosition(); }
+
+	int SCI_METHOD GetLineIndentation(Sci_Position line) override;
+	Sci::Position SetLineIndentation(Sci::Line line, Sci::Position indent);
+	Sci::Position GetLineIndentPosition(Sci::Line line) const;
+	Sci::Position GetColumn(Sci::Position pos);
+	Sci::Position CountCharacters(Sci::Position startPos, Sci::Position endPos) const noexcept;
+	Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const noexcept;
+	Sci::Position FindColumn(Sci::Line line, Sci::Position column);
+	void Indent(bool forwards, Sci::Line lineBottom, Sci::Line lineTop);
+	static std::string TransformLineEnds(const char *s, size_t len, Scintilla::EndOfLine eolModeWanted);
+	void ConvertLineEnds(Scintilla::EndOfLine eolModeSet);
+	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
+	bool IsReadOnly() const noexcept { return cb.IsReadOnly(); }
+	bool IsLarge() const noexcept { return cb.IsLarge(); }
+	Scintilla::DocumentOption Options() const noexcept;
+
+	void DelChar(Sci::Position pos);
+	void DelCharBack(Sci::Position pos);
+
+	char CharAt(Sci::Position position) const noexcept { return cb.CharAt(position); }
+	void SCI_METHOD GetCharRange(char *buffer, Sci_Position position, Sci_Position lengthRetrieve) const override {
+		cb.GetCharRange(buffer, position, lengthRetrieve);
+	}
+	char SCI_METHOD StyleAt(Sci_Position position) const override { return cb.StyleAt(position); }
+	int StyleIndexAt(Sci_Position position) const noexcept { return static_cast<unsigned char>(cb.StyleAt(position)); }
+	void GetStyleRange(unsigned char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const {
+		cb.GetStyleRange(buffer, position, lengthRetrieve);
+	}
+	int GetMark(Sci::Line line) const noexcept;
+	Sci::Line MarkerNext(Sci::Line lineStart, int mask) const noexcept;
+	int AddMark(Sci::Line line, int markerNum);
+	void AddMarkSet(Sci::Line line, int valueSet);
+	void DeleteMark(Sci::Line line, int markerNum);
+	void DeleteMarkFromHandle(int markerHandle);
+	void DeleteAllMarks(int markerNum);
+	Sci::Line LineFromHandle(int markerHandle) const noexcept;
+	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;
+	bool IsLineStartPosition(Sci::Position position) const;
+	Sci_Position SCI_METHOD LineEnd(Sci_Position line) const override;
+	Sci::Position LineEndPosition(Sci::Position position) const;
+	bool IsLineEndPosition(Sci::Position position) const;
+	bool IsPositionInLineEnd(Sci::Position position) const;
+	Sci::Position VCHomePosition(Sci::Position position) const;
+	Sci::Position IndexLineStart(Sci::Line line, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
+	Sci::Line LineFromPositionIndex(Sci::Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
+	Sci::Line LineFromPositionAfter(Sci::Line line, Sci::Position length) const noexcept;
+
+	int SCI_METHOD SetLevel(Sci_Position line, int level) override;
+	int SCI_METHOD GetLevel(Sci_Position line) const override;
+	Scintilla::FoldLevel GetFoldLevel(Sci_Position line) const;
+	void ClearLevels();
+	Sci::Line GetLastChild(Sci::Line lineParent, std::optional<Scintilla::FoldLevel> level = {}, Sci::Line lastLine = -1);
+	Sci::Line GetFoldParent(Sci::Line line) const;
+	void GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine);
+
+	Sci::Position ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters=false) const;
+	Sci::Position NextWordStart(Sci::Position pos, int delta) const;
+	Sci::Position NextWordEnd(Sci::Position pos, int delta) const;
+	Sci_Position SCI_METHOD Length() const override { return cb.Length(); }
+	Sci::Position LengthNoExcept() const noexcept { return cb.Length(); }
+	void Allocate(Sci::Position newSize) { cb.Allocate(newSize); }
+
+	CharacterExtracted ExtractCharacter(Sci::Position position) const noexcept;
+
+	bool IsWordStartAt(Sci::Position pos) const;
+	bool IsWordEndAt(Sci::Position pos) const;
+	bool IsWordAt(Sci::Position start, Sci::Position end) const;
+
+	bool MatchesWordOptions(bool word, bool wordStart, Sci::Position pos, Sci::Position length) const;
+	bool HasCaseFolder() const noexcept;
+	void SetCaseFolder(std::unique_ptr<CaseFolder> pcf_) noexcept;
+	Sci::Position FindText(Sci::Position minPos, Sci::Position maxPos, const char *search, Scintilla::FindOption flags, Sci::Position *length);
+	const char *SubstituteByPosition(const char *text, Sci::Position *length);
+	Scintilla::LineCharacterIndexType LineCharacterIndex() const noexcept;
+	void AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	void ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+	Sci::Line LinesTotal() const noexcept;
+	void AllocateLines(Sci::Line lines);
+
+	void SetDefaultCharClasses(bool includeWordClass);
+	void SetCharClasses(const unsigned char *chars, CharacterClass newCharClass);
+	int GetCharsOfClass(CharacterClass characterClass, unsigned char *buffer) const;
+	void SetCharacterCategoryOptimization(int countCharacters);
+	int CharacterCategoryOptimization() const noexcept;
+	void SCI_METHOD StartStyling(Sci_Position position) override;
+	bool SCI_METHOD SetStyleFor(Sci_Position length, char style) override;
+	bool SCI_METHOD SetStyles(Sci_Position length, const char *styles) override;
+	Sci::Position GetEndStyled() const noexcept { return endStyled; }
+	void EnsureStyledTo(Sci::Position pos);
+	void StyleToAdjustingLineDuration(Sci::Position pos);
+	void LexerChanged();
+	int GetStyleClock() const noexcept { return styleClock; }
+	void IncrementStyleClock() noexcept;
+	void SCI_METHOD DecorationSetCurrentIndicator(int indicator) override;
+	void SCI_METHOD DecorationFillRange(Sci_Position position, int value, Sci_Position fillLength) override;
+	LexInterface *GetLexInterface() const noexcept;
+	void SetLexInterface(std::unique_ptr<LexInterface> pLexInterface) noexcept;
+
+	int SCI_METHOD SetLineState(Sci_Position line, int state) override;
+	int SCI_METHOD GetLineState(Sci_Position line) const override;
+	Sci::Line GetMaxLineState() const noexcept;
+	void SCI_METHOD ChangeLexerState(Sci_Position start, Sci_Position end) override;
+
+	StyledText MarginStyledText(Sci::Line line) const noexcept;
+	void MarginSetStyle(Sci::Line line, int style);
+	void MarginSetStyles(Sci::Line line, const unsigned char *styles);
+	void MarginSetText(Sci::Line line, const char *text);
+	void MarginClearAll();
+
+	StyledText AnnotationStyledText(Sci::Line line) const noexcept;
+	void AnnotationSetText(Sci::Line line, const char *text);
+	void AnnotationSetStyle(Sci::Line line, int style);
+	void AnnotationSetStyles(Sci::Line line, const unsigned char *styles);
+	int AnnotationLines(Sci::Line line) const noexcept;
+	void AnnotationClearAll();
+
+	StyledText EOLAnnotationStyledText(Sci::Line line) const noexcept;
+	void EOLAnnotationSetStyle(Sci::Line line, int style);
+	void EOLAnnotationSetText(Sci::Line line, const char *text);
+	void EOLAnnotationClearAll();
+
+	bool AddWatcher(DocWatcher *watcher, void *userData);
+	bool RemoveWatcher(DocWatcher *watcher, void *userData) noexcept;
+
+	CharacterClass WordCharacterClass(unsigned int ch) const;
+	bool IsWordPartSeparator(unsigned int ch) const;
+	Sci::Position WordPartLeft(Sci::Position pos) const;
+	Sci::Position WordPartRight(Sci::Position pos) const;
+	Sci::Position ExtendStyleRange(Sci::Position pos, int delta, bool singleLine) noexcept;
+	bool IsWhiteLine(Sci::Line line) const;
+	Sci::Position ParaUp(Sci::Position pos) const;
+	Sci::Position ParaDown(Sci::Position pos) const;
+	int IndentSize() const noexcept { return actualIndentInChars; }
+	Sci::Position BraceMatch(Sci::Position position, Sci::Position maxReStyle, Sci::Position startPos, bool useStartPos) noexcept;
+
+private:
+	void NotifyModifyAttempt();
+	void NotifySavePoint(bool atSavePoint);
+	void NotifyModified(DocModification mh);
+};
+
+class UndoGroup {
+	Document *pdoc;
+	bool groupNeeded;
+public:
+	UndoGroup(Document *pdoc_, bool groupNeeded_=true) :
+		pdoc(pdoc_), groupNeeded(groupNeeded_) {
+		if (groupNeeded) {
+			pdoc->BeginUndoAction();
+		}
+	}
+	// Deleted so UndoGroup objects can not be copied.
+	UndoGroup(const UndoGroup &) = delete;
+	UndoGroup(UndoGroup &&) = delete;
+	void operator=(const UndoGroup &) = delete;
+	UndoGroup &operator=(UndoGroup &&) = delete;
+	~UndoGroup() {
+		if (groupNeeded) {
+			// EndUndoAction can throw as it allocates but throw in destructor is fatal.
+			// To fix this UndoHistory should allocate any memory needed by EndUndoAction
+			// beforehand or change EndUndoAction to not require allocation.
+			pdoc->EndUndoAction();
+		}
+	}
+	bool Needed() const noexcept {
+		return groupNeeded;
+	}
+};
+
+
+/**
+ * To optimise processing of document modifications by DocWatchers, a hint is passed indicating the
+ * scope of the change.
+ * If the DocWatcher is a document view then this can be used to optimise screen updating.
+ */
+class DocModification {
+public:
+	Scintilla::ModificationFlags modificationType;
+	Sci::Position position;
+	Sci::Position length;
+	Sci::Line linesAdded;	/**< Negative if lines deleted. */
+	const char *text;	/**< Only valid for changes to text, not for changes to style. */
+	Sci::Line line;
+	Scintilla::FoldLevel foldLevelNow;
+	Scintilla::FoldLevel foldLevelPrev;
+	Sci::Line annotationLinesAdded;
+	Sci::Position token;
+
+	DocModification(Scintilla::ModificationFlags modificationType_, Sci::Position position_=0, Sci::Position length_=0,
+		Sci::Line linesAdded_=0, const char *text_=nullptr, Sci::Line line_=0) noexcept :
+		modificationType(modificationType_),
+		position(position_),
+		length(length_),
+		linesAdded(linesAdded_),
+		text(text_),
+		line(line_),
+		foldLevelNow(Scintilla::FoldLevel::None),
+		foldLevelPrev(Scintilla::FoldLevel::None),
+		annotationLinesAdded(0),
+		token(0) {}
+
+	DocModification(Scintilla::ModificationFlags modificationType_, const Action &act, Sci::Line linesAdded_=0) noexcept :
+		modificationType(modificationType_),
+		position(act.position),
+		length(act.lenData),
+		linesAdded(linesAdded_),
+		text(act.data.get()),
+		line(0),
+		foldLevelNow(Scintilla::FoldLevel::None),
+		foldLevelPrev(Scintilla::FoldLevel::None),
+		annotationLinesAdded(0),
+		token(0) {}
+};
+
+/**
+ * A class that wants to receive notifications from a Document must be derived from DocWatcher
+ * and implement the notification methods. It can then be added to the watcher list with AddWatcher.
+ */
+class DocWatcher {
+public:
+	virtual ~DocWatcher() {}
+
+	virtual void NotifyModifyAttempt(Document *doc, void *userData) = 0;
+	virtual void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) = 0;
+	virtual void NotifyModified(Document *doc, DocModification mh, void *userData) = 0;
+	virtual void NotifyDeleted(Document *doc, void *userData) noexcept = 0;
+	virtual void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) = 0;
+	virtual void NotifyLexerChanged(Document *doc, void *userData) = 0;
+	virtual void NotifyErrorOccurred(Document *doc, void *userData, Scintilla::Status status) = 0;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/EditModel.cxx b/scite-app/scintilla/src/EditModel.cxx
new file mode 100644
index 0000000..5dd3cc8
--- /dev/null
+++ b/scite-app/scintilla/src/EditModel.cxx
@@ -0,0 +1,123 @@
+// Scintilla source code edit control
+/** @file EditModel.cxx
+ ** Defines the editor state that must be visible to EditorView.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterCategoryMap.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+Caret::Caret() noexcept :
+	active(false), on(false), period(500) {}
+
+EditModel::EditModel() : braces{} {
+	inOverstrike = false;
+	xOffset = 0;
+	trackLineWidth = false;
+	posDrag = SelectionPosition(Sci::invalidPosition);
+	braces[0] = Sci::invalidPosition;
+	braces[1] = Sci::invalidPosition;
+	bracesMatchStyle = StyleBraceBad;
+	highlightGuideColumn = 0;
+	hasFocus = false;
+	primarySelection = true;
+	imeInteraction = IMEInteraction::Windowed;
+	bidirectional = Bidirectional::Disabled;
+	foldFlags = FoldFlag::None;
+	foldDisplayTextStyle = FoldDisplayTextStyle::Hidden;
+	hotspot = Range(Sci::invalidPosition);
+	hotspotSingleLine = true;
+	hoverIndicatorPos = Sci::invalidPosition;
+	wrapWidth = LineLayout::wrapWidthInfinite;
+	pdoc = new Document(DocumentOption::Default);
+	pdoc->AddRef();
+	pcs = ContractionStateCreate(pdoc->IsLarge());
+}
+
+EditModel::~EditModel() {
+	try {
+		// This never throws but isn't marked noexcept for compatibility
+		pdoc->Release();
+	} catch (...) {
+		// Ignore any exception
+	}
+	pdoc = nullptr;
+}
+
+bool EditModel::BidirectionalEnabled() const noexcept {
+	return (bidirectional != Bidirectional::Disabled) &&
+		(CpUtf8 == pdoc->dbcsCodePage);
+}
+
+bool EditModel::BidirectionalR2L() const noexcept {
+	return bidirectional == Bidirectional::R2L;
+}
+
+void EditModel::SetDefaultFoldDisplayText(const char *text) {
+	defaultFoldDisplayText = IsNullOrEmpty(text) ? UniqueString() : UniqueStringCopy(text);
+}
+
+const char *EditModel::GetDefaultFoldDisplayText() const noexcept {
+	return defaultFoldDisplayText.get();
+}
+
+const char *EditModel::GetFoldDisplayText(Sci::Line lineDoc) const noexcept {
+	if (foldDisplayTextStyle == FoldDisplayTextStyle::Hidden || pcs->GetExpanded(lineDoc)) {
+		return nullptr;
+	}
+
+	const char *text = pcs->GetFoldDisplayText(lineDoc);
+	return text ? text : defaultFoldDisplayText.get();
+}
+
+InSelection EditModel::LineEndInSelection(Sci::Line lineDoc) const {
+	const Sci::Position posAfterLineEnd = pdoc->LineStart(lineDoc + 1);
+	return sel.InSelectionForEOL(posAfterLineEnd);
+}
diff --git a/scite-app/scintilla/src/EditModel.h b/scite-app/scintilla/src/EditModel.h
new file mode 100644
index 0000000..16a3d1c
--- /dev/null
+++ b/scite-app/scintilla/src/EditModel.h
@@ -0,0 +1,78 @@
+// Scintilla source code edit control
+/** @file EditModel.h
+ ** Defines the editor state that must be visible to EditorView.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef EDITMODEL_H
+#define EDITMODEL_H
+
+namespace Scintilla::Internal {
+
+/**
+*/
+class Caret {
+public:
+	bool active;
+	bool on;
+	int period;
+
+	Caret() noexcept;
+};
+
+class EditModel {
+public:
+	bool inOverstrike;
+	int xOffset;		///< Horizontal scrolled amount in pixels
+	bool trackLineWidth;
+
+	SpecialRepresentations reprs;
+	Caret caret;
+	SelectionPosition posDrag;
+	Sci::Position braces[2];
+	int bracesMatchStyle;
+	int highlightGuideColumn;
+	bool hasFocus;
+	Selection sel;
+	bool primarySelection;
+
+	Scintilla::IMEInteraction imeInteraction;
+	Scintilla::Bidirectional bidirectional;
+
+	Scintilla::FoldFlag foldFlags;
+	Scintilla::FoldDisplayTextStyle foldDisplayTextStyle;
+	UniqueString defaultFoldDisplayText;
+	std::unique_ptr<IContractionState> pcs;
+	// Hotspot support
+	Range hotspot;
+	bool hotspotSingleLine;
+	Sci::Position hoverIndicatorPos;
+
+	// Wrapping support
+	int wrapWidth;
+
+	Document *pdoc;
+
+	EditModel();
+	// Deleted so EditModel objects can not be copied.
+	EditModel(const EditModel &) = delete;
+	EditModel(EditModel &&) = delete;
+	EditModel &operator=(const EditModel &) = delete;
+	EditModel &operator=(EditModel &&) = delete;
+	virtual ~EditModel();
+	virtual Sci::Line TopLineOfMain() const = 0;
+	virtual Point GetVisibleOriginInMain() const = 0;
+	virtual Sci::Line LinesOnScreen() const = 0;
+	virtual Range GetHotSpotRange() const noexcept = 0;
+	bool BidirectionalEnabled() const noexcept;
+	bool BidirectionalR2L() const noexcept;
+	void SetDefaultFoldDisplayText(const char *text);
+	const char *GetDefaultFoldDisplayText() const noexcept;
+	const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept;
+	InSelection LineEndInSelection(Sci::Line lineDoc) const;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/EditView.cxx b/scite-app/scintilla/src/EditView.cxx
new file mode 100644
index 0000000..e4b0fa5
--- /dev/null
+++ b/scite-app/scintilla/src/EditView.cxx
@@ -0,0 +1,2724 @@
+// Scintilla source code edit control
+/** @file EditView.cxx
+ ** Defines the appearance of the main text area of the editor window.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "ElapsedPeriod.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+PrintParameters::PrintParameters() noexcept {
+	magnification = 0;
+	colourMode = PrintOption::Normal;
+	wrapState = Wrap::Word;
+}
+
+namespace Scintilla::Internal {
+
+bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st) noexcept {
+	if (st.multipleStyles) {
+		for (size_t iStyle = 0; iStyle<st.length; iStyle++) {
+			if (!vs.ValidStyle(styleOffset + st.styles[iStyle]))
+				return false;
+		}
+	} else {
+		if (!vs.ValidStyle(styleOffset + st.style))
+			return false;
+	}
+	return true;
+}
+
+static int WidthStyledText(Surface *surface, const ViewStyle &vs, int styleOffset,
+	const char *text, const unsigned char *styles, size_t len) {
+	int width = 0;
+	size_t start = 0;
+	while (start < len) {
+		const unsigned char style = styles[start];
+		size_t endSegment = start;
+		while ((endSegment + 1 < len) && (styles[endSegment + 1] == style))
+			endSegment++;
+		const Font *fontText = vs.styles[style + styleOffset].font.get();
+		const std::string_view sv(text + start, endSegment - start + 1);
+		width += static_cast<int>(surface->WidthText(fontText, sv));
+		start = endSegment + 1;
+	}
+	return width;
+}
+
+int WidestLineWidth(Surface *surface, const ViewStyle &vs, int styleOffset, const StyledText &st) {
+	int widthMax = 0;
+	size_t start = 0;
+	while (start < st.length) {
+		const size_t lenLine = st.LineLength(start);
+		int widthSubLine;
+		if (st.multipleStyles) {
+			widthSubLine = WidthStyledText(surface, vs, styleOffset, st.text + start, st.styles + start, lenLine);
+		} else {
+			const Font *fontText = vs.styles[styleOffset + st.style].font.get();
+			const std::string_view text(st.text + start, lenLine);
+			widthSubLine = static_cast<int>(surface->WidthText(fontText, text));
+		}
+		if (widthSubLine > widthMax)
+			widthMax = widthSubLine;
+		start += lenLine + 1;
+	}
+	return widthMax;
+}
+
+void DrawTextNoClipPhase(Surface *surface, PRectangle rc, const Style &style, XYPOSITION ybase,
+	std::string_view text, DrawPhase phase) {
+	const Font *fontText = style.font.get();
+	if (FlagSet(phase, DrawPhase::back)) {
+		if (FlagSet(phase, DrawPhase::text)) {
+			// Drawing both
+			surface->DrawTextNoClip(rc, fontText, ybase, text,
+				style.fore, style.back);
+		} else {
+			surface->FillRectangleAligned(rc, Fill(style.back));
+		}
+	} else if (FlagSet(phase, DrawPhase::text)) {
+		surface->DrawTextTransparent(rc, fontText, ybase, text, style.fore);
+	}
+}
+
+void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRectangle rcText,
+	const StyledText &st, size_t start, size_t length, DrawPhase phase) {
+
+	if (st.multipleStyles) {
+		int x = static_cast<int>(rcText.left);
+		size_t i = 0;
+		while (i < length) {
+			size_t end = i;
+			size_t style = st.styles[i + start];
+			while (end < length - 1 && st.styles[start + end + 1] == style)
+				end++;
+			style += styleOffset;
+			const Font *fontText = vs.styles[style].font.get();
+			const std::string_view text(st.text + start + i, end - i + 1);
+			const int width = static_cast<int>(surface->WidthText(fontText, text));
+			PRectangle rcSegment = rcText;
+			rcSegment.left = static_cast<XYPOSITION>(x);
+			rcSegment.right = static_cast<XYPOSITION>(x + width + 1);
+			DrawTextNoClipPhase(surface, rcSegment, vs.styles[style],
+				rcText.top + vs.maxAscent, text, phase);
+			x += width;
+			i = end + 1;
+		}
+	} else {
+		const size_t style = st.style + styleOffset;
+		DrawTextNoClipPhase(surface, rcText, vs.styles[style],
+			rcText.top + vs.maxAscent,
+			std::string_view(st.text + start, length), phase);
+	}
+}
+
+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() {
+	tabWidthMinimumPixels = 2; // needed for calculating tab stops for fractional proportional fonts
+	hideSelection = false;
+	drawOverstrikeCaret = true;
+	bufferedDraw = true;
+	phasesDraw = PhasesDraw::Two;
+	lineWidthMaxSeen = 0;
+	additionalCaretsBlink = true;
+	additionalCaretsVisible = true;
+	imeCaretBlockOverride = false;
+	llc.SetLevel(LineCache::Caret);
+	posCache.SetSize(0x400);
+	tabArrowHeight = 4;
+	customDrawTabArrow = nullptr;
+	customDrawWrapMarker = nullptr;
+}
+
+EditView::~EditView() = default;
+
+bool EditView::SetTwoPhaseDraw(bool twoPhaseDraw) noexcept {
+	const PhasesDraw phasesDrawNew = twoPhaseDraw ? PhasesDraw::Two : PhasesDraw::One;
+	const bool redraw = phasesDraw != phasesDrawNew;
+	phasesDraw = phasesDrawNew;
+	return redraw;
+}
+
+bool EditView::SetPhasesDraw(int phases) noexcept {
+	const PhasesDraw phasesDrawNew = static_cast<PhasesDraw>(phases);
+	const bool redraw = phasesDraw != phasesDrawNew;
+	phasesDraw = phasesDrawNew;
+	return redraw;
+}
+
+bool EditView::LinesOverlap() const noexcept {
+	return phasesDraw == PhasesDraw::Multiple;
+}
+
+void EditView::ClearAllTabstops() noexcept {
+	ldTabstops.reset();
+}
+
+XYPOSITION EditView::NextTabstopPos(Sci::Line line, XYPOSITION x, XYPOSITION tabWidth) const noexcept {
+	const int next = GetNextTabstop(line, static_cast<int>(x + tabWidthMinimumPixels));
+	if (next > 0)
+		return static_cast<XYPOSITION>(next);
+	return (static_cast<int>((x + tabWidthMinimumPixels) / tabWidth) + 1) * tabWidth;
+}
+
+bool EditView::ClearTabstops(Sci::Line line) noexcept {
+	return ldTabstops && ldTabstops->ClearTabstops(line);
+}
+
+bool EditView::AddTabstop(Sci::Line line, int x) {
+	if (!ldTabstops) {
+		ldTabstops = std::make_unique<LineTabstops>();
+	}
+	return ldTabstops && ldTabstops->AddTabstop(line, x);
+}
+
+int EditView::GetNextTabstop(Sci::Line line, int x) const noexcept {
+	if (ldTabstops) {
+		return ldTabstops->GetNextTabstop(line, x);
+	} else {
+		return 0;
+	}
+}
+
+void EditView::LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded) {
+	if (ldTabstops) {
+		if (linesAdded > 0) {
+			for (Sci::Line line = lineOfPos; line < lineOfPos + linesAdded; line++) {
+				ldTabstops->InsertLine(line);
+			}
+		} else {
+			for (Sci::Line line = (lineOfPos + -linesAdded) - 1; line >= lineOfPos; line--) {
+				ldTabstops->RemoveLine(line);
+			}
+		}
+	}
+}
+
+void EditView::DropGraphics() noexcept {
+	pixmapLine.reset();
+	pixmapIndentGuide.reset();
+	pixmapIndentGuideHighlight.reset();
+}
+
+static 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";
+	}
+}
+
+static void DrawTabArrow(Surface *surface, PRectangle rcTab, int ymid,
+	const ViewStyle &vsDraw, Stroke stroke) {
+
+	const XYPOSITION halfWidth = stroke.width / 2.0;
+
+	const XYPOSITION leftStroke = std::round(std::min(rcTab.left + 2, rcTab.right - 1)) + halfWidth;
+	const XYPOSITION rightStroke = std::max(leftStroke, std::round(rcTab.right) - 1.0f - halfWidth);
+	const XYPOSITION yMidAligned = ymid + halfWidth;
+	const Point arrowPoint(rightStroke, yMidAligned);
+	if (rightStroke > leftStroke) {
+		// When not enough room, don't draw the arrow shaft
+		surface->LineDraw(Point(leftStroke, yMidAligned), arrowPoint, stroke);
+	}
+
+	// Draw the arrow head if needed
+	if (vsDraw.tabDrawMode == TabDrawMode::LongArrow) {
+		XYPOSITION ydiff = std::floor(rcTab.Height() / 2.0f);
+		XYPOSITION xhead = rightStroke - ydiff;
+		if (xhead <= rcTab.left) {
+			ydiff -= rcTab.left - xhead;
+			xhead = rcTab.left;
+		}
+		const Point ptsHead[] = {
+			Point(xhead, yMidAligned - ydiff),
+			arrowPoint,
+			Point(xhead, yMidAligned + ydiff)
+		};
+		surface->PolyLine(ptsHead, std::size(ptsHead), stroke);
+	}
+}
+
+void EditView::RefreshPixMaps(Surface *surfaceWindow, const ViewStyle &vsDraw) {
+	if (!pixmapIndentGuide) {
+		// 1 extra pixel in height so can handle odd/even positions and so produce a continuous line
+		pixmapIndentGuide = surfaceWindow->AllocatePixMap(1, vsDraw.lineHeight + 1);
+		pixmapIndentGuideHighlight = surfaceWindow->AllocatePixMap(1, vsDraw.lineHeight + 1);
+		const PRectangle rcIG = PRectangle::FromInts(0, 0, 1, vsDraw.lineHeight);
+		pixmapIndentGuide->FillRectangle(rcIG, vsDraw.styles[StyleIndentGuide].back);
+		pixmapIndentGuideHighlight->FillRectangle(rcIG, vsDraw.styles[StyleBraceLight].back);
+		for (int stripe = 1; stripe < vsDraw.lineHeight + 1; stripe += 2) {
+			const PRectangle rcPixel = PRectangle::FromInts(0, stripe, 1, stripe + 1);
+			pixmapIndentGuide->FillRectangle(rcPixel, vsDraw.styles[StyleIndentGuide].fore);
+			pixmapIndentGuideHighlight->FillRectangle(rcPixel, vsDraw.styles[StyleBraceLight].fore);
+		}
+		pixmapIndentGuide->FlushDrawing();
+		pixmapIndentGuideHighlight->FlushDrawing();
+	}
+}
+
+std::shared_ptr<LineLayout> EditView::RetrieveLineLayout(Sci::Line lineNumber, const EditModel &model) {
+	const Sci::Position posLineStart = model.pdoc->LineStart(lineNumber);
+	const Sci::Position posLineEnd = model.pdoc->LineStart(lineNumber + 1);
+	PLATFORM_ASSERT(posLineEnd >= posLineStart);
+	const Sci::Line lineCaret = model.pdoc->SciLineFromPosition(model.sel.MainCaret());
+	return llc.Retrieve(lineNumber, lineCaret,
+		static_cast<int>(posLineEnd - posLineStart), model.pdoc->GetStyleClock(),
+		model.LinesOnScreen() + 1, model.pdoc->LinesTotal());
+}
+
+namespace {
+
+constexpr XYPOSITION epsilon = 0.0001f;	// A small nudge to avoid floating point precision issues
+
+/**
+* Return the chDoc argument with case transformed as indicated by the caseForce argument.
+* chPrevious is needed for camel casing.
+* This only affects ASCII characters and is provided for languages with case-insensitive
+* ASCII keywords where the user wishes to view keywords in a preferred case.
+*/
+inline char CaseForce(Style::CaseForce caseForce, char chDoc, char chPrevious) noexcept {
+	switch (caseForce) {
+	case Style::CaseForce::mixed:
+		return chDoc;
+	case Style::CaseForce::lower:
+		return MakeLowerCase(chDoc);
+	case Style::CaseForce::upper:
+		return MakeUpperCase(chDoc);
+	case Style::CaseForce::camel:
+	default:	// default should not occur, included to avoid warnings
+		if (IsUpperOrLowerCase(chDoc) && !IsUpperOrLowerCase(chPrevious)) {
+			return MakeUpperCase(chDoc);
+		} else {
+			return MakeLowerCase(chDoc);
+		}
+	}
+}
+
+constexpr bool IsControlCharacter(int ch) noexcept {
+	// iscntrl returns true for lots of chars > 127 which are displayable,
+	// currently only check C0 control characters.
+	return (ch >= 0 && ch < ' ') || (ch == 127);
+}
+
+bool ViewIsASCII(std::string_view text) {
+	return std::all_of(text.cbegin(), text.cend(), IsASCII);
+}
+
+}
+
+/**
+* Fill in the LineLayout data for the given line.
+* 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) {
+	if (!ll)
+		return;
+
+	const Sci::Line line = ll->LineNumber();
+	PLATFORM_ASSERT(line < model.pdoc->LinesTotal());
+	PLATFORM_ASSERT(ll->chars);
+	const Sci::Position posLineStart = model.pdoc->LineStart(line);
+	Sci::Position posLineEnd = model.pdoc->LineStart(line + 1);
+	// If the line is very long, limit the treatment to a length that should fit in the viewport
+	if (posLineEnd >(posLineStart + ll->maxLineLength)) {
+		posLineEnd = posLineStart + ll->maxLineLength;
+	}
+	// Hard to cope when too narrow, so just assume there is space
+	width = std::max(width, 20);
+
+	if (ll->validity == LineLayout::ValidLevel::checkTextAndStyle) {
+		Sci::Position lineLength = posLineEnd - posLineStart;
+		if (!vstyle.viewEOL) {
+			lineLength = model.pdoc->LineEnd(line) - posLineStart;
+		}
+		if (lineLength == ll->numCharsInLine) {
+			// See if chars, styles, indicators, are all the same
+			bool allSame = true;
+			// Check base line layout
+			char chPrevious = 0;
+			for (Sci::Position numCharsInLine = 0; numCharsInLine < lineLength; numCharsInLine++) {
+				const Sci::Position charInDoc = numCharsInLine + posLineStart;
+				const char chDoc = model.pdoc->CharAt(charInDoc);
+				const int styleByte = model.pdoc->StyleIndexAt(charInDoc);
+				allSame = allSame &&
+					(ll->styles[numCharsInLine] == styleByte);
+				allSame = allSame &&
+					(ll->chars[numCharsInLine] == CaseForce(vstyle.styles[styleByte].caseForce, chDoc, chPrevious));
+				chPrevious = chDoc;
+			}
+			const int styleByteLast = (posLineEnd > posLineStart) ? model.pdoc->StyleIndexAt(posLineEnd - 1) : 0;
+			allSame = allSame && (ll->styles[lineLength] == styleByteLast);	// For eolFilled
+			if (allSame) {
+				ll->validity = (ll->widthLine != width) ? LineLayout::ValidLevel::positions : LineLayout::ValidLevel::lines;
+			} else {
+				ll->validity = LineLayout::ValidLevel::invalid;
+			}
+		} else {
+			ll->validity = LineLayout::ValidLevel::invalid;
+		}
+	}
+	if (ll->validity == LineLayout::ValidLevel::invalid) {
+		ll->widthLine = LineLayout::wrapWidthInfinite;
+		ll->lines = 1;
+		if (vstyle.edgeState == EdgeVisualStyle::Background) {
+			Sci::Position edgePosition = model.pdoc->FindColumn(line, vstyle.theEdge.column);
+			if (edgePosition >= posLineStart) {
+				edgePosition -= posLineStart;
+			}
+			ll->edgeColumn = static_cast<int>(edgePosition);
+		} else {
+			ll->edgeColumn = -1;
+		}
+
+		// Fill base line layout
+		const int lineLength = static_cast<int>(posLineEnd - posLineStart);
+		model.pdoc->GetCharRange(ll->chars.get(), posLineStart, lineLength);
+		model.pdoc->GetStyleRange(ll->styles.get(), posLineStart, lineLength);
+		const int numCharsBeforeEOL = static_cast<int>(model.pdoc->LineEnd(line) - posLineStart);
+		const int numCharsInLine = (vstyle.viewEOL) ? lineLength : numCharsBeforeEOL;
+		const unsigned char styleByteLast = (lineLength > 0) ? ll->styles[lineLength - 1] : 0;
+		if (vstyle.someStylesForceCase) {
+			char chPrevious = 0;
+			for (int charInLine = 0; charInLine<lineLength; charInLine++) {
+				const char chDoc = ll->chars[charInLine];
+				ll->chars[charInLine] = CaseForce(vstyle.styles[ll->styles[charInLine]].caseForce, chDoc, chPrevious);
+				chPrevious = chDoc;
+			}
+		}
+		ll->xHighlightGuide = 0;
+		// Extra element at the end of the line to hold end x position and act as
+		ll->chars[numCharsInLine] = 0;   // Also triggers processing in the loops as this is a control character
+		ll->styles[numCharsInLine] = styleByteLast;	// For eolFilled
+
+		// Layout the line, determining the position of each character,
+		// with an extra element at the end for the end of the line.
+		ll->positions[0] = 0;
+		bool lastSegItalics = false;
+
+		BreakFinder bfLayout(ll, nullptr, Range(0, numCharsInLine), posLineStart, 0, false, model.pdoc, &model.reprs, nullptr);
+		while (bfLayout.More()) {
+
+			const TextSegment ts = bfLayout.Next();
+
+			std::fill(&ll->positions[ts.start + 1], &ll->positions[ts.end() + 1], 0.0f);
+			if (vstyle.styles[ll->styles[ts.start]].visible) {
+				if (ts.representation) {
+					XYPOSITION representationWidth = vstyle.controlCharWidth;
+					if (ll->chars[ts.start] == '\t') {
+						// Tab is a special case of representation, taking a variable amount of space
+						const XYPOSITION x = ll->positions[ts.start];
+						representationWidth = NextTabstopPos(line, x, vstyle.tabWidth) - ll->positions[ts.start];
+					} else {
+						if (representationWidth <= 0.0) {
+							assert(ts.representation->stringRep.length() <= Representation::maxLength);
+							XYPOSITION positionsRepr[Representation::maxLength+1];
+							// ts.representation->stringRep is UTF-8 which only matches cache if document is UTF-8
+							// or it only contains ASCII which is a subset of all currently supported encodings.
+							if ((CpUtf8 == model.pdoc->dbcsCodePage) || ViewIsASCII(ts.representation->stringRep)) {
+								posCache.MeasureWidths(surface, vstyle, StyleControlChar, ts.representation->stringRep,
+									positionsRepr);
+							} else {
+								surface->MeasureWidthsUTF8(vstyle.styles[StyleControlChar].font.get(), ts.representation->stringRep, positionsRepr);
+							}
+							representationWidth = positionsRepr[ts.representation->stringRep.length() - 1];
+							if (FlagSet(ts.representation->appearance, RepresentationAppearance::Blob)) {
+								representationWidth += vstyle.ctrlCharPadding;
+							}
+						}
+					}
+					for (int ii = 0; ii < ts.length; ii++)
+						ll->positions[ts.start + 1 + ii] = representationWidth;
+				} else {
+					if ((ts.length == 1) && (' ' == ll->chars[ts.start])) {
+						// Over half the segments are single characters and of these about half are space characters.
+						ll->positions[ts.start + 1] = vstyle.styles[ll->styles[ts.start]].spaceWidth;
+					} else {
+						posCache.MeasureWidths(surface, vstyle, ll->styles[ts.start],
+							std::string_view(&ll->chars[ts.start], ts.length), &ll->positions[ts.start + 1]);
+					}
+				}
+				lastSegItalics = (!ts.representation) && ((ll->chars[ts.end() - 1] != ' ') && vstyle.styles[ll->styles[ts.start]].italic);
+			}
+
+			for (Sci::Position posToIncrease = ts.start + 1; posToIncrease <= ts.end(); posToIncrease++) {
+				ll->positions[posToIncrease] += ll->positions[ts.start];
+			}
+		}
+
+		// Small hack to make lines that end with italics not cut off the edge of the last character
+		if (lastSegItalics) {
+			ll->positions[numCharsInLine] += vstyle.lastSegItalicsOffset;
+		}
+		ll->numCharsInLine = numCharsInLine;
+		ll->numCharsBeforeEOL = numCharsBeforeEOL;
+		ll->validity = LineLayout::ValidLevel::positions;
+	}
+	if ((ll->validity == LineLayout::ValidLevel::positions) || (ll->widthLine != width)) {
+		ll->widthLine = width;
+		if (width == LineLayout::wrapWidthInfinite) {
+			ll->lines = 1;
+		} else if (width > ll->positions[ll->numCharsInLine]) {
+			// Simple common case where line does not need wrapping.
+			ll->lines = 1;
+		} else {
+			if (FlagSet(vstyle.wrap.visualFlags, WrapVisualFlag::End)) {
+				width -= static_cast<int>(vstyle.aveCharWidth); // take into account the space for end wrap mark
+			}
+			XYPOSITION wrapAddIndent = 0; // This will be added to initial indent of line
+			switch (vstyle.wrap.indentMode) {
+			case WrapIndentMode::Fixed:
+				wrapAddIndent = vstyle.wrap.visualStartIndent * vstyle.aveCharWidth;
+				break;
+			case WrapIndentMode::Indent:
+				wrapAddIndent = model.pdoc->IndentSize() * vstyle.spaceWidth;
+				break;
+			case WrapIndentMode::DeepIndent:
+				wrapAddIndent = model.pdoc->IndentSize() * 2 * vstyle.spaceWidth;
+				break;
+			default:	// No additional indent for WrapIndentMode::Fixed
+				break;
+			}
+			ll->wrapIndent = wrapAddIndent;
+			if (vstyle.wrap.indentMode != WrapIndentMode::Fixed) {
+				for (int i = 0; i < ll->numCharsInLine; i++) {
+					if (!IsSpaceOrTab(ll->chars[i])) {
+						ll->wrapIndent += ll->positions[i]; // Add line indent
+						break;
+					}
+				}
+			}
+			// Check for text width minimum
+			if (ll->wrapIndent > width - static_cast<int>(vstyle.aveCharWidth) * 15)
+				ll->wrapIndent = wrapAddIndent;
+			// 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->lines = 0;
+			// Calculate line start positions based upon width.
+			Sci::Position lastGoodBreak = 0;
+			Sci::Position lastLineStart = 0;
+			XYACCUMULATOR startOffset = 0;
+			Sci::Position p = 0;
+			while (p < ll->numCharsInLine) {
+				if ((ll->positions[p + 1] - startOffset) >= width) {
+					if (lastGoodBreak == lastLineStart) {
+						// Try moving to start of last character
+						if (p > 0) {
+							lastGoodBreak = model.pdoc->MovePositionOutsideChar(p + posLineStart, -1)
+								- posLineStart;
+						}
+						if (lastGoodBreak == lastLineStart) {
+							// Ensure at least one character on line.
+							lastGoodBreak = model.pdoc->MovePositionOutsideChar(lastGoodBreak + posLineStart + 1, 1)
+								- posLineStart;
+						}
+					}
+					lastLineStart = lastGoodBreak;
+					ll->lines++;
+					ll->SetLineStart(ll->lines, static_cast<int>(lastGoodBreak));
+					startOffset = ll->positions[lastGoodBreak];
+					// take into account the space for start wrap mark and indent
+					startOffset -= ll->wrapIndent;
+					p = lastGoodBreak + 1;
+					continue;
+				}
+				if (p > 0) {
+					if (vstyle.wrap.state == Wrap::Char) {
+						lastGoodBreak = model.pdoc->MovePositionOutsideChar(p + posLineStart, -1)
+							- posLineStart;
+						p = model.pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart;
+						continue;
+					} else if ((vstyle.wrap.state == Wrap::Word) && (ll->styles[p] != ll->styles[p - 1])) {
+						lastGoodBreak = p;
+					} else if (IsSpaceOrTab(ll->chars[p - 1]) && !IsSpaceOrTab(ll->chars[p])) {
+						lastGoodBreak = p;
+					}
+				}
+				p++;
+			}
+			ll->lines++;
+		}
+		ll->validity = LineLayout::ValidLevel::lines;
+	}
+}
+
+// Fill the LineLayout bidirectional data fields according to each char style
+
+void EditView::UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, LineLayout *ll) {
+	if (model.BidirectionalEnabled()) {
+		ll->EnsureBidiData();
+		for (int stylesInLine = 0; stylesInLine < ll->numCharsInLine; stylesInLine++) {
+			ll->bidiData->stylesFonts[stylesInLine] = vstyle.styles[ll->styles[stylesInLine]].font;
+		}
+		ll->bidiData->stylesFonts[ll->numCharsInLine].reset();
+
+		for (int charsInLine = 0; charsInLine < ll->numCharsInLine; charsInLine++) {
+			const int charWidth = UTF8DrawBytes(reinterpret_cast<unsigned char *>(&ll->chars[charsInLine]), ll->numCharsInLine - charsInLine);
+			const Representation *repr = model.reprs.RepresentationFromCharacter(std::string_view(&ll->chars[charsInLine], charWidth));
+
+			ll->bidiData->widthReprs[charsInLine] = 0.0f;
+			if (repr && ll->chars[charsInLine] != '\t') {
+				ll->bidiData->widthReprs[charsInLine] = ll->positions[charsInLine + charWidth] - ll->positions[charsInLine];
+			}
+			if (charWidth > 1) {
+				for (int c = 1; c < charWidth; c++) {
+					charsInLine++;
+					ll->bidiData->widthReprs[charsInLine] = 0.0f;
+				}
+			}
+		}
+		ll->bidiData->widthReprs[ll->numCharsInLine] = 0.0f;
+	} else {
+		ll->bidiData.reset();
+	}
+}
+
+Point EditView::LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, Sci::Line topLine,
+				     const ViewStyle &vs, PointEnd pe, const PRectangle rcClient) {
+	Point pt;
+	if (pos.Position() == Sci::invalidPosition)
+		return pt;
+	Sci::Line lineDoc = model.pdoc->SciLineFromPosition(pos.Position());
+	Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
+	if (FlagSet(pe, PointEnd::lineEnd) && (lineDoc > 0) && (pos.Position() == posLineStart)) {
+		// Want point at end of first line
+		lineDoc--;
+		posLineStart = model.pdoc->LineStart(lineDoc);
+	}
+	const Sci::Line lineVisible = model.pcs->DisplayFromDoc(lineDoc);
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
+	if (surface && ll) {
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const int posInLine = static_cast<int>(pos.Position() - posLineStart);
+		pt = ll->PointFromPosition(posInLine, vs.lineHeight, pe);
+		pt.x += vs.textStart - model.xOffset;
+
+		if (model.BidirectionalEnabled()) {
+			// Fill the line bidi data
+			UpdateBidiData(model, vs, ll.get());
+
+			// Find subLine
+			const int subLine = ll->SubLineFromPosition(posInLine, pe);
+			const int caretPosition = posInLine - ll->LineStart(subLine);
+
+			// Get the point from current position
+			const ScreenLine screenLine(ll.get(), subLine, vs, rcClient.right, tabWidthMinimumPixels);
+			std::unique_ptr<IScreenLineLayout> slLayout = surface->Layout(&screenLine);
+			pt.x = slLayout->XFromPosition(caretPosition);
+
+			pt.x += vs.textStart - model.xOffset;
+
+			pt.y = 0;
+			if (posInLine >= ll->LineStart(subLine)) {
+				pt.y = static_cast<XYPOSITION>(subLine*vs.lineHeight);
+			}
+		}
+		pt.y += (lineVisible - topLine) * vs.lineHeight;
+	}
+	pt.x += pos.VirtualSpace() * vs.styles[ll->EndLineStyle()].spaceWidth;
+	return pt;
+}
+
+Range EditView::RangeDisplayLine(Surface *surface, const EditModel &model, Sci::Line lineVisible, const ViewStyle &vs) {
+	Range rangeSubLine = Range(0, 0);
+	if (lineVisible < 0) {
+		return rangeSubLine;
+	}
+	const Sci::Line lineDoc = model.pcs->DocFromDisplay(lineVisible);
+	const Sci::Position positionLineStart = model.pdoc->LineStart(lineDoc);
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
+	if (surface && ll) {
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const Sci::Line lineStartSet = model.pcs->DisplayFromDoc(lineDoc);
+		const int subLine = static_cast<int>(lineVisible - lineStartSet);
+		if (subLine < ll->lines) {
+			rangeSubLine = ll->SubLineRange(subLine, LineLayout::Scope::visibleOnly);
+			if (subLine == ll->lines-1) {
+				rangeSubLine.end = model.pdoc->LineStart(lineDoc + 1) -
+					positionLineStart;
+			}
+		}
+	}
+	rangeSubLine.start += positionLineStart;
+	rangeSubLine.end += positionLineStart;
+	return rangeSubLine;
+}
+
+SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditModel &model, PointDocument pt, bool canReturnInvalid,
+	bool charPosition, bool virtualSpace, const ViewStyle &vs, const PRectangle rcClient) {
+	pt.x = pt.x - vs.textStart;
+	Sci::Line visibleLine = static_cast<int>(std::floor(pt.y / vs.lineHeight));
+	if (!canReturnInvalid && (visibleLine < 0))
+		visibleLine = 0;
+	const Sci::Line lineDoc = model.pcs->DocFromDisplay(visibleLine);
+	if (canReturnInvalid && (lineDoc < 0))
+		return SelectionPosition(Sci::invalidPosition);
+	if (lineDoc >= model.pdoc->LinesTotal())
+		return SelectionPosition(canReturnInvalid ? Sci::invalidPosition :
+			model.pdoc->Length());
+	const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
+	if (surface && ll) {
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const Sci::Line lineStartSet = model.pcs->DisplayFromDoc(lineDoc);
+		const int subLine = static_cast<int>(visibleLine - lineStartSet);
+		if (subLine < ll->lines) {
+			const Range rangeSubLine = ll->SubLineRange(subLine, LineLayout::Scope::visibleOnly);
+			const XYPOSITION subLineStart = ll->positions[rangeSubLine.start];
+			if (subLine > 0)	// Wrapped
+				pt.x -= ll->wrapIndent;
+			Sci::Position positionInLine = 0;
+			if (model.BidirectionalEnabled()) {
+				// Fill the line bidi data
+				UpdateBidiData(model, vs, ll.get());
+
+				const ScreenLine screenLine(ll.get(), subLine, vs, rcClient.right, tabWidthMinimumPixels);
+				std::unique_ptr<IScreenLineLayout> slLayout = surface->Layout(&screenLine);
+				positionInLine = slLayout->PositionFromX(static_cast<XYPOSITION>(pt.x), charPosition) +
+					rangeSubLine.start;
+			} else {
+				positionInLine = ll->FindPositionFromX(static_cast<XYPOSITION>(pt.x + subLineStart),
+					rangeSubLine, charPosition);
+			}
+			if (positionInLine < rangeSubLine.end) {
+				return SelectionPosition(model.pdoc->MovePositionOutsideChar(positionInLine + posLineStart, 1));
+			}
+			if (virtualSpace) {
+				const XYPOSITION spaceWidth = vs.styles[ll->EndLineStyle()].spaceWidth;
+				const int spaceOffset = static_cast<int>(
+					(pt.x + subLineStart - ll->positions[rangeSubLine.end] + spaceWidth / 2) / spaceWidth);
+				return SelectionPosition(rangeSubLine.end + posLineStart, spaceOffset);
+			} else if (canReturnInvalid) {
+				if (pt.x < (ll->positions[rangeSubLine.end] - subLineStart)) {
+					return SelectionPosition(model.pdoc->MovePositionOutsideChar(rangeSubLine.end + posLineStart, 1));
+				}
+			} else {
+				return SelectionPosition(rangeSubLine.end + posLineStart);
+			}
+		}
+		if (!canReturnInvalid)
+			return SelectionPosition(ll->numCharsInLine + posLineStart);
+	}
+	return SelectionPosition(canReturnInvalid ? Sci::invalidPosition : posLineStart);
+}
+
+/**
+* Find the document position corresponding to an x coordinate on a particular document line.
+* Ensure is between whole characters when document is in multi-byte or UTF-8 mode.
+* This method is used for rectangular selections and does not work on wrapped lines.
+*/
+SelectionPosition EditView::SPositionFromLineX(Surface *surface, const EditModel &model, Sci::Line lineDoc, int x, const ViewStyle &vs) {
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
+	if (surface && ll) {
+		const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const Range rangeSubLine = ll->SubLineRange(0, LineLayout::Scope::visibleOnly);
+		const XYPOSITION subLineStart = ll->positions[rangeSubLine.start];
+		const Sci::Position positionInLine = ll->FindPositionFromX(x + subLineStart, rangeSubLine, false);
+		if (positionInLine < rangeSubLine.end) {
+			return SelectionPosition(model.pdoc->MovePositionOutsideChar(positionInLine + posLineStart, 1));
+		}
+		const XYPOSITION spaceWidth = vs.styles[ll->EndLineStyle()].spaceWidth;
+		const int spaceOffset = static_cast<int>(
+			(x + subLineStart - ll->positions[rangeSubLine.end] + spaceWidth / 2) / spaceWidth);
+		return SelectionPosition(rangeSubLine.end + posLineStart, spaceOffset);
+	}
+	return SelectionPosition(0);
+}
+
+Sci::Line EditView::DisplayFromPosition(Surface *surface, const EditModel &model, Sci::Position pos, const ViewStyle &vs) {
+	const Sci::Line lineDoc = model.pdoc->SciLineFromPosition(pos);
+	Sci::Line lineDisplay = model.pcs->DisplayFromDoc(lineDoc);
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(lineDoc, model);
+	if (surface && ll) {
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
+		const Sci::Position posInLine = pos - posLineStart;
+		lineDisplay--; // To make up for first increment ahead.
+		for (int subLine = 0; subLine < ll->lines; subLine++) {
+			if (posInLine >= ll->LineStart(subLine)) {
+				lineDisplay++;
+			}
+		}
+	}
+	return lineDisplay;
+}
+
+Sci::Position EditView::StartEndDisplayLine(Surface *surface, const EditModel &model, Sci::Position pos, bool start, const ViewStyle &vs) {
+	const Sci::Line line = model.pdoc->SciLineFromPosition(pos);
+	std::shared_ptr<LineLayout> ll = RetrieveLineLayout(line, model);
+	Sci::Position posRet = Sci::invalidPosition;
+	if (surface && ll) {
+		const Sci::Position posLineStart = model.pdoc->LineStart(line);
+		LayoutLine(model, surface, vs, ll.get(), model.wrapWidth);
+		const Sci::Position posInLine = pos - posLineStart;
+		if (posInLine <= ll->maxLineLength) {
+			for (int subLine = 0; subLine < ll->lines; subLine++) {
+				if ((posInLine >= ll->LineStart(subLine)) &&
+				    (posInLine <= ll->LineStart(subLine + 1)) &&
+				    (posInLine <= ll->numCharsBeforeEOL)) {
+					if (start) {
+						posRet = ll->LineStart(subLine) + posLineStart;
+					} else {
+						if (subLine == ll->lines - 1)
+							posRet = ll->numCharsBeforeEOL + posLineStart;
+						else
+							posRet = model.pdoc->MovePositionOutsideChar(ll->LineStart(subLine + 1) + posLineStart - 1, -1, false);
+					}
+				}
+			}
+		}
+	}
+	return posRet;
+}
+
+namespace {
+
+constexpr ColourRGBA bugColour = ColourRGBA(0xff, 0, 0xff, 0xf0);
+
+// Selection background colours are always defined, the value_or is to show if bug
+
+ColourRGBA SelectionBackground(const EditModel &model, const ViewStyle &vsDraw, InSelection inSelection) {
+	if (inSelection == InSelection::inNone)
+		return bugColour;	// Not selected is a bug
+
+	Element element = Element::SelectionBack;
+	if (inSelection == InSelection::inAdditional)
+		element = Element::SelectionAdditionalBack;
+	if (!model.primarySelection)
+		element = Element::SelectionSecondaryBack;
+	if (!model.hasFocus && vsDraw.ElementColour(Element::SelectionInactiveBack))
+		element = Element::SelectionInactiveBack;
+	return vsDraw.ElementColour(element).value_or(bugColour);
+}
+
+std::optional<ColourRGBA> SelectionForeground(const EditModel &model, const ViewStyle &vsDraw, InSelection inSelection) {
+	if (inSelection == InSelection::inNone)
+		return {};
+	Element element = Element::SelectionText;
+	if (inSelection == InSelection::inAdditional)
+		element = Element::SelectionAdditionalText;
+	if (!model.primarySelection)	// Secondary selection
+		element = Element::SelectionSecondaryText;
+	if (!model.hasFocus) {
+		if (vsDraw.ElementColour(Element::SelectionInactiveText)) {
+			element = Element::SelectionInactiveText;
+		} else {
+			return {};
+		}
+	}
+	return vsDraw.ElementColour(element);
+}
+
+}
+
+static ColourRGBA TextBackground(const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	std::optional<ColourRGBA> background, InSelection inSelection, bool inHotspot, int styleMain, Sci::Position i) {
+	if (inSelection && (vsDraw.selection.layer == Layer::Base)) {
+		return SelectionBackground(model, vsDraw, inSelection).Opaque();
+	}
+	if ((vsDraw.edgeState == EdgeVisualStyle::Background) &&
+		(i >= ll->edgeColumn) &&
+		(i < ll->numCharsBeforeEOL))
+		return vsDraw.theEdge.colour;
+	if (inHotspot && vsDraw.ElementColour(Element::HotSpotActiveBack))
+		return vsDraw.ElementColour(Element::HotSpotActiveBack)->Opaque();
+	if (background && (styleMain != StyleBraceLight) && (styleMain != StyleBraceBad)) {
+		return *background;
+	} else {
+		return vsDraw.styles[styleMain].back;
+	}
+}
+
+void EditView::DrawIndentGuide(Surface *surface, Sci::Line lineVisible, int lineHeight, XYPOSITION start, PRectangle rcSegment, bool highlight) {
+	const Point from = Point::FromInts(0, ((lineVisible & 1) && (lineHeight & 1)) ? 1 : 0);
+	const PRectangle rcCopyArea(start + 1, rcSegment.top,
+		start + 2, rcSegment.bottom);
+	surface->Copy(rcCopyArea, from,
+		highlight ? *pixmapIndentGuideHighlight : *pixmapIndentGuide);
+}
+
+static void DrawTextBlob(Surface *surface, const ViewStyle &vsDraw, PRectangle rcSegment,
+	std::string_view text, ColourRGBA textBack, ColourRGBA textFore, bool fillBackground) {
+	if (rcSegment.Empty())
+		return;
+	if (fillBackground) {
+		surface->FillRectangleAligned(rcSegment, Fill(textBack));
+	}
+	const Font *ctrlCharsFont = vsDraw.styles[StyleControlChar].font.get();
+	const int normalCharHeight = static_cast<int>(std::ceil(vsDraw.styles[StyleControlChar].capitalHeight));
+	PRectangle rcCChar = rcSegment;
+	rcCChar.left = rcCChar.left + 1;
+	rcCChar.top = rcSegment.top + vsDraw.maxAscent - normalCharHeight;
+	rcCChar.bottom = rcSegment.top + vsDraw.maxAscent + 1;
+	PRectangle rcCentral = rcCChar;
+	rcCentral.top++;
+	rcCentral.bottom--;
+	surface->FillRectangleAligned(rcCentral, Fill(textFore));
+	PRectangle rcChar = rcCChar;
+	rcChar.left++;
+	rcChar.right--;
+	surface->DrawTextClippedUTF8(rcChar, ctrlCharsFont,
+		rcSegment.top + vsDraw.maxAscent, text,
+		textBack, textFore);
+}
+
+static void DrawCaretLineFramed(Surface *surface, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine, int subLine) {
+	const std::optional<ColourRGBA> caretlineBack = vsDraw.ElementColour(Element::CaretLineBack);
+	if (!caretlineBack) {
+		return;
+	}
+
+	const ColourRGBA colourFrame = (vsDraw.caretLine.layer == Layer::Base) ?
+		caretlineBack->Opaque() : *caretlineBack;
+
+	const int width = vsDraw.GetFrameWidth();
+
+	// Avoid double drawing the corners by removing the left and right sides when drawing top and bottom borders
+	const PRectangle rcWithoutLeftRight = rcLine.Inset(Point(width, 0.0));
+
+	if (subLine == 0 || ll->wrapIndent == 0 || vsDraw.caretLine.layer != Layer::Base) {
+		// Left
+		surface->FillRectangleAligned(Side(rcLine, Edge::left, width), colourFrame);
+	}
+	if (subLine == 0) {
+		// Top
+		surface->FillRectangleAligned(Side(rcWithoutLeftRight, Edge::top, width), colourFrame);
+	}
+	if (subLine == ll->lines - 1 || vsDraw.caretLine.layer != Layer::Base) {
+		// Right
+		surface->FillRectangleAligned(Side(rcLine, Edge::right, width), colourFrame);
+	}
+	if (subLine == ll->lines - 1) {
+		// Bottom
+		surface->FillRectangleAligned(Side(rcWithoutLeftRight, Edge::bottom, width), colourFrame);
+	}
+}
+
+void EditView::DrawEOL(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	PRectangle rcLine, Sci::Line line, Sci::Position lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
+	std::optional<ColourRGBA> background) {
+
+	const Sci::Position posLineStart = model.pdoc->LineStart(line);
+	PRectangle rcSegment = rcLine;
+
+	const bool lastSubLine = subLine == (ll->lines - 1);
+	XYPOSITION virtualSpace = 0;
+	if (lastSubLine) {
+		const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+		virtualSpace = model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line)) * spaceWidth;
+	}
+	const XYPOSITION xEol = static_cast<XYPOSITION>(ll->positions[lineEnd] - subLineStart);
+
+	// Fill the virtual space and show selections within it
+	if (virtualSpace > 0.0f) {
+		rcSegment.left = xEol + xStart;
+		rcSegment.right = xEol + xStart + virtualSpace;
+		const ColourRGBA backgroundFill = background.value_or(vsDraw.styles[ll->styles[ll->numCharsInLine]].back);
+		surface->FillRectangleAligned(rcSegment, backgroundFill);
+		if (!hideSelection && (vsDraw.selection.layer == Layer::Base)) {
+			const SelectionSegment virtualSpaceRange(SelectionPosition(model.pdoc->LineEnd(line)),
+				SelectionPosition(model.pdoc->LineEnd(line),
+					model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line))));
+			for (size_t r = 0; r<model.sel.Count(); r++) {
+				const SelectionSegment portion = model.sel.Range(r).Intersect(virtualSpaceRange);
+				if (!portion.Empty()) {
+					const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+					rcSegment.left = xStart + ll->positions[portion.start.Position() - posLineStart] -
+						static_cast<XYPOSITION>(subLineStart)+portion.start.VirtualSpace() * spaceWidth;
+					rcSegment.right = xStart + ll->positions[portion.end.Position() - posLineStart] -
+						static_cast<XYPOSITION>(subLineStart)+portion.end.VirtualSpace() * spaceWidth;
+					rcSegment.left = (rcSegment.left > rcLine.left) ? rcSegment.left : rcLine.left;
+					rcSegment.right = (rcSegment.right < rcLine.right) ? rcSegment.right : rcLine.right;
+					surface->FillRectangleAligned(rcSegment, Fill(
+						SelectionBackground(model, vsDraw, model.sel.RangeType(r)).Opaque()));
+				}
+			}
+		}
+	}
+
+	InSelection eolInSelection = InSelection::inNone;
+	if (!hideSelection && lastSubLine) {
+		eolInSelection = model.LineEndInSelection(line);
+	}
+
+	const ColourRGBA selectionBack = SelectionBackground(model, vsDraw, eolInSelection);
+
+	// Draw the [CR], [LF], or [CR][LF] blobs if visible line ends are on
+	XYPOSITION blobsWidth = 0;
+	if (lastSubLine) {
+		for (Sci::Position eolPos = ll->numCharsBeforeEOL; eolPos<ll->numCharsInLine;) {
+			const int styleMain = ll->styles[eolPos];
+			const std::optional<ColourRGBA> selectionFore = SelectionForeground(model, vsDraw, eolInSelection);
+			ColourRGBA textFore = selectionFore.value_or(vsDraw.styles[styleMain].fore);
+			char hexits[4] = "";
+			std::string_view ctrlChar;
+			Sci::Position widthBytes = 1;
+			RepresentationAppearance appearance = RepresentationAppearance::Blob;
+			const Representation *repr = model.reprs.RepresentationFromCharacter(std::string_view(&ll->chars[eolPos], ll->numCharsInLine - eolPos));
+			if (repr) {
+				// Representation of whole text
+				widthBytes = ll->numCharsInLine - eolPos;
+			} else {
+				repr = model.reprs.RepresentationFromCharacter(std::string_view(&ll->chars[eolPos], 1));
+			}
+			if (repr) {
+				ctrlChar = repr->stringRep;
+				appearance = repr->appearance;
+				if (FlagSet(appearance, RepresentationAppearance::Colour)) {
+					textFore = repr->colour;
+				}
+			} else {
+				const unsigned char chEOL = ll->chars[eolPos];
+				if (UTF8IsAscii(chEOL)) {
+					ctrlChar = ControlCharacterString(chEOL);
+				} else {
+					Hexits(hexits, chEOL);
+					ctrlChar = hexits;
+				}
+			}
+
+			rcSegment.left = xStart + ll->positions[eolPos] - static_cast<XYPOSITION>(subLineStart)+virtualSpace;
+			rcSegment.right = xStart + ll->positions[eolPos + widthBytes] - static_cast<XYPOSITION>(subLineStart)+virtualSpace;
+			blobsWidth += rcSegment.Width();
+			const ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, eolInSelection, false, styleMain, eolPos);
+			if (eolInSelection && (line < model.pdoc->LinesTotal() - 1)) {
+				if (vsDraw.selection.layer == Layer::Base) {
+					surface->FillRectangleAligned(rcSegment, Fill(selectionBack.Opaque()));
+				} else {
+					surface->FillRectangleAligned(rcSegment, Fill(textBack));
+				}
+			} else {
+				surface->FillRectangleAligned(rcSegment, Fill(textBack));
+			}
+			const bool drawEOLSelection = eolInSelection && (line < model.pdoc->LinesTotal() - 1);
+			ColourRGBA blobText = textBack;
+			if (drawEOLSelection && (vsDraw.selection.layer == Layer::UnderText)) {
+				surface->FillRectangleAligned(rcSegment, selectionBack);
+				blobText = textBack.MixedWith(selectionBack, selectionBack.GetAlphaComponent());
+			}
+			if (FlagSet(appearance, RepresentationAppearance::Blob)) {
+				DrawTextBlob(surface, vsDraw, rcSegment, ctrlChar, blobText, textFore, phasesDraw == PhasesDraw::One);
+			} else {
+				surface->DrawTextTransparentUTF8(rcSegment, vsDraw.styles[StyleControlChar].font.get(),
+					rcSegment.top + vsDraw.maxAscent, ctrlChar, textFore);
+			}
+			if (drawEOLSelection && (vsDraw.selection.layer == Layer::OverText)) {
+				surface->FillRectangleAligned(rcSegment, selectionBack);
+			}
+			eolPos += widthBytes;
+		}
+	}
+
+	// Draw the eol-is-selected rectangle
+	rcSegment.left = xEol + xStart + virtualSpace + blobsWidth;
+	rcSegment.right = rcSegment.left + vsDraw.aveCharWidth;
+
+	if (eolInSelection && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer == Layer::Base)) {
+		surface->FillRectangleAligned(rcSegment, Fill(selectionBack.Opaque()));
+	} else {
+		if (background) {
+			surface->FillRectangleAligned(rcSegment, Fill(*background));
+		} else if (line < model.pdoc->LinesTotal() - 1) {
+			surface->FillRectangleAligned(rcSegment, Fill(vsDraw.styles[ll->styles[ll->numCharsInLine]].back));
+		} else if (vsDraw.styles[ll->styles[ll->numCharsInLine]].eolFilled) {
+			surface->FillRectangleAligned(rcSegment, Fill(vsDraw.styles[ll->styles[ll->numCharsInLine]].back));
+		} else {
+			surface->FillRectangleAligned(rcSegment, Fill(vsDraw.styles[StyleDefault].back));
+		}
+		if (eolInSelection && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer != Layer::Base)) {
+			surface->FillRectangleAligned(rcSegment, selectionBack);
+		}
+	}
+
+	rcSegment.left = rcSegment.right;
+	if (rcSegment.left < rcLine.left)
+		rcSegment.left = rcLine.left;
+	rcSegment.right = rcLine.right;
+
+	const bool drawEOLAnnotationStyledText = (vsDraw.eolAnnotationVisible != EOLAnnotationVisible::Hidden) && model.pdoc->EOLAnnotationStyledText(line).text;
+	const bool fillRemainder = (!lastSubLine || (!model.GetFoldDisplayText(line) && !drawEOLAnnotationStyledText));
+	if (fillRemainder) {
+		// Fill the remainder of the line
+		FillLineRemainder(surface, model, vsDraw, ll, line, rcSegment, subLine);
+	}
+
+	bool drawWrapMarkEnd = false;
+
+	if (subLine + 1 < ll->lines) {
+		if (FlagSet(vsDraw.wrap.visualFlags, WrapVisualFlag::End)) {
+			drawWrapMarkEnd = ll->LineStart(subLine + 1) != 0;
+		}
+		if (vsDraw.IsLineFrameOpaque(model.caret.active, ll->containsCaret)) {
+			// Draw right of frame under marker
+			surface->FillRectangleAligned(Side(rcLine, Edge::right, vsDraw.GetFrameWidth()),
+				vsDraw.ElementColour(Element::CaretLineBack)->Opaque());
+		}
+	}
+
+	if (drawWrapMarkEnd) {
+		PRectangle rcPlace = rcSegment;
+
+		if (FlagSet(vsDraw.wrap.visualFlagsLocation, WrapVisualLocation::EndByText)) {
+			rcPlace.left = xEol + xStart + virtualSpace;
+			rcPlace.right = rcPlace.left + vsDraw.aveCharWidth;
+		} else {
+			// rcLine is clipped to text area
+			rcPlace.right = rcLine.right;
+			rcPlace.left = rcPlace.right - vsDraw.aveCharWidth;
+		}
+		if (!customDrawWrapMarker) {
+			DrawWrapMarker(surface, rcPlace, true, vsDraw.WrapColour());
+		} else {
+			customDrawWrapMarker(surface, rcPlace, true, vsDraw.WrapColour());
+		}
+	}
+}
+
+static void DrawIndicator(int indicNum, Sci::Position startPos, Sci::Position endPos, Surface *surface, const ViewStyle &vsDraw,
+	const LineLayout *ll, int xStart, PRectangle rcLine, Sci::Position secondCharacter, int subLine, Indicator::State state,
+	int value, bool bidiEnabled, int tabWidthMinimumPixels) {
+
+	const XYPOSITION subLineStart = ll->positions[ll->LineStart(subLine)];
+
+	std::vector<PRectangle> rectangles;
+
+	const PRectangle rcIndic(
+		ll->positions[startPos] + xStart - subLineStart,
+		rcLine.top + vsDraw.maxAscent,
+		ll->positions[endPos] + xStart - subLineStart,
+		rcLine.top + vsDraw.maxAscent + 3);
+
+	if (bidiEnabled) {
+		ScreenLine screenLine(ll, subLine, vsDraw, rcLine.right - xStart, tabWidthMinimumPixels);
+		const Range lineRange = ll->SubLineRange(subLine, LineLayout::Scope::visibleOnly);
+
+		std::unique_ptr<IScreenLineLayout> slLayout = surface->Layout(&screenLine);
+		std::vector<Interval> intervals = slLayout->FindRangeIntervals(
+			startPos - lineRange.start, endPos - lineRange.start);
+		for (const Interval &interval : intervals) {
+			PRectangle rcInterval = rcIndic;
+			rcInterval.left = interval.left + xStart;
+			rcInterval.right = interval.right + xStart;
+			rectangles.push_back(rcInterval);
+		}
+	} else {
+		rectangles.push_back(rcIndic);
+	}
+
+	for (const PRectangle &rc : rectangles) {
+		PRectangle rcFirstCharacter = rc;
+		// Allow full descent space for character indicators
+		rcFirstCharacter.bottom = rcLine.top + vsDraw.maxAscent + vsDraw.maxDescent;
+		if (secondCharacter >= 0) {
+			rcFirstCharacter.right = ll->positions[secondCharacter] + xStart - subLineStart;
+		} else {
+			// Indicator continued from earlier line so make an empty box and don't draw
+			rcFirstCharacter.right = rcFirstCharacter.left;
+		}
+		vsDraw.indicators[indicNum].Draw(surface, rc, rcLine, rcFirstCharacter, state, value);
+	}
+}
+
+static void DrawIndicators(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, int xStart, PRectangle rcLine, int subLine, Sci::Position lineEnd, bool under, int tabWidthMinimumPixels) {
+	// Draw decorators
+	const Sci::Position posLineStart = model.pdoc->LineStart(line);
+	const Sci::Position lineStart = ll->LineStart(subLine);
+	const Sci::Position posLineEnd = posLineStart + lineEnd;
+
+	for (const IDecoration *deco : model.pdoc->decorations->View()) {
+		if (under == vsDraw.indicators[deco->Indicator()].under) {
+			Sci::Position startPos = posLineStart + lineStart;
+			if (!deco->ValueAt(startPos)) {
+				startPos = deco->EndRun(startPos);
+			}
+			while ((startPos < posLineEnd) && (deco->ValueAt(startPos))) {
+				const Range rangeRun(deco->StartRun(startPos), deco->EndRun(startPos));
+				const Sci::Position endPos = std::min(rangeRun.end, posLineEnd);
+				const bool hover = vsDraw.indicators[deco->Indicator()].IsDynamic() &&
+					rangeRun.ContainsCharacter(model.hoverIndicatorPos);
+				const int value = deco->ValueAt(startPos);
+				const Indicator::State state = hover ? Indicator::State::hover : Indicator::State::normal;
+				const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(rangeRun.First() + 1, 1);
+				DrawIndicator(deco->Indicator(), startPos - posLineStart, endPos - posLineStart,
+					surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, state,
+					value, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+				startPos = endPos;
+				if (!deco->ValueAt(startPos)) {
+					startPos = deco->EndRun(startPos);
+				}
+			}
+		}
+	}
+
+	// Use indicators to highlight matching braces
+	if ((vsDraw.braceHighlightIndicatorSet && (model.bracesMatchStyle == StyleBraceLight)) ||
+		(vsDraw.braceBadLightIndicatorSet && (model.bracesMatchStyle == StyleBraceBad))) {
+		const int braceIndicator = (model.bracesMatchStyle == StyleBraceLight) ? vsDraw.braceHighlightIndicator : vsDraw.braceBadLightIndicator;
+		if (under == vsDraw.indicators[braceIndicator].under) {
+			const Range rangeLine(posLineStart + lineStart, posLineEnd);
+			if (rangeLine.ContainsCharacter(model.braces[0])) {
+				const Sci::Position braceOffset = model.braces[0] - posLineStart;
+				if (braceOffset < ll->numCharsInLine) {
+					const Sci::Position secondOffset = model.pdoc->MovePositionOutsideChar(model.braces[0] + 1, 1) - posLineStart;
+					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, ll, xStart, rcLine, secondOffset,
+						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+				}
+			}
+			if (rangeLine.ContainsCharacter(model.braces[1])) {
+				const Sci::Position braceOffset = model.braces[1] - posLineStart;
+				if (braceOffset < ll->numCharsInLine) {
+					const Sci::Position secondOffset = model.pdoc->MovePositionOutsideChar(model.braces[1] + 1, 1) - posLineStart;
+					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, ll, xStart, rcLine, secondOffset,
+						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+				}
+			}
+		}
+	}
+}
+
+void EditView::DrawFoldDisplayText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+							  Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase) {
+	const bool lastSubLine = subLine == (ll->lines - 1);
+	if (!lastSubLine)
+		return;
+
+	const char *text = model.GetFoldDisplayText(line);
+	if (!text)
+		return;
+
+	PRectangle rcSegment = rcLine;
+	const std::string_view foldDisplayText(text);
+	const Font *fontText = vsDraw.styles[StyleFoldDisplayText].font.get();
+	const int widthFoldDisplayText = static_cast<int>(surface->WidthText(fontText, foldDisplayText));
+
+	InSelection eolInSelection = InSelection::inNone;
+	if (!hideSelection) {
+		eolInSelection = model.LineEndInSelection(line);
+	}
+
+	const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+	const XYPOSITION virtualSpace = model.sel.VirtualSpaceFor(
+		model.pdoc->LineEnd(line)) * spaceWidth;
+	rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + virtualSpace + vsDraw.aveCharWidth;
+	rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthFoldDisplayText);
+
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const std::optional<ColourRGBA> selectionFore = SelectionForeground(model, vsDraw, eolInSelection);
+	const ColourRGBA textFore = selectionFore.value_or(vsDraw.styles[StyleFoldDisplayText].fore);
+	const ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, eolInSelection,
+											false, StyleFoldDisplayText, -1);
+
+	if (model.trackLineWidth) {
+		if (rcSegment.right + 1> lineWidthMaxSeen) {
+			// Fold display text border drawn on rcSegment.right with width 1 is the last visible object of the line
+			lineWidthMaxSeen = static_cast<int>(rcSegment.right + 1);
+		}
+	}
+
+	if (FlagSet(phase, DrawPhase::back)) {
+		surface->FillRectangleAligned(rcSegment, Fill(textBack));
+
+		// Fill Remainder of the line
+		PRectangle rcRemainder = rcSegment;
+		rcRemainder.left = rcRemainder.right;
+		if (rcRemainder.left < rcLine.left)
+			rcRemainder.left = rcLine.left;
+		rcRemainder.right = rcLine.right;
+		FillLineRemainder(surface, model, vsDraw, ll, line, rcRemainder, subLine);
+	}
+
+	if (FlagSet(phase, DrawPhase::text)) {
+		if (phasesDraw != PhasesDraw::One) {
+			surface->DrawTextTransparent(rcSegment, fontText,
+				rcSegment.top + vsDraw.maxAscent, foldDisplayText,
+				textFore);
+		} else {
+			surface->DrawTextNoClip(rcSegment, fontText,
+				rcSegment.top + vsDraw.maxAscent, foldDisplayText,
+				textFore, textBack);
+		}
+	}
+
+	if (FlagSet(phase, DrawPhase::indicatorsFore)) {
+		if (model.foldDisplayTextStyle == FoldDisplayTextStyle::Boxed) {
+			PRectangle rcBox = rcSegment;
+			rcBox.left = std::round(rcSegment.left);
+			rcBox.right = std::round(rcSegment.right);
+			surface->RectangleFrame(rcBox, Stroke(textFore));
+		}
+	}
+
+	if (FlagSet(phase, DrawPhase::selectionTranslucent)) {
+		if (eolInSelection && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer != Layer::Base)) {
+			surface->FillRectangleAligned(rcSegment, SelectionBackground(model, vsDraw, eolInSelection));
+		}
+	}
+}
+
+void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase) {
+
+	const bool lastSubLine = subLine == (ll->lines - 1);
+	if (!lastSubLine)
+		return;
+
+	if (vsDraw.eolAnnotationVisible == EOLAnnotationVisible::Hidden) {
+		return;
+	}
+	const StyledText stEOLAnnotation = model.pdoc->EOLAnnotationStyledText(line);
+	if (!stEOLAnnotation.text || !ValidStyledText(vsDraw, vsDraw.eolAnnotationStyleOffset, stEOLAnnotation)) {
+		return;
+	}
+	const std::string_view eolAnnotationText(stEOLAnnotation.text, stEOLAnnotation.length);
+	const size_t style = stEOLAnnotation.style + vsDraw.eolAnnotationStyleOffset;
+
+	PRectangle rcSegment = rcLine;
+	const Font *fontText = vsDraw.styles[style].font.get();
+
+	const Surface::Ends ends = static_cast<Surface::Ends>(static_cast<int>(vsDraw.eolAnnotationVisible) & 0xff);
+	const Surface::Ends leftSide = static_cast<Surface::Ends>(static_cast<int>(ends) & 0xf);
+	const Surface::Ends rightSide = static_cast<Surface::Ends>(static_cast<int>(ends) & 0xf0);
+
+	XYPOSITION leftBoxSpace = 0;
+	XYPOSITION rightBoxSpace = 0;
+	if (vsDraw.eolAnnotationVisible >= EOLAnnotationVisible::Boxed) {
+		leftBoxSpace = 1;
+		rightBoxSpace = 1;
+		if (vsDraw.eolAnnotationVisible != EOLAnnotationVisible::Boxed) {
+			switch (leftSide) {
+			case Surface::Ends::leftFlat:
+				leftBoxSpace = 1;
+				break;
+			case Surface::Ends::leftAngle:
+				leftBoxSpace = rcLine.Height() / 2.0;
+				break;
+			case Surface::Ends::semiCircles:
+			default:
+				leftBoxSpace = rcLine.Height() / 3.0;
+			   break;
+			}
+			switch (rightSide) {
+			case Surface::Ends::rightFlat:
+				rightBoxSpace = 1;
+				break;
+			case Surface::Ends::rightAngle:
+				rightBoxSpace = rcLine.Height() / 2.0;
+				break;
+			case Surface::Ends::semiCircles:
+			default:
+				rightBoxSpace = rcLine.Height() / 3.0;
+			   break;
+			}
+		}
+	}
+	const int widthEOLAnnotationText = static_cast<int>(surface->WidthTextUTF8(fontText, eolAnnotationText) +
+		leftBoxSpace + rightBoxSpace);
+
+	const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+	const XYPOSITION virtualSpace = model.sel.VirtualSpaceFor(
+		model.pdoc->LineEnd(line)) * spaceWidth;
+	rcSegment.left = xStart +
+		static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart)
+		+ virtualSpace + vsDraw.aveCharWidth;
+
+	const char *textFoldDisplay = model.GetFoldDisplayText(line);
+	if (textFoldDisplay) {
+		const std::string_view foldDisplayText(textFoldDisplay);
+		rcSegment.left += (static_cast<int>(surface->WidthText(fontText, foldDisplayText)) + vsDraw.aveCharWidth);
+	}
+	rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthEOLAnnotationText);
+
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const ColourRGBA textFore = vsDraw.styles[style].fore;
+	const ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, InSelection::inNone,
+											false, static_cast<int>(style), -1);
+
+	if (model.trackLineWidth) {
+		if (rcSegment.right + 1> lineWidthMaxSeen) {
+			// EOL Annotation text border drawn on rcSegment.right with width 1 is the last visible object of the line
+			lineWidthMaxSeen = static_cast<int>(rcSegment.right + 1);
+		}
+	}
+
+	if (FlagSet(phase, DrawPhase::back)) {
+		// This fills in the whole remainder of the line even though
+		// it may be double drawing. This is to allow stadiums with
+		// curved or angled ends to have the area outside in the correct
+		// background colour.
+		PRectangle rcRemainder = rcSegment;
+		rcRemainder.right = rcLine.right;
+		FillLineRemainder(surface, model, vsDraw, ll, line, rcRemainder, subLine);
+	}
+
+	PRectangle rcText = rcSegment;
+	rcText.left += leftBoxSpace;
+	rcText.right -= rightBoxSpace;
+
+	// For single phase drawing, draw the text then any box over it
+	if (FlagSet(phase, DrawPhase::text)) {
+		if (phasesDraw == PhasesDraw::One) {
+			surface->DrawTextNoClipUTF8(rcText, fontText,
+			rcText.top + vsDraw.maxAscent, eolAnnotationText,
+			textFore, textBack);
+		}
+	}
+
+	// Draw any box or stadium shape
+	if (FlagSet(phase, DrawPhase::indicatorsBack)) {
+		if (vsDraw.eolAnnotationVisible >= EOLAnnotationVisible::Boxed) {
+			PRectangle rcBox = rcSegment;
+			rcBox.left = std::round(rcSegment.left);
+			rcBox.right = std::round(rcSegment.right);
+			if (vsDraw.eolAnnotationVisible == EOLAnnotationVisible::Boxed) {
+				surface->RectangleFrame(rcBox, Stroke(textFore));
+			} else {
+				if (phasesDraw == PhasesDraw::One) {
+					// Draw an outline around the text
+					surface->Stadium(rcBox, FillStroke(ColourRGBA(textBack, 0), textFore, 1.0), ends);
+				} else {
+					// Draw with a fill to fill the edges of the shape.
+					surface->Stadium(rcBox, FillStroke(textBack, textFore, 1.0), ends);
+				}
+			}
+		}
+	}
+
+	// For multi-phase drawing draw the text last as transparent over any box 
+	if (FlagSet(phase, DrawPhase::text)) {
+		if (phasesDraw != PhasesDraw::One) {
+			surface->DrawTextTransparentUTF8(rcText, fontText,
+				rcText.top + vsDraw.maxAscent, eolAnnotationText,
+				textFore);
+		}
+	}
+}
+
+static constexpr bool AnnotationBoxedOrIndented(AnnotationVisible annotationVisible) noexcept {
+	return annotationVisible == AnnotationVisible::Boxed || annotationVisible == AnnotationVisible::Indented;
+}
+
+void EditView::DrawAnnotation(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase) {
+	const int indent = static_cast<int>(model.pdoc->GetLineIndentation(line) * vsDraw.spaceWidth);
+	PRectangle rcSegment = rcLine;
+	const int annotationLine = subLine - ll->lines;
+	const StyledText stAnnotation = model.pdoc->AnnotationStyledText(line);
+	if (stAnnotation.text && ValidStyledText(vsDraw, vsDraw.annotationStyleOffset, stAnnotation)) {
+		if (FlagSet(phase, DrawPhase::back)) {
+			surface->FillRectangleAligned(rcSegment, Fill(vsDraw.styles[0].back));
+		}
+		rcSegment.left = static_cast<XYPOSITION>(xStart);
+		if (model.trackLineWidth || AnnotationBoxedOrIndented(vsDraw.annotationVisible)) {
+			// Only care about calculating width if tracking or need to draw indented box
+			int widthAnnotation = WidestLineWidth(surface, vsDraw, vsDraw.annotationStyleOffset, stAnnotation);
+			if (AnnotationBoxedOrIndented(vsDraw.annotationVisible)) {
+				widthAnnotation += static_cast<int>(vsDraw.spaceWidth * 2); // Margins
+				rcSegment.left = static_cast<XYPOSITION>(xStart + indent);
+				rcSegment.right = rcSegment.left + widthAnnotation;
+			}
+			if (widthAnnotation > lineWidthMaxSeen)
+				lineWidthMaxSeen = widthAnnotation;
+		}
+		const int annotationLines = model.pdoc->AnnotationLines(line);
+		size_t start = 0;
+		size_t lengthAnnotation = stAnnotation.LineLength(start);
+		int lineInAnnotation = 0;
+		while ((lineInAnnotation < annotationLine) && (start < stAnnotation.length)) {
+			start += lengthAnnotation + 1;
+			lengthAnnotation = stAnnotation.LineLength(start);
+			lineInAnnotation++;
+		}
+		PRectangle rcText = rcSegment;
+		if ((FlagSet(phase, DrawPhase::back)) && AnnotationBoxedOrIndented(vsDraw.annotationVisible)) {
+			surface->FillRectangleAligned(rcText,
+				Fill(vsDraw.styles[stAnnotation.StyleAt(start) + vsDraw.annotationStyleOffset].back));
+			rcText.left += vsDraw.spaceWidth;
+		}
+		DrawStyledText(surface, vsDraw, vsDraw.annotationStyleOffset, rcText,
+			stAnnotation, start, lengthAnnotation, phase);
+		if ((FlagSet(phase, DrawPhase::back)) && (vsDraw.annotationVisible == AnnotationVisible::Boxed)) {
+			const ColourRGBA colourBorder = vsDraw.styles[vsDraw.annotationStyleOffset].fore;
+			const PRectangle rcBorder = PixelAlignOutside(rcSegment, surface->PixelDivisions());
+			surface->FillRectangle(Side(rcBorder, Edge::left, 1), colourBorder);
+			surface->FillRectangle(Side(rcBorder, Edge::right, 1), colourBorder);
+			if (subLine == ll->lines) {
+				surface->FillRectangle(Side(rcBorder, Edge::top, 1), colourBorder);
+			}
+			if (subLine == ll->lines + annotationLines - 1) {
+				surface->FillRectangle(Side(rcBorder, Edge::bottom, 1), colourBorder);
+			}
+		}
+	}
+}
+
+static void DrawBlockCaret(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	int subLine, int xStart, Sci::Position offset, Sci::Position posCaret, PRectangle rcCaret, ColourRGBA caretColour) {
+
+	const Sci::Position lineStart = ll->LineStart(subLine);
+	Sci::Position posBefore = posCaret;
+	Sci::Position posAfter = model.pdoc->MovePositionOutsideChar(posCaret + 1, 1);
+	Sci::Position numCharsToDraw = posAfter - posCaret;
+
+	// Work out where the starting and ending offsets are. We need to
+	// see if the previous character shares horizontal space, such as a
+	// glyph / combining character. If so we'll need to draw that too.
+	Sci::Position offsetFirstChar = offset;
+	Sci::Position offsetLastChar = offset + (posAfter - posCaret);
+	while ((posBefore > 0) && ((offsetLastChar - numCharsToDraw) >= lineStart)) {
+		if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - numCharsToDraw]) > 0) {
+			// The char does not share horizontal space
+			break;
+		}
+		// Char shares horizontal space, update the numChars to draw
+		// Update posBefore to point to the prev char
+		posBefore = model.pdoc->MovePositionOutsideChar(posBefore - 1, -1);
+		numCharsToDraw = posAfter - posBefore;
+		offsetFirstChar = offset - (posCaret - posBefore);
+	}
+
+	// See if the next character shares horizontal space, if so we'll
+	// need to draw that too.
+	if (offsetFirstChar < 0)
+		offsetFirstChar = 0;
+	numCharsToDraw = offsetLastChar - offsetFirstChar;
+	while ((offsetLastChar < ll->LineStart(subLine + 1)) && (offsetLastChar <= ll->numCharsInLine)) {
+		// Update posAfter to point to the 2nd next char, this is where
+		// the next character ends, and 2nd next begins. We'll need
+		// to compare these two
+		posBefore = posAfter;
+		posAfter = model.pdoc->MovePositionOutsideChar(posAfter + 1, 1);
+		offsetLastChar = offset + (posAfter - posCaret);
+		if ((ll->positions[offsetLastChar] - ll->positions[offsetLastChar - (posAfter - posBefore)]) > 0) {
+			// The char does not share horizontal space
+			break;
+		}
+		// Char shares horizontal space, update the numChars to draw
+		numCharsToDraw = offsetLastChar - offsetFirstChar;
+	}
+
+	// We now know what to draw, update the caret drawing rectangle
+	rcCaret.left = ll->positions[offsetFirstChar] - ll->positions[lineStart] + xStart;
+	rcCaret.right = ll->positions[offsetFirstChar + numCharsToDraw] - ll->positions[lineStart] + xStart;
+
+	// Adjust caret position to take into account any word wrapping symbols.
+	if ((ll->wrapIndent != 0) && (lineStart != 0)) {
+		const XYPOSITION wordWrapCharWidth = ll->wrapIndent;
+		rcCaret.left += wordWrapCharWidth;
+		rcCaret.right += wordWrapCharWidth;
+	}
+
+	// This character is where the caret block is, we override the colours
+	// (inversed) for drawing the caret here.
+	const int styleMain = ll->styles[offsetFirstChar];
+	const Font *fontText = vsDraw.styles[styleMain].font.get();
+	const std::string_view text(&ll->chars[offsetFirstChar], numCharsToDraw);
+	surface->DrawTextClipped(rcCaret, fontText,
+		rcCaret.top + vsDraw.maxAscent, text, vsDraw.styles[styleMain].back,
+		caretColour);
+}
+
+void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line lineDoc, int xStart, PRectangle rcLine, int subLine) const {
+	// When drag is active it is the only caret drawn
+	const bool drawDrag = model.posDrag.IsValid();
+	if (hideSelection && !drawDrag)
+		return;
+	const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
+	// For each selection draw
+	for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) {
+		const bool mainCaret = r == model.sel.Main();
+		SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret);
+		if ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) && 
+			!drawDrag &&
+			posCaret > model.sel.Range(r).anchor) {
+			if (posCaret.VirtualSpace() > 0)
+				posCaret.SetVirtualSpace(posCaret.VirtualSpace() - 1);
+			else
+				posCaret.SetPosition(model.pdoc->MovePositionOutsideChar(posCaret.Position()-1, -1));
+		}
+		const int offset = static_cast<int>(posCaret.Position() - posLineStart);
+		const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+		const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth;
+		if (ll->InLine(offset, subLine) && offset <= ll->numCharsBeforeEOL) {
+			XYPOSITION xposCaret = ll->positions[offset] + virtualOffset - ll->positions[ll->LineStart(subLine)];
+			if (model.BidirectionalEnabled() && (posCaret.VirtualSpace() == 0)) {
+				// Get caret point
+				const ScreenLine screenLine(ll, subLine, vsDraw, rcLine.right, tabWidthMinimumPixels);
+
+				const int caretPosition = offset - ll->LineStart(subLine);
+
+				std::unique_ptr<IScreenLineLayout> slLayout = surface->Layout(&screenLine);
+				const XYPOSITION caretLeft = slLayout->XFromPosition(caretPosition);
+
+				// In case of start of line, the cursor should be at the right
+				xposCaret = caretLeft + virtualOffset;
+			}
+			if (ll->wrapIndent != 0) {
+				const Sci::Position lineStart = ll->LineStart(subLine);
+				if (lineStart != 0)	// Wrapped
+					xposCaret += ll->wrapIndent;
+			}
+			const bool caretBlinkState = (model.caret.active && model.caret.on) || (!additionalCaretsBlink && !mainCaret);
+			const bool caretVisibleState = additionalCaretsVisible || mainCaret;
+			if ((xposCaret >= 0) && vsDraw.IsCaretVisible() &&
+				(drawDrag || (caretBlinkState && caretVisibleState))) {
+				bool canDrawBlockCaret = true;
+				bool drawBlockCaret = false;
+				XYPOSITION widthOverstrikeCaret;
+				XYPOSITION caretWidthOffset = 0;
+				PRectangle rcCaret = rcLine;
+
+				if (posCaret.Position() == model.pdoc->Length()) {   // At end of document
+					canDrawBlockCaret = false;
+					widthOverstrikeCaret = vsDraw.aveCharWidth;
+				} else if ((posCaret.Position() - posLineStart) >= ll->numCharsInLine) {	// At end of line
+					canDrawBlockCaret = false;
+					widthOverstrikeCaret = vsDraw.aveCharWidth;
+				} else {
+					const int widthChar = model.pdoc->LenChar(posCaret.Position());
+					widthOverstrikeCaret = ll->positions[offset + widthChar] - ll->positions[offset];
+				}
+				if (widthOverstrikeCaret < 3)	// Make sure its visible
+					widthOverstrikeCaret = 3;
+
+				if (xposCaret > 0)
+					caretWidthOffset = 0.51f;	// Move back so overlaps both character cells.
+				xposCaret += xStart;
+				const ViewStyle::CaretShape caretShape = drawDrag ? ViewStyle::CaretShape::line : vsDraw.CaretShapeForMode(model.inOverstrike);
+				if (drawDrag) {
+					/* Dragging text, use a line caret */
+					rcCaret.left = std::round(xposCaret - caretWidthOffset);
+					rcCaret.right = rcCaret.left + vsDraw.caret.width;
+				} else if ((caretShape == ViewStyle::CaretShape::bar) && drawOverstrikeCaret) {
+					/* Over-strike (insert mode), use a modified bar caret */
+					rcCaret.top = rcCaret.bottom - 2;
+					rcCaret.left = xposCaret + 1;
+					rcCaret.right = rcCaret.left + widthOverstrikeCaret - 1;
+				} else if ((caretShape == ViewStyle::CaretShape::block) || imeCaretBlockOverride) {
+					/* Block caret */
+					rcCaret.left = xposCaret;
+					if (canDrawBlockCaret && !(IsControlCharacter(ll->chars[offset]))) {
+						drawBlockCaret = true;
+						rcCaret.right = xposCaret + widthOverstrikeCaret;
+					} else {
+						rcCaret.right = xposCaret + vsDraw.aveCharWidth;
+					}
+				} else {
+					/* Line caret */
+					rcCaret.left = std::round(xposCaret - caretWidthOffset);
+					rcCaret.right = rcCaret.left + vsDraw.caret.width;
+				}
+				const Element elementCaret = mainCaret ? Element::Caret : Element::CaretAdditional;
+				const ColourRGBA caretColour = *vsDraw.ElementColour(elementCaret);
+				//assert(caretColour.IsOpaque());
+				if (drawBlockCaret) {
+					DrawBlockCaret(surface, model, vsDraw, ll, subLine, xStart, offset, posCaret.Position(), rcCaret, caretColour);
+				} else {
+					surface->FillRectangleAligned(rcCaret, Fill(caretColour));
+				}
+			}
+		}
+		if (drawDrag)
+			break;
+	}
+}
+
+static void DrawWrapIndentAndMarker(Surface *surface, const ViewStyle &vsDraw, const LineLayout *ll,
+	int xStart, PRectangle rcLine, std::optional<ColourRGBA> background, DrawWrapMarkerFn customDrawWrapMarker,
+	bool caretActive) {
+	// default bgnd here..
+	surface->FillRectangleAligned(rcLine, Fill(background ? *background :
+		vsDraw.styles[StyleDefault].back));
+
+	if (vsDraw.IsLineFrameOpaque(caretActive, ll->containsCaret)) {
+		// Draw left of frame under marker
+		surface->FillRectangleAligned(Side(rcLine, Edge::left, vsDraw.GetFrameWidth()),
+			vsDraw.ElementColour(Element::CaretLineBack)->Opaque());
+	}
+
+	if (FlagSet(vsDraw.wrap.visualFlags, WrapVisualFlag::Start)) {
+
+		// draw continuation rect
+		PRectangle rcPlace = rcLine;
+
+		rcPlace.left = static_cast<XYPOSITION>(xStart);
+		rcPlace.right = rcPlace.left + ll->wrapIndent;
+
+		if (FlagSet(vsDraw.wrap.visualFlagsLocation, WrapVisualLocation::StartByText))
+			rcPlace.left = rcPlace.right - vsDraw.aveCharWidth;
+		else
+			rcPlace.right = rcPlace.left + vsDraw.aveCharWidth;
+
+		if (!customDrawWrapMarker) {
+			DrawWrapMarker(surface, rcPlace, false, vsDraw.WrapColour());
+		} else {
+			customDrawWrapMarker(surface, rcPlace, false, vsDraw.WrapColour());
+		}
+	}
+}
+
+void EditView::DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart,
+	int subLine, std::optional<ColourRGBA> background) const {
+
+	const bool selBackDrawn = vsDraw.SelectionBackgroundDrawn();
+	bool inIndentation = subLine == 0;	// Do not handle indentation except on first subline.
+	const XYACCUMULATOR subLineStart = ll->positions[lineRange.start];
+	// Does not take margin into account but not significant
+	const XYPOSITION xStartVisible = static_cast<XYPOSITION>(subLineStart-xStart);
+
+	BreakFinder bfBack(ll, &model.sel, lineRange, posLineStart, xStartVisible, selBackDrawn, model.pdoc, &model.reprs, nullptr);
+
+	const bool drawWhitespaceBackground = vsDraw.WhitespaceBackgroundDrawn() && !background;
+
+	// Background drawing loop
+	while (bfBack.More()) {
+
+		const TextSegment ts = bfBack.Next();
+		const Sci::Position i = ts.end() - 1;
+		const Sci::Position iDoc = i + posLineStart;
+
+		PRectangle rcSegment = rcLine;
+		rcSegment.left = ll->positions[ts.start] + xStart - static_cast<XYPOSITION>(subLineStart);
+		rcSegment.right = ll->positions[ts.end()] + xStart - static_cast<XYPOSITION>(subLineStart);
+		// Only try to draw if really visible - enhances performance by not calling environment to
+		// draw strings that are completely past the right side of the window.
+		if (!rcSegment.Empty() && rcSegment.Intersects(rcLine)) {
+			// Clip to line rectangle, since may have a huge position which will not work with some platforms
+			if (rcSegment.left < rcLine.left)
+				rcSegment.left = rcLine.left;
+			if (rcSegment.right > rcLine.right)
+				rcSegment.right = rcLine.right;
+
+			const InSelection inSelection = hideSelection ? InSelection::inNone : model.sel.CharacterInSelection(iDoc);
+			const bool inHotspot = (ll->hotspot.Valid()) && ll->hotspot.ContainsCharacter(iDoc);
+			ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, inSelection,
+				inHotspot, ll->styles[i], i);
+			if (ts.representation) {
+				if (ll->chars[i] == '\t') {
+					// Tab display
+					if (drawWhitespaceBackground && vsDraw.WhiteSpaceVisible(inIndentation)) {
+						textBack = vsDraw.ElementColour(Element::WhiteSpaceBack)->Opaque();
+					}
+				} else {
+					// Blob display
+					inIndentation = false;
+				}
+				surface->FillRectangleAligned(rcSegment, Fill(textBack));
+			} else {
+				// Normal text display
+				surface->FillRectangleAligned(rcSegment, Fill(textBack));
+				if (vsDraw.viewWhitespace != WhiteSpace::Invisible) {
+					for (int cpos = 0; cpos <= i - ts.start; cpos++) {
+						if (ll->chars[cpos + ts.start] == ' ') {
+							if (drawWhitespaceBackground && vsDraw.WhiteSpaceVisible(inIndentation)) {
+								const PRectangle rcSpace(
+									ll->positions[cpos + ts.start] + xStart - static_cast<XYPOSITION>(subLineStart),
+									rcSegment.top,
+									ll->positions[cpos + ts.start + 1] + xStart - static_cast<XYPOSITION>(subLineStart),
+									rcSegment.bottom);
+								surface->FillRectangleAligned(rcSpace,
+									vsDraw.ElementColour(Element::WhiteSpaceBack)->Opaque());
+							}
+						} else {
+							inIndentation = false;
+						}
+					}
+				}
+			}
+		} else if (rcSegment.left > rcLine.right) {
+			break;
+		}
+	}
+}
+
+static void DrawEdgeLine(Surface *surface, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
+	Range lineRange, int xStart) {
+	if (vsDraw.edgeState == EdgeVisualStyle::Line) {
+		PRectangle rcSegment = rcLine;
+		const int edgeX = static_cast<int>(vsDraw.theEdge.column * vsDraw.spaceWidth);
+		rcSegment.left = static_cast<XYPOSITION>(edgeX + xStart);
+		if ((ll->wrapIndent != 0) && (lineRange.start != 0))
+			rcSegment.left -= ll->wrapIndent;
+		rcSegment.right = rcSegment.left + 1;
+		surface->FillRectangleAligned(rcSegment, Fill(vsDraw.theEdge.colour));
+	} else if (vsDraw.edgeState == EdgeVisualStyle::MultiLine) {
+		for (size_t edge = 0; edge < vsDraw.theMultiEdge.size(); edge++) {
+			if (vsDraw.theMultiEdge[edge].column >= 0) {
+				PRectangle rcSegment = rcLine;
+				const int edgeX = static_cast<int>(vsDraw.theMultiEdge[edge].column * vsDraw.spaceWidth);
+				rcSegment.left = static_cast<XYPOSITION>(edgeX + xStart);
+				if ((ll->wrapIndent != 0) && (lineRange.start != 0))
+					rcSegment.left -= ll->wrapIndent;
+				rcSegment.right = rcSegment.left + 1;
+				surface->FillRectangleAligned(rcSegment, Fill(vsDraw.theMultiEdge[edge].colour));
+			}
+		}
+	}
+}
+
+// Draw underline mark as part of background if on base layer
+static void DrawMarkUnderline(Surface *surface, const EditModel &model, const ViewStyle &vsDraw,
+	Sci::Line line, PRectangle rcLine) {
+	int marks = model.pdoc->GetMark(line);
+	for (int markBit = 0; (markBit < 32) && marks; markBit++) {
+		if ((marks & 1) && (vsDraw.markers[markBit].markType == MarkerSymbol::Underline) &&
+			(vsDraw.markers[markBit].layer == Layer::Base)) {
+			PRectangle rcUnderline = rcLine;
+			rcUnderline.top = rcUnderline.bottom - 2;
+			surface->FillRectangleAligned(rcUnderline, Fill(vsDraw.markers[markBit].back));
+		}
+		marks >>= 1;
+	}
+}
+
+static void DrawTranslucentSelection(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, PRectangle rcLine, int subLine, Range lineRange, int xStart, int tabWidthMinimumPixels, Layer layer) {
+	if (vsDraw.selection.layer == layer) {
+		const Sci::Position posLineStart = model.pdoc->LineStart(line);
+		const XYACCUMULATOR subLineStart = ll->positions[lineRange.start];
+		// For each selection draw
+		Sci::Position virtualSpaces = 0;
+		if (subLine == (ll->lines - 1)) {
+			virtualSpaces = model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line));
+		}
+		const SelectionPosition posStart(posLineStart + lineRange.start);
+		const SelectionPosition posEnd(posLineStart + lineRange.end, virtualSpaces);
+		const SelectionSegment virtualSpaceRange(posStart, posEnd);
+		for (size_t r = 0; r < model.sel.Count(); r++) {
+			const SelectionSegment portion = model.sel.Range(r).Intersect(virtualSpaceRange);
+			if (!portion.Empty()) {
+				const ColourRGBA selectionBack = SelectionBackground(
+					model, vsDraw, model.sel.RangeType(r));
+				const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
+				if (model.BidirectionalEnabled()) {
+					const int selectionStart = static_cast<int>(portion.start.Position() - posLineStart - lineRange.start);
+					const int selectionEnd = static_cast<int>(portion.end.Position() - posLineStart - lineRange.start);
+
+					const ScreenLine screenLine(ll, subLine, vsDraw, rcLine.right, tabWidthMinimumPixels);
+					std::unique_ptr<IScreenLineLayout> slLayout = surface->Layout(&screenLine);
+
+					const std::vector<Interval> intervals = slLayout->FindRangeIntervals(selectionStart, selectionEnd);
+					for (const Interval &interval : intervals) {
+						const XYPOSITION rcRight = interval.right + xStart;
+						const XYPOSITION rcLeft = interval.left + xStart;
+						const PRectangle rcSelection(rcLeft, rcLine.top, rcRight, rcLine.bottom);
+						surface->FillRectangleAligned(rcSelection, selectionBack);
+					}
+
+					if (portion.end.VirtualSpace()) {
+						const XYPOSITION xStartVirtual = ll->positions[lineRange.end] -
+							static_cast<XYPOSITION>(subLineStart) + xStart;
+						PRectangle rcSegment = rcLine;
+						rcSegment.left = xStartVirtual + portion.start.VirtualSpace() * spaceWidth;
+						rcSegment.right = xStartVirtual + portion.end.VirtualSpace() * spaceWidth;
+						surface->FillRectangleAligned(rcSegment, selectionBack);
+					}
+				} else {
+					PRectangle rcSegment = rcLine;
+					rcSegment.left = xStart + ll->positions[portion.start.Position() - posLineStart] -
+						static_cast<XYPOSITION>(subLineStart) + portion.start.VirtualSpace() * spaceWidth;
+					rcSegment.right = xStart + ll->positions[portion.end.Position() - posLineStart] -
+						static_cast<XYPOSITION>(subLineStart) + portion.end.VirtualSpace() * spaceWidth;
+					if ((ll->wrapIndent != 0) && (lineRange.start != 0)) {
+						if ((portion.start.Position() - posLineStart) == lineRange.start && model.sel.Range(r).ContainsCharacter(portion.start.Position() - 1))
+							rcSegment.left -= static_cast<int>(ll->wrapIndent); // indentation added to xStart was truncated to int, so we do the same here
+					}
+					rcSegment.left = (rcSegment.left > rcLine.left) ? rcSegment.left : rcLine.left;
+					rcSegment.right = (rcSegment.right < rcLine.right) ? rcSegment.right : rcLine.right;
+					if (rcSegment.right > rcLine.left)
+						surface->FillRectangleAligned(rcSegment, selectionBack);
+				}
+			}
+		}
+	}
+}
+
+// Draw any translucent whole line states
+static void DrawTranslucentLineState(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, PRectangle rcLine, int subLine, Layer layer) {
+	if ((model.caret.active || vsDraw.caretLine.alwaysShow) && vsDraw.ElementColour(Element::CaretLineBack) && ll->containsCaret &&
+		vsDraw.caretLine.layer == layer) {
+		if (vsDraw.caretLine.frame) {
+			DrawCaretLineFramed(surface, vsDraw, ll, rcLine, subLine);
+		} else {
+			surface->FillRectangleAligned(rcLine, *vsDraw.ElementColour(Element::CaretLineBack));
+		}
+	}
+	const int marksOfLine = model.pdoc->GetMark(line);
+	int marksDrawnInText = marksOfLine & vsDraw.maskDrawInText;
+	for (int markBit = 0; (markBit < 32) && marksDrawnInText; markBit++) {
+		if ((marksDrawnInText & 1) && (vsDraw.markers[markBit].layer == layer)) {
+			if (vsDraw.markers[markBit].markType == MarkerSymbol::Background) {
+				surface->FillRectangleAligned(rcLine, vsDraw.markers[markBit].BackWithAlpha());
+			} else if (vsDraw.markers[markBit].markType == MarkerSymbol::Underline) {
+				PRectangle rcUnderline = rcLine;
+				rcUnderline.top = rcUnderline.bottom - 2;
+				surface->FillRectangleAligned(rcUnderline, vsDraw.markers[markBit].BackWithAlpha());
+			}
+		}
+		marksDrawnInText >>= 1;
+	}
+	int marksDrawnInLine = marksOfLine & vsDraw.maskInLine;
+	for (int markBit = 0; (markBit < 32) && marksDrawnInLine; markBit++) {
+		if ((marksDrawnInLine & 1) && (vsDraw.markers[markBit].layer == layer)) {
+			surface->FillRectangleAligned(rcLine, vsDraw.markers[markBit].BackWithAlpha());
+		}
+		marksDrawnInLine >>= 1;
+	}
+}
+
+void EditView::DrawForeground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line lineVisible, PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart,
+	int subLine, std::optional<ColourRGBA> background) {
+
+	const bool selBackDrawn = vsDraw.SelectionBackgroundDrawn();
+	const bool drawWhitespaceBackground = vsDraw.WhitespaceBackgroundDrawn() && !background;
+	bool inIndentation = subLine == 0;	// Do not handle indentation except on first subline.
+
+	const XYACCUMULATOR subLineStart = ll->positions[lineRange.start];
+	const XYPOSITION indentWidth = model.pdoc->IndentSize() * vsDraw.spaceWidth;
+
+	// Does not take margin into account but not significant
+	const XYPOSITION xStartVisible = static_cast<XYPOSITION>(subLineStart-xStart);
+
+	// Foreground drawing loop
+	BreakFinder bfFore(ll, &model.sel, lineRange, posLineStart, xStartVisible,
+		(((phasesDraw == PhasesDraw::One) && selBackDrawn) || vsDraw.SelectionTextDrawn()), model.pdoc, &model.reprs, &vsDraw);
+
+	while (bfFore.More()) {
+
+		const TextSegment ts = bfFore.Next();
+		const Sci::Position i = ts.end() - 1;
+		const Sci::Position iDoc = i + posLineStart;
+
+		PRectangle rcSegment = rcLine;
+		rcSegment.left = ll->positions[ts.start] + xStart - static_cast<XYPOSITION>(subLineStart);
+		rcSegment.right = ll->positions[ts.end()] + xStart - static_cast<XYPOSITION>(subLineStart);
+		// Only try to draw if really visible - enhances performance by not calling environment to
+		// draw strings that are completely past the right side of the window.
+		if (rcSegment.Intersects(rcLine)) {
+			const int styleMain = ll->styles[i];
+			ColourRGBA textFore = vsDraw.styles[styleMain].fore;
+			const Font *textFont = vsDraw.styles[styleMain].font.get();
+			// Hot-spot foreground
+			const bool inHotspot = (ll->hotspot.Valid()) && ll->hotspot.ContainsCharacter(iDoc);
+			if (inHotspot) {
+				if (vsDraw.ElementColour(Element::HotSpotActive))
+					textFore = *vsDraw.ElementColour(Element::HotSpotActive);
+			}
+			if (vsDraw.indicatorsSetFore) {
+				// At least one indicator sets the text colour so see if it applies to this segment
+				for (const IDecoration *deco : model.pdoc->decorations->View()) {
+					const int indicatorValue = deco->ValueAt(ts.start + posLineStart);
+					if (indicatorValue) {
+						const Indicator &indicator = vsDraw.indicators[deco->Indicator()];
+						bool hover = false;
+						if (indicator.IsDynamic()) {
+							const Sci::Position startPos = ts.start + posLineStart;
+							const Range rangeRun(deco->StartRun(startPos), deco->EndRun(startPos));
+							hover =	rangeRun.ContainsCharacter(model.hoverIndicatorPos);
+						}
+						if (hover) {
+							if (indicator.sacHover.style == IndicatorStyle::TextFore) {
+								textFore = indicator.sacHover.fore;
+							}
+						} else {
+							if (indicator.sacNormal.style == IndicatorStyle::TextFore) {
+								if (FlagSet(indicator.Flags(), IndicFlag::ValueFore))
+									textFore = ColourRGBA::FromRGB(indicatorValue & static_cast<int>(IndicValue::Mask));
+								else
+									textFore = indicator.sacNormal.fore;
+							}
+						}
+					}
+				}
+			}
+			const InSelection inSelection = hideSelection ? InSelection::inNone : model.sel.CharacterInSelection(iDoc);
+			const std::optional<ColourRGBA> selectionFore = SelectionForeground(model, vsDraw, inSelection);
+			if (selectionFore) {
+				textFore = *selectionFore;
+			}
+			ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, inSelection, inHotspot, styleMain, i);
+			if (ts.representation) {
+				if (ll->chars[i] == '\t') {
+					// Tab display
+					if (phasesDraw == PhasesDraw::One) {
+						if (drawWhitespaceBackground && vsDraw.WhiteSpaceVisible(inIndentation))
+							textBack = vsDraw.ElementColour(Element::WhiteSpaceBack)->Opaque();
+						surface->FillRectangleAligned(rcSegment, Fill(textBack));
+					}
+					if (inIndentation && vsDraw.viewIndentationGuides == IndentView::Real) {
+						for (int indentCount = static_cast<int>((ll->positions[i] + epsilon) / indentWidth);
+							indentCount <= (ll->positions[i + 1] - epsilon) / indentWidth;
+							indentCount++) {
+							if (indentCount > 0) {
+								const XYPOSITION xIndent = std::floor(indentCount * indentWidth);
+								DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment,
+									(ll->xHighlightGuide == xIndent));
+							}
+						}
+					}
+					if (vsDraw.viewWhitespace != WhiteSpace::Invisible) {
+						if (vsDraw.WhiteSpaceVisible(inIndentation)) {
+							const PRectangle rcTab(rcSegment.left + 1, rcSegment.top + tabArrowHeight,
+								rcSegment.right - 1, rcSegment.bottom - vsDraw.maxDescent);
+							const int segmentTop = static_cast<int>(rcSegment.top) + vsDraw.lineHeight / 2;
+							const ColourRGBA whiteSpaceFore = vsDraw.ElementColour(Element::WhiteSpace).value_or(textFore);
+							if (!customDrawTabArrow)
+								DrawTabArrow(surface, rcTab, segmentTop, vsDraw, Stroke(whiteSpaceFore, 1.0f));
+							else
+								customDrawTabArrow(surface, rcTab, segmentTop, vsDraw, Stroke(whiteSpaceFore, 1.0f));
+						}
+					}
+				} else {
+					inIndentation = false;
+					if (vsDraw.controlCharSymbol >= 32) {
+						// Using one font for all control characters so it can be controlled independently to ensure
+						// the box goes around the characters tightly. Seems to be no way to work out what height
+						// is taken by an individual character - internal leading gives varying results.
+						const Font *ctrlCharsFont = vsDraw.styles[StyleControlChar].font.get();
+						const char cc[2] = { static_cast<char>(vsDraw.controlCharSymbol), '\0' };
+						surface->DrawTextNoClip(rcSegment, ctrlCharsFont,
+							rcSegment.top + vsDraw.maxAscent,
+							cc, textBack, textFore);
+					} else {
+						if (FlagSet(ts.representation->appearance, RepresentationAppearance::Colour)) {
+							textFore = ts.representation->colour;
+						}
+						if (FlagSet(ts.representation->appearance, RepresentationAppearance::Blob)) {
+							DrawTextBlob(surface, vsDraw, rcSegment, ts.representation->stringRep,
+								textBack, textFore, phasesDraw == PhasesDraw::One);
+						} else {
+							surface->DrawTextTransparentUTF8(rcSegment, vsDraw.styles[StyleControlChar].font.get(),
+								rcSegment.top + vsDraw.maxAscent, ts.representation->stringRep, textFore);
+						}
+					}
+				}
+			} else {
+				// Normal text display
+				if (vsDraw.styles[styleMain].visible) {
+					const std::string_view text(&ll->chars[ts.start], i - ts.start + 1);
+					if (phasesDraw != PhasesDraw::One) {
+						surface->DrawTextTransparent(rcSegment, textFont,
+							rcSegment.top + vsDraw.maxAscent, text, textFore);
+					} else {
+						surface->DrawTextNoClip(rcSegment, textFont,
+							rcSegment.top + vsDraw.maxAscent, text, textFore, textBack);
+					}
+				}
+				if (vsDraw.viewWhitespace != WhiteSpace::Invisible ||
+					(inIndentation && vsDraw.viewIndentationGuides != IndentView::None)) {
+					for (int cpos = 0; cpos <= i - ts.start; cpos++) {
+						if (ll->chars[cpos + ts.start] == ' ') {
+							if (vsDraw.viewWhitespace != WhiteSpace::Invisible) {
+								if (vsDraw.WhiteSpaceVisible(inIndentation)) {
+									const XYPOSITION xmid = (ll->positions[cpos + ts.start] + ll->positions[cpos + ts.start + 1]) / 2;
+									if ((phasesDraw == PhasesDraw::One) && drawWhitespaceBackground) {
+										textBack = vsDraw.ElementColour(Element::WhiteSpaceBack)->Opaque();
+										const PRectangle rcSpace(
+											ll->positions[cpos + ts.start] + xStart - static_cast<XYPOSITION>(subLineStart),
+											rcSegment.top,
+											ll->positions[cpos + ts.start + 1] + xStart - static_cast<XYPOSITION>(subLineStart),
+											rcSegment.bottom);
+										surface->FillRectangleAligned(rcSpace, Fill(textBack));
+									}
+									const int halfDotWidth = vsDraw.whitespaceSize / 2;
+									PRectangle rcDot(xmid + xStart - halfDotWidth - static_cast<XYPOSITION>(subLineStart),
+										rcSegment.top + vsDraw.lineHeight / 2, 0.0f, 0.0f);
+									rcDot.right = rcDot.left + vsDraw.whitespaceSize;
+									rcDot.bottom = rcDot.top + vsDraw.whitespaceSize;
+									const ColourRGBA whiteSpaceFore = vsDraw.ElementColour(Element::WhiteSpace).value_or(textFore);
+									surface->FillRectangleAligned(rcDot, Fill(whiteSpaceFore));
+								}
+							}
+							if (inIndentation && vsDraw.viewIndentationGuides == IndentView::Real) {
+								for (int indentCount = static_cast<int>((ll->positions[cpos + ts.start] + epsilon) / indentWidth);
+									indentCount <= (ll->positions[cpos + ts.start + 1] - epsilon) / indentWidth;
+									indentCount++) {
+									if (indentCount > 0) {
+										const XYPOSITION xIndent = std::floor(indentCount * indentWidth);
+										DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcSegment,
+											(ll->xHighlightGuide == xIndent));
+									}
+								}
+							}
+						} else {
+							inIndentation = false;
+						}
+					}
+				}
+			}
+			if (ll->hotspot.Valid() && vsDraw.hotspotUnderline && ll->hotspot.ContainsCharacter(iDoc)) {
+				PRectangle rcUL = rcSegment;
+				rcUL.top = rcUL.top + vsDraw.maxAscent + 1;
+				rcUL.bottom = rcUL.top + 1;
+				if (vsDraw.ElementColour(Element::HotSpotActive))
+					surface->FillRectangleAligned(rcUL, Fill(*vsDraw.ElementColour(Element::HotSpotActive)));
+				else
+					surface->FillRectangleAligned(rcUL, Fill(textFore));
+			} else if (vsDraw.styles[styleMain].underline) {
+				PRectangle rcUL = rcSegment;
+				rcUL.top = rcUL.top + vsDraw.maxAscent + 1;
+				rcUL.bottom = rcUL.top + 1;
+				surface->FillRectangleAligned(rcUL, Fill(textFore));
+			}
+		} else if (rcSegment.left > rcLine.right) {
+			break;
+		}
+	}
+}
+
+void EditView::DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, Sci::Line lineVisible, PRectangle rcLine, int xStart, int subLine) {
+	if ((vsDraw.viewIndentationGuides == IndentView::LookForward || vsDraw.viewIndentationGuides == IndentView::LookBoth)
+		&& (subLine == 0)) {
+		const Sci::Position posLineStart = model.pdoc->LineStart(line);
+		int indentSpace = model.pdoc->GetLineIndentation(line);
+		int xStartText = static_cast<int>(ll->positions[model.pdoc->GetLineIndentPosition(line) - posLineStart]);
+
+		// Find the most recent line with some text
+
+		Sci::Line lineLastWithText = line;
+		while (lineLastWithText > std::max(line - 20, static_cast<Sci::Line>(0)) && model.pdoc->IsWhiteLine(lineLastWithText)) {
+			lineLastWithText--;
+		}
+		if (lineLastWithText < line) {
+			xStartText = 100000;	// Don't limit to visible indentation on empty line
+			// This line is empty, so use indentation of last line with text
+			int indentLastWithText = model.pdoc->GetLineIndentation(lineLastWithText);
+			const int isFoldHeader = LevelIsHeader(model.pdoc->GetFoldLevel(lineLastWithText));
+			if (isFoldHeader) {
+				// Level is one more level than parent
+				indentLastWithText += model.pdoc->IndentSize();
+			}
+			if (vsDraw.viewIndentationGuides == IndentView::LookForward) {
+				// In viLookForward mode, previous line only used if it is a fold header
+				if (isFoldHeader) {
+					indentSpace = std::max(indentSpace, indentLastWithText);
+				}
+			} else {	// viLookBoth
+				indentSpace = std::max(indentSpace, indentLastWithText);
+			}
+		}
+
+		Sci::Line lineNextWithText = line;
+		while (lineNextWithText < std::min(line + 20, model.pdoc->LinesTotal()) && model.pdoc->IsWhiteLine(lineNextWithText)) {
+			lineNextWithText++;
+		}
+		if (lineNextWithText > line) {
+			xStartText = 100000;	// Don't limit to visible indentation on empty line
+			// This line is empty, so use indentation of first next line with text
+			indentSpace = std::max(indentSpace,
+				model.pdoc->GetLineIndentation(lineNextWithText));
+		}
+
+		for (int indentPos = model.pdoc->IndentSize(); indentPos < indentSpace; indentPos += model.pdoc->IndentSize()) {
+			const XYPOSITION xIndent = std::floor(indentPos * vsDraw.spaceWidth);
+			if (xIndent < xStartText) {
+				DrawIndentGuide(surface, lineVisible, vsDraw.lineHeight, xIndent + xStart, rcLine,
+					(ll->xHighlightGuide == xIndent));
+			}
+		}
+	}
+}
+
+void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, Sci::Line lineVisible, int xStart, PRectangle rcLine, int subLine, DrawPhase phase) {
+
+	if (subLine >= ll->lines) {
+		DrawAnnotation(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, phase);
+		return; // No further drawing
+	}
+
+	// See if something overrides the line background colour.
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+
+	const Sci::Position posLineStart = model.pdoc->LineStart(line);
+
+	const Range lineRange = ll->SubLineRange(subLine, LineLayout::Scope::visibleOnly);
+	const Range lineRangeIncludingEnd = ll->SubLineRange(subLine, LineLayout::Scope::includeEnd);
+	const XYACCUMULATOR subLineStart = ll->positions[lineRange.start];
+
+	if ((ll->wrapIndent != 0) && (subLine > 0)) {
+		if (FlagSet(phase, DrawPhase::back)) {
+			DrawWrapIndentAndMarker(surface, vsDraw, ll, xStart, rcLine, background, customDrawWrapMarker, model.caret.active);
+		}
+		xStart += static_cast<int>(ll->wrapIndent);
+	}
+
+	if (phasesDraw != PhasesDraw::One) {
+		if (FlagSet(phase, DrawPhase::back)) {
+			DrawBackground(surface, model, vsDraw, ll, rcLine, lineRange, posLineStart, xStart,
+				subLine, background);
+			DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, DrawPhase::back);
+			DrawEOLAnnotationText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, DrawPhase::back);
+			// Remove drawBack to not draw again in DrawFoldDisplayText
+			phase = static_cast<DrawPhase>(static_cast<int>(phase) & ~static_cast<int>(DrawPhase::back));
+			DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end,
+				xStart, subLine, subLineStart, background);
+			if (vsDraw.IsLineFrameOpaque(model.caret.active, ll->containsCaret))
+				DrawCaretLineFramed(surface, vsDraw, ll, rcLine, subLine);
+		}
+
+		if (FlagSet(phase, DrawPhase::indicatorsBack)) {
+			DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine,
+				lineRangeIncludingEnd.end, true, tabWidthMinimumPixels);
+			DrawEdgeLine(surface, vsDraw, ll, rcLine, lineRange, xStart);
+			DrawMarkUnderline(surface, model, vsDraw, line, rcLine);
+		}
+	}
+
+	if (FlagSet(phase, DrawPhase::text)) {
+		DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::UnderText);
+		DrawTranslucentLineState(surface, model, vsDraw, ll, line, rcLine, subLine, Layer::UnderText);
+		DrawForeground(surface, model, vsDraw, ll, lineVisible, rcLine, lineRange, posLineStart, xStart,
+			subLine, background);
+	}
+
+	if (FlagSet(phase, DrawPhase::indentationGuides)) {
+		DrawIndentGuidesOverEmpty(surface, model, vsDraw, ll, line, lineVisible, rcLine, xStart, subLine);
+	}
+
+	if (FlagSet(phase, DrawPhase::indicatorsFore)) {
+		DrawIndicators(surface, model, vsDraw, ll, line, xStart, rcLine, subLine,
+			lineRangeIncludingEnd.end, false, tabWidthMinimumPixels);
+	}
+
+	DrawFoldDisplayText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, phase);
+	DrawEOLAnnotationText(surface, model, vsDraw, ll, line, xStart, rcLine, subLine, subLineStart, phase);
+
+	if (phasesDraw == PhasesDraw::One) {
+		DrawEOL(surface, model, vsDraw, ll, rcLine, line, lineRange.end,
+			xStart, subLine, subLineStart, background);
+		if (vsDraw.IsLineFrameOpaque(model.caret.active, ll->containsCaret))
+			DrawCaretLineFramed(surface, vsDraw, ll, rcLine, subLine);
+		DrawEdgeLine(surface, vsDraw, ll, rcLine, lineRange, xStart);
+		DrawMarkUnderline(surface, model, vsDraw, line, rcLine);
+	}
+
+	if (!hideSelection && FlagSet(phase, DrawPhase::selectionTranslucent)) {
+		DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::OverText);
+	}
+
+	if (FlagSet(phase, DrawPhase::lineTranslucent)) {
+		DrawTranslucentLineState(surface, model, vsDraw, ll, line, rcLine, subLine, Layer::OverText);
+	}
+}
+
+static void DrawFoldLines(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, Sci::Line line, PRectangle rcLine) {
+	const bool expanded = model.pcs->GetExpanded(line);
+	const FoldLevel level = model.pdoc->GetFoldLevel(line);
+	const FoldLevel levelNext = model.pdoc->GetFoldLevel(line + 1);
+	if (LevelIsHeader(level) &&
+		(LevelNumber(level) < LevelNumber(levelNext))) {
+		// Paint the line above the fold
+		if ((expanded && (FlagSet(model.foldFlags, FoldFlag::LineBeforeExpanded)))
+			||
+			(!expanded && (FlagSet(model.foldFlags, FoldFlag::LineBeforeContracted)))) {
+			PRectangle rcFoldLine = rcLine;
+			rcFoldLine.bottom = rcFoldLine.top + 1;
+			surface->FillRectangleAligned(rcFoldLine, Fill(vsDraw.styles[StyleDefault].fore));
+		}
+		// Paint the line below the fold
+		if ((expanded && (FlagSet(model.foldFlags, FoldFlag::LineAfterExpanded)))
+			||
+			(!expanded && (FlagSet(model.foldFlags, FoldFlag::LineAfterContracted)))) {
+			PRectangle rcFoldLine = rcLine;
+			rcFoldLine.top = rcFoldLine.bottom - 1;
+			surface->FillRectangleAligned(rcFoldLine, Fill(vsDraw.styles[StyleDefault].fore));
+		}
+	}
+}
+
+void EditView::PaintText(Surface *surfaceWindow, const EditModel &model, PRectangle rcArea,
+	PRectangle rcClient, const ViewStyle &vsDraw) {
+	// Allow text at start of line to overlap 1 pixel into the margin as this displays
+	// serifs and italic stems for aliased text.
+	const int leftTextOverlap = ((model.xOffset == 0) && (vsDraw.leftMarginWidth > 0)) ? 1 : 0;
+
+	// Do the painting
+	if (rcArea.right > vsDraw.textStart - leftTextOverlap) {
+
+		Surface *surface = surfaceWindow;
+		if (bufferedDraw) {
+			surface = pixmapLine.get();
+			PLATFORM_ASSERT(pixmapLine->Initialised());
+		}
+		surface->SetMode(SurfaceMode(model.pdoc->dbcsCodePage, model.BidirectionalR2L()));
+
+		const Point ptOrigin = model.GetVisibleOriginInMain();
+
+		const int screenLinePaintFirst = static_cast<int>(rcArea.top) / vsDraw.lineHeight;
+		const int xStart = vsDraw.textStart - model.xOffset + static_cast<int>(ptOrigin.x);
+
+		SelectionPosition posCaret = model.sel.RangeMain().caret;
+		if (model.posDrag.IsValid())
+			posCaret = model.posDrag;
+		const Sci::Line lineCaret = model.pdoc->SciLineFromPosition(posCaret.Position());
+
+		PRectangle rcTextArea = rcClient;
+		if (vsDraw.marginInside) {
+			rcTextArea.left += vsDraw.textStart;
+			rcTextArea.right -= vsDraw.rightMarginWidth;
+		} else {
+			rcTextArea = rcArea;
+		}
+
+		// Remove selection margin from drawing area so text will not be drawn
+		// on it in unbuffered mode.
+		const bool clipping = !bufferedDraw && vsDraw.marginInside;
+		if (clipping) {
+			PRectangle rcClipText = rcTextArea;
+			rcClipText.left -= leftTextOverlap;
+			surfaceWindow->SetClip(rcClipText);
+		}
+
+		// Loop on visible lines
+#if defined(TIME_PAINTING)
+		double durLayout = 0.0;
+		double durPaint = 0.0;
+		double durCopy = 0.0;
+		ElapsedPeriod epWhole;
+#endif
+		const bool bracesIgnoreStyle = ((vsDraw.braceHighlightIndicatorSet && (model.bracesMatchStyle == StyleBraceLight)) ||
+			(vsDraw.braceBadLightIndicatorSet && (model.bracesMatchStyle == StyleBraceBad)));
+
+		Sci::Line lineDocPrevious = -1;	// Used to avoid laying out one document line multiple times
+		std::shared_ptr<LineLayout> ll;
+		std::vector<DrawPhase> phases;
+		if ((phasesDraw == PhasesDraw::Multiple) && !bufferedDraw) {
+			for (DrawPhase phase = DrawPhase::back; phase <= DrawPhase::carets; phase = static_cast<DrawPhase>(static_cast<int>(phase) * 2)) {
+				phases.push_back(phase);
+			}
+		} else {
+			phases.push_back(DrawPhase::all);
+		}
+		for (const DrawPhase &phase : phases) {
+			int ypos = 0;
+			if (!bufferedDraw)
+				ypos += screenLinePaintFirst * vsDraw.lineHeight;
+			int yposScreen = screenLinePaintFirst * vsDraw.lineHeight;
+			Sci::Line visibleLine = model.TopLineOfMain() + screenLinePaintFirst;
+			while (visibleLine < model.pcs->LinesDisplayed() && yposScreen < rcArea.bottom) {
+
+				const Sci::Line lineDoc = model.pcs->DocFromDisplay(visibleLine);
+				// Only visible lines should be handled by the code within the loop
+				PLATFORM_ASSERT(model.pcs->GetVisible(lineDoc));
+				const Sci::Line lineStartSet = model.pcs->DisplayFromDoc(lineDoc);
+				const int subLine = static_cast<int>(visibleLine - lineStartSet);
+
+				// Copy this line and its styles from the document into local arrays
+				// and determine the x position at which each character starts.
+#if defined(TIME_PAINTING)
+				ElapsedPeriod ep;
+#endif
+				if (lineDoc != lineDocPrevious) {
+					ll = RetrieveLineLayout(lineDoc, model);
+					LayoutLine(model, surface, vsDraw, ll.get(), model.wrapWidth);
+					lineDocPrevious = lineDoc;
+				}
+#if defined(TIME_PAINTING)
+				durLayout += ep.Duration(true);
+#endif
+				if (ll) {
+					ll->containsCaret = !hideSelection && (lineDoc == lineCaret);
+					ll->hotspot = model.GetHotSpotRange();
+
+					PRectangle rcLine = rcTextArea;
+					rcLine.top = static_cast<XYPOSITION>(ypos);
+					rcLine.bottom = static_cast<XYPOSITION>(ypos + vsDraw.lineHeight);
+
+					const Range rangeLine(model.pdoc->LineStart(lineDoc),
+						model.pdoc->LineStart(lineDoc + 1));
+
+					// Highlight the current braces if any
+					ll->SetBracesHighlight(rangeLine, model.braces, static_cast<char>(model.bracesMatchStyle),
+						static_cast<int>(model.highlightGuideColumn * vsDraw.spaceWidth), bracesIgnoreStyle);
+
+					if (leftTextOverlap && (bufferedDraw || ((phasesDraw < PhasesDraw::Multiple) && (FlagSet(phase, DrawPhase::back))))) {
+						// Clear the left margin
+						PRectangle rcSpacer = rcLine;
+						rcSpacer.right = rcSpacer.left;
+						rcSpacer.left -= 1;
+						surface->FillRectangleAligned(rcSpacer, Fill(vsDraw.styles[StyleDefault].back));
+					}
+
+					if (model.BidirectionalEnabled()) {
+						// Fill the line bidi data
+						UpdateBidiData(model, vsDraw, ll.get());
+					}
+
+					DrawLine(surface, model, vsDraw, ll.get(), lineDoc, visibleLine, xStart, rcLine, subLine, phase);
+#if defined(TIME_PAINTING)
+					durPaint += ep.Duration(true);
+#endif
+					// Restore the previous styles for the brace highlights in case layout is in cache.
+					ll->RestoreBracesHighlight(rangeLine, model.braces, bracesIgnoreStyle);
+
+					if (FlagSet(phase, DrawPhase::foldLines)) {
+						DrawFoldLines(surface, model, vsDraw, lineDoc, rcLine);
+					}
+
+					if (FlagSet(phase, DrawPhase::carets)) {
+						DrawCarets(surface, model, vsDraw, ll.get(), lineDoc, xStart, rcLine, subLine);
+					}
+
+					if (bufferedDraw) {
+						const Point from = Point::FromInts(vsDraw.textStart - leftTextOverlap, 0);
+						const PRectangle rcCopyArea = PRectangle::FromInts(vsDraw.textStart - leftTextOverlap, yposScreen,
+							static_cast<int>(rcClient.right - vsDraw.rightMarginWidth),
+							yposScreen + vsDraw.lineHeight);
+						pixmapLine->FlushDrawing();
+						surfaceWindow->Copy(rcCopyArea, from, *pixmapLine);
+					}
+
+					lineWidthMaxSeen = std::max(
+						lineWidthMaxSeen, static_cast<int>(ll->positions[ll->numCharsInLine]));
+#if defined(TIME_PAINTING)
+					durCopy += ep.Duration(true);
+#endif
+				}
+
+				if (!bufferedDraw) {
+					ypos += vsDraw.lineHeight;
+				}
+
+				yposScreen += vsDraw.lineHeight;
+				visibleLine++;
+			}
+		}
+		ll.reset();
+#if defined(TIME_PAINTING)
+		if (durPaint < 0.00000001)
+			durPaint = 0.00000001;
+#endif
+		// Right column limit indicator
+		PRectangle rcBeyondEOF = (vsDraw.marginInside) ? rcClient : rcArea;
+		rcBeyondEOF.left = static_cast<XYPOSITION>(vsDraw.textStart);
+		rcBeyondEOF.right = rcBeyondEOF.right - ((vsDraw.marginInside) ? vsDraw.rightMarginWidth : 0);
+		rcBeyondEOF.top = static_cast<XYPOSITION>((model.pcs->LinesDisplayed() - model.TopLineOfMain()) * vsDraw.lineHeight);
+		if (rcBeyondEOF.top < rcBeyondEOF.bottom) {
+			surfaceWindow->FillRectangleAligned(rcBeyondEOF, Fill(vsDraw.styles[StyleDefault].back));
+			if (vsDraw.edgeState == EdgeVisualStyle::Line) {
+				const int edgeX = static_cast<int>(vsDraw.theEdge.column * vsDraw.spaceWidth);
+				rcBeyondEOF.left = static_cast<XYPOSITION>(edgeX + xStart);
+				rcBeyondEOF.right = rcBeyondEOF.left + 1;
+				surfaceWindow->FillRectangleAligned(rcBeyondEOF, Fill(vsDraw.theEdge.colour));
+			} else if (vsDraw.edgeState == EdgeVisualStyle::MultiLine) {
+				for (size_t edge = 0; edge < vsDraw.theMultiEdge.size(); edge++) {
+					if (vsDraw.theMultiEdge[edge].column >= 0) {
+						const int edgeX = static_cast<int>(vsDraw.theMultiEdge[edge].column * vsDraw.spaceWidth);
+						rcBeyondEOF.left = static_cast<XYPOSITION>(edgeX + xStart);
+						rcBeyondEOF.right = rcBeyondEOF.left + 1;
+						surfaceWindow->FillRectangleAligned(rcBeyondEOF, Fill(vsDraw.theMultiEdge[edge].colour));
+					}
+				}
+			}
+		}
+
+		if (clipping)
+			surfaceWindow->PopClip();
+
+		//Platform::DebugPrintf("start display %d, offset = %d\n", model.pdoc->Length(), model.xOffset);
+#if defined(TIME_PAINTING)
+		Platform::DebugPrintf(
+		"Layout:%9.6g    Paint:%9.6g    Ratio:%9.6g   Copy:%9.6g   Total:%9.6g\n",
+		durLayout, durPaint, durLayout / durPaint, durCopy, epWhole.Duration());
+#endif
+	}
+}
+
+void EditView::FillLineRemainder(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+	Sci::Line line, PRectangle rcArea, int subLine) const {
+		InSelection eolInSelection = InSelection::inNone;
+	if ((!hideSelection) && (subLine == (ll->lines - 1))) {
+		eolInSelection = model.LineEndInSelection(line);
+	}
+
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+
+	if (eolInSelection && vsDraw.selection.eolFilled && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer == Layer::Base)) {
+		surface->FillRectangleAligned(rcArea, Fill(SelectionBackground(model, vsDraw, eolInSelection).Opaque()));
+	} else {
+		if (background) {
+			surface->FillRectangleAligned(rcArea, Fill(*background));
+		} else if (vsDraw.styles[ll->styles[ll->numCharsInLine]].eolFilled) {
+			surface->FillRectangleAligned(rcArea, Fill(vsDraw.styles[ll->styles[ll->numCharsInLine]].back));
+		} else {
+			surface->FillRectangleAligned(rcArea, Fill(vsDraw.styles[StyleDefault].back));
+		}
+		if (eolInSelection && vsDraw.selection.eolFilled && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer != Layer::Base)) {
+			surface->FillRectangleAligned(rcArea, SelectionBackground(model, vsDraw, eolInSelection));
+		}
+	}
+}
+
+// Space (3 space characters) between line numbers and text when printing.
+#define lineNumberPrintSpace "   "
+
+static ColourRGBA InvertedLight(ColourRGBA orig) noexcept {
+	unsigned int r = orig.GetRed();
+	unsigned int g = orig.GetGreen();
+	unsigned int b = orig.GetBlue();
+	const unsigned int l = (r + g + b) / 3; 	// There is a better calculation for this that matches human eye
+	const unsigned int il = 0xff - l;
+	if (l == 0)
+		return ColourRGBA(0xff, 0xff, 0xff);
+	r = r * il / l;
+	g = g * il / l;
+	b = b * il / l;
+	return ColourRGBA(std::min(r, 0xffu), std::min(g, 0xffu), std::min(b, 0xffu));
+}
+
+Sci::Position EditView::FormatRange(bool draw, const RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
+	const EditModel &model, const ViewStyle &vs) {
+	// Can't use measurements cached for screen
+	posCache.Clear();
+
+	ViewStyle vsPrint(vs);
+	vsPrint.technology = Technology::Default;
+
+	// Modify the view style for printing as do not normally want any of the transient features to be printed
+	// Printing supports only the line number margin.
+	int lineNumberIndex = -1;
+	for (size_t margin = 0; margin < vs.ms.size(); margin++) {
+		if ((vsPrint.ms[margin].style == MarginType::Number) && (vsPrint.ms[margin].width > 0)) {
+			lineNumberIndex = static_cast<int>(margin);
+		} else {
+			vsPrint.ms[margin].width = 0;
+		}
+	}
+	vsPrint.fixedColumnWidth = 0;
+	vsPrint.zoomLevel = printParameters.magnification;
+	// Don't show indentation guides
+	// If this ever gets changed, cached pixmap would need to be recreated if technology != Technology::Default
+	vsPrint.viewIndentationGuides = IndentView::None;
+	// Don't show the selection when printing
+	vsPrint.elementColours.clear();
+	vsPrint.elementBaseColours.clear();
+	vsPrint.caretLine.alwaysShow = false;
+	// Don't highlight matching braces using indicators
+	vsPrint.braceHighlightIndicatorSet = false;
+	vsPrint.braceBadLightIndicatorSet = false;
+
+	// Set colours for printing according to users settings
+	for (size_t sty = 0; sty < vsPrint.styles.size(); sty++) {
+		if (printParameters.colourMode == PrintOption::InvertLight) {
+			vsPrint.styles[sty].fore = InvertedLight(vsPrint.styles[sty].fore);
+			vsPrint.styles[sty].back = InvertedLight(vsPrint.styles[sty].back);
+		} else if (printParameters.colourMode == PrintOption::BlackOnWhite) {
+			vsPrint.styles[sty].fore = ColourRGBA(0, 0, 0);
+			vsPrint.styles[sty].back = ColourRGBA(0xff, 0xff, 0xff);
+		} else if (printParameters.colourMode == PrintOption::ColourOnWhite) {
+			vsPrint.styles[sty].back = ColourRGBA(0xff, 0xff, 0xff);
+		} else if (printParameters.colourMode == PrintOption::ColourOnWhiteDefaultBG) {
+			if (sty <= StyleDefault) {
+				vsPrint.styles[sty].back = ColourRGBA(0xff, 0xff, 0xff);
+			}
+		}
+	}
+	// White background for the line numbers if PrintOption::ScreenColours isn't used
+	if (printParameters.colourMode != PrintOption::ScreenColours)
+		vsPrint.styles[StyleLineNumber].back = ColourRGBA(0xff, 0xff, 0xff);
+
+	// Printing uses different margins, so reset screen margins
+	vsPrint.leftMarginWidth = 0;
+	vsPrint.rightMarginWidth = 0;
+
+	vsPrint.Refresh(*surfaceMeasure, model.pdoc->tabInChars);
+	// Determining width must happen after fonts have been realised in Refresh
+	int lineNumberWidth = 0;
+	if (lineNumberIndex >= 0) {
+		lineNumberWidth = static_cast<int>(surfaceMeasure->WidthText(vsPrint.styles[StyleLineNumber].font.get(),
+			"99999" lineNumberPrintSpace));
+		vsPrint.ms[lineNumberIndex].width = lineNumberWidth;
+		vsPrint.Refresh(*surfaceMeasure, model.pdoc->tabInChars);	// Recalculate fixedColumnWidth
+	}
+
+	const Sci::Line linePrintStart = model.pdoc->SciLineFromPosition(pfr->chrg.cpMin);
+	Sci::Line linePrintLast = linePrintStart + (pfr->rc.bottom - pfr->rc.top) / vsPrint.lineHeight - 1;
+	if (linePrintLast < linePrintStart)
+		linePrintLast = linePrintStart;
+	const Sci::Line linePrintMax = model.pdoc->SciLineFromPosition(pfr->chrg.cpMax);
+	if (linePrintLast > linePrintMax)
+		linePrintLast = linePrintMax;
+	//Platform::DebugPrintf("Formatting lines=[%0d,%0d,%0d] top=%0d bottom=%0d line=%0d %0d\n",
+	//      linePrintStart, linePrintLast, linePrintMax, pfr->rc.top, pfr->rc.bottom, vsPrint.lineHeight,
+	//      surfaceMeasure->Height(vsPrint.styles[StyleLineNumber].font));
+	Sci::Position endPosPrint = model.pdoc->Length();
+	if (linePrintLast < model.pdoc->LinesTotal())
+		endPosPrint = model.pdoc->LineStart(linePrintLast + 1);
+
+	// Ensure we are styled to where we are formatting.
+	model.pdoc->EnsureStyledTo(endPosPrint);
+
+	const int xStart = vsPrint.fixedColumnWidth + pfr->rc.left;
+	int ypos = pfr->rc.top;
+
+	Sci::Line lineDoc = linePrintStart;
+
+	Sci::Position nPrintPos = pfr->chrg.cpMin;
+	int visibleLine = 0;
+	int widthPrint = pfr->rc.right - pfr->rc.left - vsPrint.fixedColumnWidth;
+	if (printParameters.wrapState == Wrap::None)
+		widthPrint = LineLayout::wrapWidthInfinite;
+
+	while (lineDoc <= linePrintLast && ypos < pfr->rc.bottom) {
+
+		// When printing, the hdc and hdcTarget may be the same, so
+		// changing the state of surfaceMeasure may change the underlying
+		// state of surface. Therefore, any cached state is discarded before
+		// using each surface.
+		surfaceMeasure->FlushCachedState();
+
+		// Copy this line and its styles from the document into local arrays
+		// and determine the x position at which each character starts.
+		LineLayout ll(lineDoc, static_cast<int>(model.pdoc->LineStart(lineDoc + 1) - model.pdoc->LineStart(lineDoc) + 1));
+		LayoutLine(model, surfaceMeasure, vsPrint, &ll, widthPrint);
+
+		ll.containsCaret = false;
+
+		PRectangle rcLine = PRectangle::FromInts(
+			pfr->rc.left,
+			ypos,
+			pfr->rc.right - 1,
+			ypos + vsPrint.lineHeight);
+
+		// When document line is wrapped over multiple display lines, find where
+		// to start printing from to ensure a particular position is on the first
+		// line of the page.
+		if (visibleLine == 0) {
+			const Sci::Position startWithinLine = nPrintPos -
+				model.pdoc->LineStart(lineDoc);
+			for (int iwl = 0; iwl < ll.lines - 1; iwl++) {
+				if (ll.LineStart(iwl) <= startWithinLine && ll.LineStart(iwl + 1) >= startWithinLine) {
+					visibleLine = -iwl;
+				}
+			}
+
+			if (ll.lines > 1 && startWithinLine >= ll.LineStart(ll.lines - 1)) {
+				visibleLine = -(ll.lines - 1);
+			}
+		}
+
+		if (draw && lineNumberWidth &&
+			(ypos + vsPrint.lineHeight <= pfr->rc.bottom) &&
+			(visibleLine >= 0)) {
+			const std::string number = std::to_string(lineDoc + 1) + lineNumberPrintSpace;
+			PRectangle rcNumber = rcLine;
+			rcNumber.right = rcNumber.left + lineNumberWidth;
+			// Right justify
+			rcNumber.left = rcNumber.right - surfaceMeasure->WidthText(
+				vsPrint.styles[StyleLineNumber].font.get(), number);
+			surface->FlushCachedState();
+			surface->DrawTextNoClip(rcNumber, vsPrint.styles[StyleLineNumber].font.get(),
+				static_cast<XYPOSITION>(ypos + vsPrint.maxAscent), number,
+				vsPrint.styles[StyleLineNumber].fore,
+				vsPrint.styles[StyleLineNumber].back);
+		}
+
+		// Draw the line
+		surface->FlushCachedState();
+
+		for (int iwl = 0; iwl < ll.lines; iwl++) {
+			if (ypos + vsPrint.lineHeight <= pfr->rc.bottom) {
+				if (visibleLine >= 0) {
+					if (draw) {
+						rcLine.top = static_cast<XYPOSITION>(ypos);
+						rcLine.bottom = static_cast<XYPOSITION>(ypos + vsPrint.lineHeight);
+						DrawLine(surface, model, vsPrint, &ll, lineDoc, visibleLine, xStart, rcLine, iwl, DrawPhase::all);
+					}
+					ypos += vsPrint.lineHeight;
+				}
+				visibleLine++;
+				if (iwl == ll.lines - 1)
+					nPrintPos = model.pdoc->LineStart(lineDoc + 1);
+				else
+					nPrintPos += ll.LineStart(iwl + 1) - ll.LineStart(iwl);
+			}
+		}
+
+		++lineDoc;
+	}
+
+	// Clear cache so measurements are not used for screen
+	posCache.Clear();
+
+	return nPrintPos;
+}
diff --git a/scite-app/scintilla/src/EditView.h b/scite-app/scintilla/src/EditView.h
new file mode 100644
index 0000000..bac59ed
--- /dev/null
+++ b/scite-app/scintilla/src/EditView.h
@@ -0,0 +1,163 @@
+// Scintilla source code edit control
+/** @file EditView.h
+ ** Defines the appearance of the main text area of the editor window.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef EDITVIEW_H
+#define EDITVIEW_H
+
+namespace Scintilla::Internal {
+
+struct PrintParameters {
+	int magnification;
+	Scintilla::PrintOption colourMode;
+	Scintilla::Wrap wrapState;
+	PrintParameters() noexcept;
+};
+
+/**
+* The view may be drawn in separate phases.
+*/
+enum class DrawPhase {
+	none = 0x0,
+	back = 0x1,
+	indicatorsBack = 0x2,
+	text = 0x4,
+	indentationGuides = 0x8,
+	indicatorsFore = 0x10,
+	selectionTranslucent = 0x20,
+	lineTranslucent = 0x40,
+	foldLines = 0x80,
+	carets = 0x100,
+	all = 0x1FF
+};
+
+bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st) noexcept;
+int WidestLineWidth(Surface *surface, const ViewStyle &vs, int styleOffset, const StyledText &st);
+void DrawTextNoClipPhase(Surface *surface, PRectangle rc, const Style &style, XYPOSITION ybase,
+	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);
+
+class LineTabstops;
+
+/**
+* EditView draws the main text area.
+*/
+class EditView {
+public:
+	PrintParameters printParameters;
+	std::unique_ptr<LineTabstops> ldTabstops;
+	int tabWidthMinimumPixels;
+
+	bool hideSelection;
+	bool drawOverstrikeCaret; // used by the curses platform
+
+	/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to
+	* the screen. This avoids flashing but is about 30% slower. */
+	bool bufferedDraw;
+	/** In phasesTwo mode, drawing is performed in two phases, first the background
+	* and then the foreground. This avoids chopping off characters that overlap the next run.
+	* In multiPhaseDraw mode, drawing is performed in multiple phases with each phase drawing
+	* one feature over the whole drawing area, instead of within one line. This allows text to
+	* overlap from one line to the next. */
+	Scintilla::PhasesDraw phasesDraw;
+
+	int lineWidthMaxSeen;
+
+	bool additionalCaretsBlink;
+	bool additionalCaretsVisible;
+
+	bool imeCaretBlockOverride;
+
+	std::unique_ptr<Surface> pixmapLine;
+	std::unique_ptr<Surface> pixmapIndentGuide;
+	std::unique_ptr<Surface> pixmapIndentGuideHighlight;
+
+	LineLayoutCache llc;
+	PositionCache posCache;
+
+	int tabArrowHeight; // draw arrow heads this many pixels above/below line midpoint
+	/** Some platforms, notably PLAT_CURSES, do not support Scintilla's native
+	 * DrawTabArrow function for drawing tab characters. Allow those platforms to
+	 * override it instead of creating a new method in the Surface class that
+	 * existing platforms must implement as empty. */
+	DrawTabArrowFn customDrawTabArrow;
+	DrawWrapMarkerFn customDrawWrapMarker;
+
+	EditView();
+	// Deleted so EditView objects can not be copied.
+	EditView(const EditView &) = delete;
+	EditView(EditView &&) = delete;
+	void operator=(const EditView &) = delete;
+	void operator=(EditView &&) = delete;
+	virtual ~EditView();
+
+	bool SetTwoPhaseDraw(bool twoPhaseDraw) noexcept;
+	bool SetPhasesDraw(int phases) noexcept;
+	bool LinesOverlap() const noexcept;
+
+	void ClearAllTabstops() noexcept;
+	XYPOSITION NextTabstopPos(Sci::Line line, XYPOSITION x, XYPOSITION tabWidth) const noexcept;
+	bool ClearTabstops(Sci::Line line) noexcept;
+	bool AddTabstop(Sci::Line line, int x);
+	int GetNextTabstop(Sci::Line line, int x) const noexcept;
+	void LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded);
+
+	void DropGraphics() noexcept;
+	void RefreshPixMaps(Surface *surfaceWindow, const ViewStyle &vsDraw);
+
+	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::wrapWidthInfinite);
+
+	static void UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, LineLayout *ll);
+
+	Point LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, Sci::Line topLine,
+		const ViewStyle &vs, PointEnd pe, const PRectangle rcClient);
+	Range RangeDisplayLine(Surface *surface, const EditModel &model, Sci::Line lineVisible, const ViewStyle &vs);
+	SelectionPosition SPositionFromLocation(Surface *surface, const EditModel &model, PointDocument pt, bool canReturnInvalid,
+		bool charPosition, bool virtualSpace, const ViewStyle &vs, const PRectangle rcClient);
+	SelectionPosition SPositionFromLineX(Surface *surface, const EditModel &model, Sci::Line lineDoc, int x, const ViewStyle &vs);
+	Sci::Line DisplayFromPosition(Surface *surface, const EditModel &model, Sci::Position pos, const ViewStyle &vs);
+	Sci::Position StartEndDisplayLine(Surface *surface, const EditModel &model, Sci::Position pos, bool start, const ViewStyle &vs);
+
+	void DrawIndentGuide(Surface *surface, Sci::Line lineVisible, int lineHeight, XYPOSITION start, PRectangle rcSegment, bool highlight);
+	void DrawEOL(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
+		Sci::Line line, Sci::Position lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
+		std::optional<ColourRGBA> background);
+	void DrawFoldDisplayText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+		Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
+	void DrawEOLAnnotationText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+		Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
+	void DrawAnnotation(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+		Sci::Line line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
+	void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineDoc,
+		int xStart, PRectangle rcLine, int subLine) const;
+	void DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
+		Range lineRange, Sci::Position posLineStart, int xStart,
+		int subLine, std::optional<ColourRGBA> background) const;
+	void DrawForeground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineVisible,
+		PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart,
+		int subLine, std::optional<ColourRGBA> background);
+	void DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+		Sci::Line line, Sci::Line lineVisible, PRectangle rcLine, int xStart, int subLine);
+	void DrawLine(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line,
+		Sci::Line lineVisible, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
+	void PaintText(Surface *surfaceWindow, const EditModel &model, PRectangle rcArea, PRectangle rcClient,
+		const ViewStyle &vsDraw);
+	void FillLineRemainder(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
+		Sci::Line line, PRectangle rcArea, int subLine) const;
+	Sci::Position FormatRange(bool draw, const Scintilla::RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
+		const EditModel &model, const ViewStyle &vs);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Editor.cxx b/scite-app/scintilla/src/Editor.cxx
new file mode 100644
index 0000000..23fe910
--- /dev/null
+++ b/scite-app/scintilla/src/Editor.cxx
@@ -0,0 +1,8637 @@
+// Scintilla source code edit control
+/** @file Editor.cxx
+ ** Main code for the edit control.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterType.h"
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "UniConversion.h"
+#include "DBCS.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "ElapsedPeriod.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+namespace {
+
+/*
+	return whether this modification represents an operation that
+	may reasonably be deferred (not done now OR [possibly] at all)
+*/
+constexpr bool CanDeferToLastStep(const DocModification &mh) noexcept {
+	if (FlagSet(mh.modificationType, (ModificationFlags::BeforeInsert | ModificationFlags::BeforeDelete)))
+		return true;	// CAN skip
+	if (!FlagSet(mh.modificationType, (ModificationFlags::Undo | ModificationFlags::Redo)))
+		return false;	// MUST do
+	if (FlagSet(mh.modificationType, ModificationFlags::MultiStepUndoRedo))
+		return true;	// CAN skip
+	return false;		// PRESUMABLY must do
+}
+
+constexpr bool CanEliminate(const DocModification &mh) noexcept {
+	return
+		FlagSet(mh.modificationType, (ModificationFlags::BeforeInsert | ModificationFlags::BeforeDelete));
+}
+
+/*
+	return whether this modification represents the FINAL step
+	in a [possibly lengthy] multi-step Undo/Redo sequence
+*/
+constexpr bool IsLastStep(const DocModification &mh) noexcept {
+	return
+		FlagSet(mh.modificationType, (ModificationFlags::Undo | ModificationFlags::Redo))
+	    && (FlagSet(mh.modificationType, ModificationFlags::MultiStepUndoRedo))
+	    && (FlagSet(mh.modificationType, ModificationFlags::LastStepInUndoRedo))
+	    && (FlagSet(mh.modificationType, ModificationFlags::MultilineUndoRedo));
+}
+
+}
+
+Timer::Timer() noexcept :
+		ticking(false), ticksToWait(0), tickerID{} {}
+
+Idler::Idler() noexcept :
+		state(false), idlerID(nullptr) {}
+
+static constexpr bool IsAllSpacesOrTabs(std::string_view sv) noexcept {
+	for (const char ch : sv) {
+		// This is safe because IsSpaceOrTab() will return false for null terminators
+		if (!IsSpaceOrTab(ch))
+			return false;
+	}
+	return true;
+}
+
+Editor::Editor() : durationWrapOneByte(0.000001, 0.0000001, 0.00001) {
+	ctrlID = 0;
+
+	stylesValid = false;
+	technology = Technology::Default;
+	scaleRGBAImage = 100.0f;
+
+	cursorMode = CursorShape::Normal;
+
+	errorStatus = Status::Ok;
+	mouseDownCaptures = true;
+	mouseWheelCaptures = true;
+
+	lastClickTime = 0;
+	doubleClickCloseThreshold = Point(3, 3);
+	dwellDelay = TimeForever;
+	ticksToDwell = TimeForever;
+	dwelling = false;
+	ptMouseLast.x = 0;
+	ptMouseLast.y = 0;
+	inDragDrop = DragDrop::none;
+	dropWentOutside = false;
+	posDrop = SelectionPosition(Sci::invalidPosition);
+	hotSpotClickPos = Sci::invalidPosition;
+	selectionUnit = TextUnit::character;
+
+	lastXChosen = 0;
+	lineAnchorPos = 0;
+	originalAnchorPos = 0;
+	wordSelectAnchorStartPos = 0;
+	wordSelectAnchorEndPos = 0;
+	wordSelectInitialCaretPos = -1;
+
+	caretPolicies.x = { CaretPolicy::Slop | CaretPolicy::Even, 50 };
+	caretPolicies.y = { CaretPolicy::Even, 0 };
+
+	visiblePolicy = { 0, 0 };
+
+	searchAnchor = 0;
+
+	xCaretMargin = 50;
+	horizontalScrollBarVisible = true;
+	scrollWidth = 2000;
+	verticalScrollBarVisible = true;
+	endAtLastLine = true;
+	caretSticky = CaretSticky::Off;
+	marginOptions = MarginOption::None;
+	mouseSelectionRectangularSwitch = false;
+	multipleSelection = false;
+	additionalSelectionTyping = false;
+	multiPasteMode = MultiPaste::Once;
+	virtualSpaceOptions = VirtualSpace::None;
+
+	targetRange = SelectionSegment();
+	searchFlags = FindOption::None;
+
+	topLine = 0;
+	posTopLine = 0;
+
+	lengthForEncode = -1;
+
+	needUpdateUI = Update::None;
+	ContainerNeedsUpdate(Update::Content);
+
+	paintState = PaintState::notPainting;
+	paintAbandonedByStyling = false;
+	paintingAllText = false;
+	willRedrawAll = false;
+	idleStyling = IdleStyling::None;
+	needIdleStyling = false;
+
+	modEventMask = ModificationFlags::EventMaskAll;
+	commandEvents = true;
+
+	pdoc->AddWatcher(this, nullptr);
+
+	recordingMacro = false;
+	foldAutomatic = AutomaticFold::None;
+
+	convertPastes = true;
+
+	SetRepresentations();
+}
+
+Editor::~Editor() {
+	pdoc->RemoveWatcher(this, nullptr);
+	DropGraphics();
+}
+
+void Editor::Finalise() {
+	SetIdle(false);
+	CancelModes();
+}
+
+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);
+			}
+		}
+	}
+}
+
+void Editor::DropGraphics() noexcept {
+	marginView.DropGraphics();
+	view.DropGraphics();
+}
+
+void Editor::InvalidateStyleData() {
+	stylesValid = false;
+	vs.technology = technology;
+	DropGraphics();
+	view.llc.Invalidate(LineLayout::ValidLevel::invalid);
+	view.posCache.Clear();
+}
+
+void Editor::InvalidateStyleRedraw() {
+	NeedWrapping();
+	InvalidateStyleData();
+	Redraw();
+}
+
+void Editor::RefreshStyleData() {
+	if (!stylesValid) {
+		stylesValid = true;
+		AutoSurface surface(this);
+		if (surface) {
+			vs.Refresh(*surface, pdoc->tabInChars);
+		}
+		SetScrollBars();
+		SetRectangularRange();
+	}
+}
+
+Point Editor::GetVisibleOriginInMain() const {
+	return Point(0, 0);
+}
+
+PointDocument Editor::DocumentPointFromView(Point ptView) const {
+	PointDocument ptDocument(ptView);
+	if (wMargin.GetID()) {
+		const Point ptOrigin = GetVisibleOriginInMain();
+		ptDocument.x += ptOrigin.x;
+		ptDocument.y += ptOrigin.y;
+	} else {
+		ptDocument.x += xOffset;
+		ptDocument.y += topLine * vs.lineHeight;
+	}
+	return ptDocument;
+}
+
+Sci::Line Editor::TopLineOfMain() const {
+	if (wMargin.GetID())
+		return 0;
+	else
+		return topLine;
+}
+
+PRectangle Editor::GetClientRectangle() const {
+	return wMain.GetClientPosition();
+}
+
+PRectangle Editor::GetClientDrawingRectangle() {
+	return GetClientRectangle();
+}
+
+PRectangle Editor::GetTextRectangle() const {
+	PRectangle rc = GetClientRectangle();
+	rc.left += vs.textStart;
+	rc.right -= vs.rightMarginWidth;
+	return rc;
+}
+
+Sci::Line Editor::LinesOnScreen() const {
+	const PRectangle rcClient = GetClientRectangle();
+	const int htClient = static_cast<int>(rcClient.bottom - rcClient.top);
+	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
+	return htClient / vs.lineHeight;
+}
+
+Sci::Line Editor::LinesToScroll() const {
+	const Sci::Line retVal = LinesOnScreen() - 1;
+	if (retVal < 1)
+		return 1;
+	else
+		return retVal;
+}
+
+Sci::Line Editor::MaxScrollPos() const {
+	//Platform::DebugPrintf("Lines %d screen = %d maxScroll = %d\n",
+	//LinesTotal(), LinesOnScreen(), LinesTotal() - LinesOnScreen() + 1);
+	Sci::Line retVal = pcs->LinesDisplayed();
+	if (endAtLastLine) {
+		retVal -= LinesOnScreen();
+	} else {
+		retVal--;
+	}
+	if (retVal < 0) {
+		return 0;
+	} else {
+		return retVal;
+	}
+}
+
+SelectionPosition Editor::ClampPositionIntoDocument(SelectionPosition sp) const {
+	if (sp.Position() < 0) {
+		return SelectionPosition(0);
+	} else if (sp.Position() > pdoc->Length()) {
+		return SelectionPosition(pdoc->Length());
+	} else {
+		// If not at end of line then set offset to 0
+		if (!pdoc->IsLineEndPosition(sp.Position()))
+			sp.SetVirtualSpace(0);
+		return sp;
+	}
+}
+
+Point Editor::LocationFromPosition(SelectionPosition pos, PointEnd pe) {
+	const PRectangle rcClient = GetTextRectangle();
+	RefreshStyleData();
+	AutoSurface surface(this);
+	return view.LocationFromPosition(surface, *this, pos, topLine, vs, pe, rcClient);
+}
+
+Point Editor::LocationFromPosition(Sci::Position pos, PointEnd pe) {
+	return LocationFromPosition(SelectionPosition(pos), pe);
+}
+
+int Editor::XFromPosition(SelectionPosition sp) {
+	const Point pt = LocationFromPosition(sp);
+	return static_cast<int>(pt.x) - vs.textStart + xOffset;
+}
+
+SelectionPosition Editor::SPositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition, bool virtualSpace) {
+	RefreshStyleData();
+	AutoSurface surface(this);
+
+	PRectangle rcClient = GetTextRectangle();
+	// May be in scroll view coordinates so translate back to main view
+	const Point ptOrigin = GetVisibleOriginInMain();
+	rcClient.Move(-ptOrigin.x, -ptOrigin.y);
+
+	if (canReturnInvalid) {
+		if (!rcClient.Contains(pt))
+			return SelectionPosition(Sci::invalidPosition);
+		if (pt.x < vs.textStart)
+			return SelectionPosition(Sci::invalidPosition);
+		if (pt.y < 0)
+			return SelectionPosition(Sci::invalidPosition);
+	}
+	const PointDocument ptdoc = DocumentPointFromView(pt);
+	return view.SPositionFromLocation(surface, *this, ptdoc, canReturnInvalid,
+		charPosition, virtualSpace, vs, rcClient);
+}
+
+Sci::Position Editor::PositionFromLocation(Point pt, bool canReturnInvalid, bool charPosition) {
+	return SPositionFromLocation(pt, canReturnInvalid, charPosition, false).Position();
+}
+
+/**
+* Find the document position corresponding to an x coordinate on a particular document line.
+* Ensure is between whole characters when document is in multi-byte or UTF-8 mode.
+* This method is used for rectangular selections and does not work on wrapped lines.
+*/
+SelectionPosition Editor::SPositionFromLineX(Sci::Line lineDoc, int x) {
+	RefreshStyleData();
+	if (lineDoc >= pdoc->LinesTotal())
+		return SelectionPosition(pdoc->Length());
+	//Platform::DebugPrintf("Position of (%d,%d) line = %d top=%d\n", pt.x, pt.y, line, topLine);
+	AutoSurface surface(this);
+	return view.SPositionFromLineX(surface, *this, lineDoc, x, vs);
+}
+
+Sci::Position Editor::PositionFromLineX(Sci::Line lineDoc, int x) {
+	return SPositionFromLineX(lineDoc, x).Position();
+}
+
+Sci::Line Editor::LineFromLocation(Point pt) const {
+	return pcs->DocFromDisplay(static_cast<int>(pt.y) / vs.lineHeight + topLine);
+}
+
+void Editor::SetTopLine(Sci::Line topLineNew) {
+	if ((topLine != topLineNew) && (topLineNew >= 0)) {
+		topLine = topLineNew;
+		ContainerNeedsUpdate(Update::VScroll);
+	}
+	posTopLine = pdoc->LineStart(pcs->DocFromDisplay(topLine));
+}
+
+/**
+ * If painting then abandon the painting because a wider redraw is needed.
+ * @return true if calling code should stop drawing.
+ */
+bool Editor::AbandonPaint() {
+	if ((paintState == PaintState::painting) && !paintingAllText) {
+		paintState = PaintState::abandoned;
+	}
+	return paintState == PaintState::abandoned;
+}
+
+void Editor::RedrawRect(PRectangle rc) {
+	//Platform::DebugPrintf("Redraw %0d,%0d - %0d,%0d\n", rc.left, rc.top, rc.right, rc.bottom);
+
+	// Clip the redraw rectangle into the client area
+	const PRectangle rcClient = GetClientRectangle();
+	if (rc.top < rcClient.top)
+		rc.top = rcClient.top;
+	if (rc.bottom > rcClient.bottom)
+		rc.bottom = rcClient.bottom;
+	if (rc.left < rcClient.left)
+		rc.left = rcClient.left;
+	if (rc.right > rcClient.right)
+		rc.right = rcClient.right;
+
+	if ((rc.bottom > rc.top) && (rc.right > rc.left)) {
+		wMain.InvalidateRectangle(rc);
+	}
+}
+
+void Editor::DiscardOverdraw() {
+	// Overridden on platforms that may draw outside visible area.
+}
+
+void Editor::Redraw() {
+	//Platform::DebugPrintf("Redraw all\n");
+	const PRectangle rcClient = GetClientRectangle();
+	wMain.InvalidateRectangle(rcClient);
+	if (wMargin.GetID())
+		wMargin.InvalidateAll();
+	//wMain.InvalidateAll();
+}
+
+void Editor::RedrawSelMargin(Sci::Line line, bool allAfter) {
+	const bool markersInText = vs.maskInLine || vs.maskDrawInText;
+	if (!wMargin.GetID() || markersInText) {	// May affect text area so may need to abandon and retry
+		if (AbandonPaint()) {
+			return;
+		}
+	}
+	if (wMargin.GetID() && markersInText) {
+		Redraw();
+		return;
+	}
+	PRectangle rcMarkers = GetClientRectangle();
+	if (!markersInText) {
+		// Normal case: just draw the margin
+		rcMarkers.right = rcMarkers.left + vs.fixedColumnWidth;
+	}
+	if (line != -1) {
+		PRectangle rcLine = RectangleFromRange(Range(pdoc->LineStart(line)), 0);
+
+		// Inflate line rectangle if there are image markers with height larger than line height
+		if (vs.largestMarkerHeight > vs.lineHeight) {
+			const int delta = (vs.largestMarkerHeight - vs.lineHeight + 1) / 2;
+			rcLine.top -= delta;
+			rcLine.bottom += delta;
+			if (rcLine.top < rcMarkers.top)
+				rcLine.top = rcMarkers.top;
+			if (rcLine.bottom > rcMarkers.bottom)
+				rcLine.bottom = rcMarkers.bottom;
+		}
+
+		rcMarkers.top = rcLine.top;
+		if (!allAfter)
+			rcMarkers.bottom = rcLine.bottom;
+		if (rcMarkers.Empty())
+			return;
+	}
+	if (wMargin.GetID()) {
+		const Point ptOrigin = GetVisibleOriginInMain();
+		rcMarkers.Move(-ptOrigin.x, -ptOrigin.y);
+		wMargin.InvalidateRectangle(rcMarkers);
+	} else {
+		wMain.InvalidateRectangle(rcMarkers);
+	}
+}
+
+PRectangle Editor::RectangleFromRange(Range r, int overlap) {
+	const Sci::Line minLine = pcs->DisplayFromDoc(
+		pdoc->SciLineFromPosition(r.First()));
+	const Sci::Line maxLine = pcs->DisplayLastFromDoc(
+		pdoc->SciLineFromPosition(r.Last()));
+	const PRectangle rcClientDrawing = GetClientDrawingRectangle();
+	PRectangle rc;
+	const int leftTextOverlap = ((xOffset == 0) && (vs.leftMarginWidth > 0)) ? 1 : 0;
+	rc.left = static_cast<XYPOSITION>(vs.textStart - leftTextOverlap);
+	rc.top = static_cast<XYPOSITION>((minLine - TopLineOfMain()) * vs.lineHeight - overlap);
+	if (rc.top < rcClientDrawing.top)
+		rc.top = rcClientDrawing.top;
+	// Extend to right of prepared area if any to prevent artifacts from caret line highlight
+	rc.right = rcClientDrawing.right;
+	rc.bottom = static_cast<XYPOSITION>((maxLine - TopLineOfMain() + 1) * vs.lineHeight + overlap);
+
+	return rc;
+}
+
+void Editor::InvalidateRange(Sci::Position start, Sci::Position end) {
+	RedrawRect(RectangleFromRange(Range(start, end), view.LinesOverlap() ? vs.lineOverlap : 0));
+}
+
+Sci::Position Editor::CurrentPosition() const {
+	return sel.MainCaret();
+}
+
+bool Editor::SelectionEmpty() const noexcept {
+	return sel.Empty();
+}
+
+SelectionPosition Editor::SelectionStart() {
+	return sel.RangeMain().Start();
+}
+
+SelectionPosition Editor::SelectionEnd() {
+	return sel.RangeMain().End();
+}
+
+void Editor::SetRectangularRange() {
+	if (sel.IsRectangular()) {
+		const int xAnchor = XFromPosition(sel.Rectangular().anchor);
+		int xCaret = XFromPosition(sel.Rectangular().caret);
+		if (sel.selType == Selection::SelTypes::thin) {
+			xCaret = xAnchor;
+		}
+		const Sci::Line lineAnchorRect =
+			pdoc->SciLineFromPosition(sel.Rectangular().anchor.Position());
+		const Sci::Line lineCaret =
+			pdoc->SciLineFromPosition(sel.Rectangular().caret.Position());
+		const int increment = (lineCaret > lineAnchorRect) ? 1 : -1;
+		AutoSurface surface(this);
+		for (Sci::Line line=lineAnchorRect; line != lineCaret+increment; line += increment) {
+			SelectionRange range(
+				view.SPositionFromLineX(surface, *this, line, xCaret, vs),
+				view.SPositionFromLineX(surface, *this, line, xAnchor, vs));
+			if (!FlagSet(virtualSpaceOptions, VirtualSpace::RectangularSelection))
+				range.ClearVirtualSpace();
+			if (line == lineAnchorRect)
+				sel.SetSelection(range);
+			else
+				sel.AddSelectionWithoutTrim(range);
+		}
+	}
+}
+
+void Editor::ThinRectangularRange() {
+	if (sel.IsRectangular()) {
+		sel.selType = Selection::SelTypes::thin;
+		if (sel.Rectangular().caret < sel.Rectangular().anchor) {
+			sel.Rectangular() = SelectionRange(sel.Range(sel.Count()-1).caret, sel.Range(0).anchor);
+		} else {
+			sel.Rectangular() = SelectionRange(sel.Range(sel.Count()-1).anchor, sel.Range(0).caret);
+		}
+		SetRectangularRange();
+	}
+}
+
+void Editor::InvalidateSelection(SelectionRange newMain, bool invalidateWholeSelection) {
+	if (sel.Count() > 1 || !(sel.RangeMain().anchor == newMain.anchor) || sel.IsRectangular()) {
+		invalidateWholeSelection = true;
+	}
+	Sci::Position firstAffected = std::min(sel.RangeMain().Start().Position(), newMain.Start().Position());
+	// +1 for lastAffected ensures caret repainted
+	Sci::Position lastAffected = std::max(newMain.caret.Position()+1, newMain.anchor.Position());
+	lastAffected = std::max(lastAffected, sel.RangeMain().End().Position());
+	if (invalidateWholeSelection) {
+		for (size_t r=0; r<sel.Count(); r++) {
+			firstAffected = std::min(firstAffected, sel.Range(r).caret.Position());
+			firstAffected = std::min(firstAffected, sel.Range(r).anchor.Position());
+			lastAffected = std::max(lastAffected, sel.Range(r).caret.Position()+1);
+			lastAffected = std::max(lastAffected, sel.Range(r).anchor.Position());
+		}
+	}
+	ContainerNeedsUpdate(Update::Selection);
+	InvalidateRange(firstAffected, lastAffected);
+}
+
+void Editor::InvalidateWholeSelection() {
+	InvalidateSelection(sel.RangeMain(), true);
+}
+
+/* For Line selection - the anchor and caret are always
+   at the beginning and end of the region lines. */
+SelectionRange Editor::LineSelectionRange(SelectionPosition currentPos_, SelectionPosition anchor_) const {
+	if (currentPos_ > anchor_) {
+		anchor_ = SelectionPosition(
+			pdoc->LineStart(pdoc->LineFromPosition(anchor_.Position())));
+		currentPos_ = SelectionPosition(
+			pdoc->LineEnd(pdoc->LineFromPosition(currentPos_.Position())));
+	} else {
+		currentPos_ = SelectionPosition(
+			pdoc->LineStart(pdoc->LineFromPosition(currentPos_.Position())));
+		anchor_ = SelectionPosition(
+			pdoc->LineEnd(pdoc->LineFromPosition(anchor_.Position())));
+	}
+	return SelectionRange(currentPos_, anchor_);
+}
+
+void Editor::SetSelection(SelectionPosition currentPos_, SelectionPosition anchor_) {
+	currentPos_ = ClampPositionIntoDocument(currentPos_);
+	anchor_ = ClampPositionIntoDocument(anchor_);
+	const Sci::Line currentLine = pdoc->SciLineFromPosition(currentPos_.Position());
+	SelectionRange rangeNew(currentPos_, anchor_);
+	if (sel.selType == Selection::SelTypes::lines) {
+		rangeNew = LineSelectionRange(currentPos_, anchor_);
+	}
+	if (sel.Count() > 1 || !(sel.RangeMain() == rangeNew)) {
+		InvalidateSelection(rangeNew);
+	}
+	sel.RangeMain() = rangeNew;
+	SetRectangularRange();
+	ClaimSelection();
+	SetHoverIndicatorPosition(sel.MainCaret());
+
+	if (marginView.highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
+	QueueIdleWork(WorkItems::updateUI);
+}
+
+void Editor::SetSelection(Sci::Position currentPos_, Sci::Position anchor_) {
+	SetSelection(SelectionPosition(currentPos_), SelectionPosition(anchor_));
+}
+
+// Just move the caret on the main selection
+void Editor::SetSelection(SelectionPosition currentPos_) {
+	currentPos_ = ClampPositionIntoDocument(currentPos_);
+	const Sci::Line currentLine = pdoc->SciLineFromPosition(currentPos_.Position());
+	if (sel.Count() > 1 || !(sel.RangeMain().caret == currentPos_)) {
+		InvalidateSelection(SelectionRange(currentPos_));
+	}
+	if (sel.IsRectangular()) {
+		sel.Rectangular() =
+			SelectionRange(SelectionPosition(currentPos_), sel.Rectangular().anchor);
+		SetRectangularRange();
+	} else if (sel.selType == Selection::SelTypes::lines) {
+		sel.RangeMain() = LineSelectionRange(currentPos_, sel.RangeMain().anchor);
+	} else {
+		sel.RangeMain() =
+			SelectionRange(SelectionPosition(currentPos_), sel.RangeMain().anchor);
+	}
+	ClaimSelection();
+	SetHoverIndicatorPosition(sel.MainCaret());
+
+	if (marginView.highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
+	QueueIdleWork(WorkItems::updateUI);
+}
+
+void Editor::SetEmptySelection(SelectionPosition currentPos_) {
+	const Sci::Line currentLine = pdoc->SciLineFromPosition(currentPos_.Position());
+	SelectionRange rangeNew(ClampPositionIntoDocument(currentPos_));
+	if (sel.Count() > 1 || !(sel.RangeMain() == rangeNew)) {
+		InvalidateSelection(rangeNew);
+	}
+	sel.Clear();
+	sel.RangeMain() = rangeNew;
+	SetRectangularRange();
+	ClaimSelection();
+	SetHoverIndicatorPosition(sel.MainCaret());
+
+	if (marginView.highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
+	QueueIdleWork(WorkItems::updateUI);
+}
+
+void Editor::SetEmptySelection(Sci::Position currentPos_) {
+	SetEmptySelection(SelectionPosition(currentPos_));
+}
+
+void Editor::MultipleSelectAdd(AddNumber addNumber) {
+	if (SelectionEmpty() || !multipleSelection) {
+		// Select word at caret
+		const Sci::Position startWord = pdoc->ExtendWordSelect(sel.MainCaret(), -1, true);
+		const Sci::Position endWord = pdoc->ExtendWordSelect(startWord, 1, true);
+		TrimAndSetSelection(endWord, startWord);
+
+	} else {
+
+		if (!pdoc->HasCaseFolder())
+			pdoc->SetCaseFolder(CaseFolderForEncoding());
+
+		const Range rangeMainSelection(sel.RangeMain().Start().Position(), sel.RangeMain().End().Position());
+		const std::string selectedText = RangeText(rangeMainSelection.start, rangeMainSelection.end);
+
+		const Range rangeTarget(targetRange.start.Position(), targetRange.end.Position());
+		std::vector<Range> searchRanges;
+		// Search should be over the target range excluding the current selection so
+		// may need to search 2 ranges, after the selection then before the selection.
+		if (rangeTarget.Overlaps(rangeMainSelection)) {
+			// Common case is that the selection is completely within the target but
+			// may also have overlap at start or end.
+			if (rangeMainSelection.end < rangeTarget.end)
+				searchRanges.push_back(Range(rangeMainSelection.end, rangeTarget.end));
+			if (rangeTarget.start < rangeMainSelection.start)
+				searchRanges.push_back(Range(rangeTarget.start, rangeMainSelection.start));
+		} else {
+			// No overlap
+			searchRanges.push_back(rangeTarget);
+		}
+
+		for (std::vector<Range>::const_iterator it = searchRanges.begin(); it != searchRanges.end(); ++it) {
+			Sci::Position searchStart = it->start;
+			const Sci::Position searchEnd = it->end;
+			for (;;) {
+				Sci::Position lengthFound = selectedText.length();
+				const Sci::Position pos = pdoc->FindText(searchStart, searchEnd,
+					selectedText.c_str(), searchFlags, &lengthFound);
+				if (pos >= 0) {
+					sel.AddSelection(SelectionRange(pos + lengthFound, pos));
+					ContainerNeedsUpdate(Update::Selection);
+					ScrollRange(sel.RangeMain());
+					Redraw();
+					if (addNumber == AddNumber::one)
+						return;
+					searchStart = pos + lengthFound;
+				} else {
+					break;
+				}
+			}
+		}
+	}
+}
+
+bool Editor::RangeContainsProtected(Sci::Position start, Sci::Position end) const noexcept {
+	if (vs.ProtectionActive()) {
+		if (start > end) {
+			const Sci::Position t = start;
+			start = end;
+			end = t;
+		}
+		for (Sci::Position pos = start; pos < end; pos++) {
+			if (vs.styles[pdoc->StyleIndexAt(pos)].IsProtected())
+				return true;
+		}
+	}
+	return false;
+}
+
+bool Editor::SelectionContainsProtected() const {
+	for (size_t r=0; r<sel.Count(); r++) {
+		if (RangeContainsProtected(sel.Range(r).Start().Position(),
+			sel.Range(r).End().Position())) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Asks document to find a good position and then moves out of any invisible positions.
+ */
+Sci::Position Editor::MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd) const {
+	return MovePositionOutsideChar(SelectionPosition(pos), moveDir, checkLineEnd).Position();
+}
+
+SelectionPosition Editor::MovePositionOutsideChar(SelectionPosition pos, Sci::Position moveDir, bool checkLineEnd) const {
+	const Sci::Position posMoved = pdoc->MovePositionOutsideChar(pos.Position(), moveDir, checkLineEnd);
+	if (posMoved != pos.Position())
+		pos.SetPosition(posMoved);
+	if (vs.ProtectionActive()) {
+		if (moveDir > 0) {
+			if ((pos.Position() > 0) && vs.styles[pdoc->StyleIndexAt(pos.Position() - 1)].IsProtected()) {
+				while ((pos.Position() < pdoc->Length()) &&
+				        (vs.styles[pdoc->StyleIndexAt(pos.Position())].IsProtected()))
+					pos.Add(1);
+			}
+		} else if (moveDir < 0) {
+			if (vs.styles[pdoc->StyleIndexAt(pos.Position())].IsProtected()) {
+				while ((pos.Position() > 0) &&
+				        (vs.styles[pdoc->StyleIndexAt(pos.Position() - 1)].IsProtected()))
+					pos.Add(-1);
+			}
+		}
+	}
+	return pos;
+}
+
+void Editor::MovedCaret(SelectionPosition newPos, SelectionPosition previousPos,
+	bool ensureVisible, CaretPolicies policies) {
+	const Sci::Line currentLine = pdoc->SciLineFromPosition(newPos.Position());
+	if (ensureVisible) {
+		// In case in need of wrapping to ensure DisplayFromDoc works.
+		if (currentLine >= wrapPending.start) {
+			if (WrapLines(WrapScope::wsAll)) {
+				Redraw();
+			}
+		}
+		const XYScrollPosition newXY = XYScrollToMakeVisible(
+			SelectionRange(posDrag.IsValid() ? posDrag : newPos), XYScrollOptions::all, policies);
+		if (previousPos.IsValid() && (newXY.xOffset == xOffset)) {
+			// simple vertical scroll then invalidate
+			ScrollTo(newXY.topLine);
+			InvalidateSelection(SelectionRange(previousPos), true);
+		} else {
+			SetXYScroll(newXY);
+		}
+	}
+
+	ShowCaretAtCurrentPosition();
+	NotifyCaretMove();
+
+	ClaimSelection();
+	SetHoverIndicatorPosition(sel.MainCaret());
+	QueueIdleWork(WorkItems::updateUI);
+
+	if (marginView.highlightDelimiter.NeedsDrawing(currentLine)) {
+		RedrawSelMargin();
+	}
+}
+
+void Editor::MovePositionTo(SelectionPosition newPos, Selection::SelTypes selt, bool ensureVisible) {
+	const SelectionPosition spCaret = ((sel.Count() == 1) && sel.Empty()) ?
+		sel.Last() : SelectionPosition(Sci::invalidPosition);
+
+	const Sci::Position delta = newPos.Position() - sel.MainCaret();
+	newPos = ClampPositionIntoDocument(newPos);
+	newPos = MovePositionOutsideChar(newPos, delta);
+	if (!multipleSelection && sel.IsRectangular() && (selt == Selection::SelTypes::stream)) {
+		// Can't turn into multiple selection so clear additional selections
+		InvalidateSelection(SelectionRange(newPos), true);
+		sel.DropAdditionalRanges();
+	}
+	if (!sel.IsRectangular() && (selt == Selection::SelTypes::rectangle)) {
+		// Switching to rectangular
+		InvalidateSelection(sel.RangeMain(), false);
+		SelectionRange rangeMain = sel.RangeMain();
+		sel.Clear();
+		sel.Rectangular() = rangeMain;
+	}
+	if (selt != Selection::SelTypes::none) {
+		sel.selType = selt;
+	}
+	if (selt != Selection::SelTypes::none || sel.MoveExtends()) {
+		SetSelection(newPos);
+	} else {
+		SetEmptySelection(newPos);
+	}
+
+	MovedCaret(newPos, spCaret, ensureVisible, caretPolicies);
+}
+
+void Editor::MovePositionTo(Sci::Position newPos, Selection::SelTypes selt, bool ensureVisible) {
+	MovePositionTo(SelectionPosition(newPos), selt, ensureVisible);
+}
+
+SelectionPosition Editor::MovePositionSoVisible(SelectionPosition pos, int moveDir) {
+	pos = ClampPositionIntoDocument(pos);
+	pos = MovePositionOutsideChar(pos, moveDir);
+	const Sci::Line lineDoc = pdoc->SciLineFromPosition(pos.Position());
+	if (pcs->GetVisible(lineDoc)) {
+		return pos;
+	} else {
+		Sci::Line lineDisplay = pcs->DisplayFromDoc(lineDoc);
+		if (moveDir > 0) {
+			// lineDisplay is already line before fold as lines in fold use display line of line after fold
+			lineDisplay = std::clamp<Sci::Line>(lineDisplay, 0, pcs->LinesDisplayed());
+			return SelectionPosition(
+				pdoc->LineStart(pcs->DocFromDisplay(lineDisplay)));
+		} else {
+			lineDisplay = std::clamp<Sci::Line>(lineDisplay - 1, 0, pcs->LinesDisplayed());
+			return SelectionPosition(
+				pdoc->LineEnd(pcs->DocFromDisplay(lineDisplay)));
+		}
+	}
+}
+
+SelectionPosition Editor::MovePositionSoVisible(Sci::Position pos, int moveDir) {
+	return MovePositionSoVisible(SelectionPosition(pos), moveDir);
+}
+
+Point Editor::PointMainCaret() {
+	return LocationFromPosition(sel.Range(sel.Main()).caret);
+}
+
+/**
+ * Choose the x position that the caret will try to stick to
+ * as it moves up and down.
+ */
+void Editor::SetLastXChosen() {
+	const Point pt = PointMainCaret();
+	lastXChosen = static_cast<int>(pt.x) + xOffset;
+}
+
+void Editor::ScrollTo(Sci::Line line, bool moveThumb) {
+	const Sci::Line topLineNew = std::clamp<Sci::Line>(line, 0, MaxScrollPos());
+	if (topLineNew != topLine) {
+		// Try to optimise small scrolls
+#ifndef UNDER_CE
+		const Sci::Line linesToMove = topLine - topLineNew;
+		const bool performBlit = (std::abs(linesToMove) <= 10) && (paintState == PaintState::notPainting);
+		willRedrawAll = !performBlit;
+#endif
+		SetTopLine(topLineNew);
+		// Optimize by styling the view as this will invalidate any needed area
+		// which could abort the initial paint if discovered later.
+		StyleAreaBounded(GetClientRectangle(), true);
+#ifndef UNDER_CE
+		// Perform redraw rather than scroll if many lines would be redrawn anyway.
+		if (performBlit) {
+			ScrollText(linesToMove);
+		} else {
+			Redraw();
+		}
+		willRedrawAll = false;
+#else
+		Redraw();
+#endif
+		if (moveThumb) {
+			SetVerticalScrollPos();
+		}
+	}
+}
+
+void Editor::ScrollText(Sci::Line /* linesToMove */) {
+	//Platform::DebugPrintf("Editor::ScrollText %d\n", linesToMove);
+	Redraw();
+}
+
+void Editor::HorizontalScrollTo(int xPos) {
+	//Platform::DebugPrintf("HorizontalScroll %d\n", xPos);
+	if (xPos < 0)
+		xPos = 0;
+	if (!Wrapping() && (xOffset != xPos)) {
+		xOffset = xPos;
+		ContainerNeedsUpdate(Update::HScroll);
+		SetHorizontalScrollPos();
+		RedrawRect(GetClientRectangle());
+	}
+}
+
+void Editor::VerticalCentreCaret() {
+	const Sci::Line lineDoc =
+		pdoc->SciLineFromPosition(sel.IsRectangular() ? sel.Rectangular().caret.Position() : sel.MainCaret());
+	const Sci::Line lineDisplay = pcs->DisplayFromDoc(lineDoc);
+	const Sci::Line newTop = lineDisplay - (LinesOnScreen() / 2);
+	if (topLine != newTop) {
+		SetTopLine(newTop > 0 ? newTop : 0);
+		RedrawRect(GetClientRectangle());
+	}
+}
+
+void Editor::MoveSelectedLines(int lineDelta) {
+
+	if (sel.IsRectangular()) {
+		return;
+	}
+
+	// if selection doesn't start at the beginning of the line, set the new start
+	Sci::Position selectionStart = SelectionStart().Position();
+	const Sci::Line startLine = pdoc->SciLineFromPosition(selectionStart);
+	const Sci::Position beginningOfStartLine = pdoc->LineStart(startLine);
+	selectionStart = beginningOfStartLine;
+
+	// if selection doesn't end at the beginning of a line greater than that of the start,
+	// then set it at the beginning of the next one
+	Sci::Position selectionEnd = SelectionEnd().Position();
+	const Sci::Line endLine = pdoc->SciLineFromPosition(selectionEnd);
+	const Sci::Position beginningOfEndLine = pdoc->LineStart(endLine);
+	bool appendEol = false;
+	if (selectionEnd > beginningOfEndLine
+		|| selectionStart == selectionEnd) {
+		selectionEnd = pdoc->LineStart(endLine + 1);
+		appendEol = (selectionEnd == pdoc->Length() && pdoc->SciLineFromPosition(selectionEnd) == endLine);
+	}
+
+	// if there's nowhere for the selection to move
+	// (i.e. at the beginning going up or at the end going down),
+	// stop it right there!
+	if ((selectionStart == 0 && lineDelta < 0)
+		|| (selectionEnd == pdoc->Length() && lineDelta > 0)
+	        || selectionStart == selectionEnd) {
+		return;
+	}
+
+	UndoGroup ug(pdoc);
+
+	if (lineDelta > 0 && selectionEnd == pdoc->LineStart(pdoc->LinesTotal() - 1)) {
+		SetSelection(pdoc->MovePositionOutsideChar(selectionEnd - 1, -1), selectionEnd);
+		ClearSelection();
+		selectionEnd = CurrentPosition();
+	}
+	SetSelection(selectionStart, selectionEnd);
+
+	SelectionText selectedText;
+	CopySelectionRange(&selectedText);
+
+	const Point currentLocation = LocationFromPosition(CurrentPosition());
+	const Sci::Line currentLine = LineFromLocation(currentLocation);
+
+	if (appendEol)
+		SetSelection(pdoc->MovePositionOutsideChar(selectionStart - 1, -1), selectionEnd);
+	ClearSelection();
+
+	const char *eol = StringFromEOLMode(pdoc->eolMode);
+	if (currentLine + lineDelta >= pdoc->LinesTotal())
+		pdoc->InsertString(pdoc->Length(), eol, strlen(eol));
+	GoToLine(currentLine + lineDelta);
+
+	Sci::Position selectionLength = pdoc->InsertString(CurrentPosition(), selectedText.Data(), selectedText.Length());
+	if (appendEol) {
+		const Sci::Position lengthInserted = pdoc->InsertString(CurrentPosition() + selectionLength, eol, strlen(eol));
+		selectionLength += lengthInserted;
+	}
+	SetSelection(CurrentPosition(), CurrentPosition() + selectionLength);
+}
+
+void Editor::MoveSelectedLinesUp() {
+	MoveSelectedLines(-1);
+}
+
+void Editor::MoveSelectedLinesDown() {
+	MoveSelectedLines(1);
+}
+
+void Editor::MoveCaretInsideView(bool ensureVisible) {
+	const PRectangle rcClient = GetTextRectangle();
+	const Point pt = PointMainCaret();
+	if (pt.y < rcClient.top) {
+		MovePositionTo(SPositionFromLocation(
+		            Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top)),
+					false, false, UserVirtualSpace()),
+					Selection::SelTypes::none, ensureVisible);
+	} else if ((pt.y + vs.lineHeight - 1) > rcClient.bottom) {
+		const ptrdiff_t yOfLastLineFullyDisplayed = static_cast<ptrdiff_t>(rcClient.top) + (LinesOnScreen() - 1) * vs.lineHeight;
+		MovePositionTo(SPositionFromLocation(
+		            Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top + yOfLastLineFullyDisplayed)),
+					false, false, UserVirtualSpace()),
+		        Selection::SelTypes::none, ensureVisible);
+	}
+}
+
+Sci::Line Editor::DisplayFromPosition(Sci::Position pos) {
+	AutoSurface surface(this);
+	return view.DisplayFromPosition(surface, *this, pos, vs);
+}
+
+/**
+ * Ensure the caret is reasonably visible in context.
+ *
+Caret policy in Scintilla
+
+If slop is set, we can define a slop value.
+This value defines an unwanted zone (UZ) where the caret is... unwanted.
+This zone is defined as a number of pixels near the vertical margins,
+and as a number of lines near the horizontal margins.
+By keeping the caret away from the edges, it is seen within its context,
+so it is likely that the identifier that the caret is on can be completely seen,
+and that the current line is seen with some of the lines following it which are
+often dependent on that line.
+
+If strict is set, the policy is enforced... strictly.
+The caret is centred on the display if slop is not set,
+and cannot go in the UZ if slop is set.
+
+If jumps is set, the display is moved more energetically
+so the caret can move in the same direction longer before the policy is applied again.
+'3UZ' notation is used to indicate three time the size of the UZ as a distance to the margin.
+
+If even is not set, instead of having symmetrical UZs,
+the left and bottom UZs are extended up to right and top UZs respectively.
+This way, we favour the displaying of useful information: the beginning of lines,
+where most code reside, and the lines after the caret, eg. the body of a function.
+
+     |        |       |      |                                            |
+slop | strict | jumps | even | Caret can go to the margin                 | When reaching limit (caret going out of
+     |        |       |      |                                            | visibility or going into the UZ) display is...
+-----+--------+-------+------+--------------------------------------------+--------------------------------------------------------------
+  0  |   0    |   0   |   0  | Yes                                        | moved to put caret on top/on right
+  0  |   0    |   0   |   1  | Yes                                        | moved by one position
+  0  |   0    |   1   |   0  | Yes                                        | moved to put caret on top/on right
+  0  |   0    |   1   |   1  | Yes                                        | centred on the caret
+  0  |   1    |   -   |   0  | Caret is always on top/on right of display | -
+  0  |   1    |   -   |   1  | No, caret is always centred                | -
+  1  |   0    |   0   |   0  | Yes                                        | moved to put caret out of the asymmetrical UZ
+  1  |   0    |   0   |   1  | Yes                                        | moved to put caret out of the UZ
+  1  |   0    |   1   |   0  | Yes                                        | moved to put caret at 3UZ of the top or right margin
+  1  |   0    |   1   |   1  | Yes                                        | moved to put caret at 3UZ of the margin
+  1  |   1    |   -   |   0  | Caret is always at UZ of top/right margin  | -
+  1  |   1    |   0   |   1  | No, kept out of UZ                         | moved by one position
+  1  |   1    |   1   |   1  | No, kept out of UZ                         | moved to put caret at 3UZ of the margin
+*/
+
+Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &range,
+	const XYScrollOptions options, CaretPolicies policies) {
+	const PRectangle rcClient = GetTextRectangle();
+	const Point ptOrigin = GetVisibleOriginInMain();
+	const Point pt = LocationFromPosition(range.caret) + ptOrigin;
+	const Point ptAnchor = LocationFromPosition(range.anchor) + ptOrigin;
+	const Point ptBottomCaret(pt.x, pt.y + vs.lineHeight - 1);
+
+	XYScrollPosition newXY(xOffset, topLine);
+	if (rcClient.Empty()) {
+		return newXY;
+	}
+
+	// Vertical positioning
+	if (FlagSet(options, XYScrollOptions::vertical) &&
+		(pt.y < rcClient.top || ptBottomCaret.y >= rcClient.bottom || FlagSet(policies.y.policy, CaretPolicy::Strict))) {
+		const Sci::Line lineCaret = DisplayFromPosition(range.caret.Position());
+		const Sci::Line linesOnScreen = LinesOnScreen();
+		const Sci::Line halfScreen = std::max(linesOnScreen - 1, static_cast<Sci::Line>(2)) / 2;
+		const bool bSlop = FlagSet(policies.y.policy, CaretPolicy::Slop);
+		const bool bStrict = FlagSet(policies.y.policy, CaretPolicy::Strict);
+		const bool bJump = FlagSet(policies.y.policy, CaretPolicy::Jumps);
+		const bool bEven = FlagSet(policies.y.policy, CaretPolicy::Even);
+
+		// It should be possible to scroll the window to show the caret,
+		// but this fails to remove the caret on GTK+
+		if (bSlop) {	// A margin is defined
+			Sci::Line yMoveT, yMoveB;
+			if (bStrict) {
+				Sci::Line yMarginT, yMarginB;
+				if (!FlagSet(options, XYScrollOptions::useMargin)) {
+					// In drag mode, avoid moves
+					// otherwise, a double click will select several lines.
+					yMarginT = yMarginB = 0;
+				} else {
+					// yMarginT must equal to caretYSlop, with a minimum of 1 and
+					// a maximum of slightly less than half the height of the text area.
+					yMarginT = std::clamp<Sci::Line>(policies.y.slop, 1, halfScreen);
+					if (bEven) {
+						yMarginB = yMarginT;
+					} else {
+						yMarginB = linesOnScreen - yMarginT - 1;
+					}
+				}
+				yMoveT = yMarginT;
+				if (bEven) {
+					if (bJump) {
+						yMoveT = std::clamp<Sci::Line>(policies.y.slop * 3, 1, halfScreen);
+					}
+					yMoveB = yMoveT;
+				} else {
+					yMoveB = linesOnScreen - yMoveT - 1;
+				}
+				if (lineCaret < topLine + yMarginT) {
+					// Caret goes too high
+					newXY.topLine = lineCaret - yMoveT;
+				} else if (lineCaret > topLine + linesOnScreen - 1 - yMarginB) {
+					// Caret goes too low
+					newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB;
+				}
+			} else {	// Not strict
+				yMoveT = bJump ? policies.y.slop * 3 : policies.y.slop;
+				yMoveT = std::clamp<Sci::Line>(yMoveT, 1, halfScreen);
+				if (bEven) {
+					yMoveB = yMoveT;
+				} else {
+					yMoveB = linesOnScreen - yMoveT - 1;
+				}
+				if (lineCaret < topLine) {
+					// Caret goes too high
+					newXY.topLine = lineCaret - yMoveT;
+				} else if (lineCaret > topLine + linesOnScreen - 1) {
+					// Caret goes too low
+					newXY.topLine = lineCaret - linesOnScreen + 1 + yMoveB;
+				}
+			}
+		} else {	// No slop
+			if (!bStrict && !bJump) {
+				// Minimal move
+				if (lineCaret < topLine) {
+					// Caret goes too high
+					newXY.topLine = lineCaret;
+				} else if (lineCaret > topLine + linesOnScreen - 1) {
+					// Caret goes too low
+					if (bEven) {
+						newXY.topLine = lineCaret - linesOnScreen + 1;
+					} else {
+						newXY.topLine = lineCaret;
+					}
+				}
+			} else {	// Strict or going out of display
+				if (bEven) {
+					// Always centre caret
+					newXY.topLine = lineCaret - halfScreen;
+				} else {
+					// Always put caret on top of display
+					newXY.topLine = lineCaret;
+				}
+			}
+		}
+		if (!(range.caret == range.anchor)) {
+			const Sci::Line lineAnchor = DisplayFromPosition(range.anchor.Position());
+			if (lineAnchor < lineCaret) {
+				// Shift up to show anchor or as much of range as possible
+				newXY.topLine = std::min(newXY.topLine, lineAnchor);
+				newXY.topLine = std::max(newXY.topLine, lineCaret - LinesOnScreen());
+			} else {
+				// Shift down to show anchor or as much of range as possible
+				newXY.topLine = std::max(newXY.topLine, lineAnchor - LinesOnScreen());
+				newXY.topLine = std::min(newXY.topLine, lineCaret);
+			}
+		}
+		newXY.topLine = std::clamp<Sci::Line>(newXY.topLine, 0, MaxScrollPos());
+	}
+
+	// Horizontal positioning
+	if (FlagSet(options, XYScrollOptions::horizontal) && !Wrapping()) {
+		const int halfScreen = std::max(static_cast<int>(rcClient.Width()) - 4, 4) / 2;
+		const bool bSlop = FlagSet(policies.x.policy, CaretPolicy::Slop);
+		const bool bStrict = FlagSet(policies.x.policy, CaretPolicy::Strict);
+		const bool bJump = FlagSet(policies.x.policy, CaretPolicy::Jumps);
+		const bool bEven = FlagSet(policies.x.policy, CaretPolicy::Even);
+
+		if (bSlop) {	// A margin is defined
+			int xMoveL, xMoveR;
+			if (bStrict) {
+				int xMarginL, xMarginR;
+				if (!FlagSet(options, XYScrollOptions::useMargin)) {
+					// In drag mode, avoid moves unless very near of the margin
+					// otherwise, a simple click will select text.
+					xMarginL = xMarginR = 2;
+				} else {
+					// xMargin must equal to caretXSlop, with a minimum of 2 and
+					// a maximum of slightly less than half the width of the text area.
+					xMarginR = std::clamp(policies.x.slop, 2, halfScreen);
+					if (bEven) {
+						xMarginL = xMarginR;
+					} else {
+						xMarginL = static_cast<int>(rcClient.Width()) - xMarginR - 4;
+					}
+				}
+				if (bJump && bEven) {
+					// Jump is used only in even mode
+					xMoveL = xMoveR = std::clamp(policies.x.slop * 3, 1, halfScreen);
+				} else {
+					xMoveL = xMoveR = 0;	// Not used, avoid a warning
+				}
+				if (pt.x < rcClient.left + xMarginL) {
+					// Caret is on the left of the display
+					if (bJump && bEven) {
+						newXY.xOffset -= xMoveL;
+					} else {
+						// Move just enough to allow to display the caret
+						newXY.xOffset -= static_cast<int>((rcClient.left + xMarginL) - pt.x);
+					}
+				} else if (pt.x >= rcClient.right - xMarginR) {
+					// Caret is on the right of the display
+					if (bJump && bEven) {
+						newXY.xOffset += xMoveR;
+					} else {
+						// Move just enough to allow to display the caret
+						newXY.xOffset += static_cast<int>(pt.x - (rcClient.right - xMarginR) + 1);
+					}
+				}
+			} else {	// Not strict
+				xMoveR = bJump ? policies.x.slop * 3 : policies.x.slop;
+				xMoveR = std::clamp(xMoveR, 1, halfScreen);
+				if (bEven) {
+					xMoveL = xMoveR;
+				} else {
+					xMoveL = static_cast<int>(rcClient.Width()) - xMoveR - 4;
+				}
+				if (pt.x < rcClient.left) {
+					// Caret is on the left of the display
+					newXY.xOffset -= xMoveL;
+				} else if (pt.x >= rcClient.right) {
+					// Caret is on the right of the display
+					newXY.xOffset += xMoveR;
+				}
+			}
+		} else {	// No slop
+			if (bStrict ||
+			        (bJump && (pt.x < rcClient.left || pt.x >= rcClient.right))) {
+				// Strict or going out of display
+				if (bEven) {
+					// Centre caret
+					newXY.xOffset += static_cast<int>(pt.x - rcClient.left - halfScreen);
+				} else {
+					// Put caret on right
+					newXY.xOffset += static_cast<int>(pt.x - rcClient.right + 1);
+				}
+			} else {
+				// Move just enough to allow to display the caret
+				if (pt.x < rcClient.left) {
+					// Caret is on the left of the display
+					if (bEven) {
+						newXY.xOffset -= static_cast<int>(rcClient.left - pt.x);
+					} else {
+						newXY.xOffset += static_cast<int>(pt.x - rcClient.right) + 1;
+					}
+				} else if (pt.x >= rcClient.right) {
+					// Caret is on the right of the display
+					newXY.xOffset += static_cast<int>(pt.x - rcClient.right) + 1;
+				}
+			}
+		}
+		// In case of a jump (find result) largely out of display, adjust the offset to display the caret
+		if (pt.x + xOffset < rcClient.left + newXY.xOffset) {
+			newXY.xOffset = static_cast<int>(pt.x + xOffset - rcClient.left) - 2;
+		} else if (pt.x + xOffset >= rcClient.right + newXY.xOffset) {
+			newXY.xOffset = static_cast<int>(pt.x + xOffset - rcClient.right) + 2;
+			if (vs.IsBlockCaretStyle() || view.imeCaretBlockOverride) {
+				// Ensure we can see a good portion of the block caret
+				newXY.xOffset += static_cast<int>(vs.aveCharWidth);
+			}
+		}
+		if (!(range.caret == range.anchor)) {
+			if (ptAnchor.x < pt.x) {
+				// Shift to left to show anchor or as much of range as possible
+				const int maxOffset = static_cast<int>(ptAnchor.x + xOffset - rcClient.left) - 1;
+				const int minOffset = static_cast<int>(pt.x + xOffset - rcClient.right) + 1;
+				newXY.xOffset = std::min(newXY.xOffset, maxOffset);
+				newXY.xOffset = std::max(newXY.xOffset, minOffset);
+			} else {
+				// Shift to right to show anchor or as much of range as possible
+				const int minOffset = static_cast<int>(ptAnchor.x + xOffset - rcClient.right) + 1;
+				const int maxOffset = static_cast<int>(pt.x + xOffset - rcClient.left) - 1;
+				newXY.xOffset = std::max(newXY.xOffset, minOffset);
+				newXY.xOffset = std::min(newXY.xOffset, maxOffset);
+			}
+		}
+		if (newXY.xOffset < 0) {
+			newXY.xOffset = 0;
+		}
+	}
+
+	return newXY;
+}
+
+void Editor::SetXYScroll(XYScrollPosition newXY) {
+	if ((newXY.topLine != topLine) || (newXY.xOffset != xOffset)) {
+		if (newXY.topLine != topLine) {
+			SetTopLine(newXY.topLine);
+			SetVerticalScrollPos();
+		}
+		if (newXY.xOffset != xOffset) {
+			xOffset = newXY.xOffset;
+			ContainerNeedsUpdate(Update::HScroll);
+			if (newXY.xOffset > 0) {
+				const PRectangle rcText = GetTextRectangle();
+				if (horizontalScrollBarVisible &&
+					rcText.Width() + xOffset > scrollWidth) {
+					scrollWidth = xOffset + static_cast<int>(rcText.Width());
+					SetScrollBars();
+				}
+			}
+			SetHorizontalScrollPos();
+		}
+		Redraw();
+		UpdateSystemCaret();
+	}
+}
+
+void Editor::ScrollRange(SelectionRange range) {
+	SetXYScroll(XYScrollToMakeVisible(range, XYScrollOptions::all, caretPolicies));
+}
+
+void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
+	SetXYScroll(XYScrollToMakeVisible(SelectionRange(posDrag.IsValid() ? posDrag : sel.RangeMain().caret),
+		(useMargin?XYScrollOptions::useMargin:XYScrollOptions::none)|
+		(vert?XYScrollOptions::vertical:XYScrollOptions::none)|
+		(horiz?XYScrollOptions::horizontal:XYScrollOptions::none),
+		caretPolicies));
+}
+
+void Editor::ShowCaretAtCurrentPosition() {
+	if (hasFocus) {
+		caret.active = true;
+		caret.on = true;
+		FineTickerCancel(TickReason::caret);
+		if (caret.period > 0)
+			FineTickerStart(TickReason::caret, caret.period, caret.period/10);
+	} else {
+		caret.active = false;
+		caret.on = false;
+		FineTickerCancel(TickReason::caret);
+	}
+	InvalidateCaret();
+}
+
+void Editor::DropCaret() {
+	caret.active = false;
+	FineTickerCancel(TickReason::caret);
+	InvalidateCaret();
+}
+
+void Editor::CaretSetPeriod(int period) {
+	if (caret.period != period) {
+		caret.period = period;
+		caret.on = true;
+		FineTickerCancel(TickReason::caret);
+		if ((caret.active) && (caret.period > 0))
+			FineTickerStart(TickReason::caret, caret.period, caret.period/10);
+		InvalidateCaret();
+	}
+}
+
+void Editor::InvalidateCaret() {
+	if (posDrag.IsValid()) {
+		InvalidateRange(posDrag.Position(), posDrag.Position() + 1);
+	} else {
+		for (size_t r=0; r<sel.Count(); r++) {
+			InvalidateRange(sel.Range(r).caret.Position(), sel.Range(r).caret.Position() + 1);
+		}
+	}
+	UpdateSystemCaret();
+}
+
+void Editor::NotifyCaretMove() {
+}
+
+void Editor::UpdateSystemCaret() {
+}
+
+bool Editor::Wrapping() const noexcept {
+	return vs.wrap.state != Wrap::None;
+}
+
+void Editor::NeedWrapping(Sci::Line docLineStart, Sci::Line docLineEnd) {
+//Platform::DebugPrintf("\nNeedWrapping: %0d..%0d\n", docLineStart, docLineEnd);
+	if (wrapPending.AddRange(docLineStart, docLineEnd)) {
+		view.llc.Invalidate(LineLayout::ValidLevel::positions);
+	}
+	// Wrap lines during idle.
+	if (Wrapping() && wrapPending.NeedsWrap()) {
+		SetIdle(true);
+	}
+}
+
+bool Editor::WrapOneLine(Surface *surface, Sci::Line lineToWrap) {
+	std::shared_ptr<LineLayout> ll = view.RetrieveLineLayout(lineToWrap, *this);
+	int linesWrapped = 1;
+	if (ll) {
+		view.LayoutLine(*this, surface, vs, ll.get(), wrapWidth);
+		linesWrapped = ll->lines;
+	}
+	return pcs->SetHeight(lineToWrap, linesWrapped +
+		((vs.annotationVisible != AnnotationVisible::Hidden) ? pdoc->AnnotationLines(lineToWrap) : 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
+// wsIdle: wrap one page + 100 lines
+// Return true if wrapping occurred.
+bool Editor::WrapLines(WrapScope ws) {
+	Sci::Line goodTopLine = topLine;
+	bool wrapOccurred = false;
+	if (!Wrapping()) {
+		if (wrapWidth != LineLayout::wrapWidthInfinite) {
+			wrapWidth = LineLayout::wrapWidthInfinite;
+			for (Sci::Line lineDoc = 0; lineDoc < pdoc->LinesTotal(); lineDoc++) {
+				pcs->SetHeight(lineDoc, 1 +
+					((vs.annotationVisible != AnnotationVisible::Hidden) ? pdoc->AnnotationLines(lineDoc) : 0));
+			}
+			wrapOccurred = true;
+		}
+		wrapPending.Reset();
+
+	} else if (wrapPending.NeedsWrap()) {
+		wrapPending.start = std::min(wrapPending.start, pdoc->LinesTotal());
+		if (!SetIdle(true)) {
+			// Idle processing not supported so full wrap required.
+			ws = WrapScope::wsAll;
+		}
+		// Decide where to start wrapping
+		Sci::Line lineToWrap = wrapPending.start;
+		Sci::Line lineToWrapEnd = std::min(wrapPending.end, pdoc->LinesTotal());
+		const Sci::Line lineDocTop = pcs->DocFromDisplay(topLine);
+		const Sci::Line subLineTop = topLine - pcs->DisplayFromDoc(lineDocTop);
+		if (ws == WrapScope::wsVisible) {
+			lineToWrap = std::clamp(lineDocTop-5, wrapPending.start, pdoc->LinesTotal());
+			// Priority wrap to just after visible area.
+			// Since wrapping could reduce display lines, treat each
+			// as taking only one display line.
+			lineToWrapEnd = lineDocTop;
+			Sci::Line lines = LinesOnScreen() + 1;
+			constexpr double secondsAllowed = 0.1;
+			const size_t actionsInAllowedTime = std::clamp<Sci::Line>(
+				durationWrapOneByte.ActionsInAllowedTime(secondsAllowed),
+				0x2000, 0x200000);
+			const Sci::Line lineLast = pdoc->LineFromPositionAfter(lineToWrap, actionsInAllowedTime);
+			const Sci::Line maxLine = std::min(lineLast, pcs->LinesInDoc());
+			while ((lineToWrapEnd < maxLine) && (lines>0)) {
+				if (pcs->GetVisible(lineToWrapEnd))
+					lines--;
+				lineToWrapEnd++;
+			}
+			// .. and if the paint window is outside pending wraps
+			if ((lineToWrap > wrapPending.end) || (lineToWrapEnd < wrapPending.start)) {
+				// Currently visible text does not need wrapping
+				return false;
+			}
+		} else if (ws == WrapScope::wsIdle) {
+			// Try to keep time taken by wrapping reasonable so interaction remains smooth.
+			constexpr double secondsAllowed = 0.01;
+			const size_t actionsInAllowedTime = std::clamp<Sci::Line>(
+				durationWrapOneByte.ActionsInAllowedTime(secondsAllowed),
+				0x200, 0x20000);
+			lineToWrapEnd = pdoc->LineFromPositionAfter(lineToWrap, actionsInAllowedTime);
+		}
+		const Sci::Line lineEndNeedWrap = std::min(wrapPending.end, pdoc->LinesTotal());
+		lineToWrapEnd = std::min(lineToWrapEnd, lineEndNeedWrap);
+
+		// Ensure all lines being wrapped are styled.
+		pdoc->EnsureStyledTo(pdoc->LineStart(lineToWrapEnd));
+
+		if (lineToWrap < lineToWrapEnd) {
+
+			PRectangle rcTextArea = GetClientRectangle();
+			rcTextArea.left = static_cast<XYPOSITION>(vs.textStart);
+			rcTextArea.right -= vs.rightMarginWidth;
+			wrapWidth = static_cast<int>(rcTextArea.Width());
+			RefreshStyleData();
+			AutoSurface surface(this);
+			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());
+
+				goodTopLine = pcs->DisplayFromDoc(lineDocTop) + std::min(
+					subLineTop, static_cast<Sci::Line>(pcs->GetHeight(lineDocTop)-1));
+			}
+		}
+
+		// If wrapping is done, bring it to resting position
+		if (wrapPending.start >= lineEndNeedWrap) {
+			wrapPending.Reset();
+		}
+	}
+
+	if (wrapOccurred) {
+		SetScrollBars();
+		SetTopLine(std::clamp<Sci::Line>(goodTopLine, 0, MaxScrollPos()));
+		SetVerticalScrollPos();
+	}
+
+	return wrapOccurred;
+}
+
+void Editor::LinesJoin() {
+	if (!RangeContainsProtected(targetRange.start.Position(), targetRange.end.Position())) {
+		UndoGroup ug(pdoc);
+		bool prevNonWS = true;
+		for (Sci::Position pos = targetRange.start.Position(); pos < targetRange.end.Position(); pos++) {
+			if (pdoc->IsPositionInLineEnd(pos)) {
+				targetRange.end.Add(-pdoc->LenChar(pos));
+				pdoc->DelChar(pos);
+				if (prevNonWS) {
+					// Ensure at least one space separating previous lines
+					const Sci::Position lengthInserted = pdoc->InsertString(pos, " ", 1);
+					targetRange.end.Add(lengthInserted);
+				}
+			} else {
+				prevNonWS = pdoc->CharAt(pos) != ' ';
+			}
+		}
+	}
+}
+
+const char *Editor::StringFromEOLMode(EndOfLine eolMode) noexcept {
+	if (eolMode == EndOfLine::CrLf) {
+		return "\r\n";
+	} else if (eolMode == EndOfLine::Cr) {
+		return "\r";
+	} else {
+		return "\n";
+	}
+}
+
+void Editor::LinesSplit(int pixelWidth) {
+	if (!RangeContainsProtected(targetRange.start.Position(), targetRange.end.Position())) {
+		if (pixelWidth == 0) {
+			const PRectangle rcText = GetTextRectangle();
+			pixelWidth = static_cast<int>(rcText.Width());
+		}
+		const Sci::Line lineStart = pdoc->SciLineFromPosition(targetRange.start.Position());
+		Sci::Line lineEnd = pdoc->SciLineFromPosition(targetRange.end.Position());
+		const char *eol = StringFromEOLMode(pdoc->eolMode);
+		UndoGroup ug(pdoc);
+		for (Sci::Line line = lineStart; line <= lineEnd; line++) {
+			AutoSurface surface(this);
+			std::shared_ptr<LineLayout> ll = view.RetrieveLineLayout(line, *this);
+			if (surface && ll) {
+				const Sci::Position posLineStart = pdoc->LineStart(line);
+				view.LayoutLine(*this, surface, vs, ll.get(), pixelWidth);
+				Sci::Position lengthInsertedTotal = 0;
+				for (int subLine = 1; subLine < ll->lines; subLine++) {
+					const Sci::Position lengthInserted = pdoc->InsertString(
+						posLineStart + lengthInsertedTotal + ll->LineStart(subLine),
+						eol, strlen(eol));
+					targetRange.end.Add(lengthInserted);
+					lengthInsertedTotal += lengthInserted;
+				}
+			}
+			lineEnd = pdoc->SciLineFromPosition(targetRange.end.Position());
+		}
+	}
+}
+
+void Editor::PaintSelMargin(Surface *surfaceWindow, const PRectangle &rc) {
+	if (vs.fixedColumnWidth == 0)
+		return;
+
+	RefreshStyleData();
+	RefreshPixMaps(surfaceWindow);
+
+	// On GTK+ with Ubuntu overlay scroll bars, the surface may have been finished
+	// at this point. The Initialised call checks for this case and sets the status
+	// to be bad which avoids crashes in following calls.
+	if (!surfaceWindow->Initialised()) {
+		return;
+	}
+
+	PRectangle rcMargin = GetClientRectangle();
+	const Point ptOrigin = GetVisibleOriginInMain();
+	rcMargin.Move(0, -ptOrigin.y);
+	rcMargin.left = 0;
+	rcMargin.right = static_cast<XYPOSITION>(vs.fixedColumnWidth);
+
+	if (!rc.Intersects(rcMargin))
+		return;
+
+	Surface *surface;
+	if (view.bufferedDraw) {
+		surface = marginView.pixmapSelMargin.get();
+	} else {
+		surface = surfaceWindow;
+	}
+
+	// Clip vertically to paint area to avoid drawing line numbers
+	if (rcMargin.bottom > rc.bottom)
+		rcMargin.bottom = rc.bottom;
+	if (rcMargin.top < rc.top)
+		rcMargin.top = rc.top;
+
+	marginView.PaintMargin(surface, topLine, rc, rcMargin, *this, vs);
+
+	if (view.bufferedDraw) {
+		marginView.pixmapSelMargin->FlushDrawing();
+		surfaceWindow->Copy(rcMargin, Point(rcMargin.left, rcMargin.top), *marginView.pixmapSelMargin);
+	}
+}
+
+void Editor::RefreshPixMaps(Surface *surfaceWindow) {
+	view.RefreshPixMaps(surfaceWindow, vs);
+	marginView.RefreshPixMaps(surfaceWindow, vs);
+	if (view.bufferedDraw) {
+		const PRectangle rcClient = GetClientRectangle();
+		if (!view.pixmapLine) {
+			view.pixmapLine = surfaceWindow->AllocatePixMap(static_cast<int>(rcClient.Width()), vs.lineHeight);
+		}
+		if (!marginView.pixmapSelMargin) {
+			marginView.pixmapSelMargin = surfaceWindow->AllocatePixMap(vs.fixedColumnWidth,
+				static_cast<int>(rcClient.Height()));
+		}
+	}
+}
+
+void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
+	//Platform::DebugPrintf("Paint:%1d (%3d,%3d) ... (%3d,%3d)\n",
+	//	paintingAllText, rcArea.left, rcArea.top, rcArea.right, rcArea.bottom);
+
+	RefreshStyleData();
+	if (paintState == PaintState::abandoned)
+		return;	// Scroll bars may have changed so need redraw
+	RefreshPixMaps(surfaceWindow);
+
+	paintAbandonedByStyling = false;
+
+	StyleAreaBounded(rcArea, false);
+
+	const PRectangle rcClient = GetClientRectangle();
+	//Platform::DebugPrintf("Client: (%3d,%3d) ... (%3d,%3d)   %d\n",
+	//	rcClient.left, rcClient.top, rcClient.right, rcClient.bottom);
+
+	if (NotifyUpdateUI()) {
+		RefreshStyleData();
+		RefreshPixMaps(surfaceWindow);
+	}
+
+	// Wrap the visible lines if needed.
+	if (WrapLines(WrapScope::wsVisible)) {
+		// The wrapping process has changed the height of some lines so
+		// abandon this paint for a complete repaint.
+		if (AbandonPaint()) {
+			return;
+		}
+		RefreshPixMaps(surfaceWindow);	// In case pixmaps invalidated by scrollbar change
+	}
+
+	if (!marginView.pixmapSelPattern->Initialised()) {
+		// When Direct2D is used, pixmap creation may fail with D2DERR_RECREATE_TARGET so
+		// abandon this paint to avoid further failures.
+		// Main drawing surface and pixmaps should be recreated by next paint.
+		return;
+	}
+
+	if (!view.bufferedDraw)
+		surfaceWindow->SetClip(rcArea);
+
+	if (paintState != PaintState::abandoned) {
+		if (vs.marginInside) {
+			PaintSelMargin(surfaceWindow, rcArea);
+			PRectangle rcRightMargin = rcClient;
+			rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
+			if (rcArea.Intersects(rcRightMargin)) {
+				surfaceWindow->FillRectangle(rcRightMargin, vs.styles[StyleDefault].back);
+			}
+		} else { // Else separate view so separate paint event but leftMargin included to allow overlap
+			PRectangle rcLeftMargin = rcArea;
+			rcLeftMargin.left = 0;
+			rcLeftMargin.right = rcLeftMargin.left + vs.leftMarginWidth;
+			if (rcArea.Intersects(rcLeftMargin)) {
+				surfaceWindow->FillRectangle(rcLeftMargin, vs.styles[StyleDefault].back);
+			}
+		}
+	}
+
+	if (paintState == PaintState::abandoned) {
+		// Either styling or NotifyUpdateUI noticed that painting is needed
+		// outside the current painting rectangle
+		//Platform::DebugPrintf("Abandoning paint\n");
+		if (Wrapping()) {
+			if (paintAbandonedByStyling) {
+				// Styling has spilled over a line end, such as occurs by starting a multiline
+				// comment. The width of subsequent text may have changed, so rewrap.
+				NeedWrapping(pcs->DocFromDisplay(topLine));
+			}
+		}
+		if (!view.bufferedDraw)
+			surfaceWindow->PopClip();
+		return;
+	}
+
+	view.PaintText(surfaceWindow, *this, rcArea, rcClient, vs);
+
+	if (horizontalScrollBarVisible && trackLineWidth && (view.lineWidthMaxSeen > scrollWidth)) {
+		scrollWidth = view.lineWidthMaxSeen;
+		if (!FineTickerRunning(TickReason::widen)) {
+			FineTickerStart(TickReason::widen, 50, 5);
+		}
+	}
+
+	if (!view.bufferedDraw)
+		surfaceWindow->PopClip();
+
+	NotifyPainted();
+}
+
+// This is mostly copied from the Paint method but with some things omitted
+// such as the margin markers, line numbers, selection and caret
+// Should be merged back into a combined Draw method.
+Sci::Position Editor::FormatRange(bool draw, const RangeToFormat *pfr) {
+	if (!pfr)
+		return 0;
+
+	AutoSurface surface(pfr->hdc, this, Technology::Default);
+	if (!surface)
+		return 0;
+	AutoSurface surfaceMeasure(pfr->hdcTarget, this, Technology::Default);
+	if (!surfaceMeasure) {
+		return 0;
+	}
+	return view.FormatRange(draw, pfr, surface, surfaceMeasure, *this, vs);
+}
+
+long Editor::TextWidth(uptr_t style, const char *text) {
+	RefreshStyleData();
+	AutoSurface surface(this);
+	if (surface) {
+		return std::lround(surface->WidthText(vs.styles[style].font.get(), text));
+	} else {
+		return 1;
+	}
+}
+
+// Empty method is overridden on GTK+ to show / hide scrollbars
+void Editor::ReconfigureScrollBars() {}
+
+void Editor::SetScrollBars() {
+	RefreshStyleData();
+
+	const Sci::Line nMax = MaxScrollPos();
+	const Sci::Line nPage = LinesOnScreen();
+	const bool modified = ModifyScrollBars(nMax + nPage - 1, nPage);
+	if (modified) {
+		DwellEnd(true);
+	}
+
+	// TODO: ensure always showing as many lines as possible
+	// May not be, if, for example, window made larger
+	if (topLine > MaxScrollPos()) {
+		SetTopLine(std::clamp<Sci::Line>(topLine, 0, MaxScrollPos()));
+		SetVerticalScrollPos();
+		Redraw();
+	}
+	if (modified) {
+		if (!AbandonPaint())
+			Redraw();
+	}
+	//Platform::DebugPrintf("end max = %d page = %d\n", nMax, nPage);
+}
+
+void Editor::ChangeSize() {
+	DropGraphics();
+	SetScrollBars();
+	if (Wrapping()) {
+		PRectangle rcTextArea = GetClientRectangle();
+		rcTextArea.left = static_cast<XYPOSITION>(vs.textStart);
+		rcTextArea.right -= vs.rightMarginWidth;
+		if (wrapWidth != rcTextArea.Width()) {
+			NeedWrapping();
+			Redraw();
+		}
+	}
+}
+
+Sci::Position Editor::RealizeVirtualSpace(Sci::Position position, Sci::Position virtualSpace) {
+	if (virtualSpace > 0) {
+		const Sci::Line line = pdoc->SciLineFromPosition(position);
+		const Sci::Position indent = pdoc->GetLineIndentPosition(line);
+		if (indent == position) {
+			return pdoc->SetLineIndentation(line, pdoc->GetLineIndentation(line) + virtualSpace);
+		} else {
+			std::string spaceText(virtualSpace, ' ');
+			const Sci::Position lengthInserted = pdoc->InsertString(position, spaceText.c_str(), virtualSpace);
+			position += lengthInserted;
+		}
+	}
+	return position;
+}
+
+SelectionPosition Editor::RealizeVirtualSpace(const SelectionPosition &position) {
+	// Return the new position with no virtual space
+	return SelectionPosition(RealizeVirtualSpace(position.Position(), position.VirtualSpace()));
+}
+
+void Editor::AddChar(char ch) {
+	char s[2];
+	s[0] = ch;
+	s[1] = '\0';
+	InsertCharacter(std::string_view(s, 1), CharacterSource::DirectInput);
+}
+
+void Editor::FilterSelections() {
+	if (!additionalSelectionTyping && (sel.Count() > 1)) {
+		InvalidateWholeSelection();
+		sel.DropAdditionalRanges();
+	}
+}
+
+// InsertCharacter inserts a character encoded in document code page.
+void Editor::InsertCharacter(std::string_view sv, CharacterSource charSource) {
+	if (sv.empty()) {
+		return;
+	}
+	FilterSelections();
+	{
+		UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty() || inOverstrike);
+
+		// Vector elements point into selection in order to change selection.
+		std::vector<SelectionRange *> selPtrs;
+		for (size_t r = 0; r < sel.Count(); r++) {
+			selPtrs.push_back(&sel.Range(r));
+		}
+		// Order selections by position in document.
+		std::sort(selPtrs.begin(), selPtrs.end(),
+			[](const SelectionRange *a, const SelectionRange *b) noexcept {return *a < *b;});
+
+		// Loop in reverse to avoid disturbing positions of selections yet to be processed.
+		for (std::vector<SelectionRange *>::reverse_iterator rit = selPtrs.rbegin();
+			rit != selPtrs.rend(); ++rit) {
+			SelectionRange *currentSel = *rit;
+			if (!RangeContainsProtected(currentSel->Start().Position(),
+				currentSel->End().Position())) {
+				Sci::Position positionInsert = currentSel->Start().Position();
+				if (!currentSel->Empty()) {
+					if (currentSel->Length()) {
+						pdoc->DeleteChars(positionInsert, currentSel->Length());
+						currentSel->ClearVirtualSpace();
+					} else {
+						// Range is all virtual so collapse to start of virtual space
+						currentSel->MinimizeVirtualSpace();
+					}
+				} else if (inOverstrike) {
+					if (positionInsert < pdoc->Length()) {
+						if (!pdoc->IsPositionInLineEnd(positionInsert)) {
+							pdoc->DelChar(positionInsert);
+							currentSel->ClearVirtualSpace();
+						}
+					}
+				}
+				positionInsert = RealizeVirtualSpace(positionInsert, currentSel->caret.VirtualSpace());
+				const Sci::Position lengthInserted = pdoc->InsertString(positionInsert, sv.data(), sv.length());
+				if (lengthInserted > 0) {
+					currentSel->caret.SetPosition(positionInsert + lengthInserted);
+					currentSel->anchor.SetPosition(positionInsert + lengthInserted);
+				}
+				currentSel->ClearVirtualSpace();
+				// If in wrap mode rewrap current line so EnsureCaretVisible has accurate information
+				if (Wrapping()) {
+					AutoSurface surface(this);
+					if (surface) {
+						if (WrapOneLine(surface, pdoc->SciLineFromPosition(positionInsert))) {
+							SetScrollBars();
+							SetVerticalScrollPos();
+							Redraw();
+						}
+					}
+				}
+			}
+		}
+	}
+	if (Wrapping()) {
+		SetScrollBars();
+	}
+	ThinRectangularRange();
+	// If in wrap mode rewrap current line so EnsureCaretVisible has accurate information
+	EnsureCaretVisible();
+	// Avoid blinking during rapid typing:
+	ShowCaretAtCurrentPosition();
+	if ((caretSticky == CaretSticky::Off) ||
+		((caretSticky == CaretSticky::WhiteSpace) && !IsAllSpacesOrTabs(sv))) {
+		SetLastXChosen();
+	}
+
+	int ch = static_cast<unsigned char>(sv[0]);
+	if (pdoc->dbcsCodePage != CpUtf8) {
+		if (sv.length() > 1) {
+			// DBCS code page or DBCS font character set.
+			ch = (ch << 8) | static_cast<unsigned char>(sv[1]);
+		}
+	} else {
+		if ((ch < 0xC0) || (1 == sv.length())) {
+			// Handles UTF-8 characters between 0x01 and 0x7F and single byte
+			// characters when not in UTF-8 mode.
+			// Also treats \0 and naked trail bytes 0x80 to 0xBF as valid
+			// characters representing themselves.
+		} else {
+			unsigned int utf32[1] = { 0 };
+			UTF32FromUTF8(sv, utf32, std::size(utf32));
+			ch = utf32[0];
+		}
+	}
+	NotifyChar(ch, charSource);
+
+	if (recordingMacro && charSource != CharacterSource::TentativeInput) {
+		std::string copy(sv); // ensure NUL-terminated
+		NotifyMacroRecord(Message::ReplaceSel, 0, reinterpret_cast<sptr_t>(copy.data()));
+	}
+}
+
+void Editor::ClearBeforeTentativeStart() {
+	// Make positions for the first composition string.
+	FilterSelections();
+	UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty() || inOverstrike);
+	for (size_t r = 0; r<sel.Count(); r++) {
+		if (!RangeContainsProtected(sel.Range(r).Start().Position(),
+			sel.Range(r).End().Position())) {
+			const Sci::Position positionInsert = sel.Range(r).Start().Position();
+			if (!sel.Range(r).Empty()) {
+				if (sel.Range(r).Length()) {
+					pdoc->DeleteChars(positionInsert, sel.Range(r).Length());
+					sel.Range(r).ClearVirtualSpace();
+				} else {
+					// Range is all virtual so collapse to start of virtual space
+					sel.Range(r).MinimizeVirtualSpace();
+				}
+			}
+			RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace());
+			sel.Range(r).ClearVirtualSpace();
+		}
+	}
+}
+
+void Editor::InsertPaste(const char *text, Sci::Position len) {
+	if (multiPasteMode == MultiPaste::Once) {
+		SelectionPosition selStart = sel.Start();
+		selStart = RealizeVirtualSpace(selStart);
+		const Sci::Position lengthInserted = pdoc->InsertString(selStart.Position(), text, len);
+		if (lengthInserted > 0) {
+			SetEmptySelection(selStart.Position() + lengthInserted);
+		}
+	} else {
+		// MultiPaste::Each
+		for (size_t r=0; r<sel.Count(); r++) {
+			if (!RangeContainsProtected(sel.Range(r).Start().Position(),
+				sel.Range(r).End().Position())) {
+				Sci::Position positionInsert = sel.Range(r).Start().Position();
+				if (!sel.Range(r).Empty()) {
+					if (sel.Range(r).Length()) {
+						pdoc->DeleteChars(positionInsert, sel.Range(r).Length());
+						sel.Range(r).ClearVirtualSpace();
+					} else {
+						// Range is all virtual so collapse to start of virtual space
+						sel.Range(r).MinimizeVirtualSpace();
+					}
+				}
+				positionInsert = RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace());
+				const Sci::Position lengthInserted = pdoc->InsertString(positionInsert, text, len);
+				if (lengthInserted > 0) {
+					sel.Range(r).caret.SetPosition(positionInsert + lengthInserted);
+					sel.Range(r).anchor.SetPosition(positionInsert + lengthInserted);
+				}
+				sel.Range(r).ClearVirtualSpace();
+			}
+		}
+	}
+}
+
+void Editor::InsertPasteShape(const char *text, Sci::Position len, PasteShape shape) {
+	std::string convertedText;
+	if (convertPastes) {
+		// Convert line endings of the paste into our local line-endings mode
+		convertedText = Document::TransformLineEnds(text, len, pdoc->eolMode);
+		len = convertedText.length();
+		text = convertedText.c_str();
+	}
+	if (shape == PasteShape::rectangular) {
+		PasteRectangular(sel.Start(), text, len);
+	} else {
+		if (shape == PasteShape::line) {
+			const Sci::Position insertPos =
+				pdoc->LineStart(pdoc->LineFromPosition(sel.MainCaret()));
+			Sci::Position lengthInserted = pdoc->InsertString(insertPos, text, len);
+			// add the newline if necessary
+			if ((len > 0) && (text[len - 1] != '\n' && text[len - 1] != '\r')) {
+				const char *endline = StringFromEOLMode(pdoc->eolMode);
+				const Sci::Position length = strlen(endline);
+				lengthInserted += pdoc->InsertString(insertPos + lengthInserted, endline, length);
+			}
+			if (sel.MainCaret() == insertPos) {
+				SetEmptySelection(sel.MainCaret() + lengthInserted);
+			}
+		} else {
+			InsertPaste(text, len);
+		}
+	}
+}
+
+void Editor::ClearSelection(bool retainMultipleSelections) {
+	if (!sel.IsRectangular() && !retainMultipleSelections)
+		FilterSelections();
+	UndoGroup ug(pdoc);
+	for (size_t r=0; r<sel.Count(); r++) {
+		if (!sel.Range(r).Empty()) {
+			if (!RangeContainsProtected(sel.Range(r).Start().Position(),
+				sel.Range(r).End().Position())) {
+				pdoc->DeleteChars(sel.Range(r).Start().Position(),
+					sel.Range(r).Length());
+				sel.Range(r) = SelectionRange(sel.Range(r).Start());
+			}
+		}
+	}
+	ThinRectangularRange();
+	sel.RemoveDuplicates();
+	ClaimSelection();
+	SetHoverIndicatorPosition(sel.MainCaret());
+}
+
+void Editor::ClearAll() {
+	{
+		UndoGroup ug(pdoc);
+		if (0 != pdoc->Length()) {
+			pdoc->DeleteChars(0, pdoc->Length());
+		}
+		if (!pdoc->IsReadOnly()) {
+			pcs->Clear();
+			pdoc->AnnotationClearAll();
+			pdoc->EOLAnnotationClearAll();
+			pdoc->MarginClearAll();
+		}
+	}
+
+	view.ClearAllTabstops();
+
+	sel.Clear();
+	SetTopLine(0);
+	SetVerticalScrollPos();
+	InvalidateStyleRedraw();
+}
+
+void Editor::ClearDocumentStyle() {
+	pdoc->decorations->DeleteLexerDecorations();
+	pdoc->StartStyling(0);
+	pdoc->SetStyleFor(pdoc->Length(), 0);
+	pcs->ShowAll();
+	SetAnnotationHeights(0, pdoc->LinesTotal());
+	pdoc->ClearLevels();
+}
+
+void Editor::CopyAllowLine() {
+	SelectionText selectedText;
+	CopySelectionRange(&selectedText, true);
+	CopyToClipboard(selectedText);
+}
+
+void Editor::Cut() {
+	pdoc->CheckReadOnly();
+	if (!pdoc->IsReadOnly() && !SelectionContainsProtected()) {
+		Copy();
+		ClearSelection();
+	}
+}
+
+void Editor::PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len) {
+	if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
+		return;
+	}
+	UndoGroup ug(pdoc);
+	if (!sel.Empty() && inDragDrop != DragDrop::dragging) {
+		//ClearSelection(); // want to replace rectangular selection contents
+	}
+	sel.Clear();
+	sel.RangeMain() = SelectionRange(pos);
+	Sci::Line line = pdoc->SciLineFromPosition(sel.MainCaret());
+	sel.RangeMain().caret = RealizeVirtualSpace(sel.RangeMain().caret);
+	const int xInsert = XFromPosition(sel.RangeMain().caret);
+	bool prevCr = false;
+	while ((len > 0) && IsEOLChar(ptr[len-1]))
+		len--;
+	for (Sci::Position i = 0; i < len; i++) {
+		if (IsEOLChar(ptr[i])) {
+			if ((ptr[i] == '\r') || (!prevCr))
+				line++;
+			if (line >= pdoc->LinesTotal()) {
+				if (pdoc->eolMode != EndOfLine::Lf)
+					pdoc->InsertString(pdoc->Length(), "\r", 1);
+				if (pdoc->eolMode != EndOfLine::Cr)
+					pdoc->InsertString(pdoc->Length(), "\n", 1);
+			}
+			// Pad the end of lines with spaces if required
+			sel.RangeMain().caret.SetPosition(PositionFromLineX(line, xInsert));
+			if ((XFromPosition(sel.RangeMain().caret) < xInsert) && (i + 1 < len)) {
+				while (XFromPosition(sel.RangeMain().caret) < xInsert) {
+					assert(pdoc);
+					const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), " ", 1);
+					sel.RangeMain().caret.Add(lengthInserted);
+				}
+			}
+			prevCr = ptr[i] == '\r';
+		} else {
+			const Sci::Position lengthInserted = pdoc->InsertString(sel.MainCaret(), ptr + i, 1);
+			sel.RangeMain().caret.Add(lengthInserted);
+			prevCr = false;
+		}
+	}
+	SetEmptySelection(pos);
+}
+
+bool Editor::CanPaste() {
+	return !pdoc->IsReadOnly() && !SelectionContainsProtected();
+}
+
+void Editor::Clear() {
+	// If multiple selections, don't delete EOLS
+	if (sel.Empty()) {
+		bool singleVirtual = false;
+		if ((sel.Count() == 1) &&
+			!RangeContainsProtected(sel.MainCaret(), sel.MainCaret() + 1) &&
+			sel.RangeMain().Start().VirtualSpace()) {
+			singleVirtual = true;
+		}
+		UndoGroup ug(pdoc, (sel.Count() > 1) || singleVirtual);
+		for (size_t r=0; r<sel.Count(); r++) {
+			if (!RangeContainsProtected(sel.Range(r).caret.Position(), sel.Range(r).caret.Position() + 1)) {
+				if (sel.Range(r).Start().VirtualSpace()) {
+					if (sel.Range(r).anchor < sel.Range(r).caret)
+						sel.Range(r) = SelectionRange(RealizeVirtualSpace(sel.Range(r).anchor.Position(), sel.Range(r).anchor.VirtualSpace()));
+					else
+						sel.Range(r) = SelectionRange(RealizeVirtualSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace()));
+				}
+				if ((sel.Count() == 1) || !pdoc->IsPositionInLineEnd(sel.Range(r).caret.Position())) {
+					pdoc->DelChar(sel.Range(r).caret.Position());
+					sel.Range(r).ClearVirtualSpace();
+				}  // else multiple selection so don't eat line ends
+			} else {
+				sel.Range(r).ClearVirtualSpace();
+			}
+		}
+	} else {
+		ClearSelection();
+	}
+	sel.RemoveDuplicates();
+	ShowCaretAtCurrentPosition();		// Avoid blinking
+}
+
+void Editor::SelectAll() {
+	sel.Clear();
+	SetSelection(0, pdoc->Length());
+	Redraw();
+}
+
+void Editor::Undo() {
+	if (pdoc->CanUndo()) {
+		InvalidateCaret();
+		const Sci::Position newPos = pdoc->Undo();
+		if (newPos >= 0)
+			SetEmptySelection(newPos);
+		EnsureCaretVisible();
+	}
+}
+
+void Editor::Redo() {
+	if (pdoc->CanRedo()) {
+		const Sci::Position newPos = pdoc->Redo();
+		if (newPos >= 0)
+			SetEmptySelection(newPos);
+		EnsureCaretVisible();
+	}
+}
+
+void Editor::DelCharBack(bool allowLineStartDeletion) {
+	RefreshStyleData();
+	if (!sel.IsRectangular())
+		FilterSelections();
+	if (sel.IsRectangular())
+		allowLineStartDeletion = false;
+	UndoGroup ug(pdoc, (sel.Count() > 1) || !sel.Empty());
+	if (sel.Empty()) {
+		for (size_t r=0; r<sel.Count(); r++) {
+			if (!RangeContainsProtected(sel.Range(r).caret.Position() - 1, sel.Range(r).caret.Position())) {
+				if (sel.Range(r).caret.VirtualSpace()) {
+					sel.Range(r).caret.SetVirtualSpace(sel.Range(r).caret.VirtualSpace() - 1);
+					sel.Range(r).anchor.SetVirtualSpace(sel.Range(r).caret.VirtualSpace());
+				} else {
+					const Sci::Line lineCurrentPos =
+						pdoc->SciLineFromPosition(sel.Range(r).caret.Position());
+					if (allowLineStartDeletion || (pdoc->LineStart(lineCurrentPos) != sel.Range(r).caret.Position())) {
+						if (pdoc->GetColumn(sel.Range(r).caret.Position()) <= pdoc->GetLineIndentation(lineCurrentPos) &&
+								pdoc->GetColumn(sel.Range(r).caret.Position()) > 0 && pdoc->backspaceUnindents) {
+							UndoGroup ugInner(pdoc, !ug.Needed());
+							const int indentation = pdoc->GetLineIndentation(lineCurrentPos);
+							const int indentationStep = pdoc->IndentSize();
+							int indentationChange = indentation % indentationStep;
+							if (indentationChange == 0)
+								indentationChange = indentationStep;
+							const Sci::Position posSelect = pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationChange);
+							// SetEmptySelection
+							sel.Range(r) = SelectionRange(posSelect);
+						} else {
+							pdoc->DelCharBack(sel.Range(r).caret.Position());
+						}
+					}
+				}
+			} else {
+				sel.Range(r).ClearVirtualSpace();
+			}
+		}
+		ThinRectangularRange();
+	} else {
+		ClearSelection();
+	}
+	sel.RemoveDuplicates();
+	ContainerNeedsUpdate(Update::Selection);
+	// Avoid blinking during rapid typing:
+	ShowCaretAtCurrentPosition();
+}
+
+KeyMod Editor::ModifierFlags(bool shift, bool ctrl, bool alt, bool meta, bool super) noexcept {
+	return
+		(shift ? KeyMod::Shift : KeyMod::Norm) |
+		(ctrl ? KeyMod::Ctrl : KeyMod::Norm) |
+		(alt ? KeyMod::Alt : KeyMod::Norm) |
+		(meta ? KeyMod::Meta : KeyMod::Norm) |
+		(super ? KeyMod::Super : KeyMod::Norm);
+}
+
+void Editor::NotifyFocus(bool focus) {
+	NotificationData scn = {};
+	scn.nmhdr.code = focus ? Notification::FocusIn : Notification::FocusOut;
+	NotifyParent(scn);
+}
+
+void Editor::SetCtrlID(int identifier) {
+	ctrlID = identifier;
+}
+
+void Editor::NotifyStyleToNeeded(Sci::Position endStyleNeeded) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::StyleNeeded;
+	scn.position = endStyleNeeded;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyStyleNeeded(Document *, void *, Sci::Position endStyleNeeded) {
+	NotifyStyleToNeeded(endStyleNeeded);
+}
+
+void Editor::NotifyLexerChanged(Document *, void *) {
+}
+
+void Editor::NotifyErrorOccurred(Document *, void *, Status status) {
+	errorStatus = status;
+}
+
+void Editor::NotifyChar(int ch, CharacterSource charSource) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::CharAdded;
+	scn.ch = ch;
+	scn.characterSource = charSource;
+	NotifyParent(scn);
+}
+
+void Editor::NotifySavePoint(bool isSavePoint) {
+	NotificationData scn = {};
+	if (isSavePoint) {
+		scn.nmhdr.code = Notification::SavePointReached;
+	} else {
+		scn.nmhdr.code = Notification::SavePointLeft;
+	}
+	NotifyParent(scn);
+}
+
+void Editor::NotifyModifyAttempt() {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::ModifyAttemptRO;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyDoubleClick(Point pt, KeyMod modifiers) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::DoubleClick;
+	scn.line = LineFromLocation(pt);
+	scn.position = PositionFromLocation(pt, true);
+	scn.modifiers = modifiers;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyHotSpotDoubleClicked(Sci::Position position, KeyMod modifiers) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::HotSpotDoubleClick;
+	scn.position = position;
+	scn.modifiers = modifiers;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyHotSpotClicked(Sci::Position position, KeyMod modifiers) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::HotSpotClick;
+	scn.position = position;
+	scn.modifiers = modifiers;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyHotSpotReleaseClick(Sci::Position position, KeyMod modifiers) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::HotSpotReleaseClick;
+	scn.position = position;
+	scn.modifiers = modifiers;
+	NotifyParent(scn);
+}
+
+bool Editor::NotifyUpdateUI() {
+	if (needUpdateUI != Update::None) {
+		NotificationData scn = {};
+		scn.nmhdr.code = Notification::UpdateUI;
+		scn.updated = needUpdateUI;
+		NotifyParent(scn);
+		needUpdateUI = Update::None;
+		return true;
+	}
+	return false;
+}
+
+void Editor::NotifyPainted() {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::Painted;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyIndicatorClick(bool click, Sci::Position position, KeyMod modifiers) {
+	const int mask = pdoc->decorations->AllOnFor(position);
+	if ((click && mask) || pdoc->decorations->ClickNotified()) {
+		NotificationData scn = {};
+		pdoc->decorations->SetClickNotified(click);
+		scn.nmhdr.code = click ? Notification::IndicatorClick : Notification::IndicatorRelease;
+		scn.modifiers = modifiers;
+		scn.position = position;
+		NotifyParent(scn);
+	}
+}
+
+bool Editor::NotifyMarginClick(Point pt, KeyMod modifiers) {
+	const int marginClicked = vs.MarginFromLocation(pt);
+	if ((marginClicked >= 0) && vs.ms[marginClicked].sensitive) {
+		const Sci::Position position = pdoc->LineStart(LineFromLocation(pt));
+		if ((vs.ms[marginClicked].mask & MaskFolders) && (FlagSet(foldAutomatic, AutomaticFold::Click))) {
+			const bool ctrl = FlagSet(modifiers, KeyMod::Ctrl);
+			const bool shift = FlagSet(modifiers, KeyMod::Shift);
+			const Sci::Line lineClick = pdoc->SciLineFromPosition(position);
+			if (shift && ctrl) {
+				FoldAll(FoldAction::Toggle);
+			} else {
+				const FoldLevel levelClick = pdoc->GetFoldLevel(lineClick);
+				if (LevelIsHeader(levelClick)) {
+					if (shift) {
+						// Ensure all children visible
+						FoldExpand(lineClick, FoldAction::Expand, levelClick);
+					} else if (ctrl) {
+						FoldExpand(lineClick, FoldAction::Toggle, levelClick);
+					} else {
+						// Toggle this line
+						FoldLine(lineClick, FoldAction::Toggle);
+					}
+				}
+			}
+			return true;
+		}
+		NotificationData scn = {};
+		scn.nmhdr.code = Notification::MarginClick;
+		scn.modifiers = modifiers;
+		scn.position = position;
+		scn.margin = marginClicked;
+		NotifyParent(scn);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+bool Editor::NotifyMarginRightClick(Point pt, KeyMod modifiers) {
+	const int marginRightClicked = vs.MarginFromLocation(pt);
+	if ((marginRightClicked >= 0) && vs.ms[marginRightClicked].sensitive) {
+		const Sci::Position position = pdoc->LineStart(LineFromLocation(pt));
+		NotificationData scn = {};
+		scn.nmhdr.code = Notification::MarginRightClick;
+		scn.modifiers = modifiers;
+		scn.position = position;
+		scn.margin = marginRightClicked;
+		NotifyParent(scn);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+void Editor::NotifyNeedShown(Sci::Position pos, Sci::Position len) {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::NeedShown;
+	scn.position = pos;
+	scn.length = len;
+	NotifyParent(scn);
+}
+
+void Editor::NotifyDwelling(Point pt, bool state) {
+	NotificationData scn = {};
+	scn.nmhdr.code = state ? Notification::DwellStart : Notification::DwellEnd;
+	scn.position = PositionFromLocation(pt, true);
+	scn.x = static_cast<int>(pt.x + vs.ExternalMarginWidth());
+	scn.y = static_cast<int>(pt.y);
+	NotifyParent(scn);
+}
+
+void Editor::NotifyZoom() {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::Zoom;
+	NotifyParent(scn);
+}
+
+// Notifications from document
+void Editor::NotifyModifyAttempt(Document *, void *) {
+	//Platform::DebugPrintf("** Modify Attempt\n");
+	NotifyModifyAttempt();
+}
+
+void Editor::NotifySavePoint(Document *, void *, bool atSavePoint) {
+	//Platform::DebugPrintf("** Save Point %s\n", atSavePoint ? "On" : "Off");
+	NotifySavePoint(atSavePoint);
+}
+
+void Editor::CheckModificationForWrap(DocModification mh) {
+	if (FlagSet(mh.modificationType, ModificationFlags::InsertText | ModificationFlags::DeleteText)) {
+		view.llc.Invalidate(LineLayout::ValidLevel::checkTextAndStyle);
+		const Sci::Line lineDoc = pdoc->SciLineFromPosition(mh.position);
+		const Sci::Line lines = std::max(static_cast<Sci::Line>(0), mh.linesAdded);
+		if (Wrapping()) {
+			NeedWrapping(lineDoc, lineDoc + lines + 1);
+		}
+		RefreshStyleData();
+		// Fix up annotation heights
+		SetAnnotationHeights(lineDoc, lineDoc + lines + 2);
+	}
+}
+
+namespace {
+
+// Move a position so it is still after the same character as before the insertion.
+constexpr Sci::Position MovePositionForInsertion(Sci::Position position, Sci::Position startInsertion, Sci::Position length) noexcept {
+	if (position > startInsertion) {
+		return position + length;
+	}
+	return position;
+}
+
+// Move a position so it is still after the same character as before the deletion if that
+// character is still present else after the previous surviving character.
+constexpr Sci::Position MovePositionForDeletion(Sci::Position position, Sci::Position startDeletion, Sci::Position length) noexcept {
+	if (position > startDeletion) {
+		const Sci::Position endDeletion = startDeletion + length;
+		if (position > endDeletion) {
+			return position - length;
+		} else {
+			return startDeletion;
+		}
+	} else {
+		return position;
+	}
+}
+
+}
+
+void Editor::NotifyModified(Document *, DocModification mh, void *) {
+	ContainerNeedsUpdate(Update::Content);
+	if (paintState == PaintState::painting) {
+		CheckForChangeOutsidePaint(Range(mh.position, mh.position + mh.length));
+	}
+	if (FlagSet(mh.modificationType, ModificationFlags::ChangeLineState)) {
+		if (paintState == PaintState::painting) {
+			CheckForChangeOutsidePaint(
+			    Range(pdoc->LineStart(mh.line),
+					pdoc->LineStart(mh.line + 1)));
+		} else {
+			// Could check that change is before last visible line.
+			Redraw();
+		}
+	}
+	if (FlagSet(mh.modificationType, ModificationFlags::ChangeTabStops)) {
+		Redraw();
+	}
+	if (FlagSet(mh.modificationType, ModificationFlags::LexerState)) {
+		if (paintState == PaintState::painting) {
+			CheckForChangeOutsidePaint(
+			    Range(mh.position, mh.position + mh.length));
+		} else {
+			Redraw();
+		}
+	}
+	if (FlagSet(mh.modificationType, ModificationFlags::ChangeStyle | ModificationFlags::ChangeIndicator)) {
+		if (FlagSet(mh.modificationType, ModificationFlags::ChangeStyle)) {
+			pdoc->IncrementStyleClock();
+		}
+		if (paintState == PaintState::notPainting) {
+			const Sci::Line lineDocTop = pcs->DocFromDisplay(topLine);
+			if (mh.position < pdoc->LineStart(lineDocTop)) {
+				// Styling performed before this view
+				Redraw();
+			} else {
+				InvalidateRange(mh.position, mh.position + mh.length);
+			}
+		}
+		if (FlagSet(mh.modificationType, ModificationFlags::ChangeStyle)) {
+			view.llc.Invalidate(LineLayout::ValidLevel::checkTextAndStyle);
+		}
+	} else {
+		// Move selection and brace highlights
+		if (FlagSet(mh.modificationType, ModificationFlags::InsertText)) {
+			sel.MovePositions(true, mh.position, mh.length);
+			braces[0] = MovePositionForInsertion(braces[0], mh.position, mh.length);
+			braces[1] = MovePositionForInsertion(braces[1], mh.position, mh.length);
+		} else if (FlagSet(mh.modificationType, ModificationFlags::DeleteText)) {
+			sel.MovePositions(false, mh.position, mh.length);
+			braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length);
+			braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length);
+		}
+		if (FlagSet(mh.modificationType, ModificationFlags::BeforeInsert | ModificationFlags::BeforeDelete) && pcs->HiddenLines()) {
+			// Some lines are hidden so may need shown.
+			const Sci::Line lineOfPos = pdoc->SciLineFromPosition(mh.position);
+			Sci::Position endNeedShown = mh.position;
+			if (FlagSet(mh.modificationType, ModificationFlags::BeforeInsert)) {
+				if (pdoc->ContainsLineEnd(mh.text, mh.length) && (mh.position != pdoc->LineStart(lineOfPos)))
+					endNeedShown = pdoc->LineStart(lineOfPos+1);
+			} else if (FlagSet(mh.modificationType, ModificationFlags::BeforeDelete)) {
+				// If the deletion includes any EOL then we extend the need shown area.
+				endNeedShown = mh.position + mh.length;
+				Sci::Line lineLast = pdoc->SciLineFromPosition(mh.position+mh.length);
+				for (Sci::Line line = lineOfPos + 1; line <= lineLast; line++) {
+					const Sci::Line lineMaxSubord = pdoc->GetLastChild(line, {}, -1);
+					if (lineLast < lineMaxSubord) {
+						lineLast = lineMaxSubord;
+						endNeedShown = pdoc->LineEnd(lineLast);
+					}
+				}
+			}
+			NeedShown(mh.position, endNeedShown - mh.position);
+		}
+		if (mh.linesAdded != 0) {
+			// Update contraction state for inserted and removed lines
+			// lineOfPos should be calculated in context of state before modification, shouldn't it
+			Sci::Line lineOfPos = pdoc->SciLineFromPosition(mh.position);
+			if (mh.position > pdoc->LineStart(lineOfPos))
+				lineOfPos++;	// Affecting subsequent lines
+			if (mh.linesAdded > 0) {
+				pcs->InsertLines(lineOfPos, mh.linesAdded);
+			} else {
+				pcs->DeleteLines(lineOfPos, -mh.linesAdded);
+			}
+			view.LinesAddedOrRemoved(lineOfPos, mh.linesAdded);
+		}
+		if (FlagSet(mh.modificationType, ModificationFlags::ChangeAnnotation)) {
+			const Sci::Line lineDoc = pdoc->SciLineFromPosition(mh.position);
+			if (vs.annotationVisible != AnnotationVisible::Hidden) {
+				if (pcs->SetHeight(lineDoc, pcs->GetHeight(lineDoc) + static_cast<int>(mh.annotationLinesAdded))) {
+					SetScrollBars();
+				}
+				Redraw();
+			}
+		}
+		if (FlagSet(mh.modificationType, ModificationFlags::ChangeEOLAnnotation)) {
+			if (vs.eolAnnotationVisible != EOLAnnotationVisible::Hidden) {
+				Redraw();
+			}
+		}
+		CheckModificationForWrap(mh);
+		if (mh.linesAdded != 0) {
+			// Avoid scrolling of display if change before current display
+			if (mh.position < posTopLine && !CanDeferToLastStep(mh)) {
+				const Sci::Line newTop = std::clamp<Sci::Line>(topLine + mh.linesAdded, 0, MaxScrollPos());
+				if (newTop != topLine) {
+					SetTopLine(newTop);
+					SetVerticalScrollPos();
+				}
+			}
+
+			if (paintState == PaintState::notPainting && !CanDeferToLastStep(mh)) {
+				if (SynchronousStylingToVisible()) {
+					QueueIdleWork(WorkItems::style, pdoc->Length());
+				}
+				Redraw();
+			}
+		} else {
+			if (paintState == PaintState::notPainting && mh.length && !CanEliminate(mh)) {
+				if (SynchronousStylingToVisible()) {
+					QueueIdleWork(WorkItems::style, mh.position + mh.length);
+				}
+				InvalidateRange(mh.position, mh.position + mh.length);
+			}
+		}
+	}
+
+	if (mh.linesAdded != 0 && !CanDeferToLastStep(mh)) {
+		SetScrollBars();
+	}
+
+	if ((FlagSet(mh.modificationType, ModificationFlags::ChangeMarker)) || (FlagSet(mh.modificationType, ModificationFlags::ChangeMargin))) {
+		if ((!willRedrawAll) && ((paintState == PaintState::notPainting) || !PaintContainsMargin())) {
+			if (FlagSet(mh.modificationType, ModificationFlags::ChangeFold)) {
+				// Fold changes can affect the drawing of following lines so redraw whole margin
+				RedrawSelMargin(marginView.highlightDelimiter.isEnabled ? -1 : mh.line - 1, true);
+			} else {
+				RedrawSelMargin(mh.line);
+			}
+		}
+	}
+	if ((FlagSet(mh.modificationType, ModificationFlags::ChangeFold)) && (FlagSet(foldAutomatic, AutomaticFold::Change))) {
+		FoldChanged(mh.line, mh.foldLevelNow, mh.foldLevelPrev);
+	}
+
+	// NOW pay the piper WRT "deferred" visual updates
+	if (IsLastStep(mh)) {
+		SetScrollBars();
+		Redraw();
+	}
+
+	// If client wants to see this modification
+	if (FlagSet(mh.modificationType, modEventMask)) {
+		if (commandEvents) {
+			if ((mh.modificationType & (ModificationFlags::ChangeStyle | ModificationFlags::ChangeIndicator)) == ModificationFlags::None) {
+				// Real modification made to text of document.
+				NotifyChange();	// Send EN_CHANGE
+			}
+		}
+
+		NotificationData scn = {};
+		scn.nmhdr.code = Notification::Modified;
+		scn.position = mh.position;
+		scn.modificationType = mh.modificationType;
+		scn.text = mh.text;
+		scn.length = mh.length;
+		scn.linesAdded = mh.linesAdded;
+		scn.line = mh.line;
+		scn.foldLevelNow = mh.foldLevelNow;
+		scn.foldLevelPrev = mh.foldLevelPrev;
+		scn.token = static_cast<int>(mh.token);
+		scn.annotationLinesAdded = mh.annotationLinesAdded;
+		NotifyParent(scn);
+	}
+}
+
+void Editor::NotifyDeleted(Document *, void *) noexcept {
+	/* Do nothing */
+}
+
+void Editor::NotifyMacroRecord(Message iMessage, uptr_t wParam, sptr_t lParam) {
+
+	// Enumerates all macroable messages
+	switch (iMessage) {
+	case Message::Cut:
+	case Message::Copy:
+	case Message::Paste:
+	case Message::Clear:
+	case Message::ReplaceSel:
+	case Message::AddText:
+	case Message::InsertText:
+	case Message::AppendText:
+	case Message::ClearAll:
+	case Message::SelectAll:
+	case Message::GotoLine:
+	case Message::GotoPos:
+	case Message::SearchAnchor:
+	case Message::SearchNext:
+	case Message::SearchPrev:
+	case Message::LineDown:
+	case Message::LineDownExtend:
+	case Message::ParaDown:
+	case Message::ParaDownExtend:
+	case Message::LineUp:
+	case Message::LineUpExtend:
+	case Message::ParaUp:
+	case Message::ParaUpExtend:
+	case Message::CharLeft:
+	case Message::CharLeftExtend:
+	case Message::CharRight:
+	case Message::CharRightExtend:
+	case Message::WordLeft:
+	case Message::WordLeftExtend:
+	case Message::WordRight:
+	case Message::WordRightExtend:
+	case Message::WordPartLeft:
+	case Message::WordPartLeftExtend:
+	case Message::WordPartRight:
+	case Message::WordPartRightExtend:
+	case Message::WordLeftEnd:
+	case Message::WordLeftEndExtend:
+	case Message::WordRightEnd:
+	case Message::WordRightEndExtend:
+	case Message::Home:
+	case Message::HomeExtend:
+	case Message::LineEnd:
+	case Message::LineEndExtend:
+	case Message::HomeWrap:
+	case Message::HomeWrapExtend:
+	case Message::LineEndWrap:
+	case Message::LineEndWrapExtend:
+	case Message::DocumentStart:
+	case Message::DocumentStartExtend:
+	case Message::DocumentEnd:
+	case Message::DocumentEndExtend:
+	case Message::StutteredPageUp:
+	case Message::StutteredPageUpExtend:
+	case Message::StutteredPageDown:
+	case Message::StutteredPageDownExtend:
+	case Message::PageUp:
+	case Message::PageUpExtend:
+	case Message::PageDown:
+	case Message::PageDownExtend:
+	case Message::EditToggleOvertype:
+	case Message::Cancel:
+	case Message::DeleteBack:
+	case Message::Tab:
+	case Message::BackTab:
+	case Message::FormFeed:
+	case Message::VCHome:
+	case Message::VCHomeExtend:
+	case Message::VCHomeWrap:
+	case Message::VCHomeWrapExtend:
+	case Message::VCHomeDisplay:
+	case Message::VCHomeDisplayExtend:
+	case Message::DelWordLeft:
+	case Message::DelWordRight:
+	case Message::DelWordRightEnd:
+	case Message::DelLineLeft:
+	case Message::DelLineRight:
+	case Message::LineCopy:
+	case Message::LineCut:
+	case Message::LineDelete:
+	case Message::LineTranspose:
+	case Message::LineReverse:
+	case Message::LineDuplicate:
+	case Message::LowerCase:
+	case Message::UpperCase:
+	case Message::LineScrollDown:
+	case Message::LineScrollUp:
+	case Message::DeleteBackNotLine:
+	case Message::HomeDisplay:
+	case Message::HomeDisplayExtend:
+	case Message::LineEndDisplay:
+	case Message::LineEndDisplayExtend:
+	case Message::SetSelectionMode:
+	case Message::LineDownRectExtend:
+	case Message::LineUpRectExtend:
+	case Message::CharLeftRectExtend:
+	case Message::CharRightRectExtend:
+	case Message::HomeRectExtend:
+	case Message::VCHomeRectExtend:
+	case Message::LineEndRectExtend:
+	case Message::PageUpRectExtend:
+	case Message::PageDownRectExtend:
+	case Message::SelectionDuplicate:
+	case Message::CopyAllowLine:
+	case Message::VerticalCentreCaret:
+	case Message::MoveSelectedLinesUp:
+	case Message::MoveSelectedLinesDown:
+	case Message::ScrollToStart:
+	case Message::ScrollToEnd:
+		break;
+
+		// Filter out all others like display changes. Also, newlines are redundant
+		// with char insert messages.
+	case Message::NewLine:
+	default:
+		//		printf("Filtered out %ld of macro recording\n", iMessage);
+		return;
+	}
+
+	// Send notification
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::MacroRecord;
+	scn.message = iMessage;
+	scn.wParam = wParam;
+	scn.lParam = lParam;
+	NotifyParent(scn);
+}
+
+// Something has changed that the container should know about
+void Editor::ContainerNeedsUpdate(Update flags) noexcept {
+	needUpdateUI = needUpdateUI | flags;
+}
+
+/**
+ * Force scroll and keep position relative to top of window.
+ *
+ * If stuttered = true and not already at first/last row, move to first/last row of window.
+ * If stuttered = true and already at first/last row, scroll as normal.
+ */
+void Editor::PageMove(int direction, Selection::SelTypes selt, bool stuttered) {
+	Sci::Line topLineNew;
+	SelectionPosition newPos;
+
+	const Sci::Line currentLine = pdoc->SciLineFromPosition(sel.MainCaret());
+	const Sci::Line topStutterLine = topLine + caretPolicies.y.slop;
+	const Sci::Line bottomStutterLine =
+	    pdoc->SciLineFromPosition(PositionFromLocation(
+	                Point::FromInts(lastXChosen - xOffset, direction * vs.lineHeight * static_cast<int>(LinesToScroll()))))
+	    - caretPolicies.y.slop - 1;
+
+	if (stuttered && (direction < 0 && currentLine > topStutterLine)) {
+		topLineNew = topLine;
+		newPos = SPositionFromLocation(Point::FromInts(lastXChosen - xOffset, vs.lineHeight * caretPolicies.y.slop),
+			false, false, UserVirtualSpace());
+
+	} else if (stuttered && (direction > 0 && currentLine < bottomStutterLine)) {
+		topLineNew = topLine;
+		newPos = SPositionFromLocation(Point::FromInts(lastXChosen - xOffset, vs.lineHeight * static_cast<int>(LinesToScroll() - caretPolicies.y.slop)),
+			false, false, UserVirtualSpace());
+
+	} else {
+		const Point pt = LocationFromPosition(sel.MainCaret());
+
+		topLineNew = std::clamp<Sci::Line>(
+		            topLine + direction * LinesToScroll(), 0, MaxScrollPos());
+		newPos = SPositionFromLocation(
+			Point::FromInts(lastXChosen - xOffset, static_cast<int>(pt.y) +
+				direction * (vs.lineHeight * static_cast<int>(LinesToScroll()))),
+			false, false, UserVirtualSpace());
+	}
+
+	if (topLineNew != topLine) {
+		SetTopLine(topLineNew);
+		MovePositionTo(newPos, selt);
+		Redraw();
+		SetVerticalScrollPos();
+	} else {
+		MovePositionTo(newPos, selt);
+	}
+}
+
+void Editor::ChangeCaseOfSelection(CaseMapping caseMapping) {
+	UndoGroup ug(pdoc);
+	for (size_t r=0; r<sel.Count(); r++) {
+		SelectionRange current = sel.Range(r);
+		SelectionRange currentNoVS = current;
+		currentNoVS.ClearVirtualSpace();
+		const size_t rangeBytes = currentNoVS.Length();
+		if (rangeBytes > 0) {
+			std::string sText = RangeText(currentNoVS.Start().Position(), currentNoVS.End().Position());
+
+			std::string sMapped = CaseMapString(sText, caseMapping);
+
+			if (sMapped != sText) {
+				size_t firstDifference = 0;
+				while (sMapped[firstDifference] == sText[firstDifference])
+					firstDifference++;
+				size_t lastDifferenceText = sText.size() - 1;
+				size_t lastDifferenceMapped = sMapped.size() - 1;
+				while (sMapped[lastDifferenceMapped] == sText[lastDifferenceText]) {
+					lastDifferenceText--;
+					lastDifferenceMapped--;
+				}
+				const size_t endDifferenceText = sText.size() - 1 - lastDifferenceText;
+				pdoc->DeleteChars(
+					currentNoVS.Start().Position() + firstDifference,
+					rangeBytes - firstDifference - endDifferenceText);
+				const Sci::Position lengthChange = lastDifferenceMapped - firstDifference + 1;
+				const Sci::Position lengthInserted = pdoc->InsertString(
+					currentNoVS.Start().Position() + firstDifference,
+					sMapped.c_str() + firstDifference,
+					lengthChange);
+				// Automatic movement changes selection so reset to exactly the same as it was.
+				const Sci::Position diffSizes = sMapped.size() - sText.size() + lengthInserted - lengthChange;
+				if (diffSizes != 0) {
+					if (current.anchor > current.caret)
+						current.anchor.Add(diffSizes);
+					else
+						current.caret.Add(diffSizes);
+				}
+				sel.Range(r) = current;
+			}
+		}
+	}
+}
+
+void Editor::LineTranspose() {
+	const Sci::Line line = pdoc->SciLineFromPosition(sel.MainCaret());
+	if (line > 0) {
+		UndoGroup ug(pdoc);
+
+		const Sci::Position startPrevious = pdoc->LineStart(line - 1);
+		const std::string linePrevious = RangeText(startPrevious, pdoc->LineEnd(line - 1));
+
+		Sci::Position startCurrent = pdoc->LineStart(line);
+		const std::string lineCurrent = RangeText(startCurrent, pdoc->LineEnd(line));
+
+		pdoc->DeleteChars(startCurrent, lineCurrent.length());
+		pdoc->DeleteChars(startPrevious, linePrevious.length());
+		startCurrent -= linePrevious.length();
+
+		startCurrent += pdoc->InsertString(startPrevious, lineCurrent.c_str(),
+			lineCurrent.length());
+		pdoc->InsertString(startCurrent, linePrevious.c_str(),
+			linePrevious.length());
+		// Move caret to start of current line
+		MovePositionTo(SelectionPosition(startCurrent));
+	}
+}
+
+void Editor::LineReverse() {
+	const Sci::Line lineStart =
+		pdoc->SciLineFromPosition(sel.RangeMain().Start().Position());
+	const Sci::Line lineEnd =
+		pdoc->SciLineFromPosition(sel.RangeMain().End().Position()-1);
+	const Sci::Line lineDiff = lineEnd - lineStart;
+	if (lineDiff <= 0)
+		return;
+	UndoGroup ug(pdoc);
+	for (Sci::Line i=(lineDiff+1)/2-1; i>=0; --i) {
+		const Sci::Line lineNum2 = lineEnd - i;
+		const Sci::Line lineNum1 = lineStart + i;
+		Sci::Position lineStart2 = pdoc->LineStart(lineNum2);
+		const Sci::Position lineStart1 = pdoc->LineStart(lineNum1);
+		const std::string line2 = RangeText(lineStart2, pdoc->LineEnd(lineNum2));
+		const std::string line1 = RangeText(lineStart1, pdoc->LineEnd(lineNum1));
+		const Sci::Position lineLen2 = line2.length();
+		const Sci::Position lineLen1 = line1.length();
+		pdoc->DeleteChars(lineStart2, lineLen2);
+		pdoc->DeleteChars(lineStart1, lineLen1);
+		lineStart2 -= lineLen1;
+		pdoc->InsertString(lineStart2, line1.c_str(), lineLen1);
+		pdoc->InsertString(lineStart1, line2.c_str(), lineLen2);
+	}
+	// Wholly select all affected lines
+	sel.RangeMain() = SelectionRange(pdoc->LineStart(lineStart),
+		pdoc->LineStart(lineEnd+1));
+}
+
+void Editor::Duplicate(bool forLine) {
+	if (sel.Empty()) {
+		forLine = true;
+	}
+	UndoGroup ug(pdoc);
+	const char *eol = "";
+	Sci::Position eolLen = 0;
+	if (forLine) {
+		eol = StringFromEOLMode(pdoc->eolMode);
+		eolLen = strlen(eol);
+	}
+	for (size_t r=0; r<sel.Count(); r++) {
+		SelectionPosition start = sel.Range(r).Start();
+		SelectionPosition end = sel.Range(r).End();
+		if (forLine) {
+			const Sci::Line line = pdoc->SciLineFromPosition(sel.Range(r).caret.Position());
+			start = SelectionPosition(pdoc->LineStart(line));
+			end = SelectionPosition(pdoc->LineEnd(line));
+		}
+		std::string text = RangeText(start.Position(), end.Position());
+		Sci::Position lengthInserted = eolLen;
+		if (forLine)
+			lengthInserted = pdoc->InsertString(end.Position(), eol, eolLen);
+		pdoc->InsertString(end.Position() + lengthInserted, text.c_str(), text.length());
+	}
+	if (sel.Count() && sel.IsRectangular()) {
+		SelectionPosition last = sel.Last();
+		if (forLine) {
+			const Sci::Line line = pdoc->SciLineFromPosition(last.Position());
+			last = SelectionPosition(last.Position() +
+				pdoc->LineStart(line+1) - pdoc->LineStart(line));
+		}
+		if (sel.Rectangular().anchor > sel.Rectangular().caret)
+			sel.Rectangular().anchor = last;
+		else
+			sel.Rectangular().caret = last;
+		SetRectangularRange();
+	}
+}
+
+void Editor::CancelModes() {
+	sel.SetMoveExtends(false);
+}
+
+void Editor::NewLine() {
+	InvalidateWholeSelection();
+	if (sel.IsRectangular() || !additionalSelectionTyping) {
+		// Remove non-main ranges
+		sel.DropAdditionalRanges();
+	}
+
+	UndoGroup ug(pdoc, !sel.Empty() || (sel.Count() > 1));
+
+	// Clear each range
+	if (!sel.Empty()) {
+		ClearSelection();
+	}
+
+	// Insert each line end
+	size_t countInsertions = 0;
+	for (size_t r = 0; r < sel.Count(); r++) {
+		sel.Range(r).ClearVirtualSpace();
+		const char *eol = StringFromEOLMode(pdoc->eolMode);
+		const Sci::Position positionInsert = sel.Range(r).caret.Position();
+		const Sci::Position insertLength = pdoc->InsertString(positionInsert, eol, strlen(eol));
+		if (insertLength > 0) {
+			sel.Range(r) = SelectionRange(positionInsert + insertLength);
+			countInsertions++;
+		}
+	}
+
+	// Perform notifications after all the changes as the application may change the
+	// selections in response to the characters.
+	for (size_t i = 0; i < countInsertions; i++) {
+		const char *eol = StringFromEOLMode(pdoc->eolMode);
+		while (*eol) {
+			NotifyChar(*eol, CharacterSource::DirectInput);
+			if (recordingMacro) {
+				char txt[2];
+				txt[0] = *eol;
+				txt[1] = '\0';
+				NotifyMacroRecord(Message::ReplaceSel, 0, reinterpret_cast<sptr_t>(txt));
+			}
+			eol++;
+		}
+	}
+
+	SetLastXChosen();
+	SetScrollBars();
+	EnsureCaretVisible();
+	// Avoid blinking during rapid typing:
+	ShowCaretAtCurrentPosition();
+}
+
+SelectionPosition Editor::PositionUpOrDown(SelectionPosition spStart, int direction, int lastX) {
+	const Point pt = LocationFromPosition(spStart);
+	int skipLines = 0;
+
+	if (vs.annotationVisible != AnnotationVisible::Hidden) {
+		const Sci::Line lineDoc = pdoc->SciLineFromPosition(spStart.Position());
+		const Point ptStartLine = LocationFromPosition(pdoc->LineStart(lineDoc));
+		const int subLine = static_cast<int>(pt.y - ptStartLine.y) / vs.lineHeight;
+
+		if (direction < 0 && subLine == 0) {
+			const Sci::Line lineDisplay = pcs->DisplayFromDoc(lineDoc);
+			if (lineDisplay > 0) {
+				skipLines = pdoc->AnnotationLines(pcs->DocFromDisplay(lineDisplay - 1));
+			}
+		} else if (direction > 0 && subLine >= (pcs->GetHeight(lineDoc) - 1 - pdoc->AnnotationLines(lineDoc))) {
+			skipLines = pdoc->AnnotationLines(lineDoc);
+		}
+	}
+
+	const Sci::Line newY = static_cast<Sci::Line>(pt.y) + (1 + skipLines) * direction * vs.lineHeight;
+	if (lastX < 0) {
+		lastX = static_cast<int>(pt.x) + xOffset;
+	}
+	SelectionPosition posNew = SPositionFromLocation(
+		Point::FromInts(lastX - xOffset, static_cast<int>(newY)), false, false, UserVirtualSpace());
+
+	if (direction < 0) {
+		// Line wrapping may lead to a location on the same line, so
+		// seek back if that is the case.
+		Point ptNew = LocationFromPosition(posNew.Position());
+		while ((posNew.Position() > 0) && (pt.y == ptNew.y)) {
+			posNew.Add(-1);
+			posNew.SetVirtualSpace(0);
+			ptNew = LocationFromPosition(posNew.Position());
+		}
+	} else if (direction > 0 && posNew.Position() != pdoc->Length()) {
+		// There is an equivalent case when moving down which skips
+		// over a line.
+		Point ptNew = LocationFromPosition(posNew.Position());
+		while ((posNew.Position() > spStart.Position()) && (ptNew.y > newY)) {
+			posNew.Add(-1);
+			posNew.SetVirtualSpace(0);
+			ptNew = LocationFromPosition(posNew.Position());
+		}
+	}
+	return posNew;
+}
+
+void Editor::CursorUpOrDown(int direction, Selection::SelTypes selt) {
+	if ((selt == Selection::SelTypes::none) && sel.MoveExtends()) {
+		selt = !sel.IsRectangular() ? Selection::SelTypes::stream : Selection::SelTypes::rectangle;
+	}
+	SelectionPosition caretToUse = sel.Range(sel.Main()).caret;
+	if (sel.IsRectangular()) {
+		if (selt ==  Selection::SelTypes::none) {
+			caretToUse = (direction > 0) ? sel.Limits().end : sel.Limits().start;
+		} else {
+			caretToUse = sel.Rectangular().caret;
+		}
+	}
+	if (selt == Selection::SelTypes::rectangle) {
+		const SelectionRange rangeBase = sel.IsRectangular() ? sel.Rectangular() : sel.RangeMain();
+		if (!sel.IsRectangular()) {
+			InvalidateWholeSelection();
+			sel.DropAdditionalRanges();
+		}
+		const SelectionPosition posNew = MovePositionSoVisible(
+			PositionUpOrDown(caretToUse, direction, lastXChosen), direction);
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular() = SelectionRange(posNew, rangeBase.anchor);
+		SetRectangularRange();
+		MovedCaret(posNew, caretToUse, true, caretPolicies);
+	} else if (sel.selType == Selection::SelTypes::lines && sel.MoveExtends()) {
+		// Calculate new caret position and call SetSelection(), which will ensure whole lines are selected.
+		const SelectionPosition posNew = MovePositionSoVisible(
+			PositionUpOrDown(caretToUse, direction, -1), direction);
+		SetSelection(posNew, sel.Range(sel.Main()).anchor);
+	} else {
+		InvalidateWholeSelection();
+		if (!additionalSelectionTyping || (sel.IsRectangular())) {
+			sel.DropAdditionalRanges();
+		}
+		sel.selType = Selection::SelTypes::stream;
+		for (size_t r = 0; r < sel.Count(); r++) {
+			const int lastX = (r == sel.Main()) ? lastXChosen : -1;
+			const SelectionPosition spCaretNow = sel.Range(r).caret;
+			const SelectionPosition posNew = MovePositionSoVisible(
+				PositionUpOrDown(spCaretNow, direction, lastX), direction);
+			sel.Range(r) = selt == Selection::SelTypes::stream ?
+				SelectionRange(posNew, sel.Range(r).anchor) : SelectionRange(posNew);
+		}
+		sel.RemoveDuplicates();
+		MovedCaret(sel.RangeMain().caret, caretToUse, true, caretPolicies);
+	}
+}
+
+void Editor::ParaUpOrDown(int direction, Selection::SelTypes selt) {
+	Sci::Line lineDoc;
+	const Sci::Position savedPos = sel.MainCaret();
+	do {
+		MovePositionTo(SelectionPosition(direction > 0 ? pdoc->ParaDown(sel.MainCaret()) : pdoc->ParaUp(sel.MainCaret())), selt);
+		lineDoc = pdoc->SciLineFromPosition(sel.MainCaret());
+		if (direction > 0) {
+			if (sel.MainCaret() >= pdoc->Length() && !pcs->GetVisible(lineDoc)) {
+				if (selt == Selection::SelTypes::none) {
+					MovePositionTo(SelectionPosition(pdoc->LineEndPosition(savedPos)));
+				}
+				break;
+			}
+		}
+	} while (!pcs->GetVisible(lineDoc));
+}
+
+Range Editor::RangeDisplayLine(Sci::Line lineVisible) {
+	RefreshStyleData();
+	AutoSurface surface(this);
+	return view.RangeDisplayLine(surface, *this, lineVisible, vs);
+}
+
+Sci::Position Editor::StartEndDisplayLine(Sci::Position pos, bool start) {
+	RefreshStyleData();
+	AutoSurface surface(this);
+	const Sci::Position posRet = view.StartEndDisplayLine(surface, *this, pos, start, vs);
+	if (posRet == Sci::invalidPosition) {
+		return pos;
+	} else {
+		return posRet;
+	}
+}
+
+namespace {
+
+constexpr short HighShortFromWParam(uptr_t x) {
+	return static_cast<short>(x >> 16);
+}
+
+constexpr short LowShortFromWParam(uptr_t x) {
+	return static_cast<short>(x & 0xffff);
+}
+
+constexpr Message WithExtends(Message iMessage) noexcept {
+	switch (iMessage) {
+	case Message::CharLeft: return Message::CharLeftExtend;
+	case Message::CharRight: return Message::CharRightExtend;
+
+	case Message::WordLeft: return Message::WordLeftExtend;
+	case Message::WordRight: return Message::WordRightExtend;
+	case Message::WordLeftEnd: return Message::WordLeftEndExtend;
+	case Message::WordRightEnd: return Message::WordRightEndExtend;
+	case Message::WordPartLeft: return Message::WordPartLeftExtend;
+	case Message::WordPartRight: return Message::WordPartRightExtend;
+
+	case Message::Home: return Message::HomeExtend;
+	case Message::HomeDisplay: return Message::HomeDisplayExtend;
+	case Message::HomeWrap: return Message::HomeWrapExtend;
+	case Message::VCHome: return Message::VCHomeExtend;
+	case Message::VCHomeDisplay: return Message::VCHomeDisplayExtend;
+	case Message::VCHomeWrap: return Message::VCHomeWrapExtend;
+
+	case Message::LineEnd: return Message::LineEndExtend;
+	case Message::LineEndDisplay: return Message::LineEndDisplayExtend;
+	case Message::LineEndWrap: return Message::LineEndWrapExtend;
+
+	default:	return iMessage;
+	}
+}
+
+constexpr int NaturalDirection(Message iMessage) noexcept {
+	switch (iMessage) {
+	case Message::CharLeft:
+	case Message::CharLeftExtend:
+	case Message::CharLeftRectExtend:
+	case Message::WordLeft:
+	case Message::WordLeftExtend:
+	case Message::WordLeftEnd:
+	case Message::WordLeftEndExtend:
+	case Message::WordPartLeft:
+	case Message::WordPartLeftExtend:
+	case Message::Home:
+	case Message::HomeExtend:
+	case Message::HomeDisplay:
+	case Message::HomeDisplayExtend:
+	case Message::HomeWrap:
+	case Message::HomeWrapExtend:
+		// VC_HOME* mostly goes back
+	case Message::VCHome:
+	case Message::VCHomeExtend:
+	case Message::VCHomeDisplay:
+	case Message::VCHomeDisplayExtend:
+	case Message::VCHomeWrap:
+	case Message::VCHomeWrapExtend:
+		return -1;
+
+	default:
+		return 1;
+	}
+}
+
+constexpr bool IsRectExtend(Message iMessage, bool isRectMoveExtends) noexcept {
+	switch (iMessage) {
+	case Message::CharLeftRectExtend:
+	case Message::CharRightRectExtend:
+	case Message::HomeRectExtend:
+	case Message::VCHomeRectExtend:
+	case Message::LineEndRectExtend:
+		return true;
+	default:
+		if (isRectMoveExtends) {
+			// Handle Message::SetSelectionMode(SelectionMode::Rectangle) and subsequent movements.
+			switch (iMessage) {
+			case Message::CharLeftExtend:
+			case Message::CharRightExtend:
+			case Message::HomeExtend:
+			case Message::VCHomeExtend:
+			case Message::LineEndExtend:
+				return true;
+			default:
+				return false;
+			}
+		}
+		return false;
+	}
+}
+
+}
+
+Sci::Position Editor::VCHomeDisplayPosition(Sci::Position position) {
+	const Sci::Position homePos = pdoc->VCHomePosition(position);
+	const Sci::Position viewLineStart = StartEndDisplayLine(position, true);
+	if (viewLineStart > homePos)
+		return viewLineStart;
+	else
+		return homePos;
+}
+
+Sci::Position Editor::VCHomeWrapPosition(Sci::Position position) {
+	const Sci::Position homePos = pdoc->VCHomePosition(position);
+	const Sci::Position viewLineStart = StartEndDisplayLine(position, true);
+	if ((viewLineStart < position) && (viewLineStart > homePos))
+		return viewLineStart;
+	else
+		return homePos;
+}
+
+Sci::Position Editor::LineEndWrapPosition(Sci::Position position) {
+	const Sci::Position endPos = StartEndDisplayLine(position, false);
+	const Sci::Position realEndPos = pdoc->LineEndPosition(position);
+	if (endPos > realEndPos      // if moved past visible EOLs
+		|| position >= endPos) // if at end of display line already
+		return realEndPos;
+	else
+		return endPos;
+}
+
+int Editor::HorizontalMove(Message iMessage) {
+	if (sel.selType == Selection::SelTypes::lines) {
+		return 0; // horizontal moves with line selection have no effect
+	}
+	if (sel.MoveExtends()) {
+		iMessage = WithExtends(iMessage);
+	}
+
+	if (!multipleSelection && !sel.IsRectangular()) {
+		// Simplify selection down to 1
+		sel.SetSelection(sel.RangeMain());
+	}
+
+	// Invalidate each of the current selections
+	InvalidateWholeSelection();
+
+	if (IsRectExtend(iMessage, sel.IsRectangular() && sel.MoveExtends())) {
+		const SelectionRange rangeBase = sel.IsRectangular() ? sel.Rectangular() : sel.RangeMain();
+		if (!sel.IsRectangular()) {
+			sel.DropAdditionalRanges();
+		}
+		// Will change to rectangular if not currently rectangular
+		SelectionPosition spCaret = rangeBase.caret;
+		switch (iMessage) {
+		case Message::CharLeftRectExtend:
+		case Message::CharLeftExtend: // only when sel.IsRectangular() && sel.MoveExtends()
+			if (pdoc->IsLineEndPosition(spCaret.Position()) && spCaret.VirtualSpace()) {
+				spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1);
+			} else if (!FlagSet(virtualSpaceOptions, VirtualSpace::NoWrapLineStart) || pdoc->GetColumn(spCaret.Position()) > 0) {
+				spCaret = SelectionPosition(spCaret.Position() - 1);
+			}
+			break;
+		case Message::CharRightRectExtend:
+		case Message::CharRightExtend: // only when sel.IsRectangular() && sel.MoveExtends()
+			if (FlagSet(virtualSpaceOptions, VirtualSpace::RectangularSelection) && pdoc->IsLineEndPosition(sel.MainCaret())) {
+				spCaret.SetVirtualSpace(spCaret.VirtualSpace() + 1);
+			} else {
+				spCaret = SelectionPosition(spCaret.Position() + 1);
+			}
+			break;
+		case Message::HomeRectExtend:
+		case Message::HomeExtend: // only when sel.IsRectangular() && sel.MoveExtends()
+			spCaret = SelectionPosition(
+				pdoc->LineStart(pdoc->LineFromPosition(spCaret.Position())));
+			break;
+		case Message::VCHomeRectExtend:
+		case Message::VCHomeExtend: // only when sel.IsRectangular() && sel.MoveExtends()
+			spCaret = SelectionPosition(pdoc->VCHomePosition(spCaret.Position()));
+			break;
+		case Message::LineEndRectExtend:
+		case Message::LineEndExtend: // only when sel.IsRectangular() && sel.MoveExtends()
+			spCaret = SelectionPosition(pdoc->LineEndPosition(spCaret.Position()));
+			break;
+		default:
+			break;
+		}
+		const int directionMove = (spCaret < rangeBase.caret) ? -1 : 1;
+		spCaret = MovePositionSoVisible(spCaret, directionMove);
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular() = SelectionRange(spCaret, rangeBase.anchor);
+		SetRectangularRange();
+	} else if (sel.IsRectangular()) {
+		// Not a rectangular extension so switch to stream.
+		SelectionPosition selAtLimit = (NaturalDirection(iMessage) > 0) ? sel.Limits().end : sel.Limits().start;
+		switch (iMessage) {
+		case Message::Home:
+			selAtLimit = SelectionPosition(
+				pdoc->LineStart(pdoc->LineFromPosition(selAtLimit.Position())));
+			break;
+		case Message::VCHome:
+			selAtLimit = SelectionPosition(pdoc->VCHomePosition(selAtLimit.Position()));
+			break;
+		case Message::LineEnd:
+			selAtLimit = SelectionPosition(pdoc->LineEndPosition(selAtLimit.Position()));
+			break;
+		default:
+			break;
+		}
+		sel.selType = Selection::SelTypes::stream;
+		sel.SetSelection(SelectionRange(selAtLimit));
+	} else {
+		if (!additionalSelectionTyping) {
+			InvalidateWholeSelection();
+			sel.DropAdditionalRanges();
+		}
+		for (size_t r = 0; r < sel.Count(); r++) {
+			const SelectionPosition spCaretNow = sel.Range(r).caret;
+			SelectionPosition spCaret = spCaretNow;
+			switch (iMessage) {
+			case Message::CharLeft:
+			case Message::CharLeftExtend:
+				if (spCaret.VirtualSpace()) {
+					spCaret.SetVirtualSpace(spCaret.VirtualSpace() - 1);
+				} else if (!FlagSet(virtualSpaceOptions, VirtualSpace::NoWrapLineStart) || pdoc->GetColumn(spCaret.Position()) > 0) {
+					spCaret = SelectionPosition(spCaret.Position() - 1);
+				}
+				break;
+			case Message::CharRight:
+			case Message::CharRightExtend:
+				if (FlagSet(virtualSpaceOptions, VirtualSpace::UserAccessible) && pdoc->IsLineEndPosition(spCaret.Position())) {
+					spCaret.SetVirtualSpace(spCaret.VirtualSpace() + 1);
+				} else {
+					spCaret = SelectionPosition(spCaret.Position() + 1);
+				}
+				break;
+			case Message::WordLeft:
+			case Message::WordLeftExtend:
+				spCaret = SelectionPosition(pdoc->NextWordStart(spCaret.Position(), -1));
+				break;
+			case Message::WordRight:
+			case Message::WordRightExtend:
+				spCaret = SelectionPosition(pdoc->NextWordStart(spCaret.Position(), 1));
+				break;
+			case Message::WordLeftEnd:
+			case Message::WordLeftEndExtend:
+				spCaret = SelectionPosition(pdoc->NextWordEnd(spCaret.Position(), -1));
+				break;
+			case Message::WordRightEnd:
+			case Message::WordRightEndExtend:
+				spCaret = SelectionPosition(pdoc->NextWordEnd(spCaret.Position(), 1));
+				break;
+			case Message::WordPartLeft:
+			case Message::WordPartLeftExtend:
+				spCaret = SelectionPosition(pdoc->WordPartLeft(spCaret.Position()));
+				break;
+			case Message::WordPartRight:
+			case Message::WordPartRightExtend:
+				spCaret = SelectionPosition(pdoc->WordPartRight(spCaret.Position()));
+				break;
+			case Message::Home:
+			case Message::HomeExtend:
+				spCaret = SelectionPosition(
+					pdoc->LineStart(pdoc->LineFromPosition(spCaret.Position())));
+				break;
+			case Message::HomeDisplay:
+			case Message::HomeDisplayExtend:
+				spCaret = SelectionPosition(StartEndDisplayLine(spCaret.Position(), true));
+				break;
+			case Message::HomeWrap:
+			case Message::HomeWrapExtend:
+				spCaret = MovePositionSoVisible(StartEndDisplayLine(spCaret.Position(), true), -1);
+				if (spCaretNow <= spCaret)
+					spCaret = SelectionPosition(
+						pdoc->LineStart(pdoc->LineFromPosition(spCaret.Position())));
+				break;
+			case Message::VCHome:
+			case Message::VCHomeExtend:
+				// VCHome alternates between beginning of line and beginning of text so may move back or forwards
+				spCaret = SelectionPosition(pdoc->VCHomePosition(spCaret.Position()));
+				break;
+			case Message::VCHomeDisplay:
+			case Message::VCHomeDisplayExtend:
+				spCaret = SelectionPosition(VCHomeDisplayPosition(spCaret.Position()));
+				break;
+			case Message::VCHomeWrap:
+			case Message::VCHomeWrapExtend:
+				spCaret = SelectionPosition(VCHomeWrapPosition(spCaret.Position()));
+				break;
+			case Message::LineEnd:
+			case Message::LineEndExtend:
+				spCaret = SelectionPosition(pdoc->LineEndPosition(spCaret.Position()));
+				break;
+			case Message::LineEndDisplay:
+			case Message::LineEndDisplayExtend:
+				spCaret = SelectionPosition(StartEndDisplayLine(spCaret.Position(), false));
+				break;
+			case Message::LineEndWrap:
+			case Message::LineEndWrapExtend:
+				spCaret = SelectionPosition(LineEndWrapPosition(spCaret.Position()));
+				break;
+
+			default:
+				PLATFORM_ASSERT(false);
+			}
+
+			const int directionMove = (spCaret < spCaretNow) ? -1 : 1;
+			spCaret = MovePositionSoVisible(spCaret, directionMove);
+
+			// Handle move versus extend, and special behaviour for non-empty left/right
+			switch (iMessage) {
+			case Message::CharLeft:
+			case Message::CharRight:
+				if (sel.Range(r).Empty()) {
+					sel.Range(r) = SelectionRange(spCaret);
+				} else {
+					sel.Range(r) = SelectionRange(
+						(iMessage == Message::CharLeft) ? sel.Range(r).Start() : sel.Range(r).End());
+				}
+				break;
+
+			case Message::WordLeft:
+			case Message::WordRight:
+			case Message::WordLeftEnd:
+			case Message::WordRightEnd:
+			case Message::WordPartLeft:
+			case Message::WordPartRight:
+			case Message::Home:
+			case Message::HomeDisplay:
+			case Message::HomeWrap:
+			case Message::VCHome:
+			case Message::VCHomeDisplay:
+			case Message::VCHomeWrap:
+			case Message::LineEnd:
+			case Message::LineEndDisplay:
+			case Message::LineEndWrap:
+				sel.Range(r) = SelectionRange(spCaret);
+				break;
+
+			case Message::CharLeftExtend:
+			case Message::CharRightExtend:
+			case Message::WordLeftExtend:
+			case Message::WordRightExtend:
+			case Message::WordLeftEndExtend:
+			case Message::WordRightEndExtend:
+			case Message::WordPartLeftExtend:
+			case Message::WordPartRightExtend:
+			case Message::HomeExtend:
+			case Message::HomeDisplayExtend:
+			case Message::HomeWrapExtend:
+			case Message::VCHomeExtend:
+			case Message::VCHomeDisplayExtend:
+			case Message::VCHomeWrapExtend:
+			case Message::LineEndExtend:
+			case Message::LineEndDisplayExtend:
+			case Message::LineEndWrapExtend: {
+				SelectionRange rangeNew = SelectionRange(spCaret, sel.Range(r).anchor);
+				sel.TrimOtherSelections(r, SelectionRange(rangeNew));
+				sel.Range(r) = rangeNew;
+				}
+				break;
+
+			default:
+				PLATFORM_ASSERT(false);
+			}
+		}
+	}
+
+	sel.RemoveDuplicates();
+
+	MovedCaret(sel.RangeMain().caret, SelectionPosition(Sci::invalidPosition), true, caretPolicies);
+
+	// Invalidate the new state of the selection
+	InvalidateWholeSelection();
+
+	SetLastXChosen();
+	// Need the line moving and so forth from MovePositionTo
+	return 0;
+}
+
+int Editor::DelWordOrLine(Message iMessage) {
+	// Virtual space may be realised for Message::DelWordRight or Message::DelWordRightEnd
+	// which means 2 actions so wrap in an undo group.
+
+	// Rightwards and leftwards deletions differ in treatment of virtual space.
+	// Clear virtual space for leftwards, realise for rightwards.
+	const bool leftwards = (iMessage == Message::DelWordLeft) || (iMessage == Message::DelLineLeft);
+
+	if (!additionalSelectionTyping) {
+		InvalidateWholeSelection();
+		sel.DropAdditionalRanges();
+	}
+
+	UndoGroup ug0(pdoc, (sel.Count() > 1) || !leftwards);
+
+	for (size_t r = 0; r < sel.Count(); r++) {
+		if (leftwards) {
+			// Delete to the left so first clear the virtual space.
+			sel.Range(r).ClearVirtualSpace();
+		} else {
+			// Delete to the right so first realise the virtual space.
+			sel.Range(r) = SelectionRange(
+				RealizeVirtualSpace(sel.Range(r).caret));
+		}
+
+		Range rangeDelete;
+		switch (iMessage) {
+		case Message::DelWordLeft:
+			rangeDelete = Range(
+				pdoc->NextWordStart(sel.Range(r).caret.Position(), -1),
+				sel.Range(r).caret.Position());
+			break;
+		case Message::DelWordRight:
+			rangeDelete = Range(
+				sel.Range(r).caret.Position(),
+				pdoc->NextWordStart(sel.Range(r).caret.Position(), 1));
+			break;
+		case Message::DelWordRightEnd:
+			rangeDelete = Range(
+				sel.Range(r).caret.Position(),
+				pdoc->NextWordEnd(sel.Range(r).caret.Position(), 1));
+			break;
+		case Message::DelLineLeft:
+			rangeDelete = Range(
+				pdoc->LineStart(pdoc->LineFromPosition(sel.Range(r).caret.Position())),
+				sel.Range(r).caret.Position());
+			break;
+		case Message::DelLineRight:
+			rangeDelete = Range(
+				sel.Range(r).caret.Position(),
+				pdoc->LineEnd(pdoc->LineFromPosition(sel.Range(r).caret.Position())));
+			break;
+		default:
+			break;
+		}
+		if (!RangeContainsProtected(rangeDelete.start, rangeDelete.end)) {
+			pdoc->DeleteChars(rangeDelete.start, rangeDelete.end - rangeDelete.start);
+		}
+	}
+
+	// May need something stronger here: can selections overlap at this point?
+	sel.RemoveDuplicates();
+
+	MovedCaret(sel.RangeMain().caret, SelectionPosition(Sci::invalidPosition), true, caretPolicies);
+
+	// Invalidate the new state of the selection
+	InvalidateWholeSelection();
+
+	SetLastXChosen();
+	return 0;
+}
+
+int Editor::KeyCommand(Message iMessage) {
+	switch (iMessage) {
+	case Message::LineDown:
+		CursorUpOrDown(1, Selection::SelTypes::none);
+		break;
+	case Message::LineDownExtend:
+		CursorUpOrDown(1, Selection::SelTypes::stream);
+		break;
+	case Message::LineDownRectExtend:
+		CursorUpOrDown(1, Selection::SelTypes::rectangle);
+		break;
+	case Message::ParaDown:
+		ParaUpOrDown(1, Selection::SelTypes::none);
+		break;
+	case Message::ParaDownExtend:
+		ParaUpOrDown(1, Selection::SelTypes::stream);
+		break;
+	case Message::LineScrollDown:
+		ScrollTo(topLine + 1);
+		MoveCaretInsideView(false);
+		break;
+	case Message::LineUp:
+		CursorUpOrDown(-1, Selection::SelTypes::none);
+		break;
+	case Message::LineUpExtend:
+		CursorUpOrDown(-1, Selection::SelTypes::stream);
+		break;
+	case Message::LineUpRectExtend:
+		CursorUpOrDown(-1, Selection::SelTypes::rectangle);
+		break;
+	case Message::ParaUp:
+		ParaUpOrDown(-1, Selection::SelTypes::none);
+		break;
+	case Message::ParaUpExtend:
+		ParaUpOrDown(-1, Selection::SelTypes::stream);
+		break;
+	case Message::LineScrollUp:
+		ScrollTo(topLine - 1);
+		MoveCaretInsideView(false);
+		break;
+
+	case Message::CharLeft:
+	case Message::CharLeftExtend:
+	case Message::CharLeftRectExtend:
+	case Message::CharRight:
+	case Message::CharRightExtend:
+	case Message::CharRightRectExtend:
+	case Message::WordLeft:
+	case Message::WordLeftExtend:
+	case Message::WordRight:
+	case Message::WordRightExtend:
+	case Message::WordLeftEnd:
+	case Message::WordLeftEndExtend:
+	case Message::WordRightEnd:
+	case Message::WordRightEndExtend:
+	case Message::WordPartLeft:
+	case Message::WordPartLeftExtend:
+	case Message::WordPartRight:
+	case Message::WordPartRightExtend:
+	case Message::Home:
+	case Message::HomeExtend:
+	case Message::HomeRectExtend:
+	case Message::HomeDisplay:
+	case Message::HomeDisplayExtend:
+	case Message::HomeWrap:
+	case Message::HomeWrapExtend:
+	case Message::VCHome:
+	case Message::VCHomeExtend:
+	case Message::VCHomeRectExtend:
+	case Message::VCHomeDisplay:
+	case Message::VCHomeDisplayExtend:
+	case Message::VCHomeWrap:
+	case Message::VCHomeWrapExtend:
+	case Message::LineEnd:
+	case Message::LineEndExtend:
+	case Message::LineEndRectExtend:
+	case Message::LineEndDisplay:
+	case Message::LineEndDisplayExtend:
+	case Message::LineEndWrap:
+	case Message::LineEndWrapExtend:
+		return HorizontalMove(iMessage);
+
+	case Message::DocumentStart:
+		MovePositionTo(0);
+		SetLastXChosen();
+		break;
+	case Message::DocumentStartExtend:
+		MovePositionTo(0, Selection::SelTypes::stream);
+		SetLastXChosen();
+		break;
+	case Message::DocumentEnd:
+		MovePositionTo(pdoc->Length());
+		SetLastXChosen();
+		break;
+	case Message::DocumentEndExtend:
+		MovePositionTo(pdoc->Length(), Selection::SelTypes::stream);
+		SetLastXChosen();
+		break;
+	case Message::StutteredPageUp:
+		PageMove(-1, Selection::SelTypes::none, true);
+		break;
+	case Message::StutteredPageUpExtend:
+		PageMove(-1, Selection::SelTypes::stream, true);
+		break;
+	case Message::StutteredPageDown:
+		PageMove(1, Selection::SelTypes::none, true);
+		break;
+	case Message::StutteredPageDownExtend:
+		PageMove(1, Selection::SelTypes::stream, true);
+		break;
+	case Message::PageUp:
+		PageMove(-1);
+		break;
+	case Message::PageUpExtend:
+		PageMove(-1, Selection::SelTypes::stream);
+		break;
+	case Message::PageUpRectExtend:
+		PageMove(-1, Selection::SelTypes::rectangle);
+		break;
+	case Message::PageDown:
+		PageMove(1);
+		break;
+	case Message::PageDownExtend:
+		PageMove(1, Selection::SelTypes::stream);
+		break;
+	case Message::PageDownRectExtend:
+		PageMove(1, Selection::SelTypes::rectangle);
+		break;
+	case Message::EditToggleOvertype:
+		inOverstrike = !inOverstrike;
+		ContainerNeedsUpdate(Update::Selection);
+		ShowCaretAtCurrentPosition();
+		SetIdle(true);
+		break;
+	case Message::Cancel:            	// Cancel any modes - handled in subclass
+		// Also unselect text
+		CancelModes();
+		if ((sel.Count() > 1) && !sel.IsRectangular()) {
+			// Drop additional selections
+			InvalidateWholeSelection();
+			sel.DropAdditionalRanges();
+		}
+		break;
+	case Message::DeleteBack:
+		DelCharBack(true);
+		if ((caretSticky == CaretSticky::Off) || (caretSticky == CaretSticky::WhiteSpace)) {
+			SetLastXChosen();
+		}
+		EnsureCaretVisible();
+		break;
+	case Message::DeleteBackNotLine:
+		DelCharBack(false);
+		if ((caretSticky == CaretSticky::Off) || (caretSticky == CaretSticky::WhiteSpace)) {
+			SetLastXChosen();
+		}
+		EnsureCaretVisible();
+		break;
+	case Message::Tab:
+		Indent(true);
+		if (caretSticky == CaretSticky::Off) {
+			SetLastXChosen();
+		}
+		EnsureCaretVisible();
+		ShowCaretAtCurrentPosition();		// Avoid blinking
+		break;
+	case Message::BackTab:
+		Indent(false);
+		if ((caretSticky == CaretSticky::Off) || (caretSticky == CaretSticky::WhiteSpace)) {
+			SetLastXChosen();
+		}
+		EnsureCaretVisible();
+		ShowCaretAtCurrentPosition();		// Avoid blinking
+		break;
+	case Message::NewLine:
+		NewLine();
+		break;
+	case Message::FormFeed:
+		AddChar('\f');
+		break;
+	case Message::ZoomIn:
+		if (vs.zoomLevel < 20) {
+			vs.zoomLevel++;
+			InvalidateStyleRedraw();
+			NotifyZoom();
+		}
+		break;
+	case Message::ZoomOut:
+		if (vs.zoomLevel > -10) {
+			vs.zoomLevel--;
+			InvalidateStyleRedraw();
+			NotifyZoom();
+		}
+		break;
+
+	case Message::DelWordLeft:
+	case Message::DelWordRight:
+	case Message::DelWordRightEnd:
+	case Message::DelLineLeft:
+	case Message::DelLineRight:
+		return DelWordOrLine(iMessage);
+
+	case Message::LineCopy: {
+			const Sci::Line lineStart = pdoc->SciLineFromPosition(SelectionStart().Position());
+			const Sci::Line lineEnd = pdoc->SciLineFromPosition(SelectionEnd().Position());
+			CopyRangeToClipboard(pdoc->LineStart(lineStart),
+				pdoc->LineStart(lineEnd + 1));
+		}
+		break;
+	case Message::LineCut: {
+			const Sci::Line lineStart = pdoc->SciLineFromPosition(SelectionStart().Position());
+			const Sci::Line lineEnd = pdoc->SciLineFromPosition(SelectionEnd().Position());
+			const Sci::Position start = pdoc->LineStart(lineStart);
+			const Sci::Position end = pdoc->LineStart(lineEnd + 1);
+			SetSelection(start, end);
+			Cut();
+			SetLastXChosen();
+		}
+		break;
+	case Message::LineDelete: {
+			const Sci::Line line = pdoc->SciLineFromPosition(sel.MainCaret());
+			const Sci::Position start = pdoc->LineStart(line);
+			const Sci::Position end = pdoc->LineStart(line + 1);
+			pdoc->DeleteChars(start, end - start);
+		}
+		break;
+	case Message::LineTranspose:
+		LineTranspose();
+		break;
+	case Message::LineReverse:
+		LineReverse();
+		break;
+	case Message::LineDuplicate:
+		Duplicate(true);
+		break;
+	case Message::SelectionDuplicate:
+		Duplicate(false);
+		break;
+	case Message::LowerCase:
+		ChangeCaseOfSelection(CaseMapping::lower);
+		break;
+	case Message::UpperCase:
+		ChangeCaseOfSelection(CaseMapping::upper);
+		break;
+	case Message::ScrollToStart:
+		ScrollTo(0);
+		break;
+	case Message::ScrollToEnd:
+		ScrollTo(MaxScrollPos());
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+int Editor::KeyDefault(Keys, KeyMod) {
+	return 0;
+}
+
+int Editor::KeyDownWithModifiers(Keys key, KeyMod modifiers, bool *consumed) {
+	DwellEnd(false);
+	const Message msg = kmap.Find(key, modifiers);
+	if (msg != static_cast<Message>(0)) {
+		if (consumed)
+			*consumed = true;
+		return static_cast<int>(WndProc(msg, 0, 0));
+	} else {
+		if (consumed)
+			*consumed = false;
+		return KeyDefault(key, modifiers);
+	}
+}
+
+void Editor::Indent(bool forwards) {
+	UndoGroup ug(pdoc);
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Line lineOfAnchor =
+			pdoc->SciLineFromPosition(sel.Range(r).anchor.Position());
+		Sci::Position caretPosition = sel.Range(r).caret.Position();
+		const Sci::Line lineCurrentPos = pdoc->SciLineFromPosition(caretPosition);
+		if (lineOfAnchor == lineCurrentPos) {
+			if (forwards) {
+				pdoc->DeleteChars(sel.Range(r).Start().Position(), sel.Range(r).Length());
+				caretPosition = sel.Range(r).caret.Position();
+				if (pdoc->GetColumn(caretPosition) <= pdoc->GetColumn(pdoc->GetLineIndentPosition(lineCurrentPos)) &&
+						pdoc->tabIndents) {
+					const int indentation = pdoc->GetLineIndentation(lineCurrentPos);
+					const int indentationStep = pdoc->IndentSize();
+					const Sci::Position posSelect = pdoc->SetLineIndentation(
+						lineCurrentPos, indentation + indentationStep - indentation % indentationStep);
+					sel.Range(r) = SelectionRange(posSelect);
+				} else {
+					if (pdoc->useTabs) {
+						const Sci::Position lengthInserted = pdoc->InsertString(caretPosition, "\t", 1);
+						sel.Range(r) = SelectionRange(caretPosition + lengthInserted);
+					} else {
+						int numSpaces = (pdoc->tabInChars) -
+								(pdoc->GetColumn(caretPosition) % (pdoc->tabInChars));
+						if (numSpaces < 1)
+							numSpaces = pdoc->tabInChars;
+						const std::string spaceText(numSpaces, ' ');
+						const Sci::Position lengthInserted = pdoc->InsertString(caretPosition, spaceText.c_str(),
+							spaceText.length());
+						sel.Range(r) = SelectionRange(caretPosition + lengthInserted);
+					}
+				}
+			} else {
+				if (pdoc->GetColumn(caretPosition) <= pdoc->GetLineIndentation(lineCurrentPos) &&
+						pdoc->tabIndents) {
+					const int indentation = pdoc->GetLineIndentation(lineCurrentPos);
+					const int indentationStep = pdoc->IndentSize();
+					const Sci::Position posSelect = pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationStep);
+					sel.Range(r) = SelectionRange(posSelect);
+				} else {
+					Sci::Position newColumn = ((pdoc->GetColumn(caretPosition) - 1) / pdoc->tabInChars) *
+							pdoc->tabInChars;
+					if (newColumn < 0)
+						newColumn = 0;
+					Sci::Position newPos = caretPosition;
+					while (pdoc->GetColumn(newPos) > newColumn)
+						newPos--;
+					sel.Range(r) = SelectionRange(newPos);
+				}
+			}
+		} else {	// Multiline
+			const Sci::Position anchorPosOnLine = sel.Range(r).anchor.Position() -
+				pdoc->LineStart(lineOfAnchor);
+			const Sci::Position currentPosPosOnLine = caretPosition -
+				pdoc->LineStart(lineCurrentPos);
+			// Multiple lines selected so indent / dedent
+			const Sci::Line lineTopSel = std::min(lineOfAnchor, lineCurrentPos);
+			Sci::Line lineBottomSel = std::max(lineOfAnchor, lineCurrentPos);
+			if (pdoc->LineStart(lineBottomSel) == sel.Range(r).anchor.Position() || pdoc->LineStart(lineBottomSel) == caretPosition)
+				lineBottomSel--;  	// If not selecting any characters on a line, do not indent
+			pdoc->Indent(forwards, lineBottomSel, lineTopSel);
+			if (lineOfAnchor < lineCurrentPos) {
+				if (currentPosPosOnLine == 0)
+					sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos),
+						pdoc->LineStart(lineOfAnchor));
+				else
+					sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos + 1),
+						pdoc->LineStart(lineOfAnchor));
+			} else {
+				if (anchorPosOnLine == 0)
+					sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos),
+						pdoc->LineStart(lineOfAnchor));
+				else
+					sel.Range(r) = SelectionRange(pdoc->LineStart(lineCurrentPos),
+						pdoc->LineStart(lineOfAnchor + 1));
+			}
+		}
+	}
+	ContainerNeedsUpdate(Update::Selection);
+}
+
+class CaseFolderASCII : public CaseFolderTable {
+public:
+	CaseFolderASCII() noexcept {
+		StandardASCII();
+	}
+};
+
+
+std::unique_ptr<CaseFolder> Editor::CaseFolderForEncoding() {
+	// Simple default that only maps ASCII upper case to lower case.
+	return std::make_unique<CaseFolderASCII>();
+}
+
+/**
+ * Search of a text in the document, in the given range.
+ * @return The position of the found text, -1 if not found.
+ */
+Sci::Position Editor::FindText(
+    uptr_t wParam,		///< Search modes : @c FindOption::MatchCase, @c FindOption::WholeWord,
+    ///< @c FindOption::WordStart, @c FindOption::RegExp or @c FindOption::Posix.
+    sptr_t lParam) {	///< @c Sci_TextToFind structure: The text to search for in the given range.
+
+	TextToFind *ft = static_cast<TextToFind *>(PtrFromSPtr(lParam));
+	Sci::Position lengthFound = strlen(ft->lpstrText);
+	if (!pdoc->HasCaseFolder())
+		pdoc->SetCaseFolder(CaseFolderForEncoding());
+	try {
+		const Sci::Position pos = pdoc->FindText(
+			static_cast<Sci::Position>(ft->chrg.cpMin),
+			static_cast<Sci::Position>(ft->chrg.cpMax),
+			ft->lpstrText,
+			static_cast<FindOption>(wParam),
+			&lengthFound);
+		if (pos != -1) {
+			ft->chrgText.cpMin = static_cast<Sci_PositionCR>(pos);
+			ft->chrgText.cpMax = static_cast<Sci_PositionCR>(pos + lengthFound);
+		}
+		return pos;
+	} catch (RegexError &) {
+		errorStatus = Status::RegEx;
+		return -1;
+	}
+}
+
+/**
+ * Relocatable search support : Searches relative to current selection
+ * point and sets the selection to the found text range with
+ * each search.
+ */
+/**
+ * Anchor following searches at current selection start: This allows
+ * multiple incremental interactive searches to be macro recorded
+ * while still setting the selection to found text so the find/select
+ * operation is self-contained.
+ */
+void Editor::SearchAnchor() {
+	searchAnchor = SelectionStart().Position();
+}
+
+/**
+ * Find text from current search anchor: Must call @c SearchAnchor first.
+ * Used for next text and previous text requests.
+ * @return The position of the found text, -1 if not found.
+ */
+Sci::Position Editor::SearchText(
+    Message iMessage,		///< Accepts both @c Message::SearchNext and @c Message::SearchPrev.
+    uptr_t wParam,				///< Search modes : @c FindOption::MatchCase, @c FindOption::WholeWord,
+    ///< @c FindOption::WordStart, @c FindOption::RegExp or @c FindOption::Posix.
+    sptr_t lParam) {			///< The text to search for.
+
+	const char *txt = CharPtrFromSPtr(lParam);
+	Sci::Position pos = Sci::invalidPosition;
+	Sci::Position lengthFound = strlen(txt);
+	if (!pdoc->HasCaseFolder())
+		pdoc->SetCaseFolder(CaseFolderForEncoding());
+	try {
+		if (iMessage == Message::SearchNext) {
+			pos = pdoc->FindText(searchAnchor, pdoc->Length(), txt,
+					static_cast<FindOption>(wParam),
+					&lengthFound);
+		} else {
+			pos = pdoc->FindText(searchAnchor, 0, txt,
+					static_cast<FindOption>(wParam),
+					&lengthFound);
+		}
+	} catch (RegexError &) {
+		errorStatus = Status::RegEx;
+		return Sci::invalidPosition;
+	}
+	if (pos != Sci::invalidPosition) {
+		SetSelection(pos, pos + lengthFound);
+	}
+
+	return pos;
+}
+
+std::string Editor::CaseMapString(const std::string &s, CaseMapping caseMapping) {
+	std::string ret(s);
+	for (char &ch : ret) {
+		switch (caseMapping) {
+			case CaseMapping::upper:
+				ch = MakeUpperCase(ch);
+				break;
+			case CaseMapping::lower:
+				ch = MakeLowerCase(ch);
+				break;
+			default:	// no action
+				break;
+		}
+	}
+	return ret;
+}
+
+/**
+ * Search for text in the target range of the document.
+ * @return The position of the found text, -1 if not found.
+ */
+Sci::Position Editor::SearchInTarget(const char *text, Sci::Position length) {
+	Sci::Position lengthFound = length;
+
+	if (!pdoc->HasCaseFolder())
+		pdoc->SetCaseFolder(CaseFolderForEncoding());
+	try {
+		const Sci::Position pos = pdoc->FindText(targetRange.start.Position(), targetRange.end.Position(), text,
+				searchFlags,
+				&lengthFound);
+		if (pos != -1) {
+			targetRange.start.SetPosition(pos);
+			targetRange.end.SetPosition(pos + lengthFound);
+		}
+		return pos;
+	} catch (RegexError &) {
+		errorStatus = Status::RegEx;
+		return -1;
+	}
+}
+
+void Editor::GoToLine(Sci::Line lineNo) {
+	if (lineNo > pdoc->LinesTotal())
+		lineNo = pdoc->LinesTotal();
+	if (lineNo < 0)
+		lineNo = 0;
+	SetEmptySelection(pdoc->LineStart(lineNo));
+	ShowCaretAtCurrentPosition();
+	EnsureCaretVisible();
+}
+
+static bool Close(Point pt1, Point pt2, Point threshold) noexcept {
+	const Point ptDifference = pt2 - pt1;
+	if (std::abs(ptDifference.x) > threshold.x)
+		return false;
+	if (std::abs(ptDifference.y) > threshold.y)
+		return false;
+	return true;
+}
+
+std::string Editor::RangeText(Sci::Position start, Sci::Position end) const {
+	if (start < end) {
+		const Sci::Position len = end - start;
+		std::string ret(len, '\0');
+		pdoc->GetCharRange(ret.data(), start, len);
+		return ret;
+	}
+	return std::string();
+}
+
+void Editor::CopySelectionRange(SelectionText *ss, bool allowLineCopy) {
+	if (sel.Empty()) {
+		if (allowLineCopy) {
+			const Sci::Line currentLine = pdoc->SciLineFromPosition(sel.MainCaret());
+			const Sci::Position start = pdoc->LineStart(currentLine);
+			const Sci::Position end = pdoc->LineEnd(currentLine);
+
+			std::string text = RangeText(start, end);
+			if (pdoc->eolMode != EndOfLine::Lf)
+				text.push_back('\r');
+			if (pdoc->eolMode != EndOfLine::Cr)
+				text.push_back('\n');
+			ss->Copy(text, pdoc->dbcsCodePage,
+				vs.styles[StyleDefault].characterSet, false, true);
+		}
+	} else {
+		std::string text;
+		std::vector<SelectionRange> rangesInOrder = sel.RangesCopy();
+		if (sel.selType == Selection::SelTypes::rectangle)
+			std::sort(rangesInOrder.begin(), rangesInOrder.end());
+		for (const SelectionRange &current : rangesInOrder) {
+				text.append(RangeText(current.Start().Position(), current.End().Position()));
+			if (sel.selType == Selection::SelTypes::rectangle) {
+				if (pdoc->eolMode != EndOfLine::Lf)
+					text.push_back('\r');
+				if (pdoc->eolMode != EndOfLine::Cr)
+					text.push_back('\n');
+			}
+		}
+		ss->Copy(text, pdoc->dbcsCodePage,
+			vs.styles[StyleDefault].characterSet, sel.IsRectangular(), sel.selType == Selection::SelTypes::lines);
+	}
+}
+
+void Editor::CopyRangeToClipboard(Sci::Position start, Sci::Position end) {
+	start = pdoc->ClampPositionIntoDocument(start);
+	end = pdoc->ClampPositionIntoDocument(end);
+	SelectionText selectedText;
+	std::string text = RangeText(start, end);
+	selectedText.Copy(text,
+		pdoc->dbcsCodePage, vs.styles[StyleDefault].characterSet, false, false);
+	CopyToClipboard(selectedText);
+}
+
+void Editor::CopyText(size_t length, const char *text) {
+	SelectionText selectedText;
+	selectedText.Copy(std::string(text, length),
+		pdoc->dbcsCodePage, vs.styles[StyleDefault].characterSet, false, false);
+	CopyToClipboard(selectedText);
+}
+
+void Editor::SetDragPosition(SelectionPosition newPos) {
+	if (newPos.Position() >= 0) {
+		newPos = MovePositionOutsideChar(newPos, 1);
+		posDrop = newPos;
+	}
+	if (!(posDrag == newPos)) {
+		const CaretPolicies dragCaretPolicies = {
+			CaretPolicySlop(CaretPolicy::Slop | CaretPolicy::Strict | CaretPolicy::Even, 50),
+			CaretPolicySlop(CaretPolicy::Slop | CaretPolicy::Strict | CaretPolicy::Even, 2)
+		};
+		MovedCaret(newPos, posDrag, true, dragCaretPolicies);
+
+		caret.on = true;
+		FineTickerCancel(TickReason::caret);
+		if ((caret.active) && (caret.period > 0) && (newPos.Position() < 0))
+			FineTickerStart(TickReason::caret, caret.period, caret.period/10);
+		InvalidateCaret();
+		posDrag = newPos;
+		InvalidateCaret();
+	}
+}
+
+void Editor::DisplayCursor(Window::Cursor c) {
+	if (cursorMode == CursorShape::Normal)
+		wMain.SetCursor(c);
+	else
+		wMain.SetCursor(static_cast<Window::Cursor>(cursorMode));
+}
+
+bool Editor::DragThreshold(Point ptStart, Point ptNow) {
+	const Point ptDiff = ptStart - ptNow;
+	const XYPOSITION distanceSquared = ptDiff.x * ptDiff.x + ptDiff.y * ptDiff.y;
+	return distanceSquared > 16.0f;
+}
+
+void Editor::StartDrag() {
+	// Always handled by subclasses
+	//SetMouseCapture(true);
+	//DisplayCursor(Windows::Cursor::Arrow);
+}
+
+void Editor::DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular) {
+	//Platform::DebugPrintf("DropAt %d %d\n", inDragDrop, position);
+	if (inDragDrop == DragDrop::dragging)
+		dropWentOutside = false;
+
+	const bool positionWasInSelection = PositionInSelection(position.Position());
+
+	const bool positionOnEdgeOfSelection =
+	    (position == SelectionStart()) || (position == SelectionEnd());
+
+	if ((inDragDrop != DragDrop::dragging) || !(positionWasInSelection) ||
+	        (positionOnEdgeOfSelection && !moving)) {
+
+		const SelectionPosition selStart = SelectionStart();
+		const SelectionPosition selEnd = SelectionEnd();
+
+		UndoGroup ug(pdoc);
+
+		SelectionPosition positionAfterDeletion = position;
+		if ((inDragDrop == DragDrop::dragging) && moving) {
+			// Remove dragged out text
+			if (rectangular || sel.selType == Selection::SelTypes::lines) {
+				for (size_t r=0; r<sel.Count(); r++) {
+					if (position >= sel.Range(r).Start()) {
+						if (position > sel.Range(r).End()) {
+							positionAfterDeletion.Add(-sel.Range(r).Length());
+						} else {
+							positionAfterDeletion.Add(-SelectionRange(position, sel.Range(r).Start()).Length());
+						}
+					}
+				}
+			} else {
+				if (position > selStart) {
+					positionAfterDeletion.Add(-SelectionRange(selEnd, selStart).Length());
+				}
+			}
+			ClearSelection();
+		}
+		position = positionAfterDeletion;
+
+		std::string convertedText = Document::TransformLineEnds(value, lengthValue, pdoc->eolMode);
+
+		if (rectangular) {
+			PasteRectangular(position, convertedText.c_str(), convertedText.length());
+			// Should try to select new rectangle but it may not be a rectangle now so just select the drop position
+			SetEmptySelection(position);
+		} else {
+			position = MovePositionOutsideChar(position, sel.MainCaret() - position.Position());
+			position = RealizeVirtualSpace(position);
+			const Sci::Position lengthInserted = pdoc->InsertString(
+				position.Position(), convertedText.c_str(), convertedText.length());
+			if (lengthInserted > 0) {
+				SelectionPosition posAfterInsertion = position;
+				posAfterInsertion.Add(lengthInserted);
+				SetSelection(posAfterInsertion, position);
+			}
+		}
+	} else if (inDragDrop == DragDrop::dragging) {
+		SetEmptySelection(position);
+	}
+}
+
+void Editor::DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular) {
+	DropAt(position, value, strlen(value), moving, rectangular);
+}
+
+/**
+ * @return true if given position is inside the selection,
+ */
+bool Editor::PositionInSelection(Sci::Position pos) {
+	pos = MovePositionOutsideChar(pos, sel.MainCaret() - pos);
+	for (size_t r=0; r<sel.Count(); r++) {
+		if (sel.Range(r).Contains(pos))
+			return true;
+	}
+	return false;
+}
+
+bool Editor::PointInSelection(Point pt) {
+	const SelectionPosition pos = SPositionFromLocation(pt, false, true);
+	const Point ptPos = LocationFromPosition(pos);
+	for (size_t r=0; r<sel.Count(); r++) {
+		const SelectionRange &range = sel.Range(r);
+		if (range.Contains(pos)) {
+			bool hit = true;
+			if (pos == range.Start()) {
+				// see if just before selection
+				if (pt.x < ptPos.x) {
+					hit = false;
+				}
+			}
+			if (pos == range.End()) {
+				// see if just after selection
+				if (pt.x > ptPos.x) {
+					hit = false;
+				}
+			}
+			if (hit)
+				return true;
+		}
+	}
+	return false;
+}
+
+bool Editor::PointInSelMargin(Point pt) const {
+	// Really means: "Point in a margin"
+	if (vs.fixedColumnWidth > 0) {	// There is a margin
+		PRectangle rcSelMargin = GetClientRectangle();
+		rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - vs.leftMarginWidth);
+		rcSelMargin.left = static_cast<XYPOSITION>(vs.textStart - vs.fixedColumnWidth);
+		const Point ptOrigin = GetVisibleOriginInMain();
+		rcSelMargin.Move(0, -ptOrigin.y);
+		return rcSelMargin.ContainsWholePixel(pt);
+	} else {
+		return false;
+	}
+}
+
+Window::Cursor Editor::GetMarginCursor(Point pt) const noexcept {
+	int x = 0;
+	for (const MarginStyle &m : vs.ms) {
+		if ((pt.x >= x) && (pt.x < x + m.width))
+			return static_cast<Window::Cursor>(m.cursor);
+		x += m.width;
+	}
+	return Window::Cursor::reverseArrow;
+}
+
+void Editor::TrimAndSetSelection(Sci::Position currentPos_, Sci::Position anchor_) {
+	sel.TrimSelection(SelectionRange(currentPos_, anchor_));
+	SetSelection(currentPos_, anchor_);
+}
+
+void Editor::LineSelection(Sci::Position lineCurrentPos_, Sci::Position lineAnchorPos_, bool wholeLine) {
+	Sci::Position selCurrentPos;
+	Sci::Position selAnchorPos;
+	if (wholeLine) {
+		const Sci::Line lineCurrent_ = pdoc->SciLineFromPosition(lineCurrentPos_);
+		const Sci::Line lineAnchor_ = pdoc->SciLineFromPosition(lineAnchorPos_);
+		if (lineAnchorPos_ < lineCurrentPos_) {
+			selCurrentPos = pdoc->LineStart(lineCurrent_ + 1);
+			selAnchorPos = pdoc->LineStart(lineAnchor_);
+		} else if (lineAnchorPos_ > lineCurrentPos_) {
+			selCurrentPos = pdoc->LineStart(lineCurrent_);
+			selAnchorPos = pdoc->LineStart(lineAnchor_ + 1);
+		} else { // Same line, select it
+			selCurrentPos = pdoc->LineStart(lineAnchor_ + 1);
+			selAnchorPos = pdoc->LineStart(lineAnchor_);
+		}
+	} else {
+		if (lineAnchorPos_ < lineCurrentPos_) {
+			selCurrentPos = StartEndDisplayLine(lineCurrentPos_, false) + 1;
+			selCurrentPos = pdoc->MovePositionOutsideChar(selCurrentPos, 1);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, true);
+		} else if (lineAnchorPos_ > lineCurrentPos_) {
+			selCurrentPos = StartEndDisplayLine(lineCurrentPos_, true);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, false) + 1;
+			selAnchorPos = pdoc->MovePositionOutsideChar(selAnchorPos, 1);
+		} else { // Same line, select it
+			selCurrentPos = StartEndDisplayLine(lineAnchorPos_, false) + 1;
+			selCurrentPos = pdoc->MovePositionOutsideChar(selCurrentPos, 1);
+			selAnchorPos = StartEndDisplayLine(lineAnchorPos_, true);
+		}
+	}
+	TrimAndSetSelection(selCurrentPos, selAnchorPos);
+}
+
+void Editor::WordSelection(Sci::Position pos) {
+	if (pos < wordSelectAnchorStartPos) {
+		// Extend backward to the word containing pos.
+		// Skip ExtendWordSelect if the line is empty or if pos is after the last character.
+		// This ensures that a series of empty lines isn't counted as a single "word".
+		if (!pdoc->IsLineEndPosition(pos))
+			pos = pdoc->ExtendWordSelect(pdoc->MovePositionOutsideChar(pos + 1, 1), -1);
+		TrimAndSetSelection(pos, wordSelectAnchorEndPos);
+	} else if (pos > wordSelectAnchorEndPos) {
+		// Extend forward to the word containing the character to the left of pos.
+		// Skip ExtendWordSelect if the line is empty or if pos is the first position on the line.
+		// This ensures that a series of empty lines isn't counted as a single "word".
+		if (pos > pdoc->LineStart(pdoc->LineFromPosition(pos)))
+			pos = pdoc->ExtendWordSelect(pdoc->MovePositionOutsideChar(pos - 1, -1), 1);
+		TrimAndSetSelection(pos, wordSelectAnchorStartPos);
+	} else {
+		// Select only the anchored word
+		if (pos >= originalAnchorPos)
+			TrimAndSetSelection(wordSelectAnchorEndPos, wordSelectAnchorStartPos);
+		else
+			TrimAndSetSelection(wordSelectAnchorStartPos, wordSelectAnchorEndPos);
+	}
+}
+
+void Editor::DwellEnd(bool mouseMoved) {
+	if (mouseMoved)
+		ticksToDwell = dwellDelay;
+	else
+		ticksToDwell = TimeForever;
+	if (dwelling && (dwellDelay < TimeForever)) {
+		dwelling = false;
+		NotifyDwelling(ptMouseLast, dwelling);
+	}
+	FineTickerCancel(TickReason::dwell);
+}
+
+void Editor::MouseLeave() {
+	SetHotSpotRange(nullptr);
+	SetHoverIndicatorPosition(Sci::invalidPosition);
+	if (!HaveMouseCapture()) {
+		ptMouseLast = Point(-1, -1);
+		DwellEnd(true);
+	}
+}
+
+static constexpr bool AllowVirtualSpace(VirtualSpace virtualSpaceOptions, bool rectangular) noexcept {
+	return (!rectangular && (FlagSet(virtualSpaceOptions, VirtualSpace::UserAccessible)))
+		|| (rectangular && (FlagSet(virtualSpaceOptions, VirtualSpace::RectangularSelection)));
+}
+
+void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, KeyMod modifiers) {
+	SetHoverIndicatorPoint(pt);
+	//Platform::DebugPrintf("ButtonDown %d %d = %d alt=%d %d\n", curTime, lastClickTime, curTime - lastClickTime, alt, inDragDrop);
+	ptMouseLast = pt;
+	const bool ctrl = FlagSet(modifiers, KeyMod::Ctrl);
+	const bool shift = FlagSet(modifiers, KeyMod::Shift);
+	const bool alt = FlagSet(modifiers, KeyMod::Alt);
+	SelectionPosition newPos = SPositionFromLocation(pt, false, false, AllowVirtualSpace(virtualSpaceOptions, alt));
+	newPos = MovePositionOutsideChar(newPos, sel.MainCaret() - newPos.Position());
+	SelectionPosition newCharPos = SPositionFromLocation(pt, false, true, false);
+	newCharPos = MovePositionOutsideChar(newCharPos, -1);
+	inDragDrop = DragDrop::none;
+	sel.SetMoveExtends(false);
+
+	if (NotifyMarginClick(pt, modifiers))
+		return;
+
+	NotifyIndicatorClick(true, newPos.Position(), modifiers);
+
+	const bool inSelMargin = PointInSelMargin(pt);
+	// In margin ctrl+(double)click should always select everything
+	if (ctrl && inSelMargin) {
+		SelectAll();
+		lastClickTime = curTime;
+		lastClick = pt;
+		return;
+	}
+	if (shift && !inSelMargin) {
+		SetSelection(newPos);
+	}
+	if ((curTime < (lastClickTime+Platform::DoubleClickTime())) && Close(pt, lastClick, doubleClickCloseThreshold)) {
+		//Platform::DebugPrintf("Double click %d %d = %d\n", curTime, lastClickTime, curTime - lastClickTime);
+		SetMouseCapture(true);
+		FineTickerStart(TickReason::scroll, 100, 10);
+		if (!ctrl || !multipleSelection || (selectionUnit != TextUnit::character && selectionUnit != TextUnit::word))
+			SetEmptySelection(newPos.Position());
+		bool doubleClick = false;
+		if (inSelMargin) {
+			// Inside margin selection type should be either subLine or wholeLine.
+			if (selectionUnit == TextUnit::subLine) {
+				// If it is subLine, we're inside a *double* click and word wrap is enabled,
+				// so we switch to wholeLine in order to select whole line.
+				selectionUnit = TextUnit::wholeLine;
+			} else if (selectionUnit != TextUnit::subLine && selectionUnit != TextUnit::wholeLine) {
+				// If it is neither, reset selection type to line selection.
+				selectionUnit = (Wrapping() && (FlagSet(marginOptions, MarginOption::SubLineSelect))) ? TextUnit::subLine : TextUnit::wholeLine;
+			}
+		} else {
+			if (selectionUnit == TextUnit::character) {
+				selectionUnit = TextUnit::word;
+				doubleClick = true;
+			} else if (selectionUnit == TextUnit::word) {
+				// Since we ended up here, we're inside a *triple* click, which should always select
+				// whole line regardless of word wrap being enabled or not.
+				selectionUnit = TextUnit::wholeLine;
+			} else {
+				selectionUnit = TextUnit::character;
+				originalAnchorPos = sel.MainCaret();
+			}
+		}
+
+		if (selectionUnit == TextUnit::word) {
+			Sci::Position charPos = originalAnchorPos;
+			if (sel.MainCaret() == originalAnchorPos) {
+				charPos = PositionFromLocation(pt, false, true);
+				charPos = MovePositionOutsideChar(charPos, -1);
+			}
+
+			Sci::Position startWord;
+			Sci::Position endWord;
+			if ((sel.MainCaret() >= originalAnchorPos) && !pdoc->IsLineEndPosition(charPos)) {
+				startWord = pdoc->ExtendWordSelect(pdoc->MovePositionOutsideChar(charPos + 1, 1), -1);
+				endWord = pdoc->ExtendWordSelect(charPos, 1);
+			} else {
+				// Selecting backwards, or anchor beyond last character on line. In these cases,
+				// we select the word containing the character to the *left* of the anchor.
+				if (charPos > pdoc->LineStart(pdoc->LineFromPosition(charPos))) {
+					startWord = pdoc->ExtendWordSelect(charPos, -1);
+					endWord = pdoc->ExtendWordSelect(startWord, 1);
+				} else {
+					// Anchor at start of line; select nothing to begin with.
+					startWord = charPos;
+					endWord = charPos;
+				}
+			}
+
+			wordSelectAnchorStartPos = startWord;
+			wordSelectAnchorEndPos = endWord;
+			wordSelectInitialCaretPos = sel.MainCaret();
+			WordSelection(wordSelectInitialCaretPos);
+		} else if (selectionUnit == TextUnit::subLine || selectionUnit == TextUnit::wholeLine) {
+			lineAnchorPos = newPos.Position();
+			LineSelection(lineAnchorPos, lineAnchorPos, selectionUnit == TextUnit::wholeLine);
+			//Platform::DebugPrintf("Triple click: %d - %d\n", anchor, currentPos);
+		} else {
+			SetEmptySelection(sel.MainCaret());
+		}
+		//Platform::DebugPrintf("Double click: %d - %d\n", anchor, currentPos);
+		if (doubleClick) {
+			NotifyDoubleClick(pt, modifiers);
+			if (PositionIsHotspot(newCharPos.Position()))
+				NotifyHotSpotDoubleClicked(newCharPos.Position(), modifiers);
+		}
+	} else {	// Single click
+		if (inSelMargin) {
+			if (sel.IsRectangular() || (sel.Count() > 1)) {
+				InvalidateWholeSelection();
+				sel.Clear();
+			}
+			sel.selType = Selection::SelTypes::stream;
+			if (!shift) {
+				// Single click in margin: select wholeLine or only subLine if word wrap is enabled
+				lineAnchorPos = newPos.Position();
+				selectionUnit = (Wrapping() && (FlagSet(marginOptions, MarginOption::SubLineSelect))) ? TextUnit::subLine : TextUnit::wholeLine;
+				LineSelection(lineAnchorPos, lineAnchorPos, selectionUnit == TextUnit::wholeLine);
+			} else {
+				// Single shift+click in margin: select from line anchor to clicked line
+				if (sel.MainAnchor() > sel.MainCaret())
+					lineAnchorPos = sel.MainAnchor() - 1;
+				else
+					lineAnchorPos = sel.MainAnchor();
+				// Reset selection type if there is an empty selection.
+				// This ensures that we don't end up stuck in previous selection mode, which is no longer valid.
+				// Otherwise, if there's a non empty selection, reset selection type only if it differs from selSubLine and selWholeLine.
+				// This ensures that we continue selecting in the same selection mode.
+				if (sel.Empty() || (selectionUnit != TextUnit::subLine && selectionUnit != TextUnit::wholeLine))
+					selectionUnit = (Wrapping() && (FlagSet(marginOptions, MarginOption::SubLineSelect))) ? TextUnit::subLine : TextUnit::wholeLine;
+				LineSelection(newPos.Position(), lineAnchorPos, selectionUnit == TextUnit::wholeLine);
+			}
+
+			SetDragPosition(SelectionPosition(Sci::invalidPosition));
+			SetMouseCapture(true);
+			FineTickerStart(TickReason::scroll, 100, 10);
+		} else {
+			if (PointIsHotspot(pt)) {
+				NotifyHotSpotClicked(newCharPos.Position(), modifiers);
+				hotSpotClickPos = newCharPos.Position();
+			}
+			if (!shift) {
+				if (PointInSelection(pt) && !SelectionEmpty())
+					inDragDrop = DragDrop::initial;
+				else
+					inDragDrop = DragDrop::none;
+			}
+			SetMouseCapture(true);
+			FineTickerStart(TickReason::scroll, 100, 10);
+			if (inDragDrop != DragDrop::initial) {
+				SetDragPosition(SelectionPosition(Sci::invalidPosition));
+				if (!shift) {
+					if (ctrl && multipleSelection) {
+						const SelectionRange range(newPos);
+						sel.TentativeSelection(range);
+						InvalidateSelection(range, true);
+					} else {
+						InvalidateSelection(SelectionRange(newPos), true);
+						if (sel.Count() > 1)
+							Redraw();
+						if ((sel.Count() > 1) || (sel.selType != Selection::SelTypes::stream))
+							sel.Clear();
+						sel.selType = alt ? Selection::SelTypes::rectangle : Selection::SelTypes::stream;
+						SetSelection(newPos, newPos);
+					}
+				}
+				SelectionPosition anchorCurrent = newPos;
+				if (shift)
+					anchorCurrent = sel.IsRectangular() ?
+						sel.Rectangular().anchor : sel.RangeMain().anchor;
+				sel.selType = alt ? Selection::SelTypes::rectangle : Selection::SelTypes::stream;
+				selectionUnit = TextUnit::character;
+				originalAnchorPos = sel.MainCaret();
+				sel.Rectangular() = SelectionRange(newPos, anchorCurrent);
+				SetRectangularRange();
+			}
+		}
+	}
+	lastClickTime = curTime;
+	lastClick = pt;
+	lastXChosen = static_cast<int>(pt.x) + xOffset;
+	ShowCaretAtCurrentPosition();
+}
+
+void Editor::RightButtonDownWithModifiers(Point pt, unsigned int, KeyMod modifiers) {
+	if (NotifyMarginRightClick(pt, modifiers))
+		return;
+}
+
+bool Editor::PositionIsHotspot(Sci::Position position) const {
+	return vs.styles[pdoc->StyleIndexAt(position)].hotspot;
+}
+
+bool Editor::PointIsHotspot(Point pt) {
+	const Sci::Position pos = PositionFromLocation(pt, true, true);
+	if (pos == Sci::invalidPosition)
+		return false;
+	return PositionIsHotspot(pos);
+}
+
+void Editor::SetHoverIndicatorPosition(Sci::Position position) {
+	const Sci::Position hoverIndicatorPosPrev = hoverIndicatorPos;
+	hoverIndicatorPos = Sci::invalidPosition;
+	if (!vs.indicatorsDynamic)
+		return;
+	if (position != Sci::invalidPosition) {
+		for (const IDecoration *deco : pdoc->decorations->View()) {
+			if (vs.indicators[deco->Indicator()].IsDynamic()) {
+				if (pdoc->decorations->ValueAt(deco->Indicator(), position)) {
+					hoverIndicatorPos = position;
+				}
+			}
+		}
+	}
+	if (hoverIndicatorPosPrev != hoverIndicatorPos) {
+		Redraw();
+	}
+}
+
+void Editor::SetHoverIndicatorPoint(Point pt) {
+	if (!vs.indicatorsDynamic) {
+		SetHoverIndicatorPosition(Sci::invalidPosition);
+	} else {
+		SetHoverIndicatorPosition(PositionFromLocation(pt, true, true));
+	}
+}
+
+void Editor::SetHotSpotRange(const Point *pt) {
+	if (pt) {
+		const Sci::Position pos = PositionFromLocation(*pt, false, true);
+
+		// If we don't limit this to word characters then the
+		// range can encompass more than the run range and then
+		// the underline will not be drawn properly.
+		Range hsNew;
+		hsNew.start = pdoc->ExtendStyleRange(pos, -1, hotspotSingleLine);
+		hsNew.end = pdoc->ExtendStyleRange(pos, 1, hotspotSingleLine);
+
+		// Only invalidate the range if the hotspot range has changed...
+		if (!(hsNew == hotspot)) {
+			if (hotspot.Valid()) {
+				InvalidateRange(hotspot.start, hotspot.end);
+			}
+			hotspot = hsNew;
+			InvalidateRange(hotspot.start, hotspot.end);
+		}
+	} else {
+		if (hotspot.Valid()) {
+			InvalidateRange(hotspot.start, hotspot.end);
+		}
+		hotspot = Range(Sci::invalidPosition);
+	}
+}
+
+Range Editor::GetHotSpotRange() const noexcept {
+	return hotspot;
+}
+
+void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, KeyMod modifiers) {
+	if (ptMouseLast != pt) {
+		DwellEnd(true);
+	}
+
+	SelectionPosition movePos = SPositionFromLocation(pt, false, false,
+		AllowVirtualSpace(virtualSpaceOptions, sel.IsRectangular()));
+	movePos = MovePositionOutsideChar(movePos, sel.MainCaret() - movePos.Position());
+
+	if (inDragDrop == DragDrop::initial) {
+		if (DragThreshold(ptMouseLast, pt)) {
+			SetMouseCapture(false);
+			FineTickerCancel(TickReason::scroll);
+			SetDragPosition(movePos);
+			CopySelectionRange(&drag);
+			StartDrag();
+		}
+		return;
+	}
+
+	ptMouseLast = pt;
+	PRectangle rcClient = GetClientRectangle();
+	const Point ptOrigin = GetVisibleOriginInMain();
+	rcClient.Move(0, -ptOrigin.y);
+	if ((dwellDelay < TimeForever) && rcClient.Contains(pt)) {
+		FineTickerStart(TickReason::dwell, dwellDelay, dwellDelay/10);
+	}
+	//Platform::DebugPrintf("Move %d %d\n", pt.x, pt.y);
+	if (HaveMouseCapture()) {
+
+		// Slow down autoscrolling/selection
+		autoScrollTimer.ticksToWait -= timer.tickSize;
+		if (autoScrollTimer.ticksToWait > 0)
+			return;
+		autoScrollTimer.ticksToWait = autoScrollDelay;
+
+		// Adjust selection
+		if (posDrag.IsValid()) {
+			SetDragPosition(movePos);
+		} else {
+			if (selectionUnit == TextUnit::character) {
+				if (sel.selType == Selection::SelTypes::stream && FlagSet(modifiers, KeyMod::Alt) && mouseSelectionRectangularSwitch) {
+					sel.selType = Selection::SelTypes::rectangle;
+				}
+				if (sel.IsRectangular()) {
+					sel.Rectangular() = SelectionRange(movePos, sel.Rectangular().anchor);
+					SetSelection(movePos, sel.RangeMain().anchor);
+				} else if (sel.Count() > 1) {
+					InvalidateSelection(sel.RangeMain(), false);
+					const SelectionRange range(movePos, sel.RangeMain().anchor);
+					sel.TentativeSelection(range);
+					InvalidateSelection(range, true);
+				} else {
+					SetSelection(movePos, sel.RangeMain().anchor);
+				}
+			} else if (selectionUnit == TextUnit::word) {
+				// Continue selecting by word
+				if (movePos.Position() == wordSelectInitialCaretPos) {  // Didn't move
+					// No need to do anything. Previously this case was lumped
+					// in with "Moved forward", but that can be harmful in this
+					// case: a handler for the NotifyDoubleClick re-adjusts
+					// the selection for a fancier definition of "word" (for
+					// example, in Perl it is useful to include the leading
+					// '$', '%' or '@' on variables for word selection). In this
+					// the ButtonMove() called via TickFor() for auto-scrolling
+					// could result in the fancier word selection adjustment
+					// being unmade.
+				} else {
+					wordSelectInitialCaretPos = -1;
+					WordSelection(movePos.Position());
+				}
+			} else {
+				// Continue selecting by line
+				LineSelection(movePos.Position(), lineAnchorPos, selectionUnit == TextUnit::wholeLine);
+			}
+		}
+
+		// Autoscroll
+		const Sci::Line lineMove = DisplayFromPosition(movePos.Position());
+		if (pt.y >= rcClient.bottom) {
+			ScrollTo(lineMove - LinesOnScreen() + 1);
+			Redraw();
+		} else if (pt.y < rcClient.top) {
+			ScrollTo(lineMove);
+			Redraw();
+		}
+		EnsureCaretVisible(false, false, true);
+
+		if (hotspot.Valid() && !PointIsHotspot(pt))
+			SetHotSpotRange(nullptr);
+
+		if (hotSpotClickPos != Sci::invalidPosition && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
+			if (inDragDrop == DragDrop::none) {
+				DisplayCursor(Window::Cursor::text);
+			}
+			hotSpotClickPos = Sci::invalidPosition;
+		}
+
+	} else {
+		if (vs.fixedColumnWidth > 0) {	// There is a margin
+			if (PointInSelMargin(pt)) {
+				DisplayCursor(GetMarginCursor(pt));
+				SetHotSpotRange(nullptr);
+				SetHoverIndicatorPosition(Sci::invalidPosition);
+				return; 	// No need to test for selection
+			}
+		}
+		// Display regular (drag) cursor over selection
+		if (PointInSelection(pt) && !SelectionEmpty()) {
+			DisplayCursor(Window::Cursor::arrow);
+			SetHoverIndicatorPosition(Sci::invalidPosition);
+		} else {
+			SetHoverIndicatorPoint(pt);
+			if (PointIsHotspot(pt)) {
+				DisplayCursor(Window::Cursor::hand);
+				SetHotSpotRange(&pt);
+			} else {
+				if (hoverIndicatorPos != Sci::invalidPosition)
+					DisplayCursor(Window::Cursor::hand);
+				else
+					DisplayCursor(Window::Cursor::text);
+				SetHotSpotRange(nullptr);
+			}
+		}
+	}
+}
+
+void Editor::ButtonUpWithModifiers(Point pt, unsigned int curTime, KeyMod modifiers) {
+	//Platform::DebugPrintf("ButtonUp %d %d\n", HaveMouseCapture(), inDragDrop);
+	SelectionPosition newPos = SPositionFromLocation(pt, false, false,
+		AllowVirtualSpace(virtualSpaceOptions, sel.IsRectangular()));
+	if (hoverIndicatorPos != Sci::invalidPosition)
+		InvalidateRange(newPos.Position(), newPos.Position() + 1);
+	newPos = MovePositionOutsideChar(newPos, sel.MainCaret() - newPos.Position());
+	if (inDragDrop == DragDrop::initial) {
+		inDragDrop = DragDrop::none;
+		SetEmptySelection(newPos);
+		selectionUnit = TextUnit::character;
+		originalAnchorPos = sel.MainCaret();
+	}
+	if (hotSpotClickPos != Sci::invalidPosition && PointIsHotspot(pt)) {
+		hotSpotClickPos = Sci::invalidPosition;
+		SelectionPosition newCharPos = SPositionFromLocation(pt, false, true, false);
+		newCharPos = MovePositionOutsideChar(newCharPos, -1);
+		NotifyHotSpotReleaseClick(newCharPos.Position(), modifiers & KeyMod::Ctrl);
+	}
+	if (HaveMouseCapture()) {
+		if (PointInSelMargin(pt)) {
+			DisplayCursor(GetMarginCursor(pt));
+		} else {
+			DisplayCursor(Window::Cursor::text);
+			SetHotSpotRange(nullptr);
+		}
+		ptMouseLast = pt;
+		SetMouseCapture(false);
+		FineTickerCancel(TickReason::scroll);
+		NotifyIndicatorClick(false, newPos.Position(), modifiers);
+		if (inDragDrop == DragDrop::dragging) {
+			const SelectionPosition selStart = SelectionStart();
+			const SelectionPosition selEnd = SelectionEnd();
+			if (selStart < selEnd) {
+				if (drag.Length()) {
+					const Sci::Position length = drag.Length();
+					if (FlagSet(modifiers, KeyMod::Ctrl)) {
+						const Sci::Position lengthInserted = pdoc->InsertString(
+							newPos.Position(), drag.Data(), length);
+						if (lengthInserted > 0) {
+							SetSelection(newPos.Position(), newPos.Position() + lengthInserted);
+						}
+					} else if (newPos < selStart) {
+						pdoc->DeleteChars(selStart.Position(), drag.Length());
+						const Sci::Position lengthInserted = pdoc->InsertString(
+							newPos.Position(), drag.Data(), length);
+						if (lengthInserted > 0) {
+							SetSelection(newPos.Position(), newPos.Position() + lengthInserted);
+						}
+					} else if (newPos > selEnd) {
+						pdoc->DeleteChars(selStart.Position(), drag.Length());
+						newPos.Add(-static_cast<Sci::Position>(drag.Length()));
+						const Sci::Position lengthInserted = pdoc->InsertString(
+							newPos.Position(), drag.Data(), length);
+						if (lengthInserted > 0) {
+							SetSelection(newPos.Position(), newPos.Position() + lengthInserted);
+						}
+					} else {
+						SetEmptySelection(newPos.Position());
+					}
+					drag.Clear();
+				}
+				selectionUnit = TextUnit::character;
+			}
+		} else {
+			if (selectionUnit == TextUnit::character) {
+				if (sel.Count() > 1) {
+					sel.RangeMain() =
+						SelectionRange(newPos, sel.Range(sel.Count() - 1).anchor);
+					InvalidateWholeSelection();
+				} else {
+					SetSelection(newPos, sel.RangeMain().anchor);
+				}
+			}
+			sel.CommitTentative();
+		}
+		SetRectangularRange();
+		lastClickTime = curTime;
+		lastClick = pt;
+		lastXChosen = static_cast<int>(pt.x) + xOffset;
+		if (sel.selType == Selection::SelTypes::stream) {
+			SetLastXChosen();
+		}
+		inDragDrop = DragDrop::none;
+		EnsureCaretVisible(false);
+	}
+}
+
+bool Editor::Idle() {
+	NotifyUpdateUI();
+
+	bool needWrap = Wrapping() && wrapPending.NeedsWrap();
+
+	if (needWrap) {
+		// Wrap lines during idle.
+		WrapLines(WrapScope::wsIdle);
+		// No more wrapping
+		needWrap = wrapPending.NeedsWrap();
+	} else if (needIdleStyling) {
+		IdleStyle();
+	}
+
+	// Add more idle things to do here, but make sure idleDone is
+	// set correctly before the function returns. returning
+	// false will stop calling this idle function until SetIdle() is
+	// called again.
+
+	const bool idleDone = !needWrap && !needIdleStyling; // && thatDone && theOtherThingDone...
+
+	return !idleDone;
+}
+
+void Editor::TickFor(TickReason reason) {
+	switch (reason) {
+		case TickReason::caret:
+			caret.on = !caret.on;
+			if (caret.active) {
+				InvalidateCaret();
+			}
+			break;
+		case TickReason::scroll:
+			// Auto scroll
+			ButtonMoveWithModifiers(ptMouseLast, 0, KeyMod::Norm);
+			break;
+		case TickReason::widen:
+			SetScrollBars();
+			FineTickerCancel(TickReason::widen);
+			break;
+		case TickReason::dwell:
+			if ((!HaveMouseCapture()) &&
+				(ptMouseLast.y >= 0)) {
+				dwelling = true;
+				NotifyDwelling(ptMouseLast, dwelling);
+			}
+			FineTickerCancel(TickReason::dwell);
+			break;
+		default:
+			// tickPlatform handled by subclass
+			break;
+	}
+}
+
+// FineTickerStart is be overridden by subclasses that support fine ticking so
+// this method should never be called.
+bool Editor::FineTickerRunning(TickReason) {
+	assert(false);
+	return false;
+}
+
+// FineTickerStart is be overridden by subclasses that support fine ticking so
+// this method should never be called.
+void Editor::FineTickerStart(TickReason, int, int) {
+	assert(false);
+}
+
+// FineTickerCancel is be overridden by subclasses that support fine ticking so
+// this method should never be called.
+void Editor::FineTickerCancel(TickReason) {
+	assert(false);
+}
+
+void Editor::SetFocusState(bool focusState) {
+	const bool changing = hasFocus != focusState;
+	hasFocus = focusState;
+	if (changing) {
+		Redraw();
+	}
+	NotifyFocus(hasFocus);
+	if (!hasFocus) {
+		CancelModes();
+	}
+	ShowCaretAtCurrentPosition();
+}
+
+void Editor::UpdateBaseElements() {
+	// Overridden by subclasses
+}
+
+Sci::Position Editor::PositionAfterArea(PRectangle rcArea) const {
+	// The start of the document line after the display line after the area
+	// This often means that the line after a modification is restyled which helps
+	// detect multiline comment additions and heals single line comments
+	const Sci::Line lineAfter = TopLineOfMain() + static_cast<Sci::Line>(rcArea.bottom - 1) / vs.lineHeight + 1;
+	if (lineAfter < pcs->LinesDisplayed())
+		return pdoc->LineStart(pcs->DocFromDisplay(lineAfter) + 1);
+	else
+		return pdoc->Length();
+}
+
+// Style to a position within the view. If this causes a change at end of last line then
+// affects later lines so style all the viewed text.
+void Editor::StyleToPositionInView(Sci::Position pos) {
+	Sci::Position endWindow = PositionAfterArea(GetClientDrawingRectangle());
+	if (pos > endWindow)
+		pos = endWindow;
+	const int styleAtEnd = pdoc->StyleIndexAt(pos-1);
+	pdoc->EnsureStyledTo(pos);
+	if ((endWindow > pos) && (styleAtEnd != pdoc->StyleIndexAt(pos-1))) {
+		// Style at end of line changed so is multi-line change like starting a comment
+		// so require rest of window to be styled.
+		DiscardOverdraw();	// Prepared bitmaps may be invalid
+		// DiscardOverdraw may have truncated client drawing area so recalculate endWindow
+		endWindow = PositionAfterArea(GetClientDrawingRectangle());
+		pdoc->EnsureStyledTo(endWindow);
+	}
+}
+
+Sci::Position Editor::PositionAfterMaxStyling(Sci::Position posMax, bool scrolling) const {
+	if (SynchronousStylingToVisible()) {
+		// Both states do not limit styling
+		return posMax;
+	}
+
+	// Try to keep time taken by styling reasonable so interaction remains smooth.
+	// When scrolling, allow less time to ensure responsive
+	const double secondsAllowed = scrolling ? 0.005 : 0.02;
+
+	const size_t actionsInAllowedTime = std::clamp<Sci::Line>(
+		pdoc->durationStyleOneByte.ActionsInAllowedTime(secondsAllowed),
+		0x200, 0x20000);
+	const Sci::Line lineLast = pdoc->LineFromPositionAfter(pdoc->SciLineFromPosition(pdoc->GetEndStyled()), actionsInAllowedTime);
+	const Sci::Line stylingMaxLine = std::min(lineLast, pdoc->LinesTotal());
+
+	return std::min(pdoc->LineStart(stylingMaxLine), posMax);
+}
+
+void Editor::StartIdleStyling(bool truncatedLastStyling) {
+	if ((idleStyling == IdleStyling::All) || (idleStyling == IdleStyling::AfterVisible)) {
+		if (pdoc->GetEndStyled() < pdoc->Length()) {
+			// Style remainder of document in idle time
+			needIdleStyling = true;
+		}
+	} else if (truncatedLastStyling) {
+		needIdleStyling = true;
+	}
+
+	if (needIdleStyling) {
+		SetIdle(true);
+	}
+}
+
+// Style for an area but bound the amount of styling to remain responsive
+void Editor::StyleAreaBounded(PRectangle rcArea, bool scrolling) {
+	const Sci::Position posAfterArea = PositionAfterArea(rcArea);
+	const Sci::Position posAfterMax = PositionAfterMaxStyling(posAfterArea, scrolling);
+	if (posAfterMax < posAfterArea) {
+		// Idle styling may be performed before current visible area
+		// Style a bit now then style further in idle time
+		pdoc->StyleToAdjustingLineDuration(posAfterMax);
+	} else {
+		// Can style all wanted now.
+		StyleToPositionInView(posAfterArea);
+	}
+	StartIdleStyling(posAfterMax < posAfterArea);
+}
+
+void Editor::IdleStyle() {
+	const Sci::Position posAfterArea = PositionAfterArea(GetClientRectangle());
+	const Sci::Position endGoal = (idleStyling >= IdleStyling::AfterVisible) ?
+		pdoc->Length() : posAfterArea;
+	const Sci::Position posAfterMax = PositionAfterMaxStyling(endGoal, false);
+	pdoc->StyleToAdjustingLineDuration(posAfterMax);
+	if (pdoc->GetEndStyled() >= endGoal) {
+		needIdleStyling = false;
+	}
+}
+
+void Editor::IdleWork() {
+	// Style the line after the modification as this allows modifications that change just the
+	// line of the modification to heal instead of propagating to the rest of the window.
+	if (FlagSet(workNeeded.items, WorkItems::style)) {
+		StyleToPositionInView(pdoc->LineStart(pdoc->LineFromPosition(workNeeded.upTo) + 2));
+	}
+	NotifyUpdateUI();
+	workNeeded.Reset();
+}
+
+void Editor::QueueIdleWork(WorkItems items, Sci::Position upTo) {
+	workNeeded.Need(items, upTo);
+}
+
+int Editor::SupportsFeature(Supports feature) {
+	AutoSurface surface(this);
+	return surface->SupportsFeature(feature);
+}
+
+bool Editor::PaintContains(PRectangle rc) {
+	if (rc.Empty()) {
+		return true;
+	} else {
+		return rcPaint.Contains(rc);
+	}
+}
+
+bool Editor::PaintContainsMargin() {
+	if (wMargin.GetID()) {
+		// With separate margin view, paint of text view
+		// never contains margin.
+		return false;
+	}
+	PRectangle rcSelMargin = GetClientRectangle();
+	rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart);
+	return PaintContains(rcSelMargin);
+}
+
+void Editor::CheckForChangeOutsidePaint(Range r) {
+	if (paintState == PaintState::painting && !paintingAllText) {
+		//Platform::DebugPrintf("Checking range in paint %d-%d\n", r.start, r.end);
+		if (!r.Valid())
+			return;
+
+		PRectangle rcRange = RectangleFromRange(r, 0);
+		const PRectangle rcText = GetTextRectangle();
+		if (rcRange.top < rcText.top) {
+			rcRange.top = rcText.top;
+		}
+		if (rcRange.bottom > rcText.bottom) {
+			rcRange.bottom = rcText.bottom;
+		}
+
+		if (!PaintContains(rcRange)) {
+			AbandonPaint();
+			paintAbandonedByStyling = true;
+		}
+	}
+}
+
+void Editor::SetBraceHighlight(Sci::Position pos0, Sci::Position pos1, int matchStyle) {
+	if ((pos0 != braces[0]) || (pos1 != braces[1]) || (matchStyle != bracesMatchStyle)) {
+		if ((braces[0] != pos0) || (matchStyle != bracesMatchStyle)) {
+			CheckForChangeOutsidePaint(Range(braces[0]));
+			CheckForChangeOutsidePaint(Range(pos0));
+			braces[0] = pos0;
+		}
+		if ((braces[1] != pos1) || (matchStyle != bracesMatchStyle)) {
+			CheckForChangeOutsidePaint(Range(braces[1]));
+			CheckForChangeOutsidePaint(Range(pos1));
+			braces[1] = pos1;
+		}
+		bracesMatchStyle = matchStyle;
+		if (paintState == PaintState::notPainting) {
+			Redraw();
+		}
+	}
+}
+
+void Editor::SetAnnotationHeights(Sci::Line start, Sci::Line end) {
+	if (vs.annotationVisible != AnnotationVisible::Hidden) {
+		RefreshStyleData();
+		bool changedHeight = false;
+		for (Sci::Line line=start; line<end && line<pdoc->LinesTotal(); line++) {
+			int linesWrapped = 1;
+			if (Wrapping()) {
+				AutoSurface surface(this);
+				std::shared_ptr<LineLayout> ll = view.RetrieveLineLayout(line, *this);
+				if (surface && ll) {
+					view.LayoutLine(*this, surface, vs, ll.get(), wrapWidth);
+					linesWrapped = ll->lines;
+				}
+			}
+			if (pcs->SetHeight(line, pdoc->AnnotationLines(line) + linesWrapped))
+				changedHeight = true;
+		}
+		if (changedHeight) {
+			Redraw();
+		}
+	}
+}
+
+void Editor::SetDocPointer(Document *document) {
+	//Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document);
+	pdoc->RemoveWatcher(this, nullptr);
+	pdoc->Release();
+	if (!document) {
+		pdoc = new Document(DocumentOption::Default);
+	} else {
+		pdoc = document;
+	}
+	pdoc->AddRef();
+	pcs = ContractionStateCreate(pdoc->IsLarge());
+
+	// Ensure all positions within document
+	sel.Clear();
+	targetRange = SelectionSegment();
+
+	braces[0] = Sci::invalidPosition;
+	braces[1] = Sci::invalidPosition;
+
+	vs.ReleaseAllExtendedStyles();
+
+	SetRepresentations();
+
+	// Reset the contraction state to fully shown.
+	pcs->Clear();
+	pcs->InsertLines(0, pdoc->LinesTotal() - 1);
+	SetAnnotationHeights(0, pdoc->LinesTotal());
+	view.llc.Deallocate();
+	NeedWrapping();
+
+	hotspot = Range(Sci::invalidPosition);
+	hoverIndicatorPos = Sci::invalidPosition;
+
+	view.ClearAllTabstops();
+
+	pdoc->AddWatcher(this, nullptr);
+	SetScrollBars();
+	Redraw();
+}
+
+void Editor::SetAnnotationVisible(AnnotationVisible visible) {
+	if (vs.annotationVisible != visible) {
+		const bool changedFromOrToHidden = ((vs.annotationVisible != AnnotationVisible::Hidden) != (visible != AnnotationVisible::Hidden));
+		vs.annotationVisible = visible;
+		if (changedFromOrToHidden) {
+			const int dir = (vs.annotationVisible!= AnnotationVisible::Hidden) ? 1 : -1;
+			for (Sci::Line line=0; line<pdoc->LinesTotal(); line++) {
+				const int annotationLines = pdoc->AnnotationLines(line);
+				if (annotationLines > 0) {
+					pcs->SetHeight(line, pcs->GetHeight(line) + annotationLines * dir);
+				}
+			}
+			SetScrollBars();
+		}
+		Redraw();
+	}
+}
+
+void Editor::SetEOLAnnotationVisible(EOLAnnotationVisible visible) {
+	if (vs.eolAnnotationVisible != visible) {
+		vs.eolAnnotationVisible = visible;
+		Redraw();
+	}
+}
+
+/**
+ * Recursively expand a fold, making lines visible except where they have an unexpanded parent.
+ */
+Sci::Line Editor::ExpandLine(Sci::Line line) {
+	const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
+	line++;
+	while (line <= lineMaxSubord) {
+		pcs->SetVisible(line, line, true);
+		const FoldLevel level = pdoc->GetFoldLevel(line);
+		if (LevelIsHeader(level)) {
+			if (pcs->GetExpanded(line)) {
+				line = ExpandLine(line);
+			} else {
+				line = pdoc->GetLastChild(line);
+			}
+		}
+		line++;
+	}
+	return lineMaxSubord;
+}
+
+void Editor::SetFoldExpanded(Sci::Line lineDoc, bool expanded) {
+	if (pcs->SetExpanded(lineDoc, expanded)) {
+		RedrawSelMargin();
+	}
+}
+
+void Editor::FoldLine(Sci::Line line, FoldAction action) {
+	if (line >= 0) {
+		if (action == FoldAction::Toggle) {
+			if (!LevelIsHeader(pdoc->GetFoldLevel(line))) {
+				line = pdoc->GetFoldParent(line);
+				if (line < 0)
+					return;
+			}
+			action = (pcs->GetExpanded(line)) ? FoldAction::Contract : FoldAction::Expand;
+		}
+
+		if (action == FoldAction::Contract) {
+			const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
+			if (lineMaxSubord > line) {
+				pcs->SetExpanded(line, false);
+				pcs->SetVisible(line + 1, lineMaxSubord, false);
+
+				const Sci::Line lineCurrent =
+					pdoc->SciLineFromPosition(sel.MainCaret());
+				if (lineCurrent > line && lineCurrent <= lineMaxSubord) {
+					// This does not re-expand the fold
+					EnsureCaretVisible();
+				}
+			}
+
+		} else {
+			if (!(pcs->GetVisible(line))) {
+				EnsureLineVisible(line, false);
+				GoToLine(line);
+			}
+			pcs->SetExpanded(line, true);
+			ExpandLine(line);
+		}
+
+		SetScrollBars();
+		Redraw();
+	}
+}
+
+void Editor::FoldExpand(Sci::Line line, FoldAction action, FoldLevel level) {
+	bool expanding = action == FoldAction::Expand;
+	if (action == FoldAction::Toggle) {
+		expanding = !pcs->GetExpanded(line);
+	}
+	// Ensure child lines lexed and fold information extracted before
+	// flipping the state.
+	pdoc->GetLastChild(line, LevelNumberPart(level));
+	SetFoldExpanded(line, expanding);
+	if (expanding && (pcs->HiddenLines() == 0))
+		// Nothing to do
+		return;
+	const Sci::Line lineMaxSubord = pdoc->GetLastChild(line, LevelNumberPart(level));
+	line++;
+	pcs->SetVisible(line, lineMaxSubord, expanding);
+	while (line <= lineMaxSubord) {
+		const FoldLevel levelLine = pdoc->GetFoldLevel(line);
+		if (LevelIsHeader(levelLine)) {
+			SetFoldExpanded(line, expanding);
+		}
+		line++;
+	}
+	SetScrollBars();
+	Redraw();
+}
+
+Sci::Line Editor::ContractedFoldNext(Sci::Line lineStart) const {
+	for (Sci::Line line = lineStart; line<pdoc->LinesTotal();) {
+		if (!pcs->GetExpanded(line) && LevelIsHeader(pdoc->GetFoldLevel(line)))
+			return line;
+		line = pcs->ContractedNext(line+1);
+		if (line < 0)
+			return -1;
+	}
+
+	return -1;
+}
+
+/**
+ * Recurse up from this line to find any folds that prevent this line from being visible
+ * and unfold them all.
+ */
+void Editor::EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy) {
+
+	// In case in need of wrapping to ensure DisplayFromDoc works.
+	if (lineDoc >= wrapPending.start) {
+		if (WrapLines(WrapScope::wsAll)) {
+			Redraw();
+		}
+	}
+
+	if (!pcs->GetVisible(lineDoc)) {
+		// Back up to find a non-blank line
+		Sci::Line lookLine = lineDoc;
+		FoldLevel lookLineLevel = pdoc->GetFoldLevel(lookLine);
+		while ((lookLine > 0) && LevelIsWhitespace(lookLineLevel)) {
+			lookLineLevel = pdoc->GetFoldLevel(--lookLine);
+		}
+		Sci::Line lineParent = pdoc->GetFoldParent(lookLine);
+		if (lineParent < 0) {
+			// Backed up to a top level line, so try to find parent of initial line
+			lineParent = pdoc->GetFoldParent(lineDoc);
+		}
+		if (lineParent >= 0) {
+			if (lineDoc != lineParent)
+				EnsureLineVisible(lineParent, enforcePolicy);
+			if (!pcs->GetExpanded(lineParent)) {
+				pcs->SetExpanded(lineParent, true);
+				ExpandLine(lineParent);
+			}
+		}
+		SetScrollBars();
+		Redraw();
+	}
+	if (enforcePolicy) {
+		const Sci::Line lineDisplay = pcs->DisplayFromDoc(lineDoc);
+		if (FlagSet(visiblePolicy.policy, VisiblePolicy::Slop)) {
+			if ((topLine > lineDisplay) || ((FlagSet(visiblePolicy.policy, VisiblePolicy::Strict)) && (topLine + visiblePolicy.slop > lineDisplay))) {
+				SetTopLine(std::clamp<Sci::Line>(lineDisplay - visiblePolicy.slop, 0, MaxScrollPos()));
+				SetVerticalScrollPos();
+				Redraw();
+			} else if ((lineDisplay > topLine + LinesOnScreen() - 1) ||
+			        ((FlagSet(visiblePolicy.policy, VisiblePolicy::Strict)) && (lineDisplay > topLine + LinesOnScreen() - 1 - visiblePolicy.slop))) {
+				SetTopLine(std::clamp<Sci::Line>(lineDisplay - LinesOnScreen() + 1 + visiblePolicy.slop, 0, MaxScrollPos()));
+				SetVerticalScrollPos();
+				Redraw();
+			}
+		} else {
+			if ((topLine > lineDisplay) || (lineDisplay > topLine + LinesOnScreen() - 1) || (FlagSet(visiblePolicy.policy, VisiblePolicy::Strict))) {
+				SetTopLine(std::clamp<Sci::Line>(lineDisplay - LinesOnScreen() / 2 + 1, 0, MaxScrollPos()));
+				SetVerticalScrollPos();
+				Redraw();
+			}
+		}
+	}
+}
+
+void Editor::FoldAll(FoldAction action) {
+	pdoc->EnsureStyledTo(pdoc->Length());
+	const Sci::Line maxLine = pdoc->LinesTotal();
+	bool expanding = action == FoldAction::Expand;
+	if (action == FoldAction::Toggle) {
+		// Discover current state
+		for (int lineSeek = 0; lineSeek < maxLine; lineSeek++) {
+			if (LevelIsHeader(pdoc->GetFoldLevel(lineSeek))) {
+				expanding = !pcs->GetExpanded(lineSeek);
+				break;
+			}
+		}
+	}
+	if (expanding) {
+		pcs->SetVisible(0, maxLine-1, true);
+		for (int line = 0; line < maxLine; line++) {
+			const FoldLevel levelLine = pdoc->GetFoldLevel(line);
+			if (LevelIsHeader(levelLine)) {
+				SetFoldExpanded(line, true);
+			}
+		}
+	} else {
+		for (Sci::Line line = 0; line < maxLine; line++) {
+			const FoldLevel level = pdoc->GetFoldLevel(line);
+			if (LevelIsHeader(level) &&
+					(FoldLevel::Base == LevelNumberPart(level))) {
+				SetFoldExpanded(line, false);
+				const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
+				if (lineMaxSubord > line) {
+					pcs->SetVisible(line + 1, lineMaxSubord, false);
+				}
+			}
+		}
+	}
+	SetScrollBars();
+	Redraw();
+}
+
+void Editor::FoldChanged(Sci::Line line, FoldLevel levelNow, FoldLevel levelPrev) {
+	if (LevelIsHeader(levelNow)) {
+		if (!LevelIsHeader(levelPrev)) {
+			// Adding a fold point.
+			if (pcs->SetExpanded(line, true)) {
+				RedrawSelMargin();
+			}
+			FoldExpand(line, FoldAction::Expand, levelPrev);
+		}
+	} else if (LevelIsHeader(levelPrev)) {
+		const Sci::Line prevLine = line - 1;
+		const FoldLevel prevLineLevel = pdoc->GetFoldLevel(prevLine);
+
+		// Combining two blocks where the first block is collapsed (e.g. by deleting the line(s) which separate(s) the two blocks)
+		if ((LevelNumber(prevLineLevel) == LevelNumber(levelNow)) && !pcs->GetVisible(prevLine))
+			FoldLine(pdoc->GetFoldParent(prevLine), FoldAction::Expand);
+
+		if (!pcs->GetExpanded(line)) {
+			// Removing the fold from one that has been contracted so should expand
+			// otherwise lines are left invisible with no way to make them visible
+			if (pcs->SetExpanded(line, true)) {
+				RedrawSelMargin();
+			}
+			// Combining two blocks where the second one is collapsed (e.g. by adding characters in the line which separates the two blocks)
+			FoldExpand(line, FoldAction::Expand, levelPrev);
+		}
+	}
+	if (!LevelIsWhitespace(levelNow) &&
+	        (LevelNumber(levelPrev) > LevelNumber(levelNow))) {
+		if (pcs->HiddenLines()) {
+			// See if should still be hidden
+			const Sci::Line parentLine = pdoc->GetFoldParent(line);
+			if ((parentLine < 0) || (pcs->GetExpanded(parentLine) && pcs->GetVisible(parentLine))) {
+				pcs->SetVisible(line, line, true);
+				SetScrollBars();
+				Redraw();
+			}
+		}
+	}
+
+	// Combining two blocks where the first one is collapsed (e.g. by adding characters in the line which separates the two blocks)
+	if (!LevelIsWhitespace(levelNow) && (LevelNumber(levelPrev) < LevelNumber(levelNow))) {
+		if (pcs->HiddenLines()) {
+			const Sci::Line parentLine = pdoc->GetFoldParent(line);
+			if (!pcs->GetExpanded(parentLine) && pcs->GetVisible(line))
+				FoldLine(parentLine, FoldAction::Expand);
+		}
+	}
+}
+
+void Editor::NeedShown(Sci::Position pos, Sci::Position len) {
+	if (FlagSet(foldAutomatic, AutomaticFold::Show)) {
+		const Sci::Line lineStart = pdoc->SciLineFromPosition(pos);
+		const Sci::Line lineEnd = pdoc->SciLineFromPosition(pos+len);
+		for (Sci::Line line = lineStart; line <= lineEnd; line++) {
+			EnsureLineVisible(line, false);
+		}
+	} else {
+		NotifyNeedShown(pos, len);
+	}
+}
+
+Sci::Position Editor::GetTag(char *tagValue, int tagNumber) {
+	const char *text = nullptr;
+	Sci::Position length = 0;
+	if ((tagNumber >= 1) && (tagNumber <= 9)) {
+		char name[3] = "\\?";
+		name[1] = static_cast<char>(tagNumber + '0');
+		length = 2;
+		text = pdoc->SubstituteByPosition(name, &length);
+	}
+	if (tagValue) {
+		if (text)
+			memcpy(tagValue, text, length + 1);
+		else
+			*tagValue = '\0';
+	}
+	return length;
+}
+
+Sci::Position Editor::ReplaceTarget(bool replacePatterns, const char *text, Sci::Position length) {
+	UndoGroup ug(pdoc);
+	if (length == -1)
+		length = strlen(text);
+	if (replacePatterns) {
+		text = pdoc->SubstituteByPosition(text, &length);
+		if (!text) {
+			return 0;
+		}
+	}
+
+	// Remove the text inside the range
+	if (targetRange.Length() > 0)
+		pdoc->DeleteChars(targetRange.start.Position(), targetRange.Length());
+	targetRange.end = targetRange.start;
+
+	// Realize virtual space of target start
+	const Sci::Position startAfterSpaceInsertion = RealizeVirtualSpace(targetRange.start.Position(), targetRange.start.VirtualSpace());
+	targetRange.start.SetPosition(startAfterSpaceInsertion);
+	targetRange.end = targetRange.start;
+
+	// Insert the new text
+	const Sci::Position lengthInserted = pdoc->InsertString(targetRange.start.Position(), text, length);
+	targetRange.end.SetPosition(targetRange.start.Position() + lengthInserted);
+	return length;
+}
+
+bool Editor::IsUnicodeMode() const noexcept {
+	return pdoc && (CpUtf8 == pdoc->dbcsCodePage);
+}
+
+int Editor::CodePage() const noexcept {
+	if (pdoc)
+		return pdoc->dbcsCodePage;
+	else
+		return 0;
+}
+
+Sci::Line Editor::WrapCount(Sci::Line line) {
+	AutoSurface surface(this);
+	std::shared_ptr<LineLayout> ll = view.RetrieveLineLayout(line, *this);
+
+	if (surface && ll) {
+		view.LayoutLine(*this, surface, vs, ll.get(), wrapWidth);
+		return ll->lines;
+	} else {
+		return 1;
+	}
+}
+
+void Editor::AddStyledText(const char *buffer, Sci::Position appendLength) {
+	// The buffer consists of alternating character bytes and style bytes
+	const Sci::Position textLength = appendLength / 2;
+	std::string text(textLength, '\0');
+	Sci::Position i;
+	for (i = 0; i < textLength; i++) {
+		text[i] = buffer[i*2];
+	}
+	const Sci::Position lengthInserted = pdoc->InsertString(CurrentPosition(), text.c_str(), textLength);
+	for (i = 0; i < textLength; i++) {
+		text[i] = buffer[i*2+1];
+	}
+	pdoc->StartStyling(CurrentPosition());
+	pdoc->SetStyles(textLength, text.c_str());
+	SetEmptySelection(sel.MainCaret() + lengthInserted);
+}
+
+bool Editor::ValidMargin(uptr_t wParam) const noexcept {
+	return wParam < vs.ms.size();
+}
+
+void Editor::StyleSetMessage(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	vs.EnsureStyle(wParam);
+	switch (iMessage) {
+	case Message::StyleSetFore:
+		vs.styles[wParam].fore = ColourRGBA::FromIpRGB(lParam);
+		break;
+	case Message::StyleSetBack:
+		vs.styles[wParam].back = ColourRGBA::FromIpRGB(lParam);
+		break;
+	case Message::StyleSetBold:
+		vs.styles[wParam].weight = lParam != 0 ? FontWeight::Bold : FontWeight::Normal;
+		break;
+	case Message::StyleSetWeight:
+		vs.styles[wParam].weight = static_cast<FontWeight>(lParam);
+		break;
+	case Message::StyleSetItalic:
+		vs.styles[wParam].italic = lParam != 0;
+		break;
+	case Message::StyleSetEOLFilled:
+		vs.styles[wParam].eolFilled = lParam != 0;
+		break;
+	case Message::StyleSetSize:
+		vs.styles[wParam].size = static_cast<int>(lParam * FontSizeMultiplier);
+		break;
+	case Message::StyleSetSizeFractional:
+		vs.styles[wParam].size = static_cast<int>(lParam);
+		break;
+	case Message::StyleSetFont:
+		if (lParam != 0) {
+			vs.SetStyleFontName(static_cast<int>(wParam), CharPtrFromSPtr(lParam));
+		}
+		break;
+	case Message::StyleSetUnderline:
+		vs.styles[wParam].underline = lParam != 0;
+		break;
+	case Message::StyleSetCase:
+		vs.styles[wParam].caseForce = static_cast<Style::CaseForce>(lParam);
+		break;
+	case Message::StyleSetCharacterSet:
+		vs.styles[wParam].characterSet = static_cast<CharacterSet>(lParam);
+		pdoc->SetCaseFolder(nullptr);
+		break;
+	case Message::StyleSetVisible:
+		vs.styles[wParam].visible = lParam != 0;
+		break;
+	case Message::StyleSetChangeable:
+		vs.styles[wParam].changeable = lParam != 0;
+		break;
+	case Message::StyleSetHotSpot:
+		vs.styles[wParam].hotspot = lParam != 0;
+		break;
+	default:
+		break;
+	}
+	InvalidateStyleRedraw();
+}
+
+sptr_t Editor::StyleGetMessage(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	vs.EnsureStyle(wParam);
+	switch (iMessage) {
+	case Message::StyleGetFore:
+		return vs.styles[wParam].fore.OpaqueRGB();
+	case Message::StyleGetBack:
+		return vs.styles[wParam].back.OpaqueRGB();
+	case Message::StyleGetBold:
+		return vs.styles[wParam].weight > FontWeight::Normal;
+	case Message::StyleGetWeight:
+		return static_cast<sptr_t>(vs.styles[wParam].weight);
+	case Message::StyleGetItalic:
+		return vs.styles[wParam].italic ? 1 : 0;
+	case Message::StyleGetEOLFilled:
+		return vs.styles[wParam].eolFilled ? 1 : 0;
+	case Message::StyleGetSize:
+		return vs.styles[wParam].size / FontSizeMultiplier;
+	case Message::StyleGetSizeFractional:
+		return vs.styles[wParam].size;
+	case Message::StyleGetFont:
+		return StringResult(lParam, vs.styles[wParam].fontName);
+	case Message::StyleGetUnderline:
+		return vs.styles[wParam].underline ? 1 : 0;
+	case Message::StyleGetCase:
+		return static_cast<int>(vs.styles[wParam].caseForce);
+	case Message::StyleGetCharacterSet:
+		return static_cast<sptr_t>(vs.styles[wParam].characterSet);
+	case Message::StyleGetVisible:
+		return vs.styles[wParam].visible ? 1 : 0;
+	case Message::StyleGetChangeable:
+		return vs.styles[wParam].changeable ? 1 : 0;
+	case Message::StyleGetHotSpot:
+		return vs.styles[wParam].hotspot ? 1 : 0;
+	default:
+		break;
+	}
+	return 0;
+}
+
+void Editor::SetSelectionNMessage(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	if (wParam >= sel.Count()) {
+		return;
+	}
+	InvalidateRange(sel.Range(wParam).Start().Position(), sel.Range(wParam).End().Position());
+
+	switch (iMessage) {
+	case Message::SetSelectionNCaret:
+		sel.Range(wParam).caret.SetPosition(lParam);
+		break;
+
+	case Message::SetSelectionNAnchor:
+		sel.Range(wParam).anchor.SetPosition(lParam);
+		break;
+
+	case Message::SetSelectionNCaretVirtualSpace:
+		sel.Range(wParam).caret.SetVirtualSpace(lParam);
+		break;
+
+	case Message::SetSelectionNAnchorVirtualSpace:
+		sel.Range(wParam).anchor.SetVirtualSpace(lParam);
+		break;
+
+	case Message::SetSelectionNStart:
+		sel.Range(wParam).anchor.SetPosition(lParam);
+		break;
+
+	case Message::SetSelectionNEnd:
+		sel.Range(wParam).caret.SetPosition(lParam);
+		break;
+
+	default:
+		break;
+
+	}
+
+	InvalidateRange(sel.Range(wParam).Start().Position(), sel.Range(wParam).End().Position());
+	ContainerNeedsUpdate(Update::Selection);
+}
+
+sptr_t Editor::StringResult(sptr_t lParam, const char *val) noexcept {
+	const size_t len = val ? strlen(val) : 0;
+	if (lParam) {
+		char *ptr = CharPtrFromSPtr(lParam);
+		if (val)
+			memcpy(ptr, val, len+1);
+		else
+			*ptr = 0;
+	}
+	return len;	// Not including NUL
+}
+
+sptr_t Editor::BytesResult(sptr_t lParam, const unsigned char *val, size_t len) noexcept {
+	// No NUL termination: len is number of valid/displayed bytes
+	if ((lParam) && (len > 0)) {
+		char *ptr = CharPtrFromSPtr(lParam);
+		if (val)
+			memcpy(ptr, val, len);
+		else
+			*ptr = 0;
+	}
+	return val ? len : 0;
+}
+
+sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	//Platform::DebugPrintf("S start wnd proc %d %d %d\n",iMessage, wParam, lParam);
+
+	// Optional macro recording hook
+	if (recordingMacro)
+		NotifyMacroRecord(iMessage, wParam, lParam);
+
+	switch (iMessage) {
+
+	case Message::GetText: {
+			if (lParam == 0)
+				return pdoc->Length() + 1;
+			if (wParam == 0)
+				return 0;
+			char *ptr = CharPtrFromSPtr(lParam);
+			const Sci_Position len = std::min<Sci_Position>(wParam - 1, pdoc->Length());
+			pdoc->GetCharRange(ptr, 0, len);
+			ptr[len] = '\0';
+			return len;
+		}
+
+	case Message::SetText: {
+			if (lParam == 0)
+				return 0;
+			UndoGroup ug(pdoc);
+			pdoc->DeleteChars(0, pdoc->Length());
+			SetEmptySelection(0);
+			const char *text = CharPtrFromSPtr(lParam);
+			pdoc->InsertString(0, text, strlen(text));
+			return 1;
+		}
+
+	case Message::GetTextLength:
+		return pdoc->Length();
+
+	case Message::Cut:
+		Cut();
+		SetLastXChosen();
+		break;
+
+	case Message::Copy:
+		Copy();
+		break;
+
+	case Message::CopyAllowLine:
+		CopyAllowLine();
+		break;
+
+	case Message::VerticalCentreCaret:
+		VerticalCentreCaret();
+		break;
+
+	case Message::MoveSelectedLinesUp:
+		MoveSelectedLinesUp();
+		break;
+
+	case Message::MoveSelectedLinesDown:
+		MoveSelectedLinesDown();
+		break;
+
+	case Message::CopyRange:
+		CopyRangeToClipboard(PositionFromUPtr(wParam), lParam);
+		break;
+
+	case Message::CopyText:
+		CopyText(wParam, CharPtrFromSPtr(lParam));
+		break;
+
+	case Message::Paste:
+		Paste();
+		if ((caretSticky == CaretSticky::Off) || (caretSticky == CaretSticky::WhiteSpace)) {
+			SetLastXChosen();
+		}
+		EnsureCaretVisible();
+		break;
+
+	case Message::ReplaceRectangular: {
+		UndoGroup ug(pdoc);
+		if (!sel.Empty()) {
+			ClearSelection(); // want to replace rectangular selection contents
+		}
+		InsertPasteShape(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam), PasteShape::rectangular);
+		break;
+	}
+
+	case Message::Clear:
+		Clear();
+		SetLastXChosen();
+		EnsureCaretVisible();
+		break;
+
+	case Message::Undo:
+		Undo();
+		SetLastXChosen();
+		break;
+
+	case Message::CanUndo:
+		return (pdoc->CanUndo() && !pdoc->IsReadOnly()) ? 1 : 0;
+
+	case Message::EmptyUndoBuffer:
+		pdoc->DeleteUndoHistory();
+		return 0;
+
+	case Message::GetFirstVisibleLine:
+		return topLine;
+
+	case Message::SetFirstVisibleLine:
+		ScrollTo(LineFromUPtr(wParam));
+		break;
+
+	case Message::GetLine: {	// Risk of overwriting the end of the buffer
+			const Sci::Position lineStart =
+				pdoc->LineStart(LineFromUPtr(wParam));
+			const Sci::Position lineEnd =
+				pdoc->LineStart(LineFromUPtr(wParam + 1));
+			// not NUL terminated
+			const Sci::Position len = lineEnd - lineStart;
+			if (lParam == 0) {
+				return len;
+			}
+			char *ptr = CharPtrFromSPtr(lParam);
+			pdoc->GetCharRange(ptr, lineStart, len);
+			return len;
+		}
+
+	case Message::GetLineCount:
+		if (pdoc->LinesTotal() == 0)
+			return 1;
+		else
+			return pdoc->LinesTotal();
+
+	case Message::AllocateLines:
+		pdoc->AllocateLines(wParam);
+		break;
+
+	case Message::GetModify:
+		return !pdoc->IsSavePoint();
+
+	case Message::SetSel: {
+			Sci::Position nStart = PositionFromUPtr(wParam);
+			Sci::Position nEnd = lParam;
+			if (nEnd < 0)
+				nEnd = pdoc->Length();
+			if (nStart < 0)
+				nStart = nEnd; 	// Remove selection
+			InvalidateSelection(SelectionRange(nStart, nEnd));
+			sel.Clear();
+			sel.selType = Selection::SelTypes::stream;
+			SetSelection(nEnd, nStart);
+			EnsureCaretVisible();
+		}
+		break;
+
+	case Message::GetSelText: {
+			SelectionText selectedText;
+			CopySelectionRange(&selectedText);
+			if (lParam == 0) {
+				return selectedText.LengthWithTerminator();
+			} else {
+				char *ptr = CharPtrFromSPtr(lParam);
+				size_t iChar = selectedText.Length();
+				if (iChar) {
+					memcpy(ptr, selectedText.Data(), iChar);
+					ptr[iChar++] = '\0';
+				} else {
+					ptr[0] = '\0';
+				}
+				return iChar;
+			}
+		}
+
+	case Message::LineFromPosition:
+		if (PositionFromUPtr(wParam) < 0)
+			return 0;
+		return pdoc->LineFromPosition(PositionFromUPtr(wParam));
+
+	case Message::PositionFromLine:
+		if (LineFromUPtr(wParam) < 0)
+			wParam = pdoc->LineFromPosition(SelectionStart().Position());
+		if (wParam == 0)
+			return 0; 	// Even if there is no text, there is a first line that starts at 0
+		if (LineFromUPtr(wParam) > pdoc->LinesTotal())
+			return -1;
+		//if (wParam > pdoc->LineFromPosition(pdoc->Length()))	// Useful test, anyway...
+		//	return -1;
+		return pdoc->LineStart(LineFromUPtr(wParam));
+
+		// Replacement of the old Scintilla interpretation of EM_LINELENGTH
+	case Message::LineLength:
+		if ((LineFromUPtr(wParam) < 0) ||
+		        (LineFromUPtr(wParam) > pdoc->LineFromPosition(pdoc->Length())))
+			return 0;
+		return pdoc->LineStart(LineFromUPtr(wParam) + 1) - pdoc->LineStart(LineFromUPtr(wParam));
+
+	case Message::ReplaceSel: {
+			if (lParam == 0)
+				return 0;
+			UndoGroup ug(pdoc);
+			ClearSelection();
+			const char *replacement = CharPtrFromSPtr(lParam);
+			const Sci::Position lengthInserted = pdoc->InsertString(
+				sel.MainCaret(), replacement, strlen(replacement));
+			SetEmptySelection(sel.MainCaret() + lengthInserted);
+			SetLastXChosen();
+			EnsureCaretVisible();
+		}
+		break;
+
+	case Message::SetTargetStart:
+		targetRange.start.SetPosition(PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetTargetStart:
+		return targetRange.start.Position();
+
+	case Message::SetTargetStartVirtualSpace:
+		targetRange.start.SetVirtualSpace(PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetTargetStartVirtualSpace:
+		return targetRange.start.VirtualSpace();
+
+	case Message::SetTargetEnd:
+		targetRange.end.SetPosition(PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetTargetEnd:
+		return targetRange.end.Position();
+
+	case Message::SetTargetEndVirtualSpace:
+		targetRange.end.SetVirtualSpace(PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetTargetEndVirtualSpace:
+		return targetRange.end.VirtualSpace();
+
+	case Message::SetTargetRange:
+		targetRange.start.SetPosition(PositionFromUPtr(wParam));
+		targetRange.end.SetPosition(lParam);
+		break;
+
+	case Message::TargetWholeDocument:
+		targetRange.start.SetPosition(0);
+		targetRange.end.SetPosition(pdoc->Length());
+		break;
+
+	case Message::TargetFromSelection:
+		targetRange.start = sel.RangeMain().Start();
+		targetRange.end = sel.RangeMain().End();
+		break;
+
+	case Message::GetTargetText: {
+			std::string text = RangeText(targetRange.start.Position(), targetRange.end.Position());
+			return BytesResult(lParam, reinterpret_cast<const unsigned char *>(text.c_str()), text.length());
+		}
+
+	case Message::ReplaceTarget:
+		PLATFORM_ASSERT(lParam);
+		return ReplaceTarget(false, CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+
+	case Message::ReplaceTargetRE:
+		PLATFORM_ASSERT(lParam);
+		return ReplaceTarget(true, CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+
+	case Message::SearchInTarget:
+		PLATFORM_ASSERT(lParam);
+		return SearchInTarget(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+
+	case Message::SetSearchFlags:
+		searchFlags = static_cast<FindOption>(wParam);
+		break;
+
+	case Message::GetSearchFlags:
+		return static_cast<sptr_t>(searchFlags);
+
+	case Message::GetTag:
+		return GetTag(CharPtrFromSPtr(lParam), static_cast<int>(wParam));
+
+	case Message::PositionBefore:
+		return pdoc->MovePositionOutsideChar(PositionFromUPtr(wParam) - 1, -1, true);
+
+	case Message::PositionAfter:
+		return pdoc->MovePositionOutsideChar(PositionFromUPtr(wParam) + 1, 1, true);
+
+	case Message::PositionRelative:
+		return std::clamp<Sci::Position>(pdoc->GetRelativePosition(
+			PositionFromUPtr(wParam), lParam),
+			0, pdoc->Length());
+
+	case Message::PositionRelativeCodeUnits:
+		return std::clamp<Sci::Position>(pdoc->GetRelativePositionUTF16(
+			PositionFromUPtr(wParam), lParam),
+			0, pdoc->Length());
+
+	case Message::LineScroll:
+		ScrollTo(topLine + lParam);
+		HorizontalScrollTo(xOffset + static_cast<int>(wParam) * static_cast<int>(vs.spaceWidth));
+		return 1;
+
+	case Message::SetXOffset:
+		xOffset = static_cast<int>(wParam);
+		ContainerNeedsUpdate(Update::HScroll);
+		SetHorizontalScrollPos();
+		Redraw();
+		break;
+
+	case Message::GetXOffset:
+		return xOffset;
+
+	case Message::ChooseCaretX:
+		SetLastXChosen();
+		break;
+
+	case Message::ScrollCaret:
+		EnsureCaretVisible();
+		break;
+
+	case Message::SetReadOnly:
+		pdoc->SetReadOnly(wParam != 0);
+		return 1;
+
+	case Message::GetReadOnly:
+		return pdoc->IsReadOnly();
+
+	case Message::CanPaste:
+		return CanPaste();
+
+	case Message::PointXFromPosition:
+		if (lParam < 0) {
+			return 0;
+		} else {
+			const Point pt = LocationFromPosition(lParam);
+			// Convert to view-relative
+			return static_cast<int>(pt.x) - vs.textStart + vs.fixedColumnWidth;
+		}
+
+	case Message::PointYFromPosition:
+		if (lParam < 0) {
+			return 0;
+		} else {
+			const Point pt = LocationFromPosition(lParam);
+			return static_cast<int>(pt.y);
+		}
+
+	case Message::FindText:
+		return FindText(wParam, lParam);
+
+	case Message::GetTextRange: {
+			if (lParam == 0)
+				return 0;
+			TextRange *tr = static_cast<TextRange *>(PtrFromSPtr(lParam));
+			Sci::Position cpMax = static_cast<Sci::Position>(tr->chrg.cpMax);
+			if (cpMax == -1)
+				cpMax = pdoc->Length();
+			PLATFORM_ASSERT(cpMax <= pdoc->Length());
+			Sci::Position len = cpMax - tr->chrg.cpMin; 	// No -1 as cpMin and cpMax are referring to inter character positions
+			pdoc->GetCharRange(tr->lpstrText, tr->chrg.cpMin, len);
+			// Spec says copied text is terminated with a NUL
+			tr->lpstrText[len] = '\0';
+			return len; 	// Not including NUL
+		}
+
+	case Message::HideSelection:
+		view.hideSelection = wParam != 0;
+		Redraw();
+		break;
+
+	case Message::FormatRange:
+		return FormatRange(wParam != 0, static_cast<RangeToFormat *>(PtrFromSPtr(lParam)));
+
+	case Message::GetMarginLeft:
+		return vs.leftMarginWidth;
+
+	case Message::GetMarginRight:
+		return vs.rightMarginWidth;
+
+	case Message::SetMarginLeft:
+		lastXChosen += static_cast<int>(lParam) - vs.leftMarginWidth;
+		vs.leftMarginWidth = static_cast<int>(lParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetMarginRight:
+		vs.rightMarginWidth = static_cast<int>(lParam);
+		InvalidateStyleRedraw();
+		break;
+
+		// Control specific messages
+
+	case Message::AddText: {
+			if (lParam == 0)
+				return 0;
+			const Sci::Position lengthInserted = pdoc->InsertString(
+				CurrentPosition(), CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+			SetEmptySelection(sel.MainCaret() + lengthInserted);
+			return 0;
+		}
+
+	case Message::AddStyledText:
+		if (lParam)
+			AddStyledText(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+		return 0;
+
+	case Message::InsertText: {
+			if (lParam == 0)
+				return 0;
+			Sci::Position insertPos = PositionFromUPtr(wParam);
+			if (insertPos == -1)
+				insertPos = CurrentPosition();
+			Sci::Position newCurrent = CurrentPosition();
+			const char *sz = CharPtrFromSPtr(lParam);
+			const Sci::Position lengthInserted = pdoc->InsertString(insertPos, sz, strlen(sz));
+			if (newCurrent > insertPos)
+				newCurrent += lengthInserted;
+			SetEmptySelection(newCurrent);
+			return 0;
+		}
+
+	case Message::ChangeInsertion:
+		PLATFORM_ASSERT(lParam);
+		pdoc->ChangeInsertion(CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+		return 0;
+
+	case Message::AppendText:
+		pdoc->InsertString(pdoc->Length(),
+			CharPtrFromSPtr(lParam), PositionFromUPtr(wParam));
+		return 0;
+
+	case Message::ClearAll:
+		ClearAll();
+		return 0;
+
+	case Message::DeleteRange:
+		pdoc->DeleteChars(PositionFromUPtr(wParam), lParam);
+		return 0;
+
+	case Message::ClearDocumentStyle:
+		ClearDocumentStyle();
+		return 0;
+
+	case Message::SetUndoCollection:
+		pdoc->SetUndoCollection(wParam != 0);
+		return 0;
+
+	case Message::GetUndoCollection:
+		return pdoc->IsCollectingUndo();
+
+	case Message::BeginUndoAction:
+		pdoc->BeginUndoAction();
+		return 0;
+
+	case Message::EndUndoAction:
+		pdoc->EndUndoAction();
+		return 0;
+
+	case Message::GetCaretPeriod:
+		return caret.period;
+
+	case Message::SetCaretPeriod:
+		CaretSetPeriod(static_cast<int>(wParam));
+		break;
+
+	case Message::GetWordChars:
+		return pdoc->GetCharsOfClass(CharacterClass::word, UCharPtrFromSPtr(lParam));
+
+	case Message::SetWordChars: {
+			pdoc->SetDefaultCharClasses(false);
+			if (lParam == 0)
+				return 0;
+			pdoc->SetCharClasses(ConstUCharPtrFromSPtr(lParam), CharacterClass::word);
+		}
+		break;
+
+	case Message::GetWhitespaceChars:
+		return pdoc->GetCharsOfClass(CharacterClass::space, UCharPtrFromSPtr(lParam));
+
+	case Message::SetWhitespaceChars: {
+			if (lParam == 0)
+				return 0;
+			pdoc->SetCharClasses(ConstUCharPtrFromSPtr(lParam), CharacterClass::space);
+		}
+		break;
+
+	case Message::GetPunctuationChars:
+		return pdoc->GetCharsOfClass(CharacterClass::punctuation, UCharPtrFromSPtr(lParam));
+
+	case Message::SetPunctuationChars: {
+			if (lParam == 0)
+				return 0;
+			pdoc->SetCharClasses(ConstUCharPtrFromSPtr(lParam), CharacterClass::punctuation);
+		}
+		break;
+
+	case Message::SetCharsDefault:
+		pdoc->SetDefaultCharClasses(true);
+		break;
+
+	case Message::SetCharacterCategoryOptimization:
+		pdoc->SetCharacterCategoryOptimization(static_cast<int>(wParam));
+		break;
+
+	case Message::GetCharacterCategoryOptimization:
+		return pdoc->CharacterCategoryOptimization();
+
+	case Message::GetLength:
+		return pdoc->Length();
+
+	case Message::Allocate:
+		pdoc->Allocate(PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetCharAt:
+		return pdoc->CharAt(PositionFromUPtr(wParam));
+
+	case Message::SetCurrentPos:
+		if (sel.IsRectangular()) {
+			sel.Rectangular().caret.SetPosition(PositionFromUPtr(wParam));
+			SetRectangularRange();
+			Redraw();
+		} else {
+			SetSelection(PositionFromUPtr(wParam), sel.MainAnchor());
+		}
+		break;
+
+	case Message::GetCurrentPos:
+		return sel.IsRectangular() ? sel.Rectangular().caret.Position() : sel.MainCaret();
+
+	case Message::SetAnchor:
+		if (sel.IsRectangular()) {
+			sel.Rectangular().anchor.SetPosition(PositionFromUPtr(wParam));
+			SetRectangularRange();
+			Redraw();
+		} else {
+			SetSelection(sel.MainCaret(), PositionFromUPtr(wParam));
+		}
+		break;
+
+	case Message::GetAnchor:
+		return sel.IsRectangular() ? sel.Rectangular().anchor.Position() : sel.MainAnchor();
+
+	case Message::SetSelectionStart:
+		SetSelection(std::max(sel.MainCaret(), PositionFromUPtr(wParam)), PositionFromUPtr(wParam));
+		break;
+
+	case Message::GetSelectionStart:
+		return sel.LimitsForRectangularElseMain().start.Position();
+
+	case Message::SetSelectionEnd:
+		SetSelection(PositionFromUPtr(wParam), std::min(sel.MainAnchor(), PositionFromUPtr(wParam)));
+		break;
+
+	case Message::GetSelectionEnd:
+		return sel.LimitsForRectangularElseMain().end.Position();
+
+	case Message::SetEmptySelection:
+		SetEmptySelection(PositionFromUPtr(wParam));
+		break;
+
+	case Message::SetPrintMagnification:
+		view.printParameters.magnification = static_cast<int>(wParam);
+		break;
+
+	case Message::GetPrintMagnification:
+		return view.printParameters.magnification;
+
+	case Message::SetPrintColourMode:
+		view.printParameters.colourMode = static_cast<PrintOption>(wParam);
+		break;
+
+	case Message::GetPrintColourMode:
+		return static_cast<sptr_t>(view.printParameters.colourMode);
+
+	case Message::SetPrintWrapMode:
+		view.printParameters.wrapState = (static_cast<Wrap>(wParam) == Wrap::Word) ? Wrap::Word : Wrap::None;
+		break;
+
+	case Message::GetPrintWrapMode:
+		return static_cast<sptr_t>(view.printParameters.wrapState);
+
+	case Message::GetStyleAt:
+		if (PositionFromUPtr(wParam) >= pdoc->Length())
+			return 0;
+		else
+			return pdoc->StyleAt(PositionFromUPtr(wParam));
+
+	case Message::Redo:
+		Redo();
+		break;
+
+	case Message::SelectAll:
+		SelectAll();
+		break;
+
+	case Message::SetSavePoint:
+		pdoc->SetSavePoint();
+		break;
+
+	case Message::GetStyledText: {
+			if (lParam == 0)
+				return 0;
+			TextRange *tr = static_cast<TextRange *>(PtrFromSPtr(lParam));
+			Sci::Position iPlace = 0;
+			for (Sci::Position iChar = tr->chrg.cpMin; iChar < tr->chrg.cpMax; iChar++) {
+				tr->lpstrText[iPlace++] = pdoc->CharAt(iChar);
+				tr->lpstrText[iPlace++] = pdoc->StyleAt(iChar);
+			}
+			tr->lpstrText[iPlace] = '\0';
+			tr->lpstrText[iPlace + 1] = '\0';
+			return iPlace;
+		}
+
+	case Message::CanRedo:
+		return (pdoc->CanRedo() && !pdoc->IsReadOnly()) ? 1 : 0;
+
+	case Message::MarkerLineFromHandle:
+		return pdoc->LineFromHandle(static_cast<int>(wParam));
+
+	case Message::MarkerDeleteHandle:
+		pdoc->DeleteMarkFromHandle(static_cast<int>(wParam));
+		break;
+
+	case Message::MarkerHandleFromLine:
+		return pdoc->MarkerHandleFromLine(LineFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::MarkerNumberFromLine:
+		return pdoc->MarkerNumberFromLine(LineFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::GetViewWS:
+		return static_cast<sptr_t>(vs.viewWhitespace);
+
+	case Message::SetViewWS:
+		vs.viewWhitespace = static_cast<WhiteSpace>(wParam);
+		Redraw();
+		break;
+
+	case Message::GetTabDrawMode:
+		return static_cast<sptr_t>(vs.tabDrawMode);
+
+	case Message::SetTabDrawMode:
+		vs.tabDrawMode = static_cast<TabDrawMode>(wParam);
+		Redraw();
+		break;
+
+	case Message::GetWhitespaceSize:
+		return vs.whitespaceSize;
+
+	case Message::SetWhitespaceSize:
+		vs.whitespaceSize = static_cast<int>(wParam);
+		Redraw();
+		break;
+
+	case Message::PositionFromPoint:
+		return PositionFromLocation(PointFromParameters(wParam, lParam), false, false);
+
+	case Message::PositionFromPointClose:
+		return PositionFromLocation(PointFromParameters(wParam, lParam), true, false);
+
+	case Message::CharPositionFromPoint:
+		return PositionFromLocation(PointFromParameters(wParam, lParam), false, true);
+
+	case Message::CharPositionFromPointClose:
+		return PositionFromLocation(PointFromParameters(wParam, lParam), true, true);
+
+	case Message::GotoLine:
+		GoToLine(LineFromUPtr(wParam));
+		break;
+
+	case Message::GotoPos:
+		SetEmptySelection(PositionFromUPtr(wParam));
+		EnsureCaretVisible();
+		break;
+
+	case Message::GetCurLine: {
+			const Sci::Line lineCurrentPos = pdoc->SciLineFromPosition(sel.MainCaret());
+			const Sci::Position lineStart = pdoc->LineStart(lineCurrentPos);
+			const Sci::Position lineEnd = pdoc->LineStart(lineCurrentPos + 1);
+			if (lParam == 0) {
+				return 1 + lineEnd - lineStart;
+			}
+			PLATFORM_ASSERT(wParam > 0);
+			char *ptr = CharPtrFromSPtr(lParam);
+			const Sci::Position len = std::min<uptr_t>(lineEnd - lineStart, wParam - 1);
+			pdoc->GetCharRange(ptr, lineStart, len);
+			ptr[len] = '\0';
+			return sel.MainCaret() - lineStart;
+		}
+
+	case Message::GetEndStyled:
+		return pdoc->GetEndStyled();
+
+	case Message::GetEOLMode:
+		return static_cast<sptr_t>(pdoc->eolMode);
+
+	case Message::SetEOLMode:
+		pdoc->eolMode = static_cast<EndOfLine>(wParam);
+		break;
+
+	case Message::SetLineEndTypesAllowed:
+		if (pdoc->SetLineEndTypesAllowed(static_cast<LineEndType>(wParam))) {
+			pcs->Clear();
+			pcs->InsertLines(0, pdoc->LinesTotal() - 1);
+			SetAnnotationHeights(0, pdoc->LinesTotal());
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetLineEndTypesAllowed:
+		return static_cast<sptr_t>(pdoc->GetLineEndTypesAllowed());
+
+	case Message::GetLineEndTypesActive:
+		return static_cast<sptr_t>(pdoc->GetLineEndTypesActive());
+
+	case Message::StartStyling:
+		pdoc->StartStyling(PositionFromUPtr(wParam));
+		break;
+
+	case Message::SetStyling:
+		if (PositionFromUPtr(wParam) < 0)
+			errorStatus = Status::Failure;
+		else
+			pdoc->SetStyleFor(PositionFromUPtr(wParam), static_cast<char>(lParam));
+		break;
+
+	case Message::SetStylingEx:             // Specify a complete styling buffer
+		if (lParam == 0)
+			return 0;
+		pdoc->SetStyles(PositionFromUPtr(wParam), CharPtrFromSPtr(lParam));
+		break;
+
+	case Message::SetBufferedDraw:
+		view.bufferedDraw = wParam != 0;
+		break;
+
+	case Message::GetBufferedDraw:
+		return view.bufferedDraw;
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+	case SCI_GETTWOPHASEDRAW:
+		return view.phasesDraw == EditView::phasesTwo;
+
+	case SCI_SETTWOPHASEDRAW:
+		if (view.SetTwoPhaseDraw(wParam != 0))
+			InvalidateStyleRedraw();
+		break;
+#endif
+
+	case Message::GetPhasesDraw:
+		return static_cast<sptr_t>(view.phasesDraw);
+
+	case Message::SetPhasesDraw:
+		if (view.SetPhasesDraw(static_cast<int>(wParam)))
+			InvalidateStyleRedraw();
+		break;
+
+	case Message::SetFontQuality:
+		vs.extraFontFlag = static_cast<FontQuality>(
+			(static_cast<int>(vs.extraFontFlag) & ~static_cast<int>(FontQuality::QualityMask)) |
+			(wParam & static_cast<int>(FontQuality::QualityMask)));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetFontQuality:
+		return static_cast<int>(vs.extraFontFlag) & static_cast<int>(FontQuality::QualityMask);
+
+	case Message::SetTabWidth:
+		if (wParam > 0) {
+			pdoc->tabInChars = static_cast<int>(wParam);
+			if (pdoc->indentInChars == 0)
+				pdoc->actualIndentInChars = pdoc->tabInChars;
+		}
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetTabWidth:
+		return pdoc->tabInChars;
+
+	case Message::SetTabMinimumWidth:
+		SetAppearance(view.tabWidthMinimumPixels, static_cast<int>(wParam));
+		break;
+
+	case Message::GetTabMinimumWidth:
+		return view.tabWidthMinimumPixels;
+
+	case Message::ClearTabStops:
+		if (view.ClearTabstops(LineFromUPtr(wParam))) {
+			const DocModification mh(ModificationFlags::ChangeTabStops, 0, 0, 0, nullptr, LineFromUPtr(wParam));
+			NotifyModified(pdoc, mh, nullptr);
+		}
+		break;
+
+	case Message::AddTabStop:
+		if (view.AddTabstop(LineFromUPtr(wParam), static_cast<int>(lParam))) {
+			const DocModification mh(ModificationFlags::ChangeTabStops, 0, 0, 0, nullptr, LineFromUPtr(wParam));
+			NotifyModified(pdoc, mh, nullptr);
+		}
+		break;
+
+	case Message::GetNextTabStop:
+		return view.GetNextTabstop(LineFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::SetIndent:
+		pdoc->indentInChars = static_cast<int>(wParam);
+		if (pdoc->indentInChars != 0)
+			pdoc->actualIndentInChars = pdoc->indentInChars;
+		else
+			pdoc->actualIndentInChars = pdoc->tabInChars;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetIndent:
+		return pdoc->indentInChars;
+
+	case Message::SetUseTabs:
+		pdoc->useTabs = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetUseTabs:
+		return pdoc->useTabs;
+
+	case Message::SetLineIndentation:
+		pdoc->SetLineIndentation(LineFromUPtr(wParam), lParam);
+		break;
+
+	case Message::GetLineIndentation:
+		return pdoc->GetLineIndentation(LineFromUPtr(wParam));
+
+	case Message::GetLineIndentPosition:
+		return pdoc->GetLineIndentPosition(LineFromUPtr(wParam));
+
+	case Message::SetTabIndents:
+		pdoc->tabIndents = wParam != 0;
+		break;
+
+	case Message::GetTabIndents:
+		return pdoc->tabIndents;
+
+	case Message::SetBackSpaceUnIndents:
+		pdoc->backspaceUnindents = wParam != 0;
+		break;
+
+	case Message::GetBackSpaceUnIndents:
+		return pdoc->backspaceUnindents;
+
+	case Message::SetMouseDwellTime:
+		dwellDelay = static_cast<int>(wParam);
+		ticksToDwell = dwellDelay;
+		break;
+
+	case Message::GetMouseDwellTime:
+		return dwellDelay;
+
+	case Message::WordStartPosition:
+		return pdoc->ExtendWordSelect(PositionFromUPtr(wParam), -1, lParam != 0);
+
+	case Message::WordEndPosition:
+		return pdoc->ExtendWordSelect(PositionFromUPtr(wParam), 1, lParam != 0);
+
+	case Message::IsRangeWord:
+		return pdoc->IsWordAt(PositionFromUPtr(wParam), lParam);
+
+	case Message::SetIdleStyling:
+		idleStyling = static_cast<IdleStyling>(wParam);
+		break;
+
+	case Message::GetIdleStyling:
+		return static_cast<sptr_t>(idleStyling);
+
+	case Message::SetWrapMode:
+		if (vs.SetWrapState(static_cast<Wrap>(wParam))) {
+			xOffset = 0;
+			ContainerNeedsUpdate(Update::HScroll);
+			InvalidateStyleRedraw();
+			ReconfigureScrollBars();
+		}
+		break;
+
+	case Message::GetWrapMode:
+		return static_cast<sptr_t>(vs.wrap.state);
+
+	case Message::SetWrapVisualFlags:
+		if (vs.SetWrapVisualFlags(static_cast<WrapVisualFlag>(wParam))) {
+			InvalidateStyleRedraw();
+			ReconfigureScrollBars();
+		}
+		break;
+
+	case Message::GetWrapVisualFlags:
+		return static_cast<sptr_t>(vs.wrap.visualFlags);
+
+	case Message::SetWrapVisualFlagsLocation:
+		if (vs.SetWrapVisualFlagsLocation(static_cast<WrapVisualLocation>(wParam))) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetWrapVisualFlagsLocation:
+		return static_cast<sptr_t>(vs.wrap.visualFlagsLocation);
+
+	case Message::SetWrapStartIndent:
+		if (vs.SetWrapVisualStartIndent(static_cast<int>(wParam))) {
+			InvalidateStyleRedraw();
+			ReconfigureScrollBars();
+		}
+		break;
+
+	case Message::GetWrapStartIndent:
+		return vs.wrap.visualStartIndent;
+
+	case Message::SetWrapIndentMode:
+		if (vs.SetWrapIndentMode(static_cast<WrapIndentMode>(wParam))) {
+			InvalidateStyleRedraw();
+			ReconfigureScrollBars();
+		}
+		break;
+
+	case Message::GetWrapIndentMode:
+		return static_cast<sptr_t>(vs.wrap.indentMode);
+
+	case Message::SetLayoutCache:
+		if (static_cast<LineCache>(wParam) <= LineCache::Document) {
+			view.llc.SetLevel(static_cast<LineCache>(wParam));
+		}
+		break;
+
+	case Message::GetLayoutCache:
+		return static_cast<sptr_t>(view.llc.GetLevel());
+
+	case Message::SetPositionCache:
+		view.posCache.SetSize(wParam);
+		break;
+
+	case Message::GetPositionCache:
+		return view.posCache.GetSize();
+
+	case Message::SetScrollWidth:
+		PLATFORM_ASSERT(wParam > 0);
+		if ((wParam > 0) && (wParam != static_cast<unsigned int>(scrollWidth))) {
+			view.lineWidthMaxSeen = 0;
+			scrollWidth = static_cast<int>(wParam);
+			SetScrollBars();
+		}
+		break;
+
+	case Message::GetScrollWidth:
+		return scrollWidth;
+
+	case Message::SetScrollWidthTracking:
+		trackLineWidth = wParam != 0;
+		break;
+
+	case Message::GetScrollWidthTracking:
+		return trackLineWidth;
+
+	case Message::LinesJoin:
+		LinesJoin();
+		break;
+
+	case Message::LinesSplit:
+		LinesSplit(static_cast<int>(wParam));
+		break;
+
+	case Message::TextWidth:
+		PLATFORM_ASSERT(wParam < vs.styles.size());
+		PLATFORM_ASSERT(lParam);
+		return TextWidth(wParam, CharPtrFromSPtr(lParam));
+
+	case Message::TextHeight:
+		RefreshStyleData();
+		return vs.lineHeight;
+
+	case Message::SetEndAtLastLine:
+		PLATFORM_ASSERT((wParam == 0) || (wParam == 1));
+		if (endAtLastLine != (wParam != 0)) {
+			endAtLastLine = wParam != 0;
+			SetScrollBars();
+		}
+		break;
+
+	case Message::GetEndAtLastLine:
+		return endAtLastLine;
+
+	case Message::SetCaretSticky:
+		PLATFORM_ASSERT(static_cast<CaretSticky>(wParam) <= CaretSticky::WhiteSpace);
+		if (static_cast<CaretSticky>(wParam) <= CaretSticky::WhiteSpace) {
+			caretSticky = static_cast<CaretSticky>(wParam);
+		}
+		break;
+
+	case Message::GetCaretSticky:
+		return static_cast<sptr_t>(caretSticky);
+
+	case Message::ToggleCaretSticky:
+		caretSticky = (caretSticky == CaretSticky::Off) ? CaretSticky::On : CaretSticky::Off;
+		break;
+
+	case Message::GetColumn:
+		return pdoc->GetColumn(PositionFromUPtr(wParam));
+
+	case Message::FindColumn:
+		return pdoc->FindColumn(LineFromUPtr(wParam), lParam);
+
+	case Message::SetHScrollBar :
+		if (horizontalScrollBarVisible != (wParam != 0)) {
+			horizontalScrollBarVisible = wParam != 0;
+			SetScrollBars();
+			ReconfigureScrollBars();
+		}
+		break;
+
+	case Message::GetHScrollBar:
+		return horizontalScrollBarVisible;
+
+	case Message::SetVScrollBar:
+		if (verticalScrollBarVisible != (wParam != 0)) {
+			verticalScrollBarVisible = wParam != 0;
+			SetScrollBars();
+			ReconfigureScrollBars();
+			if (verticalScrollBarVisible)
+				SetVerticalScrollPos();
+		}
+		break;
+
+	case Message::GetVScrollBar:
+		return verticalScrollBarVisible;
+
+	case Message::SetIndentationGuides:
+		vs.viewIndentationGuides = static_cast<IndentView>(wParam);
+		Redraw();
+		break;
+
+	case Message::GetIndentationGuides:
+		return static_cast<sptr_t>(vs.viewIndentationGuides);
+
+	case Message::SetHighlightGuide:
+		if ((highlightGuideColumn != static_cast<int>(wParam)) || (wParam > 0)) {
+			highlightGuideColumn = static_cast<int>(wParam);
+			Redraw();
+		}
+		break;
+
+	case Message::GetHighlightGuide:
+		return highlightGuideColumn;
+
+	case Message::GetLineEndPosition:
+		return pdoc->LineEnd(LineFromUPtr(wParam));
+
+	case Message::SetCodePage:
+		if (ValidCodePage(static_cast<int>(wParam))) {
+			if (pdoc->SetDBCSCodePage(static_cast<int>(wParam))) {
+				pcs->Clear();
+				pcs->InsertLines(0, pdoc->LinesTotal() - 1);
+				SetAnnotationHeights(0, pdoc->LinesTotal());
+				InvalidateStyleRedraw();
+				SetRepresentations();
+			}
+		}
+		break;
+
+	case Message::GetCodePage:
+		return pdoc->dbcsCodePage;
+
+	case Message::SetIMEInteraction:
+		imeInteraction = static_cast<IMEInteraction>(wParam);
+		break;
+
+	case Message::GetIMEInteraction:
+		return static_cast<sptr_t>(imeInteraction);
+
+	case Message::SetBidirectional:
+		// Message::SetBidirectional is implemented on platform subclasses if they support bidirectional text.
+		break;
+
+	case Message::GetBidirectional:
+		return static_cast<sptr_t>(bidirectional);
+
+	case Message::GetLineCharacterIndex:
+		return static_cast<sptr_t>(pdoc->LineCharacterIndex());
+
+	case Message::AllocateLineCharacterIndex:
+		pdoc->AllocateLineCharacterIndex(static_cast<LineCharacterIndexType>(wParam));
+		break;
+
+	case Message::ReleaseLineCharacterIndex:
+		pdoc->ReleaseLineCharacterIndex(static_cast<LineCharacterIndexType>(wParam));
+		break;
+
+	case Message::LineFromIndexPosition:
+		return pdoc->LineFromPositionIndex(PositionFromUPtr(wParam), static_cast<LineCharacterIndexType>(lParam));
+
+	case Message::IndexPositionFromLine:
+		return pdoc->IndexLineStart(LineFromUPtr(wParam), static_cast<LineCharacterIndexType>(lParam));
+
+		// Marker definition and setting
+	case Message::MarkerDefine:
+		if (wParam <= MarkerMax) {
+			vs.markers[wParam].markType = static_cast<MarkerSymbol>(lParam);
+			vs.CalcLargestMarkerHeight();
+		}
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+
+	case Message::MarkerSymbolDefined:
+		if (wParam <= MarkerMax)
+			return static_cast<sptr_t>(vs.markers[wParam].markType);
+		else
+			return 0;
+
+	case Message::MarkerSetFore:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].fore = ColourRGBA::FromIpRGB(lParam);
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetBack:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].back = ColourRGBA::FromIpRGB(lParam);
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetBackSelected:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].backSelected = ColourRGBA::FromIpRGB(lParam);
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetForeTranslucent:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].fore = ColourRGBA(static_cast<int>(lParam));
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetBackTranslucent:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].back = ColourRGBA(static_cast<int>(lParam));
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetBackSelectedTranslucent:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].backSelected = ColourRGBA(static_cast<int>(lParam));
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetStrokeWidth:
+		if (wParam <= MarkerMax)
+			vs.markers[wParam].strokeWidth = lParam / 100.0f;
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+	case Message::MarkerEnableHighlight:
+		marginView.highlightDelimiter.isEnabled = wParam == 1;
+		RedrawSelMargin();
+		break;
+	case Message::MarkerSetAlpha:
+		if (wParam <= MarkerMax) {
+			if (static_cast<Alpha>(lParam) == Alpha::NoAlpha) {
+				SetAppearance(vs.markers[wParam].alpha, Alpha::Opaque);
+				SetAppearance(vs.markers[wParam].layer, Layer::Base);
+			} else {
+				SetAppearance(vs.markers[wParam].alpha, static_cast<Alpha>(lParam));
+				SetAppearance(vs.markers[wParam].layer, Layer::OverText);
+			}
+		}
+		break;
+	case Message::MarkerSetLayer:
+		if (wParam <= MarkerMax) {
+			SetAppearance(vs.markers[wParam].layer, static_cast<Layer>(lParam));
+		}
+		break;
+	case Message::MarkerGetLayer:
+		if (wParam <= MarkerMax) {
+			return static_cast<sptr_t>(vs.markers[wParam].layer);
+		}
+		return 0;
+	case Message::MarkerAdd: {
+			const int markerID = pdoc->AddMark(LineFromUPtr(wParam), static_cast<int>(lParam));
+			return markerID;
+		}
+	case Message::MarkerAddSet:
+		if (lParam != 0)
+			pdoc->AddMarkSet(LineFromUPtr(wParam), static_cast<int>(lParam));
+		break;
+
+	case Message::MarkerDelete:
+		pdoc->DeleteMark(LineFromUPtr(wParam), static_cast<int>(lParam));
+		break;
+
+	case Message::MarkerDeleteAll:
+		pdoc->DeleteAllMarks(static_cast<int>(wParam));
+		break;
+
+	case Message::MarkerGet:
+		return pdoc->GetMark(LineFromUPtr(wParam));
+
+	case Message::MarkerNext:
+		return pdoc->MarkerNext(LineFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::MarkerPrevious: {
+			for (Sci::Line iLine = LineFromUPtr(wParam); iLine >= 0; iLine--) {
+				if ((pdoc->GetMark(iLine) & lParam) != 0)
+					return iLine;
+			}
+		}
+		return -1;
+
+	case Message::MarkerDefinePixmap:
+		if (wParam <= MarkerMax) {
+			vs.markers[wParam].SetXPM(CharPtrFromSPtr(lParam));
+			vs.CalcLargestMarkerHeight();
+		}
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+
+	case Message::RGBAImageSetWidth:
+		sizeRGBAImage.x = static_cast<XYPOSITION>(wParam);
+		break;
+
+	case Message::RGBAImageSetHeight:
+		sizeRGBAImage.y = static_cast<XYPOSITION>(wParam);
+		break;
+
+	case Message::RGBAImageSetScale:
+		scaleRGBAImage = static_cast<float>(wParam);
+		break;
+
+	case Message::MarkerDefineRGBAImage:
+		if (wParam <= MarkerMax) {
+			vs.markers[wParam].SetRGBAImage(sizeRGBAImage, scaleRGBAImage / 100.0f, ConstUCharPtrFromSPtr(lParam));
+			vs.CalcLargestMarkerHeight();
+		}
+		InvalidateStyleData();
+		RedrawSelMargin();
+		break;
+
+	case Message::SetMarginTypeN:
+		if (ValidMargin(wParam)) {
+			vs.ms[wParam].style = static_cast<MarginType>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetMarginTypeN:
+		if (ValidMargin(wParam))
+			return static_cast<sptr_t>(vs.ms[wParam].style);
+		else
+			return 0;
+
+	case Message::SetMarginWidthN:
+		if (ValidMargin(wParam)) {
+			// Short-circuit if the width is unchanged, to avoid unnecessary redraw.
+			if (vs.ms[wParam].width != lParam) {
+				lastXChosen += static_cast<int>(lParam) - vs.ms[wParam].width;
+				vs.ms[wParam].width = static_cast<int>(lParam);
+				InvalidateStyleRedraw();
+			}
+		}
+		break;
+
+	case Message::GetMarginWidthN:
+		if (ValidMargin(wParam))
+			return vs.ms[wParam].width;
+		else
+			return 0;
+
+	case Message::SetMarginMaskN:
+		if (ValidMargin(wParam)) {
+			vs.ms[wParam].mask = static_cast<int>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetMarginMaskN:
+		if (ValidMargin(wParam))
+			return vs.ms[wParam].mask;
+		else
+			return 0;
+
+	case Message::SetMarginSensitiveN:
+		if (ValidMargin(wParam)) {
+			vs.ms[wParam].sensitive = lParam != 0;
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetMarginSensitiveN:
+		if (ValidMargin(wParam))
+			return vs.ms[wParam].sensitive ? 1 : 0;
+		else
+			return 0;
+
+	case Message::SetMarginCursorN:
+		if (ValidMargin(wParam))
+			vs.ms[wParam].cursor = static_cast<CursorShape>(lParam);
+		break;
+
+	case Message::GetMarginCursorN:
+		if (ValidMargin(wParam))
+			return static_cast<sptr_t>(vs.ms[wParam].cursor);
+		else
+			return 0;
+
+	case Message::SetMarginBackN:
+		if (ValidMargin(wParam)) {
+			vs.ms[wParam].back = ColourRGBA::FromIpRGB(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetMarginBackN:
+		if (ValidMargin(wParam))
+			return vs.ms[wParam].back.OpaqueRGB();
+		else
+			return 0;
+
+	case Message::SetMargins:
+		if (wParam < 1000)
+			vs.ms.resize(wParam);
+		break;
+
+	case Message::GetMargins:
+		return vs.ms.size();
+
+	case Message::StyleClearAll:
+		vs.ClearStyles();
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::StyleSetFore:
+	case Message::StyleSetBack:
+	case Message::StyleSetBold:
+	case Message::StyleSetWeight:
+	case Message::StyleSetItalic:
+	case Message::StyleSetEOLFilled:
+	case Message::StyleSetSize:
+	case Message::StyleSetSizeFractional:
+	case Message::StyleSetFont:
+	case Message::StyleSetUnderline:
+	case Message::StyleSetCase:
+	case Message::StyleSetCharacterSet:
+	case Message::StyleSetVisible:
+	case Message::StyleSetChangeable:
+	case Message::StyleSetHotSpot:
+		StyleSetMessage(iMessage, wParam, lParam);
+		break;
+
+	case Message::StyleGetFore:
+	case Message::StyleGetBack:
+	case Message::StyleGetBold:
+	case Message::StyleGetWeight:
+	case Message::StyleGetItalic:
+	case Message::StyleGetEOLFilled:
+	case Message::StyleGetSize:
+	case Message::StyleGetSizeFractional:
+	case Message::StyleGetFont:
+	case Message::StyleGetUnderline:
+	case Message::StyleGetCase:
+	case Message::StyleGetCharacterSet:
+	case Message::StyleGetVisible:
+	case Message::StyleGetChangeable:
+	case Message::StyleGetHotSpot:
+		return StyleGetMessage(iMessage, wParam, lParam);
+
+	case Message::StyleResetDefault:
+		vs.ResetDefaultStyle();
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetElementColour:
+		if (vs.SetElementColour(static_cast<Element>(wParam), ColourRGBA(static_cast<int>(lParam)))) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetElementColour:
+		return vs.ElementColour(static_cast<Element>(wParam)).value_or(ColourRGBA()).AsInteger();
+
+	case Message::ResetElementColour:
+		if (vs.ResetElement(static_cast<Element>(wParam))) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetElementIsSet:
+		return vs.ElementColour(static_cast<Element>(wParam)).has_value();
+
+	case Message::GetElementAllowsTranslucent:
+		return vs.ElementAllowsTranslucent(static_cast<Element>(wParam));
+
+	case Message::GetElementBaseColour:
+		return vs.elementBaseColours[static_cast<Element>(wParam)].value_or(ColourRGBA()).AsInteger();
+
+	case Message::SetFontLocale:
+		if (lParam) {
+			vs.SetFontLocaleName(CharPtrFromSPtr(lParam));
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetFontLocale:
+		return StringResult(lParam, vs.localeName.c_str());
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+	case SCI_SETSTYLEBITS:
+		vs.EnsureStyle(0xff);
+		break;
+
+	case SCI_GETSTYLEBITS:
+		return 8;
+#endif
+
+	case Message::SetLineState:
+		return pdoc->SetLineState(LineFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::GetLineState:
+		return pdoc->GetLineState(LineFromUPtr(wParam));
+
+	case Message::GetMaxLineState:
+		return pdoc->GetMaxLineState();
+
+	case Message::GetCaretLineVisible:
+		return vs.ElementColour(Element::CaretLineBack) ? 1 : 0;
+	case Message::SetCaretLineVisible:
+		if (wParam) {
+			if (!vs.elementColours.count(Element::CaretLineBack)) {
+				vs.elementColours[Element::CaretLineBack] = ColourRGBA(0xFF, 0xFF, 0);
+				InvalidateStyleRedraw();
+			}
+		} else {
+			if (vs.ResetElement(Element::CaretLineBack)) {
+				InvalidateStyleRedraw();
+			}
+		}
+		break;
+	case Message::GetCaretLineVisibleAlways:
+		return vs.caretLine.alwaysShow;
+	case Message::SetCaretLineVisibleAlways:
+		vs.caretLine.alwaysShow = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetCaretLineFrame:
+		return vs.caretLine.frame;
+	case Message::SetCaretLineFrame:
+		vs.caretLine.frame = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+	case Message::GetCaretLineBack:
+		if (vs.ElementColour(Element::CaretLineBack))
+			return vs.ElementColour(Element::CaretLineBack)->OpaqueRGB();
+		else
+			return 0;
+
+	case Message::SetCaretLineBack:
+		vs.SetElementRGB(Element::CaretLineBack, static_cast<int>(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetCaretLineLayer:
+		return static_cast<sptr_t>(vs.caretLine.layer);
+
+	case Message::SetCaretLineLayer:
+		if (vs.caretLine.layer != static_cast<Layer>(wParam)) {
+			vs.caretLine.layer = static_cast<Layer>(wParam);
+			UpdateBaseElements();
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetCaretLineBackAlpha:
+		if (vs.caretLine.layer == Layer::Base)
+			return static_cast<sptr_t>(Alpha::NoAlpha);
+		return vs.ElementColour(Element::CaretLineBack).value_or(ColourRGBA()).GetAlpha();
+
+	case Message::SetCaretLineBackAlpha: {
+			const Layer layerNew = (static_cast<Alpha>(wParam) == Alpha::NoAlpha) ? Layer::Base : Layer::OverText;
+			vs.caretLine.layer = layerNew;
+			if (vs.ElementColour(Element::CaretLineBack)) {
+				vs.SetElementAlpha(Element::CaretLineBack, static_cast<int>(wParam));
+			}
+			InvalidateStyleRedraw();
+		}
+		break;
+
+		// Folding messages
+
+	case Message::VisibleFromDocLine:
+		return pcs->DisplayFromDoc(LineFromUPtr(wParam));
+
+	case Message::DocLineFromVisible:
+		return pcs->DocFromDisplay(LineFromUPtr(wParam));
+
+	case Message::WrapCount:
+		return WrapCount(LineFromUPtr(wParam));
+
+	case Message::SetFoldLevel: {
+			const int prev = pdoc->SetLevel(LineFromUPtr(wParam), static_cast<int>(lParam));
+			if (prev != static_cast<int>(lParam))
+				RedrawSelMargin();
+			return prev;
+		}
+
+	case Message::GetFoldLevel:
+		return pdoc->GetLevel(LineFromUPtr(wParam));
+
+	case Message::GetLastChild:
+		return pdoc->GetLastChild(LineFromUPtr(wParam), OptionalFoldLevel(lParam));
+
+	case Message::GetFoldParent:
+		return pdoc->GetFoldParent(LineFromUPtr(wParam));
+
+	case Message::ShowLines:
+		pcs->SetVisible(LineFromUPtr(wParam), lParam, true);
+		SetScrollBars();
+		Redraw();
+		break;
+
+	case Message::HideLines:
+		if (wParam > 0)
+			pcs->SetVisible(LineFromUPtr(wParam), lParam, false);
+		SetScrollBars();
+		Redraw();
+		break;
+
+	case Message::GetLineVisible:
+		return pcs->GetVisible(LineFromUPtr(wParam));
+
+	case Message::GetAllLinesVisible:
+		return pcs->HiddenLines() ? 0 : 1;
+
+	case Message::SetFoldExpanded:
+		SetFoldExpanded(LineFromUPtr(wParam), lParam != 0);
+		break;
+
+	case Message::GetFoldExpanded:
+		return pcs->GetExpanded(LineFromUPtr(wParam));
+
+	case Message::SetAutomaticFold:
+		foldAutomatic = static_cast<AutomaticFold>(wParam);
+		break;
+
+	case Message::GetAutomaticFold:
+		return static_cast<sptr_t>(foldAutomatic);
+
+	case Message::SetFoldFlags:
+		foldFlags = static_cast<FoldFlag>(wParam);
+		Redraw();
+		break;
+
+	case Message::ToggleFoldShowText:
+		pcs->SetFoldDisplayText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+		FoldLine(LineFromUPtr(wParam), FoldAction::Toggle);
+		break;
+
+	case Message::FoldDisplayTextSetStyle:
+		foldDisplayTextStyle = static_cast<FoldDisplayTextStyle>(wParam);
+		Redraw();
+		break;
+
+	case Message::FoldDisplayTextGetStyle:
+		return static_cast<sptr_t>(foldDisplayTextStyle);
+
+	case Message::SetDefaultFoldDisplayText:
+		SetDefaultFoldDisplayText(CharPtrFromSPtr(lParam));
+		Redraw();
+		break;
+
+	case Message::GetDefaultFoldDisplayText:
+		return StringResult(lParam, GetDefaultFoldDisplayText());
+
+	case Message::ToggleFold:
+		FoldLine(LineFromUPtr(wParam), FoldAction::Toggle);
+		break;
+
+	case Message::FoldLine:
+		FoldLine(LineFromUPtr(wParam), static_cast<FoldAction>(lParam));
+		break;
+
+	case Message::FoldChildren:
+		FoldExpand(LineFromUPtr(wParam), static_cast<FoldAction>(lParam), pdoc->GetFoldLevel(LineFromUPtr(wParam)));
+		break;
+
+	case Message::FoldAll:
+		FoldAll(static_cast<FoldAction>(wParam));
+		break;
+
+	case Message::ExpandChildren:
+		FoldExpand(LineFromUPtr(wParam), FoldAction::Expand, static_cast<FoldLevel>(lParam));
+		break;
+
+	case Message::ContractedFoldNext:
+		return ContractedFoldNext(LineFromUPtr(wParam));
+
+	case Message::EnsureVisible:
+		EnsureLineVisible(LineFromUPtr(wParam), false);
+		break;
+
+	case Message::EnsureVisibleEnforcePolicy:
+		EnsureLineVisible(LineFromUPtr(wParam), true);
+		break;
+
+	case Message::ScrollRange:
+		ScrollRange(SelectionRange(PositionFromUPtr(wParam), lParam));
+		break;
+
+	case Message::SearchAnchor:
+		SearchAnchor();
+		break;
+
+	case Message::SearchNext:
+	case Message::SearchPrev:
+		return SearchText(iMessage, wParam, lParam);
+
+	case Message::SetXCaretPolicy:
+		caretPolicies.x = CaretPolicySlop(wParam, lParam);
+		break;
+
+	case Message::SetYCaretPolicy:
+		caretPolicies.y = CaretPolicySlop(wParam, lParam);
+		break;
+
+	case Message::SetVisiblePolicy:
+		visiblePolicy = VisiblePolicySlop(wParam, lParam);
+		break;
+
+	case Message::LinesOnScreen:
+		return LinesOnScreen();
+
+	case Message::SetSelFore:
+		vs.elementColours[Element::SelectionText] = OptionalColour(wParam, lParam);
+		vs.elementColours[Element::SelectionAdditionalText] = OptionalColour(wParam, lParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetSelBack:
+		if (wParam) {
+			vs.SetElementRGB(Element::SelectionBack, static_cast<int>(lParam));
+			vs.SetElementRGB(Element::SelectionAdditionalBack, static_cast<int>(lParam));
+		} else {
+			vs.ResetElement(Element::SelectionBack);
+			vs.ResetElement(Element::SelectionAdditionalBack);
+		}
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetSelAlpha: {
+			const Layer layerNew = (static_cast<Alpha>(wParam) == Alpha::NoAlpha) ? Layer::Base : Layer::OverText;
+			if (vs.selection.layer != layerNew) {
+			    vs.selection.layer = layerNew;
+			    UpdateBaseElements();
+			}
+			const int alpha = static_cast<int>(wParam);
+			vs.SetElementAlpha(Element::SelectionBack, alpha);
+			vs.SetElementAlpha(Element::SelectionAdditionalBack, alpha);
+			vs.SetElementAlpha(Element::SelectionSecondaryBack, alpha);
+			vs.SetElementAlpha(Element::SelectionInactiveBack, alpha);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetSelAlpha:
+		if (vs.selection.layer == Layer::Base)
+			return static_cast<sptr_t>(Alpha::NoAlpha);
+		return vs.ElementColour(Element::SelectionBack)->GetAlpha();
+
+	case Message::GetSelEOLFilled:
+		return vs.selection.eolFilled;
+
+	case Message::SetSelEOLFilled:
+		vs.selection.eolFilled = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetWhitespaceFore:
+		if (vs.SetElementColourOptional(Element::WhiteSpace, wParam, lParam)) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::SetWhitespaceBack:
+		if (vs.SetElementColourOptional(Element::WhiteSpaceBack, wParam, lParam)) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::SetSelectionLayer:
+		if (vs.selection.layer != static_cast<Layer>(wParam)) {
+			vs.selection.layer = static_cast<Layer>(wParam);
+			UpdateBaseElements();
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetSelectionLayer:
+		return static_cast<sptr_t>(vs.selection.layer);
+
+	case Message::SetCaretFore:
+		vs.elementColours[Element::Caret] = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetCaretFore:
+		return vs.ElementColour(Element::Caret)->OpaqueRGB();
+
+	case Message::SetCaretStyle:
+		if (static_cast<CaretStyle>(wParam) <= (CaretStyle::Block | CaretStyle::OverstrikeBlock | CaretStyle::BlockAfter))
+			vs.caret.style = static_cast<CaretStyle>(wParam);
+		else
+			/* Default to the line caret */
+			vs.caret.style = CaretStyle::Line;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetCaretStyle:
+		return static_cast<sptr_t>(vs.caret.style);
+
+	case Message::SetCaretWidth:
+		vs.caret.width = std::clamp(static_cast<int>(wParam), 0, 20);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetCaretWidth:
+		return vs.caret.width;
+
+	case Message::AssignCmdKey:
+		kmap.AssignCmdKey(static_cast<Keys>(LowShortFromWParam(wParam)),
+			static_cast<KeyMod>(HighShortFromWParam(wParam)), static_cast<Message>(lParam));
+		break;
+
+	case Message::ClearCmdKey:
+		kmap.AssignCmdKey(static_cast<Keys>(LowShortFromWParam(wParam)),
+			static_cast<KeyMod>(HighShortFromWParam(wParam)), Message::Null);
+		break;
+
+	case Message::ClearAllCmdKeys:
+		kmap.Clear();
+		break;
+
+	case Message::IndicSetStyle:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].sacNormal.style = static_cast<IndicatorStyle>(lParam);
+			vs.indicators[wParam].sacHover.style = static_cast<IndicatorStyle>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetStyle:
+		return (wParam <= IndicatorMax) ?
+			static_cast<sptr_t>(vs.indicators[wParam].sacNormal.style) : 0;
+
+	case Message::IndicSetFore:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].sacNormal.fore = ColourRGBA::FromIpRGB(lParam);
+			vs.indicators[wParam].sacHover.fore = ColourRGBA::FromIpRGB(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetFore:
+		return (wParam <= IndicatorMax) ?
+			vs.indicators[wParam].sacNormal.fore.OpaqueRGB() : 0;
+
+	case Message::IndicSetHoverStyle:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].sacHover.style = static_cast<IndicatorStyle>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetHoverStyle:
+		return (wParam <= IndicatorMax) ?
+			static_cast<sptr_t>(vs.indicators[wParam].sacHover.style) : 0;
+
+	case Message::IndicSetHoverFore:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].sacHover.fore = ColourRGBA::FromIpRGB(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetHoverFore:
+		return (wParam <= IndicatorMax) ?
+			vs.indicators[wParam].sacHover.fore.OpaqueRGB() : 0;
+
+	case Message::IndicSetFlags:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].SetFlags(static_cast<IndicFlag>(lParam));
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetFlags:
+		return (wParam <= IndicatorMax) ?
+			static_cast<sptr_t>(vs.indicators[wParam].Flags()) : 0;
+
+	case Message::IndicSetUnder:
+		if (wParam <= IndicatorMax) {
+			vs.indicators[wParam].under = lParam != 0;
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetUnder:
+		return (wParam <= IndicatorMax) ?
+			vs.indicators[wParam].under : 0;
+
+	case Message::IndicSetAlpha:
+		if (wParam <= IndicatorMax && lParam >=0 && lParam <= 255) {
+			vs.indicators[wParam].fillAlpha = static_cast<int>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetAlpha:
+		return (wParam <= IndicatorMax)
+			? vs.indicators[wParam].fillAlpha : 0;
+
+	case Message::IndicSetOutlineAlpha:
+		if (wParam <= IndicatorMax && lParam >=0 && lParam <= 255) {
+			vs.indicators[wParam].outlineAlpha = static_cast<int>(lParam);
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetOutlineAlpha:
+		return (wParam <= IndicatorMax) ? vs.indicators[wParam].outlineAlpha : 0;
+
+	case Message::IndicSetStrokeWidth:
+		if (wParam <= IndicatorMax && lParam >= 0 && lParam <= 1000) {
+			vs.indicators[wParam].strokeWidth = lParam / 100.0f;
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::IndicGetStrokeWidth:
+		if (wParam <= IndicatorMax) {
+			return std::lround(vs.indicators[wParam].strokeWidth * 100);
+		}
+		break;
+
+	case Message::SetIndicatorCurrent:
+		pdoc->DecorationSetCurrentIndicator(static_cast<int>(wParam));
+		break;
+	case Message::GetIndicatorCurrent:
+		return pdoc->decorations->GetCurrentIndicator();
+	case Message::SetIndicatorValue:
+		pdoc->decorations->SetCurrentValue(static_cast<int>(wParam));
+		break;
+	case Message::GetIndicatorValue:
+		return pdoc->decorations->GetCurrentValue();
+
+	case Message::IndicatorFillRange:
+		pdoc->DecorationFillRange(PositionFromUPtr(wParam),
+			pdoc->decorations->GetCurrentValue(), lParam);
+		break;
+
+	case Message::IndicatorClearRange:
+		pdoc->DecorationFillRange(PositionFromUPtr(wParam), 0,
+			lParam);
+		break;
+
+	case Message::IndicatorAllOnFor:
+		return pdoc->decorations->AllOnFor(PositionFromUPtr(wParam));
+
+	case Message::IndicatorValueAt:
+		return pdoc->decorations->ValueAt(static_cast<int>(wParam), lParam);
+
+	case Message::IndicatorStart:
+		return pdoc->decorations->Start(static_cast<int>(wParam), lParam);
+
+	case Message::IndicatorEnd:
+		return pdoc->decorations->End(static_cast<int>(wParam), lParam);
+
+	case Message::LineDown:
+	case Message::LineDownExtend:
+	case Message::ParaDown:
+	case Message::ParaDownExtend:
+	case Message::LineUp:
+	case Message::LineUpExtend:
+	case Message::ParaUp:
+	case Message::ParaUpExtend:
+	case Message::CharLeft:
+	case Message::CharLeftExtend:
+	case Message::CharRight:
+	case Message::CharRightExtend:
+	case Message::WordLeft:
+	case Message::WordLeftExtend:
+	case Message::WordRight:
+	case Message::WordRightExtend:
+	case Message::WordLeftEnd:
+	case Message::WordLeftEndExtend:
+	case Message::WordRightEnd:
+	case Message::WordRightEndExtend:
+	case Message::Home:
+	case Message::HomeExtend:
+	case Message::LineEnd:
+	case Message::LineEndExtend:
+	case Message::HomeWrap:
+	case Message::HomeWrapExtend:
+	case Message::LineEndWrap:
+	case Message::LineEndWrapExtend:
+	case Message::DocumentStart:
+	case Message::DocumentStartExtend:
+	case Message::DocumentEnd:
+	case Message::DocumentEndExtend:
+	case Message::ScrollToStart:
+	case Message::ScrollToEnd:
+
+	case Message::StutteredPageUp:
+	case Message::StutteredPageUpExtend:
+	case Message::StutteredPageDown:
+	case Message::StutteredPageDownExtend:
+
+	case Message::PageUp:
+	case Message::PageUpExtend:
+	case Message::PageDown:
+	case Message::PageDownExtend:
+	case Message::EditToggleOvertype:
+	case Message::Cancel:
+	case Message::DeleteBack:
+	case Message::Tab:
+	case Message::BackTab:
+	case Message::NewLine:
+	case Message::FormFeed:
+	case Message::VCHome:
+	case Message::VCHomeExtend:
+	case Message::VCHomeWrap:
+	case Message::VCHomeWrapExtend:
+	case Message::VCHomeDisplay:
+	case Message::VCHomeDisplayExtend:
+	case Message::ZoomIn:
+	case Message::ZoomOut:
+	case Message::DelWordLeft:
+	case Message::DelWordRight:
+	case Message::DelWordRightEnd:
+	case Message::DelLineLeft:
+	case Message::DelLineRight:
+	case Message::LineCopy:
+	case Message::LineCut:
+	case Message::LineDelete:
+	case Message::LineTranspose:
+	case Message::LineReverse:
+	case Message::LineDuplicate:
+	case Message::LowerCase:
+	case Message::UpperCase:
+	case Message::LineScrollDown:
+	case Message::LineScrollUp:
+	case Message::WordPartLeft:
+	case Message::WordPartLeftExtend:
+	case Message::WordPartRight:
+	case Message::WordPartRightExtend:
+	case Message::DeleteBackNotLine:
+	case Message::HomeDisplay:
+	case Message::HomeDisplayExtend:
+	case Message::LineEndDisplay:
+	case Message::LineEndDisplayExtend:
+	case Message::LineDownRectExtend:
+	case Message::LineUpRectExtend:
+	case Message::CharLeftRectExtend:
+	case Message::CharRightRectExtend:
+	case Message::HomeRectExtend:
+	case Message::VCHomeRectExtend:
+	case Message::LineEndRectExtend:
+	case Message::PageUpRectExtend:
+	case Message::PageDownRectExtend:
+	case Message::SelectionDuplicate:
+		return KeyCommand(iMessage);
+
+	case Message::BraceHighlight:
+		SetBraceHighlight(PositionFromUPtr(wParam), lParam, StyleBraceLight);
+		break;
+
+	case Message::BraceHighlightIndicator:
+		if (lParam >= 0 && static_cast<size_t>(lParam) <= IndicatorMax) {
+			vs.braceHighlightIndicatorSet = wParam != 0;
+			vs.braceHighlightIndicator = static_cast<int>(lParam);
+		}
+		break;
+
+	case Message::BraceBadLight:
+		SetBraceHighlight(PositionFromUPtr(wParam), -1, StyleBraceBad);
+		break;
+
+	case Message::BraceBadLightIndicator:
+		if (lParam >= 0 && static_cast<size_t>(lParam) <= IndicatorMax) {
+			vs.braceBadLightIndicatorSet = wParam != 0;
+			vs.braceBadLightIndicator = static_cast<int>(lParam);
+		}
+		break;
+
+	case Message::BraceMatch:
+		// wParam is position of char to find brace for,
+		// lParam is maximum amount of text to restyle to find it
+		return pdoc->BraceMatch(PositionFromUPtr(wParam), lParam, 0, false);
+
+	case Message::BraceMatchNext:
+		return pdoc->BraceMatch(PositionFromUPtr(wParam), 0, lParam, true);
+
+	case Message::GetViewEOL:
+		return vs.viewEOL;
+
+	case Message::SetViewEOL:
+		vs.viewEOL = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetZoom: {
+			const int zoomLevel = static_cast<int>(wParam);
+			if (zoomLevel != vs.zoomLevel) {
+				vs.zoomLevel = zoomLevel;
+				InvalidateStyleRedraw();
+				NotifyZoom();
+			}
+			break;
+		}
+
+	case Message::GetZoom:
+		return vs.zoomLevel;
+
+	case Message::GetEdgeColumn:
+		return vs.theEdge.column;
+
+	case Message::SetEdgeColumn:
+		vs.theEdge.column = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetEdgeMode:
+		return static_cast<sptr_t>(vs.edgeState);
+
+	case Message::SetEdgeMode:
+		vs.edgeState = static_cast<EdgeVisualStyle>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetEdgeColour:
+		return vs.theEdge.colour.OpaqueRGB();
+
+	case Message::SetEdgeColour:
+		vs.theEdge.colour = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::MultiEdgeAddLine:
+		vs.AddMultiEdge(wParam, lParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::MultiEdgeClearAll:
+		std::vector<EdgeProperties>().swap(vs.theMultiEdge); // Free vector and memory, C++03 compatible
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetMultiEdgeColumn: {
+			const size_t which = wParam;
+			// size_t is unsigned so this also handles negative inputs.
+			if (which >= vs.theMultiEdge.size()) {
+				return -1;
+			}
+			return vs.theMultiEdge[which].column;
+		}
+
+	case Message::GetAccessibility:
+		return static_cast<sptr_t>(Accessibility::Disabled);
+
+	case Message::SetAccessibility:
+		// May be implemented by platform code.
+		break;
+
+	case Message::GetDocPointer:
+		return reinterpret_cast<sptr_t>(pdoc);
+
+	case Message::SetDocPointer:
+		CancelModes();
+		SetDocPointer(static_cast<Document *>(PtrFromSPtr(lParam)));
+		return 0;
+
+	case Message::CreateDocument: {
+			Document *doc = new Document(static_cast<DocumentOption>(lParam));
+			doc->AddRef();
+			doc->Allocate(PositionFromUPtr(wParam));
+			pcs = ContractionStateCreate(pdoc->IsLarge());
+			return reinterpret_cast<sptr_t>(doc);
+		}
+
+	case Message::AddRefDocument:
+		(static_cast<Document *>(PtrFromSPtr(lParam)))->AddRef();
+		break;
+
+	case Message::ReleaseDocument:
+		(static_cast<Document *>(PtrFromSPtr(lParam)))->Release();
+		break;
+
+	case Message::GetDocumentOptions:
+		return static_cast<sptr_t>(pdoc->Options());
+
+	case Message::CreateLoader: {
+			Document *doc = new Document(static_cast<DocumentOption>(lParam));
+			doc->AddRef();
+			doc->Allocate(PositionFromUPtr(wParam));
+			doc->SetUndoCollection(false);
+			pcs = ContractionStateCreate(pdoc->IsLarge());
+			return reinterpret_cast<sptr_t>(static_cast<ILoader *>(doc));
+		}
+
+	case Message::SetModEventMask:
+		modEventMask = static_cast<ModificationFlags>(wParam);
+		return 0;
+
+	case Message::GetModEventMask:
+		return static_cast<sptr_t>(modEventMask);
+
+	case Message::SetCommandEvents:
+		commandEvents = static_cast<bool>(wParam);
+		return 0;
+
+	case Message::GetCommandEvents:
+		return commandEvents;
+
+	case Message::ConvertEOLs:
+		pdoc->ConvertLineEnds(static_cast<EndOfLine>(wParam));
+		SetSelection(sel.MainCaret(), sel.MainAnchor());	// Ensure selection inside document
+		return 0;
+
+	case Message::SetLengthForEncode:
+		lengthForEncode = PositionFromUPtr(wParam);
+		return 0;
+
+	case Message::SelectionIsRectangle:
+		return sel.selType == Selection::SelTypes::rectangle ? 1 : 0;
+
+	case Message::SetSelectionMode: {
+			switch (static_cast<SelectionMode>(wParam)) {
+			case SelectionMode::Stream:
+				sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::SelTypes::stream));
+				sel.selType = Selection::SelTypes::stream;
+				break;
+			case SelectionMode::Rectangle:
+				sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::SelTypes::rectangle));
+				sel.selType = Selection::SelTypes::rectangle;
+				sel.Rectangular() = sel.RangeMain(); // adjust current selection
+				break;
+			case SelectionMode::Lines:
+				sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::SelTypes::lines));
+				sel.selType = Selection::SelTypes::lines;
+				SetSelection(sel.RangeMain().caret, sel.RangeMain().anchor); // adjust current selection
+				break;
+			case SelectionMode::Thin:
+				sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::SelTypes::thin));
+				sel.selType = Selection::SelTypes::thin;
+				break;
+			default:
+				sel.SetMoveExtends(!sel.MoveExtends() || (sel.selType != Selection::SelTypes::stream));
+				sel.selType = Selection::SelTypes::stream;
+			}
+			InvalidateWholeSelection();
+			break;
+		}
+	case Message::GetSelectionMode:
+		switch (sel.selType) {
+		case Selection::SelTypes::stream:
+			return static_cast<sptr_t>(SelectionMode::Stream);
+		case Selection::SelTypes::rectangle:
+			return static_cast<sptr_t>(SelectionMode::Rectangle);
+		case Selection::SelTypes::lines:
+			return static_cast<sptr_t>(SelectionMode::Lines);
+		case Selection::SelTypes::thin:
+			return static_cast<sptr_t>(SelectionMode::Thin);
+		default:	// ?!
+			return static_cast<sptr_t>(SelectionMode::Stream);
+		}
+	case Message::GetMoveExtendsSelection:
+		return sel.MoveExtends();
+	case Message::GetLineSelStartPosition:
+	case Message::GetLineSelEndPosition: {
+			const SelectionSegment segmentLine(
+				SelectionPosition(pdoc->LineStart(LineFromUPtr(wParam))),
+				SelectionPosition(pdoc->LineEnd(LineFromUPtr(wParam))));
+			for (size_t r=0; r<sel.Count(); r++) {
+				const SelectionSegment portion = sel.Range(r).Intersect(segmentLine);
+				if (portion.start.IsValid()) {
+					return (iMessage == Message::GetLineSelStartPosition) ? portion.start.Position() : portion.end.Position();
+				}
+			}
+			return Sci::invalidPosition;
+		}
+
+	case Message::SetOvertype:
+		if (inOverstrike != (wParam != 0)) {
+			inOverstrike = wParam != 0;
+			ContainerNeedsUpdate(Update::Selection);
+			ShowCaretAtCurrentPosition();
+			SetIdle(true);
+		}
+		break;
+
+	case Message::GetOvertype:
+		return inOverstrike ? 1 : 0;
+
+	case Message::SetFocus:
+		SetFocusState(wParam != 0);
+		break;
+
+	case Message::GetFocus:
+		return hasFocus;
+
+	case Message::SetStatus:
+		errorStatus = static_cast<Status>(wParam);
+		break;
+
+	case Message::GetStatus:
+		return static_cast<sptr_t>(errorStatus);
+
+	case Message::SetMouseDownCaptures:
+		mouseDownCaptures = wParam != 0;
+		break;
+
+	case Message::GetMouseDownCaptures:
+		return mouseDownCaptures;
+
+	case Message::SetMouseWheelCaptures:
+		mouseWheelCaptures = wParam != 0;
+		break;
+
+	case Message::GetMouseWheelCaptures:
+		return mouseWheelCaptures;
+
+	case Message::SetCursor:
+		cursorMode = static_cast<CursorShape>(wParam);
+		DisplayCursor(Window::Cursor::text);
+		break;
+
+	case Message::GetCursor:
+		return static_cast<sptr_t>(cursorMode);
+
+	case Message::SetControlCharSymbol:
+		vs.controlCharSymbol = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetControlCharSymbol:
+		return vs.controlCharSymbol;
+
+	case Message::SetRepresentation:
+		reprs.SetRepresentation(ConstCharPtrFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::GetRepresentation: {
+			const Representation *repr = reprs.RepresentationFromCharacter(
+				ConstCharPtrFromUPtr(wParam));
+			if (repr) {
+				return StringResult(lParam, repr->stringRep.c_str());
+			}
+			return 0;
+		}
+
+	case Message::ClearRepresentation:
+		reprs.ClearRepresentation(ConstCharPtrFromUPtr(wParam));
+		break;
+
+	case Message::ClearAllRepresentations:
+		SetRepresentations();
+		break;
+
+	case Message::SetRepresentationAppearance:
+		reprs.SetRepresentationAppearance(ConstCharPtrFromUPtr(wParam), static_cast<RepresentationAppearance>(lParam));
+		break;
+
+	case Message::GetRepresentationAppearance: {
+			const Representation *repr = reprs.RepresentationFromCharacter(
+				ConstCharPtrFromUPtr(wParam));
+			if (repr) {
+				return static_cast<sptr_t>(repr->appearance);
+			}
+			return 0;
+		}
+	case Message::SetRepresentationColour:
+		reprs.SetRepresentationColour(ConstCharPtrFromUPtr(wParam), ColourRGBA(static_cast<int>(lParam)));
+		break;
+
+	case Message::GetRepresentationColour: {
+			const Representation *repr = reprs.RepresentationFromCharacter(
+				ConstCharPtrFromUPtr(wParam));
+			if (repr) {
+				return repr->colour.AsInteger();
+			}
+			return 0;
+		}
+
+	case Message::StartRecord:
+		recordingMacro = true;
+		return 0;
+
+	case Message::StopRecord:
+		recordingMacro = false;
+		return 0;
+
+	case Message::MoveCaretInsideView:
+		MoveCaretInsideView();
+		break;
+
+	case Message::SetFoldMarginColour:
+		vs.foldmarginColour = OptionalColour(wParam, lParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetFoldMarginHiColour:
+		vs.foldmarginHighlightColour = OptionalColour(wParam, lParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetHotspotActiveFore:
+		if (vs.SetElementColourOptional(Element::HotSpotActive, wParam, lParam)) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetHotspotActiveFore:
+		return vs.ElementColour(Element::HotSpotActive).value_or(ColourRGBA()).OpaqueRGB();
+
+	case Message::SetHotspotActiveBack:
+		if (vs.SetElementColourOptional(Element::HotSpotActiveBack, wParam, lParam)) {
+			InvalidateStyleRedraw();
+		}
+		break;
+
+	case Message::GetHotspotActiveBack:
+		return vs.ElementColour(Element::HotSpotActiveBack).value_or(ColourRGBA()).OpaqueRGB();
+
+	case Message::SetHotspotActiveUnderline:
+		vs.hotspotUnderline = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetHotspotActiveUnderline:
+		return vs.hotspotUnderline ? 1 : 0;
+
+	case Message::SetHotspotSingleLine:
+		hotspotSingleLine = wParam != 0;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetHotspotSingleLine:
+		return hotspotSingleLine ? 1 : 0;
+
+	case Message::SetPasteConvertEndings:
+		convertPastes = wParam != 0;
+		break;
+
+	case Message::GetPasteConvertEndings:
+		return convertPastes ? 1 : 0;
+
+	case Message::GetCharacterPointer:
+		return reinterpret_cast<sptr_t>(pdoc->BufferPointer());
+
+	case Message::GetRangePointer:
+		return reinterpret_cast<sptr_t>(pdoc->RangePointer(
+			PositionFromUPtr(wParam), lParam));
+
+	case Message::GetGapPosition:
+		return pdoc->GapPosition();
+
+	case Message::SetExtraAscent:
+		vs.extraAscent = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetExtraAscent:
+		return vs.extraAscent;
+
+	case Message::SetExtraDescent:
+		vs.extraDescent = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetExtraDescent:
+		return vs.extraDescent;
+
+	case Message::MarginSetStyleOffset:
+		vs.marginStyleOffset = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::MarginGetStyleOffset:
+		return vs.marginStyleOffset;
+
+	case Message::SetMarginOptions:
+		marginOptions = static_cast<MarginOption>(wParam);
+		break;
+
+	case Message::GetMarginOptions:
+		return static_cast<sptr_t>(marginOptions);
+
+	case Message::MarginSetText:
+		pdoc->MarginSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+		break;
+
+	case Message::MarginGetText: {
+			const StyledText st = pdoc->MarginStyledText(LineFromUPtr(wParam));
+			return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
+		}
+
+	case Message::MarginSetStyle:
+		pdoc->MarginSetStyle(LineFromUPtr(wParam), static_cast<int>(lParam));
+		break;
+
+	case Message::MarginGetStyle: {
+			const StyledText st = pdoc->MarginStyledText(LineFromUPtr(wParam));
+			return st.style;
+		}
+
+	case Message::MarginSetStyles:
+		pdoc->MarginSetStyles(LineFromUPtr(wParam), ConstUCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::MarginGetStyles: {
+			const StyledText st = pdoc->MarginStyledText(LineFromUPtr(wParam));
+			return BytesResult(lParam, st.styles, st.length);
+		}
+
+	case Message::MarginTextClearAll:
+		pdoc->MarginClearAll();
+		break;
+
+	case Message::AnnotationSetText:
+		pdoc->AnnotationSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AnnotationGetText: {
+			const StyledText st = pdoc->AnnotationStyledText(LineFromUPtr(wParam));
+			return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
+		}
+
+	case Message::AnnotationGetStyle: {
+			const StyledText st = pdoc->AnnotationStyledText(LineFromUPtr(wParam));
+			return st.style;
+		}
+
+	case Message::AnnotationSetStyle:
+		pdoc->AnnotationSetStyle(LineFromUPtr(wParam), static_cast<int>(lParam));
+		break;
+
+	case Message::AnnotationSetStyles:
+		pdoc->AnnotationSetStyles(LineFromUPtr(wParam), ConstUCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AnnotationGetStyles: {
+			const StyledText st = pdoc->AnnotationStyledText(LineFromUPtr(wParam));
+			return BytesResult(lParam, st.styles, st.length);
+		}
+
+	case Message::AnnotationGetLines:
+		return pdoc->AnnotationLines(LineFromUPtr(wParam));
+
+	case Message::AnnotationClearAll:
+		pdoc->AnnotationClearAll();
+		break;
+
+	case Message::AnnotationSetVisible:
+		SetAnnotationVisible(static_cast<AnnotationVisible>(wParam));
+		break;
+
+	case Message::AnnotationGetVisible:
+		return static_cast<sptr_t>(vs.annotationVisible);
+
+	case Message::AnnotationSetStyleOffset:
+		vs.annotationStyleOffset = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::AnnotationGetStyleOffset:
+		return vs.annotationStyleOffset;
+
+	case Message::EOLAnnotationSetText:
+		pdoc->EOLAnnotationSetText(LineFromUPtr(wParam), CharPtrFromSPtr(lParam));
+		break;
+
+	case Message::EOLAnnotationGetText: {
+			const StyledText st = pdoc->EOLAnnotationStyledText(LineFromUPtr(wParam));
+			return BytesResult(lParam, reinterpret_cast<const unsigned char *>(st.text), st.length);
+		}
+
+	case Message::EOLAnnotationGetStyle: {
+			const StyledText st = pdoc->EOLAnnotationStyledText(LineFromUPtr(wParam));
+			return st.style;
+		}
+
+	case Message::EOLAnnotationSetStyle:
+		pdoc->EOLAnnotationSetStyle(LineFromUPtr(wParam), static_cast<int>(lParam));
+		break;
+
+	case Message::EOLAnnotationClearAll:
+		pdoc->EOLAnnotationClearAll();
+		break;
+
+	case Message::EOLAnnotationSetVisible:
+		SetEOLAnnotationVisible(static_cast<EOLAnnotationVisible>(wParam));
+		break;
+
+	case Message::EOLAnnotationGetVisible:
+		return static_cast<sptr_t>(vs.eolAnnotationVisible);
+
+	case Message::EOLAnnotationSetStyleOffset:
+		vs.eolAnnotationStyleOffset = static_cast<int>(wParam);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::EOLAnnotationGetStyleOffset:
+		return vs.eolAnnotationStyleOffset;
+
+	case Message::ReleaseAllExtendedStyles:
+		vs.ReleaseAllExtendedStyles();
+		break;
+
+	case Message::AllocateExtendedStyles:
+		return vs.AllocateExtendedStyles(static_cast<int>(wParam));
+
+	case Message::SupportsFeature:
+		return SupportsFeature(static_cast<Supports>(wParam));
+
+	case Message::AddUndoAction:
+		pdoc->AddUndoAction(PositionFromUPtr(wParam),
+			FlagSet(static_cast<UndoFlags>(lParam), UndoFlags::MayCoalesce));
+		break;
+
+	case Message::SetMouseSelectionRectangularSwitch:
+		mouseSelectionRectangularSwitch = wParam != 0;
+		break;
+
+	case Message::GetMouseSelectionRectangularSwitch:
+		return mouseSelectionRectangularSwitch;
+
+	case Message::SetMultipleSelection:
+		multipleSelection = wParam != 0;
+		InvalidateCaret();
+		break;
+
+	case Message::GetMultipleSelection:
+		return multipleSelection;
+
+	case Message::SetAdditionalSelectionTyping:
+		additionalSelectionTyping = wParam != 0;
+		InvalidateCaret();
+		break;
+
+	case Message::GetAdditionalSelectionTyping:
+		return additionalSelectionTyping;
+
+	case Message::SetMultiPaste:
+		multiPasteMode = static_cast<MultiPaste>(wParam);
+		break;
+
+	case Message::GetMultiPaste:
+		return static_cast<sptr_t>(multiPasteMode);
+
+	case Message::SetAdditionalCaretsBlink:
+		view.additionalCaretsBlink = wParam != 0;
+		InvalidateCaret();
+		break;
+
+	case Message::GetAdditionalCaretsBlink:
+		return view.additionalCaretsBlink;
+
+	case Message::SetAdditionalCaretsVisible:
+		view.additionalCaretsVisible = wParam != 0;
+		InvalidateCaret();
+		break;
+
+	case Message::GetAdditionalCaretsVisible:
+		return view.additionalCaretsVisible;
+
+	case Message::GetSelections:
+		return sel.Count();
+
+	case Message::GetSelectionEmpty:
+		return sel.Empty();
+
+	case Message::ClearSelections:
+		sel.Clear();
+		ContainerNeedsUpdate(Update::Selection);
+		Redraw();
+		break;
+
+	case Message::SetSelection:
+		sel.SetSelection(SelectionRange(PositionFromUPtr(wParam), lParam));
+		Redraw();
+		break;
+
+	case Message::AddSelection:
+		sel.AddSelection(SelectionRange(PositionFromUPtr(wParam), lParam));
+		ContainerNeedsUpdate(Update::Selection);
+		Redraw();
+		break;
+
+	case Message::DropSelectionN:
+		sel.DropSelection(wParam);
+		ContainerNeedsUpdate(Update::Selection);
+		Redraw();
+		break;
+
+	case Message::SetMainSelection:
+		sel.SetMain(wParam);
+		ContainerNeedsUpdate(Update::Selection);
+		Redraw();
+		break;
+
+	case Message::GetMainSelection:
+		return sel.Main();
+
+	case Message::SetSelectionNCaret:
+	case Message::SetSelectionNAnchor:
+	case Message::SetSelectionNCaretVirtualSpace:
+	case Message::SetSelectionNAnchorVirtualSpace:
+	case Message::SetSelectionNStart:
+	case Message::SetSelectionNEnd:
+		SetSelectionNMessage(iMessage, wParam, lParam);
+		break;
+
+	case Message::GetSelectionNCaret:
+		return sel.Range(wParam).caret.Position();
+
+	case Message::GetSelectionNAnchor:
+		return sel.Range(wParam).anchor.Position();
+
+	case Message::GetSelectionNCaretVirtualSpace:
+		return sel.Range(wParam).caret.VirtualSpace();
+
+	case Message::GetSelectionNAnchorVirtualSpace:
+		return sel.Range(wParam).anchor.VirtualSpace();
+
+	case Message::GetSelectionNStart:
+		return sel.Range(wParam).Start().Position();
+
+	case Message::GetSelectionNStartVirtualSpace:
+		return sel.Range(wParam).Start().VirtualSpace();
+
+	case Message::GetSelectionNEnd:
+		return sel.Range(wParam).End().Position();
+
+	case Message::GetSelectionNEndVirtualSpace:
+		return sel.Range(wParam).End().VirtualSpace();
+
+	case Message::SetRectangularSelectionCaret:
+		if (!sel.IsRectangular())
+			sel.Clear();
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular().caret.SetPosition(PositionFromUPtr(wParam));
+		SetRectangularRange();
+		Redraw();
+		break;
+
+	case Message::GetRectangularSelectionCaret:
+		return sel.Rectangular().caret.Position();
+
+	case Message::SetRectangularSelectionAnchor:
+		if (!sel.IsRectangular())
+			sel.Clear();
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular().anchor.SetPosition(PositionFromUPtr(wParam));
+		SetRectangularRange();
+		Redraw();
+		break;
+
+	case Message::GetRectangularSelectionAnchor:
+		return sel.Rectangular().anchor.Position();
+
+	case Message::SetRectangularSelectionCaretVirtualSpace:
+		if (!sel.IsRectangular())
+			sel.Clear();
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular().caret.SetVirtualSpace(PositionFromUPtr(wParam));
+		SetRectangularRange();
+		Redraw();
+		break;
+
+	case Message::GetRectangularSelectionCaretVirtualSpace:
+		return sel.Rectangular().caret.VirtualSpace();
+
+	case Message::SetRectangularSelectionAnchorVirtualSpace:
+		if (!sel.IsRectangular())
+			sel.Clear();
+		sel.selType = Selection::SelTypes::rectangle;
+		sel.Rectangular().anchor.SetVirtualSpace(PositionFromUPtr(wParam));
+		SetRectangularRange();
+		Redraw();
+		break;
+
+	case Message::GetRectangularSelectionAnchorVirtualSpace:
+		return sel.Rectangular().anchor.VirtualSpace();
+
+	case Message::SetVirtualSpaceOptions:
+		virtualSpaceOptions = static_cast<VirtualSpace>(wParam);
+		break;
+
+	case Message::GetVirtualSpaceOptions:
+		return static_cast<sptr_t>(virtualSpaceOptions);
+
+	case Message::SetAdditionalSelFore:
+		vs.elementColours[Element::SelectionAdditionalText] = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetAdditionalSelBack:
+		vs.SetElementRGB(Element::SelectionAdditionalBack, static_cast<int>(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::SetAdditionalSelAlpha:
+		vs.SetElementAlpha(Element::SelectionAdditionalBack, static_cast<int>(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetAdditionalSelAlpha:
+		if (vs.selection.layer == Layer::Base)
+			return static_cast<sptr_t>(Alpha::NoAlpha);
+		return vs.ElementColour(Element::SelectionAdditionalBack)->GetAlpha();
+
+	case Message::SetAdditionalCaretFore:
+		vs.elementColours[Element::CaretAdditional] = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::GetAdditionalCaretFore:
+		return vs.ElementColour(Element::CaretAdditional)->OpaqueRGB();
+
+	case Message::RotateSelection:
+		sel.RotateMain();
+		InvalidateWholeSelection();
+		break;
+
+	case Message::SwapMainAnchorCaret:
+		InvalidateSelection(sel.RangeMain());
+		sel.RangeMain().Swap();
+		break;
+
+	case Message::MultipleSelectAddNext:
+		MultipleSelectAdd(AddNumber::one);
+		break;
+
+	case Message::MultipleSelectAddEach:
+		MultipleSelectAdd(AddNumber::each);
+		break;
+
+	case Message::ChangeLexerState:
+		pdoc->ChangeLexerState(PositionFromUPtr(wParam), lParam);
+		break;
+
+	case Message::SetIdentifier:
+		SetCtrlID(static_cast<int>(wParam));
+		break;
+
+	case Message::GetIdentifier:
+		return GetCtrlID();
+
+	case Message::SetTechnology:
+		// No action by default
+		break;
+
+	case Message::GetTechnology:
+		return static_cast<sptr_t>(technology);
+
+	case Message::CountCharacters:
+		return pdoc->CountCharacters(PositionFromUPtr(wParam), lParam);
+
+	case Message::CountCodeUnits:
+		return pdoc->CountUTF16(PositionFromUPtr(wParam), lParam);
+
+	default:
+		return DefWndProc(iMessage, wParam, lParam);
+	}
+	//Platform::DebugPrintf("end wnd proc\n");
+	return 0;
+}
diff --git a/scite-app/scintilla/src/Editor.h b/scite-app/scintilla/src/Editor.h
new file mode 100644
index 0000000..417700e
--- /dev/null
+++ b/scite-app/scintilla/src/Editor.h
@@ -0,0 +1,715 @@
+// Scintilla source code edit control
+/** @file Editor.h
+ ** Defines the main editor class.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef EDITOR_H
+#define EDITOR_H
+
+namespace Scintilla::Internal {
+
+/**
+ */
+class Timer {
+public:
+	bool ticking;
+	int ticksToWait;
+	enum {tickSize = 100};
+	TickerID tickerID;
+
+	Timer() noexcept;
+};
+
+/**
+ */
+class Idler {
+public:
+	bool state;
+	IdlerID idlerID;
+
+	Idler() noexcept;
+};
+
+/**
+ * When platform has a way to generate an event before painting,
+ * accumulate needed styling range and other work items in
+ * WorkNeeded to avoid unnecessary work inside paint handler
+ */
+
+enum class WorkItems {
+	none = 0,
+	style = 1,
+	updateUI = 2
+};
+
+class WorkNeeded {
+public:
+	enum WorkItems items;
+	Sci::Position upTo;
+
+	WorkNeeded() noexcept : items(WorkItems::none), upTo(0) {}
+	void Reset() noexcept {
+		items = WorkItems::none;
+		upTo = 0;
+	}
+	void Need(WorkItems items_, Sci::Position pos) noexcept {
+		if (Scintilla::FlagSet(items_, WorkItems::style) && (upTo < pos))
+			upTo = pos;
+		items = static_cast<WorkItems>(static_cast<int>(items) | static_cast<int>(items_));
+	}
+};
+
+/**
+ * Hold a piece of text selected for copying or dragging, along with encoding and selection format information.
+ */
+class SelectionText {
+	std::string s;
+public:
+	bool rectangular;
+	bool lineCopy;
+	int codePage;
+	Scintilla::CharacterSet characterSet;
+	SelectionText() noexcept : rectangular(false), lineCopy(false), codePage(0), characterSet(Scintilla::CharacterSet::Ansi) {}
+	void Clear() noexcept {
+		s.clear();
+		rectangular = false;
+		lineCopy = false;
+		codePage = 0;
+		characterSet = Scintilla::CharacterSet::Ansi;
+	}
+	void Copy(const std::string &s_, int codePage_, Scintilla::CharacterSet characterSet_, bool rectangular_, bool lineCopy_) {
+		s = s_;
+		codePage = codePage_;
+		characterSet = characterSet_;
+		rectangular = rectangular_;
+		lineCopy = lineCopy_;
+		FixSelectionForClipboard();
+	}
+	void Copy(const SelectionText &other) {
+		Copy(other.s, other.codePage, other.characterSet, other.rectangular, other.lineCopy);
+	}
+	const char *Data() const noexcept {
+		return s.c_str();
+	}
+	size_t Length() const noexcept {
+		return s.length();
+	}
+	size_t LengthWithTerminator() const noexcept {
+		return s.length() + 1;
+	}
+	bool Empty() const noexcept {
+		return s.empty();
+	}
+private:
+	void FixSelectionForClipboard() {
+		// To avoid truncating the contents of the clipboard when pasted where the
+		// clipboard contains NUL characters, replace NUL characters by spaces.
+		std::replace(s.begin(), s.end(), '\0', ' ');
+	}
+};
+
+struct WrapPending {
+	// The range of lines that need to be wrapped
+	enum { lineLarge = 0x7ffffff };
+	Sci::Line start;	// When there are wraps pending, will be in document range
+	Sci::Line end;	// May be lineLarge to indicate all of document after start
+	WrapPending() noexcept {
+		start = lineLarge;
+		end = lineLarge;
+	}
+	void Reset() noexcept {
+		start = lineLarge;
+		end = lineLarge;
+	}
+	void Wrapped(Sci::Line line) noexcept {
+		if (start == line)
+			start++;
+	}
+	bool NeedsWrap() const noexcept {
+		return start < end;
+	}
+	bool AddRange(Sci::Line lineStart, Sci::Line lineEnd) noexcept {
+		const bool neededWrap = NeedsWrap();
+		bool changed = false;
+		if (start > lineStart) {
+			start = lineStart;
+			changed = true;
+		}
+		if ((end < lineEnd) || !neededWrap) {
+			end = lineEnd;
+			changed = true;
+		}
+		return changed;
+	}
+};
+
+struct CaretPolicySlop {
+	Scintilla::CaretPolicy policy;	// Combination from CaretPolicy::Slop, CaretPolicy::Strict, CaretPolicy::Jumps, CaretPolicy::Even
+	int slop;	// Pixels for X, lines for Y
+	CaretPolicySlop(Scintilla::CaretPolicy policy_, intptr_t slop_) noexcept :
+		policy(policy_), slop(static_cast<int>(slop_)) {}
+	CaretPolicySlop(uintptr_t policy_=0, intptr_t slop_=0) noexcept :
+		policy(static_cast<Scintilla::CaretPolicy>(policy_)), slop(static_cast<int>(slop_)) {}
+};
+
+struct CaretPolicies {
+	CaretPolicySlop x;
+	CaretPolicySlop y;
+};
+
+struct VisiblePolicySlop {
+	Scintilla::VisiblePolicy policy;	// Combination from VisiblePolicy::Slop, VisiblePolicy::Strict
+	int slop;	// Pixels for X, lines for Y
+	VisiblePolicySlop(uintptr_t policy_ = 0, intptr_t slop_ = 0) noexcept :
+		policy(static_cast<Scintilla::VisiblePolicy>(policy_)), slop(static_cast<int>(slop_)) {}
+};
+
+enum class XYScrollOptions {
+	none = 0x0,
+	useMargin = 0x1,
+	vertical = 0x2,
+	horizontal = 0x4,
+	all = useMargin | vertical | horizontal
+};
+
+constexpr XYScrollOptions operator|(XYScrollOptions a, XYScrollOptions b) noexcept {
+	return static_cast<XYScrollOptions>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+/**
+ */
+class Editor : public EditModel, public DocWatcher {
+protected:	// ScintillaBase subclass needs access to much of Editor
+
+	/** On GTK+, Scintilla is a container widget holding two scroll bars
+	 * whereas on Windows there is just one window with both scroll bars turned on. */
+	Window wMain;	///< The Scintilla parent window
+	Window wMargin;	///< May be separate when using a scroll view for wMain
+
+	/** Style resources may be expensive to allocate so are cached between uses.
+	 * When a style attribute is changed, this cache is flushed. */
+	bool stylesValid;
+	ViewStyle vs;
+	Scintilla::Technology technology;
+	Point sizeRGBAImage;
+	float scaleRGBAImage;
+
+	MarginView marginView;
+	EditView view;
+
+	Scintilla::CursorShape cursorMode;
+
+	bool mouseDownCaptures;
+	bool mouseWheelCaptures;
+
+	int xCaretMargin;	///< Ensure this many pixels visible on both sides of caret
+	bool horizontalScrollBarVisible;
+	int scrollWidth;
+	bool verticalScrollBarVisible;
+	bool endAtLastLine;
+	Scintilla::CaretSticky caretSticky;
+	Scintilla::MarginOption marginOptions;
+	bool mouseSelectionRectangularSwitch;
+	bool multipleSelection;
+	bool additionalSelectionTyping;
+	Scintilla::MultiPaste multiPasteMode;
+
+	Scintilla::VirtualSpace virtualSpaceOptions;
+
+	KeyMap kmap;
+
+	Timer timer;
+	Timer autoScrollTimer;
+	enum { autoScrollDelay = 200 };
+
+	Idler idler;
+
+	Point lastClick;
+	unsigned int lastClickTime;
+	Point doubleClickCloseThreshold;
+	int dwellDelay;
+	int ticksToDwell;
+	bool dwelling;
+	enum class TextUnit { character, word, subLine, wholeLine } selectionUnit;
+	Point ptMouseLast;
+	enum class DragDrop { none, initial, dragging } inDragDrop;
+	bool dropWentOutside;
+	SelectionPosition posDrop;
+	Sci::Position hotSpotClickPos;
+	int lastXChosen;
+	Sci::Position lineAnchorPos;
+	Sci::Position originalAnchorPos;
+	Sci::Position wordSelectAnchorStartPos;
+	Sci::Position wordSelectAnchorEndPos;
+	Sci::Position wordSelectInitialCaretPos;
+	SelectionSegment targetRange;
+	Scintilla::FindOption searchFlags;
+	Sci::Line topLine;
+	Sci::Position posTopLine;
+	Sci::Position lengthForEncode;
+
+	Scintilla::Update needUpdateUI;
+
+	enum class PaintState { notPainting, painting, abandoned } paintState;
+	bool paintAbandonedByStyling;
+	PRectangle rcPaint;
+	bool paintingAllText;
+	bool willRedrawAll;
+	WorkNeeded workNeeded;
+	Scintilla::IdleStyling idleStyling;
+	bool needIdleStyling;
+
+	Scintilla::ModificationFlags modEventMask;
+	bool commandEvents;
+
+	SelectionText drag;
+
+	CaretPolicies caretPolicies;
+
+	VisiblePolicySlop visiblePolicy;
+
+	Sci::Position searchAnchor;
+
+	bool recordingMacro;
+
+	Scintilla::AutomaticFold foldAutomatic;
+
+	// Wrapping support
+	WrapPending wrapPending;
+	ActionDuration durationWrapOneByte;
+
+	bool convertPastes;
+
+	Editor();
+	// Deleted so Editor objects can not be copied.
+	Editor(const Editor &) = delete;
+	Editor(Editor &&) = delete;
+	Editor &operator=(const Editor &) = delete;
+	Editor &operator=(Editor &&) = delete;
+	// ~Editor() in public section
+	virtual void Initialise() = 0;
+	virtual void Finalise();
+
+	void InvalidateStyleData();
+	void InvalidateStyleRedraw();
+	void RefreshStyleData();
+	void SetRepresentations();
+	void DropGraphics() noexcept;
+
+	// The top left visible point in main window coordinates. Will be 0,0 except for
+	// scroll views where it will be equivalent to the current scroll position.
+	Point GetVisibleOriginInMain() const override;
+	PointDocument DocumentPointFromView(Point ptView) const;  // Convert a point from view space to document
+	Sci::Line TopLineOfMain() const override;   // Return the line at Main's y coordinate 0
+	virtual PRectangle GetClientRectangle() const;
+	virtual PRectangle GetClientDrawingRectangle();
+	PRectangle GetTextRectangle() const;
+
+	Sci::Line LinesOnScreen() const override;
+	Sci::Line LinesToScroll() const;
+	Sci::Line MaxScrollPos() const;
+	SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const;
+	Point LocationFromPosition(SelectionPosition pos, PointEnd pe=PointEnd::start);
+	Point LocationFromPosition(Sci::Position pos, PointEnd pe=PointEnd::start);
+	int XFromPosition(SelectionPosition sp);
+	SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true);
+	Sci::Position PositionFromLocation(Point pt, bool canReturnInvalid = false, bool charPosition = false);
+	SelectionPosition SPositionFromLineX(Sci::Line lineDoc, int x);
+	Sci::Position PositionFromLineX(Sci::Line lineDoc, int x);
+	Sci::Line LineFromLocation(Point pt) const;
+	void SetTopLine(Sci::Line topLineNew);
+
+	virtual bool AbandonPaint();
+	virtual void RedrawRect(PRectangle rc);
+	virtual void DiscardOverdraw();
+	virtual void Redraw();
+	void RedrawSelMargin(Sci::Line line=-1, bool allAfter=false);
+	PRectangle RectangleFromRange(Range r, int overlap);
+	void InvalidateRange(Sci::Position start, Sci::Position end);
+
+	bool UserVirtualSpace() const noexcept {
+		return (FlagSet(virtualSpaceOptions, Scintilla::VirtualSpace::UserAccessible));
+	}
+	Sci::Position CurrentPosition() const;
+	bool SelectionEmpty() const noexcept;
+	SelectionPosition SelectionStart();
+	SelectionPosition SelectionEnd();
+	void SetRectangularRange();
+	void ThinRectangularRange();
+	void InvalidateSelection(SelectionRange newMain, bool invalidateWholeSelection=false);
+	void InvalidateWholeSelection();
+	SelectionRange LineSelectionRange(SelectionPosition currentPos_, SelectionPosition anchor_) const;
+	void SetSelection(SelectionPosition currentPos_, SelectionPosition anchor_);
+	void SetSelection(Sci::Position currentPos_, Sci::Position anchor_);
+	void SetSelection(SelectionPosition currentPos_);
+	void SetEmptySelection(SelectionPosition currentPos_);
+	void SetEmptySelection(Sci::Position currentPos_);
+	enum class AddNumber { one, each };
+	void MultipleSelectAdd(AddNumber addNumber);
+	bool RangeContainsProtected(Sci::Position start, Sci::Position end) const noexcept;
+	bool SelectionContainsProtected() const;
+	Sci::Position MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd=true) const;
+	SelectionPosition MovePositionOutsideChar(SelectionPosition pos, Sci::Position moveDir, bool checkLineEnd=true) const;
+	void MovedCaret(SelectionPosition newPos, SelectionPosition previousPos,
+		bool ensureVisible, CaretPolicies policies);
+	void MovePositionTo(SelectionPosition newPos, Selection::SelTypes selt=Selection::SelTypes::none, bool ensureVisible=true);
+	void MovePositionTo(Sci::Position newPos, Selection::SelTypes selt=Selection::SelTypes::none, bool ensureVisible=true);
+	SelectionPosition MovePositionSoVisible(SelectionPosition pos, int moveDir);
+	SelectionPosition MovePositionSoVisible(Sci::Position pos, int moveDir);
+	Point PointMainCaret();
+	void SetLastXChosen();
+
+	void ScrollTo(Sci::Line line, bool moveThumb=true);
+	virtual void ScrollText(Sci::Line linesToMove);
+	void HorizontalScrollTo(int xPos);
+	void VerticalCentreCaret();
+	void MoveSelectedLines(int lineDelta);
+	void MoveSelectedLinesUp();
+	void MoveSelectedLinesDown();
+	void MoveCaretInsideView(bool ensureVisible=true);
+	Sci::Line DisplayFromPosition(Sci::Position pos);
+
+	struct XYScrollPosition {
+		int xOffset;
+		Sci::Line topLine;
+		XYScrollPosition(int xOffset_, Sci::Line topLine_) noexcept : xOffset(xOffset_), topLine(topLine_) {}
+		bool operator==(const XYScrollPosition &other) const noexcept {
+			return (xOffset == other.xOffset) && (topLine == other.topLine);
+		}
+	};
+	XYScrollPosition XYScrollToMakeVisible(const SelectionRange &range,
+		const XYScrollOptions options, CaretPolicies policies);
+	void SetXYScroll(XYScrollPosition newXY);
+	void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true);
+	void ScrollRange(SelectionRange range);
+	void ShowCaretAtCurrentPosition();
+	void DropCaret();
+	void CaretSetPeriod(int period);
+	void InvalidateCaret();
+	virtual void NotifyCaretMove();
+	virtual void UpdateSystemCaret();
+
+	bool Wrapping() const noexcept;
+	void NeedWrapping(Sci::Line docLineStart=0, Sci::Line docLineEnd=WrapPending::lineLarge);
+	bool WrapOneLine(Surface *surface, Sci::Line lineToWrap);
+	enum class WrapScope {wsAll, wsVisible, wsIdle};
+	bool WrapLines(WrapScope ws);
+	void LinesJoin();
+	void LinesSplit(int pixelWidth);
+
+	void PaintSelMargin(Surface *surfaceWindow, const PRectangle &rc);
+	void RefreshPixMaps(Surface *surfaceWindow);
+	void Paint(Surface *surfaceWindow, PRectangle rcArea);
+	Sci::Position FormatRange(bool draw, const Scintilla::RangeToFormat *pfr);
+	long TextWidth(Scintilla::uptr_t style, const char *text);
+
+	virtual void SetVerticalScrollPos() = 0;
+	virtual void SetHorizontalScrollPos() = 0;
+	virtual bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) = 0;
+	virtual void ReconfigureScrollBars();
+	void SetScrollBars();
+	void ChangeSize();
+
+	void FilterSelections();
+	Sci::Position RealizeVirtualSpace(Sci::Position position, Sci::Position virtualSpace);
+	SelectionPosition RealizeVirtualSpace(const SelectionPosition &position);
+	void AddChar(char ch);
+	virtual void InsertCharacter(std::string_view sv, Scintilla::CharacterSource charSource);
+	void ClearBeforeTentativeStart();
+	void InsertPaste(const char *text, Sci::Position len);
+	enum class PasteShape { stream=0, rectangular = 1, line = 2 };
+	void InsertPasteShape(const char *text, Sci::Position len, PasteShape shape);
+	void ClearSelection(bool retainMultipleSelections = false);
+	void ClearAll();
+	void ClearDocumentStyle();
+	virtual void Cut();
+	void PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len);
+	virtual void Copy() = 0;
+	void CopyAllowLine();
+	virtual bool CanPaste();
+	virtual void Paste() = 0;
+	void Clear();
+	virtual void SelectAll();
+	virtual void Undo();
+	virtual void Redo();
+	void DelCharBack(bool allowLineStartDeletion);
+	virtual void ClaimSelection() = 0;
+
+	static Scintilla::KeyMod ModifierFlags(bool shift, bool ctrl, bool alt, bool meta=false, bool super=false) noexcept;
+	virtual void NotifyChange() = 0;
+	virtual void NotifyFocus(bool focus);
+	virtual void SetCtrlID(int identifier);
+	virtual int GetCtrlID() { return ctrlID; }
+	virtual void NotifyParent(Scintilla::NotificationData scn) = 0;
+	virtual void NotifyStyleToNeeded(Sci::Position endStyleNeeded);
+	void NotifyChar(int ch, Scintilla::CharacterSource charSource);
+	void NotifySavePoint(bool isSavePoint);
+	void NotifyModifyAttempt();
+	virtual void NotifyDoubleClick(Point pt, Scintilla::KeyMod modifiers);
+	void NotifyHotSpotClicked(Sci::Position position, Scintilla::KeyMod modifiers);
+	void NotifyHotSpotDoubleClicked(Sci::Position position, Scintilla::KeyMod modifiers);
+	void NotifyHotSpotReleaseClick(Sci::Position position, Scintilla::KeyMod modifiers);
+	bool NotifyUpdateUI();
+	void NotifyPainted();
+	void NotifyIndicatorClick(bool click, Sci::Position position, Scintilla::KeyMod modifiers);
+	bool NotifyMarginClick(Point pt, Scintilla::KeyMod modifiers);
+	bool NotifyMarginRightClick(Point pt, Scintilla::KeyMod modifiers);
+	void NotifyNeedShown(Sci::Position pos, Sci::Position len);
+	void NotifyDwelling(Point pt, bool state);
+	void NotifyZoom();
+
+	void NotifyModifyAttempt(Document *document, void *userData) override;
+	void NotifySavePoint(Document *document, void *userData, bool atSavePoint) override;
+	void CheckModificationForWrap(DocModification mh);
+	void NotifyModified(Document *document, DocModification mh, void *userData) override;
+	void NotifyDeleted(Document *document, void *userData) noexcept override;
+	void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endStyleNeeded) override;
+	void NotifyLexerChanged(Document *doc, void *userData) override;
+	void NotifyErrorOccurred(Document *doc, void *userData, Scintilla::Status status) override;
+	void NotifyMacroRecord(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+	void ContainerNeedsUpdate(Scintilla::Update flags) noexcept;
+	void PageMove(int direction, Selection::SelTypes selt=Selection::SelTypes::none, bool stuttered = false);
+	enum class CaseMapping { same, upper, lower };
+	virtual std::string CaseMapString(const std::string &s, CaseMapping caseMapping);
+	void ChangeCaseOfSelection(CaseMapping caseMapping);
+	void LineTranspose();
+	void LineReverse();
+	void Duplicate(bool forLine);
+	virtual void CancelModes();
+	void NewLine();
+	SelectionPosition PositionUpOrDown(SelectionPosition spStart, int direction, int lastX);
+	void CursorUpOrDown(int direction, Selection::SelTypes selt);
+	void ParaUpOrDown(int direction, Selection::SelTypes selt);
+	Range RangeDisplayLine(Sci::Line lineVisible);
+	Sci::Position StartEndDisplayLine(Sci::Position pos, bool start);
+	Sci::Position VCHomeDisplayPosition(Sci::Position position);
+	Sci::Position VCHomeWrapPosition(Sci::Position position);
+	Sci::Position LineEndWrapPosition(Sci::Position position);
+	int HorizontalMove(Scintilla::Message iMessage);
+	int DelWordOrLine(Scintilla::Message iMessage);
+	virtual int KeyCommand(Scintilla::Message iMessage);
+	virtual int KeyDefault(Scintilla::Keys /* key */, Scintilla::KeyMod /*modifiers*/);
+	int KeyDownWithModifiers(Scintilla::Keys key, Scintilla::KeyMod modifiers, bool *consumed);
+
+	void Indent(bool forwards);
+
+	virtual std::unique_ptr<CaseFolder> CaseFolderForEncoding();
+	Sci::Position FindText(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	void SearchAnchor();
+	Sci::Position SearchText(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	Sci::Position SearchInTarget(const char *text, Sci::Position length);
+	void GoToLine(Sci::Line lineNo);
+
+	virtual void CopyToClipboard(const SelectionText &selectedText) = 0;
+	std::string RangeText(Sci::Position start, Sci::Position end) const;
+	void CopySelectionRange(SelectionText *ss, bool allowLineCopy=false);
+	void CopyRangeToClipboard(Sci::Position start, Sci::Position end);
+	void CopyText(size_t length, const char *text);
+	void SetDragPosition(SelectionPosition newPos);
+	virtual void DisplayCursor(Window::Cursor c);
+	virtual bool DragThreshold(Point ptStart, Point ptNow);
+	virtual void StartDrag();
+	void DropAt(SelectionPosition position, const char *value, size_t lengthValue, bool moving, bool rectangular);
+	void DropAt(SelectionPosition position, const char *value, bool moving, bool rectangular);
+	/** PositionInSelection returns true if position in selection. */
+	bool PositionInSelection(Sci::Position pos);
+	bool PointInSelection(Point pt);
+	bool PointInSelMargin(Point pt) const;
+	Window::Cursor GetMarginCursor(Point pt) const noexcept;
+	void TrimAndSetSelection(Sci::Position currentPos_, Sci::Position anchor_);
+	void LineSelection(Sci::Position lineCurrentPos_, Sci::Position lineAnchorPos_, bool wholeLine);
+	void WordSelection(Sci::Position pos);
+	void DwellEnd(bool mouseMoved);
+	void MouseLeave();
+	virtual void ButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers);
+	virtual void RightButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers);
+	void ButtonMoveWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers);
+	void ButtonUpWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers);
+
+	bool Idle();
+	enum class TickReason { caret, scroll, widen, dwell, platform };
+	virtual void TickFor(TickReason reason);
+	virtual bool FineTickerRunning(TickReason reason);
+	virtual void FineTickerStart(TickReason reason, int millis, int tolerance);
+	virtual void FineTickerCancel(TickReason reason);
+	virtual bool SetIdle(bool) { return false; }
+	virtual void SetMouseCapture(bool on) = 0;
+	virtual bool HaveMouseCapture() = 0;
+	void SetFocusState(bool focusState);
+	virtual void UpdateBaseElements();
+
+	Sci::Position PositionAfterArea(PRectangle rcArea) const;
+	void StyleToPositionInView(Sci::Position pos);
+	Sci::Position PositionAfterMaxStyling(Sci::Position posMax, bool scrolling) const;
+	void StartIdleStyling(bool truncatedLastStyling);
+	void StyleAreaBounded(PRectangle rcArea, bool scrolling);
+	constexpr bool SynchronousStylingToVisible() const noexcept {
+		return (idleStyling == Scintilla::IdleStyling::None) || (idleStyling == Scintilla::IdleStyling::AfterVisible);
+	}
+	void IdleStyle();
+	virtual void IdleWork();
+	virtual void QueueIdleWork(WorkItems items, Sci::Position upTo=0);
+
+	virtual int SupportsFeature(Scintilla::Supports feature);
+	virtual bool PaintContains(PRectangle rc);
+	bool PaintContainsMargin();
+	void CheckForChangeOutsidePaint(Range r);
+	void SetBraceHighlight(Sci::Position pos0, Sci::Position pos1, int matchStyle);
+
+	void SetAnnotationHeights(Sci::Line start, Sci::Line end);
+	virtual void SetDocPointer(Document *document);
+
+	void SetAnnotationVisible(Scintilla::AnnotationVisible visible);
+	void SetEOLAnnotationVisible(Scintilla::EOLAnnotationVisible visible);
+
+	Sci::Line ExpandLine(Sci::Line line);
+	void SetFoldExpanded(Sci::Line lineDoc, bool expanded);
+	void FoldLine(Sci::Line line, Scintilla::FoldAction action);
+	void FoldExpand(Sci::Line line, Scintilla::FoldAction action, Scintilla::FoldLevel level);
+	Sci::Line ContractedFoldNext(Sci::Line lineStart) const;
+	void EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy);
+	void FoldChanged(Sci::Line line, Scintilla::FoldLevel levelNow, Scintilla::FoldLevel levelPrev);
+	void NeedShown(Sci::Position pos, Sci::Position len);
+	void FoldAll(Scintilla::FoldAction action);
+
+	Sci::Position GetTag(char *tagValue, int tagNumber);
+	Sci::Position ReplaceTarget(bool replacePatterns, const char *text, Sci::Position length=-1);
+
+	bool PositionIsHotspot(Sci::Position position) const;
+	bool PointIsHotspot(Point pt);
+	void SetHotSpotRange(const Point *pt);
+	Range GetHotSpotRange() const noexcept override;
+	void SetHoverIndicatorPosition(Sci::Position position);
+	void SetHoverIndicatorPoint(Point pt);
+
+	int CodePage() const noexcept;
+	virtual bool ValidCodePage(int /* codePage */) const { return true; }
+	virtual std::string UTF8FromEncoded(std::string_view encoded) const = 0;
+	virtual std::string EncodedFromUTF8(std::string_view utf8) const = 0;
+
+	Sci::Line WrapCount(Sci::Line line);
+	void AddStyledText(const char *buffer, Sci::Position appendLength);
+
+	virtual Scintilla::sptr_t DefWndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) = 0;
+	bool ValidMargin(Scintilla::uptr_t wParam) const noexcept;
+	void StyleSetMessage(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	Scintilla::sptr_t StyleGetMessage(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	void SetSelectionNMessage(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+	static const char *StringFromEOLMode(Scintilla::EndOfLine eolMode) noexcept;
+
+	// Coercion functions for transforming WndProc parameters into pointers
+	static void *PtrFromSPtr(Scintilla::sptr_t lParam) noexcept {
+		return reinterpret_cast<void *>(lParam);
+	}
+	static const char *ConstCharPtrFromSPtr(Scintilla::sptr_t lParam) noexcept {
+		return static_cast<const char *>(PtrFromSPtr(lParam));
+	}
+	static const unsigned char *ConstUCharPtrFromSPtr(Scintilla::sptr_t lParam) noexcept {
+		return static_cast<const unsigned char *>(PtrFromSPtr(lParam));
+	}
+	static char *CharPtrFromSPtr(Scintilla::sptr_t lParam) noexcept {
+		return static_cast<char *>(PtrFromSPtr(lParam));
+	}
+	static unsigned char *UCharPtrFromSPtr(Scintilla::sptr_t lParam) noexcept {
+		return static_cast<unsigned char *>(PtrFromSPtr(lParam));
+	}
+	static void *PtrFromUPtr(Scintilla::uptr_t wParam) noexcept {
+		return reinterpret_cast<void *>(wParam);
+	}
+	static const char *ConstCharPtrFromUPtr(Scintilla::uptr_t wParam) noexcept {
+		return static_cast<const char *>(PtrFromUPtr(wParam));
+	}
+
+	static constexpr Scintilla::sptr_t SPtrFromUPtr(Scintilla::uptr_t wParam) noexcept {
+		return static_cast<Scintilla::sptr_t>(wParam);
+	}
+	static constexpr Sci::Position PositionFromUPtr(Scintilla::uptr_t wParam) noexcept {
+		return SPtrFromUPtr(wParam);
+	}
+	static constexpr Sci::Line LineFromUPtr(Scintilla::uptr_t wParam) noexcept {
+		return SPtrFromUPtr(wParam);
+	}
+	Point PointFromParameters(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) const noexcept {
+		return Point(static_cast<XYPOSITION>(wParam) - vs.ExternalMarginWidth(), static_cast<XYPOSITION>(lParam));
+	}
+
+	constexpr std::optional<FoldLevel> OptionalFoldLevel(Scintilla::sptr_t lParam) {
+		if (lParam >= 0) {
+			return static_cast<FoldLevel>(lParam);
+		}
+		return std::nullopt;
+	}
+
+	static Scintilla::sptr_t StringResult(Scintilla::sptr_t lParam, const char *val) noexcept;
+	static Scintilla::sptr_t BytesResult(Scintilla::sptr_t lParam, const unsigned char *val, size_t len) noexcept;
+
+	// Set a variable controlling appearance to a value and invalidates the display
+	// if a change was made. Avoids extra text and the possibility of mistyping.
+	template <typename T>
+	bool SetAppearance(T &variable, T value) {
+		// Using ! and == as more types have == defined than !=.
+		const bool changed = !(variable == value);
+		if (changed) {
+			variable = value;
+			InvalidateStyleRedraw();
+		}
+		return changed;
+	}
+
+public:
+	~Editor() override;
+
+	// Public so the COM thunks can access it.
+	bool IsUnicodeMode() const noexcept;
+	// Public so scintilla_send_message can use it.
+	virtual Scintilla::sptr_t WndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	// Public so scintilla_set_id can use it.
+	int ctrlID;
+	// Public so COM methods for drag and drop can set it.
+	Scintilla::Status errorStatus;
+	friend class AutoSurface;
+};
+
+/**
+ * A smart pointer class to ensure Surfaces are set up and deleted correctly.
+ */
+class AutoSurface {
+private:
+	std::unique_ptr<Surface> surf;
+public:
+	AutoSurface(const Editor *ed) {
+		if (ed->wMain.GetID()) {
+			surf = Surface::Allocate(ed->technology);
+			surf->Init(ed->wMain.GetID());
+			surf->SetMode(SurfaceMode(ed->CodePage(), ed->BidirectionalR2L()));
+		}
+	}
+	AutoSurface(SurfaceID sid, Editor *ed, std::optional<Scintilla::Technology> technology = {}) {
+		if (ed->wMain.GetID()) {
+			surf = Surface::Allocate(technology ? *technology : ed->technology);
+			surf->Init(sid, ed->wMain.GetID());
+			surf->SetMode(SurfaceMode(ed->CodePage(), ed->BidirectionalR2L()));
+		}
+	}
+	// Deleted so AutoSurface objects can not be copied.
+	AutoSurface(const AutoSurface &) = delete;
+	AutoSurface(AutoSurface &&) = delete;
+	void operator=(const AutoSurface &) = delete;
+	void operator=(AutoSurface &&) = delete;
+	~AutoSurface() {
+	}
+	Surface *operator->() const noexcept {
+		return surf.get();
+	}
+	operator Surface *() const noexcept {
+		return surf.get();
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/ElapsedPeriod.h b/scite-app/scintilla/src/ElapsedPeriod.h
new file mode 100644
index 0000000..36f03e1
--- /dev/null
+++ b/scite-app/scintilla/src/ElapsedPeriod.h
@@ -0,0 +1,35 @@
+// Scintilla source code edit control
+/** @file ElapsedPeriod.h
+ ** Encapsulate C++ <chrono> to simplify use.
+ **/
+// Copyright 2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef ELAPSEDPERIOD_H
+#define ELAPSEDPERIOD_H
+
+namespace Scintilla::Internal {
+
+// Simplified access to high precision timing.
+class ElapsedPeriod {
+	using ElapsedClock = std::chrono::steady_clock;
+	ElapsedClock::time_point tp;
+public:
+	/// Capture the moment
+	ElapsedPeriod() noexcept : tp(ElapsedClock::now()) {
+	}
+	/// Return duration as floating point seconds
+	double Duration(bool reset=false) noexcept {
+		const ElapsedClock::time_point tpNow = ElapsedClock::now();
+		const std::chrono::duration<double> duration =
+			std::chrono::duration_cast<std::chrono::duration<double>>(tpNow - tp);
+		if (reset) {
+			tp = tpNow;
+		}
+		return duration.count();
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/FontQuality.h b/scite-app/scintilla/src/FontQuality.h
new file mode 100644
index 0000000..b587fc6
--- /dev/null
+++ b/scite-app/scintilla/src/FontQuality.h
@@ -0,0 +1,27 @@
+// Scintilla source code edit control
+/** @file FontQuality.h
+ ** Definitions to control font anti-aliasing.
+ ** Redefine constants from Scintilla.h to avoid including Scintilla.h in PlatWin.cxx.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef FONTQUALITY_H
+#define FONTQUALITY_H
+
+namespace Scintilla {
+
+// These definitions match Scintilla.h
+//#define SC_EFF_QUALITY_MASK            0xF
+//#define SC_EFF_QUALITY_DEFAULT           0
+//#define SC_EFF_QUALITY_NON_ANTIALIASED   1
+//#define SC_EFF_QUALITY_ANTIALIASED       2
+//#define SC_EFF_QUALITY_LCD_OPTIMIZED     3
+
+// These definitions must match SC_TECHNOLOGY_* in Scintilla.h
+//#define SCWIN_TECH_GDI 0
+//#define SCWIN_TECH_DIRECTWRITE 1
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Geometry.cxx b/scite-app/scintilla/src/Geometry.cxx
new file mode 100644
index 0000000..afdc5d1
--- /dev/null
+++ b/scite-app/scintilla/src/Geometry.cxx
@@ -0,0 +1,98 @@
+// Scintilla source code edit control
+/** @file Geometry.cxx
+ ** Helper functions for geometric calculations.
+ **/
+// Copyright 2020 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdint>
+#include <cmath>
+
+#include <algorithm>
+
+#include "Geometry.h"
+
+namespace Scintilla::Internal {
+
+PRectangle Clamp(PRectangle rc, Edge edge, XYPOSITION position) noexcept {
+	switch (edge) {
+	case Edge::left:
+		return PRectangle(std::clamp(position, rc.left, rc.right), rc.top, rc.right, rc.bottom);
+	case Edge::top:
+		return PRectangle(rc.left, std::clamp(position, rc.top, rc.bottom), rc.right, rc.bottom);
+	case Edge::right:
+		return PRectangle(rc.left, rc.top, std::clamp(position, rc.left, rc.right), rc.bottom);
+	case Edge::bottom:
+	default:
+		return PRectangle(rc.left, rc.top, rc.right, std::clamp(position, rc.top, rc.bottom));
+	}
+}
+
+PRectangle Side(PRectangle rc, Edge edge, XYPOSITION size) noexcept {
+	switch (edge) {
+	case Edge::left:
+		return PRectangle(rc.left, rc.top, std::min(rc.left + size, rc.right), rc.bottom);
+	case Edge::top:
+		return PRectangle(rc.left, rc.top, rc.right, std::min(rc.top + size, rc.bottom));
+	case Edge::right:
+		return PRectangle(std::max(rc.left, rc.right - size), rc.top, rc.right, rc.bottom);
+	case Edge::bottom:
+	default:
+		return PRectangle(rc.left, std::max(rc.top, rc.bottom - size), rc.right, rc.bottom);
+	}
+}
+
+Interval Intersection(Interval a, Interval b) noexcept {
+	const XYPOSITION leftMax = std::max(a.left, b.left);
+	const XYPOSITION rightMin = std::min(a.right, b.right);
+	// If the result would have a negative width. make empty instead.
+	const XYPOSITION rightResult = (rightMin >= leftMax) ? rightMin : leftMax;
+	return { leftMax, rightResult };
+}
+
+PRectangle Intersection(PRectangle rc, Interval horizontalBounds) noexcept {
+	const Interval intersection = Intersection(HorizontalBounds(rc), horizontalBounds);
+	return PRectangle(intersection.left, rc.top, intersection.right, rc.bottom);
+}
+
+Interval HorizontalBounds(PRectangle rc) noexcept {
+	return { rc.left, rc.right };
+}
+
+XYPOSITION PixelAlign(XYPOSITION xy, int pixelDivisions) noexcept {
+	return std::round(xy * pixelDivisions) / pixelDivisions;
+}
+
+XYPOSITION PixelAlignFloor(XYPOSITION xy, int pixelDivisions) noexcept {
+	return std::floor(xy * pixelDivisions) / pixelDivisions;
+}
+
+Point PixelAlign(const Point &pt, int pixelDivisions) noexcept {
+	return Point(
+		     std::round(pt.x * pixelDivisions) / pixelDivisions,
+		     std::round(pt.y * pixelDivisions) / pixelDivisions);
+}
+
+PRectangle PixelAlign(const PRectangle &rc, int pixelDivisions) noexcept {
+	// Move left and right side to nearest pixel to avoid blurry visuals.
+	// The top and bottom should be integers but floor them to make sure.
+	// `pixelDivisions` is commonly 1 except for 'retina' displays where it is 2.
+	// On retina displays, the positions should be moved to the nearest device
+	// pixel which is the nearest half logical pixel.
+	return PRectangle(
+		std::round(rc.left * pixelDivisions) / pixelDivisions,
+		PixelAlignFloor(rc.top, pixelDivisions),
+		std::round(rc.right * pixelDivisions) / pixelDivisions,
+		PixelAlignFloor(rc.bottom, pixelDivisions));
+}
+
+PRectangle PixelAlignOutside(const PRectangle &rc, int pixelDivisions) noexcept {
+	// Move left and right side to extremes (floor(left) ceil(right)) to avoid blurry visuals.
+	return PRectangle(
+		std::floor(rc.left * pixelDivisions) / pixelDivisions,
+		std::floor(rc.top * pixelDivisions) / pixelDivisions,
+		std::ceil(rc.right * pixelDivisions) / pixelDivisions,
+		std::floor(rc.bottom * pixelDivisions) / pixelDivisions);
+}
+
+}
diff --git a/scite-app/scintilla/src/Geometry.h b/scite-app/scintilla/src/Geometry.h
new file mode 100644
index 0000000..6456af0
--- /dev/null
+++ b/scite-app/scintilla/src/Geometry.h
@@ -0,0 +1,311 @@
+// Scintilla source code edit control
+/** @file Geometry.h
+ ** Classes and functions for geometric and colour calculations.
+ **/
+// Copyright 2020 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef GEOMETRY_H
+#define GEOMETRY_H
+
+namespace Scintilla::Internal {
+
+typedef double XYPOSITION;
+typedef double XYACCUMULATOR;
+
+/**
+ * A geometric point class.
+ * Point is similar to the Win32 POINT and GTK+ GdkPoint types.
+ */
+class Point {
+public:
+	XYPOSITION x;
+	XYPOSITION y;
+
+	constexpr explicit Point(XYPOSITION x_=0, XYPOSITION y_=0) noexcept : x(x_), y(y_) {
+	}
+
+	static constexpr Point FromInts(int x_, int y_) noexcept {
+		return Point(static_cast<XYPOSITION>(x_), static_cast<XYPOSITION>(y_));
+	}
+
+	constexpr bool operator==(Point other) const noexcept {
+		return (x == other.x) && (y == other.y);
+	}
+
+	constexpr bool operator!=(Point other) const noexcept {
+		return (x != other.x) || (y != other.y);
+	}
+
+	constexpr Point operator+(Point other) const noexcept {
+		return Point(x + other.x, y + other.y);
+	}
+
+	constexpr Point operator-(Point other) const noexcept {
+		return Point(x - other.x, y - other.y);
+	}
+
+	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
+};
+
+
+/**
+ * A geometric interval class.
+ */
+class Interval {
+public:
+	XYPOSITION left;
+	XYPOSITION right;
+	constexpr bool operator==(const Interval &other) const noexcept {
+		return (left == other.left) && (right == other.right);
+	}
+	constexpr XYPOSITION Width() const noexcept { return right - left; }
+	constexpr bool Empty() const noexcept {
+		return Width() <= 0;
+	}
+	constexpr bool Intersects(Interval other) const noexcept {
+		return (right > other.left) && (left < other.right);
+	}
+};
+
+/**
+ * A geometric rectangle class.
+ * PRectangle is similar to Win32 RECT.
+ * PRectangles contain their top and left sides, but not their right and bottom sides.
+ */
+class PRectangle {
+public:
+	XYPOSITION left;
+	XYPOSITION top;
+	XYPOSITION right;
+	XYPOSITION bottom;
+
+	constexpr explicit PRectangle(XYPOSITION left_=0, XYPOSITION top_=0, XYPOSITION right_=0, XYPOSITION bottom_ = 0) noexcept :
+		left(left_), top(top_), right(right_), bottom(bottom_) {
+	}
+
+	static constexpr PRectangle FromInts(int left_, int top_, int right_, int bottom_) noexcept {
+		return PRectangle(static_cast<XYPOSITION>(left_), static_cast<XYPOSITION>(top_),
+			static_cast<XYPOSITION>(right_), static_cast<XYPOSITION>(bottom_));
+	}
+
+	// Other automatically defined methods (assignment, copy constructor, destructor) are fine
+
+	constexpr bool operator==(const PRectangle &rc) const noexcept {
+		return (rc.left == left) && (rc.right == right) &&
+			(rc.top == top) && (rc.bottom == bottom);
+	}
+	constexpr bool Contains(Point pt) const noexcept {
+		return (pt.x >= left) && (pt.x <= right) &&
+			(pt.y >= top) && (pt.y <= bottom);
+	}
+	constexpr bool ContainsWholePixel(Point pt) const noexcept {
+		// Does the rectangle contain all of the pixel to left/below the point
+		return (pt.x >= left) && ((pt.x+1) <= right) &&
+			(pt.y >= top) && ((pt.y+1) <= bottom);
+	}
+	constexpr bool Contains(PRectangle rc) const noexcept {
+		return (rc.left >= left) && (rc.right <= right) &&
+			(rc.top >= top) && (rc.bottom <= bottom);
+	}
+	constexpr bool Intersects(PRectangle other) const noexcept {
+		return (right > other.left) && (left < other.right) &&
+			(bottom > other.top) && (top < other.bottom);
+	}
+	void Move(XYPOSITION xDelta, XYPOSITION yDelta) noexcept {
+		left += xDelta;
+		top += yDelta;
+		right += xDelta;
+		bottom += yDelta;
+	}
+
+	constexpr PRectangle Inset(XYPOSITION delta) const noexcept {
+		return PRectangle(left + delta, top + delta, right - delta, bottom - delta);
+	}
+
+	constexpr PRectangle Inset(Point delta) const noexcept {
+		return PRectangle(left + delta.x, top + delta.y, right - delta.x, bottom - delta.y);
+	}
+
+	constexpr Point Centre() const noexcept {
+		return Point((left + right) / 2, (top + bottom) / 2);
+	}
+
+	constexpr XYPOSITION Width() const noexcept { return right - left; }
+	constexpr XYPOSITION Height() const noexcept { return bottom - top; }
+	constexpr bool Empty() const noexcept {
+		return (Height() <= 0) || (Width() <= 0);
+	}
+};
+
+enum class Edge { left, top, bottom, right };
+
+PRectangle Clamp(PRectangle rc, Edge edge, XYPOSITION position) noexcept;
+PRectangle Side(PRectangle rc, Edge edge, XYPOSITION size) noexcept;
+
+Interval Intersection(Interval a, Interval b) noexcept;
+PRectangle Intersection(PRectangle rc, Interval horizontalBounds) noexcept;
+Interval HorizontalBounds(PRectangle rc) noexcept;
+
+XYPOSITION PixelAlign(XYPOSITION xy, int pixelDivisions) noexcept;
+XYPOSITION PixelAlignFloor(XYPOSITION xy, int pixelDivisions) noexcept;
+
+Point PixelAlign(const Point &pt, int pixelDivisions) noexcept;
+
+PRectangle PixelAlign(const PRectangle &rc, int pixelDivisions) noexcept;
+PRectangle PixelAlignOutside(const PRectangle &rc, int pixelDivisions) noexcept;
+
+/**
+* Holds an RGBA colour with 8 bits for each component.
+*/
+constexpr const float componentMaximum = 255.0f;
+class ColourRGBA {
+	int co;
+	constexpr static unsigned int Mixed(unsigned char a, unsigned char b, double proportion) noexcept {
+		return static_cast<unsigned int>(a + proportion * (b - a));
+	}
+public:
+	constexpr explicit ColourRGBA(int co_ = 0) noexcept : co(co_) {
+	}
+
+	constexpr ColourRGBA(unsigned int red, unsigned int green, unsigned int blue, unsigned int alpha=0xff) noexcept :
+		ColourRGBA(red | (green << 8) | (blue << 16) | (alpha << 24)) {
+	}
+
+	constexpr ColourRGBA(ColourRGBA cd, unsigned int alpha) noexcept :
+		ColourRGBA(cd.OpaqueRGB() | (alpha << 24)) {
+	}
+
+	static constexpr ColourRGBA FromRGB(int co_) noexcept {
+		return ColourRGBA(co_ | (0xffu << 24));
+	}
+
+	static constexpr ColourRGBA FromIpRGB(intptr_t co_) noexcept {
+		return ColourRGBA(static_cast<int>(co_) | (0xffu << 24));
+	}
+
+	constexpr ColourRGBA WithoutAlpha() const noexcept {
+		return ColourRGBA(co & 0xffffff);
+	}
+
+	constexpr ColourRGBA Opaque() const noexcept {
+		return ColourRGBA(co | (0xffu << 24));
+	}
+
+	constexpr int AsInteger() const noexcept {
+		return co;
+	}
+
+	constexpr int OpaqueRGB() const noexcept {
+		return co & 0xffffff;
+	}
+
+	// Red, green and blue values as bytes 0..255
+	constexpr unsigned char GetRed() const noexcept {
+		return co & 0xff;
+	}
+	constexpr unsigned char GetGreen() const noexcept {
+		return (co >> 8) & 0xff;
+	}
+	constexpr unsigned char GetBlue() const noexcept {
+		return (co >> 16) & 0xff;
+	}
+	constexpr unsigned char GetAlpha() const noexcept {
+		return (co >> 24) & 0xff;
+	}
+
+	// Red, green, blue, and alpha values as float 0..1.0
+	constexpr float GetRedComponent() const noexcept {
+		return GetRed() / componentMaximum;
+	}
+	constexpr float GetGreenComponent() const noexcept {
+		return GetGreen() / componentMaximum;
+	}
+	constexpr float GetBlueComponent() const noexcept {
+		return GetBlue() / componentMaximum;
+	}
+	constexpr float GetAlphaComponent() const noexcept {
+		return GetAlpha() / componentMaximum;
+	}
+
+	constexpr bool operator==(const ColourRGBA &other) const noexcept {
+		return co == other.co;
+	}
+
+	constexpr bool IsOpaque() const noexcept {
+		return GetAlpha() == 0xff;
+	}
+
+	constexpr ColourRGBA MixedWith(ColourRGBA other) const noexcept {
+		const unsigned int red = (GetRed() + other.GetRed()) / 2;
+		const unsigned int green = (GetGreen() + other.GetGreen()) / 2;
+		const unsigned int blue = (GetBlue() + other.GetBlue()) / 2;
+		const unsigned int alpha = (GetAlpha() + other.GetAlpha()) / 2;
+		return ColourRGBA(red, green, blue, alpha);
+	}
+
+	constexpr ColourRGBA MixedWith(ColourRGBA other, double proportion) const noexcept {
+		return ColourRGBA(
+			Mixed(GetRed(), other.GetRed(), proportion),
+			Mixed(GetGreen(), other.GetGreen(), proportion),
+			Mixed(GetBlue(), other.GetBlue(), proportion),
+			Mixed(GetAlpha(), other.GetAlpha(), proportion));
+	}
+};
+
+/**
+* Holds an RGBA colour and stroke width to stroke a shape.
+*/
+class Stroke {
+public:
+	ColourRGBA colour;
+	XYPOSITION width;
+	constexpr Stroke(ColourRGBA colour_, XYPOSITION width_=1.0) noexcept : 
+		colour(colour_), width(width_) {
+	}
+	constexpr float WidthF() const noexcept {
+		return static_cast<float>(width);
+	}
+};
+
+/**
+* Holds an RGBA colour to fill a shape.
+*/
+class Fill {
+public:
+	ColourRGBA colour;
+	constexpr Fill(ColourRGBA colour_) noexcept : 
+		colour(colour_) {
+	}
+};
+
+/**
+* Holds a pair of RGBA colours and stroke width to fill and stroke a shape.
+*/
+class FillStroke {
+public:
+	Fill fill;
+	Stroke stroke;
+	constexpr FillStroke(ColourRGBA colourFill_, ColourRGBA colourStroke_, XYPOSITION widthStroke_=1.0) noexcept : 
+		fill(colourFill_), stroke(colourStroke_, widthStroke_) {
+	}
+	constexpr FillStroke(ColourRGBA colourBoth, XYPOSITION widthStroke_=1.0) noexcept : 
+		fill(colourBoth), stroke(colourBoth, widthStroke_) {
+	}
+};
+
+/**
+* Holds an element of a gradient with an RGBA colour and a relative position.
+*/
+class ColourStop {
+public:
+	XYPOSITION position;
+	ColourRGBA colour;
+	constexpr ColourStop(XYPOSITION position_, ColourRGBA colour_) noexcept :
+		position(position_), colour(colour_) {
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Indicator.cxx b/scite-app/scintilla/src/Indicator.cxx
new file mode 100644
index 0000000..0dd9ba7
--- /dev/null
+++ b/scite-app/scintilla/src/Indicator.cxx
@@ -0,0 +1,291 @@
+// Scintilla source code edit control
+/** @file Indicator.cxx
+ ** Defines the style of indicators which are text decorations such as underlining.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cmath>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Indicator.h"
+#include "XPM.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, State state, int value) const {
+	StyleAndColour sacDraw = sacNormal;
+	if (FlagSet(Flags(), IndicFlag::ValueFore)) {
+		sacDraw.fore = ColourRGBA::FromRGB(value & static_cast<int>(IndicValue::Mask));
+	}
+	if (state == State::hover) {
+		sacDraw = sacHover;
+	}
+
+	const int pixelDivisions = surface->PixelDivisions();
+
+	const XYPOSITION halfWidth = strokeWidth / 2.0f;
+
+	const PRectangle rcAligned(PixelAlignOutside(rc, pixelDivisions));
+	PRectangle rcFullHeightAligned = PixelAlignOutside(rcLine, pixelDivisions);
+	rcFullHeightAligned.left = rcAligned.left;
+	rcFullHeightAligned.right = rcAligned.right;
+
+	const XYPOSITION ymid = PixelAlign(rc.Centre().y, pixelDivisions);
+
+	// This is a reasonable clip for indicators beneath text like underlines 
+	PRectangle rcClip = rcAligned;
+	rcClip.bottom = rcFullHeightAligned.bottom;
+
+	switch (sacDraw.style) {
+	case IndicatorStyle::Squiggle: {
+			surface->SetClip(rcClip);
+			XYPOSITION x = rcAligned.left + halfWidth;
+			const XYPOSITION top = rcAligned.top + halfWidth;
+			const XYPOSITION xLast = rcAligned.right + halfWidth;
+			XYPOSITION y = 0;
+			std::vector<Point> pts;
+			const XYPOSITION pitch = 1 + strokeWidth;
+			pts.emplace_back(x, top + y);
+			while (x < xLast) {
+				x += pitch;
+				y = pitch - y;
+				pts.emplace_back(x, top + y);
+				}
+			surface->PolyLine(pts.data(), std::size(pts), Stroke(sacDraw.fore, strokeWidth));
+			surface->PopClip();
+		}
+		break;
+
+	case IndicatorStyle::SquigglePixmap: {
+			const PRectangle rcSquiggle = PixelAlign(rc, 1);
+
+			const int width = std::min(4000, static_cast<int>(rcSquiggle.Width()));
+			RGBAImage image(width, 3, 1.0, nullptr);
+			constexpr unsigned int alphaFull = 0xff;
+			constexpr unsigned int alphaSide = 0x2f;
+			constexpr unsigned int alphaSide2 = 0x5f;
+			for (int x = 0; x < width; x++) {
+				if (x%2) {
+					// Two halfway columns have a full pixel in middle flanked by light pixels
+					image.SetPixel(x, 0, ColourRGBA(sacDraw.fore, alphaSide));
+					image.SetPixel(x, 1, ColourRGBA(sacDraw.fore, alphaFull));
+					image.SetPixel(x, 2, ColourRGBA(sacDraw.fore, alphaSide));
+				} else {
+					// Extreme columns have a full pixel at bottom or top and a mid-tone pixel in centre
+					image.SetPixel(x, (x % 4) ? 0 : 2, ColourRGBA(sacDraw.fore, alphaFull));
+					image.SetPixel(x, 1, ColourRGBA(sacDraw.fore, alphaSide2));
+				}
+			}
+			surface->DrawRGBAImage(rcSquiggle, image.GetWidth(), image.GetHeight(), image.Pixels());
+		}
+		break;
+
+	case IndicatorStyle::SquiggleLow: {
+			std::vector<Point> pts;
+			const XYPOSITION top = rcAligned.top + halfWidth;
+			int y = 0;
+			XYPOSITION x = std::round(rcAligned.left) + halfWidth;
+			pts.emplace_back(x, top + y);
+			const XYPOSITION pitch = 2 + strokeWidth;
+			x += pitch;
+			while (x < rcAligned.right) {
+				pts.emplace_back(x - 1, top + y);
+				y = 1 - y;
+				pts.emplace_back(x, top + y);
+				x += pitch;
+			}
+			pts.emplace_back(rcAligned.right, top + y);
+			surface->PolyLine(pts.data(), std::size(pts), Stroke(sacDraw.fore, strokeWidth));
+		}
+		break;
+
+	case IndicatorStyle::TT: {
+			surface->SetClip(rcClip);
+			const XYPOSITION yLine = ymid;
+			XYPOSITION x = rcAligned.left + 5.0f;
+			const XYPOSITION pitch = 4 + strokeWidth;
+			while (x < rc.right + pitch) {
+				const PRectangle line(x-pitch, yLine, x, yLine + strokeWidth);
+				surface->FillRectangle(line, sacDraw.fore);
+				const PRectangle tail(x - 2 - strokeWidth, yLine + strokeWidth, x - 2, yLine + strokeWidth * 2);
+				surface->FillRectangle(tail, sacDraw.fore);
+				x++;
+				x += pitch;
+			}
+			surface->PopClip();
+		}
+		break;
+
+	case IndicatorStyle::Diagonal: {
+			surface->SetClip(rcClip);
+			XYPOSITION x = rcAligned.left + halfWidth;
+			const XYPOSITION top = rcAligned.top + halfWidth;
+			const XYPOSITION pitch = 3 + strokeWidth;
+			while (x < rc.right) {
+				const XYPOSITION endX = x+3;
+				const XYPOSITION endY = top - 1;
+				surface->LineDraw(Point(x, top + 2), Point(endX, endY), Stroke(sacDraw.fore, strokeWidth));
+				x += pitch;
+			}
+			surface->PopClip();
+		}
+		break;
+
+	case IndicatorStyle::Strike: {
+			const XYPOSITION yStrike = std::round(rcLine.Centre().y);
+			const PRectangle rcStrike(
+				rcAligned.left, yStrike, rcAligned.right, yStrike + strokeWidth);
+			surface->FillRectangle(rcStrike, sacDraw.fore);
+		}
+		break;
+
+	case IndicatorStyle::Hidden:
+	case IndicatorStyle::TextFore:
+		// Draw nothing
+		break;
+
+	case IndicatorStyle::Box: {
+			PRectangle rcBox = rcFullHeightAligned;
+			rcBox.top = rcBox.top + 1.0f;
+			rcBox.bottom = ymid + 1.0f;
+			surface->RectangleFrame(rcBox, Stroke(ColourRGBA(sacDraw.fore, outlineAlpha), strokeWidth));
+		}
+		break;
+
+	case IndicatorStyle::RoundBox:
+	case IndicatorStyle::StraightBox:
+	case IndicatorStyle::FullBox: {
+			PRectangle rcBox = rcFullHeightAligned;
+			if (sacDraw.style != IndicatorStyle::FullBox)
+				rcBox.top = rcBox.top + 1;
+			surface->AlphaRectangle(rcBox, (sacDraw.style == IndicatorStyle::RoundBox) ? 1.0f : 0.0f,
+						FillStroke(ColourRGBA(sacDraw.fore, fillAlpha), ColourRGBA(sacDraw.fore, outlineAlpha), strokeWidth));
+		}
+		break;
+
+	case IndicatorStyle::Gradient:
+	case IndicatorStyle::GradientCentre: {
+			PRectangle rcBox = rcFullHeightAligned;
+			rcBox.top = rcBox.top + 1;
+			const Surface::GradientOptions options = Surface::GradientOptions::topToBottom;
+			const ColourRGBA start(sacDraw.fore, fillAlpha);
+			const ColourRGBA end(sacDraw.fore, 0);
+			std::vector<ColourStop> stops;
+			switch (sacDraw.style) {
+			case IndicatorStyle::Gradient:
+				stops.push_back(ColourStop(0.0, start));
+				stops.push_back(ColourStop(1.0, end));
+				break;
+			case IndicatorStyle::GradientCentre:
+				stops.push_back(ColourStop(0.0, end));
+				stops.push_back(ColourStop(0.5, start));
+				stops.push_back(ColourStop(1.0, end));
+				break;
+			default:
+				break;
+			}
+			surface->GradientRectangle(rcBox, stops, options);
+		}
+		break;
+
+	case IndicatorStyle::DotBox: {
+			PRectangle rcBox = rcFullHeightAligned;
+			rcBox.top = rcBox.top + 1;
+			// Cap width at 4000 to avoid large allocations when mistakes made
+			const int width = std::min(static_cast<int>(rcBox.Width()), 4000);
+			const int height = static_cast<int>(rcBox.Height());
+			RGBAImage image(width, height, 1.0, nullptr);
+			// Draw horizontal lines top and bottom
+			for (int x=0; x<width; x++) {
+				for (int y = 0; y< height; y += height - 1) {
+					image.SetPixel(x, y, ColourRGBA(sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha));
+				}
+			}
+			// Draw vertical lines left and right
+			for (int y = 1; y<height; y++) {
+				for (int x=0; x<width; x += width-1) {
+					image.SetPixel(x, y, ColourRGBA(sacDraw.fore, ((x + y) % 2) ? outlineAlpha : fillAlpha));
+				}
+			}
+			surface->DrawRGBAImage(rcBox, image.GetWidth(), image.GetHeight(), image.Pixels());
+		}
+		break;
+
+	case IndicatorStyle::Dash: {
+			XYPOSITION x = std::floor(rc.left);
+			const XYPOSITION widthDash = 3 + std::round(strokeWidth);
+			while (x < rc.right) {
+				const PRectangle rcDash = PRectangle(x, ymid,
+					x + widthDash, ymid + std::round(strokeWidth));
+				surface->FillRectangle(rcDash, sacDraw.fore);
+				x += 3 + widthDash;
+			}
+		}
+		break;
+
+	case IndicatorStyle::Dots: {
+			const XYPOSITION widthDot = std::round(strokeWidth);
+			XYPOSITION x = std::floor(rc.left);
+			while (x < rc.right) {
+				const PRectangle rcDot = PRectangle(x, ymid, 
+					x + widthDot, ymid + widthDot);
+				surface->FillRectangle(rcDot, sacDraw.fore);
+				x += widthDot * 2;
+			}
+		}
+		break;
+
+	case IndicatorStyle::CompositionThick: {
+			const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom);
+			surface->FillRectangle(rcComposition, sacDraw.fore);
+		}
+		break;
+
+	case IndicatorStyle::CompositionThin: {
+			const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom-1);
+			surface->FillRectangle(rcComposition, sacDraw.fore);
+		}
+		break;
+
+	case IndicatorStyle::Point:
+	case IndicatorStyle::PointCharacter:
+		if (rcCharacter.Width() >= 0.1) {
+			const XYPOSITION pixelHeight = std::floor(rc.Height() - 1.0f);	// 1 pixel onto next line if multiphase
+			const XYPOSITION x = (sacDraw.style == IndicatorStyle::Point) ? (rcCharacter.left) : ((rcCharacter.right + rcCharacter.left) / 2);
+			// 0.5f is to hit midpoint of pixels:
+			const XYPOSITION ix = std::round(x) + 0.5f;
+			const XYPOSITION iy = std::floor(rc.top + 1.0f) + 0.5f;
+			const Point pts[] = {
+				Point(ix - pixelHeight, iy + pixelHeight),	// Left
+				Point(ix + pixelHeight, iy + pixelHeight),	// Right
+				Point(ix, iy)								// Top
+			};
+			surface->Polygon(pts, std::size(pts), FillStroke(sacDraw.fore));
+		}
+		break;
+
+	default:
+		// Either IndicatorStyle::Plain or unknown
+		surface->FillRectangle(PRectangle(rcAligned.left, ymid,
+			rcAligned.right, ymid + std::round(strokeWidth)), sacDraw.fore);
+	}
+}
+
+void Indicator::SetFlags(IndicFlag attributes_) noexcept {
+	attributes = attributes_;
+}
diff --git a/scite-app/scintilla/src/Indicator.h b/scite-app/scintilla/src/Indicator.h
new file mode 100644
index 0000000..fc17a82
--- /dev/null
+++ b/scite-app/scintilla/src/Indicator.h
@@ -0,0 +1,57 @@
+// Scintilla source code edit control
+/** @file Indicator.h
+ ** Defines the style of indicators which are text decorations such as underlining.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef INDICATOR_H
+#define INDICATOR_H
+
+namespace Scintilla::Internal {
+
+struct StyleAndColour {
+	Scintilla::IndicatorStyle style;
+	ColourRGBA fore;
+	StyleAndColour() noexcept : style(Scintilla::IndicatorStyle::Plain), fore(0, 0, 0) {
+	}
+	StyleAndColour(Scintilla::IndicatorStyle style_, ColourRGBA fore_ = ColourRGBA(0, 0, 0)) noexcept : style(style_), fore(fore_) {
+	}
+	bool operator==(const StyleAndColour &other) const noexcept {
+		return (style == other.style) && (fore == other.fore);
+	}
+};
+
+/**
+ */
+class Indicator {
+public:
+	enum class State { normal, hover };
+	StyleAndColour sacNormal;
+	StyleAndColour sacHover;
+	bool under;
+	int fillAlpha;
+	int outlineAlpha;
+	Scintilla::IndicFlag attributes;
+	XYPOSITION strokeWidth = 1.0f;
+	Indicator() noexcept : under(false), fillAlpha(30), outlineAlpha(50), attributes(Scintilla::IndicFlag::None) {
+	}
+	Indicator(Scintilla::IndicatorStyle style_, ColourRGBA fore_= ColourRGBA(0,0,0), bool under_=false, int fillAlpha_=30, int outlineAlpha_=50) noexcept :
+		sacNormal(style_, fore_), sacHover(style_, fore_), under(under_), fillAlpha(fillAlpha_), outlineAlpha(outlineAlpha_), attributes(Scintilla::IndicFlag::None) {
+	}
+	void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine, const PRectangle &rcCharacter, State drawState, int value) const;
+	bool IsDynamic() const noexcept {
+		return !(sacNormal == sacHover);
+	}
+	bool OverridesTextFore() const noexcept {
+		return sacNormal.style == Scintilla::IndicatorStyle::TextFore || sacHover.style == Scintilla::IndicatorStyle::TextFore;
+	}
+	Scintilla::IndicFlag Flags() const noexcept {
+		return attributes;
+	}
+	void SetFlags(Scintilla::IndicFlag attributes_) noexcept;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/KeyMap.cxx b/scite-app/scintilla/src/KeyMap.cxx
new file mode 100644
index 0000000..ae189db
--- /dev/null
+++ b/scite-app/scintilla/src/KeyMap.cxx
@@ -0,0 +1,176 @@
+// Scintilla source code edit control
+/** @file KeyMap.cxx
+ ** Defines a mapping between keystrokes and commands.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+
+#include "Debugging.h"
+
+#include "KeyMap.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+KeyMap::KeyMap() {
+	for (int i = 0; static_cast<int>(MapDefault[i].key); i++) {
+		AssignCmdKey(MapDefault[i].key,
+			MapDefault[i].modifiers,
+			MapDefault[i].msg);
+	}
+}
+
+KeyMap::~KeyMap() {
+	Clear();
+}
+
+void KeyMap::Clear() noexcept {
+	kmap.clear();
+}
+
+void KeyMap::AssignCmdKey(Keys key, KeyMod modifiers, Message msg) {
+	kmap[KeyModifiers(key, modifiers)] = msg;
+}
+
+Message KeyMap::Find(Keys key, KeyMod modifiers) const {
+	std::map<KeyModifiers, Message>::const_iterator it = kmap.find(KeyModifiers(key, modifiers));
+	return (it == kmap.end()) ? static_cast<Message>(0) : it->second;
+}
+
+const std::map<KeyModifiers, Message> &KeyMap::GetKeyMap() const noexcept {
+	return kmap;
+}
+
+#if PLAT_GTK_MACOSX
+#define OS_X_KEYS 1
+#else
+#define OS_X_KEYS 0
+#endif
+
+// Define a modifier that is exactly Ctrl key on all platforms
+// Most uses of Ctrl map to Cmd on OS X but some can't so use SCI_[S]CTRL_META
+#if OS_X_KEYS
+#define SCI_CTRL_META SCI_META
+#define SCI_SCTRL_META (SCI_META | SCI_SHIFT)
+#else
+#define SCI_CTRL_META SCI_CTRL
+#define SCI_SCTRL_META (SCI_CTRL | SCI_SHIFT)
+#endif
+
+namespace {
+
+constexpr Keys Key(char ch) {
+    return static_cast<Keys>(ch);
+}
+
+}
+
+const KeyToCommand KeyMap::MapDefault[] = {
+
+#if OS_X_KEYS
+    {Keys::Down,		SCI_CTRL,	Message::DocumentEnd},
+    {Keys::Down,		SCI_CSHIFT,	Message::DocumentEndExtend},
+    {Keys::Up,		    SCI_CTRL,	Message::DocumentStart},
+    {Keys::Up,		    SCI_CSHIFT,	Message::DocumentStartExtend},
+    {Keys::Left,		SCI_CTRL,	Message::VCHome},
+    {Keys::Left,		SCI_CSHIFT,	Message::VCHomeExtend},
+    {Keys::Right,		SCI_CTRL,	Message::LineEnd},
+    {Keys::Right,		SCI_CSHIFT,	Message::LineEndExtend},
+#endif
+
+    {Keys::Down,		SCI_NORM,	Message::LineDown},
+    {Keys::Down,		SCI_SHIFT,	Message::LineDownExtend},
+    {Keys::Down,		SCI_CTRL_META,	Message::LineScrollDown},
+    {Keys::Down,		SCI_ASHIFT,	Message::LineDownRectExtend},
+    {Keys::Up,		    SCI_NORM,	Message::LineUp},
+    {Keys::Up,			SCI_SHIFT,	Message::LineUpExtend},
+    {Keys::Up,			SCI_CTRL_META,	Message::LineScrollUp},
+    {Keys::Up,		    SCI_ASHIFT,	Message::LineUpRectExtend},
+    {Key('['),			SCI_CTRL,	Message::ParaUp},
+    {Key('['),			SCI_CSHIFT,	Message::ParaUpExtend},
+    {Key(']'),			SCI_CTRL,	Message::ParaDown},
+    {Key(']'),			SCI_CSHIFT,	Message::ParaDownExtend},
+    {Keys::Left,		SCI_NORM,	Message::CharLeft},
+    {Keys::Left,		SCI_SHIFT,	Message::CharLeftExtend},
+    {Keys::Left,		SCI_CTRL_META,	Message::WordLeft},
+    {Keys::Left,		SCI_SCTRL_META,	Message::WordLeftExtend},
+    {Keys::Left,		SCI_ASHIFT,	Message::CharLeftRectExtend},
+    {Keys::Right,		SCI_NORM,	Message::CharRight},
+    {Keys::Right,		SCI_SHIFT,	Message::CharRightExtend},
+    {Keys::Right,		SCI_CTRL_META,	Message::WordRight},
+    {Keys::Right,		SCI_SCTRL_META,	Message::WordRightExtend},
+    {Keys::Right,		SCI_ASHIFT,	Message::CharRightRectExtend},
+    {Key('/'),		    SCI_CTRL,	Message::WordPartLeft},
+    {Key('/'),		    SCI_CSHIFT,	Message::WordPartLeftExtend},
+    {Key('\\'),		    SCI_CTRL,	Message::WordPartRight},
+    {Key('\\'),		    SCI_CSHIFT,	Message::WordPartRightExtend},
+    {Keys::Home,		SCI_NORM,	Message::VCHome},
+    {Keys::Home, 		SCI_SHIFT, 	Message::VCHomeExtend},
+    {Keys::Home, 		SCI_CTRL, 	Message::DocumentStart},
+    {Keys::Home, 		SCI_CSHIFT, Message::DocumentStartExtend},
+    {Keys::Home, 		SCI_ALT, 	Message::HomeDisplay},
+    {Keys::Home,		SCI_ASHIFT,	Message::VCHomeRectExtend},
+    {Keys::End,	 	    SCI_NORM,	Message::LineEnd},
+    {Keys::End,	 	    SCI_SHIFT, 	Message::LineEndExtend},
+    {Keys::End, 		SCI_CTRL, 	Message::DocumentEnd},
+    {Keys::End, 		SCI_CSHIFT, Message::DocumentEndExtend},
+    {Keys::End, 		SCI_ALT, 	Message::LineEndDisplay},
+    {Keys::End,		    SCI_ASHIFT,	Message::LineEndRectExtend},
+    {Keys::Prior,		SCI_NORM,	Message::PageUp},
+    {Keys::Prior,		SCI_SHIFT, 	Message::PageUpExtend},
+    {Keys::Prior,		SCI_ASHIFT,	Message::PageUpRectExtend},
+    {Keys::Next, 		SCI_NORM, 	Message::PageDown},
+    {Keys::Next, 		SCI_SHIFT, 	Message::PageDownExtend},
+    {Keys::Next,		SCI_ASHIFT,	Message::PageDownRectExtend},
+    {Keys::Delete,      SCI_NORM,	Message::Clear},
+    {Keys::Delete, 	    SCI_SHIFT,	Message::Cut},
+    {Keys::Delete, 	    SCI_CTRL,	Message::DelWordRight},
+    {Keys::Delete,	    SCI_CSHIFT,	Message::DelLineRight},
+    {Keys::Insert, 		SCI_NORM,	Message::EditToggleOvertype},
+    {Keys::Insert, 		SCI_SHIFT,	Message::Paste},
+    {Keys::Insert, 		SCI_CTRL,	Message::Copy},
+    {Keys::Escape,  	SCI_NORM,	Message::Cancel},
+    {Keys::Back,		SCI_NORM, 	Message::DeleteBack},
+    {Keys::Back,		SCI_SHIFT, 	Message::DeleteBack},
+    {Keys::Back,		SCI_CTRL, 	Message::DelWordLeft},
+    {Keys::Back, 		SCI_ALT,	Message::Undo},
+    {Keys::Back,		SCI_CSHIFT,	Message::DelLineLeft},
+    {Key('Z'), 			SCI_CTRL,	Message::Undo},
+#if OS_X_KEYS
+    {Key('Z'), 			SCI_CSHIFT,	Message::Redo},
+#else
+    {Key('Y'), 			SCI_CTRL,	Message::Redo},
+#endif
+    {Key('X'), 			SCI_CTRL,	Message::Cut},
+    {Key('C'), 			SCI_CTRL,	Message::Copy},
+    {Key('V'), 			SCI_CTRL,	Message::Paste},
+    {Key('A'), 			SCI_CTRL,	Message::SelectAll},
+    {Keys::Tab,		    SCI_NORM,	Message::Tab},
+    {Keys::Tab,		    SCI_SHIFT,	Message::BackTab},
+    {Keys::Return, 	    SCI_NORM,	Message::NewLine},
+    {Keys::Return, 	    SCI_SHIFT,	Message::NewLine},
+    {Keys::Add, 		SCI_CTRL,	Message::ZoomIn},
+    {Keys::Subtract,	SCI_CTRL,	Message::ZoomOut},
+    {Keys::Divide,	    SCI_CTRL,	Message::SetZoom},
+    {Key('L'), 			SCI_CTRL,	Message::LineCut},
+    {Key('L'), 			SCI_CSHIFT,	Message::LineDelete},
+    {Key('T'), 			SCI_CSHIFT,	Message::LineCopy},
+    {Key('T'), 			SCI_CTRL,	Message::LineTranspose},
+    {Key('D'), 			SCI_CTRL,	Message::SelectionDuplicate},
+    {Key('U'), 			SCI_CTRL,	Message::LowerCase},
+    {Key('U'), 			SCI_CSHIFT,	Message::UpperCase},
+    {Key(0),SCI_NORM,static_cast<Message>(0)},
+};
+
diff --git a/scite-app/scintilla/src/KeyMap.h b/scite-app/scintilla/src/KeyMap.h
new file mode 100644
index 0000000..6662118
--- /dev/null
+++ b/scite-app/scintilla/src/KeyMap.h
@@ -0,0 +1,64 @@
+// Scintilla source code edit control
+/** @file KeyMap.h
+ ** Defines a mapping between keystrokes and commands.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef KEYMAP_H
+#define KEYMAP_H
+
+namespace Scintilla::Internal {
+
+#define SCI_NORM KeyMod::Norm
+#define SCI_SHIFT KeyMod::Shift
+#define SCI_CTRL KeyMod::Ctrl
+#define SCI_ALT KeyMod::Alt
+#define SCI_META KeyMod::Meta
+#define SCI_SUPER KeyMod::Super
+#define SCI_CSHIFT (KeyMod::Ctrl | KeyMod::Shift)
+#define SCI_ASHIFT (KeyMod::Alt | KeyMod::Shift)
+
+/**
+ */
+class KeyModifiers {
+public:
+	Scintilla::Keys key;
+	Scintilla::KeyMod modifiers;
+	KeyModifiers(Scintilla::Keys key_, Scintilla::KeyMod modifiers_) noexcept : key(key_), modifiers(modifiers_) {
+	}
+	bool operator<(const KeyModifiers &other) const noexcept {
+		if (key == other.key)
+			return modifiers < other.modifiers;
+		else
+			return key < other.key;
+	}
+};
+
+/**
+ */
+class KeyToCommand {
+public:
+	Scintilla::Keys key;
+	Scintilla::KeyMod modifiers;
+	Scintilla::Message msg;
+};
+
+/**
+ */
+class KeyMap {
+	std::map<KeyModifiers, Scintilla::Message> kmap;
+	static const KeyToCommand MapDefault[];
+
+public:
+	KeyMap();
+	~KeyMap();
+	void Clear() noexcept;
+	void AssignCmdKey(Scintilla::Keys key, Scintilla::KeyMod modifiers, Scintilla::Message msg);
+	Scintilla::Message Find(Scintilla::Keys key, Scintilla::KeyMod modifiers) const;	// 0 returned on failure
+	const std::map<KeyModifiers, Scintilla::Message> &GetKeyMap() const noexcept;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/LineMarker.cxx b/scite-app/scintilla/src/LineMarker.cxx
new file mode 100644
index 0000000..5bfb893
--- /dev/null
+++ b/scite-app/scintilla/src/LineMarker.cxx
@@ -0,0 +1,560 @@
+// Scintilla source code edit control
+/** @file LineMarker.cxx
+ ** Defines the look of a line marker in the margin.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstring>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+
+#include "Platform.h"
+
+#include "XPM.h"
+#include "LineMarker.h"
+#include "UniConversion.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+LineMarker::LineMarker(const LineMarker &other) {
+	// Defined to avoid pxpm and image being blindly copied, not as a complete copy constructor.
+	markType = other.markType;
+	fore = other.fore;
+	back = other.back;
+	backSelected = other.backSelected;
+	strokeWidth = other.strokeWidth;
+	layer = other.layer;
+	alpha = other.alpha;
+	if (other.pxpm)
+		pxpm = std::make_unique<XPM>(*other.pxpm);
+	else
+		pxpm = nullptr;
+	if (other.image)
+		image = std::make_unique<RGBAImage>(*other.image);
+	else
+		image = nullptr;
+	customDraw = other.customDraw;
+}
+
+LineMarker &LineMarker::operator=(const LineMarker &other) {
+	// Defined to avoid pxpm and image being blindly copied, not as a complete assignment operator.
+	if (this != &other) {
+		markType = other.markType;
+		fore = other.fore;
+		back = other.back;
+		backSelected = other.backSelected;
+		strokeWidth = other.strokeWidth;
+		layer = other.layer;
+		alpha = other.alpha;
+		if (other.pxpm)
+			pxpm = std::make_unique<XPM>(*other.pxpm);
+		else
+			pxpm = nullptr;
+		if (other.image)
+			image = std::make_unique<RGBAImage>(*other.image);
+		else
+			image = nullptr;
+		customDraw = other.customDraw;
+	}
+	return *this;
+}
+
+ColourRGBA LineMarker::BackWithAlpha() const noexcept {
+	return ColourRGBA(back, static_cast<int>(alpha));
+}
+
+void LineMarker::SetXPM(const char *textForm) {
+	pxpm = std::make_unique<XPM>(textForm);
+	markType = MarkerSymbol::Pixmap;
+}
+
+void LineMarker::SetXPM(const char *const *linesForm) {
+	pxpm = std::make_unique<XPM>(linesForm);
+	markType = MarkerSymbol::Pixmap;
+}
+
+void LineMarker::SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage) {
+	image = std::make_unique<RGBAImage>(static_cast<int>(sizeRGBAImage.x), static_cast<int>(sizeRGBAImage.y), scale, pixelsRGBAImage);
+	markType = MarkerSymbol::RgbaImage;
+}
+
+namespace {
+
+enum class Expansion { Minus, Plus };
+enum class Shape { Square, Circle };
+
+void DrawSymbol(Surface *surface, Shape shape, Expansion expansion, PRectangle rcSymbol, XYPOSITION widthStroke,
+	ColourRGBA colourFill, ColourRGBA colourFrame, ColourRGBA colourFrameRight, ColourRGBA colourExpansion) {
+
+	const FillStroke fillStroke(colourFill, colourFrame, widthStroke);
+	const PRectangle rcSymbolLeft = Side(rcSymbol, Edge::left, (rcSymbol.Width() + widthStroke) / 2.0f);
+	surface->SetClip(rcSymbolLeft);
+	if (shape == Shape::Square) {
+		// Hollowed square
+		surface->RectangleDraw(rcSymbol, fillStroke);
+	} else {
+		surface->Ellipse(rcSymbol, fillStroke);
+	}
+	surface->PopClip();
+
+	const FillStroke fillStrokeRight(colourFill, colourFrameRight, widthStroke);
+	const PRectangle rcSymbolRight = Side(rcSymbol, Edge::right, (rcSymbol.Width() - widthStroke) / 2.0f);
+	surface->SetClip(rcSymbolRight);
+	if (shape == Shape::Square) {
+		surface->RectangleDraw(rcSymbol, fillStrokeRight);
+	} else {
+		surface->Ellipse(rcSymbol, fillStrokeRight);
+	}
+	surface->PopClip();
+
+	const PRectangle rcPlusMinus = rcSymbol.Inset(widthStroke + 1.0f);
+	const XYPOSITION armWidth = (rcPlusMinus.Width() - widthStroke) / 2.0f;
+	const XYPOSITION top = rcPlusMinus.top + armWidth;
+	const PRectangle rcH = PRectangle(
+		rcPlusMinus.left, top,
+		rcPlusMinus.right, top + widthStroke);
+	surface->FillRectangle(rcH, colourExpansion);
+	if (expansion == Expansion::Plus) {
+		const XYPOSITION left = rcPlusMinus.left + armWidth;
+		const PRectangle rcV = PRectangle(
+			left, rcPlusMinus.top,
+			left + widthStroke, rcPlusMinus.bottom);
+		surface->FillRectangle(rcV, colourExpansion);
+	}
+}
+
+void DrawTail(Surface *surface, XYPOSITION leftLine, XYPOSITION rightTail, XYPOSITION centreY, XYPOSITION widthSymbolStroke, ColourRGBA fill) {
+	const XYPOSITION slopeLength = 2.0f + widthSymbolStroke;
+	const XYPOSITION strokeTop = centreY + slopeLength;
+	const XYPOSITION halfWidth = widthSymbolStroke / 2.0f;
+	const XYPOSITION strokeMiddle = strokeTop + halfWidth;
+	Point lines[] = {
+		// Stick
+		Point(rightTail, strokeMiddle),
+		Point(leftLine + halfWidth + slopeLength, strokeMiddle),
+		// Slope
+		Point(leftLine + widthSymbolStroke / 2.0f, centreY + halfWidth),
+	};
+	surface->PolyLine(lines, std::size(lines), Stroke(fill, widthSymbolStroke));
+}
+
+}
+
+void LineMarker::DrawFoldingMark(Surface *surface, const PRectangle &rcWhole, FoldPart part) const {
+	// Assume: edges of rcWhole are integers.
+	// Code can only really handle integer strokeWidth.
+
+	ColourRGBA colourHead = back;
+	ColourRGBA colourBody = back;
+	ColourRGBA colourTail = back;
+
+	switch (part) {
+	case FoldPart::head:
+	case FoldPart::headWithTail:
+		colourHead = backSelected;
+		colourTail = backSelected;
+		break;
+	case FoldPart::body:
+		colourHead = backSelected;
+		colourBody = backSelected;
+		break;
+	case FoldPart::tail:
+		colourBody = backSelected;
+		colourTail = backSelected;
+		break;
+	default:
+		// LineMarker::undefined
+		break;
+	}
+
+	const int pixelDivisions = surface->PixelDivisions();
+
+	// Folding symbols should have equal height and width to be either a circle or square.
+	// So find the minimum of width and height.
+	const XYPOSITION minDimension = std::floor(std::min(rcWhole.Width(), rcWhole.Height() - 2)) - 1;
+
+	// If strokeWidth would take up too much of area reduce to reasonable width.
+	const XYPOSITION widthStroke = PixelAlignFloor(std::min(strokeWidth, minDimension / 5.0f), pixelDivisions);
+
+	// To centre +/-, odd strokeWidth -> odd symbol width, even -> even
+	const XYPOSITION widthSymbol =
+		((std::lround(minDimension * pixelDivisions) % 2) == (std::lround(widthStroke * pixelDivisions) % 2)) ?
+		minDimension : minDimension - 1.0f / pixelDivisions;
+
+	const Point centre = PixelAlign(rcWhole.Centre(), pixelDivisions);
+
+	// Folder symbols and lines follow some rules to join up, fit the pixel grid,
+	// and avoid over-painting.
+
+	const XYPOSITION halfSymbol = std::round(widthSymbol / 2);
+	const Point topLeft(centre.x - halfSymbol, centre.y - halfSymbol);
+	const PRectangle rcSymbol(
+		topLeft.x, topLeft.y,
+		topLeft.x + widthSymbol, topLeft.y + widthSymbol);
+	const XYPOSITION leftLine = rcSymbol.Centre().x - widthStroke / 2.0f;
+	const XYPOSITION rightLine = leftLine + widthStroke;
+
+	// This is the vertical line through the whole area which is subdivided
+	// when there is a symbol on the line or the colour changes for highlighting.
+	const PRectangle rcVLine(leftLine, rcWhole.top, rightLine, rcWhole.bottom);
+
+	// Portions of rcVLine above and below the symbol.
+	const PRectangle rcAboveSymbol = Clamp(rcVLine, Edge::bottom, rcSymbol.top);
+	const PRectangle rcBelowSymbol = Clamp(rcVLine, Edge::top, rcSymbol.bottom);
+
+	// Projection to right.
+	const PRectangle rcStick(
+		rcVLine.right, centre.y + 1.0f - widthStroke,
+		rcWhole.right - 1, centre.y + 1.0f);
+
+	switch (markType) {
+
+	case MarkerSymbol::VLine:
+		surface->FillRectangle(rcVLine, colourBody);
+		break;
+
+	case MarkerSymbol::LCorner:
+		surface->FillRectangle(Clamp(rcVLine, Edge::bottom, centre.y + 1.0f), colourTail);
+		surface->FillRectangle(rcStick, colourTail);
+		break;
+
+	case MarkerSymbol::TCorner:
+		surface->FillRectangle(Clamp(rcVLine, Edge::bottom, centre.y + 1.0f), colourBody);
+		surface->FillRectangle(Clamp(rcVLine, Edge::top, centre.y + 1.0f), colourHead);
+		surface->FillRectangle(rcStick, colourTail);
+		break;
+
+	// CORNERCURVE cases divide slightly lower than CORNER to accommodate the curve
+	case MarkerSymbol::LCornerCurve:
+		surface->FillRectangle(Clamp(rcVLine, Edge::bottom, centre.y), colourTail);
+		DrawTail(surface, leftLine, rcWhole.right - 1.0f, centre.y - widthStroke,
+			widthStroke, colourTail);
+		break;
+
+	case MarkerSymbol::TCornerCurve:
+		surface->FillRectangle(Clamp(rcVLine, Edge::bottom, centre.y), colourBody);
+		surface->FillRectangle(Clamp(rcVLine, Edge::top, centre.y), colourHead);
+		DrawTail(surface, leftLine, rcWhole.right - 1.0f, centre.y - widthStroke,
+			widthStroke, colourTail);
+		break;
+
+	case MarkerSymbol::BoxPlus:
+		DrawSymbol(surface, Shape::Square, Expansion::Plus, rcSymbol, widthStroke,
+			fore, colourHead, colourHead, colourTail);
+		break;
+
+	case MarkerSymbol::BoxPlusConnected: {
+			const ColourRGBA colourBelow = (part == FoldPart::headWithTail) ? colourTail : colourBody;
+			surface->FillRectangle(rcBelowSymbol, colourBelow);
+			surface->FillRectangle(rcAboveSymbol, colourBody);
+
+			const ColourRGBA colourRight = (part == FoldPart::body) ? colourTail : colourHead;
+			DrawSymbol(surface, Shape::Square, Expansion::Plus, rcSymbol, widthStroke,
+				fore, colourHead, colourRight, colourTail);
+		}
+		break;
+
+	case MarkerSymbol::BoxMinus:
+		surface->FillRectangle(rcBelowSymbol, colourHead);
+		DrawSymbol(surface, Shape::Square, Expansion::Minus, rcSymbol, widthStroke,
+			fore, colourHead, colourHead, colourTail);
+		break;
+
+	case MarkerSymbol::BoxMinusConnected: {
+			surface->FillRectangle(rcBelowSymbol, colourHead);
+			surface->FillRectangle(rcAboveSymbol, colourBody);
+
+			const ColourRGBA colourRight = (part == FoldPart::body) ? colourTail : colourHead;
+			DrawSymbol(surface, Shape::Square, Expansion::Minus, rcSymbol, widthStroke,
+				fore, colourHead, colourRight, colourTail);
+		}
+		break;
+
+	case MarkerSymbol::CirclePlus:
+		DrawSymbol(surface, Shape::Circle, Expansion::Plus, rcSymbol, widthStroke,
+			fore, colourHead, colourHead, colourTail);
+		break;
+
+	case MarkerSymbol::CirclePlusConnected: {
+			const ColourRGBA colourBelow = (part == FoldPart::headWithTail) ? colourTail : colourBody;
+			surface->FillRectangle(rcBelowSymbol, colourBelow);
+			surface->FillRectangle(rcAboveSymbol, colourBody);
+
+			const ColourRGBA colourRight = (part == FoldPart::body) ? colourTail : colourHead;
+			DrawSymbol(surface, Shape::Circle, Expansion::Plus, rcSymbol, widthStroke,
+				fore, colourHead, colourRight, colourTail);
+		}
+		break;
+
+	case MarkerSymbol::CircleMinus:
+		surface->FillRectangle(rcBelowSymbol, colourHead);
+		DrawSymbol(surface, Shape::Circle, Expansion::Minus, rcSymbol, widthStroke,
+			fore, colourHead, colourHead, colourTail);
+		break;
+
+	case MarkerSymbol::CircleMinusConnected: {
+			surface->FillRectangle(rcBelowSymbol, colourHead);
+			surface->FillRectangle(rcAboveSymbol, colourBody);
+			const ColourRGBA colourRight = (part == FoldPart::body) ? colourTail : colourHead;
+			DrawSymbol(surface, Shape::Circle, Expansion::Minus, rcSymbol, widthStroke,
+				fore, colourHead, colourRight, colourTail);
+		}
+		break;
+
+	default:
+		break;
+
+	}
+}
+
+void LineMarker::AlignedPolygon(Surface *surface, const Point *pts, size_t npts) const {
+	const XYPOSITION move = strokeWidth / 2.0;
+	std::vector<Point> points;
+	std::transform(pts, pts + npts, std::back_inserter(points), [=](Point pt)->Point {
+		return Point(pt.x + move, pt.y + move);
+	});
+	surface->Polygon(points.data(), std::size(points), FillStroke(back, fore, strokeWidth));
+}
+
+void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *fontForCharacter, FoldPart part, MarginType marginStyle) const {
+	// This is to satisfy the changed API - eventually the stroke width will be exposed to clients
+
+	if (customDraw) {
+		customDraw(surface, rcWhole, fontForCharacter, static_cast<int>(part), marginStyle, this);
+		return;
+	}
+
+	if ((markType == MarkerSymbol::Pixmap) && (pxpm)) {
+		pxpm->Draw(surface, rcWhole);
+		return;
+	}
+	if ((markType == MarkerSymbol::RgbaImage) && (image)) {
+		// Make rectangle just large enough to fit image centred on centre of rcWhole
+		PRectangle rcImage;
+		rcImage.top = ((rcWhole.top + rcWhole.bottom) - image->GetScaledHeight()) / 2;
+		rcImage.bottom = rcImage.top + image->GetScaledHeight();
+		rcImage.left = ((rcWhole.left + rcWhole.right) - image->GetScaledWidth()) / 2;
+		rcImage.right = rcImage.left + image->GetScaledWidth();
+		surface->DrawRGBAImage(rcImage, image->GetWidth(), image->GetHeight(), image->Pixels());
+		return;
+	}
+
+	if ((markType >= MarkerSymbol::VLine) && markType <= (MarkerSymbol::CircleMinusConnected)) {
+		DrawFoldingMark(surface, rcWhole, part);
+		return;
+	}
+
+	// Restrict most shapes a bit
+	const PRectangle rc(rcWhole.left, rcWhole.top + 1, rcWhole.right, rcWhole.bottom - 1);
+	// Ensure does not go beyond edge
+	const XYPOSITION minDim = std::min(rcWhole.Width(), rcWhole.Height() - 2) - 1;
+
+	const Point centre = rcWhole.Centre();
+	XYPOSITION centreX = std::floor(centre.x);
+	const XYPOSITION centreY = std::floor(centre.y);
+	const XYPOSITION dimOn2 = std::floor(minDim / 2);
+	const XYPOSITION dimOn4 = std::floor(minDim / 4);
+	const XYPOSITION armSize = dimOn2 - 2;
+	if (marginStyle == MarginType::Number || marginStyle == MarginType::Text || marginStyle == MarginType::RText) {
+		// On textual margins move marker to the left to try to avoid overlapping the text
+		centreX = rcWhole.left + dimOn2 + 1;
+	}
+
+	switch (markType) {
+	case MarkerSymbol::RoundRect: {
+			PRectangle rcRounded = rc;
+			rcRounded.left = rc.left + 1;
+			rcRounded.right = rc.right - 1;
+			surface->RoundedRectangle(rcRounded, FillStroke(back, fore, strokeWidth));
+		}
+		break;
+
+	case MarkerSymbol::Circle: {
+			const PRectangle rcCircle = PRectangle(
+							    centreX - dimOn2,
+							    centreY - dimOn2,
+							    centreX + dimOn2,
+							    centreY + dimOn2);
+			surface->Ellipse(rcCircle, FillStroke(back, fore, strokeWidth));
+		}
+		break;
+
+	case MarkerSymbol::Arrow: {
+			Point pts[] = {
+				Point(centreX - dimOn4, centreY - dimOn2),
+				Point(centreX - dimOn4, centreY + dimOn2),
+				Point(centreX + dimOn2 - dimOn4, centreY),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::ArrowDown: {
+			Point pts[] = {
+				Point(centreX - dimOn2, centreY - dimOn4),
+				Point(centreX + dimOn2, centreY - dimOn4),
+				Point(centreX, centreY + dimOn2 - dimOn4),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::Plus: {
+			Point pts[] = {
+				Point(centreX - armSize, centreY - 1),
+				Point(centreX - 1, centreY - 1),
+				Point(centreX - 1, centreY - armSize),
+				Point(centreX + 1, centreY - armSize),
+				Point(centreX + 1, centreY - 1),
+				Point(centreX + armSize, centreY - 1),
+				Point(centreX + armSize, centreY + 1),
+				Point(centreX + 1, centreY + 1),
+				Point(centreX + 1, centreY + armSize),
+				Point(centreX - 1, centreY + armSize),
+				Point(centreX - 1, centreY + 1),
+				Point(centreX - armSize, centreY + 1),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::Minus: {
+			Point pts[] = {
+				Point(centreX - armSize, centreY - 1),
+				Point(centreX + armSize, centreY - 1),
+				Point(centreX + armSize, centreY + 1),
+				Point(centreX - armSize, centreY + 1),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::SmallRect: {
+			PRectangle rcSmall;
+			rcSmall.left = rc.left + 1;
+			rcSmall.top = rc.top + 2;
+			rcSmall.right = rc.right - 1;
+			rcSmall.bottom = rc.bottom - 2;
+			surface->RectangleDraw(rcSmall, FillStroke(back, fore, strokeWidth));
+		}
+		break;
+
+	case MarkerSymbol::Empty:
+	case MarkerSymbol::Background:
+	case MarkerSymbol::Underline:
+	case MarkerSymbol::Available:
+		// An invisible marker so don't draw anything
+		break;
+
+	case MarkerSymbol::DotDotDot: {
+			XYPOSITION right = static_cast<XYPOSITION>(centreX - 6);
+			for (int b = 0; b < 3; b++) {
+				const PRectangle rcBlob(right, rc.bottom - 4, right + 2, rc.bottom - 2);
+				surface->FillRectangle(rcBlob, fore);
+				right += 5.0f;
+			}
+		}
+		break;
+
+	case MarkerSymbol::Arrows: {
+			XYPOSITION right = centreX - 4.0f + strokeWidth / 2.0f;
+			const XYPOSITION midY = centreY + strokeWidth / 2.0f;
+			const XYPOSITION armLength = std::round(dimOn2 - strokeWidth);
+			for (int b = 0; b < 3; b++) {
+				const Point pts[] = {
+					Point(right - armLength, midY - armLength),
+					Point(right, midY),
+					Point(right - armLength, midY + armLength)
+				};
+				surface->PolyLine(pts, std::size(pts), Stroke(fore, strokeWidth));
+				right += strokeWidth + 3.0f;
+			}
+		}
+		break;
+
+	case MarkerSymbol::ShortArrow: {
+			Point pts[] = {
+				Point(centreX, centreY + dimOn2),
+				Point(centreX + dimOn2, centreY),
+				Point(centreX, centreY - dimOn2),
+				Point(centreX, centreY - dimOn4),
+				Point(centreX - dimOn4, centreY - dimOn4),
+				Point(centreX - dimOn4, centreY + dimOn4),
+				Point(centreX, centreY + dimOn4),
+				Point(centreX, centreY + dimOn2),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::FullRect:
+		surface->FillRectangle(rcWhole, back);
+		break;
+
+	case MarkerSymbol::LeftRect: {
+			PRectangle rcLeft = rcWhole;
+			rcLeft.right = rcLeft.left + 4;
+			surface->FillRectangle(rcLeft, back);
+		}
+		break;
+
+	case MarkerSymbol::Bookmark: {
+			const XYPOSITION halfHeight = std::floor(minDim / 3);
+			Point pts[] = {
+				Point(rcWhole.left, centreY - halfHeight),
+				Point(rcWhole.right - strokeWidth - 2, centreY - halfHeight),
+				Point(rcWhole.right - strokeWidth - 2 - halfHeight, centreY),
+				Point(rcWhole.right - strokeWidth - 2, centreY + halfHeight),
+				Point(rcWhole.left, centreY + halfHeight),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	case MarkerSymbol::VerticalBookmark: {
+			const XYPOSITION halfWidth = std::floor(minDim / 3);
+			Point pts[] = {
+				Point(centreX - halfWidth, centreY - dimOn2),
+				Point(centreX + halfWidth, centreY - dimOn2),
+				Point(centreX + halfWidth, centreY + dimOn2),
+				Point(centreX, centreY + dimOn2 - halfWidth),
+				Point(centreX - halfWidth, centreY + dimOn2),
+			};
+			AlignedPolygon(surface, pts, std::size(pts));
+		}
+		break;
+
+	default:
+		if (markType >= MarkerSymbol::Character) {
+			char character[UTF8MaxBytes + 1] {};
+			const int uch = static_cast<int>(markType) - static_cast<int>(MarkerSymbol::Character);
+			UTF8FromUTF32Character(uch, character);
+			const XYPOSITION width = surface->WidthTextUTF8(fontForCharacter, character);
+			PRectangle rcText = rc;
+			rcText.left += (rc.Width() - width) / 2;
+			rcText.right = rcText.left + width;
+			surface->DrawTextNoClipUTF8(rcText, fontForCharacter, rcText.bottom - 2,
+						 character, fore, back);
+		} else {
+			// treat as MarkerSymbol::FullRect
+			surface->FillRectangle(rcWhole, back);
+		}
+		break;
+	}
+}
diff --git a/scite-app/scintilla/src/LineMarker.h b/scite-app/scintilla/src/LineMarker.h
new file mode 100644
index 0000000..0a60da9
--- /dev/null
+++ b/scite-app/scintilla/src/LineMarker.h
@@ -0,0 +1,58 @@
+// Scintilla source code edit control
+/** @file LineMarker.h
+ ** Defines the look of a line marker in the margin .
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LINEMARKER_H
+#define LINEMARKER_H
+
+namespace Scintilla::Internal {
+
+class XPM;
+class RGBAImage;
+
+typedef void (*DrawLineMarkerFn)(Surface *surface, const PRectangle &rcWhole, const Font *fontForCharacter, int tFold, Scintilla::MarginType marginStyle, const void *lineMarker);
+
+/**
+ */
+class LineMarker {
+public:
+	enum class FoldPart { undefined, head, body, tail, headWithTail };
+
+	Scintilla::MarkerSymbol markType = Scintilla::MarkerSymbol::Circle;
+	ColourRGBA fore = ColourRGBA(0, 0, 0);
+	ColourRGBA back = ColourRGBA(0xff, 0xff, 0xff);
+	ColourRGBA backSelected = ColourRGBA(0xff, 0x00, 0x00);
+	Scintilla::Layer layer = Scintilla::Layer::Base;
+	Scintilla::Alpha alpha = Scintilla::Alpha::NoAlpha;
+	XYPOSITION strokeWidth = 1.0f;
+	std::unique_ptr<XPM> pxpm;
+	std::unique_ptr<RGBAImage> image;
+	/** Some platforms, notably PLAT_CURSES, do not support Scintilla's native
+	 * Draw function for drawing line markers. Allow those platforms to override
+	 * it instead of creating a new method(s) in the Surface class that existing
+	 * platforms must implement as empty. */
+	DrawLineMarkerFn customDraw = nullptr;
+
+	LineMarker() noexcept = default;
+	LineMarker(const LineMarker &other);
+	LineMarker(LineMarker &&) noexcept = default;
+	LineMarker &operator=(const LineMarker& other);
+	LineMarker &operator=(LineMarker&&) noexcept = default;
+	virtual ~LineMarker() = default;
+
+	ColourRGBA BackWithAlpha() const noexcept;
+
+	void SetXPM(const char *textForm);
+	void SetXPM(const char *const *linesForm);
+	void SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage);
+	void AlignedPolygon(Surface *surface, const Point *pts, size_t npts) const;
+	void Draw(Surface *surface, const PRectangle &rcWhole, const Font *fontForCharacter, FoldPart part, Scintilla::MarginType marginStyle) const;
+	void DrawFoldingMark(Surface *surface, const PRectangle &rcWhole, FoldPart part) const;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/MarginView.cxx b/scite-app/scintilla/src/MarginView.cxx
new file mode 100644
index 0000000..50e3822
--- /dev/null
+++ b/scite-app/scintilla/src/MarginView.cxx
@@ -0,0 +1,468 @@
+// Scintilla source code edit control
+/** @file MarginView.cxx
+ ** Defines the appearance of the editor margin.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+
+using namespace Scintilla;
+
+namespace Scintilla::Internal {
+
+void DrawWrapMarker(Surface *surface, PRectangle rcPlace,
+	bool isEndMarker, ColourRGBA wrapColour) {
+
+	const XYPOSITION extraFinalPixel = surface->SupportsFeature(Supports::LineDrawsFinal) ? 0.0f : 1.0f;
+
+	const PRectangle rcAligned = PixelAlignOutside(rcPlace, surface->PixelDivisions());
+
+	const XYPOSITION widthStroke = std::floor(rcAligned.Width() / 6);
+
+	constexpr XYPOSITION xa = 1; // gap before start
+	const XYPOSITION w = rcAligned.Width() - xa - widthStroke;
+
+	// isEndMarker -> x-mirrored symbol for start marker
+
+	const XYPOSITION x0 = isEndMarker ? rcAligned.left : rcAligned.right - widthStroke;
+	const XYPOSITION y0 = rcAligned.top;
+
+	const XYPOSITION dy = std::floor(rcAligned.Height() / 5);
+	const XYPOSITION y = std::floor(rcAligned.Height() / 2) + dy;
+
+	struct Relative {
+		XYPOSITION xBase;
+		int xDir;
+		XYPOSITION yBase;
+		int yDir;
+		XYPOSITION halfWidth;
+		Point At(XYPOSITION xRelative, XYPOSITION yRelative) noexcept {
+			return Point(xBase + xDir * xRelative + halfWidth, yBase + yDir * yRelative + halfWidth);
+		}
+	};
+
+	Relative rel = { x0, isEndMarker ? 1 : -1, y0, 1, widthStroke / 2.0f };
+
+	// arrow head
+	const Point head[] = {
+		rel.At(xa + dy, y - dy),
+		rel.At(xa, y),
+		rel.At(xa + dy + extraFinalPixel, y + dy + extraFinalPixel)
+	};
+	surface->PolyLine(head, std::size(head), Stroke(wrapColour, widthStroke));
+
+	// arrow body
+	const Point body[] = {
+		rel.At(xa, y),
+		rel.At(xa + w, y),
+		rel.At(xa + w, y - 2 * dy),
+		rel.At(xa, y - 2 * dy),
+	};
+	surface->PolyLine(body, std::size(body), Stroke(wrapColour, widthStroke));
+}
+
+MarginView::MarginView() noexcept {
+	wrapMarkerPaddingRight = 3;
+	customDrawWrapMarker = nullptr;
+}
+
+void MarginView::DropGraphics() noexcept {
+	pixmapSelMargin.reset();
+	pixmapSelPattern.reset();
+	pixmapSelPatternOffset1.reset();
+}
+
+void MarginView::RefreshPixMaps(Surface *surfaceWindow, const ViewStyle &vsDraw) {
+	if (!pixmapSelPattern) {
+		constexpr int patternSize = 8;
+		pixmapSelPattern = surfaceWindow->AllocatePixMap(patternSize, patternSize);
+		pixmapSelPatternOffset1 = surfaceWindow->AllocatePixMap(patternSize, patternSize);
+		// This complex procedure is to reproduce the checkerboard dithered pattern used by windows
+		// for scroll bars and Visual Studio for its selection margin. The colour of this pattern is half
+		// way between the chrome colour and the chrome highlight colour making a nice transition
+		// between the window chrome and the content area. And it works in low colour depths.
+		const PRectangle rcPattern = PRectangle::FromInts(0, 0, patternSize, patternSize);
+
+		// Initialize default colours based on the chrome colour scheme.  Typically the highlight is white.
+		ColourRGBA colourFMFill = vsDraw.selbar;
+		ColourRGBA colourFMStripes = vsDraw.selbarlight;
+
+		if (!(vsDraw.selbarlight == ColourRGBA(0xff, 0xff, 0xff))) {
+			// User has chosen an unusual chrome colour scheme so just use the highlight edge colour.
+			// (Typically, the highlight colour is white.)
+			colourFMFill = vsDraw.selbarlight;
+		}
+
+		if (vsDraw.foldmarginColour) {
+			// override default fold margin colour
+			colourFMFill = *vsDraw.foldmarginColour;
+		}
+		if (vsDraw.foldmarginHighlightColour) {
+			// override default fold margin highlight colour
+			colourFMStripes = *vsDraw.foldmarginHighlightColour;
+		}
+
+		pixmapSelPattern->FillRectangle(rcPattern, colourFMFill);
+		pixmapSelPatternOffset1->FillRectangle(rcPattern, colourFMStripes);
+		for (int y = 0; y < patternSize; y++) {
+			for (int x = y % 2; x < patternSize; x += 2) {
+				const PRectangle rcPixel = PRectangle::FromInts(x, y, x + 1, y + 1);
+				pixmapSelPattern->FillRectangle(rcPixel, colourFMStripes);
+				pixmapSelPatternOffset1->FillRectangle(rcPixel, colourFMFill);
+			}
+		}
+		pixmapSelPattern->FlushDrawing();
+		pixmapSelPatternOffset1->FlushDrawing();
+	}
+}
+
+static MarkerOutline SubstituteMarkerIfEmpty(MarkerOutline markerCheck, MarkerOutline markerDefault, const ViewStyle &vs) noexcept {
+	if (vs.markers[static_cast<size_t>(markerCheck)].markType == MarkerSymbol::Empty)
+		return markerDefault;
+	return markerCheck;
+}
+
+void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, PRectangle rcMargin,
+	const EditModel &model, const ViewStyle &vs) {
+
+	PRectangle rcSelMargin = rcMargin;
+	rcSelMargin.right = rcMargin.left;
+	if (rcSelMargin.bottom < rc.bottom)
+		rcSelMargin.bottom = rc.bottom;
+
+	const Point ptOrigin = model.GetVisibleOriginInMain();
+	const Font *fontLineNumber = vs.styles[StyleLineNumber].font.get();
+	for (size_t margin = 0; margin < vs.ms.size(); margin++) {
+		if (vs.ms[margin].width > 0) {
+
+			rcSelMargin.left = rcSelMargin.right;
+			rcSelMargin.right = rcSelMargin.left + vs.ms[margin].width;
+
+			if (vs.ms[margin].style != MarginType::Number) {
+				if (vs.ms[margin].ShowsFolding()) {
+					// Required because of special way brush is created for selection margin
+					// Ensure patterns line up when scrolling with separate margin view
+					// by choosing correctly aligned variant.
+					const bool invertPhase = static_cast<int>(ptOrigin.y) & 1;
+					surface->FillRectangle(rcSelMargin,
+						invertPhase ? *pixmapSelPattern : *pixmapSelPatternOffset1);
+				} else {
+					ColourRGBA colour;
+					switch (vs.ms[margin].style) {
+					case MarginType::Back:
+						colour = vs.styles[StyleDefault].back;
+						break;
+					case MarginType::Fore:
+						colour = vs.styles[StyleDefault].fore;
+						break;
+					case MarginType::Colour:
+						colour = vs.ms[margin].back;
+						break;
+					default:
+						colour = vs.styles[StyleLineNumber].back;
+						break;
+					}
+					surface->FillRectangle(rcSelMargin, colour);
+				}
+			} else {
+				surface->FillRectangle(rcSelMargin, vs.styles[StyleLineNumber].back);
+			}
+
+			const Sci::Line lineStartPaint = static_cast<Sci::Line>(rcMargin.top + ptOrigin.y) / vs.lineHeight;
+			Sci::Line visibleLine = model.TopLineOfMain() + lineStartPaint;
+			Sci::Position yposScreen = lineStartPaint * vs.lineHeight - static_cast<Sci::Position>(ptOrigin.y);
+			// Work out whether the top line is whitespace located after a
+			// lessening of fold level which implies a 'fold tail' but which should not
+			// be displayed until the last of a sequence of whitespace.
+			bool needWhiteClosure = false;
+			if (vs.ms[margin].ShowsFolding()) {
+				const FoldLevel level = model.pdoc->GetFoldLevel(model.pcs->DocFromDisplay(visibleLine));
+				if (LevelIsWhitespace(level)) {
+					Sci::Line lineBack = model.pcs->DocFromDisplay(visibleLine);
+					FoldLevel levelPrev = level;
+					while ((lineBack > 0) && LevelIsWhitespace(levelPrev)) {
+						lineBack--;
+						levelPrev = model.pdoc->GetFoldLevel(lineBack);
+					}
+					if (!LevelIsHeader(levelPrev)) {
+						if (LevelNumber(level) < LevelNumber(levelPrev))
+							needWhiteClosure = true;
+					}
+				}
+				if (highlightDelimiter.isEnabled) {
+					const Sci::Line lastLine = model.pcs->DocFromDisplay(topLine + model.LinesOnScreen()) + 1;
+					model.pdoc->GetHighlightDelimiters(highlightDelimiter,
+						model.pdoc->SciLineFromPosition(model.sel.MainCaret()), lastLine);
+				}
+			}
+
+			// Old code does not know about new markers needed to distinguish all cases
+			const MarkerOutline folderOpenMid = SubstituteMarkerIfEmpty(MarkerOutline::FolderOpenMid,
+				MarkerOutline::FolderOpen, vs);
+			const MarkerOutline folderEnd = SubstituteMarkerIfEmpty(MarkerOutline::FolderEnd,
+				MarkerOutline::Folder, vs);
+
+			while ((visibleLine < model.pcs->LinesDisplayed()) && yposScreen < rc.bottom) {
+
+				PLATFORM_ASSERT(visibleLine < model.pcs->LinesDisplayed());
+				const Sci::Line lineDoc = model.pcs->DocFromDisplay(visibleLine);
+				PLATFORM_ASSERT(model.pcs->GetVisible(lineDoc));
+				const Sci::Line firstVisibleLine = model.pcs->DisplayFromDoc(lineDoc);
+				const Sci::Line lastVisibleLine = model.pcs->DisplayLastFromDoc(lineDoc);
+				const bool firstSubLine = visibleLine == firstVisibleLine;
+				const bool lastSubLine = visibleLine == lastVisibleLine;
+
+				int marks = model.pdoc->GetMark(lineDoc);
+				if (!firstSubLine)
+					marks = 0;
+
+				bool headWithTail = false;
+
+				if (vs.ms[margin].ShowsFolding()) {
+					// Decide which fold indicator should be displayed
+					const FoldLevel level = model.pdoc->GetFoldLevel(lineDoc);
+					const FoldLevel levelNext = model.pdoc->GetFoldLevel(lineDoc + 1);
+					const FoldLevel levelNum = LevelNumberPart(level);
+					const FoldLevel levelNextNum = LevelNumberPart(levelNext);
+					if (LevelIsHeader(level)) {
+						if (firstSubLine) {
+							if (levelNum < levelNextNum) {
+								if (model.pcs->GetExpanded(lineDoc)) {
+									if (levelNum == FoldLevel::Base)
+										marks |= 1 << MarkerOutline::FolderOpen;
+									else
+										marks |= 1 << folderOpenMid;
+								} else {
+									if (levelNum == FoldLevel::Base)
+										marks |= 1 << MarkerOutline::Folder;
+									else
+										marks |= 1 << folderEnd;
+								}
+							} else if (levelNum > FoldLevel::Base) {
+								marks |= 1 << MarkerOutline::FolderSub;
+							}
+						} else {
+							if (levelNum < levelNextNum) {
+								if (model.pcs->GetExpanded(lineDoc)) {
+									marks |= 1 << MarkerOutline::FolderSub;
+								} else if (levelNum > FoldLevel::Base) {
+									marks |= 1 << MarkerOutline::FolderSub;
+								}
+							} else if (levelNum > FoldLevel::Base) {
+								marks |= 1 << MarkerOutline::FolderSub;
+							}
+						}
+						needWhiteClosure = false;
+						const Sci::Line firstFollowupLine = model.pcs->DocFromDisplay(model.pcs->DisplayFromDoc(lineDoc + 1));
+						const FoldLevel firstFollowupLineLevel = model.pdoc->GetFoldLevel(firstFollowupLine);
+						const FoldLevel secondFollowupLineLevelNum = LevelNumberPart(model.pdoc->GetFoldLevel(firstFollowupLine + 1));
+						if (!model.pcs->GetExpanded(lineDoc)) {
+							if (LevelIsWhitespace(firstFollowupLineLevel) &&
+								(levelNum > secondFollowupLineLevelNum))
+								needWhiteClosure = true;
+
+							if (highlightDelimiter.IsFoldBlockHighlighted(firstFollowupLine))
+								headWithTail = true;
+						}
+					} else if (LevelIsWhitespace(level)) {
+						if (needWhiteClosure) {
+							if (LevelIsWhitespace(levelNext)) {
+								marks |= 1 << MarkerOutline::FolderSub;
+							} else if (levelNextNum > FoldLevel::Base) {
+								marks |= 1 << MarkerOutline::FolderMidTail;
+								needWhiteClosure = false;
+							} else {
+								marks |= 1 << MarkerOutline::FolderTail;
+								needWhiteClosure = false;
+							}
+						} else if (levelNum > FoldLevel::Base) {
+							if (levelNextNum < levelNum) {
+								if (levelNextNum > FoldLevel::Base) {
+									marks |= 1 << MarkerOutline::FolderMidTail;
+								} else {
+									marks |= 1 << MarkerOutline::FolderTail;
+								}
+							} else {
+								marks |= 1 << MarkerOutline::FolderSub;
+							}
+						}
+					} else if (levelNum > FoldLevel::Base) {
+						if (levelNextNum < levelNum) {
+							needWhiteClosure = false;
+							if (LevelIsWhitespace(levelNext)) {
+								marks |= 1 << MarkerOutline::FolderSub;
+								needWhiteClosure = true;
+							} else if (lastSubLine) {
+								if (levelNextNum > FoldLevel::Base) {
+									marks |= 1 << MarkerOutline::FolderMidTail;
+								} else {
+									marks |= 1 << MarkerOutline::FolderTail;
+								}
+							} else {
+								marks |= 1 << MarkerOutline::FolderSub;
+							}
+						} else {
+							marks |= 1 << MarkerOutline::FolderSub;
+						}
+					}
+				}
+
+				marks &= vs.ms[margin].mask;
+
+				const PRectangle rcMarker(
+					rcSelMargin.left,
+					static_cast<XYPOSITION>(yposScreen),
+					rcSelMargin.right,
+					static_cast<XYPOSITION>(yposScreen + vs.lineHeight));
+				if (vs.ms[margin].style == MarginType::Number) {
+					if (firstSubLine) {
+						std::string sNumber;
+						if (lineDoc >= 0) {
+							sNumber = std::to_string(lineDoc + 1);
+						}
+						if (FlagSet(model.foldFlags, (FoldFlag::LevelNumbers | FoldFlag::LineState))) {
+							char number[100] = "";
+							if (FlagSet(model.foldFlags, FoldFlag::LevelNumbers)) {
+								const FoldLevel lev = model.pdoc->GetFoldLevel(lineDoc);
+								sprintf(number, "%c%c %03X %03X",
+									LevelIsHeader(lev) ? 'H' : '_',
+									LevelIsWhitespace(lev) ? 'W' : '_',
+									LevelNumber(lev),
+									static_cast<int>(lev) >> 16
+									);
+							} else {
+								const int state = model.pdoc->GetLineState(lineDoc);
+								sprintf(number, "%0X", state);
+							}
+							sNumber = number;
+						}
+						PRectangle rcNumber = rcMarker;
+						// Right justify
+						const XYPOSITION width = surface->WidthText(fontLineNumber, sNumber);
+						const XYPOSITION xpos = rcNumber.right - width - vs.marginNumberPadding;
+						rcNumber.left = xpos;
+						DrawTextNoClipPhase(surface, rcNumber, vs.styles[StyleLineNumber],
+							rcNumber.top + vs.maxAscent, sNumber, DrawPhase::all);
+					} else if (FlagSet(vs.wrap.visualFlags, WrapVisualFlag::Margin)) {
+						PRectangle rcWrapMarker = rcMarker;
+						rcWrapMarker.right -= wrapMarkerPaddingRight;
+						rcWrapMarker.left = rcWrapMarker.right - vs.styles[StyleLineNumber].aveCharWidth;
+						if (!customDrawWrapMarker) {
+							DrawWrapMarker(surface, rcWrapMarker, false, vs.styles[StyleLineNumber].fore);
+						} else {
+							customDrawWrapMarker(surface, rcWrapMarker, false, vs.styles[StyleLineNumber].fore);
+						}
+					}
+				} else if (vs.ms[margin].style == MarginType::Text || vs.ms[margin].style == MarginType::RText) {
+					const StyledText stMargin = model.pdoc->MarginStyledText(lineDoc);
+					if (stMargin.text && ValidStyledText(vs, vs.marginStyleOffset, stMargin)) {
+						if (firstSubLine) {
+							surface->FillRectangle(rcMarker,
+								vs.styles[stMargin.StyleAt(0) + vs.marginStyleOffset].back);
+							PRectangle rcText = rcMarker;
+							if (vs.ms[margin].style == MarginType::RText) {
+								const int width = WidestLineWidth(surface, vs, vs.marginStyleOffset, stMargin);
+								rcText.left = rcText.right - width - 3;
+							}
+							DrawStyledText(surface, vs, vs.marginStyleOffset, rcText,
+								stMargin, 0, stMargin.length, DrawPhase::all);
+						} else {
+							// if we're displaying annotation lines, colour the margin to match the associated document line
+							const int annotationLines = model.pdoc->AnnotationLines(lineDoc);
+							if (annotationLines && (visibleLine > lastVisibleLine - annotationLines)) {
+								surface->FillRectangle(rcMarker, vs.styles[stMargin.StyleAt(0) + vs.marginStyleOffset].back);
+							}
+						}
+					}
+				}
+
+				if (marks) {
+					for (int markBit = 0; (markBit < 32) && marks; markBit++) {
+						if (marks & 1) {
+							LineMarker::FoldPart part = LineMarker::FoldPart::undefined;
+							if (vs.ms[margin].ShowsFolding() && highlightDelimiter.IsFoldBlockHighlighted(lineDoc)) {
+								if (highlightDelimiter.IsBodyOfFoldBlock(lineDoc)) {
+									part = LineMarker::FoldPart::body;
+								} else if (highlightDelimiter.IsHeadOfFoldBlock(lineDoc)) {
+									if (firstSubLine) {
+										part = headWithTail ? LineMarker::FoldPart::headWithTail : LineMarker::FoldPart::head;
+									} else {
+										if (model.pcs->GetExpanded(lineDoc) || headWithTail) {
+											part = LineMarker::FoldPart::body;
+										} else {
+											part = LineMarker::FoldPart::undefined;
+										}
+									}
+								} else if (highlightDelimiter.IsTailOfFoldBlock(lineDoc)) {
+									part = LineMarker::FoldPart::tail;
+								}
+							}
+							vs.markers[markBit].Draw(surface, rcMarker, fontLineNumber, part, vs.ms[margin].style);
+						}
+						marks >>= 1;
+					}
+				}
+
+				visibleLine++;
+				yposScreen += vs.lineHeight;
+			}
+		}
+	}
+
+	PRectangle rcBlankMargin = rcMargin;
+	rcBlankMargin.left = rcSelMargin.right;
+	surface->FillRectangle(rcBlankMargin, vs.styles[StyleDefault].back);
+}
+
+}
+
diff --git a/scite-app/scintilla/src/MarginView.h b/scite-app/scintilla/src/MarginView.h
new file mode 100644
index 0000000..f73a188
--- /dev/null
+++ b/scite-app/scintilla/src/MarginView.h
@@ -0,0 +1,45 @@
+// Scintilla source code edit control
+/** @file MarginView.h
+ ** Defines the appearance of the editor margin.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef MARGINVIEW_H
+#define MARGINVIEW_H
+
+namespace Scintilla::Internal {
+
+void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourRGBA wrapColour);
+
+typedef void (*DrawWrapMarkerFn)(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourRGBA wrapColour);
+
+/**
+* MarginView draws the margins.
+*/
+class MarginView {
+public:
+	std::unique_ptr<Surface> pixmapSelMargin;
+	std::unique_ptr<Surface> pixmapSelPattern;
+	std::unique_ptr<Surface> pixmapSelPatternOffset1;
+	// Highlight current folding block
+	HighlightDelimiter highlightDelimiter;
+
+	int wrapMarkerPaddingRight; // right-most pixel padding of wrap markers
+	/** Some platforms, notably PLAT_CURSES, do not support Scintilla's native
+	 * DrawWrapMarker function for drawing wrap markers. Allow those platforms to
+	 * override it instead of creating a new method in the Surface class that
+	 * existing platforms must implement as empty. */
+	DrawWrapMarkerFn customDrawWrapMarker;
+
+	MarginView() noexcept;
+
+	void DropGraphics() noexcept;
+	void RefreshPixMaps(Surface *surfaceWindow, const ViewStyle &vsDraw);
+	void PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, PRectangle rcMargin,
+		const EditModel &model, const ViewStyle &vs);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Partitioning.h b/scite-app/scintilla/src/Partitioning.h
new file mode 100644
index 0000000..efa6bf9
--- /dev/null
+++ b/scite-app/scintilla/src/Partitioning.h
@@ -0,0 +1,261 @@
+// Scintilla source code edit control
+/** @file Partitioning.h
+ ** Data structure used to partition an interval. Used for holding line start/end positions.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PARTITIONING_H
+#define PARTITIONING_H
+
+namespace Scintilla::Internal {
+
+/// A split vector of integers with a method for adding a value to all elements
+/// in a range.
+/// Used by the Partitioning class.
+
+template <typename T>
+class SplitVectorWithRangeAdd : public SplitVector<T> {
+public:
+	explicit SplitVectorWithRangeAdd(ptrdiff_t growSize_) {
+		this->SetGrowSize(growSize_);
+		this->ReAllocate(growSize_);
+	}
+	// Deleted so SplitVectorWithRangeAdd objects can not be copied.
+	SplitVectorWithRangeAdd(const SplitVectorWithRangeAdd &) = delete;
+	SplitVectorWithRangeAdd(SplitVectorWithRangeAdd &&) = delete;
+	void operator=(const SplitVectorWithRangeAdd &) = delete;
+	void operator=(SplitVectorWithRangeAdd &&) = delete;
+	~SplitVectorWithRangeAdd() {
+	}
+	void RangeAddDelta(ptrdiff_t start, ptrdiff_t end, T delta) noexcept {
+		// end is 1 past end, so end-start is number of elements to change
+		ptrdiff_t i = 0;
+		const ptrdiff_t rangeLength = end - start;
+		ptrdiff_t range1Length = rangeLength;
+		const ptrdiff_t part1Left = this->part1Length - start;
+		if (range1Length > part1Left)
+			range1Length = part1Left;
+		while (i < range1Length) {
+			this->body[start++] += delta;
+			i++;
+		}
+		start += this->gapLength;
+		while (i < rangeLength) {
+			this->body[start++] += delta;
+			i++;
+		}
+	}
+};
+
+/// Divide an interval into multiple partitions.
+/// Useful for breaking a document down into sections such as lines.
+/// A 0 length interval has a single 0 length partition, numbered 0
+/// If interval not 0 length then each partition non-zero length
+/// When needed, positions after the interval are considered part of the last partition
+/// but the end of the last partition can be found with PositionFromPartition(last+1).
+
+template <typename T>
+class Partitioning {
+private:
+	// To avoid calculating all the partition positions whenever any text is inserted
+	// there may be a step somewhere in the list.
+	T stepPartition;
+	T stepLength;
+	std::unique_ptr<SplitVectorWithRangeAdd<T>> body;
+
+	// Move step forward
+	void ApplyStep(T partitionUpTo) noexcept {
+		if (stepLength != 0) {
+			body->RangeAddDelta(stepPartition+1, partitionUpTo + 1, stepLength);
+		}
+		stepPartition = partitionUpTo;
+		if (stepPartition >= body->Length()-1) {
+			stepPartition = Partitions();
+			stepLength = 0;
+		}
+	}
+
+	// Move step backward
+	void BackStep(T partitionDownTo) noexcept {
+		if (stepLength != 0) {
+			body->RangeAddDelta(partitionDownTo+1, stepPartition+1, -stepLength);
+		}
+		stepPartition = partitionDownTo;
+	}
+
+	void Allocate(ptrdiff_t growSize) {
+		body = std::make_unique<SplitVectorWithRangeAdd<T>>(growSize);
+		stepPartition = 0;
+		stepLength = 0;
+		body->Insert(0, 0);	// This value stays 0 for ever
+		body->Insert(1, 0);	// This is the end of the first partition and will be the start of the second
+	}
+
+public:
+	explicit Partitioning(int growSize) : stepPartition(0), stepLength(0) {
+		Allocate(growSize);
+	}
+
+	// Deleted so Partitioning objects can not be copied.
+	Partitioning(const Partitioning &) = delete;
+	Partitioning(Partitioning &&) = delete;
+	void operator=(const Partitioning &) = delete;
+	void operator=(Partitioning &&) = delete;
+
+	~Partitioning() {
+	}
+
+	T Partitions() const noexcept {
+		return static_cast<T>(body->Length())-1;
+	}
+
+	void ReAllocate(ptrdiff_t newSize) {
+		// + 1 accounts for initial element that is always 0.
+		body->ReAllocate(newSize + 1);
+	}
+
+	T Length() const noexcept {
+		return PositionFromPartition(Partitions());
+	}
+
+	void InsertPartition(T partition, T pos) {
+		if (stepPartition < partition) {
+			ApplyStep(partition);
+		}
+		body->Insert(partition, pos);
+		stepPartition++;
+	}
+
+	void InsertPartitions(T partition, const T *positions, size_t length) {
+		if (stepPartition < partition) {
+			ApplyStep(partition);
+		}
+		body->InsertFromArray(partition, positions, 0, length);
+		stepPartition += static_cast<T>(length);
+	}
+
+	void InsertPartitionsWithCast(T partition, const ptrdiff_t *positions, size_t length) {
+		// Used for 64-bit builds when T is 32-bits
+		if (stepPartition < partition) {
+			ApplyStep(partition);
+		}
+		T *pInsertion = body->InsertEmpty(partition, length);
+		for (size_t i = 0; i < length; i++) {
+			pInsertion[i] = static_cast<T>(positions[i]);
+		}
+		stepPartition += static_cast<T>(length);
+	}
+
+	void SetPartitionStartPosition(T partition, T pos) noexcept {
+		ApplyStep(partition+1);
+		if ((partition < 0) || (partition > body->Length())) {
+			return;
+		}
+		body->SetValueAt(partition, pos);
+	}
+
+	void InsertText(T partitionInsert, T delta) noexcept {
+		// Point all the partitions after the insertion point further along in the buffer
+		if (stepLength != 0) {
+			if (partitionInsert >= stepPartition) {
+				// Fill in up to the new insertion point
+				ApplyStep(partitionInsert);
+				stepLength += delta;
+			} else if (partitionInsert >= (stepPartition - body->Length() / 10)) {
+				// Close to step but before so move step back
+				BackStep(partitionInsert);
+				stepLength += delta;
+			} else {
+				ApplyStep(Partitions());
+				stepPartition = partitionInsert;
+				stepLength = delta;
+			}
+		} else {
+			stepPartition = partitionInsert;
+			stepLength = delta;
+		}
+	}
+
+	void RemovePartition(T partition) {
+		if (partition > stepPartition) {
+			ApplyStep(partition);
+			stepPartition--;
+		} else {
+			stepPartition--;
+		}
+		body->Delete(partition);
+	}
+
+	T PositionFromPartition(T partition) const noexcept {
+		PLATFORM_ASSERT(partition >= 0);
+		PLATFORM_ASSERT(partition < body->Length());
+		const ptrdiff_t lengthBody = body->Length();
+		if ((partition < 0) || (partition >= lengthBody)) {
+			return 0;
+		}
+		T pos = body->ValueAt(partition);
+		if (partition > stepPartition)
+			pos += stepLength;
+		return pos;
+	}
+
+	/// Return value in range [0 .. Partitions() - 1] even for arguments outside interval
+	T PartitionFromPosition(T pos) const noexcept {
+		if (body->Length() <= 1)
+			return 0;
+		if (pos >= (PositionFromPartition(Partitions())))
+			return Partitions() - 1;
+		T lower = 0;
+		T upper = Partitions();
+		do {
+			const T middle = (upper + lower + 1) / 2; 	// Round high
+			T posMiddle = body->ValueAt(middle);
+			if (middle > stepPartition)
+				posMiddle += stepLength;
+			if (pos < posMiddle) {
+				upper = middle - 1;
+			} else {
+				lower = middle;
+			}
+		} while (lower < upper);
+		return lower;
+	}
+
+	void DeleteAll() {
+		Allocate(body->GetGrowSize());
+	}
+
+	void Check() const {
+#ifdef CHECK_CORRECTNESS
+		if (Length() < 0) {
+			throw std::runtime_error("Partitioning: Length can not be negative.");
+		}
+		if (Partitions() < 1) {
+			throw std::runtime_error("Partitioning: Must always have 1 or more partitions.");
+		}
+		if (Length() == 0) {
+			if ((PositionFromPartition(0) != 0) || (PositionFromPartition(1) != 0)) {
+				throw std::runtime_error("Partitioning: Invalid empty partitioning.");
+			}
+		} else {
+			// Positions should be a strictly ascending sequence
+			for (T i = 0; i < Partitions(); i++) {
+				const T pos = PositionFromPartition(i);
+				const T posNext = PositionFromPartition(i+1);
+				if (pos > posNext) {
+					throw std::runtime_error("Partitioning: Negative partition.");
+				} else if (pos == posNext) {
+					throw std::runtime_error("Partitioning: Empty partition.");
+				}
+			}
+		}
+#endif
+	}
+
+};
+
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/PerLine.cxx b/scite-app/scintilla/src/PerLine.cxx
new file mode 100644
index 0000000..068d5d0
--- /dev/null
+++ b/scite-app/scintilla/src/PerLine.cxx
@@ -0,0 +1,550 @@
+// Scintilla source code edit control
+/** @file PerLine.cxx
+ ** Manages data associated with each line of the document
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+
+using namespace Scintilla::Internal;
+
+MarkerHandleSet::MarkerHandleSet() {
+}
+
+MarkerHandleSet::~MarkerHandleSet() {
+	mhList.clear();
+}
+
+bool MarkerHandleSet::Empty() const noexcept {
+	return mhList.empty();
+}
+
+int MarkerHandleSet::MarkValue() const noexcept {
+	unsigned int m = 0;
+	for (const MarkerHandleNumber &mhn : mhList) {
+		m |= (1 << mhn.number);
+	}
+	return m;
+}
+
+bool MarkerHandleSet::Contains(int handle) const noexcept {
+	for (const MarkerHandleNumber &mhn : mhList) {
+		if (mhn.handle == handle) {
+			return true;
+		}
+	}
+	return false;
+}
+
+MarkerHandleNumber const *MarkerHandleSet::GetMarkerHandleNumber(int which) const noexcept {
+	for (const MarkerHandleNumber &mhn : mhList) {
+		if (which == 0)
+			return &mhn;
+		which--;
+	}
+	return nullptr;
+}
+
+bool MarkerHandleSet::InsertHandle(int handle, int markerNum) {
+	mhList.push_front(MarkerHandleNumber(handle, markerNum));
+	return true;
+}
+
+void MarkerHandleSet::RemoveHandle(int handle) {
+	mhList.remove_if([handle](const MarkerHandleNumber &mhn) noexcept { return mhn.handle == handle; });
+}
+
+bool MarkerHandleSet::RemoveNumber(int markerNum, bool all) {
+	bool performedDeletion = false;
+	mhList.remove_if([&](const MarkerHandleNumber &mhn) noexcept {
+		if ((all || !performedDeletion) && (mhn.number == markerNum)) {
+			performedDeletion = true;
+			return true;
+		}
+		return false;
+	});
+	return performedDeletion;
+}
+
+void MarkerHandleSet::CombineWith(MarkerHandleSet *other) noexcept {
+	mhList.splice_after(mhList.before_begin(), other->mhList);
+}
+
+LineMarkers::~LineMarkers() {
+}
+
+void LineMarkers::Init() {
+	markers.DeleteAll();
+}
+
+void LineMarkers::InsertLine(Sci::Line line) {
+	if (markers.Length()) {
+		markers.Insert(line, 0);
+	}
+}
+
+void LineMarkers::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (markers.Length()) {
+		markers.InsertEmpty(line, lines);
+	}
+}
+
+void LineMarkers::RemoveLine(Sci::Line line) {
+	// Retain the markers from the deleted line by oring them into the previous line
+	if (markers.Length()) {
+		if (line > 0) {
+			MergeMarkers(line - 1);
+		}
+		markers.Delete(line);
+	}
+}
+
+Sci::Line LineMarkers::LineFromHandle(int markerHandle) const noexcept {
+	for (Sci::Line line = 0; line < markers.Length(); line++) {
+		if (markers[line] && markers[line]->Contains(markerHandle)) {
+			return line;
+		}
+	}
+	return -1;
+}
+
+int LineMarkers::HandleFromLine(Sci::Line line, int which) const noexcept {
+	if (markers.Length() && (line >= 0) && (line < markers.Length()) && markers[line]) {
+		MarkerHandleNumber const *pnmh = markers[line]->GetMarkerHandleNumber(which);
+		return pnmh ? pnmh->handle : -1;
+	}
+	return -1;
+}
+
+int LineMarkers::NumberFromLine(Sci::Line line, int which) const noexcept {
+	if (markers.Length() && (line >= 0) && (line < markers.Length()) && markers[line]) {
+		MarkerHandleNumber const *pnmh = markers[line]->GetMarkerHandleNumber(which);
+		return pnmh ? pnmh->number : -1;
+	}
+	return -1;
+}
+
+void LineMarkers::MergeMarkers(Sci::Line line) {
+	if (markers[line + 1]) {
+		if (!markers[line])
+			markers[line] = std::make_unique<MarkerHandleSet>();
+		markers[line]->CombineWith(markers[line + 1].get());
+		markers[line + 1].reset();
+	}
+}
+
+int LineMarkers::MarkValue(Sci::Line line) const noexcept {
+	if (markers.Length() && (line >= 0) && (line < markers.Length()) && markers[line])
+		return markers[line]->MarkValue();
+	else
+		return 0;
+}
+
+Sci::Line LineMarkers::MarkerNext(Sci::Line lineStart, int mask) const noexcept {
+	if (lineStart < 0)
+		lineStart = 0;
+	const Sci::Line length = markers.Length();
+	for (Sci::Line iLine = lineStart; iLine < length; iLine++) {
+		const MarkerHandleSet *onLine = markers[iLine].get();
+		if (onLine && ((onLine->MarkValue() & mask) != 0))
+			return iLine;
+	}
+	return -1;
+}
+
+int LineMarkers::AddMark(Sci::Line line, int markerNum, Sci::Line lines) {
+	handleCurrent++;
+	if (!markers.Length()) {
+		// No existing markers so allocate one element per line
+		markers.InsertEmpty(0, lines);
+	}
+	if (line >= markers.Length()) {
+		return -1;
+	}
+	if (!markers[line]) {
+		// Need new structure to hold marker handle
+		markers[line] = std::make_unique<MarkerHandleSet>();
+	}
+	markers[line]->InsertHandle(handleCurrent, markerNum);
+
+	return handleCurrent;
+}
+
+bool LineMarkers::DeleteMark(Sci::Line line, int markerNum, bool all) {
+	bool someChanges = false;
+	if (markers.Length() && (line >= 0) && (line < markers.Length()) && markers[line]) {
+		if (markerNum == -1) {
+			someChanges = true;
+			markers[line].reset();
+		} else {
+			someChanges = markers[line]->RemoveNumber(markerNum, all);
+			if (markers[line]->Empty()) {
+				markers[line].reset();
+			}
+		}
+	}
+	return someChanges;
+}
+
+void LineMarkers::DeleteMarkFromHandle(int markerHandle) {
+	const Sci::Line line = LineFromHandle(markerHandle);
+	if (line >= 0) {
+		markers[line]->RemoveHandle(markerHandle);
+		if (markers[line]->Empty()) {
+			markers[line].reset();
+		}
+	}
+}
+
+LineLevels::~LineLevels() {
+}
+
+void LineLevels::Init() {
+	levels.DeleteAll();
+}
+
+void LineLevels::InsertLine(Sci::Line line) {
+	if (levels.Length()) {
+		const int level = (line < levels.Length()) ? levels[line] : static_cast<int>(Scintilla::FoldLevel::Base);
+		levels.Insert(line, level);
+	}
+}
+
+void LineLevels::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (levels.Length()) {
+		const int level = (line < levels.Length()) ? levels[line] : static_cast<int>(Scintilla::FoldLevel::Base);
+		levels.InsertValue(line, lines, level);
+	}
+}
+
+void LineLevels::RemoveLine(Sci::Line line) {
+	if (levels.Length()) {
+		// Move up following lines but merge header flag from this line
+		// to line before to avoid a temporary disappearance causing expansion.
+		int firstHeader = levels[line] & static_cast<int>(Scintilla::FoldLevel::HeaderFlag);
+		levels.Delete(line);
+		if (line == levels.Length()-1) // Last line loses the header flag
+			levels[line-1] &= ~static_cast<int>(Scintilla::FoldLevel::HeaderFlag);
+		else if (line > 0)
+			levels[line-1] |= firstHeader;
+	}
+}
+
+void LineLevels::ExpandLevels(Sci::Line sizeNew) {
+	levels.InsertValue(levels.Length(), sizeNew - levels.Length(), static_cast<int>(Scintilla::FoldLevel::Base));
+}
+
+void LineLevels::ClearLevels() {
+	levels.DeleteAll();
+}
+
+int LineLevels::SetLevel(Sci::Line line, int level, Sci::Line lines) {
+	int prev = 0;
+	if ((line >= 0) && (line < lines)) {
+		if (!levels.Length()) {
+			ExpandLevels(lines + 1);
+		}
+		prev = levels[line];
+		if (prev != level) {
+			levels[line] = level;
+		}
+	}
+	return prev;
+}
+
+int LineLevels::GetLevel(Sci::Line line) const noexcept {
+	if (levels.Length() && (line >= 0) && (line < levels.Length())) {
+		return levels[line];
+	} else {
+		return static_cast<int>(Scintilla::FoldLevel::Base);
+	}
+}
+
+LineState::~LineState() {
+}
+
+void LineState::Init() {
+	lineStates.DeleteAll();
+}
+
+void LineState::InsertLine(Sci::Line line) {
+	if (lineStates.Length()) {
+		lineStates.EnsureLength(line);
+		const int val = (line < lineStates.Length()) ? lineStates[line] : 0;
+		lineStates.Insert(line, val);
+	}
+}
+
+void LineState::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (lineStates.Length()) {
+		lineStates.EnsureLength(line);
+		const int val = (line < lineStates.Length()) ? lineStates[line] : 0;
+		lineStates.InsertValue(line, lines, val);
+	}
+}
+
+void LineState::RemoveLine(Sci::Line line) {
+	if (lineStates.Length() > line) {
+		lineStates.Delete(line);
+	}
+}
+
+int LineState::SetLineState(Sci::Line line, int state) {
+	lineStates.EnsureLength(line + 1);
+	const int stateOld = lineStates[line];
+	lineStates[line] = state;
+	return stateOld;
+}
+
+int LineState::GetLineState(Sci::Line line) {
+	if (line < 0)
+		return 0;
+	lineStates.EnsureLength(line + 1);
+	return lineStates[line];
+}
+
+Sci::Line LineState::GetMaxLineState() const noexcept {
+	return lineStates.Length();
+}
+
+// Each allocated LineAnnotation is a char array which starts with an AnnotationHeader
+// and then has text and optional styles.
+
+struct AnnotationHeader {
+	short style;	// Style IndividualStyles implies array of styles
+	short lines;
+	int length;
+};
+
+namespace {
+
+constexpr int IndividualStyles = 0x100;
+
+size_t NumberLines(std::string_view sv) {
+	return std::count(sv.begin(), sv.end(), '\n') + 1;
+}
+
+std::unique_ptr<char[]>AllocateAnnotation(size_t length, int style) {
+	const size_t len = sizeof(AnnotationHeader) + length + ((style == IndividualStyles) ? length : 0);
+	return std::make_unique<char[]>(len);
+}
+
+}
+
+LineAnnotation::~LineAnnotation() {
+}
+
+void LineAnnotation::Init() {
+	ClearAll();
+}
+
+void LineAnnotation::InsertLine(Sci::Line line) {
+	if (annotations.Length()) {
+		annotations.EnsureLength(line);
+		annotations.Insert(line, std::unique_ptr<char []>());
+	}
+}
+
+void LineAnnotation::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (annotations.Length()) {
+		annotations.EnsureLength(line);
+		annotations.InsertEmpty(line, lines);
+	}
+}
+
+void LineAnnotation::RemoveLine(Sci::Line line) {
+	if (annotations.Length() && (line > 0) && (line <= annotations.Length())) {
+		annotations[line-1].reset();
+		annotations.Delete(line-1);
+	}
+}
+
+bool LineAnnotation::MultipleStyles(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line])
+		return reinterpret_cast<AnnotationHeader *>(annotations[line].get())->style == IndividualStyles;
+	else
+		return false;
+}
+
+int LineAnnotation::Style(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line])
+		return reinterpret_cast<AnnotationHeader *>(annotations[line].get())->style;
+	else
+		return 0;
+}
+
+const char *LineAnnotation::Text(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line])
+		return annotations[line].get()+sizeof(AnnotationHeader);
+	else
+		return nullptr;
+}
+
+const unsigned char *LineAnnotation::Styles(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line] && MultipleStyles(line))
+		return reinterpret_cast<unsigned char *>(annotations[line].get() + sizeof(AnnotationHeader) + Length(line));
+	else
+		return nullptr;
+}
+
+void LineAnnotation::SetText(Sci::Line line, const char *text) {
+	if (text && (line >= 0)) {
+		annotations.EnsureLength(line+1);
+		const int style = Style(line);
+		annotations[line] = AllocateAnnotation(strlen(text), style);
+		char *pa = annotations[line].get();
+		assert(pa);
+		AnnotationHeader *pah = reinterpret_cast<AnnotationHeader *>(pa);
+		pah->style = static_cast<short>(style);
+		pah->length = static_cast<int>(strlen(text));
+		pah->lines = static_cast<short>(NumberLines(text));
+		memcpy(pa+sizeof(AnnotationHeader), text, pah->length);
+	} else {
+		if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line]) {
+			annotations[line].reset();
+		}
+	}
+}
+
+void LineAnnotation::ClearAll() {
+	annotations.DeleteAll();
+}
+
+void LineAnnotation::SetStyle(Sci::Line line, int style) {
+	annotations.EnsureLength(line+1);
+	if (!annotations[line]) {
+		annotations[line] = AllocateAnnotation(0, style);
+	}
+	reinterpret_cast<AnnotationHeader *>(annotations[line].get())->style = static_cast<short>(style);
+}
+
+void LineAnnotation::SetStyles(Sci::Line line, const unsigned char *styles) {
+	if (line >= 0) {
+		annotations.EnsureLength(line+1);
+		if (!annotations[line]) {
+			annotations[line] = AllocateAnnotation(0, IndividualStyles);
+		} else {
+			const AnnotationHeader *pahSource = reinterpret_cast<AnnotationHeader *>(annotations[line].get());
+			if (pahSource->style != IndividualStyles) {
+				std::unique_ptr<char[]>allocation = AllocateAnnotation(pahSource->length, IndividualStyles);
+				AnnotationHeader *pahAlloc = reinterpret_cast<AnnotationHeader *>(allocation.get());
+				pahAlloc->length = pahSource->length;
+				pahAlloc->lines = pahSource->lines;
+				memcpy(allocation.get() + sizeof(AnnotationHeader), annotations[line].get() + sizeof(AnnotationHeader), pahSource->length);
+				annotations[line] = std::move(allocation);
+			}
+		}
+		AnnotationHeader *pah = reinterpret_cast<AnnotationHeader *>(annotations[line].get());
+		pah->style = IndividualStyles;
+		memcpy(annotations[line].get() + sizeof(AnnotationHeader) + pah->length, styles, pah->length);
+	}
+}
+
+int LineAnnotation::Length(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line])
+		return reinterpret_cast<AnnotationHeader *>(annotations[line].get())->length;
+	else
+		return 0;
+}
+
+int LineAnnotation::Lines(Sci::Line line) const noexcept {
+	if (annotations.Length() && (line >= 0) && (line < annotations.Length()) && annotations[line])
+		return reinterpret_cast<AnnotationHeader *>(annotations[line].get())->lines;
+	else
+		return 0;
+}
+
+LineTabstops::~LineTabstops() {
+}
+
+void LineTabstops::Init() {
+	tabstops.DeleteAll();
+}
+
+void LineTabstops::InsertLine(Sci::Line line) {
+	if (tabstops.Length()) {
+		tabstops.EnsureLength(line);
+		tabstops.Insert(line, nullptr);
+	}
+}
+
+void LineTabstops::InsertLines(Sci::Line line, Sci::Line lines) {
+	if (tabstops.Length()) {
+		tabstops.EnsureLength(line);
+		tabstops.InsertEmpty(line, lines);
+	}
+}
+
+void LineTabstops::RemoveLine(Sci::Line line) {
+	if (tabstops.Length() > line) {
+		tabstops[line].reset();
+		tabstops.Delete(line);
+	}
+}
+
+bool LineTabstops::ClearTabstops(Sci::Line line) noexcept {
+	if (line < tabstops.Length()) {
+		TabstopList *tl = tabstops[line].get();
+		if (tl) {
+			tl->clear();
+			return true;
+		}
+	}
+	return false;
+}
+
+bool LineTabstops::AddTabstop(Sci::Line line, int x) {
+	tabstops.EnsureLength(line + 1);
+	if (!tabstops[line]) {
+		tabstops[line] = std::make_unique<TabstopList>();
+	}
+
+	TabstopList *tl = tabstops[line].get();
+	if (tl) {
+		// tabstop positions are kept in order - insert in the right place
+		std::vector<int>::iterator it = std::lower_bound(tl->begin(), tl->end(), x);
+		// don't insert duplicates
+		if (it == tl->end() || *it != x) {
+			tl->insert(it, x);
+			return true;
+		}
+	}
+	return false;
+}
+
+int LineTabstops::GetNextTabstop(Sci::Line line, int x) const noexcept {
+	if (line < tabstops.Length()) {
+		TabstopList *tl = tabstops[line].get();
+		if (tl) {
+			for (const int i : *tl) {
+				if (i > x) {
+					return i;
+				}
+			}
+		}
+	}
+	return 0;
+}
diff --git a/scite-app/scintilla/src/PerLine.h b/scite-app/scintilla/src/PerLine.h
new file mode 100644
index 0000000..8f88183
--- /dev/null
+++ b/scite-app/scintilla/src/PerLine.h
@@ -0,0 +1,172 @@
+// Scintilla source code edit control
+/** @file PerLine.h
+ ** Manages data associated with each line of the document
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PERLINE_H
+#define PERLINE_H
+
+namespace Scintilla::Internal {
+
+/**
+ * This holds the marker identifier and the marker type to display.
+ * MarkerHandleNumbers are members of lists.
+ */
+struct MarkerHandleNumber {
+	int handle;
+	int number;
+	MarkerHandleNumber(int handle_, int number_) noexcept : handle(handle_), number(number_) {}
+};
+
+/**
+ * A marker handle set contains any number of MarkerHandleNumbers.
+ */
+class MarkerHandleSet {
+	std::forward_list<MarkerHandleNumber> mhList;
+
+public:
+	MarkerHandleSet();
+	// Deleted so MarkerHandleSet objects can not be copied.
+	MarkerHandleSet(const MarkerHandleSet &) = delete;
+	MarkerHandleSet(MarkerHandleSet &&) = delete;
+	void operator=(const MarkerHandleSet &) = delete;
+	void operator=(MarkerHandleSet &&) = delete;
+	~MarkerHandleSet();
+	bool Empty() const noexcept;
+	int MarkValue() const noexcept;	///< Bit set of marker numbers.
+	bool Contains(int handle) const noexcept;
+	bool InsertHandle(int handle, int markerNum);
+	void RemoveHandle(int handle);
+	bool RemoveNumber(int markerNum, bool all);
+	void CombineWith(MarkerHandleSet *other) noexcept;
+	MarkerHandleNumber const *GetMarkerHandleNumber(int which) const noexcept;
+};
+
+class LineMarkers : public PerLine {
+	SplitVector<std::unique_ptr<MarkerHandleSet>> markers;
+	/// Handles are allocated sequentially and should never have to be reused as 32 bit ints are very big.
+	int handleCurrent;
+public:
+	LineMarkers() : handleCurrent(0) {
+	}
+	// Deleted so LineMarkers objects can not be copied.
+	LineMarkers(const LineMarkers &) = delete;
+	LineMarkers(LineMarkers &&) = delete;
+	void operator=(const LineMarkers &) = delete;
+	void operator=(LineMarkers &&) = delete;
+	~LineMarkers() override;
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	int MarkValue(Sci::Line line) const noexcept;
+	Sci::Line MarkerNext(Sci::Line lineStart, int mask) const noexcept;
+	int AddMark(Sci::Line line, int markerNum, Sci::Line lines);
+	void MergeMarkers(Sci::Line line);
+	bool DeleteMark(Sci::Line line, int markerNum, bool all);
+	void DeleteMarkFromHandle(int markerHandle);
+	Sci::Line LineFromHandle(int markerHandle) const noexcept;
+	int HandleFromLine(Sci::Line line, int which) const noexcept;
+	int NumberFromLine(Sci::Line line, int which) const noexcept;
+};
+
+class LineLevels : public PerLine {
+	SplitVector<int> levels;
+public:
+	LineLevels() {
+	}
+	// Deleted so LineLevels objects can not be copied.
+	LineLevels(const LineLevels &) = delete;
+	LineLevels(LineLevels &&) = delete;
+	void operator=(const LineLevels &) = delete;
+	void operator=(LineLevels &&) = delete;
+	~LineLevels() override;
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	void ExpandLevels(Sci::Line sizeNew=-1);
+	void ClearLevels();
+	int SetLevel(Sci::Line line, int level, Sci::Line lines);
+	int GetLevel(Sci::Line line) const noexcept;
+};
+
+class LineState : public PerLine {
+	SplitVector<int> lineStates;
+public:
+	LineState() {
+	}
+	// Deleted so LineState objects can not be copied.
+	LineState(const LineState &) = delete;
+	LineState(LineState &&) = delete;
+	void operator=(const LineState &) = delete;
+	void operator=(LineState &&) = delete;
+	~LineState() override;
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	int SetLineState(Sci::Line line, int state);
+	int GetLineState(Sci::Line line);
+	Sci::Line GetMaxLineState() const noexcept;
+};
+
+class LineAnnotation : public PerLine {
+	SplitVector<std::unique_ptr<char []>> annotations;
+public:
+	LineAnnotation() {
+	}
+	// Deleted so LineAnnotation objects can not be copied.
+	LineAnnotation(const LineAnnotation &) = delete;
+	LineAnnotation(LineAnnotation &&) = delete;
+	void operator=(const LineAnnotation &) = delete;
+	void operator=(LineAnnotation &&) = delete;
+	~LineAnnotation() override;
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	bool MultipleStyles(Sci::Line line) const noexcept;
+	int Style(Sci::Line line) const noexcept;
+	const char *Text(Sci::Line line) const noexcept;
+	const unsigned char *Styles(Sci::Line line) const noexcept;
+	void SetText(Sci::Line line, const char *text);
+	void ClearAll();
+	void SetStyle(Sci::Line line, int style);
+	void SetStyles(Sci::Line line, const unsigned char *styles);
+	int Length(Sci::Line line) const noexcept;
+	int Lines(Sci::Line line) const noexcept;
+};
+
+typedef std::vector<int> TabstopList;
+
+class LineTabstops : public PerLine {
+	SplitVector<std::unique_ptr<TabstopList>> tabstops;
+public:
+	LineTabstops() {
+	}
+	// Deleted so LineTabstops objects can not be copied.
+	LineTabstops(const LineTabstops &) = delete;
+	LineTabstops(LineTabstops &&) = delete;
+	void operator=(const LineTabstops &) = delete;
+	void operator=(LineTabstops &&) = delete;
+	~LineTabstops() override;
+	void Init() override;
+	void InsertLine(Sci::Line line) override;
+	void InsertLines(Sci::Line line, Sci::Line lines) override;
+	void RemoveLine(Sci::Line line) override;
+
+	bool ClearTabstops(Sci::Line line) noexcept;
+	bool AddTabstop(Sci::Line line, int x);
+	int GetNextTabstop(Sci::Line line, int x) const noexcept;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Platform.h b/scite-app/scintilla/src/Platform.h
new file mode 100644
index 0000000..ce04d9b
--- /dev/null
+++ b/scite-app/scintilla/src/Platform.h
@@ -0,0 +1,379 @@
+// Scintilla source code edit control
+/** @file Platform.h
+ ** Interface to platform facilities. Also includes some basic utilities.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PLATFORM_H
+#define PLATFORM_H
+
+// PLAT_GTK = GTK+ on Linux or Win32
+// PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
+// PLAT_WIN = Win32 API on Win32 OS
+// PLAT_WX is wxWindows on any supported platform
+// PLAT_TK = Tcl/TK on Linux or Win32
+
+#define PLAT_GTK 0
+#define PLAT_GTK_WIN32 0
+#define PLAT_GTK_MACOSX 0
+#define PLAT_MACOSX 0
+#define PLAT_WIN 0
+#define PLAT_WX  0
+#define PLAT_QT 0
+#define PLAT_QT_QML 0
+#define PLAT_FOX 0
+#define PLAT_CURSES 0
+#define PLAT_TK 0
+#define PLAT_HAIKU 0
+
+#if defined(FOX)
+#undef PLAT_FOX
+#define PLAT_FOX 1
+
+#elif defined(__WX__)
+#undef PLAT_WX
+#define PLAT_WX  1
+
+#elif defined(CURSES)
+#undef PLAT_CURSES
+#define PLAT_CURSES 1
+
+#elif defined(__HAIKU__)
+#undef PLAT_HAIKU
+#define PLAT_HAIKU 1
+
+#elif defined(SCINTILLA_QT)
+#undef PLAT_QT
+#define PLAT_QT 1
+
+#elif defined(SCINTILLA_QT_QML)
+#undef PLAT_QT_QML
+#define PLAT_QT_QML 1
+
+#elif defined(TK)
+#undef PLAT_TK
+#define PLAT_TK 1
+
+#elif defined(GTK)
+#undef PLAT_GTK
+#define PLAT_GTK 1
+
+#if defined(__WIN32__) || defined(_MSC_VER)
+#undef PLAT_GTK_WIN32
+#define PLAT_GTK_WIN32 1
+#endif
+
+#if defined(__APPLE__)
+#undef PLAT_GTK_MACOSX
+#define PLAT_GTK_MACOSX 1
+#endif
+
+#elif defined(__APPLE__)
+
+#undef PLAT_MACOSX
+#define PLAT_MACOSX 1
+
+#else
+#undef PLAT_WIN
+#define PLAT_WIN 1
+
+#endif
+
+namespace Scintilla::Internal {
+
+// Underlying the implementation of the platform classes are platform specific types.
+// Sometimes these need to be passed around by client code so they are defined here
+
+typedef void *SurfaceID;
+typedef void *WindowID;
+typedef void *MenuID;
+typedef void *TickerID;
+typedef void *Function;
+typedef void *IdlerID;
+
+/**
+ * Font management.
+ */
+
+constexpr const char *localeNameDefault = "en-us";
+
+struct FontParameters {
+	const char *faceName;
+	XYPOSITION size;
+	Scintilla::FontWeight weight;
+	bool italic;
+	Scintilla::FontQuality extraFontFlag;
+	Scintilla::Technology technology;
+	Scintilla::CharacterSet characterSet;
+	const char *localeName;
+
+	constexpr FontParameters(
+		const char *faceName_,
+		XYPOSITION size_=10,
+		Scintilla::FontWeight weight_= Scintilla::FontWeight::Normal,
+		bool italic_=false,
+		Scintilla::FontQuality extraFontFlag_= Scintilla::FontQuality::QualityDefault,
+		Scintilla::Technology technology_= Scintilla::Technology::Default,
+		Scintilla::CharacterSet characterSet_= Scintilla::CharacterSet::Ansi,
+		const char *localeName_=localeNameDefault) noexcept :
+
+		faceName(faceName_),
+		size(size_),
+		weight(weight_),
+		italic(italic_),
+		extraFontFlag(extraFontFlag_),
+		technology(technology_),
+		characterSet(characterSet_),
+		localeName(localeName_)
+	{
+	}
+
+};
+
+class Font {
+public:
+	Font() noexcept = default;
+	// Deleted so Font objects can not be copied
+	Font(const Font &) = delete;
+	Font(Font &&) = delete;
+	Font &operator=(const Font &) = delete;
+	Font &operator=(Font &&) = delete;
+	virtual ~Font() noexcept = default;
+
+	static std::shared_ptr<Font> Allocate(const FontParameters &fp);
+};
+
+class IScreenLine {
+public:
+	virtual std::string_view Text() const = 0;
+	virtual size_t Length() const = 0;
+	virtual size_t RepresentationCount() const = 0;
+	virtual XYPOSITION Width() const = 0;
+	virtual XYPOSITION Height() const = 0;
+	virtual XYPOSITION TabWidth() const = 0;
+	virtual XYPOSITION TabWidthMinimumPixels() const = 0;
+	virtual const Font *FontOfPosition(size_t position) const = 0;
+	virtual XYPOSITION RepresentationWidth(size_t position) const = 0;
+	virtual XYPOSITION TabPositionAfter(XYPOSITION xPosition) const = 0;
+};
+
+class IScreenLineLayout {
+public:
+	virtual ~IScreenLineLayout() noexcept = default;
+	virtual size_t PositionFromX(XYPOSITION xDistance, bool charPosition) = 0;
+	virtual XYPOSITION XFromPosition(size_t caretPosition) = 0;
+	virtual std::vector<Interval> FindRangeIntervals(size_t start, size_t end) = 0;
+};
+
+/**
+ * Parameters for surfaces.
+ */
+struct SurfaceMode {
+	int codePage = 0;
+	bool bidiR2L = false;
+	SurfaceMode() = default;
+	explicit SurfaceMode(int codePage_, bool bidiR2L_) noexcept : codePage(codePage_), bidiR2L(bidiR2L_) {
+	}
+};
+
+/**
+ * A surface abstracts a place to draw.
+ */
+class Surface {
+public:
+	Surface() noexcept = default;
+	Surface(const Surface &) = delete;
+	Surface(Surface &&) = delete;
+	Surface &operator=(const Surface &) = delete;
+	Surface &operator=(Surface &&) = delete;
+	virtual ~Surface() noexcept = default;
+	static std::unique_ptr<Surface> Allocate(Scintilla::Technology technology);
+
+	virtual void Init(WindowID wid)=0;
+	virtual void Init(SurfaceID sid, WindowID wid)=0;
+	virtual std::unique_ptr<Surface> AllocatePixMap(int width, int height)=0;
+
+	virtual void SetMode(SurfaceMode mode)=0;
+
+	enum class Ends {
+		semiCircles = 0x0,
+		leftFlat = 0x1,
+		leftAngle = 0x2,
+		rightFlat = 0x10,
+		rightAngle = 0x20,
+	};
+
+	virtual void Release() noexcept=0;
+	virtual int SupportsFeature(Scintilla::Supports feature) noexcept=0;
+	virtual bool Initialised()=0;
+	virtual int LogPixelsY()=0;
+	virtual int PixelDivisions()=0;
+	virtual int DeviceHeightFont(int points)=0;
+	virtual void LineDraw(Point start, Point end, Stroke stroke)=0;
+	virtual void PolyLine(const Point *pts, size_t npts, Stroke stroke)=0;
+	virtual void Polygon(const Point *pts, size_t npts, FillStroke fillStroke)=0;
+	virtual void RectangleDraw(PRectangle rc, FillStroke fillStroke)=0;
+	virtual void RectangleFrame(PRectangle rc, Stroke stroke)=0;
+	virtual void FillRectangle(PRectangle rc, Fill fill)=0;
+	virtual void FillRectangleAligned(PRectangle rc, Fill fill)=0;
+	virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;
+	virtual void RoundedRectangle(PRectangle rc, FillStroke fillStroke)=0;
+	virtual void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke)=0;
+	enum class GradientOptions { leftToRight, topToBottom };
+	virtual void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options)=0;
+	virtual void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) = 0;
+	virtual void Ellipse(PRectangle rc, FillStroke fillStroke)=0;
+	virtual void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends)=0;
+	virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0;
+
+	virtual std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) = 0;
+
+	virtual void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0;
+	virtual void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) = 0;
+	virtual XYPOSITION WidthText(const Font *font_, std::string_view text) = 0;
+
+	virtual void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) = 0;
+	virtual void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) = 0;
+	virtual void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) = 0;
+	virtual XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) = 0;
+
+	virtual XYPOSITION Ascent(const Font *font_)=0;
+	virtual XYPOSITION Descent(const Font *font_)=0;
+	virtual XYPOSITION InternalLeading(const Font *font_)=0;
+	virtual XYPOSITION Height(const Font *font_)=0;
+	virtual XYPOSITION AverageCharWidth(const Font *font_)=0;
+
+	virtual void SetClip(PRectangle rc)=0;
+	virtual void PopClip()=0;
+	virtual void FlushCachedState()=0;
+	virtual void FlushDrawing()=0;
+};
+
+/**
+ * Class to hide the details of window manipulation.
+ * Does not own the window which will normally have a longer life than this object.
+ */
+class Window {
+protected:
+	WindowID wid;
+public:
+	Window() noexcept : wid(nullptr), cursorLast(Cursor::invalid) {
+	}
+	Window(const Window &source) = delete;
+	Window(Window &&) = delete;
+	Window &operator=(WindowID wid_) noexcept {
+		wid = wid_;
+		cursorLast = Cursor::invalid;
+		return *this;
+	}
+	Window &operator=(const Window &) = delete;
+	Window &operator=(Window &&) = delete;
+	virtual ~Window() noexcept;
+	WindowID GetID() const noexcept { return wid; }
+	bool Created() const noexcept { return wid != nullptr; }
+	void Destroy() noexcept;
+	PRectangle GetPosition() const;
+	void SetPosition(PRectangle rc);
+	void SetPositionRelative(PRectangle rc, const Window *relativeTo);
+	PRectangle GetClientPosition() const;
+	void Show(bool show=true);
+	void InvalidateAll();
+	void InvalidateRectangle(PRectangle rc);
+	enum class Cursor { invalid, text, arrow, up, wait, horizontal, vertical, reverseArrow, hand };
+	void SetCursor(Cursor curs);
+	PRectangle GetMonitorRect(Point pt);
+private:
+	Cursor cursorLast;
+};
+
+/**
+ * Listbox management.
+ */
+
+// ScintillaBase implements IListBoxDelegate to receive ListBoxEvents from a ListBox
+
+struct ListBoxEvent {
+	enum class EventType { selectionChange, doubleClick } event;
+	ListBoxEvent(EventType event_) noexcept : event(event_) {
+	}
+};
+
+class IListBoxDelegate {
+public:
+	virtual void ListNotify(ListBoxEvent *plbe)=0;
+};
+
+struct ListOptions {
+	std::optional<ColourRGBA> fore;
+	std::optional<ColourRGBA> back;
+	std::optional<ColourRGBA> foreSelected;
+	std::optional<ColourRGBA> backSelected;
+	AutoCompleteOption options=AutoCompleteOption::Normal;
+};
+
+class ListBox : public Window {
+public:
+	ListBox() noexcept;
+	virtual ~ListBox() noexcept override;
+	static std::unique_ptr<ListBox> Allocate();
+
+	virtual void SetFont(const Font *font)=0;
+	virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_, Scintilla::Technology technology_)=0;
+	virtual void SetAverageCharWidth(int width)=0;
+	virtual void SetVisibleRows(int rows)=0;
+	virtual int GetVisibleRows() const=0;
+	virtual PRectangle GetDesiredRect()=0;
+	virtual int CaretFromEdge()=0;
+	virtual void Clear() noexcept=0;
+	virtual void Append(char *s, int type = -1)=0;
+	virtual int Length()=0;
+	virtual void Select(int n)=0;
+	virtual int GetSelection()=0;
+	virtual int Find(const char *prefix)=0;
+	virtual std::string GetValue(int n)=0;
+	virtual void RegisterImage(int type, const char *xpm_data)=0;
+	virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) = 0;
+	virtual void ClearRegisteredImages()=0;
+	virtual void SetDelegate(IListBoxDelegate *lbDelegate)=0;
+	virtual void SetList(const char* list, char separator, char typesep)=0;
+	virtual void SetOptions(ListOptions options_)=0;
+};
+
+/**
+ * Menu management.
+ */
+class Menu {
+	MenuID mid;
+public:
+	Menu() noexcept;
+	MenuID GetID() const noexcept { return mid; }
+	void CreatePopUp();
+	void Destroy() noexcept;
+	void Show(Point pt, const Window &w);
+};
+
+/**
+ * Platform namespace used to retrieve system wide parameters such as double click speed
+ * and chrome colour.
+ */
+namespace Platform {
+
+ColourRGBA Chrome();
+ColourRGBA ChromeHighlight();
+const char *DefaultFont();
+int DefaultFontSize();
+unsigned int DoubleClickTime();
+constexpr long LongFromTwoShorts(short a,short b) noexcept {
+	return (a) | ((b) << 16);
+}
+
+}
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Position.h b/scite-app/scintilla/src/Position.h
new file mode 100644
index 0000000..b455124
--- /dev/null
+++ b/scite-app/scintilla/src/Position.h
@@ -0,0 +1,26 @@
+// Scintilla source code edit control
+/** @file Position.h
+ ** Defines global type name Position in the Sci internal namespace.
+ **/
+// Copyright 2015 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef POSITION_H
+#define POSITION_H
+
+/**
+ * A Position is a position within a document between two characters or at the beginning or end.
+ * Sometimes used as a character index where it identifies the character after the position.
+ * A Line is a document or screen line.
+ */
+
+namespace Sci {
+
+typedef ptrdiff_t Position;
+typedef ptrdiff_t Line;
+
+inline constexpr Position invalidPosition = -1;
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/PositionCache.cxx b/scite-app/scintilla/src/PositionCache.cxx
new file mode 100644
index 0000000..285bf28
--- /dev/null
+++ b/scite-app/scintilla/src/PositionCache.cxx
@@ -0,0 +1,887 @@
+// Scintilla source code edit control
+/** @file PositionCache.cxx
+ ** Classes for caching layout information.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cmath>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+void BidiData::Resize(size_t maxLineLength_) {
+	stylesFonts.resize(maxLineLength_ + 1);
+	widthReprs.resize(maxLineLength_ + 1);
+}
+
+LineLayout::LineLayout(Sci::Line lineNumber_, int maxLineLength_) :
+	lenLineStarts(0),
+	lineNumber(lineNumber_),
+	maxLineLength(-1),
+	numCharsInLine(0),
+	numCharsBeforeEOL(0),
+	validity(ValidLevel::invalid),
+	xHighlightGuide(0),
+	highlightColumn(false),
+	containsCaret(false),
+	edgeColumn(0),
+	bracePreviousStyles{},
+	hotspot(0,0),
+	widthLine(wrapWidthInfinite),
+	lines(1),
+	wrapIndent(0) {
+	Resize(maxLineLength_);
+}
+
+LineLayout::~LineLayout() {
+	Free();
+}
+
+void LineLayout::Resize(int maxLineLength_) {
+	if (maxLineLength_ > maxLineLength) {
+		Free();
+		chars = std::make_unique<char[]>(maxLineLength_ + 1);
+		styles = std::make_unique<unsigned char []>(maxLineLength_ + 1);
+		// Extra position allocated as sometimes the Windows
+		// GetTextExtentExPoint API writes an extra element.
+		positions = std::make_unique<XYPOSITION []>(maxLineLength_ + 1 + 1);
+		if (bidiData) {
+			bidiData->Resize(maxLineLength_);
+		}
+
+		maxLineLength = maxLineLength_;
+	}
+}
+
+void LineLayout::EnsureBidiData() {
+	if (!bidiData) {
+		bidiData = std::make_unique<BidiData>();
+		bidiData->Resize(maxLineLength);
+	}
+}
+
+void LineLayout::Free() noexcept {
+	chars.reset();
+	styles.reset();
+	positions.reset();
+	lineStarts.reset();
+	bidiData.reset();
+}
+
+void LineLayout::Invalidate(ValidLevel validity_) noexcept {
+	if (validity > validity_)
+		validity = validity_;
+}
+
+Sci::Line LineLayout::LineNumber() const noexcept {
+	return lineNumber;
+}
+
+bool LineLayout::CanHold(Sci::Line lineDoc, int lineLength_) const noexcept {
+	return (lineNumber == lineDoc) && (lineLength_ <= maxLineLength);
+}
+
+int LineLayout::LineStart(int line) const noexcept {
+	if (line <= 0) {
+		return 0;
+	} else if ((line >= lines) || !lineStarts) {
+		return numCharsInLine;
+	} else {
+		return lineStarts[line];
+	}
+}
+
+int LineLayout::LineLength(int line) const noexcept {
+	if (!lineStarts) {
+		return numCharsInLine;
+	} if (line >= lines - 1) {
+		return numCharsInLine - lineStarts[line];
+	} else {
+		return lineStarts[line + 1] - lineStarts[line];
+	}
+}
+
+int LineLayout::LineLastVisible(int line, Scope scope) const noexcept {
+	if (line < 0) {
+		return 0;
+	} else if ((line >= lines-1) || !lineStarts) {
+		return scope == Scope::visibleOnly ? numCharsBeforeEOL : numCharsInLine;
+	} else {
+		return lineStarts[line+1];
+	}
+}
+
+Range LineLayout::SubLineRange(int subLine, Scope scope) const noexcept {
+	return Range(LineStart(subLine), LineLastVisible(subLine, scope));
+}
+
+bool LineLayout::InLine(int offset, int line) const noexcept {
+	return ((offset >= LineStart(line)) && (offset < LineStart(line + 1))) ||
+		((offset == numCharsInLine) && (line == (lines-1)));
+}
+
+int LineLayout::SubLineFromPosition(int posInLine, PointEnd pe) const noexcept {
+	if (!lineStarts || (posInLine > maxLineLength)) {
+		return lines - 1;
+	}
+
+	for (int line = 0; line < lines; line++) {
+		if (FlagSet(pe, PointEnd::subLineEnd)) {
+			// Return subline not start of next
+			if (lineStarts[line + 1] <= posInLine + 1)
+				return line;
+		} else {
+			if (lineStarts[line + 1] <= posInLine)
+				return line;
+		}
+	}
+
+	return lines - 1;
+}
+
+void LineLayout::SetLineStart(int line, int start) {
+	if ((line >= lenLineStarts) && (line != 0)) {
+		const int newMaxLines = line + 20;
+		std::unique_ptr<int[]> newLineStarts = std::make_unique<int[]>(newMaxLines);
+		if (lenLineStarts) {
+			std::copy(lineStarts.get(), lineStarts.get() + lenLineStarts, newLineStarts.get());
+		}
+		lineStarts = std::move(newLineStarts);
+		lenLineStarts = newMaxLines;
+	}
+	lineStarts[line] = start;
+}
+
+void LineLayout::SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
+                                    char bracesMatchStyle, int xHighlight, bool ignoreStyle) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) {
+		const Sci::Position braceOffset = braces[0] - rangeLine.start;
+		if (braceOffset < numCharsInLine) {
+			bracePreviousStyles[0] = styles[braceOffset];
+			styles[braceOffset] = bracesMatchStyle;
+		}
+	}
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) {
+		const Sci::Position braceOffset = braces[1] - rangeLine.start;
+		if (braceOffset < numCharsInLine) {
+			bracePreviousStyles[1] = styles[braceOffset];
+			styles[braceOffset] = bracesMatchStyle;
+		}
+	}
+	if ((braces[0] >= rangeLine.start && braces[1] <= rangeLine.end) ||
+	        (braces[1] >= rangeLine.start && braces[0] <= rangeLine.end)) {
+		xHighlightGuide = xHighlight;
+	}
+}
+
+void LineLayout::RestoreBracesHighlight(Range rangeLine, const Sci::Position braces[], bool ignoreStyle) {
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[0])) {
+		const Sci::Position braceOffset = braces[0] - rangeLine.start;
+		if (braceOffset < numCharsInLine) {
+			styles[braceOffset] = bracePreviousStyles[0];
+		}
+	}
+	if (!ignoreStyle && rangeLine.ContainsCharacter(braces[1])) {
+		const Sci::Position braceOffset = braces[1] - rangeLine.start;
+		if (braceOffset < numCharsInLine) {
+			styles[braceOffset] = bracePreviousStyles[1];
+		}
+	}
+	xHighlightGuide = 0;
+}
+
+int LineLayout::FindBefore(XYPOSITION x, Range range) const noexcept {
+	Sci::Position lower = range.start;
+	Sci::Position upper = range.end;
+	do {
+		const Sci::Position middle = (upper + lower + 1) / 2; 	// Round high
+		const XYPOSITION posMiddle = positions[middle];
+		if (x < posMiddle) {
+			upper = middle - 1;
+		} else {
+			lower = middle;
+		}
+	} while (lower < upper);
+	return static_cast<int>(lower);
+}
+
+
+int LineLayout::FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const noexcept {
+	int pos = FindBefore(x, range);
+	while (pos < range.end) {
+		if (charPosition) {
+			if (x < (positions[pos + 1])) {
+				return pos;
+			}
+		} else {
+			if (x < ((positions[pos] + positions[pos + 1]) / 2)) {
+				return pos;
+			}
+		}
+		pos++;
+	}
+	return static_cast<int>(range.end);
+}
+
+Point LineLayout::PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const noexcept {
+	Point pt;
+	// In case of very long line put x at arbitrary large position
+	if (posInLine > maxLineLength) {
+		pt.x = positions[maxLineLength] - positions[LineStart(lines)];
+	}
+
+	for (int subLine = 0; subLine < lines; subLine++) {
+		const Range rangeSubLine = SubLineRange(subLine, Scope::visibleOnly);
+		if (posInLine >= rangeSubLine.start) {
+			pt.y = static_cast<XYPOSITION>(subLine*lineHeight);
+			if (posInLine <= rangeSubLine.end) {
+				pt.x = positions[posInLine] - positions[rangeSubLine.start];
+				if (rangeSubLine.start != 0)	// Wrapped lines may be indented
+					pt.x += wrapIndent;
+				if (FlagSet(pe, PointEnd::subLineEnd))	// Return end of first subline not start of next
+					break;
+			} else if (FlagSet(pe, PointEnd::lineEnd) && (subLine == (lines-1))) {
+				pt.x = positions[numCharsInLine] - positions[rangeSubLine.start];
+				if (rangeSubLine.start != 0)	// Wrapped lines may be indented
+					pt.x += wrapIndent;
+			}
+		} else {
+			break;
+		}
+	}
+	return pt;
+}
+
+int LineLayout::EndLineStyle() const noexcept {
+	return styles[numCharsBeforeEOL > 0 ? numCharsBeforeEOL-1 : 0];
+}
+
+ScreenLine::ScreenLine(
+	const LineLayout *ll_,
+	int subLine,
+	const ViewStyle &vs,
+	XYPOSITION width_,
+	int tabWidthMinimumPixels_) :
+	ll(ll_),
+	start(ll->LineStart(subLine)),
+	len(ll->LineLength(subLine)),
+	width(width_),
+	height(static_cast<float>(vs.lineHeight)),
+	ctrlCharPadding(vs.ctrlCharPadding),
+	tabWidth(vs.tabWidth),
+	tabWidthMinimumPixels(tabWidthMinimumPixels_) {
+}
+
+ScreenLine::~ScreenLine() {
+}
+
+std::string_view ScreenLine::Text() const {
+	return std::string_view(&ll->chars[start], len);
+}
+
+size_t ScreenLine::Length() const {
+	return len;
+}
+
+size_t ScreenLine::RepresentationCount() const {
+	return std::count_if(&ll->bidiData->widthReprs[start],
+		&ll->bidiData->widthReprs[start + len],
+		[](XYPOSITION w) noexcept { return w > 0.0f; });
+}
+
+XYPOSITION ScreenLine::Width() const {
+	return width;
+}
+
+XYPOSITION ScreenLine::Height() const {
+	return height;
+}
+
+XYPOSITION ScreenLine::TabWidth() const {
+	return tabWidth;
+}
+
+XYPOSITION ScreenLine::TabWidthMinimumPixels() const {
+	return static_cast<XYPOSITION>(tabWidthMinimumPixels);
+}
+
+const Font *ScreenLine::FontOfPosition(size_t position) const {
+	return ll->bidiData->stylesFonts[start + position].get();
+}
+
+XYPOSITION ScreenLine::RepresentationWidth(size_t position) const {
+	return ll->bidiData->widthReprs[start + position];
+}
+
+XYPOSITION ScreenLine::TabPositionAfter(XYPOSITION xPosition) const {
+	return (std::floor((xPosition + TabWidthMinimumPixels()) / TabWidth()) + 1) * TabWidth();
+}
+
+LineLayoutCache::LineLayoutCache() :
+	level(LineCache::None),
+	allInvalidated(false), styleClock(-1) {
+}
+
+LineLayoutCache::~LineLayoutCache() = default;
+
+namespace {
+
+constexpr size_t AlignUp(size_t value, size_t alignment) noexcept {
+	return ((value - 1) / alignment + 1) * alignment;
+}
+
+constexpr size_t alignmentLLC = 20;
+
+}
+
+
+size_t LineLayoutCache::EntryForLine(Sci::Line line) const noexcept {
+	switch (level) {
+	case LineCache::None:
+		return 0;
+	case LineCache::Caret:
+		return 0;
+	case LineCache::Page:
+		return 1 + (line % (cache.size() - 1));
+	case LineCache::Document:
+		return line;
+	}
+	return 0;
+}
+
+void LineLayoutCache::AllocateForLevel(Sci::Line linesOnScreen, Sci::Line linesInDoc) {
+	size_t lengthForLevel = 0;
+	if (level == LineCache::Caret) {
+		lengthForLevel = 1;
+	} else if (level == LineCache::Page) {
+		lengthForLevel = AlignUp(linesOnScreen + 1, alignmentLLC);
+	} else if (level == LineCache::Document) {
+		lengthForLevel = AlignUp(linesInDoc, alignmentLLC);
+	}
+
+	if (lengthForLevel != cache.size()) {
+		allInvalidated = false;
+		cache.resize(lengthForLevel);
+		// Cache::none -> no entries
+		// Cache::caret -> 1 entry can take any line
+		// Cache::document -> entry per line so each line in correct entry after resize
+		if (level == LineCache::Page) {
+			// Cache::page -> locates lines in particular entries which may be incorrect after
+			// a resize so move them to correct entries.
+			for (size_t i = 1; i < cache.size();) {
+				size_t increment = 1;
+				if (cache[i]) {
+					const size_t posForLine = EntryForLine(cache[i]->LineNumber());
+					if (posForLine != i) {
+						if (cache[posForLine]) {
+							if (EntryForLine(cache[posForLine]->LineNumber()) == posForLine) {
+								// [posForLine] already holds line that is in correct place
+								cache[i].reset();	// This line has nowhere to go so reset it.
+							} else {
+								std::swap(cache[i], cache[posForLine]);
+								increment = 0;
+								// Don't increment as newly swapped in value may have to move
+							}
+						} else {
+							cache[posForLine] = std::move(cache[i]);
+						}
+					}
+				}
+				i += increment;
+			}
+
+#ifdef CHECK_LLC
+			for (size_t i = 1; i < cache.size(); i++) {
+				if (cache[i]) {
+					PLATFORM_ASSERT(EntryForLine(cache[i]->LineNumber()) == i);
+				}
+			}
+#endif
+		}
+	}
+	PLATFORM_ASSERT(cache.size() == lengthForLevel);
+}
+
+void LineLayoutCache::Deallocate() noexcept {
+	cache.clear();
+}
+
+void LineLayoutCache::Invalidate(LineLayout::ValidLevel validity_) noexcept {
+	if (!cache.empty() && !allInvalidated) {
+		for (const std::shared_ptr<LineLayout> &ll : cache) {
+			if (ll) {
+				ll->Invalidate(validity_);
+			}
+		}
+		if (validity_ == LineLayout::ValidLevel::invalid) {
+			allInvalidated = true;
+		}
+	}
+}
+
+void LineLayoutCache::SetLevel(LineCache level_) noexcept {
+	if (level != level_) {
+		level = level_;
+		allInvalidated = false;
+		cache.clear();
+	}
+}
+
+std::shared_ptr<LineLayout> LineLayoutCache::Retrieve(Sci::Line lineNumber, Sci::Line lineCaret, int maxChars, int styleClock_,
+                                      Sci::Line linesOnScreen, Sci::Line linesInDoc) {
+	AllocateForLevel(linesOnScreen, linesInDoc);
+	if (styleClock != styleClock_) {
+		Invalidate(LineLayout::ValidLevel::checkTextAndStyle);
+		styleClock = styleClock_;
+	}
+	allInvalidated = false;
+	size_t pos = 0;
+	if (level == LineCache::Page) {
+		// If first entry is this line then just reuse it.
+		if (!(cache[0] && (cache[0]->lineNumber == lineNumber))) {
+			const size_t posForLine = EntryForLine(lineNumber);
+			if (lineNumber == lineCaret) {
+				// Use position 0 for caret line.
+				if (cache[0]) {
+					// Another line is currently in [0] so move it out to its normal position.
+					// Since it was recently the caret line its likely to be needed soon.
+					const size_t posNewForEntry0 = EntryForLine(cache[0]->lineNumber);
+					if (posForLine == posNewForEntry0) {
+						std::swap(cache[0], cache[posNewForEntry0]);
+					} else {
+						cache[posNewForEntry0] = std::move(cache[0]);
+					}
+				}
+				if (cache[posForLine] && (cache[posForLine]->lineNumber == lineNumber)) {
+					// Caret line is currently somewhere else so move it to [0].
+					cache[0] = std::move(cache[posForLine]);
+				}
+			} else {
+				pos = posForLine;
+			}
+		}
+	} else if (level == LineCache::Document) {
+		pos = lineNumber;
+	}
+
+	if (pos < cache.size()) {
+		if (cache[pos] && !cache[pos]->CanHold(lineNumber, maxChars)) {
+			cache[pos].reset();
+		}
+		if (!cache[pos]) {
+			cache[pos] = std::make_shared<LineLayout>(lineNumber, maxChars);
+		}
+#ifdef CHECK_LLC
+		// Expensive check that there is only one entry for any line number
+		std::vector<bool> linesInCache(linesInDoc);
+		for (const auto &entry : cache) {
+			if (entry) {
+				PLATFORM_ASSERT(!linesInCache[entry->LineNumber()]);
+				linesInCache[entry->LineNumber()] = true;
+			}
+		}
+#endif
+		return cache[pos];
+	}
+
+	// Only reach here for level == Cache::none
+	return std::make_shared<LineLayout>(lineNumber, maxChars);
+}
+
+// Simply pack the (maximum 4) character bytes into an int
+static unsigned int KeyFromString(std::string_view charBytes) noexcept {
+	PLATFORM_ASSERT(charBytes.length() <= 4);
+	unsigned int k=0;
+	for (size_t i=0; i < charBytes.length(); i++) {
+		k = k * 0x100;
+		const unsigned char uc = charBytes[i];
+		k += uc;
+	}
+	return k;
+}
+
+void SpecialRepresentations::SetRepresentation(std::string_view charBytes, std::string_view value) {
+	if ((charBytes.length() <= 4) && (value.length() <= Representation::maxLength)) {
+		const unsigned int key = KeyFromString(charBytes);
+		MapRepresentation::iterator it = mapReprs.find(key);
+		if (it == mapReprs.end()) {
+			// New entry so increment for first byte
+			const unsigned char ucStart = charBytes.empty() ? 0 : charBytes[0];
+			startByteHasReprs[ucStart]++;
+		}
+		mapReprs[key] = Representation(value);
+	}
+}
+
+void SpecialRepresentations::SetRepresentationAppearance(std::string_view charBytes, RepresentationAppearance appearance) {
+	if (charBytes.length() <= 4) {
+		const unsigned int key = KeyFromString(charBytes);
+		MapRepresentation::iterator it = mapReprs.find(key);
+		if (it == mapReprs.end()) {
+			// Not present so fail
+			return;
+		}
+		it->second.appearance = appearance;
+	}
+}
+
+void SpecialRepresentations::SetRepresentationColour(std::string_view charBytes, ColourRGBA colour) {
+	if (charBytes.length() <= 4) {
+		const unsigned int key = KeyFromString(charBytes);
+		MapRepresentation::iterator it = mapReprs.find(key);
+		if (it == mapReprs.end()) {
+			// Not present so fail
+			return;
+		}
+		it->second.appearance = it->second.appearance | RepresentationAppearance::Colour;
+		it->second.colour = colour;
+	}
+}
+
+void SpecialRepresentations::ClearRepresentation(std::string_view charBytes) {
+	if (charBytes.length() <= 4) {
+		MapRepresentation::iterator it = mapReprs.find(KeyFromString(charBytes));
+		if (it != mapReprs.end()) {
+			mapReprs.erase(it);
+			const unsigned char ucStart = charBytes.empty() ? 0 : charBytes[0];
+			startByteHasReprs[ucStart]--;
+		}
+	}
+}
+
+const Representation *SpecialRepresentations::RepresentationFromCharacter(std::string_view charBytes) const {
+	if (charBytes.length() <= 4) {
+		const unsigned char ucStart = charBytes.empty() ? 0 : charBytes[0];
+		if (!startByteHasReprs[ucStart])
+			return nullptr;
+		MapRepresentation::const_iterator it = mapReprs.find(KeyFromString(charBytes));
+		if (it != mapReprs.end()) {
+			return &(it->second);
+		}
+	}
+	return nullptr;
+}
+
+bool SpecialRepresentations::Contains(std::string_view charBytes) const {
+	PLATFORM_ASSERT(charBytes.length() <= 4);
+	const unsigned char ucStart = charBytes.empty() ? 0 : charBytes[0];
+	if (!startByteHasReprs[ucStart])
+		return false;
+	MapRepresentation::const_iterator it = mapReprs.find(KeyFromString(charBytes));
+	return it != mapReprs.end();
+}
+
+void SpecialRepresentations::Clear() {
+	mapReprs.clear();
+	constexpr short none = 0;
+	std::fill(startByteHasReprs, std::end(startByteHasReprs), none);
+}
+
+void BreakFinder::Insert(Sci::Position val) {
+	const int posInLine = static_cast<int>(val);
+	if (posInLine > nextBreak) {
+		const std::vector<int>::iterator it = std::lower_bound(selAndEdge.begin(), selAndEdge.end(), posInLine);
+		if (it == selAndEdge.end()) {
+			selAndEdge.push_back(posInLine);
+		} else if (*it != posInLine) {
+			selAndEdge.insert(it, 1, posInLine);
+		}
+	}
+}
+
+BreakFinder::BreakFinder(const LineLayout *ll_, const Selection *psel, Range lineRange_, Sci::Position posLineStart_,
+	XYPOSITION xStart, bool breakForSelection, const Document *pdoc_, const SpecialRepresentations *preprs_, const ViewStyle *pvsDraw) :
+	ll(ll_),
+	lineRange(lineRange_),
+	posLineStart(posLineStart_),
+	nextBreak(static_cast<int>(lineRange_.start)),
+	saeCurrentPos(0),
+	saeNext(0),
+	subBreak(-1),
+	pdoc(pdoc_),
+	encodingFamily(pdoc_->CodePageFamily()),
+	preprs(preprs_) {
+
+	// Search for first visible break
+	// First find the first visible character
+	if (xStart > 0.0f)
+		nextBreak = ll->FindBefore(xStart, lineRange);
+	// Now back to a style break
+	while ((nextBreak > lineRange.start) && (ll->styles[nextBreak] == ll->styles[nextBreak - 1])) {
+		nextBreak--;
+	}
+
+	if (breakForSelection) {
+		const SelectionPosition posStart(posLineStart);
+		const SelectionPosition posEnd(posLineStart + lineRange.end);
+		const SelectionSegment segmentLine(posStart, posEnd);
+		for (size_t r=0; r<psel->Count(); r++) {
+			const SelectionSegment portion = psel->Range(r).Intersect(segmentLine);
+			if (!(portion.start == portion.end)) {
+				if (portion.start.IsValid())
+					Insert(portion.start.Position() - posLineStart);
+				if (portion.end.IsValid())
+					Insert(portion.end.Position() - posLineStart);
+			}
+		}
+	}
+	if (pvsDraw && pvsDraw->indicatorsSetFore) {
+		for (const IDecoration *deco : pdoc->decorations->View()) {
+			if (pvsDraw->indicators[deco->Indicator()].OverridesTextFore()) {
+				Sci::Position startPos = deco->EndRun(posLineStart);
+				while (startPos < (posLineStart + lineRange.end)) {
+					Insert(startPos - posLineStart);
+					startPos = deco->EndRun(startPos);
+				}
+			}
+		}
+	}
+	Insert(ll->edgeColumn);
+	Insert(lineRange.end);
+	saeNext = (!selAndEdge.empty()) ? selAndEdge[0] : -1;
+}
+
+BreakFinder::~BreakFinder() {
+}
+
+TextSegment BreakFinder::Next() {
+	if (subBreak == -1) {
+		const int prev = nextBreak;
+		while (nextBreak < lineRange.end) {
+			int charWidth = 1;
+			if (encodingFamily == EncodingFamily::unicode)
+				charWidth = UTF8DrawBytes(reinterpret_cast<unsigned char *>(&ll->chars[nextBreak]),
+					static_cast<int>(lineRange.end - nextBreak));
+			else if (encodingFamily == EncodingFamily::dbcs)
+				charWidth = pdoc->DBCSDrawBytes(
+					std::string_view(&ll->chars[nextBreak], lineRange.end - nextBreak));
+			// Special case \r\n line ends if there is a representation
+			if (preprs->Contains("\r\n") && ll->chars[nextBreak] == '\r' && ll->chars[nextBreak + 1] == '\n')
+				charWidth = 2;
+			const Representation *repr = preprs->RepresentationFromCharacter(std::string_view(&ll->chars[nextBreak], charWidth));
+			if (((nextBreak > 0) && (ll->styles[nextBreak] != ll->styles[nextBreak - 1])) ||
+					repr ||
+					(nextBreak == saeNext)) {
+				while ((nextBreak >= saeNext) && (saeNext < lineRange.end)) {
+					saeCurrentPos++;
+					saeNext = static_cast<int>((saeCurrentPos < selAndEdge.size()) ? selAndEdge[saeCurrentPos] : lineRange.end);
+				}
+				if ((nextBreak > prev) || repr) {
+					// Have a segment to report
+					if (nextBreak == prev) {
+						nextBreak += charWidth;
+					} else {
+						repr = nullptr;	// Optimize -> should remember repr
+					}
+					if ((nextBreak - prev) < lengthStartSubdivision) {
+						return TextSegment(prev, nextBreak - prev, repr);
+					} else {
+						break;
+					}
+				}
+			}
+			nextBreak += charWidth;
+		}
+		if ((nextBreak - prev) < lengthStartSubdivision) {
+			return TextSegment(prev, nextBreak - prev);
+		}
+		subBreak = prev;
+	}
+	// Splitting up a long run from prev to nextBreak in lots of approximately lengthEachSubdivision.
+	// For very long runs add extra breaks after spaces or if no spaces before low punctuation.
+	const int startSegment = subBreak;
+	if ((nextBreak - subBreak) <= lengthEachSubdivision) {
+		subBreak = -1;
+		return TextSegment(startSegment, nextBreak - startSegment);
+	} else {
+		subBreak += pdoc->SafeSegment(&ll->chars[subBreak], nextBreak-subBreak, lengthEachSubdivision);
+		if (subBreak >= nextBreak) {
+			subBreak = -1;
+			return TextSegment(startSegment, nextBreak - startSegment);
+		} else {
+			return TextSegment(startSegment, subBreak - startSegment);
+		}
+	}
+}
+
+bool BreakFinder::More() const noexcept {
+	return (subBreak >= 0) || (nextBreak < lineRange.end);
+}
+
+PositionCacheEntry::PositionCacheEntry() noexcept :
+	styleNumber(0), len(0), clock(0) {
+}
+
+// Copy constructor not currently used, but needed for being element in std::vector.
+PositionCacheEntry::PositionCacheEntry(const PositionCacheEntry &other) :
+	styleNumber(other.styleNumber), len(other.len), clock(other.clock) {
+	if (other.positions) {
+		const size_t lenData = len + (len / sizeof(XYPOSITION)) + 1;
+		positions = std::make_unique<XYPOSITION[]>(lenData);
+		memcpy(positions.get(), other.positions.get(), lenData * sizeof(XYPOSITION));
+	}
+}
+
+void PositionCacheEntry::Set(unsigned int styleNumber_, std::string_view sv,
+	const XYPOSITION *positions_, unsigned int clock_) {
+	Clear();
+	styleNumber = styleNumber_;
+	len = static_cast<unsigned int>(sv.length());
+	clock = clock_;
+	if (sv.data() && positions_) {
+		positions = std::make_unique<XYPOSITION[]>(len + (len / sizeof(XYPOSITION)) + 1);
+		for (unsigned int i=0; i<len; i++) {
+			positions[i] = positions_[i];
+		}
+		memcpy(&positions[len], sv.data(), sv.length());
+	}
+}
+
+PositionCacheEntry::~PositionCacheEntry() {
+	Clear();
+}
+
+void PositionCacheEntry::Clear() noexcept {
+	positions.reset();
+	styleNumber = 0;
+	len = 0;
+	clock = 0;
+}
+
+bool PositionCacheEntry::Retrieve(unsigned int styleNumber_, std::string_view sv, XYPOSITION *positions_) const noexcept {
+	if ((styleNumber == styleNumber_) && (len == sv.length()) &&
+		(memcmp(&positions[len], sv.data(), sv.length())== 0)) {
+		for (unsigned int i=0; i<len; i++) {
+			positions_[i] = positions[i];
+		}
+		return true;
+	} else {
+		return false;
+	}
+}
+
+size_t PositionCacheEntry::Hash(unsigned int styleNumber_, std::string_view sv) noexcept {
+	const size_t h1 = std::hash<std::string_view>{}(sv);
+	const size_t h2 = std::hash<unsigned int>{}(styleNumber_);
+	return h1 ^ (h2 << 1);
+}
+
+bool PositionCacheEntry::NewerThan(const PositionCacheEntry &other) const noexcept {
+	return clock > other.clock;
+}
+
+void PositionCacheEntry::ResetClock() noexcept {
+	if (clock > 0) {
+		clock = 1;
+	}
+}
+
+PositionCache::PositionCache() {
+	clock = 1;
+	pces.resize(0x400);
+	allClear = true;
+}
+
+void PositionCache::Clear() noexcept {
+	if (!allClear) {
+		for (PositionCacheEntry &pce : pces) {
+			pce.Clear();
+		}
+	}
+	clock = 1;
+	allClear = true;
+}
+
+void PositionCache::SetSize(size_t size_) {
+	Clear();
+	pces.resize(size_);
+}
+
+size_t PositionCache::GetSize() const noexcept {
+	return pces.size();
+}
+
+void PositionCache::MeasureWidths(Surface *surface, const ViewStyle &vstyle, unsigned int styleNumber,
+	std::string_view sv, XYPOSITION *positions) {
+	allClear = false;
+	size_t probe = pces.size();	// Out of bounds
+	if ((!pces.empty()) && (sv.length() < 30)) {
+		// Only store short strings in the cache so it doesn't churn with
+		// long comments with only a single comment.
+
+		// Two way associative: try two probe positions.
+		const size_t hashValue = PositionCacheEntry::Hash(styleNumber, sv);
+		probe = hashValue % pces.size();
+		if (pces[probe].Retrieve(styleNumber, sv, positions)) {
+			return;
+		}
+		const size_t probe2 = (hashValue * 37) % pces.size();
+		if (pces[probe2].Retrieve(styleNumber, sv, positions)) {
+			return;
+		}
+		// Not found. Choose the oldest of the two slots to replace
+		if (pces[probe].NewerThan(pces[probe2])) {
+			probe = probe2;
+		}
+	}
+	const Font *fontStyle = vstyle.styles[styleNumber].font.get();
+	surface->MeasureWidths(fontStyle, sv, positions);
+	if (probe < pces.size()) {
+		// Store into cache
+		clock++;
+		if (clock > 60000) {
+			// Since there are only 16 bits for the clock, wrap it round and
+			// reset all cache entries so none get stuck with a high clock.
+			for (PositionCacheEntry &pce : pces) {
+				pce.ResetClock();
+			}
+			clock = 2;
+		}
+		pces[probe].Set(styleNumber, sv, positions, clock);
+	}
+}
diff --git a/scite-app/scintilla/src/PositionCache.h b/scite-app/scintilla/src/PositionCache.h
new file mode 100644
index 0000000..b628b04
--- /dev/null
+++ b/scite-app/scintilla/src/PositionCache.h
@@ -0,0 +1,284 @@
+// Scintilla source code edit control
+/** @file PositionCache.h
+ ** Classes for caching layout information.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef POSITIONCACHE_H
+#define POSITIONCACHE_H
+
+namespace Scintilla::Internal {
+
+inline constexpr bool IsEOLChar(int ch) noexcept {
+	return (ch == '\r') || (ch == '\n');
+}
+
+inline constexpr bool IsSpaceOrTab(int ch) noexcept {
+	return ch == ' ' || ch == '\t';
+}
+
+/**
+* A point in document space.
+* Uses double for sufficient resolution in large (>20,000,000 line) documents.
+*/
+class PointDocument {
+public:
+	double x;
+	double y;
+
+	explicit PointDocument(double x_ = 0, double y_ = 0) noexcept : x(x_), y(y_) {
+	}
+
+	// Conversion from Point.
+	explicit PointDocument(Point pt) noexcept : x(pt.x), y(pt.y) {
+	}
+};
+
+// There are two points for some positions and this enumeration
+// can choose between the end of the first line or subline
+// and the start of the next line or subline.
+enum class PointEnd {
+	start = 0x0,
+	lineEnd = 0x1,
+	subLineEnd = 0x2,
+	endEither = lineEnd | subLineEnd,
+};
+
+class BidiData {
+public:
+	std::vector<std::shared_ptr<Font>> stylesFonts;
+	std::vector<XYPOSITION> widthReprs;
+	void Resize(size_t maxLineLength_);
+};
+
+/**
+ */
+class LineLayout {
+private:
+	friend class LineLayoutCache;
+	std::unique_ptr<int []>lineStarts;
+	int lenLineStarts;
+	/// Drawing is only performed for @a maxLineLength characters on each line.
+	Sci::Line lineNumber;
+public:
+	enum { wrapWidthInfinite = 0x7ffffff };
+
+	int maxLineLength;
+	int numCharsInLine;
+	int numCharsBeforeEOL;
+	enum class ValidLevel { invalid, checkTextAndStyle, positions, lines } validity;
+	int xHighlightGuide;
+	bool highlightColumn;
+	bool containsCaret;
+	int edgeColumn;
+	std::unique_ptr<char[]> chars;
+	std::unique_ptr<unsigned char[]> styles;
+	std::unique_ptr<XYPOSITION[]> positions;
+	char bracePreviousStyles[2];
+
+	std::unique_ptr<BidiData> bidiData;
+
+	// Hotspot support
+	Range hotspot;
+
+	// Wrapped line support
+	int widthLine;
+	int lines;
+	XYPOSITION wrapIndent; // In pixels
+
+	LineLayout(Sci::Line lineNumber_, int maxLineLength_);
+	// Deleted so LineLayout objects can not be copied.
+	LineLayout(const LineLayout &) = delete;
+	LineLayout(LineLayout &&) = delete;
+	void operator=(const LineLayout &) = delete;
+	void operator=(LineLayout &&) = delete;
+	virtual ~LineLayout();
+	void Resize(int maxLineLength_);
+	void EnsureBidiData();
+	void Free() noexcept;
+	void Invalidate(ValidLevel validity_) noexcept;
+	Sci::Line LineNumber() const noexcept;
+	bool CanHold(Sci::Line lineDoc, int lineLength_) const noexcept;
+	int LineStart(int line) const noexcept;
+	int LineLength(int line) const noexcept;
+	enum class Scope { visibleOnly, includeEnd };
+	int LineLastVisible(int line, Scope scope) const noexcept;
+	Range SubLineRange(int subLine, Scope scope) const noexcept;
+	bool InLine(int offset, int line) const noexcept;
+	int SubLineFromPosition(int posInLine, PointEnd pe) const noexcept;
+	void SetLineStart(int line, int start);
+	void SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
+		char bracesMatchStyle, int xHighlight, bool ignoreStyle);
+	void RestoreBracesHighlight(Range rangeLine, const Sci::Position braces[], bool ignoreStyle);
+	int FindBefore(XYPOSITION x, Range range) const noexcept;
+	int FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const noexcept;
+	Point PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const noexcept;
+	int EndLineStyle() const noexcept;
+};
+
+struct ScreenLine : public IScreenLine {
+	const LineLayout *ll;
+	size_t start;
+	size_t len;
+	XYPOSITION width;
+	XYPOSITION height;
+	int ctrlCharPadding;
+	XYPOSITION tabWidth;
+	int tabWidthMinimumPixels;
+
+	ScreenLine(const LineLayout *ll_, int subLine, const ViewStyle &vs, XYPOSITION width_, int tabWidthMinimumPixels_);
+	// Deleted so ScreenLine objects can not be copied.
+	ScreenLine(const ScreenLine &) = delete;
+	ScreenLine(ScreenLine &&) = delete;
+	void operator=(const ScreenLine &) = delete;
+	void operator=(ScreenLine &&) = delete;
+	virtual ~ScreenLine();
+
+	std::string_view Text() const override;
+	size_t Length() const override;
+	size_t RepresentationCount() const override;
+	XYPOSITION Width() const override;
+	XYPOSITION Height() const override;
+	XYPOSITION TabWidth() const override;
+	XYPOSITION TabWidthMinimumPixels() const override;
+	const Font *FontOfPosition(size_t position) const override;
+	XYPOSITION RepresentationWidth(size_t position) const override;
+	XYPOSITION TabPositionAfter(XYPOSITION xPosition) const override;
+};
+
+/**
+ */
+class LineLayoutCache {
+public:
+private:
+	Scintilla::LineCache level;
+	std::vector<std::shared_ptr<LineLayout>>cache;
+	bool allInvalidated;
+	int styleClock;
+	size_t EntryForLine(Sci::Line line) const noexcept;
+	void AllocateForLevel(Sci::Line linesOnScreen, Sci::Line linesInDoc);
+public:
+	LineLayoutCache();
+	// Deleted so LineLayoutCache objects can not be copied.
+	LineLayoutCache(const LineLayoutCache &) = delete;
+	LineLayoutCache(LineLayoutCache &&) = delete;
+	void operator=(const LineLayoutCache &) = delete;
+	void operator=(LineLayoutCache &&) = delete;
+	virtual ~LineLayoutCache();
+	void Deallocate() noexcept;
+	void Invalidate(LineLayout::ValidLevel validity_) noexcept;
+	void SetLevel(Scintilla::LineCache level_) noexcept;
+	Scintilla::LineCache GetLevel() const noexcept { return level; }
+	std::shared_ptr<LineLayout> Retrieve(Sci::Line lineNumber, Sci::Line lineCaret, int maxChars, int styleClock_,
+		Sci::Line linesOnScreen, Sci::Line linesInDoc);
+};
+
+class PositionCacheEntry {
+	unsigned int styleNumber:8;
+	unsigned int len:8;
+	unsigned int clock:16;
+	std::unique_ptr<XYPOSITION []> positions;
+public:
+	PositionCacheEntry() noexcept;
+	// Copy constructor not currently used, but needed for being element in std::vector.
+	PositionCacheEntry(const PositionCacheEntry &);
+	PositionCacheEntry(PositionCacheEntry &&) noexcept = default;
+	// Deleted so PositionCacheEntry objects can not be assigned.
+	void operator=(const PositionCacheEntry &) = delete;
+	void operator=(PositionCacheEntry &&) = delete;
+	~PositionCacheEntry();
+	void Set(unsigned int styleNumber_, std::string_view sv, const XYPOSITION *positions_, unsigned int clock_);
+	void Clear() noexcept;
+	bool Retrieve(unsigned int styleNumber_, std::string_view sv, XYPOSITION *positions_) const noexcept;
+	static size_t Hash(unsigned int styleNumber_, std::string_view sv) noexcept;
+	bool NewerThan(const PositionCacheEntry &other) const noexcept;
+	void ResetClock() noexcept;
+};
+
+class Representation {
+public:
+	static constexpr size_t maxLength = 200;
+	std::string stringRep;
+	RepresentationAppearance appearance;
+	ColourRGBA colour;
+	explicit Representation(std::string_view value="", RepresentationAppearance appearance_= RepresentationAppearance::Blob) :
+		stringRep(value), appearance(appearance_) {
+	}
+};
+
+typedef std::map<unsigned int, Representation> MapRepresentation;
+
+class SpecialRepresentations {
+	MapRepresentation mapReprs;
+	short startByteHasReprs[0x100] {};
+public:
+	void SetRepresentation(std::string_view charBytes, std::string_view value);
+	void SetRepresentationAppearance(std::string_view charBytes, RepresentationAppearance appearance);
+	void SetRepresentationColour(std::string_view charBytes, ColourRGBA colour);
+	void ClearRepresentation(std::string_view charBytes);
+	const Representation *RepresentationFromCharacter(std::string_view charBytes) const;
+	bool Contains(std::string_view charBytes) const;
+	void Clear();
+};
+
+struct TextSegment {
+	int start;
+	int length;
+	const Representation *representation;
+	TextSegment(int start_=0, int length_=0, const Representation *representation_=nullptr) noexcept :
+		start(start_), length(length_), representation(representation_) {
+	}
+	int end() const noexcept {
+		return start + length;
+	}
+};
+
+// Class to break a line of text into shorter runs at sensible places.
+class BreakFinder {
+	const LineLayout *ll;
+	Range lineRange;
+	Sci::Position posLineStart;
+	int nextBreak;
+	std::vector<int> selAndEdge;
+	unsigned int saeCurrentPos;
+	int saeNext;
+	int subBreak;
+	const Document *pdoc;
+	EncodingFamily encodingFamily;
+	const SpecialRepresentations *preprs;
+	void Insert(Sci::Position val);
+public:
+	// If a whole run is longer than lengthStartSubdivision then subdivide
+	// into smaller runs at spaces or punctuation.
+	enum { lengthStartSubdivision = 300 };
+	// Try to make each subdivided run lengthEachSubdivision or shorter.
+	enum { lengthEachSubdivision = 100 };
+	BreakFinder(const LineLayout *ll_, const Selection *psel, Range lineRange_, Sci::Position posLineStart_,
+		XYPOSITION xStart, bool breakForSelection, const Document *pdoc_, const SpecialRepresentations *preprs_, const ViewStyle *pvsDraw);
+	// Deleted so BreakFinder objects can not be copied.
+	BreakFinder(const BreakFinder &) = delete;
+	BreakFinder(BreakFinder &&) = delete;
+	void operator=(const BreakFinder &) = delete;
+	void operator=(BreakFinder &&) = delete;
+	~BreakFinder();
+	TextSegment Next();
+	bool More() const noexcept;
+};
+
+class PositionCache {
+	std::vector<PositionCacheEntry> pces;
+	unsigned int clock;
+	bool allClear;
+public:
+	PositionCache();
+	void Clear() noexcept;
+	void SetSize(size_t size_);
+	size_t GetSize() const noexcept;
+	void MeasureWidths(Surface *surface, const ViewStyle &vstyle, unsigned int styleNumber,
+		std::string_view sv, XYPOSITION *positions);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/RESearch.cxx b/scite-app/scintilla/src/RESearch.cxx
new file mode 100644
index 0000000..6d30e4c
--- /dev/null
+++ b/scite-app/scintilla/src/RESearch.cxx
@@ -0,0 +1,961 @@
+// Scintilla source code edit control
+/** @file RESearch.cxx
+ ** Regular expression search library.
+ **/
+
+/*
+ * regex - Regular expression pattern matching and replacement
+ *
+ * By:  Ozan S. Yigit (oz)
+ *      Dept. of Computer Science
+ *      York University
+ *
+ * Original code available from http://www.cs.yorku.ca/~oz/
+ * Translation to C++ by Neil Hodgson neilh@scintilla.org
+ * Removed all use of register.
+ * Converted to modern function prototypes.
+ * Put all global/static variables into an object so this code can be
+ * used from multiple threads, etc.
+ * Some extensions by Philippe Lhoste PhiLho(a)GMX.net
+ * '?' extensions by Michael Mullin masmullin@gmail.com
+ *
+ * These routines are the PUBLIC DOMAIN equivalents of regex
+ * routines as found in 4.nBSD UN*X, with minor extensions.
+ *
+ * These routines are derived from various implementations found
+ * in software tools books, and Conroy's grep. They are NOT derived
+ * from licensed/restricted software.
+ * For more interesting/academic/complicated implementations,
+ * see Henry Spencer's regexp routines, or GNU Emacs pattern
+ * matching module.
+ *
+ * Modification history removed.
+ *
+ * Interfaces:
+ *  RESearch::Compile:      compile a regular expression into a NFA.
+ *
+ *          const char *RESearch::Compile(const char *pattern, int length,
+ *                                        bool caseSensitive, bool posix)
+ *
+ * Returns a short error string if they fail.
+ *
+ *  RESearch::Execute:      execute the NFA to match a pattern.
+ *
+ *          int RESearch::Execute(characterIndexer &ci, int lp, int endp)
+ *
+ *  re_fail:                failure routine for RESearch::Execute. (no longer used)
+ *
+ *          void re_fail(char *msg, char op)
+ *
+ * Regular Expressions:
+ *
+ *      [1]     char    matches itself, unless it is a special
+ *                      character (metachar): . \ [ ] * + ? ^ $
+ *                      and ( ) if posix option.
+ *
+ *      [2]     .       matches any character.
+ *
+ *      [3]     \       matches the character following it, except:
+ *                      - \a, \b, \f, \n, \r, \t, \v match the corresponding C
+ *                      escape char, respectively BEL, BS, FF, LF, CR, TAB and VT;
+ *                      Note that \r and \n are never matched because Scintilla
+ *                      regex searches are made line per line
+ *                      (stripped of end-of-line chars).
+ *                      - if not in posix mode, when followed by a
+ *                      left or right round bracket (see [8]);
+ *                      - when followed by a digit 1 to 9 (see [9]);
+ *                      - when followed by a left or right angle bracket
+ *                      (see [10]);
+ *                      - when followed by d, D, s, S, w or W (see [11]);
+ *                      - when followed by x and two hexa digits (see [12].
+ *                      Backslash is used as an escape character for all
+ *                      other meta-characters, and itself.
+ *
+ *      [4]     [set]   matches one of the characters in the set.
+ *                      If the first character in the set is "^",
+ *                      it matches the characters NOT in the set, i.e.
+ *                      complements the set. A shorthand S-E (start dash end)
+ *                      is used to specify a set of characters S up to
+ *                      E, inclusive. S and E must be characters, otherwise
+ *                      the dash is taken literally (eg. in expression [\d-a]).
+ *                      The special characters "]" and "-" have no special
+ *                      meaning if they appear as the first chars in the set.
+ *                      To include both, put - first: [-]A-Z]
+ *                      (or just backslash them).
+ *                      examples:        match:
+ *
+ *                              [-]|]    matches these 3 chars,
+ *
+ *                              []-|]    matches from ] to | chars
+ *
+ *                              [a-z]    any lowercase alpha
+ *
+ *                              [^-]]    any char except - and ]
+ *
+ *                              [^A-Z]   any char except uppercase
+ *                                       alpha
+ *
+ *                              [a-zA-Z] any alpha
+ *
+ *      [5]     *       any regular expression form [1] to [4]
+ *                      (except [8], [9] and [10] forms of [3]),
+ *                      followed by closure char (*)
+ *                      matches zero or more matches of that form.
+ *
+ *      [6]     +       same as [5], except it matches one or more.
+ *
+ *      [5-6]           Both [5] and [6] are greedy (they match as much as possible).
+ *                      Unless they are followed by the 'lazy' quantifier (?)
+ *                      In which case both [5] and [6] try to match as little as possible
+ *
+ *      [7]     ?       same as [5] except it matches zero or one.
+ *
+ *      [8]             a regular expression in the form [1] to [13], enclosed
+ *                      as \(form\) (or (form) with posix flag) matches what
+ *                      form matches. The enclosure creates a set of tags,
+ *                      used for [9] and for pattern substitution.
+ *                      The tagged forms are numbered starting from 1.
+ *
+ *      [9]             a \ followed by a digit 1 to 9 matches whatever a
+ *                      previously tagged regular expression ([8]) matched.
+ *
+ *      [10]    \<      a regular expression starting with a \< construct
+ *              \>      and/or ending with a \> construct, restricts the
+ *                      pattern matching to the beginning of a word, and/or
+ *                      the end of a word. A word is defined to be a character
+ *                      string beginning and/or ending with the characters
+ *                      A-Z a-z 0-9 and _. Scintilla extends this definition
+ *                      by user setting. The word must also be preceded and/or
+ *                      followed by any character outside those mentioned.
+ *
+ *      [11]    \l      a backslash followed by d, D, s, S, w or W,
+ *                      becomes a character class (both inside and
+ *                      outside sets []).
+ *                        d: decimal digits
+ *                        D: any char except decimal digits
+ *                        s: whitespace (space, \t \n \r \f \v)
+ *                        S: any char except whitespace (see above)
+ *                        w: alphanumeric & underscore (changed by user setting)
+ *                        W: any char except alphanumeric & underscore (see above)
+ *
+ *      [12]    \xHH    a backslash followed by x and two hexa digits,
+ *                      becomes the character whose ASCII code is equal
+ *                      to these digits. If not followed by two digits,
+ *                      it is 'x' char itself.
+ *
+ *      [13]            a composite regular expression xy where x and y
+ *                      are in the form [1] to [12] matches the longest
+ *                      match of x followed by a match for y.
+ *
+ *      [14]    ^       a regular expression starting with a ^ character
+ *              $       and/or ending with a $ character, restricts the
+ *                      pattern matching to the beginning of the line,
+ *                      or the end of line. [anchors] Elsewhere in the
+ *                      pattern, ^ and $ are treated as ordinary characters.
+ *
+ *
+ * Acknowledgements:
+ *
+ *  HCR's Hugh Redelmeier has been most helpful in various
+ *  stages of development. He convinced me to include BOW
+ *  and EOW constructs, originally invented by Rob Pike at
+ *  the University of Toronto.
+ *
+ * References:
+ *              Software tools                  Kernighan & Plauger
+ *              Software tools in Pascal        Kernighan & Plauger
+ *              Grep [rsx-11 C dist]            David Conroy
+ *              ed - text editor                Un*x Programmer's Manual
+ *              Advanced editing on Un*x        B. W. Kernighan
+ *              RegExp routines                 Henry Spencer
+ *
+ * Notes:
+ *
+ *  This implementation uses a bit-set representation for character
+ *  classes for speed and compactness. Each character is represented
+ *  by one bit in a 256-bit block. Thus, CCL always takes a
+ *	constant 32 bytes in the internal nfa, and RESearch::Execute does a single
+ *  bit comparison to locate the character in the set.
+ *
+ * Examples:
+ *
+ *  pattern:    foo*.*
+ *  compile:    CHR f CHR o CLO CHR o END CLO ANY END END
+ *  matches:    fo foo fooo foobar fobar foxx ...
+ *
+ *  pattern:    fo[ob]a[rz]
+ *  compile:    CHR f CHR o CCL bitset CHR a CCL bitset END
+ *  matches:    fobar fooar fobaz fooaz
+ *
+ *  pattern:    foo\\+
+ *  compile:    CHR f CHR o CHR o CHR \ CLO CHR \ END END
+ *  matches:    foo\ foo\\ foo\\\  ...
+ *
+ *  pattern:    \(foo\)[1-3]\1  (same as foo[1-3]foo)
+ *  compile:    BOT 1 CHR f CHR o CHR o EOT 1 CCL bitset REF 1 END
+ *  matches:    foo1foo foo2foo foo3foo
+ *
+ *  pattern:    \(fo.*\)-\1
+ *  compile:    BOT 1 CHR f CHR o CLO ANY END EOT 1 CHR - REF 1 END
+ *  matches:    foo-foo fo-fo fob-fob foobar-foobar ...
+ */
+
+#include <cstddef>
+#include <cstdlib>
+
+#include <stdexcept>
+#include <string>
+#include <algorithm>
+#include <iterator>
+
+#include "Position.h"
+#include "CharClassify.h"
+#include "RESearch.h"
+
+using namespace Scintilla::Internal;
+
+#define OKP     1
+#define NOP     0
+
+#define CHR     1
+#define ANY     2
+#define CCL     3
+#define BOL     4
+#define EOL     5
+#define BOT     6
+#define EOT     7
+#define BOW     8
+#define EOW     9
+#define REF     10
+#define CLO     11
+#define CLQ     12 /* 0 to 1 closure */
+#define LCLO    13 /* lazy closure */
+
+#define END     0
+
+/*
+ * The following defines are not meant to be changeable.
+ * They are for readability only.
+ */
+#define BITIND  07
+
+#define badpat(x)	(*nfa = END, x)
+
+/*
+ * Character classification table for word boundary operators BOW
+ * and EOW is passed in by the creator of this object (Scintilla
+ * Document). The Document default state is that word chars are:
+ * 0-9, a-z, A-Z and _
+ */
+
+RESearch::RESearch(CharClassify *charClassTable) {
+	failure = 0;
+	charClass = charClassTable;
+	sta = NOP;                  /* status of lastpat */
+	bol = 0;
+	constexpr unsigned char nul = 0;
+	std::fill(bittab, std::end(bittab), nul);
+	std::fill(tagstk, std::end(tagstk), 0);
+	std::fill(nfa, std::end(nfa), '\0');
+	Clear();
+}
+
+RESearch::~RESearch() {
+	Clear();
+}
+
+void RESearch::Clear() noexcept {
+	for (int i = 0; i < MAXTAG; i++) {
+		pat[i].clear();
+		bopat[i] = NOTFOUND;
+		eopat[i] = NOTFOUND;
+	}
+}
+
+void RESearch::GrabMatches(const CharacterIndexer &ci) {
+	for (unsigned int i = 0; i < MAXTAG; i++) {
+		if ((bopat[i] != NOTFOUND) && (eopat[i] != NOTFOUND)) {
+			const Sci::Position len = eopat[i] - bopat[i];
+			pat[i].resize(len);
+			for (Sci::Position j = 0; j < len; j++)
+				pat[i][j] = ci.CharAt(bopat[i] + j);
+		}
+	}
+}
+
+void RESearch::ChSet(unsigned char c) noexcept {
+	bittab[c >> 3] |= 1 << (c & BITIND);
+}
+
+void RESearch::ChSetWithCase(unsigned char c, bool caseSensitive) noexcept {
+	ChSet(c);
+	if (!caseSensitive) {
+		if ((c >= 'a') && (c <= 'z')) {
+			ChSet(c - 'a' + 'A');
+		} else if ((c >= 'A') && (c <= 'Z')) {
+			ChSet(c - 'A' + 'a');
+		}
+	}
+}
+
+namespace {
+
+constexpr unsigned char escapeValue(unsigned char ch) noexcept {
+	switch (ch) {
+	case 'a':	return '\a';
+	case 'b':	return '\b';
+	case 'f':	return '\f';
+	case 'n':	return '\n';
+	case 'r':	return '\r';
+	case 't':	return '\t';
+	case 'v':	return '\v';
+	}
+	return 0;
+}
+
+constexpr int GetHexaChar(unsigned char hd1, unsigned char hd2) noexcept {
+	int hexValue = 0;
+	if (hd1 >= '0' && hd1 <= '9') {
+		hexValue += 16 * (hd1 - '0');
+	} else if (hd1 >= 'A' && hd1 <= 'F') {
+		hexValue += 16 * (hd1 - 'A' + 10);
+	} else if (hd1 >= 'a' && hd1 <= 'f') {
+		hexValue += 16 * (hd1 - 'a' + 10);
+	} else {
+		return -1;
+	}
+	if (hd2 >= '0' && hd2 <= '9') {
+		hexValue += hd2 - '0';
+	} else if (hd2 >= 'A' && hd2 <= 'F') {
+		hexValue += hd2 - 'A' + 10;
+	} else if (hd2 >= 'a' && hd2 <= 'f') {
+		hexValue += hd2 - 'a' + 10;
+	} else {
+		return -1;
+	}
+	return hexValue;
+}
+
+constexpr int isinset(const char *ap, unsigned char c) noexcept {
+	return ap[c >> 3] & (1 << (c & BITIND));
+}
+
+}
+
+/**
+ * Called when the parser finds a backslash not followed
+ * by a valid expression (like \( in non-Posix mode).
+ * @param pattern : pointer on the char after the backslash.
+ * @param incr : (out) number of chars to skip after expression evaluation.
+ * @return the char if it resolves to a simple char,
+ * or -1 for a char class. In this case, bittab is changed.
+ */
+int RESearch::GetBackslashExpression(
+    const char *pattern,
+    int &incr) noexcept {
+	// Since error reporting is primitive and messages are not used anyway,
+	// I choose to interpret unexpected syntax in a logical way instead
+	// of reporting errors. Otherwise, we can stick on, eg., PCRE behaviour.
+	incr = 0;	// Most of the time, will skip the char "naturally".
+	int c;
+	int result = -1;
+	const unsigned char bsc = *pattern;
+	if (!bsc) {
+		// Avoid overrun
+		result = '\\';	// \ at end of pattern, take it literally
+		return result;
+	}
+
+	switch (bsc) {
+	case 'a':
+	case 'b':
+	case 'n':
+	case 'f':
+	case 'r':
+	case 't':
+	case 'v':
+		result = escapeValue(bsc);
+		break;
+	case 'x': {
+			const unsigned char hd1 = *(pattern + 1);
+			const unsigned char hd2 = *(pattern + 2);
+			const int hexValue = GetHexaChar(hd1, hd2);
+			if (hexValue >= 0) {
+				result = hexValue;
+				incr = 2;	// Must skip the digits
+			} else {
+				result = 'x';	// \x without 2 digits: see it as 'x'
+			}
+		}
+		break;
+	case 'd':
+		for (c = '0'; c <= '9'; c++) {
+			ChSet(static_cast<unsigned char>(c));
+		}
+		break;
+	case 'D':
+		for (c = 0; c < MAXCHR; c++) {
+			if (c < '0' || c > '9') {
+				ChSet(static_cast<unsigned char>(c));
+			}
+		}
+		break;
+	case 's':
+		ChSet(' ');
+		ChSet('\t');
+		ChSet('\n');
+		ChSet('\r');
+		ChSet('\f');
+		ChSet('\v');
+		break;
+	case 'S':
+		for (c = 0; c < MAXCHR; c++) {
+			if (c != ' ' && !(c >= 0x09 && c <= 0x0D)) {
+				ChSet(static_cast<unsigned char>(c));
+			}
+		}
+		break;
+	case 'w':
+		for (c = 0; c < MAXCHR; c++) {
+			if (iswordc(static_cast<unsigned char>(c))) {
+				ChSet(static_cast<unsigned char>(c));
+			}
+		}
+		break;
+	case 'W':
+		for (c = 0; c < MAXCHR; c++) {
+			if (!iswordc(static_cast<unsigned char>(c))) {
+				ChSet(static_cast<unsigned char>(c));
+			}
+		}
+		break;
+	default:
+		result = bsc;
+	}
+	return result;
+}
+
+const char *RESearch::Compile(const char *pattern, Sci::Position length, bool caseSensitive, bool posix) noexcept {
+	char *mp=nfa;          /* nfa pointer       */
+	char *lp;              /* saved pointer     */
+	char *sp=nfa;          /* another one       */
+	char *mpMax = mp + MAXNFA - BITBLK - 10;
+
+	int tagi = 0;          /* tag stack index   */
+	int tagc = 1;          /* actual tag count  */
+
+	int n;
+	char mask;             /* xor mask -CCL/NCL */
+	int c1, c2, prevChar;
+
+	if (!pattern || !length) {
+		if (sta)
+			return nullptr;
+		else
+			return badpat("No previous regular expression");
+	}
+	sta = NOP;
+
+	const char *p=pattern;     /* pattern pointer   */
+	for (int i=0; i<length; i++, p++) {
+		if (mp > mpMax)
+			return badpat("Pattern too long");
+		lp = mp;
+		switch (*p) {
+
+		case '.':               /* match any char  */
+			*mp++ = ANY;
+			break;
+
+		case '^':               /* match beginning */
+			if (p == pattern) {
+				*mp++ = BOL;
+			} else {
+				*mp++ = CHR;
+				*mp++ = *p;
+			}
+			break;
+
+		case '$':               /* match endofline */
+			if (!*(p+1)) {
+				*mp++ = EOL;
+			} else {
+				*mp++ = CHR;
+				*mp++ = *p;
+			}
+			break;
+
+		case '[':               /* match char class */
+			*mp++ = CCL;
+			prevChar = 0;
+
+			i++;
+			if (*++p == '^') {
+				mask = '\377';
+				i++;
+				p++;
+			} else {
+				mask = 0;
+			}
+
+			if (*p == '-') {	/* real dash */
+				i++;
+				prevChar = *p;
+				ChSet(*p++);
+			}
+			if (*p == ']') {	/* real brace */
+				i++;
+				prevChar = *p;
+				ChSet(*p++);
+			}
+			while (*p && *p != ']') {
+				if (*p == '-') {
+					if (prevChar < 0) {
+						// Previous def. was a char class like \d, take dash literally
+						prevChar = *p;
+						ChSet(*p);
+					} else if (*(p+1)) {
+						if (*(p+1) != ']') {
+							c1 = prevChar + 1;
+							i++;
+							c2 = static_cast<unsigned char>(*++p);
+							if (c2 == '\\') {
+								if (!*(p+1)) {	// End of RE
+									return badpat("Missing ]");
+								} else {
+									i++;
+									p++;
+									int incr;
+									c2 = GetBackslashExpression(p, incr);
+									i += incr;
+									p += incr;
+									if (c2 >= 0) {
+										// Convention: \c (c is any char) is case sensitive, whatever the option
+										ChSet(static_cast<unsigned char>(c2));
+										prevChar = c2;
+									} else {
+										// bittab is already changed
+										prevChar = -1;
+									}
+								}
+							}
+							if (prevChar < 0) {
+								// Char after dash is char class like \d, take dash literally
+								prevChar = '-';
+								ChSet('-');
+							} else {
+								// Put all chars between c1 and c2 included in the char set
+								while (c1 <= c2) {
+									ChSetWithCase(static_cast<unsigned char>(c1++), caseSensitive);
+								}
+							}
+						} else {
+							// Dash before the ], take it literally
+							prevChar = *p;
+							ChSet(*p);
+						}
+					} else {
+						return badpat("Missing ]");
+					}
+				} else if (*p == '\\' && *(p+1)) {
+					i++;
+					p++;
+					int incr;
+					const int c = GetBackslashExpression(p, incr);
+					i += incr;
+					p += incr;
+					if (c >= 0) {
+						// Convention: \c (c is any char) is case sensitive, whatever the option
+						ChSet(static_cast<unsigned char>(c));
+						prevChar = c;
+					} else {
+						// bittab is already changed
+						prevChar = -1;
+					}
+				} else {
+					prevChar = static_cast<unsigned char>(*p);
+					ChSetWithCase(*p, caseSensitive);
+				}
+				i++;
+				p++;
+			}
+			if (!*p)
+				return badpat("Missing ]");
+
+			for (n = 0; n < BITBLK; bittab[n++] = 0)
+				*mp++ = static_cast<char>(mask ^ bittab[n]);
+
+			break;
+
+		case '*':               /* match 0 or more... */
+		case '+':               /* match 1 or more... */
+		case '?':
+			if (p == pattern)
+				return badpat("Empty closure");
+			lp = sp;		/* previous opcode */
+			if (*lp == CLO || *lp == LCLO)		/* equivalence... */
+				break;
+			switch (*lp) {
+
+			case BOL:
+			case BOT:
+			case EOT:
+			case BOW:
+			case EOW:
+			case REF:
+				return badpat("Illegal closure");
+			default:
+				break;
+			}
+
+			if (*p == '+')
+				for (sp = mp; lp < sp; lp++)
+					*mp++ = *lp;
+
+			*mp++ = END;
+			*mp++ = END;
+			sp = mp;
+
+			while (--mp > lp)
+				*mp = mp[-1];
+			if (*p == '?')          *mp = CLQ;
+			else if (*(p+1) == '?') *mp = LCLO;
+			else                    *mp = CLO;
+
+			mp = sp;
+			break;
+
+		case '\\':              /* tags, backrefs... */
+			i++;
+			switch (*++p) {
+			case '<':
+				*mp++ = BOW;
+				break;
+			case '>':
+				if (*sp == BOW)
+					return badpat("Null pattern inside \\<\\>");
+				*mp++ = EOW;
+				break;
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+				n = *p-'0';
+				if (tagi > 0 && tagstk[tagi] == n)
+					return badpat("Cyclical reference");
+				if (tagc > n) {
+					*mp++ = REF;
+					*mp++ = static_cast<char>(n);
+				} else {
+					return badpat("Undetermined reference");
+				}
+				break;
+			default:
+				if (!posix && *p == '(') {
+					if (tagc < MAXTAG) {
+						tagstk[++tagi] = tagc;
+						*mp++ = BOT;
+						*mp++ = static_cast<char>(tagc++);
+					} else {
+						return badpat("Too many \\(\\) pairs");
+					}
+				} else if (!posix && *p == ')') {
+					if (*sp == BOT)
+						return badpat("Null pattern inside \\(\\)");
+					if (tagi > 0) {
+						*mp++ = EOT;
+						*mp++ = static_cast<char>(tagstk[tagi--]);
+					} else {
+						return badpat("Unmatched \\)");
+					}
+				} else {
+					int incr;
+					int c = GetBackslashExpression(p, incr);
+					i += incr;
+					p += incr;
+					if (c >= 0) {
+						*mp++ = CHR;
+						*mp++ = static_cast<unsigned char>(c);
+					} else {
+						*mp++ = CCL;
+						mask = 0;
+						for (n = 0; n < BITBLK; bittab[n++] = 0)
+							*mp++ = static_cast<char>(mask ^ bittab[n]);
+					}
+				}
+			}
+			break;
+
+		default :               /* an ordinary char */
+			if (posix && *p == '(') {
+				if (tagc < MAXTAG) {
+					tagstk[++tagi] = tagc;
+					*mp++ = BOT;
+					*mp++ = static_cast<char>(tagc++);
+				} else {
+					return badpat("Too many () pairs");
+				}
+			} else if (posix && *p == ')') {
+				if (*sp == BOT)
+					return badpat("Null pattern inside ()");
+				if (tagi > 0) {
+					*mp++ = EOT;
+					*mp++ = static_cast<char>(tagstk[tagi--]);
+				} else {
+					return badpat("Unmatched )");
+				}
+			} else {
+				unsigned char c = *p;
+				if (!c)	// End of RE
+					c = '\\';	// We take it as raw backslash
+				if (caseSensitive || !iswordc(c)) {
+					*mp++ = CHR;
+					*mp++ = c;
+				} else {
+					*mp++ = CCL;
+					mask = 0;
+					ChSetWithCase(c, false);
+					for (n = 0; n < BITBLK; bittab[n++] = 0)
+						*mp++ = static_cast<char>(mask ^ bittab[n]);
+				}
+			}
+			break;
+		}
+		sp = lp;
+	}
+	if (tagi > 0)
+		return badpat((posix ? "Unmatched (" : "Unmatched \\("));
+	*mp = END;
+	sta = OKP;
+	return nullptr;
+}
+
+/*
+ * RESearch::Execute:
+ *   execute nfa to find a match.
+ *
+ *  special cases: (nfa[0])
+ *      BOL
+ *          Match only once, starting from the
+ *          beginning.
+ *      CHR
+ *          First locate the character without
+ *          calling PMatch, and if found, call
+ *          PMatch for the remaining string.
+ *      END
+ *          RESearch::Compile failed, poor luser did not
+ *          check for it. Fail fast.
+ *
+ *  If a match is found, bopat[0] and eopat[0] are set
+ *  to the beginning and the end of the matched fragment,
+ *  respectively.
+ *
+ */
+int RESearch::Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp) {
+	unsigned char c;
+	Sci::Position ep = NOTFOUND;
+	char *ap = nfa;
+
+	bol = lp;
+	failure = 0;
+
+	Clear();
+
+	switch (*ap) {
+
+	case BOL:			/* anchored: match from BOL only */
+		ep = PMatch(ci, lp, endp, ap);
+		break;
+	case EOL:			/* just searching for end of line normal path doesn't work */
+		if (*(ap+1) == END) {
+			lp = endp;
+			ep = lp;
+			break;
+		} else {
+			return 0;
+		}
+	case CHR:			/* ordinary char: locate it fast */
+		c = *(ap+1);
+		while ((lp < endp) && (static_cast<unsigned char>(ci.CharAt(lp)) != c))
+			lp++;
+		if (lp >= endp)	/* if EOS, fail, else fall through. */
+			return 0;
+		[[fallthrough]];
+	default:			/* regular matching all the way. */
+		while (lp < endp) {
+			ep = PMatch(ci, lp, endp, ap);
+			if (ep != NOTFOUND)
+				break;
+			lp++;
+		}
+		break;
+	case END:			/* munged automaton. fail always */
+		return 0;
+	}
+	if (ep == NOTFOUND)
+		return 0;
+
+	bopat[0] = lp;
+	eopat[0] = ep;
+	return 1;
+}
+
+/*
+ * PMatch: internal routine for the hard part
+ *
+ *  This code is partly snarfed from an early grep written by
+ *  David Conroy. The backref and tag stuff, and various other
+ *  innovations are by oz.
+ *
+ *  special case optimizations: (nfa[n], nfa[n+1])
+ *      CLO ANY
+ *          We KNOW .* will match everything up to the
+ *          end of line. Thus, directly go to the end of
+ *          line, without recursive PMatch calls. As in
+ *          the other closure cases, the remaining pattern
+ *          must be matched by moving backwards on the
+ *          string recursively, to find a match for xy
+ *          (x is ".*" and y is the remaining pattern)
+ *          where the match satisfies the LONGEST match for
+ *          x followed by a match for y.
+ *      CLO CHR
+ *          We can again scan the string forward for the
+ *          single char and at the point of failure, we
+ *          execute the remaining nfa recursively, same as
+ *          above.
+ *
+ *  At the end of a successful match, bopat[n] and eopat[n]
+ *  are set to the beginning and end of subpatterns matched
+ *  by tagged expressions (n = 1 to 9).
+ */
+
+//extern void re_fail(char *,char);
+
+/*
+ * skip values for CLO XXX to skip past the closure
+ */
+
+#define ANYSKIP 2 	/* [CLO] ANY END          */
+#define CHRSKIP 3	/* [CLO] CHR chr END      */
+#define CCLSKIP 34	/* [CLO] CCL 32 bytes END */
+
+Sci::Position RESearch::PMatch(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap) {
+	int op, c, n;
+	Sci::Position e;		/* extra pointer for CLO  */
+	Sci::Position bp;		/* beginning of subpat... */
+	Sci::Position ep;		/* ending of subpat...    */
+	Sci::Position are;	/* to save the line ptr.  */
+	Sci::Position llp;	/* lazy lp for LCLO       */
+
+	while ((op = *ap++) != END)
+		switch (op) {
+
+		case CHR:
+			if (ci.CharAt(lp++) != *ap++)
+				return NOTFOUND;
+			break;
+		case ANY:
+			if (lp++ >= endp)
+				return NOTFOUND;
+			break;
+		case CCL:
+			if (lp >= endp)
+				return NOTFOUND;
+			if (!isinset(ap, ci.CharAt(lp++)))
+				return NOTFOUND;
+			ap += BITBLK;
+			break;
+		case BOL:
+			if (lp != bol)
+				return NOTFOUND;
+			break;
+		case EOL:
+			if (lp < endp)
+				return NOTFOUND;
+			break;
+		case BOT:
+			bopat[static_cast<int>(*ap++)] = lp;
+			break;
+		case EOT:
+			eopat[static_cast<int>(*ap++)] = lp;
+			break;
+		case BOW:
+			if ((lp!=bol && iswordc(ci.CharAt(lp-1))) || !iswordc(ci.CharAt(lp)))
+				return NOTFOUND;
+			break;
+		case EOW:
+			if (lp==bol || !iswordc(ci.CharAt(lp-1)) || iswordc(ci.CharAt(lp)))
+				return NOTFOUND;
+			break;
+		case REF:
+			n = *ap++;
+			bp = bopat[n];
+			ep = eopat[n];
+			while (bp < ep)
+				if (ci.CharAt(bp++) != ci.CharAt(lp++))
+					return NOTFOUND;
+			break;
+		case LCLO:
+		case CLQ:
+		case CLO:
+			are = lp;
+			switch (*ap) {
+
+			case ANY:
+				if (op == CLO || op == LCLO)
+					while (lp < endp)
+						lp++;
+				else if (lp < endp)
+					lp++;
+
+				n = ANYSKIP;
+				break;
+			case CHR:
+				c = *(ap+1);
+				if (op == CLO || op == LCLO)
+					while ((lp < endp) && (c == ci.CharAt(lp)))
+						lp++;
+				else if ((lp < endp) && (c == ci.CharAt(lp)))
+					lp++;
+				n = CHRSKIP;
+				break;
+			case CCL:
+				while ((lp < endp) && isinset(ap+1, ci.CharAt(lp)))
+					lp++;
+				n = CCLSKIP;
+				break;
+			default:
+				failure = true;
+				//re_fail("closure: bad nfa.", *ap);
+				return NOTFOUND;
+			}
+			ap += n;
+
+			llp = lp;
+			e = NOTFOUND;
+			while (llp >= are) {
+				Sci::Position q;
+				if ((q = PMatch(ci, llp, endp, ap)) != NOTFOUND) {
+					e = q;
+					lp = llp;
+					if (op != LCLO) return e;
+				}
+				if (*ap == END) return e;
+				--llp;
+			}
+			if (*ap == EOT)
+				PMatch(ci, lp, endp, ap);
+			return e;
+		default:
+			//re_fail("RESearch::Execute: bad nfa.", static_cast<char>(op));
+			return NOTFOUND;
+		}
+	return lp;
+}
+
+
diff --git a/scite-app/scintilla/src/RESearch.h b/scite-app/scintilla/src/RESearch.h
new file mode 100644
index 0000000..4f05988
--- /dev/null
+++ b/scite-app/scintilla/src/RESearch.h
@@ -0,0 +1,69 @@
+// Scintilla source code edit control
+/** @file RESearch.h
+ ** Interface to the regular expression search library.
+ **/
+// Written by Neil Hodgson <neilh@scintilla.org>
+// Based on the work of Ozan S. Yigit.
+// This file is in the public domain.
+
+#ifndef RESEARCH_H
+#define RESEARCH_H
+
+namespace Scintilla::Internal {
+
+class CharacterIndexer {
+public:
+	virtual char CharAt(Sci::Position index) const=0;
+	virtual ~CharacterIndexer() {
+	}
+};
+
+class RESearch {
+
+public:
+	explicit RESearch(CharClassify *charClassTable);
+	// No dynamic allocation so default copy constructor and assignment operator are OK.
+	~RESearch();
+	void Clear() noexcept;
+	void GrabMatches(const CharacterIndexer &ci);
+	const char *Compile(const char *pattern, Sci::Position length, bool caseSensitive, bool posix) noexcept;
+	int Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp);
+
+	static constexpr int MAXTAG = 10;
+	static constexpr int NOTFOUND = -1;
+
+	Sci::Position bopat[MAXTAG];
+	Sci::Position eopat[MAXTAG];
+	std::string pat[MAXTAG];
+
+private:
+
+	static constexpr int MAXNFA = 4096;
+	// The following constants are not meant to be changeable.
+	// They are for readability only.
+	static constexpr int MAXCHR = 256;
+	static constexpr int CHRBIT = 8;
+	static constexpr int BITBLK = MAXCHR / CHRBIT;
+
+	void ChSet(unsigned char c) noexcept;
+	void ChSetWithCase(unsigned char c, bool caseSensitive) noexcept;
+	int GetBackslashExpression(const char *pattern, int &incr) noexcept;
+
+	Sci::Position PMatch(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap);
+
+	Sci::Position bol;
+	Sci::Position tagstk[MAXTAG];  /* subpat tag stack */
+	char nfa[MAXNFA];    /* automaton */
+	int sta;
+	unsigned char bittab[BITBLK]; /* bit table for CCL pre-set bits */
+	int failure;
+	CharClassify *charClass;
+	bool iswordc(unsigned char x) const noexcept {
+		return charClass->IsWord(x);
+	}
+};
+
+}
+
+#endif
+
diff --git a/scite-app/scintilla/src/RunStyles.cxx b/scite-app/scintilla/src/RunStyles.cxx
new file mode 100644
index 0000000..e9d3f6e
--- /dev/null
+++ b/scite-app/scintilla/src/RunStyles.cxx
@@ -0,0 +1,315 @@
+/** @file RunStyles.cxx
+ ** Data structure used to store sparse styles.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <climits>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+
+using namespace Scintilla::Internal;
+
+// Find the first run at a position
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::RunFromPosition(DISTANCE position) const noexcept {
+	DISTANCE run = starts->PartitionFromPosition(position);
+	// Go to first element with this position
+	while ((run > 0) && (position == starts->PositionFromPartition(run-1))) {
+		run--;
+	}
+	return run;
+}
+
+// If there is no run boundary at position, insert one continuing style.
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::SplitRun(DISTANCE position) {
+	DISTANCE run = RunFromPosition(position);
+	const DISTANCE posRun = starts->PositionFromPartition(run);
+	if (posRun < position) {
+		STYLE runStyle = ValueAt(position);
+		run++;
+		starts->InsertPartition(run, position);
+		styles->InsertValue(run, 1, runStyle);
+	}
+	return run;
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRun(DISTANCE run) {
+	starts->RemovePartition(run);
+	styles->DeleteRange(run, 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRunIfEmpty(DISTANCE run) {
+	if ((run < starts->Partitions()) && (starts->Partitions() > 1)) {
+		if (starts->PositionFromPartition(run) == starts->PositionFromPartition(run+1)) {
+			RemoveRun(run);
+		}
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRunIfSameAsPrevious(DISTANCE run) {
+	if ((run > 0) && (run < starts->Partitions())) {
+		if (styles->ValueAt(run-1) == styles->ValueAt(run)) {
+			RemoveRun(run);
+		}
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+RunStyles<DISTANCE, STYLE>::RunStyles() {
+	starts = std::make_unique<Partitioning<DISTANCE>>(8);
+	styles = std::make_unique<SplitVector<STYLE>>();
+	styles->InsertValue(0, 2, 0);
+}
+
+template <typename DISTANCE, typename STYLE>
+RunStyles<DISTANCE, STYLE>::~RunStyles() {
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Length() const noexcept {
+	return starts->PositionFromPartition(starts->Partitions());
+}
+
+template <typename DISTANCE, typename STYLE>
+STYLE RunStyles<DISTANCE, STYLE>::ValueAt(DISTANCE position) const noexcept {
+	return styles->ValueAt(starts->PartitionFromPosition(position));
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::FindNextChange(DISTANCE position, DISTANCE end) const noexcept {
+	const DISTANCE run = starts->PartitionFromPosition(position);
+	if (run < starts->Partitions()) {
+		const DISTANCE runChange = starts->PositionFromPartition(run);
+		if (runChange > position)
+			return runChange;
+		const DISTANCE nextChange = starts->PositionFromPartition(run + 1);
+		if (nextChange > position) {
+			return nextChange;
+		} else if (position < end) {
+			return end;
+		} else {
+			return end + 1;
+		}
+	} else {
+		return end + 1;
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::StartRun(DISTANCE position) const noexcept {
+	return starts->PositionFromPartition(starts->PartitionFromPosition(position));
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::EndRun(DISTANCE position) const noexcept {
+	return starts->PositionFromPartition(starts->PartitionFromPosition(position) + 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+FillResult<DISTANCE> RunStyles<DISTANCE, STYLE>::FillRange(DISTANCE position, STYLE value, DISTANCE fillLength) {
+	const FillResult<DISTANCE> resultNoChange{false, position, fillLength};
+	if (fillLength <= 0) {
+		return resultNoChange;
+	}
+	DISTANCE end = position + fillLength;
+	if (end > Length()) {
+		return resultNoChange;
+	}
+	DISTANCE runEnd = RunFromPosition(end);
+	if (styles->ValueAt(runEnd) == value) {
+		// End already has value so trim range.
+		end = starts->PositionFromPartition(runEnd);
+		if (position >= end) {
+			// Whole range is already same as value so no action
+			return resultNoChange;
+		}
+		fillLength = end - position;
+	} else {
+		runEnd = SplitRun(end);
+	}
+	DISTANCE runStart = RunFromPosition(position);
+	if (styles->ValueAt(runStart) == value) {
+		// Start is in expected value so trim range.
+		runStart++;
+		position = starts->PositionFromPartition(runStart);
+		fillLength = end - position;
+	} else {
+		if (starts->PositionFromPartition(runStart) < position) {
+			runStart = SplitRun(position);
+			runEnd++;
+		}
+	}
+	if (runStart < runEnd) {
+		const FillResult<DISTANCE> result{ true, position, fillLength };
+		styles->SetValueAt(runStart, value);
+		// Remove each old run over the range
+		for (DISTANCE run=runStart+1; run<runEnd; run++) {
+			RemoveRun(runStart+1);
+		}
+		runEnd = RunFromPosition(end);
+		RemoveRunIfSameAsPrevious(runEnd);
+		RemoveRunIfSameAsPrevious(runStart);
+		runEnd = RunFromPosition(end);
+		RemoveRunIfEmpty(runEnd);
+		return result;
+	} else {
+		return resultNoChange;
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::SetValueAt(DISTANCE position, STYLE value) {
+	FillRange(position, value, 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::InsertSpace(DISTANCE position, DISTANCE insertLength) {
+	DISTANCE runStart = RunFromPosition(position);
+	if (starts->PositionFromPartition(runStart) == position) {
+		STYLE runStyle = ValueAt(position);
+		// Inserting at start of run so make previous longer
+		if (runStart == 0) {
+			// Inserting at start of document so ensure 0
+			if (runStyle) {
+				styles->SetValueAt(0, STYLE());
+				starts->InsertPartition(1, 0);
+				styles->InsertValue(1, 1, runStyle);
+				starts->InsertText(0, insertLength);
+			} else {
+				starts->InsertText(runStart, insertLength);
+			}
+		} else {
+			if (runStyle) {
+				starts->InsertText(runStart-1, insertLength);
+			} else {
+				// Insert at end of run so do not extend style
+				starts->InsertText(runStart, insertLength);
+			}
+		}
+	} else {
+		starts->InsertText(runStart, insertLength);
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::DeleteAll() {
+	starts = std::make_unique<Partitioning<DISTANCE>>(8);
+	styles = std::make_unique<SplitVector<STYLE>>();
+	styles->InsertValue(0, 2, 0);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::DeleteRange(DISTANCE position, DISTANCE deleteLength) {
+	DISTANCE end = position + deleteLength;
+	DISTANCE runStart = RunFromPosition(position);
+	DISTANCE runEnd = RunFromPosition(end);
+	if (runStart == runEnd) {
+		// Deleting from inside one run
+		starts->InsertText(runStart, -deleteLength);
+		RemoveRunIfEmpty(runStart);
+	} else {
+		runStart = SplitRun(position);
+		runEnd = SplitRun(end);
+		starts->InsertText(runStart, -deleteLength);
+		// Remove each old run over the range
+		for (DISTANCE run=runStart; run<runEnd; run++) {
+			RemoveRun(runStart);
+		}
+		RemoveRunIfEmpty(runStart);
+		RemoveRunIfSameAsPrevious(runStart);
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Runs() const noexcept {
+	return starts->Partitions();
+}
+
+template <typename DISTANCE, typename STYLE>
+bool RunStyles<DISTANCE, STYLE>::AllSame() const noexcept {
+	for (DISTANCE run = 1; run < starts->Partitions(); run++) {
+		if (styles->ValueAt(run) != styles->ValueAt(run - 1))
+			return false;
+	}
+	return true;
+}
+
+template <typename DISTANCE, typename STYLE>
+bool RunStyles<DISTANCE, STYLE>::AllSameAs(STYLE value) const noexcept {
+	return AllSame() && (styles->ValueAt(0) == value);
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Find(STYLE value, DISTANCE start) const noexcept {
+	if (start < Length()) {
+		DISTANCE run = start ? RunFromPosition(start) : 0;
+		if (styles->ValueAt(run) == value)
+			return start;
+		run++;
+		while (run < starts->Partitions()) {
+			if (styles->ValueAt(run) == value)
+				return starts->PositionFromPartition(run);
+			run++;
+		}
+	}
+	return -1;
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::Check() const {
+	if (Length() < 0) {
+		throw std::runtime_error("RunStyles: Length can not be negative.");
+	}
+	if (starts->Partitions() < 1) {
+		throw std::runtime_error("RunStyles: Must always have 1 or more partitions.");
+	}
+	if (starts->Partitions() != styles->Length()-1) {
+		throw std::runtime_error("RunStyles: Partitions and styles different lengths.");
+	}
+	DISTANCE start=0;
+	while (start < Length()) {
+		const DISTANCE end = EndRun(start);
+		if (start >= end) {
+			throw std::runtime_error("RunStyles: Partition is 0 length.");
+		}
+		start = end;
+	}
+	if (styles->ValueAt(styles->Length()-1) != 0) {
+		throw std::runtime_error("RunStyles: Unused style at end changed.");
+	}
+	for (ptrdiff_t j=1; j<styles->Length()-1; j++) {
+		if (styles->ValueAt(j) == styles->ValueAt(j-1)) {
+			throw std::runtime_error("RunStyles: Style of a partition same as previous.");
+		}
+	}
+}
+
+template class Scintilla::Internal::RunStyles<int, int>;
+template class Scintilla::Internal::RunStyles<int, char>;
+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
+template class Scintilla::Internal::RunStyles<ptrdiff_t, int>;
+template class Scintilla::Internal::RunStyles<ptrdiff_t, char>;
+#endif
diff --git a/scite-app/scintilla/src/RunStyles.h b/scite-app/scintilla/src/RunStyles.h
new file mode 100644
index 0000000..328fa1d
--- /dev/null
+++ b/scite-app/scintilla/src/RunStyles.h
@@ -0,0 +1,64 @@
+/** @file RunStyles.h
+ ** Data structure used to store sparse styles.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+/// Styling buffer using one element for each run rather than using
+/// a filled buffer.
+
+#ifndef RUNSTYLES_H
+#define RUNSTYLES_H
+
+namespace Scintilla::Internal {
+
+// Return for RunStyles::FillRange reports if anything was changed and the
+// range that was changed. This may be trimmed from the requested range
+// when some of the requested range already had the requested value.
+template <typename DISTANCE>
+struct FillResult {
+	bool changed;
+	DISTANCE position;
+	DISTANCE fillLength;
+};
+
+template <typename DISTANCE, typename STYLE>
+class RunStyles {
+private:
+	std::unique_ptr<Partitioning<DISTANCE>> starts;
+	std::unique_ptr<SplitVector<STYLE>> styles;
+	DISTANCE RunFromPosition(DISTANCE position) const noexcept;
+	DISTANCE SplitRun(DISTANCE position);
+	void RemoveRun(DISTANCE run);
+	void RemoveRunIfEmpty(DISTANCE run);
+	void RemoveRunIfSameAsPrevious(DISTANCE run);
+public:
+	RunStyles();
+	// Deleted so RunStyles objects can not be copied.
+	RunStyles(const RunStyles &) = delete;
+	RunStyles(RunStyles &&) = delete;
+	void operator=(const RunStyles &) = delete;
+	void operator=(RunStyles &&) = delete;
+	~RunStyles();
+	DISTANCE Length() const noexcept;
+	STYLE ValueAt(DISTANCE position) const noexcept;
+	DISTANCE FindNextChange(DISTANCE position, DISTANCE end) const noexcept;
+	DISTANCE StartRun(DISTANCE position) const noexcept;
+	DISTANCE EndRun(DISTANCE position) const noexcept;
+	// Returns changed=true if some values may have changed
+	FillResult<DISTANCE> FillRange(DISTANCE position, STYLE value, DISTANCE fillLength);
+	void SetValueAt(DISTANCE position, STYLE value);
+	void InsertSpace(DISTANCE position, DISTANCE insertLength);
+	void DeleteAll();
+	void DeleteRange(DISTANCE position, DISTANCE deleteLength);
+	DISTANCE Runs() const noexcept;
+	bool AllSame() const noexcept;
+	bool AllSameAs(STYLE value) const noexcept;
+	DISTANCE Find(STYLE value, DISTANCE start) const noexcept;
+
+	void Check() const;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/SciTE.properties b/scite-app/scintilla/src/SciTE.properties
new file mode 100644
index 0000000..1eda9fa
--- /dev/null
+++ b/scite-app/scintilla/src/SciTE.properties
@@ -0,0 +1,6 @@
+# SciTE.properties is the per directory local options file and can be used to override
+# settings made in SciTEGlobal.properties
+command.build.directory.*.cxx=..\win32
+command.build.directory.*.h=..\win32
+command.build.*.cxx=nmake -f scintilla.mak QUIET=1
+command.build.*.h=nmake -f scintilla.mak QUIET=1
diff --git a/scite-app/scintilla/src/ScintillaBase.cxx b/scite-app/scintilla/src/ScintillaBase.cxx
new file mode 100644
index 0000000..2382997
--- /dev/null
+++ b/scite-app/scintilla/src/ScintillaBase.cxx
@@ -0,0 +1,1161 @@
+// Scintilla source code edit control
+/** @file ScintillaBase.cxx
+ ** An enhanced subclass of Editor with calltips, autocomplete and context menu.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterCategoryMap.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+ScintillaBase::ScintillaBase() {
+	displayPopupMenu = PopUp::All;
+	listType = 0;
+	maxListWidth = 0;
+	multiAutoCMode = MultiAutoComplete::Once;
+}
+
+ScintillaBase::~ScintillaBase() {
+}
+
+void ScintillaBase::Finalise() {
+	Editor::Finalise();
+	popup.Destroy();
+}
+
+void ScintillaBase::InsertCharacter(std::string_view sv, CharacterSource charSource) {
+	const bool isFillUp = ac.Active() && ac.IsFillUpChar(sv[0]);
+	if (!isFillUp) {
+		Editor::InsertCharacter(sv, charSource);
+	}
+	if (ac.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.
+		if (isFillUp) {
+			Editor::InsertCharacter(sv, charSource);
+		}
+	}
+}
+
+void ScintillaBase::Command(int cmdId) {
+
+	switch (cmdId) {
+
+	case idAutoComplete:  	// Nothing to do
+
+		break;
+
+	case idCallTip:  	// Nothing to do
+
+		break;
+
+	case idcmdUndo:
+		WndProc(Message::Undo, 0, 0);
+		break;
+
+	case idcmdRedo:
+		WndProc(Message::Redo, 0, 0);
+		break;
+
+	case idcmdCut:
+		WndProc(Message::Cut, 0, 0);
+		break;
+
+	case idcmdCopy:
+		WndProc(Message::Copy, 0, 0);
+		break;
+
+	case idcmdPaste:
+		WndProc(Message::Paste, 0, 0);
+		break;
+
+	case idcmdDelete:
+		WndProc(Message::Clear, 0, 0);
+		break;
+
+	case idcmdSelectAll:
+		WndProc(Message::SelectAll, 0, 0);
+		break;
+	}
+}
+
+int ScintillaBase::KeyCommand(Message iMessage) {
+	// Most key commands cancel autocompletion mode
+	if (ac.Active()) {
+		switch (iMessage) {
+			// Except for these
+		case Message::LineDown:
+			AutoCompleteMove(1);
+			return 0;
+		case Message::LineUp:
+			AutoCompleteMove(-1);
+			return 0;
+		case Message::PageDown:
+			AutoCompleteMove(ac.lb->GetVisibleRows());
+			return 0;
+		case Message::PageUp:
+			AutoCompleteMove(-ac.lb->GetVisibleRows());
+			return 0;
+		case Message::VCHome:
+			AutoCompleteMove(-5000);
+			return 0;
+		case Message::LineEnd:
+			AutoCompleteMove(5000);
+			return 0;
+		case Message::DeleteBack:
+			DelCharBack(true);
+			AutoCompleteCharacterDeleted();
+			EnsureCaretVisible();
+			return 0;
+		case Message::DeleteBackNotLine:
+			DelCharBack(false);
+			AutoCompleteCharacterDeleted();
+			EnsureCaretVisible();
+			return 0;
+		case Message::Tab:
+			AutoCompleteCompleted(0, CompletionMethods::Tab);
+			return 0;
+		case Message::NewLine:
+			AutoCompleteCompleted(0, CompletionMethods::Newline);
+			return 0;
+
+		default:
+			AutoCompleteCancel();
+		}
+	}
+
+	if (ct.inCallTipMode) {
+		if (
+		    (iMessage != Message::CharLeft) &&
+		    (iMessage != Message::CharLeftExtend) &&
+		    (iMessage != Message::CharRight) &&
+		    (iMessage != Message::CharRightExtend) &&
+		    (iMessage != Message::EditToggleOvertype) &&
+		    (iMessage != Message::DeleteBack) &&
+		    (iMessage != Message::DeleteBackNotLine)
+		) {
+			ct.CallTipCancel();
+		}
+		if ((iMessage == Message::DeleteBack) || (iMessage == Message::DeleteBackNotLine)) {
+			if (sel.MainCaret() <= ct.posStartCallTip) {
+				ct.CallTipCancel();
+			}
+		}
+	}
+	return Editor::KeyCommand(iMessage);
+}
+
+void ScintillaBase::ListNotify(ListBoxEvent *plbe) {
+	switch (plbe->event) {
+	case ListBoxEvent::EventType::selectionChange:
+		AutoCompleteSelection();
+		break;
+	case ListBoxEvent::EventType::doubleClick:
+		AutoCompleteCompleted(0, CompletionMethods::DoubleClick);
+		break;
+	}
+}
+
+void ScintillaBase::AutoCompleteInsert(Sci::Position startPos, Sci::Position removeLen, const char *text, Sci::Position textLen) {
+	UndoGroup ug(pdoc);
+	if (multiAutoCMode == MultiAutoComplete::Once) {
+		pdoc->DeleteChars(startPos, removeLen);
+		const Sci::Position lengthInserted = pdoc->InsertString(startPos, text, textLen);
+		SetEmptySelection(startPos + lengthInserted);
+	} else {
+		// MultiAutoComplete::Each
+		for (size_t r=0; r<sel.Count(); r++) {
+			if (!RangeContainsProtected(sel.Range(r).Start().Position(),
+				sel.Range(r).End().Position())) {
+				Sci::Position positionInsert = sel.Range(r).Start().Position();
+				positionInsert = RealizeVirtualSpace(positionInsert, sel.Range(r).caret.VirtualSpace());
+				if (positionInsert - removeLen >= 0) {
+					positionInsert -= removeLen;
+					pdoc->DeleteChars(positionInsert, removeLen);
+				}
+				const Sci::Position lengthInserted = pdoc->InsertString(positionInsert, text, textLen);
+				if (lengthInserted > 0) {
+					sel.Range(r).caret.SetPosition(positionInsert + lengthInserted);
+					sel.Range(r).anchor.SetPosition(positionInsert + lengthInserted);
+				}
+				sel.Range(r).ClearVirtualSpace();
+			}
+		}
+	}
+}
+
+void ScintillaBase::AutoCompleteStart(Sci::Position lenEntered, const char *list) {
+	//Platform::DebugPrintf("AutoComplete %s\n", list);
+	ct.CallTipCancel();
+
+	if (ac.chooseSingle && (listType == 0)) {
+		if (list && !strchr(list, ac.GetSeparator())) {
+			const char *typeSep = strchr(list, ac.GetTypesep());
+			const Sci::Position lenInsert = typeSep ?
+				(typeSep-list) : strlen(list);
+			if (ac.ignoreCase) {
+				// May need to convert the case before invocation, so remove lenEntered characters
+				AutoCompleteInsert(sel.MainCaret() - lenEntered, lenEntered, list, lenInsert);
+			} else {
+				AutoCompleteInsert(sel.MainCaret(), 0, list + lenEntered, lenInsert - lenEntered);
+			}
+			ac.Cancel();
+			return;
+		}
+	}
+
+	ListOptions options{
+		vs.ElementColour(Element::List),
+		vs.ElementColour(Element::ListBack),
+		vs.ElementColour(Element::ListSelected),
+		vs.ElementColour(Element::ListSelectedBack),
+		ac.options,
+	};
+
+	ac.Start(wMain, idAutoComplete, sel.MainCaret(), PointMainCaret(),
+				lenEntered, vs.lineHeight, IsUnicodeMode(), technology, options);
+
+	const PRectangle rcClient = GetClientRectangle();
+	Point pt = LocationFromPosition(sel.MainCaret() - lenEntered);
+	PRectangle rcPopupBounds = wMain.GetMonitorRect(pt);
+	if (rcPopupBounds.Height() == 0)
+		rcPopupBounds = rcClient;
+
+	int heightLB = ac.heightLBDefault;
+	int widthLB = ac.widthLBDefault;
+	if (pt.x >= rcClient.right - widthLB) {
+		HorizontalScrollTo(static_cast<int>(xOffset + pt.x - rcClient.right + widthLB));
+		Redraw();
+		pt = PointMainCaret();
+	}
+	if (wMargin.Created()) {
+		pt = pt + GetVisibleOriginInMain();
+	}
+	PRectangle rcac;
+	rcac.left = pt.x - ac.lb->CaretFromEdge();
+	if (pt.y >= rcPopupBounds.bottom - heightLB &&  // Won't fit below.
+	        pt.y >= (rcPopupBounds.bottom + rcPopupBounds.top) / 2) { // and there is more room above.
+		rcac.top = pt.y - heightLB;
+		if (rcac.top < rcPopupBounds.top) {
+			heightLB -= static_cast<int>(rcPopupBounds.top - rcac.top);
+			rcac.top = rcPopupBounds.top;
+		}
+	} else {
+		rcac.top = pt.y + vs.lineHeight;
+	}
+	rcac.right = rcac.left + widthLB;
+	rcac.bottom = static_cast<XYPOSITION>(std::min(static_cast<int>(rcac.top) + heightLB, static_cast<int>(rcPopupBounds.bottom)));
+	ac.lb->SetPositionRelative(rcac, &wMain);
+	ac.lb->SetFont(vs.styles[StyleDefault].font.get());
+	const int aveCharWidth = static_cast<int>(vs.styles[StyleDefault].aveCharWidth);
+	ac.lb->SetAverageCharWidth(aveCharWidth);
+	ac.lb->SetDelegate(this);
+
+	ac.SetList(list ? list : "");
+
+	// Fiddle the position of the list so it is right next to the target and wide enough for all its strings
+	PRectangle rcList = ac.lb->GetDesiredRect();
+	const int heightAlloced = static_cast<int>(rcList.bottom - rcList.top);
+	widthLB = std::max(widthLB, static_cast<int>(rcList.right - rcList.left));
+	if (maxListWidth != 0)
+		widthLB = std::min(widthLB, aveCharWidth*maxListWidth);
+	// Make an allowance for large strings in list
+	rcList.left = pt.x - ac.lb->CaretFromEdge();
+	rcList.right = rcList.left + widthLB;
+	if (((pt.y + vs.lineHeight) >= (rcPopupBounds.bottom - heightAlloced)) &&  // Won't fit below.
+	        ((pt.y + vs.lineHeight / 2) >= (rcPopupBounds.bottom + rcPopupBounds.top) / 2)) { // and there is more room above.
+		rcList.top = pt.y - heightAlloced;
+	} else {
+		rcList.top = pt.y + vs.lineHeight;
+	}
+	rcList.bottom = rcList.top + heightAlloced;
+	ac.lb->SetPositionRelative(rcList, &wMain);
+	ac.Show(true);
+	if (lenEntered != 0) {
+		AutoCompleteMoveToCurrentWord();
+	}
+}
+
+void ScintillaBase::AutoCompleteCancel() {
+	if (ac.Active()) {
+		NotificationData scn = {};
+		scn.nmhdr.code = Notification::AutoCCancelled;
+		scn.wParam = 0;
+		scn.listType = 0;
+		NotifyParent(scn);
+	}
+	ac.Cancel();
+}
+
+void ScintillaBase::AutoCompleteMove(int delta) {
+	ac.Move(delta);
+}
+
+void ScintillaBase::AutoCompleteMoveToCurrentWord() {
+	std::string wordCurrent = RangeText(ac.posStart - ac.startLen, sel.MainCaret());
+	ac.Select(wordCurrent.c_str());
+}
+
+void ScintillaBase::AutoCompleteSelection() {
+	const int item = ac.GetSelection();
+	std::string selected;
+	if (item != -1) {
+		selected = ac.GetValue(item);
+	}
+
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::AutoCSelectionChange;
+	scn.message = static_cast<Message>(0);
+	scn.wParam = listType;
+	scn.listType = listType;
+	const Sci::Position firstPos = ac.posStart - ac.startLen;
+	scn.position = firstPos;
+	scn.lParam = firstPos;
+	scn.text = selected.c_str();
+	NotifyParent(scn);
+}
+
+void ScintillaBase::AutoCompleteCharacterAdded(char ch) {
+	if (ac.IsFillUpChar(ch)) {
+		AutoCompleteCompleted(ch, CompletionMethods::FillUp);
+	} else if (ac.IsStopChar(ch)) {
+		AutoCompleteCancel();
+	} else {
+		AutoCompleteMoveToCurrentWord();
+	}
+}
+
+void ScintillaBase::AutoCompleteCharacterDeleted() {
+	if (sel.MainCaret() < ac.posStart - ac.startLen) {
+		AutoCompleteCancel();
+	} else if (ac.cancelAtStartPos && (sel.MainCaret() <= ac.posStart)) {
+		AutoCompleteCancel();
+	} else {
+		AutoCompleteMoveToCurrentWord();
+	}
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::AutoCCharDeleted;
+	scn.wParam = 0;
+	scn.listType = 0;
+	NotifyParent(scn);
+}
+
+void ScintillaBase::AutoCompleteCompleted(char ch, CompletionMethods completionMethod) {
+	const int item = ac.GetSelection();
+	if (item == -1) {
+		AutoCompleteCancel();
+		return;
+	}
+	const std::string selected = ac.GetValue(item);
+
+	ac.Show(false);
+
+	NotificationData scn = {};
+	scn.nmhdr.code = listType > 0 ? Notification::UserListSelection : Notification::AutoCSelection;
+	scn.message = static_cast<Message>(0);
+	scn.ch = ch;
+	scn.listCompletionMethod = completionMethod;
+	scn.wParam = listType;
+	scn.listType = listType;
+	const Sci::Position firstPos = ac.posStart - ac.startLen;
+	scn.position = firstPos;
+	scn.lParam = firstPos;
+	scn.text = selected.c_str();
+	NotifyParent(scn);
+
+	if (!ac.Active())
+		return;
+	ac.Cancel();
+
+	if (listType > 0)
+		return;
+
+	Sci::Position endPos = sel.MainCaret();
+	if (ac.dropRestOfWord)
+		endPos = pdoc->ExtendWordSelect(endPos, 1, true);
+	if (endPos < firstPos)
+		return;
+	AutoCompleteInsert(firstPos, endPos - firstPos, selected.c_str(), selected.length());
+	SetLastXChosen();
+
+	scn.nmhdr.code = Notification::AutoCCompleted;
+	NotifyParent(scn);
+
+}
+
+int ScintillaBase::AutoCompleteGetCurrent() const {
+	if (!ac.Active())
+		return -1;
+	return ac.GetSelection();
+}
+
+int ScintillaBase::AutoCompleteGetCurrentText(char *buffer) const {
+	if (ac.Active()) {
+		const int item = ac.GetSelection();
+		if (item != -1) {
+			const std::string selected = ac.GetValue(item);
+			if (buffer)
+				memcpy(buffer, selected.c_str(), selected.length()+1);
+			return static_cast<int>(selected.length());
+		}
+	}
+	if (buffer)
+		*buffer = '\0';
+	return 0;
+}
+
+void ScintillaBase::CallTipShow(Point pt, const char *defn) {
+	ac.Cancel();
+	// If container knows about StyleCallTip then use it in place of the
+	// StyleDefault for the face name, size and character set. Also use it
+	// for the foreground and background colour.
+	const int ctStyle = ct.UseStyleCallTip() ? StyleCallTip : StyleDefault;
+	if (ct.UseStyleCallTip()) {
+		ct.SetForeBack(vs.styles[StyleCallTip].fore, vs.styles[StyleCallTip].back);
+	}
+	if (wMargin.Created()) {
+		pt = pt + GetVisibleOriginInMain();
+	}
+	PRectangle rc = ct.CallTipStart(sel.MainCaret(), pt,
+		vs.lineHeight,
+		defn,
+		vs.styles[ctStyle].fontName,
+		vs.styles[ctStyle].sizeZoomed,
+		CodePage(),
+		vs.styles[ctStyle].characterSet,
+		vs.technology,
+		vs.localeName.c_str(),
+		wMain);
+	// If the call-tip window would be out of the client
+	// space
+	const PRectangle rcClient = GetClientRectangle();
+	const int offset = vs.lineHeight + static_cast<int>(rc.Height());
+	// adjust so it displays above the text.
+	if (rc.bottom > rcClient.bottom && rc.Height() < rcClient.Height()) {
+		rc.top -= offset;
+		rc.bottom -= offset;
+	}
+	// adjust so it displays below the text.
+	if (rc.top < rcClient.top && rc.Height() < rcClient.Height()) {
+		rc.top += offset;
+		rc.bottom += offset;
+	}
+	// Now display the window.
+	CreateCallTipWindow(rc);
+	ct.wCallTip.SetPositionRelative(rc, &wMain);
+	ct.wCallTip.Show();
+}
+
+void ScintillaBase::CallTipClick() {
+	NotificationData scn = {};
+	scn.nmhdr.code = Notification::CallTipClick;
+	scn.position = ct.clickPlace;
+	NotifyParent(scn);
+}
+
+bool ScintillaBase::ShouldDisplayPopup(Point ptInWindowCoordinates) const {
+	return (displayPopupMenu == PopUp::All ||
+		(displayPopupMenu == PopUp::Text && !PointInSelMargin(ptInWindowCoordinates)));
+}
+
+void ScintillaBase::ContextMenu(Point pt) {
+	if (displayPopupMenu != PopUp::Never) {
+		const bool writable = !WndProc(Message::GetReadOnly, 0, 0);
+		popup.CreatePopUp();
+		AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo());
+		AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo());
+		AddToPopUp("");
+		AddToPopUp("Cut", idcmdCut, writable && !sel.Empty());
+		AddToPopUp("Copy", idcmdCopy, !sel.Empty());
+		AddToPopUp("Paste", idcmdPaste, writable && WndProc(Message::CanPaste, 0, 0));
+		AddToPopUp("Delete", idcmdDelete, writable && !sel.Empty());
+		AddToPopUp("");
+		AddToPopUp("Select All", idcmdSelectAll);
+		popup.Show(pt, wMain);
+	}
+}
+
+void ScintillaBase::CancelModes() {
+	AutoCompleteCancel();
+	ct.CallTipCancel();
+	Editor::CancelModes();
+}
+
+void ScintillaBase::ButtonDownWithModifiers(Point pt, unsigned int curTime, KeyMod modifiers) {
+	CancelModes();
+	Editor::ButtonDownWithModifiers(pt, curTime, modifiers);
+}
+
+void ScintillaBase::RightButtonDownWithModifiers(Point pt, unsigned int curTime, KeyMod modifiers) {
+	CancelModes();
+	Editor::RightButtonDownWithModifiers(pt, curTime, modifiers);
+}
+
+namespace Scintilla::Internal {
+
+class LexState : public LexInterface {
+public:
+	explicit LexState(Document *pdoc_) noexcept;
+	void SetInstance(ILexer5 *instance_);
+	// Deleted so LexState objects can not be copied.
+	LexState(const LexState &) = delete;
+	LexState(LexState &&) = delete;
+	LexState &operator=(const LexState &) = delete;
+	LexState &operator=(LexState &&) = delete;
+	~LexState() override;
+
+	const char *DescribeWordListSets();
+	void SetWordList(int n, const char *wl);
+	int GetIdentifier() const;
+	const char *GetName() const;
+	void *PrivateCall(int operation, void *pointer);
+	const char *PropertyNames();
+	TypeProperty PropertyType(const char *name);
+	const char *DescribeProperty(const char *name);
+	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);
+	int SubStylesStart(int styleBase);
+	int SubStylesLength(int styleBase);
+	int StyleFromSubStyle(int subStyle);
+	int PrimaryStyleFromStyle(int style);
+	void FreeSubStyles();
+	void SetIdentifiers(int style, const char *identifiers);
+	int DistanceToSecondaryStyles();
+	const char *GetSubStyleBases();
+	int NamedStyles();
+	const char *NameOfStyle(int style);
+	const char *TagsOfStyle(int style);
+	const char *DescriptionOfStyle(int style);
+};
+
+}
+
+LexState::LexState(Document *pdoc_) noexcept : LexInterface(pdoc_) {
+}
+
+LexState::~LexState() {
+	if (instance) {
+		try {
+			instance->Release();
+		} catch (...) {
+			// ILexer5::Release must not throw, ignore if it does.
+		}
+		instance = nullptr;
+	}
+}
+
+void LexState::SetInstance(ILexer5 *instance_) {
+	if (instance) {
+		try {
+			instance->Release();
+		} catch (...) {
+			// ILexer5::Release must not throw, ignore if it does.
+		}
+		instance = nullptr;
+	}
+	instance = instance_;
+	pdoc->LexerChanged();
+}
+
+LexState *ScintillaBase::DocumentLexState() {
+	if (!pdoc->GetLexInterface()) {
+		pdoc->SetLexInterface(std::make_unique<LexState>(pdoc));
+	}
+	return dynamic_cast<LexState *>(pdoc->GetLexInterface());
+}
+
+const char *LexState::DescribeWordListSets() {
+	if (instance) {
+		return instance->DescribeWordListSets();
+	} else {
+		return nullptr;
+	}
+}
+
+void LexState::SetWordList(int n, const char *wl) {
+	if (instance) {
+		const Sci_Position firstModification = instance->WordListSet(n, wl);
+		if (firstModification >= 0) {
+			pdoc->ModifiedAt(firstModification);
+		}
+	}
+}
+
+int LexState::GetIdentifier() const {
+	if (instance) {
+		return instance->GetIdentifier();
+	}
+	return 0;
+}
+
+const char *LexState::GetName() const {
+	if (instance) {
+		return instance->GetName();
+	}
+	return "";
+}
+
+void *LexState::PrivateCall(int operation, void *pointer) {
+	if (instance) {
+		return instance->PrivateCall(operation, pointer);
+	} else {
+		return nullptr;
+	}
+}
+
+const char *LexState::PropertyNames() {
+	if (instance) {
+		return instance->PropertyNames();
+	} else {
+		return nullptr;
+	}
+}
+
+TypeProperty LexState::PropertyType(const char *name) {
+	if (instance) {
+		return static_cast<TypeProperty>(instance->PropertyType(name));
+	} else {
+		return TypeProperty::Boolean;
+	}
+}
+
+const char *LexState::DescribeProperty(const char *name) {
+	if (instance) {
+		return instance->DescribeProperty(name);
+	} else {
+		return nullptr;
+	}
+}
+
+void LexState::PropSet(const char *key, const char *val) {
+	if (instance) {
+		const Sci_Position firstModification = instance->PropertySet(key, val);
+		if (firstModification >= 0) {
+			pdoc->ModifiedAt(firstModification);
+		}
+	}
+}
+
+const char *LexState::PropGet(const char *key) const {
+	if (instance) {
+		return instance->PropertyGet(key);
+	} else {
+		return nullptr;
+	}
+}
+
+int LexState::PropGetInt(const char *key, int defaultValue) const {
+	if (instance) {
+		const char *value = instance->PropertyGet(key);
+		if (value && *value) {
+			return atoi(value);
+		}
+	}
+	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());
+	}
+	return LineEndType::Default;
+}
+
+int LexState::AllocateSubStyles(int styleBase, int numberStyles) {
+	if (instance) {
+		return instance->AllocateSubStyles(styleBase, numberStyles);
+	}
+	return -1;
+}
+
+int LexState::SubStylesStart(int styleBase) {
+	if (instance) {
+		return instance->SubStylesStart(styleBase);
+	}
+	return -1;
+}
+
+int LexState::SubStylesLength(int styleBase) {
+	if (instance) {
+		return instance->SubStylesLength(styleBase);
+	}
+	return 0;
+}
+
+int LexState::StyleFromSubStyle(int subStyle) {
+	if (instance) {
+		return instance->StyleFromSubStyle(subStyle);
+	}
+	return 0;
+}
+
+int LexState::PrimaryStyleFromStyle(int style) {
+	if (instance) {
+		return instance->PrimaryStyleFromStyle(style);
+	}
+	return 0;
+}
+
+void LexState::FreeSubStyles() {
+	if (instance) {
+		instance->FreeSubStyles();
+	}
+}
+
+void LexState::SetIdentifiers(int style, const char *identifiers) {
+	if (instance) {
+		instance->SetIdentifiers(style, identifiers);
+		pdoc->ModifiedAt(0);
+	}
+}
+
+int LexState::DistanceToSecondaryStyles() {
+	if (instance) {
+		return instance->DistanceToSecondaryStyles();
+	}
+	return 0;
+}
+
+const char *LexState::GetSubStyleBases() {
+	if (instance) {
+		return instance->GetSubStyleBases();
+	}
+	return "";
+}
+
+int LexState::NamedStyles() {
+	if (instance) {
+		return instance->NamedStyles();
+	} else {
+		return -1;
+	}
+}
+
+const char *LexState::NameOfStyle(int style) {
+	if (instance) {
+		return instance->NameOfStyle(style);
+	} else {
+		return nullptr;
+	}
+}
+
+const char *LexState::TagsOfStyle(int style) {
+	if (instance) {
+		return instance->TagsOfStyle(style);
+	} else {
+		return nullptr;
+	}
+}
+
+const char *LexState::DescriptionOfStyle(int style) {
+	if (instance) {
+		return instance->DescriptionOfStyle(style);
+	} else {
+		return nullptr;
+	}
+}
+
+void ScintillaBase::NotifyStyleToNeeded(Sci::Position endStyleNeeded) {
+	if (!DocumentLexState()->UseContainerLexing()) {
+		const Sci::Line lineEndStyled =
+			pdoc->SciLineFromPosition(pdoc->GetEndStyled());
+		const Sci::Position endStyled =
+			pdoc->LineStart(lineEndStyled);
+		DocumentLexState()->Colourise(endStyled, endStyleNeeded);
+		return;
+	}
+	Editor::NotifyStyleToNeeded(endStyleNeeded);
+}
+
+void ScintillaBase::NotifyLexerChanged(Document *, void *) {
+	vs.EnsureStyle(0xff);
+}
+
+sptr_t ScintillaBase::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+	case Message::AutoCShow:
+		listType = 0;
+		AutoCompleteStart(PositionFromUPtr(wParam), ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AutoCCancel:
+		ac.Cancel();
+		break;
+
+	case Message::AutoCActive:
+		return ac.Active();
+
+	case Message::AutoCPosStart:
+		return ac.posStart;
+
+	case Message::AutoCComplete:
+		AutoCompleteCompleted(0, CompletionMethods::Command);
+		break;
+
+	case Message::AutoCSetSeparator:
+		ac.SetSeparator(static_cast<char>(wParam));
+		break;
+
+	case Message::AutoCGetSeparator:
+		return ac.GetSeparator();
+
+	case Message::AutoCStops:
+		ac.SetStopChars(ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AutoCSelect:
+		ac.Select(ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AutoCGetCurrent:
+		return AutoCompleteGetCurrent();
+
+	case Message::AutoCGetCurrentText:
+		return AutoCompleteGetCurrentText(CharPtrFromSPtr(lParam));
+
+	case Message::AutoCSetCancelAtStart:
+		ac.cancelAtStartPos = wParam != 0;
+		break;
+
+	case Message::AutoCGetCancelAtStart:
+		return ac.cancelAtStartPos;
+
+	case Message::AutoCSetFillUps:
+		ac.SetFillUpChars(ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AutoCSetChooseSingle:
+		ac.chooseSingle = wParam != 0;
+		break;
+
+	case Message::AutoCGetChooseSingle:
+		return ac.chooseSingle;
+
+	case Message::AutoCSetIgnoreCase:
+		ac.ignoreCase = wParam != 0;
+		break;
+
+	case Message::AutoCGetIgnoreCase:
+		return ac.ignoreCase;
+
+	case Message::AutoCSetCaseInsensitiveBehaviour:
+		ac.ignoreCaseBehaviour = static_cast<CaseInsensitiveBehaviour>(wParam);
+		break;
+
+	case Message::AutoCGetCaseInsensitiveBehaviour:
+		return static_cast<sptr_t>(ac.ignoreCaseBehaviour);
+
+	case Message::AutoCSetMulti:
+		multiAutoCMode = static_cast<MultiAutoComplete>(wParam);
+		break;
+
+	case Message::AutoCGetMulti:
+		return static_cast<sptr_t>(multiAutoCMode);
+
+	case Message::AutoCSetOrder:
+		ac.autoSort = static_cast<Ordering>(wParam);
+		break;
+
+	case Message::AutoCGetOrder:
+		return static_cast<sptr_t>(ac.autoSort);
+
+	case Message::UserListShow:
+		listType = static_cast<int>(wParam);
+		AutoCompleteStart(0, ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::AutoCSetAutoHide:
+		ac.autoHide = wParam != 0;
+		break;
+
+	case Message::AutoCGetAutoHide:
+		return ac.autoHide;
+
+	case Message::AutoCSetOptions:
+		ac.options = static_cast<AutoCompleteOption>(wParam);
+		break;
+
+	case Message::AutoCGetOptions:
+		return static_cast<sptr_t>(ac.options);
+
+	case Message::AutoCSetDropRestOfWord:
+		ac.dropRestOfWord = wParam != 0;
+		break;
+
+	case Message::AutoCGetDropRestOfWord:
+		return ac.dropRestOfWord;
+
+	case Message::AutoCSetMaxHeight:
+		ac.lb->SetVisibleRows(static_cast<int>(wParam));
+		break;
+
+	case Message::AutoCGetMaxHeight:
+		return ac.lb->GetVisibleRows();
+
+	case Message::AutoCSetMaxWidth:
+		maxListWidth = static_cast<int>(wParam);
+		break;
+
+	case Message::AutoCGetMaxWidth:
+		return maxListWidth;
+
+	case Message::RegisterImage:
+		ac.lb->RegisterImage(static_cast<int>(wParam), ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::RegisterRGBAImage:
+		ac.lb->RegisterRGBAImage(static_cast<int>(wParam), static_cast<int>(sizeRGBAImage.x), static_cast<int>(sizeRGBAImage.y),
+			ConstUCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::ClearRegisteredImages:
+		ac.lb->ClearRegisteredImages();
+		break;
+
+	case Message::AutoCSetTypeSeparator:
+		ac.SetTypesep(static_cast<char>(wParam));
+		break;
+
+	case Message::AutoCGetTypeSeparator:
+		return ac.GetTypesep();
+
+	case Message::CallTipShow:
+		CallTipShow(LocationFromPosition(wParam),
+			ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::CallTipCancel:
+		ct.CallTipCancel();
+		break;
+
+	case Message::CallTipActive:
+		return ct.inCallTipMode;
+
+	case Message::CallTipPosStart:
+		return ct.posStartCallTip;
+
+	case Message::CallTipSetPosStart:
+		ct.posStartCallTip = wParam;
+		break;
+
+	case Message::CallTipSetHlt:
+		ct.SetHighlight(wParam, lParam);
+		break;
+
+	case Message::CallTipSetBack:
+		ct.colourBG = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		vs.styles[StyleCallTip].back = ct.colourBG;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::CallTipSetFore:
+		ct.colourUnSel = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		vs.styles[StyleCallTip].fore = ct.colourUnSel;
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::CallTipSetForeHlt:
+		ct.colourSel = ColourRGBA::FromIpRGB(SPtrFromUPtr(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::CallTipUseStyle:
+		ct.SetTabSize(static_cast<int>(wParam));
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::CallTipSetPosition:
+		ct.SetPosition(wParam != 0);
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::UsePopUp:
+		displayPopupMenu = static_cast<PopUp>(wParam);
+		break;
+
+	case Message::GetLexer:
+		return DocumentLexState()->GetIdentifier();
+
+	case Message::SetILexer:
+		DocumentLexState()->SetInstance(static_cast<ILexer5 *>(PtrFromSPtr(lParam)));
+		return 0;
+
+	case Message::Colourise:
+		if (DocumentLexState()->UseContainerLexing()) {
+			pdoc->ModifiedAt(PositionFromUPtr(wParam));
+			NotifyStyleToNeeded((lParam == -1) ? pdoc->Length() : lParam);
+		} else {
+			DocumentLexState()->Colourise(PositionFromUPtr(wParam), lParam);
+		}
+		Redraw();
+		break;
+
+	case Message::SetProperty:
+		DocumentLexState()->PropSet(ConstCharPtrFromUPtr(wParam),
+		          ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::GetProperty:
+		return StringResult(lParam, DocumentLexState()->PropGet(ConstCharPtrFromUPtr(wParam)));
+
+	case Message::GetPropertyExpanded:
+		return DocumentLexState()->PropGetExpanded(ConstCharPtrFromUPtr(wParam),
+			CharPtrFromSPtr(lParam));
+
+	case Message::GetPropertyInt:
+		return DocumentLexState()->PropGetInt(ConstCharPtrFromUPtr(wParam), static_cast<int>(lParam));
+
+	case Message::SetKeyWords:
+		DocumentLexState()->SetWordList(static_cast<int>(wParam), ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::GetLexerLanguage:
+		return StringResult(lParam, DocumentLexState()->GetName());
+
+	case Message::PrivateLexerCall:
+		return reinterpret_cast<sptr_t>(
+			DocumentLexState()->PrivateCall(static_cast<int>(wParam), PtrFromSPtr(lParam)));
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+	case SCI_GETSTYLEBITSNEEDED:
+		return 8;
+#endif
+
+	case Message::PropertyNames:
+		return StringResult(lParam, DocumentLexState()->PropertyNames());
+
+	case Message::PropertyType:
+		return static_cast<sptr_t>(DocumentLexState()->PropertyType(ConstCharPtrFromUPtr(wParam)));
+
+	case Message::DescribeProperty:
+		return StringResult(lParam,
+				    DocumentLexState()->DescribeProperty(ConstCharPtrFromUPtr(wParam)));
+
+	case Message::DescribeKeyWordSets:
+		return StringResult(lParam, DocumentLexState()->DescribeWordListSets());
+
+	case Message::GetLineEndTypesSupported:
+		return static_cast<sptr_t>(DocumentLexState()->LineEndTypesSupported());
+
+	case Message::AllocateSubStyles:
+		return DocumentLexState()->AllocateSubStyles(static_cast<int>(wParam), static_cast<int>(lParam));
+
+	case Message::GetSubStylesStart:
+		return DocumentLexState()->SubStylesStart(static_cast<int>(wParam));
+
+	case Message::GetSubStylesLength:
+		return DocumentLexState()->SubStylesLength(static_cast<int>(wParam));
+
+	case Message::GetStyleFromSubStyle:
+		return DocumentLexState()->StyleFromSubStyle(static_cast<int>(wParam));
+
+	case Message::GetPrimaryStyleFromStyle:
+		return DocumentLexState()->PrimaryStyleFromStyle(static_cast<int>(wParam));
+
+	case Message::FreeSubStyles:
+		DocumentLexState()->FreeSubStyles();
+		break;
+
+	case Message::SetIdentifiers:
+		DocumentLexState()->SetIdentifiers(static_cast<int>(wParam),
+						   ConstCharPtrFromSPtr(lParam));
+		break;
+
+	case Message::DistanceToSecondaryStyles:
+		return DocumentLexState()->DistanceToSecondaryStyles();
+
+	case Message::GetSubStyleBases:
+		return StringResult(lParam, DocumentLexState()->GetSubStyleBases());
+
+	case Message::GetNamedStyles:
+		return DocumentLexState()->NamedStyles();
+
+	case Message::NameOfStyle:
+		return StringResult(lParam, DocumentLexState()->
+				    NameOfStyle(static_cast<int>(wParam)));
+
+	case Message::TagsOfStyle:
+		return StringResult(lParam, DocumentLexState()->
+				    TagsOfStyle(static_cast<int>(wParam)));
+
+	case Message::DescriptionOfStyle:
+		return StringResult(lParam, DocumentLexState()->
+				    DescriptionOfStyle(static_cast<int>(wParam)));
+
+	default:
+		return Editor::WndProc(iMessage, wParam, lParam);
+	}
+	return 0;
+}
diff --git a/scite-app/scintilla/src/ScintillaBase.h b/scite-app/scintilla/src/ScintillaBase.h
new file mode 100644
index 0000000..47e2479
--- /dev/null
+++ b/scite-app/scintilla/src/ScintillaBase.h
@@ -0,0 +1,96 @@
+// Scintilla source code edit control
+/** @file ScintillaBase.h
+ ** Defines an enhanced subclass of Editor with calltips, autocomplete and context menu.
+ **/
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLABASE_H
+#define SCINTILLABASE_H
+
+namespace Scintilla::Internal {
+
+class LexState;
+/**
+ */
+class ScintillaBase : public Editor, IListBoxDelegate {
+protected:
+	/** Enumeration of commands and child windows. */
+	enum {
+		idCallTip=1,
+		idAutoComplete=2,
+
+		idcmdUndo=10,
+		idcmdRedo=11,
+		idcmdCut=12,
+		idcmdCopy=13,
+		idcmdPaste=14,
+		idcmdDelete=15,
+		idcmdSelectAll=16
+	};
+
+	Scintilla::PopUp displayPopupMenu;
+	Menu popup;
+	Scintilla::Internal::AutoComplete ac;
+
+	CallTip ct;
+
+	int listType;			///< 0 is an autocomplete list
+	int maxListWidth;		/// Maximum width of list, in average character widths
+	Scintilla::MultiAutoComplete multiAutoCMode; /// Mode for autocompleting when multiple selections are present
+
+	LexState *DocumentLexState();
+	void Colourise(int start, int end);
+
+	ScintillaBase();
+	// Deleted so ScintillaBase objects can not be copied.
+	ScintillaBase(const ScintillaBase &) = delete;
+	ScintillaBase(ScintillaBase &&) = delete;
+	ScintillaBase &operator=(const ScintillaBase &) = delete;
+	ScintillaBase &operator=(ScintillaBase &&) = delete;
+	// ~ScintillaBase() in public section
+	void Initialise() override {}
+	void Finalise() override;
+
+	void InsertCharacter(std::string_view sv, Scintilla::CharacterSource charSource) override;
+	void Command(int cmdId);
+	void CancelModes() override;
+	int KeyCommand(Scintilla::Message iMessage) override;
+
+	void AutoCompleteInsert(Sci::Position startPos, Sci::Position removeLen, const char *text, Sci::Position textLen);
+	void AutoCompleteStart(Sci::Position lenEntered, const char *list);
+	void AutoCompleteCancel();
+	void AutoCompleteMove(int delta);
+	int AutoCompleteGetCurrent() const;
+	int AutoCompleteGetCurrentText(char *buffer) const;
+	void AutoCompleteCharacterAdded(char ch);
+	void AutoCompleteCharacterDeleted();
+	void AutoCompleteCompleted(char ch, Scintilla::CompletionMethods completionMethod);
+	void AutoCompleteMoveToCurrentWord();
+	void AutoCompleteSelection();
+	void ListNotify(ListBoxEvent *plbe) override;
+
+	void CallTipClick();
+	void CallTipShow(Point pt, const char *defn);
+	virtual void CreateCallTipWindow(PRectangle rc) = 0;
+
+	virtual void AddToPopUp(const char *label, int cmd=0, bool enabled=true) = 0;
+	bool ShouldDisplayPopup(Point ptInWindowCoordinates) const;
+	void ContextMenu(Point pt);
+
+	void ButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers) override;
+	void RightButtonDownWithModifiers(Point pt, unsigned int curTime, Scintilla::KeyMod modifiers) override;
+
+	void NotifyStyleToNeeded(Sci::Position endStyleNeeded) override;
+	void NotifyLexerChanged(Document *doc, void *userData) override;
+
+public:
+	~ScintillaBase() override;
+
+	// Public so scintilla_send_message can use it
+	Scintilla::sptr_t WndProc(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) override;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Selection.cxx b/scite-app/scintilla/src/Selection.cxx
new file mode 100644
index 0000000..9cf4e6f
--- /dev/null
+++ b/scite-app/scintilla/src/Selection.cxx
@@ -0,0 +1,454 @@
+// Scintilla source code edit control
+/** @file Selection.cxx
+ ** Classes maintaining the selection.
+ **/
+// Copyright 2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "Selection.h"
+
+using namespace Scintilla::Internal;
+
+void SelectionPosition::MoveForInsertDelete(bool insertion, Sci::Position startChange, Sci::Position length, bool moveForEqual) noexcept {
+	if (insertion) {
+		if (position == startChange) {
+			// Always consume virtual space
+			const Sci::Position virtualLengthRemove = std::min(length, virtualSpace);
+			virtualSpace -= virtualLengthRemove;
+			position += virtualLengthRemove;
+			if (moveForEqual) {
+				const Sci::Position lengthAfterVirtualRemove = length - virtualLengthRemove;
+				position += lengthAfterVirtualRemove;
+			}
+		} else if (position > startChange) {
+			position += length;
+		}
+	} else {
+		if (position == startChange) {
+			virtualSpace = 0;
+		}
+		if (position > startChange) {
+			const Sci::Position endDeletion = startChange + length;
+			if (position > endDeletion) {
+				position -= length;
+			} else {
+				position = startChange;
+				virtualSpace = 0;
+			}
+		}
+	}
+}
+
+bool SelectionPosition::operator <(const SelectionPosition &other) const noexcept {
+	if (position == other.position)
+		return virtualSpace < other.virtualSpace;
+	else
+		return position < other.position;
+}
+
+bool SelectionPosition::operator >(const SelectionPosition &other) const noexcept {
+	if (position == other.position)
+		return virtualSpace > other.virtualSpace;
+	else
+		return position > other.position;
+}
+
+bool SelectionPosition::operator <=(const SelectionPosition &other) const noexcept {
+	if (position == other.position && virtualSpace == other.virtualSpace)
+		return true;
+	else
+		return other > *this;
+}
+
+bool SelectionPosition::operator >=(const SelectionPosition &other) const noexcept {
+	if (position == other.position && virtualSpace == other.virtualSpace)
+		return true;
+	else
+		return *this > other;
+}
+
+Sci::Position SelectionRange::Length() const noexcept {
+	if (anchor > caret) {
+		return anchor.Position() - caret.Position();
+	} else {
+		return caret.Position() - anchor.Position();
+	}
+}
+
+void SelectionRange::MoveForInsertDelete(bool insertion, Sci::Position startChange, Sci::Position length) noexcept {
+	// For insertions that occur at the start of the selection move both the start
+	// and end of the selection to preserve the selected length.
+	// The end will automatically move since it is after the insertion, so determine
+	// which position is the start and pass this into
+	// SelectionPosition::MoveForInsertDelete.
+	// There isn't any reason to move an empty selection so don't move it.
+	const bool caretStart = caret.Position() < anchor.Position();
+	const bool anchorStart = anchor.Position() < caret.Position();
+
+	caret.MoveForInsertDelete(insertion, startChange, length, caretStart);
+	anchor.MoveForInsertDelete(insertion, startChange, length, anchorStart);
+}
+
+bool SelectionRange::Contains(Sci::Position pos) const noexcept {
+	if (anchor > caret)
+		return (pos >= caret.Position()) && (pos <= anchor.Position());
+	else
+		return (pos >= anchor.Position()) && (pos <= caret.Position());
+}
+
+bool SelectionRange::Contains(SelectionPosition sp) const noexcept {
+	if (anchor > caret)
+		return (sp >= caret) && (sp <= anchor);
+	else
+		return (sp >= anchor) && (sp <= caret);
+}
+
+bool SelectionRange::ContainsCharacter(Sci::Position posCharacter) const noexcept {
+	if (anchor > caret)
+		return (posCharacter >= caret.Position()) && (posCharacter < anchor.Position());
+	else
+		return (posCharacter >= anchor.Position()) && (posCharacter < caret.Position());
+}
+
+SelectionSegment SelectionRange::Intersect(SelectionSegment check) const noexcept {
+	const SelectionSegment inOrder(caret, anchor);
+	if ((inOrder.start <= check.end) || (inOrder.end >= check.start)) {
+		SelectionSegment portion = check;
+		if (portion.start < inOrder.start)
+			portion.start = inOrder.start;
+		if (portion.end > inOrder.end)
+			portion.end = inOrder.end;
+		if (portion.start > portion.end)
+			return SelectionSegment();
+		else
+			return portion;
+	} else {
+		return SelectionSegment();
+	}
+}
+
+void SelectionRange::Swap() noexcept {
+	std::swap(caret, anchor);
+}
+
+bool SelectionRange::Trim(SelectionRange range) noexcept {
+	const SelectionPosition startRange = range.Start();
+	const SelectionPosition endRange = range.End();
+	SelectionPosition start = Start();
+	SelectionPosition end = End();
+	PLATFORM_ASSERT(start <= end);
+	PLATFORM_ASSERT(startRange <= endRange);
+	if ((startRange <= end) && (endRange >= start)) {
+		if ((start > startRange) && (end < endRange)) {
+			// Completely covered by range -> empty at start
+			end = start;
+		} else if ((start < startRange) && (end > endRange)) {
+			// Completely covers range -> empty at start
+			end = start;
+		} else if (start <= startRange) {
+			// Trim end
+			end = startRange;
+		} else { //
+			PLATFORM_ASSERT(end >= endRange);
+			// Trim start
+			start = endRange;
+		}
+		if (anchor > caret) {
+			caret = start;
+			anchor = end;
+		} else {
+			anchor = start;
+			caret = end;
+		}
+		return Empty();
+	} else {
+		return false;
+	}
+}
+
+// If range is all virtual collapse to start of virtual space
+void SelectionRange::MinimizeVirtualSpace() noexcept {
+	if (caret.Position() == anchor.Position()) {
+		Sci::Position virtualSpace = caret.VirtualSpace();
+		if (virtualSpace > anchor.VirtualSpace())
+			virtualSpace = anchor.VirtualSpace();
+		caret.SetVirtualSpace(virtualSpace);
+		anchor.SetVirtualSpace(virtualSpace);
+	}
+}
+
+Selection::Selection() : mainRange(0), moveExtends(false), tentativeMain(false), selType(SelTypes::stream) {
+	AddSelection(SelectionRange(SelectionPosition(0)));
+}
+
+Selection::~Selection() {
+}
+
+bool Selection::IsRectangular() const noexcept {
+	return (selType == SelTypes::rectangle) || (selType == SelTypes::thin);
+}
+
+Sci::Position Selection::MainCaret() const noexcept {
+	return ranges[mainRange].caret.Position();
+}
+
+Sci::Position Selection::MainAnchor() const noexcept {
+	return ranges[mainRange].anchor.Position();
+}
+
+SelectionRange &Selection::Rectangular() noexcept {
+	return rangeRectangular;
+}
+
+SelectionSegment Selection::Limits() const noexcept {
+	if (ranges.empty()) {
+		return SelectionSegment();
+	} else {
+		SelectionSegment sr(ranges[0].anchor, ranges[0].caret);
+		for (size_t i=1; i<ranges.size(); i++) {
+			sr.Extend(ranges[i].anchor);
+			sr.Extend(ranges[i].caret);
+		}
+		return sr;
+	}
+}
+
+SelectionSegment Selection::LimitsForRectangularElseMain() const {
+	if (IsRectangular()) {
+		return Limits();
+	} else {
+		return SelectionSegment(ranges[mainRange].caret, ranges[mainRange].anchor);
+	}
+}
+
+size_t Selection::Count() const noexcept {
+	return ranges.size();
+}
+
+size_t Selection::Main() const noexcept {
+	return mainRange;
+}
+
+void Selection::SetMain(size_t r) noexcept {
+	PLATFORM_ASSERT(r < ranges.size());
+	mainRange = r;
+}
+
+SelectionRange &Selection::Range(size_t r) noexcept {
+	return ranges[r];
+}
+
+const SelectionRange &Selection::Range(size_t r) const noexcept {
+	return ranges[r];
+}
+
+SelectionRange &Selection::RangeMain() noexcept {
+	return ranges[mainRange];
+}
+
+const SelectionRange &Selection::RangeMain() const noexcept {
+	return ranges[mainRange];
+}
+
+SelectionPosition Selection::Start() const noexcept {
+	if (IsRectangular()) {
+		return rangeRectangular.Start();
+	} else {
+		return ranges[mainRange].Start();
+	}
+}
+
+bool Selection::MoveExtends() const noexcept {
+	return moveExtends;
+}
+
+void Selection::SetMoveExtends(bool moveExtends_) noexcept {
+	moveExtends = moveExtends_;
+}
+
+bool Selection::Empty() const noexcept {
+	for (const SelectionRange &range : ranges) {
+		if (!range.Empty())
+			return false;
+	}
+	return true;
+}
+
+SelectionPosition Selection::Last() const noexcept {
+	SelectionPosition lastPosition;
+	for (const SelectionRange &range : ranges) {
+		if (lastPosition < range.caret)
+			lastPosition = range.caret;
+		if (lastPosition < range.anchor)
+			lastPosition = range.anchor;
+	}
+	return lastPosition;
+}
+
+Sci::Position Selection::Length() const noexcept {
+	Sci::Position len = 0;
+	for (const SelectionRange &range : ranges) {
+		len += range.Length();
+	}
+	return len;
+}
+
+void Selection::MovePositions(bool insertion, Sci::Position startChange, Sci::Position length) noexcept {
+	for (SelectionRange &range : ranges) {
+		range.MoveForInsertDelete(insertion, startChange, length);
+	}
+	if (selType == SelTypes::rectangle) {
+		rangeRectangular.MoveForInsertDelete(insertion, startChange, length);
+	}
+}
+
+void Selection::TrimSelection(SelectionRange range) noexcept {
+	for (size_t i=0; i<ranges.size();) {
+		if ((i != mainRange) && (ranges[i].Trim(range))) {
+			// Trimmed to empty so remove
+			for (size_t j=i; j<ranges.size()-1; j++) {
+				ranges[j] = ranges[j+1];
+				if (j == mainRange-1)
+					mainRange--;
+			}
+			ranges.pop_back();
+		} else {
+			i++;
+		}
+	}
+}
+
+void Selection::TrimOtherSelections(size_t r, SelectionRange range) noexcept {
+	for (size_t i = 0; i<ranges.size(); ++i) {
+		if (i != r) {
+			ranges[i].Trim(range);
+		}
+	}
+}
+
+void Selection::SetSelection(SelectionRange range) {
+	ranges.clear();
+	ranges.push_back(range);
+	mainRange = ranges.size() - 1;
+}
+
+void Selection::AddSelection(SelectionRange range) {
+	TrimSelection(range);
+	ranges.push_back(range);
+	mainRange = ranges.size() - 1;
+}
+
+void Selection::AddSelectionWithoutTrim(SelectionRange range) {
+	ranges.push_back(range);
+	mainRange = ranges.size() - 1;
+}
+
+void Selection::DropSelection(size_t r) {
+	if ((ranges.size() > 1) && (r < ranges.size())) {
+		size_t mainNew = mainRange;
+		if (mainNew >= r) {
+			if (mainNew == 0) {
+				mainNew = ranges.size() - 2;
+			} else {
+				mainNew--;
+			}
+		}
+		ranges.erase(ranges.begin() + r);
+		mainRange = mainNew;
+	}
+}
+
+void Selection::DropAdditionalRanges() {
+	SetSelection(RangeMain());
+}
+
+void Selection::TentativeSelection(SelectionRange range) {
+	if (!tentativeMain) {
+		rangesSaved = ranges;
+	}
+	ranges = rangesSaved;
+	AddSelection(range);
+	TrimSelection(ranges[mainRange]);
+	tentativeMain = true;
+}
+
+void Selection::CommitTentative() noexcept {
+	rangesSaved.clear();
+	tentativeMain = false;
+}
+
+InSelection Selection::RangeType(size_t r) const noexcept {
+	return r == Main() ? InSelection::inMain : InSelection::inAdditional;
+}
+
+InSelection Selection::CharacterInSelection(Sci::Position posCharacter) const noexcept {
+	for (size_t i=0; i<ranges.size(); i++) {
+		if (ranges[i].ContainsCharacter(posCharacter))
+			return RangeType(i);
+	}
+	return InSelection::inNone;
+}
+
+InSelection Selection::InSelectionForEOL(Sci::Position pos) const noexcept {
+	for (size_t i=0; i<ranges.size(); i++) {
+		if (!ranges[i].Empty() && (pos > ranges[i].Start().Position()) && (pos <= ranges[i].End().Position()))
+			return RangeType(i);
+	}
+	return InSelection::inNone;
+}
+
+Sci::Position Selection::VirtualSpaceFor(Sci::Position pos) const noexcept {
+	Sci::Position virtualSpace = 0;
+	for (const SelectionRange &range : ranges) {
+		if ((range.caret.Position() == pos) && (virtualSpace < range.caret.VirtualSpace()))
+			virtualSpace = range.caret.VirtualSpace();
+		if ((range.anchor.Position() == pos) && (virtualSpace < range.anchor.VirtualSpace()))
+			virtualSpace = range.anchor.VirtualSpace();
+	}
+	return virtualSpace;
+}
+
+void Selection::Clear() {
+	ranges.clear();
+	ranges.emplace_back();
+	mainRange = ranges.size() - 1;
+	selType = SelTypes::stream;
+	moveExtends = false;
+	ranges[mainRange].Reset();
+	rangeRectangular.Reset();
+}
+
+void Selection::RemoveDuplicates() {
+	for (size_t i=0; i<ranges.size()-1; i++) {
+		if (ranges[i].Empty()) {
+			size_t j=i+1;
+			while (j<ranges.size()) {
+				if (ranges[i] == ranges[j]) {
+					ranges.erase(ranges.begin() + j);
+					if (mainRange >= j)
+						mainRange--;
+				} else {
+					j++;
+				}
+			}
+		}
+	}
+}
+
+void Selection::RotateMain() noexcept {
+	mainRange = (mainRange + 1) % ranges.size();
+}
+
diff --git a/scite-app/scintilla/src/Selection.h b/scite-app/scintilla/src/Selection.h
new file mode 100644
index 0000000..7912d03
--- /dev/null
+++ b/scite-app/scintilla/src/Selection.h
@@ -0,0 +1,199 @@
+// Scintilla source code edit control
+/** @file Selection.h
+ ** Classes maintaining the selection.
+ **/
+// Copyright 2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SELECTION_H
+#define SELECTION_H
+
+namespace Scintilla::Internal {
+
+class SelectionPosition {
+	Sci::Position position;
+	Sci::Position virtualSpace;
+public:
+	explicit SelectionPosition(Sci::Position position_= Sci::invalidPosition, Sci::Position virtualSpace_=0) noexcept : position(position_), virtualSpace(virtualSpace_) {
+		PLATFORM_ASSERT(virtualSpace < 800000);
+		if (virtualSpace < 0)
+			virtualSpace = 0;
+	}
+	void Reset() noexcept {
+		position = 0;
+		virtualSpace = 0;
+	}
+	void MoveForInsertDelete(bool insertion, Sci::Position startChange, Sci::Position length, bool moveForEqual) noexcept;
+	bool operator ==(const SelectionPosition &other) const noexcept {
+		return position == other.position && virtualSpace == other.virtualSpace;
+	}
+	bool operator <(const SelectionPosition &other) const noexcept;
+	bool operator >(const SelectionPosition &other) const noexcept;
+	bool operator <=(const SelectionPosition &other) const noexcept;
+	bool operator >=(const SelectionPosition &other) const noexcept;
+	Sci::Position Position() const noexcept {
+		return position;
+	}
+	void SetPosition(Sci::Position position_) noexcept {
+		position = position_;
+		virtualSpace = 0;
+	}
+	Sci::Position VirtualSpace() const noexcept {
+		return virtualSpace;
+	}
+	void SetVirtualSpace(Sci::Position virtualSpace_) noexcept {
+		PLATFORM_ASSERT(virtualSpace_ < 800000);
+		if (virtualSpace_ >= 0)
+			virtualSpace = virtualSpace_;
+	}
+	void Add(Sci::Position increment) noexcept {
+		position = position + increment;
+	}
+	bool IsValid() const noexcept {
+		return position >= 0;
+	}
+};
+
+// Ordered range to make drawing simpler
+struct SelectionSegment {
+	SelectionPosition start;
+	SelectionPosition end;
+	SelectionSegment() noexcept : start(), end() {
+	}
+	SelectionSegment(SelectionPosition a, SelectionPosition b) noexcept {
+		if (a < b) {
+			start = a;
+			end = b;
+		} else {
+			start = b;
+			end = a;
+		}
+	}
+	bool Empty() const noexcept {
+		return start == end;
+	}
+	Sci::Position Length() const noexcept {
+		return end.Position() - start.Position();
+	}
+	void Extend(SelectionPosition p) noexcept {
+		if (start > p)
+			start = p;
+		if (end < p)
+			end = p;
+	}
+};
+
+struct SelectionRange {
+	SelectionPosition caret;
+	SelectionPosition anchor;
+
+	SelectionRange() noexcept : caret(), anchor() {
+	}
+	explicit SelectionRange(SelectionPosition single) noexcept : caret(single), anchor(single) {
+	}
+	explicit SelectionRange(Sci::Position single) noexcept : caret(single), anchor(single) {
+	}
+	SelectionRange(SelectionPosition caret_, SelectionPosition anchor_) noexcept : caret(caret_), anchor(anchor_) {
+	}
+	SelectionRange(Sci::Position caret_, Sci::Position anchor_) noexcept : caret(caret_), anchor(anchor_) {
+	}
+	bool Empty() const noexcept {
+		return anchor == caret;
+	}
+	Sci::Position Length() const noexcept;
+	// Sci::Position Width() const;	// Like Length but takes virtual space into account
+	bool operator ==(const SelectionRange &other) const noexcept {
+		return caret == other.caret && anchor == other.anchor;
+	}
+	bool operator <(const SelectionRange &other) const noexcept {
+		return caret < other.caret || ((caret == other.caret) && (anchor < other.anchor));
+	}
+	void Reset() noexcept {
+		anchor.Reset();
+		caret.Reset();
+	}
+	void ClearVirtualSpace() noexcept {
+		anchor.SetVirtualSpace(0);
+		caret.SetVirtualSpace(0);
+	}
+	void MoveForInsertDelete(bool insertion, Sci::Position startChange, Sci::Position length) noexcept;
+	bool Contains(Sci::Position pos) const noexcept;
+	bool Contains(SelectionPosition sp) const noexcept;
+	bool ContainsCharacter(Sci::Position posCharacter) const noexcept;
+	SelectionSegment Intersect(SelectionSegment check) const noexcept;
+	SelectionPosition Start() const noexcept {
+		return (anchor < caret) ? anchor : caret;
+	}
+	SelectionPosition End() const noexcept {
+		return (anchor < caret) ? caret : anchor;
+	}
+	void Swap() noexcept;
+	bool Trim(SelectionRange range) noexcept;
+	// If range is all virtual collapse to start of virtual space
+	void MinimizeVirtualSpace() noexcept;
+};
+
+// Deliberately an enum rather than an enum class to allow treating as bool
+enum InSelection { inNone, inMain, inAdditional };
+
+class Selection {
+	std::vector<SelectionRange> ranges;
+	std::vector<SelectionRange> rangesSaved;
+	SelectionRange rangeRectangular;
+	size_t mainRange;
+	bool moveExtends;
+	bool tentativeMain;
+public:
+	enum class SelTypes { none, stream, rectangle, lines, thin };
+	SelTypes selType;
+
+	Selection();
+	~Selection();
+	bool IsRectangular() const noexcept;
+	Sci::Position MainCaret() const noexcept;
+	Sci::Position MainAnchor() const noexcept;
+	SelectionRange &Rectangular() noexcept;
+	SelectionSegment Limits() const noexcept;
+	// This is for when you want to move the caret in response to a
+	// user direction command - for rectangular selections, use the range
+	// that covers all selected text otherwise return the main selection.
+	SelectionSegment LimitsForRectangularElseMain() const;
+	size_t Count() const noexcept;
+	size_t Main() const noexcept;
+	void SetMain(size_t r) noexcept;
+	SelectionRange &Range(size_t r) noexcept;
+	const SelectionRange &Range(size_t r) const noexcept;
+	SelectionRange &RangeMain() noexcept;
+	const SelectionRange &RangeMain() const noexcept;
+	SelectionPosition Start() const noexcept;
+	bool MoveExtends() const noexcept;
+	void SetMoveExtends(bool moveExtends_) noexcept;
+	bool Empty() const noexcept;
+	SelectionPosition Last() const noexcept;
+	Sci::Position Length() const noexcept;
+	void MovePositions(bool insertion, Sci::Position startChange, Sci::Position length) noexcept;
+	void TrimSelection(SelectionRange range) noexcept;
+	void TrimOtherSelections(size_t r, SelectionRange range) noexcept;
+	void SetSelection(SelectionRange range);
+	void AddSelection(SelectionRange range);
+	void AddSelectionWithoutTrim(SelectionRange range);
+	void DropSelection(size_t r);
+	void DropAdditionalRanges();
+	void TentativeSelection(SelectionRange range);
+	void CommitTentative() noexcept;
+	InSelection RangeType(size_t r) const noexcept;
+	InSelection CharacterInSelection(Sci::Position posCharacter) const noexcept;
+	InSelection InSelectionForEOL(Sci::Position pos) const noexcept;
+	Sci::Position VirtualSpaceFor(Sci::Position pos) const noexcept;
+	void Clear();
+	void RemoveDuplicates();
+	void RotateMain() noexcept;
+	bool Tentative() const noexcept { return tentativeMain; }
+	std::vector<SelectionRange> RangesCopy() const {
+		return ranges;
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/SparseVector.h b/scite-app/scintilla/src/SparseVector.h
new file mode 100644
index 0000000..3163616
--- /dev/null
+++ b/scite-app/scintilla/src/SparseVector.h
@@ -0,0 +1,213 @@
+// Scintilla source code edit control
+/** @file SparseVector.h
+ ** Hold data sparsely associated with elements in a range.
+ **/
+// Copyright 2016 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SPARSEVECTOR_H
+#define SPARSEVECTOR_H
+
+namespace Scintilla::Internal {
+
+// SparseVector is similar to RunStyles but is more efficient for cases where values occur
+// for one position instead of over a range of positions.
+// There are always elements at the start and end, so the element type should have
+// a reasonable empty value that will cause no problems.
+// The element type should have a noexcept default constructor as that allows methods to
+// be noexcept.
+template <typename T>
+class SparseVector {
+private:
+	std::unique_ptr<Partitioning<Sci::Position>> starts;
+	std::unique_ptr<SplitVector<T>> values;
+	T empty;	// Return from ValueAt when no element at a position.
+	void ClearValue(Sci::Position partition) noexcept {
+		values->SetValueAt(partition, T());
+	}
+public:
+	SparseVector() : empty() {
+		starts = std::make_unique<Partitioning<Sci::Position>>(8);
+		values = std::make_unique<SplitVector<T>>();
+		values->InsertEmpty(0, 2);
+	}
+	// Deleted so SparseVector objects can not be copied.
+	SparseVector(const SparseVector &) = delete;
+	SparseVector(SparseVector &&) = delete;
+	void operator=(const SparseVector &) = delete;
+	void operator=(SparseVector &&) = delete;
+	~SparseVector() {
+		starts.reset();
+		// starts dead here but not used by ClearValue.
+		for (Sci::Position part = 0; part < values->Length(); part++) {
+			ClearValue(part);
+		}
+		values.reset();
+	}
+	Sci::Position Length() const noexcept {
+		return starts->Length();
+	}
+	Sci::Position Elements() const noexcept {
+		return starts->Partitions();
+	}
+	Sci::Position PositionOfElement(Sci::Position element) const noexcept {
+		return starts->PositionFromPartition(element);
+	}
+	Sci::Position ElementFromPosition(Sci::Position position) const noexcept {
+		if (position < Length()) {
+			return starts->PartitionFromPosition(position);
+		} else {
+			return starts->Partitions();
+		}
+	}
+	const T& ValueAt(Sci::Position position) const noexcept {
+		assert(position <= Length());
+		const Sci::Position partition = ElementFromPosition(position);
+		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		if (startPartition == position) {
+			return values->ValueAt(partition);
+		} else {
+			return empty;
+		}
+	}
+	template <typename ParamType>
+	void SetValueAt(Sci::Position position, ParamType &&value) {
+		assert(position <= Length());
+		const Sci::Position partition = ElementFromPosition(position);
+		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		if (value == T()) {
+			// Setting the empty value is equivalent to deleting the position
+			if (position == 0) {
+				ClearValue(partition);
+			} else if (position == startPartition) {
+				// Currently an element at this position, so remove
+				ClearValue(partition);
+				starts->RemovePartition(partition);
+				values->Delete(partition);
+			}
+			// Else element remains empty
+		} else {
+			if (position == startPartition) {
+				// Already a value at this position, so replace
+				ClearValue(partition);
+				values->SetValueAt(partition, std::forward<ParamType>(value));
+			} else {
+				// Insert a new element
+				starts->InsertPartition(partition + 1, position);
+				values->Insert(partition + 1, std::forward<ParamType>(value));
+			}
+		}
+	}
+	void InsertSpace(Sci::Position position, Sci::Position insertLength) {
+		assert(position <= Length());
+		const Sci::Position partition = starts->PartitionFromPosition(position);
+		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		if (startPartition == position) {
+			const bool positionOccupied = values->ValueAt(partition) != T();
+			// Inserting at start of run so make previous longer
+			if (partition == 0) {
+				// Inserting at start of document so ensure start empty
+				if (positionOccupied) {
+					starts->InsertPartition(1, 0);
+					values->InsertEmpty(0, 1);
+				}
+				starts->InsertText(partition, insertLength);
+			} else {
+				if (positionOccupied) {
+					starts->InsertText(partition - 1, insertLength);
+				} else {
+					// Insert at end of run so do not extend style
+					starts->InsertText(partition, insertLength);
+				}
+			}
+		} else {
+			starts->InsertText(partition, insertLength);
+		}
+	}
+	void DeletePosition(Sci::Position position) {
+		assert(position < Length());
+		Sci::Position partition = starts->PartitionFromPosition(position);
+		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		if (startPartition == position) {
+			if (partition == 0) {
+				ClearValue(0);
+				if (starts->PositionFromPartition(1) == 1) {
+					// Removing all space of first partition, so remove next partition
+					// and move value if not last
+					if (Elements() > 1) {
+						starts->RemovePartition(partition + 1);
+						values->Delete(partition);
+					}
+				}
+			} else if (partition == starts->Partitions()) {
+				// This should not be possible
+				ClearValue(partition);
+				throw std::runtime_error("SparseVector: deleting end partition.");
+			} else {
+				ClearValue(partition);
+				starts->RemovePartition(partition);
+				values->Delete(partition);
+				// Its the previous partition now that gets smaller
+				partition--;
+			}
+		}
+		starts->InsertText(partition, -1);
+		Check();
+	}
+	void DeleteRange(Sci::Position position, Sci::Position deleteLength) {
+		// For now, delete elements in range - may want to leave value at start
+		// or combine onto position.
+		if (position > Length() || (deleteLength == 0)) {
+			return;
+		}
+		const Sci::Position positionEnd = position + deleteLength;
+		assert(positionEnd <= Length());
+		if (position == 0) {
+			// Remove all partitions in range, moving values to start
+			while ((Elements() > 1) && (starts->PositionFromPartition(1) <= deleteLength)) {
+				starts->RemovePartition(1);
+				values->Delete(0);
+			}
+			starts->InsertText(0, -deleteLength);
+			if (Length() == 0) {
+				ClearValue(0);
+			}
+		} else {
+			const Sci::Position partition = starts->PartitionFromPosition(position);
+			const bool atPartitionStart = position == starts->PositionFromPartition(partition);
+			const Sci::Position partitionDelete = partition + (atPartitionStart ? 0 : 1);
+			assert(partitionDelete > 0);
+			for (;;) {
+				const Sci::Position positionAtIndex = starts->PositionFromPartition(partitionDelete);
+				assert(position <= positionAtIndex);
+				if (positionAtIndex >= positionEnd) {
+					break;
+				}
+				assert(partitionDelete <= Elements());
+				starts->RemovePartition(partitionDelete);
+				values->Delete(partitionDelete);
+			}
+			starts->InsertText(partition - (atPartitionStart ? 1 : 0), -deleteLength);
+		}
+		Check();
+	}
+	Sci::Position IndexAfter(Sci::Position position) const noexcept {
+		assert(position < Length());
+		if (position < 0)
+			return 0;
+		const Sci::Position partition = starts->PartitionFromPosition(position);
+		return partition + 1;
+	}
+	void Check() const {
+#ifdef CHECK_CORRECTNESS
+		starts->Check();
+		if (starts->Partitions() != values->Length() - 1) {
+			throw std::runtime_error("SparseVector: Partitions and values different lengths.");
+		}
+#endif
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/SplitVector.h b/scite-app/scintilla/src/SplitVector.h
new file mode 100644
index 0000000..d233a50
--- /dev/null
+++ b/scite-app/scintilla/src/SplitVector.h
@@ -0,0 +1,351 @@
+// Scintilla source code edit control
+/** @file SplitVector.h
+ ** Main data structure for holding arrays that handle insertions
+ ** and deletions efficiently.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SPLITVECTOR_H
+#define SPLITVECTOR_H
+
+namespace Scintilla::Internal {
+
+template <typename T>
+class SplitVector {
+protected:
+	std::vector<T> body;
+	T empty;	/// Returned as the result of out-of-bounds access.
+	ptrdiff_t lengthBody;
+	ptrdiff_t part1Length;
+	ptrdiff_t gapLength;	/// invariant: gapLength == body.size() - lengthBody
+	ptrdiff_t growSize;
+
+	/// Move the gap to a particular position so that insertion and
+	/// deletion at that point will not require much copying and
+	/// hence be fast.
+	void GapTo(ptrdiff_t position) noexcept {
+		if (position != part1Length) {
+			try {
+				if (gapLength > 0) {	// If gap to move
+					// This can never fail but std::move and std::move_backward are not noexcept.
+					if (position < part1Length) {
+						// Moving the gap towards start so moving elements towards end
+						std::move_backward(
+							body.data() + position,
+							body.data() + part1Length,
+							body.data() + gapLength + part1Length);
+					} else {	// position > part1Length
+						// Moving the gap towards end so moving elements towards start
+						std::move(
+							body.data() + part1Length + gapLength,
+							body.data() + gapLength + position,
+							body.data() + part1Length);
+					}
+				}
+				part1Length = position;
+			} catch (...) {
+				// Ignore any exception
+			}
+		}
+	}
+
+	/// Check that there is room in the buffer for an insertion,
+	/// reallocating if more space needed.
+	void RoomFor(ptrdiff_t insertionLength) {
+		if (gapLength < insertionLength) {
+			while (growSize < static_cast<ptrdiff_t>(body.size() / 6))
+				growSize *= 2;
+			ReAllocate(body.size() + insertionLength + growSize);
+		}
+	}
+
+	void Init() {
+		body.clear();
+		body.shrink_to_fit();
+		lengthBody = 0;
+		part1Length = 0;
+		gapLength = 0;
+		growSize = 8;
+	}
+
+public:
+	/// Construct a split buffer.
+	SplitVector() : empty(), lengthBody(0), part1Length(0), gapLength(0), growSize(8) {
+	}
+
+	// Deleted so SplitVector objects can not be copied.
+	SplitVector(const SplitVector &) = delete;
+	SplitVector(SplitVector &&) = delete;
+	void operator=(const SplitVector &) = delete;
+	void operator=(SplitVector &&) = delete;
+
+	~SplitVector() {
+	}
+
+	ptrdiff_t GetGrowSize() const noexcept {
+		return growSize;
+	}
+
+	void SetGrowSize(ptrdiff_t growSize_) noexcept {
+		growSize = growSize_;
+	}
+
+	/// Reallocate the storage for the buffer to be newSize and
+	/// copy existing contents to the new buffer.
+	/// Must not be used to decrease the size of the buffer.
+	void ReAllocate(ptrdiff_t newSize) {
+		if (newSize < 0)
+			throw std::runtime_error("SplitVector::ReAllocate: negative size.");
+
+		if (newSize > static_cast<ptrdiff_t>(body.size())) {
+			// Move the gap to the end
+			GapTo(lengthBody);
+			gapLength += newSize - static_cast<ptrdiff_t>(body.size());
+			// RoomFor implements a growth strategy but so does vector::resize so
+			// ensure vector::resize allocates exactly the amount wanted by
+			// calling reserve first.
+			body.reserve(newSize);
+			body.resize(newSize);
+		}
+	}
+
+	/// Retrieve the element at a particular position.
+	/// Retrieving positions outside the range of the buffer returns empty or 0.
+	const T& ValueAt(ptrdiff_t position) const noexcept {
+		if (position < part1Length) {
+			if (position < 0) {
+				return empty;
+			} else {
+				return body[position];
+			}
+		} else {
+			if (position >= lengthBody) {
+				return empty;
+			} else {
+				return body[gapLength + position];
+			}
+		}
+	}
+
+	/// Set the element at a particular position.
+	/// Setting positions outside the range of the buffer performs no assignment
+	/// but asserts in debug builds.
+	template <typename ParamType>
+	void SetValueAt(ptrdiff_t position, ParamType&& v) noexcept {
+		if (position < part1Length) {
+			PLATFORM_ASSERT(position >= 0);
+			if (position < 0) {
+				;
+			} else {
+				body[position] = std::forward<ParamType>(v);
+			}
+		} else {
+			PLATFORM_ASSERT(position < lengthBody);
+			if (position >= lengthBody) {
+				;
+			} else {
+				body[gapLength + position] = std::forward<ParamType>(v);
+			}
+		}
+	}
+
+	/// Retrieve the element at a particular position.
+	/// The position must be within bounds or an assertion is triggered.
+	const T &operator[](ptrdiff_t position) const noexcept {
+		PLATFORM_ASSERT(position >= 0 && position < lengthBody);
+		if (position < part1Length) {
+			return body[position];
+		} else {
+			return body[gapLength + position];
+		}
+	}
+
+	/// Retrieve reference to the element at a particular position.
+	/// This, instead of the const variant, can be used to mutate in-place.
+	/// The position must be within bounds or an assertion is triggered.
+	T &operator[](ptrdiff_t position) noexcept {
+		PLATFORM_ASSERT(position >= 0 && position < lengthBody);
+		if (position < part1Length) {
+			return body[position];
+		} else {
+			return body[gapLength + position];
+		}
+	}
+
+	/// Retrieve the length of the buffer.
+	ptrdiff_t Length() const noexcept {
+		return lengthBody;
+	}
+
+	/// Insert a single value into the buffer.
+	/// Inserting at positions outside the current range fails.
+	void Insert(ptrdiff_t position, T v) {
+		PLATFORM_ASSERT((position >= 0) && (position <= lengthBody));
+		if ((position < 0) || (position > lengthBody)) {
+			return;
+		}
+		RoomFor(1);
+		GapTo(position);
+		body[part1Length] = std::move(v);
+		lengthBody++;
+		part1Length++;
+		gapLength--;
+	}
+
+	/// Insert a number of elements into the buffer setting their value.
+	/// Inserting at positions outside the current range fails.
+	void InsertValue(ptrdiff_t position, ptrdiff_t insertLength, T v) {
+		PLATFORM_ASSERT((position >= 0) && (position <= lengthBody));
+		if (insertLength > 0) {
+			if ((position < 0) || (position > lengthBody)) {
+				return;
+			}
+			RoomFor(insertLength);
+			GapTo(position);
+			std::fill(body.data() + part1Length, body.data() + part1Length + insertLength, v);
+			lengthBody += insertLength;
+			part1Length += insertLength;
+			gapLength -= insertLength;
+		}
+	}
+
+	/// Add some new empty elements.
+	/// InsertValue is good for value objects but not for unique_ptr objects
+	/// since they can only be moved from once.
+	/// Callers can write to the returned pointer to transform inputs without copies.
+	T *InsertEmpty(ptrdiff_t position, ptrdiff_t insertLength) {
+		PLATFORM_ASSERT((position >= 0) && (position <= lengthBody));
+		if (insertLength > 0) {
+			if ((position < 0) || (position > lengthBody)) {
+				return nullptr;
+			}
+			RoomFor(insertLength);
+			GapTo(position);
+			for (ptrdiff_t elem = part1Length; elem < part1Length + insertLength; elem++) {
+				T emptyOne = {};
+				body[elem] = std::move(emptyOne);
+			}
+			lengthBody += insertLength;
+			part1Length += insertLength;
+			gapLength -= insertLength;
+		}
+		return body.data() + position;
+	}
+
+	/// Ensure at least length elements allocated,
+	/// appending zero valued elements if needed.
+	void EnsureLength(ptrdiff_t wantedLength) {
+		if (Length() < wantedLength) {
+			InsertEmpty(Length(), wantedLength - Length());
+		}
+	}
+
+	/// Insert text into the buffer from an array.
+	void InsertFromArray(ptrdiff_t positionToInsert, const T s[], ptrdiff_t positionFrom, ptrdiff_t insertLength) {
+		PLATFORM_ASSERT((positionToInsert >= 0) && (positionToInsert <= lengthBody));
+		if (insertLength > 0) {
+			if ((positionToInsert < 0) || (positionToInsert > lengthBody)) {
+				return;
+			}
+			RoomFor(insertLength);
+			GapTo(positionToInsert);
+			std::copy(s + positionFrom, s + positionFrom + insertLength, body.data() + part1Length);
+			lengthBody += insertLength;
+			part1Length += insertLength;
+			gapLength -= insertLength;
+		}
+	}
+
+	/// Delete one element from the buffer.
+	void Delete(ptrdiff_t position) {
+		PLATFORM_ASSERT((position >= 0) && (position < lengthBody));
+		DeleteRange(position, 1);
+	}
+
+	/// Delete a range from the buffer.
+	/// Deleting positions outside the current range fails.
+	/// Cannot be noexcept as vector::shrink_to_fit may be called and it may throw.
+	void DeleteRange(ptrdiff_t position, ptrdiff_t deleteLength) {
+		PLATFORM_ASSERT((position >= 0) && (position + deleteLength <= lengthBody));
+		if ((position < 0) || ((position + deleteLength) > lengthBody)) {
+			return;
+		}
+		if ((position == 0) && (deleteLength == lengthBody)) {
+			// Full deallocation returns storage and is faster
+			Init();
+		} else if (deleteLength > 0) {
+			GapTo(position);
+			lengthBody -= deleteLength;
+			gapLength += deleteLength;
+		}
+	}
+
+	/// Delete all the buffer contents.
+	void DeleteAll() {
+		DeleteRange(0, lengthBody);
+	}
+
+	/// Retrieve a range of elements into an array
+	void GetRange(T *buffer, ptrdiff_t position, ptrdiff_t retrieveLength) const {
+		// Split into up to 2 ranges, before and after the split then use memcpy on each.
+		ptrdiff_t range1Length = 0;
+		if (position < part1Length) {
+			const ptrdiff_t part1AfterPosition = part1Length - position;
+			range1Length = retrieveLength;
+			if (range1Length > part1AfterPosition)
+				range1Length = part1AfterPosition;
+		}
+		std::copy(body.data() + position, body.data() + position + range1Length, buffer);
+		buffer += range1Length;
+		position = position + range1Length + gapLength;
+		const ptrdiff_t range2Length = retrieveLength - range1Length;
+		std::copy(body.data() + position, body.data() + position + range2Length, buffer);
+	}
+
+	/// Compact the buffer and return a pointer to the first element.
+	/// Also ensures there is an empty element beyond logical end in case its
+	/// passed to a function expecting a NUL terminated string.
+	T *BufferPointer() {
+		RoomFor(1);
+		GapTo(lengthBody);
+		T emptyOne = {};
+		body[lengthBody] = std::move(emptyOne);
+		return body.data();
+	}
+
+	/// Return a pointer to a range of elements, first rearranging the buffer if
+	/// needed to make that range contiguous.
+	T *RangePointer(ptrdiff_t position, ptrdiff_t rangeLength) noexcept {
+		if (position < part1Length) {
+			if ((position + rangeLength) > part1Length) {
+				// Range overlaps gap, so move gap to start of range.
+				GapTo(position);
+				return body.data() + position + gapLength;
+			} else {
+				return body.data() + position;
+			}
+		} else {
+			return body.data() + position + gapLength;
+		}
+	}
+
+	/// Return a pointer to a single element.
+	/// Does not rearrange the buffer.
+	const T *ElementPointer(ptrdiff_t position) const noexcept {
+		if (position < part1Length) {
+			return body.data() + position;
+		} else {
+			return body.data() + position + gapLength;
+		}
+	}
+
+	/// Return the position of the gap within the buffer.
+	ptrdiff_t GapPosition() const noexcept {
+		return part1Length;
+	}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/Style.cxx b/scite-app/scintilla/src/Style.cxx
new file mode 100644
index 0000000..d71b62d
--- /dev/null
+++ b/scite-app/scintilla/src/Style.cxx
@@ -0,0 +1,153 @@
+// Scintilla source code edit control
+/** @file Style.cxx
+ ** Defines the font and colour style for a class of text.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Style.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+bool FontSpecification::operator==(const FontSpecification &other) const noexcept {
+	return fontName == other.fontName &&
+	       weight == other.weight &&
+	       italic == other.italic &&
+	       size == other.size &&
+	       characterSet == other.characterSet &&
+	       extraFontFlag == other.extraFontFlag;
+}
+
+bool FontSpecification::operator<(const FontSpecification &other) const noexcept {
+	if (fontName != other.fontName)
+		return fontName < other.fontName;
+	if (weight != other.weight)
+		return weight < other.weight;
+	if (italic != other.italic)
+		return !italic;
+	if (size != other.size)
+		return size < other.size;
+	if (characterSet != other.characterSet)
+		return characterSet < other.characterSet;
+	if (extraFontFlag != other.extraFontFlag)
+		return extraFontFlag < other.extraFontFlag;
+	return false;
+}
+
+FontMeasurements::FontMeasurements() noexcept {
+	ClearMeasurements();
+}
+
+void FontMeasurements::ClearMeasurements() noexcept {
+	ascent = 1;
+	descent = 1;
+	capitalHeight = 1;
+	aveCharWidth = 1;
+	spaceWidth = 1;
+	sizeZoomed = 2;
+}
+
+Style::Style() : FontSpecification() {
+	Clear(ColourRGBA(0, 0, 0), ColourRGBA(0xff, 0xff, 0xff),
+	      Platform::DefaultFontSize() * FontSizeMultiplier, nullptr, CharacterSet::Default,
+	      FontWeight::Normal, false, false, false, CaseForce::mixed, true, true, false);
+}
+
+Style::Style(const Style &source) noexcept : FontSpecification(), FontMeasurements() {
+	Clear(ColourRGBA(0, 0, 0), ColourRGBA(0xff, 0xff, 0xff),
+	      0, nullptr, CharacterSet::Ansi,
+	      FontWeight::Normal, false, false, false, CaseForce::mixed, true, true, false);
+	fore = source.fore;
+	back = source.back;
+	characterSet = source.characterSet;
+	weight = source.weight;
+	italic = source.italic;
+	size = source.size;
+	fontName = source.fontName;
+	eolFilled = source.eolFilled;
+	underline = source.underline;
+	caseForce = source.caseForce;
+	visible = source.visible;
+	changeable = source.changeable;
+	hotspot = source.hotspot;
+}
+
+Style::~Style() = default;
+
+Style &Style::operator=(const Style &source) noexcept {
+	if (this == &source)
+		return * this;
+	Clear(ColourRGBA(0, 0, 0), ColourRGBA(0xff, 0xff, 0xff),
+	      0, nullptr, CharacterSet::Default,
+	      FontWeight::Normal, false, false, false, CaseForce::mixed, true, true, false);
+	fore = source.fore;
+	back = source.back;
+	characterSet = source.characterSet;
+	weight = source.weight;
+	italic = source.italic;
+	size = source.size;
+	fontName = source.fontName;
+	eolFilled = source.eolFilled;
+	underline = source.underline;
+	caseForce = source.caseForce;
+	visible = source.visible;
+	changeable = source.changeable;
+	return *this;
+}
+
+void Style::Clear(ColourRGBA fore_, ColourRGBA back_, int size_,
+        const char *fontName_, CharacterSet characterSet_,
+        FontWeight weight_, bool italic_, bool eolFilled_,
+        bool underline_, CaseForce caseForce_,
+        bool visible_, bool changeable_, bool hotspot_) noexcept {
+	fore = fore_;
+	back = back_;
+	characterSet = characterSet_;
+	weight = weight_;
+	italic = italic_;
+	size = size_;
+	fontName = fontName_;
+	eolFilled = eolFilled_;
+	underline = underline_;
+	caseForce = caseForce_;
+	visible = visible_;
+	changeable = changeable_;
+	hotspot = hotspot_;
+	font.reset();
+	FontMeasurements::ClearMeasurements();
+}
+
+void Style::ClearTo(const Style &source) noexcept {
+	Clear(
+	    source.fore,
+	    source.back,
+	    source.size,
+	    source.fontName,
+	    source.characterSet,
+	    source.weight,
+	    source.italic,
+	    source.eolFilled,
+	    source.underline,
+	    source.caseForce,
+	    source.visible,
+	    source.changeable,
+	    source.hotspot);
+}
+
+void Style::Copy(std::shared_ptr<Font> font_, const FontMeasurements &fm_) noexcept {
+	font = std::move(font_);
+	(FontMeasurements &)(*this) = fm_;
+}
diff --git a/scite-app/scintilla/src/Style.h b/scite-app/scintilla/src/Style.h
new file mode 100644
index 0000000..8153d15
--- /dev/null
+++ b/scite-app/scintilla/src/Style.h
@@ -0,0 +1,78 @@
+// Scintilla source code edit control
+/** @file Style.h
+ ** Defines the font and colour style for a class of text.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STYLE_H
+#define STYLE_H
+
+namespace Scintilla::Internal {
+
+struct FontSpecification {
+	const char *fontName;
+	Scintilla::FontWeight weight;
+	bool italic;
+	int size;
+	Scintilla::CharacterSet characterSet;
+	Scintilla::FontQuality extraFontFlag;
+	FontSpecification() noexcept :
+		fontName(nullptr),
+		weight(Scintilla::FontWeight::Normal),
+		italic(false),
+		size(10 * Scintilla::FontSizeMultiplier),
+		characterSet(Scintilla::CharacterSet::Ansi),
+		extraFontFlag(Scintilla::FontQuality::QualityDefault) {
+	}
+	bool operator==(const FontSpecification &other) const noexcept;
+	bool operator<(const FontSpecification &other) const noexcept;
+};
+
+struct FontMeasurements {
+	unsigned int ascent;
+	unsigned int descent;
+	XYPOSITION capitalHeight;	// Top of capital letter to baseline: ascent - internal leading
+	XYPOSITION aveCharWidth;
+	XYPOSITION spaceWidth;
+	int sizeZoomed;
+	FontMeasurements() noexcept;
+	void ClearMeasurements() noexcept;
+};
+
+/**
+ */
+class Style : public FontSpecification, public FontMeasurements {
+public:
+	ColourRGBA fore;
+	ColourRGBA back;
+	bool eolFilled;
+	bool underline;
+	enum class CaseForce {mixed, upper, lower, camel};
+	CaseForce caseForce;
+	bool visible;
+	bool changeable;
+	bool hotspot;
+
+	std::shared_ptr<Font> font;
+
+	Style();
+	Style(const Style &source) noexcept;
+	Style(Style &&) noexcept = default;
+	~Style();
+	Style &operator=(const Style &source) noexcept;
+	Style &operator=(Style &&) = delete;
+	void Clear(ColourRGBA fore_, ColourRGBA back_,
+	           int size_,
+	           const char *fontName_, Scintilla::CharacterSet characterSet_,
+	           Scintilla::FontWeight weight_, bool italic_, bool eolFilled_,
+	           bool underline_, CaseForce caseForce_,
+	           bool visible_, bool changeable_, bool hotspot_) noexcept;
+	void ClearTo(const Style &source) noexcept;
+	void Copy(std::shared_ptr<Font> font_, const FontMeasurements &fm_) noexcept;
+	bool IsProtected() const noexcept { return !(changeable && visible);}
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/UniConversion.cxx b/scite-app/scintilla/src/UniConversion.cxx
new file mode 100644
index 0000000..91aea6c
--- /dev/null
+++ b/scite-app/scintilla/src/UniConversion.cxx
@@ -0,0 +1,404 @@
+// Scintilla source code edit control
+/** @file UniConversion.cxx
+ ** Functions to handle UTF-8 and UTF-16 strings.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+
+#include "UniConversion.h"
+
+namespace Scintilla::Internal {
+
+size_t UTF8Length(std::wstring_view wsv) noexcept {
+	size_t len = 0;
+	for (size_t i = 0; i < wsv.length() && wsv[i];) {
+		const unsigned int uch = wsv[i];
+		if (uch < 0x80) {
+			len++;
+		} else if (uch < 0x800) {
+			len += 2;
+		} else if ((uch >= SURROGATE_LEAD_FIRST) &&
+			(uch <= SURROGATE_TRAIL_LAST)) {
+			len += 4;
+			i++;
+		} else {
+			len += 3;
+		}
+		i++;
+	}
+	return len;
+}
+
+size_t UTF8PositionFromUTF16Position(std::string_view u8Text, size_t positionUTF16) noexcept {
+	size_t positionUTF8 = 0;
+	for (size_t lengthUTF16 = 0; (positionUTF8 < u8Text.length()) && (lengthUTF16 < positionUTF16);) {
+		const unsigned char uch = u8Text[positionUTF8];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		lengthUTF16 += UTF16LengthFromUTF8ByteCount(byteCount);
+		positionUTF8 += byteCount;
+	}
+
+	return positionUTF8;
+}
+
+void UTF8FromUTF16(std::wstring_view wsv, char *putf, size_t len) noexcept {
+	size_t k = 0;
+	for (size_t i = 0; i < wsv.length() && wsv[i];) {
+		const unsigned int uch = wsv[i];
+		if (uch < 0x80) {
+			putf[k++] = static_cast<char>(uch);
+		} else if (uch < 0x800) {
+			putf[k++] = static_cast<char>(0xC0 | (uch >> 6));
+			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+		} else if ((uch >= SURROGATE_LEAD_FIRST) &&
+			(uch <= SURROGATE_TRAIL_LAST)) {
+			// Half a surrogate pair
+			i++;
+			const unsigned int xch = 0x10000 + ((uch & 0x3ff) << 10) + (wsv[i] & 0x3ff);
+			putf[k++] = static_cast<char>(0xF0 | (xch >> 18));
+			putf[k++] = static_cast<char>(0x80 | ((xch >> 12) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | ((xch >> 6) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | (xch & 0x3f));
+		} else {
+			putf[k++] = static_cast<char>(0xE0 | (uch >> 12));
+			putf[k++] = static_cast<char>(0x80 | ((uch >> 6) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+		}
+		i++;
+	}
+	if (k < len)
+		putf[k] = '\0';
+}
+
+void UTF8FromUTF32Character(int uch, char *putf) noexcept {
+	size_t k = 0;
+	if (uch < 0x80) {
+		putf[k++] = static_cast<char>(uch);
+	} else if (uch < 0x800) {
+		putf[k++] = static_cast<char>(0xC0 | (uch >> 6));
+		putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+	} else if (uch < 0x10000) {
+		putf[k++] = static_cast<char>(0xE0 | (uch >> 12));
+		putf[k++] = static_cast<char>(0x80 | ((uch >> 6) & 0x3f));
+		putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+	} else {
+		putf[k++] = static_cast<char>(0xF0 | (uch >> 18));
+		putf[k++] = static_cast<char>(0x80 | ((uch >> 12) & 0x3f));
+		putf[k++] = static_cast<char>(0x80 | ((uch >> 6) & 0x3f));
+		putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+	}
+	putf[k] = '\0';
+}
+
+size_t UTF16Length(std::string_view svu8) noexcept {
+	size_t ulen = 0;
+	for (size_t i = 0; i< svu8.length();) {
+		const unsigned char ch = svu8[i];
+		const unsigned int byteCount = UTF8BytesOfLead[ch];
+		const unsigned int utf16Len = UTF16LengthFromUTF8ByteCount(byteCount);
+		i += byteCount;
+		ulen += (i > svu8.length()) ? 1 : utf16Len;
+	}
+	return ulen;
+}
+
+constexpr unsigned char TrailByteValue(unsigned char c) {
+	// The top 2 bits are 0b10 to indicate a trail byte.
+	// The lower 6 bits contain the value.
+	return c & 0b0011'1111;
+}
+
+size_t UTF16FromUTF8(std::string_view svu8, wchar_t *tbuf, size_t tlen) {
+	size_t ui = 0;
+	for (size_t i = 0; i < svu8.length();) {
+		unsigned char ch = svu8[i];
+		const unsigned int byteCount = UTF8BytesOfLead[ch];
+		unsigned int value;
+
+		if (i + byteCount > svu8.length()) {
+			// Trying to read past end but still have space to write
+			if (ui < tlen) {
+				tbuf[ui] = ch;
+				ui++;
+			}
+			break;
+		}
+
+		const size_t outLen = UTF16LengthFromUTF8ByteCount(byteCount);
+		if (ui + outLen > tlen) {
+			throw std::runtime_error("UTF16FromUTF8: attempted write beyond end");
+		}
+
+		i++;
+		switch (byteCount) {
+		case 1:
+			tbuf[ui] = ch;
+			break;
+		case 2:
+			value = (ch & 0x1F) << 6;
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			tbuf[ui] = static_cast<wchar_t>(value);
+			break;
+		case 3:
+			value = (ch & 0xF) << 12;
+			ch = svu8[i++];
+			value += (TrailByteValue(ch) << 6);
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			tbuf[ui] = static_cast<wchar_t>(value);
+			break;
+		default:
+			// Outside the BMP so need two surrogates
+			value = (ch & 0x7) << 18;
+			ch = svu8[i++];
+			value += TrailByteValue(ch) << 12;
+			ch = svu8[i++];
+			value += TrailByteValue(ch) << 6;
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			tbuf[ui] = static_cast<wchar_t>(((value - 0x10000) >> 10) + SURROGATE_LEAD_FIRST);
+			ui++;
+			tbuf[ui] = static_cast<wchar_t>((value & 0x3ff) + SURROGATE_TRAIL_FIRST);
+			break;
+		}
+		ui++;
+	}
+	return ui;
+}
+
+size_t UTF32Length(std::string_view svu8) noexcept {
+	size_t ulen = 0;
+	for (size_t i = 0; i < svu8.length();) {
+		const unsigned char ch = svu8[i];
+		const unsigned int byteCount = UTF8BytesOfLead[ch];
+		i += byteCount;
+		ulen++;
+	}
+	return ulen;
+}
+
+size_t UTF32FromUTF8(std::string_view svu8, unsigned int *tbuf, size_t tlen) {
+	size_t ui = 0;
+	for (size_t i = 0; i < svu8.length();) {
+		unsigned char ch = svu8[i];
+		const unsigned int byteCount = UTF8BytesOfLead[ch];
+		unsigned int value;
+
+		if (i + byteCount > svu8.length()) {
+			// Trying to read past end but still have space to write
+			if (ui < tlen) {
+				tbuf[ui] = ch;
+				ui++;
+			}
+			break;
+		}
+
+		if (ui == tlen) {
+			throw std::runtime_error("UTF32FromUTF8: attempted write beyond end");
+		}
+
+		i++;
+		switch (byteCount) {
+		case 1:
+			value = ch;
+			break;
+		case 2:
+			value = (ch & 0x1F) << 6;
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			break;
+		case 3:
+			value = (ch & 0xF) << 12;
+			ch = svu8[i++];
+			value += TrailByteValue(ch) << 6;
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			break;
+		default:
+			value = (ch & 0x7) << 18;
+			ch = svu8[i++];
+			value += TrailByteValue(ch) << 12;
+			ch = svu8[i++];
+			value += TrailByteValue(ch) << 6;
+			ch = svu8[i++];
+			value += TrailByteValue(ch);
+			break;
+		}
+		tbuf[ui] = value;
+		ui++;
+	}
+	return ui;
+}
+
+std::wstring WStringFromUTF8(std::string_view svu8) {
+	if constexpr (sizeof(wchar_t) == 2) {
+		const size_t len16 = UTF16Length(svu8);
+		std::wstring ws(len16, 0);
+		UTF16FromUTF8(svu8, &ws[0], len16);
+		return ws;
+	} else {
+		const size_t len32 = UTF32Length(svu8);
+		std::wstring ws(len32, 0);
+		UTF32FromUTF8(svu8, reinterpret_cast<unsigned int *>(&ws[0]), len32);
+		return ws;
+	}
+}
+
+unsigned int UTF16FromUTF32Character(unsigned int val, wchar_t *tbuf) noexcept {
+	if (val < SUPPLEMENTAL_PLANE_FIRST) {
+		tbuf[0] = static_cast<wchar_t>(val);
+		return 1;
+	} else {
+		tbuf[0] = static_cast<wchar_t>(((val - SUPPLEMENTAL_PLANE_FIRST) >> 10) + SURROGATE_LEAD_FIRST);
+		tbuf[1] = static_cast<wchar_t>((val & 0x3ff) + SURROGATE_TRAIL_FIRST);
+		return 2;
+	}
+}
+
+const unsigned char UTF8BytesOfLead[256] = {
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 00 - 0F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 10 - 1F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 20 - 2F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 30 - 3F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 40 - 4F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 50 - 5F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 60 - 6F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 70 - 7F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 80 - 8F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 90 - 9F
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // A0 - AF
+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // B0 - BF
+1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0 - CF
+2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // D0 - DF
+3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // E0 - EF
+4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // F0 - FF
+};
+
+// Return both the width of the first character in the string and a status
+// saying whether it is valid or invalid.
+// Most invalid sequences return a width of 1 so are treated as isolated bytes but
+// the non-characters *FFFE, *FFFF and FDD0 .. FDEF return 3 or 4 as they can be
+// reasonably treated as code points in some circumstances. They will, however,
+// not have associated glyphs.
+int UTF8Classify(const unsigned char *us, size_t len) noexcept {
+	// For the rules: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+	if (us[0] < 0x80) {
+		// ASCII
+		return 1;
+	}
+
+	const size_t byteCount = UTF8BytesOfLead[us[0]];
+	if (byteCount == 1 || byteCount > len) {
+		// Invalid lead byte
+		return UTF8MaskInvalid | 1;
+	}
+
+	if (!UTF8IsTrailByte(us[1])) {
+		// Invalid trail byte
+		return UTF8MaskInvalid | 1;
+	}
+
+	switch (byteCount) {
+	case 2:
+		return 2;
+
+	case 3:
+		if (UTF8IsTrailByte(us[2])) {
+			if ((*us == 0xe0) && ((us[1] & 0xe0) == 0x80)) {
+				// Overlong
+				return UTF8MaskInvalid | 1;
+			}
+			if ((*us == 0xed) && ((us[1] & 0xe0) == 0xa0)) {
+				// Surrogate
+				return UTF8MaskInvalid | 1;
+			}
+			if ((*us == 0xef) && (us[1] == 0xbf) && (us[2] == 0xbe)) {
+				// U+FFFE non-character - 3 bytes long
+				return UTF8MaskInvalid | 3;
+			}
+			if ((*us == 0xef) && (us[1] == 0xbf) && (us[2] == 0xbf)) {
+				// U+FFFF non-character - 3 bytes long
+				return UTF8MaskInvalid | 3;
+			}
+			if ((*us == 0xef) && (us[1] == 0xb7) && (((us[2] & 0xf0) == 0x90) || ((us[2] & 0xf0) == 0xa0))) {
+				// U+FDD0 .. U+FDEF
+				return UTF8MaskInvalid | 3;
+			}
+			return 3;
+		}
+		break;
+
+	default:
+		if (UTF8IsTrailByte(us[2]) && UTF8IsTrailByte(us[3])) {
+			if (((us[1] & 0xf) == 0xf) && (us[2] == 0xbf) && ((us[3] == 0xbe) || (us[3] == 0xbf))) {
+				// *FFFE or *FFFF non-character
+				return UTF8MaskInvalid | 4;
+			}
+			if (*us == 0xf4) {
+				// Check if encoding a value beyond the last Unicode character 10FFFF
+				if (us[1] > 0x8f) {
+					return UTF8MaskInvalid | 1;
+				}
+			} else if ((*us == 0xf0) && ((us[1] & 0xf0) == 0x80)) {
+				// Overlong
+				return UTF8MaskInvalid | 1;
+			}
+			return 4;
+		}
+		break;
+	}
+
+	return UTF8MaskInvalid | 1;
+}
+
+int UTF8DrawBytes(const unsigned char *us, int len) noexcept {
+	const int utf8StatusNext = UTF8Classify(us, len);
+	return (utf8StatusNext & UTF8MaskInvalid) ? 1 : (utf8StatusNext & UTF8MaskWidth);
+}
+
+bool UTF8IsValid(std::string_view svu8) noexcept {
+	const unsigned char *us = reinterpret_cast<const unsigned char *>(svu8.data());
+	size_t remaining = svu8.length();
+	while (remaining > 0) {
+		const int utf8Status = UTF8Classify(us, remaining);
+		if (utf8Status & UTF8MaskInvalid) {
+			return false;
+		} else {
+			const int lenChar = utf8Status & UTF8MaskWidth;
+			us += lenChar;
+			remaining -= lenChar;
+		}
+	}
+	return remaining == 0;
+}
+
+// Replace invalid bytes in UTF-8 with the replacement character
+std::string FixInvalidUTF8(const std::string &text) {
+	std::string result;
+	const char *s = text.c_str();
+	size_t remaining = text.size();
+	while (remaining > 0) {
+		const int utf8Status = UTF8Classify(reinterpret_cast<const unsigned char *>(s), remaining);
+		if (utf8Status & UTF8MaskInvalid) {
+			// Replacement character 0xFFFD = UTF8:"efbfbd".
+			result.append("\xef\xbf\xbd");
+			s++;
+			remaining--;
+		} else {
+			const size_t len = utf8Status & UTF8MaskWidth;
+			result.append(s, len);
+			s += len;
+			remaining -= len;
+		}
+	}
+	return result;
+}
+
+}
diff --git a/scite-app/scintilla/src/UniConversion.h b/scite-app/scintilla/src/UniConversion.h
new file mode 100644
index 0000000..ead7aae
--- /dev/null
+++ b/scite-app/scintilla/src/UniConversion.h
@@ -0,0 +1,106 @@
+// Scintilla source code edit control
+/** @file UniConversion.h
+ ** Functions to handle UTF-8 and UTF-16 strings.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef UNICONVERSION_H
+#define UNICONVERSION_H
+
+namespace Scintilla::Internal {
+
+constexpr int UTF8MaxBytes = 4;
+
+constexpr int unicodeReplacementChar = 0xFFFD;
+
+size_t UTF8Length(std::wstring_view wsv) noexcept;
+size_t UTF8PositionFromUTF16Position(std::string_view u8Text, size_t positionUTF16) noexcept;
+void UTF8FromUTF16(std::wstring_view wsv, char *putf, size_t len) noexcept;
+void UTF8FromUTF32Character(int uch, char *putf) noexcept;
+size_t UTF16Length(std::string_view svu8) noexcept;
+size_t UTF16FromUTF8(std::string_view svu8, wchar_t *tbuf, size_t tlen);
+size_t UTF32Length(std::string_view svu8) noexcept;
+size_t UTF32FromUTF8(std::string_view svu8, unsigned int *tbuf, size_t tlen);
+// WStringFromUTF8 does the right thing when wchar_t is 2 or 4 bytes so
+// works on both Windows and Unix.
+std::wstring WStringFromUTF8(std::string_view svu8);
+unsigned int UTF16FromUTF32Character(unsigned int val, wchar_t *tbuf) noexcept;
+bool UTF8IsValid(std::string_view svu8) noexcept;
+std::string FixInvalidUTF8(const std::string &text);
+
+extern const unsigned char UTF8BytesOfLead[256];
+
+inline int UnicodeFromUTF8(const unsigned char *us) noexcept {
+	switch (UTF8BytesOfLead[us[0]]) {
+	case 1:
+		return us[0];
+	case 2:
+		return ((us[0] & 0x1F) << 6) + (us[1] & 0x3F);
+	case 3:
+		return ((us[0] & 0xF) << 12) + ((us[1] & 0x3F) << 6) + (us[2] & 0x3F);
+	default:
+		return ((us[0] & 0x7) << 18) + ((us[1] & 0x3F) << 12) + ((us[2] & 0x3F) << 6) + (us[3] & 0x3F);
+	}
+}
+
+inline constexpr bool UTF8IsTrailByte(unsigned char ch) noexcept {
+	return (ch >= 0x80) && (ch < 0xc0);
+}
+
+inline constexpr bool UTF8IsAscii(unsigned char ch) noexcept {
+	return ch < 0x80;
+}
+
+inline constexpr bool UTF8IsAscii(char ch) noexcept {
+	const unsigned char uch = ch;
+	return uch < 0x80;
+}
+
+enum { UTF8MaskWidth=0x7, UTF8MaskInvalid=0x8 };
+int UTF8Classify(const unsigned char *us, size_t len) noexcept;
+inline int UTF8Classify(std::string_view sv) noexcept {
+	return UTF8Classify(reinterpret_cast<const unsigned char *>(sv.data()), sv.length());
+}
+
+// Similar to UTF8Classify but returns a length of 1 for invalid bytes
+// instead of setting the invalid flag
+int UTF8DrawBytes(const unsigned char *us, int len) noexcept;
+
+// Line separator is U+2028 \xe2\x80\xa8
+// Paragraph separator is U+2029 \xe2\x80\xa9
+constexpr int UTF8SeparatorLength = 3;
+inline bool UTF8IsSeparator(const unsigned char *us) noexcept {
+	return (us[0] == 0xe2) && (us[1] == 0x80) && ((us[2] == 0xa8) || (us[2] == 0xa9));
+}
+
+// NEL is U+0085 \xc2\x85
+constexpr int UTF8NELLength = 2;
+inline bool UTF8IsNEL(const unsigned char *us) noexcept {
+	return (us[0] == 0xc2) && (us[1] == 0x85);
+}
+
+// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL. 
+constexpr bool UTF8IsMultibyteLineEnd(unsigned char ch0, unsigned char ch1, unsigned char ch2) noexcept {
+	return
+		((ch0 == 0xe2) && (ch1 == 0x80) && ((ch2 == 0xa8) || (ch2 == 0xa9))) ||
+		((ch1 == 0xc2) && (ch2 == 0x85));
+}
+
+enum { SURROGATE_LEAD_FIRST = 0xD800 };
+enum { SURROGATE_LEAD_LAST = 0xDBFF };
+enum { SURROGATE_TRAIL_FIRST = 0xDC00 };
+enum { SURROGATE_TRAIL_LAST = 0xDFFF };
+enum { SUPPLEMENTAL_PLANE_FIRST = 0x10000 };
+
+inline constexpr unsigned int UTF16CharLength(wchar_t uch) noexcept {
+	return ((uch >= SURROGATE_LEAD_FIRST) && (uch <= SURROGATE_LEAD_LAST)) ? 2 : 1;
+}
+
+inline constexpr unsigned int UTF16LengthFromUTF8ByteCount(unsigned int byteCount) noexcept {
+	return (byteCount < 4) ? 1 : 2;
+}
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/UniqueString.cxx b/scite-app/scintilla/src/UniqueString.cxx
new file mode 100644
index 0000000..61c1e06
--- /dev/null
+++ b/scite-app/scintilla/src/UniqueString.cxx
@@ -0,0 +1,56 @@
+// Scintilla source code edit control
+/** @file UniqueString.cxx
+ ** Define an allocator for UniqueString.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <memory>
+
+#include "UniqueString.h"
+
+namespace Scintilla::Internal {
+
+/// Equivalent to strdup but produces a std::unique_ptr<const char[]> allocation to go
+/// into collections.
+UniqueString UniqueStringCopy(const char *text) {
+	if (!text) {
+		return UniqueString();
+	}
+	const std::string_view sv(text);
+	std::unique_ptr<char[]> upcNew = std::make_unique<char[]>(sv.length() + 1);
+	sv.copy(upcNew.get(), sv.length());
+	return UniqueString(upcNew.release());
+}
+
+// A set of strings that always returns the same pointer for each string.
+
+UniqueStringSet::UniqueStringSet() noexcept = default;
+
+UniqueStringSet::~UniqueStringSet() {
+	strings.clear();
+}
+
+void UniqueStringSet::Clear() noexcept {
+	strings.clear();
+}
+
+const char *UniqueStringSet::Save(const char *text) {
+	if (!text)
+		return nullptr;
+
+	const std::string_view sv(text);
+	for (const UniqueString &us : strings) {
+		if (sv == us.get()) {
+			return us.get();
+		}
+	}
+
+	strings.push_back(UniqueStringCopy(text));
+	return strings.back().get();
+}
+
+}
diff --git a/scite-app/scintilla/src/UniqueString.h b/scite-app/scintilla/src/UniqueString.h
new file mode 100644
index 0000000..83cb69e
--- /dev/null
+++ b/scite-app/scintilla/src/UniqueString.h
@@ -0,0 +1,46 @@
+// Scintilla source code edit control
+/** @file UniqueString.h
+ ** Define UniqueString, a unique_ptr based string type for storage in containers
+ ** and an allocator for UniqueString.
+ ** Define UniqueStringSet which holds a set of strings, used to avoid holding many copies
+ ** of font names.
+ **/
+// Copyright 2017 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef UNIQUESTRING_H
+#define UNIQUESTRING_H
+
+namespace Scintilla::Internal {
+
+constexpr bool IsNullOrEmpty(const char *text) noexcept {
+	return text == nullptr || *text == '\0';
+}
+
+using UniqueString = std::unique_ptr<const char[]>;
+
+/// Equivalent to strdup but produces a std::unique_ptr<const char[]> allocation to go
+/// into collections.
+UniqueString UniqueStringCopy(const char *text);
+
+// A set of strings that always returns the same pointer for each string.
+
+class UniqueStringSet {
+private:
+	std::vector<UniqueString> strings;
+public:
+	UniqueStringSet() noexcept;
+	// UniqueStringSet objects can not be copied.
+	UniqueStringSet(const UniqueStringSet &) = delete;
+	UniqueStringSet &operator=(const UniqueStringSet &) = delete;
+	// UniqueStringSet objects can be moved.
+	UniqueStringSet(UniqueStringSet &&) = default;
+	UniqueStringSet &operator=(UniqueStringSet &&) = default;
+	~UniqueStringSet();
+	void Clear() noexcept;
+	const char *Save(const char *text);
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/ViewStyle.cxx b/scite-app/scintilla/src/ViewStyle.cxx
new file mode 100644
index 0000000..33b8614
--- /dev/null
+++ b/scite-app/scintilla/src/ViewStyle.cxx
@@ -0,0 +1,717 @@
+// Scintilla source code edit control
+/** @file ViewStyle.cxx
+ ** Store information on how the document is to be viewed.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "Indicator.h"
+#include "XPM.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+MarginStyle::MarginStyle(MarginType style_, int width_, int mask_) noexcept :
+	style(style_), width(width_), mask(mask_), sensitive(false), cursor(CursorShape::ReverseArrow) {
+}
+
+bool MarginStyle::ShowsFolding() const noexcept {
+	return (mask & MaskFolders) != 0;
+}
+
+FontRealised::FontRealised() noexcept = default;
+
+FontRealised::~FontRealised() = default;
+
+void FontRealised::Realise(Surface &surface, int zoomLevel, Technology technology, const FontSpecification &fs, const char *localeName) {
+	PLATFORM_ASSERT(fs.fontName);
+	sizeZoomed = fs.size + zoomLevel * FontSizeMultiplier;
+	if (sizeZoomed <= 2 * FontSizeMultiplier)	// Hangs if sizeZoomed <= 1
+		sizeZoomed = 2 * FontSizeMultiplier;
+
+	const float deviceHeight = static_cast<float>(surface.DeviceHeightFont(sizeZoomed));
+	const FontParameters fp(fs.fontName, deviceHeight / FontSizeMultiplier, fs.weight,
+		fs.italic, fs.extraFontFlag, technology, fs.characterSet, localeName);
+	font = Font::Allocate(fp);
+
+	ascent = static_cast<unsigned int>(surface.Ascent(font.get()));
+	descent = static_cast<unsigned int>(surface.Descent(font.get()));
+	capitalHeight = surface.Ascent(font.get()) - surface.InternalLeading(font.get());
+	aveCharWidth = surface.AverageCharWidth(font.get());
+	spaceWidth = surface.WidthText(font.get(), " ");
+}
+
+ViewStyle::ViewStyle() : markers(MarkerMax + 1), indicators(static_cast<size_t>(IndicatorNumbers::Max) + 1) {
+	Init();
+}
+
+// Copy constructor only called when printing copies the screen ViewStyle so it can be
+// modified for printing styles.
+ViewStyle::ViewStyle(const ViewStyle &source) : markers(MarkerMax + 1), indicators(static_cast<size_t>(IndicatorNumbers::Max) + 1) {
+	Init(source.styles.size());
+	styles = source.styles;
+	for (size_t sty=0; sty<source.styles.size(); sty++) {
+		// Can't just copy fontName as its lifetime is relative to its owning ViewStyle
+		styles[sty].fontName = fontNames.Save(source.styles[sty].fontName);
+	}
+	nextExtendedStyle = source.nextExtendedStyle;
+	markers = source.markers;
+	CalcLargestMarkerHeight();
+
+	indicators = source.indicators;
+
+	indicatorsDynamic = source.indicatorsDynamic;
+	indicatorsSetFore = source.indicatorsSetFore;
+
+	selection = source.selection;
+
+	foldmarginColour = source.foldmarginColour;
+	foldmarginHighlightColour = source.foldmarginHighlightColour;
+
+	hotspotUnderline = source.hotspotUnderline;
+
+	controlCharSymbol = source.controlCharSymbol;
+	controlCharWidth = source.controlCharWidth;
+	selbar = source.selbar;
+	selbarlight = source.selbarlight;
+	caret = source.caret;
+	caretLine = source.caretLine;
+	someStylesProtected = false;
+	someStylesForceCase = false;
+	leftMarginWidth = source.leftMarginWidth;
+	rightMarginWidth = source.rightMarginWidth;
+	ms = source.ms;
+	maskInLine = source.maskInLine;
+	maskDrawInText = source.maskDrawInText;
+	fixedColumnWidth = source.fixedColumnWidth;
+	marginInside = source.marginInside;
+	textStart = source.textStart;
+	zoomLevel = source.zoomLevel;
+	viewWhitespace = source.viewWhitespace;
+	tabDrawMode = source.tabDrawMode;
+	whitespaceSize = source.whitespaceSize;
+	viewIndentationGuides = source.viewIndentationGuides;
+	viewEOL = source.viewEOL;
+	extraFontFlag = source.extraFontFlag;
+	extraAscent = source.extraAscent;
+	extraDescent = source.extraDescent;
+	marginStyleOffset = source.marginStyleOffset;
+	annotationVisible = source.annotationVisible;
+	annotationStyleOffset = source.annotationStyleOffset;
+	eolAnnotationVisible = source.eolAnnotationVisible;
+	eolAnnotationStyleOffset = source.eolAnnotationStyleOffset;
+	braceHighlightIndicatorSet = source.braceHighlightIndicatorSet;
+	braceHighlightIndicator = source.braceHighlightIndicator;
+	braceBadLightIndicatorSet = source.braceBadLightIndicatorSet;
+	braceBadLightIndicator = source.braceBadLightIndicator;
+
+	edgeState = source.edgeState;
+	theEdge = source.theEdge;
+	theMultiEdge = source.theMultiEdge;
+
+	marginNumberPadding = source.marginNumberPadding;
+	ctrlCharPadding = source.ctrlCharPadding;
+	lastSegItalicsOffset = source.lastSegItalicsOffset;
+
+	wrap = source.wrap;
+
+	localeName = source.localeName;
+}
+
+ViewStyle::~ViewStyle() {
+	styles.clear();
+	fonts.clear();
+}
+
+void ViewStyle::CalculateMarginWidthAndMask() noexcept {
+	fixedColumnWidth = marginInside ? leftMarginWidth : 0;
+	maskInLine = 0xffffffff;
+	int maskDefinedMarkers = 0;
+	for (const MarginStyle &m : ms) {
+		fixedColumnWidth += m.width;
+		if (m.width > 0)
+			maskInLine &= ~m.mask;
+		maskDefinedMarkers |= m.mask;
+	}
+	maskDrawInText = 0;
+	for (int markBit = 0; markBit < 32; markBit++) {
+		const int maskBit = 1U << markBit;
+		switch (markers[markBit].markType) {
+		case MarkerSymbol::Empty:
+			maskInLine &= ~maskBit;
+			break;
+		case MarkerSymbol::Background:
+		case MarkerSymbol::Underline:
+			maskInLine &= ~maskBit;
+			maskDrawInText |= maskDefinedMarkers & maskBit;
+			break;
+		default:	// Other marker types do not affect the masks
+			break;
+		}
+	}
+}
+
+void ViewStyle::Init(size_t stylesSize_) {
+	AllocStyles(stylesSize_);
+	nextExtendedStyle = 256;
+	fontNames.Clear();
+	ResetDefaultStyle();
+
+	// There are no image markers by default, so no need for calling CalcLargestMarkerHeight()
+	largestMarkerHeight = 0;
+
+	indicators[0] = Indicator(IndicatorStyle::Squiggle, ColourRGBA(0, 0x7f, 0));
+	indicators[1] = Indicator(IndicatorStyle::TT, ColourRGBA(0, 0, 0xff));
+	indicators[2] = Indicator(IndicatorStyle::Plain, ColourRGBA(0xff, 0, 0));
+
+	technology = Technology::Default;
+	indicatorsDynamic = false;
+	indicatorsSetFore = false;
+	lineHeight = 1;
+	lineOverlap = 0;
+	maxAscent = 1;
+	maxDescent = 1;
+	aveCharWidth = 8;
+	spaceWidth = 8;
+	tabWidth = spaceWidth * 8;
+
+	// Default is for no selection foregrounds
+	elementColours.erase(Element::SelectionText);
+	elementColours.erase(Element::SelectionAdditionalText);
+	elementColours.erase(Element::SelectionSecondaryText);
+	elementColours.erase(Element::SelectionInactiveText);
+	// Shades of grey for selection backgrounds
+	elementBaseColours[Element::SelectionBack] = ColourRGBA(0xc0, 0xc0, 0xc0, 0xff);
+	elementBaseColours[Element::SelectionAdditionalBack] = ColourRGBA(0xd7, 0xd7, 0xd7, 0xff);
+	elementBaseColours[Element::SelectionSecondaryBack] = ColourRGBA(0xb0, 0xb0, 0xb0, 0xff);
+	elementBaseColours[Element::SelectionInactiveBack] = ColourRGBA(0x80, 0x80, 0x80, 0x3f);
+	elementAllowsTranslucent.insert({
+		Element::SelectionText,
+		Element::SelectionBack,
+		Element::SelectionAdditionalText,
+		Element::SelectionAdditionalBack,
+		Element::SelectionSecondaryText,
+		Element::SelectionSecondaryBack,
+		Element::SelectionInactiveText,
+		Element::SelectionBack,
+		Element::SelectionInactiveBack,
+	});
+	selection.layer = Layer::Base;
+	selection.eolFilled = false;
+
+	foldmarginColour.reset();
+	foldmarginHighlightColour.reset();
+
+	controlCharSymbol = 0;	/* Draw the control characters */
+	controlCharWidth = 0;
+	selbar = Platform::Chrome();
+	selbarlight = Platform::ChromeHighlight();
+	styles[StyleLineNumber].fore = ColourRGBA(0, 0, 0);
+	styles[StyleLineNumber].back = Platform::Chrome();
+
+	elementBaseColours[Element::Caret] = ColourRGBA(0, 0, 0);
+	elementBaseColours[Element::CaretAdditional] = ColourRGBA(0x7f, 0x7f, 0x7f);
+	elementAllowsTranslucent.insert({
+		Element::Caret,
+		Element::CaretAdditional,
+	});
+	caret.style = CaretStyle::Line;
+	caret.width = 1;
+
+	elementColours.erase(Element::CaretLineBack);
+	elementAllowsTranslucent.insert(Element::CaretLineBack);
+	caretLine.alwaysShow = false;
+	caretLine.layer = Layer::Base;
+	caretLine.frame = 0;
+
+	someStylesProtected = false;
+	someStylesForceCase = false;
+
+	hotspotUnderline = true;
+	elementColours.erase(Element::HotSpotActive);
+	elementAllowsTranslucent.insert(Element::HotSpotActive);
+
+	leftMarginWidth = 1;
+	rightMarginWidth = 1;
+	ms.resize(MaxMargin + 1);
+	ms[0] = MarginStyle(MarginType::Number);
+	ms[1] = MarginStyle(MarginType::Symbol, 16, ~MaskFolders);
+	ms[2] = MarginStyle(MarginType::Symbol);
+	marginInside = true;
+	CalculateMarginWidthAndMask();
+	textStart = marginInside ? fixedColumnWidth : leftMarginWidth;
+	zoomLevel = 0;
+	viewWhitespace = WhiteSpace::Invisible;
+	tabDrawMode = TabDrawMode::LongArrow;
+	whitespaceSize = 1;
+	elementColours.erase(Element::WhiteSpace);
+	elementAllowsTranslucent.insert(Element::WhiteSpace);
+
+	viewIndentationGuides = IndentView::None;
+	viewEOL = false;
+	extraFontFlag = FontQuality::QualityDefault;
+	extraAscent = 0;
+	extraDescent = 0;
+	marginStyleOffset = 0;
+	annotationVisible = AnnotationVisible::Hidden;
+	annotationStyleOffset = 0;
+	eolAnnotationVisible = EOLAnnotationVisible::Hidden;
+	eolAnnotationStyleOffset = 0;
+	braceHighlightIndicatorSet = false;
+	braceHighlightIndicator = 0;
+	braceBadLightIndicatorSet = false;
+	braceBadLightIndicator = 0;
+
+	edgeState = EdgeVisualStyle::None;
+	theEdge = EdgeProperties(0, ColourRGBA(0xc0, 0xc0, 0xc0));
+
+	marginNumberPadding = 3;
+	ctrlCharPadding = 3; // +3 For a blank on front and rounded edge each side
+	lastSegItalicsOffset = 2;
+
+	wrap.state = Wrap::None;
+	wrap.visualFlags = WrapVisualFlag::None;
+	wrap.visualFlagsLocation = WrapVisualLocation::Default;
+	wrap.visualStartIndent = 0;
+	wrap.indentMode = WrapIndentMode::Fixed;
+
+	localeName = localeNameDefault;
+}
+
+void ViewStyle::Refresh(Surface &surface, int tabInChars) {
+	fonts.clear();
+
+	selbar = Platform::Chrome();
+	selbarlight = Platform::ChromeHighlight();
+
+	// Apply the extra font flag which controls text drawing quality to each style.
+	for (Style &style : styles) {
+		style.extraFontFlag = extraFontFlag;
+	}
+
+	// Create a FontRealised object for each unique font in the styles.
+	CreateAndAddFont(styles[StyleDefault]);
+	for (const Style &style : styles) {
+		CreateAndAddFont(style);
+	}
+
+	// Ask platform to allocate each unique font.
+	for (const std::pair<const FontSpecification, std::unique_ptr<FontRealised>> &font : fonts) {
+		font.second->Realise(surface, zoomLevel, technology, font.first, localeName.c_str());
+	}
+
+	// Set the platform font handle and measurements for each style.
+	for (Style &style : styles) {
+		const FontRealised *fr = Find(style);
+		style.Copy(fr->font, *fr);
+	}
+
+	indicatorsDynamic = std::any_of(indicators.cbegin(), indicators.cend(),
+		[](const Indicator &indicator) noexcept { return indicator.IsDynamic(); });
+
+	indicatorsSetFore = std::any_of(indicators.cbegin(), indicators.cend(),
+		[](const Indicator &indicator) noexcept { return indicator.OverridesTextFore(); });
+
+	maxAscent = 1;
+	maxDescent = 1;
+	FindMaxAscentDescent();
+	maxAscent += extraAscent;
+	maxDescent += extraDescent;
+	lineHeight = maxAscent + maxDescent;
+	lineOverlap = lineHeight / 10;
+	if (lineOverlap < 2)
+		lineOverlap = 2;
+	if (lineOverlap > lineHeight)
+		lineOverlap = lineHeight;
+
+	someStylesProtected = std::any_of(styles.cbegin(), styles.cend(),
+		[](const Style &style) noexcept { return style.IsProtected(); });
+
+	someStylesForceCase = std::any_of(styles.cbegin(), styles.cend(),
+		[](const Style &style) noexcept { return style.caseForce != Style::CaseForce::mixed; });
+
+	aveCharWidth = styles[StyleDefault].aveCharWidth;
+	spaceWidth = styles[StyleDefault].spaceWidth;
+	tabWidth = spaceWidth * tabInChars;
+
+	controlCharWidth = 0.0;
+	if (controlCharSymbol >= 32) {
+		const char cc[2] = { static_cast<char>(controlCharSymbol), '\0' };
+		controlCharWidth = surface.WidthText(styles[StyleControlChar].font.get(), cc);
+	}
+
+	CalculateMarginWidthAndMask();
+	textStart = marginInside ? fixedColumnWidth : leftMarginWidth;
+}
+
+void ViewStyle::ReleaseAllExtendedStyles() noexcept {
+	nextExtendedStyle = 256;
+}
+
+int ViewStyle::AllocateExtendedStyles(int numberStyles) {
+	const int startRange = nextExtendedStyle;
+	nextExtendedStyle += numberStyles;
+	EnsureStyle(nextExtendedStyle);
+	for (int i=startRange; i<nextExtendedStyle; i++) {
+		styles[i].ClearTo(styles[StyleDefault]);
+	}
+	return startRange;
+}
+
+void ViewStyle::EnsureStyle(size_t index) {
+	if (index >= styles.size()) {
+		AllocStyles(index+1);
+	}
+}
+
+void ViewStyle::ResetDefaultStyle() {
+	styles[StyleDefault].Clear(ColourRGBA(0,0,0),
+	        ColourRGBA(0xff,0xff,0xff),
+	        Platform::DefaultFontSize() * FontSizeMultiplier, fontNames.Save(Platform::DefaultFont()),
+	        CharacterSet::Default,
+	        FontWeight::Normal, false, false, false, Style::CaseForce::mixed, true, true, false);
+}
+
+void ViewStyle::ClearStyles() {
+	// Reset all styles to be like the default style
+	for (size_t i=0; i<styles.size(); i++) {
+		if (i != StyleDefault) {
+			styles[i].ClearTo(styles[StyleDefault]);
+		}
+	}
+	styles[StyleLineNumber].back = Platform::Chrome();
+
+	// Set call tip fore/back to match the values previously set for call tips
+	styles[StyleCallTip].back = ColourRGBA(0xff, 0xff, 0xff);
+	styles[StyleCallTip].fore = ColourRGBA(0x80, 0x80, 0x80);
+}
+
+void ViewStyle::SetStyleFontName(int styleIndex, const char *name) {
+	styles[styleIndex].fontName = fontNames.Save(name);
+}
+
+void ViewStyle::SetFontLocaleName(const char *name) {
+	localeName = name;
+}
+
+bool ViewStyle::ProtectionActive() const noexcept {
+	return someStylesProtected;
+}
+
+int ViewStyle::ExternalMarginWidth() const noexcept {
+	return marginInside ? 0 : fixedColumnWidth;
+}
+
+int ViewStyle::MarginFromLocation(Point pt) const noexcept {
+	int margin = -1;
+	int x = marginInside ? 0 : -fixedColumnWidth;
+	for (size_t i = 0; i < ms.size(); i++) {
+		if ((pt.x >= x) && (pt.x < x + ms[i].width))
+			margin = static_cast<int>(i);
+		x += ms[i].width;
+	}
+	return margin;
+}
+
+bool ViewStyle::ValidStyle(size_t styleIndex) const noexcept {
+	return styleIndex < styles.size();
+}
+
+void ViewStyle::CalcLargestMarkerHeight() noexcept {
+	largestMarkerHeight = 0;
+	for (const LineMarker &marker : markers) {
+		switch (marker.markType) {
+		case MarkerSymbol::Pixmap:
+			if (marker.pxpm && marker.pxpm->GetHeight() > largestMarkerHeight)
+				largestMarkerHeight = marker.pxpm->GetHeight();
+			break;
+		case MarkerSymbol::RgbaImage:
+			if (marker.image && marker.image->GetHeight() > largestMarkerHeight)
+				largestMarkerHeight = marker.image->GetHeight();
+			break;
+		default:	// Only images have their own natural heights
+			break;
+		}
+	}
+}
+
+int ViewStyle::GetFrameWidth() const noexcept {
+	return std::clamp(caretLine.frame, 1, lineHeight / 3);
+}
+
+bool ViewStyle::IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) const {
+	return caretLine.frame && (caretActive || caretLine.alwaysShow) &&
+		ElementColour(Element::CaretLineBack) &&
+		(caretLine.layer == Layer::Base) && lineContainsCaret;
+}
+
+// See if something overrides the line background colour:  Either if caret is on the line
+// and background colour is set for that, or if a marker is defined that forces its background
+// colour onto the line, or if a marker is defined but has no selection margin in which to
+// display itself (as long as it's not an MarkerSymbol::Empty marker).  These are checked in order
+// with the earlier taking precedence.  When multiple markers cause background override,
+// the colour for the highest numbered one is used.
+std::optional<ColourRGBA> ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const {
+	std::optional<ColourRGBA> background;
+	if (!caretLine.frame && (caretActive || caretLine.alwaysShow) &&
+		(caretLine.layer == Layer::Base) && lineContainsCaret) {
+		background = ElementColour(Element::CaretLineBack);
+	}
+	if (!background && marksOfLine) {
+		int marks = marksOfLine;
+		for (int markBit = 0; (markBit < 32) && marks; markBit++) {
+			if ((marks & 1) && (markers[markBit].markType == MarkerSymbol::Background) &&
+				(markers[markBit].layer == Layer::Base)) {
+				background = markers[markBit].back;
+			}
+			marks >>= 1;
+		}
+	}
+	if (!background && maskInLine) {
+		int marksMasked = marksOfLine & maskInLine;
+		if (marksMasked) {
+			for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) {
+				if ((marksMasked & 1) &&
+					(markers[markBit].layer == Layer::Base)) {
+					background = markers[markBit].back;
+				}
+				marksMasked >>= 1;
+			}
+		}
+	}
+	if (background) {
+		return background->Opaque();
+	} else {
+		return {};
+	}
+}
+
+bool ViewStyle::SelectionBackgroundDrawn() const noexcept {
+	return selection.layer == Layer::Base;
+}
+
+bool ViewStyle::SelectionTextDrawn() const {
+	return
+		ElementIsSet(Element::SelectionText) ||
+		ElementIsSet(Element::SelectionAdditionalText) ||
+		ElementIsSet(Element::SelectionSecondaryText) ||
+		ElementIsSet(Element::SelectionInactiveText);
+}
+
+bool ViewStyle::WhitespaceBackgroundDrawn() const {
+	return (viewWhitespace != WhiteSpace::Invisible) && (ElementIsSet(Element::WhiteSpaceBack));
+}
+
+bool ViewStyle::WhiteSpaceVisible(bool inIndent) const noexcept {
+	return (!inIndent && viewWhitespace == WhiteSpace::VisibleAfterIndent) ||
+		(inIndent && viewWhitespace == WhiteSpace::VisibleOnlyInIndent) ||
+		viewWhitespace == WhiteSpace::VisibleAlways;
+}
+
+ColourRGBA ViewStyle::WrapColour() const {
+	return ElementColour(Element::WhiteSpace).value_or(styles[StyleDefault].fore);
+}
+
+// Insert new edge in sorted order.
+void ViewStyle::AddMultiEdge(uptr_t wParam, sptr_t lParam) {
+	const int column = static_cast<int>(wParam);
+	theMultiEdge.insert(
+		std::upper_bound(theMultiEdge.begin(), theMultiEdge.end(), column,
+			[](const EdgeProperties &a, const EdgeProperties &b) {
+				return a.column < b.column;
+			}),
+		EdgeProperties(column, lParam));
+}
+
+std::optional<ColourRGBA> ViewStyle::ElementColour(Element element) const {
+	ElementMap::const_iterator search = elementColours.find(element);
+	if (search != elementColours.end()) {
+		if (search->second.has_value()) {
+			return search->second;
+		}
+	}
+	ElementMap::const_iterator searchBase = elementBaseColours.find(element);
+	if (searchBase != elementBaseColours.end()) {
+		if (searchBase->second.has_value()) {
+			return searchBase->second;
+		}
+	}
+	return {};
+}
+
+bool ViewStyle::ElementAllowsTranslucent(Element element) const {
+	return elementAllowsTranslucent.count(element) > 0;
+}
+
+bool ViewStyle::ResetElement(Element element) {
+	ElementMap::const_iterator search = elementColours.find(element);
+	const bool changed = (search != elementColours.end()) && (search->second.has_value());
+	elementColours.erase(element);
+	return changed;
+}
+
+bool ViewStyle::SetElementColour(Element element, ColourRGBA colour) {
+	ElementMap::const_iterator search = elementColours.find(element);
+	const bool changed =
+		(search == elementColours.end()) ||
+		(search->second.has_value() && !(*search->second == colour));
+	elementColours[element] = colour;
+	return changed;
+}
+
+bool ViewStyle::SetElementColourOptional(Element element, uptr_t wParam, sptr_t lParam) {
+	if (wParam) {
+		return SetElementColour(element, ColourRGBA::FromIpRGB(lParam));
+	} else {
+		return ResetElement(element);
+	}
+}
+
+void ViewStyle::SetElementRGB(Element element, int rgb) {
+	const ColourRGBA current = ElementColour(element).value_or(ColourRGBA(0, 0, 0, 0));
+	elementColours[element] = ColourRGBA(ColourRGBA(rgb), current.GetAlpha());
+}
+
+void ViewStyle::SetElementAlpha(Element element, int alpha) {
+	const ColourRGBA current = ElementColour(element).value_or(ColourRGBA(0, 0, 0, 0));
+	elementColours[element] = ColourRGBA(current, std::min(alpha, 0xff));
+}
+
+bool ViewStyle::ElementIsSet(Element element) const {
+	ElementMap::const_iterator search = elementColours.find(element);
+	if (search != elementColours.end()) {
+		return search->second.has_value();
+	}
+	return false;
+}
+
+bool ViewStyle::SetElementBase(Element element, ColourRGBA colour) {
+	ElementMap::const_iterator search = elementBaseColours.find(element);
+	const bool changed =
+		(search == elementBaseColours.end()) ||
+		(search->second.has_value() && !(*search->second == colour));
+	elementBaseColours[element] = colour;
+	return changed;
+}
+
+bool ViewStyle::SetWrapState(Wrap wrapState_) noexcept {
+	const bool changed = wrap.state != wrapState_;
+	wrap.state = wrapState_;
+	return changed;
+}
+
+bool ViewStyle::SetWrapVisualFlags(WrapVisualFlag wrapVisualFlags_) noexcept {
+	const bool changed = wrap.visualFlags != wrapVisualFlags_;
+	wrap.visualFlags = wrapVisualFlags_;
+	return changed;
+}
+
+bool ViewStyle::SetWrapVisualFlagsLocation(WrapVisualLocation wrapVisualFlagsLocation_) noexcept {
+	const bool changed = wrap.visualFlagsLocation != wrapVisualFlagsLocation_;
+	wrap.visualFlagsLocation = wrapVisualFlagsLocation_;
+	return changed;
+}
+
+bool ViewStyle::SetWrapVisualStartIndent(int wrapVisualStartIndent_) noexcept {
+	const bool changed = wrap.visualStartIndent != wrapVisualStartIndent_;
+	wrap.visualStartIndent = wrapVisualStartIndent_;
+	return changed;
+}
+
+bool ViewStyle::SetWrapIndentMode(WrapIndentMode wrapIndentMode_) noexcept {
+	const bool changed = wrap.indentMode != wrapIndentMode_;
+	wrap.indentMode = wrapIndentMode_;
+	return changed;
+}
+
+bool ViewStyle::IsBlockCaretStyle() const noexcept {
+	return ((caret.style & CaretStyle::InsMask) == CaretStyle::Block) ||
+		FlagSet(caret.style, CaretStyle::OverstrikeBlock);
+}
+
+bool ViewStyle::IsCaretVisible() const noexcept {
+	return caret.width > 0 && caret.style != CaretStyle::Invisible;
+}
+
+bool ViewStyle::DrawCaretInsideSelection(bool inOverstrike, bool imeCaretBlockOverride) const noexcept {
+	if (FlagSet(caret.style, CaretStyle::BlockAfter))
+		return false;
+	return ((caret.style & CaretStyle::InsMask) == CaretStyle::Block) ||
+		(inOverstrike && FlagSet(caret.style, CaretStyle::OverstrikeBlock)) ||
+		imeCaretBlockOverride;
+}
+
+ViewStyle::CaretShape ViewStyle::CaretShapeForMode(bool inOverstrike) const noexcept {
+	if (inOverstrike) {
+		return (FlagSet(caret.style, CaretStyle::OverstrikeBlock)) ? CaretShape::block : CaretShape::bar;
+	}
+
+	const CaretStyle caretStyle = caret.style & CaretStyle::InsMask;
+	return (caretStyle <= CaretStyle::Block) ? static_cast<CaretShape>(caretStyle) : CaretShape::line;
+}
+
+void ViewStyle::AllocStyles(size_t sizeNew) {
+	size_t i=styles.size();
+	styles.resize(sizeNew);
+	if (styles.size() > StyleDefault) {
+		for (; i<sizeNew; i++) {
+			if (i != StyleDefault) {
+				styles[i].ClearTo(styles[StyleDefault]);
+			}
+		}
+	}
+}
+
+void ViewStyle::CreateAndAddFont(const FontSpecification &fs) {
+	if (fs.fontName) {
+		FontMap::iterator it = fonts.find(fs);
+		if (it == fonts.end()) {
+			fonts[fs] = std::make_unique<FontRealised>();
+		}
+	}
+}
+
+FontRealised *ViewStyle::Find(const FontSpecification &fs) {
+	if (!fs.fontName)	// Invalid specification so return arbitrary object
+		return fonts.begin()->second.get();
+	FontMap::iterator it = fonts.find(fs);
+	if (it != fonts.end()) {
+		// Should always reach here since map was just set for all styles
+		return it->second.get();
+	}
+	return nullptr;
+}
+
+void ViewStyle::FindMaxAscentDescent() {
+	for (const auto &font : fonts) {
+		if (maxAscent < font.second->ascent)
+			maxAscent = font.second->ascent;
+		if (maxDescent < font.second->descent)
+			maxDescent = font.second->descent;
+	}
+}
diff --git a/scite-app/scintilla/src/ViewStyle.h b/scite-app/scintilla/src/ViewStyle.h
new file mode 100644
index 0000000..8b9f125
--- /dev/null
+++ b/scite-app/scintilla/src/ViewStyle.h
@@ -0,0 +1,259 @@
+// Scintilla source code edit control
+/** @file ViewStyle.h
+ ** Store information on how the document is to be viewed.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef VIEWSTYLE_H
+#define VIEWSTYLE_H
+
+namespace Scintilla::Internal {
+
+/**
+ */
+class MarginStyle {
+public:
+	Scintilla::MarginType style;
+	ColourRGBA back;
+	int width;
+	int mask;
+	bool sensitive;
+	Scintilla::CursorShape cursor;
+	MarginStyle(Scintilla::MarginType style_= Scintilla::MarginType::Symbol, int width_=0, int mask_=0) noexcept;
+	bool ShowsFolding() const noexcept;
+};
+
+/**
+ */
+
+
+class FontRealised : public FontMeasurements {
+public:
+	std::shared_ptr<Font> font;
+	FontRealised() noexcept;
+	// FontRealised objects can not be copied.
+	FontRealised(const FontRealised &) = delete;
+	FontRealised(FontRealised &&) = delete;
+	FontRealised &operator=(const FontRealised &) = delete;
+	FontRealised &operator=(FontRealised &&) = delete;
+	virtual ~FontRealised();
+	void Realise(Surface &surface, int zoomLevel, Scintilla::Technology technology, const FontSpecification &fs, const char *localeName);
+};
+
+typedef std::map<FontSpecification, std::unique_ptr<FontRealised>> FontMap;
+
+inline std::optional<ColourRGBA> OptionalColour(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) {
+	if (wParam) {
+		return ColourRGBA::FromIpRGB(lParam);
+	} else {
+		return {};
+	}
+}
+
+struct SelectionAppearance {
+	// Whether to draw on base layer or over text
+	Scintilla::Layer layer;
+	// Draw selection past line end characters up to right border
+	bool eolFilled;
+};
+
+struct CaretLineAppearance {
+	// Whether to draw on base layer or over text
+	Scintilla::Layer layer;
+	// Also show when non-focused
+	bool alwaysShow;
+	// Non-0: draw a rectangle around line instead of filling line. Value is pixel width of frame
+	int frame;
+};
+
+struct CaretAppearance {
+	// Line, block, over-strike bar ... 
+	Scintilla::CaretStyle style;
+	// Width in pixels
+	int width;
+};
+
+struct WrapAppearance {
+	// No wrapping, word, character, whitespace appearance
+	Scintilla::Wrap state;
+	// Show indication of wrap at line end, line start, or in margin
+	Scintilla::WrapVisualFlag visualFlags;
+	// Show indication near margin or near text
+	Scintilla::WrapVisualLocation visualFlagsLocation;
+	// How much indentation to show wrapping
+	int visualStartIndent;
+	// WrapIndentMode::Fixed, _SAME, _INDENT, _DEEPINDENT
+	Scintilla::WrapIndentMode indentMode;
+};
+
+struct EdgeProperties {
+	int column = 0;
+	ColourRGBA colour;
+	EdgeProperties(int column_ = 0, ColourRGBA colour_ = ColourRGBA::FromRGB(0)) noexcept :
+		column(column_), colour(colour_) {
+	}
+	EdgeProperties(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam) noexcept :
+		column(static_cast<int>(wParam)), colour(ColourRGBA::FromIpRGB(lParam)) {
+	}
+};
+
+// This is an old style enum so that its members can be used directly as indices without casting
+enum StyleIndices {
+	StyleDefault = static_cast<int>(Scintilla::StylesCommon::Default),
+	StyleLineNumber = static_cast<int>(Scintilla::StylesCommon::LineNumber),
+	StyleBraceLight = static_cast<int>(Scintilla::StylesCommon::BraceLight),
+	StyleBraceBad = static_cast<int>(Scintilla::StylesCommon::BraceBad),
+	StyleControlChar = static_cast<int>(Scintilla::StylesCommon::ControlChar),
+	StyleIndentGuide = static_cast<int>(Scintilla::StylesCommon::IndentGuide),
+	StyleCallTip = static_cast<int>(Scintilla::StylesCommon::CallTip),
+	StyleFoldDisplayText = static_cast<int>(Scintilla::StylesCommon::FoldDisplayText),
+};
+
+/**
+ */
+class ViewStyle {
+	UniqueStringSet fontNames;
+	FontMap fonts;
+public:
+	std::vector<Style> styles;
+	int nextExtendedStyle;
+	std::vector<LineMarker> markers;
+	int largestMarkerHeight;
+	std::vector<Indicator> indicators;
+	bool indicatorsDynamic;
+	bool indicatorsSetFore;
+	Scintilla::Technology technology;
+	int lineHeight;
+	int lineOverlap;
+	unsigned int maxAscent;
+	unsigned int maxDescent;
+	XYPOSITION aveCharWidth;
+	XYPOSITION spaceWidth;
+	XYPOSITION tabWidth;
+
+	SelectionAppearance selection;
+
+	int controlCharSymbol;
+	XYPOSITION controlCharWidth;
+	ColourRGBA selbar;
+	ColourRGBA selbarlight;
+	std::optional<ColourRGBA> foldmarginColour;
+	std::optional<ColourRGBA> foldmarginHighlightColour;
+	bool hotspotUnderline;
+	/// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin
+	int leftMarginWidth;	///< Spacing margin on left of text
+	int rightMarginWidth;	///< Spacing margin on right of text
+	int maskInLine;	///< Mask for markers to be put into text because there is nowhere for them to go in margin
+	int maskDrawInText;	///< Mask for markers that always draw in text
+	std::vector<MarginStyle> ms;
+	int fixedColumnWidth;	///< Total width of margins
+	bool marginInside;	///< true: margin included in text view, false: separate views
+	int textStart;	///< Starting x position of text within the view
+	int zoomLevel;
+	Scintilla::WhiteSpace viewWhitespace;
+	Scintilla::TabDrawMode tabDrawMode;
+	int whitespaceSize;
+	Scintilla::IndentView viewIndentationGuides;
+	bool viewEOL;
+
+	CaretAppearance caret;
+
+	CaretLineAppearance caretLine;
+
+	bool someStylesProtected;
+	bool someStylesForceCase;
+	Scintilla::FontQuality extraFontFlag;
+	int extraAscent;
+	int extraDescent;
+	int marginStyleOffset;
+	Scintilla::AnnotationVisible annotationVisible;
+	int annotationStyleOffset;
+	Scintilla::EOLAnnotationVisible eolAnnotationVisible;
+	int eolAnnotationStyleOffset;
+	bool braceHighlightIndicatorSet;
+	int braceHighlightIndicator;
+	bool braceBadLightIndicatorSet;
+	int braceBadLightIndicator;
+	Scintilla::EdgeVisualStyle edgeState;
+	EdgeProperties theEdge;
+	std::vector<EdgeProperties> theMultiEdge;
+	int marginNumberPadding; // the right-side padding of the number margin
+	int ctrlCharPadding; // the padding around control character text blobs
+	int lastSegItalicsOffset; // the offset so as not to clip italic characters at EOLs
+
+	using ElementMap = std::map<Scintilla::Element, std::optional<ColourRGBA>>;
+	ElementMap elementColours;
+	ElementMap elementBaseColours;
+	std::set<Scintilla::Element> elementAllowsTranslucent;
+
+	WrapAppearance wrap;
+
+	std::string localeName;
+
+	ViewStyle();
+	ViewStyle(const ViewStyle &source);
+	ViewStyle(ViewStyle &&) = delete;
+	// Can only be copied through copy constructor which ensures font names initialised correctly
+	ViewStyle &operator=(const ViewStyle &) = delete;
+	ViewStyle &operator=(ViewStyle &&) = delete;
+	~ViewStyle();
+	void CalculateMarginWidthAndMask() noexcept;
+	void Init(size_t stylesSize_=256);
+	void Refresh(Surface &surface, int tabInChars);
+	void ReleaseAllExtendedStyles() noexcept;
+	int AllocateExtendedStyles(int numberStyles);
+	void EnsureStyle(size_t index);
+	void ResetDefaultStyle();
+	void ClearStyles();
+	void SetStyleFontName(int styleIndex, const char *name);
+	void SetFontLocaleName(const char *name);
+	bool ProtectionActive() const noexcept;
+	int ExternalMarginWidth() const noexcept;
+	int MarginFromLocation(Point pt) const noexcept;
+	bool ValidStyle(size_t styleIndex) const noexcept;
+	void CalcLargestMarkerHeight() noexcept;
+	int GetFrameWidth() const noexcept;
+	bool IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) const;
+	std::optional<ColourRGBA> Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const;
+	bool SelectionBackgroundDrawn() const noexcept;
+	bool SelectionTextDrawn() const;
+	bool WhitespaceBackgroundDrawn() const;
+	ColourRGBA WrapColour() const;
+
+	void AddMultiEdge(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+	std::optional<ColourRGBA> ElementColour(Scintilla::Element element) const;
+	bool ElementAllowsTranslucent(Scintilla::Element element) const;
+	bool ResetElement(Scintilla::Element element);
+	bool SetElementColour(Scintilla::Element element, ColourRGBA colour);
+	bool SetElementColourOptional(Scintilla::Element element, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+	void SetElementRGB(Scintilla::Element element, int rgb);
+	void SetElementAlpha(Scintilla::Element element, int alpha);
+	bool ElementIsSet(Scintilla::Element element) const;
+	bool SetElementBase(Scintilla::Element element, ColourRGBA colour);
+
+	bool SetWrapState(Scintilla::Wrap wrapState_) noexcept;
+	bool SetWrapVisualFlags(Scintilla::WrapVisualFlag wrapVisualFlags_) noexcept;
+	bool SetWrapVisualFlagsLocation(Scintilla::WrapVisualLocation wrapVisualFlagsLocation_) noexcept;
+	bool SetWrapVisualStartIndent(int wrapVisualStartIndent_) noexcept;
+	bool SetWrapIndentMode(Scintilla::WrapIndentMode wrapIndentMode_) noexcept;
+
+	bool WhiteSpaceVisible(bool inIndent) const noexcept;
+
+	enum class CaretShape { invisible, line, block, bar };
+	bool IsBlockCaretStyle() const noexcept;
+	bool IsCaretVisible() const noexcept;
+	bool DrawCaretInsideSelection(bool inOverstrike, bool imeCaretBlockOverride) const noexcept;
+	CaretShape CaretShapeForMode(bool inOverstrike) const noexcept;
+
+private:
+	void AllocStyles(size_t sizeNew);
+	void CreateAndAddFont(const FontSpecification &fs);
+	FontRealised *Find(const FontSpecification &fs);
+	void FindMaxAscentDescent();
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/src/XPM.cxx b/scite-app/scintilla/src/XPM.cxx
new file mode 100644
index 0000000..eba3fb6
--- /dev/null
+++ b/scite-app/scintilla/src/XPM.cxx
@@ -0,0 +1,331 @@
+// Scintilla source code edit control
+/** @file XPM.cxx
+ ** Define a class that holds data in the X Pixmap (XPM) format.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "XPM.h"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+namespace {
+
+const char *NextField(const char *s) noexcept {
+	// In case there are leading spaces in the string
+	while (*s == ' ') {
+		s++;
+	}
+	while (*s && *s != ' ') {
+		s++;
+	}
+	while (*s == ' ') {
+		s++;
+	}
+	return s;
+}
+
+// Data lines in XPM can be terminated either with NUL or "
+size_t MeasureLength(const char *s) noexcept {
+	size_t i = 0;
+	while (s[i] && (s[i] != '\"'))
+		i++;
+	return i;
+}
+
+unsigned int ValueOfHex(const char ch) noexcept {
+	if (ch >= '0' && ch <= '9')
+		return ch - '0';
+	else if (ch >= 'A' && ch <= 'F')
+		return ch - 'A' + 10;
+	else if (ch >= 'a' && ch <= 'f')
+		return ch - 'a' + 10;
+	else
+		return 0;
+}
+
+ColourRGBA ColourFromHex(const char *val) noexcept {
+	const unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
+	const unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
+	const unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
+	return ColourRGBA(r, g, b);
+}
+
+}
+
+
+ColourRGBA XPM::ColourFromCode(int ch) const noexcept {
+	return colourCodeTable[ch];
+}
+
+void XPM::FillRun(Surface *surface, int code, int startX, int y, int x) const {
+	if ((code != codeTransparent) && (startX != x)) {
+		const PRectangle rc = PRectangle::FromInts(startX, y, x, y + 1);
+		surface->FillRectangle(rc, ColourFromCode(code));
+	}
+}
+
+XPM::XPM(const char *textForm) {
+	Init(textForm);
+}
+
+XPM::XPM(const char *const *linesForm) {
+	Init(linesForm);
+}
+
+XPM::~XPM() {
+}
+
+void XPM::Init(const char *textForm) {
+	// Test done is two parts to avoid possibility of overstepping the memory
+	// if memcmp implemented strangely. Must be 4 bytes at least at destination.
+	if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) {
+		// Build the lines form out of the text form
+		std::vector<const char *> linesForm = LinesFormFromTextForm(textForm);
+		if (!linesForm.empty()) {
+			Init(&linesForm[0]);
+		}
+	} else {
+		// It is really in line form
+		Init(reinterpret_cast<const char * const *>(textForm));
+	}
+}
+
+void XPM::Init(const char *const *linesForm) {
+	height = 1;
+	width = 1;
+	nColours = 1;
+	pixels.clear();
+	codeTransparent = ' ';
+	if (!linesForm)
+		return;
+
+	std::fill(colourCodeTable, std::end(colourCodeTable), ColourRGBA(0, 0, 0));
+	const char *line0 = linesForm[0];
+	width = atoi(line0);
+	line0 = NextField(line0);
+	height = atoi(line0);
+	pixels.resize(width*height);
+	line0 = NextField(line0);
+	nColours = atoi(line0);
+	line0 = NextField(line0);
+	if (atoi(line0) != 1) {
+		// Only one char per pixel is supported
+		return;
+	}
+
+	for (int c=0; c<nColours; c++) {
+		const char *colourDef = linesForm[c+1];
+		const char code = colourDef[0];
+		colourDef += 4;
+		ColourRGBA colour(0, 0, 0, 0);
+		if (*colourDef == '#') {
+			colour = ColourFromHex(colourDef+1);
+		} else {
+			codeTransparent = code;
+		}
+		colourCodeTable[static_cast<unsigned char>(code)] = colour;
+	}
+
+	for (int y=0; y<height; y++) {
+		const char *lform = linesForm[y+nColours+1];
+		const size_t len = MeasureLength(lform);
+		for (size_t x = 0; x<len; x++)
+			pixels[y * width + x] = lform[x];
+	}
+}
+
+void XPM::Draw(Surface *surface, const PRectangle &rc) {
+	if (pixels.empty()) {
+		return;
+	}
+	// Centre the pixmap
+	const int startY = static_cast<int>(rc.top + (rc.Height() - height) / 2);
+	const int startX = static_cast<int>(rc.left + (rc.Width() - width) / 2);
+	for (int y=0; y<height; y++) {
+		int prevCode = 0;
+		int xStartRun = 0;
+		for (int x=0; x<width; x++) {
+			const int code = pixels[y * width + x];
+			if (code != prevCode) {
+				FillRun(surface, prevCode, startX + xStartRun, startY + y, startX + x);
+				xStartRun = x;
+				prevCode = code;
+			}
+		}
+		FillRun(surface, prevCode, startX + xStartRun, startY + y, startX + width);
+	}
+}
+
+ColourRGBA XPM::PixelAt(int x, int y) const noexcept {
+	if (pixels.empty() || (x < 0) || (x >= width) || (y < 0) || (y >= height)) {
+		// Out of bounds -> transparent black
+		return ColourRGBA(0, 0, 0, 0);
+	}
+	const int code = pixels[y * width + x];
+	return ColourFromCode(code);
+}
+
+std::vector<const char *> XPM::LinesFormFromTextForm(const char *textForm) {
+	// Build the lines form out of the text form
+	std::vector<const char *> linesForm;
+	int countQuotes = 0;
+	int strings=1;
+	int j=0;
+	for (; countQuotes < (2*strings) && textForm[j] != '\0'; j++) {
+		if (textForm[j] == '\"') {
+			if (countQuotes == 0) {
+				// First field: width, height, number of colours, chars per pixel
+				const char *line0 = textForm + j + 1;
+				// Skip width
+				line0 = NextField(line0);
+				// Add 1 line for each pixel of height
+				strings += atoi(line0);
+				line0 = NextField(line0);
+				// Add 1 line for each colour
+				strings += atoi(line0);
+			}
+			if (countQuotes / 2 >= strings) {
+				break;	// Bad height or number of colours!
+			}
+			if ((countQuotes & 1) == 0) {
+				linesForm.push_back(textForm + j + 1);
+			}
+			countQuotes++;
+		}
+	}
+	if (textForm[j] == '\0' || countQuotes / 2 > strings) {
+		// Malformed XPM! Height + number of colours too high or too low
+		linesForm.clear();
+	}
+	return linesForm;
+}
+
+RGBAImage::RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_) :
+	height(height_), width(width_), scale(scale_) {
+	if (pixels_) {
+		pixelBytes.assign(pixels_, pixels_ + CountBytes());
+	} else {
+		pixelBytes.resize(CountBytes());
+	}
+}
+
+RGBAImage::RGBAImage(const XPM &xpm) {
+	height = xpm.GetHeight();
+	width = xpm.GetWidth();
+	scale = 1;
+	pixelBytes.resize(CountBytes());
+	for (int y=0; y<height; y++) {
+		for (int x=0; x<width; x++) {
+			SetPixel(x, y, xpm.PixelAt(x, y));
+		}
+	}
+}
+
+RGBAImage::~RGBAImage() {
+}
+
+int RGBAImage::CountBytes() const noexcept {
+	return width * height * 4;
+}
+
+const unsigned char *RGBAImage::Pixels() const noexcept {
+	return &pixelBytes[0];
+}
+
+void RGBAImage::SetPixel(int x, int y, ColourRGBA colour) noexcept {
+	unsigned char *pixel = &pixelBytes[0] + (y * width + x) * 4;
+	// RGBA
+	pixel[0] = colour.GetRed();
+	pixel[1] = colour.GetGreen();
+	pixel[2] = colour.GetBlue();
+	pixel[3] = colour.GetAlpha();
+}
+
+// Transform a block of pixels from RGBA to BGRA with premultiplied alpha.
+// Used for DrawRGBAImage on some platforms.
+void RGBAImage::BGRAFromRGBA(unsigned char *pixelsBGRA, const unsigned char *pixelsRGBA, size_t count) noexcept {
+	for (size_t i = 0; i < count; i++) {
+		const unsigned char alpha = pixelsRGBA[3];
+		// Input is RGBA, output is BGRA with premultiplied alpha
+		pixelsBGRA[2] = pixelsRGBA[0] * alpha / 255;
+		pixelsBGRA[1] = pixelsRGBA[1] * alpha / 255;
+		pixelsBGRA[0] = pixelsRGBA[2] * alpha / 255;
+		pixelsBGRA[3] = alpha;
+		pixelsRGBA += bytesPerPixel;
+		pixelsBGRA += bytesPerPixel;
+	}
+}
+
+RGBAImageSet::RGBAImageSet() : height(-1), width(-1) {
+}
+
+RGBAImageSet::~RGBAImageSet() {
+	Clear();
+}
+
+/// Remove all images.
+void RGBAImageSet::Clear() noexcept {
+	images.clear();
+	height = -1;
+	width = -1;
+}
+
+/// Add an image.
+void RGBAImageSet::AddImage(int ident, std::unique_ptr<RGBAImage> image) {
+	images[ident] = std::move(image);
+	height = -1;
+	width = -1;
+}
+
+/// Get image by id.
+RGBAImage *RGBAImageSet::Get(int ident) {
+	ImageMap::iterator it = images.find(ident);
+	if (it != images.end()) {
+		return it->second.get();
+	}
+	return nullptr;
+}
+
+/// Give the largest height of the set.
+int RGBAImageSet::GetHeight() const {
+	if (height < 0) {
+		for (const std::pair<const int, std::unique_ptr<RGBAImage>> &image : images) {
+			if (height < image.second->GetHeight()) {
+				height = image.second->GetHeight();
+			}
+		}
+	}
+	return (height > 0) ? height : 0;
+}
+
+/// Give the largest width of the set.
+int RGBAImageSet::GetWidth() const {
+	if (width < 0) {
+		for (const std::pair<const int, std::unique_ptr<RGBAImage>> &image : images) {
+			if (width < image.second->GetWidth()) {
+				width = image.second->GetWidth();
+			}
+		}
+	}
+	return (width > 0) ? width : 0;
+}
diff --git a/scite-app/scintilla/src/XPM.h b/scite-app/scintilla/src/XPM.h
new file mode 100644
index 0000000..4ec0205
--- /dev/null
+++ b/scite-app/scintilla/src/XPM.h
@@ -0,0 +1,102 @@
+// Scintilla source code edit control
+/** @file XPM.h
+ ** Define a classes to hold image data in the X Pixmap (XPM) and RGBA formats.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef XPM_H
+#define XPM_H
+
+namespace Scintilla::Internal {
+
+/**
+ * Hold a pixmap in XPM format.
+ */
+class XPM {
+	int height=1;
+	int width=1;
+	int nColours=1;
+	std::vector<unsigned char> pixels;
+	ColourRGBA colourCodeTable[256];
+	char codeTransparent=' ';
+	ColourRGBA ColourFromCode(int ch) const noexcept;
+	void FillRun(Surface *surface, int code, int startX, int y, int x) const;
+public:
+	explicit XPM(const char *textForm);
+	explicit XPM(const char *const *linesForm);
+	XPM(const XPM &) = default;
+	XPM(XPM &&) noexcept = default;
+	XPM &operator=(const XPM &) = default;
+	XPM &operator=(XPM &&) noexcept = default;
+	~XPM();
+	void Init(const char *textForm);
+	void Init(const char *const *linesForm);
+	/// Decompose image into runs and use FillRectangle for each run
+	void Draw(Surface *surface, const PRectangle &rc);
+	int GetHeight() const noexcept { return height; }
+	int GetWidth() const noexcept { return width; }
+	ColourRGBA PixelAt(int x, int y) const noexcept;
+private:
+	static std::vector<const char *>LinesFormFromTextForm(const char *textForm);
+};
+
+/**
+ * A translucent image stored as a sequence of RGBA bytes.
+ */
+class RGBAImage {
+	int height;
+	int width;
+	float scale;
+	std::vector<unsigned char> pixelBytes;
+public:
+	static constexpr size_t bytesPerPixel = 4;
+	RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_);
+	explicit RGBAImage(const XPM &xpm);
+	RGBAImage(const RGBAImage &) = default;
+	RGBAImage(RGBAImage &&) noexcept = default;
+	RGBAImage &operator=(const RGBAImage &) = default;
+	RGBAImage &operator=(RGBAImage &&) noexcept = default;
+	virtual ~RGBAImage();
+	int GetHeight() const noexcept { return height; }
+	int GetWidth() const noexcept { return width; }
+	float GetScale() const noexcept { return scale; }
+	float GetScaledHeight() const noexcept { return height / scale; }
+	float GetScaledWidth() const noexcept { return width / scale; }
+	int CountBytes() const noexcept;
+	const unsigned char *Pixels() const noexcept;
+	void SetPixel(int x, int y, ColourRGBA colour) noexcept;
+	static void BGRAFromRGBA(unsigned char *pixelsBGRA, const unsigned char *pixelsRGBA, size_t count) noexcept;
+};
+
+/**
+ * A collection of RGBAImage pixmaps indexed by integer id.
+ */
+class RGBAImageSet {
+	typedef std::map<int, std::unique_ptr<RGBAImage>> ImageMap;
+	ImageMap images;
+	mutable int height;	///< Memorize largest height of the set.
+	mutable int width;	///< Memorize largest width of the set.
+public:
+	RGBAImageSet();
+	// Deleted so RGBAImageSet objects can not be copied.
+	RGBAImageSet(const RGBAImageSet &) = delete;
+	RGBAImageSet(RGBAImageSet &&) = delete;
+	RGBAImageSet &operator=(const RGBAImageSet &) = delete;
+	RGBAImageSet &operator=(RGBAImageSet &&) = delete;
+	~RGBAImageSet();
+	/// Remove all images.
+	void Clear() noexcept;
+	/// Add an image.
+	void AddImage(int ident, std::unique_ptr<RGBAImage> image);
+	/// Get image by id.
+	RGBAImage *Get(int ident);
+	/// Give the largest height of the set.
+	int GetHeight() const;
+	/// Give the largest width of the set.
+	int GetWidth() const;
+};
+
+}
+
+#endif
diff --git a/scite-app/scintilla/test/MessageNumbers.py b/scite-app/scintilla/test/MessageNumbers.py
new file mode 100644
index 0000000..440a0f6
--- /dev/null
+++ b/scite-app/scintilla/test/MessageNumbers.py
@@ -0,0 +1,64 @@
+# List many windows message numbers
+
+msgs = {
+"WM_ACTIVATE":6,
+"WM_ACTIVATEAPP":28,
+"WM_CAPTURECHANGED":533,
+"WM_CHAR":258,
+"WM_CLOSE":16,
+"WM_CREATE":1,
+"WM_COMMAND":273,
+"WM_DESTROY":2,
+"WM_ENTERSIZEMOVE":561,
+"WM_ERASEBKGND":20,
+"WM_EXITSIZEMOVE":562,
+"WM_GETMINMAXINFO":36,
+"WM_GETTEXT":13,
+"WM_GETTEXTLENGTH":14,
+"WM_IME_SETCONTEXT":0x0281,
+"WM_IME_NOTIFY":0x0282,
+"WM_KEYDOWN":256,
+"WM_KEYUP":257,
+"WM_KILLFOCUS":8,
+"WM_LBUTTONDOWN":513,
+"WM_LBUTTONUP":514,
+"WM_MBUTTONDOWN":519,
+"WM_MBUTTONUP":520,
+"WM_MBUTTONDBLCLK":521,
+"WM_MOUSEACTIVATE":33,
+"WM_MOUSEMOVE":512,
+"WM_MOVE":3,
+"WM_MOVING":534,
+"WM_NCACTIVATE":134,
+"WM_NCCALCSIZE":131,
+"WM_NCCREATE":129,
+"WM_NCDESTROY":130,
+"WM_NCHITTEST":132,
+"WM_NCLBUTTONDBLCLK":163,
+"WM_NCLBUTTONDOWN":161,
+"WM_NCLBUTTONUP":162,
+"WM_NCMOUSEMOVE":160,
+"WM_NCPAINT":133,
+"WM_PAINT":15,
+"WM_PARENTNOTIFY":528,
+"WM_SETCURSOR":32,
+"WM_SETFOCUS":7,
+"WM_SETFONT":48,
+"WM_SETTEXT":12,
+"WM_SHOWWINDOW":24,
+"WM_SIZE":5,
+"WM_SIZING":532,
+"WM_SYNCPAINT":136,
+"WM_SYSCOMMAND":274,
+"WM_SYSKEYDOWN":260,
+"WM_TIMER":275,
+"WM_USER":1024,
+"WM_USER+1":1025,
+"WM_WINDOWPOSCHANGED":71,
+"WM_WINDOWPOSCHANGING":70,
+}
+
+sgsm={}
+for k,v in msgs.items():
+	sgsm[v] = k
+
diff --git a/scite-app/scintilla/test/README b/scite-app/scintilla/test/README
new file mode 100644
index 0000000..53bfb7c
--- /dev/null
+++ b/scite-app/scintilla/test/README
@@ -0,0 +1,30 @@
+The test directory contains some unit and performance tests for Scintilla.
+
+The tests can only be run on Windows or Linux/Qt using Python 2.7 or 3.x.
+Python 2.7+ is required because the bytes string type and literals are available.
+Scintilla must be built before running any tests.
+
+A test application for Windows only is in xite.py and this can be run to experiment:
+pythonw xite.py
+
+To run the basic tests:
+python simpleTests.py
+
+There are some lexing tests with simple input files in several languages in the examples
+subdirectory and their expected lexed states in *.styled where the start of each style
+is marked with {styleNumber}, for example:
+{15}<%@{16}language=javas{15}%>{0}
+
+To run the lexing tests:
+python lexTests.py
+
+To check for performance regressions:
+python performanceTests.py
+While each test run will be different and the timer has only limited granularity, some results
+from a 2 GHz Athlon with a DEBUG build are:
+ 0.187 testAddLine
+. 0.203 testAddLineMiddle
+. 0.171 testHuge
+. 0.203 testHugeInserts
+. 0.312 testHugeReplace
+.
diff --git a/scite-app/scintilla/test/ScintillaCallable.py b/scite-app/scintilla/test/ScintillaCallable.py
new file mode 100644
index 0000000..1164631
--- /dev/null
+++ b/scite-app/scintilla/test/ScintillaCallable.py
@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+import ctypes, os, sys
+
+from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long, c_ssize_t
+
+def IsEnumeration(t):
+	return t[:1].isupper()
+
+basicTypes = ["bool", "int", "position", "line", "pointer", "colour", "colouralpha"]
+
+def BasicTypeOrEnumeration(t):
+	return t in basicTypes or IsEnumeration(t)
+
+class TEXTRANGE(ctypes.Structure):
+	_fields_= (\
+		('cpMin', c_long),
+		('cpMax', c_long),
+		('lpstrText', ctypes.POINTER(ctypes.c_char)),
+	)
+
+class FINDTEXT(ctypes.Structure):
+	_fields_= (\
+		('cpMin', c_long),
+		('cpMax', c_long),
+		('lpstrText', c_char_p),
+		('cpMinText', c_long),
+		('cpMaxText', c_long),
+	)
+
+class SciCall:
+	def __init__(self, fn, ptr, msg, stringResult=False):
+		self._fn = fn
+		self._ptr = ptr
+		self._msg = msg
+		self._stringResult = stringResult
+	def __call__(self, w=0, l=0):
+		ww = ctypes.cast(w, c_char_p)
+		if self._stringResult:
+			lengthBytes = self._fn(self._ptr, self._msg, ww, None)
+			if lengthBytes == 0:
+				return bytearray()
+			result = (ctypes.c_byte * lengthBytes)(0)
+			lengthBytes2 = self._fn(self._ptr, self._msg, ww, ctypes.cast(result, c_char_p))
+			assert lengthBytes == lengthBytes2
+			return bytearray(result)[:lengthBytes]
+		else:
+			ll = ctypes.cast(l, c_char_p)
+			return self._fn(self._ptr, self._msg, ww, ll)
+
+sciFX = ctypes.CFUNCTYPE(c_ssize_t, c_char_p, c_int, c_char_p, c_char_p)
+
+class ScintillaCallable:
+	def __init__(self, face, scifn, sciptr):
+		self.__dict__["face"] = face
+		self.__dict__["used"] = set()
+		self.__dict__["all"] = set()
+		# The k member is for accessing constants as a dictionary
+		self.__dict__["k"] = {}
+		for f in face.features:
+			self.all.add(f)
+			if face.features[f]["FeatureType"] == "val":
+				self.k[f] = int(self.face.features[f]["Value"], 0)
+			elif face.features[f]["FeatureType"] == "evt":
+				self.k["SCN_"+f] = int(self.face.features[f]["Value"], 0)
+		scifn = sciFX(scifn)
+		self.__dict__["_scifn"] = scifn
+		self.__dict__["_sciptr"] = sciptr
+	def __getattr__(self, name):
+		if name in self.face.features:
+			self.used.add(name)
+			feature = self.face.features[name]
+			value = int(feature["Value"], 0)
+			#~ print("Feature", name, feature)
+			if feature["FeatureType"] == "val":
+				self.__dict__[name] = value
+				return value
+			else:
+				if feature["Param2Type"] == "stringresult" and \
+					name not in ["GetText", "GetLine", "GetCurLine"]:
+					return SciCall(self._scifn, self._sciptr, value, True)
+				else:
+					return SciCall(self._scifn, self._sciptr, value)
+		elif ("Get" + name) in self.face.features:
+			self.used.add("Get" + name)
+			feature = self.face.features["Get" + name]
+			value = int(feature["Value"], 0)
+			if feature["FeatureType"] == "get" and \
+				not name.startswith("Get") and \
+				not feature["Param1Type"] and \
+				not feature["Param2Type"] and \
+				BasicTypeOrEnumeration(feature["ReturnType"]):
+				#~ print("property", feature)
+				return self._scifn(self._sciptr, value, None, None)
+		elif name.startswith("SCN_") and name in self.k:
+			self.used.add(name)
+			feature = self.face.features[name[4:]]
+			value = int(feature["Value"], 0)
+			#~ print("Feature", name, feature)
+			if feature["FeatureType"] == "val":
+				return value
+		raise AttributeError(name)
+	def __setattr__(self, name, val):
+		if ("Set" + name) in self.face.features:
+			self.used.add("Set" + name)
+			feature = self.face.features["Set" + name]
+			value = int(feature["Value"], 0)
+			#~ print("setproperty", feature)
+			if feature["FeatureType"] == "set" and not name.startswith("Set"):
+				if BasicTypeOrEnumeration(feature["Param1Type"]):
+					return self._scifn(self._sciptr, value, c_char_p(val), None)
+				elif feature["Param2Type"] in ["string"]:
+					return self._scifn(self._sciptr, value, None, c_char_p(val))
+				raise AttributeError(name)
+		raise AttributeError(name)
+	def getvalue(self, name):
+		if name in self.face.features:
+			feature = self.face.features[name]
+			if feature["FeatureType"] != "evt":
+				try:
+					return int(feature["Value"], 0)
+				except ValueError:
+					return -1
+		return -1
+
+
+	def ByteRange(self, start, end):
+		tr = TEXTRANGE()
+		tr.cpMin = start
+		tr.cpMax = end
+		length = end - start
+		tr.lpstrText = ctypes.create_string_buffer(length + 1)
+		self.GetTextRange(0, ctypes.byref(tr))
+		text = tr.lpstrText[:length]
+		text += b"\0" * (length - len(text))
+		return text
+	def StyledTextRange(self, start, end):
+		tr = TEXTRANGE()
+		tr.cpMin = start
+		tr.cpMax = end
+		length = 2 * (end - start)
+		tr.lpstrText = ctypes.create_string_buffer(length + 2)
+		self.GetStyledText(0, ctypes.byref(tr))
+		styledText = tr.lpstrText[:length]
+		styledText += b"\0" * (length - len(styledText))
+		return styledText
+	def FindBytes(self, start, end, s, flags):
+		ft = FINDTEXT()
+		ft.cpMin = start
+		ft.cpMax = end
+		ft.lpstrText = s
+		ft.cpMinText = 0
+		ft.cpMaxText = 0
+		pos = self.FindText(flags, ctypes.byref(ft))
+		#~ print(start, end, ft.cpMinText, ft.cpMaxText)
+		return pos
+
+	def Contents(self):
+		return self.ByteRange(0, self.Length)
+
+	def SetContents(self, s):
+		self.TargetStart = 0
+		self.TargetEnd = self.Length
+		self.ReplaceTarget(len(s), s)
+
diff --git a/scite-app/scintilla/test/XiteMenu.py b/scite-app/scintilla/test/XiteMenu.py
new file mode 100644
index 0000000..b047cf8
--- /dev/null
+++ b/scite-app/scintilla/test/XiteMenu.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+
+""" Define the menu structure used by the Pentacle applications """
+
+MenuStructure = [
+	["&File", [
+		["&New", "<control>N"],
+		["&Open...", "<control>O"],
+		["&Save", "<control>S"],
+		["Save &As...", "<control><shift>S"],
+		["Test", ""],
+		["Exercised", ""],
+		["Uncalled", ""],
+		["-", ""],
+		["&Exit", ""]]],
+	[ "&Edit", [
+		["&Undo", "<control>Z"],
+		["&Redo", "<control>Y"],
+		["-", ""],
+		["Cu&t", "<control>X"],
+		["&Copy", "<control>C"],
+		["&Paste", "<control>V"],
+		["&Delete", "Del"],
+		["Select &All", "<control>A"],
+		]],
+]
diff --git a/scite-app/scintilla/test/XiteQt.py b/scite-app/scintilla/test/XiteQt.py
new file mode 100644
index 0000000..e91829a
--- /dev/null
+++ b/scite-app/scintilla/test/XiteQt.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+# Requires Python 2.7 or later
+
+import ctypes, os, platform, sys, unittest
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+import ScintillaCallable
+
+sys.path.append("..")
+from bin import ScintillaEditPy
+
+scintillaDirectory = ".."
+scintillaIncludeDirectory = os.path.join(scintillaDirectory, "include")
+scintillaScriptsDirectory = os.path.join(scintillaDirectory, "scripts")
+sys.path.append(scintillaScriptsDirectory)
+import Face
+
+scintillaIncludesLexers = False
+# Lexilla may optionally be tested it is built and can be loaded
+lexillaAvailable = False
+
+lexillaDirectory = os.path.join(scintillaDirectory, "..", "lexilla")
+lexillaBinDirectory = os.path.join(lexillaDirectory, "bin")
+lexillaIncludeDirectory = os.path.join(lexillaDirectory, "include")
+
+lexName = "liblexilla.so"
+try:
+	lexillaSOPath = os.path.join(lexillaBinDirectory, lexName)
+	lexillaLibrary = ctypes.cdll.LoadLibrary(lexillaSOPath)
+	createLexer = lexillaLibrary.CreateLexer
+	createLexer.restype = ctypes.c_void_p
+	lexillaAvailable = True
+	print("Found Lexilla")
+except OSError:
+	print("Can't find " + lexName)
+	print("Python is built for " + " ".join(platform.architecture()))
+
+class Form(QDialog):
+
+	def __init__(self, parent=None):
+		super(Form, self).__init__(parent)
+		self.resize(460,300)
+		# Create widget
+		self.edit = ScintillaEditPy.ScintillaEdit(self)
+
+class XiteWin():
+	def __init__(self, test=""):
+		self.face = Face.Face()
+		self.face.ReadFromFile(os.path.join(scintillaIncludeDirectory, "Scintilla.iface"))
+		try:
+			faceLex = Face.Face()
+			faceLex.ReadFromFile(os.path.join(lexillaIncludeDirectory, "LexicalStyles.iface"))
+			self.face.features.update(faceLex.features)
+		except FileNotFoundError:
+			print("Can't find " + "LexicalStyles.iface")
+
+		self.test = test
+
+		self.form = Form()
+
+		scifn = self.form.edit.send(int(self.face.features["GetDirectFunction"]["Value"]), 0, 0)
+		sciptr = ctypes.c_char_p(self.form.edit.send(
+			int(self.face.features["GetDirectPointer"]["Value"]), 0,0))
+
+		self.ed = ScintillaCallable.ScintillaCallable(self.face, scifn, sciptr)
+		self.form.show()
+
+	def DoStuff(self):
+		print(self.test)
+		self.CmdTest()
+
+	def DoEvents(self):
+		QApplication.processEvents()
+
+	def CmdTest(self):
+		runner = unittest.TextTestRunner()
+		tests = unittest.defaultTestLoader.loadTestsFromName(self.test)
+		results = runner.run(tests)
+		print(results)
+		sys.exit(0)
+
+	def ChooseLexer(self, lexer):
+		if scintillaIncludesLexers:
+			self.ed.LexerLanguage = lexer
+		elif lexillaAvailable:
+			pLexilla = createLexer(lexer)
+			self.ed.SetILexer(0, pLexilla)
+		else:	# No lexers available
+			pass
+
+xiteFrame = None
+
+def main(test):
+	global xiteFrame
+	app = QApplication(sys.argv)
+	xiteFrame = XiteWin(test)
+	xiteFrame.DoStuff()
+	sys.exit(app.exec_())
diff --git a/scite-app/scintilla/test/XiteWin.py b/scite-app/scintilla/test/XiteWin.py
new file mode 100644
index 0000000..c71db04
--- /dev/null
+++ b/scite-app/scintilla/test/XiteWin.py
@@ -0,0 +1,578 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 3.6 or later
+
+from __future__ import with_statement
+from __future__ import unicode_literals
+
+import os, platform, sys, unittest
+
+import ctypes
+from ctypes import wintypes
+from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long
+from ctypes.wintypes import HWND, WPARAM, LPARAM, HANDLE, HBRUSH, LPCWSTR
+user32=ctypes.windll.user32
+gdi32=ctypes.windll.gdi32
+kernel32=ctypes.windll.kernel32
+from MessageNumbers import msgs, sgsm
+
+import ScintillaCallable
+import XiteMenu
+
+scintillaIncludesLexers = False
+# Lexilla may optionally be tested it is built and can be loaded
+lexillaAvailable = False
+
+scintillaDirectory = ".."
+scintillaIncludeDirectory = os.path.join(scintillaDirectory, "include")
+scintillaScriptsDirectory = os.path.join(scintillaDirectory, "scripts")
+sys.path.append(scintillaScriptsDirectory)
+import Face
+
+scintillaBinDirectory = os.path.join(scintillaDirectory, "bin")
+
+lexillaDirectory = os.path.join(scintillaDirectory, "..", "lexilla")
+lexillaBinDirectory = os.path.join(lexillaDirectory, "bin")
+lexillaIncludeDirectory = os.path.join(lexillaDirectory, "include")
+
+lexName = "Lexilla.DLL"
+try:
+	lexillaDLLPath = os.path.join(lexillaBinDirectory, lexName)
+	lexillaLibrary = ctypes.cdll.LoadLibrary(lexillaDLLPath)
+	createLexer = lexillaLibrary.CreateLexer
+	createLexer.restype = ctypes.c_void_p
+	lexillaAvailable = True
+	print("Found Lexilla")
+except OSError:
+	print("Can't find " + lexName)
+	print("Python is built for " + " ".join(platform.architecture()))
+
+WFUNC = ctypes.WINFUNCTYPE(c_int, HWND, c_uint, WPARAM, LPARAM)
+
+WS_CHILD = 0x40000000
+WS_CLIPCHILDREN = 0x2000000
+WS_OVERLAPPEDWINDOW = 0xcf0000
+WS_VISIBLE = 0x10000000
+WS_HSCROLL = 0x100000
+WS_VSCROLL = 0x200000
+WA_INACTIVE = 0
+MF_POPUP = 16
+MF_SEPARATOR = 0x800
+IDYES = 6
+OFN_HIDEREADONLY = 4
+MB_OK = 0
+MB_YESNOCANCEL = 3
+MF_CHECKED = 8
+MF_UNCHECKED = 0
+SW_SHOW = 5
+PM_REMOVE = 1
+
+VK_SHIFT = 16
+VK_CONTROL = 17
+VK_MENU = 18
+
+class OPENFILENAME(ctypes.Structure):
+	_fields_ = (("lStructSize", c_int),
+		("hwndOwner", c_int),
+		("hInstance", c_int),
+		("lpstrFilter", c_wchar_p),
+		("lpstrCustomFilter", c_char_p),
+		("nMaxCustFilter", c_int),
+		("nFilterIndex", c_int),
+		("lpstrFile", c_wchar_p),
+		("nMaxFile", c_int),
+		("lpstrFileTitle", c_wchar_p),
+		("nMaxFileTitle", c_int),
+		("lpstrInitialDir", c_wchar_p),
+		("lpstrTitle", c_wchar_p),
+		("flags", c_int),
+		("nFileOffset", c_ushort),
+		("nFileExtension", c_ushort),
+		("lpstrDefExt", c_char_p),
+		("lCustData", c_int),
+		("lpfnHook", c_char_p),
+		("lpTemplateName", c_char_p),
+		("pvReserved", c_char_p),
+		("dwReserved", c_int),
+		("flagsEx", c_int))
+
+	def __init__(self, win, title):
+		ctypes.Structure.__init__(self)
+		self.lStructSize = ctypes.sizeof(OPENFILENAME)
+		self.nMaxFile = 1024
+		self.hwndOwner = win
+		self.lpstrTitle = title
+		self.Flags = OFN_HIDEREADONLY
+
+trace = False
+#~ trace = True
+
+def WindowSize(w):
+	rc = ctypes.wintypes.RECT()
+	user32.GetClientRect(w, ctypes.byref(rc))
+	return rc.right - rc.left, rc.bottom - rc.top
+
+def IsKeyDown(key):
+	return (user32.GetKeyState(key) & 0x8000) != 0
+
+def KeyTranslate(w):
+	tr = { 9: "Tab", 0xD:"Enter", 0x1B: "Esc" }
+	if w in tr:
+		return tr[w]
+	elif ord("A") <= w <= ord("Z"):
+		return chr(w)
+	elif 0x70 <= w <= 0x7b:
+		return "F" + str(w-0x70+1)
+	else:
+		return "Unknown_" + hex(w)
+
+class WNDCLASS(ctypes.Structure):
+	_fields_= (\
+		('style', c_int),
+		('lpfnWndProc', WFUNC),
+		('cls_extra', c_int),
+		('wnd_extra', c_int),
+		('hInst', HANDLE),
+		('hIcon', HANDLE),
+		('hCursor', HANDLE),
+		('hbrBackground', HBRUSH),
+		('menu_name', LPCWSTR),
+		('lpzClassName', LPCWSTR),
+	)
+
+hinst = ctypes.windll.kernel32.GetModuleHandleW(0)
+
+def RegisterClass(name, func, background = 0):
+	# register a window class for toplevel windows.
+	wc = WNDCLASS()
+	wc.style = 0
+	wc.lpfnWndProc = func
+	wc.cls_extra = 0
+	wc.wnd_extra = 0
+	wc.hInst = hinst
+	wc.hIcon = 0
+	wc.hCursor = 0
+	wc.hbrBackground = background
+	wc.menu_name = None
+	wc.lpzClassName = name
+	user32.RegisterClassW(ctypes.byref(wc))
+
+
+class XiteWin():
+	def __init__(self, test=""):
+		self.face = Face.Face()
+		self.face.ReadFromFile(os.path.join(scintillaIncludeDirectory, "Scintilla.iface"))
+		try:
+			faceLex = Face.Face()
+			faceLex.ReadFromFile(os.path.join(lexillaIncludeDirectory, "LexicalStyles.iface"))
+			self.face.features.update(faceLex.features)
+		except FileNotFoundError:
+			print("Can't find " + "LexicalStyles.iface")
+
+		self.titleDirty = True
+		self.fullPath = ""
+		self.test = test
+
+		self.appName = "xite"
+
+		self.large = "-large" in sys.argv
+
+		self.cmds = {}
+		self.windowName = "XiteWindow"
+		self.wfunc = WFUNC(self.WndProc)
+		RegisterClass(self.windowName, self.wfunc)
+		user32.CreateWindowExW(0, self.windowName, self.appName, \
+			WS_VISIBLE | WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, \
+			0, 0, 500, 700, 0, 0, hinst, 0)
+
+		args = [a for a in sys.argv[1:] if not a.startswith("-")]
+		self.SetMenus()
+		if args:
+			self.GrabFile(args[0])
+			self.FocusOnEditor()
+			self.ed.GotoPos(self.ed.Length)
+
+		if self.test:
+			print(self.test)
+			for k in self.cmds:
+				if self.cmds[k] == "Test":
+					user32.PostMessageW(self.win, msgs["WM_COMMAND"], k, 0)
+
+	def FocusOnEditor(self):
+		user32.SetFocus(self.sciHwnd)
+
+	def OnSize(self):
+		width, height = WindowSize(self.win)
+		user32.SetWindowPos(self.sciHwnd, 0, 0, 0, width, height, 0)
+		user32.InvalidateRect(self.win, 0, 0)
+
+	def OnCreate(self, hwnd):
+		self.win = hwnd
+		if scintillaIncludesLexers:
+			sciName = "SciLexer.DLL"
+		else:
+			sciName = "Scintilla.DLL"
+		try:
+			scintillaDLLPath = os.path.join(scintillaBinDirectory, sciName)
+			ctypes.cdll.LoadLibrary(scintillaDLLPath)
+		except OSError:
+			print("Can't find " + sciName)
+			print("Python is built for " + " ".join(platform.architecture()))
+			sys.exit()
+		self.sciHwnd = user32.CreateWindowExW(0,
+			"Scintilla", "Source",
+			WS_CHILD | WS_VSCROLL | WS_HSCROLL | WS_CLIPCHILDREN,
+			0, 0, 100, 100, self.win, 0, hinst, 0)
+		user32.ShowWindow(self.sciHwnd, SW_SHOW)
+		user32.SendMessageW.restype = WPARAM
+		scifn = user32.SendMessageW(self.sciHwnd,
+			int(self.face.features["GetDirectFunction"]["Value"], 0), 0,0)
+		sciptr = c_char_p(user32.SendMessageW(self.sciHwnd,
+			int(self.face.features["GetDirectPointer"]["Value"], 0), 0,0))
+		self.ed = ScintillaCallable.ScintillaCallable(self.face, scifn, sciptr)
+		if self.large:
+			doc = self.ed.CreateDocument(10, 0x100)
+			self.ed.SetDocPointer(0, doc)
+
+		self.FocusOnEditor()
+
+	def ChooseLexer(self, lexer):
+		if scintillaIncludesLexers:
+			self.ed.LexerLanguage = lexer
+		elif lexillaAvailable:
+			pLexilla = createLexer(lexer)
+			self.ed.SetILexer(0, pLexilla)
+		else:	# No lexers available
+			pass
+
+	def Invalidate(self):
+		user32.InvalidateRect(self.win, 0, 0)
+
+	def WndProc(self, h, m, w, l):
+		user32.DefWindowProcW.argtypes = [HWND, c_uint, WPARAM, LPARAM]
+		ms = sgsm.get(m, "XXX")
+		if trace:
+			print("%s %s %s %s" % (hex(h)[2:],ms,w,l))
+		if ms == "WM_CLOSE":
+			user32.PostQuitMessage(0)
+		elif ms == "WM_CREATE":
+			self.OnCreate(h)
+			return 0
+		elif ms == "WM_SIZE":
+			# Work out size
+			if w != 1:
+				self.OnSize()
+			return 0
+		elif ms == "WM_COMMAND":
+			cmdCode = w & 0xffff
+			if cmdCode in self.cmds:
+				self.Command(self.cmds[cmdCode])
+			return 0
+		elif ms == "WM_ACTIVATE":
+			if w != WA_INACTIVE:
+				self.FocusOnEditor()
+			return 0
+		else:
+			return user32.DefWindowProcW(h, m, w, l)
+		return 0
+
+	def Command(self, name):
+		name = name.replace(" ", "")
+		method = "Cmd" + name
+		cmd = None
+		try:
+			cmd = getattr(self, method)
+		except AttributeError:
+			return
+		if cmd:
+			cmd()
+
+	def KeyDown(self, w, prefix = ""):
+		keyName = prefix
+		if IsKeyDown(VK_CONTROL):
+			keyName += "<control>"
+		if IsKeyDown(VK_SHIFT):
+			keyName += "<shift>"
+		keyName += KeyTranslate(w)
+		if trace:
+			print("Key:", keyName)
+		if keyName in self.keys:
+			method = "Cmd" + self.keys[keyName]
+			getattr(self, method)()
+			return True
+		#~ print("UKey:", keyName)
+		return False
+
+	def Accelerator(self, msg):
+		ms = sgsm.get(msg.message, "XXX")
+		if ms == "WM_KEYDOWN":
+			return self.KeyDown(msg.wParam)
+		elif ms == "WM_SYSKEYDOWN":
+			return self.KeyDown(msg.wParam, "<alt>")
+		return False
+
+	def AppLoop(self):
+		msg = ctypes.wintypes.MSG()
+		lpmsg = ctypes.byref(msg)
+		while user32.GetMessageW(lpmsg, 0, 0, 0):
+			if trace and msg.message != msgs["WM_TIMER"]:
+				print('mm', hex(msg.hWnd)[2:],sgsm.get(msg.message, "XXX"))
+			if not self.Accelerator(msg):
+				user32.TranslateMessage(lpmsg)
+				user32.DispatchMessageW(lpmsg)
+
+	def DoEvents(self):
+		msg = ctypes.wintypes.MSG()
+		lpmsg = ctypes.byref(msg)
+		cont = True
+		while cont:
+			cont = user32.PeekMessageW(lpmsg, 0, 0, 0, PM_REMOVE)
+			if cont:
+				if not self.Accelerator(msg):
+					user32.TranslateMessage(lpmsg)
+					user32.DispatchMessageW(lpmsg)
+
+	def SetTitle(self, changePath):
+		if changePath or self.titleDirty != self.ed.Modify:
+			self.titleDirty = self.ed.Modify
+			self.title = self.fullPath
+			if self.titleDirty:
+				self.title += " * "
+			else:
+				self.title += " - "
+			self.title += self.appName
+			if self.win:
+				user32.SetWindowTextW(self.win, self.title)
+
+	def Open(self):
+		ofx = OPENFILENAME(self.win, "Open File")
+		opath = ctypes.create_unicode_buffer(1024)
+		ofx.lpstrFile = ctypes.addressof(opath)
+		filters = ["Python (.py;.pyw)|*.py;*.pyw|All|*.*"]
+		filterText = "\0".join([f.replace("|", "\0") for f in filters])+"\0\0"
+		ofx.lpstrFilter = filterText
+		if ctypes.windll.comdlg32.GetOpenFileNameW(ctypes.byref(ofx)):
+			absPath = opath.value.replace("\0", "")
+			self.GrabFile(absPath)
+			self.FocusOnEditor()
+			self.ed.LexerLanguage = b"python"
+			self.ed.Lexer = self.ed.SCLEX_PYTHON
+			self.ed.SetKeyWords(0, b"class def else for from if import print return while")
+			for style in [k for k in self.ed.k if k.startswith("SCE_P_")]:
+				self.ed.StyleSetFont(self.ed.k[style], b"Verdana")
+				if "COMMENT" in style:
+					self.ed.StyleSetFore(self.ed.k[style], 127 * 256)
+					self.ed.StyleSetFont(self.ed.k[style], b"Comic Sans MS")
+				elif "OPERATOR" in style:
+					self.ed.StyleSetBold(self.ed.k[style], 1)
+					self.ed.StyleSetFore(self.ed.k[style], 127 * 256 * 256)
+				elif "WORD" in style:
+					self.ed.StyleSetItalic(self.ed.k[style], 255)
+					self.ed.StyleSetFore(self.ed.k[style], 255 * 256 * 256)
+				elif "TRIPLE" in style:
+					self.ed.StyleSetFore(self.ed.k[style], 0xA0A0)
+				elif "STRING" in style or "CHARACTER" in style:
+					self.ed.StyleSetFore(self.ed.k[style], 0xA000A0)
+				else:
+					self.ed.StyleSetFore(self.ed.k[style], 0)
+
+	def SaveAs(self):
+		ofx = OPENFILENAME(self.win, "Save File")
+		opath = "\0" * 1024
+		ofx.lpstrFile = opath
+		if ctypes.windll.comdlg32.GetSaveFileNameW(ctypes.byref(ofx)):
+			self.fullPath = opath.replace("\0", "")
+			self.Save()
+			self.SetTitle(1)
+			self.FocusOnEditor()
+
+	def SetMenus(self):
+		ui = XiteMenu.MenuStructure
+		self.cmds = {}
+		self.keys = {}
+
+		cmdId = 0
+		self.menuBar = user32.CreateMenu()
+		for name, contents in ui:
+			cmdId += 1
+			menu = user32.CreateMenu()
+			for item in contents:
+				text, key = item
+				cmdText = text.replace("&", "")
+				cmdText = cmdText.replace("...", "")
+				cmdText = cmdText.replace(" ", "")
+				cmdId += 1
+				if key:
+					keyText = key.replace("<control>", "Ctrl+")
+					keyText = keyText.replace("<shift>", "Shift+")
+					text += "\t" + keyText
+				if text == "-":
+					user32.AppendMenuW(menu, MF_SEPARATOR, cmdId, text)
+				else:
+					user32.AppendMenuW(menu, 0, cmdId, text)
+				self.cmds[cmdId] = cmdText
+				self.keys[key] = cmdText
+				#~ print(cmdId, item)
+			user32.AppendMenuW(self.menuBar, MF_POPUP, menu, name)
+		user32.SetMenu(self.win, self.menuBar)
+		self.CheckMenuItem("Wrap", True)
+		user32.ShowWindow(self.win, SW_SHOW)
+
+	def CheckMenuItem(self, name, val):
+		#~ print(name, val)
+		if self.cmds:
+			for k,v in self.cmds.items():
+				if v == name:
+					#~ print(name, k)
+					user32.CheckMenuItem(user32.GetMenu(self.win), \
+						k, [MF_UNCHECKED, MF_CHECKED][val])
+
+	def Exit(self):
+		sys.exit(0)
+
+	def DisplayMessage(self, msg, ask):
+		return IDYES == user32.MessageBoxW(self.win, \
+			msg, self.appName, [MB_OK, MB_YESNOCANCEL][ask])
+
+	def NewDocument(self):
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.SetSavePoint()
+
+	def SaveIfUnsure(self):
+		if self.ed.Modify:
+			msg = "Save changes to \"" + self.fullPath + "\"?"
+			print(msg)
+			decision = self.DisplayMessage(msg, True)
+			if decision:
+				self.CmdSave()
+			return decision
+		return True
+
+	def New(self):
+		if self.SaveIfUnsure():
+			self.fullPath = ""
+			self.overrideMode = None
+			self.NewDocument()
+			self.SetTitle(1)
+		self.Invalidate()
+
+	def CheckMenus(self):
+		pass
+
+	def MoveSelection(self, caret, anchor=-1):
+		if anchor == -1:
+			anchor = caret
+		self.ed.SetSelectionStart(caret)
+		self.ed.SetSelectionEnd(anchor)
+		self.ed.ScrollCaret()
+		self.Invalidate()
+
+	def GrabFile(self, name):
+		self.fullPath = name
+		self.overrideMode = None
+		self.NewDocument()
+		fsr = open(name, "rb")
+		data = fsr.read()
+		fsr.close()
+		self.ed.AddText(len(data), data)
+		self.ed.EmptyUndoBuffer()
+		self.MoveSelection(0)
+		self.SetTitle(1)
+
+	def Save(self):
+		fos = open(self.fullPath, "wb")
+		blockSize = 1024
+		length = self.ed.Length
+		i = 0
+		while i < length:
+			grabSize = length - i
+			if grabSize > blockSize:
+				grabSize = blockSize
+			#~ print(i, grabSize, length)
+			data = self.ed.ByteRange(i, i + grabSize)
+			fos.write(data)
+			i += grabSize
+		fos.close()
+		self.ed.SetSavePoint()
+		self.SetTitle(0)
+
+	# Command handlers are called by menu actions
+
+	def CmdNew(self):
+		self.New()
+
+	def CmdOpen(self):
+		self.Open()
+
+	def CmdSave(self):
+		if (self.fullPath == None) or (len(self.fullPath) == 0):
+			self.SaveAs()
+		else:
+			self.Save()
+
+	def CmdSaveAs(self):
+		self.SaveAs()
+
+	def CmdTest(self):
+		runner = unittest.TextTestRunner()
+		if self.test:
+			tests = unittest.defaultTestLoader.loadTestsFromName(self.test)
+		else:
+			tests = unittest.defaultTestLoader.loadTestsFromName("simpleTests")
+		results = runner.run(tests)
+		#~ print(results)
+		if self.test:
+			user32.PostQuitMessage(0)
+
+	def CmdExercised(self):
+		print()
+		unused = sorted(self.ed.all.difference(self.ed.used))
+		print("Unused", len(unused))
+		print()
+		print("\n".join(unused))
+		print()
+		print("Used", len(self.ed.used))
+		print()
+		print("\n".join(sorted(self.ed.used)))
+
+	def Uncalled(self):
+		print("")
+		unused = sorted(self.ed.all.difference(self.ed.used))
+		uu = {}
+		for u in unused:
+			v = self.ed.getvalue(u)
+			if v > 2000:
+				uu[v] = u
+		#~ for x in sorted(uu.keys())[150:]:
+		return uu
+
+	def CmdExit(self):
+		self.Exit()
+
+	def CmdUndo(self):
+		self.ed.Undo()
+
+	def CmdRedo(self):
+		self.ed.Redo()
+
+	def CmdCut(self):
+		self.ed.Cut()
+
+	def CmdCopy(self):
+		self.ed.Copy()
+
+	def CmdPaste(self):
+		self.ed.Paste()
+
+	def CmdDelete(self):
+		self.ed.Clear()
+
+xiteFrame = None
+
+def main(test):
+	global xiteFrame
+	xiteFrame = XiteWin(test)
+	xiteFrame.AppLoop()
+	#~ xiteFrame.CmdExercised()
+	return xiteFrame.Uncalled()
diff --git a/scite-app/scintilla/test/gi/Scintilla-0.1.gir.good b/scite-app/scintilla/test/gi/Scintilla-0.1.gir.good
new file mode 100644
index 0000000..771edae
--- /dev/null
+++ b/scite-app/scintilla/test/gi/Scintilla-0.1.gir.good
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+<!-- This file was automatically generated from C sources - DO NOT EDIT!
+To affect the contents of this file, edit the original C definitions,
+and/or use gtk-doc annotations.  -->
+<repository version="1.2"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+  <include name="Gtk" version="3.0"/>
+  <c:include name="Scintilla.h"/>
+  <c:include name="ScintillaWidget.h"/>
+  <namespace name="Scintilla"
+             version="0.1"
+             shared-library="libscintilla.so"
+             c:identifier-prefixes="Scintilla"
+             c:symbol-prefixes="scintilla">
+    <alias name="Sci_Position" c:type="Sci_Position">
+      <type name="gint" c:type="int"/>
+    </alias>
+    <alias name="Sci_PositionCR" c:type="Sci_PositionCR">
+      <type name="glong" c:type="long"/>
+    </alias>
+    <alias name="Sci_PositionU" c:type="Sci_PositionU">
+      <type name="guint" c:type="unsigned int"/>
+    </alias>
+    <alias name="Sci_SurfaceID" c:type="Sci_SurfaceID">
+      <type name="gpointer" c:type="gpointer"/>
+    </alias>
+    <alias name="sptr_t" c:type="sptr_t">
+      <type name="glong" c:type="long"/>
+    </alias>
+    <alias name="uptr_t" c:type="uptr_t">
+      <type name="gulong" c:type="unsigned long"/>
+    </alias>
+    <constant name="NOTIFY" value="sci-notify" c:type="SCINTILLA_NOTIFY">
+      <type name="utf8" c:type="gchar*"/>
+    </constant>
+    <class name="Object"
+           c:symbol-prefix="object"
+           c:type="ScintillaObject"
+           parent="Gtk.Container"
+           glib:type-name="ScintillaObject"
+           glib:get-type="scintilla_object_get_type"
+           glib:type-struct="ObjectClass">
+      <implements name="Atk.ImplementorIface"/>
+      <implements name="Gtk.Buildable"/>
+      <constructor name="new" c:identifier="scintilla_object_new">
+        <return-value transfer-ownership="none">
+          <type name="Gtk.Widget" c:type="GtkWidget*"/>
+        </return-value>
+      </constructor>
+      <virtual-method name="command">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="sci" transfer-ownership="none">
+            <type name="Object" c:type="ScintillaObject*"/>
+          </instance-parameter>
+          <parameter name="cmd" transfer-ownership="none">
+            <type name="gint" c:type="int"/>
+          </parameter>
+          <parameter name="window" transfer-ownership="none">
+            <type name="Gtk.Widget" c:type="GtkWidget*"/>
+          </parameter>
+        </parameters>
+      </virtual-method>
+      <virtual-method name="notify">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="sci" transfer-ownership="none">
+            <type name="Object" c:type="ScintillaObject*"/>
+          </instance-parameter>
+          <parameter name="id" transfer-ownership="none">
+            <type name="gint" c:type="int"/>
+          </parameter>
+          <parameter name="scn" transfer-ownership="none">
+            <type name="SCNotification" c:type="SCNotification*"/>
+          </parameter>
+        </parameters>
+      </virtual-method>
+      <method name="send_message" c:identifier="scintilla_object_send_message">
+        <return-value transfer-ownership="none">
+          <type name="gintptr" c:type="gintptr"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="sci" transfer-ownership="none">
+            <type name="Object" c:type="ScintillaObject*"/>
+          </instance-parameter>
+          <parameter name="iMessage" transfer-ownership="none">
+            <type name="guint" c:type="unsigned int"/>
+          </parameter>
+          <parameter name="wParam" transfer-ownership="none">
+            <type name="guintptr" c:type="guintptr"/>
+          </parameter>
+          <parameter name="lParam" transfer-ownership="none">
+            <type name="gintptr" c:type="gintptr"/>
+          </parameter>
+        </parameters>
+      </method>
+      <field name="cont">
+        <type name="Gtk.Container" c:type="GtkContainer"/>
+      </field>
+      <field name="pscin">
+        <type name="gpointer" c:type="void*"/>
+      </field>
+      <glib:signal name="command" when="last" action="1">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="gint" c:type="gint"/>
+          </parameter>
+          <parameter name="p0" transfer-ownership="none">
+            <type name="Gtk.Widget"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+      <glib:signal name="sci-notify" when="last" action="1">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object" transfer-ownership="none">
+            <type name="gint" c:type="gint"/>
+          </parameter>
+          <parameter name="p0" transfer-ownership="none">
+            <type name="SCNotification"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="ObjectClass"
+            c:type="ScintillaObjectClass"
+            glib:is-gtype-struct-for="Object">
+      <field name="parent_class">
+        <type name="Gtk.ContainerClass" c:type="GtkContainerClass"/>
+      </field>
+      <field name="command">
+        <callback name="command">
+          <return-value transfer-ownership="none">
+            <type name="none" c:type="void"/>
+          </return-value>
+          <parameters>
+            <parameter name="sci" transfer-ownership="none">
+              <type name="Object" c:type="ScintillaObject*"/>
+            </parameter>
+            <parameter name="cmd" transfer-ownership="none">
+              <type name="gint" c:type="int"/>
+            </parameter>
+            <parameter name="window" transfer-ownership="none">
+              <type name="Gtk.Widget" c:type="GtkWidget*"/>
+            </parameter>
+          </parameters>
+        </callback>
+      </field>
+      <field name="notify">
+        <callback name="notify">
+          <return-value transfer-ownership="none">
+            <type name="none" c:type="void"/>
+          </return-value>
+          <parameters>
+            <parameter name="sci" transfer-ownership="none">
+              <type name="Object" c:type="ScintillaObject*"/>
+            </parameter>
+            <parameter name="id" transfer-ownership="none">
+              <type name="gint" c:type="int"/>
+            </parameter>
+            <parameter name="scn" transfer-ownership="none">
+              <type name="SCNotification" c:type="SCNotification*"/>
+            </parameter>
+          </parameters>
+        </callback>
+      </field>
+    </record>
+    <record name="SCNotification"
+            c:type="SCNotification"
+            glib:type-name="SCNotification"
+            glib:get-type="scnotification_get_type"
+            c:symbol-prefix="scnotification">
+      <field name="nmhdr" writable="1">
+        <type name="Sci_NotifyHeader" c:type="Sci_NotifyHeader"/>
+      </field>
+      <field name="position" writable="1">
+        <type name="Sci_Position" c:type="Sci_Position"/>
+      </field>
+      <field name="ch" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="modifiers" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="modificationType" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="text" writable="1">
+        <type name="utf8" c:type="const char*"/>
+      </field>
+      <field name="length" writable="1">
+        <type name="Sci_Position" c:type="Sci_Position"/>
+      </field>
+      <field name="linesAdded" writable="1">
+        <type name="Sci_Position" c:type="Sci_Position"/>
+      </field>
+      <field name="message" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="wParam" writable="1">
+        <type name="uptr_t" c:type="uptr_t"/>
+      </field>
+      <field name="lParam" writable="1">
+        <type name="sptr_t" c:type="sptr_t"/>
+      </field>
+      <field name="line" writable="1">
+        <type name="Sci_Position" c:type="Sci_Position"/>
+      </field>
+      <field name="foldLevelNow" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="foldLevelPrev" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="margin" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="listType" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="x" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="y" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="token" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="annotationLinesAdded" writable="1">
+        <type name="Sci_Position" c:type="Sci_Position"/>
+      </field>
+      <field name="updated" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="listCompletionMethod" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+    </record>
+    <callback name="SciFnDirect">
+      <return-value transfer-ownership="none">
+        <type name="sptr_t" c:type="sptr_t"/>
+      </return-value>
+      <parameters>
+        <parameter name="ptr" transfer-ownership="none">
+          <type name="sptr_t" c:type="sptr_t"/>
+        </parameter>
+        <parameter name="iMessage" transfer-ownership="none">
+          <type name="guint" c:type="unsigned int"/>
+        </parameter>
+        <parameter name="wParam" transfer-ownership="none">
+          <type name="uptr_t" c:type="uptr_t"/>
+        </parameter>
+        <parameter name="lParam" transfer-ownership="none">
+          <type name="sptr_t" c:type="sptr_t"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="Sci_CharacterRange" c:type="Sci_CharacterRange">
+      <field name="cpMin" writable="1">
+        <type name="Sci_PositionCR" c:type="Sci_PositionCR"/>
+      </field>
+      <field name="cpMax" writable="1">
+        <type name="Sci_PositionCR" c:type="Sci_PositionCR"/>
+      </field>
+    </record>
+    <record name="Sci_NotifyHeader" c:type="Sci_NotifyHeader">
+      <field name="hwndFrom" writable="1">
+        <type name="gpointer" c:type="void*"/>
+      </field>
+      <field name="idFrom" writable="1">
+        <type name="uptr_t" c:type="uptr_t"/>
+      </field>
+      <field name="code" writable="1">
+        <type name="guint" c:type="unsigned"/>
+      </field>
+    </record>
+    <record name="Sci_RangeToFormat" c:type="Sci_RangeToFormat">
+      <field name="hdc" writable="1">
+        <type name="Sci_SurfaceID" c:type="Sci_SurfaceID"/>
+      </field>
+      <field name="hdcTarget" writable="1">
+        <type name="Sci_SurfaceID" c:type="Sci_SurfaceID"/>
+      </field>
+      <field name="rc" writable="1">
+        <type name="gpointer" c:type="Sci_Rectangle"/>
+      </field>
+      <field name="rcPage" writable="1">
+        <type name="gpointer" c:type="Sci_Rectangle"/>
+      </field>
+      <field name="chrg" writable="1">
+        <type name="gpointer" c:type="Sci_CharacterRange"/>
+      </field>
+    </record>
+    <record name="Sci_Rectangle" c:type="Sci_Rectangle">
+      <field name="left" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="top" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="right" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+      <field name="bottom" writable="1">
+        <type name="gint" c:type="int"/>
+      </field>
+    </record>
+    <record name="Sci_TextRange" c:type="Sci_TextRange">
+      <field name="chrg" writable="1">
+        <type name="gpointer" c:type="Sci_CharacterRange"/>
+      </field>
+      <field name="lpstrText" writable="1">
+        <type name="utf8" c:type="char*"/>
+      </field>
+    </record>
+    <record name="Sci_TextToFind" c:type="Sci_TextToFind">
+      <field name="chrg" writable="1">
+        <type name="gpointer" c:type="Sci_CharacterRange"/>
+      </field>
+      <field name="lpstrText" writable="1">
+        <type name="utf8" c:type="const char*"/>
+      </field>
+      <field name="chrgText" writable="1">
+        <type name="gpointer" c:type="Sci_CharacterRange"/>
+      </field>
+    </record>
+    <function name="Scintilla_LinkLexers" c:identifier="Scintilla_LinkLexers">
+      <return-value transfer-ownership="none">
+        <type name="gint" c:type="int"/>
+      </return-value>
+    </function>
+  </namespace>
+</repository>
diff --git a/scite-app/scintilla/test/gi/filter-scintilla-h.py b/scite-app/scintilla/test/gi/filter-scintilla-h.py
new file mode 100644
index 0000000..0743f9e
--- /dev/null
+++ b/scite-app/scintilla/test/gi/filter-scintilla-h.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# Filters Scintilla.h to not contain generated stuff or deprecated defines
+
+import sys
+import fileinput
+
+def main():
+    inhibit = 0
+    for line in fileinput.input():
+        if line.startswith("/* ++Autogenerated") or line.startswith("#ifdef INCLUDE_DEPRECATED_FEATURES"):
+            inhibit += 1
+        if inhibit == 0:
+            sys.stdout.write(line)
+        if line.startswith("/* --Autogenerated") or line.startswith("#endif"):
+            if (inhibit > 0):
+                inhibit -= 1
+
+if __name__ == "__main__":
+    main()
diff --git a/scite-app/scintilla/test/gi/gi-test.py b/scite-app/scintilla/test/gi/gi-test.py
new file mode 100644
index 0000000..b047ece
--- /dev/null
+++ b/scite-app/scintilla/test/gi/gi-test.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+import gi
+gi.require_version('Scintilla', '0.1')
+
+# Scintilla is imported before because it loads Gtk with a specified version
+# this avoids a warning when Gtk is imported without version such as below (where
+# it is imported without because this script works with gtk2 and gtk3)
+from gi.repository import Scintilla
+from gi.repository import Gtk
+
+def on_notify(sci, id, scn):
+    if (scn.nmhdr.code == 2001): # SCN_CHARADDED
+        print ("sci-notify: id: %d, char added: %d" % (id, scn.ch))
+    elif (scn.nmhdr.code == 2008): # SCN_MODIFIED
+        print ("sci-notify: id: %d, pos: %d, mod type: %d" % (id, scn.position, scn.modificationType))
+    else:
+        print ("sci-notify: id: %d, scn.nmhdr.code: %d" % (id, scn.nmhdr.code))
+
+win = Gtk.Window()
+win.connect("delete-event", Gtk.main_quit)
+sci = Scintilla.Object()
+sci.connect("sci-notify", on_notify)
+win.add(sci)
+win.show_all()
+win.resize(400,300)
+Gtk.main()
diff --git a/scite-app/scintilla/test/gi/makefile b/scite-app/scintilla/test/gi/makefile
new file mode 100644
index 0000000..b6ad878
--- /dev/null
+++ b/scite-app/scintilla/test/gi/makefile
@@ -0,0 +1,53 @@
+# Build gir and test
+# For Ubuntu, these may be needed:
+#     apt-get install gobject-introspection
+#     apt-get install libgirepository1.0-dev
+all: Scintilla-0.1.typelib
+
+ifdef GTK3
+GTKVERSION=3.0
+else
+GTKVERSION=2.0
+endif
+
+GI_SCANNER = g-ir-scanner
+GI_COMPILER = g-ir-compiler
+GTK_LIBS = $(shell pkg-config --libs gtk+-$(GTKVERSION))
+GTK_CFLAGS = $(shell pkg-config --cflags gtk+-$(GTKVERSION))
+PWD = $(shell pwd)
+
+.PHONY: test clean FORCE
+
+../../bin/scintilla.a: FORCE
+	$(MAKE) -C ../../gtk all
+
+Scintilla-filtered.h: ../../include/Scintilla.h
+	python filter-scintilla-h.py $< > $@
+
+libscintilla.so: ../../bin/scintilla.a
+	$(CXX) -shared -o $@ -Wl,--whole-archive $^ -Wl,--no-whole-archive $(GTK_LIBS)
+
+Scintilla-0.1.gir: libscintilla.so Scintilla-filtered.h
+	LDFLAGS=-Wl,-rpath=$(shell pwd) \
+		$(GI_SCANNER) --no-libtool --warn-all -i Gtk-$(GTKVERSION) -DG_IR_SCANNING -DGTK \
+		--cflags-begin $(GTK_CFLAGS) -include gtk/gtk.h \
+		-include Scintilla-filtered.h -I../../include --cflags-end \
+		--accept-unprefixed \
+		--c-include Scintilla.h --c-include ScintillaWidget.h \
+		-n Scintilla --nsversion 0.1 --library scintilla -L$(PWD) \
+		../../include/Sci_Position.h ../../include/ScintillaWidget.h Scintilla-filtered.h \
+		-o $@
+
+Scintilla-0.1.typelib: Scintilla-0.1.gir
+	$(GI_COMPILER) $^ -o $@
+
+clean:
+	rm -f libscintilla.so Scintilla-0.1.gir Scintilla-0.1.typelib Scintilla-filtered.h
+	$(MAKE) -C ../../gtk clean
+
+test: Scintilla-0.1.gir Scintilla-0.1.typelib
+	@echo Verifying Scintilla-0.1.gir file
+	@diff $<.good $< || (echo "GIR FILE MISMATCH!"; exit 1)
+	@echo Launching gi-test.py python program
+	GI_TYPELIB_PATH=$(PWD) LD_LIBRARY_PATH=$(PWD) \
+		python $(PWD)/gi-test.py
diff --git a/scite-app/scintilla/test/performanceTests.py b/scite-app/scintilla/test/performanceTests.py
new file mode 100644
index 0000000..435e0e5
--- /dev/null
+++ b/scite-app/scintilla/test/performanceTests.py
@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 2.7 or later
+
+from __future__ import with_statement
+from __future__ import unicode_literals
+
+import os, string, sys, time, unittest
+
+try:
+	start = time.perf_counter()
+	timer = time.perf_counter
+except AttributeError:
+	timer = time.time
+
+if sys.platform == "win32":
+	import XiteWin as Xite
+else:
+	import XiteQt as Xite
+
+class TestPerformance(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testAddLine(self):
+		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
+		start = timer()
+		for i in range(1000):
+			self.ed.AddText(len(data), data)
+			self.assertEquals(self.ed.LineCount, i + 2)
+		end = timer()
+		duration = end - start
+		print("%6.3f testAddLine" % duration)
+		self.xite.DoEvents()
+		self.assert_(self.ed.Length > 0)
+
+	def testAddLineMiddle(self):
+		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
+		start = timer()
+		for i in range(1000):
+			self.ed.AddText(len(data), data)
+			self.assertEquals(self.ed.LineCount, i + 2)
+		end = timer()
+		duration = end - start
+		print("%6.3f testAddLineMiddle" % duration)
+		self.xite.DoEvents()
+		self.assert_(self.ed.Length > 0)
+
+	def testHuge(self):
+		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
+		data = data * 100000
+		start = timer()
+		self.ed.AddText(len(data), data)
+		end = timer()
+		duration = end - start
+		print("%6.3f testHuge" % duration)
+		self.xite.DoEvents()
+		self.assert_(self.ed.Length > 0)
+
+	def testHugeInserts(self):
+		data = (string.ascii_letters + string.digits + "\n").encode('utf-8')
+		data = data * 100000
+		insert = (string.digits + "\n").encode('utf-8')
+		self.ed.AddText(len(data), data)
+		start = timer()
+		for i in range(1000):
+			self.ed.InsertText(0, insert)
+		end = timer()
+		duration = end - start
+		print("%6.3f testHugeInserts" % duration)
+		self.xite.DoEvents()
+		self.assert_(self.ed.Length > 0)
+
+	def testHugeReplace(self):
+		oneLine = (string.ascii_letters + string.digits + "\n").encode('utf-8')
+		data = oneLine * 100000
+		insert = (string.digits + "\n").encode('utf-8')
+		self.ed.AddText(len(data), data)
+		start = timer()
+		for i in range(1000):
+			self.ed.TargetStart = i * len(insert)
+			self.ed.TargetEnd = self.ed.TargetStart + len(oneLine)
+			self.ed.ReplaceTarget(len(insert), insert)
+		end = timer()
+		duration = end - start
+		print("%6.3f testHugeReplace" % duration)
+		self.xite.DoEvents()
+		self.assert_(self.ed.Length > 0)
+
+	def testUTF8CaseSearches(self):
+		self.ed.SetCodePage(65001)
+		oneLine = "Fold Margin=折りたたみ表示用の余白(&F)\n".encode('utf-8')
+		manyLines = oneLine * 100000
+		manyLines = manyLines + "φ\n".encode('utf-8')
+		self.ed.AddText(len(manyLines), manyLines)
+		searchString = "φ".encode('utf-8')
+		start = timer()
+		for i in range(10):
+			self.ed.TargetStart = 0
+			self.ed.TargetEnd = self.ed.Length-1
+			self.ed.SearchFlags = self.ed.SCFIND_MATCHCASE
+			pos = self.ed.SearchInTarget(len(searchString), searchString)
+			self.assert_(pos > 0)
+		end = timer()
+		duration = end - start
+		print("%6.3f testUTF8CaseSearches" % duration)
+		self.xite.DoEvents()
+
+	def testUTF8Searches(self):
+		self.ed.SetCodePage(65001)
+		oneLine = "Fold Margin=折りたたみ表示用の余白(&F)\n".encode('utf-8')
+		manyLines = oneLine * 100000
+		manyLines = manyLines + "φ\n".encode('utf-8')
+		self.ed.AddText(len(manyLines), manyLines)
+		searchString = "φ".encode('utf-8')
+		start = timer()
+		for i in range(10):
+			self.ed.TargetStart = 0
+			self.ed.TargetEnd = self.ed.Length-1
+			self.ed.SearchFlags = 0
+			pos = self.ed.SearchInTarget(len(searchString), searchString)
+			self.assert_(pos > 0)
+		end = timer()
+		duration = end - start
+		print("%6.3f testUTF8Searches" % duration)
+		self.xite.DoEvents()
+
+if __name__ == '__main__':
+	Xite.main("performanceTests")
diff --git a/scite-app/scintilla/test/simpleTests.py b/scite-app/scintilla/test/simpleTests.py
new file mode 100644
index 0000000..dca1e24
--- /dev/null
+++ b/scite-app/scintilla/test/simpleTests.py
@@ -0,0 +1,2925 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 2.7 or later
+
+from __future__ import with_statement
+from __future__ import unicode_literals
+
+import codecs, ctypes, os, sys, unittest
+
+if sys.platform == "win32":
+	import XiteWin as Xite
+else:
+	import XiteQt as Xite
+
+# Unicode line ends are only available for lexers that support the feature so requires lexers
+lexersAvailable = Xite.lexillaAvailable or Xite.scintillaIncludesLexers
+unicodeLineEndsAvailable = lexersAvailable
+
+class TestSimple(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testStatus(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.ed.SetStatus(1)
+		self.assertEquals(self.ed.GetStatus(), 1)
+		self.ed.SetStatus(0)
+		self.assertEquals(self.ed.GetStatus(), 0)
+
+	def testLength(self):
+		self.assertEquals(self.ed.Length, 0)
+
+	def testAddText(self):
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(self.ed.GetCharAt(0), ord("x"))
+		self.assertEquals(self.ed.GetStyleAt(0), 0)
+		self.ed.ClearAll()
+		self.assertEquals(self.ed.Length, 0)
+
+	def testDeleteRange(self):
+		self.ed.AddText(5, b"abcde")
+		self.assertEquals(self.ed.Length, 5)
+		self.ed.DeleteRange(1, 2)
+		self.assertEquals(self.ed.Length, 3)
+		self.assertEquals(self.ed.Contents(), b"ade")
+
+	def testAddStyledText(self):
+		self.assertEquals(self.ed.EndStyled, 0)
+		self.ed.AddStyledText(2, b"x\002")
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(self.ed.GetCharAt(0), ord("x"))
+		self.assertEquals(self.ed.GetStyleAt(0), 2)
+		self.assertEquals(self.ed.StyledTextRange(0, 1), b"x\002")
+		self.ed.ClearDocumentStyle()
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(self.ed.GetCharAt(0), ord("x"))
+		self.assertEquals(self.ed.GetStyleAt(0), 0)
+		self.assertEquals(self.ed.StyledTextRange(0, 1), b"x\0")
+
+	def testStyling(self):
+		self.assertEquals(self.ed.EndStyled, 0)
+		self.ed.AddStyledText(4, b"x\002y\003")
+		self.assertEquals(self.ed.StyledTextRange(0, 2), b"x\002y\003")
+		self.ed.StartStyling(0,0xf)
+		self.ed.SetStyling(1, 5)
+		self.assertEquals(self.ed.StyledTextRange(0, 2), b"x\005y\003")
+
+		self.ed.StartStyling(0,0xff)
+		self.ed.SetStylingEx(2, b"\100\101")
+		self.assertEquals(self.ed.StyledTextRange(0, 2), b"x\100y\101")
+
+	def testPosition(self):
+		self.assertEquals(self.ed.CurrentPos, 0)
+		self.assertEquals(self.ed.Anchor, 0)
+		self.ed.AddText(1, b"x")
+		# Caret has automatically moved
+		self.assertEquals(self.ed.CurrentPos, 1)
+		self.assertEquals(self.ed.Anchor, 1)
+		self.ed.SelectAll()
+		self.assertEquals(self.ed.CurrentPos, 0)
+		self.assertEquals(self.ed.Anchor, 1)
+		self.ed.Anchor = 0
+		self.assertEquals(self.ed.Anchor, 0)
+		# Check line positions
+		self.assertEquals(self.ed.PositionFromLine(0), 0)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 1)
+		self.assertEquals(self.ed.PositionFromLine(1), 1)
+
+		self.ed.CurrentPos = 1
+		self.assertEquals(self.ed.Anchor, 0)
+		self.assertEquals(self.ed.CurrentPos, 1)
+
+	def testBeyonEnd(self):
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.GetLineEndPosition(0), 1)
+		self.assertEquals(self.ed.GetLineEndPosition(1), 1)
+		self.assertEquals(self.ed.GetLineEndPosition(2), 1)
+
+	def testSelection(self):
+		self.assertEquals(self.ed.CurrentPos, 0)
+		self.assertEquals(self.ed.Anchor, 0)
+		self.assertEquals(self.ed.SelectionStart, 0)
+		self.assertEquals(self.ed.SelectionEnd, 0)
+		self.ed.AddText(1, b"x")
+		self.ed.SelectionStart = 0
+		self.assertEquals(self.ed.CurrentPos, 1)
+		self.assertEquals(self.ed.Anchor, 0)
+		self.assertEquals(self.ed.SelectionStart, 0)
+		self.assertEquals(self.ed.SelectionEnd, 1)
+		self.ed.SelectionStart = 1
+		self.assertEquals(self.ed.CurrentPos, 1)
+		self.assertEquals(self.ed.Anchor, 1)
+		self.assertEquals(self.ed.SelectionStart, 1)
+		self.assertEquals(self.ed.SelectionEnd, 1)
+
+		self.ed.SelectionEnd = 0
+		self.assertEquals(self.ed.CurrentPos, 0)
+		self.assertEquals(self.ed.Anchor, 0)
+
+	def testSetSelection(self):
+		self.ed.AddText(4, b"abcd")
+		self.ed.SetSel(1, 3)
+		self.assertEquals(self.ed.SelectionStart, 1)
+		self.assertEquals(self.ed.SelectionEnd, 3)
+		result = self.ed.GetSelText(0)
+		self.assertEquals(result, b"bc\0")
+		self.ed.ReplaceSel(0, b"1234")
+		self.assertEquals(self.ed.Length, 6)
+		self.assertEquals(self.ed.Contents(), b"a1234d")
+
+	def testReadOnly(self):
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.ReadOnly, 0)
+		self.assertEquals(self.ed.Contents(), b"x")
+		self.ed.ReadOnly = 1
+		self.assertEquals(self.ed.ReadOnly, 1)
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.Contents(), b"x")
+		self.ed.ReadOnly = 0
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.Contents(), b"xx")
+		self.ed.Null()
+		self.assertEquals(self.ed.Contents(), b"xx")
+
+	def testAddLine(self):
+		data = b"x" * 70 + b"\n"
+		for i in range(5):
+			self.ed.AddText(len(data), data)
+			self.assertEquals(self.ed.LineCount, i + 2)
+		self.assert_(self.ed.Length > 0)
+
+	def testInsertText(self):
+		data = b"xy"
+		self.ed.InsertText(0, data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(data, self.ed.ByteRange(0,2))
+
+		self.ed.InsertText(1, data)
+		# Should now be "xxyy"
+		self.assertEquals(self.ed.Length, 4)
+		self.assertEquals(b"xxyy", self.ed.ByteRange(0,4))
+
+	def testInsertNul(self):
+		data = b"\0"
+		self.ed.AddText(1, data)
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(data, self.ed.ByteRange(0,1))
+
+	def testUndoRedo(self):
+		data = b"xy"
+		self.assertEquals(self.ed.Modify, 0)
+		self.assertEquals(self.ed.UndoCollection, 1)
+		self.assertEquals(self.ed.CanRedo(), 0)
+		self.assertEquals(self.ed.CanUndo(), 0)
+		self.ed.InsertText(0, data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.ed.Modify, 1)
+		self.assertEquals(self.ed.CanRedo(), 0)
+		self.assertEquals(self.ed.CanUndo(), 1)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.ed.Modify, 0)
+		self.assertEquals(self.ed.CanRedo(), 1)
+		self.assertEquals(self.ed.CanUndo(), 0)
+		self.ed.Redo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.ed.Modify, 1)
+		self.assertEquals(data, self.ed.Contents())
+		self.assertEquals(self.ed.CanRedo(), 0)
+		self.assertEquals(self.ed.CanUndo(), 1)
+
+	def testUndoSavePoint(self):
+		data = b"xy"
+		self.assertEquals(self.ed.Modify, 0)
+		self.ed.InsertText(0, data)
+		self.assertEquals(self.ed.Modify, 1)
+		self.ed.SetSavePoint()
+		self.assertEquals(self.ed.Modify, 0)
+		self.ed.InsertText(0, data)
+		self.assertEquals(self.ed.Modify, 1)
+
+	def testUndoCollection(self):
+		data = b"xy"
+		self.assertEquals(self.ed.UndoCollection, 1)
+		self.ed.UndoCollection = 0
+		self.assertEquals(self.ed.UndoCollection, 0)
+		self.ed.InsertText(0, data)
+		self.assertEquals(self.ed.CanRedo(), 0)
+		self.assertEquals(self.ed.CanUndo(), 0)
+		self.ed.UndoCollection = 1
+
+	def testGetColumn(self):
+		self.ed.AddText(1, b"x")
+		self.assertEquals(self.ed.GetColumn(0), 0)
+		self.assertEquals(self.ed.GetColumn(1), 1)
+		# Next line caused infinite loop in 1.71
+		self.assertEquals(self.ed.GetColumn(2), 1)
+		self.assertEquals(self.ed.GetColumn(3), 1)
+
+	def testTabWidth(self):
+		self.assertEquals(self.ed.TabWidth, 8)
+		self.ed.AddText(3, b"x\tb")
+		self.assertEquals(self.ed.GetColumn(0), 0)
+		self.assertEquals(self.ed.GetColumn(1), 1)
+		self.assertEquals(self.ed.GetColumn(2), 8)
+		for col in range(10):
+			if col == 0:
+				self.assertEquals(self.ed.FindColumn(0, col), 0)
+			elif col == 1:
+				self.assertEquals(self.ed.FindColumn(0, col), 1)
+			elif col == 8:
+				self.assertEquals(self.ed.FindColumn(0, col), 2)
+			elif col == 9:
+				self.assertEquals(self.ed.FindColumn(0, col), 3)
+			else:
+				self.assertEquals(self.ed.FindColumn(0, col), 1)
+		self.ed.TabWidth = 4
+		self.assertEquals(self.ed.TabWidth, 4)
+		self.assertEquals(self.ed.GetColumn(0), 0)
+		self.assertEquals(self.ed.GetColumn(1), 1)
+		self.assertEquals(self.ed.GetColumn(2), 4)
+
+	def testIndent(self):
+		self.assertEquals(self.ed.Indent, 0)
+		self.assertEquals(self.ed.UseTabs, 1)
+		self.ed.Indent = 8
+		self.ed.UseTabs = 0
+		self.assertEquals(self.ed.Indent, 8)
+		self.assertEquals(self.ed.UseTabs, 0)
+		self.ed.AddText(3, b"x\tb")
+		self.assertEquals(self.ed.GetLineIndentation(0), 0)
+		self.ed.InsertText(0, b" ")
+		self.assertEquals(self.ed.GetLineIndentation(0), 1)
+		self.assertEquals(self.ed.GetLineIndentPosition(0), 1)
+		self.assertEquals(self.ed.Contents(), b" x\tb")
+		self.ed.SetLineIndentation(0,2)
+		self.assertEquals(self.ed.Contents(), b"  x\tb")
+		self.assertEquals(self.ed.GetLineIndentPosition(0), 2)
+		self.ed.UseTabs = 1
+		self.ed.SetLineIndentation(0,8)
+		self.assertEquals(self.ed.Contents(), b"\tx\tb")
+		self.assertEquals(self.ed.GetLineIndentPosition(0), 1)
+
+	def testGetCurLine(self):
+		self.ed.AddText(1, b"x")
+		data = ctypes.create_string_buffer(b"\0" * 100)
+		caret = self.ed.GetCurLine(len(data), data)
+		self.assertEquals(caret, 1)
+		self.assertEquals(data.value, b"x")
+
+	def testGetLine(self):
+		self.ed.AddText(1, b"x")
+		data = ctypes.create_string_buffer(b"\0" * 100)
+		self.ed.GetLine(0, data)
+		self.assertEquals(data.value, b"x")
+
+	def testLineEnds(self):
+		self.ed.AddText(3, b"x\ny")
+		self.assertEquals(self.ed.GetLineEndPosition(0), 1)
+		self.assertEquals(self.ed.GetLineEndPosition(1), 3)
+		self.assertEquals(self.ed.LineLength(0), 2)
+		self.assertEquals(self.ed.LineLength(1), 1)
+		# Test lines out of range.
+		self.assertEquals(self.ed.LineLength(2), 0)
+		self.assertEquals(self.ed.LineLength(-1), 0)
+		if sys.platform == "win32":
+			self.assertEquals(self.ed.EOLMode, self.ed.SC_EOL_CRLF)
+		else:
+			self.assertEquals(self.ed.EOLMode, self.ed.SC_EOL_LF)
+		lineEnds = [b"\r\n", b"\r", b"\n"]
+		for lineEndType in [self.ed.SC_EOL_CR, self.ed.SC_EOL_LF, self.ed.SC_EOL_CRLF]:
+			self.ed.EOLMode = lineEndType
+			self.assertEquals(self.ed.EOLMode, lineEndType)
+			self.ed.ConvertEOLs(lineEndType)
+			self.assertEquals(self.ed.Contents(), b"x" + lineEnds[lineEndType] + b"y")
+			self.assertEquals(self.ed.LineLength(0), 1 + len(lineEnds[lineEndType]))
+
+	# Several tests for unicode line ends U+2028 and U+2029
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testUnicodeLineEnds(self):
+		# Add two lines separated with U+2028 and ensure it is seen as two lines
+		# Then remove U+2028 and should be just 1 lines
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		self.ed.AddText(5, b"x\xe2\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 2)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 1)
+		self.assertEquals(self.ed.GetLineEndPosition(1), 5)
+		self.assertEquals(self.ed.LineLength(0), 4)
+		self.assertEquals(self.ed.LineLength(1), 1)
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 4
+		self.ed.ReplaceTarget(0, b"")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.assertEquals(self.ed.LineLength(0), 2)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 2)
+		self.assertEquals(self.ed.LineEndTypesSupported, 1)
+
+	def testUnicodeLineEndsWithCodePage0(self):
+		# Try the Unicode line ends when not in Unicode mode -> should remain 1 line
+		self.ed.SetCodePage(0)
+		self.ed.AddText(5, b"x\xe2\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.ed.AddText(4, b"x\xc2\x85y")
+		self.assertEquals(self.ed.LineCount, 1)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testUnicodeLineEndsSwitchToUnicodeAndBack(self):
+		# Add the Unicode line ends when not in Unicode mode
+		self.ed.SetCodePage(0)
+		self.ed.AddText(5, b"x\xe2\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 1)
+		# Into UTF-8 mode - should now be interpreting as two lines
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		self.assertEquals(self.ed.LineCount, 2)
+		# Back to code page 0 and 1 line
+		self.ed.SetCodePage(0)
+		self.assertEquals(self.ed.LineCount, 1)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testUFragmentedEOLCompletion(self):
+		# Add 2 starting bytes of UTF-8 line end then complete it
+		self.ed.ClearAll()
+		self.ed.AddText(4, b"x\xe2\x80y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 4)
+		self.ed.SetSel(3,3)
+		self.ed.AddText(1, b"\xa8")
+		self.assertEquals(self.ed.Contents(), b"x\xe2\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 2)
+
+		# Add 1 starting bytes of UTF-8 line end then complete it
+		self.ed.ClearAll()
+		self.ed.AddText(3, b"x\xe2y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 3)
+		self.ed.SetSel(2,2)
+		self.ed.AddText(2, b"\x80\xa8")
+		self.assertEquals(self.ed.Contents(), b"x\xe2\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testUFragmentedEOLStart(self):
+		# Add end of UTF-8 line end then insert start
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		self.assertEquals(self.ed.LineCount, 1)
+		self.ed.AddText(4, b"x\x80\xa8y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.ed.SetSel(1,1)
+		self.ed.AddText(1, b"\xe2")
+		self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testUBreakApartEOL(self):
+		# Add two lines separated by U+2029 then remove and add back each byte ensuring
+		# only one line after each removal of any byte in line end and 2 lines after reinsertion
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		text = b"x\xe2\x80\xa9y";
+		self.ed.AddText(5, text)
+		self.assertEquals(self.ed.LineCount, 2)
+
+		for i in range(len(text)):
+			self.ed.TargetStart = i
+			self.ed.TargetEnd = i + 1
+			self.ed.ReplaceTarget(0, b"")
+			if i in [0, 4]:
+				# Removing text characters does not change number of lines
+				self.assertEquals(self.ed.LineCount, 2)
+			else:
+				# Removing byte from line end, removes 1 line
+				self.assertEquals(self.ed.LineCount, 1)
+
+			self.ed.TargetEnd = i
+			self.ed.ReplaceTarget(1, text[i:i+1])
+			self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testURemoveEOLFragment(self):
+		# Add UTF-8 line end then delete each byte causing line end to disappear
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		for i in range(3):
+			self.ed.ClearAll()
+			self.ed.AddText(5, b"x\xe2\x80\xa8y")
+			self.assertEquals(self.ed.LineCount, 2)
+			self.ed.TargetStart = i+1
+			self.ed.TargetEnd = i+2
+			self.ed.ReplaceTarget(0, b"")
+			self.assertEquals(self.ed.LineCount, 1)
+
+	# Several tests for unicode NEL line ends U+0085
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testNELLineEnds(self):
+		# Add two lines separated with U+0085 and ensure it is seen as two lines
+		# Then remove U+0085 and should be just 1 lines
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		self.ed.AddText(4, b"x\xc2\x85y")
+		self.assertEquals(self.ed.LineCount, 2)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 1)
+		self.assertEquals(self.ed.GetLineEndPosition(1), 4)
+		self.assertEquals(self.ed.LineLength(0), 3)
+		self.assertEquals(self.ed.LineLength(1), 1)
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 3
+		self.ed.ReplaceTarget(0, b"")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.assertEquals(self.ed.LineLength(0), 2)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testNELFragmentedEOLCompletion(self):
+		# Add starting byte of UTF-8 NEL then complete it
+		self.ed.AddText(3, b"x\xc2y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.assertEquals(self.ed.GetLineEndPosition(0), 3)
+		self.ed.SetSel(2,2)
+		self.ed.AddText(1, b"\x85")
+		self.assertEquals(self.ed.Contents(), b"x\xc2\x85y")
+		self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testNELFragmentedEOLStart(self):
+		# Add end of UTF-8 NEL then insert start
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		self.assertEquals(self.ed.LineCount, 1)
+		self.ed.AddText(4, b"x\x85y")
+		self.assertEquals(self.ed.LineCount, 1)
+		self.ed.SetSel(1,1)
+		self.ed.AddText(1, b"\xc2")
+		self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testNELBreakApartEOL(self):
+		# Add two lines separated by U+0085 then remove and add back each byte ensuring
+		# only one line after each removal of any byte in line end and 2 lines after reinsertion
+		self.xite.ChooseLexer(b"cpp")
+		self.ed.SetCodePage(65001)
+		self.ed.SetLineEndTypesAllowed(1)
+		text = b"x\xc2\x85y";
+		self.ed.AddText(4, text)
+		self.assertEquals(self.ed.LineCount, 2)
+
+		for i in range(len(text)):
+			self.ed.TargetStart = i
+			self.ed.TargetEnd = i + 1
+			self.ed.ReplaceTarget(0, b"")
+			if i in [0, 3]:
+				# Removing text characters does not change number of lines
+				self.assertEquals(self.ed.LineCount, 2)
+			else:
+				# Removing byte from line end, removes 1 line
+				self.assertEquals(self.ed.LineCount, 1)
+
+			self.ed.TargetEnd = i
+			self.ed.ReplaceTarget(1, text[i:i+1])
+			self.assertEquals(self.ed.LineCount, 2)
+
+	@unittest.skipUnless(unicodeLineEndsAvailable, "can not test Unicode line ends")
+	def testNELRemoveEOLFragment(self):
+		# Add UTF-8 NEL then delete each byte causing line end to disappear
+		self.ed.SetCodePage(65001)
+		for i in range(2):
+			self.ed.ClearAll()
+			self.ed.AddText(4, b"x\xc2\x85y")
+			self.assertEquals(self.ed.LineCount, 2)
+			self.ed.TargetStart = i+1
+			self.ed.TargetEnd = i+2
+			self.ed.ReplaceTarget(0, b"")
+			self.assertEquals(self.ed.LineCount, 1)
+
+	def testGoto(self):
+		self.ed.AddText(5, b"a\nb\nc")
+		self.assertEquals(self.ed.CurrentPos, 5)
+		self.ed.GotoLine(1)
+		self.assertEquals(self.ed.CurrentPos, 2)
+		self.ed.GotoPos(4)
+		self.assertEquals(self.ed.CurrentPos, 4)
+
+	def testCutCopyPaste(self):
+		self.ed.AddText(5, b"a1b2c")
+		self.ed.SetSel(1,3)
+		self.ed.Cut()
+		# Clipboard = "1b"
+		self.assertEquals(self.ed.Contents(), b"a2c")
+		self.assertEquals(self.ed.CanPaste(), 1)
+		self.ed.SetSel(0, 0)
+		self.ed.Paste()
+		self.assertEquals(self.ed.Contents(), b"1ba2c")
+		self.ed.SetSel(4,5)
+		self.ed.Copy()
+		# Clipboard = "c"
+		self.ed.SetSel(1,3)
+		self.ed.Paste()
+		self.assertEquals(self.ed.Contents(), b"1c2c")
+		self.ed.SetSel(2,4)
+		self.ed.Clear()
+		self.assertEquals(self.ed.Contents(), b"1c")
+
+	def testReplaceRectangular(self):
+		self.ed.AddText(5, b"a\nb\nc")
+		self.ed.SetSel(0,0)
+		self.ed.ReplaceRectangular(3, b"1\n2")
+		self.assertEquals(self.ed.Contents(), b"1a\n2b\nc")
+
+	def testCopyAllowLine(self):
+		lineEndType = self.ed.EOLMode
+		self.ed.EOLMode = self.ed.SC_EOL_LF
+		self.ed.AddText(5, b"a1\nb2")
+		self.ed.SetSel(1,1)
+		self.ed.CopyAllowLine()
+		# Clipboard = "a1\n"
+		self.assertEquals(self.ed.CanPaste(), 1)
+		self.ed.SetSel(0, 0)
+		self.ed.Paste()
+		self.ed.EOLMode = lineEndType
+		self.assertEquals(self.ed.Contents(), b"a1\na1\nb2")
+
+	def testDuplicate(self):
+		self.ed.AddText(3, b"1b2")
+		self.ed.SetSel(1,2)
+		self.ed.SelectionDuplicate()
+		self.assertEquals(self.ed.Contents(), b"1bb2")
+
+	def testTransposeLines(self):
+		self.ed.AddText(8, b"a1\nb2\nc3")
+		self.ed.SetSel(3,3)
+		self.ed.LineTranspose()
+		self.assertEquals(self.ed.Contents(), b"b2\na1\nc3")
+
+	def testGetSet(self):
+		self.ed.SetContents(b"abc")
+		self.assertEquals(self.ed.TextLength, 3)
+		# String buffer containing exactly 5 digits
+		result = ctypes.create_string_buffer(b"12345", 5)
+		self.assertEquals(result.raw, b"12345")
+		length = self.ed.GetText(4, result)
+		self.assertEquals(length, 3)
+		self.assertEquals(result.value, b"abc")
+		# GetText has written the 3 bytes of text and a terminating NUL but left the final digit 5
+		self.assertEquals(result.raw, b"abc\x005")
+
+	def testAppend(self):
+		self.ed.SetContents(b"abc")
+		self.assertEquals(self.ed.SelectionStart, 0)
+		self.assertEquals(self.ed.SelectionEnd, 0)
+		text = b"12"
+		self.ed.AppendText(len(text), text)
+		self.assertEquals(self.ed.SelectionStart, 0)
+		self.assertEquals(self.ed.SelectionEnd, 0)
+		self.assertEquals(self.ed.Contents(), b"abc12")
+
+	def testTarget(self):
+		self.ed.SetContents(b"abcd")
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 3
+		self.assertEquals(self.ed.TargetStart, 1)
+		self.assertEquals(self.ed.TargetEnd, 3)
+		rep = b"321"
+		self.ed.ReplaceTarget(len(rep), rep)
+		self.assertEquals(self.ed.Contents(), b"a321d")
+		self.ed.SearchFlags = self.ed.SCFIND_REGEXP
+		self.assertEquals(self.ed.SearchFlags, self.ed.SCFIND_REGEXP)
+		searchString = b"\([1-9]+\)"
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(1, pos)
+		tagString = self.ed.GetTag(1)
+		self.assertEquals(tagString, b"321")
+		rep = b"\\1"
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = 0
+		self.ed.ReplaceTargetRE(len(rep), rep)
+		self.assertEquals(self.ed.Contents(), b"321a321d")
+		self.ed.SetSel(4,5)
+		self.ed.TargetFromSelection()
+		self.assertEquals(self.ed.TargetStart, 4)
+		self.assertEquals(self.ed.TargetEnd, 5)
+
+	def testTargetWhole(self):
+		self.ed.SetContents(b"abcd")
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 3
+		self.ed.TargetWholeDocument()
+		self.assertEquals(self.ed.TargetStart, 0)
+		self.assertEquals(self.ed.TargetEnd, 4)
+
+	def testTargetEscape(self):
+		# Checks that a literal \ can be in the replacement. Bug #2959876
+		self.ed.SetContents(b"abcd")
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 3
+		rep = b"\\\\n"
+		self.ed.ReplaceTargetRE(len(rep), rep)
+		self.assertEquals(self.ed.Contents(), b"a\\nd")
+
+	def testTargetVirtualSpace(self):
+		self.ed.SetContents(b"a\nbcd")
+		self.assertEquals(self.ed.TargetStart, 0)
+		self.assertEquals(self.ed.TargetStartVirtualSpace, 0)
+		self.assertEquals(self.ed.TargetEnd, 5)
+		self.assertEquals(self.ed.TargetEndVirtualSpace, 0)
+		self.ed.TargetStart = 1
+		self.ed.TargetStartVirtualSpace = 2
+		self.ed.TargetEnd = 3
+		self.ed.TargetEndVirtualSpace = 4
+		# Adds 2 spaces to first line due to virtual space, and replace 2 characters with 3
+		rep = b"12\n"
+		self.ed.ReplaceTarget(len(rep), rep)
+		self.assertEquals(self.ed.Contents(), b"a  12\ncd")
+		# 1+2v realized to 3
+		self.assertEquals(self.ed.TargetStart, 3)
+		self.assertEquals(self.ed.TargetStartVirtualSpace, 0)
+		self.assertEquals(self.ed.TargetEnd, 6)
+		self.assertEquals(self.ed.TargetEndVirtualSpace, 0)
+
+	def testPointsAndPositions(self):
+		self.ed.AddText(1, b"x")
+		# Start of text
+		self.assertEquals(self.ed.PositionFromPoint(0,0), 0)
+		# End of text
+		self.assertEquals(self.ed.PositionFromPoint(0,100), 1)
+
+	def testLinePositions(self):
+		text = b"ab\ncd\nef"
+		nl = b"\n"
+		if sys.version_info[0] == 3:
+			nl = ord(b"\n")
+		self.ed.AddText(len(text), text)
+		self.assertEquals(self.ed.LineFromPosition(-1), 0)
+		line = 0
+		for pos in range(len(text)+1):
+			self.assertEquals(self.ed.LineFromPosition(pos), line)
+			if pos < len(text) and text[pos] == nl:
+				line += 1
+
+	def testWordPositions(self):
+		text = b"ab cd\tef"
+		self.ed.AddText(len(text), text)
+		self.assertEquals(self.ed.WordStartPosition(3, 0), 2)
+		self.assertEquals(self.ed.WordStartPosition(4, 0), 3)
+		self.assertEquals(self.ed.WordStartPosition(5, 0), 3)
+		self.assertEquals(self.ed.WordStartPosition(6, 0), 5)
+
+		self.assertEquals(self.ed.WordEndPosition(2, 0), 3)
+		self.assertEquals(self.ed.WordEndPosition(3, 0), 5)
+		self.assertEquals(self.ed.WordEndPosition(4, 0), 5)
+		self.assertEquals(self.ed.WordEndPosition(5, 0), 6)
+		self.assertEquals(self.ed.WordEndPosition(6, 0), 8)
+
+	def testWordRange(self):
+		text = b"ab cd\t++"
+		self.ed.AddText(len(text), text)
+		self.assertEquals(self.ed.IsRangeWord(0, 0), 0)
+		self.assertEquals(self.ed.IsRangeWord(0, 1), 0)
+		self.assertEquals(self.ed.IsRangeWord(0, 2), 1)
+		self.assertEquals(self.ed.IsRangeWord(0, 3), 0)
+		self.assertEquals(self.ed.IsRangeWord(0, 4), 0)
+		self.assertEquals(self.ed.IsRangeWord(0, 5), 1)
+		self.assertEquals(self.ed.IsRangeWord(6, 7), 0)
+		self.assertEquals(self.ed.IsRangeWord(6, 8), 1)
+
+MODI = 1
+UNDO = 2
+REDO = 4
+
+class TestContainerUndo(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.data = b"xy"
+
+	def UndoState(self):
+		return (MODI if self.ed.Modify else 0) | \
+			(UNDO if self.ed.CanUndo() else 0) | \
+			(REDO if self.ed.CanRedo() else 0)
+
+	def testContainerActNoCoalesce(self):
+		self.ed.InsertText(0, self.data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 0)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO | REDO)
+		self.ed.Redo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+
+	def testContainerActCoalesce(self):
+		self.ed.InsertText(0, self.data)
+		self.ed.AddUndoAction(5, 1)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+		self.ed.Redo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+
+	def testContainerMultiStage(self):
+		self.ed.InsertText(0, self.data)
+		self.ed.AddUndoAction(5, 1)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+		self.ed.Redo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+
+	def testContainerMultiStageNoText(self):
+		self.ed.AddUndoAction(5, 1)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+		self.assertEquals(self.UndoState(), REDO)
+		self.ed.Redo()
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+		self.assertEquals(self.UndoState(), REDO)
+
+	def testContainerActCoalesceEnd(self):
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.InsertText(0, self.data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+		self.ed.Redo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+
+	def testContainerBetweenInsertAndInsert(self):
+		self.assertEquals(self.ed.Length, 0)
+		self.ed.InsertText(0, self.data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.InsertText(2, self.data)
+		self.assertEquals(self.ed.Length, 4)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		# Undoes both insertions and the containerAction in the middle
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+
+	def testContainerNoCoalesceBetweenInsertAndInsert(self):
+		self.assertEquals(self.ed.Length, 0)
+		self.ed.InsertText(0, self.data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 0)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.InsertText(2, self.data)
+		self.assertEquals(self.ed.Length, 4)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		# Undo last insertion
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO | REDO)
+		# Undo container
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO | REDO)
+		# Undo first insertion
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 0)
+		self.assertEquals(self.UndoState(), REDO)
+
+	def testContainerBetweenDeleteAndDelete(self):
+		self.ed.InsertText(0, self.data)
+		self.ed.EmptyUndoBuffer()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), 0)
+		self.ed.SetSel(2,2)
+		self.ed.DeleteBack()
+		self.assertEquals(self.ed.Length, 1)
+		self.ed.AddUndoAction(5, 1)
+		self.ed.DeleteBack()
+		self.assertEquals(self.ed.Length, 0)
+		# Undoes both deletions and the containerAction in the middle
+		self.ed.Undo()
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), REDO)
+
+	def testContainerBetweenInsertAndDelete(self):
+		self.assertEquals(self.ed.Length, 0)
+		self.ed.InsertText(0, self.data)
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.AddUndoAction(5, 1)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.SetSel(0,1)
+		self.ed.Cut()
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(self.UndoState(), MODI | UNDO)
+		self.ed.Undo()	# Only undoes the deletion
+		self.assertEquals(self.ed.Length, 2)
+		self.assertEquals(self.UndoState(), MODI | UNDO | REDO)
+
+class TestKeyCommands(unittest.TestCase):
+	""" These commands are normally assigned to keys and take no arguments """
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def selRange(self):
+		return self.ed.CurrentPos, self.ed.Anchor
+
+	def testLineMove(self):
+		self.ed.AddText(8, b"x1\ny2\nz3")
+		self.ed.SetSel(0,0)
+		self.ed.ChooseCaretX()
+		self.ed.LineDown()
+		self.ed.LineDown()
+		self.assertEquals(self.selRange(), (6, 6))
+		self.ed.LineUp()
+		self.assertEquals(self.selRange(), (3, 3))
+		self.ed.LineDownExtend()
+		self.assertEquals(self.selRange(), (6, 3))
+		self.ed.LineUpExtend()
+		self.ed.LineUpExtend()
+		self.assertEquals(self.selRange(), (0, 3))
+
+	def testCharMove(self):
+		self.ed.AddText(8, b"x1\ny2\nz3")
+		self.ed.SetSel(0,0)
+		self.ed.CharRight()
+		self.ed.CharRight()
+		self.assertEquals(self.selRange(), (2, 2))
+		self.ed.CharLeft()
+		self.assertEquals(self.selRange(), (1, 1))
+		self.ed.CharRightExtend()
+		self.assertEquals(self.selRange(), (2, 1))
+		self.ed.CharLeftExtend()
+		self.ed.CharLeftExtend()
+		self.assertEquals(self.selRange(), (0, 1))
+
+	def testWordMove(self):
+		self.ed.AddText(10, b"a big boat")
+		self.ed.SetSel(3,3)
+		self.ed.WordRight()
+		self.ed.WordRight()
+		self.assertEquals(self.selRange(), (10, 10))
+		self.ed.WordLeft()
+		self.assertEquals(self.selRange(), (6, 6))
+		self.ed.WordRightExtend()
+		self.assertEquals(self.selRange(), (10, 6))
+		self.ed.WordLeftExtend()
+		self.ed.WordLeftExtend()
+		self.assertEquals(self.selRange(), (2, 6))
+
+	def testHomeEndMove(self):
+		self.ed.AddText(10, b"a big boat")
+		self.ed.SetSel(3,3)
+		self.ed.Home()
+		self.assertEquals(self.selRange(), (0, 0))
+		self.ed.LineEnd()
+		self.assertEquals(self.selRange(), (10, 10))
+		self.ed.SetSel(3,3)
+		self.ed.HomeExtend()
+		self.assertEquals(self.selRange(), (0, 3))
+		self.ed.LineEndExtend()
+		self.assertEquals(self.selRange(), (10, 3))
+
+	def testStartEndMove(self):
+		self.ed.AddText(10, b"a\nbig\nboat")
+		self.ed.SetSel(3,3)
+		self.ed.DocumentStart()
+		self.assertEquals(self.selRange(), (0, 0))
+		self.ed.DocumentEnd()
+		self.assertEquals(self.selRange(), (10, 10))
+		self.ed.SetSel(3,3)
+		self.ed.DocumentStartExtend()
+		self.assertEquals(self.selRange(), (0, 3))
+		self.ed.DocumentEndExtend()
+		self.assertEquals(self.selRange(), (10, 3))
+
+
+class TestMarkers(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.AddText(5, b"x\ny\nz")
+
+	def testMarker(self):
+		handle = self.ed.MarkerAdd(1,1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(handle), 1)
+		self.ed.MarkerDelete(1,1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(handle), -1)
+
+	def testTwiceAddedDelete(self):
+		handle = self.ed.MarkerAdd(1,1)
+		self.assertEquals(self.ed.MarkerGet(1), 2)
+		handle2 = self.ed.MarkerAdd(1,1)
+		self.assertEquals(self.ed.MarkerGet(1), 2)
+		self.ed.MarkerDelete(1,1)
+		self.assertEquals(self.ed.MarkerGet(1), 2)
+		self.ed.MarkerDelete(1,1)
+		self.assertEquals(self.ed.MarkerGet(1), 0)
+
+	def testMarkerDeleteAll(self):
+		h1 = self.ed.MarkerAdd(0,1)
+		h2 = self.ed.MarkerAdd(1,2)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h1), 0)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h2), 1)
+		self.ed.MarkerDeleteAll(1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h1), -1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h2), 1)
+		self.ed.MarkerDeleteAll(-1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h1), -1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(h2), -1)
+
+	def testMarkerDeleteHandle(self):
+		handle = self.ed.MarkerAdd(0,1)
+		self.assertEquals(self.ed.MarkerLineFromHandle(handle), 0)
+		self.ed.MarkerDeleteHandle(handle)
+		self.assertEquals(self.ed.MarkerLineFromHandle(handle), -1)
+
+	def testMarkerBits(self):
+		self.assertEquals(self.ed.MarkerGet(0), 0)
+		self.ed.MarkerAdd(0,1)
+		self.assertEquals(self.ed.MarkerGet(0), 2)
+		self.ed.MarkerAdd(0,2)
+		self.assertEquals(self.ed.MarkerGet(0), 6)
+
+	def testMarkerAddSet(self):
+		self.assertEquals(self.ed.MarkerGet(0), 0)
+		self.ed.MarkerAddSet(0,5)
+		self.assertEquals(self.ed.MarkerGet(0), 5)
+		self.ed.MarkerDeleteAll(-1)
+
+	def testMarkerNext(self):
+		self.assertEquals(self.ed.MarkerNext(0, 2), -1)
+		h1 = self.ed.MarkerAdd(0,1)
+		h2 = self.ed.MarkerAdd(2,1)
+		self.assertEquals(self.ed.MarkerNext(0, 2), 0)
+		self.assertEquals(self.ed.MarkerNext(1, 2), 2)
+		self.assertEquals(self.ed.MarkerNext(2, 2), 2)
+		self.assertEquals(self.ed.MarkerPrevious(0, 2), 0)
+		self.assertEquals(self.ed.MarkerPrevious(1, 2), 0)
+		self.assertEquals(self.ed.MarkerPrevious(2, 2), 2)
+
+	def testMarkerNegative(self):
+		self.assertEquals(self.ed.MarkerNext(-1, 2), -1)
+
+	def testLineState(self):
+		self.assertEquals(self.ed.MaxLineState, 0)
+		self.assertEquals(self.ed.GetLineState(0), 0)
+		self.assertEquals(self.ed.GetLineState(1), 0)
+		self.assertEquals(self.ed.GetLineState(2), 0)
+		self.ed.SetLineState(1, 100)
+		self.assertNotEquals(self.ed.MaxLineState, 0)
+		self.assertEquals(self.ed.GetLineState(0), 0)
+		self.assertEquals(self.ed.GetLineState(1), 100)
+		self.assertEquals(self.ed.GetLineState(2), 0)
+
+	def testSymbolRetrieval(self):
+		self.ed.MarkerDefine(1,3)
+		self.assertEquals(self.ed.MarkerSymbolDefined(1), 3)
+
+	def markerFromLineIndex(self, line, index):
+		""" Helper that returns (handle, number) """
+		return (self.ed.MarkerHandleFromLine(line, index), self.ed.MarkerNumberFromLine(line, index))
+
+	def markerSetFromLine(self, line):
+		""" Helper that returns set of (handle, number) """
+		markerSet = set()
+		index = 0
+		while 1:
+			marker = self.markerFromLineIndex(line, index)
+			if marker[0] == -1:
+				return markerSet
+			markerSet.add(marker)
+			index += 1
+
+	def testMarkerFromLine(self):
+		self.assertEquals(self.ed.MarkerHandleFromLine(1, 0), -1)
+		self.assertEquals(self.ed.MarkerNumberFromLine(1, 0), -1)
+		self.assertEquals(self.markerFromLineIndex(1, 0), (-1, -1))
+		self.assertEquals(self.markerSetFromLine(1), set())
+
+		handle = self.ed.MarkerAdd(1,10)
+		self.assertEquals(self.markerFromLineIndex(1, 0), (handle, 10))
+		self.assertEquals(self.markerFromLineIndex(1, 1), (-1, -1))
+		self.assertEquals(self.markerSetFromLine(1), {(handle, 10)})
+
+		handle2 = self.ed.MarkerAdd(1,11)
+		# Don't want to depend on ordering so check as sets
+		self.assertEquals(self.markerSetFromLine(1), {(handle, 10), (handle2, 11)})
+
+		self.ed.MarkerDeleteHandle(handle2)
+		self.assertEquals(self.markerSetFromLine(1), {(handle, 10)})
+
+class TestIndicators(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def indicatorValueString(self, indicator):
+		# create a string with -/X where indicator off/on to make checks simple
+		return "".join("-X"[self.ed.IndicatorValueAt(indicator, index)] for index in range(self.ed.TextLength))
+
+	def testSetIndicator(self):
+		self.assertEquals(self.ed.IndicGetStyle(0), 1)
+		self.assertEquals(self.ed.IndicGetFore(0), 0x007f00)
+		self.ed.IndicSetStyle(0, 2)
+		self.ed.IndicSetFore(0, 0xff0080)
+		self.assertEquals(self.ed.IndicGetStyle(0), 2)
+		self.assertEquals(self.ed.IndicGetFore(0), 0xff0080)
+
+	def testIndicatorFill(self):
+		self.ed.InsertText(0, b"abc")
+		self.ed.IndicatorCurrent = 3
+		self.ed.IndicatorFillRange(1,1)
+		self.assertEquals(self.indicatorValueString(3), "-X-")
+		self.assertEquals(self.ed.IndicatorStart(3, 0), 0)
+		self.assertEquals(self.ed.IndicatorEnd(3, 0), 1)
+		self.assertEquals(self.ed.IndicatorStart(3, 1), 1)
+		self.assertEquals(self.ed.IndicatorEnd(3, 1), 2)
+		self.assertEquals(self.ed.IndicatorStart(3, 2), 2)
+		self.assertEquals(self.ed.IndicatorEnd(3, 2), 3)
+
+	def testIndicatorAtEnd(self):
+		self.ed.InsertText(0, b"ab")
+		self.ed.IndicatorCurrent = 3
+		self.ed.IndicatorFillRange(1,1)
+		self.assertEquals(self.ed.IndicatorValueAt(3, 0), 0)
+		self.assertEquals(self.ed.IndicatorValueAt(3, 1), 1)
+		self.assertEquals(self.ed.IndicatorStart(3, 0), 0)
+		self.assertEquals(self.ed.IndicatorEnd(3, 0), 1)
+		self.assertEquals(self.ed.IndicatorStart(3, 1), 1)
+		self.assertEquals(self.ed.IndicatorEnd(3, 1), 2)
+		self.ed.DeleteRange(1, 1)
+		# Now only one character left and does not have indicator so indicator 3 is null
+		self.assertEquals(self.ed.IndicatorValueAt(3, 0), 0)
+		# Since null, remaining calls return 0
+		self.assertEquals(self.ed.IndicatorStart(3, 0), 0)
+		self.assertEquals(self.ed.IndicatorEnd(3, 0), 0)
+		self.assertEquals(self.ed.IndicatorStart(3, 1), 0)
+		self.assertEquals(self.ed.IndicatorEnd(3, 1), 0)
+
+	def testIndicatorMovement(self):
+		# Create a two character indicator over "BC" in "aBCd" and ensure that it doesn't
+		# leak onto surrounding characters when insertions made at either end but
+		# insertion inside indicator does extend length
+		self.ed.InsertText(0, b"aBCd")
+		self.ed.IndicatorCurrent = 3
+		self.ed.IndicatorFillRange(1,2)
+		self.assertEquals(self.indicatorValueString(3), "-XX-")
+
+		# Insertion 1 before
+		self.ed.InsertText(0, b"1")
+		self.assertEquals(b"1aBCd", self.ed.Contents())
+		self.assertEquals(self.indicatorValueString(3), "--XX-")
+
+		# Insertion at start of indicator
+		self.ed.InsertText(2, b"2")
+		self.assertEquals(b"1a2BCd", self.ed.Contents())
+		self.assertEquals(self.indicatorValueString(3), "---XX-")
+
+		# Insertion inside indicator
+		self.ed.InsertText(4, b"3")
+		self.assertEquals(b"1a2B3Cd", self.ed.Contents())
+		self.assertEquals(self.indicatorValueString(3), "---XXX-")
+
+		# Insertion at end of indicator
+		self.ed.InsertText(6, b"4")
+		self.assertEquals(b"1a2B3C4d", self.ed.Contents())
+		self.assertEquals(self.indicatorValueString(3), "---XXX--")
+
+		# Insertion 1 after
+		self.ed.InsertText(8, b"5")
+		self.assertEquals(self.indicatorValueString(3), "---XXX---")
+		self.assertEquals(b"1a2B3C4d5", self.ed.Contents())
+
+
+class TestScrolling(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 150 should be enough lines
+		self.ed.InsertText(0, b"a" * 150 + b"\n" * 150)
+
+	def testTop(self):
+		self.ed.GotoLine(0)
+		self.assertEquals(self.ed.FirstVisibleLine, 0)
+
+	def testLineScroll(self):
+		self.ed.GotoLine(0)
+		self.ed.LineScroll(0, 3)
+		self.assertEquals(self.ed.FirstVisibleLine, 3)
+		self.ed.LineScroll(0, -2)
+		self.assertEquals(self.ed.FirstVisibleLine, 1)
+		self.assertEquals(self.ed.XOffset, 0)
+		self.ed.LineScroll(10, 0)
+		self.assertGreater(self.ed.XOffset, 0)
+		scroll_width = float(self.ed.XOffset) / 10
+		self.ed.LineScroll(-2, 0)
+		self.assertEquals(self.ed.XOffset, scroll_width * 8)
+
+	def testVisibleLine(self):
+		self.ed.FirstVisibleLine = 7
+		self.assertEquals(self.ed.FirstVisibleLine, 7)
+
+class TestSearch(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.InsertText(0, b"a\tbig boat\t")
+
+	def testFind(self):
+		pos = self.ed.FindBytes(0, self.ed.Length, b"zzz", 0)
+		self.assertEquals(pos, -1)
+		pos = self.ed.FindBytes(0, self.ed.Length, b"big", 0)
+		self.assertEquals(pos, 2)
+
+	def testFindEmpty(self):
+		pos = self.ed.FindBytes(0, self.ed.Length, b"", 0)
+		self.assertEquals(pos, 0)
+
+	def testCaseFind(self):
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"big", 0), 2)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bIg", 0), 2)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bIg",
+			self.ed.SCFIND_MATCHCASE), -1)
+
+	def testWordFind(self):
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bi", 0), 2)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bi",
+			self.ed.SCFIND_WHOLEWORD), -1)
+
+	def testWordStartFind(self):
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bi", 0), 2)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"bi",
+			self.ed.SCFIND_WORDSTART), 2)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"ig", 0), 3)
+		self.assertEquals(self.ed.FindBytes(0, self.ed.Length, b"ig",
+			self.ed.SCFIND_WORDSTART), -1)
+
+	def testREFind(self):
+		flags = self.ed.SCFIND_REGEXP
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"b.g", 0))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"b.g", flags))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"\<b.g\>", flags))
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"b[A-Z]g",
+			flags | self.ed.SCFIND_MATCHCASE))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"b[a-z]g", flags))
+		self.assertEquals(6, self.ed.FindBytes(0, self.ed.Length, b"b[a-z]*t", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"^a", flags))
+		self.assertEquals(10, self.ed.FindBytes(0, self.ed.Length, b"\t$", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"\([a]\).*\0", flags))
+
+	def testPosixREFind(self):
+		flags = self.ed.SCFIND_REGEXP | self.ed.SCFIND_POSIX
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"b.g", 0))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"b.g", flags))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"\<b.g\>", flags))
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"b[A-Z]g",
+			flags | self.ed.SCFIND_MATCHCASE))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"b[a-z]g", flags))
+		self.assertEquals(6, self.ed.FindBytes(0, self.ed.Length, b"b[a-z]*t", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"^a", flags))
+		self.assertEquals(10, self.ed.FindBytes(0, self.ed.Length, b"\t$", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"([a]).*\0", flags))
+
+	def testPhilippeREFind(self):
+		# Requires 1.,72
+		flags = self.ed.SCFIND_REGEXP
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"\w", flags))
+		self.assertEquals(1, self.ed.FindBytes(0, self.ed.Length, b"\W", flags))
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"\d", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"\D", flags))
+		self.assertEquals(1, self.ed.FindBytes(0, self.ed.Length, b"\s", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"\S", flags))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"\x62", flags))
+
+	def testRENonASCII(self):
+		self.ed.InsertText(0, b"\xAD")
+		flags = self.ed.SCFIND_REGEXP
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"\\x10", flags))
+		self.assertEquals(2, self.ed.FindBytes(0, self.ed.Length, b"\\x09", flags))
+		self.assertEquals(-1, self.ed.FindBytes(0, self.ed.Length, b"\\xAB", flags))
+		self.assertEquals(0, self.ed.FindBytes(0, self.ed.Length, b"\\xAD", flags))
+
+	def testMultipleAddSelection(self):
+		# Find both 'a'
+		self.assertEquals(self.ed.MultipleSelection, 0)
+		self.ed.MultipleSelection = 1
+		self.assertEquals(self.ed.MultipleSelection, 1)
+		self.ed.TargetWholeDocument()
+		self.ed.SearchFlags = 0
+		self.ed.SetSelection(1, 0)
+		self.assertEquals(self.ed.Selections, 1)
+		self.ed.MultipleSelectAddNext()
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(1), 8)
+		self.assertEquals(self.ed.GetSelectionNCaret(1), 9)
+		self.ed.MultipleSelection = 0
+
+	def testMultipleAddEachSelection(self):
+		# Find each 'b'
+		self.assertEquals(self.ed.MultipleSelection, 0)
+		self.ed.MultipleSelection = 1
+		self.assertEquals(self.ed.MultipleSelection, 1)
+		self.ed.TargetWholeDocument()
+		self.ed.SearchFlags = 0
+		self.ed.SetSelection(3, 2)
+		self.assertEquals(self.ed.Selections, 1)
+		self.ed.MultipleSelectAddEach()
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 2)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 3)
+		self.assertEquals(self.ed.GetSelectionNAnchor(1), 6)
+		self.assertEquals(self.ed.GetSelectionNCaret(1), 7)
+		self.ed.MultipleSelection = 0
+
+class TestRepresentations(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testGetControl(self):
+		result = self.ed.GetRepresentation(b"\001")
+		self.assertEquals(result, b"SOH")
+
+	def testClearControl(self):
+		result = self.ed.GetRepresentation(b"\002")
+		self.assertEquals(result, b"STX")
+		self.ed.ClearRepresentation(b"\002")
+		result = self.ed.GetRepresentation(b"\002")
+		self.assertEquals(result, b"")
+
+	def testSetOhm(self):
+		ohmSign = b"\xe2\x84\xa6"
+		ohmExplained = b"U+2126 \xe2\x84\xa6"
+		self.ed.SetRepresentation(ohmSign, ohmExplained)
+		result = self.ed.GetRepresentation(ohmSign)
+		self.assertEquals(result, ohmExplained)
+
+	def testNul(self):
+		self.ed.SetRepresentation(b"", b"Nul")
+		result = self.ed.GetRepresentation(b"")
+		self.assertEquals(result, b"Nul")
+
+	def testAppearance(self):
+		ohmSign = b"\xe2\x84\xa6"
+		ohmExplained = b"U+2126 \xe2\x84\xa6"
+		self.ed.SetRepresentation(ohmSign, ohmExplained)
+		result = self.ed.GetRepresentationAppearance(ohmSign)
+		self.assertEquals(result, self.ed.SC_REPRESENTATION_BLOB)
+		self.ed.SetRepresentationAppearance(ohmSign, self.ed.SC_REPRESENTATION_PLAIN)
+		result = self.ed.GetRepresentationAppearance(ohmSign)
+		self.assertEquals(result, self.ed.SC_REPRESENTATION_PLAIN)
+
+	def testColour(self):
+		ohmSign = b"\xe2\x84\xa6"
+		ohmExplained = b"U+2126 \xe2\x84\xa6"
+		self.ed.SetRepresentation(ohmSign, ohmExplained)
+		result = self.ed.GetRepresentationColour(ohmSign)
+		self.assertEquals(result, 0)
+		self.ed.SetRepresentationColour(ohmSign, 0x10203040)
+		result = self.ed.GetRepresentationColour(ohmSign)
+		self.assertEquals(result, 0x10203040)
+
+@unittest.skipUnless(lexersAvailable, "no lexers included")
+class TestProperties(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testSet(self):
+		self.xite.ChooseLexer(b"cpp")
+		# For Lexilla, only known property names may work
+		propName = b"lexer.cpp.allow.dollars"
+		self.ed.SetProperty(propName, b"1")
+		self.assertEquals(self.ed.GetPropertyInt(propName), 1)
+		result = self.ed.GetProperty(propName)
+		self.assertEquals(result, b"1")
+		self.ed.SetProperty(propName, b"0")
+		self.assertEquals(self.ed.GetPropertyInt(propName), 0)
+		result = self.ed.GetProperty(propName)
+		self.assertEquals(result, b"0")
+		# No longer expands but should at least return the value
+		result = self.ed.GetPropertyExpanded(propName)
+		self.assertEquals(result, b"0")
+
+class TestTextMargin(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.txt = b"abcd"
+		self.ed.AddText(1, b"x")
+
+	def testAscent(self):
+		lineHeight = self.ed.TextHeight(0)
+		self.assertEquals(self.ed.ExtraAscent, 0)
+		self.assertEquals(self.ed.ExtraDescent, 0)
+		self.ed.ExtraAscent = 1
+		self.assertEquals(self.ed.ExtraAscent, 1)
+		self.ed.ExtraDescent = 2
+		self.assertEquals(self.ed.ExtraDescent, 2)
+		lineHeightIncreased = self.ed.TextHeight(0)
+		self.assertEquals(lineHeightIncreased, lineHeight + 2 + 1)
+
+	def testTextMargin(self):
+		self.ed.MarginSetText(0, self.txt)
+		result = self.ed.MarginGetText(0)
+		self.assertEquals(result, self.txt)
+		self.ed.MarginTextClearAll()
+
+	def testTextMarginStyle(self):
+		self.ed.MarginSetText(0, self.txt)
+		self.ed.MarginSetStyle(0, 33)
+		self.assertEquals(self.ed.MarginGetStyle(0), 33)
+		self.ed.MarginTextClearAll()
+
+	def testTextMarginStyles(self):
+		styles = b"\001\002\003\004"
+		self.ed.MarginSetText(0, self.txt)
+		self.ed.MarginSetStyles(0, styles)
+		result = self.ed.MarginGetStyles(0)
+		self.assertEquals(result, styles)
+		self.ed.MarginTextClearAll()
+
+	def testTextMarginStyleOffset(self):
+		self.ed.MarginSetStyleOffset(300)
+		self.assertEquals(self.ed.MarginGetStyleOffset(), 300)
+
+class TestAnnotation(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.txt = b"abcd"
+		self.ed.AddText(1, b"x")
+
+	def testTextAnnotation(self):
+		self.assertEquals(self.ed.AnnotationGetLines(), 0)
+		self.ed.AnnotationSetText(0, self.txt)
+		self.assertEquals(self.ed.AnnotationGetLines(), 1)
+		result = self.ed.AnnotationGetText(0)
+		self.assertEquals(len(result), 4)
+		self.assertEquals(result, self.txt)
+		self.ed.AnnotationClearAll()
+
+	def testTextAnnotationStyle(self):
+		self.ed.AnnotationSetText(0, self.txt)
+		self.ed.AnnotationSetStyle(0, 33)
+		self.assertEquals(self.ed.AnnotationGetStyle(0), 33)
+		self.ed.AnnotationClearAll()
+
+	def testTextAnnotationStyles(self):
+		styles = b"\001\002\003\004"
+		self.ed.AnnotationSetText(0, self.txt)
+		self.ed.AnnotationSetStyles(0, styles)
+		result = self.ed.AnnotationGetStyles(0)
+		self.assertEquals(result, styles)
+		self.ed.AnnotationClearAll()
+
+	def testExtendedStyles(self):
+		start0 = self.ed.AllocateExtendedStyles(0)
+		self.assertEquals(start0, 256)
+		start1 = self.ed.AllocateExtendedStyles(10)
+		self.assertEquals(start1, 256)
+		start2 = self.ed.AllocateExtendedStyles(20)
+		self.assertEquals(start2, start1 + 10)
+		# Reset by changing lexer
+		self.ed.ReleaseAllExtendedStyles()
+		start0 = self.ed.AllocateExtendedStyles(0)
+		self.assertEquals(start0, 256)
+
+	def testTextAnnotationStyleOffset(self):
+		self.ed.AnnotationSetStyleOffset(300)
+		self.assertEquals(self.ed.AnnotationGetStyleOffset(), 300)
+
+	def testTextAnnotationVisible(self):
+		self.assertEquals(self.ed.AnnotationGetVisible(), 0)
+		self.ed.AnnotationSetVisible(2)
+		self.assertEquals(self.ed.AnnotationGetVisible(), 2)
+		self.ed.AnnotationSetVisible(0)
+
+def selectionPositionRepresentation(selectionPosition):
+	position, virtualSpace = selectionPosition
+	representation = str(position)
+	if virtualSpace > 0:
+		representation += "+" + str(virtualSpace) + "v"
+	return representation
+
+def selectionRangeRepresentation(selectionRange):
+	anchor, caret = selectionRange
+	return selectionPositionRepresentation(anchor) + "-" + selectionPositionRepresentation(caret)
+
+class TestMultiSelection(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 3 lines of 3 characters
+		t = b"xxx\nxxx\nxxx"
+		self.ed.AddText(len(t), t)
+
+	def textOfSelection(self, n):
+		self.ed.TargetStart = self.ed.GetSelectionNStart(n)
+		self.ed.TargetEnd = self.ed.GetSelectionNEnd(n)
+		return bytes(self.ed.GetTargetText())
+
+	def testSelectionCleared(self):
+		self.ed.ClearSelections()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 0)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 0)
+
+	def test1Selection(self):
+		self.ed.SetSelection(1, 2)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 2)
+		self.assertEquals(self.ed.GetSelectionNStart(0), 1)
+		self.assertEquals(self.ed.GetSelectionNEnd(0), 2)
+		self.ed.SwapMainAnchorCaret()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+
+	def test1SelectionReversed(self):
+		self.ed.SetSelection(2, 1)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.assertEquals(self.ed.GetSelectionNStart(0), 1)
+		self.assertEquals(self.ed.GetSelectionNEnd(0), 2)
+
+	def test1SelectionByStartEnd(self):
+		self.ed.SetSelectionNStart(0, 2)
+		self.ed.SetSelectionNEnd(0, 3)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 2)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 3)
+		self.assertEquals(self.ed.GetSelectionNStart(0), 2)
+		self.assertEquals(self.ed.GetSelectionNEnd(0), 3)
+
+	def test2Selections(self):
+		self.ed.SetSelection(1, 2)
+		self.ed.AddSelection(4, 5)
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.MainSelection, 1)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 2)
+		self.assertEquals(self.ed.GetSelectionNCaret(1), 4)
+		self.assertEquals(self.ed.GetSelectionNAnchor(1), 5)
+		self.assertEquals(self.ed.GetSelectionNStart(0), 1)
+		self.assertEquals(self.ed.GetSelectionNEnd(0), 2)
+		self.ed.MainSelection = 0
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.ed.RotateSelection()
+		self.assertEquals(self.ed.MainSelection, 1)
+
+	def testRectangularSelection(self):
+		self.ed.RectangularSelectionAnchor = 1
+		self.assertEquals(self.ed.RectangularSelectionAnchor, 1)
+		self.ed.RectangularSelectionCaret = 10
+		self.assertEquals(self.ed.RectangularSelectionCaret, 10)
+		self.assertEquals(self.ed.Selections, 3)
+		self.assertEquals(self.ed.MainSelection, 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(1), 5)
+		self.assertEquals(self.ed.GetSelectionNCaret(1), 6)
+		self.assertEquals(self.ed.GetSelectionNAnchor(2), 9)
+		self.assertEquals(self.ed.GetSelectionNCaret(2), 10)
+
+	def testVirtualSpace(self):
+		self.ed.SetSelection(3, 7)
+		self.ed.SetSelectionNCaretVirtualSpace(0, 3)
+		self.assertEquals(self.ed.GetSelectionNCaretVirtualSpace(0), 3)
+		self.ed.SetSelectionNAnchorVirtualSpace(0, 2)
+		self.assertEquals(self.ed.GetSelectionNAnchorVirtualSpace(0), 2)
+		self.assertEquals(self.ed.GetSelectionNStartVirtualSpace(0), 3)
+		self.assertEquals(self.ed.GetSelectionNEndVirtualSpace(0), 2)
+		# Does not check that virtual space is valid by being at end of line
+		self.ed.SetSelection(1, 1)
+		self.ed.SetSelectionNCaretVirtualSpace(0, 3)
+		self.assertEquals(self.ed.GetSelectionNCaretVirtualSpace(0), 3)
+		self.assertEquals(self.ed.GetSelectionNStartVirtualSpace(0), 0)
+		self.assertEquals(self.ed.GetSelectionNEndVirtualSpace(0), 3)
+
+	def testRectangularVirtualSpace(self):
+		self.ed.VirtualSpaceOptions=1
+		self.ed.RectangularSelectionAnchor = 3
+		self.assertEquals(self.ed.RectangularSelectionAnchor, 3)
+		self.ed.RectangularSelectionCaret = 7
+		self.assertEquals(self.ed.RectangularSelectionCaret, 7)
+		self.ed.RectangularSelectionAnchorVirtualSpace = 1
+		self.assertEquals(self.ed.RectangularSelectionAnchorVirtualSpace, 1)
+		self.ed.RectangularSelectionCaretVirtualSpace = 10
+		self.assertEquals(self.ed.RectangularSelectionCaretVirtualSpace, 10)
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.MainSelection, 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 3)
+		self.assertEquals(self.ed.GetSelectionNAnchorVirtualSpace(0), 1)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 3)
+		self.assertEquals(self.ed.GetSelectionNCaretVirtualSpace(0), 10)
+
+	def testRectangularVirtualSpaceOptionOff(self):
+		# Same as previous test but virtual space option off so no virtual space in result
+		self.ed.VirtualSpaceOptions=0
+		self.ed.RectangularSelectionAnchor = 3
+		self.assertEquals(self.ed.RectangularSelectionAnchor, 3)
+		self.ed.RectangularSelectionCaret = 7
+		self.assertEquals(self.ed.RectangularSelectionCaret, 7)
+		self.ed.RectangularSelectionAnchorVirtualSpace = 1
+		self.assertEquals(self.ed.RectangularSelectionAnchorVirtualSpace, 1)
+		self.ed.RectangularSelectionCaretVirtualSpace = 10
+		self.assertEquals(self.ed.RectangularSelectionCaretVirtualSpace, 10)
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.MainSelection, 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 3)
+		self.assertEquals(self.ed.GetSelectionNAnchorVirtualSpace(0), 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 3)
+		self.assertEquals(self.ed.GetSelectionNCaretVirtualSpace(0), 0)
+
+	def testDropSelectionN(self):
+		self.ed.SetSelection(1, 2)
+		# Only one so dropping has no effect
+		self.ed.DropSelectionN(0)
+		self.assertEquals(self.ed.Selections, 1)
+		self.ed.AddSelection(4, 5)
+		self.assertEquals(self.ed.Selections, 2)
+		# Outside bounds so no effect
+		self.ed.DropSelectionN(2)
+		self.assertEquals(self.ed.Selections, 2)
+		# Dropping before main so main decreases
+		self.ed.DropSelectionN(0)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 4)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 5)
+
+		self.ed.AddSelection(10, 11)
+		self.ed.AddSelection(20, 21)
+		self.assertEquals(self.ed.Selections, 3)
+		self.assertEquals(self.ed.MainSelection, 2)
+		self.ed.MainSelection = 1
+		# Dropping after main so main does not change
+		self.ed.DropSelectionN(2)
+		self.assertEquals(self.ed.MainSelection, 1)
+
+		# Dropping first selection so wraps around to new last.
+		self.ed.AddSelection(30, 31)
+		self.ed.AddSelection(40, 41)
+		self.assertEquals(self.ed.Selections, 4)
+		self.ed.MainSelection = 0
+		self.ed.DropSelectionN(0)
+		self.assertEquals(self.ed.MainSelection, 2)
+
+	def partFromSelection(self, n):
+		# Return a tuple (order, text) from a selection part
+		# order is a boolean whether the caret is before the anchor
+		self.ed.TargetStart = self.ed.GetSelectionNStart(n)
+		self.ed.TargetEnd = self.ed.GetSelectionNEnd(n)
+		return (self.ed.GetSelectionNCaret(n) < self.ed.GetSelectionNAnchor(n), self.textOfSelection(n))
+
+	def replacePart(self, n, part):
+		startSelection = self.ed.GetSelectionNStart(n)
+		self.ed.TargetStart = startSelection
+		self.ed.TargetEnd = self.ed.GetSelectionNEnd(n)
+		direction, text = part
+		length = len(text)
+		self.ed.ReplaceTarget(len(text), text)
+		if direction:
+			self.ed.SetSelectionNCaret(n, startSelection)
+			self.ed.SetSelectionNAnchor(n, startSelection + length)
+		else:
+			self.ed.SetSelectionNAnchor(n, startSelection)
+			self.ed.SetSelectionNCaret(n, startSelection + length)
+
+	def swapSelections(self):
+		# Swap the selections
+		part0 = self.partFromSelection(0)
+		part1 = self.partFromSelection(1)
+
+		self.replacePart(1, part0)
+		self.replacePart(0, part1)
+
+	def checkAdjacentSelections(self, selections, invert):
+		# Only called from testAdjacentSelections to try one permutation
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		t = b"ab"
+		texts = (b'b', b'a') if invert else (b'a', b'b')
+		self.ed.AddText(len(t), t)
+		sel0, sel1 = selections
+		self.ed.SetSelection(sel0[0], sel0[1])
+		self.ed.AddSelection(sel1[0], sel1[1])
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.textOfSelection(0), texts[0])
+		self.assertEquals(self.textOfSelection(1), texts[1])
+		self.swapSelections()
+		self.assertEquals(self.ed.Contents(), b'ba')
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.textOfSelection(0), texts[1])
+		self.assertEquals(self.textOfSelection(1), texts[0])
+
+	def selectionRepresentation(self, n):
+		anchor = (self.ed.GetSelectionNAnchor(0), self.ed.GetSelectionNAnchorVirtualSpace(0))
+		caret = (self.ed.GetSelectionNCaret(0), self.ed.GetSelectionNCaretVirtualSpace(0))
+		return selectionRangeRepresentation((anchor, caret))
+
+	def testAdjacentSelections(self):
+		# For various permutations of selections, try swapping the text and ensure that the
+		# selections remain distinct
+		self.checkAdjacentSelections(((1, 0),(1, 2)), False)
+		self.checkAdjacentSelections(((0, 1),(1, 2)), False)
+		self.checkAdjacentSelections(((1, 0),(2, 1)), False)
+		self.checkAdjacentSelections(((0, 1),(2, 1)), False)
+
+		# Reverse order, first selection is after second
+		self.checkAdjacentSelections(((1, 2),(1, 0)), True)
+		self.checkAdjacentSelections(((1, 2),(0, 1)), True)
+		self.checkAdjacentSelections(((2, 1),(1, 0)), True)
+		self.checkAdjacentSelections(((2, 1),(0, 1)), True)
+
+	def testInsertBefore(self):
+		self.ed.ClearAll()
+		t = b"a"
+		self.ed.AddText(len(t), t)
+		self.ed.SetSelection(0, 1)
+		self.assertEquals(self.textOfSelection(0), b'a')
+
+		self.ed.SetTargetRange(0, 0)
+		self.ed.ReplaceTarget(1, b'1')
+		self.assertEquals(self.ed.Contents(), b'1a')
+		self.assertEquals(self.textOfSelection(0), b'a')
+
+	def testInsertAfter(self):
+		self.ed.ClearAll()
+		t = b"a"
+		self.ed.AddText(len(t), t)
+		self.ed.SetSelection(0, 1)
+		self.assertEquals(self.textOfSelection(0), b'a')
+
+		self.ed.SetTargetRange(1, 1)
+		self.ed.ReplaceTarget(1, b'9')
+		self.assertEquals(self.ed.Contents(), b'a9')
+		self.assertEquals(self.textOfSelection(0), b'a')
+
+	def testInsertBeforeVirtualSpace(self):
+		self.ed.SetContents(b"a")
+		self.ed.SetSelection(1, 1)
+		self.ed.SetSelectionNAnchorVirtualSpace(0, 2)
+		self.ed.SetSelectionNCaretVirtualSpace(0, 2)
+		self.assertEquals(self.selectionRepresentation(0), "1+2v-1+2v")
+		self.assertEquals(self.textOfSelection(0), b'')
+
+		# Append '1'
+		self.ed.SetTargetRange(1, 1)
+		self.ed.ReplaceTarget(1, b'1')
+		# Selection moved on 1, but still empty
+		self.assertEquals(self.selectionRepresentation(0), "2+1v-2+1v")
+		self.assertEquals(self.ed.Contents(), b'a1')
+		self.assertEquals(self.textOfSelection(0), b'')
+
+	def testInsertThroughVirtualSpace(self):
+		self.ed.SetContents(b"a")
+		self.ed.SetSelection(1, 1)
+		self.ed.SetSelectionNAnchorVirtualSpace(0, 2)
+		self.ed.SetSelectionNCaretVirtualSpace(0, 3)
+		self.assertEquals(self.selectionRepresentation(0), "1+2v-1+3v")
+		self.assertEquals(self.textOfSelection(0), b'')
+
+		# Append '1' past current virtual space
+		self.ed.SetTargetRange(1, 1)
+		self.ed.SetTargetStartVirtualSpace(4)
+		self.ed.SetTargetEndVirtualSpace(5)
+		self.ed.ReplaceTarget(1, b'1')
+		# Virtual space of selection all converted to real positions
+		self.assertEquals(self.selectionRepresentation(0), "3-4")
+		self.assertEquals(self.ed.Contents(), b'a    1')
+		self.assertEquals(self.textOfSelection(0), b' ')
+
+
+class TestModalSelection(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 3 lines of 3 characters
+		t = b"xxx\nxxx\nxxx"
+		self.ed.AddText(len(t), t)
+
+	def testCharacterSelection(self):
+		self.ed.SetSelection(1, 1)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.SelectionMode = self.ed.SC_SEL_STREAM
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.CharRight()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.LineDown()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 6)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.ClearSelections()
+
+	def testRectangleSelection(self):
+		self.ed.SetSelection(1, 1)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.SelectionMode = self.ed.SC_SEL_RECTANGLE
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.CharRight()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.LineDown()
+		self.assertEquals(self.ed.Selections, 2)
+		self.assertEquals(self.ed.MainSelection, 1)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 2)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.assertEquals(self.ed.GetSelectionNCaret(1), 6)
+		self.assertEquals(self.ed.GetSelectionNAnchor(1), 5)
+		self.ed.ClearSelections()
+
+	def testLinesSelection(self):
+		self.ed.SetSelection(1, 1)
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 1)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 1)
+		self.ed.SelectionMode = self.ed.SC_SEL_LINES
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 0)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 3)
+		self.ed.CharRight()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 0)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 3)
+		self.ed.LineDown()
+		self.assertEquals(self.ed.Selections, 1)
+		self.assertEquals(self.ed.MainSelection, 0)
+		self.assertEquals(self.ed.GetSelectionNCaret(0), 7)
+		self.assertEquals(self.ed.GetSelectionNAnchor(0), 0)
+		self.ed.ClearSelections()
+
+class TestTechnology(unittest.TestCase):
+	""" These tests are just to ensure that the calls set and retrieve values.
+	They assume running on a Direct2D compatible version of Windows.
+	They do not check visual appearance.
+	"""
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def tearDown(self):
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testTechnologyAndBufferedDraw(self):
+		self.ed.Technology = self.ed.SC_TECHNOLOGY_DEFAULT
+		self.assertEquals(self.ed.GetTechnology(), self.ed.SC_TECHNOLOGY_DEFAULT)
+		if sys.platform == "win32":
+			self.ed.Technology = self.ed.SC_TECHNOLOGY_DIRECTWRITE
+			self.assertEquals(self.ed.GetTechnology(), self.ed.SC_TECHNOLOGY_DIRECTWRITE)
+			self.assertEquals(self.ed.BufferedDraw, False)
+			self.ed.Technology = self.ed.SC_TECHNOLOGY_DEFAULT
+			self.assertEquals(self.ed.GetTechnology(), self.ed.SC_TECHNOLOGY_DEFAULT)
+			self.assertEquals(self.ed.BufferedDraw, True)
+
+class TestStyleAttributes(unittest.TestCase):
+	""" These tests are just to ensure that the calls set and retrieve values.
+	They do not check the visual appearance of the style attributes.
+	"""
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.testColour = 0x171615
+		self.testFont = b"Georgia"
+
+	def tearDown(self):
+		self.ed.StyleResetDefault()
+
+	def testFont(self):
+		self.ed.StyleSetFont(self.ed.STYLE_DEFAULT, self.testFont)
+		self.assertEquals(self.ed.StyleGetFont(self.ed.STYLE_DEFAULT), self.testFont)
+
+	def testSize(self):
+		self.ed.StyleSetSize(self.ed.STYLE_DEFAULT, 12)
+		self.assertEquals(self.ed.StyleGetSize(self.ed.STYLE_DEFAULT), 12)
+		self.assertEquals(self.ed.StyleGetSizeFractional(self.ed.STYLE_DEFAULT), 12*self.ed.SC_FONT_SIZE_MULTIPLIER)
+		self.ed.StyleSetSizeFractional(self.ed.STYLE_DEFAULT, 1234)
+		self.assertEquals(self.ed.StyleGetSizeFractional(self.ed.STYLE_DEFAULT), 1234)
+
+	def testBold(self):
+		self.ed.StyleSetBold(self.ed.STYLE_DEFAULT, 1)
+		self.assertEquals(self.ed.StyleGetBold(self.ed.STYLE_DEFAULT), 1)
+		self.assertEquals(self.ed.StyleGetWeight(self.ed.STYLE_DEFAULT), self.ed.SC_WEIGHT_BOLD)
+		self.ed.StyleSetWeight(self.ed.STYLE_DEFAULT, 530)
+		self.assertEquals(self.ed.StyleGetWeight(self.ed.STYLE_DEFAULT), 530)
+
+	def testItalic(self):
+		self.ed.StyleSetItalic(self.ed.STYLE_DEFAULT, 1)
+		self.assertEquals(self.ed.StyleGetItalic(self.ed.STYLE_DEFAULT), 1)
+
+	def testUnderline(self):
+		self.assertEquals(self.ed.StyleGetUnderline(self.ed.STYLE_DEFAULT), 0)
+		self.ed.StyleSetUnderline(self.ed.STYLE_DEFAULT, 1)
+		self.assertEquals(self.ed.StyleGetUnderline(self.ed.STYLE_DEFAULT), 1)
+
+	def testFore(self):
+		self.assertEquals(self.ed.StyleGetFore(self.ed.STYLE_DEFAULT), 0)
+		self.ed.StyleSetFore(self.ed.STYLE_DEFAULT, self.testColour)
+		self.assertEquals(self.ed.StyleGetFore(self.ed.STYLE_DEFAULT), self.testColour)
+
+	def testBack(self):
+		self.assertEquals(self.ed.StyleGetBack(self.ed.STYLE_DEFAULT), 0xffffff)
+		self.ed.StyleSetBack(self.ed.STYLE_DEFAULT, self.testColour)
+		self.assertEquals(self.ed.StyleGetBack(self.ed.STYLE_DEFAULT), self.testColour)
+
+	def testEOLFilled(self):
+		self.assertEquals(self.ed.StyleGetEOLFilled(self.ed.STYLE_DEFAULT), 0)
+		self.ed.StyleSetEOLFilled(self.ed.STYLE_DEFAULT, 1)
+		self.assertEquals(self.ed.StyleGetEOLFilled(self.ed.STYLE_DEFAULT), 1)
+
+	def testCharacterSet(self):
+		self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_RUSSIAN)
+		self.assertEquals(self.ed.StyleGetCharacterSet(self.ed.STYLE_DEFAULT), self.ed.SC_CHARSET_RUSSIAN)
+
+	def testCase(self):
+		self.assertEquals(self.ed.StyleGetCase(self.ed.STYLE_DEFAULT), self.ed.SC_CASE_MIXED)
+		self.ed.StyleSetCase(self.ed.STYLE_DEFAULT, self.ed.SC_CASE_UPPER)
+		self.assertEquals(self.ed.StyleGetCase(self.ed.STYLE_DEFAULT), self.ed.SC_CASE_UPPER)
+		self.ed.StyleSetCase(self.ed.STYLE_DEFAULT, self.ed.SC_CASE_LOWER)
+		self.assertEquals(self.ed.StyleGetCase(self.ed.STYLE_DEFAULT), self.ed.SC_CASE_LOWER)
+
+	def testVisible(self):
+		self.assertEquals(self.ed.StyleGetVisible(self.ed.STYLE_DEFAULT), 1)
+		self.ed.StyleSetVisible(self.ed.STYLE_DEFAULT, 0)
+		self.assertEquals(self.ed.StyleGetVisible(self.ed.STYLE_DEFAULT), 0)
+
+	def testChangeable(self):
+		self.assertEquals(self.ed.StyleGetChangeable(self.ed.STYLE_DEFAULT), 1)
+		self.ed.StyleSetChangeable(self.ed.STYLE_DEFAULT, 0)
+		self.assertEquals(self.ed.StyleGetChangeable(self.ed.STYLE_DEFAULT), 0)
+
+	def testHotSpot(self):
+		self.assertEquals(self.ed.StyleGetHotSpot(self.ed.STYLE_DEFAULT), 0)
+		self.ed.StyleSetHotSpot(self.ed.STYLE_DEFAULT, 1)
+		self.assertEquals(self.ed.StyleGetHotSpot(self.ed.STYLE_DEFAULT), 1)
+
+	def testFoldDisplayTextStyle(self):
+		self.assertEquals(self.ed.FoldDisplayTextGetStyle(), 0)
+		self.ed.FoldDisplayTextSetStyle(self.ed.SC_FOLDDISPLAYTEXT_BOXED)
+		self.assertEquals(self.ed.FoldDisplayTextGetStyle(), self.ed.SC_FOLDDISPLAYTEXT_BOXED)
+
+	def testDefaultFoldDisplayText(self):
+		self.assertEquals(self.ed.GetDefaultFoldDisplayText(), b"")
+		self.ed.SetDefaultFoldDisplayText(0, b"...")
+		self.assertEquals(self.ed.GetDefaultFoldDisplayText(), b"...")
+
+	def testFontQuality(self):
+		self.assertEquals(self.ed.GetFontQuality(), self.ed.SC_EFF_QUALITY_DEFAULT)
+		self.ed.SetFontQuality(self.ed.SC_EFF_QUALITY_LCD_OPTIMIZED)
+		self.assertEquals(self.ed.GetFontQuality(), self.ed.SC_EFF_QUALITY_LCD_OPTIMIZED)
+
+	def testFontLocale(self):
+		initialLocale = "en-us".encode("UTF-8")
+		testLocale = "zh-Hans".encode("UTF-8")
+		self.assertEquals(self.ed.GetFontLocale(), initialLocale)
+		self.ed.FontLocale = testLocale
+		self.assertEquals(self.ed.GetFontLocale(), testLocale)
+
+class TestElements(unittest.TestCase):
+	""" These tests are just to ensure that the calls set and retrieve values.
+	They do not check the visual appearance of the style attributes.
+	"""
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.testColourAlpha = 0x18171615
+		self.opaque = 0xff000000
+		self.dropAlpha = 0x00ffffff
+
+	def tearDown(self):
+		pass
+		
+	def ElementColour(self, element):
+		# & 0xffffffff prevents sign extension issues
+		return self.ed.GetElementColour(element) & 0xffffffff
+
+	def RestoreCaretLine(self):
+		self.ed.CaretLineLayer = 0
+		self.ed.CaretLineFrame = 0
+		self.ed.ResetElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK)
+		self.ed.CaretLineVisibleAlways = False
+
+	def testIsSet(self):
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_SELECTION_TEXT))
+
+	def testAllowsTranslucent(self):
+		self.assertFalse(self.ed.GetElementAllowsTranslucent(self.ed.SC_ELEMENT_LIST))
+		self.assertTrue(self.ed.GetElementAllowsTranslucent(self.ed.SC_ELEMENT_SELECTION_TEXT))
+
+	def testChanging(self):
+		self.ed.SetElementColour(self.ed.SC_ELEMENT_LIST_BACK, self.testColourAlpha)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_LIST_BACK), self.testColourAlpha)
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_LIST_BACK))
+
+	def testReset(self):
+		self.ed.SetElementColour(self.ed.SC_ELEMENT_SELECTION_ADDITIONAL_TEXT, self.testColourAlpha)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_SELECTION_ADDITIONAL_TEXT), self.testColourAlpha)
+		self.ed.ResetElementColour(self.ed.SC_ELEMENT_SELECTION_ADDITIONAL_TEXT)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_SELECTION_ADDITIONAL_TEXT), 0)
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_SELECTION_ADDITIONAL_TEXT))
+
+	def testBaseColour(self):
+		if sys.platform == "win32":
+			# SC_ELEMENT_LIST* base colours only currently implemented on Win32
+			text = self.ed.GetElementBaseColour(self.ed.SC_ELEMENT_LIST)
+			back = self.ed.GetElementBaseColour(self.ed.SC_ELEMENT_LIST_BACK)
+			self.assertEquals(text & self.opaque, self.opaque)
+			self.assertEquals(back & self.opaque, self.opaque)
+			self.assertNotEquals(text & self.dropAlpha, back & self.dropAlpha)
+			selText = self.ed.GetElementBaseColour(self.ed.SC_ELEMENT_LIST_SELECTED)
+			selBack = self.ed.GetElementBaseColour(self.ed.SC_ELEMENT_LIST_SELECTED_BACK)
+			self.assertEquals(selText & self.opaque, self.opaque)
+			self.assertEquals(selBack & self.opaque, self.opaque)
+			self.assertNotEquals(selText & self.dropAlpha, selBack & self.dropAlpha)
+
+	def testSelectionLayer(self):
+		self.ed.SelectionLayer = self.ed.SC_LAYER_OVER_TEXT
+		self.assertEquals(self.ed.SelectionLayer, self.ed.SC_LAYER_OVER_TEXT)
+		self.ed.SelectionLayer = self.ed.SC_LAYER_BASE
+		self.assertEquals(self.ed.SelectionLayer, self.ed.SC_LAYER_BASE)
+		
+	def testCaretLine(self):
+		# Newer Layer / ElementColour API
+		self.assertEquals(self.ed.CaretLineLayer, 0)
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
+		self.assertEquals(self.ed.CaretLineFrame, 0)
+		self.assertFalse(self.ed.CaretLineVisibleAlways)
+		
+		self.ed.CaretLineLayer = 2
+		self.assertEquals(self.ed.CaretLineLayer, 2)
+		self.ed.CaretLineFrame = 2
+		self.assertEquals(self.ed.CaretLineFrame, 2)
+		self.ed.CaretLineVisibleAlways = True
+		self.assertTrue(self.ed.CaretLineVisibleAlways)
+		self.ed.SetElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK, self.testColourAlpha)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK), self.testColourAlpha)
+		
+		self.RestoreCaretLine()
+
+	def testCaretLineLayerDiscouraged(self):
+		# Check old discouraged APIs
+		# This is s bit tricky as there is no clean mapping: parts of the old state are distributed to
+		# sometimes-multiple parts of the new state.
+		backColour = 0x102030
+		backColourOpaque = backColour | self.opaque
+		self.assertEquals(self.ed.CaretLineVisible, 0)
+		self.ed.CaretLineVisible = 1
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
+		self.assertEquals(self.ed.CaretLineVisible, 1)
+		self.ed.CaretLineBack = backColour
+		self.assertEquals(self.ed.CaretLineBack, backColour)
+		# Check with newer API
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK), backColourOpaque)
+		self.assertEquals(self.ed.CaretLineLayer, 0)
+
+		alpha = 0x7f
+		self.ed.CaretLineBackAlpha = alpha
+		self.assertEquals(self.ed.CaretLineBackAlpha, alpha)
+		backColourTranslucent = backColour | (alpha << 24)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_CARET_LINE_BACK), backColourTranslucent)
+		self.assertEquals(self.ed.CaretLineLayer, 2)
+		
+		self.ed.CaretLineBackAlpha = 0x100
+		self.assertEquals(self.ed.CaretLineBackAlpha, 0x100)
+		self.assertEquals(self.ed.CaretLineLayer, 0)	# SC_ALPHA_NOALPHA moved to base layer
+		
+		self.RestoreCaretLine()
+		
+		# Try other orders
+
+		self.ed.CaretLineBackAlpha = 0x100
+		self.assertEquals(self.ed.CaretLineBackAlpha, 0x100)
+		self.assertEquals(self.ed.CaretLineLayer, 0)	# SC_ALPHA_NOALPHA moved to base layer
+		self.ed.CaretLineBack = backColour
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
+		self.ed.CaretLineVisible = 0
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_CARET_LINE_BACK))
+
+		self.RestoreCaretLine()
+
+	def testMarkerLayer(self):
+		self.assertEquals(self.ed.MarkerGetLayer(1), 0)
+		self.ed.MarkerSetAlpha(1, 23)
+		self.assertEquals(self.ed.MarkerGetLayer(1), 2)
+		self.ed.MarkerSetAlpha(1, 0x100)
+		self.assertEquals(self.ed.MarkerGetLayer(1), 0)
+
+	def testHotSpot(self):
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE))
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK))
+		self.assertEquals(self.ed.HotspotActiveFore, 0)
+		self.assertEquals(self.ed.HotspotActiveBack, 0)
+		
+		testColour = 0x804020
+		resetColour = 0x112233	# Doesn't get set
+		self.ed.SetHotspotActiveFore(1, testColour)
+		self.assertEquals(self.ed.HotspotActiveFore, testColour)
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE))
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE), testColour | self.opaque)
+		self.ed.SetHotspotActiveFore(0, resetColour)
+		self.assertEquals(self.ed.HotspotActiveFore, 0)
+		self.assertFalse(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE))
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE), 0)
+		
+		translucentColour = 0x50403020
+		self.ed.SetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE, translucentColour)
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE), translucentColour)
+		self.assertEquals(self.ed.HotspotActiveFore, translucentColour & self.dropAlpha)
+
+		backColour = 0x204080
+		self.ed.SetHotspotActiveBack(1, backColour)
+		self.assertEquals(self.ed.HotspotActiveBack, backColour)
+		self.assertTrue(self.ed.GetElementIsSet(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK))
+		self.assertEquals(self.ElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK), backColour | self.opaque)
+
+		# Restore
+		self.ed.ResetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE)
+		self.ed.ResetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK)
+
+class TestIndices(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.SetCodePage(65001)
+		# Text includes one non-BMP character
+		t = "aå\U00010348flﬔ-\n"
+		self.tv = t.encode("UTF-8")
+
+	def tearDown(self):
+		self.ed.SetCodePage(0)
+
+	def testAllocation(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testUTF32(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testUTF16(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		t = "aå\U00010348flﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testBoth(self):
+		# Set text before turning indices on
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		# Test the inverse: position->line
+		self.assertEquals(self.ed.LineFromIndexPosition(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.LineFromIndexPosition(7, self.ed.SC_LINECHARACTERINDEX_UTF32), 1)
+		self.assertEquals(self.ed.LineFromIndexPosition(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.LineFromIndexPosition(8, self.ed.SC_LINECHARACTERINDEX_UTF16), 1)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testMaintenance(self):
+		# Set text after turning indices on
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.ed.SetContents(self.tv)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+class TestCharacterNavigation(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.SetCodePage(65001)
+
+	def tearDown(self):
+		self.ed.SetCodePage(0)
+
+	def testBeforeAfter(self):
+		t = "aåflﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(tv)
+		pos = 0
+		for i in range(len(t)-1):
+			after = self.ed.PositionAfter(pos)
+			self.assert_(after > i)
+			back = self.ed.PositionBefore(after)
+			self.assertEquals(pos, back)
+			pos = after
+
+	def testRelative(self):
+		# \x61  \xc3\xa5  \xef\xac\x82   \xef\xac\x94   \x2d
+		t = "aåflﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(tv)
+		self.assertEquals(self.ed.PositionRelative(1, 2), 6)
+		self.assertEquals(self.ed.CountCharacters(1, 6), 2)
+		self.assertEquals(self.ed.PositionRelative(6, -2), 1)
+		pos = 0
+		previous = 0
+		for i in range(1, len(t)):
+			after = self.ed.PositionRelative(pos, i)
+			self.assert_(after > pos)
+			self.assert_(after > previous)
+			previous = after
+		pos = len(t)
+		previous = pos
+		for i in range(1, len(t)-1):
+			after = self.ed.PositionRelative(pos, -i)
+			self.assert_(after < pos)
+			self.assert_(after < previous)
+			previous = after
+
+	def testRelativeNonBOM(self):
+		# \x61  \xF0\x90\x8D\x88  \xef\xac\x82   \xef\xac\x94   \x2d
+		t = "a\U00010348flﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(tv)
+		self.assertEquals(self.ed.PositionRelative(1, 2), 8)
+		self.assertEquals(self.ed.CountCharacters(1, 8), 2)
+		self.assertEquals(self.ed.CountCodeUnits(1, 8), 3)
+		self.assertEquals(self.ed.PositionRelative(8, -2), 1)
+		self.assertEquals(self.ed.PositionRelativeCodeUnits(8, -3), 1)
+		pos = 0
+		previous = 0
+		for i in range(1, len(t)):
+			after = self.ed.PositionRelative(pos, i)
+			self.assert_(after > pos)
+			self.assert_(after > previous)
+			previous = after
+		pos = len(t)
+		previous = pos
+		for i in range(1, len(t)-1):
+			after = self.ed.PositionRelative(pos, -i)
+			self.assert_(after < pos)
+			self.assert_(after <= previous)
+			previous = after
+
+	def testLineEnd(self):
+		t = "a\r\nb\nc"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(tv)
+		for i in range(0, len(t)):
+			self.assertEquals(self.ed.CountCharacters(0, i), i)
+
+class TestCaseMapping(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def tearDown(self):
+		self.ed.SetCodePage(0)
+		self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_DEFAULT)
+
+	def testEmpty(self):
+		# Trying to upper case an empty string caused a crash at one stage
+		t = b"x"
+		self.ed.SetContents(t)
+		self.ed.UpperCase()
+		self.assertEquals(self.ed.Contents(), b"x")
+
+	def testASCII(self):
+		t = b"x"
+		self.ed.SetContents(t)
+		self.ed.SetSel(0,1)
+		self.ed.UpperCase()
+		self.assertEquals(self.ed.Contents(), b"X")
+
+	def testLatin1(self):
+		t = "å".encode("Latin-1")
+		r = "Å".encode("Latin-1")
+		self.ed.SetContents(t)
+		self.ed.SetSel(0,1)
+		self.ed.UpperCase()
+		self.assertEquals(self.ed.Contents(), r)
+
+	def testRussian(self):
+		if sys.platform == "win32":
+			self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_RUSSIAN)
+		else:
+			self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_CYRILLIC)
+		t = "Б".encode("Windows-1251")
+		r = "б".encode("Windows-1251")
+		self.ed.SetContents(t)
+		self.ed.SetSel(0,1)
+		self.ed.LowerCase()
+		self.assertEquals(self.ed.Contents(), r)
+
+	def testUTF(self):
+		self.ed.SetCodePage(65001)
+		t = "å".encode("UTF-8")
+		r = "Å".encode("UTF-8")
+		self.ed.SetContents(t)
+		self.ed.SetSel(0,2)
+		self.ed.UpperCase()
+		self.assertEquals(self.ed.Contents(), r)
+
+	def testUTFDifferentLength(self):
+		self.ed.SetCodePage(65001)
+		t = "ı".encode("UTF-8")
+		r = "I".encode("UTF-8")
+		self.ed.SetContents(t)
+		self.assertEquals(self.ed.Length, 2)
+		self.ed.SetSel(0,2)
+		self.ed.UpperCase()
+		self.assertEquals(self.ed.Length, 1)
+		self.assertEquals(self.ed.Contents(), r)
+
+	def testUTFGrows(self):
+		# This crashed at one point in debug builds due to looking past end of shorter string
+		self.ed.SetCodePage(65001)
+		# ﬖ is a single character ligature taking 3 bytes in UTF8: EF AC 96
+		t = 'ﬖﬖ'.encode("UTF-8")
+		self.ed.SetContents(t)
+		self.assertEquals(self.ed.Length, 6)
+		self.ed.SetSel(0,self.ed.Length)
+		self.ed.UpperCase()
+		# To convert to upper case the ligature is separated into վ and ն then uppercased to Վ and Ն
+		# each of which takes 2 bytes in UTF-8: D5 8E D5 86
+		r = 'ՎՆՎՆ'.encode("UTF-8")
+		self.assertEquals(self.ed.Length, 8)
+		self.assertEquals(self.ed.Contents(), r)
+		self.assertEquals(self.ed.SelectionEnd, self.ed.Length)
+
+	def testUTFShrinks(self):
+		self.ed.SetCodePage(65001)
+		# fi is a single character ligature taking 3 bytes in UTF8: EF AC 81
+		t = 'fifi'.encode("UTF-8")
+		self.ed.SetContents(t)
+		self.assertEquals(self.ed.Length, 6)
+		self.ed.SetSel(0,self.ed.Length)
+		self.ed.UpperCase()
+		# To convert to upper case the ligature is separated into f and i then uppercased to F and I
+		# each of which takes 1 byte in UTF-8: 46 49
+		r = 'FIFI'.encode("UTF-8")
+		self.assertEquals(self.ed.Length, 4)
+		self.assertEquals(self.ed.Contents(), r)
+		self.assertEquals(self.ed.SelectionEnd, self.ed.Length)
+
+class TestCaseInsensitiveSearch(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def tearDown(self):
+		self.ed.SetCodePage(0)
+		self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_DEFAULT)
+
+	def testEmpty(self):
+		text = b" x X"
+		searchString = b""
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(0, pos)
+
+	def testASCII(self):
+		text = b" x X"
+		searchString = b"X"
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(1, pos)
+
+	def testLatin1(self):
+		text = "Frånd Åå".encode("Latin-1")
+		searchString = "Å".encode("Latin-1")
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(2, pos)
+
+	def testRussian(self):
+		self.ed.StyleSetCharacterSet(self.ed.STYLE_DEFAULT, self.ed.SC_CHARSET_RUSSIAN)
+		text = "=(Б tex б)".encode("Windows-1251")
+		searchString = "б".encode("Windows-1251")
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(2, pos)
+
+	def testUTF(self):
+		self.ed.SetCodePage(65001)
+		text = "Frånd Åå".encode("UTF-8")
+		searchString = "Å".encode("UTF-8")
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(2, pos)
+
+	def testUTFDifferentLength(self):
+		# Searching for a two byte string finds a single byte
+		self.ed.SetCodePage(65001)
+		# two byte string "ſ" single byte "s"
+		text = "Frånds Ååſ $".encode("UTF-8")
+		searchString = "ſ".encode("UTF-8")
+		firstPosition = len("Frånd".encode("UTF-8"))
+		self.assertEquals(len(searchString), 2)
+		self.ed.SetContents(text)
+		self.ed.TargetStart = 0
+		self.ed.TargetEnd = self.ed.Length-1
+		self.ed.SearchFlags = 0
+		pos = self.ed.SearchInTarget(len(searchString), searchString)
+		self.assertEquals(firstPosition, pos)
+		self.assertEquals(firstPosition+1, self.ed.TargetEnd)
+
+@unittest.skipUnless(lexersAvailable, "no lexers included")
+class TestLexer(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testLexerNumber(self):
+		self.xite.ChooseLexer(b"cpp")
+		self.assertEquals(self.ed.GetLexer(), self.ed.SCLEX_CPP)
+
+	def testLexerName(self):
+		self.xite.ChooseLexer(b"cpp")
+		self.assertEquals(self.ed.GetLexer(), self.ed.SCLEX_CPP)
+		name = self.ed.GetLexerLanguage(0)
+		self.assertEquals(name, b"cpp")
+
+	def testPropertyNames(self):
+		propertyNames = self.ed.PropertyNames()
+		self.assertNotEquals(propertyNames, b"")
+		# The cpp lexer has a boolean property named lexer.cpp.allow.dollars
+		propNameDollars = b"lexer.cpp.allow.dollars"
+		propertyType = self.ed.PropertyType(propNameDollars)
+		self.assertEquals(propertyType, self.ed.SC_TYPE_BOOLEAN)
+		propertyDescription = self.ed.DescribeProperty(propNameDollars)
+		self.assertNotEquals(propertyDescription, b"")
+
+	def testWordListDescriptions(self):
+		wordSet = self.ed.DescribeKeyWordSets()
+		self.assertNotEquals(wordSet, b"")
+
+@unittest.skipUnless(lexersAvailable, "no lexers included")
+class TestSubStyles(unittest.TestCase):
+	''' These tests include knowledge of the current implementation in the cpp lexer
+	and may have to change when that implementation changes.
+	Currently supports subStyles for IDENTIFIER 11 and COMMENTDOCKEYWORD 17 '''
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testInfo(self):
+		self.xite.ChooseLexer(b"cpp")
+		bases = self.ed.GetSubStyleBases()
+		self.assertEquals(bases, b"\x0b\x11")	# 11, 17
+		self.assertEquals(self.ed.DistanceToSecondaryStyles(), 0x40)
+
+	def testAllocate(self):
+		firstSubStyle = 0x80	# Current implementation
+		self.xite.ChooseLexer(b"cpp")
+		self.assertEquals(self.ed.GetStyleFromSubStyle(firstSubStyle), firstSubStyle)
+		self.assertEquals(self.ed.GetSubStylesStart(self.ed.SCE_C_IDENTIFIER), 0)
+		self.assertEquals(self.ed.GetSubStylesLength(self.ed.SCE_C_IDENTIFIER), 0)
+		numSubStyles = 5
+		subs = self.ed.AllocateSubStyles(self.ed.SCE_C_IDENTIFIER, numSubStyles)
+		self.assertEquals(subs, firstSubStyle)
+		self.assertEquals(self.ed.GetSubStylesStart(self.ed.SCE_C_IDENTIFIER), firstSubStyle)
+		self.assertEquals(self.ed.GetSubStylesLength(self.ed.SCE_C_IDENTIFIER), numSubStyles)
+		self.assertEquals(self.ed.GetStyleFromSubStyle(subs), self.ed.SCE_C_IDENTIFIER)
+		self.assertEquals(self.ed.GetStyleFromSubStyle(subs+numSubStyles-1), self.ed.SCE_C_IDENTIFIER)
+		self.assertEquals(self.ed.GetStyleFromSubStyle(self.ed.SCE_C_IDENTIFIER), self.ed.SCE_C_IDENTIFIER)
+		# Now free and check same as start
+		self.ed.FreeSubStyles()
+		self.assertEquals(self.ed.GetStyleFromSubStyle(subs), subs)
+		self.assertEquals(self.ed.GetSubStylesStart(self.ed.SCE_C_IDENTIFIER), 0)
+		self.assertEquals(self.ed.GetSubStylesLength(self.ed.SCE_C_IDENTIFIER), 0)
+
+	def testInactive(self):
+		firstSubStyle = 0x80	# Current implementation
+		inactiveDistance = self.ed.DistanceToSecondaryStyles()
+		self.xite.ChooseLexer(b"cpp")
+		numSubStyles = 5
+		subs = self.ed.AllocateSubStyles(self.ed.SCE_C_IDENTIFIER, numSubStyles)
+		self.assertEquals(subs, firstSubStyle)
+		self.assertEquals(self.ed.GetStyleFromSubStyle(subs), self.ed.SCE_C_IDENTIFIER)
+		self.assertEquals(self.ed.GetStyleFromSubStyle(subs+inactiveDistance), self.ed.SCE_C_IDENTIFIER+inactiveDistance)
+		self.ed.FreeSubStyles()
+
+	def testSecondary(self):
+		inactiveDistance = self.ed.DistanceToSecondaryStyles()
+		self.assertEquals(self.ed.GetPrimaryStyleFromStyle(self.ed.SCE_C_IDENTIFIER+inactiveDistance), self.ed.SCE_C_IDENTIFIER)
+
+class TestCallTip(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 1 line of 4 characters
+		t = b"fun("
+		self.ed.AddText(len(t), t)
+
+	def testBasics(self):
+		self.assertEquals(self.ed.CallTipActive(), 0)
+		self.ed.CallTipShow(1, "fun(int x)")
+		self.assertEquals(self.ed.CallTipActive(), 1)
+		self.assertEquals(self.ed.CallTipPosStart(), 4)
+		self.ed.CallTipSetPosStart(1)
+		self.assertEquals(self.ed.CallTipPosStart(), 1)
+		self.ed.CallTipCancel()
+		self.assertEquals(self.ed.CallTipActive(), 0)
+
+class TestEdge(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+
+	def testBasics(self):
+		self.ed.EdgeColumn = 3
+		self.assertEquals(self.ed.EdgeColumn, 3)
+		self.ed.SetEdgeColour(0xA0)
+		self.assertEquals(self.ed.GetEdgeColour(), 0xA0)
+
+	def testMulti(self):
+		self.assertEquals(self.ed.GetMultiEdgeColumn(-1), -1)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), -1)
+		self.ed.MultiEdgeAddLine(5, 0x50)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), 5)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(1), -1)
+		self.ed.MultiEdgeAddLine(6, 0x60)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), 5)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(1), 6)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(2), -1)
+		self.ed.MultiEdgeAddLine(4, 0x40)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), 4)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(1), 5)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(2), 6)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(3), -1)
+		self.ed.MultiEdgeClearAll()
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), -1)
+
+	def testSameTwice(self):
+		# Tests that adding a column twice retains both
+		self.ed.MultiEdgeAddLine(5, 0x50)
+		self.ed.MultiEdgeAddLine(5, 0x55)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(0), 5)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(1), 5)
+		self.assertEquals(self.ed.GetMultiEdgeColumn(2), -1)
+		self.ed.MultiEdgeClearAll()
+
+class TestAutoComplete(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 1 line of 3 characters
+		t = b"xxx\n"
+		self.ed.AddText(len(t), t)
+
+	def testDefaults(self):
+		self.assertEquals(self.ed.AutoCGetSeparator(), ord(' '))
+		self.assertEquals(self.ed.AutoCGetMaxHeight(), 5)
+		self.assertEquals(self.ed.AutoCGetMaxWidth(), 0)
+		self.assertEquals(self.ed.AutoCGetTypeSeparator(), ord('?'))
+		self.assertEquals(self.ed.AutoCGetIgnoreCase(), 0)
+		self.assertEquals(self.ed.AutoCGetAutoHide(), 1)
+		self.assertEquals(self.ed.AutoCGetDropRestOfWord(), 0)
+
+	def testChangeDefaults(self):
+		self.ed.AutoCSetSeparator(ord('-'))
+		self.assertEquals(self.ed.AutoCGetSeparator(), ord('-'))
+		self.ed.AutoCSetSeparator(ord(' '))
+
+		self.ed.AutoCSetMaxHeight(100)
+		self.assertEquals(self.ed.AutoCGetMaxHeight(), 100)
+		self.ed.AutoCSetMaxHeight(5)
+
+		self.ed.AutoCSetMaxWidth(100)
+		self.assertEquals(self.ed.AutoCGetMaxWidth(), 100)
+		self.ed.AutoCSetMaxWidth(0)
+
+		self.ed.AutoCSetTypeSeparator(ord('@'))
+		self.assertEquals(self.ed.AutoCGetTypeSeparator(), ord('@'))
+		self.ed.AutoCSetTypeSeparator(ord('?'))
+
+		self.ed.AutoCSetIgnoreCase(1)
+		self.assertEquals(self.ed.AutoCGetIgnoreCase(), 1)
+		self.ed.AutoCSetIgnoreCase(0)
+
+		self.ed.AutoCSetAutoHide(0)
+		self.assertEquals(self.ed.AutoCGetAutoHide(), 0)
+		self.ed.AutoCSetAutoHide(1)
+
+		self.ed.AutoCSetDropRestOfWord(1)
+		self.assertEquals(self.ed.AutoCGetDropRestOfWord(), 1)
+		self.ed.AutoCSetDropRestOfWord(0)
+
+	def testAutoShow(self):
+		self.assertEquals(self.ed.AutoCActive(), 0)
+		self.ed.SetSel(0, 0)
+
+		self.ed.AutoCShow(0, b"za defn ghi")
+		self.assertEquals(self.ed.AutoCActive(), 1)
+		#~ time.sleep(2)
+		self.assertEquals(self.ed.AutoCPosStart(), 0)
+		self.assertEquals(self.ed.AutoCGetCurrent(), 0)
+		t = self.ed.AutoCGetCurrentText(5)
+		#~ self.assertEquals(l, 3)
+		self.assertEquals(t, b"za")
+		self.ed.AutoCCancel()
+		self.assertEquals(self.ed.AutoCActive(), 0)
+
+	def testAutoShowComplete(self):
+		self.assertEquals(self.ed.AutoCActive(), 0)
+		self.ed.SetSel(0, 0)
+
+		self.ed.AutoCShow(0, b"za defn ghi")
+		self.ed.AutoCComplete()
+		self.assertEquals(self.ed.Contents(), b"zaxxx\n")
+
+		self.assertEquals(self.ed.AutoCActive(), 0)
+
+	def testAutoShowSelect(self):
+		self.assertEquals(self.ed.AutoCActive(), 0)
+		self.ed.SetSel(0, 0)
+
+		self.ed.AutoCShow(0, b"za defn ghi")
+		self.ed.AutoCSelect(0, b"d")
+		self.ed.AutoCComplete()
+		self.assertEquals(self.ed.Contents(), b"defnxxx\n")
+
+		self.assertEquals(self.ed.AutoCActive(), 0)
+
+	def testWriteOnly(self):
+		""" Checks that setting attributes doesn't crash or change tested behaviour
+		but does not check that the changed attributes are effective. """
+		self.ed.AutoCStops(0, b"abcde")
+		self.ed.AutoCSetFillUps(0, b"1234")
+
+class TestDirectAccess(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def testGapPosition(self):
+		text = b"abcd"
+		self.ed.SetContents(text)
+		self.assertEquals(self.ed.GapPosition, 4)
+		self.ed.TargetStart = 1
+		self.ed.TargetEnd = 1
+		rep = b"-"
+		self.ed.ReplaceTarget(len(rep), rep)
+		self.assertEquals(self.ed.GapPosition, 2)
+
+	def testCharacterPointerAndRangePointer(self):
+		text = b"abcd"
+		self.ed.SetContents(text)
+		characterPointer = self.ed.CharacterPointer
+		rangePointer = self.ed.GetRangePointer(0,3)
+		self.assertEquals(characterPointer, rangePointer)
+		cpBuffer = ctypes.c_char_p(characterPointer)
+		self.assertEquals(cpBuffer.value, text)
+		# Gap will not be moved as already moved for CharacterPointer call
+		rangePointer = self.ed.GetRangePointer(1,3)
+		cpBuffer = ctypes.c_char_p(rangePointer)
+		self.assertEquals(cpBuffer.value, text[1:])
+
+class TestWordChars(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+
+	def tearDown(self):
+		self.ed.SetCharsDefault()
+
+	def _setChars(self, charClass, chars):
+		""" Wrapper to call self.ed.Set*Chars with the right type
+		@param charClass {str} the character class, "word", "space", etc.
+		@param chars {iterable of int} characters to set
+		"""
+		if sys.version_info.major == 2:
+			# Python 2, use latin-1 encoded str
+			unichars = (unichr(x) for x in chars if x != 0)
+			# can't use literal u"", that's a syntax error in Py3k
+			# uncode() doesn't exist in Py3k, but we never run it there
+			result = unicode("").join(unichars).encode("latin-1")
+		else:
+			# Python 3, use bytes()
+			result = bytes(x for x in chars if x != 0)
+		meth = getattr(self.ed, "Set%sChars" % (charClass.capitalize()))
+		return meth(None, result)
+
+	def assertCharSetsEqual(self, first, second, *args, **kwargs):
+		""" Assert that the two character sets are equal.
+		If either set are an iterable of numbers, convert them to chars
+		first. """
+		first_set = set()
+		for c in first:
+			first_set.add(chr(c) if isinstance(c, int) else c)
+		second_set = set()
+		for c in second:
+			second_set.add(chr(c) if isinstance(c, int) else c)
+		return self.assertEqual(first_set, second_set, *args, **kwargs)
+
+	def testDefaultWordChars(self):
+		# check that the default word chars are as expected
+		import string
+		data = self.ed.GetWordChars(None)
+		expected = set(string.digits + string.ascii_letters + '_') | \
+			set(chr(x) for x in range(0x80, 0x100))
+		self.assertCharSetsEqual(data, expected)
+
+	def testDefaultWhitespaceChars(self):
+		# check that the default whitespace chars are as expected
+		import string
+		data = self.ed.GetWhitespaceChars(None)
+		expected = (set(chr(x) for x in (range(0, 0x20))) | set(' ')) - \
+			set(['\r', '\n'])
+		self.assertCharSetsEqual(data, expected)
+
+	def testDefaultPunctuationChars(self):
+		# check that the default punctuation chars are as expected
+		import string
+		data = self.ed.GetPunctuationChars(None)
+		expected = set(chr(x) for x in range(0x20, 0x80)) - \
+			set(string.ascii_letters + string.digits + "\r\n_ ")
+		self.assertCharSetsEqual(data, expected)
+
+	def testCustomWordChars(self):
+		# check that setting things to whitespace chars makes them not words
+		self._setChars("whitespace", range(1, 0x100))
+		data = self.ed.GetWordChars(None)
+		expected = set()
+		self.assertCharSetsEqual(data, expected)
+		# and now set something to make sure that works too
+		expected = set(range(1, 0x100, 2))
+		self._setChars("word", expected)
+		data = self.ed.GetWordChars(None)
+		self.assertCharSetsEqual(data, expected)
+
+	def testCustomWhitespaceChars(self):
+		# check setting whitespace chars to non-default values
+		self._setChars("word", range(1, 0x100))
+		# we can't change chr(0) from being anything but whitespace
+		expected = set([0])
+		data = self.ed.GetWhitespaceChars(None)
+		self.assertCharSetsEqual(data, expected)
+		# now try to set it to something custom
+		expected = set(range(1, 0x100, 2)) | set([0])
+		self._setChars("whitespace", expected)
+		data = self.ed.GetWhitespaceChars(None)
+		self.assertCharSetsEqual(data, expected)
+
+	def testCustomPunctuationChars(self):
+		# check setting punctuation chars to non-default values
+		self._setChars("word", range(1, 0x100))
+		expected = set()
+		data = self.ed.GetPunctuationChars(0)
+		self.assertEquals(set(data), expected)
+		# now try to set it to something custom
+		expected = set(range(1, 0x100, 1))
+		self._setChars("punctuation", expected)
+		data = self.ed.GetPunctuationChars(None)
+		self.assertCharSetsEqual(data, expected)
+
+	def testCharacterCategoryOptimization(self):
+		self.assertEquals(self.ed.CharacterCategoryOptimization, 0x100)
+		self.ed.CharacterCategoryOptimization = 0x1000
+		self.assertEquals(self.ed.CharacterCategoryOptimization, 0x1000)
+
+class TestExplicitTabStops(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		# 2 lines of 4 characters
+		self.t = b"fun(\nint)"
+		self.ed.AddText(len(self.t), self.t)
+
+	def testAddingAndClearing(self):
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 0)
+
+		# Add a tab stop at 7
+		self.ed.AddTabStop(0, 7)
+		# Check added
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 7)
+		# Check does not affect line 1
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 0)
+
+		# Add a tab stop at 18
+		self.ed.AddTabStop(0, 18)
+		# Check added
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 7)
+		self.assertEquals(self.ed.GetNextTabStop(0,7), 18)
+		# Check does not affect line 1
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(1,7), 0)
+
+		# Add a tab stop between others at 13
+		self.ed.AddTabStop(0, 13)
+		# Check added
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 7)
+		self.assertEquals(self.ed.GetNextTabStop(0,7), 13)
+		self.assertEquals(self.ed.GetNextTabStop(0,13), 18)
+		# Check does not affect line 1
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(1,7), 0)
+
+		self.ed.ClearTabStops(0)
+		# Check back to original state
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 0)
+
+	def testLineInsertionDeletion(self):
+		# Add a tab stop at 7 on line 1
+		self.ed.AddTabStop(1, 7)
+		# Check added
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 7)
+
+		# More text at end
+		self.ed.AddText(len(self.t), self.t)
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 7)
+		self.assertEquals(self.ed.GetNextTabStop(2,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(3,0), 0)
+
+		# Another 2 lines before explicit line moves the explicit tab stop
+		data = b"x\ny\n"
+		self.ed.InsertText(4, data)
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(2,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(3,0), 7)
+		self.assertEquals(self.ed.GetNextTabStop(4,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(5,0), 0)
+
+		# Undo moves the explicit tab stop back
+		self.ed.Undo()
+		self.assertEquals(self.ed.GetNextTabStop(0,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(1,0), 7)
+		self.assertEquals(self.ed.GetNextTabStop(2,0), 0)
+		self.assertEquals(self.ed.GetNextTabStop(3,0), 0)
+
+if __name__ == '__main__':
+	uu = Xite.main("simpleTests")
+	#~ for x in sorted(uu.keys()):
+		#~ print(x, uu[x])
+	#~ print()
diff --git a/scite-app/scintilla/test/unit/LICENSE_1_0.txt b/scite-app/scintilla/test/unit/LICENSE_1_0.txt
new file mode 100644
index 0000000..36b7cd9
--- /dev/null
+++ b/scite-app/scintilla/test/unit/LICENSE_1_0.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/scite-app/scintilla/test/unit/README b/scite-app/scintilla/test/unit/README
new file mode 100644
index 0000000..2558d8e
--- /dev/null
+++ b/scite-app/scintilla/test/unit/README
@@ -0,0 +1,15 @@
+The test/unit directory contains unit tests for Scintilla data structures.
+
+The tests can be run on Windows, OS X, or Linux using g++ and GNU make.
+The Catch test framework is used.
+https://github.com/philsquared/Catch
+The file catch.hpp is under the Boost Software License which is contained in LICENSE_1_0.txt
+
+   To run the tests on OS X or Linux:
+make test
+
+   To run the tests on Windows:
+mingw32-make test
+
+   Visual C++ (2010+) and nmake can also be used on Windows:
+nmake -f test.mak test
diff --git a/scite-app/scintilla/test/unit/Sci.natvis b/scite-app/scintilla/test/unit/Sci.natvis
new file mode 100644
index 0000000..d6ac2b9
--- /dev/null
+++ b/scite-app/scintilla/test/unit/Sci.natvis
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="Scintilla::SplitVector&lt;*&gt;">
+    <DisplayString>{{size = {lengthBody}}}</DisplayString>
+    <Expand>
+      <Item Name="[size]">lengthBody</Item>
+      <Item Name="[part1Length]">part1Length</Item>
+      <Item Name="[gap]">gapLength</Item>
+      <IndexListItems>
+        <Size>lengthBody</Size>
+        <ValueNode>body[($i&lt;part1Length)?$i:$i+gapLength]</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="Scintilla::Partitioning&lt;*&gt;">
+    <DisplayString>{{size = {body->lengthBody}}}</DisplayString>
+    <Expand>
+      <IndexListItems>
+        <Size>body->lengthBody</Size>
+        <ValueNode>body->body[($i&lt;body->part1Length)?$i:$i+body->gapLength]+($i&gt;stepPartition?stepLength:0)</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="std::unique_ptr&lt;*&gt;">
+    <SmartPointer Usage="Minimal">_Mypair._Myval2</SmartPointer>
+    <DisplayString Condition="_Mypair._Myval2 == 0">empty</DisplayString>
+    <DisplayString Condition="_Mypair._Myval2 != 0">unique_ptr {*_Mypair._Myval2}</DisplayString>
+    <Expand>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair._Myval2</ExpandedItem>
+      <ExpandedItem Condition="_Mypair._Myval2 != 0">_Mypair</ExpandedItem>
+    </Expand>
+  </Type>
+</AutoVisualizer>
diff --git a/scite-app/scintilla/test/unit/SciTE.properties b/scite-app/scintilla/test/unit/SciTE.properties
new file mode 100644
index 0000000..cbbe208
--- /dev/null
+++ b/scite-app/scintilla/test/unit/SciTE.properties
@@ -0,0 +1,5 @@
+command.go.*.cxx=./unitTest
+if PLAT_WIN
+	make.command=mingw32-make
+	command.go.*.cxx=unitTest
+command.go.needs.$(file.patterns.cplusplus)=$(make.command)
diff --git a/scite-app/scintilla/test/unit/UnitTester.cxx b/scite-app/scintilla/test/unit/UnitTester.cxx
new file mode 100644
index 0000000..e498add
--- /dev/null
+++ b/scite-app/scintilla/test/unit/UnitTester.cxx
@@ -0,0 +1,45 @@
+/** @file UnitTester.cxx
+ ** UnitTester.cpp : Defines the entry point for the console application.
+ **/
+
+// Catch uses std::uncaught_exception which is deprecated in C++17.
+// This define silences a warning from Visual C++.
+#define _SILENCE_CXX17_UNCAUGHT_EXCEPTION_DEPRECATION_WARNING
+
+#include <cstdio>
+#include <cstdarg>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <memory>
+
+#include "Debugging.h"
+
+#define CATCH_CONFIG_WINDOWS_CRTDBG
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Needed for PLATFORM_ASSERT in code being tested
+
+void Platform::Assert(const char *c, const char *file, int line) noexcept {
+	fprintf(stderr, "Assertion [%s] failed at %s %d\n", c, file, line);
+	abort();
+}
+
+void Platform::DebugPrintf(const char *format, ...) noexcept {
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer, format, pArguments);
+	va_end(pArguments);
+	fprintf(stderr, "%s", buffer);
+}
+
+int main(int argc, char* argv[]) {
+	const int result = Catch::Session().run(argc, argv);
+
+	return result;
+}
diff --git a/scite-app/scintilla/test/unit/UnitTester.vcxproj b/scite-app/scintilla/test/unit/UnitTester.vcxproj
new file mode 100644
index 0000000..2e130ec
--- /dev/null
+++ b/scite-app/scintilla/test/unit/UnitTester.vcxproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{35688A27-D91B-453A-8A05-65A7F28DEFBF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>UnitTester</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\CaseConvert.cxx" />
+    <ClCompile Include="..\..\src\CaseFolder.cxx" />
+    <ClCompile Include="..\..\src\CellBuffer.cxx" />
+    <ClCompile Include="..\..\src\CharacterCategoryMap.cxx" />
+    <ClCompile Include="..\..\src\CharClassify.cxx" />
+    <ClCompile Include="..\..\src\ContractionState.cxx" />
+    <ClCompile Include="..\..\src\Decoration.cxx" />
+    <ClCompile Include="..\..\src\Document.cxx" />
+    <ClCompile Include="..\..\src\PerLine.cxx" />
+    <ClCompile Include="..\..\src\RESearch.cxx" />
+    <ClCompile Include="..\..\src\RunStyles.cxx" />
+    <ClCompile Include="..\..\src\UniConversion.cxx" />
+    <ClCompile Include="..\..\src\UniqueString.cxx" />
+    <ClCompile Include="test*.cxx" />
+    <ClCompile Include="UnitTester.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="Sci.natvis" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/scintilla/test/unit/catch.hpp b/scite-app/scintilla/test/unit/catch.hpp
new file mode 100644
index 0000000..0384171
--- /dev/null
+++ b/scite-app/scintilla/test/unit/catch.hpp
@@ -0,0 +1,17881 @@
+/*
+ *  Catch v2.13.4
+ *  Generated: 2020-12-29 14:48:00.116107
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 13
+#define CATCH_VERSION_PATCH 4
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+#  define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+#  define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+// We have to avoid both ICC and Clang, because they try to mask themselves
+// as gcc, and we want only GCC in this block
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
+#endif
+
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    include <cstddef>
+  #    if __cpp_lib_byte > 0
+  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #    endif
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+        bool empty() const noexcept { return file[0] == '\0'; }
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
+
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
+
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
+
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    // Keep ::type here because we still support C++11
+    template <typename Func, typename... U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream : NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+// end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator, typename Sentinel = InputIterator>
+        std::string rangeToString(InputIterator first, Sentinel last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
+    using std::end;
+
+    namespace detail {
+        template <typename...>
+        struct void_type {
+            using type = void;
+        };
+
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {
+        };
+
+        template <typename T>
+        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
+        };
+    } // namespace detail
+
+    template <typename T>
+    struct is_range : detail::is_range_impl<T> {
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+        template <typename RhsT>
+        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
+        }
+        template <typename RhsT>
+        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
+        }
+        template <typename RhsT>
+        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+#include <chrono>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef const& macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_section.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                return "";
+#else
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+#endif
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_exception.hpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            uint64_t m_ulps;
+            FloatingPointKind m_type;
+        };
+
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // inferring std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        template<typename T, typename Alloc>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T, Alloc> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
+            bool match(std::vector<T, AllocMatch> const& vec) const override {
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T, AllocComp> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename Alloc = std::allocator<T>>
+    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
+        };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
+
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
+
+    const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
+
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
+    public:
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::forward<T>(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::forward<U>(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
+
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = next();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
+
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& rng();
+}
+
+// end catch_context.h
+// start catch_interfaces_config.h
+
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <chrono>
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual double minDuration() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// start catch_random_number_generator.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+// end catch_random_number_generator.h
+#include <random>
+
+namespace Catch {
+namespace Generators {
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_specific.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        double minDuration = -1;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        double minDuration() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    //! Should the reporter show
+    bool shouldShowDuration( IConfig const& config, double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& className,
+                          std::string const& rootName,
+                          SectionNode const& sectionNode);
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
+
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
+
+// start catch_benchmark.hpp
+
+ // Benchmark
+
+// start catch_chronometer.hpp
+
+// User-facing chronometer
+
+
+// start catch_clock.hpp
+
+// Clocks
+
+
+#include <chrono>
+#include <ratio>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_clock.hpp
+// start catch_optimizer.hpp
+
+ // Hinting the optimizer
+
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
+
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
+
+// Invoke with a special case for void
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
+
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_complete_invoke.hpp
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                ClockDuration<Clock> elapsed() const { return finished - started; }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_chronometer.hpp
+// start catch_environment.hpp
+
+// Environment information
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
+        };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
+
+ // Execution plan
+
+
+// start catch_benchmark_function.hpp
+
+ // Dumb std::function implementation for consistent call overhead
+
+
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
+
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
+
+// repeat algorithm
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
+
+// Run a function for a minimum amount of time
+
+
+// start catch_measure.hpp
+
+// Measure
+
+
+// start catch_timing.hpp
+
+// Timing
+
+
+#include <tuple>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_timing.hpp
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), std::move(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
+
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
+
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                throw optimized_away_error{};
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
+
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
+
+ // Environment measurement
+
+
+// start catch_stats.hpp
+
+// Statistical analysis tools
+
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <iterator>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+#include <random>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
+
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
+
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = std::max(cumn(a1), 0);
+                auto hi = std::min(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
+
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
+
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
+
+ // Run and analyse one benchmark
+
+
+// start catch_sample_analysis.hpp
+
+// Benchmark results
+
+
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
+
+// Constructor and destructor helpers
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
+
+                ObjectStorage() : data() {}
+
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
+
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(&data) T(std::move(other.stored_object()));
+                }
+
+                ~ObjectStorage() { destruct_on_exit<T>(); }
+
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (&data) T(std::forward<Args>(args)...);
+                }
+
+                template <bool AllowManualDestruction = !Destruct>
+                typename std::enable_if<AllowManualDestruction>::type destruct()
+                {
+                    stored_object().~T();
+                }
+
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
+
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                T const& stored_object() const {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                TStorage data;
+            };
+        }
+
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
+
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    }
+}
+
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            return lhs.name == rhs.name
+                && lhs.location == rhs.location;
+        }
+    };
+
+    class ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    class  ITracker {
+        NameAndLocation m_nameAndLocation;
+
+    public:
+        ITracker(NameAndLocation const& nameAndLoc) :
+            m_nameAndLocation(nameAndLoc)
+        {}
+
+        // static queries
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+
+        virtual ~ITracker();
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+        virtual bool hasStarted() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+        bool hasStarted() const override {
+            return m_runState != NotStarted;
+        }
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isGeneratorTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+        //! Returns filters active in this tracker
+        std::vector<std::string> const& getFilters() const;
+        //! Returns whitespace-trimmed name of the tracked section
+        std::string const& trimmedName() const;
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+        FatalConditionHandler();
+        static void reset();
+        ~FatalConditionHandler();
+
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions[];
+        static stack_t oldSigStack;
+        static char altStackMem[];
+
+        static void handleSignal( int sig );
+
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+        static void reset();
+    };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset();
+    };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef const& macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+            throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
+
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
+
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto operator + (Column const& other)->Columns;
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+class Spacer : public Column {
+
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
+
+class Columns {
+	std::vector<Column> m_columns;
+
+public:
+
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
+
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <cctype>
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( setReporter, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( config.minDuration, "seconds" )
+                ["-D"]["--min-duration"]
+                ( "show test durations for tests taking at least the given number of seconds" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    double Config::minDuration() const                 { return m_data.minDuration; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) override {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != nullptr) {
+            impl->use( _colourCode );
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        ~Context() override;
+
+    public: // IMutableContext
+        void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+
+#  include <cassert>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if (m_translators.empty()) {
+            std::rethrow_exception(std::current_exception());
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    // Report the error condition
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
+    };
+
+    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        // 32k seems enough for Catch to handle stack overflow,
+        // but the value was found experimentally, so there is no strong guarantee
+        guaranteeSize = 32 * 1024;
+        exceptionHandlerHandle = nullptr;
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        // Pass in guarantee size to be filled
+        SetThreadStackGuarantee(&guaranteeSize);
+    }
+
+    void FatalConditionHandler::reset() {
+        if (isSet) {
+            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+            SetThreadStackGuarantee(&guaranteeSize);
+            exceptionHandlerHandle = nullptr;
+            isSet = false;
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    // 32kb for the alternate stack seems to be sufficient. However, this value
+    // is experimentally determined, so that's not guaranteed.
+    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    void FatalConditionHandler::handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        reset();
+        reportFatal(name);
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = sigStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+    void FatalConditionHandler::reset() {
+        if( isSet ) {
+            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+            }
+            // Return the old stack
+            sigaltstack(&oldSigStack, nullptr);
+            isSet = false;
+        }
+    }
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
+}
+
+namespace Generators {
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters();
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters() {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
+        Option<std::size_t> listedCount;
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
+
+namespace Catch {
+namespace {
+
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
+
+        auto ulpDiff = std::abs(lc - rc);
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
+    }
+
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
+
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
+    }
+
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info ), m_moved()
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w+")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+#endif
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                // Under specific circumstances, the generator we want
+                // to acquire is also the current tracker. If this is
+                // the case, we have to avoid looking through current
+                // tracker's children, and instead return the current
+                // tracker.
+                // A case where this check is important is e.g.
+                //     for (int i = 0; i < 5; ++i) {
+                //         int n = GENERATE(1, 2);
+                //     }
+                //
+                // without it, the code above creates 5 nested generators.
+                if (currentTracker.nameAndLocation() == nameAndLocation) {
+                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
+                    assert(thisTracker);
+                    assert(thisTracker->isGeneratorTracker());
+                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
+                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                } else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // If a generator has a child (it is followed by a section)
+                // and none of its children have started, then we must wait
+                // until later to start consuming its values.
+                // This catches cases where `GENERATE` is placed between two
+                // `SECTION`s.
+                // **The check for m_children.empty cannot be removed**.
+                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
+                const bool should_wait_for_child = [&]() {
+                    // No children -> nobody to wait for
+                    if ( m_children.empty() ) {
+                        return false;
+                    }
+                    // If at least one child started executing, don't wait
+                    if ( std::find_if(
+                             m_children.begin(),
+                             m_children.end(),
+                             []( TestCaseTracking::ITrackerPtr tracker ) {
+                                 return tracker->hasStarted();
+                             } ) != m_children.end() ) {
+                        return false;
+                    }
+
+                    // No children have started. We need to check if they _can_
+                    // start, and thus we should wait for them, or they cannot
+                    // start (due to filters), and we shouldn't wait for them
+                    auto* parent = m_parent;
+                    // This is safe: there is always at least one section
+                    // tracker in a test case tracking tree
+                    while ( !parent->isSectionTracker() ) {
+                        parent = &( parent->parent() );
+                    }
+                    assert( parent &&
+                            "Missing root (test case) level section" );
+
+                    auto const& parentSection =
+                        static_cast<SectionTracker&>( *parent );
+                    auto const& filters = parentSection.getFilters();
+                    // No filters -> no restrictions on running sections
+                    if ( filters.empty() ) {
+                        return true;
+                    }
+
+                    for ( auto const& child : m_children ) {
+                        if ( child->isSectionTracker() &&
+                             std::find( filters.begin(),
+                                        filters.end(),
+                                        static_cast<SectionTracker&>( *child )
+                                            .trimmedName() ) !=
+                                 filters.end() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }();
+
+                // This check is a bit tricky, because m_generator->next()
+                // has a side-effect, where it consumes generator's current
+                // value, but we do not want to invoke the side-effect if
+                // this generator is still waiting for any child to start.
+                if ( should_wait_for_child ||
+                     ( m_runState == CompletedSuccessfully &&
+                       m_generator->next() ) ) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
+                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+        m_reporter->benchmarkPreparing(name);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+    void RunContext::benchmarkFailed(std::string const & error) {
+        m_reporter->benchmarkFailed(error);
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandler fatalConditionHandler; // Handle signals
+        m_activeTestCase->invoke();
+        fatalConditionHandler.reset();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+#include <set>
+#include <iterator>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
+            }
+
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
+                }
+
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
+            }
+
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( m_config ) )
+                return static_cast<int>( *listed );
+
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+#endif
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace Detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new Detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new Detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new Detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    auto StringRef::c_str() const -> char const* {
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
+        return m_start;
+    }
+    auto StringRef::data() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
+            return StringRef();
+        }
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.data(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for (char c : nameAndTags.tags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            // Add all "hidden" tags to make them behave identically
+            tags.insert( tags.end(), { ".", "!hide" } );
+        }
+
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        struct TestHasher {
+            using hash_t = uint64_t;
+
+            explicit TestHasher( hash_t hashSuffix ):
+                m_hashSuffix{ hashSuffix } {}
+
+            uint32_t operator()( TestCase const& t ) const {
+                // FNV-1a hash with multiplication fold.
+                const hash_t prime = 1099511628211u;
+                hash_t hash = 14695981039346656037u;
+                for ( const char c : t.name ) {
+                    hash ^= c;
+                    hash *= prime;
+                }
+                hash ^= m_hashSuffix;
+                hash *= prime;
+                const uint32_t low{ static_cast<uint32_t>( hash ) };
+                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+                return low * high;
+            }
+
+        private:
+            hash_t m_hashSuffix;
+        };
+    } // end unnamed namespace
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+        switch( config.runOrder() ) {
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+
+            case RunTests::InLexicographicalOrder: {
+                std::vector<TestCase> sorted = unsortedTestCases;
+                std::sort( sorted.begin(), sorted.end() );
+                return sorted;
+            }
+
+            case RunTests::InRandomOrder: {
+                seedRng( config );
+                TestHasher h{ config.rngSeed() };
+
+                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
+                std::vector<hashedTest> indexed_tests;
+                indexed_tests.reserve( unsortedTestCases.size() );
+
+                for (auto const& testCase : unsortedTestCases) {
+                    indexed_tests.emplace_back(h(testCase), &testCase);
+                }
+
+                std::sort(indexed_tests.begin(), indexed_tests.end(),
+                          [](hashedTest const& lhs, hashedTest const& rhs) {
+                          if (lhs.first == rhs.first) {
+                              return lhs.second->name < rhs.second->name;
+                          }
+                          return lhs.first < rhs.first;
+                });
+
+                std::vector<TestCase> sorted;
+                sorted.reserve( indexed_tests.size() );
+
+                for (auto const& hashed : indexed_tests) {
+                    sorted.emplace_back(*hashed.second);
+                }
+
+                return sorted;
+            }
+        }
+        return unsortedTestCases;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className(classOrQualifiedMethodName);
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(nameAndLocation),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if (m_filters.empty()
+            || m_filters[0] == ""
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(""); // Root - should never be consulted
+            m_filters.emplace_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+    std::vector<std::string> const& SectionTracker::getFilters() const {
+        return m_filters;
+    }
+
+    std::string const& SectionTracker::trimmedName() const {
+        return m_trimmed_name;
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+        m_realPatternPos = 0;
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
+            }
+
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / ( i + 1u );
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (Catch::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+int StringMaker<float>::precision = 5;
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = 10;
+
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, precision);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+// start catch_config_uncaught_exceptions.hpp
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+// end catch_config_uncaught_exceptions.hpp
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 13, 4, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+#include <type_traits>
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            unsigned char c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    unsigned char nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        std::sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    bool shouldShowDuration( IConfig const& config, double duration ) {
+        if ( config.showDurations() == ShowDurations::Always ) {
+            return true;
+        }
+        if ( config.showDurations() == ShowDurations::Never ) {
+            return false;
+        }
+        const double min = config.minDuration();
+        return min >= 0 && duration >= min;
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            double dur = _sectionStats.durationInSeconds;
+            if ( shouldShowDuration( *m_config, dur ) ) {
+                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    double m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return m_inNanoseconds;
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "us";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    double dur = _sectionStats.durationInSeconds;
+    if (shouldShowDuration(*m_config, dur)) {
+        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters()) {
+        Colour guard(Colour::BrightYellow);
+        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
+    }
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", suiteTime );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection );
+    }
+
+    void JunitReporter::writeSection(  std::string const& className,
+                        std::string const& rootName,
+                        SectionNode const& sectionNode ) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status", "run" );
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode );
+            else
+                writeSection( className, name, *childNode );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
+            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", info.clockResolution)
+            .writeAttribute("estimatedDuration", info.estimatedDuration)
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/scite-app/scintilla/test/unit/makefile b/scite-app/scintilla/test/unit/makefile
new file mode 100644
index 0000000..fad3127
--- /dev/null
+++ b/scite-app/scintilla/test/unit/makefile
@@ -0,0 +1,81 @@
+# Build all the unit tests using GNU make and either g++ or clang
+# Should be run using mingw32-make on Windows, not nmake
+# On Windows g++ is used, on OS X clang, and on Linux G++ is used by default
+# but clang can be used by defining CLANG when invoking make
+# clang works only with libc++, not libstdc++
+# Tested with clang 9 and g++ 9
+
+CXXSTD=c++17
+
+ifndef windir
+ifeq ($(shell uname),Darwin)
+# On OS X always use clang as g++ is old version
+CLANG = 1
+USELIBCPP = 1
+endif
+endif
+
+CXXFLAGS += $(OPTIMIZATION)
+CXXFLAGS += --std=$(CXXSTD)
+
+ifdef CLANG
+CXX = clang++
+CXXFLAGS += -D_CRT_SECURE_NO_DEPRECATE
+ifdef USELIBCPP
+# OS X, use libc++ but don't have sanitizers
+CXXFLAGS += --stdlib=libc++
+LINKFLAGS = -lc++
+else
+ifndef windir
+# Linux, have sanitizers
+SANITIZE = -fsanitize=address,undefined
+CXXFLAGS += $(SANITIZE)
+endif
+endif
+else
+CXX = g++
+endif
+
+ifdef windir
+DEL = del /q
+EXE = unitTest.exe
+else
+DEL = rm -f
+EXE = unitTest
+endif
+
+INCLUDEDIRS = -I ../../include -I ../../src
+
+CPPFLAGS += $(INCLUDEDIRS)
+CXXFLAGS += -Wall -Wextra
+
+# Files in this directory containing tests
+TESTSRC=test*.cxx
+# Files being tested from scintilla/src directory
+TESTEDSRC=\
+ ../../src/CaseConvert.cxx \
+ ../../src/CaseFolder.cxx \
+ ../../src/CellBuffer.cxx \
+ ../../src/CharacterCategoryMap.cxx \
+ ../../src/CharClassify.cxx \
+ ../../src/ContractionState.cxx \
+ ../../src/Decoration.cxx \
+ ../../src/Document.cxx \
+ ../../src/PerLine.cxx \
+ ../../src/RESearch.cxx \
+ ../../src/RunStyles.cxx \
+ ../../src/UniConversion.cxx \
+ ../../src/UniqueString.cxx
+
+TESTS=$(EXE)
+
+all: $(TESTS)
+
+test: $(TESTS)
+	./$(EXE)
+
+clean:
+	$(DEL) $(TESTS) *.o *.obj *.exe
+
+$(EXE): $(TESTSRC) $(TESTEDSRC) unitTest.cxx
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKFLAGS) $^ -o $@
diff --git a/scite-app/scintilla/test/unit/test.mak b/scite-app/scintilla/test/unit/test.mak
new file mode 100644
index 0000000..9e1c9ac
--- /dev/null
+++ b/scite-app/scintilla/test/unit/test.mak
@@ -0,0 +1,40 @@
+# Build all the unit tests with Microsoft Visual C++ using nmake
+# Tested with Visual C++ 2019
+
+DEL = del /q
+EXE = unitTest.exe
+
+INCLUDEDIRS = /I../../include /I../../src
+
+CXXFLAGS = /EHsc /std:c++17 $(OPTIMIZATION) /nologo /D_HAS_AUTO_PTR_ETC=1 /wd 4805 $(INCLUDEDIRS)
+
+# Files in this directory containing tests
+TESTSRC=test*.cxx
+# Files being tested from scintilla/src directory
+TESTEDSRC=\
+ ../../src/CaseConvert.cxx \
+ ../../src/CaseFolder.cxx \
+ ../../src/CellBuffer.cxx \
+ ../../src/CharacterCategoryMap.cxx \
+ ../../src/CharClassify.cxx \
+ ../../src/ContractionState.cxx \
+ ../../src/Decoration.cxx \
+ ../../src/Document.cxx \
+ ../../src/PerLine.cxx \
+ ../../src/RESearch.cxx \
+ ../../src/RunStyles.cxx \
+ ../../src/UniConversion.cxx \
+ ../../src/UniqueString.cxx
+
+TESTS=$(EXE)
+
+all: $(TESTS)
+
+test: $(TESTS)
+	$(EXE)
+
+clean:
+	$(DEL) $(TESTS) *.o *.obj *.exe
+
+$(EXE): $(TESTSRC) $(TESTEDSRC) $(@B).obj
+	$(CXX) $(CXXFLAGS) /Fe$@ $**
diff --git a/scite-app/scintilla/test/unit/testCellBuffer.cxx b/scite-app/scintilla/test/unit/testCellBuffer.cxx
new file mode 100644
index 0000000..b48e44b
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testCellBuffer.cxx
@@ -0,0 +1,440 @@
+/** @file testCellBuffer.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "CellBuffer.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+// Test CellBuffer.
+
+TEST_CASE("CellBuffer") {
+
+	const char sText[] = "Scintilla";
+	const Sci::Position sLength = static_cast<Sci::Position>(strlen(sText));
+
+	CellBuffer cb(true, false);
+
+	SECTION("InsertOneLine") {
+		bool startSequence = false;
+		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		REQUIRE(startSequence);
+		REQUIRE(sLength == cb.Length());
+		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
+		REQUIRE(1 == cb.Lines());
+		REQUIRE(0 == cb.LineStart(0));
+		REQUIRE(0 == cb.LineFromPosition(0));
+		REQUIRE(sLength == cb.LineStart(1));
+		REQUIRE(0 == cb.LineFromPosition(static_cast<int>(sLength)));
+		REQUIRE(cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+	}
+
+	SECTION("InsertTwoLines") {
+		const char sText2[] = "Two\nLines";
+		const Sci::Position sLength2 = static_cast<Sci::Position>(strlen(sText2));
+		bool startSequence = false;
+		const char *cpChange = cb.InsertString(0, sText2, static_cast<int>(sLength), startSequence);
+		REQUIRE(startSequence);
+		REQUIRE(sLength2 == cb.Length());
+		REQUIRE(memcmp(cpChange, sText2, sLength2) == 0);
+		REQUIRE(2 == cb.Lines());
+		REQUIRE(0 == cb.LineStart(0));
+		REQUIRE(0 == cb.LineFromPosition(0));
+		REQUIRE(4 == cb.LineStart(1));
+		REQUIRE(1 == cb.LineFromPosition(5));
+		REQUIRE(sLength2 == cb.LineStart(2));
+		REQUIRE(1 == cb.LineFromPosition(static_cast<int>(sLength)));
+		REQUIRE(cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+	}
+
+	SECTION("UndoOff") {
+		REQUIRE(cb.IsCollectingUndo());
+		cb.SetUndoCollection(false);
+		REQUIRE(!cb.IsCollectingUndo());
+		bool startSequence = false;
+		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		REQUIRE(!startSequence);
+		REQUIRE(sLength == cb.Length());
+		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
+		REQUIRE(!cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+	}
+
+	SECTION("UndoRedo") {
+		const char sTextDeleted[] = "ci";
+		const char sTextAfterDeletion[] = "Sntilla";
+		bool startSequence = false;
+		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		REQUIRE(startSequence);
+		REQUIRE(sLength == cb.Length());
+		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
+		REQUIRE(memcmp(cb.BufferPointer(), sText, sLength) == 0);
+		REQUIRE(cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+		const char *cpDeletion = cb.DeleteChars(1, 2, startSequence);
+		REQUIRE(startSequence);
+		REQUIRE(memcmp(cpDeletion, sTextDeleted, strlen(sTextDeleted)) == 0);
+		REQUIRE(memcmp(cb.BufferPointer(), sTextAfterDeletion, strlen(sTextAfterDeletion)) == 0);
+		REQUIRE(cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+
+		int steps = cb.StartUndo();
+		REQUIRE(steps == 1);
+		cb.PerformUndoStep();
+		REQUIRE(memcmp(cb.BufferPointer(), sText, sLength) == 0);
+		REQUIRE(cb.CanUndo());
+		REQUIRE(cb.CanRedo());
+
+		steps = cb.StartUndo();
+		REQUIRE(steps == 1);
+		cb.PerformUndoStep();
+		REQUIRE(cb.Length() == 0);
+		REQUIRE(!cb.CanUndo());
+		REQUIRE(cb.CanRedo());
+
+		steps = cb.StartRedo();
+		REQUIRE(steps == 1);
+		cb.PerformRedoStep();
+		REQUIRE(memcmp(cb.BufferPointer(), sText, sLength) == 0);
+		REQUIRE(cb.CanUndo());
+		REQUIRE(cb.CanRedo());
+
+		steps = cb.StartRedo();
+		REQUIRE(steps == 1);
+		cb.PerformRedoStep();
+		REQUIRE(memcmp(cb.BufferPointer(), sTextAfterDeletion, strlen(sTextAfterDeletion)) == 0);
+		REQUIRE(cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+
+		cb.DeleteUndoHistory();
+		REQUIRE(!cb.CanUndo());
+		REQUIRE(!cb.CanRedo());
+	}
+
+	SECTION("LineEndTypes") {
+		REQUIRE(cb.GetLineEndTypes() == LineEndType::Default);
+		cb.SetLineEndTypes(LineEndType::Unicode);
+		REQUIRE(cb.GetLineEndTypes() == LineEndType::Unicode);
+		cb.SetLineEndTypes(LineEndType::Default);
+		REQUIRE(cb.GetLineEndTypes() == LineEndType::Default);
+	}
+
+	SECTION("ReadOnly") {
+		REQUIRE(!cb.IsReadOnly());
+		cb.SetReadOnly(true);
+		REQUIRE(cb.IsReadOnly());
+		bool startSequence = false;
+		cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		REQUIRE(cb.Length() == 0);
+	}
+
+}
+
+TEST_CASE("CharacterIndex") {
+
+	CellBuffer cb(true, false);
+
+	SECTION("Setup") {
+		REQUIRE(cb.LineCharacterIndex() == LineCharacterIndexType::None);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 0);
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16);
+		REQUIRE(cb.LineCharacterIndex() == LineCharacterIndexType::Utf16);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 0);
+
+		cb.ReleaseLineCharacterIndex(LineCharacterIndexType::Utf16);
+		REQUIRE(cb.LineCharacterIndex() == LineCharacterIndexType::None);
+	}
+
+	SECTION("Insertion") {
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		cb.InsertString(0, "a", 1, startSequence);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 1);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 1);
+
+		const char *hwair = "\xF0\x90\x8D\x88";
+		cb.InsertString(0, hwair, strlen(hwair), startSequence);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+	}
+
+	SECTION("Deletion") {
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		const char *hwair = "a\xF0\x90\x8D\x88z";
+		cb.InsertString(0, hwair, strlen(hwair), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 4);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+
+		cb.DeleteChars(5, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+
+		cb.DeleteChars(1, 4, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 1);
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 1);
+	}
+
+	SECTION("Insert Complex") {
+		cb.SetUTF8Substance(true);
+		cb.SetLineEndTypes(LineEndType::Unicode);
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 5);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 6);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 4);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 5);
+
+		// Insert a new line at end -> "a\n\xF0\x90\x8D\x88\nz\n" 4 lines
+		// Last line empty
+		cb.InsertString(strlen(data), "\n", 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 5);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 7);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf16) == 7);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 4);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 6);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf32) == 6);
+
+		// Insert a new line before end -> "a\n\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		cb.InsertString(strlen(data), "\n", 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 5);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 7);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf16) == 8);
+		REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf16) == 8);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 4);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 6);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf32) == 7);
+		REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf32) == 7);
+
+		// Insert a valid 3-byte UTF-8 character at start -> 
+		// "\xE2\x82\xACa\n\xF0\x90\x8D\x88\nz\n\n" 5 lines
+
+		const char *euro = "\xE2\x82\xAC";
+		cb.InsertString(0, euro, strlen(euro), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 6);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 8);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf16) == 9);
+		REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf16) == 9);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 5);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 7);
+		REQUIRE(cb.IndexLineStart(4, LineCharacterIndexType::Utf32) == 8);
+		REQUIRE(cb.IndexLineStart(5, LineCharacterIndexType::Utf32) == 8);
+
+		// Insert a lone lead byte implying a 3 byte character at start of line 2 -> 
+		// "\xE2\x82\xACa\n\EF\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		// Should be treated as a single byte character
+
+		const char *lead = "\xEF";
+		cb.InsertString(5, lead, strlen(lead), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 7);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 9);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 6);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 8);
+
+		// Insert an ASCII lead byte inside the 3-byte initial character ->
+		// "\xE2!\x82\xACa\n\EF\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		// It should b treated as a single character and should cause the
+		// byte before and the 2 bytes after also be each treated as singles
+		// so 3 more characters on line 0.
+
+		const char *ascii = "!";
+		cb.InsertString(1, ascii, strlen(ascii), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 6);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 10);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 6);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 9);
+
+		// Insert a NEL after the '!' to trigger the utf8 line end case ->
+		// "\xE2!\xC2\x85 \x82\xACa\n \EF\xF0\x90\x8D\x88\n z\n\n" 5 lines
+
+		const char *nel = "\xC2\x85";
+		cb.InsertString(2, nel, strlen(nel), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 7);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 11);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 7);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 10);
+	}
+
+	SECTION("Delete Multiple lines") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz\nc";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// Delete first 2 new lines -> "az\nc"
+		cb.DeleteChars(1, strlen(data) - 4, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 4);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 4);
+	}
+
+	SECTION("Delete Complex") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// Delete lead byte from character on line 1 ->
+		// "a\n\x90\x8D\x88\nz"
+		// line 1 becomes 4 single byte characters
+		cb.DeleteChars(2, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 6);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 7);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 6);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf32) == 7);
+
+		// Delete first new line ->
+		// "a\x90\x8D\x88\nz"
+		// Only 2 lines with line 0 containing 5 single byte characters
+		cb.DeleteChars(1, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 5);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 6);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 5);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 6);
+
+		// Restore lead byte from character on line 0 making a 4-byte character ->
+		// "a\xF0\x90\x8D\x88\nz"
+
+		const char *lead4 = "\xF0";
+		cb.InsertString(1, lead4, strlen(lead4), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 4);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 5);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf32) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf32) == 3);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf32) == 4);
+	}
+
+	SECTION("Insert separates new line bytes") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(LineCharacterIndexType::Utf16 | LineCharacterIndexType::Utf32);
+
+		bool startSequence = false;
+		// 2 lines of text containing 4 bytes
+		const char *data = "a\r\nb";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// 3 lines of text containing 5 bytes ->
+		// "a\r!\nb"
+		const char *ascii = "!";
+		cb.InsertString(2, ascii, strlen(ascii), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, LineCharacterIndexType::Utf16) == 0);
+		REQUIRE(cb.IndexLineStart(1, LineCharacterIndexType::Utf16) == 2);
+		REQUIRE(cb.IndexLineStart(2, LineCharacterIndexType::Utf16) == 4);
+		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 5);
+	}
+}
diff --git a/scite-app/scintilla/test/unit/testCharClassify.cxx b/scite-app/scintilla/test/unit/testCharClassify.cxx
new file mode 100644
index 0000000..18bf9dc
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testCharClassify.cxx
@@ -0,0 +1,124 @@
+/** @file testCharClassify.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstring>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <iostream>
+
+#include "Debugging.h"
+
+#include "CharClassify.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test CharClassify.
+
+class CharClassifyTest {
+	// Avoid warnings, deleted so never called.
+	CharClassifyTest(const CharClassifyTest &) = delete;
+protected:
+	CharClassifyTest() {
+		pcc = std::make_unique<CharClassify>();
+		for (int ch = 0; ch < 256; ch++) {
+			if (ch == '\r' || ch == '\n')
+				charClass[ch] = CharacterClass::newLine;
+			else if (ch < 0x20 || ch == ' ')
+				charClass[ch] = CharacterClass::space;
+			else if (ch >= 0x80 || isalnum(ch) || ch == '_')
+				charClass[ch] = CharacterClass::word;
+			else
+				charClass[ch] = CharacterClass::punctuation;
+		}
+	}
+
+	std::unique_ptr<CharClassify> pcc;
+	CharacterClass charClass[256];
+
+	static const char* GetClassName(CharacterClass charClass) {
+		switch(charClass) {
+			#define CASE(c) case CharacterClass::c: return #c
+			CASE(space);
+			CASE(newLine);
+			CASE(word);
+			CASE(punctuation);
+			#undef CASE
+			default:
+				return "<unknown>";
+		}
+	}
+};
+
+TEST_CASE_METHOD(CharClassifyTest, "Defaults") {
+	for (int i = 0; i < 256; i++) {
+		if (charClass[i] != pcc->GetClass(i))
+			std::cerr
+			<< "Character " << i
+			<< " should be class " << GetClassName(charClass[i])
+			<< ", but got " << GetClassName(pcc->GetClass(i)) << std::endl;
+		REQUIRE(charClass[i] == pcc->GetClass(i));
+	}
+}
+
+TEST_CASE_METHOD(CharClassifyTest, "Custom") {
+	unsigned char buf[2] = {0, 0};
+	for (int i = 0; i < 256; i++) {
+		CharacterClass thisClass = CharacterClass(i % 4);
+		buf[0] = i;
+		pcc->SetCharClasses(buf, thisClass);
+		charClass[i] = thisClass;
+	}
+	for (int i = 0; i < 256; i++) {
+		if (charClass[i] != pcc->GetClass(i))
+			std::cerr
+			<< "Character " << i
+			<< " should be class " << GetClassName(charClass[i])
+			<< ", but got " << GetClassName(pcc->GetClass(i)) << std::endl;
+		REQUIRE(charClass[i] == pcc->GetClass(i));
+	}
+}
+
+TEST_CASE_METHOD(CharClassifyTest, "CharsOfClass") {
+	unsigned char buf[2] = {0, 0};
+	for (int i = 1; i < 256; i++) {
+		CharacterClass thisClass = CharacterClass(i % 4);
+		buf[0] = i;
+		pcc->SetCharClasses(buf, thisClass);
+		charClass[i] = thisClass;
+	}
+	for (int classVal = 0; classVal < 4; ++classVal) {
+		CharacterClass thisClass = CharacterClass(classVal % 4);
+		int size = pcc->GetCharsOfClass(thisClass, NULL);
+		std::vector<unsigned char> buffer(size+1);
+		void *pBuffer = static_cast<void *>(buffer.data());
+		pcc->GetCharsOfClass(thisClass, buffer.data());
+		for (int i = 1; i < 256; i++) {
+			if (charClass[i] == thisClass) {
+				if (!memchr(pBuffer, i, size))
+					std::cerr
+					<< "Character " << i
+					<< " should be class " << GetClassName(thisClass)
+					<< ", but was not in GetCharsOfClass;"
+					<< " it is reported to be "
+					<< GetClassName(pcc->GetClass(i)) << std::endl;
+				REQUIRE(memchr(pBuffer, i, size));
+			} else {
+				if (memchr(pBuffer, i, size))
+					std::cerr
+					<< "Character " << i
+					<< " should not be class " << GetClassName(thisClass)
+					<< ", but was in GetCharsOfClass"
+					<< " it is reported to be "
+					<< GetClassName(pcc->GetClass(i)) << std::endl;
+				REQUIRE_FALSE(memchr(pBuffer, i, size));
+			}
+		}
+	}
+}
diff --git a/scite-app/scintilla/test/unit/testCharacterCategoryMap.cxx b/scite-app/scintilla/test/unit/testCharacterCategoryMap.cxx
new file mode 100644
index 0000000..8c5305c
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testCharacterCategoryMap.cxx
@@ -0,0 +1,73 @@
+/** @file testCharacterCategoryMap.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "CharacterCategoryMap.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+// Test CharacterCategoryMap.
+
+TEST_CASE("CharacterCategoryMap") {
+
+	CharacterCategoryMap ccm;
+
+	SECTION("LowerCaseLetter") {
+		const CharacterCategory cc = ccm.CategoryFor('a');
+		REQUIRE(cc == CharacterCategory::ccLl);
+	}
+
+	SECTION("All") {
+		REQUIRE(ccm.CategoryFor('A') == CharacterCategory::ccLu);
+		REQUIRE(ccm.CategoryFor('a') == CharacterCategory::ccLl);
+		REQUIRE(ccm.CategoryFor(0x01C5) == CharacterCategory::ccLt);
+		REQUIRE(ccm.CategoryFor(0x0E46) == CharacterCategory::ccLm);
+		REQUIRE(ccm.CategoryFor(0x4E00) == CharacterCategory::ccLo);
+
+		REQUIRE(ccm.CategoryFor(0x0300) == CharacterCategory::ccMn);
+		REQUIRE(ccm.CategoryFor(0x0903) == CharacterCategory::ccMc);
+		REQUIRE(ccm.CategoryFor(0x20E0) == CharacterCategory::ccMe);
+
+		REQUIRE(ccm.CategoryFor('7') == CharacterCategory::ccNd);
+		REQUIRE(ccm.CategoryFor(0x2160) == CharacterCategory::ccNl);
+		REQUIRE(ccm.CategoryFor(0x00BC) == CharacterCategory::ccNo);
+
+		REQUIRE(ccm.CategoryFor('_') == CharacterCategory::ccPc);
+		REQUIRE(ccm.CategoryFor('-') == CharacterCategory::ccPd);
+		REQUIRE(ccm.CategoryFor('(') == CharacterCategory::ccPs);
+		REQUIRE(ccm.CategoryFor('}') == CharacterCategory::ccPe);
+		REQUIRE(ccm.CategoryFor(0x00AB) == CharacterCategory::ccPi);
+		REQUIRE(ccm.CategoryFor(0x00BB) == CharacterCategory::ccPf);
+		REQUIRE(ccm.CategoryFor('"') == CharacterCategory::ccPo);
+
+		REQUIRE(ccm.CategoryFor('+') == CharacterCategory::ccSm);
+		REQUIRE(ccm.CategoryFor('$') == CharacterCategory::ccSc);
+		REQUIRE(ccm.CategoryFor(0x02C2) == CharacterCategory::ccSk);
+		REQUIRE(ccm.CategoryFor(0x00A6) == CharacterCategory::ccSo);
+
+		REQUIRE(ccm.CategoryFor(' ') == CharacterCategory::ccZs);
+		REQUIRE(ccm.CategoryFor(0x2028) == CharacterCategory::ccZl);
+		REQUIRE(ccm.CategoryFor(0x2029) == CharacterCategory::ccZp);
+
+		REQUIRE(ccm.CategoryFor('\n') == CharacterCategory::ccCc);
+		REQUIRE(ccm.CategoryFor(0x00AD) == CharacterCategory::ccCf);
+		REQUIRE(ccm.CategoryFor(0xD800) == CharacterCategory::ccCs);
+		REQUIRE(ccm.CategoryFor(0xE000) == CharacterCategory::ccCo);
+		REQUIRE(ccm.CategoryFor(0xFFFE) == CharacterCategory::ccCn);
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testContractionState.cxx b/scite-app/scintilla/test/unit/testContractionState.cxx
new file mode 100644
index 0000000..64f300a
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testContractionState.cxx
@@ -0,0 +1,168 @@
+/** @file testContractionState.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test ContractionState.
+
+TEST_CASE("ContractionState") {
+
+	std::unique_ptr<IContractionState> pcs = ContractionStateCreate(false);
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(1 == pcs->LinesInDoc());
+		REQUIRE(1 == pcs->LinesDisplayed());
+		REQUIRE(0 == pcs->DisplayFromDoc(0));
+		REQUIRE(0 == pcs->DocFromDisplay(0));
+	}
+
+	SECTION("OneLine") {
+		pcs->InsertLines(0, 1);
+		REQUIRE(2 == pcs->LinesInDoc());
+		REQUIRE(2 == pcs->LinesDisplayed());
+		REQUIRE(0 == pcs->DisplayFromDoc(0));
+		REQUIRE(0 == pcs->DocFromDisplay(0));
+		REQUIRE(1 == pcs->DisplayFromDoc(1));
+		REQUIRE(1 == pcs->DocFromDisplay(1));
+	}
+
+	SECTION("InsertionThenDeletions") {
+		pcs->InsertLines(0,4);
+		pcs->DeleteLines(1, 1);
+
+		REQUIRE(4 == pcs->LinesInDoc());
+		REQUIRE(4 == pcs->LinesDisplayed());
+		for (int l=0;l<4;l++) {
+			REQUIRE(l == pcs->DisplayFromDoc(l));
+			REQUIRE(l == pcs->DocFromDisplay(l));
+		}
+
+		pcs->DeleteLines(0,2);
+		REQUIRE(2 == pcs->LinesInDoc());
+		REQUIRE(2 == pcs->LinesDisplayed());
+		for (int l=0;l<2;l++) {
+			REQUIRE(l == pcs->DisplayFromDoc(l));
+			REQUIRE(l == pcs->DocFromDisplay(l));
+		}
+	}
+
+	SECTION("ShowHide") {
+		pcs->InsertLines(0,4);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(true == pcs->GetVisible(1));
+		REQUIRE(true == pcs->GetVisible(2));
+		REQUIRE(5 == pcs->LinesDisplayed());
+
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(false == pcs->GetVisible(1));
+		REQUIRE(true == pcs->GetVisible(2));
+		REQUIRE(4 == pcs->LinesDisplayed());
+		REQUIRE(true == pcs->HiddenLines());
+
+		pcs->SetVisible(1, 2, true);
+		for (int l=0;l<4;l++) {
+			REQUIRE(true == pcs->GetVisible(0));
+		}
+
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(false == pcs->GetVisible(1));
+		pcs->ShowAll();
+		for (int l=0;l<4;l++) {
+			REQUIRE(true == pcs->GetVisible(0));
+		}
+		REQUIRE(false == pcs->HiddenLines());
+	}
+
+	SECTION("Hidden") {
+		pcs->InsertLines(0,1);
+		for (int l=0;l<2;l++) {
+			REQUIRE(true == pcs->GetVisible(0));
+		}
+		REQUIRE(false == pcs->HiddenLines());
+
+		pcs->SetVisible(1, 1, false);
+		REQUIRE(true == pcs->GetVisible(0));
+		REQUIRE(false == pcs->GetVisible(1));
+		REQUIRE(true == pcs->HiddenLines());
+
+		pcs->SetVisible(1, 1, true);
+		for (int l=0;l<2;l++) {
+			REQUIRE(true == pcs->GetVisible(0));
+		}
+		REQUIRE(false == pcs->HiddenLines());
+	}
+
+	SECTION("Contracting") {
+		pcs->InsertLines(0,4);
+		for (int l=0;l<4;l++) {
+			REQUIRE(true == pcs->GetExpanded(l));
+		}
+
+		pcs->SetExpanded(2, false);
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(false == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
+
+		REQUIRE(2 == pcs->ContractedNext(0));
+		REQUIRE(2 == pcs->ContractedNext(1));
+		REQUIRE(2 == pcs->ContractedNext(2));
+		REQUIRE(-1 == pcs->ContractedNext(3));
+
+		pcs->SetExpanded(2, true);
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(true == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
+	}
+
+	SECTION("ChangeHeight") {
+		pcs->InsertLines(0,4);
+		for (int l=0;l<4;l++) {
+			REQUIRE(1 == pcs->GetHeight(l));
+		}
+
+		pcs->SetHeight(1, 2);
+		REQUIRE(1 == pcs->GetHeight(0));
+		REQUIRE(2 == pcs->GetHeight(1));
+		REQUIRE(1 == pcs->GetHeight(2));
+	}
+
+	SECTION("SetFoldDisplayText") {
+		pcs->InsertLines(0, 4);
+		REQUIRE(5 == pcs->LinesInDoc());
+		pcs->SetFoldDisplayText(1, "abc");
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(1), "abc") == 0);
+		pcs->SetFoldDisplayText(1, "def");
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(1), "def") == 0);
+		pcs->SetFoldDisplayText(1, nullptr);
+		REQUIRE(static_cast<const char *>(nullptr) == pcs->GetFoldDisplayText(1));
+		// At end
+		pcs->SetFoldDisplayText(5, "xyz");
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(5), "xyz") == 0);
+		pcs->DeleteLines(4, 1);
+		REQUIRE(strcmp(pcs->GetFoldDisplayText(4), "xyz") == 0);
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testDecoration.cxx b/scite-app/scintilla/test/unit/testDecoration.cxx
new file mode 100644
index 0000000..fd43bc2
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testDecoration.cxx
@@ -0,0 +1,98 @@
+/** @file testDecoration.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "Decoration.h"
+
+#include "catch.hpp"
+
+constexpr int indicator=4;
+
+using namespace Scintilla::Internal;
+
+// Test Decoration.
+
+TEST_CASE("Decoration") {
+
+	std::unique_ptr<IDecoration> deco = DecorationCreate(false, indicator);
+
+	SECTION("HasCorrectIndicator") {
+		REQUIRE(indicator == deco->Indicator());
+	}
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0 == deco->Length());
+		REQUIRE(1 == deco->Runs());
+		REQUIRE(deco->Empty());
+	}
+
+	SECTION("SimpleSpace") {
+		deco->InsertSpace(0, 1);
+		REQUIRE(deco->Empty());
+	}
+
+	SECTION("SimpleRun") {
+		deco->InsertSpace(0, 1);
+		deco->SetValueAt(0, 2);
+		REQUIRE(!deco->Empty());
+	}
+}
+
+// Test DecorationList.
+
+TEST_CASE("DecorationList") {
+
+	std::unique_ptr<IDecorationList> decol = DecorationListCreate(false);
+
+	SECTION("HasCorrectIndicator") {
+		decol->SetCurrentIndicator(indicator);
+		REQUIRE(indicator == decol->GetCurrentIndicator());
+	}
+
+	SECTION("HasCorrectCurrentValue") {
+		constexpr int value = 55;
+		decol->SetCurrentValue(value);
+		REQUIRE(value == decol->GetCurrentValue());
+	}
+
+	SECTION("ExpandSetValues") {
+		decol->SetCurrentIndicator(indicator);
+		decol->InsertSpace(0, 9);
+		constexpr int value = 59;
+		constexpr Sci::Position position = 4;
+		constexpr Sci::Position fillLength = 3;
+		auto fr = decol->FillRange(position, value, fillLength);
+		REQUIRE(fr.changed);
+		REQUIRE(fr.position == 4);
+		REQUIRE(fr.fillLength == 3);
+		REQUIRE(decol->ValueAt(indicator, 5) == value);
+		REQUIRE(decol->AllOnFor(5) == (1 << indicator));
+		REQUIRE(decol->Start(indicator, 5) == 4);
+		REQUIRE(decol->End(indicator, 5) == 7);
+		constexpr int indicatorB=6;
+		decol->SetCurrentIndicator(indicatorB);
+		fr = decol->FillRange(position, value, fillLength);
+		REQUIRE(fr.changed);
+		REQUIRE(decol->AllOnFor(5) == ((1 << indicator) | (1 << indicatorB)));
+		decol->DeleteRange(5, 1);
+		REQUIRE(decol->Start(indicatorB, 5) == 4);
+		REQUIRE(decol->End(indicatorB, 5) == 6);
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testDocument.cxx b/scite-app/scintilla/test/unit/testDocument.cxx
new file mode 100644
index 0000000..809647e
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testDocument.cxx
@@ -0,0 +1,488 @@
+/** @file testDocument.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+
+#include "ScintillaTypes.h"
+
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "CellBuffer.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+// Test Document.
+
+struct Folding {
+	int from;
+	int to;
+	int length;
+};
+
+// Table of case folding for non-ASCII bytes in Windows Latin code page 1252
+Folding foldings1252[] = {
+	{0x8a, 0x9a, 0x01},
+	{0x8c, 0x9c, 0x01},
+	{0x8e, 0x9e, 0x01},
+	{0x9f, 0xff, 0x01},
+	{0xc0, 0xe0, 0x17},
+	{0xd8, 0xf8, 0x07},
+};
+
+// Table of case folding for non-ASCII bytes in Windows Russian code page 1251
+Folding foldings1251[] = {
+	{0x80, 0x90, 0x01},
+	{0x81, 0x83, 0x01},
+	{0x8a, 0x9a, 0x01},
+	{0x8c, 0x9c, 0x04},
+	{0xa1, 0xa2, 0x01},
+	{0xa3, 0xbc, 0x01},
+	{0xa5, 0xb4, 0x01},
+	{0xa8, 0xb8, 0x01},
+	{0xaa, 0xba, 0x01},
+	{0xaf, 0xbf, 0x01},
+	{0xb2, 0xb3, 0x01},
+	{0xbd, 0xbe, 0x01},
+	{0xc0, 0xe0, 0x20},
+};
+
+std::string ReadFile(std::string path) {
+	std::ifstream ifs(path, std::ios::binary);
+	std::string content((std::istreambuf_iterator<char>(ifs)),
+		(std::istreambuf_iterator<char>()));
+	return content;
+}
+
+struct DocPlus {
+	Document document;
+
+	DocPlus(std::string_view svInitial, int codePage) : document(DocumentOption::Default) {
+		SetCodePage(codePage);
+		document.InsertString(0, svInitial.data(), svInitial.length());
+	}
+
+	void SetCodePage(int codePage) {
+		document.SetDBCSCodePage(codePage);
+		if (codePage == CpUtf8) {
+			document.SetCaseFolder(std::make_unique<CaseFolderUnicode>());
+		} else {
+			// This case folder will not handle many DBCS cases. Scintilla uses platform-specific code for DBCS
+			// case folding which can not easily be inserted in platform-independent tests.
+			std::unique_ptr<CaseFolderTable> pcft = std::make_unique<CaseFolderTable>();
+			pcft->StandardASCII();
+			document.SetCaseFolder(std::move(pcft));
+		}
+	}
+
+	void SetSBCSFoldings(const Folding *foldings, size_t length) {
+		std::unique_ptr<CaseFolderTable> pcft = std::make_unique<CaseFolderTable>();
+		pcft->StandardASCII();
+		for (size_t block = 0; block < length; block++) {
+			for (int fold = 0; fold < foldings[block].length; fold++) {
+				pcft->SetTranslation(foldings[block].from + fold, foldings[block].to + fold);
+			}
+		}
+		document.SetCaseFolder(std::move(pcft));
+	}
+
+	Sci::Position FindNeedle(const std::string &needle, FindOption options, Sci::Position *length) {
+		assert(*length == static_cast<Sci::Position>(needle.length()));
+		return document.FindText(0, document.Length(), needle.c_str(), options, length);
+	}
+	Sci::Position FindNeedleReverse(const std::string &needle, FindOption options, Sci::Position *length) {
+		assert(*length == static_cast<Sci::Position>(needle.length()));
+		return document.FindText(document.Length(), 0, needle.c_str(), options, length);
+	}
+	void MoveGap(Sci::Position gapNew) {
+		// Move gap to gapNew by inserting
+		document.InsertString(gapNew, "!", 1);
+		// Remove insertion
+		document.DeleteChars(gapNew, 1);
+	}
+};
+
+void TimeTrace(std::string_view sv, const Catch::Timer &tikka) {
+	std::cout << sv << std::setw(5) << tikka.getElapsedMilliseconds() << " milliseconds" << std::endl;
+}
+
+TEST_CASE("Document") {
+
+	const char sText[] = "Scintilla";
+	const Sci::Position sLength = static_cast<Sci::Position>(strlen(sText));
+
+	SECTION("InsertOneLine") {
+		DocPlus doc("", 0);
+		const Sci::Position length = doc.document.InsertString(0, sText, sLength);
+		REQUIRE(sLength == doc.document.Length());
+		REQUIRE(length == sLength);
+		REQUIRE(1 == doc.document.LinesTotal());
+		REQUIRE(0 == doc.document.LineStart(0));
+		REQUIRE(0 == doc.document.LineFromPosition(0));
+		REQUIRE(sLength == doc.document.LineStart(1));
+		REQUIRE(0 == doc.document.LineFromPosition(static_cast<int>(sLength)));
+		REQUIRE(doc.document.CanUndo());
+		REQUIRE(!doc.document.CanRedo());
+	}
+
+	// Search ranges are from first argument to just before second argument
+	// Arguments are expected to be at character boundaries and will be tweaked if
+	// part way through a character.
+	SECTION("SearchInLatin") {
+		DocPlus doc("abcde", 0);	// a b c d e
+		std::string finding = "b";
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.FindNeedleReverse(finding, FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(0, 2, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(0, 1, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == -1);
+	}
+
+	SECTION("SearchInBothSegments") {
+		DocPlus doc("ab-ab", 0);	// a b - a b
+		std::string finding = "ab";
+		for (int gapPos = 0; gapPos <= 5; gapPos++) {
+			doc.MoveGap(gapPos);
+			Sci::Position lengthFinding = finding.length();
+			Sci::Position location = doc.document.FindText(0, doc.document.Length(), finding.c_str(), FindOption::MatchCase, &lengthFinding);
+			REQUIRE(location == 0);
+			location = doc.document.FindText(2, doc.document.Length(), finding.c_str(), FindOption::MatchCase, &lengthFinding);
+			REQUIRE(location == 3);
+		}
+	}
+
+	SECTION("InsensitiveSearchInLatin") {
+		DocPlus doc("abcde", 0);	// a b c d e
+		std::string finding = "B";
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.FindNeedleReverse(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(0, 2, finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(0, 1, finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == -1);
+	}
+
+	SECTION("InsensitiveSearchIn1252") {
+		// In Windows Latin, code page 1252, C6 is AE and E6 is ae
+		DocPlus doc("tru\xc6s\xe6t", 0);	// t r u AE s ae t
+		doc.SetSBCSFoldings(foldings1252, std::size(foldings1252));
+
+		// Search for upper-case AE
+		std::string finding = "\xc6";
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 3);
+		location = doc.document.FindText(4, doc.document.Length(), finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 5);
+		location = doc.FindNeedleReverse(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 5);
+
+		// Search for lower-case ae
+		finding = "\xe6";
+		location = doc.FindNeedle(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 3);
+		location = doc.document.FindText(4, doc.document.Length(), finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 5);
+		location = doc.FindNeedleReverse(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 5);
+	}
+
+	SECTION("Search2InLatin") {
+		// Checks that the initial '_' and final 'f' are ignored since they are outside the search bounds
+		DocPlus doc("_abcdef", 0);	// _ a b c d e f
+		std::string finding = "cd";
+		Sci::Position lengthFinding = finding.length();
+		size_t docLength = doc.document.Length() - 1;
+		Sci::Position location = doc.document.FindText(1, docLength, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 3);
+		location = doc.document.FindText(docLength, 1, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 3);
+		location = doc.document.FindText(docLength, 1, "bc", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(docLength, 1, "ab", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(docLength, 1, "de", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 4);
+		location = doc.document.FindText(docLength, 1, "_a", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == -1);
+		location = doc.document.FindText(docLength, 1, "ef", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == -1);
+		lengthFinding = 3;
+		location = doc.document.FindText(docLength, 1, "cde", FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 3);
+	}
+
+	SECTION("SearchInUTF8") {
+		DocPlus doc("ab\xCE\x93" "d", CpUtf8);	// a b gamma d
+		const std::string finding = "b";
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(doc.document.Length(), 0, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(0, 1, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == -1);
+		// Check doesn't try to follow a lead-byte past the search end
+		const std::string findingUTF = "\xCE\x93";
+		lengthFinding = findingUTF.length();
+		location = doc.document.FindText(0, 4, findingUTF.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 2);
+		// Only succeeds as 3 is partway through character so adjusted to 4
+		location = doc.document.FindText(0, 3, findingUTF.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(0, 2, findingUTF.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == -1);
+	}
+
+	SECTION("InsensitiveSearchInUTF8") {
+		DocPlus doc("ab\xCE\x93" "d", CpUtf8);	// a b gamma d
+		const std::string finding = "b";
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		location = doc.document.FindText(doc.document.Length(), 0, finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		const std::string findingUTF = "\xCE\x93";
+		lengthFinding = findingUTF.length();
+		location = doc.FindNeedle(findingUTF, FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(doc.document.Length(), 0, findingUTF.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(0, 4, findingUTF.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		// Only succeeds as 3 is partway through character so adjusted to 4
+		location = doc.document.FindText(0, 3, findingUTF.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(0, 2, findingUTF.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == -1);
+	}
+
+	SECTION("SearchInShiftJIS") {
+		// {CJK UNIFIED IDEOGRAPH-9955} is two bytes: {0xE9, 'b'} in Shift-JIS
+		// The 'b' can be incorrectly matched by the search string 'b' when the search
+		// does not iterate the text correctly.
+		DocPlus doc("ab\xe9" "b ", 932);	// a b {CJK UNIFIED IDEOGRAPH-9955} {space}
+		std::string finding = "b";
+		// Search forwards
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+		// Search backwards
+		lengthFinding = finding.length();
+		location = doc.document.FindText(doc.document.Length(), 0, finding.c_str(), FindOption::MatchCase, &lengthFinding);
+		REQUIRE(location == 1);
+	}
+
+	SECTION("InsensitiveSearchInShiftJIS") {
+		// {CJK UNIFIED IDEOGRAPH-9955} is two bytes: {0xE9, 'b'} in Shift-JIS
+		// The 'b' can be incorrectly matched by the search string 'b' when the search
+		// does not iterate the text correctly.
+		DocPlus doc("ab\xe9" "b ", 932);	// a b {CJK UNIFIED IDEOGRAPH-9955} {space}
+		std::string finding = "b";
+		// Search forwards
+		Sci::Position lengthFinding = finding.length();
+		Sci::Position location = doc.FindNeedle(finding, FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		// Search backwards
+		lengthFinding = finding.length();
+		location = doc.document.FindText(doc.document.Length(), 0, finding.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 1);
+		std::string finding932 = "\xe9" "b";
+		// Search forwards
+		lengthFinding = finding932.length();
+		location = doc.FindNeedle(finding932, FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		// Search backwards
+		lengthFinding = finding932.length();
+		location = doc.document.FindText(doc.document.Length(), 0, finding932.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(0, 3, finding932.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == 2);
+		location = doc.document.FindText(0, 2, finding932.c_str(), FindOption::None, &lengthFinding);
+		REQUIRE(location == -1);
+		// Can not test case mapping of double byte text as folder available here does not implement this 
+	}
+
+	SECTION("GetCharacterAndWidth DBCS") {
+		Document doc(DocumentOption::Default);
+		doc.SetDBCSCodePage(932);
+		REQUIRE(doc.CodePage() == 932);
+		const Sci::Position length = doc.InsertString(0, "H\x84\xff\x84H", 5);
+		// This text is invalid in code page 932.
+		// A reasonable interpretation is as 4 items: 2 characters and 2 character fragments
+		// The last item is a 2-byte CYRILLIC CAPITAL LETTER ZE character 
+		// H [84] [FF] ZE
+		REQUIRE(5 == length);
+		REQUIRE(5 == doc.Length());
+		Sci::Position width = 0;
+		// test GetCharacterAndWidth()
+		int ch = doc.GetCharacterAndWidth(0, &width);
+		REQUIRE(width == 1);
+		REQUIRE(ch == 'H');
+		ch = doc.GetCharacterAndWidth(1, &width);
+		REQUIRE(width == 1);
+		REQUIRE(ch == 0x84);
+		width = 0;
+		ch = doc.GetCharacterAndWidth(2, &width);
+		REQUIRE(width == 1);
+		REQUIRE(ch == 0xff);
+		width = 0;
+		ch = doc.GetCharacterAndWidth(3, &width);
+		REQUIRE(width == 2);
+		REQUIRE(ch == 0x8448);
+		// test LenChar()
+		width = doc.LenChar(0);
+		REQUIRE(width == 1);
+		width = doc.LenChar(1);
+		REQUIRE(width == 1);
+		width = doc.LenChar(2);
+		REQUIRE(width == 1);
+		width = doc.LenChar(3);
+		REQUIRE(width == 2);
+		// test MovePositionOutsideChar()
+		Sci::Position pos = doc.MovePositionOutsideChar(1, 1);
+		REQUIRE(pos == 1);
+		pos = doc.MovePositionOutsideChar(2, 1);
+		REQUIRE(pos == 2);
+		pos = doc.MovePositionOutsideChar(3, 1);
+		REQUIRE(pos == 3);
+		pos = doc.MovePositionOutsideChar(4, 1);
+		REQUIRE(pos == 5);
+		pos = doc.MovePositionOutsideChar(1, -1);
+		REQUIRE(pos == 1);
+		pos = doc.MovePositionOutsideChar(2, -1);
+		REQUIRE(pos == 2);
+		pos = doc.MovePositionOutsideChar(3, -1);
+		REQUIRE(pos == 3);
+		pos = doc.MovePositionOutsideChar(4, -1);
+		REQUIRE(pos == 3);
+		// test NextPosition()
+		pos = doc.NextPosition(0, 1);
+		REQUIRE(pos == 1);
+		pos = doc.NextPosition(1, 1);
+		REQUIRE(pos == 2);
+		pos = doc.NextPosition(2, 1);
+		REQUIRE(pos == 3);
+		pos = doc.NextPosition(3, 1);
+		REQUIRE(pos == 5);
+		pos = doc.NextPosition(1, -1);
+		REQUIRE(pos == 0);
+		pos = doc.NextPosition(2, -1);
+		REQUIRE(pos == 1);
+		pos = doc.NextPosition(3, -1);
+		REQUIRE(pos == 2);
+		pos = doc.NextPosition(5, -1);
+		REQUIRE(pos == 3);
+	}
+
+	SECTION("NextPosition Valid DBCS") {
+		Document doc(DocumentOption::Default);
+		doc.SetDBCSCodePage(932);
+		REQUIRE(doc.CodePage() == 932);
+		// This text is valid in code page 932.
+		// O p e n = U+958B Ku ( O ) U+7DE8 -
+		// U+958B open
+		// U+7DE8 arrange
+		const std::string japaneseText = "Open=\x8aJ\x82\xad(O)\x95\xd2-";
+		const Sci::Position length = doc.InsertString(0, japaneseText.c_str(), japaneseText.length());
+		REQUIRE(length == 15);
+		// Forwards
+		REQUIRE(doc.NextPosition( 0, 1) == 1);
+		REQUIRE(doc.NextPosition( 1, 1) == 2);
+		REQUIRE(doc.NextPosition( 2, 1) == 3);
+		REQUIRE(doc.NextPosition( 3, 1) == 4);
+		REQUIRE(doc.NextPosition( 4, 1) == 5);
+		REQUIRE(doc.NextPosition( 5, 1) == 7);	// Double byte
+		REQUIRE(doc.NextPosition( 6, 1) == 7);
+		REQUIRE(doc.NextPosition( 7, 1) == 9);	// Double byte
+		REQUIRE(doc.NextPosition( 8, 1) == 9);
+		REQUIRE(doc.NextPosition( 9, 1) == 10);
+		REQUIRE(doc.NextPosition(10, 1) == 11);
+		REQUIRE(doc.NextPosition(11, 1) == 12);
+		REQUIRE(doc.NextPosition(12, 1) == 14);	// Double byte
+		REQUIRE(doc.NextPosition(13, 1) == 14);
+		REQUIRE(doc.NextPosition(14, 1) == 15);
+		REQUIRE(doc.NextPosition(15, 1) == 15);
+		// Backwards
+		REQUIRE(doc.NextPosition( 0, -1) == 0);
+		REQUIRE(doc.NextPosition( 1, -1) == 0);
+		REQUIRE(doc.NextPosition( 2, -1) == 1);
+		REQUIRE(doc.NextPosition( 3, -1) == 2);
+		REQUIRE(doc.NextPosition( 4, -1) == 3);
+		REQUIRE(doc.NextPosition( 5, -1) == 4);
+		REQUIRE(doc.NextPosition( 6, -1) == 5);	// Double byte
+		REQUIRE(doc.NextPosition( 7, -1) == 5);
+		REQUIRE(doc.NextPosition( 8, -1) == 7);	// Double byte
+		REQUIRE(doc.NextPosition( 9, -1) == 7);
+		REQUIRE(doc.NextPosition(10, -1) == 9);
+		REQUIRE(doc.NextPosition(11, -1) == 10);
+		REQUIRE(doc.NextPosition(12, -1) == 11);
+		REQUIRE(doc.NextPosition(13, -1) == 12);	// Double byte
+		REQUIRE(doc.NextPosition(14, -1) == 12);
+		REQUIRE(doc.NextPosition(15, -1) == 14);
+	}
+
+}
+
+TEST_CASE("Words") {
+
+	SECTION("WordsInText") {
+		const DocPlus doc(" abc ", 0);
+		REQUIRE(doc.document.IsWordAt(1, 4));
+		REQUIRE(!doc.document.IsWordAt(0, 1));
+		REQUIRE(!doc.document.IsWordAt(1, 2));
+		const DocPlus docPunct(" [!] ", 0);
+		REQUIRE(docPunct.document.IsWordAt(1, 4));
+		REQUIRE(!docPunct.document.IsWordAt(0, 1));
+		REQUIRE(!docPunct.document.IsWordAt(1, 2));
+		const DocPlus docMixed(" -ab ", 0);	// '-' is punctuation, 'ab' is word
+		REQUIRE(docMixed.document.IsWordAt(2, 4));
+		REQUIRE(docMixed.document.IsWordAt(1, 4));
+		REQUIRE(docMixed.document.IsWordAt(1, 2));
+		REQUIRE(!docMixed.document.IsWordAt(1, 3));	// 3 is between a and b so not word edge
+		// Scintilla's word definition just examines the ends
+		const DocPlus docOverSpace(" a b ", 0);
+		REQUIRE(docOverSpace.document.IsWordAt(1, 4));
+	}
+
+	SECTION("WordsAtEnds") {
+		const DocPlus doc("a c", 0);
+		REQUIRE(doc.document.IsWordAt(0, 1));
+		REQUIRE(doc.document.IsWordAt(2, 3));
+		const DocPlus docEndSpace(" a c ", 0);
+		REQUIRE(!docEndSpace.document.IsWordAt(0, 2));
+		REQUIRE(!docEndSpace.document.IsWordAt(3, 5));
+	}
+}
diff --git a/scite-app/scintilla/test/unit/testPartitioning.cxx b/scite-app/scintilla/test/unit/testPartitioning.cxx
new file mode 100644
index 0000000..b2b7598
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testPartitioning.cxx
@@ -0,0 +1,219 @@
+/** @file testPartitioning.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+constexpr int growSize = 4;
+
+constexpr int lengthTestArray = 8;
+static const int testArray[lengthTestArray] = {3, 4, 5, 6, 7, 8, 9, 10};
+
+// Test SplitVectorWithRangeAdd.
+
+TEST_CASE("SplitVectorWithRangeAdd") {
+
+	SplitVectorWithRangeAdd<int> svwra(growSize);
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0 == svwra.Length());
+	}
+
+	SECTION("IncrementExceptEnds") {
+		svwra.InsertFromArray(0, testArray, 0, lengthTestArray);
+		svwra.RangeAddDelta(1, lengthTestArray-1, 1);
+		for (int i=0; i<svwra.Length(); i++) {
+			if ((i == 0) || (i == lengthTestArray-1))
+				REQUIRE((i+3) == svwra.ValueAt(i));
+			else
+				REQUIRE((i+4) == svwra.ValueAt(i));
+		}
+	}
+
+}
+
+// Test Partitioning.
+
+TEST_CASE("Partitioning") {
+
+	Partitioning<Sci::Position> part(growSize);
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(1 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(part.Partitions()));
+		REQUIRE(0 == part.PartitionFromPosition(0));
+	}
+
+	SECTION("SimpleInsert") {
+		part.InsertText(0, 1);
+		REQUIRE(1 == part.Partitions());
+		REQUIRE(1 == part.PositionFromPartition(part.Partitions()));
+	}
+
+	SECTION("TwoPartitions") {
+		part.InsertText(0, 2);
+		part.InsertPartition(1, 1);
+		REQUIRE(2 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(1 == part.PositionFromPartition(1));
+		REQUIRE(2 == part.PositionFromPartition(2));
+	}
+
+	SECTION("MoveStart") {
+		part.InsertText(0, 3);
+		part.InsertPartition(1, 2);
+		part.SetPartitionStartPosition(1,1);
+		REQUIRE(2 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(1 == part.PositionFromPartition(1));
+		REQUIRE(3 == part.PositionFromPartition(2));
+	}
+
+	SECTION("InsertAgain") {
+		part.InsertText(0, 3);
+		part.InsertPartition(1, 2);
+		part.InsertText(0,3);
+		part.InsertText(1,2);
+		REQUIRE(2 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(5 == part.PositionFromPartition(1));
+		REQUIRE(8 == part.PositionFromPartition(2));
+	}
+
+	SECTION("InsertMultiple") {
+		part.InsertText(0, 10);
+		const Sci::Position positions[] { 2, 5, 7 };
+		part.InsertPartitions(1, positions, std::size(positions));
+		REQUIRE(4 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(2 == part.PositionFromPartition(1));
+		REQUIRE(5 == part.PositionFromPartition(2));
+		REQUIRE(7 == part.PositionFromPartition(3));
+		REQUIRE(10 == part.PositionFromPartition(4));
+	}
+
+	SECTION("InsertMultipleWithCast") {
+		part.InsertText(0, 9);
+		REQUIRE(1 == part.Partitions());
+		const ptrdiff_t positionsp[]{ 2, 4, 6, 8 };
+		part.InsertPartitionsWithCast(1, positionsp, std::size(positionsp));
+		REQUIRE(5 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(2 == part.PositionFromPartition(1));
+		REQUIRE(4 == part.PositionFromPartition(2));
+		REQUIRE(6 == part.PositionFromPartition(3));
+		REQUIRE(8 == part.PositionFromPartition(4));
+		REQUIRE(9 == part.PositionFromPartition(5));
+	}
+
+	SECTION("InsertReversed") {
+		part.InsertText(0, 3);
+		part.InsertPartition(1, 2);
+		part.InsertText(1,2);
+		part.InsertText(0,3);
+		REQUIRE(2 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(5 == part.PositionFromPartition(1));
+		REQUIRE(8 == part.PositionFromPartition(2));
+	}
+
+	SECTION("InverseSearch") {
+		part.InsertText(0, 3);
+		part.InsertPartition(1, 2);
+		part.SetPartitionStartPosition(1,1);
+
+		REQUIRE(2 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(1 == part.PositionFromPartition(1));
+		REQUIRE(3 == part.PositionFromPartition(2));
+
+		REQUIRE(0 == part.PartitionFromPosition(0));
+		REQUIRE(1 == part.PartitionFromPosition(1));
+		REQUIRE(1 == part.PartitionFromPosition(2));
+
+		REQUIRE(1 == part.PartitionFromPosition(3));
+	}
+
+	SECTION("DeletePartition") {
+		part.InsertText(0, 2);
+		part.InsertPartition(1, 1);
+		part.RemovePartition(1);
+		REQUIRE(1 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(2 == part.PositionFromPartition(1));
+	}
+
+	SECTION("DeleteAll") {
+		part.InsertText(0, 3);
+		part.InsertPartition(1, 2);
+		part.SetPartitionStartPosition(1,1);
+		part.DeleteAll();
+		// Back to initial state
+		REQUIRE(1 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(part.Partitions()));
+	}
+
+	SECTION("TestBackwards") {
+		part.InsertText(0, 10);
+		part.InsertPartition(1, 3);
+		part.InsertPartition(2, 6);
+		part.InsertPartition(3, 9);
+		part.InsertText(2,4);
+		part.InsertText(1,2);
+		part.InsertText(0,3);
+		REQUIRE(4 == part.Partitions());
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(6 == part.PositionFromPartition(1));
+		REQUIRE(11 == part.PositionFromPartition(2));
+		REQUIRE(18 == part.PositionFromPartition(3));
+		REQUIRE(19 == part.PositionFromPartition(4));
+	}
+
+	SECTION("TestMany") {
+		// Provoke backstep call
+		part.InsertText(0, 42);
+		for (int i=0; i<20; i++) {
+			part.InsertPartition(i+1, (i+1) * 2);
+		}
+		for (int i=20; i>0; i--) {
+			part.InsertText(i,2);
+		}
+		REQUIRE(21 == part.Partitions());
+		for (int i=1; i<20; i++) {
+			REQUIRE((i*4 - 2) == part.PositionFromPartition(i));
+			REQUIRE(i == part.PartitionFromPosition(i*4 - 2));
+		}
+		part.InsertText(19,2);
+		REQUIRE(3 == part.PartitionFromPosition(10));
+		part.InsertText(0,2);
+		part.InsertText(0,-2);
+		part.RemovePartition(1);
+		REQUIRE(0 == part.PositionFromPartition(0));
+		REQUIRE(6 == part.PositionFromPartition(1));
+		REQUIRE(10 == part.PositionFromPartition(2));
+		part.RemovePartition(10);
+		REQUIRE(46 == part.PositionFromPartition(10));
+		REQUIRE(10 == part.PartitionFromPosition(46));
+		REQUIRE(50 == part.PositionFromPartition(11));
+		REQUIRE(11 == part.PartitionFromPosition(50));
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testPerLine.cxx b/scite-app/scintilla/test/unit/testPerLine.cxx
new file mode 100644
index 0000000..5209c19
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testPerLine.cxx
@@ -0,0 +1,369 @@
+/** @file testPerLine.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <forward_list>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "CellBuffer.h"
+#include "PerLine.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+constexpr int FoldBase = static_cast<int>(Scintilla::FoldLevel::Base);
+
+// Test MarkerHandleSet.
+
+TEST_CASE("MarkerHandleSet") {
+
+	MarkerHandleSet mhs;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(mhs.Empty());
+		REQUIRE(0 == mhs.MarkValue());
+		REQUIRE(!mhs.Contains(1));
+	}
+
+	SECTION("InsertDelete") {
+		// Test knows that InsertHandle inserts at front (0)
+		// Insert 1 with handle 100
+		REQUIRE(mhs.InsertHandle(100,1));
+		REQUIRE(!mhs.Empty());
+		REQUIRE(2 == mhs.MarkValue());
+		REQUIRE(mhs.Contains(100));
+
+		// Insert 2 with handle 200
+		REQUIRE(mhs.InsertHandle(200,2));
+		REQUIRE(!mhs.Empty());
+		REQUIRE(mhs.Contains(100));
+		REQUIRE(mhs.Contains(200));
+		REQUIRE(6 == mhs.MarkValue());
+
+		const MarkerHandleNumber *mhn0 = mhs.GetMarkerHandleNumber(0);
+		REQUIRE(200 == mhn0->handle);
+		REQUIRE(2 == mhn0->number);
+		const MarkerHandleNumber *mhn1 = mhs.GetMarkerHandleNumber(1);
+		REQUIRE(100 == mhn1->handle);
+		REQUIRE(1 == mhn1->number);
+		const MarkerHandleNumber *mhn2 = mhs.GetMarkerHandleNumber(2);
+		REQUIRE(nullptr == mhn2);
+
+		// Remove first insertion
+		mhs.RemoveHandle(100);
+		REQUIRE(!mhs.Empty());
+		REQUIRE(mhs.Contains(200));
+		REQUIRE(4 == mhs.MarkValue());
+
+		// Remove remaining element
+		REQUIRE(mhs.RemoveNumber(2, true));
+		REQUIRE(mhs.Empty());
+		REQUIRE(!mhs.Contains(200));
+		REQUIRE(0 == mhs.MarkValue());
+	}
+
+	SECTION("Combine") {
+		mhs.InsertHandle(100, 1);
+		MarkerHandleSet mhsOther;
+		mhsOther.InsertHandle(200, 2);
+		mhs.CombineWith(&mhsOther);
+		REQUIRE(mhsOther.Empty());
+		mhs.RemoveHandle(100);
+		mhs.RemoveHandle(200);
+		REQUIRE(mhs.Empty());
+	}
+}
+
+TEST_CASE("LineMarkers") {
+
+	LineMarkers lm;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(0 == lm.MarkValue(0));
+	}
+
+	SECTION("AddDelete") {
+		// Test knows the way handles are allocated, starting from 1
+		lm.InsertLines(0, 5);
+		const int handle1 = lm.AddMark(0, 1, 5);
+		REQUIRE(1 == handle1);
+		REQUIRE(2 == lm.MarkValue(0));
+		REQUIRE(1 == lm.HandleFromLine(0, 0));
+		REQUIRE(1 == lm.NumberFromLine(0, 0));
+		REQUIRE(-1 == lm.HandleFromLine(0, 1));
+		REQUIRE(-1 == lm.NumberFromLine(0, 1));
+		REQUIRE(0 == lm.LineFromHandle(handle1));
+
+		REQUIRE(lm.DeleteMark(0, 1, true));
+		REQUIRE(0 == lm.MarkValue(0));
+
+		const int handle2 = lm.AddMark(0, 2, 5);
+		REQUIRE(2 == handle2);
+		REQUIRE(4 == lm.MarkValue(0));
+		lm.DeleteMarkFromHandle(handle2);
+		REQUIRE(0 == lm.MarkValue(0));
+	}
+
+	SECTION("MarkerNext") {
+		lm.AddMark(1, 1, 5);
+		lm.AddMark(2, 2, 5);
+		const Sci::Line line1 = lm.MarkerNext(0, 6);
+		REQUIRE(1 == line1);
+		const Sci::Line line2 = lm.MarkerNext(line1+1, 6);
+		REQUIRE(2 == line2);
+		const Sci::Line line3 = lm.MarkerNext(line2+1, 6);
+		REQUIRE(-1 == line3);
+	}
+
+	SECTION("MergeMarkers") {
+		lm.AddMark(1, 1, 5);
+		lm.AddMark(2, 2, 5);
+		lm.MergeMarkers(1);
+		REQUIRE(6 == lm.MarkValue(1));
+		REQUIRE(0 == lm.MarkValue(2));
+	}
+
+	SECTION("InsertRemoveLine") {
+		const int handle1 = lm.AddMark(1, 1, 5);
+		const int handle2 = lm.AddMark(2, 2, 5);
+		lm.InsertLine(2);
+		REQUIRE(0 == lm.MarkValue(0));
+		REQUIRE(2 == lm.MarkValue(1));
+		REQUIRE(0 == lm.MarkValue(2));
+		REQUIRE(4 == lm.MarkValue(3));
+		REQUIRE(0 == lm.MarkValue(4));
+		lm.RemoveLine(2);
+		REQUIRE(0 == lm.MarkValue(0));
+		REQUIRE(2 == lm.MarkValue(1));
+		REQUIRE(4 == lm.MarkValue(2));
+		REQUIRE(0 == lm.MarkValue(3));
+		lm.InsertLines(2, 2);
+		REQUIRE(0 == lm.MarkValue(0));
+		REQUIRE(2 == lm.MarkValue(1));
+		REQUIRE(0 == lm.MarkValue(2));
+		REQUIRE(0 == lm.MarkValue(3));
+		REQUIRE(4 == lm.MarkValue(4));
+		REQUIRE(0 == lm.MarkValue(5));
+		REQUIRE(1 == lm.LineFromHandle(handle1));
+		REQUIRE(4 == lm.LineFromHandle(handle2));
+	}
+}
+
+TEST_CASE("LineLevels") {
+
+	LineLevels ll;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(FoldBase == ll.GetLevel(0));
+	}
+
+	SECTION("SetLevel") {
+		REQUIRE(FoldBase == ll.SetLevel(1, 200, 5));
+		REQUIRE(FoldBase == ll.GetLevel(0));
+		REQUIRE(200 == ll.GetLevel(1));
+		REQUIRE(FoldBase == ll.GetLevel(2));
+		ll.ClearLevels();
+		REQUIRE(FoldBase == ll.GetLevel(1));
+		ll.ExpandLevels(5);
+		REQUIRE(FoldBase == ll.GetLevel(7));
+	}
+
+	SECTION("InsertRemoveLine") {
+		ll.SetLevel(1, 1, 5);
+		ll.SetLevel(2, 2, 5);
+		ll.InsertLine(2);
+		REQUIRE(FoldBase == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(2 == ll.GetLevel(3));
+		REQUIRE(FoldBase == ll.GetLevel(4));
+		ll.RemoveLine(2);
+		REQUIRE(FoldBase == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(FoldBase == ll.GetLevel(3));
+		ll.InsertLines(2, 2);
+		REQUIRE(FoldBase == ll.GetLevel(0));
+		REQUIRE(1 == ll.GetLevel(1));
+		REQUIRE(2 == ll.GetLevel(2));
+		REQUIRE(2 == ll.GetLevel(3));
+		REQUIRE(2 == ll.GetLevel(4));
+		REQUIRE(FoldBase == ll.GetLevel(5));
+	}
+}
+
+TEST_CASE("LineState") {
+
+	LineState ls;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(0 == ls.GetMaxLineState());
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(1 == ls.GetMaxLineState());
+		ls.Init();
+		REQUIRE(0 == ls.GetMaxLineState());
+		REQUIRE(0 == ls.GetLineState(0));
+	}
+
+	SECTION("SetLineState") {
+		REQUIRE(0 == ls.SetLineState(1, 200));
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(200 == ls.GetLineState(1));
+		REQUIRE(0 == ls.GetLineState(2));
+		REQUIRE(0 == ls.SetLineState(2, 400));
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(200 == ls.GetLineState(1));
+		REQUIRE(400 == ls.GetLineState(2));
+		REQUIRE(0 == ls.GetLineState(3));
+		// GetLineState(3) expands to 4 lines
+		REQUIRE(4 == ls.GetMaxLineState());
+		ls.Init();
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(1 == ls.GetMaxLineState());
+	}
+
+	SECTION("InsertRemoveLine") {
+		REQUIRE(0 == ls.GetMaxLineState());
+		ls.SetLineState(1, 1);
+		ls.SetLineState(2, 2);
+		REQUIRE(3 == ls.GetMaxLineState());
+		ls.InsertLine(2);
+		REQUIRE(4 == ls.GetMaxLineState());
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(1 == ls.GetLineState(1));
+		REQUIRE(2 == ls.GetLineState(2));
+		REQUIRE(2 == ls.GetLineState(3));
+		REQUIRE(0 == ls.GetLineState(4));
+		REQUIRE(5 == ls.GetMaxLineState());
+		ls.RemoveLine(2);
+		REQUIRE(4 == ls.GetMaxLineState());
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(1 == ls.GetLineState(1));
+		REQUIRE(2 == ls.GetLineState(2));
+		REQUIRE(0 == ls.GetLineState(3));
+		ls.InsertLines(2, 2);
+		REQUIRE(6 == ls.GetMaxLineState());
+		REQUIRE(0 == ls.GetLineState(0));
+		REQUIRE(1 == ls.GetLineState(1));
+		REQUIRE(2 == ls.GetLineState(2));
+		REQUIRE(2 == ls.GetLineState(3));
+		REQUIRE(2 == ls.GetLineState(4));
+		REQUIRE(0 == ls.GetLineState(5));
+	}
+}
+
+TEST_CASE("LineAnnotation") {
+
+	LineAnnotation la;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(0 == la.Length(0));
+		REQUIRE(0 == la.Lines(0));
+		REQUIRE(0 == la.Style(0));
+		REQUIRE(false == la.MultipleStyles(0));
+	}
+
+	SECTION("SetText") {
+		la.SetText(0, "Text");
+		REQUIRE(4 == la.Length(0));
+		REQUIRE(1 == la.Lines(0));
+		REQUIRE(memcmp(la.Text(0), "Text", 4) == 0);
+		REQUIRE(nullptr == la.Styles(0));
+		REQUIRE(0 == la.Style(0));
+		la.SetStyle(0, 9);
+		REQUIRE(9 == la.Style(0));
+
+		la.SetText(0, "Ant\nBird\nCat");
+		REQUIRE(3 == la.Lines(0));
+
+		la.ClearAll();
+		REQUIRE(nullptr == la.Text(0));
+	}
+
+	SECTION("SetStyles") {
+		la.SetText(0, "Text");
+		const unsigned char styles[] { 1,2,3,4 };
+		la.SetStyles(0, styles);
+		REQUIRE(memcmp(la.Text(0), "Text", 4) == 0);
+		REQUIRE(memcmp(la.Styles(0), styles, 4) == 0);
+		REQUIRE(la.MultipleStyles(0));
+	}
+
+	SECTION("InsertRemoveLine") {
+		la.SetText(0, "Ant");
+		la.SetText(1, "Bird");
+		REQUIRE(3 == la.Length(0));
+		REQUIRE(4 == la.Length(1));
+		REQUIRE(1 == la.Lines(0));
+		la.InsertLine(1);
+		REQUIRE(3 == la.Length(0));
+		REQUIRE(0 == la.Length(1));
+		REQUIRE(4 == la.Length(2));
+		la.RemoveLine(2);
+		REQUIRE(3 == la.Length(0));
+		REQUIRE(4 == la.Length(1));
+		la.InsertLines(1, 2);
+		REQUIRE(3 == la.Length(0));
+		REQUIRE(0 == la.Length(1));
+		REQUIRE(0 == la.Length(2));
+		REQUIRE(4 == la.Length(3));
+	}
+}
+
+TEST_CASE("LineTabstops") {
+
+	LineTabstops lt;
+
+	SECTION("Initial") {
+		// Initial State
+		REQUIRE(0 == lt.GetNextTabstop(0, 0));
+	}
+
+	SECTION("AddClearTabstops") {
+		lt.AddTabstop(0, 100);
+		REQUIRE(100 == lt.GetNextTabstop(0, 0));
+		REQUIRE(0 == lt.GetNextTabstop(0, 100));
+		lt.ClearTabstops(0);
+		REQUIRE(0 == lt.GetNextTabstop(0, 0));
+	}
+
+	SECTION("InsertRemoveLine") {
+		lt.AddTabstop(0, 100);
+		lt.AddTabstop(1, 200);
+		lt.InsertLine(1);
+		REQUIRE(100 == lt.GetNextTabstop(0, 0));
+		REQUIRE(0 == lt.GetNextTabstop(1, 0));
+		REQUIRE(200 == lt.GetNextTabstop(2, 0));
+		lt.RemoveLine(1);
+		REQUIRE(100 == lt.GetNextTabstop(0, 0));
+		REQUIRE(200 == lt.GetNextTabstop(1, 0));
+		lt.InsertLines(1, 2);
+		REQUIRE(100 == lt.GetNextTabstop(0, 0));
+		REQUIRE(0 == lt.GetNextTabstop(1, 0));
+		REQUIRE(0 == lt.GetNextTabstop(2, 0));
+		REQUIRE(200 == lt.GetNextTabstop(3, 0));
+		lt.Init();
+		REQUIRE(0 == lt.GetNextTabstop(0, 0));
+	}
+}
diff --git a/scite-app/scintilla/test/unit/testRESearch.cxx b/scite-app/scintilla/test/unit/testRESearch.cxx
new file mode 100644
index 0000000..0dadc21
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testRESearch.cxx
@@ -0,0 +1,77 @@
+/** @file testRESearch.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "CellBuffer.h"
+#include "CharClassify.h"
+#include "RESearch.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+class StringCI : public CharacterIndexer {
+	std::string s;
+public:
+	StringCI(std::string_view sv_) : s(sv_) {
+	}
+	Sci::Position Length() const noexcept {
+		return s.length();
+	}
+	char CharAt(Sci::Position index) const override {
+		return s.at(index);
+	}
+};
+
+// Test RESearch.
+
+TEST_CASE("RESearch") {
+
+	CharClassify cc;
+	const char sTextSpace[] = "Scintilla ";
+	const char pattern[] = "[a-z]+";
+
+	SECTION("Compile") {
+		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
+		const char *msg = re->Compile(pattern, strlen(pattern), true, false);
+		REQUIRE(nullptr == msg);
+	}
+
+	SECTION("Execute") {
+		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
+		re->Compile(pattern, strlen(pattern), true, false);
+		StringCI sci(sTextSpace);
+		const int x = re->Execute(sci, 0, sci.Length());
+		REQUIRE(x == 1);
+		REQUIRE(re->bopat[0] == 1);
+		REQUIRE(re->eopat[0] == sci.Length() - 1);
+	}
+
+	SECTION("Grab") {
+		std::unique_ptr<RESearch> re = std::make_unique<RESearch>(&cc);
+		re->Compile(pattern, strlen(pattern), true, false);
+		StringCI sci(sTextSpace);
+		re->Execute(sci, 0, sci.Length());
+		re->GrabMatches(sci);
+		REQUIRE(re->pat[0] == "cintilla");
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testRunStyles.cxx b/scite-app/scintilla/test/unit/testRunStyles.cxx
new file mode 100644
index 0000000..92e6b9a
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testRunStyles.cxx
@@ -0,0 +1,335 @@
+/** @file testRunStyles.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test RunStyles.
+
+namespace Scintilla::Internal {	// Xcode clang 9.0 doesn't like this when in the unnamed namespace
+	bool operator==(const FillResult<int> &fra, const FillResult<int> &frb) {
+		return fra.changed == frb.changed &&
+			fra.position == frb.position &&
+			fra.fillLength == frb.fillLength;
+	}
+}
+
+TEST_CASE("RunStyles") {
+
+	RunStyles<int, int> rs;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+	}
+
+	SECTION("SimpleInsert") {
+		rs.InsertSpace(0, 1);
+		REQUIRE(1 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+		REQUIRE(0 == rs.ValueAt(0));
+		REQUIRE(1 == rs.FindNextChange(0, rs.Length()));
+		REQUIRE(2 == rs.FindNextChange(1, rs.Length()));
+	}
+
+	SECTION("TwoRuns") {
+		rs.InsertSpace(0, 2);
+		REQUIRE(2 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+		rs.SetValueAt(0, 2);
+		REQUIRE(2 == rs.Runs());
+		REQUIRE(2 == rs.ValueAt(0));
+		REQUIRE(0 == rs.ValueAt(1));
+		REQUIRE(1 == rs.FindNextChange(0, rs.Length()));
+		REQUIRE(2 == rs.FindNextChange(1, rs.Length()));
+		REQUIRE(3 == rs.FindNextChange(2, rs.Length()));
+	}
+
+	SECTION("LongerRuns") {
+		rs.InsertSpace(0, 5);
+		rs.SetValueAt(0, 3);
+		rs.SetValueAt(1, 3);
+		REQUIRE(3 == rs.ValueAt(0));
+		REQUIRE(3 == rs.ValueAt(1));
+		REQUIRE(0 == rs.ValueAt(2));
+		REQUIRE(2 == rs.Runs());
+
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(2 == rs.EndRun(0));
+
+		REQUIRE(0 == rs.StartRun(1));
+		REQUIRE(2 == rs.EndRun(1));
+
+		REQUIRE(2 == rs.StartRun(2));
+		REQUIRE(5 == rs.EndRun(2));
+
+		REQUIRE(2 == rs.StartRun(3));
+		REQUIRE(5 == rs.EndRun(3));
+
+		REQUIRE(2 == rs.StartRun(4));
+		REQUIRE(5 == rs.EndRun(4));
+
+		// At end
+		REQUIRE(2 == rs.StartRun(5));
+		REQUIRE(5 == rs.EndRun(5));
+
+		// After end is same as end
+		REQUIRE(2 == rs.StartRun(6));
+		REQUIRE(5 == rs.EndRun(6));
+
+		REQUIRE(2 == rs.FindNextChange(0, rs.Length()));
+		REQUIRE(5 == rs.FindNextChange(2, rs.Length()));
+		REQUIRE(6 == rs.FindNextChange(5, rs.Length()));
+	}
+
+	SECTION("FillRange") {
+		rs.InsertSpace(0, 5);
+		int startFill = 1;
+		int lengthFill = 3;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 3} == fr);
+
+		REQUIRE(0 == rs.ValueAt(0));
+		REQUIRE(99 == rs.ValueAt(1));
+		REQUIRE(99 == rs.ValueAt(2));
+		REQUIRE(99 == rs.ValueAt(3));
+		REQUIRE(0 == rs.ValueAt(4));
+
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(1 == rs.EndRun(0));
+
+		REQUIRE(1 == rs.StartRun(1));
+		REQUIRE(4 == rs.EndRun(1));
+	}
+
+	SECTION("FillRangeAlreadyFilled") {
+		rs.InsertSpace(0, 5);
+		int startFill = 1;
+		int lengthFill = 3;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 3} == fr);
+
+		int startFill2 = 2;
+		int lengthFill2 = 1;
+		// Compiler warnings if 'false' used instead of '0' as expected value:
+		const auto fr2 = rs.FillRange(startFill2, 99, lengthFill2);
+		REQUIRE(FillResult<int>{false, 2, 1} == fr2);
+		REQUIRE(0 == rs.ValueAt(0));
+		REQUIRE(99 == rs.ValueAt(1));
+		REQUIRE(99 == rs.ValueAt(2));
+		REQUIRE(99 == rs.ValueAt(3));
+		REQUIRE(0 == rs.ValueAt(4));
+		REQUIRE(3 == rs.Runs());
+	}
+
+	SECTION("FillRangeAlreadyPartFilled") {
+		rs.InsertSpace(0, 5);
+		int startFill = 1;
+		int lengthFill = 2;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 2} == fr);
+
+		int startFill2 = 2;
+		int lengthFill2 = 2;
+		const auto fr2 = rs.FillRange(startFill2, 99, lengthFill2);
+		REQUIRE(FillResult<int>{true, 3, 1} == fr2);
+		REQUIRE(3 == rs.Runs());
+	}
+
+	SECTION("DeleteRange") {
+		rs.InsertSpace(0, 5);
+		rs.SetValueAt(0, 3);
+		REQUIRE(2 == rs.Runs());
+		rs.SetValueAt(1, 3);
+		REQUIRE(2 == rs.Runs());
+		rs.DeleteRange(1, 1);
+		REQUIRE(4 == rs.Length());
+		REQUIRE(2 == rs.Runs());
+		REQUIRE(3 == rs.ValueAt(0));
+		REQUIRE(0 == rs.ValueAt(1));
+
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(1 == rs.EndRun(0));
+
+		REQUIRE(1 == rs.StartRun(1));
+		REQUIRE(4 == rs.EndRun(1));
+
+		REQUIRE(1 == rs.StartRun(2));
+		REQUIRE(4 == rs.EndRun(2));
+	}
+
+	SECTION("Find") {
+		rs.InsertSpace(0, 5);
+		int startFill = 1;
+		int lengthFill = 3;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 3} == fr);
+
+		REQUIRE(0 == rs.Find(0,0));
+		REQUIRE(1 == rs.Find(99,0));
+		REQUIRE(-1 == rs.Find(3,0));
+
+		REQUIRE(4 == rs.Find(0,1));
+		REQUIRE(1 == rs.Find(99,1));
+		REQUIRE(-1 == rs.Find(3,1));
+
+		REQUIRE(4 == rs.Find(0,2));
+		REQUIRE(2 == rs.Find(99,2));
+		REQUIRE(-1 == rs.Find(3, 2));
+
+		REQUIRE(4 == rs.Find(0,4));
+		REQUIRE(-1 == rs.Find(99,4));
+		REQUIRE(-1 == rs.Find(3,4));
+
+		REQUIRE(-1 == rs.Find(0,5));
+		REQUIRE(-1 == rs.Find(99,5));
+		REQUIRE(-1 == rs.Find(3,5));
+
+		REQUIRE(-1 == rs.Find(0,6));
+		REQUIRE(-1 == rs.Find(99,6));
+		REQUIRE(-1 == rs.Find(3,6));
+	}
+
+	SECTION("AllSame") {
+		REQUIRE(true == rs.AllSame());
+		rs.InsertSpace(0, 5);
+		REQUIRE(true == rs.AllSame());
+		REQUIRE(false == rs.AllSameAs(88));
+		REQUIRE(true == rs.AllSameAs(0));
+		int startFill = 1;
+		int lengthFill = 3;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(true == fr.changed);
+		REQUIRE(false == rs.AllSame());
+		REQUIRE(false == rs.AllSameAs(88));
+		REQUIRE(false == rs.AllSameAs(0));
+		const auto fr2 = rs.FillRange(startFill, 0, lengthFill);
+		REQUIRE(true == fr2.changed);
+		REQUIRE(true == rs.AllSame());
+		REQUIRE(false == rs.AllSameAs(88));
+		REQUIRE(true == rs.AllSameAs(0));
+	}
+
+	SECTION("FindWithReversion") {
+		rs.InsertSpace(0, 5);
+		REQUIRE(1 == rs.Runs());
+
+		int startFill = 1;
+		int lengthFill = 1;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 1} == fr);
+		REQUIRE(3 == rs.Runs());
+
+		startFill = 2;
+		lengthFill = 1;
+		const auto fr2 = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(FillResult<int>{true, 2, 1} == fr2);
+		REQUIRE(3 == rs.Runs());
+
+		startFill = 1;
+		lengthFill = 1;
+		const auto fr3 = rs.FillRange(startFill, 0, lengthFill);
+		REQUIRE(FillResult<int>{true, 1, 1} == fr3);
+		REQUIRE(3 == rs.Runs());
+
+		startFill = 2;
+		lengthFill = 1;
+		const auto fr4 = rs.FillRange(startFill, 0, lengthFill);
+		REQUIRE(FillResult<int>{true, 2, 1} == fr4);
+		REQUIRE(1 == rs.Runs());
+
+		REQUIRE(-1 == rs.Find(0,6));
+	}
+
+	SECTION("FinalRunInversion") {
+		REQUIRE(1 == rs.Runs());
+		rs.InsertSpace(0, 1);
+		REQUIRE(1 == rs.Runs());
+		rs.SetValueAt(0, 1);
+		REQUIRE(1 == rs.Runs());
+		rs.InsertSpace(1, 1);
+		REQUIRE(1 == rs.Runs());
+		rs.SetValueAt(1, 1);
+		REQUIRE(1 == rs.Runs());
+		rs.SetValueAt(1, 0);
+		REQUIRE(2 == rs.Runs());
+		rs.SetValueAt(1, 1);
+		REQUIRE(1 == rs.Runs());
+	}
+
+	SECTION("DeleteAll") {
+		rs.InsertSpace(0, 5);
+		rs.SetValueAt(0, 3);
+		rs.SetValueAt(1, 3);
+		rs.DeleteAll();
+		REQUIRE(0 == rs.Length());
+		REQUIRE(0 == rs.ValueAt(0));
+		REQUIRE(1 == rs.Runs());
+	}
+
+	SECTION("DeleteSecond") {
+		rs.InsertSpace(0, 3);
+		int startFill = 1;
+		int lengthFill = 1;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(true == fr.changed);
+		REQUIRE(3 == rs.Length());
+		REQUIRE(3 == rs.Runs());
+		rs.DeleteRange(1, 1);
+		REQUIRE(2 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+	}
+
+	SECTION("DeleteEndRun") {
+		rs.InsertSpace(0, 2);
+		int startFill = 1;
+		int lengthFill = 1;
+		const auto fr = rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(true == fr.changed);
+		REQUIRE(2 == rs.Length());
+		REQUIRE(2 == rs.Runs());
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(1 == rs.EndRun(0));
+		REQUIRE(1 == rs.StartRun(1));
+		REQUIRE(2 == rs.EndRun(1));
+		rs.DeleteRange(1, 1);
+		REQUIRE(1 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(1 == rs.EndRun(0));
+		REQUIRE(0 == rs.StartRun(1));
+		REQUIRE(1 == rs.EndRun(1));
+		rs.Check();
+	}
+
+	SECTION("OutsideBounds") {
+		rs.InsertSpace(0, 1);
+		int startFill = 1;
+		int lengthFill = 1;
+		rs.FillRange(startFill, 99, lengthFill);
+		REQUIRE(1 == rs.Length());
+		REQUIRE(1 == rs.Runs());
+		REQUIRE(0 == rs.StartRun(0));
+		REQUIRE(1 == rs.EndRun(0));
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testSparseVector.cxx b/scite-app/scintilla/test/unit/testSparseVector.cxx
new file mode 100644
index 0000000..0bc8f90
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testSparseVector.cxx
@@ -0,0 +1,420 @@
+/** @file testSparseVector.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "SparseVector.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test SparseVector.
+
+// Helper to produce a string representation of a SparseVector<const char *>
+// to simplify checks.
+static std::string Representation(const SparseVector<UniqueString> &st) {
+	std::string ret;
+	for (int i = 0;i <= st.Length();i++) {
+		const char *value = st.ValueAt(i).get();
+		if (value && *value)
+			ret += value;
+		else
+			ret += "-";
+	}
+	return ret;
+}
+
+TEST_CASE("SparseVector") {
+
+	SparseVector<UniqueString> st;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(1 == st.Elements());
+		REQUIRE(0 == st.Length());
+		REQUIRE("-" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertSpace") {
+		st.InsertSpace(0, 5);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(static_cast<const char *>(nullptr) == st.ValueAt(0).get());
+		REQUIRE(static_cast<const char *>(nullptr) == st.ValueAt(1).get());
+		REQUIRE(static_cast<const char *>(nullptr) == st.ValueAt(4).get());
+		st.Check();
+	}
+
+	SECTION("InsertValue") {
+		st.InsertSpace(0, 5);
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("---3--" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertAndChangeAndDeleteValue") {
+		st.InsertSpace(0, 5);
+		REQUIRE(5 == st.Length());
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE(2 == st.Elements());
+		st.SetValueAt(3, UniqueStringCopy("4"));
+		REQUIRE(2 == st.Elements());
+		st.DeletePosition(3);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(4 == st.Length());
+		REQUIRE("-----" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertAndDeleteAtStart") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(0, UniqueStringCopy("3"));
+		REQUIRE(1 == st.Elements());
+		REQUIRE("3-----" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("-----" == Representation(st));
+		st.SetValueAt(0, UniqueStringCopy("4"));
+		REQUIRE(1 == st.Elements());
+		REQUIRE("4----" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("----" == Representation(st));
+		st.SetValueAt(0, UniqueStringCopy("4"));
+		REQUIRE(1 == st.Elements());
+		REQUIRE("4---" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("---" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertStringAtStartThenInsertSpaceAtStart") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(0, UniqueStringCopy("3"));
+		REQUIRE(1 == st.Elements());
+		REQUIRE("3-----" == Representation(st));
+		st.InsertSpace(0, 1);
+		REQUIRE(2 == st.Elements());
+		REQUIRE("-3-----" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertSpaceAfterStart") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(1, UniqueStringCopy("1"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("-1----" == Representation(st));
+		st.InsertSpace(1, 1);
+		REQUIRE(2 == st.Elements());
+		REQUIRE("--1----" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertStringAt1ThenInsertLettersAt1") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(1, UniqueStringCopy("9"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("-9----" == Representation(st));
+		st.InsertSpace(0, 1);
+		REQUIRE(2 == st.Elements());
+		REQUIRE("--9----" == Representation(st));
+		// Initial st has allocation of 9 values so this should cause reallocation
+		const std::string letters("ABCDEFGHIJKLMNOP");	// 16 letters
+		for (const char letter : letters) {
+			const char sLetter[] = { letter, 0 };
+			st.InsertSpace(0, 1);
+			st.SetValueAt(1, UniqueStringCopy(sLetter));
+		}
+		REQUIRE("-PONMLKJIHGFEDCBA-9----" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("InsertAndDeleteAtEnd") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(4, UniqueStringCopy("5"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("----5-" == Representation(st));
+		st.SetValueAt(5, UniqueStringCopy("6"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("----56" == Representation(st));
+		st.DeletePosition(4);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("----6" == Representation(st));
+		st.SetValueAt(4, UniqueStringCopy("7"));
+		REQUIRE(1 == st.Elements());
+		REQUIRE("----7" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("SetNULL") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 5);
+		st.SetValueAt(4, UniqueStringCopy("5"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("----5-" == Representation(st));
+		st.SetValueAt(4, nullptr);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("------" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("CheckDeletionLeavesOrdered") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 1);
+		st.SetValueAt(0, UniqueStringCopy("1"));
+		REQUIRE("1-" == Representation(st));
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(1, 1);
+		st.SetValueAt(1, UniqueStringCopy("2"));
+		REQUIRE("12-" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE("2-" == Representation(st));
+		REQUIRE(1 == st.Elements());
+		st.DeletePosition(0);
+		REQUIRE("-" == Representation(st));
+	}
+
+	SECTION("DeleteAll") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 10);
+		st.SetValueAt(9, UniqueStringCopy("9"));
+		st.SetValueAt(7, UniqueStringCopy("7"));
+		st.SetValueAt(4, UniqueStringCopy("4"));
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE(5 == st.Elements());
+		REQUIRE("---34--7-9-" == Representation(st));
+		st.Check();
+	}
+
+	SECTION("DeleteStarting") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 2);
+		st.SetValueAt(0, UniqueStringCopy("1"));
+		st.SetValueAt(1, UniqueStringCopy("2"));
+		REQUIRE("12-" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE("2-" == Representation(st));
+		st.DeletePosition(0);
+		REQUIRE("-" == Representation(st));
+	}
+
+	SECTION("DeleteRange") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 10);
+		st.SetValueAt(9, UniqueStringCopy("9"));
+		st.SetValueAt(7, UniqueStringCopy("7"));
+		st.SetValueAt(4, UniqueStringCopy("4"));
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE(5 == st.Elements());
+		REQUIRE(10 == st.Length());
+		REQUIRE("---34--7-9-" == Representation(st));
+		// Delete in space
+		st.DeleteRange(1, 1);
+		REQUIRE(5 == st.Elements());
+		REQUIRE(9 == st.Length());
+		REQUIRE("--34--7-9-" == Representation(st));
+		// Delete 2 values
+		st.DeleteRange(3, 4);
+		REQUIRE(3 == st.Elements());
+		REQUIRE(5 == st.Length());
+		REQUIRE("--3-9-" == Representation(st));
+		// Deletion at start
+		st.DeleteRange(0, 1);
+		REQUIRE(3 == st.Elements());
+		REQUIRE(4 == st.Length());
+		REQUIRE("-3-9-" == Representation(st));
+	}
+
+	SECTION("DeleteRangeAtEnds") {
+		// There are always elements at start and end although they can be nulled
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 4);
+		REQUIRE(4 == st.Length());
+		st.SetValueAt(1, UniqueStringCopy("3"));
+		st.SetValueAt(4, UniqueStringCopy("9"));
+		REQUIRE("-3--9" == Representation(st));
+		REQUIRE(2 == st.Elements());
+		// Empty deletion at end -> no effect
+		st.DeleteRange(4, 0);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(4 == st.Length());
+		REQUIRE("-3--9" == Representation(st));
+		// Delete value at start
+		st.InsertSpace(0, 1);
+		st.SetValueAt(0, UniqueStringCopy("0"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE(5 == st.Length());
+		REQUIRE("0-3--9" == Representation(st));
+		st.DeleteRange(0, 1);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(4 == st.Length());
+		REQUIRE("03--9" == Representation(st));
+		// Empty deletion at start -> no effect
+		st.InsertSpace(0, 1);
+		st.SetValueAt(0, UniqueStringCopy("1"));
+		REQUIRE(3 == st.Elements());
+		REQUIRE(5 == st.Length());
+		REQUIRE("103--9" == Representation(st));
+		st.DeleteRange(0, 0);
+		REQUIRE(3 == st.Elements());
+		REQUIRE(5 == st.Length());
+		REQUIRE("103--9" == Representation(st));
+	}
+
+	SECTION("DeleteStartingRange") {
+		REQUIRE(1 == st.Elements());
+		st.InsertSpace(0, 2);
+		st.SetValueAt(0, UniqueStringCopy("1"));
+		st.SetValueAt(1, UniqueStringCopy("2"));
+		REQUIRE(2 == st.Length());
+		REQUIRE("12-" == Representation(st));
+		st.DeleteRange(0,1);
+		REQUIRE(1 == st.Length());
+		REQUIRE("2-" == Representation(st));
+		st.DeleteRange(0,1);
+		REQUIRE(0 == st.Length());
+		REQUIRE("-" == Representation(st));
+		st.InsertSpace(0, 2);
+		st.SetValueAt(1, UniqueStringCopy("1"));
+		REQUIRE(2 == st.Length());
+		REQUIRE("-1-" == Representation(st));
+		st.DeleteRange(0, 2);
+		REQUIRE("-" == Representation(st));
+		st.InsertSpace(0, 4);
+		st.SetValueAt(1, UniqueStringCopy("1"));
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE(4 == st.Length());
+		REQUIRE("-1-3-" == Representation(st));
+		st.DeleteRange(0, 3);
+		REQUIRE("3-" == Representation(st));
+		st.DeleteRange(0, 1);
+		REQUIRE("-" == Representation(st));
+		st.InsertSpace(0, 4);
+		st.SetValueAt(1, UniqueStringCopy("1"));
+		st.SetValueAt(4, UniqueStringCopy("4"));
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE("-1-34" == Representation(st));
+		st.DeleteRange(1, 3);
+		REQUIRE("-4" == Representation(st));
+		st.InsertSpace(1, 3);
+		REQUIRE("----4" == Representation(st));
+		st.SetValueAt(4, UniqueStringCopy("4"));
+		st.SetValueAt(3, UniqueStringCopy("3"));
+		REQUIRE("---34" == Representation(st));
+		st.DeleteRange(1, 3);
+		REQUIRE("-4" == Representation(st));
+	}
+}
+
+TEST_CASE("SparseTextInt") {
+
+	SparseVector<int> st;
+
+	SECTION("InsertAndDeleteValue") {
+		st.InsertSpace(0, 5);
+		st.SetValueAt(3, 3);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(0 == st.ValueAt(0));
+		REQUIRE(0 == st.ValueAt(1));
+		REQUIRE(0 == st.ValueAt(2));
+		REQUIRE(3 == st.ValueAt(3));
+		REQUIRE(0 == st.ValueAt(4));
+		st.SetValueAt(3, -3);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(0 == st.ValueAt(0));
+		REQUIRE(0 == st.ValueAt(1));
+		REQUIRE(0 == st.ValueAt(2));
+		REQUIRE(-3 == st.ValueAt(3));
+		REQUIRE(0 == st.ValueAt(4));
+		st.SetValueAt(3, 0);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(0 == st.ValueAt(0));
+		REQUIRE(0 == st.ValueAt(1));
+		REQUIRE(0 == st.ValueAt(2));
+		REQUIRE(0 == st.ValueAt(3));
+		REQUIRE(0 == st.ValueAt(4));
+		st.Check();
+	}
+
+	SECTION("IndexAfter") {
+		st.InsertSpace(0, 5);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(0 == st.IndexAfter(-1));
+		REQUIRE(0 == st.PositionOfElement(0));
+		REQUIRE(1 == st.IndexAfter(0));
+		REQUIRE(5 == st.PositionOfElement(1));
+		st.SetValueAt(3, 3);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(0 == st.IndexAfter(-1));
+		REQUIRE(0 == st.PositionOfElement(0));
+		REQUIRE(1 == st.IndexAfter(0));
+		REQUIRE(3 == st.PositionOfElement(1));
+		REQUIRE(2 == st.IndexAfter(3));
+		REQUIRE(5 == st.PositionOfElement(2));
+	}
+}
+
+TEST_CASE("SparseTextString") {
+
+	SparseVector<std::string> st;
+
+	SECTION("InsertAndDeleteValue") {
+		st.InsertSpace(0, 5);
+		REQUIRE(5 == st.Length());
+		st.SetValueAt(3, std::string("3"));
+		REQUIRE(2 == st.Elements());
+		REQUIRE("" == st.ValueAt(0));
+		REQUIRE("" == st.ValueAt(2));
+		REQUIRE("3" == st.ValueAt(3));
+		REQUIRE("" == st.ValueAt(4));
+		st.DeletePosition(0);
+		REQUIRE(4 == st.Length());
+		REQUIRE("3" == st.ValueAt(2));
+		st.DeletePosition(2);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(3 == st.Length());
+		REQUIRE("" == st.ValueAt(0));
+		REQUIRE("" == st.ValueAt(1));
+		REQUIRE("" == st.ValueAt(2));
+		st.Check();
+	}
+
+	SECTION("SetAndMoveString") {
+		st.InsertSpace(0, 2);
+		REQUIRE(2u == st.Length());
+		std::string s24("24");
+		st.SetValueAt(0, s24);
+		REQUIRE("24" == s24);	// Not moved from
+		REQUIRE("" == st.ValueAt(-1));
+		REQUIRE("24" == st.ValueAt(0));
+		REQUIRE("" == st.ValueAt(1));
+		std::string s25("25");
+		st.SetValueAt(1, std::move(s25));
+		REQUIRE("" == s25);	// moved from
+		REQUIRE("25" == st.ValueAt(1));
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testSplitVector.cxx b/scite-app/scintilla/test/unit/testSplitVector.cxx
new file mode 100644
index 0000000..aa855f1
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testSplitVector.cxx
@@ -0,0 +1,358 @@
+/** @file testSplitVector.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstddef>
+#include <cstring>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test SplitVector.
+
+struct StringSetHolder {
+	SplitVector<std::string> sa;
+	bool Check() const noexcept {
+		for (int i = 0; i < sa.Length(); i++) {
+			if (sa[i].empty()) {
+				return false;
+			}
+		}
+		return true;
+	}
+};
+
+constexpr int lengthTestArray = 4;
+static const int testArray[4] = {3, 4, 5, 6};
+
+TEST_CASE("SplitVector") {
+
+	SplitVector<int> sv;
+
+	SECTION("IsEmptyInitially") {
+		REQUIRE(0 == sv.Length());
+	}
+
+	SECTION("InsertOne") {
+		sv.InsertValue(0, 10, 0);
+		sv.Insert(5, 3);
+		REQUIRE(11 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i == 5) ? 3 : 0) == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("Insertion") {
+		sv.InsertValue(0, 10, 0);
+		REQUIRE(10 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(0 == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("InsertionString") {
+		// This test failed an earlier version of SplitVector that copied backwards incorrectly
+		StringSetHolder ssh;
+		ssh.sa.Insert(0, "Alpha");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Beta");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Cat");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Dog");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Elephant");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Fox");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Grass");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Hat");
+		REQUIRE(ssh.Check());
+		ssh.sa.Delete(4);
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Indigo");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Jackal");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Kanga");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Lion");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(0, "Mango");
+		REQUIRE(ssh.Check());
+		ssh.sa.Insert(1, "Neon");
+		REQUIRE(ssh.Check());
+	}
+
+	SECTION("InsertionPattern") {
+		sv.Insert(0, 1);	// 1
+		sv.Insert(0, 2);	// 21
+		sv.Insert(0, 3);	// 321
+		sv.Insert(1, 4);	// 3421
+		sv.Insert(0, 5);	// 53421
+		sv.Insert(1, 6);	// 563421
+		sv.Insert(0, 7);	// 7563421
+		sv.Insert(1, 8);	// 78563421
+
+		REQUIRE(8 == sv.Length());
+
+		REQUIRE(7 == sv.ValueAt(0));
+		REQUIRE(8 == sv.ValueAt(1));
+		REQUIRE(5 == sv.ValueAt(2));
+		REQUIRE(6 == sv.ValueAt(3));
+		REQUIRE(3 == sv.ValueAt(4));
+		REQUIRE(4 == sv.ValueAt(5));
+		REQUIRE(2 == sv.ValueAt(6));
+		REQUIRE(1 == sv.ValueAt(7));
+
+		sv.Delete(4);	// 7856421
+
+		REQUIRE(7 == sv.Length());
+
+		REQUIRE(7 == sv.ValueAt(0));
+		REQUIRE(8 == sv.ValueAt(1));
+		REQUIRE(5 == sv.ValueAt(2));
+		REQUIRE(6 == sv.ValueAt(3));
+		REQUIRE(4 == sv.ValueAt(4));
+		REQUIRE(2 == sv.ValueAt(5));
+		REQUIRE(1 == sv.ValueAt(6));
+
+		sv.Insert(0, 9);		// 97856421
+		sv.Insert(1, 0xa);	// 9a7856421
+		sv.Insert(0, 0xb);	// b9a7856421
+		sv.Insert(1, 0xc);	// bc9a7856421
+		sv.Insert(0, 0xd);	// dbc9a7856421
+		sv.Insert(1, 0xe);	// debc9a7856421
+
+		REQUIRE(13 == sv.Length());
+
+		REQUIRE(0xd == sv.ValueAt(0));
+		REQUIRE(0xe == sv.ValueAt(1));
+		REQUIRE(0xb == sv.ValueAt(2));
+		REQUIRE(0xc == sv.ValueAt(3));
+		REQUIRE(9 == sv.ValueAt(4));
+		REQUIRE(0xa == sv.ValueAt(5));
+		REQUIRE(7 == sv.ValueAt(6));
+		REQUIRE(8 == sv.ValueAt(7));
+		REQUIRE(5 == sv.ValueAt(8));
+		REQUIRE(6 == sv.ValueAt(9));
+		REQUIRE(4 == sv.ValueAt(10));
+		REQUIRE(2 == sv.ValueAt(11));
+		REQUIRE(1 == sv.ValueAt(12));
+	}
+
+	SECTION("EnsureLength") {
+		sv.EnsureLength(4);
+		REQUIRE(4 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(0 == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("InsertFromArray") {
+		sv.InsertFromArray(0, testArray, 0, lengthTestArray);
+		REQUIRE(lengthTestArray == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE((i+3) == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("InsertEmpty") {
+		sv.InsertEmpty(0, 0);
+		REQUIRE(0 == sv.Length());
+		int *pi = sv.InsertEmpty(0, 2);
+		REQUIRE(2 == sv.Length());
+		REQUIRE(0 == sv.ValueAt(0));
+		REQUIRE(0 == sv.ValueAt(1));
+		pi[0] = 4;
+		pi[1] = 5;
+		REQUIRE(4 == sv.ValueAt(0));
+		REQUIRE(5 == sv.ValueAt(1));
+		pi = sv.InsertEmpty(1, 2);
+		pi[0] = 6;
+		pi[1] = 7;
+		REQUIRE(4 == sv.Length());
+		REQUIRE(4 == sv.ValueAt(0));
+		REQUIRE(6 == sv.ValueAt(1));
+		REQUIRE(7 == sv.ValueAt(2));
+		REQUIRE(5 == sv.ValueAt(3));
+	}
+
+	SECTION("SetValue") {
+		sv.InsertValue(0, 10, 0);
+		sv.SetValueAt(5, 3);
+		REQUIRE(10 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i == 5) ? 3 : 0) == sv.ValueAt(i));
+		}
+		// Move the gap
+		sv.InsertValue(7, 1, 17);
+		REQUIRE(17 == sv.ValueAt(7));
+		REQUIRE(0 == sv.ValueAt(8));
+		// Set after the gap
+		sv.SetValueAt(8, 19);
+		REQUIRE(19 == sv.ValueAt(8));
+	}
+
+	SECTION("Indexing") {
+		sv.InsertValue(0, 10, 0);
+		sv.SetValueAt(5, 3);
+		REQUIRE(10 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i == 5) ? 3 : 0) == sv[i]);
+		}
+}
+
+	SECTION("Fill") {
+		sv.InsertValue(0, 10, 0);
+		REQUIRE(10 == sv.Length());
+		sv.InsertValue(7, 1, 1);
+		REQUIRE(11 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i == 7) ? 1 : 0) == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("DeleteOne") {
+		sv.InsertFromArray(0, testArray, 0, lengthTestArray);
+		sv.Delete(2);
+		REQUIRE((lengthTestArray-1) == sv.Length());
+		REQUIRE(3 == sv[0]);
+		REQUIRE(4 == sv[1]);
+		REQUIRE(6 == sv[2]);
+	}
+
+	SECTION("DeleteRange") {
+		sv.InsertValue(0, 10, 0);
+		REQUIRE(10 == sv.Length());
+		sv.InsertValue(7, 1, 1);
+		REQUIRE(11 == sv.Length());
+		sv.DeleteRange(2, 3);
+		REQUIRE(8 == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i == 4) ? 1 : 0) == sv.ValueAt(i));
+		}
+	}
+
+	SECTION("DeleteAll") {
+		sv.InsertValue(0, 10, 0);
+		sv.InsertValue(7, 1, 1);
+		sv.DeleteRange(2, 3);
+		sv.DeleteAll();
+		REQUIRE(0 == sv.Length());
+	}
+
+	SECTION("GetRange") {
+		sv.InsertValue(0, 10, 0);
+		sv.InsertValue(7, 1, 1);
+		int retrieveArray[11] = {0};
+		sv.GetRange(retrieveArray, 0, 11);
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE(((i==7) ? 1 : 0) == retrieveArray[i]);
+		}
+	}
+
+	SECTION("GetRangeOverGap") {
+		sv.InsertFromArray(0, testArray, 0, lengthTestArray);
+		REQUIRE(lengthTestArray == sv.Length());
+		int retrieveArray[lengthTestArray] = {0};
+		sv.GetRange(retrieveArray, 0, lengthTestArray);
+		for (int i=0; i<sv.Length(); i++) {
+			REQUIRE((i+3) == retrieveArray[i]);
+		}
+	}
+
+	SECTION("ReplaceUp") {
+		// Replace each element by inserting and then deleting the displaced element
+		// This should perform many moves
+		constexpr int testLength=105;
+		sv.EnsureLength(testLength);
+		for (int i=0; i<testLength; i++)
+			sv.SetValueAt(i, i+2);
+		REQUIRE(testLength == sv.Length());
+		for (int i=0; i<sv.Length(); i++) {
+			sv.InsertValue(i, 1, i+9);
+			sv.Delete(i+1);
+		}
+		for (int i=0; i<sv.Length(); i++)
+			REQUIRE((i+9) == sv.ValueAt(i));
+	}
+
+	SECTION("ReplaceDown") {
+		// From the end, replace each element by inserting and then deleting the displaced element
+		// This should perform many moves
+		constexpr int testLength=24;
+		sv.EnsureLength(testLength);
+		for (int i=0; i<testLength; i++)
+			sv.SetValueAt(i, i+12);
+		REQUIRE(testLength == sv.Length());
+		for (ptrdiff_t i=sv.Length()-1; i>=0; i--) {
+			sv.InsertValue(i, 1, static_cast<int>(i+5));
+			sv.Delete(i+1);
+		}
+		for (int i=0; i<sv.Length(); i++)
+			REQUIRE((i+5) == sv.ValueAt(i));
+	}
+
+	SECTION("BufferPointer") {
+		// Low-level access to the data
+		sv.InsertFromArray(0, testArray, 0, lengthTestArray);
+		sv.Insert(0, 99);	// This moves the gap so that BufferPointer() must also move
+		REQUIRE(1 == sv.GapPosition());
+		constexpr int lengthAfterInsertion = 1 + lengthTestArray;
+		REQUIRE(lengthAfterInsertion == (sv.Length()));
+		const int *retrievePointer = sv.BufferPointer();
+		for (int i=1; i<sv.Length(); i++) {
+			REQUIRE((i+3-1) == retrievePointer[i]);
+		}
+		REQUIRE(lengthAfterInsertion == sv.Length());
+		// Gap was moved to end.
+		REQUIRE(lengthAfterInsertion == sv.GapPosition());
+	}
+
+	SECTION("DeleteBackAndForth") {
+		sv.InsertValue(0, 10, 87);
+		for (int i=0; i<10; i+=2) {
+			int len = 10 - i;
+			REQUIRE(len == sv.Length());
+			for (int j=0; j<sv.Length(); j++) {
+				REQUIRE(87 == sv.ValueAt(j));
+			}
+			sv.Delete(len-1);
+			sv.Delete(0);
+		}
+	}
+
+	SECTION("GrowSize") {
+		sv.SetGrowSize(5);
+		REQUIRE(5 == sv.GetGrowSize());
+	}
+
+	SECTION("OutsideBounds") {
+		sv.InsertValue(0, 10, 87);
+		REQUIRE(0 == sv.ValueAt(-1));
+		REQUIRE(0 == sv.ValueAt(10));
+
+		/* Could be a death test as this asserts:
+		sv.SetValueAt(-1,98);
+		sv.SetValueAt(10,99);
+		REQUIRE(0 == sv.ValueAt(-1));
+		REQUIRE(0 == sv.ValueAt(10));
+		*/
+	}
+
+}
diff --git a/scite-app/scintilla/test/unit/testUniConversion.cxx b/scite-app/scintilla/test/unit/testUniConversion.cxx
new file mode 100644
index 0000000..5e02255
--- /dev/null
+++ b/scite-app/scintilla/test/unit/testUniConversion.cxx
@@ -0,0 +1,361 @@
+/** @file testUniConversion.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+#include <cstring>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <algorithm>
+#include <memory>
+
+#include "Debugging.h"
+
+#include "UniConversion.h"
+
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Test UniConversion.
+// Use examples from Wikipedia:
+// https://en.wikipedia.org/wiki/UTF-8
+
+TEST_CASE("UTF16Length") {
+
+	SECTION("UTF16Length ASCII") {
+		// Latin Small Letter A
+		const char *s = "a";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 1U);
+	}
+
+	SECTION("UTF16Length Example1") {
+		// Dollar Sign
+		const char *s = "\x24";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 1U);
+	}
+
+	SECTION("UTF16Length Example2") {
+		// Cent Sign
+		const char *s = "\xC2\xA2";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 1U);
+	}
+
+	SECTION("UTF16Length Example3") {
+		// Euro Sign
+		const char *s = "\xE2\x82\xAC";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 1U);
+	}
+
+	SECTION("UTF16Length Example4") {
+		// Gothic Letter Hwair
+		const char *s = "\xF0\x90\x8D\x88";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 2U);
+	}
+
+	SECTION("UTF16Length Invalid Trail byte in lead position") {
+		const char *s = "a\xB5yz";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 4U);
+	}
+
+	SECTION("UTF16Length Invalid Lead byte at end") {
+		const char *s = "a\xC2";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 2U);
+	}
+
+	SECTION("UTF16Length Invalid Lead byte implies 3 trails but only 2") {
+		const char *s = "a\xF1yz";
+		size_t len = UTF16Length(s);
+		REQUIRE(len == 2U);
+	}
+}
+
+TEST_CASE("UniConversion") {
+
+	// UnicodeFromUTF8
+
+	SECTION("UnicodeFromUTF8 ASCII") {
+		const unsigned char s[]={'a', 0, 0, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 'a');
+	}
+
+	SECTION("UnicodeFromUTF8 Example1") {
+		const unsigned char s[]={0x24, 0, 0, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x24);
+	}
+
+	SECTION("UnicodeFromUTF8 Example2") {
+		const unsigned char s[]={0xC2, 0xA2, 0, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0xA2);
+	}
+
+	SECTION("UnicodeFromUTF8 Example3") {
+		const unsigned char s[]={0xE2, 0x82, 0xAC, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x20AC);
+	}
+
+	SECTION("UnicodeFromUTF8 Example4") {
+		const unsigned char s[]={0xF0, 0x90, 0x8D, 0x88, 0};
+		REQUIRE(UnicodeFromUTF8(s) == 0x10348);
+	}
+
+	// UTF16FromUTF8
+
+	SECTION("UTF16FromUTF8 ASCII") {
+		const char s[] = {'a', 0};
+		wchar_t tbuf[1] = {0};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 'a');
+	}
+
+	SECTION("UTF16FromUTF8 Example1") {
+		const char s[] = {'\x24', 0};
+		wchar_t tbuf[1] = {0};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0x24);
+	}
+
+	SECTION("UTF16FromUTF8 Example2") {
+		const char s[] = {'\xC2', '\xA2', 0};
+		wchar_t tbuf[1] = {0};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0xA2);
+	}
+
+	SECTION("UTF16FromUTF8 Example3") {
+		const char s[] = {'\xE2', '\x82', '\xAC', 0};
+		wchar_t tbuf[1] = {0};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 1);;
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0x20AC);
+	}
+
+	SECTION("UTF16FromUTF8 Example4") {
+		const char s[] = {'\xF0', '\x90', '\x8D', '\x88', 0};
+		wchar_t tbuf[2] = {0, 0};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 2);
+		REQUIRE(tlen == 2U);
+		REQUIRE(tbuf[0] == 0xD800);
+		REQUIRE(tbuf[1] == 0xDF48);
+	}
+
+	SECTION("UTF16FromUTF8 Invalid Trail byte in lead position") {
+		const char s[] = "a\xB5yz";
+		wchar_t tbuf[4] = {};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 4);
+		REQUIRE(tlen == 4U);
+		REQUIRE(tbuf[0] == 'a');
+		REQUIRE(tbuf[1] == 0xB5);
+		REQUIRE(tbuf[2] == 'y');
+		REQUIRE(tbuf[3] == 'z');
+	}
+
+	SECTION("UTF16FromUTF8 Invalid Lead byte at end") {
+		const char s[] = "a\xC2";
+		wchar_t tbuf[2] = {};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 2);
+		REQUIRE(tlen == 2U);
+		REQUIRE(tbuf[0] == 'a');
+		REQUIRE(tbuf[1] == 0xC2);
+	}
+
+	SECTION("UTF16FromUTF8 Invalid Lead byte implies 3 trails but only 2") {
+		const char *s = "a\xF1yz";
+		wchar_t tbuf[4] = {};
+		size_t tlen = UTF16FromUTF8(s, tbuf, 4);
+		REQUIRE(tlen == 2U);
+		REQUIRE(tbuf[0] == 'a');
+		REQUIRE(tbuf[1] == 0xF1);
+	}
+
+	// UTF32FromUTF8
+
+	SECTION("UTF32FromUTF8 ASCII") {
+		const char s[] = {'a', 0};
+		unsigned int tbuf[1] = {0};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == static_cast<unsigned int>('a'));
+	}
+
+	SECTION("UTF32FromUTF8 Example1") {
+		const char s[] = {'\x24', 0};
+		unsigned int tbuf[1] = {0};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0x24);
+	}
+
+	SECTION("UTF32FromUTF8 Example2") {
+		const char s[] = {'\xC2', '\xA2', 0};
+		unsigned int tbuf[1] = {0};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0xA2);
+	}
+
+	SECTION("UTF32FromUTF8 Example3") {
+		const char s[] = {'\xE2', '\x82', '\xAC', 0};
+		unsigned int tbuf[1] = {0};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0x20AC);
+	}
+
+	SECTION("UTF32FromUTF8 Example4") {
+		const char s[] = {'\xF0', '\x90', '\x8D', '\x88', 0};
+		unsigned int tbuf[1] = {0};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 1);
+		REQUIRE(tlen == 1U);
+		REQUIRE(tbuf[0] == 0x10348);
+	}
+
+	SECTION("UTF32FromUTF8 Invalid Trail byte in lead position") {
+		const char s[] = "a\xB5yz";
+		unsigned int tbuf[4] = {};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 4);
+		REQUIRE(tlen == 4U);
+		REQUIRE(tbuf[0] == static_cast<unsigned int>('a'));
+		REQUIRE(tbuf[1] == 0xB5);
+		REQUIRE(tbuf[2] == static_cast<unsigned int>('y'));
+		REQUIRE(tbuf[3] == static_cast<unsigned int>('z'));
+	}
+
+	SECTION("UTF32FromUTF8 Invalid Lead byte at end") {
+		const char s[] = "a\xC2";
+		unsigned int tbuf[2] = {};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 2);
+		REQUIRE(tlen == 2U);
+		REQUIRE(tbuf[0] == static_cast<unsigned int>('a'));
+		REQUIRE(tbuf[1] == 0xC2);
+	}
+
+	SECTION("UTF32FromUTF8 Invalid Lead byte implies 3 trails but only 2") {
+		const char *s = "a\xF1yz";
+		unsigned int tbuf[4] = {};
+		size_t tlen = UTF32FromUTF8(s, tbuf, 4);
+		REQUIRE(tlen == 2U);
+		REQUIRE(tbuf[0] == static_cast<unsigned int>('a'));
+		REQUIRE(tbuf[1] == 0xF1);
+	}
+}
+
+namespace {
+
+// Simple adapter to avoid casting
+int UTFClass(const char *s) noexcept {
+	return UTF8Classify(reinterpret_cast<const unsigned char *>(s), static_cast<int>(strlen(s)));
+}
+
+}
+
+TEST_CASE("UTF8Classify") {
+
+	// These tests are supposed to hit every return statement in UTF8Classify in order
+	// with some hit multiple times.
+
+	// Single byte
+
+	SECTION("UTF8Classify Simple ASCII") {
+		REQUIRE(UTFClass("a") == 1);
+	}
+	SECTION("UTF8Classify Invalid Too large lead") {
+		REQUIRE(UTFClass("\xF5") == (1|UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify Overlong") {
+		REQUIRE(UTFClass("\xC0\x80") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify single trail byte") {
+		REQUIRE(UTFClass("\x80") == (1 | UTF8MaskInvalid));
+	}
+
+	// Invalid length tests
+
+	SECTION("UTF8Classify 2 byte lead, string less than 2 long") {
+		REQUIRE(UTFClass("\xD0") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 3 byte lead, string less than 3 long") {
+		REQUIRE(UTFClass("\xEF") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte lead, string less than 4 long") {
+		REQUIRE(UTFClass("\xF0") == (1 | UTF8MaskInvalid));
+	}
+
+	// Invalid first trail byte tests
+
+	SECTION("UTF8Classify 2 byte lead trail is invalid") {
+		REQUIRE(UTFClass("\xD0q") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 3 byte lead invalid trails") {
+		REQUIRE(UTFClass("\xE2qq") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte bad trails") {
+		REQUIRE(UTFClass("\xF0xyz") == (1 | UTF8MaskInvalid));
+	}
+
+	// 2 byte lead
+
+	SECTION("UTF8Classify 2 byte valid character") {
+		REQUIRE(UTFClass("\xD0\x80") == 2);
+	}
+
+	// 3 byte lead
+
+	SECTION("UTF8Classify 3 byte lead, overlong") {
+		REQUIRE(UTFClass("\xE0\x80\xAF") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 3 byte lead, surrogate") {
+		REQUIRE(UTFClass("\xED\xA0\x80") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify FFFE non-character") {
+		REQUIRE(UTFClass("\xEF\xBF\xBE") == (3 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify FFFF non-character") {
+		REQUIRE(UTFClass("\xEF\xBF\xBF") == (3 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify FDD0 non-character") {
+		REQUIRE(UTFClass("\xEF\xB7\x90") == (3 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 3 byte valid character") {
+		REQUIRE(UTFClass("\xE2\x82\xAC") == 3);
+	}
+
+	// 4 byte lead
+
+	SECTION("UTF8Classify 1FFFF non-character") {
+		REQUIRE(UTFClass("\xF0\x9F\xBF\xBF") == (4 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 1 Greater than max Unicode 110000") {
+		// Maximum Unicode value is 10FFFF so 110000 is out of range
+		REQUIRE(UTFClass("\xF4\x90\x80\x80") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte overlong") {
+		REQUIRE(UTFClass("\xF0\x80\x80\x80") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte valid character") {
+		REQUIRE(UTFClass("\xF0\x9F\x8C\x90") == 4);
+	}
+
+	// Invalid 2nd or 3rd continuation bytes
+	SECTION("UTF8Classify 3 byte lead invalid 2nd trail") {
+		REQUIRE(UTFClass("\xE2\x82q") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte lead invalid 2nd trail") {
+		REQUIRE(UTFClass("\xF0\x9Fq\x9F") == (1 | UTF8MaskInvalid));
+	}
+	SECTION("UTF8Classify 4 byte lead invalid 3rd trail") {
+		REQUIRE(UTFClass("\xF0\x9F\x9Fq") == (1 | UTF8MaskInvalid));
+	}
+}
diff --git a/scite-app/scintilla/test/unit/unitTest.cxx b/scite-app/scintilla/test/unit/unitTest.cxx
new file mode 100644
index 0000000..c629b6b
--- /dev/null
+++ b/scite-app/scintilla/test/unit/unitTest.cxx
@@ -0,0 +1,75 @@
+/** @file unitTest.cxx
+ ** Unit Tests for Scintilla internal data structures
+ **/
+
+/*
+    Currently tested:
+        SplitVector
+        Partitioning
+        RunStyles
+        ContractionState
+        CharClassify
+        Decoration
+        DecorationList
+        CellBuffer
+        UniConversion
+
+    To do:
+        PerLine *
+        Range
+        StyledText
+        CaseFolder ...
+        Document
+        RESearch
+        Selection
+        Style
+
+        lexlib:
+        Accessor
+        LexAccessor
+        CharacterSet
+        OptionSet
+        PropSetSimple
+        StyleContext
+*/
+
+#include <cstdio>
+#include <cstdarg>
+
+#include <string_view>
+#include <vector>
+#include <optional>
+#include <memory>
+
+#include "Debugging.h"
+
+#if defined(__GNUC__)
+// Want to avoid misleading indentation warnings in catch.hpp but the pragma
+// may not be available so protect by turning off pragma warnings
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wpragmas"
+#if !defined(__clang__)
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+#endif
+
+#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+#include "catch.hpp"
+
+using namespace Scintilla::Internal;
+
+// Needed for PLATFORM_ASSERT in code being tested
+
+void Platform::Assert(const char *c, const char *file, int line) noexcept {
+	fprintf(stderr, "Assertion [%s] failed at %s %d\n", c, file, line);
+	abort();
+}
+
+void Platform::DebugPrintf(const char *format, ...) noexcept {
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer, format, pArguments);
+	va_end(pArguments);
+	fprintf(stderr, "%s", buffer);
+}
diff --git a/scite-app/scintilla/test/win32Tests.py b/scite-app/scintilla/test/win32Tests.py
new file mode 100644
index 0000000..d47ed66
--- /dev/null
+++ b/scite-app/scintilla/test/win32Tests.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 2.7 or later
+
+# These are tests that run only on Win32 as they use Win32 SendMessage call
+# to send WM_* messages to Scintilla that are not implemented on other platforms.
+# These help Scintilla behave like a Win32 text control and can help screen readers,
+# for example.
+
+from __future__ import with_statement
+from __future__ import unicode_literals
+
+import codecs, ctypes, os, sys, unittest
+
+from MessageNumbers import msgs, sgsm
+
+import ctypes
+user32 = ctypes.windll.user32
+
+import XiteWin as Xite
+
+class TestWins(unittest.TestCase):
+
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.sciHwnd = self.xite.sciHwnd
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.SetCodePage(0)
+		self.ed.SetStatus(0)
+
+	# Helper methods
+
+	def Send(self, msg, w, l):
+		return user32.SendMessageW(self.sciHwnd, msgs[msg], w, l)
+
+	def GetTextLength(self):
+		return self.Send("WM_GETTEXTLENGTH", 0, 0)
+
+	def GetText(self, n, s):
+		# n = The maximum number of characters to be copied, including the terminating null character.
+		# returns the number of characters copied, not including the terminating null character
+		return self.Send("WM_GETTEXT", n, s)
+
+	def TextValue(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		lenValue = self.GetTextLength()
+		lenValueWithNUL = lenValue + 1
+		value = ctypes.create_unicode_buffer(lenValueWithNUL)
+		lenData = self.GetText(lenValueWithNUL, value)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEquals(lenData, lenValue)
+		return value.value
+
+	def SetText(self, s):
+		return self.Send("WM_SETTEXT", 0, s)
+
+	# Tests
+
+	def testSetText(self):
+		self.SetText(b"ab")
+		self.assertEquals(self.ed.Length, 2)
+
+	def testGetTextLength(self):
+		self.SetText(b"ab")
+		self.assertEquals(self.GetTextLength(), 2)
+
+	def testGetText(self):
+		self.SetText(b"ab")
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(100, data)
+		self.assertEquals(lenData, 2)
+		self.assertEquals(len(data.value), 2)
+		self.assertEquals(data.value, "ab")
+
+	def testGetUTF8Text(self):
+		self.ed.SetCodePage(65001)
+		t = "å"
+		tu8 = t.encode("UTF-8")
+		self.SetText(tu8)
+		value = self.TextValue()
+		self.assertEquals(value, t)
+
+	def testGetBadUTF8Text(self):
+		self.ed.SetCodePage(65001)
+		tu8 = b't\xc2'
+		t = "t\xc2"
+		self.SetText(tu8)
+		value = self.TextValue()
+		self.assertEquals(len(value), 2)
+		self.assertEquals(value, t)
+
+	def testGetJISText(self):
+		self.ed.SetCodePage(932)
+		t = "\N{HIRAGANA LETTER KA}"
+		tu8 = t.encode("shift-jis")
+		self.SetText(tu8)
+		value = self.TextValue()
+		self.assertEquals(len(value), 1)
+		self.assertEquals(value, t)
+
+	def testGetBadJISText(self):
+		self.ed.SetCodePage(932)
+		# This is invalid Shift-JIS, surrounded by []
+		tu8 = b'[\x85\xff]'
+		# Win32 uses Katakana Middle Dot to indicate some invalid Shift-JIS text
+		# At other times \uF8F3 is used which is a private use area character
+		# See https://unicodebook.readthedocs.io/operating_systems.html
+		katakanaMiddleDot = '[\N{KATAKANA MIDDLE DOT}]'
+		privateBad = '[\uf8f3]'
+		self.SetText(tu8)
+		value = self.TextValue()
+		self.assertEquals(len(value), 3)
+		self.assertEquals(value, katakanaMiddleDot)
+		
+		# This is even less valid Shift-JIS
+		tu8 = b'[\xff]'
+		self.SetText(tu8)
+		value = self.TextValue()
+		self.assertEquals(len(value), 3)
+		self.assertEquals(value, privateBad)
+
+	def testGetTextLong(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.SetText(b"ab")
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(4, data)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEquals(lenData, 2)
+		self.assertEquals(data.value, "ab")
+
+	def testGetTextLongNonASCII(self):
+		# With 1 multibyte character in document ask for 4 and ensure 1 character
+		# returned correctly.
+		self.ed.SetCodePage(65001)
+		t = "å"
+		tu8 = t.encode("UTF-8")
+		self.SetText(tu8)
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(4, data)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEquals(lenData, 1)
+		self.assertEquals(data.value, t)
+
+	def testGetTextShort(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.SetText(b"ab")
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(2, data)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.assertEquals(lenData, 1)
+		self.assertEquals(data.value, "a")
+
+	def testGetTextJustNUL(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.SetText(b"ab")
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(1, data)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		#~ print(data)
+		self.assertEquals(lenData, 0)
+		self.assertEquals(data.value, "")
+
+	def testGetTextZeroLength(self):
+		self.assertEquals(self.ed.GetStatus(), 0)
+		self.SetText(b"ab")
+		data = ctypes.create_unicode_buffer(100)
+		lenData = self.GetText(0, data)
+		self.assertEquals(self.ed.GetStatus(), 0)
+		#~ print(data)
+		self.assertEquals(lenData, 0)
+		self.assertEquals(data.value, "")
+
+if __name__ == '__main__':
+	uu = Xite.main("win32Tests")
diff --git a/scite-app/scintilla/test/xite.py b/scite-app/scintilla/test/xite.py
new file mode 100644
index 0000000..9a78dfe
--- /dev/null
+++ b/scite-app/scintilla/test/xite.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 3.6 or later
+
+import XiteWin
+
+if __name__ == "__main__":
+	XiteWin.main("")
diff --git a/scite-app/scintilla/tgzsrc b/scite-app/scintilla/tgzsrc
new file mode 100644
index 0000000..32278f3
--- /dev/null
+++ b/scite-app/scintilla/tgzsrc
@@ -0,0 +1,4 @@
+cd ..
+rm -f scintilla.tgz
+tar --create --exclude \*.o --exclude \*.obj --exclude \*.dll --exclude \*.so --exclude \*.exe --exclude \*.a scintilla/* \
+	| gzip -c >scintilla.tgz
diff --git a/scite-app/scintilla/tgzsrc.orig b/scite-app/scintilla/tgzsrc.orig
new file mode 100644
index 0000000..45e905a
--- /dev/null
+++ b/scite-app/scintilla/tgzsrc.orig
@@ -0,0 +1,3 @@
+cd ..
+rm -f scintilla.tgz
+tar --exclude-from=scintilla/.hgignore --create scintilla/* | gzip -c >scintilla.tgz
diff --git a/scite-app/scintilla/version.txt b/scite-app/scintilla/version.txt
new file mode 100644
index 0000000..c0556fb
--- /dev/null
+++ b/scite-app/scintilla/version.txt
@@ -0,0 +1 @@
+511
diff --git a/scite-app/scintilla/win32/DepGen.py b/scite-app/scintilla/win32/DepGen.py
new file mode 100644
index 0000000..f2cbb48
--- /dev/null
+++ b/scite-app/scintilla/win32/DepGen.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# DepGen.py - produce a make dependencies file for Scintilla
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 3.6 or later
+
+import sys
+
+sys.path.append("..")
+
+from scripts import Dependencies
+
+topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
+
+def Generate():
+	sources = ["../src/*.cxx"]
+	includes = ["../include", "../src"]
+
+	# Create the dependencies file for g++
+	deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sources,  ["../win32"] + includes, ".o", "../win32/")
+
+	Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment)
+
+	# Create the dependencies file for MSVC
+
+	# Place the objects in $(DIR_O) and change extension from ".o" to ".obj"
+	deps = [["$(DIR_O)/"+Dependencies.PathStem(obj)+".obj", headers] for obj, headers in deps]
+
+	Dependencies.UpdateDependencies("../win32/nmdeps.mak", deps, topComment)
+
+if __name__ == "__main__":
+	Generate()
\ No newline at end of file
diff --git a/scite-app/scintilla/win32/HanjaDic.cxx b/scite-app/scintilla/win32/HanjaDic.cxx
new file mode 100644
index 0000000..cf598d6
--- /dev/null
+++ b/scite-app/scintilla/win32/HanjaDic.cxx
@@ -0,0 +1,135 @@
+// Scintilla source code edit control
+/** @file HanjaDic.cxx
+ ** Korean Hanja Dictionary
+ ** Convert between Korean Hanja and Hangul by COM interface.
+ **/
+// Copyright 2015 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string>
+#include <string_view>
+
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <ole2.h>
+
+#include "UniConversion.h"
+#include "HanjaDic.h"
+
+namespace Scintilla::Internal {
+
+namespace HanjaDict {
+
+interface IRadical;
+interface IHanja;
+interface IStrokes;
+
+typedef enum { HANJA_UNKNOWN = 0, HANJA_K0 = 1, HANJA_K1 = 2, HANJA_OTHER = 3 } HANJA_TYPE;
+
+interface IHanjaDic : IUnknown {
+	STDMETHOD(OpenMainDic)();
+	STDMETHOD(CloseMainDic)();
+	STDMETHOD(GetHanjaWords)(BSTR bstrHangul, SAFEARRAY* ppsaHanja, VARIANT_BOOL* pfFound);
+	STDMETHOD(GetHanjaChars)(unsigned short wchHangul, BSTR* pbstrHanjaChars, VARIANT_BOOL* pfFound);
+	STDMETHOD(HanjaToHangul)(BSTR bstrHanja, BSTR* pbstrHangul);
+	STDMETHOD(GetHanjaType)(unsigned short wchHanja, HANJA_TYPE* pHanjaType);
+	STDMETHOD(GetHanjaSense)(unsigned short wchHanja, BSTR* pbstrSense);
+	STDMETHOD(GetRadicalID)(short SeqNumOfRadical, short* pRadicalID, unsigned short* pwchRadical);
+	STDMETHOD(GetRadical)(short nRadicalID, IRadical** ppIRadical);
+	STDMETHOD(RadicalIDToHanja)(short nRadicalID, unsigned short* pwchRadical);
+	STDMETHOD(GetHanja)(unsigned short wchHanja, IHanja** ppIHanja);
+	STDMETHOD(GetStrokes)(short nStrokes, IStrokes** ppIStrokes);
+	STDMETHOD(OpenDefaultCustomDic)();
+	STDMETHOD(OpenCustomDic)(BSTR bstrPath, long* plUdr);
+	STDMETHOD(CloseDefaultCustomDic)();
+	STDMETHOD(CloseCustomDic)(long lUdr);
+	STDMETHOD(CloseAllCustomDics)();
+	STDMETHOD(GetDefaultCustomHanjaWords)(BSTR bstrHangul, SAFEARRAY** ppsaHanja, VARIANT_BOOL* pfFound);
+	STDMETHOD(GetCustomHanjaWords)(long lUdr, BSTR bstrHangul, SAFEARRAY** ppsaHanja, VARIANT_BOOL* pfFound);
+	STDMETHOD(PutDefaultCustomHanjaWord)(BSTR bstrHangul, BSTR bstrHanja);
+	STDMETHOD(PutCustomHanjaWord)(long lUdr, BSTR bstrHangul, BSTR bstrHanja);
+	STDMETHOD(MaxNumOfRadicals)(short* pVal);
+	STDMETHOD(MaxNumOfStrokes)(short* pVal);
+	STDMETHOD(DefaultCustomDic)(long* pVal);
+	STDMETHOD(DefaultCustomDic)(long pVal);
+	STDMETHOD(MaxHanjaType)(HANJA_TYPE* pHanjaType);
+	STDMETHOD(MaxHanjaType)(HANJA_TYPE pHanjaType);
+};
+
+extern "C" const GUID __declspec(selectany) IID_IHanjaDic =
+{ 0xad75f3ac, 0x18cd, 0x48c6, { 0xa2, 0x7d, 0xf1, 0xe9, 0xa7, 0xdc, 0xe4, 0x32 } };
+
+class HanjaDic {
+private:
+	HRESULT hr;
+	CLSID CLSID_HanjaDic;
+
+public:
+	IHanjaDic *HJinterface;
+
+	HanjaDic() : HJinterface(nullptr) {
+		hr = CLSIDFromProgID(OLESTR("mshjdic.hanjadic"), &CLSID_HanjaDic);
+		if (SUCCEEDED(hr)) {
+			hr = CoCreateInstance(CLSID_HanjaDic, nullptr,
+					CLSCTX_INPROC_SERVER, IID_IHanjaDic,
+					(LPVOID *)& HJinterface);
+			if (SUCCEEDED(hr)) {
+				hr = HJinterface->OpenMainDic();
+			}
+		}
+	}
+
+	~HanjaDic() {
+		if (SUCCEEDED(hr)) {
+			hr = HJinterface->CloseMainDic();
+			try {
+				// This can never fail but IUnknown::Release is not marked noexcept.
+				HJinterface->Release();
+			} catch (...) {
+				// Ignore any exception
+			}
+		}
+	}
+
+	bool HJdictAvailable() {
+		return SUCCEEDED(hr);
+	}
+
+	bool IsHanja(int hanja) {
+		HANJA_TYPE hanjaType;
+		hr = HJinterface->GetHanjaType(static_cast<unsigned short>(hanja), &hanjaType);
+		if (SUCCEEDED(hr)) {
+			return (hanjaType > 0);
+		}
+		return false;
+	}
+};
+
+int GetHangulOfHanja(wchar_t *inout) {
+	// Convert every hanja to hangul.
+	// Return the number of characters converted.
+	int changed = 0;
+	HanjaDic dict;
+	if (dict.HJdictAvailable()) {
+		const size_t len = wcslen(inout);
+		wchar_t conv[UTF8MaxBytes] = {0};
+		BSTR bstrHangul = SysAllocString(conv);
+		for (size_t i=0; i<len; i++) {
+			if (dict.IsHanja(static_cast<int>(inout[i]))) { // Pass hanja only!
+				conv[0] = inout[i];
+				BSTR bstrHanja = SysAllocString(conv);
+				const HRESULT hr = dict.HJinterface->HanjaToHangul(bstrHanja, &bstrHangul);
+				if (SUCCEEDED(hr)) {
+					inout[i] = static_cast<wchar_t>(bstrHangul[0]);
+					changed += 1;
+				}
+				SysFreeString(bstrHanja);
+			}
+		}
+		SysFreeString(bstrHangul);
+	}
+	return changed;
+}
+
+}
+}
diff --git a/scite-app/scintilla/win32/HanjaDic.h b/scite-app/scintilla/win32/HanjaDic.h
new file mode 100644
index 0000000..c23abc1
--- /dev/null
+++ b/scite-app/scintilla/win32/HanjaDic.h
@@ -0,0 +1,22 @@
+// Scintilla source code edit control
+/** @file HanjaDic.h
+ ** Korean Hanja Dictionary
+ ** Convert between Korean Hanja and Hangul by COM interface.
+ **/
+// Copyright 2015 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef HANJADIC_H
+#define HANJADIC_H
+
+namespace Scintilla::Internal {
+
+namespace HanjaDict {
+
+int GetHangulOfHanja(wchar_t *inout);
+
+}
+
+}
+
+#endif
diff --git a/scite-app/scintilla/win32/PlatWin.cxx b/scite-app/scintilla/win32/PlatWin.cxx
new file mode 100644
index 0000000..3e966b4
--- /dev/null
+++ b/scite-app/scintilla/win32/PlatWin.cxx
@@ -0,0 +1,3917 @@
+// Scintilla source code edit control
+/** @file PlatWin.cxx
+ ** Implementation of platform facilities on Windows.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+#include <cmath>
+#include <climits>
+
+#include <string_view>
+#include <vector>
+#include <map>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <mutex>
+
+// Want to use std::min and std::max so don't want Windows.h version of min and max
+#if !defined(NOMINMAX)
+#define NOMINMAX
+#endif
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#undef WINVER
+#define WINVER 0x0500
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+
+#if !defined(DISABLE_D2D)
+#define USE_D2D 1
+#endif
+
+#if defined(USE_D2D)
+#include <d2d1.h>
+#include <dwrite.h>
+#endif
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+#include "XPM.h"
+#include "UniConversion.h"
+#include "DBCS.h"
+
+#include "PlatWin.h"
+
+#ifndef SPI_GETFONTSMOOTHINGCONTRAST
+#define SPI_GETFONTSMOOTHINGCONTRAST	0x200C
+#endif
+
+#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
+#define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
+#endif
+
+// __uuidof is a Microsoft extension but makes COM code neater, so disable warning
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wlanguage-extension-token"
+#endif
+
+using namespace Scintilla;
+
+namespace Scintilla::Internal {
+
+UINT CodePageFromCharSet(CharacterSet characterSet, UINT documentCodePage) noexcept;
+
+#if defined(USE_D2D)
+IDWriteFactory *pIDWriteFactory = nullptr;
+ID2D1Factory *pD2DFactory = nullptr;
+IDWriteRenderingParams *defaultRenderingParams = nullptr;
+IDWriteRenderingParams *customClearTypeRenderingParams = nullptr;
+D2D1_DRAW_TEXT_OPTIONS d2dDrawTextOptions = D2D1_DRAW_TEXT_OPTIONS_NONE;
+
+static HMODULE hDLLD2D {};
+static HMODULE hDLLDWrite {};
+
+void LoadD2DOnce() noexcept {
+	DWORD loadLibraryFlags = 0;
+	HMODULE kernel32 = ::GetModuleHandleW(L"kernel32.dll");
+	if (kernel32) {
+		if (::GetProcAddress(kernel32, "SetDefaultDllDirectories")) {
+			// Availability of SetDefaultDllDirectories implies Windows 8+ or
+			// that KB2533623 has been installed so LoadLibraryEx can be called
+			// with LOAD_LIBRARY_SEARCH_SYSTEM32.
+			loadLibraryFlags = LOAD_LIBRARY_SEARCH_SYSTEM32;
+		}
+	}
+
+	typedef HRESULT (WINAPI *D2D1CFSig)(D2D1_FACTORY_TYPE factoryType, REFIID riid,
+		CONST D2D1_FACTORY_OPTIONS *pFactoryOptions, IUnknown **factory);
+	typedef HRESULT (WINAPI *DWriteCFSig)(DWRITE_FACTORY_TYPE factoryType, REFIID iid,
+		IUnknown **factory);
+
+	hDLLD2D = ::LoadLibraryEx(TEXT("D2D1.DLL"), 0, loadLibraryFlags);
+	D2D1CFSig fnD2DCF = DLLFunction<D2D1CFSig>(hDLLD2D, "D2D1CreateFactory");
+	if (fnD2DCF) {
+		// A single threaded factory as Scintilla always draw on the GUI thread
+		fnD2DCF(D2D1_FACTORY_TYPE_SINGLE_THREADED,
+			__uuidof(ID2D1Factory),
+			nullptr,
+			reinterpret_cast<IUnknown**>(&pD2DFactory));
+	}
+	hDLLDWrite = ::LoadLibraryEx(TEXT("DWRITE.DLL"), 0, loadLibraryFlags);
+	DWriteCFSig fnDWCF = DLLFunction<DWriteCFSig>(hDLLDWrite, "DWriteCreateFactory");
+	if (fnDWCF) {
+		const GUID IID_IDWriteFactory2 = // 0439fc60-ca44-4994-8dee-3a9af7b732ec
+		{ 0x0439fc60, 0xca44, 0x4994, { 0x8d, 0xee, 0x3a, 0x9a, 0xf7, 0xb7, 0x32, 0xec } };
+
+		const HRESULT hr = fnDWCF(DWRITE_FACTORY_TYPE_SHARED,
+			IID_IDWriteFactory2,
+			reinterpret_cast<IUnknown**>(&pIDWriteFactory));
+		if (SUCCEEDED(hr)) {
+			// D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT
+			d2dDrawTextOptions = static_cast<D2D1_DRAW_TEXT_OPTIONS>(0x00000004);
+		} else {
+			fnDWCF(DWRITE_FACTORY_TYPE_SHARED,
+				__uuidof(IDWriteFactory),
+				reinterpret_cast<IUnknown**>(&pIDWriteFactory));
+		}
+	}
+
+	if (pIDWriteFactory) {
+		const HRESULT hr = pIDWriteFactory->CreateRenderingParams(&defaultRenderingParams);
+		if (SUCCEEDED(hr)) {
+			unsigned int clearTypeContrast = 0;
+			if (::SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST, 0, &clearTypeContrast, 0)) {
+
+				FLOAT gamma;
+				if (clearTypeContrast >= 1000 && clearTypeContrast <= 2200)
+					gamma = static_cast<FLOAT>(clearTypeContrast) / 1000.0f;
+				else
+					gamma = defaultRenderingParams->GetGamma();
+
+				pIDWriteFactory->CreateCustomRenderingParams(gamma, defaultRenderingParams->GetEnhancedContrast(), defaultRenderingParams->GetClearTypeLevel(),
+					defaultRenderingParams->GetPixelGeometry(), defaultRenderingParams->GetRenderingMode(), &customClearTypeRenderingParams);
+			}
+		}
+	}
+}
+
+bool LoadD2D() {
+	static std::once_flag once;
+	std::call_once(once, LoadD2DOnce);
+	return pIDWriteFactory && pD2DFactory;
+}
+
+#endif
+
+#ifndef CLEARTYPE_QUALITY
+#define CLEARTYPE_QUALITY 5
+#endif
+
+void *PointerFromWindow(HWND hWnd) noexcept {
+	return reinterpret_cast<void *>(::GetWindowLongPtr(hWnd, 0));
+}
+
+void SetWindowPointer(HWND hWnd, void *ptr) noexcept {
+	::SetWindowLongPtr(hWnd, 0, reinterpret_cast<LONG_PTR>(ptr));
+}
+
+namespace {
+
+// system DPI, same for all monitor.
+UINT uSystemDPI = USER_DEFAULT_SCREEN_DPI;
+
+using GetDpiForWindowSig = UINT(WINAPI *)(HWND hwnd);
+GetDpiForWindowSig fnGetDpiForWindow = nullptr;
+
+HMODULE hDLLShcore {};
+using GetDpiForMonitorSig = HRESULT (WINAPI *)(HMONITOR hmonitor, /*MONITOR_DPI_TYPE*/int dpiType, UINT *dpiX, UINT *dpiY);
+GetDpiForMonitorSig fnGetDpiForMonitor = nullptr;
+
+using GetSystemMetricsForDpiSig = int(WINAPI *)(int nIndex, UINT dpi);
+GetSystemMetricsForDpiSig fnGetSystemMetricsForDpi = nullptr;
+
+using AdjustWindowRectExForDpiSig = BOOL(WINAPI *)(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle, UINT dpi);
+AdjustWindowRectExForDpiSig fnAdjustWindowRectExForDpi = nullptr;
+
+void LoadDpiForWindow() noexcept {
+	HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
+	fnGetDpiForWindow = DLLFunction<GetDpiForWindowSig>(user32, "GetDpiForWindow");
+	fnGetSystemMetricsForDpi = DLLFunction<GetSystemMetricsForDpiSig>(user32, "GetSystemMetricsForDpi");
+	fnAdjustWindowRectExForDpi = DLLFunction<AdjustWindowRectExForDpiSig>(user32, "AdjustWindowRectExForDpi");
+
+	using GetDpiForSystemSig = UINT(WINAPI *)(void);
+	GetDpiForSystemSig fnGetDpiForSystem = DLLFunction<GetDpiForSystemSig>(user32, "GetDpiForSystem");
+	if (fnGetDpiForSystem) {
+		uSystemDPI = fnGetDpiForSystem();
+	} else {
+		HDC hdcMeasure = ::CreateCompatibleDC({});
+		uSystemDPI = ::GetDeviceCaps(hdcMeasure, LOGPIXELSY);
+		::DeleteDC(hdcMeasure);
+	}
+
+	if (!fnGetDpiForWindow) {
+		hDLLShcore = ::LoadLibraryExW(L"shcore.dll", {}, LOAD_LIBRARY_SEARCH_SYSTEM32);
+		if (hDLLShcore) {
+			fnGetDpiForMonitor = DLLFunction<GetDpiForMonitorSig>(hDLLShcore, "GetDpiForMonitor");
+		}
+	}
+}
+
+HINSTANCE hinstPlatformRes {};
+
+const Supports SupportsGDI[] = {
+	Supports::PixelModification,
+};
+
+constexpr BYTE Win32MapFontQuality(FontQuality extraFontFlag) noexcept {
+	switch (extraFontFlag & FontQuality::QualityMask) {
+
+		case FontQuality::QualityNonAntialiased:
+			return NONANTIALIASED_QUALITY;
+
+		case FontQuality::QualityAntialiased:
+			return ANTIALIASED_QUALITY;
+
+		case FontQuality::QualityLcdOptimized:
+			return CLEARTYPE_QUALITY;
+
+		default:
+			return DEFAULT_QUALITY;
+	}
+}
+
+#if defined(USE_D2D)
+constexpr D2D1_TEXT_ANTIALIAS_MODE DWriteMapFontQuality(FontQuality extraFontFlag) noexcept {
+	switch (extraFontFlag & FontQuality::QualityMask) {
+
+		case FontQuality::QualityNonAntialiased:
+			return D2D1_TEXT_ANTIALIAS_MODE_ALIASED;
+
+		case FontQuality::QualityAntialiased:
+			return D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;
+
+		case FontQuality::QualityLcdOptimized:
+			return D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE;
+
+		default:
+			return D2D1_TEXT_ANTIALIAS_MODE_DEFAULT;
+	}
+}
+#endif
+
+// Both GDI and DirectWrite can produce a HFONT for use in list boxes
+struct FontWin : public Font {
+	virtual HFONT HFont() const noexcept = 0;
+};
+
+void SetLogFont(LOGFONTW &lf, const char *faceName, CharacterSet characterSet, XYPOSITION size, FontWeight weight, bool italic, FontQuality extraFontFlag) {
+	lf = LOGFONTW();
+	// The negative is to allow for leading
+	lf.lfHeight = -(std::abs(std::lround(size)));
+	lf.lfWeight = static_cast<LONG>(weight);
+	lf.lfItalic = italic ? 1 : 0;
+	lf.lfCharSet = static_cast<BYTE>(characterSet);
+	lf.lfQuality = Win32MapFontQuality(extraFontFlag);
+	UTF16FromUTF8(faceName, lf.lfFaceName, LF_FACESIZE);
+}
+
+struct FontGDI : public FontWin {
+	HFONT hfont = {};
+	FontGDI(const FontParameters &fp) {
+		LOGFONTW lf;
+		SetLogFont(lf, fp.faceName, fp.characterSet, fp.size, fp.weight, fp.italic, fp.extraFontFlag);
+		hfont = ::CreateFontIndirectW(&lf);
+	}
+	// Deleted so FontGDI objects can not be copied.
+	FontGDI(const FontGDI &) = delete;
+	FontGDI(FontGDI &&) = delete;
+	FontGDI &operator=(const FontGDI &) = delete;
+	FontGDI &operator=(FontGDI &&) = delete;
+	~FontGDI() noexcept override {
+		if (hfont)
+			::DeleteObject(hfont);
+	}
+	HFONT HFont() const noexcept override {
+		// Duplicating hfont
+		LOGFONTW lf = {};
+		if (0 == ::GetObjectW(hfont, sizeof(lf), &lf)) {
+			return {};
+		}
+		return ::CreateFontIndirectW(&lf);
+	}
+};
+
+#if defined(USE_D2D)
+struct FontDirectWrite : public FontWin {
+	IDWriteTextFormat *pTextFormat = nullptr;
+	FontQuality extraFontFlag = FontQuality::QualityDefault;
+	CharacterSet characterSet = CharacterSet::Ansi;
+	FLOAT yAscent = 2.0f;
+	FLOAT yDescent = 1.0f;
+	FLOAT yInternalLeading = 0.0f;
+
+	FontDirectWrite(const FontParameters &fp) :
+		extraFontFlag(fp.extraFontFlag),
+		characterSet(fp.characterSet) {
+		const std::wstring wsFace = WStringFromUTF8(fp.faceName);
+		const std::wstring wsLocale = WStringFromUTF8(fp.localeName);
+		const FLOAT fHeight = static_cast<FLOAT>(fp.size);
+		const DWRITE_FONT_STYLE style = fp.italic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL;
+		HRESULT hr = pIDWriteFactory->CreateTextFormat(wsFace.c_str(), nullptr,
+			static_cast<DWRITE_FONT_WEIGHT>(fp.weight),
+			style,
+			DWRITE_FONT_STRETCH_NORMAL, fHeight, wsLocale.c_str(), &pTextFormat);
+		if (hr == E_INVALIDARG) {
+			// Possibly a bad locale name like "/" so try "en-us".
+			hr = pIDWriteFactory->CreateTextFormat(wsFace.c_str(), nullptr,
+				static_cast<DWRITE_FONT_WEIGHT>(fp.weight),
+				style,
+				DWRITE_FONT_STRETCH_NORMAL, fHeight, L"en-us", &pTextFormat);
+		}
+		if (SUCCEEDED(hr)) {
+			pTextFormat->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP);
+
+			IDWriteTextLayout *pTextLayout = nullptr;
+			hr = pIDWriteFactory->CreateTextLayout(L"X", 1, pTextFormat,
+					100.0f, 100.0f, &pTextLayout);
+			if (SUCCEEDED(hr) && pTextLayout) {
+				constexpr int maxLines = 2;
+				DWRITE_LINE_METRICS lineMetrics[maxLines]{};
+				UINT32 lineCount = 0;
+				hr = pTextLayout->GetLineMetrics(lineMetrics, maxLines, &lineCount);
+				if (SUCCEEDED(hr)) {
+					yAscent = lineMetrics[0].baseline;
+					yDescent = lineMetrics[0].height - lineMetrics[0].baseline;
+
+					FLOAT emHeight;
+					hr = pTextLayout->GetFontSize(0, &emHeight);
+					if (SUCCEEDED(hr)) {
+						yInternalLeading = lineMetrics[0].height - emHeight;
+					}
+				}
+				ReleaseUnknown(pTextLayout);
+				pTextFormat->SetLineSpacing(DWRITE_LINE_SPACING_METHOD_UNIFORM, lineMetrics[0].height, lineMetrics[0].baseline);
+			}
+		}
+	}
+	// Deleted so FontDirectWrite objects can not be copied.
+	FontDirectWrite(const FontDirectWrite &) = delete;
+	FontDirectWrite(FontDirectWrite &&) = delete;
+	FontDirectWrite &operator=(const FontDirectWrite &) = delete;
+	FontDirectWrite &operator=(FontDirectWrite &&) = delete;
+	~FontDirectWrite() noexcept override {
+		ReleaseUnknown(pTextFormat);
+	}
+	HFONT HFont() const noexcept override {
+		LOGFONTW lf = {};
+		const HRESULT hr = pTextFormat->GetFontFamilyName(lf.lfFaceName, LF_FACESIZE);
+		if (!SUCCEEDED(hr)) {
+			return {};
+		}
+		lf.lfWeight = pTextFormat->GetFontWeight();
+		lf.lfItalic = pTextFormat->GetFontStyle() == DWRITE_FONT_STYLE_ITALIC;
+		lf.lfHeight = -static_cast<int>(pTextFormat->GetFontSize());
+		return ::CreateFontIndirectW(&lf);
+	}
+};
+#endif
+
+}
+
+std::shared_ptr<Font> Font::Allocate(const FontParameters &fp) {
+#if defined(USE_D2D)
+	if (fp.technology != Technology::Default) {
+		return std::make_shared<FontDirectWrite>(fp);
+	}
+#endif
+	return std::make_shared<FontGDI>(fp);
+}
+
+// Buffer to hold strings and string position arrays without always allocating on heap.
+// May sometimes have string too long to allocate on stack. So use a fixed stack-allocated buffer
+// when less than safe size otherwise allocate on heap and free automatically.
+template<typename T, int lengthStandard>
+class VarBuffer {
+	T bufferStandard[lengthStandard];
+public:
+	T *buffer;
+	explicit VarBuffer(size_t length) : buffer(nullptr) {
+		if (length > lengthStandard) {
+			buffer = new T[length];
+		} else {
+			buffer = bufferStandard;
+		}
+	}
+	// Deleted so VarBuffer objects can not be copied.
+	VarBuffer(const VarBuffer &) = delete;
+	VarBuffer(VarBuffer &&) = delete;
+	VarBuffer &operator=(const VarBuffer &) = delete;
+	VarBuffer &operator=(VarBuffer &&) = delete;
+
+	~VarBuffer() noexcept {
+		if (buffer != bufferStandard) {
+			delete []buffer;
+			buffer = nullptr;
+		}
+	}
+};
+
+constexpr int stackBufferLength = 400;
+class TextWide : public VarBuffer<wchar_t, stackBufferLength> {
+public:
+	int tlen;	// Using int instead of size_t as most Win32 APIs take int.
+	TextWide(std::string_view text, int codePage) :
+		VarBuffer<wchar_t, stackBufferLength>(text.length()) {
+		if (codePage == CpUtf8) {
+			tlen = static_cast<int>(UTF16FromUTF8(text, buffer, text.length()));
+		} else {
+			// Support Asian string display in 9x English
+			tlen = ::MultiByteToWideChar(codePage, 0, text.data(), static_cast<int>(text.length()),
+				buffer, static_cast<int>(text.length()));
+		}
+	}
+};
+typedef VarBuffer<XYPOSITION, stackBufferLength> TextPositions;
+
+UINT DpiForWindow(WindowID wid) noexcept {
+	if (fnGetDpiForWindow) {
+		return fnGetDpiForWindow(HwndFromWindowID(wid));
+	}
+	if (fnGetDpiForMonitor) {
+		HMONITOR hMonitor = ::MonitorFromWindow(HwndFromWindowID(wid), MONITOR_DEFAULTTONEAREST);
+		UINT dpiX = 0;
+		UINT dpiY = 0;
+		if (fnGetDpiForMonitor(hMonitor, 0 /*MDT_EFFECTIVE_DPI*/, &dpiX, &dpiY) == S_OK) {
+			return dpiY;
+		}
+	}
+	return uSystemDPI;
+}
+
+int SystemMetricsForDpi(int nIndex, UINT dpi) noexcept {
+	if (fnGetSystemMetricsForDpi) {
+		return fnGetSystemMetricsForDpi(nIndex, dpi);
+	}
+
+	int value = ::GetSystemMetrics(nIndex);
+	value = (dpi == uSystemDPI) ? value : ::MulDiv(value, dpi, uSystemDPI);
+	return value;
+}
+
+class SurfaceGDI : public Surface {
+	SurfaceMode mode;
+	HDC hdc{};
+	bool hdcOwned=false;
+	HPEN pen{};
+	HPEN penOld{};
+	HBRUSH brush{};
+	HBRUSH brushOld{};
+	HFONT fontOld{};
+	HBITMAP bitmap{};
+	HBITMAP bitmapOld{};
+
+	int logPixelsY = USER_DEFAULT_SCREEN_DPI;
+
+	int maxWidthMeasure = INT_MAX;
+	// There appears to be a 16 bit string length limit in GDI on NT.
+	int maxLenText = 65535;
+
+	void PenColour(ColourRGBA fore, XYPOSITION widthStroke) noexcept;
+
+	void BrushColour(ColourRGBA back) noexcept;
+	void SetFont(const Font *font_);
+	void Clear() noexcept;
+
+public:
+	SurfaceGDI() noexcept;
+	SurfaceGDI(HDC hdcCompatible, int width, int height, SurfaceMode mode_, int logPixelsY_) noexcept;
+	// Deleted so SurfaceGDI objects can not be copied.
+	SurfaceGDI(const SurfaceGDI &) = delete;
+	SurfaceGDI(SurfaceGDI &&) = delete;
+	SurfaceGDI &operator=(const SurfaceGDI &) = delete;
+	SurfaceGDI &operator=(SurfaceGDI &&) = delete;
+
+	~SurfaceGDI() noexcept override;
+
+	void Init(WindowID wid) override;
+	void Init(SurfaceID sid, WindowID wid) override;
+	std::unique_ptr<Surface> AllocatePixMap(int width, int height) override;
+
+	void SetMode(SurfaceMode mode_) override;
+
+	void Release() noexcept override;
+	int SupportsFeature(Supports feature) noexcept override;
+	bool Initialised() override;
+	int LogPixelsY() override;
+	int PixelDivisions() override;
+	int DeviceHeightFont(int points) override;
+	void LineDraw(Point start, Point end, Stroke stroke) override;
+	void PolyLine(const Point *pts, size_t npts, Stroke stroke) override;
+	void Polygon(const Point *pts, size_t npts, FillStroke fillStroke) override;
+	void RectangleDraw(PRectangle rc, FillStroke fillStroke) override;
+	void RectangleFrame(PRectangle rc, Stroke stroke) override;
+	void FillRectangle(PRectangle rc, Fill fill) override;
+	void FillRectangleAligned(PRectangle rc, Fill fill) override;
+	void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+	void RoundedRectangle(PRectangle rc, FillStroke fillStroke) override;
+	void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) override;
+	void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) override;
+	void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+	void Ellipse(PRectangle rc, FillStroke fillStroke) override;
+	void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) override;
+	void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
+
+	std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
+	void DrawTextCommon(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, UINT fuOptions);
+	void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthText(const Font *font_, std::string_view text) override;
+
+	void DrawTextCommonUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, UINT fuOptions);
+	void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
+	XYPOSITION Ascent(const Font *font_) override;
+	XYPOSITION Descent(const Font *font_) override;
+	XYPOSITION InternalLeading(const Font *font_) override;
+	XYPOSITION Height(const Font *font_) override;
+	XYPOSITION AverageCharWidth(const Font *font_) override;
+
+	void SetClip(PRectangle rc) override;
+	void PopClip() override;
+	void FlushCachedState() override;
+	void FlushDrawing() override;
+};
+
+SurfaceGDI::SurfaceGDI() noexcept {
+}
+
+SurfaceGDI::SurfaceGDI(HDC hdcCompatible, int width, int height, SurfaceMode mode_, int logPixelsY_) noexcept {
+	hdc = ::CreateCompatibleDC(hdc);
+	hdcOwned = true;
+	bitmap = ::CreateCompatibleBitmap(hdcCompatible, width, height);
+	bitmapOld = SelectBitmap(hdc, bitmap);
+	::SetTextAlign(hdc, TA_BASELINE);
+	mode = mode_;
+	logPixelsY = logPixelsY_;
+}
+
+SurfaceGDI::~SurfaceGDI() noexcept {
+	Clear();
+}
+
+void SurfaceGDI::Clear() noexcept {
+	if (penOld) {
+		::SelectObject(hdc, penOld);
+		::DeleteObject(pen);
+		penOld = {};
+	}
+	pen = {};
+	if (brushOld) {
+		::SelectObject(hdc, brushOld);
+		::DeleteObject(brush);
+		brushOld = {};
+	}
+	brush = {};
+	if (fontOld) {
+		// Fonts are not deleted as they are owned by a Font object
+		::SelectObject(hdc, fontOld);
+		fontOld = {};
+	}
+	if (bitmapOld) {
+		::SelectObject(hdc, bitmapOld);
+		::DeleteObject(bitmap);
+		bitmapOld = {};
+	}
+	bitmap = {};
+	if (hdcOwned) {
+		::DeleteDC(hdc);
+		hdc = {};
+		hdcOwned = false;
+	}
+}
+
+void SurfaceGDI::Release() noexcept {
+	Clear();
+}
+
+int SurfaceGDI::SupportsFeature(Supports feature) noexcept {
+	for (const Supports f : SupportsGDI) {
+		if (f == feature)
+			return 1;
+	}
+	return 0;
+}
+
+bool SurfaceGDI::Initialised() {
+	return hdc != 0;
+}
+
+void SurfaceGDI::Init(WindowID wid) {
+	Release();
+	hdc = ::CreateCompatibleDC({});
+	hdcOwned = true;
+	::SetTextAlign(hdc, TA_BASELINE);
+	logPixelsY = DpiForWindow(wid);
+}
+
+void SurfaceGDI::Init(SurfaceID sid, WindowID wid) {
+	Release();
+	hdc = static_cast<HDC>(sid);
+	::SetTextAlign(hdc, TA_BASELINE);
+	// Windows on screen are scaled but printers are not.
+	const bool printing = ::GetDeviceCaps(hdc, TECHNOLOGY) != DT_RASDISPLAY;
+	logPixelsY = printing ? ::GetDeviceCaps(hdc, LOGPIXELSY) : DpiForWindow(wid);
+}
+
+std::unique_ptr<Surface> SurfaceGDI::AllocatePixMap(int width, int height) {
+	return std::make_unique<SurfaceGDI>(hdc, width, height, mode, logPixelsY);
+}
+
+void SurfaceGDI::SetMode(SurfaceMode mode_) {
+	mode = mode_;
+}
+
+void SurfaceGDI::PenColour(ColourRGBA fore, XYPOSITION widthStroke) noexcept {
+	if (pen) {
+		::SelectObject(hdc, penOld);
+		::DeleteObject(pen);
+		pen = {};
+		penOld = {};
+	}
+	const DWORD penWidth = std::lround(widthStroke);
+	const COLORREF penColour = fore.OpaqueRGB();
+	if (widthStroke > 1) {
+		const LOGBRUSH brushParameters{ BS_SOLID, penColour, 0 };
+		pen = ::ExtCreatePen(PS_GEOMETRIC | PS_ENDCAP_ROUND | PS_JOIN_MITER,
+			penWidth,
+			&brushParameters,
+			0,
+			nullptr);
+	} else {
+		pen = ::CreatePen(PS_INSIDEFRAME, penWidth, penColour);
+	}
+	penOld = SelectPen(hdc, pen);
+}
+
+void SurfaceGDI::BrushColour(ColourRGBA back) noexcept {
+	if (brush) {
+		::SelectObject(hdc, brushOld);
+		::DeleteObject(brush);
+		brush = {};
+		brushOld = {};
+	}
+	brush = ::CreateSolidBrush(back.OpaqueRGB());
+	brushOld = SelectBrush(hdc, brush);
+}
+
+void SurfaceGDI::SetFont(const Font *font_) {
+	const FontGDI *pfm = dynamic_cast<const FontGDI *>(font_);
+	PLATFORM_ASSERT(pfm);
+	if (!pfm) {
+		throw std::runtime_error("SurfaceGDI::SetFont: wrong Font type.");
+	}
+	if (fontOld) {
+		SelectFont(hdc, pfm->hfont);
+	} else {
+		fontOld = SelectFont(hdc, pfm->hfont);
+	}
+}
+
+int SurfaceGDI::LogPixelsY() {
+	return logPixelsY;
+}
+
+int SurfaceGDI::PixelDivisions() {
+	// Win32 uses device pixels.
+	return 1;
+}
+
+int SurfaceGDI::DeviceHeightFont(int points) {
+	return ::MulDiv(points, LogPixelsY(), 72);
+}
+
+void SurfaceGDI::LineDraw(Point start, Point end, Stroke stroke) {
+	PenColour(stroke.colour, stroke.width);
+	::MoveToEx(hdc, std::lround(std::floor(start.x)), std::lround(std::floor(start.y)), nullptr);
+	::LineTo(hdc, std::lround(std::floor(end.x)), std::lround(std::floor(end.y)));
+}
+
+void SurfaceGDI::PolyLine(const Point *pts, size_t npts, Stroke stroke) {
+	PLATFORM_ASSERT(npts > 1);
+	if (npts <= 1) {
+		return;
+	}
+	PenColour(stroke.colour, stroke.width);
+	std::vector<POINT> outline;
+	std::transform(pts, pts + npts, std::back_inserter(outline), POINTFromPoint);
+	::Polyline(hdc, outline.data(), static_cast<int>(npts));
+}
+
+void SurfaceGDI::Polygon(const Point *pts, size_t npts, FillStroke fillStroke) {
+	PenColour(fillStroke.stroke.colour.WithoutAlpha(), fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour.WithoutAlpha());
+	std::vector<POINT> outline;
+	std::transform(pts, pts + npts, std::back_inserter(outline), POINTFromPoint);
+	::Polygon(hdc, outline.data(), static_cast<int>(npts));
+}
+
+void SurfaceGDI::RectangleDraw(PRectangle rc, FillStroke fillStroke) {
+	RectangleFrame(rc, fillStroke.stroke);
+	FillRectangle(rc.Inset(fillStroke.stroke.width), fillStroke.fill.colour);
+}
+
+void SurfaceGDI::RectangleFrame(PRectangle rc, Stroke stroke) {
+	BrushColour(stroke.colour);
+	const RECT rcw = RectFromPRectangle(rc);
+	::FrameRect(hdc, &rcw, brush);
+}
+
+void SurfaceGDI::FillRectangle(PRectangle rc, Fill fill) {
+	if (fill.colour.IsOpaque()) {
+		// Using ExtTextOut rather than a FillRect ensures that no dithering occurs.
+		// There is no need to allocate a brush either.
+		const RECT rcw = RectFromPRectangle(rc);
+		::SetBkColor(hdc, fill.colour.OpaqueRGB());
+		::ExtTextOut(hdc, rcw.left, rcw.top, ETO_OPAQUE, &rcw, TEXT(""), 0, nullptr);
+	} else {
+		AlphaRectangle(rc, 0, FillStroke(fill.colour));
+	}
+}
+
+void SurfaceGDI::FillRectangleAligned(PRectangle rc, Fill fill) {
+	FillRectangle(PixelAlign(rc, 1), fill);
+}
+
+void SurfaceGDI::FillRectangle(PRectangle rc, Surface &surfacePattern) {
+	HBRUSH br;
+	if (SurfaceGDI *psgdi = dynamic_cast<SurfaceGDI *>(&surfacePattern); psgdi && psgdi->bitmap) {
+		br = ::CreatePatternBrush(psgdi->bitmap);
+	} else {	// Something is wrong so display in red
+		br = ::CreateSolidBrush(RGB(0xff, 0, 0));
+	}
+	const RECT rcw = RectFromPRectangle(rc);
+	::FillRect(hdc, &rcw, br);
+	::DeleteObject(br);
+}
+
+void SurfaceGDI::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
+	PenColour(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+	const RECT rcw = RectFromPRectangle(rc);
+	::RoundRect(hdc,
+		rcw.left + 1, rcw.top,
+		rcw.right - 1, rcw.bottom,
+		8, 8);
+}
+
+namespace {
+
+constexpr DWORD dwordFromBGRA(byte b, byte g, byte r, byte a) noexcept {
+	return (a << 24) | (r << 16) | (g << 8) | b;
+}
+
+constexpr byte AlphaScaled(unsigned char component, unsigned int alpha) noexcept {
+	return static_cast<byte>(component * alpha / 255);
+}
+
+constexpr DWORD dwordMultiplied(ColourRGBA colour) noexcept {
+	return dwordFromBGRA(
+		AlphaScaled(colour.GetBlue(), colour.GetAlpha()),
+		AlphaScaled(colour.GetGreen(), colour.GetAlpha()),
+		AlphaScaled(colour.GetRed(), colour.GetAlpha()),
+		colour.GetAlpha());
+}
+
+class DIBSection {
+	HDC hMemDC {};
+	HBITMAP hbmMem {};
+	HBITMAP hbmOld {};
+	SIZE size {};
+	DWORD *pixels = nullptr;
+public:
+	DIBSection(HDC hdc, SIZE size_) noexcept;
+	// Deleted so DIBSection objects can not be copied.
+	DIBSection(const DIBSection&) = delete;
+	DIBSection(DIBSection&&) = delete;
+	DIBSection &operator=(const DIBSection&) = delete;
+	DIBSection &operator=(DIBSection&&) = delete;
+	~DIBSection() noexcept;
+	operator bool() const noexcept {
+		return hMemDC && hbmMem && pixels;
+	}
+	DWORD *Pixels() const noexcept {
+		return pixels;
+	}
+	unsigned char *Bytes() const noexcept {
+		return reinterpret_cast<unsigned char *>(pixels);
+	}
+	HDC DC() const noexcept {
+		return hMemDC;
+	}
+	void SetPixel(LONG x, LONG y, DWORD value) noexcept {
+		PLATFORM_ASSERT(x >= 0);
+		PLATFORM_ASSERT(y >= 0);
+		PLATFORM_ASSERT(x < size.cx);
+		PLATFORM_ASSERT(y < size.cy);
+		pixels[y * size.cx + x] = value;
+	}
+	void SetSymmetric(LONG x, LONG y, DWORD value) noexcept;
+};
+
+DIBSection::DIBSection(HDC hdc, SIZE size_) noexcept {
+	hMemDC = ::CreateCompatibleDC(hdc);
+	if (!hMemDC) {
+		return;
+	}
+
+	size = size_;
+
+	// -size.y makes bitmap start from top
+	const BITMAPINFO bpih = { {sizeof(BITMAPINFOHEADER), size.cx, -size.cy, 1, 32, BI_RGB, 0, 0, 0, 0, 0},
+		{{0, 0, 0, 0}} };
+	void *image = nullptr;
+	hbmMem = CreateDIBSection(hMemDC, &bpih, DIB_RGB_COLORS, &image, {}, 0);
+	if (!hbmMem || !image) {
+		return;
+	}
+	pixels = static_cast<DWORD *>(image);
+	hbmOld = SelectBitmap(hMemDC, hbmMem);
+}
+
+DIBSection::~DIBSection() noexcept {
+	if (hbmOld) {
+		SelectBitmap(hMemDC, hbmOld);
+		hbmOld = {};
+	}
+	if (hbmMem) {
+		::DeleteObject(hbmMem);
+		hbmMem = {};
+	}
+	if (hMemDC) {
+		::DeleteDC(hMemDC);
+		hMemDC = {};
+	}
+}
+
+void DIBSection::SetSymmetric(LONG x, LONG y, DWORD value) noexcept {
+	// Plot a point symmetrically to all 4 quadrants
+	const LONG xSymmetric = size.cx - 1 - x;
+	const LONG ySymmetric = size.cy - 1 - y;
+	SetPixel(x, y, value);
+	SetPixel(xSymmetric, y, value);
+	SetPixel(x, ySymmetric, value);
+	SetPixel(xSymmetric, ySymmetric, value);
+}
+
+constexpr unsigned int Proportional(unsigned char a, unsigned char b, XYPOSITION t) noexcept {
+	return static_cast<unsigned int>(a + t * (b - a));
+}
+
+ColourRGBA Proportional(ColourRGBA a, ColourRGBA b, XYPOSITION t) noexcept {
+	return ColourRGBA(
+		Proportional(a.GetRed(), b.GetRed(), t),
+		Proportional(a.GetGreen(), b.GetGreen(), t),
+		Proportional(a.GetBlue(), b.GetBlue(), t),
+		Proportional(a.GetAlpha(), b.GetAlpha(), t));
+}
+
+ColourRGBA GradientValue(const std::vector<ColourStop> &stops, XYPOSITION proportion) noexcept {
+	for (size_t stop = 0; stop < stops.size() - 1; stop++) {
+		// Loop through each pair of stops
+		const XYPOSITION positionStart = stops[stop].position;
+		const XYPOSITION positionEnd = stops[stop + 1].position;
+		if ((proportion >= positionStart) && (proportion <= positionEnd)) {
+			const XYPOSITION proportionInPair = (proportion - positionStart) /
+				(positionEnd - positionStart);
+			return Proportional(stops[stop].colour, stops[stop + 1].colour, proportionInPair);
+		}
+	}
+	// Loop should always find a value
+	return ColourRGBA();
+}
+
+constexpr SIZE SizeOfRect(RECT rc) noexcept {
+	return { rc.right - rc.left, rc.bottom - rc.top };
+}
+
+constexpr BLENDFUNCTION mergeAlpha = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA };
+
+}
+
+void SurfaceGDI::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
+	// TODO: Implement strokeWidth
+	const RECT rcw = RectFromPRectangle(rc);
+	const SIZE size = SizeOfRect(rcw);
+
+	if (size.cx > 0) {
+
+		DIBSection section(hdc, size);
+
+		if (section) {
+
+			// Ensure not distorted too much by corners when small
+			const LONG corner = std::min(static_cast<LONG>(cornerSize), (std::min(size.cx, size.cy) / 2) - 2);
+
+			constexpr DWORD valEmpty = dwordFromBGRA(0,0,0,0);
+			const DWORD valFill = dwordMultiplied(fillStroke.fill.colour);
+			const DWORD valOutline = dwordMultiplied(fillStroke.stroke.colour);
+
+			// Draw a framed rectangle
+			for (int y=0; y<size.cy; y++) {
+				for (int x=0; x<size.cx; x++) {
+					if ((x==0) || (x==size.cx-1) || (y == 0) || (y == size.cy -1)) {
+						section.SetPixel(x, y, valOutline);
+					} else {
+						section.SetPixel(x, y, valFill);
+					}
+				}
+			}
+
+			// Make the corners transparent
+			for (LONG c=0; c<corner; c++) {
+				for (LONG x=0; x<c+1; x++) {
+					section.SetSymmetric(x, c - x, valEmpty);
+				}
+			}
+
+			// Draw the corner frame pieces
+			for (LONG x=1; x<corner; x++) {
+				section.SetSymmetric(x, corner - x, valOutline);
+			}
+
+			AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+		}
+	} else {
+		BrushColour(fillStroke.stroke.colour);
+		FrameRect(hdc, &rcw, brush);
+	}
+}
+
+void SurfaceGDI::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+
+	const RECT rcw = RectFromPRectangle(rc);
+	const SIZE size = SizeOfRect(rcw);
+
+	DIBSection section(hdc, size);
+
+	if (section) {
+
+		if (options == GradientOptions::topToBottom) {
+			for (LONG y = 0; y < size.cy; y++) {
+				// Find y/height proportional colour
+				const XYPOSITION proportion = y / (rc.Height() - 1.0f);
+				const ColourRGBA mixed = GradientValue(stops, proportion);
+				const DWORD valFill = dwordMultiplied(mixed);
+				for (LONG x = 0; x < size.cx; x++) {
+					section.SetPixel(x, y, valFill);
+				}
+			}
+		} else {
+			for (LONG x = 0; x < size.cx; x++) {
+				// Find x/width proportional colour
+				const XYPOSITION proportion = x / (rc.Width() - 1.0f);
+				const ColourRGBA mixed = GradientValue(stops, proportion);
+				const DWORD valFill = dwordMultiplied(mixed);
+				for (LONG y = 0; y < size.cy; y++) {
+					section.SetPixel(x, y, valFill);
+				}
+			}
+		}
+
+		AlphaBlend(hdc, rcw.left, rcw.top, size.cx, size.cy, section.DC(), 0, 0, size.cx, size.cy, mergeAlpha);
+	}
+}
+
+void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	if (rc.Width() > 0) {
+		if (rc.Width() > width)
+			rc.left += std::floor((rc.Width() - width) / 2);
+		rc.right = rc.left + width;
+		if (rc.Height() > height)
+			rc.top += std::floor((rc.Height() - height) / 2);
+		rc.bottom = rc.top + height;
+
+		const SIZE size { width, height };
+		DIBSection section(hdc, size);
+		if (section) {
+			RGBAImage::BGRAFromRGBA(section.Bytes(), pixelsImage, static_cast<size_t>(width) * height);
+			AlphaBlend(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
+				static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), section.DC(),
+				0, 0, width, height, mergeAlpha);
+		}
+	}
+}
+
+void SurfaceGDI::Ellipse(PRectangle rc, FillStroke fillStroke) {
+	PenColour(fillStroke.stroke.colour, fillStroke.stroke.width);
+	BrushColour(fillStroke.fill.colour);
+	const RECT rcw = RectFromPRectangle(rc);
+	::Ellipse(hdc, rcw.left, rcw.top, rcw.right, rcw.bottom);
+}
+
+void SurfaceGDI::Stadium(PRectangle rc, FillStroke fillStroke, [[maybe_unused]] Ends ends) {
+	// TODO: Implement properly - the rectangle is just a placeholder
+	RectangleDraw(rc, fillStroke);
+}
+
+void SurfaceGDI::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
+	::BitBlt(hdc,
+		static_cast<int>(rc.left), static_cast<int>(rc.top),
+		static_cast<int>(rc.Width()), static_cast<int>(rc.Height()),
+		dynamic_cast<SurfaceGDI &>(surfaceSource).hdc,
+		static_cast<int>(from.x), static_cast<int>(from.y), SRCCOPY);
+}
+
+std::unique_ptr<IScreenLineLayout> SurfaceGDI::Layout(const IScreenLine *) {
+	return {};
+}
+
+typedef VarBuffer<int, stackBufferLength> TextPositionsI;
+
+void SurfaceGDI::DrawTextCommon(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, UINT fuOptions) {
+	SetFont(font_);
+	const RECT rcw = RectFromPRectangle(rc);
+	const int x = static_cast<int>(rc.left);
+	const int yBaseInt = static_cast<int>(ybase);
+
+	if (mode.codePage == CpUtf8) {
+		const TextWide tbuf(text, mode.codePage);
+		::ExtTextOutW(hdc, x, yBaseInt, fuOptions, &rcw, tbuf.buffer, tbuf.tlen, nullptr);
+	} else {
+		::ExtTextOutA(hdc, x, yBaseInt, fuOptions, &rcw, text.data(), static_cast<UINT>(text.length()), nullptr);
+	}
+}
+
+void SurfaceGDI::DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	::SetTextColor(hdc, fore.OpaqueRGB());
+	::SetBkColor(hdc, back.OpaqueRGB());
+	DrawTextCommon(rc, font_, ybase, text, ETO_OPAQUE);
+}
+
+void SurfaceGDI::DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	::SetTextColor(hdc, fore.OpaqueRGB());
+	::SetBkColor(hdc, back.OpaqueRGB());
+	DrawTextCommon(rc, font_, ybase, text, ETO_OPAQUE | ETO_CLIPPED);
+}
+
+void SurfaceGDI::DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (const char ch : text) {
+		if (ch != ' ') {
+			::SetTextColor(hdc, fore.OpaqueRGB());
+			::SetBkMode(hdc, TRANSPARENT);
+			DrawTextCommon(rc, font_, ybase, text, 0);
+			::SetBkMode(hdc, OPAQUE);
+			return;
+		}
+	}
+}
+
+void SurfaceGDI::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	// Zero positions to avoid random behaviour on failure.
+	std::fill(positions, positions + text.length(), 0.0f);
+	SetFont(font_);
+	SIZE sz = { 0,0 };
+	int fit = 0;
+	int i = 0;
+	const int len = static_cast<int>(text.length());
+	if (mode.codePage == CpUtf8) {
+		const TextWide tbuf(text, mode.codePage);
+		TextPositionsI poses(tbuf.tlen);
+		if (!::GetTextExtentExPointW(hdc, tbuf.buffer, tbuf.tlen, maxWidthMeasure, &fit, poses.buffer, &sz)) {
+			// Failure
+			return;
+		}
+		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+		for (int ui = 0; ui < fit; ui++) {
+			const unsigned char uch = text[i];
+			const unsigned int byteCount = UTF8BytesOfLead[uch];
+			if (byteCount == 4) {	// Non-BMP
+				ui++;
+			}
+			for (unsigned int bytePos = 0; (bytePos < byteCount) && (i < len); bytePos++) {
+				positions[i++] = static_cast<XYPOSITION>(poses.buffer[ui]);
+			}
+		}
+	} else {
+		TextPositionsI poses(len);
+		if (!::GetTextExtentExPointA(hdc, text.data(), len, maxWidthMeasure, &fit, poses.buffer, &sz)) {
+			// Eeek - a NULL DC or other foolishness could cause this.
+			return;
+		}
+		while (i < fit) {
+			positions[i] = static_cast<XYPOSITION>(poses.buffer[i]);
+			i++;
+		}
+	}
+	// If any positions not filled in then use the last position for them
+	const XYPOSITION lastPos = (fit > 0) ? positions[fit - 1] : 0.0f;
+	std::fill(positions + i, positions + text.length(), lastPos);
+}
+
+XYPOSITION SurfaceGDI::WidthText(const Font *font_, std::string_view text) {
+	SetFont(font_);
+	SIZE sz = { 0,0 };
+	if (!(mode.codePage == CpUtf8)) {
+		::GetTextExtentPoint32A(hdc, text.data(), std::min(static_cast<int>(text.length()), maxLenText), &sz);
+	} else {
+		const TextWide tbuf(text, mode.codePage);
+		::GetTextExtentPoint32W(hdc, tbuf.buffer, tbuf.tlen, &sz);
+	}
+	return static_cast<XYPOSITION>(sz.cx);
+}
+
+void SurfaceGDI::DrawTextCommonUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, UINT fuOptions) {
+	SetFont(font_);
+	const RECT rcw = RectFromPRectangle(rc);
+	const int x = static_cast<int>(rc.left);
+	const int yBaseInt = static_cast<int>(ybase);
+
+	const TextWide tbuf(text, CpUtf8);
+	::ExtTextOutW(hdc, x, yBaseInt, fuOptions, &rcw, tbuf.buffer, tbuf.tlen, nullptr);
+}
+
+void SurfaceGDI::DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	::SetTextColor(hdc, fore.OpaqueRGB());
+	::SetBkColor(hdc, back.OpaqueRGB());
+	DrawTextCommonUTF8(rc, font_, ybase, text, ETO_OPAQUE);
+}
+
+void SurfaceGDI::DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	::SetTextColor(hdc, fore.OpaqueRGB());
+	::SetBkColor(hdc, back.OpaqueRGB());
+	DrawTextCommonUTF8(rc, font_, ybase, text, ETO_OPAQUE | ETO_CLIPPED);
+}
+
+void SurfaceGDI::DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (const char ch : text) {
+		if (ch != ' ') {
+			::SetTextColor(hdc, fore.OpaqueRGB());
+			::SetBkMode(hdc, TRANSPARENT);
+			DrawTextCommonUTF8(rc, font_, ybase, text, 0);
+			::SetBkMode(hdc, OPAQUE);
+			return;
+		}
+	}
+}
+
+void SurfaceGDI::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	// Zero positions to avoid random behaviour on failure.
+	std::fill(positions, positions + text.length(), 0.0f);
+	SetFont(font_);
+	SIZE sz = { 0,0 };
+	int fit = 0;
+	int i = 0;
+	const int len = static_cast<int>(text.length());
+	const TextWide tbuf(text, CpUtf8);
+	TextPositionsI poses(tbuf.tlen);
+	if (!::GetTextExtentExPointW(hdc, tbuf.buffer, tbuf.tlen, maxWidthMeasure, &fit, poses.buffer, &sz)) {
+		// Failure
+		return;
+	}
+	// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+	for (int ui = 0; ui < fit; ui++) {
+		const unsigned char uch = text[i];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		if (byteCount == 4) {	// Non-BMP
+			ui++;
+		}
+		for (unsigned int bytePos = 0; (bytePos < byteCount) && (i < len); bytePos++) {
+			positions[i++] = static_cast<XYPOSITION>(poses.buffer[ui]);
+		}
+	}
+	// If any positions not filled in then use the last position for them
+	const XYPOSITION lastPos = (fit > 0) ? positions[fit - 1] : 0.0f;
+	std::fill(positions + i, positions + text.length(), lastPos);
+}
+
+XYPOSITION SurfaceGDI::WidthTextUTF8(const Font *font_, std::string_view text) {
+	SetFont(font_);
+	SIZE sz = { 0,0 };
+	const TextWide tbuf(text, CpUtf8);
+	::GetTextExtentPoint32W(hdc, tbuf.buffer, tbuf.tlen, &sz);
+	return static_cast<XYPOSITION>(sz.cx);
+}
+
+XYPOSITION SurfaceGDI::Ascent(const Font *font_) {
+	SetFont(font_);
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	return static_cast<XYPOSITION>(tm.tmAscent);
+}
+
+XYPOSITION SurfaceGDI::Descent(const Font *font_) {
+	SetFont(font_);
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	return static_cast<XYPOSITION>(tm.tmDescent);
+}
+
+XYPOSITION SurfaceGDI::InternalLeading(const Font *font_) {
+	SetFont(font_);
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	return static_cast<XYPOSITION>(tm.tmInternalLeading);
+}
+
+XYPOSITION SurfaceGDI::Height(const Font *font_) {
+	SetFont(font_);
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	return static_cast<XYPOSITION>(tm.tmHeight);
+}
+
+XYPOSITION SurfaceGDI::AverageCharWidth(const Font *font_) {
+	SetFont(font_);
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	return static_cast<XYPOSITION>(tm.tmAveCharWidth);
+}
+
+void SurfaceGDI::SetClip(PRectangle rc) {
+	::SaveDC(hdc);
+	::IntersectClipRect(hdc, static_cast<int>(rc.left), static_cast<int>(rc.top),
+		static_cast<int>(rc.right), static_cast<int>(rc.bottom));
+}
+
+void SurfaceGDI::PopClip() {
+	::RestoreDC(hdc, -1);
+}
+
+void SurfaceGDI::FlushCachedState() {
+	pen = {};
+	brush = {};
+}
+
+void SurfaceGDI::FlushDrawing() {
+}
+
+#if defined(USE_D2D)
+
+namespace {
+
+constexpr D2D1_RECT_F RectangleFromPRectangle(PRectangle rc) noexcept {
+	return {
+		static_cast<FLOAT>(rc.left),
+		static_cast<FLOAT>(rc.top),
+		static_cast<FLOAT>(rc.right),
+		static_cast<FLOAT>(rc.bottom)
+	};
+}
+
+constexpr D2D1_POINT_2F DPointFromPoint(Point point) noexcept {
+	return { static_cast<FLOAT>(point.x), static_cast<FLOAT>(point.y) };
+}
+
+const Supports SupportsD2D[] = {
+	Supports::LineDrawsFinal,
+	Supports::FractionalStrokeWidth,
+	Supports::TranslucentStroke,
+	Supports::PixelModification,
+};
+
+constexpr D2D_COLOR_F ColorFromColourAlpha(ColourRGBA colour) noexcept {
+	return D2D_COLOR_F{
+		colour.GetRedComponent(),
+		colour.GetGreenComponent(),
+		colour.GetBlueComponent(),
+		colour.GetAlphaComponent()
+	};
+}
+
+constexpr D2D1_RECT_F RectangleInset(D2D1_RECT_F rect, FLOAT inset) noexcept {
+	return D2D1_RECT_F{
+		rect.left + inset,
+		rect.top + inset,
+		rect.right - inset,
+		rect.bottom - inset };
+}
+
+}
+
+class BlobInline;
+
+class SurfaceD2D : public Surface {
+	SurfaceMode mode;
+
+	int codePageText = 0;
+
+	ID2D1RenderTarget *pRenderTarget = nullptr;
+	ID2D1BitmapRenderTarget *pBitmapRenderTarget = nullptr;
+	bool ownRenderTarget = false;
+	int clipsActive = 0;
+
+	IDWriteTextFormat *pTextFormat = nullptr;
+	FLOAT yAscent = 2;
+	FLOAT yDescent = 1;
+	FLOAT yInternalLeading = 0;
+
+	ID2D1SolidColorBrush *pBrush = nullptr;
+
+	int logPixelsY = USER_DEFAULT_SCREEN_DPI;
+
+	void Clear() noexcept;
+	void SetFont(const Font *font_);
+	HRESULT GetBitmap(ID2D1Bitmap **ppBitmap);
+
+public:
+	SurfaceD2D() noexcept;
+	SurfaceD2D(ID2D1RenderTarget *pRenderTargetCompatible, int width, int height, SurfaceMode mode_, int logPixelsY_) noexcept;
+	// Deleted so SurfaceD2D objects can not be copied.
+	SurfaceD2D(const SurfaceD2D &) = delete;
+	SurfaceD2D(SurfaceD2D &&) = delete;
+	SurfaceD2D &operator=(const SurfaceD2D &) = delete;
+	SurfaceD2D &operator=(SurfaceD2D &&) = delete;
+	~SurfaceD2D() noexcept override;
+
+	void SetScale(WindowID wid) noexcept;
+	void Init(WindowID wid) override;
+	void Init(SurfaceID sid, WindowID wid) override;
+	std::unique_ptr<Surface> AllocatePixMap(int width, int height) override;
+
+	void SetMode(SurfaceMode mode_) override;
+
+	void Release() noexcept override;
+	int SupportsFeature(Supports feature) noexcept override;
+	bool Initialised() override;
+
+	void D2DPenColourAlpha(ColourRGBA fore) noexcept;
+	int LogPixelsY() override;
+	int PixelDivisions() override;
+	int DeviceHeightFont(int points) override;
+	void LineDraw(Point start, Point end, Stroke stroke) override;
+	ID2D1PathGeometry *Geometry(const Point *pts, size_t npts, D2D1_FIGURE_BEGIN figureBegin) noexcept;
+	void PolyLine(const Point *pts, size_t npts, Stroke stroke) override;
+	void Polygon(const Point *pts, size_t npts, FillStroke fillStroke) override;
+	void RectangleDraw(PRectangle rc, FillStroke fillStroke) override;
+	void RectangleFrame(PRectangle rc, Stroke stroke) override;
+	void FillRectangle(PRectangle rc, Fill fill) override;
+	void FillRectangleAligned(PRectangle rc, Fill fill) override;
+	void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+	void RoundedRectangle(PRectangle rc, FillStroke fillStroke) override;
+	void AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) override;
+	void GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) override;
+	void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+	void Ellipse(PRectangle rc, FillStroke fillStroke) override;
+	void Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) override;
+	void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
+
+	std::unique_ptr<IScreenLineLayout> Layout(const IScreenLine *screenLine) override;
+
+	void DrawTextCommon(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, int codePageOverride, UINT fuOptions);
+
+	void DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthText(const Font *font_, std::string_view text) override;
+
+	void DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore, ColourRGBA back) override;
+	void DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, ColourRGBA fore) override;
+	void MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) override;
+	XYPOSITION WidthTextUTF8(const Font *font_, std::string_view text) override;
+
+	XYPOSITION Ascent(const Font *font_) override;
+	XYPOSITION Descent(const Font *font_) override;
+	XYPOSITION InternalLeading(const Font *font_) override;
+	XYPOSITION Height(const Font *font_) override;
+	XYPOSITION AverageCharWidth(const Font *font_) override;
+
+	void SetClip(PRectangle rc) override;
+	void PopClip() override;
+	void FlushCachedState() override;
+	void FlushDrawing() override;
+};
+
+SurfaceD2D::SurfaceD2D() noexcept {
+}
+
+SurfaceD2D::SurfaceD2D(ID2D1RenderTarget *pRenderTargetCompatible, int width, int height, SurfaceMode mode_, int logPixelsY_) noexcept {
+	const D2D1_SIZE_F desiredSize = D2D1::SizeF(static_cast<float>(width), static_cast<float>(height));
+	D2D1_PIXEL_FORMAT desiredFormat;
+#ifdef __MINGW32__
+	desiredFormat.format = DXGI_FORMAT_UNKNOWN;
+#else
+	desiredFormat = pRenderTargetCompatible->GetPixelFormat();
+#endif
+	desiredFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE;
+	const HRESULT hr = pRenderTargetCompatible->CreateCompatibleRenderTarget(
+		&desiredSize, nullptr, &desiredFormat, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &pBitmapRenderTarget);
+	if (SUCCEEDED(hr)) {
+		pRenderTarget = pBitmapRenderTarget;
+		pRenderTarget->BeginDraw();
+		ownRenderTarget = true;
+	}
+	mode = mode_;
+	logPixelsY = logPixelsY_;
+}
+
+SurfaceD2D::~SurfaceD2D() noexcept {
+	Clear();
+}
+
+void SurfaceD2D::Clear() noexcept {
+	ReleaseUnknown(pBrush);
+	if (pRenderTarget) {
+		while (clipsActive) {
+			pRenderTarget->PopAxisAlignedClip();
+			clipsActive--;
+		}
+		if (ownRenderTarget) {
+			pRenderTarget->EndDraw();
+			ReleaseUnknown(pRenderTarget);
+			ownRenderTarget = false;
+		}
+		pRenderTarget = nullptr;
+	}
+	pBitmapRenderTarget = nullptr;
+}
+
+void SurfaceD2D::Release() noexcept {
+	Clear();
+}
+
+void SurfaceD2D::SetScale(WindowID wid) noexcept {
+	logPixelsY = DpiForWindow(wid);
+}
+
+int SurfaceD2D::SupportsFeature(Supports feature) noexcept {
+	for (const Supports f : SupportsD2D) {
+		if (f == feature)
+			return 1;
+	}
+	return 0;
+}
+
+bool SurfaceD2D::Initialised() {
+	return pRenderTarget != nullptr;
+}
+
+void SurfaceD2D::Init(WindowID wid) {
+	Release();
+	SetScale(wid);
+}
+
+void SurfaceD2D::Init(SurfaceID sid, WindowID wid) {
+	Release();
+	SetScale(wid);
+	pRenderTarget = static_cast<ID2D1RenderTarget *>(sid);
+}
+
+std::unique_ptr<Surface> SurfaceD2D::AllocatePixMap(int width, int height) {
+	return std::make_unique<SurfaceD2D>(pRenderTarget, width, height, mode, logPixelsY);
+}
+
+void SurfaceD2D::SetMode(SurfaceMode mode_) {
+	mode = mode_;
+}
+
+HRESULT SurfaceD2D::GetBitmap(ID2D1Bitmap **ppBitmap) {
+	PLATFORM_ASSERT(pBitmapRenderTarget);
+	return pBitmapRenderTarget->GetBitmap(ppBitmap);
+}
+
+void SurfaceD2D::D2DPenColourAlpha(ColourRGBA fore) noexcept {
+	if (pRenderTarget) {
+		const D2D_COLOR_F col = ColorFromColourAlpha(fore);
+		if (pBrush) {
+			pBrush->SetColor(col);
+		} else {
+			const HRESULT hr = pRenderTarget->CreateSolidColorBrush(col, &pBrush);
+			if (!SUCCEEDED(hr)) {
+				ReleaseUnknown(pBrush);
+			}
+		}
+	}
+}
+
+void SurfaceD2D::SetFont(const Font *font_) {
+	const FontDirectWrite *pfm = dynamic_cast<const FontDirectWrite *>(font_);
+	PLATFORM_ASSERT(pfm);
+	if (!pfm) {
+		throw std::runtime_error("SurfaceD2D::SetFont: wrong Font type.");
+	}
+	pTextFormat = pfm->pTextFormat;
+	yAscent = pfm->yAscent;
+	yDescent = pfm->yDescent;
+	yInternalLeading = pfm->yInternalLeading;
+	codePageText = mode.codePage;
+	if (!(mode.codePage == CpUtf8) && (pfm->characterSet != CharacterSet::Ansi)) {
+		codePageText = CodePageFromCharSet(pfm->characterSet, mode.codePage);
+	}
+	if (pRenderTarget) {
+		D2D1_TEXT_ANTIALIAS_MODE aaMode;
+		aaMode = DWriteMapFontQuality(pfm->extraFontFlag);
+
+		if (aaMode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE && customClearTypeRenderingParams)
+			pRenderTarget->SetTextRenderingParams(customClearTypeRenderingParams);
+		else if (defaultRenderingParams)
+			pRenderTarget->SetTextRenderingParams(defaultRenderingParams);
+
+		pRenderTarget->SetTextAntialiasMode(aaMode);
+	}
+}
+
+int SurfaceD2D::LogPixelsY() {
+	return logPixelsY;
+}
+
+int SurfaceD2D::PixelDivisions() {
+	// Win32 uses device pixels.
+	return 1;
+}
+
+int SurfaceD2D::DeviceHeightFont(int points) {
+	return ::MulDiv(points, LogPixelsY(), 72);
+}
+
+void SurfaceD2D::LineDraw(Point start, Point end, Stroke stroke) {
+	D2DPenColourAlpha(stroke.colour);
+
+	D2D1_STROKE_STYLE_PROPERTIES strokeProps {};
+	strokeProps.startCap = D2D1_CAP_STYLE_SQUARE;
+	strokeProps.endCap = D2D1_CAP_STYLE_SQUARE;
+	strokeProps.dashCap = D2D1_CAP_STYLE_FLAT;
+	strokeProps.lineJoin = D2D1_LINE_JOIN_MITER;
+	strokeProps.miterLimit = 4.0f;
+	strokeProps.dashStyle = D2D1_DASH_STYLE_SOLID;
+	strokeProps.dashOffset = 0;
+
+	// get the stroke style to apply
+	ID2D1StrokeStyle *pStrokeStyle = nullptr;
+	const HRESULT hr = pD2DFactory->CreateStrokeStyle(
+		strokeProps, nullptr, 0, &pStrokeStyle);
+	if (SUCCEEDED(hr)) {
+		pRenderTarget->DrawLine(
+			DPointFromPoint(start),
+			DPointFromPoint(end), pBrush, stroke.WidthF(), pStrokeStyle);
+	}
+
+	ReleaseUnknown(pStrokeStyle);
+}
+
+ID2D1PathGeometry *SurfaceD2D::Geometry(const Point *pts, size_t npts, D2D1_FIGURE_BEGIN figureBegin) noexcept {
+	ID2D1PathGeometry *geometry = nullptr;
+	HRESULT hr = pD2DFactory->CreatePathGeometry(&geometry);
+	if (SUCCEEDED(hr) && geometry) {
+		ID2D1GeometrySink *sink = nullptr;
+		hr = geometry->Open(&sink);
+		if (SUCCEEDED(hr) && sink) {
+			sink->BeginFigure(DPointFromPoint(pts[0]), figureBegin);
+			for (size_t i = 1; i < npts; i++) {
+				sink->AddLine(DPointFromPoint(pts[i]));
+			}
+			sink->EndFigure((figureBegin == D2D1_FIGURE_BEGIN_FILLED) ?
+				D2D1_FIGURE_END_CLOSED : D2D1_FIGURE_END_OPEN);
+			sink->Close();
+			ReleaseUnknown(sink);
+		}
+	}
+	return geometry;
+}
+
+void SurfaceD2D::PolyLine(const Point *pts, size_t npts, Stroke stroke) {
+	PLATFORM_ASSERT(pRenderTarget && (npts > 1));
+	if (!pRenderTarget || (npts <= 1)) {
+		return;
+	}
+
+	ID2D1PathGeometry *geometry = Geometry(pts, npts, D2D1_FIGURE_BEGIN_HOLLOW);
+	PLATFORM_ASSERT(geometry);
+	if (!geometry) {
+		return;
+	}
+
+	D2DPenColourAlpha(stroke.colour);
+	D2D1_STROKE_STYLE_PROPERTIES strokeProps {};
+	strokeProps.startCap = D2D1_CAP_STYLE_ROUND;
+	strokeProps.endCap = D2D1_CAP_STYLE_ROUND;
+	strokeProps.dashCap = D2D1_CAP_STYLE_FLAT;
+	strokeProps.lineJoin = D2D1_LINE_JOIN_MITER;
+	strokeProps.miterLimit = 4.0f;
+	strokeProps.dashStyle = D2D1_DASH_STYLE_SOLID;
+	strokeProps.dashOffset = 0;
+
+	// get the stroke style to apply
+	ID2D1StrokeStyle *pStrokeStyle = nullptr;
+	const HRESULT hr = pD2DFactory->CreateStrokeStyle(
+		strokeProps, nullptr, 0, &pStrokeStyle);
+	if (SUCCEEDED(hr)) {
+		pRenderTarget->DrawGeometry(geometry, pBrush, stroke.WidthF(), pStrokeStyle);
+	}
+	ReleaseUnknown(pStrokeStyle);
+	ReleaseUnknown(geometry);
+}
+
+void SurfaceD2D::Polygon(const Point *pts, size_t npts, FillStroke fillStroke) {
+	PLATFORM_ASSERT(pRenderTarget && (npts > 2));
+	if (pRenderTarget) {
+		ID2D1PathGeometry *geometry = Geometry(pts, npts, D2D1_FIGURE_BEGIN_FILLED);
+		PLATFORM_ASSERT(geometry);
+		if (geometry) {
+			D2DPenColourAlpha(fillStroke.fill.colour);
+			pRenderTarget->FillGeometry(geometry, pBrush);
+			D2DPenColourAlpha(fillStroke.stroke.colour);
+			pRenderTarget->DrawGeometry(geometry, pBrush, fillStroke.stroke.WidthF());
+			ReleaseUnknown(geometry);
+		}
+	}
+}
+
+void SurfaceD2D::RectangleDraw(PRectangle rc, FillStroke fillStroke) {
+	if (!pRenderTarget)
+		return;
+	const D2D1_RECT_F rect = RectangleFromPRectangle(rc);
+	const D2D1_RECT_F rectFill = RectangleInset(rect, fillStroke.stroke.WidthF());
+	const float halfStroke = fillStroke.stroke.WidthF() / 2.0f;
+	const D2D1_RECT_F rectOutline = RectangleInset(rect, halfStroke);
+
+	D2DPenColourAlpha(fillStroke.fill.colour);
+	pRenderTarget->FillRectangle(&rectFill, pBrush);
+	D2DPenColourAlpha(fillStroke.stroke.colour);
+	pRenderTarget->DrawRectangle(&rectOutline, pBrush, fillStroke.stroke.WidthF());
+}
+
+void SurfaceD2D::RectangleFrame(PRectangle rc, Stroke stroke) {
+	if (pRenderTarget) {
+		const XYPOSITION halfStroke = stroke.width / 2.0f;
+		const D2D1_RECT_F rectangle1 = RectangleFromPRectangle(rc.Inset(halfStroke));
+		D2DPenColourAlpha(stroke.colour);
+		pRenderTarget->DrawRectangle(&rectangle1, pBrush, stroke.WidthF());
+	}
+}
+
+void SurfaceD2D::FillRectangle(PRectangle rc, Fill fill) {
+	if (pRenderTarget) {
+		D2DPenColourAlpha(fill.colour);
+		const D2D1_RECT_F rectangle = RectangleFromPRectangle(rc);
+		pRenderTarget->FillRectangle(&rectangle, pBrush);
+	}
+}
+
+void SurfaceD2D::FillRectangleAligned(PRectangle rc, Fill fill) {
+	FillRectangle(PixelAlign(rc, 1), fill);
+}
+
+void SurfaceD2D::FillRectangle(PRectangle rc, Surface &surfacePattern) {
+	SurfaceD2D *psurfOther = dynamic_cast<SurfaceD2D *>(&surfacePattern);
+	PLATFORM_ASSERT(psurfOther);
+	if (!psurfOther) {
+		throw std::runtime_error("SurfaceD2D::FillRectangle: wrong Surface type.");
+	}
+	ID2D1Bitmap *pBitmap = nullptr;
+	HRESULT hr = psurfOther->GetBitmap(&pBitmap);
+	if (SUCCEEDED(hr) && pBitmap) {
+		ID2D1BitmapBrush *pBitmapBrush = nullptr;
+		const D2D1_BITMAP_BRUSH_PROPERTIES brushProperties =
+	        D2D1::BitmapBrushProperties(D2D1_EXTEND_MODE_WRAP, D2D1_EXTEND_MODE_WRAP,
+			D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
+		// Create the bitmap brush.
+		hr = pRenderTarget->CreateBitmapBrush(pBitmap, brushProperties, &pBitmapBrush);
+		ReleaseUnknown(pBitmap);
+		if (SUCCEEDED(hr) && pBitmapBrush) {
+			pRenderTarget->FillRectangle(
+				RectangleFromPRectangle(rc),
+				pBitmapBrush);
+			ReleaseUnknown(pBitmapBrush);
+		}
+	}
+}
+
+void SurfaceD2D::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
+	if (pRenderTarget) {
+		D2D1_ROUNDED_RECT roundedRectFill = {
+			RectangleFromPRectangle(rc.Inset(1.0)),
+			4, 4};
+		D2DPenColourAlpha(fillStroke.fill.colour);
+		pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
+
+		D2D1_ROUNDED_RECT roundedRect = {
+			RectangleFromPRectangle(rc.Inset(0.5)),
+			4, 4};
+		D2DPenColourAlpha(fillStroke.stroke.colour);
+		pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
+	}
+}
+
+void SurfaceD2D::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
+	const D2D1_RECT_F rect = RectangleFromPRectangle(rc);
+	const D2D1_RECT_F rectFill = RectangleInset(rect, fillStroke.stroke.WidthF());
+	const float halfStroke = fillStroke.stroke.WidthF() / 2.0f;
+	const D2D1_RECT_F rectOutline = RectangleInset(rect, halfStroke);
+	if (pRenderTarget) {
+		if (cornerSize == 0) {
+			// When corner size is zero, draw square rectangle to prevent blurry pixels at corners
+			D2DPenColourAlpha(fillStroke.fill.colour);
+			pRenderTarget->FillRectangle(rectFill, pBrush);
+
+			D2DPenColourAlpha(fillStroke.stroke.colour);
+			pRenderTarget->DrawRectangle(rectOutline, pBrush, fillStroke.stroke.WidthF());
+		} else {
+			const float cornerSizeF = static_cast<float>(cornerSize);
+			D2D1_ROUNDED_RECT roundedRectFill = {
+				rectFill, cornerSizeF - 1.0f, cornerSizeF - 1.0f };
+			D2DPenColourAlpha(fillStroke.fill.colour);
+			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
+
+			D2D1_ROUNDED_RECT roundedRect = {
+				rectOutline, cornerSizeF, cornerSizeF};
+			D2DPenColourAlpha(fillStroke.stroke.colour);
+			pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
+		}
+	}
+}
+
+void SurfaceD2D::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+	if (pRenderTarget) {
+		D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES lgbp {
+			DPointFromPoint(Point(rc.left, rc.top)), {}
+		};
+		switch (options) {
+		case GradientOptions::leftToRight:
+			lgbp.endPoint = DPointFromPoint(Point(rc.right, rc.top));
+			break;
+		case GradientOptions::topToBottom:
+		default:
+			lgbp.endPoint = DPointFromPoint(Point(rc.left, rc.bottom));
+			break;
+		}
+
+		std::vector<D2D1_GRADIENT_STOP> gradientStops;
+		for (const ColourStop &stop : stops) {
+			gradientStops.push_back({ static_cast<FLOAT>(stop.position), ColorFromColourAlpha(stop.colour) });
+		}
+		ID2D1GradientStopCollection *pGradientStops = nullptr;
+		HRESULT hr = pRenderTarget->CreateGradientStopCollection(
+			gradientStops.data(), static_cast<UINT32>(gradientStops.size()), &pGradientStops);
+		if (FAILED(hr) || !pGradientStops) {
+			return;
+		}
+		ID2D1LinearGradientBrush *pBrushLinear = nullptr;
+		hr = pRenderTarget->CreateLinearGradientBrush(
+			lgbp, pGradientStops, &pBrushLinear);
+		if (SUCCEEDED(hr) && pBrushLinear) {
+			const D2D1_RECT_F rectangle = RectangleFromPRectangle(PRectangle(
+				std::round(rc.left), rc.top, std::round(rc.right), rc.bottom));
+			pRenderTarget->FillRectangle(&rectangle, pBrushLinear);
+			ReleaseUnknown(pBrushLinear);
+		}
+		ReleaseUnknown(pGradientStops);
+	}
+}
+
+void SurfaceD2D::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	if (pRenderTarget) {
+		if (rc.Width() > width)
+			rc.left += std::floor((rc.Width() - width) / 2);
+		rc.right = rc.left + width;
+		if (rc.Height() > height)
+			rc.top += std::floor((rc.Height() - height) / 2);
+		rc.bottom = rc.top + height;
+
+		std::vector<unsigned char> image(RGBAImage::bytesPerPixel * height * width);
+		RGBAImage::BGRAFromRGBA(image.data(), pixelsImage, static_cast<ptrdiff_t>(height) * width);
+
+		ID2D1Bitmap *bitmap = nullptr;
+		const D2D1_SIZE_U size = D2D1::SizeU(width, height);
+		D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM,
+		    D2D1_ALPHA_MODE_PREMULTIPLIED}, 72.0, 72.0};
+		const HRESULT hr = pRenderTarget->CreateBitmap(size, image.data(),
+                  width * 4, &props, &bitmap);
+		if (SUCCEEDED(hr)) {
+			const D2D1_RECT_F rcDestination = RectangleFromPRectangle(rc);
+			pRenderTarget->DrawBitmap(bitmap, rcDestination);
+			ReleaseUnknown(bitmap);
+		}
+	}
+}
+
+void SurfaceD2D::Ellipse(PRectangle rc, FillStroke fillStroke) {
+	if (!pRenderTarget)
+		return;
+	const D2D1_POINT_2F centre = DPointFromPoint(rc.Centre());
+
+	const FLOAT radiusFill = static_cast<FLOAT>(rc.Width() / 2.0f - fillStroke.stroke.width);
+	const D2D1_ELLIPSE ellipseFill = { centre, radiusFill, radiusFill };
+
+	D2DPenColourAlpha(fillStroke.fill.colour);
+	pRenderTarget->FillEllipse(ellipseFill, pBrush);
+
+	const FLOAT radiusOutline = static_cast<FLOAT>(rc.Width() / 2.0f - fillStroke.stroke.width / 2.0f);
+	const D2D1_ELLIPSE ellipseOutline = { centre, radiusOutline, radiusOutline };
+
+	D2DPenColourAlpha(fillStroke.stroke.colour);
+	pRenderTarget->DrawEllipse(ellipseOutline, pBrush, fillStroke.stroke.WidthF());
+}
+
+void SurfaceD2D::Stadium(PRectangle rc, FillStroke fillStroke, Ends ends) {
+	if (!pRenderTarget)
+		return;
+	if (rc.Width() < rc.Height()) {
+		// Can't draw nice ends so just draw a rectangle
+		RectangleDraw(rc, fillStroke);
+		return;
+	}
+	const FLOAT radius = static_cast<FLOAT>(rc.Height() / 2.0);
+	const FLOAT radiusFill = radius - fillStroke.stroke.WidthF();
+	const FLOAT halfStroke = fillStroke.stroke.WidthF() / 2.0f;
+	if (ends == Surface::Ends::semiCircles) {
+		const D2D1_RECT_F rect = RectangleFromPRectangle(rc);
+		D2D1_ROUNDED_RECT roundedRectFill = { RectangleInset(rect, fillStroke.stroke.WidthF()),
+			radiusFill, radiusFill };
+		D2DPenColourAlpha(fillStroke.fill.colour);
+		pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
+
+		D2D1_ROUNDED_RECT roundedRect = { RectangleInset(rect, halfStroke),
+			radius, radius };
+		D2DPenColourAlpha(fillStroke.stroke.colour);
+		pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
+	} else {
+		const Ends leftSide = static_cast<Ends>(static_cast<int>(ends) & 0xf);
+		const Ends rightSide = static_cast<Ends>(static_cast<int>(ends) & 0xf0);
+		PRectangle rcInner = rc;
+		rcInner.left += radius;
+		rcInner.right -= radius;
+		ID2D1PathGeometry *pathGeometry = nullptr;
+		const HRESULT hrGeometry = pD2DFactory->CreatePathGeometry(&pathGeometry);
+		if (FAILED(hrGeometry) || !pathGeometry)
+			return;
+		ID2D1GeometrySink *pSink = nullptr;
+		const HRESULT hrSink = pathGeometry->Open(&pSink);
+		if (SUCCEEDED(hrSink) && pSink) {
+			switch (leftSide) {
+				case Ends::leftFlat:
+					pSink->BeginFigure(DPointFromPoint(Point(rc.left + halfStroke, rc.top + halfStroke)), D2D1_FIGURE_BEGIN_FILLED);
+					pSink->AddLine(DPointFromPoint(Point(rc.left + halfStroke, rc.bottom - halfStroke)));
+					break;
+				case Ends::leftAngle:
+					pSink->BeginFigure(DPointFromPoint(Point(rcInner.left + halfStroke, rc.top + halfStroke)), D2D1_FIGURE_BEGIN_FILLED);
+					pSink->AddLine(DPointFromPoint(Point(rc.left + halfStroke, rc.Centre().y)));
+					pSink->AddLine(DPointFromPoint(Point(rcInner.left + halfStroke, rc.bottom - halfStroke)));
+					break;
+				case Ends::semiCircles:
+				default: {
+						pSink->BeginFigure(DPointFromPoint(Point(rcInner.left + halfStroke, rc.top + halfStroke)), D2D1_FIGURE_BEGIN_FILLED);
+						D2D1_ARC_SEGMENT segment{};
+						segment.point = DPointFromPoint(Point(rcInner.left + halfStroke, rc.bottom - halfStroke));
+						segment.size = D2D1::SizeF(radiusFill, radiusFill);
+						segment.rotationAngle = 0.0f;
+						segment.sweepDirection = D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE;
+						segment.arcSize = D2D1_ARC_SIZE_SMALL;
+						pSink->AddArc(segment);
+					}
+					break;
+			}
+
+			switch (rightSide) {
+			case Ends::rightFlat:
+				pSink->AddLine(DPointFromPoint(Point(rc.right - halfStroke, rc.bottom - halfStroke)));
+				pSink->AddLine(DPointFromPoint(Point(rc.right - halfStroke, rc.top + halfStroke)));
+				break;
+			case Ends::rightAngle:
+				pSink->AddLine(DPointFromPoint(Point(rcInner.right - halfStroke, rc.bottom - halfStroke)));
+				pSink->AddLine(DPointFromPoint(Point(rc.right - halfStroke, rc.Centre().y)));
+				pSink->AddLine(DPointFromPoint(Point(rcInner.right - halfStroke, rc.top + halfStroke)));
+				break;
+			case Ends::semiCircles:
+			default: {
+					pSink->AddLine(DPointFromPoint(Point(rcInner.right - halfStroke, rc.bottom - halfStroke)));
+					D2D1_ARC_SEGMENT segment{};
+					segment.point = DPointFromPoint(Point(rcInner.right - halfStroke, rc.top + halfStroke));
+					segment.size = D2D1::SizeF(radiusFill, radiusFill);
+					segment.rotationAngle = 0.0f;
+					segment.sweepDirection = D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE;
+					segment.arcSize = D2D1_ARC_SIZE_SMALL;
+					pSink->AddArc(segment);
+				}
+				break;
+			}
+
+			pSink->EndFigure(D2D1_FIGURE_END_CLOSED);
+
+			pSink->Close();
+		}
+		ReleaseUnknown(pSink);
+		D2DPenColourAlpha(fillStroke.fill.colour);
+		pRenderTarget->FillGeometry(pathGeometry, pBrush);
+		D2DPenColourAlpha(fillStroke.stroke.colour);
+		pRenderTarget->DrawGeometry(pathGeometry, pBrush, fillStroke.stroke.WidthF());
+		ReleaseUnknown(pathGeometry);
+	}
+}
+
+void SurfaceD2D::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
+	SurfaceD2D &surfOther = dynamic_cast<SurfaceD2D &>(surfaceSource);
+	ID2D1Bitmap *pBitmap = nullptr;
+	const HRESULT hr = surfOther.GetBitmap(&pBitmap);
+	if (SUCCEEDED(hr) && pBitmap) {
+		const D2D1_RECT_F rcDestination = RectangleFromPRectangle(rc);
+		D2D1_RECT_F rcSource = RectangleFromPRectangle(PRectangle(
+			from.x, from.y, from.x + rc.Width(), from.y + rc.Height()));
+		pRenderTarget->DrawBitmap(pBitmap, rcDestination, 1.0f,
+			D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, rcSource);
+		ReleaseUnknown(pBitmap);
+	}
+}
+
+class BlobInline : public IDWriteInlineObject {
+	XYPOSITION width;
+
+	// IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv) override;
+	STDMETHODIMP_(ULONG)AddRef() override;
+	STDMETHODIMP_(ULONG)Release() override;
+
+	// IDWriteInlineObject
+	COM_DECLSPEC_NOTHROW STDMETHODIMP Draw(
+		void *clientDrawingContext,
+		IDWriteTextRenderer *renderer,
+		FLOAT originX,
+		FLOAT originY,
+		BOOL isSideways,
+		BOOL isRightToLeft,
+		IUnknown *clientDrawingEffect
+		) override;
+	COM_DECLSPEC_NOTHROW STDMETHODIMP GetMetrics(DWRITE_INLINE_OBJECT_METRICS *metrics) override;
+	COM_DECLSPEC_NOTHROW STDMETHODIMP GetOverhangMetrics(DWRITE_OVERHANG_METRICS *overhangs) override;
+	COM_DECLSPEC_NOTHROW STDMETHODIMP GetBreakConditions(
+		DWRITE_BREAK_CONDITION *breakConditionBefore,
+		DWRITE_BREAK_CONDITION *breakConditionAfter) override;
+public:
+	BlobInline(XYPOSITION width_=0.0f) noexcept : width(width_) {
+	}
+	// Defaulted so BlobInline objects can be copied.
+	BlobInline(const BlobInline &) = default;
+	BlobInline(BlobInline &&) = default;
+	BlobInline &operator=(const BlobInline &) = default;
+	BlobInline &operator=(BlobInline &&) = default;
+	virtual ~BlobInline() noexcept = default;
+};
+
+/// Implement IUnknown
+STDMETHODIMP BlobInline::QueryInterface(REFIID riid, PVOID *ppv) {
+	if (!ppv)
+		return E_POINTER;
+	// Never called so not checked.
+	*ppv = nullptr;
+	if (riid == IID_IUnknown)
+		*ppv = static_cast<IUnknown *>(this);
+	if (riid == __uuidof(IDWriteInlineObject))
+		*ppv = static_cast<IDWriteInlineObject *>(this);
+	if (!*ppv)
+		return E_NOINTERFACE;
+	return S_OK;
+}
+
+STDMETHODIMP_(ULONG) BlobInline::AddRef() {
+	// Lifetime tied to Platform methods so ignore any reference operations.
+	return 1;
+}
+
+STDMETHODIMP_(ULONG) BlobInline::Release() {
+	// Lifetime tied to Platform methods so ignore any reference operations.
+	return 1;
+}
+
+/// Implement IDWriteInlineObject
+COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::Draw(
+	void*,
+	IDWriteTextRenderer*,
+	FLOAT,
+	FLOAT,
+	BOOL,
+	BOOL,
+	IUnknown*) {
+	// Since not performing drawing, not necessary to implement
+	// Could be implemented by calling back into platform-independent code.
+	// This would allow more of the drawing to be mediated through DirectWrite.
+	return S_OK;
+}
+
+COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetMetrics(
+	DWRITE_INLINE_OBJECT_METRICS *metrics
+) {
+	if (!metrics)
+		return E_POINTER;
+	metrics->width = static_cast<FLOAT>(width);
+	metrics->height = 2;
+	metrics->baseline = 1;
+	metrics->supportsSideways = FALSE;
+	return S_OK;
+}
+
+COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetOverhangMetrics(
+	DWRITE_OVERHANG_METRICS *overhangs
+) {
+	if (!overhangs)
+		return E_POINTER;
+	overhangs->left = 0;
+	overhangs->top = 0;
+	overhangs->right = 0;
+	overhangs->bottom = 0;
+	return S_OK;
+}
+
+COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetBreakConditions(
+	DWRITE_BREAK_CONDITION *breakConditionBefore,
+	DWRITE_BREAK_CONDITION *breakConditionAfter
+) {
+	if (!breakConditionBefore || !breakConditionAfter)
+		return E_POINTER;
+	// Since not performing 2D layout, not necessary to implement
+	*breakConditionBefore = DWRITE_BREAK_CONDITION_NEUTRAL;
+	*breakConditionAfter = DWRITE_BREAK_CONDITION_NEUTRAL;
+	return S_OK;
+}
+
+class ScreenLineLayout : public IScreenLineLayout {
+	IDWriteTextLayout *textLayout = nullptr;
+	std::string text;
+	std::wstring buffer;
+	std::vector<BlobInline> blobs;
+	static void FillTextLayoutFormats(const IScreenLine *screenLine, IDWriteTextLayout *textLayout, std::vector<BlobInline> &blobs);
+	static std::wstring ReplaceRepresentation(std::string_view text);
+	static size_t GetPositionInLayout(std::string_view text, size_t position);
+public:
+	ScreenLineLayout(const IScreenLine *screenLine);
+	// Deleted so ScreenLineLayout objects can not be copied
+	ScreenLineLayout(const ScreenLineLayout &) = delete;
+	ScreenLineLayout(ScreenLineLayout &&) = delete;
+	ScreenLineLayout &operator=(const ScreenLineLayout &) = delete;
+	ScreenLineLayout &operator=(ScreenLineLayout &&) = delete;
+	~ScreenLineLayout() noexcept override;
+	size_t PositionFromX(XYPOSITION xDistance, bool charPosition) override;
+	XYPOSITION XFromPosition(size_t caretPosition) override;
+	std::vector<Interval> FindRangeIntervals(size_t start, size_t end) override;
+};
+
+// Each char can have its own style, so we fill the textLayout with the textFormat of each char
+
+void ScreenLineLayout::FillTextLayoutFormats(const IScreenLine *screenLine, IDWriteTextLayout *textLayout, std::vector<BlobInline> &blobs) {
+	// Reserve enough entries up front so they are not moved and the pointers handed
+	// to textLayout remain valid.
+	const ptrdiff_t numRepresentations = screenLine->RepresentationCount();
+	std::string_view text = screenLine->Text();
+	const ptrdiff_t numTabs = std::count(std::begin(text), std::end(text), '\t');
+	blobs.reserve(numRepresentations + numTabs);
+
+	UINT32 layoutPosition = 0;
+
+	for (size_t bytePosition = 0; bytePosition < screenLine->Length();) {
+		const unsigned char uch = screenLine->Text()[bytePosition];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		const UINT32 codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
+		const DWRITE_TEXT_RANGE textRange = { layoutPosition, codeUnits };
+
+		XYPOSITION representationWidth = screenLine->RepresentationWidth(bytePosition);
+		if ((representationWidth == 0.0f) && (screenLine->Text()[bytePosition] == '\t')) {
+			D2D1_POINT_2F realPt {};
+			DWRITE_HIT_TEST_METRICS realCaretMetrics {};
+			textLayout->HitTestTextPosition(
+				layoutPosition,
+				false, // trailing if false, else leading edge
+				&realPt.x,
+				&realPt.y,
+				&realCaretMetrics
+			);
+
+			const XYPOSITION nextTab = screenLine->TabPositionAfter(realPt.x);
+			representationWidth = nextTab - realPt.x;
+		}
+		if (representationWidth > 0.0f) {
+			blobs.push_back(BlobInline(representationWidth));
+			textLayout->SetInlineObject(&blobs.back(), textRange);
+		};
+
+		const FontDirectWrite *pfm =
+			dynamic_cast<const FontDirectWrite *>(screenLine->FontOfPosition(bytePosition));
+		if (!pfm) {
+			throw std::runtime_error("FillTextLayoutFormats: wrong Font type.");
+		}
+
+		const unsigned int fontFamilyNameSize = pfm->pTextFormat->GetFontFamilyNameLength();
+		std::wstring fontFamilyName(fontFamilyNameSize, 0);
+		const HRESULT hrFamily = pfm->pTextFormat->GetFontFamilyName(fontFamilyName.data(), fontFamilyNameSize + 1);
+		if (SUCCEEDED(hrFamily)) {
+			textLayout->SetFontFamilyName(fontFamilyName.c_str(), textRange);
+		}
+
+		textLayout->SetFontSize(pfm->pTextFormat->GetFontSize(), textRange);
+		textLayout->SetFontWeight(pfm->pTextFormat->GetFontWeight(), textRange);
+		textLayout->SetFontStyle(pfm->pTextFormat->GetFontStyle(), textRange);
+
+		const unsigned int localeNameSize = pfm->pTextFormat->GetLocaleNameLength();
+		std::wstring localeName(localeNameSize, 0);
+		const HRESULT hrLocale = pfm->pTextFormat->GetLocaleName(localeName.data(), localeNameSize + 1);
+		if (SUCCEEDED(hrLocale)) {
+			textLayout->SetLocaleName(localeName.c_str(), textRange);
+		}
+
+		textLayout->SetFontStretch(pfm->pTextFormat->GetFontStretch(), textRange);
+
+		IDWriteFontCollection *fontCollection = nullptr;
+		if (SUCCEEDED(pfm->pTextFormat->GetFontCollection(&fontCollection))) {
+			textLayout->SetFontCollection(fontCollection, textRange);
+		}
+
+		bytePosition += byteCount;
+		layoutPosition += codeUnits;
+	}
+
+}
+
+/* Convert to a wide character string and replace tabs with X to stop DirectWrite tab expansion */
+
+std::wstring ScreenLineLayout::ReplaceRepresentation(std::string_view text) {
+	const TextWide wideText(text, CpUtf8);
+	std::wstring ws(wideText.buffer, wideText.tlen);
+	std::replace(ws.begin(), ws.end(), L'\t', L'X');
+	return ws;
+}
+
+// Finds the position in the wide character version of the text.
+
+size_t ScreenLineLayout::GetPositionInLayout(std::string_view text, size_t position) {
+	const std::string_view textUptoPosition = text.substr(0, position);
+	return UTF16Length(textUptoPosition);
+}
+
+ScreenLineLayout::ScreenLineLayout(const IScreenLine *screenLine) {
+	// If the text is empty, then no need to go through this function
+	if (!screenLine || !screenLine->Length())
+		return;
+
+	text = screenLine->Text();
+
+	// Get textFormat
+	const FontDirectWrite *pfm = dynamic_cast<const FontDirectWrite *>(screenLine->FontOfPosition(0));
+
+	if (!pIDWriteFactory || !pfm || !pfm->pTextFormat) {
+		return;
+	}
+
+	// Convert the string to wstring and replace the original control characters with their representative chars.
+	buffer = ReplaceRepresentation(screenLine->Text());
+
+	// Create a text layout
+	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(
+		buffer.c_str(),
+		static_cast<UINT32>(buffer.length()),
+		pfm->pTextFormat,
+		static_cast<FLOAT>(screenLine->Width()),
+		static_cast<FLOAT>(screenLine->Height()),
+		&textLayout);
+	if (!SUCCEEDED(hrCreate)) {
+		return;
+	}
+
+	// Fill the textLayout chars with their own formats
+	FillTextLayoutFormats(screenLine, textLayout, blobs);
+}
+
+ScreenLineLayout::~ScreenLineLayout() noexcept {
+	ReleaseUnknown(textLayout);
+}
+
+// Get the position from the provided x
+
+size_t ScreenLineLayout::PositionFromX(XYPOSITION xDistance, bool charPosition) {
+	if (!textLayout) {
+		return 0;
+	}
+
+	// Returns the text position corresponding to the mouse x,y.
+	// If hitting the trailing side of a cluster, return the
+	// leading edge of the following text position.
+
+	BOOL isTrailingHit = FALSE;
+	BOOL isInside = FALSE;
+	DWRITE_HIT_TEST_METRICS caretMetrics {};
+
+	textLayout->HitTestPoint(
+		static_cast<FLOAT>(xDistance),
+		0.0f,
+		&isTrailingHit,
+		&isInside,
+		&caretMetrics
+	);
+
+	DWRITE_HIT_TEST_METRICS hitTestMetrics {};
+	if (isTrailingHit) {
+		FLOAT caretX = 0.0f;
+		FLOAT caretY = 0.0f;
+
+		// Uses hit-testing to align the current caret position to a whole cluster,
+		// rather than residing in the middle of a base character + diacritic,
+		// surrogate pair, or character + UVS.
+
+		// Align the caret to the nearest whole cluster.
+		textLayout->HitTestTextPosition(
+			caretMetrics.textPosition,
+			false,
+			&caretX,
+			&caretY,
+			&hitTestMetrics
+		);
+	}
+
+	size_t pos;
+	if (charPosition) {
+		pos = isTrailingHit ? hitTestMetrics.textPosition : caretMetrics.textPosition;
+	} else {
+		pos = isTrailingHit ? static_cast<size_t>(hitTestMetrics.textPosition) + hitTestMetrics.length : caretMetrics.textPosition;
+	}
+
+	// Get the character position in original string
+	return UTF8PositionFromUTF16Position(text, pos);
+}
+
+// Finds the point of the caret position
+
+XYPOSITION ScreenLineLayout::XFromPosition(size_t caretPosition) {
+	if (!textLayout) {
+		return 0.0;
+	}
+	// Convert byte positions to wchar_t positions
+	const size_t position = GetPositionInLayout(text, caretPosition);
+
+	// Translate text character offset to point x,y.
+	DWRITE_HIT_TEST_METRICS caretMetrics {};
+	D2D1_POINT_2F pt {};
+
+	textLayout->HitTestTextPosition(
+		static_cast<UINT32>(position),
+		false, // trailing if false, else leading edge
+		&pt.x,
+		&pt.y,
+		&caretMetrics
+	);
+
+	return pt.x;
+}
+
+// Find the selection range rectangles
+
+std::vector<Interval> ScreenLineLayout::FindRangeIntervals(size_t start, size_t end) {
+	std::vector<Interval> ret;
+
+	if (!textLayout || (start == end)) {
+		return ret;
+	}
+
+	// Convert byte positions to wchar_t positions
+	const size_t startPos = GetPositionInLayout(text, start);
+	const size_t endPos = GetPositionInLayout(text, end);
+
+	// Find selection range length
+	const size_t rangeLength = (endPos > startPos) ? (endPos - startPos) : (startPos - endPos);
+
+	// Determine actual number of hit-test ranges
+	UINT32 actualHitTestCount = 0;
+
+	// First try with 2 elements and if more needed, allocate.
+	std::vector<DWRITE_HIT_TEST_METRICS> hitTestMetrics(2);
+	textLayout->HitTestTextRange(
+		static_cast<UINT32>(startPos),
+		static_cast<UINT32>(rangeLength),
+		0, // x
+		0, // y
+		hitTestMetrics.data(),
+		static_cast<UINT32>(hitTestMetrics.size()),
+		&actualHitTestCount
+	);
+
+	if (actualHitTestCount == 0) {
+		return ret;
+	}
+
+	if (hitTestMetrics.size() < actualHitTestCount) {
+		// Allocate enough room to return all hit-test metrics.
+		hitTestMetrics.resize(actualHitTestCount);
+		textLayout->HitTestTextRange(
+			static_cast<UINT32>(startPos),
+			static_cast<UINT32>(rangeLength),
+			0, // x
+			0, // y
+			hitTestMetrics.data(),
+			static_cast<UINT32>(hitTestMetrics.size()),
+			&actualHitTestCount
+		);
+	}
+
+	// Get the selection ranges behind the text.
+
+	for (size_t i = 0; i < actualHitTestCount; ++i) {
+		// Store selection rectangle
+		const DWRITE_HIT_TEST_METRICS &htm = hitTestMetrics[i];
+		const Interval selectionInterval { htm.left, htm.left + htm.width };
+		ret.push_back(selectionInterval);
+	}
+
+	return ret;
+}
+
+std::unique_ptr<IScreenLineLayout> SurfaceD2D::Layout(const IScreenLine *screenLine) {
+	return std::make_unique<ScreenLineLayout>(screenLine);
+}
+
+void SurfaceD2D::DrawTextCommon(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text, int codePageOverride, UINT fuOptions) {
+	SetFont(font_);
+
+	// Use Unicode calls
+	const int codePageDraw = codePageOverride ? codePageOverride : codePageText;
+	const TextWide tbuf(text, codePageDraw);
+	if (pRenderTarget && pTextFormat && pBrush) {
+		if (fuOptions & ETO_CLIPPED) {
+			const D2D1_RECT_F rcClip = RectangleFromPRectangle(rc);
+			pRenderTarget->PushAxisAlignedClip(rcClip, D2D1_ANTIALIAS_MODE_ALIASED);
+		}
+
+		// Explicitly creating a text layout appears a little faster
+		IDWriteTextLayout *pTextLayout = nullptr;
+		const HRESULT hr = pIDWriteFactory->CreateTextLayout(
+				tbuf.buffer,
+				tbuf.tlen,
+				pTextFormat,
+				static_cast<FLOAT>(rc.Width()),
+				static_cast<FLOAT>(rc.Height()),
+				&pTextLayout);
+		if (SUCCEEDED(hr)) {
+			D2D1_POINT_2F origin = DPointFromPoint(Point(rc.left, ybase-yAscent));
+			pRenderTarget->DrawTextLayout(origin, pTextLayout, pBrush, d2dDrawTextOptions);
+			ReleaseUnknown(pTextLayout);
+		}
+
+		if (fuOptions & ETO_CLIPPED) {
+			pRenderTarget->PopAxisAlignedClip();
+		}
+	}
+}
+
+void SurfaceD2D::DrawTextNoClip(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	if (pRenderTarget) {
+		FillRectangleAligned(rc, back);
+		D2DPenColourAlpha(fore);
+		DrawTextCommon(rc, font_, ybase, text, 0, ETO_OPAQUE);
+	}
+}
+
+void SurfaceD2D::DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	if (pRenderTarget) {
+		FillRectangleAligned(rc, back);
+		D2DPenColourAlpha(fore);
+		DrawTextCommon(rc, font_, ybase, text, 0, ETO_OPAQUE | ETO_CLIPPED);
+	}
+}
+
+void SurfaceD2D::DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (const char ch : text) {
+		if (ch != ' ') {
+			if (pRenderTarget) {
+				D2DPenColourAlpha(fore);
+				DrawTextCommon(rc, font_, ybase, text, 0, 0);
+			}
+			return;
+		}
+	}
+}
+
+void SurfaceD2D::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	SetFont(font_);
+	if (!pIDWriteFactory || !pTextFormat) {
+		// SetFont failed or no access to DirectWrite so give up.
+		return;
+	}
+	const TextWide tbuf(text, codePageText);
+	TextPositions poses(tbuf.tlen);
+	// Initialize poses for safety.
+	std::fill(poses.buffer, poses.buffer + tbuf.tlen, 0.0f);
+	// Create a layout
+	IDWriteTextLayout *pTextLayout = nullptr;
+	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 10000.0, 1000.0, &pTextLayout);
+	if (!SUCCEEDED(hrCreate) || !pTextLayout) {
+		return;
+	}
+	constexpr int clusters = stackBufferLength;
+	DWRITE_CLUSTER_METRICS clusterMetrics[clusters];
+	UINT32 count = 0;
+	const HRESULT hrGetCluster = pTextLayout->GetClusterMetrics(clusterMetrics, clusters, &count);
+	ReleaseUnknown(pTextLayout);
+	if (!SUCCEEDED(hrGetCluster)) {
+		return;
+	}
+	// A cluster may be more than one WCHAR, such as for "ffi" which is a ligature in the Candara font
+	XYPOSITION position = 0.0;
+	int ti=0;
+	for (unsigned int ci=0; ci<count; ci++) {
+		for (unsigned int inCluster=0; inCluster<clusterMetrics[ci].length; inCluster++) {
+			poses.buffer[ti++] = position + clusterMetrics[ci].width * (inCluster + 1) / clusterMetrics[ci].length;
+		}
+		position += clusterMetrics[ci].width;
+	}
+	PLATFORM_ASSERT(ti == tbuf.tlen);
+	if (mode.codePage == CpUtf8) {
+		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+		size_t i = 0;
+		for (int ui = 0; ui < tbuf.tlen; ui++) {
+			const unsigned char uch = text[i];
+			const unsigned int byteCount = UTF8BytesOfLead[uch];
+			if (byteCount == 4) {	// Non-BMP
+				ui++;
+			}
+			for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()) && (ui<tbuf.tlen); bytePos++) {
+				positions[i++] = poses.buffer[ui];
+			}
+		}
+		const XYPOSITION lastPos = (i > 0) ? positions[i - 1] : 0.0;
+		while (i<text.length()) {
+			positions[i++] = lastPos;
+		}
+	} else if (!IsDBCSCodePage(codePageText)) {
+
+		// One char per position
+		PLATFORM_ASSERT(text.length() == static_cast<size_t>(tbuf.tlen));
+		for (int kk=0; kk<tbuf.tlen; kk++) {
+			positions[kk] = poses.buffer[kk];
+		}
+
+	} else {
+
+		// May be one or two bytes per position
+		int ui = 0;
+		for (size_t i=0; i<text.length() && ui<tbuf.tlen;) {
+			positions[i] = poses.buffer[ui];
+			if (DBCSIsLeadByte(codePageText, text[i])) {
+				positions[i+1] = poses.buffer[ui];
+				i += 2;
+			} else {
+				i++;
+			}
+
+			ui++;
+		}
+	}
+}
+
+XYPOSITION SurfaceD2D::WidthText(const Font *font_, std::string_view text) {
+	FLOAT width = 1.0;
+	SetFont(font_);
+	const TextWide tbuf(text, codePageText);
+	if (pIDWriteFactory && pTextFormat) {
+		// Create a layout
+		IDWriteTextLayout *pTextLayout = nullptr;
+		const HRESULT hr = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 1000.0, 1000.0, &pTextLayout);
+		if (SUCCEEDED(hr) && pTextLayout) {
+			DWRITE_TEXT_METRICS textMetrics;
+			if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
+				width = textMetrics.widthIncludingTrailingWhitespace;
+			ReleaseUnknown(pTextLayout);
+		}
+	}
+	return width;
+}
+
+void SurfaceD2D::DrawTextNoClipUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	if (pRenderTarget) {
+		FillRectangleAligned(rc, back);
+		D2DPenColourAlpha(fore);
+		DrawTextCommon(rc, font_, ybase, text, CpUtf8, ETO_OPAQUE);
+	}
+}
+
+void SurfaceD2D::DrawTextClippedUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore, ColourRGBA back) {
+	if (pRenderTarget) {
+		FillRectangleAligned(rc, back);
+		D2DPenColourAlpha(fore);
+		DrawTextCommon(rc, font_, ybase, text, CpUtf8, ETO_OPAQUE | ETO_CLIPPED);
+	}
+}
+
+void SurfaceD2D::DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOSITION ybase, std::string_view text,
+	ColourRGBA fore) {
+	// Avoid drawing spaces in transparent mode
+	for (const char ch : text) {
+		if (ch != ' ') {
+			if (pRenderTarget) {
+				D2DPenColourAlpha(fore);
+				DrawTextCommon(rc, font_, ybase, text, CpUtf8, 0);
+			}
+			return;
+		}
+	}
+}
+
+void SurfaceD2D::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	SetFont(font_);
+	if (!pIDWriteFactory || !pTextFormat) {
+		// SetFont failed or no access to DirectWrite so give up.
+		return;
+	}
+	const TextWide tbuf(text, CpUtf8);
+	TextPositions poses(tbuf.tlen);
+	// Initialize poses for safety.
+	std::fill(poses.buffer, poses.buffer + tbuf.tlen, 0.0f);
+	// Create a layout
+	IDWriteTextLayout *pTextLayout = nullptr;
+	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 10000.0, 1000.0, &pTextLayout);
+	if (!SUCCEEDED(hrCreate) || !pTextLayout) {
+		return;
+	}
+	constexpr int clusters = stackBufferLength;
+	DWRITE_CLUSTER_METRICS clusterMetrics[clusters];
+	UINT32 count = 0;
+	const HRESULT hrGetCluster = pTextLayout->GetClusterMetrics(clusterMetrics, clusters, &count);
+	ReleaseUnknown(pTextLayout);
+	if (!SUCCEEDED(hrGetCluster)) {
+		return;
+	}
+	// A cluster may be more than one WCHAR, such as for "ffi" which is a ligature in the Candara font
+	XYPOSITION position = 0.0;
+	int ti = 0;
+	for (unsigned int ci = 0; ci < count; ci++) {
+		for (unsigned int inCluster = 0; inCluster < clusterMetrics[ci].length; inCluster++) {
+			poses.buffer[ti++] = position + clusterMetrics[ci].width * (inCluster + 1) / clusterMetrics[ci].length;
+		}
+		position += clusterMetrics[ci].width;
+	}
+	PLATFORM_ASSERT(ti == tbuf.tlen);
+	// Map the widths given for UTF-16 characters back onto the UTF-8 input string
+	size_t i = 0;
+	for (int ui = 0; ui < tbuf.tlen; ui++) {
+		const unsigned char uch = text[i];
+		const unsigned int byteCount = UTF8BytesOfLead[uch];
+		if (byteCount == 4) {	// Non-BMP
+			ui++;
+			PLATFORM_ASSERT(ui < ti);
+		}
+		for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
+			positions[i++] = poses.buffer[ui];
+		}
+	}
+	const XYPOSITION lastPos = (i > 0) ? positions[i - 1] : 0.0;
+	while (i < text.length()) {
+		positions[i++] = lastPos;
+	}
+}
+
+XYPOSITION SurfaceD2D::WidthTextUTF8(const Font * font_, std::string_view text) {
+	FLOAT width = 1.0;
+	SetFont(font_);
+	const TextWide tbuf(text, CpUtf8);
+	if (pIDWriteFactory && pTextFormat) {
+		// Create a layout
+		IDWriteTextLayout *pTextLayout = nullptr;
+		const HRESULT hr = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 1000.0, 1000.0, &pTextLayout);
+		if (SUCCEEDED(hr)) {
+			DWRITE_TEXT_METRICS textMetrics;
+			if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
+				width = textMetrics.widthIncludingTrailingWhitespace;
+			ReleaseUnknown(pTextLayout);
+		}
+	}
+	return width;
+}
+
+XYPOSITION SurfaceD2D::Ascent(const Font *font_) {
+	SetFont(font_);
+	return std::ceil(yAscent);
+}
+
+XYPOSITION SurfaceD2D::Descent(const Font *font_) {
+	SetFont(font_);
+	return std::ceil(yDescent);
+}
+
+XYPOSITION SurfaceD2D::InternalLeading(const Font *font_) {
+	SetFont(font_);
+	return std::floor(yInternalLeading);
+}
+
+XYPOSITION SurfaceD2D::Height(const Font *font_) {
+	return Ascent(font_) + Descent(font_);
+}
+
+XYPOSITION SurfaceD2D::AverageCharWidth(const Font *font_) {
+	FLOAT width = 1.0;
+	SetFont(font_);
+	if (pIDWriteFactory && pTextFormat) {
+		// Create a layout
+		IDWriteTextLayout *pTextLayout = nullptr;
+		static const WCHAR wszAllAlpha[] = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		const size_t lenAllAlpha = wcslen(wszAllAlpha);
+		const HRESULT hr = pIDWriteFactory->CreateTextLayout(wszAllAlpha, static_cast<UINT32>(lenAllAlpha),
+			pTextFormat, 1000.0, 1000.0, &pTextLayout);
+		if (SUCCEEDED(hr) && pTextLayout) {
+			DWRITE_TEXT_METRICS textMetrics;
+			if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
+				width = textMetrics.width / lenAllAlpha;
+			ReleaseUnknown(pTextLayout);
+		}
+	}
+	return width;
+}
+
+void SurfaceD2D::SetClip(PRectangle rc) {
+	if (pRenderTarget) {
+		const D2D1_RECT_F rcClip = RectangleFromPRectangle(rc);
+		pRenderTarget->PushAxisAlignedClip(rcClip, D2D1_ANTIALIAS_MODE_ALIASED);
+		clipsActive++;
+	}
+}
+
+void SurfaceD2D::PopClip() {
+	if (pRenderTarget) {
+		PLATFORM_ASSERT(clipsActive > 0);
+		pRenderTarget->PopAxisAlignedClip();
+		clipsActive--;
+	}
+}
+
+void SurfaceD2D::FlushCachedState() {
+}
+
+void SurfaceD2D::FlushDrawing() {
+	if (pRenderTarget) {
+		pRenderTarget->Flush();
+	}
+}
+
+#endif
+
+std::unique_ptr<Surface> Surface::Allocate(Technology technology) {
+#if defined(USE_D2D)
+	if (technology == Technology::Default)
+		return std::make_unique<SurfaceGDI>();
+	else
+		return std::make_unique<SurfaceD2D>();
+#else
+	return std::make_unique<SurfaceGDI>();
+#endif
+}
+
+Window::~Window() noexcept {
+}
+
+void Window::Destroy() noexcept {
+	if (wid)
+		::DestroyWindow(HwndFromWindowID(wid));
+	wid = nullptr;
+}
+
+PRectangle Window::GetPosition() const {
+	RECT rc;
+	::GetWindowRect(HwndFromWindowID(wid), &rc);
+	return PRectangle::FromInts(rc.left, rc.top, rc.right, rc.bottom);
+}
+
+void Window::SetPosition(PRectangle rc) {
+	::SetWindowPos(HwndFromWindowID(wid),
+		0, static_cast<int>(rc.left), static_cast<int>(rc.top),
+		static_cast<int>(rc.Width()), static_cast<int>(rc.Height()), SWP_NOZORDER | SWP_NOACTIVATE);
+}
+
+namespace {
+
+static RECT RectFromMonitor(HMONITOR hMonitor) noexcept {
+	MONITORINFO mi = {};
+	mi.cbSize = sizeof(mi);
+	if (GetMonitorInfo(hMonitor, &mi)) {
+		return mi.rcWork;
+	}
+	RECT rc = {0, 0, 0, 0};
+	if (::SystemParametersInfoA(SPI_GETWORKAREA, 0, &rc, 0) == 0) {
+		rc.left = 0;
+		rc.top = 0;
+		rc.right = 0;
+		rc.bottom = 0;
+	}
+	return rc;
+}
+
+}
+
+void Window::SetPositionRelative(PRectangle rc, const Window *relativeTo) {
+	const DWORD style = GetWindowStyle(HwndFromWindowID(wid));
+	if (style & WS_POPUP) {
+		POINT ptOther = {0, 0};
+		::ClientToScreen(HwndFromWindow(*relativeTo), &ptOther);
+		rc.Move(static_cast<XYPOSITION>(ptOther.x), static_cast<XYPOSITION>(ptOther.y));
+
+		const RECT rcMonitor = RectFromPRectangle(rc);
+
+		HMONITOR hMonitor = MonitorFromRect(&rcMonitor, MONITOR_DEFAULTTONEAREST);
+		// If hMonitor is NULL, that's just the main screen anyways.
+		const RECT rcWork = RectFromMonitor(hMonitor);
+
+		if (rcWork.left < rcWork.right) {
+			// Now clamp our desired rectangle to fit inside the work area
+			// This way, the menu will fit wholly on one screen. An improvement even
+			// if you don't have a second monitor on the left... Menu's appears half on
+			// one screen and half on the other are just U.G.L.Y.!
+			if (rc.right > rcWork.right)
+				rc.Move(rcWork.right - rc.right, 0);
+			if (rc.bottom > rcWork.bottom)
+				rc.Move(0, rcWork.bottom - rc.bottom);
+			if (rc.left < rcWork.left)
+				rc.Move(rcWork.left - rc.left, 0);
+			if (rc.top < rcWork.top)
+				rc.Move(0, rcWork.top - rc.top);
+		}
+	}
+	SetPosition(rc);
+}
+
+PRectangle Window::GetClientPosition() const {
+	RECT rc={0,0,0,0};
+	if (wid)
+		::GetClientRect(HwndFromWindowID(wid), &rc);
+	return PRectangle::FromInts(rc.left, rc.top, rc.right, rc.bottom);
+}
+
+void Window::Show(bool show) {
+	if (show)
+		::ShowWindow(HwndFromWindowID(wid), SW_SHOWNOACTIVATE);
+	else
+		::ShowWindow(HwndFromWindowID(wid), SW_HIDE);
+}
+
+void Window::InvalidateAll() {
+	::InvalidateRect(HwndFromWindowID(wid), nullptr, FALSE);
+}
+
+void Window::InvalidateRectangle(PRectangle rc) {
+	const RECT rcw = RectFromPRectangle(rc);
+	::InvalidateRect(HwndFromWindowID(wid), &rcw, FALSE);
+}
+
+namespace {
+
+void FlipBitmap(HBITMAP bitmap, int width, int height) noexcept {
+	HDC hdc = ::CreateCompatibleDC({});
+	if (hdc) {
+		HBITMAP prevBmp = SelectBitmap(hdc, bitmap);
+		::StretchBlt(hdc, width - 1, 0, -width, height, hdc, 0, 0, width, height, SRCCOPY);
+		SelectBitmap(hdc, prevBmp);
+		::DeleteDC(hdc);
+	}
+}
+
+}
+
+HCURSOR LoadReverseArrowCursor(UINT dpi) noexcept {
+	HCURSOR reverseArrowCursor {};
+
+	bool created = false;
+	HCURSOR cursor = ::LoadCursor({}, IDC_ARROW);
+
+	if (dpi != uSystemDPI) {
+		const int width = SystemMetricsForDpi(SM_CXCURSOR, dpi);
+		const int height = SystemMetricsForDpi(SM_CYCURSOR, dpi);
+		HCURSOR copy = static_cast<HCURSOR>(::CopyImage(cursor, IMAGE_CURSOR, width, height, LR_COPYFROMRESOURCE | LR_COPYRETURNORG));
+		if (copy) {
+			created = copy != cursor;
+			cursor = copy;
+		}
+	}
+
+	ICONINFO info;
+	if (::GetIconInfo(cursor, &info)) {
+		BITMAP bmp {};
+		if (::GetObject(info.hbmMask, sizeof(bmp), &bmp)) {
+			FlipBitmap(info.hbmMask, bmp.bmWidth, bmp.bmHeight);
+			if (info.hbmColor)
+				FlipBitmap(info.hbmColor, bmp.bmWidth, bmp.bmHeight);
+			info.xHotspot = bmp.bmWidth - 1 - info.xHotspot;
+
+			reverseArrowCursor = ::CreateIconIndirect(&info);
+		}
+
+		::DeleteObject(info.hbmMask);
+		if (info.hbmColor)
+			::DeleteObject(info.hbmColor);
+	}
+
+	if (created) {
+		::DestroyCursor(cursor);
+	}
+	return reverseArrowCursor;
+}
+
+void Window::SetCursor(Cursor curs) {
+	switch (curs) {
+	case Cursor::text:
+		::SetCursor(::LoadCursor(NULL,IDC_IBEAM));
+		break;
+	case Cursor::up:
+		::SetCursor(::LoadCursor(NULL,IDC_UPARROW));
+		break;
+	case Cursor::wait:
+		::SetCursor(::LoadCursor(NULL,IDC_WAIT));
+		break;
+	case Cursor::horizontal:
+		::SetCursor(::LoadCursor(NULL,IDC_SIZEWE));
+		break;
+	case Cursor::vertical:
+		::SetCursor(::LoadCursor(NULL,IDC_SIZENS));
+		break;
+	case Cursor::hand:
+		::SetCursor(::LoadCursor(NULL,IDC_HAND));
+		break;
+	case Cursor::reverseArrow:
+	case Cursor::arrow:
+	case Cursor::invalid:	// Should not occur, but just in case.
+		::SetCursor(::LoadCursor(NULL,IDC_ARROW));
+		break;
+	}
+}
+
+/* Returns rectangle of monitor pt is on, both rect and pt are in Window's
+   coordinates */
+PRectangle Window::GetMonitorRect(Point pt) {
+	const PRectangle rcPosition = GetPosition();
+	POINT ptDesktop = {static_cast<LONG>(pt.x + rcPosition.left),
+		static_cast<LONG>(pt.y + rcPosition.top)};
+	HMONITOR hMonitor = MonitorFromPoint(ptDesktop, MONITOR_DEFAULTTONEAREST);
+
+	const RECT rcWork = RectFromMonitor(hMonitor);
+	if (rcWork.left < rcWork.right) {
+		PRectangle rcMonitor(
+			rcWork.left - rcPosition.left,
+			rcWork.top - rcPosition.top,
+			rcWork.right - rcPosition.left,
+			rcWork.bottom - rcPosition.top);
+		return rcMonitor;
+	} else {
+		return PRectangle();
+	}
+}
+
+struct ListItemData {
+	const char *text;
+	int pixId;
+};
+
+class LineToItem {
+	std::vector<char> words;
+
+	std::vector<ListItemData> data;
+
+public:
+	void Clear() noexcept {
+		words.clear();
+		data.clear();
+	}
+
+	ListItemData Get(size_t index) const noexcept {
+		if (index < data.size()) {
+			return data[index];
+		} else {
+			ListItemData missing = {"", -1};
+			return missing;
+		}
+	}
+	int Count() const noexcept {
+		return static_cast<int>(data.size());
+	}
+
+	void AllocItem(const char *text, int pixId) {
+		ListItemData lid = { text, pixId };
+		data.push_back(lid);
+	}
+
+	char *SetWords(const char *s) {
+		words = std::vector<char>(s, s+strlen(s)+1);
+		return &words[0];
+	}
+};
+
+const TCHAR ListBoxX_ClassName[] = TEXT("ListBoxX");
+
+ListBox::ListBox() noexcept {
+}
+
+ListBox::~ListBox() noexcept {
+}
+
+class ListBoxX : public ListBox {
+	int lineHeight;
+	HFONT fontCopy;
+	Technology technology;
+	RGBAImageSet images;
+	LineToItem lti;
+	HWND lb;
+	bool unicodeMode;
+	int desiredVisibleRows;
+	unsigned int maxItemCharacters;
+	unsigned int aveCharWidth;
+	Window *parent;
+	int ctrlID;
+	UINT dpi;
+	IListBoxDelegate *delegate;
+	const char *widestItem;
+	unsigned int maxCharWidth;
+	WPARAM resizeHit;
+	PRectangle rcPreSize;
+	Point dragOffset;
+	Point location;	// Caret location at which the list is opened
+	int wheelDelta; // mouse wheel residue
+	ListOptions options;
+	DWORD frameStyle = WS_THICKFRAME;
+
+	HWND GetHWND() const noexcept;
+	void AppendListItem(const char *text, const char *numword);
+	void AdjustWindowRect(PRectangle *rc, UINT dpiAdjust) const noexcept;
+	int ItemHeight() const;
+	int MinClientWidth() const noexcept;
+	int TextOffset() const;
+	POINT GetClientExtent() const noexcept;
+	POINT MinTrackSize() const;
+	POINT MaxTrackSize() const;
+	void SetRedraw(bool on) noexcept;
+	void OnDoubleClick();
+	void OnSelChange();
+	void ResizeToCursor();
+	void StartResize(WPARAM);
+	LRESULT NcHitTest(WPARAM, LPARAM) const;
+	void CentreItem(int n);
+	void Paint(HDC);
+	static LRESULT PASCAL ControlWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+
+	static constexpr Point ItemInset {0, 0};	// Padding around whole item
+	static constexpr Point TextInset {2, 0};	// Padding around text
+	static constexpr Point ImageInset {1, 0};	// Padding around image
+
+public:
+	ListBoxX() : lineHeight(10), fontCopy{}, technology(Technology::Default), lb{}, unicodeMode(false),
+		desiredVisibleRows(9), maxItemCharacters(0), aveCharWidth(8),
+		parent(nullptr), ctrlID(0), dpi(USER_DEFAULT_SCREEN_DPI),
+		delegate(nullptr),
+		widestItem(nullptr), maxCharWidth(1), resizeHit(0), wheelDelta(0) {
+	}
+	ListBoxX(const ListBoxX &) = delete;
+	ListBoxX(ListBoxX &&) = delete;
+	ListBoxX &operator=(const ListBoxX &) = delete;
+	ListBoxX &operator=(ListBoxX &&) = delete;
+	~ListBoxX() noexcept override {
+		if (fontCopy) {
+			::DeleteObject(fontCopy);
+			fontCopy = 0;
+		}
+	}
+	void SetFont(const Font *font) override;
+	void Create(Window &parent_, int ctrlID_, Point location_, int lineHeight_, bool unicodeMode_, Technology technology_) override;
+	void SetAverageCharWidth(int width) override;
+	void SetVisibleRows(int rows) override;
+	int GetVisibleRows() const override;
+	PRectangle GetDesiredRect() override;
+	int CaretFromEdge() override;
+	void Clear() noexcept override;
+	void Append(char *s, int type = -1) override;
+	int Length() override;
+	void Select(int n) override;
+	int GetSelection() override;
+	int Find(const char *prefix) override;
+	std::string GetValue(int n) override;
+	void RegisterImage(int type, const char *xpm_data) override;
+	void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override;
+	void ClearRegisteredImages() override;
+	void SetDelegate(IListBoxDelegate *lbDelegate) override;
+	void SetList(const char *list, char separator, char typesep) override;
+	void SetOptions(ListOptions options_) override;
+	void Draw(DRAWITEMSTRUCT *pDrawItem);
+	LRESULT WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+	static LRESULT PASCAL StaticWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+};
+
+std::unique_ptr<ListBox> ListBox::Allocate() {
+	return std::make_unique<ListBoxX>();
+}
+
+void ListBoxX::Create(Window &parent_, int ctrlID_, Point location_, int lineHeight_, bool unicodeMode_, Technology technology_) {
+	parent = &parent_;
+	ctrlID = ctrlID_;
+	location = location_;
+	lineHeight = lineHeight_;
+	unicodeMode = unicodeMode_;
+	technology = technology_;
+	HWND hwndParent = HwndFromWindow(*parent);
+	HINSTANCE hinstanceParent = GetWindowInstance(hwndParent);
+	// Window created as popup so not clipped within parent client area
+	wid = ::CreateWindowEx(
+		WS_EX_WINDOWEDGE, ListBoxX_ClassName, TEXT(""),
+		WS_POPUP | frameStyle,
+		100,100, 150,80, hwndParent,
+		NULL,
+		hinstanceParent,
+		this);
+
+	dpi = DpiForWindow(hwndParent);
+	POINT locationw = POINTFromPoint(location);
+	::MapWindowPoints(hwndParent, NULL, &locationw, 1);
+	location = PointFromPOINT(locationw);
+}
+
+void ListBoxX::SetFont(const Font *font) {
+	const FontWin *pfm = dynamic_cast<const FontWin *>(font);
+	if (pfm) {
+		if (fontCopy) {
+			::DeleteObject(fontCopy);
+			fontCopy = 0;
+		}
+		fontCopy = pfm->HFont();
+		SetWindowFont(lb, fontCopy, 0);
+	}
+}
+
+void ListBoxX::SetAverageCharWidth(int width) {
+	aveCharWidth = width;
+}
+
+void ListBoxX::SetVisibleRows(int rows) {
+	desiredVisibleRows = rows;
+}
+
+int ListBoxX::GetVisibleRows() const {
+	return desiredVisibleRows;
+}
+
+HWND ListBoxX::GetHWND() const noexcept {
+	return HwndFromWindowID(GetID());
+}
+
+PRectangle ListBoxX::GetDesiredRect() {
+	PRectangle rcDesired = GetPosition();
+
+	int rows = Length();
+	if ((rows == 0) || (rows > desiredVisibleRows))
+		rows = desiredVisibleRows;
+	rcDesired.bottom = rcDesired.top + ItemHeight() * rows;
+
+	int width = MinClientWidth();
+	HDC hdc = ::GetDC(lb);
+	HFONT oldFont = SelectFont(hdc, fontCopy);
+	SIZE textSize = {0, 0};
+	int len = 0;
+	if (widestItem) {
+		len = static_cast<int>(strlen(widestItem));
+		if (unicodeMode) {
+			const TextWide tbuf(widestItem, CpUtf8);
+			::GetTextExtentPoint32W(hdc, tbuf.buffer, tbuf.tlen, &textSize);
+		} else {
+			::GetTextExtentPoint32A(hdc, widestItem, len, &textSize);
+		}
+	}
+	TEXTMETRIC tm;
+	::GetTextMetrics(hdc, &tm);
+	maxCharWidth = tm.tmMaxCharWidth;
+	SelectFont(hdc, oldFont);
+	::ReleaseDC(lb, hdc);
+
+	const int widthDesired = std::max(textSize.cx, (len + 1) * tm.tmAveCharWidth);
+	if (width < widthDesired)
+		width = widthDesired;
+
+	rcDesired.right = rcDesired.left + TextOffset() + width + (TextInset.x * 2);
+	if (Length() > rows)
+		rcDesired.right += SystemMetricsForDpi(SM_CXVSCROLL, dpi);
+
+	AdjustWindowRect(&rcDesired, dpi);
+	return rcDesired;
+}
+
+int ListBoxX::TextOffset() const {
+	const int pixWidth = images.GetWidth();
+	return static_cast<int>(pixWidth == 0 ? ItemInset.x : ItemInset.x + pixWidth + (ImageInset.x * 2));
+}
+
+int ListBoxX::CaretFromEdge() {
+	PRectangle rc;
+	AdjustWindowRect(&rc, dpi);
+	return TextOffset() + static_cast<int>(TextInset.x + (0 - rc.left) - 1);
+}
+
+void ListBoxX::Clear() noexcept {
+	ListBox_ResetContent(lb);
+	maxItemCharacters = 0;
+	widestItem = nullptr;
+	lti.Clear();
+}
+
+void ListBoxX::Append(char *, int) {
+	// This method is no longer called in Scintilla
+	PLATFORM_ASSERT(false);
+}
+
+int ListBoxX::Length() {
+	return lti.Count();
+}
+
+void ListBoxX::Select(int n) {
+	// We are going to scroll to centre on the new selection and then select it, so disable
+	// redraw to avoid flicker caused by a painting new selection twice in unselected and then
+	// selected states
+	SetRedraw(false);
+	CentreItem(n);
+	ListBox_SetCurSel(lb, n);
+	OnSelChange();
+	SetRedraw(true);
+}
+
+int ListBoxX::GetSelection() {
+	return ListBox_GetCurSel(lb);
+}
+
+// This is not actually called at present
+int ListBoxX::Find(const char *) {
+	return LB_ERR;
+}
+
+std::string ListBoxX::GetValue(int n) {
+	const ListItemData item = lti.Get(n);
+	return item.text;
+}
+
+void ListBoxX::RegisterImage(int type, const char *xpm_data) {
+	XPM xpmImage(xpm_data);
+	images.AddImage(type, std::make_unique<RGBAImage>(xpmImage));
+}
+
+void ListBoxX::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+	images.AddImage(type, std::make_unique<RGBAImage>(width, height, 1.0f, pixelsImage));
+}
+
+void ListBoxX::ClearRegisteredImages() {
+	images.Clear();
+}
+
+namespace {
+
+int ColourOfElement(std::optional<ColourRGBA> colour, int nIndex) {
+	if (colour.has_value()) {
+		return colour.value().OpaqueRGB();
+	} else {
+		return ::GetSysColor(nIndex);
+	}
+}
+
+void FillRectColour(HDC hdc, const RECT *lprc, int colour) noexcept {
+	const HBRUSH brush = ::CreateSolidBrush(colour);
+	::FillRect(hdc, lprc, brush);
+	::DeleteObject(brush);
+}
+
+}
+
+void ListBoxX::Draw(DRAWITEMSTRUCT *pDrawItem) {
+	if ((pDrawItem->itemAction == ODA_SELECT) || (pDrawItem->itemAction == ODA_DRAWENTIRE)) {
+		RECT rcBox = pDrawItem->rcItem;
+		rcBox.left += TextOffset();
+		if (pDrawItem->itemState & ODS_SELECTED) {
+			RECT rcImage = pDrawItem->rcItem;
+			rcImage.right = rcBox.left;
+			// The image is not highlighted
+			FillRectColour(pDrawItem->hDC, &rcImage, ColourOfElement(options.back, COLOR_WINDOW));
+			FillRectColour(pDrawItem->hDC, &rcBox, ColourOfElement(options.backSelected, COLOR_HIGHLIGHT));
+			::SetBkColor(pDrawItem->hDC, ColourOfElement(options.backSelected, COLOR_HIGHLIGHT));
+			::SetTextColor(pDrawItem->hDC, ColourOfElement(options.foreSelected, COLOR_HIGHLIGHTTEXT));
+		} else {
+			FillRectColour(pDrawItem->hDC, &pDrawItem->rcItem, ColourOfElement(options.back, COLOR_WINDOW));
+			::SetBkColor(pDrawItem->hDC, ColourOfElement(options.back, COLOR_WINDOW));
+			::SetTextColor(pDrawItem->hDC, ColourOfElement(options.fore, COLOR_WINDOWTEXT));
+		}
+
+		const ListItemData item = lti.Get(pDrawItem->itemID);
+		const int pixId = item.pixId;
+		const char *text = item.text;
+		const int len = static_cast<int>(strlen(text));
+
+		RECT rcText = rcBox;
+		::InsetRect(&rcText, static_cast<int>(TextInset.x), static_cast<int>(TextInset.y));
+
+		if (unicodeMode) {
+			const TextWide tbuf(text, CpUtf8);
+			::DrawTextW(pDrawItem->hDC, tbuf.buffer, tbuf.tlen, &rcText, DT_NOPREFIX|DT_END_ELLIPSIS|DT_SINGLELINE|DT_NOCLIP);
+		} else {
+			::DrawTextA(pDrawItem->hDC, text, len, &rcText, DT_NOPREFIX|DT_END_ELLIPSIS|DT_SINGLELINE|DT_NOCLIP);
+		}
+
+		// Draw the image, if any
+		const RGBAImage *pimage = images.Get(pixId);
+		if (pimage) {
+			std::unique_ptr<Surface> surfaceItem(Surface::Allocate(technology));
+			if (technology == Technology::Default) {
+				surfaceItem->Init(pDrawItem->hDC, pDrawItem->hwndItem);
+				const long left = pDrawItem->rcItem.left + static_cast<int>(ItemInset.x + ImageInset.x);
+				const PRectangle rcImage = PRectangle::FromInts(left, pDrawItem->rcItem.top,
+					left + images.GetWidth(), pDrawItem->rcItem.bottom);
+				surfaceItem->DrawRGBAImage(rcImage,
+					pimage->GetWidth(), pimage->GetHeight(), pimage->Pixels());
+				::SetTextAlign(pDrawItem->hDC, TA_TOP);
+			} else {
+#if defined(USE_D2D)
+				const D2D1_RENDER_TARGET_PROPERTIES props = D2D1::RenderTargetProperties(
+					D2D1_RENDER_TARGET_TYPE_DEFAULT,
+					D2D1::PixelFormat(
+						DXGI_FORMAT_B8G8R8A8_UNORM,
+						D2D1_ALPHA_MODE_IGNORE),
+					0,
+					0,
+					D2D1_RENDER_TARGET_USAGE_NONE,
+					D2D1_FEATURE_LEVEL_DEFAULT
+					);
+				ID2D1DCRenderTarget *pDCRT = nullptr;
+				HRESULT hr = pD2DFactory->CreateDCRenderTarget(&props, &pDCRT);
+				if (SUCCEEDED(hr) && pDCRT) {
+					RECT rcWindow;
+					GetClientRect(pDrawItem->hwndItem, &rcWindow);
+					hr = pDCRT->BindDC(pDrawItem->hDC, &rcWindow);
+					if (SUCCEEDED(hr)) {
+						surfaceItem->Init(pDCRT, pDrawItem->hwndItem);
+						pDCRT->BeginDraw();
+						const long left = pDrawItem->rcItem.left + static_cast<long>(ItemInset.x + ImageInset.x);
+						const PRectangle rcImage = PRectangle::FromInts(left, pDrawItem->rcItem.top,
+							left + images.GetWidth(), pDrawItem->rcItem.bottom);
+						surfaceItem->DrawRGBAImage(rcImage,
+							pimage->GetWidth(), pimage->GetHeight(), pimage->Pixels());
+						pDCRT->EndDraw();
+						ReleaseUnknown(pDCRT);
+					}
+				}
+#endif
+			}
+		}
+	}
+}
+
+void ListBoxX::AppendListItem(const char *text, const char *numword) {
+	int pixId = -1;
+	if (numword) {
+		pixId = 0;
+		char ch;
+		while ((ch = *++numword) != '\0') {
+			pixId = 10 * pixId + (ch - '0');
+		}
+	}
+
+	lti.AllocItem(text, pixId);
+	const unsigned int len = static_cast<unsigned int>(strlen(text));
+	if (maxItemCharacters < len) {
+		maxItemCharacters = len;
+		widestItem = text;
+	}
+}
+
+void ListBoxX::SetDelegate(IListBoxDelegate *lbDelegate) {
+	delegate = lbDelegate;
+}
+
+void ListBoxX::SetList(const char *list, char separator, char typesep) {
+	// Turn off redraw while populating the list - this has a significant effect, even if
+	// the listbox is not visible.
+	SetRedraw(false);
+	Clear();
+	const size_t size = strlen(list);
+	char *words = lti.SetWords(list);
+	char *startword = words;
+	char *numword = nullptr;
+	for (size_t i=0; i < size; i++) {
+		if (words[i] == separator) {
+			words[i] = '\0';
+			if (numword)
+				*numword = '\0';
+			AppendListItem(startword, numword);
+			startword = words + i + 1;
+			numword = nullptr;
+		} else if (words[i] == typesep) {
+			numword = words + i;
+		}
+	}
+	if (startword) {
+		if (numword)
+			*numword = '\0';
+		AppendListItem(startword, numword);
+	}
+
+	// Finally populate the listbox itself with the correct number of items
+	const int count = lti.Count();
+	::SendMessage(lb, LB_INITSTORAGE, count, 0);
+	for (intptr_t j=0; j<count; j++) {
+		ListBox_AddItemData(lb, j+1);
+	}
+	SetRedraw(true);
+}
+
+void ListBoxX::SetOptions(ListOptions options_) {
+	options = options_;
+	frameStyle = FlagSet(options.options, AutoCompleteOption::FixedSize) ? WS_BORDER : WS_THICKFRAME;
+}
+
+void ListBoxX::AdjustWindowRect(PRectangle *rc, UINT dpiAdjust) const noexcept {
+	RECT rcw = RectFromPRectangle(*rc);
+	if (fnAdjustWindowRectExForDpi) {
+		fnAdjustWindowRectExForDpi(&rcw, frameStyle, false, WS_EX_WINDOWEDGE, dpiAdjust);
+	} else {
+		::AdjustWindowRectEx(&rcw, frameStyle, false, WS_EX_WINDOWEDGE);
+	}
+	*rc = PRectangle::FromInts(rcw.left, rcw.top, rcw.right, rcw.bottom);
+}
+
+int ListBoxX::ItemHeight() const {
+	int itemHeight = lineHeight + (static_cast<int>(TextInset.y) * 2);
+	const int pixHeight = images.GetHeight() + (static_cast<int>(ImageInset.y) * 2);
+	if (itemHeight < pixHeight) {
+		itemHeight = pixHeight;
+	}
+	return itemHeight;
+}
+
+int ListBoxX::MinClientWidth() const noexcept {
+	return 12 * (aveCharWidth+aveCharWidth/3);
+}
+
+POINT ListBoxX::MinTrackSize() const {
+	PRectangle rc = PRectangle::FromInts(0, 0, MinClientWidth(), ItemHeight());
+	AdjustWindowRect(&rc, dpi);
+	POINT ret = {static_cast<LONG>(rc.Width()), static_cast<LONG>(rc.Height())};
+	return ret;
+}
+
+POINT ListBoxX::MaxTrackSize() const {
+	PRectangle rc = PRectangle::FromInts(0, 0,
+		std::max(static_cast<unsigned int>(MinClientWidth()),
+		maxCharWidth * maxItemCharacters + static_cast<int>(TextInset.x) * 2 +
+		 TextOffset() + SystemMetricsForDpi(SM_CXVSCROLL, dpi)),
+		ItemHeight() * lti.Count());
+	AdjustWindowRect(&rc, dpi);
+	POINT ret = {static_cast<LONG>(rc.Width()), static_cast<LONG>(rc.Height())};
+	return ret;
+}
+
+void ListBoxX::SetRedraw(bool on) noexcept {
+	::SendMessage(lb, WM_SETREDRAW, on, 0);
+	if (on)
+		::InvalidateRect(lb, nullptr, TRUE);
+}
+
+void ListBoxX::ResizeToCursor() {
+	PRectangle rc = GetPosition();
+	POINT ptw;
+	::GetCursorPos(&ptw);
+	const Point pt = PointFromPOINT(ptw) + dragOffset;
+
+	switch (resizeHit) {
+		case HTLEFT:
+			rc.left = pt.x;
+			break;
+		case HTRIGHT:
+			rc.right = pt.x;
+			break;
+		case HTTOP:
+			rc.top = pt.y;
+			break;
+		case HTTOPLEFT:
+			rc.top = pt.y;
+			rc.left = pt.x;
+			break;
+		case HTTOPRIGHT:
+			rc.top = pt.y;
+			rc.right = pt.x;
+			break;
+		case HTBOTTOM:
+			rc.bottom = pt.y;
+			break;
+		case HTBOTTOMLEFT:
+			rc.bottom = pt.y;
+			rc.left = pt.x;
+			break;
+		case HTBOTTOMRIGHT:
+			rc.bottom = pt.y;
+			rc.right = pt.x;
+			break;
+		default:
+			break;
+	}
+
+	const POINT ptMin = MinTrackSize();
+	const POINT ptMax = MaxTrackSize();
+	// We don't allow the left edge to move at present, but just in case
+	rc.left = std::clamp(rc.left, rcPreSize.right - ptMax.x, rcPreSize.right - ptMin.x);
+	rc.top = std::clamp(rc.top, rcPreSize.bottom - ptMax.y, rcPreSize.bottom - ptMin.y);
+	rc.right = std::clamp(rc.right, rcPreSize.left + ptMin.x, rcPreSize.left + ptMax.x);
+	rc.bottom = std::clamp(rc.bottom, rcPreSize.top + ptMin.y, rcPreSize.top + ptMax.y);
+
+	SetPosition(rc);
+}
+
+void ListBoxX::StartResize(WPARAM hitCode) {
+	rcPreSize = GetPosition();
+	POINT cursorPos;
+	::GetCursorPos(&cursorPos);
+
+	switch (hitCode) {
+		case HTRIGHT:
+		case HTBOTTOM:
+		case HTBOTTOMRIGHT:
+			dragOffset.x = rcPreSize.right - cursorPos.x;
+			dragOffset.y = rcPreSize.bottom - cursorPos.y;
+			break;
+
+		case HTTOPRIGHT:
+			dragOffset.x = rcPreSize.right - cursorPos.x;
+			dragOffset.y = rcPreSize.top - cursorPos.y;
+			break;
+
+		// Note that the current hit test code prevents the left edge cases ever firing
+		// as we don't want the left edge to be movable
+		case HTLEFT:
+		case HTTOP:
+		case HTTOPLEFT:
+			dragOffset.x = rcPreSize.left - cursorPos.x;
+			dragOffset.y = rcPreSize.top - cursorPos.y;
+			break;
+		case HTBOTTOMLEFT:
+			dragOffset.x = rcPreSize.left - cursorPos.x;
+			dragOffset.y = rcPreSize.bottom - cursorPos.y;
+			break;
+
+		default:
+			return;
+	}
+
+	::SetCapture(GetHWND());
+	resizeHit = hitCode;
+}
+
+LRESULT ListBoxX::NcHitTest(WPARAM wParam, LPARAM lParam) const {
+	const PRectangle rc = GetPosition();
+
+	LRESULT hit = ::DefWindowProc(GetHWND(), WM_NCHITTEST, wParam, lParam);
+	// There is an apparent bug in the DefWindowProc hit test code whereby it will
+	// return HTTOPXXX if the window in question is shorter than the default
+	// window caption height + frame, even if one is hovering over the bottom edge of
+	// the frame, so workaround that here
+	if (hit >= HTTOP && hit <= HTTOPRIGHT) {
+		const int minHeight = SystemMetricsForDpi(SM_CYMINTRACK, dpi);
+		const int yPos = GET_Y_LPARAM(lParam);
+		if ((rc.Height() < minHeight) && (yPos > ((rc.top + rc.bottom)/2))) {
+			hit += HTBOTTOM - HTTOP;
+		}
+	}
+
+	// Never permit resizing that moves the left edge. Allow movement of top or bottom edge
+	// depending on whether the list is above or below the caret
+	switch (hit) {
+		case HTLEFT:
+		case HTTOPLEFT:
+		case HTBOTTOMLEFT:
+			hit = HTERROR;
+			break;
+
+		case HTTOP:
+		case HTTOPRIGHT: {
+				// Valid only if caret below list
+				if (location.y < rc.top)
+					hit = HTERROR;
+			}
+			break;
+
+		case HTBOTTOM:
+		case HTBOTTOMRIGHT: {
+				// Valid only if caret above list
+				if (rc.bottom <= location.y)
+					hit = HTERROR;
+			}
+			break;
+		default:
+			break;
+	}
+
+	return hit;
+}
+
+void ListBoxX::OnDoubleClick() {
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::doubleClick);
+		delegate->ListNotify(&event);
+	}
+}
+
+void ListBoxX::OnSelChange() {
+	if (delegate) {
+		ListBoxEvent event(ListBoxEvent::EventType::selectionChange);
+		delegate->ListNotify(&event);
+	}
+}
+
+POINT ListBoxX::GetClientExtent() const noexcept {
+	RECT rc;
+	::GetWindowRect(HwndFromWindowID(wid), &rc);
+	POINT ret { rc.right - rc.left, rc.bottom - rc.top };
+	return ret;
+}
+
+void ListBoxX::CentreItem(int n) {
+	// If below mid point, scroll up to centre, but with more items below if uneven
+	if (n >= 0) {
+		const POINT extent = GetClientExtent();
+		const int visible = extent.y/ItemHeight();
+		if (visible < Length()) {
+			const int top = ListBox_GetTopIndex(lb);
+			const int half = (visible - 1) / 2;
+			if (n > (top + half))
+				ListBox_SetTopIndex(lb, n - half);
+		}
+	}
+}
+
+// Performs a double-buffered paint operation to avoid flicker
+void ListBoxX::Paint(HDC hDC) {
+	const POINT extent = GetClientExtent();
+	HBITMAP hBitmap = ::CreateCompatibleBitmap(hDC, extent.x, extent.y);
+	HDC bitmapDC = ::CreateCompatibleDC(hDC);
+	HBITMAP hBitmapOld = SelectBitmap(bitmapDC, hBitmap);
+	// The list background is mainly erased during painting, but can be a small
+	// unpainted area when at the end of a non-integrally sized list with a
+	// vertical scroll bar
+	const RECT rc = { 0, 0, extent.x, extent.y };
+	FillRectColour(bitmapDC, &rc, ColourOfElement(options.back, COLOR_WINDOWTEXT));
+	// Paint the entire client area and vertical scrollbar
+	::SendMessage(lb, WM_PRINT, reinterpret_cast<WPARAM>(bitmapDC), PRF_CLIENT|PRF_NONCLIENT);
+	::BitBlt(hDC, 0, 0, extent.x, extent.y, bitmapDC, 0, 0, SRCCOPY);
+	// Select a stock brush to prevent warnings from BoundsChecker
+	SelectBrush(bitmapDC, GetStockBrush(WHITE_BRUSH));
+	SelectBitmap(bitmapDC, hBitmapOld);
+	::DeleteDC(bitmapDC);
+	::DeleteObject(hBitmap);
+}
+
+LRESULT PASCAL ListBoxX::ControlWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		ListBoxX *lbx = static_cast<ListBoxX *>(PointerFromWindow(::GetParent(hWnd)));
+		switch (iMessage) {
+		case WM_ERASEBKGND:
+			return TRUE;
+
+		case WM_PAINT: {
+				PAINTSTRUCT ps;
+				HDC hDC = ::BeginPaint(hWnd, &ps);
+				if (lbx) {
+					lbx->Paint(hDC);
+				}
+				::EndPaint(hWnd, &ps);
+			}
+			return 0;
+
+		case WM_MOUSEACTIVATE:
+			// This prevents the view activating when the scrollbar is clicked
+			return MA_NOACTIVATE;
+
+		case WM_LBUTTONDOWN: {
+				// We must take control of selection to prevent the ListBox activating
+				// the popup
+				const LRESULT lResult = ::SendMessage(hWnd, LB_ITEMFROMPOINT, 0, lParam);
+				const int item = LOWORD(lResult);
+				if (HIWORD(lResult) == 0 && item >= 0) {
+					ListBox_SetCurSel(hWnd, item);
+					if (lbx) {
+						lbx->OnSelChange();
+					}
+				}
+			}
+			return 0;
+
+		case WM_LBUTTONUP:
+			return 0;
+
+		case WM_LBUTTONDBLCLK: {
+				if (lbx) {
+					lbx->OnDoubleClick();
+				}
+			}
+			return 0;
+
+		case WM_MBUTTONDOWN:
+			// disable the scroll wheel button click action
+			return 0;
+
+		default:
+			break;
+		}
+
+		WNDPROC prevWndProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
+		if (prevWndProc) {
+			return ::CallWindowProc(prevWndProc, hWnd, iMessage, wParam, lParam);
+		} else {
+			return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+		}
+	} catch (...) {
+	}
+	return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+}
+
+LRESULT ListBoxX::WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	switch (iMessage) {
+	case WM_CREATE: {
+			HINSTANCE hinstanceParent = GetWindowInstance(HwndFromWindow(*parent));
+			// Note that LBS_NOINTEGRALHEIGHT is specified to fix cosmetic issue when resizing the list
+			// but has useful side effect of speeding up list population significantly
+			lb = ::CreateWindowEx(
+				0, TEXT("listbox"), TEXT(""),
+				WS_CHILD | WS_VSCROLL | WS_VISIBLE |
+				LBS_OWNERDRAWFIXED | LBS_NODATA | LBS_NOINTEGRALHEIGHT,
+				0, 0, 150,80, hWnd,
+				reinterpret_cast<HMENU>(static_cast<ptrdiff_t>(ctrlID)),
+				hinstanceParent,
+				0);
+			WNDPROC prevWndProc = SubclassWindow(lb, ControlWndProc);
+			::SetWindowLongPtr(lb, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(prevWndProc));
+		}
+		break;
+
+	case WM_SIZE:
+		if (lb) {
+			SetRedraw(false);
+			::SetWindowPos(lb, 0, 0,0, LOWORD(lParam), HIWORD(lParam), SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOMOVE);
+			// Ensure the selection remains visible
+			CentreItem(GetSelection());
+			SetRedraw(true);
+		}
+		break;
+
+	case WM_PAINT: {
+			PAINTSTRUCT ps;
+			::BeginPaint(hWnd, &ps);
+			::EndPaint(hWnd, &ps);
+		}
+		break;
+
+	case WM_COMMAND:
+		// This is not actually needed now - the registered double click action is used
+		// directly to action a choice from the list.
+		::SendMessage(HwndFromWindow(*parent), iMessage, wParam, lParam);
+		break;
+
+	case WM_MEASUREITEM: {
+			MEASUREITEMSTRUCT *pMeasureItem = reinterpret_cast<MEASUREITEMSTRUCT *>(lParam);
+			pMeasureItem->itemHeight = ItemHeight();
+		}
+		break;
+
+	case WM_DRAWITEM:
+		Draw(reinterpret_cast<DRAWITEMSTRUCT *>(lParam));
+		break;
+
+	case WM_DESTROY:
+		lb = 0;
+		SetWindowPointer(hWnd, nullptr);
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+
+	case WM_ERASEBKGND:
+		// To reduce flicker we can elide background erasure since this window is
+		// completely covered by its child.
+		return TRUE;
+
+	case WM_GETMINMAXINFO: {
+			MINMAXINFO *minMax = reinterpret_cast<MINMAXINFO*>(lParam);
+			minMax->ptMaxTrackSize = MaxTrackSize();
+			minMax->ptMinTrackSize = MinTrackSize();
+		}
+		break;
+
+	case WM_MOUSEACTIVATE:
+		return MA_NOACTIVATE;
+
+	case WM_NCHITTEST:
+		return NcHitTest(wParam, lParam);
+
+	case WM_NCLBUTTONDOWN:
+		// We have to implement our own window resizing because the DefWindowProc
+		// implementation insists on activating the resized window
+		StartResize(wParam);
+		return 0;
+
+	case WM_MOUSEMOVE: {
+			if (resizeHit == 0) {
+				return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+			} else {
+				ResizeToCursor();
+			}
+		}
+		break;
+
+	case WM_LBUTTONUP:
+	case WM_CANCELMODE:
+		if (resizeHit != 0) {
+			resizeHit = 0;
+			::ReleaseCapture();
+		}
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	case WM_MOUSEWHEEL:
+		wheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam);
+		if (std::abs(wheelDelta) >= WHEEL_DELTA) {
+			const int nRows = GetVisibleRows();
+			int linesToScroll = 1;
+			if (nRows > 1) {
+				linesToScroll = nRows - 1;
+			}
+			if (linesToScroll > 3) {
+				linesToScroll = 3;
+			}
+			linesToScroll *= (wheelDelta / WHEEL_DELTA);
+			int top = ListBox_GetTopIndex(lb) + linesToScroll;
+			if (top < 0) {
+				top = 0;
+			}
+			ListBox_SetTopIndex(lb, top);
+			// update wheel delta residue
+			if (wheelDelta >= 0)
+				wheelDelta = wheelDelta % WHEEL_DELTA;
+			else
+				wheelDelta = - (-wheelDelta % WHEEL_DELTA);
+		}
+		break;
+
+	default:
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	}
+
+	return 0;
+}
+
+LRESULT PASCAL ListBoxX::StaticWndProc(
+    HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	if (iMessage == WM_CREATE) {
+		CREATESTRUCT *pCreate = reinterpret_cast<CREATESTRUCT *>(lParam);
+		SetWindowPointer(hWnd, pCreate->lpCreateParams);
+	}
+	// Find C++ object associated with window.
+	ListBoxX *lbx = static_cast<ListBoxX *>(PointerFromWindow(hWnd));
+	if (lbx) {
+		return lbx->WndProc(hWnd, iMessage, wParam, lParam);
+	} else {
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	}
+}
+
+namespace {
+
+bool ListBoxX_Register() noexcept {
+	WNDCLASSEX wndclassc {};
+	wndclassc.cbSize = sizeof(wndclassc);
+	// We need CS_HREDRAW and CS_VREDRAW because of the ellipsis that might be drawn for
+	// truncated items in the list and the appearance/disappearance of the vertical scroll bar.
+	// The list repaint is double-buffered to avoid the flicker this would otherwise cause.
+	wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
+	wndclassc.cbWndExtra = sizeof(ListBoxX *);
+	wndclassc.hInstance = hinstPlatformRes;
+	wndclassc.lpfnWndProc = ListBoxX::StaticWndProc;
+	wndclassc.hCursor = ::LoadCursor(NULL, IDC_ARROW);
+	wndclassc.lpszClassName = ListBoxX_ClassName;
+
+	return ::RegisterClassEx(&wndclassc) != 0;
+}
+
+void ListBoxX_Unregister() noexcept {
+	if (hinstPlatformRes) {
+		::UnregisterClass(ListBoxX_ClassName, hinstPlatformRes);
+	}
+}
+
+}
+
+Menu::Menu() noexcept : mid{} {
+}
+
+void Menu::CreatePopUp() {
+	Destroy();
+	mid = ::CreatePopupMenu();
+}
+
+void Menu::Destroy() noexcept {
+	if (mid)
+		::DestroyMenu(static_cast<HMENU>(mid));
+	mid = 0;
+}
+
+void Menu::Show(Point pt, const Window &w) {
+	::TrackPopupMenu(static_cast<HMENU>(mid),
+		TPM_RIGHTBUTTON, static_cast<int>(pt.x - 4), static_cast<int>(pt.y), 0,
+		HwndFromWindow(w), nullptr);
+	Destroy();
+}
+
+ColourRGBA Platform::Chrome() {
+	return ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(COLOR_3DFACE)));
+}
+
+ColourRGBA Platform::ChromeHighlight() {
+	return ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(COLOR_3DHIGHLIGHT)));
+}
+
+const char *Platform::DefaultFont() {
+	return "Verdana";
+}
+
+int Platform::DefaultFontSize() {
+	return 8;
+}
+
+unsigned int Platform::DoubleClickTime() {
+	return ::GetDoubleClickTime();
+}
+
+void Platform::DebugDisplay(const char *s) noexcept {
+	::OutputDebugStringA(s);
+}
+
+//#define TRACE
+
+#ifdef TRACE
+void Platform::DebugPrintf(const char *format, ...) noexcept {
+	char buffer[2000];
+	va_list pArguments;
+	va_start(pArguments, format);
+	vsprintf(buffer,format,pArguments);
+	va_end(pArguments);
+	Platform::DebugDisplay(buffer);
+}
+#else
+void Platform::DebugPrintf(const char *, ...) noexcept {
+}
+#endif
+
+static bool assertionPopUps = true;
+
+bool Platform::ShowAssertionPopUps(bool assertionPopUps_) noexcept {
+	const bool ret = assertionPopUps;
+	assertionPopUps = assertionPopUps_;
+	return ret;
+}
+
+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");
+	if (assertionPopUps) {
+		const int idButton = ::MessageBoxA(0, buffer, "Assertion failure",
+			MB_ABORTRETRYIGNORE|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
+		if (idButton == IDRETRY) {
+			::DebugBreak();
+		} else if (idButton == IDIGNORE) {
+			// all OK
+		} else {
+			abort();
+		}
+	} else {
+		Platform::DebugDisplay(buffer);
+		::DebugBreak();
+		abort();
+	}
+}
+
+void Platform_Initialise(void *hInstance) noexcept {
+	hinstPlatformRes = static_cast<HINSTANCE>(hInstance);
+	LoadDpiForWindow();
+	ListBoxX_Register();
+}
+
+void Platform_Finalise(bool fromDllMain) noexcept {
+#if defined(USE_D2D)
+	if (!fromDllMain) {
+		ReleaseUnknown(defaultRenderingParams);
+		ReleaseUnknown(customClearTypeRenderingParams);
+		ReleaseUnknown(pIDWriteFactory);
+		ReleaseUnknown(pD2DFactory);
+		if (hDLLDWrite) {
+			FreeLibrary(hDLLDWrite);
+			hDLLDWrite = {};
+		}
+		if (hDLLD2D) {
+			FreeLibrary(hDLLD2D);
+			hDLLD2D = {};
+		}
+	}
+#endif
+	if (!fromDllMain && hDLLShcore) {
+		FreeLibrary(hDLLShcore);
+		hDLLShcore = {};
+	}
+	ListBoxX_Unregister();
+}
+
+}
diff --git a/scite-app/scintilla/win32/PlatWin.h b/scite-app/scintilla/win32/PlatWin.h
new file mode 100644
index 0000000..3ee0d6b
--- /dev/null
+++ b/scite-app/scintilla/win32/PlatWin.h
@@ -0,0 +1,91 @@
+// Scintilla source code edit control
+/** @file PlatWin.h
+ ** Implementation of platform facilities on Windows.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PLATWIN_H
+#define PLATWIN_H
+
+namespace Scintilla::Internal {
+
+#ifndef USER_DEFAULT_SCREEN_DPI
+#define USER_DEFAULT_SCREEN_DPI		96
+#endif
+
+extern void Platform_Initialise(void *hInstance) noexcept;
+
+extern void Platform_Finalise(bool fromDllMain) noexcept;
+
+constexpr RECT RectFromPRectangle(PRectangle prc) noexcept {
+	RECT rc = { static_cast<LONG>(prc.left), static_cast<LONG>(prc.top),
+		static_cast<LONG>(prc.right), static_cast<LONG>(prc.bottom) };
+	return rc;
+}
+
+constexpr POINT POINTFromPoint(Point pt) noexcept {
+	return POINT{ static_cast<LONG>(pt.x), static_cast<LONG>(pt.y) };
+}
+
+constexpr Point PointFromPOINT(POINT pt) noexcept {
+	return Point::FromInts(pt.x, pt.y);
+}
+
+constexpr HWND HwndFromWindowID(WindowID wid) noexcept {
+	return static_cast<HWND>(wid);
+}
+
+inline HWND HwndFromWindow(const Window &w) noexcept {
+	return HwndFromWindowID(w.GetID());
+}
+
+void *PointerFromWindow(HWND hWnd) noexcept;
+void SetWindowPointer(HWND hWnd, void *ptr) noexcept;
+
+/// Find a function in a DLL and convert to a function pointer.
+/// This avoids undefined and conditionally defined behaviour.
+template<typename T>
+T DLLFunction(HMODULE hModule, LPCSTR lpProcName) noexcept {
+	if (!hModule) {
+		return nullptr;
+	}
+	FARPROC function = ::GetProcAddress(hModule, lpProcName);
+	static_assert(sizeof(T) == sizeof(function));
+	T fp {};
+	memcpy(&fp, &function, sizeof(T));
+	return fp;
+}
+
+// Release an IUnknown* and set to nullptr.
+// While IUnknown::Release must be noexcept, it isn't marked as such so produces
+// warnings which are avoided by the catch.
+template <class T>
+void ReleaseUnknown(T *&ppUnknown) noexcept {
+	if (ppUnknown) {
+		try {
+			ppUnknown->Release();
+		}
+		catch (...) {
+			// Never occurs
+		}
+		ppUnknown = nullptr;
+	}
+}
+
+
+UINT DpiForWindow(WindowID wid) noexcept;
+
+int SystemMetricsForDpi(int nIndex, UINT dpi) noexcept;
+
+HCURSOR LoadReverseArrowCursor(UINT dpi) noexcept;
+
+#if defined(USE_D2D)
+extern bool LoadD2D();
+extern ID2D1Factory *pD2DFactory;
+extern IDWriteFactory *pIDWriteFactory;
+#endif
+
+}
+
+#endif
diff --git a/scite-app/scintilla/win32/SciTE.properties b/scite-app/scintilla/win32/SciTE.properties
new file mode 100644
index 0000000..5856b8d
--- /dev/null
+++ b/scite-app/scintilla/win32/SciTE.properties
@@ -0,0 +1,21 @@
+command.build.SConstruct=scons.bat .
+command.name.1.SConstruct=scons clean
+command.1.SConstruct=scons.bat --clean .
+
+command.build.*.mak=nmake -f $(FileNameExt) DEBUG=1 QUIET=1
+command.name.1.*.mak=nmake clean
+command.1.*.mak=nmake -f $(FileNameExt) clean
+command.name.2.*.mak=Borland Make
+command.2.*.mak=make -f $(FileNameExt)
+command.subsystem.2.*.mak=0
+command.name.3.*.mak=make clean
+command.3.*.mak=make -f $(FileNameExt) clean
+command.name.4.*.mak=make debug
+command.4.*.mak=make DEBUG=1 -f $(FileNameExt)
+command.name.5.*.mak=nmake debug
+command.5.*.mak=nmake DEBUG=1 -f $(FileNameExt)
+# SciTE.properties is the per directory local options file and can be used to override
+# settings made in SciTEGlobal.properties
+command.build.*.cxx=nmake -f scintilla.mak DEBUG=1 QUIET=1
+command.build.*.h=nmake -f scintilla.mak DEBUG=1 QUIET=1
+command.build.*.rc=nmake -f scintilla.mak DEBUG=1 QUIET=1
diff --git a/scite-app/scintilla/win32/ScintRes.rc b/scite-app/scintilla/win32/ScintRes.rc
new file mode 100644
index 0000000..54ae1c8
--- /dev/null
+++ b/scite-app/scintilla/win32/ScintRes.rc
@@ -0,0 +1,37 @@
+// Resource file for Scintilla
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <windows.h>
+
+#define VERSION_SCINTILLA "5.1.1"
+#define VERSION_WORDS 5, 1, 1, 0
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION	VERSION_WORDS
+PRODUCTVERSION	VERSION_WORDS
+FILEFLAGSMASK	0x3fL
+FILEFLAGS 0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+	BLOCK	"VarFileInfo"
+	BEGIN
+		VALUE	"Translation",	0x409,	1200
+	END
+	BLOCK	"StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
+			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0"
+			VALUE	"FileVersion",	VERSION_SCINTILLA "\0"
+			VALUE	"InternalName",	"Scintilla\0"
+			VALUE	"LegalCopyright",	"Copyright 1998-2012 by Neil Hodgson\0"
+			VALUE	"OriginalFilename",	"Scintilla.DLL\0"
+			VALUE	"ProductName",	"Scintilla\0"
+			VALUE	"ProductVersion",	VERSION_SCINTILLA "\0"
+		END
+	END
+END
diff --git a/scite-app/scintilla/win32/Scintilla.def b/scite-app/scintilla/win32/Scintilla.def
new file mode 100644
index 0000000..7ff903b
--- /dev/null
+++ b/scite-app/scintilla/win32/Scintilla.def
@@ -0,0 +1,2 @@
+EXPORTS
+	Scintilla_DirectFunction
\ No newline at end of file
diff --git a/scite-app/scintilla/win32/Scintilla.vcxproj b/scite-app/scintilla/win32/Scintilla.vcxproj
new file mode 100644
index 0000000..e6bc399
--- /dev/null
+++ b/scite-app/scintilla/win32/Scintilla.vcxproj
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{19CCA8B8-46B9-4609-B7CE-198DA19F07BD}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Scintilla</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IntDir>Intermediates\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IntDir>Intermediates\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>Intermediates\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IntDir>Intermediates\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>SCI_EMPTYCATALOGUE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\src;</AdditionalIncludeDirectories>
+      <BrowseInformation>true</BrowseInformation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MinimalRebuild>false</MinimalRebuild>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <CETCompat>true</CETCompat>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\*.cxx" />
+    <ClCompile Include="..\win32\HanjaDic.cxx" />
+    <ClCompile Include="..\win32\PlatWin.cxx" />
+    <ClCompile Include="..\win32\ScintillaWin.cxx" />
+    <ClCompile Include="..\win32\ScintillaDLL.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\*.h" />
+    <ClInclude Include="..\src\*.h" />
+    <ClInclude Include="..\win32\*.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\win32\ScintRes.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/scintilla/win32/ScintillaDLL.cxx b/scite-app/scintilla/win32/ScintillaDLL.cxx
new file mode 100644
index 0000000..3e448d8
--- /dev/null
+++ b/scite-app/scintilla/win32/ScintillaDLL.cxx
@@ -0,0 +1,37 @@
+// Scintilla source code edit control
+/** @file ScintillaDLL.cxx
+ ** DLL entry point for Scintilla.
+ **/
+// Copyright 1998-2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#undef WINVER
+#define WINVER 0x0500
+#include <windows.h>
+
+#include "ScintillaTypes.h"
+#include "ScintillaWin.h"
+
+using namespace Scintilla;
+
+extern "C"
+__declspec(dllexport)
+sptr_t __stdcall Scintilla_DirectFunction(
+    Internal::ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) {
+	return Internal::DirectFunction(sci, iMessage, wParam, lParam);
+}
+
+extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpvReserved) {
+	//Platform::DebugPrintf("Scintilla::DllMain %d %d\n", hInstance, dwReason);
+	if (dwReason == DLL_PROCESS_ATTACH) {
+		if (!Internal::RegisterClasses(hInstance))
+			return FALSE;
+	} else if (dwReason == DLL_PROCESS_DETACH) {
+		if (lpvReserved == NULL) {
+			Internal::ResourcesRelease(true);
+		}
+	}
+	return TRUE;
+}
diff --git a/scite-app/scintilla/win32/ScintillaWin.cxx b/scite-app/scintilla/win32/ScintillaWin.cxx
new file mode 100644
index 0000000..fc12e48
--- /dev/null
+++ b/scite-app/scintilla/win32/ScintillaWin.cxx
@@ -0,0 +1,3694 @@
+// Scintilla source code edit control
+/** @file ScintillaWin.cxx
+ ** Windows specific subclass of ScintillaBase.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
+#include <climits>
+
+#include <stdexcept>
+#include <new>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <mutex>
+
+// Want to use std::min and std::max so don't want Windows.h version of min and max
+#if !defined(NOMINMAX)
+#define NOMINMAX
+#endif
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#undef WINVER
+#define WINVER 0x0500
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+#include <zmouse.h>
+#include <ole2.h>
+
+#if !defined(DISABLE_D2D)
+#define USE_D2D 1
+#endif
+
+#if defined(USE_D2D)
+#include <d2d1.h>
+#include <dwrite.h>
+#endif
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaStructures.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "Debugging.h"
+#include "Geometry.h"
+#include "Platform.h"
+
+#include "CharacterCategoryMap.h"
+#include "Position.h"
+#include "UniqueString.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "ContractionState.h"
+#include "CellBuffer.h"
+#include "CallTip.h"
+#include "KeyMap.h"
+#include "Indicator.h"
+#include "LineMarker.h"
+#include "Style.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
+#include "CaseFolder.h"
+#include "Document.h"
+#include "CaseConvert.h"
+#include "UniConversion.h"
+#include "Selection.h"
+#include "PositionCache.h"
+#include "EditModel.h"
+#include "MarginView.h"
+#include "EditView.h"
+#include "Editor.h"
+#include "ElapsedPeriod.h"
+
+#include "AutoComplete.h"
+#include "ScintillaBase.h"
+
+#include "PlatWin.h"
+#include "HanjaDic.h"
+#include "ScintillaWin.h"
+
+#ifndef SPI_GETWHEELSCROLLLINES
+#define SPI_GETWHEELSCROLLLINES   104
+#endif
+
+#ifndef WM_UNICHAR
+#define WM_UNICHAR                      0x0109
+#endif
+
+#ifndef WM_DPICHANGED
+#define WM_DPICHANGED 0x02E0
+#endif
+#ifndef WM_DPICHANGED_AFTERPARENT
+#define WM_DPICHANGED_AFTERPARENT 0x02E3
+#endif
+
+#ifndef UNICODE_NOCHAR
+#define UNICODE_NOCHAR                  0xFFFF
+#endif
+
+#ifndef IS_HIGH_SURROGATE
+#define IS_HIGH_SURROGATE(x)            ((x) >= SURROGATE_LEAD_FIRST && (x) <= SURROGATE_LEAD_LAST)
+#endif
+
+#ifndef IS_LOW_SURROGATE
+#define IS_LOW_SURROGATE(x)             ((x) >= SURROGATE_TRAIL_FIRST && (x) <= SURROGATE_TRAIL_LAST)
+#endif
+
+#ifndef MK_ALT
+#define MK_ALT 32
+#endif
+
+namespace {
+
+// Two idle messages SC_WIN_IDLE and SC_WORK_IDLE.
+
+// SC_WIN_IDLE is low priority so should occur after the next WM_PAINT
+// It is for lengthy actions like wrapping and background styling
+constexpr UINT SC_WIN_IDLE = 5001;
+// SC_WORK_IDLE is high priority and should occur before the next WM_PAINT
+// It is for shorter actions like restyling the text just inserted
+// and delivering SCN_UPDATEUI
+constexpr UINT SC_WORK_IDLE = 5002;
+
+constexpr int IndicatorInput = static_cast<int>(Scintilla::IndicatorNumbers::Ime);
+constexpr int IndicatorTarget = IndicatorInput + 1;
+constexpr int IndicatorConverted = IndicatorInput + 2;
+constexpr int IndicatorUnknown = IndicatorInput + 3;
+
+#ifndef SCS_CAP_SETRECONVERTSTRING
+#define SCS_CAP_SETRECONVERTSTRING 0x00000004
+#define SCS_QUERYRECONVERTSTRING 0x00020000
+#define SCS_SETRECONVERTSTRING 0x00010000
+#endif
+
+typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent,
+	UINT uElapse, TIMERPROC lpTimerFunc, ULONG uToleranceDelay);
+
+}
+
+// GCC has trouble with the standard COM ABI so do it the old C way with explicit vtables.
+
+using namespace Scintilla;
+using namespace Scintilla::Internal;
+
+namespace {
+
+const TCHAR callClassName[] = TEXT("CallTip");
+
+void SetWindowID(HWND hWnd, int identifier) noexcept {
+	::SetWindowLongPtr(hWnd, GWLP_ID, identifier);
+}
+
+Point PointFromLParam(sptr_t lpoint) noexcept {
+	return Point::FromInts(GET_X_LPARAM(lpoint), GET_Y_LPARAM(lpoint));
+}
+
+bool KeyboardIsKeyDown(int key) noexcept {
+	return (::GetKeyState(key) & 0x80000000) != 0;
+}
+
+constexpr bool KeyboardIsNumericKeypadFunction(uptr_t wParam, sptr_t lParam) {
+	// Bit 24 is the extended keyboard flag and the numeric keypad is non-extended
+	if ((lParam & (1 << 24)) != 0) {
+		// Not from the numeric keypad
+		return false;
+	}
+
+	switch (wParam) {
+	case VK_INSERT:	// 0
+	case VK_END:	// 1
+	case VK_DOWN:	// 2
+	case VK_NEXT:	// 3
+	case VK_LEFT:	// 4
+	case VK_CLEAR:	// 5
+	case VK_RIGHT:	// 6
+	case VK_HOME:	// 7
+	case VK_UP:		// 8
+	case VK_PRIOR:	// 9
+		return true;
+	default:
+		return false;
+	}
+}
+
+typedef void VFunction(void);
+
+/**
+ */
+class FormatEnumerator {
+public:
+	VFunction **vtbl;
+	ULONG ref;
+	ULONG pos;
+	std::vector<CLIPFORMAT> formats;
+	FormatEnumerator(ULONG pos_, const CLIPFORMAT formats_[], size_t formatsLen_);
+};
+
+/**
+ */
+class DropSource {
+public:
+	VFunction **vtbl;
+	ScintillaWin *sci;
+	DropSource() noexcept;
+};
+
+/**
+ */
+class DataObject {
+public:
+	VFunction **vtbl;
+	ScintillaWin *sci;
+	DataObject() noexcept;
+};
+
+/**
+ */
+class DropTarget {
+public:
+	VFunction **vtbl;
+	ScintillaWin *sci;
+	DropTarget() noexcept;
+};
+
+class IMContext {
+	HWND hwnd;
+public:
+	HIMC hIMC;
+	IMContext(HWND hwnd_) noexcept :
+		hwnd(hwnd_), hIMC(::ImmGetContext(hwnd_)) {
+	}
+	// Deleted so IMContext objects can not be copied.
+	IMContext(const IMContext &) = delete;
+	IMContext(IMContext &&) = delete;
+	IMContext &operator=(const IMContext &) = delete;
+	IMContext &operator=(IMContext &&) = delete;
+	~IMContext() {
+		if (hIMC)
+			::ImmReleaseContext(hwnd, hIMC);
+	}
+
+	unsigned int GetImeCaretPos() const noexcept {
+		return ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, nullptr, 0);
+	}
+
+	std::vector<BYTE> GetImeAttributes() {
+		const int attrLen = ::ImmGetCompositionStringW(hIMC, GCS_COMPATTR, nullptr, 0);
+		std::vector<BYTE> attr(attrLen, 0);
+		::ImmGetCompositionStringW(hIMC, GCS_COMPATTR, &attr[0], static_cast<DWORD>(attr.size()));
+		return attr;
+	}
+
+	std::wstring GetCompositionString(DWORD dwIndex) {
+		const LONG byteLen = ::ImmGetCompositionStringW(hIMC, dwIndex, nullptr, 0);
+		std::wstring wcs(byteLen / 2, 0);
+		::ImmGetCompositionStringW(hIMC, dwIndex, &wcs[0], byteLen);
+		return wcs;
+	}
+};
+
+class GlobalMemory;
+
+class ReverseArrowCursor {
+	UINT dpi = USER_DEFAULT_SCREEN_DPI;
+	HCURSOR cursor {};
+
+public:
+	ReverseArrowCursor() noexcept {}
+	// Deleted so ReverseArrowCursor objects can not be copied.
+	ReverseArrowCursor(const ReverseArrowCursor &) = delete;
+	ReverseArrowCursor(ReverseArrowCursor &&) = delete;
+	ReverseArrowCursor &operator=(const ReverseArrowCursor &) = delete;
+	ReverseArrowCursor &operator=(ReverseArrowCursor &&) = delete;
+	~ReverseArrowCursor() {
+		if (cursor) {
+			::DestroyCursor(cursor);
+		}
+	}
+
+	HCURSOR Load(UINT dpi_) noexcept {
+		if (cursor)	 {
+			if (dpi == dpi_) {
+				return cursor;
+			}
+			::DestroyCursor(cursor);
+		}
+
+		dpi = dpi_;
+		cursor = LoadReverseArrowCursor(dpi_);
+		return cursor ? cursor : ::LoadCursor({}, IDC_ARROW);
+	}
+};
+
+}
+
+namespace Scintilla::Internal {
+
+/**
+ */
+class ScintillaWin :
+	public ScintillaBase {
+
+	bool lastKeyDownConsumed;
+	wchar_t lastHighSurrogateChar;
+
+	bool capturedMouse;
+	bool trackedMouseLeave;
+	SetCoalescableTimerSig SetCoalescableTimerFn;
+
+	unsigned int linesPerScroll;	///< Intellimouse support
+	int wheelDelta; ///< Wheel delta from roll
+
+	UINT dpi = USER_DEFAULT_SCREEN_DPI;
+	ReverseArrowCursor reverseArrowCursor;
+
+	HRGN hRgnUpdate;
+
+	bool hasOKText;
+
+	CLIPFORMAT cfColumnSelect;
+	CLIPFORMAT cfBorlandIDEBlockType;
+	CLIPFORMAT cfLineSelect;
+	CLIPFORMAT cfVSLineTag;
+
+	HRESULT hrOle;
+	DropSource ds;
+	DataObject dob;
+	DropTarget dt;
+
+	static HINSTANCE hInstance;
+	static ATOM scintillaClassAtom;
+	static ATOM callClassAtom;
+
+#if defined(USE_D2D)
+	ID2D1RenderTarget *pRenderTarget;
+	bool renderTargetValid;
+#endif
+
+	explicit ScintillaWin(HWND hwnd);
+	// Deleted so ScintillaWin objects can not be copied.
+	ScintillaWin(const ScintillaWin &) = delete;
+	ScintillaWin(ScintillaWin &&) = delete;
+	ScintillaWin &operator=(const ScintillaWin &) = delete;
+	ScintillaWin &operator=(ScintillaWin &&) = delete;
+	// ~ScintillaWin() in public section
+
+	void Finalise() override;
+#if defined(USE_D2D)
+	void EnsureRenderTarget(HDC hdc);
+#endif
+	void DropRenderTarget() noexcept;
+	HWND MainHWND() const noexcept;
+
+	static sptr_t DirectFunction(
+		    sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam);
+	static sptr_t DirectStatusFunction(
+		    sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam, int *pStatus);
+	static LRESULT PASCAL SWndProc(
+		    HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+	static LRESULT PASCAL CTWndProc(
+		    HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+
+	enum : UINT_PTR { invalidTimerID, standardTimerID, idleTimerID, fineTimerStart };
+
+	void DisplayCursor(Window::Cursor c) override;
+	bool DragThreshold(Point ptStart, Point ptNow) override;
+	void StartDrag() override;
+	static KeyMod MouseModifiers(uptr_t wParam) noexcept;
+
+	Sci::Position TargetAsUTF8(char *text) const;
+	Sci::Position EncodedFromUTF8(const char *utf8, char *encoded) const;
+
+	bool PaintDC(HDC hdc);
+	sptr_t WndPaint();
+
+	// DBCS
+	void ImeStartComposition();
+	void ImeEndComposition();
+	LRESULT ImeOnReconvert(LPARAM lParam);
+	sptr_t HandleCompositionWindowed(uptr_t wParam, sptr_t lParam);
+	sptr_t HandleCompositionInline(uptr_t wParam, sptr_t lParam);
+	static bool KoreanIME() noexcept;
+	void MoveImeCarets(Sci::Position offset) noexcept;
+	void DrawImeIndicator(int indicator, Sci::Position len);
+	void SetCandidateWindowPos();
+	void SelectionToHangul();
+	void EscapeHanja();
+	void ToggleHanja();
+	void AddWString(std::wstring_view wsv, CharacterSource charSource);
+
+	UINT CodePageOfDocument() const noexcept;
+	bool ValidCodePage(int codePage) const override;
+	std::string UTF8FromEncoded(std::string_view encoded) const override;
+	std::string EncodedFromUTF8(std::string_view utf8) const override;
+
+	std::string EncodeWString(std::wstring_view wsv);
+	sptr_t DefWndProc(Message iMessage, uptr_t wParam, sptr_t lParam) override;
+	void IdleWork() override;
+	void QueueIdleWork(WorkItems items, Sci::Position upTo) override;
+	bool SetIdle(bool on) override;
+	UINT_PTR timers[static_cast<int>(TickReason::dwell)+1] {};
+	bool FineTickerRunning(TickReason reason) override;
+	void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+	void FineTickerCancel(TickReason reason) override;
+	void SetMouseCapture(bool on) override;
+	bool HaveMouseCapture() override;
+	void SetTrackMouseLeaveEvent(bool on) noexcept;
+	void UpdateBaseElements() override;
+	bool PaintContains(PRectangle rc) override;
+	void ScrollText(Sci::Line linesToMove) override;
+	void NotifyCaretMove() override;
+	void UpdateSystemCaret() override;
+	void SetVerticalScrollPos() override;
+	void SetHorizontalScrollPos() override;
+	bool ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) override;
+	void NotifyChange() override;
+	void NotifyFocus(bool focus) override;
+	void SetCtrlID(int identifier) override;
+	int GetCtrlID() override;
+	void NotifyParent(NotificationData scn) override;
+	void NotifyDoubleClick(Point pt, KeyMod modifiers) override;
+	std::unique_ptr<CaseFolder> CaseFolderForEncoding() override;
+	std::string CaseMapString(const std::string &s, CaseMapping caseMapping) override;
+	void Copy() override;
+	bool CanPaste() override;
+	void Paste() override;
+	void CreateCallTipWindow(PRectangle rc) override;
+	void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+	void ClaimSelection() override;
+
+	void GetIntelliMouseParameters() noexcept;
+	void CopyToGlobal(GlobalMemory &gmUnicode, const SelectionText &selectedText);
+	void CopyToClipboard(const SelectionText &selectedText) override;
+	void ScrollMessage(WPARAM wParam);
+	void HorizontalScrollMessage(WPARAM wParam);
+	void FullPaint();
+	void FullPaintDC(HDC hdc);
+	bool IsCompatibleDC(HDC hOtherDC) noexcept;
+	DWORD EffectFromState(DWORD grfKeyState) const noexcept;
+
+	bool IsVisible() const noexcept;
+	int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) noexcept;
+	bool GetScrollInfo(int nBar, LPSCROLLINFO lpsi) noexcept;
+	void ChangeScrollPos(int barType, Sci::Position pos);
+	sptr_t GetTextLength();
+	sptr_t GetText(uptr_t wParam, sptr_t lParam);
+	Window::Cursor ContextCursor(Point pt);
+	sptr_t ShowContextMenu(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	void SizeWindow();
+	sptr_t MouseMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t KeyMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t FocusMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t IMEMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t IdleMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+	sptr_t SciMessage(Message iMessage, uptr_t wParam, sptr_t lParam);
+
+public:
+	~ScintillaWin() override;
+
+	// Public for benefit of Scintilla_DirectFunction
+	sptr_t WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) override;
+
+	/// Implement IUnknown
+	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv);
+	STDMETHODIMP_(ULONG)AddRef();
+	STDMETHODIMP_(ULONG)Release();
+
+	/// Implement IDropTarget
+	STDMETHODIMP DragEnter(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+	                       POINTL pt, PDWORD pdwEffect);
+	STDMETHODIMP DragOver(DWORD grfKeyState, POINTL pt, PDWORD pdwEffect);
+	STDMETHODIMP DragLeave();
+	STDMETHODIMP Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+	                  POINTL pt, PDWORD pdwEffect);
+
+	/// Implement important part of IDataObject
+	STDMETHODIMP GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM);
+
+	static void Prepare() noexcept;
+	static bool Register(HINSTANCE hInstance_) noexcept;
+	static bool Unregister() noexcept;
+
+	bool DragIsRectangularOK(CLIPFORMAT fmt) const noexcept {
+		return drag.rectangular && (fmt == cfColumnSelect);
+	}
+
+private:
+	// For use in creating a system caret
+	bool HasCaretSizeChanged() const noexcept;
+	BOOL CreateSystemCaret();
+	BOOL DestroySystemCaret() noexcept;
+	HBITMAP sysCaretBitmap;
+	int sysCaretWidth;
+	int sysCaretHeight;
+	bool styleIdleInQueue;
+};
+
+HINSTANCE ScintillaWin::hInstance {};
+ATOM ScintillaWin::scintillaClassAtom = 0;
+ATOM ScintillaWin::callClassAtom = 0;
+
+ScintillaWin::ScintillaWin(HWND hwnd) {
+
+	lastKeyDownConsumed = false;
+	lastHighSurrogateChar = 0;
+
+	capturedMouse = false;
+	trackedMouseLeave = false;
+	SetCoalescableTimerFn = nullptr;
+
+	linesPerScroll = 0;
+	wheelDelta = 0;   // Wheel delta from roll
+
+	dpi = DpiForWindow(hwnd);
+
+	hRgnUpdate = {};
+
+	hasOKText = false;
+
+	// There does not seem to be a real standard for indicating that the clipboard
+	// contains a rectangular selection, so copy Developer Studio and Borland Delphi.
+	cfColumnSelect = static_cast<CLIPFORMAT>(
+		::RegisterClipboardFormat(TEXT("MSDEVColumnSelect")));
+	cfBorlandIDEBlockType = static_cast<CLIPFORMAT>(
+		::RegisterClipboardFormat(TEXT("Borland IDE Block Type")));
+
+	// Likewise for line-copy (copies a full line when no text is selected)
+	cfLineSelect = static_cast<CLIPFORMAT>(
+		::RegisterClipboardFormat(TEXT("MSDEVLineSelect")));
+	cfVSLineTag = static_cast<CLIPFORMAT>(
+		::RegisterClipboardFormat(TEXT("VisualStudioEditorOperationsLineCutCopyClipboardTag")));
+	hrOle = E_FAIL;
+
+	wMain = hwnd;
+
+	dob.sci = this;
+	ds.sci = this;
+	dt.sci = this;
+
+	sysCaretBitmap = {};
+	sysCaretWidth = 0;
+	sysCaretHeight = 0;
+
+	styleIdleInQueue = false;
+
+#if defined(USE_D2D)
+	pRenderTarget = nullptr;
+	renderTargetValid = true;
+#endif
+
+	caret.period = ::GetCaretBlinkTime();
+	if (caret.period < 0)
+		caret.period = 0;
+
+	// Initialize COM.  If the app has already done this it will have
+	// no effect.  If the app hasn't, we really shouldn't ask them to call
+	// it just so this internal feature works.
+	hrOle = ::OleInitialize(nullptr);
+
+	// Find SetCoalescableTimer which is only available from Windows 8+
+	HMODULE user32 = ::GetModuleHandleW(L"user32.dll");
+	SetCoalescableTimerFn = DLLFunction<SetCoalescableTimerSig>(user32, "SetCoalescableTimer");
+
+	vs.indicators[IndicatorUnknown] = Indicator(IndicatorStyle::Hidden, ColourRGBA(0, 0, 0xff));
+	vs.indicators[IndicatorInput] = Indicator(IndicatorStyle::Dots, ColourRGBA(0, 0, 0xff));
+	vs.indicators[IndicatorConverted] = Indicator(IndicatorStyle::CompositionThick, ColourRGBA(0, 0, 0xff));
+	vs.indicators[IndicatorTarget] = Indicator(IndicatorStyle::StraightBox, ColourRGBA(0, 0, 0xff));
+}
+
+ScintillaWin::~ScintillaWin() {
+	if (sysCaretBitmap) {
+		::DeleteObject(sysCaretBitmap);
+		sysCaretBitmap = {};
+	}
+}
+
+void ScintillaWin::Finalise() {
+	ScintillaBase::Finalise();
+	for (TickReason tr = TickReason::caret; tr <= TickReason::dwell;
+		tr = static_cast<TickReason>(static_cast<int>(tr) + 1)) {
+		FineTickerCancel(tr);
+	}
+	SetIdle(false);
+	DropRenderTarget();
+	::RevokeDragDrop(MainHWND());
+	if (SUCCEEDED(hrOle)) {
+		::OleUninitialize();
+	}
+}
+
+#if defined(USE_D2D)
+
+void ScintillaWin::EnsureRenderTarget(HDC hdc) {
+	if (!renderTargetValid) {
+		DropRenderTarget();
+		renderTargetValid = true;
+	}
+	if (pD2DFactory && !pRenderTarget) {
+		HWND hw = MainHWND();
+		RECT rc;
+		::GetClientRect(hw, &rc);
+
+		const D2D1_SIZE_U size = D2D1::SizeU(rc.right - rc.left, rc.bottom - rc.top);
+
+		// Create a Direct2D render target.
+		D2D1_RENDER_TARGET_PROPERTIES drtp {};
+		drtp.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+		drtp.pixelFormat.format = DXGI_FORMAT_UNKNOWN;
+		drtp.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN;
+		drtp.dpiX = 96.0;
+		drtp.dpiY = 96.0;
+		drtp.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+		drtp.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+		if (technology == Technology::DirectWriteDC) {
+			// Explicit pixel format needed.
+			drtp.pixelFormat = D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM,
+				D2D1_ALPHA_MODE_IGNORE);
+
+			ID2D1DCRenderTarget *pDCRT = nullptr;
+			const HRESULT hr = pD2DFactory->CreateDCRenderTarget(&drtp, &pDCRT);
+			if (SUCCEEDED(hr)) {
+				pRenderTarget = pDCRT;
+			} else {
+				Platform::DebugPrintf("Failed CreateDCRenderTarget 0x%lx\n", hr);
+				pRenderTarget = nullptr;
+			}
+
+		} else {
+			D2D1_HWND_RENDER_TARGET_PROPERTIES dhrtp {};
+			dhrtp.hwnd = hw;
+			dhrtp.pixelSize = size;
+			dhrtp.presentOptions = (technology == Technology::DirectWriteRetain) ?
+			D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS : D2D1_PRESENT_OPTIONS_NONE;
+
+			ID2D1HwndRenderTarget *pHwndRenderTarget = nullptr;
+			const HRESULT hr = pD2DFactory->CreateHwndRenderTarget(drtp, dhrtp, &pHwndRenderTarget);
+			if (SUCCEEDED(hr)) {
+				pRenderTarget = pHwndRenderTarget;
+			} else {
+				Platform::DebugPrintf("Failed CreateHwndRenderTarget 0x%lx\n", hr);
+				pRenderTarget = nullptr;
+			}
+		}
+		// Pixmaps were created to be compatible with previous render target so
+		// need to be recreated.
+		DropGraphics();
+	}
+
+	if ((technology == Technology::DirectWriteDC) && pRenderTarget) {
+		RECT rcWindow;
+		::GetClientRect(MainHWND(), &rcWindow);
+		const HRESULT hr = static_cast<ID2D1DCRenderTarget*>(pRenderTarget)->BindDC(hdc, &rcWindow);
+		if (FAILED(hr)) {
+			Platform::DebugPrintf("BindDC failed 0x%lx\n", hr);
+			DropRenderTarget();
+		}
+	}
+}
+#endif
+
+
+void ScintillaWin::DropRenderTarget() noexcept {
+#if defined(USE_D2D)
+	ReleaseUnknown(pRenderTarget);
+#endif
+}
+
+HWND ScintillaWin::MainHWND() const noexcept {
+	return HwndFromWindow(wMain);
+}
+
+void ScintillaWin::DisplayCursor(Window::Cursor c) {
+	if (cursorMode != CursorShape::Normal) {
+		c = static_cast<Window::Cursor>(cursorMode);
+	}
+	if (c == Window::Cursor::reverseArrow) {
+		::SetCursor(reverseArrowCursor.Load(dpi));
+	} else {
+		wMain.SetCursor(c);
+	}
+}
+
+bool ScintillaWin::DragThreshold(Point ptStart, Point ptNow) {
+	const Point ptDifference = ptStart - ptNow;
+	const XYPOSITION xMove = std::trunc(std::abs(ptDifference.x));
+	const XYPOSITION yMove = std::trunc(std::abs(ptDifference.y));
+	return (xMove > SystemMetricsForDpi(SM_CXDRAG, dpi)) ||
+		(yMove > SystemMetricsForDpi(SM_CYDRAG, dpi));
+}
+
+void ScintillaWin::StartDrag() {
+	inDragDrop = DragDrop::dragging;
+	DWORD dwEffect = 0;
+	dropWentOutside = true;
+	IDataObject *pDataObject = reinterpret_cast<IDataObject *>(&dob);
+	IDropSource *pDropSource = reinterpret_cast<IDropSource *>(&ds);
+	//Platform::DebugPrintf("About to DoDragDrop %x %x\n", pDataObject, pDropSource);
+	const HRESULT hr = ::DoDragDrop(
+	                 pDataObject,
+	                 pDropSource,
+	                 DROPEFFECT_COPY | DROPEFFECT_MOVE, &dwEffect);
+	//Platform::DebugPrintf("DoDragDrop = %x\n", hr);
+	if (SUCCEEDED(hr)) {
+		if ((hr == DRAGDROP_S_DROP) && (dwEffect == DROPEFFECT_MOVE) && dropWentOutside) {
+			// Remove dragged out text
+			ClearSelection();
+		}
+	}
+	inDragDrop = DragDrop::none;
+	SetDragPosition(SelectionPosition(Sci::invalidPosition));
+}
+
+KeyMod ScintillaWin::MouseModifiers(uptr_t wParam) noexcept {
+	return ModifierFlags(
+		(wParam & MK_SHIFT) != 0,
+		(wParam & MK_CONTROL) != 0,
+		KeyboardIsKeyDown(VK_MENU));
+}
+
+}
+
+namespace {
+
+int InputCodePage() noexcept {
+	HKL inputLocale = ::GetKeyboardLayout(0);
+	const LANGID inputLang = LOWORD(inputLocale);
+	char sCodePage[10];
+	const int res = ::GetLocaleInfoA(MAKELCID(inputLang, SORT_DEFAULT),
+	  LOCALE_IDEFAULTANSICODEPAGE, sCodePage, sizeof(sCodePage));
+	if (!res)
+		return 0;
+	return atoi(sCodePage);
+}
+
+/** Map the key codes to their equivalent Keys:: form. */
+Keys KeyTranslate(int keyIn) noexcept {
+//PLATFORM_ASSERT(!keyIn);
+	switch (keyIn) {
+	case VK_DOWN:		return Keys::Down;
+		case VK_UP:		return Keys::Up;
+		case VK_LEFT:		return Keys::Left;
+		case VK_RIGHT:		return Keys::Right;
+		case VK_HOME:		return Keys::Home;
+		case VK_END:		return Keys::End;
+		case VK_PRIOR:		return Keys::Prior;
+		case VK_NEXT:		return Keys::Next;
+		case VK_DELETE:	return Keys::Delete;
+		case VK_INSERT:		return Keys::Insert;
+		case VK_ESCAPE:	return Keys::Escape;
+		case VK_BACK:		return Keys::Back;
+		case VK_TAB:		return Keys::Tab;
+		case VK_RETURN:	return Keys::Return;
+		case VK_ADD:		return Keys::Add;
+		case VK_SUBTRACT:	return Keys::Subtract;
+		case VK_DIVIDE:		return Keys::Divide;
+		case VK_LWIN:		return Keys::Win;
+		case VK_RWIN:		return Keys::RWin;
+		case VK_APPS:		return Keys::Menu;
+		case VK_OEM_2:		return static_cast<Keys>('/');
+		case VK_OEM_3:		return static_cast<Keys>('`');
+		case VK_OEM_4:		return static_cast<Keys>('[');
+		case VK_OEM_5:		return static_cast<Keys>('\\');
+		case VK_OEM_6:		return static_cast<Keys>(']');
+		default:			return static_cast<Keys>(keyIn);
+	}
+}
+
+bool BoundsContains(PRectangle rcBounds, HRGN hRgnBounds, PRectangle rcCheck) noexcept {
+	bool contains = true;
+	if (!rcCheck.Empty()) {
+		if (!rcBounds.Contains(rcCheck)) {
+			contains = false;
+		} else if (hRgnBounds) {
+			// In bounding rectangle so check more accurately using region
+			const RECT rcw = RectFromPRectangle(rcCheck);
+			HRGN hRgnCheck = ::CreateRectRgnIndirect(&rcw);
+			if (hRgnCheck) {
+				HRGN hRgnDifference = ::CreateRectRgn(0, 0, 0, 0);
+				if (hRgnDifference) {
+					const int combination = ::CombineRgn(hRgnDifference, hRgnCheck, hRgnBounds, RGN_DIFF);
+					if (combination != NULLREGION) {
+						contains = false;
+					}
+					::DeleteRgn(hRgnDifference);
+				}
+				::DeleteRgn(hRgnCheck);
+			}
+		}
+	}
+	return contains;
+}
+
+// Simplify calling WideCharToMultiByte and MultiByteToWideChar by providing default parameters and using string view.
+
+int MultiByteFromWideChar(UINT codePage, std::wstring_view wsv, LPSTR lpMultiByteStr, ptrdiff_t cbMultiByte) noexcept {
+	return ::WideCharToMultiByte(codePage, 0, wsv.data(), static_cast<int>(wsv.length()), lpMultiByteStr, static_cast<int>(cbMultiByte), nullptr, nullptr);
+}
+
+int MultiByteLenFromWideChar(UINT codePage, std::wstring_view wsv) noexcept {
+	return MultiByteFromWideChar(codePage, wsv, nullptr, 0);
+}
+
+int WideCharFromMultiByte(UINT codePage, std::string_view sv, LPWSTR lpWideCharStr, ptrdiff_t cchWideChar) noexcept {
+	return ::MultiByteToWideChar(codePage, 0, sv.data(), static_cast<int>(sv.length()), lpWideCharStr, static_cast<int>(cchWideChar));
+}
+
+int WideCharLenFromMultiByte(UINT codePage, std::string_view sv) noexcept {
+	return WideCharFromMultiByte(codePage, sv, nullptr, 0);
+}
+
+std::string StringEncode(std::wstring_view wsv, int codePage) {
+	const int cchMulti = wsv.length() ? MultiByteLenFromWideChar(codePage, wsv) : 0;
+	std::string sMulti(cchMulti, 0);
+	if (cchMulti) {
+		MultiByteFromWideChar(codePage, wsv, sMulti.data(), cchMulti);
+	}
+	return sMulti;
+}
+
+std::wstring StringDecode(std::string_view sv, int codePage) {
+	const int cchWide = sv.length() ? WideCharLenFromMultiByte(codePage, sv) : 0;
+	std::wstring sWide(cchWide, 0);
+	if (cchWide) {
+		WideCharFromMultiByte(codePage, sv, sWide.data(), cchWide);
+	}
+	return sWide;
+}
+
+std::wstring StringMapCase(std::wstring_view wsv, DWORD mapFlags) {
+	const int charsConverted = ::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
+		wsv.data(), static_cast<int>(wsv.length()), nullptr, 0);
+	std::wstring wsConverted(charsConverted, 0);
+	if (charsConverted) {
+		::LCMapStringW(LOCALE_SYSTEM_DEFAULT, mapFlags,
+			wsv.data(), static_cast<int>(wsv.length()), wsConverted.data(), charsConverted);
+	}
+	return wsConverted;
+}
+
+}
+
+// Returns the target converted to UTF8.
+// Return the length in bytes.
+Sci::Position ScintillaWin::TargetAsUTF8(char *text) const {
+	const Sci::Position targetLength = targetRange.Length();
+	if (IsUnicodeMode()) {
+		if (text) {
+			pdoc->GetCharRange(text, targetRange.start.Position(), targetLength);
+		}
+	} else {
+		// Need to convert
+		const std::string s = RangeText(targetRange.start.Position(), targetRange.end.Position());
+		const std::wstring characters = StringDecode(s, CodePageOfDocument());
+		const int utf8Len = MultiByteLenFromWideChar(CpUtf8, characters);
+		if (text) {
+			MultiByteFromWideChar(CpUtf8, characters, text, utf8Len);
+			text[utf8Len] = '\0';
+		}
+		return utf8Len;
+	}
+	return targetLength;
+}
+
+// Translates a nul terminated UTF8 string into the document encoding.
+// Return the length of the result in bytes.
+Sci::Position ScintillaWin::EncodedFromUTF8(const char *utf8, char *encoded) const {
+	const Sci::Position inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8);
+	if (IsUnicodeMode()) {
+		if (encoded) {
+			memcpy(encoded, utf8, inputLength);
+		}
+		return inputLength;
+	} else {
+		// Need to convert
+		const std::string_view utf8Input(utf8, inputLength);
+		const int charsLen = WideCharLenFromMultiByte(CpUtf8, utf8Input);
+		std::wstring characters(charsLen, L'\0');
+		WideCharFromMultiByte(CpUtf8, utf8Input, &characters[0], charsLen);
+
+		const int encodedLen = MultiByteLenFromWideChar(CodePageOfDocument(), characters);
+		if (encoded) {
+			MultiByteFromWideChar(CodePageOfDocument(), characters, encoded, encodedLen);
+			encoded[encodedLen] = '\0';
+		}
+		return encodedLen;
+	}
+}
+
+bool ScintillaWin::PaintDC(HDC hdc) {
+	if (technology == Technology::Default) {
+		AutoSurface surfaceWindow(hdc, this);
+		if (surfaceWindow) {
+			Paint(surfaceWindow, rcPaint);
+			surfaceWindow->Release();
+		}
+	} else {
+#if defined(USE_D2D)
+		EnsureRenderTarget(hdc);
+		if (pRenderTarget) {
+			AutoSurface surfaceWindow(pRenderTarget, this);
+			if (surfaceWindow) {
+				pRenderTarget->BeginDraw();
+				Paint(surfaceWindow, rcPaint);
+				surfaceWindow->Release();
+				const HRESULT hr = pRenderTarget->EndDraw();
+				if (hr == static_cast<HRESULT>(D2DERR_RECREATE_TARGET)) {
+					DropRenderTarget();
+					return false;
+				}
+			}
+		}
+#endif
+	}
+
+	return true;
+}
+
+sptr_t ScintillaWin::WndPaint() {
+	//ElapsedPeriod ep;
+
+	// Redirect assertions to debug output and save current state
+	const bool assertsPopup = Platform::ShowAssertionPopUps(false);
+	paintState = PaintState::painting;
+	PAINTSTRUCT ps = {};
+
+	// Removed since this interferes with reporting other assertions as it occurs repeatedly
+	//PLATFORM_ASSERT(hRgnUpdate == NULL);
+	hRgnUpdate = ::CreateRectRgn(0, 0, 0, 0);
+	::GetUpdateRgn(MainHWND(), hRgnUpdate, FALSE);
+	::BeginPaint(MainHWND(), &ps);
+	rcPaint = PRectangle::FromInts(ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom);
+	const PRectangle rcClient = GetClientRectangle();
+	paintingAllText = BoundsContains(rcPaint, hRgnUpdate, rcClient);
+	if (!PaintDC(ps.hdc)) {
+		paintState = PaintState::abandoned;
+	}
+	if (hRgnUpdate) {
+		::DeleteRgn(hRgnUpdate);
+		hRgnUpdate = {};
+	}
+
+	::EndPaint(MainHWND(), &ps);
+	if (paintState == PaintState::abandoned) {
+		// Painting area was insufficient to cover new styling or brace highlight positions
+		FullPaint();
+		::ValidateRect(MainHWND(), nullptr);
+	}
+	paintState = PaintState::notPainting;
+
+	// Restore debug output state
+	Platform::ShowAssertionPopUps(assertsPopup);
+
+	//Platform::DebugPrintf("Paint took %g\n", ep.Duration());
+	return 0;
+}
+
+sptr_t ScintillaWin::HandleCompositionWindowed(uptr_t wParam, sptr_t lParam) {
+	if (lParam & GCS_RESULTSTR) {
+		IMContext imc(MainHWND());
+		if (imc.hIMC) {
+			AddWString(imc.GetCompositionString(GCS_RESULTSTR), CharacterSource::ImeResult);
+
+			// Set new position after converted
+			const Point pos = PointMainCaret();
+			COMPOSITIONFORM CompForm {};
+			CompForm.dwStyle = CFS_POINT;
+			CompForm.ptCurrentPos = POINTFromPoint(pos);
+			::ImmSetCompositionWindow(imc.hIMC, &CompForm);
+		}
+		return 0;
+	}
+	return ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam);
+}
+
+bool ScintillaWin::KoreanIME() noexcept {
+	const int codePage = InputCodePage();
+	return codePage == 949 || codePage == 1361;
+}
+
+void ScintillaWin::MoveImeCarets(Sci::Position offset) noexcept {
+	// Move carets relatively by bytes.
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Position positionInsert = sel.Range(r).Start().Position();
+		sel.Range(r).caret.SetPosition(positionInsert + offset);
+		sel.Range(r).anchor.SetPosition(positionInsert + offset);
+	}
+}
+
+void ScintillaWin::DrawImeIndicator(int indicator, Sci::Position len) {
+	// Emulate the visual style of IME characters with indicators.
+	// Draw an indicator on the character before caret by the character bytes of len
+	// so it should be called after InsertCharacter().
+	// It does not affect caret positions.
+	if (indicator < 8 || indicator > IndicatorMax) {
+		return;
+	}
+	pdoc->DecorationSetCurrentIndicator(indicator);
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Position positionInsert = sel.Range(r).Start().Position();
+		pdoc->DecorationFillRange(positionInsert - len, 1, len);
+	}
+}
+
+void ScintillaWin::SetCandidateWindowPos() {
+	IMContext imc(MainHWND());
+	if (imc.hIMC) {
+		const Point pos = PointMainCaret();
+		const PRectangle rcClient = GetTextRectangle();
+		CANDIDATEFORM CandForm{};
+		CandForm.dwIndex = 0;
+		CandForm.dwStyle = CFS_EXCLUDE;
+		CandForm.ptCurrentPos.x = static_cast<int>(pos.x);
+		CandForm.ptCurrentPos.y = static_cast<int>(pos.y + std::max(4, vs.lineHeight/4));
+		// Exclude the area of the whole caret line
+		CandForm.rcArea.top = static_cast<int>(pos.y);
+		CandForm.rcArea.bottom = static_cast<int>(pos.y + vs.lineHeight);
+		CandForm.rcArea.left = static_cast<int>(rcClient.left);
+		CandForm.rcArea.right = static_cast<int>(rcClient.right);
+		::ImmSetCandidateWindow(imc.hIMC, &CandForm);
+	}
+}
+
+void ScintillaWin::SelectionToHangul() {
+	// Convert every hanja to hangul within the main range.
+	const Sci::Position selStart = sel.RangeMain().Start().Position();
+	const Sci::Position documentStrLen = sel.RangeMain().Length();
+	const Sci::Position selEnd = selStart + documentStrLen;
+	const Sci::Position utf16Len = pdoc->CountUTF16(selStart, selEnd);
+
+	if (utf16Len > 0) {
+		std::string documentStr(documentStrLen, '\0');
+		pdoc->GetCharRange(&documentStr[0], selStart, documentStrLen);
+
+		std::wstring uniStr = StringDecode(documentStr, CodePageOfDocument());
+		const int converted = HanjaDict::GetHangulOfHanja(&uniStr[0]);
+		documentStr = StringEncode(uniStr, CodePageOfDocument());
+
+		if (converted > 0) {
+			pdoc->BeginUndoAction();
+			ClearSelection();
+			InsertPaste(&documentStr[0], documentStr.size());
+			pdoc->EndUndoAction();
+		}
+	}
+}
+
+void ScintillaWin::EscapeHanja() {
+	// The candidate box pops up to user to select a hanja.
+	// It comes into WM_IME_COMPOSITION with GCS_RESULTSTR.
+	// The existing hangul or hanja is replaced with it.
+	if (sel.Count() > 1) {
+		return; // Do not allow multi carets.
+	}
+	const Sci::Position currentPos = CurrentPosition();
+	const int oneCharLen = pdoc->LenChar(currentPos);
+
+	if (oneCharLen < 2) {
+		return; // No need to handle SBCS.
+	}
+
+	// ImmEscapeW() may overwrite uniChar[] with a null terminated string.
+	// So enlarge it enough to Maximum 4 as in UTF-8.
+	constexpr size_t safeLength = UTF8MaxBytes + 1;
+	std::string oneChar(safeLength, '\0');
+	pdoc->GetCharRange(&oneChar[0], currentPos, oneCharLen);
+
+	std::wstring uniChar = StringDecode(oneChar, CodePageOfDocument());
+
+	IMContext imc(MainHWND());
+	if (imc.hIMC) {
+		// Set the candidate box position since IME may show it.
+		SetCandidateWindowPos();
+		// IME_ESC_HANJA_MODE appears to receive the first character only.
+		if (::ImmEscapeW(GetKeyboardLayout(0), imc.hIMC, IME_ESC_HANJA_MODE, &uniChar[0])) {
+			SetSelection(currentPos, currentPos + oneCharLen);
+		}
+	}
+}
+
+void ScintillaWin::ToggleHanja() {
+	// If selection, convert every hanja to hangul within the main range.
+	// If no selection, commit to IME.
+	if (sel.Count() > 1) {
+		return; // Do not allow multi carets.
+	}
+
+	if (sel.Empty()) {
+		EscapeHanja();
+	} else {
+		SelectionToHangul();
+	}
+}
+
+namespace {
+
+std::vector<int> MapImeIndicators(std::vector<BYTE> inputStyle) {
+	std::vector<int> imeIndicator(inputStyle.size(), IndicatorUnknown);
+	for (size_t i = 0; i < inputStyle.size(); i++) {
+		switch (static_cast<int>(inputStyle.at(i))) {
+		case ATTR_INPUT:
+			imeIndicator[i] = IndicatorInput;
+			break;
+		case ATTR_TARGET_NOTCONVERTED:
+		case ATTR_TARGET_CONVERTED:
+			imeIndicator[i] = IndicatorTarget;
+			break;
+		case ATTR_CONVERTED:
+			imeIndicator[i] = IndicatorConverted;
+			break;
+		default:
+			imeIndicator[i] = IndicatorUnknown;
+			break;
+		}
+	}
+	return imeIndicator;
+}
+
+}
+
+void ScintillaWin::AddWString(std::wstring_view wsv, CharacterSource charSource) {
+	if (wsv.empty())
+		return;
+
+	const int codePage = CodePageOfDocument();
+	for (size_t i = 0; i < wsv.size(); ) {
+		const size_t ucWidth = UTF16CharLength(wsv[i]);
+		const std::string docChar = StringEncode(wsv.substr(i, ucWidth), codePage);
+
+		InsertCharacter(docChar, charSource);
+		i += ucWidth;
+	}
+}
+
+sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
+	// Copy & paste by johnsonj with a lot of helps of Neil.
+	// Great thanks for my foreruners, jiniya and BLUEnLIVE.
+
+	IMContext imc(MainHWND());
+	if (!imc.hIMC)
+		return 0;
+	if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
+		::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+		return 0;
+	}
+
+	bool initialCompose = false;
+	if (pdoc->TentativeActive()) {
+		pdoc->TentativeUndo();
+	} else {
+		// No tentative undo means start of this composition so
+		// fill in any virtual spaces.
+		initialCompose = true;
+	}
+
+	view.imeCaretBlockOverride = false;
+
+	if (lParam & GCS_RESULTSTR) {
+		AddWString(imc.GetCompositionString(GCS_RESULTSTR), CharacterSource::ImeResult);
+	}
+
+	if (lParam & GCS_COMPSTR) {
+		const std::wstring wcs = imc.GetCompositionString(GCS_COMPSTR);
+		if (wcs.empty()) {
+			ShowCaretAtCurrentPosition();
+			return 0;
+		}
+
+		if (initialCompose) {
+			ClearBeforeTentativeStart();
+		}
+
+		// Set candidate window left aligned to beginning of preedit string.
+		SetCandidateWindowPos();
+		pdoc->TentativeStart(); // TentativeActive from now on.
+
+		std::vector<int> imeIndicator = MapImeIndicators(imc.GetImeAttributes());
+
+		const int codePage = CodePageOfDocument();
+		const std::wstring_view wsv = wcs;
+		for (size_t i = 0; i < wsv.size(); ) {
+			const size_t ucWidth = UTF16CharLength(wsv[i]);
+			const std::string docChar = StringEncode(wsv.substr(i, ucWidth), codePage);
+
+			InsertCharacter(docChar, CharacterSource::TentativeInput);
+
+			DrawImeIndicator(imeIndicator[i], docChar.size());
+			i += ucWidth;
+		}
+
+		// Japanese IME after pressing Tab replaces input string with first candidate item (target string);
+		// when selecting other candidate item, previous item will be replaced with current one.
+		// After candidate item been added, it's looks like been full selected, it's better to keep caret
+		// at end of "selection" (end of input) instead of jump to beginning of input ("selection").
+		const bool onlyTarget = std::all_of(imeIndicator.begin(), imeIndicator.end(), [](int i) noexcept {
+			return i == IndicatorTarget;
+		});
+		if (!onlyTarget) {
+			// CS_NOMOVECARET: keep caret at beginning of composition string which already moved in InsertCharacter().
+			// GCS_CURSORPOS: current caret position is provided by IME.
+			Sci::Position imeEndToImeCaretU16 = -static_cast<Sci::Position>(wcs.size());
+			if (!(lParam & CS_NOMOVECARET) && (lParam & GCS_CURSORPOS)) {
+				imeEndToImeCaretU16 += imc.GetImeCaretPos();
+			}
+			if (imeEndToImeCaretU16 != 0) {
+				// Move back IME caret from current last position to imeCaretPos.
+				const Sci::Position currentPos = CurrentPosition();
+				const Sci::Position imeCaretPosDoc = pdoc->GetRelativePositionUTF16(currentPos, imeEndToImeCaretU16);
+
+				MoveImeCarets(-currentPos + imeCaretPosDoc);
+
+				if (std::find(imeIndicator.begin(), imeIndicator.end(), IndicatorTarget) != imeIndicator.end()) {
+					// set candidate window left aligned to beginning of target string.
+					SetCandidateWindowPos();
+				}
+			}
+		}
+
+		if (KoreanIME()) {
+			view.imeCaretBlockOverride = true;
+		}
+	}
+	EnsureCaretVisible();
+	ShowCaretAtCurrentPosition();
+	return 0;
+}
+
+namespace {
+
+// Translate message IDs from WM_* and EM_* to Message::* so can partly emulate Windows Edit control
+Message SciMessageFromEM(unsigned int iMessage) noexcept {
+	switch (iMessage) {
+	case EM_CANPASTE: return Message::CanPaste;
+	case EM_CANUNDO: return Message::CanUndo;
+	case EM_EMPTYUNDOBUFFER: return Message::EmptyUndoBuffer;
+	case EM_FINDTEXTEX: return Message::FindText;
+	case EM_FORMATRANGE: return Message::FormatRange;
+	case EM_GETFIRSTVISIBLELINE: return Message::GetFirstVisibleLine;
+	case EM_GETLINECOUNT: return Message::GetLineCount;
+	case EM_GETSELTEXT: return Message::GetSelText;
+	case EM_GETTEXTRANGE: return Message::GetTextRange;
+	case EM_HIDESELECTION: return Message::HideSelection;
+	case EM_LINEINDEX: return Message::PositionFromLine;
+	case EM_LINESCROLL: return Message::LineScroll;
+	case EM_REPLACESEL: return Message::ReplaceSel;
+	case EM_SCROLLCARET: return Message::ScrollCaret;
+	case EM_SETREADONLY: return Message::SetReadOnly;
+	case WM_CLEAR: return Message::Clear;
+	case WM_COPY: return Message::Copy;
+	case WM_CUT: return Message::Cut;
+	case WM_SETTEXT: return Message::SetText;
+	case WM_PASTE: return Message::Paste;
+	case WM_UNDO: return Message::Undo;
+	}
+	return static_cast<Message>(iMessage);
+}
+
+}
+
+namespace Scintilla::Internal {
+
+UINT CodePageFromCharSet(CharacterSet characterSet, UINT documentCodePage) noexcept {
+	if (documentCodePage == CpUtf8) {
+		return CpUtf8;
+	}
+	switch (characterSet) {
+	case CharacterSet::Ansi: return 1252;
+	case CharacterSet::Default: return documentCodePage ? documentCodePage : 1252;
+	case CharacterSet::Baltic: return 1257;
+	case CharacterSet::ChineseBig5: return 950;
+	case CharacterSet::EastEurope: return 1250;
+	case CharacterSet::GB2312: return 936;
+	case CharacterSet::Greek: return 1253;
+	case CharacterSet::Hangul: return 949;
+	case CharacterSet::Mac: return 10000;
+	case CharacterSet::Oem: return 437;
+	case CharacterSet::Russian: return 1251;
+	case CharacterSet::ShiftJis: return 932;
+	case CharacterSet::Turkish: return 1254;
+	case CharacterSet::Johab: return 1361;
+	case CharacterSet::Hebrew: return 1255;
+	case CharacterSet::Arabic: return 1256;
+	case CharacterSet::Vietnamese: return 1258;
+	case CharacterSet::Thai: return 874;
+	case CharacterSet::Iso8859_15: return 28605;
+	// Not supported
+	case CharacterSet::Cyrillic: return documentCodePage;
+	case CharacterSet::Symbol: return documentCodePage;
+	default: break;
+	}
+	return documentCodePage;
+}
+
+}
+
+UINT ScintillaWin::CodePageOfDocument() const noexcept {
+	return CodePageFromCharSet(vs.styles[StyleDefault].characterSet, pdoc->dbcsCodePage);
+}
+
+std::string ScintillaWin::EncodeWString(std::wstring_view wsv) {
+	if (IsUnicodeMode()) {
+		const size_t len = UTF8Length(wsv);
+		std::string putf(len, 0);
+		UTF8FromUTF16(wsv, putf.data(), len);
+		return putf;
+	} else {
+		// Not in Unicode mode so convert from Unicode to current Scintilla code page
+		return StringEncode(wsv, CodePageOfDocument());
+	}
+}
+
+sptr_t ScintillaWin::GetTextLength() {
+	if (pdoc->dbcsCodePage == 0 || pdoc->dbcsCodePage == CpUtf8) {
+		return pdoc->CountUTF16(0, pdoc->Length());
+	} else {
+		// Count the number of UTF-16 code units line by line
+		const UINT cpSrc = CodePageOfDocument();
+		const Sci::Line lines = pdoc->LinesTotal();
+		Sci::Position codeUnits = 0;
+		std::string lineBytes;
+		for (Sci::Line line = 0; line < lines; line++) {
+			const Sci::Position start = pdoc->LineStart(line);
+			const Sci::Position width = pdoc->LineStart(line+1) - start;
+			lineBytes.resize(width);
+			pdoc->GetCharRange(lineBytes.data(), start, width);
+			codeUnits += WideCharLenFromMultiByte(cpSrc, lineBytes);
+		}
+		return codeUnits;
+	}
+}
+
+sptr_t ScintillaWin::GetText(uptr_t wParam, sptr_t lParam) {
+	if (lParam == 0) {
+		return GetTextLength();
+	}
+	if (wParam == 0) {
+		return 0;
+	}
+	wchar_t *ptr = static_cast<wchar_t *>(PtrFromSPtr(lParam));
+	if (pdoc->Length() == 0) {
+		*ptr = L'\0';
+		return 0;
+	}
+	const Sci::Position lengthWanted = wParam - 1;
+	if (IsUnicodeMode()) {
+		Sci::Position sizeRequestedRange = pdoc->GetRelativePositionUTF16(0, lengthWanted);
+		if (sizeRequestedRange < 0) {
+			// Requested more text than there is in the document.
+			sizeRequestedRange = pdoc->Length();
+		}
+		std::string docBytes(sizeRequestedRange, '\0');
+		pdoc->GetCharRange(&docBytes[0], 0, sizeRequestedRange);
+		const size_t uLen = UTF16FromUTF8(docBytes, ptr, lengthWanted);
+		ptr[uLen] = L'\0';
+		return uLen;
+	} else {
+		// Not Unicode mode
+		// Convert to Unicode using the current Scintilla code page
+		// Retrieve as UTF-16 line by line
+		const UINT cpSrc = CodePageOfDocument();
+		const Sci::Line lines = pdoc->LinesTotal();
+		Sci::Position codeUnits = 0;
+		std::string lineBytes;
+		std::wstring lineAsUTF16;
+		for (Sci::Line line = 0; line < lines && codeUnits < lengthWanted; line++) {
+			const Sci::Position start = pdoc->LineStart(line);
+			const Sci::Position width = pdoc->LineStart(line + 1) - start;
+			lineBytes.resize(width);
+			pdoc->GetCharRange(lineBytes.data(), start, width);
+			const Sci::Position codeUnitsLine = WideCharLenFromMultiByte(cpSrc, lineBytes);
+			lineAsUTF16.resize(codeUnitsLine);
+			const Sci::Position lengthLeft = lengthWanted - codeUnits;
+			WideCharFromMultiByte(cpSrc, lineBytes, lineAsUTF16.data(), lineAsUTF16.length());
+			const Sci::Position lengthToCopy = std::min(lengthLeft, codeUnitsLine);
+			lineAsUTF16.copy(ptr + codeUnits, lengthToCopy);
+			codeUnits += lengthToCopy;
+		}
+		ptr[codeUnits] = L'\0';
+		return codeUnits;
+	}
+}
+
+Window::Cursor ScintillaWin::ContextCursor(Point pt) {
+	if (inDragDrop == DragDrop::dragging) {
+		return Window::Cursor::up;
+	} else {
+		// Display regular (drag) cursor over selection
+		if (PointInSelMargin(pt)) {
+			return GetMarginCursor(pt);
+		} else if (!SelectionEmpty() && PointInSelection(pt)) {
+			return Window::Cursor::arrow;
+		} else if (PointIsHotspot(pt)) {
+			return Window::Cursor::hand;
+		} else if (hoverIndicatorPos != Sci::invalidPosition) {
+			const Sci::Position pos = PositionFromLocation(pt, true, true);
+			if (pos != Sci::invalidPosition) {
+				return Window::Cursor::hand;
+			}
+		}
+	}
+	return Window::Cursor::text;
+}
+
+sptr_t ScintillaWin::ShowContextMenu(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	Point pt = PointFromLParam(lParam);
+	POINT rpt = POINTFromPoint(pt);
+	::ScreenToClient(MainHWND(), &rpt);
+	const Point ptClient = PointFromPOINT(rpt);
+	if (ShouldDisplayPopup(ptClient)) {
+		if ((pt.x == -1) && (pt.y == -1)) {
+			// Caused by keyboard so display menu near caret
+			pt = PointMainCaret();
+			POINT spt = POINTFromPoint(pt);
+			::ClientToScreen(MainHWND(), &spt);
+			pt = PointFromPOINT(spt);
+		}
+		ContextMenu(pt);
+		return 0;
+	}
+	return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+}
+
+void ScintillaWin::SizeWindow() {
+#if defined(USE_D2D)
+	if (paintState == PaintState::notPainting) {
+		DropRenderTarget();
+	} else {
+		renderTargetValid = false;
+	}
+#endif
+	//Platform::DebugPrintf("Scintilla WM_SIZE %d %d\n", LOWORD(lParam), HIWORD(lParam));
+	ChangeSize();
+}
+
+sptr_t ScintillaWin::MouseMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+	case WM_LBUTTONDOWN: {
+			// For IME, set the composition string as the result string.
+			IMContext imc(MainHWND());
+			if (imc.hIMC) {
+				::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
+			}
+			//
+			//Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam,
+			//	KeyboardIsKeyDown(VK_SHIFT),
+			//	KeyboardIsKeyDown(VK_CONTROL),
+			//	KeyboardIsKeyDown(VK_MENU));
+			::SetFocus(MainHWND());
+			ButtonDownWithModifiers(PointFromLParam(lParam), ::GetMessageTime(),
+						MouseModifiers(wParam));
+		}
+		break;
+
+	case WM_LBUTTONUP:
+		ButtonUpWithModifiers(PointFromLParam(lParam),
+				      ::GetMessageTime(), MouseModifiers(wParam));
+		break;
+
+	case WM_RBUTTONDOWN: {
+			::SetFocus(MainHWND());
+			const Point pt = PointFromLParam(lParam);
+			if (!PointInSelection(pt)) {
+				CancelModes();
+				SetEmptySelection(PositionFromLocation(PointFromLParam(lParam)));
+			}
+
+			RightButtonDownWithModifiers(pt, ::GetMessageTime(), MouseModifiers(wParam));
+		}
+		break;
+
+	case WM_MOUSEMOVE: {
+			const Point pt = PointFromLParam(lParam);
+
+			// Windows might send WM_MOUSEMOVE even though the mouse has not been moved:
+			// http://blogs.msdn.com/b/oldnewthing/archive/2003/10/01/55108.aspx
+			if (ptMouseLast != pt) {
+				SetTrackMouseLeaveEvent(true);
+				ButtonMoveWithModifiers(pt, ::GetMessageTime(), MouseModifiers(wParam));
+			}
+		}
+		break;
+
+	case WM_MOUSELEAVE:
+		SetTrackMouseLeaveEvent(false);
+		MouseLeave();
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_MOUSEWHEEL:
+		if (!mouseWheelCaptures) {
+			// if the mouse wheel is not captured, test if the mouse
+			// pointer is over the editor window and if not, don't
+			// handle the message but pass it on.
+			RECT rc;
+			GetWindowRect(MainHWND(), &rc);
+			const POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+			if (!PtInRect(&rc, pt))
+				return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+		}
+		// if autocomplete list active then send mousewheel message to it
+		if (ac.Active()) {
+			HWND hWnd = HwndFromWindow(*(ac.lb));
+			::SendMessage(hWnd, iMessage, wParam, lParam);
+			break;
+		}
+
+		// Don't handle datazoom.
+		// (A good idea for datazoom would be to "fold" or "unfold" details.
+		// i.e. if datazoomed out only class structures are visible, when datazooming in the control
+		// structures appear, then eventually the individual statements...)
+		if (wParam & MK_SHIFT) {
+			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+		}
+		// Either SCROLL or ZOOM. We handle the wheel steppings calculation
+		wheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam);
+		if (std::abs(wheelDelta) >= WHEEL_DELTA && linesPerScroll > 0) {
+			Sci::Line linesToScroll = linesPerScroll;
+			if (linesPerScroll == WHEEL_PAGESCROLL)
+				linesToScroll = LinesOnScreen() - 1;
+			if (linesToScroll == 0) {
+				linesToScroll = 1;
+			}
+			linesToScroll *= (wheelDelta / WHEEL_DELTA);
+			if (wheelDelta >= 0)
+				wheelDelta = wheelDelta % WHEEL_DELTA;
+			else
+				wheelDelta = -(-wheelDelta % WHEEL_DELTA);
+
+			if (wParam & MK_CONTROL) {
+				// Zoom! We play with the font sizes in the styles.
+				// Number of steps/line is ignored, we just care if sizing up or down
+				if (linesToScroll < 0) {
+					KeyCommand(Message::ZoomIn);
+				} else {
+					KeyCommand(Message::ZoomOut);
+				}
+			} else {
+				// Scroll
+				ScrollTo(topLine + linesToScroll);
+			}
+		}
+		return 0;
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::KeyMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+
+	case WM_SYSKEYDOWN:
+	case WM_KEYDOWN: {
+			// Platform::DebugPrintf("Keydown %c %c%c%c%c %x %x\n",
+			// iMessage == WM_KEYDOWN ? 'K' : 'S',
+			// (lParam & (1 << 24)) ? 'E' : '-',
+			// KeyboardIsKeyDown(VK_SHIFT) ? 'S' : '-',
+			// KeyboardIsKeyDown(VK_CONTROL) ? 'C' : '-',
+			// KeyboardIsKeyDown(VK_MENU) ? 'A' : '-',
+			// wParam, lParam);
+			lastKeyDownConsumed = false;
+			const bool altDown = KeyboardIsKeyDown(VK_MENU);
+			if (altDown && KeyboardIsNumericKeypadFunction(wParam, lParam)) {
+				// Don't interpret these as they may be characters entered by number.
+				return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+			}
+			const int ret = KeyDownWithModifiers(
+								 static_cast<Keys>(KeyTranslate(static_cast<int>(wParam))),
+							     ModifierFlags(KeyboardIsKeyDown(VK_SHIFT),
+									     KeyboardIsKeyDown(VK_CONTROL),
+									     altDown),
+							     &lastKeyDownConsumed);
+			if (!ret && !lastKeyDownConsumed) {
+				return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+			}
+			break;
+		}
+
+	case WM_KEYUP:
+		//Platform::DebugPrintf("S keyup %d %x %x\n",iMessage, wParam, lParam);
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_CHAR:
+		if (((wParam >= 128) || !iscntrl(static_cast<int>(wParam))) || !lastKeyDownConsumed) {
+			wchar_t wcs[3] = { static_cast<wchar_t>(wParam), 0 };
+			unsigned int wclen = 1;
+			if (IS_HIGH_SURROGATE(wcs[0])) {
+				// If this is a high surrogate character, we need a second one
+				lastHighSurrogateChar = wcs[0];
+				return 0;
+			} else if (IS_LOW_SURROGATE(wcs[0])) {
+				wcs[1] = wcs[0];
+				wcs[0] = lastHighSurrogateChar;
+				lastHighSurrogateChar = 0;
+				wclen = 2;
+			}
+			AddWString(std::wstring_view(wcs, wclen), CharacterSource::DirectInput);
+		}
+		return 0;
+
+	case WM_UNICHAR:
+		if (wParam == UNICODE_NOCHAR) {
+			return TRUE;
+		} else if (lastKeyDownConsumed) {
+			return 1;
+		} else {
+			wchar_t wcs[3] = { 0 };
+			const size_t wclen = UTF16FromUTF32Character(static_cast<unsigned int>(wParam), wcs);
+			AddWString(std::wstring_view(wcs, wclen), CharacterSource::DirectInput);
+			return FALSE;
+		}
+	}
+
+	return 0;
+}
+
+sptr_t ScintillaWin::FocusMessage(unsigned int iMessage, uptr_t wParam, sptr_t) {
+	switch (iMessage) {
+	case WM_KILLFOCUS: {
+		HWND wOther = reinterpret_cast<HWND>(wParam);
+		HWND wThis = MainHWND();
+		const HWND wCT = HwndFromWindow(ct.wCallTip);
+		if (!wParam ||
+			!(::IsChild(wThis, wOther) || (wOther == wCT))) {
+			SetFocusState(false);
+			DestroySystemCaret();
+		}
+		// Explicitly complete any IME composition
+		IMContext imc(MainHWND());
+		if (imc.hIMC) {
+			::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0);
+		}
+		break;
+	}
+
+	case WM_SETFOCUS:
+		SetFocusState(true);
+		DestroySystemCaret();
+		CreateSystemCaret();
+		break;
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::IMEMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+
+	case WM_INPUTLANGCHANGE:
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_INPUTLANGCHANGEREQUEST:
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_IME_KEYDOWN: {
+			if (wParam == VK_HANJA) {
+				ToggleHanja();
+			}
+			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+		}
+
+	case WM_IME_REQUEST: {
+			if (wParam == IMR_RECONVERTSTRING) {
+				return ImeOnReconvert(lParam);
+			}
+			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+		}
+
+	case WM_IME_STARTCOMPOSITION:
+		if (KoreanIME() || imeInteraction == IMEInteraction::Inline) {
+			return 0;
+		} else {
+			ImeStartComposition();
+			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+		}
+
+	case WM_IME_ENDCOMPOSITION:
+		ImeEndComposition();
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_IME_COMPOSITION:
+		if (KoreanIME() || imeInteraction == IMEInteraction::Inline) {
+			return HandleCompositionInline(wParam, lParam);
+		} else {
+			return HandleCompositionWindowed(wParam, lParam);
+		}
+
+	case WM_IME_SETCONTEXT:
+		if (KoreanIME() || imeInteraction == IMEInteraction::Inline) {
+			if (wParam) {
+				LPARAM NoImeWin = lParam;
+				NoImeWin = NoImeWin & (~ISC_SHOWUICOMPOSITIONWINDOW);
+				return ::DefWindowProc(MainHWND(), iMessage, wParam, NoImeWin);
+			}
+		}
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	case WM_IME_NOTIFY:
+		return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+
+	case EM_LINEFROMCHAR:
+		if (PositionFromUPtr(wParam) < 0) {
+			wParam = SelectionStart().Position();
+		}
+		return pdoc->LineFromPosition(wParam);
+
+	case EM_EXLINEFROMCHAR:
+		return pdoc->LineFromPosition(lParam);
+
+	case EM_GETSEL:
+		if (wParam) {
+			*reinterpret_cast<DWORD *>(wParam) = static_cast<DWORD>(SelectionStart().Position());
+		}
+		if (lParam) {
+			*reinterpret_cast<DWORD *>(lParam) = static_cast<DWORD>(SelectionEnd().Position());
+		}
+		return MAKELRESULT(SelectionStart().Position(), SelectionEnd().Position());
+
+	case EM_EXGETSEL: {
+			if (lParam == 0) {
+				return 0;
+			}
+			CHARRANGE *pCR = reinterpret_cast<CHARRANGE *>(lParam);
+			pCR->cpMin = static_cast<LONG>(SelectionStart().Position());
+			pCR->cpMax = static_cast<LONG>(SelectionEnd().Position());
+		}
+		break;
+
+	case EM_SETSEL: {
+			Sci::Position nStart = wParam;
+			Sci::Position nEnd = lParam;
+			if (nStart == 0 && nEnd == -1) {
+				nEnd = pdoc->Length();
+			}
+			if (nStart == -1) {
+				nStart = nEnd;	// Remove selection
+			}
+			SetSelection(nEnd, nStart);
+			EnsureCaretVisible();
+		}
+		break;
+
+	case EM_EXSETSEL: {
+			if (lParam == 0) {
+				return 0;
+			}
+			const CHARRANGE *pCR = reinterpret_cast<const CHARRANGE *>(lParam);
+			sel.selType = Selection::SelTypes::stream;
+			if (pCR->cpMin == 0 && pCR->cpMax == -1) {
+				SetSelection(pCR->cpMin, pdoc->Length());
+			} else {
+				SetSelection(pCR->cpMin, pCR->cpMax);
+			}
+			EnsureCaretVisible();
+			return pdoc->LineFromPosition(SelectionStart().Position());
+		}
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::IdleMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+	case SC_WIN_IDLE:
+		// wParam=dwTickCountInitial, or 0 to initialize.  lParam=bSkipUserInputTest
+		if (idler.state) {
+			if (lParam || (WAIT_TIMEOUT == MsgWaitForMultipleObjects(0, nullptr, 0, 0, QS_INPUT | QS_HOTKEY))) {
+				if (Idle()) {
+					// User input was given priority above, but all events do get a turn.  Other
+					// messages, notifications, etc. will get interleaved with the idle messages.
+
+					// However, some things like WM_PAINT are a lower priority, and will not fire
+					// when there's a message posted.  So, several times a second, we stop and let
+					// the low priority events have a turn (after which the timer will fire again).
+
+					// Suppress a warning from Code Analysis that the GetTickCount function
+					// wraps after 49 days. The WM_TIMER will kick off another SC_WIN_IDLE
+					// after the wrap.
+#ifdef _MSC_VER
+#pragma warning(suppress: 28159)
+#endif
+					const DWORD dwCurrent = GetTickCount();
+					const DWORD dwStart = wParam ? static_cast<DWORD>(wParam) : dwCurrent;
+					constexpr DWORD maxWorkTime = 50;
+
+					if (dwCurrent >= dwStart && dwCurrent > maxWorkTime &&dwCurrent - maxWorkTime < dwStart)
+						PostMessage(MainHWND(), SC_WIN_IDLE, dwStart, 0);
+				} else {
+					SetIdle(false);
+				}
+			}
+		}
+		break;
+
+	case SC_WORK_IDLE:
+		IdleWork();
+		break;
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::SciMessage(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	switch (iMessage) {
+	case Message::GetDirectFunction:
+		return reinterpret_cast<sptr_t>(DirectFunction);
+
+	case Message::GetDirectStatusFunction:
+		return reinterpret_cast<sptr_t>(DirectStatusFunction);
+
+	case Message::GetDirectPointer:
+		return reinterpret_cast<sptr_t>(this);
+
+	case Message::GrabFocus:
+		::SetFocus(MainHWND());
+		break;
+
+#ifdef INCLUDE_DEPRECATED_FEATURES
+	case Message::SETKEYSUNICODE:
+		break;
+
+	case Message::GETKEYSUNICODE:
+		return true;
+#endif
+
+	case Message::SetTechnology:
+		if (const Technology technologyNew = static_cast<Technology>(wParam);
+			(technologyNew == Technology::Default) ||
+			(technologyNew == Technology::DirectWriteRetain) ||
+			(technologyNew == Technology::DirectWriteDC) ||
+			(technologyNew == Technology::DirectWrite)) {
+			if (technology != technologyNew) {
+				if (technologyNew > Technology::Default) {
+#if defined(USE_D2D)
+					if (!LoadD2D())
+						// Failed to load Direct2D or DirectWrite so no effect
+						return 0;
+#else
+					return 0;
+#endif
+				} else {
+					bidirectional = Bidirectional::Disabled;
+				}
+				DropRenderTarget();
+				technology = technologyNew;
+				view.bufferedDraw = technologyNew == Technology::Default;
+				// Invalidate all cached information including layout.
+				DropGraphics();
+				InvalidateStyleRedraw();
+			}
+		}
+		break;
+
+	case Message::SetBidirectional:
+		if (technology == Technology::Default) {
+			bidirectional = Bidirectional::Disabled;
+		} else if (static_cast<Bidirectional>(wParam) <= Bidirectional::R2L) {
+			bidirectional = static_cast<Bidirectional>(wParam);
+		}
+		// Invalidate all cached information including layout.
+		DropGraphics();
+		InvalidateStyleRedraw();
+		break;
+
+	case Message::TargetAsUTF8:
+		return TargetAsUTF8(CharPtrFromSPtr(lParam));
+
+	case Message::EncodedFromUTF8:
+		return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam),
+			CharPtrFromSPtr(lParam));
+	
+	default:
+		break;
+
+	}
+	return 0;
+}
+
+sptr_t ScintillaWin::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	try {
+		//Platform::DebugPrintf("S M:%x WP:%x L:%x\n", iMessage, wParam, lParam);
+		const unsigned int msg = static_cast<unsigned int>(iMessage);
+		switch (msg) {
+
+		case WM_CREATE:
+			ctrlID = ::GetDlgCtrlID(HwndFromWindow(wMain));
+			UpdateBaseElements();
+			// Get Intellimouse scroll line parameters
+			GetIntelliMouseParameters();
+			::RegisterDragDrop(MainHWND(), reinterpret_cast<IDropTarget *>(&dt));
+			break;
+
+		case WM_COMMAND:
+			Command(LOWORD(wParam));
+			break;
+
+		case WM_PAINT:
+			return WndPaint();
+
+		case WM_PRINTCLIENT: {
+				HDC hdc = reinterpret_cast<HDC>(wParam);
+				if (!IsCompatibleDC(hdc)) {
+					return ::DefWindowProc(MainHWND(), msg, wParam, lParam);
+				}
+				FullPaintDC(hdc);
+			}
+			break;
+
+		case WM_VSCROLL:
+			ScrollMessage(wParam);
+			break;
+
+		case WM_HSCROLL:
+			HorizontalScrollMessage(wParam);
+			break;
+
+		case WM_SIZE:
+			SizeWindow();
+			break;
+
+		case WM_TIMER:
+			if (wParam == idleTimerID && idler.state) {
+				SendMessage(MainHWND(), SC_WIN_IDLE, 0, 1);
+			} else {
+				TickFor(static_cast<TickReason>(wParam - fineTimerStart));
+			}
+			break;
+
+		case SC_WIN_IDLE:
+		case SC_WORK_IDLE:
+			return IdleMessage(msg, wParam, lParam);
+
+		case WM_GETMINMAXINFO:
+			return ::DefWindowProc(MainHWND(), msg, wParam, lParam);
+
+		case WM_LBUTTONDOWN:
+		case WM_LBUTTONUP:
+		case WM_RBUTTONDOWN:
+		case WM_MOUSEMOVE:
+		case WM_MOUSELEAVE:
+		case WM_MOUSEWHEEL:
+			return MouseMessage(msg, wParam, lParam);
+
+		case WM_SETCURSOR:
+			if (LOWORD(lParam) == HTCLIENT) {
+				POINT pt;
+				if (::GetCursorPos(&pt)) {
+					::ScreenToClient(MainHWND(), &pt);
+					DisplayCursor(ContextCursor(PointFromPOINT(pt)));
+				}
+				return TRUE;
+			} else {
+				return ::DefWindowProc(MainHWND(), msg, wParam, lParam);
+			}
+
+		case WM_SYSKEYDOWN:
+		case WM_KEYDOWN:
+		case WM_KEYUP:
+		case WM_CHAR:
+		case WM_UNICHAR:
+			return KeyMessage(msg, wParam, lParam);
+
+		case WM_SETTINGCHANGE:
+			//Platform::DebugPrintf("Setting Changed\n");
+			UpdateBaseElements();
+			InvalidateStyleData();
+			// Get Intellimouse scroll line parameters
+			GetIntelliMouseParameters();
+			break;
+
+		case WM_GETDLGCODE:
+			return DLGC_HASSETSEL | DLGC_WANTALLKEYS;
+
+		case WM_KILLFOCUS:
+		case WM_SETFOCUS:
+			return FocusMessage(msg, wParam, lParam);
+
+		case WM_SYSCOLORCHANGE:
+			//Platform::DebugPrintf("Setting Changed\n");
+			UpdateBaseElements();
+			InvalidateStyleData();
+			break;
+
+		case WM_DPICHANGED:
+			dpi = HIWORD(wParam);
+			InvalidateStyleRedraw();
+			break;
+
+		case WM_DPICHANGED_AFTERPARENT: {
+				const UINT dpiNow = DpiForWindow(wMain.GetID());
+				if (dpi != dpiNow) {
+					dpi = dpiNow;
+					InvalidateStyleRedraw();
+				}
+			}
+			break;
+
+		case WM_CONTEXTMENU:
+			return ShowContextMenu(msg, wParam, lParam);
+
+		case WM_ERASEBKGND:
+			return 1;   // Avoid any background erasure as whole window painted.
+
+		case WM_SETREDRAW:
+			::DefWindowProc(MainHWND(), msg, wParam, lParam);
+			if (wParam) {
+				SetScrollBars();
+				SetVerticalScrollPos();
+				SetHorizontalScrollPos();
+			}
+			return 0;
+
+		case WM_CAPTURECHANGED:
+			capturedMouse = false;
+			return 0;
+
+		// These are not handled in Scintilla and its faster to dispatch them here.
+		// Also moves time out to here so profile doesn't count lots of empty message calls.
+
+		case WM_MOVE:
+		case WM_MOUSEACTIVATE:
+		case WM_NCHITTEST:
+		case WM_NCCALCSIZE:
+		case WM_NCPAINT:
+		case WM_NCMOUSEMOVE:
+		case WM_NCLBUTTONDOWN:
+		case WM_SYSCOMMAND:
+		case WM_WINDOWPOSCHANGING:
+		case WM_WINDOWPOSCHANGED:
+			return ::DefWindowProc(MainHWND(), msg, wParam, lParam);
+
+		case WM_GETTEXTLENGTH:
+			return GetTextLength();
+
+		case WM_GETTEXT:
+			return GetText(wParam, lParam);
+
+		case WM_INPUTLANGCHANGE:
+		case WM_INPUTLANGCHANGEREQUEST:
+		case WM_IME_KEYDOWN:
+		case WM_IME_REQUEST:
+		case WM_IME_STARTCOMPOSITION:
+		case WM_IME_ENDCOMPOSITION:
+		case WM_IME_COMPOSITION:
+		case WM_IME_SETCONTEXT:
+		case WM_IME_NOTIFY:
+			return IMEMessage(msg, wParam, lParam);
+
+		case EM_LINEFROMCHAR:
+		case EM_EXLINEFROMCHAR:
+		case EM_GETSEL:
+		case EM_EXGETSEL:
+		case EM_SETSEL:
+		case EM_EXSETSEL:
+			return EditMessage(msg, wParam, lParam);
+		}
+
+		iMessage = SciMessageFromEM(msg);
+		switch (iMessage) {
+		case Message::GetDirectFunction:
+		case Message::GetDirectStatusFunction:
+		case Message::GetDirectPointer:
+		case Message::GrabFocus:
+		case Message::SetTechnology:
+		case Message::SetBidirectional:
+		case Message::TargetAsUTF8:
+		case Message::EncodedFromUTF8:
+			return SciMessage(iMessage, wParam, lParam);
+
+		default:
+			return ScintillaBase::WndProc(iMessage, wParam, lParam);
+		}
+	} catch (std::bad_alloc &) {
+		errorStatus = Status::BadAlloc;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return 0;
+}
+
+bool ScintillaWin::ValidCodePage(int codePage) const {
+	return codePage == 0 || codePage == CpUtf8 ||
+	       codePage == 932 || codePage == 936 || codePage == 949 ||
+	       codePage == 950 || codePage == 1361;
+}
+
+std::string ScintillaWin::UTF8FromEncoded(std::string_view encoded) const {
+	if (IsUnicodeMode()) {
+		return std::string(encoded);
+	} else {
+		// Pivot through wide string
+		std::wstring ws = StringDecode(encoded, CodePageOfDocument());
+		return StringEncode(ws, CpUtf8);
+	}
+}
+
+std::string ScintillaWin::EncodedFromUTF8(std::string_view utf8) const {
+	if (IsUnicodeMode()) {
+		return std::string(utf8);
+	} else {
+		// Pivot through wide string
+		std::wstring ws = StringDecode(utf8, CpUtf8);
+		return StringEncode(ws, CodePageOfDocument());
+	}
+}
+
+sptr_t ScintillaWin::DefWndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
+	return ::DefWindowProc(MainHWND(), static_cast<unsigned int>(iMessage), wParam, lParam);
+}
+
+bool ScintillaWin::FineTickerRunning(TickReason reason) {
+	return timers[static_cast<size_t>(reason)] != 0;
+}
+
+void ScintillaWin::FineTickerStart(TickReason reason, int millis, int tolerance) {
+	FineTickerCancel(reason);
+	const UINT_PTR reasonIndex = static_cast<UINT_PTR>(reason);
+	const UINT_PTR eventID = static_cast<UINT_PTR>(fineTimerStart) + reasonIndex;
+	if (SetCoalescableTimerFn && tolerance) {
+		timers[reasonIndex] = SetCoalescableTimerFn(MainHWND(), eventID, millis, nullptr, tolerance);
+	} else {
+		timers[reasonIndex] = ::SetTimer(MainHWND(), eventID, millis, nullptr);
+	}
+}
+
+void ScintillaWin::FineTickerCancel(TickReason reason) {
+	const UINT_PTR reasonIndex = static_cast<UINT_PTR>(reason);
+	if (timers[reasonIndex]) {
+		::KillTimer(MainHWND(), timers[reasonIndex]);
+		timers[reasonIndex] = 0;
+	}
+}
+
+
+bool ScintillaWin::SetIdle(bool on) {
+	// On Win32 the Idler is implemented as a Timer on the Scintilla window.  This
+	// takes advantage of the fact that WM_TIMER messages are very low priority,
+	// and are only posted when the message queue is empty, i.e. during idle time.
+	if (idler.state != on) {
+		if (on) {
+			idler.idlerID = ::SetTimer(MainHWND(), idleTimerID, 10, nullptr)
+				? reinterpret_cast<IdlerID>(idleTimerID) : 0;
+		} else {
+			::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(idler.idlerID));
+			idler.idlerID = 0;
+		}
+		idler.state = idler.idlerID != 0;
+	}
+	return idler.state;
+}
+
+void ScintillaWin::IdleWork() {
+	styleIdleInQueue = false;
+	Editor::IdleWork();
+}
+
+void ScintillaWin::QueueIdleWork(WorkItems items, Sci::Position upTo) {
+	Editor::QueueIdleWork(items, upTo);
+	if (!styleIdleInQueue) {
+		if (PostMessage(MainHWND(), SC_WORK_IDLE, 0, 0)) {
+			styleIdleInQueue = true;
+		}
+	}
+}
+
+void ScintillaWin::SetMouseCapture(bool on) {
+	if (mouseDownCaptures) {
+		if (on) {
+			::SetCapture(MainHWND());
+		} else {
+			::ReleaseCapture();
+		}
+	}
+	capturedMouse = on;
+}
+
+bool ScintillaWin::HaveMouseCapture() {
+	// Cannot just see if GetCapture is this window as the scroll bar also sets capture for the window
+	return capturedMouse;
+	//return capturedMouse && (::GetCapture() == MainHWND());
+}
+
+void ScintillaWin::SetTrackMouseLeaveEvent(bool on) noexcept {
+	if (on && !trackedMouseLeave) {
+		TRACKMOUSEEVENT tme {};
+		tme.cbSize = sizeof(tme);
+		tme.dwFlags = TME_LEAVE;
+		tme.hwndTrack = MainHWND();
+		tme.dwHoverTime = HOVER_DEFAULT;	// Unused but triggers Dr. Memory if not initialized
+		TrackMouseEvent(&tme);
+	}
+	trackedMouseLeave = on;
+}
+
+void ScintillaWin::UpdateBaseElements() {
+	struct ElementToIndex { Element element; int nIndex; };
+	ElementToIndex eti[] = {
+		{ Element::List, COLOR_WINDOWTEXT },
+		{ Element::ListBack, COLOR_WINDOW },
+		{ Element::ListSelected, COLOR_HIGHLIGHTTEXT },
+		{ Element::ListSelectedBack, COLOR_HIGHLIGHT },
+	};
+	bool changed = false;
+	for (const ElementToIndex &ei : eti) {
+		changed = vs.SetElementBase(ei.element, ColourRGBA::FromRGB(static_cast<int>(::GetSysColor(ei.nIndex)))) || changed;
+	}
+	if (changed) {
+		Redraw();
+	}
+}
+
+bool ScintillaWin::PaintContains(PRectangle rc) {
+	if (paintState == PaintState::painting) {
+		return BoundsContains(rcPaint, hRgnUpdate, rc);
+	}
+	return true;
+}
+
+void ScintillaWin::ScrollText(Sci::Line /* linesToMove */) {
+	//Platform::DebugPrintf("ScintillaWin::ScrollText %d\n", linesToMove);
+	//::ScrollWindow(MainHWND(), 0,
+	//	vs.lineHeight * linesToMove, 0, 0);
+	//::UpdateWindow(MainHWND());
+	Redraw();
+	UpdateSystemCaret();
+}
+
+void ScintillaWin::NotifyCaretMove() {
+	NotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, MainHWND(), OBJID_CARET, CHILDID_SELF);
+}
+
+void ScintillaWin::UpdateSystemCaret() {
+	if (hasFocus) {
+		if (pdoc->TentativeActive()) {
+			// ongoing inline mode IME composition, don't inform IME of system caret position.
+			// fix candidate window for Google Japanese IME moved on typing on Win7.
+			return;
+		}
+		if (HasCaretSizeChanged()) {
+			DestroySystemCaret();
+			CreateSystemCaret();
+		}
+		const Point pos = PointMainCaret();
+		::SetCaretPos(static_cast<int>(pos.x), static_cast<int>(pos.y));
+	}
+}
+
+bool ScintillaWin::IsVisible() const noexcept {
+	return GetWindowStyle(MainHWND()) & WS_VISIBLE;
+}
+
+int ScintillaWin::SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw) noexcept {
+	return ::SetScrollInfo(MainHWND(), nBar, lpsi, bRedraw);
+}
+
+bool ScintillaWin::GetScrollInfo(int nBar, LPSCROLLINFO lpsi) noexcept {
+	return ::GetScrollInfo(MainHWND(), nBar, lpsi) ? true : false;
+}
+
+// Change the scroll position but avoid repaint if changing to same value
+void ScintillaWin::ChangeScrollPos(int barType, Sci::Position pos) {
+	if (!IsVisible()) {
+		return;
+	}
+
+	SCROLLINFO sci = {
+		sizeof(sci), 0, 0, 0, 0, 0, 0
+	};
+	sci.fMask = SIF_POS;
+	GetScrollInfo(barType, &sci);
+	if (sci.nPos != pos) {
+		DwellEnd(true);
+		sci.nPos = static_cast<int>(pos);
+		SetScrollInfo(barType, &sci, TRUE);
+	}
+}
+
+void ScintillaWin::SetVerticalScrollPos() {
+	ChangeScrollPos(SB_VERT, topLine);
+}
+
+void ScintillaWin::SetHorizontalScrollPos() {
+	ChangeScrollPos(SB_HORZ, xOffset);
+}
+
+bool ScintillaWin::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
+	if (!IsVisible()) {
+		return false;
+	}
+
+	bool modified = false;
+	SCROLLINFO sci = {
+		sizeof(sci), 0, 0, 0, 0, 0, 0
+	};
+	sci.fMask = SIF_PAGE | SIF_RANGE;
+	GetScrollInfo(SB_VERT, &sci);
+	const Sci::Line vertEndPreferred = nMax;
+	if (!verticalScrollBarVisible)
+		nPage = vertEndPreferred + 1;
+	if ((sci.nMin != 0) ||
+		(sci.nMax != vertEndPreferred) ||
+	        (sci.nPage != static_cast<unsigned int>(nPage)) ||
+	        (sci.nPos != 0)) {
+		sci.fMask = SIF_PAGE | SIF_RANGE;
+		sci.nMin = 0;
+		sci.nMax = static_cast<int>(vertEndPreferred);
+		sci.nPage = static_cast<UINT>(nPage);
+		sci.nPos = 0;
+		sci.nTrackPos = 1;
+		SetScrollInfo(SB_VERT, &sci, TRUE);
+		modified = true;
+	}
+
+	const PRectangle rcText = GetTextRectangle();
+	int horizEndPreferred = scrollWidth;
+	if (horizEndPreferred < 0)
+		horizEndPreferred = 0;
+	int pageWidth = static_cast<int>(rcText.Width());
+	if (!horizontalScrollBarVisible || Wrapping())
+		pageWidth = horizEndPreferred + 1;
+	sci.fMask = SIF_PAGE | SIF_RANGE;
+	GetScrollInfo(SB_HORZ, &sci);
+	if ((sci.nMin != 0) ||
+		(sci.nMax != horizEndPreferred) ||
+		(sci.nPage != static_cast<unsigned int>(pageWidth)) ||
+	        (sci.nPos != 0)) {
+		sci.fMask = SIF_PAGE | SIF_RANGE;
+		sci.nMin = 0;
+		sci.nMax = horizEndPreferred;
+		sci.nPage = pageWidth;
+		sci.nPos = 0;
+		sci.nTrackPos = 1;
+		SetScrollInfo(SB_HORZ, &sci, TRUE);
+		modified = true;
+		if (scrollWidth < pageWidth) {
+			HorizontalScrollTo(0);
+		}
+	}
+	return modified;
+}
+
+void ScintillaWin::NotifyChange() {
+	::SendMessage(::GetParent(MainHWND()), WM_COMMAND,
+	        MAKEWPARAM(GetCtrlID(), FocusChange::Change),
+		reinterpret_cast<LPARAM>(MainHWND()));
+}
+
+void ScintillaWin::NotifyFocus(bool focus) {
+	if (commandEvents) {
+		::SendMessage(::GetParent(MainHWND()), WM_COMMAND,
+			MAKEWPARAM(GetCtrlID(), focus ? FocusChange::Setfocus : FocusChange::Killfocus),
+			reinterpret_cast<LPARAM>(MainHWND()));
+	}
+	Editor::NotifyFocus(focus);
+}
+
+void ScintillaWin::SetCtrlID(int identifier) {
+	::SetWindowID(HwndFromWindow(wMain), identifier);
+}
+
+int ScintillaWin::GetCtrlID() {
+	return ::GetDlgCtrlID(HwndFromWindow(wMain));
+}
+
+void ScintillaWin::NotifyParent(NotificationData scn) {
+	scn.nmhdr.hwndFrom = MainHWND();
+	scn.nmhdr.idFrom = GetCtrlID();
+	::SendMessage(::GetParent(MainHWND()), WM_NOTIFY,
+	              GetCtrlID(), reinterpret_cast<LPARAM>(&scn));
+}
+
+void ScintillaWin::NotifyDoubleClick(Point pt, KeyMod modifiers) {
+	//Platform::DebugPrintf("ScintillaWin Double click 0\n");
+	ScintillaBase::NotifyDoubleClick(pt, modifiers);
+	// Send myself a WM_LBUTTONDBLCLK, so the container can handle it too.
+	::SendMessage(MainHWND(),
+			  WM_LBUTTONDBLCLK,
+			  FlagSet(modifiers, KeyMod::Shift) ? MK_SHIFT : 0,
+			  MAKELPARAM(pt.x, pt.y));
+}
+
+class CaseFolderDBCS : public CaseFolderTable {
+	// Allocate the expandable storage here so that it does not need to be reallocated
+	// for each call to Fold.
+	std::vector<wchar_t> utf16Mixed;
+	std::vector<wchar_t> utf16Folded;
+	UINT cp;
+public:
+	explicit CaseFolderDBCS(UINT cp_) : cp(cp_) {
+		StandardASCII();
+	}
+	size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
+		if ((lenMixed == 1) && (sizeFolded > 0)) {
+			folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
+			return 1;
+		} else {
+			if (lenMixed > utf16Mixed.size()) {
+				utf16Mixed.resize(lenMixed + 8);
+			}
+			const size_t nUtf16Mixed = WideCharFromMultiByte(cp,
+				std::string_view(mixed, lenMixed),
+				&utf16Mixed[0],
+				utf16Mixed.size());
+
+			if (nUtf16Mixed == 0) {
+				// Failed to convert -> bad input
+				folded[0] = '\0';
+				return 1;
+			}
+
+			size_t lenFlat = 0;
+			for (size_t mixIndex=0; mixIndex < nUtf16Mixed; mixIndex++) {
+				if ((lenFlat + 20) > utf16Folded.size())
+					utf16Folded.resize(lenFlat + 60);
+				const char *foldedUTF8 = CaseConvert(utf16Mixed[mixIndex], CaseConversion::fold);
+				if (foldedUTF8) {
+					// Maximum length of a case conversion is 6 bytes, 3 characters
+					wchar_t wFolded[20];
+					const size_t charsConverted = UTF16FromUTF8(std::string_view(foldedUTF8),
+							wFolded, std::size(wFolded));
+					for (size_t j=0; j<charsConverted; j++)
+						utf16Folded[lenFlat++] = wFolded[j];
+				} else {
+					utf16Folded[lenFlat++] = utf16Mixed[mixIndex];
+				}
+			}
+
+			const std::wstring_view wsvFolded(&utf16Folded[0], lenFlat);
+			const size_t lenOut = MultiByteLenFromWideChar(cp, wsvFolded);
+
+			if (lenOut < sizeFolded) {
+				MultiByteFromWideChar(cp, wsvFolded, folded, lenOut);
+				return lenOut;
+			} else {
+				return 0;
+			}
+		}
+	}
+};
+
+std::unique_ptr<CaseFolder> ScintillaWin::CaseFolderForEncoding() {
+	const UINT cpDest = CodePageOfDocument();
+	if (cpDest == CpUtf8) {
+		return std::make_unique<CaseFolderUnicode>();
+	} else {
+		if (pdoc->dbcsCodePage == 0) {
+			std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>();
+			pcf->StandardASCII();
+			// Only for single byte encodings
+			for (int i=0x80; i<0x100; i++) {
+				char sCharacter[2] = "A";
+				sCharacter[0] = static_cast<char>(i);
+				wchar_t wCharacter[20];
+				const unsigned int lengthUTF16 = WideCharFromMultiByte(cpDest, sCharacter,
+					wCharacter, std::size(wCharacter));
+				if (lengthUTF16 == 1) {
+					const char *caseFolded = CaseConvert(wCharacter[0], CaseConversion::fold);
+					if (caseFolded) {
+						wchar_t wLower[20];
+						const size_t charsConverted = UTF16FromUTF8(std::string_view(caseFolded),
+							wLower, std::size(wLower));
+						if (charsConverted == 1) {
+							char sCharacterLowered[20];
+							const unsigned int lengthConverted = MultiByteFromWideChar(cpDest,
+								std::wstring_view(wLower, charsConverted),
+								sCharacterLowered, std::size(sCharacterLowered));
+							if ((lengthConverted == 1) && (sCharacter[0] != sCharacterLowered[0])) {
+								pcf->SetTranslation(sCharacter[0], sCharacterLowered[0]);
+							}
+						}
+					}
+				}
+			}
+			return pcf;
+		} else {
+			return std::make_unique<CaseFolderDBCS>(cpDest);
+		}
+	}
+}
+
+std::string ScintillaWin::CaseMapString(const std::string &s, CaseMapping caseMapping) {
+	if ((s.size() == 0) || (caseMapping == CaseMapping::same))
+		return s;
+
+	const UINT cpDoc = CodePageOfDocument();
+	if (cpDoc == CpUtf8) {
+		return CaseConvertString(s, (caseMapping == CaseMapping::upper) ? CaseConversion::upper : CaseConversion::lower);
+	}
+
+	// Change text to UTF-16
+	const std::wstring wsText = StringDecode(s, cpDoc);
+
+	const DWORD mapFlags = LCMAP_LINGUISTIC_CASING |
+		((caseMapping == CaseMapping::upper) ? LCMAP_UPPERCASE : LCMAP_LOWERCASE);
+
+	// Change case
+	const std::wstring wsConverted = StringMapCase(wsText, mapFlags);
+
+	// Change back to document encoding
+	std::string sConverted = StringEncode(wsConverted, cpDoc);
+
+	return sConverted;
+}
+
+void ScintillaWin::Copy() {
+	//Platform::DebugPrintf("Copy\n");
+	if (!sel.Empty()) {
+		SelectionText selectedText;
+		CopySelectionRange(&selectedText);
+		CopyToClipboard(selectedText);
+	}
+}
+
+bool ScintillaWin::CanPaste() {
+	if (!Editor::CanPaste())
+		return false;
+	return ::IsClipboardFormatAvailable(CF_UNICODETEXT) != FALSE;
+}
+
+namespace {
+
+class GlobalMemory {
+	HGLOBAL hand {};
+public:
+	void *ptr {};
+	GlobalMemory() noexcept {
+	}
+	explicit GlobalMemory(HGLOBAL hand_) noexcept : hand(hand_) {
+		if (hand) {
+			ptr = ::GlobalLock(hand);
+		}
+	}
+	// Deleted so GlobalMemory objects can not be copied.
+	GlobalMemory(const GlobalMemory &) = delete;
+	GlobalMemory(GlobalMemory &&) = delete;
+	GlobalMemory &operator=(const GlobalMemory &) = delete;
+	GlobalMemory &operator=(GlobalMemory &&) = delete;
+	~GlobalMemory() {
+		assert(!ptr);
+		assert(!hand);
+	}
+	void Allocate(size_t bytes) noexcept {
+		assert(!hand);
+		hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, bytes);
+		if (hand) {
+			ptr = ::GlobalLock(hand);
+		}
+	}
+	HGLOBAL Unlock() noexcept {
+		assert(ptr);
+		HGLOBAL handCopy = hand;
+		::GlobalUnlock(hand);
+		ptr = nullptr;
+		hand = {};
+		return handCopy;
+	}
+	void SetClip(UINT uFormat) noexcept {
+		::SetClipboardData(uFormat, Unlock());
+	}
+	operator bool() const noexcept {
+		return ptr != nullptr;
+	}
+	SIZE_T Size() const noexcept {
+		return ::GlobalSize(hand);
+	}
+};
+
+// OpenClipboard may fail if another application has opened the clipboard.
+// Try up to 8 times, with an initial delay of 1 ms and an exponential back off
+// for a maximum total delay of 127 ms (1+2+4+8+16+32+64).
+bool OpenClipboardRetry(HWND hwnd) noexcept {
+	for (int attempt=0; attempt<8; attempt++) {
+		if (attempt > 0) {
+			::Sleep(1 << (attempt-1));
+		}
+		if (::OpenClipboard(hwnd)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool IsValidFormatEtc(const FORMATETC *pFE) noexcept {
+	return pFE->ptd == nullptr &&
+		(pFE->dwAspect & DVASPECT_CONTENT) != 0 &&
+		pFE->lindex == -1 &&
+		(pFE->tymed & TYMED_HGLOBAL) != 0;
+}
+
+bool SupportedFormat(const FORMATETC *pFE) noexcept {
+	return pFE->cfFormat == CF_UNICODETEXT &&
+		IsValidFormatEtc(pFE);
+}
+
+}
+
+void ScintillaWin::Paste() {
+	if (!::OpenClipboardRetry(MainHWND())) {
+		return;
+	}
+	UndoGroup ug(pdoc);
+	const bool isLine = SelectionEmpty() &&
+		(::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag));
+	ClearSelection(multiPasteMode == MultiPaste::Each);
+	bool isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0);
+
+	if (!isRectangular) {
+		// Evaluate "Borland IDE Block Type" explicitly
+		GlobalMemory memBorlandSelection(::GetClipboardData(cfBorlandIDEBlockType));
+		if (memBorlandSelection) {
+			isRectangular = (memBorlandSelection.Size() == 1) && (static_cast<BYTE *>(memBorlandSelection.ptr)[0] == 0x02);
+			memBorlandSelection.Unlock();
+		}
+	}
+	const PasteShape pasteShape = isRectangular ? PasteShape::rectangular : (isLine ? PasteShape::line : PasteShape::stream);
+
+	// Use CF_UNICODETEXT if available
+	GlobalMemory memUSelection(::GetClipboardData(CF_UNICODETEXT));
+	if (const wchar_t *uptr = static_cast<const wchar_t *>(memUSelection.ptr)) {
+		const std::string putf = EncodeWString(uptr);
+		InsertPasteShape(putf.c_str(), putf.length(), pasteShape);
+		memUSelection.Unlock();
+	}
+	::CloseClipboard();
+	Redraw();
+}
+
+void ScintillaWin::CreateCallTipWindow(PRectangle) {
+	if (!ct.wCallTip.Created()) {
+		HWND wnd = ::CreateWindow(callClassName, TEXT("ACallTip"),
+					     WS_POPUP, 100, 100, 150, 20,
+					     MainHWND(), 0,
+					     GetWindowInstance(MainHWND()),
+					     this);
+		ct.wCallTip = wnd;
+		ct.wDraw = wnd;
+	}
+}
+
+void ScintillaWin::AddToPopUp(const char *label, int cmd, bool enabled) {
+	HMENU hmenuPopup = static_cast<HMENU>(popup.GetID());
+	if (!label[0])
+		::AppendMenuA(hmenuPopup, MF_SEPARATOR, 0, "");
+	else if (enabled)
+		::AppendMenuA(hmenuPopup, MF_STRING, cmd, label);
+	else
+		::AppendMenuA(hmenuPopup, MF_STRING | MF_DISABLED | MF_GRAYED, cmd, label);
+}
+
+void ScintillaWin::ClaimSelection() {
+	// Windows does not have a primary selection
+}
+
+/// Implement IUnknown
+
+STDMETHODIMP_(ULONG)FormatEnumerator_AddRef(FormatEnumerator *fe);
+STDMETHODIMP FormatEnumerator_QueryInterface(FormatEnumerator *fe, REFIID riid, PVOID *ppv) {
+	//Platform::DebugPrintf("EFE QI");
+	*ppv = nullptr;
+	if (riid == IID_IUnknown)
+		*ppv = reinterpret_cast<IEnumFORMATETC *>(fe);
+	if (riid == IID_IEnumFORMATETC)
+		*ppv = reinterpret_cast<IEnumFORMATETC *>(fe);
+	if (!*ppv)
+		return E_NOINTERFACE;
+	FormatEnumerator_AddRef(fe);
+	return S_OK;
+}
+STDMETHODIMP_(ULONG)FormatEnumerator_AddRef(FormatEnumerator *fe) {
+	return ++fe->ref;
+}
+STDMETHODIMP_(ULONG)FormatEnumerator_Release(FormatEnumerator *fe) {
+	fe->ref--;
+	if (fe->ref > 0)
+		return fe->ref;
+	delete fe;
+	return 0;
+}
+/// Implement IEnumFORMATETC
+STDMETHODIMP FormatEnumerator_Next(FormatEnumerator *fe, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) {
+	if (!rgelt) return E_POINTER;
+	ULONG putPos = 0;
+	while ((fe->pos < fe->formats.size()) && (putPos < celt)) {
+		rgelt->cfFormat = fe->formats[fe->pos];
+		rgelt->ptd = nullptr;
+		rgelt->dwAspect = DVASPECT_CONTENT;
+		rgelt->lindex = -1;
+		rgelt->tymed = TYMED_HGLOBAL;
+		rgelt++;
+		fe->pos++;
+		putPos++;
+	}
+	if (pceltFetched)
+		*pceltFetched = putPos;
+	return putPos ? S_OK : S_FALSE;
+}
+STDMETHODIMP FormatEnumerator_Skip(FormatEnumerator *fe, ULONG celt) {
+	fe->pos += celt;
+	return S_OK;
+}
+STDMETHODIMP FormatEnumerator_Reset(FormatEnumerator *fe) {
+	fe->pos = 0;
+	return S_OK;
+}
+STDMETHODIMP FormatEnumerator_Clone(FormatEnumerator *fe, IEnumFORMATETC **ppenum) {
+	FormatEnumerator *pfe;
+	try {
+		pfe = new FormatEnumerator(fe->pos, &fe->formats[0], fe->formats.size());
+	} catch (...) {
+		return E_OUTOFMEMORY;
+	}
+	return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC,
+	                                       reinterpret_cast<void **>(ppenum));
+}
+
+static VFunction *vtFormatEnumerator[] = {
+	(VFunction *)(FormatEnumerator_QueryInterface),
+	(VFunction *)(FormatEnumerator_AddRef),
+	(VFunction *)(FormatEnumerator_Release),
+	(VFunction *)(FormatEnumerator_Next),
+	(VFunction *)(FormatEnumerator_Skip),
+	(VFunction *)(FormatEnumerator_Reset),
+	(VFunction *)(FormatEnumerator_Clone)
+};
+
+FormatEnumerator::FormatEnumerator(ULONG pos_, const CLIPFORMAT formats_[], size_t formatsLen_) {
+	vtbl = vtFormatEnumerator;
+	ref = 0;   // First QI adds first reference...
+	pos = pos_;
+	formats.insert(formats.begin(), formats_, formats_+formatsLen_);
+}
+
+/// Implement IUnknown
+STDMETHODIMP DropSource_QueryInterface(DropSource *ds, REFIID riid, PVOID *ppv) {
+	return ds->sci->QueryInterface(riid, ppv);
+}
+STDMETHODIMP_(ULONG)DropSource_AddRef(DropSource *ds) {
+	return ds->sci->AddRef();
+}
+STDMETHODIMP_(ULONG)DropSource_Release(DropSource *ds) {
+	return ds->sci->Release();
+}
+
+/// Implement IDropSource
+STDMETHODIMP DropSource_QueryContinueDrag(DropSource *, BOOL fEsc, DWORD grfKeyState) {
+	if (fEsc)
+		return DRAGDROP_S_CANCEL;
+	if (!(grfKeyState & MK_LBUTTON))
+		return DRAGDROP_S_DROP;
+	return S_OK;
+}
+
+STDMETHODIMP DropSource_GiveFeedback(DropSource *, DWORD) {
+	return DRAGDROP_S_USEDEFAULTCURSORS;
+}
+
+static VFunction *vtDropSource[] = {
+	(VFunction *)(DropSource_QueryInterface),
+	(VFunction *)(DropSource_AddRef),
+	(VFunction *)(DropSource_Release),
+	(VFunction *)(DropSource_QueryContinueDrag),
+	(VFunction *)(DropSource_GiveFeedback)
+};
+
+DropSource::DropSource() noexcept {
+	vtbl = vtDropSource;
+	sci = nullptr;
+}
+
+/// Implement IUnkown
+STDMETHODIMP DataObject_QueryInterface(DataObject *pd, REFIID riid, PVOID *ppv) {
+	//Platform::DebugPrintf("DO QI %x\n", pd);
+	return pd->sci->QueryInterface(riid, ppv);
+}
+STDMETHODIMP_(ULONG)DataObject_AddRef(DataObject *pd) {
+	return pd->sci->AddRef();
+}
+STDMETHODIMP_(ULONG)DataObject_Release(DataObject *pd) {
+	return pd->sci->Release();
+}
+/// Implement IDataObject
+STDMETHODIMP DataObject_GetData(DataObject *pd, FORMATETC *pFEIn, STGMEDIUM *pSTM) {
+	return pd->sci->GetData(pFEIn, pSTM);
+}
+
+STDMETHODIMP DataObject_GetDataHere(DataObject *, FORMATETC *, STGMEDIUM *) {
+	//Platform::DebugPrintf("DOB GetDataHere\n");
+	return E_NOTIMPL;
+}
+
+STDMETHODIMP DataObject_QueryGetData(DataObject *pd, FORMATETC *pFE) {
+	if (pd->sci->DragIsRectangularOK(pFE->cfFormat) && IsValidFormatEtc(pFE)) {
+		return S_OK;
+	}
+
+	if (SupportedFormat(pFE)) {
+		return S_OK;
+	} else {
+		return S_FALSE;
+	}
+}
+
+STDMETHODIMP DataObject_GetCanonicalFormatEtc(DataObject *, FORMATETC *, FORMATETC *pFEOut) {
+	//Platform::DebugPrintf("DOB GetCanon\n");
+	pFEOut->cfFormat = CF_UNICODETEXT;
+	pFEOut->ptd = nullptr;
+	pFEOut->dwAspect = DVASPECT_CONTENT;
+	pFEOut->lindex = -1;
+	pFEOut->tymed = TYMED_HGLOBAL;
+	return S_OK;
+}
+
+STDMETHODIMP DataObject_SetData(DataObject *, FORMATETC *, STGMEDIUM *, BOOL) {
+	//Platform::DebugPrintf("DOB SetData\n");
+	return E_FAIL;
+}
+
+STDMETHODIMP DataObject_EnumFormatEtc(DataObject *pd, DWORD dwDirection, IEnumFORMATETC **ppEnum) {
+	try {
+		//Platform::DebugPrintf("DOB EnumFormatEtc %d\n", dwDirection);
+		if (dwDirection != DATADIR_GET) {
+			*ppEnum = nullptr;
+			return E_FAIL;
+		}
+
+		const CLIPFORMAT formats[] = {CF_UNICODETEXT};
+		FormatEnumerator *pfe = new FormatEnumerator(0, formats, std::size(formats));
+		return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC,
+											   reinterpret_cast<void **>(ppEnum));
+	} catch (std::bad_alloc &) {
+		pd->sci->errorStatus = Status::BadAlloc;
+		return E_OUTOFMEMORY;
+	} catch (...) {
+		pd->sci->errorStatus = Status::Failure;
+		return E_FAIL;
+	}
+}
+
+STDMETHODIMP DataObject_DAdvise(DataObject *, FORMATETC *, DWORD, IAdviseSink *, PDWORD) {
+	//Platform::DebugPrintf("DOB DAdvise\n");
+	return E_FAIL;
+}
+
+STDMETHODIMP DataObject_DUnadvise(DataObject *, DWORD) {
+	//Platform::DebugPrintf("DOB DUnadvise\n");
+	return E_FAIL;
+}
+
+STDMETHODIMP DataObject_EnumDAdvise(DataObject *, IEnumSTATDATA **) {
+	//Platform::DebugPrintf("DOB EnumDAdvise\n");
+	return E_FAIL;
+}
+
+static VFunction *vtDataObject[] = {
+	(VFunction *)(DataObject_QueryInterface),
+	(VFunction *)(DataObject_AddRef),
+	(VFunction *)(DataObject_Release),
+	(VFunction *)(DataObject_GetData),
+	(VFunction *)(DataObject_GetDataHere),
+	(VFunction *)(DataObject_QueryGetData),
+	(VFunction *)(DataObject_GetCanonicalFormatEtc),
+	(VFunction *)(DataObject_SetData),
+	(VFunction *)(DataObject_EnumFormatEtc),
+	(VFunction *)(DataObject_DAdvise),
+	(VFunction *)(DataObject_DUnadvise),
+	(VFunction *)(DataObject_EnumDAdvise)
+};
+
+DataObject::DataObject() noexcept {
+	vtbl = vtDataObject;
+	sci = nullptr;
+}
+
+/// Implement IUnknown
+STDMETHODIMP DropTarget_QueryInterface(DropTarget *dt, REFIID riid, PVOID *ppv) {
+	//Platform::DebugPrintf("DT QI %x\n", dt);
+	return dt->sci->QueryInterface(riid, ppv);
+}
+STDMETHODIMP_(ULONG)DropTarget_AddRef(DropTarget *dt) {
+	return dt->sci->AddRef();
+}
+STDMETHODIMP_(ULONG)DropTarget_Release(DropTarget *dt) {
+	return dt->sci->Release();
+}
+
+/// Implement IDropTarget by forwarding to Scintilla
+STDMETHODIMP DropTarget_DragEnter(DropTarget *dt, LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+                                  POINTL pt, PDWORD pdwEffect) {
+	try {
+		return dt->sci->DragEnter(pIDataSource, grfKeyState, pt, pdwEffect);
+	} catch (...) {
+		dt->sci->errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+STDMETHODIMP DropTarget_DragOver(DropTarget *dt, DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
+	try {
+		return dt->sci->DragOver(grfKeyState, pt, pdwEffect);
+	} catch (...) {
+		dt->sci->errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+STDMETHODIMP DropTarget_DragLeave(DropTarget *dt) {
+	try {
+		return dt->sci->DragLeave();
+	} catch (...) {
+		dt->sci->errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+STDMETHODIMP DropTarget_Drop(DropTarget *dt, LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+                             POINTL pt, PDWORD pdwEffect) {
+	try {
+		return dt->sci->Drop(pIDataSource, grfKeyState, pt, pdwEffect);
+	} catch (...) {
+		dt->sci->errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+
+static VFunction *vtDropTarget[] = {
+	(VFunction *)(DropTarget_QueryInterface),
+	(VFunction *)(DropTarget_AddRef),
+	(VFunction *)(DropTarget_Release),
+	(VFunction *)(DropTarget_DragEnter),
+	(VFunction *)(DropTarget_DragOver),
+	(VFunction *)(DropTarget_DragLeave),
+	(VFunction *)(DropTarget_Drop)
+};
+
+DropTarget::DropTarget() noexcept {
+	vtbl = vtDropTarget;
+	sci = nullptr;
+}
+
+/**
+ * DBCS: support Input Method Editor (IME).
+ * Called when IME Window opened.
+ */
+void ScintillaWin::ImeStartComposition() {
+	if (caret.active) {
+		// Move IME Window to current caret position
+		IMContext imc(MainHWND());
+		const Point pos = PointMainCaret();
+		COMPOSITIONFORM CompForm;
+		CompForm.dwStyle = CFS_POINT;
+		CompForm.ptCurrentPos = POINTFromPoint(pos);
+
+		::ImmSetCompositionWindow(imc.hIMC, &CompForm);
+
+		// Set font of IME window to same as surrounded text.
+		if (stylesValid) {
+			// Since the style creation code has been made platform independent,
+			// The logfont for the IME is recreated here.
+			const int styleHere = pdoc->StyleIndexAt(sel.MainCaret());
+			LOGFONTW lf = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, L""};
+			int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel * FontSizeMultiplier;
+			if (sizeZoomed <= 2 * FontSizeMultiplier)	// Hangs if sizeZoomed <= 1
+				sizeZoomed = 2 * FontSizeMultiplier;
+			// The negative is to allow for leading
+			lf.lfHeight = -::MulDiv(sizeZoomed, dpi, 72*FontSizeMultiplier);
+			lf.lfWeight = static_cast<LONG>(vs.styles[styleHere].weight);
+			lf.lfItalic = vs.styles[styleHere].italic ? 1 : 0;
+			lf.lfCharSet = DEFAULT_CHARSET;
+			lf.lfFaceName[0] = L'\0';
+			if (vs.styles[styleHere].fontName) {
+				const char* fontName = vs.styles[styleHere].fontName;
+				UTF16FromUTF8(std::string_view(fontName), lf.lfFaceName, LF_FACESIZE);
+			}
+
+			::ImmSetCompositionFontW(imc.hIMC, &lf);
+		}
+		// Caret is displayed in IME window. So, caret in Scintilla is useless.
+		DropCaret();
+	}
+}
+
+/** Called when IME Window closed. */
+void ScintillaWin::ImeEndComposition() {
+	// clear IME composition state.
+	view.imeCaretBlockOverride = false;
+	pdoc->TentativeUndo();
+	ShowCaretAtCurrentPosition();
+}
+
+LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) {
+	// Reconversion on windows limits within one line without eol.
+	// Look around:   baseStart  <--  (|mainStart|  -- mainEnd)  --> baseEnd.
+	const Sci::Position mainStart = sel.RangeMain().Start().Position();
+	const Sci::Position mainEnd = sel.RangeMain().End().Position();
+	const Sci::Line curLine = pdoc->SciLineFromPosition(mainStart);
+	if (curLine != pdoc->LineFromPosition(mainEnd))
+		return 0;
+	const Sci::Position baseStart = pdoc->LineStart(curLine);
+	const Sci::Position baseEnd = pdoc->LineEnd(curLine);
+	if ((baseStart == baseEnd) || (mainEnd > baseEnd))
+		return 0;
+
+	const int codePage = CodePageOfDocument();
+	const std::wstring rcFeed = StringDecode(RangeText(baseStart, baseEnd), codePage);
+	const int rcFeedLen = static_cast<int>(rcFeed.length()) * sizeof(wchar_t);
+	const int rcSize = sizeof(RECONVERTSTRING) + rcFeedLen + sizeof(wchar_t);
+
+	RECONVERTSTRING *rc = static_cast<RECONVERTSTRING *>(PtrFromSPtr(lParam));
+	if (!rc)
+		return rcSize; // Immediately be back with rcSize of memory block.
+
+	wchar_t *rcFeedStart = reinterpret_cast<wchar_t*>(rc + 1);
+	memcpy(rcFeedStart, &rcFeed[0], rcFeedLen);
+
+	std::string rcCompString = RangeText(mainStart, mainEnd);
+	std::wstring rcCompWstring = StringDecode(rcCompString, codePage);
+	std::string rcCompStart = RangeText(baseStart, mainStart);
+	std::wstring rcCompWstart = StringDecode(rcCompStart, codePage);
+
+	// Map selection to dwCompStr.
+	// No selection assumes current caret as rcCompString without length.
+	rc->dwVersion = 0; // It should be absolutely 0.
+	rc->dwStrLen = static_cast<DWORD>(rcFeed.length());
+	rc->dwStrOffset = sizeof(RECONVERTSTRING);
+	rc->dwCompStrLen = static_cast<DWORD>(rcCompWstring.length());
+	rc->dwCompStrOffset = static_cast<DWORD>(rcCompWstart.length()) * sizeof(wchar_t);
+	rc->dwTargetStrLen = rc->dwCompStrLen;
+	rc->dwTargetStrOffset =rc->dwCompStrOffset;
+
+	IMContext imc(MainHWND());
+	if (!imc.hIMC)
+		return 0;
+
+	if (!::ImmSetCompositionStringW(imc.hIMC, SCS_QUERYRECONVERTSTRING, rc, rcSize, nullptr, 0))
+		return 0;
+
+	// No selection asks IME to fill target fields with its own value.
+	const int tgWlen = rc->dwTargetStrLen;
+	const int tgWstart = rc->dwTargetStrOffset / sizeof(wchar_t);
+
+	std::string tgCompStart = StringEncode(rcFeed.substr(0, tgWstart), codePage);
+	std::string tgComp = StringEncode(rcFeed.substr(tgWstart, tgWlen), codePage);
+
+	// No selection needs to adjust reconvert start position for IME set.
+	const int adjust = static_cast<int>(tgCompStart.length() - rcCompStart.length());
+	const int docCompLen = static_cast<int>(tgComp.length());
+
+	// Make place for next composition string to sit in.
+	for (size_t r=0; r<sel.Count(); r++) {
+		const Sci::Position rBase = sel.Range(r).Start().Position();
+		const Sci::Position docCompStart = rBase + adjust;
+
+		if (inOverstrike) { // the docCompLen of bytes will be overstriked.
+			sel.Range(r).caret.SetPosition(docCompStart);
+			sel.Range(r).anchor.SetPosition(docCompStart);
+		} else {
+			// Ensure docCompStart+docCompLen be not beyond lineEnd.
+			// since docCompLen by byte might break eol.
+			const Sci::Position lineEnd = pdoc->LineEnd(pdoc->LineFromPosition(rBase));
+			const Sci::Position overflow = (docCompStart + docCompLen) - lineEnd;
+			if (overflow > 0) {
+				pdoc->DeleteChars(docCompStart, docCompLen - overflow);
+			} else {
+				pdoc->DeleteChars(docCompStart, docCompLen);
+			}
+		}
+	}
+	// Immediately Target Input or candidate box choice with GCS_COMPSTR.
+	return rcSize;
+}
+
+void ScintillaWin::GetIntelliMouseParameters() noexcept {
+	// This retrieves the number of lines per scroll as configured in the Mouse Properties sheet in Control Panel
+	::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &linesPerScroll, 0);
+}
+
+void ScintillaWin::CopyToGlobal(GlobalMemory &gmUnicode, const SelectionText &selectedText) {
+	const std::string_view svSelected(selectedText.Data(), selectedText.LengthWithTerminator());
+	if (IsUnicodeMode()) {
+		const size_t uchars = UTF16Length(svSelected);
+		gmUnicode.Allocate(2 * uchars);
+		if (gmUnicode) {
+			UTF16FromUTF8(svSelected,
+				static_cast<wchar_t *>(gmUnicode.ptr), uchars);
+		}
+	} else {
+		// Not Unicode mode
+		// Convert to Unicode using the current Scintilla code page
+		const UINT cpSrc = CodePageFromCharSet(
+			selectedText.characterSet, selectedText.codePage);
+		const size_t uLen = WideCharLenFromMultiByte(cpSrc, svSelected);
+		gmUnicode.Allocate(2 * uLen);
+		if (gmUnicode) {
+			WideCharFromMultiByte(cpSrc, svSelected,
+				static_cast<wchar_t *>(gmUnicode.ptr), uLen);
+		}
+	}
+}
+
+void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) {
+	if (!::OpenClipboardRetry(MainHWND())) {
+		return;
+	}
+	::EmptyClipboard();
+
+	GlobalMemory uniText;
+	CopyToGlobal(uniText, selectedText);
+	if (uniText) {
+		uniText.SetClip(CF_UNICODETEXT);
+	}
+
+	if (selectedText.rectangular) {
+		::SetClipboardData(cfColumnSelect, 0);
+
+		GlobalMemory borlandSelection;
+		borlandSelection.Allocate(1);
+		if (borlandSelection) {
+			static_cast<BYTE *>(borlandSelection.ptr)[0] = 0x02;
+			borlandSelection.SetClip(cfBorlandIDEBlockType);
+		}
+	}
+
+	if (selectedText.lineCopy) {
+		::SetClipboardData(cfLineSelect, 0);
+		::SetClipboardData(cfVSLineTag, 0);
+	}
+
+	::CloseClipboard();
+}
+
+void ScintillaWin::ScrollMessage(WPARAM wParam) {
+	//DWORD dwStart = timeGetTime();
+	//Platform::DebugPrintf("Scroll %x %d\n", wParam, lParam);
+
+	SCROLLINFO sci = {};
+	sci.cbSize = sizeof(sci);
+	sci.fMask = SIF_ALL;
+
+	GetScrollInfo(SB_VERT, &sci);
+
+	//Platform::DebugPrintf("ScrollInfo %d mask=%x min=%d max=%d page=%d pos=%d track=%d\n", b,sci.fMask,
+	//sci.nMin, sci.nMax, sci.nPage, sci.nPos, sci.nTrackPos);
+	Sci::Line topLineNew = topLine;
+	switch (LOWORD(wParam)) {
+	case SB_LINEUP:
+		topLineNew -= 1;
+		break;
+	case SB_LINEDOWN:
+		topLineNew += 1;
+		break;
+	case SB_PAGEUP:
+		topLineNew -= LinesToScroll(); break;
+	case SB_PAGEDOWN: topLineNew += LinesToScroll(); break;
+	case SB_TOP: topLineNew = 0; break;
+	case SB_BOTTOM: topLineNew = MaxScrollPos(); break;
+	case SB_THUMBPOSITION: topLineNew = sci.nTrackPos; break;
+	case SB_THUMBTRACK: topLineNew = sci.nTrackPos; break;
+	}
+	ScrollTo(topLineNew);
+}
+
+void ScintillaWin::HorizontalScrollMessage(WPARAM wParam) {
+	int xPos = xOffset;
+	const PRectangle rcText = GetTextRectangle();
+	const int pageWidth = static_cast<int>(rcText.Width() * 2 / 3);
+	switch (LOWORD(wParam)) {
+	case SB_LINEUP:
+		xPos -= 20;
+		break;
+	case SB_LINEDOWN:	// May move past the logical end
+		xPos += 20;
+		break;
+	case SB_PAGEUP:
+		xPos -= pageWidth;
+		break;
+	case SB_PAGEDOWN:
+		xPos += pageWidth;
+		if (xPos > scrollWidth - rcText.Width()) {	// Hit the end exactly
+			xPos = scrollWidth - static_cast<int>(rcText.Width());
+		}
+		break;
+	case SB_TOP:
+		xPos = 0;
+		break;
+	case SB_BOTTOM:
+		xPos = scrollWidth;
+		break;
+	case SB_THUMBPOSITION:
+	case SB_THUMBTRACK: {
+			// Do NOT use wParam, its 16 bit and not enough for very long lines. Its still possible to overflow the 32 bit but you have to try harder =]
+			SCROLLINFO si {};
+			si.cbSize = sizeof(si);
+			si.fMask = SIF_TRACKPOS;
+			if (GetScrollInfo(SB_HORZ, &si)) {
+				xPos = si.nTrackPos;
+			}
+		}
+		break;
+	}
+	HorizontalScrollTo(xPos);
+}
+
+/**
+ * Redraw all of text area.
+ * This paint will not be abandoned.
+ */
+void ScintillaWin::FullPaint() {
+	if ((technology == Technology::Default) || (technology == Technology::DirectWriteDC)) {
+		HDC hdc = ::GetDC(MainHWND());
+		FullPaintDC(hdc);
+		::ReleaseDC(MainHWND(), hdc);
+	} else {
+		FullPaintDC({});
+	}
+}
+
+/**
+ * Redraw all of text area on the specified DC.
+ * This paint will not be abandoned.
+ */
+void ScintillaWin::FullPaintDC(HDC hdc) {
+	paintState = PaintState::painting;
+	rcPaint = GetClientRectangle();
+	paintingAllText = true;
+	PaintDC(hdc);
+	paintState = PaintState::notPainting;
+}
+
+namespace {
+
+bool CompareDevCap(HDC hdc, HDC hOtherDC, int nIndex) noexcept {
+	return ::GetDeviceCaps(hdc, nIndex) == ::GetDeviceCaps(hOtherDC, nIndex);
+}
+
+}
+
+bool ScintillaWin::IsCompatibleDC(HDC hOtherDC) noexcept {
+	HDC hdc = ::GetDC(MainHWND());
+	const bool isCompatible =
+		CompareDevCap(hdc, hOtherDC, TECHNOLOGY) &&
+		CompareDevCap(hdc, hOtherDC, LOGPIXELSY) &&
+		CompareDevCap(hdc, hOtherDC, LOGPIXELSX) &&
+		CompareDevCap(hdc, hOtherDC, BITSPIXEL) &&
+		CompareDevCap(hdc, hOtherDC, PLANES);
+	::ReleaseDC(MainHWND(), hdc);
+	return isCompatible;
+}
+
+DWORD ScintillaWin::EffectFromState(DWORD grfKeyState) const noexcept {
+	// These are the Wordpad semantics.
+	DWORD dwEffect;
+	if (inDragDrop == DragDrop::dragging)	// Internal defaults to move
+		dwEffect = DROPEFFECT_MOVE;
+	else
+		dwEffect = DROPEFFECT_COPY;
+	if (grfKeyState & MK_ALT)
+		dwEffect = DROPEFFECT_MOVE;
+	if (grfKeyState & MK_CONTROL)
+		dwEffect = DROPEFFECT_COPY;
+	return dwEffect;
+}
+
+/// Implement IUnknown
+STDMETHODIMP ScintillaWin::QueryInterface(REFIID riid, PVOID *ppv) {
+	*ppv = nullptr;
+	if (riid == IID_IUnknown)
+		*ppv = reinterpret_cast<IDropTarget *>(&dt);
+	if (riid == IID_IDropSource)
+		*ppv = reinterpret_cast<IDropSource *>(&ds);
+	if (riid == IID_IDropTarget)
+		*ppv = reinterpret_cast<IDropTarget *>(&dt);
+	if (riid == IID_IDataObject)
+		*ppv = reinterpret_cast<IDataObject *>(&dob);
+	if (!*ppv)
+		return E_NOINTERFACE;
+	return S_OK;
+}
+
+STDMETHODIMP_(ULONG) ScintillaWin::AddRef() {
+	return 1;
+}
+
+STDMETHODIMP_(ULONG) ScintillaWin::Release() {
+	return 1;
+}
+
+/// Implement IDropTarget
+STDMETHODIMP ScintillaWin::DragEnter(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+                                     POINTL, PDWORD pdwEffect) {
+	if (!pIDataSource )
+		return E_POINTER;
+	FORMATETC fmtu = {CF_UNICODETEXT, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+	const HRESULT hrHasUText = pIDataSource->QueryGetData(&fmtu);
+	hasOKText = (hrHasUText == S_OK);
+	if (hasOKText) {
+		*pdwEffect = EffectFromState(grfKeyState);
+	} else {
+		*pdwEffect = DROPEFFECT_NONE;
+	}
+
+	return S_OK;
+}
+
+STDMETHODIMP ScintillaWin::DragOver(DWORD grfKeyState, POINTL pt, PDWORD pdwEffect) {
+	try {
+		if (!hasOKText || pdoc->IsReadOnly()) {
+			*pdwEffect = DROPEFFECT_NONE;
+			return S_OK;
+		}
+
+		*pdwEffect = EffectFromState(grfKeyState);
+
+		// Update the cursor.
+		POINT rpt = {pt.x, pt.y};
+		::ScreenToClient(MainHWND(), &rpt);
+		SetDragPosition(SPositionFromLocation(PointFromPOINT(rpt), false, false, UserVirtualSpace()));
+
+		return S_OK;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+
+STDMETHODIMP ScintillaWin::DragLeave() {
+	try {
+		SetDragPosition(SelectionPosition(Sci::invalidPosition));
+		return S_OK;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+
+STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
+                                POINTL pt, PDWORD pdwEffect) {
+	try {
+		*pdwEffect = EffectFromState(grfKeyState);
+
+		if (!pIDataSource)
+			return E_POINTER;
+
+		SetDragPosition(SelectionPosition(Sci::invalidPosition));
+
+		std::string putf;
+		FORMATETC fmtu = {CF_UNICODETEXT, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+		STGMEDIUM medium{};
+		const HRESULT hr = pIDataSource->GetData(&fmtu, &medium);
+		if (!SUCCEEDED(hr)) {
+			return hr;
+		}
+		if (medium.hGlobal) {
+			GlobalMemory memUDrop(medium.hGlobal);
+			if (const wchar_t *uptr = static_cast<const wchar_t *>(memUDrop.ptr)) {
+				putf = EncodeWString(uptr);
+			}
+			memUDrop.Unlock();
+		}
+
+		if (putf.empty()) {
+			return S_OK;
+		}
+
+		FORMATETC fmtr = {cfColumnSelect, nullptr, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
+		const bool isRectangular = S_OK == pIDataSource->QueryGetData(&fmtr);
+
+		POINT rpt = {pt.x, pt.y};
+		::ScreenToClient(MainHWND(), &rpt);
+		const SelectionPosition movePos = SPositionFromLocation(PointFromPOINT(rpt), false, false, UserVirtualSpace());
+
+		DropAt(movePos, putf.c_str(), putf.size(), *pdwEffect == DROPEFFECT_MOVE, isRectangular);
+
+		// Free data
+		::ReleaseStgMedium(&medium);
+
+		return S_OK;
+	} catch (...) {
+		errorStatus = Status::Failure;
+	}
+	return E_FAIL;
+}
+
+/// Implement important part of IDataObject
+STDMETHODIMP ScintillaWin::GetData(FORMATETC *pFEIn, STGMEDIUM *pSTM) {
+	if (!SupportedFormat(pFEIn)) {
+		//Platform::DebugPrintf("DOB GetData No %d %x %x fmt=%x\n", lenDrag, pFEIn, pSTM, pFEIn->cfFormat);
+		return DATA_E_FORMATETC;
+	}
+
+	pSTM->tymed = TYMED_HGLOBAL;
+	//Platform::DebugPrintf("DOB GetData OK %d %x %x\n", lenDrag, pFEIn, pSTM);
+
+	GlobalMemory uniText;
+	CopyToGlobal(uniText, drag);
+	pSTM->hGlobal = uniText ? uniText.Unlock() : 0;
+	pSTM->pUnkForRelease = nullptr;
+	return S_OK;
+}
+
+void ScintillaWin::Prepare() noexcept {
+	Platform_Initialise(hInstance);
+
+	// Register the CallTip class
+	WNDCLASSEX wndclassc{};
+	wndclassc.cbSize = sizeof(wndclassc);
+	wndclassc.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
+	wndclassc.cbWndExtra = sizeof(ScintillaWin *);
+	wndclassc.hInstance = hInstance;
+	wndclassc.lpfnWndProc = ScintillaWin::CTWndProc;
+	wndclassc.hCursor = ::LoadCursor(NULL, IDC_ARROW);
+	wndclassc.lpszClassName = callClassName;
+
+	callClassAtom = ::RegisterClassEx(&wndclassc);
+}
+
+bool ScintillaWin::Register(HINSTANCE hInstance_) noexcept {
+
+	hInstance = hInstance_;
+
+	// Register the Scintilla class
+	// Register Scintilla as a wide character window
+	WNDCLASSEXW wndclass {};
+	wndclass.cbSize = sizeof(wndclass);
+	wndclass.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
+	wndclass.lpfnWndProc = ScintillaWin::SWndProc;
+	wndclass.cbWndExtra = sizeof(ScintillaWin *);
+	wndclass.hInstance = hInstance;
+	wndclass.lpszClassName = L"Scintilla";
+	scintillaClassAtom = ::RegisterClassExW(&wndclass);
+	const bool result = 0 != scintillaClassAtom;
+
+	return result;
+}
+
+bool ScintillaWin::Unregister() noexcept {
+	bool result = true;
+	if (0 != scintillaClassAtom) {
+		if (::UnregisterClass(MAKEINTATOM(scintillaClassAtom), hInstance) == 0) {
+			result = false;
+		}
+		scintillaClassAtom = 0;
+	}
+	if (0 != callClassAtom) {
+		if (::UnregisterClass(MAKEINTATOM(callClassAtom), hInstance) == 0) {
+			result = false;
+		}
+		callClassAtom = 0;
+	}
+	return result;
+}
+
+bool ScintillaWin::HasCaretSizeChanged() const noexcept {
+	if (
+		( (0 != vs.caret.width) && (sysCaretWidth != vs.caret.width) )
+		|| ((0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight))
+		) {
+		return true;
+	}
+	return false;
+}
+
+BOOL ScintillaWin::CreateSystemCaret() {
+	sysCaretWidth = vs.caret.width;
+	if (0 == sysCaretWidth) {
+		sysCaretWidth = 1;
+	}
+	sysCaretHeight = vs.lineHeight;
+	const int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) *
+		sysCaretHeight;
+	std::vector<BYTE> bits(bitmapSize);
+	sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1,
+		1, &bits[0]);
+	const BOOL retval = ::CreateCaret(
+		MainHWND(), sysCaretBitmap,
+		sysCaretWidth, sysCaretHeight);
+	if (technology == Technology::Default) {
+		// System caret interferes with Direct2D drawing so only show it for GDI.
+		::ShowCaret(MainHWND());
+	}
+	return retval;
+}
+
+BOOL ScintillaWin::DestroySystemCaret() noexcept {
+	::HideCaret(MainHWND());
+	const BOOL retval = ::DestroyCaret();
+	if (sysCaretBitmap) {
+		::DeleteObject(sysCaretBitmap);
+		sysCaretBitmap = {};
+	}
+	return retval;
+}
+
+LRESULT PASCAL ScintillaWin::CTWndProc(
+	HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	// Find C++ object associated with window.
+	ScintillaWin *sciThis = static_cast<ScintillaWin *>(PointerFromWindow(hWnd));
+	try {
+		// ctp will be zero if WM_CREATE not seen yet
+		if (sciThis == nullptr) {
+			if (iMessage == WM_CREATE) {
+				// Associate CallTip object with window
+				CREATESTRUCT *pCreate = static_cast<CREATESTRUCT *>(PtrFromSPtr(lParam));
+				SetWindowPointer(hWnd, pCreate->lpCreateParams);
+				return 0;
+			} else {
+				return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+			}
+		} else {
+			if (iMessage == WM_NCDESTROY) {
+				SetWindowPointer(hWnd, nullptr);
+				return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+			} else if (iMessage == WM_PAINT) {
+				PAINTSTRUCT ps;
+				::BeginPaint(hWnd, &ps);
+				std::unique_ptr<Surface> surfaceWindow(Surface::Allocate(sciThis->technology));
+#if defined(USE_D2D)
+				ID2D1HwndRenderTarget *pCTRenderTarget = nullptr;
+#endif
+				RECT rc;
+				GetClientRect(hWnd, &rc);
+				// Create a Direct2D render target.
+				if (sciThis->technology == Technology::Default) {
+					surfaceWindow->Init(ps.hdc, hWnd);
+				} else {
+#if defined(USE_D2D)
+					D2D1_HWND_RENDER_TARGET_PROPERTIES dhrtp {};
+					dhrtp.hwnd = hWnd;
+					dhrtp.pixelSize = D2D1::SizeU(rc.right - rc.left, rc.bottom - rc.top);
+					dhrtp.presentOptions = (sciThis->technology == Technology::DirectWriteRetain) ?
+						D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS : D2D1_PRESENT_OPTIONS_NONE;
+
+					D2D1_RENDER_TARGET_PROPERTIES drtp {};
+					drtp.type = D2D1_RENDER_TARGET_TYPE_DEFAULT;
+					drtp.pixelFormat.format = DXGI_FORMAT_UNKNOWN;
+					drtp.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN;
+					drtp.dpiX = 96.0;
+					drtp.dpiY = 96.0;
+					drtp.usage = D2D1_RENDER_TARGET_USAGE_NONE;
+					drtp.minLevel = D2D1_FEATURE_LEVEL_DEFAULT;
+
+					if (!SUCCEEDED(pD2DFactory->CreateHwndRenderTarget(drtp, dhrtp, &pCTRenderTarget))) {
+						surfaceWindow->Release();
+						::EndPaint(hWnd, &ps);
+						return 0;
+					}
+					// If above SUCCEEDED, then pCTRenderTarget not nullptr
+					assert(pCTRenderTarget);
+					if (pCTRenderTarget) {
+						surfaceWindow->Init(pCTRenderTarget, hWnd);
+						pCTRenderTarget->BeginDraw();
+					}
+#endif
+				}
+				surfaceWindow->SetMode(SurfaceMode(sciThis->ct.codePage, sciThis->BidirectionalR2L()));
+				sciThis->ct.PaintCT(surfaceWindow.get());
+#if defined(USE_D2D)
+				if (pCTRenderTarget)
+					pCTRenderTarget->EndDraw();
+#endif
+				surfaceWindow->Release();
+#if defined(USE_D2D)
+				ReleaseUnknown(pCTRenderTarget);
+#endif
+				::EndPaint(hWnd, &ps);
+				return 0;
+			} else if ((iMessage == WM_NCLBUTTONDOWN) || (iMessage == WM_NCLBUTTONDBLCLK)) {
+				POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+				ScreenToClient(hWnd, &pt);
+				sciThis->ct.MouseClick(PointFromPOINT(pt));
+				sciThis->CallTipClick();
+				return 0;
+			} else if (iMessage == WM_LBUTTONDOWN) {
+				// This does not fire due to the hit test code
+				sciThis->ct.MouseClick(PointFromLParam(lParam));
+				sciThis->CallTipClick();
+				return 0;
+			} else if (iMessage == WM_SETCURSOR) {
+				::SetCursor(::LoadCursor(NULL, IDC_ARROW));
+				return 0;
+			} else if (iMessage == WM_NCHITTEST) {
+				return HTCAPTION;
+			} else {
+				return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+			}
+		}
+	} catch (...) {
+		sciThis->errorStatus = Status::Failure;
+	}
+	return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+}
+
+sptr_t ScintillaWin::DirectFunction(
+    sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam) {
+	ScintillaWin *sci = reinterpret_cast<ScintillaWin *>(ptr);
+	PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), nullptr));
+	return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+sptr_t ScintillaWin::DirectStatusFunction(
+    sptr_t ptr, UINT iMessage, uptr_t wParam, sptr_t lParam, int *pStatus) {
+	ScintillaWin *sci = reinterpret_cast<ScintillaWin *>(ptr);
+	PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), nullptr));
+	const sptr_t returnValue = sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+	*pStatus = static_cast<int>(sci->errorStatus);
+	return returnValue;
+}
+
+namespace Scintilla::Internal {
+
+sptr_t DirectFunction(
+    ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) {
+	return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+}
+
+}
+
+LRESULT PASCAL ScintillaWin::SWndProc(
+	HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	//Platform::DebugPrintf("S W:%x M:%x WP:%x L:%x\n", hWnd, iMessage, wParam, lParam);
+
+	// Find C++ object associated with window.
+	ScintillaWin *sci = static_cast<ScintillaWin *>(PointerFromWindow(hWnd));
+	// sci will be zero if WM_CREATE not seen yet
+	if (sci == nullptr) {
+		try {
+			if (iMessage == WM_CREATE) {
+				static std::once_flag once;
+				std::call_once(once, Prepare);
+				// Create C++ object associated with window
+				sci = new ScintillaWin(hWnd);
+				SetWindowPointer(hWnd, sci);
+				return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+			}
+		} catch (...) {
+		}
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	} else {
+		if (iMessage == WM_NCDESTROY) {
+			try {
+				sci->Finalise();
+				delete sci;
+			} catch (...) {
+			}
+			SetWindowPointer(hWnd, nullptr);
+			return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+		} else {
+			return sci->WndProc(static_cast<Message>(iMessage), wParam, lParam);
+		}
+	}
+}
+
+// This function is externally visible so it can be called from container when building statically.
+// Must be called once only.
+extern "C" int Scintilla_RegisterClasses(void *hInstance) {
+	const bool result = ScintillaWin::Register(static_cast<HINSTANCE>(hInstance));
+	return result;
+}
+
+namespace Scintilla::Internal {
+
+int ResourcesRelease(bool fromDllMain) noexcept {
+	const bool result = ScintillaWin::Unregister();
+	Platform_Finalise(fromDllMain);
+	return result;
+}
+
+int RegisterClasses(void *hInstance) noexcept {
+	const bool result = ScintillaWin::Register(static_cast<HINSTANCE>(hInstance));
+	return result;
+}
+
+}
+
+// This function is externally visible so it can be called from container when building statically.
+extern "C" int Scintilla_ReleaseResources() {
+	return Scintilla::Internal::ResourcesRelease(false);
+}
diff --git a/scite-app/scintilla/win32/ScintillaWin.h b/scite-app/scintilla/win32/ScintillaWin.h
new file mode 100644
index 0000000..c46e263
--- /dev/null
+++ b/scite-app/scintilla/win32/ScintillaWin.h
@@ -0,0 +1,21 @@
+// Scintilla source code edit control
+/** @file ScintillaWin.h
+ ** Define functions from ScintillaWin.cxx that can be called from ScintillaDLL.cxx.
+ **/
+// Copyright 1998-2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLAWIN_H
+#define SCINTILLAWIN_H
+
+namespace Scintilla::Internal {
+
+class ScintillaWin;
+
+int ResourcesRelease(bool fromDllMain) noexcept;
+int RegisterClasses(void *hInstance) noexcept;
+Scintilla::sptr_t DirectFunction(ScintillaWin *sci, UINT iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
+
+}
+
+#endif
diff --git a/scite-app/scintilla/win32/deps.mak b/scite-app/scintilla/win32/deps.mak
new file mode 100644
index 0000000..af4d8f9
--- /dev/null
+++ b/scite-app/scintilla/win32/deps.mak
@@ -0,0 +1,445 @@
+# Created by DepGen.py. To recreate, run DepGen.py.
+HanjaDic.o: \
+	HanjaDic.cxx \
+	../src/UniConversion.h \
+	HanjaDic.h
+PlatWin.o: \
+	PlatWin.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h \
+	../src/UniConversion.h \
+	../src/DBCS.h \
+	PlatWin.h
+ScintillaDLL.o: \
+	ScintillaDLL.cxx \
+	../include/ScintillaTypes.h \
+	ScintillaWin.h
+ScintillaWin.o: \
+	ScintillaWin.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/CaseConvert.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/ElapsedPeriod.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h \
+	PlatWin.h \
+	HanjaDic.h \
+	ScintillaWin.h
+AutoComplete.o: \
+	../src/AutoComplete.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/Position.h \
+	../src/AutoComplete.h
+CallTip.o: \
+	../src/CallTip.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/CallTip.h
+CaseConvert.o: \
+	../src/CaseConvert.cxx \
+	../src/CaseConvert.h \
+	../src/UniConversion.h
+CaseFolder.o: \
+	../src/CaseFolder.cxx \
+	../src/CaseFolder.h \
+	../src/CaseConvert.h
+CellBuffer.o: \
+	../src/CellBuffer.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/UniConversion.h
+CharacterCategoryMap.o: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+CharacterType.o: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
+CharClassify.o: \
+	../src/CharClassify.cxx \
+	../src/CharacterType.h \
+	../src/CharClassify.h
+ContractionState.o: \
+	../src/ContractionState.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ContractionState.h
+DBCS.o: \
+	../src/DBCS.cxx \
+	../src/DBCS.h
+Decoration.o: \
+	../src/Decoration.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/Decoration.h
+Document.o: \
+	../src/Document.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/RESearch.h \
+	../src/UniConversion.h \
+	../src/ElapsedPeriod.h
+EditModel.o: \
+	../src/EditModel.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h
+Editor.o: \
+	../src/Editor.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/DBCS.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/ElapsedPeriod.h
+EditView.o: \
+	../src/EditView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/ElapsedPeriod.h
+Geometry.o: \
+	../src/Geometry.cxx \
+	../src/Geometry.h
+Indicator.o: \
+	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Indicator.h \
+	../src/XPM.h
+KeyMap.o: \
+	../src/KeyMap.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/KeyMap.h
+LineMarker.o: \
+	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/UniConversion.h
+MarginView.o: \
+	../src/MarginView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h
+PerLine.o: \
+	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h
+PositionCache.o: \
+	../src/PositionCache.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h
+RESearch.o: \
+	../src/RESearch.cxx \
+	../src/Position.h \
+	../src/CharClassify.h \
+	../src/RESearch.h
+RunStyles.o: \
+	../src/RunStyles.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h
+ScintillaBase.o: \
+	../src/ScintillaBase.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h
+Selection.o: \
+	../src/Selection.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/Selection.h
+Style.o: \
+	../src/Style.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Style.h
+UniConversion.o: \
+	../src/UniConversion.cxx \
+	../src/UniConversion.h
+UniqueString.o: \
+	../src/UniqueString.cxx \
+	../src/UniqueString.h
+ViewStyle.o: \
+	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/Indicator.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h
+XPM.o: \
+	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h
diff --git a/scite-app/scintilla/win32/makefile b/scite-app/scintilla/win32/makefile
new file mode 100644
index 0000000..c09d8d7
--- /dev/null
+++ b/scite-app/scintilla/win32/makefile
@@ -0,0 +1,136 @@
+# Make file for Scintilla on Windows
+# @file makefile
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile assumes Mingw-w64 GCC 9.0+ is used and changes will be needed to use other compilers.
+# Clang 9.0+ can be used with CLANG=1 on command line.
+
+.PHONY: all clean analyze depend
+
+.SUFFIXES: .cxx .c .o .h .a
+
+DIR_BIN=../bin
+
+COMPONENT = $(DIR_BIN)/Scintilla.dll
+LIBSCI = $(DIR_BIN)/libscintilla.a
+
+WARNINGS = -Wpedantic -Wall
+
+ifdef CLANG
+CXX = clang++
+DEFINES += -D_CRT_SECURE_NO_DEPRECATE
+else
+# MinGW GCC
+LIBSMINGW = -lstdc++
+STRIPOPTION = -s
+endif
+ARFLAGS = rc
+RANLIB ?= ranlib
+WINDRES ?= windres
+
+# Environment variable windir always defined on Win32
+
+# Take care of changing Unix style '/' directory separator to '\' on Windows
+normalize = $(if $(windir),$(subst /,\,$1),$1)
+
+PYTHON = $(if $(windir),pyw,python3)
+
+ifdef windir
+DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
+else
+DEL = rm -f
+endif
+
+vpath %.h ../src ../include
+vpath %.cxx ../src
+
+LDFLAGS=-shared -static -mwindows
+LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW)
+
+INCLUDES=-I ../include -I ../src
+
+BASE_FLAGS += $(WARNINGS)
+
+ifdef NO_CXX11_REGEX
+DEFINES += -DNO_CXX11_REGEX
+endif
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+ifndef DEBUG
+STRIPFLAG=$(STRIPOPTION)
+endif
+
+CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
+CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS)
+
+all:	$(COMPONENT) $(LIBSCI)
+
+clean:
+	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI))
+
+%.o: %.cxx
+	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
+
+analyze:
+	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx
+
+depend deps.mak:
+	$(PYTHON) DepGen.py
+
+# Required for base Scintilla
+SRC_OBJS = \
+	AutoComplete.o \
+	CallTip.o \
+	CaseConvert.o \
+	CaseFolder.o \
+	CellBuffer.o \
+	CharacterCategoryMap.o \
+	CharacterType.o \
+	CharClassify.o \
+	ContractionState.o \
+	DBCS.o \
+	Decoration.o \
+	Document.o \
+	EditModel.o \
+	Editor.o \
+	EditView.o \
+	Geometry.o \
+	Indicator.o \
+	KeyMap.o \
+	LineMarker.o \
+	MarginView.o \
+	PerLine.o \
+	PositionCache.o \
+	RESearch.o \
+	RunStyles.o \
+	Selection.o \
+	Style.o \
+	UniConversion.o \
+	UniqueString.o \
+	ViewStyle.o \
+	XPM.o
+
+COMPONENT_OBJS = \
+	$(SRC_OBJS) \
+	HanjaDic.o \
+	PlatWin.o \
+	ScintillaBase.o \
+	ScintillaDLL.o \
+	ScintillaWin.o \
+	ScintRes.o
+
+$(COMPONENT): $(COMPONENT_OBJS)
+	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
+
+$(LIBSCI): $(COMPONENT_OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+	$(RANLIB) $@
+
+# Automatically generate dependencies for most files with "make deps"
+include deps.mak
+
+ScintRes.o:	ScintRes.rc
+	$(WINDRES) ScintRes.rc $@
+
diff --git a/scite-app/scintilla/win32/nmdeps.mak b/scite-app/scintilla/win32/nmdeps.mak
new file mode 100644
index 0000000..50542ab
--- /dev/null
+++ b/scite-app/scintilla/win32/nmdeps.mak
@@ -0,0 +1,445 @@
+# Created by DepGen.py. To recreate, run DepGen.py.
+$(DIR_O)/HanjaDic.obj: \
+	HanjaDic.cxx \
+	../src/UniConversion.h \
+	HanjaDic.h
+$(DIR_O)/PlatWin.obj: \
+	PlatWin.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h \
+	../src/UniConversion.h \
+	../src/DBCS.h \
+	PlatWin.h
+$(DIR_O)/ScintillaDLL.obj: \
+	ScintillaDLL.cxx \
+	../include/ScintillaTypes.h \
+	ScintillaWin.h
+$(DIR_O)/ScintillaWin.obj: \
+	ScintillaWin.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/CaseConvert.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/ElapsedPeriod.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h \
+	PlatWin.h \
+	HanjaDic.h \
+	ScintillaWin.h
+$(DIR_O)/AutoComplete.obj: \
+	../src/AutoComplete.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/Position.h \
+	../src/AutoComplete.h
+$(DIR_O)/CallTip.obj: \
+	../src/CallTip.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/CallTip.h
+$(DIR_O)/CaseConvert.obj: \
+	../src/CaseConvert.cxx \
+	../src/CaseConvert.h \
+	../src/UniConversion.h
+$(DIR_O)/CaseFolder.obj: \
+	../src/CaseFolder.cxx \
+	../src/CaseFolder.h \
+	../src/CaseConvert.h
+$(DIR_O)/CellBuffer.obj: \
+	../src/CellBuffer.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/UniConversion.h
+$(DIR_O)/CharacterCategoryMap.obj: \
+	../src/CharacterCategoryMap.cxx \
+	../src/CharacterCategoryMap.h
+$(DIR_O)/CharacterType.obj: \
+	../src/CharacterType.cxx \
+	../src/CharacterType.h
+$(DIR_O)/CharClassify.obj: \
+	../src/CharClassify.cxx \
+	../src/CharacterType.h \
+	../src/CharClassify.h
+$(DIR_O)/ContractionState.obj: \
+	../src/ContractionState.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ContractionState.h
+$(DIR_O)/DBCS.obj: \
+	../src/DBCS.cxx \
+	../src/DBCS.h
+$(DIR_O)/Decoration.obj: \
+	../src/Decoration.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/Decoration.h
+$(DIR_O)/Document.obj: \
+	../src/Document.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/RESearch.h \
+	../src/UniConversion.h \
+	../src/ElapsedPeriod.h
+$(DIR_O)/EditModel.obj: \
+	../src/EditModel.cxx \
+	../include/ScintillaTypes.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h
+$(DIR_O)/Editor.obj: \
+	../src/Editor.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/DBCS.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/ElapsedPeriod.h
+$(DIR_O)/EditView.obj: \
+	../src/EditView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterType.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/ElapsedPeriod.h
+$(DIR_O)/Geometry.obj: \
+	../src/Geometry.cxx \
+	../src/Geometry.h
+$(DIR_O)/Indicator.obj: \
+	../src/Indicator.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Indicator.h \
+	../src/XPM.h
+$(DIR_O)/KeyMap.obj: \
+	../src/KeyMap.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../src/Debugging.h \
+	../src/KeyMap.h
+$(DIR_O)/LineMarker.obj: \
+	../src/LineMarker.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/UniConversion.h
+$(DIR_O)/MarginView.obj: \
+	../src/MarginView.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h
+$(DIR_O)/PerLine.obj: \
+	../src/PerLine.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/CellBuffer.h \
+	../src/PerLine.h
+$(DIR_O)/PositionCache.obj: \
+	../src/PositionCache.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/UniConversion.h \
+	../src/Selection.h \
+	../src/PositionCache.h
+$(DIR_O)/RESearch.obj: \
+	../src/RESearch.cxx \
+	../src/Position.h \
+	../src/CharClassify.h \
+	../src/RESearch.h
+$(DIR_O)/RunStyles.obj: \
+	../src/RunStyles.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h
+$(DIR_O)/ScintillaBase.obj: \
+	../src/ScintillaBase.cxx \
+	../include/ScintillaTypes.h \
+	../include/ScintillaMessages.h \
+	../include/ScintillaStructures.h \
+	../include/ILoader.h \
+	../include/Sci_Position.h \
+	../include/ILexer.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/CharacterCategoryMap.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/ContractionState.h \
+	../src/CellBuffer.h \
+	../src/CallTip.h \
+	../src/KeyMap.h \
+	../src/Indicator.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h \
+	../src/CharClassify.h \
+	../src/Decoration.h \
+	../src/CaseFolder.h \
+	../src/Document.h \
+	../src/Selection.h \
+	../src/PositionCache.h \
+	../src/EditModel.h \
+	../src/MarginView.h \
+	../src/EditView.h \
+	../src/Editor.h \
+	../src/AutoComplete.h \
+	../src/ScintillaBase.h
+$(DIR_O)/Selection.obj: \
+	../src/Selection.cxx \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/Selection.h
+$(DIR_O)/Style.obj: \
+	../src/Style.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Style.h
+$(DIR_O)/UniConversion.obj: \
+	../src/UniConversion.cxx \
+	../src/UniConversion.h
+$(DIR_O)/UniqueString.obj: \
+	../src/UniqueString.cxx \
+	../src/UniqueString.h
+$(DIR_O)/ViewStyle.obj: \
+	../src/ViewStyle.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/Position.h \
+	../src/UniqueString.h \
+	../src/Indicator.h \
+	../src/XPM.h \
+	../src/LineMarker.h \
+	../src/Style.h \
+	../src/ViewStyle.h
+$(DIR_O)/XPM.obj: \
+	../src/XPM.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Geometry.h \
+	../src/Platform.h \
+	../src/XPM.h
diff --git a/scite-app/scintilla/win32/scintilla.mak b/scite-app/scintilla/win32/scintilla.mak
new file mode 100644
index 0000000..ed40818
--- /dev/null
+++ b/scite-app/scintilla/win32/scintilla.mak
@@ -0,0 +1,144 @@
+# Make file for Scintilla on Windows Visual C++ version
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile is for using Visual C++ with nmake.
+# Usage for Microsoft:
+#     nmake -f scintilla.mak
+# For debug versions define DEBUG on the command line:
+#     nmake DEBUG=1 -f scintilla.mak
+# The main makefile uses mingw32 gcc and may be more current than this file.
+
+.SUFFIXES: .cxx
+
+DIR_O=.
+DIR_BIN=..\bin
+
+COMPONENT=$(DIR_BIN)\Scintilla.dll
+LIBSCI=$(DIR_BIN)\libscintilla.lib
+
+LD=link
+
+!IFDEF SUPPORT_XP
+ADD_DEFINE=-D_USING_V110_SDK71_
+# Different subsystems for 32-bit and 64-bit Windows XP so detect based on Platform
+# environment vairable set by vcvars*.bat to be either x86 or x64
+!IF "$(PLATFORM)" == "x64"
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02
+!ELSE
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01
+!ENDIF
+!ELSE
+CETCOMPAT=-CETCOMPAT
+!IFDEF ARM64
+ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+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)
+CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS)
+CXXDEBUG=-Od -MTd -DDEBUG
+CXXNDEBUG=-O1 -MT -DNDEBUG -GL
+NAME=-Fo
+LDFLAGS=-OPT:REF -LTCG -IGNORE:4197 -DEBUG $(SUBSYSTEM) $(CETCOMPAT)
+LDDEBUG=
+LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.lib OLEAUT32.lib MSIMG32.lib
+NOLOGO=-nologo
+
+!IFDEF QUIET
+CXX=@$(CXX)
+CXXFLAGS=$(CXXFLAGS) $(NOLOGO)
+LDFLAGS=$(LDFLAGS) $(NOLOGO)
+!ENDIF
+
+!IFDEF NO_CXX11_REGEX
+CXXFLAGS=$(CXXFLAGS) -DNO_CXX11_REGEX
+!ENDIF
+
+!IFDEF DEBUG
+CXXFLAGS=$(CXXFLAGS) $(CXXDEBUG)
+LDFLAGS=$(LDDEBUG) $(LDFLAGS)
+!ELSE
+CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
+!ENDIF
+
+INCLUDES=-I../include -I../src
+CXXFLAGS=$(CXXFLAGS) $(INCLUDES)
+
+all:	$(COMPONENT) $(LIBSCI)
+
+clean:
+	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) \
+	$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \
+	$(DIR_BIN)\Scintilla.lib $(LIBSCI)
+
+depend:
+	pyw DepGen.py
+
+# Required for base Scintilla
+SRC_OBJS=\
+	$(DIR_O)\AutoComplete.obj \
+	$(DIR_O)\CallTip.obj \
+	$(DIR_O)\CaseConvert.obj \
+	$(DIR_O)\CaseFolder.obj \
+	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\CharacterCategoryMap.obj \
+	$(DIR_O)\CharacterType.obj \
+	$(DIR_O)\CharClassify.obj \
+	$(DIR_O)\ContractionState.obj \
+	$(DIR_O)\DBCS.obj \
+	$(DIR_O)\Decoration.obj \
+	$(DIR_O)\Document.obj \
+	$(DIR_O)\EditModel.obj \
+	$(DIR_O)\Editor.obj \
+	$(DIR_O)\EditView.obj \
+	$(DIR_O)\Geometry.obj \
+	$(DIR_O)\Indicator.obj \
+	$(DIR_O)\KeyMap.obj \
+	$(DIR_O)\LineMarker.obj \
+	$(DIR_O)\MarginView.obj \
+	$(DIR_O)\PerLine.obj \
+	$(DIR_O)\PositionCache.obj \
+	$(DIR_O)\RESearch.obj \
+	$(DIR_O)\RunStyles.obj \
+	$(DIR_O)\Selection.obj \
+	$(DIR_O)\Style.obj \
+	$(DIR_O)\UniConversion.obj \
+	$(DIR_O)\UniqueString.obj \
+	$(DIR_O)\ViewStyle.obj \
+	$(DIR_O)\XPM.obj
+
+COMPONENT_OBJS = \
+	$(DIR_O)\HanjaDic.obj \
+	$(DIR_O)\PlatWin.obj \
+	$(DIR_O)\ScintillaBase.obj \
+	$(DIR_O)\ScintillaDLL.obj \
+	$(DIR_O)\ScintillaWin.obj \
+	$(SRC_OBJS)
+
+$(DIR_O)\ScintRes.res : ScintRes.rc
+	$(RC) -fo$@ $**
+
+$(COMPONENT): $(COMPONENT_OBJS) $(DIR_O)\ScintRes.res
+	$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
+
+$(LIBSCI): $(COMPONENT_OBJS)
+	LIB /OUT:$@ $**
+
+# Define how to build all the objects and what they depend on
+
+{..\src}.cxx{$(DIR_O)}.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
+{.}.cxx{$(DIR_O)}.obj::
+	$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
+
+# Dependencies
+
+!IF EXISTS(nmdeps.mak)
+
+# Protect with !IF EXISTS to handle accidental deletion - just 'nmake -f scintilla.mak deps'
+
+!INCLUDE nmdeps.mak
+
+!ENDIF
+
diff --git a/scite-app/scintilla/zipsrc.bat b/scite-app/scintilla/zipsrc.bat
new file mode 100755
index 0000000..e9268fa
--- /dev/null
+++ b/scite-app/scintilla/zipsrc.bat
@@ -0,0 +1,4 @@
+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
+cd scintilla
diff --git a/scite-app/scite/CONTRIBUTING b/scite-app/scite/CONTRIBUTING
new file mode 100644
index 0000000..2390372
--- /dev/null
+++ b/scite-app/scite/CONTRIBUTING
@@ -0,0 +1,20 @@
+Fixes should be posted to the Bug Tracker
+http://sourceforge.net/p/scintilla/bugs/
+
+Features should be posted to the Feature Request Tracker
+http://sourceforge.net/p/scintilla/feature-requests/
+
+Either send unified diffs (or patch files) or zip archives with whole files.
+Mercurial patch files are best as they include author information and commit
+messages.
+
+Questions should go to the scite-interest mailing list
+https://groups.google.com/forum/#!forum/scite-interest
+
+Code should follow the guidelines at
+http://www.scintilla.org/SciCoding.html
+
+Do not use SourceForge's Merge Request mechanism or message sending
+feature as no one is monitoring these.
+The neilh @ scintilla.org account receives much spam and is only checked
+occasionally. Almost all SciTE mail should go to the mailing list.
\ No newline at end of file
diff --git a/scite-app/scite/License.txt b/scite-app/scite/License.txt
new file mode 100644
index 0000000..b362eb8
--- /dev/null
+++ b/scite-app/scite/License.txt
@@ -0,0 +1,20 @@
+License for Lexilla, Scintilla, and SciTE
+
+Copyright 1998-2021 by Neil Hodgson <neilh@scintilla.org>
+
+All Rights Reserved 
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that 
+both that copyright notice and this permission notice appear in 
+supporting documentation. 
+
+NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
+OR PERFORMANCE OF THIS SOFTWARE. 
\ No newline at end of file
diff --git a/scite-app/scite/README b/scite-app/scite/README
new file mode 100644
index 0000000..fcdc406
--- /dev/null
+++ b/scite-app/scite/README
@@ -0,0 +1,92 @@
+README for building of Scintilla, Lexilla, and SciTE
+
+Scintilla and Lexilla can be built by themselves.
+To build SciTE, Scintilla and Lexilla should first be built.
+
+See lexilla/README for information on building Lexilla.
+
+*** GTK+/Linux version ***
+
+You must first have GTK+ 2.24 or later and GCC (7.1 or better) installed.
+Clang may be used by adding CLANG=1 to the make command line.
+Other C++ compilers may work but may require tweaking the make file.
+Either GTK+ 2.x or 3.x may be used with 2.x the default and 3.x
+chosen with the make argument GTK3=1.
+
+To build Scintilla, use the makefile located in the scintilla/gtk directory
+	cd scintilla/gtk
+	make
+	cd ../..
+
+To build and install SciTE, use the makefile located in the scite/gtk directory
+	cd scite/gtk
+	make
+	sudo make install
+
+This installs SciTE into $prefix/bin. The value of $prefix is determined from
+the location of Gnome if it is installed. This is usually /usr if installed
+with Linux or /usr/local if built from source. If Gnome is not installed
+/usr/bin is used as the prefix. The prefix can be overridden on the command
+line like "make prefix=/opt" but the same value should be used for both make
+and make install as this location is compiled into the executable. The global
+properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
+The language specific properties files are also installed into this directory.
+
+To remove SciTE
+	sudo make uninstall
+
+To clean the object files which may be needed to change $prefix
+	make clean
+
+The current make file supports static and dynamic linking between SciTE, Scintilla, and Lexilla.
+
+
+*** Windows version ***
+
+A C++ 17 compiler is required.
+Visual Studio 2019 is the development system used for most development
+although Mingw-w64 9.2 is also supported.
+
+To build Scintilla, make in the scintilla/win32 directory
+		cd scintilla\win32
+GCC:		mingw32-make
+Visual C++:	nmake -f scintilla.mak
+		cd ..\..
+
+To build SciTE, use the makefiles located in the scite/win32 directory
+		cd scite\win32
+GCC:		mingw32-make
+Visual C++: 	nmake -f scite.mak
+
+An executable SciTE will now be in scite/bin.
+
+*** GTK+/Windows version ***
+
+Mingw-w64 is known to work. Other compilers will probably not work.
+
+Only Scintilla will build with GTK+ on Windows. SciTE will not work.
+
+Make builds both a static library version of Scintilla with lexers (scintilla.a) and
+a shared library without lexers (libscintilla.so or or libscintilla.dll).
+
+To build Scintilla, make in the scintilla/gtk directory
+	cd scintilla\gtk
+	mingw32-make
+
+*** macOS Cocoa version ***
+
+Xcode 9.2 or later may be used to build Scintilla on macOS.
+
+There is no open source version of SciTE for macOS but there is a commercial
+version available through the App Store.
+
+To build Scintilla, run xcodebuild in the scintilla/cocoa/ScintillaFramework or 
+scintilla/cocoa/Scintilla directory
+
+        cd cocoa/Scintilla
+
+	xcodebuild
+
+*** Qt version ***
+
+See the qt/README file to build Scintilla with Qt.
diff --git a/scite-app/scite/bin/empty.txt b/scite-app/scite/bin/empty.txt
new file mode 100644
index 0000000..6618385
--- /dev/null
+++ b/scite-app/scite/bin/empty.txt
@@ -0,0 +1 @@
+This empty files ensures that the directory is created.
\ No newline at end of file
diff --git a/scite-app/scite/cppcheck.suppress b/scite-app/scite/cppcheck.suppress
new file mode 100644
index 0000000..7ecca8c
--- /dev/null
+++ b/scite-app/scite/cppcheck.suppress
@@ -0,0 +1,24 @@
+// File to suppress cppcheck warnings for files that will not be fixed.
+// Does not suppress warnings where an additional occurrence of the warning may be of interest.
+
+// These may be interesting but its not clear without examining each instance closely
+useStlAlgorithm
+
+// Coding style is to use assignments in constructor when there are many
+// members to initialize or the initialization is complex or has comments.
+useInitializationList
+
+// FilePath has a non-explicit constructor used for conversions
+noExplicitConstructor:scite/src/FilePath.h
+
+// Doesn't analyze execution path correctly.
+nullPointerRedundantCheck:scite/src/SciTEBase.cxx
+
+// Doesn't understand Win32 SetClipboardData is not leak
+memleak:scite/win32/SciTEWin.cxx
+
+// AddToPopUp is currently const but is not logically const and may change
+constParameter:scite/gtk/Widget.cxx
+
+// Suppress everything in lua as that comes from the Lua distribution
+*:scite/lua/*
diff --git a/scite-app/scite/delbin.bat b/scite-app/scite/delbin.bat
new file mode 100755
index 0000000..513cf18
--- /dev/null
+++ b/scite-app/scite/delbin.bat
@@ -0,0 +1 @@
+@del /S /Q *.a *.aps *.bsc *.dll *.dsw *.exe *.idb *.ilc *.ild *.ilf *.ilk *.ils *.lib *.map *.ncb *.obj *.o *.opt *.ipdb *.pdb *.plg *.res *.sbr *.tds *.exp *.tlog *.plist >NUL:
diff --git a/scite-app/scite/doc/CommandValues.html b/scite-app/scite/doc/CommandValues.html
new file mode 100644
index 0000000..a014aeb
--- /dev/null
+++ b/scite-app/scite/doc/CommandValues.html
@@ -0,0 +1,276 @@
+
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--Generated by scite/scripts/commandsdoc.py -->
+<style type="text/css">
+    table { border: 1px solid #1F1F1F; border-collapse: collapse; }
+    td { border: 1px solid; border-color: #E0E0E0 #000000; padding: 1px 5px 1px 5px; }
+    th { border: 1px solid #1F1F1F; padding: 1px 5px 1px 5px; }
+    thead { background-color: #000000; color: #FFFFFF; }
+</style>
+<body>
+<h2>SciTE menu commands</h2>
+<table>
+<thead><tr><th>Command</th><th>Menu text</th></tr></thead>
+<tr><td>IDM_NEW</td><td>New</td></tr>
+<tr><td>IDM_OPEN</td><td>Open</td></tr>
+<tr><td>IDM_OPENSELECTED</td><td>Open Selected Filename</td></tr>
+<tr><td>IDM_REVERT</td><td>Revert</td></tr>
+<tr><td>IDM_CLOSE</td><td>Close</td></tr>
+<tr><td>IDM_SAVE</td><td>Save</td></tr>
+<tr><td>IDM_SAVEAS</td><td>Save As</td></tr>
+<tr><td>IDM_SAVEACOPY</td><td>Save a Copy</td></tr>
+<tr><td>IDM_COPYPATH</td><td>Copy Path</td></tr>
+<tr><td>IDM_ENCODING_DEFAULT</td><td>Code Page Property</td></tr>
+<tr><td>IDM_ENCODING_UCS2BE</td><td>UTF-16 Big Endian</td></tr>
+<tr><td>IDM_ENCODING_UCS2LE</td><td>UTF-16 Little Endian</td></tr>
+<tr><td>IDM_ENCODING_UTF8</td><td>UTF-8 with BOM</td></tr>
+<tr><td>IDM_ENCODING_UCOOKIE</td><td>UTF-8</td></tr>
+<tr><td>IDM_SAVEASHTML</td><td>As HTML</td></tr>
+<tr><td>IDM_SAVEASRTF</td><td>As RTF</td></tr>
+<tr><td>IDM_SAVEASPDF</td><td>As PDF</td></tr>
+<tr><td>IDM_SAVEASTEX</td><td>As LaTeX</td></tr>
+<tr><td>IDM_SAVEASXML</td><td>As XML</td></tr>
+<tr><td>IDM_PRINTSETUP</td><td>Page Setup</td></tr>
+<tr><td>IDM_PRINT</td><td>Print</td></tr>
+<tr><td>IDM_LOADSESSION</td><td>Load Session</td></tr>
+<tr><td>IDM_SAVESESSION</td><td>Save Session</td></tr>
+<tr><td>IDM_QUIT</td><td>Exit</td></tr>
+<tr><td>IDM_UNDO</td><td>Undo</td></tr>
+<tr><td>IDM_REDO</td><td>Redo</td></tr>
+<tr><td>IDM_CUT</td><td>Cut</td></tr>
+<tr><td>IDM_COPY</td><td>Copy</td></tr>
+<tr><td>IDM_PASTE</td><td>Paste</td></tr>
+<tr><td>IDM_DUPLICATE</td><td>Duplicate</td></tr>
+<tr><td>IDM_CLEAR</td><td>Delete</td></tr>
+<tr><td>IDM_SELECTALL</td><td>Select All</td></tr>
+<tr><td>IDM_COPYASRTF</td><td>Copy as RTF</td></tr>
+<tr><td>IDM_MATCHBRACE</td><td>Match Brace</td></tr>
+<tr><td>IDM_SELECTTOBRACE</td><td>Select to Brace</td></tr>
+<tr><td>IDM_SHOWCALLTIP</td><td>Show Calltip</td></tr>
+<tr><td>IDM_COMPLETE</td><td>Complete Symbol</td></tr>
+<tr><td>IDM_COMPLETEWORD</td><td>Complete Word</td></tr>
+<tr><td>IDM_ABBREV</td><td>Expand Abbreviation</td></tr>
+<tr><td>IDM_INS_ABBREV</td><td>Insert Abbreviation</td></tr>
+<tr><td>IDM_BLOCK_COMMENT</td><td>Block Comment or Uncomment</td></tr>
+<tr><td>IDM_BOX_COMMENT</td><td>Box Comment</td></tr>
+<tr><td>IDM_STREAM_COMMENT</td><td>Stream Comment</td></tr>
+<tr><td>IDM_UPRCASE</td><td>Make Selection Uppercase</td></tr>
+<tr><td>IDM_LWRCASE</td><td>Make Selection Lowercase</td></tr>
+<tr><td>IDM_LINEREVERSE</td><td>Reverse Selected Lines</td></tr>
+<tr><td>IDM_JOIN</td><td>Join</td></tr>
+<tr><td>IDM_SPLIT</td><td>Split</td></tr>
+<tr><td>IDM_FIND</td><td>Find</td></tr>
+<tr><td>IDM_FINDNEXT</td><td>Find Next</td></tr>
+<tr><td>IDM_FINDNEXTBACK</td><td>Find Previous</td></tr>
+<tr><td>IDM_FINDINFILES</td><td>Find in Files</td></tr>
+<tr><td>IDM_REPLACE</td><td>Replace</td></tr>
+<tr><td>IDM_INCSEARCH</td><td>Incremental Search</td></tr>
+<tr><td>IDM_SELECTIONADDNEXT</td><td>Selection Add Next</td></tr>
+<tr><td>IDM_SELECTIONADDEACH</td><td>Selection Add Each</td></tr>
+<tr><td>IDM_GOTO</td><td>Go to</td></tr>
+<tr><td>IDM_BOOKMARK_NEXT</td><td>Next Bookmark</td></tr>
+<tr><td>IDM_BOOKMARK_PREV</td><td>Previous Bookmark</td></tr>
+<tr><td>IDM_BOOKMARK_TOGGLE</td><td>Toggle Bookmark</td></tr>
+<tr><td>IDM_BOOKMARK_CLEARALL</td><td>Clear All Bookmarks</td></tr>
+<tr><td>IDM_BOOKMARK_SELECT_ALL</td><td>Select All Bookmarks</td></tr>
+<tr><td>IDM_EXPAND</td><td>Toggle current fold</td></tr>
+<tr><td>IDM_TOGGLE_FOLDALL</td><td>Toggle all folds</td></tr>
+<tr><td>IDM_FULLSCREEN</td><td>Full Screen</td></tr>
+<tr><td>IDM_VIEWTOOLBAR</td><td>Tool Bar</td></tr>
+<tr><td>IDM_VIEWTABBAR</td><td>Tab Bar</td></tr>
+<tr><td>IDM_VIEWSTATUSBAR</td><td>Status Bar</td></tr>
+<tr><td>IDM_VIEWSPACE</td><td>Whitespace</td></tr>
+<tr><td>IDM_VIEWEOL</td><td>End of Line</td></tr>
+<tr><td>IDM_VIEWGUIDES</td><td>Indentation Guides</td></tr>
+<tr><td>IDM_LINENUMBERMARGIN</td><td>Line Numbers</td></tr>
+<tr><td>IDM_SELMARGIN</td><td>Margin</td></tr>
+<tr><td>IDM_FOLDMARGIN</td><td>Fold Margin</td></tr>
+<tr><td>IDM_TOGGLEOUTPUT</td><td>Output</td></tr>
+<tr><td>IDM_TOGGLEPARAMETERS</td><td>Parameters</td></tr>
+<tr><td>IDM_COMPILE</td><td>Compile</td></tr>
+<tr><td>IDM_BUILD</td><td>Build</td></tr>
+<tr><td>IDM_CLEAN</td><td>Clean</td></tr>
+<tr><td>IDM_GO</td><td>Go</td></tr>
+<tr><td>IDM_STOPEXECUTE</td><td>Stop Executing</td></tr>
+<tr><td>IDM_NEXTMSG</td><td>Next Message</td></tr>
+<tr><td>IDM_PREVMSG</td><td>Previous Message</td></tr>
+<tr><td>IDM_CLEAROUTPUT</td><td>Clear Output</td></tr>
+<tr><td>IDM_SWITCHPANE</td><td>Switch Pane</td></tr>
+<tr><td>IDM_ONTOP</td><td>Always On Top</td></tr>
+<tr><td>IDM_OPENFILESHERE</td><td>Open Files Here</td></tr>
+<tr><td>IDM_SPLITVERTICAL</td><td>Vertical Split</td></tr>
+<tr><td>IDM_WRAP</td><td>Wrap</td></tr>
+<tr><td>IDM_WRAPOUTPUT</td><td>Wrap Output</td></tr>
+<tr><td>IDM_READONLY</td><td>Read-Only</td></tr>
+<tr><td>IDM_EOL_CRLF</td><td>CR + LF</td></tr>
+<tr><td>IDM_EOL_CR</td><td>CR</td></tr>
+<tr><td>IDM_EOL_LF</td><td>LF</td></tr>
+<tr><td>IDM_EOL_CONVERT</td><td>Convert Line End Characters</td></tr>
+<tr><td>IDM_TABSIZE</td><td>Change Indentation Settings</td></tr>
+<tr><td>IDM_MONOFONT</td><td>Use Monospaced Font</td></tr>
+<tr><td>IDM_OPENLOCALPROPERTIES</td><td>Open Local Options File</td></tr>
+<tr><td>IDM_OPENDIRECTORYPROPERTIES</td><td>Open Directory Options File</td></tr>
+<tr><td>IDM_OPENUSERPROPERTIES</td><td>Open User Options File</td></tr>
+<tr><td>IDM_OPENGLOBALPROPERTIES</td><td>Open Global Options File</td></tr>
+<tr><td>IDM_OPENABBREVPROPERTIES</td><td>Open Abbreviations File</td></tr>
+<tr><td>IDM_OPENLUAEXTERNALFILE</td><td>Open Lua Startup Script</td></tr>
+<tr><td>IDM_PREVFILE</td><td>Previous</td></tr>
+<tr><td>IDM_NEXTFILE</td><td>Next</td></tr>
+<tr><td>IDM_CLOSEALL</td><td>Close All</td></tr>
+<tr><td>IDM_SAVEALL</td><td>Save All</td></tr>
+<tr><td>IDM_HELP</td><td>Help</td></tr>
+<tr><td>IDM_HELP_SCITE</td><td>Sc1 Help</td></tr>
+<tr><td>IDM_ABOUT</td><td>About Sc1</td></tr>
+<tr><td>IDM_HELP_SCITE</td><td>SciTE Help</td></tr>
+<tr><td>IDM_ABOUT</td><td>About SciTE</td></tr>
+</table>
+<h2>Scintilla key commands</h2>
+<table>
+<thead><tr><th>Command</th><th>Name</th><th>Explanation</th></tr></thead>
+<tr><td>2547</td><td>AnnotationClearAll</td><td>Clear the annotations from all lines</td></tr>
+<tr><td>2101</td><td>AutoCCancel</td><td>Remove the auto-completion list from the screen.</td></tr>
+<tr><td>2104</td><td>AutoCComplete</td><td>User has selected an item so remove the list and insert the selection.</td></tr>
+<tr><td>2328</td><td>BackTab</td><td>Dedent the selected lines.</td></tr>
+<tr><td>2078</td><td>BeginUndoAction</td><td>Start a sequence of actions that is undone and redone as a unit. May be nested.</td></tr>
+<tr><td>2201</td><td>CallTipCancel</td><td>Remove the call tip from the screen.</td></tr>
+<tr><td>2325</td><td>Cancel</td><td>Cancel any modes such as call tip or auto-completion list display.</td></tr>
+<tr><td>2304</td><td>CharLeft</td><td>Move caret left one character.</td></tr>
+<tr><td>2305</td><td>CharLeftExtend</td><td>Move caret left one character extending selection to new caret position.</td></tr>
+<tr><td>2428</td><td>CharLeftRectExtend</td><td>Move caret left one character, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2306</td><td>CharRight</td><td>Move caret right one character.</td></tr>
+<tr><td>2307</td><td>CharRightExtend</td><td>Move caret right one character extending selection to new caret position.</td></tr>
+<tr><td>2429</td><td>CharRightRectExtend</td><td>Move caret right one character, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2399</td><td>ChooseCaretX</td><td>Set the last x chosen value to be the caret x position.</td></tr>
+<tr><td>2180</td><td>Clear</td><td>Clear the selection.</td></tr>
+<tr><td>2004</td><td>ClearAll</td><td>Delete all text in the document.</td></tr>
+<tr><td>2072</td><td>ClearAllCmdKeys</td><td>Drop all key mappings.</td></tr>
+<tr><td>2770</td><td>ClearAllRepresentations</td><td>Clear representations to default.</td></tr>
+<tr><td>2005</td><td>ClearDocumentStyle</td><td>Set all style bytes to 0, remove all folding information.</td></tr>
+<tr><td>2408</td><td>ClearRegisteredImages</td><td>Clear all the registered XPM images.</td></tr>
+<tr><td>2571</td><td>ClearSelections</td><td>Clear selections to a single empty stream selection</td></tr>
+<tr><td>2178</td><td>Copy</td><td>Copy the selection to the clipboard.</td></tr>
+<tr><td>2519</td><td>CopyAllowLine</td><td>Copy the selection, if selection empty copy the line with the caret</td></tr>
+<tr><td>2177</td><td>Cut</td><td>Cut the selection to the clipboard.</td></tr>
+<tr><td>2395</td><td>DelLineLeft</td><td>Delete back from the current position to the start of the line.</td></tr>
+<tr><td>2396</td><td>DelLineRight</td><td>Delete forwards from the current position to the end of the line.</td></tr>
+<tr><td>2335</td><td>DelWordLeft</td><td>Delete the word to the left of the caret.</td></tr>
+<tr><td>2336</td><td>DelWordRight</td><td>Delete the word to the right of the caret.</td></tr>
+<tr><td>2518</td><td>DelWordRightEnd</td><td>Delete the word to the right of the caret, but not the trailing non-word characters.</td></tr>
+<tr><td>2326</td><td>DeleteBack</td><td>Delete the selection or if no selection, the character before the caret.</td></tr>
+<tr><td>2344</td><td>DeleteBackNotLine</td><td>Delete the selection or if no selection, the character before the caret. Will not delete the character before at the start of a line.</td></tr>
+<tr><td>2318</td><td>DocumentEnd</td><td>Move caret to last position in document.</td></tr>
+<tr><td>2319</td><td>DocumentEndExtend</td><td>Move caret to last position in document extending selection to new caret position.</td></tr>
+<tr><td>2316</td><td>DocumentStart</td><td>Move caret to first position in document.</td></tr>
+<tr><td>2317</td><td>DocumentStartExtend</td><td>Move caret to first position in document extending selection to new caret position.</td></tr>
+<tr><td>2744</td><td>EOLAnnotationClearAll</td><td>Clear the end of annotations from all lines</td></tr>
+<tr><td>2324</td><td>EditToggleOvertype</td><td>Switch from insert to overtype mode or the reverse.</td></tr>
+<tr><td>2175</td><td>EmptyUndoBuffer</td><td>Delete the undo history.</td></tr>
+<tr><td>2079</td><td>EndUndoAction</td><td>End a sequence of actions that is undone and redone as a unit.</td></tr>
+<tr><td>2642</td><td>FindIndicatorHide</td><td>On OS X, hide the find indicator.</td></tr>
+<tr><td>2330</td><td>FormFeed</td><td>Insert a Form Feed character.</td></tr>
+<tr><td>4023</td><td>FreeSubStyles</td><td>Free allocated sub styles</td></tr>
+<tr><td>2400</td><td>GrabFocus</td><td>Set the focus to this Scintilla widget.</td></tr>
+<tr><td>2312</td><td>Home</td><td>Move caret to first position on line.</td></tr>
+<tr><td>2345</td><td>HomeDisplay</td><td>Move caret to first position on display line.</td></tr>
+<tr><td>2346</td><td>HomeDisplayExtend</td><td>Move caret to first position on display line extending selection to new caret position.</td></tr>
+<tr><td>2313</td><td>HomeExtend</td><td>Move caret to first position on line extending selection to new caret position.</td></tr>
+<tr><td>2430</td><td>HomeRectExtend</td><td>Move caret to first position on line, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2349</td><td>HomeWrap</td><td>Like Home but when word-wrap is enabled goes first to start of display line HomeDisplay, then to start of document line Home.</td></tr>
+<tr><td>2450</td><td>HomeWrapExtend</td><td>Like HomeExtend but when word-wrap is enabled extends first to start of display line HomeDisplayExtend, then to start of document line HomeExtend.</td></tr>
+<tr><td>2455</td><td>LineCopy</td><td>Copy the line containing the caret.</td></tr>
+<tr><td>2337</td><td>LineCut</td><td>Cut the line containing the caret.</td></tr>
+<tr><td>2338</td><td>LineDelete</td><td>Delete the line containing the caret.</td></tr>
+<tr><td>2300</td><td>LineDown</td><td>Move caret down one line.</td></tr>
+<tr><td>2301</td><td>LineDownExtend</td><td>Move caret down one line extending selection to new caret position.</td></tr>
+<tr><td>2426</td><td>LineDownRectExtend</td><td>Move caret down one line, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2404</td><td>LineDuplicate</td><td>Duplicate the current line.</td></tr>
+<tr><td>2314</td><td>LineEnd</td><td>Move caret to last position on line.</td></tr>
+<tr><td>2347</td><td>LineEndDisplay</td><td>Move caret to last position on display line.</td></tr>
+<tr><td>2348</td><td>LineEndDisplayExtend</td><td>Move caret to last position on display line extending selection to new caret position.</td></tr>
+<tr><td>2315</td><td>LineEndExtend</td><td>Move caret to last position on line extending selection to new caret position.</td></tr>
+<tr><td>2432</td><td>LineEndRectExtend</td><td>Move caret to last position on line, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2451</td><td>LineEndWrap</td><td>Like LineEnd but when word-wrap is enabled goes first to end of display line LineEndDisplay, then to start of document line LineEnd.</td></tr>
+<tr><td>2452</td><td>LineEndWrapExtend</td><td>Like LineEndExtend but when word-wrap is enabled extends first to end of display line LineEndDisplayExtend, then to start of document line LineEndExtend.</td></tr>
+<tr><td>2354</td><td>LineReverse</td><td>Reverse order of selected lines.</td></tr>
+<tr><td>2342</td><td>LineScrollDown</td><td>Scroll the document down, keeping the caret visible.</td></tr>
+<tr><td>2343</td><td>LineScrollUp</td><td>Scroll the document up, keeping the caret visible.</td></tr>
+<tr><td>2339</td><td>LineTranspose</td><td>Switch the current line with the previous.</td></tr>
+<tr><td>2302</td><td>LineUp</td><td>Move caret up one line.</td></tr>
+<tr><td>2303</td><td>LineUpExtend</td><td>Move caret up one line extending selection to new caret position.</td></tr>
+<tr><td>2427</td><td>LineUpRectExtend</td><td>Move caret up one line, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2288</td><td>LinesJoin</td><td>Join the lines in the target.</td></tr>
+<tr><td>2340</td><td>LowerCase</td><td>Transform the selection to lower case.</td></tr>
+<tr><td>2536</td><td>MarginTextClearAll</td><td>Clear the margin text on all lines</td></tr>
+<tr><td>2401</td><td>MoveCaretInsideView</td><td>Move the caret inside current view if it's not there already.</td></tr>
+<tr><td>2621</td><td>MoveSelectedLinesDown</td><td>Move the selected lines down one line, shifting the line below before the selection</td></tr>
+<tr><td>2620</td><td>MoveSelectedLinesUp</td><td>Move the selected lines up one line, shifting the line above after the selection</td></tr>
+<tr><td>2695</td><td>MultiEdgeClearAll</td><td>Clear all vertical edges.</td></tr>
+<tr><td>2689</td><td>MultipleSelectAddEach</td><td>Add each occurrence of the main selection in the target to the set of selections. If the current selection is empty then select word around caret.</td></tr>
+<tr><td>2688</td><td>MultipleSelectAddNext</td><td>Add the next occurrence of the main selection to the set of selections as main. If the current selection is empty then select word around caret.</td></tr>
+<tr><td>2329</td><td>NewLine</td><td>Insert a new line, may use a CRLF, CR or LF depending on EOL mode.</td></tr>
+<tr><td>2172</td><td>Null</td><td>Null operation.</td></tr>
+<tr><td>2322</td><td>PageDown</td><td>Move caret one page down.</td></tr>
+<tr><td>2323</td><td>PageDownExtend</td><td>Move caret one page down extending selection to new caret position.</td></tr>
+<tr><td>2434</td><td>PageDownRectExtend</td><td>Move caret one page down, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2320</td><td>PageUp</td><td>Move caret one page up.</td></tr>
+<tr><td>2321</td><td>PageUpExtend</td><td>Move caret one page up extending selection to new caret position.</td></tr>
+<tr><td>2433</td><td>PageUpRectExtend</td><td>Move caret one page up, extending rectangular selection to new caret position.</td></tr>
+<tr><td>2413</td><td>ParaDown</td><td>Move caret down one paragraph (delimited by empty lines).</td></tr>
+<tr><td>2414</td><td>ParaDownExtend</td><td>Extend selection down one paragraph (delimited by empty lines).</td></tr>
+<tr><td>2415</td><td>ParaUp</td><td>Move caret up one paragraph (delimited by empty lines).</td></tr>
+<tr><td>2416</td><td>ParaUpExtend</td><td>Extend selection up one paragraph (delimited by empty lines).</td></tr>
+<tr><td>2179</td><td>Paste</td><td>Paste the contents of the clipboard into the document replacing the selection.</td></tr>
+<tr><td>2011</td><td>Redo</td><td>Redoes the next action on the undo history.</td></tr>
+<tr><td>2552</td><td>ReleaseAllExtendedStyles</td><td>Release all extended (>255) style numbers</td></tr>
+<tr><td>2606</td><td>RotateSelection</td><td>Set the main selection to the next selection.</td></tr>
+<tr><td>2169</td><td>ScrollCaret</td><td>Ensure the caret is visible.</td></tr>
+<tr><td>2629</td><td>ScrollToEnd</td><td>Scroll to end of document.</td></tr>
+<tr><td>2628</td><td>ScrollToStart</td><td>Scroll to start of document.</td></tr>
+<tr><td>2366</td><td>SearchAnchor</td><td>Sets the current caret position to be the search anchor.</td></tr>
+<tr><td>2013</td><td>SelectAll</td><td>Select all the text in the document.</td></tr>
+<tr><td>2469</td><td>SelectionDuplicate</td><td>Duplicate the selection. If selection empty duplicate the line containing the caret.</td></tr>
+<tr><td>2444</td><td>SetCharsDefault</td><td>Reset the set of characters for whitespace and word characters to the defaults.</td></tr>
+<tr><td>2014</td><td>SetSavePoint</td><td>Remember the current position in the undo history as the position at which the document was saved.</td></tr>
+<tr><td>3001</td><td>StartRecord</td><td>Start notifying the container of all key presses and commands.</td></tr>
+<tr><td>3002</td><td>StopRecord</td><td>Stop notifying the container of all key presses and commands.</td></tr>
+<tr><td>2437</td><td>StutteredPageDown</td><td>Move caret to bottom of page, or one page down if already at bottom of page.</td></tr>
+<tr><td>2438</td><td>StutteredPageDownExtend</td><td>Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.</td></tr>
+<tr><td>2435</td><td>StutteredPageUp</td><td>Move caret to top of page, or one page up if already at top of page.</td></tr>
+<tr><td>2436</td><td>StutteredPageUpExtend</td><td>Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.</td></tr>
+<tr><td>2050</td><td>StyleClearAll</td><td>Clear all the styles and make equivalent to the global default style.</td></tr>
+<tr><td>2058</td><td>StyleResetDefault</td><td>Reset the default style to its state at startup</td></tr>
+<tr><td>2607</td><td>SwapMainAnchorCaret</td><td>Swap that caret and anchor of the main selection.</td></tr>
+<tr><td>2327</td><td>Tab</td><td>If selection is empty or all on one line replace the selection with a tab character. If more than one line selected, indent the lines.</td></tr>
+<tr><td>2287</td><td>TargetFromSelection</td><td>Make the target range start and end be the same as the selection range start and end.</td></tr>
+<tr><td>2690</td><td>TargetWholeDocument</td><td>Sets the target to the whole document.</td></tr>
+<tr><td>2459</td><td>ToggleCaretSticky</td><td>Switch between sticky and non-sticky: meant to be bound to a key.</td></tr>
+<tr><td>2176</td><td>Undo</td><td>Undo one action in the undo history.</td></tr>
+<tr><td>2341</td><td>UpperCase</td><td>Transform the selection to upper case.</td></tr>
+<tr><td>2331</td><td>VCHome</td><td>Move caret to before first visible character on line. If already there move to first character on line.</td></tr>
+<tr><td>2652</td><td>VCHomeDisplay</td><td>Move caret to before first visible character on display line. If already there move to first character on display line.</td></tr>
+<tr><td>2653</td><td>VCHomeDisplayExtend</td><td>Like VCHomeDisplay but extending selection to new caret position.</td></tr>
+<tr><td>2332</td><td>VCHomeExtend</td><td>Like VCHome but extending selection to new caret position.</td></tr>
+<tr><td>2431</td><td>VCHomeRectExtend</td><td>Move caret to before first visible character on line. If already there move to first character on line. In either case, extend rectangular selection to new caret position.</td></tr>
+<tr><td>2453</td><td>VCHomeWrap</td><td>Like VCHome but when word-wrap is enabled goes first to start of display line VCHomeDisplay, then behaves like VCHome.</td></tr>
+<tr><td>2454</td><td>VCHomeWrapExtend</td><td>Like VCHomeExtend but when word-wrap is enabled extends first to start of display line VCHomeDisplayExtend, then behaves like VCHomeExtend.</td></tr>
+<tr><td>2619</td><td>VerticalCentreCaret</td><td>Centre current line in window.</td></tr>
+<tr><td>2308</td><td>WordLeft</td><td>Move caret left one word.</td></tr>
+<tr><td>2439</td><td>WordLeftEnd</td><td>Move caret left one word, position cursor at end of word.</td></tr>
+<tr><td>2440</td><td>WordLeftEndExtend</td><td>Move caret left one word, position cursor at end of word, extending selection to new caret position.</td></tr>
+<tr><td>2309</td><td>WordLeftExtend</td><td>Move caret left one word extending selection to new caret position.</td></tr>
+<tr><td>2390</td><td>WordPartLeft</td><td>Move to the previous change in capitalisation.</td></tr>
+<tr><td>2391</td><td>WordPartLeftExtend</td><td>Move to the previous change in capitalisation extending selection to new caret position.</td></tr>
+<tr><td>2392</td><td>WordPartRight</td><td>Move to the change next in capitalisation.</td></tr>
+<tr><td>2393</td><td>WordPartRightExtend</td><td>Move to the next change in capitalisation extending selection to new caret position.</td></tr>
+<tr><td>2310</td><td>WordRight</td><td>Move caret right one word.</td></tr>
+<tr><td>2441</td><td>WordRightEnd</td><td>Move caret right one word, position cursor at end of word.</td></tr>
+<tr><td>2442</td><td>WordRightEndExtend</td><td>Move caret right one word, position cursor at end of word, extending selection to new caret position.</td></tr>
+<tr><td>2311</td><td>WordRightExtend</td><td>Move caret right one word extending selection to new caret position.</td></tr>
+<tr><td>2333</td><td>ZoomIn</td><td>Magnify the displayed text by increasing the sizes by 1 point.</td></tr>
+<tr><td>2334</td><td>ZoomOut</td><td>Make the displayed text smaller by decreasing the sizes by 1 point.</td></tr>
+</table>
+</body>
+</html>
diff --git a/scite-app/scite/doc/PaneAPI.html b/scite-app/scite/doc/PaneAPI.html
new file mode 100644
index 0000000..9044edc
--- /dev/null
+++ b/scite-app/scite/doc/PaneAPI.html
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding='utf-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE Pane API
+    </title>
+<style type="text/css">
+        table {
+            border: 1px solid #1F1F1F;
+            border-collapse: collapse;
+	    font-family: Verdana, Arial, Helvetica
+        }
+        p {
+	    font-family: Verdana, Arial, Helvetica
+        }
+        td {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        th {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        .windowsonly {
+            background: #EBF3FF;
+        }
+        .gtkonly {
+            background: #FFFFE7;
+        }
+        .osxonly {
+            background: #FFE7E7;
+        }
+        .example {
+            color: #008000;
+            font-weight: bold;
+        }
+        .comment {
+	     font-style:italic;
+            font-size: 80%;
+        }
+        DIV.example {
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+            font-size: 80%;
+        }
+        h2 {
+            border: 2px solid #FFCC00;
+            background-color: #FFF7EE;
+            padding: 2px 5px;
+	     font-family: Verdana, Arial, Helvetica
+            font-size: 180%;
+        }
+        h3 {
+            border: 2px solid #FFCC00;
+            background-color: #FFF7EE;
+            padding: 2px 5px;
+        }
+        .header{
+            border: 1px solid #CCCCCC;
+        }
+        .headerlinks {
+            padding: 7px;
+            background-color: #CCCCCC;
+            border: 0px solid #FF0000;
+            font-size: 120%;
+        }
+ </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" style="border:0px solid #FF0000" border="0"  summary="banner">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+          SciTE Lua scripting of edit and output panes using Scintilla API</font></a>
+        </td>
+      </tr>
+    </table>
+	<h1>Scintilla API calls</h1>
+	<p>Both the edit and output panes are Scintilla controls and can be scripted using Scintilla's API.</p>
+	<p>The API is presented here as it is called from Lua for the edit pane. All of the same features
+	are available for the output pane by substituting 'output' for 'editor'.</p>
+	<p>In Lua methods are called with the ':' operator and properties accessed with the '.' operator.
+	Properties are both readable and writeable by default and are otherwise marked "read-only" or "write-only".</p>
+	<p>The 'position' and 'line' types are integer types that represent positions and line numbers in the document.
+	On 32-bit systems the maximum value is 2,147,483,647 but on 64-bit systems larger values are possible.</p>
+	<p>The 'pointer' type is a memory address. It is difficult to use this type from Lua but its possible it could be
+	passed back to Scintilla or to an extension written in C.</p>
+
+<!--++Autogenerated -->
+	<h2>Text retrieval and modification</h2>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETTEXT'>GetText</a>()<span class="comment"> -- Retrieve all the text in the document. Returns number of characters retrieved. Result is NUL-terminated.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTEXT'>SetText</a>(string text)<span class="comment"> -- Replace the contents of the document with the argument text.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSAVEPOINT'>SetSavePoint</a>()<span class="comment"> -- Remember the current position in the undo history as the position at which the document was saved.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINE'>GetLine</a>(line line)<span class="comment"> -- Retrieve the contents of a line. Returns the length of the line.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REPLACESEL'>ReplaceSel</a>(string text)<span class="comment"> -- Replace the selected text with the argument text.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETREADONLY'>ReadOnly</a><span class="comment"> -- Set to read only or read write.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATE'>Allocate</a>(position bytes)<span class="comment"> -- Enlarge the document to a particular size of text bytes.</span></p>
+	<p>line editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATELINES'>AllocateLines</a> write-only<span class="comment"> -- Enlarge the number of lines allocated.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ADDTEXT'>AddText</a>(string text)<span class="comment"> -- Add text to the document at current position.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_APPENDTEXT'>AppendText</a>(string text)<span class="comment"> -- Append a string to the end of the document without changing the selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INSERTTEXT'>InsertText</a>(position pos, string text)<span class="comment"> -- Insert string at a position.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CHANGEINSERTION'>ChangeInsertion</a>(string text)<span class="comment"> -- Change the text that is being inserted in response to SC_MOD_INSERTCHECK</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARALL'>ClearAll</a>()<span class="comment"> -- Delete all text in the document.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DELETERANGE'>DeleteRange</a>(position start, position lengthDelete)<span class="comment"> -- Delete a range of text in the document.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARDOCUMENTSTYLE'>ClearDocumentStyle</a>()<span class="comment"> -- Set all style bytes to 0, remove all folding information.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETCHARAT'>CharAt</a>[position pos] read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSTYLEAT'>StyleAt</a>[position pos] read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RELEASEALLEXTENDEDSTYLES'>ReleaseAllExtendedStyles</a>()<span class="comment"> -- Release all extended (>255) style numbers</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATEEXTENDEDSTYLES'>AllocateExtendedStyles</a>(int numberStyles)<span class="comment"> -- Allocate some extended (>255) style numbers and return the start of the range</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TARGETASUTF8'>TargetAsUTF8</a>()<span class="comment"> -- Returns the target converted to UTF8. Return the length in bytes.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ENCODEDFROMUTF8'>EncodedFromUTF8</a>(string utf8)<span class="comment"> -- Translates a UTF8 string into the document encoding. Return the length of the result in bytes. On error return 0.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETLENGTHFORENCODE'>SetLengthForEncode</a>(position bytes)<span class="comment"> -- Set the length of the utf8 argument for calling EncodedFromUTF8. Set to -1 and the string will be measured to the first nul.</span></p>
+	<h2>Searching</h2>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTARGETSTART'>TargetStart</a><span class="comment"> -- Sets the position that starts the target which is used for updating the document without affecting the scroll position.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTARGETSTARTVIRTUALSPACE'>TargetStartVirtualSpace</a><span class="comment"> -- Sets the virtual space of the target start</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTARGETEND'>TargetEnd</a><span class="comment"> -- Sets the position that ends the target which is used for updating the document without affecting the scroll position.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTARGETENDVIRTUALSPACE'>TargetEndVirtualSpace</a><span class="comment"> -- Sets the virtual space of the target end</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTARGETRANGE'>SetTargetRange</a>(position start, position end)<span class="comment"> -- Sets both the start and end of the target in one call.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TARGETFROMSELECTION'>TargetFromSelection</a>()<span class="comment"> -- Make the target range start and end be the same as the selection range start and end.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TARGETWHOLEDOCUMENT'>TargetWholeDocument</a>()<span class="comment"> -- Sets the target to the whole document.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSEARCHFLAGS'>SearchFlags</a><span class="comment"> -- Set the search flags used by SearchInTarget.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SEARCHINTARGET'>SearchInTarget</a>(string text)<span class="comment"> -- Search for a counted string in the target and set the target to the found range. Text is counted so it can contain NULs. Returns start of found range or -1 for failure in which case target is not moved.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETTARGETTEXT'>TargetText</a> read-only</p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REPLACETARGET'>ReplaceTarget</a>(string text)<span class="comment"> -- Replace the target text with the argument text. Text is counted so it can contain NULs. Returns the length of the replacement text.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REPLACETARGETRE'>ReplaceTargetRE</a>(string text)<span class="comment"> -- Replace the target text with the argument text after \d processing. Text is counted so it can contain NULs. Looks for \d where d is between 1 and 9 and replaces these with the strings matched in the last search operation which were surrounded by \( and \). Returns the length of the replacement text including any change caused by processing the \d patterns.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETTAG'>Tag</a>[int tagNumber] read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SEARCHANCHOR'>SearchAnchor</a>()<span class="comment"> -- Sets the current caret position to be the search anchor.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SEARCHNEXT'>SearchNext</a>(int searchFlags, string text)<span class="comment"> -- Find some text starting at the search anchor. Does not ensure the selection is visible.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SEARCHPREV'>SearchPrev</a>(int searchFlags, string text)<span class="comment"> -- Find some text starting at the search anchor and moving backwards. Does not ensure the selection is visible.</span></p>
+	<h2>Overtype</h2>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETOVERTYPE'>Overtype</a><span class="comment"> -- Set to overtype (true) or insert mode.</span></p>
+	<h2>Cut, copy and paste</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CUT'>Cut</a>()<span class="comment"> -- Cut the selection to the clipboard.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COPY'>Copy</a>()<span class="comment"> -- Copy the selection to the clipboard.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_PASTE'>Paste</a>()<span class="comment"> -- Paste the contents of the clipboard into the document replacing the selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEAR'>Clear</a>()<span class="comment"> -- Clear the selection.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CANPASTE'>CanPaste</a>()<span class="comment"> -- Will a paste succeed?</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COPYALLOWLINE'>CopyAllowLine</a>()<span class="comment"> -- Copy the selection, if selection empty copy the line with the caret</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COPYRANGE'>CopyRange</a>(position start, position end)<span class="comment"> -- Copy a range of text to the clipboard. Positions are clipped into the document.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COPYTEXT'>CopyText</a>(string text)<span class="comment"> -- Copy argument text to the clipboard.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPASTECONVERTENDINGS'>PasteConvertEndings</a><span class="comment"> -- Enable/Disable convert-on-paste for line endings</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REPLACERECTANGULAR'>ReplaceRectangular</a>(string text)<span class="comment"> -- Replace the selection with text like a rectangular paste.</span></p>
+	<h2>Error handling</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSTATUS'>Status</a><span class="comment"> -- Change error status - 0 = OK.</span></p>
+	<h2>Undo and Redo</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_UNDO'>Undo</a>()<span class="comment"> -- Undo one action in the undo history.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CANUNDO'>CanUndo</a>()<span class="comment"> -- Are there any undoable actions in the undo history?</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REDO'>Redo</a>()<span class="comment"> -- Redoes the next action on the undo history.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CANREDO'>CanRedo</a>()<span class="comment"> -- Are there any redoable actions in the undo history?</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EMPTYUNDOBUFFER'>EmptyUndoBuffer</a>()<span class="comment"> -- Delete the undo history.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETUNDOCOLLECTION'>UndoCollection</a><span class="comment"> -- Choose between collecting actions into the undo history and discarding them.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BEGINUNDOACTION'>BeginUndoAction</a>()<span class="comment"> -- Start a sequence of actions that is undone and redone as a unit. May be nested.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ENDUNDOACTION'>EndUndoAction</a>()<span class="comment"> -- End a sequence of actions that is undone and redone as a unit.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ADDUNDOACTION'>AddUndoAction</a>(int token, int flags)<span class="comment"> -- Add a container action to the undo stack</span></p>
+	<h2>Selection and information</h2>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETTEXTLENGTH'>TextLength</a> read-only</p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLENGTH'>Length</a> read-only</p>
+	<p>line editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINECOUNT'>LineCount</a> read-only</p>
+	<p>line editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINESONSCREEN'>LinesOnScreen</a> read-only</p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETMODIFY'>Modify</a> read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSEL'>SetSel</a>(position anchor, position caret)<span class="comment"> -- Select a range of text.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GOTOPOS'>GotoPos</a>(position caret)<span class="comment"> -- Set caret to a position and ensure it is visible.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GOTOLINE'>GotoLine</a>(line line)<span class="comment"> -- Set caret to start of a line and ensure it is visible.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCURRENTPOS'>CurrentPos</a><span class="comment"> -- Sets the position of the caret.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETANCHOR'>Anchor</a><span class="comment"> -- Set the selection anchor to a position. The anchor is the opposite end of the selection from the caret.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONSTART'>SelectionStart</a><span class="comment"> -- Sets the position that starts the selection - this becomes the anchor.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONEND'>SelectionEnd</a><span class="comment"> -- Sets the position that ends the selection - this becomes the caret.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEMPTYSELECTION'>SetEmptySelection</a>(position caret)<span class="comment"> -- Set caret to a position, while removing any existing selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SELECTALL'>SelectAll</a>()<span class="comment"> -- Select all the text in the document.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINEFROMPOSITION'>LineFromPosition</a>(position pos)<span class="comment"> -- Retrieve the line containing a position.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONFROMLINE'>PositionFromLine</a>(line line)<span class="comment"> -- Retrieve the position at the start of a line.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINEENDPOSITION'>LineEndPosition</a>[line line] read-only</p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINELENGTH'>LineLength</a>(line line)<span class="comment"> -- How many characters are on a line, including end of line characters?</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSELTEXT'>GetSelText</a>()<span class="comment"> -- Retrieve the selected text. Return the length of the text. Result is NUL-terminated.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETCURLINE'>GetCurLine</a>()<span class="comment"> -- Retrieve the text of the line containing the caret. Returns the index of the caret on the line. Result is NUL-terminated.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SELECTIONISRECTANGLE'>SelectionIsRectangle</a> read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONMODE'>SelectionMode</a><span class="comment"> -- Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or by lines (SC_SEL_LINES).</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETMOVEEXTENDSSELECTION'>MoveExtendsSelection</a> read-only</p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINESELSTARTPOSITION'>GetLineSelStartPosition</a>(line line)<span class="comment"> -- Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINESELENDPOSITION'>GetLineSelEndPosition</a>(line line)<span class="comment"> -- Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVECARETINSIDEVIEW'>MoveCaretInsideView</a>()<span class="comment"> -- Move the caret inside current view if it's not there already.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONBEFORE'>PositionBefore</a>(position pos)<span class="comment"> -- Given a valid document position, return the previous position taking code page into account. Returns 0 if passed 0.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONAFTER'>PositionAfter</a>(position pos)<span class="comment"> -- Given a valid document position, return the next position taking code page into account. Maximum value returned is the last position in the document.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TEXTWIDTH'>TextWidth</a>(int style, string text)<span class="comment"> -- Measure the pixel width of some text in a particular style. NUL terminated text argument. Does not handle tab or control characters.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TEXTHEIGHT'>TextHeight</a>(line line)<span class="comment"> -- Retrieve the height of a particular line of text in pixels.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETCOLUMN'>Column</a>[position pos] read-only</p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FINDCOLUMN'>FindColumn</a>(line line, position column)<span class="comment"> -- Find the position of a column on a line taking into account tabs and multi-byte characters. If beyond end of line, return line end position.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONFROMPOINT'>PositionFromPoint</a>(int x, int y)<span class="comment"> -- Find the position from a point within the window.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONFROMPOINTCLOSE'>PositionFromPointClose</a>(int x, int y)<span class="comment"> -- Find the position from a point within the window but return INVALID_POSITION if not close to text.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CHARPOSITIONFROMPOINT'>CharPositionFromPoint</a>(int x, int y)<span class="comment"> -- Find the position of a character from a point within the window.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CHARPOSITIONFROMPOINTCLOSE'>CharPositionFromPointClose</a>(int x, int y)<span class="comment"> -- Find the position of a character from a point within the window. Return INVALID_POSITION if not close to text.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POINTXFROMPOSITION'>PointXFromPosition</a>(position pos)<span class="comment"> -- Retrieve the x value of the point in the window where a position is displayed.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POINTYFROMPOSITION'>PointYFromPosition</a>(position pos)<span class="comment"> -- Retrieve the y value of the point in the window where a position is displayed.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_HIDESELECTION'>HideSelection</a>(bool hide)<span class="comment"> -- Draw the selection either highlighted or in normal (non-highlighted) style.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CHOOSECARETX'>ChooseCaretX</a>()<span class="comment"> -- Set the last x chosen value to be the caret x position.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVESELECTEDLINESUP'>MoveSelectedLinesUp</a>()<span class="comment"> -- Move the selected lines up one line, shifting the line above after the selection</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVESELECTEDLINESDOWN'>MoveSelectedLinesDown</a>()<span class="comment"> -- Move the selected lines down one line, shifting the line below before the selection</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMOUSESELECTIONRECTANGULARSWITCH'>MouseSelectionRectangularSwitch</a><span class="comment"> -- Set whether switching to rectangular mode while selecting with the mouse is allowed.</span></p>
+	<h2>By character or UTF-16 code unit</h2>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONRELATIVE'>PositionRelative</a>(position pos, position relative)<span class="comment"> -- Given a valid document position, return a position that differs in a number of characters. Returned value is always between 0 and last position in document.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COUNTCHARACTERS'>CountCharacters</a>(position start, position end)<span class="comment"> -- Count characters between two positions.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONRELATIVECODEUNITS'>PositionRelativeCodeUnits</a>(position pos, position relative)<span class="comment"> -- Given a valid document position, return a position that differs in a number of UTF-16 code units. Returned value is always between 0 and last position in document. The result may point half way (2 bytes) inside a non-BMP character.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COUNTCODEUNITS'>CountCodeUnits</a>(position start, position end)<span class="comment"> -- Count code units between two positions.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINECHARACTERINDEX'>LineCharacterIndex</a> read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATELINECHARACTERINDEX'>AllocateLineCharacterIndex</a>(int lineCharacterIndex)<span class="comment"> -- Request line character index be created or its use count increased.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RELEASELINECHARACTERINDEX'>ReleaseLineCharacterIndex</a>(int lineCharacterIndex)<span class="comment"> -- Decrease use count of line character index and remove if 0.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINEFROMINDEXPOSITION'>LineFromIndexPosition</a>(position pos, int lineCharacterIndex)<span class="comment"> -- Retrieve the document line containing a position measured in index units.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDEXPOSITIONFROMLINE'>IndexPositionFromLine</a>(line line, int lineCharacterIndex)<span class="comment"> -- Retrieve the position measured in index units at the start of a document line.</span></p>
+	<h2>Multiple Selection and Virtual Space</h2>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMULTIPLESELECTION'>MultipleSelection</a><span class="comment"> -- Set whether multiple selections can be made</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALSELECTIONTYPING'>AdditionalSelectionTyping</a><span class="comment"> -- Set whether typing can be performed into multiple selections</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMULTIPASTE'>MultiPaste</a><span class="comment"> -- Change the effect of pasting when there are multiple selections.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETVIRTUALSPACEOPTIONS'>VirtualSpaceOptions</a><span class="comment"> -- Set options for virtual space behaviour.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETRECTANGULARSELECTIONMODIFIER'>RectangularSelectionModifier</a><span class="comment"> -- On GTK, allow selecting the modifier key to use for mouse-based rectangular selection. Often the window manager requires Alt+Mouse Drag for moving windows. Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSELECTIONS'>Selections</a> read-only</p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSELECTIONEMPTY'>SelectionEmpty</a> read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARSELECTIONS'>ClearSelections</a>()<span class="comment"> -- Clear selections to a single empty stream selection</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTION'>SetSelection</a>(position caret, position anchor)<span class="comment"> -- Set a simple selection</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ADDSELECTION'>AddSelection</a>(position caret, position anchor)<span class="comment"> -- Add a selection</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DROPSELECTIONN'>DropSelectionN</a>(int selection)<span class="comment"> -- Drop one selection</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMAINSELECTION'>MainSelection</a><span class="comment"> -- Set the main selection</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNCARET'>SelectionNCaret</a>[int selection]<span class="comment"> -- Set the caret position of the nth selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNCARETVIRTUALSPACE'>SelectionNCaretVirtualSpace</a>[int selection]<span class="comment"> -- Set the virtual space of the caret of the nth selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNANCHOR'>SelectionNAnchor</a>[int selection]<span class="comment"> -- Set the anchor position of the nth selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNANCHORVIRTUALSPACE'>SelectionNAnchorVirtualSpace</a>[int selection]<span class="comment"> -- Set the virtual space of the anchor of the nth selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNSTART'>SelectionNStart</a>[int selection]<span class="comment"> -- Sets the position that starts the selection - this becomes the anchor.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSELECTIONNSTARTVIRTUALSPACE'>SelectionNStartVirtualSpace</a>[int selection] read-only</p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONNEND'>SelectionNEnd</a>[int selection]<span class="comment"> -- Sets the position that ends the selection - this becomes the currentPosition.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSELECTIONNENDVIRTUALSPACE'>SelectionNEndVirtualSpace</a>[int selection] read-only</p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETRECTANGULARSELECTIONCARET'>RectangularSelectionCaret</a><span class="comment"> -- Set the caret position of the rectangular selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE'>RectangularSelectionCaretVirtualSpace</a><span class="comment"> -- Set the virtual space of the caret of the rectangular selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETRECTANGULARSELECTIONANCHOR'>RectangularSelectionAnchor</a><span class="comment"> -- Set the anchor position of the rectangular selection.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE'>RectangularSelectionAnchorVirtualSpace</a><span class="comment"> -- Set the virtual space of the anchor of the rectangular selection.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALSELALPHA'>AdditionalSelAlpha</a><span class="comment"> -- Set the alpha of the selection.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALSELFORE'>AdditionalSelFore</a> write-only<span class="comment"> -- Set the foreground colour of additional selections. Must have previously called SetSelFore with non-zero first argument for this to have an effect.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALSELBACK'>AdditionalSelBack</a> write-only<span class="comment"> -- Set the background colour of additional selections. Must have previously called SetSelBack with non-zero first argument for this to have an effect.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALCARETFORE'>AdditionalCaretFore</a><span class="comment"> -- Set the foreground colour of additional carets.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALCARETSBLINK'>AdditionalCaretsBlink</a><span class="comment"> -- Set whether additional carets will blink</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALCARETSVISIBLE'>AdditionalCaretsVisible</a><span class="comment"> -- Set whether additional carets are visible</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SWAPMAINANCHORCARET'>SwapMainAnchorCaret</a>()<span class="comment"> -- Swap that caret and anchor of the main selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ROTATESELECTION'>RotateSelection</a>()<span class="comment"> -- Set the main selection to the next selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MULTIPLESELECTADDNEXT'>MultipleSelectAddNext</a>()<span class="comment"> -- Add the next occurrence of the main selection to the set of selections as main. If the current selection is empty then select word around caret.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MULTIPLESELECTADDEACH'>MultipleSelectAddEach</a>()<span class="comment"> -- Add each occurrence of the main selection in the target to the set of selections. If the current selection is empty then select word around caret.</span></p>
+	<h2>Scrolling and automatic scrolling</h2>
+	<p>line editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFIRSTVISIBLELINE'>FirstVisibleLine</a><span class="comment"> -- Scroll so that a display line is at the top of the display.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETXOFFSET'>XOffset</a><span class="comment"> -- Set the xOffset (ie, horizontal scroll position).</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINESCROLL'>LineScroll</a>(position columns, line lines)<span class="comment"> -- Scroll horizontally and vertically.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SCROLLCARET'>ScrollCaret</a>()<span class="comment"> -- Ensure the caret is visible.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SCROLLRANGE'>ScrollRange</a>(position secondary, position primary)<span class="comment"> -- Scroll the argument positions and the range between them into view giving priority to the primary position then the secondary position. This may be used to make a search match visible.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETXCARETPOLICY'>SetXCaretPolicy</a>(int caretPolicy, int caretSlop)<span class="comment"> -- Set the way the caret is kept visible when going sideways. The exclusion zone is given in pixels.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETYCARETPOLICY'>SetYCaretPolicy</a>(int caretPolicy, int caretSlop)<span class="comment"> -- Set the way the line the caret is on is kept visible. The exclusion zone is given in lines.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETVISIBLEPOLICY'>SetVisiblePolicy</a>(int visiblePolicy, int visibleSlop)<span class="comment"> -- Set the way the display area is determined when a particular line is to be moved to by Find, FindNext, GotoLine, etc.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHSCROLLBAR'>HScrollBar</a><span class="comment"> -- Show or hide the horizontal scroll bar.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETVSCROLLBAR'>VScrollBar</a><span class="comment"> -- Show or hide the vertical scroll bar.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSCROLLWIDTH'>ScrollWidth</a><span class="comment"> -- Sets the document width assumed for scrolling.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSCROLLWIDTHTRACKING'>ScrollWidthTracking</a><span class="comment"> -- Sets whether the maximum width line displayed is used to set scroll width.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETENDATLASTLINE'>EndAtLastLine</a><span class="comment"> -- Sets the scroll range so that maximum scroll position has the last line at the bottom of the view (default). Setting this to false allows scrolling one page below the last line.</span></p>
+	<h2>White space</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETVIEWWS'>ViewWS</a><span class="comment"> -- Make white space characters invisible, always visible or visible outside indentation.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWHITESPACEFORE'>SetWhitespaceFore</a>(bool useSetting, colour fore)<span class="comment"> -- Set the foreground colour of all whitespace and whether to use this setting.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWHITESPACEBACK'>SetWhitespaceBack</a>(bool useSetting, colour back)<span class="comment"> -- Set the background colour of all whitespace and whether to use this setting.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWHITESPACESIZE'>WhitespaceSize</a><span class="comment"> -- Set the size of the dots used to mark space characters.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTABDRAWMODE'>TabDrawMode</a><span class="comment"> -- Set how tabs are drawn when visible.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEXTRAASCENT'>ExtraAscent</a><span class="comment"> -- Set extra ascent for each line</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEXTRADESCENT'>ExtraDescent</a><span class="comment"> -- Set extra descent for each line</span></p>
+	<h2>Cursor</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCURSOR'>Cursor</a><span class="comment"> -- Sets the cursor to one of the SC_CURSOR* values.</span></p>
+	<h2>Mouse capture</h2>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMOUSEDOWNCAPTURES'>MouseDownCaptures</a><span class="comment"> -- Set whether the mouse is captured when its button is pressed.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMOUSEWHEELCAPTURES'>MouseWheelCaptures</a><span class="comment"> -- Set whether the mouse wheel can be active outside the window.</span></p>
+	<h2>Line endings</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEOLMODE'>EOLMode</a><span class="comment"> -- Set the current end of line mode.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CONVERTEOLS'>ConvertEOLs</a>(int eolMode)<span class="comment"> -- Convert all line endings in the document to one mode.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETVIEWEOL'>ViewEOL</a><span class="comment"> -- Make the end of line characters visible or invisible.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINEENDTYPESSUPPORTED'>LineEndTypesSupported</a> read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETLINEENDTYPESALLOWED'>LineEndTypesAllowed</a><span class="comment"> -- Set the line end types that the application wants to use. May not be used if incompatible with lexer or encoding.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINEENDTYPESACTIVE'>LineEndTypesActive</a> read-only</p>
+	<h2>Words</h2>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_WORDENDPOSITION'>WordEndPosition</a>(position pos, bool onlyWordCharacters)<span class="comment"> -- Get position of end of word.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_WORDSTARTPOSITION'>WordStartPosition</a>(position pos, bool onlyWordCharacters)<span class="comment"> -- Get position of start of word.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ISRANGEWORD'>IsRangeWord</a>(position start, position end)<span class="comment"> -- Is the range start..end considered a word?</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWORDCHARS'>WordChars</a><span class="comment"> -- Set the set of characters making up words for when moving or selecting by word. First sets defaults like SetCharsDefault.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWHITESPACECHARS'>WhitespaceChars</a><span class="comment"> -- Set the set of characters making up whitespace for when moving or selecting by word. Should be called after SetWordChars.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPUNCTUATIONCHARS'>PunctuationChars</a><span class="comment"> -- Set the set of characters making up punctuation characters Should be called after SetWordChars.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCHARSDEFAULT'>SetCharsDefault</a>()<span class="comment"> -- Reset the set of characters for whitespace and word characters to the defaults.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCHARACTERCATEGORYOPTIMIZATION'>CharacterCategoryOptimization</a><span class="comment"> -- Set the number of characters to have directly indexed categories</span></p>
+	<h2>Styling</h2>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETENDSTYLED'>EndStyled</a> read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STARTSTYLING'>StartStyling</a>(position start, int unused)<span class="comment"> -- Set the current styling position to start. The unused parameter is no longer used and should be set to 0.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSTYLING'>SetStyling</a>(position length, int style)<span class="comment"> -- Change style from current styling position for length characters to a style and move the current styling position to after this newly styled segment.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSTYLINGEX'>SetStylingEx</a>(string styles)<span class="comment"> -- Set the styles for a segment of the document.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETIDLESTYLING'>IdleStyling</a><span class="comment"> -- Sets limits to idle styling.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETLINESTATE'>LineState</a>[line line]<span class="comment"> -- Used to hold extra styling information for each line.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETMAXLINESTATE'>MaxLineState</a> read-only</p>
+	<h2>Style definition</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLERESETDEFAULT'>StyleResetDefault</a>()<span class="comment"> -- Reset the default style to its state at startup</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLECLEARALL'>StyleClearAll</a>()<span class="comment"> -- Clear all the styles and make equivalent to the global default style.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETFONT'>StyleFont</a>[int style]<span class="comment"> -- Set the font of a style.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETSIZE'>StyleSize</a>[int style]<span class="comment"> -- Set the size of characters of a style.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETSIZEFRACTIONAL'>StyleSizeFractional</a>[int style]<span class="comment"> -- Set the size of characters of a style. Size is in points multiplied by 100.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETBOLD'>StyleBold</a>[int style]<span class="comment"> -- Set a style to be bold or not.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETWEIGHT'>StyleWeight</a>[int style]<span class="comment"> -- Set the weight of characters of a style.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETITALIC'>StyleItalic</a>[int style]<span class="comment"> -- Set a style to be italic or not.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETUNDERLINE'>StyleUnderline</a>[int style]<span class="comment"> -- Set a style to be underlined or not.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETFORE'>StyleFore</a>[int style]<span class="comment"> -- Set the foreground colour of a style.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETBACK'>StyleBack</a>[int style]<span class="comment"> -- Set the background colour of a style.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETEOLFILLED'>StyleEOLFilled</a>[int style]<span class="comment"> -- Set a style to have its end of line filled or not.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETCHARACTERSET'>StyleCharacterSet</a>[int style]<span class="comment"> -- Set the character set of the font in a style.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETCASE'>StyleCase</a>[int style]<span class="comment"> -- Set a style to be mixed case, or to force upper or lower case.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETVISIBLE'>StyleVisible</a>[int style]<span class="comment"> -- Set a style to be visible or not.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETCHANGEABLE'>StyleChangeable</a>[int style]<span class="comment"> -- Set a style to be changeable or not (read only). Experimental feature, currently buggy.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETHOTSPOT'>StyleHotSpot</a>[int style]<span class="comment"> -- Set a style to be a hotspot or not.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFONTLOCALE'>FontLocale</a><span class="comment"> -- Set the locale for displaying text.</span></p>
+	<h2>Element colours</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETELEMENTCOLOUR'>SetElementColour</a>(int element, colouralpha colourElement)<span class="comment"> -- Set the colour of an element. Translucency (alpha) may or may not be significant and this may depend on the platform. The alpha byte should commonly be 0xff for opaque.</span></p>
+	<p>colouralpha editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETELEMENTCOLOUR'>GetElementColour</a>(int element)<span class="comment"> -- Get the colour of an element.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RESETELEMENTCOLOUR'>ResetElementColour</a>(int element)<span class="comment"> -- Use the default or platform-defined colour for an element.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETELEMENTISSET'>GetElementIsSet</a>(int element)<span class="comment"> -- Get whether an element has been set by SetElementColour. When false, a platform-defined or default colour is used.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETELEMENTALLOWSTRANSLUCENT'>GetElementAllowsTranslucent</a>(int element)<span class="comment"> -- Get whether an element supports translucency.</span></p>
+	<p>colouralpha editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETELEMENTBASECOLOUR'>GetElementBaseColour</a>(int element)<span class="comment"> -- Get the colour of an element.</span></p>
+	<h2>Selection, caret, and hotspot styles</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELFORE'>SetSelFore</a>(bool useSetting, colour fore)<span class="comment"> -- Set the foreground colour of the main and additional selections and whether to use this setting.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELBACK'>SetSelBack</a>(bool useSetting, colour back)<span class="comment"> -- Set the background colour of the main and additional selections and whether to use this setting.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELECTIONLAYER'>SelectionLayer</a><span class="comment"> -- Set the layer for drawing selections: either opaquely on base layer or translucently over text</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELALPHA'>SelAlpha</a><span class="comment"> -- Set the alpha of the selection.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETSELEOLFILLED'>SelEOLFilled</a><span class="comment"> -- Set the selection to have its end of line filled or not.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETFORE'>CaretFore</a><span class="comment"> -- Set the foreground colour of the caret.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINELAYER'>CaretLineLayer</a><span class="comment"> -- Set the layer of the background of the line containing the caret.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINEVISIBLE'>CaretLineVisible</a><span class="comment"> -- Display the background of the line containing the caret in a different colour.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINEBACK'>CaretLineBack</a><span class="comment"> -- Set the colour of the background of the line containing the caret.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINEBACKALPHA'>CaretLineBackAlpha</a><span class="comment"> -- Set background alpha of the caret line.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINEFRAME'>CaretLineFrame</a><span class="comment"> -- Display the caret line framed. Set width != 0 to enable this option and width = 0 to disable it.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETLINEVISIBLEALWAYS'>CaretLineVisibleAlways</a><span class="comment"> -- Sets the caret line to always visible.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETPERIOD'>CaretPeriod</a><span class="comment"> -- Get the time in milliseconds that the caret is on and off. 0 = steady on.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETSTYLE'>CaretStyle</a><span class="comment"> -- Set the style of the caret to be drawn.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETWIDTH'>CaretWidth</a><span class="comment"> -- Set the width of the insert mode caret.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETSTICKY'>CaretSticky</a><span class="comment"> -- Stop the caret preferred x position changing when the user types.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TOGGLECARETSTICKY'>ToggleCaretSticky</a>()<span class="comment"> -- Switch between sticky and non-sticky: meant to be bound to a key.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHOTSPOTACTIVEFORE'>SetHotspotActiveFore</a>(bool useSetting, colour fore)<span class="comment"> -- Set a fore colour for active hotspots.</span></p>
+	<p>colour editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETHOTSPOTACTIVEFORE'>GetHotspotActiveFore</a>()<span class="comment"> -- Get the fore colour for active hotspots.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHOTSPOTACTIVEBACK'>SetHotspotActiveBack</a>(bool useSetting, colour back)<span class="comment"> -- Set a back colour for active hotspots.</span></p>
+	<p>colour editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETHOTSPOTACTIVEBACK'>GetHotspotActiveBack</a>()<span class="comment"> -- Get the back colour for active hotspots.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHOTSPOTACTIVEUNDERLINE'>HotspotActiveUnderline</a><span class="comment"> -- Enable / Disable underlining active hotspots.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHOTSPOTSINGLELINE'>HotspotSingleLine</a><span class="comment"> -- Limit hotspots to single line so hotspots on two lines don't merge.</span></p>
+	<h2>Character representations</h2>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETREPRESENTATION'>Representation</a>[string encodedCharacter]<span class="comment"> -- Set the way a character is drawn.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARREPRESENTATION'>ClearRepresentation</a>(string encodedCharacter)<span class="comment"> -- Remove a character representation.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARALLREPRESENTATIONS'>ClearAllRepresentations</a>()<span class="comment"> -- Clear representations to default.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETREPRESENTATIONAPPEARANCE'>RepresentationAppearance</a>[string encodedCharacter]<span class="comment"> -- Set the appearance of a representation.</span></p>
+	<p>colouralpha editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETREPRESENTATIONCOLOUR'>RepresentationColour</a>[string encodedCharacter]<span class="comment"> -- Set the colour of a representation.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCONTROLCHARSYMBOL'>ControlCharSymbol</a><span class="comment"> -- Change the way control characters are displayed: If symbol is &lt; 32, keep the drawn way, else, use the given character.</span></p>
+	<h2>Margins</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINS'>Margins</a><span class="comment"> -- Allocate a non-standard number of margins.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINTYPEN'>MarginTypeN</a>[int margin]<span class="comment"> -- Set a margin to be either numeric or symbolic.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINWIDTHN'>MarginWidthN</a>[int margin]<span class="comment"> -- Set the width of a margin to a width expressed in pixels.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINMASKN'>MarginMaskN</a>[int margin]<span class="comment"> -- Set a mask that determines which markers are displayed in a margin.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINSENSITIVEN'>MarginSensitiveN</a>[int margin]<span class="comment"> -- Make a margin sensitive or insensitive to mouse clicks.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINCURSORN'>MarginCursorN</a>[int margin]<span class="comment"> -- Set the cursor shown when the mouse is inside a margin.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINBACKN'>MarginBackN</a>[int margin]<span class="comment"> -- Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINLEFT'>MarginLeft</a><span class="comment"> -- Sets the size in pixels of the left margin.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINRIGHT'>MarginRight</a><span class="comment"> -- Sets the size in pixels of the right margin.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOLDMARGINCOLOUR'>SetFoldMarginColour</a>(bool useSetting, colour back)<span class="comment"> -- Set one of the colours used as a chequerboard pattern in the fold margin</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOLDMARGINHICOLOUR'>SetFoldMarginHiColour</a>(bool useSetting, colour fore)<span class="comment"> -- Set the other colour used as a chequerboard pattern in the fold margin</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARGINSETTEXT'>MarginText</a>[line line]<span class="comment"> -- Set the text in the text margin for a line</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARGINSETSTYLE'>MarginStyle</a>[line line]<span class="comment"> -- Set the style number for the text margin for a line</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARGINSETSTYLES'>MarginStyles</a>[line line]<span class="comment"> -- Set the style in the text margin for a line</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARGINTEXTCLEARALL'>MarginTextClearAll</a>()<span class="comment"> -- Clear the margin text on all lines</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARGINSETSTYLEOFFSET'>MarginStyleOffset</a><span class="comment"> -- Get the start of the range of style numbers used for margin text</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMARGINOPTIONS'>MarginOptions</a><span class="comment"> -- Set the margin options.</span></p>
+	<h2>Annotations</h2>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONSETTEXT'>AnnotationText</a>[line line]<span class="comment"> -- Set the annotation text for a line</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONSETSTYLE'>AnnotationStyle</a>[line line]<span class="comment"> -- Set the style number for the annotations for a line</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONSETSTYLES'>AnnotationStyles</a>[line line]<span class="comment"> -- Set the annotation styles for a line</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONGETLINES'>AnnotationLines</a>[line line] read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONCLEARALL'>AnnotationClearAll</a>()<span class="comment"> -- Clear the annotations from all lines</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONSETVISIBLE'>AnnotationVisible</a><span class="comment"> -- Set the visibility for the annotations for a view</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ANNOTATIONSETSTYLEOFFSET'>AnnotationStyleOffset</a><span class="comment"> -- Get the start of the range of style numbers used for annotations</span></p>
+	<h2>End of Line Annotations</h2>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EOLANNOTATIONSETTEXT'>EOLAnnotationText</a>[line line]<span class="comment"> -- Set the end of line annotation text for a line</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EOLANNOTATIONSETSTYLE'>EOLAnnotationStyle</a>[line line]<span class="comment"> -- Set the style number for the end of line annotations for a line</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EOLANNOTATIONCLEARALL'>EOLAnnotationClearAll</a>()<span class="comment"> -- Clear the end of annotations from all lines</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EOLANNOTATIONSETVISIBLE'>EOLAnnotationVisible</a><span class="comment"> -- Set the visibility for the end of line annotations for a view</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EOLANNOTATIONSETSTYLEOFFSET'>EOLAnnotationStyleOffset</a><span class="comment"> -- Get the start of the range of style numbers used for end of line annotations</span></p>
+	<h2>Other settings</h2>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETBUFFEREDDRAW'>BufferedDraw</a><span class="comment"> -- If drawing is buffered then each line of text is drawn into a bitmap buffer before drawing it to the screen to avoid flicker.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPHASESDRAW'>PhasesDraw</a><span class="comment"> -- In one phase draw, text is drawn in a series of rectangular blocks with no overlap. In two phase draw, text is drawn in a series of lines allowing runs to overlap horizontally. In multiple phase draw, each element is drawn over the whole drawing area, allowing text to overlap from one line to the next.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTECHNOLOGY'>Technology</a><span class="comment"> -- Set the technology used.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFONTQUALITY'>FontQuality</a><span class="comment"> -- Choose the quality level for text from the FontQuality enumeration.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCODEPAGE'>CodePage</a><span class="comment"> -- Set the code page used to interpret the bytes of the document as characters. The SC_CP_UTF8 value can be used to enter Unicode mode.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETIMEINTERACTION'>IMEInteraction</a><span class="comment"> -- Choose to display the IME in a window or inline.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETBIDIRECTIONAL'>Bidirectional</a><span class="comment"> -- Set bidirectional text display state.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GRABFOCUS'>GrabFocus</a>()<span class="comment"> -- Set the focus to this Scintilla widget.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOCUS'>Focus</a><span class="comment"> -- Change internal focus flag.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SUPPORTSFEATURE'>SupportsFeature</a>(int feature)<span class="comment"> -- Get whether a feature is supported</span></p>
+	<h2>Brace highlighting</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEHIGHLIGHT'>BraceHighlight</a>(position posA, position posB)<span class="comment"> -- Highlight the characters at two positions.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEBADLIGHT'>BraceBadLight</a>(position pos)<span class="comment"> -- Highlight the character at a position indicating there is no matching brace.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEHIGHLIGHTINDICATOR'>BraceHighlightIndicator</a>(bool useSetting, int indicator)<span class="comment"> -- Use specified indicator to highlight matching braces instead of changing their style.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEBADLIGHTINDICATOR'>BraceBadLightIndicator</a>(bool useSetting, int indicator)<span class="comment"> -- Use specified indicator to highlight non matching brace instead of changing its style.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEMATCH'>BraceMatch</a>(position pos, int maxReStyle)<span class="comment"> -- Find the position of a matching brace or INVALID_POSITION if no match. The maxReStyle must be 0 for now. It may be defined in a future release.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_BRACEMATCHNEXT'>BraceMatchNext</a>(position pos, position startPos)<span class="comment"> -- Similar to BraceMatch, but matching starts at the explicit start position.</span></p>
+	<h2>Tabs and Indentation Guides</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTABMINIMUMWIDTH'>TabMinimumWidth</a><span class="comment"> -- Set the minimum visual width of a tab.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTABWIDTH'>TabWidth</a><span class="comment"> -- Change the visible size of a tab to be a multiple of the width of a space character.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARTABSTOPS'>ClearTabStops</a>(line line)<span class="comment"> -- Clear explicit tabstops on a line.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ADDTABSTOP'>AddTabStop</a>(line line, int x)<span class="comment"> -- Add an explicit tab stop for a line.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETNEXTTABSTOP'>GetNextTabStop</a>(line line, int x)<span class="comment"> -- Find the next explicit tab stop position on a line after a position.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETUSETABS'>UseTabs</a><span class="comment"> -- Indentation will only use space characters if useTabs is false, otherwise it will use a combination of tabs and spaces.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETINDENT'>Indent</a><span class="comment"> -- Set the number of spaces used for one level of indentation.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETTABINDENTS'>TabIndents</a><span class="comment"> -- Sets whether a tab pressed when caret is within indentation indents.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETBACKSPACEUNINDENTS'>BackSpaceUnIndents</a><span class="comment"> -- Sets whether a backspace pressed when caret is within indentation unindents.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETLINEINDENTATION'>LineIndentation</a>[line line]<span class="comment"> -- Change the indentation of a line to a number of columns.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINEINDENTPOSITION'>LineIndentPosition</a>[line line] read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETINDENTATIONGUIDES'>IndentationGuides</a><span class="comment"> -- Show or hide indentation guides.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETHIGHLIGHTGUIDE'>HighlightGuide</a><span class="comment"> -- Set the highlighted indentation guide column. 0 = no highlighted guide.</span></p>
+	<h2>Markers</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDEFINE'>MarkerDefine</a>(int markerNumber, int markerSymbol)<span class="comment"> -- Set the symbol used for a particular marker number.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDEFINEPIXMAP'>MarkerDefinePixmap</a>(int markerNumber, string pixmap)<span class="comment"> -- Define a marker from a pixmap.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RGBAIMAGESETWIDTH'>RGBAImageWidth</a> write-only<span class="comment"> -- Set the width for future RGBA image data.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RGBAIMAGESETHEIGHT'>RGBAImageHeight</a> write-only<span class="comment"> -- Set the height for future RGBA image data.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RGBAIMAGESETSCALE'>RGBAImageScale</a> write-only<span class="comment"> -- Set the scale factor in percent for future RGBA image data.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDEFINERGBAIMAGE'>MarkerDefineRGBAImage</a>(int markerNumber, string pixels)<span class="comment"> -- Define a marker from RGBA data. It has the width and height from RGBAImageSetWidth/Height</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSYMBOLDEFINED'>MarkerSymbolDefined</a>(int markerNumber)<span class="comment"> -- Which symbol was defined for markerNumber with MarkerDefine</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETFORE'>MarkerFore</a>[int markerNumber] write-only<span class="comment"> -- Set the foreground colour used for a particular marker number.</span></p>
+	<p>colouralpha editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETFORETRANSLUCENT'>MarkerForeTranslucent</a>[int markerNumber] write-only<span class="comment"> -- Set the foreground colour used for a particular marker number.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETBACK'>MarkerBack</a>[int markerNumber] write-only<span class="comment"> -- Set the background colour used for a particular marker number.</span></p>
+	<p>colouralpha editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETBACKTRANSLUCENT'>MarkerBackTranslucent</a>[int markerNumber] write-only<span class="comment"> -- Set the background colour used for a particular marker number.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETBACKSELECTED'>MarkerBackSelected</a>[int markerNumber] write-only<span class="comment"> -- Set the background colour used for a particular marker number when its folding block is selected.</span></p>
+	<p>colouralpha editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETBACKSELECTEDTRANSLUCENT'>MarkerBackSelectedTranslucent</a>[int markerNumber] write-only<span class="comment"> -- Set the background colour used for a particular marker number when its folding block is selected.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETSTROKEWIDTH'>MarkerStrokeWidth</a>[int markerNumber] write-only<span class="comment"> -- Set the width of strokes used in .01 pixels so 50  = 1/2 pixel width.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERENABLEHIGHLIGHT'>MarkerEnableHighlight</a>(bool enabled)<span class="comment"> -- Enable/disable highlight for current folding block (smallest one that contains the caret)</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETLAYER'>MarkerLayer</a>[int markerNumber]<span class="comment"> -- Set the layer used for a marker that is drawn in the text area, not the margin.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERSETALPHA'>MarkerAlpha</a>[int markerNumber] write-only<span class="comment"> -- Set the alpha used for a marker that is drawn in the text area, not the margin.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERADD'>MarkerAdd</a>(line line, int markerNumber)<span class="comment"> -- Add a marker to a line, returning an ID which can be used to find or delete the marker.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERADDSET'>MarkerAddSet</a>(line line, int markerSet)<span class="comment"> -- Add a set of markers to a line.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDELETE'>MarkerDelete</a>(line line, int markerNumber)<span class="comment"> -- Delete a marker from a line.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDELETEALL'>MarkerDeleteAll</a>(int markerNumber)<span class="comment"> -- Delete all markers with a particular number from all lines.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERGET'>MarkerGet</a>(line line)<span class="comment"> -- Get a bit mask of all the markers set on a line.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERNEXT'>MarkerNext</a>(line lineStart, int markerMask)<span class="comment"> -- Find the next line at or after lineStart that includes a marker in mask. Return -1 when no more lines.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERPREVIOUS'>MarkerPrevious</a>(line lineStart, int markerMask)<span class="comment"> -- Find the previous line before lineStart that includes a marker in mask.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERLINEFROMHANDLE'>MarkerLineFromHandle</a>(int markerHandle)<span class="comment"> -- Retrieve the line number at which a particular marker is located.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDELETEHANDLE'>MarkerDeleteHandle</a>(int markerHandle)<span class="comment"> -- Delete a marker.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERHANDLEFROMLINE'>MarkerHandleFromLine</a>(line line, int which)<span class="comment"> -- Retrieve marker handles of a line</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MARKERNUMBERFROMLINE'>MarkerNumberFromLine</a>(line line, int which)<span class="comment"> -- Retrieve marker number of a marker handle</span></p>
+	<h2>Indicators</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETSTYLE'>IndicStyle</a>[int indicator]<span class="comment"> -- Set an indicator to plain, squiggle or TT.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETFORE'>IndicFore</a>[int indicator]<span class="comment"> -- Set the foreground colour of an indicator.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETSTROKEWIDTH'>IndicStrokeWidth</a>[int indicator]<span class="comment"> -- Set the stroke width of an indicator in hundredths of a pixel.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETALPHA'>IndicAlpha</a>[int indicator]<span class="comment"> -- Set the alpha fill colour of the given indicator.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETOUTLINEALPHA'>IndicOutlineAlpha</a>[int indicator]<span class="comment"> -- Set the alpha outline colour of the given indicator.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETUNDER'>IndicUnder</a>[int indicator]<span class="comment"> -- Set an indicator to draw under text or over(default).</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETHOVERSTYLE'>IndicHoverStyle</a>[int indicator]<span class="comment"> -- Set a hover indicator to plain, squiggle or TT.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETHOVERFORE'>IndicHoverFore</a>[int indicator]<span class="comment"> -- Set the foreground hover colour of an indicator.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICSETFLAGS'>IndicFlags</a>[int indicator]<span class="comment"> -- Set the attributes of an indicator.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETINDICATORCURRENT'>IndicatorCurrent</a><span class="comment"> -- Set the indicator used for IndicatorFillRange and IndicatorClearRange</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETINDICATORVALUE'>IndicatorValue</a><span class="comment"> -- Set the value used for IndicatorFillRange</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATORFILLRANGE'>IndicatorFillRange</a>(position start, position lengthFill)<span class="comment"> -- Turn a indicator on over a range.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATORCLEARRANGE'>IndicatorClearRange</a>(position start, position lengthClear)<span class="comment"> -- Turn a indicator off over a range.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATORALLONFOR'>IndicatorAllOnFor</a>(position pos)<span class="comment"> -- Are any indicators present at pos?</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATORVALUEAT'>IndicatorValueAt</a>(int indicator, position pos)<span class="comment"> -- What value does a particular indicator have at a position?</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATORSTART'>IndicatorStart</a>(int indicator, position pos)<span class="comment"> -- Where does a particular indicator start?</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDICATOREND'>IndicatorEnd</a>(int indicator, position pos)<span class="comment"> -- Where does a particular indicator end?</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FINDINDICATORSHOW'>FindIndicatorShow</a>(position start, position end)<span class="comment"> -- On OS X, show a find indicator.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FINDINDICATORFLASH'>FindIndicatorFlash</a>(position start, position end)<span class="comment"> -- On OS X, flash a find indicator, then fade out.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FINDINDICATORHIDE'>FindIndicatorHide</a>()<span class="comment"> -- On OS X, hide the find indicator.</span></p>
+	<h2>Autocompletion</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSHOW'>AutoCShow</a>(position lengthEntered, string itemList)<span class="comment"> -- Display a auto-completion list. The lengthEntered parameter indicates how many characters before the caret should be used to provide context.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCCANCEL'>AutoCCancel</a>()<span class="comment"> -- Remove the auto-completion list from the screen.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCACTIVE'>AutoCActive</a>()<span class="comment"> -- Is there an auto-completion list visible?</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCPOSSTART'>AutoCPosStart</a>()<span class="comment"> -- Retrieve the position of the caret when the auto-completion list was displayed.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCCOMPLETE'>AutoCComplete</a>()<span class="comment"> -- User has selected an item so remove the list and insert the selection.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSTOPS'>AutoCStops</a>(string characterSet)<span class="comment"> -- Define a set of character that when typed cancel the auto-completion list.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETSEPARATOR'>AutoCSeparator</a><span class="comment"> -- Change the separator character in the string setting up an auto-completion list. Default is space but can be changed if items contain space.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSELECT'>AutoCSelect</a>(string select)<span class="comment"> -- Select the item in the auto-completion list that starts with a string.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCGETCURRENT'>AutoCCurrent</a> read-only</p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCGETCURRENTTEXT'>AutoCCurrentText</a> read-only</p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETCANCELATSTART'>AutoCCancelAtStart</a><span class="comment"> -- Should the auto-completion list be cancelled if the user backspaces to a position before where the box was created.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETFILLUPS'>AutoCFillUps</a> write-only<span class="comment"> -- Define a set of characters that when typed will cause the autocompletion to choose the selected item.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETCHOOSESINGLE'>AutoCChooseSingle</a><span class="comment"> -- Should a single item auto-completion list automatically choose the item.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETIGNORECASE'>AutoCIgnoreCase</a><span class="comment"> -- Set whether case is significant when performing auto-completion searches.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR'>AutoCCaseInsensitiveBehaviour</a><span class="comment"> -- Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETMULTI'>AutoCMulti</a><span class="comment"> -- Change the effect of autocompleting when there are multiple selections.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETORDER'>AutoCOrder</a><span class="comment"> -- Set the way autocompletion lists are ordered.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETAUTOHIDE'>AutoCAutoHide</a><span class="comment"> -- Set whether or not autocompletion is hidden automatically when nothing matches.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETDROPRESTOFWORD'>AutoCDropRestOfWord</a><span class="comment"> -- Set whether or not autocompletion deletes any word characters after the inserted text upon completion.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETOPTIONS'>AutoCOptions</a><span class="comment"> -- Set autocompletion options.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REGISTERIMAGE'>RegisterImage</a>(int type, string xpmData)<span class="comment"> -- Register an XPM image for use in autocompletion lists.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_REGISTERRGBAIMAGE'>RegisterRGBAImage</a>(int type, string pixels)<span class="comment"> -- Register an RGBA image for use in autocompletion lists. It has the width and height from RGBAImageSetWidth/Height</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARREGISTEREDIMAGES'>ClearRegisteredImages</a>()<span class="comment"> -- Clear all the registered XPM images.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETTYPESEPARATOR'>AutoCTypeSeparator</a><span class="comment"> -- Change the type-separator character in the string setting up an auto-completion list. Default is '?' but can be changed if items contain '?'.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETMAXHEIGHT'>AutoCMaxHeight</a><span class="comment"> -- Set the maximum height, in rows, of auto-completion and user lists. The default is 5 rows.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_AUTOCSETMAXWIDTH'>AutoCMaxWidth</a><span class="comment"> -- Set the maximum width, in characters, of auto-completion and user lists. Set to 0 to autosize to fit longest item, which is the default.</span></p>
+	<h2>User lists</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_USERLISTSHOW'>UserListShow</a>(int listType, string itemList)<span class="comment"> -- Display a list of strings and send notification when user chooses one.</span></p>
+	<h2>Call tips</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSHOW'>CallTipShow</a>(position pos, string definition)<span class="comment"> -- Show a call tip containing a definition near position pos.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPCANCEL'>CallTipCancel</a>()<span class="comment"> -- Remove the call tip from the screen.</span></p>
+	<p>bool editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPACTIVE'>CallTipActive</a>()<span class="comment"> -- Is there an active call tip?</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPPOSSTART'>CallTipPosStart</a>()<span class="comment"> -- Retrieve the position where the caret was before displaying the call tip.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETPOSSTART'>CallTipPosStart</a> write-only<span class="comment"> -- Set the start position in order to change when backspacing removes the calltip.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETHLT'>CallTipSetHlt</a>(position highlightStart, position highlightEnd)<span class="comment"> -- Highlight a segment of the definition.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETBACK'>CallTipBack</a> write-only<span class="comment"> -- Set the background colour for the call tip.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETFORE'>CallTipFore</a> write-only<span class="comment"> -- Set the foreground colour for the call tip.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETFOREHLT'>CallTipForeHlt</a> write-only<span class="comment"> -- Set the foreground colour for the highlighted part of the call tip.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPUSESTYLE'>CallTipUseStyle</a> write-only<span class="comment"> -- Enable use of STYLE_CALLTIP and set call tip tab size in pixels.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CALLTIPSETPOSITION'>CallTipPosition</a> write-only<span class="comment"> -- Set position of calltip, above or below text.</span></p>
+	<h2>Key bindings</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ASSIGNCMDKEY'>AssignCmdKey</a>(keymod keyDefinition, int sciCommand)<span class="comment"> -- When key+modifier combination keyDefinition is pressed perform sciCommand.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARCMDKEY'>ClearCmdKey</a>(keymod keyDefinition)<span class="comment"> -- When key+modifier combination keyDefinition is pressed do nothing.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CLEARALLCMDKEYS'>ClearAllCmdKeys</a>()<span class="comment"> -- Drop all key mappings.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_NULL'>Null</a>()<span class="comment"> -- Null operation.</span></p>
+	<h2>Popup edit menu</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_USEPOPUP'>UsePopUp</a>(int popUpMode)<span class="comment"> -- Set whether a pop up menu is displayed automatically when the user presses the wrong mouse button on certain areas.</span></p>
+	<h2>Macro recording</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STARTRECORD'>StartRecord</a>()<span class="comment"> -- Start notifying the container of all key presses and commands.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_STOPRECORD'>StopRecord</a>()<span class="comment"> -- Stop notifying the container of all key presses and commands.</span></p>
+	<h2>Printing</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPRINTMAGNIFICATION'>PrintMagnification</a><span class="comment"> -- Sets the print magnification added to the point size of each style for printing.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPRINTCOLOURMODE'>PrintColourMode</a><span class="comment"> -- Modify colours when printing for clearer printed text.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPRINTWRAPMODE'>PrintWrapMode</a><span class="comment"> -- Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).</span></p>
+	<h2>Direct access</h2>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETDIRECTFUNCTION'>DirectFunction</a> read-only</p>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETDIRECTSTATUSFUNCTION'>DirectStatusFunction</a> read-only</p>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETDIRECTPOINTER'>DirectPointer</a> read-only</p>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETCHARACTERPOINTER'>CharacterPointer</a> read-only</p>
+	<p>pointer editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETRANGEPOINTER'>GetRangePointer</a>(position start, position lengthRange)<span class="comment"> -- Return a read-only pointer to a range of characters in the document. May move the gap so that the range is contiguous, but will only move up to lengthRange bytes.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETGAPPOSITION'>GapPosition</a> read-only</p>
+	<h2>Multiple views</h2>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETDOCPOINTER'>DocPointer</a><span class="comment"> -- Change the document object used.</span></p>
+	<p>pointer editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CREATEDOCUMENT'>CreateDocument</a>(position bytes, int documentOptions)<span class="comment"> -- Create a new document object. Starts with reference count of 1 and not selected into editor.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ADDREFDOCUMENT'>AddRefDocument</a>(pointer doc)<span class="comment"> -- Extend life of document.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RELEASEDOCUMENT'>ReleaseDocument</a>(pointer doc)<span class="comment"> -- Release a reference to the document, deleting document if it fades to black.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETDOCUMENTOPTIONS'>DocumentOptions</a> read-only</p>
+	<h2>Background loading and saving</h2>
+	<p>pointer editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CREATELOADER'>CreateLoader</a>(position bytes, int documentOptions)<span class="comment"> -- Create an ILoader*.</span></p>
+	<h2>Folding</h2>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_VISIBLEFROMDOCLINE'>VisibleFromDocLine</a>(line docLine)<span class="comment"> -- Find the display line of a document line taking hidden lines into account.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DOCLINEFROMVISIBLE'>DocLineFromVisible</a>(line displayLine)<span class="comment"> -- Find the document line of a display line taking hidden lines into account.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SHOWLINES'>ShowLines</a>(line lineStart, line lineEnd)<span class="comment"> -- Make a range of lines visible.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_HIDELINES'>HideLines</a>(line lineStart, line lineEnd)<span class="comment"> -- Make a range of lines invisible.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINEVISIBLE'>LineVisible</a>[line line] read-only</p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETALLLINESVISIBLE'>AllLinesVisible</a> read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOLDLEVEL'>FoldLevel</a>[line line]<span class="comment"> -- Set the fold level of a line. This encodes an integer level along with flags indicating whether the line is a header and whether it is effectively white space.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOLDFLAGS'>FoldFlags</a> write-only<span class="comment"> -- Set some style options for folding.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLASTCHILD'>GetLastChild</a>(line line, int level)<span class="comment"> -- Find the last child line of a header line.</span></p>
+	<p>line editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETFOLDPARENT'>FoldParent</a>[line line] read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TOGGLEFOLD'>ToggleFold</a>(line line)<span class="comment"> -- Switch a header line between expanded and contracted.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TOGGLEFOLDSHOWTEXT'>ToggleFoldShowText</a>(line line, string text)<span class="comment"> -- Switch a header line between expanded and contracted and show some text after the line.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FOLDDISPLAYTEXTSETSTYLE'>FoldDisplayTextStyle</a><span class="comment"> -- Set the style of fold display text.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETDEFAULTFOLDDISPLAYTEXT'>SetDefaultFoldDisplayText</a>(string text)<span class="comment"> -- Set the default fold display text.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETDEFAULTFOLDDISPLAYTEXT'>GetDefaultFoldDisplayText</a>()<span class="comment"> -- Get the default fold display text.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETFOLDEXPANDED'>FoldExpanded</a>[line line]<span class="comment"> -- Show the children of a header line.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FOLDLINE'>FoldLine</a>(line line, int action)<span class="comment"> -- Expand or contract a fold header.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FOLDCHILDREN'>FoldChildren</a>(line line, int action)<span class="comment"> -- Expand or contract a fold header and its children.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FOLDALL'>FoldAll</a>(int action)<span class="comment"> -- Expand or contract all fold headers.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_EXPANDCHILDREN'>ExpandChildren</a>(line line, int level)<span class="comment"> -- Expand a fold header and all children. Use the level argument instead of the line's current level.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETAUTOMATICFOLD'>AutomaticFold</a><span class="comment"> -- Set automatic folding behaviours.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CONTRACTEDFOLDNEXT'>ContractedFoldNext</a>(line lineStart)<span class="comment"> -- Find the next line at or after lineStart that is a contracted fold header line. Return -1 when no more lines.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ENSUREVISIBLE'>EnsureVisible</a>(line line)<span class="comment"> -- Ensure a particular line is visible by expanding any header line hiding it.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ENSUREVISIBLEENFORCEPOLICY'>EnsureVisibleEnforcePolicy</a>(line line)<span class="comment"> -- Ensure a particular line is visible by expanding any header line hiding it. Use the currently set visibility policy to determine which range to display.</span></p>
+	<h2>Line wrapping</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWRAPMODE'>WrapMode</a><span class="comment"> -- Sets whether text is word wrapped.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWRAPVISUALFLAGS'>WrapVisualFlags</a><span class="comment"> -- Set the display mode of visual flags for wrapped lines.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWRAPVISUALFLAGSLOCATION'>WrapVisualFlagsLocation</a><span class="comment"> -- Set the location of visual flags for wrapped lines.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWRAPINDENTMODE'>WrapIndentMode</a><span class="comment"> -- Sets how wrapped sublines are placed. Default is fixed.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETWRAPSTARTINDENT'>WrapStartIndent</a><span class="comment"> -- Set the start indent for wrapped lines.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETLAYOUTCACHE'>LayoutCache</a><span class="comment"> -- Sets the degree of caching of layout information.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPOSITIONCACHE'>PositionCache</a><span class="comment"> -- Set number of entries in position cache</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINESSPLIT'>LinesSplit</a>(int pixelWidth)<span class="comment"> -- Split the lines in the target into lines that are less wide than pixelWidth where possible.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINESJOIN'>LinesJoin</a>()<span class="comment"> -- Join the lines in the target.</span></p>
+	<p>line editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_WRAPCOUNT'>WrapCount</a>(line docLine)<span class="comment"> -- The number of display lines needed to wrap a document line</span></p>
+	<h2>Zooming</h2>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ZOOMIN'>ZoomIn</a>()<span class="comment"> -- Magnify the displayed text by increasing the sizes by 1 point.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ZOOMOUT'>ZoomOut</a>()<span class="comment"> -- Make the displayed text smaller by decreasing the sizes by 1 point.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETZOOM'>Zoom</a><span class="comment"> -- Set the zoom level. This number of points is added to the size of all fonts. It may be positive to magnify or negative to reduce.</span></p>
+	<h2>Long lines</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEDGEMODE'>EdgeMode</a><span class="comment"> -- The edge may be displayed by a line (EDGE_LINE/EDGE_MULTILINE) or by highlighting text that goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEDGECOLUMN'>EdgeColumn</a><span class="comment"> -- Set the column number of the edge. If text goes past the edge then it is highlighted.</span></p>
+	<p>colour editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETEDGECOLOUR'>EdgeColour</a><span class="comment"> -- Change the colour used in edge indication.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MULTIEDGEADDLINE'>MultiEdgeAddLine</a>(position column, colour edgeColour)<span class="comment"> -- Add a new vertical edge to the view.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MULTIEDGECLEARALL'>MultiEdgeClearAll</a>()<span class="comment"> -- Clear all vertical edges.</span></p>
+	<p>position editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETMULTIEDGECOLUMN'>MultiEdgeColumn</a>[int which] read-only</p>
+	<h2>Accessibility</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETACCESSIBILITY'>Accessibility</a><span class="comment"> -- Enable or disable accessibility.</span></p>
+	<h2>Lexer</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLEXER'>Lexer</a> read-only</p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLEXERLANGUAGE'>LexerLanguage</a> read-only</p>
+	<p>pointer editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETILEXER'>ILexer</a> write-only<span class="comment"> -- Set the lexer from an ILexer*.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COLOURISE'>Colourise</a>(position start, position end)<span class="comment"> -- Colourise a segment of the document using the current lexing language.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_CHANGELEXERSTATE'>ChangeLexerState</a>(position start, position end)<span class="comment"> -- Indicate that the internal state of a lexer has changed over a range and therefore there may be a need to redraw.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_PROPERTYNAMES'>PropertyNames</a>()<span class="comment"> -- Retrieve a '\n' separated list of properties understood by the current lexer. Result is NUL-terminated.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_PROPERTYTYPE'>PropertyType</a>(string name)<span class="comment"> -- Retrieve the type of a property.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DESCRIBEPROPERTY'>DescribeProperty</a>(string name)<span class="comment"> -- Describe a property. Result is NUL-terminated.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETPROPERTY'>Property</a>[string key]<span class="comment"> -- Set up a value that may be used by a lexer for some optional feature.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETPROPERTYEXPANDED'>PropertyExpanded</a>[string key] read-only</p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETPROPERTYINT'>GetPropertyInt</a>(string key, int defaultValue)<span class="comment"> -- Retrieve a "property" value previously set with SetProperty, interpreted as an int AFTER any "$()" variable replacement.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETKEYWORDS'>KeyWords</a>[int keyWordSet] write-only<span class="comment"> -- Set up the key words used by the lexer.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DESCRIBEKEYWORDSETS'>DescribeKeyWordSets</a>()<span class="comment"> -- Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer. Result is NUL-terminated.</span></p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSUBSTYLEBASES'>SubStyleBases</a> read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DISTANCETOSECONDARYSTYLES'>DistanceToSecondaryStyles</a> read-only</p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATESUBSTYLES'>AllocateSubStyles</a>(int styleBase, int numberStyles)<span class="comment"> -- Allocate a set of sub styles for a particular base style, returning start of range</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_FREESUBSTYLES'>FreeSubStyles</a>()<span class="comment"> -- Free allocated sub styles</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSUBSTYLESSTART'>SubStylesStart</a>[int styleBase] read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSUBSTYLESLENGTH'>SubStylesLength</a>[int styleBase] read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETSTYLEFROMSUBSTYLE'>StyleFromSubStyle</a>[int subStyle] read-only</p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETPRIMARYSTYLEFROMSTYLE'>PrimaryStyleFromStyle</a>[int style] read-only</p>
+	<p>string editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETIDENTIFIERS'>Identifiers</a>[int style] write-only<span class="comment"> -- Set the identifiers that are shown in a particular style</span></p>
+	<p>pointer editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_PRIVATELEXERCALL'>PrivateLexerCall</a>(int operation, pointer pointer)<span class="comment"> -- For private communication between an application and a known lexer.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETNAMEDSTYLES'>NamedStyles</a> read-only</p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_NAMEOFSTYLE'>NameOfStyle</a>(int style)<span class="comment"> -- Retrieve the name of a style. Result is NUL-terminated.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TAGSOFSTYLE'>TagsOfStyle</a>(int style)<span class="comment"> -- Retrieve a ' ' separated list of style tags like "literal quoted string". Result is NUL-terminated.</span></p>
+	<p>string editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_DESCRIPTIONOFSTYLE'>DescriptionOfStyle</a>(int style)<span class="comment"> -- Retrieve a description of a style. Result is NUL-terminated.</span></p>
+	<h2>Notifications</h2>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETIDENTIFIER'>Identifier</a><span class="comment"> -- Set the identifier reported as idFrom in notification messages.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMODEVENTMASK'>ModEventMask</a><span class="comment"> -- Set which document modification events are sent to the container.</span></p>
+	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETCOMMANDEVENTS'>CommandEvents</a><span class="comment"> -- Set whether command events are sent to the container.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMOUSEDWELLTIME'>MouseDwellTime</a><span class="comment"> -- Sets the time the mouse must sit still to generate a mouse dwell event.</span></p>
+
+<!----Autogenerated -->
+  </body>
+</html>
diff --git a/scite-app/scite/doc/PrintHi.png b/scite-app/scite/doc/PrintHi.png
new file mode 100644
index 0000000..a3bfcc1
Binary files /dev/null and b/scite-app/scite/doc/PrintHi.png differ
diff --git a/scite-app/scite/doc/SciBreak2.jpg b/scite-app/scite/doc/SciBreak2.jpg
new file mode 100644
index 0000000..bec27bb
Binary files /dev/null and b/scite-app/scite/doc/SciBreak2.jpg differ
diff --git a/scite-app/scite/doc/SciTE.html b/scite-app/scite/doc/SciTE.html
new file mode 100644
index 0000000..b9703e8
--- /dev/null
+++ b/scite-app/scite/doc/SciTE.html
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <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="20210726" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script type="text/javascript">
+   	function IsRemote() {
+		var loc = '' + window.location;
+		return (loc.indexOf('http:')) != -1 || (loc.indexOf('https:') != -1);
+   	}
+   </script>
+    <style type="text/css">
+        #versionlist {
+            margin: 0;
+            padding: .5em;
+            list-style-type: none;
+            color: #FFCC99;
+            background: #000000;
+        }
+        #versionlist li {
+            margin-bottom: .5em;
+        }
+        #menu {
+            margin: 0;
+            padding: .5em 0;
+            list-style-type: none;
+            font-size: larger;
+            background: #CCCCCC;
+        }
+        #menu li {
+            margin: 0;
+            padding: 0 .5em;
+            display: inline;
+        }
+    </style>
+    <title>
+      Scintilla and SciTE
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="256">
+          <img src="https://www.scintilla.org/SciTEWord.jpg" height="85" width="200" alt="Scintilla" />
+        </td>
+        <td width="40%" align="left">
+          <font color="#FFCC99" size="4"> A free source code editor for Win32 and
+          X</font>
+        </td>
+        <td width="40%" align="right">
+          <font color="#FFCC99" size="3"> Release version 5.1.1<br />
+           Site last modified July 26 2021</font>
+        </td>
+        <td width="20%">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td width="100%" style="background: url(https://www.scintilla.org/SciBreak2.jpg) no-repeat;height:150px;">
+          &nbsp;
+        </td>
+      </tr>
+    </table>
+    <ul id="versionlist">
+      <li>Version 5.1.1 fixes bugs and improves performance.</li>
+      <li>Version 5.1.0 is a stable release. A 'representations' property can change the appearance of characters.</li>
+      <li>Version 5.0.3 fixes primary selection on GTK with Wayland.</li>
+      <li>Version 5.0.2 fixes file type discovery from #! line.
+      On Windows fix text display, directory locking, and reduce flashing of tab bar.</li>
+      <li>Version 5.0.1 contains new drawing code from Scintilla.
+      Added autocomplete colour properties on Win32; bookmark.stroke.width, fold.stroke.width, and whitespace.size.</li>
+      <li>Version 5.0.0 is an unstable testing release.</li>
+    </ul>
+    <ul id="menu">
+      <li><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
+      <li id="remote1"><a href="https://www.scintilla.org/SciTEDownload.html">Download</a></li>
+      <li><a href="https://www.scintilla.org/SciTEDoc.html">Documentation</a></li>
+      <li id="remote2"><a href="https://www.scintilla.org/index.html">Scintilla</a></li>
+      <li id="remote3"><a href="https://www.scintilla.org/Lexilla.html">Lexilla</a></li>
+      <li><a href="https://www.scintilla.org/SciTEHistory.html">History</a></li>
+      <li><a href="http://code.google.com/p/scite-files/wiki/Customization">Extras</a></li>
+      <li><a href="http://code.google.com/p/scite-files/wiki/Translations">Translations</a></li>
+      <li><a href="https://www.scintilla.org/SciTEFAQ.html">Frequently Asked Questions</a></li>
+      <li id="remote4"><a href="https://www.scintilla.org/Privacy.html">Privacy</a></li>
+    </ul>
+<script type="text/javascript" language="JavaScript"><!--
+if (!IsRemote()) { //if NOT remote...
+    document.getElementById('remote1').style.display='none';
+    document.getElementById('remote2').style.display='none';
+    document.getElementById('remote3').style.display='none';
+    document.getElementById('remote4').style.display='none';
+}
+//--></script>
+    <p>
+       <a href="https://www.scintilla.org/SciTEDoc.html">SciTE</a> is a SCIntilla based Text Editor. Originally built to
+      demonstrate <a href="https://www.scintilla.org">Scintilla</a>, it has grown to be a generally useful editor with facilities for
+      building and running programs. It is best used for jobs with simple configurations - I use it
+      for building test and demonstration programs as well as SciTE and Scintilla, themselves.
+    </p>
+    <p>
+       SciTE is currently available for Intel Windows (XP or later) and Linux compatible operating
+      systems with GTK. It has been run on Windows 7 and on Fedora 26 and Ubuntu 18.04
+      with GTK 2.24. <a href="https://www.scintilla.org/SciTEImage.html">Here is a screenshot of
+      SciTE.</a><br />
+    </p>
+<script type="text/javascript" language="JavaScript"><!--
+if (IsRemote()) {
+    document.write('<p>You can <a href="https://www.scintilla.org/SciTEDownload.html">download Scintilla and SciTE.</a></p>');
+}
+//--></script>
+<noscript>
+<p>You can <a href="https://www.scintilla.org/SciTEDownload.html">download Scintilla and SciTE.</a></p>
+</noscript>
+    <p>
+       For macOS, there is a commercial version of SciTE available from the <a href="https://www.scintilla.org/SciTE-OSX.html">Mac App Store</a>.
+    </p>
+    <p>
+       There are some <a href="http://code.google.com/p/scite-files/wiki/Customization">extra configuration files</a> that can
+       enhance SciTE for various languages and APIs.
+    </p>
+    <p>
+      Questions and comments about SciTE should be directed to the
+      <a href="http://groups.google.com/group/scite-interest">scite-interest</a>
+      mailing list,
+      which is for discussion of SciTE and related projects, their bugs and future features.
+      This is a low traffic list, averaging less than 20 messages per week.
+      To avoid spam, only list members can write to the list.
+      New versions of SciTE are announced on scite-interest and may also be received by SourceForge
+      members by clicking on the Monitor column icon for "scite" on
+      <a href="https://sourceforge.net/project/showfiles.php?group_id=2439">the downloads page</a>.
+      Messages sent to my personal email address that could have been sent to the list
+      may receive no response.
+      <br />
+    </p>
+There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a> hosted on
+<script type="text/javascript" language="JavaScript">
+<!--
+if (IsRemote()) {
+    document.write('<a href="https://sourceforge.net/projects/scintilla/">');
+    document.write('<img src="https://sflogo.sourceforge.net/sflogo.php?group_id=2439&amp;type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a> ');
+} else {
+    document.write('<a href="https://sourceforge.net/projects/scintilla/">SourceForge<\/a>');
+}
+//-->
+</script>
+<noscript>
+<a href="https://sourceforge.net/projects/scintilla">
+<img src="https://sflogo.sourceforge.net/sflogo.php?group_id=2439&amp;type=8" width="80" height="15" alt="Get Scintilla at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
+</noscript>
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTEDirector.html b/scite-app/scite/doc/SciTEDirector.html
new file mode 100644
index 0000000..97b2c4f
--- /dev/null
+++ b/scite-app/scite/doc/SciTEDirector.html
@@ -0,0 +1,446 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE Director Interface
+    </title>
+    <style type="text/css">
+	table {
+		border: 1px solid black;
+		border-collapse: collapse;
+	}
+	td {
+		border: 1px solid black;
+		padding: 1px 5px 1px 5px;
+	}
+	.S0 {
+		color: #808080;
+	}
+	.S1 {
+		font-family: Comic Sans MS;
+		color: #007F00;
+		font-size: 9pt;
+	}
+	.S2 {
+		font-family: Comic Sans MS;
+		color: #007F00;
+		font-size: 9pt;
+	}
+	.S3 {
+		font-family: Comic Sans MS;
+		color: #3F703F;
+		font-size: 9pt;
+	}
+	.S4 {
+		color: #007F7F;
+	}
+	.S5 {
+		font-weight: bold;
+		color: #00007F;
+	}
+	.S6 {
+		color: #7F007F;
+	}
+	.S7 {
+		color: #7F007F;
+	}
+	.S8 {
+		color: #804080;
+	}
+	.S9 {
+		color: #7F7F00;
+	}
+	.S10 {
+		font-weight: bold;
+		color: #000000;
+	}
+	.S12 {
+		font-family: Courier New;
+		color: #000000;
+		background: #E0C0E0;
+		font-size: 10pt;
+	}
+	.S13 {
+		font-family: Courier New;
+		color: #007F00;
+		background: #E0FFE0;
+		font-size: 10pt;
+	}
+	.S14 {
+		font-family: Courier New;
+		color: #3F7F3F;
+		background: #E0F0FF;
+		font-size: 10pt;
+	}
+	.S15 {
+		font-family: Comic Sans MS;
+		color: #3F703F;
+		font-size: 9pt;
+	}
+	SPAN {
+		font-family: Verdana;
+		font-size: 10pt;
+	}
+	.example {
+		color: #00A000;
+		font-weight: bold;
+	}
+	DIV.example {
+		background: #F7FCF7;
+		border: 1px solid #C0D7C0;
+		margin: 0.3em 3em;
+		padding: 0.3em 0.6em;
+		font-size: 80%;
+	}
+	DIV.highlighted {
+		background: #F7FCF7;
+		border: 1px solid #C0D7C0;
+		margin: 0.3em 3em;
+		padding: 0.3em 0.6em;
+		font-size: 80%;
+	}
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  SciTE Director Interface</font></a>
+        </td>
+      </tr>
+    </table>
+    <h3>
+       Purpose.
+    </h3>
+	<p>Software development does not occur only at the single file level handled by SciTE.
+	A developer will generally work on a group of related files together in the context of one
+	project. Project manager functionality could be added to SciTE as it has to other editors
+	but this would impose a particular view of how projects are to be managed including the
+	format of project files. Instead, SciTE has an interface that can be used by project
+	managers or similar applications to control SciTE. Any application that controls SciTE is
+	referred to as a "Director".</p>
+	<p>The current Director interface only works on Windows and GTK/Linux. In the future, it should be
+	possible to replace the low level interface and so make this interface available on other
+	platforms.</p>
+	<p>There is currently one director application,
+	<a href="http://llt.chez-alice.fr/">Filerx</a>, available.</p>
+	<p>This interface is implemented on top of the
+	<a href="SciTEExtension.html">SciTE Extension Interface</a>, in the
+	file scite\win32\DirectorExtension.cxx.</p>
+    <h3>
+       Direct connection, broadcasting and explicit return addresses.
+    </h3>
+	<p>One application at a time is <i>the director</i> of SciTE,
+	controlling SciTE as it wishes. To support other communications techniques
+	applications may broadcast to all active director interfaces. When doing so,
+	each message should contain an explicit return address where replies to the
+	broadcast message will be sent.
+	</p>
+    <h3>
+       Low level interface on Windows.
+    </h3>
+	<p>The Windows WM_COPYDATA message is used to transfer data between
+	SciTE and a Director. The messages are sent between windows created by the two
+	applications. SciTE uses a window that has no other purpose than to receive these
+	messages.
+	The lpData and cbData fields of the COPYDATASTRUCT
+	are used to transfer a string between the two processes, with cbData holding the length
+	of the string pointed to by lpData. The string does not have to be terminated with '\0'.
+	The dwData should be 0.</p>
+	<p>Before messages can be sent from one application to the other, the window handle
+	of the window to receive the message must be found. This is normally transferred when
+	starting the other application as a command line parameter. Either application may
+	start the other. SciTE makes its window handle available in the WindowID
+	property and accepts a director.hwnd property as the window handle to which it
+	sends data.</p>
+	<p>As an example of communicating the window handle, to install Filerx in the Tools
+	menu of SciTE these properties could be used:</p>
+	<div class="example">
+	command.name.0.*=Project Editor<br/>
+	command.0.*="C:\os\scite\bin\filerx.exe" "$(FileDir)" "$(WindowID)"<br/>
+	command.subsystem.0.*=2
+	</div>
+	<p>In the opposite direction, Filerx can start up SciTE with a command line that
+	specifies its window handle as well as the file it wants edited:</p>
+	<div class="example">
+	SciTE -director.hwnd=937846 c:\os\scite\src\SciTEBase.cxx
+	</div>
+	<p>Once one application has the window handle of the other application, it should send
+	its window handle to the other application using an identity message as described later.
+	Then both sides are able to send messages.</p>
+	<p>To broadcast a message on Windows, the set of active director
+	interfaces can be found by broadcasting the "SciTEDirectorInterface"
+	message and seeing which windows reply with the same value as that message.
+	Example broadcast code:</p>
+	<div class="highlighted">
+<SPAN class=S0></SPAN><SPAN class=S5>unsigned</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>int</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>RegisterWindowMessage</SPAN><SPAN class=S10>(</SPAN><SPAN class=S0></SPAN><SPAN class=S6>"SciTEDirectorInterface"</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S11>HWND</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>w</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>GetWindow</SPAN><SPAN class=S10>(::</SPAN><SPAN class=S11>GetDesktopWindow</SPAN><SPAN class=S10>(),</SPAN><SPAN class=S0></SPAN><SPAN class=S11>GW_CHILD</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S5>while</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>w</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>DWORD</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>res</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S4>0</SPAN><SPAN class=S10>;</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S2>//&nbsp;Need&nbsp;time&nbsp;out&nbsp;to&nbsp;avoid&nbsp;hung&nbsp;applications</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>SendMessageTimeout</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>w</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S4>0</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S4>0</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>SMTO_NORMAL</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S4>1000</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>&amp;</SPAN><SPAN class=S11>res</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>if</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>res</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>==</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>static_cast</SPAN><SPAN class=S10>&lt;</SPAN><SPAN class=S11>DWORD</SPAN><SPAN class=S10>&gt;(</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S10>))</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S2>//&nbsp;Replied&nbsp;with&nbsp;same&nbsp;SDI&nbsp;code&nbsp;so&nbsp;should</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S2>//&nbsp;understand&nbsp;SDI's&nbsp;version&nbsp;of&nbsp;WM_COPYDATA</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>SendMessage</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>w</SPAN><SPAN class=S10>,</SPAN><SPAN class=S11>WM_COPYDATA</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>UINT</SPAN><SPAN class=S10>)</SPAN><SPAN class=S11>m_hWnd</SPAN><SPAN class=S10>,(</SPAN><SPAN class=S5>long</SPAN><SPAN class=S10>)&amp;</SPAN><SPAN class=S11>cds</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>w</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>GetWindow</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>w</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>GW_HWNDNEXT</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+</SPAN>
+</div>
+<p>To advertise that a top level window supports the Director interface:</p>
+	<div class="highlighted">
+<SPAN class=S0></SPAN><SPAN class=S11>LRESULT</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>PASCAL</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>DirectorExtension_WndProc</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>HWND</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>hWnd</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S11>UINT</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>iMessage</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>WPARAM</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>wParam</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>LPARAM</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>lParam</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>unsigned</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S5>int</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>=</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>RegisterWindowMessage</SPAN><SPAN class=S10>(</SPAN><SPAN class=S6>"SciTEDirectorInterface"</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>if</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>iMessage</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>==</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S10>)</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>{</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>return</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>SDI</SPAN><SPAN class=S10>;</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S10>}</SPAN><SPAN class=S0><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN class=S5>return</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S10>::</SPAN><SPAN class=S11>DefWindowProc</SPAN><SPAN class=S10>(</SPAN><SPAN class=S11>hWnd</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>iMessage</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0>&nbsp;</SPAN><SPAN class=S11>wParam</SPAN><SPAN class=S10>,</SPAN><SPAN class=S0></SPAN><SPAN class=S11>lParam</SPAN><SPAN class=S10>);</SPAN><SPAN class=S0><BR>
+</SPAN><SPAN class=S10>}</SPAN><BR>
+</div>
+    <h3>
+       Low level interface on GTK.
+    </h3>
+	<p>An input fifo for each application supporting the director
+	interface located in the temporary directory (obtained through GLib g_get_tmp_dir() call),
+	with a name using a pattern such as
+	"/tmp/SciTE.&lt;PID&gt;.in".
+	This allows enumerating all active director interfaces and also opening
+	a specific interface when the fifo name has been communicated through some
+	other means such as a command line argument or an identity: command.</p>
+    <h3>
+       High level interface.
+    </h3>
+	<p>Messages use C style escapes to represent control characters and
+	ensure that only visible characters are transmitted apart from the use
+	of '\n' to separate messages.</p>
+	<p>The string transmitted by the low level interface contains an optional
+	return address surrounded by ':' characters, an action, a ':' character and
+	an optional argument. The argument is often a file path. The ':' must be present even if there
+	is no argument. For example, SciTE understands the message</p>
+	<div class="example">
+	open:c:\\os\\scintilla\\include\\Scintilla.iface
+	</div>
+	<p>as a command to open the file "c:\os\scintilla\include\Scintilla.iface" just as if the user
+	had performed this operation.</p>
+	<p>If the first character of the message is a ':' then up to the next ':' is a return
+	address, so SciTE will reply to the message</p>
+	<div class="example">
+	:73658:askfilename:
+	</div>
+	<p>by sending the filename being edited to the return address 73658
+	rather than to its director.</p>
+	<h4>The actions understood by SciTE are:</h4>
+	<table border="1">
+		<tr>
+			<td>askfilename:</td>
+			<td>Return the name of the file being edited.</td>
+		</tr>
+		<tr>
+			<td>askproperty:&lt;key&gt;</td>
+			<td>Return the value of a property.</td>
+		</tr>
+		<tr>
+			<td>close:</td>
+			<td>Close the current file.</td>
+		</tr>
+		<tr>
+			<td>closing:</td>
+			<td>Director is closing - SciTE closes if it was started by the director.</td>
+		</tr>
+		<tr>
+			<td>currentmacro:&lt;string&gt;</td>
+			<td>Set the current macro to name.</td>
+		</tr>
+		<tr>
+			<td>cwd:</td>
+			<td>Change the working directory.</td>
+		</tr>
+		<tr>
+			<td>enumproperties:dyn|local|user|base|embed</td>
+			<td>Enumerate all the properties in the argument set.</td>
+		</tr>
+		<tr>
+			<td>exportashtml:&lt;path&gt;</td>
+			<td>Save the document in HTML format as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>exportasrtf:&lt;path&gt;</td>
+			<td>Save the document in RTF format as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>exportaspdf:&lt;path&gt;</td>
+			<td>Save the document in PDF format as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>exportaslatex:&lt;path&gt;</td>
+			<td>Save the document in LaTeX format as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>exportasxml:&lt;path&gt;</td>
+			<td>Save the document in XML format as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>extender:&lt;command&gt;</td>
+			<td>Call the extension interface with the given command.</td>
+		</tr>
+		<tr>
+			<td>find:&lt;string&gt;</td>
+			<td>Search for a string, select and show it.</td>
+		</tr>
+		<tr>
+			<td>focus:&lt;timeStamp&gt;</td>
+			<td>On GTK bring this SciTE window to the front.
+			The timeStamp is from the window manager and ensures that windows are only
+			activated because of a user command.
+			Has no effect on Windows as applications on Windows can only donate focus, not take focus.</td>
+		</tr>
+		<tr>
+			<td>goto:&lt;lineNumber&gt;[,&lt;columnNumber&gt;]</td>
+			<td>Move caret to a particular line and make it visible.<br>
+			If there is a column number then select the word at that column number
+			or move the caret there if no word is present.</td>
+		</tr>
+		<tr>
+			<td>identity:&lt;hwndDirector&gt;</td>
+			<td>Sets the director window handle to which SciTE sends messages.
+			The argument is in decimal.</td>
+		</tr>
+		<tr>
+			<td>insert:&lt;value&gt;</td>
+			<td>Display the value in the editor pane replacing the selection.</td>
+		</tr>
+		<tr>
+			<td>loadsession:&lt;path&gt;</td>
+			<td>Load a session as given by the indicated file.</td>
+		</tr>
+		<tr>
+			<td>macrocommand:&lt;command&gt;</td>
+			<td>Execute a macro command.
+			See the SciTE source code for the syntax of the
+			command argument.</td>
+		</tr>
+		<tr>
+			<td>macroenable:&lt;enable&gt;</td>
+			<td>If enable, display menu commands in SciTE for recording
+			and playing macros.</td>
+		</tr>
+		<tr>
+			<td>macrolist:&lt;list&gt;</td>
+			<td>Display a list for the user to choose from.</td>
+		</tr>
+		<tr>
+			<td>menucommand:&lt;cmd&gt;</td>
+			<td>Execute a menu command based on numeric ID.</td>
+		</tr>
+		<tr>
+			<td>open:&lt;path&gt;</td>
+			<td>Open the indicated file.</td>
+		</tr>
+		<tr>
+			<td>output:&lt;value&gt;</td>
+			<td>Display the value in the output pane replacing the selection.</td>
+		</tr>
+		<tr>
+			<td>property:&lt;key&gt;=&lt;value&gt;</td>
+			<td>Set a property to a value.</td>
+		</tr>
+		<tr>
+			<td>quit:</td>
+			<td>Shut down SciTE.</td>
+		</tr>
+		<tr>
+			<td>reloadproperties:</td>
+			<td>Reload properties from files.</td>
+		</tr>
+		<tr>
+			<td>replaceall:&lt;search&gt;\000&lt;replace&gt;</td>
+			<td>Replace all instances of the search string in the
+			document with the replace string.</td>
+		</tr>
+		<tr>
+			<td>saveas:&lt;path&gt;</td>
+			<td>Save the document as the indicated file.</td>
+		</tr>
+		<tr>
+			<td>savesession:&lt;path&gt;</td>
+			<td>Save a session as given by the indicated file.</td>
+		</tr>
+		<tr>
+			<td>setdefaultcwd:</td>
+			<td>Change the working directory to somewhere reasonable and safe.</td>
+		</tr>
+	</table>
+	<h4>The actions sent by SciTE are:</h4>
+	<table border="1">
+		<tr>
+			<td>closed:&lt;path&gt;</td>
+			<td>SciTE has closed the indicated file.</td>
+		</tr>
+		<tr>
+			<td>closing:</td>
+			<td>SciTE is closing.</td>
+		</tr>
+		<tr>
+			<td>dyn|local|user|base|embed:&lt;key&gt;=&lt;value&gt;</td>
+			<td>Set a property in a set to a value.</td>
+		</tr>
+		<tr>
+			<td>filename:&lt;path&gt;</td>
+			<td>The file being edited is path.
+			This is the reply to the askfilename: command.</td>
+		</tr>
+		<tr>
+			<td>identity:&lt;hwndSciTEReceiving&gt;</td>
+			<td>SciTE indicates to the director the window handle to which it should send
+			messages. The argument is in decimal.</td>
+		</tr>
+		<tr>
+			<td>macro:getlist</td>
+			<td>Retrieve the list of available macros which will be
+			returned by the macrolist command.</td>
+		</tr>
+		<tr>
+			<td>macro:record:&lt;details&gt;</td>
+			<td>Start recording a macro.
+			See the SciTE source code for the syntax of the
+			details argument.</td>
+		</tr>
+		<tr>
+			<td>macro:run:&lt;macroName&gt;</td>
+			<td>Run the named macro.</td>
+		</tr>
+		<tr>
+			<td>macro:stoprecord</td>
+			<td>Stop recording a macro.</td>
+		</tr>
+		<tr>
+			<td>opened:&lt;path&gt;</td>
+			<td>SciTE has opened the indicated file.</td>
+		</tr>
+		<tr>
+			<td>switched:&lt;path&gt;</td>
+			<td>SciTE has switched buffers to the indicated file.</td>
+		</tr>
+		<tr>
+			<td>saved:&lt;path&gt;</td>
+			<td>SciTE has saved the indicated file.</td>
+		</tr>
+	</table>
+  <p>In the future, more actions will be defined. Applications should ignore any
+  actions that they do not understand.</p>
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTEDoc.html b/scite-app/scite/doc/SciTEDoc.html
new file mode 100644
index 0000000..46e8aa3
--- /dev/null
+++ b/scite-app/scite/doc/SciTEDoc.html
@@ -0,0 +1,4952 @@
+<?xml version="1.0" encoding='utf-8'?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html" />
+    <title>
+      SciTE
+    </title>
+<style type="text/css">
+        table {
+            border: 1px solid #1F1F1F;
+            border-collapse: collapse;
+        }
+        td {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        th {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        .windowsonly {
+            background: #E7F0FF;
+        }
+        .gtkonly {
+            background: #FFFFD7;
+        }
+        .osxonly {
+            background: #FFE0E0;
+        }
+        .windows-osx {
+            background: #FFEBFF;
+        }
+        .windows-gtk {
+            background: #EBFFF7;
+        }
+        .example {
+            color: #008000;
+            font-weight: bold;
+        }
+        DIV.example {
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+            font-size: 80%;
+        }
+        h3 {
+            border: 2px solid #FFCC00;
+            background-color: #FFF7EE;
+            padding: 2px 5px;
+        }
+        .header{
+            border: 1px solid #CCCCCC;
+        }
+        .headerlinks {
+            padding: 7px;
+            background-color: #CCCCCC;
+            border: 0px solid #FF0000;
+            font-size: 120%;
+        }
+ </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" style="border:0px solid #FF0000" border="0"  summary="banner">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+          SciTE Documentation</font></a>
+        </td>
+      </tr>
+    </table>
+    <table class="header" width="100%" summary="header">
+      <tr>
+        <td class="headerlinks">
+          <a href="SciTEFAQ.html">
+          Frequently Asked Questions</a>&nbsp;&nbsp;
+          <a href="SciTELua.html">
+          Scripting</a>&nbsp;&nbsp;
+          <a href="SciTERegEx.html">Regular Expressions</a>&nbsp;&nbsp;
+        </td>
+      </tr>
+    </table>
+    <h3 id="StandardEditing">
+       Standard Editing
+    </h3>
+    <p>
+        Text editing in SciTE works similarly to most Macintosh or Windows editors with the added
+        feature of automatic syntax styling. SciTE can hold multiple files in memory at one time but
+        only one file will be visible. Rectangular
+        blocks of text can be selected in SciTE by holding down the Alt key on Windows or the Ctrl
+        key on GTK while dragging the mouse over the text. The modifier key used on GTK
+        can be changed with the rectangular.selection.modifier property.
+    </p>
+    <p>
+       There are two panes in SciTE, the editing pane and the output pane. The output pane is
+      located either to the right of the editing pane or below it. Initially it is of zero size, but
+      it can be made larger by dragging the divider between it and the editing pane. The Options |
+      Vertical Split command can be used to move the output pane beneath the editing pane.
+    </p>
+    <p>
+       SciTE can perform commands to compile or run source files with the output from these
+      commands directed into the output pane.
+    </p>
+    <p>
+       For example, if <a href="http://www.python.org">Python</a> is installed on the machine, open
+      a new document, type:
+    </p>
+    <blockquote>
+<kbd>
+print("hi")
+</kbd>
+    </blockquote>
+    <p>
+       as that document's text.
+    </p>
+    Save the document as printhi.py. <br />
+     The document should now appear coloured as SciTE is using the file's extension to decide upon
+    the syntax styling to use:
+    <blockquote>
+        <code>
+                <b><font color="#000080">print</font></b><b><font color="#000000">(</font></b><font color="#800080">"hi"</font><b><font color="#000000">)</font></b>
+        </code>
+    </blockquote>
+    Perform the Tools | Go command.<br />
+     The output window will be made visible if it is not already visible and will show:<br />
+    <blockquote>
+        <code>
+                <font color="#0000FF">&gt;pythonw -u printhi.py</font><br />
+                hi<br />
+                <font color="#0000FF">&gt;Exit code: 0</font>
+        </code>
+    </blockquote>
+    The first blue line is from SciTE showing the command it will use to run the program. The black
+    line is the output from running the Python program. The last blue line is from SciTE showing
+    that the program has finished and displaying its exit code. An exit code of zero indicates a
+    successful run. <br />
+
+    <p>
+       SciTE partially understands the error messages produced by Python, GCC, Visual C++, Borland
+      C++, PHP and other tools which use the same format as one of these. To see this, add a mistake to
+      the Python file by adding a second line to make the file:
+    </p>
+    <blockquote>
+        <code>
+        <span style="color:#000080;font-weight:bold;">print</span><span style="color:#000000;font-weight:bold;">(</span><span style="color:#800080;">"hi"</span><span style="color:#000000;font-weight:bold;">)</span>
+        <br />
+        mistake
+        </code>
+    </blockquote>
+    <p>
+       Perform the Tools | Go command. The results should look like:
+    </p>
+    <blockquote>
+<pre>
+<span style="color:#0000FF">&gt;pythonw -u printhi.py</span>
+hi
+Traceback (most recent call last):
+  <span style="color:#FF0000">File "printhi.py", line 2, in &lt;module&gt;</span>
+    mistake
+NameError: name 'mistake' is not defined
+<span style="color:#0000FF">&gt;Exit code: 1</span>
+</pre>
+    </blockquote>
+    <p>
+       While it is easy to see where the problem is in this simple case, when a file is larger the
+      Tools | Next Message command can be used to view each of the reported errors. Upon performing
+      Tools | Next Message, the first error message in the output pane is highlighted with a yellow
+      background, and an error indicator is displayed for the appropriate line in the editing pane.
+      The caret is moved to this line and the pane is scrolled if needed to show the line. SciTE
+      now looks like this:
+    </p>
+    <img src="PrintHi.png" alt="SciTE after running Python interpreter" />
+    <p>
+       SciTE understands both the file name and line number parts of error messages in most cases
+      so can open another file (such as a header file) if errors were caused by that file. This
+      feature may not work where the file name is complicated by containing spaces or ".."
+    </p>
+    <p>
+       If command execution has failed and is taking too long to complete then the Tools | Stop
+      Executing command can be used.
+    </p>
+    <h3 id="CommandSubsystem">
+       Command subsystem
+    </h3>
+    <p>
+    Tools can be executed in various modes by SciTE which are called "subsystems". Different
+    subsystems are supported on Windows, GTK and macOS. The default subsystem is 0.
+    </p>
+    <table class="windowsonly" cellpadding="0" cellspacing="0" border="1" summary="Command line commands">
+    <thead><tr><td colspan="3">Windows</td></tr></thead>
+    <tr><td>0</td><td>console</td><td>Command line programs<br/>Do not use for GUI programs as their windows will not be visible.</td></tr>
+    <tr><td>1</td><td>windows</td><td>Programs that create their own windows</td></tr>
+    <tr><td>2</td><td>shellexec</td><td>Run using ShellExecute<br />
+    A good way to open HTML files and
+      similar as it handles this similarly to a user opening the file from the shell.</td></tr>
+    <tr><td>3</td><td>lua<br />director</td><td>Internal extension or director extension</td></tr>
+    <tr><td>4</td><td>htmlhelp</td><td>Open in HtmlHelp program<br />
+        Two part command separated by ! with the first
+        part being the topic to search for and the second the name of the help file
+    </td></tr>
+    <tr><td>5</td><td>winhelp</td><td>Open with WinHelp function<br />
+    Two part command similar to subsystem 4</td></tr>
+    <tr><td>7</td><td>immediate</td><td>Internal script that is executed immediately instead of being queued.</td></tr>
+    </table>
+    <br />
+    <table class="gtkonly" cellpadding="0" cellspacing="0" border="1" summary="Command line commands">
+    <thead><tr><td colspan="3">GTK and macOS</td></tr></thead>
+    <tr><td>0</td><td>console</td><td>Execute tool and wait for it to finish</td></tr>
+    <tr><td>2</td><td>shellexec</td><td>Execute in background</td></tr>
+    <tr><td>3</td><td>lua<br />director</td><td>Internal extension or director extension</td></tr>
+    <tr><td>7</td><td>immediate</td><td>Internal script that is executed immediately instead of being queued.</td></tr>
+    </table>
+    <h3 id="CommandLineArguments">
+       Command line arguments
+    </h3>
+    <p>
+       Command line arguments to SciTE include file names, commands and properties.
+       Commands and properties are preceded by "-" and are differentiated by the use in
+       commands of ':' as the first character that is not '.' or alphabetic.
+       Properties use the syntax used in property set files and override any
+       properties set in property files. If there is no value given for a property, it is set to 1.
+       Double quotes may be placed around arguments that contain spaces but they must be
+       placed around the whole argument, not just around a file name, so "-open:x y.txt" works but
+       -open:"x y.txt" doesn't.
+       On Linux, the standard shell quoting is available.
+       The "-p" argument causes SciTE to print the file and then exit.
+    </p>
+    <p>
+        For <span class="windowsonly">Windows</span>:<br />
+        The command line arguments "-" and "--" (without the quotes) are special in that they read the
+        stdin stream into the last buffer ("-"), or the output pane ("--"))<br />
+        The command line argument "-@" (without the quotes) is special in that file names are read from stdin
+        and opened.<br />
+        <b>Note:</b> when reading stdin into the output pane, when the property split.vertical is 0, the
+        output pane is increased to its maximum height.  When the property split.vertical is 1, the output pane is
+        increased to approximately half of the screen width.<br />
+        <b>Note:</b> If stdin is not redirected, these arguments are effectively ignored.
+    </p>
+    <div>
+       For example,</div>
+       <div class="example">
+       SciTE "-font.base=font:MS Gothic,size:11" -save.recent ScintillaGTK.cxx
+       </div>
+       <div>starts SciTE, opens ScintillaGTK.cxx, loads the recent file list, and uses
+       11 point MS Gothic as the base font.<br />
+       A group of properties can be saved as a property set file (with the extension
+       ".properties") and the import command used on the command line:</div>
+       <div class="example">
+       SciTE "-import c:\os\web_work" SciTEDoc.html
+       </div>
+       <p>
+       A few commands are currently available although this will expand in the future.
+       These commands are available:</p>
+       <table cellpadding="0" cellspacing="0" border="1" summary="Command line commands">
+        <thead>
+        <tr><th>Command</th><th>Argument</th></tr>
+        </thead>
+        <tr><td>close:</td><td></td></tr>
+        <tr><td>cwd:</td><td>change working directory</td></tr>
+        <tr><td>find:</td><td>search text</td></tr>
+        <tr><td>goto:</td><td>line number[,column number]</td></tr>
+        <tr><td>open:</td><td>file name</td></tr>
+        <tr><td>loadsession:</td><td>file name</td></tr>
+        <tr><td>quit:</td><td></td></tr>
+        <tr><td>replaceall:</td><td>search text\000replacement text</td></tr>
+        <tr><td>saveas:</td><td>file name</td></tr>
+       </table>
+       <br />
+       Commands use C style escape sequences which include:
+       <table cellpadding="0" cellspacing="0" border="1"  summary="Command line escape sequences">
+        <thead>
+        <tr><th>Escape Sequence</th><th>Meaning</th></tr>
+        </thead>
+        <tr><td>\\</td><td>backslash</td></tr>
+        <tr><td>\a</td><td>bell</td></tr>
+        <tr><td>\b</td><td>backspace</td></tr>
+        <tr><td>\f</td><td>form feed</td></tr>
+        <tr><td>\n</td><td>new line</td></tr>
+        <tr><td>\r</td><td>carriage return</td></tr>
+        <tr><td>\t</td><td>tab</td></tr>
+        <tr><td>\v</td><td>vertical tab</td></tr>
+        <tr><td>\&lt;ooo&gt;</td><td>octal number specified by 1, 2, or 3 digits</td></tr>
+        <tr><td>\x&lt;hh&gt;</td><td>hexadecimal number specified by 2 digits</td></tr>
+       </table>
+       Windows paths normally use "\" to separate directories and these should be doubled in commands.
+       "/" may be used instead to separate directories on Windows.<br />
+       The following opens /big/icon.txt:<br />
+       <div class="example">
+       SciTE -open:/big/icon.txt
+       </div>
+       On Windows, the following opens C:\Program Files\SciTE\SciTEDoc.html
+       and goes to the 123rd line:<br />
+       <div class="example">
+       SciTE "-open:C:\\Program Files\\SciTE\\SciTEDoc.html" -goto:123
+       </div>
+    <p>
+        Command line arguments are evaluated left to right in two phases because
+        opening files requires the user interface to be available and there is also a need
+        to set some user interface properties before the user interface is displayed.
+        The first phase process arguments until just before the first file name would be opened.
+        The second phase processes the remaining arguments.
+    </p>
+    <p>
+        So, if you need to perform e.g. a find: or a goto: command on a file, you must put
+        the command after the filename, to allow SciTE to open the file before performing the command.
+    </p>
+        <p>
+        For <span class="windowsonly">Windows</span>:<br />
+        If any simple file name on the command line matches a directory name, the file open dialog appears - this is dependent upon the property
+        "open.dialog.in.file.directory"<br /><br />
+        If the property "buffers" is greater than one and the file name matches either a existing file or by means of a wildcard search, one or more files, the
+        matching files are loaded up to the property "buffers" count.  Directories are not considered a match in this case<br /><br />
+        If the file name is an extension, optionally preceded by a path, and no such simple file name exists, the file open dialog appears, with the given extension as
+        the filter.<br /><br />
+        If the file name contains no extension, the property "source.default.extensions" is used to provide default extensions to attempt to match the file name to an
+        existing file.
+        </p>
+    <h3 id="Buffers">
+       Buffers
+    </h3>
+    <p>
+       SciTE may be configured to use between 1 and 100 buffers each containing a
+       file. The default is 1 and this effectively turns off buffers. With more than one buffer,
+       the Buffers menu can be used to switch between buffers, either by selecting the
+       file name or using the Previous (F6) and Next (Shift+F6) commands.
+       A tab is displayed for each buffer in the tab bar although this can be turned off with the
+       View | Tab Bar command.
+       A tab may be closed by clicking on it with the middle mouse button.
+       Setting large numbers of buffers may cause problems as some menus are fixed in length
+       and thus files beyond that length may not be accessible.
+     </p>
+     <p>
+       When all the buffers contain files, then opening a new file causes a buffer to be reused
+       which may require a file to be saved. In this case an alert is displayed to ensure the user
+       wants the file saved.
+    </p>
+    <h3 id="Sessions">
+        Sessions
+    </h3>
+     <p>
+        A session is a list of file names. You can save a complete set of your
+        currently opened buffers as a session for fast batch-loading in the
+        future.
+        Sessions are stored as properties files with the extension ".session".
+     </p>
+     <p>
+        Use File | Load Session and File | Save Session to load/save sessions.
+        You can turn on/off "last session autoloading" using SciTE properties
+        variable "save.session".
+     </p>
+     <p>
+        If "buffers" variable is set to "0" session management is turned off.
+     </p>
+     <p>
+        Loading previously saved session will close your currently opened
+        buffers. However you will not lose your edits, because you will be
+        asked to save unsaved buffers first.
+     </p>
+     <p>
+        Opening a specific file from command line overrides "save.session"
+        variable state. When you start SciTE loading a specific file from
+        command line last session will not restore even if "save.session"
+        variable is set to "1". This makes "save.session" safe to use - you
+        will never open a couple of files when you are trying to open just
+        one, specific file.
+     </p>
+     <p>
+        By setting "session.bookmarks" and "session.folds" variables bookmarks
+        and folding states of the currently opened buffers are saved in session
+        files and restored when sessions are loaded.
+     </p>
+    <h3 id="Languages">
+       Languages understood by SciTE
+    </h3>
+    <p>
+       SciTE currently is able to syntax style these languages (* denotes
+       support for folding):
+    </p>
+    <ul>
+        <li>Abaqus*</li>
+        <li>Ada</li>
+        <li>ANS.1 MIB definition files*</li>
+        <li>APDL</li>
+        <li>Assembler (NASM, MASM)</li>
+        <li>Asymptote*</li>
+        <li>AutoIt*</li>
+        <li>Avenue*</li>
+        <li>Batch files (MS-DOS)</li>
+        <li>Baan*</li>
+        <li>Bash*</li>
+        <li>BlitzBasic*</li>
+        <li>Bullant*</li>
+        <li>C/C++/C#*</li>
+        <li>Clarion*</li>
+        <li>cmake*</li>
+        <li>COBOL</li>
+        <li>Coffeescript</li>
+        <li>conf (Apache)*</li>
+        <li>CSound*</li>
+        <li>CSS*</li>
+        <li>D</li>
+        <li>diff files*</li>
+        <li>E-Script*</li>
+        <li>Eiffel*</li>
+        <li>Erlang*</li>
+        <li>Flagship (Clipper / XBase)*</li>
+        <li>Flash (ActionScript)*</li>
+        <li>Fortran*</li>
+        <li>Forth*</li>
+        <li>GAP*</li>
+        <li>Gettext</li>
+        <li>Go*</li>
+        <li>Haskell</li>
+        <li>HTML*</li>
+        <li>HTML with embedded JavaScript, VBScript, PHP and ASP*</li>
+        <li>Gui4Cli*</li>
+        <li>IDL - both MSIDL and XPIDL*</li>
+        <li>INI, properties* and similar</li>
+        <li>InnoSetup*</li>
+        <li>Intel HEX*</li>
+        <li>Java*</li>
+        <li>JavaScript*</li>
+        <li>JSON and JSON-LD</li>
+        <li>KiXtart</li>
+        <li>LISP*</li>
+        <li>LOT*</li>
+        <li>Lout*</li>
+        <li>Lua*</li>
+        <li>Make</li>
+        <li>Matlab*</li>
+        <li>Maxima*</li>
+        <li>Metapost*</li>
+        <li>MMIXAL</li>
+        <li>MSSQL</li>
+        <li>Modula 3</li>
+        <li>Nimrod</li>
+        <li>nnCron</li>
+        <li>NSIS*</li>
+        <li>Objective C</li>
+        <li>Objective Caml*</li>
+        <li>Opal</li>
+        <li>Octave*</li>
+        <li>Pascal/Delphi*</li>
+        <li>Perl, most of it except for some ambiguous cases*</li>
+        <li>PL/M*</li>
+        <li>Progress*</li>
+        <li>PostScript*</li>
+        <li>POV-Ray*</li>
+        <li>PowerBasic*</li>
+        <li>PowerShell*</li>
+        <li>PowerPro</li>
+        <li>PureBasic*</li>
+        <li>Python*</li>
+        <li>R*</li>
+        <li>Rebol*</li>
+        <li>Registry</li>
+        <li>Ruby*</li>
+        <li>Rust</li>
+        <li>Scheme*</li>
+        <li>scriptol*</li>
+        <li>SORCUS Installation</li>
+        <li>Specman E*</li>
+        <li>Spice</li>
+        <li>Smalltalk</li>
+        <li>SQL and PLSQL</li>
+        <li>S-Record</li>
+        <li>Swift</li>
+        <li>TADS3*</li>
+        <li>TeX and LaTeX</li>
+        <li>Tcl/Tk*</li>
+        <li>Vala*</li>
+        <li>VB and VBScript*</li>
+        <li>Verilog*</li>
+        <li>VHDL*</li>
+        <li>XML*</li>
+        <li>YAML*</li>
+    </ul>
+    <p>
+       Running and building commands for some of these languages have been set up but should be
+      checked as they will have to be modified to work for many people.
+    </p>
+    <p>
+      To keep menus to a reasonable length some languages are included but have been commented
+      out in global options. These should be enabled by removing the comment character '#'.
+    </p>
+    <p>
+      Language settings are determined from the file extension but this can be changed
+      by selecting another language from the Language menu. The language menu can be
+      changed with the menu.language property.
+    </p>
+    <h3 id="FindReplace">
+       Find and Replace
+    </h3>
+    <p>
+       Either dialogs or strips may be used for find and replace, with dialogs being the default.
+       Strips are similar to find in web browsers, appearing at the bottom of the
+       window and are smaller and less distracting than dialogs.
+       They are specified with the find.use.strip and replace.use.strip properties.
+    </p>
+    <p>
+       SciTE has options to allow searching for words, regular expressions,
+       matching case, in the reverse direction, wrapping around the end of the
+       document.
+       C style backslash escapes which are listed in the command line
+       arguments section, may be used to search and replace control
+       characters.
+       Replacements can be made individually, over the current selection or
+       over the whole file. When regular expressions are used tagged
+       subexpressions can be used in the replacement text.
+       Regular expressions will not match across a line end.
+    </p>
+    <p>
+       SciTE supports
+       <a href="SciTERegEx.html">basic regular expressions</a>
+       with tagging.
+    </p>
+    <p>
+       On Windows, pressing Shift+Enter when the focus is in a text entry field will search
+       in the opposite of the current direction, so will normally search backwards.
+    </p>
+    <h3 id="Keyboard">
+       Keyboard commands
+    </h3>
+    <p>
+       Keyboard commands in SciTE mostly follow common Windows and GTK conventions.
+       All movement keys (arrows, page up/down, home and end)
+       allow to extend or reduce a stream selection when holding the Shift key,
+       and a rectangular selection when holding the Shift and Alt keys.
+       Some keys may not be available with some national keyboards or because
+       they are taken by the system such as by a window manager on GTK.
+       The user.shortcuts setting may be used to assign a key to a function.
+       Note that Home key behaviour is changed by the vc.home.key option.
+       Keyboard equivalents of menu commands are listed in the menus.
+       macOS keys differ from the other platforms with the command key &#8984;
+       often used where the Ctrl key is used on Windows and GTK.
+       Some less common commands with no menu equivalent are:
+    </p>
+<table cellpadding="0" cellspacing="0" border="1" summary="Keyboard commands">
+      <thead>
+        <tr><th>Command</th><th>Key</th><th align="left">macOS Key<br />
+        &#8679; shift<br/>
+        &#8963; control<br />
+        &#8997; option<br />
+        &#8984; command</th></tr>
+      </thead>
+      <tr>
+        <td>Magnify text size.</td><td>Ctrl+Keypad+</td><td>Trackpad expand gesture</td>
+      </tr>
+      <tr>
+        <td>Reduce text size.</td><td>Ctrl+Keypad-</td><td>Trackpad reduce gesture</td>
+      </tr>
+      <tr>
+        <td>Restore text size to normal.</td><td>Ctrl+Keypad/</td><td></td>
+      </tr>
+      <tr>
+        <td>Cycle through recent files.</td><td>Ctrl+Tab</td><td>F6</td>
+      </tr>
+      <tr>
+        <td>Indent block.</td><td>Tab</td><td>tab</td>
+      </tr>
+      <tr>
+        <td>Dedent block.</td><td>Shift+Tab</td><td>&#8679;tab</td>
+      </tr>
+      <tr>
+        <td>Delete to start of word.</td><td>Ctrl+BackSpace</td><td>&#8984;delete</td>
+      </tr>
+      <tr>
+        <td>Delete to end of word.</td><td>Ctrl+Delete</td><td>fn&#8984;delete</td>
+      </tr>
+      <tr>
+        <td>Delete to start of line.</td><td>Ctrl+Shift+BackSpace</td><td>&#8679;&#8984;delete</td>
+      </tr>
+      <tr>
+        <td>Delete to end of line.</td><td>Ctrl+Shift+Delete</td><td>fn&#8679;&#8984;delete</td>
+      </tr>
+      <tr>
+        <td>Go to start of document.</td><td>Ctrl+Home</td><td>&#8984;&uarr;</td>
+      </tr>
+      <tr>
+        <td>Extend selection to start of document.</td><td>Ctrl+Shift+Home</td><td>&#8679;&#8984;&uarr;</td>
+      </tr>
+      <tr>
+        <td>Go to start of display line.</td><td>Alt+Home</td><td>fn&#8997;&larr;</td>
+      </tr>
+      <tr>
+        <td>Go to end of document.</td><td>Ctrl+End</td><td>&#8984;&darr;</td>
+      </tr>
+      <tr>
+        <td>Extend selection to end of document.</td><td>Ctrl+Shift+End</td><td>&#8679;&#8984;&darr;</td>
+      </tr>
+      <tr>
+        <td>Go to end of display line.</td><td>Alt+End</td><td>fn&#8997;&rarr;</td>
+      </tr>
+      <tr>
+        <td>Expand or contract a fold point.</td><td>Ctrl+Keypad*</td><td></td>
+      </tr>
+      <tr>
+        <td>Select to next bookmark.</td><td>Alt+F2</td><td></td>
+      </tr>
+      <tr>
+        <td>Select to previous bookmark.</td><td>Alt+Shift+F2</td><td></td>
+      </tr>
+      <tr>
+        <td>Find selection.</td><td>Ctrl+F3</td><td></td>
+      </tr>
+      <tr>
+        <td>Find selection backwards.</td><td>Ctrl+Shift+F3</td><td></td>
+      </tr>
+      <tr>
+        <td>Scroll up.</td><td>Ctrl+Up</td><td></td>
+      </tr>
+      <tr>
+        <td>Scroll down.</td><td>Ctrl+Down</td><td></td>
+      </tr>
+      <tr>
+        <td>Line cut.</td><td>Ctrl+L</td><td>&#8984;L</td>
+      </tr>
+      <tr>
+        <td>Line copy.</td><td>Ctrl+Shift+T</td><td>&#8679;&#8984;T</td>
+      </tr>
+      <tr>
+        <td>Line delete.</td><td>Ctrl+Shift+L</td><td>&#8679;&#8984;L</td>
+      </tr>
+      <tr>
+        <td>Line transpose with previous.</td><td>Ctrl+T</td><td>&#8984;T</td>
+      </tr>
+      <tr>
+        <td>Selection duplicate.</td><td>Ctrl+D</td><td>&#8984;D</td>
+      </tr>
+      <tr>
+        <td>Find matching preprocessor conditional, skipping nested ones.</td><td>Ctrl+K</td><td></td>
+      </tr>
+      <tr>
+        <td>Select to matching preprocessor conditional.</td><td>Ctrl+Shift+K</td><td></td>
+      </tr>
+      <tr>
+        <td>Find matching preprocessor conditional backwards, skipping nested ones.</td><td>Ctrl+J</td><td></td>
+      </tr>
+      <tr>
+        <td>Select to matching preprocessor conditional backwards.</td><td>Ctrl+Shift+J</td><td></td>
+      </tr>
+      <tr>
+        <td>Previous paragraph. Shift extends selection.</td><td>Ctrl+[</td><td>&#8984;[</td>
+      </tr>
+      <tr>
+        <td>Next paragraph. Shift extends selection.</td><td>Ctrl+]</td><td>&#8984;]</td>
+      </tr>
+      <tr>
+        <td>Previous word. Shift extends selection.</td><td>Ctrl+Left</td><td>&#8963;&larr;</td>
+      </tr>
+      <tr>
+        <td>Next word. Shift extends selection.</td><td>Ctrl+Right</td><td>&#8963;&rarr;</td>
+      </tr>
+      <tr>
+        <td>Previous word part. Shift extends selection</td><td>Ctrl+/</td><td>&#8984;/</td>
+      </tr>
+      <tr>
+        <td>Next word part. Shift extends selection.</td><td>Ctrl+\</td><td>&#8984;\</td>
+      </tr>
+      <tr>
+        <td>Rectangular block selection.</td><td>Alt+Shift+Movement</td><td>&#8679;&#8997;Movement</td>
+      </tr>
+      <tr>
+        <td>Extend rectangular selection to start of line.</td><td>Alt+Shift+Home</td><td></td>
+      </tr>
+      <tr>
+        <td>Extend rectangular selection to end of line.</td><td>Alt+Shift+End</td><td></td>
+      </tr>
+    </table>
+    <p class="windowsonly">
+       On Windows, a search can be performed in the opposite direction by
+       using Shift+Enter in the Find or Replace strips or dialogs.
+    </p>
+    <h3 id="Abbreviations">
+       Abbreviations
+    </h3>
+    <p>
+       To use an abbreviation, type it and use the Expand Abbreviation
+       command or the Ctrl+B key. The abbreviation is replaced by an
+       expansion defined in the Abbreviations file. You can open the
+       Abbreviations file with a command in the Options menu and
+       add abbreviations. There is a default abbreviations file but a different
+       abbreviations file can be set for particular file extensions.
+    </p>
+    <p>
+       Each line in the files looks like "abbreviation=expansion".<br />
+       The abbreviations names can have any character (except perhaps control chars,
+       surely for CR and LF), including high Ascii chars (accented chars).<br />
+       Names have properties files limits: they cannot start with sharp (#) or space or tab
+       (but can have spaces inside); and they cannot have '=' character inside.<br />
+       Abbreviations names are limited to 32 characters. It is probably enough for
+       <em>abbreviations</em>...<br />
+    </p>
+    <p>
+       An expansion may contain new line characters indicated by '\n' and
+       a caret position indicated by the '|' character. To include a literal '|'
+       character, use '||'.<br />
+       Some simple examples are included in the distributed Abbreviations file.<br />
+       When expanding, the names don't need to be separated from the previous text.
+       Ie. if you define 'é' as '&amp;eacute;', you can expand it inside a word.<br />
+       When multiple abbreviation names match, the longest matching name will be expanded.
+    </p>
+    <h3 id="Folding">
+       Folding
+    </h3>
+    <p>
+       SciTE supports folding for many languages (see the list of languages
+       understood by SciTE for more information.) Fold points are based upon
+       indentation for Python and on counting braces for the other languages.
+    </p>
+
+    <p>
+       The fold point markers (in the fold margin) can be clicked to expand and
+       contract folds. Normal clicking does not alter the fold state of child fold
+       points; naturally the children are hidden when the parent fold is
+       contracted, but when the parent is expanded again, each child is still
+       folded or not, as before.
+    </p>
+
+    <p>
+       Ctrl+Click on a fold point toggles it and performs the same operation on
+       all children.
+    </p>
+
+    <p>
+       Shift+Click on a fold point does not toggle that fold, it expands all the
+       child folds.
+    </p>
+
+    <p>
+       Ctrl+Shift+Click in the fold margin expands or contracts all the top level
+       folds.
+       "Toggle all folds" in the View menu does the same; it toggles only
+       top-level folds.
+    </p>
+
+    <p>
+       Tip:
+       To open a large code block with all its children folded, fold it with
+       Ctrl+Click, then open it with a normal click. Then on opening a child fold,
+       you will see that the grandchild folds are still closed; if you want those
+       'grandchild' folds open, Shift+Click the child fold.
+    </p>
+    <h3 id="PropertiesFile">
+       Properties file
+    </h3>
+    <p>
+       Much of SciTE's behaviour can be changed by editing the properties files.
+    </p>
+    <p>
+       There are four properties files used:</p>
+       <ul>
+       <li>Local properties file called "SciTE.properties" which may be
+       present in the same directory as the file being edited.</li>
+       <li>Directory properties file called "SciTEDirectory.properties" which may be
+       present in the same or in a parent directory as the file being edited.</li>
+       <li>User properties file called "SciTEUser.properties" on Windows
+       and ".SciTEUser.properties" on GTK.</li>
+       <li>Global properties file called "SciTEGlobal.properties".</li>
+       </ul>
+    <p>
+      Settings in the local properties file override those in the directory properties file
+      which overrides those in the user properties file which override those
+      in the global properties files. Environment variables are also available as properties and these
+      are overridden by an explicit setting in one of the properties files.
+    </p>
+    <p>
+      The directory properties file can be used as project options file where user commands and
+      compile, build commands should work in the same manner in subdirectories of a project. The
+      benefit is that local properties files in subdirectories can be replaced by one properties file
+      which is located at the root of the project.
+      The evaluation of the directory properties file is disabled by default and must be enabled by
+      setting the variable properties.directory.enable to 1 in the user or global properties file.
+    </p>
+    <p>
+      The user properties file is intended for customisation by the user,
+      leaving the global properties file to contain the default options distributed with SciTE.
+      The main use of the local properties files is to change the effects of the
+      Compile, Build and Go commands for the files in a directory. For example, I use the javac
+      compiler from the Java Development Kit for most work, so SciTEGlobal.properties sets the
+      command for compiling .java files to "javac". If I want to use the jvc compiler for the files
+      in one directory, then the SciTE.properties file in that directory contains an entry setting
+      the command to "jvc".
+    </p>
+    <p>
+      The global properties file should not be edited by the user as it is replaced with
+      each release. Instead copy the property into the user properties file
+      and change it there.
+    </p>
+    <p>
+     On Windows, the global properties file is located in the directory of the executable.
+      The user properties file is looked for in the user profile directory as set in the
+      USERPROFILE environment variable, or in the directory of the executable if
+      USERPROFILE is not set.
+      For GTK the user properties file is found in the user's home directory and the global
+      properties in a directory set at build time - normally /usr/share/scite.
+    </p>
+    <p>
+      There are two environment variables, "SciTE_HOME" and "SciTE_USERHOME", which the user
+      may set to override the standard locations of the global and/or the user properties files
+      (this and the following applies to Windows and GTK):
+    </p>
+    <ul>
+        <li>If SciTE_USERHOME is set then it is where the user properties files are found.</li>
+        <li>If SciTE_HOME is set then it is where the global properties files are found.</li>
+        <li>If <b>only</b> SciTE_HOME is set then it is where both the global and user properties
+            files are found.</li>
+    </ul>
+    <p>
+       There are commands in the Options menu for opening each of the properties files.
+    </p>
+    <p>
+       The files are in approximately the same format as Java properties files which have a simple
+      text format. Lines that start with '#' or that are completely blank are comments. Other lines
+      are of the form
+    </p>
+    <p>
+       variable=value
+    </p>
+    <p>
+       For long values, a '\' character at the end of the line continues that value on the next line.
+       Space characters are significant in values but leading and trailing spaces are not significant in variable names
+       so "<span class="example">&nbsp;x&nbsp;=1</span>" defines a variable called "x".
+       Values may include the values of other variables by using $(variablename).
+      </p>
+      <p>
+      The "=" function compares strings (separated by ";") and if they are the same yields "1" else "0".
+      To test if the value of "Status" is "2":
+      <span class="example">$(= $(Status);2)</span>
+      </p>
+      <p>
+      The "star" function may be used to collect the values of all variables that start with a particular prefix.
+      <span class="example">all.languages=$(star&nbsp;language.)</span> finds every variable
+      that starts with "language." and assigns that to all.languages.
+      This can be used to combine settings from many files for user interface elements such as the Language menu.
+      Within a property file level (local, directory, user, global) the ordering is alphabetically by variable name
+      which allows a degree of control over the ordering.
+      Prefixes that are used by the standard distribution are
+      <a href="#property-star-filter">"*filter."</a>, <a href="#property-star-language">"*language."</a>,
+      and <a href="#property-star-source.patterns">"*source.patterns."</a> with the
+      initial "*" being a convention that the variables are meant for use in a star function.
+      These prefixes are discussed in the <a href="#DefinedVariables">"Defined variables"</a> section.
+      </p>
+      <p>
+      Colours are defined like HTML with '#' followed by 6 or 8 hexadecimal digits #RRGGBB or #RRGGBBAA
+      defining the red, green, blue, and alpha values of the colour.
+      Alpha is the degree of translucency with 00 completely transparent and FF completely opaque.
+      A 6 digit colour is assumed to be completely opaque.
+      Only a few settings can currently be set translucent with an 8-digit value.
+      </p>
+      <p>
+      On Windows, values may be scaled using the current screen dots-per-inch so that they use more
+      pixels on high resolution screens and appear a reasonable size.
+      <span class="example">margin.width=$(scale&nbsp;16)</span> makes the margin 16 pixels wide
+      on a normal screen and 32 pixels wide when the screen is set to 200%.
+      </p>
+      <p>
+      There are
+      some variables set by the environment to access the name of the current file as well:
+    </p>
+       <table cellpadding="0" cellspacing="0" border="1" summary="Variables set by the environment for use in property files">
+        <thead>
+        <tr><th>Name</th><th>Meaning</th></tr>
+        </thead>
+               <tr id='property-FilePath'><td>FilePath</td><td>full path of the current file</td></tr>
+               <tr id='property-FileDir'><td>FileDir</td><td>directory of the current file without a trailing slash</td></tr>
+               <tr id='property-FileName'><td>FileName</td><td>base name of the current file</td></tr>
+               <tr id='property-FileExt'><td>FileExt</td><td>extension of the current file</td></tr>
+               <tr id='property-FileNameExt'><td>FileNameExt</td><td>$(FileName).$(FileExt)</td></tr>
+               <tr id='property-Language'><td>Language</td><td>name of the lexer used for the current file</td></tr>
+               <tr id='property-SessionPath'><td>SessionPath</td><td>full path of the current session</td></tr>
+               <tr id='property-CurrentSelection'><td>CurrentSelection</td><td>value of the currently selected text</td></tr>
+               <tr id='property-CurrentWord'><td>CurrentWord</td><td>value of word which the caret is within or near</td></tr>
+               <tr id='property-Replacements'><td>Replacements</td><td>number of replacements made by last Replace command</td></tr>
+               <tr id='property-SelectionStartColumn'><td>SelectionStartColumn</td><td>column where selection starts</td></tr>
+               <tr id='property-SelectionStartLine'><td>SelectionStartLine</td><td>line where selection starts</td></tr>
+               <tr id='property-SelectionEndColumn'><td>SelectionEndColumn</td><td>column where selection ends</td></tr>
+               <tr id='property-SelectionEndLine'><td>SelectionEndLine</td><td>line where selection ends</td></tr>
+               <tr id='property-CurrentMessage'><td>CurrentMessage</td><td>most recently selected output pane message</td></tr>
+               <tr id='property-SciteDefaultHome'><td>SciteDefaultHome</td><td>directory in which the Global Options file is found</td></tr>
+               <tr id='property-SciteUserHome'><td>SciteUserHome</td><td>directory in which the User Options file is found</td></tr>
+               <tr id='property-SciteDirectoryHome'><td>SciteDirectoryHome</td><td>directory in which the Directory Options file is found</td></tr>
+               <tr id='property-APIPath'><td>APIPath</td><td>list of full paths of API files from api.<i>filepattern</i></td></tr>
+               <tr id='property-AbbrevPath'><td>AbbrevPath</td><td>full path of abbreviations file</td></tr>
+               <tr id='property-ScaleFactor'><td>ScaleFactor</td><td>the screen's scaling factor with a default value of 100</td></tr>
+               <tr id='property-Appearance'><td>Appearance</td><td>whether the system is using a light (0) or dark (1) theme</td></tr>
+               <tr id='property-Contrast'><td>Contrast</td><td>1 when the system is in high-contrast mode else 0</td></tr>
+        </table>
+    <p>
+       Some features use file name patterns to see which variable to use. For example, the lexer
+      variable can be specialised for a particular file, or a group of files based upon wildcard
+      matching so:<br />
+       <b>lexer.makefile=makefile</b> indicates that the lexer called "makefile" should be used on
+      files called "makefile".<br />
+       <b>lexer.*.cxx=cpp</b> indicates that the lexer called "cpp" should be used on files with a
+      "cxx" extension.<br />
+       Variable substitution is available on the left hand side of file pattern assignments and
+      look like this:<br />
+       <b>file.patterns.html=*.html;*.htm;*.asp;*.shtml</b><br />
+       <b>command.go.$(file.patterns.html)=file://$(FilePath)</b>
+    </p>
+    <p>
+    Wildcard matching treats '?' as matching any character and '*' as matching any number of characters, so
+    "*.mak" will match "proj.mak";
+    "Makefile*" will match "Makefile.in"; and
+    "*.x?l" will match "data.xml" and "transform.xsl".
+    </p>
+    <p>
+    Properties files are not treated as having a particular encoding, however individual property values
+    may be treated as having an encoding. For file names, commands, and user interface text, this is
+    UTF-8 so it may be easier to edit properties files as UTF-8 by inserting a coding cookie as explained later.
+    Other properties may be treated as byte sequences (like word.characters.<i>filepattern</i>) or in an implicit
+    encoding (such as keywords.<i>filepattern</i> matching the document encoding) so that it may be better to
+    edit these settings using a non-UTF-8 encoding. Where both UTF-8 and non-UTF-8 values are wanted,
+    two files can be used with different encodings and an import statement to include one in the other.
+    </p>
+    <h3 id="ImportAndConditional">
+       Importing properties files and conditional logic
+    </h3>
+    <p>
+      <a name="property-import"></a>
+       The 'import' statement includes a properties file as if the text were
+       inline at that point. The imported properties file
+       is either relative to the base file or absolute and a '.properties'
+       extension is assumed. Therefore an "import Lua" statement in
+       c:\os\scite\bin\SciTEGlobal.properties will import
+       c:\os\scite\bin\Lua.properties.
+       Any import statements in imported files are relative to directory of the original file,
+       rather than the current file.
+    </p>
+    <p>
+       All of the properties files in a directory can be imported with "import *".
+       This does not import generic properties files like user properties or abbreviations.
+       The set of files that are imported can be controlled with the imports.include and imports.exclude
+       properties.
+    </p>
+    <p>
+       Imported files are not scope walls: properties may be redefined in another file.
+       Thus, if a file contains both "import cplusplus", "import java", and "style.cpp.1=fore:$(comment.colour)" then
+       cplusplus.properties contains "comment.colour=#800000" and java.properties contains
+       "comment.colour=#008000" then the last definition wins and is active for the definitions in the base
+       file as well as any definitions in cplusplus.properties and java.properties.
+    </p>
+    <p>
+      <a name="property-if"></a>
+      The 'if' statement takes one argument which is a
+      symbol or expression that may be defined earlier in this property set file or in a base
+      property set. If the symbol evaluates to '0' then the test fails.
+      An empty string or not present symbol evaluates to 0.
+      An expression that evaluates to 0 or empty fails.
+      Into the very top property set
+      is inserted one of 'PLAT_GTK' with value '1',
+      'PLAT_WIN' with value '1', or 'PLAT_MAC' with value '1'.
+      For both PLAT_GTK and PLAT_MAC, 'PLAT_UNIX' is inserted with value '1'.
+      The system properties Appearance and Contrast are also available for use in expressions.
+      If the test succeeds then following indented statements are executed. When a
+      non-indented statement is found the if clause is finished. Only simple set
+      statements are allowed in if clauses. The evaluation of if statements occurs
+      at read time, not at evaluation time.
+      A reread is forced if either of the system properties changes.
+     <div class="example">
+     if PLAT_WIN<br />
+     &nbsp;&nbsp;&nbsp;&nbsp;caret.fore=#00FF00<br />
+     if $(= $(Appearance);1)<br />
+     &nbsp;&nbsp;&nbsp;&nbsp;caret.fore=#FFFFFF<br />
+     </div>
+    </p>
+    <p>
+      <a name="property-module"></a>
+      The 'module' statement is meant for use in the single-file distribution Sc1 where all of the
+      standard .properties files are joined together as a resource in the executable.
+      The module statement marks which file each segment originally came from so that the
+      imports.include and imports.exclude properties will work with Sc1 and unwanted properties
+      will not be active. The syntax is "module &lt;name&gt;" and the effect is to either process or
+      ignore all text up to the next module statement depending on whether the name is in
+      imports.include or imports.exclude.
+    </p>
+    <h3 id="Parameters">
+       Command parameters and prompting
+    </h3>
+    <p>
+      SciTE has 4 properties $(1) .. $(4) which can be used to run commands with
+      changeable parameters. To set the parameter values, use the View | Parameters
+      command to view the modeless Parameters dialog which shows the current values
+      of these parameters and allows setting new values. The accelerator keys for the main
+      window remain active while this dialog is displayed, so it can be used to rapidly run
+      a command several times with different parameters. Alternatively, a command can be
+      made to display the modal Parameters dialog when executed by starting the
+      command with a '*' which is otherwise ignored. If the modeless Parameters dialog is
+      already visible, then the '*' is ignored.
+    </p>
+    <h3 id="Encodings">
+       Encodings
+    </h3>
+    <p>
+      SciTE will automatically detect the encoding scheme used for Unicode files that
+      start with a Byte Order Mark (BOM).
+      The UTF-8 and UTF-16 encodings are recognised including both Little Endian and
+      Big Endian variants of UTF-16.
+    </p>
+    <p>
+      UTF-8 files will also be recognised when they contain a coding cookie on one of the
+      first two lines. A coding cookie looks similar to "coding: utf-8" ("coding" followed by ':'
+      or '=', optional whitespace, optional quote, "utf-8") and is normally contained in
+      a comment:</p>
+      <div class="example"># -*- coding: utf-8 -*-</div>
+      For XML there is a declaration:<br />
+      <div class="example">&lt;?xml version='1.0' encoding='utf-8'?&gt;</div>
+    <p>
+      For other encodings set the code.page and character.set properties.
+    </p>
+    <h3 id="DefinedVariables">
+      <a name="property-"></a>
+       Defined variables in properties files
+    </h3>
+    <p>
+      Some properties are only available on
+      <span class="windowsonly">Windows</span>,
+      <span class="gtkonly">GTK</span>,
+      <span class="osxonly">macOS</span>, or
+      <span class="windows-osx">Windows &amp; macOS</span>.
+    </p>
+    <table cellpadding="1" cellspacing="0" border="1" summary="Defined variables in property files">
+      <tr id='property-position.left'>
+        <td>
+          <a name='property-position.top'></a><a name='property-position.width'></a><a name='property-position.height'></a><a name='property-position.maximize'></a>
+          position.left<br />
+           position.top<br />
+           position.width<br />
+           position.height<br />
+           position.maximize
+        </td>
+        <td>
+          Set the initial window size and position. If these are omitted then the
+          environment's defaults are used. If the width or height are -1 or the
+          position.maximize property is set then the window is maximised.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-position.tile'>
+        <td>
+          position.tile
+        </td>
+        <td>
+          If there is another copy of SciTE open, set the initial window position to be
+          with the left side at position.left + position.width so that most of the time
+          you can see both copies at once without overlap.
+          Works nicely if position.left set to 0 and position.width set to half of the
+          screen width.
+        </td>
+      </tr>
+      <tr id='property-buffers'>
+        <td>
+          buffers
+        </td>
+        <td>
+          Set to a number between 1 and 100 to configure that many buffers.
+        Values outside this range are clamped to be within the range.
+        The default is 1 which turns off UI features concerned with buffers.<br />
+        This value is read only once, early in the startup process and only from the
+        global and user properties files. So after changing it, restart SciTE to see the effect.
+        </td>
+      </tr>
+      <tr id='property-buffers.zorder.switching'>
+        <td>
+        buffers.zorder.switching
+        </td>
+        <td>
+          This setting chooses the ordering of buffer switching when Ctrl+Tab pressed.
+        Set to 1, the buffers are selected in the order of their previous selection otherwise
+        they are chosen based on the buffer number.
+        </td>
+      </tr>
+      <tr id='property-are.you.sure'>
+        <td>
+          <a name='property-are.you.sure.for.build'></a>
+          are.you.sure<br />
+           are.you.sure.for.build
+        </td>
+        <td>
+          The classic GUI question. Normally, when SciTE is about to close a file which has unsaved
+          edits it asks this annoying question. To turn off the question, set are.you.sure to 0 and
+          files will be automatically saved without bothering the user. To abandon edits to a file
+          use the New command. New always asks "Are you sure?" giving an opportunity to not save
+          the file.<br />
+           When running or building a file, its most likely that you want the file to be saved
+          first. To enable a confirmation dialog for performing Compile, Build or Go commands, set
+          are.you.sure.for.build=1.
+        </td>
+      </tr>
+      <tr id='property-save.all.for.build'>
+        <td>
+           save.all.for.build
+        </td>
+        <td>
+          SciTE normally saves the current buffer when performing a Compile, Build, or Go
+          command. To save all buffers set save.all.for.build=1
+        </td>
+      </tr>
+      <tr id='property-representations'>
+        <td>
+        representations
+        </td>
+        <td>
+          Sets up a different way of displaying particular characters.
+          It contains a list of items separated by ','.
+          An item may define the representation of a character or set an appearance or colour.
+          A representation item contains a character followed by '=' and its representation text.
+          Hexadecimal Unicode escapes may be used: '\x' followed by 2 hexadecimal digits, '\u' followed by 4, or '\U' followed by 8.
+          Appearance items start with '!' followed by an optional appearance number, '0' for plain or '1' for blobs,
+          '' for default.
+          Colour items start with '#' followed by 6 (opaque), 8 (translucent), or 0 (default) hexadecimal digits.
+          By default, representations are shown in the colour of the style of the original text.
+          Appearance and colour items continue to affect following representation items until they are changed or reset.
+          To specify the characters '\', '=', ',', '!', or '#' use an escape.
+          Only single characters can be represented except for the special case of Windows line ends
+          Carriage Return + Line Feed.<br />
+          The following example shows 'π' as a blob 'Pi';
+          '₪' as a blob 'shekel(₪)';
+          and with View | End of Line turned on Carriage Return + Line Feed appears as translucent red text 'crlf'.
+          <div class="example">
+representations=π=Pi,\u20AA=shekel(\u20AA),!0,#FF000090,\x0D\x0A=crlf</div>
+        </td>
+
+        </td>
+      </tr>
+      <tr id='property-view.whitespace'>
+        <td>
+          <a name='property-view.indentation.whitespace'></a>
+          view.whitespace<br />
+        view.indentation.whitespace
+        </td>
+        <td>
+          Setting view.whitespace to 1 makes SciTE start up with whitespace visible.<br />
+          Setting view.indentation.whitespace to 0 hides visible whitespace inside indentation.<br />
+          Setting view.indentation.whitespace to 1 makes indentation whitespace visible<br />
+          Setting view.indentation.whitespace to 2 makes indentation whitespace only visible
+        </td>
+      </tr>
+      <tr id='property-whitespace.fore'>
+        <td>
+          <a name='property-whitespace.back'></a>
+          whitespace.fore<br />
+        whitespace.back
+        </td>
+        <td>
+        Sets the colours used for displaying all visible whitespace, overriding any styling
+        applied by the lexer.
+        </td>
+      </tr>
+      <tr id='property-whitespace.size'>
+        <td>
+          whitespace.size<br />
+        </td>
+        <td>
+        Sets the size used for displaying all visible spaces, especially for when whitespace.fore
+        is set to be subtle.
+        </td>
+      </tr>
+      <tr id='property-view.indentation.guides'>
+        <td>
+          <a name='property-view.indentation.examine'></a><a name='property-highlight.indentation.guides'></a>
+          view.indentation.guides<br />
+          view.indentation.examine<br />
+          view.indentation.examine.<i>filepattern</i><br />
+          highlight.indentation.guides
+        </td>
+        <td>
+          Setting view.indentation.guides to 1 displays dotted vertical lines within indentation white
+          space every indent.size columns.<br />
+          Setting view.indentation.examine to 1 to display guides within real indentation whitespace only,
+          2 according to the next non-empty line (good for Python) or 3 according to both the next and
+          previous non-empty lines (good for most languages).<br />
+          Setting highlight.indentation.guides to 1 highlights the indentation guide associated with a
+          brace when that brace is highlighted.
+        </td>
+      </tr>
+       <tr id='property-view.eol'>
+        <td>
+          view.eol
+        </td>
+        <td>
+          Setting this to 1 makes SciTE display the characters that make up line ends. This looks
+          similar to (CR), (LF), or (CR)(LF). This is useful when using files created on another
+          operating system with software that is picky about line ends.
+        </td>
+      </tr>
+      <tr id='property-eol.mode'>
+        <td>
+          eol.mode
+        </td>
+        <td>
+          The default EOL mode (characters that make up line ends)
+          depends on your platform.
+          You can overwrite this behaviour by setting the property to
+          <div class="example">
+  LF   for UNIX and macOS format<br />
+  CR   for Macintosh format prior to OS X<br />
+  CRLF for DOS/Windows format</div>
+        </td>
+      </tr>
+      <tr id='property-eol.auto'>
+        <td>
+          eol.auto
+        </td>
+        <td>
+          This setting overrides the eol.mode value and chooses the end of
+          line character sequence based on the current contents of the file
+          when it is opened. The line ending used the most in the file is chosen.
+        </td>
+      </tr>
+      <tr id='property-blank.margin.left'>
+        <td>
+          <a name='property-blank.margin.right'></a>
+          <a name='property-output.blank.margin.left'></a>
+          blank.margin.left<br />
+          blank.margin.right<br />
+          output.blank.margin.left
+        </td>
+        <td>
+          There is a blank margin on both sides of the text. It is drawn in the background colour
+          of default text. This defaults to one pixel for both left and right sides but may be
+          altered with these settings.<br />
+          If output.blank.margin.left is set then it overrides blank.margin.left for the output pane.
+        </td>
+      </tr>
+      <tr id='property-margin.width'>
+        <td>
+          margin.width
+        </td>
+        <td>
+          Setting this to a number makes SciTE display a selection margin to the left of the text.
+          The value is the number of pixels wide the selection margin should be. Line markers are
+          displayed in the selection margin area.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-full.screen.hides.menu'>
+        <td>
+          full.screen.hides.menu
+        </td>
+        <td>
+        Setting this to 1 hides the menu bar when the Full Screen command is used on
+        Windows.
+        On GTK the menu is always visible.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-minimize.to.tray'>
+        <td>
+          minimize.to.tray
+        </td>
+        <td>
+        Setting this to 1 minimizes SciTE to the system tray rather than to the task bar.
+        </td>
+      </tr>
+      <tr id='property-line.margin.visible'>
+        <td>
+          <a name='property-line.margin.width'></a>
+          line.margin.visible<br />
+          line.margin.width
+        </td>
+        <td>
+          SciTE is able to display a column of line numbers to the left of the selection
+          margin.  Setting line.margin.visible to 1 makes this column visible at startup.
+          The line.margin.width property controls how much space is reserved for the line
+          numbers, in terms of the number of digits that can be displayed.  To specify that
+          the margin should expand if needed to accommodate larger line numbers, add a '+'
+          after the number of digits, e.g. <span class="example">line.margin.width=3+</span>.
+        </td>
+      </tr>
+      <tr id='property-tabbar.visible'>
+        <td>
+          tabbar.visible
+        </td>
+        <td>
+          Setting tabbar.visible to 1 makes the tab bar visible at start up.
+          The buffers property must be set to a value greater than 1 for this option to work.
+        </td>
+      </tr>
+      <tr id='property-tabbar.hide.one'>
+        <td>
+          tabbar.hide.one
+        </td>
+        <td>
+          Setting tabbar.hide.one to 1 hides the tab bar until there is more than one tab.
+        </td>
+      </tr>
+      <tr id='property-tabbar.hide.index'>
+        <td>
+          tabbar.hide.index
+        </td>
+        <td>
+          Setting tabbar.hide.index to 1 will hide the buffer number in tabs.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-tabbar.multiline'>
+        <td>
+        tabbar.multiline
+        </td>
+        <td>
+          Setting tabbar.multiline uses multiple lines for the tab bar
+        </td>
+      </tr>
+      <tr id='property-toolbar.visible'>
+        <td>
+          toolbar.visible
+        </td>
+        <td>
+          Setting this to 1 makes the tool bar visible at start up.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-toolbar.large'>
+        <td>
+          toolbar.large
+        </td>
+        <td>
+          Setting this to 1 makes the tool bar larger and use larger icons.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-toolbar.usestockicons'>
+        <td>
+          toolbar.usestockicons
+        </td>
+        <td>
+          SciTE has a built-in icon set for the toolbar, setting this to 1 makes
+        SciTE more integrated in the GNOME desktop by using the icons
+        provided by the current theme used in GNOME.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-pathbar.visible'>
+        <td>
+          pathbar.visible
+        </td>
+        <td>
+          The path bar is a line of text under the tab bar showing the full path of the currently selected tab.
+        Setting pathbar.visible to 1 makes the path bar visible on GTK.
+        </td>
+      </tr>
+      <tr id='property-undo.redo.lazy'>
+        <td>
+          undo.redo.lazy
+        </td>
+        <td>
+          Setting this to 1 changes the technique used to determine when to enable or disable
+          tool bar buttons to be less accurate. This may improve performance on slow machines.
+        </td>
+      </tr>
+      <tr id='property-statusbar.visible'>
+        <td>
+          statusbar.visible
+        </td>
+        <td>
+          Setting this to 1 makes the status bar visible at start up.
+        </td>
+      </tr>
+      <tr class="osxonly" id='property-statusbar.minimum.height'>
+        <td>
+          statusbar.minimum.height
+        </td>
+        <td>
+          On macOS, when the status bar is turned off, it is still visible but only for this
+          height which defaults to 4 pixels. This is because of a bug that causes window corner
+          debris to appear in the margin when scrolling. This parameter may be set to 0
+          if the debris does not appear on a particular setup.
+        </td>
+      </tr>
+      <tr id='property-statusbar.number'>
+        <td>
+          <a name='property-statusbar.text'></a>
+          statusbar.number<br />
+          statusbar.text.<i>number</i>
+        </td>
+        <td>
+        The statusbar.text.1 option defines the information displayed in the status bar
+        by default on all platforms.
+        Property values may be used in this text using the $() syntax.
+          Commonly used properties are: ReadOnly, EOLMode, BufferLength,
+          NbOfLines (in buffer), SelLength (chars), SelHeight (lines).
+          Extra properties defined for the status bar are LineNumber, ColumnNumber, and
+          OverType which is either "OVR" or "INS" depending on the overtype status.
+          You can also use file properties, which, unlike those above, are not updated
+          on each keystroke: FileName or FileNameExt, FileDate and FileTime and
+          FileAttr. Plus CurrentDate and CurrentTime.<br />
+          On Windows only, further texts may be set as statusbar.text.2 .. and these may be
+          cycled between by clicking the status bar.<br />
+          The statusbar.number option defines how many texts are to be cycled through.
+        </td>
+      </tr>
+      <tr id='property-buffered.draw'>
+        <td>
+          buffered.draw
+        </td>
+        <td>
+          Setting this to 1 rather than the default 0 may make SciTE
+          draw output into a buffer bitmap first and then to the screen instead of directly to the
+          screen. On old platforms and some unusual modes this can result in less flickering.
+          but is slower.<br />
+          Has no effect on macOS and may have no effect on other platforms or technology choices.
+        </td>
+      </tr>
+      <tr id='property-phases.draw'>
+        <td>
+          phases.draw
+        </td>
+        <td>
+        There are two orders in which the text area may be drawn offering a trade-off
+        between speed and allowing all pixels of text to be seen even when they overlap
+        other elements.
+        There may be some flickering on some platforms if buffered drawing is not turned on.<br/>
+        Two phase drawing (phases.draw=1)
+        draws all the backgrounds of a line first and then draws the text
+        in transparent mode. Lines are drawn separately and no line will overlap another
+        so any pixels that overlap into another line such as extreme ascenders and
+        descenders on characters will be cut off.<br/>
+        Multiple phase drawing (phases.draw=2)
+        draws the whole area multiple times, once for each feature, building up the
+        the appearance in layers or phases. The coloured backgrounds for all lines are
+        drawn before any text and then all the text is drawn in transparent mode over this
+        combined background without clipping text to the line boundaries. This allows
+        extreme ascenders and descenders to overflow into the adjacent lines.
+        This mode is incompatible with buffered.draw so will be treated as phases.draw=1
+        when buffered.draw=1.<br/>
+        The default is for drawing to be two phase.<br />
+        Single phase drawing (phases.draw=0) is a deprecated mode that was used in previous
+        releases. While it can still be enabled, it is not supported and may cause incorrect drawing.<br/>
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-technology'>
+        <td>
+          technology
+        </td>
+        <td>
+        On Windows Vista or newer, this can be set to 1, 2 or 3 to use the Direct2D and DirectWrite APIs
+        for higher quality antialiased drawing or 0 to use the older GDI. The default is 1.
+        The value 2 causes the frame to be retained after presentation which
+        may prevent drawing failures on some cards and drivers.
+        3 may also prevent drawing failures on some cards and drivers but with lower speed.
+        </td>
+      </tr>
+      <tr id='property-load.on.activate'>
+        <td>
+          <a name='property-save.on.deactivate'></a>
+          load.on.activate<br />
+           save.on.deactivate
+        </td>
+        <td>
+          The load.on.activate property causes SciTE to check whether the current file has been
+          updated by another process whenever it is activated. This is useful when another editor
+          such as a WYSIWYG HTML editor, is being used in conjunction with SciTE.<br />
+           The save.on.deactivate property causes SciTE to save the file whenever the SciTE
+          application loses focus. This is useful when developing web pages and you want to often
+          check the appearance of the page in a browser.
+        </td>
+      </tr>
+       <tr id='property-are.you.sure.on.reload'>
+         <td>
+          are.you.sure.on.reload
+        </td>
+        <td>
+          When both this and load.on.activate are set to 1, SciTE will ask if you really want to
+          reload the modified file, giving you the chance to keep the file as it is. By default this
+          property is disabled, causing SciTE to reload the file without bothering you.
+        </td>
+      </tr>
+      <tr id='property-save.on.timer'>
+        <td>
+           save.on.timer
+        </td>
+        <td>
+          The save.on.timer property causes SciTE to save modified files whenever there have been no
+          modifications for the number of seconds specified by the property.
+          When set to 0, the default, this feature is disabled and files are not automatically saved.
+        </td>
+      </tr>
+      <tr id='property-reload.preserves.undo'>
+        <td>
+          reload.preserves.undo
+        </td>
+        <td>
+          When set to 1, reloading a file does not delete all the undo history. This is useful
+          when load.on.activate is used in conjunction with filter commands.
+        </td>
+      </tr>
+      <tr id='property-check.if.already.open'>
+        <td>
+           check.if.already.open
+        </td>
+        <td>
+        This option allows opening files in an existing instance of SciTE rather than
+        always opening a new instance.
+        When this option is set and SciTE is started, it checks to see if
+        there are any other instances of SciTE open. If there is, another
+        instance is asked to open the file and become active and the new
+        instance exits.
+        On Windows, the instance with the Options | Open Files Here
+        menu item checked opens the file.
+        On GTK, an arbitrary instance opens the file.
+        </td>
+      </tr>
+      <tr id='property-read.only'>
+        <td>
+           read.only
+        </td>
+        <td>
+        When this option is set then opened documents are initially read only.
+        New files are not affected by this setting.
+        </td>
+      </tr>
+      <tr id='property-read.only.indicator'>
+        <td>
+           read.only.indicator
+        </td>
+        <td>
+        If this option is set, SciTE indicates that the buffer is read only
+        by adding a "pipe"-character (|) to the file name in the tab bar and
+        in the buffer menu.
+        </td>
+      </tr>
+      <tr id='property-background.open.size'>
+        <td>
+          <a name='property-background.save.size'></a>
+        background.open.size<br />
+        background.save.size
+        </td>
+        <td>
+          This setting controls whether files are opened and saved without blocking the user interface
+        while they are being read or written.
+        Files larger than the given size in bytes will be read or written in the background while
+        smaller files will be read or written directly and SciTE will not respond until the file access is completed.
+        The default value is -1 allows background processing for all files.
+        For saving, the size used is the in-memory size in bytes which will differ from the on-disk size
+        when the UTF-16 encoding is used.
+        </td>
+      </tr>
+      </tr>
+      <tr id='property-file.size.large'>
+        <td>
+          <a name='property-file.size.large'></a>
+           file.size.large
+        </td>
+        <td>
+          This setting controls whether files are opened into a mode that will work with files larger
+          than 2 gigabytes called 'large mode'.
+          Files larger than the given size in bytes will be opened in large mode.
+          Without this setting, SciTE will use less memory but will fail for files that are
+          larger than 2 gigabytes when opened or grow larger than 2 gigabytes.
+          The default value is 100000000 so files larger than 100,000,000 bytes are opened in large mode.<br />
+          The large mode only works when SciTE is built as a 64-bit application.
+        </td>
+      </tr>
+      <tr id='property-file.size.no.styles'>
+        <td>
+          <a name='property-file.size.no.styles'></a>
+           file.size.no.styles
+        </td>
+        <td>
+          Very large files take a long time to style completely and this can
+          make editing too slow.
+          Files larger than the given size in bytes will be opened with styling turned off.
+          It is only the file size at opening that is considered - styling will not turn on or off
+          when the file size changes during editing.
+          The default value is 1000000 so files larger than 1,000,000 bytes are opened without styling.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-temp.files.sync.load'>
+        <td>
+          temp.files.sync.load
+        </td>
+        <td>
+          Files dropped on SciTE on Windows are normally opened asynchronously
+        as there may be a long list. However, files dragged from some applications
+        such as 7-Zip may only exist for a moment in the temporary directory and
+        be deleted once the drop has occurred.<br />
+        Setting this to 1 makes SciTE open dropped files in the temporary directory
+        immediately.
+        </td>
+      </tr>
+      <tr id='property-quit.on.close.last'>
+        <td>
+           quit.on.close.last
+        </td>
+        <td>
+        If this option is set, SciTE will close when its last buffer has been
+        closed, e.g. with File/Close.  (By default, if this option is not set,
+        SciTE will remain open and will create a new blank document when its
+        last buffer is closed.)
+        </td>
+      </tr>
+      <tr id='property-highlight.current.word'>
+        <td>
+           highlight.current.word
+        </td>
+        <td>
+        When set to 1, all occurrences of the selected word are highlighted with the
+        colour defined by highlight.current.word.colour. By default, this option is disabled. (See indicators.alpha and indicators.under)
+        </td>
+      </tr>
+      <tr id='property-highlight.current.word.indicator'>
+        <td>
+          highlight.current.word.indicator
+        </td>
+        <td>
+          If set, defines the appearance of the current word highlight. This is a
+          <a href="#IndicatorProperty">structured property</a> with multiple attributes similar to:
+         <div class="example">
+              highlight.current.word.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80
+         </div>
+        </td>
+       </tr>
+      <tr id='property-highlight.current.word.colour'>
+        <td>
+           highlight.current.word.colour
+        </td>
+        <td>
+        The option highlight.current.word.colour defines the colour of highlight.
+        The default value is #A0A000.<br />
+        Overridden by highlight.current.word.indicator.
+        </td>
+      </tr>
+      <tr id='property-highlight.current.word.by.style'>
+        <td>
+           highlight.current.word.by.style
+        </td>
+        <td>
+        If the option highlight.current.word.by.style is set, then only words with the same style
+        are highlighted (e.g. if you select this word in a comment, then only occurrences of words in
+        comments are selected).
+        </td>
+      </tr>
+      <tr class="osxonly" id='property-spell.ignore'>
+        <td>
+         spell.ignore.<i>filepattern</i>
+        </td>
+        <td>
+          Specifies a list of words that should not be treated as spelling mistakes for a particular filepattern.
+          For example, in HTML, tag names that are not words are common so turn off the spelling highlight with:
+         <div class="example">
+         spell.ignore.*.html=br ul toc valign blockquote kbd thead tr th tbody colspan</div>
+         To turn spell checking completely off for a filepattern use the value *.
+        </td>
+      </tr>
+      <tr class="osxonly" id='property-spell.mistake.indicator'>
+        <td>
+          spell.mistake.indicator
+        </td>
+        <td>
+          If set, defines the appearance of spelling mistakes. This is a
+          <a href="#IndicatorProperty">structured property</a> with multiple attributes similar to:
+         <div class="example">
+              spell.mistake.indicator=style:squigglepixmap,colour:#FF0000
+         </div>
+        </td>
+       </tr>
+      <tr class="gtkonly" id='property-rectangular.selection.modifier'>
+        <td>
+           rectangular.selection.modifier
+        </td>
+        <td>
+        On GTK, the modifier key used to make rectangular selections can be set with this
+        property. Valid options are 2 (Ctrl), 4 (Alt) or 8 (Super). Super is often assigned to the
+        Windows/Start key on Windows keyboards or the Command key on Mac keyboards.
+        <br />
+        Since the Alt key is often used by window managers to move windows, this will need to
+        be configured off to use the combination in SciTE. This can be done for Metacity using
+        gconf-editor to modify the /apps/metacity/general/mouse_button_modifier. A valid value here
+        is &lt;Super&gt;.
+        </td>
+      </tr>
+      <tr id='property-selection.fore'>
+        <td>
+          <a name='property-selection.back'></a>
+          selection.fore<br />
+          selection.back
+        </td>
+        <td>
+          Sets the colours used for displaying selected text. If one of these is not set then that
+          attribute is not changed for the selection. The default is to show the selection by
+          changing the background to light grey and leaving the foreground the same as when it was
+          not selected.
+          When selection.layer is under text (1) or over text (2), selection.back may be an 8 digit number
+          with translucency as the last two digits.
+          On macOS, the system's selection background may be used when selection.back is set to empty.
+        </td>
+      </tr>
+      <tr id='property-selection.layer'>
+        <td>
+          selection.layer
+        </td>
+        <td>
+          Sets the layer for drawing the selection background:
+          base opaque (0), under text (1), or over text (2).
+        </td>
+      </tr>
+      <tr id='property-selection.additional.fore'>
+        <td>
+          <a name='property-selection.additional.back'></a>
+          selection.additional.fore<br />
+          selection.additional.back
+        </td>
+        <td>
+          Similar to selection.fore, selection.back.
+          Sets the colours used for displaying additional selections when multiple selections are
+          enabled or a rectangular selection is made.
+        </td>
+      </tr>
+      <tr id='property-selection.secondary.fore'>
+        <td>
+          <a name='property-selection.secondary.back'></a>
+          selection.secondary.fore<br />
+          selection.secondary.back
+        </td>
+        <td>
+          Similar to selection.fore and selection.back.
+          Sets the colours used for displaying selections when another window holds the primary selection.
+        </td>
+      </tr>
+      <tr id='property-selection.inactive.fore'>
+        <td>
+          <a name='property-selection.inactive.back'></a>
+          selection.inactive.fore<br />
+          selection.inactive.back
+        </td>
+        <td>
+          Similar to selection.fore and selection.back.
+          Sets the colours used for displaying selections when the window is inactive because it does not have focus.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-selection.always.visible'>
+        <td>
+          selection.always.visible
+        </td>
+        <td>
+          Set to 1 to show the selection coloured even when SciTE is not the active application. Default is 1.
+        </td>
+      </tr>
+      <tr id='property-caret.fore'>
+        <td>
+          caret.fore
+        </td>
+        <td>
+          Sets the colour used for the caret.
+        </td>
+      </tr>
+      <tr id='property-caret.additional.blinks'>
+        <td>
+          caret.additional.blinks
+        </td>
+        <td>
+          Set whether all carets blink. 0 means only the main caret blinks. Default is 1.
+        </td>
+      </tr>
+      <tr id='property-caret.line.back'>
+        <td>
+          <a name='property-caret.line.layer'></a>
+          caret.line.back<br />
+          caret.line.layer
+        </td>
+        <td>
+          Sets the background colour and translucency used for line containing the caret.
+          caret.line.back is the layer to draw the caret line: base opaque (0), under text (1), or over text (2).
+        </td>
+      </tr>
+      <tr id='property-caret.line.frame'>
+        <td>
+          caret.line.frame
+        </td>
+        <td>
+          This setting allows the caret line to be drawn as a rectangle inside the line instead of the whole line.
+          It sets the width of rectanges sides. A setting of 0 returns to drawing the whole line.
+        </td>
+      </tr>
+      <tr id='property-caret.period'>
+        <td>
+          caret.period
+        </td>
+        <td>
+          Sets the rate at which the caret blinks. The value is the time in milliseconds that the
+          caret is visible before it is switched to invisible. It then stays invisible for the same
+          period before appearing again. A value of 0 stops the caret from blinking.
+        </td>
+      </tr>
+      <tr id='property-caret.style'>
+        <td>
+          caret.style
+        </td>
+        <td>
+          Sets the style of the caret. see <a href="https://www.scintilla.org/ScintillaDoc.html#SCI_SETCARETSTYLE">SCI_SETCARETSTYLE</a> for possible values.
+        </td>
+      </tr>
+      <tr id='property-caret.width'>
+        <td>
+          caret.width
+        </td>
+        <td>
+          Sets the width of the caret in pixels. Only values of 1, 2, or 3 work.
+        </td>
+      </tr>
+      <tr id='property-selection.rectangular.switch.mouse'>
+        <td>
+          selection.rectangular.switch.mouse
+        </td>
+        <td>
+          Sets whether switching to rectangular selection mode while making a selection with the mouse is
+          allowed (1) or not (0). Default is 0.
+        </td>
+      </tr>
+      <tr id='property-selection.multiple'>
+        <td>
+          <a name='property-selection.additional.typing'></a><a name='property-selection.multipaste'></a>
+          selection.multiple<br />
+          selection.additional.typing<br />
+          selection.multipaste
+        </td>
+        <td>
+        Set selection.multiple to make multiple selections with the mouse by holding down the Ctrl key.<br />
+        Set selection.additional.typing to 1. to allow typing, backspace and delete to affect all selections including each line
+        of rectangular selections. When set to 0, typing only affects the main selection.<br />
+        Set selection.multipaste to 1 to paste at all selections. If set to 0, the paste will only be inserted at the last selection.
+        </td>
+      </tr>
+      <tr id='property-virtual.space'>
+        <td>
+          virtual.space
+        </td>
+        <td>
+          Determines whether the caret can be moved into virtual space, that is, beyond the last character on a line.
+        Set to 1 to allow virtual space when making a rectangular selection, 2 to allow the arrow keys or a mouse
+        click to  move the caret into virtual space, and 3 to allow both.
+        4 may be added to prevent left arrow from wrapping to previous line.
+        </td>
+      </tr>
+      <tr id='property-caret.policy.xslop'>
+        <td>
+          <a name='property-caret.policy.width'></a><a name='property-caret.policy.xstrict'></a><a name='property-caret.policy.xeven'></a><a name='property-caret.policy.xjumps'></a><a name='property-caret.policy.yslop'></a><a name='property-caret.policy.lines'></a><a name='property-caret.policy.ystrict'></a><a name='property-caret.policy.yeven'></a><a name='property-caret.policy.yjumps'></a>
+          caret.policy.xslop<br />
+          caret.policy.width<br />
+          caret.policy.xstrict<br />
+          caret.policy.xeven<br />
+          caret.policy.xjumps<br /><br />
+          caret.policy.yslop<br />
+          caret.policy.lines<br />
+          caret.policy.ystrict<br />
+          caret.policy.yeven<br />
+          caret.policy.yjumps<br />
+        </td>
+        <td>
+          <p>If slop is set, we can define a slop value: width for xslop, lines for yslop.<br />
+          This value defines an unwanted zone (UZ) where the caret is... unwanted.<br />
+          This zone is defined as a number of pixels near the vertical margins,
+          and as a number of lines near the horizontal margins.<br />
+          By keeping the caret away from the edges, it is seen within its context,
+          so it is likely that the identifier that the caret is on can be completely seen,
+          and that the current line is seen with some of the lines following it which are
+          often dependent on that line.</p>
+
+          <p>If strict is set, the policy is enforced... strictly.<br />
+          The caret is centred on the display if slop is not set,
+          and cannot go in the UZ if slop is set.</p>
+
+          <p>If jumps is set, the display is moved more energetically
+          so the caret can move in the same direction longer before the policy is applied again.<br />
+          '3UZ' notation is used to indicate three time the size of the UZ as a distance to the margin.</p>
+
+          <p>If even is not set, instead of having symmetrical UZs,
+          the left and bottom UZs are extended up to right and top UZs respectively.<br />
+          This way, we favour the displaying of useful information: the beginning of lines,
+          where most code reside, and the lines after the caret, e.g., the body of a function.</p>
+          <p>See the table below to see how these settings interact.<br />
+          Default: xslop, yslop, xeven, yeven=1, width=50, all others = 0.</p>
+        </td>
+      </tr>
+      <tr id='property-visible.policy.strict'>
+        <td>
+          <a name='property-visible.policy.slop'></a><a name='property-visible.policy.lines'></a>
+          visible.policy.strict<br />
+          visible.policy.slop<br />
+        visible.policy.lines
+        </td>
+        <td>
+          Determines how the display area is determined after a Go to command or
+        equivalent such as a Find or Next Message. Options are similar to caret.policy.*.
+        </td>
+      </tr>
+      <tr id='property-edge.mode'>
+        <td>
+          <a name='property-edge.column'></a><a name='property-edge.colour'></a>
+          edge.mode<br />
+           edge.column<br />
+           edge.colour<br />
+        </td>
+        <td>
+          Indicates long lines. The default edge.mode, 0, does not indicate long lines. An
+          edge.mode of 1 uses a vertical line to indicate the specified column and an edge.mode of
+          2 changes the background colour of characters beyond that column. For proportional fonts,
+          an edge.mode of 2 is more useful than 1.
+        </td>
+      </tr>
+      <tr id='property-control.char.symbol'>
+        <td>
+          control.char.symbol
+        </td>
+        <td>
+          Sets the character to use to indicate control characters. If
+          not set, control characters are shown as mnemonics.
+        </td>
+      </tr>
+      <tr id='property-error.marker.fore'>
+        <td>
+          <a name='property-error.marker.back'></a>
+          error.marker.fore<br />
+          error.marker.back
+        </td>
+        <td>
+          The colours used to indicate error and warning lines in both the edit and output panes
+          are set with these two values.
+          If there is a margin on a pane then a symbol is displayed in the margin to indicate
+          the error message for the output pane or the line causing the error message for the edit pane.
+          The error.marker.back is used as the fill colour of the symbol and the error.marker.fore
+          as the outline colour. If there is no margin then the background to the line is set to the
+          error.marker.back colour.
+        </td>
+       </tr>
+      <tr id='property-error.inline'>
+        <td>
+          <a name='property-style.error.0'></a><a name='property-style.error.1'></a><a name='property-style.error.2'></a><a name='property-style.error.3'></a>
+          error.inline<br />
+          style.error.0<br />
+          style.error.1<br />
+          style.error.2<br />
+          style.error.3
+        </td>
+        <td>
+          To see error messages interspersed with the source code, set error.inline=1.<br />
+          Different visual styles are used for different severities: style.error.0 is the default;
+          style.error.1 for warnings; style.error.2 for errors; and style.error.3 for fatal errors.
+          The severity of a message is inferred from finding the text "warning", "error", or "fatal" in the message.
+        </td>
+       </tr>
+      <tr id='property-bookmark.fore'>
+        <td>
+          <a name='property-bookmark.back'></a><a name='property-bookmark.alpha'></a><a name='property-bookmark.stroke.width'></a>
+          bookmark.fore<br />
+          bookmark.back<br />
+          bookmark.alpha<br />
+          bookmark.stroke.width
+        </td>
+        <td>
+          The colours used to display bookmarks in the margin. If bookmark.fore is empty then
+          a blue sphere is used. When the margin is turned off, bookmarks are shown by a
+          change in the background colour of the line with the translucency set with bookmark.alpha.<br />
+          The stroke width of the symbol can be set in hundredths of a pixel with bookmark.stroke.width.
+          When using a high DPI display or large fonts it can be worthwhile setting bookmark.stroke.width to 200.
+        </td>
+       </tr>
+      <tr id='property-bookmark.symbol'>
+        <td>
+          bookmark.symbol
+        </td>
+        <td>
+          The visual style used to display bookmarks in the margin. Set to a numeric value according to the symbols
+          defined in <a href="http://www.scintilla.org/ScintillaDoc.html#SCI_MARKERDEFINE">SCI_MARKERDEFINE</a>.
+        </td>
+       </tr>
+      <tr id='property-find.mark.indicator'>
+        <td>
+          find.mark.indicator
+        </td>
+        <td>
+          If set, then the Mark All command in the Find dialog will draw indicators over
+            each string found. This is a
+            <a href="#IndicatorProperty">structured property</a> with multiple attributes similar to:
+         <div class="example">
+              find.mark.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80
+         </div>
+        </td>
+       </tr>
+      <tr id='property-find.mark'>
+        <td>
+          find.mark
+        </td>
+        <td>
+          If set, then the Mark All command in the Find dialog will draw translucent boxes over
+          each string found. (See indicators.alpha and indicators.under)<br />
+          Overridden by find.mark.indicator.
+        </td>
+       </tr>
+       <tr id='property-indicators.alpha'>
+        <td>
+          indicators.alpha
+        </td>
+        <td>
+          This property defines the alpha level for indicators (default value is 30).
+          The alpha value can range from 0 (completely transparent) to 255 (no transparency).
+          A value out of this range is ignored and the default one is used.<br />
+          Will be overridden by specific indicator definitions such as find.mark.indicator.
+        </td>
+       </tr>
+       <tr id='property-indicators.under'>
+        <td>
+          indicators.under
+        </td>
+        <td>
+          If set, the indicators are drawn under text or over (by default, it is over).<br />
+          Will be overridden by specific indicator definitions such as find.mark.indicator.
+        </td>
+       </tr>
+       <tr id='property-error.select.line'>
+        <td>
+          error.select.line
+        </td>
+        <td>
+          When a command execution produces error messages, and you step with F4 key through
+          the matching source lines, this option selects the line where the error occurs.
+          Most useful if the error message contains the column of error too as the selection will
+          start at the column of the error. The error message must contain the column and must be
+          understood by SciTE (currently only supported for HTML Tidy). The tab size assumed by
+          the external tool must match the tab size of your source file for correct column reporting.
+        </td>
+       </tr>
+       <tr id='property-openpath'>
+        <td>openpath.<i>filepattern</i></td>
+        <td>Defines a path for the Open Selected Filename command in the File
+        menu. The path is searched if the selected filename doesn't contain an
+        absolute path or the file is not found in the document directory. The
+        directories in openpath are separated by ';' on Windows and ':' on macOS and GTK.<br />
+        An openpath setting may look like:
+        <div class="example">
+        openpath.*.txt=c:\dos\;f:\;<br />
+        openpath.$(file.patterns.cpp)=$(cpp_includes)</div>
+        </td>
+       </tr>
+       <tr id='property-open.suffix'>
+        <td>open.suffix.<i>filepattern</i></td>
+        <td>Defines a suffix to add to the selected file name for the
+        Open Selected Filename command in the File menu.
+        This is used in languages where the suffix is not given when accessing a file.
+        An example is python where "import xlib" will most often mean to import from
+        a file called "xlib.py".<br />
+        An open.suffix setting may look like:<br />
+        <div class="example">open.suffix.*.py=.py</div>
+        </td>
+       </tr>
+       <tr id='property-strip.trailing.spaces'>
+        <td>
+          strip.trailing.spaces<br />
+          strip.trailing.spaces.<i>filepattern</i>
+        </td>
+        <td>
+          Strips trailing white spaces from the file while saving.<br />
+          The global strip.trailing.spaces property can be overridden for
+          files that match a pattern by using the file pattern forms: <br />
+          <div class="example">
+          strip.trailing.spaces.*.yaml=0<br />
+          or <br />
+          strip.trailing.spaces.$(file.patterns.yaml)=0<br />
+          </div>
+        </td>
+      </tr>
+       <tr id='property-ensure.final.line.end'>
+        <td>
+          ensure.final.line.end
+        </td>
+        <td>
+          Ensures file ends with a line end when saved.
+        </td>
+      </tr>
+       <tr id='property-ensure.consistent.line.ends'>
+        <td>
+          ensure.consistent.line.ends
+        </td>
+        <td>
+          Ensures all lines end with the current Line End Characters setting when saved.
+        </td>
+      </tr>
+      <tr id='property-abbreviations'>
+        <td>
+          abbreviations.<i>filepattern</i>
+        </td>
+        <td>
+          Loads an abbreviations file for a particular language overriding the default abbreviations file.
+          For example,
+         <div class="example">
+                abbreviations.*.c=$(SciteUserHome)/c_abbrev.properties<br />
+         </div>
+        </td>
+      </tr>
+      <tr id='property-api'>
+        <td>
+          api.<i>filepattern</i>
+        </td>
+        <td>
+          Loads a set of API files for a particular language.
+          If there is more than one API file then the file names are separated by ';'.
+          API files contain a sorted list of
+          identifiers and function prototypes, one per line. If there are multiple files then each file should
+        end with a line end or the next file's first line will merge with the previous file's last line.
+        The "Complete Symbol" command
+          looks at the characters before the caret and displayed the subset of the API file
+          starting with that string. When an opening brace is typed, the file is searched for the
+          text preceding the caret and if a function prototype is found then it is displayed as a
+          calltip.
+          For example, the setting
+         <div class="example">
+                api.*.c=w.api<br />
+         </div>
+                  could be used with a w.api file containing
+         <div class="example">
+                fclose(FILE* fileClose)<br />
+                FILE<br />
+                fopen(const char* szFileName, const char* szMode)<br />
+                fpos_t<br />
+                fread(void* buf, size_t size, size_t count, FILE* file)<br />
+                fseek(FILE* file, long lnOffset, int nOrigin)<br />
+         </div>
+          to provide autocompletion and calltips for some of the C file functions. It is best to
+          use the full path to the API file as otherwise the current directory is used.
+        See the Creating API files section for ways to create API files.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.choose.single'>
+        <td>
+          autocomplete.choose.single
+        </td>
+        <td>
+          When set to 1 and an autocompletion list is invoked and there is only one element
+        in that list then that element is automatically chosen. This means that the matched
+        element is inserted and the list is not displayed.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.*.ignorecase'>
+        <td>
+          autocomplete.<i>lexer</i>.ignorecase<br />
+          autocomplete.*.ignorecase
+        </td>
+        <td>
+          When set to 1 the API file is searched in a case insensitive way to find elements
+        for autocompletion lists. Otherwise matches only occur if case also matches.
+        The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.*.start.characters'>
+        <td>
+          autocomplete.<i>lexer</i>.start.characters<br />
+          autocomplete.*.start.characters
+        </td>
+        <td>
+        If this setting is not empty, typing any of the characters will cause
+        autocompletion to start. For example, if
+        autocomplete.python.start.characters=. and the API file for Python
+        contains "string.rjust" and "string.replace" then typing "string." will
+        cause the autocompletion to display both identifiers.
+        The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.*.fillups'>
+        <td>
+          autocomplete.<i>lexer</i>.fillups<br />
+          autocomplete.*.fillups
+        </td>
+        <td>
+        If this setting is not empty, typing any of the characters will cause
+        autocompletion to complete.
+        For example, if
+        autocomplete.python.fillups=( and the API file for Python
+        contains "string.replace" then typing "string.r(" will
+        cause "string.replace(" to be inserted.
+        The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-autocomplete.fore'>
+        <td>
+          autocomplete.fore<br />
+          autocomplete.back<br />
+          autocomplete.selected.fore<br />
+          autocomplete.selected.back
+        </td>
+        <td>
+        If these settings are not empty, they specify colours to use in
+        autocompletion lists.
+        The default values depend on the platform and system settings.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.*.typesep'>
+        <td>
+          autocomplete.<i>lexer</i>.typesep<br />
+          autocomplete.*.typesep
+        </td>
+        <td>
+        If this setting is not empty, it specifies the character used to
+        separate autocompletion choices from type icon IDs.
+        The default value is '?'.
+        </td>
+      </tr>
+      <tr id='property-autocomplete.visible.item.count'>
+        <td>
+          autocomplete.visible.item.count
+        </td>
+        <td>
+        Set the number of items that are visible in autocompletion lists. The default is 9.
+        </td>
+      </tr>
+      <tr id='property-autocompleteword.automatic'>
+        <td>
+          autocompleteword.automatic
+        </td>
+        <td>
+        If this setting is 1 then when typing a word, if only one word in the document
+        starts with that string then an autocompletion list is displayed with that word so it
+        can be chosen by pressing Tab.
+        </td>
+      </tr>
+      <tr id='property-calltip.*.ignorecase'>
+        <td>
+          calltip.<i>lexer</i>.ignorecase<br />
+          calltip.*.ignorecase
+        </td>
+        <td>
+          When set to 1 the API file is searched in a case insensitive way to find the function
+        which will have its signature displayed as a calltip. The * form is used if there
+        is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-calltip.*.use.escapes'>
+        <td>
+          calltip.<i>lexer</i>.use.escapes<br />
+          calltip.*.use.escapes
+        </td>
+        <td>
+          When set to 1 the API file may contain C style backslash escapes which are listed in
+        the command line arguments section. The * form is used if there is no lexer specific
+        setting.
+        </td>
+      </tr>
+      <tr id='property-calltip.*.word.characters'>
+        <td>
+          calltip.<i>lexer</i>.word.characters<br />
+          calltip.*.word.characters
+        </td>
+        <td>
+        To determine the identifier to look up for calltips, a search is performed
+        allowing the characters in this set to be included in the identifier.
+        While the same setting can be used as for word.characters, sometimes
+        additional characters may be allowed.
+        For example, in Python, '.' is not normally considered part of a word
+        when selecting text, but it is good to allow "string.replace" to show a
+        calltip so calltip.python.word.characters=._$(chars.alpha) would be a
+        reasonable setting.
+        The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-calltip.*.parameters.start'>
+        <td>
+          <a name='property-calltip.*.parameters.end'></a><a name='property-calltip.*.parameters.separators'></a>
+          calltip.<i>lexer</i>.parameters.start<br />
+          calltip.<i>lexer</i>.parameters.end<br />
+          calltip.<i>lexer</i>.parameters.separators<br />
+          calltip.*.parameters.start<br />
+          calltip.*.parameters.end<br />
+          calltip.*.parameters.separators
+        </td>
+        <td>
+          Allows you to specify characters which start, end and separate
+          parameters. For most common languages, it's usually left brace for
+          start, right brace for end and comma or semicolon for separator.
+          E.g. CSS has colon for start, space for separator and nothing for
+          end. You can specify more characters for each property.
+          The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-calltip.*.end.definition'>
+        <td>
+          calltip.<i>lexer</i>.end.definition<br />
+          calltip.*.end.definition
+        </td>
+        <td>
+        API files may contain explanatory text after each function definition.
+        To display the explanation on a second line, set this property to the character used at the
+        end of the definition part. For most languages, this is ')'.
+        The * form is used if there is no lexer specific setting.
+        </td>
+      </tr>
+      <tr id='property-xml.auto.close.tags'>
+        <td>
+          xml.auto.close.tags
+        </td>
+        <td>
+          For XML and HTML, setting this property to 1 will automatically insert the
+        corresponding end tag when '&gt;' is typed to end a start tag.
+        Type "&lt;td&gt;" and the result will be "&lt;td&gt;&lt;/td&gt;" with the caret
+        placed between the tags.
+        </td>
+      </tr>
+<!--++Autogenerated - run ../scripts/RegenerateSource.py to regenerate -->
+<!--**\(\*\n\) -->
+        <tr id='property-asp.default.language'>
+        <td>asp.default.language</td>
+        <td>Script in ASP code is initially assumed to be in JavaScript. To change this to VBScript set asp.default.language to 2. Python is 3.</td>
+        </tr>
+        <tr id='property-fold.abl.comment.multiline'>
+        <td>fold.abl.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.abl.syntax.based'>
+        <td>fold.abl.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.asm.comment.explicit'>
+        <td>fold.asm.comment.explicit</td>
+        <td>This option enables folding explicit fold points when using the Asm lexer. Explicit fold points allows adding extra folding by placing a ;{ comment at the start and a ;} at the end of a section that should fold.</td>
+        </tr>
+        <tr id='property-fold.asm.comment.multiline'>
+        <td>fold.asm.comment.multiline</td>
+        <td>Set this property to 1 to enable folding multi-line comments.</td>
+        </tr>
+        <tr id='property-fold.asm.explicit.anywhere'>
+        <td>fold.asm.explicit.anywhere</td>
+        <td>Set this property to 1 to enable explicit fold points anywhere, not just in line comments.</td>
+        </tr>
+        <tr id='property-fold.asm.explicit.end'>
+        <td>fold.asm.explicit.end</td>
+        <td>The string to use for explicit fold end points, replacing the standard ;}.</td>
+        </tr>
+        <tr id='property-fold.asm.explicit.start'>
+        <td>fold.asm.explicit.start</td>
+        <td>The string to use for explicit fold start points, replacing the standard ;{.</td>
+        </tr>
+        <tr id='property-fold.asm.syntax.based'>
+        <td>fold.asm.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.at.else'>
+        <td>fold.at.else</td>
+        <td>This option enables C++ folding on a "} else {" line of an if statement.</td>
+        </tr>
+        <tr id='property-fold.baan.inner.level'>
+        <td>fold.baan.inner.level</td>
+        <td>Set this property to 1 to enable folding of inner levels of select statements.Disabled by default. case and if statements are also eligible</td>
+        </tr>
+        <tr id='property-fold.baan.keywords.based'>
+        <td>fold.baan.keywords.based</td>
+        <td>Set this property to 0 to disable keywords based folding, which is folding based on for, if, on (case), repeat, select, while and fold ends based on endfor, endif, endcase, until, endselect, endwhile respectively.Also folds declarations which are grouped together.</td>
+        </tr>
+        <tr id='property-fold.baan.sections'>
+        <td>fold.baan.sections</td>
+        <td>Set this property to 0 to disable folding of Main Sections as well as Sub Sections.</td>
+        </tr>
+        <tr id='property-fold.baan.syntax.based'>
+        <td>fold.baan.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding, which is folding based on '{' & '('.</td>
+        </tr>
+        <tr id='property-fold.basic.comment.explicit'>
+        <td>fold.basic.comment.explicit</td>
+        <td>This option enables folding explicit fold points when using the Basic lexer. Explicit fold points allows adding extra folding by placing a ;{ (BB/PB) or '{ (FB) comment at the start and a ;} (BB/PB) or '} (FB) at the end of a section that should be folded.</td>
+        </tr>
+        <tr id='property-fold.basic.explicit.anywhere'>
+        <td>fold.basic.explicit.anywhere</td>
+        <td>Set this property to 1 to enable explicit fold points anywhere, not just in line comments.</td>
+        </tr>
+        <tr id='property-fold.basic.explicit.end'>
+        <td>fold.basic.explicit.end</td>
+        <td>The string to use for explicit fold end points, replacing the standard ;} (BB/PB) or '} (FB).</td>
+        </tr>
+        <tr id='property-fold.basic.explicit.start'>
+        <td>fold.basic.explicit.start</td>
+        <td>The string to use for explicit fold start points, replacing the standard ;{ (BB/PB) or '{ (FB).</td>
+        </tr>
+        <tr id='property-fold.basic.syntax.based'>
+        <td>fold.basic.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.cil.comment.multiline'>
+        <td>fold.cil.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.comment'>
+        <td>fold.comment</td>
+        <td>This option enables folding multi-line comments and explicit fold points when using the C++ lexer. Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} at the end of a section that should fold.</td>
+        </tr>
+        <tr id='property-fold.cpp.comment.explicit'>
+        <td>fold.cpp.comment.explicit</td>
+        <td>Set this property to 0 to disable folding explicit fold points when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.cpp.comment.multiline'>
+        <td>fold.cpp.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.cpp.explicit.anywhere'>
+        <td>fold.cpp.explicit.anywhere</td>
+        <td>Set this property to 1 to enable explicit fold points anywhere, not just in line comments.</td>
+        </tr>
+        <tr id='property-fold.cpp.explicit.end'>
+        <td>fold.cpp.explicit.end</td>
+        <td>The string to use for explicit fold end points, replacing the standard //}.</td>
+        </tr>
+        <tr id='property-fold.cpp.explicit.start'>
+        <td>fold.cpp.explicit.start</td>
+        <td>The string to use for explicit fold start points, replacing the standard //{.</td>
+        </tr>
+        <tr id='property-fold.cpp.preprocessor.at.else'>
+        <td>fold.cpp.preprocessor.at.else</td>
+        <td>This option enables folding on a preprocessor #else or #endif line of an #if statement.</td>
+        </tr>
+        <tr id='property-fold.cpp.syntax.based'>
+        <td>fold.cpp.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.d.comment.explicit'>
+        <td>fold.d.comment.explicit</td>
+        <td>Set this property to 0 to disable folding explicit fold points when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.d.comment.multiline'>
+        <td>fold.d.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.d.explicit.anywhere'>
+        <td>fold.d.explicit.anywhere</td>
+        <td>Set this property to 1 to enable explicit fold points anywhere, not just in line comments.</td>
+        </tr>
+        <tr id='property-fold.d.explicit.end'>
+        <td>fold.d.explicit.end</td>
+        <td>The string to use for explicit fold end points, replacing the standard //}.</td>
+        </tr>
+        <tr id='property-fold.d.explicit.start'>
+        <td>fold.d.explicit.start</td>
+        <td>The string to use for explicit fold start points, replacing the standard //{.</td>
+        </tr>
+        <tr id='property-fold.d.syntax.based'>
+        <td>fold.d.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.dataflex.compilerlist'>
+        <td>fold.dataflex.compilerlist</td>
+        <td>Set to 1 for enabling the code folding feature in *.prn files</td>
+        </tr>
+        <tr id='property-fold.fsharp.comment.multiline'>
+        <td>fold.fsharp.comment.multiline</td>
+        <td>Setting this option to 0 disables folding of grouped line comments in F# files when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.fsharp.comment.stream'>
+        <td>fold.fsharp.comment.stream</td>
+        <td>Setting this option to 0 disables folding of ML-style comments in F# files when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.fsharp.imports'>
+        <td>fold.fsharp.imports</td>
+        <td>Setting this option to 0 disables folding of F# import declarations.</td>
+        </tr>
+        <tr id='property-fold.fsharp.preprocessor'>
+        <td>fold.fsharp.preprocessor</td>
+        <td>Setting this option to 1 enables folding of F# compiler directives.</td>
+        </tr>
+        <tr id='property-fold.haskell.imports'>
+        <td>fold.haskell.imports</td>
+        <td>Set to 1 to enable folding of import declarations</td>
+        </tr>
+        <tr id='property-fold.html'>
+        <td>fold.html</td>
+        <td>Folding is turned on or off for HTML and XML files with this option. The fold option must also be on for folding to occur.</td>
+        </tr>
+        <tr id='property-fold.html.preprocessor'>
+        <td>fold.html.preprocessor</td>
+        <td>Folding is turned on or off for scripts embedded in HTML files with this option. The default is on.</td>
+        </tr>
+        <tr id='property-fold.hypertext.comment'>
+        <td>fold.hypertext.comment</td>
+        <td>Allow folding for comments in scripts embedded in HTML. The default is off.</td>
+        </tr>
+        <tr id='property-fold.hypertext.heredoc'>
+        <td>fold.hypertext.heredoc</td>
+        <td>Allow folding for heredocs in scripts embedded in HTML. The default is off.</td>
+        </tr>
+        <tr id='property-fold.julia.docstring'>
+        <td>fold.julia.docstring</td>
+        <td>Fold multiline triple-doublequote strings, usually used to document a function or type above the definition.</td>
+        </tr>
+        <tr id='property-fold.julia.syntax.based'>
+        <td>fold.julia.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.perl.at.else'>
+        <td>fold.perl.at.else</td>
+        <td>This option enables Perl folding on a "} else {" line of an if statement.</td>
+        </tr>
+        <tr id='property-fold.perl.comment.explicit'>
+        <td>fold.perl.comment.explicit</td>
+        <td>Set to 0 to disable explicit folding.</td>
+        </tr>
+        <tr id='property-fold.perl.package'>
+        <td>fold.perl.package</td>
+        <td>Set to 0 to disable folding packages when using the Perl lexer.</td>
+        </tr>
+        <tr id='property-fold.perl.pod'>
+        <td>fold.perl.pod</td>
+        <td>Set to 0 to disable folding Pod blocks when using the Perl lexer.</td>
+        </tr>
+        <tr id='property-fold.preprocessor'>
+        <td>fold.preprocessor</td>
+        <td>This option enables folding preprocessor directives when using the C++ lexer. Includes C#'s explicit #region and #endregion folding directives.</td>
+        </tr>
+        <tr id='property-fold.quotes.python'>
+        <td>fold.quotes.python</td>
+        <td>This option enables folding multi-line quoted strings when using the Python lexer.</td>
+        </tr>
+        <tr id='property-fold.raku.comment.multiline'>
+        <td>fold.raku.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.raku.comment.pod'>
+        <td>fold.raku.comment.pod</td>
+        <td>Set this property to 0 to disable folding POD comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.rust.comment.explicit'>
+        <td>fold.rust.comment.explicit</td>
+        <td>Set this property to 0 to disable folding explicit fold points when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.rust.comment.multiline'>
+        <td>fold.rust.comment.multiline</td>
+        <td>Set this property to 0 to disable folding multi-line comments when fold.comment=1.</td>
+        </tr>
+        <tr id='property-fold.rust.explicit.anywhere'>
+        <td>fold.rust.explicit.anywhere</td>
+        <td>Set this property to 1 to enable explicit fold points anywhere, not just in line comments.</td>
+        </tr>
+        <tr id='property-fold.rust.explicit.end'>
+        <td>fold.rust.explicit.end</td>
+        <td>The string to use for explicit fold end points, replacing the standard //}.</td>
+        </tr>
+        <tr id='property-fold.rust.explicit.start'>
+        <td>fold.rust.explicit.start</td>
+        <td>The string to use for explicit fold start points, replacing the standard //{.</td>
+        </tr>
+        <tr id='property-fold.rust.syntax.based'>
+        <td>fold.rust.syntax.based</td>
+        <td>Set this property to 0 to disable syntax based folding.</td>
+        </tr>
+        <tr id='property-fold.sql.at.else'>
+        <td>fold.sql.at.else</td>
+        <td>This option enables SQL folding on a "ELSE" and "ELSIF" line of an IF statement.</td>
+        </tr>
+        <tr id='property-fold.verilog.flags'>
+        <td>fold.verilog.flags</td>
+        <td>This option enables folding module definitions. Typically source files contain only one module definition so this option is somewhat useless.</td>
+        </tr>
+        <tr id='property-fold.xml.at.tag.open'>
+        <td>fold.xml.at.tag.open</td>
+        <td>Enable folding for XML at the start of open tag. The default is off.</td>
+        </tr>
+        <tr id='property-html.tags.case.sensitive'>
+        <td>html.tags.case.sensitive</td>
+        <td>For XML and HTML, setting this property to 1 will make tags match in a case sensitive way which is the expected behaviour for XML and XHTML.</td>
+        </tr>
+        <tr id='property-lexer.as.comment.character'>
+        <td>lexer.as.comment.character</td>
+        <td>Overrides the default comment character (which is ';' for asm and '#' for as).</td>
+        </tr>
+        <tr id='property-lexer.asm.comment.delimiter'>
+        <td>lexer.asm.comment.delimiter</td>
+        <td>Character used for COMMENT directive's delimiter, replacing the standard "~".</td>
+        </tr>
+        <tr id='property-lexer.baan.styling.within.preprocessor'>
+        <td>lexer.baan.styling.within.preprocessor</td>
+        <td>For Baan code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) or only from the initial # to the end of the command word(1).</td>
+        </tr>
+        <tr id='property-lexer.cpp.allow.dollars'>
+        <td>lexer.cpp.allow.dollars</td>
+        <td>Set to 0 to disallow the '$' character in identifiers with the cpp lexer.</td>
+        </tr>
+        <tr id='property-lexer.cpp.backquoted.strings'>
+        <td>lexer.cpp.backquoted.strings</td>
+        <td>Set to 1 to enable highlighting of back-quoted raw strings .</td>
+        </tr>
+        <tr id='property-lexer.cpp.escape.sequence'>
+        <td>lexer.cpp.escape.sequence</td>
+        <td>Set to 1 to enable highlighting of escape sequences in strings</td>
+        </tr>
+        <tr id='property-lexer.cpp.hashquoted.strings'>
+        <td>lexer.cpp.hashquoted.strings</td>
+        <td>Set to 1 to enable highlighting of hash-quoted strings.</td>
+        </tr>
+        <tr id='property-lexer.cpp.track.preprocessor'>
+        <td>lexer.cpp.track.preprocessor</td>
+        <td>Set to 1 to interpret #if/#else/#endif to grey out code that is not active.</td>
+        </tr>
+        <tr id='property-lexer.cpp.triplequoted.strings'>
+        <td>lexer.cpp.triplequoted.strings</td>
+        <td>Set to 1 to enable highlighting of triple-quoted strings.</td>
+        </tr>
+        <tr id='property-lexer.cpp.update.preprocessor'>
+        <td>lexer.cpp.update.preprocessor</td>
+        <td>Set to 1 to update preprocessor definitions when #define found.</td>
+        </tr>
+        <tr id='property-lexer.cpp.verbatim.strings.allow.escapes'>
+        <td>lexer.cpp.verbatim.strings.allow.escapes</td>
+        <td>Set to 1 to allow verbatim strings to contain escape sequences.</td>
+        </tr>
+        <tr id='property-lexer.css.hss.language'>
+        <td>lexer.css.hss.language</td>
+        <td>Set to 1 for HSS (.hss)</td>
+        </tr>
+        <tr id='property-lexer.css.less.language'>
+        <td>lexer.css.less.language</td>
+        <td>Set to 1 for Less CSS (.less)</td>
+        </tr>
+        <tr id='property-lexer.css.scss.language'>
+        <td>lexer.css.scss.language</td>
+        <td>Set to 1 for Sassy CSS (.scss)</td>
+        </tr>
+        <tr id='property-lexer.d.fold.at.else'>
+        <td>lexer.d.fold.at.else</td>
+        <td>This option enables D folding on a "} else {" line of an if statement.</td>
+        </tr>
+        <tr id='property-lexer.edifact.highlight.un.all'>
+        <td>lexer.edifact.highlight.un.all</td>
+        <td>Set to 0 to highlight only UNA segments, or 1 to highlight all UNx segments.</td>
+        </tr>
+        <tr id='property-lexer.errorlist.escape.sequences'>
+        <td>lexer.errorlist.escape.sequences</td>
+        <td>Set to 1 to interpret escape sequences.</td>
+        </tr>
+        <tr id='property-lexer.errorlist.value.separate'>
+        <td>lexer.errorlist.value.separate</td>
+        <td>For lines in the output pane that are matches from Find in Files or GCC-style diagnostics, style the path and line number separately from the rest of the line with style 21 used for the rest of the line. This allows matched text to be more easily distinguished from its location.</td>
+        </tr>
+        <tr id='property-lexer.flagship.styling.within.preprocessor'>
+        <td>lexer.flagship.styling.within.preprocessor</td>
+        <td>For Harbour code, determines whether all preprocessor code is styled in the preprocessor style (0) or only from the initial # to the end of the command word(1, the default). It also determines how to present text, dump, and disabled code.</td>
+        </tr>
+        <tr id='property-lexer.haskell.allow.hash'>
+        <td>lexer.haskell.allow.hash</td>
+        <td>Set to 0 to disallow the '#' character at the end of identifiers and literals with the haskell lexer (GHC -XMagicHash extension)</td>
+        </tr>
+        <tr id='property-lexer.haskell.allow.questionmark'>
+        <td>lexer.haskell.allow.questionmark</td>
+        <td>Set to 1 to allow the '?' character at the start of identifiers with the haskell lexer (GHC & Hugs -XImplicitParams extension)</td>
+        </tr>
+        <tr id='property-lexer.haskell.allow.quotes'>
+        <td>lexer.haskell.allow.quotes</td>
+        <td>Set to 0 to disable highlighting of Template Haskell name quotations and promoted constructors (GHC -XTemplateHaskell and -XDataKinds extensions)</td>
+        </tr>
+        <tr id='property-lexer.haskell.cpp'>
+        <td>lexer.haskell.cpp</td>
+        <td>Set to 0 to disable C-preprocessor highlighting (-XCPP extension)</td>
+        </tr>
+        <tr id='property-lexer.haskell.import.safe'>
+        <td>lexer.haskell.import.safe</td>
+        <td>Set to 0 to disallow "safe" keyword in imports (GHC -XSafe, -XTrustworthy, -XUnsafe extensions)</td>
+        </tr>
+        <tr id='property-lexer.html.django'>
+        <td>lexer.html.django</td>
+        <td>Set to 1 to enable the django template language.</td>
+        </tr>
+        <tr id='property-lexer.html.mako'>
+        <td>lexer.html.mako</td>
+        <td>Set to 1 to enable the mako template language.</td>
+        </tr>
+        <tr id='property-lexer.json.allow.comments'>
+        <td>lexer.json.allow.comments</td>
+        <td>Set to 1 to enable highlighting of line/block comments in JSON</td>
+        </tr>
+        <tr id='property-lexer.json.escape.sequence'>
+        <td>lexer.json.escape.sequence</td>
+        <td>Set to 1 to enable highlighting of escape sequences in strings</td>
+        </tr>
+        <tr id='property-lexer.julia.highlight.lexerror'>
+        <td>lexer.julia.highlight.lexerror</td>
+        <td>This option enables highlighting of syntax error int character or number definition.</td>
+        </tr>
+        <tr id='property-lexer.julia.highlight.typeannotation'>
+        <td>lexer.julia.highlight.typeannotation</td>
+        <td>This option enables highlighting of the type identifier after `::`.</td>
+        </tr>
+        <tr id='property-lexer.nim.raw.strings.highlight.ident'>
+        <td>lexer.nim.raw.strings.highlight.ident</td>
+        <td>Set to 1 to enable highlighting generalized raw string identifiers. Generalized raw string identifiers are anything other than r (or R).</td>
+        </tr>
+        <tr id='property-lexer.props.allow.initial.spaces'>
+        <td>lexer.props.allow.initial.spaces</td>
+        <td>For properties files, set to 0 to style all lines that start with whitespace in the default style. This is not suitable for SciTE .properties files which use indentation for flow control but can be used for RFC2822 text where indentation is used for continuation lines.</td>
+        </tr>
+        <tr id='property-lexer.python.keywords2.no.sub.identifiers'>
+        <td>lexer.python.keywords2.no.sub.identifiers</td>
+        <td>When enabled, it will not style keywords2 items that are used as a sub-identifier. Example: when set, will not highlight "foo.open" when "open" is a keywords2 item.</td>
+        </tr>
+        <tr id='property-lexer.python.literals.binary'>
+        <td>lexer.python.literals.binary</td>
+        <td>Set to 0 to not recognise Python 3 binary and octal literals: 0b1011 0o712.</td>
+        </tr>
+        <tr id='property-lexer.python.strings.b'>
+        <td>lexer.python.strings.b</td>
+        <td>Set to 0 to not recognise Python 3 bytes literals b"x".</td>
+        </tr>
+        <tr id='property-lexer.python.strings.f'>
+        <td>lexer.python.strings.f</td>
+        <td>Set to 0 to not recognise Python 3.6 f-string literals f"var={var}".</td>
+        </tr>
+        <tr id='property-lexer.python.strings.over.newline'>
+        <td>lexer.python.strings.over.newline</td>
+        <td>Set to 1 to allow strings to span newline characters.</td>
+        </tr>
+        <tr id='property-lexer.python.strings.u'>
+        <td>lexer.python.strings.u</td>
+        <td>Set to 0 to not recognise Python Unicode literals u"x" as used before Python 3.</td>
+        </tr>
+        <tr id='property-lexer.python.unicode.identifiers'>
+        <td>lexer.python.unicode.identifiers</td>
+        <td>Set to 0 to not recognise Python 3 Unicode identifiers.</td>
+        </tr>
+        <tr id='property-lexer.rust.fold.at.else'>
+        <td>lexer.rust.fold.at.else</td>
+        <td>This option enables Rust folding on a "} else {" line of an if statement.</td>
+        </tr>
+        <tr id='property-lexer.sql.allow.dotted.word'>
+        <td>lexer.sql.allow.dotted.word</td>
+        <td>Set to 1 to colourise recognized words with dots (recommended for Oracle PL/SQL objects).</td>
+        </tr>
+        <tr id='property-lexer.sql.numbersign.comment'>
+        <td>lexer.sql.numbersign.comment</td>
+        <td>If "lexer.sql.numbersign.comment" property is set to 0 a line beginning with '#' will not be a comment.</td>
+        </tr>
+        <tr id='property-lexer.verilog.allupperkeywords'>
+        <td>lexer.verilog.allupperkeywords</td>
+        <td>Set to 1 to style identifiers that are all uppercase as documentation keyword.</td>
+        </tr>
+        <tr id='property-lexer.verilog.fold.preprocessor.else'>
+        <td>lexer.verilog.fold.preprocessor.else</td>
+        <td>This option enables folding on `else and `elsif preprocessor directives.</td>
+        </tr>
+        <tr id='property-lexer.verilog.portstyling'>
+        <td>lexer.verilog.portstyling</td>
+        <td>Set to 1 to style input, output, and inout ports differently from regular keywords.</td>
+        </tr>
+        <tr id='property-lexer.verilog.track.preprocessor'>
+        <td>lexer.verilog.track.preprocessor</td>
+        <td>Set to 1 to interpret `if/`else/`endif to grey out code that is not active.</td>
+        </tr>
+        <tr id='property-lexer.verilog.update.preprocessor'>
+        <td>lexer.verilog.update.preprocessor</td>
+        <td>Set to 1 to update preprocessor definitions when `define, `undef, or `undefineall found.</td>
+        </tr>
+        <tr id='property-lexer.xml.allow.scripts'>
+        <td>lexer.xml.allow.scripts</td>
+        <td>Set to 0 to disable scripts in XML.</td>
+        </tr>
+        <tr id='property-sql.backslash.escapes'>
+        <td>sql.backslash.escapes</td>
+        <td>Enables backslash as an escape character in SQL.</td>
+        </tr>
+        <tr id='property-styling.within.preprocessor'>
+        <td>styling.within.preprocessor</td>
+        <td>For C++ code, determines whether all preprocessor code is styled in the preprocessor style (0, the default) or only from the initial # to the end of the command word(1).</td>
+        </tr>
+        <tr id='property-tab.timmy.whinge.level'>
+        <td>tab.timmy.whinge.level</td>
+        <td>For Python code, checks whether indenting is consistent. The default, 0 turns off indentation checking, 1 checks whether each line is potentially inconsistent with the previous line, 2 checks whether any space characters occur before a tab character in the indentation, 3 checks whether any spaces are in the indentation, and 4 checks for any tab characters in the indentation. 1 is a good level to use.</td>
+        </tr>
+
+<!----Autogenerated -- end of automatically generated section -->
+      <tr id='property-user.shortcuts'>
+        <td>
+          user.shortcuts
+        </td>
+        <td>
+        Define keys that perform commands.
+        This is a '|' delimited list of keys and the commands they produce.
+        The commands are either <a href="CommandValues.html">string or numeric IDs</a>.
+        Numeric IDs above 2000 are Scintilla commands and are sent to the focussed pane.
+        Named IDs and numeric IDs below 2000 are SciTE menu commands.<br/>
+        The modifiers are Ctrl, Shift, Alt, <span class="gtkonly">Super</span>, and <span class="osxonly">Control</span>.<br/>
+        The named keys are Left, Right, Up, Down, Insert, End, Home, Enter, Space, Tab,
+        KeypadPlus, KeypadMinus, KeypadMultiply, KeypadDivide, <span class="windowsonly">KeypadDecimal</span>,
+        Escape, Delete, PageUp, PageDown,
+        <span class="gtkonly">Slash</span>, <span class="gtkonly">Question</span>, <span class="gtkonly">Equal</span>,
+        Win, Menu.
+        <br/>
+        On macOS the command key uses the modifier Ctrl+ as this eases using one setting between platforms and
+        the control key uses the modifier Control+.
+        <br/>
+        The Super modifier can be used only on GTK.
+        <br/>
+        <div class="example">
+user.shortcuts=\<br/>
+Ctrl+Shift+I|IDM_OPEN|\<br/>
+Ctrl+Shift+Left|IDM_CLOSE|<br/>
+        </div>
+        This property is only read at start up.
+        <br/>
+        </td>
+      </tr>
+      <tr id='property-user.context.menu'>
+        <td>
+          user.context.menu
+        </td>
+        <td>
+        Define additional commands for the context menu.
+        This is a '|' delimited list of menu items and the commands they
+        produce with commands defined as in user.shortcuts. An empty
+        item produces a separator.
+        <br/>
+        <div class="example">
+user.context.menu=\<br/>
+||\<br/>
+Next File|IDM_NEXTFILE|\<br/>
+Prev File|IDM_PREVFILE|<br/>
+        </div>
+        </td>
+      </tr>
+      <tr id='property-magnification'>
+        <td>
+          <a name='property-output.magnification'></a>
+          magnification<br />
+        output.magnification
+        </td>
+        <td>
+          Sets the initial magnification factor of the edit and output panes. This is useful
+        when you want to change the size of text globally, such as after changing the
+        screen resolution without having to touch every style setting. 0 is default,
+        negative values makes the size smaller and positive values make it larger.
+        </td>
+      </tr>
+      <tr id='property-split.vertical'>
+        <td>
+          <a name='property-output.horizontal.size'></a><a name='property-output.vertical.size'></a><a name='property-output.initial.hide'></a>
+          split.vertical<br />
+        output.horizontal.size<br />
+        output.vertical.size<br />
+        output.initial.hide
+        </td>
+        <td>
+          If split.vertical is set to 1 then the output pane is to the right of the editing pane,
+        if set to 0 then the output pane is below the editing pane.
+        The output.*.size settings determine the initial size of the output pane.
+        If output.initial.hide is 1, then the output pane is hidden when SciTE first
+        starts up even when output.*.size is set; otherwise the output pane is shown at
+        startup.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-split.wide'>
+        <td>
+        split.wide
+        </td>
+        <td>
+          On GTK, the divider between the edit and output pane can be made wider by setting split.wide to 1.
+          This makes it easier to grab with the mouse but uses up room.
+          This property is only read at start up.
+        </td>
+      </tr>
+      <tr id='property-clear.before.execute'>
+        <td>
+          clear.before.execute
+        </td>
+        <td>
+          If set to 1 then the output pane is cleared before any tool commands are run.
+        </td>
+      </tr>
+      <tr id='property-horizontal.scrollbar'>
+        <td>
+          <a name='property-horizontal.scroll.width'></a><a name='property-horizontal.scroll.width.tracking'></a><a name='property-output.horizontal.scrollbar'></a><a name='property-output.horizontal.scroll.width'></a><a name='property-output.horizontal.scroll.width.tracking'></a><a name='property-output.scroll'></a><a name='property-end.at.last.line'></a>
+          horizontal.scrollbar<br />
+        horizontal.scroll.width<br />
+        horizontal.scroll.width.tracking<br />
+        output.horizontal.scrollbar<br />
+        output.horizontal.scroll.width<br />
+        output.horizontal.scroll.width.tracking<br />
+        output.scroll<br />
+        end.at.last.line
+        </td>
+        <td>
+          If horizontal.scrollbar set to 0 then the edit pane's horizontal scrollbar is not displayed.<br />
+          horizontal.scroll.width is the document width assumed for scrolling.<br />
+          Similarly, output.horizontal.scrollbar and output.horizontal.scroll.width controls the
+        horizontal scroll bar of the output pane.<br />
+          The horizontal scroll bar widths can automatically grow as needed to ensure all displayed lines can be fully
+        scrolled with horizontal.scroll.width.tracking and output.horizontal.scroll.width.tracking.<br />
+        To stop the output pane from automatically scrolling, set output.scroll to 0.
+        To have the output pane scroll and return back to the line of the executed command,
+        set output.scroll to 1. If you want the output pane to scroll and remain at
+        the bottom after execution, set output.scroll to 2.<br />
+        The vertical scroll range is normally set so that maximum scroll position has
+        the last line at the bottom of the view. Set end.at.last.line to 0 to allow
+        scrolling one page below the last line.
+        </td>
+      </tr>
+      <tr id='property-wrap'>
+        <td>
+          <a name='property-output.wrap'></a>
+          wrap<br />
+        output.wrap
+        </td>
+        <td>
+          If wrap set to 1 then the edit pane is dynamically line wrapped.
+          If output.wrap set to 1 then the output pane is dynamically line wrapped.
+        These options have a high performance cost which is proportional to the amount of text
+        so should be turned off for large documents on slow machines.
+        </td>
+      </tr>
+      <tr id='property-wrap.style'>
+        <td>
+          wrap.style
+        </td>
+        <td>
+          Chooses between word wrapping (1, the default) and character wrapping (2).
+        Character wrapping is a better choice for Asian languages with no spaces
+        between words.
+        </td>
+      </tr>
+      <tr id='property-wrap.visual.flags'>
+        <td>
+          wrap.visual.flags
+        </td>
+        <td>
+          Flags to display markers at end and begin of wrapped lines for visual identify them.
+          Set to 0 to not display markers (default). Set to 1 to display markers at end of
+          wrapped lines, to 2 to display markers at begin of wrapped lines and to 3 to
+          display markers at begin and end.
+        </td>
+      </tr>
+      <tr id='property-wrap.visual.flags.location'>
+        <td>
+          wrap.visual.flags.location
+        </td>
+        <td>
+          Flags to set the location of the display markers (if enabled) near to text or near to border.
+          Set to 0 to have begin and end markers near to border (default). Set to 1 to
+          have end markers near text, to 2 to have begin markers near text and
+          to 3 to have all markers near text.
+        </td>
+      </tr>
+      <tr id='property-wrap.indent.mode'>
+        <td>
+          wrap.indent.mode
+        </td>
+        <td>
+          Wrapped sublines can be indented in various ways relative to the initial subline.
+          Default mode 0 indents sublines to the left of window plus wrap.visual.startindent.
+          Mode 1 aligns sublines to the first subline.
+          Mode 2 aligns sublines to the first subline plus one more level of indentation.
+        </td>
+      </tr>
+      <tr id='property-wrap.visual.startindent'>
+        <td>
+          wrap.visual.startindent
+        </td>
+        <td>
+          Sets the indention of continued wrapped lines to better visually identify the wrapping.
+          Default is 0 (no indention). Note if wrap.visual.flags is 2 or 3 (begin marker displayed)
+          the line is indented at least 1, even if wrap.visual.startindent is still 0.
+        </td>
+      </tr>
+      <tr id='property-wrap.aware.home.end.keys'>
+        <td>wrap.aware.home.end.keys</td>
+        <td>
+          This property changes the behaviour of the home and end keys when dynamic
+          line wrapping is turned on.  When set to 0 (the default), the Home and End
+          keys will move the caret to the very beginning / end of the 'logical'
+          line, whether or not the line is wrapped over multiple lines in the display.
+          When this property is set to 1, the caret moves to the end of the current
+          'display' line if you press End once, or to the very end of the 'logical'
+          line if you press End again.  Likewise, the Home key moves first to the
+          beginning of the 'display' line, then on to the very beginning of the line.
+          In a pane where dynamic line-wrapping is not enabled, this setting has no
+          effect.
+        </td>
+      </tr>
+      <tr id='property-idle.styling'>
+        <td>
+          <a name='property-output.idle.styling'></a>
+          idle.styling<br />
+          output.idle.styling
+        </td>
+        <td>
+          By default (0), syntax styling is performed for all the currently visible text before displaying it.
+          On very large files, this may make scrolling down slow.
+          With idle.styling=1, a small amount of styling is performed before display and then
+          further styling is performed incrementally in the background. This may result in the
+          text initially appearing uncoloured and then, some time later, it is coloured.
+          Text after the currently visible portion may be styled in the background with 2.
+          To style both before and after the visible text in the background use the value 3.
+          output.idle.styling is the equivalent setting for the output pane.
+        </td>
+      </tr>
+      <tr id='property-cache.layout'>
+        <td>
+          <a name='property-output.cache.layout'></a>
+        cache.layout<br />
+        output.cache.layout
+        </td>
+        <td>
+        A large proportion of the time spent in the editor is used to lay out text prior
+        to drawing it. This information often stays static between repaints so can
+        be cached with these settings. There are four levels of caching. 0 is no caching,
+        1 caches the line that the caret is on, 2 caches the visible page as well as the caret,
+        and 3 caches the whole document. The more that is cached, the greater the
+        amount of memory used, with 3 using large amounts of memory, 7 times the
+        size of the text in the document. However,
+        level 3 dramatically speeds up dynamic wrapping by around 25 times on large
+        source files so is a very good option to use when wrapping is turned on and
+        memory is plentiful.
+        </td>
+      </tr>
+      <tr id='property-open.filter'>
+        <td>
+          open.filter
+        </td>
+        <td>
+          This is a complex expression used for determining the file types that will be available in
+          the open file dialog. For each type of file, there is some explanatory text, a '|'
+          character, some file patterns, and another '|' character. These file types appear in the "Files of type:" pull down.
+          The first item is the default, so you may wish to change the first item to include the file
+          types you commonly open.
+          The default value for this setting is built up by combining some specific settings for "All Source" and "All Files"
+          with all the <a href="#property-star-filter">*filter</a> settings.
+          The "All Source" item uses a set of file patterns which combines all the
+          <a href="#property-star-source.patterns">*source.patterns</a> settings.
+          <br />
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-save.filter'>
+        <td>
+          save.filter
+        </td>
+        <td>
+          This is a complex expression used for determining the file types that will be available in
+          the save file dialog. The structure of the property is the same as open.filter.<br />
+          Does not work on GTK.
+        </td>
+      </tr>
+      <tr id='property-star-source.patterns'>
+        <td>
+          *source.patterns.<i>name</i>
+        </td>
+        <td>
+          Set a value to be included in the set of file extensions used for the "All Source" pull down menu item in the Open dialog
+          when using the default value for <a href="#property-open.filter">open.filter</a>.
+          For example, <span class="example">*source.patterns.ruby=*.rb;*.rbw;</span> adds the file patterns *.rb and *.rbw
+          to the set of source extensions.
+        </td>
+      </tr>
+      <tr id='property-star-filter'>
+        <td>
+          *filter.<i>name</i>
+        </td>
+        <td>
+          Set a value to be included in the file type pull down menu in the Open dialog
+          when using the default value for <a href="#property-open.filter">open.filter</a>.
+          For example, <span class="example">*filter.ruby=Ruby (rb rbw)|*.rb;*.rbw|</span> adds a "Ruby" item to the file type
+          pull down menu. Selecting that item will show files that match the patterns *.rb and *.rbw.
+          There must be 2 '|' characters in the setting.
+        </td>
+      </tr>
+      <tr id='property-max.file.size'>
+        <td>
+          max.file.size
+        </td>
+        <td>
+        To avoid accidentally loading huge files on slow media, or just to ensure SciTE is used
+        only to edit human readable code, the user can set the max.file.size property to specify
+        a limit to file loading.
+        If unset or set to 0, there is no limit.
+        If set to a given size in bytes and if a file to load exceeds this limit, the user is asked
+        if the file should be loaded. If accepted, the file is read as usual. If rejected then no
+        action is taken (no file loaded, no buffer created).
+        </td>
+      </tr>
+      <tr id='property-save.deletes.first'>
+        <td>
+          save.deletes.first
+        </td>
+        <td>
+          Causes files to be deleted before being opened for saving. Can be used
+          to ensure saving under a different capitalisation changes the files capitalisation rather
+          than silently using the old capitalisation.
+        </td>
+      </tr>
+      <tr id='property-save.check.modified.time'>
+        <td>
+          save.check.modified.time
+        </td>
+        <td>
+        With save.check.modified.time=1, when saving and the file has been modified by another
+        process, check if it should be overwritten by the current contents.
+        </td>
+      </tr>
+      <tr id='property-save.session'>
+        <td>
+          <a name='property-save.recent'></a><a name='property-save.position'></a><a name='property-save.find'></a>
+          save.session<br />
+          save.recent<br />
+          save.position<br />
+          save.find
+        </td>
+        <td>
+        If you set save.session, the list of currently opened buffers will be saved on exit
+        in a session file. When you start SciTE next time (without specifying a file name
+        on the command line) the last session will be restored automatically.<br />
+        <b>For GTK</b>, the file is called ".SciTE.session" and is located in the
+        directory given by the SciTE_USERHOME environment variable and if that is
+        not set, the value of the SciTE_HOME environment variable and if that is not
+        set, the value of the HOME environment variable and if that is not
+        set, the top level directory.<br />
+        <b>For Windows</b>, the file is called "SciTE.session" and is located in the
+        directory given by the SciTE_USERHOME environment variable and if that is not
+        set, the value of the SciTE_HOME environment variable and if that is not set,
+        the value of the USERPROFILE environment variable and if that is not set, the
+        directory of the SciTE executable.<br />
+        Setting save.recent causes the most recently used files list to be saved on
+        exit in the session file and read at start up.<br />
+        Setting save.position causes the SciTE window position on the desktop to be
+        saved on exit in the session file and restored at start up.<br />
+        Setting save.find cause the "Find what" and "Replace with" to be saved in the session file.
+        </td>
+      </tr>
+      <tr id='property-session.bookmarks'>
+        <td>
+          <a name='property-session.folds'></a>
+          session.bookmarks<br />
+          session.folds
+        </td>
+        <td>
+          Setting session.bookmarks causes bookmarks to be saved in session files.
+        If you set session.folds then the folding state will be saved in session
+        files. When loading a session file bookmarks and/or folds are restored.
+        Folding states are not restored if fold.on.open is set.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-open.dialog.in.file.directory'>
+        <td>
+        open.dialog.in.file.directory
+        </td>
+        <td>
+          Setting open.dialog.in.file.directory causes the open dialog to initially
+          display the same directory as the current file. If it is not set then the
+          system default is used.
+        </td>
+      </tr>
+      <tr id='property-find.close.on.find'>
+        <td>
+          find.close.on.find
+        </td>
+        <td>
+          Set find.close.on.find to 0, 1 or 2 to prevent (0) or allow (1) closing the
+          the find strip automatically when the Find button is pressed.
+          The value 2 causes the strip to close automatically only when the search finds a match
+          which enables the user to change options or search string if a mistake was made.
+          The default value is 1.
+        </td>
+      </tr>
+      <tr id='property-find.replace.matchcase'>
+        <td>
+          <a name='property-find.replace.regexp'></a><a name='property-find.replace.wrap'></a><a name='property-find.replace.escapes'></a>
+        find.replace.matchcase<br />
+        find.replace.regexp<br />
+        find.replace.wrap<br />
+        find.replace.escapes
+        </td>
+        <td>
+          These properties define the initial conditions for find and replace commands.
+        The find.replace.matchcase property turns of the "Match case" option,
+        find.replace.regexp the "Regular expression" option,
+        find.replace.wrap the "Wrap around" option and
+        find.replace.escapes the "Transform backslash expressions" option.<br />
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-find.replacewith.focus'>
+        <td>
+        find.replacewith.focus
+        </td>
+        <td>
+        If the find.replacewith.focus property is set, the Replace With input box is focused
+        in the Replace dialog if Find What is non-empty.
+        </td>
+      </tr>
+      <tr id='property-find.replace.regexp.posix'>
+        <td>
+        find.replace.regexp.posix
+        </td>
+        <td>
+          Change behaviour of Regular expression search.
+        If set to 0 (the default), characters '(' and ')' must be escaped by '\' to behave as regexp meta characters.
+        If set to 1, these characters are meta characters itself.
+        </td>
+      </tr>
+      <tr id='property-find.replace.regexp.cpp11'>
+        <td>
+        find.replace.regexp.cpp11
+        </td>
+        <td>
+          Change to an alternative regular expression library provided by the C++ compiler
+          that SciTE was built with.
+          This may provide more features than SciTE's own regular expression code.
+        If set to 0 (the default), SciTE's own regular expression code is used.
+        If set to 1, the C++ regular expression library is used.
+        </td>
+      </tr>
+      <tr id='property-find.use.strip'>
+        <td>
+          <a name='property-replace.use.strip'></a>
+         find.use.strip<br />
+         replace.use.strip
+        </td>
+        <td>
+          Use in-window strips rather than dialogs for performing Find or Replace commands.
+        </td>
+      </tr>
+      <tr id='property-find.strip.incremental'>
+        <td>
+          <a name='property-replace.strip.incremental'></a>
+         find.strip.incremental<br />
+         replace.strip.incremental
+        </td>
+        <td>
+          Perform incremental search when typing in the find and replace strips.
+          Set to 1 to enable incremental searching and 2 to enable both incremental searching
+          and highlighting all matches. Highlighting all matches (2) can be slow on large files so
+          should only be enabled when performance is reasonable.
+        </td>
+      </tr>
+      <tr id='property-find.indicator.incremental'>
+        <td>
+          find.indicator.incremental
+        </td>
+        <td>
+          Sets the indicator to use for find.strip.incremental=2 or replace.strip.incremental=2.
+          This is a
+            <a href="#IndicatorProperty">structured property</a> with multiple attributes similar to:
+         <div class="example">
+              find.indicator.incremental=style:compositionthick,colour:#FFB700,under
+         </div>
+        </td>
+       </tr>
+      <tr class="gtkonly" id='property-strip.button.height'>
+        <td>
+         strip.button.height
+        </td>
+        <td>
+          Buttons on GTK often contain extra spacing that makes strips take too much room.
+          This setting tries to limit the height of buttons.
+          A value of 23 or 24 may work well.
+        </td>
+      </tr>
+      <tr class="osxonly" id='property-strip.shortcuts.enable'>
+        <td>
+         strip.shortcuts.enable
+        </td>
+        <td>
+          On macOS, default behaviour is to allow use of shortcuts in the Find and Replace strips
+          such as &#x2318;W to turn "Match whole word only" on or off.
+          This prevents closing the file with &#x2318;W so shortcuts can be disabled for strips
+          by setting this property to 0.
+          This property is only read at start up.
+        </td>
+      </tr>
+      <tr id='property-find.replace.advanced'>
+        <td>
+         find.replace.advanced
+        </td>
+        <td>
+          Enables Replace in Buffers command
+          <span class="windowsonly">and Search only in this style checkbox.
+          If enabled, searches can be restricted to a particular style (e.g. strings).</span>
+        </td>
+      </tr>
+      <tr class="osxonly" id='property-find.indicator'>
+        <td>
+         find.indicator
+        </td>
+        <td>
+          Controls the animated golden match indicator on macOS.
+        The default value, 1, shows and animates the find indicator then fades it away so surrounding text can be seen clearly.
+        Use the value 0 to disable the find indicator and the value 2 to keep the find indicator displayed.
+          This setting is not available on OS X 10.6.
+        </td>
+      </tr>
+      <tr id='property-find.command'>
+        <td>
+          <a name='property-find.input'></a>
+          find.command<br />
+          find.option.wholeword.0<br />
+          find.option.wholeword.1<br />
+          find.option.matchcase.0<br />
+          find.option.matchcase.1<br />
+          <span class="windowsonly">find.input</span>
+        </td>
+        <td>
+          The Find in Files command works in a similar way to the building commands executing a
+          command line tool with output redirected to the output pane. If the command produces
+          output understood by one of the error output passes, as does grep, then the F4 and
+          Shift+F4 keys can be used to move through all the matches. The $(find.what),
+          $(find.files), and $(find.directory) variables can be used for the values from the
+          Find in Files dialog.<br />
+          There are some scripts that implement this feature in Perl better than grep does
+          itself
+          <a href="http://jenda.krynicky.cz/#SciteFind">here</a> and
+          <a href="http://www.forusers.com/forme/finder.zip">here</a>.
+          This command line works with Cygwin on Windows, with modifications to suit
+          the Cygwin installation directory:<br />
+        <div class="example">
+find.command=cmd /c c:\cygwin\bin\find "$(find.directory)"
+-name "$(find.files)" -print0 |
+c:\cygwin\bin\xargs -0 fgrep -G -n "$(find.what)"
+          </div>
+          On Windows, the find string can be given to the find command through
+          its standard input stream to avoid problems with quote interpretation.
+          To do this, specify find.input to be the search string, $(find.what).
+          <br />
+          If find.command is empty then SciTE's own search code is used. This only does a
+        simple search without regular expressions and is faster than running an external program.
+        <br />
+          When defining find.command, to specify the value of the option for the "match case" use
+          $(find.matchcase), and to specify the value of the option "whole word" use
+          $(find.wholeword). Additionally, you should define the properties find.option.matchcase.0,
+          find.option.matchcase.1, find.option.wholeword.0 and find.option.wholeword.1 to
+          match the expected parameters of the command you use for find.
+          <br />
+        <div class="example">
+find.option.wholeword.0=<br />
+find.option.wholeword.1=-w<br />
+find.option.matchcase.0=-i<br />
+find.option.matchcase.1=<br />
+<br />
+find.command=cmd /c c:\cygwin\bin\find "$(find.directory)"
+-name "*" -print0 |
+c:\cygwin\bin\xargs -0 grep $(find.wholeword) $(find.matchcase) -G -n "$(find.what)"
+          </div>
+
+        </td>
+      </tr>
+      <tr id='property-find.files'>
+        <td>
+          find.files
+        </td>
+        <td>
+          This is the default set of files to search through using the Find in Files command.
+          The find.files property can contain a list of sets of files separated by '|' like
+          "*.cxx *.h|*.py *.pyw|*.html" which adds three entries to the history and
+          uses the first as the default value.<br />
+          The evaluation of this setting is a little unusual in that each entry in the value
+          from the property files is appended to the end of the history if that entry is
+          not already present. This means that opening files from different directories
+          will result in any local setting of find.files being added to the list.
+        </td>
+      </tr>
+      <tr id='property-find.in.dot'>
+        <td>
+          find.in.dot
+        </td>
+        <td>
+        If find.in.dot is 1 then Find in Files searches in directories that start with '.'.
+        The default behaviour is to prevent SciTE finding matches in the unmodified versions of
+        files kept by Subversion in .svn subdirectories.
+        </td>
+      </tr>
+      <tr id='property-find.in.binary'>
+        <td>
+          find.in.binary
+        </td>
+        <td>
+        If find.in.binary is 1 then Find in Files displays matches in binary files.
+        For Find in Files, a binary file is a file that contains a NUL byte in the first 64K block read from the file.
+        </td>
+      </tr>
+      <tr id='property-find.in.directory'>
+        <td>
+          find.in.directory
+        </td>
+        <td>
+        If set then Find in Files directory will be prefilled by this value.
+        If not set then Find in Files directory will be prefilled by directory of current file.
+        </td>
+      </tr>
+      <tr id='property-find.in.files.close.on.find'>
+        <td>
+          find.in.files.close.on.find
+        </td>
+        <td>
+          Set to 0 to prevent the Find in Files dialog from closing when "Find" pressed.
+        </td>
+      </tr>
+      <tr id='property-code.page'>
+        <td>
+          <a name='property-output.code.page'></a>
+          code.page<br />
+          output.code.page
+        </td>
+        <td>
+          To support a DBCS language such as Japanese, a code page can be set here. This ensures
+          that double byte characters are always treated as a unit so the caret is never located
+          between the two bytes of a double byte character.<br/><br/>
+          <table>
+          <thead><tr><th>Code page</th><th>Value</th></tr></thead>
+          <tr><td>Default (single byte character set)</td><td align="right">0</td></tr>
+          <tr><td>UTF-8</td><td align="right">65001</td></tr>
+          <tr><td>Japanese Shift-JIS</td><td align="right">932</td></tr>
+          <tr><td>Simplified Chinese GBK</td><td align="right">936</td></tr>
+          <tr><td>Korean Wansung</td><td align="right">949</td></tr>
+          <tr><td>Traditional Chinese Big5</td><td align="right">950</td></tr>
+          <tr><td>Korean Johab</td><td align="right">1361</td></tr>
+          </table>
+        Setting code.page to 65001 starts Unicode mode and the document is treated as
+        a sequence of characters expressed as UTF-8. Display is performed by converting to the
+        platform's normal Unicode encoding first so characters from any language will be displayed.
+        Correct glyphs may only be displayed if fonts are chosen that contain the appropriate glyphs.
+        The Tahoma font contains a wide range of glyphs so may be a good choice. <br/>
+        This property can <em>not</em> set a single byte character set.<br />
+        If output.code.page is set then it is used for the output pane which otherwise
+        matches the edit pane.
+        </td>
+      </tr>
+      <tr id='property-character.set'>
+        <td>
+          character.set
+        </td>
+        <td>
+          This setting allows changing the character set that is asked for when setting up fonts.
+        Not all of the values will work on all platforms.<br/><br/>
+          <table>
+          <thead><tr><th>Character set</th><th>Value</th></tr></thead>
+          <tr><td>Default</td><td align="right">0</td></tr>
+          <tr><td>Japanese</td><td align="right">128</td></tr>
+          <tr><td>Chinese GB2312</td><td align="right">134</td></tr>
+          <tr><td>Chinese BIG5</td><td align="right">136</td></tr>
+          <tr><td>Korean</td><td align="right">129</td></tr>
+          <tr><td>Greek</td><td align="right">161</td></tr>
+          <tr><td>Eastern European</td><td align="right">238</td></tr>
+          <tr class="windowsonly"><td>Baltic</td><td align="right">186</td></tr>
+          <tr class="windowsonly"><td>Turkish</td><td align="right">162</td></tr>
+          <tr><td>Hebrew</td><td align="right">177</td></tr>
+          <tr><td>Arabic</td><td align="right">178</td></tr>
+          <tr class="windowsonly"><td>Thai</td><td align="right">222</td></tr>
+          <tr class="windowsonly"><td>Vietnamese</td><td align="right">163</td></tr>
+          <tr class="gtkonly"><td>Cyrillic (CP866 on GTK)</td><td align="right">866</td></tr>
+          <tr><td>Cyrillic (CP1251 on Windows, KOI8-R on GTK)</td><td align="right">204</td></tr>
+          <tr class="gtkonly"><td>Cyrillic (CP1251 on GTK)</td><td align="right">1251</td></tr>
+          <tr class="gtkonly"><td>European with Euro (ISO 8859-15)</td><td align="right">1000</td></tr>
+          </table>
+        All of these values except for 1251 and 1000 should work on macOS or Windows.
+        On GTK Baltic, Turkish, Thai and Vietnamese will probably not work.
+        </td>
+      </tr>
+      <tr id='property-ime.interaction'>
+        <td>
+          ime.interaction
+        </td>
+        <td>
+          Allows a choice between windowed and inline Input Method Editors with
+          0 choosing windowed mode and 1 the in-line mode.
+          If there is no setting then a mode is chosen that may differ
+          between platforms and locales.
+        </td>
+      </tr>
+      <tr id='property-ime.autocomplete'>
+        <td>
+          ime.autocomplete
+        </td>
+        <td>
+          Setting 1 enables autocompletion on ime input.
+          To see the autocomplete box and calltip box,
+          autocomplete.*.start.characters and calltip.*.word.characters should be given.
+          Others such as calltip.parameters.* with ime characters are not supported.
+          It defaults to 0, so disabled.
+        </td>
+      </tr>
+      <tr class="windows-osx" id='property-bidirectional'>
+        <td>
+          bidirectional
+        </td>
+        <td>
+          Experimental and incomplete display for bidirectional languages like Arabic and Hebrew on macOS
+          and Windows.
+          Set to 1 to turn on bidirectional display.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-accessibility'>
+        <td>
+          accessibility
+        </td>
+        <td>
+        On GTK, accessibility of the edit and output panes may be disabled by setting accessibility to 0.
+        Disabling accessibility may moderately improve performance and memory use.
+        This only affects the custom accessibility implementation, not the functionality provided by
+        the system such as speaking the characters typed.
+        It defaults to 1, so enabled.
+        </td>
+      </tr>
+      <tr id='property-imports.include'>
+        <td>
+          <a name='property-imports.exclude'></a>
+          imports.include<br />
+          imports.exclude
+        </td>
+        <td>
+          These settings control which files are imported by import statements.<br/>
+        The imports.include property defines the names of the properties
+        files that may be imported. Say you are only interested in using
+        fortran and lisp, then in user properties, you could set<br />
+        <div class="example">
+imports.include=fortran lisp
+        </div>
+        The imports.exclude property is examined only if imports.include is empty or missing.
+        This property stops the named files from being imported.<br />
+          The properties files shipped with SciTE, and which can be included or excluded with these properties, are:<br />
+          abaqus ada asl asm asn1 au3 ave avs baan blitzbasic
+          bullant caml cmake cobol coffeescript conf cpp csound css d ecl
+          eiffel erlang escript flagship forth fortran freebasic gap haskell
+          hex html inno kix latex lisp lot lout lua matlab maxima metapost
+          mmixal modula3 nimrod nncrontab nsis opal oscript others
+          pascal perl pov powerpro powershell ps purebasic python r rebol
+          registry ruby rust scriptol smalltalk sorcins specman spice sql
+          tacl tal tcl tex txt2tags vb verilog vhdl yaml.
+        </td>
+      </tr>
+      <tr id='property-command.discover.properties'>
+        <td>
+        command.discover.properties
+        </td>
+        <td>
+        This property can be used to run a program to determine file encoding and other properties
+        when a file is loaded.<br />
+        The program should print a list of property=value lines for each property it wants to set.
+        This is the same format as properties files.<br />
+        <div class="example">
+              command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
+         </div>
+        A simple Python script that recognises a particular tag that indicates the file is in the Korean code page 949:<br />
+        <div class="example">
+<span><span class="S5">import</span><span class="S0"> </span>sys<br />
+<span class="S5">if</span><span class="S0"> </span><span class="S3">"Language:Korean"</span><span class="S0"> </span><span class="S5">in</span><span class="S0"> </span>open<span class="S10">(</span>sys<span class="S10">.</span>argv<span class="S10">[</span><span class="S2">1</span><span class="S10">]).</span>read<span class="S10">():</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">print</span><span class="S10">(</span><span class="S4">'code.page=949'</span><span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">print</span><span class="S10">(</span><span class="S4">'character.set=129'</span><span class="S10">)</span><br />
+<span class="S0"></span></span>
+         </div>
+        </td>
+      </tr>
+      <tr id='property-comment.block'>
+        <td>
+          <a name='property-comment.block.at.line.start'></a><a name='property-comment.stream.start'></a><a name='property-comment.stream.end'></a><a name='property-comment.box.start'></a><a name='property-comment.box.middle'></a><a name='property-comment.box.end'></a>
+        comment.block.<i>lexer</i><br />
+        comment.block.at.line.start.<i>lexer</i><br />
+        comment.stream.start.<i>lexer</i><br />
+        comment.stream.end.<i>lexer</i><br />
+        comment.box.start.<i>lexer</i><br />
+        comment.box.middle.<i>lexer</i><br />
+        comment.box.end.<i>lexer</i>
+        </td>
+        <td>
+        These settings are for the comment commands in the Edit menu and are
+        defined separately for each lexer. Not all languages support
+        both stream and block comments.<br />
+        Block comments are comments that start with a particular string and
+        continue until the end of line.
+        The comment.block property sets the string to be inserted or deleted
+        at the start of the selected lines when the Block Comment or Uncomment
+        command is performed. To make this command perform sensibly over
+        a range of text that already contains comments and other code, the string
+        can be defined to contain a character such as '~' that is not used in real
+        comments.<br />
+        Set comment.block.at.line.start to "1" to place block comment symbols
+        at the start of the lines, instead of just before the first non-blank
+        character of the lines.<br />
+        Stream comments start with a particular string and end with another
+        particular string and may continue over line ends. These are defined
+        with comment.stream.start and comment.stream.end. <br />
+        Box comments are a form of stream comment that takes several lines
+        and uses different strings for the start, end and other lines in the range.
+        These are defined with comment.box.start,
+        comment.box.middle and comment.box.end.
+        </td>
+      </tr>
+      <tr id='property-preprocessor.symbol'>
+        <td>
+          <a name='property-preprocessor.start'></a><a name='property-preprocessor.middle'></a><a name='property-preprocessor.end'></a>
+        preprocessor.symbol.<i>filepattern</i><br />
+        preprocessor.start.<i>filepattern</i><br />
+        preprocessor.middle.<i>filepattern</i><br />
+        preprocessor.end.<i>filepattern</i>
+        </td>
+        <td>
+        These settings make the preprocessor conditional movement and selection commands work.
+        The character that defines preprocessor lines is defined by preprocessor.symbol.
+        The preprocessor keywords that make up the start (if), middle (else), and end (endif)
+        of preprocessor conditionals are defined by the other three properties.
+        There may be multiple values for each of these, as, for example, C uses "if", "ifdef",
+        and "ifndef" to begin preprocessor conditionals.
+        </td>
+      </tr>
+      <tr id='property-lexer'>
+        <td>
+          lexer.<i>filepattern</i>
+        </td>
+        <td>
+          A lexer splits a file up into syntactic pieces. SciTE can then display these pieces in
+          different visual styles. Many lexers are included in SciTE for popular
+          programming languages such as Python, Java, C/C++, JavaScript and VB. Often several file
+          extensions (.cpp, .cc, .h) can map to one language (C++) and hence one lexer. These
+          settings associate a file name with a lexer.<br />
+          The lexers included in SciTE are written in C++ and compiled into the SciTE executable.
+          Lexers can also be written as a <a href="ScriptLexer.html">Lua script</a>
+          or as a Lua LPeg lexer using <a href="http://code.google.com/p/scintillua/">scintillua</a>.
+        </td>
+      </tr>
+      <tr id='property-shbang'>
+        <td>
+          shbang.<i>command</i>
+        </td>
+        <td>
+          On Unix, command files often have no extension and instead specify the interpreter
+                    to use for the file in an initial line that starts with "#!". When the lexer can not be
+                         otherwise determined and the file starts with "#!", the initial line is split up into words and
+                         each word is prepended with "shbang.". If a property with this name exists then it is
+                         treated as the extension of the file. For example, <span class="example">shbang.python=py</span> will be
+                         triggered by an initial line <span class="example">#!/usr/bin/env python</span> so the file will be treated as Python.
+        </td>
+      </tr>
+      <tr id='property-lexilla.path'>
+        <td>
+        lexilla.path
+        </td>
+        <td>
+          Specifies a ';' separated list of dynamic lexer libraries.
+          Each entry is a path to a dynamic library that implements the Lexilla protocol.
+          If there is no extension then the platform standard extension '.so', '.dll', or '.dylib' is appended.
+          The special entry '.' which is the default refers to the 'Lexilla' dynamic library distributed with SciTE.
+        </td>
+      </tr>
+      <tr id='property-lexillacontext'>
+        <td>
+        lexilla.context.<i>contextspecific</i>
+        </td>
+        <td>
+          Lexer libraries may require initialisation parameters and these can be specified by prefixing the
+          library-specific names with 'lexilla.context.'.
+          For example, a lexer library that needs to read in XML files containing lexer definitions may require a
+          xmllexer.directory property which is provided with lexilla.context.xmllexer.directory.
+          <div class="example">
+                lexilla.context.xmllexer.directory=/home/example/xmllexer/definitions
+          </div>
+        </td>
+      </tr>
+      <tr id='property-keywords'>
+        <td>
+          <a name='property-keywords2'></a><a name='property-keywords3'></a><a name='property-keywords4'></a><a name='property-keywords5'></a><a name='property-keywords6'></a><a name='property-keywords7'></a><a name='property-keywords8'></a><a name='property-keywords9'></a><a name='property-keywordclass'></a>
+          keywords.<i>filepattern</i><br />
+          keywords2.<i>filepattern</i><br />
+          keywords3.<i>filepattern</i><br />
+          keywords4.<i>filepattern</i><br />
+          keywords5.<i>filepattern</i><br />
+          keywords6.<i>filepattern</i><br />
+          keywords7.<i>filepattern</i><br />
+          keywords8.<i>filepattern</i><br />
+          keywords9.<i>filepattern</i><br />
+          keywordclass.<i>lexer</i>
+        </td>
+        <td>
+          Most of the lexers differentiate between names and keywords and use the keywords
+          variables to do so. To avoid repeating the keyword list for each file extension, where
+          several file extensions are used for one language, a keywordclass variable is defined in
+          the distributed properties file although this is just a convention. Some lexers define a
+          second set of keywords which will be displayed in a different style to the first set of
+          keywords. This is used in the HTML lexer to display JavaScript keywords in a different
+          style to HTML tags and attributes.<br />
+        Keywords can be prefix based so ^GTK_ will treat all words that start
+        with GTK_ as keywords.
+        </td>
+      </tr>
+      <tr id='property-default.file.ext'>
+        <td>
+          default.file.ext
+        </td>
+        <td>
+          Defines the language mode used before the file has a name. For example, if
+          default.file.ext=.py, then when the New command is used to create a new file then Python
+          syntax styling is used.
+        </td>
+      </tr>
+      <tr id='property-word.characters'>
+        <td>
+          word.characters.<i>filepattern</i>
+        </td>
+        <td>
+          Defines which characters can be parts of words. The default value here is all the
+          alphabetic and numeric characters and the underscore which is a reasonable value for
+          languages such as C++.
+        </td>
+      </tr>
+      <tr id='property-whitespace.characters'>
+        <td>
+          whitespace.characters.<i>filepattern</i>
+        </td>
+        <td>
+          Defines which characters are considered whitespace. The default value is that initially set up
+                  by Scintilla, which is space and all chars less than 0x20.  Setting this property allows you to
+                  force Scintilla to consider other characters as whitespace (e.g. punctuation) during such activities
+                  as cursor navigation (ctrl+left/right).
+        </td>
+      </tr>
+      <tr id='property-style.*'>
+        <td>
+          style.*.<i>stylenumber</i><br />
+           style.<i>lexer</i>.<i>stylenumber</i>
+        </td>
+        <td>
+          The lexers determine a style number for each lexical type, such as keyword, comment or
+          number. These settings determine the visual style to be used for each style number of
+          each lexer.<br />
+           The value of each setting is a set of ',' separated fields, some of which have a
+          subvalue after a ':'. The fields are: <div class="example">font, size, fore, back, italics, notitalics, bold,
+          notbold, weight, eolfilled, noteolfilled, underlined, notunderlined, case,
+          visible, notvisible, changeable, and notchangeable</div>
+        The font field has a subvalue which is the name of
+          the font, the fore and back have colour subvalues,
+          the size field has a (fractional) numeric size subvalue,
+          the weight field has a numeric size subvalue (1.. 999: 100=light, 400=normal, 700=bold),
+          the case field has a subvalue of 'm', 'u', 'l', or 'c' for miXed, UPPER, lower, or Camel case,
+          and the bold, italics and eolfilled fields have no subvalue. The value
+          "fore:#FF0000,font:Courier,size:14" represents 14 point, red Courier text.<br />
+           A global style can be set up using style.*.<i>stylenumber</i>. Any style options set in
+          the global style will be inherited by each lexer style unless overridden.
+        </td>
+      </tr>
+      <tr>
+        <td>
+          style.<i>lexer</i>.32<br />
+           style.<i>lexer</i>.33<br />
+           style.<i>lexer</i>.34<br />
+           style.<i>lexer</i>.35<br />
+           style.<i>lexer</i>.36<br />
+           style.<i>lexer</i>.37<br />
+           style.<i>lexer</i>.38
+        </td>
+        <td>
+          As well as the styles generated by the lexer, there are other numbered styles used.<br />
+           Style 32 is the default style and its features will be inherited by all other styles
+          unless overridden.<br />
+           Style 33 is used to display line numbers in the margin.<br />
+           Styles 34 and 35 are used to display matching and non-matching braces
+          respectively.<br />
+           Style 36 is used for displaying control characters. This is not a full style as the
+          foreground and background colours for control characters are determined by their lexical
+          state rather than this style.<br />
+           Style 37 is used for displaying indentation guides. Only the fore and back are used.<br />
+           Style 38 is used for displaying calltips. Only the font, size, fore and back are used.<br />
+           A * can be used instead of a lexer to indicate a global style setting.
+        </td>
+      </tr>
+      <tr id='property-substyles'>
+        <td>
+          substyles.<i>lexer</i>.<i>stylenumber</i>
+        </td>
+        <td>
+          Substyles are mainly used to display sets of identifiers distinctly.
+          When working with a particular library, you may want to highlight all the calls to functions in that library
+          differently to your own functions or operating system calls.
+          Substyles splits one style, commonly an identifier style, into several groups.
+          Only some lexers support this and within a lexer it will only be supported for some styles.
+          Currently the cpp lexer allows substyles for identifiers (11) and
+          comment doc keywords (17), and the python lexer allows substyles for identifiers (11).
+          Language properties files will specify the styles that can be split.<br />
+          This setting defines how many substyles are allocated to a particular main style.
+          To allow 2 extra styles for identifiers in C++:
+          <div class="example">
+                substyles.cpp.11=2
+          </div>
+        </td>
+      </tr>
+      <tr id='property-substylewords'>
+        <td>
+          substylewords.<i>mainstyle</i>.<i>substyle</i>.<i>filepattern</i>
+        </td>
+        <td>
+          This property defines which words are to be styled in a particular substyle, in a similar way to keywords.
+          For example, to use the first substyle of identifiers (11) for the C++ standard library identifiers "std", "map",
+          "string", and "vector":
+          <div class="example">
+                substylewords.11.1.$(file.patterns.cpp)=std map string vector
+          </div>
+        </td>
+      </tr>
+      <tr id='property-style.sub'>
+        <td>
+          style.<i>lexer</i>.<i>mainstyle</i>.<i>substyle</i>
+        </td>
+        <td>
+          This property defines the visual appearance of a substyle.
+          For example, to display the first substyle of identifiers (11) as pink:
+          <div class="example">
+                style.cpp.11.1=fore:#EE00AA
+          </div>
+        </td>
+      </tr>
+      <tr class="windows-osx" id='property-font.quality'>
+        <td>
+          font.quality
+        </td>
+        <td>
+        This setting allows choosing different ways of drawing text on Windows and macOS.
+        The appearance will depend on platform settings and, on Windows, the technology setting.
+        This setting does not currently have any effect on GTK.
+          <table>
+          <thead><tr><th>Value</th><th>Meaning</th></tr></thead>
+          <tr><td>0</td><td>Default</td></tr>
+          <tr><td>1</td><td>Non-antialiased</td></tr>
+          <tr><td>2</td><td>Antialiased</td></tr>
+          <tr><td>3</td><td>LCD Optimized</td></tr>
+          </table>
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-font.locale'>
+        <td>
+          font.locale
+        </td>
+        <td>
+        This setting allows choosing character shapes that match languages by specifying a language locale.
+        Some values are "ja" for Japanese, "ko" for Korean, "zh-Hans" for Simplified Chinese and "zh-Hant" for Traditional Chinese.
+        The default setting is "en-us" for US English.
+        The setting only works on Windows with DirectWrite (technology=1).
+        </td>
+      </tr>
+       <tr id='property-braces.check'>
+        <td>
+          <a name='property-braces.sloppy'></a>
+          braces.check<br />
+           braces.sloppy<br />
+           style.<i>lexer</i>.34<br />
+           style.<i>lexer</i>.35<br />
+           braces.<i>lexer</i>.style
+        </td>
+        <td>
+          Brace highlighting is a feature that shows the range of a brace when the caret is
+          positioned immediately after it. It is especially useful when complex nested braces are
+          used. The characters '(', ')', '[', ']', '{', and '}' are considered braces. The feature
+          defaults to off (because it slows cursor movement) unless braces.check is set to 1. If
+          braces.sloppy is set to 1 then if there is no brace before the caret then the character
+          after the caret is checked. The highlighting is performed by displaying the braces in
+          style number 34 or in style number 35 if there is no matching brace. While this is a full
+          style, to avoid partial display of the braces, it is best to make this style differ from
+          the standard style of braces only in foreground and background colour. Only braces with
+          style set to braces.<i>lexer</i>.style (which defaults to 0) are candidates for brace
+          match highlighting.
+        </td>
+      </tr>
+      <tr id='property-font.monospace'>
+        <td>
+        font.monospace
+        </td>
+        <td>
+        Defines, with the same syntax as the style properties,
+        the font name and size to be used when the Use Monospaced Font
+        command is performed.
+        </td>
+      </tr>
+      <tr id='property-command.compile'>
+        <td>
+          <a name='property-command.compile.subsystem'></a><a name='property-command.build'></a><a name='property-command.build.subsystem'></a><a name='property-command.build.directory'></a><a name='property-command.go'></a><a name='property-command.go.subsystem'></a><a name='property-command.clean'></a>
+          command.compile.<i>filepattern</i><br />
+          command.compile.subsystem.<i>filepattern</i><br />
+          command.build.<i>filepattern</i><br />
+          command.build.subsystem.<i>filepattern</i><br />
+          command.build.directory.<i>filepattern</i><br />
+          command.clean.<i>filepattern</i><br />
+          command.clean.subsystem.<i>filepattern</i><br />
+          command.go.<i>filepattern</i><br />
+        command.go.subsystem.<i>filepattern</i>
+        </td>
+        <td>
+          These settings choose which commands to execute when the Compile, Build, Clean or Go menu items
+          are selected. The subsystem options are explained in the subsystem section.<br />
+        When source files are in a different directory to that they should be built in, the
+        command.build.directory property can be set to change to a particular directory before performing
+        the build.
+        </td>
+      </tr>
+      <tr id='property-command.go.needs'>
+        <td>
+          <a name='property-command.go.needs.subsystem'></a>
+          command.go.needs.<i>filepattern</i><br />
+          command.go.needs.subsystem.<i>filepattern</i>
+        </td>
+        <td>
+          Sometimes a file must be compiled or built before it can be run. If this is the case,
+          this setting indicates what command needs to be run to perform the compile or build step
+          before running the file. When a file is compiled, this is noted and future runs will not
+          perform a compile or build. To make a 'compile and go' Go command for .c files:
+        <div class="example">
+                command.go.*.c=$(FileName)<br />
+                command.go.needs.*.c=g++ $(FileNameExt) -o $(FileName)<br />
+         </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          command.name.<i>number</i>.<i>filepattern</i><br />
+        command.<i>number</i>.<i>filepattern</i><br />
+          command.is.filter.<i>number</i>.<i>filepattern</i><br />
+          command.subsystem.<i>number</i>.<i>filepattern</i><br />
+          command.save.before.<i>number</i>.<i>filepattern</i><br />
+          <span class="windowsonly">command.input.<i>number</i>.<i>filepattern</i></span><br />
+          command.replace.selection.<i>number</i>.<i>filepattern</i><br />
+          command.quiet.<i>number</i>.<i>filepattern</i><br />
+          command.mode.<i>number</i>.<i>filepattern</i><br />
+          command.shortcut.<i>number</i>.<i>filepattern</i>
+        </td>
+        <td>
+          Extra commands can be added to the Tools menu. For example to include the 'astyle'
+          indenter, the properties file could contain
+         <div class="example">command.name.0.*.cc=Indent<br />
+                command.0.*.cc=astyle -taO $(FileNameExt)<br />
+                command.is.filter.0.*.cc=1</div>
+          The first line defines the string that will appear in the Tools menu (immediately below
+          'Go'). The second line is the command string, similar to those of the compile, build, and
+          go commands. The optional command.is.filter property states that the command modifies the
+          current file so it may need to be read in after performing the command if
+          load.on.activate is set.<br />
+        If command.save.before is set to 1, SciTE automatically saves the file before execution.
+        If it is set to 2, SciTE will not save the file, otherwise SciTE asks you.
+
+        On Windows, the optional command.input property specifies text that will be piped
+        to the command.  This may reference other properties; for example,
+        <span class="example">command.input.0.*.cc=$(CurrentSelection)</span>
+        would pipe the current selection to the command processes.
+        The command.input property is only supported for subsystem 0
+        (command line programs).<br />
+        <br />
+
+        The optional command.replace.selection can be used to specify that the
+        command output should replace the current selection (or be inserted at the cursor
+        location, if there is no selection).  This property has three available settings:
+        0, the default, means do not replace the selection.  1 means replace the selection
+        when the command finishes.  2 means replace the selection only if the command
+        finishes with an exit code of 0.  If the user cancels the command via "Tools / Stop
+        Executing", the selection will not be replaced even in mode 1.  Note, commands run
+        asynchronously, so you are not prevented from modifying the document or even
+        switching buffers while a command is running.  However, please bear in mind that
+        command.replace.selection will send the output to whatever window is active <i>when
+        the command completes</i>.<br />
+
+        A final command property is command.quiet.
+        A value of 1 indicates that the command I/O should not be echoed to the output pane.
+        This may be useful in combination with command.input and command.replace.selection.<br />
+        <br />
+
+        The command.mode property is a comma-separated list of flags / settings.  Each mode
+        setting can have an argument, separated from the setting name by a colon.  For
+        most of these, the argument portion is optional; if the setting name appears without
+        an argument, this works the same as "setting:yes".  If a setting is included in
+        the command.mode but also appears as a separate command property, the mode property
+        will be overridden.  Similarly, if a single setting appears more than once with
+        different arguments, the last valid argument takes priority.  The supported
+        command.mode settings are:
+      <div class="example">
+filter - accepts keyword arguments yes and no<br />
+quiet - accepts keyword arguments yes and no<br />
+replaceselection - accepts yes, no, and auto<br />
+savebefore - accepts yes, no, and prompt<br />
+subsystem - console, windows, shellexec, lua, director, winhelp, htmlhelp, immediate<br />
+groupundo - yes or no
+</div>
+        Currently, all of these except groupundo are based on individual properties with
+        similar names, and so are not described separately here.  The groupundo setting
+        works with subsystem 3 (lua / director), and indicates that SciTE should treat any
+        changes made by the command as a single undo action.  A command that uses the
+        groupundo setting should not change which buffer is active in the editor.<br />
+
+        The command.shortcut property allows you to specify a keyboard shortcut for the
+        command.  By default, commands 0 to 9 have keyboard shortcuts Ctrl+0 to Ctrl+9
+        respectively, but this can be overridden.  For commands numbered higher than 9,
+        there is no default keyboard shortcut.  The notation used to specify keyboard
+        shortcuts is the same as for the user.shortcuts property, described elsewhere
+        in this document.<br />
+        <br />
+
+        If the text of a command starts with '*' then the Parameters dialog is displayed to
+        prompt for parameters before executing the command. The initial '*' is not included
+        in the command that is executed.<br />
+        <br />
+
+        The command number can be in the range of 0 to 49. Command numbers 0 to 9 are
+        assigned Ctrl+Number shortcuts. Internally these commands use IDs starting from
+        1100 (IDM_TOOLS) which can be used in user.shortcuts and user.context.menu as:
+         <div class="example">user.context.menu=Indent|1100|</div>
+         If command.name is empty then no item is added to the Tools menu. This can be used
+         for commands that are only in the context menu or user shortcuts.
+        </td>
+      </tr>
+      <tr id='property-command.help'>
+        <td>
+          <a name='property-command.help.subsystem'></a>
+          command.help.<i>filepattern</i><br />
+          command.help.subsystem.<i>filepattern</i>
+        </td>
+        <td>
+        Defines a command to be executed when the help command is
+        invoked or F1 pressed. On Windows, this often uses subsystem 4 as described above.
+        On macOS or Linux, running man or a browser are common ways of displaying help.
+        The word at the cursor is copied to $(CurrentWord) and this is often a good argument
+        to the help application. The subsystem property works in the same way as for other
+        commands.
+        </td>
+      </tr>
+      <tr id='property-command.scite.help'>
+        <td>
+          <a name='property-command.scite.help.subsystem'></a>
+          command.scite.help<br />
+          command.scite.help.subsystem
+        </td>
+        <td>
+        Defines a command to be executed for help on the SciTE program itself which normally
+        means displaying this file in a browser.
+        </td>
+      </tr>
+      <tr id='property-time.commands'>
+        <td>
+        time.commands
+        </td>
+        <td>
+          When a command is completed, print the time it took in seconds.
+        </td>
+      </tr>
+      <tr id='property-print.magnification'>
+        <td>
+        print.magnification
+        </td>
+        <td>
+          Printing is normally done with the same settings as screen display.
+        To make the printing larger or smaller, the print.magnification
+        setting is added to the size of every font when printed. To get a
+        good miniaturisation of text, set print.magnification to -4.
+        </td>
+      </tr>
+      <tr id='property-print.colour.mode'>
+        <td>
+        print.colour.mode
+        </td>
+        <td>
+        Some people prefer light coloured text on a black background on
+        screen but dark text on white on paper. If print.colour.mode is set
+        to 1 then each colour is inverted for printing. If set to 2 then
+        printing produces black text on white background. 3 forces the
+        background to white and 4 forces the default background to white.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-print.margins'>
+        <td>
+        print.margins
+        </td>
+        <td>
+        Specify the default margins on the printer on Windows in left right top bottom order.
+        Units depends on your locale, either hundredths of millimetres or thousandths
+        of inches. You can see which units by the units used in the page setup dialog.
+        This property is only read at start up.
+        </td>
+      </tr>
+      <tr id='property-print.header.format'>
+        <td>
+          <a name='property-print.footer.format'></a>
+        print.header.format<br />
+        print.footer.format
+        </td>
+        <td>
+        These settings determine what will be printed if anything as headers and
+        footers. Property settings can be substituted into the values using the $(property)
+        syntax. There are some extra properties set up while printing:
+        CurrentPage, FileTime, FileDate, CurrentDate, and CurrentTime (at start of
+        printing).
+        Common properties to use in headers and footers are FileNameExt and FilePath.<br />
+        A header setting may look like:<br />
+        <div class="example">
+        print.header.format=$(FileNameExt) - Printed on $(CurrentDate),$(CurrentTime) - Page $(CurrentPage)
+        </div>
+        </td>
+      </tr>
+      <tr id='property-print.header.style'>
+        <td>
+          <a name='property-print.footer.style'></a>
+        print.header.style<br />
+        print.footer.style
+        </td>
+        <td>
+        These settings determine the style of the header and footer using the same
+        format as other styles in SciTE. Only the fore, back, font, size, bold, italics,
+        and underlined attributes are supported.
+        </td>
+      </tr>
+      <tr id='property-export.keep.ext'>
+        <td>
+        export.keep.ext
+        </td>
+        <td>
+        This property determines how the file name
+        (for example, LineMarker.cxx) is transformed when
+        exporting to include the appropriate export format extension -
+        .html for HTML and .rtf for RTF.
+        If export.keep.ext is the default, 0, then the current extension is replaced
+        (LineMarker.html).
+        If it is 1, then the export format extension is added (LineMarker.cxx.html).
+        If it is 2 then the final '.' is replaced by '_' and the
+        export format extension added (LineMarker_cxx.html).
+        </td>
+      </tr>
+      <tr id='property-export.html.wysiwyg'>
+        <td>
+          <a name='property-export.html.tabs'></a><a name='property-export.html.folding'></a><a name='property-export.html.styleused'></a><a name='property-export.html.title.fullpath'></a>
+        export.html.wysiwyg<br />
+        export.html.tabs<br />
+        export.html.folding<br />
+        export.html.styleused<br />
+        export.html.title.fullpath
+        </td>
+        <td>
+        When export.html.wysiwyg is set to 0 then exporting to a HTML file produces a smaller
+        file but which is less completely specified so may look more different to the on screen display.
+        When export.html.tabs is set to 1 and export.html.wysiwyg is set to 0 then tab characters in
+        the file are exported as tab characters rather than a sequence of space characters.<br />
+        The exported file can be made to fold in browsers that support CSS well (Mozilla and Internet
+        Explorer) by setting export.html.folding to 1.
+        Only export styles actually used when export.html.styleused set to 1.
+        The full path name of the file is put in the title, instead of just the file name
+        when export.html.title.fullpath set to 1.
+        </td>
+      </tr>
+      <tr id='property-export.rtf.wysiwyg'>
+        <td>
+          <a name='property-export.rtf.tabs'></a><a name='property-export.rtf.font.face'></a><a name='property-export.rtf.font.size'></a><a name='property-export.rtf.tabsize'></a>
+        export.rtf.wysiwyg<br />
+        export.rtf.tabs<br />
+        export.rtf.font.face<br />
+        export.rtf.font.size<br />
+        export.rtf.tabsize
+        </td>
+        <td>
+        When export.rtf.wysiwyg is set to 0 then exporting to a RTF file produces a smaller
+        file but which is less completely specified so may look more different to the on screen display.
+        When export.rtf.tabs is set to 1 and export.rtf.wysiwyg is set to 0 then tab characters in
+        the file are exported as tab characters rather than a sequence of space characters. <br />
+        export.rtf.font.face and export.rtf.font.size can be used to select a particular font and size
+        for the exported RTF file. export.rtf.tabsize can be set to use a different tab size than that
+        defined by the tabsize setting.
+        </td>
+      </tr>
+      <tr id='property-export.pdf.magnification'>
+        <td>
+          <a name='property-export.pdf.font'></a><a name='property-export.pdf.pagesize'></a><a name='property-export.pdf.margins'></a>
+        export.pdf.magnification<br />
+        export.pdf.font<br />
+        export.pdf.pagesize<br />
+        export.pdf.margins
+        </td>
+        <td>
+        export.pdf.magnification is a value that is added to the font size of the default screen style in use.
+        A positive value increases the PDF document's font size, and vice versa.<br />
+        export.pdf.font accepts a one-word parameter that selects one of the default PDF fonts: Courier,
+        Helvetica or Times. Helvetica is the default. Helvetica and Times do not line wrap, Courier line
+        wraps.<br />
+        export.pdf.pagesize is used to set the document's page size, using points (1/72th of an inch) as
+        the unit. E.g. Letter paper (8.5 inch x 11 inch) is specified using the values 612,792.<br />
+        export.pdf.margins sets the widths of the page margins. Margins defaults to 72 points,
+        or 1 inch.<br />
+        The PDF exporter is necessarily feature-limited because PDF is a document archival format. Supporting
+        a full set of features will bloat SciTE. Wrapping Helvetica or Times adequately isn't possible without
+        the complexities of font metrics and kerning. The PDF produced uses WinAnsiEncoding, so pre-encoding
+        has to be done before exporting to PDF, if you want to use extended characters.
+        </td>
+      </tr>
+      <tr id='property-export.tex.title.fullpath'>
+        <td>
+        export.tex.title.fullpath
+        </td>
+        <td>
+        The full path name of the file is put in the title, instead of just the file name
+        when export.tex.title.fullpath set to 1.
+        </td>
+      </tr>
+      <tr id='property-export.xml.collapse.spaces'>
+        <td>
+          <a name='property-export.xml.collapse.lines'></a>
+        export.xml.collapse.spaces<br />
+        export.xml.collapse.lines
+        </td>
+        <td>
+        export.xml.collapse.spaces and export.xml.collapse.lines are flags that control how empty lines
+        and runs of space characters are converted into XML. The flags are enabled if set to 1. Tab
+        characters are always converted by the XML exporter into spaces according to the tabsize property.
+        </td>
+      </tr>
+      <tr id='property-fold'>
+        <td>fold</td>
+        <td>Folding is turned on by setting fold=1.</td>
+      </tr>
+      <tr id='property-fold.symbols'>
+        <td>
+          fold.symbols
+        </td>
+        <td>
+        The fold.symbols setting chooses between four ways of showing folding.
+        Set to 0 (the default) for macOS style arrows to indicate contracted
+        (facing right) and expanded (facing down); 1 to display contracted folds
+        with "+" and expanded with "-"; 2 for a flattened tree control with round
+        headers and rounded joins; 3 for a flattened tree control with square headers.
+        </td>
+      </tr>
+      <tr id='property-fold.fore'>
+        <td>
+          <a name='property-fold.back'></a>
+          fold.fore<br />
+          fold.back
+        </td>
+        <td>
+        Sets the colours used for folds. fold.fore sets the outline colour, fold.back sets the fill.
+        An 8-digit value sets the translucency as well: #FF00007F is half-transparent red.
+        </td>
+      </tr>
+      <tr id='property-fold.stroke.width'>
+        <td>
+          fold.stroke.width
+        </td>
+        <td>
+          Sets the stroke width of the fold symbols in hundredths of a pixel.
+          The default value, 100 is good for standard displays but 200 may be better for high DPI displays,
+        </td>
+      </tr>
+      </tr>
+      <tr id='property-fold.margin.width'>
+        <td>
+          fold.margin.width
+        </td>
+        <td>
+          Sets the width of the fold margin.
+        </td>
+      </tr>
+      <tr id='property-fold.margin.colour'>
+        <td>
+          <a name='property-fold.margin.highlight.colour'></a>
+          fold.margin.colour<br />
+          fold.margin.highlight.colour
+        </td>
+        <td>
+          These two properties defined the fold margin colour and fold
+          margin highlight colour.  If they are not defined (left commented out) the colours for the
+          fold margin will default to a reasonable pair of colours.
+          On Windows, the system colours are used to make the fold margin appear like the background
+          of scroll bars. As an example, with <span class="example">fold.margin.colour=#FF0000</span> and
+          <span class="example">fold.margin.highlight.colour=#0000FF</span>, the fold margin is a mixture of red
+          and blue.
+        </td>
+      </tr>
+      <tr id='property-fold.on.open'>
+        <td>
+          fold.on.open
+        </td>
+        <td>
+        To automatically fold files as much as possible when loaded, set
+        fold.on.open to 1.
+        </td>
+      </tr>
+      <tr id='property-fold.flags'>
+        <td>
+          fold.flags
+        </td>
+        <td>
+                Not really documented ;) bit flags which may go away.
+        2, 4, 8, and 16 control drawing lines above and below folding lines if
+        expanded or not expanded.
+        Set to 64 to help debug folding by showing hexadecimal fold levels in margin.
+        </td>
+      </tr>
+      <tr id='property-fold.compact'>
+        <td>
+          fold.compact<br />
+        </td>
+        <td>
+        For HTML, XML, Lua and C++ and similar files, turning this option on leads to blank lines following the
+        end of an element folding with that element. Defaults to on.
+        </td>
+      </tr>
+      <tr id='property-fold.highlight'>
+        <td>
+          fold.highlight<br />
+        </td>
+        <td>
+        Set to 1 to enable highlight for current folding block (smallest one that contains the caret).
+        By default, it's disable. Note : The highlight is enabled only when fold.symbols equals
+        to 2 (round headers) or 3 (square headers).
+        </td>
+      </tr>
+      <tr id='property-fold.highlight.colour'>
+        <td>
+          fold.highlight.colour<br />
+        </td>
+        <td>
+        Define the colour of highlight. The colour by default is red (#FF0000).
+        An 8-digit value sets the translucency as well.
+        </td>
+      </tr>
+      <tr id='property-title.full.path'>
+        <td>
+          title.full.path
+        </td>
+        <td>
+                Chooses how the file name is displayed in the title bar.
+        When 0 (default) the file name is displayed. When 1 the full path is displayed.
+               When 2 the window title displays "filename in directory".
+        </td>
+      </tr>
+      <tr id='property-title.show.buffers'>
+        <td>
+          title.show.buffers
+        </td>
+        <td>
+                When set to 1 shows the current buffer number in the title bar.
+        </td>
+      </tr>
+      <tr id='property-tabsize'>
+        <td>
+          <a name='property-tab.size'></a><a name='property-indent.size'></a><a name='property-use.tabs'></a><a name='property-indent.auto'></a><a name='property-tab.indents'></a><a name='property-backspace.unindents'></a>
+          tabsize<br />
+          tab.size.<i>filepattern</i><br />
+        indent.size<br />
+        indent.size.<i>filepattern</i><br />
+          use.tabs<br />
+          use.tabs.<i>filepattern</i><br />
+        indent.auto<br />
+        tab.indents<br />
+        backspace.unindents
+        </td>
+        <td>
+          Sets the size of a tab as a multiple of the size of a space character in the style of the
+          default style definition. The indent size is the size to use when performing automatic
+        indentation and may be different from the tab size. Many people use a tab size of 8 but
+        4 character indentation. When creating indentation, use.tabs determines whether the
+        indentation is made up purely from space characters or from a mix of tabs and spaces
+        using as many tabs as possible. <br />
+        The global tabsize, indent.size, and use.tabs properties can be overridden for
+        files that match a pattern by using the file pattern forms: <br />
+        <div class="example">
+        indent.size.*.pas=3</div>
+        If indent.auto is set then indent.size and use.tabs are set according to the contents
+        of the opened document.<br />
+        The properties file settings apply to newly opened files but remain constant once the file is open
+        unless changed using the Change Indentation Settings dialog.<br />
+        If tab.indents is set then pressing tab within indentation whitespace indents by indent.size
+        rather than inserting a tab character. If backspace.unindents then pressing backspace
+        within indentation whitespace unindents by indent.size rather than deleting the character
+        before the caret.
+        </td>
+      </tr>
+      <tr id='property-indent.automatic'>
+        <td>
+          <a name='property-indent.opening'></a><a name='property-indent.closing'></a><a name='property-indent.maintain'></a>
+        indent.automatic<br />
+        indent.opening<br />
+        indent.closing<br />
+        indent.maintain.<i>filepattern</i>
+        </td>
+        <td>
+          Determines the look of automatic indentation. Automatic indentation is turned on with
+          indent.automatic=1. To indent a brace line after a compound statement start set
+          indent.opening=1, likewise for the terminating brace. So with both set to 0:
+        <div class="example">
+                if (c)<br />
+                {<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;s;<br />
+                }<br />
+         </div>
+         And with both set to 1:
+        <div class="example">
+                if (c)<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;{<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;s;<br />
+                &nbsp;&nbsp;&nbsp;&nbsp;}<br />
+         </div>
+         Automatic indentation may be changed to simply repeat the indentation of the
+         previous line for some files with indent.maintain.<i>filepattern</i>=1 which
+         overrides the other language specific settings.
+         </td>
+      </tr>
+      <tr id='property-statement.indent'>
+        <td>
+          <a name='property-statement.end'></a><a name='property-statement.lookback'></a><a name='property-block.start'></a><a name='property-block.end'></a>
+        statement.indent.<i>filepattern</i><br />
+        statement.end.<i>filepattern</i><br />
+        statement.lookback.<i>filepattern</i><br />
+        block.start.<i>filepattern</i><br />
+        block.end.<i>filepattern</i>
+        </td>
+        <td>
+          Each of these settings starts with a style number and then a set of words or characters
+          that define how to recognise that feature. If there is a second space in the setting then
+          it is a set of words, otherwise a set of characters. The set of keywords used to indicate
+          the start of a compound statement is defined in statement.indent. For example:
+        <div class="example">
+                statement.indent.$(file.patterns.cpp)=5 if else while
+         </div>
+          says that for C++ the words "if", "else", and "while" in keyword style, 5, start compound
+          statements which leads to the next line being indented if no other factors affect it. However,
+          if a statement end is found on the same line then the next line is not indented. For C++ the
+          statement end is the semicolon in the operator style, so this is defined:
+         <div class="example">
+                statement.end.$(file.patterns.cpp)=10 ;
+         </div>
+         The number of lines looked at to determine indentation can be set with statement.lookback.
+         This can be used either to bound the amount of time spent on this task or to specify
+         that only the last line be examined for indentation.<br />
+         The block.start and block.end properties define the language elements used to bracket groups
+         of statements. In C++ these are '{' and '}'.
+        </td>
+      </tr>
+      <tr id='property-indent.python.colon'>
+        <td>
+        indent.python.colon
+        </td>
+        <td>
+          For Python, automatically indent by one level if the previous line ended in a ':'
+        ignoring comments and whitespace. Otherwise use the same indentation as the previous line.
+        This property overrides other indentation settings.
+         </td>
+      </tr>
+      <tr id='property-os.x.home.end.keys'>
+        <td>
+          os.x.home.end.keys
+        </td>
+        <td>
+        Chooses the standard macOS behaviour for the Home and End keys which is
+        to scroll the file to the start or end. This setting takes precedence over
+        vc.home.key.
+        </td>
+      </tr>
+      <tr id='property-vc.home.key'>
+        <td>
+          vc.home.key
+        </td>
+        <td>
+                Chooses the behaviour of the Home and Shift+Home keys. 1, the default is like
+        Visual C++ moving the caret to the end of the line indentation unless already
+        there, in which case it moves to the start of the line. 0 moves to the start of the line.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-warning.findwrapped'>
+        <td>
+          <a name='property-warning.notfound'></a><a name='property-warning.wrongfile'></a><a name='property-warning.executeok'></a><a name='property-warning.executeko'></a><a name='property-warning.nootherbookmark'></a>
+          warning.findwrapped<br />
+          warning.notfound<br />
+          warning.wrongfile<br />
+          warning.executeok<br />
+          warning.executeko<br />
+          warning.nootherbookmark
+        </td>
+        <td>
+                Allows for sounds to be played and the window to be flashed
+        on Windows when particular events occur.
+        The values consist of three items separated by ',': flash duration, sound
+        and sound duration. If sound is a number then it is treated as a pitch and
+        played for the duration in milliseconds.
+        Otherwise it is treated as a path to a sound file
+        that is played. If you do not want a flash, specify 0 for flash duration.
+        For example,
+        <div class="example">
+        warning.wrongfile=0,C:\Windows\Media\SFX\Glass.wav
+        </div>
+        will play the glass sound if open selected is given a bad file name.
+        The findwrapped warning occurs when a find operation wraps past
+        either end of the file,
+        notfound when the find or preprocessor conditional move commands
+        fail to find a match,
+        executeok when a command such as build
+        executes successfully, executeko when a command fails, and
+        nootherbookmark when there is no bookmark to find.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-fileselector.width'>
+        <td>
+          <a name='property-fileselector.height'></a>
+          fileselector.width<br />
+          fileselector.height
+        </td>
+        <td>
+          For the GTK version determines the initial size of the file
+          selector dialog invoked by the Open and Save commands.
+          Setting has no effect on Windows.
+        </td>
+      </tr>
+      <tr id='property-fileselector.show.hidden' class="osxonly">
+        <td>
+          fileselector.show.hidden
+        </td>
+        <td>
+          On macOS setting this to 0 makes the file selector dialog
+          invoked by the Open command not show hidden files.
+        </td>
+      </tr>
+      <tr id='property-locale.properties'>
+        <td>
+        locale.properties
+        </td>
+        <td>
+          Set the name of the localisation file. For a multi-user installation
+        this allows each user to set a preferred user interface language.<br />
+        On macOS, localisation files for some languages are installed in the translations
+        subdirectory of the user home directory which allows setting
+        the user interface to, for example, German with
+                <div class="example">
+                locale.properties=$(SciteUserHome)/translations/locale.de.properties
+                </div>
+        </td>
+      </tr>
+      <tr id='property-translation.missing'>
+        <td>
+        translation.missing
+        </td>
+        <td>
+                When using a localised version, if a term is not found in the locale.properties
+        translation file then use the value of translation.missing instead. By setting
+        this to a marker such as "***" it is easier to check where terms have not been
+        provided with translations.
+        </td>
+      </tr>
+      <tr id='property-menu.language'>
+        <td>
+        menu.language
+        </td>
+        <td>
+                Defines the entries in the Language menu and the file extensions they map to.
+                Each menu item is defined by 3 elements, language name, extension and an optional
+                keyboard equivalent. Each element is terminated by '|'. For example:<br />
+                <span class="example">H&amp;ypertext|html|F12|</span><br />
+                Menu items may be commented out by prefixing the name with '#'.
+                The default value for this setting is built up by combining all
+                <a href="#property-star-language">*language</a> settings.<br />
+                This value is read only once when starting SciTE, so, after changing it,
+                restart SciTE to see the effect.
+        </td>
+      </tr>
+      <tr id='property-star-language'>
+        <td>
+          *language.<i>name</i>
+        </td>
+        <td>
+          Set a value to be included in the Language menu when using the default value for
+          <a href="#property-menu.language">menu.language</a>.
+          For example, <span class="example">*language.ruby=Ruby|rb|F9|</span> adds a "Ruby"
+          item to the Language menu which maps to the "rb" file extension and can be chosen with the F9 key.
+          More than one language may be defined in one variable.
+          There must be a multiple of 3 '|' characters in the setting.
+        </td>
+      </tr>
+      <tr class="gtkonly" id='property-menukey.*'>
+        <td>
+        menukey.*
+        </td>
+        <td>
+                The menukey.* settings allow the user to redefine accelerator keys for menus
+                without having to resort to modifying the SciTE source code.  The syntax for the setting is:
+                <div class="example">
+                menukey.menu_title.menu_name=&lt;modifier&gt;key
+                </div>
+                For example, the File | Exit command accelerator could be specified as follows:
+                <div class="example">
+                menukey.file.exit=&lt;control&gt;Q
+                </div>
+                Note that spaces in menu titles and names must be converted to underscores,
+                and trailing ellipses removed.  For example, "File | Save As...." is referenced as "menukey.file.save_as".
+                <br /><br />
+                Multiple modifiers may be specified, though each must be surrounded by angle brackets.  The
+                recognised modifiers are the same as for the user.shortcuts setting described above.  The recognised named
+                keys are also the same as for user.shortcuts, with the addition of "none" to indicate that no accelerator
+                key should be defined for a particular menu.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-source.default.extensions'>
+        <td>
+          source.default.extensions
+        </td>
+        <td>
+          If the name specified on the command line cannot be found as a directory or file - including a wild-card
+          search, the contents of the property are treated as default extensions to be used to locate the file name.<br />
+          An example is: .cxx|.cpp|.c|.hxx|.hpp|.h|.bat|.txt|.lua<br />
+          Attempting to open win32\SciTEWin would open win32\SciTEWin.cxx since it matches before win32\SciTEWin.h
+          <br />
+          If the property contains an entry such as Bar.cxx|.cxx and you attempt to open win32\SciTEWin, it will open
+          ScTEWinBar.cxx since that is the first match.
+        </td>
+      </tr>
+      <tr id='property-ext.lua.startup.script'>
+        <td>
+          <a name='property-ext.lua.auto.reload'></a><a name='property-ext.lua.reset'></a><a name='property-extension'></a>
+          ext.lua.startup.script<br />
+          ext.lua.auto.reload<br />
+          ext.lua.reset<br />
+          extension.<i>filepattern</i>
+        </td>
+        <td>
+          The ext.lua properties are specific to the <a href="SciTELua.html">
+          SciTE Lua Scripting Extension</a>.  The extension.<i>filepattern</i> property
+          is part of the generic <a href="SciTEExtension.html">SciTE Extension
+          Interface</a> but is currently only used by the Lua Scripting Extension.
+          <br />
+          The ext.lua.startup.script property defines the filename of a Lua script that
+          will be loaded when SciTE starts to set up the global state for Lua.
+          The default value is $(SciteUserHome)/SciTEStartup.lua.
+          You should use an absolute path for this property, but can reference the
+          $(SciteDefaultHome) or $(SciteUserHome) properties.  Global event handlers,
+          command functions, as well as other functions and objects can be defined here.
+          <br />
+          The ext.lua.auto.reload property determines what happens if you save the
+          startup script, or the active extension script, from within SciTE.  If it
+          is set to 0, the startup script only applied at startup time
+          or when you switch buffers (depending on ext.lua.reset), and changes to the
+          extension script are only applied when you switch buffers.  If
+          ext.lua.auto.reload is set to 1 (the default), SciTE will re-initialize the global scope
+          immediately when either script is saved from within SciTE.  <i>Even
+          when ext.lua.auto.reload is enabled, SciTE will not notice if the files
+          are changed from outside the current SciTE instance.  For that, see
+          ext.lua.reset below.</i>
+          <br />
+          The ext.lua.reset property is primarily for debugging.  If ext.lua.reset
+          is 0 (the default), the startup script property is checked only once -
+          when SciTE starts.  If ext.lua.reset is changed to 1, SciTE will check
+          the startup script property, and reload the new startup script, each
+          time you switch buffers.  As such, it has a different (larger) set of
+          side effects than ext.lua.auto.reload.  In some situations it will make
+          sense for both auto.reload and reset to be enabled, but usually
+          ext.lua.auto.reload alone will suffice.
+          <br />
+          Aside from ext.lua.startup.script, the extension.<i>filepattern</i> property
+          provides a way to load additional functions and event handlers that may be
+          specific to a given file type.  If the extension property value ends in .lua
+          and names a file that exists, the Lua extension evaluates the script so that event
+          handlers and commands defined in the script are available while that buffer
+          is active.  Functions and objects defined through ext.lua.startup.script are
+          still accessible, unless they are overridden.
+          <br />
+          The extension property can also define behaviour that is specific to a given
+          directory.  If a bare filename (no path) is specified in the extension
+          property, SciTE looks for the file in the standard property file locations,
+          starting with the local directory.  This can be very useful in combination
+          with a local SciTE.properties file.
+        </td>
+      </tr>
+      <tr class="windowsonly" id='property-create.hidden.console'>
+        <td>
+          create.hidden.console
+        </td>
+        <td>
+          On Windows, to prevent a console window appearing momentarily whenever the Lua
+          os.execute or io.popen functions are called to execute programs, set create.hidden.console to 1.
+          This property is only read at startup so changing behaviour requires restarting SciTE.
+        </td>
+      </tr>
+      <tr id='property-caret.sticky'>
+        <td>
+          caret.sticky
+        </td>
+        <td>
+          Controls when the last position of the caret on the line is modified.
+                  When set to 1, the position is not modified when you type a character, a tab,
+                  paste the clipboard content or press backspace. The default is 0 which turns
+                  off this feature.
+        </td>
+      </tr>
+          <tr id='property-properties.directory.enable'>
+        <td>
+          properties.directory.enable
+        </td>
+        <td>
+          Enables or disables the evaluation of the directory properties file.
+          The default is 0 which disables the evaluation. Any other value enables
+                   this properties file.
+        </td>
+      </tr>
+          <tr id='property-editor.config.enable'>
+        <td>
+          editor.config.enable
+        </td>
+        <td>
+          Enables or disables the reading and evaluation of .editorconfig files that follow the
+          <a href="http://editorconfig.org/">EditorConfig</a> definition.
+          The default is 0 which disables the evaluation with any other value enabling it.
+        </td>
+      </tr>
+          <tr id='property-save.path.suggestion'>
+        <td>
+          save.path.suggestion
+        </td>
+        <td>
+          If set, SciTE suggests this name and directory when we perform the "Save" command for a new, unnamed buffer.
+          The directory should exist. (This setting doesn't affect the "Save As" command).
+          A save.path.suggestion setting may be defined as either a relative to $(SciteUserHome) path, like:
+          <div class="example">
+          save.path.suggestion=$(SciteUserHome)\Notes\note_$(TimeStamp).txt<br/>
+          </div>
+          or as a full path. It accepts both directory delimiters: the slash "/" and the backslash "\".<br/>
+          If $(TimeStamp) is specified, it will be replaced by an actual timestamp, 14 characters long.
+        </td>
+      </tr>
+    </table>
+    <p>
+    caret.policy.{x|y}&lt;param&gt; interaction:
+    </p>
+    <table cellpadding="1" cellspacing="0" border="1" summary="Caret policy">
+     <tr>
+      <th>slop</th>
+      <th>strict</th>
+      <th>jumps</th>
+      <th>even</th>
+      <th>Caret can go to the  margin</th>
+      <th>When reaching limit<br />
+      (going out of visibility or<br />
+      going into the UZ)<br />
+      display is...</th>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td>Yes</td>
+      <td>moved to put caret on top/on right</td>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td>Yes</td>
+      <td>moved by one position</td>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td>Yes</td>
+      <td>moved to put caret on top/on right</td>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td>Yes</td>
+      <td>centred on the caret</td>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">-</td>
+      <td align="center">0</td>
+      <td>Caret is always on top/on right of display</td>
+      <td>-</td>
+     </tr>
+     <tr>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">-</td>
+      <td align="center">1</td>
+      <td>No, caret is always centred</td>
+      <td>-</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td>Yes</td>
+      <td>moved to put caret out of the asymmetrical UZ</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td>Yes</td>
+      <td>moved to put caret out of the UZ</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td>Yes</td>
+      <td>moved to put caret at 3UZ of the top or right margin</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td>Yes</td>
+      <td>moved to put caret at 3UZ of the margin</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td align="center">-</td>
+      <td align="center">0</td>
+      <td>Caret is always at UZ of top/right margin</td>
+      <td>-</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td align="center">1</td>
+      <td>No, kept out of UZ</td>
+      <td>moved by one position</td>
+     </tr>
+     <tr>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td align="center">1</td>
+      <td align="center">0</td>
+      <td>No, kept out of UZ</td>
+      <td>moved to put caret at 3UZ of the margin</td>
+     </tr>
+    </table>
+    <h3 id="IndicatorProperty">
+       Indicator definition
+    </h3>
+    <p>Properties that define indicators look like</p>
+    <div class="example">
+       highlight.current.word.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80</div>
+    <p>The structure uses commas between attributes and a colon between an attribute name and value:</p>
+    <table cellpadding="1" cellspacing="0" border="1" summary="Caret policy">
+     <tr>
+      <th>attribute</th>
+      <th>value</th>
+      <th>default</th>
+     </tr>
+     <tr>
+      <td>style</td>
+      <td>one of plain, squiggle, tt, diagonal, strike, hidden, box, roundbox, straightbox, fullbox, dash,
+      dots, squigglelow, dotbox, squigglepixmap, compositionthick, compositionthin,
+      textfore, gradient, gradientcentre, point, or pointcharacter.<br />
+      </td>
+      <td>plain</td>
+     </tr>
+     <tr>
+      <td>colour or color</td>
+      <td>a hex colour value preceded by '#' such as #008020.</td>
+      <td>black</td>
+     </tr>
+     <tr>
+      <td>fillalpha</td>
+      <td>the translucency from 0 for completely transparent to 255 for opaque of the fill for roundbox, straightbox and dotbox.</td>
+      <td>30</td>
+     </tr>
+     <tr>
+      <td>outlinealpha</td>
+      <td>the translucency from 0 for completely transparent to 255 for opaque of the outline for roundbox, straightbox and dotbox.</td>
+      <td>50</td>
+     </tr>
+     <tr>
+      <td>under</td>
+      <td>the indicator is drawn under the text.</td>
+      <td>no</td>
+     </tr>
+     <tr>
+      <td>notunder</td>
+      <td>the indicator is drawn over the text.</td>
+      <td>yes</td>
+     </tr>
+    </table>
+    </p>
+    <p>Samples:<br />
+    <img src="SciTEIndicators.png" alt="Indicator samples" /></p>
+    <h3 id="NewLanguage">
+       Supporting a new language
+    </h3>
+    <p>
+       For languages very similar to existing supported languages, which may only differ in a minor
+      feature such as the keywords used, the existing lexers can often be reused. The set of
+      keywords can then be changed to suit the new language. Java and JavaScript could have
+      reasonably reused the C++ lexer. The Java lexer was added only to support doc comments.
+    </p>
+    <p>
+       For languages that can not be lexed with the existing lexers, a new lexer can be coded in
+       C++.&nbsp; These can either be built into Lexilla, or put into an
+       external module and loaded when SciTE runs.
+       See Lexilla and the <a href="#property-lexillapath">lexilla.path</a> property.
+    </p>
+    <p>
+       The open.filter should be modified to include the file extensions used for the new language
+      and entries added for command.compile, command.build, command.go and command.go.needs for the
+      language.
+    </p>
+    <h3 id="APIFiles">
+       Creating API files
+    </h3>
+    <p>
+       The .api files can be generated by hand or by using a program.
+       There are also <a href="http://code.google.com/p/scite-files/wiki/Customization">downloadable ready-to-use
+       .api files.</a>
+    </p>
+    <p>
+        For C/C++ headers, an API file can be generated using
+        <a href="http://ctags.sourceforge.net/">ctags</a>
+        and then the <a href="tags2api.py">
+        tags2api Python script</a> (which assumes C/C++ source) on the tags file to grab complete
+        multiple line function prototypes.
+        Some common headers surround parameter lists with a __P macro and may have
+        comments. The <a href="cleanapi.cc">cleanapi</a> utility may be used on these files.
+    </p>
+    <p>
+        To generate an API file for Python modules, there is a
+        <a href="gen_python_api.zip">gen_python script</a>.
+    </p>
+    <p>
+        To generate an API file for Java classes, there is a
+        <a href="ApiBuilder.java">ApiBuilder.java</a> program.
+    </p>
+    <h3 id="OpenSelected">
+       Open Selected Filename
+    </h3>
+    <p>
+       This command opens the file for the file name selected in either the edit or output pane.
+       It uses the current selection or searches around the caret to try to
+       find a file name based on which characters are normally used in a path.
+       If there is no extension then an extension may be inferred from the current file using the
+       open.suffix property which defaults to .properties in a .properties file.
+       If the file name is followed by a number (in a format similar to ctags, grep output,
+       or Visual Studio messages) then that line is displayed in the opened file.
+       If the file name is an absolute path then it is opened directly otherwise it is looked for
+       in the current directory and then in the directory specified by the openpath property.
+       On Windows, web, ftp, mail and news URLs are handled by opening their
+       associated application.
+    </p>
+    <h3 id="Translations">
+       SciTE in other languages
+    </h3>
+    <p>
+       SciTE can be and has been <a href="http://code.google.com/p/scite-files/wiki/Translations">translated into other languages</a>.
+    </p>
+    <h3 id="Building">
+       Building SciTE
+    </h3>
+    <p>
+       The procedure for building and installing SciTE is described in the README file in the scite
+       directory.
+    </p>
+    <h3 id="Extending">
+       Extending SciTE
+    </h3>
+    <p>
+       There are two formal extension interfaces for SciTE, the
+       <a href="SciTEExtension.html">SciTE Extension Interface</a>
+       is for extending SciTE with code compiled into the SciTE executable and the
+       <a href="SciTEDirector.html">SciTE Director Interface</a> is for
+       manipulating SciTE on Windows from another application.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/scite/doc/SciTEDownload.html b/scite-app/scite/doc/SciTEDownload.html
new file mode 100644
index 0000000..fb5aaca
--- /dev/null
+++ b/scite-app/scite/doc/SciTEDownload.html
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <title>
+      Download Scintilla and SciTE
+    </title>
+  <style type="text/css">
+    h3 {
+	background-color: #CCCCFF;
+    }
+  </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Download
+          Scintilla and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
+      <tr>
+        <td>
+          <font size="4"> <a href="https://www.scintilla.org/scite511.zip">
+	Windows</a>&nbsp;&nbsp;
+	<a href="https://www.scintilla.org/scite511.tgz">
+          GTK/Linux</a>&nbsp;&nbsp;</font>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Download
+    </h2>
+    <p>
+       The <a href="License.txt">license</a> for using Scintilla or SciTE is similar to that of Python
+      containing very few restrictions.
+    </p>
+    <h2>
+       Release 5.1.1
+    </h2>
+    <h3>
+       Source Code
+    </h3>
+       The source code package contains all of the source code for Scintilla and SciTE but no binary
+	executable code and is available in
+       <ul>
+       <li><a href="https://www.scintilla.org/scite511.zip">zip format</a> (3.7M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scite511.tgz">tgz format</a> (3.2M) commonly used on Linux and compatible operating systems</li>
+       </ul>
+       Instructions for building on both Windows and Linux are included in the readme file.
+    <h3>
+       Windows
+    </h3>
+    <h4>
+       Windows Executables
+    </h4>
+    <p>
+       Windows executables only support Windows XP and later. It may be possible to build with older compilers for Windows 2000 but that
+       is no longer tested.
+       <ul>
+       <li>
+        <a href="https://www.scintilla.org/wscite511.zip">Full 64-bit download</a> (1.9M) includes the SciTE executable, any required DLLs,
+        configuration files and documentation. After downloading the file, unzip it, and run
+        SciTE.EXE. The files required to run SciTE are SciTE.EXE, SciLexer.DLL, and
+        SciTEGlobal.properties.
+       </li>
+       <li>
+         <a href="https://www.scintilla.org/wscite32_511.zip">Full 32-bit download</a> (1.8M) is similar but will run on 32-bit Windows
+         with the executable called SciTE32.EXE. This is also the file to use on Windows XP.
+       </li>
+       <li>
+         <a href="https://www.scintilla.org/Sc511.exe">Single file 64-bit executable called Sc1</a> (3.0M) does not need any DLL or
+         properties files as these are linked into the executable. You may still create properties files if you wish.
+       </li>
+       <li>
+         <a href="https://www.scintilla.org/Sc32_511.exe">Single file 32-bit download</a> (2.4M) is similar but will run on 32-bit Windows.
+       </li>
+       </ul>
+    </p>
+    <h4>
+       Windows Installer
+    </h4>
+    <p>
+       <a href="http://www.ebswift.com/scite-text-editor-installer.html">An installer</a>
+       created by Troy Simpson.
+    </p>
+    <h3>
+       GTK / Linux
+    </h3>
+    <h4>
+       Linux executable for 64-bit Intel compatible processors
+    </h4>
+    <p>
+      This binary release requires GTK 2.24 or later and was tested on Ubuntu 18.04.
+      If you are using a Linux distribution more than a year old you may
+      need to rebuild SciTE to use your installed version of GTK.
+      If the target system is 32-bit, you will need to build SciTE from source.
+    </p>
+    <p>
+       A <a href="https://www.scintilla.org/gscite511.tgz">full download</a> (1.8M) includes the 64-bit SciTE executable,
+      configuration files and documentation.
+      After downloading the file, gunzip and untar it, and run
+      SciTE. The files required to run SciTE are SciTE which is best located on the path
+      (I put it in /usr/local/bin) 70 properties files which should be located in the
+      /usr/share/scite directory, and Sci48M.png which should be copied to /usr/share/pixmaps.
+    </p>
+    <h4>
+       Debian Packages
+    </h4>
+    <p>
+       Official Debian Packages are available from Apt.
+       There is a
+       <a href="http://packages.debian.org/stable/scite">package page</a>.
+    </p>
+    <p>
+       Contributed by Aubin Paul.
+    </p>
+    <h3>
+       SciTE localised for other languages
+    </h3>
+    <p>
+       SciTE can be and has been <a href="http://code.google.com/p/scite-files/wiki/Translations">translated into other languages</a>.
+    </p>
+    <p>
+       Previous versions can be downloaded from the <a href="ScintillaHistory.html">history
+      page</a>.
+    </p>
+    <h3>
+       Icons
+    </h3>
+    <p>
+       Some <a href="https://prdownloads.sourceforge.net/scintilla/SciTE_icons.zip?download">high resolution and alternate icons</a> are available.
+    </p>
+  </body>
+</html>
diff --git a/scite-app/scite/doc/SciTEExtension.html b/scite-app/scite/doc/SciTEExtension.html
new file mode 100644
index 0000000..1b0e402
--- /dev/null
+++ b/scite-app/scite/doc/SciTEExtension.html
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE Extension Interface
+    </title>
+    <style type="text/css">
+        .example {
+            color: #00A000;
+            font-weight: bold;
+        }
+        DIV.example {
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+            font-size: 80%;
+        }
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  SciTE Extension Interface</font></a>
+        </td>
+      </tr>
+    </table>
+    <h3>
+       Purpose.
+    </h3>
+	<p>Some people want to create enhanced versions of the SciTE editor, while
+	still receiving the benefits of new SciTE features. This could be for an
+	editor designed for a particular environment such as developing games,
+	to incorporate a scripting capability within SciTE or to allow SciTE to be
+	controlled by another process through an IPC mechanism.</p>
+	<p>There are two example extensions.
+	The <a href="SciTEDirector.html">SciTE Director Interface</a> allows
+	SciTE to be controlled by an external application such as a
+	project manager.
+	The <a href="SciTELua.html">SciTE Lua Scripting Extension</a> is an
+	integration of the Lua scripting language into SciTE, done using the Extension
+	interface.</p>
+    <h3>
+       Extension Interface.
+    </h3>
+    <div class="example">
+	bool Initialise(ExtensionAPI *host_);<br />
+	bool Finalise();<br />
+	bool Clear();<br />
+	bool Load(const char *filename);<br />
+	bool InitBuffer(int index);<br />
+	bool ActivateBuffer(int index);<br />
+	bool RemoveBuffer(int index);<br />
+	bool OnOpen(const char *path);<br />
+	bool OnSwitchFile(const char *path);<br />
+	bool OnBeforeSave(const char *path);<br />
+	bool OnSave(const char *path);<br />
+	bool OnChar(char ch);<br />
+	bool OnExecute(const char *s);<br />
+	bool OnSavePointReached();<br />
+	bool OnSavePointLeft();<br />
+	bool OnStyle(unsigned int, int, int, Accessor *);<br />
+	bool OnDoubleClick();<br />
+	bool OnUpdateUI();<br />
+	bool OnMarginClick();<br />
+	bool OnMacro(const char *, const char *);<br />
+	bool SendProperty(const char *);<br />
+	bool OnKey(int keyval, int modifiers);<br />
+	bool OnDwellStart(int pos, const char *word);<br />
+	bool OnClose(const char *filename);<br />
+    </div>
+	<p>An extension must implement the Extension interface defined in scite/src/Extender.h
+	Only the first 4 methods must be implemented although an implementation can be as
+	simple as just returning false. The other methods have empty default implementations.
+	Methods added to this interface in the future should have default implementations so
+	existing extensions will continue to compile.</p>
+	<p>Each method returns a bool indicating whether the method handled all processing that
+	is needed and so no additional processing is required. Normally, false is returned to indicate
+	that further processing may be done.</p>
+	<p>The extension should use the Initialise and Finalise methods to allocate
+	and deallocate resources. The ExtensionAPI pointer should be saved in the
+	Initialise method so the extension can communicate back to SciTE.</p>
+	<p>The Clear and Load methods are used to support extensions that need
+	to load a resource such as a script file when a file is opened. When a file is
+	opened in SciTE, first the extension is asked to clear any data associated with
+	the previous file through Clear. Then SciTE checks for a property called
+	"extension" which matches the file name, so for x.cpp, looks for extension.*.cpp.
+	A file with this name is searched for in standard property file locations and if found
+	Load is called with the path as an argument.</p>
+	<p>The InitBuffer, ActivateBuffer, and RemoveBuffer methods provide the necessary hooks
+	so that extensions have a mechanism to associate data with a specific buffer, similar
+	to the way SciTE itself remembers the monospace setting of each buffer.  InitBuffer is
+	called whenever a new document is opened in a given buffer.  The buffer might be a newly
+	allocated one, or it might be recycled if the maximum number of buffers has been reached.
+	Once the buffer has been initialized, it will be the active buffer.  Thereafter,
+	ActivateBuffer is called whenever the user switches to another loaded buffer.
+	RemoveBuffer is called when an existing buffer is closed.  Thereafter, the indexes of
+	the buffers that come after the removed buffer are shifted down by one.  After
+	RemoveBuffer, the extension will receive an InitBuffer or ActivateBuffer to establish
+	the new active buffer.</p>
+	<p>OnExecute is called only when an extension command is executed. These are
+	indicated in properties as subsystem 3.</p>
+	<p>OnBeforeSave is called before saving the file and an extension may implement
+	file saving itself and return true to prevent the default file save code from executing.</p>
+	<p>Other methods are called upon events occurring in SciTE allowing an extension
+	to respond to those events.</p>
+    <h3>
+       ExtensionAPI Interface.
+    </h3>
+	<div class="example">
+	enum Pane { paneEditor=1, paneOutput=2, paneFindOutput=3 };<br />
+	sptr_t Send(Pane p, unsigned int msg, uptr_t wParam=0, sptr_t lParam=0);<br />
+	std::string Range(Pane p, int start, int end);<br />
+	void Remove(Pane p, int start, int end);<br />
+	void Insert(Pane p, int pos, const char *s);<br />
+	void Trace(const char *s);<br />
+	std::string Property(const char *key);<br />
+	void SetProperty(const char *key, const char *val);<br />
+	uptr_t GetInstance();<br />
+	void ShutDown();<br />
+	void Perform(const char *actions);<br />
+	void DoMenuCommand(int cmdID);<br />
+	void UpdateStatusBar(bool bUpdateSlowData);<br />
+    	</div>
+	<p>An extension can call back into SciTE using this interface which is a simplified
+	way to access the functionality of SciTE.</p>
+	<p>As well as the normal editor pane and output pane, this interface allows for
+	a future feature where a third pane may be used for the output of search
+	commands. This is currently mapped to the output pane.</p>
+	<p>Send allows sending messages to the Scintilla control contained in each pane.</p>
+	<p>Range retrieves text from the pane.
+	Remove and Insert are used to remove and insert text in a pane.</p>
+	<p>Trace displays a string at the end of the output pane.</p>
+	<p>SciTE's properties can be read and written with Property and
+	SetProperty.</p>
+	<p>GetInstance is Windows specific and returns the HINSTANCE of
+	the application which is needed when accessing platform facilities.</p>
+	<p>ShutDown is equivalent to the user choosing the Quit menu item.
+	If there are any unsaved files loaded, then the user is asked whether to save them
+	and may cancel from this dialog. So under some circumstances, the application will
+	continue to run after ShutDown is called.</p>
+	<p>Perform takes a string containing an action, a ':' character, and an argument.
+	Currently the only known action is open and then the argument is a path.
+	This is used by the <a href="SciTEDirector.html">Director extension</a>
+	to relay commands from another application.
+	In the future more actions will be possible through this method.</p>
+    <h3>
+       Attaching the extension.
+    </h3>
+    	<p>Extensions are currently added explicitly by code in the start up function.
+	On Windows, the DirectorExtension is attached with code similar to this simplified
+	example:</p>
+	<div class="example">
+DirectorExtension director;<br />
+Extension *extender = &amp;director;<br />
+//...<br />
+SciTEWin MainWind(extender);
+</div>
+	<p>It would be better to move to an implicit attachment mechanism similar to the
+	way lexers are attached to Scintilla, determining which extensions are used
+	by simply linking their object files into SciTE. It would also be good to
+	allow run-time attachment of extensions housed in DLLs or shared object libraries.</p>
+    <h3>
+       Multiplexing.
+    </h3>
+	<p>SciTE supports multiple extensions at a time. A multiplexer extension
+	maintains a list of extensions and calls each in turn for each method. Once an extension
+	returns true indicating processing should stop, the multiplexer returns without traversing
+	any remaining list members. However, for some methods such as Initialise and Finalise,
+	the remaining extensions are traversed regardless of the return value of the previous
+	extension.</p>
+    <h3>
+       Thread safety.
+    </h3>
+	<p>In general, SciTE is a single threaded application.  However, on Windows, command
+	tools call OnExecute from a separate worker thread.  The SingleThreadExtension adapter
+	class can be used to wrap an extension so that OnExecute calls are marshalled to the
+	main thread.  Of course, this is not necessary if your extension is thread safe, or
+	if it does not implement OnExecute, or if it is a GTK-specific extension.
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTEExternalLexer.html b/scite-app/scite/doc/SciTEExternalLexer.html
new file mode 100644
index 0000000..75c296f
--- /dev/null
+++ b/scite-app/scite/doc/SciTEExternalLexer.html
@@ -0,0 +1,20 @@
+<html>
+<body bgcolor="#FFFFFF" text="#000000">
+
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0" id="table1">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  Add an external lexer to SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Lexer addition.
+    </h2>
+    <p>This document has been superceded.</p>
+</body>
+</html>
diff --git a/scite-app/scite/doc/SciTEExtras.html b/scite-app/scite/doc/SciTEExtras.html
new file mode 100644
index 0000000..036a529
--- /dev/null
+++ b/scite-app/scite/doc/SciTEExtras.html
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <title>
+      SciTE Extras
+    </title>
+<style type="text/css">
+        table {
+            border: 1px solid black;
+            border-collapse: collapse;
+        }
+        td {
+            border: 1px solid black;
+            padding: 1px 5px 1px 5px;
+        }
+        th {
+            border: 1px solid black;
+            padding: 1px 5px 1px 5px;
+        }
+ </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+          API files and property files for SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2 style="background: #FFB000">
+        <a href="http://code.google.com/p/scite-files/wiki/Customization">The current version of this page has moved here</a>.
+    </h2>
+    <h3>
+       This page contains various contributed files that can be used with SciTE.
+    </h3>
+    <h3>
+       Shells
+    </h3>
+    <ul>
+    <li><a href="http://llt.chez.tiscali.fr/">Filerx</a>
+    provides project management and macro features on Windows.</li>
+    <li><a href="http://www.frykholm.se/scitecmd.html">scitecmd</a>
+    is a simple utility for opening files as tabs in SciTE from the command line on Windows.</li>
+    </ul>
+    <h3>
+       APDL
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/apdl.zip">APDL properties and API</a></li>
+    </ul>
+    <h3>
+       ASP
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/asp.api">ASP API methods</a></li>
+    </ul>
+    <h3>
+       AutoHotkey
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/ahk.properties">AutoHotkey properties</a></li>
+    </ul>
+    <h3>
+       AutoIt3
+    </h3>
+    <ul>
+    <li><a href="http://www.autoitscript.com/autoit3/scite">SciTE4AutoIt3 Website containing AutoIt3 related properties and API files.</a></li>
+    </ul>
+    <h3>
+       C
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/c.api">C standard library</a></li>
+    </ul>
+    <h3>
+       C++
+    </h3>
+    <ul>
+    <li><a href="http://www.nbk.orc.ru/scintilla/cpp.api.zip">Windows API</a></li>
+    <li><a href="http://www.scintilla.org/opengl.zip">OpenGL API</a></li>
+    <li><a href="http://www.scintilla.org/glut.zip">Glut API</a></li>
+    </ul>
+    <h3>
+       C#
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/genapi.zip">C# API file and generator program.</a></li>
+    </ul>
+    <h3>
+       CIL
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/il.properties">Properties for CIL/MSIL</a></li>
+    </ul>
+    <h3>
+       CMake
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/cmake.api">CMake API</a></li>
+    </ul>
+    <h3>
+       FORTRAN
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/fortran.api">Standard FORTRAN API functions</a></li>
+    </ul>
+    <h3>
+       Java
+    </h3>
+    <ul>
+    <li><a href="http://www.burgaud.com/scite.php">Java API and Java Help</a></li>
+    </ul>
+    <h3>
+       Lua
+    </h3>
+    <ul>
+    <li><a href="http://www.geocities.com/keinhong/scite/lua5api.zip">Lua 5 C API and Lua functions</a></li>
+    </ul>
+    <h3>
+       Microsoft SQL
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/mssql.properties">Replaces sql.properties</a></li>
+    </ul>
+    <h3>
+       MySQL
+    </h3>
+    <ul>
+    <li><a href="http://jakub.vrana.cz/utility/scite_mysql.zip">Keywords</a></li>
+    </ul>
+    <h3>
+       nncron
+    </h3>
+    <ul>
+    <li><a href="http://www.nbk.orc.ru/scintilla/nncron.api">nncron.api</a></li>
+    </ul>
+    <h3>
+       Oracle
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/sql.properties_ext">Extended properties file</a>
+    with additional keywords and standard package names.</li>
+    </ul>
+    <h3>
+       osCommerce
+    </h3>
+    <ul>
+    <li><a href="http://www.rvdesign.de/index.php/SciTE">
+    API. German language site.</a></li>
+    </ul>
+    <h3>
+       Perl
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/perl.api">Perl API</a></li>
+    </ul>
+    <h3>
+       PHP
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/html.properties">html.properties</a></li>
+    <li><a href="http://www.scintilla.org/php.api">php.api for PHP 4.3.3</a></li>
+    <li><a href="http://www.scintilla.org/php.properties">PHP properties</a></li>
+    <li><a href="http://www.scintilla.org/phpfunctions.properties">PHP functions</a></li>
+    <li><a href="http://jakub.vrana.cz/utility/scite_php_t.zip">
+    Utilities for making PHP support files.</a></li>
+    <li><a href="http://www.scintilla.org/phpapi.php.txt">A script for creating api file
+    out of your own php source code</a></li>
+    </ul>
+    <h3>
+       POV-Ray
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/pov.api">POV-Ray API</a></li>
+    </ul>
+    <h3>
+       TADS3
+    </h3>
+    <ul>
+    <li><a href="http://www.scintilla.org/tads3.properties">
+    TADS3 property file</a></li>
+    <li><a href="http://www.scintilla.org/TADS3.txt">
+    Explanation</a></li>
+    </ul>
+    <h3>
+       Windows Scripting
+    </h3>
+    <ul>
+    <li><a href="http://dev.remotenetworktechnology.com/SciTE/index.htm">
+    Properties files and scripts.</a></li>
+    </ul>
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTEFAQ.html b/scite-app/scite/doc/SciTEFAQ.html
new file mode 100644
index 0000000..deaaf67
--- /dev/null
+++ b/scite-app/scite/doc/SciTEFAQ.html
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE FAQ
+    </title>
+<style type="text/css">
+        table {
+            border: 1px solid #1F1F1F;
+            border-collapse: collapse;
+        }
+        td {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        th {
+            border: 1px solid #1F1F1F;
+            padding: 1px 5px 1px 5px;
+        }
+        h4 {
+            background-color: #000000;
+            color: #FFFFFF;
+            padding: 2px 6px;
+        }
+        .example {
+            color: #00A000;
+            font-weight: bold;
+        }
+        DIV.example {
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+            font-size: 80%;
+        }
+ </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0"  summary="banner">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+          SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       SciTE Frequently Asked Question
+    </h2>
+    <ul>
+    <li><a class="toc" href="#WindowsFont">
+    	On Windows, how can asian fonts can be applied?</a></li>
+    <li><a class="toc" href="#WindowsFlash">
+    	On Windows, how can window flashing be avoided?</a></li>
+    <li><a class="toc" href="#FixedWidth">
+    	How do I use a fixed width font for all text?</a></li>
+    <li><a class="toc" href="#Monospaced">
+    	What happened to <span class="example">use.monospaced</span>?</a></li>
+    <li><a class="toc" href="#LineNumbers">
+    	Why doesn't my <span class="example">line.numbers</span> setting work?</a></li>
+    <li><a class="toc" href="#BlackBackground">
+    	How do I change SciTE to use black as the background colour?</a></li>
+    <li><a class="toc" href="#OutputColour">
+    	How do I change the colours of the output pane?</a></li>
+    <li><a class="toc" href="#HorizontalScrollBar">
+    	How do I make the horizontal scroll bar adjust to the width of text?</a></li>
+    <li><a class="toc" href="#TabbedMode">
+    	How do I enable tabbed window mode in SciTE?</a></li>
+    <li><a class="toc" href="#Autocomplete">
+    	How do I enable autocomplete?</a></li>
+    <li><a class="toc" href="#CannotFindFile">
+    	When I try to compile/build/run my [some language] source files, I get the following error:
+        'The system cannot find the file specified'.</a></li>
+    <li><a class="toc" href="#ToolsMenu">
+    	How can I add [some external application] to the Tools menu on SciTE?</a></li>
+    <li><a class="toc" href="#ToolsNoMenu">
+    	How can I add a keyboard command without adding it to the Tools menu?</a></li>
+    <li><a class="toc" href="#ReplaceInFiles">
+    	Is there a command to replace a string in multiple files together?</a></li>
+    <li><a class="toc" href="#SpeedUpGTK">
+    	How do I make SciTE run faster on GTK?</a></li>
+    <li><a class="toc" href="#NewlineInRegEx">
+    	Is it possible to use the newline character (\n) in a regular expression?</a></li>
+    <li><a class="toc" href="#CompilerErrors">
+    	How do I get SciTE to understand the error messages from my compiler?</a></li>
+    <li><a class="toc" href="#GCCUTF8">
+    	Why do GCC error messages include ugly characters?</a></li>
+    <li><a class="toc" href="#WindowsSpaces">
+    	How do I make Windows open a file associated with SciTE when its path contains spaces?</a></li>
+    <li><a class="toc" href="#ExplicitFolds">
+    	Why does a //{ comment affect folding?</a></li>
+    </ul>
+    <h4 id="WindowsFont">
+       On Windows, how can asian fonts can be applied?
+    </h4>
+    <p>
+       On Windows GDI, font names have been <a href="http://www.scintilla.org/ScintillaDoc.html#SCI_STYLESETFONT">encoded in UTF-8</a> since Scintilla 3.5.3.
+       This matches the Direct2D code path. Perviously they were encoded in the local code page.
+       Giving the name in UTF-8 or Ascii may solve the problem.</p>
+    <h4 id="WindowsFlash">
+       On Windows, how can window flashing be avoided?
+    </h4>
+    <p>
+       This is most likely a problem with DirectDraw on your graphics card.
+       Different methods of drawing can be tried by modifying the <a href="SciTEDoc.html#property-technology">technology</a> setting.</p>
+    <h4 id="FixedWidth">
+       How do I use a fixed width font for all text?
+    </h4>
+    <p>
+       Use these properties:</p><div class="example">
+	font.base=$(font.monospace)<br />
+	font.small=$(font.monospace)<br />
+	font.comment=$(font.monospace)<br />
+	font.text=$(font.monospace)<br />
+	font.text.comment=$(font.monospace)<br />
+	font.embedded.base=$(font.monospace)<br />
+	font.embedded.comment=$(font.monospace)<br />
+	font.vbs=$(font.monospace)</div>
+    <h4 id="Monospaced">
+       What happened to <span class="example">use.monospaced</span>?
+    </h4>
+    <p>
+       The <span class="example">use.monospaced</span> property was removed as
+       people were using it to ask for fixed width fonts and then
+       requiring support to cope with its limitations. The correct way to
+       set fixed width fonts is <a class="toc" href="#FixedWidth">here</a>.
+    </p>
+    <h4 id="LineNumbers">
+       Why doesn't my <span class="example">line.numbers</span> setting work?
+    </h4>
+    <p>
+       <span class="example">line.numbers</span> has been replaced with two properties: <span class="example">line.margin.visible</span>
+       and <span class="example">line.margin.width</span> which are explained earlier in <a href="SciTEDoc.html">
+       the main SciTE document</a>.
+    </p>
+    <h4 id="BlackBackground">
+       How do I change SciTE to use black as the background colour?
+    </h4>
+    <p>
+       You need to change the style settings. The main change is in the user
+       options file to the global default style and caret colour but you may have
+       to change other style settings to make this work well:</p><div class="example">
+	style.*.32=$(font.base),back:#000000,fore:#ffffff<br />
+	style.*.33=back:#C0C0C0,$(font.base)<br />
+	style.*.37=fore:#939393<br />
+	caret.fore=#FFFFFF<br />
+	selection.alpha=75<br />
+	selection.back=#FFFFFF<br />
+	colour.keyword=fore:#649bff<br />
+	colour.operator=fore:#727272</div>
+    <h4 id="OutputColour">
+       How do I change the colours of the output pane?
+    </h4>
+    <p>
+       The output pane often lists error and warning messages and
+       is styled by the "errorlist" lexer. The default errorlist styles are found
+       in others.properties. To change the output pane background to black
+       and the default text to white set</p><div class="example">
+       style.errorlist.32=$(font.small),back:#000000<br />
+       style.errorlist.0=fore:#FFFFFF</div>
+    <h4 id="HorizontalScrollBar">
+       How do I make the horizontal scroll bar adjust to the width of text?
+    </h4>
+    <p>
+       To avoid slow performance the horizontal scroll bar does not automatically adjust.
+       You can use the <span class="example">horizontal.scroll.width</span> property to change the horizontal scroll range.
+    </p>
+    <h4 id="TabbedMode">
+        How do I enable tabbed window mode in SciTE?
+    </h4>
+    <p>
+        Multiple buffers must be allocated by setting, for example, <span class="example">buffers=10</span>
+        in your SciTEGlobal.properties. To have the tab bar visible upon starting
+        SciTE, set <span class="example">tabbar.visible=1</span>.
+        You can also set <span class="example">tabbar.hide.one=0</span> to always show tabs,
+        or 1 to hide when only one file is open.
+        <span class="example">tabbar.multiline=1</span> splits tabs across various lines if necessary.
+    </p>
+    <h4 id="Autocomplete">
+        How do I enable autocomplete?
+    </h4>
+    <p>
+        Goto Options | Open Global Options File and uncomment</p>
+        <div class="example">autocompleteword.automatic=1</div>
+    <h4 id="CannotFindFile">
+        When I try to compile/build/run my [some language] source files, I get the following error:
+        'The system cannot find the file specified'.
+    </h4>
+    <p>
+        Make sure that the path to your compiler is set correctly on your system.
+        Try to execute from console the same command you get in SciTE and see if it works.
+        You can also search in your [language].properties for the compile
+        commands used. If you have a different compiler or use different arguments,
+        edit the commands to suit your needs.
+        The lines to look for:</p><div class="example">
+        command.compile.filepattern=<br />
+        command.build.filepattern=<br />
+        command.go.filepattern=</div>
+    <h4 id="ToolsMenu">
+       How can I add [some external application] to the Tools menu on SciTE?
+    </h4>
+    <p>
+In your properties file, you'll need to add some lines:
+    </p>
+    <p>
+<span class="example">command.name.number.filepattern</span><br />
+(e.g.: <span class="example">command.name.1.$(file.patterns.web)=HTML Tidy</span>)<br />
+This defines the Text that will appear on the Tools Menu.
+    </p>
+    <p>
+<span class="example">command.number.filepattern</span><br />
+(e.g.: <span class="example">command.1.$(file.patterns.web)=tidy -i -wrap 0 -m $(FilePath)</span> )<br />
+This is the actual command that SciTE executes. You should provide the appropriate paths, options and parameters as you would from a command line. See SciTEDoc.html for more information on parameters and how to make SciTE prompt a Parameters Dialog.
+    </p>
+    <p>
+<span class="example">command.is.filter.number.filepattern</span><br />
+(e.g.: <span class="example">command.is.filter.1.$(file.patterns.web)=1</span>)<br />
+The external application may have modified your file, so setting this to true makes SciTE reload the
+file after execution of the command if <span class="example">load.on.activate=1</span>.
+    </p>
+    <p>
+<span class="example">command.subsystem.number.filepattern</span><br />
+(e.g.: <span class="example">command.subsystem.1.$(file.patterns.web)=2</span>)<br />
+This is for Windows and defines the subsystem through which the program is called. See SciTEDoc.html for more information on this.
+    </p>
+    <p>
+You can set a command for all files using * as a file pattern. Up to 10 commands (0 - 9) can be defined in the Tools Menu at any time. Commands also get executed with Ctrl+number.
+    </p>
+    <h4 id="ToolsNoMenu">
+       How can I add a keyboard command without adding it to the Tools menu?
+    </h4>
+    <p>
+	This is similar to <a href="#ToolsMenu">adding to the tools menu</a> except that you set the name to be empty.
+	Then the command is included in <span class="example">user.shortcuts</span> by adding 1100 to produce its command ID. For example,</p>
+	<div class="example">
+command.name.21.*.properties=<br />
+command.21.*.properties=cmd /c echo $(FileNameExt)<br />
+user.shortcuts=\<br />
+Ctrl+Shift+V|1121|<br />
+	</div>
+    <h4 id="ReplaceInFiles">
+       Is there a command to replace a string in multiple files together?
+    </h4>
+    <p>
+     It is possible to replace a string in all opened buffers with the Replace in Buffers
+     button in the Replace dialog.
+     However this button is hidden by default, it can be displayed with
+     <span class="example">find.replace.advanced=1</span>.
+    </p>
+    <h4 id="SpeedUpGTK">
+       How do I make SciTE run faster on GTK?
+    </h4>
+     <p>Line wrapping slows SciTE down and this can be turned off with <span class="example">wrap=0</span>.
+    </p>
+    <h4 id="NewlineInRegEx">
+       Is it possible to use the newline character (\n) in a regular expression?
+    </h4>
+    <p>
+     No.
+    </p>
+    <p>
+	 The "Transform backslash expressions" option allows using \n and \r but that option does
+	 not work with regular expressions.
+    </p>
+    <h4 id="CompilerErrors">
+       How do I get SciTE to understand the error messages from my compiler?
+    </h4>
+    <p>
+     The set of error message formats is embedded in the Scintilla and SciTE code.
+     To add support for another compiler, you will need to add a new style to
+     scintilla/include/Scintilla.iface after the other SCE_ERR_* values, run HFacer.py,
+     edit RecogniseErrorListLine in scintilla/src/LexOthers.cxx to recognise the error message,
+     and edit DecodeMessage in scite/src/SciTEBuffers.cxx to extract the file name and line
+     number.
+    </p>
+    <h4 id="GCCUTF8">
+       Why do GCC error messages include ugly characters?
+    </h4>
+    <p>
+	Linux distributions now often set the locale to UTF-8 by, for
+	example, setting LANG=en_US.UTF-8. gcc takes this as an indication
+	that it can use any Unicode character encoded as UTF-8 so quotes using
+	&lsquo;these&rsquo; rather than ASCII. To see these as intended, set</p>
+    <div class="example">
+    output.code.page=65001</div>
+    <h4 id="WindowsSpaces">
+       How do I make Windows open a file associated with SciTE when its path contains spaces?
+    </h4>
+    <p>
+	On some versions of Windows, associating a particular file type
+	with SciTE does not allow paths containing spaces to work.
+	To fix this, the path variable %1 needs to be surrounded by double quotes.
+	This is done either directly in the registry or through the Explorer in
+	Tools | Folder Options | File Types | (Select type) | Advanced | open | Edit.
+	Change the "Application used to perform action" field to be similar to</p>
+	<div class="example">"C:\bin\SciTE\SciTE.exe" "%1"</div>
+    <h4 id="ExplicitFolds">
+       Why does a //{ comment affect folding?
+    </h4>
+    <p>
+	For C++ and similar languages, explicit folds can be added with //{ and //} .
+	This feature can be turned off with</p>
+    <div class="example">
+    fold.comment=0</div>
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTEHistory.html b/scite-app/scite/doc/SciTEHistory.html
new file mode 100644
index 0000000..52a88a3
--- /dev/null
+++ b/scite-app/scite/doc/SciTEHistory.html
@@ -0,0 +1,13576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>
+      SciTE
+    </title>
+    <style type="text/css">
+        table {
+            border-collapse: collapse;
+            font-size: 80%;
+        }
+        td {
+            xborder: 1px solid #1F1F1F;
+            padding: 0px 4px;
+        }
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h1>History of SciTE, Scintilla, and Lexilla</h1>
+    <h2>Contributors</h2>
+    <p>
+       Thanks to all the people that have contributed patches, bug reports and suggestions.
+    </p>
+    <p>
+       Source code and documentation have been contributed by
+    </p>
+    <table>
+      <tr>
+	<td>Atsuo Ishimoto</td>
+	<td>Mark Hammond</td>
+	<td>Francois Le Coguiec</td>
+	<td>Dale Nagata</td>
+      </tr><tr>
+	<td>Ralf Reinhardt</td>
+	<td>Philippe Lhoste</td>
+	<td>Andrew McKinlay</td>
+	<td>Stephan R. A. Deibel</td>
+      </tr><tr>
+	<td>Hans Eckardt</td>
+	<td>Vassili Bourdo</td>
+	<td>Maksim Lin</td>
+	<td>Robin Dunn</td>
+      </tr><tr>
+	<td>John Ehresman</td>
+	<td>Steffen Goeldner</td>
+	<td>Deepak S.</td>
+	<td><a href="http://www.develop.com">DevelopMentor</a></td>
+      </tr><tr>
+	<td>Yann Gaillard</td>
+	<td>Aubin Paul</td>
+	<td>Jason Diamond</td>
+	<td>Ahmad Baitalmal</td>
+      </tr><tr>
+	<td>Paul Winwood</td>
+	<td>Maxim Baranov</td>
+	<td>Ragnar Højland</td>
+	<td>Christian Obrecht</td>
+      </tr><tr>
+	<td>Andreas Neukoetter</td>
+	<td>Adam Gates</td>
+	<td>Steve Lhomme</td>
+	<td>Ferdinand Prantl</td>
+      </tr><tr>
+	<td>Jan Dries</td>
+	<td>Markus Gritsch</td>
+	<td>Tahir Karaca</td>
+	<td>Ahmad Zawawi</td>
+      </tr><tr>
+	<td>Laurent le Tynevez</td>
+	<td>Walter Braeu</td>
+	<td>Ashley Cambrell</td>
+	<td>Garrett Serack</td>
+      </tr><tr>
+	<td>Holger Schmidt</td>
+	<td><a href="http://www.activestate.com">ActiveState</a></td>
+	<td>James Larcombe</td>
+	<td>Alexey Yutkin</td>
+      </tr><tr>
+	<td>Jan Hercek</td>
+	<td>Richard Pecl</td>
+	<td>Edward K. Ream</td>
+	<td>Valery Kondakoff</td>
+      </tr><tr>
+	<td>Smári McCarthy</td>
+	<td>Clemens Wyss</td>
+	<td>Simon Steele</td>
+	<td>Serge A. Baranov</td>
+      </tr><tr>
+	<td>Xavier Nodet</td>
+	<td>Willy Devaux</td>
+	<td>David Clain</td>
+	<td>Brendon Yenson</td>
+      </tr><tr>
+	<td><a href="http://www.baanboard.com">Vamsi Potluru</a></td>
+	<td>Praveen Ambekar</td>
+	<td>Alan Knowles</td>
+	<td>Kengo Jinno</td>
+      </tr><tr>
+	<td>Valentin Valchev</td>
+	<td>Marcos E. Wurzius</td>
+	<td>Martin Alderson</td>
+	<td>Robert Gustavsson</td>
+      </tr><tr>
+	<td>José Fonseca</td>
+	<td>Holger Kiemes</td>
+	<td>Francis Irving</td>
+	<td>Scott Kirkwood</td>
+      </tr><tr>
+	<td>Brian Quinlan</td>
+	<td>Ubi</td>
+	<td>Michael R. Duerig</td>
+	<td>Deepak T</td>
+      </tr><tr>
+	<td>Don Paul Beletsky</td>
+	<td>Gerhard Kalab</td>
+	<td>Olivier Dagenais</td>
+	<td>Josh Wingstrom</td>
+      </tr><tr>
+	<td>Bruce Dodson</td>
+	<td>Sergey Koshcheyev</td>
+	<td>Chuan-jian Shen</td>
+	<td>Shane Caraveo</td>
+      </tr><tr>
+	<td>Alexander Scripnik</td>
+	<td>Ryan Christianson</td>
+	<td>Martin Steffensen</td>
+	<td>Jakub Vrána</td>
+      </tr><tr>
+	<td>The Black Horus</td>
+	<td>Bernd Kreuss</td>
+	<td>Thomas Lauer</td>
+	<td>Mike Lansdaal</td>
+      </tr><tr>
+	<td>Yukihiro Nakai</td>
+	<td>Jochen Tucht</td>
+	<td>Greg Smith</td>
+	<td>Steve Schoettler</td>
+      </tr><tr>
+	<td>Mauritius Thinnes</td>
+	<td>Darren Schroeder</td>
+	<td>Pedro Guerreiro</td>
+	<td>Steven te Brinke</td>
+      </tr><tr>
+	<td>Dan Petitt</td>
+	<td>Biswapesh Chattopadhyay</td>
+	<td>Kein-Hong Man</td>
+	<td>Patrizio Bekerle</td>
+      </tr><tr>
+	<td>Nigel Hathaway</td>
+	<td>Hrishikesh Desai</td>
+	<td>Sergey Puljajev</td>
+	<td>Mathias Rauen</td>
+      </tr><tr>
+	<td><a href="http://www.spaceblue.com">Angelo Mandato</a></td>
+	<td>Denis Sureau</td>
+	<td>Kaspar Schiess</td>
+	<td>Christoph Hösler</td>
+      </tr><tr>
+	<td>João Paulo F Farias</td>
+	<td>Ron Schofield</td>
+	<td>Stefan Wosnik</td>
+	<td>Marius Gheorghe</td>
+      </tr><tr>
+	<td>Naba Kumar</td>
+	<td>Sean O'Dell</td>
+	<td>Stefanos Togoulidis</td>
+	<td>Hans Hagen</td>
+      </tr><tr>
+	<td>Jim Cape</td>
+	<td>Roland Walter</td>
+	<td>Brian Mosher</td>
+	<td>Nicholas Nemtsev</td>
+      </tr><tr>
+	<td>Roy Wood</td>
+	<td>Peter-Henry Mander</td>
+	<td>Robert Boucher</td>
+	<td>Christoph Dalitz</td>
+      </tr><tr>
+	<td>April White</td>
+	<td>S. Umar</td>
+	<td>Trent Mick</td>
+	<td>Filip Yaghob</td>
+      </tr><tr>
+	<td>Avi Yegudin</td>
+	<td>Vivi Orunitia</td>
+	<td>Manfred Becker</td>
+	<td>Dimitris Keletsekis</td>
+      </tr><tr>
+	<td>Yuiga</td>
+	<td>Davide Scola</td>
+	<td>Jason Boggs</td>
+	<td>Reinhold Niesner</td>
+      </tr><tr>
+	<td>Jos van der Zande</td>
+	<td>Pescuma</td>
+	<td>Pavol Bosik</td>
+	<td>Johannes Schmid</td>
+      </tr><tr>
+	<td>Blair McGlashan</td>
+	<td>Mikael Hultgren</td>
+	<td>Florian Balmer</td>
+	<td>Hadar Raz</td>
+      </tr><tr>
+	<td>Herr Pfarrer</td>
+	<td>Ben Key</td>
+	<td>Gene Barry</td>
+	<td>Niki Spahiev</td>
+      </tr><tr>
+	<td>Carsten Sperber</td>
+	<td>Phil Reid</td>
+	<td>Iago Rubio</td>
+	<td>Régis Vaquette</td>
+      </tr><tr>
+	<td>Massimo Corà</td>
+	<td>Elias Pschernig</td>
+	<td>Chris Jones</td>
+	<td>Josiah Reynolds</td>
+      </tr><tr>
+	<td>Robert Roessler <a href="http://www.rftp.com">rftp.com</a></td>
+	<td>Steve Donovan</td>
+	<td>Jan Martin Pettersen</td>
+	<td>Sergey Philippov</td>
+      </tr><tr>
+	<td>Borujoa</td>
+	<td>Michael Owens</td>
+	<td>Franck Marcia</td>
+	<td>Massimo Maria Ghisalberti</td>
+      </tr><tr>
+	<td>Frank Wunderlich</td>
+	<td>Josepmaria Roca</td>
+	<td>Tobias Engvall</td>
+	<td>Suzumizaki Kimitaka</td>
+      </tr><tr>
+	<td>Michael Cartmell</td>
+	<td>Pascal Hurni</td>
+	<td>Andre</td>
+	<td>Randy Butler</td>
+      </tr><tr>
+	<td>Georg Ritter</td>
+	<td>Michael Goffioul</td>
+	<td>Ben Harper</td>
+	<td>Adam Strzelecki</td>
+      </tr><tr>
+	<td>Kamen Stanev</td>
+	<td>Steve Menard</td>
+	<td>Oliver Yeoh</td>
+	<td>Eric Promislow</td>
+      </tr><tr>
+	<td>Joseph Galbraith</td>
+	<td>Jeffrey Ren</td>
+	<td>Armel Asselin</td>
+	<td>Jim Pattee</td>
+      </tr><tr>
+	<td>Friedrich Vedder</td>
+	<td>Sebastian Pipping</td>
+	<td>Andre Arpin</td>
+	<td>Stanislav Maslovski</td>
+      </tr><tr>
+	<td>Martin Stone</td>
+	<td>Fabien Proriol</td>
+	<td>mimir</td>
+	<td>Nicola Civran</td>
+      </tr><tr>
+	<td>Snow</td>
+	<td>Mitchell Foral</td>
+	<td>Pieter Holtzhausen</td>
+	<td>Waldemar Augustyn</td>
+      </tr><tr>
+	<td>Jason Haslam</td>
+	<td>Sebastian Steinlechner</td>
+	<td>Chris Rickard</td>
+	<td>Rob McMullen</td>
+      </tr><tr>
+	<td>Stefan Schwendeler</td>
+	<td>Cristian Adam</td>
+	<td>Nicolas Chachereau</td>
+	<td>Istvan Szollosi</td>
+      </tr><tr>
+	<td>Xie Renhui</td>
+	<td>Enrico Tröger</td>
+	<td>Todd Whiteman</td>
+	<td>Yuval Papish</td>
+      </tr><tr>
+	<td>instanton</td>
+	<td>Sergio Lucato</td>
+	<td>VladVRO</td>
+	<td>Dmitry Maslov</td>
+      </tr><tr>
+	<td>chupakabra</td>
+	<td>Juan Carlos Arevalo Baeza</td>
+	<td>Nick Treleaven</td>
+	<td>Stephen Stagg</td>
+      </tr><tr>
+	<td>Jean-Paul Iribarren</td>
+	<td>Tim Gerundt</td>
+	<td>Sam Harwell</td>
+	<td>Boris</td>
+      </tr><tr>
+	<td>Jason Oster</td>
+	<td>Gertjan Kloosterman</td>
+	<td>alexbodn</td>
+	<td>Sergiu Dotenco</td>
+      </tr><tr>
+	<td>Anders Karlsson</td>
+	<td>ozlooper</td>
+	<td>Marko Njezic</td>
+	<td>Eugen Bitter</td>
+      </tr><tr>
+	<td>Christoph Baumann</td>
+	<td>Christopher Bean</td>
+	<td>Sergey Kishchenko</td>
+	<td>Kai Liu</td>
+      </tr><tr>
+	<td>Andreas Rumpf</td>
+	<td>James Moffatt</td>
+	<td>Yuzhou Xin</td>
+	<td>Nic Jansma</td>
+      </tr><tr>
+	<td>Evan Jones</td>
+	<td>Mike Lischke</td>
+	<td>Eric Kidd</td>
+	<td>maXmo</td>
+      </tr><tr>
+	<td>David Severwright</td>
+	<td>Jon Strait</td>
+	<td>Oliver Kiddle</td>
+	<td>Etienne Girondel</td>
+      </tr><tr>
+	<td>Haimag Ren</td>
+	<td>Andrey Moskalyov</td>
+	<td>Xavi</td>
+	<td>Toby Inkster</td>
+      </tr><tr>
+	<td>Eric Forgeot</td>
+	<td>Colomban Wendling</td>
+	<td>Neo</td>
+	<td>Jordan Russell</td>
+      </tr><tr>
+	<td>Farshid Lashkari</td>
+	<td>Sam Rawlins</td>
+	<td>Michael Mullin</td>
+	<td>Carlos SS</td>
+      </tr><tr>
+	<td>vim</td>
+	<td>Martial Demolins</td>
+	<td>Tino Weinkauf</td>
+	<td>Jérôme Laforge</td>
+      </tr><tr>
+	<td>Udo Lechner</td>
+	<td>Marco Falda</td>
+	<td>Dariusz Knociński</td>
+	<td>Ben Fisher</td>
+      </tr><tr>
+	<td>Don Gobin</td>
+	<td>John Yeung</td>
+	<td>Adobe</td>
+	<td>Elizabeth A. Irizarry</td>
+      </tr><tr>
+	<td>Mike Schroeder</td>
+	<td>Morten MacFly</td>
+	<td>Jaime Gimeno</td>
+	<td>Thomas Linder Puls</td>
+      </tr><tr>
+	<td>Artyom Zuikov</td>
+	<td>Gerrit</td>
+	<td>Occam's Razor</td>
+	<td>Ben Bluemel</td>
+      </tr><tr>
+	<td>David Wolfendale</td>
+	<td>Chris Angelico</td>
+	<td>Marat Dukhan</td>
+	<td>Stefan Weil</td>
+      </tr><tr>
+	<td>Rex Conn</td>
+	<td>Ross McKay</td>
+	<td>Bruno Barbieri</td>
+	<td>Gordon Smith</td>
+      </tr><tr>
+	<td>dimitar</td>
+	<td>Sébastien Granjoux</td>
+	<td>zeniko</td>
+	<td>James Ribe</td>
+      </tr><tr>
+	<td>Markus Nißl</td>
+	<td>Martin Panter</td>
+	<td>Mark Yen</td>
+	<td>Philippe Elsass</td>
+      </tr><tr>
+	<td>Dimitar Zhekov</td>
+	<td>Fan Yang</td>
+	<td>Denis Shelomovskij</td>
+	<td>darmar</td>
+      </tr><tr>
+	<td>John Vella</td>
+	<td>Chinh Nguyen</td>
+	<td>Sakshi Verma</td>
+	<td>Joel B. Mohler</td>
+      </tr><tr>
+	<td>Isiledhel</td>
+	<td>Vidya Wasi</td>
+	<td>G. Hu</td>
+	<td>Byron Hawkins</td>
+      </tr><tr>
+	<td>Alpha</td>
+	<td>John Donoghue</td>
+	<td>kudah</td>
+	<td>Igor Shaula</td>
+      </tr><tr>
+	<td>Pavel Bulochkin</td>
+	<td>Yosef Or Boczko</td>
+	<td>Brian Griffin</td>
+	<td>Özgür Emir</td>
+      </tr><tr>
+	<td>Neomi</td>
+	<td>OmegaPhil</td>
+	<td>SiegeLord</td>
+	<td>Erik</td>
+      </tr><tr>
+	<td>TJF</td>
+	<td>Mark Robinson</td>
+	<td>Thomas Martitz</td>
+	<td>felix</td>
+      </tr><tr>
+	<td>Christian Walther</td>
+	<td>Ebben</td>
+	<td>Robert Gieseke</td>
+	<td>Mike M</td>
+      </tr><tr>
+	<td>nkmathew</td>
+	<td>Andreas Tscharner</td>
+	<td>Lee Wilmott</td>
+	<td>johnsonj</td>
+      </tr><tr>
+	<td>Vicente</td>
+	<td>Nick Gravgaard</td>
+	<td>Ian Goldby</td>
+	<td>Holger Stenger</td>
+      </tr><tr>
+	<td>danselmi</td>
+	<td>Mat Berchtold</td>
+	<td>Michael Staszewski</td>
+	<td>Baurzhan Muftakhidinov</td>
+      </tr><tr>
+	<td>Erik Angelin</td>
+	<td>Yusuf Ramazan Karagöz</td>
+	<td>Markus Heidelberg</td>
+	<td>Joe Mueller</td>
+      </tr><tr>
+	<td>Mika Attila</td>
+	<td>JoMazM</td>
+	<td>Markus Moser</td>
+	<td>Stefan Küng</td>
+      </tr><tr>
+	<td>Jiří Techet</td>
+	<td>Jonathan Hunt</td>
+	<td>Serg Stetsuk</td>
+	<td>Jordan Jueckstock</td>
+      </tr><tr>
+	<td>Yury Dubinsky</td>
+	<td>Sam Hocevar</td>
+	<td>Luyomi</td>
+	<td>Matt Gilarde</td>
+      </tr><tr>
+	<td>Mark C</td>
+	<td>Johannes Sasongko</td>
+	<td>fstirlitz</td>
+	<td>Robin Haberkorn</td>
+      </tr><tr>
+	<td>Pavel Sountsov</td>
+	<td>Dirk Lorenzen</td>
+	<td>Kasper B. Graversen</td>
+	<td>Chris Mayo</td>
+      </tr><tr>
+	<td>Van de Bugger</td>
+	<td>Tse Kit Yam</td>
+	<td><a href="https://www.smartsharesystems.com/">SmartShare Systems</a></td>
+	<td>Morten Brørup</td>
+      </tr><tr>
+	<td>Alexey Denisov</td>
+	<td>Justin Dailey</td>
+	<td>oirfeodent</td>
+	<td>A-R-C-A</td>
+      </tr><tr>
+	<td>Roberto Rossi</td>
+	<td>Kenny Liu</td>
+	<td>Iain Clarke</td>
+	<td>desto</td>
+      </tr><tr>
+	<td>John Flatness</td>
+	<td>Thorsten Kani</td>
+	<td>Bernhard M. Wiedemann</td>
+	<td>Baldur Karlsson</td>
+      </tr><tr>
+	<td>Martin Kleusberg</td>
+	<td>Jannick</td>
+	<td>Zufu Liu</td>
+	<td>Simon Sobisch</td>
+      </tr><tr>
+	<td>Georger Araújo</td>
+	<td>Tobias Kühne</td>
+	<td>Dimitar Radev</td>
+	<td>Liang Bai</td>
+      </tr><tr>
+	<td>Gunter Königsmann</td>
+	<td>Nicholai Benalal</td>
+	<td>Uniface</td>
+	<td>Raghda Morsy</td>
+      </tr><tr>
+	<td>Giuseppe Corbelli</td>
+	<td>Andreas Rönnquist</td>
+	<td>Henrik Hank</td>
+	<td>Luke Rasmussen</td>
+      </tr><tr>
+	<td>Philipp</td>
+	<td>maboroshin</td>
+	<td>Gokul Krishnan</td>
+	<td>John Horigan</td>
+      </tr><tr>
+	<td>jj5</td>
+	<td>Jad Altahan</td>
+	<td>Andrea Ricchi</td>
+	<td>Juarez Rudsatz</td>
+      </tr><tr>
+	<td>Wil van Antwerpen</td>
+	<td>Hodong Kim</td>
+	<td>Michael Conrad</td>
+	<td>Dejan Budimir</td>
+      </tr><tr>
+	<td>Andreas Falkenhahn</td>
+	<td>Mark Reay</td>
+	<td>David Shuman</td>
+	<td>McLoo</td>
+      </tr><tr>
+	<td>Shmuel Zeigerman</td>
+	<td>Chris Graham</td>
+	<td>Hugues Larrive</td>
+	<td>Prakash Sahni</td>
+      </tr><tr>
+	<td>Michel Sauvard</td>
+	<td>uhf7</td>
+	<td>gnombat</td>
+	<td>Derek Brown</td>
+      </tr><tr>
+	<td>cshnik</td>
+	<td>Robert Di Pardo</td>
+	<td>YX Hao</td>
+	<td>Petko Georgiev</td>
+      </tr><tr>
+	<td>Damiano Lombardi</td>
+	<td>riQQ</td>
+	<td>Bertrand Lacoste</td>
+	<td>Michael Neuroth</td>
+      </tr><tr>
+	<td>Ivan Ustûžanin</td>
+      </tr>
+    </table>
+    <p>
+       Images used in GTK version:<br />
+        <a href="http://sourceforge.net/projects/icon-collection/">
+        Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
+    </p>
+    <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scite511.zip">Release 5.1.1</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 26 July 2021.
+		</li>
+		<li>
+		Fixed bug on Windows where autocompletion list reduced to height of previous list.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2265/">Bug #2265</a>.
+		</li>
+		<li>
+		Fixed bug on Windows where context menu not shown on secondary monitor located to left of main monitor.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2266/">Bug #2266</a>.
+		</li>
+		<li>
+		Fixed hang on GTK when performing Find in Files while running a tool.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2267/">Bug #2267</a>.
+		</li>
+		<li>
+		Rearrange access keys on Search menu to be more memorable.
+		</li>
+	</ul>
+	<li>Lexilla 5.1.1</li>
+	<ul>
+		<li>
+		On 32-bit Win32 using Visual C++ projects, stop exported functions ending with @n causing failures with GetProcAddress.
+		</li>
+		<li>
+		Fixed crash when calling TagsOfStyle on C++ lexer after allocating substyles.
+		</li>
+		<li>
+		Fixed folding for Julia which could be inconsistent depending on range folded.
+		Added SCE_JULIA_KEYWORD4 and SCE_JULIA_TYPEOPERATOR lexical styles and
+		changed keyword set 4 from "Raw string literals" to "Built in functions".
+		Property lexer.julia.string.interpolation removed.
+		Updated set of characters for identifiers.
+		<a href="https://github.com/ScintillaOrg/lexilla/pull/13">Pull request #13</a>.
+		</li>
+		<li>
+		Fixed Markdown emphasis spans to only be recognized when closed in same paragraph.
+		<a href="https://sourceforge.net/p/scintilla/bugs/1216/">Bug #1216</a>.
+		</li>
+		<li>
+		Fixed Markdown code block to terminate when end marker is indented.
+		Display all of end marker in code block style.
+		Only recognize inline code when closed in same paragraph.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2247/">Bug #2247</a>.
+		</li>
+		<li>
+		Fixed Matlab to not allow escape sequences in double-quoted strings.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/18">Issue #18</a>.
+		</li>
+		<li>
+		Support flexible heredoc and nowdoc syntax for PHP.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+		</li>
+		<li>
+		Enabled '_' digit separator in numbers for PHP.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+		</li>
+		<li>
+		Stop styling attributes as comments for PHP.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/19">Issue #19</a>.
+		</li>
+	</ul>
+	<li>Scintilla 5.1.1</li>
+	<ul>
+		<li>
+		In DBCS encodings, treat valid DBCS lead byte followed by invalid trail byte as single byte.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1408/">Feature #1408</a>.
+		</li>
+		<li>
+		Searching was optimized for documents that contain mostly ASCII text and is often 2-3 times faster.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1381/">Feature #1381</a>.
+		</li>
+		<li>
+		Word searching behaves more consistently at start and end of document.
+		</li>
+		<li>
+		Add SCI_ALLOCATELINES to allocate indices to hold some number of lines.
+		This can decrease reallocation overhead when the application can count or estimate the number of lines in huge files.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1370/">Feature #1370</a>.
+		</li>
+		<li>
+		Add SCI_AUTOCSETOPTIONS to allow choosing a non-resizeable autocompletion list
+		on Win32.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1284/">Feature #1284</a>.
+		</li>
+		<li>
+		On Win32, when technology is changed, buffering is set to a reasonable value for the technology:
+		on for GDI and off for Direct2D as Direct2D performs its own buffering.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1400/">Feature #1400</a>.
+		</li>
+		<li>
+		On Win32, implement WM_SETREDRAW to turn off scroll bar updates.
+		This can be used to reduce overhead when making many changes.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1411/">Feature #1411</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite510.zip">Release 5.1.0</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 23 June 2021.
+		</li>
+		<li>
+		Add 'representations' property to choose different way to display particular characters such as displaying
+		'₩' as 'won'.
+		</li>
+		<li>
+		Fixed bug on Windows with open dialog not retaining preferred filter when switching directories
+		and there is a change to $(open.filter).
+		</li>
+		<li>
+		Fixed bug on Windows where text was cut off in progress strip with 200% display scale.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2263/">Bug #2263</a>.
+		</li>
+		<li>
+		Fixed crash with editorconfig where 'indent_size=tab' but no 'tab_width' setting.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2264/">Bug #2264</a>.
+		</li>
+	</ul>
+	<li>Lexilla 5.1.0</li>
+	<ul>
+		<li>
+		This is a stable release. The Lexilla protocol should remain compatible through 5.x releases.
+		</li>
+		<li>
+		Fixed bugs with styling Erlang by handling \n and \r\n line endings consistently.
+		</li>
+		<li>
+		Fixed folding for F# open statements and for strings that contain comment prefixes.
+		</li>
+		<li>
+		Format specifiers lexed in F# strings.
+		</li>
+		<li>
+		Fixed folding for ASP files where scripts were treated inconsistently when '&lt;%' was included
+		or not included in range examined.
+		</li>
+		<li>
+		Fixed folding of Raku heredocs that start with "q:to" or "qq:to".
+		</li>
+		<li>
+		Fixed folding at end of Ruby files where these is no final new line.
+		</li>
+		<li>
+		Made folding of Tcl files more consistent by always treating completely empty lines as whitespace.
+		</li>
+		<li>
+		Fixed styling of "a:b" with no spaces in YAML as a single piece of text instead of a key-value pair.
+		<a href="https://github.com/ScintillaOrg/lexilla/pull/15">Pull request #15</a>.
+		</li>
+	</ul>
+	<li>Scintilla 5.1.0</li>
+	<ul>
+		<li>
+		This is a stable release. Interfaces with lexers and between platform-independent code
+		and platform layers should remain compatible through 5.x releases.
+		</li>
+		<li>
+		Add SciFnDirectStatus, a direct access function which also returns status.
+		It can be retrieved with SCI_GETDIRECTSTATUSFUNCTION.
+		This can avoid calling SCI_GETSTATUS after every API to determine failure so can
+		improve performance.
+		</li>
+		<li>
+		Add more type-safe wrappers to the API.
+		These are defined in include/ScintillaCall.h and implemented in call/ScintillaCall.cxx.
+		ScintillaCall throws Scintilla::Failure exceptions when a call fails.
+		</li>
+		<li>
+		Add APIs for setting appearance (traditional blob or plain text) and colour of representations
+		and support setting a representation for the "\r\n" line end sequence.
+		</li>
+		<li>
+		Add SCI_REPLACERECTANGULAR to insert text like a rectangular paste.
+		</li>
+		<li>
+		Fixed bug with SCI_GETLASTCHILD.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2260/">Bug #2260</a>.
+		</li>
+		<li>
+		Fixed gcc link-time-optimization (LTO) compilation.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2259/">Bug #2259</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite503.zip">Release 5.0.3</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 2 June 2021.
+		</li>
+	</ul>
+	<li>Lexilla 5.0.3</li>
+	<ul>
+		<li>
+		Add namespace feature with GetNameSpace function.
+		</li>
+		<li>
+		AddStaticLexerModule function adds a static lexer to Lexilla's list.
+		</li>
+		<li>
+		Add Julia lexer.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1380/">Feature #1380</a>.
+		</li>
+		<li>
+		Fix variable expansion in Batch.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/4">Issue #4</a>.
+		</li>
+		<li>
+		Fix transition to comment for --> inside JavaScript string.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2207/">Bug #2207</a>.
+		</li>
+		<li>
+		Remove nested comment and long string support as these were removed from Lua.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2205/">Bug #2205</a>.
+		</li>
+		<li>
+		Fix empty link titles in Markdown.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2235/">Bug #2235</a>.
+		Also fix detection of whether the previous line had content which treated '\n' and '\r\n' line endings differently.
+		</li>
+		<li>
+		Update to Unicode 13.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1379/">Feature #1379</a>.
+		</li>
+		<li>
+		On Win32 enable hardware-enforced stack protection.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1405/">Feature #1405</a>.
+		</li>
+		<li>
+		On 32-bit Win32 using g++, stop exported functions ending with @n causing failures with GetProcAddress.
+		<a href="https://github.com/ScintillaOrg/lexilla/issues/10">Issue #10</a>.
+		</li>
+	</ul>
+	<li>Scintilla 5.0.3</li>
+	<ul>
+		<li>
+		A more type-safe binding of Scintilla's API that can be used from C++ is implemented in the
+		ScintillaTypes.h, ScintillaMessages.h, and ScintillaStructures.h headers.
+		</li>
+		<li>
+		Change the way that selections and carets are drawn to use the element APIs.
+		The selection background colour may default to use platform APIs to discover global
+		or user settings and may change in response to those settings changing.
+		The SCI_SETSELECTIONLAYER method defines whether the selection background is drawn
+		translucently over or under text or opaquely underneath other drawing.
+		</li>
+		<li>
+		Change caret line drawing to use SC_ELEMENT_CARET_LINE_BACK element and
+		SCI_SETCARETLINELAYER method.
+		Older caret line APIs SCI_SETCARETLINEVISIBLE, SCI_SETCARETLINEBACK,
+		SCI_SETCARETLINEBACKALPHA now discouraged.
+		</li>
+		<li>
+		Add SCI_MARKERSETLAYER to define layer on which to draw content area markers.
+		This replaces the use of SC_ALPHA_NOALPHA for markers.
+		</li>
+		<li>
+		Add SC_ELEMENT_WHITE_SPACE to set the colour of visible whitespace including translucency.
+		</li>
+		<li>
+		Add elements for hot spots SC_ELEMENT_HOT_SPOT_ACTIVE and
+		SC_ELEMENT_HOT_SPOT_ACTIVE_BACK.
+		</li>
+		<li>
+		Add SCI_GETELEMENTBASECOLOUR to return the default values for element colours.
+		</li>
+		<li>
+		Make idle actions wrapping and background styling smoother by
+		measuring per-byte instead of per-line and allowing just one line to be
+		processed in a time slice.
+		Very long lines will not distort estimation	or block interaction as much.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1373/">Feature #1373</a>.
+		</li>
+		<li>
+		Include modifiers in SCN_INDICATORRELEASE notification.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2254/">Bug #2254</a>.
+		</li>
+		<li>
+		Update to Unicode 13.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1379/">Feature #1379</a>.
+		</li>
+		<li>
+		On GTK 3 with Wayland, fix primary selection.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2227/">Bug #2227</a>.
+		</li>
+		<li>
+		On Win32 enable hardware-enforced stack protection.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1405/">Feature #1405</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite502.zip">Release 5.0.2</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 23 April 2021.
+		</li>
+		<li>
+		On Windows, reduce screen flashing when updating tab bar.
+		</li>
+		<li>
+		On Windows, reduce occurrences of directory locking by setting current working directory
+		to that of SciTE executable at startup.
+		Implement setdefaultcwd director command.
+		</li>
+		<li>
+		Fix checking of shbang lines for files without extensions.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2249/">Bug #2249</a>.
+		</li>
+		<li>
+		Font locale name exposed with font.locale property.
+		</li>
+	</ul>
+	<li>Lexilla 5.0.2</li>
+	<ul>
+		<li>
+		Fix assertion in cpp lexer handling of preprocessor.
+		Empty preprocessor statement '#' caused preprocessor history to be stored on incorrect line number.
+		Dangling #else or #elif without corresponding #if led to inconsistent state.
+		Change treatment of empty preprocessor statement to set subsequent line end characters in
+		preprocessor style as this is more consistent with other preprocessor directives and avoids
+		differences between \n and \r\n line ends.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2245/">Bug #2245</a>.
+		</li>
+	</ul>
+	<li>Scintilla 5.0.2</li>
+	<ul>
+		<li>
+		On Windows, fix encoding used for text display with DirectWrite.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2246/">Bug #2246</a>.
+		</li>
+		<li>
+		Implement font locale SCI_SETFONTLOCALE. Initially only for DirectWrite on Win32.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2027/">Bug #2027</a>.
+		</li>
+		<li>
+		On Cocoa with macOS 11, use plain style for autocompletion to fix problems with truncating text
+		and padding. This makes autocompletion look the same on macOS 11 as macOS 10.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2248/">Bug #2248</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite501.zip">Release 5.0.1</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 9 April 2021.
+		</li>
+		<li>
+		Drop lexerpath.&lt;filepattern&gt; property superceded by Lexilla with lexilla.path.
+		</li>
+		<li>
+		On GTK, include the file name in print job names to make it easier to control printing.
+		<a href="https://sourceforge.net/p/scintilla/feature-requests/1397/">Feature #1397</a>.
+		</li>
+		<li>
+		Implemented whitespace.size so that visible spaces can be made more visible.
+		</li>
+	</ul>
+	<li>Lexilla 5.0.1</li>
+	<ul>
+		<li>
+		Add LexerNameFromID function to Lexilla protocol as optional and temporary to
+		help applications migrate to Lexilla.
+		It is marked deprecated and will be removed in a future release.
+		</li>
+		<li>
+		The cpp lexer supports XML styled comment doc keywords.
+		<a href="https://github.com/ScintillaOrg/lexilla/pull/2">Pull request #2</a>.
+		</li>
+		<li>
+		The errorlist lexer detects NMAKE fatal errors and Microsoft linker errors as SCE_ERR_MS.
+		</li>
+	</ul>
+	<li>Scintilla 5.0.1</li>
+	<ul>
+		<li>
+		Remove SetLexer, SetLexerLanguage, and LoadLexerLibrary methods.
+		These have been superceded by Lexilla and the SetILexer API.
+		</li>
+		<li>
+		Improve the platform layer interface.
+		Add support for stroke width and translucency to drawing methods.
+		Allow clipping to nest.
+		Add methods for UTF-8 text.
+		Add methods for encoding conversion.
+		Use these changes to improve appearance.
+		</li>
+		<li>
+		Add SCI_SUPPORTSFEATURE method to allow applications to determine which features are available
+		and to then choose workarounds for missing features like translucent drawing.
+		</li>
+		<li>
+		Add colouralpha type to Scintilla.iface for APIs that set both colour and transparency together as an RGBA value.
+		</li>
+		<li>
+		Add SCI_INDICSETSTROKEWIDTH to set stroke width of indicators.
+		</li>
+		<li>
+		Add methods to set translucency and stroke width of markers.
+		SCI_MARKERSETFORETRANSLUCENT, SCI_MARKERSETBACKTRANSLUCENT,
+		SCI_MARKERSETBACKSELECTEDTRANSLUCENT, SCI_MARKERSETSTROKEWIDTH.
+		</li>
+		<li>
+		Change graphics coordinates from float (32-bit) to double (64-bit).
+		Fixes uneven line heights in large documents on Cocoa.
+		Increases memory use.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2224/">Bug #2224</a>.
+		</li>
+		<li>
+		Add shapes with curved and rounded ends to EOL annotations as EOLANNOTATION_*.
+		</li>
+		<li>
+		Support Unicode characters as margin markers with SC_MARK_CHARACTER.
+		</li>
+		<li>
+		EOL annotation text is now always treated as UTF-8 instead of in the document encoding.
+		</li>
+		<li>
+		Add SCI_SETELEMENTCOLOUR and related APIs to change colours of visible elements.
+		Implement SC_ELEMENT_LIST* to change colours of autocompletion lists.
+		</li>
+		<li>
+		On Cocoa, fix drawing in revealed area after enlarging window.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2238/">Bug #2238</a>.
+		</li>
+		<li>
+		On GTK, changes in system font settings (such as from Tweak) are detected and position
+		caches are invalidated since different font display options, such as antialiasing, change
+		character shape and thus positions.
+		</li>
+		<li>
+		On Win32, fix crash with SC_TECHNOLOGY_DIRECTWRITERETAIN.
+		<a href="https://sourceforge.net/p/scintilla/bugs/2243/">Bug #2243</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite500.zip">Release 5.0.0</a>
+    </h3>
+    <ul>
+	<li>SciTE</li>
+	<ul>
+		<li>
+		Released 5 March 2021.
+		</li>
+		<li>
+		First version that separates Lexilla from Scintilla.
+		Each of the 3 projects now has a separate history page but history before 5.0.0 remains combined.
+		</li>
+		<li>
+		SciTE uses the "null" lexer when it doesn't have a lexer assigned to a file.
+		This avoids activating a Lua script lexer if one is assigned.
+		</li>
+	</ul>
+	<li>Lexilla 5.0.0</li>
+	<ul>
+		<li>
+		Lexer added for F#.
+		</li>
+	</ul>
+	<li>Scintilla 5.0.0</li>
+	<ul>
+		<li>
+		Fix Alt+End (move to wrapped line end) for Japanese UTF-8 text..
+		<a href="https://sourceforge.net/p/scintilla/bugs/2231/">Bug #2231</a>.
+		</li>
+	</ul>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite446.zip">Release 4.4.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 December 2020.
+	</li>
+	<li>
+	Fix building with Xcode 12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2187/">Bug #2187</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite445.zip">Release 4.4.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 September 2020.
+	</li>
+	<li>
+	Lexilla interface supports setting initialisation properties on lexer libraries with
+	SetLibraryProperty and GetLibraryPropertyNames functions.
+	These are called by SciTE which will forward properties to lexer libraries that are prefixed with
+	"lexilla.context.".
+	</li>
+	<li>
+	Allow cross-building for GTK by choosing pkg-config.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
+	</li>
+	<li>
+	On GTK, allow setting CPPFLAGS (and LDFLAGS for SciTE) to support hardening.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2191/">Bug #2191</a>.
+	</li>
+	<li>
+	Changed SciTE's indent.auto mode to set tab size to indent size when file uses tabs for indentation.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2198/">Bug #2198</a>.
+	</li>
+	<li>
+	Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based on
+	width of text.
+	</li>
+	<li>
+	Fixed bug on Win32 where cursor was flickering between hand and text over an
+	indicator with hover style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2170/">Bug #2170</a>.
+	</li>
+	<li>
+	Fixed bug where hovered indicator was not returning to non-hover
+	appearance when mouse moved out of window or into margin.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2193/">Bug #2193</a>.
+	</li>
+	<li>
+	Fixed bug where a hovered INDIC_TEXTFORE indicator was not applying the hover
+	colour to the whole range.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2199/">Bug #2199</a>.
+	</li>
+	<li>
+	Fixed bug where gradient indicators were not showing hovered appearance.
+	</li>
+	<li>
+	Fixed bug where layout caching was ineffective.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2197/">Bug #2197</a>.
+	</li>
+	<li>
+	For SciTE, don't show the output pane for quiet jobs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Support command.quiet for SciTE on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1365/">Feature #1365</a>.
+	</li>
+	<li>
+	Fixed a bug in SciTE with stack balance when a syntax error in the Lua startup script
+	caused continuing failures to find functions after the syntax error was corrected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	Added method for iterating through multiple vertical edges: SCI_GETMULTIEDGECOLUMN.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1350/">Feature #1350</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite444.zip">Release 4.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 July 2020.
+	</li>
+	<li>
+	End of line annotations implemented.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2141/">Bug #2141</a>.
+	</li>
+	<li>
+	Add SCI_BRACEMATCHNEXT API.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1368/">Feature #1368</a>.
+	</li>
+	<li>
+	The latex lexer supports lstlisting environment that is similar to verbatim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1358/">Feature #1358</a>.
+	</li>
+	<li>
+	For SciTE on Linux, place liblexilla.so and libscintilla.so in /usr/lib/scite.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2184/">Bug #2184</a>.
+	</li>
+	<li>
+	Round SCI_TEXTWIDTH instead of truncating as this may be more accurate when sizing application
+	elements to match text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1355/">Feature #1355</a>.
+	</li>
+	<li>
+	Display DEL control character as visible "DEL" block like other control characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1369/">Feature #1369</a>.
+	</li>
+	<li>
+	Allow caret width to be up to 20 pixels.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1361/">Feature #1361</a>.
+	</li>
+	<li>
+	SciTE on Windows adds create.hidden.console option to stop console window flashing
+	when Lua script calls os.execute or io.popen.
+	</li>
+	<li>
+	Fix translucent rectangle drawing on Qt. When drawing a translucent selection, there were edge
+	artifacts as the calls used were drawing outlines over fill areas. Make bottom and right borders on
+	INDIC_ROUNDBOX be same intensity as top and left.
+	Replaced some deprecated Qt calls with currently supported calls.
+	</li>
+	<li>
+	Fix printing on Windows to use correct text size.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2185/">Bug #2185</a>.
+	</li>
+	<li>
+	Fix bug on Win32 where calling WM_GETTEXT for more text than in document could return
+	less text than in document.
+	</li>
+	<li>
+	Fixed a bug in SciTE with Lua stack balance causing failure to find
+	functions after reloading script.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite443.zip">Release 4.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 June 2020.
+	</li>
+	<li>
+	Fix syntax highlighting for SciTE on Windows by setting executable directory for loading Lexilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2181/">Bug #2181</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite442.zip">Release 4.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2020.
+	</li>
+	<li>
+	On Cocoa using Xcode changed Lexilla.dylib install path to @rpath as would otherwise try /usr/lib which
+	won't work for sandboxed applications.
+	</li>
+	<li>
+	On Cocoa using Xcode made work on old versions of macOS by specifying deployment target as 10.8
+	instead of 10.15.
+	</li>
+	<li>
+	On Win32 fix static linking of Lexilla by specifying calling convention in Lexilla.h.
+	</li>
+	<li>
+	SciTE now uses default shared library extension even when directory contains '.'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite440.zip">Release 4.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2020.
+	</li>
+	<li>
+	Added Xcode project files for Lexilla and Scintilla with no lexers (cocoa/Scintilla).
+	</li>
+	<li>
+	For GTK, build a shared library with no lexers libscintilla.so or libscintilla.dll.
+	</li>
+	<li>
+	Lexilla used as a shared library for most builds of SciTE except for the single file executable on Win32.
+	On GTK, Scintilla shared library used.
+	LexillaLibrary code can be copied out of SciTE for other applications that want to interface to Lexilla.
+	</li>
+	<li>
+	Constants in Scintilla.h can be disabled with SCI_DISABLE_AUTOGENERATED.
+	</li>
+	<li>
+	Implement per-monitor DPI Awareness on Win32 so both Scintilla and SciTE
+	will adapt to the display scale when moved between monitors.
+	Applications should forward WM_DPICHANGED to Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2171/">Bug #2171</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2063/">Bug #2063</a>.
+	</li>
+	<li>
+	Optimized performance when opening huge files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1347/">Feature #1347</a>.
+	</li>
+	<li>
+	Add Appearance and Contrast properties to SciTE that allow customising visuals for dark mode and
+	high contrast modes.
+	</li>
+	<li>
+	Fixed bug in Batch lexer where a single character line with a single character line end continued
+	state onto the next line.
+	</li>
+	<li>
+	Added SCE_ERR_GCC_EXCERPT style for GCC 9 diagnostics in errorlist lexer.
+	</li>
+	<li>
+	Fixed buffer over-read bug with absolute references in MMIXAL lexer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2019/">Bug #2019</a>.
+	</li>
+	<li>
+	Fixed bug with GTK on recent Linux distributions where underscores were invisible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
+	</li>
+	<li>
+	Fixed GTK on Linux bug when pasting from closed application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2175/">Bug #2175</a>.
+	</li>
+	<li>
+	Fixed bug in SciTE with Lua stack balance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
+	</li>
+	<li>
+	For macOS, SciTE reverts to running python (2) due to python3 not being available in the sandbox.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite433.zip">Release 4.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 April 2020.
+	</li>
+	<li>
+	Added Visual Studio project files for Lexilla and Scintilla with no lexers.
+	</li>
+	<li>
+	Add methods for iterating through the marker handles and marker numbers on a line:
+	SCI_MARKERHANDLEFROMLINE and SCI_MARKERNUMBERFROMLINE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1344/">Feature #1344</a>.
+	</li>
+	<li>
+	Assembler lexers asm and as can change comment character with lexer.as.comment.character property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1314/">Feature #1314</a>.
+	</li>
+	<li>
+	Fix brace styling in Batch lexer so that brace matching works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1624/">Bug #1624</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1906/">Bug #1906</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1997/">Bug #1997</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2065/">Bug #2065</a>.
+	</li>
+	<li>
+	Change Perl lexer to style all line ends of comment lines in comment line style.
+	Previously, the last character was in default style which made the characters in
+	\r\n line ends have mismatching styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2164/">Bug #2164</a>.
+	</li>
+	<li>
+	When a lexer has been set with SCI_SETILEXER, fix SCI_GETLEXER and avoid
+	sending SCN_STYLENEEDED notifications.
+	</li>
+	<li>
+	On Win32 fix handling Japanese IME input when both GCS_COMPSTR and
+	GCS_RESULTSTR set.
+	</li>
+	<li>
+	With Qt on Win32 add support for line copy format on clipboard, compatible with Visual Studio.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2167/">Bug #2167</a>.
+	</li>
+	<li>
+	On Qt with default encoding (ISO 8859-1) fix bug where 'µ' (Micro Sign) case-insensitively matches '?'
+	<a href="https://sourceforge.net/p/scintilla/bugs/2168/">Bug #2168</a>.
+	</li>
+	<li>
+	On GTK with Wayland fix display of windowed IME.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2149/">Bug #2149</a>.
+	</li>
+	<li>
+	For Python programs, SciTE defaults to running python3 on Unix and pyw on Windows which will run
+	the most recently installed Python in many cases.
+	Set the "python.command" property to override this.
+	Scripts distributed with Scintilla and SciTE are checked with Python 3 and may not work with Python 2.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite432.zip">Release 4.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 March 2020.
+	</li>
+	<li>
+	On Win32 fix new bug that treated all dropped text as rectangular.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite431.zip">Release 4.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 March 2020.
+	</li>
+	<li>
+	Add default argument for StyleContext::GetRelative.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1336/">Feature #1336</a>.
+	</li>
+	<li>
+	Fix drag and drop between different encodings on Win32 by always providing CF_UNICODETEXT only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2151/">Bug #2151</a>.
+	</li>
+	<li>
+	Automatically scroll while dragging text.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/497/">Feature #497</a>.
+	</li>
+	<li>
+	On Win32, the numeric keypad with Alt pressed can be used to enter characters by number.
+	This can produce unexpected results in non-numlock mode when function keys are assigned.
+	Potentially problematic keys like Alt+KeypadUp are now ignored.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2152/">Bug #2152</a>.
+	</li>
+	<li>
+	Crash fixed with Direct2D on Win32 when updating driver.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2138/">Bug #2138</a>.
+	</li>
+	<li>
+	For SciTE on Win32, fix crashes when Lua script closes application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2155/">Bug #2155</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite430.zip">Release 4.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 January 2020.
+	</li>
+	<li>
+	Lexers made available as Lexilla library.
+	TestLexers program with tests for Lexilla and lexers added in lexilla/test.
+	</li>
+	<li>
+	SCI_SETILEXER implemented to use lexers from Lexilla or other sources.
+	</li>
+	<li>
+	ILexer5 interface defined provisionally to support use of Lexilla.
+	The details of this interface may change before being stabilised in Scintilla 5.0.
+	</li>
+	<li>
+	SCI_LOADLEXERLIBRARY implemented on Cocoa.
+	</li>
+	<li>
+	Build Scintilla with SCI_EMPTYCATALOGUE to avoid making lexers available.
+	</li>
+	<li>
+	Lexer and folder added for Raku language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1328/">Feature #1328</a>.
+	</li>
+	<li>
+	Don't clear clipboard before copying text with Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2147/">Bug #2147</a>.
+	</li>
+	<li>
+	On Win32, remove support for CF_TEXT clipboard format as Windows will convert to
+	CF_UNICODETEXT.
+	</li>
+	<li>
+	Improve IME behaviour on GTK.
+	Set candidate position for windowed IME.
+	Improve location of candidate window.
+	Prevent movement of candidate window while typing.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2135/">Bug #2135</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite423.zip">Release 4.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 December 2019.
+	</li>
+	<li>
+	Fix failure in SciTE's Complete Symbol command.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite422.zip">Release 4.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2019.
+	</li>
+	<li>
+	Move rather than grow selection when insertion at start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2140/">Bug #2140</a>.
+	</li>
+	<li>
+	Allow target to have virtual space.
+	Add methods for finding the virtual space at start and end of multiple selections.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1316/">Feature #1316</a>.
+	</li>
+	<li>
+	SciTE on Win32 adds mouse button "Forward" and "Backward" key definitions for use in
+	properties like user.shortcuts.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1317/">Feature #1317</a>.
+	</li>
+	<li>
+	Lexer and folder added for Hollywood language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1324/">Feature #1324</a>.
+	</li>
+	<li>
+	HTML lexer treats custom tags from HTML5 as known tags. These contain "-" like "custom-tag".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1299/">Feature #1299</a>.
+	</li>
+	<li>
+	HTML lexer fixes bug with some non-alphabetic characters in unknown tags.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1320/">Feature #1320</a>.
+	</li>
+	<li>
+	Fix bug in properties file lexer where long lines were only styled for the first 1024 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1933/">Bug #1933</a>.
+	</li>
+	<li>
+	Ruby lexer recognizes squiggly heredocs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1326/">Feature #1326</a>.
+	</li>
+	<li>
+	Avoid unnecessary IME caret movement on Win32.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1304/">Feature #1304</a>.
+	</li>
+	<li>
+	Clear IME state when switching language on Win32.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>.
+	</li>
+	<li>
+	Fixed drawing of translucent rounded rectangles on Win32 with Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2144/">Bug #2144</a>.
+	</li>
+	<li>
+	Setting rectangular selection made faster.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>.
+	</li>
+	<li>
+	SciTE reassigns *.s extension to the GNU Assembler language from the S+ statistical language.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite421.zip">Release 4.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 October 2019.
+	</li>
+	<li>
+	Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs.
+	This allows minimaps or overviews to be layed out to match the full size editing view.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2118/">Bug #2118</a>.
+	</li>
+	<li>
+	SciTE enables use of SCI_ commands in user.context.menu.
+	</li>
+ 	<li>
+	XML folder adds fold.xml.at.tag.open option to fold tags at the start of the tag "&lt;" instead of the end "&gt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2128/">Bug #2128</a>.
+	</li>
+ 	<li>
+	Metapost lexer fixes crash with 'interface=none' comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2129/">Bug #2129</a>.
+	</li>
+ 	<li>
+	Perl lexer supports indented here-docs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2121/">Bug #2121</a>.
+	</li>
+ 	<li>
+	Perl folder folds qw arrays.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1306/">Feature #1306</a>.
+	</li>
+ 	<li>
+	TCL folder can turn off whitespace flag by setting fold.compact property to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2131/">Bug #2131</a>.
+	</li>
+ 	<li>
+	Optimize setting up keyword lists in lexers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1305/">Feature #1305</a>.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 12.1.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1315/">Feature #1315</a>.
+	</li>
+ 	<li>
+	On Win32, stop the IME candidate window moving unnecessarily and position it better.<br />
+	Stop candidate window overlapping composition text and taskbar.<br />
+	Position candidate window closer to composition text.<br />
+	Stop candidate window moving while typing.<br />
+	Align candidate window to target part of composition text.<br />
+	Stop Google IME on Windows 7 moving while typing.<br />
+	<a href="https://sourceforge.net/p/scintilla/bugs/2120/">Bug #2120</a>.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1300/">Feature #1300</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite420.zip">Release 4.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 July 2019.
+	</li>
+ 	<li>
+	Scintilla.iface adds line and pointer types, increases use of the position type, uses enumeration
+	types in methods and properties, and adds enumeration aliases to produce better CamelCase
+	identifiers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1297/">Feature #1297</a>.
+	</li>
+ 	<li>
+	Source of input (direct / IME composition / IME result) reported in SCN_CHARADDED so applications
+	can treat temporary IME composition input differently.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2038/">Bug #2038</a>.
+	</li>
+ 	<li>
+	Lexer added for DataFlex.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1295/">Feature #1295</a>.
+	</li>
+ 	<li>
+	Matlab lexer now treats keywords as case-sensitive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2112/">Bug #2112</a>.
+	</li>
+ 	<li>
+	SQL lexer fixes single quoted strings where '" (quote, double quote) was seen as continuing the string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2098/">Bug #2098</a>.
+	</li>
+ 	<li>
+	Platform layers should use InsertCharacter method to perform keyboard and IME input, replacing
+	AddCharUTF method.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1293/">Feature #1293</a>.
+	</li>
+ 	<li>
+	Add CARETSTYLE_BLOCK_AFTER option to always display block caret after selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1924/">Bug #1924</a>.
+	</li>
+ 	<li>
+	On Win32, limit text returned from WM_GETTEXT to the length specified in wParam.
+	This could cause failures when using assistive technologies like NVDA.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2110/">Bug #2110</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2114/">Bug #2114</a>.
+	</li>
+ 	<li>
+	Fix deletion of isolated invalid bytes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2116/">Bug #2116</a>.
+	</li>
+ 	<li>
+	Fix position of line caret when overstrike caret set to block.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2106/">Bug #2106</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite417.zip">Release 4.1.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 June 2019.
+	</li>
+	<li>
+	Fixes an incorrect default setting in SciTE which caused multiple visual features to fail to display.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite416.zip">Release 4.1.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 June 2019.
+	</li>
+	<li>
+	For Visual C++ 2019, /std:c++latest now includes some C++20 features so switch to /std:c++17.
+	</li>
+	<li>
+	SciTE supports editing files larger than 2 gigabytes when built as a 64-bit application.
+	</li>
+ 	<li>
+	Lexer added for X12.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1280/">Feature #1280</a>.
+	</li>
+ 	<li>
+	CMake folder folds function - endfunction.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1289/">Feature #1289</a>.
+	</li>
+ 	<li>
+	VB lexer adds support for VB2017 binary literal &amp;B and digit separators 123_456.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1288/">Feature #1288</a>.
+	</li>
+	<li>
+	Improved performance of line folding code on large files when no folds are contracted.
+	This improves the time taken to open or close large files.
+	</li>
+	<li>
+	Fix bug where changing identifier sets in lexers preserved previous identifiers.
+	</li>
+	<li>
+	Fixed bug where changing to Unicode would rediscover line end positions even if still
+	sticking to ASCII (not Unicode NEL, LS, PS) line ends.
+	Only noticeable on huge files with over 100,000 lines.
+	</li>
+ 	<li>
+	Changed behaviour of SCI_STYLESETCASE(*,SC_CASE_CAMEL) so that it only treats 'a-zA-Z'
+	as word characters because this covers the feature's intended use (viewing case-insensitive ASCII-only
+	keywords in a specified casing style) and simplifies the behaviour and code.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1238/">Feature #1238</a>.
+	</li>
+ 	<li>
+	In SciTE added Camel case option "case:c" for styles to show keywords with initial capital.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite415.zip">Release 4.1.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2019.
+	</li>
+ 	<li>
+	On Win32, removed special handling of non-0 wParam to WM_PAINT.
+	</li>
+ 	<li>
+	Implement high-priority idle on Win32 to make redraw smoother and more efficient.
+	</li>
+	<li>
+	Add vertical bookmark symbol SC_MARK_VERTICALBOOKMARK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1276/">Feature #1276</a>.
+	</li>
+ 	<li>
+	Set default fold display text SCI_SETDEFAULTFOLDDISPLAYTEXT(text).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1272/">Feature #1272</a>.
+	</li>
+ 	<li>
+	Add SCI_SETCHARACTERCATEGORYOPTIMIZATION API to optimize speed
+	of character category features like determining whether a character is a space or number
+	at the expense of memory.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1259/">Feature #1259</a>.
+	</li>
+ 	<li>
+	Improve the styling of numbers in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1268/">Feature #1268</a>.
+	</li>
+ 	<li>
+	Fix exception when inserting DBCS text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2093/">Bug #2093</a>.
+	</li>
+	<li>
+	Improve performance of accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2094/">Bug #2094</a>.
+	</li>
+ 	<li>
+	Fix text reported for deletion with accessibility on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2095/">Bug #2095</a>.
+	</li>
+ 	<li>
+	Fix flicker when inserting primary selection on GTK.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2087/">Bug #2087</a>.
+	</li>
+ 	<li>
+	Support coloured text in Windows 8.1+.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1277/">Feature #1277</a>.
+	</li>
+ 	<li>
+	Avoid potential long hangs with idle styling for huge documents on Cocoa and GTK.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite414.zip">Release 4.1.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 March 2019.
+	</li>
+	<li>
+	Calltips implemented on Qt.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1548/">Bug #1548</a>.
+	</li>
+ 	<li>
+	Block caret in overtype mode SCI_SETCARETSTYLE(caretStyle | CARETSTYLE_OVERSTRIKE_BLOCK).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1217/">Feature #1217</a>.
+	</li>
+ 	<li>
+	SciTE supports changing caret style via caret.style property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1264/">Feature #1624</a>.
+	</li>
+ 	<li>
+	Lexer added for .NET's Common Intermediate Language CIL.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1265/">Feature #1265</a>.
+	</li>
+ 	<li>
+	The C++ lexer, with styling.within.preprocessor on, now interprets "(" in preprocessor "#if("
+	as an operator instead of part of the directive. This improves folding as well which could become
+	unbalanced.
+	</li>
+ 	<li>
+	Fix raw strings in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1253/">Feature #1253</a>.
+	</li>
+ 	<li>
+	Fix inconsistency with dot styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1260/">Feature #1260</a>.
+	</li>
+ 	<li>
+	Enhance the styling of backticks in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1261/">Feature #1261</a>.
+	</li>
+ 	<li>
+	Enhance raw string identifier styling in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1262/">Feature #1262</a>.
+	</li>
+ 	<li>
+	Fix fold behaviour with comments in Nim.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1254/">Feature #1254</a>.
+	</li>
+ 	<li>
+	Fix TCL lexer recognizing '"' after "," inside a bracketed substitution.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1947/">Bug #1947</a>.
+	</li>
+ 	<li>
+	Fix garbage text from SCI_MOVESELECTEDLINESUP and SCI_MOVESELECTEDLINESDOWN
+	for rectangular or thin selection by performing no action.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2078/">Bug #2078</a>.
+	</li>
+ 	<li>
+	Ensure container notified if Insert pressed when caret off-screen.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2083/">Bug #2083</a>.
+	</li>
+ 	<li>
+	Fix memory leak when checking running instance on GTK.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1267/">Feature #1267</a>.
+	</li>
+	<li>
+	Platform layer font cache removed on Win32 as there is a platform-independent cache.
+	</li>
+	<li>
+	SciTE for GTK easier to build on macOS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2084/">Bug #2084</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite413.zip">Release 4.1.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 January 2019.
+	</li>
+	<li>
+	Add SCI_SETCOMMANDEVENTS API to allow turning off command events as they
+	can be a significant performance cost.
+	</li>
+	<li>
+	Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
+	still remaining responsive.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 11.
+	</li>
+	<li>
+	Errorlist lexer recognizes negative line numbers as some programs show whole-file
+	errors occurring on line -1.
+	SciTE's parsing of diagnostics also updated to handle this case.
+	</li>
+ 	<li>
+	Added "nim" lexer (SCLEX_NIM) for the Nim language which was previously called Nimrod.
+	For compatibility, the old "nimrod" lexer is still present but is deprecated and will be removed at the
+	next major version.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1242/">Feature #1242</a>.
+	</li>
+ 	<li>
+	The Bash lexer implements substyles for multiple sets of keywords and supports SCI_PROPERTYNAMES.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2054/">Bug #2054</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets continued preprocessor lines correctly by reading all of
+	the logical line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2062/">Bug #2062</a>.
+	</li>
+ 	<li>
+	The C++ lexer interprets preprocessor arithmetic expressions containing multiplicative and additive
+	operators correctly by following operator precedence rules.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2069/">Bug #2069</a>.
+	</li>
+ 	<li>
+	The EDIFACT lexer handles message groups as well as messages.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1247/">Feature #1247</a>.
+	</li>
+ 	<li>
+	For SciTE's Find in Files, allow case-sensitivity and whole-word options when running
+	a user defined command.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2053/">Bug #2053</a>.
+	</li>
+	<li>
+	Notify with SC_UPDATE_SELECTION when user performs a multiple selection add.
+	</li>
+	<li>
+	On macOS 10.14 Cocoa, fix incorrect horizontal offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2022/">Bug #2022</a>.
+	</li>
+	<li>
+	On Cocoa, fix a crash that occurred when entering a dead key diacritic then a character
+	that can not take that diacritic, such as option+e (acute accent) followed by g.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2061/">Bug #2061</a>.
+	</li>
+	<li>
+	On Cocoa, use dark info bar background when system is set to Dark Appearance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2055/">Bug #2055</a>.
+	</li>
+	<li>
+	Fixed a crash on Cocoa in bidirectional mode where some patterns of invalid UTF-8
+	caused failures to create Unicode strings.
+	</li>
+	<li>
+	SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
+	</li>
+	<li>
+	Improve performance of text insertion when Unicode line indexing off.
+	</li>
+	<li>
+	For Qt on Windows, stop specifying -std:c++latest as that is no longer needed
+	to enable C++17 with MSVC 2017 and Qt 5.12 and it caused duplicate flag warnings.
+	</li>
+	<li>
+	On Linux, enable Lua to access dynamic libraries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2058/">Bug #2058</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite412.zip">Release 4.1.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 October 2018.
+	</li>
+	<li>
+	C++ lexer fixes evaluation of "#elif".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
+	</li>
+	<li>
+	Markdown lexer fixes highlighting of non-ASCII characters in links.
+	</li>
+	<li>
+	SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips
+	and disables F5 while command running.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite411.zip">Release 4.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 September 2018.
+	</li>
+	<li>
+	Optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units added.
+	This can improve performance for clients that provide UTF-32 or UTF-16 interfaces or that need to interoperate
+	with UTF-32 or UTF-16 components.
+	</li>
+	<li>
+	Lexers added for SAS and Stata.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
+	</li>
+	<li>
+	Shell folder folds "if", "do", and "case".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1144/">Feature #1144.</a>
+	</li>
+	<li>
+	SciTE's menukey feature implemented on Windows.
+	</li>
+	<li>
+	For SciTE on Windows, user defined strip lists are now scrollable.
+	Cursor no longer flickers in edit and combo boxes.
+	Focus in and out events occur for combo boxes.
+	</li>
+	<li>
+	Fix a leak in the bidirectional code on Win32.
+	</li>
+	<li>
+	Fix crash on Win32 when switching technology to default after setting bidirectional mode.
+	</li>
+	<li>
+	Fix margin cursor on Cocoa to point more accurately.
+	</li>
+	<li>
+	Fix SciTE crash on GTK+ when using director interface.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite410.zip">Release 4.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 June 2018.
+	</li>
+	<li>
+	Experimental and incomplete support added for bidirectional text on Windows using DirectWrite and Cocoa for
+	UTF-8 documents by calling SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R).
+	This allows documents that contain Arabic or Hebrew to be edited more easily in a way that is similar
+	to other editors.
+	</li>
+	<li>
+	INDIC_GRADIENT and INDIC_GRADIENTCENTRE indicator types added.
+	INDIC_GRADIENT starts with a specified colour and alpha at top of line and fades
+	to fully transparent at bottom.
+	INDIC_GRADIENTCENTRE starts with a specified colour and alpha at centre of line and fades
+	to fully transparent at top and bottom.
+	</li>
+	<li>
+	Wrap indent mode SC_WRAPINDENT_DEEPINDENT added which indents two tabs from previous line.
+	</li>
+	<li>
+	Indicators are drawn for line end characters when displayed.
+	</li>
+	<li>
+	Most invalid bytes in DBCS encodings are displayed as blobs to make problems clear
+	and ensure something is shown.
+	</li>
+	<li>
+	On Cocoa, invalid text in DBCS encodings will be interpreted through the
+	single-byte MacRoman encoding as that will accept any byte.
+	</li>
+	<li>
+	Diff lexer adds styles for diffs containing patches.
+	</li>
+	<li>
+	Crashes fixed on macOS for invalid DBCS characters when dragging text,
+	changing case of text, case-insensitive searching, and retrieving text as UTF-8.
+	</li>
+	<li>
+	Regular expression crash fixed on macOS when linking to libstdc++.
+	</li>
+	<li>
+	SciTE on GTK+, when running in single-instance mode, now forwards all command line arguments
+	to the already running instance.
+	This allows "SciTE filename -goto:line" to work.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite405.zip">Release 4.0.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 May 2018.
+	</li>
+	<li>
+	Add experimental SC_DOCUMENTOPTION_TEXT_LARGE option to accommodate documents larger than
+	2 GigaBytes.
+	</li>
+	<li>
+	Additional print option SC_PRINT_SCREENCOLOURS prints with the same colours used on screen
+	including line numbers.
+	</li>
+	<li>
+	SciTE can read settings in EditorConfig format when enabled with editor.config.enable property.
+	</li>
+	<li>
+	EDIFACT lexer adds property lexer.edifact.highlight.un.all to highlight all UN* segments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	Fortran folder understands "change team" and "endteam".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1216/">Feature #1216.</a>
+	</li>
+	<li>
+	Set the last X chosen when SCI_REPLACESEL called to ensure macros work
+	when text insertion followed by caret up or down.
+	</li>
+	<li>
+	Bugs fixed in regular expression searches in Scintilla where some matches did not occur in an
+	effort to avoid infinite loops when replacing on empty matches like "^" and "$".
+	Applications should always handle empty matches in a way that avoids infinite loops, commonly
+	by incrementing the search position after replacing an empty match.
+	SciTE fixes a bug where replacing "^" always matched on the first line even when it was an
+	"in selection" replace and the selection started after the line start.
+	</li>
+	<li>
+	Bug fixed in SciTE where invalid numeric properties could crash.
+	</li>
+	<li>
+	Runtime warnings fixed with SciTE on GTK after using Find in Files.
+	</li>
+	<li>
+	SciTE on Windows find and replace strips place caret at end of text after search.
+	</li>
+	<li>
+	Bug fixed with SciTE on macOS where corner debris appeared in the margin when scrolling.
+	Fixed by not completely hiding the status bar so the curved corner is no longer part of the
+	scrolling region.
+	By default, 4 pixels of the status bar remain visible and this can be changed with
+	the statusbar.minimum.height property or turned off if the debris are not a problem by
+	setting the property to 0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite404.zip">Release 4.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 10 April 2018.
+	</li>
+	<li>
+	On Win32, the standard makefiles build a libscintilla static library as well as the existing dynamic libraries.
+	The statically linked version of SciTE, Sc1, links to this static library. A new file, ScintillaDLL.cxx, provides
+	the DllMain function required for a stand-alone Scintilla DLL. Build and project files should include this
+	file when producing a DLL and omit it when producing a static library or linking Scintilla statically.
+	The STATIC_BUILD preprocessor symbol is no longer used.
+	</li>
+	<li>
+	On Win32, Direct2D support is no longer automatically detected during build.
+	DISABLE_D2D may still be defined to remove Direct2D features.
+	</li>
+	<li>
+	In some cases, invalid UTF-8 is handled in a way that is a little friendlier.
+	For example, when copying to the clipboard on Windows, an invalid lead byte will be copied as the
+	equivalent ISO 8859-1 character and will not hide the following byte.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1211/">Feature #1211.</a>
+	</li>
+	<li>
+	Lexer added for the Maxima computer algebra language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1210/">Feature #1210.</a>
+	</li>
+	<li>
+	Fix hang in Lua lexer when lexing a label upto the terminating "::".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1999/">Bug #1999</a>.
+	</li>
+	<li>
+	Lua lexer matches identifier chains with dots and colons.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1952/">Bug #1952</a>.
+	</li>
+	<li>
+	For rectangular selections, pressing Home or End now moves the caret to the Home or End
+	position instead of the limit of the rectangular selection.
+	</li>
+	<li>
+	Fix move-extends-selection mode for rectangular and line selections.
+	</li>
+	<li>
+	On GTK+, change lifetime of selection widget to avoid runtime warnings.
+	</li>
+	<li>
+	Fix building on Mingw/MSYS to perform file copies and deletions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1993/">Bug #1993</a>.
+	</li>
+	<li>
+	SciTE can match a wider variety of file patterns where '*' is in the middle of
+	the pattern and where there are multiple '*'.
+	A '?' matches any single character.
+	</li>
+	<li>
+	SciTE on Windows can execute Python scripts directly by name when on path.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1209/">Feature #1209.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files checks for cancel after every 10,000 lines read so
+	can be stopped on huge files.
+	</li>
+	<li>
+	SciTE remembers entered values in lists in more cases for find, replace and find in files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1715/">Bug #1715</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite403.zip">Release 4.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 February 2018.
+	</li>
+	<li>
+	Features from C++14 and C++17 are used more often, with build files now specifying
+	c++17, gnu++17, c++1z, or std:c++latest (MSVC).
+	Requires Microsoft Visual C++ 2017.5, GCC 7, Xcode 9.2 or Clang 4.0 or newer.
+	</li>
+	<li>
+	SCI_CREATEDOCUMENT adds a bytes argument to allocate memory for an initial size.
+	SCI_CREATELOADER and SCI_CREATEDOCUMENT add a documentOption argument to
+	allow choosing different document capabilities.
+	</li>
+	<li>
+	Add SC_DOCUMENTOPTION_STYLES_NONE option to stop allocating memory for styles.
+	</li>
+	<li>
+	Add SCI_GETMOVEEXTENDSSELECTION to allow applications to add more
+	complex selection commands.
+	</li>
+	<li>
+	SciTE property bookmark.symbol allows choosing symbol used for bookmarks.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1208/">Feature #1208.</a>
+	</li>
+	<li>
+	Improve VHDL lexer's handling of character literals and escape characters in strings.
+	</li>
+	<li>
+	Fix double tap word selection on Windows 10 1709 Fall Creators Update.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1983/">Bug #1983</a>.
+	</li>
+	<li>
+	Fix closing autocompletion lists on Cocoa for macOS 10.13 where the window
+	was emptying but staying visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1981/">Bug #1981</a>.
+	</li>
+	<li>
+	Fix drawing failure on Cocoa with animated find indicator in large files with macOS 10.12
+	by disabling animation.
+	</li>
+	<li>
+	SciTE on GTK+ installs its desktop file as non-executable and supports the common
+	LDLIBS make variable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1989/">Bug #1989</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1990/">Bug #1990</a>.
+	</li>
+	<li>
+	SciTE shows correct column number when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1991/">Bug #1991</a>.
+	</li>
+	<li>
+	SciTE preserves selection positions when saving with strip.trailing.spaces
+	and virtual space turned on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1992/">Bug #1992</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite402.zip">Release 4.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 October 2017.
+	</li>
+	<li>
+	Fix HTML lexer handling of Django so that nesting a  &#123;&#123; &#125;&#125; or &#123;% %&#125;
+	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
+	</li>
+	<li>
+	The Matlab folder now treats "while" as a fold start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1985/">Bug #1985</a>.
+	</li>
+	<li>
+	Fix failure on Cocoa with animated find indicator in large files with macOS 10.13
+	by disabling animation on 10.13.
+	</li>
+	<li>
+	Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite401.zip">Release 4.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 October 2017.
+	</li>
+	<li>
+	The ILoader interface is defined in its own header ILoader.h as it is not
+	related to lexing so doesn't belong in ILexer.h.
+	</li>
+	<li>
+	The Scintilla namespace is always active for internal symbols and for the lexer interfaces
+	ILexer4 and IDocument.
+	</li>
+	<li>
+	The Baan lexer checks that matches to 3rd set of keywords are function calls and leaves as identifiers if not.
+	Baan lexer and folder support #context_on / #context_off preprocessor feature.
+	</li>
+	<li>
+	The C++ lexer improved preprocessor conformance.<br />
+	Default value of 0 for undefined preprocessor symbols.<br />
+	#define A is treated as #define A 1.<br />
+	"defined A" removes "A" before replacing "defined" with value.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1966/">Bug #1966</a>.
+	</li>
+	<li>
+	The Python folder treats triple-quoted f-strings like triple-quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1977/">Bug #1977</a>.
+	</li>
+	<li>
+	The SQL lexer uses sql.backslash.escapes for double quoted strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1968/">Bug #1968</a>.
+	</li>
+	<li>
+	Minor undefined behaviour fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1978">Bug #1978</a>.
+	</li>
+	<li>
+	On Cocoa, improve scrolling on macOS 10.12.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1885">Bug #1885</a>.
+	</li>
+	<li>
+	On Cocoa, fix line selection by clicking in the margin when scrolled.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1971">Bug #1971</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite400.zip">Release 4.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 August 2017.
+	</li>
+	<li>
+	This is an unstable release with changes to interfaces used for lexers and platform access.
+	Some more changes may occur to internal and external interfaces before stability is regained with 4.1.0.
+	</li>
+	<li>
+	Uses C++14 features. Requires Microsoft Visual C++ 2017, GCC 7, and Clang 4.0 or newer.
+	</li>
+	<li>
+	Support dropped for GTK+ versions before 2.24.
+	</li>
+	<li>
+	The lexer interfaces ILexer and ILexerWithSubStyles, along with additional style metadata methods, were merged into ILexer4.
+	Most lexers will need to be updated to match the new interfaces.
+	</li>
+	<li>
+	The IDocumentWithLineEnd interface was merged into IDocument.
+	</li>
+	<li>
+	The platform layer interface has changed with unused methods removed, a new mechanism for
+	reporting events, removal of methods that take individual keyboard modifiers, and removal of old timer methods.
+	</li>
+	<li>
+	<a href="StyleMetadata.html">Style metadata</a> may be retrieved from lexers that support this through the SCI_GETNAMEDSTYLES, SCI_NAMEOFSTYLE,
+	SCI_TAGSOFSTYLE, and SCI_DESCRIPTIONOFSTYLE APIs.
+	</li>
+	<li>
+	The Cocoa platform layer uses Automatic Reference Counting (ARC).
+	</li>
+	<li>
+	The default encoding in Scintilla is UTF-8.
+	</li>
+	<li>
+	An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
+	</li>
+	<li>
+	The data parameter to ILoader::AddData made const.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1955/">Bug #1955</a>.
+	</li>
+	<li>
+	SciTE's embedded Lua interpreter updated to Lua 5.3.
+	</li>
+	<li>
+	SciTE allows event handlers to be arbitrary callables, not just functions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1190/">Feature #1190.</a>
+	</li>
+	<li>
+	SciTE allows user.shortcuts to be defined with symbolic Scintilla messages like
+	'Ctrl+L|SCI_LINEDELETE|'.
+	</li>
+	<li>
+	The Matlab lexer treats 'end' as a number rather than a keyword when used as a index.
+	This also stops incorrect folding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1951/">Bug #1951</a>.
+	</li>
+	<li>
+	The Matlab folder implements "fold", "fold.comment", and "fold.compact" properties.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1965/">Bug #1965</a>.
+	</li>
+	<li>
+	The Rust lexer recognizes 'usize' numeric literal suffixes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>.
+	</li>
+	<li>
+	Ensure redraw when application changes overtype mode so caret change visible even when not blinking.
+	Notify application with SC_UPDATE_SELECTION when overtype changed - previously
+	sent SC_UPDATE_CONTENT.
+	</li>
+	<li>
+	Fix drawing failure when in wrap mode for delete to start/end of line which
+	affects later lines but did not redraw them.
+	Also fixed drawing for wrap mode on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
+	</li>
+	<li>
+	On GTK+ fix drawing problems including incorrect scrollbar redrawing and flickering of text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1876">Bug #1876</a>.
+	</li>
+	<li>
+	On Linux, both for GTK+ and Qt, the default modifier key for rectangular selection is now Alt.
+	This is the same as Windows and macOS.
+	This was changed from Ctrl as window managers are less likely to intercept Alt+Drag for
+	moving windows than in the past.
+	</li>
+	<li>
+	On Cocoa, fix doCommandBySelector but avoid double effect of 'delete'
+	key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1958">Bug #1958</a>.
+	</li>
+	<li>
+	On Qt, the updateUi signal includes the 'updated' flags.
+	No updateUi signal is sent for focus in events.
+	These changes make Qt behave more like the other platforms.
+	</li>
+	<li>
+	On Qt, dropping files on Scintilla now fires the SCN_URIDROPPED notification
+	instead of inserting text.
+	</li>
+	<li>
+	On Qt, focus changes send the focusChanged signal.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1957/">Bug #1957</a>.
+	</li>
+	<li>
+	On Qt, mouse tracking is reenabled when the window is reshown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>.
+	</li>
+	<li>
+	On Windows, the DirectWrite modes SC_TECHNOLOGY_DIRECTWRITEDC and
+	SC_TECHNOLOGY_DIRECTWRITERETAIN are no longer provisional.
+	</li>
+	<li>
+	SciTE on macOS fixes a crash when platform-specific and platform-independent
+	session restoration clashed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1960/">Bug #1960</a>.
+	</li>
+	<li>
+	SciTE on GTK+ implements find.close.on.find.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1152/">Bug #1152</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1254/">Bug #1254</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1762/">Bug #1762</a>,
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/849/">Feature #849</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla376.zip">Release 3.7.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 August 2017.
+	</li>
+	<li>
+	This is the first release of the
+	<a href="https://scintilla.sourceforge.io/LongTermDownload.html">long term branch</a>
+	which avoids using features from C++14 or later in order to support older systems.
+	</li>
+	<li>
+	The Baan lexer correctly highlights numbers when followed by an operator.
+	</li>
+	<li>
+	On Cocoa, fix a bug with retrieving encoded bytes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite375.zip">Release 3.7.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2017.
+	</li>
+	<li>
+	This is the final release of SciTE 3.x.
+	</li>
+	<li>
+	Support dropped for Microsoft Visual C++ 2013 due to increased use of C++11 features.
+	</li>
+	<li>
+	Added a caret line frame as an alternative visual for highlighting the caret line.
+	</li>
+	<li>
+	Added "Reverse Selected Lines" feature.
+	</li>
+	<li>
+	SciTE adds "Select All Bookmarks" command.
+	</li>
+	<li>
+	SciTE adds a save.path.suggestion setting to suggest a file name when saving an
+	unnamed buffer.
+	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 9.
+	</li>
+	<li>
+	The Baan lexer recognizes numeric literals in a more compliant manner including
+	hexadecimal numbers and exponentials.
+	</li>
+	<li>
+	The Bash lexer recognizes strings in lists in more cases.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1944/">Bug #1944</a>.
+	</li>
+	<li>
+	The Fortran lexer recognizes a preprocessor line after a line continuation &amp;.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1935/">Bug #1935</a>.
+	</li>
+	<li>
+	The Fortran folder can fold comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1936/">Bug #1936</a>.
+	</li>
+	<li>
+	The PowerShell lexer recognizes escaped quotes in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1929/">Bug #1929</a>.
+	</li>
+	<li>
+	The Python lexer recognizes identifiers more accurately when they include non-ASCII characters.
+	</li>
+	<li>
+	The Python folder treats comments at the end of the file as separate from the preceding structure.
+	</li>
+	<li>
+	The YAML lexer recognizes comments in more situations and styles a
+	"..." line like a "---" line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1931/">Bug #1931</a>.
+	</li>
+	<li>
+	Update scroll bar when annotations added, removed, or visibility changed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1187/">Feature #1187.</a>
+	</li>
+	<li>
+	Canceling modes with the Esc key preserves a rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1940/">Bug #1940</a>.
+	</li>
+	<li>
+	Builds are made with a sorted list of lexers to be more reproducible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1946/">Bug #1946</a>.
+	</li>
+	<li>
+	On Cocoa, a leak of mouse tracking areas was fixed.
+	</li>
+	<li>
+	On Cocoa, the autocompletion is 4 pixels wider to avoid text truncation.
+	</li>
+	<li>
+	On Windows, stop drawing a focus rectangle on the autocompletion list and
+	raise the default list length to 9 items.
+	</li>
+	<li>
+	SciTE examines at most 1 MB of a file to automatically determine indentation
+	for indent.auto to avoid a lengthy pause when loading very large files.
+	</li>
+	<li>
+	SciTE user interface uses lighter colours and fewer 3D elements to match current desktop environments.
+	</li>
+	<li>
+	SciTE sets buffer dirty and shows message when file deleted if load.on.activate on.
+	</li>
+	<li>
+	SciTE on Windows Find strip Find button works in incremental no-close mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1926/">Bug #1926</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite374.zip">Release 3.7.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2017.
+	</li>
+	<li>
+	Requires a C++11 compiler. GCC 4.8 and MSVC 2015 are supported.
+	</li>
+	<li>
+	Support dropped for Windows NT 4.
+	</li>
+	<li>
+	Accessibility support may be queried with SCI_GETACCESSIBILITY.
+	On GTK+, accessibility may be disabled by calling SCI_SETACCESSIBILITY.
+	</li>
+	<li>
+	Lexer added for "indent" language which is styled as plain text but folded by indentation level.
+	</li>
+	<li>
+	The Progress ABL lexer handles nested comments where comment starts or ends
+	are adjacent like "/*/*" or "*/*/".
+	</li>
+	<li>
+	In the Python lexer, improve f-string support.
+	Add support for multiline expressions in triple quoted f-strings.
+	Handle nested "()", "[]", and "{}" in f-string expressions and terminate expression colouring at ":" or "!".
+	End f-string if ending quote is seen in a "{}" expression.
+	Fix terminating single quoted f-string at EOL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1918/">Bug #1918</a>.
+	</li>
+	<li>
+	The VHDL folder folds an "entity" on the first line of the file.
+	</li>
+	<li>
+	For IMEs, do not clear selected text when there is no composition text to show.
+	</li>
+	<li>
+	Fix to crash with fold tags where line inserted at start.
+	</li>
+	<li>
+	Fix to stream selection mode when moving caret up or down.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1905/">Bug #1905</a>.
+	</li>
+	<li>
+	Drawing fixes for fold tags include fully drawing lines and not overlapping some
+	drawing and ensuring edges and mark underlines are visible.
+	</li>
+	<li>
+	Fix Cocoa failure to display accented character chooser for European
+	languages by partially reverting a change made to prevent a crash with
+	Chinese input by special-casing the Cangjie input source.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	Fix potential problems with IME on Cocoa when document contains invalid
+	UTF-8.
+	</li>
+	<li>
+	Fix crash on Cocoa with OS X 10.9 due to accessibility API not available.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1915/">Bug #1915</a>.
+	</li>
+	<li>
+	Improved speed of accessibility code on GTK+ by using additional memory
+	as a cache.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1910/">Bug #1910</a>.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ &lt; 3.3.6 caused by previous bug fix.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Fix to prevent double scrolling on GTK+ with X11.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+	<li>
+	SciTE on GTK+ adds an "accessibility" property to allow disabling accessibility
+	on GTK+ as an optimization.
+	</li>
+	<li>
+	SciTE on GTK+ has changed file chooser behaviour for some actions:
+	overwriting an existing file shows a warning;
+	the default session file name "SciTE.session" is shown and a "*.session" filter is applied;
+	appropriate filters are applied when exporting;
+	the current file name is displayed in "Save As" even when that file no longer exists.
+	</li>
+	<li>
+	SciTE fixed a bug where, on GTK+, when the output pane had focus, menu commands
+	performed by mouse were sent instead to the edit pane.
+	</li>
+	<li>
+	SciTE on Windows 8+ further restricts the paths searched for DLLs to the application
+	and system directories which may prevent some binary planting attacks.
+	</li>
+	<li>
+	Fix failure to load Direct2D on Windows when used on old versions of Windows.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1653/">Bug #1653</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite373.zip">Release 3.7.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 February 2017.
+	</li>
+	<li>
+	Display block caret over the character at the end of a selection to be similar
+	to other editors.
+	</li>
+	<li>
+	In SciTE can choose colours for fold markers.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1172/">Feature #1172.</a>
+	</li>
+	<li>
+	In SciTE can hide buffer numbers in tabs.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1173/">Feature #1173.</a>
+	</li>
+	<li>
+	The Diff lexer recognizes deleted lines that start with "--- ".
+	</li>
+	<li>
+	The Lua lexer requires the first line to start with "#!" to be treated as a shebang comment,
+	not just "#".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1900/">Bug #1900</a>.
+	</li>
+	<li>
+	The Matlab lexer requires block comment start and end to be alone on a line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1902/">Bug #1902</a>.
+	</li>
+	<li>
+	The Python lexer supports f-strings with new styles, allows Unicode identifiers,
+	and no longer allows @1 to be a decorator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1848/">Bug #1848</a>.
+	</li>
+	<li>
+	Fix folding inconsistency when fold header added above a folded part.
+	Avoid unnecessary unfolding when a deletion does not include a line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1896/">Bug #1896</a>.
+	</li>
+	<li>
+	Fix finalization crash on Cocoa.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1909/">Bug #1909</a>.
+	</li>
+	<li>
+	SciTE on GTK+ can have a wide divider between the panes with the
+	split.wide property.
+	</li>
+	<li>
+	Fix display of autocompletion lists and calltips on GTK+ 3.22 on Wayland.
+	Newer APIs used on GTK+ 3.22 as older APIs were deprecated.
+	</li>
+	<li>
+	Fix crash in accessibility code on GTK+ due to signal receipt after destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1907/">Bug #1907</a>.
+	</li>
+	<li>
+	Make trackpad scrolling work on Wayland.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1901/">Bug #1901</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite372.zip">Release 3.7.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 December 2016.
+	</li>
+	<li>
+	Minimize redrawing for SCI_SETSELECTIONN* APIs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>.
+	</li>
+	<li>
+	Use more precision to allow selecting individual lines in files with
+	more than 16.7 million lines.
+	</li>
+	<li>
+	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
+	</li>
+	<li>
+	For Cocoa, fix crash on view destruction with macOS 10.12.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1891/">Bug #1891</a>.
+	</li>
+	<li>
+	Fix crash on GTK+ &lt;3.8 due to incorrect lifetime of accessibility object.
+	More accurate reporting of attribute ranges and deletion lengths for accessibility.
+	</li>
+	<li>
+	In SciTE, if a Lua script causes a Scintilla failure exception, display error
+	message in output pane instead of exiting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1773/">Bug #1773</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite371.zip">Release 3.7.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 December 2016.
+	</li>
+	<li>
+	The Scintilla namespace is no longer applied to struct definitions in Scintilla.h even
+	when SCI_NAMESPACE defined.
+	Client code should not define SCI_NAMESPACE.
+	</li>
+	<li>
+	Structure names in Scintilla.h without prefixes are deprecated and will now only
+	be usable with INCLUDE_DEPRECATED_FEATURES defined.<br />
+	Use the newer names with the "Sci_" prefix:<br />
+	CharacterRange &rarr; Sci_CharacterRange<br />
+	TextRange &rarr; Sci_TextRange<br />
+	TextToFind &rarr; Sci_TextToFind<br />
+	RangeToFormat &rarr; Sci_RangeToFormat<br />
+	NotifyHeader &rarr; Sci_NotifyHeader
+	</li>
+	<li>
+	Previously deprecated features SC_CP_DBCS, SCI_SETUSEPALETTE. and SCI_GETUSEPALETTE
+	have been removed and can no longer be used in client code.
+	</li>
+	<li>
+	Single phase drawing SC_PHASES_ONE is deprecated along with the
+	SCI_SETTWOPHASEDRAW and SCI_GETTWOPHASEDRAW messages.
+	</li>
+	<li>
+	Accessibility support allowing screen readers to work added on GTK+ and Cocoa.
+	</li>
+	<li>
+	Textual tags may be displayed to the right on folded lines with SCI_TOGGLEFOLDSHOWTEXT.
+	This is commonly something like "{ ... }" or "&lt;tr&gt;...&lt;/tr&gt;".
+	It is displayed with the STYLE_FOLDDISPLAYTEXT style and may have a box drawn around it
+	with SCI_FOLDDISPLAYTEXTSETSTYLE.
+	</li>
+	<li>
+	A mouse right-click over the margin may send an SCN_MARGINRIGHTCLICK event.
+	This only occurs when popup menus are turned off.
+	SCI_USEPOPUP now has three states: SC_POPUP_NEVER, SC_POPUP_ALL, or SC_POPUP_TEXT.
+	</li>
+	<li>
+	INDIC_POINT and INDIC_POINTCHARACTER indicators added to display small arrows
+	underneath positions or characters.
+	</li>
+	<li>
+	Added alternate appearance for visible tabs which looks like a horizontal line.
+	Controlled with SCI_SETTABDRAWMODE.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1165/">Feature #1165.</a>
+	</li>
+	<li>
+	On Cocoa, a modulemap file is included to allow Scintilla to be treated as a module.
+	This makes it easier to use Scintilla from the Swift language.
+	</li>
+	<li>
+	Baan folder accommodates sections and lexer fixes definition of SCE_BAAN_FUNCDEF.
+	</li>
+	<li>
+	EDIFACT lexer and folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1166/">Feature #1166.</a>
+	</li>
+	<li>
+	JSON folder fixed where it didn't resume folding with the correct fold level.
+	</li>
+	<li>
+	Matlab folder based on syntax instead of indentation so more accurate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1692/">Bug #1692</a>.
+	</li>
+	<li>
+	YAML lexer fixed style of references and keywords when followed by a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1872/">Bug #1872</a>.
+	</li>
+	<li>
+	Margin click to select line now clears rectangular and additional selections.
+	</li>
+	<li>
+	Fixed a NULL access bug on GTK+ where the scrollbars could be used during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1873/">Bug #1873</a>.
+	</li>
+	<li>
+	A potential bug on GTK+ fixed where asynchronous clipboard could be delivered after its
+	target Scintilla instance was destroyed.
+	</li>
+	<li>
+	Cocoa IME made more compliant with documented behaviour to avoid bugs that caused
+	huge allocations.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1881/">Bug #1881</a>.
+	</li>
+	<li>
+	On Win32 fix EM_SETSEL to match Microsoft documentation..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1886/">Bug #1886</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows localizing tool bar tool tips.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1167/">Feature #1167.</a>
+	</li>
+	<li>
+	SciTE on Windows restores focus to edit pane after closing user strip.
+	</li>
+	<li>
+	SciTE measures files larger that 2 GB which allows it to refuse to open huge files more consistently
+	and to show better warning messages.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite370.zip">Release 3.7.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 October 2016.
+	</li>
+	<li>
+	Word selection, navigation, and manipulation is now performed on characters instead of bytes
+	leading to more natural behaviour for multi-byte encodings like UTF-8.
+	For UTF-8 characters 0x80 and above, classification into word; punctuation; space; or line-end
+	is based on the Unicode general category of the character and is not customizable.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1832/">Bug #1832</a>.
+	</li>
+	<li>
+	Two enums changed in Scintilla.iface which may lead to changed bindings.
+	There were 2 FontQuality enums and the first is now PhasesDraw.
+	The prefix for FoldAction was SC_FOLDACTION and is now SC_FOLDACTION_
+	which is similar to other enums.
+	These changes do not affect the standard C/C++ binding.
+	</li>
+	<li>
+	EDGE_MULTILINE and SCI_MULTIEDGEADDLINE added to allow displaying multiple
+	vertical edges simultaneously.
+	</li>
+	<li>
+	The number of margins can be changed with SCI_SETMARGINS.
+	</li>
+	<li>
+	Margin type SC_MARGIN_COLOUR added so that the application may
+	choose any colour for a margin with SCI_SETMARGINBACKN.
+	</li>
+	<li>
+	On Win32, mouse wheel scrolling can be restricted to only occur when the mouse is
+	within the window.
+	</li>
+	<li>
+	The WordList class in lexlib used by lexers adds an InListAbridged method for
+	matching keywords that have particular prefixes and/or suffixes.
+	</li>
+	<li>
+	The Baan lexer was changed significantly with more lexical states, keyword sets,
+	and support for abridged keywords.
+	</li>
+	<li>
+	The CoffeeScript lexer styles interpolated code in strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1865/">Bug #1865</a>.
+	</li>
+	<li>
+	The Progress lexer "progress" has been replaced with a new lexer "abl"
+	(Advanced Business Language)
+	with a different set of lexical states and more functionality.
+	The lexical state prefix has changed from SCE_4GL_ to SCE_ABL_.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1143/">Feature #1143.</a>
+	</li>
+	<li>
+	The PowerShell lexer understands the grave accent escape character.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1868/">Bug #1868</a>.
+	</li>
+	<li>
+	The YAML lexer recognizes inline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1660/">Bug #1660</a>.
+	</li>
+	<li>
+	SciTE on Windows can retain coloured selection when inactive with
+	selection.always.visible property.
+	</li>
+	<li>
+	SciTE on Windows adds a state to close.on.find to close the find strip when
+	a match is found.
+	</li>
+	<li>
+	Fix caret position after left or right movement with rectangular selection.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1861/">Bug #1861</a>.
+	</li>
+	<li>
+	In SciTE, optional prefix argument added to scite.ConstantName method.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1860/">Bug #1860</a>.
+	</li>
+	<li>
+	On Cocoa, include ILexer.h in the public headers of the framework.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1855/">Bug #1855</a>.
+	</li>
+	<li>
+	On Cocoa, allow subclass of SCIContentView to set cursor.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1863/">Bug #1863</a>.
+	</li>
+	<li>
+	On Cocoa, recognize the numeric keypad '+', '-', and '/' keys as
+	SCK_ADD, SCK_SUBTRACT, and SCK_DIVIDE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1867/">Bug #1867</a>.
+	</li>
+	<li>
+	On GTK+ 3.21+ fix incorrect font size in auto-completion list.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1859/">Bug #1859</a>.
+	</li>
+	<li>
+	Fix SciTE crash when command.mode ends with comma.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1857/">Bug #1857</a>.
+	</li>
+	<li>
+	SciTE on Windows has a full size toolbar icon for "Close".
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite367.zip">Release 3.6.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 September 2016.
+	</li>
+	<li>
+	C++11 range-based for loops used in SciTE so GCC 4.6 is now the minimum supported version.
+	</li>
+	<li>
+	SC_CHARSET_DEFAULT now means code page 1252 on Windows unless a code page is set.
+	This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
+	Projects which want to default to DBCS code pages in East Asian locales should set the code page and
+	character set explicitly.
+	</li>
+	<li>
+	SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.
+	Most commonly wanted when virtual space is used.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1648/">Bug #1648</a>.
+	</li>
+	<li>
+	The C++ lexer can fold on #else and #elif with the fold.cpp.preprocessor.at.else property.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/210/">Bug #210</a>.
+	</li>
+	<li>
+	The errorlist lexer detects warnings from Visual C++ which do not contain line numbers.
+	</li>
+	<li>
+	The HTML lexer no longer treats "&lt;?" inside a string in a script as potentially starting an XML document.
+	<a href="https://sourceforge.net/p/scintilla/bugs/767/">Bug #767</a>.
+	</li>
+	<li>
+	The HTML lexer fixes a problem resuming at a script start where the starting state continued
+	past where it should.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1849/">Bug #1849</a>.
+	</li>
+	<li>
+	When inserting spaces for virtual space and the position is in indentation and tabs are enabled
+	for indentation then use tabs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1850/">Bug #1850</a>.
+	</li>
+	<li>
+	Fix fold expand when some child text not styled.
+	Caused by fixes for Bug #1799.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1842/">Bug #1842</a>.
+	</li>
+	<li>
+	Fix key binding bug on Cocoa for control+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1854/">Bug #1854</a>.
+	</li>
+	<li>
+	Fix scroll bar size warnings on GTK+ caused by #1831.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1851/">Bug #1851</a>.
+	</li>
+	<li>
+	Small fixes for GTK+ makefile.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1844/">Bug #1844</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1845/">Bug #1845</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1846/">Bug #1846</a>.
+	</li>
+	<li>
+	Fix SciTE indentation after code like "void function () {}".
+	</li>
+	<li>
+	Fix SciTE global regex replace of "^" with something which missed the line after empty
+	lines with LF line ends.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1839/">Bug #1839</a>.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.20 bug where toggle buttons on find and replace strips
+	did not show active state.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1853/">Bug #1853</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite366.zip">Release 3.6.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 24 May 2016.
+	</li>
+	<li>
+	C++ 11 &lt;regex&gt; support built by default. Can be disabled by defining NO_CXX11_REGEX.
+	</li>
+	<li>
+	SciTE_USERHOME environment variable allows separate location for writeable properties files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/965/">Feature #965.</a>
+	</li>
+	<li>
+	GObject introspection supports notify and command events.
+	</li>
+	<li>
+	The Progress lexer now allows comments preceded by a tab.
+	</li>
+	<li>
+	Scripts reading Scintilla.iface file include comments for enu and lex definitions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1829/">Bug #1829</a>.
+	</li>
+	<li>
+	Fix crashes on GTK+ if idle work active when destroyed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1827/">Bug #1827</a>.
+	</li>
+	<li>
+	Fixed bugs when used on GTK+ 3.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1825/">Bug #1825</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1831/">Bug #1831</a>.
+	</li>
+	<li>
+	Fix SciTE search field background with dark theme on GTK+ 2.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1826/">Bug #1826</a>.
+	</li>
+	<li>
+	Fixed bug on Win32 that allowed resizing autocompletion from bottom when it was
+	located above the caret.
+	</li>
+	<li>
+	On Win32, when using a screen reader and selecting text using Shift+Arrow,
+	fix bug when scrolling made the caret stay at the same screen location
+	so the screen reader did not speak the added or removed selection.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite365.zip">Release 3.6.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 April 2016.
+	</li>
+	<li>
+	JSON lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1140/">Feature #1140.</a>
+	</li>
+	<li>
+	The C++ lexer fixes a bug with multi-line strings with line continuation where the string style
+	overflowed after an edit.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1824/">Bug #1824</a>.
+	</li>
+	<li>
+	The Python lexer treats '@' as an operator except when it is the first visible character on a line.
+	This is for Python 3.5.
+	</li>
+	<li>
+	The Rust lexer allows '?' as an operator.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1146/">Feature #1146.</a>
+	</li>
+	<li>
+	Doubled size of compiled regex buffer.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1822/">Bug #1822</a>.
+	</li>
+	<li>
+	For GTK+, the Super modifier key can be used in key bindings.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1142/">Feature #1142.</a>
+	</li>
+	<li>
+	For GTK+, fix some crashes when using multiple threads.
+	</li>
+	<li>
+	Platform layer font cache removed on GTK+ as platform-independent caches are used.
+	This avoids the use of thread locking and initialization of threads so any GTK+
+	applications that rely on Scintilla initializing threads will have to do that themselves.
+	</li>
+	<li>
+	SciTE bug fixed with exported HTML where extra line shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1816/">Bug #1816</a>.
+	</li>
+	<li>
+	SciTE on Windows fixes bugs with pop-up menus in the find and replace strips.
+	For the replace strip, menu choices change the state.
+	For the find strip, menu choices are reflected in the appearance of their corresponding buttons.
+	</li>
+	<li>
+	SciTE on Windows on high DPI displays fixes the height of edit boxes in user strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite364.zip">Release 3.6.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 March 2016.
+	</li>
+	<li>
+	SciTE allows setting the autocompletion type separator character.
+	</li>
+	<li>
+	The C++ folder folds code on '(' and ')' to allow multi-line calls to be folded.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1138/">Feature #1138.</a>
+	</li>
+	<li>
+	For the HTML lexer, limit the extent of Mako line comments to finish before
+	the line end characters.
+	</li>
+	<li>
+	Folds unfolded when two fold regions are merged by either deleting an intervening line
+	or changing its fold level by adding characters.
+	This was fixed both in Scintilla and in SciTE's equivalent code.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1799/">Bug #1799</a>.<br />
+	</li>
+	<li>
+	The Progress lexer supports hexadecimal numeric literals,
+	single-line comments, abbreviated keywords and
+	extends nested comments to unlimited levels.
+	</li>
+	<li>
+	Ruby lexer treats alternate hash key syntax "key:" as a symbol.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1810/">Bug #1810</a>.
+	</li>
+	<li>
+	Rust lexer handles bracketed Unicode string escapes like "\u{123abc}".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1809/">Bug #1809</a>.
+	</li>
+	<li>
+	For GTK+ on Windows fix 64-bit build which was broken in 3.6.3.
+	</li>
+	<li>
+	For Qt, release builds have assertions turned off.
+	</li>
+	<li>
+	For Qt on Windows, fix compilation failure for Qt 4.x.
+	</li>
+	<li>
+	IME target range displayed on Qt for OS X.
+	</li>
+	<li>
+	On Windows, make clipboard operations more robust by retrying OpenClipboard if it fails
+	as this may occur when another application has opened the clipboard.
+	</li>
+	<li>
+	On Windows back out change that removed use of def file to ensure
+	Scintilla_DirectFunction exported without name mangling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1813/">Bug #1813</a>.
+	</li>
+	<li>
+	On GTK+ and Qt over Win32 in Korean fix bug caused by last release's word input change.
+	</li>
+	<li>
+	For SciTE, more descriptive error messages are displayed when there are problems loading the
+	Lua startup script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1139/">Feature #1139.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite363.zip">Release 3.6.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 18 January 2016.
+	</li>
+	<li>
+	Allow painting without first styling all visible text then styling in the background
+	using idle-time. This helps performance when scrolling down in very large documents.
+	Can also incrementally style after the visible area to the end of the document so that
+	the document is already styled when the user scrolls to it.
+	</li>
+	<li>
+	Support GObject introspection on GTK+.
+	</li>
+	<li>
+	SciTE supports pasting to each selection with the selection.multipaste setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1123/">Feature #1123.</a>
+	</li>
+	<li>
+	SciTE can optionally display a read-only indicator on tabs and in the Buffers menu.
+	</li>
+	<li>
+	Bash lexer flags incomplete here doc delimiters as syntax errors.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1789/">Bug #1789</a>.<br />
+	Support added for using '#' in non-comment ways as is possible with zsh.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1794/">Bug #1794</a>.<br />
+	Recognize more characters as here-doc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1778/">Bug #1778</a>.
+	</li>
+	<li>
+	Errorlist lexer highlights warning messages from the Microsoft linker.
+	</li>
+	<li>
+	Errorlist lexer fixes bug with final line in escape sequence recognition mode.
+	</li>
+	<li>
+	Lua lexer includes '&amp;' and '|' bitwise operators for Lua 5.3.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1790/">Bug #1790</a>.
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.20 and 5.22.<br />
+	Allow '_' for subroutine prototypes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1791/">Bug #1791</a>.<br />
+	Double-diamond operator &lt;&lt;&gt;&gt;.<br />
+	Hexadecimal floating point literals.<br />
+	Repetition in list assignment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1793/">Bug #1793</a>.<br />
+	Highlight changed subroutine prototype syntax for Perl 5.20.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1797/">Bug #1797</a>.<br />
+	Fix module ::-syntax when special characters such as 'x' are used.<br />
+	Added ' and " detection as prefix chars for x repetition operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1800/">Bug #1800</a>.
+	</li>
+	<li>
+	Visual Prolog lexer recognizes numbers more accurately and allows non-ASCII verbatim
+	quoting characters.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1130/">Feature #1130.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION when the application changes multiple
+	selection.
+	</li>
+	<li>
+	Expand folded areas before deleting fold header line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1796/">Bug #1796</a>.
+	</li>
+	<li>
+	Treat Unicode line ends like common line ends when maintaining fold state.
+	</li>
+	<li>
+	Highlight whole run for hover indicator when wrapped.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1784/">Bug #1784</a>.
+	</li>
+	<li>
+	On Cocoa, fix crash when autocompletion list closed during scroll bounce-back.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1788/">Bug #1788</a>.
+	</li>
+	<li>
+	On Windows, fix non-BMP input through WM_CHAR and allow WM_UNICHAR to work
+	with non-BMP characters and on non-Unicode documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1779/">Bug #1779</a>.
+	</li>
+	<li>
+	On Windows using DirectWrite, for ligatures and other character clusters,
+	display caret and selections part-way through clusters so that the caret doesn't stick
+	to the end of the cluster making it easier to understand editing actions.
+	</li>
+	<li>
+	On Windows, Scintilla no longer uses a .DEF file during linking as it duplicates
+	source code directives.
+	</li>
+	<li>
+	On GTK+ and Qt, Korean input by word fixed.
+	</li>
+	<li>
+	On GTK+, Qt, and Win32 block IME input when document is read-only or any selected text
+	is protected.
+	</li>
+	<li>
+	On GTK+ on OS X, fix warning during destruction.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1777/">Bug #1777</a>.
+	</li>
+	<li>
+	Fix SciTE crashes when using LPEG lexers.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite362.zip">Release 3.6.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 6 November 2015.
+	</li>
+	<li>
+	Whitespace may be made visible just in indentation.
+	</li>
+	<li>
+	Whitespace dots are centred when larger than 1 pixel.
+	</li>
+	<li>
+	The Scintilla framework on Cocoa now contains version numbers.
+	</li>
+	<li>
+	SciTE's standard properties collect values from all active .properties file to produce the Language menu
+	and the file types pull-down in the File open dialog.
+	</li>
+	<li>
+	The single executable version of SciTE, Sc1, uses 'module' statements within its embedded
+	properties. This makes it act more like the full distribution allowing languages to be turned on
+	and off by setting imports.include and imports.exclude.
+	The default imports.exclude property adds eiffel, erlang, ps, and pov so these languages are
+	turned off by default.
+	</li>
+	<li>
+	SciTE adds an output.blank.margin.left property to allow setting the output pane
+	margin to a different width than the edit pane.
+	</li>
+	<li>
+	CoffeeScript lexer highlights ranges correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1765/">Bug #1765</a>.
+	</li>
+	<li>
+	Markdown lexer treats line starts consistently to always highlight *foo* or similar at line start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1766/">Bug #1766</a>.
+	</li>
+	<li>
+	Optimize marker redrawing by only drawing affected lines when markers shown in the text.
+	</li>
+	<li>
+	On Cocoa, timers and idling now work in modal dialogs. This also stops some crashes.
+	</li>
+	<li>
+	On Cocoa, fix crashes when deleting a ScintillaView. These crashes could occur when scrolling
+	at the time the ScintillaView was deleted although there may have been other cases.
+	</li>
+	<li>
+	On GTK+ 2.x, fix height of lines in autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1774/">Bug #1774</a>.
+	</li>
+	<li>
+	Fix bug with SCI_LINEENDDISPLAY where the caret moved to the next document line instead of the
+	end of the display line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1772/">Bug #1772</a>.
+	</li>
+	<li>
+	Report error (SC_STATUS_FAILURE) when negative length passed to SCI_SETSTYLING.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1768/">Bug #1768</a>.
+	</li>
+	<li>
+	When SC_MARK_UNDERLINE is not assigned to a margin, stop drawing the whole line.
+	</li>
+	<li>
+	When reverting an untitled document in SciTE, just clear it with no message about a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1764/">Bug #1764</a>.
+	</li>
+	<li>
+	SciTE on GTK+ allows use of Ctrl+A (Select All) inside find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1769/">Bug #1769</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite361.zip">Release 3.6.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 September 2015.
+	</li>
+	<li>
+	The oldest version of GTK+ supported now is 2.18 and for glib it is 2.22.
+	</li>
+	<li>
+	On GTK+, SC_CHARSET_OEM866 added to allow editing Russian files encoded in code page 866.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1019/">Feature #1019.</a>
+	</li>
+	<li>
+	On Windows, reconversion is performed when requested by the IME.
+	</li>
+	<li>
+	CoffeeScript lexer adds lexical class for instance properties and fixes some cases of regex highlighting.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1749/">Bug #1749</a>.
+	</li>
+	<li>
+	The errorlist lexer understands some ANSI escape sequences to change foreground colour and intensity.
+	This is sufficient to colour diagnostic output from gcc and clang when -fdiagnostics-color set.
+	</li>
+	<li>
+	The errorlist lexer allows the line number to be 0 in GCC errors as some tools report whole file
+	errors as line 0.
+	</li>
+	<li>
+	MySql lexer fixes empty comments /**/ so the comment state does not continue.
+	</li>
+	<li>
+	VHDL folder supports "protected" keyword.
+	</li>
+	<li>
+	Treat CRLF line end as two characters in SCI_COUNTCHARACTERS.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1757/">Bug #1757</a>.
+	</li>
+	<li>
+	On GTK+ 3.x, fix height of lines in autocompletion lists to match the font.
+	Switch from deprecated style calls to CSS styling.
+	Removed setting list colours on GTK+ 3.16+ as no longer appears needed.
+	</li>
+	<li>
+	On GTK+, avoid "Invalid rectangle passed" warning messages by never reporting the client
+	rectangle with a negative width or height.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1743/">Bug #1743</a>.
+	</li>
+	<li>
+	On Cocoa, copy Sci_Position.h into the framework so clients can build.
+	</li>
+	<li>
+	On Cocoa fix bug with drag and drop that could lead to crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1751/">Bug #1751</a>.
+	</li>
+	<li>
+	Fix SciTE disk exhaustion bug by reporting failures when writing files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1760/">Bug #1760</a>.
+	</li>
+	<li>
+	Fix find strip in SciTE on Windows XP to be visible.
+	</li>
+	<li>
+	SciTE on Windows changes the way it detects that a tool has finished executing to ensure all output data
+	from the process is read.
+	</li>
+	<li>
+	SciTE on Windows improves the time taken to read output from tools that produce a large amount
+	of output by a factor of around 10.
+	</li>
+	<li>
+	On GTK+ the keyboard command for View | End of Line was changed to Ctrl+Shift+N
+	to avoid clash with Search | Selection Add Next.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1750/">Bug #1750</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite360.zip?download">Release 3.6.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 August 2015.
+	</li>
+	<li>
+	External interfaces use the Sci_Position and Sci_PositionU typedefs instead of int and unsigned int
+	to allow for changes to a 64-bit interface on 64-bit platforms in the future.
+	Applications and external lexers should start using the new type names so that
+	they will be compatible when the 64-bit change occurs.
+	There is also Sci_PositionCR (long) for use in the Sci_CharacterRange struct which will
+	also eventually become 64-bit.
+	</li>
+	<li>
+	Multiple selection now works over more key commands.
+	The new multiple-selection handling commands include horizontal movement and selection commands,
+	line up and down movement and selection commands, word and line deletion commands, and
+	line end insertion.
+	This change in behaviours is conditional on setting the SCI_SETADDITIONALSELECTIONTYPING property.
+	</li>
+	<li>
+	Autocompletion lists send an SCN_AUTOCCOMPLETED notification after the text has been inserted.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1109/">Feature #1109.</a>
+	</li>
+	<li>
+	The case mode style attribute can now be SC_CASE_CAMEL.
+	</li>
+	<li>
+	The Python lexer supports substyles for identifiers.
+	</li>
+	<li>
+	SciTE adds support for substyles.
+	</li>
+	<li>
+	SciTE's Export as RTF and Copy as RTF commands support UTF-8.
+	</li>
+	<li>
+	SciTE can display autocompletion on all IME input with ime.autocomplete property.
+	</li>
+	<li>
+	SciTE properties files now discard trailing white space on variable names.
+	</li>
+	<li>
+	Calling SCI_SETIDENTIFIERS resets styling to ensure any added identifier are highlighted.
+	</li>
+	<li>
+	Avoid candidate box randomly popping up away from edit pane with (especially
+	Japanese) IME input.
+	</li>
+	<li>
+	On Cocoa fix problems with positioning of autocompletion lists near screen edge
+	or under dock. Cancel autocompletion when window moved.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1740/">Bug #1740</a>.
+	</li>
+	<li>
+	Fix drawing problem when control characters are in a hidden style as they then
+	have a zero width rectangle to draw but modify that rectangle in a way that
+	clears some pixels.
+	</li>
+	<li>
+	Report error when attempt to resize buffer to more than 2GB with SC_STATUS_FAILURE.
+	</li>
+	<li>
+	Fix bug on GTK+ with scroll bars leaking.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1742/">Bug #1742</a>.
+	</li>
+	<li>
+	LexOthers.cxx file split into one file per lexer: LexBatch, LexDiff,
+	LexErrorList, LexMake, LexNull, and LexProps.
+	</li>
+	<li>
+	SciTE exporters handle styles &gt; 127 correctly now.
+	</li>
+	<li>
+	SciTE on Windows can scale window element sizes based on the system DPI setting.
+	</li>
+	<li>
+	SciTE implements find.in.files.close.on.find on all platforms, not just Windows.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite357.zip?download">Release 3.5.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2015.
+	</li>
+	<li>
+	Added SCI_MULTIPLESELECTADDNEXT to add the next occurrence of the main selection within the
+	target to the set of selections as main. If the current selection is empty then select word around caret.
+	SCI_MULTIPLESELECTADDEACH adds each occurrence of the main selection within the
+	target to the set of selections.
+	</li>
+	<li>
+	SciTE adds "Selection Add Next" and "Selection Add Each" commands to the Search menu.
+	</li>
+	<li>
+	Added SCI_ISRANGEWORD to determine if the parameters are at the start and end of a word.
+	</li>
+	<li>
+	Added SCI_TARGETWHOLEDOCUMENT to set the target to the whole document.
+	</li>
+	<li>
+	Verilog lexer recognizes protected regions and the folder folds protected regions.
+	</li>
+	<li>
+	A performance problem with markers when deleting many lines was fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1733/">Bug #1733</a>.
+	</li>
+	<li>
+	On Cocoa fix crash when ScintillaView destroyed if no autocompletion ever displayed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1728/">Bug #1728</a>.
+	</li>
+	<li>
+	On Cocoa fix crash in drag and drop.
+	</li>
+	<li>
+	On GTK+ 3.4+, when there are both horizontal and vertical scrollbars, draw the lower-right corner
+	so that it does not appear black when text selected.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1611/">Bug #1611</a>.
+	</li>
+	<li>
+	Fixed most calls deprecated in GTK+ 3.16. Does not fix style override calls
+	as they are more complex.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x uses a different technique for highlighting the search strip when there is
+	no match which is more compatible with future and past versions and different themes.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite356.zip?download">Release 3.5.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 May 2015.
+	</li>
+	<li>
+	On Qt, use fractional positioning calls and avoid rounding to ensure consistency.
+	</li>
+	<li>
+	SCI_TARGETASUTF8 and SCI_ENCODEDFROMUTF8 implemented on
+	Win32 as well as GTK+ and Cocoa.
+	</li>
+	<li>
+	C++ lexer fixes empty backquoted string.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1711/">Bug #1711</a>.
+	</li>
+	<li>
+	C++ lexer fixes #undef directive.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1719/">Bug #1719</a>.
+	</li>
+	<li>
+	Fortran folder fixes handling of "selecttype" and "selectcase".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1724/">Bug #1724</a>.
+	</li>
+	<li>
+	Verilog folder folds interface definitions.
+	</li>
+	<li>
+	VHDL folder folds units declarations and fixes a case insensitivity bug with not treating "IS" the same as "is".
+	</li>
+	<li>
+	Fix bug when drawing text margins in buffered mode which would use default
+	encoding instead of chosen encoding.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1703/">Bug #1703</a>.
+	</li>
+	<li>
+	Fix bug with Korean Hanja conversions in DBCS encoding on Windows.
+	</li>
+	<li>
+	Fix for reading a UTF-16 file in SciTE where a non-BMP character is split over a read buffer boundary.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1710/">Bug #1710</a>.
+	</li>
+	<li>
+	Fix bug on GTK+ 2.x for Windows where there was an ABI difference between
+	compiler version.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1726/">Bug #1726</a>.
+	</li>
+	<li>
+	Fix undo bug on Cocoa that could lose data..
+	</li>
+	<li>
+	Fix link error on Windows when SCI_NAMESPACE used.
+	</li>
+	<li>
+	Fix exporting from SciTE when using Scintillua for lexing.
+	</li>
+	<li>
+	SciTE does not report twice that a search string can not be found when "Replace" pressed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1716/">Bug #1716</a>.
+	</li>
+	<li>
+	SciTE on GTK+ 3.x disables arrow in search combo when no entries.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1717/">Bug #1717</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 April 2015.
+	</li>
+	<li>
+	Scintilla on Windows is now always a wide character window so SCI_SETKEYSUNICODE has no effect
+	and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called.
+	</li>
+	<li>
+	The wxWidgets-specific ascent member of Font has been removed which breaks
+	compatibility with current wxStyledTextCtrl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1682/">Bug #1682</a>.
+	</li>
+	<li>
+	IME on Qt supports multiple carets and behaves more like other platforms.
+	</li>
+	<li>
+	Always use inline IME on GTK+ for Korean.
+	</li>
+	<li>
+	SQL lexer fixes handling of '+' and '-' in numbers so the '-' in '1-1' is seen as an operator and for
+	'1--comment' the comment is recognized.
+	</li>
+	<li>
+	TCL lexer reverts change to string handling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer fixes bugs with macro styling.
+	Verilog folder fixes bugs with `end completing an `if* instead of `endif and fold.at.else, and implements
+	folding at preprocessor `else.
+	</li>
+	<li>
+	VHDL lexer supports extended identifiers.
+	</li>
+	<li>
+	Fix bug on Cocoa where the calltip would display incorrectly when
+	switching calltips and the new calltip required a taller window.
+	</li>
+	<li>
+	Fix leak on Cocoa with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1706/">Bug #1706</a>.
+	</li>
+	<li>
+	Fix potential crash on Cocoa with drag and drop.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1709/">Bug #1709</a>.
+	</li>
+	<li>
+	Fix bug on Windows when compiling with MinGW-w64 which caused text to not be drawn
+	when in wrap mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1705/">Bug #1705</a>.
+	</li>
+	<li>
+	Fix SciTE bug with missing file open filters and add hex to excluded set of properties files so that its
+	settings don't appear.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1707/">Bug #1707</a>.
+	</li>
+	<li>
+	Fix SciTE bug where files without extensions like "makefile" were not highlighted correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite354.zip?download">Release 3.5.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2015.
+	</li>
+	<li>
+	Indicators may have a different colour and style when the mouse is over them or the caret is moved into them.
+	</li>
+	<li>
+	An indicator may display in a large variety of colours with the SC_INDICFLAG_VALUEFORE
+	flag taking the colour from the indicator's value, which may differ for every character, instead of its
+	foreground colour attribute.
+	</li>
+	<li>
+	On Cocoa, additional IME methods implemented so that more commands are enabled.
+	For Japanese: Reverse Conversion, Convert to Related Character, and Search Similar Kanji
+	can now be performed.
+	The global definition hotkey Command+Control+D and the equivalent three finger tap gesture
+	can be used.
+	</li>
+	<li>
+	Minimum version of Qt supported is now 4.8 due to the use of QElapsedTimer::nsecsElapsed.
+	</li>
+	<li>
+	On Windows, for Korean, the VK_HANJA key is implemented to choose Hanja for Hangul and
+	to convert from Hanja to Hangul.
+	</li>
+	<li>
+	C++ lexer adds lexer.cpp.verbatim.strings.allow.escapes option that allows verbatim (@") strings
+	to contain escape sequences. This should remain off (0) for C# and be turned on (1) for Objective C.
+	</li>
+	<li>
+	Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>.
+	</li>
+	<li>
+	Ruby folder can fold multiline comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1697/">Bug #1697</a>.
+	</li>
+	<li>
+	SQL lexer fixes a bug with the q-quote operator.
+	</li>
+	<li>
+	TCL lexer fixes a bug with some strings.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
+	Verilog lexer handles escaped identifiers that begin with \ and end with space like \reset* .
+	Verilog folder fixes one bug with inconsistent folding when fold.comment is on and another
+	with typedef class statements creating a fold point, expecting an endclass statement.
+	</li>
+	<li>
+	VHDL folder fixes hang in folding when document starts with "entity".
+	</li>
+	<li>
+	Add new indicators INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, and INDIC_TEXTFORE.
+	INDIC_COMPOSITIONTHIN is a thin underline that mimics the appearance of non-target segments in OS X IME.
+	INDIC_FULLBOX is similar to INDIC_STRAIGHTBOX but covers the entire character area which means that
+	indicators with this style on contiguous lines may touch. INDIC_TEXTFORE changes the text foreground colour.
+	</li>
+	<li>
+	Fix adaptive scrolling speed for GTK+ on OS X with GTK Quartz backend (as opposed to X11 backend).
+	<a href="https://sourceforge.net/p/scintilla/bugs/1696/">Bug #1696</a>.
+	</li>
+	<li>
+	Fix position of autocompletion and calltips on Cocoa when there were two screens stacked vertically.
+	</li>
+	<li>
+	Fix crash in SciTE when saving large files in background when closing application.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1691/">Bug #1691</a>.
+	</li>
+	<li>
+	Fix decoding of MSVC warnings in SciTE so that files in the C:\Program Files (x86)\ directory can be opened.
+	This is a common location of system include files.
+	</li>
+	<li>
+	Fix compilation failure of C++11 &lt;regex&gt; on Windows using gcc.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 January 2015.
+	</li>
+	<li>
+	Support removed for Windows 95, 98, and ME.
+	</li>
+	<li>
+	Lexers added for Motorola S-Record files, Intel hex files, and Tektronix extended hex files with folding for Intel hex files.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1091/">Feature #1091.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1093/">Feature #1093.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1095/">Feature #1095.</a>
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1096/">Feature #1096.</a>
+	</li>
+	<li>
+	C++ folder allows folding on square brackets '['.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1087/">Feature #1087.</a>
+	</li>
+	<li>
+	Shell lexer fixes three issues with here-documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1672/">Bug #1672</a>.
+	</li>
+	<li>
+	Verilog lexer highlights doc comment keywords; has separate styles for input, output, and inout ports
+	(lexer.verilog.portstyling); fixes a bug in highlighting numbers; can treat upper-case identifiers as
+	keywords (lexer.verilog.allupperkeywords); and can use different styles for code that is inactive due
+	to preprocessor commands (lexer.verilog.track.preprocessor, lexer.verilog.update.preprocessor).
+	</li>
+	<li>
+	When the calltip window is taller than the Scintilla window, leave it in a
+	position that avoids overlapping the Scintilla text.
+	</li>
+	<li>
+	When a text margin is displayed, for annotation lines, use the background colour of the base line.
+	</li>
+	<li>
+	On Windows GDI, assume font names are encoded in UTF-8. This matches the Direct2D code path.
+	</li>
+	<li>
+	Fix paste for GTK+ on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1677/">Bug #1677</a>.
+	</li>
+	<li>
+	Reverted a fix on Qt where Qt 5.3 has returned to the behaviour of 4.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	When the mouse is on the line between margin and text changed to treat as within text.
+	This makes the PLAT_CURSES character cell platform work better.
+	</li>
+	<li>
+	Fix a crash in SciTE when the command line is just "-close:".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1675/">Bug #1675</a>.
+	</li>
+	<li>
+	Fix unexpected dialog in SciTE on Windows when the command line has a quoted filename then ends with a space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1673/">Bug #1673</a>.
+	</li>
+	<li>
+	On Windows and GTK+, use indicators for inline IME.
+	</li>
+	<li>
+	SciTE shuts down quicker when there is no user-written OnClose function and no directors are attached.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite352.zip?download">Release 3.5.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 December 2014.
+	</li>
+	<li>
+	For OS X Cocoa switch C++ runtime to libc++ to enable use of features that will never
+	be added to libstdc++ including those part of C++11.
+	Scintilla will now run only on OS X 10.7 or later and only in 64-bit mode.
+	</li>
+	<li>
+	Include support for using C++11 &lt;regex&gt; for regular expression searches.
+	Enabling this requires rebuilding Scintilla with a non-default option.
+	This is a provisional feature and may change API before being made permanent.
+	</li>
+	<li>
+	Allocate indicators used for Input Method Editors after 31 which was the previous limit of indicators to
+	ensure no clash between the use of indicators for IME and for the application.
+	</li>
+	<li>
+	ANNOTATION_INDENTED added which is similar to ANNOTATION_BOXED in terms of positioning
+	but does not show a border.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1086/">Feature #1086.</a>
+	</li>
+	<li>
+	Allow platform overrides for drawing tab arrows, wrap markers, and line markers.
+	Size of double click detection area is a variable.
+	These enable better visuals and behaviour for PLAT_CURSES as it is character cell based.
+	</li>
+	<li>
+	CoffeeScript lexer fixes "/*" to not be a comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1420/">Bug #1420</a>.
+	</li>
+	<li>
+	VHDL folder fixes "block" keyword.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1664/">Bug #1664</a>.
+	</li>
+	<li>
+	Prevent caret blinking when holding down Delete key.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1657/">Bug #1657</a>.
+	</li>
+	<li>
+	On Windows, allow right click selection in popup menu.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1080/">Feature #1080.</a>
+	</li>
+	<li>
+	On Windows, only call ShowCaret in GDI mode as it interferes with caret drawing when using Direct2D.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1643/">Bug #1643</a>.
+	</li>
+	<li>
+	On Windows, another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITEDC added
+	which may avoid drawing failures in some circumstances by drawing into a GDI DC.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows, avoid processing mouse move events where the mouse has not moved as these can
+	cause unexpected dwell start notifications.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1670/">Bug #1670</a>.
+	</li>
+	<li>
+	For GTK+ on Windows, avoid extra space when pasting from external application.
+	</li>
+	<li>
+	On GTK+ 2.x allow Scintilla to be used inside tool tips by changing when preedit window created.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1662/">Bug #1662</a>.
+	</li>
+	<li>
+	Support MinGW compilation under Linux.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1077/">Feature #1077.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite351.zip?download">Release 3.5.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 September 2014.
+	</li>
+	<li>
+	BibTeX lexer added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1071/">Feature #1071.</a>
+	</li>
+	<li>
+	SQL lexer supports the q-quote operator as SCE_SQL_QOPERATOR(24).
+	</li>
+	<li>
+	VHDL lexer supports block comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1527/">Bug #1527</a>.
+	</li>
+	<li>
+	VHDL folder fixes case where "component" used before name.
+	<a href="https://sourceforge.net/p/scintilla/bugs/613/">Bug #613</a>.
+	</li>
+	<li>
+	Restore fractional pixel tab positioning which was truncated to whole pixels in 3.5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1652/">Bug #1652</a>.
+	</li>
+	<li>
+	Allow choice between windowed and inline IME on some platforms.
+	</li>
+	<li>
+	On GTK+ cache autocomplete window to avoid platform bug where windows
+	were sometimes lost.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1649/">Bug #1649</a>.
+	</li>
+	<li>
+	On GTK+ size autocomplete window more accurately.
+	</li>
+	<li>
+	On Windows only unregister windows classes registered.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1639/">Bug #1639</a>.
+	</li>
+	<li>
+	On Windows another DirectWrite mode SC_TECHNOLOGY_DIRECTWRITERETAIN added
+	which may avoid drawing failures on some cards and drivers.
+	This feature is provisional and may be changed or removed if a better solution is found.
+	</li>
+	<li>
+	On Windows support the Visual Studio 2010+ clipboard format that indicates a line copy.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1636/">Bug #1636</a>.
+	</li>
+	<li>
+	SciTE session files remember the scroll position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite350.zip?download">Release 3.5.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 August 2014.
+	</li>
+	<li>
+	Text may share space vertically so that extreme ascenders and descenders are
+	not cut off by calling SCI_SETPHASESDRAW(SC_PHASES_MULTIPLE).
+	</li>
+	<li>
+	Separate timers are used for each type of periodic activity and they are turned on and off
+	as required. This saves power as there are fewer wake ups.
+	On recent releases of OS X Cocoa and Windows, coalescing timers are used to further
+	save power.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1086/">Bug #1086</a>.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1532/">Bug #1532</a>.
+	</li>
+	<li>
+	Explicit tab stops may be set for each line.
+	</li>
+	<li>
+	On Windows and GTK+, when using Korean input methods, IME composition is moved from a
+	separate window into the Scintilla window.
+	</li>
+	<li>
+	SciTE adds a "Clean" command to the "Tools" menu which is meant to be bound to a command like
+	"make clean".
+	</li>
+	<li>
+	Lexer added for Windows registry files.
+	</li>
+	<li>
+	HTML lexer fixes a crash with SGML after a Mako comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1622/">Bug #1622</a>.
+	</li>
+	<li>
+	KiXtart lexer adds a block comment state.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1053/">Feature #1053.</a>
+	</li>
+	<li>
+	Matlab lexer fixes transpose operations like "X{1}'".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1629/">Bug #1629</a>.
+	</li>
+	<li>
+	Ruby lexer fixes bugs with the syntax of symbols including allowing a symbol to end with '?'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1627/">Bug #1627</a>.
+	</li>
+	<li>
+	Rust lexer supports byte string literals, naked CR can be escaped in strings, and files starting with
+	"#![" are not treated as starting with a hashbang comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1063/">Feature #1063.</a>
+	</li>
+	<li>
+	Bug fixed where style data was stale when deleting a rectangular selection.
+	</li>
+	<li>
+	Bug fixed where annotations disappeared when SCI_CLEARDOCUMENTSTYLE called.
+	</li>
+	<li>
+	Bug fixed where selection not redrawn after SCI_DELWORDRIGHT.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1633/">Bug #1633</a>.
+	</li>
+	<li>
+	Change the function prototypes to be complete for functions exported as "C".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1618/">Bug #1618</a>.
+	</li>
+	<li>
+	Fix a memory leak on GTK+ with autocompletion lists.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1638/">Bug #1638</a>.
+	</li>
+	<li>
+	On GTK+, use the full character width for the overstrike caret for multibyte characters.
+	</li>
+	<li>
+	On Qt, set list icon size to largest icon. Add padding on OS X.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1634/">Bug #1634</a>.
+	</li>
+	<li>
+	On Qt, fix building on FreeBSD 9.2.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1635/">Bug #1635</a>.
+	</li>
+	<li>
+	On Qt, add a get_character method on the document.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1064/">Feature #1064.</a>
+	</li>
+	<li>
+	On Qt, add SCI_* for methods to ScintillaConstants.py.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1065/">Feature #1065.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed with Insert Abbreviation command.
+	</li>
+	<li>
+	For SciTE with read-only files and are.you.sure=0 reenable choice to save to another
+	location when using Save or Close commands.
+	</li>
+	<li>
+	Fix SciTE bug where toggle bookmark did not work after multiple lines with bookmarks merged.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1617/">Bug #1617</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite344.zip?download">Release 3.4.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 July 2014.
+	</li>
+	<li>
+	Style byte indicators removed. They were deprecated in 2007. Standard indicators should be used instead.
+	Some elements used by lexers no longer take number of bits or mask arguments so lexers may need to be
+	updated for LexAccessor::StartAt,  LexAccessor::SetFlags (removed),  LexerModule::LexerModule.
+	</li>
+	<li>
+	When multiple selections are active, autocompletion text may be inserted at each selection with new
+	SCI_AUTOCSETMULTI method.
+	</li>
+	<li>
+	C++ lexer fixes crash for "#define x(".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1614/">Bug #1614</a>.
+	</li>
+	<li>
+	C++ lexer fixes raw string recognition so that R"xxx(blah)xxx" is styled as SCE_C_STRINGRAW.
+	</li>
+	<li>
+	The Postscript lexer no longer marks token edges with indicators as this used style byte indicators.
+	</li>
+	<li>
+	The Scriptol lexer no longer displays indicators for poor indentation as this used style byte indicators.
+	</li>
+	<li>
+	TCL lexer fixes names of keyword sets.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1615/">Bug #1615</a>.
+	</li>
+	<li>
+	Shell lexer fixes fold matching problem caused by "&lt;&lt;&lt;".
+	<a href="https://sourceforge.net/p/scintilla/bugs/1605/">Bug #1605</a>.
+	</li>
+	<li>
+	Fix bug where indicators were not removed when fold highlighting on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1604/">Bug #1604</a>.
+	</li>
+	<li>
+	Fix bug on Cocoa where emoji were treated as being zero width.
+	</li>
+	<li>
+	Fix crash on GTK+ with Ubuntu 12.04 and overlay scroll bars.
+	</li>
+	<li>
+	Avoid creating a Cairo context when measuring text on GTK+ as future versions of GTK+
+	may prohibit calling gdk_cairo_create except inside drawing handlers. This prohibition may
+	be required on Wayland.
+	</li>
+	<li>
+	On Cocoa, the registerNotifyCallback method is now marked as deprecated so client code that
+	uses it will display an error message.
+	Client code should use the delegate mechanism or subclassing instead.
+	The method will be removed in the next version.
+	</li>
+	<li>
+	On Cocoa, package Scintilla more in compliance with platform conventions.
+	Only publish public headers in the framework headers directory.
+	Only define the Scintilla namespace in Scintilla.h when compiling as C++.
+	Use the Cocoa NS_ENUM and NS_OPTIONS macros for exposed enumerations.
+	Hide internal methods from public headers.
+	These changes are aimed towards publishing Scintilla as a module which will allow it to
+	be used from the Swift programming language, although more changes will be needed here.
+	</li>
+	<li>
+	Fix crash in SciTE when stream comment performed at line end.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1610/">Bug #1610</a>.
+	</li>
+	<li>
+	For SciTE on Windows, display error message when common dialogs fail.
+	<a href="https://sourceforge.net/p/scintilla/bugs/156/">Bug #156</a>.
+	</li>
+	<li>
+	For SciTE on GTK+ fix bug with initialization of toggle buttons in find and replace strips.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1612/">Bug #1612</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite343.zip?download">Release 3.4.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 May 2014.
+	</li>
+	<li>
+	Fix hangs and crashes in DLL at shutdown on Windows when using Direct2D.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite342.zip?download">Release 3.4.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2014.
+	</li>
+	<li>
+	Insertions can be filtered or modified by calling SCI_CHANGEINSERTION inside a handler for
+	SC_MOD_INSERTCHECK.
+	</li>
+	<li>
+	DMIS lexer added. DMIS is a language for coordinate measuring machines.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1049/">Feature #1049.</a>
+	</li>
+	<li>
+	Line state may be displayed in the line number margin to aid in debugging lexing and folding with
+	SC_FOLDFLAG_LINESTATE (128).
+	</li>
+	<li>
+	C++ lexer understands more preprocessor statements. #if defined SYMBOL is understood.
+	Some macros with arguments can be understood and these may be predefined in keyword set 4
+	(keywords5 for SciTE)
+	with syntax similar to CHECKVERSION(x)=(x&lt;3).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1051/">Feature #1051.</a>
+	</li>
+	<li>
+	C++ lexer can highlight task marker keywords in comments as SCE_C_TASKMARKER.
+	</li>
+	<li>
+	C++ lexer can optionally highlight escape sequences in strings as SCE_C_ESCAPESEQUENCE.
+	</li>
+	<li>
+	C++ lexer supports Go back quoted raw string literals with lexer.cpp.backquoted.strings option.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1047/">Feature #1047.</a>
+	</li>
+	<li>
+	SciTE performs word and search match highlighting as an idle task to improve interactivity
+	and allow use of these features on large files.
+	</li>
+	<li>
+	Bug fixed on Cocoa where previous caret lines were visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1593/">Bug #1593</a>.
+	</li>
+	<li>
+	Bug fixed where caret remained invisible when period set to 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1592/">Bug #1592</a>.
+	</li>
+	<li>
+	Fixed display flashing when scrolling with GTK+ 3.10.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1567/">Bug #1567</a>.
+	</li>
+	<li>
+	Fixed calls and constants deprecated in GTK+ 3.10.
+	</li>
+	<li>
+	Fixed bug on Windows where WM_GETTEXT did not provide data in UTF-16 for Unicode window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/685/">Bug #685</a>.
+	</li>
+	<li>
+	For SciTE, protect access to variables used by threads with a mutex to prevent data races.
+	</li>
+	<li>
+	For SciTE on GTK+ fix thread object leaks.
+	Display the version of GTK+ compiled against in the about box.
+	</li>
+	<li>
+	For SciTE on GTK+ 3.10, fix the size of the tab bar's content and use
+	freedesktop.org standard icon names where possible.
+	</li>
+	<li>
+	For SciTE on Windows, fix bug where invoking help resubmitted the
+	running program.
+	<a href="https://sourceforge.net/p/scintilla/bugs/272/">Bug #272</a>.
+	</li>
+	<li>
+	SciTE's highlight current word feature no longer matches the selection when it contains space.
+	</li>
+	<li>
+	For building SciTE in Visual C++, the win\SciTE.vcxproj project file should be used.
+	The boundscheck directory and its project and solution files have been removed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite341.zip?download">Release 3.4.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 April 2014.
+	</li>
+	<li>
+	Display Unicode line ends as [LS], [PS], and [NEL] blobs.
+	</li>
+	<li>
+	Bug fixed where cursor down failed on wrapped lines.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1585/">Bug #1585</a>.
+	</li>
+	<li>
+	Caret positioning changed a little to appear inside characters less often by
+	rounding the caret position to the pixel grid instead of truncating.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1588/">Bug #1588</a>.
+	</li>
+	<li>
+	Bug fixed where automatic indentation wrong when caret in virtual space.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1586/">Bug #1586</a>.
+	</li>
+	<li>
+	Bug fixed on Windows where WM_LBUTTONDBLCLK was no longer sent to window.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1587/">Bug #1587</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE on Windows XP where black stripes appeared inside the find and
+	replace strips.
+	</li>
+	<li>
+	Crash fixed in SciTE with recursive properties files.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1507/">Bug #1507</a>.
+	</li>
+	<li>
+	Bug fixed with SciTE where Ctrl+E before an unmatched end brace jumps to file start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/315/">Bug #315</a>.
+	</li>
+	<li>
+	Fixed scrolling on Cocoa to avoid display glitches and be smoother.
+	</li>
+	<li>
+	Fixed crash on Cocoa when character composition used when autocompletion list active.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite340.zip?download">Release 3.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 March 2014.
+	</li>
+	<li>
+	The Unicode line ends and substyles features added as provisional in 3.2.5 are now finalized.
+	There are now no provisional features.
+	</li>
+	<li>
+	Added wrap mode SC_WRAP_WHITESPACE which only wraps on whitespace, not on style changes.
+	</li>
+	<li>
+	SciTE find and replace strips can perform incremental searching and temporary highlighting of all
+	matches with the find.strip.incremental, replace.strip.incremental, and find.indicator.incremental settings.
+	</li>
+	<li>
+	SciTE default settings changed to use strips for find and replace and to draw with Direct2D and
+	DirectWrite on Windows.
+	</li>
+	<li>
+	SciTE on Windows scales image buttons on the find and replace strips to match the current system scale factor.
+	</li>
+	<li>
+	Additional assembler lexer variant As(SCLEX_AS) for Unix assembly code which uses '#' for comments and
+	';' to separate statements.
+	</li>
+	<li>
+	Fix Coffeescript lexer for keyword style extending past end of word.
+	Also fixes styling 0...myArray.length all as a number.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1583/">Bug #1583</a>.
+	</li>
+	<li>
+	Fix crashes and other bugs in Fortran folder by removing folding of do-label constructs.
+	</li>
+	<li>
+	Deleting a whole line deletes the annotations on that line instead of the annotations on the next line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1577/">Bug #1577</a>.
+	</li>
+	<li>
+	Changed position of tall calltips to prefer lower half of screen to cut off end instead of start.
+	</li>
+	<li>
+	Fix Qt bug where double click treated as triple click.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
+	</li>
+	<li>
+	On Qt, selecting an item in an autocompletion list that is not currently visible positions it at the top.
+	</li>
+	<li>
+	Fix bug on Windows when resizing autocompletion list with only short strings caused the list to move.
+	</li>
+	<li>
+	On Cocoa reduce scrollable height by one line to fix bugs with moving caret
+	up or down.
+	</li>
+	<li>
+	On Cocoa fix calltips which did not appear when they were created in an off-screen position.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite339.zip?download">Release 3.3.9</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 January 2014.
+	</li>
+	<li>
+	Fix 3.3.8 bug where external lexers became inaccessible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1574/">Bug #1574</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite338.zip?download">Release 3.3.8</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2014.
+	</li>
+	<li>
+	DropSelectionN API added to drop a selection from a multiple selection.
+	</li>
+	<li>
+	CallTipSetPosStart API added to change the position at which backspacing removes the calltip.
+	</li>
+	<li>
+	SC_MARK_BOOKMARK marker symbol added which looks like bookmark ribbons used in
+	book reading applications.
+	</li>
+	<li>
+	Basic lexer highlights hex, octal, and binary numbers in FreeBASIC which use the prefixes
+	&amp;h, &amp;o and &amp;b respectively.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1041/">Feature #1041.</a>
+	</li>
+	<li>
+	C++ lexer fixes bug where keyword followed immediately by quoted string continued
+	keyword style.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1564/">Bug #1564</a>.
+	</li>
+	<li>
+	Matlab lexer treats '!' differently for Matlab and Octave languages.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1571/">Bug #1571</a>.
+	</li>
+	<li>
+	Rust lexer improved with nested comments, more compliant doc-comment detection,
+	octal literals, NUL characters treated as valid, and highlighting of raw string literals and float literals fixed.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1038/">Feature #1038.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1570/">Bug #1570</a>.
+	</li>
+	<li>
+	On Qt expose the EOLMode on the document object.
+	</li>
+	<li>
+	Fix hotspot clicking where area was off by half a character width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1562/">Bug #1562</a>.
+	</li>
+	<li>
+	Tweaked scroll positioning by either 2 pixels or 1 pixel when caret is at left or right of view
+	to ensure caret is inside visible area.
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for Shift+Tab inside text.
+	</li>
+	<li>
+	On Windows update the system caret position when scrolling to help screen readers
+	see the scroll quickly.
+	</li>
+	<li>
+	On Cocoa, GTK+, and Windows/Direct2D draw circles more accurately so that
+	circular folding margin markers appear circular, of consistent size, and centred.
+	Make SC_MARK_ARROWS drawing more even.
+	Fix corners of SC_MARK_ROUNDRECT with Direct2D to be similar to other platforms.
+	</li>
+	<li>
+	SciTE uses a bookmark ribbon symbol for bookmarks as it scales better to higher resolutions
+	than the previous blue gem bitmap.
+	</li>
+	<li>
+	SciTE will change the width of margins while running when the margin.width and fold.margin.width
+	properties are changed.
+	</li>
+	<li>
+	SciTE on Windows can display a larger tool bar with the toolbar.large property.
+	</li>
+	<li>
+	SciTE displays a warning message when asked to open a directory.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1568/">Bug #1568</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 12 December 2013.
+	</li>
+	<li>
+	Lexer added for DMAP language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1026/">Feature #1026.</a>
+	</li>
+	<li>
+	Basic lexer supports multiline comments in FreeBASIC.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1023/">Feature #1023.</a>
+	</li>
+	<li>
+	Bash lexer allows '#' inside words..
+	<a href="https://sourceforge.net/p/scintilla/bugs/1553/">Bug #1553</a>.
+	</li>
+	<li>
+	C++ lexer recognizes C++11 user-defined literals and applies lexical class SCE_C_USERLITERAL.
+	</li>
+	<li>
+	C++ lexer allows single quote characters as digit separators in numeric literals like 123'456 as this is
+	included in C++14.
+	</li>
+	<li>
+	C++ lexer fixes bug with #include statements without " or &gt; terminating filename.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>.
+	</li>
+	<li>
+	C++ lexer fixes split of Doxygen keywords @code{.fileExtension} and @param[in,out].
+	<a href="https://sourceforge.net/p/scintilla/bugs/1551/">Bug #1551</a>.
+	</li>
+	<li>
+	C++ lexer styles Doxygen keywords at end of document.
+	</li>
+	<li>
+	Cmake lexer fixes bug with empty comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1550/">Bug #1550</a>.
+	</li>
+	<li>
+	Fortran folder improved. Treats "else" as fold header.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/962/">Feature #962.</a>
+	</li>
+	<li>
+	Fix bug with adjacent instances of the same indicator with different values where only the first was drawn.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1560/">Bug #1560</a>.
+	</li>
+	<li>
+	For DirectWrite, use the GDI ClearType gamma value for SC_EFF_QUALITY_LCD_OPTIMIZED as
+	this results in text that is similar in colour intensity to GDI.
+	For the duller default DirectWrite ClearType text appearance, use SC_EFF_QUALITY_DEFAULT.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/887/">Feature #887.</a>
+	</li>
+	<li>
+	Fix another problem with drawing on Windows with Direct2D when returning from lock screen.
+	The whole window is redrawn as just redrawing the initially required area left other areas black.
+	</li>
+	<li>
+	When scroll width is tracked, take width of annotation lines into account.
+	</li>
+	<li>
+	For Cocoa on OS X 10.9, responsive scrolling is supported.
+	</li>
+	<li>
+	On Cocoa, apply font quality setting to line numbers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1544/">Bug #1544</a>.
+	</li>
+	<li>
+	On Cocoa, clicking in margin now sets focus.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1542/">Bug #1542</a>.
+	</li>
+	<li>
+	On Cocoa, correct cursor displayed in margin after showing dialog.
+	</li>
+	<li>
+	On Cocoa, multipaste mode now works.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>.
+	</li>
+	<li>
+	On GTK+, chain up to superclass finalize so that all finalization is performed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1549/">Bug #1549</a>.
+	</li>
+	<li>
+	On GTK+, fix horizontal scroll bar range to not be double the needed width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1546/">Bug #1546</a>.
+	</li>
+	<li>
+	On OS X GTK+, report control key as SCI_META for mouse down events.
+	</li>
+	<li>
+	On Qt, bug fixed with drawing of scrollbars, where previous contents were not drawn over with some
+	themes.
+	</li>
+	<li>
+	On Qt, bug fixed with finding monitor rectangle which could lead to autocomplete showing at wrong location.
+	</li>
+	<li>
+	SciTE fix for multiple message boxes when failing to save a file with save.on.deactivate.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1540/">Bug #1540</a>.
+	</li>
+	<li>
+	SciTE on GTK+ fixes SIGCHLD handling so that Lua scripts can determine the exit status of processes
+	they start.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1557/">Bug #1557</a>.
+	</li>
+	<li>
+	SciTE on Windows XP fixes bad display of find and replace values when using strips.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 October 2013.
+	</li>
+	<li>
+	Added functions to help convert between substyles and base styles and between secondary and primary styles.
+	SCI_GETSTYLEFROMSUBSTYLE finds the base style of substyles.
+	Can be used to treat all substyles of a style equivalent to that style.
+	SCI_GETPRIMARYSTYLEFROMSTYLE finds the primary style of secondary styles.
+	StyleFromSubStyle and PrimaryStyleFromStyle methods were added to ILexerWithSubStyles so each lexer can implement these.
+	</li>
+	<li>
+	Lexer added for Rust language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1024/">Feature #1024.</a>
+	</li>
+	<li>
+	Avoid false matches in errorlist lexer which is used for the SciTE output pane
+	by stricter checking of ctags lines.
+	</li>
+	<li>
+	Perl lexer fixes bugs with multi-byte characters, including in HEREDOCs and PODs.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1528/">Bug #1528</a>.
+	</li>
+	<li>
+	SQL folder folds 'create view' statements.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1020/">Feature #1020.</a>
+	</li>
+	<li>
+	Visual Prolog lexer updated with better support for string literals and Unicode.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1025/">Feature #1025.</a>
+	</li>
+	<li>
+	For SCI_SETIDENTIFIERS, \t, \r, and \n are allowed as well as space between identifiers.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1521/">Bug #1521</a>.
+	</li>
+	<li>
+	Gaining and losing focus is now reported as a notification with the code set to SCN_FOCUSIN
+	or SCN_FOCUSOUT.
+	This allows clients to uniformly use notifications instead of commands.
+	Since there is no longer a need for commands they will be deprecated in a future version.
+	Clients should switch any code that currently uses SCEN_SETFOCUS or SCEN_KILLFOCUS.
+	</li>
+	<li>
+	On Cocoa, clients should use the delegate mechanism or subclass ScintillaView in preference
+	to registerNotifyCallback: which will be deprecated in the future.
+	</li>
+	<li>
+	On Cocoa, the ScintillaView.h header hides internal implementation details from Platform.h and ScintillaCocoa.h.
+	InnerView was renamed to SCIContentView and MarginView was renamed to SCIMarginView.
+	dealloc removed from @interface.
+	</li>
+	<li>
+	On Cocoa, clients may customize SCIContentView by subclassing both SCIContentView and ScintillaView
+	and implementing the contentViewClass class method on the ScintillaView subclass to return the class of
+	the SCIContentView subclass.
+	</li>
+	<li>
+	On Cocoa, fixed appearance of alpha rectangles to use specified alpha and colour for outline as well as corner size.
+	This makes INDIC_STRAIGHTBOX and INDIC_ROUNDBOX look correct.
+	</li>
+	<li>
+	On Cocoa, memory leak fixed for MarginView.
+	</li>
+	<li>
+	On Cocoa, make drag and drop work when destination view is empty.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1534/">Bug #1534</a>.
+	</li>
+	<li>
+	On Cocoa, drag image fixed when view scrolled.
+	</li>
+	<li>
+	On Cocoa, SCI_POSITIONFROMPOINTCLOSE fixed when view scrolled.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1021/">Feature #1021.</a>
+	</li>
+	<li>
+	On Cocoa, don't send selection change notification when scrolling.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1522/">Bug #1522</a>.
+	</li>
+	<li>
+	On Qt, turn off idle events on destruction to prevent repeatedly calling idle.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit changed to use signed first parameter.
+	</li>
+	<li>
+	Compilation errors fixed on Windows and GTK+ with SCI_NAMESPACE.
+	</li>
+	<li>
+	On Windows, building with gcc will check if Direct2D headers are available and enable Direct2D if they are.
+	</li>
+	<li>
+	Avoid attempts to redraw empty areas when lexing beyond the currently visible lines.
+	</li>
+	<li>
+	Control more attributes of indicators in SciTE with find.mark.indicator and highlight.current.word.indicator
+	properties.
+	</li>
+	<li>
+	Fix SciTE bug with buffers becoming read-only.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1525/">Bug #1525</a>.
+	</li>
+	<li>
+	Fix linking SciTE on non-Linux Unix systems with GNU toolchain by linking to libdl.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1523/">Bug #1523</a>.
+	</li>
+	<li>
+	On Windows, SciTE's Incremental Search displays match failures by changing the background colour
+	instead of not adding the character that caused failure.
+	</li>
+	<li>
+	Fix SciTE on GTK+ 3.x incremental search to change foreground colour when no match as
+	changing background colour is difficult.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite335.zip?download">Release 3.3.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2013.
+	</li>
+	<li>
+	Characters may be represented by strings.
+	In Unicode mode C1 control characters are represented by their mnemonics.
+	</li>
+	<li>
+	Added SCI_POSITIONRELATIVE to optimize navigation by character.
+	</li>
+	<li>
+	Option to allow mouse selection to switch to rectangular by pressing Alt after start of gesture.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Lexer added for KVIrc script.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1008/">Feature #1008.</a>
+	</li>
+	<li>
+	Bash lexer fixed quoted HereDoc delimiters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1500/">Bug #1500</a>.
+	</li>
+	<li>
+	MS SQL lexer fixed ';' to appear as an operator.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1509/">Bug #1509</a>.
+	</li>
+	<li>
+	Structured Text lexer fixed styling of enumeration members.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1508/">Bug #1508</a>.
+	</li>
+	<li>
+	Fixed bug with horizontal caret position when margin changed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1512/">Bug #1512</a>.
+	</li>
+	<li>
+	Fixed bug on Cocoa where coordinates were relative to text subview instead of whole view.
+	</li>
+	<li>
+	Ensure selection redrawn correctly in two cases.
+	When switching from stream to rectangular selection with Alt+Shift+Up.
+	When reducing the range of an additional selection by moving mouse up.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1007/">Feature #1007.</a>
+	</li>
+	<li>
+	Copy and paste of rectangular selections compatible with Borland Delphi IDE on Windows.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1002/">Feature #1002.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1513/">Bug #1513</a>.
+	</li>
+	<li>
+	Initialize extended styles to the default style.
+	</li>
+	<li>
+	On Windows, fix painting on an explicit HDC when first paint attempt abandoned.
+	</li>
+	<li>
+	Qt bindings in ScintillaEdit made to work on 64-bit Unix systems.
+	</li>
+	<li>
+	Easier access to printing on Qt with formatRange method.
+	</li>
+	<li>
+	Fixed SciTE failure to save initial buffer in single buffer mode.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339</a>.
+	</li>
+	<li>
+	Fixed compilation problem with Visual C++ in non-English locales.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1506/">Bug #1506</a>.
+	</li>
+	<li>
+	Disable Direct2D when compiling with MinGW gcc on Windows because of changes in the recent MinGW release.
+	</li>
+	<li>
+	SciTE crash fixed for negative line.margin.width.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1504/">Bug #1504</a>.
+	</li>
+	<li>
+	SciTE fix for infinite dialog boxes when failing to automatically save a file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1503/">Bug #1503</a>.
+	</li>
+	<li>
+	SciTE settings buffered.draw, two.phase.draw, and technology are applied to the
+	output pane as well as the edit pane.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite334.zip?download">Release 3.3.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 19 July 2013.
+	</li>
+	<li>
+	Handling of UTF-8 and DBCS text in lexers improved with methods ForwardBytes and
+	GetRelativeCharacter added to StyleContext.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	For Unicode text, case-insensitive searching and making text upper or lower case is now
+	compliant with Unicode standards on all platforms and is much faster for non-ASCII characters.
+	</li>
+	<li>
+	A CategoriseCharacter function was added to return the Unicode general category of a character
+	which can be useful in lexers.
+	</li>
+	<li>
+	On Cocoa, the LCD Optimized font quality level turns font smoothing on.
+	</li>
+	<li>
+	SciTE 'immediate' subsystem added to allow scripts that work while tools are executed.
+	</li>
+	<li>
+	Font quality exposed in SciTE as font.quality setting.
+	</li>
+	<li>
+	On Cocoa, message:... methods simplify direct access to Scintilla and avoid call layers..
+	</li>
+	<li>
+	A68K lexer updated.
+	</li>
+	<li>
+	CoffeeScript lexer fixes a bug with comment blocks.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1495/">Bug #1495</a>
+	</li>
+	<li>
+	ECL lexer regular expression code fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1491/">Bug #1491</a>.
+	</li>
+	<li>
+	errorlist lexer only recognizes Perl diagnostics when there is a filename between
+	"at" and "line". Had been triggering for MSVC errors containing "at line".
+	</li>
+	<li>
+	Haskell lexer fixed to avoid unnecessary full redraws.
+	Don't highlight CPP inside comments when styling.within.preprocessor is on.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459</a>.
+	</li>
+	<li>
+	Lua lexer fixes bug in labels with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Perl lexer fixes bug in string interpolation with UTF-8 text.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1483/">Bug #1483</a>.
+	</li>
+	<li>
+	Fixed bugs with case conversion when the result was longer or shorter than the original text.
+	Could access past end of string potentially crashing.
+	Selection now updated to result length.
+	</li>
+	<li>
+	Fixed bug where data being inserted and removed was not being reported in
+	notification messages. Bug was introduced in 3.3.2.
+	</li>
+	<li>
+	Word wrap bug fixed where the last line could be shown twice.
+	</li>
+	<li>
+	Word wrap bug fixed for lines wrapping too short on Windows and GTK+.
+	</li>
+	<li>
+	Word wrap performance improved.
+	</li>
+	<li>
+	Minor memory leak fixed.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1487/">Bug #1487</a>.
+	</li>
+	<li>
+	On Cocoa, fixed insertText: method which was broken when implementing a newer protocol.
+	</li>
+	<li>
+	On Cocoa, fixed a crash when performing string folding for bytes that do not represent a character
+	in the current encoding.
+	</li>
+	<li>
+	On Qt, fixed layout problem when QApplication construction delayed.
+	</li>
+	<li>
+	On Qt, find_text reports failure with -1 as first element of return value.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where a tool command could be performed using the keyboard while one was
+	already running leading to confusion and crashes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1486/">Bug #1486</a>.
+	</li>
+	<li>
+	Fixed SciTE bug in Copy as RTF which was limited to first 32 styles.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1011/">Bug #1011</a>.
+	</li>
+	<li>
+	Fixed SciTE on Windows user strip height when the system text scaling factor is 125% or 150%.
+	</li>
+	<li>
+	Compile time checks for Digital Mars C++ removed.
+	</li>
+	<li>
+	Visual C++ 2013 supported.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1492/">Bug #1492</a>.
+	</li>
+	<li>
+	Python scripts used for building and maintenance improved and moved into scripts directory.
+	</li>
+	<li>
+	Testing scripts now work on Linux using Qt and PySide.
+	</li>
+	<li>
+	Tk platform defined.
+	Implementation for Tk will be available separately from main Scintilla distribution.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite333.zip?download">Release 3.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 June 2013.
+	</li>
+	<li>
+	Lexer and folder added for Structured Text language.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/959/">Feature #959.</a>
+	</li>
+	<li>
+	Out of bounds access fixed for GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1480/">Bug #1480</a>.
+	</li>
+	<li>
+	Crash fixed for GTK+ on Windows paste.
+	</li>
+	<li>
+	Bug fixed with incorrect event copying on GTK+ 3.x.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1481/">Bug #1481</a>.
+	</li>
+	<li>
+	Bug fixed with right to left locales, like Hebrew, on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1477/">Bug #1477</a>.
+	</li>
+	<li>
+	Bug fixed with undo grouping of tab and backtab commands.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1478/">Bug #1478</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite332.zip?download">Release 3.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 May 2013.
+	</li>
+	<li>
+	Basic implementations of common folding methods added to Scintilla to make it
+	easier for containers to implement folding.
+	</li>
+	<li>
+	Add indicator INDIC_COMPOSITIONTHICK, a thick low underline, to mimic an
+	appearance used for Asian language input composition.
+	</li>
+	<li>
+	On Cocoa, implement font quality setting.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/988/">Feature #988.</a>
+	</li>
+	<li>
+	On Cocoa, implement automatic enabling of commands and added clear command.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/987/">Feature #987.</a>
+	</li>
+	<li>
+	C++ lexer adds style for preprocessor doc comment.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/990/">Feature #990.</a>
+	</li>
+	<li>
+	Haskell lexer and folder improved. Separate mode for literate Haskell "literatehaskell" SCLEX_LITERATEHASKELL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459 </a>.
+	</li>
+	<li>
+	LaTeX lexer bug fixed for Unicode character following '\'.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1468/">Bug #1468 </a>.
+	</li>
+	<li>
+	PowerShell lexer recognizes here strings and doccomment keywords.
+	#region folding added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/985/">Feature #985.</a>
+	</li>
+	<li>
+	Fix multi-typing when two carets are located in virtual space on one line so that spaces
+	are preserved.
+	</li>
+	<li>
+	Fixes to input composition on Cocoa and implementation of accented character input through
+	press and hold. Set selection correctly so that changes to pieces of composition text are easier to perform.
+	Restore undo collection after a sequence of composition actions.
+	Composition popups appear near input.
+	</li>
+	<li>
+	Fix lexer problem where no line end was seen at end of document.
+	</li>
+	<li>
+	Fix crash on Cocoa when view deallocated.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1466/">Bug #1466</a>.
+	</li>
+	<li>
+	Fix Qt window positioning to not assume the top right of a monitor is at 0, 0.
+	</li>
+	<li>
+	Fix Qt to not track mouse when widget is hidden.
+	</li>
+	<li>
+	Qt now supports Qt 5.0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1448/">Bug #1448</a>.
+	</li>
+	<li>
+	Fix drawing on Windows with Direct2D when returning from lock screen.
+	The render target had to be recreated and an area would be black since the drawing was not retried.
+	</li>
+	<li>
+	Fix display of DBCS documents on Windows Direct2D/DirectWrite with default character set.
+	</li>
+	<li>
+	For SciTE on Windows, fixed most-recently-used menu when files opened through check.if.already.opened.
+	</li>
+	<li>
+	In SciTE, do not call OnSave twice when files saved asynchronously.
+	</li>
+	<li>
+	Scintilla no longer builds with Visual C++ 6.0.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite331.zip?download">Release 3.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 11 April 2013.
+	</li>
+	<li>
+	Autocompletion lists can now appear in priority order or be sorted by Scintilla.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/981/">Feature #981.</a>
+	</li>
+	<li>
+	Most lexers now lex an extra NUL byte at the end of the
+	document which makes it more likely they will classify keywords at document end correctly.
+	<a href="https://sourceforge.net/p/scintilla/bugs/574/">Bug #574</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/588/">Bug #588.</a>
+	</li>
+	<li>
+	Haskell lexer improved in several ways.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1459/">Bug #1459.</a>
+	</li>
+	<li>
+	Matlab/Octave lexer recognizes block comments and ... comments.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1414/">Bug #1414.</a>
+	</li>
+	<li>
+	Ruby lexer crash fixed with keyword at start of document.
+	</li>
+	<li>
+	The PLAT_NCURSES platform now called PLAT_CURSES as may work on other implementations.
+	</li>
+	<li>
+	Bug on Cocoa fixed where input composition with multiple selection or virtual space selection
+	could make undo stop working.
+	</li>
+	<li>
+	Direct2D/DirectWrite mode on Windows now displays documents in non-Latin1 8-bit encodings correctly.
+	</li>
+	<li>
+	Character positioning corrected in Direct2D/DirectWrite mode on Windows to avoid text moving and cutting off
+	lower parts of characters.
+	</li>
+	<li>
+	Position of calltip and autocompletion lists fixed on Cocoa.
+	</li>
+	<li>
+	While regular expression search in DBCS text is still not working, matching partial characters is now avoided
+	by moving end of match to end of character.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite330.zip?download">Release 3.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 March 2013.
+	</li>
+	<li>
+	Overlay scrollers and kinetic scrolling implemented on Cocoa.
+	</li>
+	<li>
+	To improve display smoothness, styling and UI Update notifications will, when possible, be performed in
+	a high-priority idle task on Cocoa instead of during painting.
+	Performing these jobs inside painting can cause paints to be abandoned and a new paint scheduled.
+	On GTK+, the high-priority idle task is used in more cases.
+	</li>
+	<li>
+	SCI_SCROLLRANGE added to scroll the view to display a range of text.
+	If the whole range can not be displayed, priority is given to one end.
+	</li>
+	<li>
+	C++ lexer no longer recognizes raw (R"") strings when the first character after "
+	is invalid.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1454/">Bug #1454.</a>
+	</li>
+	<li>
+	HTML lexer recognizes JavaScript RegEx literals in more contexts.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1412/">Bug #1412.</a>
+	</li>
+	<li>
+	Fixed automatic display of folded text when return pressed at end of fold header and
+	first folded line was blank.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1455/">Bug #1455.</a>
+	</li>
+	<li>
+	SCI_VISIBLEFROMDOCLINE fixed to never return a line beyond the document end.
+	</li>
+	<li>
+	SCI_LINESCROLL fixed for a negative column offset.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1450/">Bug #1450.</a>
+	</li>
+	<li>
+	On GTK+, fix tab markers so visible if indent markers are visible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1453/">Bug #1453.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite325.zip?download">Release 3.2.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 26 February 2013.
+	</li>
+	<li>
+	To allow cooperation between different uses of extended (beyond 255) styles they should be allocated
+	using SCI_ALLOCATEEXTENDEDSTYLES.
+	</li>
+	<li>
+	For Unicode documents, lexers that use StyleContext will retrieve whole characters
+	instead of bytes.
+	LexAccessor provides a LineEnd method which can be a more efficient way to
+	handle line ends and can enable Unicode line ends.
+	</li>
+	<li>
+	The C++ lexer understands the #undef directive when determining preprocessor definitions.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/978/">Feature #978.</a>
+	</li>
+	<li>
+	The errorlist lexer recognizes gcc include path diagnostics that appear before an error.
+	</li>
+	<li>
+	Folding implemented for GetText (PO)  translation language.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1437/">Bug #1437.</a>
+	</li>
+	<li>
+	HTML lexer does not interrupt comment style for processing instructions.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1447/">Bug #1447.</a>
+	</li>
+	<li>
+	Fix SciTE forgetting caret x-position when switching documents.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1442/">Bug #1442.</a>
+	</li>
+	<li>
+	Fixed bug where vertical scrollbar thumb appeared at beginning of document when
+	scrollbar shown.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1446/">Bug #1446.</a>
+	</li>
+	<li>
+	Fixed brace-highlighting bug on OS X 10.8 where matching brace is on a different line.
+	</li>
+	<li>
+	<a href="ScintillaDoc.html#ProvisionalMessages">Provisional features</a>
+	are new features that may change or be removed if they cause problems but should become
+	permanent if they work well.
+	For this release <a href="ScintillaDoc.html#SCI_GETLINEENDTYPESSUPPORTED">Unicode line ends</a> and
+	<a href="ScintillaDoc.html#Substyles">substyles</a>
+	are provisional features.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite324.zip?download">Release 3.2.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 17 January 2013.
+	</li>
+	<li>
+	Caret line highlight can optionally remain visible when window does not have focus.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/964/">Feature #964.</a>
+	</li>
+	<li>
+	Delegate mechanism for notifications added on Cocoa.
+	</li>
+	<li>
+	NUL characters in selection are copied to clipboard as spaces to avoid truncating
+	at the NUL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1289/">Bug #1289.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with showing inactive sections when preprocessor lines contain trailing comment.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1413/">Bug #1413.</a>
+	</li>
+	<li>
+	C++ lexer fixes problem with JavaScript regular expressions with '/' in character ranges.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1415/">Bug #1415.</a>
+	</li>
+	<li>
+	LaTeX folder added.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	LaTeX lexer improves styling of math environments.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/970/">Feature #970.</a>
+	</li>
+	<li>
+	MySQL lexer implements hidden commands.
+	</li>
+	<li>
+	Only produce a single undo step when autocompleting a single word.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1421/">Bug #1421.</a>
+	</li>
+	<li>
+	Fixed crash when printing lines longer than 8000 characters.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1430/">Bug #1430.</a>
+	</li>
+	<li>
+	Fixed problem in character movement extends selection mode where reversing
+	direction collapsed the selection.
+	</li>
+	<li>
+	Memory issues fixed on Cocoa, involving object ownership,
+	lifetime of timers, and images held by the info bar.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1436/">Bug #1436.</a>
+	</li>
+	<li>
+	Cocoa key binding for Alt+Delete changed to delete previous word to be more compatible with
+	platform standards.
+	</li>
+	<li>
+	Fixed crash on Cocoa with scrollbar when there is no scrolling possible.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1416/">Bug #1416.</a>
+	</li>
+	<li>
+	On Cocoa with retina display fixed positioning of autocompletion lists.
+	</li>
+	<li>
+	Fixed SciTE on Windows failure to run a batch file with a name containing a space by
+	quoting the path in the properties file.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1423/">Bug #1423.</a>
+	</li>
+	<li>
+	Fixed scaling bug when printing on GTK+.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1427/">Bug #1427.</a>
+	</li>
+	<li>
+	SciTE on GTK toolbar.detachable feature removed.
+	</li>
+	<li>
+	Fixed some background saving bugs in SciTE.
+	<a href="https://sourceforge.net/p/scintilla/bugs/1366/">Bug #1366.</a>
+	<a href="https://sourceforge.net/p/scintilla/bugs/1339/">Bug #1339.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite323.zip?download">Release 3.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 October 2012.
+	</li>
+	<li>
+	Improve speed when performing multiple searches.
+	</li>
+	<li>
+	SciTE adds definition of PLAT_UNIX for both PLAT_GTK and PLAT_MAC to allow consolidation of
+	settings valid on all Unix variants.
+	</li>
+	<li>
+	Signal autoCompleteCancelled added on Qt.
+	</li>
+	<li>
+	Bash lexer supports nested delimiter pairs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3569352&group_id=2439">Feature #3569352.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1515556&group_id=2439">Bug #1515556.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3008483&group_id=2439">Bug #3008483.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515392&group_id=2439">Bug #3515392.</a>
+	</li>
+	<li>
+	For C/C++, recognize exponent in floating point hexadecimal literals.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3576454&group_id=2439">Bug #3576454.</a>
+	</li>
+	<li>
+	For C #include statements, do not treat // in the path as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519260&group_id=2439">Bug #3519260.</a>
+	</li>
+	<li>
+	Lexer for GetText translations (PO) improved with additional styles and single instance limitation fixed.
+	</li>
+	<li>
+	Ruby for loop folding fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3240902&group_id=2439">Bug #3240902.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567391&group_id=2439">Bug #3567391.</a>
+	</li>
+	<li>
+	Ruby recognition of here-doc after class or instance variable fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567809&group_id=2439">Bug #3567809.</a>
+	</li>
+	<li>
+	SQL folding of loop and case fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3567905&group_id=2439">Bug #3567905.</a>
+	</li>
+	<li>
+	SQL folding of case with assignment fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3571820&group_id=2439">Bug #3571820.</a>
+	</li>
+	<li>
+	Fix hang when removing all characters from indicator at end of document.
+	</li>
+	<li>
+	Fix failure of \xhh in regular expression search for values greater than 0x79.
+	</li>
+	<li>
+	On Cocoa on OS X 10.8, fix inverted drawing of find indicator.
+	</li>
+	<li>
+	On Cocoa, fix double drawing when horizontal scroll range small and user swipes horizontally.
+	</li>
+	<li>
+	On Cocoa, remove incorrect setting of save point when reading information through 'string' and 'selectedString'.
+	</li>
+	<li>
+	On Cocoa, fix incorrect memory management of infoBar.
+	</li>
+	<li>
+	On GTK+ 3 Ubuntu, fix crash when drawing margin.
+	</li>
+	<li>
+	On ncurses, fix excessive spacing with italics line end.
+	</li>
+	<li>
+	On Windows, search for D2D1.DLL and DWRITE.DLL in system directory to avoid loading from earlier
+	in path where could be planted by malware.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite322.zip?download">Release 3.2.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 31 August 2012.
+	</li>
+	<li>
+	Retina display support for Cocoa. Text size fixed.
+	Scale factor for images implemented so they can be displayed in high definition.
+	</li>
+	<li>
+	Implement INDIC_SQUIGGLEPIXMAP as a faster version of INDIC_SQUIGGLE.
+	Avoid poor drawing at right of INDIC_SQUIGGLE.
+	Align INDIC_DOTBOX to pixel grid for full intensity.
+	</li>
+	<li>
+	Implement SCI_GETSELECTIONEMPTY API.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Added SCI_VCHOMEDISPLAY and SCI_VCHOMEDISPLAYEXTEND key commands.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3561433&group_id=2439">Feature #3561433.</a>
+	</li>
+	<li>
+	Allow specifying SciTE Find in Files directory with find.in.directory property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3558594&group_id=2439">Feature #3558594.</a>
+	</li>
+	<li>
+	Override SciTE global strip.trailing.spaces with strip.trailing.spaces by pattern files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3556320&group_id=2439">Feature #3556320.</a>
+	</li>
+	<li>
+	Fix long XML script tag handling in XML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3534190&group_id=2439">Bug #3534190.</a>
+	</li>
+	<li>
+	Fix rectangular selection range after backspace.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543097&group_id=2439">Bug #3543097.</a>
+	</li>
+	<li>
+	Send SCN_UPDATEUI with SC_UPDATE_SELECTION for backspace in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3543121&group_id=2439">Bug #3543121.</a>
+	</li>
+	<li>
+	Avoid problems when calltip highlight range is negative.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	On Cocoa, fix image drawing code so that image is not accessed after being freed
+	and is drawn in the correct location.
+	</li>
+	<li>
+	On Cocoa, limit horizontal touch scrolling to existing established width.
+	</li>
+	<li>
+	On Cocoa, decrease sensitivity of pinch-zoom.
+	</li>
+	<li>
+	Fix Cocoa drawing where style changes were not immediately visible.
+	</li>
+	<li>
+	Fix Cocoa memory leak due to reference cycle.
+	</li>
+	<li>
+	Fix Cocoa bug where notifications were sent after Scintilla was freed.
+	</li>
+	<li>
+	SciTE on OS X user shortcuts treats "Ctrl+D" as equivalent to "Ctrl+d".
+	</li>
+	<li>
+	On Windows, saving SciTE's Lua startup script causes it to run.
+	</li>
+	<li>
+	Limit time allowed to highlight current word in SciTE to 0.25 seconds to remain responsive.
+	</li>
+	<li>
+	Fixed SciTE read-only mode to stick with buffer.
+	</li>
+	<li>
+	For SciTE on Windows, enable Ctrl+Z, Ctrl+X, and Ctrl+C (Undo, Cut, and Copy) in the
+	editable fields of find and replace strips
+	</li>
+	<li>
+	Remove limit on logical line length in SciTE .properties files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3544312&group_id=2439">Bug #3544312.</a>
+	</li>
+	<li>
+	Improve performance of SciTE Save As command.
+	</li>
+	<li>
+	Fix SciTE crash with empty .properties files. Bug #3545938.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3555308&group_id=2439">Bug #3555308.</a>
+	</li>
+	<li>
+	Fix repeated letter in SciTE calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3545938&group_id=2439">Bug #3545938.</a>
+	</li>
+	<li>
+	Refine build time checking for Direct2D and DirectWrite.
+	</li>
+	<li>
+	Avoid potential build problems on Windows with MultiMon.h by explicitly checking for multi-monitor APIs.
+	</li>
+	<li>
+	Automatically disable themed drawing in SciTE when building on Windows 2000.
+	Reenable building for Windows NT 4 on NT 4 .
+	</li>
+	<li>
+	Added ncurses platform definitions. Implementation is maintained separately as
+	<a href="https://foicica.com/scinterm/">Scinterm</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite321.zip?download">Release 3.2.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 July 2012.
+	</li>
+	<li>
+	In Scintilla.iface, specify features as properties instead of functions where possible and fix some enumerations.
+	</li>
+	<li>
+	In SciTE Lua scripts, string properties in Scintilla API can be retrieved as well as set using property notation.
+	</li>
+	<li>
+	Added character class APIs: SCI_SETPUNCTUATIONCHARS, SCI_GETWORDCHARS, SCI_GETWHITESPACECHARS,
+	and SCI_GETPUNCTUATIONCHARS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3529805&group_id=2439">Feature #3529805.</a>
+	</li>
+	<li>
+	Less/Hss support added to CSS lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3532413&group_id=2439">Feature #3532413.</a>
+	</li>
+	<li>
+	C++ lexer style SCE_C_PREPROCESSORCOMMENT added for stream comments in preprocessor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487406&group_id=2439">Bug #3487406.</a>
+	</li>
+	<li>
+	Fix incorrect styling of inactive code in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3533036&group_id=2439">Bug #3533036.</a>
+	</li>
+	<li>
+	Fix incorrect styling by C++ lexer after empty lines in preprocessor style.
+	</li>
+	<li>
+	C++ lexer option "lexer.cpp.allow.dollars" fixed so can be turned off after being on.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3541461&group_id=2439">Bug #3541461.</a>
+	</li>
+	<li>
+	Fortran fixed format lexer fixed to style comments from column 73.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran folder folds CRITICAL .. END CRITICAL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540486&group_id=2439">Bug #3540486.</a>
+	</li>
+	<li>
+	Fortran lexer fixes styling after comment line ending with '&amp;'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3087226&group_id=2439">Bug #3087226.</a>
+	</li>
+	<li>
+	Fortran lexer styles preprocessor lines so they do not trigger incorrect folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2906275&group_id=2439">Bug #2906275.</a>
+	</li>
+	<li>
+	Fortran folder fixes folding of nested ifs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809176&group_id=2439">Bug #2809176.</a>
+	</li>
+	<li>
+	HTML folder fixes folding of CDATA when fold.html.preprocessor=0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3540491&group_id=2439">Bug #3540491.</a>
+	</li>
+	<li>
+	On Cocoa, fix autocompletion font lifetime issue and row height computation.
+	</li>
+	<li>
+	In 'choose single' mode, autocompletion will close an existing list if asked to display a single entry list.
+	</li>
+	<li>
+	Fixed SCI_MARKERDELETE to only delete one marker per call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3535806&group_id=2439">Bug #3535806.</a>
+	</li>
+	<li>
+	Properly position caret after undoing coalesced delete operations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3523326&group_id=2439">Bug #3523326.</a>
+	</li>
+	<li>
+	Ensure margin is redrawn when SCI_MARGINSETSTYLE called.
+	</li>
+	<li>
+	Fix clicks in first pixel of margins to send SCN_MARGINCLICK.
+	</li>
+	<li>
+	Fix infinite loop when drawing block caret for a zero width space character at document start.
+	</li>
+	<li>
+	Crash fixed for deleting negative range.
+	</li>
+	<li>
+	For characters that overlap the beginning of their space such as italics descenders and bold serifs, allow start
+	of text to draw 1 pixel into margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=699587&group_id=2439">Bug #699587.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537799&group_id=2439">Bug #3537799.</a>
+	</li>
+	<li>
+	Fixed problems compiling Scintilla for Qt with GCC 4.7.1 x64.
+	</li>
+	<li>
+	Fixed problem with determining GTK+ sub-platform caused when adding Qt support in 3.2.0.
+	</li>
+	<li>
+	Fix incorrect measurement of untitled file in SciTE on Linux leading to message "File ...' is 2147483647 bytes long".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3537764&group_id=2439">Bug #3537764.</a>
+	</li>
+	<li>
+	In SciTE, fix open of selected filename with line number to go to that line.
+	</li>
+	<li>
+	Fix problem with last visible buffer closing in SciTE causing invisible buffers to be active.
+	</li>
+	<li>
+	Avoid blinking of SciTE's current word highlight when output pane changes.
+	</li>
+	<li>
+	SciTE properties files can be longer than 60K.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite320.zip?download">Release 3.2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2012.
+	</li>
+	<li>
+	Platform layer added for the Qt open-source cross-platform application and user interface framework
+	for development in C++ or in Python with the PySide bindings for Qt.
+	</li>
+	<li>
+	Direct access provided to the document bytes for ranges within Scintilla.
+	This is similar to the existing SCI_GETCHARACTERPOINTER API but allows for better performance.
+	</li>
+	<li>
+	Ctrl+Double Click and Ctrl+Triple Click add the word or line to the set of selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3520037&group_id=2439">Feature #3520037.</a>
+	</li>
+	<li>
+	A SCI_DELETERANGE API was added for deleting a range of text.
+	</li>
+	<li>
+	Line wrap markers may now be drawn in the line number margin.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3518198&group_id=2439">Feature #3518198.</a>
+	</li>
+	<li>
+	SciTE on OS X adds option to hide hidden files in the open dialog box.
+	</li>
+	<li>
+	Lexer added for OScript language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523197&group_id=2439">Feature #3523197.</a>
+	</li>
+	<li>
+	Lexer added for Visual Prolog language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3523018&group_id=2439">Feature #3523018.</a>
+	</li>
+	<li>
+	UTF-8 validity is checked more stringently and consistently. All 66 non-characters are now treated as invalid.
+	</li>
+	<li>
+	HTML lexer bug fixed with inconsistent highlighting for PHP when attribute on separate line from tag.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520027&group_id=2439">Bug #3520027.</a>
+	</li>
+	<li>
+	HTML lexer bug fixed for JavaScript block comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3520032&group_id=2439">Bug #3520032.</a>
+	</li>
+	<li>
+	Annotation drawing bug fixed when box displayed with different colours on different lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519872&group_id=2439">Bug #3519872.</a>
+	</li>
+	<li>
+	On Windows with Direct2D, fix drawing with 125% and 150% DPI system settings.
+	</li>
+	<li>
+	Virtual space selection bug fixed for rectangular selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3519246&group_id=2439">Bug #3519246.</a>
+	</li>
+	<li>
+	Replacing multiple selection with newline changed to only affect main selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522251&group_id=2439">Bug #3522251.</a>
+	</li>
+	<li>
+	Replacing selection with newline changed to group deletion and insertion as a single undo action.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3522250&group_id=2439">Bug #3522250.</a>
+	</li>
+	<li>
+	Auto-completion lists on GTK+ 3 set height correctly instead of showing too few lines.
+	</li>
+	<li>
+	Mouse wheel scrolling changed to avoid GTK+ bug in recent distributions.
+	</li>
+	<li>
+	IME bug on Windows fixed for horizontal jump.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3529728&group_id=2439">Bug #3529728.</a>
+	</li>
+	<li>
+	SciTE case-insensitive autocompletion filters equal identifiers better.
+	Calltip arrows work with bare word identifiers.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3517810&group_id=2439">Bug #3517810.</a>
+	</li>
+	<li>
+	SciTE bug fixed where shbang lines not setting file type when switching
+	to file loaded in background.
+	</li>
+	<li>
+	SciTE on GTK+ shows open and save dialogs with the directory of the current file displayed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite310.zip?download">Release 3.1.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 April 2012.
+	</li>
+	<li>
+	Animated find indicator added on Cocoa.
+	</li>
+	<li>
+	Buttons can be made default in SciTE user strips.
+	</li>
+	<li>
+	SciTE allows find and replace histories to be saved in session.
+	</li>
+	<li>
+	Option added to allow case-insensitive selection in auto-completion lists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3516538&group_id=2439">Bug #3516538.</a>
+	</li>
+	<li>
+	Replace \0 by complete found text in regular expressions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3510979&group_id=2439">Feature #3510979.</a>
+	</li>
+	<li>
+	Fixed single quoted strings in bash lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512208&group_id=2439">Bug #3512208.</a>
+	</li>
+	<li>
+	Incorrect highlighting fixed in C++ lexer for continued lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3509317&group_id=2439">Bug #3509317.</a>
+	</li>
+	<li>
+	Hang fixed in diff lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3508602&group_id=2439">Bug #3508602.</a>
+	</li>
+	<li>
+	Folding improved for SQL CASE/MERGE statement.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3503277&group_id=2439">Bug #3503277.</a>
+	</li>
+	<li>
+	Fix extra drawing of selection inside word wrap indentation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3515555&group_id=2439">Bug #3515555.</a>
+	</li>
+	<li>
+	Fix problem with determining the last line that needs styling when drawing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix problems with drawing in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514882&group_id=2439">Bug #3514882.</a>
+	</li>
+	<li>
+	Fix printing crash when using Direct2D to display on-screen.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3513946&group_id=2439">Bug #3513946.</a>
+	</li>
+	<li>
+	Fix SciTE bug where background.*.size disabled restoration of bookmarks and positions from session.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3514885&group_id=2439">Bug #3514885.</a>
+	</li>
+	<li>
+	Fixed the Move Selected Lines command when last line does not end with a line end character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3511023&group_id=2439">Bug #3511023.</a>
+	</li>
+	<li>
+	Fix word wrap indentation printing to use printer settings instead of screen settings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512961&group_id=2439">Bug #3512961.</a>
+	</li>
+	<li>
+	Fix SciTE bug where executing an empty command prevented executing further commands
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3512976&group_id=2439">Bug #3512976.</a>
+	</li>
+	<li>
+	Fix SciTE bugs with focus in user strips and made strips more robust with invalid definitions.
+	</li>
+	<li>
+	Suppress SciTE regular expression option when searching with find next selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3510985&group_id=2439">Bug #3510985.</a>
+	</li>
+	<li>
+	SciTE Find in Files command matches empty pattern to all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495918&group_id=2439">Feature #3495918.</a>
+	</li>
+	<li>
+	Fix scroll with mouse wheel on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3501321&group_id=2439">Bug #3501321.</a>
+	</li>
+	<li>
+	Fix column finding method so that tab is counted correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3483713&group_id=2439">Bug #3483713.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite304.zip?download">Release 3.0.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2012.
+	</li>
+	<li>
+	SciTE scripts can create user interfaces as strips.
+	</li>
+	<li>
+	SciTE can save files automatically in the background.
+	</li>
+	<li>
+	Pinch zoom implemented on Cocoa.
+	</li>
+	<li>
+	ECL lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488209&group_id=2439">Feature #3488209.</a>
+	</li>
+	<li>
+	CPP lexer fixes styling after document comment keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495445&group_id=2439">Bug #3495445.</a>
+	</li>
+	<li>
+	Pascal folder improves handling of some constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486385&group_id=2439">Feature #3486385.</a>
+	</li>
+	<li>
+	XML lexer avoids entering a bad mode due to complex preprocessor instructions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488060&group_id=2439">Bug #3488060.</a>
+	</li>
+	<li>
+	Duplicate command is always remembered as a distinct command for undo.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495836&group_id=2439">Bug #3495836.</a>
+	</li>
+	<li>
+	SciTE xml.auto.close.tags no longer closes with PHP code similar to &lt;a $this-&gt;
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488067&group_id=2439">Bug #3488067.</a>
+	</li>
+	<li>
+	Fix bug where setting an indicator for the whole document would fail.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487440&group_id=2439">Bug #3487440.</a>
+	</li>
+	<li>
+	Crash fixed for SCI_MOVESELECTEDLINESDOWN with empty vertical selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3496403&group_id=2439">Bug #3496403.</a>
+	</li>
+	<li>
+	Differences between buffered and unbuffered mode on Direct2D eliminated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3495791&group_id=2439">Bug #3495791.</a>
+	</li>
+	<li>
+	Font leading implemented for Direct2D to improve display of character blobs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494744&group_id=2439">Bug #3494744.</a>
+	</li>
+	<li>
+	Fractional widths used for line numbers, character markers and other situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	Translucent rectangles drawn using Direct2D with sharper corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494492&group_id=2439">Bug #3494492.</a>
+	</li>
+	<li>
+	RGBA markers drawn sharper when centred using Direct2D.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494202&group_id=2439">Bug #3494202.</a>
+	</li>
+	<li>
+	RGBA markers are drawn centred when taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3494184&group_id=2439">Bug #3494184.</a>
+	</li>
+	<li>
+	Image marker drawing problem fixed for markers taller than line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3493503&group_id=2439">Bug #3493503.</a>
+	</li>
+	<li>
+	Markers are drawn horizontally off-centre based on margin type instead of dimensions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488696&group_id=2439">Bug #3488696.</a>
+	</li>
+	<li>
+	Fold tail markers drawn vertically centred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3488289&group_id=2439">Feature #3488289.</a>
+	</li>
+	<li>
+	On Windows, Scintilla is more responsive in wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3487397&group_id=2439">Bug #3487397.</a>
+	</li>
+	<li>
+	Unimportant "Gdk-CRITICAL" messages are no longer displayed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3488481&group_id=2439">Bug #3488481.</a>
+	</li>
+	<li>
+	SciTE on Windows Find in Files sets focus to dialog when already created; allows opening dialog when a job is running.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480635&group_id=2439">Bug #3480635.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3486657&group_id=2439">Bug #3486657.</a>
+	</li>
+	<li>
+	Fixed problems with multiple clicks in margin and with mouse actions combined with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484370&group_id=2439">Bug #3484370.</a>
+	</li>
+	<li>
+	Fixed bug with using page up and down and not returning to original line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3485669&group_id=2439">Bug #3485669.</a>
+	</li>
+	<li>
+	Down arrow with wrapped text no longer skips lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1776560&group_id=2439">Bug #1776560.</a>
+	</li>
+	<li>
+	Fix problem with dwell ending immediately due to word wrap.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484416&group_id=2439">Bug #3484416.</a>
+	</li>
+	<li>
+	Wrapped lines are rewrapped more consistently while resizing window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484179&group_id=2439">Bug #3484179.</a>
+	</li>
+	<li>
+	Selected line ends are highlighted more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3484330&group_id=2439">Bug #3484330.</a>
+	</li>
+	<li>
+	Fix grey background on files that use shbang to choose language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3482777&group_id=2439">Bug #3482777.</a>
+	</li>
+	<li>
+	Fix failure messages from empty commands in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3480645&group_id=2439">Bug #3480645.</a>
+	</li>
+	<li>
+	Redrawing reduced for some marker calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3493530&group_id=2439">Feature #3493530.</a>
+	</li>
+	<li>
+	Match brace and select brace commands work in SciTE output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486598&group_id=2439">Feature #3486598.</a>
+	</li>
+	<li>
+	Performing SciTE "Show Calltip" command when a calltip is already visible shows the next calltip.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3487017&group_id=2439">Feature #3487017.</a>
+	</li>
+	<li>
+	SciTE allows saving file even when file unchanged.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3486654&group_id=2439">Feature #3486654.</a>
+	</li>
+	<li>
+	SciTE allows optional use of character escapes in calltips.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495239&group_id=2439">Feature #3495239.</a>
+	</li>
+	<li>
+	SciTE can open file:// URLs with Ctrl+Shift+O.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3495389&group_id=2439">Feature #3495389.</a>
+	</li>
+	<li>
+	Key modifiers updated for GTK+ on OS X to match upstream changes.
+	</li>
+	<li>
+	SciTE hang when marking all occurrences of regular expressions fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite303.zip?download">Release 3.0.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 28 January 2012.
+	</li>
+	<li>
+	Printing works on GTK+ version 2.x as well as 3.x.
+	</li>
+	<li>
+	Lexer added for the AviSynth language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3475611&group_id=2439">Feature #3475611.</a>
+	</li>
+	<li>
+	Lexer added for the Take Command / TCC scripting language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3462462&group_id=2439">Feature #3462462.</a>
+	</li>
+	<li>
+	CSS lexer gains support for SCSS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3268017&group_id=2439">Feature #3268017.</a>
+	</li>
+	<li>
+	CPP lexer fixes problems in the preprocessor structure caused by continuation lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3458508&group_id=2439">Bug #3458508.</a>
+	</li>
+	<li>
+	Errorlist lexer handles column numbers for GCC format diagnostics.
+	In SciTE, Next Message goes to column where this can be decoded from GCC format diagnostics.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3453075&group_id=2439">Feature #3453075.</a>
+	</li>
+	<li>
+	HTML folder fixes spurious folds on some tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459262&group_id=2439">Bug #3459262.</a>
+	</li>
+	<li>
+	Ruby lexer fixes bug where '=' at start of file caused whole file to appear as a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3452488&group_id=2439">Bug #3452488.</a>
+	</li>
+	<li>
+	SQL folder folds blocks of single line comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3467425&group_id=2439">Feature #3467425.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, defer invalidation of render target until completion of painting to avoid failures.
+	</li>
+	<li>
+	Further support of fractional positioning. Spaces, tabs, and single character tokens can take fractional space
+	and wrapped lines are positioned taking fractional positions into account.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	On Windows using Direct2D, fix extra carets appearing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3471998&group_id=2439">Bug #3471998.</a>
+	</li>
+	<li>
+	For autocompletion lists Page Up and Down move by the list height instead of by 5 lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3455493&group_id=2439">Bug #3455493.</a>
+	</li>
+	<li>
+	For SCI_LINESCROLLDOWN/UP don't select into virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3451681&group_id=2439">Bug #3451681.</a>
+	</li>
+	<li>
+	Fix fold highlight not being fully drawn.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469936&group_id=2439">Bug #3469936.</a>
+	</li>
+	<li>
+	Fix selection margin appearing black when starting in wrap mode.
+	</li>
+	<li>
+	Fix crash when changing end of document after adding an annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476637&group_id=2439">Bug #3476637.</a>
+	</li>
+	<li>
+	Fix problems with building to make RPMs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476149&group_id=2439">Bug #3476149.</a>
+	</li>
+	<li>
+	Fix problem with building on GTK+ where recent distributions could not find gmodule.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3469056&group_id=2439">Bug #3469056.</a>
+	</li>
+	<li>
+	Fix problem with installing SciTE on GTK+ due to icon definition in .desktop file including an extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3476117&group_id=2439">Bug #3476117.</a>
+	</li>
+	<li>
+	Fix SciTE bug where new buffers inherited some properties from previously opened file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3457060&group_id=2439">Bug #3457060.</a>
+	</li>
+	<li>
+	Fix focus when closing tab in SciTE with middle click. Focus moves to edit pane instead of staying on tab bar.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix bug where Open Selected Filename for URL would append a file extension.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3459185&group_id=2439">Feature #3459185.</a>
+	</li>
+	<li>
+	For SciTE on Windows fix key handling of control characters in Parameters dialog so normal editing (Ctrl+C, ...) works.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3459345&group_id=2439">Bug #3459345.</a>
+	</li>
+	<li>
+	Fix SciTE bug where files became read-only after saving. Drop the "*" dirty marker after save completes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467432&group_id=2439">Bug #3467432.</a>
+	</li>
+	<li>
+	For SciTE handling of diffs with "+++" and "---" lines, also handle case where not followed by tab.
+	Go to correct line for diff "+++" message.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467143&group_id=2439">Bug #3467143.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3467178&group_id=2439">Bug #3467178.</a>
+	</li>
+	<li>
+	SciTE on GTK+ now performs threaded actions even on GTK+ versions before 2.12.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite302.zip?download">Release 3.0.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 December 2011.
+	</li>
+	<li>
+	SciTE saves files in the background without blocking the user interface.
+	</li>
+	<li>
+	Printing implemented in SciTE on GTK+ 3.x.
+	</li>
+	<li>
+	ILoader interface for background loading finalized and documented.
+	</li>
+	<li>
+	CoffeeScript lexer added.
+	</li>
+	<li>
+	C++ lexer fixes crash with "#if defined( XXX 1".
+	</li>
+	<li>
+	Crash with Direct2D on Windows fixed.
+	</li>
+	<li>
+	Backspace removing protected range fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3445911&group_id=2439">Bug #3445911.</a>
+	</li>
+	<li>
+	Cursor setting failure on Windows when screen saver on fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3438780&group_id=2439">Bug #3438780.</a>
+	</li>
+	<li>
+	SciTE on GTK+ hang fixed with -open:file option.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441980&group_id=2439">Bug #3441980.</a>
+	</li>
+	<li>
+	Failure to evaluate shbang fixed in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3441801&group_id=2439">Bug #3441801.</a>
+	</li>
+	<li>
+	SciTE failure to treat files starting with "&lt;?xml" as XML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440718&group_id=2439">Bug #3440718.</a>
+	</li>
+	<li>
+	Made untitled tab saveable when created by closing all files.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440244&group_id=2439">Bug #3440244.</a>
+	</li>
+	<li>
+	SciTE crash fixed when using Scintillua.
+	</li>
+	<li>
+	SciTE revert command fixed so that undo works on individual actions instead of undoing to revert point.
+	</li>
+	<li>
+	Focus loss in SciTE when opening a recent file fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3440142&group_id=2439">Bug #3440142.</a>
+	</li>
+	<li>
+	Fixed SciTE SelLength property to measure characters instead of bytes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283519&group_id=2439">Bug #3283519.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite301.zip?download">Release 3.0.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 November 2011.
+	</li>
+	<li>
+	SciTE on Windows now runs Lua scripts directly on the main thread instead of starting them on a
+	secondary thread and then moving back to the main thread.
+	</li>
+	<li>
+	Highlight "else" as a keyword for TCL in the same way as other languages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1836954&group_id=2439">Bug #1836954.</a>
+	</li>
+	<li>
+	Fix problems with setting fonts for autocompletion lists on Windows where
+	font handles were copied and later deleted causing a system default font to be used.
+	</li>
+	<li>
+	Fix font size used on Windows for Asian language input methods which sometimes led to IME not being visible.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3436753&group_id=2439">Bug #3436753.</a>
+	</li>
+	<li>
+	Fixed polygon drawing on Windows so fold symbols are visible again.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433558&group_id=2439">Bug #3433558.</a>
+	</li>
+	<li>
+	Changed background drawing on GTK+ to allow for fractional character positioning as occurs on OS X
+	as this avoids faint lines at lexeme boundaries.
+	</li>
+	<li>
+	Ensure pixmaps allocated before painting as there was a crash when Scintilla drew without common initialization calls.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3432354&group_id=2439">Bug #3432354.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows bug causing wrong caret position after indenting a selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3433433&group_id=2439">Bug #3433433.</a>
+	</li>
+	<li>
+	Fixed SciTE session saving to store buffer position matching buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3434372&group_id=2439">Bug #3434372.</a>
+	</li>
+	<li>
+	Fixed leak of document objects in SciTE.
+	</li>
+	<li>
+	Recognize URL characters '?' and '%' for Open Selected command in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3429409&group_id=2439">Bug #3429409.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite300.zip?download">Release 3.0.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 November 2011.
+	</li>
+	<li>
+	Carbon platform support removed. OS X applications should switch to Cocoa.
+	</li>
+	<li>
+	On Windows Vista or newer, drawing may be performed with Direct2D and DirectWrite instead of GDI.
+	</li>
+	<li>
+	Cairo is now used for all drawing on GTK+. GDK drawing was removed.
+	</li>
+	<li>
+	Paletted display support removed.
+	</li>
+	<li>
+	Fractional font sizes can be specified.
+	</li>
+	<li>
+	Different weights of text supported on some platforms instead of just normal and bold.
+	</li>
+	<li>
+	Sub-pixel character positioning supported.
+	</li>
+	<li>
+	SciTE loads files in the background without blocking the user interface.
+	</li>
+	<li>
+	SciTE can display diagnostic messages interleaved with the text of files immediately after the
+	line referred to by the diagnostic.
+	</li>
+	<li>
+	New API to see if all lines are visible which can be used to optimize processing fold structure notifications.
+	</li>
+	<li>
+	Scrolling optimized by avoiding invalidation of fold margin when redrawing whole window.
+	</li>
+	<li>
+	Optimized SCI_MARKERNEXT.
+	</li>
+	<li>
+	C++ lexer supports Pike hash quoted strings when turned on with lexer.cpp.hashquoted.strings.
+	</li>
+	<li>
+	Fixed incorrect line height with annotations in wrapped mode when there are multiple views.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388159&group_id=2439">Bug #3388159.</a>
+	</li>
+	<li>
+	Calltips may be displayed above the text as well as below.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3410830&group_id=2439">Bug #3410830.</a>
+	</li>
+	<li>
+	For huge files SciTE only examines the first megabyte for newline discovery.
+	</li>
+	<li>
+	SciTE on GTK+ removes the fileselector.show.hidden property and check box as this was buggy and GTK+ now
+	supports an equivalent feature.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3413630&group_id=2439">Bug #3413630.</a>
+	</li>
+	<li>
+	SciTE on GTK+ supports mnemonics in dynamic menus.
+	</li>
+	<li>
+	SciTE on GTK+ displays the user's home directory as '~' in menus to make them shorter.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite229.zip?download">Release 2.29</a>
+    </h3>
+    <ul>
+	<li>
+	Released 16 September 2011.
+	</li>
+	<li>
+	To automatically discover the encoding of a file when opening it, SciTE can run a program set with command.discover.properties.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3324341&group_id=2439">Feature #3324341.</a>
+	</li>
+	<li>
+	Cairo always used for drawing on GTK+.
+	</li>
+	<li>
+	The set of properties files imported by SciTE can be controlled with the properties imports.include and imports.exclude.
+	The import statement has been extended to allow "import *".
+	The properties files for some languages are no longer automatically loaded by default. The properties files affected are
+	avenue, baan, escript, lot, metapost, and mmixal.
+	</li>
+	<li>
+	C++ lexer fixed a bug with raw strings being recognized too easily.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3388122&group_id=2439">Bug #3388122.</a>
+	</li>
+	<li>
+	LaTeX lexer improved with more states and fixes to most outstanding bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1493111&group_id=2439">Bug #1493111.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1856356&group_id=2439">Bug #1856356.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081692&group_id=2439">Bug #3081692.</a>
+	</li>
+	<li>
+	Lua lexer updates for Lua 5.2 beta with goto labels and "\z" string escape.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3386330&group_id=2439">Feature #3386330.</a>
+	</li>
+	<li>
+	Perl string styling highlights interpolated variables.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3394258&group_id=2439">Feature #3394258.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3076629&group_id=2439">Bug #3076629.</a>
+	</li>
+	<li>
+	Perl lexer updated for Perl 5.14.0 with 0X and 0B numeric literal prefixes, break keyword and "+" supported in subroutine prototypes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3388802&group_id=2439">Feature #3388802.</a>
+	</li>
+	<li>
+	Perl bug fixed with CRLF line endings.
+	</li>
+	<li>
+	Markdown lexer fixed to not change state with "_" in middle of word.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3398184&group_id=2439">Bug #3398184.</a>
+	</li>
+	<li>
+	Cocoa restores compatibility with OS X 10.5.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow near start when scrolled horizontally.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3389055&group_id=2439">Bug #3389055.</a>
+	</li>
+	<li>
+	Indicators that finish at the end of the document no longer expand when text is appended.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3378718&group_id=2439">Bug #3378718.</a>
+	</li>
+	<li>
+	SparseState merge fixed to check if other range is empty.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3387053&group_id=2439">Bug #3387053.</a>
+	</li>
+	<li>
+	On Windows, autocompletion lists will scroll instead of document when mouse wheel spun.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3403600&group_id=2439">Feature #3403600.</a>
+	</li>
+	<li>
+	SciTE performs more rapid polling for command completion so will return faster and report more accurate times.
+	</li>
+	<li>
+	SciTE resizes panes proportionally when switched between horizontal and vertical layout.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3376784&group_id=2439">Feature #3376784.</a>
+	</li>
+	<li>
+	SciTE on GTK+ opens multiple files into a single instance more reliably.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3363754&group_id=2439">Bug #3363754.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite228.zip?download">Release 2.28</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 August 2011.
+	</li>
+	<li>
+	GTK+ Cairo support works back to GTK+ version 2.8. Requires changing Scintilla source code to enable before GTK+ 2.22.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3322351&group_id=2439">Bug #3322351.</a>
+	</li>
+	<li>
+	Translucent images in RGBA format can be used for margin markers and in autocompletion lists.
+	</li>
+	<li>
+	INDIC_DOTBOX added as a translucent dotted rectangular indicator.
+	</li>
+	<li>
+	Asian text input using IME works for GTK+ 3.x and GTK+ 2.x with Cairo.
+	</li>
+	<li>
+	On GTK+, IME works for Ctrl+Shift+U Unicode input in Scintilla. For SciTE, Ctrl+Shift+U is still Make Selection Uppercase.
+	</li>
+	<li>
+	Key bindings for GTK+ on OS X made compatible with Cocoa port and platform conventions.
+	</li>
+	<li>
+	Cocoa port supports different character encodings, improves scrolling performance and drag image appearance.
+	The control ID is included in WM_COMMAND notifications. Text may be deleted by dragging to the trash.
+	ScrollToStart and ScrollToEnd key commands added to simplify implementation of standard OS X Home and End
+	behaviour.
+	</li>
+	<li>
+	SciTE on GTK+ uses a paned widget to contain the edit and output panes instead of custom code.
+	This allows the divider to be moved easily on GTK+ 3 and its appearance follows GTK+ conventions more closely.
+	</li>
+	<li>
+	SciTE builds and installs on BSD.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324644&group_id=2439">Bug #3324644.</a>
+	</li>
+	<li>
+	Cobol supports fixed format comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3014850&group_id=2439">Bug #3014850.</a>
+	</li>
+	<li>
+	Mako template language block syntax extended and ## comments recognized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3325178&group_id=2439">Feature #3325178.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3318818&group_id=2439">Bug #3318818.</a>
+	</li>
+	<li>
+	Folding of Mako template language within HTML fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3324563&group_id=2439">Bug #3324563.</a>
+	</li>
+	<li>
+	Python lexer has lexer.python.keywords2.no.sub.identifiers option to avoid highlighting second set of
+	keywords following '.'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3325333&group_id=2439">Bug #3325333.</a>
+	</li>
+	<li>
+	Python folder fixes bug where fold would not extend to final line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3349157&group_id=2439">Bug #3349157.</a>
+	</li>
+	<li>
+	SciTE treats LPEG lexers the same as script lexers by setting all 8 style bits.
+	</li>
+	<li>
+	For Cocoa, crashes with unsupported font variants and memory leaks for colour objects fixed.
+	</li>
+	<li>
+	Shift-JIS lead byte ranges modified to match Windows.
+	</li>
+	<li>
+	Mouse pointer changes over selection to an arrow more consistently.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315756&group_id=2439">Bug #3315756.</a>
+	</li>
+	<li>
+	Bug fixed with annotations beyond end of document.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3347268&group_id=2439">Bug #3347268.</a>
+	</li>
+	<li>
+	Incorrect drawing fixed for combination of background colour change and translucent selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377116&group_id=2439">Bug #3377116.</a>
+	</li>
+	<li>
+	Lexers initialized correctly when started at position other than start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3377148&group_id=2439">Bug #3377148.</a>
+	</li>
+	<li>
+	Fold highlight drawing fixed for some situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323015&group_id=2439">Bug #3323015.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3323805&group_id=2439">Bug #3323805.</a>
+	</li>
+	<li>
+	Case insensitive search fixed for cases where folded character uses fewer bytes than base character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3362038&group_id=2439">Bug #3362038.</a>
+	</li>
+	<li>
+	SciTE bookmark.alpha setting fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3373907&group_id=2439">Bug #3373907.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite227.zip?download">Release 2.27</a>
+    </h3>
+    <ul>
+	<li>
+	Released 20 June 2011.
+	</li>
+	<li>
+	On recent GTK+ 2.x versions when using Cairo, bug fixed where wrong colours were drawn.
+	</li>
+	<li>
+	SciTE on GTK+ slow performance in menu maintenance fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315233&group_id=2439">Bug #3315233.</a>
+	</li>
+	<li>
+	Cocoa platform supports 64-bit builds and uses only non-deprecated APIs.
+	Asian Input Method Editors are supported.
+	Autocompletion lists and calltips implemented.
+	Control identifier used in notifications.
+	</li>
+	<li>
+	On Cocoa, rectangular selection now uses Option/Alt key to be compatible with Apple Human
+	Interface Guidelines and other applications.
+	The Control key is reported with an SCMOD_META modifier bit.
+	</li>
+	<li>
+	API added for setting and retrieving the identifier number used in notifications.
+	</li>
+	<li>
+	SCI_SETEMPTYSELECTION added to set selection without scrolling or redrawing more than needed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3314877&group_id=2439">Feature #3314877.</a>
+	</li>
+	<li>
+	Added new indicators. INDIC_DASH and INDIC_DOTS are variants of underlines.
+	INDIC_SQUIGGLELOW indicator added as shorter alternative to INDIC_SQUIGGLE for small fonts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314591&group_id=2439">Bug #3314591</a>
+	</li>
+	<li>
+	Margin line selection can be changed to select display lines instead of document lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	On Windows, SciTE can perform reverse searches by pressing Shift+Enter
+	in the Find or Replace strips or dialogs.
+	</li>
+	<li>
+	Matlab lexer does not special case '\' in single quoted strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=948757&group_id=2439">Bug #948757</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1755950&group_id=2439">Bug #1755950</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1888738&group_id=2439">Bug #1888738</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3316852&group_id=2439">Bug #3316852.</a>
+	</li>
+	<li>
+	Verilog lexer supports SystemVerilog folding and keywords.
+	</li>
+	<li>
+	Font leak fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+	<li>
+	Automatic scrolling works for long wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3312763&group_id=2439">Bug #3312763.</a>
+	</li>
+	<li>
+	Multiple typing works for cases where selections collapse together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3309906&group_id=2439">Bug #3309906.</a>
+	</li>
+	<li>
+	Fold expanded when needed in word wrap mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	</li>
+	<li>
+	Bug fixed with edge drawn in wrong place on wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314807&group_id=2439">Bug #3314807.</a>
+	</li>
+	<li>
+	Bug fixed with unnecessary scrolling for SCI_GOTOLINE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3303406&group_id=2439">Bug #3303406.</a>
+	</li>
+	<li>
+	Bug fixed where extra step needed to undo SCI_CLEAR in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3159691&group_id=2439">Bug #3159691.</a>
+	</li>
+	<li>
+	Regular expression search fixed for \$ on last line of search range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313746&group_id=2439">Bug #3313746.</a>
+	</li>
+	<li>
+	SciTE performance improved when switching to a tab with a very large file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3311421&group_id=2439">Bug #3311421.</a>
+	</li>
+	<li>
+	On Windows, SciTE advanced search remembers the "Search only in this style" setting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3313344&group_id=2439">Bug #3313344.</a>
+	</li>
+	<li>
+	On GTK+, SciTE opens help using "xdg-open" instead of "netscape" as "netscape" no longer commonly installed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3314377&group_id=2439">Bug #3314377.</a>
+	</li>
+	<li>
+	SciTE script lexers can use 256 styles.
+	</li>
+	<li>
+	SciTE word highlight works for words containing DBCS characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3315173&group_id=2439">Bug #3315173.</a>
+	</li>
+	<li>
+	Compilation fixed for wxWidgets.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3306156&group_id=2439">Bug #3306156.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite226.zip?download">Release 2.26</a>
+    </h3>
+    <ul>
+	<li>
+	Released 25 May 2011.
+	</li>
+	<li>
+	Folding margin symbols can be highlighted for the current folding block.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3147069&group_id=2439">Feature #3147069.</a>
+	</li>
+	<li>
+	Selected lines can be moved up or down together.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3304850&group_id=2439">Feature #3304850.</a>
+	</li>
+	<li>
+	SciTE can highlight all occurrences of the current word or selected text.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3291636&group_id=2439">Feature #3291636.</a>
+	</li>
+	<li>
+	Experimental GTK+ 3.0 support: build with "make GTK3=1".
+	</li>
+	<li>
+	INDIC_STRAIGHTBOX added. Is similar to INDIC_ROUNDBOX but without rounded corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3290435&group_id=2439">Bug #3290435.</a>
+	</li>
+	<li>
+	Can show brace matching and mismatching with indicators instead of text style.
+	Translucency of outline can be altered for INDIC_ROUNDBOX and INDIC_STRAIGHTBOX.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3290434&group_id=2439">Feature #3290434.</a>
+	</li>
+	<li>
+	SciTE can automatically indent python by examining previous line for scope-starting ':' with indent.python.colon.
+	</li>
+	<li>
+	Batch file lexer allows braces '(' or ')' inside variable names.
+	</li>
+	<li>
+	The cpp lexer only recognizes Vala triple quoted strings when lexer.cpp.triplequoted.strings property is set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3239234&group_id=2439">Bug #3239234.</a>
+	</li>
+	<li>
+	Make file lexer treats a variable with a nested variable like $(f$(qx)b) as one variable.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3298223&group_id=2439">Bug #3298223.</a>
+	</li>
+	<li>
+	Folding bug fixed for JavaScript with nested PHP.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3193530&group_id=2439">Bug #3193530.</a>
+	</li>
+	<li>
+	HTML lexer styles Django's {# #} comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3013798&group_id=2439">Bug #3013798.</a>
+	</li>
+	<li>
+	HTML lexer styles JavaScript regular expression correctly for /abc/i.test('abc');.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3209108&group_id=2439">Bug #3209108.</a>
+	</li>
+	<li>
+	Inno Setup Script lexer now works properly when it restarts from middle of [CODE] section.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3283880&group_id=2439">Bug #3283880.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3129044&group_id=2439">Bug #3129044.</a>
+	</li>
+	<li>
+	Lua lexer updated for Lua 5.2 with hexadecimal floating-point numbers and '\*' whitespace escaping in strings.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3243811&group_id=2439">Feature #3243811.</a>
+	</li>
+	<li>
+	Perl folding folds "here doc"s and adds options fold.perl.at.else and fold.perl.comment.explicit. Fold structure for Perl fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3112671&group_id=2439">Feature #3112671.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	Python lexer supports cpdef keyword for Cython.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3279728&group_id=2439">Bug #3279728.</a>
+	</li>
+	<li>
+	SQL folding option lexer.sql.fold.at.else renamed to fold.sql.at.else.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3271474&group_id=2439">Bug #3271474.</a>
+	</li>
+	<li>
+	SQL lexer no longer treats ';' as terminating a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3196071&group_id=2439">Bug #3196071.</a>
+	</li>
+	<li>
+	Text drawing and measurement segmented into smaller runs to avoid platform bugs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3277449&group_id=2439">Bug #3277449.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3165743&group_id=2439">Bug #3165743.</a>
+	</li>
+	<li>
+	SciTE on Windows adds temp.files.sync.load property to open dropped temporary files synchronously as they may
+	be removed before they can be opened asynchronously.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3072009&group_id=2439">Bug #3072009.</a>
+	</li>
+	<li>
+	Bug fixed with indentation guides ignoring first line in SC_IV_LOOKBOTH mode.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291317&group_id=2439">Bug #3291317.</a>
+	</li>
+	<li>
+	Bugs fixed in backward regex search.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3292659&group_id=2439">Bug #3292659.</a>
+	</li>
+	<li>
+	Bugs with display of folding structure fixed for wrapped lines and where there is a fold header but no body.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3291579&group_id=2439">Bug #3291579.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3265401&group_id=2439">Bug #3265401.</a>
+	</li>
+	<li>
+	SciTE on Windows cursor changes to an arrow now when over horizontal splitter near top of window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3286620&group_id=2439">Bug #3286620.</a>
+	</li>
+	<li>
+	Fixed default widget size problem on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3267892&group_id=2439">Bug #3267892.</a>
+	</li>
+	<li>
+	Fixed font size when using Cairo on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3272662&group_id=2439">Bug #3272662.</a>
+	</li>
+	<li>
+	Fixed primary selection and cursor issues on GTK+ when unrealized then realized.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3256153&group_id=2439">Bug #3256153.</a>
+	</li>
+	<li>
+	Right click now cancels selection on GTK+ like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3235190&group_id=2439">Bug #3235190.</a>
+	</li>
+	<li>
+	SciTE on GTK+ implements z-order buffer switching like on Windows.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3228384&group_id=2439">Bug #3228384.</a>
+	</li>
+	<li>
+	Improve selection position after SciTE Insert Abbreviation command when abbreviation expansion includes '|'.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite225.zip?download">Release 2.25</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 March 2011.
+	</li>
+	<li>
+	SparseState class makes it easier to write lexers which have to remember complex state between lines.
+	</li>
+	<li>
+	Visual Studio project (.dsp) files removed. The make files should be used instead as described in the README.
+	</li>
+	<li>
+	Modula 3 lexer added along with SciTE support.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3173374&group_id=2439">Feature #3173374.</a>
+	</li>
+	<li>
+	Asm, Basic, and D lexers add extra folding properties.
+	</li>
+	<li>
+	Raw string literals for C++0x supported in C++ lexer.
+	</li>
+	<li>
+	Triple-quoted strings used in Vala language supported in C++ lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3177601&group_id=2439">Feature #3177601.</a>
+	</li>
+	<li>
+ 	The errorlist lexer used in SciTE's output pane colours lines that start with '&lt;' as diff deletions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3172878&group_id=2439">Feature #3172878.</a>
+	</li>
+	<li>
+ 	The Fortran lexer correctly folds type-bound procedures from Fortran 2003.
+	</li>
+	<li>
+	LPeg lexer support‎ improved in SciTE.
+	</li>
+	<li>
+	SciTE on Windows-64 fixes for menu localization and Lua scripts.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3204502&group_id=2439">Bug #3204502.</a>
+	</li>
+	<li>
+	SciTE on Windows avoids locking folders when using the open or save dialogs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1795484&group_id=2439">Bug #1795484.</a>
+	</li>
+	<li>
+	Diff lexer fixes problem where diffs of diffs producing lines that start with "----".
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3197952&group_id=2439">Bug #3197952.</a>
+	</li>
+	<li>
+	Bug fixed when searching upwards in Chinese code page 936.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3176271&group_id=2439">Bug #3176271.</a>
+	</li>
+	<li>
+	On Cocoa, translucent drawing performed as on other platforms instead of 2.5 times less translucent.
+	</li>
+	<li>
+	Performance issue and potential bug fixed on GTK+ with caret line for long lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite224.zip?download">Release 2.24</a>
+    </h3>
+    <ul>
+	<li>
+	Released 3 February 2011.
+	</li>
+	<li>
+	Fixed memory leak in GTK+ Cairo code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3157655&group_id=2439">Feature #3157655.</a>
+	</li>
+	<li>
+	Insert Abbreviation dialog added to SciTE on GTK+.
+	</li>
+	<li>
+	SCN_UPDATEUI notifications received when window scrolled. An 'updated' bit mask indicates which
+	types of update have occurred from SC_UPDATE_SELECTION, SC_UPDATE_CONTENT, SC_UPDATE_H_SCROLL
+	or SC_UPDATE_V_SCROLL.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3125977&group_id=2439">Feature #3125977.</a>
+	</li>
+	<li>
+	On Windows, to ensure reverse arrow cursor matches platform default, it is now generated by
+	reflecting the platform arrow cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3143968&group_id=2439">Feature #3143968.</a>
+	</li>
+	<li>
+	Can choose mouse cursor used in margins.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3161326&group_id=2439">Feature #3161326.</a>
+	</li>
+	<li>
+	On GTK+, SciTE sets a mime type of text/plain in its .desktop file so that it will appear in the shell context menu.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3137126&group_id=2439">Feature #3137126.</a>
+	</li>
+	<li>
+	Bash folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118223&group_id=2439">Feature #3118223.</a>
+	</li>
+	<li>
+	C++ folder adds fold.cpp.syntax.based, fold.cpp.comment.multiline, fold.cpp.explicit.start, fold.cpp.explicit.end,
+	and fold.cpp.explicit.anywhere properties to allow more control over folding and choice of explicit fold markers.
+	</li>
+	<li>
+	C++ lexer fixed to always handle single quote strings continued past a line end.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3150522&group_id=2439">Bug #3150522.</a>
+	</li>
+	<li>
+	Ruby folder handles here docs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3118224&group_id=2439">Feature #3118224.</a>
+	</li>
+	<li>
+	SQL lexer allows '.' to be part of words.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3103129&group_id=2439">Feature #3103129.</a>
+	</li>
+	<li>
+	SQL folder handles case statements in more situations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3135027&group_id=2439">Feature #3135027.</a>
+	</li>
+	<li>
+	SQL folder adds fold points inside expressions based on bracket structure.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3165488&group_id=2439">Feature #3165488.</a>
+	</li>
+	<li>
+	SQL folder drops fold.sql.exists property as 'exists' is handled automatically.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3164194&group_id=2439">Bug #3164194.</a>
+	</li>
+	<li>
+	SciTE only forwards properties to lexers when they have been explicitly set so the defaults set by lexers are used
+	rather than 0.
+	</li>
+	<li>
+	Mouse double click word selection chooses the word around the character under the mouse rather than
+	the inter-character position under the mouse. This makes double clicking select what the user is pointing
+	at and avoids selecting adjacent non-word characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3111174&group_id=2439">Bug #3111174.</a>
+	</li>
+	<li>
+	Fixed mouse double click to always perform word select, not line select.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3143635&group_id=2439">Bug #3143635.</a>
+	</li>
+	<li>
+	Right click cancels autocompletion.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3144531&group_id=2439">Bug #3144531.</a>
+	</li>
+	<li>
+	Fixed multiPaste to work when additionalSelectionTyping off.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3126221&group_id=2439">Bug #3126221.</a>
+	</li>
+	<li>
+	Fixed virtual space problems when text modified at caret.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3154986&group_id=2439">Bug #3154986.</a>
+	</li>
+	<li>
+	Fixed memory leak in lexer object code.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3133672&group_id=2439">Bug #3133672.</a>
+	</li>
+	<li>
+	Fixed SciTE on GTK+ search failure when using regular expression.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3156217&group_id=2439">Bug #3156217.</a>
+	</li>
+	<li>
+	Avoid unnecessary full window redraw for SCI_GOTOPOS.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3146650&group_id=2439">Feature #3146650.</a>
+	</li>
+	<li>
+	Avoid unnecessary redraw when indicator fill range makes no real change.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite223.zip?download">Release 2.23</a>
+    </h3>
+    <ul>
+	<li>
+	Released 7 December 2010.
+	</li>
+	<li>
+	On GTK+ version 2.22 and later, drawing is performed with Cairo rather than GDK.
+	This is in preparation for GTK+ 3.0 which will no longer support GDK drawing.
+	The appearance of some elements will be different with Cairo as it is anti-aliased and uses sub-pixel positioning.
+	Cairo may be turned on for GTK+ versions before 2.22 by defining USE_CAIRO although this has not
+	been extensively tested.
+	</li>
+	<li>
+	New lexer a68k for Motorola 68000 assembler.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101598&group_id=2439">Feature #3101598.</a>
+	</li>
+	<li>
+	Borland C++ is no longer supported for building Scintilla or SciTE on Windows.
+	</li>
+	<li>
+	Performance improved when creating large rectangular selections.
+	</li>
+	<li>
+	PHP folder recognizes #region and #endregion comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3101624&group_id=2439">Feature #3101624.</a>
+	</li>
+	<li>
+	SQL lexer has a lexer.sql.numbersign.comment option to turn off use of '#' comments
+	as these are a non-standard feature only available in some implementations.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3098071&group_id=2439">Feature #3098071.</a>
+	</li>
+	<li>
+	SQL folder recognizes case statements and understands the fold.at.else property.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3107362&group_id=2439">Bug #3107362.</a>
+	</li>
+	<li>
+	SQL folder fixes bugs with end statements when fold.sql.only.begin=1.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3104091&group_id=2439">Bug #3104091.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed with multi-line tab bar not adjusting correctly when maximizing and demaximizing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3097517&group_id=2439">Bug #3097517.</a>
+	</li>
+	<li>
+	Crash fixed on GTK+ when Scintilla widget destroyed while it still has an outstanding style idle pending.
+	</li>
+	<li>
+	Bug fixed where searching backwards in DBCS text (code page 936 or similar) failed to find occurrences at the start of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3103936&group_id=2439">Bug #3103936.</a>
+	</li>
+	<li>
+	SciTE on Windows supports Unicode file names when executing help applications with winhelp and htmlhelp subsystems.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite222.zip?download">Release 2.22</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 October 2010.
+	</li>
+	<li>
+	SciTE includes support for integrating with Scintillua which allows lexers to be implemented in Lua as a
+	Parsing Expression Grammar (PEG).
+	</li>
+	<li>
+	Regular expressions allow use of '?' for non-greedy matches or to match 0 or 1 instances of an item.
+	</li>
+	<li>
+	SCI_CONTRACTEDFOLDNEXT added to allow rapid retrieval of folding state.
+	</li>
+	<li>
+	SCN_HOTSPOTRELEASECLICK notification added which is similar to SCN_HOTSPOTCLICK but occurs
+	when the mouse is released.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3082409&group_id=2439">Feature #3082409.</a>
+	</li>
+	<li>
+	Command added for centring current line in window.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3064696&group_id=2439">Feature #3064696.</a>
+	</li>
+	<li>
+	SciTE performance improved by not examining document for line ends when switching buffers and not
+	storing folds when folding turned off.
+	</li>
+	<li>
+	Bug fixed where scrolling to ensure the caret is visible did not take into account all pixels of the line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3081721&group_id=2439">Bug #3081721.</a>
+	</li>
+	<li>
+	Bug fixed for autocompletion list overlapping text when WS_EX_CLIENTEDGE used.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079778&group_id=2439">Bug #3079778.</a>
+	</li>
+	<li>
+	After autocompletion, the caret's X is updated.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3079114&group_id=2439">Bug #3079114.</a>
+	</li>
+	<li>
+	On Windows, default to the system caret blink time.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3079784&group_id=2439">Feature #3079784.</a>
+	</li>
+	<li>
+	PgUp/PgDn fixed to allow virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3077452&group_id=2439">Bug #3077452.</a>
+	</li>
+	<li>
+	Crash fixed when AddMark and AddMarkSet called with negative argument.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3075074&group_id=2439">Bug #3075074.</a>
+	</li>
+	<li>
+	Dwell notifications fixed so that they do not occur when the mouse is outside Scintilla.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a>
+	</li>
+	<li>
+	Bash lexer bug fixed for here docs starting with &lt;&lt;-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3063822&group_id=2439">Bug #3063822.</a>
+	</li>
+	<li>
+	C++ lexer bug fixed for // comments that are continued onto a second line by a \.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a>
+	</li>
+	<li>
+	C++ lexer fixes wrong highlighting for float literals containing +/-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058924&group_id=2439">Bug #3058924.</a>
+	</li>
+	<li>
+	JavaScript lexer recognize regexes following return keyword.‎
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3062287&group_id=2439">Bug #3062287.</a>
+	</li>
+	<li>
+	Ruby lexer handles % quoting better and treats range dots as operators in 1..2 and 1...2.
+	Ruby folder handles "if" keyword used as a modifier even when it is separated from the modified statement by an escaped new line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2093767&group_id=2439">Bug #2093767.</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3058496&group_id=2439">Bug #3058496.</a>
+	</li>
+	<li>
+	Bug fixed where upwards search failed with DBCS code pages.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3065912&group_id=2439">Bug #3065912.</a>
+	</li>
+	<li>
+	SciTE has a default Lua startup script name distributed in SciTEGlobal.properties.
+	No error message is displayed if this file does not exist.
+	</li>
+	<li>
+	SciTE on Windows tab control height is calculated better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635702&group_id=2439">Bug #2635702.</a>
+	</li>
+	<li>
+	SciTE on Windows uses better themed check buttons in find and replace strips.
+	</li>
+	<li>
+	SciTE on Windows fixes bug with Find strip appearing along with Incremental Find strip.
+	</li>
+	<li>
+	SciTE setting find.close.on.find added to allow preventing the Find dialog from closing.
+	</li>
+	<li>
+	SciTE on Windows attempts to rerun commands that fail by prepending them with "cmd.exe /c".
+	This allows commands built in to the command processor like "dir" to run.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite221.zip?download">Release 2.21</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 September 2010.
+	</li>
+	<li>
+	Asian Double Byte Character Set (DBCS) support improved.
+	Case insensitive search works and other operations are much faster.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2999125&group_id=2439">Bug #2999125,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2774616&group_id=2439">Bug #2774616,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2991942&group_id=2439">Bug #2991942,</a>
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005688&group_id=2439">Bug #3005688.</a>
+	</li>
+	<li>
+	Scintilla on GTK+ uses only non-deprecated APIs (for GTK+ 2.20) except for GdkFont and GdkFont use can be disabled
+	with the preprocessor symbol DISABLE_GDK_FONT.
+	</li>
+	<li>
+	IDocument interface used by lexers adds BufferPointer and GetLineIndentation methods.
+	</li>
+	<li>
+	On Windows, clicking sets focus before processing the click or sending notifications.
+	</li>
+	<li>
+	Bug on OS X (macosx platform) fixed where drag/drop overwrote clipboard.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3039732&group_id=2439">Bug #3039732.</a>
+	</li>
+	<li>
+	GTK+ drawing bug when the view was horizontally scrolled more than 32000 pixels fixed.
+	</li>
+	<li>
+	SciTE bug fixed with invoking Complete Symbol from output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3050957&group_id=2439">Bug #3050957.</a>
+	</li>
+	<li>
+	Bug fixed where it was not possible to disable folding.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3040649&group_id=2439">Bug #3040649.</a>
+	</li>
+	<li>
+	Bug fixed with pressing Enter on a folded fold header line not opening the fold.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3043419&group_id=2439">Bug #3043419.</a>
+	</li>
+	<li>
+	SciTE 'Match case' option in find and replace user interfaces changed to 'Case sensitive' to allow use of 'v'
+	rather than 'c' as the mnemonic.
+	</li>
+	<li>
+	SciTE displays stack trace for Lua when error occurs..
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3051397&group_id=2439">Bug #3051397.</a>
+	</li>
+	<li>
+	SciTE on Windows fixes bug where double clicking on error message left focus in output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1264835&group_id=2439">Bug #1264835.</a>
+	</li>
+	<li>
+	SciTE on Windows uses SetDllDirectory to avoid a security problem.
+	</li>
+	<li>
+	C++ lexer crash fixed with preprocessor expression that looked like division by 0.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3056825&group_id=2439">Bug #3056825.</a>
+	</li>
+	<li>
+	Haskell lexer improved.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3039490&group_id=2439">Feature #3039490.</a>
+	</li>
+	<li>
+	HTML lexing fixed around Django {% %} tags.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3034853&group_id=2439">Bug #3034853.</a>
+	</li>
+	<li>
+	HTML JavaScript lexing fixed when line end escaped.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3038381&group_id=2439">Bug #3038381.</a>
+	</li>
+	<li>
+	HTML lexer stores line state produced by a line on that line rather than on the next line.
+	</li>
+	<li>
+	Markdown lexer fixes infinite loop.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3045386&group_id=2439">Bug #3045386.</a>
+	</li>
+	<li>
+	MySQL folding bugs with END statements fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3031742&group_id=2439">Bug #3031742.</a>
+	</li>
+	<li>
+	PowerShell lexer allows '_' as a word character.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3042228&group_id=2439">Feature #3042228.</a>
+	</li>
+	<li>
+	SciTE on GTK+ abandons processing of subsequent commands if a command.go.needs command fails.
+	</li>
+	<li>
+	When SciTE is closed, all buffers now receive an OnClose call.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3033857&group_id=2439">Bug #3033857.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite220.zip?download">Release 2.20</a>
+    </h3>
+    <ul>
+	<li>
+	Released 30 July 2010.
+	</li>
+	<li>
+	Lexers are implemented as objects so that they may retain extra state.
+	The interfaces defined for this are tentative and may change before the next release.
+	Compatibility classes allow current lexers compiled into Scintilla to run with few changes.
+	The interface to external lexers has changed and existing external lexers will need to have changes
+	made and be recompiled.
+	A single lexer object is attached to a document whereas previously lexers were attached to views
+	which could lead to different lexers being used for split views with confusing results.
+	</li>
+	<li>
+	C++ lexer understands the preprocessor enough to grey-out inactive code due to conditional compilation.
+	</li>
+	<li>
+	SciTE can use strips within the main window for find and replace rather than dialogs.
+	On Windows SciTE always uses a strip for incremental search.
+	</li>
+	<li>
+	Lexer added for Txt2Tags language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3018736&group_id=2439">Feature #3018736.</a>
+	</li>
+	<li>
+	Sticky caret feature enhanced with additional SC_CARETSTICKY_WHITESPACE mode .
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3027559&group_id=2439">Feature #3027559.</a>
+	</li>
+	<li>
+	Bash lexer implements basic parsing of compound commands and constructs.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3033135&group_id=2439">Feature #3033135.</a>
+	</li>
+	<li>
+	C++ folder allows disabling explicit fold comments.
+	</li>
+	<li>
+	Perl folder works for array blocks, adjacent package statements, nested PODs, and terminates package folding at __DATA__, ^D and ^Z.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3030887&group_id=2439">Feature #3030887.</a>
+	</li>
+	<li>
+	PowerShell lexer supports multiline &lt;# .. #&gt; comments and adds 2 keyword classes.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3015176&group_id=2439">Feature #3015176.</a>
+	</li>
+	<li>
+	Lexing performed incrementally when needed by wrapping to make user interface more responsive.
+	</li>
+	<li>
+	SciTE setting replaceselection:yes works on GTK+.
+	</li>
+	<li>
+	SciTE Lua scripts calling io.open or io.popen on Windows have arguments treated as UTF-8 and converted to Unicode
+	so that non-ASCII file paths will work. Lua files with non-ASCII paths run.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3016951&group_id=2439">Bug #3016951.</a>
+	</li>
+	<li>
+	Crash fixed when searching for empty string.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017572&group_id=2439">Bug #3017572.</a>
+	</li>
+	<li>
+	Bugs fixed with folding and lexing when Enter pressed at start of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3032652&group_id=2439">Bug #3032652.</a>
+	</li>
+	<li>
+	Bug fixed with line selection mode not affecting selection range.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021480&group_id=2439">Bug #3021480.</a>
+	</li>
+	<li>
+	Bug fixed where indicator alpha was limited to 100 rather than 255.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3021473&group_id=2439">Bug #3021473.</a>
+	</li>
+	<li>
+	Bug fixed where changing annotation did not cause automatic redraw.
+	</li>
+	<li>
+	Regular expression bug fixed when a character range included non-ASCII characters.
+	</li>
+	<li>
+	Compilation failure with recent compilers fixed on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3022027&group_id=2439">Bug #3022027.</a>
+	</li>
+	<li>
+	Bug fixed on Windows with multiple monitors where autocomplete pop up would appear off-screen
+	or straddling monitors.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3017512&group_id=2439">Bug #3017512.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where changing directory to a Unicode path failed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011987&group_id=2439">Bug #3011987.</a>
+	</li>
+	<li>
+	SciTE on Windows bug fixed where combo boxes were not allowing Unicode characters.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012986&group_id=2439">Bug #3012986.</a>
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed when dragging files into SciTE on KDE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3026555&group_id=2439">Bug #3026555.</a>
+	</li>
+	<li>
+	SciTE bug fixed where closing untitled file could lose data if attempt to name file same as another buffer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3011680&group_id=2439">Bug #3011680.</a>
+	</li>
+	<li>
+	COBOL number masks now correctly highlighted.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3012164&group_id=2439">Bug #3012164.</a>
+	</li>
+	<li>
+	PHP comments can include &lt;?PHP without triggering state change.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2854183&group_id=2439">Bug #2854183.</a>
+	</li>
+	<li>
+	VHDL lexer styles unclosed string correctly.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3029627&group_id=2439">Bug #3029627.</a>
+	</li>
+	<li>
+	Memory leak fixed in list boxes on GTK+.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3007669&group_id=2439">Bug #3007669.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite212.zip?download">Release 2.12</a>
+    </h3>
+    <ul>
+	<li>
+	Released 1 June 2010.
+	</li>
+	<li>
+	Drawing optimizations improve speed and fix some visible flashing when scrolling.
+	</li>
+	<li>
+	Copy Path command added to File menu in SciTE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986745&group_id=2439">Feature #2986745.</a>
+	</li>
+	<li>
+	Optional warning displayed by SciTE when saving a file which has been modified by another process.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2975041&group_id=2439">Feature #2975041.</a>
+	</li>
+	<li>
+	Flagship lexer for xBase languages updated to follow the language much more closely.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2992689&group_id=2439">Feature #2992689.</a>
+	</li>
+	<li>
+	HTML lexer highlights Django templates in more regions.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=3002874&group_id=2439">Feature #3002874.</a>
+	</li>
+	<li>
+	Dropping files on SciTE on Windows, releases the drag object earlier and opens the files asynchronously,
+	leading to smoother user experience.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2986724&group_id=2439">Feature #2986724.</a>
+	</li>
+	<li>
+	SciTE HTML exports take the Use Monospaced Font setting into account.
+	</li>
+	<li>
+	SciTE window title "[n of m]" localized.
+	</li>
+	<li>
+	When new line inserted at start of line, markers are moved down.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986727&group_id=2439">Bug #2986727.</a>
+	</li>
+	<li>
+	On Windows, dropped text has its line ends converted, similar to pasting.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3005328&group_id=2439">Bug #3005328.</a>
+	</li>
+	<li>
+	Fixed bug with middle-click paste in block select mode where text was pasted next to selection rather than at cursor.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2984460&group_id=2439">Bug #2984460.</a>
+	</li>
+	<li>
+	Fixed SciTE crash where a style had a size parameter without a value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3003834&group_id=2439">Bug #3003834.</a>
+	</li>
+	<li>
+	Debug assertions in multiple lexers fixed.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3000566&group_id=2439">Bug #3000566.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where @font-face displayed incorrectly
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994224&group_id=2439">Bug #2994224.</a>
+	</li>
+	<li>
+	CSS lexer fixed bug where open comment caused highlighting error.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1683672&group_id=2439">Bug #1683672.</a>
+	</li>
+	<li>
+	Shell file lexer fixed highlight glitch with here docs where the first line is a comment.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830239&group_id=2439">Bug #2830239.</a>
+	</li>
+	<li>
+	Bug fixed in SciTE openpath property that caused Open Selected File to fail to open the selected file.
+	</li>
+	<li>
+	Bug fixed in SciTE FileExt property when file name with no extension evaluated to whole path.
+	</li>
+	<li>
+	Fixed SciTE on Windows printing bug where the $(CurrentTime), $(CurrentPage) variables were not expanded.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2994612&group_id=2439">Bug #2994612.</a>
+	</li>
+	<li>
+	SciTE compiles for 64-bit Windows and runs without crashing.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2986312&group_id=2439">Bug #2986312.</a>
+	</li>
+	<li>
+	Full Screen mode in Windows Vista/7 improved to hide Start button and size borders a little better.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3002813&group_id=2439">Bug #3002813.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite211.zip?download">Release 2.11</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 April 2010.
+	</li>
+	<li>
+	Fixes compatibility of Scintilla.h with the C language.
+	</li>
+	<li>
+	With a rectangular selection SCI_GETSELECTIONSTART and SCI_GETSELECTIONEND return limits of the
+	rectangular selection rather than the limits of the main selection.
+	</li>
+	<li>
+	When SciTE on Windows is minimized to tray, only takes a single click to restore rather than a double click.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=981917&group_id=2439">Feature #981917.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite210.zip?download">Release 2.10</a>
+    </h3>
+    <ul>
+	<li>
+	Released 4 April 2010.
+	</li>
+	<li>
+	Version 1.x of GTK+ is no longer supported.
+	</li>
+	<li>
+	SciTE is no longer supported on Windows 95, 98 or ME.
+	</li>
+	<li>
+	Case-insensitive search works for non-ASCII characters in UTF-8 and 8-bit encodings.
+	Non-regex search in DBCS encodings is always case-sensitive.
+	</li>
+	<li>
+	Non-ASCII characters may be changed to upper and lower case.
+	</li>
+	<li>
+	SciTE on Windows can access all files including those with names outside the user's preferred character encoding.
+	</li>
+	<li>
+	SciTE may be extended with lexers written in Lua.
+	</li>
+	<li>
+	When there are multiple selections, the paste command can go either to the main selection or to each
+	selection. This is controlled with SCI_SETMULTIPASTE.
+	</li>
+	<li>
+	More forms of bad UTF-8 are detected including overlong sequences, surrogates, and characters outside
+	the valid range. Bad UTF-8 bytes are now displayed as 2 hex digits preceded by 'x'.
+	</li>
+	<li>
+	SCI_GETTAG retrieves the value of captured expressions within regular expression searches.
+	</li>
+	<li>
+	Django template highlighting added to the HTML lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2974889&group_id=2439">Feature #2974889.</a>
+	</li>
+	<li>
+	Verilog line comments can be folded.
+	</li>
+	<li>
+	SciTE on Windows allows specifying a filter for the Save As dialog.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2943445&group_id=2439">Feature #2943445.</a>
+	</li>
+	<li>
+	Bug fixed when multiple selection disabled where rectangular selections could be expanded into multiple selections.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2948260&group_id=2439">Bug #2948260.</a>
+	</li>
+	<li>
+	Bug fixed when document horizontally scrolled and up/down-arrow did not return to the same
+	column after horizontal scroll occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2950799&group_id=2439">Bug #2950799.</a>
+	</li>
+	<li>
+	Bug fixed to remove hotspot highlight when mouse is moved out of the document. Windows only fix.
+	<a href="https://sourceforge.net/tracker/?func=detail&aid=2951353&group_id=2439&atid=102439">Bug #2951353.</a>
+	</li>
+	<li>
+	R lexer now performs case-sensitive check for keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2956543&group_id=2439">Bug #2956543.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ where text disappeared when a wrap occurred.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2958043&group_id=2439">Bug #2958043.</a>
+	</li>
+	<li>
+	Bug fixed where regular expression replace cannot escape the '\' character by using '\\'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2959876&group_id=2439">Bug #2959876.</a>
+	</li>
+	<li>
+	Bug fixed on GTK+ when virtual space disabled, middle-click could still paste text beyond end of line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2971618&group_id=2439">Bug #2971618.</a>
+	</li>
+	<li>
+	SciTE crash fixed when double clicking on a malformed error message in the output pane.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2976551&group_id=2439">Bug #2976551.</a>
+	</li>
+	<li>
+	Improved performance on GTK+ when changing parameters associated with scroll bars to the same value.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2964357&group_id=2439">Bug #2964357.</a>
+	</li>
+	<li>
+	Fixed bug with pressing Shift+Tab with a rectangular selection so that it performs an un-indent
+	similar to how Tab performs an indent.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite203.zip?download">Release 2.03</a>
+    </h3>
+    <ul>
+	<li>
+	Released 14 February 2010.
+	</li>
+	<li>
+	Added SCI_SETFIRSTVISIBLELINE to match SCI_GETFIRSTVISIBLELINE.
+	</li>
+	<li>
+	Erlang lexer extended set of numeric bases recognized; separate style for module:function_name; detects
+	built-in functions, known module attributes, and known preprocessor instructions; recognizes EDoc and EDoc macros;
+	separates types of comments.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942448&group_id=2439">Bug #2942448.</a>
+	</li>
+	<li>
+	Python lexer extended with lexer.python.strings.over.newline option that allows non-triple-quoted strings to extend
+	past line ends. This allows use of the Ren'Py language.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2945550&group_id=2439">Feature #2945550.</a>
+	</li>
+	<li>
+	Fixed bugs with cursor movement after deleting a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2942131&group_id=2439">Bug #2942131.</a>
+	</li>
+	<li>
+	Fixed bug where calling SCI_SETSEL when there is a rectangular selection left
+	the additional selections selected.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2947064&group_id=2439">Bug #2947064.</a>
+	</li>
+	<li>
+	Fixed macro recording bug where not all bytes in multi-byte character insertions were reported through
+	SCI_REPLACESEL.
+	</li>
+	<li>
+	Fixed SciTE bug where using Ctrl+Enter followed by Ctrl+Space produced an autocompletion list
+	with only a single line containing all the identifiers.
+	</li>
+	<li>
+	Fixed SciTE on GTK+ bug where running a tool made the user interface completely unresponsive.
+	</li>
+	<li>
+	Fixed SciTE on Windows Copy to RTF bug.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2108574&group_id=2439">Bug #2108574.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite202.zip?download">Release 2.02</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 January 2010.
+	</li>
+	<li>
+	Markdown lexer added.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2844081&group_id=2439">Feature #2844081.</a>
+	</li>
+	<li>
+	On GTK+, include code that understands the ranges of lead bytes for code pages 932, 936, and 950
+	so that most Chinese and Japanese text can be used on systems that are not set to the corresponding locale.
+	</li>
+	<li>
+	Allow changing the size of dots in visible whitespace using SCI_SETWHITESPACESIZE.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2839427&group_id=2439">Feature #2839427.</a>
+	</li>
+	<li>
+	Additional carets can be hidden with SCI_SETADDITIONALCARETSVISIBLE.
+	</li>
+	<li>
+	Can choose anti-aliased, non-anti-aliased or lcd-optimized text using SCI_SETFONTQUALITY.
+	</li>
+	<li>
+	Retrieve the current selected text in the autocompletion list with SCI_AUTOCGETCURRENTTEXT.
+	</li>
+	<li>
+	Retrieve the name of the current lexer with SCI_GETLEXERLANGUAGE.
+	</li>
+	<li>
+	Progress 4GL lexer improves handling of comments in preprocessor declaration.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2902206&group_id=2439">Feature #2902206.</a>
+	</li>
+	<li>
+	HTML lexer extended to handle Mako template language.
+	</li>
+	<li>
+	SQL folder extended for SQL Anywhere "EXISTS" and "ENDIF" keywords.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2887524&group_id=2439">Feature #2887524.</a>
+	</li>
+	<li>
+	SciTE adds APIPath and AbbrevPath variables.
+	</li>
+	<li>
+	SciTE on GTK+ uses pipes instead of temporary files for running tools. This should be more secure.
+	</li>
+	<li>
+	Fixed crash when calling SCI_STYLEGETFONT for a style which does not have a font set.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2857425&group_id=2439">Bug #2857425.</a>
+	</li>
+	<li>
+	Fixed crash caused by not having sufficient styles allocated after choosing a lexer.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2881279&group_id=2439">Bug #2881279.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE using autocomplete word when word characters includes space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2840141&group_id=2439">Bug #2840141.</a>
+	</li>
+	<li>
+	Fixed bug with handling upper-case file extensions SciTE on GTK+.
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions with folded folds where it would not
+	be scrolled to the correct location.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882775&group_id=2439">Bug #2882775.</a>
+	</li>
+	<li>
+	Fixed SciTE loading files from sessions when file no longer exists.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2883437&group_id=2439">Bug #2883437.</a>
+	</li>
+	<li>
+	Fixed SciTE export to HTML using the wrong background colour.
+	</li>
+	<li>
+	Fixed crash when adding an annotation and then adding a new line after the annotation.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929708&group_id=2439">Bug #2929708.</a>
+	</li>
+	<li>
+	Fixed crash in SciTE setting a property to nil from Lua.
+	</li>
+	<li>
+	SCI_GETSELTEXT fixed to return correct length.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2929441&group_id=2439">Bug #2929441.</a>
+	</li>
+	<li>
+	Fixed text positioning problems with selection in some circumstances.
+	</li>
+	<li>
+	Fixed text positioning problems with ligatures on GTK+.
+	</li>
+	<li>
+	Fixed problem pasting into rectangular selection with caret at bottom caused text to go from the caret down
+	rather than replacing the selection.
+	</li>
+	<li>
+	Fixed problem replacing in a rectangular selection where only the final line was changed.
+	</li>
+	<li>
+	Fixed inability to select a rectangular area using Alt+Shift+Click at both corners.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2899746&group_id=2439">Bug #2899746.</a>
+	</li>
+	<li>
+	Fixed problem moving to start/end of a rectangular selection with left/right key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871358&group_id=2439">Bug #2871358.</a>
+	</li>
+	<li>
+	Fixed problem with Select All when there's a rectangular selection.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2930488&group_id=2439">Bug #2930488.</a>
+	</li>
+	<li>
+	Fixed SCI_LINEDUPLICATE on a rectangular selection to not produce multiple discontinuous selections.
+	</li>
+	<li>
+	Virtual space removed when performing delete word left or delete line left.
+	Virtual space converted to real space for delete word right.
+	Preserve virtual space when pressing Delete key.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2882566&group_id=2439">Bug #2882566.</a>
+	</li>
+	<li>
+	Fixed problem where Shift+Alt+Down did not move through wrapped lines.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2871749&group_id=2439">Bug #2871749.</a>
+	</li>
+	<li>
+	Fixed incorrect background colour when using coloured lines with virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2914691&group_id=2439">Bug #2914691.</a>
+	</li>
+	<li>
+	Fixed failure to display wrap symbol for SC_WRAPVISUALFLAGLOC_END_BY_TEXT.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2936108&group_id=2439">Bug #2936108.</a>
+	</li>
+	<li>
+	Fixed blank background colour with EOLFilled style on last line.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2890105&group_id=2439">Bug #2890105.</a>
+	</li>
+	<li>
+	Fixed problem in VB lexer with keyword at end of file.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2901239&group_id=2439">Bug #2901239.</a>
+	</li>
+	<li>
+	Fixed SciTE bug where double clicking on a tab closed the file.
+	</li>
+	<li>
+	Fixed SciTE brace matching commands to only work when the caret is next to the brace, not when
+	it is in virtual space.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2885560&group_id=2439">Bug #2885560.</a>
+	</li>
+	<li>
+	Fixed SciTE on Windows Vista to access files in the Program Files directory rather than allow Windows
+	to virtualize access.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2916685&group_id=2439">Bug #2916685.</a>
+	</li>
+	<li>
+	Fixed NSIS folder to handle keywords that start with '!'.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2872157&group_id=2439">Bug #2872157.</a>
+	</li>
+	<li>
+	Changed linkage of Scintilla_LinkLexers to "C" so that it can be used by clients written in C.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2844718&group_id=2439">Bug #2844718.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite201.zip?download">Release 2.01</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 August 2009.
+	</li>
+	<li>
+	Fix to positioning rectangular paste when viewing line ends.
+	</li>
+	<li>
+	Don't insert new lines and indentation for line ends at end of rectangular paste.
+	</li>
+	<li>
+	When not in additional selection typing mode, cutting a rectangular selection removes all of the selected text.
+	</li>
+	<li>
+	Rectangular selections are copied to the clipboard in document order, not in the order of selection.
+	</li>
+	<li>
+	SCI_SETCURRENTPOS and SCI_SETANCHOR work in rectangular mode.
+	</li>
+	<li>
+	On GTK+, drag and drop to a later position in the document now drops at the position.
+	</li>
+	<li>
+	Fix bug where missing property did not use default value.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite200.zip?download">Release 2.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 August 2009.
+	</li>
+	<li>
+	Multiple pieces of text can be selected simultaneously by holding control while dragging the mouse.
+	Typing, backspace and delete may affect all selections together.
+	</li>
+	<li>
+	Virtual space allows selecting beyond the last character on a line.
+	</li>
+	<li>
+	SciTE on GTK+ path bar is now optional and defaults to off.
+	</li>
+	<li>
+	MagikSF lexer recognizes numbers correctly.
+	</li>
+	<li>
+	Folding of Python comments and blank lines improved. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=210240&group_id=2439">Bug #210240.</a>
+	</li>
+	<li>
+	Bug fixed where background colour of last character in document leaked past that character.
+	</li>
+	<li>
+	Crash fixed when adding marker beyond last line in document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830307&group_id=2439">Bug #2830307.</a>
+	</li>
+	<li>
+	Resource leak fixed in SciTE for Windows when printing fails. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2816524&group_id=2439">Bug #2816524.</a>
+	</li>
+	<li>
+	Bug fixed on Windows where the system caret was destroyed during destruction when another window
+	was using the system caret. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2830223&group_id=2439">Bug #2830223.</a>
+	</li>
+	<li>
+	Bug fixed where indentation guides were drawn over text when the indentation used a style with a different
+	space width to the default style.
+	</li>
+	<li>
+	SciTE bug fixed where box comment added a bare line feed rather than the chosen line end. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2818104&group_id=2439">Bug #2818104.</a>
+	</li>
+	<li>
+	Reverted fix that led to wrapping whole document when displaying the first line of the document.
+	</li>
+	<li>
+	Export to LaTeX in SciTE fixed to work in more cases and not use as much space. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=1286548&group_id=2439">Bug #1286548.</a>
+	</li>
+	<li>
+	Bug fixed where EN_CHANGE notification was sent when performing a paste operation in a
+	read-only document. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2825485&group_id=2439">Bug #2825485.</a>
+	</li>
+	<li>
+	Refactored code so that Scintilla exposes less of its internal implementation and uses the C++ standard
+	library for some basic collections. Projects that linked to Scintilla's SString or PropSet classes
+	should copy this code from a previous version of Scintilla or from SciTE.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite179.zip?download">Release 1.79</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 July 2009.
+	</li>
+	<li>
+	Memory exhaustion and other exceptions handled by placing an error value into the
+	status property rather than crashing.
+	Scintilla now builds with exception handling enabled and requires exception handling to be enabled. <br />
+	This is a major change and application developers should consider how they will deal with Scintilla exhausting
+	memory since Scintilla may not be in a stable state.
+	</li>
+	<li>
+	Deprecated APIs removed. The symbols removed are:
+	<ul>
+ <li>SCI_SETCARETPOLICY</li>
+<li> CARET_CENTER</li>
+<li> CARET_XEVEN</li>
+<li> CARET_XJUMPS</li>
+<li> SC_FOLDFLAG_BOX</li>
+<li> SC_FOLDLEVELBOXHEADERFLAG</li>
+<li> SC_FOLDLEVELBOXFOOTERFLAG</li>
+<li> SC_FOLDLEVELCONTRACTED</li>
+<li> SC_FOLDLEVELUNINDENT</li>
+<li> SCN_POSCHANGED</li>
+<li> SCN_CHECKBRACE</li>
+<li> SCLEX_ASP</li>
+<li> SCLEX_PHP</li>
+</ul>
+	</li>
+	<li>
+	Cocoa platform added.
+	</li>
+	<li>
+	Names of struct types in Scintilla.h now start with "Sci_" to avoid possible clashes with platform
+	definitions. Currently, the old names still work but these will be phased out.
+	</li>
+	<li>
+	When lines are wrapped, subsequent lines may be indented to match the indent of the initial line,
+	or one more indentation level. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2796119&group_id=2439">Feature #2796119.</a>
+	</li>
+	<li>
+	APIs added for finding the character at a point rather than an inter-character position. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2646738&group_id=2439">Feature #2646738.</a>
+	</li>
+	<li>
+	A new marker SC_MARK_BACKGROUND_UNDERLINE is drawn in the text area as an underline
+	the full width of the window.
+	</li>
+	<li>
+	Batch file lexer understands variables surrounded by '!'.
+	</li>
+	<li>
+	CAML lexer also supports SML.
+	</li>
+	<li>
+	D lexer handles string and numeric literals more accurately. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2793782&group_id=2439">Feature #2793782.</a>
+	</li>
+	<li>
+	Forth lexer is now case-insensitive and better supports numbers like $hex and %binary. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2804894&group_id=2439">Feature #2804894.</a>
+	</li>
+	<li>
+	Lisp lexer treats '[', ']', '{', and '}' as balanced delimiters which is common usage. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794989&group_id=2439">Feature #2794989.</a>
+	<br />
+	It treats keyword argument names as being equivalent to symbols. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2794901&group_id=2439">Feature #2794901.</a>
+	</li>
+	<li>
+	Pascal lexer bug fixed to prevent hang when 'interface' near beginning of file. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2802863&group_id=2439">Bug #2802863.</a>
+	</li>
+	<li>
+	Perl lexer bug fixed where previous lexical states persisted causing "/" special case styling and
+	subroutine prototype styling to not be correct. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2809168&group_id=2439">Bug #2809168.</a>
+	</li>
+	<li>
+	XML lexer fixes bug where Unicode entities like '&amp;—' were broken into fragments. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2804760&group_id=2439">Bug #2804760.</a>
+	</li>
+	<li>
+	SciTE on GTK+ enables scrolling the tab bar on recent versions of GTK+. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2061821&group_id=2439">Feature #2061821.</a>
+	</li>
+	<li>
+	SciTE on Windows allows tab bar tabs to be reordered by drag and drop.
+	</li>
+	<li>
+	Unit test script for Scintilla on Windows included with source code.
+	</li>
+	<li>
+	User defined menu items are now localized when there is a matching translation.
+	</li>
+	<li>
+	Width of icon column of autocompletion lists on GTK+ made more consistent.
+	</li>
+	<li>
+	Bug with slicing UTF-8 text into character fragments when there is a sequence of 100 or more 3 byte characters. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2780566&group_id=2439">Bug #2780566.</a>
+	</li>
+	<li>
+	Folding bugs introduced in 1.78 fixed. Some of the fix was generic and there was also a specific fix for C++.
+	</li>
+	<li>
+	Bug fixed where a rectangular paste was not padding the line with sufficient spaces to align the pasted text.
+	</li>
+	<li>
+	Bug fixed with showing all text on each line of multi-line annotations when styling the whole annotation using SCI_ANNOTATIONSETSTYLE. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2789430&group_id=2439">Bug #2789430.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite178.zip?download">Release 1.78</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 28 April 2009.
+	</li>
+	<li>
+	Annotation lines may be added to each line.
+	</li>
+	<li>
+	A text margin may be defined with different text on each line.
+	</li>
+	<li>
+	Application actions may be added to the undo history.
+	</li>
+	<li>
+	Can query the symbol defined for a marker.
+	An available symbol added for applications to indicate that plugins may allocate a marker.
+	</li>
+	<li>
+	Can increase the amount of font ascent and descent.
+	</li>
+	<li>
+	COBOL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Nimrod lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2642620&group_id=2439">Feature #2642620.</a>
+	</li>
+	<li>
+	PowerPro lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2195308&group_id=2439">Feature #2195308.</a>
+	</li>
+	<li>
+	SML lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2710950&group_id=2439">Feature #2710950.</a>
+	</li>
+	<li>
+	SORCUS Installation file lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2343375&group_id=2439">Feature #2343375.</a>
+	</li>
+	<li>
+	TACL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	TAL lexer added. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2127406&group_id=2439">Feature #2127406.</a>
+	</li>
+	<li>
+	Rewritten Pascal lexer with improved folding and other fixes. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2190650&group_id=2439">Feature #2190650.</a>
+	</li>
+	<li>
+	INDIC_ROUNDBOX translucency level can be modified. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2586290&group_id=2439">Feature #2586290.</a>
+	</li>
+	<li>
+	C++ lexer treats angle brackets in #include directives as quotes when styling.within.preprocessor. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2551033&group_id=2439">Bug #2551033.</a>
+	</li>
+	<li>
+	Inno Setup lexer is sensitive to whether within the [Code] section and handles comments better. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2552973&group_id=2439">Bug #2552973.</a>
+	</li>
+	<li>
+	HTML lexer does not go into script mode when script tag is self-closing.
+	</li>
+	<li>
+	HTML folder fixed where confused by comments when fold.html.preprocessor off. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2532774&group_id=2439">Bug #2532774.</a>
+	</li>
+	<li>
+	Perl lexer fixes problem with string matching caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2648342&group_id=2439">Bug #2648342.</a>
+	</li>
+	<li>
+	Progress lexer fixes problem with "last-event:function" phrase. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2483619&group_id=2439">Bug #2483619.</a>
+	</li>
+	<li>
+	Properties file lexer extended to handle RFC2822 text when lexer.props.allow.initial.spaces on.
+	</li>
+	<li>
+	Python lexer adds options for Python 3 and Cython.
+	</li>
+	<li>
+	Shell lexer fixes heredoc problem caused by line endings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2635257&group_id=2439">Bug #2635257.</a>
+	</li>
+	<li>
+	TeX lexer handles comment at end of line correctly. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2698766&group_id=2439">Bug #2698766.</a>
+	</li>
+	<li>
+	SciTE retains selection range when performing a replace selection command. <a href="https://sourceforge.net/tracker/?func=detail&atid=352439&aid=2339160&group_id=2439">Feature #2339160.</a>
+	</li>
+	<li>
+	SciTE definition of word characters fixed to match documentation. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2464531&group_id=2439">Bug #2464531.</a>
+	</li>
+	<li>
+	SciTE on GTK+ performing Search or Replace when dialog already shown now brings dialog to foreground.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2634224&group_id=2439">Bug #2634224.</a>
+	</li>
+	<li>
+	Fixed encoding bug with calltips on GTK+.
+	</li>
+	<li>
+	Block caret drawn in correct place on wrapped lines. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2126144&group_id=2439">Bug #2126144.</a>
+	</li>
+	<li>
+	Compilation for 64 bit Windows works using MinGW. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2515578&group_id=2439">Bug #2515578.</a>
+	</li>
+	<li>
+	Incorrect memory freeing fixed on OS X.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2354098&group_id=2439">Bug #2354098</a>,
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2671749&group_id=2439">Bug #2671749.</a>
+	</li>
+	<li>
+	SciTE on GTK+ crash fixed on startup when child process exits before initialization complete.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2716987&group_id=2439">Bug #2716987.</a>
+	</li>
+	<li>
+	Crash fixed when AutoCompleteGetCurrent called with no active autocompletion.
+	</li>
+	<li>
+	Flickering diminished when pressing Tab. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2723006&group_id=2439">Bug #2723006.</a>
+	</li>
+	<li>
+	Namespace compilation issues with GTK+ on OS X fixed.
+	</li>
+	<li>
+	Increased maximum length of SciTE's Language menu on GTK+ to 100 items. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2528241&group_id=2439">Bug #2528241.</a>
+	</li>
+	<li>
+	Fixed incorrect Python lexing for multi-line continued strings. <a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=2450963&group_id=2439">Bug #2450963.</a>
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite177.zip?download">Release 1.77</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 October 2008.
+	</li>
+	<li>
+	Direct temporary access to Scintilla's text buffer to allow simple efficient interfacing
+	to libraries like regular expression libraries.
+	</li>
+	<li>
+	Scintilla on Windows can interpret keys as Unicode even when a narrow character
+	window with SCI_SETKEYSUNICODE.
+	</li>
+	<li>
+	Notification sent when autocompletion cancelled.
+	</li>
+	<li>
+	MySQL lexer added.
+	</li>
+	<li>
+	Lexer for gettext .po files added.
+	</li>
+	<li>
+	Abaqus lexer handles program structure more correctly.
+	</li>
+	<li>
+	Assembler lexer works with non-ASCII text.
+	</li>
+	<li>
+	C++ lexer allows mixed case doc comment tags.
+	</li>
+	<li>
+	CSS lexer updated and works with non-ASCII.
+	</li>
+	<li>
+	Diff lexer adds style for changed lines, handles subversion diffs better and
+	fixes styling and folding for lines containing chunk dividers ("---").
+	</li>
+	<li>
+	FORTRAN lexer accepts more styles of compiler directive.
+	</li>
+	<li>
+	Haskell lexer allows hexadecimal literals.
+	</li>
+	<li>
+	HTML lexer improves PHP and JavaScript folding.
+	PHP heredocs, nowdocs, strings and comments processed more accurately.
+	Internet Explorer's non-standard &gt;comment&lt; tag supported.
+	Script recognition in XML can be controlled with lexer.xml.allow.scripts property.
+	</li>
+	<li>
+	Lua lexer styles last character correctly.
+	</li>
+	<li>
+	Perl lexer update.
+	</li>
+	<li>
+	Comment folding implemented for Ruby.
+	</li>
+	<li>
+	Better TeX folding.
+	</li>
+	<li>
+	Verilog lexer updated.
+	</li>
+	<li>
+	Windows Batch file lexer handles %~ and %*.
+	</li>
+	<li>
+	YAML lexer allows non-ASCII text.
+	</li>
+	<li>
+	SciTE on GTK+ implements "Replace in Buffers" in advanced mode.
+	</li>
+	<li>
+	The extender OnBeforeSave method can override the default file saving behaviour by retuning true.
+	</li>
+	<li>
+	Window position and recent files list may be saved into the session file.
+	</li>
+	<li>
+	Right button press outside the selection moves the caret.
+	</li>
+	<li>
+	SciTE load.on.activate works when closing a document reveals a changed document.
+	</li>
+	<li>
+	SciTE bug fixed where eol.mode not used for initial buffer.
+	</li>
+	<li>
+	SciTE bug fixed where a file could be saved as the same name as another
+	buffer leading to confusing behaviour.
+	</li>
+	<li>
+	Fixed display bug for long lines in same style on Windows.
+	</li>
+	<li>
+	Fixed SciTE crash when finding matching preprocessor command used on some files.
+	</li>
+	<li>
+	Drawing performance improved for files with many blank lines.
+	</li>
+	<li>
+	Folding bugs fixed where changing program text produced a decrease in fold level on a fold header line.
+	</li>
+	<li>
+	Clearing document style now clears all indicators.
+	</li>
+	<li>
+	SciTE's embedded Lua updated to 5.1.4.
+	</li>
+	<li>
+	SciTE will compile with versions of GTK+ before 2.8 again.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where multiple files not opened.
+	</li>
+	<li>
+	Bug fixed with SCI_VCHOMEWRAP and SCI_VCHOMEWRAPEXTEND on white last line.
+	</li>
+	<li>
+	Regular expression bug fixed where "^[^(]+$" matched empty lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite176.zip?download">Release 1.76</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 16 March 2008.
+	</li>
+	<li>
+	Support for PowerShell.
+	</li>
+	<li>
+	Lexer added for Magik.
+	</li>
+	<li>
+	Director extension working on GTK+.
+	</li>
+	<li>
+	Director extension may set focus to SciTE through "focus:" message on GTK+.
+	</li>
+	<li>
+	C++ folder handles final line better in some cases.
+	</li>
+	<li>
+	SCI_COPYALLOWLINE added which is similar to SCI_COPY except that if the selection is empty then
+	the line holding the caret is copied. On Windows an extra clipboard format allows pasting this as a whole
+	line before the current selection. This behaviour is compatible with Visual Studio.
+	</li>
+	<li>
+	On Windows, the horizontal scroll bar can handle wider files.
+	</li>
+	<li>
+	On Windows, a system palette leak was fixed. Should not affect many as palette mode is rarely used.
+	</li>
+	<li>
+	Install command on GTK+ no longer tries to set explicit owner.
+	</li>
+	<li>
+	Perl lexer handles defined-or operator "//".
+	</li>
+	<li>
+	Octave lexer fixes "!=" operator.
+	</li>
+	<li>
+	Optimized selection change drawing to not redraw as much when not needed.
+	</li>
+	<li>
+	SciTE on GTK+ no longer echoes Lua commands so is same as on Windows.
+	</li>
+	<li>
+	Automatic vertical scrolling limited to one line at a time so is not too fast.
+	</li>
+	<li>
+	Crash fixed when line states set beyond end of line states. This occurred when lexers did not
+	set a line state for each line.
+	</li>
+	<li>
+	Crash in SciTE on Windows fixed when search for 513 character string fails.
+	</li>
+	<li>
+	SciTE disables translucent features on Windows 9x due to crashes reported when using translucency.
+	</li>
+	<li>
+	Bug fixed where whitespace background was not seen on wrapped lines.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite175.zip?download">Release 1.75</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 22 November 2007.
+	</li>
+	<li>
+	Some WordList and PropSet functionality moved from Scintilla to SciTE.
+	Projects that link to Scintilla's code for these classes may need to copy
+	code from SciTE.
+	</li>
+	<li>
+	Borland C++ can no longer build Scintilla.
+	</li>
+	<li>
+	Invalid bytes in UTF-8 mode are displayed as hex blobs. This also prevents crashes due to
+	passing invalid UTF-8 to platform calls.
+	</li>
+	<li>
+	Indentation guides enhanced to be visible on completely empty lines when possible.
+	</li>
+	<li>
+	The horizontal scroll bar may grow to match the widest line displayed.
+	</li>
+	<li>
+	Allow autocomplete pop ups to appear outside client rectangle in some cases.
+	</li>
+	<li>
+	When line state changed, SC_MOD_CHANGELINESTATE modification notification sent and
+	margin redrawn.
+	</li>
+	<li>
+	SciTE scripts can access the menu command values IDM_*.
+	</li>
+	<li>
+	SciTE's statement.end property has been implemented again.
+	</li>
+	<li>
+	SciTE shows paths and matches in different styles for Find In Files.
+	</li>
+	<li>
+	Incremental search in SciTE for Windows is modeless to make it easier to exit.
+	</li>
+	<li>
+	Folding performance improved.
+	</li>
+	<li>
+	SciTE for GTK+ now includes a Browse button in the Find In Files dialog.
+	</li>
+	<li>
+	On Windows versions that support Unicode well, Scintilla is a wide character window
+	which allows input for some less common languages like Armenian, Devanagari,
+	Tamil, and Georgian. To fully benefit, applications should use wide character calls.
+	</li>
+	<li>
+	Lua function names are exported from SciTE to allow some extension libraries to work.
+	</li>
+	<li>
+	Lexers added for Abaqus, Ansys APDL, Asymptote, and R.
+	</li>
+	<li>
+	SCI_DELWORDRIGHTEND added for closer compatibility with GTK+ entry widget.
+	</li>
+	<li>
+	The styling buffer may now use all 8 bits in each byte for lexical states with 0 bits for indicators.
+	</li>
+	<li>
+	Multiple characters may be set for SciTE's calltip.&lt;lexer&gt;.parameters.start property.
+	</li>
+	<li>
+	Bash lexer handles octal literals.
+	</li>
+	<li>
+	C++/JavaScript lexer recognizes regex literals in more situations.
+	</li>
+	<li>
+	Haskell lexer fixed for quoted strings.
+	</li>
+	<li>
+	HTML/XML lexer does not notice XML indicator if there is
+	non-whitespace between the "&lt;?" and "XML".
+	ASP problem fixed where &lt;/ is used inside a comment.
+	</li>
+	<li>
+	Error messages from Lua 5.1 are recognized.
+	</li>
+	<li>
+	Folding implemented for Metapost.
+	</li>
+	<li>
+	Perl lexer enhanced for handling minus-prefixed barewords,
+	underscores in numeric literals and vector/version strings,
+	^D and ^Z similar to __END__,
+	subroutine prototypes as a new lexical class,
+	formats and format blocks as new lexical classes, and
+	'/' suffixed keywords and barewords.
+	</li>
+	<li>
+	Python lexer styles all of a decorator in the decorator style rather than just the name.
+	</li>
+	<li>
+	YAML lexer styles colons as operators.
+	</li>
+	<li>
+	Fixed SciTE bug where undo would group together multiple separate modifications.
+	</li>
+	<li>
+	Bug fixed where setting background colour of calltip failed.
+	</li>
+	<li>
+	SciTE allows wildcard suffixes for file pattern based properties.
+	</li>
+	<li>
+	SciTE on GTK+ bug fixed where user not prompted to save untitled buffer.
+	</li>
+	<li>
+	SciTE bug fixed where property values from one file were not seen by lower priority files.
+	</li>
+	<li>
+	Bug fixed when showing selection with a foreground colour change which highlighted
+	an incorrect range in some positions.
+	</li>
+	<li>
+	Cut now invokes SCN_MODIFYATTEMPTRO notification.
+	</li>
+	<li>
+	Bug fixed where caret not shown at beginning of wrapped lines.
+	Caret made visible in some cases after wrapping and scroll bar updated after wrapping.
+	</li>
+	<li>
+	Modern indicators now work on wrapped lines.
+	</li>
+	<li>
+	Some crashes fixed for 64-bit GTK+.
+	</li>
+	<li>
+	On GTK+ clipboard features improved for VMWare tools copy and paste.
+	SciTE exports the clipboard more consistently on shut down.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite174.zip?download">Release 1.74</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 18 June 2007.
+	</li>
+	<li>
+	OS X support.
+	</li>
+	<li>
+	Indicators changed to be a separate data structure allowing more indicators. Storing indicators in high bits
+	of styling bytes is deprecated and will be removed in the next version.
+	</li>
+	<li>
+	Unicode support extended to all Unicode characters not just the Basic Multilingual Plane.
+	</li>
+	<li>
+	Performance improved on wide lines by breaking long runs in a single style into shorter segments.
+	</li>
+	<li>
+	Performance improved by caching layout of short text segments.
+	</li>
+	<li>
+	SciTE includes Lua 5.1.
+	</li>
+	<li>
+	Caret may be displayed as a block.
+	</li>
+	<li>
+	Lexer added for GAP.
+	</li>
+	<li>
+	Lexer added for PL/M.
+	</li>
+	<li>
+	Lexer added for Progress.
+	</li>
+	<li>
+	SciTE session files have changed format to be like other SciTE .properties files
+	and now use the extension .session.
+	Bookmarks and folds may optionally be saved in session files.
+	Session files created with previous versions of SciTE will not load into this version.
+	</li>
+	<li>
+	SciTE's extension and scripting interfaces add OnKey, OnDwellStart, and OnClose methods.
+	</li>
+	<li>
+	On GTK+, copying to the clipboard does not include the text/urilist type since this caused problems when
+	pasting into Open Office.
+	</li>
+	<li>
+	On GTK+, Scintilla defaults caret blink rate to platform preference.
+	</li>
+	<li>
+	Dragging does not start until the mouse has been dragged a certain amount.
+	This stops spurious drags when just clicking inside the selection.
+	</li>
+	<li>
+	Bug fixed where brace highlight not shown when caret line background set.
+	</li>
+	<li>
+	Bug fixed in Ruby lexer where out of bounds access could occur.
+	</li>
+	<li>
+	Bug fixed in XML folding where tags were not being folded because they are singletons in HTML.
+	</li>
+	<li>
+	Bug fixed when many font names used.
+	</li>
+	<li>
+	Layout bug fixed on GTK+ where fonts have ligatures available.
+	</li>
+	<li>
+	Bug fixed with SCI_LINETRANSPOSE on a blank line.
+	</li>
+	<li>
+	SciTE hang fixed when using UNC path with directory properties feature.
+	</li>
+	<li>
+	Bug on Windows fixed by examining dropped text for Unicode even in non-Unicode mode so it
+	can work when source only provides Unicode or when using an encoding different from the
+	system default.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where Stop Executing did not work when more than a single process started.
+	</li>
+	<li>
+	SciTE bug on GTK+ fixed where mouse wheel was not switching between buffers.
+	</li>
+	<li>
+	Minor line end fix to PostScript lexer.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite173.zip?download">Release 1.73</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 March 2007.
+	</li>
+	<li>
+	SciTE adds a Directory properties file to configure behaviour for files in a directory and its subdirectories.
+	</li>
+	<li>
+	Style changes may be made during text modification events.
+	</li>
+	<li>
+	Regular expressions recognize \d, \D, \s, \S, \w, \W, and \xHH.
+	</li>
+	<li>
+	Support for cmake language added.
+	</li>
+	<li>
+	More Scintilla properties can be queried.
+	</li>
+	<li>
+	Edge line drawn under text.
+	</li>
+	<li>
+	A savesession command added to SciTE director interface.
+	</li>
+	<li>
+	SciTE File | Encoding menu item names changed to be less confusing.
+	</li>
+	<li>
+	SciTE on GTK+ dialog buttons reordered to follow guidelines.
+	</li>
+	<li>
+	SciTE on GTK+ removed GTK+ 1.x compatible file dialog code.
+	</li>
+	<li>
+	SciTE on GTK+ recognizes key names KeypadMultiply and KeypadDivide.
+	</li>
+	<li>
+	Background colour of line wrapping visual flag changed to STYLE_DEFAULT.
+	</li>
+	<li>
+	Makefile lexing enhanced for ':=' operator and when lines start with tab.
+	</li>
+	<li>
+	TADS3 lexer and folder improved.
+	</li>
+	<li>
+	SCN_DOUBLECLICK notification may set SCI_SHIFT, SCI_CTRL, and SCI_ALT flags on modifiers field.
+	</li>
+	<li>
+	Slow folding of large constructs in Python fixed.
+	</li>
+	<li>
+	MSSQL folding fixed to be case-insensitive and fold at more keywords.
+	</li>
+	<li>
+	SciTE's brace matching works better for HTML.
+	</li>
+	<li>
+	Determining API list items checks for specified parameters start character before default '('.
+	</li>
+	<li>
+	Hang fixed in HTML lexer.
+	</li>
+	<li>
+	Bug fixed in with LineTranspose command where markers could move to different line.
+	</li>
+	<li>
+	Memory released when buffer completely emptied.
+	</li>
+	<li>
+	If translucency not available on Windows, draw rectangular outline instead.
+	</li>
+	<li>
+	Bash lexer handles "-x" in "--x-includes..." better.
+	</li>
+	<li>
+	AutoIt3 lexer fixes string followed by '+'.
+	</li>
+	<li>
+	LinesJoin fixed where it stopped early due to not adjusting for inserted spaces..
+	</li>
+	<li>
+	StutteredPageDown fixed when lines wrapped.
+	</li>
+	<li>
+	FormatRange fixed to not double count line number width which could lead to a large space.
+	</li>
+	<li>
+	SciTE Export As PDF and Latex commands fixed to format floating point numbers with '.' even in locales
+	that use ','.
+	</li>
+	<li>
+	SciTE bug fixed where File | New could produce buffer with contents of previous file when using read-only mode.
+	</li>
+	<li>
+	SciTE retains current scroll position when switching buffers and fold.on.open set.
+	</li>
+	<li>
+	SciTE crash fixed where '*' used to invoke parameters dialog.
+	</li>
+	<li>
+	SciTE bugs when writing large UCS-2 files fixed.
+	</li>
+	<li>
+	Bug fixed when scrolling inside a SCN_PAINTED event by invalidating window
+	rather than trying to perform synchronous painting.
+	</li>
+	<li>
+	SciTE for GTK+ View | Full Screen works on recent versions of GTK+.
+	</li>
+	<li>
+	SciTE for Windows enables and disables toolbar commands correctly.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite172.zip?download">Release 1.72</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 15 January 2007.
+	</li>
+	<li>
+	Performance of per-line data improved.
+	</li>
+	<li>
+	SC_STARTACTION flag set on the first modification notification in an undo
+	transaction to help synchronize the container's undo stack with Scintilla's.
+	</li>
+	<li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li>
+	<li>
+	Scintilla supports extending appearance of selection to right hand margin.
+	</li>
+	<li>
+	Incremental search available on GTK+.
+	</li>
+	<li>
+	SciTE Indentation Settings dialog available on GTK+ and adds a "Convert" button.
+	</li>
+	<li>
+	Find in Files can optionally ignore binary files or directories that start with ".".
+	</li>
+	<li>
+	Lexer added for "D" language.
+	</li>
+	<li>
+	Export as HTML shows folding with underline lines and +/- symbols.
+	</li>
+	<li>
+	Ruby lexer interprets interpolated strings as expressions.
+	</li>
+	<li>
+	Lua lexer fixes some cases of numeric literals.
+	</li>
+	<li>
+	C++ folder fixes bug with "@" in doc comments.
+	</li>
+	<li>
+	NSIS folder handles !if and related commands.
+	</li>
+	<li>
+	Inno setup lexer adds styling for single and double quoted strings.
+	</li>
+	<li>
+	Matlab lexer handles backslashes in string literals correctly.
+	</li>
+	<li>
+	HTML lexer fixed to allow "?&gt;" in comments in Basic script.
+	</li>
+	<li>
+	Added key codes for Windows key and Menu key.
+	</li>
+	<li>
+	Lua script method scite.MenuCommand(x) performs a menu command.
+	</li>
+	<li>
+	SciTE bug fixed with box comment command near start of file setting selection to end of file.
+	</li>
+	<li>
+	SciTE on GTK+, fixed loop that occurred with automatic loading for an unreadable file.
+	</li>
+	<li>
+	SciTE asks whether to save files when Windows shuts down.
+	</li>
+	<li>
+	Save Session on Windows now defaults the extension to "ses".
+	</li>
+	<li>
+	Bug fixed with single character keywords.
+	</li>
+	<li>
+	Fixed infinite loop for SCI_GETCOLUMN for position beyond end of document.
+	</li>
+	<li>
+	Fixed failure to accept typing on Solaris/GTK+ when using default ISO-8859-1 encoding.
+	</li>
+	<li>
+	Fixed warning from Lua in SciTE when creating a new buffer when already have
+	maximum number of buffers open.
+	</li>
+	<li>
+	Crash fixed with "%%" at end of batch file.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite171.zip?download">Release 1.71</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 21 August 2006.
+	</li>
+	<!--li>
+	On GTK+ drag and drop defaults to move rather than copy.
+	</li-->
+	<li>
+	Double click notification includes line and position.
+	</li>
+	<li>
+	VB lexer bugs fixed for preprocessor directive below a comment or some other states and
+	to use string not closed style back to the starting quote when there are internal doubled quotes.
+	</li>
+	<li>
+	C++ lexer allows identifiers to contain '$' and non-ASCII characters such as UTF-8.
+	The '$' character can be disallowed with lexer.cpp.allow.dollars=0.
+	</li>
+	<li>
+	Perl lexer allows UTF-8 identifiers and has some other small improvements.
+	</li>
+	<li>
+	SciTE's $(CurrentWord) uses word.characters.&lt;filepattern&gt; to define the word
+	rather than a hardcoded list of word characters.
+	</li>
+	<li>
+	SciTE Export as HTML adds encoding information for UTF-8 file and fixes DOCTYPE.
+	</li>
+	<li>
+	SciTE session and .recent files default to the user properties directory rather than global
+	properties directory.
+	</li>
+	<li>
+	Left and right scroll events handled correctly on GTK+ and horizontal scroll bar has more sensible
+	distances for page and arrow clicks.
+	</li>
+	<li>
+	SciTE on GTK+ tab bar fixed to work on recent versions of GTK+.
+	</li>
+	<li>
+	On GTK+, if the approximate character set conversion is unavailable, a second attempt is made
+	without approximations. This may allow keyboard input and paste to work on older systems.
+	</li>
+	<li>
+	SciTE on GTK+ can redefine the Insert key.
+	</li>
+	<li>
+	SciTE scripting interface bug fixed where some string properties could not be changed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite170.zip?download">Release 1.70</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 20 June 2006.
+	</li>
+	<li>
+	On GTK+, character set conversion is performed using an option that allows approximate conversions rather
+	than failures when a character can not be converted. This may lead to similar characters being inserted or
+	when no similar character is available a '?' may be inserted.
+	</li>
+	<li>
+	On GTK+, the internationalized IM (Input Method) feature is used for all typed input for all character sets.
+	</li>
+	<li>
+	Scintilla has new margin types SC_MARGIN_BACK and SC_MARGIN_FORE that use the default
+	style's background and foreground colours (normally white and black) as the background to the margin.
+	</li>
+	<li>
+	Scintilla/GTK+ allows file drops on Windows when drop is of type DROPFILES_DND
+	as well as text/uri-list.
+	</li>
+	<li>
+	Code page can only be set to one of the listed valid values.
+	</li>
+	<li>
+	Text wrapping fixed for cases where insertion was not wide enough to trigger
+	wrapping before being styled but was after styling.
+	</li>
+	<li>
+	SciTE find marks are removed before printing or exporting to avoid producing incorrect styles.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite169.zip?download">Release 1.69</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2006.
+	</li>
+	<li>
+	SciTE supports z-order based buffer switching on Ctrl+Tab.
+	</li>
+	<li>
+	Translucent support for selection and whole line markers.
+	</li>
+	<li>
+	SciTE may have per-language abbreviations files.
+	</li>
+	<li>
+	Support for Spice language.
+	</li>
+	<li>
+	On GTK+ autocompletion lists are optimized and use correct selection colours.
+	</li>
+	<li>
+	On GTK+ the URI data type is preferred in drag and drop so that applications
+	will see files dragged from the shell rather than dragging the text of the file name
+	into the document.
+	</li>
+	<li>
+	Increased number of margins to 5.
+	</li>
+	<li>
+	Basic lexer allows include directive $include: "file name".
+	</li>
+	<li>
+	SQL lexer no longer bases folding on indentation.
+	</li>
+	<li>
+	Line ends are transformed when copied to clipboard on
+	Windows/GTK+2 as well as Windows/GTK+ 1.
+	</li>
+	<li>
+	Lexing code masks off the indicator bits on the start style before calling the lexer
+	to avoid confusing the lexer when an application has used an indicator.
+	</li>
+	<li>
+	SciTE savebefore:yes only saves the file when it has been changed.
+	</li>
+	<li>
+	SciTE adds output.initial.hide setting to allow setting the size of the output pane
+	without it showing initially.
+	</li>
+	<li>
+	SciTE on Windows Go To dialog allows line number with more digits.
+	</li>
+	<li>
+	Bug in HTML lexer fixed where a segment of PHP could switch scripting language
+	based on earlier text on that line.
+	</li>
+	<li>
+	Memory bug fixed when freeing regions on GTK+.
+	Other minor bugs fixed on GTK+.
+	</li>
+	<li>
+	Deprecated GTK+ calls in Scintilla replaced with current calls.
+	</li>
+	<li>
+	Fixed a SciTE bug where closing the final buffer, if read-only, left the text present in an
+	untitled buffer.
+	</li>
+	<li>
+	Bug fixed in bash lexer that prevented folding.
+	</li>
+	<li>
+	Crash fixed in bash lexer when backslash at end of file.
+	</li>
+	<li>
+	Crash on recent releases of GTK+ 2.x avoided by changing default font from X
+	core font to Pango font "!Sans".
+	</li>
+	<li>
+	Fix for SciTE properties files where multiline properties continued over completely blank lines.
+	</li>
+	<li>
+	Bug fixed in SciTE/GTK+ director interface where more data available than
+	buffer size.
+	</li>
+	<li>
+	Minor visual fixes to SciTE splitter on GTK+.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite168.zip?download">Release 1.68</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 9 March 2006.
+	</li>
+	<li>
+	Translucent drawing implemented for caret line and box indicators.
+	</li>
+	<li>
+	Lexer specifically for TCL is much more accurate than reusing C++ lexer.
+	</li>
+	<li>
+	Support for Inno Setup scripts.
+	</li>
+	<li>
+	Support for Opal language.
+	</li>
+	<li>
+	Calltips may use a new style, STYLE_CALLTIP which allows choosing a
+	different font for calltips.
+	</li>
+	<li>
+	Python lexer styles comments on decorators.
+	</li>
+	<li>
+	HTML lexer refined handling of "?>" and "%>" within server
+	side scripts.
+	</li>
+	<li>
+	Batch file lexer improved.
+	</li>
+	<li>
+	Eiffel lexer doesn't treat '.' as a name character.
+	</li>
+	<li>
+	Lua lexer handles length operator, #, and hex literals.
+	</li>
+	<li>
+	Properties file lexer has separate style for keys.
+	</li>
+	<li>
+	PL/SQL folding improved.
+	</li>
+	<li>
+	SciTE Replace dialog always searches in forwards direction.
+	</li>
+	<li>
+	SciTE can detect language of file from initial #! line.
+	</li>
+	<li>
+	SciTE on GTK+ supports output.scroll=2 setting.
+	</li>
+	<li>
+	SciTE can perform an import a properties file from the command line.
+	</li>
+	<li>
+	Set of word characters used for regular expression \&lt; and \&gt;.
+	</li>
+	<li>
+	Bug fixed with SCI_COPYTEXT stopping too early.
+	</li>
+	<li>
+	Bug fixed with splitting lines so that all lines are split.
+	</li>
+	<li>
+	SciTE calls OnSwitchFile when closing one buffer causes a switch to another.
+	</li>
+	<li>
+	SciTE bug fixed where properties were being reevaluated without good reason
+	after running a macro.
+	</li>
+	<li>
+	Crash fixed when clearing document with some lines contracted in word wrap mode.
+	</li>
+	<li>
+	Palette expands as more entries are needed.
+	</li>
+	<li>
+	SCI_POSITIONFROMPOINT returns more reasonable value when close to
+	last text on a line.
+	</li>
+	<li>
+	On Windows, long pieces of text may be drawn in segments if they fail to draw
+	as a whole.
+	</li>
+	<li>
+	Bug fixed with bad drawing when some visual changes made inside SCN_UPDATEUI
+	notification.
+	</li>
+	<li>
+	SciTE bug fixed with groupundo setting.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite167.zip?download">Release 1.67</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 17 December 2005.
+	</li>
+	<li>
+	Scintilla checks the paint region more accurately when seeing if an area is being
+	repainted. Platform layer implementations may need to change for this to take
+	effect. This fixes some drawing and styling bugs. Also optimized some parts of
+	marker code to only redraw the line of the marker rather than whole of the margin.
+	</li>
+	<li>
+	Quoted identifier style for SQL. SQL folding performed more simply.
+	</li>
+	<li>
+	Ruby lexer improved to better handle here documents and non-ASCII
+	characters.
+	</li>
+	<li>
+	Lua lexer supports long string and block comment syntax from Lua 5.1.
+	</li>
+	<li>
+	Bash lexer handles here documents better.
+	</li>
+	<li>
+	JavaScript lexing recognizes regular expressions more accurately and includes flag
+	characters in the regular expression style. This is both in JavaScript files and when
+	JavaScript is embedded in HTML.
+	</li>
+	<li>
+	Scintilla API provided to reveal how many style bits are needed for the
+	current lexer.
+	</li>
+	<li>
+	Selection duplicate added.
+	</li>
+	<li>
+	Scintilla API for adding a set of markers to a line.
+	</li>
+	<li>
+	DBCS encodings work on Windows 9x.
+	</li>
+	<li>
+	Convention defined for property names to be used by lexers and folders
+	so they can be automatically discovered and forwarded from containers.
+	</li>
+	<li>
+	Default bookmark in SciTE changed to a blue sphere image.
+	</li>
+	<li>
+	SciTE stores the time of last asking for a save separately for each buffer
+	which fixes bugs with automatic reloading.
+	</li>
+	<li>
+	On Windows, pasted text has line ends converted to current preference.
+	GTK+ already did this.
+	</li>
+	<li>
+	Kid template language better handled by HTML lexer by finishing ASP Python
+	mode when a ?> is found.
+	</li>
+	<li>
+	SciTE counts number of characters in a rectangular selection correctly.
+	</li>
+	<li>
+	64-bit compatibility improved. One change that may affect user code is that
+	the notification message header changed to include a pointer-sized id field
+	to match the current Windows definition.
+	</li>
+	<li>
+	Empty ranges can no longer be dragged.
+	</li>
+	<li>
+	Crash fixed when calls made that use layout inside the painted notification.
+	</li>
+	<li>
+	Bug fixed where Scintilla created pixmap buffers that were too large leading
+	to failures when many instances used.
+	</li>
+	<li>
+	SciTE sets the directory of a new file to the directory of the currently
+	active file.
+	</li>
+	<li>
+	SciTE allows choosing a code page for the output pane.
+	</li>
+	<li>
+	SciTE HTML exporter no longer honours monospaced font setting.
+	</li>
+	<li>
+	Line layout cache in page mode caches the line of the caret. An assertion is
+	now used to ensure that the layout reentrancy problem that caused this
+	is easier to find.
+	</li>
+	<li>
+	Speed optimized for long lines and lines containing many control characters.
+	</li>
+	<li>
+	Bug fixed in brace matching in DBCS files where byte inside character
+	is same as brace.
+	</li>
+	<li>
+	Indent command does not indent empty lines.
+	</li>
+	<li>
+	SciTE bug fixed for commands that operate on files with empty extensions.
+	</li>
+	<li>
+	SciTE bug fixed where monospaced option was copied for subsequently opened files.
+	</li>
+	<li>
+	SciTE on Windows bug fixed in the display of a non-ASCII search string
+	which can not be found.
+	</li>
+	<li>
+	Bugs fixed with nested calls displaying a new calltip while one is already
+	displayed.
+	</li>
+	<li>
+	Bug fixed when styling PHP strings.
+	</li>
+	<li>
+	Bug fixed when styling C++ continued preprocessor lines.
+	</li>
+	<li>
+	SciTE bug fixed where opening file from recently used list reset choice of
+	language.
+	</li>
+	<li>
+	SciTE bug fixed when compiled with NO_EXTENSIONS and
+	closing one file closes the application.
+	</li>
+	<li>
+	SciTE crash fixed for error messages that look like Lua messages but aren't
+	in the same order.
+	</li>
+	<li>
+	Remaining fold box support deprecated. The symbols SC_FOLDLEVELBOXHEADERFLAG,
+   SC_FOLDLEVELBOXFOOTERFLAG, SC_FOLDLEVELCONTRACTED,
+   SC_FOLDLEVELUNINDENT, and SC_FOLDFLAG_BOX are deprecated.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite166.zip?download">Release 1.66</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 26 August 2005.
+	</li>
+	<li>
+	New, more ambitious Ruby lexer.
+	</li>
+	<li>
+	SciTE Find in Files dialog has options for matching case and whole words which are
+	enabled when the internal find command is used.
+	</li>
+	<li>
+	SciTE output pane can display automatic completion after "$(" typed.
+	An initial ">" on a line is ignored when Enter pressed.
+	</li>
+	<li>
+	C++ lexer recognizes keywords within line doc comments. It continues styles over line
+	end characters more consistently so that eolfilled style can be used for preprocessor lines
+	and line comments.
+	</li>
+	<li>
+	VB lexer improves handling of file numbers and date literals.
+	</li>
+	<li>
+	Lua folder handles repeat until, nested comments and nested strings.
+	</li>
+	<li>
+	POV lexer improves handling of comment lines.
+	</li>
+	<li>
+	AU3 lexer and folder updated. COMOBJ style added.
+	</li>
+	<li>
+	Bug fixed with text display on GTK+ with Pango 1.8.
+	</li>
+	<li>
+	Caret painting avoided when not focused.
+	</li>
+	<li>
+	SciTE on GTK+ handles file names used to reference properties as case-sensitive.
+	</li>
+	<li>
+	SciTE on GTK+ Save As and Export commands set the file name field.
+	On GTK+ the Export commands modify the file name in the same way as on Windows.
+	</li>
+	<li>
+	Fixed SciTE problem where confirmation was not displaying when closing a file where all
+	contents had been deleted.
+	</li>
+	<li>
+	Middle click on SciTE tab now closes correct buffer on Windows when tool bar is visible.
+	</li>
+	<li>
+	SciTE bugs fixed where files contained in directory that includes '.' character.
+	</li>
+	<li>
+	SciTE bug fixed where import in user options was reading file from directory of
+	global options.
+	</li>
+	<li>
+	SciTE calltip bug fixed where single line calltips had arrow displayed incorrectly.
+	</li>
+	<li>
+	SciTE folding bug fixed where empty lines were shown for no reason.
+	</li>
+	<li>
+	Bug fixed where 2 byte per pixel XPM images caused crash although they are still not
+	displayed.
+	</li>
+	<li>
+	Autocompletion list size tweaked.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite165.zip?download">Release 1.65</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 August 2005.
+	</li>
+	<li>
+	FreeBasic support.
+	</li>
+	<li>
+	SciTE on Windows handles command line arguments
+	"-" (read standard input into buffer),
+	"--" (read standard input into output pane) and
+	"-@" (read file names from standard input and open each).
+	</li>
+	<li>
+	SciTE includes a simple implementation of Find in Files which is used if no find.command is set.
+	</li>
+	<li>
+	SciTE can close tabs with a mouse middle click.
+	</li>
+	<li>
+	SciTE includes a save.all.for.build setting.
+	</li>
+	<li>
+	Folder for MSSQL.
+	</li>
+	<li>
+	Batch file lexer understands more of the syntax and the behaviour of built in commands.
+	</li>
+	<li>
+	Perl lexer handles here docs better; disambiguates barewords, quote-like delimiters, and repetition operators;
+	handles Pods after __END__; recognizes numbers better; and handles some typeglob special variables.
+	</li>
+	<li>
+	Lisp adds more lexical states.
+	</li>
+	<li>
+	PHP allows spaces after &lt;&lt;&lt;.
+	</li>
+	<li>
+	TADS3 has a simpler set of states and recognizes identifiers.
+	</li>
+	<li>
+	Avenue elseif folds better.
+	</li>
+	<li>
+	Errorlist lexer treats lines starting with '+++' and '---' as separate
+	styles from '+' and '-' as they indicate file names in diffs.
+	</li>
+	<li>
+	SciTE error recognizer handles file paths in extra explanatory lines from MSVC
+	and in '+++' and '---' lines from diff.
+	</li>
+	<li>
+	Bugs fixed in SciTE and Scintilla folding behaviour when text pasted before
+	folded text caused unnecessary
+	unfolding and cutting text could lead to text being irretrievably hidden.
+	</li>
+	<li>
+	SciTE on Windows uses correct font for dialogs and better font for tab bar
+	allowing better localization
+	</li>
+	<li>
+	When Windows is used with a secondary monitor before the primary
+	monitor, autocompletion lists are not forced onto the primary monitor.
+	</li>
+	<li>
+	Scintilla calltip bug fixed where down arrow setting wrong value in notification
+	if not in first line. SciTE bug fixed where second arrow only shown on multiple line
+	calltip and was therefore misinterpreting the notification value.
+	</li>
+	<li>
+	Lexers will no longer be re-entered recursively during, for example, fold level setting.
+	</li>
+	<li>
+	Undo of typing in overwrite mode undoes one character at a time rather than requiring a removal
+	and addition step for each character.
+	</li>
+	<li>
+	EM_EXSETSEL(0,-1) fixed.
+	</li>
+	<li>
+	Bug fixed where part of a rectangular selection was not shown as selected.
+	</li>
+	<li>
+	Autocomplete window size fixed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite164.zip?download">Release 1.64</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 6 June 2005.
+	</li>
+	<li>
+	TADS3 support
+	</li>
+	<li>
+	Smalltalk support.
+	</li>
+	<li>
+	Rebol support.
+	</li>
+	<li>
+	Flagship (Clipper / XBase) support.
+	</li>
+	<li>
+	CSound support.
+	</li>
+	<li>
+	SQL enhanced to support SQL*Plus.
+	</li>
+	<li>
+	SC_MARK_FULLRECT margin marker fills the whole marker margin for marked
+	lines with a colour.
+	</li>
+	<li>
+	Performance improved for some large undo and redo operations and modification flags
+	added in notifications.
+	</li>
+	<li>
+	SciTE adds command equivalents for fold margin mouse actions.
+	</li>
+	<li>
+	SciTE adds OnUpdateUI to set of events that can be handled by a Lua script.
+	</li>
+	<li>
+	Properties set in Scintilla can be read.
+	</li>
+	<li>
+	GTK+ SciTE exit confirmation adds Cancel button.
+	</li>
+	<li>
+	More accurate lexing of numbers in PHP and Caml.
+	</li>
+	<li>
+	Perl can fold POD and package sections. POD verbatim section style.
+	Globbing syntax recognized better.
+	</li>
+	<li>
+	Context menu moved slightly on GTK+ so that it will be under the mouse and will
+	stay open if just clicked rather than held.
+	</li>
+	<li>
+	Rectangular selection paste works the same whichever direction the selection was dragged in.
+	</li>
+	<li>
+	EncodedFromUTF8 handles -1 length argument as documented.
+	</li>
+	<li>
+	Undo and redo can cause SCN_MODIFYATTEMPTRO notifications.
+	</li>
+	<li>
+	Indicators display correctly when they start at the second character on a line.
+	</li>
+	<li>
+	SciTE Export As HTML uses standards compliant CSS.
+	</li>
+	<li>
+	SciTE automatic indentation handles keywords for indentation better.
+	</li>
+	<li>
+	SciTE fold.comment.python property removed as does not work.
+	</li>
+	<li>
+	Fixed problem with character set conversion when pasting on GTK+.
+	</li>
+	<li>
+	SciTE default character set changed from ANSI_CHARSET to DEFAULT_CHARSET.
+	</li>
+	<li>
+	Fixed crash when creating empty autocompletion list.
+	</li>
+	<li>
+	Autocomplete window size made larger under some conditions to make truncation less common.
+	</li>
+	<li>
+	Bug fixed where changing case of a selection did not affect initial character of lines
+	in multi-byte encodings.
+	</li>
+	<li>
+	Bug fixed where rectangular selection not displayed after Alt+Shift+Click.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite163.zip?download">Release 1.63</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 4 April 2005.
+	</li>
+	<li>
+	Autocompletion on Windows changed to use pop up window, be faster,
+	allow choice of maximum width and height, and to highlight only the text of the
+	selected item rather than both the text and icon if any.
+	</li>
+	<li>
+	Extra items can be added to the context menu in SciTE.
+	</li>
+	<li>
+	Character wrap mode in Scintilla helps East Asian languages.
+	</li>
+	<li>
+	Lexer added for Haskell.
+	</li>
+	<li>
+	Objective Caml support.
+	</li>
+	<li>
+	BlitzBasic and PureBasic support.
+	</li>
+	<li>
+	CSS support updated to handle CSS2.
+	</li>
+	<li>
+	C++ lexer is more selective about document comment keywords.
+	</li>
+	<li>
+	AutoIt 3 lexer improved.
+	</li>
+	<li>
+	Lua lexer styles end of line characters on comment and preprocessor
+	lines so that the eolfilled style can be applied to them.
+	</li>
+	<li>
+	NSIS support updated for line continuations, box comments, SectionGroup and
+	PageEx, and with more up-to-date properties.
+	</li>
+	<li>
+	Clarion lexer updated to perform folding and have more styles.
+	</li>
+	<li>
+	SQL lexer gains second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer recognizes Borland Delphi error messages.
+	</li>
+	<li>
+	Method added for determining number of visual lines occupied by a document
+	line due to wrapping.
+	</li>
+	<li>
+	Sticky caret mode does not modify the preferred caret x position when typing
+	and may be useful for typing columns of text.
+	</li>
+	<li>
+	Dwell end notification sent when scroll occurs.
+	</li>
+	<li>
+	On GTK+, Scintilla requisition height is screen height rather than large fixed value.
+	</li>
+	<li>
+	Case insensitive autocompletion prefers exact case match.
+	</li>
+	<li>
+	SCI_PARADOWN and SCI_PARAUP treat lines containing only white
+	space as empty and handle text hidden by folding.
+	</li>
+	<li>
+	Scintilla on Windows supports WM_PRINTCLIENT although there are some
+	limitations.
+	</li>
+	<li>
+	SCN_AUTOCSELECTION notification sent when user selects from autoselection list.
+	</li>
+	<li>
+	SciTE's standard properties file sets buffers to 10, uses Pango fonts on GTK+ and
+	has dropped several languages to make the menu fit on screen.
+	</li>
+	<li>
+	SciTE's encoding cookie detection loosened so that common XML files will load
+	in UTF-8 if that is their declared encoding.
+	</li>
+	<li>
+	SciTE on GTK+ changes menus and toolbars to not be detachable unless turned
+	on with a property. Menus no longer tear off. The toolbar may be set to use the
+	default theme icons rather than SciTE's set. Changed key for View | End of Line
+	because of a conflict. Language menu can contain more items.
+	</li>
+	<li>
+	SciTE on GTK+ 2.x allows the height and width of the file open file chooser to
+	be set, for the show hidden files check box to be set from an option and for it
+	to be opened in the directory of the current file explicitly. Enter key works in
+	save chooser.
+	</li>
+	<li>
+	Scintilla lexers should no longer see bits in style bytes that are outside the set
+	they modify so should be able to correctly lex documents where the container
+	has used indicators.
+	</li>
+	<li>
+	SciTE no longer asks to save before performing a revert.
+	</li>
+	<li>
+	SciTE director interface adds a reloadproperties command to reload properties
+	from files.
+	</li>
+	<li>
+	Allow build on CYGWIN platform.
+	</li>
+	<li>
+	Allow use from LccWin compiler.
+	</li>
+	<li>
+	SCI_COLOURISE for SCLEX_CONTAINER causes a
+	SCN_STYLENEEDED notification.
+	</li>
+	<li>
+	Bugs fixed in lexing of HTML/ASP/JScript.
+	</li>
+	<li>
+	Fix for folding becoming confused.
+	</li>
+	<li>
+	On Windows, fixes for Japanese Input Method Editor and for 8 bit Katakana
+	characters.
+	</li>
+	<li>
+	Fixed buffer size bug avoided when typing long words by making buffer bigger.
+	</li>
+	<li>
+	Undo after automatic indentation more sensible.
+	</li>
+	<li>
+	SciTE menus on GTK+ uses Shift and Ctrl rather than old style abbreviations.
+	</li>
+	<li>
+	SciTE full screen mode on Windows calculates size more correctly.
+	</li>
+	<li>
+	SciTE on Windows menus work better with skinning applications.
+	</li>
+	<li>
+	Searching bugs fixed.
+	</li>
+	<li>
+	Colours reallocated when changing image using SCI_REGISTERIMAGE.
+	</li>
+	<li>
+	Caret stays visible when Enter held down.
+	</li>
+	<li>
+	Undo of automatic indentation more reasonable.
+	</li>
+	<li>
+	High processor usage fixed in background wrapping under some
+	circumstances.
+	</li>
+	<li>
+	Crashing bug fixed on AMD64.
+	</li>
+	<li>
+	SciTE crashing bug fixed when position.height or position.width not set.
+	</li>
+	<li>
+	Crashing bug on GTK+ fixed when setting cursor and window is NULL.
+	</li>
+	<li>
+	Crashing bug on GTK+ preedit window fixed.
+	</li>
+	<li>
+	SciTE crashing bug fixed in incremental search on Windows ME.
+	</li>
+	<li>
+	SciTE on Windows has a optional find and replace dialogs that can search through
+	all buffers and search within a particular style number.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite162.zip?download">Release 1.62</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 31 October 2004.
+	</li>
+	<li>
+	Lexer added for ASN.1.
+	</li>
+	<li>
+	Lexer added for VHDL.
+	</li>
+	<li>
+	On Windows, an invisible system caret is used to allow screen readers to determine
+	where the caret is. The visible caret is still drawn by the painting code.
+	</li>
+	<li>
+	On GTK+, Scintilla has methods to read the target as UTF-8 and to convert
+	a string from UTF-8 to the document encoding. This eases integration with
+	containers that use the UTF-8 encoding which is the API encoding for GTK+ 2.
+	</li>
+	<li>
+	SciTE on GTK+2 and Windows NT/2000/XP allows search and replace of Unicode text.
+	</li>
+	<li>
+	SciTE calltips allow setting the characters used to start and end parameter lists and
+	to separate parameters.
+	</li>
+	<li>
+	FindColumn method converts a line and column into a position, taking into account
+	tabs and multi-byte characters.
+	</li>
+	<li>
+	On Windows, when Scintilla copies text to the clipboard as Unicode, it avoids
+	adding an ANSI copy as the system will automatically convert as required in
+	a context-sensitive manner.
+	</li>
+	<li>
+	SciTE indent.auto setting automatically determines indent.size and use.tabs from
+	document contents.
+	</li>
+	<li>
+	SciTE defines a CurrentMessage property that holds the most recently selected
+	output pane message.
+	</li>
+	<li>
+	SciTE Lua scripting enhanced with
+	<ul>
+	<li>A Lua table called 'buffer' is associated with each buffer and can be used to
+	maintain buffer-specific state.</li>
+	<li>A 'scite' object allows interaction with the application such as opening
+	files from script.</li>
+	<li>Dynamic properties can be reset by assigning nil to a given key in
+	the props table.</li>
+	<li>An 'OnClear' event fires whenever properties and extension scripts are
+	about to be reloaded.</li>
+	<li>On Windows, loadlib is enabled and can be used to access Lua
+	binary modules / DLLs.</li></ul>
+	</li>
+	<li>
+	SciTE Find in Files on Windows can be used in a modeless way and gains a '..'
+	button to move up to the parent directory. It is also wider so that longer paths
+	can be seen.
+	</li>
+	<li>
+	Close buttons added to dialogs in SciTE on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ 2 has a "hidden files" check box in file open dialog.
+	</li>
+	<li>
+	SciTE use.monospaced setting removed. More information in the
+	<a href="SciTEFAQ.html">FAQ</a>.
+	</li>
+	<li>
+	APDL lexer updated with more lexical classes
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Ada lexer fixed to support non-ASCII text.
+	</li>
+	<li>
+	Cpp lexer now only matches exactly three slashes as starting a doc-comment so that
+	lines of slashes are seen as a normal comment.
+	Line ending characters are appear in default style on preprocessor and single line
+	comment lines.
+	</li>
+	<li>
+	CSS lexer updated to support CSS2 including second set of keywords.
+	</li>
+	<li>
+	Errorlist lexer now understands Java stack trace lines.
+	</li>
+	<li>
+	SciTE's handling of HTML Tidy messages jumps to column as well as line indicated.
+	</li>
+	<li>
+	Lisp lexer allows multiline strings.
+	</li>
+	<li>
+	Lua lexer treats .. as an operator when between identifiers.
+	</li>
+	<li>
+	PHP lexer handles 'e' in numerical literals.
+	</li>
+	<li>
+	PowerBasic lexer updated for macros and optimized.
+	</li>
+	<li>
+	Properties file folder changed to leave lines before a header at the base level
+	and thus avoid a vertical line when using connected folding symbols.
+	</li>
+	<li>
+	GTK+ on Windows version uses Alt for rectangular selection to be compatible with
+	platform convention.
+	</li>
+	<li>
+	SciTE abbreviations file moved from system directory to user directory
+	so each user can have separate abbreviations.
+	</li>
+	<li>
+	SciTE on GTK+ has improved .desktop file and make install support that may
+	lead to better integration with system shell.
+	</li>
+	<li>
+	Disabling of themed background drawing on GTK+ extended to all cases.
+	</li>
+	<li>
+	SciTE date formatting on Windows performed with the user setting rather than the
+	system setting.
+	</li>
+	<li>
+	GTK+ 2 redraw while scrolling fixed.
+	</li>
+	<li>
+	Recursive property definitions are safer, avoiding expansion when detected.
+	</li>
+	<li>
+	SciTE thread synchronization for scripts no longer uses HWND_MESSAGE
+	so is compatible with older versions of Windows.
+	Other Lua scripting bugs fixed.
+	</li>
+	<li>
+	SciTE on Windows localization of menu accelerators changed to be compatible
+	with alternative UI themes.
+	</li>
+	<li>
+	SciTE on Windows full screen mode now fits better when menu different height
+	to title bar height.
+	</li>
+	<li>
+	SC_MARK_EMPTY marker is now invisible and does not change the background
+	colour.
+	</li>
+	<li>
+	Bug fixed in HTML lexer to allow use of &lt;?xml in strings in scripts without
+	triggering xml mode.
+	</li>
+	<li>
+	Bug fixed in SciTE abbreviation expansion that could break indentation or crash.
+	</li>
+	<li>
+	Bug fixed when searching for a whole word string that ends one character before
+	end of document.
+	</li>
+	<li>
+	Drawing bug fixed when indicators drawn on wrapped lines.
+	</li>
+	<li>
+	Bug fixed when double clicking a hotspot.
+	</li>
+	<li>
+	Bug fixed where autocompletion would remove typed text if no match found.
+	</li>
+	<li>
+	Bug fixed where display does not scroll when inserting in long wrapped line.
+	</li>
+	<li>
+	Bug fixed where SCI_MARKERDELETEALL would only remove one of the markers
+	on a line that contained multiple markers with the same number.
+	</li>
+	<li>
+	Bug fixed where markers would move when converting line endings.
+	</li>
+	<li>
+	Bug fixed where SCI_LINEENDWRAP would move too far when line ends are visible.
+	</li>
+	<li>
+	Bugs fixed where calltips with unicode or other non-ASCII text would display
+	incorrectly.
+	</li>
+	<li>
+	Bug fixed in determining if at save point after undoing from save point and then
+	performing changes.
+	</li>
+	<li>
+	Bug fixed on GTK+ using unsupported code pages where extraneous text could
+	be drawn.
+	</li>
+	<li>
+	Bug fixed in drag and drop code on Windows where dragging from SciTE to
+	Firefox could hang both applications.
+	</li>
+	<li>
+	Crashing bug fixed on GTK+ when no font allocation succeeds.
+	</li>
+	<li>
+	Crashing bug fixed when autocompleting word longer than 1000 characters.
+	</li>
+	<li>
+	SciTE crashing bug fixed when both Find and Replace dialogs shown by disallowing
+	this situation.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite161.zip?download">Release 1.61</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 29 May 2004.
+	</li>
+	<li>
+	Improvements to selection handling on GTK+.
+	</li>
+	<li>
+	SciTE on GTK+ 2.4 uses the improved file chooser which allows
+	file extension filters, multiple selection, and remembers favourite
+	directories.
+	</li>
+	<li>
+	SciTE Load Session and Save Session commands available on GTK+.
+	</li>
+	<li>
+	SciTE lists Lua Startup Script in Options menu when loaded.
+	</li>
+	<li>
+	In SciTE, OnUserListSelection can be implemented in Lua.
+	</li>
+	<li>
+	SciTE on Windows has a context menu on the file tabs.
+	</li>
+	<li>
+	SQL lexer allows '#' comments and optionally '\' quoting inside strings.
+	</li>
+	<li>
+	Mssql lexer improved.
+	</li>
+	<li>
+	AutoIt3 lexer updated.
+	</li>
+	<li>
+	Perl lexer recognizes regular expression use better.
+	</li>
+	<li>
+	Errorlist lexer understands Lua tracebacks and copes with findstr
+	output for file names that end with digits.
+	</li>
+	<li>
+	Drawing of lines on GTK+ improved and made more like Windows
+	without final point.
+	</li>
+	<li>
+	SciTE on GTK+ uses a high resolution window icon.
+	</li>
+	<li>
+	SciTE can be set to warn before loading files larger than a particular size.
+	</li>
+	<li>
+	SciTE Lua scripting bugs fixed included a crashing bug when using
+	an undefined function name that would go before first actual name.
+	</li>
+	<li>
+	SciTE bug fixed where a modified buffer was not saved if it was
+	the last buffer and was not current when the New command used.
+	</li>
+	<li>
+	SciTE monofont mode no longer affects line numbers.
+	</li>
+	<li>
+	Crashing bug in SciTE avoided by not allowing both the Find and Replace
+	dialogs to be visible at one time.
+	</li>
+	<li>
+	Crashing bug in SciTE fixed when Lua scripts were being run
+	concurrently.
+	</li>
+	<li>
+	Bug fixed that caused incorrect line number width in SciTE.
+	</li>
+	<li>
+	PHP folding bug fixed.
+	</li>
+	<li>
+	Regression fixed when setting word characters to not include
+	some of the standard word characters.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite160.zip?download">Release 1.60</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 1 May 2004.
+	</li>
+	<li>
+	SciTE can be scripted using the Lua programming language.
+	</li>
+	<li>
+	command.mode is a better way to specify tool command options in SciTE.
+	</li>
+	<li>
+	Continuation markers can be displayed so that you can see which lines are wrapped.
+	</li>
+	<li>
+	Lexer for Gui4Cli language.
+	</li>
+	<li>
+	Lexer for Kix language.
+	</li>
+	<li>
+	Lexer for Specman E language.
+	</li>
+	<li>
+	Lexer for AutoIt3 language.
+	</li>
+	<li>
+	Lexer for APDL language.
+	</li>
+	<li>
+	Lexer for Bash language. Also reasonable for other Unix shells.
+	</li>
+	<li>
+	SciTE can load lexers implemented in external shared libraries.
+	</li>
+	<li>
+	Perl treats "." not as part of an identifier and interprets '/' and '->'
+	correctly in more circumstances.
+	</li>
+	<li>
+	PHP recognizes variables within strings.
+	</li>
+	<li>
+	NSIS has properties "nsis.uservars" and "nsis.ignorecase".
+	</li>
+	<li>
+	MSSQL lexer adds keyword list for operators and stored procedures,
+	defines '(', ')', and ',' as operators and changes some other details.
+	</li>
+	<li>
+	Input method preedit window on GTK+ 2 may support some Asian languages.
+	</li>
+	<li>
+	Platform interface adds an extra platform-specific flag to Font::Create.
+	Used on wxWidgets to choose antialiased text display but may be used for
+	any task that a platform needs.
+	</li>
+	<li>
+	OnBeforeSave method added to Extension interface.
+	</li>
+	<li>
+	Scintilla methods that return strings can be called with a NULL pointer
+	to find out how long the string should be.
+	</li>
+	<li>
+	Visual Studio .NET project file now in VS .NET 2003 format so can not be used
+	directly in VS .NET 2002.
+	</li>
+	<li>
+	Scintilla can be built with GTK+ 2 on Windows.
+	</li>
+	<li>
+	Updated RPM spec for SciTE on GTK+.
+	</li>
+	<li>
+	GTK+ makefile for SciTE allows selection of destination directory, creates destination
+	directories and sets file modes and owners better.
+	</li>
+	<li>
+	Tab indents now go to next tab multiple rather than add tab size.
+	</li>
+	<li>
+	SciTE abbreviations now use the longest possible match rather than the shortest.
+	</li>
+	<li>
+	Autocompletion does not remove prefix when actioned with no choice selected.
+	</li>
+	<li>
+	Autocompletion cancels when moving beyond the start position, not at the start position.
+	</li>
+	<li>
+	SciTE now shows only calltips for functions that match exactly, not
+	those that match as a prefix.
+	</li>
+	<li>
+	SciTE can repair box comment sections where some lines were added without
+	the box comment middle line prefix.
+	</li>
+	<li>
+	Alt+ works in user.shortcuts on Windows.
+	</li>
+	<li>
+	SciTE on GTK+ enables replace in selection for rectangular selections.
+	</li>
+	<li>
+	Key bindings for command.shortcut implemented in a way that doesn't break
+	when the menus are localized.
+	</li>
+	<li>
+	Drawing of background on GTK+ faster as theme drawing disabled.
+	</li>
+	<li>
+	On GTK+, calltips are moved back onto the screen if they extend beyond the screen bounds.
+	</li>
+	<li>
+	On Windows, the Scintilla object is destroyed on WM_NCDESTROY rather than
+	WM_DESTROY which arrives earlier. This fixes some problems when Scintilla was subclassed.
+	</li>
+	<li>
+	The zorder switching feature removed due to number of crashing bugs.
+	</li>
+	<li>
+	Code for XPM images made more robust.
+	</li>
+	<li>
+	Bug fixed with primary selection on GTK+.
+	</li>
+	<li>
+	On GTK+ 2, copied or cut text can still be pasted after the Scintilla widget is destroyed.
+	</li>
+	<li>
+	Styling change not visible problem fixed when line was cached.
+	</li>
+	<li>
+	Bug in SciTE on Windows fixed where clipboard commands stopped working.
+	</li>
+	<li>
+	Crashing bugs in display fixed in line layout cache.
+	</li>
+	<li>
+	Crashing bug may be fixed on AMD64 processor on GTK+.
+	</li>
+	<li>
+	Rare hanging crash fixed in Python lexer.
+	</li>
+	<li>
+	Display bugs fixed with DBCS characters on GTK+.
+	</li>
+	<li>
+	Autocompletion lists on GTK+ 2 are not sorted by the ListModel as the
+	contents are sorted correctly by Scintilla.
+	</li>
+	<li>
+	SciTE fixed to not open extra untitled buffers with check.if.already.open.
+	</li>
+	<li>
+	Sizing bug fixed on GTK+ when window resized while unmapped.
+	</li>
+	<li>
+	Text drawing crashing bug fixed on GTK+ with non-Pango fonts and long strings.
+	</li>
+	<li>
+	Fixed some issues if characters are unsigned.
+	</li>
+	<li>
+	Fixes in NSIS support.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite159.zip?download">Release 1.59</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 19 February 2004.
+	</li>
+	<li>
+	SciTE Options and Language menus reduced in length by commenting
+	out some languages. Languages can be enabled by editing the global
+	properties file.
+	</li>
+	<li>
+	Verilog language supported.
+	</li>
+	<li>
+	Lexer for Microsoft dialect of SQL. SciTE properties file available from extras page.
+	</li>
+	<li>
+	Perl lexer disambiguates '/' better.
+	</li>
+	<li>
+	NSIS lexer improved with a lexical class for numbers, option for ignoring case
+	of keywords, and folds only occurring when folding keyword first on line.
+	</li>
+	<li>
+	PowerBasic lexer improved with styles for constants and assembler and
+	folding improvements.
+	</li>
+	<li>
+	On GTK+, input method support only invoked for Asian languages and not
+	European languages as the old European keyboard code works better.
+	</li>
+	<li>
+	Scintilla can be requested to allocate a certain amount and so avoid repeated
+	reallocations and memory inefficiencies. SciTE uses this and so should require
+	less memory.
+	</li>
+	<li>
+	SciTE's "toggle current fold" works when invoked on child line as well as
+	fold header.
+	</li>
+	<li>
+	SciTE output pane scrolling can be set to not scroll back to start after
+	completion of command.
+	</li>
+	<li>
+	SciTE has a $(SessionPath) property.
+	</li>
+	<li>
+	SciTE on Windows can use VK_* codes for keys in user.shortcuts.
+	</li>
+	<li>
+	Stack overwrite bug fixed in SciTE's command to move to the end of a
+	preprocessor conditional.
+	</li>
+	<li>
+	Bug fixed where vertical selection appeared to select a different set of characters
+	then would be used by, for example, a copy.
+	</li>
+	<li>
+	SciTE memory leak fixed in fold state remembering.
+	</li>
+	<li>
+	Bug fixed where changing the style of some text outside the
+	standard StyleNeeded notification would not be visible.
+	</li>
+	<li>
+	On GTK+ 2 g_iconv is used in preference to iconv, as it is provided by GTK+
+	so should avoid problems finding the iconv library.
+	</li>
+	<li>
+	On GTK+ fixed a style reference count bug.
+	</li>
+	<li>
+	Memory corruption bug fixed with GetSelText.
+	</li>
+	<li>
+	On Windows Scintilla deletes memory on WM_NCDESTROY rather than
+	the earlier WM_DESTROY to avoid problems when the window is subclassed.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite158.zip?download">Release 1.58</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 11 January 2004.
+	</li>
+	<li>
+	Method to discover the currently highlighted element in an autocompletion list.
+	</li>
+	<li>
+	On GTK+, the lexers are now included in the scintilla.a library file. This
+	will require changes to the make files of dependent projects.
+	</li>
+	<li>
+	Octave support added alongside related Matlab language and Matlab support improved.
+	</li>
+	<li>
+	VB lexer gains an unterminated string state and 4 sets of keywords.
+	</li>
+	<li>
+	Ruby lexer handles $' correctly.
+	</li>
+	<li>
+	Error line handling improved for FORTRAN compilers from Absoft and Intel.
+	</li>
+	<li>
+	International input enabled on GTK+ 2 although there is no way to choose an
+	input method.
+	</li>
+	<li>
+	MultiplexExtension in SciTE allows multiple extensions to be used at once.
+	</li>
+	<li>
+	Regular expression replace interprets backslash expressions \a, \b, \f, \n, \r, \t,
+	and \v in the replacement value.
+	</li>
+	<li>
+	SciTE Replace dialog displays number of replacements made when Replace All or
+	Replace in Selection performed.
+	</li>
+	<li>
+	Localization files may contain a translation.encoding setting which is used
+	on GTK+ 2 to automatically reencode the translation to UTF-8 so it will be
+	the localized text will be displayed correctly.
+	</li>
+	<li>
+	SciTE on GTK+ implements check.if.already.open.
+	</li>
+	<li>
+	Make files for Mac OS X made more robust.
+	</li>
+	<li>
+	Performance improved in SciTE when switching buffers when there
+	is a rectangular selection.
+	</li>
+	<li>
+	Fixed failure to display some text when wrapped.
+	</li>
+	<li>
+	SciTE crashes from Ctrl+Tab buffer cycling fixed.
+	May still be some rare bugs here.
+	</li>
+	<li>
+	Crash fixed when decoding an error message that appears similar to a
+	Borland error message.
+	</li>
+	<li>
+	Fix to auto-scrolling allows containers to implement enhanced double click selection.
+	</li>
+	<li>
+	Hang fixed in idle word wrap.
+	</li>
+	<li>
+	Crash fixed in hotspot display code..
+	</li>
+	<li>
+	SciTE on Windows Incremental Search no longer moves caret back.
+	</li>
+	<li>
+	SciTE hang fixed when performing a replace with a find string that
+	matched zero length strings such as ".*".
+	</li>
+	<li>
+	SciTE no longer styles the whole file when saving buffer fold state
+	as that was slow.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite157.zip?download">Release 1.57</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 27 November 2003.
+	</li>
+	<li>
+	SciTE remembers folding of each buffer.
+	</li>
+	<li>
+	Lexer for Erlang language.
+	</li>
+	<li>
+	Scintilla allows setting the set of white space characters.
+	</li>
+	<li>
+	Scintilla has 'stuttered' page movement commands to first move
+	to top or bottom within current visible lines before scrolling.
+	</li>
+	<li>
+	Scintilla commands for moving to end of words.
+	</li>
+	<li>
+	Incremental line wrap enabled on Windows.
+	</li>
+	<li>
+	SciTE PDF exporter produces output that is more compliant with reader
+	applications, is smaller and allows more configuration.
+	HTML exporter optimizes size of output files.
+	</li>
+	<li>
+	SciTE defines properties PLAT_WINNT and PLAT_WIN95 on the
+	corresponding platforms.
+	</li>
+	<li>
+	SciTE can adjust the line margin width to fit the largest line number.
+	The line.numbers property is split between line.margin.visible and
+	line.margin.width.
+	</li>
+	<li>
+	SciTE on GTK+ allows user defined menu accelerators.
+	Alt can be included in user.shortcuts.
+	</li>
+	<li>
+	SciTE Language menu can have items commented out.
+	</li>
+	<li>
+	SciTE on Windows Go to dialog allows choosing a column number as
+	well as a line number.
+	</li>
+	<li>
+	SciTE on GTK+ make file uses prefix setting more consistently.
+	</li>
+	<li>
+	Bug fixed that caused word wrapping to fail to display all text.
+	</li>
+	<li>
+	Crashing bug fixed in GTK+ version of Scintilla when using GDK fonts
+	and opening autocompletion.
+	</li>
+	<li>
+	Bug fixed in Scintilla SCI_GETSELTEXT where an extra NUL
+	was included at end of returned string
+	</li>
+	<li>
+	Crashing bug fixed in SciTE z-order switching implementation.
+	</li>
+	<li>
+	Hanging bug fixed in Perl lexer.
+	</li>
+	<li>
+	SciTE crashing bug fixed for using 'case' without argument in style definition.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite156.zip?download">Release 1.56</a>
+    </h3>
+    <ul>
+	<li>
+	Released on 25 October 2003.
+	</li>
+	<li>
+	Rectangular selection can be performed using the keyboard.
+	Greater programmatic control over rectangular selection.
+	This has caused several changes to key bindings.
+	</li>
+	<li>
+	SciTE Replace In Selection works on rectangular selections.
+	</li>
+	<li>
+	Improved lexer for TeX, new lexer for Metapost and other support for these
+	languages.
+	</li>
+	<li>
+	Lexer for PowerBasic.
+	</li>
+	<li>
+	Lexer for Forth.
+	</li>
+	<li>
+	YAML lexer improved to include error styling.
+	</li>
+	<li>
+	Perl lexer improved to correctly handle more cases.
+	</li>
+	<li>
+	Assembler lexer updated to support single-quote strings and fix some
+	problems.
+	</li>
+	<li>
+	SciTE on Windows can switch between buffers in order of use (z-order) rather
+	than static order.
+	</li>
+	<li>
+	SciTE supports adding an extension for "Open Selected Filename".
+	The openpath setting works on GTK+.
+	</li>
+	<li>
+	SciTE can Export as XML.
+	</li>
+	<li>
+	SciTE $(SelHeight) variable gives a more natural result for empty and whole line
+	selections.
+	</li>
+	<li>
+	Fixes to wrapping problems, such as only first display line being visible in some
+	cases.
+	</li>
+	<li>
+	Fixes to hotspot to only highlight when over the hotspot, only use background
+	colour when set and option to limit hotspots to a single line.
+	</li>
+	<li>
+	Small fixes to FORTRAN lexing and folding.
+	</li>
+	<li>
+	SQL lexer treats single quote strings as a separate class to double quote strings..
+	</li>
+	<li>
+	Scintilla made compatible with expectations of container widget in GTK+ 2.3.
+	</li>
+	<li>
+	Fix to strip out pixmap ID when automatically choosing from an autocompletion
+	list with only one element.
+	</li>
+	<li>
+	SciTE bug fixed where UTF-8 files longer than 128K were gaining more than one
+	BOM.
+	</li>
+	<li>
+	Crashing bug fixed in SciTE on GTK+ where using "Stop Executing" twice leads
+	to all applications exiting.
+	</li>
+	<li>
+	Bug fixed in autocompletion scrolling on GTK+ 2 with a case sensitive list.
+	The ListBox::Sort method is no longer needed or available so platform
+	maintainers should remove it.
+	</li>
+	<li>
+	SciTE check.if.already.open setting removed from GTK+ version as unmaintained.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite155.zip?download">Release 1.55</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 25 September 2003.
+      </li>
+      <li>
+	Fix a crashing bug in indicator display in Scintilla.
+      </li>
+      <li>
+	GTK+ version now defaults to building for GTK+ 2 rather than 1.
+      </li>
+      <li>
+	Mingw make file detects compiler version and avoids options
+	that are cause problems for some versions.
+      </li>
+      <li>
+	Large performance improvement on GTK+ 2 for long lines.
+      </li>
+      <li>
+	Incremental line wrap on GTK+.
+      </li>
+      <li>
+	International text entry works much better on GTK+ with particular
+	improvements for Baltic languages and languages that use 'dead' accents.
+	NUL key events such as those generated by some function keys, ignored.
+      </li>
+      <li>
+	Unicode clipboard support on GTK+.
+      </li>
+      <li>
+	Indicator type INDIC_BOX draws a rectangle around the text.
+      </li>
+      <li>
+	Clarion language support.
+      </li>
+      <li>
+	YAML language support.
+      </li>
+      <li>
+	MPT LOG language support.
+      </li>
+      <li>
+	On Windows, SciTE can switch buffers based on activation order rather
+	than buffer number.
+      </li>
+      <li>
+	SciTE save.on.deactivate saves all buffers rather than just the current buffer.
+      </li>
+      <li>
+	Lua lexer handles non-ASCII characters correctly.
+      </li>
+      <li>
+	Error lexer understands Borland errors with pathnames that contain space.
+      </li>
+      <li>
+	On GTK+ 2, autocompletion uses TreeView rather than deprecated CList.
+      </li>
+      <li>
+	SciTE autocompletion removed when expand abbreviation command used.
+      </li>
+      <li>
+	SciTE calltips support overloaded functions.
+      </li>
+      <li>
+	When Save fails in SciTE, choice offered to Save As.
+      </li>
+      <li>
+	SciTE message boxes on Windows may be moved to front when needed.
+      </li>
+      <li>
+	Indicators drawn correctly on wrapped lines.
+      </li>
+      <li>
+	Regular expression search no longer matches characters with high bit
+	set to characters without high bit set.
+      </li>
+      <li>
+	Hang fixed in backwards search in multi byte character documents.
+      </li>
+      <li>
+	Hang fixed in SciTE Mark All command when wrap around turned off.
+      </li>
+      <li>
+	SciTE Incremental Search no longer uses hot keys on Windows.
+      </li>
+      <li>
+	Calltips draw non-ASCII characters correctly rather than as arrows.
+      </li>
+      <li>
+	SciTE crash fixed when going to an error message with empty file name.
+      </li>
+      <li>
+	Bugs fixed in XPM image handling code.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite154.zip?download">Release 1.54</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 12 August 2003.
+      </li>
+      <li>
+	SciTE on GTK+ 2.x can display a tab bar.
+      </li>
+      <li>
+	SciTE on Windows provides incremental search.
+      </li>
+      <li>
+	Lexer for PostScript.
+      </li>
+      <li>
+	Lexer for the NSIS scripting language.
+      </li>
+      <li>
+	New lexer for POV-Ray Scene Description Language
+	replaces previous implementation.
+      </li>
+      <li>
+	Lexer for the MMIX Assembler language.
+      </li>
+      <li>
+	Lexer for the Scriptol language.
+      </li>
+      <li>
+	Incompatibility: SQL keywords are specified in lower case rather than upper case.
+	SQL lexer allows double quoted strings.
+      </li>
+      <li>
+	Pascal lexer: character constants that start with '#' understood,
+	'@' only allowed within assembler blocks,
+	'$' can be the start of a number,
+	initial '.' in 0..constant not treated as part of a number,
+	and assembler blocks made more distinctive.
+      </li>
+      <li>
+	Lua lexer allows '.' in keywords.
+	Multi-line strings and comments can be folded.
+      </li>
+      <li>
+	CSS lexer handles multiple psuedoclasses.
+      </li>
+      <li>
+	Properties file folder works for INI file format.
+      </li>
+      <li>
+	Hidden indicator style allows the container to mark text within Scintilla
+	without there being any visual effect.
+      </li>
+      <li>
+	SciTE does not prompt to save changes when the buffer is empty and untitled.
+      </li>
+      <li>
+	Modification notifications caused by SCI_INSERTSTYLEDSTRING
+	now include the contents of the insertion.
+      </li>
+      <li>
+	SCI_MARKERDELETEALL deletes all the markers on a line
+	rather than just the first match.
+      </li>
+      <li>
+	Better handling of 'dead' accents on GTK+ 2 for languages
+	that use accented characters.
+      </li>
+      <li>
+	SciTE now uses value of output.vertical.size property.
+      </li>
+      <li>
+	Crash fixed in SciTE autocompletion on long lines.
+      </li>
+      <li>
+	Crash fixed in SciTE comment command on long lines.
+      </li>
+      <li>
+	Bug fixed with backwards regular expression search skipping
+	every second match.
+      </li>
+      <li>
+	Hang fixed with regular expression replace where both target and replacement were empty.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite153.zip?download">Release 1.53</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 May 2003.
+      </li>
+      <li>
+	On GTK+ 2, encodings other than ASCII, Latin1, and Unicode are
+	supported for both display and input using iconv.
+      </li>
+      <li>
+	External lexers supported on GTK+/Linux.
+	External lexers must now be explicitly loaded with SCI_LOADLEXERLIBRARY
+	rather than relying upon a naming convention and automatic loading.
+      </li>
+      <li>
+	Support of Lout typesetting language.
+      </li>
+      <li>
+	Support of E-Scripts language used in the POL Ultima Online Emulator.
+      </li>
+      <li>
+	Scrolling and drawing performance on GTK+ enhanced, particularly for GTK+ 2.x
+	with an extra window for the text area avoiding conflicts with the scroll bars.
+      </li>
+      <li>
+	CopyText and CopyRange methods in Scintilla allow container to
+	easily copy to the system clipboard.
+      </li>
+      <li>
+	Line Copy command implemented and bound to Ctrl+Shift+T.
+      </li>
+      <li>
+	Scintilla APIs PositionBefore and PositionAfter can be used to iterate through
+	a document taking into account the encoding and multi-byte characters.
+      </li>
+      <li>
+	C++ folder can fold on the "} else {" line of an if statement by setting
+	fold.at.else property to 1.
+      </li>
+      <li>
+	C++ lexer allows an extra set of keywords.
+      </li>
+      <li>
+	Property names and thus abbreviations may be non-ASCII.
+      </li>
+      <li>
+	Removed attempt to load a file when setting properties that was
+	part of an old scripting experiment.
+      </li>
+      <li>
+	SciTE no longer warns about a file not existing when opening
+	properties files from the Options menu as there is a good chance
+	the user wants to create one.
+      </li>
+      <li>
+	Bug fixed with brace recognition in multi-byte encoded files where a partial
+	character matched a brace byte.
+      </li>
+      <li>
+	More protection against infinite loops or recursion with recursive property definitions.
+      </li>
+      <li>
+	On Windows, cursor will no longer disappear over margins in custom builds when
+	cursor resource not present. The Windows default cursor is displayed instead.
+      </li>
+      <li>
+	load.on.activate fixed in SciTE as was broken in 1.52.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite152.zip?download">Release 1.52</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2003.
+      </li>
+      <li>
+	Pango font support on GTK+ 2.
+	Unicode input improved on GTK+ 2.
+      </li>
+      <li>
+	Hotspot style implemented in Scintilla.
+      </li>
+      <li>
+	Small up and down arrows can be displayed in calltips and the container
+	is notified when the mouse is clicked on a calltip.
+	Normal and selected calltip text colours can be set.
+      </li>
+      <li>
+	POSIX compatibility flag in Scintilla regular expression search
+	interprets bare ( and ) as tagged sections.
+      </li>
+      <li>
+	Error message lexer tightened to yield fewer false matches.
+	Recognition of Lahey and Intel FORTRAN error formats.
+      </li>
+      <li>
+	Scintilla keyboard commands for moving to start and end of
+	screen lines rather than document lines, unless already there
+	where these keys move to the start or end of the document line.
+      </li>
+      <li>
+	Line joining command.
+      </li>
+      <li>
+	Lexer for POV-Ray.
+      </li>
+      <li>
+	Calltips on Windows are no longer clipped by the parent window.
+      </li>
+      <li>
+	Autocompletion lists are cancelled when focus leaves their parent window.
+      </li>
+      <li>
+	Move to next/previous empty line delimited paragraph key commands.
+      </li>
+      <li>
+	SciTE hang fixed with recursive property definitions by placing limit
+	on number of substitutions performed.
+      </li>
+      <li>
+	SciTE Export as PDF reenabled and works.
+      </li>
+      <li>
+	Added loadsession: command line command to SciTE.
+      </li>
+      <li>
+	SciTE option to quit application when last document closed.
+      </li>
+      <li>
+	SciTE option to ask user if it is OK to reload a file that has been
+	modified outside SciTE.
+      </li>
+      <li>
+	SciTE option to automatically save before running particular command tools
+	or to ask user or to not save.
+      </li>
+      <li>
+	SciTE on Windows 9x will write a Ctrl+Z to the process input pipe before
+	closing the pipe when running tool commands that take input.
+      </li>
+      <li>
+	Added a manifest resource to SciTE on Windows to enable Windows XP
+	themed UI.
+      </li>
+      <li>
+	SciTE calltips handle nested calls and other situations better.
+      </li>
+      <li>
+	CSS lexer improved.
+      </li>
+      <li>
+	Interface to platform layer changed - Surface initialization now requires
+	a WindowID parameter.
+      </li>
+      <li>
+	Bug fixed with drawing or measuring long pieces of text on Windows 9x
+	by truncating the pieces.
+      </li>
+      <li>
+	Bug fixed with SciTE on GTK+ where a user shortcut for a visible character
+	inserted the character as well as executing the command.
+      </li>
+      <li>
+	Bug fixed where primary selection on GTK+ was reset by
+	Scintilla during creation.
+      </li>
+      <li>
+	Bug fixed where SciTE would close immediately on startup
+	when using save.session.
+      </li>
+      <li>
+	Crash fixed when entering '\' in LaTeX file.
+      </li>
+      <li>
+	Hang fixed when '#' last character in VB file.
+      </li>
+      <li>
+	Crash fixed in error message lexer.
+      </li>
+      <li>
+	Crash fixed when searching for long regular expressions.
+      </li>
+      <li>
+	Pressing return when nothing selected in user list sends notification with
+	empty text rather than random text.
+      </li>
+      <li>
+	Mouse debouncing disabled on Windows as it interfered with some
+	mouse utilities.
+      </li>
+      <li>
+	Bug fixed where overstrike mode inserted before rather than replaced last
+	character in document.
+      </li>
+      <li>
+	Bug fixed with syntax highlighting of Japanese text.
+      </li>
+      <li>
+	Bug fixed in split lines function.
+      </li>
+      <li>
+	Cosmetic fix to SciTE tab bar on Windows when window resized.
+	Focus sticks to either pane more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite151.zip?download">Release 1.51</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 16 February 2003.
+      </li>
+      <li>
+	Two phase drawing avoids cutting off text that overlaps runs by drawing
+	all the backgrounds of a line then drawing all the text transparently.
+	Single phase drawing is an option.
+      </li>
+      <li>
+	Scintilla method to split lines at a particular width by adding new line
+	characters.
+      </li>
+      <li>
+	The character used in autocompletion lists to separate the text from the image
+	number can be changed.
+      </li>
+      <li>
+	The scrollbar range will automatically expand when the caret is moved
+	beyond the current range.
+	The scroll bar is updated when SCI_SETXOFFSET is called.
+      </li>
+      <li>
+	Mouse cursors on GTK+ improved to be consistent with other applications
+	and the Windows version.
+      </li>
+      <li>
+	Horizontal scrollbar on GTK+ now disappears in wrapped mode.
+      </li>
+      <li>
+	Scintilla on GTK+ 2: mouse wheel scrolling, cursor over scrollbars, focus,
+	and syntax highlighting now work.
+	gtk_selection_notify avoided for compatibility with GTK+ 2.2.
+      </li>
+      <li>
+	Fold margin colours can now be set.
+      </li>
+      <li>
+	SciTE can be built for GTK+ 2.
+      </li>
+      <li>
+	SciTE can optionally preserve the undo history over an automatic file reload.
+      </li>
+      <li>
+	Tags can optionally be case insensitive in XML and HTML.
+      </li>
+      <li>
+	SciTE on Windows handles input to tool commands in a way that should avoid
+	deadlock. Output from tools can be used to replace the selection.
+      </li>
+      <li>
+	SciTE on GTK+ automatically substitutes '|' for '/' in menu items as '/'
+	is used to define the menu hierarchy.
+      </li>
+      <li>
+	Optional buffer number in SciTE title bar.
+      </li>
+      <li>
+	Crash fixed in SciTE brace matching.
+      </li>
+      <li>
+	Bug fixed where automatic scrolling past end of document
+	flipped back to the beginning.
+      </li>
+      <li>
+	Bug fixed where wrapping caused text to disappear.
+      </li>
+      <li>
+	Bug fixed on Windows where images in autocompletion lists were
+	shown on the wrong item.
+      </li>
+      <li>
+	Crash fixed due to memory bug in autocompletion lists on Windows.
+      </li>
+      <li>
+	Crash fixed when double clicking some error messages.
+      </li>
+      <li>
+	Bug fixed in word part movement where sometimes no movement would occur.
+      </li>
+      <li>
+	Bug fixed on Windows NT where long text runs were truncated by
+	treating NT differently to 9x where there is a limitation.
+      </li>
+      <li>
+	Text in not-changeable style works better but there remain some cases where
+	it is still possible to delete text protected this way.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite150.zip?download">Release 1.50</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 January 2003.
+      </li>
+      <li>
+	Autocompletion lists may have a per-item pixmap.
+      </li>
+      <li>
+	Autocompletion lists allow Unicode text on Windows.
+      </li>
+      <li>
+	Scintilla documentation rewritten.
+      </li>
+      <li>
+	Additional DBCS encoding support in Scintilla on GTK+ primarily aimed at
+	Japanese EUC encoding.
+      </li>
+      <li>
+	CSS (Cascading Style Sheets) lexer added.
+      </li>
+      <li>
+	diff lexer understands some more formats.
+      </li>
+      <li>
+	Fold box feature is an alternative way to show the structure of code.
+      </li>
+      <li>
+	Avenue lexer supports multiple keyword lists.
+      </li>
+      <li>
+	The caret may now be made invisible by setting the caret width to 0.
+      </li>
+      <li>
+	Python folder attaches comments before blocks to the next block rather
+	than the previous block.
+      </li>
+      <li>
+	SciTE openpath property on Windows searches a path for files that are
+	the subject of the Open Selected Filename command.
+      </li>
+      <li>
+        The localization file name can be changed with the locale.properties property.
+      </li>
+      <li>
+	On Windows, SciTE can pipe the result of a string expression into a command line tool.
+      </li>
+      <li>
+	On Windows, SciTE's Find dialog has a Mark All button.
+      </li>
+      <li>
+	On Windows, there is an Insert Abbreviation command that allows a choice from
+	the defined abbreviations and inserts the selection into the abbreviation at the
+	position of a '|'.
+      </li>
+      <li>
+	Minor fixes to Fortran lexer.
+      </li>
+      <li>
+	fold.html.preprocessor decides whether to fold &lt;? and ?&gt;.
+	Minor improvements to PHP folding.
+      </li>
+      <li>
+	Maximum number of keyword lists allowed increased from 6 to 9.
+      </li>
+      <li>
+	Duplicate line command added with default assignment to Ctrl+D.
+      </li>
+      <li>
+	SciTE sets $(Replacements) to the number of replacements made by the
+	Replace All command. $(CurrentWord) is set to the word before the caret if the caret
+	is at the end of a word.
+      </li>
+      <li>
+	Opening a SciTE session now loads files in remembered order, sets the current file
+	as remembered, and moves the caret to the remembered line.
+      </li>
+      <li>
+	Bugs fixed with printing on Windows where line wrapping was causing some text
+	to not print.
+      </li>
+      <li>
+	Bug fixed with Korean Input Method Editor on Windows.
+      </li>
+      <li>
+	Bugs fixed with line wrap which would sometimes choose different break positions
+	after switching focus away and back.
+      </li>
+      <li>
+	Bug fixed where wheel scrolling had no effect on GTK+ after opening a fold.
+      </li>
+      <li>
+	Bug fixed with file paths containing non-ASCII characters on Windows.
+      </li>
+      <li>
+	Crash fixed with printing on Windows after defining pixmap marker.
+      </li>
+      <li>
+	Crash fixed in makefile lexer when first character on line was '='.
+      </li>
+      <li>
+	Bug fixed where local properties were not always being applied.
+      </li>
+      <li>
+	Ctrl+Keypad* fold command works on GTK+.
+      </li>
+      <li>
+	Hangs fixed in SciTE's Replace All command when replacing regular expressions '^'
+	or '$'.
+      </li>
+      <li>
+	SciTE monospace setting behaves more sensibly.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite149.zip?download">Release 1.49</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 November 2002.
+      </li>
+      <li>
+	Unicode supported on GTK+. To perform well, this added a font cache to GTK+
+	and to make that safe, a mutex is used. The mutex requires the application to link in
+	the threading library by evaluating `glib-config --libs gthread`. A Unicode locale
+	should also be set up by a call like setlocale(LC_CTYPE, "en_US.UTF-8").
+	scintilla_release_resources function added to release mutex.
+      </li>
+      <li>
+	FORTRAN and assembler lexers added along with other support for these
+	languages in SciTE.
+      </li>
+      <li>
+	Ada lexer improved handling of based numbers, identifier validity and attributes
+	distinguished from character literals.
+      </li>
+      <li>
+	Lua lexer handles block comments and a deep level of nesting for literal strings
+	and block comments.
+      </li>
+      <li>
+	Errorlist lexer recognizes PHP error messages.
+      </li>
+      <li>
+	Variant of the C++ lexer with case insensitive keywords
+	called cppnocase. Whitespace in preprocessor text handled more correctly.
+      </li>
+      <li>
+	Folder added for Perl.
+      </li>
+      <li>
+	Compilation with GCC 3.2 supported.
+      </li>
+      <li>
+	Markers can be pixmaps.
+      </li>
+      <li>
+	Lines are wrapped when printing.
+	Bug fixed which printed line numbers in different styles.
+      </li>
+      <li>
+	Text can be appended to end with AppendText method.
+      </li>
+      <li>
+	ChooseCaretX method added.
+      </li>
+      <li>
+	Vertical scroll bar can be turned off with SetVScrollBar method.
+      </li>
+      <li>
+	SciTE Save All command saves all buffers.
+      </li>
+      <li>
+	SciTE localization compares keys case insensitively to make translations more flexible.
+      </li>
+      <li>
+	SciTE detects a utf-8 coding cookie "coding: utf-8" in first two
+	lines and goes into Unicode mode.
+      </li>
+      <li>
+	SciTE key bindings are definable.
+      </li>
+      <li>
+	SciTE Find in Files dialog can display directory browser to
+	choose directory to search.
+      </li>
+      <li>
+	SciTE enabling of undo and redo toolbar buttons improved.
+      </li>
+      <li>
+	SciTE on Windows file type filters in open dialog sorted.
+      </li>
+      <li>
+	Fixed crashing bug when using automatic tag closing in XML or HTML.
+      </li>
+      <li>
+	Fixed bug on Windows causing very long (&gt;64K) lines to not display.
+      </li>
+      <li>
+	Fixed bug in backwards regular expression searching.
+      </li>
+      <li>
+	Fixed bug in calltips where wrong argument was highlighted.
+      </li>
+      <li>
+	Fixed bug in tab timmy feature when file has line feed line endings.
+      </li>
+      <li>
+	Fixed bug in compiling without INCLUDE_DEPRECATED_FEATURES
+	defined.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite148.zip?download">Release 1.48</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 9 September 2002.
+      </li>
+      <li>
+	Improved Pascal lexer with context sensitive keywords
+	and separate folder which handles  //{ and //} folding comments and
+	{$region} and {$end} folding directives.
+	The "case" statement now folds correctly.
+      </li>
+      <li>
+	C++ lexer correctly handles comments on preprocessor lines.
+      </li>
+      <li>
+	New commands for moving to beginning and end of display lines when in line
+	wrap mode. Key bindings added for these commands.
+      </li>
+      <li>
+	New marker symbols that look like ">>>" and "..." which can be used for
+	interactive shell prompts for Python.
+      </li>
+      <li>
+	The foreground and background colours of visible whitespace can be chosen
+	independent of the colours chosen for the lexical class of that whitespace.
+      </li>
+      <li>
+	Per line data optimized by using an exponential allocation scheme.
+      </li>
+      <li>
+	SciTE API file loading optimized.
+      </li>
+      <li>
+	SciTE for GTK+ subsystem 2 documented. The exit status of commands
+	is decoded into more understandable fields.
+      </li>
+      <li>
+	SciTE find dialog remembers previous find string when there is no selection.
+	Find in Selection button disabled when selection is rectangular as command
+	did not work.
+      </li>
+      <li>
+	Shift+Enter made equivalent to Enter to avoid users having to let go of
+	the shift key when typing. Avoids the possibility of entering single carriage
+	returns in a file that contains CR+LF line ends.
+      </li>
+      <li>
+	Autocompletion does not immediately disappear when the length parameter
+	to SCI_AUTOCSHOW is 0.
+      </li>
+      <li>
+	SciTE focuses on the editor pane when File | New executed and when the
+	output pane is closed with F8. Double clicking on a non-highlighted output
+	pane line selects the word under the cursor rather than seeking the next
+	highlighted line.
+      </li>
+      <li>
+	SciTE director interface implements an "askproperty" command.
+      </li>
+      <li>
+	SciTE's Export as LaTeX output improved.
+      </li>
+      <li>
+	Better choice of autocompletion displaying above the caret rather then
+	below when that is more sensible.
+      </li>
+      <li>
+	Bug fixed where context menu would not be completely visible if invoked
+	when cursor near bottom or left of screen.
+      </li>
+      <li>
+	Crashing bug fixed when displaying long strings on GTK+ caused failure of X server
+	by displaying long text in segments.
+      </li>
+      <li>
+	Crashing bug fixed on GTK+ when a Scintilla window was removed from its parent
+	but was still the selection owner.
+      </li>
+      <li>
+	Bug fixed on Windows in Unicode mode where not all characters on a line
+	were displayed when that line contained some characters not in ASCII.
+      </li>
+      <li>
+	Crashing bug fixed in SciTE on Windows with clearing output while running command.
+      </li>
+      <li>
+	Bug fixed in SciTE for GTK+ with command completion not detected when
+	no output was produced by the command.
+      </li>
+      <li>
+	Bug fixed in SciTE for Windows where menus were not shown translated.
+      </li>
+      <li>
+	Bug fixed where words failed to display in line wrapping mode with visible
+	line ends.
+      </li>
+      <li>
+	Bug fixed in SciTE where files opened from a session file were not closed.
+      </li>
+      <li>
+	Cosmetic flicker fixed when using Ctrl+Up and Ctrl+Down with some caret policies.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite147.zip?download">Release 1.47</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 August 2002.
+      </li>
+      <li>
+	Support for GTK+ 2 in Scintilla. International input methods not supported
+	on GTK+2.
+      </li>
+      <li>
+	Line wrapping performance improved greatly.
+      </li>
+      <li>
+	New caret policy implementation that treats horizontal and vertical
+	positioning equivalently and independently. Old caret policy methods
+	deprecated and not all options work correctly with old methods.
+      </li>
+      <li>
+	Extra fold points for C, C++, Java, ... for fold comments //{ .. //} and
+	#if / #ifdef .. #endif and the #region .. #endregion feature of C#.
+      </li>
+      <li>
+	Scintilla method to find the height in pixels of a line. Currently returns the
+	same result for every line as all lines are same height.
+      </li>
+      <li>
+	Separate make file, scintilla_vc6.mak, for Scintilla to use Visual C++
+	version 6 since main makefile now assumes VS .NET.
+	VS .NET project files available for combined Scintilla and
+	SciTE in scite/boundscheck.
+      </li>
+      <li>
+	SciTE automatically recognizes Unicode files based
+	on their Byte Order Marks and switches to Unicode mode.
+	On Windows, where SciTE supports Unicode display, this
+	allows display of non European characters.
+	The file is saved back into the same character encoding unless
+	the user decides to switch using the File | Encoding menu.
+      </li>
+      <li>
+	Handling of character input changed so that a fillup character, typically '('
+	displays a calltip when an autocompletion list was being displayed.
+      </li>
+      <li>
+	Multiline strings lexed better for C++ and Lua.
+      </li>
+      <li>
+	Regular expressions in JavaScript within hypertext files are lexed better.
+      </li>
+      <li>
+	On Windows, Scintilla exports a function called Scintilla_DirectFunction
+	that can be used the same as the function returned by GetDirectFunction.
+      </li>
+      <li>
+	Scintilla converts line endings of text obtained from the clipboard to
+	the current default line endings.
+      </li>
+      <li>
+	New SciTE property ensure.final.line.end can ensure that saved files
+	always end with a new line as this is required by some tools.
+	The ensure.consistent.line.ends property ensures all line ends are the
+	current default when saving files.
+	The strip.trailing.spaces property now works on the buffer so the
+	buffer in memory and the file on disk are the same after a save is performed.
+      </li>
+      <li>
+	The SciTE expand abbreviation command again allows '|' characters
+	in expansions to be quoted by using '||'.
+      </li>
+      <li>
+	SciTE on Windows can send data to the find tool through standard
+	input rather than using a command line argument to avoid problems
+	with quoting command line arguments.
+      </li>
+      <li>
+	The Stop Executing command in SciTE on Windows improved to send
+	a Ctrl+Z character to the tool. Better messages when stopping a tool.
+      </li>
+      <li>
+	Autocompletion can automatically "fill up" when one of a set of characters is
+	type with the autocomplete.&lt;lexer&gt;.fillups property.
+      </li>
+      <li>
+	New predefined properties in SciTE, SelectionStartColumn, SelectionStartLine,
+	SelectionEndColumn, SelectionEndLine can be used to integrate with other
+	applications.
+      </li>
+      <li>
+	Environment variables are available as properties in SciTE.
+      </li>
+      <li>
+	SciTE on Windows keeps status line more current.
+      </li>
+      <li>
+	Abbreviations work in SciTE on Linux when first opened.
+      </li>
+      <li>
+	File saving fixed in SciTE to ensure files are not closed when they can not be
+	saved because of file permissions. Also fixed a problem with buffers that
+	caused files to not be saved.
+      </li>
+      <li>
+	SciTE bug fixed where monospace mode not remembered when saving files.
+	Some searching options now remembered when switching files.
+      </li>
+      <li>
+	SciTE on Linux now waits on child termination when it shuts a child down
+	to avoid zombies.
+      </li>
+      <li>
+	SciTE on Linux has a Print menu command that defaults to invoking a2ps.
+      </li>
+      <li>
+	Fixed incorrect highlighting of indentation guides in SciTE for Python.
+      </li>
+      <li>
+	Crash fixed in Scintilla when calling GetText for 0 characters.
+      </li>
+      <li>
+	Exporting as LaTeX improved when processing backslashes and tabs
+	and setting up font.
+      </li>
+      <li>
+	Crash fixed in SciTE when exporting or copying as RTF.
+      </li>
+      <li>
+	SciTE session loading fixed to handle more than 10 files in session.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite146.zip?download">Release 1.46</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 10 May 2002.
+      </li>
+      <li>
+	Set of lexers compiled into Scintilla can now be changed by adding and
+	removing lexer source files from scintilla/src and running LexGen.py.
+      </li>
+      <li>
+	SCN_ZOOM notification provided by Scintilla when user changes zoom level.
+	Method to determine width of strings in pixels so that elements can be sized
+	relative to text size.
+	SciTE changed to keep line number column displaying a given
+	number of characters.
+      </li>
+      <li>
+	The logical width of the document used to determine scroll bar range can be set.
+      </li>
+      <li>
+	Setting to allow vertical scrolling to display last line at top rather than
+	bottom of window.
+      </li>
+      <li>
+	Read-only mode improved to avoid changing the selection in most cases
+	when a modification is attempted. Drag and drop cursors display correctly
+	for read-only in some cases.
+      </li>
+      <li>
+	Visual C++ options in make files changed to suit Visual Studio .NET.
+      </li>
+      <li>
+	Scintilla.iface includes feature types for enumerations and lexers.
+      </li>
+      <li>
+	Lua lexer improves handling of literal strings and copes with nested literal strings.
+      </li>
+      <li>
+	Diff lexer changed to treat lines starting with "***" similarly to "---".
+	Symbolic names defined for lexical classes.
+      </li>
+      <li>
+	nncrontab lexer improved.
+      </li>
+      <li>
+	Turkish fonts (iso8859-9) supported on GTK+.
+      </li>
+      <li>
+	Automatic close tag feature for XML and HTML in SciTE.
+      </li>
+      <li>
+	Automatic indentation in SciTE improved.
+      </li>
+      <li>
+	Maximum number of buffers available in SciTE increased. May be up to 100
+	although other restrictions on menu length limit the real maximum.
+      </li>
+      <li>
+	Save a Copy command added to SciTE.
+      </li>
+      <li>
+	Export as TeX command added to SciTE.
+      </li>
+      <li>
+	Export as HTML command in SciTE respects Use Monospaced Font and
+	background colour settings.
+      </li>
+      <li>
+	Compilation problem on Solaris fixed.
+      </li>
+      <li>
+	Order of files displayed for SciTE's previous and next menu and key commands
+	are now consistent.
+      </li>
+      <li>
+	Saving of MRU in recent file changed so files open when SciTE quit
+	are remembered.
+      </li>
+      <li>
+	More variants of ctags tags handled by Open Selected Filename in SciTE.
+      </li>
+      <li>
+	JavaScript embedded in XML highlighted again.
+      </li>
+      <li>
+	SciTE status bar updated after changing parameters in case they are being
+	displayed in status bar.
+      </li>
+      <li>
+	Crash fixed when handling some multi-byte languages.
+      </li>
+      <li>
+	Crash fixed when replacing end of line characters.
+      </li>
+      <li>
+	Bug in SciTE fixed in multiple buffer mode where automatic loading
+	turned on could lead to losing file contents.
+      </li>
+      <li>
+	Bug in SciTE on GTK+ fixed where dismissing dialogs with close box led to
+	those dialogs never being shown again.
+      </li>
+      <li>
+	Bug in SciTE on Windows fixed where position.tile with default positions
+	led to SciTE being positioned off-screen.
+      </li>
+      <li>
+	Bug fixed in read-only mode, clearing all deletes contraction state data
+	leading to it not being synchronized with text.
+      </li>
+      <li>
+	Crash fixed in SciTE on Windows when tab bar displayed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite145.zip?download">Release 1.45</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 15 March 2002.
+      </li>
+      <li>
+	Line layout cache implemented to improve performance by maintaining
+	the positioning of characters on lines. Can be set to cache nothing,
+	the line with the caret, the visible page or the whole document.
+      </li>
+      <li>
+	Support, including a new lexer, added for Matlab programs.
+      </li>
+      <li>
+	Lua folder supports folding {} ranges and compact mode.
+	Lua lexer styles floating point numbers in number style instead of
+	setting the '.' in operator style.
+	Up to 6 sets of keywords.
+	Better support for [[ although only works well
+	when all on one line.
+      </li>
+      <li>
+	Python lexer improved to handle floating point numbers that contain negative
+	exponents and that start with '.'.
+      </li>
+      <li>
+	When performing a rectangular paste, the caret now remains at the
+	insertion point.
+      </li>
+      <li>
+	On Windows with a wheel mouse, page-at-a-time mode is recognized.
+      </li>
+      <li>
+	Read-only mode added to SciTE with a property to initialize it and another property,
+	$(ReadOnly) available to show this mode in the status bar.
+      </li>
+      <li>
+	SciTE status bar can show the number of lines in the selection
+	with the $(SelHeight) property.
+      </li>
+      <li>
+	SciTE's "Export as HTML" command uses the current character set to produce
+	correct output for non-Western-European character sets, such as Russian.
+      </li>
+      <li>
+	SciTE's "Export as RTF" fixed to produce correct output when file contains '\'.
+      </li>
+      <li>
+	SciTE goto command accepts a column as well as a line.
+	If given a column, it selects the word at that column.
+      </li>
+      <li>
+	SciTE's Build, Compile and Go commands are now disabled if no
+	action has been assigned to them.
+      </li>
+      <li>
+	The Refresh button in the status bar has been removed from SciTE on Windows.
+      </li>
+      <li>
+	Bug fixed in line wrap mode where cursor up or down command did not work.
+      </li>
+      <li>
+	Some styling bugs fixed that were due to a compilation problem with
+	gcc and inline functions with same name but different code.
+      </li>
+      <li>
+	The way that lexers loop over text was changed to avoid accessing beyond the
+	end or setting beyond the end. May fix some bugs and make the code safer but
+	may also cause new bugs.
+      </li>
+      <li>
+	Bug fixed in HTML lexer's handling of SGML.
+      </li>
+      <li>
+	Bug fixed on GTK+/X where lines wider than 32767 pixels did not display.
+      </li>
+      <li>
+	SciTE bug fixed with file name generation for standard property files.
+      </li>
+      <li>
+	SciTE bug fixed with Open Selected Filename command when used with
+	file name and line number combination.
+      </li>
+      <li>
+	In SciTE, indentation and tab settings stored with buffers so maintained correctly
+	as buffers selected.
+	The properties used to initialize these settings can now be set separately for different
+	file patterns.
+      </li>
+      <li>
+	Thread safety improved on Windows with a critical section protecting the font
+	cache and initialization of globals performed within Scintilla_RegisterClasses.
+	New Scintilla_ReleaseResources call provided to allow explicit freeing of resources
+	when statically bound into another application. Resources automatically freed
+	in DLL version. The window classes are now unregistered as part of resource
+	freeing which fixes bugs that occurred in some containers such as Internet Explorer.
+      </li>
+      <li>
+	'make install' fixed on Solaris.
+      </li>
+      <li>
+	Bug fixed that could lead to a file being opened twice in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite144.zip?download">Release 1.44</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 4 February 2002.
+      </li>
+      <li>
+	Crashing bug fixed in Editor::Paint.
+      </li>
+      <li>
+	Lua lexer no longer treats '.' as a word character and
+	handles 6 keyword sets.
+      </li>
+      <li>
+	WordStartPosition and WordEndPosition take an onlyWordCharacters
+	argument.
+      </li>
+      <li>
+	SciTE option for simplified automatic indentation which repeats
+	the indentation of the previous line.
+      </li>
+      <li>
+	Compilation fix on Alpha because of 64 bit.
+      </li>
+      <li>
+	Compilation fix for static linking.
+      </li>
+      <li>
+	Limited maximum line length handled to 8000 characters as previous
+	value of 16000 was causing stack exhaustion crashes for some.
+      </li>
+      <li>
+	When whole document line selected, only the last display line gets
+	the extra selected rectangle at the right hand side rather than
+	every display line.
+      </li>
+      <li>
+	Caret disappearing bug fixed for the case that the caret was not on the
+	first display line of a document line.
+      </li>
+      <li>
+	SciTE bug fixed where untitled buffer containing text was sometimes
+	deleted without chance to save.
+      </li>
+      <li>
+	SciTE bug fixed where use.monospaced not working with
+	multiple buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite143.zip?download">Release 1.43</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 19 January 2002.
+      </li>
+      <li>
+	Line wrapping robustness and performance improved in Scintilla.
+      </li>
+      <li>
+	Line wrapping option added to SciTE for both edit and output panes.
+      </li>
+      <li>
+	Static linking on Windows handles cursor resource better.
+	Documentation of static linking improved.
+      </li>
+      <li>
+	Autocompletion has an option to delete any word characters after the caret
+	upon selecting an item.
+      </li>
+      <li>
+	FOX version identified by PLAT_FOX in Platform.h.
+      </li>
+      <li>
+	Calltips in SciTE use the calltip.&lt;lexer&gt;.word.characters setting to
+	correctly find calltips for functions that include characters like '$' which
+	is not normally considered a word character.
+      </li>
+      <li>
+	SciTE has a command to show help on itself which gets hooked up to displaying
+	SciTEDoc.html.
+      </li>
+      <li>
+	SciTE option calltip.&lt;lexer&gt;.end.definition to display help text on a
+	second line of calltip.
+      </li>
+      <li>
+	Fixed the handling of the Buffers menu on GTK+ to ensure current buffer
+	indicated and no warnings occur.
+	Changed some menu items on GTK+ version to be same as Windows version.
+      </li>
+      <li>
+	use.monospaced property for SciTE determines initial state of Use Monospaced Font
+	setting.
+      </li>
+      <li>
+	The SciTE Complete Symbol command now works when there are no word
+	characters before the caret, even though it is slow to display the whole set of
+	symbols.
+      </li>
+      <li>
+	Function names removed from SciTE's list of PHP keywords. The full list of
+	predefined functions is available from another web site mentioned on the
+	Extras page.
+      </li>
+      <li>
+	Crashing bug at startup on GTK+ for some configurations fixed.
+      </li>
+      <li>
+	Crashing bug on GTK+ on 64 bit platforms fixed.
+      </li>
+      <li>
+	Compilation problem with some compilers fixed in GTK+.
+      </li>
+      <li>
+	Japanese text entry improved on Windows 9x.
+      </li>
+      <li>
+        SciTE recent files directory problem on Windows when HOME and SciTE_HOME
+	environment variables not set is now the directory of the executable.
+      </li>
+      <li>
+	Session files no longer include untitled buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite142.zip?download">Release 1.42</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 24 December 2001.
+      </li>
+      <li>
+	Better localization support including context menus and most messages.
+	Translations of the SciTE user interface available for Bulgarian,
+	French, German, Italian, Russian, and Turkish.
+      </li>
+      <li>
+	Can specify a character to use to indicate control characters
+	rather than having them displayed as mnemonics.
+      </li>
+      <li>
+	Scintilla key command for backspace that will not delete line
+	end characters.
+      </li>
+      <li>
+	Scintilla method to find start and end of words.
+      </li>
+      <li>
+	SciTE on GTK+ now supports the load.on.activate and save.on.deactivate
+	properties in an equivalent way to the Windows version.
+      </li>
+      <li>
+	The output pane of SciTE on Windows is now interactive so command line
+	utilities that prompt for input or confirmation can be used.
+      </li>
+      <li>
+	SciTE on Windows can choose directory for a "Find in Files"
+	command like the GTK+ version could.
+      </li>
+      <li>
+	SciTE can now load a set of API files rather than just one file.
+      </li>
+      <li>
+	ElapsedTime class added to Platform for accurate measurement of durations.
+	Used for debugging and for showing the user how long commands take in SciTE.
+      </li>
+      <li>
+	Baan lexer added.
+      </li>
+      <li>
+	In C++ lexer, document comment keywords no longer have to be at the start
+	of the line.
+      </li>
+      <li>
+	PHP lexer changed to match keywords case insensitively.
+      </li>
+      <li>
+	More shell keywords added.
+      </li>
+      <li>
+	SciTE support for VoiceXML added to xml.properties.
+      </li>
+       <li>
+	In SciTE the selection is not copied to the find field of the Search and Replace
+	dialogs if it contains end of line characters.
+      </li>
+      <li>
+	SciTE on Windows has a menu item to decide whether to respond to other
+	instances which are performing their check.if.already.open check.
+      </li>
+      <li>
+	SciTE accelerator key for Box Comment command changed to avoid problems
+	in non-English locales.
+      </li>
+      <li>
+	SciTE context menu includes Close command for the editor pane and
+	Hide command for the output pane.
+      </li>
+      <li>
+	output: command added to SciTE director interface to add text to the
+	output pane. The director interface can execute commands (such as tool
+	commands with subsystem set to 3) by sending a macro:run message.
+      </li>
+      <li>
+	SciTE on GTK+ will defer to the Window Manager for position if position.left or
+	position.top not set and for size if position.width or position.height not set.
+      </li>
+      <li>
+	SciTE on Windows has a position.tile property to place a second instance
+	to the right of the first.
+      </li>
+      <li>
+	 Scintilla on Windows again supports EM_GETSEL and EM_SETSEL.
+      </li>
+      <li>
+	Problem fixed in Scintilla on Windows where control ID is no longer cached
+	as it could be changed by external code.
+      </li>
+      <li>
+	Problems fixed in SciTE on Windows when finding any other open instances at
+	start up when check.if.already.open is true.
+      </li>
+      <li>
+	Bugs fixed in SciTE where command strings were not always having
+	variables evaluated.
+      </li>
+      <li>
+	Bugs fixed with displaying partial double-byte and Unicode characters
+	in rectangular selections and at the edge when edge mode is EDGE_BACKGROUND.
+	Column numbers reported by GetColumn treat multiple byte characters as one column
+	rather than counting bytes.
+      </li>
+      <li>
+	Bug fixed with caret movement over folded lines.
+      </li>
+      <li>
+        Another bug fixed with tracking selection in secondary views when performing
+	modifications.
+      </li>
+      <li>
+	Horizontal scrolling and display of long lines optimized.
+      </li>
+      <li>
+	Cursor setting in Scintilla on GTK+ optimized.
+      </li>
+      <li>
+	Experimental changeable style attribute.
+	Set to false to make text read-only.
+	Currently only stops caret from being within not-changeable
+	text and does not yet stop deleting a range that contains
+	not-changeable text.
+	Can be used from SciTE by adding notchangeable to style entries.
+      </li>
+      <li>
+	Experimental line wrapping.
+	Currently has performance and appearance problems.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite141.zip?download">Release 1.41</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 6 November 2001.
+      </li>
+      <li>
+        Changed Platform.h to not include platform	headers. This lessens likelihood and impact of
+	name clashes from system headers and also speeds up compilation.
+	Renamed DrawText to DrawTextNoClip to avoid name clash.
+      </li>
+      <li>
+        Changed way word functions work to treat a sequence of punctuation as
+	a word. This is more sensible and also more compatible with other editors.
+      </li>
+      <li>
+        Cursor changes over the margins and selection on GTK+ platform.
+      </li>
+      <li>
+        SC_MARK_BACKGROUND is a marker that only changes the line's background colour.
+      </li>
+      <li>
+	Enhanced Visual Basic lexer handles character date and octal literals,
+	and bracketed keywords for VB.NET. There are two VB lexers, vb and vbscript
+	with type indication characters like ! and $ allowed at the end of identifiers
+	in vb but not vbscript. Lexer states now separate from those used for C++ and
+	names start with SCE_B.
+      </li>
+      <li>
+         Lexer added for Bullant language.
+      </li>
+      <li>
+         The horizontal scroll position, xOffset, is now exposed through the API.
+      </li>
+      <li>
+         The SCN_POSCHANGED notification is deprecated as it was causing confusion.
+	 Use SCN_UPDATEUI  instead.
+      </li>
+      <li>
+         Compilation problems fixed for some versions of gcc.
+      </li>
+      <li>
+        Support for WM_GETTEXT restored on Windows.
+      </li>
+      <li>
+        Double clicking on an autocompletion list entry works on GTK+.
+      </li>
+      <li>
+        Bug fixed with case insensitive sorts for autocompletion lists.
+      </li>
+      <li>
+        Bug fixed with tracking selection in secondary views when performing modifications.
+      </li>
+      <li>
+        SciTE's abbreviation expansion feature will now indent expansions to the current
+	indentation level if indent.automatic is on.
+      </li>
+      <li>
+        SciTE allows setting up of parameters to commands from a dialog and can also
+       show this dialog automatically to prompt for arguments when running a command.
+      </li>
+      <li>
+        SciTE's Language menu (formerly Options | Use Lexer) is now defined by the
+	menu.language property rather than being hardcoded.
+      </li>
+      <li>
+        The user interface of SciTE can be localized to a particular language by editing
+	a locale.properties file.
+      </li>
+      <li>
+        On Windows, SciTE will try to move to the front when opening a new file from
+	the shell and using check.if.already.open.
+      </li>
+      <li>
+        SciTE can display the file name and directory in the title bar in the form
+	"file @ directory" when title.full.path=2.
+      </li>
+      <li>
+        The SciTE time.commands property reports the time taken by a command as well
+	as its status when completed.
+      </li>
+      <li>
+        The SciTE find.files property is now a list separated by '|' characters and this list is
+	added into the Files pull down of the Find in Files dialog.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite140.zip?download">Release 1.40</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 September 2001.
+      </li>
+      <li>
+	Removal of emulation of Win32 RichEdit control in core of Scintilla.
+	<em>This change may be incompatible with existing client code.</em>
+	Some emulation still done in Windows platform layer.
+      </li>
+      <li>
+	SGML support in the HTML/XML lexer.
+      </li>
+      <li>
+	SciTE's "Stop Executing" command will terminate GUI programs on
+	Windows NT and Windows 2000.
+      </li>
+      <li>
+	StyleContext class helps construct lexers that are simple and accurate.
+	Used in the C++, Eiffel, and Python lexers.
+      </li>
+      <li>
+	Clipboard operations in GTK+ version convert between platform '\n' line endings and
+	currently chosen line endings.
+      </li>
+      <li>
+	Any character in range 0..255 can be used as a marker.
+	This can be used to support numbered bookmarks, for example.
+      </li>
+      <li>
+	The default scripting language for ASP can be set.
+      </li>
+      <li>
+	New lexer and other support for crontab files used with the nncron scheduler.
+      </li>
+      <li>
+	Folding of Python improved.
+      </li>
+      <li>
+	The ` character is treated as a Python operator.
+      </li>
+      <li>
+	Line continuations ("\" at end of line) handled inside Python strings.
+      </li>
+      <li>
+	More consistent handling of line continuation ('\' at end of line) in
+	C++ lexer.
+	This fixes macro definitions that span more than one line.
+      </li>
+      <li>
+	C++ lexer can understand Doxygen keywords in doc comments.
+      </li>
+      <li>
+	SciTE on Windows allows choosing to open the "open" dialog on the directory
+	of the current file rather than in the default directory.
+      </li>
+      <li>
+	SciTE on Windows handles command line arguments in "check.if.already.open"
+	correctly when the current directory of the new instance is different to the
+	already open instance of SciTE.
+      </li>
+      <li>
+	"cwd" command (change working directory) defined for SciTE director interface.
+      </li>
+      <li>
+	SciTE "Export As HTML" produces better, more compliant, and shorter files.
+      </li>
+      <li>
+	SciTE on Windows allows several options for determining default file name
+	for exported files.
+      </li>
+      <li>
+	Automatic indentation of Python in SciTE fixed.
+      </li>
+      <li>
+	Exported HTML can support folding.
+      </li>
+      <li>
+	Bug fixed in SCI_GETTEXT macro command of director interface.
+      </li>
+      <li>
+	Cursor leak fixed on GTK+.
+      </li>
+      <li>
+	During SciTE shutdown, "identity" messages are no longer sent over the director interface.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite139.zip?download">Release 1.39</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 22 August 2001.
+      </li>
+      <li>
+	Windows version requires msvcrt.dll to be available so will not work
+	on original Windows 95 version 1. The msvcrt.dll file is installed
+	by almost everything including Internet Explorer so should be available.
+      </li>
+      <li>
+	Flattened tree control style folding margin. The SciTE fold.plus option is
+	now fold.symbols and has more values for the new styles.
+      </li>
+      <li>
+	Mouse dwell events are generated when the user holds the mouse steady
+	over Scintilla.
+      </li>
+      <li>
+      PositionFromPointClose is like PositionFromPoint but returns
+      INVALID_POSITION when point outside window or after end of line.
+      </li>
+      <li>
+      Input of Hungarian and Russian characters in GTK+ version works by
+      truncating input to 8 bits if in the range of normal characters.
+      </li>
+      <li>
+      Better choices for font descriptors on GTK+ for most character sets.
+      </li>
+      <li>
+      GTK+ Scintilla is destroyed upon receiving destroy signal rather than
+      destroy_event signal.
+      </li>
+      <li>
+      Style setting that force upper or lower case text.
+      </li>
+      <li>
+      Case-insensitive autocompletion lists work correctly.
+      </li>
+      <li>
+      Keywords can be prefix based so ^GTK_ will treat all words that start
+      with GTK_ as keywords.
+      </li>
+      <li>
+      Horizontal scrolling can be jumpy rather than gradual.
+      </li>
+      <li>
+      GetSelText places a '\0' in the buffer if the selection is empty..
+      </li>
+      <li>
+      EnsureVisible split into two methods EnsureVisible which will not scroll to show
+      the line and EnsureVisibleEnforcePolicy which may scroll.
+      </li>
+      <li>
+      Python folder has options to fold multi-line comments and triple quoted strings.
+      </li>
+      <li>
+      C++ lexer handles keywords before '.' like "this.x" in Java as keywords.
+      Compact folding mode option chooses whether blank lines after a structure are
+      folded with that structure. Second set of keywords with separate style supported.
+      </li>
+      <li>
+      Ruby lexer handles multi-line comments.
+      </li>
+      <li>
+      VB has folder.
+      </li>
+      <li>
+      PHP lexer has an operator style, handles "&lt;?" and "?&gt;" inside strings
+      and some comments.
+      </li>
+      <li>
+      TCL lexer which is just an alias for the C++ lexer so does not really
+      understand TCL syntax.
+      </li>
+      <li>
+      Error lines lexer has styles for Lua error messages and .NET stack traces.
+      </li>
+      <li>
+      Makefile lexer has a target style.
+      </li>
+      <li>
+      Lua lexer handles some [[]] string literals.
+      </li>
+      <li>
+      HTML and XML lexer have a SCE_H_SGML state for tags that
+      start with "&lt;!".
+      </li>
+      <li>
+      Fixed Scintilla bugs with folding. When modifications were performed near
+      folded regions sometimes no unfolding occurred when it should have. Deleting a
+      fold causing character sometimes failed to update fold information correctly.
+      </li>
+      <li>
+      Better support for Scintilla on GTK+ for Win32 including separate
+      PLAT_GTK_WIN32 definition and correct handling of rectangular selection
+      with clipboard operations.
+      </li>
+      <li>
+      SciTE has a Tools | Switch Pane (Ctrl+F6) command to switch focus between
+      edit and output panes.
+      </li>
+      <li>
+      SciTE option output.scroll allows automatic scrolling of output pane to
+      be turned off.
+      </li>
+      <li>
+      Commands can be typed into the SciTE output pane similar to a shell window.
+      </li>
+      <li>
+      SciTE properties magnification and output magnification set initial zoom levels.
+      </li>
+      <li>
+      Option for SciTE comment block command to place comments at start of line.
+      </li>
+      <li>
+       SciTE for Win32 has an option to minimize to the tray rather than the task bar.
+      </li>
+      <li>
+      Close button on SciTE tool bar for Win32.
+      </li>
+      <li>
+      SciTE compiles with GCC 3.0.
+      </li>
+      <li>
+      SciTE's automatic indentation of C++ handles braces without preceding keyword
+      correctly.
+      </li>
+      <li>
+      Bug fixed with GetLine method writing past the end of where it should.
+      </li>
+      <li>
+      Bug fixed with mouse drag automatic scrolling when some lines were folded.
+      </li>
+      <li>
+      Bug fixed because caret XEven setting was inverted.
+      </li>
+      <li>
+      Bug fixed where caret was initially visible even though window was not focussed.
+      </li>
+      <li>
+      Bug fixed where some file names could end with "\\" which caused slow
+      downs on Windows 9x.
+      </li>
+      <li>
+      On Win32, SciTE Replace dialog starts with focus on replacement text.
+      </li>
+      <li>
+      SciTE Go to dialog displays correct current line.
+      </li>
+      <li>
+      Fixed bug with SciTE opening multiple files at once.
+      </li>
+      <li>
+      Fixed bug with Unicode key values reported to container truncated.
+      </li>
+      <li>
+      Fixed bug with unnecessary save point notifications.
+      </li>
+      <li>
+      Fixed bugs with indenting and unindenting at start of line.
+      </li>
+      <li>
+      Monospace Font setting behaves more consistently.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite138.zip?download">Release 1.38</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 23 May 2001.
+      </li>
+      <li>
+	Loadable lexer plugins on Windows.
+      </li>
+      <li>
+	Ruby lexer and support.
+      </li>
+      <li>
+	Lisp lexer and support.
+      </li>
+      <li>
+	Eiffel lexer and support.
+      </li>
+      <li>
+	Modes for better handling of Tab and BackSpace keys within
+	indentation. Mode to avoid autocompletion list cancelling when
+	there are no viable matches.
+      </li>
+      <li>
+	ReplaceTarget replaced with two calls ReplaceTarget
+	(which is incompatible with previous ReplaceTarget) and
+	ReplaceTargetRE. Both of these calls have a count first
+	parameter which allows using strings containing nulls.
+	SearchInTarget and SetSearchFlags functions allow
+	specifying a search in several simple steps which helps
+	some clients which can not create structs or pointers easily.
+      </li>
+      <li>
+	Asian language input through an Input Method Editor works
+	on Windows 2000.
+      </li>
+      <li>
+	On Windows, control characters can be entered through use of
+	the numeric keypad in conjunction with the Alt key.
+      </li>
+      <li>
+	Document memory allocation changed to grow exponentially
+	which reduced time to load a 30 Megabyte file from
+	1000 seconds to 25. Change means more memory may be used.
+      </li>
+      <li>
+	Word part movement keys now handled in Scintilla rather than
+	SciTE.
+      </li>
+      <li>
+	Regular expression '^' and '$' work more often allowing insertion
+	of text at start or end of line with a replace command.
+	Backslash quoted control characters \a, \b, \f, \t, and \v
+	recognized within sets.
+      </li>
+      <li>
+	Session files for SciTE.
+      </li>
+      <li>
+	Export as PDF command hidden in SciTE as it often failed.
+	Code still present so can be turned on by those willing to cope.
+      </li>
+      <li>
+	Bug fixed in HTML lexer handling % before &gt; as end ASP
+	even when no start ASP encountered.
+        Bug fixed when scripts ended with a quoted string and
+        end tag was not seen.
+      </li>
+      <li>
+	Bug fixed on Windows where context menu key caused menu to
+	appear in corner of screen rather than within window.
+      </li>
+      <li>
+	Bug fixed in SciTE's Replace All command not processing
+	whole file when replace string longer than search string.
+      </li>
+      <li>
+	Bug fixed in SciTE's MRU list repeating entries if Ctrl+Tab
+	used when all entries filled.
+      </li>
+      <li>
+	ConvertEOLs call documentation fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite137.zip?download">Release 1.37</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 17 April 2001.
+      </li>
+      <li>
+	Bug fixed with scroll bars being invisible on GTK+ 1.2.9.
+      </li>
+      <li>
+	Scintilla and SciTE support find and replace using simple regular
+	expressions with tagged expressions. SciTE supports C '\' escapes
+	in the Find and Replace dialogs.
+	Replace in Selection available in SciTE.
+      </li>
+      <li>
+	Scintilla has a 'target' feature for replacing code rapidly without
+	causing display updates.
+      </li>
+      <li>
+	Scintilla and SciTE on GTK+ support file dropping from file managers
+	such as Nautilus and gmc. Files or other URIs dropped on Scintilla
+	result in a URIDropped notification.
+      </li>
+      <li>
+	Lexers may have separate Lex and Fold functions.
+      </li>
+      <li>
+	Lexer infrastructure improved to allow for plug in lexers and for referring
+	to lexers by name rather than by ID.
+      </li>
+      <li>
+	Ada lexer and support added.
+      </li>
+      <li>
+	Option in both Scintilla and SciTE to treat both left and right margin
+	as equally important when repositioning visible area in response to
+	caret movement. Default is to prefer visible area positioning which
+	minimizes the horizontal scroll position thus favouring the left margin.
+      </li>
+      <li>
+	Caret line highlighting.
+      </li>
+      <li>
+	Commands to delete from the caret to the end of line and
+	from the caret to the beginning of line.
+      </li>
+      <li>
+	SciTE has commands for inserting and removing block comments and
+	for inserting stream comments.
+      </li>
+      <li>
+	SciTE Director interface uses C++ '\' escapes to send control characters.
+      </li>
+      <li>
+	SciTE Director interface adds more commands including support for macros.
+      </li>
+      <li>
+	SciTE has menu options for recording and playing macros which are visible
+	when used with a companion program that supports these features.
+      </li>
+      <li>
+	SciTE has an Expand Abbreviation command.
+	Abbreviations are stored in a global abbrev.properties file.
+      </li>
+      <li>
+	SciTE has a Full Screen command to switch between a normal window
+	size and using the full screen. On Windows, the menu bar can be turned
+	off when in full screen mode.
+      </li>
+      <li>
+	SciTE has a Use monospaced font command to switch between the normal
+	set of fonts and one size of a particular fixed width font.
+      </li>
+      <li>
+	SciTE's use of tabs can be controlled for particular file names
+	as well as globally.
+      </li>
+      <li>
+	The contents of SciTE's status bar can be defined by a property and
+	include variables. On Windows, several status bar definitions can be active
+	with a click on the status bar cycling through them.
+      </li>
+      <li>
+	Copy as RTF command in SciTE on Windows to allow pasting
+	styled text into word processors.
+      </li>
+      <li>
+	SciTE can allow the use of non-alphabetic characters in
+	Complete Symbol lists and can automatically display this autocompletion
+	list when a trigger character such as '.' is typed.
+	Complete word can be set to pop up when the user is typing a word and
+	there is only one matching word in the document.
+      </li>
+      <li>
+	SciTE lists the imported properties files on a menu to allow rapid
+	access to them.
+      </li>
+      <li>
+	SciTE on GTK+ improvements to handling accelerator keys and focus
+	in dialogs. Message boxes respond to key presses without the Alt key as
+	they have no text entries to accept normal keystrokes.
+      </li>
+      <li>
+	SciTE on GTK+ sets the application icon.
+      </li>
+      <li>
+	SciTE allows setting the colours used to indicate the current
+	error line.
+      </li>
+      <li>
+	Variables within PHP strings have own style. Keyword list updated.
+      </li>
+      <li>
+	Keyword list for Lua updated for Lua 4.0.
+      </li>
+      <li>
+	Bug fixed in rectangular selection where rectangle still appeared
+	selected after using cursor keys to move caret.
+      </li>
+      <li>
+	Bug fixed in C++ lexer when deleting a '{' controlling a folded range
+	led to that range becoming permanently invisible.
+      </li>
+      <li>
+	Bug fixed in Batch lexer where comments were not recognized.
+      </li>
+      <li>
+	Bug fixed with undo actions coalescing into steps incorrectly.
+      </li>
+      <li>
+	Bug fixed with Scintilla on GTK+ positioning scroll bars 1 pixel
+	over the Scintilla window leading to their sides being chopped off.
+      </li>
+      <li>
+	Bugs fixed in SciTE when doing some actions led to the start
+	or end of the file being displayed rather than the current location.
+      </li>
+      <li>
+	Appearance of calltips fixed to look like document text including
+	any zoom factor. Positioned to be outside current line even when
+	multiple fonts and sizes used.
+      </li>
+      <li>
+	Bug fixed in Scintilla macro support where typing Enter caused both a newline
+	command and newline character insertion to be recorded.
+      </li>
+      <li>
+	Bug fixed in SciTE on GTK+ where focus was moving
+	between widgets incorrectly.
+      </li>
+      <li>
+	Bug fixed with fold symbols sometimes not updating when
+	the text changed.
+      </li>
+      <li>
+	Bugs fixed in SciTE's handling of folding commands.
+      </li>
+      <li>
+	Deprecated undo collection enumeration removed from API.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite136.zip?download">Release 1.36</a>
+    </h3>
+    <ul>
+      <li>
+	Released on 1 March 2001.
+      </li>
+      <li>
+	Scintilla supports GTK+ on Win32.
+      </li>
+      <li>
+	Some untested work on making Scintilla and SciTE 64 bit compatible.
+	For users on GTK+ this requires including Scintilla.h before
+	ScintillaWidget.h.
+      </li>
+      <li>
+	HTML lexer allows folding HTML.
+      </li>
+      <li>
+	New lexer for Avenue files which are used in the ESRI ArcView GIS.
+      </li>
+      <li>
+	DOS Batch file lexer has states for '@', external commands, variables and
+	operators.
+      </li>
+      <li>
+	C++ lexer can fold comments of /* .. */ form.
+      </li>
+      <li>
+	Better disabling of pop up menu items in Scintilla when in read-only mode.
+      </li>
+      <li>
+	Starting to move to Doxygen compatible commenting.
+      </li>
+      <li>
+	Director interface on Windows enables another application to control SciTE.
+      </li>
+      <li>
+	Opening SciTE on Windows 9x sped up greatly for some cases.
+      </li>
+      <li>
+	The command.build.directory property allows SciTE to run the build
+	command in a different directory to the source files.
+      </li>
+      <li>
+	SciTE on Windows allows setting foreground and background colours
+	for printed headers and footers.
+      </li>
+      <li>
+	Bug fixed in finding calltips in SciTE which led to no calltips for some identifiers.
+      </li>
+      <li>
+	Documentation added for lexers and for the extension and director interfaces.
+      </li>
+      <li>
+	SciTE menus rearranged with new View menu taking over some of the items that
+	were under the Options menu. Clear All Bookmarks command added.
+      </li>
+      <li>
+	Clear Output command in SciTE.
+      </li>
+      <li>
+	SciTE on Windows gains an Always On Top command.
+      </li>
+      <li>
+	Bug fixed in SciTE with attempts to define properties recursively.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where only one level of substitution was done.
+      </li>
+      <li>
+	Bug fixed in SciTE properties where extensions were not being
+	matched in a case insensitive manner.
+      </li>
+      <li>
+	Bug fixed in SciTE on Windows where the Go to dialog displays the correct
+	line number.
+      </li>
+      <li>
+	In SciTE, if fold.on.open set then switching buffers also performs fold.
+      </li>
+      <li>
+	Bug fixed in Scintilla where ensuring a line was visible in the presence of folding
+	operated on the document line instead of the visible line.
+      </li>
+      <li>
+	SciTE command line processing modified to operate on arguments in order and in
+	two phases. First any arguments before the first file name are processed, then the
+	UI is opened, then the remaining arguments are processed. Actions defined for the
+	Director interface (currently only "open") may also be used on the command line.
+	For example, "SciTE -open:x.txt" will start SciTE and open x.txt.
+      </li>
+      <li>
+	Numbered menu items SciTE's Buffers menu and the Most Recently Used portion
+	of the File menu go from 1..0 rather than 0..9.
+      </li>
+      <li>
+	The tab bar in SciTE for Windows has numbers.
+	The tab.hide.one option hides the tab bar until there is more than one buffer open.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite135.zip?download">Release 1.35</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 January 2001.
+      </li>
+      <li>
+        Rewritten and simplified widget code for the GTK+ version to enhance
+        solidity and make more fully compliant with platform norms. This includes more
+        normal handling of keystrokes so they are forwarded to containers correctly.
+      </li>
+      <li>
+        User defined lists can be shown.
+      </li>
+      <li>
+        Many fixes to the Perl lexer.
+      </li>
+      <li>
+        Pascal lexer handles comments more correctly.
+      </li>
+      <li>
+        C/C++/Java/JavaScipt lexer has a state for line doc comments.
+      </li>
+      <li>
+        Error output lexer understands Sun CC messages.
+      </li>
+      <li>
+        Make file lexer has variable, preprocessor, and operator states.
+      </li>
+      <li>
+        Wider area given to an italics character that is at the end of a line to prevent it
+	being cut off.
+      </li>
+      <li>
+        Call to move the caret inside the currently visible area.
+      </li>
+      <li>
+        Paste Rectangular will space fill on the left hand side of the pasted text as
+	needed to ensure it is kept rectangular.
+      </li>
+      <li>
+        Cut and Paste Rectangular does nothing in read-only mode.
+      </li>
+      <li>
+        Undo batching changed so that a paste followed by typing creates two undo actions..
+      </li>
+      <li>
+        A "visibility policy" setting for Scintilla determines which range of lines are displayed
+	when a particular line is moved to. Also exposed as a property in SciTE.
+      </li>
+      <li>
+        SciTE command line allows property settings.
+      </li>
+      <li>
+        SciTE has a View Output command to hide or show the output pane.
+      </li>
+      <li>
+        SciTE's Edit menu has been split in two with searching commands moved to a
+	new Search menu. Find Previous and Previous Bookmark are in the Search menu.
+      </li>
+      <li>
+        SciTE on Windows has options for setting print margins, headers and footers.
+      </li>
+      <li>
+        SciTE on Windows has tooltips for toolbar.
+      </li>
+      <li>
+        SciTE on GTK+ has properties for setting size of file selector.
+      </li>
+      <li>
+        Visual and audio cues in SciTE on Windows enhanced.
+      </li>
+      <li>
+        Fixed performance problem in SciTE for GTK+ by dropping the extra 3D
+        effect on the content windows.
+      </li>
+      <li>
+        Fixed problem in SciTE where choosing a specific lexer then meant
+        that no lexer was chosen when files opened.
+      </li>
+      <li>
+        Default selection colour changed to be visible on low colour displays.
+      </li>
+      <li>
+        Fixed problems with automatically reloading changed documents in SciTE on
+        Windows.
+      </li>
+      <li>
+        Fixed problem with uppercase file extensions in SciTE.
+      </li>
+      <li>
+        Fixed some problems when using characters >= 128, some of which were being
+        incorrectly treated as spaces.
+      </li>
+      <li>
+        Fixed handling multiple line tags, non-inline scripts, and XML end tags /&gt; in HTML/XML lexer.
+      </li>
+      <li>
+        Bookmarks in SciTE no longer disappear when switching between buffers.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite134.zip?download">Release 1.34</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 November 2000.
+      </li>
+      <li>
+        Pascal lexer.
+      </li>
+      <li>
+        Export as PDF in SciTE.
+      </li>
+      <li>
+        Support for the OpenVMS operating system in SciTE.
+      </li>
+      <li>
+        SciTE for GTK+ can check for another instance of SciTE
+	editing a file and switch to it rather than open a second instance
+	on one file.
+      </li>
+      <li>
+        Fixes to quoting and here documents in the Perl lexer.
+      </li>
+      <li>
+        SciTE on Windows can give extra visual and audio cues when a
+	warning is shown or find restarts from beginning of file.
+      </li>
+      <li>
+        Open Selected Filename command in SciTE. Also understands some
+	warning message formats.
+      </li>
+      <li>
+        Wider area for line numbers when printing.
+      </li>
+      <li>
+        Better scrolling performance on GTK+.
+      </li>
+      <li>
+        Fixed problem where rectangles with negative coordinates were
+	invalidated leading to trouble with platforms that use
+	unsigned coordinates.
+      </li>
+      <li>
+        GTK+ Scintilla uses more compliant signalling code so that keyboard
+	events should propagate to containers.
+      </li>
+      <li>
+        Bug fixed with opening full or partial paths.
+      </li>
+      <li>
+        Improved handling of paths in error messages in SciTE.
+      </li>
+      <li>
+        Better handling of F6 in SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite133.zip?download">Release 1.33</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 2000.
+      </li>
+      <li>
+        XIM support for the GTK+ version of Scintilla ensures that more non-English
+        characters can be typed.
+      </li>
+      <li>
+        Caret may be 1, 2, or 3 pixels wide.
+      </li>
+      <li>
+        Cursor may be switched to wait image during lengthy processing.
+      </li>
+      <li>
+        Scintilla's internal focus flag is exposed for clients where focus is handled in
+        complex ways.
+      </li>
+      <li>
+        Error status defined for Scintilla to hold indication that an operation failed and the reason
+        for that failure. No detection yet implemented but clients may start using the interface
+        so as to be ready for when it does.
+      </li>
+      <li>
+        Context sensitive help in SciTE.
+      </li>
+      <li>
+        CurrentWord property available in SciTE holding the value of the word the
+        caret is within or near.
+      </li>
+      <li>
+        Apache CONF file lexer.
+      </li>
+      <li>
+        Changes to Python lexer to allow 'as' as a context sensitive keyword and the
+        string forms starting with u, r, and ur to be recognized.
+      </li>
+      <li>
+        SCN_POSCHANGED notification now working and SCN_PAINTED notification added.
+      </li>
+      <li>
+        Word part movement commands for cursoring between the parts of reallyLongCamelIdentifiers and
+        other_ways_of_making_words.
+      </li>
+      <li>
+        When text on only one line is selected, Shift+Tab moves to the previous tab stop.
+      </li>
+      <li>
+        Tab control available for Windows version of SciTE listing all the buffers
+        and making it easy to switch between them.
+      </li>
+      <li>
+        SciTE can be set to automatically determine the line ending type from the contents of a
+        file when it is opened.
+      </li>
+      <li>
+        Dialogs in GTK+ version of SciTE made more modal and have accelerator keys.
+      </li>
+      <li>
+        Find in Files command in GTK+ version of SciTE allows choice of directory.
+      </li>
+      <li>
+        On Windows, multiple files can be opened at once.
+      </li>
+      <li>
+        SciTE source broken up into more files.
+      </li>
+      <li>
+        Scintilla headers made safe for C language, not just C++.
+      </li>
+      <li>
+        New printing modes - force background to white and force default background to white.
+      </li>
+      <li>
+        Automatic unfolding not occurring when Enter pressed at end of line bug fixed.
+      </li>
+      <li>
+        Bugs fixed in line selection.
+      </li>
+      <li>
+        Bug fixed with escapes in PHP strings in the HTML lexer.
+      </li>
+      <li>
+        Bug fixed in SciTE for GTK+ opening files when given full paths.
+      </li>
+      <li>
+        Bug fixed in autocompletion where user backspaces into existing text.
+      </li>
+      <li>
+        Bugs fixed in opening files and ensuring they are saved before running.
+        A case bug also fixed here.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite132.zip?download">Release 1.32</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 8 September 2000.
+      </li>
+      <li>
+        Fixes bugs in complete word and related code. Protection against a bug when
+	receiving a bad argument.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite131.zip?download">Release 1.31</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 September 2000.
+      </li>
+      <li>
+        Scintilla is available as a COM control from the scintillactrl module in CVS.
+      </li>
+      <li>
+        Style setting to underline text. Exposed in SciTE as "underlined".
+      </li>
+      <li>
+        Style setting to make text invisible.
+      </li>
+      <li>
+        SciTE has an extensibility interface that can be used to implement features such as
+        a scripting language or remote control. An example use of this is the extlua module
+        available from CVS which allows SciTE to be scripted in Lua.
+      </li>
+      <li>
+        Many minor fixes to all of the lexers.
+      </li>
+      <li>
+        New lexer for diff and patch files.
+      </li>
+      <li>
+        Error message lexer understands Perl error messages.
+      </li>
+      <li>
+        C/C++/Java lexer now supports C#, specifically verbatim strings and
+	@ quoting of identifiers that are the same as keywords. SciTE has
+	a set of keywords for C# and a build command set up for C#.
+      </li>
+      <li>
+        Scintilla property to see whether in overtype or insert state.
+      </li>
+      <li>
+         PosChanged notification fired when caret moved.
+      </li>
+      <li>
+        Comboboxes in dialogs in SciTE on Windows can be horizontally scrolled.
+      </li>
+      <li>
+        Autocompletion and calltips can treat the document as case sensitive or
+        case insensitive.
+      </li>
+      <li>
+        Autocompletion can be set to automatically choose the only
+	element in a single element list.
+      </li>
+      <li>
+        Set of characters that automatically complete an autocompletion list
+	can be set.
+      </li>
+      <li>
+        SciTE command to display calltip - useful when dropped because of
+	editing.
+      </li>
+      <li>
+        SciTE has a Revert command to go back to the last saved version.
+      </li>
+      <li>
+        SciTE has an Export as RTF command. Save as HTML is renamed
+	to Export as HTML and is located on the Export sub menu.
+      </li>
+      <li>
+        SciTE command "Complete Word" searches document for any
+	words starting with characters before caret.
+      </li>
+      <li>
+        SciTE options for changing aspects of the formatting of files exported
+	as HTML or RTF.
+      </li>
+      <li>
+        SciTE "character.set" option for choosing the character
+	set for all fonts.
+      </li>
+      <li>
+        SciTE has a "Toggle all folds" command.
+      </li>
+      <li>
+        The makefiles have changed. The makefile_vc and
+	makefile_bor files in scintilla/win32 and scite/win32 have been
+	merged into scintilla/win32/scintilla.mak and scite/win32/scite.mak.
+	DEBUG may be defined for all make files and this will turn on
+	assertions and for some make files will choose other debugging
+	options.
+      </li>
+      <li>
+         To make debugging easier and allow good use of BoundsChecker
+	 there is a Visual C++ project file in scite/boundscheck that builds
+	 all of Scintilla and SciTE into one executable.
+      </li>
+      <li>
+         The size of the SciTE output window can be set with the
+	 output.horizontal.size and output.vertical.size settings.
+      </li>
+      <li>
+         SciTE status bar indicator for insert or overwrite mode.
+      </li>
+      <li>
+        Performance improvements to autocompletion and calltips.
+      </li>
+      <li>
+        A caret redraw problem when undoing is fixed.
+      </li>
+      <li>
+        Crash with long lines fixed.
+      </li>
+      <li>
+        Bug fixed with merging markers when lines merged.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite130.zip?download">Release 1.30</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 26 July 2000.
+      </li>
+      <li>
+        Much better support for PHP which is now an integral part of the HTML support.
+      </li>
+      <li>
+        Start replacement of Windows-specific APIs with cross platform APIs.
+        In 1.30, the new APIs are introduced but the old APIs are still available.
+        For the GTK+ version, may have to include "WinDefs.h" explicitly to
+        use the old APIs.
+      </li>
+      <li>
+        "if" and "import" statements in SciTE properties files allows modularization into
+        language-specific properties files and choices based upon platform.
+        This means that SciTE is delivered with 9 language-specific properties files
+        as well as the standard SciTEGlobal.properties file.
+      </li>
+      <li>
+        Much lower resource usage on Windows 9x.
+      </li>
+      <li>
+        "/p" option in SciTE on Windows for printing a file and then exiting.
+      </li>
+      <li>
+        Options for printing with inverted brightness (when the screen is set to use
+        a dark background) and to force black on white printing.
+      </li>
+      <li>
+        Option for printing magnified or miniaturized from screen settings.
+      </li>
+      <li>
+        In SciTE, Ctrl+F3 and Ctrl+Shift+F3 find the selection in the forwards and backwards
+        directions respectively.
+      </li>
+      <li>
+        Auto-completion lists may be set to cancel when the cursor goes before
+        its start position or before the start of string being completed.
+      </li>
+      <li>
+        Auto-completion lists automatically size more sensibly.
+      </li>
+      <li>
+        SCI_CLEARDOCUMENTSTYLE zeroes all style bytes, ensures all
+        lines are shown and deletes all folding information.
+      </li>
+      <li>
+        On Windows, auto-completion lists are visually outdented rather than indented.
+      </li>
+      <li>
+        Close all command in SciTE.
+      </li>
+      <li>
+        On Windows multiple files can be dragged into SciTE.
+      </li>
+      <li>
+        When saving a file, the SciTE option save.deletes.first deletes it before doing the save.
+        This allows saving with a different capitalization on Windows.
+      </li>
+      <li>
+        When use tabs option is off pressing the tab key inserts spaces.
+      </li>
+      <li>
+        Bug in indicators leading to extra line drawn fixed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite128.zip?download">Release 1.28</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 June 2000.
+      </li>
+      <li>
+         Fixes crash in indentation guides when indent size set to 0.
+      </li>
+      <li>
+         Fixes to installation on GTK+/Linux. User properties file on GTK+ has a dot at front of name:
+         .SciTEUser.properties. Global properties file location configurable at compile time
+         defaulting to $prefix/share/scite. $prefix determined from Gnome if present else its
+         /usr/local and can be overridden by installer. Gnome menu integration performed in
+         make install if Gnome present.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite127.zip?download">Release 1.27</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 23 June 2000.
+      </li>
+      <li>
+         Indentation guides. View whitespace mode may be set to not display whitespace
+	 in indentation.
+      </li>
+      <li>
+        Set methods have corresponding gets for UndoCollection, BufferedDraw,
+	CodePage, UsePalette, ReadOnly, CaretFore, and ModEventMask.
+      </li>
+      <li>
+        Caret is continuously on rather than blinking while typing or holding down
+	delete or backspace. And is now always shown if non blinking when focused on GTK+.
+      </li>
+      <li>
+        Bug fixed in SciTE with file extension comparison now done in case insensitive way.
+      </li>
+      <li>
+        Bugs fixed in SciTE's file path handling on Windows.
+      </li>
+      <li>
+        Bug fixed with preprocessor '#' last visible character causing hang.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite126.zip?download">Release 1.26</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 13 June 2000.
+      </li>
+      <li>
+         Support for the Lua language in both Scintilla and SciTE.
+      </li>
+      <li>
+        Multiple buffers may be open in SciTE.
+      </li>
+      <li>
+        Each style may have a character set configured. This may determine
+	the characters that are displayed by the style.
+      </li>
+      <li>
+         In the C++ lexer, lexing of preprocessor source may either treat it all as being in
+	 the preprocessor class or only the initial # and preprocessor command word as
+	 being in the preprocessor class.
+      </li>
+      <li>
+        Scintilla provides SCI_CREATEDOCUMENT, SCI_ADDREFDOCUMENT, and
+	SCI_RELEASEDOCUMENT to make it easier for a container to deal with multiple
+	documents.
+      </li>
+      <li>
+        GTK+ specific definitions in Scintilla.h were removed to ScintillaWidget.h. All GTK+ clients will need to
+	#include "ScintillaWidget.h".
+      </li>
+      <li>
+        For GTK+, tools can be executed in the background by setting subsystem to 2.
+      </li>
+      <li>
+        Keys in the properties files are now case sensitive. This leads to a performance increase.
+      </li>
+      <li>
+        Menu to choose which lexer to use on a file.
+      </li>
+      <li>
+        Tab size dialog on Windows.
+      </li>
+      <li>
+        File dialogs enlarged on GTK+.
+      </li>
+      <li>
+         Match Brace command bound to Ctrl+E on both platforms with Ctrl+] a synonym on Windows.
+         Ctrl+Shift+E is select to matching brace. Brace matching tries to match to either the inside or the
+         outside, depending on whether the cursor is inside or outside the braces initially.
+	View End of Line bound to Ctrl+Shift+O.
+      </li>
+      <li>
+        The Home key may be bound to move the caret to either the start of the line or the start of the
+        text on the line.
+      </li>
+      <li>
+        Visual C++ project file for SciTE.
+      </li>
+      <li>
+        Bug fixed with current x location after Tab key.
+      </li>
+      <li>
+        Bug fixed with hiding fold margin by setting fold.margin.width to 0.
+      </li>
+      <li>
+        Bugs fixed with file name confusion on Windows when long and short names used, or different capitalizations,
+	or relative paths.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite125.zip?download">Release 1.25</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 May 2000.
+      </li>
+      <li>
+        Some Unicode support on Windows. Treats buffer and API as UTF-8 and displays
+	through UCS-2 of Windows.
+      </li>
+      <li>
+        Automatic indentation. Indentation size can be different to tab size.
+      </li>
+      <li>
+        Tool bar.
+      </li>
+      <li>
+        Status bar now on Windows as well as GTK+.
+      </li>
+      <li>
+        Input fields in Find and Replace dialogs now have history on both Windows and
+	GTK+.
+      </li>
+      <li>
+        Auto completion list items may be separated by a chosen character to allow spaces
+	in items. The selected item may be changed through the API.
+      </li>
+      <li>
+        Horizontal scrollbar can be turned off.
+      </li>
+      <li>
+        Property to remove trailing spaces when saving file.
+      </li>
+      <li>
+        On Windows, changed font size calculation to be more compatible with
+	other applications.
+      </li>
+      <li>
+        On GTK+, SciTE's global properties files are looked for in the directory specified in the
+	SCITE_HOME environment variable if it is set. This allows hiding in a dot directory.
+      </li>
+      <li>
+        Keyword lists in SciTE updated for JavaScript to include those destined to be used in
+	the future. IDL includes XPIDL keywords as well as MSIDL keywords.
+      </li>
+      <li>
+        Zoom level can be set and queried through API.
+      </li>
+      <li>
+        New notification sent before insertions and deletions.
+      </li>
+      <li>
+        LaTeX lexer.
+      </li>
+      <li>
+        Fixes to folding including when deletions and additions are performed.
+      </li>
+      <li>
+        Fix for crash with very long lines.
+      </li>
+      <li>
+        Fix to affect all of rectangular selections with deletion and case changing.
+      </li>
+      <li>
+        Removed non-working messages that had been included only for Richedit compatibility.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/scite124.zip">Release 1.24</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 March 2000.
+      </li>
+      <li>
+        Added lexing of IDL based on C++ lexer with extra UUID lexical class.
+      </li>
+      <li>
+        Functions and associated keys for Line Delete, Line Cut, Line Transpose,
+	Selection Lower Case and Selection Upper Case.
+      </li>
+      <li>
+        Property setting for SciTE, eol.mode, chooses initial state of line end characters.
+      </li>
+      <li>
+        Fixed bugs in undo history with small almost-contiguous changes being incorrectly coalesced.
+      </li>
+      <li>
+        Fixed bugs with incorrect expansion of ContractionState data structures causing crash.
+      </li>
+      <li>
+        Fixed bugs relating to null fonts.
+      </li>
+      <li>
+        Fixed bugs where recolourization was not done sometimes when required.
+      </li>
+      <li>
+        Fixed compilation problems with SVector.h.
+      </li>
+      <li>
+        Fixed bad setting of fold points in Python.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/scite123.zip?download">Release 1.23</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 March 2000.
+      </li>
+      <li>
+        Directory structure to separate on basis of product (Scintilla, SciTE, DMApp)
+	and environment (Cross-platform, Win32, GTK+).
+      </li>
+      <li>
+        Download packaging to allow download of the source or platform dependent executables.
+      </li>
+      <li>
+        Source code now available from CVS at SourceForge.
+      </li>
+      <li>
+        Very simple Windows-only demonstration application DMApp is available from cvs as dmapp.
+      </li>
+      <li>
+        Lexing functionality may optionally be included in Scintilla rather than be provided by
+        the container.
+      </li>
+      <li>
+        Set of lexers included is determined at link time by defining which of the Lex* object files
+	are linked in.
+      </li>
+      <li>
+        On Windows, the SciLexer.DLL extends Scintilla.DLL with the standard lexers.
+      </li>
+      <li>
+        Enhanced HTML lexer styles embedded VBScript and Python.
+	ASP segments are styled and ASP scripts in JavaScript, VBScript and Python are styled.
+      </li>
+      <li>
+        PLSQL and PHP supported.
+      </li>
+      <li>
+        Maximum number of lexical states extended to 128.
+      </li>
+      <li>
+        Lexers may store per line parse state for multiple line features such as ASP script language choice.
+      </li>
+      <li>
+        Lexing API simplified.
+      </li>
+      <li>
+        Project file for Visual C++.
+      </li>
+      <li>
+        Can now cycle through all recent files with Ctrl+Tab in SciTE.
+      </li>
+      <li>
+        Bookmarks in SciTE.
+      </li>
+      <li>
+        Drag and drop copy works when dragging to the edge of the selection.
+      </li>
+      <li>
+        Fixed bug with value sizes in properties file.
+      </li>
+      <li>
+        Fixed bug with last line in properties file not being used.
+      </li>
+      <li>
+        Bug with multiple views of one document fixed.
+      </li>
+      <li>
+        Keypad now works on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE122.zip?download">Release 1.22</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 27 February 2000.
+      </li>
+      <li>
+        wxWindows platform defined.
+	Implementation for wxWindows will be available separately
+	from main Scintilla distribution.
+      </li>
+      <li>
+        Line folding in Scintilla.
+      </li>
+      <li>
+        SciTE performs syntax directed folding for C/C++/Java/JavaScript and for Python.
+      </li>
+      <li>
+        Optional macro recording support.
+      </li>
+      <li>
+        User properties file (SciTEUser.properties) allows for customization by the user
+	that is not overwritten with each installation of SciTE.
+      </li>
+      <li>
+        Python lexer detects and highlights inconsistent indentation.
+      </li>
+      <li>
+        Margin API made more orthogonal. SCI_SETMARGINWIDTH and SCI_SETLINENUMBERWIDTH
+        are deprecated in favour of this new API.
+      </li>
+      <li>
+        Margins may be made sensitive to forward mouse click events to container.
+      </li>
+      <li>
+        SQL lexer and styles included.
+      </li>
+      <li>
+        Perl lexer handles regular expressions better.
+      </li>
+      <li>
+        Caret policy determines how closely caret is tracked by visible area.
+      </li>
+      <li>
+        New marker shapes: arrow pointing down, plus and minus.
+      </li>
+      <li>
+        Optionally display full path in title rather than just file name.
+      </li>
+      <li>
+        Container is notified when Scintilla gains or loses focus.
+      </li>
+      <li>
+        SciTE handles focus in a more standard way and applies the main
+	edit commands to the focused pane.
+      </li>
+      <li>
+        Container is notified when Scintilla determines that a line needs to be made visible.
+      </li>
+      <li>
+        Document watchers receive notification when document about to be deleted.
+      </li>
+      <li>
+        Document interface allows access to list of watchers.
+      </li>
+      <li>
+        Line end determined correctly for lines ending with only a '\n'.
+      </li>
+      <li>
+        Search variant that searches form current selection and sets selection.
+      </li>
+      <li>
+        SciTE understands format of diagnostic messages from WScript.
+      </li>
+      <li>
+        SciTE remembers top line of window for each file in MRU list so switching to a recent file
+	is more likely to show the same text as when the file was previously visible.
+      </li>
+      <li>
+        Document reference count now initialized correctly.
+      </li>
+      <li>
+        Setting a null document pointer creates an empty document.
+      </li>
+      <li>
+        WM_GETTEXT can no longer overrun buffer.
+      </li>
+      <li>
+        Polygon drawing bug fixed on GTK+.
+      </li>
+      <li>
+        Java and JavaScript lexers merged into C++ lexer.
+      </li>
+      <li>
+        C++ lexer indicates unterminated strings by colouring the end of the line
+	rather than changing the rest of the file to string style. This is less
+	obtrusive and helps the folding.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://prdownloads.sourceforge.net/scintilla/SciTE121.zip?download">Release 1.21</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 2 February 2000.
+      </li>
+      <li>
+        Blank margins on left and right side of text.
+      </li>
+      <li>
+        SCN_CHECKBRACE renamed SCN_UPDATEUI and made more efficient.
+      </li>
+      <li>
+        SciTE source code refactored into platform independent and platform specific classes.
+      </li>
+      <li>
+        XML and Perl subset lexers in SciTE.
+      </li>
+      <li>
+        Large improvement to lexing speed.
+      </li>
+      <li>
+        A new subsystem, 2, allows use of ShellExec on Windows.
+      </li>
+      <li>
+        Borland compatible makefile.
+      </li>
+      <li>
+        Status bar showing caret position in GTK+ version of SciTE.
+      </li>
+      <li>
+        Bug fixes to selection drawing when part of selection outside window, mouse release over
+        scroll bars, and scroll positioning after deletion.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE120.zip">Release 1.2</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 21 January 2000.
+      </li>
+      <li>
+        Multiple views of one document.
+      </li>
+      <li>
+        Rectangular selection, cut, copy, paste, drag and drop.
+      </li>
+      <li>
+        Long line indication.
+      </li>
+      <li>
+        Reverse searching
+      </li>
+      <li>
+        Line end conversion.
+      </li>
+      <li>
+        Generic autocompletion and calltips in SciTE.
+      </li>
+      <li>
+        Call tip background colour can be set.
+      </li>
+      <li>
+        SCI_MARKERPREV for moving to a previous marker.
+      </li>
+      <li>
+        Caret kept more within window where possible.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE115.zip">Release 1.15</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 15 December 1999.
+      </li>
+      <li>
+        Brace highlighting and badlighting (for mismatched braces).
+      </li>
+      <li>
+        Visible line ends.
+      </li>
+      <li>
+        Multiple line call tips.
+      </li>
+      <li>
+        Printing now works from SciTE on Windows.
+      </li>
+      <li>
+        SciTE has a global "*" lexer style that is used as the basis for all the lexers' styles.
+      </li>
+      <li>
+        Fixes some warnings on GTK+ 1.2.6.
+      </li>
+      <li>
+        Better handling of modal dialogs on GTK+.
+      </li>
+      <li>
+        Resize handle drawn on pane splitter in SciTE on GTK+ so it looks more like a regular GTK+
+        *paned widget.
+      </li>
+      <li>
+        SciTE does not place window origin offscreen if no properties file found on GTK+.
+      </li>
+      <li>
+        File open filter remembered in SciTE on Windows.
+      </li>
+      <li>
+        New mechanism using style numbers 32 to 36 standardizes the setting of styles for brace
+        highlighting, brace badlighting, line numbers, control characters and the default style.
+      </li>
+      <li>
+        Old messages SCI_SETFORE .. SCI_SETFONT have been replaced by the default style 32. The old
+        messages are deprecated and will disappear in a future version.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE114.zip">Release 1.14</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 20 November 1999.
+      </li>
+      <li>
+        Fixes a scrolling bug reported on GTK+.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE113.zip">Release 1.13</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 18 November 1999.
+      </li>
+      <li>
+        Fixes compilation problems with the mingw32 GCC 2.95.2 on Windows.
+      </li>
+      <li>
+        Control characters are now visible.
+      </li>
+      <li>
+        Performance has improved, particularly for scrolling.
+      </li>
+      <li>
+        Windows RichEdit emulation is more accurate. This may break client code that uses these
+        messages: EM_GETLINE, EM_GETLINECOUNT, EM_EXGETSEL, EM_EXSETSEL, EM_EXLINEFROMCHAR,
+        EM_LINELENGTH, EM_LINEINDEX, EM_CHARFROMPOS, EM_POSFROMCHAR, and EM_GETTEXTRANGE.
+      </li>
+      <li>
+        Menus rearranged and accelerator keys set for all static items.
+      </li>
+      <li>
+        Placement of space indicators in view whitespace mode is more accurate with some fonts.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE112.zip">Release 1.12</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 9 November 1999.
+      </li>
+      <li>
+        Packaging error in 1.11 meant that the compilation error was not fixed in that release.
+        Linux/GTK+ should compile with GCC 2.95 this time.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE111.zip">Release 1.11</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 7 November 1999.
+      </li>
+      <li>
+        Fixed a compilation bug in ScintillaGTK.cxx.
+      </li>
+      <li>
+        Added a README file to explain how to build.
+      </li>
+      <li>
+        GTK+/Linux downloads now include documentation.
+      </li>
+      <li>
+        Binary only Sc1.EXE one file download for Windows.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE110.zip">Release 1.1</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 6 November 1999.
+      </li>
+      <li>
+        Major restructuring for better modularity and platform independence.
+      </li>
+      <li>
+        Inter-application drag and drop.
+      </li>
+      <li>
+        Printing support in Scintilla on Windows.
+      </li>
+      <li>
+        Styles can select colouring to end of line. This can be used when a file contains more than
+        one language to differentiate between the areas in each language. An example is the HTML +
+        JavaScript styling in SciTE.
+      </li>
+      <li>
+        Actions can be grouped in the undo stack, so they will be undone together. This grouping is
+        hierarchical so higher level actions such as replace all can be undone in one go. Call to
+        discover whether there are any actions to redo.
+      </li>
+      <li>
+        The set of characters that define words can be changed.
+      </li>
+      <li>
+        Markers now have identifiers and can be found and deleted by their identifier. The empty
+        marker type can be used to make a marker that is invisible and which is only used to trace
+        where a particular line moves to.
+      </li>
+      <li>
+        Double click notification.
+      </li>
+      <li>
+        HTML styling in SciTE also styles embedded JavaScript.
+      </li>
+      <li>
+        Additional tool commands can be added to SciTE.
+      </li>
+      <li>
+        SciTE option to allow reloading if changed upon application activation and saving on
+        application deactivation. Not yet working on GTK+ version.
+      </li>
+      <li>
+        Entry fields in search dialogs remember last 10 user entries. Not working in all cases in
+        Windows version.
+      </li>
+      <li>
+        SciTE can save a styled copy of the current file in HTML format. As SciTE does not yet
+        support printing, this can be used to print a file by then using a browser to print the
+        HTML file.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE102.zip">Release 1.02</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 October 1999.
+      </li>
+      <li>
+        GTK+ version compiles with GCC 2.95.
+      </li>
+      <li>
+        Properly deleting objects when window destroyed under GTK+.
+      </li>
+      <li>
+        If the selection is not empty backspace deletes the selection.
+      </li>
+      <li>
+        Some X style middle mouse button handling for copying the primary selection to and from
+        Scintilla. Does not work in all cases.
+      </li>
+      <li>
+        HTML styling in SciTE.
+      </li>
+      <li>
+        Stopped dirty flag being set in SciTE when results pane modified.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE101.zip">Release 1.01</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 28 September 1999.
+      </li>
+      <li>
+        Better DBCS support on Windows including IME.
+      </li>
+      <li>
+        Wheel mouse support for scrolling and zooming on Windows. Zooming with Ctrl+KeypadPlus and
+        Ctrl+KeypadMinus.
+      </li>
+      <li>
+        Performance improvements especially on GTK+.
+      </li>
+      <li>
+        Caret blinking and settable colour on both GTK+ and Windows.
+      </li>
+      <li>
+        Drag and drop within a Scintilla window. On Windows, files can be dragged into SciTE.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/SciTE100.zip">Release 1.0</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 17 May 1999.
+      </li>
+      <li>
+        Changed name of "Tide" to "SciTE" to avoid clash with a TCL based IDE. "SciTE" is a
+        SCIntilla based Text Editor and is Latin meaning something like "understanding in a neat
+        way" and is also an Old English version of the word "shit".
+      </li>
+      <li>
+        There is a SCI_AUTOCSTOPS message for defining a string of characters that will stop
+        autocompletion mode. Autocompletion mode is cancelled when any cursor movement occurs apart
+        from backspace.
+      </li>
+      <li>
+        GTK+ version now splits horizontally as well as vertically and all dialogs cancel when the
+        escape key is pressed.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.93</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 12 May 1999.
+      </li>
+      <li>
+        A bit more robust than 0.92 and supports SCI_MARKERNEXT message.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide92.zip">Beta release 0.92</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 11 May 1999.
+      </li>
+      <li>
+        GTK+ version now contains all features of Windows version with some very small differences.
+        Executing programs works much better now.
+      </li>
+      <li>
+        New palette code to allow more colours to be displayed in 256 colour screen modes. A line
+        number column can be displayed to the left of the selection margin.
+      </li>
+      <li>
+        The code that maps from line numbers to text positions and back has been completely
+        rewritten to be faster, and to allow markers to move with the text.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide91.zip">Beta release 0.91</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30 April 1999, containing fixes to text measuring to make Scintilla work better
+        with bitmap fonts. Also some small fixes to make compiling work with Visual C++.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide90.zip">Beta release 0.90</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 29 April 1999, containing working GTK+/Linux version.
+      </li>
+      <li>
+        The Java, C++ and Python lexers recognize operators as distinct from default allowing them
+        to be highlighted.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide82.zip">Beta release 0.82</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 1 April 1999, to fix a problem with handling the Enter key in PythonWin. Also
+        fixes some problems with cmd key mapping.
+      </li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/Tide81.zip">Beta release 0.81</a>
+    </h3>
+    <ul>
+      <li>
+        Released on 30th March 1999, containing bug fixes and a few more features.
+      </li>
+      <li>
+        Static linking supported and Tidy.EXE, a statically linked version of Tide.EXE. Changes to
+        compiler flags in the makefiles to optimize for size.
+      </li>
+      <li>
+        Scintilla supports a 'savepoint' in the undo stack which can be set by the container when
+        the document is saved. Notifications are sent to the container when the savepoint is
+        entered or left, allowing the container to to display a dirty indicator and change its
+        menus.
+      </li>
+      <li>
+        When Scintilla is set to read-only mode, a notification is sent to the container should the
+        user try to edit the document. This can be used to check the document out of a version
+        control system.
+      </li>
+      <li>
+        There is an API for setting the appearance of indicators.
+      </li>
+      <li>
+        The keyboard mapping can be redefined or removed so it can be implemented completely by the
+        container. All of the keyboard commands are now commands which can be sent by the
+        container.
+      </li>
+      <li>
+        A home command like Visual C++ with one hit going to the start of the text on the line and
+        the next going to the left margin is available. I do not personally like this but my
+        fingers have become trained to it by much repetition.
+      </li>
+      <li>
+        SCI_MARKERDELETEALL has an argument in wParam which is the number of the type marker to
+        delete with -1 performing the old action of removing all marker types.
+      </li>
+      <li>
+        Tide now understands both the file name and line numbers in error messages in most cases.
+      </li>
+      <li>
+        Tide remembers the current lines of files in the recently used list.
+      </li>
+      <li>
+        Tide has a Find in Files command.
+      </li>
+    </ul>
+    <h3>
+       Beta release 0.80
+    </h3>
+    <ul>
+      <li>
+        This was the first public release on 14th March 1999, containing a mostly working Win32
+        Scintilla DLL and Tide EXE.
+      </li>
+    </ul>
+    <h3>
+       Beta releases of SciTE were called Tide
+    </h3>
+  </body>
+</html>
diff --git a/scite-app/scite/doc/SciTEIco.png b/scite-app/scite/doc/SciTEIco.png
new file mode 100644
index 0000000..d0cc869
Binary files /dev/null and b/scite-app/scite/doc/SciTEIco.png differ
diff --git a/scite-app/scite/doc/SciTEImage.html b/scite-app/scite/doc/SciTEImage.html
new file mode 100644
index 0000000..dfb78ef
--- /dev/null
+++ b/scite-app/scite/doc/SciTEImage.html
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <title>
+      Scintilla and SciTE
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">Scintilla
+          and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <br />
+     <img src="SciTE224.png" />
+  </body>
+</html>
diff --git a/scite-app/scite/doc/SciTEIndicators.png b/scite-app/scite/doc/SciTEIndicators.png
new file mode 100644
index 0000000..b325d40
Binary files /dev/null and b/scite-app/scite/doc/SciTEIndicators.png differ
diff --git a/scite-app/scite/doc/SciTELexer.html b/scite-app/scite/doc/SciTELexer.html
new file mode 100644
index 0000000..df1c158
--- /dev/null
+++ b/scite-app/scite/doc/SciTELexer.html
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org" />
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      Download Scintilla and SciTE
+    </title>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  Add a lexer to Scintilla and SciTE</font></a>
+        </td>
+      </tr>
+    </table>
+    <h1>
+       This document has been superceded.
+    </h1>
+    <p>
+        See <a href="https://www.scintilla.org/Lexilla.html">Lexilla</a> and the <a href="SciTEDoc.html#property-lexillapath">lexilla.path</a> property.
+    </p>
+   <h2>
+       Lexer addition.
+    </h2>
+     <p>The process of adding a new lexer to both Scintilla and SciTE
+is fairly long. Here is my response when asked how to add a lexer for
+Apache CONF files to SciTE. There is more information on writing the
+lexer code (steps 4 and 5, here) in the documentation for Scintilla.</p>
+<p>
+Don't bother about steps which are for configurations you don't
+use all 6 makefiles - I'll patch them up later if you want to
+contribute the lexer.</p>
+    <ol>
+<li>
+In scintilla/include/Scintilla.iface, add a lexer ID value:<br />
+val SCLEX_CONF=17
+</li>
+<li>
+And any lexical class IDs:<br />
+val SCE_CONF_DEFAULT=0<br />
+val SCE_CONF_COMMENT=1
+</li>
+<li>
+In the scintilla/scripts directory run HFacer.py to regenerate the
+SciLexer.h file. Alternatively (if you don't want to run a Python script)
+just add these values to SciLexer.h as #defines and I'll put them in
+Scintilla.iface.
+</li>
+<li>
+In the scintilla/src/LexOthers.cxx write a ColouriseConfDoc function
+similar to one of the other functions such as ColouriseLatexDoc.<br />
+static void ColouriseConfDoc (unsigned int startPos, int length, int
+initStyle, WordList *[], Accessor &amp;styler) {
+</li>
+<li>
+At the end of the file associate the lexer ID and name with the function:<br />
+LexerModule lmConf(SCLEX_CONF, ColouriseConfDoc, "conf");
+</li>
+<li>
+If this is a complex lexer then it may be better off in its own file, in
+which case clone one of the current files.
+In the scite/scripts directory run RegenerateSource.py to add the new
+lexer file to each make file.
+</li>
+<li>
+To the scite/src/others.properties add an entry to associate the file
+extension with the lexer:<br />
+lexer.*.conf=conf<br />
+   If a new lexer file was created instead of adding to LexOthers, then a
+new properties file should be created by cloning scite/src/others.properties
+and modifying that file in the following steps.
+</li>
+<li>
+Set up the styles:<br />
+# Default<br />
+style.conf.0=fore:#FF0000,bold<br />
+# Comment<br />
+style.conf.1=fore:#007F7F,$(font.comment)<br />
+</li>
+<li>
+A filter should be
+added for conf files in scite/src/others.properties:
+filter.conf=Configuration (.conf)|*.conf|
+</li>
+<li>
+In scite/src/SciTEGlobal.properties add $(filter.conf) to the definition
+of open.filter.
+</li>
+<li>
+To add this language to the Language menu of SciTE, add an entry to the menu.language
+property including the name of the language and the file extension used most commonly
+for it.
+</li>
+<li>
+Build both Scintilla and SciTE.
+</li>
+<li>
+Share and enjoy
+</li>
+</ol>
+<p>
+For more extensive information on building lexers, see the
+<a href ="http://www.scintilla.org/ScintillaDoc.html#BuildingScintilla">
+instructions in the Scintilla documentation</a>.
+</p>
+  </body>
+</html>
+
diff --git a/scite-app/scite/doc/SciTELua.html b/scite-app/scite/doc/SciTELua.html
new file mode 100644
index 0000000..25459a4
--- /dev/null
+++ b/scite-app/scite/doc/SciTELua.html
@@ -0,0 +1,379 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE Lua Scripting Extension
+    </title>
+    <style type="text/css">
+        .example {
+            color: #00A000;
+            font-weight: bold;
+        }
+        DIV.example {
+            background: #F7FCF7;
+            border: 1px solid #C0D7C0;
+            margin: 0.3em 3em;
+            padding: 0.3em 0.6em;
+            font-size: 80%;
+        }
+    </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  SciTE Lua Scripting Extension</font></a>
+        </td>
+      </tr>
+    </table>
+<h3>Lua Scripting Extension Notes</h3>
+The SciTE Lua Scripting Extension uses a copy of Lua 5.3 as
+its scripting engine.  Currently, all of the standard libraries are
+included, although this list may be trimmed in a future revision.
+<p>
+Lua is Copyright (C) 1994-2007 Lua.org, PUC-Rio.  The complete Lua license
+is included in <tt>luaCOPYRIGHT</tt> in the SciTE installation directory.  To
+find more information about Lua, including documentation for the
+language itself, visit <a href="http://www.lua.org">www.lua.org</a>.
+</p><p>
+For more ideas about what Lua can do, you may also want to check out
+the community portal, <a href="http://lua-users.org/">lua-users.org</a>,
+<a href="http://lua-users.org/wiki/UsingLuaWithScite">an introduction to using Lua with SciTE,</a>
+and <a href="http://lua-users.org/wiki/SciteScripts">some example scripts</a>.
+</p>
+<h4>SciTE Properties and Lua Event / Command Handlers</h4>
+<p>
+The properties ext.lua.startup.script and extension.<i>filepattern</i>
+can be used to define commands and event handlers that will be called
+by the SciTE.  Other properties beginning with ext.lua may also
+influence how Lua behaves.  See the <a href="SciTEDoc.html">SciTE Documentation</a>
+for more details on this.
+</p><p>
+By defining functions in the startup script or the active extension
+script, you can tailor SciTE to your needs, adding new behavior and
+functionality that is tightly integrated.
+</p><p>
+To begin, you can handle any many of the events exposed by the
+<a href="SciTEExtension.html">SciTE Extension Interface</a>.  You do
+this simply by defining functions with the same name as the event.
+Currently, <tt>OnOpen</tt>, <tt>OnClose</tt>, <tt>OnSwitchFile</tt>, <tt>OnSave</tt>,
+<tt>OnBeforeSave</tt>, <tt>OnChar</tt>, <tt>OnKey</tt>,
+<tt>OnSavePointReached</tt>, <tt>OnSavePointLeft</tt>, <tt>OnDwellStart</tt>,
+<tt>OnDoubleClick</tt>, <tt>OnMarginClick</tt>, <tt>OnUpdateUI</tt>,
+and <tt>OnUserListSelection</tt> are supported.
+</p><p>
+For some of these events, SciTE will pass one or more arguments to
+the event handler function: <tt>OnOpen</tt>, <tt>OnClose</tt>,
+<tt>OnSwitchFile</tt>, <tt>OnSave</tt>, and
+<tt>OnBeforeSave</tt> will receive the filename of the affected buffer as
+their first argument.
+An <tt>OnChar</tt> handler should expect a single-character string argument.
+An <tt>OnKey</tt> handler should expect an integer keycode and boolean
+shift, control, and alt arguments. The keycode is currently a platform specific value
+but this may change in future.
+<tt>OnDwellStart</tt> will receive the position of the mouse and the
+word under the mouse as arguments and the word will be empty when the mouse starts moving.
+<tt>OnUserListSelection</tt> receives two arguments: a number
+indicating the list type, and a string indicating the selected
+item text.  The other event handlers will not be passed any arguments.
+</p><p>
+Event handlers return a boolean value to indicate whether SciTE should
+continue processing the event.  Return a true value to indicate that
+the event has been fully handled, and that no further handlers should
+be called.  Return a false value to give other extensions a chance to
+process the same event.  In many but not all cases, a well behaved
+event handler will return false.  Remember that, in Lua, the only
+non-true values are <tt>false</tt> and <tt>nil</tt>.  Unlike in C++, Python and many
+other languages, 0 evaluates to <tt>true</tt>.
+</p><p>
+There is one additional event handler, <tt>OnClear</tt>, that is not
+expressly defined in the Extension interface, but is exposed to Lua.
+Whenever SciTE re-reads the properties (which occurs every time you
+switch buffers or open a new file, but can also occur at other times),
+the Lua Extension removes any globals that were created since the last
+time properties were read, and restores any globals that were
+overwritten. Then, if the startup script defines a function
+<tt>OnClear</tt>, that function will be called so that scripts have a
+chance to clean up other changes they might have made outside of the
+Lua global scope (e.g. dynamic properties modified through the props
+object; see below) and/or to tailor the Lua environment according to
+local properties for the current buffer.
+</p><p>
+After this, SciTE reads the properties and ultimately loads the
+extension script, if one is defined.  However, at the time when the
+<tt>OnClear</tt> event fires, the extension script is not yet loaded.
+Thus, <tt>OnClear</tt> can only be defined in the startup script,
+not in an extension script.
+</p><p>
+In addition to event handlers, you can also use define new commands
+that are available through the Tools menu or through keyboard shortcuts.
+To specify that a command that will be handled by Lua, specify
+subsystem 3 for the command.  Then, to implement the command using Lua,
+just define a global function.  The command name is the function name.
+</p><p>
+You can also use predefined functions like <tt>dofile</tt> and <tt>dostring</tt> as tool
+commands.
+</p><p>
+Anything specified after the command name is passed to the Lua function
+as a single string argument.  An example of a command, using the
+built-in dofile command, is shown below.
+</p>
+<div class="example">
+  command.name.1.*=Run My Script<br />
+  command.subsystem.1.*=3<br />
+  command.1.*=dofile $(SciteDefaultHome)/My Script.lua<br />
+</div>
+<p>
+Note that the command line is &quot;not&quot; evaluated directly
+as a Lua script.
+</p><p>
+If there is no function matching the command name, no error will be
+displayed.  This is because Lua assumes in this case that the command
+is meant for some other extension, such as the <a href="SciTEDirector.html">SciTE Director
+Extension</a>.  However, if the command function is found, but fails
+to execute, an error is reported.
+</p>
+<h4>Multiple handlers</h4>
+<p>
+<a href="http://lua-users.org/wiki/SciteExtMan">Scite Ext Man</a> can help in
+more complex applications where you have
+multiple scripts needing to handle an event.
+</p>
+<hr noshade="noshade" width="80%" align="left" />
+<h4>Predefined Lua Functions and Objects:</h4>
+<p>
+Within Lua scripts you can use the following functions / objects:
+</p><pre><tt>  trace(s) - writes s to the output pane (no prefix, no newlines)
+  dostring(s) - executes s as a Lua string, like Lua 4&#39;s dostring
+  editor - the editor pane
+  output - the output pane
+  props - a pseudo-table representing the SciTE properties
+  buffer - a table associated with the current buffer or document
+  scite - a namespace for functions which control SciTE.
+</tt></pre><p>
+In addition, all constants defined in Scintilla.iface are exposed as
+Lua globals variables. Function names are exposed as their block
+capital equivalents, with the SCI_ prefix.
+</p><p>
+All functions and objects defined in the Lua standard library are also
+available.  Although dostring was deprecated in Lua 5, it is restored
+since some have said it would be useful in tool commands.
+</p><p>
+A function <tt>_ALERT()</tt> is also defined to be an alias for the built-in
+<tt>print()</tt>, which prints the alert message (plus a newline) to the window.
+This provides a reasonable way for Lua to present error messages to
+the user.  You are free to override <tt>_ALERT</tt> with a different definition
+if you prefer.
+</p><p>
+The props pseudo-table allows you to read or write properties by name
+using normal Lua table-access semantics, e.g. <tt>props["property.name"]</tt>.
+As with Lua tables, you can also un-set a property by assigning nil to its key.
+</p><p>
+When you assign a value to a property from Lua, this overrides any values
+specified in the configuration files for that setting.  The underlying file
+properties are not changed.  If you later assign nil to the same property
+from Lua, this removes the run-time setting, allowing any file-based
+property setting to show through once again.
+</p><p>
+The editor and output panes support the following properties and
+methods:
+</p><pre><tt>  textrange(startPos, endPos) - gets the text in the specified range
+
+  findtext(text, [flags], [startPos, [endPos]])
+    - returns the start and end of the first match, or nil if no match
+    - flags can be 0 (the default), or a combination of <a href="https://www.scintilla.org/ScintillaDoc.html#searchFlags">SCFIND constants</a>
+      such as SCFIND_WHOLEWORD, SCFIND_MATCHCASE, and SCFIND_REGEXP
+
+  match(text, [flags], [startPos])
+    - returns a generator that allows you to loop over the matches
+      i.e. for m in editor:match(text, flags) do ... end
+    - the match object (i.e. the loop counter m in the above
+      example) supports read-only properties pos, len, and text;
+      and also supports a function replace(replaceText) to
+      support search and replace.
+    - while looping through matches, if the document is modified
+      by any method other than the loop counter's replace method,
+      this may cause the match generator to lose its place.
+    - also, do not attempt to store the match object for later
+      access outside the loop; it will not be useable.
+
+  append(text) - appends text to the end of the document
+  insert(pos, text) - inserts text at the specified position
+  remove(startPos, endPos) - removes the text in the range
+</tt></pre><p>
+Most of the functions defined in Scintilla.iface are also be exposed
+as pane methods. Those functions having simple parameters (string,
+boolean, and numeric types) are fully supported. For example,
+<tt>editor:InsertText(pos, text)</tt> does practically the same thing as
+<tt>editor:insert(pos, text)</tt>. Functions having a stringresult parameter
+will include a string in the return value.  For both strings and
+stringresults, if the function is documented as expecting a length
+as its first parameter, you do not pass the length from Lua. Instead,
+it is inferred from the context.
+</p><p>
+The keymod parameter type has partial support. When an iface function
+is declared as taking a keymod, the Lua equivalent expects two
+numbers: first the key code (e.g. <tt>SCK_LEFT</tt> or <tt>string.byte("'")</tt>, and
+second the modifiers (e.g. <tt>SCMOD_CTRL</tt>).
+</p><p>
+Functions that have more complex parameters are not supported.
+</p><p>
+Functions that are declared to return a numeric type have the result
+added to their return value.  If the function also has a stringresult,
+that comes first, followed by the numeric return value.
+</p><p>
+Some functions are declared as 'get' or 'set' rather than 'fun' in
+the iface file.  These are generally exposed to Lua as properties,
+e.g. <tt>editor.TabSize = 8</tt>.  Some of the getters and setters also have
+a parameter.  Where possible, these are exposed to Lua as indexed
+properties, e.g. <tt>editor.StyleBold[SCE_PROPS_DEFAULT] = true</tt>.
+However, if an iface function is declared as get / set but cannot be
+mapped to a Lua property, it is exposed as a Lua function instead.
+</p><p>
+The possible Scintilla calls are listed as the
+<a href="https://www.scintilla.org/PaneAPI.html">Pane API</a> and in
+<a href="https://github.com/downpoured/scite-files/blob/master/files/api_files_howto_create_api.md">API file format.</a>
+The Scintilla API is described in
+<a href="https://www.scintilla.org/ScintillaDoc.html">ScintillaDoc</a>.
+</p>
+<p>
+The <tt>scite</tt> namespace includes the following functions:
+</p><pre><tt>  scite.Open(filename)
+    - opens a file in a new buffer
+    - activates the file's buffer if it is already opened.
+
+  scite.SendEditor(SCI_constant, ...)
+    - sends a message to the editor pane
+    - equivalent to the corresponding iface function or property
+
+  scite.SendOutput(SCI_constant, ...)
+    - sends a message to the output pane
+
+  scite.ConstantName(number[, prefix])
+    - returns the symbolic name of a Scintilla / SciTE constant
+    - optional prefix to find a specific constant name
+
+  scite.MenuCommand(IDM_constant)
+    - equivalent to the corresponding IDM_ command defined in SciTE.h
+</tt></pre><p>
+<tt>Open</tt> requires special care.  When the buffer changes in SciTE, the
+Lua global namespace is reset to its initial state, and any extension
+script associated with the new buffer is loaded.  Thus, when you call
+Open, this may change the environment in which your current script is
+running.  When possible, you can avoid confusion by simply returning
+after scite.Open, but when that is not possible, just bear in mind
+that there are side effects.  Local variables, unlike globals, will
+be retained after the buffer change until your script returns.
+</p><p>
+The <tt>SendEditor</tt> and <tt>SendOuput</tt> functions duplicate the
+functionality of the editor and output objects, providing access to these
+through an interface that is more familiar to Scintilla C++ developers.
+This may be useful for prototyping C++ code using Lua.  Internally,
+<tt>SendEditor</tt> and <tt>SendOutput</tt> are translated to the
+corresponding iface function or property, so their arguments and
+return types are identical.  (Although the calling convention for
+properties is obviously different.)
+</p><p>
+The <tt>ConstantName</tt> function may be useful when generating debug messages,
+or if extending the SciTE LuaExtension to support macro recording.
+</p><p>
+The <tt>MenuCommand</tt> function enables usage of SciTE's menu commands
+as defined in SciTE.h.
+</p>
+
+<h4>Scripting user interfaces with strips</h4>
+<p>Simple user interfaces may be defined from Lua as strips similar to
+the find and replace strips. An example looks like<br />
+<img src="https://scintilla.org/UserStrip.png" /></p>
+
+<p>Strips are shown with StripShow which takes a string describing
+the user interface then builds and displays it as a strip at the
+bottom of the application window. There are 5 supported elements:
+labels, editable text, combo boxes, buttons and default buttons. These are
+surrounded by different indicator strings: ' for labels; []
+for editable text; {} for combo boxes; () for buttons; and (()) for default buttons.
+There can also be a newline to start a new line and a ! to show a close box on
+Windows only.</p>
+<p>A default button looks like ((OK)) and can be triggered by pressing the Enter key.
+Buttons may include accelerator keys prefixed with &amp;.
+On Windows and GTK but not OS X, labels may also define accelerator keys
+which cause focus to move to the next element which accepts focus.
+Literal ampersands are defined with &amp;&amp;.
+
+  For example, the code<pre><tt>       scite.StripShow("!'Explanation:'{}(&amp;Search)\n'Name:'[Name](OK)(Cancel)")
+</tt></pre>
+  shows the strip displayed in the picture. The strip can be closed
+by passing an empty string.</p>
+
+<p>On GTK a table is used for layout and the approach was copied to the other
+platforms. It is not yet as capable on the other platforms yet as on
+GTK - columns containing editable text and combo boxes can expand and
+other columns are fixed to the their natural width of their widest
+element.</p>
+
+<p>Events from the user are communicated back to the script through
+the OnStrip function which takes an element number (starting at 0 and
+including static text elements) and a change type (clicked=1,
+change=2, focusIn=3, focusOut=4). 'clicked' is for button presses,
+'change' for changes to editable text or the editable text part of a
+combo boxes and 'focusIn' and 'focusOut' are when the user moves focus
+between elements. The value of editable text or combo boxes can be
+retrieved with StripValue(element).</p>
+
+<p>There are some bugs and limitations with these events currently.
+Focus events may not occur or may occur only when text is edited.
+Selecting an item from the list in a combo box may not send a 'change'
+event.</p>
+
+<p>The editable part of combo boxes and editable text can be set with
+StripSet(element, value) and the list part of combo boxes can be set
+with StripSetList(element, value) where the items in 'value' are
+separated with new lines.</p>
+
+<h4>Lua 5.1</h4>
+<pre>
+Despite some of the big changes in Lua 5.1 dealing with changes
+in the language, most of the compatibility options have been
+turned on.
+Compatibilities:
+- table.getn still works, but the '#' operator should be used
+- Lua 5.0's varargs are still available
+- Lua 5.0's math.mod is still available, as well as 5.1's
+math.fmod
+- Lua 5.0's string.gfind is still available, as well as 5.1's
+string.gmatch
+- [C API] Lua 5.0's luaL_openlib behavior is still available
+Changes:
+- table.setn was deprecated
+- loadlib was moved into the package table (package.loadlib)
+- Lua 5.0's long string nesting throws an error
+</pre>
+
+<hr noshade="noshade" width="80%" align="left" />
+
+<h4>Disabling Lua</h4>
+<p>
+Lua is currently loaded just-in-time, before it is first used.  The
+ways that Lua can become are through the ext.lua.startup.script
+property, by naming a lua file named in the extension.<i>filepattern</i>
+property, or by using the extension mechanism to define tool commands
+(i.e. subsystem 3).  If you do not do any of these things, the Lua
+scripting engine is not loaded, and for all practical purposes, SciTE
+should behave as it did before Lua was added.
+</p><p>
+Nevertheless, it is still possible to build SciTE without the Lua
+support. To do this, simply define the variable <tt>NO_LUA</tt> when you build
+it, e.g. for MSVC, <tt>nmake -f scite.mak -DNO_LUA</tt>; or with GNU tools,
+<tt>make NO_LUA=1</tt>.
+</p>
+</body>
+</html>
diff --git a/scite-app/scite/doc/SciTERegEx.html b/scite-app/scite/doc/SciTERegEx.html
new file mode 100644
index 0000000..c1d403f
--- /dev/null
+++ b/scite-app/scite/doc/SciTERegEx.html
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="generator" content="SciTE" />
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+      SciTE Regular Expressions
+    </title>
+<style type="text/css">
+        h3 {
+            background-color: #FEC;
+        }
+        .ref {
+            color: #80C;
+        }
+        code {
+            font-weight: bold;
+        }
+        dt {
+            margin-top: 15px;
+        }
+ </style>
+  </head>
+  <body bgcolor="#FFFFFF" text="#000000">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+          Regular Expressions</font></a>
+        </td>
+      </tr>
+    </table>
+    <h2>
+       Regular Expressions in SciTE
+    </h2>
+    <h3>Purpose</h3>
+    <p>
+      Regular expressions can be used for searching for patterns
+      rather than literals. For example, it is possible to
+      search for variables in SciTE property files,
+      which look like $(name.subname) with the regular expression:<br />
+      <code>\$([a-z.]+)</code> (or <code>\$\([a-z.]+\)</code> in posix mode).
+    </p>
+    <p>
+      Replacement with regular expressions allows complex
+      transformations with the use of tagged expressions.
+      For example, pairs of numbers separated by a ',' could
+      be reordered by replacing the regular expression:<br />
+      <code>\([0-9]+\),\([0-9]+\)</code> (or <code>([0-9]+),([0-9]+)</code>
+      in posix mode, or even <code>(\d+),(\d+)</code>)<br />
+      with:<br />
+      <code>\2,\1</code>
+    </p>
+    <h3>Syntax</h3>
+    <p>
+      Regular expression syntax depends on a parameter:  find.replace.regexp.posix<br />
+      If set to 0, syntax uses the old Unix style where <code>\(</code> and <code>\)</code>
+      mark capturing sections while <code>(</code> and <code>)</code> are themselves.<br />
+      If set to 1, syntax uses the more common style where <code>(</code> and <code>)</code>
+      mark capturing sections while <code>\(</code> and <code>\)</code> are plain parentheses.
+    </p>
+    <dl><dt><span class="ref">[1]</span> char</dt>
+    <dd>matches itself, unless it is a special character
+    (metachar): <code>. \ [ ] * + ? ^ $</code> and <code>( )</code> in posix mode.
+    </dd><dt><span class="ref">[2]</span> <code>.</code></dt>
+    <dd>matches any character.
+    </dd><dt><span class="ref">[3]</span> <code>\</code></dt>
+    <dd>matches the character following it, except:
+    <ul><li><code>\a</code>, <code>\b</code>, <code>\f</code>,
+    <code>\n</code>, <code>\r</code>, <code>\t</code>, <code>\v</code>
+    match the corresponding C escape char,
+    respectively BEL, BS, FF, LF, CR, TAB and VT;<br />
+    Note that <code>\r</code> and <code>\n</code> are never matched because in Scintilla,
+    regular expression searches are made line per line (stripped of end-of-line chars).
+    </li><li>if not in posix mode, when followed by a left or right round bracket (see <span class="ref">[8]</span>);
+    </li><li>when followed by a digit 1 to 9 (see <span class="ref">[9]</span>);
+    </li><li>when followed by a left or right angle bracket (see <span class="ref">[10]</span>);
+    </li><li>when followed by d, D, s, S, w or W (see <span class="ref">[11]</span>);
+    </li><li>when followed by x and two hexa digits (see <span class="ref">[12]</span>);
+    </li></ul>
+    Backslash is used as an escape character for all other meta-characters, and itself.
+    </dd><dt><span class="ref">[4]</span> <code>[</code>set<code>]</code></dt>
+    <dd>matches one of the characters in the set.
+    If the first character in the set is <code>^</code>, it matches the characters NOT in the set,
+    i.e. complements the set. A shorthand <code>S-E</code> (start dash end) is
+    used to specify a set of characters S up to E, inclusive. The special characters <code>]</code> and
+    <code>-</code> have no special meaning if they appear as the first chars in the set. To include both,
+    put - first: <code>[-]A-Z]</code> (or just backslash them).
+    <table><tr><td>example</td><td>match</td></tr>
+      <tr><td><code>[-]|]</code></td><td>matches these 3 chars,</td></tr>
+      <tr><td><code>[]-|]</code></td><td>matches from ] to | chars</td></tr>
+      <tr><td><code>[a-z]</code></td><td>any lowercase alpha</td></tr>
+      <tr><td><code>[^-]]</code></td><td>any char except - and ]</td></tr>
+      <tr><td><code>[^A-Z]</code></td><td>any char except uppercase alpha</td></tr>
+      <tr><td><code>[a-zA-Z]</code></td><td>any alpha</td></tr>
+    </table>
+    </dd><dt><span class="ref">[5]</span> <code>*</code></dt>
+    <dd>any regular expression form <span class="ref">[1]</span> to <span class="ref">[4]</span>
+    (except <span class="ref">[8]</span>, <span class="ref">[9]</span> and <span class="ref">[10]</span>
+    forms of <span class="ref">[3]</span>),
+    followed by closure char (<code>*</code>) matches zero or more matches of that form.
+    </dd><dt><span class="ref">[6]</span> <code>+</code></dt>
+    <dd>same as <span class="ref">[5]</span>, except it matches one or more.
+    </dd><dt><span class="ref">[5-6]</span></dt>
+    <dd>Both <span class="ref">[5]</span> and <span class="ref">[6]</span> are greedy (they match as much as possible)
+    unless they are followed by the 'lazy' quantifier (<code>?</code>)
+    in which case both <span class="ref">[5]</span> and <span class="ref">[6]</span> try to match as little as possible.
+    </dd><dt><span class="ref">[7]</span> <code>?</code></dt>
+    <dd>same as <span class="ref">[5]</span>, except it matches zero or one.
+    </dd><dt><span class="ref">[8]</span></dt>
+    <dd>a regular expression in the form <span class="ref">[1]</span> to <span class="ref">[13]</span>, enclosed
+    as <code>\(<i>form</i>\)</code> (or <code>(<i>form</i>)</code> with posix flag) matches
+    what <i>form</i> matches.
+    The enclosure creates a set of tags, used for <span class="ref">[9]</span> and for
+    pattern substitution. The tagged forms are numbered starting from 1.
+    </dd><dt><span class="ref">[9]</span></dt>
+    <dd>a <code>\</code> followed by a digit 1 to 9 matches whatever a
+    previously tagged regular expression (<span class="ref">[8]</span>) matched.
+    </dd><dt><span class="ref">[10]</span> <code>\&lt; \&gt;</code></dt>
+    <dd>a regular expression starting with a <code>\&lt;</code> construct
+    and/or ending with a <code>\&gt;</code> construct, restricts the
+    pattern matching to the beginning of a word, and/or
+    the end of a word. A word is defined to be a character
+    string beginning and/or ending with the characters
+    A-Z a-z 0-9 and _. Scintilla extends this definition
+    by user setting. The word must also be preceded and/or
+    followed by any character outside those mentioned.
+    </dd><dt><span class="ref">[11]</span> <code>\l</code></dt>
+    <dd>a backslash followed by d, D, s, S, w or W,
+    becomes a character class (both inside and outside sets []).
+    <ul><li>d: decimal digits
+    </li><li>D: any char except decimal digits
+    </li><li>s: whitespace (space, \t \n \r \f \v)
+    </li><li>S: any char except whitespace (see above)
+    </li><li>w: alphanumeric &amp; underscore (changed by user setting)
+    </li><li>W: any char except alphanumeric &amp; underscore (see above)
+    </li></ul>
+    </dd><dt><span class="ref">[12]</span> <code>\xHH</code></dt>
+    <dd>a backslash followed by x and two hexa digits,
+    becomes the character whose Ascii code is equal
+    to these digits. If not followed by two digits,
+    it is 'x' char itself.
+    </dd><dt><span class="ref">[13]</span></dt>
+    <dd>a composite regular expression xy where x and y
+    are in the form <span class="ref">[1]</span> to <span class="ref">[12]</span> matches the longest
+    match of x followed by a match for y.
+    </dd><dt><span class="ref">[14]</span> <code>^ $</code></dt>
+    <dd>a regular expression starting with a ^ character
+    and/or ending with a $ character, restricts the
+    pattern matching to the beginning of the line,
+    or the end of line. [anchors] Elsewhere in the
+    pattern, ^ and $ are treated as ordinary characters.
+    </dd></dl>
+    <h3>Acknowledgments</h3>
+    <p>
+    Most of this documentation was originally written by Ozan S. Yigit.<br />
+    Additions by Neil Hodgson and Philippe Lhoste.<br />
+    All of this document is in the public domain.
+    </p>
+  </body>
+</html>
+
+
diff --git a/scite-app/scite/doc/SciTEWord.jpg b/scite-app/scite/doc/SciTEWord.jpg
new file mode 100644
index 0000000..9e33a95
Binary files /dev/null and b/scite-app/scite/doc/SciTEWord.jpg differ
diff --git a/scite-app/scite/doc/ScriptLexer.html b/scite-app/scite/doc/ScriptLexer.html
new file mode 100644
index 0000000..f35ef3f
--- /dev/null
+++ b/scite-app/scite/doc/ScriptLexer.html
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>SciTE Script Lexer</title>
+<meta name="Generator" content="SciTE - www.Scintilla.org" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<style type="text/css">
+.S0 {
+	color: #FF0000;
+}
+.S2 {
+	font-family: 'Comic Sans MS';
+	color: #007F00;
+	font-size: 9pt;
+}
+.S4 {
+	color: #007F7F;
+}
+.S5 {
+	color: #00007F;
+	font-weight: bold;
+}
+.S6 {
+	color: #7F007F;
+}
+.S10 {
+	color: #000000;
+}
+.S14 {
+	color: #00007F;
+	background: #F5F5FF;
+	text-decoration: inherit;
+}
+.Z0 {
+	color: #7f007f;
+	font-weight: bold;
+}
+.Z1 {
+	color: #000000;
+}
+.Z2 {
+	color: #000080;
+	font-weight: bold;
+}
+.Z3 {
+	color: #008000;
+	font-family: 'Georgia';
+	font-size: 9pt;
+	font-style:italic;
+}
+span {
+	font-family: 'Verdana';
+	color: #000000;
+	font-size: 10pt;
+}
+.example {
+    color: #008000;
+    font-weight: bold;
+}
+DIV.example {
+	background: #F7FCF7;
+	border: 1px solid #C0D7C0;
+	margin: 0.3em 3em;
+	padding: 0.3em 0.6em;
+	font-size: 80%;
+}
+DIV.highlighted {
+	background: #F7FCF7;
+	border: 1px solid #C0D7C0;
+	margin: 0.3em 3em;
+	padding: 0.3em 0.6em;
+	font-size: 80%;
+}
+table {
+	border: 1px solid #1F1F1F;
+	border-collapse: collapse;
+}
+td {
+	border: 1px solid #1F1F1F;
+	padding: 1px 5px 1px 5px;
+}
+th {
+	border: 1px solid #1F1F1F;
+	padding: 1px 5px 1px 5px;
+}
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+    <table bgcolor="#000000" width="100%" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td>
+          <img src="SciTEIco.png" border="3" height="64" width="64" alt="Scintilla icon" />
+        </td>
+        <td>
+          <a href="index.html" style="color:white;text-decoration:none"><font size="5">
+	  SciTE Script Lexer</font></a>
+        </td>
+      </tr>
+    </table>
+    <h3>
+       Writing lexers in Lua
+    </h3>
+	<p>A lexer may be written as a script in the Lua language instead of in C++.
+	This is a little simpler and allows lexers to be developed without using a C++ compiler.</p>
+	<p>A script lexer is attached by setting the file lexer to be a name that starts with "script_".
+	Styles and other properties can then be assigned using this name. For example,</p>
+	<div class="example">
+	lexer.*.zog=script_zog<br/>
+style.script_zog.0=fore:#7f007f,bold<br/>
+style.script_zog.1=fore:#000000<br/>
+style.script_zog.2=fore:#000080,bold<br/>
+style.script_zog.3=fore:#008000,font:Georgia,italics,size:9
+	</div>
+	<p>Then the lexer is implemented in Lua similar to this:</p>
+<div class="highlighted">
+<span><span class="S2">-- -*- coding: utf-8 -*-</span><br />
+<br />
+<span class="S5">function</span><span class="S0"> </span>OnStyle<span class="S10">(</span>styler<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>S_DEFAULT<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>S_IDENTIFIER<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">1</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>S_KEYWORD<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">2</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>S_UNICODECOMMENT<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">3</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>identifierCharacters<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S6">"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"</span><br />
+<br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>StartStyling<span class="S10">(</span>styler.startPos<span class="S10">,</span><span class="S0"> </span>styler.lengthDoc<span class="S10">,</span><span class="S0"> </span>styler.initStyle<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">while</span><span class="S0"> </span>styler<span class="S10">:</span>More<span class="S10">()</span><span class="S0"> </span><span class="S5">do</span><br />
+<br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S2">-- Exit state if needed</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>styler<span class="S10">:</span>State<span class="S10">()</span><span class="S0"> </span><span class="S10">==</span><span class="S0"> </span>S_IDENTIFIER<span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span><span class="S5">not</span><span class="S0"> </span>identifierCharacters<span class="S10">:</span>find<span class="S10">(</span>styler<span class="S10">:</span>Current<span class="S10">(),</span><span class="S0"> </span><span class="S4">1</span><span class="S10">,</span><span class="S0"> </span><span class="S5">true</span><span class="S10">)</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span><span class="S0"> </span>identifier<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>styler<span class="S10">:</span>Token<span class="S10">()</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>identifier<span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">"if"</span><span class="S0"> </span><span class="S5">or</span><span class="S0"> </span>identifier<span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">"end"</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>ChangeState<span class="S10">(</span>S_KEYWORD<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>SetState<span class="S10">(</span>S_DEFAULT<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">elseif</span><span class="S0"> </span>styler<span class="S10">:</span>State<span class="S10">()</span><span class="S0"> </span><span class="S10">==</span><span class="S0"> </span>S_UNICODECOMMENT<span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>styler<span class="S10">:</span>Match<span class="S10">(</span><span class="S6">"»"</span><span class="S10">)</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>ForwardSetState<span class="S10">(</span>S_DEFAULT<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S2">-- Enter state if needed</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>styler<span class="S10">:</span>State<span class="S10">()</span><span class="S0"> </span><span class="S10">==</span><span class="S0"> </span>S_DEFAULT<span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>styler<span class="S10">:</span>Match<span class="S10">(</span><span class="S6">"«"</span><span class="S10">)</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>SetState<span class="S10">(</span>S_UNICODECOMMENT<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">elseif</span><span class="S0"> </span>identifierCharacters<span class="S10">:</span>find<span class="S10">(</span>styler<span class="S10">:</span>Current<span class="S10">(),</span><span class="S0"> </span><span class="S4">1</span><span class="S10">,</span><span class="S0"> </span><span class="S5">true</span><span class="S10">)</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>SetState<span class="S10">(</span>S_IDENTIFIER<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>Forward<span class="S10">()</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span>styler<span class="S10">:</span>EndStyling<span class="S10">()</span><br />
+<span class="S5">end</span><br />
+<span class="S0"></span></span>
+</div>
+
+<p>
+The result looks like
+</p>
+
+<div class="highlighted">
+<span><span class="Z1">proc</span><span class="Z0"> </span><span class="Z1">clip</span><span class="Z0">(</span><span class="Z1">int</span><span class="Z0"> </span><span class="Z1">a</span><span class="Z0">)</span><br />
+<span class="Z3">« Clip into the positive zone »</span><br />
+<span class="Z2">if</span><span class="Z0"> (</span><span class="Z1">a</span><span class="Z0"> &gt; 0) </span><span class="Z1">a</span><br />
+<span class="Z0">0</span><br />
+<span class="Z2">end</span></span>
+</div>
+<br />
+<h3>Code Structure</h3>
+<h4>Document Loop</h4>
+<p>The lexer loops through the part of the document indicated assigning a style to each character.</p>
+<div class="highlighted">
+<span>styler:StartStyling<span class="S10">(</span>styler.startPos<span class="S10">,</span><span class="S0"> </span>styler.lengthDoc<span class="S10">,</span><span class="S0"> </span>styler.initStyle<span class="S10"><span class="S10">)</span><br />
+<span class="S5">while</span><span class="S0"> </span>styler:More<span class="S10">()</span><span class="S0"> </span><span class="S5">do</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S2">-- Code that examines the text and sets lexical states</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span>styler:Forward<span class="S10">()</span><br />
+<span class="S5">end</span><br />
+styler:EndStyling<span class="S10">()</span><br />
+</span>
+</span></div>
+<p>There are many different ways to structure the code that examines the text and sets lexical states.
+A structure that has proven useful in C++ lexers is to write two blocks of code as shown in the example.
+The first block checks if the current state should end and if so sets the state to the default 0.
+The second block is responsible for detecting whether a new state should be entered from the default state.
+This structure means everything is dealt with as switching from or to the default state and avoids having to consider many
+combinations of states.</p>
+<h4>Encodings</h4>
+<p>The styler iterates over whole characters rather than bytes. Thus if the document is encoded in UTF-8, styler:Current() may be a multibyte string. If the script is also encoded in UTF-8,
+then it is easy to check against Unicode characters with code like</p>
+<div class="highlighted">
+<span><span class="S5">if</span><span class="S0"> </span>styler:Current<span class="S10">()</span><span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">"«"</span><span class="S5"> then</span><br />
+</span></div>
+<p>If using an encoding like Latin-1 and the script is also encoded in the same encoding then literals can be used as above.</p>
+<p>If the language can be encoded in different ways then more complex code may be needed along with encoding-specific code.</p>
+<h4>Checking Before</h4>
+<p>Sometimes a lexer needs to see some information earlier in the file, perhaps a declaration changes the syntax or the particular form of quote
+at the start of a string must be matched at its end. Since the standard loop only goes forward from the starting position, different calls must be used like CharAt and StyleAt.
+These use byte positions and do not treat multi-byte characters as single entities.</p>
+<h4>Performance</h4>
+<p>The lexer above can lex approximately 90K per second on a 2.4 GHz Athlon 64. For most situations, this will
+feel completely fluid.</p>
+<p>More complex lexers will be slower. If a lexer is so slow that the application becomes unresponsive then
+the lexer can choose to split up each request. It can do so by deciding upon a range of whole lines and using this range as the
+arguments to StartStyling. This allows the user's keystrokes and mouse moves to be processed.
+The lexer will automatically be called again to lex more of the document.</p>
+<br />
+<h3>API</h3>
+<p>The API of the styler object passed to OnStyle:</p>
+<table cellpadding="0" cellspacing="0" border="1"  summary="Command line escape sequences">
+<thead>
+	<tr><th>Name</th><th>Explanation</th></tr>
+</thead>
+	<tr><td>StartStyling(startPos, length, initStyle)</td>
+	<td>Start setting styles from startPos for length with initial style initStyle</td></tr>
+	<tr><td>EndStyling()</td>
+	<td>Styling has been completed so tidy up</td></tr>
+	<tr><td>More() → boolean</td>
+	<td>Are there any more characters to process</td></tr>
+	<tr><td>Forward()</td>
+	<td>Move forward one character</td></tr>
+	<tr><td>Position() → integer</td>
+	<td>What is the position in the document of the current character</td></tr>
+	<tr><td>AtLineStart() → boolean</td>
+	<td>Is the current character the first on a line</td></tr>
+	<tr><td>AtLineEnd() → boolean</td>
+	<td>Is the current character the last on a line</td></tr>
+	<tr><td>State() → integer</td>
+	<td>The current lexical state value</td></tr>
+	<tr><td>SetState(state)</td>
+	<td>Set the style of the current token to the current state and then change the state to the argument</td></tr>
+	<tr><td>ForwardSetState(state)</td>
+	<td>Combination of moving forward and setting the state. Useful when the current character is a token terminator like " for a string.</td></tr>
+	<tr><td>ChangeState(state)</td>
+	<td>Change the current state so that the state of the current token will be set to the argument</td></tr>
+	<tr><td>Current() → string</td>
+	<td>The current character</td></tr>
+	<tr><td>Next() → string</td>
+	<td>The next character</td></tr>
+	<tr><td>Previous() → string</td>
+	<td>The previous character</td></tr>
+	<tr><td>Token() → string</td>
+	<td>The current token</td></tr>
+	<tr><td>Match(string) → boolean</td>
+	<td>Is the text from the current position the same as the argument?</td></tr>
+
+	<tr><td>Line(position) → integer</td>
+	<td>Convert a byte position into a line number</td></tr>
+	<tr><td>CharAt(position) → integer</td>
+	<td>Unsigned byte value at argument</td></tr>
+	<tr><td>StyleAt(position) → integer</td>
+	<td>Style value at argument</td></tr>
+	<tr><td>LevelAt(line) → integer</td>
+	<td>Fold level for a line</td></tr>
+	<tr><td>SetLevelAt(line, level)</td>
+	<td>Set the fold level for a line</td></tr>
+	<tr><td>LineState(line) → integer</td>
+	<td>State value for a line</td></tr>
+	<tr><td>SetLineState(line, state)</td>
+	<td>Set state value for a line. This can be used to store extra information from lexing,
+	such as a current language mode, so that there is no need to look back in the document.</td></tr>
+
+	<tr><td>startPos : integer</td>
+	<td>Start of the range to be lexed</td></tr>
+	<tr><td>lengthDoc : integer</td>
+	<td>Length of the range to be lexed</td></tr>
+	<tr><td>initStyle : integer</td>
+	<td>Starting style</td></tr>
+	<tr><td>language : string</td>
+	<td>Name of the language. Allows implementation of multiple languages with one OnStyle function.</td></tr>
+</table>
+<br />
+    <h3>
+       A line-oriented example.
+    </h3>
+    <p>This example is for a line-oriented language as is sometimes used for configuration files.
+    It uses low level direct calls instead of the StartStyling/More/Forward/EndStyling calls.</p>
+<div class="highlighted">
+<span><span class="S2">-- A line oriented lexer - style the line according to the first character</span><br />
+<span class="S5">function</span><span class="S0"> </span>OnStyle<span class="S10">(</span>styler<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> lineStart<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>editor<span class="S10">:</span>LineFromPosition<span class="S10">(</span>styler.startPos<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> lineEnd<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>editor<span class="S10">:</span>LineFromPosition<span class="S10">(</span>styler.startPos<span class="S0"> </span><span class="S10">+</span><span class="S0"> </span>styler.lengthDoc<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span>editor<span class="S10">:</span>StartStyling<span class="S10">(</span>styler.startPos<span class="S10">,</span><span class="S0"> </span><span class="S4">31</span><span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">for</span><span class="S0"> </span>line<span class="S10">=</span>lineStart<span class="S10">,</span>lineEnd<span class="S10">,</span><span class="S4">1</span><span class="S0"> </span><span class="S5">do</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> lengthLine<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>editor<span class="S10">:</span>PositionFromLine<span class="S10">(</span>line<span class="S10">+</span><span class="S4">1</span><span class="S10">)</span><span class="S0"> </span><span class="S10">-</span><span class="S0"> </span>editor<span class="S10">:</span>PositionFromLine<span class="S10">(</span>line<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> lineText<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span>editor<span class="S10">:</span>GetLine<span class="S10">(</span>line<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> first<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S14">string.sub</span><span class="S10">(</span>lineText<span class="S10">,</span><span class="S4">1</span><span class="S10">,</span><span class="S4">1</span><span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">local</span> style<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">if</span><span class="S0"> </span>first<span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">"+"</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>style<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">1</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">elseif</span><span class="S0"> </span>first<span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">" "</span><span class="S0"> </span><span class="S5">or</span><span class="S0"> </span>first<span class="S0"> </span><span class="S10">==</span><span class="S0"> </span><span class="S6">"\t"</span><span class="S0"> </span><span class="S5">then</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>style<span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">2</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; </span>editor<span class="S10">:</span>SetStyling<span class="S10">(</span>lengthLine<span class="S10">,</span><span class="S0"> </span>style<span class="S10">)</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">end</span><br />
+<span class="S5">end</span><br />
+<span class="S0"></span></span>
+</div>
+
+</body>
+</html>
diff --git a/scite-app/scite/doc/UserStrip.png b/scite-app/scite/doc/UserStrip.png
new file mode 100644
index 0000000..f3d6a46
Binary files /dev/null and b/scite-app/scite/doc/UserStrip.png differ
diff --git a/scite-app/scite/doc/demo.png b/scite-app/scite/doc/demo.png
new file mode 100644
index 0000000..d0047dc
Binary files /dev/null and b/scite-app/scite/doc/demo.png differ
diff --git a/scite-app/scite/doc/scite.1 b/scite-app/scite/doc/scite.1
new file mode 100644
index 0000000..b73a359
--- /dev/null
+++ b/scite-app/scite/doc/scite.1
@@ -0,0 +1,25 @@
+.TH SCITE 1 "2001 February 26"
+.SH NAME
+SciTE \- a programmers text editor
+.SH SYNOPSIS
+.br
+.B SciTE
+[file ..]
+.SH DESCRIPTION
+.B SciTE
+is a graphical GTK+ based editor. It has support
+for indenting, highlighting, and shortcuts in a myriad
+of languages and can be extended by editing object-oriented
+configuration files.
+.PP
+Support is included for Java, C, C++, C#, Shell, Apache.
+.SH ON-LINE HELP
+Type Alt-H or Click the Help Pulldown menu.
+.SH AUTHOR
+Most of
+.B SciTE
+was made by Neil Hodgson, with a lot of help from others.
+See Help
+.br
+.SH BUGS
+Probably.
diff --git a/scite-app/scite/gtk/AppDepGen.py b/scite-app/scite/gtk/AppDepGen.py
new file mode 100644
index 0000000..76107a6
--- /dev/null
+++ b/scite-app/scite/gtk/AppDepGen.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+# AppDepGen.py - produce a make dependencies file for SciTE
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 3.6 or later
+
+import sys
+
+srcRoot = "../.."
+
+sys.path.append(srcRoot + "/scintilla")
+
+from scripts import Dependencies
+
+topComment = "# Created by AppDepGen.py. To recreate, run AppDepGen.py.\n"
+
+def Generate():
+	sciteSources = ["../src/*.cxx", "../lua/src/*.c", "../../lexilla/access/*.cxx", "../../scintilla/call/*.cxx"]
+	sciteIncludes = ["../../lexilla/include", "../../lexilla/access", "../../scintilla/include", "../src", "../lua/src"]
+
+	deps = Dependencies.FindDependencies(["../gtk/*.cxx"] + sciteSources,  ["../gtk"] + sciteIncludes, ".o", "../gtk/")
+	Dependencies.UpdateDependencies("../gtk/deps.mak", deps, topComment)
+
+if __name__ == "__main__":
+	Generate()
\ No newline at end of file
diff --git a/scite-app/scite/gtk/DirectorExtension.cxx b/scite-app/scite/gtk/DirectorExtension.cxx
new file mode 100644
index 0000000..e215b51
--- /dev/null
+++ b/scite-app/scite/gtk/DirectorExtension.cxx
@@ -0,0 +1,517 @@
+// SciTE - Scintilla based Text Editor
+/** @file DirectorExtension.cxx
+ ** Extension for communicating with a director program.
+ ** This allows external client programs (and internal extensions) to communicate
+ ** with instances of SciTE. The original scheme required you to define the property
+ ** ipc.scite.name to be a valid (but _not_ created) pipename, which becomes the
+ ** 'request pipe' for sending commands to SciTE. (The set of available commands
+ ** is defined in SciTEBase::PerformOne()). One also had to specify a property
+ ** ipc.director.name to be an _existing_ pipe which would receive notifications (like
+ ** when a file is opened, buffers switched, etc).
+ **
+ **
+ ** This version supports the old protocol, so existing clients such as ScitePM still
+ ** work as before. But it is no longer necessary to specify these ipc properties.
+ ** If ipc.scite.name is not defined, then a new request pipe is created of the form
+ ** /tmp/SciTE.<pid>.in using the current pid. This pipename is put back into
+ ** ipc.scite.name (this is useful for internal extensions that want to find _another_
+ ** instance of SciTE). This pipe will be removed when SciTE closes normally,
+ ** so listing all files with the pattern '/tmp/SciTE.*.in' will give the currently
+ ** running SciTE instances.
+ **
+ ** If a client wants to receive notifications, they must ask using
+ ** the register command, i.e. send ':<path to temp file>:register:' to the request
+ ** pipe. SciTE will create a new notify pipe (of the form /tmp/SciTE.<pid>.<k>.out)
+ ** and write it into the temp file, which the client can read and open.
+ **
+ ** This version also supports the 'correspondent' concept used by the Win32
+ ** version; requests of the form ':<my pipe>:<command>:<args>' make any results
+ ** get sent back to the specified, existing pipename <my pipe>. For example,
+ ** ':/tmp/mypipe:askproperty:SciteDefaultHome' will make SciTE write the value of
+ ** the standard property 'SciteDefaultHome' to the pipe /tmp/mypipe.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+#include <cerrno>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <gtk/gtk.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+#include "DirectorExtension.h"
+
+static int fdDirector = 0;
+static int fdCorrespondent = 0;
+static int fdReceiver = 0;
+static bool startedByDirector = false;
+static bool shuttingDown = false;
+
+// the number of notify connections this SciTE instance will handle.
+const int MAX_PIPES = 20;
+
+#define TMP_FILENAME_LENGTH 1024
+
+static char requestPipeName[TMP_FILENAME_LENGTH];
+
+//#define IF_DEBUG(x) x;
+#define IF_DEBUG(x)
+
+IF_DEBUG(static FILE *fdDebug = 0)
+
+// managing a list of notification pipes
+// this also allows for proper cleanup of any pipes
+// that aren't _directly_ specified by the director.
+struct PipeEntry {
+	int fd;
+	char *name;
+	~PipeEntry() {
+		free(name);
+		name = 0;
+	}
+};
+static PipeEntry s_send_pipes[MAX_PIPES];
+static int s_send_cnt = 0;
+
+static bool SendPipeAvailable() {
+	return s_send_cnt < MAX_PIPES-1;
+}
+
+static void AddSendPipe(int fd, const char *name) {
+	if (SendPipeAvailable()) {
+		PipeEntry &entry = s_send_pipes[s_send_cnt++];
+		entry.fd = fd;
+		if (name)
+			entry.name = strdup(name);
+		else
+			entry.name = NULL;
+	}
+}
+
+static void RemoveSendPipes() noexcept {
+	for (int i = 0; i < s_send_cnt; ++i) {
+		PipeEntry &entry = s_send_pipes[i];
+		close(entry.fd);
+		if (entry.name)
+			remove(entry.name);
+	}
+}
+
+static bool MakePipe(const char *pipeName) {
+	int res;
+	res = mkfifo(pipeName, 0777);
+	return res == 0;
+}
+
+static int OpenPipe(const char *pipeName) {
+	int fd = open(pipeName, O_RDWR | O_NONBLOCK);
+	return fd;
+}
+
+// we now send notifications to _all_ the notification pipes registered!
+static bool SendPipeCommand(const char *pipeCommand) {
+	int size;
+	if (fdCorrespondent) {
+		size = write(fdCorrespondent,pipeCommand,strlen(pipeCommand));
+		size += write(fdCorrespondent,"\n",1);
+		IF_DEBUG(fprintf(fdDebug, "Send correspondent: %s %d bytes to %d\n", pipeCommand, size,fdCorrespondent))
+	} else {
+		for (int i = 0; i < s_send_cnt; ++i) {
+			int fd = s_send_pipes[i].fd;
+			// put a linefeed after the notification!
+			size = write(fd, pipeCommand, strlen(pipeCommand));
+			size += write(fd,"\n",1);
+			IF_DEBUG(fprintf(fdDebug, "Send pipecommand: %s %d bytes to %d\n", pipeCommand, size,fd))
+		}
+	}
+	(void)size; // to keep compiler happy if we aren't debugging...
+	return true;
+}
+
+static gboolean ReceiverPipeSignal(GIOChannel *source, GIOCondition condition, void *data) {
+#ifndef GDK_VERSION_3_6
+	gdk_threads_enter();
+#endif
+
+	if ((condition & G_IO_IN) == G_IO_IN) {
+		std::string pipeString;
+		char pipeData[8192];
+		gsize readLength;
+		GError *error = NULL;
+		GIOStatus status = g_io_channel_read_chars(source, pipeData,
+		        sizeof(pipeData) - 1, &readLength, &error);
+		while ((status != G_IO_STATUS_ERROR) && (readLength > 0)) {
+			pipeData[readLength] = '\0';
+			pipeString.append(pipeData);
+			status = g_io_channel_read_chars(source, pipeData,
+			        sizeof(pipeData) - 1, &readLength, &error);
+		}
+		DirectorExtension *ext = static_cast<DirectorExtension *>(data);
+		ext->HandleStringMessage(pipeString.c_str());
+	}
+#ifndef GDK_VERSION_3_6
+	gdk_threads_leave();
+#endif
+	return TRUE;
+}
+
+static void SendDirector(const char *verb, const char *arg = 0) {
+	IF_DEBUG(fprintf(fdDebug, "SendDirector:(%s, %s):  fdDirector = %d\n", verb, arg, fdDirector))
+	if (s_send_cnt) {
+		std::string addressedMessage;
+		addressedMessage += verb;
+		addressedMessage += ":";
+		if (arg)
+			addressedMessage += arg;
+		//send the message through all the registered pipes
+		::SendPipeCommand(addressedMessage.c_str());
+	} else {
+		IF_DEBUG(fprintf(fdDebug, "SendDirector: no notify pipes\n"))
+	}
+}
+
+static bool not_empty(const char *s) {
+	return s && *s;
+}
+
+static void CheckEnvironment(ExtensionAPI *host) {
+	if (!host)
+		return ;
+	if (!fdDirector) {
+		std::string director = host->Property("ipc.director.name");
+		if (director.length() > 0) {
+			startedByDirector = true;
+			fdDirector = OpenPipe(director.c_str());
+			AddSendPipe(fdDirector,NULL);  // we won't remove this pipe!
+		}
+	}
+}
+
+DirectorExtension &DirectorExtension::Instance() {
+	static DirectorExtension singleton;
+	return singleton;
+}
+
+bool DirectorExtension::Initialise(ExtensionAPI *host_) {
+	host = host_;
+	IF_DEBUG(fdDebug = fopen("/tmp/SciTE.log", "w"))
+	CheckEnvironment(host);
+	// always try to create the receive (request) pipe, even if not started by
+	// an external director
+	CreatePipe();
+	IF_DEBUG(fprintf(fdDebug, "Initialise: fdReceiver: %d\n", fdReceiver))
+	// but do crash out if we failed and were started by an external director.
+	if (!fdReceiver && startedByDirector) {
+		exit(3);
+	}
+	return true;
+}
+
+bool DirectorExtension::Finalise() noexcept {
+	::SendDirector("closing");
+	// close and remove all the notification pipes (except ipc.director.name)
+	RemoveSendPipes();
+	// close our request pipe
+	if (fdReceiver != 0) {
+		close(fdReceiver);
+	}
+	// and remove it if we generated it automatically (i.e. not ipc.scite.name)
+	if (not_empty(requestPipeName)) {
+		remove(requestPipeName);
+	}
+	IF_DEBUG(fprintf(fdDebug,"finished\n"))
+	IF_DEBUG(fclose(fdDebug))
+
+	g_source_remove(inputWatcher);
+	inputWatcher = 0;
+	g_io_channel_unref(inputChannel);
+	inputChannel = 0;
+
+	return true;
+}
+
+bool DirectorExtension::Clear() {
+	return false;
+}
+
+bool DirectorExtension::Load(const char *) {
+	return false;
+}
+
+bool DirectorExtension::OnOpen(const char *path) {
+	CheckEnvironment(host);
+	if (not_empty(path)) {
+		::SendDirector("opened", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnSwitchFile(const char *path) {
+	CheckEnvironment(host);
+	if (not_empty(path)) {
+		::SendDirector("switched", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnSave(const char *path) {
+	CheckEnvironment(host);
+	if (not_empty(path)) {
+		::SendDirector("saved", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnClose(const char *path) {
+	CheckEnvironment(host);
+	if (not_empty(path)) {
+		::SendDirector("closed", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::NeedsOnClose() {
+	CheckEnvironment(host);
+	return s_send_cnt > 0;
+}
+
+bool DirectorExtension::OnChar(char) {
+	return false;
+}
+
+bool DirectorExtension::OnExecute(const char *cmd) {
+	CheckEnvironment(host);
+	::SendDirector("macro:run", cmd);
+	return false;
+}
+
+bool DirectorExtension::OnSavePointReached() {
+	return false;
+}
+
+bool DirectorExtension::OnSavePointLeft() {
+	return false;
+}
+
+bool DirectorExtension::OnStyle(SA::Position, SA::Position, int, StyleWriter *) {
+	return false;
+}
+
+// These should probably have arguments
+
+bool DirectorExtension::OnDoubleClick() {
+	return false;
+}
+
+bool DirectorExtension::OnUpdateUI() {
+	return false;
+}
+
+bool DirectorExtension::OnMarginClick() {
+	return false;
+}
+
+bool DirectorExtension::OnMacro(const char *command, const char *params) {
+	SendDirector(command, params);
+	return false;
+}
+
+bool DirectorExtension::SendProperty(const char *prop) {
+	CheckEnvironment(host);
+	if (not_empty(prop)) {
+		::SendDirector("property", prop);
+	}
+	return false;
+}
+
+void DirectorExtension::HandleStringMessage(const char *message) {
+	static int kount = 1;
+	// Message may contain multiple commands separated by '\n'
+	StringList  wlMessage(true);
+	wlMessage.Set(message);
+	IF_DEBUG(fprintf(fdDebug, "HandleStringMessage: got %s\n", message))
+	for (size_t i = 0; i < wlMessage.Length(); i++) {
+		// Message format is [:return address:]command:argument
+		char *cmd = wlMessage[i];
+		char *corresp = NULL;
+		if (*cmd == ':') { // see same routine in ../win32/DirectorExtension.cxx!
+			// there is a return address
+			char *colon = strchr(cmd + 1,':');
+			if (colon) {
+				*colon = '\0';
+				corresp = cmd + 1;
+				cmd = colon + 1;
+			}
+		}
+		if (isprefix(cmd, "closing:")) {
+			fdDirector = 0;
+			if (startedByDirector && host) {
+				shuttingDown = true;
+				host->ShutDown();
+				shuttingDown = false;
+			}
+		} else if (isprefix(cmd, "register:")) {
+			// we handle this verb specially - an extension has asked us for a notify
+			// pipe which it can listen to.  We make up a unique name based on our
+			// pid and a sequence count.
+			// There is an (artificial) limit on the number of notify pipes;
+			// if there are no more slots, then the returned pipename is '*'
+			char pipeName[TMP_FILENAME_LENGTH];
+			if (! SendPipeAvailable()) {
+				StringCopy(pipeName,"*");
+			} else {
+				sprintf(pipeName,"%s/SciTE.%d.%d.out", g_get_tmp_dir(), getpid(), kount++);
+			}
+			if (corresp == NULL) {
+				fprintf(stderr,"SciTE Director: bad request\n");
+				return;
+			} else {
+				// the registering client has passed us a path for receiving the notify pipe name.
+				// this has to be a _regular_ file, which may not exist.
+				fdCorrespondent = open(corresp,O_WRONLY | O_CREAT, S_IRWXU);
+				IF_DEBUG(fprintf(fdDebug,"register '%s' %d\n",corresp,fdCorrespondent))
+				if (fdCorrespondent == -1) {
+					fdCorrespondent = 0;
+					fprintf(stderr,"SciTE Director: cannot open result file '%s'\n",corresp);
+					return;
+				}
+				if (fdCorrespondent != 0) {
+					size_t size = write(fdCorrespondent, pipeName, strlen(pipeName));
+					size += write(fdCorrespondent, "\n", 1);
+					if (size == 0)
+						fprintf(stderr,"SciTE Director: cannot write pipe name\n");
+
+				}
+			}
+			if (SendPipeAvailable()) {
+				MakePipe(pipeName);
+				int fd = OpenPipe(pipeName);
+				AddSendPipe(fd, pipeName);
+			}
+		} else if (host) {
+			if (corresp != NULL) {
+				// the client has passed us a pipename to receive the results of this command
+				fdCorrespondent = OpenPipe(corresp);
+				IF_DEBUG(fprintf(fdDebug,"corresp '%s' %d\n",corresp,fdCorrespondent))
+				if (fdCorrespondent == -1) {
+					fdCorrespondent = 0;
+					fprintf(stderr,"SciTE Director: cannot open correspondent pipe '%s'\n",corresp);
+					return;
+				}
+			}
+			host->Perform(cmd);
+		}
+		if (fdCorrespondent != 0) {
+			close(fdCorrespondent);
+			fdCorrespondent = 0;
+		}
+	}
+}
+
+void DirectorExtension::CreatePipe(bool) {
+	if (!host)
+		return;
+	bool tryStandardPipeCreation;
+	std::string pipeName = host->Property("ipc.scite.name");
+
+	fdReceiver = -1;
+	inputWatcher = -1;
+	inputChannel = 0;
+	requestPipeName[0] = '\0';
+
+	// check we have been given a specific pipe name
+	if (pipeName.length() > 0) {
+		IF_DEBUG(fprintf(fdDebug, "CreatePipe: if (not_empty(pipeName)): '%s'\n", pipeName.c_str()))
+		fdReceiver = OpenPipe(pipeName.c_str());
+		// there isn't a pipe - so create one
+		if (fdReceiver == -1 && errno == ENOENT) {
+			IF_DEBUG(fprintf(fdDebug, "CreatePipe: Non found - making\n"))
+			if (MakePipe(pipeName.c_str())) {
+				fdReceiver = OpenPipe(pipeName.c_str());
+				if (fdReceiver == -1) {
+					perror("CreatePipe: could not open newly created pipe");
+				}
+			} else {
+				perror("CreatePipe: could not create ipc.scite.name");
+			}
+			// We don't need a new pipe, we're supposed to have one
+			tryStandardPipeCreation = false;
+		} else if (fdReceiver == -1) {
+			// there are quite a few errors related to open...
+			// maybe the pipe is already owned by another SciTE instance...
+			// we'll just try creating a new one
+			perror("CreatePipe: opening ipc.scite.name failed");
+			tryStandardPipeCreation = true;
+		} else {
+			// cool - we can open it
+			tryStandardPipeCreation = false;
+		}
+	} else {
+		tryStandardPipeCreation = true;
+	}
+
+	// We were not given a name or we could'nt open it
+	if (tryStandardPipeCreation) {
+		sprintf(requestPipeName,"%s/SciTE.%d.in", g_get_tmp_dir(), getpid());
+		IF_DEBUG(fprintf(fdDebug, "Creating pipe %s\n", requestPipeName))
+		MakePipe(requestPipeName);
+		fdReceiver = OpenPipe(requestPipeName);
+	}
+
+	// If we were able to open a pipe, listen to it
+	if (fdReceiver != -1) {
+		// store the inputWatcher so we can remove it.
+		inputChannel = g_io_channel_unix_new(fdReceiver);
+		inputWatcher = g_io_add_watch(inputChannel, G_IO_IN, (GIOFunc)ReceiverPipeSignal, this);
+		//inputWatcher = gdk_input_add(fdReceiver, GDK_INPUT_READ, ReceiverPipeSignal, this);
+		// if we were not supplied with an explicit ipc.scite.name, then set this
+		// property to be the constructed pipe name.
+		if (pipeName.length() > 0) {
+			host->SetProperty("ipc.scite.name", requestPipeName);
+		}
+		return;
+	}
+
+	// if we arrive here, we must have failed
+	fdReceiver = 0;
+}
diff --git a/scite-app/scite/gtk/DirectorExtension.h b/scite-app/scite/gtk/DirectorExtension.h
new file mode 100644
index 0000000..b420293
--- /dev/null
+++ b/scite-app/scite/gtk/DirectorExtension.h
@@ -0,0 +1,53 @@
+// SciTE - Scintilla based Text Editor
+/** @file DirectorExtension.h
+ ** Extension for communicating with a director program.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DIRECTOREXTENSION_H
+#define DIRECTOREXTENSION_H
+
+class DirectorExtension : public Extension {
+private:
+	DirectorExtension() : inputWatcher(-1), inputChannel(0), host(0) {} // Singleton
+	DirectorExtension(const DirectorExtension &); // Disable copy ctor
+	void operator=(const DirectorExtension &);    // Disable operator=
+
+public:
+	static DirectorExtension &Instance();
+
+	// Implement the Extension interface
+	bool Initialise(ExtensionAPI *host_) override;
+	bool Finalise() noexcept override;
+	bool Clear() override;
+	bool Load(const char *filename) override;
+
+	bool OnOpen(const char *path) override;
+	bool OnSwitchFile(const char *path) override;
+	bool OnSave(const char *path) override;
+	bool OnChar(char ch) override;
+	bool OnExecute(const char *cmd) override;
+	bool OnSavePointReached() override;
+	bool OnSavePointLeft() override;
+	bool OnStyle(SA::Position startPos, SA::Position lengthDoc, int initStyle, StyleWriter *styler) override;
+	bool OnDoubleClick() override;
+	bool OnUpdateUI() override;
+	bool OnMarginClick() override;
+	bool OnMacro(const char *command, const char *params) override;
+
+	bool SendProperty(const char *prop) override;
+	bool OnClose(const char *path) override;
+	bool NeedsOnClose() override;
+
+	// Allow messages through to extension
+	void HandleStringMessage(const char *message);
+
+	void CreatePipe(bool forceNew = false);
+private:
+	int inputWatcher;
+	GIOChannel *inputChannel;
+	ExtensionAPI *host;
+};
+
+#endif
diff --git a/scite-app/scite/gtk/GUIGTK.cxx b/scite-app/scite/gtk/GUIGTK.cxx
new file mode 100644
index 0000000..9330df5
--- /dev/null
+++ b/scite-app/scite/gtk/GUIGTK.cxx
@@ -0,0 +1,202 @@
+// SciTE - Scintilla based Text Editor
+/** @file GUIGTK.cxx
+ ** Interface to platform GUI facilities.
+ ** Split off from Scintilla's Platform.h to avoid SciTE depending on implementation of Scintilla.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <ctime>
+
+#include <string>
+#include <chrono>
+#include <sstream>
+
+#include <gtk/gtk.h>
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+
+#include "GUI.h"
+
+namespace GUI {
+
+gui_string StringFromUTF8(const char *s) {
+	if (s)
+		return gui_string(s);
+	else
+		return gui_string("");
+}
+
+gui_string StringFromUTF8(const std::string &s) {
+	return s;
+}
+
+std::string UTF8FromString(const gui_string &s) {
+	return s;
+}
+
+gui_string StringFromInteger(long i) {
+	char number[32];
+	sprintf(number, "%0ld", i);
+	return gui_string(number);
+}
+
+gui_string StringFromLongLong(long long i) {
+	try {
+		std::ostringstream strstrm;
+		strstrm << i;
+		return StringFromUTF8(strstrm.str());
+	} catch (std::exception &) {
+		// Exceptions not enabled on stream but still causes diagnostic in Coverity.
+		// Simply swallow the failure and return the default value.
+	}
+	return gui_string();
+}
+
+std::string LowerCaseUTF8(std::string_view sv) {
+	gchar *lower = g_utf8_strdown(sv.data(), sv.length());
+	const std::string sLower(lower);
+	g_free(lower);
+	return sLower;
+}
+
+static GtkWidget *PWidget(WindowID wid) {
+	return static_cast<GtkWidget *>(wid);
+}
+
+void Window::Destroy() {
+	if (wid)
+		gtk_widget_destroy(GTK_WIDGET(wid));
+	wid = 0;
+}
+
+bool Window::HasFocus() {
+	return gtk_widget_has_focus(GTK_WIDGET(wid));
+}
+
+Rectangle Window::GetPosition() {
+	// Before any size allocated pretend its 1000 wide so not scrolled
+	Rectangle rc(0, 0, 1000, 1000);
+	if (wid) {
+		GtkAllocation allocation;
+		gtk_widget_get_allocation(PWidget(wid), &allocation);
+		rc.left = allocation.x;
+		rc.top = allocation.y;
+		if (allocation.width > 20) {
+			rc.right = rc.left + allocation.width;
+			rc.bottom = rc.top + allocation.height;
+		}
+	}
+	return rc;
+}
+
+void Window::SetPosition(Rectangle rc) {
+	GtkAllocation alloc;
+	alloc.x = rc.left;
+	alloc.y = rc.top;
+	alloc.width = rc.Width();
+	alloc.height = rc.Height();
+	gtk_widget_size_allocate(PWidget(wid), &alloc);
+}
+
+Rectangle Window::GetClientPosition() {
+	// On GTK, the client position is the window position
+	return GetPosition();
+}
+
+void Window::Show(bool show) {
+	if (show)
+		gtk_widget_show(PWidget(wid));
+}
+
+void Window::InvalidateAll() {
+	if (wid) {
+		gtk_widget_queue_draw(PWidget(wid));
+	}
+}
+
+void Window::SetTitle(const char *s) {
+	gtk_window_set_title(GTK_WINDOW(wid), s);
+}
+
+void Window::SetRedraw(bool /* redraw */) {
+	// Could call gdk_window_freeze_updates / gdk_window_thaw_updates here
+	// but unsure what the side effects will be.
+}
+
+void Menu::CreatePopUp() {
+	Destroy();
+	mid = gtk_menu_new();
+	g_object_ref_sink(G_OBJECT(mid));
+}
+
+void Menu::Destroy() noexcept {
+	if (mid)
+		g_object_unref(mid);
+	mid = 0;
+}
+
+#if !GTK_CHECK_VERSION(3,22,0)
+static void  MenuPositionFunc(GtkMenu *, gint *x, gint *y, gboolean *, gpointer userData) {
+	sptr_t intFromPointer = GPOINTER_TO_INT(userData);
+	*x = intFromPointer & 0xffff;
+	*y = intFromPointer >> 16;
+}
+#endif
+
+void Menu::Show(Point pt G_GNUC_UNUSED, Window &) {
+	GtkMenu *widget = static_cast<GtkMenu *>(mid);
+	gtk_widget_show_all(GTK_WIDGET(widget));
+#if GTK_CHECK_VERSION(3,22,0)
+	// Rely on GTK to do the right thing with positioning
+	gtk_menu_popup_at_pointer(widget, NULL);
+#else
+	int screenHeight = gdk_screen_height();
+	int screenWidth = gdk_screen_width();
+	GtkRequisition requisition;
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition);
+#else
+	gtk_widget_size_request(GTK_WIDGET(widget), &requisition);
+#endif
+	if ((pt.x + requisition.width) > screenWidth) {
+		pt.x = screenWidth - requisition.width;
+	}
+	if ((pt.y + requisition.height) > screenHeight) {
+		pt.y = screenHeight - requisition.height;
+	}
+	gtk_menu_popup(widget, NULL, NULL, MenuPositionFunc,
+		GINT_TO_POINTER((pt.y << 16) | pt.x), 0,
+		gtk_get_current_event_time());
+#endif
+}
+
+sptr_t ScintillaPrimitive::Send(unsigned int msg, uptr_t wParam, sptr_t lParam) {
+	return scintilla_send_message(SCINTILLA(GetID()), msg, wParam, lParam);
+}
+
+bool IsDBCSLeadByte(int codePage, char ch) {
+	// Byte ranges found in Wikipedia articles with relevant search strings in each case
+	unsigned char uch = static_cast<unsigned char>(ch);
+	switch (codePage) {
+		case 932:
+			// Shift_jis
+			return ((uch >= 0x81) && (uch <= 0x9F)) ||
+				((uch >= 0xE0) && (uch <= 0xEF));
+		case 936:
+			// GBK
+			return (uch >= 0x81) && (uch <= 0xFE);
+		case 950:
+			// Big5
+			return (uch >= 0x81) && (uch <= 0xFE);
+		// Korean EUC-KR may be code page 949.
+	}
+	return false;
+}
+
+void SleepMilliseconds(int sleepTime) {
+	g_usleep(sleepTime * 1000);
+}
+
+}
diff --git a/scite-app/scite/gtk/Sci48M.png b/scite-app/scite/gtk/Sci48M.png
new file mode 100644
index 0000000..22dd859
Binary files /dev/null and b/scite-app/scite/gtk/Sci48M.png differ
diff --git a/scite-app/scite/gtk/SciIcon.h b/scite-app/scite/gtk/SciIcon.h
new file mode 100644
index 0000000..d5e4076
--- /dev/null
+++ b/scite-app/scite/gtk/SciIcon.h
@@ -0,0 +1,37 @@
+// @file SciIcon.h
+/* XPM */
+static const char * SciIcon_xpm[] = {
+"16 16 17 1",
+" 	c None",
+".	c #666666",
+"+	c #424242",
+"@	c #4D4D4D",
+"#	c #777777",
+"$	c #555555",
+"%	c #868686",
+"&	c #333333",
+"*	c #292929",
+"=	c #A0A0A4",
+"-	c #808080",
+";	c #C0C0C0",
+">	c #999999",
+",	c #E3E3E3",
+"'	c #161616",
+")	c #B2B2B2",
+"!	c #D7D7D7",
+"     .+@@+#     ",
+"   $+$$@+@+@$   ",
+"  $@+%&.@@@++@  ",
+" $@*=@-@-&.+&&@ ",
+" #+@;*>#&>&@+*+ ",
+".$*;*,*=='..'++&",
+"+&.%#.,*$;&*.&*&",
+"*@)*,$+,@&=.'&.'",
+"*$&;*,$*!=*+%$''",
+"**@$)*;%*.;$***'",
+"*&&&&$*#-&*@+&''",
+" **&@*$**@+*''' ",
+" &*&+.'++*'*&** ",
+"  **&*+&*&&*''  ",
+"   ********''   ",
+"     *'''''     "};
diff --git a/scite-app/scite/gtk/SciTE.desktop b/scite-app/scite/gtk/SciTE.desktop
new file mode 100755
index 0000000..e47c178
--- /dev/null
+++ b/scite-app/scite/gtk/SciTE.desktop
@@ -0,0 +1,23 @@
+[Desktop Entry]
+Version=1.0
+Name=SciTE Text Editor
+Name[da]=SciTE-tekstredigering
+Name[de]=SciTE-Textbearbeitung
+Name[es]=Editor de textos SciTE
+Name[fr]=Éditeur de texte SciTE
+Name[ru]=Текстовый редактор SciTE
+Comment=Edit your source files
+Comment[da]=Rediger dine kildefiler
+Comment[de]=Quelltextdateien bearbeiten
+Comment[es]=Edita especializado para programación
+Comment[fr]=Éditer des fichiers sources
+Comment[ru]=Редактор исходных кодов
+GenericName=Text Editor
+GenericName[de]=Textbearbeitung
+Type=Application
+Exec=SciTE %F
+Icon=Sci48M
+Terminal=false
+StartupNotify=true
+Categories=TextEditor;Development;GTK;
+MimeType=text/plain;
diff --git a/scite-app/scite/gtk/SciTEGTK.cxx b/scite-app/scite/gtk/SciTEGTK.cxx
new file mode 100644
index 0000000..ef1f592
--- /dev/null
+++ b/scite-app/scite/gtk/SciTEGTK.cxx
@@ -0,0 +1,5500 @@
+// SciTE - Scintilla based Text Editor
+// SciTEGTK.cxx - main code for the GTK version of the editor
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+#include <cerrno>
+#include <csignal>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <glib.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+
+#include "Lexilla.h"
+#include "LexillaAccess.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+
+#include "Extender.h"
+
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "pixmapsGNOME.h"
+#include "SciIcon.h"
+#include "Widget.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+#include "StripDefinition.h"
+
+#include "SciTEKeys.h"
+
+#ifndef NO_EXTENSIONS
+#include "MultiplexExtension.h"
+
+#ifndef NO_FILER
+#include "DirectorExtension.h"
+#endif
+
+#ifndef NO_LUA
+#include "LuaExtension.h"
+#endif
+
+#endif
+
+enum { mbsAboutBox = 0x100000 };
+
+// Key names are longer for GTK 3
+#if GTK_CHECK_VERSION(3,0,0)
+#define GKEY_Escape GDK_KEY_Escape
+#define GKEY_Tab GDK_KEY_Tab
+#define GKEY_ISO_Left_Tab GDK_KEY_ISO_Left_Tab
+#define GKEY_KP_Enter GDK_KEY_KP_Enter
+#define GKEY_KP_Multiply GDK_KEY_KP_Multiply
+#define GKEY_Control_L GDK_KEY_Control_L
+#define GKEY_Control_R GDK_KEY_Control_R
+#define GKEY_F1 GDK_KEY_F1
+#define GKEY_F2 GDK_KEY_F2
+#define GKEY_F3 GDK_KEY_F3
+#define GKEY_F4 GDK_KEY_F4
+#else
+#define GKEY_Escape GDK_Escape
+#define GKEY_Tab GDK_Tab
+#define GKEY_ISO_Left_Tab GDK_ISO_Left_Tab
+#define GKEY_KP_Enter GDK_KP_Enter
+#define GKEY_KP_Multiply GDK_KP_Multiply
+#define GKEY_Control_L GDK_Control_L
+#define GKEY_Control_R GDK_Control_R
+#define GKEY_F1 GDK_F1
+#define GKEY_F2 GDK_F2
+#define GKEY_F3 GDK_F3
+#define GKEY_F4 GDK_F4
+#endif
+
+static GdkWindow *WindowFromWidget(GtkWidget *w) {
+	return gtk_widget_get_window(w);
+}
+
+const char appName[] = "SciTE";
+
+static GtkWidget *PWidget(const GUI::Window &w) {
+	return static_cast<GtkWidget *>(w.GetID());
+}
+
+class SciTEGTK;
+
+typedef void (*SigFunction)(GtkWidget *w, SciTEGTK *app);
+
+// Callback thunk class connects GTK signals to a SciTEGTK instance method.
+template< void (SciTEGTK::*method)() >
+class Signal {
+public:
+	static void Function(GtkWidget */*w*/, SciTEGTK *app) {
+		(app->*method)();
+	}
+};
+
+// Callback thunk class connects GTK signals to a SciTEGTK instance method.
+template< void (SciTEGTK::*method)(int responseID) >
+class ResponseSignal {
+public:
+	static void Function(GtkDialog */*w*/, gint responseID, SciTEGTK *app) {
+		(app->*method)(responseID);
+	}
+};
+
+template< void (SciTEGTK::*method)(int responseID) >
+inline void AttachResponse(GtkWidget *w, SciTEGTK *object) {
+	ResponseSignal <method> sig;
+	g_signal_connect(G_OBJECT(w), "response", G_CALLBACK(sig.Function), object);
+}
+
+// Field added to GTK 1.x ItemFactoryEntry for 2.x  so have a struct that is the same as 1.x
+struct SciTEItemFactoryEntry {
+	const char *path;
+	const char *accelerator;
+	GCallback callback;
+	int callback_action;
+	const char *item_type;
+};
+
+long SciTEKeys::ParseKeyCode(const char *mnemonic) {
+	int modsInKey = 0;
+	int keyval = -1;
+
+	if (mnemonic && *mnemonic) {
+		std::string sKey = mnemonic;
+
+		if (RemoveStringOnce(sKey, "Ctrl+"))
+			modsInKey |= GDK_CONTROL_MASK;
+		if (RemoveStringOnce(sKey, "Shift+"))
+			modsInKey |= GDK_SHIFT_MASK;
+		if (RemoveStringOnce(sKey, "Alt+"))
+			modsInKey |= GDK_MOD1_MASK;
+		if (RemoveStringOnce(sKey, "Super+"))
+			modsInKey |= GDK_MOD4_MASK;
+
+		if (sKey.length() == 1) {
+			if (modsInKey & GDK_CONTROL_MASK && !(modsInKey & GDK_SHIFT_MASK))
+				LowerCaseAZ(sKey);
+			keyval = sKey[0];
+		} else if ((sKey.length() > 1)) {
+			if ((sKey[0] == 'F') && (IsADigit(sKey[1]))) {
+				sKey.erase(0, 1);
+				int fkeyNum = atoi(sKey.c_str());
+				if (fkeyNum >= 1 && fkeyNum <= 12)
+#if GTK_CHECK_VERSION(3,0,0)
+					keyval = fkeyNum - 1 + GDK_KEY_F1;
+#else
+					keyval = fkeyNum - 1 + GDK_F1;
+#endif
+			} else {
+#if GTK_CHECK_VERSION(3,0,0)
+				if (sKey == "Left") {
+					keyval = GDK_KEY_Left;
+				} else if (sKey == "Right") {
+					keyval = GDK_KEY_Right;
+				} else if (sKey == "Up") {
+					keyval = GDK_KEY_Up;
+				} else if (sKey == "Down") {
+					keyval = GDK_KEY_Down;
+				} else if (sKey == "Insert") {
+					keyval = GDK_KEY_Insert;
+				} else if (sKey == "End") {
+					keyval = GDK_KEY_End;
+				} else if (sKey == "Home") {
+					keyval = GDK_KEY_Home;
+				} else if (sKey == "Enter") {
+					keyval = GDK_KEY_Return;
+				} else if (sKey == "Space") {
+					keyval = GDK_KEY_space;
+				} else if (sKey == "Tab") {
+					keyval = GDK_KEY_Tab;
+				} else if (sKey == "KeypadPlus") {
+					keyval = GDK_KEY_KP_Add;
+				} else if (sKey == "KeypadMinus") {
+					keyval = GDK_KEY_KP_Subtract;
+				} else if (sKey == "KeypadMultiply") {
+					keyval = GDK_KEY_KP_Multiply;
+				} else if (sKey == "KeypadDivide") {
+					keyval = GDK_KEY_KP_Divide;
+				} else if (sKey == "Escape") {
+					keyval = GDK_KEY_Escape;
+				} else if (sKey == "Delete") {
+					keyval = GDK_KEY_Delete;
+				} else if (sKey == "PageUp") {
+					keyval = GDK_KEY_Page_Up;
+				} else if (sKey == "PageDown") {
+					keyval = GDK_KEY_Page_Down;
+				} else if (sKey == "Slash") {
+					keyval = GDK_KEY_slash;
+				} else if (sKey == "Question") {
+					keyval = GDK_KEY_question;
+				} else if (sKey == "Equal") {
+					keyval = GDK_KEY_equal;
+				} else if (sKey == "Win") {
+					keyval = GDK_KEY_Super_L;
+				} else if (sKey == "Menu") {
+					keyval = GDK_KEY_Menu;
+				}
+#else
+				if (sKey == "Left") {
+					keyval = GDK_Left;
+				} else if (sKey == "Right") {
+					keyval = GDK_Right;
+				} else if (sKey == "Up") {
+					keyval = GDK_Up;
+				} else if (sKey == "Down") {
+					keyval = GDK_Down;
+				} else if (sKey == "Insert") {
+					keyval = GDK_Insert;
+				} else if (sKey == "End") {
+					keyval = GDK_End;
+				} else if (sKey == "Home") {
+					keyval = GDK_Home;
+				} else if (sKey == "Enter") {
+					keyval = GDK_Return;
+				} else if (sKey == "Space") {
+					keyval = GDK_space;
+				} else if (sKey == "Tab") {
+					keyval = GDK_Tab;
+				} else if (sKey == "KeypadPlus") {
+					keyval = GDK_KP_Add;
+				} else if (sKey == "KeypadMinus") {
+					keyval = GDK_KP_Subtract;
+				} else if (sKey == "KeypadMultiply") {
+					keyval = GDK_KP_Multiply;
+				} else if (sKey == "KeypadDivide") {
+					keyval = GDK_KP_Divide;
+				} else if (sKey == "Escape") {
+					keyval = GDK_Escape;
+				} else if (sKey == "Delete") {
+					keyval = GDK_Delete;
+				} else if (sKey == "PageUp") {
+					keyval = GDK_Page_Up;
+				} else if (sKey == "PageDown") {
+					keyval = GDK_Page_Down;
+				} else if (sKey == "Slash") {
+					keyval = GDK_slash;
+				} else if (sKey == "Question") {
+					keyval = GDK_question;
+				} else if (sKey == "Equal") {
+					keyval = GDK_equal;
+				} else if (sKey == "Win") {
+					keyval = GDK_Super_L;
+				} else if (sKey == "Menu") {
+					keyval = GDK_Menu;
+				}
+#endif
+			}
+		}
+	}
+
+	return (keyval > 0) ? (keyval | (modsInKey<<16)) : 0;
+}
+
+bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept {
+	return parsedKeyCode && !(0xFFFF0000 & (keyval | modifiers)) && (parsedKeyCode == (keyval | (modifiers<<16)));
+}
+
+class BackgroundStrip : public Strip {
+public:
+	WStatic wExplanation;
+	WProgress wProgress;
+
+	BackgroundStrip() {
+	}
+	void Creation(GtkWidget *container) override;
+	void SetProgress(const GUI::gui_string &explanation, size_t size, size_t progress);
+};
+
+class DialogGoto : public Dialog {
+public:
+	WEntry entryGoto;
+};
+
+class DialogAbbrev : public Dialog {
+public:
+	WComboBoxEntry comboAbbrev;
+};
+
+class DialogTabSize : public Dialog {
+public:
+	WEntry entryTabSize;
+	WEntry entryIndentSize;
+	WToggle toggleUseTabs;
+};
+
+class DialogParameters : public Dialog {
+public:
+	bool paramDialogCanceled;
+	WEntry entryParam[SciTEBase::maxParam];
+	DialogParameters() :  paramDialogCanceled(true) {
+	}
+};
+
+class FindDialog : public Dialog {
+public:
+	virtual void FillCombosInDialog()=0;
+};
+
+class DialogFindInFiles : public FindDialog, public SearchUI {
+public:
+	WComboBoxEntry wComboFiles;
+	WComboBoxEntry wComboFindInFiles;
+	WComboBoxEntry comboDir;
+	WToggle toggleWord;
+	WToggle toggleCase;
+	WButton btnDotDot;
+	WButton btnBrowse;
+	void GrabFields();
+	void FillFields();
+	void FillCombosInDialog() override;
+};
+
+class DialogFindReplace : public FindDialog, public SearchUI {
+public:
+	WStatic labelFind;
+	WComboBoxEntry wComboFind;
+	WStatic labelReplace;
+	WComboBoxEntry wComboReplace;
+	WToggle toggleWord;
+	WToggle toggleCase;
+	WToggle toggleRegExp;
+	WToggle toggleWrap;
+	WToggle toggleUnSlash;
+	WToggle toggleReverse;
+	void GrabFields();
+	void FillFields();
+	void FillCombosInDialog() override;
+};
+
+class FindReplaceStrip : public Strip, public SearchUI {
+public:
+	WComboBoxEntry wComboFind;
+	bool initializingSearch;
+	enum IncrementalBehaviour { simple, incremental, showAllMatches };
+	IncrementalBehaviour incrementalBehaviour;
+	FindReplaceStrip() : initializingSearch(false), incrementalBehaviour(simple) {
+	}
+	void SetIncrementalBehaviour(int behaviour);
+	void MarkIncremental();
+	void NextIncremental();
+};
+
+
+class FindStrip : public FindReplaceStrip {
+public:
+	WStatic wStaticFind;
+	WButton wButton;
+	WButton wButtonMarkAll;
+	enum { checks = 6 };
+	WCheckDraw wCheck[checks];
+
+	FindStrip() {
+	}
+	void Creation(GtkWidget *container) override;
+	virtual void Destruction();
+	void Show(int buttonHeight) override;
+	void Close() override;
+	bool KeyDown(GdkEventKey *event) override;
+	void MenuAction(guint action) override;
+	static void ActivateSignal(GtkWidget *w, FindStrip *pStrip);
+	static void FindComboChanged(GtkEditable *, FindStrip *pStrip);
+	static void ToggleChanged(WCheckDraw *, void *user);
+	static gboolean EscapeSignal(GtkWidget *w, GdkEventKey *event, FindStrip *pStrip);
+	void GrabFields();
+	void GrabToggles();
+	void SetToggles();
+	void ShowPopup() override;
+	void FindNextCmd();
+	void MarkAllCmd();
+	void ChildFocus(GtkWidget *widget) override;
+	gboolean Focus(GtkDirectionType direction) override;
+};
+
+class ReplaceStrip : public FindReplaceStrip {
+public:
+	WStatic wStaticFind;
+	WButton wButtonFind;
+	WButton wButtonReplaceAll;
+	WStatic wStaticReplace;
+	WComboBoxEntry wComboReplace;
+	WButton wButtonReplace;
+	WButton wButtonReplaceInSelection;
+	enum { checks = 5 };
+	WCheckDraw wCheck[checks];
+
+	ReplaceStrip() {
+	}
+	void Creation(GtkWidget *container) override;
+	virtual void Destruction();
+	void Show(int buttonHeight) override;
+	void Close() override;
+	bool KeyDown(GdkEventKey *event) override;
+	void MenuAction(guint action) override;
+	static void ActivateSignal(GtkWidget *w, ReplaceStrip *pStrip);
+	static void FindComboChanged(GtkEditable *, ReplaceStrip *pStrip);
+	static void ToggleChanged(WCheckDraw *, void *user);
+	static gboolean EscapeSignal(GtkWidget *w, GdkEventKey *event, ReplaceStrip *pStrip);
+	void GrabFields();
+	void GrabToggles();
+	void SetToggles();
+	void FindCmd();
+	void ReplaceAllCmd();
+	void ReplaceCmd();
+	void ReplaceInSelectionCmd();
+	void ShowPopup() override;
+	void ChildFocus(GtkWidget *widget) override;
+	gboolean Focus(GtkDirectionType direction) override;
+};
+
+class UserStrip : public Strip {
+public:
+	StripDefinition *psd;
+	Extension *extender;
+	SciTEGTK *pSciTEGTK;
+	WTable tableUser;
+
+	UserStrip() : psd(0), extender(0), pSciTEGTK(0), tableUser(1, 1){
+	}
+	void Creation(GtkWidget *container) override;
+	virtual void Destruction();
+	void Show(int buttonHeight) override;
+	void Close() override;
+	bool KeyDown(GdkEventKey *event) override;
+	static void ActivateSignal(GtkWidget *w, UserStrip *pStrip);
+	static gboolean EscapeSignal(GtkWidget *w, GdkEventKey *event, UserStrip *pStrip);
+	void ClickThis(GtkWidget *w);
+	static void ClickSignal(GtkWidget *w, UserStrip *pStrip);
+	void ChildFocus(GtkWidget *widget) override;
+	gboolean Focus(GtkDirectionType direction) override;
+	void SetDescription(const char *description);
+	void SetExtender(Extension *extender_);
+	void SetSciTE(SciTEGTK *pSciTEGTK_);
+	void Set(int control, const char *value);
+	void SetList(int control, const char *value);
+	std::string GetValue(int control);
+};
+
+// Manage the use of the GDK thread lock within glib signal handlers
+class ThreadLockMinder {
+public:
+#ifndef GDK_VERSION_3_6
+	ThreadLockMinder() {
+		gdk_threads_enter();
+	}
+	~ThreadLockMinder() {
+		gdk_threads_leave();
+	}
+#endif
+};
+
+class SciTEGTK : public SciTEBase {
+
+	friend class UserStrip;
+
+protected:
+
+	GtkWidget *splitPane;
+
+	guint sbContextID;
+	GUI::Window wToolBarBox;
+	int toolbarDetachable;
+	int menuSource;
+
+	// Control of sub process
+	FilePath sciteExecutable;
+	size_t icmd;
+	int originalEnd;
+	int fdFIFO;
+	GPid pidShell;
+	bool triedKill;
+	int exitStatus;
+	guint pollID;
+	int inputHandle;
+	GIOChannel *inputChannel;
+	GUI::ElapsedTime commandTime;
+	std::string lastOutput;
+	int lastFlags;
+
+	// For single instance
+	std::string uniqueInstance;
+	guint32 startupTimestamp;
+
+	guint timerID;
+	guint idlerID;
+
+	BackgroundStrip backgroundStrip;
+	UserStrip userStrip;
+
+	enum FileFormat { sfSource, sfCopy, sfHTML, sfRTF, sfPDF, sfTEX, sfXML } saveFormat;
+	Dialog dlgFileSelector;
+	DialogFindInFiles dlgFindInFiles;
+	DialogGoto dlgGoto;
+	DialogAbbrev dlgAbbrev;
+	DialogTabSize dlgTabSize;
+
+	GtkWidget *wIncrementPanel;
+	GtkWidget *IncSearchEntry;
+	GtkWidget *IncSearchBtnNext;
+
+	FindStrip findStrip;
+	ReplaceStrip replaceStrip;
+
+	DialogFindReplace dlgFindReplace;
+	DialogParameters dlgParameters;
+
+	GtkWidget *btnCompile;
+	GtkWidget *btnBuild;
+	GtkWidget *btnStop;
+
+	GtkWidget *menuBar;
+	std::map<std::string, GtkWidget *> pulldowns;
+	std::map<std::string, GSList *> radiogroups;
+	std::map<int, GtkWidget *> mapMenuItemFromId;
+	GtkAccelGroup *accelGroup;
+
+	gint	fileSelectorWidth;
+	gint	fileSelectorHeight;
+
+	GtkSettings *settings;
+
+	GtkPrintSettings *printSettings;
+	GtkPageSetup *pageSetup;
+	std::vector<int> pageStarts;
+
+	// Fullscreen handling
+	GdkRectangle saved;
+
+	GtkWidget *AddMBButton(GtkWidget *dialog, const char *label,
+	                       int val, GtkAccelGroup *accel_group, bool isDefault = false);
+	void SetIcon();
+
+	void ReadLocalization() override;
+	void ReadPropertiesInitial() override;
+	void ReadProperties() override;
+
+	static gboolean TimerTick(gpointer pSciTE);
+	void TimerStart(int mask) override;
+	void TimerEnd(int mask) override;
+	static gboolean IdlerTick(gpointer pSciTE);
+	void SetIdler(bool on) override;
+
+	void GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) override;
+
+	void SizeContentWindows() override;
+	void SizeSubWindows() override;
+	bool UpdateOutputSize();
+
+	GtkWidget *MenuItemFromAction(int itemID);
+	void SetMenuItem(int menuNumber, int position, int itemID,
+	                         const char *text, const char *mnemonic = 0) override;
+	void DestroyMenuItem(int menuNumber, int itemID) override;
+	void CheckAMenuItem(int wIDCheckItem, bool val) override;
+	void EnableAMenuItem(int wIDCheckItem, bool val) override;
+	void CheckMenusClipboard() override;
+	void CheckMenus() override;
+	static void PopUpCmd(GtkMenuItem *menuItem, SciTEGTK *scitew);
+	void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+	void ExecuteNext();
+	void ResetExecution();
+
+	void OpenUriList(const char *list) override;
+	bool OpenDialog(const FilePath &directory, const char *filesFilter) override;
+	bool HandleSaveAs(const char *savePath);
+	bool SaveAsXXX(FileFormat fmt, const char *title, const char *ext=0);
+	bool SaveAsDialog() override;
+	void SaveACopy() override;
+	void SaveAsHTML() override;
+	void SaveAsRTF() override;
+	void SaveAsPDF() override;
+	void SaveAsTEX() override;
+	void SaveAsXML() override;
+	void LoadSessionDialog() override;
+	void SaveSessionDialog() override;
+
+	void SetupFormat(Sci_RangeToFormat &frPrint, GtkPrintContext *context);
+	void BeginPrintThis(GtkPrintOperation *operation, GtkPrintContext *context);
+	static void BeginPrint(GtkPrintOperation *operation, GtkPrintContext *context, SciTEGTK *scitew);
+	void DrawPageThis(GtkPrintOperation *operation, GtkPrintContext *context, gint page_nr);
+	static void DrawPage(GtkPrintOperation *operation, GtkPrintContext *context, gint page_nr, SciTEGTK *scitew);
+	void Print(bool) override;
+	void PrintSetup() override;
+
+	std::string GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span span) override;
+
+	MessageBoxChoice WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, int style = mbsIconWarning) override;
+	void FindMessageBox(const std::string &msg, const std::string *findItem=0) override;
+	void AboutDialog() override;
+	void QuitProgram() override;
+
+	std::string EncodeString(const std::string &s) override;
+	void FindReplaceGrabFields();
+	void Find() override;
+	void UIClosed() override;
+	void UIHasFocus() override;
+	GtkWidget *TranslatedLabel(const char *original);
+	void FindIncrement() override;
+	void FindInFilesResponse(int responseID);
+	void FindInFiles() override;
+	void Replace() override;
+	void FindReplaceResponse(int responseID);
+	void FindReplace(bool replace) override;
+	void DestroyFindReplace() override;
+	void GoLineDialog() override;
+	bool AbbrevDialog() override;
+	void TabSizeDialog() override;
+	bool ParametersDialog(bool modal) override;
+
+	FilePath GetDefaultDirectory() override;
+	FilePath GetSciteDefaultHome() override;
+	FilePath GetSciteUserHome() override;
+
+	void SetStatusBarText(const char *s) override;
+	void TabInsert(int index, const GUI::gui_char *title) override;
+	void TabSelect(int index) override;
+	void RemoveAllTabs() override;
+	void SetFileProperties(PropSetFile &ps) override;
+	void UpdateStatusBar(bool bUpdateSlowData) override;
+
+	void Notify(SCNotification *notification) override;
+	void ShowToolBar() override;
+	void ShowTabBar() override;
+	void ShowStatusBar() override;
+	void ActivateWindow(const char *timestamp) override;
+	void CopyPath() override;
+	bool &FlagFromCmd(int cmd);
+	void Command(unsigned long wParam, long lParam = 0);
+	void ContinueExecute(int fromPoll);
+
+	void UserStripShow(const char *description) override;
+	void UserStripSet(int control, const char *value) override;
+	void UserStripSetList(int control, const char *value) override;
+	std::string UserStripValue(int control) override;
+	void UserStripClosed();
+	void ShowBackgroundProgress(const GUI::gui_string &explanation, size_t size, size_t progress) override;
+
+	// Single instance
+	void SendFileName(int sendPipe, const char* filename);
+	bool CheckForRunningInstance(int argc, char* argv[]);
+
+	// GTK Signal Handlers
+
+	void FindInFilesCmd();
+	void FindInFilesDotDot();
+	void FindInFilesBrowse();
+
+	void GotoCmd();
+	void GotoResponse(int responseID);
+
+	void AbbrevCmd();
+	void AbbrevResponse(int responseID);
+
+	void TabSizeSet(int &tabSize, bool &useTabs);
+	void TabSizeCmd();
+	void TabSizeConvertCmd();
+	void TabSizeResponse(int responseID);
+	void FindIncrementSetColour(bool valid);
+	void FindIncrementNext(bool select);
+	void FindIncrementChanged();
+	void FindIncrementCompleteCmd();
+	static gboolean FindIncrementFocusOutSignal(GtkWidget *w);
+	static gboolean FindIncrementEscapeSignal(GtkWidget *w, GdkEventKey *event, SciTEGTK *scitew);
+
+	void FRFindCmd();
+	void FRReplaceCmd();
+	void FRReplaceAllCmd();
+	void FRReplaceInSelectionCmd();
+	void FRReplaceInBuffersCmd();
+	void FRMarkAllCmd();
+	void FillCombos(FindDialog &dlg);
+	void FillCombosForGrep();
+
+	bool ParametersOpen() override;
+	void ParamGrab() override;
+	void ParamCancelCmd();
+	void ParamCmd();
+	void ParamResponse(int responseID);
+
+	static void PanePositionChanged(GObject *object, GParamSpec *pspec, SciTEGTK *scitew);
+	static gint PaneButtonRelease(GtkWidget *widget, GdkEvent *event, SciTEGTK *scitew);
+
+	static gboolean IOSignal(GIOChannel *source, GIOCondition condition, SciTEGTK *scitew);
+	static gint QuitSignal(GtkWidget *w, GdkEventAny *e, SciTEGTK *scitew);
+	static void ButtonSignal(GtkWidget *widget, gpointer data);
+	static void MenuSignal(GtkMenuItem *menuitem, SciTEGTK *scitew);
+	static void NotifySignal(GtkWidget *w, gint wParam, SCNotification *notification, SciTEGTK *scitew);
+	static gint KeyPress(GtkWidget *widget, GdkEventKey *event, SciTEGTK *scitew);
+	static gint KeyRelease(GtkWidget *widget, GdkEventKey *event, SciTEGTK *scitew);
+	gint Key(GdkEventKey *event);
+	static gint MousePress(GtkWidget *widget, GdkEventButton *event, SciTEGTK *scitew);
+	gint Mouse(GdkEventButton *event);
+
+	static void DragDataReceived(GtkWidget *widget, GdkDragContext *context,
+	                             gint x, gint y, GtkSelectionData *selectionData, guint info, guint time, SciTEGTK *scitew);
+
+	gint TabBarRelease(GtkNotebook *notebook, GdkEventButton *event);
+	gint TabBarScroll(GdkEventScroll *event);
+	static gint TabBarReleaseSignal(GtkNotebook *notebook, GdkEventButton *event, SciTEGTK *scitew) {
+		return scitew->TabBarRelease(notebook, event);
+	}
+	static gint TabBarScrollSignal(GtkNotebook *, GdkEventScroll *event, SciTEGTK *scitew) {
+		return scitew->TabBarScroll(event);
+	}
+
+	SystemAppearance CurrentAppearance() const noexcept override;
+	static void ThemeSignal(GObject *, GParamSpec *, SciTEGTK *scitew) {
+		scitew->CheckAppearanceChanged();
+	}
+
+public:
+
+	// TODO: get rid of this - use callback argument to find SciTEGTK
+	static SciTEGTK *instance;
+
+	explicit SciTEGTK(Extension *ext = 0);
+	~SciTEGTK() override;
+
+	void WarnUser(int warnID) override;
+	GtkWidget *AddToolButton(const char *text, int cmd, GtkWidget *toolbar_icon);
+	void AddToolBar();
+	std::string TranslatePath(const char *path);
+	void CreateTranslatedMenu(int n, const SciTEItemFactoryEntry items[],
+	                          int nRepeats = 0, const char *prefix = 0, int startNum = 0,
+	                          int startID = 0, const char *radioStart = 0);
+	void CreateMenu();
+	void CreateStrips(GtkWidget *boxMain);
+	bool StripHasFocus() const;
+	void CreateUI();
+	void LayoutUI();
+	void Run(int argc, char *argv[]);
+	void Execute() override;
+	void StopExecute() override;
+	static int PollTool(SciTEGTK *scitew);
+	static void ReapChild(GPid, gint, gpointer);
+	void PostOnMainThread(int cmd, Worker *pWorker) override;
+	static gboolean PostCallback(void *ptr);
+	// Single instance
+	void SetStartupTime(const char *timestamp);
+};
+
+SciTEGTK *SciTEGTK::instance;
+
+SciTEGTK::SciTEGTK(Extension *ext) : SciTEBase(ext) {
+	toolbarDetachable = 0;
+	menuSource = 0;
+	// Control of sub process
+	icmd = 0;
+	originalEnd = 0;
+	fdFIFO = 0;
+	pidShell = 0;
+	triedKill = false;
+	exitStatus = 0;
+	pollID = 0;
+	inputHandle = 0;
+	inputChannel = 0;
+	lastFlags = 0;
+
+	startupTimestamp = 0;
+
+	timerID = 0;
+
+	PropSetFile::SetCaseSensitiveFilenames(true);
+	propsPlatform.Set("PLAT_GTK", "1");
+	propsPlatform.Set("PLAT_UNIX", "1");
+
+	ReadEnvironment();
+
+	pathAbbreviations = GetAbbrevPropertiesFileName();
+
+	settings = gtk_settings_get_default();
+	appearance = CurrentAppearance();
+	g_signal_connect(settings, "notify::gtk-theme-name", G_CALLBACK(ThemeSignal), this);
+
+	ReadGlobalPropFile();
+	ReadAbbrevPropFile();
+
+	saveFormat = sfSource;
+	wIncrementPanel = 0;
+	IncSearchEntry = 0;
+	IncSearchBtnNext = 0;
+	btnCompile = 0;
+	btnBuild = 0;
+	btnStop = 0;
+	menuBar = 0;
+	accelGroup = 0;
+
+	splitPane = 0;
+	heightBar = 0;
+
+	fileSelectorWidth = 580;
+	fileSelectorHeight = 480;
+
+	printSettings = NULL;
+	pageSetup = NULL;
+
+	// Fullscreen handling
+	fullScreen = false;
+
+	instance = this;
+}
+
+SciTEGTK::~SciTEGTK() {
+	g_object_unref(settings);
+}
+
+static void destroyDialog(GtkWidget *, gpointer *window) {
+	if (window) {
+		GUI::Window *pwin = reinterpret_cast<GUI::Window *>(window);
+		*(pwin) = 0;
+	}
+}
+
+static void destroyDialogFindReplace(GtkWidget *, gpointer *window) {
+	if (window) {
+		DialogFindReplace *dlg = reinterpret_cast<DialogFindReplace *>(window);
+		*((GUI::Window *)dlg) = 0;
+	}
+}
+
+void SciTEGTK::WarnUser(int) {}
+
+static GtkWidget *messageBoxDialog = 0;
+static int messageBoxResult = 0;
+
+static gint messageBoxKey(GtkWidget *w, GdkEventKey *event, gpointer p) {
+	if (event->keyval == GKEY_Escape) {
+		g_signal_stop_emission_by_name(G_OBJECT(w), "key_press_event");
+		gtk_widget_destroy(GTK_WIDGET(w));
+		messageBoxDialog = 0;
+		messageBoxResult = GPOINTER_TO_INT(p);
+	}
+	return FALSE;
+}
+
+static void messageBoxDestroy(GtkWidget *, gpointer *) {
+	messageBoxDialog = 0;
+	messageBoxResult = 0;
+}
+
+static void messageBoxOK(GtkWidget *, gpointer p) {
+	gtk_widget_destroy(GTK_WIDGET(messageBoxDialog));
+	messageBoxDialog = 0;
+	messageBoxResult = GPOINTER_TO_INT(p);
+}
+
+GtkWidget *SciTEGTK::AddMBButton(GtkWidget *dialog, const char *label,
+	int val, GtkAccelGroup *accel_group, bool isDefault) {
+	GUI::gui_string translated = localiser.Text(label);
+#if GTK_CHECK_VERSION(3,14,0)
+	GtkWidget *button = gtk_dialog_add_button(GTK_DIALOG(dialog), translated.c_str(), val);
+#else
+	GtkWidget *button = gtk_button_new_with_mnemonic(translated.c_str());
+#endif
+	gtk_widget_set_can_default(button, TRUE);
+	size_t posMnemonic = translated.find('_');
+	if (posMnemonic != GUI::gui_string::npos) {
+		// With a "Yes" button want to respond to pressing "y" as well as standard "Alt+y"
+		guint key = MakeLowerCase(translated[posMnemonic + 1]);
+		gtk_widget_add_accelerator(button, "clicked", accel_group,
+	                           key, GdkModifierType(0), (GtkAccelFlags)0);
+	}
+	g_signal_connect(G_OBJECT(button), "clicked",
+		G_CALLBACK(messageBoxOK), GINT_TO_POINTER(val));
+#if GTK_CHECK_VERSION(3,0,0)
+#if !GTK_CHECK_VERSION(3,14,0)
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))),
+ 	                   button, TRUE, TRUE, 0);
+#endif
+#else
+	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+ 	                   button, TRUE, TRUE, 0);
+#endif
+	if (isDefault) {
+		gtk_widget_grab_default(GTK_WIDGET(button));
+	}
+	gtk_widget_show(button);
+	return button;
+}
+
+FilePath executableDirectory;
+
+FilePath SciTEGTK::GetDefaultDirectory() {
+	const char *where = getenv("SciTE_HOME");
+#ifdef SYSCONF_PATH
+	if (!where) {
+		where = SYSCONF_PATH;
+	}
+#else
+	if (!where) {
+		where = getenv("HOME");
+	}
+#endif
+	if (where) {
+		return FilePath(where);
+	}
+
+	return FilePath("");
+}
+
+FilePath SciTEGTK::GetSciteDefaultHome() {
+	const char *where = getenv("SciTE_HOME");
+#ifdef SYSCONF_PATH
+	if (!where) {
+		where = SYSCONF_PATH;
+	}
+#else
+	if (!where) {
+		where = getenv("HOME");
+	}
+#endif
+	if (where) {
+		return FilePath(where);
+
+	}
+	return FilePath("");
+}
+
+FilePath SciTEGTK::GetSciteUserHome() {
+	// First looking for environment variable $SciTE_USERHOME
+	// to set SciteUserHome. If not present we look for $SciTE_HOME
+	// then defaulting to $HOME
+	char *where = getenv("SciTE_USERHOME");
+	if (!where) {
+		where = getenv("SciTE_HOME");
+		if (!where) {
+			where = getenv("HOME");
+		}
+	}
+
+	return FilePath(where);
+}
+
+void SciTEGTK::SetStatusBarText(const char *s) {
+	gtk_statusbar_pop(GTK_STATUSBAR(PWidget(wStatusBar)), sbContextID);
+	gtk_statusbar_push(GTK_STATUSBAR(PWidget(wStatusBar)), sbContextID, s);
+}
+
+void SciTEGTK::TabInsert(int index, const GUI::gui_char *title) {
+	if (wTabBar.GetID()) {
+		GtkWidget *tablabel = gtk_label_new(title);
+		GtkWidget *tabcontent;
+		if (props.GetInt("pathbar.visible")) {
+			const FilePath &fp = buffers.buffers[index].file;
+			if (fp.IsUntitled())
+				tabcontent = gtk_label_new(localiser.Text("Untitled").c_str());
+			else
+				tabcontent = gtk_label_new(fp.AsInternal());
+		} else {
+			// No path bar
+			tabcontent = gtk_image_new();
+			gtk_image_set_pixel_size(GTK_IMAGE(tabcontent), 0);
+		}
+
+		gtk_widget_show(tablabel);
+		gtk_widget_show(tabcontent);
+
+		gtk_notebook_append_page(GTK_NOTEBOOK(wTabBar.GetID()), tabcontent, tablabel);
+	}
+}
+
+void SciTEGTK::TabSelect(int index) {
+	if (wTabBar.GetID())
+		gtk_notebook_set_current_page(GTK_NOTEBOOK(wTabBar.GetID()), index);
+}
+
+void SciTEGTK::RemoveAllTabs() {
+	if (wTabBar.GetID()) {
+		while (gtk_notebook_get_nth_page(GTK_NOTEBOOK(wTabBar.GetID()), 0))
+			gtk_notebook_remove_page(GTK_NOTEBOOK(wTabBar.GetID()), 0);
+	}
+}
+
+void SciTEGTK::SetFileProperties(PropSetFile &ps) {
+	char timeBuffer[200];
+
+	time_t timeNow = time(NULL);
+
+	strftime(timeBuffer, sizeof(timeBuffer), "%x", localtime(&timeNow));
+	ps.Set("CurrentDate", timeBuffer);
+	strftime(timeBuffer, sizeof(timeBuffer), "%X", localtime(&timeNow));
+	ps.Set("CurrentTime", timeBuffer);
+
+	time_t timeFileModified = filePath.ModifiedTime();
+	strftime(timeBuffer, sizeof(timeBuffer), "%x", localtime(&timeFileModified));
+	ps.Set("FileDate", timeBuffer);
+	strftime(timeBuffer, sizeof(timeBuffer), "%X", localtime(&timeFileModified));
+	ps.Set("FileTime", timeBuffer);
+
+	std::string fa;
+	if (access(filePath.AsInternal(), W_OK)) {
+		fa += "R";
+	}
+	if (filePath.AsInternal()[0] == '.') {
+		fa += "H";
+	}
+	ps.Set("FileAttr", fa.c_str());
+}
+
+void SciTEGTK::UpdateStatusBar(bool bUpdateSlowData) {
+	SciTEBase::UpdateStatusBar(bUpdateSlowData);
+}
+
+void SciTEGTK::Notify(SCNotification *notification) {
+	if (notification->nmhdr.idFrom == IDM_SRCWIN) {
+		if (notification->nmhdr.code == SCN_FOCUSIN)
+			Activate(true);
+		else if (notification->nmhdr.code == SCN_FOCUSOUT)
+			Activate(false);
+	}
+
+	SciTEBase::Notify(notification);
+}
+
+void SciTEGTK::ShowToolBar() {
+	if (gtk_toolbar_get_n_items(GTK_TOOLBAR(PWidget(wToolBar))) < 1) {
+		AddToolBar();
+	}
+
+	if (tbVisible) {
+		if (toolbarDetachable == 1) {
+			gtk_widget_show(GTK_WIDGET(PWidget(wToolBarBox)));
+		} else {
+			gtk_widget_show(GTK_WIDGET(PWidget(wToolBar)));
+		}
+	} else {
+		if (toolbarDetachable == 1) {
+			gtk_widget_hide(GTK_WIDGET(PWidget(wToolBarBox)));
+		} else {
+			gtk_widget_hide(GTK_WIDGET(PWidget(wToolBar)));
+		}
+	}
+}
+
+void SciTEGTK::ShowTabBar() {
+	if (tabVisible && (!tabHideOne || buffers.length > 1) && buffers.size()>1) {
+		gtk_widget_show(GTK_WIDGET(PWidget(wTabBar)));
+	} else {
+		gtk_widget_hide(GTK_WIDGET(PWidget(wTabBar)));
+	}
+}
+
+void SciTEGTK::ShowStatusBar() {
+	if (sbVisible) {
+		gtk_widget_show(GTK_WIDGET(PWidget(wStatusBar)));
+	} else {
+		gtk_widget_hide(GTK_WIDGET(PWidget(wStatusBar)));
+	}
+}
+
+void SciTEGTK::ActivateWindow(const char *timestamp) {
+	char *end;
+	// Reset errno so we can reliably test it
+	errno = 0;
+	gulong ts = strtoul(timestamp, &end, 0);
+	if (end != timestamp && errno == 0) {
+		gtk_window_present_with_time(GTK_WINDOW(PWidget(wSciTE)), ts);
+	} else {
+		gtk_window_present(GTK_WINDOW(PWidget(wSciTE)));
+	}
+}
+
+void SciTEGTK::CopyPath() {
+	gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+		filePath.AsInternal(), -1);
+}
+
+// The find and replace dialogs and strips often manipulate boolean
+// flags based on dialog control IDs and menu IDs.
+bool &SciTEGTK::FlagFromCmd(int cmd) {
+	static bool notFound;
+	switch (cmd) {
+		case IDWHOLEWORD:
+		case IDM_WHOLEWORD:
+			return wholeWord;
+		case IDMATCHCASE:
+		case IDM_MATCHCASE:
+			return matchCase;
+		case IDREGEXP:
+		case IDM_REGEXP:
+			return regExp;
+		case IDUNSLASH:
+		case IDM_UNSLASH:
+			return unSlash;
+		case IDWRAP:
+		case IDM_WRAPAROUND:
+			return wrapFind;
+		case IDDIRECTIONUP:
+		case IDM_DIRECTIONUP:
+			return reverseFind;
+	}
+	return notFound;
+}
+
+void SciTEGTK::Command(unsigned long wParam, long) {
+	int cmdID = ControlIDOfCommand(wParam);
+	switch (cmdID) {
+
+	case IDM_FULLSCREEN:
+		fullScreen = !fullScreen;
+		{
+			GdkWindow *parent_w = WindowFromWidget(PWidget(wSciTE));
+			if (fullScreen)
+				gdk_window_fullscreen(parent_w);
+			else
+				gdk_window_unfullscreen(parent_w);
+		}
+		SizeSubWindows();
+		CheckMenus();
+		break;
+
+	// override base class
+	case IDM_SPLITVERTICAL:
+		splitVertical = !splitVertical;
+		heightBar = 0;
+		LayoutUI();
+		CheckMenus();
+		break;
+
+	default:
+		SciTEBase::MenuCommand(cmdID, menuSource);
+		menuSource = 0;
+	}
+	// Changes to document produce SCN_UPDATEUI which updates the status
+	// bar but not too frequently.
+	UpdateStatusBar(true);
+}
+
+void SciTEGTK::ReadLocalization() {
+	SciTEBase::ReadLocalization();
+	std::string encoding = localiser.GetString("translation.encoding");
+	if (encoding.length()) {
+		GIConv iconvh = g_iconv_open("UTF-8", encoding.c_str());
+		const char *key = NULL;
+		const char *val = NULL;
+		// Get encoding
+		bool more = localiser.GetFirst(key, val);
+		while (more) {
+			char converted[1000];
+			converted[0] = '\0';
+			// g_iconv does not actually write to its input argument so safe to cast away const
+			char *pin = const_cast<char *>(val);
+			gsize inLeft = strlen(val);
+			char *pout = converted;
+			gsize outLeft = sizeof(converted);
+			gsize conversions = g_iconv(iconvh, &pin, &inLeft, &pout, &outLeft);
+			if (conversions != ((gsize)(-1))) {
+				*pout = '\0';
+				localiser.Set(key, converted);
+			}
+			more = localiser.GetNext(key, val);
+		}
+		g_iconv_close(iconvh);
+	}
+}
+
+void SciTEGTK::ReadPropertiesInitial() {
+	SciTEBase::ReadPropertiesInitial();
+	ShowToolBar();
+	ShowTabBar();
+	ShowStatusBar();
+}
+
+void SciTEGTK::ReadProperties() {
+	SciTEBase::ReadProperties();
+
+	CallChildren(SA::Message::SetRectangularSelectionModifier,
+		props.GetInt("rectangular.selection.modifier", SCMOD_ALT));
+
+	CheckMenus();
+
+	// Need this here to handle tabbar.hide.one properly
+	ShowTabBar();
+}
+
+gboolean SciTEGTK::TimerTick(gpointer pSciTE) {
+	SciTEGTK *scitew = static_cast<SciTEGTK *>(pSciTE);
+	scitew->OnTimer();
+	return TRUE;
+}
+
+void SciTEGTK::TimerStart(int mask) {
+	int maskNew = timerMask | mask;
+	if (timerMask != maskNew) {
+		if (timerMask == 0) {
+			// Create a 1 second ticker
+			timerID = g_timeout_add(1000, TimerTick, this);
+		}
+		timerMask = maskNew;
+	}
+}
+
+void SciTEGTK::TimerEnd(int mask) {
+	int maskNew = timerMask & ~mask;
+	if (timerMask != maskNew) {
+		if (maskNew == 0) {
+			g_source_remove(timerID);
+			timerID = 0;
+		}
+		timerMask = maskNew;
+	}
+}
+
+gboolean SciTEGTK::IdlerTick(gpointer pSciTE) {
+	SciTEGTK *scitew = static_cast<SciTEGTK *>(pSciTE);
+	scitew->OnIdle();
+	return TRUE;
+}
+
+void SciTEGTK::SetIdler(bool on) {
+	if (needIdle != on) {
+		needIdle = on;
+		if (needIdle) {
+			idlerID = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+					IdlerTick, this, NULL);
+		} else {
+			if (idlerID) {
+				g_source_remove(idlerID);
+			}
+		}
+	}
+}
+
+void SciTEGTK::GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) {
+	gtk_window_get_position(GTK_WINDOW(PWidget(wSciTE)), left, top);
+	gtk_window_get_size(GTK_WINDOW(PWidget(wSciTE)), width, height);
+	*maximize = (gdk_window_get_state(WindowFromWidget(PWidget(wSciTE))) & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+}
+
+void SciTEGTK::SizeContentWindows() {
+	gint max;
+	g_object_get(G_OBJECT(splitPane), "max-position", &max, NULL);
+
+	// This probably means the window hasn't been rendered yet
+	if (max == 0)
+		return;
+
+	// Since SciTEBase::NormaliseSplit() doesn't use the actual Paned maximum
+	// position, it may return an invalid heightOutput...
+	if (heightOutput > max)
+		heightOutput = max;
+
+	gtk_paned_set_position(GTK_PANED(splitPane), max - heightOutput);
+
+	// Make sure the focus is somewhere
+	if (!userStrip.VisibleHasFocus()) {
+		if (heightOutput == max) {
+			WindowSetFocus(wOutput);
+		} else if (heightOutput == 0 || (!wEditor.HasFocus() && !wOutput.HasFocus())) {
+			WindowSetFocus(wEditor);
+		}
+	}
+}
+
+void SciTEGTK::SizeSubWindows() {
+	SizeContentWindows();
+}
+
+// Find the menu item with a particular ID so that it can be enable, disabled, set or hidden.
+GtkWidget *SciTEGTK::MenuItemFromAction(int itemID) {
+	std::map<int, GtkWidget *>::iterator it;
+	it = mapMenuItemFromId.find(itemID);
+	if (it == mapMenuItemFromId.end())
+		return 0;
+	else
+		return it->second;
+}
+
+static std::string GtkFromWinCaption(const char *text) {
+	std::string sCaption(text);
+	// Escape underlines
+	Substitute(sCaption, "_", "__");
+	// Replace Windows-style ampersands with GTK underlines
+	size_t posFound = sCaption.find("&");
+	while (posFound != std::string::npos) {
+		std::string nextChar = sCaption.substr(posFound + 1, 1);
+		if (nextChar == "&") {
+			// Escaped, move on
+			posFound += 2;
+		} else {
+			sCaption.erase(posFound, 1);
+			sCaption.insert(posFound, "_", 1);
+			posFound += 1;
+		}
+		posFound = sCaption.find("&", posFound);
+	}
+	// Unescape ampersands
+	Substitute(sCaption, "&&", "&");
+	return sCaption;
+}
+
+void SciTEGTK::SetMenuItem(int, int, int itemID, const char *text, const char *mnemonic) {
+	DestroyMenuItem(0, itemID);
+
+	// On GTK the menuNumber and position are ignored as the menu item already exists and is in the right
+	// place so only needs to be shown and have its text set.
+
+	std::string itemText = GtkFromWinCaption(text);
+
+	long keycode = 0;
+	if (mnemonic && *mnemonic) {
+		keycode = SciTEKeys::ParseKeyCode(mnemonic);
+		if (keycode) {
+			itemText += " ";
+			itemText += mnemonic;
+		}
+		// the keycode could be used to make a custom accelerator table
+		// but for now, the menu's item data is used instead for command
+		// tools, and for other menu entries it is just discarded.
+	}
+
+	// Reorder shift and ctrl indicators for compatibility with other menus
+	Substitute(itemText, "Ctrl+Shift+", "Shift+Ctrl+");
+
+	GtkWidget *item = MenuItemFromAction(itemID);
+	if (item) {
+		GList *al = gtk_container_get_children(GTK_CONTAINER(item));
+		for (unsigned int ii = 0; ii < g_list_length(al); ii++) {
+			gpointer d = g_list_nth(al, ii);
+			GtkWidget **w = (GtkWidget **)d;
+			gtk_label_set_text_with_mnemonic(GTK_LABEL(*w), itemText.c_str());
+		}
+		g_list_free(al);
+		gtk_widget_show(item);
+
+		if (itemID >= IDM_TOOLS && itemID < IDM_TOOLS + toolMax) {
+			// Stow the keycode for later retrieval.
+			// Do this even if 0, in case the menu already existed (e.g. ModifyMenu)
+			g_object_set_data(G_OBJECT(item), "key", GINT_TO_POINTER(static_cast<int>(keycode)));
+		}
+	}
+}
+
+void SciTEGTK::DestroyMenuItem(int, int itemID) {
+	// On GTK menu items are just hidden rather than destroyed as they can not be recreated in the middle of a menu
+	// The menuNumber is ignored as all menu items in GTK can be found from the root of the menu tree
+
+	if (itemID) {
+		GtkWidget *item = MenuItemFromAction(itemID);
+
+		if (item) {
+			gtk_widget_hide(item);
+			g_object_set_data(G_OBJECT(item), "key", 0);
+		}
+	}
+}
+
+void SciTEGTK::CheckAMenuItem(int wIDCheckItem, bool val) {
+	GtkWidget *item = MenuItemFromAction(wIDCheckItem);
+	allowMenuActions = false;
+	if (item)
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), val ? TRUE : FALSE);
+	allowMenuActions = true;
+}
+
+void SciTEGTK::EnableAMenuItem(int wIDCheckItem, bool val) {
+	GtkWidget *item = MenuItemFromAction(wIDCheckItem);
+	if (item) {
+		if (GTK_IS_WIDGET(item))
+			gtk_widget_set_sensitive(item, val);
+
+	}
+}
+
+void SciTEGTK::CheckMenusClipboard() {
+	if (StripHasFocus()) {
+		EnableAMenuItem(IDM_CUT, false);
+		EnableAMenuItem(IDM_COPY, false);
+		EnableAMenuItem(IDM_CLEAR, false);
+		EnableAMenuItem(IDM_PASTE, false);
+		EnableAMenuItem(IDM_SELECTALL, false);
+	} else {
+		SciTEBase::CheckMenusClipboard();
+	}
+}
+
+void SciTEGTK::CheckMenus() {
+	SciTEBase::CheckMenus();
+
+	CheckAMenuItem(IDM_EOL_CRLF, wEditor.EOLMode() == SA::EndOfLine::CrLf);
+	CheckAMenuItem(IDM_EOL_CR, wEditor.EOLMode() == SA::EndOfLine::Cr);
+	CheckAMenuItem(IDM_EOL_LF, wEditor.EOLMode() == SA::EndOfLine::Lf);
+
+	CheckAMenuItem(IDM_ENCODING_DEFAULT, CurrentBuffer()->unicodeMode == uni8Bit);
+	CheckAMenuItem(IDM_ENCODING_UCS2BE, CurrentBuffer()->unicodeMode == uni16BE);
+	CheckAMenuItem(IDM_ENCODING_UCS2LE, CurrentBuffer()->unicodeMode == uni16LE);
+	CheckAMenuItem(IDM_ENCODING_UTF8, CurrentBuffer()->unicodeMode == uniUTF8);
+	CheckAMenuItem(IDM_ENCODING_UCOOKIE, CurrentBuffer()->unicodeMode == uniCookie);
+
+	CheckAMenuItem(IDM_VIEWSTATUSBAR, sbVisible);
+	CheckAMenuItem(IDM_VIEWTABBAR, tabVisible);
+
+	EnableAMenuItem(IDM_FINDINFILES, !jobQueue.IsExecuting());
+
+	if (btnBuild) {
+		gtk_widget_set_sensitive(btnBuild, !jobQueue.IsExecuting());
+		gtk_widget_set_sensitive(btnCompile, !jobQueue.IsExecuting());
+		gtk_widget_set_sensitive(btnStop, jobQueue.IsExecuting());
+	}
+}
+
+/**
+ * Replace any %xx escapes by their single-character equivalent.
+ */
+static void unquote(char *s) {
+	char *o = s;
+	while (*s) {
+		if ((*s == '%') && s[1] && s[2]) {
+			*o = IntFromHexDigit(s[1]) * 16 + IntFromHexDigit(s[2]);
+			s += 2;
+		} else {
+			*o = *s;
+		}
+		o++;
+		s++;
+	}
+	*o = '\0';
+}
+
+/**
+ * Open a list of URIs each terminated by "\r\n".
+ * Only "file:" URIs currently understood.
+ * In KDE 4, the last URI is not terminated by "\r\n"!
+ */
+void SciTEGTK::OpenUriList(const char *list) {
+	if (list && *list) {
+		std::vector<char> uriList(list, list+strlen(list) + 1);
+		char *uri = &uriList[0];
+		if (uri) {
+			char *lastenduri = uri + strlen(uri);
+			while (uri < lastenduri) {
+				char *enduri = strchr(uri, '\r');
+				if (enduri == NULL)
+					enduri = lastenduri;	// if last URI has no "\r\n".
+				*enduri = '\0';
+				if (isprefix(uri, "file:")) {
+					uri += strlen("file:");
+					if (isprefix(uri, "///")) {
+						uri += 2;	// There can be an optional // before the file path that starts with /
+					}
+
+					unquote(uri);
+					Open(uri);
+				} else {
+					GUI::gui_string msg = LocaliseMessage("URI '^0' not understood.", uri);
+					WindowMessageBox(wSciTE, msg);
+				}
+
+				uri = enduri + 1;
+				if (*uri == '\n')
+					uri++;
+			}
+		}
+	}
+}
+
+#if GTK_CHECK_VERSION(3,10,0)
+#define SCITE_STOCK_CANCEL "_Cancel"
+#define SCITE_STOCK_OPEN "_Open"
+#define SCITE_STOCK_SAVE "_Save"
+#define SCITE_STOCK_OK "_OK"
+#else
+#define SCITE_STOCK_CANCEL GTK_STOCK_CANCEL
+#define SCITE_STOCK_OPEN GTK_STOCK_OPEN
+#define SCITE_STOCK_SAVE GTK_STOCK_SAVE
+#define SCITE_STOCK_OK GTK_STOCK_OK
+#endif
+
+bool SciTEGTK::OpenDialog(const FilePath &directory, const char *filesFilter) {
+	bool canceled = true;
+	if (!dlgFileSelector.Created()) {
+		GtkWidget *dlg = gtk_file_chooser_dialog_new(
+					localiser.Text("Open File").c_str(),
+				      GTK_WINDOW(wSciTE.GetID()),
+				      GTK_FILE_CHOOSER_ACTION_OPEN,
+				      SCITE_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				      SCITE_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+				      NULL);
+		gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), TRUE);
+		gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), directory.AsInternal());
+
+		std::string openFilter = filesFilter;
+		if (openFilter.length()) {
+			std::replace(openFilter.begin(), openFilter.end(), '|', '\0');
+			size_t start = 0;
+			while (start < openFilter.length()) {
+				const char *filterName = openFilter.c_str() + start;
+				GUI::gui_string localised = localiser.Text(filterName, false);
+				if (localised.length()) {
+					openFilter.erase(start, strlen(filterName));
+					openFilter.insert(start, localised.c_str());
+				}
+				if (openFilter.c_str()[start] == '#') {
+					start += strlen(openFilter.c_str() + start) + 1;
+				} else {
+					GtkFileFilter *fileFilter = gtk_file_filter_new();
+					gtk_file_filter_set_name(fileFilter, openFilter.c_str() + start);
+					start += strlen(openFilter.c_str() + start) + 1;
+					std::string oneSet(openFilter.c_str() + start);
+					std::replace(oneSet.begin(), oneSet.end(), ';', '\0');
+					size_t item = 0;
+					while (item < oneSet.length()) {
+						gtk_file_filter_add_pattern(fileFilter, oneSet.c_str() + item);
+						item += strlen(oneSet.c_str() + item) + 1;
+					}
+					gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), fileFilter);
+				}
+				start += strlen(openFilter.c_str() + start) + 1;
+			}
+		}
+
+		gtk_window_set_default_size(GTK_WINDOW(dlg), fileSelectorWidth, fileSelectorHeight);
+		if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+			GSList *names = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dlg));
+			GSList *nameCurrent = names;
+			while (nameCurrent) {
+				char *filename = static_cast<char *>(nameCurrent->data);
+				Open(filename);
+				g_free(filename);
+				nameCurrent = g_slist_next(nameCurrent);
+			}
+			g_slist_free(names);
+			canceled = false;
+		}
+		gtk_widget_destroy(dlg);
+	}
+	return !canceled;
+}
+
+bool SciTEGTK::HandleSaveAs(const char *savePath) {
+	switch (saveFormat) {
+	case sfCopy:
+		SaveBuffer(savePath, sfNone);
+		break;
+	case sfHTML:
+		SaveToHTML(savePath);
+		break;
+	case sfRTF:
+		SaveToRTF(savePath);
+		break;
+	case sfPDF:
+		SaveToPDF(savePath);
+		break;
+	case sfTEX:
+		SaveToTEX(savePath);
+		break;
+	case sfXML:
+		SaveToXML(savePath);
+		break;
+	default: {
+			/* Checking that no other buffer refers to the same filename */
+			FilePath destFile(savePath);
+			return SaveIfNotOpen(destFile, true);
+		}
+	}
+	dlgFileSelector.Destroy();
+	return true;
+}
+
+bool SciTEGTK::SaveAsXXX(FileFormat fmt, const char *title, const char *ext) {
+	bool saved = false;
+	saveFormat = fmt;
+	if (!dlgFileSelector.Created()) {
+		GtkWidget *dlg = gtk_file_chooser_dialog_new(
+					localiser.Text(title).c_str(),
+				      GTK_WINDOW(wSciTE.GetID()),
+				      GTK_FILE_CHOOSER_ACTION_SAVE,
+				      SCITE_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				      SCITE_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+				      NULL);
+		gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
+		FilePath savePath = SaveName(ext);
+		if (ext) {
+			GtkFileFilter *filter = gtk_file_filter_new();
+			gtk_file_filter_set_name(filter, ext+1);
+			std::string filterSTR = "*";
+			filterSTR += ext;
+			gtk_file_filter_add_pattern(filter, filterSTR.c_str());
+			gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), filter);
+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), savePath.Directory().AsInternal());
+			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dlg), savePath.Name().AsInternal());
+		} else if (savePath.IsUntitled()) { // saving 'untitled'
+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), savePath.Directory().AsInternal());
+		} else {
+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), filePath.Directory().AsInternal());
+			gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dlg), savePath.Name().AsInternal());
+		}
+		gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
+
+		if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+			char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg));
+			gtk_widget_destroy(dlg);
+			saved = HandleSaveAs(filename);
+			g_free(filename);
+		} else {
+			gtk_widget_destroy(dlg);
+		}
+	}
+	return saved;
+}
+
+bool SciTEGTK::SaveAsDialog() {
+	return SaveAsXXX(sfSource, "Save File As");
+}
+
+void SciTEGTK::SaveACopy() {
+	SaveAsXXX(sfCopy, "Save a Copy");
+}
+
+void SciTEGTK::SaveAsHTML() {
+	SaveAsXXX(sfHTML, "Export File As HTML", ".html");
+}
+
+void SciTEGTK::SaveAsRTF() {
+	SaveAsXXX(sfRTF, "Export File As RTF", ".rtf");
+}
+
+void SciTEGTK::SaveAsPDF() {
+	SaveAsXXX(sfPDF, "Export File As PDF", ".pdf");
+}
+
+void SciTEGTK::SaveAsTEX() {
+	SaveAsXXX(sfTEX, "Export File As LaTeX", ".tex");
+}
+
+void SciTEGTK::SaveAsXML() {
+	SaveAsXXX(sfXML, "Export File As XML", ".xml");
+}
+
+void SciTEGTK::LoadSessionDialog() {
+	if (!dlgFileSelector.Created()) {
+		GtkWidget *dlg = gtk_file_chooser_dialog_new(
+					localiser.Text("Load Session").c_str(),
+				      GTK_WINDOW(wSciTE.GetID()),
+				      GTK_FILE_CHOOSER_ACTION_OPEN,
+				      SCITE_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				      SCITE_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+				      NULL);
+
+		GtkFileFilter *filter = gtk_file_filter_new();
+		gtk_file_filter_set_name(filter, "session");
+		gtk_file_filter_add_pattern(filter, "*.session");
+		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), filter);
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), filePath.Directory().AsInternal());
+		gtk_window_set_default_size(GTK_WINDOW(dlg), fileSelectorWidth, fileSelectorHeight);
+		if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+			char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg));
+
+			LoadSessionFile(filename);
+			RestoreSession();
+			g_free(filename);
+		}
+		gtk_widget_destroy(dlg);
+	}
+}
+
+void SciTEGTK::SaveSessionDialog() {
+	if (!dlgFileSelector.Created()) {
+		GtkWidget *dlg = gtk_file_chooser_dialog_new(
+					localiser.Text("Save Session").c_str(),
+				      GTK_WINDOW(wSciTE.GetID()),
+				      GTK_FILE_CHOOSER_ACTION_SAVE,
+				      SCITE_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				      SCITE_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+				      NULL);
+
+		GtkFileFilter *filter = gtk_file_filter_new();
+		gtk_file_filter_set_name(filter, "session");
+		gtk_file_filter_add_pattern(filter, "*.session");
+		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), filter);
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dlg), filePath.Directory().AsInternal());
+		gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dlg), "SciTE.session");
+		gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dlg), TRUE);
+		if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+			char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg));
+
+			SaveSessionFile(filename);
+			g_free(filename);
+		}
+		gtk_widget_destroy(dlg);
+	}
+}
+
+static PangoLayout *PangoLayoutFromStyleDefinition(GtkPrintContext *context, const StyleDefinition &sd) {
+	PangoLayout *layout = gtk_print_context_create_pango_layout(context);
+	if (layout) {
+		pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
+		PangoFontDescription *pfd = pango_font_description_new();
+		if (pfd) {
+			const char *fontName = "Sans";
+			if (sd.specified & StyleDefinition::sdFont)
+				fontName = sd.font.c_str();
+			if (fontName[0] == '!')
+				fontName++;
+			pango_font_description_set_family(pfd, fontName);
+			pango_font_description_set_size(pfd, PANGO_SCALE * (
+				(sd.specified & StyleDefinition::sdSize) ? sd.sizeFractional : 9.0));
+			pango_font_description_set_weight(pfd, static_cast<PangoWeight>(sd.weight));
+			pango_font_description_set_style(pfd, sd.italics ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL);
+			pango_layout_set_font_description(layout, pfd);
+			pango_font_description_free(pfd);
+		}
+	}
+	return layout;
+}
+
+void SciTEGTK::SetupFormat(Sci_RangeToFormat &frPrint, GtkPrintContext *context) {
+	cairo_t *cr = gtk_print_context_get_cairo_context(context);
+	frPrint.hdc = cr;
+	frPrint.hdcTarget = cr;
+
+	gdouble width = gtk_print_context_get_width(context);
+	gdouble height = gtk_print_context_get_height(context);
+
+	frPrint.rc.left = 0;
+	frPrint.rc.top = 0;
+	frPrint.rc.right = width;
+	frPrint.rc.bottom = height;
+
+	gdouble marginLeft = 0;
+	gdouble marginTop = 0;
+	gdouble marginRight = 0;
+	gdouble marginBottom = 0;
+	if (gtk_print_context_get_hard_margins(context,
+		&marginTop, &marginBottom, &marginLeft, &marginRight)) {
+		frPrint.rc.left += marginLeft;
+		frPrint.rc.top += marginTop;
+		frPrint.rc.right -= marginRight;
+		frPrint.rc.bottom -= marginBottom;
+	}
+
+	frPrint.rcPage.left = 0;
+	frPrint.rcPage.top = 0;
+	frPrint.rcPage.right = width;
+	frPrint.rcPage.bottom = height;
+
+	std::string headerFormat = props.GetString("print.header.format");
+	if (headerFormat.size()) {
+		StyleDefinition sdHeader(props.GetString("print.header.style").c_str());
+		PangoLayout *layout = PangoLayoutFromStyleDefinition(context, sdHeader);
+		pango_layout_set_text(layout, "Xg", -1);
+		gint layoutHeight;
+		pango_layout_get_size(layout, NULL, &layoutHeight);
+		frPrint.rc.top += ((gdouble)layoutHeight / PANGO_SCALE) * 1.5;
+		g_object_unref(layout);
+	}
+
+	std::string footerFormat = props.GetString("print.footer.format");
+	if (footerFormat.size()) {
+		StyleDefinition sdFooter(props.GetString("print.footer.style").c_str());
+		PangoLayout *layout = PangoLayoutFromStyleDefinition(context, sdFooter);
+		pango_layout_set_text(layout, "Xg", -1);
+		gint layoutHeight;
+		pango_layout_get_size(layout, NULL, &layoutHeight);
+		frPrint.rc.bottom -= ((gdouble)layoutHeight / PANGO_SCALE) * 1.5;
+		g_object_unref(layout);
+	}
+}
+
+void SciTEGTK::BeginPrintThis(GtkPrintOperation *operation, GtkPrintContext *context) {
+	pageStarts.clear();
+	Sci_RangeToFormat frPrint;
+	SetupFormat(frPrint, context) ;
+
+	SA::Position lengthDoc = wEditor.Length();
+	SA::Position lengthPrinted = 0;
+	while (lengthPrinted < lengthDoc) {
+		pageStarts.push_back(lengthPrinted);
+		frPrint.chrg.cpMin = lengthPrinted;
+		frPrint.chrg.cpMax = lengthDoc;
+		lengthPrinted = wEditor.FormatRange(false, &frPrint);
+	}
+	pageStarts.push_back(lengthPrinted);
+
+	gtk_print_operation_set_n_pages(operation, pageStarts.size()-1);
+}
+
+void SciTEGTK::BeginPrint(GtkPrintOperation *operation, GtkPrintContext *context, SciTEGTK *scitew) {
+	scitew->BeginPrintThis(operation, context);
+}
+
+static void SetCairoColour(cairo_t *cr, SA::Colour co) {
+	cairo_set_source_rgb(cr,
+		(co & 0xff) / 255.0,
+		((co >> 8) & 0xff) / 255.0,
+		((co >> 16) & 0xff) / 255.0);
+}
+
+void SciTEGTK::DrawPageThis(GtkPrintOperation * /* operation */, GtkPrintContext *context, gint page_nr) {
+	Sci_RangeToFormat frPrint;
+	SetupFormat(frPrint, context) ;
+	cairo_t *cr = static_cast<cairo_t *>(frPrint.hdc);
+
+	PropSetFile propsPrint;
+	propsPrint.superPS = &props;
+	SetFileProperties(propsPrint);
+	char pageString[32];
+	sprintf(pageString, "%0d", page_nr + 1);
+	propsPrint.Set("CurrentPage", pageString);
+
+	std::string headerFormat = props.GetString("print.header.format");
+	if (headerFormat.size()) {
+		StyleDefinition sdHeader(props.GetString("print.header.style").c_str());
+
+		PangoLayout *layout = PangoLayoutFromStyleDefinition(context, sdHeader);
+
+		SetCairoColour(cr, sdHeader.Fore());
+
+		pango_layout_set_text(layout, propsPrint.GetExpandedString("print.header.format").c_str(), -1);
+
+		gint layout_height;
+		pango_layout_get_size(layout, NULL, &layout_height);
+		gdouble text_height = (gdouble)layout_height / PANGO_SCALE;
+		cairo_move_to(cr, frPrint.rc.left, frPrint.rc.top - text_height * 1.5);
+		pango_cairo_show_layout(cr, layout);
+		g_object_unref(layout);
+
+		cairo_move_to(cr, frPrint.rc.left, frPrint.rc.top - text_height * 0.25);
+		cairo_line_to(cr, frPrint.rc.right, frPrint.rc.top - text_height * 0.25);
+		cairo_stroke(cr);
+	}
+
+	std::string footerFormat = props.GetString("print.footer.format");
+	if (footerFormat.size()) {
+		StyleDefinition sdFooter(props.GetString("print.footer.style").c_str());
+
+		PangoLayout *layout = PangoLayoutFromStyleDefinition(context, sdFooter);
+
+		SetCairoColour(cr, sdFooter.Fore());
+
+		pango_layout_set_text(layout, propsPrint.GetExpandedString("print.footer.format").c_str(), -1);
+
+		gint layout_height;
+		pango_layout_get_size(layout, NULL, &layout_height);
+		gdouble text_height = (gdouble)layout_height / PANGO_SCALE;
+		cairo_move_to(cr, frPrint.rc.left, frPrint.rc.bottom + text_height * 0.5);
+		pango_cairo_show_layout(cr, layout);
+		g_object_unref(layout);
+
+		cairo_move_to(cr, frPrint.rc.left, frPrint.rc.bottom + text_height * 0.25);
+		cairo_line_to(cr, frPrint.rc.right, frPrint.rc.bottom + text_height * 0.25);
+		cairo_stroke(cr);
+	}
+
+	SA::Position lengthDoc = wEditor.Length();
+	frPrint.chrg.cpMin = pageStarts[page_nr];
+	frPrint.chrg.cpMax = pageStarts[page_nr+1];
+	if (frPrint.chrg.cpMax < lengthDoc)
+		frPrint.chrg.cpMax--;
+
+	wEditor.FormatRange(true, &frPrint);
+}
+
+void SciTEGTK::DrawPage(GtkPrintOperation *operation, GtkPrintContext *context, gint page_nr, SciTEGTK *scitew) {
+	scitew->DrawPageThis(operation, context, page_nr);
+}
+
+void SciTEGTK::Print(bool) {
+	RemoveFindMarks();
+	SelectionIntoProperties();
+	// Printing through the GTK API
+	GtkPrintOperation *printOp = gtk_print_operation_new();
+	gtk_print_operation_set_job_name(printOp, gtk_window_get_title(GTK_WINDOW(PWidget(wSciTE))));
+
+	if (printSettings != NULL)
+		gtk_print_operation_set_print_settings(printOp, printSettings);
+	if (pageSetup != NULL)
+		gtk_print_operation_set_default_page_setup(printOp, pageSetup);
+
+	g_signal_connect(printOp, "begin_print", G_CALLBACK(BeginPrint), this);
+	g_signal_connect(printOp, "draw_page", G_CALLBACK(DrawPage), this);
+
+	GtkPrintOperationResult res = gtk_print_operation_run(
+		printOp, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+		GTK_WINDOW(PWidget(wSciTE)), NULL);
+
+	if (res == GTK_PRINT_OPERATION_RESULT_APPLY) {
+		if (printSettings != NULL)
+			g_object_unref(printSettings);
+		printSettings = gtk_print_operation_get_print_settings(printOp);
+		g_object_ref(printSettings);
+	}
+
+	g_object_unref(printOp);
+}
+
+void SciTEGTK::PrintSetup() {
+	if (printSettings == NULL)
+		printSettings = gtk_print_settings_new();
+
+	GtkPageSetup *newPageSetup = gtk_print_run_page_setup_dialog(
+		GTK_WINDOW(PWidget(wSciTE)), pageSetup, printSettings);
+
+	if (pageSetup)
+		g_object_unref(pageSetup);
+
+	pageSetup = newPageSetup;
+}
+
+std::string SciTEGTK::GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span span) {
+	const SA::Position len = span.Length();
+	if (len == 0)
+		return std::string();
+	std::string allocation(len * 3 + 1, 0);
+	win.SetTarget(span);
+	const SA::Position byteLength = win.TargetAsUTF8(&allocation[0]);
+	std::string sel(allocation, 0, byteLength);
+	return sel;
+}
+
+void SciTEGTK::Find() {
+	if (dlgFindReplace.Created()) {
+		dlgFindReplace.Present();
+		return;
+	}
+	SelectionIntoFind();
+	if (props.GetInt("find.use.strip")) {
+		replaceStrip.Close();
+		findStrip.SetIncrementalBehaviour(props.GetInt("find.strip.incremental"));
+		findStrip.Show(props.GetInt("strip.button.height", -1));
+	} else {
+		if (findStrip.visible || replaceStrip.visible)
+			return;
+		FindReplace(false);
+	}
+}
+
+void SetFocus(GUI::ScintillaWindow &w) {
+	w.GrabFocus();
+}
+
+void SciTEGTK::UIClosed() {
+	SciTEBase::UIClosed();
+	SetFocus(wEditor);
+}
+
+void SciTEGTK::UIHasFocus() {
+	CheckMenusClipboard();
+}
+
+GtkWidget *SciTEGTK::TranslatedLabel(const char *original) {
+	GUI::gui_string text = localiser.Text(original);
+	return gtk_label_new_with_mnemonic(text.c_str());
+}
+
+static void FillComboFromProps(WComboBoxEntry *combo, PropSetFile &props) {
+	const char *key;
+	const char *val;
+	combo->ClearList();
+
+	bool more = props.GetFirst(key, val);
+	while (more) {
+		combo->AppendText(key);
+		more = props.GetNext(key, val);
+	}
+}
+
+static void FillComboFromMemory(WComboBoxEntry *combo, const ComboMemory &mem, bool useTop = false) {
+	combo->ClearList();
+	for (int i = 0; i < mem.Length(); i++) {
+		combo->AppendText(mem.At(i).c_str());
+	}
+	if (useTop) {
+		combo->SetText(mem.At(0).c_str());
+	}
+}
+
+std::string SciTEGTK::EncodeString(const std::string &s) {
+	wEditor.SetLengthForEncode(s.length());
+	SA::Position len = wEditor.EncodedFromUTF8(s.c_str(), nullptr);
+	std::vector<char> ret(len+1);
+	wEditor.EncodedFromUTF8(s.c_str(), &ret[0]);
+	return std::string(&ret[0], len);
+}
+
+void BackgroundStrip::Creation(GtkWidget *container) {
+	WTable table(1, 2);
+	SetID(table);
+	Strip::Creation(container);
+	gtk_container_set_border_width(GTK_CONTAINER(GetID()), 1);
+	gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(GetID()), FALSE, FALSE, 0);
+
+	wProgress.Create();
+	table.Add(wProgress, 1, false, 0, 0);
+	gtk_widget_show(wProgress);
+
+	wExplanation.Create("");
+	table.Label(wExplanation);
+
+	//g_signal_connect(G_OBJECT(GetID()), "set-focus-child", G_CALLBACK(ChildFocusSignal), this);
+	//g_signal_connect(G_OBJECT(GetID()), "focus", G_CALLBACK(FocusSignal), this);
+
+	gtk_widget_show(GTK_WIDGET(GetID()));
+}
+
+void BackgroundStrip::SetProgress(const GUI::gui_string &explanation, size_t size, size_t progress) {
+	gtk_label_set_text(GTK_LABEL(wExplanation.GetID()), explanation.c_str());
+	if (size > 0) {
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(wProgress.GetID()),
+			static_cast<double>(progress) / static_cast<double>(size));
+	}
+}
+
+void DialogFindReplace::GrabFields() {
+	pSearcher->SetFind(wComboFind.Text());
+	if (wComboReplace) {
+		pSearcher->SetReplace(wComboReplace.Text());
+	}
+	pSearcher->wholeWord = toggleWord.Active();
+	pSearcher->matchCase = toggleCase.Active();
+	pSearcher->regExp = toggleRegExp.Active();
+	pSearcher->wrapFind = toggleWrap.Active();
+	pSearcher->unSlash = toggleUnSlash.Active();
+	if (toggleReverse) {
+		pSearcher->reverseFind = toggleReverse.Active();
+	}
+}
+
+void DialogFindReplace::FillFields() {
+	wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	if (wComboReplace) {
+		wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+	}
+	toggleWord.SetActive(pSearcher->wholeWord);
+	toggleCase.SetActive(pSearcher->matchCase);
+	toggleRegExp.SetActive(pSearcher->regExp);
+	toggleWrap.SetActive(pSearcher->wrapFind);
+	toggleUnSlash.SetActive(pSearcher->unSlash);
+	if (toggleReverse) {
+		toggleReverse.SetActive(pSearcher->reverseFind);
+	}
+}
+
+void DialogFindReplace::FillCombosInDialog() {
+	wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	if (pSearcher->replacing)
+		wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+}
+
+void SciTEGTK::FindReplaceGrabFields() {
+	dlgFindReplace.GrabFields();
+}
+
+void SciTEGTK::FRFindCmd() {
+	FindReplaceGrabFields();
+	bool isFindDialog = !dlgFindReplace.wComboReplace;
+	bool found = false;
+	if (findWhat[0]) {
+		found = FindNext(isFindDialog && reverseFind) >= 0;
+	}
+	if (isFindDialog && ShouldClose(found))
+		dlgFindReplace.Destroy();
+	else
+		FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FRReplaceCmd() {
+	FindReplaceGrabFields();
+	ReplaceOnce();
+	FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FRReplaceAllCmd() {
+	FindReplaceGrabFields();
+	if (findWhat[0]) {
+		ReplaceAll(false);
+	}
+	FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FRReplaceInSelectionCmd() {
+	FindReplaceGrabFields();
+	if (findWhat[0]) {
+		ReplaceAll(true);
+	}
+	FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FRReplaceInBuffersCmd() {
+	FindReplaceGrabFields();
+	if (findWhat[0]) {
+		ReplaceInBuffers();
+	}
+	FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FRMarkAllCmd() {
+	FindReplaceGrabFields();
+	MarkAll(markWithBookMarks);
+	const bool found = FindNext(reverseFind) >= 0;
+	if (ShouldClose(found))
+		dlgFindReplace.Destroy();
+	else
+		FillCombos(dlgFindReplace);
+}
+
+void SciTEGTK::FillCombos(FindDialog &dlg)  {
+	dlg.FillCombosInDialog();
+}
+
+void SciTEGTK::FillCombosForGrep()  {
+	FillComboFromMemory(&dlgFindInFiles.wComboFiles, memFiles, true);
+	FillComboFromMemory(&dlgFindInFiles.comboDir, memDirectory, true);
+}
+
+void DialogFindInFiles::GrabFields() {
+	pSearcher->SetFind(wComboFindInFiles.Text());
+	if (toggleWord.Sensitive())
+		pSearcher->wholeWord = toggleWord.Active();
+	if (toggleCase.Sensitive())
+		pSearcher->matchCase = toggleCase.Active();
+}
+
+void DialogFindInFiles::FillFields() {
+	wComboFindInFiles.FillFromMemory(pSearcher->memFinds.AsVector());
+	if (toggleWord.Sensitive())
+		toggleWord.SetActive(pSearcher->wholeWord);
+	if (toggleCase.Sensitive())
+		toggleCase.SetActive(pSearcher->matchCase);
+}
+
+void DialogFindInFiles::FillCombosInDialog() {
+	wComboFindInFiles.FillFromMemory(pSearcher->memFinds.AsVector());
+}
+
+void SciTEGTK::FindInFilesCmd() {
+	dlgFindInFiles.GrabFields();
+
+	const char *dirEntry = dlgFindInFiles.comboDir.Text();
+	props.Set("find.directory", dirEntry);
+	memDirectory.Insert(dirEntry);
+
+	const char *filesEntry = dlgFindInFiles.wComboFiles.Text();
+	props.Set("find.files", filesEntry);
+	memFiles.Insert(filesEntry);
+
+	SetFindInFilesOptions();
+
+	if (props.GetInt("find.in.files.close.on.find", 1)) {
+		dlgFindInFiles.Destroy();
+	}
+
+	SelectionIntoProperties();
+	std::string findCommand = props.GetNewExpandString("find.command");
+	if (findCommand == "") {
+		findCommand = sciteExecutable.AsInternal();
+		findCommand += " -grep ";
+		findCommand += (wholeWord ? "w" : "~");
+		findCommand += (matchCase ? "c" : "~");
+		findCommand += props.GetInt("find.in.dot") ? "d" : "~";
+		findCommand += props.GetInt("find.in.binary") ? "b" : "~";
+		findCommand += " \"";
+		findCommand += props.GetString("find.files");
+		findCommand += "\" \"";
+		std::string quotedForm = Slash(props.GetString("find.what"), true);
+		findCommand += quotedForm;
+		findCommand += "\"";
+	}
+	AddCommand(findCommand, props.GetString("find.directory"), jobCLI);
+	if (jobQueue.HasCommandToRun())
+		Execute();
+	if (dlgFindInFiles.Created()) {
+		FillCombos(dlgFindInFiles);
+		FillCombosForGrep();
+	}
+}
+
+void SciTEGTK::FindInFilesDotDot() {
+	FilePath findInDir(dlgFindInFiles.comboDir.Text());
+	gtk_entry_set_text(dlgFindInFiles.comboDir.Entry(), findInDir.Directory().AsInternal());
+}
+
+void SciTEGTK::FindInFilesBrowse() {
+	FilePath findInDir(dlgFindInFiles.comboDir.Text());
+	GtkWidget *dialog = gtk_file_chooser_dialog_new(
+							localiser.Text("Select a folder to search from").c_str(),
+							GTK_WINDOW(dlgFindInFiles.GetID()), // parent_window,
+							GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+							SCITE_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+							SCITE_STOCK_OK, GTK_RESPONSE_ACCEPT,
+							NULL);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), findInDir.AsInternal());
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+		char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+		dlgFindInFiles.comboDir.SetText(filename);
+		g_free(filename);
+	}
+
+	gtk_widget_destroy(dialog);
+}
+
+static const char *textFindPrompt = "Fi_nd:";
+static const char *textReplacePrompt = "Rep_lace:";
+static const char *textFindNext = "_Find Next";
+static const char *textMarkAll = "_Mark All";
+
+static const char *textFind = "F_ind";
+static const char *textReplace = "_Replace";
+static const char *textReplaceAll = "Replace _All";
+static const char *textInSelection = "In _Selection";
+static const char *textReplaceInBuffers = "Replace In _Buffers";
+static const char *textClose = "_Close";
+
+/* XPM */
+static const char * word1_x_xpm[] = {
+"16 16 15 1",
+" 	c #FFFFFF",
+".	c #000000",
+"+	c #E1E1E1",
+"@	c #D9D9D9",
+"#	c #4D4D4D",
+"$	c #7C7C7C",
+"%	c #D0D0D0",
+"&	c #A7A7A7",
+"*	c #8C8C8C",
+"=	c #BDBDBD",
+"-	c #B2B2B2",
+";	c #686868",
+">	c #F0F0F0",
+",	c #9A9A9A",
+"'	c #C7C7C7",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"               .",
+".+.+.@##@ .$%#&.",
+"*=.-*;++; .>;++.",
+",*.$,.  . . .  .",
+"=#,.=;++; . ;++.",
+"'.=.'@##@ . @#&.",
+"                ",
+".              .",
+".              .",
+"................"};
+
+/* XPM */
+static const char * case_x_xpm[] = {
+"16 16 12 1",
+" 	c #FFFFFF",
+".	c #BDBDBD",
+"+	c #4D4D4D",
+"@	c #000000",
+"#	c #D0D0D0",
+"$	c #C7C7C7",
+"%	c #7C7C7C",
+"&	c #B2B2B2",
+"*	c #8C8C8C",
+"=	c #E1E1E1",
+"-	c #686868",
+";	c #9A9A9A",
+"                ",
+"                ",
+"                ",
+"                ",
+"   .+@@         ",
+"  #@$           ",
+"  %%      &+@@  ",
+"  @*     &+=    ",
+"  @*     @&     ",
+"  -%     @&     ",
+"  .@#    ;+=    ",
+"   &+@@   ;@@@  ",
+"                ",
+"                ",
+"                ",
+"                "};
+
+/* XPM */
+static const char * regex_x_xpm[] = {
+"16 16 11 1",
+" 	c #FFFFFF",
+".	c #888888",
+"+	c #696969",
+"@	c #000000",
+"#	c #E0E0E0",
+"$	c #484848",
+"%	c #B6B6B6",
+"&	c #C4C4C4",
+"*	c #787878",
+"=	c #383838",
+"-	c #D3D3D3",
+"                ",
+"                ",
+"                ",
+"  .+        @   ",
+" #$$#     % + % ",
+" +&&+    #*=@=*#",
+"-$  $&     +++  ",
+"$&  &$    -$ =- ",
+"                ",
+"                ",
+"      %@%       ",
+"      %@%       ",
+"                ",
+"                ",
+"                ",
+"                "};
+
+/* XPM */
+static const char * backslash_x_xpm[] = {
+"16 16 15 1",
+" 	c #FFFFFF",
+".	c #141414",
+"+	c #585858",
+"@	c #A6A6A6",
+"#	c #B6B6B6",
+"$	c #272727",
+"%	c #E0E0E0",
+"&	c #979797",
+"*	c #000000",
+"=	c #696969",
+"-	c #484848",
+";	c #787878",
+">	c #D3D3D3",
+",	c #383838",
+"'	c #888888",
+"                ",
+"                ",
+"                ",
+".       .       ",
+"+@      +@   #  ",
+"#+      #+   $  ",
+" .%  .&* .% =*--",
+" ;&  *&  ;&  *  ",
+" >,  *   >,  *  ",
+"  $> *    $> *  ",
+"  &; *    &; *% ",
+"  %. *    %. '*.",
+"                ",
+"                ",
+"                ",
+"                "};
+
+/* XPM */
+static const char * around_x_xpm[] = {
+"16 16 2 1",
+" 	c #FFFFFF",
+".	c #000000",
+"                ",
+"      .....     ",
+"     .......    ",
+"    ...   ...   ",
+"            ..  ",
+"            ..  ",
+"   ..        .. ",
+"  ....       .. ",
+" ......      .. ",
+"   ..       ..  ",
+"   ...      ..  ",
+"    ...   ...   ",
+"     .......    ",
+"      .....     ",
+"                ",
+"                "};
+
+/* XPM */
+static const char * up_x_xpm[] = {
+"16 16 8 1",
+" 	c None",
+".	c #FFFFFF",
+"+	c #9C9C9C",
+"@	c #000000",
+"#	c #747474",
+"$	c #484848",
+"%	c #DFDFDF",
+"&	c #BFBFBF",
+"................",
+"................",
+"........+.......",
+".......@@#......",
+"......@@@@#.....",
+".....@@$@$@$....",
+"....@@%#@&+@$...",
+"...@@%.#@&.&@$..",
+"..#@%..#@&..&@&.",
+"..#....#@&...&&.",
+".......#@&......",
+".......#@&......",
+".......#@&......",
+".......#@&......",
+".......#@&......",
+"................"};
+
+const static SearchOption toggles[] = {
+	{"Match _whole word only", IDM_WHOLEWORD, IDWHOLEWORD},
+	{"Case sensiti_ve", IDM_MATCHCASE, IDMATCHCASE},
+	{"Regular _expression", IDM_REGEXP, IDREGEXP},
+	{"Transform _backslash expressions", IDM_UNSLASH, IDUNSLASH},
+	{"Wrap ar_ound", IDM_WRAPAROUND, IDWRAP},
+	{"_Up", IDM_DIRECTIONUP, IDDIRECTIONUP},
+	{0, 0, 0},
+};
+
+// Has to be in same order as toggles
+static const char **xpmImages[] = {
+	word1_x_xpm,
+	case_x_xpm,
+	regex_x_xpm,
+	backslash_x_xpm,
+	around_x_xpm,
+	up_x_xpm,
+};
+
+void SciTEGTK::FindInFilesResponse(int responseID) {
+	switch (responseID) {
+		case GTK_RESPONSE_OK:
+			FindInFilesCmd() ;
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			dlgFindInFiles.Destroy();
+			break;
+	}
+}
+
+void SciTEGTK::FindInFiles() {
+	dlgFindInFiles.SetSearcher(this);
+
+	SelectionIntoFind();
+	props.Set("find.what", findWhat.c_str());
+
+	FilePath findInDir = filePath.Directory().AbsolutePath();
+	std::string directory = props.GetString("find.in.directory");
+	if (directory.length()) {
+		findInDir = FilePath(directory.c_str());
+	}
+	props.Set("find.directory", findInDir.AsInternal());
+
+	dlgFindInFiles.Create(localiser.Text("Find in Files"));
+
+	WTable table(4, 5);
+	table.PackInto(GTK_BOX(dlgFindInFiles.ContentArea()));
+
+	WStatic labelFind;
+	labelFind.Create(localiser.Text("Fi_nd what:"));
+	table.Label(labelFind);
+
+	dlgFindInFiles.wComboFindInFiles.Create();
+
+	table.Add(dlgFindInFiles.wComboFindInFiles, 4, true);
+
+	gtk_entry_set_text(dlgFindInFiles.wComboFindInFiles.Entry(), findWhat.c_str());
+	dlgFindInFiles.wComboFindInFiles.ActivatesDefault();
+	labelFind.SetMnemonicFor(dlgFindInFiles.wComboFindInFiles);
+
+	WStatic labelFiles;
+	labelFiles.Create(localiser.Text("_Files:"));
+	table.Label(labelFiles);
+
+	dlgFindInFiles.wComboFiles.Create();
+	dlgFindInFiles.comboDir.Create();
+
+	FillCombosForGrep();
+
+	table.Add(dlgFindInFiles.wComboFiles, 4, true);
+	dlgFindInFiles.wComboFiles.ActivatesDefault();
+	labelFiles.SetMnemonicFor(dlgFindInFiles.wComboFiles);
+
+	WStatic labelDirectory;
+	labelDirectory.Create(localiser.Text("_Directory:"));
+	table.Label(labelDirectory);
+
+	table.Add(dlgFindInFiles.comboDir, 2, true);
+
+	gtk_entry_set_text(dlgFindInFiles.comboDir.Entry(), findInDir.AsInternal());
+	// Make a little wider than would happen automatically to show realistic paths
+	gtk_entry_set_width_chars(dlgFindInFiles.comboDir.Entry(), 40);
+	dlgFindInFiles.comboDir.ActivatesDefault();
+	labelDirectory.SetMnemonicFor(dlgFindInFiles.comboDir);
+
+	Signal<&SciTEGTK::FindInFilesDotDot> sigDotDot;
+	dlgFindInFiles.btnDotDot.Create(localiser.Text("_.."), G_CALLBACK(sigDotDot.Function), this);
+	table.Add(dlgFindInFiles.btnDotDot);
+
+	Signal<&SciTEGTK::FindInFilesBrowse> sigBrowse;
+	dlgFindInFiles.btnBrowse.Create(localiser.Text("_Browse..."), G_CALLBACK(sigBrowse.Function), this);
+	table.Add(dlgFindInFiles.btnBrowse);
+
+	table.Add();	// Space
+
+	// Whole Word
+	dlgFindInFiles.toggleWord.Create(localiser.Text(toggles[SearchOption::tWord].label));
+	table.Add(dlgFindInFiles.toggleWord, 1, true, 3, 0);
+
+	// Case Sensitive
+	dlgFindInFiles.toggleCase.Create(localiser.Text(toggles[SearchOption::tCase].label));
+	table.Add(dlgFindInFiles.toggleCase, 1, true, 3, 0);
+
+	AttachResponse<&SciTEGTK::FindInFilesResponse>(PWidget(dlgFindInFiles), this);
+	dlgFindInFiles.ResponseButton(localiser.Text("_Cancel"), GTK_RESPONSE_CANCEL);
+	dlgFindInFiles.ResponseButton(localiser.Text("F_ind"), GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgFindInFiles)), GTK_RESPONSE_OK);
+
+	dlgFindInFiles.FillFields();
+
+	gtk_widget_grab_focus(GTK_WIDGET(dlgFindInFiles.wComboFindInFiles.Entry()));
+
+	dlgFindInFiles.Display(PWidget(wSciTE));
+}
+
+void SciTEGTK::Replace() {
+	if (dlgFindReplace.Created()) {
+		dlgFindReplace.Present();
+		return;
+	}
+	SelectionIntoFind();
+	if (props.GetInt("replace.use.strip")) {
+		findStrip.Close();
+		replaceStrip.SetIncrementalBehaviour(props.GetInt("replace.strip.incremental"));
+		replaceStrip.Show(props.GetInt("strip.button.height", -1));
+	} else {
+		if (findStrip.visible || replaceStrip.visible)
+			return;
+		FindReplace(true);
+	}
+}
+
+void SciTEGTK::ResetExecution() {
+	icmd = 0;
+	jobQueue.SetExecuting(false);
+	if (needReadProperties)
+		ReadProperties();
+	CheckReload();
+	CheckMenus();
+	jobQueue.ClearJobs();
+}
+
+void SciTEGTK::ExecuteNext() {
+	icmd++;
+	if (icmd < jobQueue.commandCurrent && icmd < jobQueue.commandMax) {
+		Execute();
+	} else {
+		ResetExecution();
+	}
+}
+
+void SciTEGTK::ContinueExecute(int fromPoll) {
+	char buf[8192];
+	int count = read(fdFIFO, buf, sizeof(buf) - 1);
+	if (count > 0) {
+		buf[count] = '\0';
+		if (!(lastFlags & jobQuiet)) {
+			OutputAppendString(buf);
+		}
+		lastOutput += buf;
+	} else if (count == 0) {
+		std::string sExitMessage = StdStringFromInteger(WEXITSTATUS(exitStatus));
+		sExitMessage.insert(0, ">Exit code: ");
+		if (WIFSIGNALED(exitStatus)) {
+			std::string sSignal = StdStringFromInteger(WTERMSIG(exitStatus));
+			sSignal.insert(0, " Signal: ");
+			sExitMessage += sSignal;
+		}
+		if (jobQueue.TimeCommands()) {
+			sExitMessage += "    Time: ";
+			sExitMessage += StdStringFromDouble(commandTime.Duration(), 3);
+		}
+		if ((lastFlags & jobRepSelYes)
+			|| ((lastFlags & jobRepSelAuto) && !exitStatus)) {
+			int cpMin = wEditor.Send(SCI_GETSELECTIONSTART, 0, 0);
+			wEditor.Send(SCI_REPLACESEL,0,(sptr_t)(lastOutput.c_str()));
+			wEditor.Send(SCI_SETSEL, cpMin, cpMin+lastOutput.length());
+		}
+		sExitMessage.append("\n");
+		OutputAppendString(sExitMessage.c_str());
+		// Move selection back to beginning of this run so that F4 will go
+		// to first error of this run.
+		if ((scrollOutput == 1) && returnOutputToCommand)
+			wOutput.Send(SCI_GOTOPOS, originalEnd);
+		returnOutputToCommand = true;
+		g_source_remove(inputHandle);
+		inputHandle = 0;
+		g_io_channel_unref(inputChannel);
+		inputChannel = 0;
+		g_source_remove(pollID);
+		pollID = 0;
+		close(fdFIFO);
+		fdFIFO = 0;
+		pidShell = 0;
+		triedKill = false;
+		if (WEXITSTATUS(exitStatus))
+			ResetExecution();
+		else
+			ExecuteNext();
+	} else { // count < 0
+		// The FIFO is not ready - expected when called from polling callback.
+		if (!fromPoll) {
+			OutputAppendString(">End Bad\n");
+		}
+	}
+}
+
+void SciTEGTK::ShowBackgroundProgress(const GUI::gui_string &explanation, size_t size, size_t progress) {
+	backgroundStrip.visible = !explanation.empty();
+	if (backgroundStrip.visible) {
+		backgroundStrip.Show(0);
+		backgroundStrip.SetProgress(explanation, size, progress);
+	} else {
+		backgroundStrip.Close();
+	}
+}
+
+void SciTEGTK::UserStripShow(const char *description) {
+	if (*description) {
+		userStrip.SetDescription(description);
+		userStrip.Show(props.GetInt("strip.button.height", -1));
+	} else {
+		userStrip.Close();
+		SizeSubWindows();
+	}
+}
+
+void SciTEGTK::UserStripSet(int control, const char *value) {
+	userStrip.Set(control, value);
+}
+
+void SciTEGTK::UserStripSetList(int control, const char *value) {
+	userStrip.SetList(control, value);
+}
+
+std::string SciTEGTK::UserStripValue(int control) {
+	return userStrip.GetValue(control);
+}
+
+void SciTEGTK::UserStripClosed() {
+	SizeSubWindows();
+}
+
+gboolean SciTEGTK::IOSignal(GIOChannel *, GIOCondition, SciTEGTK *scitew) {
+#ifndef GDK_VERSION_3_6
+	ThreadLockMinder minder;
+#endif
+	scitew->ContinueExecute(FALSE);
+	return TRUE;
+}
+
+void SciTEGTK::ReapChild(GPid pid, gint status, gpointer user_data) {
+	SciTEGTK *self = static_cast<SciTEGTK*>(user_data);
+
+	self->exitStatus = status;
+	self->pidShell = 0;
+	self->triedKill = false;
+
+	g_spawn_close_pid(pid);
+}
+
+static void SetupChild(gpointer) {
+	dup2(1, 2);
+	setpgid(0, 0);
+}
+
+void SciTEGTK::Execute() {
+	if (buffers.SavingInBackground())
+		// May be saving file that should be used by command so wait until all saved
+		return;
+
+	SciTEBase::Execute();
+
+	commandTime.Duration(true);
+	if (scrollOutput)
+		wOutput.Send(SCI_GOTOPOS, wOutput.Send(SCI_GETTEXTLENGTH));
+	originalEnd = wOutput.Send(SCI_GETCURRENTPOS);
+
+	lastOutput = "";
+	lastFlags = jobQueue.jobQueue[icmd].flags;
+
+	if (jobQueue.jobQueue[icmd].jobType != jobExtension) {
+		OutputAppendString(">");
+		OutputAppendString(jobQueue.jobQueue[icmd].command.c_str());
+		OutputAppendString("\n");
+	}
+
+	if (jobQueue.jobQueue[icmd].directory.IsSet()) {
+		jobQueue.jobQueue[icmd].directory.SetWorkingDirectory();
+	}
+
+	if (jobQueue.jobQueue[icmd].jobType == jobShell) {
+		const gchar *argv[] = { "/bin/sh", "-c", jobQueue.jobQueue[icmd].command.c_str(), NULL };
+		g_spawn_async(NULL, const_cast<gchar**>(argv), NULL, GSpawnFlags(0), NULL, NULL, NULL, NULL);
+		ExecuteNext();
+	} else if (jobQueue.jobQueue[icmd].jobType == jobExtension) {
+		if (extender)
+			extender->OnExecute(jobQueue.jobQueue[icmd].command.c_str());
+		ExecuteNext();
+	} else {
+		GError *error = NULL;
+		gint fdout;
+		const char *argv[] = { "/bin/sh", "-c", jobQueue.jobQueue[icmd].command.c_str(), NULL };
+
+		if (!g_spawn_async_with_pipes(
+			NULL, const_cast<gchar**>(argv), NULL,
+			G_SPAWN_DO_NOT_REAP_CHILD, SetupChild, NULL,
+			&pidShell, NULL, &fdout, NULL, &error
+		)) {
+			OutputAppendString(">g_spawn_async_with_pipes: ");
+			OutputAppendString(error->message);
+			OutputAppendString("\n");
+
+			g_error_free(error);
+		}
+		g_child_watch_add(pidShell, SciTEGTK::ReapChild, this);
+
+		fdFIFO = fdout;
+		triedKill = false;
+		fcntl(fdFIFO, F_SETFL, fcntl(fdFIFO, F_GETFL) | O_NONBLOCK);
+		inputChannel = g_io_channel_unix_new(fdout);
+		inputHandle = g_io_add_watch(inputChannel, G_IO_IN, (GIOFunc)IOSignal, this);
+		// Also add a background task in case there is no output from the tool
+		pollID = g_timeout_add(20, (gint (*)(void *)) SciTEGTK::PollTool, this);
+	}
+}
+
+void SciTEGTK::StopExecute() {
+	if (!triedKill && pidShell) {
+#if defined(G_OS_UNIX)
+		// Only on Unix.
+		kill(-pidShell, SIGKILL);
+		// On Windows should call a native API, possibly TerminateProcess.
+#endif
+		triedKill = true;
+	}
+}
+
+void SciTEGTK::GotoCmd() {
+	int lineNo = dlgGoto.entryGoto.Value();
+	GotoLineEnsureVisible(lineNo - 1);
+	dlgGoto.Destroy();
+}
+
+void SciTEGTK::GotoResponse(int responseID) {
+	switch (responseID) {
+		case GTK_RESPONSE_OK:
+			GotoCmd() ;
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			dlgGoto.Destroy();
+			break;
+	}
+}
+
+void SciTEGTK::GoLineDialog() {
+
+	dlgGoto.Create(localiser.Text("Go To"));
+
+	gtk_container_set_border_width(GTK_CONTAINER(PWidget(dlgGoto)), 0);
+
+	WTable table(1, 2);
+	table.PackInto(GTK_BOX(dlgGoto.ContentArea()));
+
+	GtkWidget *labelGoto = TranslatedLabel("_Destination Line Number:");
+	table.Label(labelGoto);
+
+	dlgGoto.entryGoto.Create();
+	table.Add(dlgGoto.entryGoto);
+	dlgGoto.entryGoto.ActivatesDefault();
+	gtk_widget_grab_focus(dlgGoto.entryGoto);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(labelGoto), dlgGoto.entryGoto);
+
+	AttachResponse<&SciTEGTK::GotoResponse>(PWidget(dlgGoto), this);
+	dlgGoto.ResponseButton(localiser.Text("_Cancel"), GTK_RESPONSE_CANCEL);
+	dlgGoto.ResponseButton(localiser.Text("_Go To"), GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgGoto)), GTK_RESPONSE_OK);
+
+	dlgGoto.Display(PWidget(wSciTE));
+}
+
+void SciTEGTK::AbbrevCmd() {
+	abbrevInsert = dlgAbbrev.comboAbbrev.Text();
+	dlgAbbrev.Destroy();
+}
+
+void SciTEGTK::AbbrevResponse(int responseID) {
+	switch (responseID) {
+		case GTK_RESPONSE_OK:
+			AbbrevCmd();
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			abbrevInsert = "";
+			dlgAbbrev.Destroy();
+			break;
+	}
+}
+
+bool SciTEGTK::AbbrevDialog() {
+	dlgAbbrev.Create(localiser.Text("Insert Abbreviation"));
+
+	gtk_container_set_border_width(GTK_CONTAINER(PWidget(dlgAbbrev)), 0);
+
+	WTable table(1, 2);
+	table.PackInto(GTK_BOX(dlgAbbrev.ContentArea()));
+
+	GtkWidget *labelAbbrev = TranslatedLabel("_Abbreviation:");
+	table.Label(labelAbbrev);
+
+	dlgAbbrev.comboAbbrev.Create();
+	gtk_entry_set_width_chars(dlgAbbrev.comboAbbrev.Entry(), 35);
+	FillComboFromProps(&dlgAbbrev.comboAbbrev, propsAbbrev);
+	table.Add(dlgAbbrev.comboAbbrev, 2, true);
+
+	gtk_widget_grab_focus(dlgAbbrev.comboAbbrev);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(labelAbbrev), dlgAbbrev.comboAbbrev);
+
+	AttachResponse<&SciTEGTK::AbbrevResponse>(PWidget(dlgAbbrev), this);
+	dlgAbbrev.ResponseButton(localiser.Text("_Cancel"), GTK_RESPONSE_CANCEL);
+	dlgAbbrev.ResponseButton(localiser.Text("_Insert"), GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgAbbrev)), GTK_RESPONSE_OK);
+
+	dlgAbbrev.Display(PWidget(wSciTE));
+
+	return TRUE;
+}
+
+void SciTEGTK::TabSizeSet(int &tabSize, bool &useTabs) {
+	tabSize = dlgTabSize.entryTabSize.Value();
+	if (tabSize > 0)
+		wEditor.SetTabWidth(tabSize);
+	int indentSize = dlgTabSize.entryIndentSize.Value();
+	if (indentSize > 0)
+		wEditor.SetIndent(indentSize);
+	useTabs = dlgTabSize.toggleUseTabs.Active();
+	wEditor.SetUseTabs(useTabs);
+}
+
+void SciTEGTK::TabSizeCmd() {
+	int tabSize;
+	bool useTabs;
+	TabSizeSet(tabSize, useTabs);
+	dlgTabSize.Destroy();
+}
+
+void SciTEGTK::TabSizeConvertCmd() {
+	int tabSize;
+	bool useTabs;
+	TabSizeSet(tabSize, useTabs);
+	ConvertIndentation(tabSize, useTabs);
+	dlgTabSize.Destroy();
+}
+
+#define RESPONSE_CONVERT 1001
+
+void SciTEGTK::TabSizeResponse(int responseID) {
+	switch (responseID) {
+		case RESPONSE_CONVERT:
+			TabSizeConvertCmd();
+			break;
+
+		case GTK_RESPONSE_OK:
+			TabSizeCmd() ;
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			dlgTabSize.Destroy();
+			break;
+	}
+}
+
+void SciTEGTK::TabSizeDialog() {
+
+	dlgTabSize.Create(localiser.Text("Indentation Settings"));
+
+	gtk_container_set_border_width(GTK_CONTAINER(PWidget(dlgTabSize)), 0);
+
+	WTable table(3, 2);
+	table.PackInto(GTK_BOX(dlgTabSize.ContentArea()));
+
+	GtkWidget *labelTabSize = TranslatedLabel("_Tab Size:");
+	table.Label(labelTabSize);
+
+	std::string tabSize = StdStringFromInteger(wEditor.TabWidth());
+	dlgTabSize.entryTabSize.Create(tabSize.c_str());
+	table.Add(dlgTabSize.entryTabSize);
+	dlgTabSize.entryTabSize.ActivatesDefault();
+	gtk_widget_grab_focus(dlgTabSize.entryTabSize);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(labelTabSize), dlgTabSize.entryTabSize);
+
+	GtkWidget *labelIndentSize = TranslatedLabel("_Indent Size:");
+	table.Label(labelIndentSize);
+
+	std::string indentSize = StdStringFromInteger(wEditor.Indent());
+	dlgTabSize.entryIndentSize.Create(indentSize.c_str());
+	table.Add(dlgTabSize.entryIndentSize);
+	dlgTabSize.entryIndentSize.ActivatesDefault();
+	gtk_label_set_mnemonic_widget(GTK_LABEL(labelIndentSize), dlgTabSize.entryIndentSize);
+
+	bool useTabs = wEditor.UseTabs();
+	dlgTabSize.toggleUseTabs.Create(localiser.Text("_Use Tabs"));
+	dlgTabSize.toggleUseTabs.SetActive(useTabs);
+	table.Add();
+	table.Add(dlgTabSize.toggleUseTabs);
+
+	AttachResponse<&SciTEGTK::TabSizeResponse>(PWidget(dlgTabSize), this);
+	dlgTabSize.ResponseButton(localiser.Text("Con_vert"), RESPONSE_CONVERT);
+	dlgTabSize.ResponseButton(localiser.Text("_Cancel"), GTK_RESPONSE_CANCEL);
+	dlgTabSize.ResponseButton(localiser.Text("_OK"), GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgTabSize)), GTK_RESPONSE_OK);
+
+	dlgTabSize.Display(PWidget(wSciTE));
+}
+
+bool SciTEGTK::ParametersOpen() {
+	return dlgParameters.Created();
+}
+
+void SciTEGTK::ParamGrab() {
+	if (dlgParameters.Created()) {
+		for (int param = 0; param < maxParam; param++) {
+			std::string paramText = StdStringFromInteger(param + 1);
+			const char *paramVal = dlgParameters.entryParam[param].Text();
+			props.Set(paramText.c_str(), paramVal);
+		}
+		UpdateStatusBar(true);
+	}
+}
+
+void SciTEGTK::ParamCancelCmd() {
+	dlgParameters.Destroy();
+	CheckMenus();
+}
+
+void SciTEGTK::ParamCmd() {
+	dlgParameters.paramDialogCanceled = false;
+	ParamGrab();
+	dlgParameters.Destroy();
+	CheckMenus();
+}
+
+void SciTEGTK::ParamResponse(int responseID) {
+	switch (responseID) {
+		case GTK_RESPONSE_OK:
+			ParamCmd() ;
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			ParamCancelCmd();
+			break;
+	}
+}
+
+bool SciTEGTK::ParametersDialog(bool modal) {
+	if (dlgParameters.Created()) {
+		ParamGrab();
+		if (!modal) {
+			dlgParameters.Destroy();
+		}
+		return true;
+	}
+	dlgParameters.paramDialogCanceled = true;
+	dlgParameters.Create(localiser.Text("Parameters"));
+
+	g_signal_connect(G_OBJECT(PWidget(dlgParameters)),
+	                   "destroy", G_CALLBACK(destroyDialog), &dlgParameters);
+
+	WTable table(modal ? 10 : 9, 2);
+	table.PackInto(GTK_BOX(dlgParameters.ContentArea()));
+
+	if (modal) {
+		GtkWidget *cmd = gtk_label_new(parameterisedCommand.c_str());
+		table.Add(cmd, 2);
+	}
+
+	for (int param = 0; param < maxParam; param++) {
+		std::string paramText = StdStringFromInteger(param + 1);
+		std::string paramTextVal = props.GetString(paramText.c_str());
+		paramText.insert(0, "_");
+		paramText.append(":");
+		GtkWidget *label = gtk_label_new_with_mnemonic(paramText.c_str());
+		table.Label(label);
+
+		dlgParameters.entryParam[param].Create(paramTextVal.c_str());
+		table.Add(dlgParameters.entryParam[param]);
+		dlgParameters.entryParam[param].ActivatesDefault();
+
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), dlgParameters.entryParam[param]);
+	}
+
+	gtk_widget_grab_focus(dlgParameters.entryParam[0]);
+
+	AttachResponse<&SciTEGTK::ParamResponse>(PWidget(dlgParameters), this);
+	dlgParameters.ResponseButton(localiser.Text(modal ? "_Cancel" : "_Close"), GTK_RESPONSE_CANCEL);
+	dlgParameters.ResponseButton(localiser.Text(modal ? "_Execute" : "_Set"), GTK_RESPONSE_OK);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgParameters)), GTK_RESPONSE_OK);
+
+	dlgParameters.Display(PWidget(wSciTE), modal);
+
+	return !dlgParameters.paramDialogCanceled;
+}
+
+#define RESPONSE_MARK_ALL 1002
+#define RESPONSE_REPLACE 1003
+#define RESPONSE_REPLACE_ALL 1004
+#define RESPONSE_REPLACE_IN_SELECTION 1005
+#define RESPONSE_REPLACE_IN_BUFFERS 1006
+
+void SciTEGTK::FindReplaceResponse(int responseID) {
+	switch (responseID) {
+		case GTK_RESPONSE_OK:
+			FRFindCmd() ;
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			dlgFindReplace.Destroy();
+			break;
+
+		case RESPONSE_MARK_ALL:
+			FRMarkAllCmd();
+			break;
+
+		case RESPONSE_REPLACE:
+			FRReplaceCmd();
+			break;
+
+		case RESPONSE_REPLACE_ALL:
+			FRReplaceAllCmd();
+			break;
+
+		case RESPONSE_REPLACE_IN_SELECTION:
+			FRReplaceInSelectionCmd();
+			break;
+
+		case RESPONSE_REPLACE_IN_BUFFERS:
+			FRReplaceInBuffersCmd();
+			break;
+	}
+}
+
+void SciTEGTK::FindReplace(bool replace) {
+
+	replacing = replace;
+	dlgFindReplace.SetSearcher(this);
+	dlgFindReplace.Create(localiser.Text(replace ? "Replace" : "Find"));
+
+	g_signal_connect(G_OBJECT(PWidget(dlgFindReplace)),
+	                   "destroy", G_CALLBACK(destroyDialogFindReplace), &dlgFindReplace);
+
+	WTable table(replace ? 8 : 7, 2);
+	table.PackInto(GTK_BOX(dlgFindReplace.ContentArea()));
+
+	dlgFindReplace.labelFind.Create(localiser.Text("Fi_nd what:"));
+	table.Label(dlgFindReplace.labelFind);
+
+	dlgFindReplace.wComboFind.Create();
+	table.Add(dlgFindReplace.wComboFind, 1, true);
+
+	dlgFindReplace.wComboFind.SetText(findWhat.c_str());
+	gtk_entry_set_width_chars(dlgFindReplace.wComboFind.Entry(), 40);
+	dlgFindReplace.wComboFind.ActivatesDefault();
+	dlgFindReplace.labelFind.SetMnemonicFor(dlgFindReplace.wComboFind);
+
+	if (replace) {
+		dlgFindReplace.labelReplace.Create(localiser.Text("Rep_lace with:"));
+		table.Label(dlgFindReplace.labelReplace);
+
+		dlgFindReplace.wComboReplace.Create();
+		table.Add(dlgFindReplace.wComboReplace, 1, true);
+
+		dlgFindReplace.wComboReplace.ActivatesDefault();
+		dlgFindReplace.labelReplace.SetMnemonicFor(dlgFindReplace.wComboReplace);
+
+	} else {
+		dlgFindReplace.wComboReplace.SetID(0);
+	}
+
+	// Whole Word
+	dlgFindReplace.toggleWord.Create(localiser.Text(toggles[SearchOption::tWord].label));
+	table.Add(dlgFindReplace.toggleWord, 2, false, 3, 0);
+
+	// Case Sensitive
+	dlgFindReplace.toggleCase.Create(localiser.Text(toggles[SearchOption::tCase].label));
+	table.Add(dlgFindReplace.toggleCase, 2, false, 3, 0);
+
+	// Regular Expression
+	dlgFindReplace.toggleRegExp.Create(localiser.Text(toggles[SearchOption::tRegExp].label));
+	table.Add(dlgFindReplace.toggleRegExp, 2, false, 3, 0);
+
+	// Transform backslash expressions
+	dlgFindReplace.toggleUnSlash.Create(localiser.Text(toggles[SearchOption::tBackslash].label));
+	table.Add(dlgFindReplace.toggleUnSlash, 2, false, 3, 0);
+
+	// Wrap Around
+	dlgFindReplace.toggleWrap.Create(localiser.Text(toggles[SearchOption::tWrap].label));
+	table.Add(dlgFindReplace.toggleWrap, 2, false, 3, 0);
+
+	if (replace) {
+		dlgFindReplace.toggleReverse.SetID(0);
+	} else {
+		// Reverse
+		dlgFindReplace.toggleReverse.Create(localiser.Text(toggles[SearchOption::tUp].label));
+		table.Add(dlgFindReplace.toggleReverse, 2, false, 3, 0);
+	}
+
+	if (!replace) {
+		dlgFindReplace.ResponseButton(localiser.Text(textMarkAll), RESPONSE_MARK_ALL);
+	}
+
+	if (replace) {
+		dlgFindReplace.ResponseButton(localiser.Text(textReplace), RESPONSE_REPLACE);
+		dlgFindReplace.ResponseButton(localiser.Text(textReplaceAll), RESPONSE_REPLACE_ALL);
+		dlgFindReplace.ResponseButton(localiser.Text(textInSelection), RESPONSE_REPLACE_IN_SELECTION);
+		if (FindReplaceAdvanced()) {
+			dlgFindReplace.ResponseButton(localiser.Text(textReplaceInBuffers), RESPONSE_REPLACE_IN_BUFFERS);
+		}
+	}
+
+	dlgFindReplace.ResponseButton(localiser.Text(textClose), GTK_RESPONSE_CANCEL);
+	dlgFindReplace.ResponseButton(localiser.Text(textFind), GTK_RESPONSE_OK);
+
+	AttachResponse<&SciTEGTK::FindReplaceResponse>(PWidget(dlgFindReplace), this);
+	gtk_dialog_set_default_response(GTK_DIALOG(PWidget(dlgFindReplace)), GTK_RESPONSE_OK);
+
+	dlgFindReplace.FillFields();
+
+	gtk_widget_grab_focus(GTK_WIDGET(dlgFindReplace.wComboFind.Entry()));
+
+	dlgFindReplace.Display(PWidget(wSciTE), false);
+}
+
+void SciTEGTK::DestroyFindReplace() {
+	dlgFindReplace.Destroy();
+}
+
+SciTEBase::MessageBoxChoice SciTEGTK::WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, MessageBoxStyle style) {
+	if (!messageBoxDialog) {
+		std::string sMsg(msg.c_str());
+		dialogsOnScreen++;
+		GtkAccelGroup *accel_group = gtk_accel_group_new();
+
+		messageBoxResult = -1;
+		messageBoxDialog = gtk_dialog_new();
+		gtk_window_set_title(GTK_WINDOW(messageBoxDialog), appName);
+		gtk_container_set_border_width(GTK_CONTAINER(messageBoxDialog), 0);
+
+		g_signal_connect(G_OBJECT(messageBoxDialog),
+		                   "destroy", G_CALLBACK(messageBoxDestroy), &messageBoxDialog);
+
+		MessageBoxChoice escapeResult = mbOK;
+		if ((style & 0xf) == mbsOK) {
+			AddMBButton(messageBoxDialog, "_OK", mbOK, accel_group, true);
+		} else {
+			AddMBButton(messageBoxDialog, "_Yes", mbYes, accel_group, true);
+			AddMBButton(messageBoxDialog, "_No", mbNo, accel_group);
+			escapeResult = mbNo;
+			if ((style & 0xf) == mbsYesNoCancel) {
+				AddMBButton(messageBoxDialog, "_Cancel", mbCancel, accel_group);
+				escapeResult = mbCancel;
+			}
+		}
+		g_signal_connect(G_OBJECT(messageBoxDialog),
+		                   "key_press_event", G_CALLBACK(messageBoxKey),
+		                   GINT_TO_POINTER(escapeResult));
+
+		if (style & mbsAboutBox) {
+			GtkWidget *explanation = scintilla_new();
+			GUI::ScintillaWindow scExplanation;
+			scExplanation.SetScintilla(explanation);
+			scintilla_set_id(SCINTILLA(explanation), 0);
+#if GTK_CHECK_VERSION(3,0,0)
+			gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(messageBoxDialog))),
+			                   explanation, TRUE, TRUE, 0);
+#else
+			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(messageBoxDialog)->vbox),
+			                   explanation, TRUE, TRUE, 0);
+#endif
+			gtk_widget_set_size_request(GTK_WIDGET(explanation), 480, 380);
+			gtk_widget_show_all(explanation);
+			SetAboutMessage(scExplanation, "SciTE");
+		} else {
+			GtkWidget *label = gtk_label_new(sMsg.c_str());
+#if GTK_CHECK_VERSION(3,14,0)
+			gtk_widget_set_margin_start(label, 10);
+			gtk_widget_set_margin_end(label, 10);
+			gtk_widget_set_margin_top(label, 10);
+			gtk_widget_set_margin_bottom(label, 10);
+#else
+			gtk_misc_set_padding(GTK_MISC(label), 10, 10);
+#endif
+#if GTK_CHECK_VERSION(3,0,0)
+			gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(messageBoxDialog))),
+			                   label, TRUE, TRUE, 0);
+#else
+			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(messageBoxDialog)->vbox),
+			                   label, TRUE, TRUE, 0);
+#endif
+			gtk_widget_show(label);
+		}
+
+		// Mark it as a modal transient dialog
+		gtk_window_set_modal(GTK_WINDOW(messageBoxDialog), TRUE);
+		gtk_window_set_transient_for(GTK_WINDOW(messageBoxDialog),
+		                             GTK_WINDOW(PWidget(w)));
+
+		gtk_widget_show(messageBoxDialog);
+		gtk_window_add_accel_group(GTK_WINDOW(messageBoxDialog), accel_group);
+		while (messageBoxResult < 0) {
+			gtk_main_iteration();
+		}
+		dialogsOnScreen--;
+	}
+	return static_cast<MessageBoxChoice>(messageBoxResult);
+}
+
+void SciTEGTK::FindMessageBox(const std::string &msg, const std::string *findItem) {
+	if (findItem == 0) {
+		GUI::gui_string msgBuf = LocaliseMessage(msg.c_str());
+		WindowMessageBox(wSciTE, msgBuf);
+	} else {
+		GUI::gui_string msgBuf = LocaliseMessage(msg.c_str(), findItem->c_str());
+		WindowMessageBox(wSciTE, msgBuf);
+	}
+}
+
+void SciTEGTK::AboutDialog() {
+	WindowMessageBox(wSciTE, GUI::gui_string("SciTE\nby Neil Hodgson neilh@scintilla.org ."),
+	                 mbsAboutBox);
+}
+
+void SciTEGTK::QuitProgram() {
+	if (SaveIfUnsureAll() != saveCancelled) {
+		quitting = true;
+		// If ongoing saves, wait for them to complete.
+		if (!buffers.SavingInBackground()) {
+			gtk_main_quit();
+		}
+	}
+}
+
+void SciTEGTK::PanePositionChanged(GObject *, GParamSpec *, SciTEGTK *scitew) {
+	bool sizeForced = scitew->UpdateOutputSize();
+
+	if (sizeForced) {
+		// Calling SizeContentWindows sets position on the H/VPaned and thus
+		// prevents the user setting the size of either output or editor to less
+		// than 20px.
+
+		// Setting the position again may lead to this function being called
+		// twice, but it doesn't lead to an infinite loop, since sizeForced is
+		// only true when the position really changed.
+		scitew->SizeContentWindows();
+	}
+}
+
+gint SciTEGTK::PaneButtonRelease(GtkWidget *, GdkEvent *, SciTEGTK *scitew) {
+	// Only register previousHeightOutput when the user stops dragging
+
+	scitew->UpdateOutputSize();
+
+	if (scitew->heightOutput > 0) {
+		scitew->previousHeightOutput = scitew->heightOutput;
+	}
+
+	return FALSE;
+}
+
+bool SciTEGTK::UpdateOutputSize() {
+	// This sets heightOutput and returns a boolean indicating whether
+	// heightOutput is equal to the H/VPaned position or an adjustment was made.
+
+	gint max;
+	int pos;
+	int newHeight;
+
+	g_object_get(G_OBJECT(splitPane), "max-position", &max, NULL);
+	pos = gtk_paned_get_position(GTK_PANED(splitPane));
+
+	newHeight = max - pos;
+
+	// Return false if the height hasn't changed
+	// This prevents an infinite loop in PanePositionChanged()
+	if (newHeight == heightOutput)
+		return false;
+
+	heightOutput = newHeight;
+
+	if (heightOutput > (max - 20)) {
+		heightOutput = max;
+		return true;
+	} else if (heightOutput < 20) {
+		heightOutput = 0;
+		return true;
+	}
+
+	return false;
+}
+
+gint SciTEGTK::QuitSignal(GtkWidget *, GdkEventAny *, SciTEGTK *scitew) {
+	scitew->QuitProgram();
+	return TRUE;
+}
+
+void SciTEGTK::ButtonSignal(GtkWidget *, gpointer data) {
+	instance->Command((guint)(long)data);
+}
+
+void SciTEGTK::MenuSignal(GtkMenuItem *menuitem, SciTEGTK *scitew) {
+	if (scitew->allowMenuActions) {
+		gint action = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "CmdNum"));
+		scitew->Command(action);
+	}
+}
+
+void SciTEGTK::NotifySignal(GtkWidget *, gint /*wParam*/, SCNotification *notification, SciTEGTK *scitew) {
+	scitew->Notify(notification);
+}
+
+gint SciTEGTK::KeyPress(GtkWidget * /*widget*/, GdkEventKey *event, SciTEGTK *scitew) {
+	return scitew->Key(event);
+}
+
+gint SciTEGTK::KeyRelease(GtkWidget * /*widget*/, GdkEventKey *event, SciTEGTK *scitew) {
+	return scitew->Key(event);
+}
+
+gint SciTEGTK::MousePress(GtkWidget * /*widget*/, GdkEventButton *event, SciTEGTK *scitew) {
+	return scitew->Mouse(event);
+}
+
+// Translate key strokes that are not in a menu into commands
+class KeyToCommand {
+public:
+	int modifiers;
+	unsigned int key;	// For alphabetic keys has to match the shift modifier.
+	int msg;
+};
+
+enum {
+    m__ = 0,
+    mS_ = GDK_SHIFT_MASK,
+    m_C = GDK_CONTROL_MASK,
+    mSC = GDK_SHIFT_MASK | GDK_CONTROL_MASK
+};
+
+static KeyToCommand kmap[] = {
+                                 {m_C, GKEY_Tab, IDM_NEXTFILESTACK},
+                                 {mSC, GKEY_ISO_Left_Tab, IDM_PREVFILESTACK},
+                                 {m_C, GKEY_KP_Enter, IDM_COMPLETEWORD},
+                                 {GDK_MOD1_MASK, GKEY_F2, IDM_BOOKMARK_NEXT_SELECT},
+                                 {GDK_MOD1_MASK|GDK_SHIFT_MASK, GKEY_F2, IDM_BOOKMARK_PREV_SELECT},
+                                 {m_C, GKEY_F3, IDM_FINDNEXTSEL},
+                                 {mSC, GKEY_F3, IDM_FINDNEXTBACKSEL},
+                                 {m_C, GKEY_F4, IDM_CLOSE},
+                                 {m_C, 'j', IDM_PREVMATCHPPC},
+                                 {mSC, 'J', IDM_SELECTTOPREVMATCHPPC},
+                                 {m_C, 'k', IDM_NEXTMATCHPPC},
+                                 {mSC, 'K', IDM_SELECTTONEXTMATCHPPC},
+                                 {m_C, GKEY_KP_Multiply, IDM_EXPAND},
+                                 {0, 0, 0},
+                             };
+
+inline bool KeyMatch(const char *menuKey, int keyval, int modifiers) {
+	return SciTEKeys::MatchKeyCode(
+		SciTEKeys::ParseKeyCode(menuKey), keyval, modifiers);
+}
+
+gint SciTEGTK::Key(GdkEventKey *event) {
+	//printf("S-key: %d %x %x %x %x\n",event->keyval, event->state, GDK_SHIFT_MASK, GDK_CONTROL_MASK, GDK_F3);
+	if (event->type == GDK_KEY_RELEASE) {
+		if (event->keyval == GKEY_Control_L || event->keyval == GKEY_Control_R) {
+			g_signal_stop_emission_by_name(
+			    G_OBJECT(PWidget(wSciTE)), "key-release-event");
+			this->EndStackedTabbing();
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	int modifiers = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_MOD4_MASK);
+
+	int cmodifiers = // modifier mask for Lua extension
+		((event->state & GDK_SHIFT_MASK)   ? SCMOD_SHIFT : 0) |
+		((event->state & GDK_CONTROL_MASK) ? SCMOD_CTRL  : 0) |
+		((event->state & GDK_MOD1_MASK)    ? SCMOD_ALT   : 0);
+	if (extender && extender->OnKey(event->keyval, cmodifiers))
+		return 1;
+
+	int commandID = 0;
+	for (int i = 0; kmap[i].msg; i++) {
+		if ((event->keyval == kmap[i].key) && (modifiers == kmap[i].modifiers)) {
+			commandID = kmap[i].msg;
+		}
+	}
+	if (!commandID) {
+		// Look through language menu
+		for (unsigned int j = 0; j < languageMenu.size(); j++) {
+			if (KeyMatch(languageMenu[j].menuKey.c_str(), event->keyval, modifiers)) {
+				commandID = IDM_LANGUAGE + j;
+			}
+		}
+	}
+	if (commandID) {
+		Command(commandID);
+	}
+	if ((commandID == IDM_NEXTFILE) ||
+		(commandID == IDM_PREVFILE) ||
+		(commandID == IDM_NEXTFILESTACK) ||
+		(commandID == IDM_PREVFILESTACK)) {
+		// Stop the default key processing from moving the focus
+		g_signal_stop_emission_by_name(
+		    G_OBJECT(PWidget(wSciTE)), "key_press_event");
+	}
+
+	// check tools menu command shortcuts
+	for (int tool_i = 0; tool_i < toolMax; ++tool_i) {
+		GtkWidget *item = MenuItemFromAction(IDM_TOOLS + tool_i);
+		if (item) {
+			long keycode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "key"));
+			if (keycode && SciTEKeys::MatchKeyCode(keycode, event->keyval, modifiers)) {
+				SciTEBase::MenuCommand(IDM_TOOLS + tool_i);
+				return 1;
+			}
+		}
+	}
+
+	// check user defined keys
+	for (const ShortcutItem &scut : shortCutItemList) {
+		if (KeyMatch(scut.menuKey.c_str(), event->keyval, modifiers)) {
+			const int commandNum = SciTEBase::GetMenuCommandAsInt(scut.menuCommand);
+			if (commandNum != -1) {
+				if (commandNum < 2000) {
+					SciTEBase::MenuCommand(commandNum);
+				} else {
+					PaneFocused().Call(static_cast<SA::Message>(commandNum));
+				}
+				g_signal_stop_emission_by_name(
+				    G_OBJECT(PWidget(wSciTE)), "key_press_event");
+				return 1;
+			}
+		}
+	}
+
+	if (findStrip.KeyDown(event) || replaceStrip.KeyDown(event) || userStrip.KeyDown(event)) {
+		g_signal_stop_emission_by_name(G_OBJECT(PWidget(wSciTE)), "key_press_event");
+		return 1;
+	}
+
+	return 0;
+}
+
+void SciTEGTK::PopUpCmd(GtkMenuItem *menuItem, SciTEGTK *scitew) {
+	sptr_t cmd = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuItem), "CmdNum"));
+	scitew->Command(cmd);
+}
+
+void SciTEGTK::AddToPopUp(const char *label, int cmd, bool enabled) {
+	GUI::gui_string localised = localiser.Text(label);
+	GtkWidget *menuItem;
+	if (label[0])
+		menuItem = gtk_menu_item_new_with_label(localised.c_str());
+	else
+		menuItem = gtk_separator_menu_item_new();
+	gtk_menu_shell_append(GTK_MENU_SHELL(popup.GetID()), menuItem);
+	g_object_set_data(G_OBJECT(menuItem), "CmdNum", GINT_TO_POINTER(cmd));
+	g_signal_connect(G_OBJECT(menuItem),"activate", G_CALLBACK(PopUpCmd), this);
+
+	if (cmd) {
+		if (menuItem)
+			gtk_widget_set_sensitive(menuItem, enabled);
+	}
+}
+
+gint SciTEGTK::Mouse(GdkEventButton *event) {
+	if (event->button == 3) {
+		// PopUp menu
+		GUI::ScintillaWindow *w = &wEditor;
+		menuSource = IDM_SRCWIN;
+		if (WindowFromWidget(PWidget(*w)) != event->window) {
+			if (WindowFromWidget(PWidget(wOutput)) == event->window) {
+				menuSource = IDM_RUNWIN;
+				w = &wOutput;
+			} else {
+				menuSource = 0;
+				//fprintf(stderr, "Menu source focus\n");
+				return FALSE;
+			}
+		}
+		// Convert to screen
+		int ox = 0;
+		int oy = 0;
+		gdk_window_get_origin(WindowFromWidget(PWidget(*w)), &ox, &oy);
+		ContextMenu(*w, GUI::Point(static_cast<int>(event->x) + ox,
+		                     static_cast<int>(event->y) + oy), wSciTE);
+		//fprintf(stderr, "Menu source %s\n",
+		//	(menuSource == IDM_SRCWIN) ? "IDM_SRCWIN" : "IDM_RUNWIN");
+	} else {
+		menuSource = 0;
+		//fprintf(stderr, "Menu source focus\n");
+	}
+
+	return FALSE;
+}
+
+void SciTEGTK::DragDataReceived(GtkWidget *, GdkDragContext *context,
+                                gint /*x*/, gint /*y*/, GtkSelectionData *selectionData, guint /*info*/, guint time, SciTEGTK *scitew) {
+	scitew->OpenUriList(reinterpret_cast<const char *>(gtk_selection_data_get_data(selectionData)));
+	gtk_drag_finish(context, TRUE, FALSE, time);
+}
+
+gint SciTEGTK::TabBarRelease(GtkNotebook *notebook, GdkEventButton *event) {
+	if (event->button == 1) {
+		SetDocumentAt(gtk_notebook_get_current_page(GTK_NOTEBOOK(wTabBar.GetID())));
+		CheckReload();
+	} else if (event->button == 2) {
+		for (int pageNum=0;pageNum<gtk_notebook_get_n_pages(notebook);pageNum++) {
+			GtkWidget *page = gtk_notebook_get_nth_page(notebook, pageNum);
+			if (page) {
+				GtkWidget *label = gtk_notebook_get_tab_label(notebook, page);
+				GtkAllocation allocation;
+				gtk_widget_get_allocation(label, &allocation);
+				if (event->x < (allocation.x + allocation.width)) {
+					CloseTab(pageNum);
+					break;
+				}
+			}
+		}
+	}
+	return FALSE;
+}
+
+gint SciTEGTK::TabBarScroll(GdkEventScroll *event) {
+	switch (event->direction) {
+		case GDK_SCROLL_RIGHT:
+		case GDK_SCROLL_DOWN:
+			Next();
+			WindowSetFocus(wEditor);
+			break;
+		case GDK_SCROLL_LEFT:
+		case GDK_SCROLL_UP:
+			Prev();
+			WindowSetFocus(wEditor);
+			break;
+#if GTK_CHECK_VERSION(3,4,0)
+		case GDK_SCROLL_SMOOTH:
+			break;
+#endif
+	}
+	// Return true because Next() or Prev() already switches the tab
+	return TRUE;
+}
+
+static GtkWidget *pixmap_new(gchar **xpm) {
+	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)(char **)xpm);
+	return gtk_image_new_from_pixbuf(pixbuf);
+}
+
+GtkWidget *SciTEGTK::AddToolButton(const char *text, int cmd, GtkWidget *toolbar_icon) {
+	gtk_widget_show(GTK_WIDGET(toolbar_icon));
+	GUI::gui_string localised = localiser.Text(text);
+	GtkToolItem *button = gtk_tool_button_new(toolbar_icon, localised.c_str());
+	gtk_widget_set_tooltip_text(GTK_WIDGET(button), localised.c_str());
+	gtk_widget_show(GTK_WIDGET(button));
+	gtk_toolbar_insert(GTK_TOOLBAR(PWidget(wToolBar)), button, -1);
+
+	g_signal_connect(G_OBJECT(button), "clicked",
+	                   G_CALLBACK(ButtonSignal),
+	                   GINT_TO_POINTER(cmd));
+	return GTK_WIDGET(button);
+}
+
+static void AddToolSpace(GtkToolbar *toolbar) {
+	GtkToolItem *space = gtk_separator_tool_item_new();
+	gtk_widget_show(GTK_WIDGET(space));
+	gtk_toolbar_insert(toolbar, space, -1);
+}
+
+void SciTEGTK::AddToolBar() {
+	if (props.GetInt("toolbar.usestockicons") == 1) {
+		AddToolButton("New", IDM_NEW, gtk_image_new_from_icon_name("document-new", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Open", IDM_OPEN, gtk_image_new_from_icon_name("document-open", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Save", IDM_SAVE, gtk_image_new_from_icon_name("document-save", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Close", IDM_CLOSE, gtk_image_new_from_icon_name("window-close", GTK_ICON_SIZE_LARGE_TOOLBAR));
+
+		AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+		AddToolButton("Undo", IDM_UNDO, gtk_image_new_from_icon_name("edit-undo", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Redo", IDM_REDO, gtk_image_new_from_icon_name("edit-redo", GTK_ICON_SIZE_LARGE_TOOLBAR));
+
+		AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+		AddToolButton("Cut", IDM_CUT, gtk_image_new_from_icon_name("edit-cut", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Copy", IDM_COPY, gtk_image_new_from_icon_name("edit-copy", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Paste", IDM_PASTE, gtk_image_new_from_icon_name("edit-paste", GTK_ICON_SIZE_LARGE_TOOLBAR));
+
+		AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+		AddToolButton("Find in Files", IDM_FINDINFILES, gtk_image_new_from_icon_name("edit-find", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Find", IDM_FIND, gtk_image_new_from_icon_name("gtk-zoom-fit", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Find Next", IDM_FINDNEXT, gtk_image_new_from_icon_name("go-jump", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Replace", IDM_REPLACE, gtk_image_new_from_icon_name("edit-find-replace", GTK_ICON_SIZE_LARGE_TOOLBAR));
+
+		AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+		btnCompile = AddToolButton("Compile", IDM_COMPILE, gtk_image_new_from_icon_name("gtk-execute", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		btnBuild = AddToolButton("Build", IDM_BUILD, gtk_image_new_from_icon_name("gtk-convert", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		btnStop = AddToolButton("Stop", IDM_STOPEXECUTE, gtk_image_new_from_icon_name("process-stop", GTK_ICON_SIZE_LARGE_TOOLBAR));
+
+		AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+		AddToolButton("Previous", IDM_PREVFILE, gtk_image_new_from_icon_name("go-previous", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		AddToolButton("Next Buffer", IDM_NEXTFILE, gtk_image_new_from_icon_name("go-next", GTK_ICON_SIZE_LARGE_TOOLBAR));
+		return;
+	}
+	AddToolButton("New", IDM_NEW, pixmap_new((gchar**)filenew_xpm));
+	AddToolButton("Open", IDM_OPEN, pixmap_new((gchar**)fileopen_xpm));
+	AddToolButton("Save", IDM_SAVE, pixmap_new((gchar**)filesave_xpm));
+	AddToolButton("Close", IDM_CLOSE, pixmap_new((gchar**)close_xpm));
+
+	AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+	AddToolButton("Undo", IDM_UNDO, pixmap_new((gchar**)undo_xpm));
+	AddToolButton("Redo", IDM_REDO, pixmap_new((gchar**)redo_xpm));
+
+	AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+	AddToolButton("Cut", IDM_CUT, pixmap_new((gchar**)editcut_xpm));
+	AddToolButton("Copy", IDM_COPY, pixmap_new((gchar**)editcopy_xpm));
+	AddToolButton("Paste", IDM_PASTE, pixmap_new((gchar**)editpaste_xpm));
+
+	AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+	AddToolButton("Find in Files", IDM_FINDINFILES, pixmap_new((gchar**)findinfiles_xpm));
+	AddToolButton("Find", IDM_FIND, pixmap_new((gchar**)search_xpm));
+	AddToolButton("Find Next", IDM_FINDNEXT, pixmap_new((gchar**)findnext_xpm));
+	AddToolButton("Replace", IDM_REPLACE, pixmap_new((gchar**)replace_xpm));
+
+	AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+	btnCompile = AddToolButton("Compile", IDM_COMPILE, pixmap_new((gchar**)compile_xpm));
+	btnBuild = AddToolButton("Build", IDM_BUILD, pixmap_new((gchar**)build_xpm));
+	btnStop = AddToolButton("Stop", IDM_STOPEXECUTE, pixmap_new((gchar**)stop_xpm));
+
+	AddToolSpace(GTK_TOOLBAR(PWidget(wToolBar)));
+	AddToolButton("Previous", IDM_PREVFILE, pixmap_new((gchar**)prev_xpm));
+	AddToolButton("Next Buffer", IDM_NEXTFILE, pixmap_new((gchar**)next_xpm));
+}
+
+std::string SciTEGTK::TranslatePath(const char *path) {
+	if (path && path[0] == '/') {
+		std::string spathTranslated;
+		std::string spath(path, 1, strlen(path));
+		spath.append("/");
+		size_t end = spath.find("/");
+		while (spath.length() > 1) {
+			std::string segment(spath.c_str(), 0, end);
+			GUI::gui_string segmentLocalised = localiser.Text(segment.c_str());
+			std::replace(segmentLocalised.begin(), segmentLocalised.end(), '/', '|');
+			spathTranslated.append("/");
+			spathTranslated.append(segmentLocalised.c_str());
+			spath.erase(0, end + 1);
+			end = spath.find("/");
+		}
+		return spathTranslated;
+	} else {
+		return path ? path : std::string();
+	}
+}
+
+static std::string WithoutUnderscore(const char *s) {
+	std::string ret;
+	while (*s) {
+		if (*s != '_')
+			ret += *s;
+		s++;
+	}
+	return ret;
+}
+
+void SciTEGTK::CreateTranslatedMenu(int n, const SciTEItemFactoryEntry items[],
+                                    int nRepeats, const char *prefix, int startNum,
+                                    int startID, const char *radioStart) {
+
+	const int dim = n + nRepeats;
+	std::vector<SciTEItemFactoryEntry> translatedItems(dim);
+	std::vector<std::string> translatedText(dim);
+	std::vector<std::string> translatedRadios(dim);
+	std::vector<std::string> userDefinedAccels(n);
+	int i = 0;
+
+	for (; i < n; i++) {
+		// Try to find user-defined accelerator key
+		std::string menuPath = "menukey";			// menupath="menukey"
+		menuPath += items[i].path;		// menupath="menukey/File/Save _As..."
+		Substitute(menuPath, "_", "");		// menupath="menukey/File/Save As..."
+		Substitute(menuPath, ".", "");		// menupath="menukey/File/Save As"
+		Substitute(menuPath, "/", ".");		// menupath="menukey.File.Save As"
+		Substitute(menuPath, " ", "_");	// menupath="menukey.File.Save_As"
+		LowerCaseAZ(menuPath);		// menupath="menukey.file.save_as"
+
+		std::string accelKey = props.GetString(menuPath.c_str());
+
+		const char *itemAccel = items[i].accelerator;
+		if (!accelKey.empty()) {
+			if (accelKey == "\"\"" || accelKey == "none") {
+				accelKey.clear();	// Allow user to clear accelerator key
+			}
+			userDefinedAccels[i] = accelKey;
+			itemAccel = userDefinedAccels[i].c_str();
+		}
+
+		translatedItems[i].path = (gchar*) items[i].path;
+		translatedItems[i].accelerator = (gchar*) itemAccel;
+		translatedItems[i].callback_action = items[i].callback_action;
+		translatedItems[i].item_type = (gchar*) items[i].item_type;
+		translatedText[i] = TranslatePath(translatedItems[i].path);
+		translatedItems[i].path = translatedText[i].c_str();
+		translatedRadios[i] = TranslatePath(translatedItems[i].item_type);
+		translatedItems[i].item_type = translatedRadios[i].c_str();
+
+	}
+	for (; i < dim; i++) {
+		int suffix = i - n + startNum;
+		std::string ssnum = StdStringFromInteger(suffix);
+		translatedText[i] = TranslatePath(prefix);
+		translatedText[i] += ssnum;
+		translatedItems[i].path = translatedText[i].c_str();
+		translatedItems[i].accelerator = NULL;
+		translatedItems[i].callback_action = startID + suffix;
+		translatedRadios[i] = TranslatePath(radioStart);
+		translatedItems[i].item_type = translatedRadios[i].c_str();
+	}
+	// Only two levels of submenu supported
+	for (int itMenu=0; itMenu < dim; itMenu++) {
+		SciTEItemFactoryEntry *psife = &translatedItems[itMenu];
+		const char *afterSlash = psife->path+1;
+		const char *lastSlash = strrchr(afterSlash, '/');
+		std::string menuName(afterSlash, lastSlash ? (lastSlash-afterSlash) : 0);
+		GtkWidget *menuParent = menuBar;
+		if (!menuName.empty()) {
+			if (pulldowns.count(menuName) > 0) {
+				menuParent = pulldowns[menuName];
+			} else {
+				fprintf(stderr, "*** failed to find parent %s\n", psife->path);
+			}
+		}
+		const std::string_view itemType = psife->item_type;
+		if (itemType == "<Branch>") {
+			// Submenu "/_Tools" "/File/Encodin_g"
+			const char *menuTitle = lastSlash ? (lastSlash + 1) : afterSlash;
+			GtkWidget *menuItemPullDown = gtk_menu_item_new_with_mnemonic(menuTitle);
+			GtkWidget *menuPullDown = gtk_menu_new();
+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuItemPullDown), menuPullDown);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menuParent), menuItemPullDown);
+			std::string baseName = WithoutUnderscore(afterSlash);
+			pulldowns[baseName] = menuPullDown;
+		} else {
+			// Item "/File/_New"
+			std::string itemName(lastSlash+1);
+			GtkWidget *menuItemCommand = 0;
+			if (itemType.empty()) {
+				menuItemCommand = gtk_menu_item_new_with_mnemonic(itemName.c_str());
+			} else if (itemType == "<CheckItem>") {
+				menuItemCommand = gtk_check_menu_item_new_with_mnemonic(itemName.c_str());
+			} else if ((itemType == "<RadioItem>") || (itemType[0] == '/')) {
+				menuItemCommand = gtk_radio_menu_item_new_with_mnemonic(radiogroups[menuName], itemName.c_str());
+				radiogroups[menuName] = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuItemCommand));
+			} else if (itemType ==  "<Separator>") {
+				menuItemCommand = gtk_separator_menu_item_new();
+			} else {
+				menuItemCommand = gtk_menu_item_new_with_mnemonic(itemName.c_str());
+			}
+			if (psife->accelerator && psife->accelerator[0]) {
+				guint acceleratorKey;
+				GdkModifierType acceleratorMods;
+				gtk_accelerator_parse(psife->accelerator, &acceleratorKey, &acceleratorMods);
+				if (acceleratorKey) {
+					gtk_widget_add_accelerator(menuItemCommand, "activate", accelGroup,
+						acceleratorKey, acceleratorMods, GTK_ACCEL_VISIBLE);
+				} else {
+					//fprintf(stderr, "Failed to add accelerator '%s' for '%s'\n", psife->accelerator, psife->path);
+				}
+			}
+			g_object_set_data(G_OBJECT(menuItemCommand), "CmdNum",
+				GINT_TO_POINTER(psife->callback_action));
+			g_signal_connect(G_OBJECT(menuItemCommand),"activate", G_CALLBACK(MenuSignal), this);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menuParent), menuItemCommand);
+			mapMenuItemFromId[psife->callback_action] = menuItemCommand;
+		}
+	}
+}
+
+void SciTEGTK::CreateMenu() {
+
+	GCallback menuSig = G_CALLBACK(MenuSignal);
+	SciTEItemFactoryEntry menuItems[] = {
+	                                      {"/_File", NULL, NULL, 0, "<Branch>"},
+	                                      {"/File/_New", "<control>N", menuSig, IDM_NEW, 0},
+	                                      {"/File/_Open...", "<control>O", menuSig, IDM_OPEN, 0},
+	                                      {"/File/Open Selected _Filename", "<control><shift>O", menuSig, IDM_OPENSELECTED, 0},
+	                                      {"/File/_Revert", "<control>R", menuSig, IDM_REVERT, 0},
+	                                      {"/File/_Close", "<control>W", menuSig, IDM_CLOSE, 0},
+	                                      {"/File/_Save", "<control>S", menuSig, IDM_SAVE, 0},
+	                                      {"/File/Save _As...", "<control><shift>S", menuSig, IDM_SAVEAS, 0},
+	                                      {"/File/Save a Cop_y...", "<control><shift>P", menuSig, IDM_SAVEACOPY, 0},
+	                                      {"/File/Copy Pat_h", NULL, menuSig, IDM_COPYPATH, 0},
+	                                      {"/File/Encodin_g", NULL, NULL, 0, "<Branch>"},
+	                                      {"/File/Encoding/_Code Page Property", NULL, menuSig, IDM_ENCODING_DEFAULT, "<RadioItem>"},
+	                                      {"/File/Encoding/UTF-16 _Big Endian", NULL, menuSig, IDM_ENCODING_UCS2BE, "/File/Encoding/Code Page Property"},
+	                                      {"/File/Encoding/UTF-16 _Little Endian", NULL, menuSig, IDM_ENCODING_UCS2LE, "/File/Encoding/Code Page Property"},
+	                                      {"/File/Encoding/UTF-8 _with BOM", NULL, menuSig, IDM_ENCODING_UTF8, "/File/Encoding/Code Page Property"},
+	                                      {"/File/Encoding/_UTF-8", NULL, menuSig, IDM_ENCODING_UCOOKIE, "/File/Encoding/Code Page Property"},
+	                                      {"/File/_Export", "", 0, 0, "<Branch>"},
+	                                      {"/File/Export/As _HTML...", NULL, menuSig, IDM_SAVEASHTML, 0},
+	                                      {"/File/Export/As _RTF...", NULL, menuSig, IDM_SAVEASRTF, 0},
+	                                      {"/File/Export/As _PDF...", NULL, menuSig, IDM_SAVEASPDF, 0},
+	                                      {"/File/Export/As _LaTeX...", NULL, menuSig, IDM_SAVEASTEX, 0},
+	                                      {"/File/Export/As _XML...", NULL, menuSig, IDM_SAVEASXML, 0},
+	                                      {"/File/Page Set_up", NULL, menuSig, IDM_PRINTSETUP, 0},
+	                                      {"/File/_Print", "<control>P", menuSig, IDM_PRINT, 0},
+	                                      {"/File/sep1", NULL, NULL, 0, "<Separator>"},
+	                                      {"/File/_Load Session...", "", menuSig, IDM_LOADSESSION, 0},
+	                                      {"/File/Sa_ve Session...", "", menuSig, IDM_SAVESESSION, 0},
+	                                      {"/File/sep2", NULL, menuSig, IDM_MRU_SEP, "<Separator>"},
+	                                      {"/File/File0", "", menuSig, fileStackCmdID + 0, 0},
+	                                      {"/File/File1", "", menuSig, fileStackCmdID + 1, 0},
+	                                      {"/File/File2", "", menuSig, fileStackCmdID + 2, 0},
+	                                      {"/File/File3", "", menuSig, fileStackCmdID + 3, 0},
+	                                      {"/File/File4", "", menuSig, fileStackCmdID + 4, 0},
+	                                      {"/File/File5", "", menuSig, fileStackCmdID + 5, 0},
+	                                      {"/File/File6", "", menuSig, fileStackCmdID + 6, 0},
+	                                      {"/File/File7", "", menuSig, fileStackCmdID + 7, 0},
+	                                      {"/File/File8", "", menuSig, fileStackCmdID + 8, 0},
+	                                      {"/File/File9", "", menuSig, fileStackCmdID + 9, 0},
+	                                      {"/File/sep3", NULL, NULL, 0, "<Separator>"},
+	                                      {"/File/E_xit", "", menuSig, IDM_QUIT, 0},
+
+	                                      {"/_Edit", NULL, NULL, 0, "<Branch>"},
+	                                      {"/Edit/_Undo", "<control>Z", menuSig, IDM_UNDO, 0},
+
+	                                      {"/Edit/_Redo", "<control>Y", menuSig, IDM_REDO, 0},
+	                                      {"/Edit/sep1", NULL, NULL, 0, "<Separator>"},
+	                                      {"/Edit/Cu_t", "<control>X", menuSig, IDM_CUT, 0},
+	                                      {"/Edit/_Copy", "<control>C", menuSig, IDM_COPY, 0},
+	                                      {"/Edit/_Paste", "<control>V", menuSig, IDM_PASTE, 0},
+	                                      {"/Edit/Duplicat_e", "<control>D", menuSig, IDM_DUPLICATE, 0},
+	                                      {"/Edit/_Delete", "Delete", menuSig, IDM_CLEAR, 0},
+	                                      {"/Edit/Select _All", "<control>A", menuSig, IDM_SELECTALL, 0},
+	                                      {"/Edit/sep2", NULL, NULL, 0, "<Separator>"},
+	                                      {"/Edit/Match _Brace", "<control>E", menuSig, IDM_MATCHBRACE, 0},
+	                                      {"/Edit/Select t_o Brace", "<control><shift>E", menuSig, IDM_SELECTTOBRACE, 0},
+	                                      {"/Edit/S_how Calltip", "<control><shift>space", menuSig, IDM_SHOWCALLTIP, 0},
+	                                      {"/Edit/Complete S_ymbol", "<control>I", menuSig, IDM_COMPLETE, 0},
+	                                      {"/Edit/Complete _Word", "<control>Return", menuSig, IDM_COMPLETEWORD, 0},
+	                                      {"/Edit/Expand Abbre_viation", "<control>B", menuSig, IDM_ABBREV, 0},
+	                                      {"/Edit/_Insert Abbreviation", "<control><shift>R", menuSig, IDM_INS_ABBREV, 0},
+	                                      {"/Edit/Block Co_mment or Uncomment", "<control>Q", menuSig, IDM_BLOCK_COMMENT, 0},
+	                                      {"/Edit/Bo_x Comment", "<control><shift>B", menuSig, IDM_BOX_COMMENT, 0},
+	                                      {"/Edit/Stream Comme_nt", "<control><shift>Q", menuSig, IDM_STREAM_COMMENT, 0},
+	                                      {"/Edit/Make _Selection Uppercase", "<control><shift>U", menuSig, IDM_UPRCASE, 0},
+	                                      {"/Edit/Make Selection _Lowercase", "<control>U", menuSig, IDM_LWRCASE, 0},
+	                                      {"/Edit/Reverse Selected Lines", NULL, menuSig, IDM_LINEREVERSE, 0},
+	                                      {"/Edit/Para_graph", NULL, NULL, 0, "<Branch>"},
+	                                      {"/Edit/Paragraph/_Join", NULL, menuSig, IDM_JOIN, 0},
+	                                      {"/Edit/Paragraph/_Split", NULL, menuSig, IDM_SPLIT, 0},
+
+	                                      {"/_Search", NULL, NULL, 0, "<Branch>"},
+	                                      {"/Search/_Find...", "<control>F", menuSig, IDM_FIND, 0},
+	                                      {"/Search/Find _Next", "F3", menuSig, IDM_FINDNEXT, 0},
+	                                      {"/Search/Find _Previous", "<shift>F3", menuSig, IDM_FINDNEXTBACK, 0},
+	                                      {"/Search/F_ind in Files...", "<control><shift>F", menuSig, IDM_FINDINFILES, 0},
+	                                      {"/Search/_Replace...", "<control>H", menuSig, IDM_REPLACE, 0},
+	                                      {"/Search/Incremental _Search", "<control><alt>I", menuSig, IDM_INCSEARCH, 0},
+	                                      {"/Search/Selection _Add Next", "<control><shift>D", menuSig, IDM_SELECTIONADDNEXT, 0},
+	                                      {"/Search/Selection Add _Each", "", menuSig, IDM_SELECTIONADDEACH, 0},
+	                                      {"/Search/sep3", NULL, NULL, 0, "<Separator>"},
+	                                      {"/Search/_Go To...", "<control>G", menuSig, IDM_GOTO, 0},
+	                                      {"/Search/Next Book_mark", "F2", menuSig, IDM_BOOKMARK_NEXT, 0},
+	                                      {"/Search/Pre_vious Bookmark", "<shift>F2", menuSig, IDM_BOOKMARK_PREV, 0},
+	                                      {"/Search/_Toggle Bookmark", "<control>F2", menuSig, IDM_BOOKMARK_TOGGLE, 0},
+	                                      {"/Search/_Clear All Bookmarks", "", menuSig, IDM_BOOKMARK_CLEARALL, 0},
+	                                      {"/Search/Select All _Bookmarks", "", menuSig, IDM_BOOKMARK_SELECT_ALL, 0},
+
+	                                      {"/_View", NULL, NULL, 0, "<Branch>"},
+	                                      {"/View/Toggle _current fold", "", menuSig, IDM_EXPAND, 0},
+	                                      {"/View/Toggle _all folds", "", menuSig, IDM_TOGGLE_FOLDALL, 0},
+	                                      {"/View/sep1", NULL, NULL, 0, "<Separator>"},
+	                                      {"/View/Full Scree_n", "F11", menuSig, IDM_FULLSCREEN, "<CheckItem>"},
+	                                      {"/View/_Tool Bar", "", menuSig, IDM_VIEWTOOLBAR, "<CheckItem>"},
+	                                      {"/View/Tab _Bar", "", menuSig, IDM_VIEWTABBAR, "<CheckItem>"},
+	                                      {"/View/_Status Bar", "", menuSig, IDM_VIEWSTATUSBAR, "<CheckItem>"},
+	                                      {"/View/sep2", NULL, NULL, 0, "<Separator>"},
+	                                      {"/View/_Whitespace", "<control><shift>A", menuSig, IDM_VIEWSPACE, "<CheckItem>"},
+	                                      {"/View/_End of Line", "<control><shift>N", menuSig, IDM_VIEWEOL, "<CheckItem>"},
+	                                      {"/View/_Indentation Guides", NULL, menuSig, IDM_VIEWGUIDES, "<CheckItem>"},
+	                                      {"/View/_Line Numbers", "", menuSig, IDM_LINENUMBERMARGIN, "<CheckItem>"},
+	                                      {"/View/_Margin", NULL, menuSig, IDM_SELMARGIN, "<CheckItem>"},
+	                                      {"/View/_Fold Margin", NULL, menuSig, IDM_FOLDMARGIN, "<CheckItem>"},
+	                                      {"/View/_Output", "F8", menuSig, IDM_TOGGLEOUTPUT, "<CheckItem>"},
+	                                      {"/View/_Parameters", NULL, menuSig, IDM_TOGGLEPARAMETERS, "<CheckItem>"},
+
+	                                      {"/_Tools", NULL, NULL, 0, "<Branch>"},
+	                                      {"/Tools/_Compile", "<control>F7", menuSig, IDM_COMPILE, 0},
+	                                      {"/Tools/_Build", "F7", menuSig, IDM_BUILD, 0},
+	                                      {"/Tools/_Clean", "<shift>F7", menuSig, IDM_CLEAN, 0},
+	                                      {"/Tools/_Go", "F5", menuSig, IDM_GO, 0},
+
+	                                      {"/Tools/Tool0", NULL, menuSig, IDM_TOOLS + 0, 0},
+	                                      {"/Tools/Tool1", NULL, menuSig, IDM_TOOLS + 1, 0},
+	                                      {"/Tools/Tool2", NULL, menuSig, IDM_TOOLS + 2, 0},
+	                                      {"/Tools/Tool3", NULL, menuSig, IDM_TOOLS + 3, 0},
+	                                      {"/Tools/Tool4", NULL, menuSig, IDM_TOOLS + 4, 0},
+	                                      {"/Tools/Tool5", NULL, menuSig, IDM_TOOLS + 5, 0},
+	                                      {"/Tools/Tool6", NULL, menuSig, IDM_TOOLS + 6, 0},
+	                                      {"/Tools/Tool7", NULL, menuSig, IDM_TOOLS + 7, 0},
+	                                      {"/Tools/Tool8", NULL, menuSig, IDM_TOOLS + 8, 0},
+	                                      {"/Tools/Tool9", NULL, menuSig, IDM_TOOLS + 9, 0},
+
+	                                      {"/Tools/Tool10", NULL, menuSig, IDM_TOOLS + 10, 0},
+	                                      {"/Tools/Tool11", NULL, menuSig, IDM_TOOLS + 11, 0},
+	                                      {"/Tools/Tool12", NULL, menuSig, IDM_TOOLS + 12, 0},
+	                                      {"/Tools/Tool13", NULL, menuSig, IDM_TOOLS + 13, 0},
+	                                      {"/Tools/Tool14", NULL, menuSig, IDM_TOOLS + 14, 0},
+	                                      {"/Tools/Tool15", NULL, menuSig, IDM_TOOLS + 15, 0},
+	                                      {"/Tools/Tool16", NULL, menuSig, IDM_TOOLS + 16, 0},
+	                                      {"/Tools/Tool17", NULL, menuSig, IDM_TOOLS + 17, 0},
+	                                      {"/Tools/Tool18", NULL, menuSig, IDM_TOOLS + 18, 0},
+	                                      {"/Tools/Tool19", NULL, menuSig, IDM_TOOLS + 19, 0},
+
+	                                      {"/Tools/Tool20", NULL, menuSig, IDM_TOOLS + 20, 0},
+	                                      {"/Tools/Tool21", NULL, menuSig, IDM_TOOLS + 21, 0},
+	                                      {"/Tools/Tool22", NULL, menuSig, IDM_TOOLS + 22, 0},
+	                                      {"/Tools/Tool23", NULL, menuSig, IDM_TOOLS + 23, 0},
+	                                      {"/Tools/Tool24", NULL, menuSig, IDM_TOOLS + 24, 0},
+	                                      {"/Tools/Tool25", NULL, menuSig, IDM_TOOLS + 25, 0},
+	                                      {"/Tools/Tool26", NULL, menuSig, IDM_TOOLS + 26, 0},
+	                                      {"/Tools/Tool27", NULL, menuSig, IDM_TOOLS + 27, 0},
+	                                      {"/Tools/Tool28", NULL, menuSig, IDM_TOOLS + 28, 0},
+	                                      {"/Tools/Tool29", NULL, menuSig, IDM_TOOLS + 29, 0},
+
+	                                      {"/Tools/Tool30", NULL, menuSig, IDM_TOOLS + 30, 0},
+	                                      {"/Tools/Tool31", NULL, menuSig, IDM_TOOLS + 31, 0},
+	                                      {"/Tools/Tool32", NULL, menuSig, IDM_TOOLS + 32, 0},
+	                                      {"/Tools/Tool33", NULL, menuSig, IDM_TOOLS + 33, 0},
+	                                      {"/Tools/Tool34", NULL, menuSig, IDM_TOOLS + 34, 0},
+	                                      {"/Tools/Tool35", NULL, menuSig, IDM_TOOLS + 35, 0},
+	                                      {"/Tools/Tool36", NULL, menuSig, IDM_TOOLS + 36, 0},
+	                                      {"/Tools/Tool37", NULL, menuSig, IDM_TOOLS + 37, 0},
+	                                      {"/Tools/Tool38", NULL, menuSig, IDM_TOOLS + 38, 0},
+	                                      {"/Tools/Tool39", NULL, menuSig, IDM_TOOLS + 39, 0},
+
+	                                      {"/Tools/Tool40", NULL, menuSig, IDM_TOOLS + 40, 0},
+	                                      {"/Tools/Tool41", NULL, menuSig, IDM_TOOLS + 41, 0},
+	                                      {"/Tools/Tool42", NULL, menuSig, IDM_TOOLS + 42, 0},
+	                                      {"/Tools/Tool43", NULL, menuSig, IDM_TOOLS + 43, 0},
+	                                      {"/Tools/Tool44", NULL, menuSig, IDM_TOOLS + 44, 0},
+	                                      {"/Tools/Tool45", NULL, menuSig, IDM_TOOLS + 45, 0},
+	                                      {"/Tools/Tool46", NULL, menuSig, IDM_TOOLS + 46, 0},
+	                                      {"/Tools/Tool47", NULL, menuSig, IDM_TOOLS + 47, 0},
+	                                      {"/Tools/Tool48", NULL, menuSig, IDM_TOOLS + 48, 0},
+	                                      {"/Tools/Tool49", NULL, menuSig, IDM_TOOLS + 49, 0},
+
+
+	                                      {"/Tools/_Stop Executing", "<control>.", menuSig, IDM_STOPEXECUTE, NULL},
+	                                      {"/Tools/sep1", NULL, NULL, 0, "<Separator>"},
+	                                      {"/Tools/_Next Message", "F4", menuSig, IDM_NEXTMSG, 0},
+	                                      {"/Tools/_Previous Message", "<shift>F4", menuSig, IDM_PREVMSG, 0},
+	                                      {"/Tools/Clear _Output", "<shift>F5", menuSig, IDM_CLEAROUTPUT, 0},
+	                                      {"/Tools/_Switch Pane", "<control>F6", menuSig, IDM_SWITCHPANE, 0},
+	                                  };
+
+	SciTEItemFactoryEntry menuItemsOptions[] = {
+	            {"/_Options", NULL, NULL, 0, "<Branch>"},
+	            {"/Options/Vertical _Split", "", menuSig, IDM_SPLITVERTICAL, "<CheckItem>"},
+	            {"/Options/_Wrap", "", menuSig, IDM_WRAP, "<CheckItem>"},
+	            {"/Options/Wrap Out_put", "", menuSig, IDM_WRAPOUTPUT, "<CheckItem>"},
+	            {"/Options/_Read-Only", "", menuSig, IDM_READONLY, "<CheckItem>"},
+	            {"/Options/sep1", NULL, NULL, 0, "<Separator>"},
+	            {"/Options/_Line End Characters", "", 0, 0, "<Branch>"},
+	            {"/Options/Line End Characters/CR _+ LF", "", menuSig, IDM_EOL_CRLF, "<RadioItem>"},
+	            {"/Options/Line End Characters/_CR", "", menuSig, IDM_EOL_CR, "/Options/Line End Characters/CR + LF"},
+	            {"/Options/Line End Characters/_LF", "", menuSig, IDM_EOL_LF, "/Options/Line End Characters/CR + LF"},
+	            {"/Options/_Convert Line End Characters", "", menuSig, IDM_EOL_CONVERT, 0},
+	            {"/Options/sep2", NULL, NULL, 0, "<Separator>"},
+	            {"/Options/Change Inden_tation Settings", "<control><shift>I", menuSig, IDM_TABSIZE, 0},
+	            {"/Options/Use _Monospaced Font", "<control>F11", menuSig, IDM_MONOFONT, "<CheckItem>"},
+	            {"/Options/sep3", NULL, NULL, 0, "<Separator>"},
+	            {"/Options/Open Local _Options File", "", menuSig, IDM_OPENLOCALPROPERTIES, 0},
+	            {"/Options/Open _Directory Options File", "", menuSig, IDM_OPENDIRECTORYPROPERTIES, 0},
+	            {"/Options/Open _User Options File", "", menuSig, IDM_OPENUSERPROPERTIES, 0},
+	            {"/Options/Open _Global Options File", "", menuSig, IDM_OPENGLOBALPROPERTIES, 0},
+	            {"/Options/Open A_bbreviations File", "", menuSig, IDM_OPENABBREVPROPERTIES, 0},
+	            {"/Options/Open Lua Startup Scr_ipt", "", menuSig, IDM_OPENLUAEXTERNALFILE, 0},
+	            {"/Options/sep4", NULL, NULL, 0, "<Separator>"},
+	            {"/Options/_Edit Properties", "", 0, 0, "<Branch>"},
+	        };
+
+	SciTEItemFactoryEntry menuItemsLanguage[] = {
+	            {"/_Language", NULL, NULL, 0, "<Branch>"},
+	        };
+
+	SciTEItemFactoryEntry menuItemsBuffer[] = {
+	                                            {"/_Buffers", NULL, NULL, 0, "<Branch>"},
+	                                            {"/Buffers/_Previous", "<shift>F6", menuSig, IDM_PREVFILE, 0},
+	                                            {"/Buffers/_Next", "F6", menuSig, IDM_NEXTFILE, 0},
+	                                            {"/Buffers/_Close All", "", menuSig, IDM_CLOSEALL, 0},
+	                                            {"/Buffers/_Save All", "", menuSig, IDM_SAVEALL, 0},
+	                                            {"/Buffers/sep2", NULL, NULL, 0, "<Separator>"},
+	                                            {"/Buffers/Buffer0", "<alt>1", menuSig, bufferCmdID + 0, "<RadioItem>"},
+	                                            {"/Buffers/Buffer1", "<alt>2", menuSig, bufferCmdID + 1, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer2", "<alt>3", menuSig, bufferCmdID + 2, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer3", "<alt>4", menuSig, bufferCmdID + 3, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer4", "<alt>5", menuSig, bufferCmdID + 4, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer5", "<alt>6", menuSig, bufferCmdID + 5, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer6", "<alt>7", menuSig, bufferCmdID + 6, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer7", "<alt>8", menuSig, bufferCmdID + 7, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer8", "<alt>9", menuSig, bufferCmdID + 8, "/Buffers/Buffer0"},
+	                                            {"/Buffers/Buffer9", "<alt>0", menuSig, bufferCmdID + 9, "/Buffers/Buffer0"},
+	                                        };
+
+	SciTEItemFactoryEntry menuItemsHelp[] = {
+	                                          {"/_Help", NULL, NULL, 0, "<Branch>"},
+	                                          {"/Help/_Help", "F1", menuSig, IDM_HELP, 0},
+	                                          {"/Help/_SciTE Help", "", menuSig, IDM_HELP_SCITE, 0},
+	                                          {"/Help/_About SciTE", "", menuSig, IDM_ABOUT, 0},
+	                                      };
+
+	accelGroup = gtk_accel_group_new();
+
+	menuBar = gtk_menu_bar_new();
+	CreateTranslatedMenu(std::size(menuItems), menuItems);
+
+	CreateTranslatedMenu(std::size(menuItemsOptions), menuItemsOptions,
+	                     50, "/Options/Edit Properties/Props", 0, IDM_IMPORT, 0);
+	CreateTranslatedMenu(std::size(menuItemsLanguage), menuItemsLanguage,
+	                     100, "/Language/Language", 0, IDM_LANGUAGE, 0);
+	if (props.GetInt("buffers") > 1)
+		CreateTranslatedMenu(std::size(menuItemsBuffer), menuItemsBuffer,
+		                     bufferMax - 10, "/Buffers/Buffer", 10, bufferCmdID, "/Buffers/Buffer0");
+	CreateTranslatedMenu(std::size(menuItemsHelp), menuItemsHelp);
+	gtk_window_add_accel_group(GTK_WINDOW(PWidget(wSciTE)), accelGroup);
+}
+
+SystemAppearance SciTEGTK::CurrentAppearance() const noexcept {
+	SystemAppearance currentAppearance{};
+	gchar *themeName = nullptr;
+	g_object_get(settings, "gtk-theme-name", &themeName, nullptr);
+	currentAppearance.dark = g_str_has_suffix(themeName, "-dark");
+	currentAppearance.highContrast = g_str_has_prefix(themeName, "HighContrast");
+	if (g_strcmp0(themeName, "HighContrastInverse") == 0) {
+		currentAppearance.dark = true;
+	}
+	//fprintf(stderr, "Theme '%s' %d %d\n", themeName, currentAppearance.dark, currentAppearance.highContrast);
+	g_free(themeName);
+	return currentAppearance;
+}
+
+void FindReplaceStrip::SetIncrementalBehaviour(int behaviour) {
+	incrementalBehaviour = static_cast<IncrementalBehaviour>(behaviour);
+}
+
+void FindReplaceStrip::MarkIncremental() {
+ 	if (incrementalBehaviour == showAllMatches) {
+		pSearcher->MarkAll(Searcher::markIncremental);
+	}
+}
+
+void FindReplaceStrip::NextIncremental() {
+	if (initializingSearch)
+		return;
+
+	if (incrementalBehaviour == simple)
+		return;
+	if (pSearcher->findWhat.length()) {
+		pSearcher->MoveBack();
+	}
+
+	pSearcher->SetFindText(wComboFind.Text());
+
+	if (pSearcher->FindHasText()) {
+		pSearcher->FindNext(pSearcher->reverseFind, false, true);
+		pSearcher->SetCaretAsStart();
+	}
+	MarkIncremental();
+	WEntry::SetValid(wComboFind.Entry(), !pSearcher->FindHasText() || !pSearcher->failedfind);
+	wComboFind.InvalidateAll();
+}
+
+void FindStrip::Creation(GtkWidget *container) {
+	WTable table(1, 10);
+	SetID(table);
+	Strip::Creation(container);
+	gtk_container_set_border_width(GTK_CONTAINER(GetID()), 1);
+	gtk_box_pack_start(GTK_BOX(container), GTK_WIDGET(GetID()), FALSE, FALSE, 0);
+	wStaticFind.Create(localiser->Text(textFindPrompt).c_str());
+	table.Label(wStaticFind);
+
+	g_signal_connect(G_OBJECT(GetID()), "set-focus-child", G_CALLBACK(ChildFocusSignal), this);
+	g_signal_connect(G_OBJECT(GetID()), "focus", G_CALLBACK(FocusSignal), this);
+
+	wComboFind.Create();
+	table.Add(wComboFind, 1, true, 0, 0);
+
+	gtk_widget_show(wComboFind);
+
+	gtk_widget_show(GTK_WIDGET(GetID()));
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()),"changed",
+		G_CALLBACK(FindComboChanged), this);
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()), "key-press-event",
+		G_CALLBACK(EscapeSignal), this);
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()), "activate",
+		G_CALLBACK(ActivateSignal), this);
+
+	gtk_label_set_mnemonic_widget(GTK_LABEL(wStaticFind.GetID()), GTK_WIDGET(wComboFind.Entry()));
+
+	static ObjectSignal<FindStrip, &FindStrip::FindNextCmd> sigFindNext;
+	wButton.Create(localiser->Text(textFindNext), G_CALLBACK(sigFindNext.Function), this);
+	table.Add(wButton, 1, false, 0, 0);
+
+	static ObjectSignal<FindStrip, &FindStrip::MarkAllCmd> sigMarkAll;
+	wButtonMarkAll.Create(localiser->Text(textMarkAll), G_CALLBACK(sigMarkAll.Function), this);
+	table.Add(wButtonMarkAll, 1, false, 0, 0);
+
+#if !GTK_CHECK_VERSION(3,4,0)
+	gtk_widget_ensure_style(wButton);
+#endif
+
+	for (int i=0;i<checks;i++) {
+#if GTK_CHECK_VERSION(3,4,0)
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), NULL);
+#elif GTK_CHECK_VERSION(3,0,0)
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), gtk_widget_get_style(wButton.Pointer()));
+#else
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), wButton.Pointer()->style);
+#endif
+		wCheck[i].SetActive(pSearcher->FlagFromCmd(toggles[i].cmd));
+		table.Add(wCheck[i], 1, false, 0, 0);
+		wCheck[i].SetChangeFunction(ToggleChanged, this);
+	}
+}
+
+void FindStrip::Destruction() {
+}
+
+void FindStrip::Show(int buttonHeight) {
+	pSearcher->failedfind = false;
+	WEntry::SetValid(wComboFind.Entry(), true);
+	pSearcher->SetCaretAsStart();
+	Strip::Show(buttonHeight);
+
+	gtk_widget_set_size_request(wButton, -1, buttonHeight);
+	gtk_widget_set_size_request(wButtonMarkAll, -1, buttonHeight);
+	gtk_widget_set_size_request(wComboFind, widthCombo, buttonHeight);
+	gtk_widget_set_size_request(GTK_WIDGET(wComboFind.Entry()), -1, buttonHeight);
+	gtk_widget_set_size_request(wStaticFind, -1, heightStatic);
+
+	initializingSearch = true;	// Avoid search for initial value in search entry
+	wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	gtk_entry_set_text(wComboFind.Entry(), pSearcher->findWhat.c_str());
+	SetToggles();
+	initializingSearch = false;
+	MarkIncremental();
+
+	gtk_widget_grab_focus(GTK_WIDGET(wComboFind.Entry()));
+}
+
+void FindStrip::Close() {
+	if (visible) {
+		if (pSearcher->havefound) {
+			pSearcher->InsertFindInMemory();
+		}
+		Strip::Close();
+		pSearcher->UIClosed();
+	}
+}
+
+bool FindStrip::KeyDown(GdkEventKey *event) {
+	if (visible) {
+		if (Strip::KeyDown(event))
+			return true;
+		if (event->state & GDK_MOD1_MASK) {
+			for (int i=SearchOption::tWord; i<=SearchOption::tUp; i++) {
+				GUI::gui_string localised = localiser->Text(toggles[i].label);
+				char key = KeyFromLabel(localised);
+				if (static_cast<unsigned int>(key) == event->keyval) {
+					wCheck[i].Toggle();
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+void FindStrip::MenuAction(guint action) {
+	if (allowMenuActions) {
+		pSearcher->FlagFromCmd(action) = !pSearcher->FlagFromCmd(action);
+		SetToggles();
+		InvalidateAll();
+	}
+}
+
+void FindStrip::ActivateSignal(GtkWidget *, FindStrip *pStrip) {
+	pStrip->FindNextCmd();
+}
+
+void FindStrip::FindComboChanged(GtkEditable *, FindStrip *pStrip) {
+	pStrip->GrabToggles();
+	pStrip->NextIncremental();
+}
+
+void FindStrip::ToggleChanged(WCheckDraw *, void *user) {
+	FindStrip *pStrip = static_cast<FindStrip *>(user);
+	pStrip->GrabToggles();
+	pStrip->NextIncremental();
+}
+
+gboolean FindStrip::EscapeSignal(GtkWidget *w, GdkEventKey *event, FindStrip *pStrip) {
+	if (event->keyval == GKEY_Escape) {
+		g_signal_stop_emission_by_name(G_OBJECT(w), "key-press-event");
+		pStrip->Close();
+	}
+	return FALSE;
+}
+
+void FindStrip::GrabFields() {
+	pSearcher->SetFind(wComboFind.Text());
+	GrabToggles();
+}
+
+void FindStrip::GrabToggles() {
+	if (!initializingSearch) {
+		for (int i=0;i<checks;i++) {
+			pSearcher->FlagFromCmd(toggles[i].cmd) = wCheck[i].Active();
+		}
+	}
+}
+
+void FindStrip::SetToggles() {
+	for (int i=0;i<checks;i++) {
+		wCheck[i].SetActive(pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+}
+
+void FindStrip::ShowPopup() {
+	GUI::Menu popup;
+	popup.CreatePopUp();
+	for (int i=SearchOption::tWord; i<=SearchOption::tUp; i++) {
+		AddToPopUp(popup, toggles[i].label, toggles[i].cmd, pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+	GUI::Rectangle rcButton = wCheck[0].GetPosition();
+	GUI::Point pt(rcButton.left, rcButton.bottom);
+	popup.Show(pt, *this);
+}
+
+void FindStrip::FindNextCmd() {
+	GrabFields();
+	bool found = false;
+	if (pSearcher->FindHasText()) {
+		found = pSearcher->FindNext(pSearcher->reverseFind) >= 0;
+	}
+	if (pSearcher->ShouldClose(found))
+		Close();
+	else
+		wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+}
+
+void FindStrip::MarkAllCmd() {
+	GrabFields();
+	pSearcher->MarkAll();
+	const bool found = pSearcher->FindNext(pSearcher->reverseFind) >= 0;
+	if (pSearcher->ShouldClose(found))
+		Close();
+	else
+		wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+}
+
+void FindStrip::ChildFocus(GtkWidget *widget) {
+	Strip::ChildFocus(widget);
+	pSearcher->UIHasFocus();
+}
+
+gboolean FindStrip::Focus(GtkDirectionType direction) {
+	const int lastFocusCheck = 5;
+	if ((direction == GTK_DIR_TAB_BACKWARD) && wComboFind.HasFocusOnSelfOrChild()) {
+		gtk_widget_grab_focus(wCheck[lastFocusCheck]);
+		return TRUE;
+	} else if ((direction == GTK_DIR_TAB_FORWARD) && wCheck[lastFocusCheck].HasFocus()) {
+		gtk_widget_grab_focus(GTK_WIDGET(wComboFind.Entry()));
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void ReplaceStrip::Creation(GtkWidget *container) {
+	WTable tableReplace(2, 7);
+	SetID(tableReplace);
+	Strip::Creation(container);
+	tableReplace.PackInto(GTK_BOX(container), false);
+
+	wStaticFind.Create(localiser->Text(textFindPrompt));
+	tableReplace.Label(wStaticFind);
+
+	g_signal_connect(G_OBJECT(GetID()), "set-focus-child", G_CALLBACK(ChildFocusSignal), this);
+	g_signal_connect(G_OBJECT(GetID()), "focus", G_CALLBACK(FocusSignal), this);
+
+	wComboFind.Create();
+	tableReplace.Add(wComboFind, 1, true, 0, 0);
+	wComboFind.Show();
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()),"changed",
+		G_CALLBACK(FindComboChanged), this);
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()), "key-press-event",
+		G_CALLBACK(EscapeSignal), this);
+
+	g_signal_connect(G_OBJECT(wComboFind.Entry()), "activate",
+		G_CALLBACK(ActivateSignal), this);
+
+	gtk_label_set_mnemonic_widget(GTK_LABEL(wStaticFind.GetID()), GTK_WIDGET(wComboFind.Entry()));
+
+	static ObjectSignal<ReplaceStrip, &ReplaceStrip::FindCmd> sigFindNext;
+	wButtonFind.Create(localiser->Text(textFindNext),
+			G_CALLBACK(sigFindNext.Function), this);
+	tableReplace.Add(wButtonFind, 1, false, 0, 0);
+
+	static ObjectSignal<ReplaceStrip, &ReplaceStrip::ReplaceAllCmd> sigReplaceAll;
+	wButtonReplaceAll.Create(localiser->Text("Replace _All"),
+			G_CALLBACK(sigReplaceAll.Function), this);
+	tableReplace.Add(wButtonReplaceAll, 1, false, 0, 0);
+
+#if !GTK_CHECK_VERSION(3,4,0)
+	gtk_widget_ensure_style(wButtonFind);
+#endif
+
+	for (int i=0;i<checks;i++) {
+#if GTK_CHECK_VERSION(3,4,0)
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), NULL);
+#elif GTK_CHECK_VERSION(3,0,0)
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), gtk_widget_get_style(wButtonFind.Pointer()));
+#else
+		wCheck[i].Create(xpmImages[i], localiser->Text(toggles[i].label), wButtonFind.Pointer()->style);
+#endif
+		wCheck[i].SetActive(pSearcher->FlagFromCmd(toggles[i].cmd));
+		wCheck[i].SetChangeFunction(ToggleChanged, this);
+	}
+
+	tableReplace.Add(wCheck[SearchOption::tWord], 1, false, 0, 0);
+	tableReplace.Add(wCheck[SearchOption::tCase], 1, false, 0, 0);
+	tableReplace.Add(wCheck[SearchOption::tRegExp], 1, false, 0, 0);
+
+	wStaticReplace.Create(localiser->Text(textReplacePrompt));
+	tableReplace.Label(wStaticReplace);
+
+	wComboReplace.Create();
+	tableReplace.Add(wComboReplace, 1, true, 0, 0);
+
+	g_signal_connect(G_OBJECT(wComboReplace.Entry()), "key-press-event",
+		G_CALLBACK(EscapeSignal), this);
+
+	g_signal_connect(G_OBJECT(wComboReplace.Entry()), "activate",
+		G_CALLBACK(ActivateSignal), this);
+
+	gtk_label_set_mnemonic_widget(GTK_LABEL(wStaticReplace.GetID()), GTK_WIDGET(wComboReplace.Entry()));
+
+	static ObjectSignal<ReplaceStrip, &ReplaceStrip::ReplaceCmd> sigReplace;
+	wButtonReplace.Create(localiser->Text(textReplace),
+			G_CALLBACK(sigReplace.Function), this);
+	tableReplace.Add(wButtonReplace, 1, false, 0, 0);
+
+	static ObjectSignal<ReplaceStrip, &ReplaceStrip::ReplaceInSelectionCmd> sigReplaceInSelection;
+	wButtonReplaceInSelection.Create(localiser->Text(textInSelection),
+			G_CALLBACK(sigReplaceInSelection.Function), this);
+	tableReplace.Add(wButtonReplaceInSelection, 1, false, 0, 0);
+
+	tableReplace.Add(wCheck[SearchOption::tBackslash], 1, false, 0, 0);
+	tableReplace.Add(wCheck[SearchOption::tWrap], 1, false, 0, 0);
+
+	// Make the fccus chain move down before moving right
+	GList *focusChain = nullptr;
+	focusChain = g_list_append(focusChain, wComboFind.Pointer());
+	focusChain = g_list_append(focusChain, wComboReplace.Pointer());
+	focusChain = g_list_append(focusChain, wButtonFind.Pointer());
+	focusChain = g_list_append(focusChain, wButtonReplace.Pointer());
+	focusChain = g_list_append(focusChain, wButtonReplaceAll.Pointer());
+	focusChain = g_list_append(focusChain, wButtonReplaceInSelection.Pointer());
+	focusChain = g_list_append(focusChain, wCheck[SearchOption::tWord].Pointer());
+	focusChain = g_list_append(focusChain, wCheck[SearchOption::tBackslash].Pointer());
+	focusChain = g_list_append(focusChain, wCheck[SearchOption::tCase].Pointer());
+	focusChain = g_list_append(focusChain, wCheck[SearchOption::tWrap].Pointer());
+	focusChain = g_list_append(focusChain, wCheck[SearchOption::tRegExp].Pointer());
+
+	// gtk_container_set_focus_chain was deprecated in GTK 3.24 to prepare for GTK 4.
+	// Replacing it with a focus signal handler is significant work so won't be done, and isn't
+	// needed until/if SciTE is ported to GTK 4.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	gtk_container_set_focus_chain(GTK_CONTAINER(GetID()), focusChain);
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+	g_list_free(focusChain);
+}
+
+void ReplaceStrip::Destruction() {
+}
+
+void ReplaceStrip::Show(int buttonHeight) {
+	pSearcher->failedfind = false;
+	WEntry::SetValid(wComboFind.Entry(), true);
+	pSearcher->SetCaretAsStart();
+	Strip::Show(buttonHeight);
+
+	gtk_widget_set_size_request(wButtonFind, -1, buttonHeight);
+	gtk_widget_set_size_request(wButtonReplaceAll, -1, buttonHeight);
+	gtk_widget_set_size_request(wButtonReplace, -1, buttonHeight);
+	gtk_widget_set_size_request(wButtonReplaceInSelection, -1, buttonHeight);
+
+	gtk_widget_set_size_request(wComboFind, widthCombo, buttonHeight);
+	gtk_widget_set_size_request(GTK_WIDGET(wComboFind.Entry()), -1, buttonHeight);
+	gtk_widget_set_size_request(wComboReplace, widthCombo, buttonHeight);
+	gtk_widget_set_size_request(GTK_WIDGET(wComboReplace.Entry()), -1, buttonHeight);
+
+	gtk_widget_set_size_request(wStaticFind, -1, heightStatic);
+	gtk_widget_set_size_request(wStaticReplace, -1, heightStatic);
+
+	initializingSearch = true;	// Avoid search for initial value in search entry
+	wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+
+	gtk_entry_set_text(wComboFind.Entry(), pSearcher->findWhat.c_str());
+
+	SetToggles();
+	initializingSearch = false;
+	MarkIncremental();
+
+	gtk_widget_grab_focus(GTK_WIDGET(wComboFind.Entry()));
+}
+
+void ReplaceStrip::Close() {
+	if (visible) {
+		if (pSearcher->havefound) {
+			pSearcher->InsertFindInMemory();
+		}
+		Strip::Close();
+		pSearcher->UIClosed();
+	}
+}
+
+bool ReplaceStrip::KeyDown(GdkEventKey *event) {
+	if (visible) {
+		if (Strip::KeyDown(event))
+			return true;
+		if (event->state & GDK_MOD1_MASK) {
+			for (int i=SearchOption::tWord; i<=SearchOption::tWrap; i++) {
+				GUI::gui_string localised = localiser->Text(toggles[i].label);
+				char key = KeyFromLabel(localised);
+				if (static_cast<unsigned int>(key) == event->keyval) {
+					wCheck[i].Toggle();
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+void ReplaceStrip::MenuAction(guint action) {
+	if (allowMenuActions) {
+		pSearcher->FlagFromCmd(action) = !pSearcher->FlagFromCmd(action);
+		SetToggles();
+		InvalidateAll();
+	}
+}
+
+void ReplaceStrip::ActivateSignal(GtkWidget *, ReplaceStrip *pStrip) {
+	pStrip->FindCmd();
+}
+
+void ReplaceStrip::FindComboChanged(GtkEditable *, ReplaceStrip *pStrip) {
+	pStrip->GrabToggles();
+	pStrip->NextIncremental();
+}
+
+void ReplaceStrip::ToggleChanged(WCheckDraw *, void *user) {
+	ReplaceStrip *pStrip = static_cast<ReplaceStrip *>(user);
+	pStrip->GrabToggles();
+	pStrip->NextIncremental();
+}
+
+gboolean ReplaceStrip::EscapeSignal(GtkWidget *w, GdkEventKey *event, ReplaceStrip *pStrip) {
+	if (event->keyval == GKEY_Escape) {
+		g_signal_stop_emission_by_name(G_OBJECT(w), "key-press-event");
+		pStrip->Close();
+	}
+	return FALSE;
+}
+
+void ReplaceStrip::GrabFields() {
+	pSearcher->SetFind(wComboFind.Text());
+	pSearcher->SetReplace(wComboReplace.Text());
+	GrabToggles();
+}
+
+void ReplaceStrip::GrabToggles() {
+	if (!initializingSearch) {
+		for (int i=0;i<checks;i++) {
+			pSearcher->FlagFromCmd(toggles[i].cmd) = wCheck[i].Active();
+		}
+	}
+}
+
+void ReplaceStrip::SetToggles() {
+	for (int i=0;i<checks;i++) {
+		wCheck[i].SetActive(pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+}
+
+void ReplaceStrip::FindCmd() {
+	GrabFields();
+	if (pSearcher->FindHasText()) {
+		pSearcher->FindNext(pSearcher->reverseFind);
+		wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	}
+}
+
+void ReplaceStrip::ReplaceAllCmd() {
+	GrabFields();
+	if (pSearcher->FindHasText()) {
+		pSearcher->ReplaceAll(false);
+		NextIncremental();	// Show not found colour if no more matches.
+		wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+		wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	}
+}
+
+void ReplaceStrip::ReplaceCmd() {
+	GrabFields();
+	pSearcher->ReplaceOnce(incrementalBehaviour == simple);
+	NextIncremental();	// Show not found colour if no more matches.
+	wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+	wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+}
+
+void ReplaceStrip::ReplaceInSelectionCmd() {
+	GrabFields();
+	if (pSearcher->FindHasText()) {
+		pSearcher->ReplaceAll(true);
+		NextIncremental();	// Show not found colour if no more matches.
+		wComboReplace.FillFromMemory(pSearcher->memReplaces.AsVector());
+		wComboFind.FillFromMemory(pSearcher->memFinds.AsVector());
+	}
+}
+
+void ReplaceStrip::ShowPopup() {
+	GUI::Menu popup;
+	popup.CreatePopUp();
+	for (int i=SearchOption::tWord; i<=SearchOption::tWrap; i++) {
+		AddToPopUp(popup, toggles[i].label, toggles[i].cmd, pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+	GUI::Rectangle rcButton = wCheck[0].GetPosition();
+	GUI::Point pt(rcButton.left, rcButton.bottom);
+	popup.Show(pt, *this);
+}
+
+void ReplaceStrip::ChildFocus(GtkWidget *widget) {
+	Strip::ChildFocus(widget);
+	pSearcher->UIHasFocus();
+}
+
+gboolean ReplaceStrip::Focus(GtkDirectionType direction) {
+	const int lastFocusCheck = 2;	// Due to last column starting with the thirs checkbox
+	if ((direction == GTK_DIR_TAB_BACKWARD) && wComboFind.HasFocusOnSelfOrChild()) {
+		gtk_widget_grab_focus(wCheck[lastFocusCheck]);
+		return TRUE;
+	} else if ((direction == GTK_DIR_TAB_FORWARD) && wCheck[lastFocusCheck].HasFocus()) {
+		gtk_widget_grab_focus(GTK_WIDGET(wComboFind.Entry()));
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void UserStrip::Creation(GtkWidget *container) {
+	SetID(tableUser);
+	Strip::Creation(container);
+	gtk_container_set_border_width(GTK_CONTAINER(GetID()), 1);
+	tableUser.PackInto(GTK_BOX(container), false);
+	g_signal_connect(G_OBJECT(GetID()), "set-focus-child", G_CALLBACK(ChildFocusSignal), this);
+	g_signal_connect(G_OBJECT(GetID()), "focus", G_CALLBACK(FocusSignal), this);
+}
+
+void UserStrip::Destruction() {
+}
+
+void UserStrip::Show(int buttonHeight) {
+	Strip::Show(buttonHeight);
+	for (const std::vector<UserControl> &line : psd->controls) {
+		for (const UserControl &ctl : line) {
+			if (ctl.controlType == UserControl::ucStatic) {
+				gtk_widget_set_size_request(GTK_WIDGET(ctl.w.GetID()), -1, heightStatic);
+			} else if (ctl.controlType == UserControl::ucEdit) {
+				gtk_widget_set_size_request(GTK_WIDGET(ctl.w.GetID()), -1, buttonHeight);
+			} else if (ctl.controlType == UserControl::ucCombo) {
+				GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ctl.w.GetID())));
+				gtk_widget_set_size_request(GTK_WIDGET(entry), -1, buttonHeight);
+			} else if (ctl.controlType == UserControl::ucButton || ctl.controlType == UserControl::ucDefaultButton) {
+				gtk_widget_set_size_request(GTK_WIDGET(ctl.w.GetID()), -1, buttonHeight);
+			}
+		}
+	}
+}
+
+void UserStrip::Close() {
+	if (visible) {
+		Strip::Close();
+		if (pSciTEGTK)
+			pSciTEGTK->UserStripClosed();
+	}
+}
+
+bool UserStrip::KeyDown(GdkEventKey *event) {
+	if (visible) {
+		if (Strip::KeyDown(event))
+			return true;
+	}
+	return false;
+}
+
+void UserStrip::ActivateSignal(GtkWidget *, UserStrip *pStrip) {
+	// Treat Enter as pressing the first default button
+	for (const std::vector<UserControl> &line : pStrip->psd->controls) {
+		for (const UserControl &ctl : line) {
+			if (ctl.controlType == UserControl::ucDefaultButton) {
+				pStrip->extender->OnUserStrip(ctl.item, scClicked);
+				return;
+			}
+		}
+	}
+}
+
+gboolean UserStrip::EscapeSignal(GtkWidget *w, GdkEventKey *event, UserStrip *pStrip) {
+	if (event->keyval == GKEY_Escape) {
+		g_signal_stop_emission_by_name(G_OBJECT(w), "key-press-event");
+		pStrip->Close();
+	}
+	return FALSE;
+}
+
+void UserStrip::ClickThis(GtkWidget *w) {
+	for (const std::vector<UserControl> &line : psd->controls) {
+		for (const UserControl &ctl : line) {
+			if (w == GTK_WIDGET(ctl.w.GetID())) {
+				extender->OnUserStrip(ctl.item, scClicked);
+			}
+		}
+	}
+}
+
+void UserStrip::ClickSignal(GtkWidget *w, UserStrip *pStrip) {
+	pStrip->ClickThis(w);
+}
+
+void UserStrip::ChildFocus(GtkWidget *widget) {
+	Strip::ChildFocus(widget);
+}
+
+static bool WidgetHasFocus(UserControl *ctl) {
+	if (!ctl) {
+		return false;
+	} else if (ctl->controlType == UserControl::ucCombo) {
+		WComboBoxEntry *pwc = static_cast<WComboBoxEntry *>(&(ctl->w));
+		return pwc->HasFocusOnSelfOrChild();
+	} else {
+		return ctl->w.HasFocus();
+	}
+}
+
+gboolean UserStrip::Focus(GtkDirectionType direction) {
+	UserControl *ctlFirstFocus = 0;
+	UserControl *ctlLastFocus = 0;
+	for (std::vector<UserControl> &line : psd->controls) {
+		for (UserControl &ctl : line) {
+			if (ctl.controlType != UserControl::ucStatic) {
+				// Widget can have focus
+				ctlLastFocus = &ctl;
+				if (!ctlFirstFocus)
+					ctlFirstFocus = ctlLastFocus;
+			}
+		}
+	}
+	if ((direction == GTK_DIR_TAB_BACKWARD) && WidgetHasFocus(ctlFirstFocus)) {
+		gtk_widget_grab_focus(GTK_WIDGET(ctlLastFocus->w.GetID()));
+		return TRUE;
+	} else if ((direction == GTK_DIR_TAB_FORWARD) && WidgetHasFocus(ctlLastFocus)) {
+		gtk_widget_grab_focus(GTK_WIDGET(ctlFirstFocus->w.GetID()));
+		return TRUE;
+	}
+	return FALSE;
+}
+
+void UserStrip::SetDescription(const char *description) {
+	if (psd) {
+		for (const std::vector<UserControl> &line : psd->controls) {
+			for (const UserControl &ctl : line) {
+				gtk_widget_destroy(GTK_WIDGET(ctl.w.GetID()));
+			}
+		}
+	}
+	delete psd;
+	psd = new StripDefinition(description);
+	tableUser.Resize(psd->controls.size(), psd->columns);
+
+	bool hasSetFocus = false;
+	GtkWidget *pwWithAccelerator = 0;
+	for (std::vector<UserControl> &line : psd->controls) {
+		for (UserControl &ctl : line) {
+			UserControl *puc = &ctl;
+			std::string sCaption = GtkFromWinCaption(puc->text.c_str());
+			switch (puc->controlType) {
+			case UserControl::ucEdit: {
+					WEntry we;
+					we.Create(puc->text.c_str());
+					puc->w.SetID(we.GetID());
+					tableUser.Add(we, 1, true, 0, 0);
+					break;
+				}
+			case UserControl::ucCombo: {
+					WComboBoxEntry wc;
+					wc.Create();
+					wc.SetText(puc->text.c_str());
+					puc->w.SetID(wc.GetID());
+					tableUser.Add(wc, 1, true, 0, 0);
+					break;
+				}
+			case UserControl::ucButton:
+			case UserControl::ucDefaultButton: {
+					WButton wb;
+					wb.Create(sCaption.c_str(), G_CALLBACK(UserStrip::ClickSignal), this);
+					puc->w.SetID(wb.GetID());
+					tableUser.Add(wb, 1, false, 0, 0);
+					if (puc->controlType == UserControl::ucDefaultButton) {
+						gtk_widget_grab_default(GTK_WIDGET(puc->w.GetID()));
+					}
+					break;
+				}
+			default: {
+					WStatic ws;
+					ws.Create(sCaption.c_str());
+					puc->w.SetID(ws.GetID());
+#if GTK_CHECK_VERSION(3,14,0)
+					gtk_widget_set_halign(GTK_WIDGET(puc->w.GetID()), GTK_ALIGN_END);
+					gtk_widget_set_valign(GTK_WIDGET(puc->w.GetID()), GTK_ALIGN_BASELINE);
+#else
+					gtk_misc_set_alignment(GTK_MISC(puc->w.GetID()), 1.0, 0.5);
+#endif
+					tableUser.Add(ws, 1, false, 5, 0);
+					if (ws.HasMnemonic())
+						pwWithAccelerator = GTK_WIDGET(puc->w.GetID());
+				}
+			}
+			gtk_widget_show(GTK_WIDGET(puc->w.GetID()));
+			if (!hasSetFocus && (puc->controlType != UserControl::ucStatic)) {
+				gtk_widget_grab_focus(GTK_WIDGET(puc->w.GetID()));
+				hasSetFocus = true;
+			}
+			if (pwWithAccelerator && (puc->controlType != UserControl::ucStatic)) {
+				gtk_label_set_mnemonic_widget(GTK_LABEL(pwWithAccelerator), GTK_WIDGET(puc->w.GetID()));
+				pwWithAccelerator = 0;
+			}
+		}
+		tableUser.NextLine() ;
+	}
+
+	for (const std::vector<UserControl> &line : psd->controls) {
+		for (const UserControl &ctl : line) {
+			if ((ctl.controlType == UserControl::ucEdit) || (ctl.controlType == UserControl::ucCombo)) {
+				GtkEntry *entry;
+				if (ctl.controlType == UserControl::ucEdit)
+					entry = GTK_ENTRY(ctl.w.GetID());
+				else
+					entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ctl.w.GetID())));
+
+				g_signal_connect(G_OBJECT(entry), "key-press-event", G_CALLBACK(EscapeSignal), this);
+				g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(ActivateSignal), this);
+			}
+		}
+	}
+}
+
+void UserStrip::SetExtender(Extension *extender_) {
+	extender = extender_;
+}
+
+void UserStrip::SetSciTE(SciTEGTK *pSciTEGTK_) {
+	pSciTEGTK = pSciTEGTK_;
+}
+
+void UserStrip::Set(int control, const char *value) {
+	if (psd) {
+		UserControl *ctl = psd->FindControl(control);
+		if (ctl) {
+			if (ctl->controlType == UserControl::ucEdit) {
+				WEntry *pwe = static_cast<WEntry *>(&(ctl->w));
+				pwe->SetText(value);
+			} else if (ctl->controlType == UserControl::ucCombo) {
+				WComboBoxEntry *pwc = static_cast<WComboBoxEntry *>(&(ctl->w));
+				pwc->SetText(value);
+			}
+		}
+	}
+}
+
+void UserStrip::SetList(int control, const char *value) {
+	if (psd) {
+		UserControl *ctl = psd->FindControl(control);
+		if (ctl) {
+			if (ctl->controlType == UserControl::ucCombo) {
+				GUI::gui_string sValue = GUI::StringFromUTF8(value);
+				std::vector<std::string> listValues = ListFromString(sValue);
+				WComboBoxEntry *pwc = static_cast<WComboBoxEntry *>(&(ctl->w));
+				pwc->FillFromMemory(listValues);
+			}
+		}
+	}
+}
+
+std::string UserStrip::GetValue(int control) {
+	if (psd) {
+		UserControl *ctl = psd->FindControl(control);
+		if (ctl->controlType == UserControl::ucEdit) {
+			WEntry *pwe = static_cast<WEntry *>(&(ctl->w));
+			return pwe->Text();
+		} else if (ctl->controlType == UserControl::ucCombo) {
+			WComboBoxEntry *pwc = static_cast<WComboBoxEntry *>(&(ctl->w));
+			return pwc->Text();
+		}
+	}
+	return "";
+}
+
+void SciTEGTK::CreateStrips(GtkWidget *boxMain) {
+	backgroundStrip.SetLocalizer(&localiser);
+	backgroundStrip.Creation(boxMain);
+
+	userStrip.SetSciTE(this);
+	userStrip.SetExtender(extender);
+	userStrip.SetLocalizer(&localiser);
+	userStrip.Creation(boxMain);
+
+	findStrip.SetLocalizer(&localiser);
+	findStrip.SetSearcher(this);
+	findStrip.Creation(boxMain);
+
+	replaceStrip.SetLocalizer(&localiser);
+	replaceStrip.SetSearcher(this);
+	replaceStrip.Creation(boxMain);
+}
+
+bool SciTEGTK::StripHasFocus() const {
+	return findStrip.VisibleHasFocus() || replaceStrip.VisibleHasFocus() || userStrip.VisibleHasFocus();
+}
+
+void SciTEGTK::LayoutUI() {
+	if (splitPane) {
+		// If GtkOrientable is available (GTK 2.16 and newer), just switch the
+		// orientation if needed, don't recreate the H/VPaned
+		GtkOrientation orient;
+		orient = (splitVertical) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+		gtk_orientable_set_orientation(GTK_ORIENTABLE(splitPane), orient);
+		return;
+	}
+
+	if (splitVertical) {
+#if GTK_CHECK_VERSION(3,0,0)
+		splitPane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+#else
+		splitPane = gtk_hpaned_new();
+#endif
+		gtk_widget_set_size_request(PWidget(wOutput), heightOutput, -1);
+	} else {
+#if GTK_CHECK_VERSION(3,0,0)
+		splitPane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+#else
+		splitPane = gtk_vpaned_new();
+#endif
+		gtk_widget_set_size_request(PWidget(wOutput), -1, heightOutput);
+	}
+
+#if GTK_CHECK_VERSION(3,16,0)
+	gtk_paned_set_wide_handle(GTK_PANED(splitPane), props.GetInt("split.wide", 0));
+#endif
+	gtk_container_add(GTK_CONTAINER(PWidget(wContent)), GTK_WIDGET(splitPane));
+	gtk_paned_pack1(GTK_PANED(splitPane), PWidget(wEditor), TRUE, TRUE);
+	gtk_paned_pack2(GTK_PANED(splitPane), PWidget(wOutput), FALSE, TRUE);
+
+	g_signal_connect(GTK_WIDGET(splitPane), "button-release-event",
+	                   G_CALLBACK(PaneButtonRelease), static_cast<void *>(this));
+
+	g_signal_connect(G_OBJECT(splitPane), "notify::position",
+	                   G_CALLBACK(PanePositionChanged), static_cast<void *>(this));
+
+	gtk_widget_show_all(GTK_WIDGET(splitPane));
+}
+
+void SciTEGTK::CreateUI() {
+#if !GTK_CHECK_VERSION(3,0,0)
+	gtk_rc_parse_string(
+		"style \"toggler-style\" {\n"
+		"    GtkWidget::focus-padding = 0\n"
+		"    GtkWidget::focus-line-width = 0\n"
+		"    xthickness = 0\n"
+		"    ythickness = 0\n"
+		"}\n"
+		"widget \"*.toggler\" style \"toggler-style\"\n"
+	);
+#endif
+
+	CreateBuffers();
+	wSciTE = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+	void *gthis = static_cast<void *>(this);
+
+	gtk_widget_set_events(PWidget(wSciTE),
+	                      GDK_EXPOSURE_MASK
+	                      | GDK_LEAVE_NOTIFY_MASK
+	                      | GDK_BUTTON_PRESS_MASK
+	                      | GDK_BUTTON_RELEASE_MASK
+	                     );
+	g_signal_connect(G_OBJECT(PWidget(wSciTE)), "delete_event",
+	                   G_CALLBACK(QuitSignal), gthis);
+
+	g_signal_connect(G_OBJECT(PWidget(wSciTE)), "key_press_event",
+	                   G_CALLBACK(KeyPress), gthis);
+
+	g_signal_connect(G_OBJECT(PWidget(wSciTE)), "key-release-event",
+	                   G_CALLBACK(KeyRelease), gthis);
+
+	g_signal_connect(G_OBJECT(PWidget(wSciTE)), "button_press_event",
+	                   G_CALLBACK(MousePress), gthis);
+
+	gtk_window_set_title(GTK_WINDOW(PWidget(wSciTE)), appName);
+	const int useDefault = 0x10000000;
+	int left = props.GetInt("position.left", useDefault);
+	int top = props.GetInt("position.top", useDefault);
+	int width = props.GetInt("position.width", useDefault);
+	int height = props.GetInt("position.height", useDefault);
+	bool maximize = props.GetInt("position.maximize", 0) ? true : false;
+	if (width == -1 || height == -1) {
+		maximize = true;
+#if GTK_CHECK_VERSION(3,22,0)
+		GdkDisplay *pdisplay = gdk_display_get_default();
+		// gdk_display_get_primary_monitor would be a better call
+		// but that returned NULL on Fedora 25.
+		// There should always be a monitor numbered 0.
+		// At this point, wSciTE hasn't become a real window.
+		GdkMonitor *monitor = gdk_display_get_monitor(pdisplay, 0);
+		GdkRectangle rcScreen;
+		gdk_monitor_get_geometry(monitor, &rcScreen);
+		width = rcScreen.width - left - 10;
+		height = rcScreen.height - top - 30;
+#else
+		width = gdk_screen_width() - left - 10;
+		height = gdk_screen_height() - top - 30;
+#endif
+	}
+
+	if (props.GetInt("save.position")) {
+		left = propsSession.GetInt("position.left", useDefault);
+		top = propsSession.GetInt("position.top", useDefault);
+		width = propsSession.GetInt("position.width", useDefault);
+		height = propsSession.GetInt("position.height", useDefault);
+		maximize = propsSession.GetInt("position.maximize", 0) ? true : false;
+	}
+
+	fileSelectorWidth = props.GetInt("fileselector.width", fileSelectorWidth);
+	fileSelectorHeight = props.GetInt("fileselector.height", fileSelectorHeight);
+
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkWidget *boxMain = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+	gtk_box_set_homogeneous(GTK_BOX(boxMain), FALSE);
+#else
+	GtkWidget *boxMain = gtk_vbox_new(FALSE, 0);
+#endif
+	gtk_container_add(GTK_CONTAINER(PWidget(wSciTE)), boxMain);
+	gtk_widget_set_can_focus(boxMain, FALSE);
+
+ 	// The Menubar
+	CreateMenu();
+	gtk_box_pack_start(GTK_BOX(boxMain), menuBar, FALSE, FALSE, 0);
+
+	// The Toolbar
+	wToolBar = gtk_toolbar_new();
+	gtk_toolbar_set_style(GTK_TOOLBAR(PWidget(wToolBar)), GTK_TOOLBAR_ICONS);
+	gtk_box_pack_start(GTK_BOX(boxMain), PWidget(wToolBar), FALSE, FALSE, 0);
+	gtk_widget_hide(GTK_WIDGET(PWidget(wToolBar)));
+	gtk_container_set_border_width(GTK_CONTAINER(PWidget(wToolBar)), 0);
+	tbVisible = false;
+
+	// The Notebook (GTK2)
+	wTabBar = gtk_notebook_new();
+	gtk_widget_set_can_focus(PWidget(wTabBar), FALSE);
+	gtk_box_pack_start(GTK_BOX(boxMain),PWidget(wTabBar),FALSE,FALSE,0);
+	g_signal_connect(G_OBJECT(PWidget(wTabBar)),
+		"button-release-event", G_CALLBACK(TabBarReleaseSignal), gthis);
+	g_signal_connect(G_OBJECT(PWidget(wTabBar)),
+		"scroll-event", G_CALLBACK(TabBarScrollSignal), gthis);
+	gtk_notebook_set_scrollable(GTK_NOTEBOOK(PWidget(wTabBar)), TRUE);
+	tabVisible = false;
+
+#if GTK_CHECK_VERSION(3,0,0)
+	wContent = gtk_event_box_new();
+#else
+	wContent = gtk_alignment_new(0, 0, 1, 1);
+#endif
+
+	// Ensure the content area is viable at 60 pixels high
+	gtk_widget_set_size_request(PWidget(wContent), 20, 60);
+	gtk_widget_set_can_focus(PWidget(wContent), FALSE);
+	gtk_box_pack_start(GTK_BOX(boxMain), PWidget(wContent), TRUE, TRUE, 0);
+
+	wEditor.SetScintilla(scintilla_new());
+	g_object_ref(G_OBJECT(PWidget(wEditor)));
+	scintilla_set_id(SCINTILLA(PWidget(wEditor)), IDM_SRCWIN);
+	wEditor.UsePopUp(SA::PopUp::Never);
+
+	g_signal_connect(G_OBJECT(PWidget(wEditor)), SCINTILLA_NOTIFY,
+	                   G_CALLBACK(NotifySignal), this);
+
+
+	wOutput.SetScintilla(scintilla_new());
+	g_object_ref(G_OBJECT(PWidget(wOutput)));
+	scintilla_set_id(SCINTILLA(PWidget(wOutput)), IDM_RUNWIN);
+	wOutput.UsePopUp(SA::PopUp::Never);
+	g_signal_connect(G_OBJECT(PWidget(wOutput)), SCINTILLA_NOTIFY,
+	                   G_CALLBACK(NotifySignal), this);
+
+	splitVertical = props.GetInt("split.vertical", 0);
+	LayoutUI();
+
+	WTable table(1, 3);
+	wIncrementPanel = table;
+	table.PackInto(GTK_BOX(boxMain), false);
+	table.Label(TranslatedLabel("Find:"));
+
+	IncSearchEntry = gtk_entry_new();
+	table.Add(IncSearchEntry, 1, true, 5, 1);
+	Signal<&SciTEGTK::FindIncrementCompleteCmd> sigFindIncrementComplete;
+	g_signal_connect(G_OBJECT(IncSearchEntry),"activate", G_CALLBACK(sigFindIncrementComplete.Function), this);
+	g_signal_connect(G_OBJECT(IncSearchEntry), "key-press-event", G_CALLBACK(FindIncrementEscapeSignal), this);
+	Signal<&SciTEGTK::FindIncrementChanged> sigFindIncrementChanged;
+	g_signal_connect(G_OBJECT(IncSearchEntry),"changed", G_CALLBACK(sigFindIncrementChanged.Function), this);
+	g_signal_connect(G_OBJECT(IncSearchEntry),"focus-out-event", G_CALLBACK(FindIncrementFocusOutSignal), NULL);
+	gtk_widget_show(IncSearchEntry);
+
+	GUI::gui_string translated = localiser.Text("Find Next");
+	IncSearchBtnNext = gtk_button_new_with_mnemonic(translated.c_str());
+	table.Add(IncSearchBtnNext, 1, false, 5, 1);
+	g_signal_connect(G_OBJECT(IncSearchBtnNext), "clicked",
+		G_CALLBACK(sigFindIncrementComplete.Function), this);
+	gtk_widget_show(IncSearchBtnNext);
+
+	CreateStrips(boxMain);
+
+	wOutput.SetMarginWidthN(1, 0);
+
+	wStatusBar = gtk_statusbar_new();
+	sbContextID = gtk_statusbar_get_context_id(
+	                  GTK_STATUSBAR(PWidget(wStatusBar)), "global");
+	gtk_box_pack_start(GTK_BOX(boxMain), PWidget(wStatusBar), FALSE, FALSE, 0);
+	gtk_statusbar_push(GTK_STATUSBAR(PWidget(wStatusBar)), sbContextID, "Initial");
+	sbVisible = false;
+
+	static const GtkTargetEntry dragtypes[] = { { (gchar*)"text/uri-list", 0, 0 } };
+	static const gint n_dragtypes = std::size(dragtypes);
+
+	gtk_drag_dest_set(PWidget(wSciTE), GTK_DEST_DEFAULT_ALL, dragtypes,
+	                  n_dragtypes, GDK_ACTION_COPY);
+	g_signal_connect(G_OBJECT(PWidget(wSciTE)), "drag_data_received",
+	                         G_CALLBACK(DragDataReceived), this);
+
+	SetFocus(wOutput);
+
+	if ((left != useDefault) && (top != useDefault))
+		gtk_window_move(GTK_WINDOW(PWidget(wSciTE)), left, top);
+	if ((width != useDefault) && (height != useDefault))
+		gtk_window_set_default_size(GTK_WINDOW(PWidget(wSciTE)), width, height);
+	gtk_widget_show_all(PWidget(wSciTE));
+	SetIcon();
+
+	if (maximize)
+		gtk_window_maximize(GTK_WINDOW(PWidget(wSciTE)));
+
+	gtk_widget_hide(PWidget(backgroundStrip));
+	gtk_widget_hide(PWidget(userStrip));
+	gtk_widget_hide(wIncrementPanel);
+	gtk_widget_hide(PWidget(findStrip));
+	gtk_widget_hide(PWidget(replaceStrip));
+
+#if GTK_CHECK_VERSION(3,0,0)
+	// Create a named style "entryInvalid" that can be applied to a search entry
+	// when the text can not be found.
+	GtkCssProvider *provider = gtk_css_provider_new();
+	GdkScreen *screen = gtk_widget_get_screen(PWidget(wSciTE));
+	gtk_style_context_add_provider_for_screen(screen,
+		GTK_STYLE_PROVIDER(provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(provider),
+		"#toggler {\n"
+		"    padding: 2px;\n"
+		"}\n"
+		"#entryInvalid {\n"
+		"    color: #FFFFFF;\n"
+		"    background: #FF6666;\n"
+		"}\n"
+		"#entryInvalid:selected {\n"
+		"    background: #771111;\n"
+		"}\n", -1, NULL);
+	g_object_unref(provider);
+#endif
+
+	UIAvailable();
+}
+
+void SciTEGTK::FindIncrementSetColour(bool valid) {
+	WEntry::SetValid(GTK_ENTRY(IncSearchEntry), valid);
+}
+
+void SciTEGTK::FindIncrementNext(bool select) {
+	if (select) {
+		MoveBack();
+	}
+	const char *lineEntry = gtk_entry_get_text(GTK_ENTRY(IncSearchEntry));
+	findWhat = lineEntry;
+	wholeWord = false;
+	if (FindHasText()) {
+		FindNext(false, false);
+		if (!select) {
+			SetCaretAsStart();
+		}
+	}
+	FindIncrementSetColour(!FindHasText() || !failedfind);
+}
+
+void SciTEGTK::FindIncrementChanged() {
+	FindIncrementNext(true);
+}
+
+gboolean SciTEGTK::FindIncrementEscapeSignal(GtkWidget *w, GdkEventKey *event, SciTEGTK *scitew) {
+	if (event->keyval == GKEY_Escape) {
+		g_signal_stop_emission_by_name(G_OBJECT(w), "key-press-event");
+		gtk_widget_hide(scitew->wIncrementPanel);
+		SetFocus(scitew->wEditor);
+	}
+	return FALSE;
+}
+
+void SciTEGTK::FindIncrementCompleteCmd() {
+	FindIncrementNext(false);
+}
+
+gboolean SciTEGTK::FindIncrementFocusOutSignal(GtkWidget *) {
+#if GTK_CHECK_VERSION(3,0,0)
+	//gtk_widget_hide(gtk_widget_get_parent(w));
+#else
+	//gtk_widget_hide(w->parent);
+#endif
+	return FALSE;
+}
+
+void SciTEGTK::FindIncrement() {
+	findStrip.Close();
+	replaceStrip.Close();
+	FindIncrementSetColour(true);
+	failedfind = false;
+	gtk_widget_show(wIncrementPanel);
+	gtk_widget_grab_focus(GTK_WIDGET(IncSearchEntry));
+	gtk_entry_set_text(GTK_ENTRY(IncSearchEntry), "");
+}
+
+void SciTEGTK::SetIcon() {
+	FilePath pathPixmap(PIXMAP_PATH, "Sci48M.png");
+	GError *err=0;
+	if (!gtk_window_set_icon_from_file(
+		GTK_WINDOW(PWidget(wSciTE)), pathPixmap.AsInternal(), &err)) {
+		// Failed to load from file so use backup inside executable
+		GdkPixbuf *pixbufIcon = gdk_pixbuf_new_from_xpm_data(SciIcon_xpm);
+		gtk_window_set_icon(GTK_WINDOW(PWidget(wSciTE)), pixbufIcon);
+		g_object_unref(pixbufIcon);
+	}
+}
+
+struct CallbackData {
+	SciTEGTK *pSciTE;
+	int cmd;
+	Worker *pWorker;
+	CallbackData(SciTEGTK *pSciTE_, int cmd_, Worker *pWorker_) : pSciTE(pSciTE_), cmd(cmd_), pWorker(pWorker_) {
+	}
+};
+
+void SciTEGTK::PostOnMainThread(int cmd, Worker *pWorker) {
+	CallbackData *pcbd = new CallbackData(this, cmd, pWorker);
+	g_idle_add(PostCallback, pcbd);
+}
+
+gboolean SciTEGTK::PostCallback(void *ptr) {
+#ifndef GDK_VERSION_3_6
+	ThreadLockMinder minder;
+#endif
+	CallbackData *pcbd = static_cast<CallbackData *>(ptr);
+	pcbd->pSciTE->WorkerCommand(pcbd->cmd, pcbd->pWorker);
+	delete pcbd;
+	return FALSE;
+}
+
+void SciTEGTK::SetStartupTime(const char *timestamp) {
+	if (timestamp != NULL) {
+		char *end;
+		// Reset errno from any previous errors
+		errno = 0;
+		gulong ts = strtoul(timestamp, &end, 0);
+		if (end != timestamp && errno == 0) {
+			startupTimestamp = ts;
+		}
+	}
+}
+
+// Send the filename through the pipe using the director command "open:"
+// Make the path absolute if it is not already.
+// If filename is empty, we send a message to the existing instance to tell
+// it to present itself (ie. the window should come to the front)
+void SciTEGTK::SendFileName(int sendPipe, const char* filename) {
+
+	std::string command;
+	const char *pipeData;
+
+	if (strlen(filename) != 0) {
+		command = "open:";
+
+		// Check to see if path is already absolute.
+		if (!g_path_is_absolute(filename)) {
+			gchar *currentPath = g_get_current_dir();
+			command += currentPath;
+			command += '/';
+			g_free(currentPath);
+		}
+		command += filename;
+		command += "\n";
+
+	} else {
+		command = "focus:";
+
+		if (startupTimestamp != 0) {
+			char timestamp[14];
+			snprintf(timestamp, 14, "%u", startupTimestamp);
+			command += timestamp;
+		}
+		command += "\n";
+	}
+	pipeData = command.c_str();
+
+	// Send it.
+	if (write(sendPipe, pipeData, strlen(pipeData)) == -1)
+		perror("Unable to write to pipe");
+}
+
+bool SciTEGTK::CheckForRunningInstance(int argc, char *argv[]) {
+
+	const gchar *tmpdir = g_get_tmp_dir();
+	GDir *dir = g_dir_open(tmpdir, 0, NULL);
+	if (dir == NULL) {
+		return false; // Couldn't open the directory
+	}
+
+	GPatternSpec *pattern = g_pattern_spec_new("SciTE.*.in");
+
+	char *pipeFileName = NULL;
+	const char *filename;
+	uniqueInstance = g_get_tmp_dir();
+	uniqueInstance += "/SciTE.ensure.unique.instance.for.";
+	uniqueInstance += getenv("USER");
+	int fd;
+	bool isLocked;
+	do {
+		fd = open(uniqueInstance.c_str(), O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); // Try to set the lock.
+		isLocked = (fd == -1 && errno == EEXIST);
+		if (isLocked) {
+			// There is already a lock.
+			time_t ltime;
+			time(&ltime);// Get current time.
+			struct stat file_status;
+			stat(uniqueInstance.c_str(), &file_status); // Get status of lock file.
+			isLocked = difftime(ltime, file_status.st_mtime) <= 3.0; // Test whether the lock is fresh (<= 3 seconds) or not. Avoid perpetual lock if SciTE crashes during its launch and the lock file is present.
+			if (isLocked)
+				// Currently, another process of SciTE is launching. We are waiting for end of its initialisation.
+				usleep(50000);
+		}
+	} while (isLocked);
+	if (fd != -1)
+		close(fd);
+	// Find a working pipe in our temporary directory
+	while ((filename = g_dir_read_name(dir))) {
+		if (g_pattern_match_string(pattern, filename)) {
+			pipeFileName = g_build_filename(tmpdir, filename, NULL);
+
+			// Attempt to open the pipe as a writer to send out data.
+			int sendPipe = open(pipeFileName, O_WRONLY | O_NONBLOCK);
+
+			// If open succeeded, write filename data.
+			if (sendPipe != -1) {
+				// Mimic the win32 behaviour, see UniqueInstance::SendCommands
+				for (int ii = 1; ii < argc; ++ii) {
+					if (argv[ii][0] != '-') {
+						SendFileName(sendPipe, argv[ii]);
+					} else {
+						// Strip the beginning dash and add the final newline
+						if ((write(sendPipe, argv[ii]+1, strlen(argv[ii])-1) == -1) || (write(sendPipe, "\n", 1) == -1))
+							perror("Unable to write command to pipe");
+					}
+				}
+
+				// Force the SciTE instance to come to the front.
+				SendFileName(sendPipe, "");
+
+				// We're done
+				if (close(sendPipe) == -1)
+					perror("Unable to close pipe");
+				break;
+			} else {
+				// We don't care about the error. Try another pipe.
+				g_free(pipeFileName);
+				pipeFileName = NULL;
+			}
+		}
+	}
+	g_pattern_spec_free(pattern);
+	g_dir_close(dir);
+
+	if (pipeFileName != NULL) {
+		// We need to call this since we're not displaying a window
+		unlink(uniqueInstance.c_str()); // Unlock.
+		gdk_notify_startup_complete();
+		g_free(pipeFileName);
+		return true;
+	}
+
+	// If we arrived here, there is no SciTE instance we could talk to.
+	// We'll start a new one
+	return false;
+}
+
+void SciTEGTK::Run(int argc, char *argv[]) {
+	// Load the default session file
+	if (props.GetInt("save.session") || props.GetInt("save.position") || props.GetInt("save.recent")) {
+		LoadSessionFile("");
+	}
+
+	// Find the SciTE executable, first trying to use argv[0] and converting
+	// to an absolute path and if that fails, searching the path.
+	sciteExecutable = FilePath(argv[0]).AbsolutePath();
+	if (!sciteExecutable.Exists()) {
+		gchar *progPath = g_find_program_in_path(argv[0]);
+		sciteExecutable = FilePath(progPath);
+		g_free(progPath);
+	}
+
+	// Collect the argv into one string with each argument separated by '\n'
+	GUI::gui_string args;
+	for (int arg = 1; arg < argc; arg++) {
+		if (arg > 1)
+			args += '\n';
+		args += argv[arg];
+	}
+
+	// Process any initial switches
+	ProcessCommandLine(args, 0);
+
+	// Check if SciTE is already running.
+	if ((props.GetString("ipc.director.name").size() == 0) && props.GetInt ("check.if.already.open")) {
+		if (CheckForRunningInstance (argc, argv)) {
+			// Returning from this function exits the program.
+			return;
+		}
+	}
+
+	CreateUI();
+	if ((props.GetString("ipc.director.name").size() == 0) && props.GetInt ("check.if.already.open"))
+		unlink(uniqueInstance.c_str()); // Unlock.
+
+	// Process remaining switches and files
+#ifndef GDK_VERSION_3_6
+	gdk_threads_enter();
+#endif
+	ProcessCommandLine(args, 1);
+#ifndef GDK_VERSION_3_6
+	gdk_threads_leave();
+#endif
+
+	CheckMenus();
+	SizeSubWindows();
+	SetFocus(wEditor);
+	gtk_widget_grab_focus(GTK_WIDGET(PWidget(wSciTE)));
+
+#ifndef GDK_VERSION_3_6
+	gdk_threads_enter();
+#endif
+	gtk_main();
+#ifndef GDK_VERSION_3_6
+	gdk_threads_leave();
+#endif
+}
+
+// Detect if the tool has exited without producing any output
+int SciTEGTK::PollTool(SciTEGTK *scitew) {
+#ifndef GDK_VERSION_3_6
+	ThreadLockMinder minder;
+#endif
+	scitew->ContinueExecute(TRUE);
+	return TRUE;
+}
+
+int main(int argc, char *argv[]) {
+#ifdef NO_EXTENSIONS
+	Extension *extender = 0;
+#else
+	MultiplexExtension multiExtender;
+	Extension *extender = &multiExtender;
+
+#ifndef NO_LUA
+	multiExtender.RegisterExtension(LuaExtension::Instance());
+#endif
+#ifndef NO_FILER
+	multiExtender.RegisterExtension(DirectorExtension::Instance());
+#endif
+#endif
+
+	// Initialise threads
+#if !GLIB_CHECK_VERSION(2,31,0)
+	g_thread_init(NULL);
+#endif
+#ifndef GDK_VERSION_3_6
+	gdk_threads_init();
+#endif
+
+	if (argc > 0) {
+		executableDirectory = FilePath(argv[0]).AbsolutePath().Directory();
+	}
+#if __linux__
+	char selfExe[PATH_MAX] = "";
+	if (readlink("/proc/self/exe", selfExe, PATH_MAX) == -1) {
+		perror("readlink");
+	} else {
+		executableDirectory = FilePath(selfExe).Directory();
+	}
+#endif
+
+	// Get this now because gtk_init() clears it
+	const gchar *startup_id = g_getenv("DESKTOP_STARTUP_ID");
+	char *timestamp = NULL;
+	if (startup_id != NULL) {
+		char *pos = g_strrstr(startup_id, "_TIME");
+		if (pos != NULL) {
+			timestamp = pos + 5; // Skip "_TIME"
+		}
+	}
+
+	gtk_init(&argc, &argv);
+
+	SciTEGTK scite(extender);
+	scite.SetStartupTime(timestamp);
+	scite.Run(argc, argv);
+	scite.Finalise();
+
+	return 0;
+}
diff --git a/scite-app/scite/gtk/Widget.cxx b/scite-app/scite/gtk/Widget.cxx
new file mode 100644
index 0000000..2b78a3b
--- /dev/null
+++ b/scite-app/scite/gtk/Widget.cxx
@@ -0,0 +1,495 @@
+// SciTE - Scintilla based Text Editor
+// Widget.cxx - code for manipulating  GTK widgets
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <chrono>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "Scintilla.h"
+
+#include "GUI.h"
+#include "StringHelpers.h"
+#include "Widget.h"
+
+// Key names are longer for GTK 3
+#if GTK_CHECK_VERSION(3,0,0)
+#define GKEY_Escape GDK_KEY_Escape
+#define GKEY_Void GDK_KEY_VoidSymbol
+#else
+#define GKEY_Escape GDK_Escape
+#define GKEY_Void GDK_VoidSymbol
+#endif
+
+WBase::operator GtkWidget*() const {
+	return GTK_WIDGET(GetID());
+}
+
+GtkWidget* WBase::Pointer() {
+	return GTK_WIDGET(GetID());
+}
+
+bool WBase::Sensitive() {
+	return gtk_widget_get_sensitive(GTK_WIDGET(Pointer()));
+}
+
+void WStatic::Create(GUI::gui_string text) {
+	SetID(gtk_label_new_with_mnemonic(text.c_str()));
+}
+
+bool WStatic::HasMnemonic() {
+	return gtk_label_get_mnemonic_keyval(GTK_LABEL(Pointer())) != GKEY_Void;
+}
+
+void WStatic::SetMnemonicFor(WBase &w) {
+	gtk_label_set_mnemonic_widget(GTK_LABEL(Pointer()), w);
+}
+
+void WEntry::Create(const GUI::gui_char *text) {
+	SetID(gtk_entry_new());
+	if (text)
+		gtk_entry_set_text(GTK_ENTRY(GetID()), text);
+}
+
+void WEntry::ActivatesDefault() {
+	gtk_entry_set_activates_default(GTK_ENTRY(GetID()), TRUE);
+}
+
+const GUI::gui_char *WEntry::Text() {
+	return gtk_entry_get_text(GTK_ENTRY(GetID()));
+}
+
+int WEntry::Value() {
+	return atoi(Text());
+}
+
+void WEntry::SetText(const GUI::gui_char *text) {
+	return gtk_entry_set_text(GTK_ENTRY(GetID()), text);
+}
+
+void WEntry::SetValid(GtkEntry *entry, bool valid) {
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_widget_set_name(GTK_WIDGET(entry), valid ? "" : "entryInvalid");
+#else
+	if (valid) {
+		// Reset widget's background color
+		// to the one given by the GTK theme
+		gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, NULL);
+	} else {
+		GdkColor red = { 0, 0xFFFF, 0x6666, 0x6666 };
+		gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, &red);
+	}
+#endif
+}
+
+void WComboBoxEntry::Create() {
+#if GTK_CHECK_VERSION(3,0,0)
+	SetID(gtk_combo_box_text_new_with_entry());
+#else
+	SetID(gtk_combo_box_entry_new_text());
+#endif
+}
+
+GtkEntry *WComboBoxEntry::Entry() {
+	return GTK_ENTRY(gtk_bin_get_child(GTK_BIN(GetID())));
+}
+
+void WComboBoxEntry::ActivatesDefault() {
+	gtk_entry_set_activates_default(Entry(), TRUE);
+}
+
+const GUI::gui_char *WComboBoxEntry::Text() {
+	return gtk_entry_get_text(Entry());
+}
+
+void WComboBoxEntry::SetText(const GUI::gui_char *text) {
+	return gtk_entry_set_text(Entry(), text);
+}
+
+bool WComboBoxEntry::HasFocusOnSelfOrChild() {
+	return HasFocus() || gtk_widget_has_focus(GTK_WIDGET(Entry()));
+}
+
+void WComboBoxEntry::RemoveText(int position) {
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(GetID()), position);
+#else
+	gtk_combo_box_remove_text(GTK_COMBO_BOX(GetID()), position);
+#endif
+}
+
+void WComboBoxEntry::AppendText(const char *text) {
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(GetID()), text);
+#if GTK_CHECK_VERSION(3,14,0)
+	gtk_combo_box_set_button_sensitivity(GTK_COMBO_BOX(GetID()), GTK_SENSITIVITY_ON);
+#endif
+#else
+	gtk_combo_box_append_text(GTK_COMBO_BOX(GetID()), text);
+#endif
+}
+
+void WComboBoxEntry::ClearList() {
+#if GTK_CHECK_VERSION(3,0,0)
+	gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(GetID()));
+#if GTK_CHECK_VERSION(3,14,0)
+	gtk_combo_box_set_button_sensitivity(GTK_COMBO_BOX(GetID()), GTK_SENSITIVITY_OFF);
+#endif
+#else
+	for (int i = 0; i < 10; i++) {
+		RemoveText(0);
+	}
+#endif
+}
+
+void WComboBoxEntry::FillFromMemory(const std::vector<std::string> &mem, bool useTop) {
+	ClearList();
+	for (const std::string &s : mem) {
+		AppendText(s.c_str());
+	}
+	if (useTop) {
+		gtk_entry_set_text(Entry(), mem[0].c_str());
+	}
+}
+
+void WButton::Create(GUI::gui_string text, GCallback func, gpointer data) {
+	SetID(gtk_button_new_with_mnemonic(text.c_str()));
+	gtk_widget_set_can_default(GTK_WIDGET(GetID()), TRUE);
+	g_signal_connect(G_OBJECT(GetID()), "clicked", func, data);
+}
+
+void WButton::Create(GUI::gui_string text) {
+	SetID(gtk_button_new_with_mnemonic(text.c_str()));
+	gtk_widget_set_can_default(GTK_WIDGET(GetID()), TRUE);
+}
+
+void WToggle::Create(const GUI::gui_string &text) {
+	SetID(gtk_check_button_new_with_mnemonic(text.c_str()));
+}
+bool WToggle::Active() {
+	return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(GetID()));
+}
+void WToggle::SetActive(bool active) {
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(GetID()), active);
+}
+
+void WProgress::Create() {
+	SetID(gtk_progress_bar_new());
+}
+
+WCheckDraw::WCheckDraw() : cdfn(NULL), user(NULL) {
+}
+
+WCheckDraw::~WCheckDraw() {
+}
+
+static void GreyToAlpha(GdkPixbuf *ppb, GdkColor fore) {
+	guchar *pixels = gdk_pixbuf_get_pixels(ppb);
+	int rowStride = gdk_pixbuf_get_rowstride(ppb);
+	int width = gdk_pixbuf_get_width(ppb);
+	int height = gdk_pixbuf_get_height(ppb);
+	for (int y =0; y<height; y++) {
+		guchar *pixelsRow = pixels + rowStride * y;
+		for (int x =0; x<width; x++) {
+			guchar alpha = pixelsRow[0];
+			pixelsRow[3] = 255 - alpha;
+			pixelsRow[0] = fore.red / 256;
+			pixelsRow[1] = fore.green / 256;
+			pixelsRow[2] = fore.blue / 256;
+			pixelsRow += 4;
+		}
+	}
+}
+
+void WCheckDraw::Create(const char **xpmImage, const GUI::gui_string &toolTip, GtkStyle *pStyle_) {
+	GtkWidget *button = gtk_toggle_button_new();
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+
+	GdkPixbuf *pbGrey = gdk_pixbuf_new_from_xpm_data(xpmImage);
+	GdkPixbuf *pbAlpha = gdk_pixbuf_add_alpha(pbGrey, TRUE, 0xff, 0xff, 0);
+	g_object_unref(pbGrey);
+#if GTK_CHECK_VERSION(3, 4, 0)
+	(void)pStyle_;
+	GdkRGBA rgbaFore;
+	GtkStyleContext *context = gtk_widget_get_style_context(button);
+	gtk_style_context_get_color(context, gtk_style_context_get_state(context), &rgbaFore);
+	GdkColor fore;
+	fore.red = rgbaFore.red * 65535;
+	fore.green = rgbaFore.green * 65535;
+	fore.blue = rgbaFore.blue * 65535;
+	fore.pixel = 0;
+#else
+	GdkColor fore = pStyle_->fg[gtk_widget_get_state(button)];
+#endif
+	// Convert the grey to alpha and make black
+	GreyToAlpha(pbAlpha, fore);
+	GtkWidget *image = gtk_image_new_from_pixbuf(pbAlpha);
+	g_object_unref(pbAlpha);
+
+	SetID(button);
+	gtk_container_add(GTK_CONTAINER(button), image);
+
+	g_signal_connect(button, "toggled", G_CALLBACK(Toggled), this);
+	gtk_widget_set_name(GTK_WIDGET(button), "toggler");
+
+	GUI::gui_string toolTipNoMnemonic = toolTip;
+	size_t posMnemonic = toolTipNoMnemonic.find("_");
+	if (posMnemonic != GUI::gui_string::npos)
+		toolTipNoMnemonic.replace(posMnemonic, 1, "");
+	gtk_widget_set_tooltip_text(Pointer(), toolTipNoMnemonic.c_str());
+}
+
+void WCheckDraw::Toggled(GtkWidget *, WCheckDraw *pcd) {
+	if (pcd->cdfn)
+		pcd->cdfn(pcd, pcd->user);
+}
+
+GtkToggleButton *WCheckDraw::ToggleButton() {
+	return reinterpret_cast<GtkToggleButton*>(GetID());
+}
+
+bool WCheckDraw::Active() {
+	return gtk_toggle_button_get_active(ToggleButton());
+}
+
+void WCheckDraw::SetActive(bool active) {
+	gtk_toggle_button_set_active(ToggleButton(), active);
+}
+
+void WCheckDraw::Toggle() {
+	SetActive(!Active());
+}
+
+void WCheckDraw::SetChangeFunction(ChangeFunction cdfn_, void *user_) {
+	cdfn = cdfn_;
+	user = user_;
+}
+
+#if GTK_CHECK_VERSION(3,4,0)
+#define USE_GRID 1
+#else
+#define USE_GRID 0
+#endif
+
+WTable::WTable(int rows_, int columns_) :
+	rows(rows_), columns(columns_), next(0) {
+#if USE_GRID
+	SetID(gtk_grid_new());
+#else
+	SetID(gtk_table_new(rows, columns, FALSE));
+#endif
+}
+
+void WTable::Add(GtkWidget *child, int width, bool expand, int xpadding, int ypadding) {
+	if (child) {
+#if USE_GRID
+		gtk_widget_set_hexpand(child, expand);
+#if GTK_CHECK_VERSION(3,14,0)
+		gtk_widget_set_margin_end(child, xpadding);
+#else
+		gtk_widget_set_margin_right(child, xpadding);
+#endif
+		gtk_widget_set_margin_bottom(child, ypadding);
+		gtk_grid_attach(GTK_GRID(GetID()), child,
+			next % columns, next / columns,
+			width, 1);
+#else
+		GtkAttachOptions opts = static_cast<GtkAttachOptions>(
+			GTK_SHRINK | GTK_FILL);
+		GtkAttachOptions optsExpand = static_cast<GtkAttachOptions>(
+			GTK_SHRINK | GTK_FILL | GTK_EXPAND);
+
+		gtk_table_attach(GTK_TABLE(GetID()), child,
+			next % columns, next % columns + width,
+			next / columns, (next / columns) + 1,
+			expand ? optsExpand : opts, opts,
+			xpadding, ypadding);
+#endif
+	}
+	next += width;
+}
+
+void WTable::Label(GtkWidget *child) {
+#if GTK_CHECK_VERSION(3,14,0)
+	gtk_widget_set_halign(child, GTK_ALIGN_END);
+	gtk_widget_set_valign(child, GTK_ALIGN_BASELINE);
+#else
+	gtk_misc_set_alignment(GTK_MISC(child), 1.0, 0.5);
+#endif
+	Add(child);
+}
+
+void WTable::PackInto(GtkBox *box, gboolean expand) {
+	gtk_box_pack_start(box, Pointer(), expand, expand, 0);
+}
+
+void WTable::Resize(int rows_, int columns_) {
+	rows = rows_;
+	columns = columns_;
+#if !USE_GRID
+	gtk_table_resize(GTK_TABLE(GetID()), rows, columns);
+#endif
+	next = 0;
+}
+
+void WTable::NextLine() {
+	next = ((next - 1) / columns + 1) * columns;
+}
+
+GUI::gui_char KeyFromLabel(GUI::gui_string label) {
+	if (!label.empty()) {
+		size_t posMnemonic = label.find('_');
+		return MakeLowerCase(label[posMnemonic + 1]);
+	}
+	return 0;
+}
+
+void Dialog::Create(const GUI::gui_string &title) {
+	wid = gtk_dialog_new();
+	gtk_window_set_title(GTK_WINDOW(GetID()), title.c_str());
+	gtk_window_set_resizable(GTK_WINDOW(GetID()), TRUE);
+}
+
+void Dialog::Display(GtkWidget *parent, bool modal) {
+	// Mark it as a modal transient dialog
+	gtk_window_set_modal(GTK_WINDOW(GetID()), modal);
+	if (parent) {
+		gtk_window_set_transient_for(GTK_WINDOW(GetID()), GTK_WINDOW(parent));
+	}
+	g_signal_connect(G_OBJECT(GetID()), "destroy", G_CALLBACK(SignalDestroy), this);
+	gtk_widget_show_all(GTK_WIDGET(GetID()));
+	if (modal) {
+		while (Created()) {
+			gtk_main_iteration();
+		}
+	}
+}
+
+GtkWidget *Dialog::ResponseButton(const GUI::gui_string &text, int responseID) {
+	return gtk_dialog_add_button(GTK_DIALOG(GetID()), text.c_str(), responseID);
+}
+
+void Dialog::Present() {
+	gtk_window_present(GTK_WINDOW(GetID()));
+}
+
+GtkWidget *Dialog::ContentArea() {
+#if GTK_CHECK_VERSION(3,0,0)
+	return gtk_dialog_get_content_area(GTK_DIALOG(GetID()));
+#else
+	return GTK_DIALOG(GetID())->vbox;
+#endif
+}
+
+void Dialog::SignalDestroy(GtkWidget *, Dialog *d) {
+	if (d) {
+		d->SetID(0);
+	}
+}
+
+void Strip::Creation(GtkWidget *) {
+	g_signal_connect(G_OBJECT(GetID()), "button-press-event", G_CALLBACK(ButtonsPress), this);
+}
+
+void Strip::Show(int) {
+	gtk_widget_show(Widget(*this));
+	visible = true;
+}
+
+void Strip::Close() {
+	gtk_widget_hide(Widget(*this));
+	visible = false;
+}
+
+bool Strip::KeyDown(GdkEventKey *event) {
+	bool retVal = false;
+
+	if (visible) {
+		if (event->keyval == GKEY_Escape) {
+			Close();
+			return true;
+		}
+
+		if (event->state & GDK_MOD1_MASK) {
+			GList *childWidgets = gtk_container_get_children(GTK_CONTAINER(GetID()));
+			for (GList *child = g_list_first(childWidgets); child; child = g_list_next(child)) {
+				GtkWidget **w = (GtkWidget **)child;
+				std::string name = gtk_widget_get_name(*w);
+				std::string label;
+				if (name == "GtkButton" || name == "GtkCheckButton") {
+					label = gtk_button_get_label(GTK_BUTTON(*w));
+				} else if (name == "GtkLabel") {
+					label = gtk_label_get_label(GTK_LABEL(*w));
+				}
+				char key = KeyFromLabel(label);
+				if (static_cast<unsigned int>(key) == event->keyval) {
+					//fprintf(stderr, "%p %s %s %c\n", *w, name.c_str(), label.c_str(), key);
+					if (name == "GtkButton" || name == "GtkCheckButton") {
+						gtk_button_clicked(GTK_BUTTON(*w));
+					} else if (name == "GtkLabel") {
+						// Only ever use labels to label ComboBoxEntry
+						GtkWidget *pwidgetSelect = gtk_label_get_mnemonic_widget(GTK_LABEL(*w));
+						if (pwidgetSelect) {
+							gtk_widget_grab_focus(pwidgetSelect);
+						}
+					}
+					retVal = true;
+					break;
+				}
+			}
+			g_list_free(childWidgets);
+		}
+	}
+	return retVal;
+}
+
+void Strip::MenuSignal(GtkMenuItem *menuItem, Strip *pStrip) {
+	sptr_t cmd = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuItem), "CmdNum"));
+	pStrip->MenuAction(cmd);
+}
+
+void Strip::AddToPopUp(GUI::Menu &popup, const char *label, int cmd, bool checked) {
+	allowMenuActions = false;
+	GUI::gui_string localised = localiser->Text(label);
+	GtkWidget *menuItem = gtk_check_menu_item_new_with_mnemonic(localised.c_str());
+	gtk_menu_shell_append(GTK_MENU_SHELL(popup.GetID()), menuItem);
+	g_object_set_data(G_OBJECT(menuItem), "CmdNum", GINT_TO_POINTER(cmd));
+	g_signal_connect(G_OBJECT(menuItem),"activate", G_CALLBACK(MenuSignal), this);
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuItem), checked ? TRUE : FALSE);
+	allowMenuActions = true;
+}
+
+void Strip::ChildFocus(GtkWidget *widget) {
+	childHasFocus = widget != 0;
+}
+
+gboolean Strip::ChildFocusSignal(GtkContainer */*container*/, GtkWidget *widget, Strip *pStrip) {
+	pStrip->ChildFocus(widget);
+	return FALSE;
+}
+
+gboolean Strip::FocusSignal(GtkWidget */*widget*/, GtkDirectionType direction, Strip *pStrip) {
+	return pStrip->Focus(direction);
+}
+
+bool Strip::VisibleHasFocus() const {
+	return visible && childHasFocus;
+}
+
+gint Strip::ButtonsPress(GtkWidget *, GdkEventButton *event, Strip *pstrip) {
+	if (event->button == 3) {
+		pstrip->ShowPopup();
+		return TRUE;
+	}
+	return FALSE;
+}
diff --git a/scite-app/scite/gtk/Widget.h b/scite-app/scite/gtk/Widget.h
new file mode 100644
index 0000000..88649e7
--- /dev/null
+++ b/scite-app/scite/gtk/Widget.h
@@ -0,0 +1,166 @@
+// SciTE - Scintilla based Text Editor
+// Widget.h - code for manipulating  GTK widgets
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef WIDGET_H
+#define WIDGET_H
+
+// Callback thunk class connects GTK signals to a simple command method.
+
+// Callback thunk class connects GTK signals to an instance method.
+template< class T, void (T::*method)() >
+class ObjectSignal {
+public:
+	static void Function(GtkWidget */*w*/, T *object) {
+		(object->*method)();
+	}
+};
+
+class WBase : public GUI::Window {
+public:
+	operator GtkWidget*() const;
+	GtkWidget* Pointer();
+	bool Sensitive();
+};
+
+inline GtkWidget *Widget(const GUI::Window &w) {
+	return static_cast<GtkWidget *>(w.GetID());
+}
+
+class WStatic : public WBase {
+public:
+	void Create(GUI::gui_string text);
+	bool HasMnemonic();
+	void SetMnemonicFor(WBase &w);
+};
+
+class WEntry : public WBase {
+public:
+	void Create(const GUI::gui_char *text=0);
+	void ActivatesDefault();
+	const GUI::gui_char *Text();
+	int Value();
+	void SetText(const GUI::gui_char *text);
+	static void SetValid(GtkEntry *entry, bool valid);
+};
+
+class WComboBoxEntry : public WBase {
+public:
+	void Create();
+	GtkEntry *Entry();
+	void ActivatesDefault();
+	const GUI::gui_char *Text();
+	void SetText(const GUI::gui_char *text);
+	bool HasFocusOnSelfOrChild();
+	void ClearList();
+	void RemoveText(int position);
+	void AppendText(const char *text);
+	void FillFromMemory(const std::vector<std::string> &mem, bool useTop = false);
+};
+
+class WButton : public WBase {
+public:
+	void Create(GUI::gui_string text, GCallback func, gpointer data);
+	void Create(GUI::gui_string text);
+};
+
+class WToggle : public WBase {
+public:
+	void Create(const GUI::gui_string &text);
+	bool Active();
+	void SetActive(bool active);
+};
+
+class WCheckDraw : public WBase {
+public:
+	typedef void (*ChangeFunction)(WCheckDraw *cd, void *user);
+private:
+	ChangeFunction cdfn;
+	void *user;
+	static void Toggled(GtkWidget *widget, WCheckDraw *pcd);
+	GtkToggleButton *ToggleButton();
+public:
+	WCheckDraw();
+	~WCheckDraw();
+	void Create(const char **xpmImage, const GUI::gui_string &toolTip, GtkStyle *pStyle_);
+	bool Active();
+	void SetActive(bool active);
+	void Toggle();
+	void SetChangeFunction(ChangeFunction cdfn_, void *user_);
+	enum {  checkIconWidth = 16, checkButtonWidth = 16 + 3 * 2 + 1};
+};
+
+class WProgress : public WBase {
+public:
+	void Create();
+};
+
+class WTable : public WBase {
+private:
+	int rows;
+	int columns;
+	int next;
+public:
+	WTable(int rows_, int columns_);
+	void Add(GtkWidget *child=0, int width=1, bool expand=false,
+		int xpadding=5, int ypadding=5);
+	void Label(GtkWidget *child);
+	void PackInto(GtkBox *box, gboolean expand=TRUE);
+	void Resize(int rows_, int columns_);
+	void NextLine();
+};
+
+GUI::gui_char KeyFromLabel(GUI::gui_string label);
+
+class Dialog : public GUI::Window {
+public:
+	void Create(const GUI::gui_string &title);
+	void Display(GtkWidget *parent = 0, bool modal=true);
+	GtkWidget *ResponseButton(const GUI::gui_string &text, int responseID);
+	void Present();
+	GtkWidget *ContentArea();
+
+private:
+	static void SignalDestroy(GtkWidget *, Dialog *d);
+};
+
+class BaseWin : public GUI::Window {
+protected:
+	ILocalize *localiser;
+public:
+	BaseWin() : localiser(0) {
+	}
+	void SetLocalizer(ILocalize *localiser_) {
+		localiser = localiser_;
+	}
+};
+
+class Strip : public BaseWin {
+protected:
+	bool allowMenuActions;
+	bool childHasFocus;
+	enum { heightButton=23, heightStatic=12, widthCombo=20};
+public:
+	bool visible;
+	Strip() : allowMenuActions(false), childHasFocus(false), visible(false) {
+	}
+	virtual ~Strip() {
+	}
+	virtual void Creation(GtkWidget *container);
+	virtual void Show(int buttonHeight);
+	virtual void Close();
+	virtual bool KeyDown(GdkEventKey *event);
+	virtual void ShowPopup() {}
+	virtual void MenuAction(guint /* action */) {}
+	static void MenuSignal(GtkMenuItem *menuItem, Strip *pStrip);
+	void AddToPopUp(GUI::Menu &popup, const char *label, int cmd, bool checked);
+	virtual void ChildFocus(GtkWidget *widget);
+	static gboolean ChildFocusSignal(GtkContainer *container, GtkWidget *widget, Strip *pStrip);
+	virtual gboolean Focus(GtkDirectionType /* direction*/ ) { return false; }
+	static gboolean FocusSignal(GtkWidget *widget, GtkDirectionType direction, Strip *pStrip);
+	bool VisibleHasFocus() const;
+	static gint ButtonsPress(GtkWidget *widget, GdkEventButton *event, Strip *pstrip);
+};
+
+#endif
diff --git a/scite-app/scite/gtk/deps.mak b/scite-app/scite/gtk/deps.mak
new file mode 100644
index 0000000..a55c40e
--- /dev/null
+++ b/scite-app/scite/gtk/deps.mak
@@ -0,0 +1,832 @@
+# Created by AppDepGen.py. To recreate, run AppDepGen.py.
+DirectorExtension.o: \
+	DirectorExtension.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	DirectorExtension.h
+GUIGTK.o: \
+	GUIGTK.cxx \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaWidget.h \
+	../src/GUI.h
+SciTEGTK.o: \
+	SciTEGTK.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/ScintillaWidget.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	pixmapsGNOME.h \
+	SciIcon.h \
+	Widget.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	../src/StripDefinition.h \
+	../src/SciTEKeys.h \
+	../src/MultiplexExtension.h \
+	DirectorExtension.h \
+	../src/LuaExtension.h
+Widget.o: \
+	Widget.cxx \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	Widget.h
+Cookie.o: \
+	../src/Cookie.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/Cookie.h
+Credits.o: \
+	../src/Credits.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+EditorConfig.o: \
+	../src/EditorConfig.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/EditorConfig.h
+ExportHTML.o: \
+	../src/ExportHTML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportPDF.o: \
+	../src/ExportPDF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportRTF.o: \
+	../src/ExportRTF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportTEX.o: \
+	../src/ExportTEX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportXML.o: \
+	../src/ExportXML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+FilePath.o: \
+	../src/FilePath.cxx \
+	../src/GUI.h \
+	../src/FilePath.h
+FileWorker.o: \
+	../src/FileWorker.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/FilePath.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/Utf8_16.h
+IFaceTable.o: \
+	../src/IFaceTable.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/IFaceTable.h
+JobQueue.o: \
+	../src/JobQueue.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h \
+	../src/SciTE.h \
+	../src/JobQueue.h
+LuaExtension.o: \
+	../src/LuaExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/IFaceTable.h \
+	../src/SciTEKeys.h \
+	../src/LuaExtension.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+MatchMarker.o: \
+	../src/MatchMarker.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/MatchMarker.h
+MultiplexExtension.o: \
+	../src/MultiplexExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/MultiplexExtension.h \
+	../src/Extender.h
+PropSetFile.o: \
+	../src/PropSetFile.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h
+ScintillaWindow.o: \
+	../src/ScintillaWindow.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h
+SciTEBase.o: \
+	../src/SciTEBase.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h
+SciTEBuffers.o: \
+	../src/SciTEBuffers.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+SciTEIO.o: \
+	../src/SciTEIO.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	../src/Utf8_16.h
+SciTEProps.o: \
+	../src/SciTEProps.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h \
+	../src/IFaceTable.h
+StringHelpers.o: \
+	../src/StringHelpers.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h
+StringList.o: \
+	../src/StringList.cxx \
+	../src/GUI.h \
+	../src/StringList.h \
+	../src/StringHelpers.h
+StyleDefinition.o: \
+	../src/StyleDefinition.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/StyleDefinition.h
+StyleWriter.o: \
+	../src/StyleWriter.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StyleWriter.h
+Utf8_16.o: \
+	../src/Utf8_16.cxx \
+	../src/Utf8_16.h
+lapi.o: \
+	../lua/src/lapi.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+lauxlib.o: \
+	../lua/src/lauxlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h
+lbaselib.o: \
+	../lua/src/lbaselib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lbitlib.o: \
+	../lua/src/lbitlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lcode.o: \
+	../lua/src/lcode.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lcorolib.o: \
+	../lua/src/lcorolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lctype.o: \
+	../lua/src/lctype.c \
+	../lua/src/lprefix.h \
+	../lua/src/lctype.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/llimits.h
+ldblib.o: \
+	../lua/src/ldblib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ldebug.o: \
+	../lua/src/ldebug.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ldo.o: \
+	../lua/src/ldo.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+ldump.o: \
+	../lua/src/ldump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lundump.h
+lfunc.o: \
+	../lua/src/lfunc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lfunc.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lgc.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h
+lgc.o: \
+	../lua/src/lgc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+linit.o: \
+	../lua/src/linit.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+liolib.o: \
+	../lua/src/liolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+llex.o: \
+	../lua/src/llex.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lmathlib.o: \
+	../lua/src/lmathlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lmem.o: \
+	../lua/src/lmem.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h
+loadlib.o: \
+	../lua/src/loadlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lobject.o: \
+	../lua/src/lobject.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lvm.h
+lopcodes.o: \
+	../lua/src/lopcodes.c \
+	../lua/src/lprefix.h \
+	../lua/src/lopcodes.h \
+	../lua/src/llimits.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h
+loslib.o: \
+	../lua/src/loslib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lparser.o: \
+	../lua/src/lparser.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h
+lstate.o: \
+	../lua/src/lstate.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lstring.o: \
+	../lua/src/lstring.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h
+lstrlib.o: \
+	../lua/src/lstrlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltable.o: \
+	../lua/src/ltable.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ltablib.o: \
+	../lua/src/ltablib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltm.o: \
+	../lua/src/ltm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lundump.o: \
+	../lua/src/lundump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lundump.h
+lutf8lib.o: \
+	../lua/src/lutf8lib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lvm.o: \
+	../lua/src/lvm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lzio.o: \
+	../lua/src/lzio.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../lua/src/llimits.h \
+	../lua/src/lmem.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h
+LexillaAccess.o: \
+	../../lexilla/access/LexillaAccess.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h
+ScintillaCall.o: \
+	../../scintilla/call/ScintillaCall.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h
diff --git a/scite-app/scite/gtk/lua.vers b/scite-app/scite/gtk/lua.vers
new file mode 100644
index 0000000..6679044
--- /dev/null
+++ b/scite-app/scite/gtk/lua.vers
@@ -0,0 +1,180 @@
+VERS_1.0 {
+	global:
+		lua_absindex;
+		lua_arith;
+		lua_atpanic;
+		lua_callk;
+		lua_checkstack;
+		lua_close;
+		lua_compare;
+		lua_concat;
+		lua_copy;
+		lua_createtable;
+		lua_dump;
+		lua_error;
+		lua_gc;
+		lua_getallocf;
+		lua_getfield;
+		lua_getglobal;
+		lua_gethook;
+		lua_gethookcount;
+		lua_gethookmask;
+		lua_geti;
+		lua_getinfo;
+		lua_getlocal;
+		lua_getmetatable;
+		lua_getstack;
+		lua_gettable;
+		lua_gettop;
+		lua_getupvalue;
+		lua_getuservalue;
+		lua_ident;
+		lua_iscfunction;
+		lua_isinteger;
+		lua_isnumber;
+		lua_isstring;
+		lua_isuserdata;
+		lua_isyieldable;
+		luaL_addlstring;
+		luaL_addstring;
+		luaL_addvalue;
+		luaL_argerror;
+		luaL_buffinit;
+		luaL_buffinitsize;
+		luaL_callmeta;
+		luaL_checkany;
+		luaL_checkinteger;
+		luaL_checklstring;
+		luaL_checknumber;
+		luaL_checkoption;
+		luaL_checkstack;
+		luaL_checktype;
+		luaL_checkudata;
+		luaL_checkversion_;
+		lua_len;
+		luaL_error;
+		luaL_execresult;
+		luaL_fileresult;
+		luaL_getmetafield;
+		luaL_getsubtable;
+		luaL_gsub;
+		luaL_len;
+		luaL_loadbufferx;
+		luaL_loadfilex;
+		luaL_loadstring;
+		luaL_newmetatable;
+		luaL_newstate;
+		lua_load;
+		luaL_openlibs;
+		luaL_optinteger;
+		luaL_optlstring;
+		luaL_optnumber;
+		luaL_prepbuffsize;
+		luaL_pushresult;
+		luaL_pushresultsize;
+		luaL_ref;
+		luaL_requiref;
+		luaL_setfuncs;
+		luaL_setmetatable;
+		luaL_testudata;
+		luaL_tolstring;
+		luaL_traceback;
+		luaL_unref;
+		luaL_where;
+		lua_newstate;
+		lua_newthread;
+		lua_newuserdata;
+		lua_next;
+		luaopen_base;
+		luaopen_bit32;
+		luaopen_coroutine;
+		luaopen_debug;
+		luaopen_io;
+		luaopen_math;
+		luaopen_os;
+		luaopen_package;
+		luaopen_string;
+		luaopen_table;
+		luaopen_utf8;
+		lua_pcallk;
+		lua_pushboolean;
+		lua_pushcclosure;
+		lua_pushfstring;
+		lua_pushinteger;
+		lua_pushlightuserdata;
+		lua_pushlstring;
+		lua_pushnil;
+		lua_pushnumber;
+		lua_pushstring;
+		lua_pushthread;
+		lua_pushvalue;
+		lua_pushvfstring;
+		lua_rawequal;
+		lua_rawget;
+		lua_rawgeti;
+		lua_rawgetp;
+		lua_rawlen;
+		lua_rawset;
+		lua_rawseti;
+		lua_rawsetp;
+		lua_resume;
+		lua_rotate;
+		lua_setallocf;
+		lua_setfield;
+		lua_setglobal;
+		lua_sethook;
+		lua_seti;
+		lua_setlocal;
+		lua_setmetatable;
+		lua_settable;
+		lua_settop;
+		lua_setupvalue;
+		lua_setuservalue;
+		lua_status;
+		lua_stringtonumber;
+		lua_toboolean;
+		lua_tocfunction;
+		lua_tointegerx;
+		lua_tolstring;
+		lua_tonumberx;
+		lua_topointer;
+		lua_tothread;
+		lua_touserdata;
+		lua_type;
+		lua_typename;
+		lua_upvalueid;
+		lua_upvaluejoin;
+		lua_version;
+		lua_xmove;
+		lua_yieldk;
+		_Z11raise_errorP9lua_StatePKc;
+		_Z14absolute_indexP9lua_Statei;
+		_ZN14StylingContext10EndStylingEP9lua_State;
+		_ZN14StylingContext10PushMethodEP9lua_StatePFiS1_EPKc;
+		_ZN14StylingContext10SetLevelAtEP9lua_State;
+		_ZN14StylingContext11AtLineStartEP9lua_State;
+		_ZN14StylingContext11ChangeStateEP9lua_State;
+		_ZN14StylingContext12SetLineStateEP9lua_State;
+		_ZN14StylingContext12StartStylingEP9lua_State;
+		_ZN14StylingContext15ForwardSetStateEP9lua_State;
+		_ZN14StylingContext4LineEP9lua_State;
+		_ZN14StylingContext4MoreEP9lua_State;
+		_ZN14StylingContext4NextEP9lua_State;
+		_ZN14StylingContext5MatchEP9lua_State;
+		_ZN14StylingContext5StateEP9lua_State;
+		_ZN14StylingContext5TokenEP9lua_State;
+		_ZN14StylingContext6CharAtEP9lua_State;
+		_ZN14StylingContext7ContextEP9lua_State;
+		_ZN14StylingContext7CurrentEP9lua_State;
+		_ZN14StylingContext7ForwardEP9lua_State;
+		_ZN14StylingContext7LevelAtEP9lua_State;
+		_ZN14StylingContext7StyleAtEP9lua_State;
+		_ZN14StylingContext8PositionEP9lua_State;
+		_ZN14StylingContext8PreviousEP9lua_State;
+		_ZN14StylingContext8SetStateEP9lua_State;
+		_ZN14StylingContext9AtLineEndEP9lua_State;
+		_ZN14StylingContext9LineStateEP9lua_State;
+		_ZN8LexerCPP14EvaluateTokensERSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EERKSt3mapIS6_NS_11SymbolValueESt4lessIS6_ESaISt4pairIKS6_SB_EEE;
+		_ZN8LexerCPP18EvaluateExpressionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt3mapIS5_NS_11SymbolValueESt4lessIS5_ESaISt4pairIS6_S9_EEE;
+		_ZNK11PropSetFile8EvaluateB5cxx11EPKc;
+};
diff --git a/scite-app/scite/gtk/makefile b/scite-app/scite/gtk/makefile
new file mode 100644
index 0000000..c1c8725
--- /dev/null
+++ b/scite-app/scite/gtk/makefile
@@ -0,0 +1,193 @@
+# Make file for SciTE on Linux or compatible OS
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile assumes GCC 4.x is used and changes will be needed to use other compilers.
+# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
+
+.PHONY: all clean analyze depend install uninstall
+
+srcdir ?= .
+SCINTILLA_DIR ?= $(srcdir)/../../scintilla
+LEXILLA_DIR ?= $(srcdir)/../../lexilla
+
+.SUFFIXES: .cxx .o .h .a .c
+
+WARNINGS += -Wall -pedantic -Wextra
+
+ifdef CLANG
+# 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
+SANITIZE = address
+#SANITIZE = undefined
+CXX = clang++
+CC = clang
+BASE_FLAGS += -fsanitize=$(SANITIZE)
+WARNINGS += -Wno-deprecated-register
+WARNINGS += -Wno-empty-body
+else
+WARNINGS += -Wno-misleading-indentation
+endif
+PKG_CONFIG ?= pkg-config
+
+GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
+
+PYTHON = $(if $(windir),pyw,python3)
+
+# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
+gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
+ifndef prefix
+ifdef gnomeprefix
+  prefix=$(gnomeprefix)
+else
+  prefix=/usr
+endif
+endif
+datadir=$(prefix)/share
+pixmapdir=$(datadir)/pixmaps
+bindir=$(prefix)/bin
+libdir=$(prefix)/lib/scite
+SYSCONF_PATH=$(prefix)/share/scite
+
+INSTALL=install
+COPY = cp -a
+
+PROG	= $(srcdir)/../bin/SciTE
+# make should be run in ../../scintilla/gtk to compile all the lexers.
+SHAREDEXTENSION = $(if $(windir),dll,so)
+COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
+LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
+
+all: $(PROG) $(COMPONENT) $(LEXILLA)
+
+vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include
+vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call
+
+INCLUDES=-I $(LEXILLA_DIR)/include  -I $(LEXILLA_DIR)/access -I $(SCINTILLA_DIR)/include -I $(srcdir)/../src
+DEFINES += -DGTK
+DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+ifndef NO_LUA
+LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
+		ltable.o ltm.o lundump.o lvm.o lzio.o
+
+LUA_LIB_OBJS =	lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o ltablib.o \
+		lstrlib.o loadlib.o loslib.o linit.o lutf8lib.o
+
+LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+
+vpath %.c $(srcdir)/../lua/src
+
+INCLUDES += -I$(srcdir)/../lua/src
+LUA_DEFINES = -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+
+%.o: %.c
+	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(WARNINGS) $(LUA_DEFINES) $(BASE_FLAGS) $(CFLAGS) -c $< -o $@
+
+else
+DEFINES += -DNO_LUA
+endif
+
+LIBS += -lm -lstdc++
+
+UNAME:=$(shell uname -s)
+ifeq ($(UNAME), Linux)
+LIBS += -ldl
+endif
+ifneq (,$(findstring GNU,$(UNAME)))
+LIBS += -ldl
+endif
+
+%.o: %.cxx
+	$(CXX) $(CPPFLAGS) --std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) -c $< -o $@
+
+clean:
+	rm -f *.o *.plist $(PROG)
+
+analyze:
+	clang --analyze --std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx
+
+depend deps.mak:
+	$(PYTHON) AppDepGen.py
+
+../bin/%.$(SHAREDEXTENSION):	../../scintilla/bin/%.$(SHAREDEXTENSION)
+	$(COPY) $< $(@D)
+
+../bin/%.$(SHAREDEXTENSION):	../../lexilla/bin/%.$(SHAREDEXTENSION)
+	$(COPY) $< $(@D)
+
+# To almost make lua.vers (needs header and footer added) which is only needed after updating Lua:
+# nm -g ../bin/SciTE | grep lua | awk '{print "\t\t" $3 ";"}' >lua2.vers
+
+SRC_OBJS = \
+	Cookie.o \
+	Credits.o \
+	EditorConfig.o \
+	ExportHTML.o \
+	ExportPDF.o \
+	ExportRTF.o \
+	ExportTEX.o \
+	ExportXML.o \
+	FilePath.o \
+	FileWorker.o \
+	IFaceTable.o \
+	JobQueue.o \
+	LexillaAccess.o \
+	MatchMarker.o \
+	MultiplexExtension.o \
+	PropSetFile.o \
+	ScintillaCall.o \
+	ScintillaWindow.o \
+	SciTEBase.o \
+	SciTEBuffers.o \
+	SciTEIO.o \
+	SciTEProps.o \
+	StringHelpers.o \
+	StringList.o \
+	StyleDefinition.o \
+	StyleWriter.o \
+	Utf8_16.o
+
+$(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
+
+# Automatically generate header dependencies with "make deps"
+include deps.mak
+
+# The two last install commands will fail if Gnome is not installed or is not at $(prefix).
+# This is OK - just means no SciTE in the Gnome Applications menu
+# Dead:	install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
+install:
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(SYSCONF_PATH)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
+
+	$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir)
+	$(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir)
+
+	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \
+	do \
+		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
+	done
+
+ifdef gnomeprefix
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
+	$(INSTALL) -m 644 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+	$(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+endif
+
+uninstall:
+	rm -f $(DESTDIR)$(bindir)/SciTE
+	rm -f $(DESTDIR)$(libdir)/libscintilla.so
+	rm -f $(DESTDIR)$(libdir)/liblexilla.so
+	rm -rf $(DESTDIR)$(SYSCONF_PATH)
+ifdef gnomeprefix
+	rm -f $(DESTDIR)$(datadir)/applications/SciTE.desktop
+	rm -f $(DESTDIR)$(pixmapdir)/Sci48M.png
+endif
diff --git a/scite-app/scite/gtk/pixmapsGNOME.h b/scite-app/scite/gtk/pixmapsGNOME.h
new file mode 100644
index 0000000..affa364
--- /dev/null
+++ b/scite-app/scite/gtk/pixmapsGNOME.h
@@ -0,0 +1,1593 @@
+// @file pixmapsGNOME.h
+// Set of images for tool bar buttons
+// Icons  Copyright(C) 1998  by  Dean S. Jones
+// http://jfa.javalobby.org/projects/icons/
+// Modified to have same names as tigert.h
+// Not really anything to do with Gnome - just calling this
+// file pixmapsGNOME to fit in with previous code.
+
+/* XPM */
+static const char * editcopy_xpm[] = {
+"20 20 13 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #6E6E6E",
+"@	c #000000",
+"#	c #8EFFFF",
+"$	c #FFB1B1",
+"%	c #B1FFFF",
+"&	c #3E3E3E",
+"*	c #DADADA",
+"=	c #F2F2F2",
+"-	c #FFFFFF",
+";	c #CECECE",
+">	c #E6E6E6",
+".+++++++++.         ",
+"+@@@@@@@@@+.        ",
+"+@#$%%%&*+&+.       ",
+"+@.$*=-&-*+@+.      ",
+"+@#$%%.+++++++++.   ",
+"+@.$*=+@@@@@@@@@+.  ",
+"+@#$%%+@#$%%%&*+&+. ",
+"+@.$*=+@.$;>=&-*+@+.",
+"+@#$%%+@#$%%%&--*@+.",
+"+@.$*=+@.$;>=++++@+.",
+"+@#$%%+@#$%%%%%%%@+.",
+"+@.$*=+@.$;>=---=@+.",
+"+@#$%%+@#$%%%%%%%@+.",
+"+@@@@@+@.$;>=---=@+.",
+".++++++@#$%%%%%%%@+.",
+" .....+@.$;>=---=@+.",
+"      +@#$%%%%%%%@+.",
+"      +@@@@@@@@@@@+.",
+"      .+++++++++++..",
+"       ............ "};
+/* XPM */
+static const char * editcut_xpm[] = {
+"20 20 14 1",
+" 	c None",
+".	c #7A7A7A",
+"+	c #AAAAAA",
+"@	c #C0C0C0",
+"#	c #4A4A4A",
+"$	c #000000",
+"%	c #CECECE",
+"&	c #FFFFFF",
+"*	c #B6B6B6",
+"=	c #9E9E9E",
+"-	c #E6E6E6",
+";	c #F2F2F2",
+">	c #6E6E6E",
+",	c #DADADA",
+"  ...          ...+@",
+" .#$$.        .$$$.+",
+" .$%$$.      .$$&$.+",
+" .$*&$$.    .$$&%$.+",
+" .$=-&$$.  .$$&%*$.+",
+" .$$@-&$$..$$&%*$$.+",
+"  .$$@-&$$$$&%*$$.+ ",
+"   .$$@-&.$&%*$$.+  ",
+"    .$$@-;..*$$.+   ",
+"     .$$@$&$$$.+    ",
+"      .$$+-%$>+++   ",
+"   ...$..$$%%$...+  ",
+"  .$$$$$$.$$$$$$$.+ ",
+" .$$++=$.+.$$=++$$.+",
+"+$$+,@,$. +.$,@,+$$+",
+"+$$&@&;$.  .$+,@&$$+",
+"+$$+&;$$+  +$$+&;$$+",
+" .$$$$$+    +$$$$$. ",
+"  .$$$+      +$$$.  ",
+"   +++        +++   "};
+/* XPM */
+static const char * close_xpm[] = {
+"20 20 242 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #800000",
+"@ 	c #008000",
+"# 	c #808000",
+"$ 	c #000080",
+"% 	c #800080",
+"& 	c #008080",
+"* 	c #C0C0C0",
+"= 	c #C0DCC0",
+"- 	c #A6CAF0",
+"; 	c #FFF0D4",
+"> 	c #FFE2B1",
+", 	c #FFD48E",
+"' 	c #FFC66B",
+") 	c #FFB848",
+"! 	c #FFAA25",
+"~ 	c #FFAA00",
+"{ 	c #DC9200",
+"] 	c #B97A00",
+"^ 	c #966200",
+"/ 	c #734A00",
+"( 	c #503200",
+"_ 	c #FFE3D4",
+": 	c #FFC7B1",
+"< 	c #FFAB8E",
+"[ 	c #FF8F6B",
+"} 	c #FF7348",
+"| 	c #FF5725",
+"1 	c #FF5500",
+"2 	c #DC4900",
+"3 	c #B93D00",
+"4 	c #963100",
+"5 	c #732500",
+"6 	c #501900",
+"7 	c #FFD4D4",
+"8 	c #FFB1B1",
+"9 	c #FF8E8E",
+"0 	c #FF6B6B",
+"a 	c #FF4848",
+"b 	c #FF2525",
+"c 	c #FE0000",
+"d 	c #DC0000",
+"e 	c #B90000",
+"f 	c #960000",
+"g 	c #730000",
+"h 	c #500000",
+"i 	c #FFD4E3",
+"j 	c #FFB1C7",
+"k 	c #FF8EAB",
+"l 	c #FF6B8F",
+"m 	c #FF4873",
+"n 	c #FF2557",
+"o 	c #FF0055",
+"p 	c #DC0049",
+"q 	c #B9003D",
+"r 	c #960031",
+"s 	c #730025",
+"t 	c #500019",
+"u 	c #FFD4F0",
+"v 	c #FFB1E2",
+"w 	c #FF8ED4",
+"x 	c #FF6BC6",
+"y 	c #FF48B8",
+"z 	c #FF25AA",
+"A 	c #FF00AA",
+"B 	c #DC0092",
+"C 	c #B9007A",
+"D 	c #960062",
+"E 	c #73004A",
+"F 	c #500032",
+"G 	c #FFD4FF",
+"H 	c #FFB1FF",
+"I 	c #FF8EFF",
+"J 	c #FF6BFF",
+"K 	c #FF48FF",
+"L 	c #FF25FF",
+"M 	c #FE00FE",
+"N 	c #DC00DC",
+"O 	c #B900B9",
+"P 	c #960096",
+"Q 	c #730073",
+"R 	c #500050",
+"S 	c #F0D4FF",
+"T 	c #E2B1FF",
+"U 	c #D48EFF",
+"V 	c #C66BFF",
+"W 	c #B848FF",
+"X 	c #AA25FF",
+"Y 	c #AA00FF",
+"Z 	c #9200DC",
+"` 	c #7A00B9",
+" .	c #620096",
+"..	c #4A0073",
+"+.	c #320050",
+"@.	c #E3D4FF",
+"#.	c #C7B1FF",
+"$.	c #AB8EFF",
+"%.	c #8F6BFF",
+"&.	c #7348FF",
+"*.	c #5725FF",
+"=.	c #5500FF",
+"-.	c #4900DC",
+";.	c #3D00B9",
+">.	c #310096",
+",.	c #250073",
+"'.	c #190050",
+").	c #D4D4FF",
+"!.	c #B1B1FF",
+"~.	c #8E8EFF",
+"{.	c #6B6BFF",
+"].	c #4848FF",
+"^.	c #2525FF",
+"/.	c #0000FE",
+"(.	c #0000DC",
+"_.	c #0000B9",
+":.	c #000096",
+"<.	c #000073",
+"[.	c #000050",
+"}.	c #D4E3FF",
+"|.	c #B1C7FF",
+"1.	c #8EABFF",
+"2.	c #6B8FFF",
+"3.	c #4873FF",
+"4.	c #2557FF",
+"5.	c #0055FF",
+"6.	c #0049DC",
+"7.	c #003DB9",
+"8.	c #003196",
+"9.	c #002573",
+"0.	c #001950",
+"a.	c #D4F0FF",
+"b.	c #B1E2FF",
+"c.	c #8ED4FF",
+"d.	c #6BC6FF",
+"e.	c #48B8FF",
+"f.	c #25AAFF",
+"g.	c #00AAFF",
+"h.	c #0092DC",
+"i.	c #007AB9",
+"j.	c #006296",
+"k.	c #004A73",
+"l.	c #003250",
+"m.	c #D4FFFF",
+"n.	c #B1FFFF",
+"o.	c #8EFFFF",
+"p.	c #6BFFFF",
+"q.	c #48FFFF",
+"r.	c #25FFFF",
+"s.	c #00FEFE",
+"t.	c #00DCDC",
+"u.	c #00B9B9",
+"v.	c #009696",
+"w.	c #007373",
+"x.	c #005050",
+"y.	c #D4FFF0",
+"z.	c #B1FFE2",
+"A.	c #8EFFD4",
+"B.	c #6BFFC6",
+"C.	c #48FFB8",
+"D.	c #25FFAA",
+"E.	c #00FFAA",
+"F.	c #00DC92",
+"G.	c #00B97A",
+"H.	c #009662",
+"I.	c #00734A",
+"J.	c #005032",
+"K.	c #D4FFE3",
+"L.	c #B1FFC7",
+"M.	c #8EFFAB",
+"N.	c #6BFF8F",
+"O.	c #48FF73",
+"P.	c #25FF57",
+"Q.	c #00FF55",
+"R.	c #00DC49",
+"S.	c #00B93D",
+"T.	c #009631",
+"U.	c #007325",
+"V.	c #005019",
+"W.	c #D4FFD4",
+"X.	c #B1FFB1",
+"Y.	c #8EFF8E",
+"Z.	c #6BFF6B",
+"`.	c #48FF48",
+" +	c #25FF25",
+".+	c #00FE00",
+"++	c #00DC00",
+"@+	c #00B900",
+"#+	c #009600",
+"$+	c #007300",
+"%+	c #005000",
+"&+	c #E3FFD4",
+"*+	c #C7FFB1",
+"=+	c #ABFF8E",
+"-+	c #8FFF6B",
+";+	c #73FF48",
+">+	c #57FF25",
+",+	c #55FF00",
+"'+	c #49DC00",
+")+	c #3DB900",
+"!+	c #319600",
+"~+	c #257300",
+"{+	c #195000",
+"]+	c #F0FFD4",
+"^+	c #E2FFB1",
+"/+	c #D4FF8E",
+"(+	c #C6FF6B",
+"_+	c #B8FF48",
+":+	c #AAFF25",
+"<+	c #AAFF00",
+"[+	c #92DC00",
+"}+	c #7AB900",
+"|+	c #629600",
+"1+	c #4A7300",
+"2+	c #325000",
+"3+	c #FFFFD4",
+"4+	c #FFFFB1",
+"5+	c #FFFF8E",
+"6+	c #FFFF6B",
+"7+	c #FFFF48",
+"8+	c #FFFF25",
+"9+	c #FEFE00",
+"0+	c #DCDC00",
+"a+	c #B9B900",
+"b+	c #969600",
+"c+	c #737300",
+"d+	c #505000",
+"e+	c #F2F2F2",
+"f+	c #E6E6E6",
+"g+	c #DADADA",
+"h+	c #CECECE",
+"i+	c #C2C2C2",
+"j+	c #B6B6B6",
+"k+	c #AAAAAA",
+"l+	c #9E9E9E",
+"m+	c #929292",
+"n+	c #868686",
+"o+	c #7A7A7A",
+"p+	c #6E6E6E",
+"q+	c #626262",
+"r+	c #565656",
+"s+	c #4A4A4A",
+"                                        ",
+"      . . .                 s+. .       ",
+"    . . l . .             s+. l . .     ",
+"  . . l p l . .         s+. l p l . .   ",
+"  . l p p p l . .     s+. l p p p r .   ",
+"  . . r p p p l . q+q+. l p p p r . .   ",
+"    . . r p p p l . . l p p p r . .     ",
+"      . . r p p p l l p p p r . .       ",
+"        . . r p p p p p p r . .         ",
+"          q+. r p p p p r . q+          ",
+"          q+. l p p p p l . q+          ",
+"        . . l p p p p p p l . .         ",
+"      . . l p p p r r p p p l . .       ",
+"    . . l p p p r . . r p p p l . .     ",
+"  . . l p p p r . q+q+. r p p p l . .   ",
+"  . p p p p r . .     s+. r p p p p .   ",
+"  . . r p r . .         s+. r p r . .   ",
+"    . . r . .             s+. r . .     ",
+"      . . .                 s+. .       ",
+"                                        "};
+#if 0
+/* XPM */
+static const char * DocumentIn_xpm[] = {
+"20 20 17 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #B1FFFF",
+"$	c #FFB1B1",
+"%	c #CECECE",
+"&	c #7A7A7A",
+"*	c #E6E6E6",
+"=	c #FFFFFF",
+"-	c #868686",
+";	c #007373",
+">	c #6E6E6E",
+",	c #48B8FF",
+"'	c #8ED4FF",
+")	c #0092DC",
+"!	c #DADADA",
+"  .+++++++++++.     ",
+"  +@@@@@@@@@@@+.    ",
+"  +@#$####%@%&@+.   ",
+"  +@.$%***%@=%&@+.  ",
+"  +@#$####%@==%&@+. ",
+"  +@.$%**=%@===%@+. ",
+"  +@#$####%@@@@@@+. ",
+"  +@.$%**==%%%%%@+. ",
+"  +@#-;#########@+. ",
+"  +@.@@>*====***@+. ",
+"---@-@,@;#######@+. ",
+"@@@@@@,,@>====**@+. ",
+"@',,,,,,,@;#####@+. ",
+"@))))),,)@>====*@+. ",
+"@@@@@@,)@;######@+. ",
+"---@+@)@>****===@+. ",
+"  +@#@@;########@+. ",
+"  +@.--%!!!!****@+. ",
+"  +@@@@@@@@@@@@@@+. ",
+"  .++++++++++++++.  "};
+#endif
+#if 0
+/* XPM */
+static const char * Forward_xpm[] = {
+"20 20 22 1",
+" 	c None",
+".	c #AAAAAA",
+"+	c #626262",
+"@	c #3E3E3E",
+"#	c #000000",
+"$	c #626200",
+"%	c #937A00",
+"&	c #B6B6B6",
+"*	c #AF9200",
+"=	c #FFF0D4",
+"-	c #DFD48E",
+";	c #FFFFFF",
+">	c #C3B848",
+",	c #BDAA25",
+"'	c #9E9E9E",
+")	c #F2F2F2",
+"!	c #DADADA",
+"~	c #48B8FF",
+"{	c #565656",
+"]	c #323200",
+"^	c #8ED4FF",
+"/	c #0092DC",
+"          .+@#@+.   ",
+"         .@#$%$#@.  ",
+"        &+#*=--%#+& ",
+"        &@$=;->,$@& ",
+"        &#%--->,%#& ",
+"        &@$->>,*$@& ",
+"         +#%,,*%#+  ",
+"         '+#$%$#+'  ",
+"       +####@#@####+",
+"     @@+#)))))!!!!#+",
+"     ##@#!.))!!!.!#+",
+"+++++#~##.{)!!!!{!#+",
+"######~~#@]]]]]]]!#+",
+"#^~~~~~~~#]*%%%%]!#+",
+"#/////~~/##*%]*%###+",
+"######~/#@#*%]*%#++&",
+"+++++#/#@+#*%#*%#+  ",
+"     ##@ +#*%#*%#+  ",
+"     @@  +#$$#$$#+  ",
+"         +#######+  "};
+#endif
+#if 0
+/* XPM */
+static const char * Help_xpm[] = {
+"20 20 20 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #505000",
+"$	c #FFAA25",
+"%	c #FFC66B",
+"&	c #FFE2B1",
+"*	c #FFFFFF",
+"=	c #FFFF6B",
+"-	c #B9B900",
+";	c #969600",
+">	c #3E3E3E",
+",	c #808000",
+"'	c #FEFE00",
+")	c #1A1A1A",
+"!	c #DCDC00",
+"~	c #323232",
+"{	c #262626",
+"]	c #6E6E6E",
+" .++++++++++++++++. ",
+".+@@@@@@@@@@@@@@@@+.",
+"+@#$%%%%%%%%%%%%$#@+",
+"+@$%&&&&&&&&&&&&&$@+",
+"+@%&**=-;+>,-===&%@+",
+"+@%&*='>,=+@)!==&%@+",
+"+@%&*=!@~=!@@-==&%@+",
+"+@%&*==~+=!@@-==&%@+",
+"+@%&*=====,@>!==&%@+",
+"+@%&*====={+!===&%@+",
+"+@%&=====]-=====&%@+",
+"+@%&====!>;=====&%@+",
+"+@%&====+@@=====&%@+",
+"+@%&====;@>=====&%@+",
+"+@$%==========&&%$@+",
+"+@#$&=&&%%%%%%%%$#@+",
+" +@@&&&%$@@@@@@@@@+.",
+"  +@%%$@@>++++++++. ",
+"  +@$@@>+           ",
+"  +@@@+.            "};
+#endif
+#if 0
+/* XPM */
+static const char * Left_xpm[] = {
+"20 20 11 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #8ED4FF",
+"$	c #B1E2FF",
+"%	c #48B8FF",
+"&	c #FFFFFF",
+"*	c #25AAFF",
+"=	c #0092DC",
+"-	c #007AB9",
+"                    ",
+"                    ",
+"      ..            ",
+"     .++.           ",
+"    .+@@+.          ",
+"   .+@#@+.......... ",
+"  .+@#$@+++++++++++.",
+" .+@#$%@@@@@@@@@@@@+",
+".+@#&%%%#########*@+",
+"+@#&%%%%%%%%%%%%%=@+",
+"+@-*%%%%%%%%%%%%%=@+",
+".+@-*%*===========@+",
+" .+@-**@@@@@@@@@@@@+",
+"  .+@-*@+++++++++++.",
+"   .+@-@+.......... ",
+"    .+@@+.          ",
+"     .++.           ",
+"      ..            ",
+"                    ",
+"                    "};
+#endif
+/* XPM */
+static const char * search_xpm[] = {
+"20 20 21 1",
+" 	c None",
+".	c #AAAAAA",
+"+	c #7A7A7A",
+"@	c #626262",
+"#	c #929292",
+"$	c #4A4A4A",
+"%	c #000000",
+"&	c #6E6E6E",
+"*	c #B6B6B6",
+"=	c #DADADA",
+"-	c #D4D4FF",
+";	c #FFFFFF",
+">	c #B1B1FF",
+",	c #C7B1FF",
+"'	c #3E3E3E",
+")	c #4A4A00",
+"!	c #626200",
+"~	c #AF9200",
+"{	c #937A00",
+"]	c #F8E2B1",
+"^	c #323200",
+"   .+@@@@+.         ",
+"  #@$%%%%$@#        ",
+" #$%&*==*&%$#       ",
+".@%*=----=*%@.      ",
+"+$&=-;>>--=&$+      ",
+"@%*-;;,,>--*%@      ",
+"@%=->,,,,>-=%@      ",
+"@%=->,,,,>-=%@      ",
+"@%*-->,,>--*%@      ",
+"+$&=-->>--=&'+      ",
+".@%*=----=*%%'      ",
+" #$%&*==*&%$)%'     ",
+"  #@$%%%%'%!~{%'    ",
+"   .+@@@@+'%~]{%'   ",
+"           '%~]{%'  ",
+"            '%~]{%' ",
+"             '%~]{%'",
+"              '%~]!%",
+"               '%!^'",
+"                '%'#"};
+/* XPM */
+static const char * filenew_xpm[] = {
+"20 20 16 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #DC9200",
+"#	c #000000",
+"$	c #FFC66B",
+"%	c #FFFF00",
+"&	c #B1FFFF",
+"*	c #CECECE",
+"=	c #7A7A7A",
+"-	c #FFAA00",
+";	c #DCDC00",
+">	c #E6E6E6",
+",	c #FFFFFF",
+"'	c #DADADA",
+")	c #FFB1B1",
+"  .++@++++++++.     ",
+"  +#@$@#######+.    ",
+"  +@$%$@&&*#*=#+.   ",
+"  @-;%;-@>*#,*=#+.  ",
+" @-;;,;;-@*#,,*=#+. ",
+"$%%%,,%%%%$#,,,*#+. ",
+" @-;;%;;-@*######+. ",
+"  @-;%;-@,,*****#+. ",
+"  +@$%$@&&&&&&&&#+. ",
+"  +#-%->>,,,,>>>#+. ",
+"  +#-%-&&&&&&&&&#+. ",
+"  +#-%-'>,,,,,>>#+. ",
+"  +#@$@&&&&&&&&&#+. ",
+"  +#.@*'>>,,,,,>#+. ",
+"  +#&)&&&&&&&&&&#+. ",
+"  +#.)**'>>>>,,,#+. ",
+"  +#&)&&&&&&&&&&#+. ",
+"  +#.)**''''>>>>#+. ",
+"  +##############+. ",
+"  .++++++++++++++.  "};
+/* XPM */
+static const char * fileopen_xpm[] = {
+"20 20 15 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #868686",
+"@	c #6E6E6E",
+"#	c #000000",
+"$	c #626262",
+"%	c #D1C96B",
+"&	c #FFF0D4",
+"*	c #AF9200",
+"=	c #C3B848",
+"-	c #DFD48E",
+";	c #929292",
+">	c #937A00",
+",	c #BDAA25",
+"'	c #626200",
+"                    ",
+"                    ",
+" .+@@@@@+.          ",
+".+@#####$+..        ",
+".@#%&&&&#$@@@@@@@@@.",
+".@#&%%%%*##########@",
+".@#&==%%%--------*#@",
+".@#&===%%%%%%%%%%*#@",
+";@#&===>>>>>>>>>=*#@",
+"@##>>>>&&&&&&&&>=*#@",
+"#&&&&&=========>*>#@",
+"#,=============*>>#@",
+"#>==============>>#@",
+"@#,=============>>#@",
+";#>=============*>#@",
+".@#**************'#@",
+".;#################@",
+" .@@@@@@@@@@@@@@@@@.",
+"  ................. ",
+"                    "};
+/* XPM */
+static const char * editpaste_xpm[] = {
+"20 20 18 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #000000",
+"@	c #626262",
+"#	c #FFFFFF",
+"$	c #DADADA",
+"%	c #E6E6E6",
+"&	c #B97A00",
+"*	c #7A7A7A",
+"=	c #966200",
+"-	c #734A00",
+";	c #6E6E6E",
+">	c #8EFFFF",
+",	c #FFB1B1",
+"'	c #B1FFFF",
+")	c #3E3E3E",
+"!	c #CECECE",
+"~	c #F2F2F2",
+"   ....++++++....   ",
+"  .@@@+##@@$$+@@@.  ",
+" .@+++%.......+++@. ",
+" .@+&+#.******+&+@. ",
+" .@+&=++++++++-=+@. ",
+" .@+&==--------=+@. ",
+" .@+&==-+++++++++;. ",
+" .@+&==-+>,''')$;);.",
+" .@+&==-+.,!%~)#$;+@",
+" .@+&==-+>,''')##$+@",
+" .@+&==-+.,!%~;;;;+@",
+" .@+&==-+>,'''''''+@",
+" .@+&==-+.,!%~###~+@",
+" .@+&==-+>,'''''''+@",
+" .@+&==-+.,!%~###~+@",
+" .@+&==-+>,'''''''+@",
+" .@+&===+.,!%~###~+@",
+" .@++++++>,'''''''+@",
+"  .@@@@@+++++++++++@",
+"   .....@@@@@@@@@@@."};
+#if 0
+/* XPM */
+static const char * Print_xpm[] = {
+"20 20 25 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #323232",
+"$	c #AAAAAA",
+"%	c #FFC7B1",
+"&	c #CECECE",
+"*	c #E6E6E6",
+"=	c #FFFFFF",
+"-	c #8EFFFF",
+";	c #6E6E6E",
+">	c #00DCDC",
+",	c #C2C2C2",
+"'	c #4A4A00",
+")	c #00B9B9",
+"!	c #FFAB8E",
+"~	c #937A00",
+"{	c #F8E2B1",
+"]	c #C3B848",
+"^	c #C5AA00",
+"/	c #AF9200",
+"(	c #DFD48E",
+"_	c #D1C96B",
+":	c #626200",
+"      .+@@@@@@@@@#. ",
+"      .@$%&**====@+.",
+"     .+@-%-------@;.",
+"    ..@$%&***===@#. ",
+"   .++@>%>>>>>--@#..",
+"  .+@@$%,,,&***@'@@;",
+" .+@+@)!)))>>>>@'~~@",
+".+@+{''''''''''']=^@",
+"+@+{]]]]]]]]]]]]=^/@",
+"+@==============^{/@",
+"+@{{{{{{{{{{{((^{(/@",
+"+@{{_____(((::(^((/@",
+"+@{_____(((((~(^(//@",
+"+@________(((((^/]~@",
+"+@~~~~~~~~~~~~~~]]@#",
+"+@+]]]]]]]]]]]^~]@#.",
+".+@+^^^^^^^^^^~]@#. ",
+" .+@@@@@@@@@@@@@#.  ",
+"  .+++++++++++++.   ",
+"   .............    "};
+#endif
+/* XPM */
+static const char * redo_xpm[] = {
+"20 20 12 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #4A4A4A",
+"#	c #000000",
+"$	c #00B900",
+"%	c #9E9E9E",
+"&	c #7A7A7A",
+"*	c #00AB3D",
+"=	c #005000",
+"-	c #009631",
+";	c #007325",
+"                    ",
+"                    ",
+"                    ",
+"           .+@.     ",
+"          .+##@.    ",
+"    .......+#$#@.   ",
+"   %%&++++++#*$#@.  ",
+"  %&#########**$#@. ",
+" %&#=-*$$$$$$*-*$#@.",
+".&#=------------*$#@",
+"%#=--------------=#+",
+"&#;----======---=#+.",
+"#=----=######--=#+. ",
+"#=---;#%%%%+#-=#+.  ",
+"#=---;#%   +#=#+.   ",
+"#=---;#%   +##+.    ",
+"+######%   .++.     ",
+"%++++++%            ",
+"                    ",
+"                    "};
+/* XPM */
+static const char * filesave_xpm[] = {
+"20 20 16 1",
+" 	c None",
+".	c #6E6E6E",
+"+	c #4A4A4A",
+"@	c #000000",
+"#	c #7A7A7A",
+"$	c #929292",
+"%	c #9E9E9E",
+"&	c #B6B6B6",
+"*	c #C2C2C2",
+"=	c #AAAAAA",
+"-	c #565656",
+";	c #626262",
+">	c #FFFFFF",
+",	c #DADADA",
+"'	c #3E3E3E",
+")	c #CECECE",
+".++..............++.",
+"+++@@@@@@@@@@@@@@+++",
+"++#$............%#++",
+"+@#$............%#@+",
+"+@#$............%#@+",
+"+@#$............&#@+",
+"+@#$............*#@+",
+"+@#$............*#@+",
+"+@#$............&#@+",
+"+@##$$$$$==&&&*&##@+",
+"+@################@+",
+"+@##--------;;;;##@+",
+"+@#->>,,,,,,*'-;%#@+",
+"+@#->;-'>)*),'-;%#@+",
+"+@#-,;-'>*)*,'-;%#@+",
+"+@#-,;-'>)*),'-;%#@+",
+"+@#-,;-'>*)*,'-;%#@+",
+"+@+-,===****,'-;%#@+",
+"=+@@@@@@@@@@@@@@@@@+",
+" =+++++++++++++++++."};
+#if 0
+/* XPM */
+static const char * filesave_all_xpm[] = {
+"20 20 13 1",
+" 	c None",
+".	c #6E6E6E",
+"+	c #4A4A4A",
+"@	c #000000",
+"#	c #B6B6B6",
+"$	c #CECECE",
+"%	c #929292",
+"&	c #7A7A7A",
+"*	c #FFFFFF",
+"=	c #F2F2F2",
+"-	c #565656",
+";	c #DADADA",
+">	c #C2C2C2",
+"    .++.........++. ",
+"    +++@@@@@@@@@+++#",
+"    ++$.........$++#",
+"    +@%.........#@+#",
+".++.........++..#@+#",
+"+++@@@@@@@@@+++.$@+#",
+"++$.........$++$&@+#",
+"+@%.........#@+&&@+#",
+"+@%.........#@+%&@+#",
+"+@%.........$@+.&@+#",
+"+@&%%%%%###$&@+.&@+#",
+"+@&&&&&&&&&&&@+.&@+#",
+"+@&&......%%&@+.&@+#",
+"+@&.***===-.&@+@@@+#",
+"+@&.;.->>;-.&@++++.#",
+"+@&.;-@>>;-.&@+#### ",
+"+@+.;&&>>;-.&@+#    ",
+"#+@@@@@@@@@@@@+#    ",
+" #++++++++++++.#    ",
+"  #############     "};
+#endif
+/* XPM */
+static const char * undo_xpm[] = {
+"20 20 16 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #4A4A4A",
+"@	c #626262",
+"#	c #000000",
+"$	c #FF6B8F",
+"%	c #FFB1C7",
+"&	c #7A7A7A",
+"*	c #9E9E9E",
+"=	c #DC0049",
+"-	c #FFFFFF",
+";	c #FF0055",
+">	c #B9003D",
+",	c #960031",
+"'	c #B90000",
+")	c #501900",
+"                    ",
+"                    ",
+"                    ",
+"     .+@.           ",
+"    .+##@.          ",
+"   .+#$#@.......    ",
+"  .+#$%#@@@@@@&**   ",
+" .+#$%=#########&*  ",
+".+#$-==;;;;;;=>,#&* ",
+"+#$-============,#&.",
+"@#,$=============,#*",
+".@#,'=',,,,,,====>#&",
+" .@#,''######,====)#",
+"  .@#,'#@****#>===)#",
+"   .@#,#@   *#>===)#",
+"    .@##@   *#>===)#",
+"     .@@.   *######@",
+"            *@@@@@@*",
+"                    ",
+"                    "};
+/* XPM */
+static const char * replace_xpm[] = {
+"20 20 257 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #800000",
+"@ 	c #008000",
+"# 	c #808000",
+"$ 	c #000080",
+"% 	c #800080",
+"& 	c #008080",
+"* 	c #C0C0C0",
+"= 	c #C0DCC0",
+"- 	c #A6CAF0",
+"; 	c #FFF0D4",
+"> 	c #F8E2B1",
+", 	c #DFD48E",
+"' 	c #D1C96B",
+") 	c #C3B848",
+"! 	c #BDAA25",
+"~ 	c #C5AA00",
+"{ 	c #AF9200",
+"] 	c #937A00",
+"^ 	c #626200",
+"/ 	c #4A4A00",
+"( 	c #323200",
+"_ 	c #FFE3D4",
+": 	c #FFC7B1",
+"< 	c #FFAB8E",
+"[ 	c #FF8F6B",
+"} 	c #FF7348",
+"| 	c #FF5725",
+"1 	c #FF5500",
+"2 	c #DC4900",
+"3 	c #B93D00",
+"4 	c #963100",
+"5 	c #732500",
+"6 	c #501900",
+"7 	c #FFD4D4",
+"8 	c #FFB1B1",
+"9 	c #FF8E8E",
+"0 	c #FF6B6B",
+"a 	c #FF4848",
+"b 	c #FF2525",
+"c 	c #FE0000",
+"d 	c #DC0000",
+"e 	c #B90000",
+"f 	c #960000",
+"g 	c #730000",
+"h 	c #500000",
+"i 	c #FFD4E3",
+"j 	c #FFB1C7",
+"k 	c #FF8EAB",
+"l 	c #FF6B8F",
+"m 	c #FF4873",
+"n 	c #FF2557",
+"o 	c #FF0055",
+"p 	c #DC0049",
+"q 	c #B9003D",
+"r 	c #960031",
+"s 	c #730025",
+"t 	c #500019",
+"u 	c #FFD4F0",
+"v 	c #FFB1E2",
+"w 	c #FF8ED4",
+"x 	c #FF6BC6",
+"y 	c #FF48B8",
+"z 	c #FF25AA",
+"A 	c #FF00AA",
+"B 	c #DC0092",
+"C 	c #B9007A",
+"D 	c #960062",
+"E 	c #73004A",
+"F 	c #500032",
+"G 	c #FFD4FF",
+"H 	c #FFB1FF",
+"I 	c #FF8EFF",
+"J 	c #FF6BFF",
+"K 	c #FF48FF",
+"L 	c #FF25FF",
+"M 	c #FE00FE",
+"N 	c #DC00DC",
+"O 	c #B900B9",
+"P 	c #960096",
+"Q 	c #730073",
+"R 	c #500050",
+"S 	c #F0D4FF",
+"T 	c #E2B1FF",
+"U 	c #D48EFF",
+"V 	c #C66BFF",
+"W 	c #B848FF",
+"X 	c #AA25FF",
+"Y 	c #AA00FF",
+"Z 	c #9200DC",
+"` 	c #7A00B9",
+" .	c #620096",
+"..	c #4A0073",
+"+.	c #320050",
+"@.	c #E3D4FF",
+"#.	c #C7B1FF",
+"$.	c #AB8EFF",
+"%.	c #8F6BFF",
+"&.	c #7348FF",
+"*.	c #5725FF",
+"=.	c #5500FF",
+"-.	c #4900DC",
+";.	c #3D00B9",
+">.	c #310096",
+",.	c #250073",
+"'.	c #190050",
+").	c #D4D4FF",
+"!.	c #B1B1FF",
+"~.	c #8E8EFF",
+"{.	c #6B6BFF",
+"].	c #4848FF",
+"^.	c #2525FF",
+"/.	c #0000FE",
+"(.	c #0000DC",
+"_.	c #0000B9",
+":.	c #000096",
+"<.	c #000073",
+"[.	c #000050",
+"}.	c #D4E3FF",
+"|.	c #B1C7FF",
+"1.	c #8EABFF",
+"2.	c #6B8FFF",
+"3.	c #4873FF",
+"4.	c #2557FF",
+"5.	c #0055FF",
+"6.	c #0049DC",
+"7.	c #003DB9",
+"8.	c #003196",
+"9.	c #002573",
+"0.	c #001950",
+"a.	c #D4F0FF",
+"b.	c #B1E2FF",
+"c.	c #8ED4FF",
+"d.	c #6BC6FF",
+"e.	c #48B8FF",
+"f.	c #25AAFF",
+"g.	c #00AAFF",
+"h.	c #0092DC",
+"i.	c #007AB9",
+"j.	c #006296",
+"k.	c #004A73",
+"l.	c #003250",
+"m.	c #D4FFFF",
+"n.	c #B1FFFF",
+"o.	c #8EFFFF",
+"p.	c #6BFFFF",
+"q.	c #48FFFF",
+"r.	c #25FFFF",
+"s.	c #00FEFE",
+"t.	c #00DCDC",
+"u.	c #00B9B9",
+"v.	c #009696",
+"w.	c #007373",
+"x.	c #005050",
+"y.	c #D4FFF0",
+"z.	c #B1FFE2",
+"A.	c #8EFFD4",
+"B.	c #6BFFC6",
+"C.	c #48FFB8",
+"D.	c #25FFAA",
+"E.	c #00FFAA",
+"F.	c #00DC92",
+"G.	c #00B97A",
+"H.	c #009662",
+"I.	c #00734A",
+"J.	c #005032",
+"K.	c #D4FFE3",
+"L.	c #B1FFC7",
+"M.	c #8EFFAB",
+"N.	c #6BFF8F",
+"O.	c #48FF73",
+"P.	c #25FF57",
+"Q.	c #00FF55",
+"R.	c #00DC49",
+"S.	c #00B93D",
+"T.	c #009631",
+"U.	c #007325",
+"V.	c #005019",
+"W.	c #D4FFD4",
+"X.	c #B1FFB1",
+"Y.	c #8EFF8E",
+"Z.	c #6BFF6B",
+"`.	c #48FF48",
+" +	c #25FF25",
+".+	c #00FE00",
+"++	c #00DC00",
+"@+	c #00B900",
+"#+	c #009600",
+"$+	c #007300",
+"%+	c #005000",
+"&+	c #E3FFD4",
+"*+	c #C7FFB1",
+"=+	c #ABFF8E",
+"-+	c #8FFF6B",
+";+	c #73FF48",
+">+	c #57FF25",
+",+	c #55FF00",
+"'+	c #49DC00",
+")+	c #3DB900",
+"!+	c #319600",
+"~+	c #257300",
+"{+	c #195000",
+"]+	c #F0FFD4",
+"^+	c #E2FFB1",
+"/+	c #D4FF8E",
+"(+	c #C6FF6B",
+"_+	c #B8FF48",
+":+	c #AAFF25",
+"<+	c #AAFF00",
+"[+	c #92DC00",
+"}+	c #7AB900",
+"|+	c #629600",
+"1+	c #4A7300",
+"2+	c #325000",
+"3+	c #FFFFD4",
+"4+	c #FFFFB1",
+"5+	c #FFFF8E",
+"6+	c #FFFF6B",
+"7+	c #FFFF48",
+"8+	c #FFFF25",
+"9+	c #FEFE00",
+"0+	c #DCDC00",
+"a+	c #B9B900",
+"b+	c #969600",
+"c+	c #737300",
+"d+	c #505000",
+"e+	c #F2F2F2",
+"f+	c #E6E6E6",
+"g+	c #DADADA",
+"h+	c #CECECE",
+"i+	c #C2C2C2",
+"j+	c #B6B6B6",
+"k+	c #AAAAAA",
+"l+	c #9E9E9E",
+"m+	c #929292",
+"n+	c #868686",
+"o+	c #7A7A7A",
+"p+	c #6E6E6E",
+"q+	c #626262",
+"r+	c #565656",
+"s+	c #4A4A4A",
+"t+	c #3E3E3E",
+"u+	c #323232",
+"v+	c #262626",
+"w+	c #1A1A1A",
+"x+	c #0E0E0E",
+"y+	c #FFFBF0",
+"z+	c #A0A0A4",
+"A+	c #808080",
+"B+	c #FF0000",
+"C+	c #00FF00",
+"D+	c #FFFF00",
+"E+	c #0000FF",
+"F+	c #FF00FF",
+"G+	c #00FFFF",
+"H+	c #FFFFFF",
+"      k+o+q+q+q+q+o+k+                  ",
+"    m+q+s+. . . . s+q+m+      j+m+m+    ",
+"  m+s+. p+j+g+g+j+p+. s+m+    t+. t+m+  ",
+"k+q+. j+g+).).).).g+j+. q+k+t+. 9 . t+m+",
+"o+s+p+g+).H+!.!.).).g+p+s+t+. 7 8 9 . t+",
+"q+. j+).H+H+#.#.!.).).j+t+. . 8 8 9 0 . ",
+"q+. g+).!.#.#.#.#.!.).t+. ~ t+. 9 0 . t+",
+"q+. g+).!.#.#.#.#.!.t+. ~ 3+9+t+. . t+  ",
+"q+. j+).).!.#.#.!.t+. ~ 3+9+[ } . t+    ",
+"o+s+p+g+).).!.!.t+. ~ 3+9+[ } . t+      ",
+"k+q+. j+g+).).t+. ~ 3+9+[ } . t+        ",
+"  m+s+. p+j+t+. ~ 3+9+[ } . t+          ",
+"    m+q+s+t+. ~ 3+9+[ } . t+. t+        ",
+"      k+t+. ~ 3+9+[ } . t+> ] . t+      ",
+"      t+. ~ 3+9+[ } . t+. { > ] . t+    ",
+"  j+t+. . t+9+[ } . t+  t+. { > ] . t+  ",
+"  k+/ > ; . t+} . t+      t+. { > ] . t+",
+"  m+^ ; > > . . t+          t+. { > ^ . ",
+"  p+^ > > > . t+              t+. ^ ( t+",
+"  p+. ^ ^ / t+                  t+. t+m+"};
+
+/* XPM */
+/*
+static const char * replace_xpm[] = {
+"20 20 9 1",
+" 	c None",
+".	c #4A4A4A",
+"+	c #6E6E6E",
+"@	c #000000",
+"#	c #006296",
+"$	c #0092DC",
+"%	c #007AB9",
+"&	c #868686",
+"*	c #003250",
+"                    ",
+" .....+.....+       ",
+".@@@@@@@@@@@@.      ",
+".@####@@####@@.     ",
+".@@#$$#@@#$$#@@.    ",
+" .@@#$%#@@#$%#@@.   ",
+"  .@@#$%#@@#$%#@@.  ",
+"   .@@#$%#@@$%%#@@. ",
+"    .@@#$%#@@$%%#@@&",
+"     .@*#$%#@*$$%#@@",
+"     .@*#$%#@*#$%#@@",
+"    .@@#$%#@@#$%#@@&",
+"   .@@#$%#@@#$%#@@. ",
+"  .@@#$%#@@#$%#@@.  ",
+" .@@#%%#@@#%%#@@.   ",
+".@@#%%#@@#%%#@@.    ",
+".@####@@####@@.     ",
+".@@@@@@@@@@@@.      ",
+" .....+.....+       ",
+"                    "};
+*/
+#if 0
+/* XPM */
+static const char * World_xpm[] = {
+"20 20 32 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #AAAAAA",
+"@	c #868686",
+"#	c #6E6E6E",
+"$	c #4A4A4A",
+"%	c #323232",
+"&	c #000000",
+"*	c #565656",
+"=	c #006296",
+"-	c #CECECE",
+";	c #FFFFFF",
+">	c #007AB9",
+",	c #0092DC",
+"'	c #48B8FF",
+")	c #007373",
+"!	c #00734A",
+"~	c #00AAFF",
+"{	c #8ED4FF",
+"]	c #25AAFF",
+"^	c #00B9B9",
+"/	c #005050",
+"(	c #DADADA",
+"_	c #C5AA00",
+":	c #626200",
+"<	c #4A4A00",
+"[	c #323200",
+"}	c #3E3E3E",
+"|	c #B1FFFF",
+"1	c #48FFFF",
+"2	c #004A73",
+"3	c #003250",
+"     ..+@##@+..     ",
+"    .@$%&**&%$@.    ",
+"   .*&=-;;-;>=&*.   ",
+"  .*&,,';-;-'))&*.  ",
+" .*&!~{{']']^///&*. ",
+".@&!^;;'](((!_::<&@.",
+".$!^.;']';;((_::<[$.",
+"+%:'{']']]]^!_::<[%+",
+"@&:...((((^!:_:<<[&@",
+"#}<[.(;|||11_::<[>2#",
+"#}<..((((],!:::<>>2#",
+"@&@.((],],]/::<,>>&@",
+"+%@.,],],],,/:<>>=%+",
+".$[,,,,,,,,,,/<>=3$.",
+".@&,>,@,>,>,@>/23&@.",
+" .*&3@.@>>>.;@23&*. ",
+"  .*&3%..;..@23&*.  ",
+"   .*&3%;;;.@3&*.   ",
+"    .@$%&%%&%$@.    ",
+"     ..+@##@+..     "};
+#endif
+/* XPM */
+static const char * findinfiles_xpm[] = {
+"20 20 28 1",
+" 	c None",
+".	c #AAAAAA",
+"+	c #7A7A7A",
+"@	c #626262",
+"#	c #B6B6B6",
+"$	c #929292",
+"%	c #4A4A4A",
+"&	c #000000",
+"*	c #6E6E6E",
+"=	c #FF8E8E",
+"-	c #DADADA",
+";	c #FFB1B1",
+">	c #FFFFFF",
+",	c #005050",
+"'	c #D4FFFF",
+")	c #CECECE",
+"!	c #007373",
+"~	c #00DCDC",
+"{	c #00B9B9",
+"]	c #B1FFFF",
+"^	c #3E3E3E",
+"/	c #E6E6E6",
+"(	c #505000",
+"_	c #626200",
+":	c #AF9200",
+"<	c #937A00",
+"[	c #9E9E9E",
+"}	c #F8E2B1",
+"   .+@@@@@@@@@#     ",
+"  $@%&&&&%@&&&@#    ",
+" $%&*=--#*&%$+&@#   ",
+".@&#;;>>>>#&@.+&@#  ",
+"+%,';;''''',%+)+&@# ",
+"@&!~;;~~~~~!&@>)&@# ",
+"@&->;;>>>>>-&@&&&@# ",
+"@&->;;>>>>>-&@))&@# ",
+"@&{';;'''''{&@]]&@# ",
+"+%!~;;~~~~~!^+//&@# ",
+".@&#;;>>>-#&&^]]&@# ",
+" $%&*=--#*&%(&^/&@# ",
+"  @&%&&&&%&_:<&^&@# ",
+"  @&[=###/^&:}<&^@# ",
+"  @&];]]]]]^&:}<&^# ",
+"  @&#;))-///^&:}<&^ ",
+"  @&];]]]]]]]^&:}<&^",
+"  @&#;))----//^&:}_&",
+"  @&&&&&&&&&&&&^&_&^",
+"  #@@@@@@@@@@@@@^&^ "};
+/* XPM */
+static const char * findnext_xpm[] = {
+"20 20 30 1",
+" 	c None",
+".	c #AAAAAA",
+"+	c #7A7A7A",
+"@	c #626262",
+"#	c #929292",
+"$	c #4A4A4A",
+"%	c #000000",
+"&	c #6E6E6E",
+"*	c #B6B6B6",
+"=	c #DADADA",
+"-	c #D4D4FF",
+";	c #FFFFFF",
+">	c #B1B1FF",
+",	c #C7B1FF",
+"'	c #3E3E3E",
+")	c #4A4A00",
+"!	c #E6E6E6",
+"~	c #303030",
+"{	c #676709",
+"]	c #AF9200",
+"^	c #937A00",
+"/	c #48B8FF",
+"(	c #007373",
+"_	c #B1FFFF",
+":	c #F8E2B1",
+"<	c #686868",
+"[	c #8ED4FF",
+"}	c #0092DC",
+"|	c #626200",
+"1	c #323200",
+"   .+@@@@+.         ",
+"  #@$%%%%$@#        ",
+" #$%&*==*&%$#       ",
+".@%*=----=*%@.      ",
+"+$&=-;>>--=&$+      ",
+"@%*-;;,,>--*%@      ",
+"@%=->,,,,>-=%@      ",
+"@%=->,,,,>-=%@      ",
+"@%*-->,,>--*%@      ",
+"+$&=-->>--=&'+      ",
+".@%*=----=*%%'      ",
+" #$%&*==*&%$)%'     ",
+"  #@$%%%&!~{]^%'    ",
+"   .+@%/%(_%]:^%'   ",
+"%%%%%%%//%&<%]:^%'  ",
+"%[////////%('%]:^%' ",
+"%}}}}}}//}%& '%]:^%'",
+"%%%%%%%/}%(   '%]:|%",
+"      %}%&     '%|1'",
+"      %%(       '%'#"};
+/* XPM */
+static const char * next_xpm[] = {
+"20 20 17 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #B1FFFF",
+"$	c #FFB1B1",
+"%	c #CECECE",
+"&	c #7A7A7A",
+"*	c #E6E6E6",
+"=	c #FFFFFF",
+"-	c #868686",
+";	c #007373",
+">	c #6E6E6E",
+",	c #48B8FF",
+"'	c #8ED4FF",
+")	c #0092DC",
+"!	c #DADADA",
+"  .+++++++++++.     ",
+"  +@@@@@@@@@@@+.    ",
+"  +@#$####%@%&@+.   ",
+"  +@.$%***%@=%&@+.  ",
+"  +@#$####%@==%&@+. ",
+"  +@.$%**=%@===%@+. ",
+"  +@#$####%@@@@@@+. ",
+"  +@.$%**==%%%%%@+. ",
+"  +@#-;#########@+. ",
+"  +@.@@>*====***@+. ",
+"---@-@,@;#######@+. ",
+"@@@@@@,,@>====**@+. ",
+"@',,,,,,,@;#####@+. ",
+"@))))),,)@>====*@+. ",
+"@@@@@@,)@;######@+. ",
+"---@+@)@>****===@+. ",
+"  +@#@@;########@+. ",
+"  +@.--%!!!!****@+. ",
+"  +@@@@@@@@@@@@@@+. ",
+"  .++++++++++++++.  "};
+/* XPM */
+static const char * prev_xpm[] = {
+"20 20 17 1",
+" 	c None",
+".	c #B6B6B6",
+"+	c #626262",
+"@	c #000000",
+"#	c #7A7A7A",
+"$	c #CECECE",
+"%	c #B1FFFF",
+"&	c #FFB1B1",
+"*	c #FFFFFF",
+"=	c #E6E6E6",
+"-	c #007373",
+";	c #868686",
+">	c #6E6E6E",
+",	c #48B8FF",
+"'	c #8ED4FF",
+")	c #0092DC",
+"!	c #DADADA",
+"     .+++++++++++.  ",
+"    .+@@@@@@@@@@@+  ",
+"   .+@#$@$%%%%&%@+  ",
+"  .+@#$*@$===$&.@+  ",
+" .+@#$**@$%%%%&%@+  ",
+" .+@$***@$*==$&.@+  ",
+" .+@@@@@@$%%%%&%@+  ",
+" .+@$$$$$**==$&.@+  ",
+" .+@%%%%%%%%%-;%@+  ",
+" .+@===****=>@@.@+  ",
+" .+@%%%%%%%-@,@;@;;;",
+" .+@==****>@,,@@@@@@",
+" .+@%%%%%-@,,,,,,,'@",
+" .+@=****>@),,)))))@",
+" .+@%%%%%%-@),@@@@@@",
+" .+@***====>@)@+@;;;",
+" .+@%%%%%%%%-@@%@+  ",
+" .+@====!!!!$;;.@+  ",
+" .+@@@@@@@@@@@@@@+  ",
+"  .++++++++++++++.  "};
+/* XPM */
+static const char * build_xpm[] = {
+"20 20 17 1",
+" 	c None",
+".	c #626262",
+"+	c #000000",
+"@	c #4A4A4A",
+"#	c #AAAAAA",
+"$	c #FFFFFF",
+"%	c #DADADA",
+"&	c #868686",
+"*	c #CECECE",
+"=	c #B6B6B6",
+"-	c #9E9E9E",
+";	c #6E6E6E",
+">	c #929292",
+",	c #C2C2C2",
+"'	c #7A7A7A",
+")	c #323232",
+"!	c #3E3E3E",
+".+++@@+++++..#      ",
+"+$$%&&$$%%%++@.#    ",
+"+$%*.+++@@+++++..#  ",
+"+%==+$$%&&$$%%%++@.#",
+"+=&&+$%*=*$%****-;+.",
+".++++%==&;=====***-+",
+">...+=&&@@;>>>;++>*+",
+"    .+++..+&&;+..+++",
+"    >...,.+''+.  ...",
+"     .+%,.+$%+.     ",
+"    #++++.+%,+.     ",
+"    '+.++.+%,+.     ",
+"    '+'.#++++++#    ",
+"    .+.)'+.++.+'    ",
+"    .+'.'+'.))+'    ",
+"    .+;).+.)).+.    ",
+"    .+'..+'.))+.    ",
+"    '+;).+;)).+.    ",
+"    #!!+++'.))+.    ",
+"        '+;))!!'    "};
+/* XPM */
+/*
+static const char * xbuild_xpm[] = {
+"20 20 17 1",
+" 	c None",
+".	c #929292",
+"+	c #626262",
+"@	c #AAAAAA",
+"#	c #000000",
+"$	c #4A4A4A",
+"%	c #FFFFFF",
+"&	c #DADADA",
+"*	c #868686",
+"=	c #CECECE",
+"-	c #B6B6B6",
+";	c #9E9E9E",
+">	c #6E6E6E",
+",	c #7A7A7A",
+"'	c #C2C2C2",
+")	c #323232",
+"!	c #3E3E3E",
+"  .+++@@+++++@      ",
+" .+###$$#####++@    ",
+" +#%%&**%%&&&##$+@  ",
+" +#%&=-=%&====;>#+@ ",
+" +#&--*>-----===;#+ ",
+" +#-**$$>...>##.=#+ ",
+" .+###++#**>#++###+ ",
+"  .+++ +#,,#+  +++  ",
+"       +#%&#+       ",
+"       +#&'#+       ",
+"       +#&'#+       ",
+"      @######@      ",
+"      ,#+##+#,      ",
+"      ,#,+))#,      ",
+"      +#+))+#+      ",
+"      +#,+))#+      ",
+"      +#>))+#+      ",
+"      +#,+))#+      ",
+"      ,#>))+#,      ",
+"      @!!##!!@      "};
+*/
+/* XPM */
+static const char * compile_xpm[] = {
+"20 20 16 1",
+" 	c None",
+".	c #929292",
+"+	c #626262",
+"@	c #1A1A1A",
+"#	c #000000",
+"$	c #3E3E3E",
+"%	c #7A7A7A",
+"&	c #E6E6E6",
+"*	c #565656",
+"=	c #6E6E6E",
+"-	c #4A4A4A",
+";	c #323232",
+">	c #B6B6B6",
+",	c #CECECE",
+"'	c #9E9E9E",
+")	c #868686",
+"                    ",
+"   .++++.  .++++.   ",
+"  .@####$  $####@.  ",
+"  .@%&.#$  $#&.+@.  ",
+"  .#*.=#++++#.=*#.  ",
+"  .#*=*#----#+-*#.  ",
+"  +#=*#;+  +;#+-#+  ",
+" +;=*##;+##+;##+-;  ",
+" +#;;;;;;;;;;;;;;#+ ",
+" +#>&,-# ## #>&,-#+ ",
+" +#','-# ## #','-#+ ",
+" -#)>%-######)>%-#- ",
+".#=)'%-#++++#)'%)=#.",
+"+#.=.+-#+  +#=.+=.#+",
+"+#)=)+-#+  +#=)+=)#+",
+"+#--+*-#+  +#-+*--#+",
+"+#+=.+*#+  +#+.+*-#+",
+"+#######+  +#######+",
+" +++++++    +++++++ ",
+"                    "};
+
+/* XPM */
+static const char * stop_xpm[] = {
+"20 20 13 1",
+" 	c None",
+".	c #FFD4E3",
+"+	c #FFB1C7",
+"@	c #FF8EAB",
+"#	c #FF6B8F",
+"$	c #FF4873",
+"%	c #FF2557",
+"&	c #DC0049",
+"*	c #960031",
+"=	c #800000",
+"-	c #626262",
+";	c #4A4A4A",
+">	c #000000",
+"     ->>>>>>>>-     ",
+"    ;>########>;    ",
+"   ;>#$&&&&&&&#>;   ",
+"  ;>#$&&&&&&&&&#>;  ",
+" ;>#$&&&&&&&&&&&#>; ",
+"->#$&&&&&&&&&&&&&#>-",
+">#$&&&&&&&&&&&&&&&&>",
+">#$+.+...@...#...#*>",
+">#+@&&&.$+@$@+.%#.*>",
+">#$..@$.$.$&$....#*>",
+">#%&&+@.$+@$@+.$&&*>",
+">#@..@$.$&...#.%&&*>",
+">#&$%&&%&&%%%&$&&&*>",
+">&&&&&&&&&&&&&&&&&*>",
+"->*&&&&&&&&&&&&&&*>;",
+" ;>*&&&&&&&&&&&&*>> ",
+"  ;>*&&&&&&&&&&*>>  ",
+"   ;>*&&&&&&&&*>>   ",
+"    ;>********>>    ",
+"     ->>>>>>>>;     "};
diff --git a/scite-app/scite/lua/COPYRIGHT b/scite-app/scite/lua/COPYRIGHT
new file mode 100644
index 0000000..0cb88ae
--- /dev/null
+++ b/scite-app/scite/lua/COPYRIGHT
@@ -0,0 +1,34 @@
+Lua License
+-----------
+
+Lua is licensed under the terms of the MIT license reproduced below.
+This means that Lua is free software and can be used for both academic
+and commercial purposes at absolutely no cost.
+
+For details and rationale, see http://www.lua.org/license.html .
+
+===============================================================================
+
+Copyright (C) 1994-2017 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===============================================================================
+
+(end of COPYRIGHT)
diff --git a/scite-app/scite/lua/src/lapi.c b/scite-app/scite/lua/src/lapi.c
new file mode 100644
index 0000000..c9455a5
--- /dev/null
+++ b/scite-app/scite/lua/src/lapi.c
@@ -0,0 +1,1298 @@
+/*
+** $Id: lapi.c,v 2.259 2016/02/29 14:27:14 roberto Exp $
+** Lua API
+** See Copyright Notice in lua.h
+*/
+
+#define lapi_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stdarg.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+
+
+
+const char lua_ident[] =
+  "$LuaVersion: " LUA_COPYRIGHT " $"
+  "$LuaAuthors: " LUA_AUTHORS " $";
+
+
+/* value at a non-valid index */
+#define NONVALIDVALUE		cast(TValue *, luaO_nilobject)
+
+/* corresponding test */
+#define isvalid(o)	((o) != luaO_nilobject)
+
+/* test for pseudo index */
+#define ispseudo(i)		((i) <= LUA_REGISTRYINDEX)
+
+/* test for upvalue */
+#define isupvalue(i)		((i) < LUA_REGISTRYINDEX)
+
+/* test for valid but not pseudo index */
+#define isstackindex(i, o)	(isvalid(o) && !ispseudo(i))
+
+#define api_checkvalidindex(l,o)  api_check(l, isvalid(o), "invalid index")
+
+#define api_checkstackindex(l, i, o)  \
+	api_check(l, isstackindex(i, o), "index not in the stack")
+
+
+static TValue *index2addr (lua_State *L, int idx) {
+  CallInfo *ci = L->ci;
+  if (idx > 0) {
+    TValue *o = ci->func + idx;
+    api_check(L, idx <= ci->top - (ci->func + 1), "unacceptable index");
+    if (o >= L->top) return NONVALIDVALUE;
+    else return o;
+  }
+  else if (!ispseudo(idx)) {  /* negative index */
+    api_check(L, idx != 0 && -idx <= L->top - (ci->func + 1), "invalid index");
+    return L->top + idx;
+  }
+  else if (idx == LUA_REGISTRYINDEX)
+    return &G(L)->l_registry;
+  else {  /* upvalues */
+    idx = LUA_REGISTRYINDEX - idx;
+    api_check(L, idx <= MAXUPVAL + 1, "upvalue index too large");
+    if (ttislcf(ci->func))  /* light C function? */
+      return NONVALIDVALUE;  /* it has no upvalues */
+    else {
+      CClosure *func = clCvalue(ci->func);
+      return (idx <= func->nupvalues) ? &func->upvalue[idx-1] : NONVALIDVALUE;
+    }
+  }
+}
+
+
+/*
+** to be called by 'lua_checkstack' in protected mode, to grow stack
+** capturing memory errors
+*/
+static void growstack (lua_State *L, void *ud) {
+  int size = *(int *)ud;
+  luaD_growstack(L, size);
+}
+
+
+LUA_API int lua_checkstack (lua_State *L, int n) {
+  int res;
+  CallInfo *ci = L->ci;
+  lua_lock(L);
+  api_check(L, n >= 0, "negative 'n'");
+  if (L->stack_last - L->top > n)  /* stack large enough? */
+    res = 1;  /* yes; check is OK */
+  else {  /* no; need to grow stack */
+    int inuse = cast_int(L->top - L->stack) + EXTRA_STACK;
+    if (inuse > LUAI_MAXSTACK - n)  /* can grow without overflow? */
+      res = 0;  /* no */
+    else  /* try to grow stack */
+      res = (luaD_rawrunprotected(L, &growstack, &n) == LUA_OK);
+  }
+  if (res && ci->top < L->top + n)
+    ci->top = L->top + n;  /* adjust frame top */
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API void lua_xmove (lua_State *from, lua_State *to, int n) {
+  int i;
+  if (from == to) return;
+  lua_lock(to);
+  api_checknelems(from, n);
+  api_check(from, G(from) == G(to), "moving among independent states");
+  api_check(from, to->ci->top - to->top >= n, "stack overflow");
+  from->top -= n;
+  for (i = 0; i < n; i++) {
+    setobj2s(to, to->top, from->top + i);
+    to->top++;  /* stack already checked by previous 'api_check' */
+  }
+  lua_unlock(to);
+}
+
+
+LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) {
+  lua_CFunction old;
+  lua_lock(L);
+  old = G(L)->panic;
+  G(L)->panic = panicf;
+  lua_unlock(L);
+  return old;
+}
+
+
+LUA_API const lua_Number *lua_version (lua_State *L) {
+  static const lua_Number version = LUA_VERSION_NUM;
+  if (L == NULL) return &version;
+  else return G(L)->version;
+}
+
+
+
+/*
+** basic stack manipulation
+*/
+
+
+/*
+** convert an acceptable stack index into an absolute index
+*/
+LUA_API int lua_absindex (lua_State *L, int idx) {
+  return (idx > 0 || ispseudo(idx))
+         ? idx
+         : cast_int(L->top - L->ci->func) + idx;
+}
+
+
+LUA_API int lua_gettop (lua_State *L) {
+  return cast_int(L->top - (L->ci->func + 1));
+}
+
+
+LUA_API void lua_settop (lua_State *L, int idx) {
+  StkId func = L->ci->func;
+  lua_lock(L);
+  if (idx >= 0) {
+    api_check(L, idx <= L->stack_last - (func + 1), "new top too large");
+    while (L->top < (func + 1) + idx)
+      setnilvalue(L->top++);
+    L->top = (func + 1) + idx;
+  }
+  else {
+    api_check(L, -(idx+1) <= (L->top - (func + 1)), "invalid new top");
+    L->top += idx+1;  /* 'subtract' index (index is negative) */
+  }
+  lua_unlock(L);
+}
+
+
+/*
+** Reverse the stack segment from 'from' to 'to'
+** (auxiliary to 'lua_rotate')
+*/
+static void reverse (lua_State *L, StkId from, StkId to) {
+  for (; from < to; from++, to--) {
+    TValue temp;
+    setobj(L, &temp, from);
+    setobjs2s(L, from, to);
+    setobj2s(L, to, &temp);
+  }
+}
+
+
+/*
+** Let x = AB, where A is a prefix of length 'n'. Then,
+** rotate x n == BA. But BA == (A^r . B^r)^r.
+*/
+LUA_API void lua_rotate (lua_State *L, int idx, int n) {
+  StkId p, t, m;
+  lua_lock(L);
+  t = L->top - 1;  /* end of stack segment being rotated */
+  p = index2addr(L, idx);  /* start of segment */
+  api_checkstackindex(L, idx, p);
+  api_check(L, (n >= 0 ? n : -n) <= (t - p + 1), "invalid 'n'");
+  m = (n >= 0 ? t - n : p - n - 1);  /* end of prefix */
+  reverse(L, p, m);  /* reverse the prefix with length 'n' */
+  reverse(L, m + 1, t);  /* reverse the suffix */
+  reverse(L, p, t);  /* reverse the entire segment */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_copy (lua_State *L, int fromidx, int toidx) {
+  TValue *fr, *to;
+  lua_lock(L);
+  fr = index2addr(L, fromidx);
+  to = index2addr(L, toidx);
+  api_checkvalidindex(L, to);
+  setobj(L, to, fr);
+  if (isupvalue(toidx))  /* function upvalue? */
+    luaC_barrier(L, clCvalue(L->ci->func), fr);
+  /* LUA_REGISTRYINDEX does not need gc barrier
+     (collector revisits it before finishing collection) */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushvalue (lua_State *L, int idx) {
+  lua_lock(L);
+  setobj2s(L, L->top, index2addr(L, idx));
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+
+/*
+** access functions (stack -> C)
+*/
+
+
+LUA_API int lua_type (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  return (isvalid(o) ? ttnov(o) : LUA_TNONE);
+}
+
+
+LUA_API const char *lua_typename (lua_State *L, int t) {
+  UNUSED(L);
+  api_check(L, LUA_TNONE <= t && t < LUA_NUMTAGS, "invalid tag");
+  return ttypename(t);
+}
+
+
+LUA_API int lua_iscfunction (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  return (ttislcf(o) || (ttisCclosure(o)));
+}
+
+
+LUA_API int lua_isinteger (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  return ttisinteger(o);
+}
+
+
+LUA_API int lua_isnumber (lua_State *L, int idx) {
+  lua_Number n;
+  const TValue *o = index2addr(L, idx);
+  return tonumber(o, &n);
+}
+
+
+LUA_API int lua_isstring (lua_State *L, int idx) {
+  const TValue *o = index2addr(L, idx);
+  return (ttisstring(o) || cvt2str(o));
+}
+
+
+LUA_API int lua_isuserdata (lua_State *L, int idx) {
+  const TValue *o = index2addr(L, idx);
+  return (ttisfulluserdata(o) || ttislightuserdata(o));
+}
+
+
+LUA_API int lua_rawequal (lua_State *L, int index1, int index2) {
+  StkId o1 = index2addr(L, index1);
+  StkId o2 = index2addr(L, index2);
+  return (isvalid(o1) && isvalid(o2)) ? luaV_rawequalobj(o1, o2) : 0;
+}
+
+
+LUA_API void lua_arith (lua_State *L, int op) {
+  lua_lock(L);
+  if (op != LUA_OPUNM && op != LUA_OPBNOT)
+    api_checknelems(L, 2);  /* all other operations expect two operands */
+  else {  /* for unary operations, add fake 2nd operand */
+    api_checknelems(L, 1);
+    setobjs2s(L, L->top, L->top - 1);
+    api_incr_top(L);
+  }
+  /* first operand at top - 2, second at top - 1; result go to top - 2 */
+  luaO_arith(L, op, L->top - 2, L->top - 1, L->top - 2);
+  L->top--;  /* remove second operand */
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_compare (lua_State *L, int index1, int index2, int op) {
+  StkId o1, o2;
+  int i = 0;
+  lua_lock(L);  /* may call tag method */
+  o1 = index2addr(L, index1);
+  o2 = index2addr(L, index2);
+  if (isvalid(o1) && isvalid(o2)) {
+    switch (op) {
+      case LUA_OPEQ: i = luaV_equalobj(L, o1, o2); break;
+      case LUA_OPLT: i = luaV_lessthan(L, o1, o2); break;
+      case LUA_OPLE: i = luaV_lessequal(L, o1, o2); break;
+      default: api_check(L, 0, "invalid option");
+    }
+  }
+  lua_unlock(L);
+  return i;
+}
+
+
+LUA_API size_t lua_stringtonumber (lua_State *L, const char *s) {
+  size_t sz = luaO_str2num(s, L->top);
+  if (sz != 0)
+    api_incr_top(L);
+  return sz;
+}
+
+
+LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *pisnum) {
+  lua_Number n;
+  const TValue *o = index2addr(L, idx);
+  int isnum = tonumber(o, &n);
+  if (!isnum)
+    n = 0;  /* call to 'tonumber' may change 'n' even if it fails */
+  if (pisnum) *pisnum = isnum;
+  return n;
+}
+
+
+LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *pisnum) {
+  lua_Integer res;
+  const TValue *o = index2addr(L, idx);
+  int isnum = tointeger(o, &res);
+  if (!isnum)
+    res = 0;  /* call to 'tointeger' may change 'n' even if it fails */
+  if (pisnum) *pisnum = isnum;
+  return res;
+}
+
+
+LUA_API int lua_toboolean (lua_State *L, int idx) {
+  const TValue *o = index2addr(L, idx);
+  return !l_isfalse(o);
+}
+
+
+LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
+  StkId o = index2addr(L, idx);
+  if (!ttisstring(o)) {
+    if (!cvt2str(o)) {  /* not convertible? */
+      if (len != NULL) *len = 0;
+      return NULL;
+    }
+    lua_lock(L);  /* 'luaO_tostring' may create a new string */
+    luaO_tostring(L, o);
+    luaC_checkGC(L);
+    o = index2addr(L, idx);  /* previous call may reallocate the stack */
+    lua_unlock(L);
+  }
+  if (len != NULL)
+    *len = vslen(o);
+  return svalue(o);
+}
+
+
+LUA_API size_t lua_rawlen (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  switch (ttype(o)) {
+    case LUA_TSHRSTR: return tsvalue(o)->shrlen;
+    case LUA_TLNGSTR: return tsvalue(o)->u.lnglen;
+    case LUA_TUSERDATA: return uvalue(o)->len;
+    case LUA_TTABLE: return luaH_getn(hvalue(o));
+    default: return 0;
+  }
+}
+
+
+LUA_API lua_CFunction lua_tocfunction (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  if (ttislcf(o)) return fvalue(o);
+  else if (ttisCclosure(o))
+    return clCvalue(o)->f;
+  else return NULL;  /* not a C function */
+}
+
+
+LUA_API void *lua_touserdata (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  switch (ttnov(o)) {
+    case LUA_TUSERDATA: return getudatamem(uvalue(o));
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
+}
+
+
+LUA_API lua_State *lua_tothread (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  return (!ttisthread(o)) ? NULL : thvalue(o);
+}
+
+
+LUA_API const void *lua_topointer (lua_State *L, int idx) {
+  StkId o = index2addr(L, idx);
+  switch (ttype(o)) {
+    case LUA_TTABLE: return hvalue(o);
+    case LUA_TLCL: return clLvalue(o);
+    case LUA_TCCL: return clCvalue(o);
+    case LUA_TLCF: return cast(void *, cast(size_t, fvalue(o)));
+    case LUA_TTHREAD: return thvalue(o);
+    case LUA_TUSERDATA: return getudatamem(uvalue(o));
+    case LUA_TLIGHTUSERDATA: return pvalue(o);
+    default: return NULL;
+  }
+}
+
+
+
+/*
+** push functions (C -> stack)
+*/
+
+
+LUA_API void lua_pushnil (lua_State *L) {
+  lua_lock(L);
+  setnilvalue(L->top);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
+  lua_lock(L);
+  setfltvalue(L->top, n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushinteger (lua_State *L, lua_Integer n) {
+  lua_lock(L);
+  setivalue(L->top, n);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+/*
+** Pushes on the stack a string with given length. Avoid using 's' when
+** 'len' == 0 (as 's' can be NULL in that case), due to later use of
+** 'memcmp' and 'memcpy'.
+*/
+LUA_API const char *lua_pushlstring (lua_State *L, const char *s, size_t len) {
+  TString *ts;
+  lua_lock(L);
+  ts = (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len);
+  setsvalue2s(L, L->top, ts);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getstr(ts);
+}
+
+
+LUA_API const char *lua_pushstring (lua_State *L, const char *s) {
+  lua_lock(L);
+  if (s == NULL)
+    setnilvalue(L->top);
+  else {
+    TString *ts;
+    ts = luaS_new(L, s);
+    setsvalue2s(L, L->top, ts);
+    s = getstr(ts);  /* internal copy's address */
+  }
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return s;
+}
+
+
+LUA_API const char *lua_pushvfstring (lua_State *L, const char *fmt,
+                                      va_list argp) {
+  const char *ret;
+  lua_lock(L);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API const char *lua_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *ret;
+  va_list argp;
+  lua_lock(L);
+  va_start(argp, fmt);
+  ret = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return ret;
+}
+
+
+LUA_API void lua_pushcclosure (lua_State *L, lua_CFunction fn, int n) {
+  lua_lock(L);
+  if (n == 0) {
+    setfvalue(L->top, fn);
+  }
+  else {
+    CClosure *cl;
+    api_checknelems(L, n);
+    api_check(L, n <= MAXUPVAL, "upvalue index too large");
+    cl = luaF_newCclosure(L, n);
+    cl->f = fn;
+    L->top -= n;
+    while (n--) {
+      setobj2n(L, &cl->upvalue[n], L->top + n);
+      /* does not need barrier because closure is white */
+    }
+    setclCvalue(L, L->top, cl);
+  }
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushboolean (lua_State *L, int b) {
+  lua_lock(L);
+  setbvalue(L->top, (b != 0));  /* ensure that true is 1 */
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_pushlightuserdata (lua_State *L, void *p) {
+  lua_lock(L);
+  setpvalue(L->top, p);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_pushthread (lua_State *L) {
+  lua_lock(L);
+  setthvalue(L, L->top, L);
+  api_incr_top(L);
+  lua_unlock(L);
+  return (G(L)->mainthread == L);
+}
+
+
+
+/*
+** get functions (Lua -> stack)
+*/
+
+
+static int auxgetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
+    setobj2s(L, L->top, slot);
+    api_incr_top(L);
+  }
+  else {
+    setsvalue2s(L, L->top, str);
+    api_incr_top(L);
+    luaV_finishget(L, t, L->top - 1, L->top - 1, slot);
+  }
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API int lua_getglobal (lua_State *L, const char *name) {
+  Table *reg = hvalue(&G(L)->l_registry);
+  lua_lock(L);
+  return auxgetstr(L, luaH_getint(reg, LUA_RIDX_GLOBALS), name);
+}
+
+
+LUA_API int lua_gettable (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  luaV_gettable(L, t, L->top - 1, L->top - 1);
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API int lua_getfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);
+  return auxgetstr(L, index2addr(L, idx), k);
+}
+
+
+LUA_API int lua_geti (lua_State *L, int idx, lua_Integer n) {
+  StkId t;
+  const TValue *slot;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  if (luaV_fastget(L, t, n, slot, luaH_getint)) {
+    setobj2s(L, L->top, slot);
+    api_incr_top(L);
+  }
+  else {
+    setivalue(L->top, n);
+    api_incr_top(L);
+    luaV_finishget(L, t, L->top - 1, L->top - 1, slot);
+  }
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API int lua_rawget (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  setobj2s(L, L->top - 1, luaH_get(hvalue(t), L->top - 1));
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API int lua_rawgeti (lua_State *L, int idx, lua_Integer n) {
+  StkId t;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  setobj2s(L, L->top, luaH_getint(hvalue(t), n));
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API int lua_rawgetp (lua_State *L, int idx, const void *p) {
+  StkId t;
+  TValue k;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  setpvalue(&k, cast(void *, p));
+  setobj2s(L, L->top, luaH_get(hvalue(t), &k));
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+LUA_API void lua_createtable (lua_State *L, int narray, int nrec) {
+  Table *t;
+  lua_lock(L);
+  t = luaH_new(L);
+  sethvalue(L, L->top, t);
+  api_incr_top(L);
+  if (narray > 0 || nrec > 0)
+    luaH_resize(L, t, narray, nrec);
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_getmetatable (lua_State *L, int objindex) {
+  const TValue *obj;
+  Table *mt;
+  int res = 0;
+  lua_lock(L);
+  obj = index2addr(L, objindex);
+  switch (ttnov(obj)) {
+    case LUA_TTABLE:
+      mt = hvalue(obj)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(obj)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttnov(obj)];
+      break;
+  }
+  if (mt != NULL) {
+    sethvalue(L, L->top, mt);
+    api_incr_top(L);
+    res = 1;
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+LUA_API int lua_getuservalue (lua_State *L, int idx) {
+  StkId o;
+  lua_lock(L);
+  o = index2addr(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  getuservalue(L, uvalue(o), L->top);
+  api_incr_top(L);
+  lua_unlock(L);
+  return ttnov(L->top - 1);
+}
+
+
+/*
+** set functions (stack -> Lua)
+*/
+
+/*
+** t[k] = value at the top of the stack (where 'k' is a string)
+*/
+static void auxsetstr (lua_State *L, const TValue *t, const char *k) {
+  const TValue *slot;
+  TString *str = luaS_new(L, k);
+  api_checknelems(L, 1);
+  if (luaV_fastset(L, t, str, slot, luaH_getstr, L->top - 1))
+    L->top--;  /* pop value */
+  else {
+    setsvalue2s(L, L->top, str);  /* push 'str' (to make it a TValue) */
+    api_incr_top(L);
+    luaV_finishset(L, t, L->top - 1, L->top - 2, slot);
+    L->top -= 2;  /* pop value and key */
+  }
+  lua_unlock(L);  /* lock done by caller */
+}
+
+
+LUA_API void lua_setglobal (lua_State *L, const char *name) {
+  Table *reg = hvalue(&G(L)->l_registry);
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  auxsetstr(L, luaH_getint(reg, LUA_RIDX_GLOBALS), name);
+}
+
+
+LUA_API void lua_settable (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  t = index2addr(L, idx);
+  luaV_settable(L, t, L->top - 2, L->top - 1);
+  L->top -= 2;  /* pop index and value */
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
+  lua_lock(L);  /* unlock done in 'auxsetstr' */
+  auxsetstr(L, index2addr(L, idx), k);
+}
+
+
+LUA_API void lua_seti (lua_State *L, int idx, lua_Integer n) {
+  StkId t;
+  const TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  t = index2addr(L, idx);
+  if (luaV_fastset(L, t, n, slot, luaH_getint, L->top - 1))
+    L->top--;  /* pop value */
+  else {
+    setivalue(L->top, n);
+    api_incr_top(L);
+    luaV_finishset(L, t, L->top - 1, L->top - 2, slot);
+    L->top -= 2;  /* pop value and key */
+  }
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawset (lua_State *L, int idx) {
+  StkId o;
+  TValue *slot;
+  lua_lock(L);
+  api_checknelems(L, 2);
+  o = index2addr(L, idx);
+  api_check(L, ttistable(o), "table expected");
+  slot = luaH_set(L, hvalue(o), L->top - 2);
+  setobj2t(L, slot, L->top - 1);
+  invalidateTMcache(hvalue(o));
+  luaC_barrierback(L, hvalue(o), L->top-1);
+  L->top -= 2;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawseti (lua_State *L, int idx, lua_Integer n) {
+  StkId o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = index2addr(L, idx);
+  api_check(L, ttistable(o), "table expected");
+  luaH_setint(L, hvalue(o), n, L->top - 1);
+  luaC_barrierback(L, hvalue(o), L->top-1);
+  L->top--;
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_rawsetp (lua_State *L, int idx, const void *p) {
+  StkId o;
+  TValue k, *slot;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = index2addr(L, idx);
+  api_check(L, ttistable(o), "table expected");
+  setpvalue(&k, cast(void *, p));
+  slot = luaH_set(L, hvalue(o), &k);
+  setobj2t(L, slot, L->top - 1);
+  luaC_barrierback(L, hvalue(o), L->top - 1);
+  L->top--;
+  lua_unlock(L);
+}
+
+
+LUA_API int lua_setmetatable (lua_State *L, int objindex) {
+  TValue *obj;
+  Table *mt;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  obj = index2addr(L, objindex);
+  if (ttisnil(L->top - 1))
+    mt = NULL;
+  else {
+    api_check(L, ttistable(L->top - 1), "table expected");
+    mt = hvalue(L->top - 1);
+  }
+  switch (ttnov(obj)) {
+    case LUA_TTABLE: {
+      hvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, gcvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    case LUA_TUSERDATA: {
+      uvalue(obj)->metatable = mt;
+      if (mt) {
+        luaC_objbarrier(L, uvalue(obj), mt);
+        luaC_checkfinalizer(L, gcvalue(obj), mt);
+      }
+      break;
+    }
+    default: {
+      G(L)->mt[ttnov(obj)] = mt;
+      break;
+    }
+  }
+  L->top--;
+  lua_unlock(L);
+  return 1;
+}
+
+
+LUA_API void lua_setuservalue (lua_State *L, int idx) {
+  StkId o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = index2addr(L, idx);
+  api_check(L, ttisfulluserdata(o), "full userdata expected");
+  setuservalue(L, uvalue(o), L->top - 1);
+  luaC_barrier(L, gcvalue(o), L->top - 1);
+  L->top--;
+  lua_unlock(L);
+}
+
+
+/*
+** 'load' and 'call' functions (run Lua code)
+*/
+
+
+#define checkresults(L,na,nr) \
+     api_check(L, (nr) == LUA_MULTRET || (L->ci->top - L->top >= (nr) - (na)), \
+	"results from function overflow current stack size")
+
+
+LUA_API void lua_callk (lua_State *L, int nargs, int nresults,
+                        lua_KContext ctx, lua_KFunction k) {
+  StkId func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  func = L->top - (nargs+1);
+  if (k != NULL && L->nny == 0) {  /* need to prepare continuation? */
+    L->ci->u.c.k = k;  /* save continuation */
+    L->ci->u.c.ctx = ctx;  /* save context */
+    luaD_call(L, func, nresults);  /* do the call */
+  }
+  else  /* no continuation or no yieldable */
+    luaD_callnoyield(L, func, nresults);  /* just do the call */
+  adjustresults(L, nresults);
+  lua_unlock(L);
+}
+
+
+
+/*
+** Execute a protected call.
+*/
+struct CallS {  /* data to 'f_call' */
+  StkId func;
+  int nresults;
+};
+
+
+static void f_call (lua_State *L, void *ud) {
+  struct CallS *c = cast(struct CallS *, ud);
+  luaD_callnoyield(L, c->func, c->nresults);
+}
+
+
+
+LUA_API int lua_pcallk (lua_State *L, int nargs, int nresults, int errfunc,
+                        lua_KContext ctx, lua_KFunction k) {
+  struct CallS c;
+  int status;
+  ptrdiff_t func;
+  lua_lock(L);
+  api_check(L, k == NULL || !isLua(L->ci),
+    "cannot use continuations inside hooks");
+  api_checknelems(L, nargs+1);
+  api_check(L, L->status == LUA_OK, "cannot do calls on non-normal thread");
+  checkresults(L, nargs, nresults);
+  if (errfunc == 0)
+    func = 0;
+  else {
+    StkId o = index2addr(L, errfunc);
+    api_checkstackindex(L, errfunc, o);
+    func = savestack(L, o);
+  }
+  c.func = L->top - (nargs+1);  /* function to be called */
+  if (k == NULL || L->nny > 0) {  /* no continuation or no yieldable? */
+    c.nresults = nresults;  /* do a 'conventional' protected call */
+    status = luaD_pcall(L, f_call, &c, savestack(L, c.func), func);
+  }
+  else {  /* prepare continuation (call is already protected by 'resume') */
+    CallInfo *ci = L->ci;
+    ci->u.c.k = k;  /* save continuation */
+    ci->u.c.ctx = ctx;  /* save context */
+    /* save information for error recovery */
+    ci->extra = savestack(L, c.func);
+    ci->u.c.old_errfunc = L->errfunc;
+    L->errfunc = func;
+    setoah(ci->callstatus, L->allowhook);  /* save value of 'allowhook' */
+    ci->callstatus |= CIST_YPCALL;  /* function can do error recovery */
+    luaD_call(L, c.func, nresults);  /* do the call */
+    ci->callstatus &= ~CIST_YPCALL;
+    L->errfunc = ci->u.c.old_errfunc;
+    status = LUA_OK;  /* if it is here, there were no errors */
+  }
+  adjustresults(L, nresults);
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_load (lua_State *L, lua_Reader reader, void *data,
+                      const char *chunkname, const char *mode) {
+  ZIO z;
+  int status;
+  lua_lock(L);
+  if (!chunkname) chunkname = "?";
+  luaZ_init(L, &z, reader, data);
+  status = luaD_protectedparser(L, &z, chunkname, mode);
+  if (status == LUA_OK) {  /* no errors? */
+    LClosure *f = clLvalue(L->top - 1);  /* get newly created function */
+    if (f->nupvalues >= 1) {  /* does it have an upvalue? */
+      /* get global table from registry */
+      Table *reg = hvalue(&G(L)->l_registry);
+      const TValue *gt = luaH_getint(reg, LUA_RIDX_GLOBALS);
+      /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
+      setobj(L, f->upvals[0]->v, gt);
+      luaC_upvalbarrier(L, f->upvals[0]);
+    }
+  }
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_dump (lua_State *L, lua_Writer writer, void *data, int strip) {
+  int status;
+  TValue *o;
+  lua_lock(L);
+  api_checknelems(L, 1);
+  o = L->top - 1;
+  if (isLfunction(o))
+    status = luaU_dump(L, getproto(o), writer, data, strip);
+  else
+    status = 1;
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_status (lua_State *L) {
+  return L->status;
+}
+
+
+/*
+** Garbage-collection function
+*/
+
+LUA_API int lua_gc (lua_State *L, int what, int data) {
+  int res = 0;
+  global_State *g;
+  lua_lock(L);
+  g = G(L);
+  switch (what) {
+    case LUA_GCSTOP: {
+      g->gcrunning = 0;
+      break;
+    }
+    case LUA_GCRESTART: {
+      luaE_setdebt(g, 0);
+      g->gcrunning = 1;
+      break;
+    }
+    case LUA_GCCOLLECT: {
+      luaC_fullgc(L, 0);
+      break;
+    }
+    case LUA_GCCOUNT: {
+      /* GC values are expressed in Kbytes: #bytes/2^10 */
+      res = cast_int(gettotalbytes(g) >> 10);
+      break;
+    }
+    case LUA_GCCOUNTB: {
+      res = cast_int(gettotalbytes(g) & 0x3ff);
+      break;
+    }
+    case LUA_GCSTEP: {
+      l_mem debt = 1;  /* =1 to signal that it did an actual step */
+      lu_byte oldrunning = g->gcrunning;
+      g->gcrunning = 1;  /* allow GC to run */
+      if (data == 0) {
+        luaE_setdebt(g, -GCSTEPSIZE);  /* to do a "small" step */
+        luaC_step(L);
+      }
+      else {  /* add 'data' to total debt */
+        debt = cast(l_mem, data) * 1024 + g->GCdebt;
+        luaE_setdebt(g, debt);
+        luaC_checkGC(L);
+      }
+      g->gcrunning = oldrunning;  /* restore previous state */
+      if (debt > 0 && g->gcstate == GCSpause)  /* end of cycle? */
+        res = 1;  /* signal it */
+      break;
+    }
+    case LUA_GCSETPAUSE: {
+      res = g->gcpause;
+      g->gcpause = data;
+      break;
+    }
+    case LUA_GCSETSTEPMUL: {
+      res = g->gcstepmul;
+      if (data < 40) data = 40;  /* avoid ridiculous low values (and 0) */
+      g->gcstepmul = data;
+      break;
+    }
+    case LUA_GCISRUNNING: {
+      res = g->gcrunning;
+      break;
+    }
+    default: res = -1;  /* invalid option */
+  }
+  lua_unlock(L);
+  return res;
+}
+
+
+
+/*
+** miscellaneous functions
+*/
+
+
+LUA_API int lua_error (lua_State *L) {
+  lua_lock(L);
+  api_checknelems(L, 1);
+  luaG_errormsg(L);
+  /* code unreachable; will unlock when control actually leaves the kernel */
+  return 0;  /* to avoid warnings */
+}
+
+
+LUA_API int lua_next (lua_State *L, int idx) {
+  StkId t;
+  int more;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  api_check(L, ttistable(t), "table expected");
+  more = luaH_next(L, hvalue(t), L->top - 1);
+  if (more) {
+    api_incr_top(L);
+  }
+  else  /* no more elements */
+    L->top -= 1;  /* remove key */
+  lua_unlock(L);
+  return more;
+}
+
+
+LUA_API void lua_concat (lua_State *L, int n) {
+  lua_lock(L);
+  api_checknelems(L, n);
+  if (n >= 2) {
+    luaV_concat(L, n);
+  }
+  else if (n == 0) {  /* push empty string */
+    setsvalue2s(L, L->top, luaS_newlstr(L, "", 0));
+    api_incr_top(L);
+  }
+  /* else n == 1; nothing to do */
+  luaC_checkGC(L);
+  lua_unlock(L);
+}
+
+
+LUA_API void lua_len (lua_State *L, int idx) {
+  StkId t;
+  lua_lock(L);
+  t = index2addr(L, idx);
+  luaV_objlen(L, L->top, t);
+  api_incr_top(L);
+  lua_unlock(L);
+}
+
+
+LUA_API lua_Alloc lua_getallocf (lua_State *L, void **ud) {
+  lua_Alloc f;
+  lua_lock(L);
+  if (ud) *ud = G(L)->ud;
+  f = G(L)->frealloc;
+  lua_unlock(L);
+  return f;
+}
+
+
+LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud) {
+  lua_lock(L);
+  G(L)->ud = ud;
+  G(L)->frealloc = f;
+  lua_unlock(L);
+}
+
+
+LUA_API void *lua_newuserdata (lua_State *L, size_t size) {
+  Udata *u;
+  lua_lock(L);
+  u = luaS_newudata(L, size);
+  setuvalue(L, L->top, u);
+  api_incr_top(L);
+  luaC_checkGC(L);
+  lua_unlock(L);
+  return getudatamem(u);
+}
+
+
+
+static const char *aux_upvalue (StkId fi, int n, TValue **val,
+                                CClosure **owner, UpVal **uv) {
+  switch (ttype(fi)) {
+    case LUA_TCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      if (!(1 <= n && n <= f->nupvalues)) return NULL;
+      *val = &f->upvalue[n-1];
+      if (owner) *owner = f;
+      return "";
+    }
+    case LUA_TLCL: {  /* Lua closure */
+      LClosure *f = clLvalue(fi);
+      TString *name;
+      Proto *p = f->p;
+      if (!(1 <= n && n <= p->sizeupvalues)) return NULL;
+      *val = f->upvals[n-1]->v;
+      if (uv) *uv = f->upvals[n - 1];
+      name = p->upvalues[n-1].name;
+      return (name == NULL) ? "(*no name)" : getstr(name);
+    }
+    default: return NULL;  /* not a closure */
+  }
+}
+
+
+LUA_API const char *lua_getupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  lua_lock(L);
+  name = aux_upvalue(index2addr(L, funcindex), n, &val, NULL, NULL);
+  if (name) {
+    setobj2s(L, L->top, val);
+    api_incr_top(L);
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setupvalue (lua_State *L, int funcindex, int n) {
+  const char *name;
+  TValue *val = NULL;  /* to avoid warnings */
+  CClosure *owner = NULL;
+  UpVal *uv = NULL;
+  StkId fi;
+  lua_lock(L);
+  fi = index2addr(L, funcindex);
+  api_checknelems(L, 1);
+  name = aux_upvalue(fi, n, &val, &owner, &uv);
+  if (name) {
+    L->top--;
+    setobj(L, val, L->top);
+    if (owner) { luaC_barrier(L, owner, L->top); }
+    else if (uv) { luaC_upvalbarrier(L, uv); }
+  }
+  lua_unlock(L);
+  return name;
+}
+
+
+static UpVal **getupvalref (lua_State *L, int fidx, int n, LClosure **pf) {
+  LClosure *f;
+  StkId fi = index2addr(L, fidx);
+  api_check(L, ttisLclosure(fi), "Lua function expected");
+  f = clLvalue(fi);
+  api_check(L, (1 <= n && n <= f->p->sizeupvalues), "invalid upvalue index");
+  if (pf) *pf = f;
+  return &f->upvals[n - 1];  /* get its upvalue pointer */
+}
+
+
+LUA_API void *lua_upvalueid (lua_State *L, int fidx, int n) {
+  StkId fi = index2addr(L, fidx);
+  switch (ttype(fi)) {
+    case LUA_TLCL: {  /* lua closure */
+      return *getupvalref(L, fidx, n, NULL);
+    }
+    case LUA_TCCL: {  /* C closure */
+      CClosure *f = clCvalue(fi);
+      api_check(L, 1 <= n && n <= f->nupvalues, "invalid upvalue index");
+      return &f->upvalue[n - 1];
+    }
+    default: {
+      api_check(L, 0, "closure expected");
+      return NULL;
+    }
+  }
+}
+
+
+LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
+                                            int fidx2, int n2) {
+  LClosure *f1;
+  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
+  UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
+  luaC_upvdeccount(L, *up1);
+  *up1 = *up2;
+  (*up1)->refcount++;
+  if (upisopen(*up1)) (*up1)->u.open.touched = 1;
+  luaC_upvalbarrier(L, *up1);
+}
+
+
diff --git a/scite-app/scite/lua/src/lapi.h b/scite-app/scite/lua/src/lapi.h
new file mode 100644
index 0000000..6d36dee
--- /dev/null
+++ b/scite-app/scite/lua/src/lapi.h
@@ -0,0 +1,24 @@
+/*
+** $Id: lapi.h,v 2.9 2015/03/06 19:49:50 roberto Exp $
+** Auxiliary functions from Lua API
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lapi_h
+#define lapi_h
+
+
+#include "llimits.h"
+#include "lstate.h"
+
+#define api_incr_top(L)   {L->top++; api_check(L, L->top <= L->ci->top, \
+				"stack overflow");}
+
+#define adjustresults(L,nres) \
+    { if ((nres) == LUA_MULTRET && L->ci->top < L->top) L->ci->top = L->top; }
+
+#define api_checknelems(L,n)	api_check(L, (n) < (L->top - L->ci->func), \
+				  "not enough elements in the stack")
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lauxlib.c b/scite-app/scite/lua/src/lauxlib.c
new file mode 100644
index 0000000..f7a3836
--- /dev/null
+++ b/scite-app/scite/lua/src/lauxlib.c
@@ -0,0 +1,1043 @@
+/*
+** $Id: lauxlib.c,v 1.289 2016/12/20 18:37:00 roberto Exp $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+#define lauxlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*
+** This file uses only the official API of Lua.
+** Any function declared here could be written as an application function.
+*/
+
+#include "lua.h"
+
+#include "lauxlib.h"
+
+
+/*
+** {======================================================
+** Traceback
+** =======================================================
+*/
+
+
+#define LEVELS1	10	/* size of the first part of the stack */
+#define LEVELS2	11	/* size of the second part of the stack */
+
+
+
+/*
+** search for 'objidx' in table at index -1.
+** return 1 + string at top if find a good name.
+*/
+static int findfield (lua_State *L, int objidx, int level) {
+  if (level == 0 || !lua_istable(L, -1))
+    return 0;  /* not found */
+  lua_pushnil(L);  /* start 'next' loop */
+  while (lua_next(L, -2)) {  /* for each pair in table */
+    if (lua_type(L, -2) == LUA_TSTRING) {  /* ignore non-string keys */
+      if (lua_rawequal(L, objidx, -1)) {  /* found object? */
+        lua_pop(L, 1);  /* remove value (but keep name) */
+        return 1;
+      }
+      else if (findfield(L, objidx, level - 1)) {  /* try recursively */
+        lua_remove(L, -2);  /* remove table (but keep name) */
+        lua_pushliteral(L, ".");
+        lua_insert(L, -2);  /* place '.' between the two names */
+        lua_concat(L, 3);
+        return 1;
+      }
+    }
+    lua_pop(L, 1);  /* remove value */
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Search for a name for a function in all loaded modules
+*/
+static int pushglobalfuncname (lua_State *L, lua_Debug *ar) {
+  int top = lua_gettop(L);
+  lua_getinfo(L, "f", ar);  /* push function */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  if (findfield(L, top + 1, 2)) {
+    const char *name = lua_tostring(L, -1);
+    if (strncmp(name, "_G.", 3) == 0) {  /* name start with '_G.'? */
+      lua_pushstring(L, name + 3);  /* push name without prefix */
+      lua_remove(L, -2);  /* remove original name */
+    }
+    lua_copy(L, -1, top + 1);  /* move name to proper place */
+    lua_pop(L, 2);  /* remove pushed values */
+    return 1;
+  }
+  else {
+    lua_settop(L, top);  /* remove function and global table */
+    return 0;
+  }
+}
+
+
+static void pushfuncname (lua_State *L, lua_Debug *ar) {
+  if (pushglobalfuncname(L, ar)) {  /* try first a global name */
+    lua_pushfstring(L, "function '%s'", lua_tostring(L, -1));
+    lua_remove(L, -2);  /* remove name */
+  }
+  else if (*ar->namewhat != '\0')  /* is there a name from code? */
+    lua_pushfstring(L, "%s '%s'", ar->namewhat, ar->name);  /* use it */
+  else if (*ar->what == 'm')  /* main? */
+      lua_pushliteral(L, "main chunk");
+  else if (*ar->what != 'C')  /* for Lua functions, use <file:line> */
+    lua_pushfstring(L, "function <%s:%d>", ar->short_src, ar->linedefined);
+  else  /* nothing left... */
+    lua_pushliteral(L, "?");
+}
+
+
+static int lastlevel (lua_State *L) {
+  lua_Debug ar;
+  int li = 1, le = 1;
+  /* find an upper bound */
+  while (lua_getstack(L, le, &ar)) { li = le; le *= 2; }
+  /* do a binary search */
+  while (li < le) {
+    int m = (li + le)/2;
+    if (lua_getstack(L, m, &ar)) li = m + 1;
+    else le = m;
+  }
+  return le - 1;
+}
+
+
+LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1,
+                                const char *msg, int level) {
+  lua_Debug ar;
+  int top = lua_gettop(L);
+  int last = lastlevel(L1);
+  int n1 = (last - level > LEVELS1 + LEVELS2) ? LEVELS1 : -1;
+  if (msg)
+    lua_pushfstring(L, "%s\n", msg);
+  luaL_checkstack(L, 10, NULL);
+  lua_pushliteral(L, "stack traceback:");
+  while (lua_getstack(L1, level++, &ar)) {
+    if (n1-- == 0) {  /* too many levels? */
+      lua_pushliteral(L, "\n\t...");  /* add a '...' */
+      level = last - LEVELS2 + 1;  /* and skip to last ones */
+    }
+    else {
+      lua_getinfo(L1, "Slnt", &ar);
+      lua_pushfstring(L, "\n\t%s:", ar.short_src);
+      if (ar.currentline > 0)
+        lua_pushfstring(L, "%d:", ar.currentline);
+      lua_pushliteral(L, " in ");
+      pushfuncname(L, &ar);
+      if (ar.istailcall)
+        lua_pushliteral(L, "\n\t(...tail calls...)");
+      lua_concat(L, lua_gettop(L) - top);
+    }
+  }
+  lua_concat(L, lua_gettop(L) - top);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Error-report functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_argerror (lua_State *L, int arg, const char *extramsg) {
+  lua_Debug ar;
+  if (!lua_getstack(L, 0, &ar))  /* no stack frame? */
+    return luaL_error(L, "bad argument #%d (%s)", arg, extramsg);
+  lua_getinfo(L, "n", &ar);
+  if (strcmp(ar.namewhat, "method") == 0) {
+    arg--;  /* do not count 'self' */
+    if (arg == 0)  /* error is in the self argument itself? */
+      return luaL_error(L, "calling '%s' on bad self (%s)",
+                           ar.name, extramsg);
+  }
+  if (ar.name == NULL)
+    ar.name = (pushglobalfuncname(L, &ar)) ? lua_tostring(L, -1) : "?";
+  return luaL_error(L, "bad argument #%d to '%s' (%s)",
+                        arg, ar.name, extramsg);
+}
+
+
+static int typeerror (lua_State *L, int arg, const char *tname) {
+  const char *msg;
+  const char *typearg;  /* name for the type of the actual argument */
+  if (luaL_getmetafield(L, arg, "__name") == LUA_TSTRING)
+    typearg = lua_tostring(L, -1);  /* use the given type name */
+  else if (lua_type(L, arg) == LUA_TLIGHTUSERDATA)
+    typearg = "light userdata";  /* special name for messages */
+  else
+    typearg = luaL_typename(L, arg);  /* standard name */
+  msg = lua_pushfstring(L, "%s expected, got %s", tname, typearg);
+  return luaL_argerror(L, arg, msg);
+}
+
+
+static void tag_error (lua_State *L, int arg, int tag) {
+  typeerror(L, arg, lua_typename(L, tag));
+}
+
+
+/*
+** The use of 'lua_pushfstring' ensures this function does not
+** need reserved stack space when called.
+*/
+LUALIB_API void luaL_where (lua_State *L, int level) {
+  lua_Debug ar;
+  if (lua_getstack(L, level, &ar)) {  /* check function at level */
+    lua_getinfo(L, "Sl", &ar);  /* get info about it */
+    if (ar.currentline > 0) {  /* is there info? */
+      lua_pushfstring(L, "%s:%d: ", ar.short_src, ar.currentline);
+      return;
+    }
+  }
+  lua_pushfstring(L, "");  /* else, no information available... */
+}
+
+
+/*
+** Again, the use of 'lua_pushvfstring' ensures this function does
+** not need reserved stack space when called. (At worst, it generates
+** an error with "stack overflow" instead of the given message.)
+*/
+LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...) {
+  va_list argp;
+  va_start(argp, fmt);
+  luaL_where(L, 1);
+  lua_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  lua_concat(L, 2);
+  return lua_error(L);
+}
+
+
+LUALIB_API int luaL_fileresult (lua_State *L, int stat, const char *fname) {
+  int en = errno;  /* calls to Lua API may change this value */
+  if (stat) {
+    lua_pushboolean(L, 1);
+    return 1;
+  }
+  else {
+    lua_pushnil(L);
+    if (fname)
+      lua_pushfstring(L, "%s: %s", fname, strerror(en));
+    else
+      lua_pushstring(L, strerror(en));
+    lua_pushinteger(L, en);
+    return 3;
+  }
+}
+
+
+#if !defined(l_inspectstat)	/* { */
+
+#if defined(LUA_USE_POSIX)
+
+#include <sys/wait.h>
+
+/*
+** use appropriate macros to interpret 'pclose' return status
+*/
+#define l_inspectstat(stat,what)  \
+   if (WIFEXITED(stat)) { stat = WEXITSTATUS(stat); } \
+   else if (WIFSIGNALED(stat)) { stat = WTERMSIG(stat); what = "signal"; }
+
+#else
+
+#define l_inspectstat(stat,what)  /* no op */
+
+#endif
+
+#endif				/* } */
+
+
+LUALIB_API int luaL_execresult (lua_State *L, int stat) {
+  const char *what = "exit";  /* type of termination */
+  if (stat == -1)  /* error? */
+    return luaL_fileresult(L, 0, NULL);
+  else {
+    l_inspectstat(stat, what);  /* interpret result */
+    if (*what == 'e' && stat == 0)  /* successful termination? */
+      lua_pushboolean(L, 1);
+    else
+      lua_pushnil(L);
+    lua_pushstring(L, what);
+    lua_pushinteger(L, stat);
+    return 3;  /* return true/nil,what,code */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Userdata's metatable manipulation
+** =======================================================
+*/
+
+LUALIB_API int luaL_newmetatable (lua_State *L, const char *tname) {
+  if (luaL_getmetatable(L, tname) != LUA_TNIL)  /* name already in use? */
+    return 0;  /* leave previous value on top, but return 0 */
+  lua_pop(L, 1);
+  lua_createtable(L, 0, 2);  /* create metatable */
+  lua_pushstring(L, tname);
+  lua_setfield(L, -2, "__name");  /* metatable.__name = tname */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, LUA_REGISTRYINDEX, tname);  /* registry.name = metatable */
+  return 1;
+}
+
+
+LUALIB_API void luaL_setmetatable (lua_State *L, const char *tname) {
+  luaL_getmetatable(L, tname);
+  lua_setmetatable(L, -2);
+}
+
+
+LUALIB_API void *luaL_testudata (lua_State *L, int ud, const char *tname) {
+  void *p = lua_touserdata(L, ud);
+  if (p != NULL) {  /* value is a userdata? */
+    if (lua_getmetatable(L, ud)) {  /* does it have a metatable? */
+      luaL_getmetatable(L, tname);  /* get correct metatable */
+      if (!lua_rawequal(L, -1, -2))  /* not the same? */
+        p = NULL;  /* value is a userdata with wrong metatable */
+      lua_pop(L, 2);  /* remove both metatables */
+      return p;
+    }
+  }
+  return NULL;  /* value is not a userdata with a metatable */
+}
+
+
+LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
+  void *p = luaL_testudata(L, ud, tname);
+  if (p == NULL) typeerror(L, ud, tname);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Argument check functions
+** =======================================================
+*/
+
+LUALIB_API int luaL_checkoption (lua_State *L, int arg, const char *def,
+                                 const char *const lst[]) {
+  const char *name = (def) ? luaL_optstring(L, arg, def) :
+                             luaL_checkstring(L, arg);
+  int i;
+  for (i=0; lst[i]; i++)
+    if (strcmp(lst[i], name) == 0)
+      return i;
+  return luaL_argerror(L, arg,
+                       lua_pushfstring(L, "invalid option '%s'", name));
+}
+
+
+/*
+** Ensures the stack has at least 'space' extra slots, raising an error
+** if it cannot fulfill the request. (The error handling needs a few
+** extra slots to format the error message. In case of an error without
+** this extra space, Lua will generate the same 'stack overflow' error,
+** but without 'msg'.)
+*/
+LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *msg) {
+  if (!lua_checkstack(L, space)) {
+    if (msg)
+      luaL_error(L, "stack overflow (%s)", msg);
+    else
+      luaL_error(L, "stack overflow");
+  }
+}
+
+
+LUALIB_API void luaL_checktype (lua_State *L, int arg, int t) {
+  if (lua_type(L, arg) != t)
+    tag_error(L, arg, t);
+}
+
+
+LUALIB_API void luaL_checkany (lua_State *L, int arg) {
+  if (lua_type(L, arg) == LUA_TNONE)
+    luaL_argerror(L, arg, "value expected");
+}
+
+
+LUALIB_API const char *luaL_checklstring (lua_State *L, int arg, size_t *len) {
+  const char *s = lua_tolstring(L, arg, len);
+  if (!s) tag_error(L, arg, LUA_TSTRING);
+  return s;
+}
+
+
+LUALIB_API const char *luaL_optlstring (lua_State *L, int arg,
+                                        const char *def, size_t *len) {
+  if (lua_isnoneornil(L, arg)) {
+    if (len)
+      *len = (def ? strlen(def) : 0);
+    return def;
+  }
+  else return luaL_checklstring(L, arg, len);
+}
+
+
+LUALIB_API lua_Number luaL_checknumber (lua_State *L, int arg) {
+  int isnum;
+  lua_Number d = lua_tonumberx(L, arg, &isnum);
+  if (!isnum)
+    tag_error(L, arg, LUA_TNUMBER);
+  return d;
+}
+
+
+LUALIB_API lua_Number luaL_optnumber (lua_State *L, int arg, lua_Number def) {
+  return luaL_opt(L, luaL_checknumber, arg, def);
+}
+
+
+static void interror (lua_State *L, int arg) {
+  if (lua_isnumber(L, arg))
+    luaL_argerror(L, arg, "number has no integer representation");
+  else
+    tag_error(L, arg, LUA_TNUMBER);
+}
+
+
+LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int arg) {
+  int isnum;
+  lua_Integer d = lua_tointegerx(L, arg, &isnum);
+  if (!isnum) {
+    interror(L, arg);
+  }
+  return d;
+}
+
+
+LUALIB_API lua_Integer luaL_optinteger (lua_State *L, int arg,
+                                                      lua_Integer def) {
+  return luaL_opt(L, luaL_checkinteger, arg, def);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+/* userdata to box arbitrary data */
+typedef struct UBox {
+  void *box;
+  size_t bsize;
+} UBox;
+
+
+static void *resizebox (lua_State *L, int idx, size_t newsize) {
+  void *ud;
+  lua_Alloc allocf = lua_getallocf(L, &ud);
+  UBox *box = (UBox *)lua_touserdata(L, idx);
+  void *temp = allocf(ud, box->box, box->bsize, newsize);
+  if (temp == NULL && newsize > 0) {  /* allocation error? */
+    resizebox(L, idx, 0);  /* free buffer */
+    luaL_error(L, "not enough memory for buffer allocation");
+  }
+  box->box = temp;
+  box->bsize = newsize;
+  return temp;
+}
+
+
+static int boxgc (lua_State *L) {
+  resizebox(L, 1, 0);
+  return 0;
+}
+
+
+static void *newbox (lua_State *L, size_t newsize) {
+  UBox *box = (UBox *)lua_newuserdata(L, sizeof(UBox));
+  box->box = NULL;
+  box->bsize = 0;
+  if (luaL_newmetatable(L, "LUABOX")) {  /* creating metatable? */
+    lua_pushcfunction(L, boxgc);
+    lua_setfield(L, -2, "__gc");  /* metatable.__gc = boxgc */
+  }
+  lua_setmetatable(L, -2);
+  return resizebox(L, -1, newsize);
+}
+
+
+/*
+** check whether buffer is using a userdata on the stack as a temporary
+** buffer
+*/
+#define buffonstack(B)	((B)->b != (B)->initb)
+
+
+/*
+** returns a pointer to a free area with at least 'sz' bytes
+*/
+LUALIB_API char *luaL_prepbuffsize (luaL_Buffer *B, size_t sz) {
+  lua_State *L = B->L;
+  if (B->size - B->n < sz) {  /* not enough space? */
+    char *newbuff;
+    size_t newsize = B->size * 2;  /* double buffer size */
+    if (newsize - B->n < sz)  /* not big enough? */
+      newsize = B->n + sz;
+    if (newsize < B->n || newsize - B->n < sz)
+      luaL_error(L, "buffer too large");
+    /* create larger buffer */
+    if (buffonstack(B))
+      newbuff = (char *)resizebox(L, -1, newsize);
+    else {  /* no buffer yet */
+      newbuff = (char *)newbox(L, newsize);
+      memcpy(newbuff, B->b, B->n * sizeof(char));  /* copy original content */
+    }
+    B->b = newbuff;
+    B->size = newsize;
+  }
+  return &B->b[B->n];
+}
+
+
+LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
+  if (l > 0) {  /* avoid 'memcpy' when 's' can be NULL */
+    char *b = luaL_prepbuffsize(B, l);
+    memcpy(b, s, l * sizeof(char));
+    luaL_addsize(B, l);
+  }
+}
+
+
+LUALIB_API void luaL_addstring (luaL_Buffer *B, const char *s) {
+  luaL_addlstring(B, s, strlen(s));
+}
+
+
+LUALIB_API void luaL_pushresult (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  lua_pushlstring(L, B->b, B->n);
+  if (buffonstack(B)) {
+    resizebox(L, -2, 0);  /* delete old buffer */
+    lua_remove(L, -2);  /* remove its header from the stack */
+  }
+}
+
+
+LUALIB_API void luaL_pushresultsize (luaL_Buffer *B, size_t sz) {
+  luaL_addsize(B, sz);
+  luaL_pushresult(B);
+}
+
+
+LUALIB_API void luaL_addvalue (luaL_Buffer *B) {
+  lua_State *L = B->L;
+  size_t l;
+  const char *s = lua_tolstring(L, -1, &l);
+  if (buffonstack(B))
+    lua_insert(L, -2);  /* put value below buffer */
+  luaL_addlstring(B, s, l);
+  lua_remove(L, (buffonstack(B)) ? -2 : -1);  /* remove value */
+}
+
+
+LUALIB_API void luaL_buffinit (lua_State *L, luaL_Buffer *B) {
+  B->L = L;
+  B->b = B->initb;
+  B->n = 0;
+  B->size = LUAL_BUFFERSIZE;
+}
+
+
+LUALIB_API char *luaL_buffinitsize (lua_State *L, luaL_Buffer *B, size_t sz) {
+  luaL_buffinit(L, B);
+  return luaL_prepbuffsize(B, sz);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Reference system
+** =======================================================
+*/
+
+/* index of free-list header */
+#define freelist	0
+
+
+LUALIB_API int luaL_ref (lua_State *L, int t) {
+  int ref;
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* remove from stack */
+    return LUA_REFNIL;  /* 'nil' has a unique fixed reference */
+  }
+  t = lua_absindex(L, t);
+  lua_rawgeti(L, t, freelist);  /* get first free element */
+  ref = (int)lua_tointeger(L, -1);  /* ref = t[freelist] */
+  lua_pop(L, 1);  /* remove it from stack */
+  if (ref != 0) {  /* any free element? */
+    lua_rawgeti(L, t, ref);  /* remove it from list */
+    lua_rawseti(L, t, freelist);  /* (t[freelist] = t[ref]) */
+  }
+  else  /* no free elements */
+    ref = (int)lua_rawlen(L, t) + 1;  /* get a new reference */
+  lua_rawseti(L, t, ref);
+  return ref;
+}
+
+
+LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
+  if (ref >= 0) {
+    t = lua_absindex(L, t);
+    lua_rawgeti(L, t, freelist);
+    lua_rawseti(L, t, ref);  /* t[ref] = t[freelist] */
+    lua_pushinteger(L, ref);
+    lua_rawseti(L, t, freelist);  /* t[freelist] = ref */
+  }
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Load functions
+** =======================================================
+*/
+
+typedef struct LoadF {
+  int n;  /* number of pre-read characters */
+  FILE *f;  /* file being read */
+  char buff[BUFSIZ];  /* area for reading file */
+} LoadF;
+
+
+static const char *getF (lua_State *L, void *ud, size_t *size) {
+  LoadF *lf = (LoadF *)ud;
+  (void)L;  /* not used */
+  if (lf->n > 0) {  /* are there pre-read characters to be read? */
+    *size = lf->n;  /* return them (chars already in buffer) */
+    lf->n = 0;  /* no more pre-read characters */
+  }
+  else {  /* read a block from file */
+    /* 'fread' can return > 0 *and* set the EOF flag. If next call to
+       'getF' called 'fread', it might still wait for user input.
+       The next check avoids this problem. */
+    if (feof(lf->f)) return NULL;
+    *size = fread(lf->buff, 1, sizeof(lf->buff), lf->f);  /* read block */
+  }
+  return lf->buff;
+}
+
+
+static int errfile (lua_State *L, const char *what, int fnameindex) {
+  const char *serr = strerror(errno);
+  const char *filename = lua_tostring(L, fnameindex) + 1;
+  lua_pushfstring(L, "cannot %s %s: %s", what, filename, serr);
+  lua_remove(L, fnameindex);
+  return LUA_ERRFILE;
+}
+
+
+static int skipBOM (LoadF *lf) {
+  const char *p = "\xEF\xBB\xBF";  /* UTF-8 BOM mark */
+  int c;
+  lf->n = 0;
+  do {
+    c = getc(lf->f);
+    if (c == EOF || c != *(const unsigned char *)p++) return c;
+    lf->buff[lf->n++] = c;  /* to be read by the parser */
+  } while (*p != '\0');
+  lf->n = 0;  /* prefix matched; discard it */
+  return getc(lf->f);  /* return next character */
+}
+
+
+/*
+** reads the first character of file 'f' and skips an optional BOM mark
+** in its beginning plus its first line if it starts with '#'. Returns
+** true if it skipped the first line.  In any case, '*cp' has the
+** first "valid" character of the file (after the optional BOM and
+** a first-line comment).
+*/
+static int skipcomment (LoadF *lf, int *cp) {
+  int c = *cp = skipBOM(lf);
+  if (c == '#') {  /* first line is a comment (Unix exec. file)? */
+    do {  /* skip first line */
+      c = getc(lf->f);
+    } while (c != EOF && c != '\n');
+    *cp = getc(lf->f);  /* skip end-of-line, if present */
+    return 1;  /* there was a comment */
+  }
+  else return 0;  /* no comment */
+}
+
+
+LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
+                                             const char *mode) {
+  LoadF lf;
+  int status, readstatus;
+  int c;
+  int fnameindex = lua_gettop(L) + 1;  /* index of filename on the stack */
+  if (filename == NULL) {
+    lua_pushliteral(L, "=stdin");
+    lf.f = stdin;
+  }
+  else {
+    lua_pushfstring(L, "@%s", filename);
+    lf.f = fopen(filename, "r");
+    if (lf.f == NULL) return errfile(L, "open", fnameindex);
+  }
+  if (skipcomment(&lf, &c))  /* read initial portion */
+    lf.buff[lf.n++] = '\n';  /* add line to correct line numbers */
+  if (c == LUA_SIGNATURE[0] && filename) {  /* binary file? */
+    lf.f = freopen(filename, "rb", lf.f);  /* reopen in binary mode */
+    if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
+    skipcomment(&lf, &c);  /* re-read initial portion */
+  }
+  if (c != EOF)
+    lf.buff[lf.n++] = c;  /* 'c' is the first character of the stream */
+  status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
+  readstatus = ferror(lf.f);
+  if (filename) fclose(lf.f);  /* close file (even in case of errors) */
+  if (readstatus) {
+    lua_settop(L, fnameindex);  /* ignore results from 'lua_load' */
+    return errfile(L, "read", fnameindex);
+  }
+  lua_remove(L, fnameindex);
+  return status;
+}
+
+
+typedef struct LoadS {
+  const char *s;
+  size_t size;
+} LoadS;
+
+
+static const char *getS (lua_State *L, void *ud, size_t *size) {
+  LoadS *ls = (LoadS *)ud;
+  (void)L;  /* not used */
+  if (ls->size == 0) return NULL;
+  *size = ls->size;
+  ls->size = 0;
+  return ls->s;
+}
+
+
+LUALIB_API int luaL_loadbufferx (lua_State *L, const char *buff, size_t size,
+                                 const char *name, const char *mode) {
+  LoadS ls;
+  ls.s = buff;
+  ls.size = size;
+  return lua_load(L, getS, &ls, name, mode);
+}
+
+
+LUALIB_API int luaL_loadstring (lua_State *L, const char *s) {
+  return luaL_loadbuffer(L, s, strlen(s), s);
+}
+
+/* }====================================================== */
+
+
+
+LUALIB_API int luaL_getmetafield (lua_State *L, int obj, const char *event) {
+  if (!lua_getmetatable(L, obj))  /* no metatable? */
+    return LUA_TNIL;
+  else {
+    int tt;
+    lua_pushstring(L, event);
+    tt = lua_rawget(L, -2);
+    if (tt == LUA_TNIL)  /* is metafield nil? */
+      lua_pop(L, 2);  /* remove metatable and metafield */
+    else
+      lua_remove(L, -2);  /* remove only metatable */
+    return tt;  /* return metafield type */
+  }
+}
+
+
+LUALIB_API int luaL_callmeta (lua_State *L, int obj, const char *event) {
+  obj = lua_absindex(L, obj);
+  if (luaL_getmetafield(L, obj, event) == LUA_TNIL)  /* no metafield? */
+    return 0;
+  lua_pushvalue(L, obj);
+  lua_call(L, 1, 1);
+  return 1;
+}
+
+
+LUALIB_API lua_Integer luaL_len (lua_State *L, int idx) {
+  lua_Integer l;
+  int isnum;
+  lua_len(L, idx);
+  l = lua_tointegerx(L, -1, &isnum);
+  if (!isnum)
+    luaL_error(L, "object length is not an integer");
+  lua_pop(L, 1);  /* remove object */
+  return l;
+}
+
+
+LUALIB_API const char *luaL_tolstring (lua_State *L, int idx, size_t *len) {
+  if (luaL_callmeta(L, idx, "__tostring")) {  /* metafield? */
+    if (!lua_isstring(L, -1))
+      luaL_error(L, "'__tostring' must return a string");
+  }
+  else {
+    switch (lua_type(L, idx)) {
+      case LUA_TNUMBER: {
+        if (lua_isinteger(L, idx))
+          lua_pushfstring(L, "%I", (LUAI_UACINT)lua_tointeger(L, idx));
+        else
+          lua_pushfstring(L, "%f", (LUAI_UACNUMBER)lua_tonumber(L, idx));
+        break;
+      }
+      case LUA_TSTRING:
+        lua_pushvalue(L, idx);
+        break;
+      case LUA_TBOOLEAN:
+        lua_pushstring(L, (lua_toboolean(L, idx) ? "true" : "false"));
+        break;
+      case LUA_TNIL:
+        lua_pushliteral(L, "nil");
+        break;
+      default: {
+        int tt = luaL_getmetafield(L, idx, "__name");  /* try name */
+        const char *kind = (tt == LUA_TSTRING) ? lua_tostring(L, -1) :
+                                                 luaL_typename(L, idx);
+        lua_pushfstring(L, "%s: %p", kind, lua_topointer(L, idx));
+        if (tt != LUA_TNIL)
+          lua_remove(L, -2);  /* remove '__name' */
+        break;
+      }
+    }
+  }
+  return lua_tolstring(L, -1, len);
+}
+
+
+/*
+** {======================================================
+** Compatibility with 5.1 module functions
+** =======================================================
+*/
+#if defined(LUA_COMPAT_MODULE)
+
+static const char *luaL_findtable (lua_State *L, int idx,
+                                   const char *fname, int szhint) {
+  const char *e;
+  if (idx) lua_pushvalue(L, idx);
+  do {
+    e = strchr(fname, '.');
+    if (e == NULL) e = fname + strlen(fname);
+    lua_pushlstring(L, fname, e - fname);
+    if (lua_rawget(L, -2) == LUA_TNIL) {  /* no such field? */
+      lua_pop(L, 1);  /* remove this nil */
+      lua_createtable(L, 0, (*e == '.' ? 1 : szhint)); /* new table for field */
+      lua_pushlstring(L, fname, e - fname);
+      lua_pushvalue(L, -2);
+      lua_settable(L, -4);  /* set new table into field */
+    }
+    else if (!lua_istable(L, -1)) {  /* field has a non-table value? */
+      lua_pop(L, 2);  /* remove table and value */
+      return fname;  /* return problematic part of the name */
+    }
+    lua_remove(L, -2);  /* remove previous table */
+    fname = e + 1;
+  } while (*e == '.');
+  return NULL;
+}
+
+
+/*
+** Count number of elements in a luaL_Reg list.
+*/
+static int libsize (const luaL_Reg *l) {
+  int size = 0;
+  for (; l && l->name; l++) size++;
+  return size;
+}
+
+
+/*
+** Find or create a module table with a given name. The function
+** first looks at the LOADED table and, if that fails, try a
+** global variable with that name. In any case, leaves on the stack
+** the module table.
+*/
+LUALIB_API void luaL_pushmodule (lua_State *L, const char *modname,
+                                 int sizehint) {
+  luaL_findtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE, 1);
+  if (lua_getfield(L, -1, modname) != LUA_TTABLE) {  /* no LOADED[modname]? */
+    lua_pop(L, 1);  /* remove previous result */
+    /* try global variable (and create one if it does not exist) */
+    lua_pushglobaltable(L);
+    if (luaL_findtable(L, 0, modname, sizehint) != NULL)
+      luaL_error(L, "name conflict for module '%s'", modname);
+    lua_pushvalue(L, -1);
+    lua_setfield(L, -3, modname);  /* LOADED[modname] = new table */
+  }
+  lua_remove(L, -2);  /* remove LOADED table */
+}
+
+
+LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
+                               const luaL_Reg *l, int nup) {
+  luaL_checkversion(L);
+  if (libname) {
+    luaL_pushmodule(L, libname, libsize(l));  /* get/create library table */
+    lua_insert(L, -(nup + 1));  /* move library table to below upvalues */
+  }
+  if (l)
+    luaL_setfuncs(L, l, nup);
+  else
+    lua_pop(L, nup);  /* remove upvalues */
+}
+
+#endif
+/* }====================================================== */
+
+/*
+** set functions from list 'l' into table at top - 'nup'; each
+** function gets the 'nup' elements at the top as upvalues.
+** Returns with only the table at the stack.
+*/
+LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+  luaL_checkstack(L, nup, "too many upvalues");
+  for (; l->name != NULL; l++) {  /* fill the table with given functions */
+    int i;
+    for (i = 0; i < nup; i++)  /* copy upvalues to the top */
+      lua_pushvalue(L, -nup);
+    lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
+    lua_setfield(L, -(nup + 2), l->name);
+  }
+  lua_pop(L, nup);  /* remove upvalues */
+}
+
+
+/*
+** ensure that stack[idx][fname] has a table and push that table
+** into the stack
+*/
+LUALIB_API int luaL_getsubtable (lua_State *L, int idx, const char *fname) {
+  if (lua_getfield(L, idx, fname) == LUA_TTABLE)
+    return 1;  /* table already there */
+  else {
+    lua_pop(L, 1);  /* remove previous result */
+    idx = lua_absindex(L, idx);
+    lua_newtable(L);
+    lua_pushvalue(L, -1);  /* copy to be left at top */
+    lua_setfield(L, idx, fname);  /* assign new table to field */
+    return 0;  /* false, because did not find table there */
+  }
+}
+
+
+/*
+** Stripped-down 'require': After checking "loaded" table, calls 'openf'
+** to open a module, registers the result in 'package.loaded' table and,
+** if 'glb' is true, also registers the result in the global table.
+** Leaves resulting module on the top.
+*/
+LUALIB_API void luaL_requiref (lua_State *L, const char *modname,
+                               lua_CFunction openf, int glb) {
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, -1, modname);  /* LOADED[modname] */
+  if (!lua_toboolean(L, -1)) {  /* package not already loaded? */
+    lua_pop(L, 1);  /* remove field */
+    lua_pushcfunction(L, openf);
+    lua_pushstring(L, modname);  /* argument to open function */
+    lua_call(L, 1, 1);  /* call 'openf' to open module */
+    lua_pushvalue(L, -1);  /* make copy of module (call result) */
+    lua_setfield(L, -3, modname);  /* LOADED[modname] = module */
+  }
+  lua_remove(L, -2);  /* remove LOADED table */
+  if (glb) {
+    lua_pushvalue(L, -1);  /* copy of module */
+    lua_setglobal(L, modname);  /* _G[modname] = module */
+  }
+}
+
+
+LUALIB_API const char *luaL_gsub (lua_State *L, const char *s, const char *p,
+                                                               const char *r) {
+  const char *wild;
+  size_t l = strlen(p);
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  while ((wild = strstr(s, p)) != NULL) {
+    luaL_addlstring(&b, s, wild - s);  /* push prefix */
+    luaL_addstring(&b, r);  /* push replacement in place of pattern */
+    s = wild + l;  /* continue after 'p' */
+  }
+  luaL_addstring(&b, s);  /* push last suffix */
+  luaL_pushresult(&b);
+  return lua_tostring(L, -1);
+}
+
+
+static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
+  (void)ud; (void)osize;  /* not used */
+  if (nsize == 0) {
+    free(ptr);
+    return NULL;
+  }
+  else
+    return realloc(ptr, nsize);
+}
+
+
+static int panic (lua_State *L) {
+  lua_writestringerror("PANIC: unprotected error in call to Lua API (%s)\n",
+                        lua_tostring(L, -1));
+  return 0;  /* return to Lua to abort */
+}
+
+
+LUALIB_API lua_State *luaL_newstate (void) {
+  lua_State *L = lua_newstate(l_alloc, NULL);
+  if (L) lua_atpanic(L, &panic);
+  return L;
+}
+
+
+LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver, size_t sz) {
+  const lua_Number *v = lua_version(L);
+  if (sz != LUAL_NUMSIZES)  /* check numeric types */
+    luaL_error(L, "core and library have incompatible numeric types");
+  if (v != lua_version(NULL))
+    luaL_error(L, "multiple Lua VMs detected");
+  else if (*v != ver)
+    luaL_error(L, "version mismatch: app. needs %f, Lua core provides %f",
+                  (LUAI_UACNUMBER)ver, (LUAI_UACNUMBER)*v);
+}
+
diff --git a/scite-app/scite/lua/src/lauxlib.h b/scite-app/scite/lua/src/lauxlib.h
new file mode 100644
index 0000000..9a2e66a
--- /dev/null
+++ b/scite-app/scite/lua/src/lauxlib.h
@@ -0,0 +1,264 @@
+/*
+** $Id: lauxlib.h,v 1.131 2016/12/06 14:54:31 roberto Exp $
+** Auxiliary functions for building Lua libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lauxlib_h
+#define lauxlib_h
+
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include "lua.h"
+
+
+
+/* extra error code for 'luaL_loadfilex' */
+#define LUA_ERRFILE     (LUA_ERRERR+1)
+
+
+/* key, in the registry, for table of loaded modules */
+#define LUA_LOADED_TABLE	"_LOADED"
+
+
+/* key, in the registry, for table of preloaded loaders */
+#define LUA_PRELOAD_TABLE	"_PRELOAD"
+
+
+typedef struct luaL_Reg {
+  const char *name;
+  lua_CFunction func;
+} luaL_Reg;
+
+
+#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
+
+LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
+#define luaL_checkversion(L)  \
+	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
+
+LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
+LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
+LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
+LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
+LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
+                                                          size_t *l);
+LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
+                                          const char *def, size_t *l);
+LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
+LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
+
+LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
+LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
+                                          lua_Integer def);
+
+LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
+LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
+LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
+
+LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
+LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
+LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
+LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
+
+LUALIB_API void (luaL_where) (lua_State *L, int lvl);
+LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
+
+LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
+                                   const char *const lst[]);
+
+LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
+LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
+
+/* predefined references */
+#define LUA_NOREF       (-2)
+#define LUA_REFNIL      (-1)
+
+LUALIB_API int (luaL_ref) (lua_State *L, int t);
+LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
+
+LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
+                                               const char *mode);
+
+#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
+
+LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
+                                   const char *name, const char *mode);
+LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
+
+LUALIB_API lua_State *(luaL_newstate) (void);
+
+LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
+
+LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
+                                                  const char *r);
+
+LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
+
+LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
+
+LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
+                                  const char *msg, int level);
+
+LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
+                                 lua_CFunction openf, int glb);
+
+/*
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
+
+
+#define luaL_newlibtable(L,l)	\
+  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
+
+#define luaL_newlib(L,l)  \
+  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
+
+#define luaL_argcheck(L, cond,arg,extramsg)	\
+		((void)((cond) || luaL_argerror(L, (arg), (extramsg))))
+#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
+
+#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
+
+#define luaL_dofile(L, fn) \
+	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_dostring(L, s) \
+	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
+
+#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
+
+#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
+
+#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
+
+
+/*
+** {======================================================
+** Generic Buffer manipulation
+** =======================================================
+*/
+
+typedef struct luaL_Buffer {
+  char *b;  /* buffer address */
+  size_t size;  /* buffer size */
+  size_t n;  /* number of characters in buffer */
+  lua_State *L;
+  char initb[LUAL_BUFFERSIZE];  /* initial buffer */
+} luaL_Buffer;
+
+
+#define luaL_addchar(B,c) \
+  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
+   ((B)->b[(B)->n++] = (c)))
+
+#define luaL_addsize(B,s)	((B)->n += (s))
+
+LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
+LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
+LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
+LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
+LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
+LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
+
+#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** File handles for IO library
+** =======================================================
+*/
+
+/*
+** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
+** initial structure 'luaL_Stream' (it may contain other fields
+** after that initial structure).
+*/
+
+#define LUA_FILEHANDLE          "FILE*"
+
+
+typedef struct luaL_Stream {
+  FILE *f;  /* stream (NULL for incompletely created streams) */
+  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
+} luaL_Stream;
+
+/* }====================================================== */
+
+
+
+/* compatibility with old module system */
+#if defined(LUA_COMPAT_MODULE)
+
+LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
+                                   int sizehint);
+LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
+                                const luaL_Reg *l, int nup);
+
+#define luaL_register(L,n,l)	(luaL_openlib(L,(n),(l),0))
+
+#endif
+
+
+/*
+** {==================================================================
+** "Abstraction Layer" for basic report of messages and errors
+** ===================================================================
+*/
+
+/* print a string */
+#if !defined(lua_writestring)
+#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
+#endif
+
+/* print a newline and flush the output */
+#if !defined(lua_writeline)
+#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
+#endif
+
+/* print an error message */
+#if !defined(lua_writestringerror)
+#define lua_writestringerror(s,p) \
+        (fprintf(stderr, (s), (p)), fflush(stderr))
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {============================================================
+** Compatibility with deprecated conversions
+** =============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
+#define luaL_optunsigned(L,a,d)	\
+	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
+
+#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
+
+#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
+
+#endif
+/* }============================================================ */
+
+
+
+#endif
+
+
diff --git a/scite-app/scite/lua/src/lbaselib.c b/scite-app/scite/lua/src/lbaselib.c
new file mode 100644
index 0000000..08523e6
--- /dev/null
+++ b/scite-app/scite/lua/src/lbaselib.c
@@ -0,0 +1,498 @@
+/*
+** $Id: lbaselib.c,v 1.314 2016/09/05 19:06:34 roberto Exp $
+** Basic library
+** See Copyright Notice in lua.h
+*/
+
+#define lbaselib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static int luaB_print (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  lua_getglobal(L, "tostring");
+  for (i=1; i<=n; i++) {
+    const char *s;
+    size_t l;
+    lua_pushvalue(L, -1);  /* function to be called */
+    lua_pushvalue(L, i);   /* value to print */
+    lua_call(L, 1, 1);
+    s = lua_tolstring(L, -1, &l);  /* get result */
+    if (s == NULL)
+      return luaL_error(L, "'tostring' must return a string to 'print'");
+    if (i>1) lua_writestring("\t", 1);
+    lua_writestring(s, l);
+    lua_pop(L, 1);  /* pop result */
+  }
+  lua_writeline();
+  return 0;
+}
+
+
+#define SPACECHARS	" \f\n\r\t\v"
+
+static const char *b_str2int (const char *s, int base, lua_Integer *pn) {
+  lua_Unsigned n = 0;
+  int neg = 0;
+  s += strspn(s, SPACECHARS);  /* skip initial spaces */
+  if (*s == '-') { s++; neg = 1; }  /* handle signal */
+  else if (*s == '+') s++;
+  if (!isalnum((unsigned char)*s))  /* no digit? */
+    return NULL;
+  do {
+    int digit = (isdigit((unsigned char)*s)) ? *s - '0'
+                   : (toupper((unsigned char)*s) - 'A') + 10;
+    if (digit >= base) return NULL;  /* invalid numeral */
+    n = n * base + digit;
+    s++;
+  } while (isalnum((unsigned char)*s));
+  s += strspn(s, SPACECHARS);  /* skip trailing spaces */
+  *pn = (lua_Integer)((neg) ? (0u - n) : n);
+  return s;
+}
+
+
+static int luaB_tonumber (lua_State *L) {
+  if (lua_isnoneornil(L, 2)) {  /* standard conversion? */
+    luaL_checkany(L, 1);
+    if (lua_type(L, 1) == LUA_TNUMBER) {  /* already a number? */
+      lua_settop(L, 1);  /* yes; return it */
+      return 1;
+    }
+    else {
+      size_t l;
+      const char *s = lua_tolstring(L, 1, &l);
+      if (s != NULL && lua_stringtonumber(L, s) == l + 1)
+        return 1;  /* successful conversion to number */
+      /* else not a number */
+    }
+  }
+  else {
+    size_t l;
+    const char *s;
+    lua_Integer n = 0;  /* to avoid warnings */
+    lua_Integer base = luaL_checkinteger(L, 2);
+    luaL_checktype(L, 1, LUA_TSTRING);  /* no numbers as strings */
+    s = lua_tolstring(L, 1, &l);
+    luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
+    if (b_str2int(s, (int)base, &n) == s + l) {
+      lua_pushinteger(L, n);
+      return 1;
+    }  /* else not a number */
+  }  /* else not a number */
+  lua_pushnil(L);  /* not a number */
+  return 1;
+}
+
+
+static int luaB_error (lua_State *L) {
+  int level = (int)luaL_optinteger(L, 2, 1);
+  lua_settop(L, 1);
+  if (lua_type(L, 1) == LUA_TSTRING && level > 0) {
+    luaL_where(L, level);   /* add extra information */
+    lua_pushvalue(L, 1);
+    lua_concat(L, 2);
+  }
+  return lua_error(L);
+}
+
+
+static int luaB_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);
+    return 1;  /* no metatable */
+  }
+  luaL_getmetafield(L, 1, "__metatable");
+  return 1;  /* returns either __metatable field (if present) or metatable */
+}
+
+
+static int luaB_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                    "nil or table expected");
+  if (luaL_getmetafield(L, 1, "__metatable") != LUA_TNIL)
+    return luaL_error(L, "cannot change a protected metatable");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;
+}
+
+
+static int luaB_rawequal (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_checkany(L, 2);
+  lua_pushboolean(L, lua_rawequal(L, 1, 2));
+  return 1;
+}
+
+
+static int luaB_rawlen (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argcheck(L, t == LUA_TTABLE || t == LUA_TSTRING, 1,
+                   "table or string expected");
+  lua_pushinteger(L, lua_rawlen(L, 1));
+  return 1;
+}
+
+
+static int luaB_rawget (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  lua_rawget(L, 1);
+  return 1;
+}
+
+static int luaB_rawset (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  luaL_checkany(L, 2);
+  luaL_checkany(L, 3);
+  lua_settop(L, 3);
+  lua_rawset(L, 1);
+  return 1;
+}
+
+
+static int luaB_collectgarbage (lua_State *L) {
+  static const char *const opts[] = {"stop", "restart", "collect",
+    "count", "step", "setpause", "setstepmul",
+    "isrunning", NULL};
+  static const int optsnum[] = {LUA_GCSTOP, LUA_GCRESTART, LUA_GCCOLLECT,
+    LUA_GCCOUNT, LUA_GCSTEP, LUA_GCSETPAUSE, LUA_GCSETSTEPMUL,
+    LUA_GCISRUNNING};
+  int o = optsnum[luaL_checkoption(L, 1, "collect", opts)];
+  int ex = (int)luaL_optinteger(L, 2, 0);
+  int res = lua_gc(L, o, ex);
+  switch (o) {
+    case LUA_GCCOUNT: {
+      int b = lua_gc(L, LUA_GCCOUNTB, 0);
+      lua_pushnumber(L, (lua_Number)res + ((lua_Number)b/1024));
+      return 1;
+    }
+    case LUA_GCSTEP: case LUA_GCISRUNNING: {
+      lua_pushboolean(L, res);
+      return 1;
+    }
+    default: {
+      lua_pushinteger(L, res);
+      return 1;
+    }
+  }
+}
+
+
+static int luaB_type (lua_State *L) {
+  int t = lua_type(L, 1);
+  luaL_argcheck(L, t != LUA_TNONE, 1, "value expected");
+  lua_pushstring(L, lua_typename(L, t));
+  return 1;
+}
+
+
+static int pairsmeta (lua_State *L, const char *method, int iszero,
+                      lua_CFunction iter) {
+  luaL_checkany(L, 1);
+  if (luaL_getmetafield(L, 1, method) == LUA_TNIL) {  /* no metamethod? */
+    lua_pushcfunction(L, iter);  /* will return generator, */
+    lua_pushvalue(L, 1);  /* state, */
+    if (iszero) lua_pushinteger(L, 0);  /* and initial value */
+    else lua_pushnil(L);
+  }
+  else {
+    lua_pushvalue(L, 1);  /* argument 'self' to metamethod */
+    lua_call(L, 1, 3);  /* get 3 values from metamethod */
+  }
+  return 3;
+}
+
+
+static int luaB_next (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_settop(L, 2);  /* create a 2nd argument if there isn't one */
+  if (lua_next(L, 1))
+    return 2;
+  else {
+    lua_pushnil(L);
+    return 1;
+  }
+}
+
+
+static int luaB_pairs (lua_State *L) {
+  return pairsmeta(L, "__pairs", 0, luaB_next);
+}
+
+
+/*
+** Traversal function for 'ipairs'
+*/
+static int ipairsaux (lua_State *L) {
+  lua_Integer i = luaL_checkinteger(L, 2) + 1;
+  lua_pushinteger(L, i);
+  return (lua_geti(L, 1, i) == LUA_TNIL) ? 1 : 2;
+}
+
+
+/*
+** 'ipairs' function. Returns 'ipairsaux', given "table", 0.
+** (The given "table" may not be a table.)
+*/
+static int luaB_ipairs (lua_State *L) {
+#if defined(LUA_COMPAT_IPAIRS)
+  return pairsmeta(L, "__ipairs", 1, ipairsaux);
+#else
+  luaL_checkany(L, 1);
+  lua_pushcfunction(L, ipairsaux);  /* iteration function */
+  lua_pushvalue(L, 1);  /* state */
+  lua_pushinteger(L, 0);  /* initial value */
+  return 3;
+#endif
+}
+
+
+static int load_aux (lua_State *L, int status, int envidx) {
+  if (status == LUA_OK) {
+    if (envidx != 0) {  /* 'env' parameter? */
+      lua_pushvalue(L, envidx);  /* environment for loaded function */
+      if (!lua_setupvalue(L, -2, 1))  /* set it as 1st upvalue */
+        lua_pop(L, 1);  /* remove 'env' if not used by previous call */
+    }
+    return 1;
+  }
+  else {  /* error (message is on top of the stack) */
+    lua_pushnil(L);
+    lua_insert(L, -2);  /* put before error message */
+    return 2;  /* return nil plus error message */
+  }
+}
+
+
+static int luaB_loadfile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  const char *mode = luaL_optstring(L, 2, NULL);
+  int env = (!lua_isnone(L, 3) ? 3 : 0);  /* 'env' index or 0 if no 'env' */
+  int status = luaL_loadfilex(L, fname, mode);
+  return load_aux(L, status, env);
+}
+
+
+/*
+** {======================================================
+** Generic Read function
+** =======================================================
+*/
+
+
+/*
+** reserved slot, above all arguments, to hold a copy of the returned
+** string to avoid it being collected while parsed. 'load' has four
+** optional arguments (chunk, source name, mode, and environment).
+*/
+#define RESERVEDSLOT	5
+
+
+/*
+** Reader for generic 'load' function: 'lua_load' uses the
+** stack for internal stuff, so the reader cannot change the
+** stack top. Instead, it keeps its resulting string in a
+** reserved slot inside the stack.
+*/
+static const char *generic_reader (lua_State *L, void *ud, size_t *size) {
+  (void)(ud);  /* not used */
+  luaL_checkstack(L, 2, "too many nested functions");
+  lua_pushvalue(L, 1);  /* get function */
+  lua_call(L, 0, 1);  /* call it */
+  if (lua_isnil(L, -1)) {
+    lua_pop(L, 1);  /* pop result */
+    *size = 0;
+    return NULL;
+  }
+  else if (!lua_isstring(L, -1))
+    luaL_error(L, "reader function must return a string");
+  lua_replace(L, RESERVEDSLOT);  /* save string in reserved slot */
+  return lua_tolstring(L, RESERVEDSLOT, size);
+}
+
+
+static int luaB_load (lua_State *L) {
+  int status;
+  size_t l;
+  const char *s = lua_tolstring(L, 1, &l);
+  const char *mode = luaL_optstring(L, 3, "bt");
+  int env = (!lua_isnone(L, 4) ? 4 : 0);  /* 'env' index or 0 if no 'env' */
+  if (s != NULL) {  /* loading a string? */
+    const char *chunkname = luaL_optstring(L, 2, s);
+    status = luaL_loadbufferx(L, s, l, chunkname, mode);
+  }
+  else {  /* loading from a reader function */
+    const char *chunkname = luaL_optstring(L, 2, "=(load)");
+    luaL_checktype(L, 1, LUA_TFUNCTION);
+    lua_settop(L, RESERVEDSLOT);  /* create reserved slot */
+    status = lua_load(L, generic_reader, NULL, chunkname, mode);
+  }
+  return load_aux(L, status, env);
+}
+
+/* }====================================================== */
+
+
+static int dofilecont (lua_State *L, int d1, lua_KContext d2) {
+  (void)d1;  (void)d2;  /* only to match 'lua_Kfunction' prototype */
+  return lua_gettop(L) - 1;
+}
+
+
+static int luaB_dofile (lua_State *L) {
+  const char *fname = luaL_optstring(L, 1, NULL);
+  lua_settop(L, 1);
+  if (luaL_loadfile(L, fname) != LUA_OK)
+    return lua_error(L);
+  lua_callk(L, 0, LUA_MULTRET, 0, dofilecont);
+  return dofilecont(L, 0, 0);
+}
+
+
+static int luaB_assert (lua_State *L) {
+  if (lua_toboolean(L, 1))  /* condition is true? */
+    return lua_gettop(L);  /* return all arguments */
+  else {  /* error */
+    luaL_checkany(L, 1);  /* there must be a condition */
+    lua_remove(L, 1);  /* remove it */
+    lua_pushliteral(L, "assertion failed!");  /* default message */
+    lua_settop(L, 1);  /* leave only message (default if no other one) */
+    return luaB_error(L);  /* call 'error' */
+  }
+}
+
+
+static int luaB_select (lua_State *L) {
+  int n = lua_gettop(L);
+  if (lua_type(L, 1) == LUA_TSTRING && *lua_tostring(L, 1) == '#') {
+    lua_pushinteger(L, n-1);
+    return 1;
+  }
+  else {
+    lua_Integer i = luaL_checkinteger(L, 1);
+    if (i < 0) i = n + i;
+    else if (i > n) i = n;
+    luaL_argcheck(L, 1 <= i, 1, "index out of range");
+    return n - (int)i;
+  }
+}
+
+
+/*
+** Continuation function for 'pcall' and 'xpcall'. Both functions
+** already pushed a 'true' before doing the call, so in case of success
+** 'finishpcall' only has to return everything in the stack minus
+** 'extra' values (where 'extra' is exactly the number of items to be
+** ignored).
+*/
+static int finishpcall (lua_State *L, int status, lua_KContext extra) {
+  if (status != LUA_OK && status != LUA_YIELD) {  /* error? */
+    lua_pushboolean(L, 0);  /* first result (false) */
+    lua_pushvalue(L, -2);  /* error message */
+    return 2;  /* return false, msg */
+  }
+  else
+    return lua_gettop(L) - (int)extra;  /* return all results */
+}
+
+
+static int luaB_pcall (lua_State *L) {
+  int status;
+  luaL_checkany(L, 1);
+  lua_pushboolean(L, 1);  /* first result if no errors */
+  lua_insert(L, 1);  /* put it in place */
+  status = lua_pcallk(L, lua_gettop(L) - 2, LUA_MULTRET, 0, 0, finishpcall);
+  return finishpcall(L, status, 0);
+}
+
+
+/*
+** Do a protected call with error handling. After 'lua_rotate', the
+** stack will have <f, err, true, f, [args...]>; so, the function passes
+** 2 to 'finishpcall' to skip the 2 first values when returning results.
+*/
+static int luaB_xpcall (lua_State *L) {
+  int status;
+  int n = lua_gettop(L);
+  luaL_checktype(L, 2, LUA_TFUNCTION);  /* check error function */
+  lua_pushboolean(L, 1);  /* first result */
+  lua_pushvalue(L, 1);  /* function */
+  lua_rotate(L, 3, 2);  /* move them below function's arguments */
+  status = lua_pcallk(L, n - 2, LUA_MULTRET, 2, 2, finishpcall);
+  return finishpcall(L, status, 2);
+}
+
+
+static int luaB_tostring (lua_State *L) {
+  luaL_checkany(L, 1);
+  luaL_tolstring(L, 1, NULL);
+  return 1;
+}
+
+
+static const luaL_Reg base_funcs[] = {
+  {"assert", luaB_assert},
+  {"collectgarbage", luaB_collectgarbage},
+  {"dofile", luaB_dofile},
+  {"error", luaB_error},
+  {"getmetatable", luaB_getmetatable},
+  {"ipairs", luaB_ipairs},
+  {"loadfile", luaB_loadfile},
+  {"load", luaB_load},
+#if defined(LUA_COMPAT_LOADSTRING)
+  {"loadstring", luaB_load},
+#endif
+  {"next", luaB_next},
+  {"pairs", luaB_pairs},
+  {"pcall", luaB_pcall},
+  {"print", luaB_print},
+  {"rawequal", luaB_rawequal},
+  {"rawlen", luaB_rawlen},
+  {"rawget", luaB_rawget},
+  {"rawset", luaB_rawset},
+  {"select", luaB_select},
+  {"setmetatable", luaB_setmetatable},
+  {"tonumber", luaB_tonumber},
+  {"tostring", luaB_tostring},
+  {"type", luaB_type},
+  {"xpcall", luaB_xpcall},
+  /* placeholders */
+  {"_G", NULL},
+  {"_VERSION", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_base (lua_State *L) {
+  /* open lib into global table */
+  lua_pushglobaltable(L);
+  luaL_setfuncs(L, base_funcs, 0);
+  /* set global _G */
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -2, "_G");
+  /* set global _VERSION */
+  lua_pushliteral(L, LUA_VERSION);
+  lua_setfield(L, -2, "_VERSION");
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/lbitlib.c b/scite-app/scite/lua/src/lbitlib.c
new file mode 100644
index 0000000..1cb1d5b
--- /dev/null
+++ b/scite-app/scite/lua/src/lbitlib.c
@@ -0,0 +1,233 @@
+/*
+** $Id: lbitlib.c,v 1.30 2015/11/11 19:08:09 roberto Exp $
+** Standard library for bitwise operations
+** See Copyright Notice in lua.h
+*/
+
+#define lbitlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#if defined(LUA_COMPAT_BITLIB)		/* { */
+
+
+#define pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
+#define checkunsigned(L,i)	((lua_Unsigned)luaL_checkinteger(L,i))
+
+
+/* number of bits to consider in a number */
+#if !defined(LUA_NBITS)
+#define LUA_NBITS	32
+#endif
+
+
+/*
+** a lua_Unsigned with its first LUA_NBITS bits equal to 1. (Shift must
+** be made in two parts to avoid problems when LUA_NBITS is equal to the
+** number of bits in a lua_Unsigned.)
+*/
+#define ALLONES		(~(((~(lua_Unsigned)0) << (LUA_NBITS - 1)) << 1))
+
+
+/* macro to trim extra bits */
+#define trim(x)		((x) & ALLONES)
+
+
+/* builds a number with 'n' ones (1 <= n <= LUA_NBITS) */
+#define mask(n)		(~((ALLONES << 1) << ((n) - 1)))
+
+
+
+static lua_Unsigned andaux (lua_State *L) {
+  int i, n = lua_gettop(L);
+  lua_Unsigned r = ~(lua_Unsigned)0;
+  for (i = 1; i <= n; i++)
+    r &= checkunsigned(L, i);
+  return trim(r);
+}
+
+
+static int b_and (lua_State *L) {
+  lua_Unsigned r = andaux(L);
+  pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_test (lua_State *L) {
+  lua_Unsigned r = andaux(L);
+  lua_pushboolean(L, r != 0);
+  return 1;
+}
+
+
+static int b_or (lua_State *L) {
+  int i, n = lua_gettop(L);
+  lua_Unsigned r = 0;
+  for (i = 1; i <= n; i++)
+    r |= checkunsigned(L, i);
+  pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_xor (lua_State *L) {
+  int i, n = lua_gettop(L);
+  lua_Unsigned r = 0;
+  for (i = 1; i <= n; i++)
+    r ^= checkunsigned(L, i);
+  pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_not (lua_State *L) {
+  lua_Unsigned r = ~checkunsigned(L, 1);
+  pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_shift (lua_State *L, lua_Unsigned r, lua_Integer i) {
+  if (i < 0) {  /* shift right? */
+    i = -i;
+    r = trim(r);
+    if (i >= LUA_NBITS) r = 0;
+    else r >>= i;
+  }
+  else {  /* shift left */
+    if (i >= LUA_NBITS) r = 0;
+    else r <<= i;
+    r = trim(r);
+  }
+  pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_lshift (lua_State *L) {
+  return b_shift(L, checkunsigned(L, 1), luaL_checkinteger(L, 2));
+}
+
+
+static int b_rshift (lua_State *L) {
+  return b_shift(L, checkunsigned(L, 1), -luaL_checkinteger(L, 2));
+}
+
+
+static int b_arshift (lua_State *L) {
+  lua_Unsigned r = checkunsigned(L, 1);
+  lua_Integer i = luaL_checkinteger(L, 2);
+  if (i < 0 || !(r & ((lua_Unsigned)1 << (LUA_NBITS - 1))))
+    return b_shift(L, r, -i);
+  else {  /* arithmetic shift for 'negative' number */
+    if (i >= LUA_NBITS) r = ALLONES;
+    else
+      r = trim((r >> i) | ~(trim(~(lua_Unsigned)0) >> i));  /* add signal bit */
+    pushunsigned(L, r);
+    return 1;
+  }
+}
+
+
+static int b_rot (lua_State *L, lua_Integer d) {
+  lua_Unsigned r = checkunsigned(L, 1);
+  int i = d & (LUA_NBITS - 1);  /* i = d % NBITS */
+  r = trim(r);
+  if (i != 0)  /* avoid undefined shift of LUA_NBITS when i == 0 */
+    r = (r << i) | (r >> (LUA_NBITS - i));
+  pushunsigned(L, trim(r));
+  return 1;
+}
+
+
+static int b_lrot (lua_State *L) {
+  return b_rot(L, luaL_checkinteger(L, 2));
+}
+
+
+static int b_rrot (lua_State *L) {
+  return b_rot(L, -luaL_checkinteger(L, 2));
+}
+
+
+/*
+** get field and width arguments for field-manipulation functions,
+** checking whether they are valid.
+** ('luaL_error' called without 'return' to avoid later warnings about
+** 'width' being used uninitialized.)
+*/
+static int fieldargs (lua_State *L, int farg, int *width) {
+  lua_Integer f = luaL_checkinteger(L, farg);
+  lua_Integer w = luaL_optinteger(L, farg + 1, 1);
+  luaL_argcheck(L, 0 <= f, farg, "field cannot be negative");
+  luaL_argcheck(L, 0 < w, farg + 1, "width must be positive");
+  if (f + w > LUA_NBITS)
+    luaL_error(L, "trying to access non-existent bits");
+  *width = (int)w;
+  return (int)f;
+}
+
+
+static int b_extract (lua_State *L) {
+  int w;
+  lua_Unsigned r = trim(checkunsigned(L, 1));
+  int f = fieldargs(L, 2, &w);
+  r = (r >> f) & mask(w);
+  pushunsigned(L, r);
+  return 1;
+}
+
+
+static int b_replace (lua_State *L) {
+  int w;
+  lua_Unsigned r = trim(checkunsigned(L, 1));
+  lua_Unsigned v = trim(checkunsigned(L, 2));
+  int f = fieldargs(L, 3, &w);
+  lua_Unsigned m = mask(w);
+  r = (r & ~(m << f)) | ((v & m) << f);
+  pushunsigned(L, r);
+  return 1;
+}
+
+
+static const luaL_Reg bitlib[] = {
+  {"arshift", b_arshift},
+  {"band", b_and},
+  {"bnot", b_not},
+  {"bor", b_or},
+  {"bxor", b_xor},
+  {"btest", b_test},
+  {"extract", b_extract},
+  {"lrotate", b_lrot},
+  {"lshift", b_lshift},
+  {"replace", b_replace},
+  {"rrotate", b_rrot},
+  {"rshift", b_rshift},
+  {NULL, NULL}
+};
+
+
+
+LUAMOD_API int luaopen_bit32 (lua_State *L) {
+  luaL_newlib(L, bitlib);
+  return 1;
+}
+
+
+#else					/* }{ */
+
+
+LUAMOD_API int luaopen_bit32 (lua_State *L) {
+  return luaL_error(L, "library 'bit32' has been deprecated");
+}
+
+#endif					/* } */
diff --git a/scite-app/scite/lua/src/lcode.c b/scite-app/scite/lua/src/lcode.c
new file mode 100644
index 0000000..0bb4142
--- /dev/null
+++ b/scite-app/scite/lua/src/lcode.c
@@ -0,0 +1,1203 @@
+/*
+** $Id: lcode.c,v 2.112 2016/12/22 13:08:50 roberto Exp $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lcode_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/* Maximum number of registers in a Lua function (must fit in 8 bits) */
+#define MAXREGS		255
+
+
+#define hasjumps(e)	((e)->t != (e)->f)
+
+
+/*
+** If expression is a numeric constant, fills 'v' with its value
+** and returns 1. Otherwise, returns 0.
+*/
+static int tonumeral(const expdesc *e, TValue *v) {
+  if (hasjumps(e))
+    return 0;  /* not a numeral */
+  switch (e->k) {
+    case VKINT:
+      if (v) setivalue(v, e->u.ival);
+      return 1;
+    case VKFLT:
+      if (v) setfltvalue(v, e->u.nval);
+      return 1;
+    default: return 0;
+  }
+}
+
+
+/*
+** Create a OP_LOADNIL instruction, but try to optimize: if the previous
+** instruction is also OP_LOADNIL and ranges are compatible, adjust
+** range of previous instruction instead of emitting a new one. (For
+** instance, 'local a; local b' will generate a single opcode.)
+*/
+void luaK_nil (FuncState *fs, int from, int n) {
+  Instruction *previous;
+  int l = from + n - 1;  /* last register to set nil */
+  if (fs->pc > fs->lasttarget) {  /* no jumps to current position? */
+    previous = &fs->f->code[fs->pc-1];
+    if (GET_OPCODE(*previous) == OP_LOADNIL) {  /* previous is LOADNIL? */
+      int pfrom = GETARG_A(*previous);  /* get previous range */
+      int pl = pfrom + GETARG_B(*previous);
+      if ((pfrom <= from && from <= pl + 1) ||
+          (from <= pfrom && pfrom <= l + 1)) {  /* can connect both? */
+        if (pfrom < from) from = pfrom;  /* from = min(from, pfrom) */
+        if (pl > l) l = pl;  /* l = max(l, pl) */
+        SETARG_A(*previous, from);
+        SETARG_B(*previous, l - from);
+        return;
+      }
+    }  /* else go through */
+  }
+  luaK_codeABC(fs, OP_LOADNIL, from, n - 1, 0);  /* else no optimization */
+}
+
+
+/*
+** Gets the destination address of a jump instruction. Used to traverse
+** a list of jumps.
+*/
+static int getjump (FuncState *fs, int pc) {
+  int offset = GETARG_sBx(fs->f->code[pc]);
+  if (offset == NO_JUMP)  /* point to itself represents end of list */
+    return NO_JUMP;  /* end of list */
+  else
+    return (pc+1)+offset;  /* turn offset into absolute position */
+}
+
+
+/*
+** Fix jump instruction at position 'pc' to jump to 'dest'.
+** (Jump addresses are relative in Lua)
+*/
+static void fixjump (FuncState *fs, int pc, int dest) {
+  Instruction *jmp = &fs->f->code[pc];
+  int offset = dest - (pc + 1);
+  lua_assert(dest != NO_JUMP);
+  if (abs(offset) > MAXARG_sBx)
+    luaX_syntaxerror(fs->ls, "control structure too long");
+  SETARG_sBx(*jmp, offset);
+}
+
+
+/*
+** Concatenate jump-list 'l2' into jump-list 'l1'
+*/
+void luaK_concat (FuncState *fs, int *l1, int l2) {
+  if (l2 == NO_JUMP) return;  /* nothing to concatenate? */
+  else if (*l1 == NO_JUMP)  /* no original list? */
+    *l1 = l2;  /* 'l1' points to 'l2' */
+  else {
+    int list = *l1;
+    int next;
+    while ((next = getjump(fs, list)) != NO_JUMP)  /* find last element */
+      list = next;
+    fixjump(fs, list, l2);  /* last element links to 'l2' */
+  }
+}
+
+
+/*
+** Create a jump instruction and return its position, so its destination
+** can be fixed later (with 'fixjump'). If there are jumps to
+** this position (kept in 'jpc'), link them all together so that
+** 'patchlistaux' will fix all them directly to the final destination.
+*/
+int luaK_jump (FuncState *fs) {
+  int jpc = fs->jpc;  /* save list of jumps to here */
+  int j;
+  fs->jpc = NO_JUMP;  /* no more jumps to here */
+  j = luaK_codeAsBx(fs, OP_JMP, 0, NO_JUMP);
+  luaK_concat(fs, &j, jpc);  /* keep them on hold */
+  return j;
+}
+
+
+/*
+** Code a 'return' instruction
+*/
+void luaK_ret (FuncState *fs, int first, int nret) {
+  luaK_codeABC(fs, OP_RETURN, first, nret+1, 0);
+}
+
+
+/*
+** Code a "conditional jump", that is, a test or comparison opcode
+** followed by a jump. Return jump position.
+*/
+static int condjump (FuncState *fs, OpCode op, int A, int B, int C) {
+  luaK_codeABC(fs, op, A, B, C);
+  return luaK_jump(fs);
+}
+
+
+/*
+** returns current 'pc' and marks it as a jump target (to avoid wrong
+** optimizations with consecutive instructions not in the same basic block).
+*/
+int luaK_getlabel (FuncState *fs) {
+  fs->lasttarget = fs->pc;
+  return fs->pc;
+}
+
+
+/*
+** Returns the position of the instruction "controlling" a given
+** jump (that is, its condition), or the jump itself if it is
+** unconditional.
+*/
+static Instruction *getjumpcontrol (FuncState *fs, int pc) {
+  Instruction *pi = &fs->f->code[pc];
+  if (pc >= 1 && testTMode(GET_OPCODE(*(pi-1))))
+    return pi-1;
+  else
+    return pi;
+}
+
+
+/*
+** Patch destination register for a TESTSET instruction.
+** If instruction in position 'node' is not a TESTSET, return 0 ("fails").
+** Otherwise, if 'reg' is not 'NO_REG', set it as the destination
+** register. Otherwise, change instruction to a simple 'TEST' (produces
+** no register value)
+*/
+static int patchtestreg (FuncState *fs, int node, int reg) {
+  Instruction *i = getjumpcontrol(fs, node);
+  if (GET_OPCODE(*i) != OP_TESTSET)
+    return 0;  /* cannot patch other instructions */
+  if (reg != NO_REG && reg != GETARG_B(*i))
+    SETARG_A(*i, reg);
+  else {
+     /* no register to put value or register already has the value;
+        change instruction to simple test */
+    *i = CREATE_ABC(OP_TEST, GETARG_B(*i), 0, GETARG_C(*i));
+  }
+  return 1;
+}
+
+
+/*
+** Traverse a list of tests ensuring no one produces a value
+*/
+static void removevalues (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list))
+      patchtestreg(fs, list, NO_REG);
+}
+
+
+/*
+** Traverse a list of tests, patching their destination address and
+** registers: tests producing values jump to 'vtarget' (and put their
+** values in 'reg'), other tests jump to 'dtarget'.
+*/
+static void patchlistaux (FuncState *fs, int list, int vtarget, int reg,
+                          int dtarget) {
+  while (list != NO_JUMP) {
+    int next = getjump(fs, list);
+    if (patchtestreg(fs, list, reg))
+      fixjump(fs, list, vtarget);
+    else
+      fixjump(fs, list, dtarget);  /* jump to default target */
+    list = next;
+  }
+}
+
+
+/*
+** Ensure all pending jumps to current position are fixed (jumping
+** to current position with no values) and reset list of pending
+** jumps
+*/
+static void dischargejpc (FuncState *fs) {
+  patchlistaux(fs, fs->jpc, fs->pc, NO_REG, fs->pc);
+  fs->jpc = NO_JUMP;
+}
+
+
+/*
+** Add elements in 'list' to list of pending jumps to "here"
+** (current position)
+*/
+void luaK_patchtohere (FuncState *fs, int list) {
+  luaK_getlabel(fs);  /* mark "here" as a jump target */
+  luaK_concat(fs, &fs->jpc, list);
+}
+
+
+/*
+** Path all jumps in 'list' to jump to 'target'.
+** (The assert means that we cannot fix a jump to a forward address
+** because we only know addresses once code is generated.)
+*/
+void luaK_patchlist (FuncState *fs, int list, int target) {
+  if (target == fs->pc)  /* 'target' is current position? */
+    luaK_patchtohere(fs, list);  /* add list to pending jumps */
+  else {
+    lua_assert(target < fs->pc);
+    patchlistaux(fs, list, target, NO_REG, target);
+  }
+}
+
+
+/*
+** Path all jumps in 'list' to close upvalues up to given 'level'
+** (The assertion checks that jumps either were closing nothing
+** or were closing higher levels, from inner blocks.)
+*/
+void luaK_patchclose (FuncState *fs, int list, int level) {
+  level++;  /* argument is +1 to reserve 0 as non-op */
+  for (; list != NO_JUMP; list = getjump(fs, list)) {
+    lua_assert(GET_OPCODE(fs->f->code[list]) == OP_JMP &&
+                (GETARG_A(fs->f->code[list]) == 0 ||
+                 GETARG_A(fs->f->code[list]) >= level));
+    SETARG_A(fs->f->code[list], level);
+  }
+}
+
+
+/*
+** Emit instruction 'i', checking for array sizes and saving also its
+** line information. Return 'i' position.
+*/
+static int luaK_code (FuncState *fs, Instruction i) {
+  Proto *f = fs->f;
+  dischargejpc(fs);  /* 'pc' will change */
+  /* put new instruction in code array */
+  luaM_growvector(fs->ls->L, f->code, fs->pc, f->sizecode, Instruction,
+                  MAX_INT, "opcodes");
+  f->code[fs->pc] = i;
+  /* save corresponding line information */
+  luaM_growvector(fs->ls->L, f->lineinfo, fs->pc, f->sizelineinfo, int,
+                  MAX_INT, "opcodes");
+  f->lineinfo[fs->pc] = fs->ls->lastline;
+  return fs->pc++;
+}
+
+
+/*
+** Format and emit an 'iABC' instruction. (Assertions check consistency
+** of parameters versus opcode.)
+*/
+int luaK_codeABC (FuncState *fs, OpCode o, int a, int b, int c) {
+  lua_assert(getOpMode(o) == iABC);
+  lua_assert(getBMode(o) != OpArgN || b == 0);
+  lua_assert(getCMode(o) != OpArgN || c == 0);
+  lua_assert(a <= MAXARG_A && b <= MAXARG_B && c <= MAXARG_C);
+  return luaK_code(fs, CREATE_ABC(o, a, b, c));
+}
+
+
+/*
+** Format and emit an 'iABx' instruction.
+*/
+int luaK_codeABx (FuncState *fs, OpCode o, int a, unsigned int bc) {
+  lua_assert(getOpMode(o) == iABx || getOpMode(o) == iAsBx);
+  lua_assert(getCMode(o) == OpArgN);
+  lua_assert(a <= MAXARG_A && bc <= MAXARG_Bx);
+  return luaK_code(fs, CREATE_ABx(o, a, bc));
+}
+
+
+/*
+** Emit an "extra argument" instruction (format 'iAx')
+*/
+static int codeextraarg (FuncState *fs, int a) {
+  lua_assert(a <= MAXARG_Ax);
+  return luaK_code(fs, CREATE_Ax(OP_EXTRAARG, a));
+}
+
+
+/*
+** Emit a "load constant" instruction, using either 'OP_LOADK'
+** (if constant index 'k' fits in 18 bits) or an 'OP_LOADKX'
+** instruction with "extra argument".
+*/
+int luaK_codek (FuncState *fs, int reg, int k) {
+  if (k <= MAXARG_Bx)
+    return luaK_codeABx(fs, OP_LOADK, reg, k);
+  else {
+    int p = luaK_codeABx(fs, OP_LOADKX, reg, 0);
+    codeextraarg(fs, k);
+    return p;
+  }
+}
+
+
+/*
+** Check register-stack level, keeping track of its maximum size
+** in field 'maxstacksize'
+*/
+void luaK_checkstack (FuncState *fs, int n) {
+  int newstack = fs->freereg + n;
+  if (newstack > fs->f->maxstacksize) {
+    if (newstack >= MAXREGS)
+      luaX_syntaxerror(fs->ls,
+        "function or expression needs too many registers");
+    fs->f->maxstacksize = cast_byte(newstack);
+  }
+}
+
+
+/*
+** Reserve 'n' registers in register stack
+*/
+void luaK_reserveregs (FuncState *fs, int n) {
+  luaK_checkstack(fs, n);
+  fs->freereg += n;
+}
+
+
+/*
+** Free register 'reg', if it is neither a constant index nor
+** a local variable.
+)
+*/
+static void freereg (FuncState *fs, int reg) {
+  if (!ISK(reg) && reg >= fs->nactvar) {
+    fs->freereg--;
+    lua_assert(reg == fs->freereg);
+  }
+}
+
+
+/*
+** Free register used by expression 'e' (if any)
+*/
+static void freeexp (FuncState *fs, expdesc *e) {
+  if (e->k == VNONRELOC)
+    freereg(fs, e->u.info);
+}
+
+
+/*
+** Free registers used by expressions 'e1' and 'e2' (if any) in proper
+** order.
+*/
+static void freeexps (FuncState *fs, expdesc *e1, expdesc *e2) {
+  int r1 = (e1->k == VNONRELOC) ? e1->u.info : -1;
+  int r2 = (e2->k == VNONRELOC) ? e2->u.info : -1;
+  if (r1 > r2) {
+    freereg(fs, r1);
+    freereg(fs, r2);
+  }
+  else {
+    freereg(fs, r2);
+    freereg(fs, r1);
+  }
+}
+
+
+/*
+** Add constant 'v' to prototype's list of constants (field 'k').
+** Use scanner's table to cache position of constants in constant list
+** and try to reuse constants. Because some values should not be used
+** as keys (nil cannot be a key, integer keys can collapse with float
+** keys), the caller must provide a useful 'key' for indexing the cache.
+*/
+static int addk (FuncState *fs, TValue *key, TValue *v) {
+  lua_State *L = fs->ls->L;
+  Proto *f = fs->f;
+  TValue *idx = luaH_set(L, fs->ls->h, key);  /* index scanner table */
+  int k, oldsize;
+  if (ttisinteger(idx)) {  /* is there an index there? */
+    k = cast_int(ivalue(idx));
+    /* correct value? (warning: must distinguish floats from integers!) */
+    if (k < fs->nk && ttype(&f->k[k]) == ttype(v) &&
+                      luaV_rawequalobj(&f->k[k], v))
+      return k;  /* reuse index */
+  }
+  /* constant not found; create a new entry */
+  oldsize = f->sizek;
+  k = fs->nk;
+  /* numerical value does not need GC barrier;
+     table has no metatable, so it does not need to invalidate cache */
+  setivalue(idx, k);
+  luaM_growvector(L, f->k, k, f->sizek, TValue, MAXARG_Ax, "constants");
+  while (oldsize < f->sizek) setnilvalue(&f->k[oldsize++]);
+  setobj(L, &f->k[k], v);
+  fs->nk++;
+  luaC_barrier(L, f, v);
+  return k;
+}
+
+
+/*
+** Add a string to list of constants and return its index.
+*/
+int luaK_stringK (FuncState *fs, TString *s) {
+  TValue o;
+  setsvalue(fs->ls->L, &o, s);
+  return addk(fs, &o, &o);  /* use string itself as key */
+}
+
+
+/*
+** Add an integer to list of constants and return its index.
+** Integers use userdata as keys to avoid collision with floats with
+** same value; conversion to 'void*' is used only for hashing, so there
+** are no "precision" problems.
+*/
+int luaK_intK (FuncState *fs, lua_Integer n) {
+  TValue k, o;
+  setpvalue(&k, cast(void*, cast(size_t, n)));
+  setivalue(&o, n);
+  return addk(fs, &k, &o);
+}
+
+/*
+** Add a float to list of constants and return its index.
+*/
+static int luaK_numberK (FuncState *fs, lua_Number r) {
+  TValue o;
+  setfltvalue(&o, r);
+  return addk(fs, &o, &o);  /* use number itself as key */
+}
+
+
+/*
+** Add a boolean to list of constants and return its index.
+*/
+static int boolK (FuncState *fs, int b) {
+  TValue o;
+  setbvalue(&o, b);
+  return addk(fs, &o, &o);  /* use boolean itself as key */
+}
+
+
+/*
+** Add nil to list of constants and return its index.
+*/
+static int nilK (FuncState *fs) {
+  TValue k, v;
+  setnilvalue(&v);
+  /* cannot use nil as key; instead use table itself to represent nil */
+  sethvalue(fs->ls->L, &k, fs->ls->h);
+  return addk(fs, &k, &v);
+}
+
+
+/*
+** Fix an expression to return the number of results 'nresults'.
+** Either 'e' is a multi-ret expression (function call or vararg)
+** or 'nresults' is LUA_MULTRET (as any expression can satisfy that).
+*/
+void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
+  if (e->k == VCALL) {  /* expression is an open function call? */
+    SETARG_C(getinstruction(fs, e), nresults + 1);
+  }
+  else if (e->k == VVARARG) {
+    Instruction *pc = &getinstruction(fs, e);
+    SETARG_B(*pc, nresults + 1);
+    SETARG_A(*pc, fs->freereg);
+    luaK_reserveregs(fs, 1);
+  }
+  else lua_assert(nresults == LUA_MULTRET);
+}
+
+
+/*
+** Fix an expression to return one result.
+** If expression is not a multi-ret expression (function call or
+** vararg), it already returns one result, so nothing needs to be done.
+** Function calls become VNONRELOC expressions (as its result comes
+** fixed in the base register of the call), while vararg expressions
+** become VRELOCABLE (as OP_VARARG puts its results where it wants).
+** (Calls are created returning one result, so that does not need
+** to be fixed.)
+*/
+void luaK_setoneret (FuncState *fs, expdesc *e) {
+  if (e->k == VCALL) {  /* expression is an open function call? */
+    /* already returns 1 value */
+    lua_assert(GETARG_C(getinstruction(fs, e)) == 2);
+    e->k = VNONRELOC;  /* result has fixed position */
+    e->u.info = GETARG_A(getinstruction(fs, e));
+  }
+  else if (e->k == VVARARG) {
+    SETARG_B(getinstruction(fs, e), 2);
+    e->k = VRELOCABLE;  /* can relocate its simple result */
+  }
+}
+
+
+/*
+** Ensure that expression 'e' is not a variable.
+*/
+void luaK_dischargevars (FuncState *fs, expdesc *e) {
+  switch (e->k) {
+    case VLOCAL: {  /* already in a register */
+      e->k = VNONRELOC;  /* becomes a non-relocatable value */
+      break;
+    }
+    case VUPVAL: {  /* move value to some (pending) register */
+      e->u.info = luaK_codeABC(fs, OP_GETUPVAL, 0, e->u.info, 0);
+      e->k = VRELOCABLE;
+      break;
+    }
+    case VINDEXED: {
+      OpCode op;
+      freereg(fs, e->u.ind.idx);
+      if (e->u.ind.vt == VLOCAL) {  /* is 't' in a register? */
+        freereg(fs, e->u.ind.t);
+        op = OP_GETTABLE;
+      }
+      else {
+        lua_assert(e->u.ind.vt == VUPVAL);
+        op = OP_GETTABUP;  /* 't' is in an upvalue */
+      }
+      e->u.info = luaK_codeABC(fs, op, 0, e->u.ind.t, e->u.ind.idx);
+      e->k = VRELOCABLE;
+      break;
+    }
+    case VVARARG: case VCALL: {
+      luaK_setoneret(fs, e);
+      break;
+    }
+    default: break;  /* there is one value available (somewhere) */
+  }
+}
+
+
+/*
+** Ensures expression value is in register 'reg' (and therefore
+** 'e' will become a non-relocatable expression).
+*/
+static void discharge2reg (FuncState *fs, expdesc *e, int reg) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: {
+      luaK_nil(fs, reg, 1);
+      break;
+    }
+    case VFALSE: case VTRUE: {
+      luaK_codeABC(fs, OP_LOADBOOL, reg, e->k == VTRUE, 0);
+      break;
+    }
+    case VK: {
+      luaK_codek(fs, reg, e->u.info);
+      break;
+    }
+    case VKFLT: {
+      luaK_codek(fs, reg, luaK_numberK(fs, e->u.nval));
+      break;
+    }
+    case VKINT: {
+      luaK_codek(fs, reg, luaK_intK(fs, e->u.ival));
+      break;
+    }
+    case VRELOCABLE: {
+      Instruction *pc = &getinstruction(fs, e);
+      SETARG_A(*pc, reg);  /* instruction will put result in 'reg' */
+      break;
+    }
+    case VNONRELOC: {
+      if (reg != e->u.info)
+        luaK_codeABC(fs, OP_MOVE, reg, e->u.info, 0);
+      break;
+    }
+    default: {
+      lua_assert(e->k == VJMP);
+      return;  /* nothing to do... */
+    }
+  }
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensures expression value is in any register.
+*/
+static void discharge2anyreg (FuncState *fs, expdesc *e) {
+  if (e->k != VNONRELOC) {  /* no fixed register yet? */
+    luaK_reserveregs(fs, 1);  /* get a register */
+    discharge2reg(fs, e, fs->freereg-1);  /* put value there */
+  }
+}
+
+
+static int code_loadbool (FuncState *fs, int A, int b, int jump) {
+  luaK_getlabel(fs);  /* those instructions may be jump targets */
+  return luaK_codeABC(fs, OP_LOADBOOL, A, b, jump);
+}
+
+
+/*
+** check whether list has any jump that do not produce a value
+** or produce an inverted value
+*/
+static int need_value (FuncState *fs, int list) {
+  for (; list != NO_JUMP; list = getjump(fs, list)) {
+    Instruction i = *getjumpcontrol(fs, list);
+    if (GET_OPCODE(i) != OP_TESTSET) return 1;
+  }
+  return 0;  /* not found */
+}
+
+
+/*
+** Ensures final expression result (including results from its jump
+** lists) is in register 'reg'.
+** If expression has jumps, need to patch these jumps either to
+** its final position or to "load" instructions (for those tests
+** that do not produce values).
+*/
+static void exp2reg (FuncState *fs, expdesc *e, int reg) {
+  discharge2reg(fs, e, reg);
+  if (e->k == VJMP)  /* expression itself is a test? */
+    luaK_concat(fs, &e->t, e->u.info);  /* put this jump in 't' list */
+  if (hasjumps(e)) {
+    int final;  /* position after whole expression */
+    int p_f = NO_JUMP;  /* position of an eventual LOAD false */
+    int p_t = NO_JUMP;  /* position of an eventual LOAD true */
+    if (need_value(fs, e->t) || need_value(fs, e->f)) {
+      int fj = (e->k == VJMP) ? NO_JUMP : luaK_jump(fs);
+      p_f = code_loadbool(fs, reg, 0, 1);
+      p_t = code_loadbool(fs, reg, 1, 0);
+      luaK_patchtohere(fs, fj);
+    }
+    final = luaK_getlabel(fs);
+    patchlistaux(fs, e->f, final, reg, p_f);
+    patchlistaux(fs, e->t, final, reg, p_t);
+  }
+  e->f = e->t = NO_JUMP;
+  e->u.info = reg;
+  e->k = VNONRELOC;
+}
+
+
+/*
+** Ensures final expression result (including results from its jump
+** lists) is in next available register.
+*/
+void luaK_exp2nextreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  freeexp(fs, e);
+  luaK_reserveregs(fs, 1);
+  exp2reg(fs, e, fs->freereg - 1);
+}
+
+
+/*
+** Ensures final expression result (including results from its jump
+** lists) is in some (any) register and return that register.
+*/
+int luaK_exp2anyreg (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  if (e->k == VNONRELOC) {  /* expression already has a register? */
+    if (!hasjumps(e))  /* no jumps? */
+      return e->u.info;  /* result is already in a register */
+    if (e->u.info >= fs->nactvar) {  /* reg. is not a local? */
+      exp2reg(fs, e, e->u.info);  /* put final result in it */
+      return e->u.info;
+    }
+  }
+  luaK_exp2nextreg(fs, e);  /* otherwise, use next available register */
+  return e->u.info;
+}
+
+
+/*
+** Ensures final expression result is either in a register or in an
+** upvalue.
+*/
+void luaK_exp2anyregup (FuncState *fs, expdesc *e) {
+  if (e->k != VUPVAL || hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+}
+
+
+/*
+** Ensures final expression result is either in a register or it is
+** a constant.
+*/
+void luaK_exp2val (FuncState *fs, expdesc *e) {
+  if (hasjumps(e))
+    luaK_exp2anyreg(fs, e);
+  else
+    luaK_dischargevars(fs, e);
+}
+
+
+/*
+** Ensures final expression result is in a valid R/K index
+** (that is, it is either in a register or in 'k' with an index
+** in the range of R/K indices).
+** Returns R/K index.
+*/
+int luaK_exp2RK (FuncState *fs, expdesc *e) {
+  luaK_exp2val(fs, e);
+  switch (e->k) {  /* move constants to 'k' */
+    case VTRUE: e->u.info = boolK(fs, 1); goto vk;
+    case VFALSE: e->u.info = boolK(fs, 0); goto vk;
+    case VNIL: e->u.info = nilK(fs); goto vk;
+    case VKINT: e->u.info = luaK_intK(fs, e->u.ival); goto vk;
+    case VKFLT: e->u.info = luaK_numberK(fs, e->u.nval); goto vk;
+    case VK:
+     vk:
+      e->k = VK;
+      if (e->u.info <= MAXINDEXRK)  /* constant fits in 'argC'? */
+        return RKASK(e->u.info);
+      else break;
+    default: break;
+  }
+  /* not a constant in the right range: put it in a register */
+  return luaK_exp2anyreg(fs, e);
+}
+
+
+/*
+** Generate code to store result of expression 'ex' into variable 'var'.
+*/
+void luaK_storevar (FuncState *fs, expdesc *var, expdesc *ex) {
+  switch (var->k) {
+    case VLOCAL: {
+      freeexp(fs, ex);
+      exp2reg(fs, ex, var->u.info);  /* compute 'ex' into proper place */
+      return;
+    }
+    case VUPVAL: {
+      int e = luaK_exp2anyreg(fs, ex);
+      luaK_codeABC(fs, OP_SETUPVAL, e, var->u.info, 0);
+      break;
+    }
+    case VINDEXED: {
+      OpCode op = (var->u.ind.vt == VLOCAL) ? OP_SETTABLE : OP_SETTABUP;
+      int e = luaK_exp2RK(fs, ex);
+      luaK_codeABC(fs, op, var->u.ind.t, var->u.ind.idx, e);
+      break;
+    }
+    default: lua_assert(0);  /* invalid var kind to store */
+  }
+  freeexp(fs, ex);
+}
+
+
+/*
+** Emit SELF instruction (convert expression 'e' into 'e:key(e,').
+*/
+void luaK_self (FuncState *fs, expdesc *e, expdesc *key) {
+  int ereg;
+  luaK_exp2anyreg(fs, e);
+  ereg = e->u.info;  /* register where 'e' was placed */
+  freeexp(fs, e);
+  e->u.info = fs->freereg;  /* base register for op_self */
+  e->k = VNONRELOC;  /* self expression has a fixed register */
+  luaK_reserveregs(fs, 2);  /* function and 'self' produced by op_self */
+  luaK_codeABC(fs, OP_SELF, e->u.info, ereg, luaK_exp2RK(fs, key));
+  freeexp(fs, key);
+}
+
+
+/*
+** Negate condition 'e' (where 'e' is a comparison).
+*/
+static void negatecondition (FuncState *fs, expdesc *e) {
+  Instruction *pc = getjumpcontrol(fs, e->u.info);
+  lua_assert(testTMode(GET_OPCODE(*pc)) && GET_OPCODE(*pc) != OP_TESTSET &&
+                                           GET_OPCODE(*pc) != OP_TEST);
+  SETARG_A(*pc, !(GETARG_A(*pc)));
+}
+
+
+/*
+** Emit instruction to jump if 'e' is 'cond' (that is, if 'cond'
+** is true, code will jump if 'e' is true.) Return jump position.
+** Optimize when 'e' is 'not' something, inverting the condition
+** and removing the 'not'.
+*/
+static int jumponcond (FuncState *fs, expdesc *e, int cond) {
+  if (e->k == VRELOCABLE) {
+    Instruction ie = getinstruction(fs, e);
+    if (GET_OPCODE(ie) == OP_NOT) {
+      fs->pc--;  /* remove previous OP_NOT */
+      return condjump(fs, OP_TEST, GETARG_B(ie), 0, !cond);
+    }
+    /* else go through */
+  }
+  discharge2anyreg(fs, e);
+  freeexp(fs, e);
+  return condjump(fs, OP_TESTSET, NO_REG, e->u.info, cond);
+}
+
+
+/*
+** Emit code to go through if 'e' is true, jump otherwise.
+*/
+void luaK_goiftrue (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {  /* condition? */
+      negatecondition(fs, e);  /* jump when it is false */
+      pc = e->u.info;  /* save jump position */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VTRUE: {
+      pc = NO_JUMP;  /* always true; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 0);  /* jump when false */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->f, pc);  /* insert new jump in false list */
+  luaK_patchtohere(fs, e->t);  /* true list jumps to here (to go through) */
+  e->t = NO_JUMP;
+}
+
+
+/*
+** Emit code to go through if 'e' is false, jump otherwise.
+*/
+void luaK_goiffalse (FuncState *fs, expdesc *e) {
+  int pc;  /* pc of new jump */
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VJMP: {
+      pc = e->u.info;  /* already jump if true */
+      break;
+    }
+    case VNIL: case VFALSE: {
+      pc = NO_JUMP;  /* always false; do nothing */
+      break;
+    }
+    default: {
+      pc = jumponcond(fs, e, 1);  /* jump if true */
+      break;
+    }
+  }
+  luaK_concat(fs, &e->t, pc);  /* insert new jump in 't' list */
+  luaK_patchtohere(fs, e->f);  /* false list jumps to here (to go through) */
+  e->f = NO_JUMP;
+}
+
+
+/*
+** Code 'not e', doing constant folding.
+*/
+static void codenot (FuncState *fs, expdesc *e) {
+  luaK_dischargevars(fs, e);
+  switch (e->k) {
+    case VNIL: case VFALSE: {
+      e->k = VTRUE;  /* true == not nil == not false */
+      break;
+    }
+    case VK: case VKFLT: case VKINT: case VTRUE: {
+      e->k = VFALSE;  /* false == not "x" == not 0.5 == not 1 == not true */
+      break;
+    }
+    case VJMP: {
+      negatecondition(fs, e);
+      break;
+    }
+    case VRELOCABLE:
+    case VNONRELOC: {
+      discharge2anyreg(fs, e);
+      freeexp(fs, e);
+      e->u.info = luaK_codeABC(fs, OP_NOT, 0, e->u.info, 0);
+      e->k = VRELOCABLE;
+      break;
+    }
+    default: lua_assert(0);  /* cannot happen */
+  }
+  /* interchange true and false lists */
+  { int temp = e->f; e->f = e->t; e->t = temp; }
+  removevalues(fs, e->f);  /* values are useless when negated */
+  removevalues(fs, e->t);
+}
+
+
+/*
+** Create expression 't[k]'. 't' must have its final result already in a
+** register or upvalue.
+*/
+void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
+  lua_assert(!hasjumps(t) && (vkisinreg(t->k) || t->k == VUPVAL));
+  t->u.ind.t = t->u.info;  /* register or upvalue index */
+  t->u.ind.idx = luaK_exp2RK(fs, k);  /* R/K index for key */
+  t->u.ind.vt = (t->k == VUPVAL) ? VUPVAL : VLOCAL;
+  t->k = VINDEXED;
+}
+
+
+/*
+** Return false if folding can raise an error.
+** Bitwise operations need operands convertible to integers; division
+** operations cannot have 0 as divisor.
+*/
+static int validop (int op, TValue *v1, TValue *v2) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR: case LUA_OPBNOT: {  /* conversion errors */
+      lua_Integer i;
+      return (tointeger(v1, &i) && tointeger(v2, &i));
+    }
+    case LUA_OPDIV: case LUA_OPIDIV: case LUA_OPMOD:  /* division by 0 */
+      return (nvalue(v2) != 0);
+    default: return 1;  /* everything else is valid */
+  }
+}
+
+
+/*
+** Try to "constant-fold" an operation; return 1 iff successful.
+** (In this case, 'e1' has the final result.)
+*/
+static int constfolding (FuncState *fs, int op, expdesc *e1,
+                                                const expdesc *e2) {
+  TValue v1, v2, res;
+  if (!tonumeral(e1, &v1) || !tonumeral(e2, &v2) || !validop(op, &v1, &v2))
+    return 0;  /* non-numeric operands or not safe to fold */
+  luaO_arith(fs->ls->L, op, &v1, &v2, &res);  /* does operation */
+  if (ttisinteger(&res)) {
+    e1->k = VKINT;
+    e1->u.ival = ivalue(&res);
+  }
+  else {  /* folds neither NaN nor 0.0 (to avoid problems with -0.0) */
+    lua_Number n = fltvalue(&res);
+    if (luai_numisnan(n) || n == 0)
+      return 0;
+    e1->k = VKFLT;
+    e1->u.nval = n;
+  }
+  return 1;
+}
+
+
+/*
+** Emit code for unary expressions that "produce values"
+** (everything but 'not').
+** Expression to produce final result will be encoded in 'e'.
+*/
+static void codeunexpval (FuncState *fs, OpCode op, expdesc *e, int line) {
+  int r = luaK_exp2anyreg(fs, e);  /* opcodes operate only on registers */
+  freeexp(fs, e);
+  e->u.info = luaK_codeABC(fs, op, 0, r, 0);  /* generate opcode */
+  e->k = VRELOCABLE;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for binary expressions that "produce values"
+** (everything but logical operators 'and'/'or' and comparison
+** operators).
+** Expression to produce final result will be encoded in 'e1'.
+** Because 'luaK_exp2RK' can free registers, its calls must be
+** in "stack order" (that is, first on 'e2', which may have more
+** recent registers to be released).
+*/
+static void codebinexpval (FuncState *fs, OpCode op,
+                           expdesc *e1, expdesc *e2, int line) {
+  int rk2 = luaK_exp2RK(fs, e2);  /* both operands are "RK" */
+  int rk1 = luaK_exp2RK(fs, e1);
+  freeexps(fs, e1, e2);
+  e1->u.info = luaK_codeABC(fs, op, 0, rk1, rk2);  /* generate opcode */
+  e1->k = VRELOCABLE;  /* all those operations are relocatable */
+  luaK_fixline(fs, line);
+}
+
+
+/*
+** Emit code for comparisons.
+** 'e1' was already put in R/K form by 'luaK_infix'.
+*/
+static void codecomp (FuncState *fs, BinOpr opr, expdesc *e1, expdesc *e2) {
+  int rk1 = (e1->k == VK) ? RKASK(e1->u.info)
+                          : check_exp(e1->k == VNONRELOC, e1->u.info);
+  int rk2 = luaK_exp2RK(fs, e2);
+  freeexps(fs, e1, e2);
+  switch (opr) {
+    case OPR_NE: {  /* '(a ~= b)' ==> 'not (a == b)' */
+      e1->u.info = condjump(fs, OP_EQ, 0, rk1, rk2);
+      break;
+    }
+    case OPR_GT: case OPR_GE: {
+      /* '(a > b)' ==> '(b < a)';  '(a >= b)' ==> '(b <= a)' */
+      OpCode op = cast(OpCode, (opr - OPR_NE) + OP_EQ);
+      e1->u.info = condjump(fs, op, 1, rk2, rk1);  /* invert operands */
+      break;
+    }
+    default: {  /* '==', '<', '<=' use their own opcodes */
+      OpCode op = cast(OpCode, (opr - OPR_EQ) + OP_EQ);
+      e1->u.info = condjump(fs, op, 1, rk1, rk2);
+      break;
+    }
+  }
+  e1->k = VJMP;
+}
+
+
+/*
+** Aplly prefix operation 'op' to expression 'e'.
+*/
+void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e, int line) {
+  static const expdesc ef = {VKINT, {0}, NO_JUMP, NO_JUMP};
+  switch (op) {
+    case OPR_MINUS: case OPR_BNOT:  /* use 'ef' as fake 2nd operand */
+      if (constfolding(fs, op + LUA_OPUNM, e, &ef))
+        break;
+      /* FALLTHROUGH */
+    case OPR_LEN:
+      codeunexpval(fs, cast(OpCode, op + OP_UNM), e, line);
+      break;
+    case OPR_NOT: codenot(fs, e); break;
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Process 1st operand 'v' of binary operation 'op' before reading
+** 2nd operand.
+*/
+void luaK_infix (FuncState *fs, BinOpr op, expdesc *v) {
+  switch (op) {
+    case OPR_AND: {
+      luaK_goiftrue(fs, v);  /* go ahead only if 'v' is true */
+      break;
+    }
+    case OPR_OR: {
+      luaK_goiffalse(fs, v);  /* go ahead only if 'v' is false */
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2nextreg(fs, v);  /* operand must be on the 'stack' */
+      break;
+    }
+    case OPR_ADD: case OPR_SUB:
+    case OPR_MUL: case OPR_DIV: case OPR_IDIV:
+    case OPR_MOD: case OPR_POW:
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR:
+    case OPR_SHL: case OPR_SHR: {
+      if (!tonumeral(v, NULL))
+        luaK_exp2RK(fs, v);
+      /* else keep numeral, which may be folded with 2nd operand */
+      break;
+    }
+    default: {
+      luaK_exp2RK(fs, v);
+      break;
+    }
+  }
+}
+
+
+/*
+** Finalize code for binary operation, after reading 2nd operand.
+** For '(a .. b .. c)' (which is '(a .. (b .. c))', because
+** concatenation is right associative), merge second CONCAT into first
+** one.
+*/
+void luaK_posfix (FuncState *fs, BinOpr op,
+                  expdesc *e1, expdesc *e2, int line) {
+  switch (op) {
+    case OPR_AND: {
+      lua_assert(e1->t == NO_JUMP);  /* list closed by 'luK_infix' */
+      luaK_dischargevars(fs, e2);
+      luaK_concat(fs, &e2->f, e1->f);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_OR: {
+      lua_assert(e1->f == NO_JUMP);  /* list closed by 'luK_infix' */
+      luaK_dischargevars(fs, e2);
+      luaK_concat(fs, &e2->t, e1->t);
+      *e1 = *e2;
+      break;
+    }
+    case OPR_CONCAT: {
+      luaK_exp2val(fs, e2);
+      if (e2->k == VRELOCABLE &&
+          GET_OPCODE(getinstruction(fs, e2)) == OP_CONCAT) {
+        lua_assert(e1->u.info == GETARG_B(getinstruction(fs, e2))-1);
+        freeexp(fs, e1);
+        SETARG_B(getinstruction(fs, e2), e1->u.info);
+        e1->k = VRELOCABLE; e1->u.info = e2->u.info;
+      }
+      else {
+        luaK_exp2nextreg(fs, e2);  /* operand must be on the 'stack' */
+        codebinexpval(fs, OP_CONCAT, e1, e2, line);
+      }
+      break;
+    }
+    case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
+    case OPR_IDIV: case OPR_MOD: case OPR_POW:
+    case OPR_BAND: case OPR_BOR: case OPR_BXOR:
+    case OPR_SHL: case OPR_SHR: {
+      if (!constfolding(fs, op + LUA_OPADD, e1, e2))
+        codebinexpval(fs, cast(OpCode, op + OP_ADD), e1, e2, line);
+      break;
+    }
+    case OPR_EQ: case OPR_LT: case OPR_LE:
+    case OPR_NE: case OPR_GT: case OPR_GE: {
+      codecomp(fs, op, e1, e2);
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+/*
+** Change line information associated with current position.
+*/
+void luaK_fixline (FuncState *fs, int line) {
+  fs->f->lineinfo[fs->pc - 1] = line;
+}
+
+
+/*
+** Emit a SETLIST instruction.
+** 'base' is register that keeps table;
+** 'nelems' is #table plus those to be stored now;
+** 'tostore' is number of values (in registers 'base + 1',...) to add to
+** table (or LUA_MULTRET to add up to stack top).
+*/
+void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
+  int c =  (nelems - 1)/LFIELDS_PER_FLUSH + 1;
+  int b = (tostore == LUA_MULTRET) ? 0 : tostore;
+  lua_assert(tostore != 0 && tostore <= LFIELDS_PER_FLUSH);
+  if (c <= MAXARG_C)
+    luaK_codeABC(fs, OP_SETLIST, base, b, c);
+  else if (c <= MAXARG_Ax) {
+    luaK_codeABC(fs, OP_SETLIST, base, b, 0);
+    codeextraarg(fs, c);
+  }
+  else
+    luaX_syntaxerror(fs->ls, "constructor too long");
+  fs->freereg = base + 1;  /* free registers with list values */
+}
+
diff --git a/scite-app/scite/lua/src/lcode.h b/scite-app/scite/lua/src/lcode.h
new file mode 100644
index 0000000..cd306d5
--- /dev/null
+++ b/scite-app/scite/lua/src/lcode.h
@@ -0,0 +1,88 @@
+/*
+** $Id: lcode.h,v 1.64 2016/01/05 16:22:37 roberto Exp $
+** Code generator for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lcode_h
+#define lcode_h
+
+#include "llex.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+
+
+/*
+** Marks the end of a patch list. It is an invalid value both as an absolute
+** address, and as a list link (would link an element to itself).
+*/
+#define NO_JUMP (-1)
+
+
+/*
+** grep "ORDER OPR" if you change these enums  (ORDER OP)
+*/
+typedef enum BinOpr {
+  OPR_ADD, OPR_SUB, OPR_MUL, OPR_MOD, OPR_POW,
+  OPR_DIV,
+  OPR_IDIV,
+  OPR_BAND, OPR_BOR, OPR_BXOR,
+  OPR_SHL, OPR_SHR,
+  OPR_CONCAT,
+  OPR_EQ, OPR_LT, OPR_LE,
+  OPR_NE, OPR_GT, OPR_GE,
+  OPR_AND, OPR_OR,
+  OPR_NOBINOPR
+} BinOpr;
+
+
+typedef enum UnOpr { OPR_MINUS, OPR_BNOT, OPR_NOT, OPR_LEN, OPR_NOUNOPR } UnOpr;
+
+
+/* get (pointer to) instruction of given 'expdesc' */
+#define getinstruction(fs,e)	((fs)->f->code[(e)->u.info])
+
+#define luaK_codeAsBx(fs,o,A,sBx)	luaK_codeABx(fs,o,A,(sBx)+MAXARG_sBx)
+
+#define luaK_setmultret(fs,e)	luaK_setreturns(fs, e, LUA_MULTRET)
+
+#define luaK_jumpto(fs,t)	luaK_patchlist(fs, luaK_jump(fs), t)
+
+LUAI_FUNC int luaK_codeABx (FuncState *fs, OpCode o, int A, unsigned int Bx);
+LUAI_FUNC int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
+LUAI_FUNC int luaK_codek (FuncState *fs, int reg, int k);
+LUAI_FUNC void luaK_fixline (FuncState *fs, int line);
+LUAI_FUNC void luaK_nil (FuncState *fs, int from, int n);
+LUAI_FUNC void luaK_reserveregs (FuncState *fs, int n);
+LUAI_FUNC void luaK_checkstack (FuncState *fs, int n);
+LUAI_FUNC int luaK_stringK (FuncState *fs, TString *s);
+LUAI_FUNC int luaK_intK (FuncState *fs, lua_Integer n);
+LUAI_FUNC void luaK_dischargevars (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2anyreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2anyregup (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2nextreg (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_exp2val (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_exp2RK (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_self (FuncState *fs, expdesc *e, expdesc *key);
+LUAI_FUNC void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k);
+LUAI_FUNC void luaK_goiftrue (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_goiffalse (FuncState *fs, expdesc *e);
+LUAI_FUNC void luaK_storevar (FuncState *fs, expdesc *var, expdesc *e);
+LUAI_FUNC void luaK_setreturns (FuncState *fs, expdesc *e, int nresults);
+LUAI_FUNC void luaK_setoneret (FuncState *fs, expdesc *e);
+LUAI_FUNC int luaK_jump (FuncState *fs);
+LUAI_FUNC void luaK_ret (FuncState *fs, int first, int nret);
+LUAI_FUNC void luaK_patchlist (FuncState *fs, int list, int target);
+LUAI_FUNC void luaK_patchtohere (FuncState *fs, int list);
+LUAI_FUNC void luaK_patchclose (FuncState *fs, int list, int level);
+LUAI_FUNC void luaK_concat (FuncState *fs, int *l1, int l2);
+LUAI_FUNC int luaK_getlabel (FuncState *fs);
+LUAI_FUNC void luaK_prefix (FuncState *fs, UnOpr op, expdesc *v, int line);
+LUAI_FUNC void luaK_infix (FuncState *fs, BinOpr op, expdesc *v);
+LUAI_FUNC void luaK_posfix (FuncState *fs, BinOpr op, expdesc *v1,
+                            expdesc *v2, int line);
+LUAI_FUNC void luaK_setlist (FuncState *fs, int base, int nelems, int tostore);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lcorolib.c b/scite-app/scite/lua/src/lcorolib.c
new file mode 100644
index 0000000..2303429
--- /dev/null
+++ b/scite-app/scite/lua/src/lcorolib.c
@@ -0,0 +1,168 @@
+/*
+** $Id: lcorolib.c,v 1.10 2016/04/11 19:19:55 roberto Exp $
+** Coroutine Library
+** See Copyright Notice in lua.h
+*/
+
+#define lcorolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdlib.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+static lua_State *getco (lua_State *L) {
+  lua_State *co = lua_tothread(L, 1);
+  luaL_argcheck(L, co, 1, "thread expected");
+  return co;
+}
+
+
+static int auxresume (lua_State *L, lua_State *co, int narg) {
+  int status;
+  if (!lua_checkstack(co, narg)) {
+    lua_pushliteral(L, "too many arguments to resume");
+    return -1;  /* error flag */
+  }
+  if (lua_status(co) == LUA_OK && lua_gettop(co) == 0) {
+    lua_pushliteral(L, "cannot resume dead coroutine");
+    return -1;  /* error flag */
+  }
+  lua_xmove(L, co, narg);
+  status = lua_resume(co, L, narg);
+  if (status == LUA_OK || status == LUA_YIELD) {
+    int nres = lua_gettop(co);
+    if (!lua_checkstack(L, nres + 1)) {
+      lua_pop(co, nres);  /* remove results anyway */
+      lua_pushliteral(L, "too many results to resume");
+      return -1;  /* error flag */
+    }
+    lua_xmove(co, L, nres);  /* move yielded values */
+    return nres;
+  }
+  else {
+    lua_xmove(co, L, 1);  /* move error message */
+    return -1;  /* error flag */
+  }
+}
+
+
+static int luaB_coresume (lua_State *L) {
+  lua_State *co = getco(L);
+  int r;
+  r = auxresume(L, co, lua_gettop(L) - 1);
+  if (r < 0) {
+    lua_pushboolean(L, 0);
+    lua_insert(L, -2);
+    return 2;  /* return false + error message */
+  }
+  else {
+    lua_pushboolean(L, 1);
+    lua_insert(L, -(r + 1));
+    return r + 1;  /* return true + 'resume' returns */
+  }
+}
+
+
+static int luaB_auxwrap (lua_State *L) {
+  lua_State *co = lua_tothread(L, lua_upvalueindex(1));
+  int r = auxresume(L, co, lua_gettop(L));
+  if (r < 0) {
+    if (lua_type(L, -1) == LUA_TSTRING) {  /* error object is a string? */
+      luaL_where(L, 1);  /* add extra info */
+      lua_insert(L, -2);
+      lua_concat(L, 2);
+    }
+    return lua_error(L);  /* propagate error */
+  }
+  return r;
+}
+
+
+static int luaB_cocreate (lua_State *L) {
+  lua_State *NL;
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  NL = lua_newthread(L);
+  lua_pushvalue(L, 1);  /* move function to top */
+  lua_xmove(L, NL, 1);  /* move function from L to NL */
+  return 1;
+}
+
+
+static int luaB_cowrap (lua_State *L) {
+  luaB_cocreate(L);
+  lua_pushcclosure(L, luaB_auxwrap, 1);
+  return 1;
+}
+
+
+static int luaB_yield (lua_State *L) {
+  return lua_yield(L, lua_gettop(L));
+}
+
+
+static int luaB_costatus (lua_State *L) {
+  lua_State *co = getco(L);
+  if (L == co) lua_pushliteral(L, "running");
+  else {
+    switch (lua_status(co)) {
+      case LUA_YIELD:
+        lua_pushliteral(L, "suspended");
+        break;
+      case LUA_OK: {
+        lua_Debug ar;
+        if (lua_getstack(co, 0, &ar) > 0)  /* does it have frames? */
+          lua_pushliteral(L, "normal");  /* it is running */
+        else if (lua_gettop(co) == 0)
+            lua_pushliteral(L, "dead");
+        else
+          lua_pushliteral(L, "suspended");  /* initial state */
+        break;
+      }
+      default:  /* some error occurred */
+        lua_pushliteral(L, "dead");
+        break;
+    }
+  }
+  return 1;
+}
+
+
+static int luaB_yieldable (lua_State *L) {
+  lua_pushboolean(L, lua_isyieldable(L));
+  return 1;
+}
+
+
+static int luaB_corunning (lua_State *L) {
+  int ismain = lua_pushthread(L);
+  lua_pushboolean(L, ismain);
+  return 2;
+}
+
+
+static const luaL_Reg co_funcs[] = {
+  {"create", luaB_cocreate},
+  {"resume", luaB_coresume},
+  {"running", luaB_corunning},
+  {"status", luaB_costatus},
+  {"wrap", luaB_cowrap},
+  {"yield", luaB_yield},
+  {"isyieldable", luaB_yieldable},
+  {NULL, NULL}
+};
+
+
+
+LUAMOD_API int luaopen_coroutine (lua_State *L) {
+  luaL_newlib(L, co_funcs);
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/lctype.c b/scite-app/scite/lua/src/lctype.c
new file mode 100644
index 0000000..ae9367e
--- /dev/null
+++ b/scite-app/scite/lua/src/lctype.c
@@ -0,0 +1,55 @@
+/*
+** $Id: lctype.c,v 1.12 2014/11/02 19:19:04 roberto Exp $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#define lctype_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include "lctype.h"
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+LUAI_DDEF const lu_byte luai_ctype_[UCHAR_MAX + 2] = {
+  0x00,  /* EOZ */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 0. */
+  0x00,  0x08,  0x08,  0x08,  0x08,  0x08,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 1. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x0c,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,	/* 2. */
+  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,  0x16,	/* 3. */
+  0x16,  0x16,  0x04,  0x04,  0x04,  0x04,  0x04,  0x04,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 4. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 5. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x05,
+  0x04,  0x15,  0x15,  0x15,  0x15,  0x15,  0x15,  0x05,	/* 6. */
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,
+  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,  0x05,	/* 7. */
+  0x05,  0x05,  0x05,  0x04,  0x04,  0x04,  0x04,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 8. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* 9. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* a. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* b. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* c. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* d. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* e. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,	/* f. */
+  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
+};
+
+#endif			/* } */
diff --git a/scite-app/scite/lua/src/lctype.h b/scite-app/scite/lua/src/lctype.h
new file mode 100644
index 0000000..99c7d12
--- /dev/null
+++ b/scite-app/scite/lua/src/lctype.h
@@ -0,0 +1,95 @@
+/*
+** $Id: lctype.h,v 1.12 2011/07/15 12:50:29 roberto Exp $
+** 'ctype' functions for Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lctype_h
+#define lctype_h
+
+#include "lua.h"
+
+
+/*
+** WARNING: the functions defined here do not necessarily correspond
+** to the similar functions in the standard C ctype.h. They are
+** optimized for the specific needs of Lua
+*/
+
+#if !defined(LUA_USE_CTYPE)
+
+#if 'A' == 65 && '0' == 48
+/* ASCII case: can use its own tables; faster and fixed */
+#define LUA_USE_CTYPE	0
+#else
+/* must use standard C ctype */
+#define LUA_USE_CTYPE	1
+#endif
+
+#endif
+
+
+#if !LUA_USE_CTYPE	/* { */
+
+#include <limits.h>
+
+#include "llimits.h"
+
+
+#define ALPHABIT	0
+#define DIGITBIT	1
+#define PRINTBIT	2
+#define SPACEBIT	3
+#define XDIGITBIT	4
+
+
+#define MASK(B)		(1 << (B))
+
+
+/*
+** add 1 to char to allow index -1 (EOZ)
+*/
+#define testprop(c,p)	(luai_ctype_[(c)+1] & (p))
+
+/*
+** 'lalpha' (Lua alphabetic) and 'lalnum' (Lua alphanumeric) both include '_'
+*/
+#define lislalpha(c)	testprop(c, MASK(ALPHABIT))
+#define lislalnum(c)	testprop(c, (MASK(ALPHABIT) | MASK(DIGITBIT)))
+#define lisdigit(c)	testprop(c, MASK(DIGITBIT))
+#define lisspace(c)	testprop(c, MASK(SPACEBIT))
+#define lisprint(c)	testprop(c, MASK(PRINTBIT))
+#define lisxdigit(c)	testprop(c, MASK(XDIGITBIT))
+
+/*
+** this 'ltolower' only works for alphabetic characters
+*/
+#define ltolower(c)	((c) | ('A' ^ 'a'))
+
+
+/* two more entries for 0 and -1 (EOZ) */
+LUAI_DDEC const lu_byte luai_ctype_[UCHAR_MAX + 2];
+
+
+#else			/* }{ */
+
+/*
+** use standard C ctypes
+*/
+
+#include <ctype.h>
+
+
+#define lislalpha(c)	(isalpha(c) || (c) == '_')
+#define lislalnum(c)	(isalnum(c) || (c) == '_')
+#define lisdigit(c)	(isdigit(c))
+#define lisspace(c)	(isspace(c))
+#define lisprint(c)	(isprint(c))
+#define lisxdigit(c)	(isxdigit(c))
+
+#define ltolower(c)	(tolower(c))
+
+#endif			/* } */
+
+#endif
+
diff --git a/scite-app/scite/lua/src/ldblib.c b/scite-app/scite/lua/src/ldblib.c
new file mode 100644
index 0000000..786f6cd
--- /dev/null
+++ b/scite-app/scite/lua/src/ldblib.c
@@ -0,0 +1,456 @@
+/*
+** $Id: ldblib.c,v 1.151 2015/11/23 11:29:43 roberto Exp $
+** Interface from Lua to its debug API
+** See Copyright Notice in lua.h
+*/
+
+#define ldblib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** The hook table at registry[&HOOKKEY] maps threads to their current
+** hook function. (We only need the unique address of 'HOOKKEY'.)
+*/
+static const int HOOKKEY = 0;
+
+
+/*
+** If L1 != L, L1 can be in any state, and therefore there are no
+** guarantees about its stack space; any push in L1 must be
+** checked.
+*/
+static void checkstack (lua_State *L, lua_State *L1, int n) {
+  if (L != L1 && !lua_checkstack(L1, n))
+    luaL_error(L, "stack overflow");
+}
+
+
+static int db_getregistry (lua_State *L) {
+  lua_pushvalue(L, LUA_REGISTRYINDEX);
+  return 1;
+}
+
+
+static int db_getmetatable (lua_State *L) {
+  luaL_checkany(L, 1);
+  if (!lua_getmetatable(L, 1)) {
+    lua_pushnil(L);  /* no metatable */
+  }
+  return 1;
+}
+
+
+static int db_setmetatable (lua_State *L) {
+  int t = lua_type(L, 2);
+  luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
+                    "nil or table expected");
+  lua_settop(L, 2);
+  lua_setmetatable(L, 1);
+  return 1;  /* return 1st argument */
+}
+
+
+static int db_getuservalue (lua_State *L) {
+  if (lua_type(L, 1) != LUA_TUSERDATA)
+    lua_pushnil(L);
+  else
+    lua_getuservalue(L, 1);
+  return 1;
+}
+
+
+static int db_setuservalue (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TUSERDATA);
+  luaL_checkany(L, 2);
+  lua_settop(L, 2);
+  lua_setuservalue(L, 1);
+  return 1;
+}
+
+
+/*
+** Auxiliary function used by several library functions: check for
+** an optional thread as function's first argument and set 'arg' with
+** 1 if this argument is present (so that functions can skip it to
+** access their other arguments)
+*/
+static lua_State *getthread (lua_State *L, int *arg) {
+  if (lua_isthread(L, 1)) {
+    *arg = 1;
+    return lua_tothread(L, 1);
+  }
+  else {
+    *arg = 0;
+    return L;  /* function will operate over current thread */
+  }
+}
+
+
+/*
+** Variations of 'lua_settable', used by 'db_getinfo' to put results
+** from 'lua_getinfo' into result table. Key is always a string;
+** value can be a string, an int, or a boolean.
+*/
+static void settabss (lua_State *L, const char *k, const char *v) {
+  lua_pushstring(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsi (lua_State *L, const char *k, int v) {
+  lua_pushinteger(L, v);
+  lua_setfield(L, -2, k);
+}
+
+static void settabsb (lua_State *L, const char *k, int v) {
+  lua_pushboolean(L, v);
+  lua_setfield(L, -2, k);
+}
+
+
+/*
+** In function 'db_getinfo', the call to 'lua_getinfo' may push
+** results on the stack; later it creates the result table to put
+** these objects. Function 'treatstackoption' puts the result from
+** 'lua_getinfo' on top of the result table so that it can call
+** 'lua_setfield'.
+*/
+static void treatstackoption (lua_State *L, lua_State *L1, const char *fname) {
+  if (L == L1)
+    lua_rotate(L, -2, 1);  /* exchange object and table */
+  else
+    lua_xmove(L1, L, 1);  /* move object to the "main" stack */
+  lua_setfield(L, -2, fname);  /* put object into table */
+}
+
+
+/*
+** Calls 'lua_getinfo' and collects all results in a new table.
+** L1 needs stack space for an optional input (function) plus
+** two optional outputs (function and line table) from function
+** 'lua_getinfo'.
+*/
+static int db_getinfo (lua_State *L) {
+  lua_Debug ar;
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *options = luaL_optstring(L, arg+2, "flnStu");
+  checkstack(L, L1, 3);
+  if (lua_isfunction(L, arg + 1)) {  /* info about a function? */
+    options = lua_pushfstring(L, ">%s", options);  /* add '>' to 'options' */
+    lua_pushvalue(L, arg + 1);  /* move function to 'L1' stack */
+    lua_xmove(L, L1, 1);
+  }
+  else {  /* stack level */
+    if (!lua_getstack(L1, (int)luaL_checkinteger(L, arg + 1), &ar)) {
+      lua_pushnil(L);  /* level out of range */
+      return 1;
+    }
+  }
+  if (!lua_getinfo(L1, options, &ar))
+    return luaL_argerror(L, arg+2, "invalid option");
+  lua_newtable(L);  /* table to collect results */
+  if (strchr(options, 'S')) {
+    settabss(L, "source", ar.source);
+    settabss(L, "short_src", ar.short_src);
+    settabsi(L, "linedefined", ar.linedefined);
+    settabsi(L, "lastlinedefined", ar.lastlinedefined);
+    settabss(L, "what", ar.what);
+  }
+  if (strchr(options, 'l'))
+    settabsi(L, "currentline", ar.currentline);
+  if (strchr(options, 'u')) {
+    settabsi(L, "nups", ar.nups);
+    settabsi(L, "nparams", ar.nparams);
+    settabsb(L, "isvararg", ar.isvararg);
+  }
+  if (strchr(options, 'n')) {
+    settabss(L, "name", ar.name);
+    settabss(L, "namewhat", ar.namewhat);
+  }
+  if (strchr(options, 't'))
+    settabsb(L, "istailcall", ar.istailcall);
+  if (strchr(options, 'L'))
+    treatstackoption(L, L1, "activelines");
+  if (strchr(options, 'f'))
+    treatstackoption(L, L1, "func");
+  return 1;  /* return table */
+}
+
+
+static int db_getlocal (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  lua_Debug ar;
+  const char *name;
+  int nvar = (int)luaL_checkinteger(L, arg + 2);  /* local-variable index */
+  if (lua_isfunction(L, arg + 1)) {  /* function argument? */
+    lua_pushvalue(L, arg + 1);  /* push function */
+    lua_pushstring(L, lua_getlocal(L, NULL, nvar));  /* push local name */
+    return 1;  /* return only name (there is no value) */
+  }
+  else {  /* stack-level argument */
+    int level = (int)luaL_checkinteger(L, arg + 1);
+    if (!lua_getstack(L1, level, &ar))  /* out of range? */
+      return luaL_argerror(L, arg+1, "level out of range");
+    checkstack(L, L1, 1);
+    name = lua_getlocal(L1, &ar, nvar);
+    if (name) {
+      lua_xmove(L1, L, 1);  /* move local value */
+      lua_pushstring(L, name);  /* push name */
+      lua_rotate(L, -2, 1);  /* re-order */
+      return 2;
+    }
+    else {
+      lua_pushnil(L);  /* no name (nor value) */
+      return 1;
+    }
+  }
+}
+
+
+static int db_setlocal (lua_State *L) {
+  int arg;
+  const char *name;
+  lua_State *L1 = getthread(L, &arg);
+  lua_Debug ar;
+  int level = (int)luaL_checkinteger(L, arg + 1);
+  int nvar = (int)luaL_checkinteger(L, arg + 2);
+  if (!lua_getstack(L1, level, &ar))  /* out of range? */
+    return luaL_argerror(L, arg+1, "level out of range");
+  luaL_checkany(L, arg+3);
+  lua_settop(L, arg+3);
+  checkstack(L, L1, 1);
+  lua_xmove(L, L1, 1);
+  name = lua_setlocal(L1, &ar, nvar);
+  if (name == NULL)
+    lua_pop(L1, 1);  /* pop value (if not popped by 'lua_setlocal') */
+  lua_pushstring(L, name);
+  return 1;
+}
+
+
+/*
+** get (if 'get' is true) or set an upvalue from a closure
+*/
+static int auxupvalue (lua_State *L, int get) {
+  const char *name;
+  int n = (int)luaL_checkinteger(L, 2);  /* upvalue index */
+  luaL_checktype(L, 1, LUA_TFUNCTION);  /* closure */
+  name = get ? lua_getupvalue(L, 1, n) : lua_setupvalue(L, 1, n);
+  if (name == NULL) return 0;
+  lua_pushstring(L, name);
+  lua_insert(L, -(get+1));  /* no-op if get is false */
+  return get + 1;
+}
+
+
+static int db_getupvalue (lua_State *L) {
+  return auxupvalue(L, 1);
+}
+
+
+static int db_setupvalue (lua_State *L) {
+  luaL_checkany(L, 3);
+  return auxupvalue(L, 0);
+}
+
+
+/*
+** Check whether a given upvalue from a given closure exists and
+** returns its index
+*/
+static int checkupval (lua_State *L, int argf, int argnup) {
+  int nup = (int)luaL_checkinteger(L, argnup);  /* upvalue index */
+  luaL_checktype(L, argf, LUA_TFUNCTION);  /* closure */
+  luaL_argcheck(L, (lua_getupvalue(L, argf, nup) != NULL), argnup,
+                   "invalid upvalue index");
+  return nup;
+}
+
+
+static int db_upvalueid (lua_State *L) {
+  int n = checkupval(L, 1, 2);
+  lua_pushlightuserdata(L, lua_upvalueid(L, 1, n));
+  return 1;
+}
+
+
+static int db_upvaluejoin (lua_State *L) {
+  int n1 = checkupval(L, 1, 2);
+  int n2 = checkupval(L, 3, 4);
+  luaL_argcheck(L, !lua_iscfunction(L, 1), 1, "Lua function expected");
+  luaL_argcheck(L, !lua_iscfunction(L, 3), 3, "Lua function expected");
+  lua_upvaluejoin(L, 1, n1, 3, n2);
+  return 0;
+}
+
+
+/*
+** Call hook function registered at hook table for the current
+** thread (if there is one)
+*/
+static void hookf (lua_State *L, lua_Debug *ar) {
+  static const char *const hooknames[] =
+    {"call", "return", "line", "count", "tail call"};
+  lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY);
+  lua_pushthread(L);
+  if (lua_rawget(L, -2) == LUA_TFUNCTION) {  /* is there a hook function? */
+    lua_pushstring(L, hooknames[(int)ar->event]);  /* push event name */
+    if (ar->currentline >= 0)
+      lua_pushinteger(L, ar->currentline);  /* push current line */
+    else lua_pushnil(L);
+    lua_assert(lua_getinfo(L, "lS", ar));
+    lua_call(L, 2, 0);  /* call hook function */
+  }
+}
+
+
+/*
+** Convert a string mask (for 'sethook') into a bit mask
+*/
+static int makemask (const char *smask, int count) {
+  int mask = 0;
+  if (strchr(smask, 'c')) mask |= LUA_MASKCALL;
+  if (strchr(smask, 'r')) mask |= LUA_MASKRET;
+  if (strchr(smask, 'l')) mask |= LUA_MASKLINE;
+  if (count > 0) mask |= LUA_MASKCOUNT;
+  return mask;
+}
+
+
+/*
+** Convert a bit mask (for 'gethook') into a string mask
+*/
+static char *unmakemask (int mask, char *smask) {
+  int i = 0;
+  if (mask & LUA_MASKCALL) smask[i++] = 'c';
+  if (mask & LUA_MASKRET) smask[i++] = 'r';
+  if (mask & LUA_MASKLINE) smask[i++] = 'l';
+  smask[i] = '\0';
+  return smask;
+}
+
+
+static int db_sethook (lua_State *L) {
+  int arg, mask, count;
+  lua_Hook func;
+  lua_State *L1 = getthread(L, &arg);
+  if (lua_isnoneornil(L, arg+1)) {  /* no hook? */
+    lua_settop(L, arg+1);
+    func = NULL; mask = 0; count = 0;  /* turn off hooks */
+  }
+  else {
+    const char *smask = luaL_checkstring(L, arg+2);
+    luaL_checktype(L, arg+1, LUA_TFUNCTION);
+    count = (int)luaL_optinteger(L, arg + 3, 0);
+    func = hookf; mask = makemask(smask, count);
+  }
+  if (lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY) == LUA_TNIL) {
+    lua_createtable(L, 0, 2);  /* create a hook table */
+    lua_pushvalue(L, -1);
+    lua_rawsetp(L, LUA_REGISTRYINDEX, &HOOKKEY);  /* set it in position */
+    lua_pushstring(L, "k");
+    lua_setfield(L, -2, "__mode");  /** hooktable.__mode = "k" */
+    lua_pushvalue(L, -1);
+    lua_setmetatable(L, -2);  /* setmetatable(hooktable) = hooktable */
+  }
+  checkstack(L, L1, 1);
+  lua_pushthread(L1); lua_xmove(L1, L, 1);  /* key (thread) */
+  lua_pushvalue(L, arg + 1);  /* value (hook function) */
+  lua_rawset(L, -3);  /* hooktable[L1] = new Lua hook */
+  lua_sethook(L1, func, mask, count);
+  return 0;
+}
+
+
+static int db_gethook (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  char buff[5];
+  int mask = lua_gethookmask(L1);
+  lua_Hook hook = lua_gethook(L1);
+  if (hook == NULL)  /* no hook? */
+    lua_pushnil(L);
+  else if (hook != hookf)  /* external hook? */
+    lua_pushliteral(L, "external hook");
+  else {  /* hook table must exist */
+    lua_rawgetp(L, LUA_REGISTRYINDEX, &HOOKKEY);
+    checkstack(L, L1, 1);
+    lua_pushthread(L1); lua_xmove(L1, L, 1);
+    lua_rawget(L, -2);   /* 1st result = hooktable[L1] */
+    lua_remove(L, -2);  /* remove hook table */
+  }
+  lua_pushstring(L, unmakemask(mask, buff));  /* 2nd result = mask */
+  lua_pushinteger(L, lua_gethookcount(L1));  /* 3rd result = count */
+  return 3;
+}
+
+
+static int db_debug (lua_State *L) {
+  for (;;) {
+    char buffer[250];
+    lua_writestringerror("%s", "lua_debug> ");
+    if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
+        strcmp(buffer, "cont\n") == 0)
+      return 0;
+    if (luaL_loadbuffer(L, buffer, strlen(buffer), "=(debug command)") ||
+        lua_pcall(L, 0, 0, 0))
+      lua_writestringerror("%s\n", lua_tostring(L, -1));
+    lua_settop(L, 0);  /* remove eventual returns */
+  }
+}
+
+
+static int db_traceback (lua_State *L) {
+  int arg;
+  lua_State *L1 = getthread(L, &arg);
+  const char *msg = lua_tostring(L, arg + 1);
+  if (msg == NULL && !lua_isnoneornil(L, arg + 1))  /* non-string 'msg'? */
+    lua_pushvalue(L, arg + 1);  /* return it untouched */
+  else {
+    int level = (int)luaL_optinteger(L, arg + 2, (L == L1) ? 1 : 0);
+    luaL_traceback(L, L1, msg, level);
+  }
+  return 1;
+}
+
+
+static const luaL_Reg dblib[] = {
+  {"debug", db_debug},
+  {"getuservalue", db_getuservalue},
+  {"gethook", db_gethook},
+  {"getinfo", db_getinfo},
+  {"getlocal", db_getlocal},
+  {"getregistry", db_getregistry},
+  {"getmetatable", db_getmetatable},
+  {"getupvalue", db_getupvalue},
+  {"upvaluejoin", db_upvaluejoin},
+  {"upvalueid", db_upvalueid},
+  {"setuservalue", db_setuservalue},
+  {"sethook", db_sethook},
+  {"setlocal", db_setlocal},
+  {"setmetatable", db_setmetatable},
+  {"setupvalue", db_setupvalue},
+  {"traceback", db_traceback},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_debug (lua_State *L) {
+  luaL_newlib(L, dblib);
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/ldebug.c b/scite-app/scite/lua/src/ldebug.c
new file mode 100644
index 0000000..239affb
--- /dev/null
+++ b/scite-app/scite/lua/src/ldebug.c
@@ -0,0 +1,698 @@
+/*
+** $Id: ldebug.c,v 2.121 2016/10/19 12:32:10 roberto Exp $
+** Debug Interface
+** See Copyright Notice in lua.h
+*/
+
+#define ldebug_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+
+#define noLuaClosure(f)		((f) == NULL || (f)->c.tt == LUA_TCCL)
+
+
+/* Active Lua function (given call info) */
+#define ci_func(ci)		(clLvalue((ci)->func))
+
+
+static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
+                                    const char **name);
+
+
+static int currentpc (CallInfo *ci) {
+  lua_assert(isLua(ci));
+  return pcRel(ci->u.l.savedpc, ci_func(ci)->p);
+}
+
+
+static int currentline (CallInfo *ci) {
+  return getfuncline(ci_func(ci)->p, currentpc(ci));
+}
+
+
+/*
+** If function yielded, its 'func' can be in the 'extra' field. The
+** next function restores 'func' to its correct value for debugging
+** purposes. (It exchanges 'func' and 'extra'; so, when called again,
+** after debugging, it also "re-restores" ** 'func' to its altered value.
+*/
+static void swapextra (lua_State *L) {
+  if (L->status == LUA_YIELD) {
+    CallInfo *ci = L->ci;  /* get function that yielded */
+    StkId temp = ci->func;  /* exchange its 'func' and 'extra' values */
+    ci->func = restorestack(L, ci->extra);
+    ci->extra = savestack(L, temp);
+  }
+}
+
+
+/*
+** This function can be called asynchronously (e.g. during a signal).
+** Fields 'oldpc', 'basehookcount', and 'hookcount' (set by
+** 'resethookcount') are for debug only, and it is no problem if they
+** get arbitrary values (causes at most one wrong hook call). 'hookmask'
+** is an atomic value. We assume that pointers are atomic too (e.g., gcc
+** ensures that for all platforms where it runs). Moreover, 'hook' is
+** always checked before being called (see 'luaD_hook').
+*/
+LUA_API void lua_sethook (lua_State *L, lua_Hook func, int mask, int count) {
+  if (func == NULL || mask == 0) {  /* turn off hooks? */
+    mask = 0;
+    func = NULL;
+  }
+  if (isLua(L->ci))
+    L->oldpc = L->ci->u.l.savedpc;
+  L->hook = func;
+  L->basehookcount = count;
+  resethookcount(L);
+  L->hookmask = cast_byte(mask);
+}
+
+
+LUA_API lua_Hook lua_gethook (lua_State *L) {
+  return L->hook;
+}
+
+
+LUA_API int lua_gethookmask (lua_State *L) {
+  return L->hookmask;
+}
+
+
+LUA_API int lua_gethookcount (lua_State *L) {
+  return L->basehookcount;
+}
+
+
+LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar) {
+  int status;
+  CallInfo *ci;
+  if (level < 0) return 0;  /* invalid (negative) level */
+  lua_lock(L);
+  for (ci = L->ci; level > 0 && ci != &L->base_ci; ci = ci->previous)
+    level--;
+  if (level == 0 && ci != &L->base_ci) {  /* level found? */
+    status = 1;
+    ar->i_ci = ci;
+  }
+  else status = 0;  /* no such level */
+  lua_unlock(L);
+  return status;
+}
+
+
+static const char *upvalname (Proto *p, int uv) {
+  TString *s = check_exp(uv < p->sizeupvalues, p->upvalues[uv].name);
+  if (s == NULL) return "?";
+  else return getstr(s);
+}
+
+
+static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
+  int nparams = clLvalue(ci->func)->p->numparams;
+  if (n >= cast_int(ci->u.l.base - ci->func) - nparams)
+    return NULL;  /* no such vararg */
+  else {
+    *pos = ci->func + nparams + n;
+    return "(*vararg)";  /* generic name for any vararg */
+  }
+}
+
+
+static const char *findlocal (lua_State *L, CallInfo *ci, int n,
+                              StkId *pos) {
+  const char *name = NULL;
+  StkId base;
+  if (isLua(ci)) {
+    if (n < 0)  /* access to vararg values? */
+      return findvararg(ci, -n, pos);
+    else {
+      base = ci->u.l.base;
+      name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));
+    }
+  }
+  else
+    base = ci->func + 1;
+  if (name == NULL) {  /* no 'standard' name? */
+    StkId limit = (ci == L->ci) ? L->top : ci->next->func;
+    if (limit - base >= n && n > 0)  /* is 'n' inside 'ci' stack? */
+      name = "(*temporary)";  /* generic name for any valid slot */
+    else
+      return NULL;  /* no name */
+  }
+  *pos = base + (n - 1);
+  return name;
+}
+
+
+LUA_API const char *lua_getlocal (lua_State *L, const lua_Debug *ar, int n) {
+  const char *name;
+  lua_lock(L);
+  swapextra(L);
+  if (ar == NULL) {  /* information about non-active function? */
+    if (!isLfunction(L->top - 1))  /* not a Lua function? */
+      name = NULL;
+    else  /* consider live variables at function start (parameters) */
+      name = luaF_getlocalname(clLvalue(L->top - 1)->p, n, 0);
+  }
+  else {  /* active function; get information through 'ar' */
+    StkId pos = NULL;  /* to avoid warnings */
+    name = findlocal(L, ar->i_ci, n, &pos);
+    if (name) {
+      setobj2s(L, L->top, pos);
+      api_incr_top(L);
+    }
+  }
+  swapextra(L);
+  lua_unlock(L);
+  return name;
+}
+
+
+LUA_API const char *lua_setlocal (lua_State *L, const lua_Debug *ar, int n) {
+  StkId pos = NULL;  /* to avoid warnings */
+  const char *name;
+  lua_lock(L);
+  swapextra(L);
+  name = findlocal(L, ar->i_ci, n, &pos);
+  if (name) {
+    setobjs2s(L, pos, L->top - 1);
+    L->top--;  /* pop value */
+  }
+  swapextra(L);
+  lua_unlock(L);
+  return name;
+}
+
+
+static void funcinfo (lua_Debug *ar, Closure *cl) {
+  if (noLuaClosure(cl)) {
+    ar->source = "=[C]";
+    ar->linedefined = -1;
+    ar->lastlinedefined = -1;
+    ar->what = "C";
+  }
+  else {
+    Proto *p = cl->l.p;
+    ar->source = p->source ? getstr(p->source) : "=?";
+    ar->linedefined = p->linedefined;
+    ar->lastlinedefined = p->lastlinedefined;
+    ar->what = (ar->linedefined == 0) ? "main" : "Lua";
+  }
+  luaO_chunkid(ar->short_src, ar->source, LUA_IDSIZE);
+}
+
+
+static void collectvalidlines (lua_State *L, Closure *f) {
+  if (noLuaClosure(f)) {
+    setnilvalue(L->top);
+    api_incr_top(L);
+  }
+  else {
+    int i;
+    TValue v;
+    int *lineinfo = f->l.p->lineinfo;
+    Table *t = luaH_new(L);  /* new table to store active lines */
+    sethvalue(L, L->top, t);  /* push it on stack */
+    api_incr_top(L);
+    setbvalue(&v, 1);  /* boolean 'true' to be the value of all indices */
+    for (i = 0; i < f->l.p->sizelineinfo; i++)  /* for all lines with code */
+      luaH_setint(L, t, lineinfo[i], &v);  /* table[line] = true */
+  }
+}
+
+
+static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
+  if (ci == NULL)  /* no 'ci'? */
+    return NULL;  /* no info */
+  else if (ci->callstatus & CIST_FIN) {  /* is this a finalizer? */
+    *name = "__gc";
+    return "metamethod";  /* report it as such */
+  }
+  /* calling function is a known Lua function? */
+  else if (!(ci->callstatus & CIST_TAIL) && isLua(ci->previous))
+    return funcnamefromcode(L, ci->previous, name);
+  else return NULL;  /* no way to find a name */
+}
+
+
+static int auxgetinfo (lua_State *L, const char *what, lua_Debug *ar,
+                       Closure *f, CallInfo *ci) {
+  int status = 1;
+  for (; *what; what++) {
+    switch (*what) {
+      case 'S': {
+        funcinfo(ar, f);
+        break;
+      }
+      case 'l': {
+        ar->currentline = (ci && isLua(ci)) ? currentline(ci) : -1;
+        break;
+      }
+      case 'u': {
+        ar->nups = (f == NULL) ? 0 : f->c.nupvalues;
+        if (noLuaClosure(f)) {
+          ar->isvararg = 1;
+          ar->nparams = 0;
+        }
+        else {
+          ar->isvararg = f->l.p->is_vararg;
+          ar->nparams = f->l.p->numparams;
+        }
+        break;
+      }
+      case 't': {
+        ar->istailcall = (ci) ? ci->callstatus & CIST_TAIL : 0;
+        break;
+      }
+      case 'n': {
+        ar->namewhat = getfuncname(L, ci, &ar->name);
+        if (ar->namewhat == NULL) {
+          ar->namewhat = "";  /* not found */
+          ar->name = NULL;
+        }
+        break;
+      }
+      case 'L':
+      case 'f':  /* handled by lua_getinfo */
+        break;
+      default: status = 0;  /* invalid option */
+    }
+  }
+  return status;
+}
+
+
+LUA_API int lua_getinfo (lua_State *L, const char *what, lua_Debug *ar) {
+  int status;
+  Closure *cl;
+  CallInfo *ci;
+  StkId func;
+  lua_lock(L);
+  swapextra(L);
+  if (*what == '>') {
+    ci = NULL;
+    func = L->top - 1;
+    api_check(L, ttisfunction(func), "function expected");
+    what++;  /* skip the '>' */
+    L->top--;  /* pop function */
+  }
+  else {
+    ci = ar->i_ci;
+    func = ci->func;
+    lua_assert(ttisfunction(ci->func));
+  }
+  cl = ttisclosure(func) ? clvalue(func) : NULL;
+  status = auxgetinfo(L, what, ar, cl, ci);
+  if (strchr(what, 'f')) {
+    setobjs2s(L, L->top, func);
+    api_incr_top(L);
+  }
+  swapextra(L);  /* correct before option 'L', which can raise a mem. error */
+  if (strchr(what, 'L'))
+    collectvalidlines(L, cl);
+  lua_unlock(L);
+  return status;
+}
+
+
+/*
+** {======================================================
+** Symbolic Execution
+** =======================================================
+*/
+
+static const char *getobjname (Proto *p, int lastpc, int reg,
+                               const char **name);
+
+
+/*
+** find a "name" for the RK value 'c'
+*/
+static void kname (Proto *p, int pc, int c, const char **name) {
+  if (ISK(c)) {  /* is 'c' a constant? */
+    TValue *kvalue = &p->k[INDEXK(c)];
+    if (ttisstring(kvalue)) {  /* literal constant? */
+      *name = svalue(kvalue);  /* it is its own name */
+      return;
+    }
+    /* else no reasonable name found */
+  }
+  else {  /* 'c' is a register */
+    const char *what = getobjname(p, pc, c, name); /* search for 'c' */
+    if (what && *what == 'c') {  /* found a constant name? */
+      return;  /* 'name' already filled */
+    }
+    /* else no reasonable name found */
+  }
+  *name = "?";  /* no reasonable name found */
+}
+
+
+static int filterpc (int pc, int jmptarget) {
+  if (pc < jmptarget)  /* is code conditional (inside a jump)? */
+    return -1;  /* cannot know who sets that register */
+  else return pc;  /* current position sets that register */
+}
+
+
+/*
+** try to find last instruction before 'lastpc' that modified register 'reg'
+*/
+static int findsetreg (Proto *p, int lastpc, int reg) {
+  int pc;
+  int setreg = -1;  /* keep last instruction that changed 'reg' */
+  int jmptarget = 0;  /* any code before this address is conditional */
+  for (pc = 0; pc < lastpc; pc++) {
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    int a = GETARG_A(i);
+    switch (op) {
+      case OP_LOADNIL: {
+        int b = GETARG_B(i);
+        if (a <= reg && reg <= a + b)  /* set registers from 'a' to 'a+b' */
+          setreg = filterpc(pc, jmptarget);
+        break;
+      }
+      case OP_TFORCALL: {
+        if (reg >= a + 2)  /* affect all regs above its base */
+          setreg = filterpc(pc, jmptarget);
+        break;
+      }
+      case OP_CALL:
+      case OP_TAILCALL: {
+        if (reg >= a)  /* affect all registers above base */
+          setreg = filterpc(pc, jmptarget);
+        break;
+      }
+      case OP_JMP: {
+        int b = GETARG_sBx(i);
+        int dest = pc + 1 + b;
+        /* jump is forward and do not skip 'lastpc'? */
+        if (pc < dest && dest <= lastpc) {
+          if (dest > jmptarget)
+            jmptarget = dest;  /* update 'jmptarget' */
+        }
+        break;
+      }
+      default:
+        if (testAMode(op) && reg == a)  /* any instruction that set A */
+          setreg = filterpc(pc, jmptarget);
+        break;
+    }
+  }
+  return setreg;
+}
+
+
+static const char *getobjname (Proto *p, int lastpc, int reg,
+                               const char **name) {
+  int pc;
+  *name = luaF_getlocalname(p, reg + 1, lastpc);
+  if (*name)  /* is a local? */
+    return "local";
+  /* else try symbolic execution */
+  pc = findsetreg(p, lastpc, reg);
+  if (pc != -1) {  /* could find instruction? */
+    Instruction i = p->code[pc];
+    OpCode op = GET_OPCODE(i);
+    switch (op) {
+      case OP_MOVE: {
+        int b = GETARG_B(i);  /* move from 'b' to 'a' */
+        if (b < GETARG_A(i))
+          return getobjname(p, pc, b, name);  /* get name for 'b' */
+        break;
+      }
+      case OP_GETTABUP:
+      case OP_GETTABLE: {
+        int k = GETARG_C(i);  /* key index */
+        int t = GETARG_B(i);  /* table index */
+        const char *vn = (op == OP_GETTABLE)  /* name of indexed variable */
+                         ? luaF_getlocalname(p, t + 1, pc)
+                         : upvalname(p, t);
+        kname(p, pc, k, name);
+        return (vn && strcmp(vn, LUA_ENV) == 0) ? "global" : "field";
+      }
+      case OP_GETUPVAL: {
+        *name = upvalname(p, GETARG_B(i));
+        return "upvalue";
+      }
+      case OP_LOADK:
+      case OP_LOADKX: {
+        int b = (op == OP_LOADK) ? GETARG_Bx(i)
+                                 : GETARG_Ax(p->code[pc + 1]);
+        if (ttisstring(&p->k[b])) {
+          *name = svalue(&p->k[b]);
+          return "constant";
+        }
+        break;
+      }
+      case OP_SELF: {
+        int k = GETARG_C(i);  /* key index */
+        kname(p, pc, k, name);
+        return "method";
+      }
+      default: break;  /* go through to return NULL */
+    }
+  }
+  return NULL;  /* could not find reasonable name */
+}
+
+
+/*
+** Try to find a name for a function based on the code that called it.
+** (Only works when function was called by a Lua function.)
+** Returns what the name is (e.g., "for iterator", "method",
+** "metamethod") and sets '*name' to point to the name.
+*/
+static const char *funcnamefromcode (lua_State *L, CallInfo *ci,
+                                     const char **name) {
+  TMS tm = (TMS)0;  /* (initial value avoids warnings) */
+  Proto *p = ci_func(ci)->p;  /* calling function */
+  int pc = currentpc(ci);  /* calling instruction index */
+  Instruction i = p->code[pc];  /* calling instruction */
+  if (ci->callstatus & CIST_HOOKED) {  /* was it called inside a hook? */
+    *name = "?";
+    return "hook";
+  }
+  switch (GET_OPCODE(i)) {
+    case OP_CALL:
+    case OP_TAILCALL:
+      return getobjname(p, pc, GETARG_A(i), name);  /* get function name */
+    case OP_TFORCALL: {  /* for iterator */
+      *name = "for iterator";
+       return "for iterator";
+    }
+    /* other instructions can do calls through metamethods */
+    case OP_SELF: case OP_GETTABUP: case OP_GETTABLE:
+      tm = TM_INDEX;
+      break;
+    case OP_SETTABUP: case OP_SETTABLE:
+      tm = TM_NEWINDEX;
+      break;
+    case OP_ADD: case OP_SUB: case OP_MUL: case OP_MOD:
+    case OP_POW: case OP_DIV: case OP_IDIV: case OP_BAND:
+    case OP_BOR: case OP_BXOR: case OP_SHL: case OP_SHR: {
+      int offset = cast_int(GET_OPCODE(i)) - cast_int(OP_ADD);  /* ORDER OP */
+      tm = cast(TMS, offset + cast_int(TM_ADD));  /* ORDER TM */
+      break;
+    }
+    case OP_UNM: tm = TM_UNM; break;
+    case OP_BNOT: tm = TM_BNOT; break;
+    case OP_LEN: tm = TM_LEN; break;
+    case OP_CONCAT: tm = TM_CONCAT; break;
+    case OP_EQ: tm = TM_EQ; break;
+    case OP_LT: tm = TM_LT; break;
+    case OP_LE: tm = TM_LE; break;
+    default:
+      return NULL;  /* cannot find a reasonable name */
+  }
+  *name = getstr(G(L)->tmname[tm]);
+  return "metamethod";
+}
+
+/* }====================================================== */
+
+
+
+/*
+** The subtraction of two potentially unrelated pointers is
+** not ISO C, but it should not crash a program; the subsequent
+** checks are ISO C and ensure a correct result.
+*/
+static int isinstack (CallInfo *ci, const TValue *o) {
+  ptrdiff_t i = o - ci->u.l.base;
+  return (0 <= i && i < (ci->top - ci->u.l.base) && ci->u.l.base + i == o);
+}
+
+
+/*
+** Checks whether value 'o' came from an upvalue. (That can only happen
+** with instructions OP_GETTABUP/OP_SETTABUP, which operate directly on
+** upvalues.)
+*/
+static const char *getupvalname (CallInfo *ci, const TValue *o,
+                                 const char **name) {
+  LClosure *c = ci_func(ci);
+  int i;
+  for (i = 0; i < c->nupvalues; i++) {
+    if (c->upvals[i]->v == o) {
+      *name = upvalname(c->p, i);
+      return "upvalue";
+    }
+  }
+  return NULL;
+}
+
+
+static const char *varinfo (lua_State *L, const TValue *o) {
+  const char *name = NULL;  /* to avoid warnings */
+  CallInfo *ci = L->ci;
+  const char *kind = NULL;
+  if (isLua(ci)) {
+    kind = getupvalname(ci, o, &name);  /* check whether 'o' is an upvalue */
+    if (!kind && isinstack(ci, o))  /* no? try a register */
+      kind = getobjname(ci_func(ci)->p, currentpc(ci),
+                        cast_int(o - ci->u.l.base), &name);
+  }
+  return (kind) ? luaO_pushfstring(L, " (%s '%s')", kind, name) : "";
+}
+
+
+l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
+  const char *t = luaT_objtypename(L, o);
+  luaG_runerror(L, "attempt to %s a %s value%s", op, t, varinfo(L, o));
+}
+
+
+l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) {
+  if (ttisstring(p1) || cvt2str(p1)) p1 = p2;
+  luaG_typeerror(L, p1, "concatenate");
+}
+
+
+l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                         const TValue *p2, const char *msg) {
+  lua_Number temp;
+  if (!tonumber(p1, &temp))  /* first operand is wrong? */
+    p2 = p1;  /* now second is wrong */
+  luaG_typeerror(L, p2, msg);
+}
+
+
+/*
+** Error when both values are convertible to numbers, but not to integers
+*/
+l_noret luaG_tointerror (lua_State *L, const TValue *p1, const TValue *p2) {
+  lua_Integer temp;
+  if (!tointeger(p1, &temp))
+    p2 = p1;
+  luaG_runerror(L, "number%s has no integer representation", varinfo(L, p2));
+}
+
+
+l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
+  const char *t1 = luaT_objtypename(L, p1);
+  const char *t2 = luaT_objtypename(L, p2);
+  if (strcmp(t1, t2) == 0)
+    luaG_runerror(L, "attempt to compare two %s values", t1);
+  else
+    luaG_runerror(L, "attempt to compare %s with %s", t1, t2);
+}
+
+
+/* add src:line information to 'msg' */
+const char *luaG_addinfo (lua_State *L, const char *msg, TString *src,
+                                        int line) {
+  char buff[LUA_IDSIZE];
+  if (src)
+    luaO_chunkid(buff, getstr(src), LUA_IDSIZE);
+  else {  /* no source available; use "?" instead */
+    buff[0] = '?'; buff[1] = '\0';
+  }
+  return luaO_pushfstring(L, "%s:%d: %s", buff, line, msg);
+}
+
+
+l_noret luaG_errormsg (lua_State *L) {
+  if (L->errfunc != 0) {  /* is there an error handling function? */
+    StkId errfunc = restorestack(L, L->errfunc);
+    setobjs2s(L, L->top, L->top - 1);  /* move argument */
+    setobjs2s(L, L->top - 1, errfunc);  /* push function */
+    L->top++;  /* assume EXTRA_STACK */
+    luaD_callnoyield(L, L->top - 2, 1);  /* call it */
+  }
+  luaD_throw(L, LUA_ERRRUN);
+}
+
+
+l_noret luaG_runerror (lua_State *L, const char *fmt, ...) {
+  CallInfo *ci = L->ci;
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);  /* format message */
+  va_end(argp);
+  if (isLua(ci))  /* if Lua function, add source:line information */
+    luaG_addinfo(L, msg, ci_func(ci)->p->source, currentline(ci));
+  luaG_errormsg(L);
+}
+
+
+void luaG_traceexec (lua_State *L) {
+  CallInfo *ci = L->ci;
+  lu_byte mask = L->hookmask;
+  int counthook = (--L->hookcount == 0 && (mask & LUA_MASKCOUNT));
+  if (counthook)
+    resethookcount(L);  /* reset count */
+  else if (!(mask & LUA_MASKLINE))
+    return;  /* no line hook and count != 0; nothing to be done */
+  if (ci->callstatus & CIST_HOOKYIELD) {  /* called hook last time? */
+    ci->callstatus &= ~CIST_HOOKYIELD;  /* erase mark */
+    return;  /* do not call hook again (VM yielded, so it did not move) */
+  }
+  if (counthook)
+    luaD_hook(L, LUA_HOOKCOUNT, -1);  /* call count hook */
+  if (mask & LUA_MASKLINE) {
+    Proto *p = ci_func(ci)->p;
+    int npc = pcRel(ci->u.l.savedpc, p);
+    int newline = getfuncline(p, npc);
+    if (npc == 0 ||  /* call linehook when enter a new function, */
+        ci->u.l.savedpc <= L->oldpc ||  /* when jump back (loop), or when */
+        newline != getfuncline(p, pcRel(L->oldpc, p)))  /* enter a new line */
+      luaD_hook(L, LUA_HOOKLINE, newline);  /* call line hook */
+  }
+  L->oldpc = ci->u.l.savedpc;
+  if (L->status == LUA_YIELD) {  /* did hook yield? */
+    if (counthook)
+      L->hookcount = 1;  /* undo decrement to zero */
+    ci->u.l.savedpc--;  /* undo increment (resume will increment it again) */
+    ci->callstatus |= CIST_HOOKYIELD;  /* mark that it yielded */
+    ci->func = L->top - 1;  /* protect stack below results */
+    luaD_throw(L, LUA_YIELD);
+  }
+}
+
diff --git a/scite-app/scite/lua/src/ldebug.h b/scite-app/scite/lua/src/ldebug.h
new file mode 100644
index 0000000..0e31546
--- /dev/null
+++ b/scite-app/scite/lua/src/ldebug.h
@@ -0,0 +1,39 @@
+/*
+** $Id: ldebug.h,v 2.14 2015/05/22 17:45:56 roberto Exp $
+** Auxiliary functions from Debug Interface module
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldebug_h
+#define ldebug_h
+
+
+#include "lstate.h"
+
+
+#define pcRel(pc, p)	(cast(int, (pc) - (p)->code) - 1)
+
+#define getfuncline(f,pc)	(((f)->lineinfo) ? (f)->lineinfo[pc] : -1)
+
+#define resethookcount(L)	(L->hookcount = L->basehookcount)
+
+
+LUAI_FUNC l_noret luaG_typeerror (lua_State *L, const TValue *o,
+                                                const char *opname);
+LUAI_FUNC l_noret luaG_concaterror (lua_State *L, const TValue *p1,
+                                                  const TValue *p2);
+LUAI_FUNC l_noret luaG_opinterror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2,
+                                                 const char *msg);
+LUAI_FUNC l_noret luaG_tointerror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_ordererror (lua_State *L, const TValue *p1,
+                                                 const TValue *p2);
+LUAI_FUNC l_noret luaG_runerror (lua_State *L, const char *fmt, ...);
+LUAI_FUNC const char *luaG_addinfo (lua_State *L, const char *msg,
+                                                  TString *src, int line);
+LUAI_FUNC l_noret luaG_errormsg (lua_State *L);
+LUAI_FUNC void luaG_traceexec (lua_State *L);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/ldo.c b/scite-app/scite/lua/src/ldo.c
new file mode 100644
index 0000000..90b695f
--- /dev/null
+++ b/scite-app/scite/lua/src/ldo.c
@@ -0,0 +1,802 @@
+/*
+** $Id: ldo.c,v 2.157 2016/12/13 15:52:21 roberto Exp $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#define ldo_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <setjmp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+#include "lzio.h"
+
+
+
+#define errorstatus(s)	((s) > LUA_YIELD)
+
+
+/*
+** {======================================================
+** Error-recovery functions
+** =======================================================
+*/
+
+/*
+** LUAI_THROW/LUAI_TRY define how Lua does exception handling. By
+** default, Lua handles errors with exceptions when compiling as
+** C++ code, with _longjmp/_setjmp when asked to use them, and with
+** longjmp/setjmp otherwise.
+*/
+#if !defined(LUAI_THROW)				/* { */
+
+#if defined(__cplusplus) && !defined(LUA_USE_LONGJMP)	/* { */
+
+/* C++ exceptions */
+#define LUAI_THROW(L,c)		throw(c)
+#define LUAI_TRY(L,c,a) \
+	try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf		int  /* dummy variable */
+
+#elif defined(LUA_USE_POSIX)				/* }{ */
+
+/* in POSIX, try _longjmp/_setjmp (more efficient) */
+#define LUAI_THROW(L,c)		_longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#else							/* }{ */
+
+/* ISO C handling with long jumps */
+#define LUAI_THROW(L,c)		longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a)		if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf		jmp_buf
+
+#endif							/* } */
+
+#endif							/* } */
+
+
+
+/* chain list of long jump buffers */
+struct lua_longjmp {
+  struct lua_longjmp *previous;
+  luai_jmpbuf b;
+  volatile int status;  /* error code */
+};
+
+
+static void seterrorobj (lua_State *L, int errcode, StkId oldtop) {
+  switch (errcode) {
+    case LUA_ERRMEM: {  /* memory error? */
+      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
+      break;
+    }
+    case LUA_ERRERR: {
+      setsvalue2s(L, oldtop, luaS_newliteral(L, "error in error handling"));
+      break;
+    }
+    default: {
+      setobjs2s(L, oldtop, L->top - 1);  /* error message on current top */
+      break;
+    }
+  }
+  L->top = oldtop + 1;
+}
+
+
+l_noret luaD_throw (lua_State *L, int errcode) {
+  if (L->errorJmp) {  /* thread has an error handler? */
+    L->errorJmp->status = errcode;  /* set status */
+    LUAI_THROW(L, L->errorJmp);  /* jump to it */
+  }
+  else {  /* thread has no error handler */
+    global_State *g = G(L);
+    L->status = cast_byte(errcode);  /* mark it as dead */
+    if (g->mainthread->errorJmp) {  /* main thread has a handler? */
+      setobjs2s(L, g->mainthread->top++, L->top - 1);  /* copy error obj. */
+      luaD_throw(g->mainthread, errcode);  /* re-throw in main thread */
+    }
+    else {  /* no handler at all; abort */
+      if (g->panic) {  /* panic function? */
+        seterrorobj(L, errcode, L->top);  /* assume EXTRA_STACK */
+        if (L->ci->top < L->top)
+          L->ci->top = L->top;  /* pushing msg. can break this invariant */
+        lua_unlock(L);
+        g->panic(L);  /* call panic function (last chance to jump out) */
+      }
+      abort();
+    }
+  }
+}
+
+
+int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
+  unsigned short oldnCcalls = L->nCcalls;
+  struct lua_longjmp lj;
+  lj.status = LUA_OK;
+  lj.previous = L->errorJmp;  /* chain new error handler */
+  L->errorJmp = &lj;
+  LUAI_TRY(L, &lj,
+    (*f)(L, ud);
+  );
+  L->errorJmp = lj.previous;  /* restore old error handler */
+  L->nCcalls = oldnCcalls;
+  return lj.status;
+}
+
+/* }====================================================== */
+
+
+/*
+** {==================================================================
+** Stack reallocation
+** ===================================================================
+*/
+static void correctstack (lua_State *L, TValue *oldstack) {
+  CallInfo *ci;
+  UpVal *up;
+  L->top = (L->top - oldstack) + L->stack;
+  for (up = L->openupval; up != NULL; up = up->u.open.next)
+    up->v = (up->v - oldstack) + L->stack;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    ci->top = (ci->top - oldstack) + L->stack;
+    ci->func = (ci->func - oldstack) + L->stack;
+    if (isLua(ci))
+      ci->u.l.base = (ci->u.l.base - oldstack) + L->stack;
+  }
+}
+
+
+/* some space for error handling */
+#define ERRORSTACKSIZE	(LUAI_MAXSTACK + 200)
+
+
+void luaD_reallocstack (lua_State *L, int newsize) {
+  TValue *oldstack = L->stack;
+  int lim = L->stacksize;
+  lua_assert(newsize <= LUAI_MAXSTACK || newsize == ERRORSTACKSIZE);
+  lua_assert(L->stack_last - L->stack == L->stacksize - EXTRA_STACK);
+  luaM_reallocvector(L, L->stack, L->stacksize, newsize, TValue);
+  for (; lim < newsize; lim++)
+    setnilvalue(L->stack + lim); /* erase new segment */
+  L->stacksize = newsize;
+  L->stack_last = L->stack + newsize - EXTRA_STACK;
+  correctstack(L, oldstack);
+}
+
+
+void luaD_growstack (lua_State *L, int n) {
+  int size = L->stacksize;
+  if (size > LUAI_MAXSTACK)  /* error after extra size? */
+    luaD_throw(L, LUA_ERRERR);
+  else {
+    int needed = cast_int(L->top - L->stack) + n + EXTRA_STACK;
+    int newsize = 2 * size;
+    if (newsize > LUAI_MAXSTACK) newsize = LUAI_MAXSTACK;
+    if (newsize < needed) newsize = needed;
+    if (newsize > LUAI_MAXSTACK) {  /* stack overflow? */
+      luaD_reallocstack(L, ERRORSTACKSIZE);
+      luaG_runerror(L, "stack overflow");
+    }
+    else
+      luaD_reallocstack(L, newsize);
+  }
+}
+
+
+static int stackinuse (lua_State *L) {
+  CallInfo *ci;
+  StkId lim = L->top;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {
+    if (lim < ci->top) lim = ci->top;
+  }
+  lua_assert(lim <= L->stack_last);
+  return cast_int(lim - L->stack) + 1;  /* part of stack in use */
+}
+
+
+void luaD_shrinkstack (lua_State *L) {
+  int inuse = stackinuse(L);
+  int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK;
+  if (goodsize > LUAI_MAXSTACK)
+    goodsize = LUAI_MAXSTACK;  /* respect stack limit */
+  if (L->stacksize > LUAI_MAXSTACK)  /* had been handling stack overflow? */
+    luaE_freeCI(L);  /* free all CIs (list grew because of an error) */
+  else
+    luaE_shrinkCI(L);  /* shrink list */
+  /* if thread is currently not handling a stack overflow and its
+     good size is smaller than current size, shrink its stack */
+  if (inuse <= (LUAI_MAXSTACK - EXTRA_STACK) &&
+      goodsize < L->stacksize)
+    luaD_reallocstack(L, goodsize);
+  else  /* don't change stack */
+    condmovestack(L,{},{});  /* (change only for debugging) */
+}
+
+
+void luaD_inctop (lua_State *L) {
+  luaD_checkstack(L, 1);
+  L->top++;
+}
+
+/* }================================================================== */
+
+
+/*
+** Call a hook for the given event. Make sure there is a hook to be
+** called. (Both 'L->hook' and 'L->hookmask', which triggers this
+** function, can be changed asynchronously by signals.)
+*/
+void luaD_hook (lua_State *L, int event, int line) {
+  lua_Hook hook = L->hook;
+  if (hook && L->allowhook) {  /* make sure there is a hook */
+    CallInfo *ci = L->ci;
+    ptrdiff_t top = savestack(L, L->top);
+    ptrdiff_t ci_top = savestack(L, ci->top);
+    lua_Debug ar;
+    ar.event = event;
+    ar.currentline = line;
+    ar.i_ci = ci;
+    luaD_checkstack(L, LUA_MINSTACK);  /* ensure minimum stack size */
+    ci->top = L->top + LUA_MINSTACK;
+    lua_assert(ci->top <= L->stack_last);
+    L->allowhook = 0;  /* cannot call hooks inside a hook */
+    ci->callstatus |= CIST_HOOKED;
+    lua_unlock(L);
+    (*hook)(L, &ar);
+    lua_lock(L);
+    lua_assert(!L->allowhook);
+    L->allowhook = 1;
+    ci->top = restorestack(L, ci_top);
+    L->top = restorestack(L, top);
+    ci->callstatus &= ~CIST_HOOKED;
+  }
+}
+
+
+static void callhook (lua_State *L, CallInfo *ci) {
+  int hook = LUA_HOOKCALL;
+  ci->u.l.savedpc++;  /* hooks assume 'pc' is already incremented */
+  if (isLua(ci->previous) &&
+      GET_OPCODE(*(ci->previous->u.l.savedpc - 1)) == OP_TAILCALL) {
+    ci->callstatus |= CIST_TAIL;
+    hook = LUA_HOOKTAILCALL;
+  }
+  luaD_hook(L, hook, -1);
+  ci->u.l.savedpc--;  /* correct 'pc' */
+}
+
+
+static StkId adjust_varargs (lua_State *L, Proto *p, int actual) {
+  int i;
+  int nfixargs = p->numparams;
+  StkId base, fixed;
+  /* move fixed parameters to final position */
+  fixed = L->top - actual;  /* first fixed argument */
+  base = L->top;  /* final position of first argument */
+  for (i = 0; i < nfixargs && i < actual; i++) {
+    setobjs2s(L, L->top++, fixed + i);
+    setnilvalue(fixed + i);  /* erase original copy (for GC) */
+  }
+  for (; i < nfixargs; i++)
+    setnilvalue(L->top++);  /* complete missing arguments */
+  return base;
+}
+
+
+/*
+** Check whether __call metafield of 'func' is a function. If so, put
+** it in stack below original 'func' so that 'luaD_precall' can call
+** it. Raise an error if __call metafield is not a function.
+*/
+static void tryfuncTM (lua_State *L, StkId func) {
+  const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
+  StkId p;
+  if (!ttisfunction(tm))
+    luaG_typeerror(L, func, "call");
+  /* Open a hole inside the stack at 'func' */
+  for (p = L->top; p > func; p--)
+    setobjs2s(L, p, p-1);
+  L->top++;  /* slot ensured by caller */
+  setobj2s(L, func, tm);  /* tag method is the new function to be called */
+}
+
+
+/*
+** Given 'nres' results at 'firstResult', move 'wanted' of them to 'res'.
+** Handle most typical cases (zero results for commands, one result for
+** expressions, multiple results for tail calls/single parameters)
+** separated.
+*/
+static int moveresults (lua_State *L, const TValue *firstResult, StkId res,
+                                      int nres, int wanted) {
+  switch (wanted) {  /* handle typical cases separately */
+    case 0: break;  /* nothing to move */
+    case 1: {  /* one result needed */
+      if (nres == 0)   /* no results? */
+        firstResult = luaO_nilobject;  /* adjust with nil */
+      setobjs2s(L, res, firstResult);  /* move it to proper place */
+      break;
+    }
+    case LUA_MULTRET: {
+      int i;
+      for (i = 0; i < nres; i++)  /* move all results to correct place */
+        setobjs2s(L, res + i, firstResult + i);
+      L->top = res + nres;
+      return 0;  /* wanted == LUA_MULTRET */
+    }
+    default: {
+      int i;
+      if (wanted <= nres) {  /* enough results? */
+        for (i = 0; i < wanted; i++)  /* move wanted results to correct place */
+          setobjs2s(L, res + i, firstResult + i);
+      }
+      else {  /* not enough results; use all of them plus nils */
+        for (i = 0; i < nres; i++)  /* move all results to correct place */
+          setobjs2s(L, res + i, firstResult + i);
+        for (; i < wanted; i++)  /* complete wanted number of results */
+          setnilvalue(res + i);
+      }
+      break;
+    }
+  }
+  L->top = res + wanted;  /* top points after the last result */
+  return 1;
+}
+
+
+/*
+** Finishes a function call: calls hook if necessary, removes CallInfo,
+** moves current number of results to proper place; returns 0 iff call
+** wanted multiple (variable number of) results.
+*/
+int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) {
+  StkId res;
+  int wanted = ci->nresults;
+  if (L->hookmask & (LUA_MASKRET | LUA_MASKLINE)) {
+    if (L->hookmask & LUA_MASKRET) {
+      ptrdiff_t fr = savestack(L, firstResult);  /* hook may change stack */
+      luaD_hook(L, LUA_HOOKRET, -1);
+      firstResult = restorestack(L, fr);
+    }
+    L->oldpc = ci->previous->u.l.savedpc;  /* 'oldpc' for caller function */
+  }
+  res = ci->func;  /* res == final position of 1st result */
+  L->ci = ci->previous;  /* back to caller */
+  /* move results to proper place */
+  return moveresults(L, firstResult, res, nres, wanted);
+}
+
+
+
+#define next_ci(L) (L->ci = (L->ci->next ? L->ci->next : luaE_extendCI(L)))
+
+
+/* macro to check stack size, preserving 'p' */
+#define checkstackp(L,n,p)  \
+  luaD_checkstackaux(L, n, \
+    ptrdiff_t t__ = savestack(L, p);  /* save 'p' */ \
+    luaC_checkGC(L),  /* stack grow uses memory */ \
+    p = restorestack(L, t__))  /* 'pos' part: restore 'p' */
+
+
+/*
+** Prepares a function call: checks the stack, creates a new CallInfo
+** entry, fills in the relevant information, calls hook if needed.
+** If function is a C function, does the call, too. (Otherwise, leave
+** the execution ('luaV_execute') to the caller, to allow stackless
+** calls.) Returns true iff function has been executed (C function).
+*/
+int luaD_precall (lua_State *L, StkId func, int nresults) {
+  lua_CFunction f;
+  CallInfo *ci;
+  switch (ttype(func)) {
+    case LUA_TCCL:  /* C closure */
+      f = clCvalue(func)->f;
+      goto Cfunc;
+    case LUA_TLCF:  /* light C function */
+      f = fvalue(func);
+     Cfunc: {
+      int n;  /* number of returns */
+      checkstackp(L, LUA_MINSTACK, func);  /* ensure minimum stack size */
+      ci = next_ci(L);  /* now 'enter' new function */
+      ci->nresults = nresults;
+      ci->func = func;
+      ci->top = L->top + LUA_MINSTACK;
+      lua_assert(ci->top <= L->stack_last);
+      ci->callstatus = 0;
+      if (L->hookmask & LUA_MASKCALL)
+        luaD_hook(L, LUA_HOOKCALL, -1);
+      lua_unlock(L);
+      n = (*f)(L);  /* do the actual call */
+      lua_lock(L);
+      api_checknelems(L, n);
+      luaD_poscall(L, ci, L->top - n, n);
+      return 1;
+    }
+    case LUA_TLCL: {  /* Lua function: prepare its call */
+      StkId base;
+      Proto *p = clLvalue(func)->p;
+      int n = cast_int(L->top - func) - 1;  /* number of real arguments */
+      int fsize = p->maxstacksize;  /* frame size */
+      checkstackp(L, fsize, func);
+      if (p->is_vararg)
+        base = adjust_varargs(L, p, n);
+      else {  /* non vararg function */
+        for (; n < p->numparams; n++)
+          setnilvalue(L->top++);  /* complete missing arguments */
+        base = func + 1;
+      }
+      ci = next_ci(L);  /* now 'enter' new function */
+      ci->nresults = nresults;
+      ci->func = func;
+      ci->u.l.base = base;
+      L->top = ci->top = base + fsize;
+      lua_assert(ci->top <= L->stack_last);
+      ci->u.l.savedpc = p->code;  /* starting point */
+      ci->callstatus = CIST_LUA;
+      if (L->hookmask & LUA_MASKCALL)
+        callhook(L, ci);
+      return 0;
+    }
+    default: {  /* not a function */
+      checkstackp(L, 1, func);  /* ensure space for metamethod */
+      tryfuncTM(L, func);  /* try to get '__call' metamethod */
+      return luaD_precall(L, func, nresults);  /* now it must be a function */
+    }
+  }
+}
+
+
+/*
+** Check appropriate error for stack overflow ("regular" overflow or
+** overflow while handling stack overflow). If 'nCalls' is larger than
+** LUAI_MAXCCALLS (which means it is handling a "regular" overflow) but
+** smaller than 9/8 of LUAI_MAXCCALLS, does not report an error (to
+** allow overflow handling to work)
+*/
+static void stackerror (lua_State *L) {
+  if (L->nCcalls == LUAI_MAXCCALLS)
+    luaG_runerror(L, "C stack overflow");
+  else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
+    luaD_throw(L, LUA_ERRERR);  /* error while handing stack error */
+}
+
+
+/*
+** Call a function (C or Lua). The function to be called is at *func.
+** The arguments are on the stack, right after the function.
+** When returns, all the results are on the stack, starting at the original
+** function position.
+*/
+void luaD_call (lua_State *L, StkId func, int nResults) {
+  if (++L->nCcalls >= LUAI_MAXCCALLS)
+    stackerror(L);
+  if (!luaD_precall(L, func, nResults))  /* is a Lua function? */
+    luaV_execute(L);  /* call it */
+  L->nCcalls--;
+}
+
+
+/*
+** Similar to 'luaD_call', but does not allow yields during the call
+*/
+void luaD_callnoyield (lua_State *L, StkId func, int nResults) {
+  L->nny++;
+  luaD_call(L, func, nResults);
+  L->nny--;
+}
+
+
+/*
+** Completes the execution of an interrupted C function, calling its
+** continuation function.
+*/
+static void finishCcall (lua_State *L, int status) {
+  CallInfo *ci = L->ci;
+  int n;
+  /* must have a continuation and must be able to call it */
+  lua_assert(ci->u.c.k != NULL && L->nny == 0);
+  /* error status can only happen in a protected call */
+  lua_assert((ci->callstatus & CIST_YPCALL) || status == LUA_YIELD);
+  if (ci->callstatus & CIST_YPCALL) {  /* was inside a pcall? */
+    ci->callstatus &= ~CIST_YPCALL;  /* continuation is also inside it */
+    L->errfunc = ci->u.c.old_errfunc;  /* with the same error function */
+  }
+  /* finish 'lua_callk'/'lua_pcall'; CIST_YPCALL and 'errfunc' already
+     handled */
+  adjustresults(L, ci->nresults);
+  lua_unlock(L);
+  n = (*ci->u.c.k)(L, status, ci->u.c.ctx);  /* call continuation function */
+  lua_lock(L);
+  api_checknelems(L, n);
+  luaD_poscall(L, ci, L->top - n, n);  /* finish 'luaD_precall' */
+}
+
+
+/*
+** Executes "full continuation" (everything in the stack) of a
+** previously interrupted coroutine until the stack is empty (or another
+** interruption long-jumps out of the loop). If the coroutine is
+** recovering from an error, 'ud' points to the error status, which must
+** be passed to the first continuation function (otherwise the default
+** status is LUA_YIELD).
+*/
+static void unroll (lua_State *L, void *ud) {
+  if (ud != NULL)  /* error status? */
+    finishCcall(L, *(int *)ud);  /* finish 'lua_pcallk' callee */
+  while (L->ci != &L->base_ci) {  /* something in the stack */
+    if (!isLua(L->ci))  /* C function? */
+      finishCcall(L, LUA_YIELD);  /* complete its execution */
+    else {  /* Lua function */
+      luaV_finishOp(L);  /* finish interrupted instruction */
+      luaV_execute(L);  /* execute down to higher C 'boundary' */
+    }
+  }
+}
+
+
+/*
+** Try to find a suspended protected call (a "recover point") for the
+** given thread.
+*/
+static CallInfo *findpcall (lua_State *L) {
+  CallInfo *ci;
+  for (ci = L->ci; ci != NULL; ci = ci->previous) {  /* search for a pcall */
+    if (ci->callstatus & CIST_YPCALL)
+      return ci;
+  }
+  return NULL;  /* no pending pcall */
+}
+
+
+/*
+** Recovers from an error in a coroutine. Finds a recover point (if
+** there is one) and completes the execution of the interrupted
+** 'luaD_pcall'. If there is no recover point, returns zero.
+*/
+static int recover (lua_State *L, int status) {
+  StkId oldtop;
+  CallInfo *ci = findpcall(L);
+  if (ci == NULL) return 0;  /* no recovery point */
+  /* "finish" luaD_pcall */
+  oldtop = restorestack(L, ci->extra);
+  luaF_close(L, oldtop);
+  seterrorobj(L, status, oldtop);
+  L->ci = ci;
+  L->allowhook = getoah(ci->callstatus);  /* restore original 'allowhook' */
+  L->nny = 0;  /* should be zero to be yieldable */
+  luaD_shrinkstack(L);
+  L->errfunc = ci->u.c.old_errfunc;
+  return 1;  /* continue running the coroutine */
+}
+
+
+/*
+** Signal an error in the call to 'lua_resume', not in the execution
+** of the coroutine itself. (Such errors should not be handled by any
+** coroutine error handler and should not kill the coroutine.)
+*/
+static int resume_error (lua_State *L, const char *msg, int narg) {
+  L->top -= narg;  /* remove args from the stack */
+  setsvalue2s(L, L->top, luaS_new(L, msg));  /* push error message */
+  api_incr_top(L);
+  lua_unlock(L);
+  return LUA_ERRRUN;
+}
+
+
+/*
+** Do the work for 'lua_resume' in protected mode. Most of the work
+** depends on the status of the coroutine: initial state, suspended
+** inside a hook, or regularly suspended (optionally with a continuation
+** function), plus erroneous cases: non-suspended coroutine or dead
+** coroutine.
+*/
+static void resume (lua_State *L, void *ud) {
+  int n = *(cast(int*, ud));  /* number of arguments */
+  StkId firstArg = L->top - n;  /* first argument */
+  CallInfo *ci = L->ci;
+  if (L->status == LUA_OK) {  /* starting a coroutine? */
+    if (!luaD_precall(L, firstArg - 1, LUA_MULTRET))  /* Lua function? */
+      luaV_execute(L);  /* call it */
+  }
+  else {  /* resuming from previous yield */
+    lua_assert(L->status == LUA_YIELD);
+    L->status = LUA_OK;  /* mark that it is running (again) */
+    ci->func = restorestack(L, ci->extra);
+    if (isLua(ci))  /* yielded inside a hook? */
+      luaV_execute(L);  /* just continue running Lua code */
+    else {  /* 'common' yield */
+      if (ci->u.c.k != NULL) {  /* does it have a continuation function? */
+        lua_unlock(L);
+        n = (*ci->u.c.k)(L, LUA_YIELD, ci->u.c.ctx); /* call continuation */
+        lua_lock(L);
+        api_checknelems(L, n);
+        firstArg = L->top - n;  /* yield results come from continuation */
+      }
+      luaD_poscall(L, ci, firstArg, n);  /* finish 'luaD_precall' */
+    }
+    unroll(L, NULL);  /* run continuation */
+  }
+}
+
+
+LUA_API int lua_resume (lua_State *L, lua_State *from, int nargs) {
+  int status;
+  unsigned short oldnny = L->nny;  /* save "number of non-yieldable" calls */
+  lua_lock(L);
+  if (L->status == LUA_OK) {  /* may be starting a coroutine */
+    if (L->ci != &L->base_ci)  /* not in base level? */
+      return resume_error(L, "cannot resume non-suspended coroutine", nargs);
+  }
+  else if (L->status != LUA_YIELD)
+    return resume_error(L, "cannot resume dead coroutine", nargs);
+  L->nCcalls = (from) ? from->nCcalls + 1 : 1;
+  if (L->nCcalls >= LUAI_MAXCCALLS)
+    return resume_error(L, "C stack overflow", nargs);
+  luai_userstateresume(L, nargs);
+  L->nny = 0;  /* allow yields */
+  api_checknelems(L, (L->status == LUA_OK) ? nargs + 1 : nargs);
+  status = luaD_rawrunprotected(L, resume, &nargs);
+  if (status == -1)  /* error calling 'lua_resume'? */
+    status = LUA_ERRRUN;
+  else {  /* continue running after recoverable errors */
+    while (errorstatus(status) && recover(L, status)) {
+      /* unroll continuation */
+      status = luaD_rawrunprotected(L, unroll, &status);
+    }
+    if (errorstatus(status)) {  /* unrecoverable error? */
+      L->status = cast_byte(status);  /* mark thread as 'dead' */
+      seterrorobj(L, status, L->top);  /* push error message */
+      L->ci->top = L->top;
+    }
+    else lua_assert(status == L->status);  /* normal end or yield */
+  }
+  L->nny = oldnny;  /* restore 'nny' */
+  L->nCcalls--;
+  lua_assert(L->nCcalls == ((from) ? from->nCcalls : 0));
+  lua_unlock(L);
+  return status;
+}
+
+
+LUA_API int lua_isyieldable (lua_State *L) {
+  return (L->nny == 0);
+}
+
+
+LUA_API int lua_yieldk (lua_State *L, int nresults, lua_KContext ctx,
+                        lua_KFunction k) {
+  CallInfo *ci = L->ci;
+  luai_userstateyield(L, nresults);
+  lua_lock(L);
+  api_checknelems(L, nresults);
+  if (L->nny > 0) {
+    if (L != G(L)->mainthread)
+      luaG_runerror(L, "attempt to yield across a C-call boundary");
+    else
+      luaG_runerror(L, "attempt to yield from outside a coroutine");
+  }
+  L->status = LUA_YIELD;
+  ci->extra = savestack(L, ci->func);  /* save current 'func' */
+  if (isLua(ci)) {  /* inside a hook? */
+    api_check(L, k == NULL, "hooks cannot continue after yielding");
+  }
+  else {
+    if ((ci->u.c.k = k) != NULL)  /* is there a continuation? */
+      ci->u.c.ctx = ctx;  /* save context */
+    ci->func = L->top - nresults - 1;  /* protect stack below results */
+    luaD_throw(L, LUA_YIELD);
+  }
+  lua_assert(ci->callstatus & CIST_HOOKED);  /* must be inside a hook */
+  lua_unlock(L);
+  return 0;  /* return to 'luaD_hook' */
+}
+
+
+int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                ptrdiff_t old_top, ptrdiff_t ef) {
+  int status;
+  CallInfo *old_ci = L->ci;
+  lu_byte old_allowhooks = L->allowhook;
+  unsigned short old_nny = L->nny;
+  ptrdiff_t old_errfunc = L->errfunc;
+  L->errfunc = ef;
+  status = luaD_rawrunprotected(L, func, u);
+  if (status != LUA_OK) {  /* an error occurred? */
+    StkId oldtop = restorestack(L, old_top);
+    luaF_close(L, oldtop);  /* close possible pending closures */
+    seterrorobj(L, status, oldtop);
+    L->ci = old_ci;
+    L->allowhook = old_allowhooks;
+    L->nny = old_nny;
+    luaD_shrinkstack(L);
+  }
+  L->errfunc = old_errfunc;
+  return status;
+}
+
+
+
+/*
+** Execute a protected parser.
+*/
+struct SParser {  /* data to 'f_parser' */
+  ZIO *z;
+  Mbuffer buff;  /* dynamic structure used by the scanner */
+  Dyndata dyd;  /* dynamic structures used by the parser */
+  const char *mode;
+  const char *name;
+};
+
+
+static void checkmode (lua_State *L, const char *mode, const char *x) {
+  if (mode && strchr(mode, x[0]) == NULL) {
+    luaO_pushfstring(L,
+       "attempt to load a %s chunk (mode is '%s')", x, mode);
+    luaD_throw(L, LUA_ERRSYNTAX);
+  }
+}
+
+
+static void f_parser (lua_State *L, void *ud) {
+  LClosure *cl;
+  struct SParser *p = cast(struct SParser *, ud);
+  int c = zgetc(p->z);  /* read first character */
+  if (c == LUA_SIGNATURE[0]) {
+    checkmode(L, p->mode, "binary");
+    cl = luaU_undump(L, p->z, p->name);
+  }
+  else {
+    checkmode(L, p->mode, "text");
+    cl = luaY_parser(L, p->z, &p->buff, &p->dyd, p->name, c);
+  }
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luaF_initupvals(L, cl);
+}
+
+
+int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                        const char *mode) {
+  struct SParser p;
+  int status;
+  L->nny++;  /* cannot yield during parsing */
+  p.z = z; p.name = name; p.mode = mode;
+  p.dyd.actvar.arr = NULL; p.dyd.actvar.size = 0;
+  p.dyd.gt.arr = NULL; p.dyd.gt.size = 0;
+  p.dyd.label.arr = NULL; p.dyd.label.size = 0;
+  luaZ_initbuffer(L, &p.buff);
+  status = luaD_pcall(L, f_parser, &p, savestack(L, L->top), L->errfunc);
+  luaZ_freebuffer(L, &p.buff);
+  luaM_freearray(L, p.dyd.actvar.arr, p.dyd.actvar.size);
+  luaM_freearray(L, p.dyd.gt.arr, p.dyd.gt.size);
+  luaM_freearray(L, p.dyd.label.arr, p.dyd.label.size);
+  L->nny--;
+  return status;
+}
+
+
diff --git a/scite-app/scite/lua/src/ldo.h b/scite-app/scite/lua/src/ldo.h
new file mode 100644
index 0000000..4f5d51c
--- /dev/null
+++ b/scite-app/scite/lua/src/ldo.h
@@ -0,0 +1,58 @@
+/*
+** $Id: ldo.h,v 2.29 2015/12/21 13:02:14 roberto Exp $
+** Stack and Call structure of Lua
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ldo_h
+#define ldo_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+/*
+** Macro to check stack size and grow stack if needed.  Parameters
+** 'pre'/'pos' allow the macro to preserve a pointer into the
+** stack across reallocations, doing the work only when needed.
+** 'condmovestack' is used in heavy tests to force a stack reallocation
+** at every check.
+*/
+#define luaD_checkstackaux(L,n,pre,pos)  \
+	if (L->stack_last - L->top <= (n)) \
+	  { pre; luaD_growstack(L, n); pos; } else { condmovestack(L,pre,pos); }
+
+/* In general, 'pre'/'pos' are empty (nothing to save) */
+#define luaD_checkstack(L,n)	luaD_checkstackaux(L,n,(void)0,(void)0)
+
+
+
+#define savestack(L,p)		((char *)(p) - (char *)L->stack)
+#define restorestack(L,n)	((TValue *)((char *)L->stack + (n)))
+
+
+/* type of protected functions, to be ran by 'runprotected' */
+typedef void (*Pfunc) (lua_State *L, void *ud);
+
+LUAI_FUNC int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
+                                                  const char *mode);
+LUAI_FUNC void luaD_hook (lua_State *L, int event, int line);
+LUAI_FUNC int luaD_precall (lua_State *L, StkId func, int nresults);
+LUAI_FUNC void luaD_call (lua_State *L, StkId func, int nResults);
+LUAI_FUNC void luaD_callnoyield (lua_State *L, StkId func, int nResults);
+LUAI_FUNC int luaD_pcall (lua_State *L, Pfunc func, void *u,
+                                        ptrdiff_t oldtop, ptrdiff_t ef);
+LUAI_FUNC int luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult,
+                                          int nres);
+LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
+LUAI_FUNC void luaD_growstack (lua_State *L, int n);
+LUAI_FUNC void luaD_shrinkstack (lua_State *L);
+LUAI_FUNC void luaD_inctop (lua_State *L);
+
+LUAI_FUNC l_noret luaD_throw (lua_State *L, int errcode);
+LUAI_FUNC int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud);
+
+#endif
+
diff --git a/scite-app/scite/lua/src/ldump.c b/scite-app/scite/lua/src/ldump.c
new file mode 100644
index 0000000..016e300
--- /dev/null
+++ b/scite-app/scite/lua/src/ldump.c
@@ -0,0 +1,215 @@
+/*
+** $Id: ldump.c,v 2.37 2015/10/08 15:53:49 roberto Exp $
+** save precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define ldump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "lstate.h"
+#include "lundump.h"
+
+
+typedef struct {
+  lua_State *L;
+  lua_Writer writer;
+  void *data;
+  int strip;
+  int status;
+} DumpState;
+
+
+/*
+** All high-level dumps go through DumpVector; you can change it to
+** change the endianness of the result
+*/
+#define DumpVector(v,n,D)	DumpBlock(v,(n)*sizeof((v)[0]),D)
+
+#define DumpLiteral(s,D)	DumpBlock(s, sizeof(s) - sizeof(char), D)
+
+
+static void DumpBlock (const void *b, size_t size, DumpState *D) {
+  if (D->status == 0 && size > 0) {
+    lua_unlock(D->L);
+    D->status = (*D->writer)(D->L, b, size, D->data);
+    lua_lock(D->L);
+  }
+}
+
+
+#define DumpVar(x,D)		DumpVector(&x,1,D)
+
+
+static void DumpByte (int y, DumpState *D) {
+  lu_byte x = (lu_byte)y;
+  DumpVar(x, D);
+}
+
+
+static void DumpInt (int x, DumpState *D) {
+  DumpVar(x, D);
+}
+
+
+static void DumpNumber (lua_Number x, DumpState *D) {
+  DumpVar(x, D);
+}
+
+
+static void DumpInteger (lua_Integer x, DumpState *D) {
+  DumpVar(x, D);
+}
+
+
+static void DumpString (const TString *s, DumpState *D) {
+  if (s == NULL)
+    DumpByte(0, D);
+  else {
+    size_t size = tsslen(s) + 1;  /* include trailing '\0' */
+    const char *str = getstr(s);
+    if (size < 0xFF)
+      DumpByte(cast_int(size), D);
+    else {
+      DumpByte(0xFF, D);
+      DumpVar(size, D);
+    }
+    DumpVector(str, size - 1, D);  /* no need to save '\0' */
+  }
+}
+
+
+static void DumpCode (const Proto *f, DumpState *D) {
+  DumpInt(f->sizecode, D);
+  DumpVector(f->code, f->sizecode, D);
+}
+
+
+static void DumpFunction(const Proto *f, TString *psource, DumpState *D);
+
+static void DumpConstants (const Proto *f, DumpState *D) {
+  int i;
+  int n = f->sizek;
+  DumpInt(n, D);
+  for (i = 0; i < n; i++) {
+    const TValue *o = &f->k[i];
+    DumpByte(ttype(o), D);
+    switch (ttype(o)) {
+    case LUA_TNIL:
+      break;
+    case LUA_TBOOLEAN:
+      DumpByte(bvalue(o), D);
+      break;
+    case LUA_TNUMFLT:
+      DumpNumber(fltvalue(o), D);
+      break;
+    case LUA_TNUMINT:
+      DumpInteger(ivalue(o), D);
+      break;
+    case LUA_TSHRSTR:
+    case LUA_TLNGSTR:
+      DumpString(tsvalue(o), D);
+      break;
+    default:
+      lua_assert(0);
+    }
+  }
+}
+
+
+static void DumpProtos (const Proto *f, DumpState *D) {
+  int i;
+  int n = f->sizep;
+  DumpInt(n, D);
+  for (i = 0; i < n; i++)
+    DumpFunction(f->p[i], f->source, D);
+}
+
+
+static void DumpUpvalues (const Proto *f, DumpState *D) {
+  int i, n = f->sizeupvalues;
+  DumpInt(n, D);
+  for (i = 0; i < n; i++) {
+    DumpByte(f->upvalues[i].instack, D);
+    DumpByte(f->upvalues[i].idx, D);
+  }
+}
+
+
+static void DumpDebug (const Proto *f, DumpState *D) {
+  int i, n;
+  n = (D->strip) ? 0 : f->sizelineinfo;
+  DumpInt(n, D);
+  DumpVector(f->lineinfo, n, D);
+  n = (D->strip) ? 0 : f->sizelocvars;
+  DumpInt(n, D);
+  for (i = 0; i < n; i++) {
+    DumpString(f->locvars[i].varname, D);
+    DumpInt(f->locvars[i].startpc, D);
+    DumpInt(f->locvars[i].endpc, D);
+  }
+  n = (D->strip) ? 0 : f->sizeupvalues;
+  DumpInt(n, D);
+  for (i = 0; i < n; i++)
+    DumpString(f->upvalues[i].name, D);
+}
+
+
+static void DumpFunction (const Proto *f, TString *psource, DumpState *D) {
+  if (D->strip || f->source == psource)
+    DumpString(NULL, D);  /* no debug info or same source as its parent */
+  else
+    DumpString(f->source, D);
+  DumpInt(f->linedefined, D);
+  DumpInt(f->lastlinedefined, D);
+  DumpByte(f->numparams, D);
+  DumpByte(f->is_vararg, D);
+  DumpByte(f->maxstacksize, D);
+  DumpCode(f, D);
+  DumpConstants(f, D);
+  DumpUpvalues(f, D);
+  DumpProtos(f, D);
+  DumpDebug(f, D);
+}
+
+
+static void DumpHeader (DumpState *D) {
+  DumpLiteral(LUA_SIGNATURE, D);
+  DumpByte(LUAC_VERSION, D);
+  DumpByte(LUAC_FORMAT, D);
+  DumpLiteral(LUAC_DATA, D);
+  DumpByte(sizeof(int), D);
+  DumpByte(sizeof(size_t), D);
+  DumpByte(sizeof(Instruction), D);
+  DumpByte(sizeof(lua_Integer), D);
+  DumpByte(sizeof(lua_Number), D);
+  DumpInteger(LUAC_INT, D);
+  DumpNumber(LUAC_NUM, D);
+}
+
+
+/*
+** dump Lua function as precompiled chunk
+*/
+int luaU_dump(lua_State *L, const Proto *f, lua_Writer w, void *data,
+              int strip) {
+  DumpState D;
+  D.L = L;
+  D.writer = w;
+  D.data = data;
+  D.strip = strip;
+  D.status = 0;
+  DumpHeader(&D);
+  DumpByte(f->sizeupvalues, &D);
+  DumpFunction(f, NULL, &D);
+  return D.status;
+}
+
diff --git a/scite-app/scite/lua/src/lfunc.c b/scite-app/scite/lua/src/lfunc.c
new file mode 100644
index 0000000..67967da
--- /dev/null
+++ b/scite-app/scite/lua/src/lfunc.c
@@ -0,0 +1,151 @@
+/*
+** $Id: lfunc.c,v 2.45 2014/11/02 19:19:04 roberto Exp $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#define lfunc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+CClosure *luaF_newCclosure (lua_State *L, int n) {
+  GCObject *o = luaC_newobj(L, LUA_TCCL, sizeCclosure(n));
+  CClosure *c = gco2ccl(o);
+  c->nupvalues = cast_byte(n);
+  return c;
+}
+
+
+LClosure *luaF_newLclosure (lua_State *L, int n) {
+  GCObject *o = luaC_newobj(L, LUA_TLCL, sizeLclosure(n));
+  LClosure *c = gco2lcl(o);
+  c->p = NULL;
+  c->nupvalues = cast_byte(n);
+  while (n--) c->upvals[n] = NULL;
+  return c;
+}
+
+/*
+** fill a closure with new closed upvalues
+*/
+void luaF_initupvals (lua_State *L, LClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++) {
+    UpVal *uv = luaM_new(L, UpVal);
+    uv->refcount = 1;
+    uv->v = &uv->u.value;  /* make it closed */
+    setnilvalue(uv->v);
+    cl->upvals[i] = uv;
+  }
+}
+
+
+UpVal *luaF_findupval (lua_State *L, StkId level) {
+  UpVal **pp = &L->openupval;
+  UpVal *p;
+  UpVal *uv;
+  lua_assert(isintwups(L) || L->openupval == NULL);
+  while (*pp != NULL && (p = *pp)->v >= level) {
+    lua_assert(upisopen(p));
+    if (p->v == level)  /* found a corresponding upvalue? */
+      return p;  /* return it */
+    pp = &p->u.open.next;
+  }
+  /* not found: create a new upvalue */
+  uv = luaM_new(L, UpVal);
+  uv->refcount = 0;
+  uv->u.open.next = *pp;  /* link it to list of open upvalues */
+  uv->u.open.touched = 1;
+  *pp = uv;
+  uv->v = level;  /* current value lives in the stack */
+  if (!isintwups(L)) {  /* thread not in list of threads with upvalues? */
+    L->twups = G(L)->twups;  /* link it to the list */
+    G(L)->twups = L;
+  }
+  return uv;
+}
+
+
+void luaF_close (lua_State *L, StkId level) {
+  UpVal *uv;
+  while (L->openupval != NULL && (uv = L->openupval)->v >= level) {
+    lua_assert(upisopen(uv));
+    L->openupval = uv->u.open.next;  /* remove from 'open' list */
+    if (uv->refcount == 0)  /* no references? */
+      luaM_free(L, uv);  /* free upvalue */
+    else {
+      setobj(L, &uv->u.value, uv->v);  /* move value to upvalue slot */
+      uv->v = &uv->u.value;  /* now current value lives here */
+      luaC_upvalbarrier(L, uv);
+    }
+  }
+}
+
+
+Proto *luaF_newproto (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_TPROTO, sizeof(Proto));
+  Proto *f = gco2p(o);
+  f->k = NULL;
+  f->sizek = 0;
+  f->p = NULL;
+  f->sizep = 0;
+  f->code = NULL;
+  f->cache = NULL;
+  f->sizecode = 0;
+  f->lineinfo = NULL;
+  f->sizelineinfo = 0;
+  f->upvalues = NULL;
+  f->sizeupvalues = 0;
+  f->numparams = 0;
+  f->is_vararg = 0;
+  f->maxstacksize = 0;
+  f->locvars = NULL;
+  f->sizelocvars = 0;
+  f->linedefined = 0;
+  f->lastlinedefined = 0;
+  f->source = NULL;
+  return f;
+}
+
+
+void luaF_freeproto (lua_State *L, Proto *f) {
+  luaM_freearray(L, f->code, f->sizecode);
+  luaM_freearray(L, f->p, f->sizep);
+  luaM_freearray(L, f->k, f->sizek);
+  luaM_freearray(L, f->lineinfo, f->sizelineinfo);
+  luaM_freearray(L, f->locvars, f->sizelocvars);
+  luaM_freearray(L, f->upvalues, f->sizeupvalues);
+  luaM_free(L, f);
+}
+
+
+/*
+** Look for n-th local variable at line 'line' in function 'func'.
+** Returns NULL if not found.
+*/
+const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
+  int i;
+  for (i = 0; i<f->sizelocvars && f->locvars[i].startpc <= pc; i++) {
+    if (pc < f->locvars[i].endpc) {  /* is variable active? */
+      local_number--;
+      if (local_number == 0)
+        return getstr(f->locvars[i].varname);
+    }
+  }
+  return NULL;  /* not found */
+}
+
diff --git a/scite-app/scite/lua/src/lfunc.h b/scite-app/scite/lua/src/lfunc.h
new file mode 100644
index 0000000..2eeb0d5
--- /dev/null
+++ b/scite-app/scite/lua/src/lfunc.h
@@ -0,0 +1,61 @@
+/*
+** $Id: lfunc.h,v 2.15 2015/01/13 15:49:11 roberto Exp $
+** Auxiliary functions to manipulate prototypes and closures
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lfunc_h
+#define lfunc_h
+
+
+#include "lobject.h"
+
+
+#define sizeCclosure(n)	(cast(int, sizeof(CClosure)) + \
+                         cast(int, sizeof(TValue)*((n)-1)))
+
+#define sizeLclosure(n)	(cast(int, sizeof(LClosure)) + \
+                         cast(int, sizeof(TValue *)*((n)-1)))
+
+
+/* test whether thread is in 'twups' list */
+#define isintwups(L)	(L->twups != L)
+
+
+/*
+** maximum number of upvalues in a closure (both C and Lua). (Value
+** must fit in a VM register.)
+*/
+#define MAXUPVAL	255
+
+
+/*
+** Upvalues for Lua closures
+*/
+struct UpVal {
+  TValue *v;  /* points to stack or to its own value */
+  lu_mem refcount;  /* reference counter */
+  union {
+    struct {  /* (when open) */
+      UpVal *next;  /* linked list */
+      int touched;  /* mark to avoid cycles with dead threads */
+    } open;
+    TValue value;  /* the value (when closed) */
+  } u;
+};
+
+#define upisopen(up)	((up)->v != &(up)->u.value)
+
+
+LUAI_FUNC Proto *luaF_newproto (lua_State *L);
+LUAI_FUNC CClosure *luaF_newCclosure (lua_State *L, int nelems);
+LUAI_FUNC LClosure *luaF_newLclosure (lua_State *L, int nelems);
+LUAI_FUNC void luaF_initupvals (lua_State *L, LClosure *cl);
+LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
+LUAI_FUNC void luaF_close (lua_State *L, StkId level);
+LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
+LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
+                                         int pc);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lgc.c b/scite-app/scite/lua/src/lgc.c
new file mode 100644
index 0000000..ba2c19e
--- /dev/null
+++ b/scite-app/scite/lua/src/lgc.c
@@ -0,0 +1,1178 @@
+/*
+** $Id: lgc.c,v 2.215 2016/12/22 13:08:50 roberto Exp $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#define lgc_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+/*
+** internal state for collector while inside the atomic phase. The
+** collector should never be in this state while running regular code.
+*/
+#define GCSinsideatomic		(GCSpause + 1)
+
+/*
+** cost of sweeping one element (the size of a small object divided
+** by some adjust for the sweep speed)
+*/
+#define GCSWEEPCOST	((sizeof(TString) + 4) / 4)
+
+/* maximum number of elements to sweep in each single step */
+#define GCSWEEPMAX	(cast_int((GCSTEPSIZE / GCSWEEPCOST) / 4))
+
+/* cost of calling one finalizer */
+#define GCFINALIZECOST	GCSWEEPCOST
+
+
+/*
+** macro to adjust 'stepmul': 'stepmul' is actually used like
+** 'stepmul / STEPMULADJ' (value chosen by tests)
+*/
+#define STEPMULADJ		200
+
+
+/*
+** macro to adjust 'pause': 'pause' is actually used like
+** 'pause / PAUSEADJ' (value chosen by tests)
+*/
+#define PAUSEADJ		100
+
+
+/*
+** 'makewhite' erases all color bits then sets only the current white
+** bit
+*/
+#define maskcolors	(~(bitmask(BLACKBIT) | WHITEBITS))
+#define makewhite(g,x)	\
+ (x->marked = cast_byte((x->marked & maskcolors) | luaC_white(g)))
+
+#define white2gray(x)	resetbits(x->marked, WHITEBITS)
+#define black2gray(x)	resetbit(x->marked, BLACKBIT)
+
+
+#define valiswhite(x)   (iscollectable(x) && iswhite(gcvalue(x)))
+
+#define checkdeadkey(n)	lua_assert(!ttisdeadkey(gkey(n)) || ttisnil(gval(n)))
+
+
+#define checkconsistency(obj)  \
+  lua_longassert(!iscollectable(obj) || righttt(obj))
+
+
+#define markvalue(g,o) { checkconsistency(o); \
+  if (valiswhite(o)) reallymarkobject(g,gcvalue(o)); }
+
+#define markobject(g,t)	{ if (iswhite(t)) reallymarkobject(g, obj2gco(t)); }
+
+/*
+** mark an object that can be NULL (either because it is really optional,
+** or it was stripped as debug info, or inside an uncompleted structure)
+*/
+#define markobjectN(g,t)	{ if (t) markobject(g,t); }
+
+static void reallymarkobject (global_State *g, GCObject *o);
+
+
+/*
+** {======================================================
+** Generic functions
+** =======================================================
+*/
+
+
+/*
+** one after last element in a hash array
+*/
+#define gnodelast(h)	gnode(h, cast(size_t, sizenode(h)))
+
+
+/*
+** link collectable object 'o' into list pointed by 'p'
+*/
+#define linkgclist(o,p)	((o)->gclist = (p), (p) = obj2gco(o))
+
+
+/*
+** If key is not marked, mark its entry as dead. This allows key to be
+** collected, but keeps its entry in the table.  A dead node is needed
+** when Lua looks up for a key (it may be part of a chain) and when
+** traversing a weak table (key might be removed from the table during
+** traversal). Other places never manipulate dead keys, because its
+** associated nil value is enough to signal that the entry is logically
+** empty.
+*/
+static void removeentry (Node *n) {
+  lua_assert(ttisnil(gval(n)));
+  if (valiswhite(gkey(n)))
+    setdeadvalue(wgkey(n));  /* unused and unmarked key; remove it */
+}
+
+
+/*
+** tells whether a key or value can be cleared from a weak
+** table. Non-collectable objects are never removed from weak
+** tables. Strings behave as 'values', so are never removed too. for
+** other objects: if really collected, cannot keep them; for objects
+** being finalized, keep them in keys, but not in values
+*/
+static int iscleared (global_State *g, const TValue *o) {
+  if (!iscollectable(o)) return 0;
+  else if (ttisstring(o)) {
+    markobject(g, tsvalue(o));  /* strings are 'values', so are never weak */
+    return 0;
+  }
+  else return iswhite(gcvalue(o));
+}
+
+
+/*
+** barrier that moves collector forward, that is, mark the white object
+** being pointed by a black object. (If in sweep phase, clear the black
+** object to white [sweep it] to avoid other barrier calls for this
+** same object.)
+*/
+void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v) {
+  global_State *g = G(L);
+  lua_assert(isblack(o) && iswhite(v) && !isdead(g, v) && !isdead(g, o));
+  if (keepinvariant(g))  /* must keep invariant? */
+    reallymarkobject(g, v);  /* restore invariant */
+  else {  /* sweep phase */
+    lua_assert(issweepphase(g));
+    makewhite(g, o);  /* mark main obj. as white to avoid other barriers */
+  }
+}
+
+
+/*
+** barrier that moves collector backward, that is, mark the black object
+** pointing to a white object as gray again.
+*/
+void luaC_barrierback_ (lua_State *L, Table *t) {
+  global_State *g = G(L);
+  lua_assert(isblack(t) && !isdead(g, t));
+  black2gray(t);  /* make table gray (again) */
+  linkgclist(t, g->grayagain);
+}
+
+
+/*
+** barrier for assignments to closed upvalues. Because upvalues are
+** shared among closures, it is impossible to know the color of all
+** closures pointing to it. So, we assume that the object being assigned
+** must be marked.
+*/
+void luaC_upvalbarrier_ (lua_State *L, UpVal *uv) {
+  global_State *g = G(L);
+  GCObject *o = gcvalue(uv->v);
+  lua_assert(!upisopen(uv));  /* ensured by macro luaC_upvalbarrier */
+  if (keepinvariant(g))
+    markobject(g, o);
+}
+
+
+void luaC_fix (lua_State *L, GCObject *o) {
+  global_State *g = G(L);
+  lua_assert(g->allgc == o);  /* object must be 1st in 'allgc' list! */
+  white2gray(o);  /* they will be gray forever */
+  g->allgc = o->next;  /* remove object from 'allgc' list */
+  o->next = g->fixedgc;  /* link it to 'fixedgc' list */
+  g->fixedgc = o;
+}
+
+
+/*
+** create a new collectable object (with given type and size) and link
+** it to 'allgc' list.
+*/
+GCObject *luaC_newobj (lua_State *L, int tt, size_t sz) {
+  global_State *g = G(L);
+  GCObject *o = cast(GCObject *, luaM_newobject(L, novariant(tt), sz));
+  o->marked = luaC_white(g);
+  o->tt = tt;
+  o->next = g->allgc;
+  g->allgc = o;
+  return o;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Mark functions
+** =======================================================
+*/
+
+
+/*
+** mark an object. Userdata, strings, and closed upvalues are visited
+** and turned black here. Other objects are marked gray and added
+** to appropriate list to be visited (and turned black) later. (Open
+** upvalues are already linked in 'headuv' list.)
+*/
+static void reallymarkobject (global_State *g, GCObject *o) {
+ reentry:
+  white2gray(o);
+  switch (o->tt) {
+    case LUA_TSHRSTR: {
+      gray2black(o);
+      g->GCmemtrav += sizelstring(gco2ts(o)->shrlen);
+      break;
+    }
+    case LUA_TLNGSTR: {
+      gray2black(o);
+      g->GCmemtrav += sizelstring(gco2ts(o)->u.lnglen);
+      break;
+    }
+    case LUA_TUSERDATA: {
+      TValue uvalue;
+      markobjectN(g, gco2u(o)->metatable);  /* mark its metatable */
+      gray2black(o);
+      g->GCmemtrav += sizeudata(gco2u(o));
+      getuservalue(g->mainthread, gco2u(o), &uvalue);
+      if (valiswhite(&uvalue)) {  /* markvalue(g, &uvalue); */
+        o = gcvalue(&uvalue);
+        goto reentry;
+      }
+      break;
+    }
+    case LUA_TLCL: {
+      linkgclist(gco2lcl(o), g->gray);
+      break;
+    }
+    case LUA_TCCL: {
+      linkgclist(gco2ccl(o), g->gray);
+      break;
+    }
+    case LUA_TTABLE: {
+      linkgclist(gco2t(o), g->gray);
+      break;
+    }
+    case LUA_TTHREAD: {
+      linkgclist(gco2th(o), g->gray);
+      break;
+    }
+    case LUA_TPROTO: {
+      linkgclist(gco2p(o), g->gray);
+      break;
+    }
+    default: lua_assert(0); break;
+  }
+}
+
+
+/*
+** mark metamethods for basic types
+*/
+static void markmt (global_State *g) {
+  int i;
+  for (i=0; i < LUA_NUMTAGS; i++)
+    markobjectN(g, g->mt[i]);
+}
+
+
+/*
+** mark all objects in list of being-finalized
+*/
+static void markbeingfnz (global_State *g) {
+  GCObject *o;
+  for (o = g->tobefnz; o != NULL; o = o->next)
+    markobject(g, o);
+}
+
+
+/*
+** Mark all values stored in marked open upvalues from non-marked threads.
+** (Values from marked threads were already marked when traversing the
+** thread.) Remove from the list threads that no longer have upvalues and
+** not-marked threads.
+*/
+static void remarkupvals (global_State *g) {
+  lua_State *thread;
+  lua_State **p = &g->twups;
+  while ((thread = *p) != NULL) {
+    lua_assert(!isblack(thread));  /* threads are never black */
+    if (isgray(thread) && thread->openupval != NULL)
+      p = &thread->twups;  /* keep marked thread with upvalues in the list */
+    else {  /* thread is not marked or without upvalues */
+      UpVal *uv;
+      *p = thread->twups;  /* remove thread from the list */
+      thread->twups = thread;  /* mark that it is out of list */
+      for (uv = thread->openupval; uv != NULL; uv = uv->u.open.next) {
+        if (uv->u.open.touched) {
+          markvalue(g, uv->v);  /* remark upvalue's value */
+          uv->u.open.touched = 0;
+        }
+      }
+    }
+  }
+}
+
+
+/*
+** mark root set and reset all gray lists, to start a new collection
+*/
+static void restartcollection (global_State *g) {
+  g->gray = g->grayagain = NULL;
+  g->weak = g->allweak = g->ephemeron = NULL;
+  markobject(g, g->mainthread);
+  markvalue(g, &g->l_registry);
+  markmt(g);
+  markbeingfnz(g);  /* mark any finalizing object left from previous cycle */
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Traverse functions
+** =======================================================
+*/
+
+/*
+** Traverse a table with weak values and link it to proper list. During
+** propagate phase, keep it in 'grayagain' list, to be revisited in the
+** atomic phase. In the atomic phase, if table has any white value,
+** put it in 'weak' list, to be cleared.
+*/
+static void traverseweakvalue (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  /* if there is array part, assume it may have white values (it is not
+     worth traversing it now just to check) */
+  int hasclears = (h->sizearray > 0);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    checkdeadkey(n);
+    if (ttisnil(gval(n)))  /* entry is empty? */
+      removeentry(n);  /* remove it */
+    else {
+      lua_assert(!ttisnil(gkey(n)));
+      markvalue(g, gkey(n));  /* mark key */
+      if (!hasclears && iscleared(g, gval(n)))  /* is there a white value? */
+        hasclears = 1;  /* table will have to be cleared */
+    }
+  }
+  if (g->gcstate == GCSpropagate)
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+  else if (hasclears)
+    linkgclist(h, g->weak);  /* has to be cleared later */
+}
+
+
+/*
+** Traverse an ephemeron table and link it to proper list. Returns true
+** iff any object was marked during this traversal (which implies that
+** convergence has to continue). During propagation phase, keep table
+** in 'grayagain' list, to be visited again in the atomic phase. In
+** the atomic phase, if table has any white->white entry, it has to
+** be revisited during ephemeron convergence (as that key may turn
+** black). Otherwise, if it has any white key, table has to be cleared
+** (in the atomic phase).
+*/
+static int traverseephemeron (global_State *g, Table *h) {
+  int marked = 0;  /* true if an object is marked in this traversal */
+  int hasclears = 0;  /* true if table has white keys */
+  int hasww = 0;  /* true if table has entry "white-key -> white-value" */
+  Node *n, *limit = gnodelast(h);
+  unsigned int i;
+  /* traverse array part */
+  for (i = 0; i < h->sizearray; i++) {
+    if (valiswhite(&h->array[i])) {
+      marked = 1;
+      reallymarkobject(g, gcvalue(&h->array[i]));
+    }
+  }
+  /* traverse hash part */
+  for (n = gnode(h, 0); n < limit; n++) {
+    checkdeadkey(n);
+    if (ttisnil(gval(n)))  /* entry is empty? */
+      removeentry(n);  /* remove it */
+    else if (iscleared(g, gkey(n))) {  /* key is not marked (yet)? */
+      hasclears = 1;  /* table must be cleared */
+      if (valiswhite(gval(n)))  /* value not marked yet? */
+        hasww = 1;  /* white-white entry */
+    }
+    else if (valiswhite(gval(n))) {  /* value not marked yet? */
+      marked = 1;
+      reallymarkobject(g, gcvalue(gval(n)));  /* mark it now */
+    }
+  }
+  /* link table into proper list */
+  if (g->gcstate == GCSpropagate)
+    linkgclist(h, g->grayagain);  /* must retraverse it in atomic phase */
+  else if (hasww)  /* table has white->white entries? */
+    linkgclist(h, g->ephemeron);  /* have to propagate again */
+  else if (hasclears)  /* table has white keys? */
+    linkgclist(h, g->allweak);  /* may have to clean white keys */
+  return marked;
+}
+
+
+static void traversestrongtable (global_State *g, Table *h) {
+  Node *n, *limit = gnodelast(h);
+  unsigned int i;
+  for (i = 0; i < h->sizearray; i++)  /* traverse array part */
+    markvalue(g, &h->array[i]);
+  for (n = gnode(h, 0); n < limit; n++) {  /* traverse hash part */
+    checkdeadkey(n);
+    if (ttisnil(gval(n)))  /* entry is empty? */
+      removeentry(n);  /* remove it */
+    else {
+      lua_assert(!ttisnil(gkey(n)));
+      markvalue(g, gkey(n));  /* mark key */
+      markvalue(g, gval(n));  /* mark value */
+    }
+  }
+}
+
+
+static lu_mem traversetable (global_State *g, Table *h) {
+  const char *weakkey, *weakvalue;
+  const TValue *mode = gfasttm(g, h->metatable, TM_MODE);
+  markobjectN(g, h->metatable);
+  if (mode && ttisstring(mode) &&  /* is there a weak mode? */
+      ((weakkey = strchr(svalue(mode), 'k')),
+       (weakvalue = strchr(svalue(mode), 'v')),
+       (weakkey || weakvalue))) {  /* is really weak? */
+    black2gray(h);  /* keep table gray */
+    if (!weakkey)  /* strong keys? */
+      traverseweakvalue(g, h);
+    else if (!weakvalue)  /* strong values? */
+      traverseephemeron(g, h);
+    else  /* all weak */
+      linkgclist(h, g->allweak);  /* nothing to traverse now */
+  }
+  else  /* not weak */
+    traversestrongtable(g, h);
+  return sizeof(Table) + sizeof(TValue) * h->sizearray +
+                         sizeof(Node) * cast(size_t, allocsizenode(h));
+}
+
+
+/*
+** Traverse a prototype. (While a prototype is being build, its
+** arrays can be larger than needed; the extra slots are filled with
+** NULL, so the use of 'markobjectN')
+*/
+static int traverseproto (global_State *g, Proto *f) {
+  int i;
+  if (f->cache && iswhite(f->cache))
+    f->cache = NULL;  /* allow cache to be collected */
+  markobjectN(g, f->source);
+  for (i = 0; i < f->sizek; i++)  /* mark literals */
+    markvalue(g, &f->k[i]);
+  for (i = 0; i < f->sizeupvalues; i++)  /* mark upvalue names */
+    markobjectN(g, f->upvalues[i].name);
+  for (i = 0; i < f->sizep; i++)  /* mark nested protos */
+    markobjectN(g, f->p[i]);
+  for (i = 0; i < f->sizelocvars; i++)  /* mark local-variable names */
+    markobjectN(g, f->locvars[i].varname);
+  return sizeof(Proto) + sizeof(Instruction) * f->sizecode +
+                         sizeof(Proto *) * f->sizep +
+                         sizeof(TValue) * f->sizek +
+                         sizeof(int) * f->sizelineinfo +
+                         sizeof(LocVar) * f->sizelocvars +
+                         sizeof(Upvaldesc) * f->sizeupvalues;
+}
+
+
+static lu_mem traverseCclosure (global_State *g, CClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++)  /* mark its upvalues */
+    markvalue(g, &cl->upvalue[i]);
+  return sizeCclosure(cl->nupvalues);
+}
+
+/*
+** open upvalues point to values in a thread, so those values should
+** be marked when the thread is traversed except in the atomic phase
+** (because then the value cannot be changed by the thread and the
+** thread may not be traversed again)
+*/
+static lu_mem traverseLclosure (global_State *g, LClosure *cl) {
+  int i;
+  markobjectN(g, cl->p);  /* mark its prototype */
+  for (i = 0; i < cl->nupvalues; i++) {  /* mark its upvalues */
+    UpVal *uv = cl->upvals[i];
+    if (uv != NULL) {
+      if (upisopen(uv) && g->gcstate != GCSinsideatomic)
+        uv->u.open.touched = 1;  /* can be marked in 'remarkupvals' */
+      else
+        markvalue(g, uv->v);
+    }
+  }
+  return sizeLclosure(cl->nupvalues);
+}
+
+
+static lu_mem traversethread (global_State *g, lua_State *th) {
+  StkId o = th->stack;
+  if (o == NULL)
+    return 1;  /* stack not completely built yet */
+  lua_assert(g->gcstate == GCSinsideatomic ||
+             th->openupval == NULL || isintwups(th));
+  for (; o < th->top; o++)  /* mark live elements in the stack */
+    markvalue(g, o);
+  if (g->gcstate == GCSinsideatomic) {  /* final traversal? */
+    StkId lim = th->stack + th->stacksize;  /* real end of stack */
+    for (; o < lim; o++)  /* clear not-marked stack slice */
+      setnilvalue(o);
+    /* 'remarkupvals' may have removed thread from 'twups' list */
+    if (!isintwups(th) && th->openupval != NULL) {
+      th->twups = g->twups;  /* link it back to the list */
+      g->twups = th;
+    }
+  }
+  else if (g->gckind != KGC_EMERGENCY)
+    luaD_shrinkstack(th); /* do not change stack in emergency cycle */
+  return (sizeof(lua_State) + sizeof(TValue) * th->stacksize +
+          sizeof(CallInfo) * th->nci);
+}
+
+
+/*
+** traverse one gray object, turning it to black (except for threads,
+** which are always gray).
+*/
+static void propagatemark (global_State *g) {
+  lu_mem size;
+  GCObject *o = g->gray;
+  lua_assert(isgray(o));
+  gray2black(o);
+  switch (o->tt) {
+    case LUA_TTABLE: {
+      Table *h = gco2t(o);
+      g->gray = h->gclist;  /* remove from 'gray' list */
+      size = traversetable(g, h);
+      break;
+    }
+    case LUA_TLCL: {
+      LClosure *cl = gco2lcl(o);
+      g->gray = cl->gclist;  /* remove from 'gray' list */
+      size = traverseLclosure(g, cl);
+      break;
+    }
+    case LUA_TCCL: {
+      CClosure *cl = gco2ccl(o);
+      g->gray = cl->gclist;  /* remove from 'gray' list */
+      size = traverseCclosure(g, cl);
+      break;
+    }
+    case LUA_TTHREAD: {
+      lua_State *th = gco2th(o);
+      g->gray = th->gclist;  /* remove from 'gray' list */
+      linkgclist(th, g->grayagain);  /* insert into 'grayagain' list */
+      black2gray(o);
+      size = traversethread(g, th);
+      break;
+    }
+    case LUA_TPROTO: {
+      Proto *p = gco2p(o);
+      g->gray = p->gclist;  /* remove from 'gray' list */
+      size = traverseproto(g, p);
+      break;
+    }
+    default: lua_assert(0); return;
+  }
+  g->GCmemtrav += size;
+}
+
+
+static void propagateall (global_State *g) {
+  while (g->gray) propagatemark(g);
+}
+
+
+static void convergeephemerons (global_State *g) {
+  int changed;
+  do {
+    GCObject *w;
+    GCObject *next = g->ephemeron;  /* get ephemeron list */
+    g->ephemeron = NULL;  /* tables may return to this list when traversed */
+    changed = 0;
+    while ((w = next) != NULL) {
+      next = gco2t(w)->gclist;
+      if (traverseephemeron(g, gco2t(w))) {  /* traverse marked some value? */
+        propagateall(g);  /* propagate changes */
+        changed = 1;  /* will have to revisit all ephemeron tables */
+      }
+    }
+  } while (changed);
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Sweep Functions
+** =======================================================
+*/
+
+
+/*
+** clear entries with unmarked keys from all weaktables in list 'l' up
+** to element 'f'
+*/
+static void clearkeys (global_State *g, GCObject *l, GCObject *f) {
+  for (; l != f; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *n, *limit = gnodelast(h);
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (!ttisnil(gval(n)) && (iscleared(g, gkey(n)))) {
+        setnilvalue(gval(n));  /* remove value ... */
+        removeentry(n);  /* and remove entry from table */
+      }
+    }
+  }
+}
+
+
+/*
+** clear entries with unmarked values from all weaktables in list 'l' up
+** to element 'f'
+*/
+static void clearvalues (global_State *g, GCObject *l, GCObject *f) {
+  for (; l != f; l = gco2t(l)->gclist) {
+    Table *h = gco2t(l);
+    Node *n, *limit = gnodelast(h);
+    unsigned int i;
+    for (i = 0; i < h->sizearray; i++) {
+      TValue *o = &h->array[i];
+      if (iscleared(g, o))  /* value was collected? */
+        setnilvalue(o);  /* remove value */
+    }
+    for (n = gnode(h, 0); n < limit; n++) {
+      if (!ttisnil(gval(n)) && iscleared(g, gval(n))) {
+        setnilvalue(gval(n));  /* remove value ... */
+        removeentry(n);  /* and remove entry from table */
+      }
+    }
+  }
+}
+
+
+void luaC_upvdeccount (lua_State *L, UpVal *uv) {
+  lua_assert(uv->refcount > 0);
+  uv->refcount--;
+  if (uv->refcount == 0 && !upisopen(uv))
+    luaM_free(L, uv);
+}
+
+
+static void freeLclosure (lua_State *L, LClosure *cl) {
+  int i;
+  for (i = 0; i < cl->nupvalues; i++) {
+    UpVal *uv = cl->upvals[i];
+    if (uv)
+      luaC_upvdeccount(L, uv);
+  }
+  luaM_freemem(L, cl, sizeLclosure(cl->nupvalues));
+}
+
+
+static void freeobj (lua_State *L, GCObject *o) {
+  switch (o->tt) {
+    case LUA_TPROTO: luaF_freeproto(L, gco2p(o)); break;
+    case LUA_TLCL: {
+      freeLclosure(L, gco2lcl(o));
+      break;
+    }
+    case LUA_TCCL: {
+      luaM_freemem(L, o, sizeCclosure(gco2ccl(o)->nupvalues));
+      break;
+    }
+    case LUA_TTABLE: luaH_free(L, gco2t(o)); break;
+    case LUA_TTHREAD: luaE_freethread(L, gco2th(o)); break;
+    case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
+    case LUA_TSHRSTR:
+      luaS_remove(L, gco2ts(o));  /* remove it from hash table */
+      luaM_freemem(L, o, sizelstring(gco2ts(o)->shrlen));
+      break;
+    case LUA_TLNGSTR: {
+      luaM_freemem(L, o, sizelstring(gco2ts(o)->u.lnglen));
+      break;
+    }
+    default: lua_assert(0);
+  }
+}
+
+
+#define sweepwholelist(L,p)	sweeplist(L,p,MAX_LUMEM)
+static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count);
+
+
+/*
+** sweep at most 'count' elements from a list of GCObjects erasing dead
+** objects, where a dead object is one marked with the old (non current)
+** white; change all non-dead objects back to white, preparing for next
+** collection cycle. Return where to continue the traversal or NULL if
+** list is finished.
+*/
+static GCObject **sweeplist (lua_State *L, GCObject **p, lu_mem count) {
+  global_State *g = G(L);
+  int ow = otherwhite(g);
+  int white = luaC_white(g);  /* current white */
+  while (*p != NULL && count-- > 0) {
+    GCObject *curr = *p;
+    int marked = curr->marked;
+    if (isdeadm(ow, marked)) {  /* is 'curr' dead? */
+      *p = curr->next;  /* remove 'curr' from list */
+      freeobj(L, curr);  /* erase 'curr' */
+    }
+    else {  /* change mark to 'white' */
+      curr->marked = cast_byte((marked & maskcolors) | white);
+      p = &curr->next;  /* go to next element */
+    }
+  }
+  return (*p == NULL) ? NULL : p;
+}
+
+
+/*
+** sweep a list until a live object (or end of list)
+*/
+static GCObject **sweeptolive (lua_State *L, GCObject **p) {
+  GCObject **old = p;
+  do {
+    p = sweeplist(L, p, 1);
+  } while (p == old);
+  return p;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** Finalization
+** =======================================================
+*/
+
+/*
+** If possible, shrink string table
+*/
+static void checkSizes (lua_State *L, global_State *g) {
+  if (g->gckind != KGC_EMERGENCY) {
+    l_mem olddebt = g->GCdebt;
+    if (g->strt.nuse < g->strt.size / 4)  /* string table too big? */
+      luaS_resize(L, g->strt.size / 2);  /* shrink it a little */
+    g->GCestimate += g->GCdebt - olddebt;  /* update estimate */
+  }
+}
+
+
+static GCObject *udata2finalize (global_State *g) {
+  GCObject *o = g->tobefnz;  /* get first element */
+  lua_assert(tofinalize(o));
+  g->tobefnz = o->next;  /* remove it from 'tobefnz' list */
+  o->next = g->allgc;  /* return it to 'allgc' list */
+  g->allgc = o;
+  resetbit(o->marked, FINALIZEDBIT);  /* object is "normal" again */
+  if (issweepphase(g))
+    makewhite(g, o);  /* "sweep" object */
+  return o;
+}
+
+
+static void dothecall (lua_State *L, void *ud) {
+  UNUSED(ud);
+  luaD_callnoyield(L, L->top - 2, 0);
+}
+
+
+static void GCTM (lua_State *L, int propagateerrors) {
+  global_State *g = G(L);
+  const TValue *tm;
+  TValue v;
+  setgcovalue(L, &v, udata2finalize(g));
+  tm = luaT_gettmbyobj(L, &v, TM_GC);
+  if (tm != NULL && ttisfunction(tm)) {  /* is there a finalizer? */
+    int status;
+    lu_byte oldah = L->allowhook;
+    int running  = g->gcrunning;
+    L->allowhook = 0;  /* stop debug hooks during GC metamethod */
+    g->gcrunning = 0;  /* avoid GC steps */
+    setobj2s(L, L->top, tm);  /* push finalizer... */
+    setobj2s(L, L->top + 1, &v);  /* ... and its argument */
+    L->top += 2;  /* and (next line) call the finalizer */
+    L->ci->callstatus |= CIST_FIN;  /* will run a finalizer */
+    status = luaD_pcall(L, dothecall, NULL, savestack(L, L->top - 2), 0);
+    L->ci->callstatus &= ~CIST_FIN;  /* not running a finalizer anymore */
+    L->allowhook = oldah;  /* restore hooks */
+    g->gcrunning = running;  /* restore state */
+    if (status != LUA_OK && propagateerrors) {  /* error while running __gc? */
+      if (status == LUA_ERRRUN) {  /* is there an error object? */
+        const char *msg = (ttisstring(L->top - 1))
+                            ? svalue(L->top - 1)
+                            : "no message";
+        luaO_pushfstring(L, "error in __gc metamethod (%s)", msg);
+        status = LUA_ERRGCMM;  /* error in __gc metamethod */
+      }
+      luaD_throw(L, status);  /* re-throw error */
+    }
+  }
+}
+
+
+/*
+** call a few (up to 'g->gcfinnum') finalizers
+*/
+static int runafewfinalizers (lua_State *L) {
+  global_State *g = G(L);
+  unsigned int i;
+  lua_assert(!g->tobefnz || g->gcfinnum > 0);
+  for (i = 0; g->tobefnz && i < g->gcfinnum; i++)
+    GCTM(L, 1);  /* call one finalizer */
+  g->gcfinnum = (!g->tobefnz) ? 0  /* nothing more to finalize? */
+                    : g->gcfinnum * 2;  /* else call a few more next time */
+  return i;
+}
+
+
+/*
+** call all pending finalizers
+*/
+static void callallpendingfinalizers (lua_State *L) {
+  global_State *g = G(L);
+  while (g->tobefnz)
+    GCTM(L, 0);
+}
+
+
+/*
+** find last 'next' field in list 'p' list (to add elements in its end)
+*/
+static GCObject **findlast (GCObject **p) {
+  while (*p != NULL)
+    p = &(*p)->next;
+  return p;
+}
+
+
+/*
+** move all unreachable objects (or 'all' objects) that need
+** finalization from list 'finobj' to list 'tobefnz' (to be finalized)
+*/
+static void separatetobefnz (global_State *g, int all) {
+  GCObject *curr;
+  GCObject **p = &g->finobj;
+  GCObject **lastnext = findlast(&g->tobefnz);
+  while ((curr = *p) != NULL) {  /* traverse all finalizable objects */
+    lua_assert(tofinalize(curr));
+    if (!(iswhite(curr) || all))  /* not being collected? */
+      p = &curr->next;  /* don't bother with it */
+    else {
+      *p = curr->next;  /* remove 'curr' from 'finobj' list */
+      curr->next = *lastnext;  /* link at the end of 'tobefnz' list */
+      *lastnext = curr;
+      lastnext = &curr->next;
+    }
+  }
+}
+
+
+/*
+** if object 'o' has a finalizer, remove it from 'allgc' list (must
+** search the list to find it) and link it in 'finobj' list.
+*/
+void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
+  global_State *g = G(L);
+  if (tofinalize(o) ||                 /* obj. is already marked... */
+      gfasttm(g, mt, TM_GC) == NULL)   /* or has no finalizer? */
+    return;  /* nothing to be done */
+  else {  /* move 'o' to 'finobj' list */
+    GCObject **p;
+    if (issweepphase(g)) {
+      makewhite(g, o);  /* "sweep" object 'o' */
+      if (g->sweepgc == &o->next)  /* should not remove 'sweepgc' object */
+        g->sweepgc = sweeptolive(L, g->sweepgc);  /* change 'sweepgc' */
+    }
+    /* search for pointer pointing to 'o' */
+    for (p = &g->allgc; *p != o; p = &(*p)->next) { /* empty */ }
+    *p = o->next;  /* remove 'o' from 'allgc' list */
+    o->next = g->finobj;  /* link it in 'finobj' list */
+    g->finobj = o;
+    l_setbit(o->marked, FINALIZEDBIT);  /* mark it as such */
+  }
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** GC control
+** =======================================================
+*/
+
+
+/*
+** Set a reasonable "time" to wait before starting a new GC cycle; cycle
+** will start when memory use hits threshold. (Division by 'estimate'
+** should be OK: it cannot be zero (because Lua cannot even start with
+** less than PAUSEADJ bytes).
+*/
+static void setpause (global_State *g) {
+  l_mem threshold, debt;
+  l_mem estimate = g->GCestimate / PAUSEADJ;  /* adjust 'estimate' */
+  lua_assert(estimate > 0);
+  threshold = (g->gcpause < MAX_LMEM / estimate)  /* overflow? */
+            ? estimate * g->gcpause  /* no overflow */
+            : MAX_LMEM;  /* overflow; truncate to maximum */
+  debt = gettotalbytes(g) - threshold;
+  luaE_setdebt(g, debt);
+}
+
+
+/*
+** Enter first sweep phase.
+** The call to 'sweeplist' tries to make pointer point to an object
+** inside the list (instead of to the header), so that the real sweep do
+** not need to skip objects created between "now" and the start of the
+** real sweep.
+*/
+static void entersweep (lua_State *L) {
+  global_State *g = G(L);
+  g->gcstate = GCSswpallgc;
+  lua_assert(g->sweepgc == NULL);
+  g->sweepgc = sweeplist(L, &g->allgc, 1);
+}
+
+
+void luaC_freeallobjects (lua_State *L) {
+  global_State *g = G(L);
+  separatetobefnz(g, 1);  /* separate all objects with finalizers */
+  lua_assert(g->finobj == NULL);
+  callallpendingfinalizers(L);
+  lua_assert(g->tobefnz == NULL);
+  g->currentwhite = WHITEBITS; /* this "white" makes all objects look dead */
+  g->gckind = KGC_NORMAL;
+  sweepwholelist(L, &g->finobj);
+  sweepwholelist(L, &g->allgc);
+  sweepwholelist(L, &g->fixedgc);  /* collect fixed objects */
+  lua_assert(g->strt.nuse == 0);
+}
+
+
+static l_mem atomic (lua_State *L) {
+  global_State *g = G(L);
+  l_mem work;
+  GCObject *origweak, *origall;
+  GCObject *grayagain = g->grayagain;  /* save original list */
+  lua_assert(g->ephemeron == NULL && g->weak == NULL);
+  lua_assert(!iswhite(g->mainthread));
+  g->gcstate = GCSinsideatomic;
+  g->GCmemtrav = 0;  /* start counting work */
+  markobject(g, L);  /* mark running thread */
+  /* registry and global metatables may be changed by API */
+  markvalue(g, &g->l_registry);
+  markmt(g);  /* mark global metatables */
+  /* remark occasional upvalues of (maybe) dead threads */
+  remarkupvals(g);
+  propagateall(g);  /* propagate changes */
+  work = g->GCmemtrav;  /* stop counting (do not recount 'grayagain') */
+  g->gray = grayagain;
+  propagateall(g);  /* traverse 'grayagain' list */
+  g->GCmemtrav = 0;  /* restart counting */
+  convergeephemerons(g);
+  /* at this point, all strongly accessible objects are marked. */
+  /* Clear values from weak tables, before checking finalizers */
+  clearvalues(g, g->weak, NULL);
+  clearvalues(g, g->allweak, NULL);
+  origweak = g->weak; origall = g->allweak;
+  work += g->GCmemtrav;  /* stop counting (objects being finalized) */
+  separatetobefnz(g, 0);  /* separate objects to be finalized */
+  g->gcfinnum = 1;  /* there may be objects to be finalized */
+  markbeingfnz(g);  /* mark objects that will be finalized */
+  propagateall(g);  /* remark, to propagate 'resurrection' */
+  g->GCmemtrav = 0;  /* restart counting */
+  convergeephemerons(g);
+  /* at this point, all resurrected objects are marked. */
+  /* remove dead objects from weak tables */
+  clearkeys(g, g->ephemeron, NULL);  /* clear keys from all ephemeron tables */
+  clearkeys(g, g->allweak, NULL);  /* clear keys from all 'allweak' tables */
+  /* clear values from resurrected weak tables */
+  clearvalues(g, g->weak, origweak);
+  clearvalues(g, g->allweak, origall);
+  luaS_clearcache(g);
+  g->currentwhite = cast_byte(otherwhite(g));  /* flip current white */
+  work += g->GCmemtrav;  /* complete counting */
+  return work;  /* estimate of memory marked by 'atomic' */
+}
+
+
+static lu_mem sweepstep (lua_State *L, global_State *g,
+                         int nextstate, GCObject **nextlist) {
+  if (g->sweepgc) {
+    l_mem olddebt = g->GCdebt;
+    g->sweepgc = sweeplist(L, g->sweepgc, GCSWEEPMAX);
+    g->GCestimate += g->GCdebt - olddebt;  /* update estimate */
+    if (g->sweepgc)  /* is there still something to sweep? */
+      return (GCSWEEPMAX * GCSWEEPCOST);
+  }
+  /* else enter next state */
+  g->gcstate = nextstate;
+  g->sweepgc = nextlist;
+  return 0;
+}
+
+
+static lu_mem singlestep (lua_State *L) {
+  global_State *g = G(L);
+  switch (g->gcstate) {
+    case GCSpause: {
+      g->GCmemtrav = g->strt.size * sizeof(GCObject*);
+      restartcollection(g);
+      g->gcstate = GCSpropagate;
+      return g->GCmemtrav;
+    }
+    case GCSpropagate: {
+      g->GCmemtrav = 0;
+      lua_assert(g->gray);
+      propagatemark(g);
+       if (g->gray == NULL)  /* no more gray objects? */
+        g->gcstate = GCSatomic;  /* finish propagate phase */
+      return g->GCmemtrav;  /* memory traversed in this step */
+    }
+    case GCSatomic: {
+      lu_mem work;
+      propagateall(g);  /* make sure gray list is empty */
+      work = atomic(L);  /* work is what was traversed by 'atomic' */
+      entersweep(L);
+      g->GCestimate = gettotalbytes(g);  /* first estimate */;
+      return work;
+    }
+    case GCSswpallgc: {  /* sweep "regular" objects */
+      return sweepstep(L, g, GCSswpfinobj, &g->finobj);
+    }
+    case GCSswpfinobj: {  /* sweep objects with finalizers */
+      return sweepstep(L, g, GCSswptobefnz, &g->tobefnz);
+    }
+    case GCSswptobefnz: {  /* sweep objects to be finalized */
+      return sweepstep(L, g, GCSswpend, NULL);
+    }
+    case GCSswpend: {  /* finish sweeps */
+      makewhite(g, g->mainthread);  /* sweep main thread */
+      checkSizes(L, g);
+      g->gcstate = GCScallfin;
+      return 0;
+    }
+    case GCScallfin: {  /* call remaining finalizers */
+      if (g->tobefnz && g->gckind != KGC_EMERGENCY) {
+        int n = runafewfinalizers(L);
+        return (n * GCFINALIZECOST);
+      }
+      else {  /* emergency mode or no more finalizers */
+        g->gcstate = GCSpause;  /* finish collection */
+        return 0;
+      }
+    }
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+/*
+** advances the garbage collector until it reaches a state allowed
+** by 'statemask'
+*/
+void luaC_runtilstate (lua_State *L, int statesmask) {
+  global_State *g = G(L);
+  while (!testbit(statesmask, g->gcstate))
+    singlestep(L);
+}
+
+
+/*
+** get GC debt and convert it from Kb to 'work units' (avoid zero debt
+** and overflows)
+*/
+static l_mem getdebt (global_State *g) {
+  l_mem debt = g->GCdebt;
+  int stepmul = g->gcstepmul;
+  if (debt <= 0) return 0;  /* minimal debt */
+  else {
+    debt = (debt / STEPMULADJ) + 1;
+    debt = (debt < MAX_LMEM / stepmul) ? debt * stepmul : MAX_LMEM;
+    return debt;
+  }
+}
+
+/*
+** performs a basic GC step when collector is running
+*/
+void luaC_step (lua_State *L) {
+  global_State *g = G(L);
+  l_mem debt = getdebt(g);  /* GC deficit (be paid now) */
+  if (!g->gcrunning) {  /* not running? */
+    luaE_setdebt(g, -GCSTEPSIZE * 10);  /* avoid being called too often */
+    return;
+  }
+  do {  /* repeat until pause or enough "credit" (negative debt) */
+    lu_mem work = singlestep(L);  /* perform one single step */
+    debt -= work;
+  } while (debt > -GCSTEPSIZE && g->gcstate != GCSpause);
+  if (g->gcstate == GCSpause)
+    setpause(g);  /* pause until next cycle */
+  else {
+    debt = (debt / g->gcstepmul) * STEPMULADJ;  /* convert 'work units' to Kb */
+    luaE_setdebt(g, debt);
+    runafewfinalizers(L);
+  }
+}
+
+
+/*
+** Performs a full GC cycle; if 'isemergency', set a flag to avoid
+** some operations which could change the interpreter state in some
+** unexpected ways (running finalizers and shrinking some structures).
+** Before running the collection, check 'keepinvariant'; if it is true,
+** there may be some objects marked as black, so the collector has
+** to sweep all objects to turn them back to white (as white has not
+** changed, nothing will be collected).
+*/
+void luaC_fullgc (lua_State *L, int isemergency) {
+  global_State *g = G(L);
+  lua_assert(g->gckind == KGC_NORMAL);
+  if (isemergency) g->gckind = KGC_EMERGENCY;  /* set flag */
+  if (keepinvariant(g)) {  /* black objects? */
+    entersweep(L); /* sweep everything to turn them back to white */
+  }
+  /* finish any pending sweep phase to start a new cycle */
+  luaC_runtilstate(L, bitmask(GCSpause));
+  luaC_runtilstate(L, ~bitmask(GCSpause));  /* start new collection */
+  luaC_runtilstate(L, bitmask(GCScallfin));  /* run up to finalizers */
+  /* estimate must be correct after a full GC cycle */
+  lua_assert(g->GCestimate == gettotalbytes(g));
+  luaC_runtilstate(L, bitmask(GCSpause));  /* finish collection */
+  g->gckind = KGC_NORMAL;
+  setpause(g);
+}
+
+/* }====================================================== */
+
+
diff --git a/scite-app/scite/lua/src/lgc.h b/scite-app/scite/lua/src/lgc.h
new file mode 100644
index 0000000..aed3e18
--- /dev/null
+++ b/scite-app/scite/lua/src/lgc.h
@@ -0,0 +1,147 @@
+/*
+** $Id: lgc.h,v 2.91 2015/12/21 13:02:14 roberto Exp $
+** Garbage Collector
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lgc_h
+#define lgc_h
+
+
+#include "lobject.h"
+#include "lstate.h"
+
+/*
+** Collectable objects may have one of three colors: white, which
+** means the object is not marked; gray, which means the
+** object is marked, but its references may be not marked; and
+** black, which means that the object and all its references are marked.
+** The main invariant of the garbage collector, while marking objects,
+** is that a black object can never point to a white one. Moreover,
+** any gray object must be in a "gray list" (gray, grayagain, weak,
+** allweak, ephemeron) so that it can be visited again before finishing
+** the collection cycle. These lists have no meaning when the invariant
+** is not being enforced (e.g., sweep phase).
+*/
+
+
+
+/* how much to allocate before next GC step */
+#if !defined(GCSTEPSIZE)
+/* ~100 small strings */
+#define GCSTEPSIZE	(cast_int(100 * sizeof(TString)))
+#endif
+
+
+/*
+** Possible states of the Garbage Collector
+*/
+#define GCSpropagate	0
+#define GCSatomic	1
+#define GCSswpallgc	2
+#define GCSswpfinobj	3
+#define GCSswptobefnz	4
+#define GCSswpend	5
+#define GCScallfin	6
+#define GCSpause	7
+
+
+#define issweepphase(g)  \
+	(GCSswpallgc <= (g)->gcstate && (g)->gcstate <= GCSswpend)
+
+
+/*
+** macro to tell when main invariant (white objects cannot point to black
+** ones) must be kept. During a collection, the sweep
+** phase may break the invariant, as objects turned white may point to
+** still-black objects. The invariant is restored when sweep ends and
+** all objects are white again.
+*/
+
+#define keepinvariant(g)	((g)->gcstate <= GCSatomic)
+
+
+/*
+** some useful bit tricks
+*/
+#define resetbits(x,m)		((x) &= cast(lu_byte, ~(m)))
+#define setbits(x,m)		((x) |= (m))
+#define testbits(x,m)		((x) & (m))
+#define bitmask(b)		(1<<(b))
+#define bit2mask(b1,b2)		(bitmask(b1) | bitmask(b2))
+#define l_setbit(x,b)		setbits(x, bitmask(b))
+#define resetbit(x,b)		resetbits(x, bitmask(b))
+#define testbit(x,b)		testbits(x, bitmask(b))
+
+
+/* Layout for bit use in 'marked' field: */
+#define WHITE0BIT	0  /* object is white (type 0) */
+#define WHITE1BIT	1  /* object is white (type 1) */
+#define BLACKBIT	2  /* object is black */
+#define FINALIZEDBIT	3  /* object has been marked for finalization */
+/* bit 7 is currently used by tests (luaL_checkmemory) */
+
+#define WHITEBITS	bit2mask(WHITE0BIT, WHITE1BIT)
+
+
+#define iswhite(x)      testbits((x)->marked, WHITEBITS)
+#define isblack(x)      testbit((x)->marked, BLACKBIT)
+#define isgray(x)  /* neither white nor black */  \
+	(!testbits((x)->marked, WHITEBITS | bitmask(BLACKBIT)))
+
+#define tofinalize(x)	testbit((x)->marked, FINALIZEDBIT)
+
+#define otherwhite(g)	((g)->currentwhite ^ WHITEBITS)
+#define isdeadm(ow,m)	(!(((m) ^ WHITEBITS) & (ow)))
+#define isdead(g,v)	isdeadm(otherwhite(g), (v)->marked)
+
+#define changewhite(x)	((x)->marked ^= WHITEBITS)
+#define gray2black(x)	l_setbit((x)->marked, BLACKBIT)
+
+#define luaC_white(g)	cast(lu_byte, (g)->currentwhite & WHITEBITS)
+
+
+/*
+** Does one step of collection when debt becomes positive. 'pre'/'pos'
+** allows some adjustments to be done only when needed. macro
+** 'condchangemem' is used only for heavy tests (forcing a full
+** GC cycle on every opportunity)
+*/
+#define luaC_condGC(L,pre,pos) \
+	{ if (G(L)->GCdebt > 0) { pre; luaC_step(L); pos;}; \
+	  condchangemem(L,pre,pos); }
+
+/* more often than not, 'pre'/'pos' are empty */
+#define luaC_checkGC(L)		luaC_condGC(L,(void)0,(void)0)
+
+
+#define luaC_barrier(L,p,v) (  \
+	(iscollectable(v) && isblack(p) && iswhite(gcvalue(v))) ?  \
+	luaC_barrier_(L,obj2gco(p),gcvalue(v)) : cast_void(0))
+
+#define luaC_barrierback(L,p,v) (  \
+	(iscollectable(v) && isblack(p) && iswhite(gcvalue(v))) ? \
+	luaC_barrierback_(L,p) : cast_void(0))
+
+#define luaC_objbarrier(L,p,o) (  \
+	(isblack(p) && iswhite(o)) ? \
+	luaC_barrier_(L,obj2gco(p),obj2gco(o)) : cast_void(0))
+
+#define luaC_upvalbarrier(L,uv) ( \
+	(iscollectable((uv)->v) && !upisopen(uv)) ? \
+         luaC_upvalbarrier_(L,uv) : cast_void(0))
+
+LUAI_FUNC void luaC_fix (lua_State *L, GCObject *o);
+LUAI_FUNC void luaC_freeallobjects (lua_State *L);
+LUAI_FUNC void luaC_step (lua_State *L);
+LUAI_FUNC void luaC_runtilstate (lua_State *L, int statesmask);
+LUAI_FUNC void luaC_fullgc (lua_State *L, int isemergency);
+LUAI_FUNC GCObject *luaC_newobj (lua_State *L, int tt, size_t sz);
+LUAI_FUNC void luaC_barrier_ (lua_State *L, GCObject *o, GCObject *v);
+LUAI_FUNC void luaC_barrierback_ (lua_State *L, Table *o);
+LUAI_FUNC void luaC_upvalbarrier_ (lua_State *L, UpVal *uv);
+LUAI_FUNC void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt);
+LUAI_FUNC void luaC_upvdeccount (lua_State *L, UpVal *uv);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/linit.c b/scite-app/scite/lua/src/linit.c
new file mode 100644
index 0000000..afcaf98
--- /dev/null
+++ b/scite-app/scite/lua/src/linit.c
@@ -0,0 +1,68 @@
+/*
+** $Id: linit.c,v 1.39 2016/12/04 20:17:24 roberto Exp $
+** Initialization of libraries for lua.c and other clients
+** See Copyright Notice in lua.h
+*/
+
+
+#define linit_c
+#define LUA_LIB
+
+/*
+** If you embed Lua in your program and need to open the standard
+** libraries, call luaL_openlibs in your program. If you need a
+** different set of libraries, copy this file to your project and edit
+** it to suit your needs.
+**
+** You can also *preload* libraries, so that a later 'require' can
+** open the library, which is already linked to the application.
+** For that, do the following code:
+**
+**  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+**  lua_pushcfunction(L, luaopen_modname);
+**  lua_setfield(L, -2, modname);
+**  lua_pop(L, 1);  // remove PRELOAD table
+*/
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "lualib.h"
+#include "lauxlib.h"
+
+
+/*
+** these libs are loaded by lua.c and are readily available to any Lua
+** program
+*/
+static const luaL_Reg loadedlibs[] = {
+  {"_G", luaopen_base},
+  {LUA_LOADLIBNAME, luaopen_package},
+  {LUA_COLIBNAME, luaopen_coroutine},
+  {LUA_TABLIBNAME, luaopen_table},
+  {LUA_IOLIBNAME, luaopen_io},
+  {LUA_OSLIBNAME, luaopen_os},
+  {LUA_STRLIBNAME, luaopen_string},
+  {LUA_MATHLIBNAME, luaopen_math},
+  {LUA_UTF8LIBNAME, luaopen_utf8},
+  {LUA_DBLIBNAME, luaopen_debug},
+#if defined(LUA_COMPAT_BITLIB)
+  {LUA_BITLIBNAME, luaopen_bit32},
+#endif
+  {NULL, NULL}
+};
+
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+  const luaL_Reg *lib;
+  /* "require" functions from 'loadedlibs' and set results to global table */
+  for (lib = loadedlibs; lib->func; lib++) {
+    luaL_requiref(L, lib->name, lib->func, 1);
+    lua_pop(L, 1);  /* remove lib */
+  }
+}
+
diff --git a/scite-app/scite/lua/src/liolib.c b/scite-app/scite/lua/src/liolib.c
new file mode 100644
index 0000000..1568403
--- /dev/null
+++ b/scite-app/scite/lua/src/liolib.c
@@ -0,0 +1,771 @@
+/*
+** $Id: liolib.c,v 2.151 2016/12/20 18:37:00 roberto Exp $
+** Standard I/O (and system) library
+** See Copyright Notice in lua.h
+*/
+
+#define liolib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+
+
+/*
+** Change this macro to accept other modes for 'fopen' besides
+** the standard ones.
+*/
+#if !defined(l_checkmode)
+
+/* accepted extensions to 'mode' in 'fopen' */
+#if !defined(L_MODEEXT)
+#define L_MODEEXT	"b"
+#endif
+
+/* Check whether 'mode' matches '[rwa]%+?[L_MODEEXT]*' */
+static int l_checkmode (const char *mode) {
+  return (*mode != '\0' && strchr("rwa", *(mode++)) != NULL &&
+         (*mode != '+' || (++mode, 1)) &&  /* skip if char is '+' */
+         (strspn(mode, L_MODEEXT) == strlen(mode)));  /* check extensions */
+}
+
+#endif
+
+/*
+** {======================================================
+** l_popen spawns a new process connected to the current
+** one through the file streams.
+** =======================================================
+*/
+
+#if !defined(l_popen)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_popen(L,c,m)		(fflush(NULL), popen(c,m))
+#define l_pclose(L,file)	(pclose(file))
+
+#elif defined(LUA_USE_WINDOWS)	/* }{ */
+
+#define l_popen(L,c,m)		(_popen(c,m))
+#define l_pclose(L,file)	(_pclose(file))
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_popen(L,c,m)  \
+	  ((void)((void)c, m), \
+	  luaL_error(L, "'popen' not supported"), \
+	  (FILE*)0)
+#define l_pclose(L,file)		((void)L, (void)file, -1)
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }====================================================== */
+
+
+#if !defined(l_getc)		/* { */
+
+#if defined(LUA_USE_POSIX)
+#define l_getc(f)		getc_unlocked(f)
+#define l_lockfile(f)		flockfile(f)
+#define l_unlockfile(f)		funlockfile(f)
+#else
+#define l_getc(f)		getc(f)
+#define l_lockfile(f)		((void)0)
+#define l_unlockfile(f)		((void)0)
+#endif
+
+#endif				/* } */
+
+
+/*
+** {======================================================
+** l_fseek: configuration for longer offsets
+** =======================================================
+*/
+
+#if !defined(l_fseek)		/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <sys/types.h>
+
+#define l_fseek(f,o,w)		fseeko(f,o,w)
+#define l_ftell(f)		ftello(f)
+#define l_seeknum		off_t
+
+#elif defined(LUA_USE_WINDOWS) && !defined(_CRTIMP_TYPEINFO) \
+   && defined(_MSC_VER) && (_MSC_VER >= 1400)	/* }{ */
+
+/* Windows (but not DDK) and Visual C++ 2005 or higher */
+#define l_fseek(f,o,w)		_fseeki64(f,o,w)
+#define l_ftell(f)		_ftelli64(f)
+#define l_seeknum		__int64
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_fseek(f,o,w)		fseek(f,o,w)
+#define l_ftell(f)		ftell(f)
+#define l_seeknum		long
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }====================================================== */
+
+
+#define IO_PREFIX	"_IO_"
+#define IOPREF_LEN	(sizeof(IO_PREFIX)/sizeof(char) - 1)
+#define IO_INPUT	(IO_PREFIX "input")
+#define IO_OUTPUT	(IO_PREFIX "output")
+
+
+typedef luaL_Stream LStream;
+
+
+#define tolstream(L)	((LStream *)luaL_checkudata(L, 1, LUA_FILEHANDLE))
+
+#define isclosed(p)	((p)->closef == NULL)
+
+
+static int io_type (lua_State *L) {
+  LStream *p;
+  luaL_checkany(L, 1);
+  p = (LStream *)luaL_testudata(L, 1, LUA_FILEHANDLE);
+  if (p == NULL)
+    lua_pushnil(L);  /* not a file */
+  else if (isclosed(p))
+    lua_pushliteral(L, "closed file");
+  else
+    lua_pushliteral(L, "file");
+  return 1;
+}
+
+
+static int f_tostring (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (isclosed(p))
+    lua_pushliteral(L, "file (closed)");
+  else
+    lua_pushfstring(L, "file (%p)", p->f);
+  return 1;
+}
+
+
+static FILE *tofile (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (isclosed(p))
+    luaL_error(L, "attempt to use a closed file");
+  lua_assert(p->f);
+  return p->f;
+}
+
+
+/*
+** When creating file handles, always creates a 'closed' file handle
+** before opening the actual file; so, if there is a memory error, the
+** handle is in a consistent state.
+*/
+static LStream *newprefile (lua_State *L) {
+  LStream *p = (LStream *)lua_newuserdata(L, sizeof(LStream));
+  p->closef = NULL;  /* mark file handle as 'closed' */
+  luaL_setmetatable(L, LUA_FILEHANDLE);
+  return p;
+}
+
+
+/*
+** Calls the 'close' function from a file handle. The 'volatile' avoids
+** a bug in some versions of the Clang compiler (e.g., clang 3.0 for
+** 32 bits).
+*/
+static int aux_close (lua_State *L) {
+  LStream *p = tolstream(L);
+  volatile lua_CFunction cf = p->closef;
+  p->closef = NULL;  /* mark stream as closed */
+  return (*cf)(L);  /* close it */
+}
+
+
+static int io_close (lua_State *L) {
+  if (lua_isnone(L, 1))  /* no argument? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_OUTPUT);  /* use standard output */
+  tofile(L);  /* make sure argument is an open stream */
+  return aux_close(L);
+}
+
+
+static int f_gc (lua_State *L) {
+  LStream *p = tolstream(L);
+  if (!isclosed(p) && p->f != NULL)
+    aux_close(L);  /* ignore closed and incompletely open files */
+  return 0;
+}
+
+
+/*
+** function to close regular files
+*/
+static int io_fclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  int res = fclose(p->f);
+  return luaL_fileresult(L, (res == 0), NULL);
+}
+
+
+static LStream *newfile (lua_State *L) {
+  LStream *p = newprefile(L);
+  p->f = NULL;
+  p->closef = &io_fclose;
+  return p;
+}
+
+
+static void opencheck (lua_State *L, const char *fname, const char *mode) {
+  LStream *p = newfile(L);
+  p->f = fopen(fname, mode);
+  if (p->f == NULL)
+    luaL_error(L, "cannot open file '%s' (%s)", fname, strerror(errno));
+}
+
+
+static int io_open (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newfile(L);
+  const char *md = mode;  /* to traverse/check mode */
+  luaL_argcheck(L, l_checkmode(md), 2, "invalid mode");
+  p->f = fopen(filename, mode);
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+/*
+** function to close 'popen' files
+*/
+static int io_pclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  return luaL_execresult(L, l_pclose(L, p->f));
+}
+
+
+static int io_popen (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  const char *mode = luaL_optstring(L, 2, "r");
+  LStream *p = newprefile(L);
+  p->f = l_popen(L, filename, mode);
+  p->closef = &io_pclose;
+  return (p->f == NULL) ? luaL_fileresult(L, 0, filename) : 1;
+}
+
+
+static int io_tmpfile (lua_State *L) {
+  LStream *p = newfile(L);
+  p->f = tmpfile();
+  return (p->f == NULL) ? luaL_fileresult(L, 0, NULL) : 1;
+}
+
+
+static FILE *getiofile (lua_State *L, const char *findex) {
+  LStream *p;
+  lua_getfield(L, LUA_REGISTRYINDEX, findex);
+  p = (LStream *)lua_touserdata(L, -1);
+  if (isclosed(p))
+    luaL_error(L, "standard %s file is closed", findex + IOPREF_LEN);
+  return p->f;
+}
+
+
+static int g_iofile (lua_State *L, const char *f, const char *mode) {
+  if (!lua_isnoneornil(L, 1)) {
+    const char *filename = lua_tostring(L, 1);
+    if (filename)
+      opencheck(L, filename, mode);
+    else {
+      tofile(L);  /* check that it's a valid file handle */
+      lua_pushvalue(L, 1);
+    }
+    lua_setfield(L, LUA_REGISTRYINDEX, f);
+  }
+  /* return current value */
+  lua_getfield(L, LUA_REGISTRYINDEX, f);
+  return 1;
+}
+
+
+static int io_input (lua_State *L) {
+  return g_iofile(L, IO_INPUT, "r");
+}
+
+
+static int io_output (lua_State *L) {
+  return g_iofile(L, IO_OUTPUT, "w");
+}
+
+
+static int io_readline (lua_State *L);
+
+
+/*
+** maximum number of arguments to 'f:lines'/'io.lines' (it + 3 must fit
+** in the limit for upvalues of a closure)
+*/
+#define MAXARGLINE	250
+
+static void aux_lines (lua_State *L, int toclose) {
+  int n = lua_gettop(L) - 1;  /* number of arguments to read */
+  luaL_argcheck(L, n <= MAXARGLINE, MAXARGLINE + 2, "too many arguments");
+  lua_pushinteger(L, n);  /* number of arguments to read */
+  lua_pushboolean(L, toclose);  /* close/not close file when finished */
+  lua_rotate(L, 2, 2);  /* move 'n' and 'toclose' to their positions */
+  lua_pushcclosure(L, io_readline, 3 + n);
+}
+
+
+static int f_lines (lua_State *L) {
+  tofile(L);  /* check that it's a valid file handle */
+  aux_lines(L, 0);
+  return 1;
+}
+
+
+static int io_lines (lua_State *L) {
+  int toclose;
+  if (lua_isnone(L, 1)) lua_pushnil(L);  /* at least one argument */
+  if (lua_isnil(L, 1)) {  /* no file name? */
+    lua_getfield(L, LUA_REGISTRYINDEX, IO_INPUT);  /* get default input */
+    lua_replace(L, 1);  /* put it at index 1 */
+    tofile(L);  /* check that it's a valid file handle */
+    toclose = 0;  /* do not close it after iteration */
+  }
+  else {  /* open a new file */
+    const char *filename = luaL_checkstring(L, 1);
+    opencheck(L, filename, "r");
+    lua_replace(L, 1);  /* put file at index 1 */
+    toclose = 1;  /* close it after iteration */
+  }
+  aux_lines(L, toclose);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** READ
+** =======================================================
+*/
+
+
+/* maximum length of a numeral */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM     200
+#endif
+
+
+/* auxiliary structure used by 'read_number' */
+typedef struct {
+  FILE *f;  /* file being read */
+  int c;  /* current character (look ahead) */
+  int n;  /* number of elements in buffer 'buff' */
+  char buff[L_MAXLENNUM + 1];  /* +1 for ending '\0' */
+} RN;
+
+
+/*
+** Add current char to buffer (if not out of space) and read next one
+*/
+static int nextc (RN *rn) {
+  if (rn->n >= L_MAXLENNUM) {  /* buffer overflow? */
+    rn->buff[0] = '\0';  /* invalidate result */
+    return 0;  /* fail */
+  }
+  else {
+    rn->buff[rn->n++] = rn->c;  /* save current char */
+    rn->c = l_getc(rn->f);  /* read next one */
+    return 1;
+  }
+}
+
+
+/*
+** Accept current char if it is in 'set' (of size 2)
+*/
+static int test2 (RN *rn, const char *set) {
+  if (rn->c == set[0] || rn->c == set[1])
+    return nextc(rn);
+  else return 0;
+}
+
+
+/*
+** Read a sequence of (hex)digits
+*/
+static int readdigits (RN *rn, int hex) {
+  int count = 0;
+  while ((hex ? isxdigit(rn->c) : isdigit(rn->c)) && nextc(rn))
+    count++;
+  return count;
+}
+
+
+/*
+** Read a number: first reads a valid prefix of a numeral into a buffer.
+** Then it calls 'lua_stringtonumber' to check whether the format is
+** correct and to convert it to a Lua number
+*/
+static int read_number (lua_State *L, FILE *f) {
+  RN rn;
+  int count = 0;
+  int hex = 0;
+  char decp[2];
+  rn.f = f; rn.n = 0;
+  decp[0] = lua_getlocaledecpoint();  /* get decimal point from locale */
+  decp[1] = '.';  /* always accept a dot */
+  l_lockfile(rn.f);
+  do { rn.c = l_getc(rn.f); } while (isspace(rn.c));  /* skip spaces */
+  test2(&rn, "-+");  /* optional signal */
+  if (test2(&rn, "00")) {
+    if (test2(&rn, "xX")) hex = 1;  /* numeral is hexadecimal */
+    else count = 1;  /* count initial '0' as a valid digit */
+  }
+  count += readdigits(&rn, hex);  /* integral part */
+  if (test2(&rn, decp))  /* decimal point? */
+    count += readdigits(&rn, hex);  /* fractional part */
+  if (count > 0 && test2(&rn, (hex ? "pP" : "eE"))) {  /* exponent mark? */
+    test2(&rn, "-+");  /* exponent signal */
+    readdigits(&rn, 0);  /* exponent digits */
+  }
+  ungetc(rn.c, rn.f);  /* unread look-ahead char */
+  l_unlockfile(rn.f);
+  rn.buff[rn.n] = '\0';  /* finish string */
+  if (lua_stringtonumber(L, rn.buff))  /* is this a valid number? */
+    return 1;  /* ok */
+  else {  /* invalid format */
+   lua_pushnil(L);  /* "result" to be removed */
+   return 0;  /* read fails */
+  }
+}
+
+
+static int test_eof (lua_State *L, FILE *f) {
+  int c = getc(f);
+  ungetc(c, f);  /* no-op when c == EOF */
+  lua_pushliteral(L, "");
+  return (c != EOF);
+}
+
+
+static int read_line (lua_State *L, FILE *f, int chop) {
+  luaL_Buffer b;
+  int c = '\0';
+  luaL_buffinit(L, &b);
+  while (c != EOF && c != '\n') {  /* repeat until end of line */
+    char *buff = luaL_prepbuffer(&b);  /* preallocate buffer */
+    int i = 0;
+    l_lockfile(f);  /* no memory errors can happen inside the lock */
+    while (i < LUAL_BUFFERSIZE && (c = l_getc(f)) != EOF && c != '\n')
+      buff[i++] = c;
+    l_unlockfile(f);
+    luaL_addsize(&b, i);
+  }
+  if (!chop && c == '\n')  /* want a newline and have one? */
+    luaL_addchar(&b, c);  /* add ending newline to result */
+  luaL_pushresult(&b);  /* close buffer */
+  /* return ok if read something (either a newline or something else) */
+  return (c == '\n' || lua_rawlen(L, -1) > 0);
+}
+
+
+static void read_all (lua_State *L, FILE *f) {
+  size_t nr;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  do {  /* read file in chunks of LUAL_BUFFERSIZE bytes */
+    char *p = luaL_prepbuffer(&b);
+    nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
+    luaL_addsize(&b, nr);
+  } while (nr == LUAL_BUFFERSIZE);
+  luaL_pushresult(&b);  /* close buffer */
+}
+
+
+static int read_chars (lua_State *L, FILE *f, size_t n) {
+  size_t nr;  /* number of chars actually read */
+  char *p;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  p = luaL_prepbuffsize(&b, n);  /* prepare buffer to read whole block */
+  nr = fread(p, sizeof(char), n, f);  /* try to read 'n' chars */
+  luaL_addsize(&b, nr);
+  luaL_pushresult(&b);  /* close buffer */
+  return (nr > 0);  /* true iff read something */
+}
+
+
+static int g_read (lua_State *L, FILE *f, int first) {
+  int nargs = lua_gettop(L) - 1;
+  int success;
+  int n;
+  clearerr(f);
+  if (nargs == 0) {  /* no arguments? */
+    success = read_line(L, f, 1);
+    n = first+1;  /* to return 1 result */
+  }
+  else {  /* ensure stack space for all results and for auxlib's buffer */
+    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+    success = 1;
+    for (n = first; nargs-- && success; n++) {
+      if (lua_type(L, n) == LUA_TNUMBER) {
+        size_t l = (size_t)luaL_checkinteger(L, n);
+        success = (l == 0) ? test_eof(L, f) : read_chars(L, f, l);
+      }
+      else {
+        const char *p = luaL_checkstring(L, n);
+        if (*p == '*') p++;  /* skip optional '*' (for compatibility) */
+        switch (*p) {
+          case 'n':  /* number */
+            success = read_number(L, f);
+            break;
+          case 'l':  /* line */
+            success = read_line(L, f, 1);
+            break;
+          case 'L':  /* line with end-of-line */
+            success = read_line(L, f, 0);
+            break;
+          case 'a':  /* file */
+            read_all(L, f);  /* read entire file */
+            success = 1; /* always success */
+            break;
+          default:
+            return luaL_argerror(L, n, "invalid format");
+        }
+      }
+    }
+  }
+  if (ferror(f))
+    return luaL_fileresult(L, 0, NULL);
+  if (!success) {
+    lua_pop(L, 1);  /* remove last result */
+    lua_pushnil(L);  /* push nil instead */
+  }
+  return n - first;
+}
+
+
+static int io_read (lua_State *L) {
+  return g_read(L, getiofile(L, IO_INPUT), 1);
+}
+
+
+static int f_read (lua_State *L) {
+  return g_read(L, tofile(L), 2);
+}
+
+
+static int io_readline (lua_State *L) {
+  LStream *p = (LStream *)lua_touserdata(L, lua_upvalueindex(1));
+  int i;
+  int n = (int)lua_tointeger(L, lua_upvalueindex(2));
+  if (isclosed(p))  /* file is already closed? */
+    return luaL_error(L, "file is already closed");
+  lua_settop(L , 1);
+  luaL_checkstack(L, n, "too many arguments");
+  for (i = 1; i <= n; i++)  /* push arguments to 'g_read' */
+    lua_pushvalue(L, lua_upvalueindex(3 + i));
+  n = g_read(L, p->f, 2);  /* 'n' is number of results */
+  lua_assert(n > 0);  /* should return at least a nil */
+  if (lua_toboolean(L, -n))  /* read at least one value? */
+    return n;  /* return them */
+  else {  /* first result is nil: EOF or error */
+    if (n > 1) {  /* is there error information? */
+      /* 2nd result is error message */
+      return luaL_error(L, "%s", lua_tostring(L, -n + 1));
+    }
+    if (lua_toboolean(L, lua_upvalueindex(3))) {  /* generator created file? */
+      lua_settop(L, 0);
+      lua_pushvalue(L, lua_upvalueindex(1));
+      aux_close(L);  /* close it */
+    }
+    return 0;
+  }
+}
+
+/* }====================================================== */
+
+
+static int g_write (lua_State *L, FILE *f, int arg) {
+  int nargs = lua_gettop(L) - arg;
+  int status = 1;
+  for (; nargs--; arg++) {
+    if (lua_type(L, arg) == LUA_TNUMBER) {
+      /* optimization: could be done exactly as for strings */
+      int len = lua_isinteger(L, arg)
+                ? fprintf(f, LUA_INTEGER_FMT,
+                             (LUAI_UACINT)lua_tointeger(L, arg))
+                : fprintf(f, LUA_NUMBER_FMT,
+                             (LUAI_UACNUMBER)lua_tonumber(L, arg));
+      status = status && (len > 0);
+    }
+    else {
+      size_t l;
+      const char *s = luaL_checklstring(L, arg, &l);
+      status = status && (fwrite(s, sizeof(char), l, f) == l);
+    }
+  }
+  if (status) return 1;  /* file handle already on stack top */
+  else return luaL_fileresult(L, status, NULL);
+}
+
+
+static int io_write (lua_State *L) {
+  return g_write(L, getiofile(L, IO_OUTPUT), 1);
+}
+
+
+static int f_write (lua_State *L) {
+  FILE *f = tofile(L);
+  lua_pushvalue(L, 1);  /* push file at the stack top (to be returned) */
+  return g_write(L, f, 2);
+}
+
+
+static int f_seek (lua_State *L) {
+  static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
+  static const char *const modenames[] = {"set", "cur", "end", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, "cur", modenames);
+  lua_Integer p3 = luaL_optinteger(L, 3, 0);
+  l_seeknum offset = (l_seeknum)p3;
+  luaL_argcheck(L, (lua_Integer)offset == p3, 3,
+                  "not an integer in proper range");
+  op = l_fseek(f, offset, mode[op]);
+  if (op)
+    return luaL_fileresult(L, 0, NULL);  /* error */
+  else {
+    lua_pushinteger(L, (lua_Integer)l_ftell(f));
+    return 1;
+  }
+}
+
+
+static int f_setvbuf (lua_State *L) {
+  static const int mode[] = {_IONBF, _IOFBF, _IOLBF};
+  static const char *const modenames[] = {"no", "full", "line", NULL};
+  FILE *f = tofile(L);
+  int op = luaL_checkoption(L, 2, NULL, modenames);
+  lua_Integer sz = luaL_optinteger(L, 3, LUAL_BUFFERSIZE);
+  int res = setvbuf(f, NULL, mode[op], (size_t)sz);
+  return luaL_fileresult(L, res == 0, NULL);
+}
+
+
+
+static int io_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
+}
+
+
+static int f_flush (lua_State *L) {
+  return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
+}
+
+
+/*
+** functions for 'io' library
+*/
+static const luaL_Reg iolib[] = {
+  {"close", io_close},
+  {"flush", io_flush},
+  {"input", io_input},
+  {"lines", io_lines},
+  {"open", io_open},
+  {"output", io_output},
+  {"popen", io_popen},
+  {"read", io_read},
+  {"tmpfile", io_tmpfile},
+  {"type", io_type},
+  {"write", io_write},
+  {NULL, NULL}
+};
+
+
+/*
+** methods for file handles
+*/
+static const luaL_Reg flib[] = {
+  {"close", io_close},
+  {"flush", f_flush},
+  {"lines", f_lines},
+  {"read", f_read},
+  {"seek", f_seek},
+  {"setvbuf", f_setvbuf},
+  {"write", f_write},
+  {"__gc", f_gc},
+  {"__tostring", f_tostring},
+  {NULL, NULL}
+};
+
+
+static void createmeta (lua_State *L) {
+  luaL_newmetatable(L, LUA_FILEHANDLE);  /* create metatable for file handles */
+  lua_pushvalue(L, -1);  /* push metatable */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = metatable */
+  luaL_setfuncs(L, flib, 0);  /* add file methods to new metatable */
+  lua_pop(L, 1);  /* pop new metatable */
+}
+
+
+/*
+** function to (not) close the standard files stdin, stdout, and stderr
+*/
+static int io_noclose (lua_State *L) {
+  LStream *p = tolstream(L);
+  p->closef = &io_noclose;  /* keep file opened */
+  lua_pushnil(L);
+  lua_pushliteral(L, "cannot close standard file");
+  return 2;
+}
+
+
+static void createstdfile (lua_State *L, FILE *f, const char *k,
+                           const char *fname) {
+  LStream *p = newprefile(L);
+  p->f = f;
+  p->closef = &io_noclose;
+  if (k != NULL) {
+    lua_pushvalue(L, -1);
+    lua_setfield(L, LUA_REGISTRYINDEX, k);  /* add file to registry */
+  }
+  lua_setfield(L, -2, fname);  /* add file to module */
+}
+
+
+LUAMOD_API int luaopen_io (lua_State *L) {
+  luaL_newlib(L, iolib);  /* new module */
+  createmeta(L);
+  /* create (and set) default files */
+  createstdfile(L, stdin, IO_INPUT, "stdin");
+  createstdfile(L, stdout, IO_OUTPUT, "stdout");
+  createstdfile(L, stderr, NULL, "stderr");
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/llex.c b/scite-app/scite/lua/src/llex.c
new file mode 100644
index 0000000..7032827
--- /dev/null
+++ b/scite-app/scite/lua/src/llex.c
@@ -0,0 +1,565 @@
+/*
+** $Id: llex.c,v 2.96 2016/05/02 14:02:12 roberto Exp $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#define llex_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lobject.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lzio.h"
+
+
+
+#define next(ls) (ls->current = zgetc(ls->z))
+
+
+
+#define currIsNewline(ls)	(ls->current == '\n' || ls->current == '\r')
+
+
+/* ORDER RESERVED */
+static const char *const luaX_tokens [] = {
+    "and", "break", "do", "else", "elseif",
+    "end", "false", "for", "function", "goto", "if",
+    "in", "local", "nil", "not", "or", "repeat",
+    "return", "then", "true", "until", "while",
+    "//", "..", "...", "==", ">=", "<=", "~=",
+    "<<", ">>", "::", "<eof>",
+    "<number>", "<integer>", "<name>", "<string>"
+};
+
+
+#define save_and_next(ls) (save(ls, ls->current), next(ls))
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token);
+
+
+static void save (LexState *ls, int c) {
+  Mbuffer *b = ls->buff;
+  if (luaZ_bufflen(b) + 1 > luaZ_sizebuffer(b)) {
+    size_t newsize;
+    if (luaZ_sizebuffer(b) >= MAX_SIZE/2)
+      lexerror(ls, "lexical element too long", 0);
+    newsize = luaZ_sizebuffer(b) * 2;
+    luaZ_resizebuffer(ls->L, b, newsize);
+  }
+  b->buffer[luaZ_bufflen(b)++] = cast(char, c);
+}
+
+
+void luaX_init (lua_State *L) {
+  int i;
+  TString *e = luaS_newliteral(L, LUA_ENV);  /* create env name */
+  luaC_fix(L, obj2gco(e));  /* never collect this name */
+  for (i=0; i<NUM_RESERVED; i++) {
+    TString *ts = luaS_new(L, luaX_tokens[i]);
+    luaC_fix(L, obj2gco(ts));  /* reserved words are never collected */
+    ts->extra = cast_byte(i+1);  /* reserved word */
+  }
+}
+
+
+const char *luaX_token2str (LexState *ls, int token) {
+  if (token < FIRST_RESERVED) {  /* single-byte symbols? */
+    lua_assert(token == cast_uchar(token));
+    return luaO_pushfstring(ls->L, "'%c'", token);
+  }
+  else {
+    const char *s = luaX_tokens[token - FIRST_RESERVED];
+    if (token < TK_EOS)  /* fixed format (symbols and reserved words)? */
+      return luaO_pushfstring(ls->L, "'%s'", s);
+    else  /* names, strings, and numerals */
+      return s;
+  }
+}
+
+
+static const char *txtToken (LexState *ls, int token) {
+  switch (token) {
+    case TK_NAME: case TK_STRING:
+    case TK_FLT: case TK_INT:
+      save(ls, '\0');
+      return luaO_pushfstring(ls->L, "'%s'", luaZ_buffer(ls->buff));
+    default:
+      return luaX_token2str(ls, token);
+  }
+}
+
+
+static l_noret lexerror (LexState *ls, const char *msg, int token) {
+  msg = luaG_addinfo(ls->L, msg, ls->source, ls->linenumber);
+  if (token)
+    luaO_pushfstring(ls->L, "%s near %s", msg, txtToken(ls, token));
+  luaD_throw(ls->L, LUA_ERRSYNTAX);
+}
+
+
+l_noret luaX_syntaxerror (LexState *ls, const char *msg) {
+  lexerror(ls, msg, ls->t.token);
+}
+
+
+/*
+** creates a new string and anchors it in scanner's table so that
+** it will not be collected until the end of the compilation
+** (by that time it should be anchored somewhere)
+*/
+TString *luaX_newstring (LexState *ls, const char *str, size_t l) {
+  lua_State *L = ls->L;
+  TValue *o;  /* entry for 'str' */
+  TString *ts = luaS_newlstr(L, str, l);  /* create new string */
+  setsvalue2s(L, L->top++, ts);  /* temporarily anchor it in stack */
+  o = luaH_set(L, ls->h, L->top - 1);
+  if (ttisnil(o)) {  /* not in use yet? */
+    /* boolean value does not need GC barrier;
+       table has no metatable, so it does not need to invalidate cache */
+    setbvalue(o, 1);  /* t[string] = true */
+    luaC_checkGC(L);
+  }
+  else {  /* string already present */
+    ts = tsvalue(keyfromval(o));  /* re-use value previously stored */
+  }
+  L->top--;  /* remove string from stack */
+  return ts;
+}
+
+
+/*
+** increment line number and skips newline sequence (any of
+** \n, \r, \n\r, or \r\n)
+*/
+static void inclinenumber (LexState *ls) {
+  int old = ls->current;
+  lua_assert(currIsNewline(ls));
+  next(ls);  /* skip '\n' or '\r' */
+  if (currIsNewline(ls) && ls->current != old)
+    next(ls);  /* skip '\n\r' or '\r\n' */
+  if (++ls->linenumber >= MAX_INT)
+    lexerror(ls, "chunk has too many lines", 0);
+}
+
+
+void luaX_setinput (lua_State *L, LexState *ls, ZIO *z, TString *source,
+                    int firstchar) {
+  ls->t.token = 0;
+  ls->L = L;
+  ls->current = firstchar;
+  ls->lookahead.token = TK_EOS;  /* no look-ahead token */
+  ls->z = z;
+  ls->fs = NULL;
+  ls->linenumber = 1;
+  ls->lastline = 1;
+  ls->source = source;
+  ls->envn = luaS_newliteral(L, LUA_ENV);  /* get env name */
+  luaZ_resizebuffer(ls->L, ls->buff, LUA_MINBUFFER);  /* initialize buffer */
+}
+
+
+
+/*
+** =======================================================
+** LEXICAL ANALYZER
+** =======================================================
+*/
+
+
+static int check_next1 (LexState *ls, int c) {
+  if (ls->current == c) {
+    next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/*
+** Check whether current char is in set 'set' (with two chars) and
+** saves it
+*/
+static int check_next2 (LexState *ls, const char *set) {
+  lua_assert(set[2] == '\0');
+  if (ls->current == set[0] || ls->current == set[1]) {
+    save_and_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+/* LUA_NUMBER */
+/*
+** this function is quite liberal in what it accepts, as 'luaO_str2num'
+** will reject ill-formed numerals.
+*/
+static int read_numeral (LexState *ls, SemInfo *seminfo) {
+  TValue obj;
+  const char *expo = "Ee";
+  int first = ls->current;
+  lua_assert(lisdigit(ls->current));
+  save_and_next(ls);
+  if (first == '0' && check_next2(ls, "xX"))  /* hexadecimal? */
+    expo = "Pp";
+  for (;;) {
+    if (check_next2(ls, expo))  /* exponent part? */
+      check_next2(ls, "-+");  /* optional exponent sign */
+    if (lisxdigit(ls->current))
+      save_and_next(ls);
+    else if (ls->current == '.')
+      save_and_next(ls);
+    else break;
+  }
+  save(ls, '\0');
+  if (luaO_str2num(luaZ_buffer(ls->buff), &obj) == 0)  /* format error? */
+    lexerror(ls, "malformed number", TK_FLT);
+  if (ttisinteger(&obj)) {
+    seminfo->i = ivalue(&obj);
+    return TK_INT;
+  }
+  else {
+    lua_assert(ttisfloat(&obj));
+    seminfo->r = fltvalue(&obj);
+    return TK_FLT;
+  }
+}
+
+
+/*
+** skip a sequence '[=*[' or ']=*]'; if sequence is well formed, return
+** its number of '='s; otherwise, return a negative number (-1 iff there
+** are no '='s after initial bracket)
+*/
+static int skip_sep (LexState *ls) {
+  int count = 0;
+  int s = ls->current;
+  lua_assert(s == '[' || s == ']');
+  save_and_next(ls);
+  while (ls->current == '=') {
+    save_and_next(ls);
+    count++;
+  }
+  return (ls->current == s) ? count : (-count) - 1;
+}
+
+
+static void read_long_string (LexState *ls, SemInfo *seminfo, int sep) {
+  int line = ls->linenumber;  /* initial line (for error message) */
+  save_and_next(ls);  /* skip 2nd '[' */
+  if (currIsNewline(ls))  /* string starts with a newline? */
+    inclinenumber(ls);  /* skip it */
+  for (;;) {
+    switch (ls->current) {
+      case EOZ: {  /* error */
+        const char *what = (seminfo ? "string" : "comment");
+        const char *msg = luaO_pushfstring(ls->L,
+                     "unfinished long %s (starting at line %d)", what, line);
+        lexerror(ls, msg, TK_EOS);
+        break;  /* to avoid warnings */
+      }
+      case ']': {
+        if (skip_sep(ls) == sep) {
+          save_and_next(ls);  /* skip 2nd ']' */
+          goto endloop;
+        }
+        break;
+      }
+      case '\n': case '\r': {
+        save(ls, '\n');
+        inclinenumber(ls);
+        if (!seminfo) luaZ_resetbuffer(ls->buff);  /* avoid wasting space */
+        break;
+      }
+      default: {
+        if (seminfo) save_and_next(ls);
+        else next(ls);
+      }
+    }
+  } endloop:
+  if (seminfo)
+    seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + (2 + sep),
+                                     luaZ_bufflen(ls->buff) - 2*(2 + sep));
+}
+
+
+static void esccheck (LexState *ls, int c, const char *msg) {
+  if (!c) {
+    if (ls->current != EOZ)
+      save_and_next(ls);  /* add current to buffer for error message */
+    lexerror(ls, msg, TK_STRING);
+  }
+}
+
+
+static int gethexa (LexState *ls) {
+  save_and_next(ls);
+  esccheck (ls, lisxdigit(ls->current), "hexadecimal digit expected");
+  return luaO_hexavalue(ls->current);
+}
+
+
+static int readhexaesc (LexState *ls) {
+  int r = gethexa(ls);
+  r = (r << 4) + gethexa(ls);
+  luaZ_buffremove(ls->buff, 2);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static unsigned long readutf8esc (LexState *ls) {
+  unsigned long r;
+  int i = 4;  /* chars to be removed: '\', 'u', '{', and first digit */
+  save_and_next(ls);  /* skip 'u' */
+  esccheck(ls, ls->current == '{', "missing '{'");
+  r = gethexa(ls);  /* must have at least one digit */
+  while ((save_and_next(ls), lisxdigit(ls->current))) {
+    i++;
+    r = (r << 4) + luaO_hexavalue(ls->current);
+    esccheck(ls, r <= 0x10FFFF, "UTF-8 value too large");
+  }
+  esccheck(ls, ls->current == '}', "missing '}'");
+  next(ls);  /* skip '}' */
+  luaZ_buffremove(ls->buff, i);  /* remove saved chars from buffer */
+  return r;
+}
+
+
+static void utf8esc (LexState *ls) {
+  char buff[UTF8BUFFSZ];
+  int n = luaO_utf8esc(buff, readutf8esc(ls));
+  for (; n > 0; n--)  /* add 'buff' to string */
+    save(ls, buff[UTF8BUFFSZ - n]);
+}
+
+
+static int readdecesc (LexState *ls) {
+  int i;
+  int r = 0;  /* result accumulator */
+  for (i = 0; i < 3 && lisdigit(ls->current); i++) {  /* read up to 3 digits */
+    r = 10*r + ls->current - '0';
+    save_and_next(ls);
+  }
+  esccheck(ls, r <= UCHAR_MAX, "decimal escape too large");
+  luaZ_buffremove(ls->buff, i);  /* remove read digits from buffer */
+  return r;
+}
+
+
+static void read_string (LexState *ls, int del, SemInfo *seminfo) {
+  save_and_next(ls);  /* keep delimiter (for error messages) */
+  while (ls->current != del) {
+    switch (ls->current) {
+      case EOZ:
+        lexerror(ls, "unfinished string", TK_EOS);
+        break;  /* to avoid warnings */
+      case '\n':
+      case '\r':
+        lexerror(ls, "unfinished string", TK_STRING);
+        break;  /* to avoid warnings */
+      case '\\': {  /* escape sequences */
+        int c;  /* final character to be saved */
+        save_and_next(ls);  /* keep '\\' for error messages */
+        switch (ls->current) {
+          case 'a': c = '\a'; goto read_save;
+          case 'b': c = '\b'; goto read_save;
+          case 'f': c = '\f'; goto read_save;
+          case 'n': c = '\n'; goto read_save;
+          case 'r': c = '\r'; goto read_save;
+          case 't': c = '\t'; goto read_save;
+          case 'v': c = '\v'; goto read_save;
+          case 'x': c = readhexaesc(ls); goto read_save;
+          case 'u': utf8esc(ls);  goto no_save;
+          case '\n': case '\r':
+            inclinenumber(ls); c = '\n'; goto only_save;
+          case '\\': case '\"': case '\'':
+            c = ls->current; goto read_save;
+          case EOZ: goto no_save;  /* will raise an error next loop */
+          case 'z': {  /* zap following span of spaces */
+            luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+            next(ls);  /* skip the 'z' */
+            while (lisspace(ls->current)) {
+              if (currIsNewline(ls)) inclinenumber(ls);
+              else next(ls);
+            }
+            goto no_save;
+          }
+          default: {
+            esccheck(ls, lisdigit(ls->current), "invalid escape sequence");
+            c = readdecesc(ls);  /* digital escape '\ddd' */
+            goto only_save;
+          }
+        }
+       read_save:
+         next(ls);
+         /* go through */
+       only_save:
+         luaZ_buffremove(ls->buff, 1);  /* remove '\\' */
+         save(ls, c);
+         /* go through */
+       no_save: break;
+      }
+      default:
+        save_and_next(ls);
+    }
+  }
+  save_and_next(ls);  /* skip delimiter */
+  seminfo->ts = luaX_newstring(ls, luaZ_buffer(ls->buff) + 1,
+                                   luaZ_bufflen(ls->buff) - 2);
+}
+
+
+static int llex (LexState *ls, SemInfo *seminfo) {
+  luaZ_resetbuffer(ls->buff);
+  for (;;) {
+    switch (ls->current) {
+      case '\n': case '\r': {  /* line breaks */
+        inclinenumber(ls);
+        break;
+      }
+      case ' ': case '\f': case '\t': case '\v': {  /* spaces */
+        next(ls);
+        break;
+      }
+      case '-': {  /* '-' or '--' (comment) */
+        next(ls);
+        if (ls->current != '-') return '-';
+        /* else is a comment */
+        next(ls);
+        if (ls->current == '[') {  /* long comment? */
+          int sep = skip_sep(ls);
+          luaZ_resetbuffer(ls->buff);  /* 'skip_sep' may dirty the buffer */
+          if (sep >= 0) {
+            read_long_string(ls, NULL, sep);  /* skip long comment */
+            luaZ_resetbuffer(ls->buff);  /* previous call may dirty the buff. */
+            break;
+          }
+        }
+        /* else short comment */
+        while (!currIsNewline(ls) && ls->current != EOZ)
+          next(ls);  /* skip until end of line (or end of file) */
+        break;
+      }
+      case '[': {  /* long string or simply '[' */
+        int sep = skip_sep(ls);
+        if (sep >= 0) {
+          read_long_string(ls, seminfo, sep);
+          return TK_STRING;
+        }
+        else if (sep != -1)  /* '[=...' missing second bracket */
+          lexerror(ls, "invalid long string delimiter", TK_STRING);
+        return '[';
+      }
+      case '=': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_EQ;
+        else return '=';
+      }
+      case '<': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_LE;
+        else if (check_next1(ls, '<')) return TK_SHL;
+        else return '<';
+      }
+      case '>': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_GE;
+        else if (check_next1(ls, '>')) return TK_SHR;
+        else return '>';
+      }
+      case '/': {
+        next(ls);
+        if (check_next1(ls, '/')) return TK_IDIV;
+        else return '/';
+      }
+      case '~': {
+        next(ls);
+        if (check_next1(ls, '=')) return TK_NE;
+        else return '~';
+      }
+      case ':': {
+        next(ls);
+        if (check_next1(ls, ':')) return TK_DBCOLON;
+        else return ':';
+      }
+      case '"': case '\'': {  /* short literal strings */
+        read_string(ls, ls->current, seminfo);
+        return TK_STRING;
+      }
+      case '.': {  /* '.', '..', '...', or number */
+        save_and_next(ls);
+        if (check_next1(ls, '.')) {
+          if (check_next1(ls, '.'))
+            return TK_DOTS;   /* '...' */
+          else return TK_CONCAT;   /* '..' */
+        }
+        else if (!lisdigit(ls->current)) return '.';
+        else return read_numeral(ls, seminfo);
+      }
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9': {
+        return read_numeral(ls, seminfo);
+      }
+      case EOZ: {
+        return TK_EOS;
+      }
+      default: {
+        if (lislalpha(ls->current)) {  /* identifier or reserved word? */
+          TString *ts;
+          do {
+            save_and_next(ls);
+          } while (lislalnum(ls->current));
+          ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
+                                  luaZ_bufflen(ls->buff));
+          seminfo->ts = ts;
+          if (isreserved(ts))  /* reserved word? */
+            return ts->extra - 1 + FIRST_RESERVED;
+          else {
+            return TK_NAME;
+          }
+        }
+        else {  /* single-char tokens (+ - / ...) */
+          int c = ls->current;
+          next(ls);
+          return c;
+        }
+      }
+    }
+  }
+}
+
+
+void luaX_next (LexState *ls) {
+  ls->lastline = ls->linenumber;
+  if (ls->lookahead.token != TK_EOS) {  /* is there a look-ahead token? */
+    ls->t = ls->lookahead;  /* use this one */
+    ls->lookahead.token = TK_EOS;  /* and discharge it */
+  }
+  else
+    ls->t.token = llex(ls, &ls->t.seminfo);  /* read next token */
+}
+
+
+int luaX_lookahead (LexState *ls) {
+  lua_assert(ls->lookahead.token == TK_EOS);
+  ls->lookahead.token = llex(ls, &ls->lookahead.seminfo);
+  return ls->lookahead.token;
+}
+
diff --git a/scite-app/scite/lua/src/llex.h b/scite-app/scite/lua/src/llex.h
new file mode 100644
index 0000000..2363d87
--- /dev/null
+++ b/scite-app/scite/lua/src/llex.h
@@ -0,0 +1,85 @@
+/*
+** $Id: llex.h,v 1.79 2016/05/02 14:02:12 roberto Exp $
+** Lexical Analyzer
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llex_h
+#define llex_h
+
+#include "lobject.h"
+#include "lzio.h"
+
+
+#define FIRST_RESERVED	257
+
+
+#if !defined(LUA_ENV)
+#define LUA_ENV		"_ENV"
+#endif
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER RESERVED"
+*/
+enum RESERVED {
+  /* terminal symbols denoted by reserved words */
+  TK_AND = FIRST_RESERVED, TK_BREAK,
+  TK_DO, TK_ELSE, TK_ELSEIF, TK_END, TK_FALSE, TK_FOR, TK_FUNCTION,
+  TK_GOTO, TK_IF, TK_IN, TK_LOCAL, TK_NIL, TK_NOT, TK_OR, TK_REPEAT,
+  TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
+  /* other terminal symbols */
+  TK_IDIV, TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE,
+  TK_SHL, TK_SHR,
+  TK_DBCOLON, TK_EOS,
+  TK_FLT, TK_INT, TK_NAME, TK_STRING
+};
+
+/* number of reserved words */
+#define NUM_RESERVED	(cast(int, TK_WHILE-FIRST_RESERVED+1))
+
+
+typedef union {
+  lua_Number r;
+  lua_Integer i;
+  TString *ts;
+} SemInfo;  /* semantics information */
+
+
+typedef struct Token {
+  int token;
+  SemInfo seminfo;
+} Token;
+
+
+/* state of the lexer plus state of the parser when shared by all
+   functions */
+typedef struct LexState {
+  int current;  /* current character (charint) */
+  int linenumber;  /* input line counter */
+  int lastline;  /* line of last token 'consumed' */
+  Token t;  /* current token */
+  Token lookahead;  /* look ahead token */
+  struct FuncState *fs;  /* current function (parser) */
+  struct lua_State *L;
+  ZIO *z;  /* input stream */
+  Mbuffer *buff;  /* buffer for tokens */
+  Table *h;  /* to avoid collection/reuse strings */
+  struct Dyndata *dyd;  /* dynamic structures used by the parser */
+  TString *source;  /* current source name */
+  TString *envn;  /* environment variable name */
+} LexState;
+
+
+LUAI_FUNC void luaX_init (lua_State *L);
+LUAI_FUNC void luaX_setinput (lua_State *L, LexState *ls, ZIO *z,
+                              TString *source, int firstchar);
+LUAI_FUNC TString *luaX_newstring (LexState *ls, const char *str, size_t l);
+LUAI_FUNC void luaX_next (LexState *ls);
+LUAI_FUNC int luaX_lookahead (LexState *ls);
+LUAI_FUNC l_noret luaX_syntaxerror (LexState *ls, const char *s);
+LUAI_FUNC const char *luaX_token2str (LexState *ls, int token);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/llimits.h b/scite-app/scite/lua/src/llimits.h
new file mode 100644
index 0000000..f21377f
--- /dev/null
+++ b/scite-app/scite/lua/src/llimits.h
@@ -0,0 +1,323 @@
+/*
+** $Id: llimits.h,v 1.141 2015/11/19 19:16:22 roberto Exp $
+** Limits, basic types, and some other 'installation-dependent' definitions
+** See Copyright Notice in lua.h
+*/
+
+#ifndef llimits_h
+#define llimits_h
+
+
+#include <limits.h>
+#include <stddef.h>
+
+
+#include "lua.h"
+
+/*
+** 'lu_mem' and 'l_mem' are unsigned/signed integers big enough to count
+** the total memory used by Lua (in bytes). Usually, 'size_t' and
+** 'ptrdiff_t' should work, but we use 'long' for 16-bit machines.
+*/
+#if defined(LUAI_MEM)		/* { external definitions? */
+typedef LUAI_UMEM lu_mem;
+typedef LUAI_MEM l_mem;
+#elif LUAI_BITSINT >= 32	/* }{ */
+typedef size_t lu_mem;
+typedef ptrdiff_t l_mem;
+#else  /* 16-bit ints */	/* }{ */
+typedef unsigned long lu_mem;
+typedef long l_mem;
+#endif				/* } */
+
+
+/* chars used as small naturals (so that 'char' is reserved for characters) */
+typedef unsigned char lu_byte;
+
+
+/* maximum value for size_t */
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+/* maximum size visible for Lua (must be representable in a lua_Integer */
+#define MAX_SIZE	(sizeof(size_t) < sizeof(lua_Integer) ? MAX_SIZET \
+                          : (size_t)(LUA_MAXINTEGER))
+
+
+#define MAX_LUMEM	((lu_mem)(~(lu_mem)0))
+
+#define MAX_LMEM	((l_mem)(MAX_LUMEM >> 1))
+
+
+#define MAX_INT		INT_MAX  /* maximum value of an int */
+
+
+/*
+** conversion of pointer to unsigned integer:
+** this is for hashing only; there is no problem if the integer
+** cannot hold the whole pointer value
+*/
+#define point2uint(p)	((unsigned int)((size_t)(p) & UINT_MAX))
+
+
+
+/* type to ensure maximum alignment */
+#if defined(LUAI_USER_ALIGNMENT_T)
+typedef LUAI_USER_ALIGNMENT_T L_Umaxalign;
+#else
+typedef union {
+  lua_Number n;
+  double u;
+  void *s;
+  lua_Integer i;
+  long l;
+} L_Umaxalign;
+#endif
+
+
+
+/* types of 'usual argument conversions' for lua_Number and lua_Integer */
+typedef LUAI_UACNUMBER l_uacNumber;
+typedef LUAI_UACINT l_uacInt;
+
+
+/* internal assertions for in-house debugging */
+#if defined(lua_assert)
+#define check_exp(c,e)		(lua_assert(c), (e))
+/* to avoid problems with conditions too long */
+#define lua_longassert(c)	((c) ? (void)0 : lua_assert(0))
+#else
+#define lua_assert(c)		((void)0)
+#define check_exp(c,e)		(e)
+#define lua_longassert(c)	((void)0)
+#endif
+
+/*
+** assertion for checking API calls
+*/
+#if !defined(luai_apicheck)
+#define luai_apicheck(l,e)	lua_assert(e)
+#endif
+
+#define api_check(l,e,msg)	luai_apicheck(l,(e) && msg)
+
+
+/* macro to avoid warnings about unused variables */
+#if !defined(UNUSED)
+#define UNUSED(x)	((void)(x))
+#endif
+
+
+/* type casts (a macro highlights casts in the code) */
+#define cast(t, exp)	((t)(exp))
+
+#define cast_void(i)	cast(void, (i))
+#define cast_byte(i)	cast(lu_byte, (i))
+#define cast_num(i)	cast(lua_Number, (i))
+#define cast_int(i)	cast(int, (i))
+#define cast_uchar(i)	cast(unsigned char, (i))
+
+
+/* cast a signed lua_Integer to lua_Unsigned */
+#if !defined(l_castS2U)
+#define l_castS2U(i)	((lua_Unsigned)(i))
+#endif
+
+/*
+** cast a lua_Unsigned to a signed lua_Integer; this cast is
+** not strict ISO C, but two-complement architectures should
+** work fine.
+*/
+#if !defined(l_castU2S)
+#define l_castU2S(i)	((lua_Integer)(i))
+#endif
+
+
+/*
+** non-return type
+*/
+#if defined(__GNUC__)
+#define l_noret		void __attribute__((noreturn))
+#elif defined(_MSC_VER) && _MSC_VER >= 1200
+#define l_noret		void __declspec(noreturn)
+#else
+#define l_noret		void
+#endif
+
+
+
+/*
+** maximum depth for nested C calls and syntactical nested non-terminals
+** in a program. (Value must fit in an unsigned short int.)
+*/
+#if !defined(LUAI_MAXCCALLS)
+#define LUAI_MAXCCALLS		200
+#endif
+
+
+
+/*
+** type for virtual-machine instructions;
+** must be an unsigned with (at least) 4 bytes (see details in lopcodes.h)
+*/
+#if LUAI_BITSINT >= 32
+typedef unsigned int Instruction;
+#else
+typedef unsigned long Instruction;
+#endif
+
+
+
+/*
+** Maximum length for short strings, that is, strings that are
+** internalized. (Cannot be smaller than reserved words or tags for
+** metamethods, as these strings must be internalized;
+** #("function") = 8, #("__newindex") = 10.)
+*/
+#if !defined(LUAI_MAXSHORTLEN)
+#define LUAI_MAXSHORTLEN	40
+#endif
+
+
+/*
+** Initial size for the string table (must be power of 2).
+** The Lua core alone registers ~50 strings (reserved words +
+** metaevent keys + a few others). Libraries would typically add
+** a few dozens more.
+*/
+#if !defined(MINSTRTABSIZE)
+#define MINSTRTABSIZE	128
+#endif
+
+
+/*
+** Size of cache for strings in the API. 'N' is the number of
+** sets (better be a prime) and "M" is the size of each set (M == 1
+** makes a direct cache.)
+*/
+#if !defined(STRCACHE_N)
+#define STRCACHE_N		53
+#define STRCACHE_M		2
+#endif
+
+
+/* minimum size for string buffer */
+#if !defined(LUA_MINBUFFER)
+#define LUA_MINBUFFER	32
+#endif
+
+
+/*
+** macros that are executed whenever program enters the Lua core
+** ('lua_lock') and leaves the core ('lua_unlock')
+*/
+#if !defined(lua_lock)
+#define lua_lock(L)	((void) 0)
+#define lua_unlock(L)	((void) 0)
+#endif
+
+/*
+** macro executed during Lua functions at points where the
+** function can yield.
+*/
+#if !defined(luai_threadyield)
+#define luai_threadyield(L)	{lua_unlock(L); lua_lock(L);}
+#endif
+
+
+/*
+** these macros allow user-specific actions on threads when you defined
+** LUAI_EXTRASPACE and need to do something extra when a thread is
+** created/deleted/resumed/yielded.
+*/
+#if !defined(luai_userstateopen)
+#define luai_userstateopen(L)		((void)L)
+#endif
+
+#if !defined(luai_userstateclose)
+#define luai_userstateclose(L)		((void)L)
+#endif
+
+#if !defined(luai_userstatethread)
+#define luai_userstatethread(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstatefree)
+#define luai_userstatefree(L,L1)	((void)L)
+#endif
+
+#if !defined(luai_userstateresume)
+#define luai_userstateresume(L,n)	((void)L)
+#endif
+
+#if !defined(luai_userstateyield)
+#define luai_userstateyield(L,n)	((void)L)
+#endif
+
+
+
+/*
+** The luai_num* macros define the primitive operations over numbers.
+*/
+
+/* floor division (defined as 'floor(a/b)') */
+#if !defined(luai_numidiv)
+#define luai_numidiv(L,a,b)     ((void)L, l_floor(luai_numdiv(L,a,b)))
+#endif
+
+/* float division */
+#if !defined(luai_numdiv)
+#define luai_numdiv(L,a,b)      ((a)/(b))
+#endif
+
+/*
+** modulo: defined as 'a - floor(a/b)*b'; this definition gives NaN when
+** 'b' is huge, but the result should be 'a'. 'fmod' gives the result of
+** 'a - trunc(a/b)*b', and therefore must be corrected when 'trunc(a/b)
+** ~= floor(a/b)'. That happens when the division has a non-integer
+** negative result, which is equivalent to the test below.
+*/
+#if !defined(luai_nummod)
+#define luai_nummod(L,a,b,m)  \
+  { (m) = l_mathop(fmod)(a,b); if ((m)*(b) < 0) (m) += (b); }
+#endif
+
+/* exponentiation */
+#if !defined(luai_numpow)
+#define luai_numpow(L,a,b)      ((void)L, l_mathop(pow)(a,b))
+#endif
+
+/* the others are quite standard operations */
+#if !defined(luai_numadd)
+#define luai_numadd(L,a,b)      ((a)+(b))
+#define luai_numsub(L,a,b)      ((a)-(b))
+#define luai_nummul(L,a,b)      ((a)*(b))
+#define luai_numunm(L,a)        (-(a))
+#define luai_numeq(a,b)         ((a)==(b))
+#define luai_numlt(a,b)         ((a)<(b))
+#define luai_numle(a,b)         ((a)<=(b))
+#define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#endif
+
+
+
+
+
+/*
+** macro to control inclusion of some hard tests on stack reallocation
+*/
+#if !defined(HARDSTACKTESTS)
+#define condmovestack(L,pre,pos)	((void)0)
+#else
+/* realloc stack keeping its size */
+#define condmovestack(L,pre,pos)  \
+	{ int sz_ = (L)->stacksize; pre; luaD_reallocstack((L), sz_); pos; }
+#endif
+
+#if !defined(HARDMEMTESTS)
+#define condchangemem(L,pre,pos)	((void)0)
+#else
+#define condchangemem(L,pre,pos)  \
+	{ if (G(L)->gcrunning) { pre; luaC_fullgc(L, 0); pos; } }
+#endif
+
+#endif
diff --git a/scite-app/scite/lua/src/lmathlib.c b/scite-app/scite/lua/src/lmathlib.c
new file mode 100644
index 0000000..b7f8bae
--- /dev/null
+++ b/scite-app/scite/lua/src/lmathlib.c
@@ -0,0 +1,410 @@
+/*
+** $Id: lmathlib.c,v 1.119 2016/12/22 13:08:50 roberto Exp $
+** Standard mathematical library
+** See Copyright Notice in lua.h
+*/
+
+#define lmathlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdlib.h>
+#include <math.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+#undef PI
+#define PI	(l_mathop(3.141592653589793238462643383279502884))
+
+
+#if !defined(l_rand)		/* { */
+#if defined(LUA_USE_POSIX)
+#define l_rand()	random()
+#define l_srand(x)	srandom(x)
+#define L_RANDMAX	2147483647	/* (2^31 - 1), following POSIX */
+#else
+#define l_rand()	rand()
+#define l_srand(x)	srand(x)
+#define L_RANDMAX	RAND_MAX
+#endif
+#endif				/* } */
+
+
+static int math_abs (lua_State *L) {
+  if (lua_isinteger(L, 1)) {
+    lua_Integer n = lua_tointeger(L, 1);
+    if (n < 0) n = (lua_Integer)(0u - (lua_Unsigned)n);
+    lua_pushinteger(L, n);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_cos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tan (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tan)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_asin (lua_State *L) {
+  lua_pushnumber(L, l_mathop(asin)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_acos (lua_State *L) {
+  lua_pushnumber(L, l_mathop(acos)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_atan (lua_State *L) {
+  lua_Number y = luaL_checknumber(L, 1);
+  lua_Number x = luaL_optnumber(L, 2, 1);
+  lua_pushnumber(L, l_mathop(atan2)(y, x));
+  return 1;
+}
+
+
+static int math_toint (lua_State *L) {
+  int valid;
+  lua_Integer n = lua_tointegerx(L, 1, &valid);
+  if (valid)
+    lua_pushinteger(L, n);
+  else {
+    luaL_checkany(L, 1);
+    lua_pushnil(L);  /* value is not convertible to integer */
+  }
+  return 1;
+}
+
+
+static void pushnumint (lua_State *L, lua_Number d) {
+  lua_Integer n;
+  if (lua_numbertointeger(d, &n))  /* does 'd' fit in an integer? */
+    lua_pushinteger(L, n);  /* result is integer */
+  else
+    lua_pushnumber(L, d);  /* result is float */
+}
+
+
+static int math_floor (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own floor */
+  else {
+    lua_Number d = l_mathop(floor)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_ceil (lua_State *L) {
+  if (lua_isinteger(L, 1))
+    lua_settop(L, 1);  /* integer is its own ceil */
+  else {
+    lua_Number d = l_mathop(ceil)(luaL_checknumber(L, 1));
+    pushnumint(L, d);
+  }
+  return 1;
+}
+
+
+static int math_fmod (lua_State *L) {
+  if (lua_isinteger(L, 1) && lua_isinteger(L, 2)) {
+    lua_Integer d = lua_tointeger(L, 2);
+    if ((lua_Unsigned)d + 1u <= 1u) {  /* special cases: -1 or 0 */
+      luaL_argcheck(L, d != 0, 2, "zero");
+      lua_pushinteger(L, 0);  /* avoid overflow with 0x80000... / -1 */
+    }
+    else
+      lua_pushinteger(L, lua_tointeger(L, 1) % d);
+  }
+  else
+    lua_pushnumber(L, l_mathop(fmod)(luaL_checknumber(L, 1),
+                                     luaL_checknumber(L, 2)));
+  return 1;
+}
+
+
+/*
+** next function does not use 'modf', avoiding problems with 'double*'
+** (which is not compatible with 'float*') when lua_Number is not
+** 'double'.
+*/
+static int math_modf (lua_State *L) {
+  if (lua_isinteger(L ,1)) {
+    lua_settop(L, 1);  /* number is its own integer part */
+    lua_pushnumber(L, 0);  /* no fractional part */
+  }
+  else {
+    lua_Number n = luaL_checknumber(L, 1);
+    /* integer part (rounds toward zero) */
+    lua_Number ip = (n < 0) ? l_mathop(ceil)(n) : l_mathop(floor)(n);
+    pushnumint(L, ip);
+    /* fractional part (test needed for inf/-inf) */
+    lua_pushnumber(L, (n == ip) ? l_mathop(0.0) : (n - ip));
+  }
+  return 2;
+}
+
+
+static int math_sqrt (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sqrt)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+
+static int math_ult (lua_State *L) {
+  lua_Integer a = luaL_checkinteger(L, 1);
+  lua_Integer b = luaL_checkinteger(L, 2);
+  lua_pushboolean(L, (lua_Unsigned)a < (lua_Unsigned)b);
+  return 1;
+}
+
+static int math_log (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number res;
+  if (lua_isnoneornil(L, 2))
+    res = l_mathop(log)(x);
+  else {
+    lua_Number base = luaL_checknumber(L, 2);
+#if !defined(LUA_USE_C89)
+    if (base == l_mathop(2.0))
+      res = l_mathop(log2)(x); else
+#endif
+    if (base == l_mathop(10.0))
+      res = l_mathop(log10)(x);
+    else
+      res = l_mathop(log)(x)/l_mathop(log)(base);
+  }
+  lua_pushnumber(L, res);
+  return 1;
+}
+
+static int math_exp (lua_State *L) {
+  lua_pushnumber(L, l_mathop(exp)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_deg (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (l_mathop(180.0) / PI));
+  return 1;
+}
+
+static int math_rad (lua_State *L) {
+  lua_pushnumber(L, luaL_checknumber(L, 1) * (PI / l_mathop(180.0)));
+  return 1;
+}
+
+
+static int math_min (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imin = 1;  /* index of current minimum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, i, imin, LUA_OPLT))
+      imin = i;
+  }
+  lua_pushvalue(L, imin);
+  return 1;
+}
+
+
+static int math_max (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int imax = 1;  /* index of current maximum value */
+  int i;
+  luaL_argcheck(L, n >= 1, 1, "value expected");
+  for (i = 2; i <= n; i++) {
+    if (lua_compare(L, imax, i, LUA_OPLT))
+      imax = i;
+  }
+  lua_pushvalue(L, imax);
+  return 1;
+}
+
+/*
+** This function uses 'double' (instead of 'lua_Number') to ensure that
+** all bits from 'l_rand' can be represented, and that 'RANDMAX + 1.0'
+** will keep full precision (ensuring that 'r' is always less than 1.0.)
+*/
+static int math_random (lua_State *L) {
+  lua_Integer low, up;
+  double r = (double)l_rand() * (1.0 / ((double)L_RANDMAX + 1.0));
+  switch (lua_gettop(L)) {  /* check number of arguments */
+    case 0: {  /* no arguments */
+      lua_pushnumber(L, (lua_Number)r);  /* Number between 0 and 1 */
+      return 1;
+    }
+    case 1: {  /* only upper limit */
+      low = 1;
+      up = luaL_checkinteger(L, 1);
+      break;
+    }
+    case 2: {  /* lower and upper limits */
+      low = luaL_checkinteger(L, 1);
+      up = luaL_checkinteger(L, 2);
+      break;
+    }
+    default: return luaL_error(L, "wrong number of arguments");
+  }
+  /* random integer in the interval [low, up] */
+  luaL_argcheck(L, low <= up, 1, "interval is empty");
+  luaL_argcheck(L, low >= 0 || up <= LUA_MAXINTEGER + low, 1,
+                   "interval too large");
+  r *= (double)(up - low) + 1.0;
+  lua_pushinteger(L, (lua_Integer)r + low);
+  return 1;
+}
+
+
+static int math_randomseed (lua_State *L) {
+  l_srand((unsigned int)(lua_Integer)luaL_checknumber(L, 1));
+  (void)l_rand(); /* discard first value to avoid undesirable correlations */
+  return 0;
+}
+
+
+static int math_type (lua_State *L) {
+  if (lua_type(L, 1) == LUA_TNUMBER) {
+      if (lua_isinteger(L, 1))
+        lua_pushliteral(L, "integer");
+      else
+        lua_pushliteral(L, "float");
+  }
+  else {
+    luaL_checkany(L, 1);
+    lua_pushnil(L);
+  }
+  return 1;
+}
+
+
+/*
+** {==================================================================
+** Deprecated functions (for compatibility only)
+** ===================================================================
+*/
+#if defined(LUA_COMPAT_MATHLIB)
+
+static int math_cosh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(cosh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_sinh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(sinh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_tanh (lua_State *L) {
+  lua_pushnumber(L, l_mathop(tanh)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+static int math_pow (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  lua_Number y = luaL_checknumber(L, 2);
+  lua_pushnumber(L, l_mathop(pow)(x, y));
+  return 1;
+}
+
+static int math_frexp (lua_State *L) {
+  int e;
+  lua_pushnumber(L, l_mathop(frexp)(luaL_checknumber(L, 1), &e));
+  lua_pushinteger(L, e);
+  return 2;
+}
+
+static int math_ldexp (lua_State *L) {
+  lua_Number x = luaL_checknumber(L, 1);
+  int ep = (int)luaL_checkinteger(L, 2);
+  lua_pushnumber(L, l_mathop(ldexp)(x, ep));
+  return 1;
+}
+
+static int math_log10 (lua_State *L) {
+  lua_pushnumber(L, l_mathop(log10)(luaL_checknumber(L, 1)));
+  return 1;
+}
+
+#endif
+/* }================================================================== */
+
+
+
+static const luaL_Reg mathlib[] = {
+  {"abs",   math_abs},
+  {"acos",  math_acos},
+  {"asin",  math_asin},
+  {"atan",  math_atan},
+  {"ceil",  math_ceil},
+  {"cos",   math_cos},
+  {"deg",   math_deg},
+  {"exp",   math_exp},
+  {"tointeger", math_toint},
+  {"floor", math_floor},
+  {"fmod",   math_fmod},
+  {"ult",   math_ult},
+  {"log",   math_log},
+  {"max",   math_max},
+  {"min",   math_min},
+  {"modf",   math_modf},
+  {"rad",   math_rad},
+  {"random",     math_random},
+  {"randomseed", math_randomseed},
+  {"sin",   math_sin},
+  {"sqrt",  math_sqrt},
+  {"tan",   math_tan},
+  {"type", math_type},
+#if defined(LUA_COMPAT_MATHLIB)
+  {"atan2", math_atan},
+  {"cosh",   math_cosh},
+  {"sinh",   math_sinh},
+  {"tanh",   math_tanh},
+  {"pow",   math_pow},
+  {"frexp", math_frexp},
+  {"ldexp", math_ldexp},
+  {"log10", math_log10},
+#endif
+  /* placeholders */
+  {"pi", NULL},
+  {"huge", NULL},
+  {"maxinteger", NULL},
+  {"mininteger", NULL},
+  {NULL, NULL}
+};
+
+
+/*
+** Open math library
+*/
+LUAMOD_API int luaopen_math (lua_State *L) {
+  luaL_newlib(L, mathlib);
+  lua_pushnumber(L, PI);
+  lua_setfield(L, -2, "pi");
+  lua_pushnumber(L, (lua_Number)HUGE_VAL);
+  lua_setfield(L, -2, "huge");
+  lua_pushinteger(L, LUA_MAXINTEGER);
+  lua_setfield(L, -2, "maxinteger");
+  lua_pushinteger(L, LUA_MININTEGER);
+  lua_setfield(L, -2, "mininteger");
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/lmem.c b/scite-app/scite/lua/src/lmem.c
new file mode 100644
index 0000000..0a0476c
--- /dev/null
+++ b/scite-app/scite/lua/src/lmem.c
@@ -0,0 +1,100 @@
+/*
+** $Id: lmem.c,v 1.91 2015/03/06 19:45:54 roberto Exp $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#define lmem_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+
+/*
+** About the realloc function:
+** void * frealloc (void *ud, void *ptr, size_t osize, size_t nsize);
+** ('osize' is the old size, 'nsize' is the new size)
+**
+** * frealloc(ud, NULL, x, s) creates a new block of size 's' (no
+** matter 'x').
+**
+** * frealloc(ud, p, x, 0) frees the block 'p'
+** (in this specific case, frealloc must return NULL);
+** particularly, frealloc(ud, NULL, 0, 0) does nothing
+** (which is equivalent to free(NULL) in ISO C)
+**
+** frealloc returns NULL if it cannot create or reallocate the area
+** (any reallocation to an equal or smaller size cannot fail!)
+*/
+
+
+
+#define MINSIZEARRAY	4
+
+
+void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
+                     int limit, const char *what) {
+  void *newblock;
+  int newsize;
+  if (*size >= limit/2) {  /* cannot double it? */
+    if (*size >= limit)  /* cannot grow even a little? */
+      luaG_runerror(L, "too many %s (limit is %d)", what, limit);
+    newsize = limit;  /* still have at least one free place */
+  }
+  else {
+    newsize = (*size)*2;
+    if (newsize < MINSIZEARRAY)
+      newsize = MINSIZEARRAY;  /* minimum size */
+  }
+  newblock = luaM_reallocv(L, block, *size, newsize, size_elems);
+  *size = newsize;  /* update only when everything else is OK */
+  return newblock;
+}
+
+
+l_noret luaM_toobig (lua_State *L) {
+  luaG_runerror(L, "memory allocation error: block too big");
+}
+
+
+
+/*
+** generic allocation routine.
+*/
+void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
+  void *newblock;
+  global_State *g = G(L);
+  size_t realosize = (block) ? osize : 0;
+  lua_assert((realosize == 0) == (block == NULL));
+#if defined(HARDMEMTESTS)
+  if (nsize > realosize && g->gcrunning)
+    luaC_fullgc(L, 1);  /* force a GC whenever possible */
+#endif
+  newblock = (*g->frealloc)(g->ud, block, osize, nsize);
+  if (newblock == NULL && nsize > 0) {
+    lua_assert(nsize > realosize);  /* cannot fail when shrinking a block */
+    if (g->version) {  /* is state fully built? */
+      luaC_fullgc(L, 1);  /* try to free some memory... */
+      newblock = (*g->frealloc)(g->ud, block, osize, nsize);  /* try again */
+    }
+    if (newblock == NULL)
+      luaD_throw(L, LUA_ERRMEM);
+  }
+  lua_assert((nsize == 0) == (newblock == NULL));
+  g->GCdebt = (g->GCdebt + nsize) - realosize;
+  return newblock;
+}
+
diff --git a/scite-app/scite/lua/src/lmem.h b/scite-app/scite/lua/src/lmem.h
new file mode 100644
index 0000000..30f4848
--- /dev/null
+++ b/scite-app/scite/lua/src/lmem.h
@@ -0,0 +1,69 @@
+/*
+** $Id: lmem.h,v 1.43 2014/12/19 17:26:14 roberto Exp $
+** Interface to Memory Manager
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lmem_h
+#define lmem_h
+
+
+#include <stddef.h>
+
+#include "llimits.h"
+#include "lua.h"
+
+
+/*
+** This macro reallocs a vector 'b' from 'on' to 'n' elements, where
+** each element has size 'e'. In case of arithmetic overflow of the
+** product 'n'*'e', it raises an error (calling 'luaM_toobig'). Because
+** 'e' is always constant, it avoids the runtime division MAX_SIZET/(e).
+**
+** (The macro is somewhat complex to avoid warnings:  The 'sizeof'
+** comparison avoids a runtime comparison when overflow cannot occur.
+** The compiler should be able to optimize the real test by itself, but
+** when it does it, it may give a warning about "comparison is always
+** false due to limited range of data type"; the +1 tricks the compiler,
+** avoiding this warning but also this optimization.)
+*/
+#define luaM_reallocv(L,b,on,n,e) \
+  (((sizeof(n) >= sizeof(size_t) && cast(size_t, (n)) + 1 > MAX_SIZET/(e)) \
+      ? luaM_toobig(L) : cast_void(0)) , \
+   luaM_realloc_(L, (b), (on)*(e), (n)*(e)))
+
+/*
+** Arrays of chars do not need any test
+*/
+#define luaM_reallocvchar(L,b,on,n)  \
+    cast(char *, luaM_realloc_(L, (b), (on)*sizeof(char), (n)*sizeof(char)))
+
+#define luaM_freemem(L, b, s)	luaM_realloc_(L, (b), (s), 0)
+#define luaM_free(L, b)		luaM_realloc_(L, (b), sizeof(*(b)), 0)
+#define luaM_freearray(L, b, n)   luaM_realloc_(L, (b), (n)*sizeof(*(b)), 0)
+
+#define luaM_malloc(L,s)	luaM_realloc_(L, NULL, 0, (s))
+#define luaM_new(L,t)		cast(t *, luaM_malloc(L, sizeof(t)))
+#define luaM_newvector(L,n,t) \
+		cast(t *, luaM_reallocv(L, NULL, 0, n, sizeof(t)))
+
+#define luaM_newobject(L,tag,s)	luaM_realloc_(L, NULL, tag, (s))
+
+#define luaM_growvector(L,v,nelems,size,t,limit,e) \
+          if ((nelems)+1 > (size)) \
+            ((v)=cast(t *, luaM_growaux_(L,v,&(size),sizeof(t),limit,e)))
+
+#define luaM_reallocvector(L, v,oldn,n,t) \
+   ((v)=cast(t *, luaM_reallocv(L, v, oldn, n, sizeof(t))))
+
+LUAI_FUNC l_noret luaM_toobig (lua_State *L);
+
+/* not to be called directly */
+LUAI_FUNC void *luaM_realloc_ (lua_State *L, void *block, size_t oldsize,
+                                                          size_t size);
+LUAI_FUNC void *luaM_growaux_ (lua_State *L, void *block, int *size,
+                               size_t size_elem, int limit,
+                               const char *what);
+
+#endif
+
diff --git a/scite-app/scite/lua/src/loadlib.c b/scite-app/scite/lua/src/loadlib.c
new file mode 100644
index 0000000..4791e74
--- /dev/null
+++ b/scite-app/scite/lua/src/loadlib.c
@@ -0,0 +1,790 @@
+/*
+** $Id: loadlib.c,v 1.130 2017/01/12 17:14:26 roberto Exp $
+** Dynamic library loader for Lua
+** See Copyright Notice in lua.h
+**
+** This module contains an implementation of loadlib for Unix systems
+** that have dlfcn, an implementation for Windows, and a stub for other
+** systems.
+*/
+
+#define loadlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** LUA_IGMARK is a mark to ignore all before it when building the
+** luaopen_ function name.
+*/
+#if !defined (LUA_IGMARK)
+#define LUA_IGMARK		"-"
+#endif
+
+
+/*
+** LUA_CSUBSEP is the character that replaces dots in submodule names
+** when searching for a C loader.
+** LUA_LSUBSEP is the character that replaces dots in submodule names
+** when searching for a Lua loader.
+*/
+#if !defined(LUA_CSUBSEP)
+#define LUA_CSUBSEP		LUA_DIRSEP
+#endif
+
+#if !defined(LUA_LSUBSEP)
+#define LUA_LSUBSEP		LUA_DIRSEP
+#endif
+
+
+/* prefix for open functions in C libraries */
+#define LUA_POF		"luaopen_"
+
+/* separator for open functions in C libraries */
+#define LUA_OFSEP	"_"
+
+
+/*
+** unique key for table in the registry that keeps handles
+** for all loaded C libraries
+*/
+static const int CLIBS = 0;
+
+#define LIB_FAIL	"open"
+
+
+#define setprogdir(L)           ((void)0)
+
+
+/*
+** system-dependent functions
+*/
+
+/*
+** unload library 'lib'
+*/
+static void lsys_unloadlib (void *lib);
+
+/*
+** load C library in file 'path'. If 'seeglb', load with all names in
+** the library global.
+** Returns the library; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static void *lsys_load (lua_State *L, const char *path, int seeglb);
+
+/*
+** Try to find a function named 'sym' in library 'lib'.
+** Returns the function; in case of error, returns NULL plus an
+** error string in the stack.
+*/
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym);
+
+
+
+
+#if defined(LUA_USE_DLOPEN)	/* { */
+/*
+** {========================================================================
+** This is an implementation of loadlib based on the dlfcn interface.
+** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD,
+** NetBSD, AIX 4.2, HPUX 11, and  probably most other Unix flavors, at least
+** as an emulation layer on top of native functions.
+** =========================================================================
+*/
+
+#include <dlfcn.h>
+
+/*
+** Macro to convert pointer-to-void* to pointer-to-function. This cast
+** is undefined according to ISO C, but POSIX assumes that it works.
+** (The '__extension__' in gnu compilers is only to avoid warnings.)
+*/
+#if defined(__GNUC__)
+#define cast_func(p) (__extension__ (lua_CFunction)(p))
+#else
+#define cast_func(p) ((lua_CFunction)(p))
+#endif
+
+
+static void lsys_unloadlib (void *lib) {
+  dlclose(lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  void *lib = dlopen(path, RTLD_NOW | (seeglb ? RTLD_GLOBAL : RTLD_LOCAL));
+  if (lib == NULL) lua_pushstring(L, dlerror());
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = cast_func(dlsym(lib, sym));
+  if (f == NULL) lua_pushstring(L, dlerror());
+  return f;
+}
+
+/* }====================================================== */
+
+
+
+#elif defined(LUA_DL_DLL)	/* }{ */
+/*
+** {======================================================================
+** This is an implementation of loadlib for Windows using native functions.
+** =======================================================================
+*/
+
+#include <windows.h>
+
+
+/*
+** optional flags for LoadLibraryEx
+*/
+#if !defined(LUA_LLE_FLAGS)
+#define LUA_LLE_FLAGS	0
+#endif
+
+
+#undef setprogdir
+
+
+/*
+** Replace in the path (on the top of the stack) any occurrence
+** of LUA_EXEC_DIR with the executable's path.
+*/
+static void setprogdir (lua_State *L) {
+  char buff[MAX_PATH + 1];
+  char *lb;
+  DWORD nsize = sizeof(buff)/sizeof(char);
+  DWORD n = GetModuleFileNameA(NULL, buff, nsize);  /* get exec. name */
+  if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL)
+    luaL_error(L, "unable to get ModuleFileName");
+  else {
+    *lb = '\0';  /* cut name on the last '\\' to get the path */
+    luaL_gsub(L, lua_tostring(L, -1), LUA_EXEC_DIR, buff);
+    lua_remove(L, -2);  /* remove original string */
+  }
+}
+
+
+
+
+static void pusherror (lua_State *L) {
+  int error = GetLastError();
+  char buffer[128];
+  if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+      NULL, error, 0, buffer, sizeof(buffer)/sizeof(char), NULL))
+    lua_pushstring(L, buffer);
+  else
+    lua_pushfstring(L, "system error %d\n", error);
+}
+
+static void lsys_unloadlib (void *lib) {
+  FreeLibrary((HMODULE)lib);
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  HMODULE lib = LoadLibraryExA(path, NULL, LUA_LLE_FLAGS);
+  (void)(seeglb);  /* not used: symbols are 'global' by default */
+  if (lib == NULL) pusherror(L);
+  return lib;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  lua_CFunction f = (lua_CFunction)GetProcAddress((HMODULE)lib, sym);
+  if (f == NULL) pusherror(L);
+  return f;
+}
+
+/* }====================================================== */
+
+
+#else				/* }{ */
+/*
+** {======================================================
+** Fallback for other systems
+** =======================================================
+*/
+
+#undef LIB_FAIL
+#define LIB_FAIL	"absent"
+
+
+#define DLMSG	"dynamic libraries not enabled; check your Lua installation"
+
+
+static void lsys_unloadlib (void *lib) {
+  (void)(lib);  /* not used */
+}
+
+
+static void *lsys_load (lua_State *L, const char *path, int seeglb) {
+  (void)(path); (void)(seeglb);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+
+static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
+  (void)(lib); (void)(sym);  /* not used */
+  lua_pushliteral(L, DLMSG);
+  return NULL;
+}
+
+/* }====================================================== */
+#endif				/* } */
+
+
+/*
+** {==================================================================
+** Set Paths
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_VAR and LUA_CPATH_VAR are the names of the environment
+** variables that Lua check to set its paths.
+*/
+#if !defined(LUA_PATH_VAR)
+#define LUA_PATH_VAR    "LUA_PATH"
+#endif
+
+#if !defined(LUA_CPATH_VAR)
+#define LUA_CPATH_VAR   "LUA_CPATH"
+#endif
+
+
+#define AUXMARK         "\1"	/* auxiliary mark */
+
+
+/*
+** return registry.LUA_NOENV as a boolean
+*/
+static int noenv (lua_State *L) {
+  int b;
+  lua_getfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+  b = lua_toboolean(L, -1);
+  lua_pop(L, 1);  /* remove value */
+  return b;
+}
+
+
+/*
+** Set a path
+*/
+static void setpath (lua_State *L, const char *fieldname,
+                                   const char *envname,
+                                   const char *dft) {
+  const char *nver = lua_pushfstring(L, "%s%s", envname, LUA_VERSUFFIX);
+  const char *path = getenv(nver);  /* use versioned name */
+  if (path == NULL)  /* no environment variable? */
+    path = getenv(envname);  /* try unversioned name */
+  if (path == NULL || noenv(L))  /* no environment variable? */
+    lua_pushstring(L, dft);  /* use default */
+  else {
+    /* replace ";;" by ";AUXMARK;" and then AUXMARK by default path */
+    path = luaL_gsub(L, path, LUA_PATH_SEP LUA_PATH_SEP,
+                              LUA_PATH_SEP AUXMARK LUA_PATH_SEP);
+    luaL_gsub(L, path, AUXMARK, dft);
+    lua_remove(L, -2); /* remove result from 1st 'gsub' */
+  }
+  setprogdir(L);
+  lua_setfield(L, -3, fieldname);  /* package[fieldname] = path value */
+  lua_pop(L, 1);  /* pop versioned variable name */
+}
+
+/* }================================================================== */
+
+
+/*
+** return registry.CLIBS[path]
+*/
+static void *checkclib (lua_State *L, const char *path) {
+  void *plib;
+  lua_rawgetp(L, LUA_REGISTRYINDEX, &CLIBS);
+  lua_getfield(L, -1, path);
+  plib = lua_touserdata(L, -1);  /* plib = CLIBS[path] */
+  lua_pop(L, 2);  /* pop CLIBS table and 'plib' */
+  return plib;
+}
+
+
+/*
+** registry.CLIBS[path] = plib        -- for queries
+** registry.CLIBS[#CLIBS + 1] = plib  -- also keep a list of all libraries
+*/
+static void addtoclib (lua_State *L, const char *path, void *plib) {
+  lua_rawgetp(L, LUA_REGISTRYINDEX, &CLIBS);
+  lua_pushlightuserdata(L, plib);
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -3, path);  /* CLIBS[path] = plib */
+  lua_rawseti(L, -2, luaL_len(L, -2) + 1);  /* CLIBS[#CLIBS + 1] = plib */
+  lua_pop(L, 1);  /* pop CLIBS table */
+}
+
+
+/*
+** __gc tag method for CLIBS table: calls 'lsys_unloadlib' for all lib
+** handles in list CLIBS
+*/
+static int gctm (lua_State *L) {
+  lua_Integer n = luaL_len(L, 1);
+  for (; n >= 1; n--) {  /* for each handle, in reverse order */
+    lua_rawgeti(L, 1, n);  /* get handle CLIBS[n] */
+    lsys_unloadlib(lua_touserdata(L, -1));
+    lua_pop(L, 1);  /* pop handle */
+  }
+  return 0;
+}
+
+
+
+/* error codes for 'lookforfunc' */
+#define ERRLIB		1
+#define ERRFUNC		2
+
+/*
+** Look for a C function named 'sym' in a dynamically loaded library
+** 'path'.
+** First, check whether the library is already loaded; if not, try
+** to load it.
+** Then, if 'sym' is '*', return true (as library has been loaded).
+** Otherwise, look for symbol 'sym' in the library and push a
+** C function with that symbol.
+** Return 0 and 'true' or a function in the stack; in case of
+** errors, return an error code and an error message in the stack.
+*/
+static int lookforfunc (lua_State *L, const char *path, const char *sym) {
+  void *reg = checkclib(L, path);  /* check loaded C libraries */
+  if (reg == NULL) {  /* must load library? */
+    reg = lsys_load(L, path, *sym == '*');  /* global symbols if 'sym'=='*' */
+    if (reg == NULL) return ERRLIB;  /* unable to load library */
+    addtoclib(L, path, reg);
+  }
+  if (*sym == '*') {  /* loading only library (no function)? */
+    lua_pushboolean(L, 1);  /* return 'true' */
+    return 0;  /* no errors */
+  }
+  else {
+    lua_CFunction f = lsys_sym(L, reg, sym);
+    if (f == NULL)
+      return ERRFUNC;  /* unable to find function */
+    lua_pushcfunction(L, f);  /* else create new function */
+    return 0;  /* no errors */
+  }
+}
+
+
+static int ll_loadlib (lua_State *L) {
+  const char *path = luaL_checkstring(L, 1);
+  const char *init = luaL_checkstring(L, 2);
+  int stat = lookforfunc(L, path, init);
+  if (stat == 0)  /* no errors? */
+    return 1;  /* return the loaded function */
+  else {  /* error; error message is on stack top */
+    lua_pushnil(L);
+    lua_insert(L, -2);
+    lua_pushstring(L, (stat == ERRLIB) ?  LIB_FAIL : "init");
+    return 3;  /* return nil, error message, and where */
+  }
+}
+
+
+
+/*
+** {======================================================
+** 'require' function
+** =======================================================
+*/
+
+
+static int readable (const char *filename) {
+  FILE *f = fopen(filename, "r");  /* try to open file */
+  if (f == NULL) return 0;  /* open failed */
+  fclose(f);
+  return 1;
+}
+
+
+static const char *pushnexttemplate (lua_State *L, const char *path) {
+  const char *l;
+  while (*path == *LUA_PATH_SEP) path++;  /* skip separators */
+  if (*path == '\0') return NULL;  /* no more templates */
+  l = strchr(path, *LUA_PATH_SEP);  /* find next separator */
+  if (l == NULL) l = path + strlen(path);
+  lua_pushlstring(L, path, l - path);  /* template */
+  return l;
+}
+
+
+static const char *searchpath (lua_State *L, const char *name,
+                                             const char *path,
+                                             const char *sep,
+                                             const char *dirsep) {
+  luaL_Buffer msg;  /* to build error message */
+  luaL_buffinit(L, &msg);
+  if (*sep != '\0')  /* non-empty separator? */
+    name = luaL_gsub(L, name, sep, dirsep);  /* replace it by 'dirsep' */
+  while ((path = pushnexttemplate(L, path)) != NULL) {
+    const char *filename = luaL_gsub(L, lua_tostring(L, -1),
+                                     LUA_PATH_MARK, name);
+    lua_remove(L, -2);  /* remove path template */
+    if (readable(filename))  /* does file exist and is readable? */
+      return filename;  /* return that file name */
+    lua_pushfstring(L, "\n\tno file '%s'", filename);
+    lua_remove(L, -2);  /* remove file name */
+    luaL_addvalue(&msg);  /* concatenate error msg. entry */
+  }
+  luaL_pushresult(&msg);  /* create error message */
+  return NULL;  /* not found */
+}
+
+
+static int ll_searchpath (lua_State *L) {
+  const char *f = searchpath(L, luaL_checkstring(L, 1),
+                                luaL_checkstring(L, 2),
+                                luaL_optstring(L, 3, "."),
+                                luaL_optstring(L, 4, LUA_DIRSEP));
+  if (f != NULL) return 1;
+  else {  /* error message is on top of the stack */
+    lua_pushnil(L);
+    lua_insert(L, -2);
+    return 2;  /* return nil + error message */
+  }
+}
+
+
+static const char *findfile (lua_State *L, const char *name,
+                                           const char *pname,
+                                           const char *dirsep) {
+  const char *path;
+  lua_getfield(L, lua_upvalueindex(1), pname);
+  path = lua_tostring(L, -1);
+  if (path == NULL)
+    luaL_error(L, "'package.%s' must be a string", pname);
+  return searchpath(L, name, path, ".", dirsep);
+}
+
+
+static int checkload (lua_State *L, int stat, const char *filename) {
+  if (stat) {  /* module loaded successfully? */
+    lua_pushstring(L, filename);  /* will be 2nd argument to module */
+    return 2;  /* return open function and file name */
+  }
+  else
+    return luaL_error(L, "error loading module '%s' from file '%s':\n\t%s",
+                          lua_tostring(L, 1), filename, lua_tostring(L, -1));
+}
+
+
+static int searcher_Lua (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  filename = findfile(L, name, "path", LUA_LSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (luaL_loadfile(L, filename) == LUA_OK), filename);
+}
+
+
+/*
+** Try to find a load function for module 'modname' at file 'filename'.
+** First, change '.' to '_' in 'modname'; then, if 'modname' has
+** the form X-Y (that is, it has an "ignore mark"), build a function
+** name "luaopen_X" and look for it. (For compatibility, if that
+** fails, it also tries "luaopen_Y".) If there is no ignore mark,
+** look for a function named "luaopen_modname".
+*/
+static int loadfunc (lua_State *L, const char *filename, const char *modname) {
+  const char *openfunc;
+  const char *mark;
+  modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
+  mark = strchr(modname, *LUA_IGMARK);
+  if (mark) {
+    int stat;
+    openfunc = lua_pushlstring(L, modname, mark - modname);
+    openfunc = lua_pushfstring(L, LUA_POF"%s", openfunc);
+    stat = lookforfunc(L, filename, openfunc);
+    if (stat != ERRFUNC) return stat;
+    modname = mark + 1;  /* else go ahead and try old-style name */
+  }
+  openfunc = lua_pushfstring(L, LUA_POF"%s", modname);
+  return lookforfunc(L, filename, openfunc);
+}
+
+
+static int searcher_C (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  const char *filename = findfile(L, name, "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* module not found in this path */
+  return checkload(L, (loadfunc(L, filename, name) == 0), filename);
+}
+
+
+static int searcher_Croot (lua_State *L) {
+  const char *filename;
+  const char *name = luaL_checkstring(L, 1);
+  const char *p = strchr(name, '.');
+  int stat;
+  if (p == NULL) return 0;  /* is root */
+  lua_pushlstring(L, name, p - name);
+  filename = findfile(L, lua_tostring(L, -1), "cpath", LUA_CSUBSEP);
+  if (filename == NULL) return 1;  /* root not found */
+  if ((stat = loadfunc(L, filename, name)) != 0) {
+    if (stat != ERRFUNC)
+      return checkload(L, 0, filename);  /* real error */
+    else {  /* open function not found */
+      lua_pushfstring(L, "\n\tno module '%s' in file '%s'", name, filename);
+      return 1;
+    }
+  }
+  lua_pushstring(L, filename);  /* will be 2nd argument to module */
+  return 2;
+}
+
+
+static int searcher_preload (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  if (lua_getfield(L, -1, name) == LUA_TNIL)  /* not found? */
+    lua_pushfstring(L, "\n\tno field package.preload['%s']", name);
+  return 1;
+}
+
+
+static void findloader (lua_State *L, const char *name) {
+  int i;
+  luaL_Buffer msg;  /* to build error message */
+  luaL_buffinit(L, &msg);
+  /* push 'package.searchers' to index 3 in the stack */
+  if (lua_getfield(L, lua_upvalueindex(1), "searchers") != LUA_TTABLE)
+    luaL_error(L, "'package.searchers' must be a table");
+  /*  iterate over available searchers to find a loader */
+  for (i = 1; ; i++) {
+    if (lua_rawgeti(L, 3, i) == LUA_TNIL) {  /* no more searchers? */
+      lua_pop(L, 1);  /* remove nil */
+      luaL_pushresult(&msg);  /* create error message */
+      luaL_error(L, "module '%s' not found:%s", name, lua_tostring(L, -1));
+    }
+    lua_pushstring(L, name);
+    lua_call(L, 1, 2);  /* call it */
+    if (lua_isfunction(L, -2))  /* did it find a loader? */
+      return;  /* module loader found */
+    else if (lua_isstring(L, -2)) {  /* searcher returned error message? */
+      lua_pop(L, 1);  /* remove extra return */
+      luaL_addvalue(&msg);  /* concatenate error message */
+    }
+    else
+      lua_pop(L, 2);  /* remove both returns */
+  }
+}
+
+
+static int ll_require (lua_State *L) {
+  const char *name = luaL_checkstring(L, 1);
+  lua_settop(L, 1);  /* LOADED table will be at index 2 */
+  lua_getfield(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_getfield(L, 2, name);  /* LOADED[name] */
+  if (lua_toboolean(L, -1))  /* is it there? */
+    return 1;  /* package is already loaded */
+  /* else must load package */
+  lua_pop(L, 1);  /* remove 'getfield' result */
+  findloader(L, name);
+  lua_pushstring(L, name);  /* pass name as argument to module loader */
+  lua_insert(L, -2);  /* name is 1st argument (before search data) */
+  lua_call(L, 2, 1);  /* run loader to load module */
+  if (!lua_isnil(L, -1))  /* non-nil return? */
+    lua_setfield(L, 2, name);  /* LOADED[name] = returned value */
+  if (lua_getfield(L, 2, name) == LUA_TNIL) {   /* module set no value? */
+    lua_pushboolean(L, 1);  /* use true as result */
+    lua_pushvalue(L, -1);  /* extra copy to be returned */
+    lua_setfield(L, 2, name);  /* LOADED[name] = true */
+  }
+  return 1;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** 'module' function
+** =======================================================
+*/
+#if defined(LUA_COMPAT_MODULE)
+
+/*
+** changes the environment variable of calling function
+*/
+static void set_env (lua_State *L) {
+  lua_Debug ar;
+  if (lua_getstack(L, 1, &ar) == 0 ||
+      lua_getinfo(L, "f", &ar) == 0 ||  /* get calling function */
+      lua_iscfunction(L, -1))
+    luaL_error(L, "'module' not called from a Lua function");
+  lua_pushvalue(L, -2);  /* copy new environment table to top */
+  lua_setupvalue(L, -2, 1);
+  lua_pop(L, 1);  /* remove function */
+}
+
+
+static void dooptions (lua_State *L, int n) {
+  int i;
+  for (i = 2; i <= n; i++) {
+    if (lua_isfunction(L, i)) {  /* avoid 'calling' extra info. */
+      lua_pushvalue(L, i);  /* get option (a function) */
+      lua_pushvalue(L, -2);  /* module */
+      lua_call(L, 1, 0);
+    }
+  }
+}
+
+
+static void modinit (lua_State *L, const char *modname) {
+  const char *dot;
+  lua_pushvalue(L, -1);
+  lua_setfield(L, -2, "_M");  /* module._M = module */
+  lua_pushstring(L, modname);
+  lua_setfield(L, -2, "_NAME");
+  dot = strrchr(modname, '.');  /* look for last dot in module name */
+  if (dot == NULL) dot = modname;
+  else dot++;
+  /* set _PACKAGE as package name (full module name minus last part) */
+  lua_pushlstring(L, modname, dot - modname);
+  lua_setfield(L, -2, "_PACKAGE");
+}
+
+
+static int ll_module (lua_State *L) {
+  const char *modname = luaL_checkstring(L, 1);
+  int lastarg = lua_gettop(L);  /* last parameter */
+  luaL_pushmodule(L, modname, 1);  /* get/create module table */
+  /* check whether table already has a _NAME field */
+  if (lua_getfield(L, -1, "_NAME") != LUA_TNIL)
+    lua_pop(L, 1);  /* table is an initialized module */
+  else {  /* no; initialize it */
+    lua_pop(L, 1);
+    modinit(L, modname);
+  }
+  lua_pushvalue(L, -1);
+  set_env(L);
+  dooptions(L, lastarg);
+  return 1;
+}
+
+
+static int ll_seeall (lua_State *L) {
+  luaL_checktype(L, 1, LUA_TTABLE);
+  if (!lua_getmetatable(L, 1)) {
+    lua_createtable(L, 0, 1); /* create new metatable */
+    lua_pushvalue(L, -1);
+    lua_setmetatable(L, 1);
+  }
+  lua_pushglobaltable(L);
+  lua_setfield(L, -2, "__index");  /* mt.__index = _G */
+  return 0;
+}
+
+#endif
+/* }====================================================== */
+
+
+
+static const luaL_Reg pk_funcs[] = {
+  {"loadlib", ll_loadlib},
+  {"searchpath", ll_searchpath},
+#if defined(LUA_COMPAT_MODULE)
+  {"seeall", ll_seeall},
+#endif
+  /* placeholders */
+  {"preload", NULL},
+  {"cpath", NULL},
+  {"path", NULL},
+  {"searchers", NULL},
+  {"loaded", NULL},
+  {NULL, NULL}
+};
+
+
+static const luaL_Reg ll_funcs[] = {
+#if defined(LUA_COMPAT_MODULE)
+  {"module", ll_module},
+#endif
+  {"require", ll_require},
+  {NULL, NULL}
+};
+
+
+static void createsearcherstable (lua_State *L) {
+  static const lua_CFunction searchers[] =
+    {searcher_preload, searcher_Lua, searcher_C, searcher_Croot, NULL};
+  int i;
+  /* create 'searchers' table */
+  lua_createtable(L, sizeof(searchers)/sizeof(searchers[0]) - 1, 0);
+  /* fill it with predefined searchers */
+  for (i=0; searchers[i] != NULL; i++) {
+    lua_pushvalue(L, -2);  /* set 'package' as upvalue for all searchers */
+    lua_pushcclosure(L, searchers[i], 1);
+    lua_rawseti(L, -2, i+1);
+  }
+#if defined(LUA_COMPAT_LOADERS)
+  lua_pushvalue(L, -1);  /* make a copy of 'searchers' table */
+  lua_setfield(L, -3, "loaders");  /* put it in field 'loaders' */
+#endif
+  lua_setfield(L, -2, "searchers");  /* put it in field 'searchers' */
+}
+
+
+/*
+** create table CLIBS to keep track of loaded C libraries,
+** setting a finalizer to close all libraries when closing state.
+*/
+static void createclibstable (lua_State *L) {
+  lua_newtable(L);  /* create CLIBS table */
+  lua_createtable(L, 0, 1);  /* create metatable for CLIBS */
+  lua_pushcfunction(L, gctm);
+  lua_setfield(L, -2, "__gc");  /* set finalizer for CLIBS table */
+  lua_setmetatable(L, -2);
+  lua_rawsetp(L, LUA_REGISTRYINDEX, &CLIBS);  /* set CLIBS table in registry */
+}
+
+
+LUAMOD_API int luaopen_package (lua_State *L) {
+  createclibstable(L);
+  luaL_newlib(L, pk_funcs);  /* create 'package' table */
+  createsearcherstable(L);
+  /* set paths */
+  setpath(L, "path", LUA_PATH_VAR, LUA_PATH_DEFAULT);
+  setpath(L, "cpath", LUA_CPATH_VAR, LUA_CPATH_DEFAULT);
+  /* store config information */
+  lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATH_SEP "\n" LUA_PATH_MARK "\n"
+                     LUA_EXEC_DIR "\n" LUA_IGMARK "\n");
+  lua_setfield(L, -2, "config");
+  /* set field 'loaded' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_LOADED_TABLE);
+  lua_setfield(L, -2, "loaded");
+  /* set field 'preload' */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, LUA_PRELOAD_TABLE);
+  lua_setfield(L, -2, "preload");
+  lua_pushglobaltable(L);
+  lua_pushvalue(L, -2);  /* set 'package' as upvalue for next lib */
+  luaL_setfuncs(L, ll_funcs, 1);  /* open lib into global table */
+  lua_pop(L, 1);  /* pop global table */
+  return 1;  /* return 'package' table */
+}
+
diff --git a/scite-app/scite/lua/src/lobject.c b/scite-app/scite/lua/src/lobject.c
new file mode 100644
index 0000000..2da7689
--- /dev/null
+++ b/scite-app/scite/lua/src/lobject.c
@@ -0,0 +1,521 @@
+/*
+** $Id: lobject.c,v 2.113 2016/12/22 13:08:50 roberto Exp $
+** Some generic functions over Lua objects
+** See Copyright Notice in lua.h
+*/
+
+#define lobject_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <locale.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lctype.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "lvm.h"
+
+
+
+LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
+
+
+/*
+** converts an integer to a "floating point byte", represented as
+** (eeeeexxx), where the real value is (1xxx) * 2^(eeeee - 1) if
+** eeeee != 0 and (xxx) otherwise.
+*/
+int luaO_int2fb (unsigned int x) {
+  int e = 0;  /* exponent */
+  if (x < 8) return x;
+  while (x >= (8 << 4)) {  /* coarse steps */
+    x = (x + 0xf) >> 4;  /* x = ceil(x / 16) */
+    e += 4;
+  }
+  while (x >= (8 << 1)) {  /* fine steps */
+    x = (x + 1) >> 1;  /* x = ceil(x / 2) */
+    e++;
+  }
+  return ((e+1) << 3) | (cast_int(x) - 8);
+}
+
+
+/* converts back */
+int luaO_fb2int (int x) {
+  return (x < 8) ? x : ((x & 7) + 8) << ((x >> 3) - 1);
+}
+
+
+/*
+** Computes ceil(log2(x))
+*/
+int luaO_ceillog2 (unsigned int x) {
+  static const lu_byte log_2[256] = {  /* log_2[i] = ceil(log2(i - 1)) */
+    0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+    6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+    8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
+  };
+  int l = 0;
+  x--;
+  while (x >= 256) { l += 8; x >>= 8; }
+  return l + log_2[x];
+}
+
+
+static lua_Integer intarith (lua_State *L, int op, lua_Integer v1,
+                                                   lua_Integer v2) {
+  switch (op) {
+    case LUA_OPADD: return intop(+, v1, v2);
+    case LUA_OPSUB:return intop(-, v1, v2);
+    case LUA_OPMUL:return intop(*, v1, v2);
+    case LUA_OPMOD: return luaV_mod(L, v1, v2);
+    case LUA_OPIDIV: return luaV_div(L, v1, v2);
+    case LUA_OPBAND: return intop(&, v1, v2);
+    case LUA_OPBOR: return intop(|, v1, v2);
+    case LUA_OPBXOR: return intop(^, v1, v2);
+    case LUA_OPSHL: return luaV_shiftl(v1, v2);
+    case LUA_OPSHR: return luaV_shiftl(v1, -v2);
+    case LUA_OPUNM: return intop(-, 0, v1);
+    case LUA_OPBNOT: return intop(^, ~l_castS2U(0), v1);
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+static lua_Number numarith (lua_State *L, int op, lua_Number v1,
+                                                  lua_Number v2) {
+  switch (op) {
+    case LUA_OPADD: return luai_numadd(L, v1, v2);
+    case LUA_OPSUB: return luai_numsub(L, v1, v2);
+    case LUA_OPMUL: return luai_nummul(L, v1, v2);
+    case LUA_OPDIV: return luai_numdiv(L, v1, v2);
+    case LUA_OPPOW: return luai_numpow(L, v1, v2);
+    case LUA_OPIDIV: return luai_numidiv(L, v1, v2);
+    case LUA_OPUNM: return luai_numunm(L, v1);
+    case LUA_OPMOD: {
+      lua_Number m;
+      luai_nummod(L, v1, v2, m);
+      return m;
+    }
+    default: lua_assert(0); return 0;
+  }
+}
+
+
+void luaO_arith (lua_State *L, int op, const TValue *p1, const TValue *p2,
+                 TValue *res) {
+  switch (op) {
+    case LUA_OPBAND: case LUA_OPBOR: case LUA_OPBXOR:
+    case LUA_OPSHL: case LUA_OPSHR:
+    case LUA_OPBNOT: {  /* operate only on integers */
+      lua_Integer i1; lua_Integer i2;
+      if (tointeger(p1, &i1) && tointeger(p2, &i2)) {
+        setivalue(res, intarith(L, op, i1, i2));
+        return;
+      }
+      else break;  /* go to the end */
+    }
+    case LUA_OPDIV: case LUA_OPPOW: {  /* operate only on floats */
+      lua_Number n1; lua_Number n2;
+      if (tonumber(p1, &n1) && tonumber(p2, &n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return;
+      }
+      else break;  /* go to the end */
+    }
+    default: {  /* other operations */
+      lua_Number n1; lua_Number n2;
+      if (ttisinteger(p1) && ttisinteger(p2)) {
+        setivalue(res, intarith(L, op, ivalue(p1), ivalue(p2)));
+        return;
+      }
+      else if (tonumber(p1, &n1) && tonumber(p2, &n2)) {
+        setfltvalue(res, numarith(L, op, n1, n2));
+        return;
+      }
+      else break;  /* go to the end */
+    }
+  }
+  /* could not perform raw operation; try metamethod */
+  lua_assert(L != NULL);  /* should not fail when folding (compile time) */
+  luaT_trybinTM(L, p1, p2, res, cast(TMS, (op - LUA_OPADD) + TM_ADD));
+}
+
+
+int luaO_hexavalue (int c) {
+  if (lisdigit(c)) return c - '0';
+  else return (ltolower(c) - 'a') + 10;
+}
+
+
+static int isneg (const char **s) {
+  if (**s == '-') { (*s)++; return 1; }
+  else if (**s == '+') (*s)++;
+  return 0;
+}
+
+
+
+/*
+** {==================================================================
+** Lua's implementation for 'lua_strx2number'
+** ===================================================================
+*/
+
+#if !defined(lua_strx2number)
+
+/* maximum number of significant digits to read (to avoid overflows
+   even with single floats) */
+#define MAXSIGDIG	30
+
+/*
+** convert an hexadecimal numeric string to a number, following
+** C99 specification for 'strtod'
+*/
+static lua_Number lua_strx2number (const char *s, char **endptr) {
+  int dot = lua_getlocaledecpoint();
+  lua_Number r = 0.0;  /* result (accumulator) */
+  int sigdig = 0;  /* number of significant digits */
+  int nosigdig = 0;  /* number of non-significant digits */
+  int e = 0;  /* exponent correction */
+  int neg;  /* 1 if number is negative */
+  int hasdot = 0;  /* true after seen a dot */
+  *endptr = cast(char *, s);  /* nothing is valid yet */
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);  /* check signal */
+  if (!(*s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X')))  /* check '0x' */
+    return 0.0;  /* invalid format (no '0x') */
+  for (s += 2; ; s++) {  /* skip '0x' and read numeral */
+    if (*s == dot) {
+      if (hasdot) break;  /* second dot? stop loop */
+      else hasdot = 1;
+    }
+    else if (lisxdigit(cast_uchar(*s))) {
+      if (sigdig == 0 && *s == '0')  /* non-significant digit (zero)? */
+        nosigdig++;
+      else if (++sigdig <= MAXSIGDIG)  /* can read it without overflow? */
+          r = (r * cast_num(16.0)) + luaO_hexavalue(*s);
+      else e++; /* too many digits; ignore, but still count for exponent */
+      if (hasdot) e--;  /* decimal digit? correct exponent */
+    }
+    else break;  /* neither a dot nor a digit */
+  }
+  if (nosigdig + sigdig == 0)  /* no digits? */
+    return 0.0;  /* invalid format */
+  *endptr = cast(char *, s);  /* valid up to here */
+  e *= 4;  /* each digit multiplies/divides value by 2^4 */
+  if (*s == 'p' || *s == 'P') {  /* exponent part? */
+    int exp1 = 0;  /* exponent value */
+    int neg1;  /* exponent signal */
+    s++;  /* skip 'p' */
+    neg1 = isneg(&s);  /* signal */
+    if (!lisdigit(cast_uchar(*s)))
+      return 0.0;  /* invalid; must have at least one digit */
+    while (lisdigit(cast_uchar(*s)))  /* read exponent */
+      exp1 = exp1 * 10 + *(s++) - '0';
+    if (neg1) exp1 = -exp1;
+    e += exp1;
+    *endptr = cast(char *, s);  /* valid up to here */
+  }
+  if (neg) r = -r;
+  return l_mathop(ldexp)(r, e);
+}
+
+#endif
+/* }====================================================== */
+
+
+/* maximum length of a numeral */
+#if !defined (L_MAXLENNUM)
+#define L_MAXLENNUM	200
+#endif
+
+static const char *l_str2dloc (const char *s, lua_Number *result, int mode) {
+  char *endptr;
+  *result = (mode == 'x') ? lua_strx2number(s, &endptr)  /* try to convert */
+                          : lua_str2number(s, &endptr);
+  if (endptr == s) return NULL;  /* nothing recognized? */
+  while (lisspace(cast_uchar(*endptr))) endptr++;  /* skip trailing spaces */
+  return (*endptr == '\0') ? endptr : NULL;  /* OK if no trailing characters */
+}
+
+
+/*
+** Convert string 's' to a Lua number (put in 'result'). Return NULL
+** on fail or the address of the ending '\0' on success.
+** 'pmode' points to (and 'mode' contains) special things in the string:
+** - 'x'/'X' means an hexadecimal numeral
+** - 'n'/'N' means 'inf' or 'nan' (which should be rejected)
+** - '.' just optimizes the search for the common case (nothing special)
+** This function accepts both the current locale or a dot as the radix
+** mark. If the convertion fails, it may mean number has a dot but
+** locale accepts something else. In that case, the code copies 's'
+** to a buffer (because 's' is read-only), changes the dot to the
+** current locale radix mark, and tries to convert again.
+*/
+static const char *l_str2d (const char *s, lua_Number *result) {
+  const char *endptr;
+  const char *pmode = strpbrk(s, ".xXnN");
+  int mode = pmode ? ltolower(cast_uchar(*pmode)) : 0;
+  if (mode == 'n')  /* reject 'inf' and 'nan' */
+    return NULL;
+  endptr = l_str2dloc(s, result, mode);  /* try to convert */
+  if (endptr == NULL) {  /* failed? may be a different locale */
+    char buff[L_MAXLENNUM + 1];
+    const char *pdot = strchr(s, '.');
+    if (strlen(s) > L_MAXLENNUM || pdot == NULL)
+      return NULL;  /* string too long or no dot; fail */
+    strcpy(buff, s);  /* copy string to buffer */
+    buff[pdot - s] = lua_getlocaledecpoint();  /* correct decimal point */
+    endptr = l_str2dloc(buff, result, mode);  /* try again */
+    if (endptr != NULL)
+      endptr = s + (endptr - buff);  /* make relative to 's' */
+  }
+  return endptr;
+}
+
+
+#define MAXBY10		cast(lua_Unsigned, LUA_MAXINTEGER / 10)
+#define MAXLASTD	cast_int(LUA_MAXINTEGER % 10)
+
+static const char *l_str2int (const char *s, lua_Integer *result) {
+  lua_Unsigned a = 0;
+  int empty = 1;
+  int neg;
+  while (lisspace(cast_uchar(*s))) s++;  /* skip initial spaces */
+  neg = isneg(&s);
+  if (s[0] == '0' &&
+      (s[1] == 'x' || s[1] == 'X')) {  /* hex? */
+    s += 2;  /* skip '0x' */
+    for (; lisxdigit(cast_uchar(*s)); s++) {
+      a = a * 16 + luaO_hexavalue(*s);
+      empty = 0;
+    }
+  }
+  else {  /* decimal */
+    for (; lisdigit(cast_uchar(*s)); s++) {
+      int d = *s - '0';
+      if (a >= MAXBY10 && (a > MAXBY10 || d > MAXLASTD + neg))  /* overflow? */
+        return NULL;  /* do not accept it (as integer) */
+      a = a * 10 + d;
+      empty = 0;
+    }
+  }
+  while (lisspace(cast_uchar(*s))) s++;  /* skip trailing spaces */
+  if (empty || *s != '\0') return NULL;  /* something wrong in the numeral */
+  else {
+    *result = l_castU2S((neg) ? 0u - a : a);
+    return s;
+  }
+}
+
+
+size_t luaO_str2num (const char *s, TValue *o) {
+  lua_Integer i; lua_Number n;
+  const char *e;
+  if ((e = l_str2int(s, &i)) != NULL) {  /* try as an integer */
+    setivalue(o, i);
+  }
+  else if ((e = l_str2d(s, &n)) != NULL) {  /* else try as a float */
+    setfltvalue(o, n);
+  }
+  else
+    return 0;  /* conversion failed */
+  return (e - s) + 1;  /* success; return string size */
+}
+
+
+int luaO_utf8esc (char *buff, unsigned long x) {
+  int n = 1;  /* number of bytes put in buffer (backwards) */
+  lua_assert(x <= 0x10FFFF);
+  if (x < 0x80)  /* ascii? */
+    buff[UTF8BUFFSZ - 1] = cast(char, x);
+  else {  /* need continuation bytes */
+    unsigned int mfb = 0x3f;  /* maximum that fits in first byte */
+    do {  /* add continuation bytes */
+      buff[UTF8BUFFSZ - (n++)] = cast(char, 0x80 | (x & 0x3f));
+      x >>= 6;  /* remove added bits */
+      mfb >>= 1;  /* now there is one less bit available in first byte */
+    } while (x > mfb);  /* still needs continuation byte? */
+    buff[UTF8BUFFSZ - n] = cast(char, (~mfb << 1) | x);  /* add first byte */
+  }
+  return n;
+}
+
+
+/* maximum length of the conversion of a number to a string */
+#define MAXNUMBER2STR	50
+
+
+/*
+** Convert a number object to a string
+*/
+void luaO_tostring (lua_State *L, StkId obj) {
+  char buff[MAXNUMBER2STR];
+  size_t len;
+  lua_assert(ttisnumber(obj));
+  if (ttisinteger(obj))
+    len = lua_integer2str(buff, sizeof(buff), ivalue(obj));
+  else {
+    len = lua_number2str(buff, sizeof(buff), fltvalue(obj));
+#if !defined(LUA_COMPAT_FLOATSTRING)
+    if (buff[strspn(buff, "-0123456789")] == '\0') {  /* looks like an int? */
+      buff[len++] = lua_getlocaledecpoint();
+      buff[len++] = '0';  /* adds '.0' to result */
+    }
+#endif
+  }
+  setsvalue2s(L, obj, luaS_newlstr(L, buff, len));
+}
+
+
+static void pushstr (lua_State *L, const char *str, size_t l) {
+  setsvalue2s(L, L->top, luaS_newlstr(L, str, l));
+  luaD_inctop(L);
+}
+
+
+/*
+** this function handles only '%d', '%c', '%f', '%p', and '%s'
+   conventional formats, plus Lua-specific '%I' and '%U'
+*/
+const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
+  int n = 0;
+  for (;;) {
+    const char *e = strchr(fmt, '%');
+    if (e == NULL) break;
+    pushstr(L, fmt, e - fmt);
+    switch (*(e+1)) {
+      case 's': {  /* zero-terminated string */
+        const char *s = va_arg(argp, char *);
+        if (s == NULL) s = "(null)";
+        pushstr(L, s, strlen(s));
+        break;
+      }
+      case 'c': {  /* an 'int' as a character */
+        char buff = cast(char, va_arg(argp, int));
+        if (lisprint(cast_uchar(buff)))
+          pushstr(L, &buff, 1);
+        else  /* non-printable character; print its code */
+          luaO_pushfstring(L, "<\\%d>", cast_uchar(buff));
+        break;
+      }
+      case 'd': {  /* an 'int' */
+        setivalue(L->top, va_arg(argp, int));
+        goto top2str;
+      }
+      case 'I': {  /* a 'lua_Integer' */
+        setivalue(L->top, cast(lua_Integer, va_arg(argp, l_uacInt)));
+        goto top2str;
+      }
+      case 'f': {  /* a 'lua_Number' */
+        setfltvalue(L->top, cast_num(va_arg(argp, l_uacNumber)));
+      top2str:  /* convert the top element to a string */
+        luaD_inctop(L);
+        luaO_tostring(L, L->top - 1);
+        break;
+      }
+      case 'p': {  /* a pointer */
+        char buff[4*sizeof(void *) + 8]; /* should be enough space for a '%p' */
+        int l = l_sprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
+        pushstr(L, buff, l);
+        break;
+      }
+      case 'U': {  /* an 'int' as a UTF-8 sequence */
+        char buff[UTF8BUFFSZ];
+        int l = luaO_utf8esc(buff, cast(long, va_arg(argp, long)));
+        pushstr(L, buff + UTF8BUFFSZ - l, l);
+        break;
+      }
+      case '%': {
+        pushstr(L, "%", 1);
+        break;
+      }
+      default: {
+        luaG_runerror(L, "invalid option '%%%c' to 'lua_pushfstring'",
+                         *(e + 1));
+      }
+    }
+    n += 2;
+    fmt = e+2;
+  }
+  luaD_checkstack(L, 1);
+  pushstr(L, fmt, strlen(fmt));
+  if (n > 0) luaV_concat(L, n + 1);
+  return svalue(L->top - 1);
+}
+
+
+const char *luaO_pushfstring (lua_State *L, const char *fmt, ...) {
+  const char *msg;
+  va_list argp;
+  va_start(argp, fmt);
+  msg = luaO_pushvfstring(L, fmt, argp);
+  va_end(argp);
+  return msg;
+}
+
+
+/* number of chars of a literal string without the ending \0 */
+#define LL(x)	(sizeof(x)/sizeof(char) - 1)
+
+#define RETS	"..."
+#define PRE	"[string \""
+#define POS	"\"]"
+
+#define addstr(a,b,l)	( memcpy(a,b,(l) * sizeof(char)), a += (l) )
+
+void luaO_chunkid (char *out, const char *source, size_t bufflen) {
+  size_t l = strlen(source);
+  if (*source == '=') {  /* 'literal' source */
+    if (l <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, l * sizeof(char));
+    else {  /* truncate it */
+      addstr(out, source + 1, bufflen - 1);
+      *out = '\0';
+    }
+  }
+  else if (*source == '@') {  /* file name */
+    if (l <= bufflen)  /* small enough? */
+      memcpy(out, source + 1, l * sizeof(char));
+    else {  /* add '...' before rest of name */
+      addstr(out, RETS, LL(RETS));
+      bufflen -= LL(RETS);
+      memcpy(out, source + 1 + l - bufflen, bufflen * sizeof(char));
+    }
+  }
+  else {  /* string; format as [string "source"] */
+    const char *nl = strchr(source, '\n');  /* find first new line (if any) */
+    addstr(out, PRE, LL(PRE));  /* add prefix */
+    bufflen -= LL(PRE RETS POS) + 1;  /* save space for prefix+suffix+'\0' */
+    if (l < bufflen && nl == NULL) {  /* small one-line source? */
+      addstr(out, source, l);  /* keep it */
+    }
+    else {
+      if (nl != NULL) l = nl - source;  /* stop at first newline */
+      if (l > bufflen) l = bufflen;
+      addstr(out, source, l);
+      addstr(out, RETS, LL(RETS));
+    }
+    memcpy(out, POS, (LL(POS) + 1) * sizeof(char));
+  }
+}
+
diff --git a/scite-app/scite/lua/src/lobject.h b/scite-app/scite/lua/src/lobject.h
new file mode 100644
index 0000000..3c04228
--- /dev/null
+++ b/scite-app/scite/lua/src/lobject.h
@@ -0,0 +1,549 @@
+/*
+** $Id: lobject.h,v 2.117 2016/08/01 19:51:24 roberto Exp $
+** Type definitions for Lua objects
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lobject_h
+#define lobject_h
+
+
+#include <stdarg.h>
+
+
+#include "llimits.h"
+#include "lua.h"
+
+
+/*
+** Extra tags for non-values
+*/
+#define LUA_TPROTO	LUA_NUMTAGS		/* function prototypes */
+#define LUA_TDEADKEY	(LUA_NUMTAGS+1)		/* removed keys in tables */
+
+/*
+** number of all possible tags (including LUA_TNONE but excluding DEADKEY)
+*/
+#define LUA_TOTALTAGS	(LUA_TPROTO + 2)
+
+
+/*
+** tags for Tagged Values have the following use of bits:
+** bits 0-3: actual tag (a LUA_T* value)
+** bits 4-5: variant bits
+** bit 6: whether value is collectable
+*/
+
+
+/*
+** LUA_TFUNCTION variants:
+** 0 - Lua function
+** 1 - light C function
+** 2 - regular C function (closure)
+*/
+
+/* Variant tags for functions */
+#define LUA_TLCL	(LUA_TFUNCTION | (0 << 4))  /* Lua closure */
+#define LUA_TLCF	(LUA_TFUNCTION | (1 << 4))  /* light C function */
+#define LUA_TCCL	(LUA_TFUNCTION | (2 << 4))  /* C closure */
+
+
+/* Variant tags for strings */
+#define LUA_TSHRSTR	(LUA_TSTRING | (0 << 4))  /* short strings */
+#define LUA_TLNGSTR	(LUA_TSTRING | (1 << 4))  /* long strings */
+
+
+/* Variant tags for numbers */
+#define LUA_TNUMFLT	(LUA_TNUMBER | (0 << 4))  /* float numbers */
+#define LUA_TNUMINT	(LUA_TNUMBER | (1 << 4))  /* integer numbers */
+
+
+/* Bit mark for collectable types */
+#define BIT_ISCOLLECTABLE	(1 << 6)
+
+/* mark a tag as collectable */
+#define ctb(t)			((t) | BIT_ISCOLLECTABLE)
+
+
+/*
+** Common type for all collectable objects
+*/
+typedef struct GCObject GCObject;
+
+
+/*
+** Common Header for all collectable objects (in macro form, to be
+** included in other objects)
+*/
+#define CommonHeader	GCObject *next; lu_byte tt; lu_byte marked
+
+
+/*
+** Common type has only the common header
+*/
+struct GCObject {
+  CommonHeader;
+};
+
+
+
+
+/*
+** Tagged Values. This is the basic representation of values in Lua,
+** an actual value plus a tag with its type.
+*/
+
+/*
+** Union of all Lua values
+*/
+typedef union Value {
+  GCObject *gc;    /* collectable objects */
+  void *p;         /* light userdata */
+  int b;           /* booleans */
+  lua_CFunction f; /* light C functions */
+  lua_Integer i;   /* integer numbers */
+  lua_Number n;    /* float numbers */
+} Value;
+
+
+#define TValuefields	Value value_; int tt_
+
+
+typedef struct lua_TValue {
+  TValuefields;
+} TValue;
+
+
+
+/* macro defining a nil value */
+#define NILCONSTANT	{NULL}, LUA_TNIL
+
+
+#define val_(o)		((o)->value_)
+
+
+/* raw type tag of a TValue */
+#define rttype(o)	((o)->tt_)
+
+/* tag with no variants (bits 0-3) */
+#define novariant(x)	((x) & 0x0F)
+
+/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */
+#define ttype(o)	(rttype(o) & 0x3F)
+
+/* type tag of a TValue with no variants (bits 0-3) */
+#define ttnov(o)	(novariant(rttype(o)))
+
+
+/* Macros to test type */
+#define checktag(o,t)		(rttype(o) == (t))
+#define checktype(o,t)		(ttnov(o) == (t))
+#define ttisnumber(o)		checktype((o), LUA_TNUMBER)
+#define ttisfloat(o)		checktag((o), LUA_TNUMFLT)
+#define ttisinteger(o)		checktag((o), LUA_TNUMINT)
+#define ttisnil(o)		checktag((o), LUA_TNIL)
+#define ttisboolean(o)		checktag((o), LUA_TBOOLEAN)
+#define ttislightuserdata(o)	checktag((o), LUA_TLIGHTUSERDATA)
+#define ttisstring(o)		checktype((o), LUA_TSTRING)
+#define ttisshrstring(o)	checktag((o), ctb(LUA_TSHRSTR))
+#define ttislngstring(o)	checktag((o), ctb(LUA_TLNGSTR))
+#define ttistable(o)		checktag((o), ctb(LUA_TTABLE))
+#define ttisfunction(o)		checktype(o, LUA_TFUNCTION)
+#define ttisclosure(o)		((rttype(o) & 0x1F) == LUA_TFUNCTION)
+#define ttisCclosure(o)		checktag((o), ctb(LUA_TCCL))
+#define ttisLclosure(o)		checktag((o), ctb(LUA_TLCL))
+#define ttislcf(o)		checktag((o), LUA_TLCF)
+#define ttisfulluserdata(o)	checktag((o), ctb(LUA_TUSERDATA))
+#define ttisthread(o)		checktag((o), ctb(LUA_TTHREAD))
+#define ttisdeadkey(o)		checktag((o), LUA_TDEADKEY)
+
+
+/* Macros to access values */
+#define ivalue(o)	check_exp(ttisinteger(o), val_(o).i)
+#define fltvalue(o)	check_exp(ttisfloat(o), val_(o).n)
+#define nvalue(o)	check_exp(ttisnumber(o), \
+	(ttisinteger(o) ? cast_num(ivalue(o)) : fltvalue(o)))
+#define gcvalue(o)	check_exp(iscollectable(o), val_(o).gc)
+#define pvalue(o)	check_exp(ttislightuserdata(o), val_(o).p)
+#define tsvalue(o)	check_exp(ttisstring(o), gco2ts(val_(o).gc))
+#define uvalue(o)	check_exp(ttisfulluserdata(o), gco2u(val_(o).gc))
+#define clvalue(o)	check_exp(ttisclosure(o), gco2cl(val_(o).gc))
+#define clLvalue(o)	check_exp(ttisLclosure(o), gco2lcl(val_(o).gc))
+#define clCvalue(o)	check_exp(ttisCclosure(o), gco2ccl(val_(o).gc))
+#define fvalue(o)	check_exp(ttislcf(o), val_(o).f)
+#define hvalue(o)	check_exp(ttistable(o), gco2t(val_(o).gc))
+#define bvalue(o)	check_exp(ttisboolean(o), val_(o).b)
+#define thvalue(o)	check_exp(ttisthread(o), gco2th(val_(o).gc))
+/* a dead value may get the 'gc' field, but cannot access its contents */
+#define deadvalue(o)	check_exp(ttisdeadkey(o), cast(void *, val_(o).gc))
+
+#define l_isfalse(o)	(ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
+
+
+#define iscollectable(o)	(rttype(o) & BIT_ISCOLLECTABLE)
+
+
+/* Macros for internal tests */
+#define righttt(obj)		(ttype(obj) == gcvalue(obj)->tt)
+
+#define checkliveness(L,obj) \
+	lua_longassert(!iscollectable(obj) || \
+		(righttt(obj) && (L == NULL || !isdead(G(L),gcvalue(obj)))))
+
+
+/* Macros to set values */
+#define settt_(o,t)	((o)->tt_=(t))
+
+#define setfltvalue(obj,x) \
+  { TValue *io=(obj); val_(io).n=(x); settt_(io, LUA_TNUMFLT); }
+
+#define chgfltvalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisfloat(io)); val_(io).n=(x); }
+
+#define setivalue(obj,x) \
+  { TValue *io=(obj); val_(io).i=(x); settt_(io, LUA_TNUMINT); }
+
+#define chgivalue(obj,x) \
+  { TValue *io=(obj); lua_assert(ttisinteger(io)); val_(io).i=(x); }
+
+#define setnilvalue(obj) settt_(obj, LUA_TNIL)
+
+#define setfvalue(obj,x) \
+  { TValue *io=(obj); val_(io).f=(x); settt_(io, LUA_TLCF); }
+
+#define setpvalue(obj,x) \
+  { TValue *io=(obj); val_(io).p=(x); settt_(io, LUA_TLIGHTUSERDATA); }
+
+#define setbvalue(obj,x) \
+  { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); }
+
+#define setgcovalue(L,obj,x) \
+  { TValue *io = (obj); GCObject *i_g=(x); \
+    val_(io).gc = i_g; settt_(io, ctb(i_g->tt)); }
+
+#define setsvalue(L,obj,x) \
+  { TValue *io = (obj); TString *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(x_->tt)); \
+    checkliveness(L,io); }
+
+#define setuvalue(L,obj,x) \
+  { TValue *io = (obj); Udata *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TUSERDATA)); \
+    checkliveness(L,io); }
+
+#define setthvalue(L,obj,x) \
+  { TValue *io = (obj); lua_State *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TTHREAD)); \
+    checkliveness(L,io); }
+
+#define setclLvalue(L,obj,x) \
+  { TValue *io = (obj); LClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TLCL)); \
+    checkliveness(L,io); }
+
+#define setclCvalue(L,obj,x) \
+  { TValue *io = (obj); CClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TCCL)); \
+    checkliveness(L,io); }
+
+#define sethvalue(L,obj,x) \
+  { TValue *io = (obj); Table *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TTABLE)); \
+    checkliveness(L,io); }
+
+#define setdeadvalue(obj)	settt_(obj, LUA_TDEADKEY)
+
+
+
+#define setobj(L,obj1,obj2) \
+	{ TValue *io1=(obj1); *io1 = *(obj2); \
+	  (void)L; checkliveness(L,io1); }
+
+
+/*
+** different types of assignments, according to destination
+*/
+
+/* from stack to (same) stack */
+#define setobjs2s	setobj
+/* to stack (not from same stack) */
+#define setobj2s	setobj
+#define setsvalue2s	setsvalue
+#define sethvalue2s	sethvalue
+#define setptvalue2s	setptvalue
+/* from table to same table */
+#define setobjt2t	setobj
+/* to new object */
+#define setobj2n	setobj
+#define setsvalue2n	setsvalue
+
+/* to table (define it as an expression to be used in macros) */
+#define setobj2t(L,o1,o2)  ((void)L, *(o1)=*(o2), checkliveness(L,(o1)))
+
+
+
+
+/*
+** {======================================================
+** types and prototypes
+** =======================================================
+*/
+
+
+typedef TValue *StkId;  /* index to stack elements */
+
+
+
+
+/*
+** Header for string value; string bytes follow the end of this structure
+** (aligned according to 'UTString'; see next).
+*/
+typedef struct TString {
+  CommonHeader;
+  lu_byte extra;  /* reserved words for short strings; "has hash" for longs */
+  lu_byte shrlen;  /* length for short strings */
+  unsigned int hash;
+  union {
+    size_t lnglen;  /* length for long strings */
+    struct TString *hnext;  /* linked list for hash table */
+  } u;
+} TString;
+
+
+/*
+** Ensures that address after this type is always fully aligned.
+*/
+typedef union UTString {
+  L_Umaxalign dummy;  /* ensures maximum alignment for strings */
+  TString tsv;
+} UTString;
+
+
+/*
+** Get the actual string (array of bytes) from a 'TString'.
+** (Access to 'extra' ensures that value is really a 'TString'.)
+*/
+#define getstr(ts)  \
+  check_exp(sizeof((ts)->extra), cast(char *, (ts)) + sizeof(UTString))
+
+
+/* get the actual string (array of bytes) from a Lua value */
+#define svalue(o)       getstr(tsvalue(o))
+
+/* get string length from 'TString *s' */
+#define tsslen(s)	((s)->tt == LUA_TSHRSTR ? (s)->shrlen : (s)->u.lnglen)
+
+/* get string length from 'TValue *o' */
+#define vslen(o)	tsslen(tsvalue(o))
+
+
+/*
+** Header for userdata; memory area follows the end of this structure
+** (aligned according to 'UUdata'; see next).
+*/
+typedef struct Udata {
+  CommonHeader;
+  lu_byte ttuv_;  /* user value's tag */
+  struct Table *metatable;
+  size_t len;  /* number of bytes */
+  union Value user_;  /* user value */
+} Udata;
+
+
+/*
+** Ensures that address after this type is always fully aligned.
+*/
+typedef union UUdata {
+  L_Umaxalign dummy;  /* ensures maximum alignment for 'local' udata */
+  Udata uv;
+} UUdata;
+
+
+/*
+**  Get the address of memory block inside 'Udata'.
+** (Access to 'ttuv_' ensures that value is really a 'Udata'.)
+*/
+#define getudatamem(u)  \
+  check_exp(sizeof((u)->ttuv_), (cast(char*, (u)) + sizeof(UUdata)))
+
+#define setuservalue(L,u,o) \
+	{ const TValue *io=(o); Udata *iu = (u); \
+	  iu->user_ = io->value_; iu->ttuv_ = rttype(io); \
+	  checkliveness(L,io); }
+
+
+#define getuservalue(L,u,o) \
+	{ TValue *io=(o); const Udata *iu = (u); \
+	  io->value_ = iu->user_; settt_(io, iu->ttuv_); \
+	  checkliveness(L,io); }
+
+
+/*
+** Description of an upvalue for function prototypes
+*/
+typedef struct Upvaldesc {
+  TString *name;  /* upvalue name (for debug information) */
+  lu_byte instack;  /* whether it is in stack (register) */
+  lu_byte idx;  /* index of upvalue (in stack or in outer function's list) */
+} Upvaldesc;
+
+
+/*
+** Description of a local variable for function prototypes
+** (used for debug information)
+*/
+typedef struct LocVar {
+  TString *varname;
+  int startpc;  /* first point where variable is active */
+  int endpc;    /* first point where variable is dead */
+} LocVar;
+
+
+/*
+** Function Prototypes
+*/
+typedef struct Proto {
+  CommonHeader;
+  lu_byte numparams;  /* number of fixed parameters */
+  lu_byte is_vararg;
+  lu_byte maxstacksize;  /* number of registers needed by this function */
+  int sizeupvalues;  /* size of 'upvalues' */
+  int sizek;  /* size of 'k' */
+  int sizecode;
+  int sizelineinfo;
+  int sizep;  /* size of 'p' */
+  int sizelocvars;
+  int linedefined;  /* debug information  */
+  int lastlinedefined;  /* debug information  */
+  TValue *k;  /* constants used by the function */
+  Instruction *code;  /* opcodes */
+  struct Proto **p;  /* functions defined inside the function */
+  int *lineinfo;  /* map from opcodes to source lines (debug information) */
+  LocVar *locvars;  /* information about local variables (debug information) */
+  Upvaldesc *upvalues;  /* upvalue information */
+  struct LClosure *cache;  /* last-created closure with this prototype */
+  TString  *source;  /* used for debug information */
+  GCObject *gclist;
+} Proto;
+
+
+
+/*
+** Lua Upvalues
+*/
+typedef struct UpVal UpVal;
+
+
+/*
+** Closures
+*/
+
+#define ClosureHeader \
+	CommonHeader; lu_byte nupvalues; GCObject *gclist
+
+typedef struct CClosure {
+  ClosureHeader;
+  lua_CFunction f;
+  TValue upvalue[1];  /* list of upvalues */
+} CClosure;
+
+
+typedef struct LClosure {
+  ClosureHeader;
+  struct Proto *p;
+  UpVal *upvals[1];  /* list of upvalues */
+} LClosure;
+
+
+typedef union Closure {
+  CClosure c;
+  LClosure l;
+} Closure;
+
+
+#define isLfunction(o)	ttisLclosure(o)
+
+#define getproto(o)	(clLvalue(o)->p)
+
+
+/*
+** Tables
+*/
+
+typedef union TKey {
+  struct {
+    TValuefields;
+    int next;  /* for chaining (offset for next node) */
+  } nk;
+  TValue tvk;
+} TKey;
+
+
+/* copy a value into a key without messing up field 'next' */
+#define setnodekey(L,key,obj) \
+	{ TKey *k_=(key); const TValue *io_=(obj); \
+	  k_->nk.value_ = io_->value_; k_->nk.tt_ = io_->tt_; \
+	  (void)L; checkliveness(L,io_); }
+
+
+typedef struct Node {
+  TValue i_val;
+  TKey i_key;
+} Node;
+
+
+typedef struct Table {
+  CommonHeader;
+  lu_byte flags;  /* 1<<p means tagmethod(p) is not present */
+  lu_byte lsizenode;  /* log2 of size of 'node' array */
+  unsigned int sizearray;  /* size of 'array' array */
+  TValue *array;  /* array part */
+  Node *node;
+  Node *lastfree;  /* any free position is before this position */
+  struct Table *metatable;
+  GCObject *gclist;
+} Table;
+
+
+
+/*
+** 'module' operation for hashing (size is always a power of 2)
+*/
+#define lmod(s,size) \
+	(check_exp((size&(size-1))==0, (cast(int, (s) & ((size)-1)))))
+
+
+#define twoto(x)	(1<<(x))
+#define sizenode(t)	(twoto((t)->lsizenode))
+
+
+/*
+** (address of) a fixed nil value
+*/
+#define luaO_nilobject		(&luaO_nilobject_)
+
+
+LUAI_DDEC const TValue luaO_nilobject_;
+
+/* size of buffer for 'luaO_utf8esc' function */
+#define UTF8BUFFSZ	8
+
+LUAI_FUNC int luaO_int2fb (unsigned int x);
+LUAI_FUNC int luaO_fb2int (int x);
+LUAI_FUNC int luaO_utf8esc (char *buff, unsigned long x);
+LUAI_FUNC int luaO_ceillog2 (unsigned int x);
+LUAI_FUNC void luaO_arith (lua_State *L, int op, const TValue *p1,
+                           const TValue *p2, TValue *res);
+LUAI_FUNC size_t luaO_str2num (const char *s, TValue *o);
+LUAI_FUNC int luaO_hexavalue (int c);
+LUAI_FUNC void luaO_tostring (lua_State *L, StkId obj);
+LUAI_FUNC const char *luaO_pushvfstring (lua_State *L, const char *fmt,
+                                                       va_list argp);
+LUAI_FUNC const char *luaO_pushfstring (lua_State *L, const char *fmt, ...);
+LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t len);
+
+
+#endif
+
diff --git a/scite-app/scite/lua/src/lopcodes.c b/scite-app/scite/lua/src/lopcodes.c
new file mode 100644
index 0000000..a1cbef8
--- /dev/null
+++ b/scite-app/scite/lua/src/lopcodes.c
@@ -0,0 +1,124 @@
+/*
+** $Id: lopcodes.c,v 1.55 2015/01/05 13:48:33 roberto Exp $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lopcodes_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+
+#include "lopcodes.h"
+
+
+/* ORDER OP */
+
+LUAI_DDEF const char *const luaP_opnames[NUM_OPCODES+1] = {
+  "MOVE",
+  "LOADK",
+  "LOADKX",
+  "LOADBOOL",
+  "LOADNIL",
+  "GETUPVAL",
+  "GETTABUP",
+  "GETTABLE",
+  "SETTABUP",
+  "SETUPVAL",
+  "SETTABLE",
+  "NEWTABLE",
+  "SELF",
+  "ADD",
+  "SUB",
+  "MUL",
+  "MOD",
+  "POW",
+  "DIV",
+  "IDIV",
+  "BAND",
+  "BOR",
+  "BXOR",
+  "SHL",
+  "SHR",
+  "UNM",
+  "BNOT",
+  "NOT",
+  "LEN",
+  "CONCAT",
+  "JMP",
+  "EQ",
+  "LT",
+  "LE",
+  "TEST",
+  "TESTSET",
+  "CALL",
+  "TAILCALL",
+  "RETURN",
+  "FORLOOP",
+  "FORPREP",
+  "TFORCALL",
+  "TFORLOOP",
+  "SETLIST",
+  "CLOSURE",
+  "VARARG",
+  "EXTRAARG",
+  NULL
+};
+
+
+#define opmode(t,a,b,c,m) (((t)<<7) | ((a)<<6) | ((b)<<4) | ((c)<<2) | (m))
+
+LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
+/*       T  A    B       C     mode		   opcode	*/
+  opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_MOVE */
+ ,opmode(0, 1, OpArgK, OpArgN, iABx)		/* OP_LOADK */
+ ,opmode(0, 1, OpArgN, OpArgN, iABx)		/* OP_LOADKX */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_LOADBOOL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_LOADNIL */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_GETUPVAL */
+ ,opmode(0, 1, OpArgU, OpArgK, iABC)		/* OP_GETTABUP */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_GETTABLE */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABUP */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_SETUPVAL */
+ ,opmode(0, 0, OpArgK, OpArgK, iABC)		/* OP_SETTABLE */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_NEWTABLE */
+ ,opmode(0, 1, OpArgR, OpArgK, iABC)		/* OP_SELF */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_ADD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SUB */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MUL */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_MOD */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_POW */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_DIV */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_IDIV */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_BAND */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_BOR */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_BXOR */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SHL */
+ ,opmode(0, 1, OpArgK, OpArgK, iABC)		/* OP_SHR */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_UNM */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_BNOT */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_NOT */
+ ,opmode(0, 1, OpArgR, OpArgN, iABC)		/* OP_LEN */
+ ,opmode(0, 1, OpArgR, OpArgR, iABC)		/* OP_CONCAT */
+ ,opmode(0, 0, OpArgR, OpArgN, iAsBx)		/* OP_JMP */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_EQ */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LT */
+ ,opmode(1, 0, OpArgK, OpArgK, iABC)		/* OP_LE */
+ ,opmode(1, 0, OpArgN, OpArgU, iABC)		/* OP_TEST */
+ ,opmode(1, 1, OpArgR, OpArgU, iABC)		/* OP_TESTSET */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_CALL */
+ ,opmode(0, 1, OpArgU, OpArgU, iABC)		/* OP_TAILCALL */
+ ,opmode(0, 0, OpArgU, OpArgN, iABC)		/* OP_RETURN */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORLOOP */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_FORPREP */
+ ,opmode(0, 0, OpArgN, OpArgU, iABC)		/* OP_TFORCALL */
+ ,opmode(0, 1, OpArgR, OpArgN, iAsBx)		/* OP_TFORLOOP */
+ ,opmode(0, 0, OpArgU, OpArgU, iABC)		/* OP_SETLIST */
+ ,opmode(0, 1, OpArgU, OpArgN, iABx)		/* OP_CLOSURE */
+ ,opmode(0, 1, OpArgU, OpArgN, iABC)		/* OP_VARARG */
+ ,opmode(0, 0, OpArgU, OpArgU, iAx)		/* OP_EXTRAARG */
+};
+
diff --git a/scite-app/scite/lua/src/lopcodes.h b/scite-app/scite/lua/src/lopcodes.h
new file mode 100644
index 0000000..bbc4b61
--- /dev/null
+++ b/scite-app/scite/lua/src/lopcodes.h
@@ -0,0 +1,297 @@
+/*
+** $Id: lopcodes.h,v 1.149 2016/07/19 17:12:21 roberto Exp $
+** Opcodes for Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lopcodes_h
+#define lopcodes_h
+
+#include "llimits.h"
+
+
+/*===========================================================================
+  We assume that instructions are unsigned numbers.
+  All instructions have an opcode in the first 6 bits.
+  Instructions can have the following fields:
+	'A' : 8 bits
+	'B' : 9 bits
+	'C' : 9 bits
+	'Ax' : 26 bits ('A', 'B', and 'C' together)
+	'Bx' : 18 bits ('B' and 'C' together)
+	'sBx' : signed Bx
+
+  A signed argument is represented in excess K; that is, the number
+  value is the unsigned value minus K. K is exactly the maximum value
+  for that argument (so that -max is represented by 0, and +max is
+  represented by 2*max), which is half the maximum for the corresponding
+  unsigned argument.
+===========================================================================*/
+
+
+enum OpMode {iABC, iABx, iAsBx, iAx};  /* basic instruction format */
+
+
+/*
+** size and position of opcode arguments.
+*/
+#define SIZE_C		9
+#define SIZE_B		9
+#define SIZE_Bx		(SIZE_C + SIZE_B)
+#define SIZE_A		8
+#define SIZE_Ax		(SIZE_C + SIZE_B + SIZE_A)
+
+#define SIZE_OP		6
+
+#define POS_OP		0
+#define POS_A		(POS_OP + SIZE_OP)
+#define POS_C		(POS_A + SIZE_A)
+#define POS_B		(POS_C + SIZE_C)
+#define POS_Bx		POS_C
+#define POS_Ax		POS_A
+
+
+/*
+** limits for opcode arguments.
+** we use (signed) int to manipulate most arguments,
+** so they must fit in LUAI_BITSINT-1 bits (-1 for sign)
+*/
+#if SIZE_Bx < LUAI_BITSINT-1
+#define MAXARG_Bx        ((1<<SIZE_Bx)-1)
+#define MAXARG_sBx        (MAXARG_Bx>>1)         /* 'sBx' is signed */
+#else
+#define MAXARG_Bx        MAX_INT
+#define MAXARG_sBx        MAX_INT
+#endif
+
+#if SIZE_Ax < LUAI_BITSINT-1
+#define MAXARG_Ax	((1<<SIZE_Ax)-1)
+#else
+#define MAXARG_Ax	MAX_INT
+#endif
+
+
+#define MAXARG_A        ((1<<SIZE_A)-1)
+#define MAXARG_B        ((1<<SIZE_B)-1)
+#define MAXARG_C        ((1<<SIZE_C)-1)
+
+
+/* creates a mask with 'n' 1 bits at position 'p' */
+#define MASK1(n,p)	((~((~(Instruction)0)<<(n)))<<(p))
+
+/* creates a mask with 'n' 0 bits at position 'p' */
+#define MASK0(n,p)	(~MASK1(n,p))
+
+/*
+** the following macros help to manipulate instructions
+*/
+
+#define GET_OPCODE(i)	(cast(OpCode, ((i)>>POS_OP) & MASK1(SIZE_OP,0)))
+#define SET_OPCODE(i,o)	((i) = (((i)&MASK0(SIZE_OP,POS_OP)) | \
+		((cast(Instruction, o)<<POS_OP)&MASK1(SIZE_OP,POS_OP))))
+
+#define getarg(i,pos,size)	(cast(int, ((i)>>pos) & MASK1(size,0)))
+#define setarg(i,v,pos,size)	((i) = (((i)&MASK0(size,pos)) | \
+                ((cast(Instruction, v)<<pos)&MASK1(size,pos))))
+
+#define GETARG_A(i)	getarg(i, POS_A, SIZE_A)
+#define SETARG_A(i,v)	setarg(i, v, POS_A, SIZE_A)
+
+#define GETARG_B(i)	getarg(i, POS_B, SIZE_B)
+#define SETARG_B(i,v)	setarg(i, v, POS_B, SIZE_B)
+
+#define GETARG_C(i)	getarg(i, POS_C, SIZE_C)
+#define SETARG_C(i,v)	setarg(i, v, POS_C, SIZE_C)
+
+#define GETARG_Bx(i)	getarg(i, POS_Bx, SIZE_Bx)
+#define SETARG_Bx(i,v)	setarg(i, v, POS_Bx, SIZE_Bx)
+
+#define GETARG_Ax(i)	getarg(i, POS_Ax, SIZE_Ax)
+#define SETARG_Ax(i,v)	setarg(i, v, POS_Ax, SIZE_Ax)
+
+#define GETARG_sBx(i)	(GETARG_Bx(i)-MAXARG_sBx)
+#define SETARG_sBx(i,b)	SETARG_Bx((i),cast(unsigned int, (b)+MAXARG_sBx))
+
+
+#define CREATE_ABC(o,a,b,c)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, b)<<POS_B) \
+			| (cast(Instruction, c)<<POS_C))
+
+#define CREATE_ABx(o,a,bc)	((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_A) \
+			| (cast(Instruction, bc)<<POS_Bx))
+
+#define CREATE_Ax(o,a)		((cast(Instruction, o)<<POS_OP) \
+			| (cast(Instruction, a)<<POS_Ax))
+
+
+/*
+** Macros to operate RK indices
+*/
+
+/* this bit 1 means constant (0 means register) */
+#define BITRK		(1 << (SIZE_B - 1))
+
+/* test whether value is a constant */
+#define ISK(x)		((x) & BITRK)
+
+/* gets the index of the constant */
+#define INDEXK(r)	((int)(r) & ~BITRK)
+
+#if !defined(MAXINDEXRK)  /* (for debugging only) */
+#define MAXINDEXRK	(BITRK - 1)
+#endif
+
+/* code a constant index as a RK value */
+#define RKASK(x)	((x) | BITRK)
+
+
+/*
+** invalid register that fits in 8 bits
+*/
+#define NO_REG		MAXARG_A
+
+
+/*
+** R(x) - register
+** Kst(x) - constant (in constant table)
+** RK(x) == if ISK(x) then Kst(INDEXK(x)) else R(x)
+*/
+
+
+/*
+** grep "ORDER OP" if you change these enums
+*/
+
+typedef enum {
+/*----------------------------------------------------------------------
+name		args	description
+------------------------------------------------------------------------*/
+OP_MOVE,/*	A B	R(A) := R(B)					*/
+OP_LOADK,/*	A Bx	R(A) := Kst(Bx)					*/
+OP_LOADKX,/*	A 	R(A) := Kst(extra arg)				*/
+OP_LOADBOOL,/*	A B C	R(A) := (Bool)B; if (C) pc++			*/
+OP_LOADNIL,/*	A B	R(A), R(A+1), ..., R(A+B) := nil		*/
+OP_GETUPVAL,/*	A B	R(A) := UpValue[B]				*/
+
+OP_GETTABUP,/*	A B C	R(A) := UpValue[B][RK(C)]			*/
+OP_GETTABLE,/*	A B C	R(A) := R(B)[RK(C)]				*/
+
+OP_SETTABUP,/*	A B C	UpValue[A][RK(B)] := RK(C)			*/
+OP_SETUPVAL,/*	A B	UpValue[B] := R(A)				*/
+OP_SETTABLE,/*	A B C	R(A)[RK(B)] := RK(C)				*/
+
+OP_NEWTABLE,/*	A B C	R(A) := {} (size = B,C)				*/
+
+OP_SELF,/*	A B C	R(A+1) := R(B); R(A) := R(B)[RK(C)]		*/
+
+OP_ADD,/*	A B C	R(A) := RK(B) + RK(C)				*/
+OP_SUB,/*	A B C	R(A) := RK(B) - RK(C)				*/
+OP_MUL,/*	A B C	R(A) := RK(B) * RK(C)				*/
+OP_MOD,/*	A B C	R(A) := RK(B) % RK(C)				*/
+OP_POW,/*	A B C	R(A) := RK(B) ^ RK(C)				*/
+OP_DIV,/*	A B C	R(A) := RK(B) / RK(C)				*/
+OP_IDIV,/*	A B C	R(A) := RK(B) // RK(C)				*/
+OP_BAND,/*	A B C	R(A) := RK(B) & RK(C)				*/
+OP_BOR,/*	A B C	R(A) := RK(B) | RK(C)				*/
+OP_BXOR,/*	A B C	R(A) := RK(B) ~ RK(C)				*/
+OP_SHL,/*	A B C	R(A) := RK(B) << RK(C)				*/
+OP_SHR,/*	A B C	R(A) := RK(B) >> RK(C)				*/
+OP_UNM,/*	A B	R(A) := -R(B)					*/
+OP_BNOT,/*	A B	R(A) := ~R(B)					*/
+OP_NOT,/*	A B	R(A) := not R(B)				*/
+OP_LEN,/*	A B	R(A) := length of R(B)				*/
+
+OP_CONCAT,/*	A B C	R(A) := R(B).. ... ..R(C)			*/
+
+OP_JMP,/*	A sBx	pc+=sBx; if (A) close all upvalues >= R(A - 1)	*/
+OP_EQ,/*	A B C	if ((RK(B) == RK(C)) ~= A) then pc++		*/
+OP_LT,/*	A B C	if ((RK(B) <  RK(C)) ~= A) then pc++		*/
+OP_LE,/*	A B C	if ((RK(B) <= RK(C)) ~= A) then pc++		*/
+
+OP_TEST,/*	A C	if not (R(A) <=> C) then pc++			*/
+OP_TESTSET,/*	A B C	if (R(B) <=> C) then R(A) := R(B) else pc++	*/
+
+OP_CALL,/*	A B C	R(A), ... ,R(A+C-2) := R(A)(R(A+1), ... ,R(A+B-1)) */
+OP_TAILCALL,/*	A B C	return R(A)(R(A+1), ... ,R(A+B-1))		*/
+OP_RETURN,/*	A B	return R(A), ... ,R(A+B-2)	(see note)	*/
+
+OP_FORLOOP,/*	A sBx	R(A)+=R(A+2);
+			if R(A) <?= R(A+1) then { pc+=sBx; R(A+3)=R(A) }*/
+OP_FORPREP,/*	A sBx	R(A)-=R(A+2); pc+=sBx				*/
+
+OP_TFORCALL,/*	A C	R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));	*/
+OP_TFORLOOP,/*	A sBx	if R(A+1) ~= nil then { R(A)=R(A+1); pc += sBx }*/
+
+OP_SETLIST,/*	A B C	R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B	*/
+
+OP_CLOSURE,/*	A Bx	R(A) := closure(KPROTO[Bx])			*/
+
+OP_VARARG,/*	A B	R(A), R(A+1), ..., R(A+B-2) = vararg		*/
+
+OP_EXTRAARG/*	Ax	extra (larger) argument for previous opcode	*/
+} OpCode;
+
+
+#define NUM_OPCODES	(cast(int, OP_EXTRAARG) + 1)
+
+
+
+/*===========================================================================
+  Notes:
+  (*) In OP_CALL, if (B == 0) then B = top. If (C == 0), then 'top' is
+  set to last_result+1, so next open instruction (OP_CALL, OP_RETURN,
+  OP_SETLIST) may use 'top'.
+
+  (*) In OP_VARARG, if (B == 0) then use actual number of varargs and
+  set top (like in OP_CALL with C == 0).
+
+  (*) In OP_RETURN, if (B == 0) then return up to 'top'.
+
+  (*) In OP_SETLIST, if (B == 0) then B = 'top'; if (C == 0) then next
+  'instruction' is EXTRAARG(real C).
+
+  (*) In OP_LOADKX, the next 'instruction' is always EXTRAARG.
+
+  (*) For comparisons, A specifies what condition the test should accept
+  (true or false).
+
+  (*) All 'skips' (pc++) assume that next instruction is a jump.
+
+===========================================================================*/
+
+
+/*
+** masks for instruction properties. The format is:
+** bits 0-1: op mode
+** bits 2-3: C arg mode
+** bits 4-5: B arg mode
+** bit 6: instruction set register A
+** bit 7: operator is a test (next instruction must be a jump)
+*/
+
+enum OpArgMask {
+  OpArgN,  /* argument is not used */
+  OpArgU,  /* argument is used */
+  OpArgR,  /* argument is a register or a jump offset */
+  OpArgK   /* argument is a constant or register/constant */
+};
+
+LUAI_DDEC const lu_byte luaP_opmodes[NUM_OPCODES];
+
+#define getOpMode(m)	(cast(enum OpMode, luaP_opmodes[m] & 3))
+#define getBMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 4) & 3))
+#define getCMode(m)	(cast(enum OpArgMask, (luaP_opmodes[m] >> 2) & 3))
+#define testAMode(m)	(luaP_opmodes[m] & (1 << 6))
+#define testTMode(m)	(luaP_opmodes[m] & (1 << 7))
+
+
+LUAI_DDEC const char *const luaP_opnames[NUM_OPCODES+1];  /* opcode names */
+
+
+/* number of list items to accumulate before a SETLIST instruction */
+#define LFIELDS_PER_FLUSH	50
+
+
+#endif
diff --git a/scite-app/scite/lua/src/loslib.c b/scite-app/scite/lua/src/loslib.c
new file mode 100644
index 0000000..5a94eb9
--- /dev/null
+++ b/scite-app/scite/lua/src/loslib.c
@@ -0,0 +1,407 @@
+/*
+** $Id: loslib.c,v 1.65 2016/07/18 17:58:58 roberto Exp $
+** Standard Operating System library
+** See Copyright Notice in lua.h
+*/
+
+#define loslib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** {==================================================================
+** List of valid conversion specifiers for the 'strftime' function;
+** options are grouped by length; group of length 2 start with '||'.
+** ===================================================================
+*/
+#if !defined(LUA_STRFTIMEOPTIONS)	/* { */
+
+/* options for ANSI C 89 (only 1-char options) */
+#define L_STRFTIMEC89		"aAbBcdHIjmMpSUwWxXyYZ%"
+
+/* options for ISO C 99 and POSIX */
+#define L_STRFTIMEC99 "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%" \
+    "||" "EcECExEXEyEY" "OdOeOHOIOmOMOSOuOUOVOwOWOy"  /* two-char options */
+
+/* options for Windows */
+#define L_STRFTIMEWIN "aAbBcdHIjmMpSUwWxXyYzZ%" \
+    "||" "#c#x#d#H#I#j#m#M#S#U#w#W#y#Y"  /* two-char options */
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_STRFTIMEOPTIONS	L_STRFTIMEWIN
+#elif defined(LUA_USE_C89)
+#define LUA_STRFTIMEOPTIONS	L_STRFTIMEC89
+#else  /* C99 specification */
+#define LUA_STRFTIMEOPTIONS	L_STRFTIMEC99
+#endif
+
+#endif					/* } */
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for time-related stuff
+** ===================================================================
+*/
+
+#if !defined(l_time_t)		/* { */
+/*
+** type to represent time_t in Lua
+*/
+#define l_timet			lua_Integer
+#define l_pushtime(L,t)		lua_pushinteger(L,(lua_Integer)(t))
+
+static time_t l_checktime (lua_State *L, int arg) {
+  lua_Integer t = luaL_checkinteger(L, arg);
+  luaL_argcheck(L, (time_t)t == t, arg, "time out-of-bounds");
+  return (time_t)t;
+}
+
+#endif				/* } */
+
+
+#if !defined(l_gmtime)		/* { */
+/*
+** By default, Lua uses gmtime/localtime, except when POSIX is available,
+** where it uses gmtime_r/localtime_r
+*/
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#define l_gmtime(t,r)		gmtime_r(t,r)
+#define l_localtime(t,r)	localtime_r(t,r)
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define l_gmtime(t,r)		((void)(r)->tm_sec, gmtime(t))
+#define l_localtime(t,r)  	((void)(r)->tm_sec, localtime(t))
+
+#endif				/* } */
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Configuration for 'tmpnam':
+** By default, Lua uses tmpnam except when POSIX is available, where
+** it uses mkstemp.
+** ===================================================================
+*/
+#if !defined(lua_tmpnam)	/* { */
+
+#if defined(LUA_USE_POSIX)	/* { */
+
+#include <unistd.h>
+
+#define LUA_TMPNAMBUFSIZE	32
+
+#if !defined(LUA_TMPNAMTEMPLATE)
+#define LUA_TMPNAMTEMPLATE	"/tmp/lua_XXXXXX"
+#endif
+
+#define lua_tmpnam(b,e) { \
+        strcpy(b, LUA_TMPNAMTEMPLATE); \
+        e = mkstemp(b); \
+        if (e != -1) close(e); \
+        e = (e == -1); }
+
+#else				/* }{ */
+
+/* ISO C definitions */
+#define LUA_TMPNAMBUFSIZE	L_tmpnam
+#define lua_tmpnam(b,e)		{ e = (tmpnam(b) == NULL); }
+
+#endif				/* } */
+
+#endif				/* } */
+/* }================================================================== */
+
+
+
+
+static int os_execute (lua_State *L) {
+  const char *cmd = luaL_optstring(L, 1, NULL);
+  int stat = system(cmd);
+  if (cmd != NULL)
+    return luaL_execresult(L, stat);
+  else {
+    lua_pushboolean(L, stat);  /* true if there is a shell */
+    return 1;
+  }
+}
+
+
+static int os_remove (lua_State *L) {
+  const char *filename = luaL_checkstring(L, 1);
+  return luaL_fileresult(L, remove(filename) == 0, filename);
+}
+
+
+static int os_rename (lua_State *L) {
+  const char *fromname = luaL_checkstring(L, 1);
+  const char *toname = luaL_checkstring(L, 2);
+  return luaL_fileresult(L, rename(fromname, toname) == 0, NULL);
+}
+
+
+static int os_tmpname (lua_State *L) {
+  char buff[LUA_TMPNAMBUFSIZE];
+  int err;
+  lua_tmpnam(buff, err);
+  if (err)
+    return luaL_error(L, "unable to generate a unique filename");
+  lua_pushstring(L, buff);
+  return 1;
+}
+
+
+static int os_getenv (lua_State *L) {
+  lua_pushstring(L, getenv(luaL_checkstring(L, 1)));  /* if NULL push nil */
+  return 1;
+}
+
+
+static int os_clock (lua_State *L) {
+  lua_pushnumber(L, ((lua_Number)clock())/(lua_Number)CLOCKS_PER_SEC);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Time/Date operations
+** { year=%Y, month=%m, day=%d, hour=%H, min=%M, sec=%S,
+**   wday=%w+1, yday=%j, isdst=? }
+** =======================================================
+*/
+
+static void setfield (lua_State *L, const char *key, int value) {
+  lua_pushinteger(L, value);
+  lua_setfield(L, -2, key);
+}
+
+static void setboolfield (lua_State *L, const char *key, int value) {
+  if (value < 0)  /* undefined? */
+    return;  /* does not set field */
+  lua_pushboolean(L, value);
+  lua_setfield(L, -2, key);
+}
+
+
+/*
+** Set all fields from structure 'tm' in the table on top of the stack
+*/
+static void setallfields (lua_State *L, struct tm *stm) {
+  setfield(L, "sec", stm->tm_sec);
+  setfield(L, "min", stm->tm_min);
+  setfield(L, "hour", stm->tm_hour);
+  setfield(L, "day", stm->tm_mday);
+  setfield(L, "month", stm->tm_mon + 1);
+  setfield(L, "year", stm->tm_year + 1900);
+  setfield(L, "wday", stm->tm_wday + 1);
+  setfield(L, "yday", stm->tm_yday + 1);
+  setboolfield(L, "isdst", stm->tm_isdst);
+}
+
+
+static int getboolfield (lua_State *L, const char *key) {
+  int res;
+  res = (lua_getfield(L, -1, key) == LUA_TNIL) ? -1 : lua_toboolean(L, -1);
+  lua_pop(L, 1);
+  return res;
+}
+
+
+/* maximum value for date fields (to avoid arithmetic overflows with 'int') */
+#if !defined(L_MAXDATEFIELD)
+#define L_MAXDATEFIELD	(INT_MAX / 2)
+#endif
+
+static int getfield (lua_State *L, const char *key, int d, int delta) {
+  int isnum;
+  int t = lua_getfield(L, -1, key);  /* get field and its type */
+  lua_Integer res = lua_tointegerx(L, -1, &isnum);
+  if (!isnum) {  /* field is not an integer? */
+    if (t != LUA_TNIL)  /* some other value? */
+      return luaL_error(L, "field '%s' is not an integer", key);
+    else if (d < 0)  /* absent field; no default? */
+      return luaL_error(L, "field '%s' missing in date table", key);
+    res = d;
+  }
+  else {
+    if (!(-L_MAXDATEFIELD <= res && res <= L_MAXDATEFIELD))
+      return luaL_error(L, "field '%s' is out-of-bound", key);
+    res -= delta;
+  }
+  lua_pop(L, 1);
+  return (int)res;
+}
+
+
+static const char *checkoption (lua_State *L, const char *conv,
+                                ptrdiff_t convlen, char *buff) {
+  const char *option = LUA_STRFTIMEOPTIONS;
+  int oplen = 1;  /* length of options being checked */
+  for (; *option != '\0' && oplen <= convlen; option += oplen) {
+    if (*option == '|')  /* next block? */
+      oplen++;  /* will check options with next length (+1) */
+    else if (memcmp(conv, option, oplen) == 0) {  /* match? */
+      memcpy(buff, conv, oplen);  /* copy valid option to buffer */
+      buff[oplen] = '\0';
+      return conv + oplen;  /* return next item */
+    }
+  }
+  luaL_argerror(L, 1,
+    lua_pushfstring(L, "invalid conversion specifier '%%%s'", conv));
+  return conv;  /* to avoid warnings */
+}
+
+
+/* maximum size for an individual 'strftime' item */
+#define SIZETIMEFMT	250
+
+
+static int os_date (lua_State *L) {
+  size_t slen;
+  const char *s = luaL_optlstring(L, 1, "%c", &slen);
+  time_t t = luaL_opt(L, l_checktime, 2, time(NULL));
+  const char *se = s + slen;  /* 's' end */
+  struct tm tmr, *stm;
+  if (*s == '!') {  /* UTC? */
+    stm = l_gmtime(&t, &tmr);
+    s++;  /* skip '!' */
+  }
+  else
+    stm = l_localtime(&t, &tmr);
+  if (stm == NULL)  /* invalid date? */
+    luaL_error(L, "time result cannot be represented in this installation");
+  if (strcmp(s, "*t") == 0) {
+    lua_createtable(L, 0, 9);  /* 9 = number of fields */
+    setallfields(L, stm);
+  }
+  else {
+    char cc[4];  /* buffer for individual conversion specifiers */
+    luaL_Buffer b;
+    cc[0] = '%';
+    luaL_buffinit(L, &b);
+    while (s < se) {
+      if (*s != '%')  /* not a conversion specifier? */
+        luaL_addchar(&b, *s++);
+      else {
+        size_t reslen;
+        char *buff = luaL_prepbuffsize(&b, SIZETIMEFMT);
+        s++;  /* skip '%' */
+        s = checkoption(L, s, se - s, cc + 1);  /* copy specifier to 'cc' */
+        reslen = strftime(buff, SIZETIMEFMT, cc, stm);
+        luaL_addsize(&b, reslen);
+      }
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+static int os_time (lua_State *L) {
+  time_t t;
+  if (lua_isnoneornil(L, 1))  /* called without args? */
+    t = time(NULL);  /* get current time */
+  else {
+    struct tm ts;
+    luaL_checktype(L, 1, LUA_TTABLE);
+    lua_settop(L, 1);  /* make sure table is at the top */
+    ts.tm_sec = getfield(L, "sec", 0, 0);
+    ts.tm_min = getfield(L, "min", 0, 0);
+    ts.tm_hour = getfield(L, "hour", 12, 0);
+    ts.tm_mday = getfield(L, "day", -1, 0);
+    ts.tm_mon = getfield(L, "month", -1, 1);
+    ts.tm_year = getfield(L, "year", -1, 1900);
+    ts.tm_isdst = getboolfield(L, "isdst");
+    t = mktime(&ts);
+    setallfields(L, &ts);  /* update fields with normalized values */
+  }
+  if (t != (time_t)(l_timet)t || t == (time_t)(-1))
+    luaL_error(L, "time result cannot be represented in this installation");
+  l_pushtime(L, t);
+  return 1;
+}
+
+
+static int os_difftime (lua_State *L) {
+  time_t t1 = l_checktime(L, 1);
+  time_t t2 = l_checktime(L, 2);
+  lua_pushnumber(L, (lua_Number)difftime(t1, t2));
+  return 1;
+}
+
+/* }====================================================== */
+
+
+static int os_setlocale (lua_State *L) {
+  static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
+                      LC_NUMERIC, LC_TIME};
+  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
+     "numeric", "time", NULL};
+  const char *l = luaL_optstring(L, 1, NULL);
+  int op = luaL_checkoption(L, 2, "all", catnames);
+  lua_pushstring(L, setlocale(cat[op], l));
+  return 1;
+}
+
+
+static int os_exit (lua_State *L) {
+  int status;
+  if (lua_isboolean(L, 1))
+    status = (lua_toboolean(L, 1) ? EXIT_SUCCESS : EXIT_FAILURE);
+  else
+    status = (int)luaL_optinteger(L, 1, EXIT_SUCCESS);
+  if (lua_toboolean(L, 2))
+    lua_close(L);
+  if (L) exit(status);  /* 'if' to avoid warnings for unreachable 'return' */
+  return 0;
+}
+
+
+static const luaL_Reg syslib[] = {
+  {"clock",     os_clock},
+  {"date",      os_date},
+  {"difftime",  os_difftime},
+  {"execute",   os_execute},
+  {"exit",      os_exit},
+  {"getenv",    os_getenv},
+  {"remove",    os_remove},
+  {"rename",    os_rename},
+  {"setlocale", os_setlocale},
+  {"time",      os_time},
+  {"tmpname",   os_tmpname},
+  {NULL, NULL}
+};
+
+/* }====================================================== */
+
+
+
+LUAMOD_API int luaopen_os (lua_State *L) {
+  luaL_newlib(L, syslib);
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/lparser.c b/scite-app/scite/lua/src/lparser.c
new file mode 100644
index 0000000..cd4512d
--- /dev/null
+++ b/scite-app/scite/lua/src/lparser.c
@@ -0,0 +1,1650 @@
+/*
+** $Id: lparser.c,v 2.155 2016/08/01 19:51:24 roberto Exp $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#define lparser_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "lcode.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lparser.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+
+
+
+/* maximum number of local variables per function (must be smaller
+   than 250, due to the bytecode format) */
+#define MAXVARS		200
+
+
+#define hasmultret(k)		((k) == VCALL || (k) == VVARARG)
+
+
+/* because all strings are unified by the scanner, the parser
+   can use pointer equality for string equality */
+#define eqstr(a,b)	((a) == (b))
+
+
+/*
+** nodes for block list (list of active blocks)
+*/
+typedef struct BlockCnt {
+  struct BlockCnt *previous;  /* chain */
+  int firstlabel;  /* index of first label in this block */
+  int firstgoto;  /* index of first pending goto in this block */
+  lu_byte nactvar;  /* # active locals outside the block */
+  lu_byte upval;  /* true if some variable in the block is an upvalue */
+  lu_byte isloop;  /* true if 'block' is a loop */
+} BlockCnt;
+
+
+
+/*
+** prototypes for recursive non-terminal functions
+*/
+static void statement (LexState *ls);
+static void expr (LexState *ls, expdesc *v);
+
+
+/* semantic error */
+static l_noret semerror (LexState *ls, const char *msg) {
+  ls->t.token = 0;  /* remove "near <token>" from final message */
+  luaX_syntaxerror(ls, msg);
+}
+
+
+static l_noret error_expected (LexState *ls, int token) {
+  luaX_syntaxerror(ls,
+      luaO_pushfstring(ls->L, "%s expected", luaX_token2str(ls, token)));
+}
+
+
+static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
+  lua_State *L = fs->ls->L;
+  const char *msg;
+  int line = fs->f->linedefined;
+  const char *where = (line == 0)
+                      ? "main function"
+                      : luaO_pushfstring(L, "function at line %d", line);
+  msg = luaO_pushfstring(L, "too many %s (limit is %d) in %s",
+                             what, limit, where);
+  luaX_syntaxerror(fs->ls, msg);
+}
+
+
+static void checklimit (FuncState *fs, int v, int l, const char *what) {
+  if (v > l) errorlimit(fs, l, what);
+}
+
+
+static int testnext (LexState *ls, int c) {
+  if (ls->t.token == c) {
+    luaX_next(ls);
+    return 1;
+  }
+  else return 0;
+}
+
+
+static void check (LexState *ls, int c) {
+  if (ls->t.token != c)
+    error_expected(ls, c);
+}
+
+
+static void checknext (LexState *ls, int c) {
+  check(ls, c);
+  luaX_next(ls);
+}
+
+
+#define check_condition(ls,c,msg)	{ if (!(c)) luaX_syntaxerror(ls, msg); }
+
+
+
+static void check_match (LexState *ls, int what, int who, int where) {
+  if (!testnext(ls, what)) {
+    if (where == ls->linenumber)
+      error_expected(ls, what);
+    else {
+      luaX_syntaxerror(ls, luaO_pushfstring(ls->L,
+             "%s expected (to close %s at line %d)",
+              luaX_token2str(ls, what), luaX_token2str(ls, who), where));
+    }
+  }
+}
+
+
+static TString *str_checkname (LexState *ls) {
+  TString *ts;
+  check(ls, TK_NAME);
+  ts = ls->t.seminfo.ts;
+  luaX_next(ls);
+  return ts;
+}
+
+
+static void init_exp (expdesc *e, expkind k, int i) {
+  e->f = e->t = NO_JUMP;
+  e->k = k;
+  e->u.info = i;
+}
+
+
+static void codestring (LexState *ls, expdesc *e, TString *s) {
+  init_exp(e, VK, luaK_stringK(ls->fs, s));
+}
+
+
+static void checkname (LexState *ls, expdesc *e) {
+  codestring(ls, e, str_checkname(ls));
+}
+
+
+static int registerlocalvar (LexState *ls, TString *varname) {
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  int oldsize = f->sizelocvars;
+  luaM_growvector(ls->L, f->locvars, fs->nlocvars, f->sizelocvars,
+                  LocVar, SHRT_MAX, "local variables");
+  while (oldsize < f->sizelocvars)
+    f->locvars[oldsize++].varname = NULL;
+  f->locvars[fs->nlocvars].varname = varname;
+  luaC_objbarrier(ls->L, f, varname);
+  return fs->nlocvars++;
+}
+
+
+static void new_localvar (LexState *ls, TString *name) {
+  FuncState *fs = ls->fs;
+  Dyndata *dyd = ls->dyd;
+  int reg = registerlocalvar(ls, name);
+  checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
+                  MAXVARS, "local variables");
+  luaM_growvector(ls->L, dyd->actvar.arr, dyd->actvar.n + 1,
+                  dyd->actvar.size, Vardesc, MAX_INT, "local variables");
+  dyd->actvar.arr[dyd->actvar.n++].idx = cast(short, reg);
+}
+
+
+static void new_localvarliteral_ (LexState *ls, const char *name, size_t sz) {
+  new_localvar(ls, luaX_newstring(ls, name, sz));
+}
+
+#define new_localvarliteral(ls,v) \
+	new_localvarliteral_(ls, "" v, (sizeof(v)/sizeof(char))-1)
+
+
+static LocVar *getlocvar (FuncState *fs, int i) {
+  int idx = fs->ls->dyd->actvar.arr[fs->firstlocal + i].idx;
+  lua_assert(idx < fs->nlocvars);
+  return &fs->f->locvars[idx];
+}
+
+
+static void adjustlocalvars (LexState *ls, int nvars) {
+  FuncState *fs = ls->fs;
+  fs->nactvar = cast_byte(fs->nactvar + nvars);
+  for (; nvars; nvars--) {
+    getlocvar(fs, fs->nactvar - nvars)->startpc = fs->pc;
+  }
+}
+
+
+static void removevars (FuncState *fs, int tolevel) {
+  fs->ls->dyd->actvar.n -= (fs->nactvar - tolevel);
+  while (fs->nactvar > tolevel)
+    getlocvar(fs, --fs->nactvar)->endpc = fs->pc;
+}
+
+
+static int searchupvalue (FuncState *fs, TString *name) {
+  int i;
+  Upvaldesc *up = fs->f->upvalues;
+  for (i = 0; i < fs->nups; i++) {
+    if (eqstr(up[i].name, name)) return i;
+  }
+  return -1;  /* not found */
+}
+
+
+static int newupvalue (FuncState *fs, TString *name, expdesc *v) {
+  Proto *f = fs->f;
+  int oldsize = f->sizeupvalues;
+  checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
+  luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
+                  Upvaldesc, MAXUPVAL, "upvalues");
+  while (oldsize < f->sizeupvalues)
+    f->upvalues[oldsize++].name = NULL;
+  f->upvalues[fs->nups].instack = (v->k == VLOCAL);
+  f->upvalues[fs->nups].idx = cast_byte(v->u.info);
+  f->upvalues[fs->nups].name = name;
+  luaC_objbarrier(fs->ls->L, f, name);
+  return fs->nups++;
+}
+
+
+static int searchvar (FuncState *fs, TString *n) {
+  int i;
+  for (i = cast_int(fs->nactvar) - 1; i >= 0; i--) {
+    if (eqstr(n, getlocvar(fs, i)->varname))
+      return i;
+  }
+  return -1;  /* not found */
+}
+
+
+/*
+  Mark block where variable at given level was defined
+  (to emit close instructions later).
+*/
+static void markupval (FuncState *fs, int level) {
+  BlockCnt *bl = fs->bl;
+  while (bl->nactvar > level)
+    bl = bl->previous;
+  bl->upval = 1;
+}
+
+
+/*
+  Find variable with given name 'n'. If it is an upvalue, add this
+  upvalue into all intermediate functions.
+*/
+static void singlevaraux (FuncState *fs, TString *n, expdesc *var, int base) {
+  if (fs == NULL)  /* no more levels? */
+    init_exp(var, VVOID, 0);  /* default is global */
+  else {
+    int v = searchvar(fs, n);  /* look up locals at current level */
+    if (v >= 0) {  /* found? */
+      init_exp(var, VLOCAL, v);  /* variable is local */
+      if (!base)
+        markupval(fs, v);  /* local will be used as an upval */
+    }
+    else {  /* not found as local at current level; try upvalues */
+      int idx = searchupvalue(fs, n);  /* try existing upvalues */
+      if (idx < 0) {  /* not found? */
+        singlevaraux(fs->prev, n, var, 0);  /* try upper levels */
+        if (var->k == VVOID)  /* not found? */
+          return;  /* it is a global */
+        /* else was LOCAL or UPVAL */
+        idx  = newupvalue(fs, n, var);  /* will be a new upvalue */
+      }
+      init_exp(var, VUPVAL, idx);  /* new or old upvalue */
+    }
+  }
+}
+
+
+static void singlevar (LexState *ls, expdesc *var) {
+  TString *varname = str_checkname(ls);
+  FuncState *fs = ls->fs;
+  singlevaraux(fs, varname, var, 1);
+  if (var->k == VVOID) {  /* global name? */
+    expdesc key;
+    singlevaraux(fs, ls->envn, var, 1);  /* get environment variable */
+    lua_assert(var->k != VVOID);  /* this one must exist */
+    codestring(ls, &key, varname);  /* key is variable name */
+    luaK_indexed(fs, var, &key);  /* env[varname] */
+  }
+}
+
+
+static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
+  FuncState *fs = ls->fs;
+  int extra = nvars - nexps;
+  if (hasmultret(e->k)) {
+    extra++;  /* includes call itself */
+    if (extra < 0) extra = 0;
+    luaK_setreturns(fs, e, extra);  /* last exp. provides the difference */
+    if (extra > 1) luaK_reserveregs(fs, extra-1);
+  }
+  else {
+    if (e->k != VVOID) luaK_exp2nextreg(fs, e);  /* close last expression */
+    if (extra > 0) {
+      int reg = fs->freereg;
+      luaK_reserveregs(fs, extra);
+      luaK_nil(fs, reg, extra);
+    }
+  }
+  if (nexps > nvars)
+    ls->fs->freereg -= nexps - nvars;  /* remove extra values */
+}
+
+
+static void enterlevel (LexState *ls) {
+  lua_State *L = ls->L;
+  ++L->nCcalls;
+  checklimit(ls->fs, L->nCcalls, LUAI_MAXCCALLS, "C levels");
+}
+
+
+#define leavelevel(ls)	((ls)->L->nCcalls--)
+
+
+static void closegoto (LexState *ls, int g, Labeldesc *label) {
+  int i;
+  FuncState *fs = ls->fs;
+  Labellist *gl = &ls->dyd->gt;
+  Labeldesc *gt = &gl->arr[g];
+  lua_assert(eqstr(gt->name, label->name));
+  if (gt->nactvar < label->nactvar) {
+    TString *vname = getlocvar(fs, gt->nactvar)->varname;
+    const char *msg = luaO_pushfstring(ls->L,
+      "<goto %s> at line %d jumps into the scope of local '%s'",
+      getstr(gt->name), gt->line, getstr(vname));
+    semerror(ls, msg);
+  }
+  luaK_patchlist(fs, gt->pc, label->pc);
+  /* remove goto from pending list */
+  for (i = g; i < gl->n - 1; i++)
+    gl->arr[i] = gl->arr[i + 1];
+  gl->n--;
+}
+
+
+/*
+** try to close a goto with existing labels; this solves backward jumps
+*/
+static int findlabel (LexState *ls, int g) {
+  int i;
+  BlockCnt *bl = ls->fs->bl;
+  Dyndata *dyd = ls->dyd;
+  Labeldesc *gt = &dyd->gt.arr[g];
+  /* check labels in current block for a match */
+  for (i = bl->firstlabel; i < dyd->label.n; i++) {
+    Labeldesc *lb = &dyd->label.arr[i];
+    if (eqstr(lb->name, gt->name)) {  /* correct label? */
+      if (gt->nactvar > lb->nactvar &&
+          (bl->upval || dyd->label.n > bl->firstlabel))
+        luaK_patchclose(ls->fs, gt->pc, lb->nactvar);
+      closegoto(ls, g, lb);  /* close it */
+      return 1;
+    }
+  }
+  return 0;  /* label not found; cannot close goto */
+}
+
+
+static int newlabelentry (LexState *ls, Labellist *l, TString *name,
+                          int line, int pc) {
+  int n = l->n;
+  luaM_growvector(ls->L, l->arr, n, l->size,
+                  Labeldesc, SHRT_MAX, "labels/gotos");
+  l->arr[n].name = name;
+  l->arr[n].line = line;
+  l->arr[n].nactvar = ls->fs->nactvar;
+  l->arr[n].pc = pc;
+  l->n = n + 1;
+  return n;
+}
+
+
+/*
+** check whether new label 'lb' matches any pending gotos in current
+** block; solves forward jumps
+*/
+static void findgotos (LexState *ls, Labeldesc *lb) {
+  Labellist *gl = &ls->dyd->gt;
+  int i = ls->fs->bl->firstgoto;
+  while (i < gl->n) {
+    if (eqstr(gl->arr[i].name, lb->name))
+      closegoto(ls, i, lb);
+    else
+      i++;
+  }
+}
+
+
+/*
+** export pending gotos to outer level, to check them against
+** outer labels; if the block being exited has upvalues, and
+** the goto exits the scope of any variable (which can be the
+** upvalue), close those variables being exited.
+*/
+static void movegotosout (FuncState *fs, BlockCnt *bl) {
+  int i = bl->firstgoto;
+  Labellist *gl = &fs->ls->dyd->gt;
+  /* correct pending gotos to current block and try to close it
+     with visible labels */
+  while (i < gl->n) {
+    Labeldesc *gt = &gl->arr[i];
+    if (gt->nactvar > bl->nactvar) {
+      if (bl->upval)
+        luaK_patchclose(fs, gt->pc, bl->nactvar);
+      gt->nactvar = bl->nactvar;
+    }
+    if (!findlabel(fs->ls, i))
+      i++;  /* move to next one */
+  }
+}
+
+
+static void enterblock (FuncState *fs, BlockCnt *bl, lu_byte isloop) {
+  bl->isloop = isloop;
+  bl->nactvar = fs->nactvar;
+  bl->firstlabel = fs->ls->dyd->label.n;
+  bl->firstgoto = fs->ls->dyd->gt.n;
+  bl->upval = 0;
+  bl->previous = fs->bl;
+  fs->bl = bl;
+  lua_assert(fs->freereg == fs->nactvar);
+}
+
+
+/*
+** create a label named 'break' to resolve break statements
+*/
+static void breaklabel (LexState *ls) {
+  TString *n = luaS_new(ls->L, "break");
+  int l = newlabelentry(ls, &ls->dyd->label, n, 0, ls->fs->pc);
+  findgotos(ls, &ls->dyd->label.arr[l]);
+}
+
+/*
+** generates an error for an undefined 'goto'; choose appropriate
+** message when label name is a reserved word (which can only be 'break')
+*/
+static l_noret undefgoto (LexState *ls, Labeldesc *gt) {
+  const char *msg = isreserved(gt->name)
+                    ? "<%s> at line %d not inside a loop"
+                    : "no visible label '%s' for <goto> at line %d";
+  msg = luaO_pushfstring(ls->L, msg, getstr(gt->name), gt->line);
+  semerror(ls, msg);
+}
+
+
+static void leaveblock (FuncState *fs) {
+  BlockCnt *bl = fs->bl;
+  LexState *ls = fs->ls;
+  if (bl->previous && bl->upval) {
+    /* create a 'jump to here' to close upvalues */
+    int j = luaK_jump(fs);
+    luaK_patchclose(fs, j, bl->nactvar);
+    luaK_patchtohere(fs, j);
+  }
+  if (bl->isloop)
+    breaklabel(ls);  /* close pending breaks */
+  fs->bl = bl->previous;
+  removevars(fs, bl->nactvar);
+  lua_assert(bl->nactvar == fs->nactvar);
+  fs->freereg = fs->nactvar;  /* free registers */
+  ls->dyd->label.n = bl->firstlabel;  /* remove local labels */
+  if (bl->previous)  /* inner block? */
+    movegotosout(fs, bl);  /* update pending gotos to outer block */
+  else if (bl->firstgoto < ls->dyd->gt.n)  /* pending gotos in outer block? */
+    undefgoto(ls, &ls->dyd->gt.arr[bl->firstgoto]);  /* error */
+}
+
+
+/*
+** adds a new prototype into list of prototypes
+*/
+static Proto *addprototype (LexState *ls) {
+  Proto *clp;
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;  /* prototype of current function */
+  if (fs->np >= f->sizep) {
+    int oldsize = f->sizep;
+    luaM_growvector(L, f->p, fs->np, f->sizep, Proto *, MAXARG_Bx, "functions");
+    while (oldsize < f->sizep)
+      f->p[oldsize++] = NULL;
+  }
+  f->p[fs->np++] = clp = luaF_newproto(L);
+  luaC_objbarrier(L, f, clp);
+  return clp;
+}
+
+
+/*
+** codes instruction to create new closure in parent function.
+** The OP_CLOSURE instruction must use the last available register,
+** so that, if it invokes the GC, the GC knows which registers
+** are in use at that time.
+*/
+static void codeclosure (LexState *ls, expdesc *v) {
+  FuncState *fs = ls->fs->prev;
+  init_exp(v, VRELOCABLE, luaK_codeABx(fs, OP_CLOSURE, 0, fs->np - 1));
+  luaK_exp2nextreg(fs, v);  /* fix it at the last register */
+}
+
+
+static void open_func (LexState *ls, FuncState *fs, BlockCnt *bl) {
+  Proto *f;
+  fs->prev = ls->fs;  /* linked list of funcstates */
+  fs->ls = ls;
+  ls->fs = fs;
+  fs->pc = 0;
+  fs->lasttarget = 0;
+  fs->jpc = NO_JUMP;
+  fs->freereg = 0;
+  fs->nk = 0;
+  fs->np = 0;
+  fs->nups = 0;
+  fs->nlocvars = 0;
+  fs->nactvar = 0;
+  fs->firstlocal = ls->dyd->actvar.n;
+  fs->bl = NULL;
+  f = fs->f;
+  f->source = ls->source;
+  f->maxstacksize = 2;  /* registers 0/1 are always valid */
+  enterblock(fs, bl, 0);
+}
+
+
+static void close_func (LexState *ls) {
+  lua_State *L = ls->L;
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  luaK_ret(fs, 0, 0);  /* final return */
+  leaveblock(fs);
+  luaM_reallocvector(L, f->code, f->sizecode, fs->pc, Instruction);
+  f->sizecode = fs->pc;
+  luaM_reallocvector(L, f->lineinfo, f->sizelineinfo, fs->pc, int);
+  f->sizelineinfo = fs->pc;
+  luaM_reallocvector(L, f->k, f->sizek, fs->nk, TValue);
+  f->sizek = fs->nk;
+  luaM_reallocvector(L, f->p, f->sizep, fs->np, Proto *);
+  f->sizep = fs->np;
+  luaM_reallocvector(L, f->locvars, f->sizelocvars, fs->nlocvars, LocVar);
+  f->sizelocvars = fs->nlocvars;
+  luaM_reallocvector(L, f->upvalues, f->sizeupvalues, fs->nups, Upvaldesc);
+  f->sizeupvalues = fs->nups;
+  lua_assert(fs->bl == NULL);
+  ls->fs = fs->prev;
+  luaC_checkGC(L);
+}
+
+
+
+/*============================================================*/
+/* GRAMMAR RULES */
+/*============================================================*/
+
+
+/*
+** check whether current token is in the follow set of a block.
+** 'until' closes syntactical blocks, but do not close scope,
+** so it is handled in separate.
+*/
+static int block_follow (LexState *ls, int withuntil) {
+  switch (ls->t.token) {
+    case TK_ELSE: case TK_ELSEIF:
+    case TK_END: case TK_EOS:
+      return 1;
+    case TK_UNTIL: return withuntil;
+    default: return 0;
+  }
+}
+
+
+static void statlist (LexState *ls) {
+  /* statlist -> { stat [';'] } */
+  while (!block_follow(ls, 1)) {
+    if (ls->t.token == TK_RETURN) {
+      statement(ls);
+      return;  /* 'return' must be last statement */
+    }
+    statement(ls);
+  }
+}
+
+
+static void fieldsel (LexState *ls, expdesc *v) {
+  /* fieldsel -> ['.' | ':'] NAME */
+  FuncState *fs = ls->fs;
+  expdesc key;
+  luaK_exp2anyregup(fs, v);
+  luaX_next(ls);  /* skip the dot or colon */
+  checkname(ls, &key);
+  luaK_indexed(fs, v, &key);
+}
+
+
+static void yindex (LexState *ls, expdesc *v) {
+  /* index -> '[' expr ']' */
+  luaX_next(ls);  /* skip the '[' */
+  expr(ls, v);
+  luaK_exp2val(ls->fs, v);
+  checknext(ls, ']');
+}
+
+
+/*
+** {======================================================================
+** Rules for Constructors
+** =======================================================================
+*/
+
+
+struct ConsControl {
+  expdesc v;  /* last list item read */
+  expdesc *t;  /* table descriptor */
+  int nh;  /* total number of 'record' elements */
+  int na;  /* total number of array elements */
+  int tostore;  /* number of array elements pending to be stored */
+};
+
+
+static void recfield (LexState *ls, struct ConsControl *cc) {
+  /* recfield -> (NAME | '['exp1']') = exp1 */
+  FuncState *fs = ls->fs;
+  int reg = ls->fs->freereg;
+  expdesc key, val;
+  int rkkey;
+  if (ls->t.token == TK_NAME) {
+    checklimit(fs, cc->nh, MAX_INT, "items in a constructor");
+    checkname(ls, &key);
+  }
+  else  /* ls->t.token == '[' */
+    yindex(ls, &key);
+  cc->nh++;
+  checknext(ls, '=');
+  rkkey = luaK_exp2RK(fs, &key);
+  expr(ls, &val);
+  luaK_codeABC(fs, OP_SETTABLE, cc->t->u.info, rkkey, luaK_exp2RK(fs, &val));
+  fs->freereg = reg;  /* free registers */
+}
+
+
+static void closelistfield (FuncState *fs, struct ConsControl *cc) {
+  if (cc->v.k == VVOID) return;  /* there is no list item */
+  luaK_exp2nextreg(fs, &cc->v);
+  cc->v.k = VVOID;
+  if (cc->tostore == LFIELDS_PER_FLUSH) {
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);  /* flush */
+    cc->tostore = 0;  /* no more items pending */
+  }
+}
+
+
+static void lastlistfield (FuncState *fs, struct ConsControl *cc) {
+  if (cc->tostore == 0) return;
+  if (hasmultret(cc->v.k)) {
+    luaK_setmultret(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, LUA_MULTRET);
+    cc->na--;  /* do not count last expression (unknown number of elements) */
+  }
+  else {
+    if (cc->v.k != VVOID)
+      luaK_exp2nextreg(fs, &cc->v);
+    luaK_setlist(fs, cc->t->u.info, cc->na, cc->tostore);
+  }
+}
+
+
+static void listfield (LexState *ls, struct ConsControl *cc) {
+  /* listfield -> exp */
+  expr(ls, &cc->v);
+  checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor");
+  cc->na++;
+  cc->tostore++;
+}
+
+
+static void field (LexState *ls, struct ConsControl *cc) {
+  /* field -> listfield | recfield */
+  switch(ls->t.token) {
+    case TK_NAME: {  /* may be 'listfield' or 'recfield' */
+      if (luaX_lookahead(ls) != '=')  /* expression? */
+        listfield(ls, cc);
+      else
+        recfield(ls, cc);
+      break;
+    }
+    case '[': {
+      recfield(ls, cc);
+      break;
+    }
+    default: {
+      listfield(ls, cc);
+      break;
+    }
+  }
+}
+
+
+static void constructor (LexState *ls, expdesc *t) {
+  /* constructor -> '{' [ field { sep field } [sep] ] '}'
+     sep -> ',' | ';' */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  int pc = luaK_codeABC(fs, OP_NEWTABLE, 0, 0, 0);
+  struct ConsControl cc;
+  cc.na = cc.nh = cc.tostore = 0;
+  cc.t = t;
+  init_exp(t, VRELOCABLE, pc);
+  init_exp(&cc.v, VVOID, 0);  /* no value (yet) */
+  luaK_exp2nextreg(ls->fs, t);  /* fix it at stack top */
+  checknext(ls, '{');
+  do {
+    lua_assert(cc.v.k == VVOID || cc.tostore > 0);
+    if (ls->t.token == '}') break;
+    closelistfield(fs, &cc);
+    field(ls, &cc);
+  } while (testnext(ls, ',') || testnext(ls, ';'));
+  check_match(ls, '}', '{', line);
+  lastlistfield(fs, &cc);
+  SETARG_B(fs->f->code[pc], luaO_int2fb(cc.na)); /* set initial array size */
+  SETARG_C(fs->f->code[pc], luaO_int2fb(cc.nh));  /* set initial table size */
+}
+
+/* }====================================================================== */
+
+
+
+static void parlist (LexState *ls) {
+  /* parlist -> [ param { ',' param } ] */
+  FuncState *fs = ls->fs;
+  Proto *f = fs->f;
+  int nparams = 0;
+  f->is_vararg = 0;
+  if (ls->t.token != ')') {  /* is 'parlist' not empty? */
+    do {
+      switch (ls->t.token) {
+        case TK_NAME: {  /* param -> NAME */
+          new_localvar(ls, str_checkname(ls));
+          nparams++;
+          break;
+        }
+        case TK_DOTS: {  /* param -> '...' */
+          luaX_next(ls);
+          f->is_vararg = 1;  /* declared vararg */
+          break;
+        }
+        default: luaX_syntaxerror(ls, "<name> or '...' expected");
+      }
+    } while (!f->is_vararg && testnext(ls, ','));
+  }
+  adjustlocalvars(ls, nparams);
+  f->numparams = cast_byte(fs->nactvar);
+  luaK_reserveregs(fs, fs->nactvar);  /* reserve register for parameters */
+}
+
+
+static void body (LexState *ls, expdesc *e, int ismethod, int line) {
+  /* body ->  '(' parlist ')' block END */
+  FuncState new_fs;
+  BlockCnt bl;
+  new_fs.f = addprototype(ls);
+  new_fs.f->linedefined = line;
+  open_func(ls, &new_fs, &bl);
+  checknext(ls, '(');
+  if (ismethod) {
+    new_localvarliteral(ls, "self");  /* create 'self' parameter */
+    adjustlocalvars(ls, 1);
+  }
+  parlist(ls);
+  checknext(ls, ')');
+  statlist(ls);
+  new_fs.f->lastlinedefined = ls->linenumber;
+  check_match(ls, TK_END, TK_FUNCTION, line);
+  codeclosure(ls, e);
+  close_func(ls);
+}
+
+
+static int explist (LexState *ls, expdesc *v) {
+  /* explist -> expr { ',' expr } */
+  int n = 1;  /* at least one expression */
+  expr(ls, v);
+  while (testnext(ls, ',')) {
+    luaK_exp2nextreg(ls->fs, v);
+    expr(ls, v);
+    n++;
+  }
+  return n;
+}
+
+
+static void funcargs (LexState *ls, expdesc *f, int line) {
+  FuncState *fs = ls->fs;
+  expdesc args;
+  int base, nparams;
+  switch (ls->t.token) {
+    case '(': {  /* funcargs -> '(' [ explist ] ')' */
+      luaX_next(ls);
+      if (ls->t.token == ')')  /* arg list is empty? */
+        args.k = VVOID;
+      else {
+        explist(ls, &args);
+        luaK_setmultret(fs, &args);
+      }
+      check_match(ls, ')', '(', line);
+      break;
+    }
+    case '{': {  /* funcargs -> constructor */
+      constructor(ls, &args);
+      break;
+    }
+    case TK_STRING: {  /* funcargs -> STRING */
+      codestring(ls, &args, ls->t.seminfo.ts);
+      luaX_next(ls);  /* must use 'seminfo' before 'next' */
+      break;
+    }
+    default: {
+      luaX_syntaxerror(ls, "function arguments expected");
+    }
+  }
+  lua_assert(f->k == VNONRELOC);
+  base = f->u.info;  /* base register for call */
+  if (hasmultret(args.k))
+    nparams = LUA_MULTRET;  /* open call */
+  else {
+    if (args.k != VVOID)
+      luaK_exp2nextreg(fs, &args);  /* close last argument */
+    nparams = fs->freereg - (base+1);
+  }
+  init_exp(f, VCALL, luaK_codeABC(fs, OP_CALL, base, nparams+1, 2));
+  luaK_fixline(fs, line);
+  fs->freereg = base+1;  /* call remove function and arguments and leaves
+                            (unless changed) one result */
+}
+
+
+
+
+/*
+** {======================================================================
+** Expression parsing
+** =======================================================================
+*/
+
+
+static void primaryexp (LexState *ls, expdesc *v) {
+  /* primaryexp -> NAME | '(' expr ')' */
+  switch (ls->t.token) {
+    case '(': {
+      int line = ls->linenumber;
+      luaX_next(ls);
+      expr(ls, v);
+      check_match(ls, ')', '(', line);
+      luaK_dischargevars(ls->fs, v);
+      return;
+    }
+    case TK_NAME: {
+      singlevar(ls, v);
+      return;
+    }
+    default: {
+      luaX_syntaxerror(ls, "unexpected symbol");
+    }
+  }
+}
+
+
+static void suffixedexp (LexState *ls, expdesc *v) {
+  /* suffixedexp ->
+       primaryexp { '.' NAME | '[' exp ']' | ':' NAME funcargs | funcargs } */
+  FuncState *fs = ls->fs;
+  int line = ls->linenumber;
+  primaryexp(ls, v);
+  for (;;) {
+    switch (ls->t.token) {
+      case '.': {  /* fieldsel */
+        fieldsel(ls, v);
+        break;
+      }
+      case '[': {  /* '[' exp1 ']' */
+        expdesc key;
+        luaK_exp2anyregup(fs, v);
+        yindex(ls, &key);
+        luaK_indexed(fs, v, &key);
+        break;
+      }
+      case ':': {  /* ':' NAME funcargs */
+        expdesc key;
+        luaX_next(ls);
+        checkname(ls, &key);
+        luaK_self(fs, v, &key);
+        funcargs(ls, v, line);
+        break;
+      }
+      case '(': case TK_STRING: case '{': {  /* funcargs */
+        luaK_exp2nextreg(fs, v);
+        funcargs(ls, v, line);
+        break;
+      }
+      default: return;
+    }
+  }
+}
+
+
+static void simpleexp (LexState *ls, expdesc *v) {
+  /* simpleexp -> FLT | INT | STRING | NIL | TRUE | FALSE | ... |
+                  constructor | FUNCTION body | suffixedexp */
+  switch (ls->t.token) {
+    case TK_FLT: {
+      init_exp(v, VKFLT, 0);
+      v->u.nval = ls->t.seminfo.r;
+      break;
+    }
+    case TK_INT: {
+      init_exp(v, VKINT, 0);
+      v->u.ival = ls->t.seminfo.i;
+      break;
+    }
+    case TK_STRING: {
+      codestring(ls, v, ls->t.seminfo.ts);
+      break;
+    }
+    case TK_NIL: {
+      init_exp(v, VNIL, 0);
+      break;
+    }
+    case TK_TRUE: {
+      init_exp(v, VTRUE, 0);
+      break;
+    }
+    case TK_FALSE: {
+      init_exp(v, VFALSE, 0);
+      break;
+    }
+    case TK_DOTS: {  /* vararg */
+      FuncState *fs = ls->fs;
+      check_condition(ls, fs->f->is_vararg,
+                      "cannot use '...' outside a vararg function");
+      init_exp(v, VVARARG, luaK_codeABC(fs, OP_VARARG, 0, 1, 0));
+      break;
+    }
+    case '{': {  /* constructor */
+      constructor(ls, v);
+      return;
+    }
+    case TK_FUNCTION: {
+      luaX_next(ls);
+      body(ls, v, 0, ls->linenumber);
+      return;
+    }
+    default: {
+      suffixedexp(ls, v);
+      return;
+    }
+  }
+  luaX_next(ls);
+}
+
+
+static UnOpr getunopr (int op) {
+  switch (op) {
+    case TK_NOT: return OPR_NOT;
+    case '-': return OPR_MINUS;
+    case '~': return OPR_BNOT;
+    case '#': return OPR_LEN;
+    default: return OPR_NOUNOPR;
+  }
+}
+
+
+static BinOpr getbinopr (int op) {
+  switch (op) {
+    case '+': return OPR_ADD;
+    case '-': return OPR_SUB;
+    case '*': return OPR_MUL;
+    case '%': return OPR_MOD;
+    case '^': return OPR_POW;
+    case '/': return OPR_DIV;
+    case TK_IDIV: return OPR_IDIV;
+    case '&': return OPR_BAND;
+    case '|': return OPR_BOR;
+    case '~': return OPR_BXOR;
+    case TK_SHL: return OPR_SHL;
+    case TK_SHR: return OPR_SHR;
+    case TK_CONCAT: return OPR_CONCAT;
+    case TK_NE: return OPR_NE;
+    case TK_EQ: return OPR_EQ;
+    case '<': return OPR_LT;
+    case TK_LE: return OPR_LE;
+    case '>': return OPR_GT;
+    case TK_GE: return OPR_GE;
+    case TK_AND: return OPR_AND;
+    case TK_OR: return OPR_OR;
+    default: return OPR_NOBINOPR;
+  }
+}
+
+
+static const struct {
+  lu_byte left;  /* left priority for each binary operator */
+  lu_byte right; /* right priority */
+} priority[] = {  /* ORDER OPR */
+   {10, 10}, {10, 10},           /* '+' '-' */
+   {11, 11}, {11, 11},           /* '*' '%' */
+   {14, 13},                  /* '^' (right associative) */
+   {11, 11}, {11, 11},           /* '/' '//' */
+   {6, 6}, {4, 4}, {5, 5},   /* '&' '|' '~' */
+   {7, 7}, {7, 7},           /* '<<' '>>' */
+   {9, 8},                   /* '..' (right associative) */
+   {3, 3}, {3, 3}, {3, 3},   /* ==, <, <= */
+   {3, 3}, {3, 3}, {3, 3},   /* ~=, >, >= */
+   {2, 2}, {1, 1}            /* and, or */
+};
+
+#define UNARY_PRIORITY	12  /* priority for unary operators */
+
+
+/*
+** subexpr -> (simpleexp | unop subexpr) { binop subexpr }
+** where 'binop' is any binary operator with a priority higher than 'limit'
+*/
+static BinOpr subexpr (LexState *ls, expdesc *v, int limit) {
+  BinOpr op;
+  UnOpr uop;
+  enterlevel(ls);
+  uop = getunopr(ls->t.token);
+  if (uop != OPR_NOUNOPR) {
+    int line = ls->linenumber;
+    luaX_next(ls);
+    subexpr(ls, v, UNARY_PRIORITY);
+    luaK_prefix(ls->fs, uop, v, line);
+  }
+  else simpleexp(ls, v);
+  /* expand while operators have priorities higher than 'limit' */
+  op = getbinopr(ls->t.token);
+  while (op != OPR_NOBINOPR && priority[op].left > limit) {
+    expdesc v2;
+    BinOpr nextop;
+    int line = ls->linenumber;
+    luaX_next(ls);
+    luaK_infix(ls->fs, op, v);
+    /* read sub-expression with higher priority */
+    nextop = subexpr(ls, &v2, priority[op].right);
+    luaK_posfix(ls->fs, op, v, &v2, line);
+    op = nextop;
+  }
+  leavelevel(ls);
+  return op;  /* return first untreated operator */
+}
+
+
+static void expr (LexState *ls, expdesc *v) {
+  subexpr(ls, v, 0);
+}
+
+/* }==================================================================== */
+
+
+
+/*
+** {======================================================================
+** Rules for Statements
+** =======================================================================
+*/
+
+
+static void block (LexState *ls) {
+  /* block -> statlist */
+  FuncState *fs = ls->fs;
+  BlockCnt bl;
+  enterblock(fs, &bl, 0);
+  statlist(ls);
+  leaveblock(fs);
+}
+
+
+/*
+** structure to chain all variables in the left-hand side of an
+** assignment
+*/
+struct LHS_assign {
+  struct LHS_assign *prev;
+  expdesc v;  /* variable (global, local, upvalue, or indexed) */
+};
+
+
+/*
+** check whether, in an assignment to an upvalue/local variable, the
+** upvalue/local variable is begin used in a previous assignment to a
+** table. If so, save original upvalue/local value in a safe place and
+** use this safe copy in the previous assignment.
+*/
+static void check_conflict (LexState *ls, struct LHS_assign *lh, expdesc *v) {
+  FuncState *fs = ls->fs;
+  int extra = fs->freereg;  /* eventual position to save local variable */
+  int conflict = 0;
+  for (; lh; lh = lh->prev) {  /* check all previous assignments */
+    if (lh->v.k == VINDEXED) {  /* assigning to a table? */
+      /* table is the upvalue/local being assigned now? */
+      if (lh->v.u.ind.vt == v->k && lh->v.u.ind.t == v->u.info) {
+        conflict = 1;
+        lh->v.u.ind.vt = VLOCAL;
+        lh->v.u.ind.t = extra;  /* previous assignment will use safe copy */
+      }
+      /* index is the local being assigned? (index cannot be upvalue) */
+      if (v->k == VLOCAL && lh->v.u.ind.idx == v->u.info) {
+        conflict = 1;
+        lh->v.u.ind.idx = extra;  /* previous assignment will use safe copy */
+      }
+    }
+  }
+  if (conflict) {
+    /* copy upvalue/local value to a temporary (in position 'extra') */
+    OpCode op = (v->k == VLOCAL) ? OP_MOVE : OP_GETUPVAL;
+    luaK_codeABC(fs, op, extra, v->u.info, 0);
+    luaK_reserveregs(fs, 1);
+  }
+}
+
+
+static void assignment (LexState *ls, struct LHS_assign *lh, int nvars) {
+  expdesc e;
+  check_condition(ls, vkisvar(lh->v.k), "syntax error");
+  if (testnext(ls, ',')) {  /* assignment -> ',' suffixedexp assignment */
+    struct LHS_assign nv;
+    nv.prev = lh;
+    suffixedexp(ls, &nv.v);
+    if (nv.v.k != VINDEXED)
+      check_conflict(ls, lh, &nv.v);
+    checklimit(ls->fs, nvars + ls->L->nCcalls, LUAI_MAXCCALLS,
+                    "C levels");
+    assignment(ls, &nv, nvars+1);
+  }
+  else {  /* assignment -> '=' explist */
+    int nexps;
+    checknext(ls, '=');
+    nexps = explist(ls, &e);
+    if (nexps != nvars)
+      adjust_assign(ls, nvars, nexps, &e);
+    else {
+      luaK_setoneret(ls->fs, &e);  /* close last expression */
+      luaK_storevar(ls->fs, &lh->v, &e);
+      return;  /* avoid default */
+    }
+  }
+  init_exp(&e, VNONRELOC, ls->fs->freereg-1);  /* default assignment */
+  luaK_storevar(ls->fs, &lh->v, &e);
+}
+
+
+static int cond (LexState *ls) {
+  /* cond -> exp */
+  expdesc v;
+  expr(ls, &v);  /* read condition */
+  if (v.k == VNIL) v.k = VFALSE;  /* 'falses' are all equal here */
+  luaK_goiftrue(ls->fs, &v);
+  return v.f;
+}
+
+
+static void gotostat (LexState *ls, int pc) {
+  int line = ls->linenumber;
+  TString *label;
+  int g;
+  if (testnext(ls, TK_GOTO))
+    label = str_checkname(ls);
+  else {
+    luaX_next(ls);  /* skip break */
+    label = luaS_new(ls->L, "break");
+  }
+  g = newlabelentry(ls, &ls->dyd->gt, label, line, pc);
+  findlabel(ls, g);  /* close it if label already defined */
+}
+
+
+/* check for repeated labels on the same block */
+static void checkrepeated (FuncState *fs, Labellist *ll, TString *label) {
+  int i;
+  for (i = fs->bl->firstlabel; i < ll->n; i++) {
+    if (eqstr(label, ll->arr[i].name)) {
+      const char *msg = luaO_pushfstring(fs->ls->L,
+                          "label '%s' already defined on line %d",
+                          getstr(label), ll->arr[i].line);
+      semerror(fs->ls, msg);
+    }
+  }
+}
+
+
+/* skip no-op statements */
+static void skipnoopstat (LexState *ls) {
+  while (ls->t.token == ';' || ls->t.token == TK_DBCOLON)
+    statement(ls);
+}
+
+
+static void labelstat (LexState *ls, TString *label, int line) {
+  /* label -> '::' NAME '::' */
+  FuncState *fs = ls->fs;
+  Labellist *ll = &ls->dyd->label;
+  int l;  /* index of new label being created */
+  checkrepeated(fs, ll, label);  /* check for repeated labels */
+  checknext(ls, TK_DBCOLON);  /* skip double colon */
+  /* create new entry for this label */
+  l = newlabelentry(ls, ll, label, line, luaK_getlabel(fs));
+  skipnoopstat(ls);  /* skip other no-op statements */
+  if (block_follow(ls, 0)) {  /* label is last no-op statement in the block? */
+    /* assume that locals are already out of scope */
+    ll->arr[l].nactvar = fs->bl->nactvar;
+  }
+  findgotos(ls, &ll->arr[l]);
+}
+
+
+static void whilestat (LexState *ls, int line) {
+  /* whilestat -> WHILE cond DO block END */
+  FuncState *fs = ls->fs;
+  int whileinit;
+  int condexit;
+  BlockCnt bl;
+  luaX_next(ls);  /* skip WHILE */
+  whileinit = luaK_getlabel(fs);
+  condexit = cond(ls);
+  enterblock(fs, &bl, 1);
+  checknext(ls, TK_DO);
+  block(ls);
+  luaK_jumpto(fs, whileinit);
+  check_match(ls, TK_END, TK_WHILE, line);
+  leaveblock(fs);
+  luaK_patchtohere(fs, condexit);  /* false conditions finish the loop */
+}
+
+
+static void repeatstat (LexState *ls, int line) {
+  /* repeatstat -> REPEAT block UNTIL cond */
+  int condexit;
+  FuncState *fs = ls->fs;
+  int repeat_init = luaK_getlabel(fs);
+  BlockCnt bl1, bl2;
+  enterblock(fs, &bl1, 1);  /* loop block */
+  enterblock(fs, &bl2, 0);  /* scope block */
+  luaX_next(ls);  /* skip REPEAT */
+  statlist(ls);
+  check_match(ls, TK_UNTIL, TK_REPEAT, line);
+  condexit = cond(ls);  /* read condition (inside scope block) */
+  if (bl2.upval)  /* upvalues? */
+    luaK_patchclose(fs, condexit, bl2.nactvar);
+  leaveblock(fs);  /* finish scope */
+  luaK_patchlist(fs, condexit, repeat_init);  /* close the loop */
+  leaveblock(fs);  /* finish loop */
+}
+
+
+static int exp1 (LexState *ls) {
+  expdesc e;
+  int reg;
+  expr(ls, &e);
+  luaK_exp2nextreg(ls->fs, &e);
+  lua_assert(e.k == VNONRELOC);
+  reg = e.u.info;
+  return reg;
+}
+
+
+static void forbody (LexState *ls, int base, int line, int nvars, int isnum) {
+  /* forbody -> DO block */
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  int prep, endfor;
+  adjustlocalvars(ls, 3);  /* control variables */
+  checknext(ls, TK_DO);
+  prep = isnum ? luaK_codeAsBx(fs, OP_FORPREP, base, NO_JUMP) : luaK_jump(fs);
+  enterblock(fs, &bl, 0);  /* scope for declared variables */
+  adjustlocalvars(ls, nvars);
+  luaK_reserveregs(fs, nvars);
+  block(ls);
+  leaveblock(fs);  /* end of scope for declared variables */
+  luaK_patchtohere(fs, prep);
+  if (isnum)  /* numeric for? */
+    endfor = luaK_codeAsBx(fs, OP_FORLOOP, base, NO_JUMP);
+  else {  /* generic for */
+    luaK_codeABC(fs, OP_TFORCALL, base, 0, nvars);
+    luaK_fixline(fs, line);
+    endfor = luaK_codeAsBx(fs, OP_TFORLOOP, base + 2, NO_JUMP);
+  }
+  luaK_patchlist(fs, endfor, prep + 1);
+  luaK_fixline(fs, line);
+}
+
+
+static void fornum (LexState *ls, TString *varname, int line) {
+  /* fornum -> NAME = exp1,exp1[,exp1] forbody */
+  FuncState *fs = ls->fs;
+  int base = fs->freereg;
+  new_localvarliteral(ls, "(for index)");
+  new_localvarliteral(ls, "(for limit)");
+  new_localvarliteral(ls, "(for step)");
+  new_localvar(ls, varname);
+  checknext(ls, '=');
+  exp1(ls);  /* initial value */
+  checknext(ls, ',');
+  exp1(ls);  /* limit */
+  if (testnext(ls, ','))
+    exp1(ls);  /* optional step */
+  else {  /* default step = 1 */
+    luaK_codek(fs, fs->freereg, luaK_intK(fs, 1));
+    luaK_reserveregs(fs, 1);
+  }
+  forbody(ls, base, line, 1, 1);
+}
+
+
+static void forlist (LexState *ls, TString *indexname) {
+  /* forlist -> NAME {,NAME} IN explist forbody */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int nvars = 4;  /* gen, state, control, plus at least one declared var */
+  int line;
+  int base = fs->freereg;
+  /* create control variables */
+  new_localvarliteral(ls, "(for generator)");
+  new_localvarliteral(ls, "(for state)");
+  new_localvarliteral(ls, "(for control)");
+  /* create declared variables */
+  new_localvar(ls, indexname);
+  while (testnext(ls, ',')) {
+    new_localvar(ls, str_checkname(ls));
+    nvars++;
+  }
+  checknext(ls, TK_IN);
+  line = ls->linenumber;
+  adjust_assign(ls, 3, explist(ls, &e), &e);
+  luaK_checkstack(fs, 3);  /* extra space to call generator */
+  forbody(ls, base, line, nvars - 3, 0);
+}
+
+
+static void forstat (LexState *ls, int line) {
+  /* forstat -> FOR (fornum | forlist) END */
+  FuncState *fs = ls->fs;
+  TString *varname;
+  BlockCnt bl;
+  enterblock(fs, &bl, 1);  /* scope for loop and control variables */
+  luaX_next(ls);  /* skip 'for' */
+  varname = str_checkname(ls);  /* first variable name */
+  switch (ls->t.token) {
+    case '=': fornum(ls, varname, line); break;
+    case ',': case TK_IN: forlist(ls, varname); break;
+    default: luaX_syntaxerror(ls, "'=' or 'in' expected");
+  }
+  check_match(ls, TK_END, TK_FOR, line);
+  leaveblock(fs);  /* loop scope ('break' jumps to this point) */
+}
+
+
+static void test_then_block (LexState *ls, int *escapelist) {
+  /* test_then_block -> [IF | ELSEIF] cond THEN block */
+  BlockCnt bl;
+  FuncState *fs = ls->fs;
+  expdesc v;
+  int jf;  /* instruction to skip 'then' code (if condition is false) */
+  luaX_next(ls);  /* skip IF or ELSEIF */
+  expr(ls, &v);  /* read condition */
+  checknext(ls, TK_THEN);
+  if (ls->t.token == TK_GOTO || ls->t.token == TK_BREAK) {
+    luaK_goiffalse(ls->fs, &v);  /* will jump to label if condition is true */
+    enterblock(fs, &bl, 0);  /* must enter block before 'goto' */
+    gotostat(ls, v.t);  /* handle goto/break */
+    skipnoopstat(ls);  /* skip other no-op statements */
+    if (block_follow(ls, 0)) {  /* 'goto' is the entire block? */
+      leaveblock(fs);
+      return;  /* and that is it */
+    }
+    else  /* must skip over 'then' part if condition is false */
+      jf = luaK_jump(fs);
+  }
+  else {  /* regular case (not goto/break) */
+    luaK_goiftrue(ls->fs, &v);  /* skip over block if condition is false */
+    enterblock(fs, &bl, 0);
+    jf = v.f;
+  }
+  statlist(ls);  /* 'then' part */
+  leaveblock(fs);
+  if (ls->t.token == TK_ELSE ||
+      ls->t.token == TK_ELSEIF)  /* followed by 'else'/'elseif'? */
+    luaK_concat(fs, escapelist, luaK_jump(fs));  /* must jump over it */
+  luaK_patchtohere(fs, jf);
+}
+
+
+static void ifstat (LexState *ls, int line) {
+  /* ifstat -> IF cond THEN block {ELSEIF cond THEN block} [ELSE block] END */
+  FuncState *fs = ls->fs;
+  int escapelist = NO_JUMP;  /* exit list for finished parts */
+  test_then_block(ls, &escapelist);  /* IF cond THEN block */
+  while (ls->t.token == TK_ELSEIF)
+    test_then_block(ls, &escapelist);  /* ELSEIF cond THEN block */
+  if (testnext(ls, TK_ELSE))
+    block(ls);  /* 'else' part */
+  check_match(ls, TK_END, TK_IF, line);
+  luaK_patchtohere(fs, escapelist);  /* patch escape list to 'if' end */
+}
+
+
+static void localfunc (LexState *ls) {
+  expdesc b;
+  FuncState *fs = ls->fs;
+  new_localvar(ls, str_checkname(ls));  /* new local variable */
+  adjustlocalvars(ls, 1);  /* enter its scope */
+  body(ls, &b, 0, ls->linenumber);  /* function created in next register */
+  /* debug information will only see the variable after this point! */
+  getlocvar(fs, b.u.info)->startpc = fs->pc;
+}
+
+
+static void localstat (LexState *ls) {
+  /* stat -> LOCAL NAME {',' NAME} ['=' explist] */
+  int nvars = 0;
+  int nexps;
+  expdesc e;
+  do {
+    new_localvar(ls, str_checkname(ls));
+    nvars++;
+  } while (testnext(ls, ','));
+  if (testnext(ls, '='))
+    nexps = explist(ls, &e);
+  else {
+    e.k = VVOID;
+    nexps = 0;
+  }
+  adjust_assign(ls, nvars, nexps, &e);
+  adjustlocalvars(ls, nvars);
+}
+
+
+static int funcname (LexState *ls, expdesc *v) {
+  /* funcname -> NAME {fieldsel} [':' NAME] */
+  int ismethod = 0;
+  singlevar(ls, v);
+  while (ls->t.token == '.')
+    fieldsel(ls, v);
+  if (ls->t.token == ':') {
+    ismethod = 1;
+    fieldsel(ls, v);
+  }
+  return ismethod;
+}
+
+
+static void funcstat (LexState *ls, int line) {
+  /* funcstat -> FUNCTION funcname body */
+  int ismethod;
+  expdesc v, b;
+  luaX_next(ls);  /* skip FUNCTION */
+  ismethod = funcname(ls, &v);
+  body(ls, &b, ismethod, line);
+  luaK_storevar(ls->fs, &v, &b);
+  luaK_fixline(ls->fs, line);  /* definition "happens" in the first line */
+}
+
+
+static void exprstat (LexState *ls) {
+  /* stat -> func | assignment */
+  FuncState *fs = ls->fs;
+  struct LHS_assign v;
+  suffixedexp(ls, &v.v);
+  if (ls->t.token == '=' || ls->t.token == ',') { /* stat -> assignment ? */
+    v.prev = NULL;
+    assignment(ls, &v, 1);
+  }
+  else {  /* stat -> func */
+    check_condition(ls, v.v.k == VCALL, "syntax error");
+    SETARG_C(getinstruction(fs, &v.v), 1);  /* call statement uses no results */
+  }
+}
+
+
+static void retstat (LexState *ls) {
+  /* stat -> RETURN [explist] [';'] */
+  FuncState *fs = ls->fs;
+  expdesc e;
+  int first, nret;  /* registers with returned values */
+  if (block_follow(ls, 1) || ls->t.token == ';')
+    first = nret = 0;  /* return no values */
+  else {
+    nret = explist(ls, &e);  /* optional return values */
+    if (hasmultret(e.k)) {
+      luaK_setmultret(fs, &e);
+      if (e.k == VCALL && nret == 1) {  /* tail call? */
+        SET_OPCODE(getinstruction(fs,&e), OP_TAILCALL);
+        lua_assert(GETARG_A(getinstruction(fs,&e)) == fs->nactvar);
+      }
+      first = fs->nactvar;
+      nret = LUA_MULTRET;  /* return all values */
+    }
+    else {
+      if (nret == 1)  /* only one single value? */
+        first = luaK_exp2anyreg(fs, &e);
+      else {
+        luaK_exp2nextreg(fs, &e);  /* values must go to the stack */
+        first = fs->nactvar;  /* return all active values */
+        lua_assert(nret == fs->freereg - first);
+      }
+    }
+  }
+  luaK_ret(fs, first, nret);
+  testnext(ls, ';');  /* skip optional semicolon */
+}
+
+
+static void statement (LexState *ls) {
+  int line = ls->linenumber;  /* may be needed for error messages */
+  enterlevel(ls);
+  switch (ls->t.token) {
+    case ';': {  /* stat -> ';' (empty statement) */
+      luaX_next(ls);  /* skip ';' */
+      break;
+    }
+    case TK_IF: {  /* stat -> ifstat */
+      ifstat(ls, line);
+      break;
+    }
+    case TK_WHILE: {  /* stat -> whilestat */
+      whilestat(ls, line);
+      break;
+    }
+    case TK_DO: {  /* stat -> DO block END */
+      luaX_next(ls);  /* skip DO */
+      block(ls);
+      check_match(ls, TK_END, TK_DO, line);
+      break;
+    }
+    case TK_FOR: {  /* stat -> forstat */
+      forstat(ls, line);
+      break;
+    }
+    case TK_REPEAT: {  /* stat -> repeatstat */
+      repeatstat(ls, line);
+      break;
+    }
+    case TK_FUNCTION: {  /* stat -> funcstat */
+      funcstat(ls, line);
+      break;
+    }
+    case TK_LOCAL: {  /* stat -> localstat */
+      luaX_next(ls);  /* skip LOCAL */
+      if (testnext(ls, TK_FUNCTION))  /* local function? */
+        localfunc(ls);
+      else
+        localstat(ls);
+      break;
+    }
+    case TK_DBCOLON: {  /* stat -> label */
+      luaX_next(ls);  /* skip double colon */
+      labelstat(ls, str_checkname(ls), line);
+      break;
+    }
+    case TK_RETURN: {  /* stat -> retstat */
+      luaX_next(ls);  /* skip RETURN */
+      retstat(ls);
+      break;
+    }
+    case TK_BREAK:   /* stat -> breakstat */
+    case TK_GOTO: {  /* stat -> 'goto' NAME */
+      gotostat(ls, luaK_jump(ls->fs));
+      break;
+    }
+    default: {  /* stat -> func | assignment */
+      exprstat(ls);
+      break;
+    }
+  }
+  lua_assert(ls->fs->f->maxstacksize >= ls->fs->freereg &&
+             ls->fs->freereg >= ls->fs->nactvar);
+  ls->fs->freereg = ls->fs->nactvar;  /* free registers */
+  leavelevel(ls);
+}
+
+/* }====================================================================== */
+
+
+/*
+** compiles the main function, which is a regular vararg function with an
+** upvalue named LUA_ENV
+*/
+static void mainfunc (LexState *ls, FuncState *fs) {
+  BlockCnt bl;
+  expdesc v;
+  open_func(ls, fs, &bl);
+  fs->f->is_vararg = 1;  /* main function is always declared vararg */
+  init_exp(&v, VLOCAL, 0);  /* create and... */
+  newupvalue(fs, ls->envn, &v);  /* ...set environment upvalue */
+  luaX_next(ls);  /* read first token */
+  statlist(ls);  /* parse main body */
+  check(ls, TK_EOS);
+  close_func(ls);
+}
+
+
+LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                       Dyndata *dyd, const char *name, int firstchar) {
+  LexState lexstate;
+  FuncState funcstate;
+  LClosure *cl = luaF_newLclosure(L, 1);  /* create main closure */
+  setclLvalue(L, L->top, cl);  /* anchor it (to avoid being collected) */
+  luaD_inctop(L);
+  lexstate.h = luaH_new(L);  /* create table for scanner */
+  sethvalue(L, L->top, lexstate.h);  /* anchor it */
+  luaD_inctop(L);
+  funcstate.f = cl->p = luaF_newproto(L);
+  funcstate.f->source = luaS_new(L, name);  /* create and anchor TString */
+  lua_assert(iswhite(funcstate.f));  /* do not need barrier here */
+  lexstate.buff = buff;
+  lexstate.dyd = dyd;
+  dyd->actvar.n = dyd->gt.n = dyd->label.n = 0;
+  luaX_setinput(L, &lexstate, z, funcstate.f->source, firstchar);
+  mainfunc(&lexstate, &funcstate);
+  lua_assert(!funcstate.prev && funcstate.nups == 1 && !lexstate.fs);
+  /* all scopes should be correctly finished */
+  lua_assert(dyd->actvar.n == 0 && dyd->gt.n == 0 && dyd->label.n == 0);
+  L->top--;  /* remove scanner's table */
+  return cl;  /* closure is on the stack, too */
+}
+
diff --git a/scite-app/scite/lua/src/lparser.h b/scite-app/scite/lua/src/lparser.h
new file mode 100644
index 0000000..02e9b03
--- /dev/null
+++ b/scite-app/scite/lua/src/lparser.h
@@ -0,0 +1,133 @@
+/*
+** $Id: lparser.h,v 1.76 2015/12/30 18:16:13 roberto Exp $
+** Lua Parser
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lparser_h
+#define lparser_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/*
+** Expression and variable descriptor.
+** Code generation for variables and expressions can be delayed to allow
+** optimizations; An 'expdesc' structure describes a potentially-delayed
+** variable/expression. It has a description of its "main" value plus a
+** list of conditional jumps that can also produce its value (generated
+** by short-circuit operators 'and'/'or').
+*/
+
+/* kinds of variables/expressions */
+typedef enum {
+  VVOID,  /* when 'expdesc' describes the last expression a list,
+             this kind means an empty list (so, no expression) */
+  VNIL,  /* constant nil */
+  VTRUE,  /* constant true */
+  VFALSE,  /* constant false */
+  VK,  /* constant in 'k'; info = index of constant in 'k' */
+  VKFLT,  /* floating constant; nval = numerical float value */
+  VKINT,  /* integer constant; nval = numerical integer value */
+  VNONRELOC,  /* expression has its value in a fixed register;
+                 info = result register */
+  VLOCAL,  /* local variable; info = local register */
+  VUPVAL,  /* upvalue variable; info = index of upvalue in 'upvalues' */
+  VINDEXED,  /* indexed variable;
+                ind.vt = whether 't' is register or upvalue;
+                ind.t = table register or upvalue;
+                ind.idx = key's R/K index */
+  VJMP,  /* expression is a test/comparison;
+            info = pc of corresponding jump instruction */
+  VRELOCABLE,  /* expression can put result in any register;
+                  info = instruction pc */
+  VCALL,  /* expression is a function call; info = instruction pc */
+  VVARARG  /* vararg expression; info = instruction pc */
+} expkind;
+
+
+#define vkisvar(k)	(VLOCAL <= (k) && (k) <= VINDEXED)
+#define vkisinreg(k)	((k) == VNONRELOC || (k) == VLOCAL)
+
+typedef struct expdesc {
+  expkind k;
+  union {
+    lua_Integer ival;    /* for VKINT */
+    lua_Number nval;  /* for VKFLT */
+    int info;  /* for generic use */
+    struct {  /* for indexed variables (VINDEXED) */
+      short idx;  /* index (R/K) */
+      lu_byte t;  /* table (register or upvalue) */
+      lu_byte vt;  /* whether 't' is register (VLOCAL) or upvalue (VUPVAL) */
+    } ind;
+  } u;
+  int t;  /* patch list of 'exit when true' */
+  int f;  /* patch list of 'exit when false' */
+} expdesc;
+
+
+/* description of active local variable */
+typedef struct Vardesc {
+  short idx;  /* variable index in stack */
+} Vardesc;
+
+
+/* description of pending goto statements and label statements */
+typedef struct Labeldesc {
+  TString *name;  /* label identifier */
+  int pc;  /* position in code */
+  int line;  /* line where it appeared */
+  lu_byte nactvar;  /* local level where it appears in current block */
+} Labeldesc;
+
+
+/* list of labels or gotos */
+typedef struct Labellist {
+  Labeldesc *arr;  /* array */
+  int n;  /* number of entries in use */
+  int size;  /* array size */
+} Labellist;
+
+
+/* dynamic structures used by the parser */
+typedef struct Dyndata {
+  struct {  /* list of active local variables */
+    Vardesc *arr;
+    int n;
+    int size;
+  } actvar;
+  Labellist gt;  /* list of pending gotos */
+  Labellist label;   /* list of active labels */
+} Dyndata;
+
+
+/* control of blocks */
+struct BlockCnt;  /* defined in lparser.c */
+
+
+/* state needed to generate code for a given function */
+typedef struct FuncState {
+  Proto *f;  /* current function header */
+  struct FuncState *prev;  /* enclosing function */
+  struct LexState *ls;  /* lexical state */
+  struct BlockCnt *bl;  /* chain of current blocks */
+  int pc;  /* next position to code (equivalent to 'ncode') */
+  int lasttarget;   /* 'label' of last 'jump label' */
+  int jpc;  /* list of pending jumps to 'pc' */
+  int nk;  /* number of elements in 'k' */
+  int np;  /* number of elements in 'p' */
+  int firstlocal;  /* index of first local var (in Dyndata array) */
+  short nlocvars;  /* number of elements in 'f->locvars' */
+  lu_byte nactvar;  /* number of active local variables */
+  lu_byte nups;  /* number of upvalues */
+  lu_byte freereg;  /* first free register */
+} FuncState;
+
+
+LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+                                 Dyndata *dyd, const char *name, int firstchar);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lprefix.h b/scite-app/scite/lua/src/lprefix.h
new file mode 100644
index 0000000..02daa83
--- /dev/null
+++ b/scite-app/scite/lua/src/lprefix.h
@@ -0,0 +1,45 @@
+/*
+** $Id: lprefix.h,v 1.2 2014/12/29 16:54:13 roberto Exp $
+** Definitions for Lua code that must come before any other header file
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lprefix_h
+#define lprefix_h
+
+
+/*
+** Allows POSIX/XSI stuff
+*/
+#if !defined(LUA_USE_C89)	/* { */
+
+#if !defined(_XOPEN_SOURCE)
+#define _XOPEN_SOURCE           600
+#elif _XOPEN_SOURCE == 0
+#undef _XOPEN_SOURCE  /* use -D_XOPEN_SOURCE=0 to undefine it */
+#endif
+
+/*
+** Allows manipulation of large files in gcc and some other compilers
+*/
+#if !defined(LUA_32BITS) && !defined(_FILE_OFFSET_BITS)
+#define _LARGEFILE_SOURCE       1
+#define _FILE_OFFSET_BITS       64
+#endif
+
+#endif				/* } */
+
+
+/*
+** Windows stuff
+*/
+#if defined(_WIN32) 	/* { */
+
+#if !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS  /* avoid warnings about ISO C functions */
+#endif
+
+#endif			/* } */
+
+#endif
+
diff --git a/scite-app/scite/lua/src/lstate.c b/scite-app/scite/lua/src/lstate.c
new file mode 100644
index 0000000..9194ac3
--- /dev/null
+++ b/scite-app/scite/lua/src/lstate.c
@@ -0,0 +1,347 @@
+/*
+** $Id: lstate.c,v 2.133 2015/11/13 12:16:51 roberto Exp $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#define lstate_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "llex.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+
+
+#if !defined(LUAI_GCPAUSE)
+#define LUAI_GCPAUSE	200  /* 200% */
+#endif
+
+#if !defined(LUAI_GCMUL)
+#define LUAI_GCMUL	200 /* GC runs 'twice the speed' of memory allocation */
+#endif
+
+
+/*
+** a macro to help the creation of a unique random seed when a state is
+** created; the seed is used to randomize hashes.
+*/
+#if !defined(luai_makeseed)
+#include <time.h>
+#define luai_makeseed()		cast(unsigned int, time(NULL))
+#endif
+
+
+
+/*
+** thread state + extra space
+*/
+typedef struct LX {
+  lu_byte extra_[LUA_EXTRASPACE];
+  lua_State l;
+} LX;
+
+
+/*
+** Main thread combines a thread state and the global state
+*/
+typedef struct LG {
+  LX l;
+  global_State g;
+} LG;
+
+
+
+#define fromstate(L)	(cast(LX *, cast(lu_byte *, (L)) - offsetof(LX, l)))
+
+
+/*
+** Compute an initial seed as random as possible. Rely on Address Space
+** Layout Randomization (if present) to increase randomness..
+*/
+#define addbuff(b,p,e) \
+  { size_t t = cast(size_t, e); \
+    memcpy(b + p, &t, sizeof(t)); p += sizeof(t); }
+
+static unsigned int makeseed (lua_State *L) {
+  char buff[4 * sizeof(size_t)];
+  unsigned int h = luai_makeseed();
+  int p = 0;
+  addbuff(buff, p, L);  /* heap variable */
+  addbuff(buff, p, &h);  /* local variable */
+  addbuff(buff, p, luaO_nilobject);  /* global variable */
+  addbuff(buff, p, &lua_newstate);  /* public function */
+  lua_assert(p == sizeof(buff));
+  return luaS_hash(buff, p, h);
+}
+
+
+/*
+** set GCdebt to a new value keeping the value (totalbytes + GCdebt)
+** invariant (and avoiding underflows in 'totalbytes')
+*/
+void luaE_setdebt (global_State *g, l_mem debt) {
+  l_mem tb = gettotalbytes(g);
+  lua_assert(tb > 0);
+  if (debt < tb - MAX_LMEM)
+    debt = tb - MAX_LMEM;  /* will make 'totalbytes == MAX_LMEM' */
+  g->totalbytes = tb - debt;
+  g->GCdebt = debt;
+}
+
+
+CallInfo *luaE_extendCI (lua_State *L) {
+  CallInfo *ci = luaM_new(L, CallInfo);
+  lua_assert(L->ci->next == NULL);
+  L->ci->next = ci;
+  ci->previous = L->ci;
+  ci->next = NULL;
+  L->nci++;
+  return ci;
+}
+
+
+/*
+** free all CallInfo structures not in use by a thread
+*/
+void luaE_freeCI (lua_State *L) {
+  CallInfo *ci = L->ci;
+  CallInfo *next = ci->next;
+  ci->next = NULL;
+  while ((ci = next) != NULL) {
+    next = ci->next;
+    luaM_free(L, ci);
+    L->nci--;
+  }
+}
+
+
+/*
+** free half of the CallInfo structures not in use by a thread
+*/
+void luaE_shrinkCI (lua_State *L) {
+  CallInfo *ci = L->ci;
+  CallInfo *next2;  /* next's next */
+  /* while there are two nexts */
+  while (ci->next != NULL && (next2 = ci->next->next) != NULL) {
+    luaM_free(L, ci->next);  /* free next */
+    L->nci--;
+    ci->next = next2;  /* remove 'next' from the list */
+    next2->previous = ci;
+    ci = next2;  /* keep next's next */
+  }
+}
+
+
+static void stack_init (lua_State *L1, lua_State *L) {
+  int i; CallInfo *ci;
+  /* initialize stack array */
+  L1->stack = luaM_newvector(L, BASIC_STACK_SIZE, TValue);
+  L1->stacksize = BASIC_STACK_SIZE;
+  for (i = 0; i < BASIC_STACK_SIZE; i++)
+    setnilvalue(L1->stack + i);  /* erase new stack */
+  L1->top = L1->stack;
+  L1->stack_last = L1->stack + L1->stacksize - EXTRA_STACK;
+  /* initialize first ci */
+  ci = &L1->base_ci;
+  ci->next = ci->previous = NULL;
+  ci->callstatus = 0;
+  ci->func = L1->top;
+  setnilvalue(L1->top++);  /* 'function' entry for this 'ci' */
+  ci->top = L1->top + LUA_MINSTACK;
+  L1->ci = ci;
+}
+
+
+static void freestack (lua_State *L) {
+  if (L->stack == NULL)
+    return;  /* stack not completely built yet */
+  L->ci = &L->base_ci;  /* free the entire 'ci' list */
+  luaE_freeCI(L);
+  lua_assert(L->nci == 0);
+  luaM_freearray(L, L->stack, L->stacksize);  /* free stack array */
+}
+
+
+/*
+** Create registry table and its predefined values
+*/
+static void init_registry (lua_State *L, global_State *g) {
+  TValue temp;
+  /* create registry */
+  Table *registry = luaH_new(L);
+  sethvalue(L, &g->l_registry, registry);
+  luaH_resize(L, registry, LUA_RIDX_LAST, 0);
+  /* registry[LUA_RIDX_MAINTHREAD] = L */
+  setthvalue(L, &temp, L);  /* temp = L */
+  luaH_setint(L, registry, LUA_RIDX_MAINTHREAD, &temp);
+  /* registry[LUA_RIDX_GLOBALS] = table of globals */
+  sethvalue(L, &temp, luaH_new(L));  /* temp = new table (global table) */
+  luaH_setint(L, registry, LUA_RIDX_GLOBALS, &temp);
+}
+
+
+/*
+** open parts of the state that may cause memory-allocation errors.
+** ('g->version' != NULL flags that the state was completely build)
+*/
+static void f_luaopen (lua_State *L, void *ud) {
+  global_State *g = G(L);
+  UNUSED(ud);
+  stack_init(L, L);  /* init stack */
+  init_registry(L, g);
+  luaS_init(L);
+  luaT_init(L);
+  luaX_init(L);
+  g->gcrunning = 1;  /* allow gc */
+  g->version = lua_version(NULL);
+  luai_userstateopen(L);
+}
+
+
+/*
+** preinitialize a thread with consistent values without allocating
+** any memory (to avoid errors)
+*/
+static void preinit_thread (lua_State *L, global_State *g) {
+  G(L) = g;
+  L->stack = NULL;
+  L->ci = NULL;
+  L->nci = 0;
+  L->stacksize = 0;
+  L->twups = L;  /* thread has no upvalues */
+  L->errorJmp = NULL;
+  L->nCcalls = 0;
+  L->hook = NULL;
+  L->hookmask = 0;
+  L->basehookcount = 0;
+  L->allowhook = 1;
+  resethookcount(L);
+  L->openupval = NULL;
+  L->nny = 1;
+  L->status = LUA_OK;
+  L->errfunc = 0;
+}
+
+
+static void close_state (lua_State *L) {
+  global_State *g = G(L);
+  luaF_close(L, L->stack);  /* close all upvalues for this thread */
+  luaC_freeallobjects(L);  /* collect all objects */
+  if (g->version)  /* closing a fully built state? */
+    luai_userstateclose(L);
+  luaM_freearray(L, G(L)->strt.hash, G(L)->strt.size);
+  freestack(L);
+  lua_assert(gettotalbytes(g) == sizeof(LG));
+  (*g->frealloc)(g->ud, fromstate(L), sizeof(LG), 0);  /* free main block */
+}
+
+
+LUA_API lua_State *lua_newthread (lua_State *L) {
+  global_State *g = G(L);
+  lua_State *L1;
+  lua_lock(L);
+  luaC_checkGC(L);
+  /* create new thread */
+  L1 = &cast(LX *, luaM_newobject(L, LUA_TTHREAD, sizeof(LX)))->l;
+  L1->marked = luaC_white(g);
+  L1->tt = LUA_TTHREAD;
+  /* link it on list 'allgc' */
+  L1->next = g->allgc;
+  g->allgc = obj2gco(L1);
+  /* anchor it on L stack */
+  setthvalue(L, L->top, L1);
+  api_incr_top(L);
+  preinit_thread(L1, g);
+  L1->hookmask = L->hookmask;
+  L1->basehookcount = L->basehookcount;
+  L1->hook = L->hook;
+  resethookcount(L1);
+  /* initialize L1 extra space */
+  memcpy(lua_getextraspace(L1), lua_getextraspace(g->mainthread),
+         LUA_EXTRASPACE);
+  luai_userstatethread(L, L1);
+  stack_init(L1, L);  /* init stack */
+  lua_unlock(L);
+  return L1;
+}
+
+
+void luaE_freethread (lua_State *L, lua_State *L1) {
+  LX *l = fromstate(L1);
+  luaF_close(L1, L1->stack);  /* close all upvalues for this thread */
+  lua_assert(L1->openupval == NULL);
+  luai_userstatefree(L, L1);
+  freestack(L1);
+  luaM_free(L, l);
+}
+
+
+LUA_API lua_State *lua_newstate (lua_Alloc f, void *ud) {
+  int i;
+  lua_State *L;
+  global_State *g;
+  LG *l = cast(LG *, (*f)(ud, NULL, LUA_TTHREAD, sizeof(LG)));
+  if (l == NULL) return NULL;
+  L = &l->l.l;
+  g = &l->g;
+  L->next = NULL;
+  L->tt = LUA_TTHREAD;
+  g->currentwhite = bitmask(WHITE0BIT);
+  L->marked = luaC_white(g);
+  preinit_thread(L, g);
+  g->frealloc = f;
+  g->ud = ud;
+  g->mainthread = L;
+  g->seed = makeseed(L);
+  g->gcrunning = 0;  /* no GC while building state */
+  g->GCestimate = 0;
+  g->strt.size = g->strt.nuse = 0;
+  g->strt.hash = NULL;
+  setnilvalue(&g->l_registry);
+  g->panic = NULL;
+  g->version = NULL;
+  g->gcstate = GCSpause;
+  g->gckind = KGC_NORMAL;
+  g->allgc = g->finobj = g->tobefnz = g->fixedgc = NULL;
+  g->sweepgc = NULL;
+  g->gray = g->grayagain = NULL;
+  g->weak = g->ephemeron = g->allweak = NULL;
+  g->twups = NULL;
+  g->totalbytes = sizeof(LG);
+  g->GCdebt = 0;
+  g->gcfinnum = 0;
+  g->gcpause = LUAI_GCPAUSE;
+  g->gcstepmul = LUAI_GCMUL;
+  for (i=0; i < LUA_NUMTAGS; i++) g->mt[i] = NULL;
+  if (luaD_rawrunprotected(L, f_luaopen, NULL) != LUA_OK) {
+    /* memory allocation error: free partial state */
+    close_state(L);
+    L = NULL;
+  }
+  return L;
+}
+
+
+LUA_API void lua_close (lua_State *L) {
+  L = G(L)->mainthread;  /* only the main thread can be closed */
+  lua_lock(L);
+  close_state(L);
+}
+
+
diff --git a/scite-app/scite/lua/src/lstate.h b/scite-app/scite/lua/src/lstate.h
new file mode 100644
index 0000000..a469466
--- /dev/null
+++ b/scite-app/scite/lua/src/lstate.h
@@ -0,0 +1,235 @@
+/*
+** $Id: lstate.h,v 2.133 2016/12/22 13:08:50 roberto Exp $
+** Global State
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstate_h
+#define lstate_h
+
+#include "lua.h"
+
+#include "lobject.h"
+#include "ltm.h"
+#include "lzio.h"
+
+
+/*
+
+** Some notes about garbage-collected objects: All objects in Lua must
+** be kept somehow accessible until being freed, so all objects always
+** belong to one (and only one) of these lists, using field 'next' of
+** the 'CommonHeader' for the link:
+**
+** 'allgc': all objects not marked for finalization;
+** 'finobj': all objects marked for finalization;
+** 'tobefnz': all objects ready to be finalized;
+** 'fixedgc': all objects that are not to be collected (currently
+** only small strings, such as reserved words).
+
+*/
+
+
+struct lua_longjmp;  /* defined in ldo.c */
+
+
+/*
+** Atomic type (relative to signals) to better ensure that 'lua_sethook'
+** is thread safe
+*/
+#if !defined(l_signalT)
+#include <signal.h>
+#define l_signalT	sig_atomic_t
+#endif
+
+
+/* extra stack space to handle TM calls and some other extras */
+#define EXTRA_STACK   5
+
+
+#define BASIC_STACK_SIZE        (2*LUA_MINSTACK)
+
+
+/* kinds of Garbage Collection */
+#define KGC_NORMAL	0
+#define KGC_EMERGENCY	1	/* gc was forced by an allocation failure */
+
+
+typedef struct stringtable {
+  TString **hash;
+  int nuse;  /* number of elements */
+  int size;
+} stringtable;
+
+
+/*
+** Information about a call.
+** When a thread yields, 'func' is adjusted to pretend that the
+** top function has only the yielded values in its stack; in that
+** case, the actual 'func' value is saved in field 'extra'.
+** When a function calls another with a continuation, 'extra' keeps
+** the function index so that, in case of errors, the continuation
+** function can be called with the correct top.
+*/
+typedef struct CallInfo {
+  StkId func;  /* function index in the stack */
+  StkId	top;  /* top for this function */
+  struct CallInfo *previous, *next;  /* dynamic call link */
+  union {
+    struct {  /* only for Lua functions */
+      StkId base;  /* base for this function */
+      const Instruction *savedpc;
+    } l;
+    struct {  /* only for C functions */
+      lua_KFunction k;  /* continuation in case of yields */
+      ptrdiff_t old_errfunc;
+      lua_KContext ctx;  /* context info. in case of yields */
+    } c;
+  } u;
+  ptrdiff_t extra;
+  short nresults;  /* expected number of results from this function */
+  unsigned short callstatus;
+} CallInfo;
+
+
+/*
+** Bits in CallInfo status
+*/
+#define CIST_OAH	(1<<0)	/* original value of 'allowhook' */
+#define CIST_LUA	(1<<1)	/* call is running a Lua function */
+#define CIST_HOOKED	(1<<2)	/* call is running a debug hook */
+#define CIST_FRESH	(1<<3)	/* call is running on a fresh invocation
+                                   of luaV_execute */
+#define CIST_YPCALL	(1<<4)	/* call is a yieldable protected call */
+#define CIST_TAIL	(1<<5)	/* call was tail called */
+#define CIST_HOOKYIELD	(1<<6)	/* last hook called yielded */
+#define CIST_LEQ	(1<<7)  /* using __lt for __le */
+#define CIST_FIN	(1<<8)  /* call is running a finalizer */
+
+#define isLua(ci)	((ci)->callstatus & CIST_LUA)
+
+/* assume that CIST_OAH has offset 0 and that 'v' is strictly 0/1 */
+#define setoah(st,v)	((st) = ((st) & ~CIST_OAH) | (v))
+#define getoah(st)	((st) & CIST_OAH)
+
+
+/*
+** 'global state', shared by all threads of this state
+*/
+typedef struct global_State {
+  lua_Alloc frealloc;  /* function to reallocate memory */
+  void *ud;         /* auxiliary data to 'frealloc' */
+  l_mem totalbytes;  /* number of bytes currently allocated - GCdebt */
+  l_mem GCdebt;  /* bytes allocated not yet compensated by the collector */
+  lu_mem GCmemtrav;  /* memory traversed by the GC */
+  lu_mem GCestimate;  /* an estimate of the non-garbage memory in use */
+  stringtable strt;  /* hash table for strings */
+  TValue l_registry;
+  unsigned int seed;  /* randomized seed for hashes */
+  lu_byte currentwhite;
+  lu_byte gcstate;  /* state of garbage collector */
+  lu_byte gckind;  /* kind of GC running */
+  lu_byte gcrunning;  /* true if GC is running */
+  GCObject *allgc;  /* list of all collectable objects */
+  GCObject **sweepgc;  /* current position of sweep in list */
+  GCObject *finobj;  /* list of collectable objects with finalizers */
+  GCObject *gray;  /* list of gray objects */
+  GCObject *grayagain;  /* list of objects to be traversed atomically */
+  GCObject *weak;  /* list of tables with weak values */
+  GCObject *ephemeron;  /* list of ephemeron tables (weak keys) */
+  GCObject *allweak;  /* list of all-weak tables */
+  GCObject *tobefnz;  /* list of userdata to be GC */
+  GCObject *fixedgc;  /* list of objects not to be collected */
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  unsigned int gcfinnum;  /* number of finalizers to call in each GC step */
+  int gcpause;  /* size of pause between successive GCs */
+  int gcstepmul;  /* GC 'granularity' */
+  lua_CFunction panic;  /* to be called in unprotected errors */
+  struct lua_State *mainthread;
+  const lua_Number *version;  /* pointer to version number */
+  TString *memerrmsg;  /* memory-error message */
+  TString *tmname[TM_N];  /* array with tag-method names */
+  struct Table *mt[LUA_NUMTAGS];  /* metatables for basic types */
+  TString *strcache[STRCACHE_N][STRCACHE_M];  /* cache for strings in API */
+} global_State;
+
+
+/*
+** 'per thread' state
+*/
+struct lua_State {
+  CommonHeader;
+  unsigned short nci;  /* number of items in 'ci' list */
+  lu_byte status;
+  StkId top;  /* first free slot in the stack */
+  global_State *l_G;
+  CallInfo *ci;  /* call info for current function */
+  const Instruction *oldpc;  /* last pc traced */
+  StkId stack_last;  /* last free slot in the stack */
+  StkId stack;  /* stack base */
+  UpVal *openupval;  /* list of open upvalues in this stack */
+  GCObject *gclist;
+  struct lua_State *twups;  /* list of threads with open upvalues */
+  struct lua_longjmp *errorJmp;  /* current error recover point */
+  CallInfo base_ci;  /* CallInfo for first level (C calling Lua) */
+  volatile lua_Hook hook;
+  ptrdiff_t errfunc;  /* current error handling function (stack index) */
+  int stacksize;
+  int basehookcount;
+  int hookcount;
+  unsigned short nny;  /* number of non-yieldable calls in stack */
+  unsigned short nCcalls;  /* number of nested C calls */
+  l_signalT hookmask;
+  lu_byte allowhook;
+};
+
+
+#define G(L)	(L->l_G)
+
+
+/*
+** Union of all collectable objects (only for conversions)
+*/
+union GCUnion {
+  GCObject gc;  /* common header */
+  struct TString ts;
+  struct Udata u;
+  union Closure cl;
+  struct Table h;
+  struct Proto p;
+  struct lua_State th;  /* thread */
+};
+
+
+#define cast_u(o)	cast(union GCUnion *, (o))
+
+/* macros to convert a GCObject into a specific value */
+#define gco2ts(o)  \
+	check_exp(novariant((o)->tt) == LUA_TSTRING, &((cast_u(o))->ts))
+#define gco2u(o)  check_exp((o)->tt == LUA_TUSERDATA, &((cast_u(o))->u))
+#define gco2lcl(o)  check_exp((o)->tt == LUA_TLCL, &((cast_u(o))->cl.l))
+#define gco2ccl(o)  check_exp((o)->tt == LUA_TCCL, &((cast_u(o))->cl.c))
+#define gco2cl(o)  \
+	check_exp(novariant((o)->tt) == LUA_TFUNCTION, &((cast_u(o))->cl))
+#define gco2t(o)  check_exp((o)->tt == LUA_TTABLE, &((cast_u(o))->h))
+#define gco2p(o)  check_exp((o)->tt == LUA_TPROTO, &((cast_u(o))->p))
+#define gco2th(o)  check_exp((o)->tt == LUA_TTHREAD, &((cast_u(o))->th))
+
+
+/* macro to convert a Lua object into a GCObject */
+#define obj2gco(v) \
+	check_exp(novariant((v)->tt) < LUA_TDEADKEY, (&(cast_u(v)->gc)))
+
+
+/* actual number of total bytes allocated */
+#define gettotalbytes(g)	cast(lu_mem, (g)->totalbytes + (g)->GCdebt)
+
+LUAI_FUNC void luaE_setdebt (global_State *g, l_mem debt);
+LUAI_FUNC void luaE_freethread (lua_State *L, lua_State *L1);
+LUAI_FUNC CallInfo *luaE_extendCI (lua_State *L);
+LUAI_FUNC void luaE_freeCI (lua_State *L);
+LUAI_FUNC void luaE_shrinkCI (lua_State *L);
+
+
+#endif
+
diff --git a/scite-app/scite/lua/src/lstring.c b/scite-app/scite/lua/src/lstring.c
new file mode 100644
index 0000000..9351766
--- /dev/null
+++ b/scite-app/scite/lua/src/lstring.c
@@ -0,0 +1,248 @@
+/*
+** $Id: lstring.c,v 2.56 2015/11/23 11:32:51 roberto Exp $
+** String table (keeps all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#define lstring_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+
+
+#define MEMERRMSG       "not enough memory"
+
+
+/*
+** Lua will use at most ~(2^LUAI_HASHLIMIT) bytes from a string to
+** compute its hash
+*/
+#if !defined(LUAI_HASHLIMIT)
+#define LUAI_HASHLIMIT		5
+#endif
+
+
+/*
+** equality for long strings
+*/
+int luaS_eqlngstr (TString *a, TString *b) {
+  size_t len = a->u.lnglen;
+  lua_assert(a->tt == LUA_TLNGSTR && b->tt == LUA_TLNGSTR);
+  return (a == b) ||  /* same instance or... */
+    ((len == b->u.lnglen) &&  /* equal length and ... */
+     (memcmp(getstr(a), getstr(b), len) == 0));  /* equal contents */
+}
+
+
+unsigned int luaS_hash (const char *str, size_t l, unsigned int seed) {
+  unsigned int h = seed ^ cast(unsigned int, l);
+  size_t step = (l >> LUAI_HASHLIMIT) + 1;
+  for (; l >= step; l -= step)
+    h ^= ((h<<5) + (h>>2) + cast_byte(str[l - 1]));
+  return h;
+}
+
+
+unsigned int luaS_hashlongstr (TString *ts) {
+  lua_assert(ts->tt == LUA_TLNGSTR);
+  if (ts->extra == 0) {  /* no hash? */
+    ts->hash = luaS_hash(getstr(ts), ts->u.lnglen, ts->hash);
+    ts->extra = 1;  /* now it has its hash */
+  }
+  return ts->hash;
+}
+
+
+/*
+** resizes the string table
+*/
+void luaS_resize (lua_State *L, int newsize) {
+  int i;
+  stringtable *tb = &G(L)->strt;
+  if (newsize > tb->size) {  /* grow table if needed */
+    luaM_reallocvector(L, tb->hash, tb->size, newsize, TString *);
+    for (i = tb->size; i < newsize; i++)
+      tb->hash[i] = NULL;
+  }
+  for (i = 0; i < tb->size; i++) {  /* rehash */
+    TString *p = tb->hash[i];
+    tb->hash[i] = NULL;
+    while (p) {  /* for each node in the list */
+      TString *hnext = p->u.hnext;  /* save next */
+      unsigned int h = lmod(p->hash, newsize);  /* new position */
+      p->u.hnext = tb->hash[h];  /* chain it */
+      tb->hash[h] = p;
+      p = hnext;
+    }
+  }
+  if (newsize < tb->size) {  /* shrink table if needed */
+    /* vanishing slice should be empty */
+    lua_assert(tb->hash[newsize] == NULL && tb->hash[tb->size - 1] == NULL);
+    luaM_reallocvector(L, tb->hash, tb->size, newsize, TString *);
+  }
+  tb->size = newsize;
+}
+
+
+/*
+** Clear API string cache. (Entries cannot be empty, so fill them with
+** a non-collectable string.)
+*/
+void luaS_clearcache (global_State *g) {
+  int i, j;
+  for (i = 0; i < STRCACHE_N; i++)
+    for (j = 0; j < STRCACHE_M; j++) {
+    if (iswhite(g->strcache[i][j]))  /* will entry be collected? */
+      g->strcache[i][j] = g->memerrmsg;  /* replace it with something fixed */
+    }
+}
+
+
+/*
+** Initialize the string table and the string cache
+*/
+void luaS_init (lua_State *L) {
+  global_State *g = G(L);
+  int i, j;
+  luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaC_fix(L, obj2gco(g->memerrmsg));  /* it should never be collected */
+  for (i = 0; i < STRCACHE_N; i++)  /* fill cache with valid strings */
+    for (j = 0; j < STRCACHE_M; j++)
+      g->strcache[i][j] = g->memerrmsg;
+}
+
+
+
+/*
+** creates a new string object
+*/
+static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
+  TString *ts;
+  GCObject *o;
+  size_t totalsize;  /* total size of TString object */
+  totalsize = sizelstring(l);
+  o = luaC_newobj(L, tag, totalsize);
+  ts = gco2ts(o);
+  ts->hash = h;
+  ts->extra = 0;
+  getstr(ts)[l] = '\0';  /* ending 0 */
+  return ts;
+}
+
+
+TString *luaS_createlngstrobj (lua_State *L, size_t l) {
+  TString *ts = createstrobj(L, l, LUA_TLNGSTR, G(L)->seed);
+  ts->u.lnglen = l;
+  return ts;
+}
+
+
+void luaS_remove (lua_State *L, TString *ts) {
+  stringtable *tb = &G(L)->strt;
+  TString **p = &tb->hash[lmod(ts->hash, tb->size)];
+  while (*p != ts)  /* find previous element */
+    p = &(*p)->u.hnext;
+  *p = (*p)->u.hnext;  /* remove element from its list */
+  tb->nuse--;
+}
+
+
+/*
+** checks whether short string exists and reuses it or creates a new one
+*/
+static TString *internshrstr (lua_State *L, const char *str, size_t l) {
+  TString *ts;
+  global_State *g = G(L);
+  unsigned int h = luaS_hash(str, l, g->seed);
+  TString **list = &g->strt.hash[lmod(h, g->strt.size)];
+  lua_assert(str != NULL);  /* otherwise 'memcmp'/'memcpy' are undefined */
+  for (ts = *list; ts != NULL; ts = ts->u.hnext) {
+    if (l == ts->shrlen &&
+        (memcmp(str, getstr(ts), l * sizeof(char)) == 0)) {
+      /* found! */
+      if (isdead(g, ts))  /* dead (but not collected yet)? */
+        changewhite(ts);  /* resurrect it */
+      return ts;
+    }
+  }
+  if (g->strt.nuse >= g->strt.size && g->strt.size <= MAX_INT/2) {
+    luaS_resize(L, g->strt.size * 2);
+    list = &g->strt.hash[lmod(h, g->strt.size)];  /* recompute with new size */
+  }
+  ts = createstrobj(L, l, LUA_TSHRSTR, h);
+  memcpy(getstr(ts), str, l * sizeof(char));
+  ts->shrlen = cast_byte(l);
+  ts->u.hnext = *list;
+  *list = ts;
+  g->strt.nuse++;
+  return ts;
+}
+
+
+/*
+** new string (with explicit length)
+*/
+TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
+  if (l <= LUAI_MAXSHORTLEN)  /* short string? */
+    return internshrstr(L, str, l);
+  else {
+    TString *ts;
+    if (l >= (MAX_SIZE - sizeof(TString))/sizeof(char))
+      luaM_toobig(L);
+    ts = luaS_createlngstrobj(L, l);
+    memcpy(getstr(ts), str, l * sizeof(char));
+    return ts;
+  }
+}
+
+
+/*
+** Create or reuse a zero-terminated string, first checking in the
+** cache (using the string address as a key). The cache can contain
+** only zero-terminated strings, so it is safe to use 'strcmp' to
+** check hits.
+*/
+TString *luaS_new (lua_State *L, const char *str) {
+  unsigned int i = point2uint(str) % STRCACHE_N;  /* hash */
+  int j;
+  TString **p = G(L)->strcache[i];
+  for (j = 0; j < STRCACHE_M; j++) {
+    if (strcmp(str, getstr(p[j])) == 0)  /* hit? */
+      return p[j];  /* that is it */
+  }
+  /* normal route */
+  for (j = STRCACHE_M - 1; j > 0; j--)
+    p[j] = p[j - 1];  /* move out last element */
+  /* new element is first in the list */
+  p[0] = luaS_newlstr(L, str, strlen(str));
+  return p[0];
+}
+
+
+Udata *luaS_newudata (lua_State *L, size_t s) {
+  Udata *u;
+  GCObject *o;
+  if (s > MAX_SIZE - sizeof(Udata))
+    luaM_toobig(L);
+  o = luaC_newobj(L, LUA_TUSERDATA, sizeludata(s));
+  u = gco2u(o);
+  u->len = s;
+  u->metatable = NULL;
+  setuservalue(L, u, luaO_nilobject);
+  return u;
+}
+
diff --git a/scite-app/scite/lua/src/lstring.h b/scite-app/scite/lua/src/lstring.h
new file mode 100644
index 0000000..27efd20
--- /dev/null
+++ b/scite-app/scite/lua/src/lstring.h
@@ -0,0 +1,49 @@
+/*
+** $Id: lstring.h,v 1.61 2015/11/03 15:36:01 roberto Exp $
+** String table (keep all strings handled by Lua)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lstring_h
+#define lstring_h
+
+#include "lgc.h"
+#include "lobject.h"
+#include "lstate.h"
+
+
+#define sizelstring(l)  (sizeof(union UTString) + ((l) + 1) * sizeof(char))
+
+#define sizeludata(l)	(sizeof(union UUdata) + (l))
+#define sizeudata(u)	sizeludata((u)->len)
+
+#define luaS_newliteral(L, s)	(luaS_newlstr(L, "" s, \
+                                 (sizeof(s)/sizeof(char))-1))
+
+
+/*
+** test whether a string is a reserved word
+*/
+#define isreserved(s)	((s)->tt == LUA_TSHRSTR && (s)->extra > 0)
+
+
+/*
+** equality for short strings, which are always internalized
+*/
+#define eqshrstr(a,b)	check_exp((a)->tt == LUA_TSHRSTR, (a) == (b))
+
+
+LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed);
+LUAI_FUNC unsigned int luaS_hashlongstr (TString *ts);
+LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b);
+LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
+LUAI_FUNC void luaS_clearcache (global_State *g);
+LUAI_FUNC void luaS_init (lua_State *L);
+LUAI_FUNC void luaS_remove (lua_State *L, TString *ts);
+LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s);
+LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
+LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
+LUAI_FUNC TString *luaS_createlngstrobj (lua_State *L, size_t l);
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lstrlib.c b/scite-app/scite/lua/src/lstrlib.c
new file mode 100644
index 0000000..c7aa755
--- /dev/null
+++ b/scite-app/scite/lua/src/lstrlib.c
@@ -0,0 +1,1584 @@
+/*
+** $Id: lstrlib.c,v 1.254 2016/12/22 13:08:50 roberto Exp $
+** Standard library for string operations and pattern-matching
+** See Copyright Notice in lua.h
+*/
+
+#define lstrlib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <ctype.h>
+#include <float.h>
+#include <limits.h>
+#include <locale.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** maximum number of captures that a pattern can do during
+** pattern-matching. This limit is arbitrary, but must fit in
+** an unsigned char.
+*/
+#if !defined(LUA_MAXCAPTURES)
+#define LUA_MAXCAPTURES		32
+#endif
+
+
+/* macro to 'unsign' a character */
+#define uchar(c)	((unsigned char)(c))
+
+
+/*
+** Some sizes are better limited to fit in 'int', but must also fit in
+** 'size_t'. (We assume that 'lua_Integer' cannot be smaller than 'int'.)
+*/
+#define MAX_SIZET	((size_t)(~(size_t)0))
+
+#define MAXSIZE  \
+	(sizeof(size_t) < sizeof(int) ? MAX_SIZET : (size_t)(INT_MAX))
+
+
+
+
+static int str_len (lua_State *L) {
+  size_t l;
+  luaL_checklstring(L, 1, &l);
+  lua_pushinteger(L, (lua_Integer)l);
+  return 1;
+}
+
+
+/* translate a relative string position: negative means back from end */
+static lua_Integer posrelat (lua_Integer pos, size_t len) {
+  if (pos >= 0) return pos;
+  else if (0u - (size_t)pos > len) return 0;
+  else return (lua_Integer)len + pos + 1;
+}
+
+
+static int str_sub (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer start = posrelat(luaL_checkinteger(L, 2), l);
+  lua_Integer end = posrelat(luaL_optinteger(L, 3, -1), l);
+  if (start < 1) start = 1;
+  if (end > (lua_Integer)l) end = l;
+  if (start <= end)
+    lua_pushlstring(L, s + start - 1, (size_t)(end - start) + 1);
+  else lua_pushliteral(L, "");
+  return 1;
+}
+
+
+static int str_reverse (lua_State *L) {
+  size_t l, i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i = 0; i < l; i++)
+    p[i] = s[l - i - 1];
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_lower (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = tolower(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_upper (lua_State *L) {
+  size_t l;
+  size_t i;
+  luaL_Buffer b;
+  const char *s = luaL_checklstring(L, 1, &l);
+  char *p = luaL_buffinitsize(L, &b, l);
+  for (i=0; i<l; i++)
+    p[i] = toupper(uchar(s[i]));
+  luaL_pushresultsize(&b, l);
+  return 1;
+}
+
+
+static int str_rep (lua_State *L) {
+  size_t l, lsep;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer n = luaL_checkinteger(L, 2);
+  const char *sep = luaL_optlstring(L, 3, "", &lsep);
+  if (n <= 0) lua_pushliteral(L, "");
+  else if (l + lsep < l || l + lsep > MAXSIZE / n)  /* may overflow? */
+    return luaL_error(L, "resulting string too large");
+  else {
+    size_t totallen = (size_t)n * l + (size_t)(n - 1) * lsep;
+    luaL_Buffer b;
+    char *p = luaL_buffinitsize(L, &b, totallen);
+    while (n-- > 1) {  /* first n-1 copies (followed by separator) */
+      memcpy(p, s, l * sizeof(char)); p += l;
+      if (lsep > 0) {  /* empty 'memcpy' is not that cheap */
+        memcpy(p, sep, lsep * sizeof(char));
+        p += lsep;
+      }
+    }
+    memcpy(p, s, l * sizeof(char));  /* last copy (not followed by separator) */
+    luaL_pushresultsize(&b, totallen);
+  }
+  return 1;
+}
+
+
+static int str_byte (lua_State *L) {
+  size_t l;
+  const char *s = luaL_checklstring(L, 1, &l);
+  lua_Integer posi = posrelat(luaL_optinteger(L, 2, 1), l);
+  lua_Integer pose = posrelat(luaL_optinteger(L, 3, posi), l);
+  int n, i;
+  if (posi < 1) posi = 1;
+  if (pose > (lua_Integer)l) pose = l;
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (pose - posi >= INT_MAX)  /* arithmetic overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;
+  luaL_checkstack(L, n, "string slice too long");
+  for (i=0; i<n; i++)
+    lua_pushinteger(L, uchar(s[posi+i-1]));
+  return n;
+}
+
+
+static int str_char (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  int i;
+  luaL_Buffer b;
+  char *p = luaL_buffinitsize(L, &b, n);
+  for (i=1; i<=n; i++) {
+    lua_Integer c = luaL_checkinteger(L, i);
+    luaL_argcheck(L, uchar(c) == c, i, "value out of range");
+    p[i - 1] = uchar(c);
+  }
+  luaL_pushresultsize(&b, n);
+  return 1;
+}
+
+
+static int writer (lua_State *L, const void *b, size_t size, void *B) {
+  (void)L;
+  luaL_addlstring((luaL_Buffer *) B, (const char *)b, size);
+  return 0;
+}
+
+
+static int str_dump (lua_State *L) {
+  luaL_Buffer b;
+  int strip = lua_toboolean(L, 2);
+  luaL_checktype(L, 1, LUA_TFUNCTION);
+  lua_settop(L, 1);
+  luaL_buffinit(L,&b);
+  if (lua_dump(L, writer, &b, strip) != 0)
+    return luaL_error(L, "unable to dump given function");
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+
+/*
+** {======================================================
+** PATTERN MATCHING
+** =======================================================
+*/
+
+
+#define CAP_UNFINISHED	(-1)
+#define CAP_POSITION	(-2)
+
+
+typedef struct MatchState {
+  const char *src_init;  /* init of source string */
+  const char *src_end;  /* end ('\0') of source string */
+  const char *p_end;  /* end ('\0') of pattern */
+  lua_State *L;
+  int matchdepth;  /* control for recursive depth (to avoid C stack overflow) */
+  unsigned char level;  /* total number of captures (finished or unfinished) */
+  struct {
+    const char *init;
+    ptrdiff_t len;
+  } capture[LUA_MAXCAPTURES];
+} MatchState;
+
+
+/* recursive function */
+static const char *match (MatchState *ms, const char *s, const char *p);
+
+
+/* maximum recursion depth for 'match' */
+#if !defined(MAXCCALLS)
+#define MAXCCALLS	200
+#endif
+
+
+#define L_ESC		'%'
+#define SPECIALS	"^$*+?.([%-"
+
+
+static int check_capture (MatchState *ms, int l) {
+  l -= '1';
+  if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
+    return luaL_error(ms->L, "invalid capture index %%%d", l + 1);
+  return l;
+}
+
+
+static int capture_to_close (MatchState *ms) {
+  int level = ms->level;
+  for (level--; level>=0; level--)
+    if (ms->capture[level].len == CAP_UNFINISHED) return level;
+  return luaL_error(ms->L, "invalid pattern capture");
+}
+
+
+static const char *classend (MatchState *ms, const char *p) {
+  switch (*p++) {
+    case L_ESC: {
+      if (p == ms->p_end)
+        luaL_error(ms->L, "malformed pattern (ends with '%%')");
+      return p+1;
+    }
+    case '[': {
+      if (*p == '^') p++;
+      do {  /* look for a ']' */
+        if (p == ms->p_end)
+          luaL_error(ms->L, "malformed pattern (missing ']')");
+        if (*(p++) == L_ESC && p < ms->p_end)
+          p++;  /* skip escapes (e.g. '%]') */
+      } while (*p != ']');
+      return p+1;
+    }
+    default: {
+      return p;
+    }
+  }
+}
+
+
+static int match_class (int c, int cl) {
+  int res;
+  switch (tolower(cl)) {
+    case 'a' : res = isalpha(c); break;
+    case 'c' : res = iscntrl(c); break;
+    case 'd' : res = isdigit(c); break;
+    case 'g' : res = isgraph(c); break;
+    case 'l' : res = islower(c); break;
+    case 'p' : res = ispunct(c); break;
+    case 's' : res = isspace(c); break;
+    case 'u' : res = isupper(c); break;
+    case 'w' : res = isalnum(c); break;
+    case 'x' : res = isxdigit(c); break;
+    case 'z' : res = (c == 0); break;  /* deprecated option */
+    default: return (cl == c);
+  }
+  return (islower(cl) ? res : !res);
+}
+
+
+static int matchbracketclass (int c, const char *p, const char *ec) {
+  int sig = 1;
+  if (*(p+1) == '^') {
+    sig = 0;
+    p++;  /* skip the '^' */
+  }
+  while (++p < ec) {
+    if (*p == L_ESC) {
+      p++;
+      if (match_class(c, uchar(*p)))
+        return sig;
+    }
+    else if ((*(p+1) == '-') && (p+2 < ec)) {
+      p+=2;
+      if (uchar(*(p-2)) <= c && c <= uchar(*p))
+        return sig;
+    }
+    else if (uchar(*p) == c) return sig;
+  }
+  return !sig;
+}
+
+
+static int singlematch (MatchState *ms, const char *s, const char *p,
+                        const char *ep) {
+  if (s >= ms->src_end)
+    return 0;
+  else {
+    int c = uchar(*s);
+    switch (*p) {
+      case '.': return 1;  /* matches any char */
+      case L_ESC: return match_class(c, uchar(*(p+1)));
+      case '[': return matchbracketclass(c, p, ep-1);
+      default:  return (uchar(*p) == c);
+    }
+  }
+}
+
+
+static const char *matchbalance (MatchState *ms, const char *s,
+                                   const char *p) {
+  if (p >= ms->p_end - 1)
+    luaL_error(ms->L, "malformed pattern (missing arguments to '%%b')");
+  if (*s != *p) return NULL;
+  else {
+    int b = *p;
+    int e = *(p+1);
+    int cont = 1;
+    while (++s < ms->src_end) {
+      if (*s == e) {
+        if (--cont == 0) return s+1;
+      }
+      else if (*s == b) cont++;
+    }
+  }
+  return NULL;  /* string ends out of balance */
+}
+
+
+static const char *max_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  ptrdiff_t i = 0;  /* counts maximum expand for item */
+  while (singlematch(ms, s + i, p, ep))
+    i++;
+  /* keeps trying to match with the maximum repetitions */
+  while (i>=0) {
+    const char *res = match(ms, (s+i), ep+1);
+    if (res) return res;
+    i--;  /* else didn't match; reduce 1 repetition to try again */
+  }
+  return NULL;
+}
+
+
+static const char *min_expand (MatchState *ms, const char *s,
+                                 const char *p, const char *ep) {
+  for (;;) {
+    const char *res = match(ms, s, ep+1);
+    if (res != NULL)
+      return res;
+    else if (singlematch(ms, s, p, ep))
+      s++;  /* try with one more repetition */
+    else return NULL;
+  }
+}
+
+
+static const char *start_capture (MatchState *ms, const char *s,
+                                    const char *p, int what) {
+  const char *res;
+  int level = ms->level;
+  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+  ms->capture[level].init = s;
+  ms->capture[level].len = what;
+  ms->level = level+1;
+  if ((res=match(ms, s, p)) == NULL)  /* match failed? */
+    ms->level--;  /* undo capture */
+  return res;
+}
+
+
+static const char *end_capture (MatchState *ms, const char *s,
+                                  const char *p) {
+  int l = capture_to_close(ms);
+  const char *res;
+  ms->capture[l].len = s - ms->capture[l].init;  /* close capture */
+  if ((res = match(ms, s, p)) == NULL)  /* match failed? */
+    ms->capture[l].len = CAP_UNFINISHED;  /* undo capture */
+  return res;
+}
+
+
+static const char *match_capture (MatchState *ms, const char *s, int l) {
+  size_t len;
+  l = check_capture(ms, l);
+  len = ms->capture[l].len;
+  if ((size_t)(ms->src_end-s) >= len &&
+      memcmp(ms->capture[l].init, s, len) == 0)
+    return s+len;
+  else return NULL;
+}
+
+
+static const char *match (MatchState *ms, const char *s, const char *p) {
+  if (ms->matchdepth-- == 0)
+    luaL_error(ms->L, "pattern too complex");
+  init: /* using goto's to optimize tail recursion */
+  if (p != ms->p_end) {  /* end of pattern? */
+    switch (*p) {
+      case '(': {  /* start capture */
+        if (*(p + 1) == ')')  /* position capture? */
+          s = start_capture(ms, s, p + 2, CAP_POSITION);
+        else
+          s = start_capture(ms, s, p + 1, CAP_UNFINISHED);
+        break;
+      }
+      case ')': {  /* end capture */
+        s = end_capture(ms, s, p + 1);
+        break;
+      }
+      case '$': {
+        if ((p + 1) != ms->p_end)  /* is the '$' the last char in pattern? */
+          goto dflt;  /* no; go to default */
+        s = (s == ms->src_end) ? s : NULL;  /* check end of string */
+        break;
+      }
+      case L_ESC: {  /* escaped sequences not in the format class[*+?-]? */
+        switch (*(p + 1)) {
+          case 'b': {  /* balanced string? */
+            s = matchbalance(ms, s, p + 2);
+            if (s != NULL) {
+              p += 4; goto init;  /* return match(ms, s, p + 4); */
+            }  /* else fail (s == NULL) */
+            break;
+          }
+          case 'f': {  /* frontier? */
+            const char *ep; char previous;
+            p += 2;
+            if (*p != '[')
+              luaL_error(ms->L, "missing '[' after '%%f' in pattern");
+            ep = classend(ms, p);  /* points to what is next */
+            previous = (s == ms->src_init) ? '\0' : *(s - 1);
+            if (!matchbracketclass(uchar(previous), p, ep - 1) &&
+               matchbracketclass(uchar(*s), p, ep - 1)) {
+              p = ep; goto init;  /* return match(ms, s, ep); */
+            }
+            s = NULL;  /* match failed */
+            break;
+          }
+          case '0': case '1': case '2': case '3':
+          case '4': case '5': case '6': case '7':
+          case '8': case '9': {  /* capture results (%0-%9)? */
+            s = match_capture(ms, s, uchar(*(p + 1)));
+            if (s != NULL) {
+              p += 2; goto init;  /* return match(ms, s, p + 2) */
+            }
+            break;
+          }
+          default: goto dflt;
+        }
+        break;
+      }
+      default: dflt: {  /* pattern class plus optional suffix */
+        const char *ep = classend(ms, p);  /* points to optional suffix */
+        /* does not match at least once? */
+        if (!singlematch(ms, s, p, ep)) {
+          if (*ep == '*' || *ep == '?' || *ep == '-') {  /* accept empty? */
+            p = ep + 1; goto init;  /* return match(ms, s, ep + 1); */
+          }
+          else  /* '+' or no suffix */
+            s = NULL;  /* fail */
+        }
+        else {  /* matched once */
+          switch (*ep) {  /* handle optional suffix */
+            case '?': {  /* optional */
+              const char *res;
+              if ((res = match(ms, s + 1, ep + 1)) != NULL)
+                s = res;
+              else {
+                p = ep + 1; goto init;  /* else return match(ms, s, ep + 1); */
+              }
+              break;
+            }
+            case '+':  /* 1 or more repetitions */
+              s++;  /* 1 match already done */
+              /* FALLTHROUGH */
+            case '*':  /* 0 or more repetitions */
+              s = max_expand(ms, s, p, ep);
+              break;
+            case '-':  /* 0 or more repetitions (minimum) */
+              s = min_expand(ms, s, p, ep);
+              break;
+            default:  /* no suffix */
+              s++; p = ep; goto init;  /* return match(ms, s + 1, ep); */
+          }
+        }
+        break;
+      }
+    }
+  }
+  ms->matchdepth++;
+  return s;
+}
+
+
+
+static const char *lmemfind (const char *s1, size_t l1,
+                               const char *s2, size_t l2) {
+  if (l2 == 0) return s1;  /* empty strings are everywhere */
+  else if (l2 > l1) return NULL;  /* avoids a negative 'l1' */
+  else {
+    const char *init;  /* to search for a '*s2' inside 's1' */
+    l2--;  /* 1st char will be checked by 'memchr' */
+    l1 = l1-l2;  /* 's2' cannot be found after that */
+    while (l1 > 0 && (init = (const char *)memchr(s1, *s2, l1)) != NULL) {
+      init++;   /* 1st char is already checked */
+      if (memcmp(init, s2+1, l2) == 0)
+        return init-1;
+      else {  /* correct 'l1' and 's1' to try again */
+        l1 -= init-s1;
+        s1 = init;
+      }
+    }
+    return NULL;  /* not found */
+  }
+}
+
+
+static void push_onecapture (MatchState *ms, int i, const char *s,
+                                                    const char *e) {
+  if (i >= ms->level) {
+    if (i == 0)  /* ms->level == 0, too */
+      lua_pushlstring(ms->L, s, e - s);  /* add whole match */
+    else
+      luaL_error(ms->L, "invalid capture index %%%d", i + 1);
+  }
+  else {
+    ptrdiff_t l = ms->capture[i].len;
+    if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
+    if (l == CAP_POSITION)
+      lua_pushinteger(ms->L, (ms->capture[i].init - ms->src_init) + 1);
+    else
+      lua_pushlstring(ms->L, ms->capture[i].init, l);
+  }
+}
+
+
+static int push_captures (MatchState *ms, const char *s, const char *e) {
+  int i;
+  int nlevels = (ms->level == 0 && s) ? 1 : ms->level;
+  luaL_checkstack(ms->L, nlevels, "too many captures");
+  for (i = 0; i < nlevels; i++)
+    push_onecapture(ms, i, s, e);
+  return nlevels;  /* number of strings pushed */
+}
+
+
+/* check whether pattern has no special characters */
+static int nospecials (const char *p, size_t l) {
+  size_t upto = 0;
+  do {
+    if (strpbrk(p + upto, SPECIALS))
+      return 0;  /* pattern has a special character */
+    upto += strlen(p + upto) + 1;  /* may have more after \0 */
+  } while (upto <= l);
+  return 1;  /* no special chars found */
+}
+
+
+static void prepstate (MatchState *ms, lua_State *L,
+                       const char *s, size_t ls, const char *p, size_t lp) {
+  ms->L = L;
+  ms->matchdepth = MAXCCALLS;
+  ms->src_init = s;
+  ms->src_end = s + ls;
+  ms->p_end = p + lp;
+}
+
+
+static void reprepstate (MatchState *ms) {
+  ms->level = 0;
+  lua_assert(ms->matchdepth == MAXCCALLS);
+}
+
+
+static int str_find_aux (lua_State *L, int find) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  lua_Integer init = posrelat(luaL_optinteger(L, 3, 1), ls);
+  if (init < 1) init = 1;
+  else if (init > (lua_Integer)ls + 1) {  /* start after string's end? */
+    lua_pushnil(L);  /* cannot find anything */
+    return 1;
+  }
+  /* explicit request or no special characters? */
+  if (find && (lua_toboolean(L, 4) || nospecials(p, lp))) {
+    /* do a plain search */
+    const char *s2 = lmemfind(s + init - 1, ls - (size_t)init + 1, p, lp);
+    if (s2) {
+      lua_pushinteger(L, (s2 - s) + 1);
+      lua_pushinteger(L, (s2 - s) + lp);
+      return 2;
+    }
+  }
+  else {
+    MatchState ms;
+    const char *s1 = s + init - 1;
+    int anchor = (*p == '^');
+    if (anchor) {
+      p++; lp--;  /* skip anchor character */
+    }
+    prepstate(&ms, L, s, ls, p, lp);
+    do {
+      const char *res;
+      reprepstate(&ms);
+      if ((res=match(&ms, s1, p)) != NULL) {
+        if (find) {
+          lua_pushinteger(L, (s1 - s) + 1);  /* start */
+          lua_pushinteger(L, res - s);   /* end */
+          return push_captures(&ms, NULL, 0) + 2;
+        }
+        else
+          return push_captures(&ms, s1, res);
+      }
+    } while (s1++ < ms.src_end && !anchor);
+  }
+  lua_pushnil(L);  /* not found */
+  return 1;
+}
+
+
+static int str_find (lua_State *L) {
+  return str_find_aux(L, 1);
+}
+
+
+static int str_match (lua_State *L) {
+  return str_find_aux(L, 0);
+}
+
+
+/* state for 'gmatch' */
+typedef struct GMatchState {
+  const char *src;  /* current position */
+  const char *p;  /* pattern */
+  const char *lastmatch;  /* end of last match */
+  MatchState ms;  /* match state */
+} GMatchState;
+
+
+static int gmatch_aux (lua_State *L) {
+  GMatchState *gm = (GMatchState *)lua_touserdata(L, lua_upvalueindex(3));
+  const char *src;
+  gm->ms.L = L;
+  for (src = gm->src; src <= gm->ms.src_end; src++) {
+    const char *e;
+    reprepstate(&gm->ms);
+    if ((e = match(&gm->ms, src, gm->p)) != NULL && e != gm->lastmatch) {
+      gm->src = gm->lastmatch = e;
+      return push_captures(&gm->ms, src, e);
+    }
+  }
+  return 0;  /* not found */
+}
+
+
+static int gmatch (lua_State *L) {
+  size_t ls, lp;
+  const char *s = luaL_checklstring(L, 1, &ls);
+  const char *p = luaL_checklstring(L, 2, &lp);
+  GMatchState *gm;
+  lua_settop(L, 2);  /* keep them on closure to avoid being collected */
+  gm = (GMatchState *)lua_newuserdata(L, sizeof(GMatchState));
+  prepstate(&gm->ms, L, s, ls, p, lp);
+  gm->src = s; gm->p = p; gm->lastmatch = NULL;
+  lua_pushcclosure(L, gmatch_aux, 3);
+  return 1;
+}
+
+
+static void add_s (MatchState *ms, luaL_Buffer *b, const char *s,
+                                                   const char *e) {
+  size_t l, i;
+  lua_State *L = ms->L;
+  const char *news = lua_tolstring(L, 3, &l);
+  for (i = 0; i < l; i++) {
+    if (news[i] != L_ESC)
+      luaL_addchar(b, news[i]);
+    else {
+      i++;  /* skip ESC */
+      if (!isdigit(uchar(news[i]))) {
+        if (news[i] != L_ESC)
+          luaL_error(L, "invalid use of '%c' in replacement string", L_ESC);
+        luaL_addchar(b, news[i]);
+      }
+      else if (news[i] == '0')
+          luaL_addlstring(b, s, e - s);
+      else {
+        push_onecapture(ms, news[i] - '1', s, e);
+        luaL_tolstring(L, -1, NULL);  /* if number, convert it to string */
+        lua_remove(L, -2);  /* remove original value */
+        luaL_addvalue(b);  /* add capture to accumulated result */
+      }
+    }
+  }
+}
+
+
+static void add_value (MatchState *ms, luaL_Buffer *b, const char *s,
+                                       const char *e, int tr) {
+  lua_State *L = ms->L;
+  switch (tr) {
+    case LUA_TFUNCTION: {
+      int n;
+      lua_pushvalue(L, 3);
+      n = push_captures(ms, s, e);
+      lua_call(L, n, 1);
+      break;
+    }
+    case LUA_TTABLE: {
+      push_onecapture(ms, 0, s, e);
+      lua_gettable(L, 3);
+      break;
+    }
+    default: {  /* LUA_TNUMBER or LUA_TSTRING */
+      add_s(ms, b, s, e);
+      return;
+    }
+  }
+  if (!lua_toboolean(L, -1)) {  /* nil or false? */
+    lua_pop(L, 1);
+    lua_pushlstring(L, s, e - s);  /* keep original text */
+  }
+  else if (!lua_isstring(L, -1))
+    luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
+  luaL_addvalue(b);  /* add result to accumulator */
+}
+
+
+static int str_gsub (lua_State *L) {
+  size_t srcl, lp;
+  const char *src = luaL_checklstring(L, 1, &srcl);  /* subject */
+  const char *p = luaL_checklstring(L, 2, &lp);  /* pattern */
+  const char *lastmatch = NULL;  /* end of last match */
+  int tr = lua_type(L, 3);  /* replacement type */
+  lua_Integer max_s = luaL_optinteger(L, 4, srcl + 1);  /* max replacements */
+  int anchor = (*p == '^');
+  lua_Integer n = 0;  /* replacement count */
+  MatchState ms;
+  luaL_Buffer b;
+  luaL_argcheck(L, tr == LUA_TNUMBER || tr == LUA_TSTRING ||
+                   tr == LUA_TFUNCTION || tr == LUA_TTABLE, 3,
+                      "string/function/table expected");
+  luaL_buffinit(L, &b);
+  if (anchor) {
+    p++; lp--;  /* skip anchor character */
+  }
+  prepstate(&ms, L, src, srcl, p, lp);
+  while (n < max_s) {
+    const char *e;
+    reprepstate(&ms);  /* (re)prepare state for new match */
+    if ((e = match(&ms, src, p)) != NULL && e != lastmatch) {  /* match? */
+      n++;
+      add_value(&ms, &b, src, e, tr);  /* add replacement to buffer */
+      src = lastmatch = e;
+    }
+    else if (src < ms.src_end)  /* otherwise, skip one character */
+      luaL_addchar(&b, *src++);
+    else break;  /* end of subject */
+    if (anchor) break;
+  }
+  luaL_addlstring(&b, src, ms.src_end-src);
+  luaL_pushresult(&b);
+  lua_pushinteger(L, n);  /* number of substitutions */
+  return 2;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** STRING FORMAT
+** =======================================================
+*/
+
+#if !defined(lua_number2strx)	/* { */
+
+/*
+** Hexadecimal floating-point formatter
+*/
+
+#include <math.h>
+
+#define SIZELENMOD	(sizeof(LUA_NUMBER_FRMLEN)/sizeof(char))
+
+
+/*
+** Number of bits that goes into the first digit. It can be any value
+** between 1 and 4; the following definition tries to align the number
+** to nibble boundaries by making what is left after that first digit a
+** multiple of 4.
+*/
+#define L_NBFD		((l_mathlim(MANT_DIG) - 1)%4 + 1)
+
+
+/*
+** Add integer part of 'x' to buffer and return new 'x'
+*/
+static lua_Number adddigit (char *buff, int n, lua_Number x) {
+  lua_Number dd = l_mathop(floor)(x);  /* get integer part from 'x' */
+  int d = (int)dd;
+  buff[n] = (d < 10 ? d + '0' : d - 10 + 'a');  /* add to buffer */
+  return x - dd;  /* return what is left */
+}
+
+
+static int num2straux (char *buff, int sz, lua_Number x) {
+  /* if 'inf' or 'NaN', format it like '%g' */
+  if (x != x || x == (lua_Number)HUGE_VAL || x == -(lua_Number)HUGE_VAL)
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)x);
+  else if (x == 0) {  /* can be -0... */
+    /* create "0" or "-0" followed by exponent */
+    return l_sprintf(buff, sz, LUA_NUMBER_FMT "x0p+0", (LUAI_UACNUMBER)x);
+  }
+  else {
+    int e;
+    lua_Number m = l_mathop(frexp)(x, &e);  /* 'x' fraction and exponent */
+    int n = 0;  /* character count */
+    if (m < 0) {  /* is number negative? */
+      buff[n++] = '-';  /* add signal */
+      m = -m;  /* make it positive */
+    }
+    buff[n++] = '0'; buff[n++] = 'x';  /* add "0x" */
+    m = adddigit(buff, n++, m * (1 << L_NBFD));  /* add first digit */
+    e -= L_NBFD;  /* this digit goes before the radix point */
+    if (m > 0) {  /* more digits? */
+      buff[n++] = lua_getlocaledecpoint();  /* add radix point */
+      do {  /* add as many digits as needed */
+        m = adddigit(buff, n++, m * 16);
+      } while (m > 0);
+    }
+    n += l_sprintf(buff + n, sz - n, "p%+d", e);  /* add exponent */
+    lua_assert(n < sz);
+    return n;
+  }
+}
+
+
+static int lua_number2strx (lua_State *L, char *buff, int sz,
+                            const char *fmt, lua_Number x) {
+  int n = num2straux(buff, sz, x);
+  if (fmt[SIZELENMOD] == 'A') {
+    int i;
+    for (i = 0; i < n; i++)
+      buff[i] = toupper(uchar(buff[i]));
+  }
+  else if (fmt[SIZELENMOD] != 'a')
+    luaL_error(L, "modifiers for format '%%a'/'%%A' not implemented");
+  return n;
+}
+
+#endif				/* } */
+
+
+/*
+** Maximum size of each formatted item. This maximum size is produced
+** by format('%.99f', -maxfloat), and is equal to 99 + 3 ('-', '.',
+** and '\0') + number of decimal digits to represent maxfloat (which
+** is maximum exponent + 1). (99+3+1 then rounded to 120 for "extra
+** expenses", such as locale-dependent stuff)
+*/
+#define MAX_ITEM        (120 + l_mathlim(MAX_10_EXP))
+
+
+/* valid flags in a format specification */
+#define FLAGS	"-+ #0"
+
+/*
+** maximum size of each format specification (such as "%-099.99d")
+*/
+#define MAX_FORMAT	32
+
+
+static void addquoted (luaL_Buffer *b, const char *s, size_t len) {
+  luaL_addchar(b, '"');
+  while (len--) {
+    if (*s == '"' || *s == '\\' || *s == '\n') {
+      luaL_addchar(b, '\\');
+      luaL_addchar(b, *s);
+    }
+    else if (iscntrl(uchar(*s))) {
+      char buff[10];
+      if (!isdigit(uchar(*(s+1))))
+        l_sprintf(buff, sizeof(buff), "\\%d", (int)uchar(*s));
+      else
+        l_sprintf(buff, sizeof(buff), "\\%03d", (int)uchar(*s));
+      luaL_addstring(b, buff);
+    }
+    else
+      luaL_addchar(b, *s);
+    s++;
+  }
+  luaL_addchar(b, '"');
+}
+
+
+/*
+** Ensures the 'buff' string uses a dot as the radix character.
+*/
+static void checkdp (char *buff, int nb) {
+  if (memchr(buff, '.', nb) == NULL) {  /* no dot? */
+    char point = lua_getlocaledecpoint();  /* try locale point */
+    char *ppoint = (char *)memchr(buff, point, nb);
+    if (ppoint) *ppoint = '.';  /* change it to a dot */
+  }
+}
+
+
+static void addliteral (lua_State *L, luaL_Buffer *b, int arg) {
+  switch (lua_type(L, arg)) {
+    case LUA_TSTRING: {
+      size_t len;
+      const char *s = lua_tolstring(L, arg, &len);
+      addquoted(b, s, len);
+      break;
+    }
+    case LUA_TNUMBER: {
+      char *buff = luaL_prepbuffsize(b, MAX_ITEM);
+      int nb;
+      if (!lua_isinteger(L, arg)) {  /* float? */
+        lua_Number n = lua_tonumber(L, arg);  /* write as hexa ('%a') */
+        nb = lua_number2strx(L, buff, MAX_ITEM, "%" LUA_NUMBER_FRMLEN "a", n);
+        checkdp(buff, nb);  /* ensure it uses a dot */
+      }
+      else {  /* integers */
+        lua_Integer n = lua_tointeger(L, arg);
+        const char *format = (n == LUA_MININTEGER)  /* corner case? */
+                           ? "0x%" LUA_INTEGER_FRMLEN "x"  /* use hexa */
+                           : LUA_INTEGER_FMT;  /* else use default format */
+        nb = l_sprintf(buff, MAX_ITEM, format, (LUAI_UACINT)n);
+      }
+      luaL_addsize(b, nb);
+      break;
+    }
+    case LUA_TNIL: case LUA_TBOOLEAN: {
+      luaL_tolstring(L, arg, NULL);
+      luaL_addvalue(b);
+      break;
+    }
+    default: {
+      luaL_argerror(L, arg, "value has no literal form");
+    }
+  }
+}
+
+
+static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
+  const char *p = strfrmt;
+  while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
+  if ((size_t)(p - strfrmt) >= sizeof(FLAGS)/sizeof(char))
+    luaL_error(L, "invalid format (repeated flags)");
+  if (isdigit(uchar(*p))) p++;  /* skip width */
+  if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
+  if (*p == '.') {
+    p++;
+    if (isdigit(uchar(*p))) p++;  /* skip precision */
+    if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
+  }
+  if (isdigit(uchar(*p)))
+    luaL_error(L, "invalid format (width or precision too long)");
+  *(form++) = '%';
+  memcpy(form, strfrmt, ((p - strfrmt) + 1) * sizeof(char));
+  form += (p - strfrmt) + 1;
+  *form = '\0';
+  return p;
+}
+
+
+/*
+** add length modifier into formats
+*/
+static void addlenmod (char *form, const char *lenmod) {
+  size_t l = strlen(form);
+  size_t lm = strlen(lenmod);
+  char spec = form[l - 1];
+  strcpy(form + l - 1, lenmod);
+  form[l + lm - 1] = spec;
+  form[l + lm] = '\0';
+}
+
+
+static int str_format (lua_State *L) {
+  int top = lua_gettop(L);
+  int arg = 1;
+  size_t sfl;
+  const char *strfrmt = luaL_checklstring(L, arg, &sfl);
+  const char *strfrmt_end = strfrmt+sfl;
+  luaL_Buffer b;
+  luaL_buffinit(L, &b);
+  while (strfrmt < strfrmt_end) {
+    if (*strfrmt != L_ESC)
+      luaL_addchar(&b, *strfrmt++);
+    else if (*++strfrmt == L_ESC)
+      luaL_addchar(&b, *strfrmt++);  /* %% */
+    else { /* format item */
+      char form[MAX_FORMAT];  /* to store the format ('%...') */
+      char *buff = luaL_prepbuffsize(&b, MAX_ITEM);  /* to put formatted item */
+      int nb = 0;  /* number of bytes in added item */
+      if (++arg > top)
+        luaL_argerror(L, arg, "no value");
+      strfrmt = scanformat(L, strfrmt, form);
+      switch (*strfrmt++) {
+        case 'c': {
+          nb = l_sprintf(buff, MAX_ITEM, form, (int)luaL_checkinteger(L, arg));
+          break;
+        }
+        case 'd': case 'i':
+        case 'o': case 'u': case 'x': case 'X': {
+          lua_Integer n = luaL_checkinteger(L, arg);
+          addlenmod(form, LUA_INTEGER_FRMLEN);
+          nb = l_sprintf(buff, MAX_ITEM, form, (LUAI_UACINT)n);
+          break;
+        }
+        case 'a': case 'A':
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = lua_number2strx(L, buff, MAX_ITEM, form,
+                                  luaL_checknumber(L, arg));
+          break;
+        case 'e': case 'E': case 'f':
+        case 'g': case 'G': {
+          lua_Number n = luaL_checknumber(L, arg);
+          addlenmod(form, LUA_NUMBER_FRMLEN);
+          nb = l_sprintf(buff, MAX_ITEM, form, (LUAI_UACNUMBER)n);
+          break;
+        }
+        case 'q': {
+          addliteral(L, &b, arg);
+          break;
+        }
+        case 's': {
+          size_t l;
+          const char *s = luaL_tolstring(L, arg, &l);
+          if (form[2] == '\0')  /* no modifiers? */
+            luaL_addvalue(&b);  /* keep entire string */
+          else {
+            luaL_argcheck(L, l == strlen(s), arg, "string contains zeros");
+            if (!strchr(form, '.') && l >= 100) {
+              /* no precision and string is too long to be formatted */
+              luaL_addvalue(&b);  /* keep entire string */
+            }
+            else {  /* format the string into 'buff' */
+              nb = l_sprintf(buff, MAX_ITEM, form, s);
+              lua_pop(L, 1);  /* remove result from 'luaL_tolstring' */
+            }
+          }
+          break;
+        }
+        default: {  /* also treat cases 'pnLlh' */
+          return luaL_error(L, "invalid option '%%%c' to 'format'",
+                               *(strfrmt - 1));
+        }
+      }
+      lua_assert(nb < MAX_ITEM);
+      luaL_addsize(&b, nb);
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+/* }====================================================== */
+
+
+/*
+** {======================================================
+** PACK/UNPACK
+** =======================================================
+*/
+
+
+/* value used for padding */
+#if !defined(LUAL_PACKPADBYTE)
+#define LUAL_PACKPADBYTE		0x00
+#endif
+
+/* maximum size for the binary representation of an integer */
+#define MAXINTSIZE	16
+
+/* number of bits in a character */
+#define NB	CHAR_BIT
+
+/* mask for one character (NB 1's) */
+#define MC	((1 << NB) - 1)
+
+/* size of a lua_Integer */
+#define SZINT	((int)sizeof(lua_Integer))
+
+
+/* dummy union to get native endianness */
+static const union {
+  int dummy;
+  char little;  /* true iff machine is little endian */
+} nativeendian = {1};
+
+
+/* dummy structure to get native alignment requirements */
+struct cD {
+  char c;
+  union { double d; void *p; lua_Integer i; lua_Number n; } u;
+};
+
+#define MAXALIGN	(offsetof(struct cD, u))
+
+
+/*
+** Union for serializing floats
+*/
+typedef union Ftypes {
+  float f;
+  double d;
+  lua_Number n;
+  char buff[5 * sizeof(lua_Number)];  /* enough for any float type */
+} Ftypes;
+
+
+/*
+** information to pack/unpack stuff
+*/
+typedef struct Header {
+  lua_State *L;
+  int islittle;
+  int maxalign;
+} Header;
+
+
+/*
+** options for pack/unpack
+*/
+typedef enum KOption {
+  Kint,		/* signed integers */
+  Kuint,	/* unsigned integers */
+  Kfloat,	/* floating-point numbers */
+  Kchar,	/* fixed-length strings */
+  Kstring,	/* strings with prefixed length */
+  Kzstr,	/* zero-terminated strings */
+  Kpadding,	/* padding */
+  Kpaddalign,	/* padding for alignment */
+  Knop		/* no-op (configuration or spaces) */
+} KOption;
+
+
+/*
+** Read an integer numeral from string 'fmt' or return 'df' if
+** there is no numeral
+*/
+static int digit (int c) { return '0' <= c && c <= '9'; }
+
+static int getnum (const char **fmt, int df) {
+  if (!digit(**fmt))  /* no number? */
+    return df;  /* return default value */
+  else {
+    int a = 0;
+    do {
+      a = a*10 + (*((*fmt)++) - '0');
+    } while (digit(**fmt) && a <= ((int)MAXSIZE - 9)/10);
+    return a;
+  }
+}
+
+
+/*
+** Read an integer numeral and raises an error if it is larger
+** than the maximum size for integers.
+*/
+static int getnumlimit (Header *h, const char **fmt, int df) {
+  int sz = getnum(fmt, df);
+  if (sz > MAXINTSIZE || sz <= 0)
+    luaL_error(h->L, "integral size (%d) out of limits [1,%d]",
+                     sz, MAXINTSIZE);
+  return sz;
+}
+
+
+/*
+** Initialize Header
+*/
+static void initheader (lua_State *L, Header *h) {
+  h->L = L;
+  h->islittle = nativeendian.little;
+  h->maxalign = 1;
+}
+
+
+/*
+** Read and classify next option. 'size' is filled with option's size.
+*/
+static KOption getoption (Header *h, const char **fmt, int *size) {
+  int opt = *((*fmt)++);
+  *size = 0;  /* default */
+  switch (opt) {
+    case 'b': *size = sizeof(char); return Kint;
+    case 'B': *size = sizeof(char); return Kuint;
+    case 'h': *size = sizeof(short); return Kint;
+    case 'H': *size = sizeof(short); return Kuint;
+    case 'l': *size = sizeof(long); return Kint;
+    case 'L': *size = sizeof(long); return Kuint;
+    case 'j': *size = sizeof(lua_Integer); return Kint;
+    case 'J': *size = sizeof(lua_Integer); return Kuint;
+    case 'T': *size = sizeof(size_t); return Kuint;
+    case 'f': *size = sizeof(float); return Kfloat;
+    case 'd': *size = sizeof(double); return Kfloat;
+    case 'n': *size = sizeof(lua_Number); return Kfloat;
+    case 'i': *size = getnumlimit(h, fmt, sizeof(int)); return Kint;
+    case 'I': *size = getnumlimit(h, fmt, sizeof(int)); return Kuint;
+    case 's': *size = getnumlimit(h, fmt, sizeof(size_t)); return Kstring;
+    case 'c':
+      *size = getnum(fmt, -1);
+      if (*size == -1)
+        luaL_error(h->L, "missing size for format option 'c'");
+      return Kchar;
+    case 'z': return Kzstr;
+    case 'x': *size = 1; return Kpadding;
+    case 'X': return Kpaddalign;
+    case ' ': break;
+    case '<': h->islittle = 1; break;
+    case '>': h->islittle = 0; break;
+    case '=': h->islittle = nativeendian.little; break;
+    case '!': h->maxalign = getnumlimit(h, fmt, MAXALIGN); break;
+    default: luaL_error(h->L, "invalid format option '%c'", opt);
+  }
+  return Knop;
+}
+
+
+/*
+** Read, classify, and fill other details about the next option.
+** 'psize' is filled with option's size, 'notoalign' with its
+** alignment requirements.
+** Local variable 'size' gets the size to be aligned. (Kpadal option
+** always gets its full alignment, other options are limited by
+** the maximum alignment ('maxalign'). Kchar option needs no alignment
+** despite its size.
+*/
+static KOption getdetails (Header *h, size_t totalsize,
+                           const char **fmt, int *psize, int *ntoalign) {
+  KOption opt = getoption(h, fmt, psize);
+  int align = *psize;  /* usually, alignment follows size */
+  if (opt == Kpaddalign) {  /* 'X' gets alignment from following option */
+    if (**fmt == '\0' || getoption(h, fmt, &align) == Kchar || align == 0)
+      luaL_argerror(h->L, 1, "invalid next option for option 'X'");
+  }
+  if (align <= 1 || opt == Kchar)  /* need no alignment? */
+    *ntoalign = 0;
+  else {
+    if (align > h->maxalign)  /* enforce maximum alignment */
+      align = h->maxalign;
+    if ((align & (align - 1)) != 0)  /* is 'align' not a power of 2? */
+      luaL_argerror(h->L, 1, "format asks for alignment not power of 2");
+    *ntoalign = (align - (int)(totalsize & (align - 1))) & (align - 1);
+  }
+  return opt;
+}
+
+
+/*
+** Pack integer 'n' with 'size' bytes and 'islittle' endianness.
+** The final 'if' handles the case when 'size' is larger than
+** the size of a Lua integer, correcting the extra sign-extension
+** bytes if necessary (by default they would be zeros).
+*/
+static void packint (luaL_Buffer *b, lua_Unsigned n,
+                     int islittle, int size, int neg) {
+  char *buff = luaL_prepbuffsize(b, size);
+  int i;
+  buff[islittle ? 0 : size - 1] = (char)(n & MC);  /* first byte */
+  for (i = 1; i < size; i++) {
+    n >>= NB;
+    buff[islittle ? i : size - 1 - i] = (char)(n & MC);
+  }
+  if (neg && size > SZINT) {  /* negative number need sign extension? */
+    for (i = SZINT; i < size; i++)  /* correct extra bytes */
+      buff[islittle ? i : size - 1 - i] = (char)MC;
+  }
+  luaL_addsize(b, size);  /* add result to buffer */
+}
+
+
+/*
+** Copy 'size' bytes from 'src' to 'dest', correcting endianness if
+** given 'islittle' is different from native endianness.
+*/
+static void copywithendian (volatile char *dest, volatile const char *src,
+                            int size, int islittle) {
+  if (islittle == nativeendian.little) {
+    while (size-- != 0)
+      *(dest++) = *(src++);
+  }
+  else {
+    dest += size - 1;
+    while (size-- != 0)
+      *(dest--) = *(src++);
+  }
+}
+
+
+static int str_pack (lua_State *L) {
+  luaL_Buffer b;
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  int arg = 1;  /* current argument to pack */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  lua_pushnil(L);  /* mark to separate arguments from string buffer */
+  luaL_buffinit(L, &b);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    totalsize += ntoalign + size;
+    while (ntoalign-- > 0)
+     luaL_addchar(&b, LUAL_PACKPADBYTE);  /* fill alignment */
+    arg++;
+    switch (opt) {
+      case Kint: {  /* signed integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT) {  /* need overflow check? */
+          lua_Integer lim = (lua_Integer)1 << ((size * NB) - 1);
+          luaL_argcheck(L, -lim <= n && n < lim, arg, "integer overflow");
+        }
+        packint(&b, (lua_Unsigned)n, h.islittle, size, (n < 0));
+        break;
+      }
+      case Kuint: {  /* unsigned integers */
+        lua_Integer n = luaL_checkinteger(L, arg);
+        if (size < SZINT)  /* need overflow check? */
+          luaL_argcheck(L, (lua_Unsigned)n < ((lua_Unsigned)1 << (size * NB)),
+                           arg, "unsigned overflow");
+        packint(&b, (lua_Unsigned)n, h.islittle, size, 0);
+        break;
+      }
+      case Kfloat: {  /* floating-point options */
+        volatile Ftypes u;
+        char *buff = luaL_prepbuffsize(&b, size);
+        lua_Number n = luaL_checknumber(L, arg);  /* get argument */
+        if (size == sizeof(u.f)) u.f = (float)n;  /* copy it into 'u' */
+        else if (size == sizeof(u.d)) u.d = (double)n;
+        else u.n = n;
+        /* move 'u' to final result, correcting endianness if needed */
+        copywithendian(buff, u.buff, size, h.islittle);
+        luaL_addsize(&b, size);
+        break;
+      }
+      case Kchar: {  /* fixed-size string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, len <= (size_t)size, arg,
+                         "string longer than given size");
+        luaL_addlstring(&b, s, len);  /* add string */
+        while (len++ < (size_t)size)  /* pad extra space */
+          luaL_addchar(&b, LUAL_PACKPADBYTE);
+        break;
+      }
+      case Kstring: {  /* strings with length count */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, size >= (int)sizeof(size_t) ||
+                         len < ((size_t)1 << (size * NB)),
+                         arg, "string length does not fit in given size");
+        packint(&b, (lua_Unsigned)len, h.islittle, size, 0);  /* pack length */
+        luaL_addlstring(&b, s, len);
+        totalsize += len;
+        break;
+      }
+      case Kzstr: {  /* zero-terminated string */
+        size_t len;
+        const char *s = luaL_checklstring(L, arg, &len);
+        luaL_argcheck(L, strlen(s) == len, arg, "string contains zeros");
+        luaL_addlstring(&b, s, len);
+        luaL_addchar(&b, '\0');  /* add zero at the end */
+        totalsize += len + 1;
+        break;
+      }
+      case Kpadding: luaL_addchar(&b, LUAL_PACKPADBYTE);  /* FALLTHROUGH */
+      case Kpaddalign: case Knop:
+        arg--;  /* undo increment */
+        break;
+    }
+  }
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+static int str_packsize (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);  /* format string */
+  size_t totalsize = 0;  /* accumulate total size of result */
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, totalsize, &fmt, &size, &ntoalign);
+    size += ntoalign;  /* total space used by option */
+    luaL_argcheck(L, totalsize <= MAXSIZE - size, 1,
+                     "format result too large");
+    totalsize += size;
+    switch (opt) {
+      case Kstring:  /* strings with length count */
+      case Kzstr:    /* zero-terminated string */
+        luaL_argerror(L, 1, "variable-length format");
+        /* call never return, but to avoid warnings: *//* FALLTHROUGH */
+      default:  break;
+    }
+  }
+  lua_pushinteger(L, (lua_Integer)totalsize);
+  return 1;
+}
+
+
+/*
+** Unpack an integer with 'size' bytes and 'islittle' endianness.
+** If size is smaller than the size of a Lua integer and integer
+** is signed, must do sign extension (propagating the sign to the
+** higher bits); if size is larger than the size of a Lua integer,
+** it must check the unread bytes to see whether they do not cause an
+** overflow.
+*/
+static lua_Integer unpackint (lua_State *L, const char *str,
+                              int islittle, int size, int issigned) {
+  lua_Unsigned res = 0;
+  int i;
+  int limit = (size  <= SZINT) ? size : SZINT;
+  for (i = limit - 1; i >= 0; i--) {
+    res <<= NB;
+    res |= (lua_Unsigned)(unsigned char)str[islittle ? i : size - 1 - i];
+  }
+  if (size < SZINT) {  /* real size smaller than lua_Integer? */
+    if (issigned) {  /* needs sign extension? */
+      lua_Unsigned mask = (lua_Unsigned)1 << (size*NB - 1);
+      res = ((res ^ mask) - mask);  /* do sign extension */
+    }
+  }
+  else if (size > SZINT) {  /* must check unread bytes */
+    int mask = (!issigned || (lua_Integer)res >= 0) ? 0 : MC;
+    for (i = limit; i < size; i++) {
+      if ((unsigned char)str[islittle ? i : size - 1 - i] != mask)
+        luaL_error(L, "%d-byte integer does not fit into Lua Integer", size);
+    }
+  }
+  return (lua_Integer)res;
+}
+
+
+static int str_unpack (lua_State *L) {
+  Header h;
+  const char *fmt = luaL_checkstring(L, 1);
+  size_t ld;
+  const char *data = luaL_checklstring(L, 2, &ld);
+  size_t pos = (size_t)posrelat(luaL_optinteger(L, 3, 1), ld) - 1;
+  int n = 0;  /* number of results */
+  luaL_argcheck(L, pos <= ld, 3, "initial position out of string");
+  initheader(L, &h);
+  while (*fmt != '\0') {
+    int size, ntoalign;
+    KOption opt = getdetails(&h, pos, &fmt, &size, &ntoalign);
+    if ((size_t)ntoalign + size > ~pos || pos + ntoalign + size > ld)
+      luaL_argerror(L, 2, "data string too short");
+    pos += ntoalign;  /* skip alignment */
+    /* stack space for item + next position */
+    luaL_checkstack(L, 2, "too many results");
+    n++;
+    switch (opt) {
+      case Kint:
+      case Kuint: {
+        lua_Integer res = unpackint(L, data + pos, h.islittle, size,
+                                       (opt == Kint));
+        lua_pushinteger(L, res);
+        break;
+      }
+      case Kfloat: {
+        volatile Ftypes u;
+        lua_Number num;
+        copywithendian(u.buff, data + pos, size, h.islittle);
+        if (size == sizeof(u.f)) num = (lua_Number)u.f;
+        else if (size == sizeof(u.d)) num = (lua_Number)u.d;
+        else num = u.n;
+        lua_pushnumber(L, num);
+        break;
+      }
+      case Kchar: {
+        lua_pushlstring(L, data + pos, size);
+        break;
+      }
+      case Kstring: {
+        size_t len = (size_t)unpackint(L, data + pos, h.islittle, size, 0);
+        luaL_argcheck(L, pos + len + size <= ld, 2, "data string too short");
+        lua_pushlstring(L, data + pos + size, len);
+        pos += len;  /* skip string */
+        break;
+      }
+      case Kzstr: {
+        size_t len = (int)strlen(data + pos);
+        lua_pushlstring(L, data + pos, len);
+        pos += len + 1;  /* skip string plus final '\0' */
+        break;
+      }
+      case Kpaddalign: case Kpadding: case Knop:
+        n--;  /* undo increment */
+        break;
+    }
+    pos += size;
+  }
+  lua_pushinteger(L, pos + 1);  /* next position */
+  return n + 1;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg strlib[] = {
+  {"byte", str_byte},
+  {"char", str_char},
+  {"dump", str_dump},
+  {"find", str_find},
+  {"format", str_format},
+  {"gmatch", gmatch},
+  {"gsub", str_gsub},
+  {"len", str_len},
+  {"lower", str_lower},
+  {"match", str_match},
+  {"rep", str_rep},
+  {"reverse", str_reverse},
+  {"sub", str_sub},
+  {"upper", str_upper},
+  {"pack", str_pack},
+  {"packsize", str_packsize},
+  {"unpack", str_unpack},
+  {NULL, NULL}
+};
+
+
+static void createmetatable (lua_State *L) {
+  lua_createtable(L, 0, 1);  /* table to be metatable for strings */
+  lua_pushliteral(L, "");  /* dummy string */
+  lua_pushvalue(L, -2);  /* copy table */
+  lua_setmetatable(L, -2);  /* set table as metatable for strings */
+  lua_pop(L, 1);  /* pop dummy string */
+  lua_pushvalue(L, -2);  /* get string library */
+  lua_setfield(L, -2, "__index");  /* metatable.__index = string */
+  lua_pop(L, 1);  /* pop metatable */
+}
+
+
+/*
+** Open string library
+*/
+LUAMOD_API int luaopen_string (lua_State *L) {
+  luaL_newlib(L, strlib);
+  createmetatable(L);
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/ltable.c b/scite-app/scite/lua/src/ltable.c
new file mode 100644
index 0000000..d080189
--- /dev/null
+++ b/scite-app/scite/lua/src/ltable.c
@@ -0,0 +1,669 @@
+/*
+** $Id: ltable.c,v 2.118 2016/11/07 12:38:35 roberto Exp $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#define ltable_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+/*
+** Implementation of tables (aka arrays, objects, or hash tables).
+** Tables keep its elements in two parts: an array part and a hash part.
+** Non-negative integer keys are all candidates to be kept in the array
+** part. The actual size of the array is the largest 'n' such that
+** more than half the slots between 1 and n are in use.
+** Hash uses a mix of chained scatter table with Brent's variation.
+** A main invariant of these tables is that, if an element is not
+** in its main position (i.e. the 'original' position that its hash gives
+** to it), then the colliding element is in its own main position.
+** Hence even when the load factor reaches 100%, performance remains good.
+*/
+
+#include <math.h>
+#include <limits.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "lvm.h"
+
+
+/*
+** Maximum size of array part (MAXASIZE) is 2^MAXABITS. MAXABITS is
+** the largest integer such that MAXASIZE fits in an unsigned int.
+*/
+#define MAXABITS	cast_int(sizeof(int) * CHAR_BIT - 1)
+#define MAXASIZE	(1u << MAXABITS)
+
+/*
+** Maximum size of hash part is 2^MAXHBITS. MAXHBITS is the largest
+** integer such that 2^MAXHBITS fits in a signed int. (Note that the
+** maximum number of elements in a table, 2^MAXABITS + 2^MAXHBITS, still
+** fits comfortably in an unsigned int.)
+*/
+#define MAXHBITS	(MAXABITS - 1)
+
+
+#define hashpow2(t,n)		(gnode(t, lmod((n), sizenode(t))))
+
+#define hashstr(t,str)		hashpow2(t, (str)->hash)
+#define hashboolean(t,p)	hashpow2(t, p)
+#define hashint(t,i)		hashpow2(t, i)
+
+
+/*
+** for some types, it is better to avoid modulus by power of 2, as
+** they tend to have many 2 factors.
+*/
+#define hashmod(t,n)	(gnode(t, ((n) % ((sizenode(t)-1)|1))))
+
+
+#define hashpointer(t,p)	hashmod(t, point2uint(p))
+
+
+#define dummynode		(&dummynode_)
+
+static const Node dummynode_ = {
+  {NILCONSTANT},  /* value */
+  {{NILCONSTANT, 0}}  /* key */
+};
+
+
+/*
+** Hash for floating-point numbers.
+** The main computation should be just
+**     n = frexp(n, &i); return (n * INT_MAX) + i
+** but there are some numerical subtleties.
+** In a two-complement representation, INT_MAX does not has an exact
+** representation as a float, but INT_MIN does; because the absolute
+** value of 'frexp' is smaller than 1 (unless 'n' is inf/NaN), the
+** absolute value of the product 'frexp * -INT_MIN' is smaller or equal
+** to INT_MAX. Next, the use of 'unsigned int' avoids overflows when
+** adding 'i'; the use of '~u' (instead of '-u') avoids problems with
+** INT_MIN.
+*/
+#if !defined(l_hashfloat)
+static int l_hashfloat (lua_Number n) {
+  int i;
+  lua_Integer ni;
+  n = l_mathop(frexp)(n, &i) * -cast_num(INT_MIN);
+  if (!lua_numbertointeger(n, &ni)) {  /* is 'n' inf/-inf/NaN? */
+    lua_assert(luai_numisnan(n) || l_mathop(fabs)(n) == cast_num(HUGE_VAL));
+    return 0;
+  }
+  else {  /* normal case */
+    unsigned int u = cast(unsigned int, i) + cast(unsigned int, ni);
+    return cast_int(u <= cast(unsigned int, INT_MAX) ? u : ~u);
+  }
+}
+#endif
+
+
+/*
+** returns the 'main' position of an element in a table (that is, the index
+** of its hash value)
+*/
+static Node *mainposition (const Table *t, const TValue *key) {
+  switch (ttype(key)) {
+    case LUA_TNUMINT:
+      return hashint(t, ivalue(key));
+    case LUA_TNUMFLT:
+      return hashmod(t, l_hashfloat(fltvalue(key)));
+    case LUA_TSHRSTR:
+      return hashstr(t, tsvalue(key));
+    case LUA_TLNGSTR:
+      return hashpow2(t, luaS_hashlongstr(tsvalue(key)));
+    case LUA_TBOOLEAN:
+      return hashboolean(t, bvalue(key));
+    case LUA_TLIGHTUSERDATA:
+      return hashpointer(t, pvalue(key));
+    case LUA_TLCF:
+      return hashpointer(t, fvalue(key));
+    default:
+      lua_assert(!ttisdeadkey(key));
+      return hashpointer(t, gcvalue(key));
+  }
+}
+
+
+/*
+** returns the index for 'key' if 'key' is an appropriate key to live in
+** the array part of the table, 0 otherwise.
+*/
+static unsigned int arrayindex (const TValue *key) {
+  if (ttisinteger(key)) {
+    lua_Integer k = ivalue(key);
+    if (0 < k && (lua_Unsigned)k <= MAXASIZE)
+      return cast(unsigned int, k);  /* 'key' is an appropriate array index */
+  }
+  return 0;  /* 'key' did not match some condition */
+}
+
+
+/*
+** returns the index of a 'key' for table traversals. First goes all
+** elements in the array part, then elements in the hash part. The
+** beginning of a traversal is signaled by 0.
+*/
+static unsigned int findindex (lua_State *L, Table *t, StkId key) {
+  unsigned int i;
+  if (ttisnil(key)) return 0;  /* first iteration */
+  i = arrayindex(key);
+  if (i != 0 && i <= t->sizearray)  /* is 'key' inside array part? */
+    return i;  /* yes; that's the index */
+  else {
+    int nx;
+    Node *n = mainposition(t, key);
+    for (;;) {  /* check whether 'key' is somewhere in the chain */
+      /* key may be dead already, but it is ok to use it in 'next' */
+      if (luaV_rawequalobj(gkey(n), key) ||
+            (ttisdeadkey(gkey(n)) && iscollectable(key) &&
+             deadvalue(gkey(n)) == gcvalue(key))) {
+        i = cast_int(n - gnode(t, 0));  /* key index in hash table */
+        /* hash elements are numbered after array ones */
+        return (i + 1) + t->sizearray;
+      }
+      nx = gnext(n);
+      if (nx == 0)
+        luaG_runerror(L, "invalid key to 'next'");  /* key not found */
+      else n += nx;
+    }
+  }
+}
+
+
+int luaH_next (lua_State *L, Table *t, StkId key) {
+  unsigned int i = findindex(L, t, key);  /* find original element */
+  for (; i < t->sizearray; i++) {  /* try first array part */
+    if (!ttisnil(&t->array[i])) {  /* a non-nil value? */
+      setivalue(key, i + 1);
+      setobj2s(L, key+1, &t->array[i]);
+      return 1;
+    }
+  }
+  for (i -= t->sizearray; cast_int(i) < sizenode(t); i++) {  /* hash part */
+    if (!ttisnil(gval(gnode(t, i)))) {  /* a non-nil value? */
+      setobj2s(L, key, gkey(gnode(t, i)));
+      setobj2s(L, key+1, gval(gnode(t, i)));
+      return 1;
+    }
+  }
+  return 0;  /* no more elements */
+}
+
+
+/*
+** {=============================================================
+** Rehash
+** ==============================================================
+*/
+
+/*
+** Compute the optimal size for the array part of table 't'. 'nums' is a
+** "count array" where 'nums[i]' is the number of integers in the table
+** between 2^(i - 1) + 1 and 2^i. 'pna' enters with the total number of
+** integer keys in the table and leaves with the number of keys that
+** will go to the array part; return the optimal size.
+*/
+static unsigned int computesizes (unsigned int nums[], unsigned int *pna) {
+  int i;
+  unsigned int twotoi;  /* 2^i (candidate for optimal size) */
+  unsigned int a = 0;  /* number of elements smaller than 2^i */
+  unsigned int na = 0;  /* number of elements to go to array part */
+  unsigned int optimal = 0;  /* optimal size for array part */
+  /* loop while keys can fill more than half of total size */
+  for (i = 0, twotoi = 1; *pna > twotoi / 2; i++, twotoi *= 2) {
+    if (nums[i] > 0) {
+      a += nums[i];
+      if (a > twotoi/2) {  /* more than half elements present? */
+        optimal = twotoi;  /* optimal size (till now) */
+        na = a;  /* all elements up to 'optimal' will go to array part */
+      }
+    }
+  }
+  lua_assert((optimal == 0 || optimal / 2 < na) && na <= optimal);
+  *pna = na;
+  return optimal;
+}
+
+
+static int countint (const TValue *key, unsigned int *nums) {
+  unsigned int k = arrayindex(key);
+  if (k != 0) {  /* is 'key' an appropriate array index? */
+    nums[luaO_ceillog2(k)]++;  /* count as such */
+    return 1;
+  }
+  else
+    return 0;
+}
+
+
+/*
+** Count keys in array part of table 't': Fill 'nums[i]' with
+** number of keys that will go into corresponding slice and return
+** total number of non-nil keys.
+*/
+static unsigned int numusearray (const Table *t, unsigned int *nums) {
+  int lg;
+  unsigned int ttlg;  /* 2^lg */
+  unsigned int ause = 0;  /* summation of 'nums' */
+  unsigned int i = 1;  /* count to traverse all array keys */
+  /* traverse each slice */
+  for (lg = 0, ttlg = 1; lg <= MAXABITS; lg++, ttlg *= 2) {
+    unsigned int lc = 0;  /* counter */
+    unsigned int lim = ttlg;
+    if (lim > t->sizearray) {
+      lim = t->sizearray;  /* adjust upper limit */
+      if (i > lim)
+        break;  /* no more elements to count */
+    }
+    /* count elements in range (2^(lg - 1), 2^lg] */
+    for (; i <= lim; i++) {
+      if (!ttisnil(&t->array[i-1]))
+        lc++;
+    }
+    nums[lg] += lc;
+    ause += lc;
+  }
+  return ause;
+}
+
+
+static int numusehash (const Table *t, unsigned int *nums, unsigned int *pna) {
+  int totaluse = 0;  /* total number of elements */
+  int ause = 0;  /* elements added to 'nums' (can go to array part) */
+  int i = sizenode(t);
+  while (i--) {
+    Node *n = &t->node[i];
+    if (!ttisnil(gval(n))) {
+      ause += countint(gkey(n), nums);
+      totaluse++;
+    }
+  }
+  *pna += ause;
+  return totaluse;
+}
+
+
+static void setarrayvector (lua_State *L, Table *t, unsigned int size) {
+  unsigned int i;
+  luaM_reallocvector(L, t->array, t->sizearray, size, TValue);
+  for (i=t->sizearray; i<size; i++)
+     setnilvalue(&t->array[i]);
+  t->sizearray = size;
+}
+
+
+static void setnodevector (lua_State *L, Table *t, unsigned int size) {
+  if (size == 0) {  /* no elements to hash part? */
+    t->node = cast(Node *, dummynode);  /* use common 'dummynode' */
+    t->lsizenode = 0;
+    t->lastfree = NULL;  /* signal that it is using dummy node */
+  }
+  else {
+    int i;
+    int lsize = luaO_ceillog2(size);
+    if (lsize > MAXHBITS)
+      luaG_runerror(L, "table overflow");
+    size = twoto(lsize);
+    t->node = luaM_newvector(L, size, Node);
+    for (i = 0; i < (int)size; i++) {
+      Node *n = gnode(t, i);
+      gnext(n) = 0;
+      setnilvalue(wgkey(n));
+      setnilvalue(gval(n));
+    }
+    t->lsizenode = cast_byte(lsize);
+    t->lastfree = gnode(t, size);  /* all positions are free */
+  }
+}
+
+
+void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
+                                          unsigned int nhsize) {
+  unsigned int i;
+  int j;
+  unsigned int oldasize = t->sizearray;
+  int oldhsize = allocsizenode(t);
+  Node *nold = t->node;  /* save old hash ... */
+  if (nasize > oldasize)  /* array part must grow? */
+    setarrayvector(L, t, nasize);
+  /* create new hash part with appropriate size */
+  setnodevector(L, t, nhsize);
+  if (nasize < oldasize) {  /* array part must shrink? */
+    t->sizearray = nasize;
+    /* re-insert elements from vanishing slice */
+    for (i=nasize; i<oldasize; i++) {
+      if (!ttisnil(&t->array[i]))
+        luaH_setint(L, t, i + 1, &t->array[i]);
+    }
+    /* shrink array */
+    luaM_reallocvector(L, t->array, oldasize, nasize, TValue);
+  }
+  /* re-insert elements from hash part */
+  for (j = oldhsize - 1; j >= 0; j--) {
+    Node *old = nold + j;
+    if (!ttisnil(gval(old))) {
+      /* doesn't need barrier/invalidate cache, as entry was
+         already present in the table */
+      setobjt2t(L, luaH_set(L, t, gkey(old)), gval(old));
+    }
+  }
+  if (oldhsize > 0)  /* not the dummy node? */
+    luaM_freearray(L, nold, cast(size_t, oldhsize)); /* free old hash */
+}
+
+
+void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize) {
+  int nsize = allocsizenode(t);
+  luaH_resize(L, t, nasize, nsize);
+}
+
+/*
+** nums[i] = number of keys 'k' where 2^(i - 1) < k <= 2^i
+*/
+static void rehash (lua_State *L, Table *t, const TValue *ek) {
+  unsigned int asize;  /* optimal size for array part */
+  unsigned int na;  /* number of keys in the array part */
+  unsigned int nums[MAXABITS + 1];
+  int i;
+  int totaluse;
+  for (i = 0; i <= MAXABITS; i++) nums[i] = 0;  /* reset counts */
+  na = numusearray(t, nums);  /* count keys in array part */
+  totaluse = na;  /* all those keys are integer keys */
+  totaluse += numusehash(t, nums, &na);  /* count keys in hash part */
+  /* count extra key */
+  na += countint(ek, nums);
+  totaluse++;
+  /* compute new size for array part */
+  asize = computesizes(nums, &na);
+  /* resize the table to new computed sizes */
+  luaH_resize(L, t, asize, totaluse - na);
+}
+
+
+
+/*
+** }=============================================================
+*/
+
+
+Table *luaH_new (lua_State *L) {
+  GCObject *o = luaC_newobj(L, LUA_TTABLE, sizeof(Table));
+  Table *t = gco2t(o);
+  t->metatable = NULL;
+  t->flags = cast_byte(~0);
+  t->array = NULL;
+  t->sizearray = 0;
+  setnodevector(L, t, 0);
+  return t;
+}
+
+
+void luaH_free (lua_State *L, Table *t) {
+  if (!isdummy(t))
+    luaM_freearray(L, t->node, cast(size_t, sizenode(t)));
+  luaM_freearray(L, t->array, t->sizearray);
+  luaM_free(L, t);
+}
+
+
+static Node *getfreepos (Table *t) {
+  if (!isdummy(t)) {
+    while (t->lastfree > t->node) {
+      t->lastfree--;
+      if (ttisnil(gkey(t->lastfree)))
+        return t->lastfree;
+    }
+  }
+  return NULL;  /* could not find a free place */
+}
+
+
+
+/*
+** inserts a new key into a hash table; first, check whether key's main
+** position is free. If not, check whether colliding node is in its main
+** position or not: if it is not, move colliding node to an empty place and
+** put new key in its main position; otherwise (colliding node is in its main
+** position), new key goes to an empty position.
+*/
+TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key) {
+  Node *mp;
+  TValue aux;
+  if (ttisnil(key)) luaG_runerror(L, "table index is nil");
+  else if (ttisfloat(key)) {
+    lua_Integer k;
+    if (luaV_tointeger(key, &k, 0)) {  /* does index fit in an integer? */
+      setivalue(&aux, k);
+      key = &aux;  /* insert it as an integer */
+    }
+    else if (luai_numisnan(fltvalue(key)))
+      luaG_runerror(L, "table index is NaN");
+  }
+  mp = mainposition(t, key);
+  if (!ttisnil(gval(mp)) || isdummy(t)) {  /* main position is taken? */
+    Node *othern;
+    Node *f = getfreepos(t);  /* get a free place */
+    if (f == NULL) {  /* cannot find a free place? */
+      rehash(L, t, key);  /* grow table */
+      /* whatever called 'newkey' takes care of TM cache */
+      return luaH_set(L, t, key);  /* insert key into grown table */
+    }
+    lua_assert(!isdummy(t));
+    othern = mainposition(t, gkey(mp));
+    if (othern != mp) {  /* is colliding node out of its main position? */
+      /* yes; move colliding node into free position */
+      while (othern + gnext(othern) != mp)  /* find previous */
+        othern += gnext(othern);
+      gnext(othern) = cast_int(f - othern);  /* rechain to point to 'f' */
+      *f = *mp;  /* copy colliding node into free pos. (mp->next also goes) */
+      if (gnext(mp) != 0) {
+        gnext(f) += cast_int(mp - f);  /* correct 'next' */
+        gnext(mp) = 0;  /* now 'mp' is free */
+      }
+      setnilvalue(gval(mp));
+    }
+    else {  /* colliding node is in its own main position */
+      /* new node will go into free position */
+      if (gnext(mp) != 0)
+        gnext(f) = cast_int((mp + gnext(mp)) - f);  /* chain new position */
+      else lua_assert(gnext(f) == 0);
+      gnext(mp) = cast_int(f - mp);
+      mp = f;
+    }
+  }
+  setnodekey(L, &mp->i_key, key);
+  luaC_barrierback(L, t, key);
+  lua_assert(ttisnil(gval(mp)));
+  return gval(mp);
+}
+
+
+/*
+** search function for integers
+*/
+const TValue *luaH_getint (Table *t, lua_Integer key) {
+  /* (1 <= key && key <= t->sizearray) */
+  if (l_castS2U(key) - 1 < t->sizearray)
+    return &t->array[key - 1];
+  else {
+    Node *n = hashint(t, key);
+    for (;;) {  /* check whether 'key' is somewhere in the chain */
+      if (ttisinteger(gkey(n)) && ivalue(gkey(n)) == key)
+        return gval(n);  /* that's it */
+      else {
+        int nx = gnext(n);
+        if (nx == 0) break;
+        n += nx;
+      }
+    }
+    return luaO_nilobject;
+  }
+}
+
+
+/*
+** search function for short strings
+*/
+const TValue *luaH_getshortstr (Table *t, TString *key) {
+  Node *n = hashstr(t, key);
+  lua_assert(key->tt == LUA_TSHRSTR);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    const TValue *k = gkey(n);
+    if (ttisshrstring(k) && eqshrstr(tsvalue(k), key))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return luaO_nilobject;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+/*
+** "Generic" get version. (Not that generic: not valid for integers,
+** which may be in array part, nor for floats with integral values.)
+*/
+static const TValue *getgeneric (Table *t, const TValue *key) {
+  Node *n = mainposition(t, key);
+  for (;;) {  /* check whether 'key' is somewhere in the chain */
+    if (luaV_rawequalobj(gkey(n), key))
+      return gval(n);  /* that's it */
+    else {
+      int nx = gnext(n);
+      if (nx == 0)
+        return luaO_nilobject;  /* not found */
+      n += nx;
+    }
+  }
+}
+
+
+const TValue *luaH_getstr (Table *t, TString *key) {
+  if (key->tt == LUA_TSHRSTR)
+    return luaH_getshortstr(t, key);
+  else {  /* for long strings, use generic case */
+    TValue ko;
+    setsvalue(cast(lua_State *, NULL), &ko, key);
+    return getgeneric(t, &ko);
+  }
+}
+
+
+/*
+** main search function
+*/
+const TValue *luaH_get (Table *t, const TValue *key) {
+  switch (ttype(key)) {
+    case LUA_TSHRSTR: return luaH_getshortstr(t, tsvalue(key));
+    case LUA_TNUMINT: return luaH_getint(t, ivalue(key));
+    case LUA_TNIL: return luaO_nilobject;
+    case LUA_TNUMFLT: {
+      lua_Integer k;
+      if (luaV_tointeger(key, &k, 0)) /* index is int? */
+        return luaH_getint(t, k);  /* use specialized version */
+      /* else... */
+    }  /* FALLTHROUGH */
+    default:
+      return getgeneric(t, key);
+  }
+}
+
+
+/*
+** beware: when using this function you probably need to check a GC
+** barrier and invalidate the TM cache.
+*/
+TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
+  const TValue *p = luaH_get(t, key);
+  if (p != luaO_nilobject)
+    return cast(TValue *, p);
+  else return luaH_newkey(L, t, key);
+}
+
+
+void luaH_setint (lua_State *L, Table *t, lua_Integer key, TValue *value) {
+  const TValue *p = luaH_getint(t, key);
+  TValue *cell;
+  if (p != luaO_nilobject)
+    cell = cast(TValue *, p);
+  else {
+    TValue k;
+    setivalue(&k, key);
+    cell = luaH_newkey(L, t, &k);
+  }
+  setobj2t(L, cell, value);
+}
+
+
+static int unbound_search (Table *t, unsigned int j) {
+  unsigned int i = j;  /* i is zero or a present index */
+  j++;
+  /* find 'i' and 'j' such that i is present and j is not */
+  while (!ttisnil(luaH_getint(t, j))) {
+    i = j;
+    if (j > cast(unsigned int, MAX_INT)/2) {  /* overflow? */
+      /* table was built with bad purposes: resort to linear search */
+      i = 1;
+      while (!ttisnil(luaH_getint(t, i))) i++;
+      return i - 1;
+    }
+    j *= 2;
+  }
+  /* now do a binary search between them */
+  while (j - i > 1) {
+    unsigned int m = (i+j)/2;
+    if (ttisnil(luaH_getint(t, m))) j = m;
+    else i = m;
+  }
+  return i;
+}
+
+
+/*
+** Try to find a boundary in table 't'. A 'boundary' is an integer index
+** such that t[i] is non-nil and t[i+1] is nil (and 0 if t[1] is nil).
+*/
+int luaH_getn (Table *t) {
+  unsigned int j = t->sizearray;
+  if (j > 0 && ttisnil(&t->array[j - 1])) {
+    /* there is a boundary in the array part: (binary) search for it */
+    unsigned int i = 0;
+    while (j - i > 1) {
+      unsigned int m = (i+j)/2;
+      if (ttisnil(&t->array[m - 1])) j = m;
+      else i = m;
+    }
+    return i;
+  }
+  /* else must find a boundary in hash part */
+  else if (isdummy(t))  /* hash part is empty? */
+    return j;  /* that is easy... */
+  else return unbound_search(t, j);
+}
+
+
+
+#if defined(LUA_DEBUG)
+
+Node *luaH_mainposition (const Table *t, const TValue *key) {
+  return mainposition(t, key);
+}
+
+int luaH_isdummy (const Table *t) { return isdummy(t); }
+
+#endif
diff --git a/scite-app/scite/lua/src/ltable.h b/scite-app/scite/lua/src/ltable.h
new file mode 100644
index 0000000..6da9024
--- /dev/null
+++ b/scite-app/scite/lua/src/ltable.h
@@ -0,0 +1,66 @@
+/*
+** $Id: ltable.h,v 2.23 2016/12/22 13:08:50 roberto Exp $
+** Lua tables (hash)
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltable_h
+#define ltable_h
+
+#include "lobject.h"
+
+
+#define gnode(t,i)	(&(t)->node[i])
+#define gval(n)		(&(n)->i_val)
+#define gnext(n)	((n)->i_key.nk.next)
+
+
+/* 'const' to avoid wrong writings that can mess up field 'next' */
+#define gkey(n)		cast(const TValue*, (&(n)->i_key.tvk))
+
+/*
+** writable version of 'gkey'; allows updates to individual fields,
+** but not to the whole (which has incompatible type)
+*/
+#define wgkey(n)		(&(n)->i_key.nk)
+
+#define invalidateTMcache(t)	((t)->flags = 0)
+
+
+/* true when 't' is using 'dummynode' as its hash part */
+#define isdummy(t)		((t)->lastfree == NULL)
+
+
+/* allocated size for hash nodes */
+#define allocsizenode(t)	(isdummy(t) ? 0 : sizenode(t))
+
+
+/* returns the key, given the value of a table entry */
+#define keyfromval(v) \
+  (gkey(cast(Node *, cast(char *, (v)) - offsetof(Node, i_val))))
+
+
+LUAI_FUNC const TValue *luaH_getint (Table *t, lua_Integer key);
+LUAI_FUNC void luaH_setint (lua_State *L, Table *t, lua_Integer key,
+                                                    TValue *value);
+LUAI_FUNC const TValue *luaH_getshortstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_getstr (Table *t, TString *key);
+LUAI_FUNC const TValue *luaH_get (Table *t, const TValue *key);
+LUAI_FUNC TValue *luaH_newkey (lua_State *L, Table *t, const TValue *key);
+LUAI_FUNC TValue *luaH_set (lua_State *L, Table *t, const TValue *key);
+LUAI_FUNC Table *luaH_new (lua_State *L);
+LUAI_FUNC void luaH_resize (lua_State *L, Table *t, unsigned int nasize,
+                                                    unsigned int nhsize);
+LUAI_FUNC void luaH_resizearray (lua_State *L, Table *t, unsigned int nasize);
+LUAI_FUNC void luaH_free (lua_State *L, Table *t);
+LUAI_FUNC int luaH_next (lua_State *L, Table *t, StkId key);
+LUAI_FUNC int luaH_getn (Table *t);
+
+
+#if defined(LUA_DEBUG)
+LUAI_FUNC Node *luaH_mainposition (const Table *t, const TValue *key);
+LUAI_FUNC int luaH_isdummy (const Table *t);
+#endif
+
+
+#endif
diff --git a/scite-app/scite/lua/src/ltablib.c b/scite-app/scite/lua/src/ltablib.c
new file mode 100644
index 0000000..98b2f87
--- /dev/null
+++ b/scite-app/scite/lua/src/ltablib.c
@@ -0,0 +1,450 @@
+/*
+** $Id: ltablib.c,v 1.93 2016/02/25 19:41:54 roberto Exp $
+** Library for Table Manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define ltablib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <limits.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+
+/*
+** Operations that an object must define to mimic a table
+** (some functions only need some of them)
+*/
+#define TAB_R	1			/* read */
+#define TAB_W	2			/* write */
+#define TAB_L	4			/* length */
+#define TAB_RW	(TAB_R | TAB_W)		/* read/write */
+
+
+#define aux_getn(L,n,w)	(checktab(L, n, (w) | TAB_L), luaL_len(L, n))
+
+
+static int checkfield (lua_State *L, const char *key, int n) {
+  lua_pushstring(L, key);
+  return (lua_rawget(L, -n) != LUA_TNIL);
+}
+
+
+/*
+** Check that 'arg' either is a table or can behave like one (that is,
+** has a metatable with the required metamethods)
+*/
+static void checktab (lua_State *L, int arg, int what) {
+  if (lua_type(L, arg) != LUA_TTABLE) {  /* is it not a table? */
+    int n = 1;  /* number of elements to pop */
+    if (lua_getmetatable(L, arg) &&  /* must have metatable */
+        (!(what & TAB_R) || checkfield(L, "__index", ++n)) &&
+        (!(what & TAB_W) || checkfield(L, "__newindex", ++n)) &&
+        (!(what & TAB_L) || checkfield(L, "__len", ++n))) {
+      lua_pop(L, n);  /* pop metatable and tested metamethods */
+    }
+    else
+      luaL_checktype(L, arg, LUA_TTABLE);  /* force an error */
+  }
+}
+
+
+#if defined(LUA_COMPAT_MAXN)
+static int maxn (lua_State *L) {
+  lua_Number max = 0;
+  luaL_checktype(L, 1, LUA_TTABLE);
+  lua_pushnil(L);  /* first key */
+  while (lua_next(L, 1)) {
+    lua_pop(L, 1);  /* remove value */
+    if (lua_type(L, -1) == LUA_TNUMBER) {
+      lua_Number v = lua_tonumber(L, -1);
+      if (v > max) max = v;
+    }
+  }
+  lua_pushnumber(L, max);
+  return 1;
+}
+#endif
+
+
+static int tinsert (lua_State *L) {
+  lua_Integer e = aux_getn(L, 1, TAB_RW) + 1;  /* first empty element */
+  lua_Integer pos;  /* where to insert new element */
+  switch (lua_gettop(L)) {
+    case 2: {  /* called with only 2 arguments */
+      pos = e;  /* insert new element at the end */
+      break;
+    }
+    case 3: {
+      lua_Integer i;
+      pos = luaL_checkinteger(L, 2);  /* 2nd argument is the position */
+      luaL_argcheck(L, 1 <= pos && pos <= e, 2, "position out of bounds");
+      for (i = e; i > pos; i--) {  /* move up elements */
+        lua_geti(L, 1, i - 1);
+        lua_seti(L, 1, i);  /* t[i] = t[i - 1] */
+      }
+      break;
+    }
+    default: {
+      return luaL_error(L, "wrong number of arguments to 'insert'");
+    }
+  }
+  lua_seti(L, 1, pos);  /* t[pos] = v */
+  return 0;
+}
+
+
+static int tremove (lua_State *L) {
+  lua_Integer size = aux_getn(L, 1, TAB_RW);
+  lua_Integer pos = luaL_optinteger(L, 2, size);
+  if (pos != size)  /* validate 'pos' if given */
+    luaL_argcheck(L, 1 <= pos && pos <= size + 1, 1, "position out of bounds");
+  lua_geti(L, 1, pos);  /* result = t[pos] */
+  for ( ; pos < size; pos++) {
+    lua_geti(L, 1, pos + 1);
+    lua_seti(L, 1, pos);  /* t[pos] = t[pos + 1] */
+  }
+  lua_pushnil(L);
+  lua_seti(L, 1, pos);  /* t[pos] = nil */
+  return 1;
+}
+
+
+/*
+** Copy elements (1[f], ..., 1[e]) into (tt[t], tt[t+1], ...). Whenever
+** possible, copy in increasing order, which is better for rehashing.
+** "possible" means destination after original range, or smaller
+** than origin, or copying to another table.
+*/
+static int tmove (lua_State *L) {
+  lua_Integer f = luaL_checkinteger(L, 2);
+  lua_Integer e = luaL_checkinteger(L, 3);
+  lua_Integer t = luaL_checkinteger(L, 4);
+  int tt = !lua_isnoneornil(L, 5) ? 5 : 1;  /* destination table */
+  checktab(L, 1, TAB_R);
+  checktab(L, tt, TAB_W);
+  if (e >= f) {  /* otherwise, nothing to move */
+    lua_Integer n, i;
+    luaL_argcheck(L, f > 0 || e < LUA_MAXINTEGER + f, 3,
+                  "too many elements to move");
+    n = e - f + 1;  /* number of elements to move */
+    luaL_argcheck(L, t <= LUA_MAXINTEGER - n + 1, 4,
+                  "destination wrap around");
+    if (t > e || t <= f || (tt != 1 && !lua_compare(L, 1, tt, LUA_OPEQ))) {
+      for (i = 0; i < n; i++) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+    else {
+      for (i = n - 1; i >= 0; i--) {
+        lua_geti(L, 1, f + i);
+        lua_seti(L, tt, t + i);
+      }
+    }
+  }
+  lua_pushvalue(L, tt);  /* return destination table */
+  return 1;
+}
+
+
+static void addfield (lua_State *L, luaL_Buffer *b, lua_Integer i) {
+  lua_geti(L, 1, i);
+  if (!lua_isstring(L, -1))
+    luaL_error(L, "invalid value (%s) at index %d in table for 'concat'",
+                  luaL_typename(L, -1), i);
+  luaL_addvalue(b);
+}
+
+
+static int tconcat (lua_State *L) {
+  luaL_Buffer b;
+  lua_Integer last = aux_getn(L, 1, TAB_R);
+  size_t lsep;
+  const char *sep = luaL_optlstring(L, 2, "", &lsep);
+  lua_Integer i = luaL_optinteger(L, 3, 1);
+  last = luaL_optinteger(L, 4, last);
+  luaL_buffinit(L, &b);
+  for (; i < last; i++) {
+    addfield(L, &b, i);
+    luaL_addlstring(&b, sep, lsep);
+  }
+  if (i == last)  /* add last value (if interval was not empty) */
+    addfield(L, &b, i);
+  luaL_pushresult(&b);
+  return 1;
+}
+
+
+/*
+** {======================================================
+** Pack/unpack
+** =======================================================
+*/
+
+static int pack (lua_State *L) {
+  int i;
+  int n = lua_gettop(L);  /* number of elements to pack */
+  lua_createtable(L, n, 1);  /* create result table */
+  lua_insert(L, 1);  /* put it at index 1 */
+  for (i = n; i >= 1; i--)  /* assign elements */
+    lua_seti(L, 1, i);
+  lua_pushinteger(L, n);
+  lua_setfield(L, 1, "n");  /* t.n = number of elements */
+  return 1;  /* return table */
+}
+
+
+static int unpack (lua_State *L) {
+  lua_Unsigned n;
+  lua_Integer i = luaL_optinteger(L, 2, 1);
+  lua_Integer e = luaL_opt(L, luaL_checkinteger, 3, luaL_len(L, 1));
+  if (i > e) return 0;  /* empty range */
+  n = (lua_Unsigned)e - i;  /* number of elements minus 1 (avoid overflows) */
+  if (n >= (unsigned int)INT_MAX  || !lua_checkstack(L, (int)(++n)))
+    return luaL_error(L, "too many results to unpack");
+  for (; i < e; i++) {  /* push arg[i..e - 1] (to avoid overflows) */
+    lua_geti(L, 1, i);
+  }
+  lua_geti(L, 1, e);  /* push last element */
+  return (int)n;
+}
+
+/* }====================================================== */
+
+
+
+/*
+** {======================================================
+** Quicksort
+** (based on 'Algorithms in MODULA-3', Robert Sedgewick;
+**  Addison-Wesley, 1993.)
+** =======================================================
+*/
+
+
+/* type for array indices */
+typedef unsigned int IdxT;
+
+
+/*
+** Produce a "random" 'unsigned int' to randomize pivot choice. This
+** macro is used only when 'sort' detects a big imbalance in the result
+** of a partition. (If you don't want/need this "randomness", ~0 is a
+** good choice.)
+*/
+#if !defined(l_randomizePivot)		/* { */
+
+#include <time.h>
+
+/* size of 'e' measured in number of 'unsigned int's */
+#define sof(e)		(sizeof(e) / sizeof(unsigned int))
+
+/*
+** Use 'time' and 'clock' as sources of "randomness". Because we don't
+** know the types 'clock_t' and 'time_t', we cannot cast them to
+** anything without risking overflows. A safe way to use their values
+** is to copy them to an array of a known type and use the array values.
+*/
+static unsigned int l_randomizePivot (void) {
+  clock_t c = clock();
+  time_t t = time(NULL);
+  unsigned int buff[sof(c) + sof(t)];
+  unsigned int i, rnd = 0;
+  memcpy(buff, &c, sof(c) * sizeof(unsigned int));
+  memcpy(buff + sof(c), &t, sof(t) * sizeof(unsigned int));
+  for (i = 0; i < sof(buff); i++)
+    rnd += buff[i];
+  return rnd;
+}
+
+#endif					/* } */
+
+
+/* arrays larger than 'RANLIMIT' may use randomized pivots */
+#define RANLIMIT	100u
+
+
+static void set2 (lua_State *L, IdxT i, IdxT j) {
+  lua_seti(L, 1, i);
+  lua_seti(L, 1, j);
+}
+
+
+/*
+** Return true iff value at stack index 'a' is less than the value at
+** index 'b' (according to the order of the sort).
+*/
+static int sort_comp (lua_State *L, int a, int b) {
+  if (lua_isnil(L, 2))  /* no function? */
+    return lua_compare(L, a, b, LUA_OPLT);  /* a < b */
+  else {  /* function */
+    int res;
+    lua_pushvalue(L, 2);    /* push function */
+    lua_pushvalue(L, a-1);  /* -1 to compensate function */
+    lua_pushvalue(L, b-2);  /* -2 to compensate function and 'a' */
+    lua_call(L, 2, 1);      /* call function */
+    res = lua_toboolean(L, -1);  /* get result */
+    lua_pop(L, 1);          /* pop result */
+    return res;
+  }
+}
+
+
+/*
+** Does the partition: Pivot P is at the top of the stack.
+** precondition: a[lo] <= P == a[up-1] <= a[up],
+** so it only needs to do the partition from lo + 1 to up - 2.
+** Pos-condition: a[lo .. i - 1] <= a[i] == P <= a[i + 1 .. up]
+** returns 'i'.
+*/
+static IdxT partition (lua_State *L, IdxT lo, IdxT up) {
+  IdxT i = lo;  /* will be incremented before first use */
+  IdxT j = up - 1;  /* will be decremented before first use */
+  /* loop invariant: a[lo .. i] <= P <= a[j .. up] */
+  for (;;) {
+    /* next loop: repeat ++i while a[i] < P */
+    while (lua_geti(L, 1, ++i), sort_comp(L, -1, -2)) {
+      if (i == up - 1)  /* a[i] < P  but a[up - 1] == P  ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[i] */
+    }
+    /* after the loop, a[i] >= P and a[lo .. i - 1] < P */
+    /* next loop: repeat --j while P < a[j] */
+    while (lua_geti(L, 1, --j), sort_comp(L, -3, -1)) {
+      if (j < i)  /* j < i  but  a[j] > P ?? */
+        luaL_error(L, "invalid order function for sorting");
+      lua_pop(L, 1);  /* remove a[j] */
+    }
+    /* after the loop, a[j] <= P and a[j + 1 .. up] >= P */
+    if (j < i) {  /* no elements out of place? */
+      /* a[lo .. i - 1] <= P <= a[j + 1 .. i .. up] */
+      lua_pop(L, 1);  /* pop a[j] */
+      /* swap pivot (a[up - 1]) with a[i] to satisfy pos-condition */
+      set2(L, up - 1, i);
+      return i;
+    }
+    /* otherwise, swap a[i] - a[j] to restore invariant and repeat */
+    set2(L, i, j);
+  }
+}
+
+
+/*
+** Choose an element in the middle (2nd-3th quarters) of [lo,up]
+** "randomized" by 'rnd'
+*/
+static IdxT choosePivot (IdxT lo, IdxT up, unsigned int rnd) {
+  IdxT r4 = (up - lo) / 4;  /* range/4 */
+  IdxT p = rnd % (r4 * 2) + (lo + r4);
+  lua_assert(lo + r4 <= p && p <= up - r4);
+  return p;
+}
+
+
+/*
+** QuickSort algorithm (recursive function)
+*/
+static void auxsort (lua_State *L, IdxT lo, IdxT up,
+                                   unsigned int rnd) {
+  while (lo < up) {  /* loop for tail recursion */
+    IdxT p;  /* Pivot index */
+    IdxT n;  /* to be used later */
+    /* sort elements 'lo', 'p', and 'up' */
+    lua_geti(L, 1, lo);
+    lua_geti(L, 1, up);
+    if (sort_comp(L, -1, -2))  /* a[up] < a[lo]? */
+      set2(L, lo, up);  /* swap a[lo] - a[up] */
+    else
+      lua_pop(L, 2);  /* remove both values */
+    if (up - lo == 1)  /* only 2 elements? */
+      return;  /* already sorted */
+    if (up - lo < RANLIMIT || rnd == 0)  /* small interval or no randomize? */
+      p = (lo + up)/2;  /* middle element is a good pivot */
+    else  /* for larger intervals, it is worth a random pivot */
+      p = choosePivot(lo, up, rnd);
+    lua_geti(L, 1, p);
+    lua_geti(L, 1, lo);
+    if (sort_comp(L, -2, -1))  /* a[p] < a[lo]? */
+      set2(L, p, lo);  /* swap a[p] - a[lo] */
+    else {
+      lua_pop(L, 1);  /* remove a[lo] */
+      lua_geti(L, 1, up);
+      if (sort_comp(L, -1, -2))  /* a[up] < a[p]? */
+        set2(L, p, up);  /* swap a[up] - a[p] */
+      else
+        lua_pop(L, 2);
+    }
+    if (up - lo == 2)  /* only 3 elements? */
+      return;  /* already sorted */
+    lua_geti(L, 1, p);  /* get middle element (Pivot) */
+    lua_pushvalue(L, -1);  /* push Pivot */
+    lua_geti(L, 1, up - 1);  /* push a[up - 1] */
+    set2(L, p, up - 1);  /* swap Pivot (a[p]) with a[up - 1] */
+    p = partition(L, lo, up);
+    /* a[lo .. p - 1] <= a[p] == P <= a[p + 1 .. up] */
+    if (p - lo < up - p) {  /* lower interval is smaller? */
+      auxsort(L, lo, p - 1, rnd);  /* call recursively for lower interval */
+      n = p - lo;  /* size of smaller interval */
+      lo = p + 1;  /* tail call for [p + 1 .. up] (upper interval) */
+    }
+    else {
+      auxsort(L, p + 1, up, rnd);  /* call recursively for upper interval */
+      n = up - p;  /* size of smaller interval */
+      up = p - 1;  /* tail call for [lo .. p - 1]  (lower interval) */
+    }
+    if ((up - lo) / 128 > n) /* partition too imbalanced? */
+      rnd = l_randomizePivot();  /* try a new randomization */
+  }  /* tail call auxsort(L, lo, up, rnd) */
+}
+
+
+static int sort (lua_State *L) {
+  lua_Integer n = aux_getn(L, 1, TAB_RW);
+  if (n > 1) {  /* non-trivial interval? */
+    luaL_argcheck(L, n < INT_MAX, 1, "array too big");
+    if (!lua_isnoneornil(L, 2))  /* is there a 2nd argument? */
+      luaL_checktype(L, 2, LUA_TFUNCTION);  /* must be a function */
+    lua_settop(L, 2);  /* make sure there are two arguments */
+    auxsort(L, 1, (IdxT)n, 0);
+  }
+  return 0;
+}
+
+/* }====================================================== */
+
+
+static const luaL_Reg tab_funcs[] = {
+  {"concat", tconcat},
+#if defined(LUA_COMPAT_MAXN)
+  {"maxn", maxn},
+#endif
+  {"insert", tinsert},
+  {"pack", pack},
+  {"unpack", unpack},
+  {"remove", tremove},
+  {"move", tmove},
+  {"sort", sort},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_table (lua_State *L) {
+  luaL_newlib(L, tab_funcs);
+#if defined(LUA_COMPAT_UNPACK)
+  /* _G.unpack = table.unpack */
+  lua_getfield(L, -1, "unpack");
+  lua_setglobal(L, "unpack");
+#endif
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/ltm.c b/scite-app/scite/lua/src/ltm.c
new file mode 100644
index 0000000..14e5257
--- /dev/null
+++ b/scite-app/scite/lua/src/ltm.c
@@ -0,0 +1,165 @@
+/*
+** $Id: ltm.c,v 2.38 2016/12/22 13:08:50 roberto Exp $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#define ltm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+static const char udatatypename[] = "userdata";
+
+LUAI_DDEF const char *const luaT_typenames_[LUA_TOTALTAGS] = {
+  "no value",
+  "nil", "boolean", udatatypename, "number",
+  "string", "table", "function", udatatypename, "thread",
+  "proto" /* this last case is used for tests only */
+};
+
+
+void luaT_init (lua_State *L) {
+  static const char *const luaT_eventname[] = {  /* ORDER TM */
+    "__index", "__newindex",
+    "__gc", "__mode", "__len", "__eq",
+    "__add", "__sub", "__mul", "__mod", "__pow",
+    "__div", "__idiv",
+    "__band", "__bor", "__bxor", "__shl", "__shr",
+    "__unm", "__bnot", "__lt", "__le",
+    "__concat", "__call"
+  };
+  int i;
+  for (i=0; i<TM_N; i++) {
+    G(L)->tmname[i] = luaS_new(L, luaT_eventname[i]);
+    luaC_fix(L, obj2gco(G(L)->tmname[i]));  /* never collect these names */
+  }
+}
+
+
+/*
+** function to be used with macro "fasttm": optimized for absence of
+** tag methods
+*/
+const TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
+  const TValue *tm = luaH_getshortstr(events, ename);
+  lua_assert(event <= TM_EQ);
+  if (ttisnil(tm)) {  /* no tag method? */
+    events->flags |= cast_byte(1u<<event);  /* cache this fact */
+    return NULL;
+  }
+  else return tm;
+}
+
+
+const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
+  Table *mt;
+  switch (ttnov(o)) {
+    case LUA_TTABLE:
+      mt = hvalue(o)->metatable;
+      break;
+    case LUA_TUSERDATA:
+      mt = uvalue(o)->metatable;
+      break;
+    default:
+      mt = G(L)->mt[ttnov(o)];
+  }
+  return (mt ? luaH_getshortstr(mt, G(L)->tmname[event]) : luaO_nilobject);
+}
+
+
+/*
+** Return the name of the type of an object. For tables and userdata
+** with metatable, use their '__name' metafield, if present.
+*/
+const char *luaT_objtypename (lua_State *L, const TValue *o) {
+  Table *mt;
+  if ((ttistable(o) && (mt = hvalue(o)->metatable) != NULL) ||
+      (ttisfulluserdata(o) && (mt = uvalue(o)->metatable) != NULL)) {
+    const TValue *name = luaH_getshortstr(mt, luaS_new(L, "__name"));
+    if (ttisstring(name))  /* is '__name' a string? */
+      return getstr(tsvalue(name));  /* use it as type name */
+  }
+  return ttypename(ttnov(o));  /* else use standard type name */
+}
+
+
+void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                  const TValue *p2, TValue *p3, int hasres) {
+  ptrdiff_t result = savestack(L, p3);
+  StkId func = L->top;
+  setobj2s(L, func, f);  /* push function (assume EXTRA_STACK) */
+  setobj2s(L, func + 1, p1);  /* 1st argument */
+  setobj2s(L, func + 2, p2);  /* 2nd argument */
+  L->top += 3;
+  if (!hasres)  /* no result? 'p3' is third argument */
+    setobj2s(L, L->top++, p3);  /* 3rd argument */
+  /* metamethod may yield only when called from Lua code */
+  if (isLua(L->ci))
+    luaD_call(L, func, hasres);
+  else
+    luaD_callnoyield(L, func, hasres);
+  if (hasres) {  /* if has result, move it to its place */
+    p3 = restorestack(L, result);
+    setobjs2s(L, p3, --L->top);
+  }
+}
+
+
+int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                    StkId res, TMS event) {
+  const TValue *tm = luaT_gettmbyobj(L, p1, event);  /* try first operand */
+  if (ttisnil(tm))
+    tm = luaT_gettmbyobj(L, p2, event);  /* try second operand */
+  if (ttisnil(tm)) return 0;
+  luaT_callTM(L, tm, p1, p2, res, 1);
+  return 1;
+}
+
+
+void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                    StkId res, TMS event) {
+  if (!luaT_callbinTM(L, p1, p2, res, event)) {
+    switch (event) {
+      case TM_CONCAT:
+        luaG_concaterror(L, p1, p2);
+      /* call never returns, but to avoid warnings: *//* FALLTHROUGH */
+      case TM_BAND: case TM_BOR: case TM_BXOR:
+      case TM_SHL: case TM_SHR: case TM_BNOT: {
+        lua_Number dummy;
+        if (tonumber(p1, &dummy) && tonumber(p2, &dummy))
+          luaG_tointerror(L, p1, p2);
+        else
+          luaG_opinterror(L, p1, p2, "perform bitwise operation on");
+      }
+      /* calls never return, but to avoid warnings: *//* FALLTHROUGH */
+      default:
+        luaG_opinterror(L, p1, p2, "perform arithmetic on");
+    }
+  }
+}
+
+
+int luaT_callorderTM (lua_State *L, const TValue *p1, const TValue *p2,
+                      TMS event) {
+  if (!luaT_callbinTM(L, p1, p2, L->top, event))
+    return -1;  /* no metamethod */
+  else
+    return !l_isfalse(L->top);
+}
+
diff --git a/scite-app/scite/lua/src/ltm.h b/scite-app/scite/lua/src/ltm.h
new file mode 100644
index 0000000..63db726
--- /dev/null
+++ b/scite-app/scite/lua/src/ltm.h
@@ -0,0 +1,76 @@
+/*
+** $Id: ltm.h,v 2.22 2016/02/26 19:20:15 roberto Exp $
+** Tag methods
+** See Copyright Notice in lua.h
+*/
+
+#ifndef ltm_h
+#define ltm_h
+
+
+#include "lobject.h"
+
+
+/*
+* WARNING: if you change the order of this enumeration,
+* grep "ORDER TM" and "ORDER OP"
+*/
+typedef enum {
+  TM_INDEX,
+  TM_NEWINDEX,
+  TM_GC,
+  TM_MODE,
+  TM_LEN,
+  TM_EQ,  /* last tag method with fast access */
+  TM_ADD,
+  TM_SUB,
+  TM_MUL,
+  TM_MOD,
+  TM_POW,
+  TM_DIV,
+  TM_IDIV,
+  TM_BAND,
+  TM_BOR,
+  TM_BXOR,
+  TM_SHL,
+  TM_SHR,
+  TM_UNM,
+  TM_BNOT,
+  TM_LT,
+  TM_LE,
+  TM_CONCAT,
+  TM_CALL,
+  TM_N		/* number of elements in the enum */
+} TMS;
+
+
+
+#define gfasttm(g,et,e) ((et) == NULL ? NULL : \
+  ((et)->flags & (1u<<(e))) ? NULL : luaT_gettm(et, e, (g)->tmname[e]))
+
+#define fasttm(l,et,e)	gfasttm(G(l), et, e)
+
+#define ttypename(x)	luaT_typenames_[(x) + 1]
+
+LUAI_DDEC const char *const luaT_typenames_[LUA_TOTALTAGS];
+
+
+LUAI_FUNC const char *luaT_objtypename (lua_State *L, const TValue *o);
+
+LUAI_FUNC const TValue *luaT_gettm (Table *events, TMS event, TString *ename);
+LUAI_FUNC const TValue *luaT_gettmbyobj (lua_State *L, const TValue *o,
+                                                       TMS event);
+LUAI_FUNC void luaT_init (lua_State *L);
+
+LUAI_FUNC void luaT_callTM (lua_State *L, const TValue *f, const TValue *p1,
+                            const TValue *p2, TValue *p3, int hasres);
+LUAI_FUNC int luaT_callbinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                              StkId res, TMS event);
+LUAI_FUNC void luaT_trybinTM (lua_State *L, const TValue *p1, const TValue *p2,
+                              StkId res, TMS event);
+LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
+                                const TValue *p2, TMS event);
+
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lua.h b/scite-app/scite/lua/src/lua.h
new file mode 100644
index 0000000..26c0e2d
--- /dev/null
+++ b/scite-app/scite/lua/src/lua.h
@@ -0,0 +1,486 @@
+/*
+** $Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp $
+** Lua - A Scripting Language
+** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
+** See Copyright Notice at the end of this file
+*/
+
+
+#ifndef lua_h
+#define lua_h
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+#include "luaconf.h"
+
+
+#define LUA_VERSION_MAJOR	"5"
+#define LUA_VERSION_MINOR	"3"
+#define LUA_VERSION_NUM		503
+#define LUA_VERSION_RELEASE	"4"
+
+#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
+#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2017 Lua.org, PUC-Rio"
+#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
+
+
+/* mark for precompiled code ('<esc>Lua') */
+#define LUA_SIGNATURE	"\x1bLua"
+
+/* option for multiple returns in 'lua_pcall' and 'lua_call' */
+#define LUA_MULTRET	(-1)
+
+
+/*
+** Pseudo-indices
+** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
+** space after that to help overflow detection)
+*/
+#define LUA_REGISTRYINDEX	(-LUAI_MAXSTACK - 1000)
+#define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
+
+
+/* thread status */
+#define LUA_OK		0
+#define LUA_YIELD	1
+#define LUA_ERRRUN	2
+#define LUA_ERRSYNTAX	3
+#define LUA_ERRMEM	4
+#define LUA_ERRGCMM	5
+#define LUA_ERRERR	6
+
+
+typedef struct lua_State lua_State;
+
+
+/*
+** basic types
+*/
+#define LUA_TNONE		(-1)
+
+#define LUA_TNIL		0
+#define LUA_TBOOLEAN		1
+#define LUA_TLIGHTUSERDATA	2
+#define LUA_TNUMBER		3
+#define LUA_TSTRING		4
+#define LUA_TTABLE		5
+#define LUA_TFUNCTION		6
+#define LUA_TUSERDATA		7
+#define LUA_TTHREAD		8
+
+#define LUA_NUMTAGS		9
+
+
+
+/* minimum Lua stack available to a C function */
+#define LUA_MINSTACK	20
+
+
+/* predefined values in the registry */
+#define LUA_RIDX_MAINTHREAD	1
+#define LUA_RIDX_GLOBALS	2
+#define LUA_RIDX_LAST		LUA_RIDX_GLOBALS
+
+
+/* type of numbers in Lua */
+typedef LUA_NUMBER lua_Number;
+
+
+/* type for integer functions */
+typedef LUA_INTEGER lua_Integer;
+
+/* unsigned integer type */
+typedef LUA_UNSIGNED lua_Unsigned;
+
+/* type for continuation-function contexts */
+typedef LUA_KCONTEXT lua_KContext;
+
+
+/*
+** Type for C functions registered with Lua
+*/
+typedef int (*lua_CFunction) (lua_State *L);
+
+/*
+** Type for continuation functions
+*/
+typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
+
+
+/*
+** Type for functions that read/write blocks when loading/dumping Lua chunks
+*/
+typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
+
+typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
+
+
+/*
+** Type for memory-allocation functions
+*/
+typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
+
+
+
+/*
+** generic extra include file
+*/
+#if defined(LUA_USER_H)
+#include LUA_USER_H
+#endif
+
+
+/*
+** RCS ident string
+*/
+extern const char lua_ident[];
+
+
+/*
+** state manipulation
+*/
+LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
+LUA_API void       (lua_close) (lua_State *L);
+LUA_API lua_State *(lua_newthread) (lua_State *L);
+
+LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
+
+
+LUA_API const lua_Number *(lua_version) (lua_State *L);
+
+
+/*
+** basic stack manipulation
+*/
+LUA_API int   (lua_absindex) (lua_State *L, int idx);
+LUA_API int   (lua_gettop) (lua_State *L);
+LUA_API void  (lua_settop) (lua_State *L, int idx);
+LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
+LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
+LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
+LUA_API int   (lua_checkstack) (lua_State *L, int n);
+
+LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
+
+
+/*
+** access functions (stack -> C)
+*/
+
+LUA_API int             (lua_isnumber) (lua_State *L, int idx);
+LUA_API int             (lua_isstring) (lua_State *L, int idx);
+LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
+LUA_API int             (lua_isinteger) (lua_State *L, int idx);
+LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
+LUA_API int             (lua_type) (lua_State *L, int idx);
+LUA_API const char     *(lua_typename) (lua_State *L, int tp);
+
+LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
+LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
+LUA_API int             (lua_toboolean) (lua_State *L, int idx);
+LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
+LUA_API size_t          (lua_rawlen) (lua_State *L, int idx);
+LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
+LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
+LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
+LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
+
+
+/*
+** Comparison and arithmetic functions
+*/
+
+#define LUA_OPADD	0	/* ORDER TM, ORDER OP */
+#define LUA_OPSUB	1
+#define LUA_OPMUL	2
+#define LUA_OPMOD	3
+#define LUA_OPPOW	4
+#define LUA_OPDIV	5
+#define LUA_OPIDIV	6
+#define LUA_OPBAND	7
+#define LUA_OPBOR	8
+#define LUA_OPBXOR	9
+#define LUA_OPSHL	10
+#define LUA_OPSHR	11
+#define LUA_OPUNM	12
+#define LUA_OPBNOT	13
+
+LUA_API void  (lua_arith) (lua_State *L, int op);
+
+#define LUA_OPEQ	0
+#define LUA_OPLT	1
+#define LUA_OPLE	2
+
+LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
+LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
+
+
+/*
+** push functions (C -> stack)
+*/
+LUA_API void        (lua_pushnil) (lua_State *L);
+LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
+LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
+LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
+LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
+LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
+                                                      va_list argp);
+LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
+LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
+LUA_API void  (lua_pushboolean) (lua_State *L, int b);
+LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
+LUA_API int   (lua_pushthread) (lua_State *L);
+
+
+/*
+** get functions (Lua -> stack)
+*/
+LUA_API int (lua_getglobal) (lua_State *L, const char *name);
+LUA_API int (lua_gettable) (lua_State *L, int idx);
+LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
+LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawget) (lua_State *L, int idx);
+LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
+LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
+
+LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
+LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
+LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
+LUA_API int  (lua_getuservalue) (lua_State *L, int idx);
+
+
+/*
+** set functions (stack -> Lua)
+*/
+LUA_API void  (lua_setglobal) (lua_State *L, const char *name);
+LUA_API void  (lua_settable) (lua_State *L, int idx);
+LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
+LUA_API void  (lua_seti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawset) (lua_State *L, int idx);
+LUA_API void  (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
+LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
+LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
+LUA_API void  (lua_setuservalue) (lua_State *L, int idx);
+
+
+/*
+** 'load' and 'call' functions (load and run Lua code)
+*/
+LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults,
+                           lua_KContext ctx, lua_KFunction k);
+#define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
+
+LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
+                            lua_KContext ctx, lua_KFunction k);
+#define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
+
+LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
+                          const char *chunkname, const char *mode);
+
+LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
+
+
+/*
+** coroutine functions
+*/
+LUA_API int  (lua_yieldk)     (lua_State *L, int nresults, lua_KContext ctx,
+                               lua_KFunction k);
+LUA_API int  (lua_resume)     (lua_State *L, lua_State *from, int narg);
+LUA_API int  (lua_status)     (lua_State *L);
+LUA_API int (lua_isyieldable) (lua_State *L);
+
+#define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
+
+
+/*
+** garbage-collection function and options
+*/
+
+#define LUA_GCSTOP		0
+#define LUA_GCRESTART		1
+#define LUA_GCCOLLECT		2
+#define LUA_GCCOUNT		3
+#define LUA_GCCOUNTB		4
+#define LUA_GCSTEP		5
+#define LUA_GCSETPAUSE		6
+#define LUA_GCSETSTEPMUL	7
+#define LUA_GCISRUNNING		9
+
+LUA_API int (lua_gc) (lua_State *L, int what, int data);
+
+
+/*
+** miscellaneous functions
+*/
+
+LUA_API int   (lua_error) (lua_State *L);
+
+LUA_API int   (lua_next) (lua_State *L, int idx);
+
+LUA_API void  (lua_concat) (lua_State *L, int n);
+LUA_API void  (lua_len)    (lua_State *L, int idx);
+
+LUA_API size_t   (lua_stringtonumber) (lua_State *L, const char *s);
+
+LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
+LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
+
+
+
+/*
+** {==============================================================
+** some useful macros
+** ===============================================================
+*/
+
+#define lua_getextraspace(L)	((void *)((char *)(L) - LUA_EXTRASPACE))
+
+#define lua_tonumber(L,i)	lua_tonumberx(L,(i),NULL)
+#define lua_tointeger(L,i)	lua_tointegerx(L,(i),NULL)
+
+#define lua_pop(L,n)		lua_settop(L, -(n)-1)
+
+#define lua_newtable(L)		lua_createtable(L, 0, 0)
+
+#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+
+#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
+
+#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
+
+#define lua_pushliteral(L, s)	lua_pushstring(L, "" s)
+
+#define lua_pushglobaltable(L)  \
+	((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS))
+
+#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
+
+
+#define lua_insert(L,idx)	lua_rotate(L, (idx), 1)
+
+#define lua_remove(L,idx)	(lua_rotate(L, (idx), -1), lua_pop(L, 1))
+
+#define lua_replace(L,idx)	(lua_copy(L, -1, (idx)), lua_pop(L, 1))
+
+/* }============================================================== */
+
+
+/*
+** {==============================================================
+** compatibility macros for unsigned conversions
+** ===============================================================
+*/
+#if defined(LUA_COMPAT_APIINTCASTS)
+
+#define lua_pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
+#define lua_tounsignedx(L,i,is)	((lua_Unsigned)lua_tointegerx(L,i,is))
+#define lua_tounsigned(L,i)	lua_tounsignedx(L,(i),NULL)
+
+#endif
+/* }============================================================== */
+
+/*
+** {======================================================================
+** Debug API
+** =======================================================================
+*/
+
+
+/*
+** Event codes
+*/
+#define LUA_HOOKCALL	0
+#define LUA_HOOKRET	1
+#define LUA_HOOKLINE	2
+#define LUA_HOOKCOUNT	3
+#define LUA_HOOKTAILCALL 4
+
+
+/*
+** Event masks
+*/
+#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
+#define LUA_MASKRET	(1 << LUA_HOOKRET)
+#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
+
+typedef struct lua_Debug lua_Debug;  /* activation record */
+
+
+/* Functions to be called by the debugger in specific events */
+typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
+
+
+LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
+LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
+LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
+LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
+LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
+
+LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
+LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
+                                               int fidx2, int n2);
+
+LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
+LUA_API lua_Hook (lua_gethook) (lua_State *L);
+LUA_API int (lua_gethookmask) (lua_State *L);
+LUA_API int (lua_gethookcount) (lua_State *L);
+
+
+struct lua_Debug {
+  int event;
+  const char *name;	/* (n) */
+  const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
+  const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
+  const char *source;	/* (S) */
+  int currentline;	/* (l) */
+  int linedefined;	/* (S) */
+  int lastlinedefined;	/* (S) */
+  unsigned char nups;	/* (u) number of upvalues */
+  unsigned char nparams;/* (u) number of parameters */
+  char isvararg;        /* (u) */
+  char istailcall;	/* (t) */
+  char short_src[LUA_IDSIZE]; /* (S) */
+  /* private part */
+  struct CallInfo *i_ci;  /* active function */
+};
+
+/* }====================================================================== */
+
+
+/******************************************************************************
+* Copyright (C) 1994-2017 Lua.org, PUC-Rio.
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lua.hpp b/scite-app/scite/lua/src/lua.hpp
new file mode 100644
index 0000000..ec417f5
--- /dev/null
+++ b/scite-app/scite/lua/src/lua.hpp
@@ -0,0 +1,9 @@
+// lua.hpp
+// Lua header files for C++
+// <<extern "C">> not supplied automatically because Lua also compiles as C++
+
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
diff --git a/scite-app/scite/lua/src/luaconf.h b/scite-app/scite/lua/src/luaconf.h
new file mode 100644
index 0000000..da5f541
--- /dev/null
+++ b/scite-app/scite/lua/src/luaconf.h
@@ -0,0 +1,794 @@
+/*
+** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $
+** Configuration file for Lua
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef luaconf_h
+#define luaconf_h
+
+#include <limits.h>
+#include <stddef.h>
+
+
+/*
+** ===================================================================
+** Search for "@@" to find all configurable definitions.
+** ===================================================================
+*/
+
+
+/*
+** {====================================================================
+** System Configuration: macros to adapt (if needed) Lua to some
+** particular platform, for instance compiling it with 32-bit numbers or
+** restricting it to C89.
+** =====================================================================
+*/
+
+/*
+@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. You
+** can also define LUA_32BITS in the make file, but changing here you
+** ensure that all software connected to Lua will be compiled with the
+** same configuration.
+*/
+/* #define LUA_32BITS */
+
+
+/*
+@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
+** Define it if you want Lua to avoid the use of a few C99 features
+** or Windows-specific features on Windows.
+*/
+/* #define LUA_USE_C89 */
+
+
+/*
+** By default, Lua on Windows use (some) specific Windows features
+*/
+#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE)
+#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
+#endif
+
+
+#if defined(LUA_USE_WINDOWS)
+#define LUA_DL_DLL	/* enable support for DLL */
+#define LUA_USE_C89	/* broadly, Windows is C89 */
+#endif
+
+
+#if defined(LUA_USE_LINUX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+#define LUA_USE_READLINE	/* needs some extra libraries */
+#endif
+
+
+#if defined(LUA_USE_MACOSX)
+#define LUA_USE_POSIX
+#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
+#define LUA_USE_READLINE	/* needs an extra library: -lreadline */
+#endif
+
+
+/*
+@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
+** C89 ('long' and 'double'); Windows always has '__int64', so it does
+** not need to use this case.
+*/
+#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
+#define LUA_C89_NUMBERS
+#endif
+
+
+
+/*
+@@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'.
+*/
+/* avoid undefined shifts */
+#if ((INT_MAX >> 15) >> 15) >= 1
+#define LUAI_BITSINT	32
+#else
+/* 'int' always must have at least 16 bits */
+#define LUAI_BITSINT	16
+#endif
+
+
+/*
+@@ LUA_INT_TYPE defines the type for Lua integers.
+@@ LUA_FLOAT_TYPE defines the type for Lua floats.
+** Lua should work fine with any mix of these options (if supported
+** by your C compiler). The usual configurations are 64-bit integers
+** and 'double' (the default), 32-bit integers and 'float' (for
+** restricted platforms), and 'long'/'double' (for C compilers not
+** compliant with C99, which may not have support for 'long long').
+*/
+
+/* predefined options for LUA_INT_TYPE */
+#define LUA_INT_INT		1
+#define LUA_INT_LONG		2
+#define LUA_INT_LONGLONG	3
+
+/* predefined options for LUA_FLOAT_TYPE */
+#define LUA_FLOAT_FLOAT		1
+#define LUA_FLOAT_DOUBLE	2
+#define LUA_FLOAT_LONGDOUBLE	3
+
+#if defined(LUA_32BITS)		/* { */
+/*
+** 32-bit integers and 'float'
+*/
+#if LUAI_BITSINT >= 32  /* use 'int' if big enough */
+#define LUA_INT_TYPE	LUA_INT_INT
+#else  /* otherwise use 'long' */
+#define LUA_INT_TYPE	LUA_INT_LONG
+#endif
+#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
+
+#elif defined(LUA_C89_NUMBERS)	/* }{ */
+/*
+** largest types available for C89 ('long' and 'double')
+*/
+#define LUA_INT_TYPE	LUA_INT_LONG
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+
+#endif				/* } */
+
+
+/*
+** default configuration for 64-bit Lua ('long long' and 'double')
+*/
+#if !defined(LUA_INT_TYPE)
+#define LUA_INT_TYPE	LUA_INT_LONGLONG
+#endif
+
+#if !defined(LUA_FLOAT_TYPE)
+#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
+#endif
+
+/* }================================================================== */
+
+
+
+
+/*
+** {==================================================================
+** Configuration for Paths.
+** ===================================================================
+*/
+
+/*
+** LUA_PATH_SEP is the character that separates templates in a path.
+** LUA_PATH_MARK is the string that marks the substitution points in a
+** template.
+** LUA_EXEC_DIR in a Windows path is replaced by the executable's
+** directory.
+*/
+#define LUA_PATH_SEP            ";"
+#define LUA_PATH_MARK           "?"
+#define LUA_EXEC_DIR            "!"
+
+
+/*
+@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
+** Lua libraries.
+@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
+** C libraries.
+** CHANGE them if your machine has a non-conventional directory
+** hierarchy or if you want to install your libraries in
+** non-conventional directories.
+*/
+#define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
+#if defined(_WIN32)	/* { */
+/*
+** In Windows, any exclamation mark ('!') in the path is replaced by the
+** path of the directory of the executable file of the current process.
+*/
+#define LUA_LDIR	"!\\lua\\"
+#define LUA_CDIR	"!\\"
+#define LUA_SHRDIR	"!\\..\\share\\lua\\" LUA_VDIR "\\"
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
+		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
+		".\\?.lua;" ".\\?\\init.lua"
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.dll;" \
+		LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
+		LUA_CDIR"loadall.dll;" ".\\?.dll"
+
+#else			/* }{ */
+
+#define LUA_ROOT	"/usr/local/"
+#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+#define LUA_PATH_DEFAULT  \
+		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+		"./?.lua;" "./?/init.lua"
+#define LUA_CPATH_DEFAULT \
+		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+#endif			/* } */
+
+
+/*
+@@ LUA_DIRSEP is the directory separator (for submodules).
+** CHANGE it if your machine does not use "/" as the directory separator
+** and is not Windows. (On Windows Lua automatically uses "\".)
+*/
+#if defined(_WIN32)
+#define LUA_DIRSEP	"\\"
+#else
+#define LUA_DIRSEP	"/"
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Marks for exported symbols in the C code
+** ===================================================================
+*/
+
+/*
+@@ LUA_API is a mark for all core API functions.
+@@ LUALIB_API is a mark for all auxiliary library functions.
+@@ LUAMOD_API is a mark for all standard library opening functions.
+** CHANGE them if you need to define those functions in some special way.
+** For instance, if you want to create one Windows DLL with the core and
+** the libraries, you may want to use the following definition (define
+** LUA_BUILD_AS_DLL to get it).
+*/
+#if defined(LUA_BUILD_AS_DLL)	/* { */
+
+#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
+#define LUA_API __declspec(dllexport)
+#else						/* }{ */
+#define LUA_API __declspec(dllimport)
+#endif						/* } */
+
+#else				/* }{ */
+
+#if defined(_WIN32)
+#define LUA_API __declspec(dllexport)
+#else
+#define LUA_API         extern
+#endif
+
+#endif				/* } */
+
+
+/* more often than not the libs go together with the core */
+#define LUALIB_API	LUA_API
+#define LUAMOD_API	LUALIB_API
+
+
+/*
+@@ LUAI_FUNC is a mark for all extern functions that are not to be
+** exported to outside modules.
+@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables
+** that are not to be exported to outside modules (LUAI_DDEF for
+** definitions and LUAI_DDEC for declarations).
+** CHANGE them if you need to mark them in some special way. Elf/gcc
+** (versions 3.2 and later) mark them as "hidden" to optimize access
+** when Lua is compiled as a shared library. Not all elf targets support
+** this attribute. Unfortunately, gcc does not offer a way to check
+** whether the target offers that support, and those without support
+** give a warning about it. To avoid these warnings, change to the
+** default definition.
+*/
+#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
+    defined(__ELF__)		/* { */
+#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
+#else				/* }{ */
+#define LUAI_FUNC	extern
+#endif				/* } */
+
+#define LUAI_DDEC	LUAI_FUNC
+#define LUAI_DDEF	/* empty */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Compatibility with previous versions
+** ===================================================================
+*/
+
+/*
+@@ LUA_COMPAT_5_2 controls other macros for compatibility with Lua 5.2.
+@@ LUA_COMPAT_5_1 controls other macros for compatibility with Lua 5.1.
+** You can define it to get all options, or change specific options
+** to fit your specific needs.
+*/
+#if defined(LUA_COMPAT_5_2)	/* { */
+
+/*
+@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
+** functions in the mathematical library.
+*/
+#define LUA_COMPAT_MATHLIB
+
+/*
+@@ LUA_COMPAT_BITLIB controls the presence of library 'bit32'.
+*/
+#define LUA_COMPAT_BITLIB
+
+/*
+@@ LUA_COMPAT_IPAIRS controls the effectiveness of the __ipairs metamethod.
+*/
+#define LUA_COMPAT_IPAIRS
+
+/*
+@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
+** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
+** luaL_checkint, luaL_checklong, etc.)
+*/
+#define LUA_COMPAT_APIINTCASTS
+
+#endif				/* } */
+
+
+#if defined(LUA_COMPAT_5_1)	/* { */
+
+/* Incompatibilities from 5.2 -> 5.3 */
+#define LUA_COMPAT_MATHLIB
+#define LUA_COMPAT_APIINTCASTS
+
+/*
+@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
+** You can replace it with 'table.unpack'.
+*/
+#define LUA_COMPAT_UNPACK
+
+/*
+@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'.
+** You can replace it with 'package.searchers'.
+*/
+#define LUA_COMPAT_LOADERS
+
+/*
+@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall.
+** You can call your C function directly (with light C functions).
+*/
+#define lua_cpcall(L,f,u)  \
+	(lua_pushcfunction(L, (f)), \
+	 lua_pushlightuserdata(L,(u)), \
+	 lua_pcall(L,1,0,0))
+
+
+/*
+@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library.
+** You can rewrite 'log10(x)' as 'log(x, 10)'.
+*/
+#define LUA_COMPAT_LOG10
+
+/*
+@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base
+** library. You can rewrite 'loadstring(s)' as 'load(s)'.
+*/
+#define LUA_COMPAT_LOADSTRING
+
+/*
+@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library.
+*/
+#define LUA_COMPAT_MAXN
+
+/*
+@@ The following macros supply trivial compatibility for some
+** changes in the API. The macros themselves document how to
+** change your code to avoid using them.
+*/
+#define lua_strlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_objlen(L,i)		lua_rawlen(L, (i))
+
+#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
+#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
+
+/*
+@@ LUA_COMPAT_MODULE controls compatibility with previous
+** module functions 'module' (Lua) and 'luaL_register' (C).
+*/
+#define LUA_COMPAT_MODULE
+
+#endif				/* } */
+
+
+/*
+@@ LUA_COMPAT_FLOATSTRING makes Lua format integral floats without a
+@@ a float mark ('.0').
+** This macro is not on by default even in compatibility mode,
+** because this is not really an incompatibility.
+*/
+/* #define LUA_COMPAT_FLOATSTRING */
+
+/* }================================================================== */
+
+
+
+/*
+** {==================================================================
+** Configuration for Numbers.
+** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
+** satisfy your needs.
+** ===================================================================
+*/
+
+/*
+@@ LUA_NUMBER is the floating-point type used by Lua.
+@@ LUAI_UACNUMBER is the result of a 'default argument promotion'
+@@ over a floating number.
+@@ l_mathlim(x) corrects limit name 'x' to the proper float type
+** by prefixing it with one of FLT/DBL/LDBL.
+@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
+@@ LUA_NUMBER_FMT is the format for writing floats.
+@@ lua_number2str converts a float to a string.
+@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
+@@ l_floor takes the floor of a float.
+@@ lua_str2number converts a decimal numeric string to a number.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define l_floor(x)		(l_mathop(floor)(x))
+
+#define lua_number2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_NUMBER_FMT, (LUAI_UACNUMBER)(n))
+
+/*
+@@ lua_numbertointeger converts a float number to an integer, or
+** returns 0 if float is not within the range of a lua_Integer.
+** (The range comparisons are tricky because of rounding. The tests
+** here assume a two-complement representation, where MININTEGER always
+** has an exact representation as a float; MAXINTEGER may not have one,
+** and therefore its conversion to float may have an ill-defined value.)
+*/
+#define lua_numbertointeger(n,p) \
+  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
+   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
+      (*(p) = (LUA_INTEGER)(n), 1))
+
+
+/* now the variable definitions */
+
+#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
+
+#define LUA_NUMBER	float
+
+#define l_mathlim(n)		(FLT_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.7g"
+
+#define l_mathop(op)		op##f
+
+#define lua_str2number(s,p)	strtof((s), (p))
+
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
+
+#define LUA_NUMBER	long double
+
+#define l_mathlim(n)		(LDBL_##n)
+
+#define LUAI_UACNUMBER	long double
+
+#define LUA_NUMBER_FRMLEN	"L"
+#define LUA_NUMBER_FMT		"%.19Lg"
+
+#define l_mathop(op)		op##l
+
+#define lua_str2number(s,p)	strtold((s), (p))
+
+#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
+
+#define LUA_NUMBER	double
+
+#define l_mathlim(n)		(DBL_##n)
+
+#define LUAI_UACNUMBER	double
+
+#define LUA_NUMBER_FRMLEN	""
+#define LUA_NUMBER_FMT		"%.14g"
+
+#define l_mathop(op)		op
+
+#define lua_str2number(s,p)	strtod((s), (p))
+
+#else						/* }{ */
+
+#error "numeric float type not defined"
+
+#endif					/* } */
+
+
+
+/*
+@@ LUA_INTEGER is the integer type used by Lua.
+**
+@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
+**
+@@ LUAI_UACINT is the result of a 'default argument promotion'
+@@ over a lUA_INTEGER.
+@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
+@@ LUA_INTEGER_FMT is the format for writing integers.
+@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
+@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
+@@ lua_integer2str converts an integer to a string.
+*/
+
+
+/* The following definitions are good for most cases here */
+
+#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
+
+#define LUAI_UACINT		LUA_INTEGER
+
+#define lua_integer2str(s,sz,n)  \
+	l_sprintf((s), sz, LUA_INTEGER_FMT, (LUAI_UACINT)(n))
+
+/*
+** use LUAI_UACINT here to avoid problems with promotions (which
+** can turn a comparison between unsigneds into a signed comparison)
+*/
+#define LUA_UNSIGNED		unsigned LUAI_UACINT
+
+
+/* now the variable definitions */
+
+#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
+
+#define LUA_INTEGER		int
+#define LUA_INTEGER_FRMLEN	""
+
+#define LUA_MAXINTEGER		INT_MAX
+#define LUA_MININTEGER		INT_MIN
+
+#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
+
+#define LUA_INTEGER		long
+#define LUA_INTEGER_FRMLEN	"l"
+
+#define LUA_MAXINTEGER		LONG_MAX
+#define LUA_MININTEGER		LONG_MIN
+
+#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
+
+/* use presence of macro LLONG_MAX as proxy for C99 compliance */
+#if defined(LLONG_MAX)		/* { */
+/* use ISO C99 stuff */
+
+#define LUA_INTEGER		long long
+#define LUA_INTEGER_FRMLEN	"ll"
+
+#define LUA_MAXINTEGER		LLONG_MAX
+#define LUA_MININTEGER		LLONG_MIN
+
+#elif defined(LUA_USE_WINDOWS) /* }{ */
+/* in Windows, can use specific Windows types */
+
+#define LUA_INTEGER		__int64
+#define LUA_INTEGER_FRMLEN	"I64"
+
+#define LUA_MAXINTEGER		_I64_MAX
+#define LUA_MININTEGER		_I64_MIN
+
+#else				/* }{ */
+
+#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
+  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
+
+#endif				/* } */
+
+#else				/* }{ */
+
+#error "numeric integer type not defined"
+
+#endif				/* } */
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Dependencies with C99 and other C details
+** ===================================================================
+*/
+
+/*
+@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
+** (All uses in Lua have only one format item.)
+*/
+#if !defined(LUA_USE_C89)
+#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
+#else
+#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
+#endif
+
+
+/*
+@@ lua_strx2number converts an hexadecimal numeric string to a number.
+** In C99, 'strtod' does that conversion. Otherwise, you can
+** leave 'lua_strx2number' undefined and Lua will provide its own
+** implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_strx2number(s,p)		lua_str2number(s,p)
+#endif
+
+
+/*
+@@ lua_number2strx converts a float to an hexadecimal numeric string.
+** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
+** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
+** provide its own implementation.
+*/
+#if !defined(LUA_USE_C89)
+#define lua_number2strx(L,b,sz,f,n)  \
+	((void)L, l_sprintf(b,sz,f,(LUAI_UACNUMBER)(n)))
+#endif
+
+
+/*
+** 'strtof' and 'opf' variants for math functions are not valid in
+** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
+** availability of these variants. ('math.h' is already included in
+** all files that use these macros.)
+*/
+#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
+#undef l_mathop  /* variants not available */
+#undef lua_str2number
+#define l_mathop(op)		(lua_Number)op  /* no variant */
+#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
+#endif
+
+
+/*
+@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
+** functions.  It must be a numerical type; Lua will use 'intptr_t' if
+** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
+** 'intptr_t' in C89)
+*/
+#define LUA_KCONTEXT	ptrdiff_t
+
+#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
+    __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
+#undef LUA_KCONTEXT
+#define LUA_KCONTEXT	intptr_t
+#endif
+#endif
+
+
+/*
+@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
+** Change that if you do not want to use C locales. (Code using this
+** macro must include header 'locale.h'.)
+*/
+#if !defined(lua_getlocaledecpoint)
+#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Language Variations
+** =====================================================================
+*/
+
+/*
+@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
+** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
+** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
+** coercion from strings to numbers.
+*/
+/* #define LUA_NOCVTN2S */
+/* #define LUA_NOCVTS2N */
+
+
+/*
+@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
+** Define it as a help when debugging C code.
+*/
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(l,e)	assert(e)
+#endif
+
+/* }================================================================== */
+
+
+/*
+** {==================================================================
+** Macros that affect the API and must be stable (that is, must be the
+** same when you compile Lua and when you compile code that links to
+** Lua). You probably do not want/need to change them.
+** =====================================================================
+*/
+
+/*
+@@ LUAI_MAXSTACK limits the size of the Lua stack.
+** CHANGE it if you need a different limit. This limit is arbitrary;
+** its only purpose is to stop Lua from consuming unlimited stack
+** space (and to reserve some numbers for pseudo-indices).
+*/
+#if LUAI_BITSINT >= 32
+#define LUAI_MAXSTACK		1000000
+#else
+#define LUAI_MAXSTACK		15000
+#endif
+
+
+/*
+@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
+** a Lua state with very fast access.
+** CHANGE it if you need a different size.
+*/
+#define LUA_EXTRASPACE		(sizeof(void *))
+
+
+/*
+@@ LUA_IDSIZE gives the maximum size for the description of the source
+@@ of a function in debug information.
+** CHANGE it if you want a different size.
+*/
+#define LUA_IDSIZE	60
+
+
+/*
+@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
+** CHANGE it if it uses too much C-stack space. (For long double,
+** 'string.format("%.99f", -1e4932)' needs 5034 bytes, so a
+** smaller buffer would force a memory allocation for each call to
+** 'string.format'.)
+*/
+#if LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE
+#define LUAL_BUFFERSIZE		8192
+#else
+#define LUAL_BUFFERSIZE   ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer)))
+#endif
+
+/* }================================================================== */
+
+
+/*
+@@ LUA_QL describes how error messages quote program elements.
+** Lua does not use these macros anymore; they are here for
+** compatibility only.
+*/
+#define LUA_QL(x)	"'" x "'"
+#define LUA_QS		LUA_QL("%s")
+
+
+
+
+/* =================================================================== */
+
+/*
+** Local configuration. You can use this space to add your redefinitions
+** without modifying the main part of the file.
+*/
+
+#ifdef _MSC_VER
+/* Uninteresting "possible loss of data" and "cast truncates constant value" warnings */
+#pragma warning(disable: 4244 4310)
+#endif
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wcomma"
+#pragma clang diagnostic ignored "-Wstring-plus-int"
+#endif
+
+#endif
+
diff --git a/scite-app/scite/lua/src/lualib.h b/scite-app/scite/lua/src/lualib.h
new file mode 100644
index 0000000..6c0bc4c
--- /dev/null
+++ b/scite-app/scite/lua/src/lualib.h
@@ -0,0 +1,61 @@
+/*
+** $Id: lualib.h,v 1.45 2017/01/12 17:14:26 roberto Exp $
+** Lua standard libraries
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lualib_h
+#define lualib_h
+
+#include "lua.h"
+
+
+/* version suffix for environment variable names */
+#define LUA_VERSUFFIX          "_" LUA_VERSION_MAJOR "_" LUA_VERSION_MINOR
+
+
+LUAMOD_API int (luaopen_base) (lua_State *L);
+
+#define LUA_COLIBNAME	"coroutine"
+LUAMOD_API int (luaopen_coroutine) (lua_State *L);
+
+#define LUA_TABLIBNAME	"table"
+LUAMOD_API int (luaopen_table) (lua_State *L);
+
+#define LUA_IOLIBNAME	"io"
+LUAMOD_API int (luaopen_io) (lua_State *L);
+
+#define LUA_OSLIBNAME	"os"
+LUAMOD_API int (luaopen_os) (lua_State *L);
+
+#define LUA_STRLIBNAME	"string"
+LUAMOD_API int (luaopen_string) (lua_State *L);
+
+#define LUA_UTF8LIBNAME	"utf8"
+LUAMOD_API int (luaopen_utf8) (lua_State *L);
+
+#define LUA_BITLIBNAME	"bit32"
+LUAMOD_API int (luaopen_bit32) (lua_State *L);
+
+#define LUA_MATHLIBNAME	"math"
+LUAMOD_API int (luaopen_math) (lua_State *L);
+
+#define LUA_DBLIBNAME	"debug"
+LUAMOD_API int (luaopen_debug) (lua_State *L);
+
+#define LUA_LOADLIBNAME	"package"
+LUAMOD_API int (luaopen_package) (lua_State *L);
+
+
+/* open all previous libraries */
+LUALIB_API void (luaL_openlibs) (lua_State *L);
+
+
+
+#if !defined(lua_assert)
+#define lua_assert(x)	((void)0)
+#endif
+
+
+#endif
diff --git a/scite-app/scite/lua/src/lundump.c b/scite-app/scite/lua/src/lundump.c
new file mode 100644
index 0000000..4080af9
--- /dev/null
+++ b/scite-app/scite/lua/src/lundump.c
@@ -0,0 +1,279 @@
+/*
+** $Id: lundump.c,v 2.44 2015/11/02 16:09:30 roberto Exp $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#define lundump_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstring.h"
+#include "lundump.h"
+#include "lzio.h"
+
+
+#if !defined(luai_verifycode)
+#define luai_verifycode(L,b,f)  /* empty */
+#endif
+
+
+typedef struct {
+  lua_State *L;
+  ZIO *Z;
+  const char *name;
+} LoadState;
+
+
+static l_noret error(LoadState *S, const char *why) {
+  luaO_pushfstring(S->L, "%s: %s precompiled chunk", S->name, why);
+  luaD_throw(S->L, LUA_ERRSYNTAX);
+}
+
+
+/*
+** All high-level loads go through LoadVector; you can change it to
+** adapt to the endianness of the input
+*/
+#define LoadVector(S,b,n)	LoadBlock(S,b,(n)*sizeof((b)[0]))
+
+static void LoadBlock (LoadState *S, void *b, size_t size) {
+  if (luaZ_read(S->Z, b, size) != 0)
+    error(S, "truncated");
+}
+
+
+#define LoadVar(S,x)		LoadVector(S,&x,1)
+
+
+static lu_byte LoadByte (LoadState *S) {
+  lu_byte x;
+  LoadVar(S, x);
+  return x;
+}
+
+
+static int LoadInt (LoadState *S) {
+  int x;
+  LoadVar(S, x);
+  return x;
+}
+
+
+static lua_Number LoadNumber (LoadState *S) {
+  lua_Number x;
+  LoadVar(S, x);
+  return x;
+}
+
+
+static lua_Integer LoadInteger (LoadState *S) {
+  lua_Integer x;
+  LoadVar(S, x);
+  return x;
+}
+
+
+static TString *LoadString (LoadState *S) {
+  size_t size = LoadByte(S);
+  if (size == 0xFF)
+    LoadVar(S, size);
+  if (size == 0)
+    return NULL;
+  else if (--size <= LUAI_MAXSHORTLEN) {  /* short string? */
+    char buff[LUAI_MAXSHORTLEN];
+    LoadVector(S, buff, size);
+    return luaS_newlstr(S->L, buff, size);
+  }
+  else {  /* long string */
+    TString *ts = luaS_createlngstrobj(S->L, size);
+    LoadVector(S, getstr(ts), size);  /* load directly in final place */
+    return ts;
+  }
+}
+
+
+static void LoadCode (LoadState *S, Proto *f) {
+  int n = LoadInt(S);
+  f->code = luaM_newvector(S->L, n, Instruction);
+  f->sizecode = n;
+  LoadVector(S, f->code, n);
+}
+
+
+static void LoadFunction(LoadState *S, Proto *f, TString *psource);
+
+
+static void LoadConstants (LoadState *S, Proto *f) {
+  int i;
+  int n = LoadInt(S);
+  f->k = luaM_newvector(S->L, n, TValue);
+  f->sizek = n;
+  for (i = 0; i < n; i++)
+    setnilvalue(&f->k[i]);
+  for (i = 0; i < n; i++) {
+    TValue *o = &f->k[i];
+    int t = LoadByte(S);
+    switch (t) {
+    case LUA_TNIL:
+      setnilvalue(o);
+      break;
+    case LUA_TBOOLEAN:
+      setbvalue(o, LoadByte(S));
+      break;
+    case LUA_TNUMFLT:
+      setfltvalue(o, LoadNumber(S));
+      break;
+    case LUA_TNUMINT:
+      setivalue(o, LoadInteger(S));
+      break;
+    case LUA_TSHRSTR:
+    case LUA_TLNGSTR:
+      setsvalue2n(S->L, o, LoadString(S));
+      break;
+    default:
+      lua_assert(0);
+    }
+  }
+}
+
+
+static void LoadProtos (LoadState *S, Proto *f) {
+  int i;
+  int n = LoadInt(S);
+  f->p = luaM_newvector(S->L, n, Proto *);
+  f->sizep = n;
+  for (i = 0; i < n; i++)
+    f->p[i] = NULL;
+  for (i = 0; i < n; i++) {
+    f->p[i] = luaF_newproto(S->L);
+    LoadFunction(S, f->p[i], f->source);
+  }
+}
+
+
+static void LoadUpvalues (LoadState *S, Proto *f) {
+  int i, n;
+  n = LoadInt(S);
+  f->upvalues = luaM_newvector(S->L, n, Upvaldesc);
+  f->sizeupvalues = n;
+  for (i = 0; i < n; i++)
+    f->upvalues[i].name = NULL;
+  for (i = 0; i < n; i++) {
+    f->upvalues[i].instack = LoadByte(S);
+    f->upvalues[i].idx = LoadByte(S);
+  }
+}
+
+
+static void LoadDebug (LoadState *S, Proto *f) {
+  int i, n;
+  n = LoadInt(S);
+  f->lineinfo = luaM_newvector(S->L, n, int);
+  f->sizelineinfo = n;
+  LoadVector(S, f->lineinfo, n);
+  n = LoadInt(S);
+  f->locvars = luaM_newvector(S->L, n, LocVar);
+  f->sizelocvars = n;
+  for (i = 0; i < n; i++)
+    f->locvars[i].varname = NULL;
+  for (i = 0; i < n; i++) {
+    f->locvars[i].varname = LoadString(S);
+    f->locvars[i].startpc = LoadInt(S);
+    f->locvars[i].endpc = LoadInt(S);
+  }
+  n = LoadInt(S);
+  for (i = 0; i < n; i++)
+    f->upvalues[i].name = LoadString(S);
+}
+
+
+static void LoadFunction (LoadState *S, Proto *f, TString *psource) {
+  f->source = LoadString(S);
+  if (f->source == NULL)  /* no source in dump? */
+    f->source = psource;  /* reuse parent's source */
+  f->linedefined = LoadInt(S);
+  f->lastlinedefined = LoadInt(S);
+  f->numparams = LoadByte(S);
+  f->is_vararg = LoadByte(S);
+  f->maxstacksize = LoadByte(S);
+  LoadCode(S, f);
+  LoadConstants(S, f);
+  LoadUpvalues(S, f);
+  LoadProtos(S, f);
+  LoadDebug(S, f);
+}
+
+
+static void checkliteral (LoadState *S, const char *s, const char *msg) {
+  char buff[sizeof(LUA_SIGNATURE) + sizeof(LUAC_DATA)]; /* larger than both */
+  size_t len = strlen(s);
+  LoadVector(S, buff, len);
+  if (memcmp(s, buff, len) != 0)
+    error(S, msg);
+}
+
+
+static void fchecksize (LoadState *S, size_t size, const char *tname) {
+  if (LoadByte(S) != size)
+    error(S, luaO_pushfstring(S->L, "%s size mismatch in", tname));
+}
+
+
+#define checksize(S,t)	fchecksize(S,sizeof(t),#t)
+
+static void checkHeader (LoadState *S) {
+  checkliteral(S, LUA_SIGNATURE + 1, "not a");  /* 1st char already checked */
+  if (LoadByte(S) != LUAC_VERSION)
+    error(S, "version mismatch in");
+  if (LoadByte(S) != LUAC_FORMAT)
+    error(S, "format mismatch in");
+  checkliteral(S, LUAC_DATA, "corrupted");
+  checksize(S, int);
+  checksize(S, size_t);
+  checksize(S, Instruction);
+  checksize(S, lua_Integer);
+  checksize(S, lua_Number);
+  if (LoadInteger(S) != LUAC_INT)
+    error(S, "endianness mismatch in");
+  if (LoadNumber(S) != LUAC_NUM)
+    error(S, "float format mismatch in");
+}
+
+
+/*
+** load precompiled chunk
+*/
+LClosure *luaU_undump(lua_State *L, ZIO *Z, const char *name) {
+  LoadState S;
+  LClosure *cl;
+  if (*name == '@' || *name == '=')
+    S.name = name + 1;
+  else if (*name == LUA_SIGNATURE[0])
+    S.name = "binary string";
+  else
+    S.name = name;
+  S.L = L;
+  S.Z = Z;
+  checkHeader(&S);
+  cl = luaF_newLclosure(L, LoadByte(&S));
+  setclLvalue(L, L->top, cl);
+  luaD_inctop(L);
+  cl->p = luaF_newproto(L);
+  LoadFunction(&S, cl->p, NULL);
+  lua_assert(cl->nupvalues == cl->p->sizeupvalues);
+  luai_verifycode(L, buff, cl->p);
+  return cl;
+}
+
diff --git a/scite-app/scite/lua/src/lundump.h b/scite-app/scite/lua/src/lundump.h
new file mode 100644
index 0000000..aa5cc82
--- /dev/null
+++ b/scite-app/scite/lua/src/lundump.h
@@ -0,0 +1,32 @@
+/*
+** $Id: lundump.h,v 1.45 2015/09/08 15:41:05 roberto Exp $
+** load precompiled Lua chunks
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lundump_h
+#define lundump_h
+
+#include "llimits.h"
+#include "lobject.h"
+#include "lzio.h"
+
+
+/* data to catch conversion errors */
+#define LUAC_DATA	"\x19\x93\r\n\x1a\n"
+
+#define LUAC_INT	0x5678
+#define LUAC_NUM	cast_num(370.5)
+
+#define MYINT(s)	(s[0]-'0')
+#define LUAC_VERSION	(MYINT(LUA_VERSION_MAJOR)*16+MYINT(LUA_VERSION_MINOR))
+#define LUAC_FORMAT	0	/* this is the official format */
+
+/* load one chunk; from lundump.c */
+LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
+
+/* dump one chunk; from ldump.c */
+LUAI_FUNC int luaU_dump (lua_State* L, const Proto* f, lua_Writer w,
+                         void* data, int strip);
+
+#endif
diff --git a/scite-app/scite/lua/src/lutf8lib.c b/scite-app/scite/lua/src/lutf8lib.c
new file mode 100644
index 0000000..de9e3dc
--- /dev/null
+++ b/scite-app/scite/lua/src/lutf8lib.c
@@ -0,0 +1,256 @@
+/*
+** $Id: lutf8lib.c,v 1.16 2016/12/22 13:08:50 roberto Exp $
+** Standard library for UTF-8 manipulation
+** See Copyright Notice in lua.h
+*/
+
+#define lutf8lib_c
+#define LUA_LIB
+
+#include "lprefix.h"
+
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "lauxlib.h"
+#include "lualib.h"
+
+#define MAXUNICODE	0x10FFFF
+
+#define iscont(p)	((*(p) & 0xC0) == 0x80)
+
+
+/* from strlib */
+/* translate a relative string position: negative means back from end */
+static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
+  if (pos >= 0) return pos;
+  else if (0u - (size_t)pos > len) return 0;
+  else return (lua_Integer)len + pos + 1;
+}
+
+
+/*
+** Decode one UTF-8 sequence, returning NULL if byte sequence is invalid.
+*/
+static const char *utf8_decode (const char *o, int *val) {
+  static const unsigned int limits[] = {0xFF, 0x7F, 0x7FF, 0xFFFF};
+  const unsigned char *s = (const unsigned char *)o;
+  unsigned int c = s[0];
+  unsigned int res = 0;  /* final result */
+  if (c < 0x80)  /* ascii? */
+    res = c;
+  else {
+    int count = 0;  /* to count number of continuation bytes */
+    while (c & 0x40) {  /* still have continuation bytes? */
+      int cc = s[++count];  /* read next byte */
+      if ((cc & 0xC0) != 0x80)  /* not a continuation byte? */
+        return NULL;  /* invalid byte sequence */
+      res = (res << 6) | (cc & 0x3F);  /* add lower 6 bits from cont. byte */
+      c <<= 1;  /* to test next bit */
+    }
+    res |= ((c & 0x7F) << (count * 5));  /* add first byte */
+    if (count > 3 || res > MAXUNICODE || res <= limits[count])
+      return NULL;  /* invalid byte sequence */
+    s += count;  /* skip continuation bytes read */
+  }
+  if (val) *val = res;
+  return (const char *)s + 1;  /* +1 to include first byte */
+}
+
+
+/*
+** utf8len(s [, i [, j]]) --> number of characters that start in the
+** range [i,j], or nil + current position if 's' is not well formed in
+** that interval
+*/
+static int utflen (lua_State *L) {
+  int n = 0;
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer posj = u_posrelat(luaL_optinteger(L, 3, -1), len);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 2,
+                   "initial position out of string");
+  luaL_argcheck(L, --posj < (lua_Integer)len, 3,
+                   "final position out of string");
+  while (posi <= posj) {
+    const char *s1 = utf8_decode(s + posi, NULL);
+    if (s1 == NULL) {  /* conversion error? */
+      lua_pushnil(L);  /* return nil ... */
+      lua_pushinteger(L, posi + 1);  /* ... and current position */
+      return 2;
+    }
+    posi = s1 - s;
+    n++;
+  }
+  lua_pushinteger(L, n);
+  return 1;
+}
+
+
+/*
+** codepoint(s, [i, [j]])  -> returns codepoints for all characters
+** that start in the range [i,j]
+*/
+static int codepoint (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer posi = u_posrelat(luaL_optinteger(L, 2, 1), len);
+  lua_Integer pose = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  int n;
+  const char *se;
+  luaL_argcheck(L, posi >= 1, 2, "out of range");
+  luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of range");
+  if (posi > pose) return 0;  /* empty interval; return no values */
+  if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
+    return luaL_error(L, "string slice too long");
+  n = (int)(pose -  posi) + 1;
+  luaL_checkstack(L, n, "string slice too long");
+  n = 0;
+  se = s + pose;
+  for (s += posi - 1; s < se;) {
+    int code;
+    s = utf8_decode(s, &code);
+    if (s == NULL)
+      return luaL_error(L, "invalid UTF-8 code");
+    lua_pushinteger(L, code);
+    n++;
+  }
+  return n;
+}
+
+
+static void pushutfchar (lua_State *L, int arg) {
+  lua_Integer code = luaL_checkinteger(L, arg);
+  luaL_argcheck(L, 0 <= code && code <= MAXUNICODE, arg, "value out of range");
+  lua_pushfstring(L, "%U", (long)code);
+}
+
+
+/*
+** utfchar(n1, n2, ...)  -> char(n1)..char(n2)...
+*/
+static int utfchar (lua_State *L) {
+  int n = lua_gettop(L);  /* number of arguments */
+  if (n == 1)  /* optimize common case of single char */
+    pushutfchar(L, 1);
+  else {
+    int i;
+    luaL_Buffer b;
+    luaL_buffinit(L, &b);
+    for (i = 1; i <= n; i++) {
+      pushutfchar(L, i);
+      luaL_addvalue(&b);
+    }
+    luaL_pushresult(&b);
+  }
+  return 1;
+}
+
+
+/*
+** offset(s, n, [i])  -> index where n-th character counting from
+**   position 'i' starts; 0 means character at 'i'.
+*/
+static int byteoffset (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer n  = luaL_checkinteger(L, 2);
+  lua_Integer posi = (n >= 0) ? 1 : len + 1;
+  posi = u_posrelat(luaL_optinteger(L, 3, posi), len);
+  luaL_argcheck(L, 1 <= posi && --posi <= (lua_Integer)len, 3,
+                   "position out of range");
+  if (n == 0) {
+    /* find beginning of current byte sequence */
+    while (posi > 0 && iscont(s + posi)) posi--;
+  }
+  else {
+    if (iscont(s + posi))
+      luaL_error(L, "initial position is a continuation byte");
+    if (n < 0) {
+       while (n < 0 && posi > 0) {  /* move back */
+         do {  /* find beginning of previous character */
+           posi--;
+         } while (posi > 0 && iscont(s + posi));
+         n++;
+       }
+     }
+     else {
+       n--;  /* do not move for 1st character */
+       while (n > 0 && posi < (lua_Integer)len) {
+         do {  /* find beginning of next character */
+           posi++;
+         } while (iscont(s + posi));  /* (cannot pass final '\0') */
+         n--;
+       }
+     }
+  }
+  if (n == 0)  /* did it find given character? */
+    lua_pushinteger(L, posi + 1);
+  else  /* no such character */
+    lua_pushnil(L);
+  return 1;
+}
+
+
+static int iter_aux (lua_State *L) {
+  size_t len;
+  const char *s = luaL_checklstring(L, 1, &len);
+  lua_Integer n = lua_tointeger(L, 2) - 1;
+  if (n < 0)  /* first iteration? */
+    n = 0;  /* start from here */
+  else if (n < (lua_Integer)len) {
+    n++;  /* skip current byte */
+    while (iscont(s + n)) n++;  /* and its continuations */
+  }
+  if (n >= (lua_Integer)len)
+    return 0;  /* no more codepoints */
+  else {
+    int code;
+    const char *next = utf8_decode(s + n, &code);
+    if (next == NULL || iscont(next))
+      return luaL_error(L, "invalid UTF-8 code");
+    lua_pushinteger(L, n + 1);
+    lua_pushinteger(L, code);
+    return 2;
+  }
+}
+
+
+static int iter_codes (lua_State *L) {
+  luaL_checkstring(L, 1);
+  lua_pushcfunction(L, iter_aux);
+  lua_pushvalue(L, 1);
+  lua_pushinteger(L, 0);
+  return 3;
+}
+
+
+/* pattern to match a single UTF-8 character */
+#define UTF8PATT	"[\0-\x7F\xC2-\xF4][\x80-\xBF]*"
+
+
+static const luaL_Reg funcs[] = {
+  {"offset", byteoffset},
+  {"codepoint", codepoint},
+  {"char", utfchar},
+  {"len", utflen},
+  {"codes", iter_codes},
+  /* placeholders */
+  {"charpattern", NULL},
+  {NULL, NULL}
+};
+
+
+LUAMOD_API int luaopen_utf8 (lua_State *L) {
+  luaL_newlib(L, funcs);
+  lua_pushlstring(L, UTF8PATT, sizeof(UTF8PATT)/sizeof(char) - 1);
+  lua_setfield(L, -2, "charpattern");
+  return 1;
+}
+
diff --git a/scite-app/scite/lua/src/lvm.c b/scite-app/scite/lua/src/lvm.c
new file mode 100644
index 0000000..84ade6b
--- /dev/null
+++ b/scite-app/scite/lua/src/lvm.c
@@ -0,0 +1,1322 @@
+/*
+** $Id: lvm.c,v 2.268 2016/02/05 19:59:14 roberto Exp $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#define lvm_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+#include <float.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lobject.h"
+#include "lopcodes.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lvm.h"
+
+
+/* limit for table tag-method chains (to avoid loops) */
+#define MAXTAGLOOP	2000
+
+
+
+/*
+** 'l_intfitsf' checks whether a given integer can be converted to a
+** float without rounding. Used in comparisons. Left undefined if
+** all integers fit in a float precisely.
+*/
+#if !defined(l_intfitsf)
+
+/* number of bits in the mantissa of a float */
+#define NBM		(l_mathlim(MANT_DIG))
+
+/*
+** Check whether some integers may not fit in a float, that is, whether
+** (maxinteger >> NBM) > 0 (that implies (1 << NBM) <= maxinteger).
+** (The shifts are done in parts to avoid shifting by more than the size
+** of an integer. In a worst case, NBM == 113 for long double and
+** sizeof(integer) == 32.)
+*/
+#if ((((LUA_MAXINTEGER >> (NBM / 4)) >> (NBM / 4)) >> (NBM / 4)) \
+	>> (NBM - (3 * (NBM / 4))))  >  0
+
+#define l_intfitsf(i)  \
+  (-((lua_Integer)1 << NBM) <= (i) && (i) <= ((lua_Integer)1 << NBM))
+
+#endif
+
+#endif
+
+
+
+/*
+** Try to convert a value to a float. The float case is already handled
+** by the macro 'tonumber'.
+*/
+int luaV_tonumber_ (const TValue *obj, lua_Number *n) {
+  TValue v;
+  if (ttisinteger(obj)) {
+    *n = cast_num(ivalue(obj));
+    return 1;
+  }
+  else if (cvt2num(obj) &&  /* string convertible to number? */
+            luaO_str2num(svalue(obj), &v) == vslen(obj) + 1) {
+    *n = nvalue(&v);  /* convert result of 'luaO_str2num' to a float */
+    return 1;
+  }
+  else
+    return 0;  /* conversion failed */
+}
+
+
+/*
+** try to convert a value to an integer, rounding according to 'mode':
+** mode == 0: accepts only integral values
+** mode == 1: takes the floor of the number
+** mode == 2: takes the ceil of the number
+*/
+int luaV_tointeger (const TValue *obj, lua_Integer *p, int mode) {
+  TValue v;
+ again:
+  if (ttisfloat(obj)) {
+    lua_Number n = fltvalue(obj);
+    lua_Number f = l_floor(n);
+    if (n != f) {  /* not an integral value? */
+      if (mode == 0) return 0;  /* fails if mode demands integral value */
+      else if (mode > 1)  /* needs ceil? */
+        f += 1;  /* convert floor to ceil (remember: n != f) */
+    }
+    return lua_numbertointeger(f, p);
+  }
+  else if (ttisinteger(obj)) {
+    *p = ivalue(obj);
+    return 1;
+  }
+  else if (cvt2num(obj) &&
+            luaO_str2num(svalue(obj), &v) == vslen(obj) + 1) {
+    obj = &v;
+    goto again;  /* convert result from 'luaO_str2num' to an integer */
+  }
+  return 0;  /* conversion failed */
+}
+
+
+/*
+** Try to convert a 'for' limit to an integer, preserving the
+** semantics of the loop.
+** (The following explanation assumes a non-negative step; it is valid
+** for negative steps mutatis mutandis.)
+** If the limit can be converted to an integer, rounding down, that is
+** it.
+** Otherwise, check whether the limit can be converted to a number.  If
+** the number is too large, it is OK to set the limit as LUA_MAXINTEGER,
+** which means no limit.  If the number is too negative, the loop
+** should not run, because any initial integer value is larger than the
+** limit. So, it sets the limit to LUA_MININTEGER. 'stopnow' corrects
+** the extreme case when the initial value is LUA_MININTEGER, in which
+** case the LUA_MININTEGER limit would still run the loop once.
+*/
+static int forlimit (const TValue *obj, lua_Integer *p, lua_Integer step,
+                     int *stopnow) {
+  *stopnow = 0;  /* usually, let loops run */
+  if (!luaV_tointeger(obj, p, (step < 0 ? 2 : 1))) {  /* not fit in integer? */
+    lua_Number n;  /* try to convert to float */
+    if (!tonumber(obj, &n)) /* cannot convert to float? */
+      return 0;  /* not a number */
+    if (luai_numlt(0, n)) {  /* if true, float is larger than max integer */
+      *p = LUA_MAXINTEGER;
+      if (step < 0) *stopnow = 1;
+    }
+    else {  /* float is smaller than min integer */
+      *p = LUA_MININTEGER;
+      if (step >= 0) *stopnow = 1;
+    }
+  }
+  return 1;
+}
+
+
+/*
+** Finish the table access 'val = t[key]'.
+** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
+** t[k] entry (which must be nil).
+*/
+void luaV_finishget (lua_State *L, const TValue *t, TValue *key, StkId val,
+                      const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  const TValue *tm;  /* metamethod */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    if (slot == NULL) {  /* 't' is not a table? */
+      lua_assert(!ttistable(t));
+      tm = luaT_gettmbyobj(L, t, TM_INDEX);
+      if (ttisnil(tm))
+        luaG_typeerror(L, t, "index");  /* no metamethod */
+      /* else will try the metamethod */
+    }
+    else {  /* 't' is a table */
+      lua_assert(ttisnil(slot));
+      tm = fasttm(L, hvalue(t)->metatable, TM_INDEX);  /* table's metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        setnilvalue(val);  /* result is nil */
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    if (ttisfunction(tm)) {  /* is metamethod a function? */
+      luaT_callTM(L, tm, t, key, val, 1);  /* call it */
+      return;
+    }
+    t = tm;  /* else try to access 'tm[key]' */
+    if (luaV_fastget(L,t,key,slot,luaH_get)) {  /* fast track? */
+      setobj2s(L, val, slot);  /* done */
+      return;
+    }
+    /* else repeat (tail call 'luaV_finishget') */
+  }
+  luaG_runerror(L, "'__index' chain too long; possible loop");
+}
+
+
+/*
+** Finish a table assignment 't[key] = val'.
+** If 'slot' is NULL, 't' is not a table.  Otherwise, 'slot' points
+** to the entry 't[key]', or to 'luaO_nilobject' if there is no such
+** entry.  (The value at 'slot' must be nil, otherwise 'luaV_fastset'
+** would have done the job.)
+*/
+void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                     StkId val, const TValue *slot) {
+  int loop;  /* counter to avoid infinite loops */
+  for (loop = 0; loop < MAXTAGLOOP; loop++) {
+    const TValue *tm;  /* '__newindex' metamethod */
+    if (slot != NULL) {  /* is 't' a table? */
+      Table *h = hvalue(t);  /* save 't' table */
+      lua_assert(ttisnil(slot));  /* old value must be nil */
+      tm = fasttm(L, h->metatable, TM_NEWINDEX);  /* get metamethod */
+      if (tm == NULL) {  /* no metamethod? */
+        if (slot == luaO_nilobject)  /* no previous entry? */
+          slot = luaH_newkey(L, h, key);  /* create one */
+        /* no metamethod and (now) there is an entry with given key */
+        setobj2t(L, cast(TValue *, slot), val);  /* set its new value */
+        invalidateTMcache(h);
+        luaC_barrierback(L, h, val);
+        return;
+      }
+      /* else will try the metamethod */
+    }
+    else {  /* not a table; check metamethod */
+      if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
+        luaG_typeerror(L, t, "index");
+    }
+    /* try the metamethod */
+    if (ttisfunction(tm)) {
+      luaT_callTM(L, tm, t, key, val, 0);
+      return;
+    }
+    t = tm;  /* else repeat assignment over 'tm' */
+    if (luaV_fastset(L, t, key, slot, luaH_get, val))
+      return;  /* done */
+    /* else loop */
+  }
+  luaG_runerror(L, "'__newindex' chain too long; possible loop");
+}
+
+
+/*
+** Compare two strings 'ls' x 'rs', returning an integer smaller-equal-
+** -larger than zero if 'ls' is smaller-equal-larger than 'rs'.
+** The code is a little tricky because it allows '\0' in the strings
+** and it uses 'strcoll' (to respect locales) for each segments
+** of the strings.
+*/
+static int l_strcmp (const TString *ls, const TString *rs) {
+  const char *l = getstr(ls);
+  size_t ll = tsslen(ls);
+  const char *r = getstr(rs);
+  size_t lr = tsslen(rs);
+  for (;;) {  /* for each segment */
+    int temp = strcoll(l, r);
+    if (temp != 0)  /* not equal? */
+      return temp;  /* done */
+    else {  /* strings are equal up to a '\0' */
+      size_t len = strlen(l);  /* index of first '\0' in both strings */
+      if (len == lr)  /* 'rs' is finished? */
+        return (len == ll) ? 0 : 1;  /* check 'ls' */
+      else if (len == ll)  /* 'ls' is finished? */
+        return -1;  /* 'ls' is smaller than 'rs' ('rs' is not finished) */
+      /* both strings longer than 'len'; go on comparing after the '\0' */
+      len++;
+      l += len; ll -= len; r += len; lr -= len;
+    }
+  }
+}
+
+
+/*
+** Check whether integer 'i' is less than float 'f'. If 'i' has an
+** exact representation as a float ('l_intfitsf'), compare numbers as
+** floats. Otherwise, if 'f' is outside the range for integers, result
+** is trivial. Otherwise, compare them as integers. (When 'i' has no
+** float representation, either 'f' is "far away" from 'i' or 'f' has
+** no precision left for a fractional part; either way, how 'f' is
+** truncated is irrelevant.) When 'f' is NaN, comparisons must result
+** in false.
+*/
+static int LTintfloat (lua_Integer i, lua_Number f) {
+#if defined(l_intfitsf)
+  if (!l_intfitsf(i)) {
+    if (f >= -cast_num(LUA_MININTEGER))  /* -minint == maxint + 1 */
+      return 1;  /* f >= maxint + 1 > i */
+    else if (f > cast_num(LUA_MININTEGER))  /* minint < f <= maxint ? */
+      return (i < cast(lua_Integer, f));  /* compare them as integers */
+    else  /* f <= minint <= i (or 'f' is NaN)  -->  not(i < f) */
+      return 0;
+  }
+#endif
+  return luai_numlt(cast_num(i), f);  /* compare them as floats */
+}
+
+
+/*
+** Check whether integer 'i' is less than or equal to float 'f'.
+** See comments on previous function.
+*/
+static int LEintfloat (lua_Integer i, lua_Number f) {
+#if defined(l_intfitsf)
+  if (!l_intfitsf(i)) {
+    if (f >= -cast_num(LUA_MININTEGER))  /* -minint == maxint + 1 */
+      return 1;  /* f >= maxint + 1 > i */
+    else if (f >= cast_num(LUA_MININTEGER))  /* minint <= f <= maxint ? */
+      return (i <= cast(lua_Integer, f));  /* compare them as integers */
+    else  /* f < minint <= i (or 'f' is NaN)  -->  not(i <= f) */
+      return 0;
+  }
+#endif
+  return luai_numle(cast_num(i), f);  /* compare them as floats */
+}
+
+
+/*
+** Return 'l < r', for numbers.
+*/
+static int LTnum (const TValue *l, const TValue *r) {
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li < ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LTintfloat(li, fltvalue(r));  /* l < r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numlt(lf, fltvalue(r));  /* both are float */
+    else if (luai_numisnan(lf))  /* 'r' is int and 'l' is float */
+      return 0;  /* NaN < i is always false */
+    else  /* without NaN, (l < r)  <-->  not(r <= l) */
+      return !LEintfloat(ivalue(r), lf);  /* not (r <= l) ? */
+  }
+}
+
+
+/*
+** Return 'l <= r', for numbers.
+*/
+static int LEnum (const TValue *l, const TValue *r) {
+  if (ttisinteger(l)) {
+    lua_Integer li = ivalue(l);
+    if (ttisinteger(r))
+      return li <= ivalue(r);  /* both are integers */
+    else  /* 'l' is int and 'r' is float */
+      return LEintfloat(li, fltvalue(r));  /* l <= r ? */
+  }
+  else {
+    lua_Number lf = fltvalue(l);  /* 'l' must be float */
+    if (ttisfloat(r))
+      return luai_numle(lf, fltvalue(r));  /* both are float */
+    else if (luai_numisnan(lf))  /* 'r' is int and 'l' is float */
+      return 0;  /*  NaN <= i is always false */
+    else  /* without NaN, (l <= r)  <-->  not(r < l) */
+      return !LTintfloat(ivalue(r), lf);  /* not (r < l) ? */
+  }
+}
+
+
+/*
+** Main operation less than; return 'l < r'.
+*/
+int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r) {
+  int res;
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LTnum(l, r);
+  else if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) < 0;
+  else if ((res = luaT_callorderTM(L, l, r, TM_LT)) < 0)  /* no metamethod? */
+    luaG_ordererror(L, l, r);  /* error */
+  return res;
+}
+
+
+/*
+** Main operation less than or equal to; return 'l <= r'. If it needs
+** a metamethod and there is no '__le', try '__lt', based on
+** l <= r iff !(r < l) (assuming a total order). If the metamethod
+** yields during this substitution, the continuation has to know
+** about it (to negate the result of r<l); bit CIST_LEQ in the call
+** status keeps that information.
+*/
+int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r) {
+  int res;
+  if (ttisnumber(l) && ttisnumber(r))  /* both operands are numbers? */
+    return LEnum(l, r);
+  else if (ttisstring(l) && ttisstring(r))  /* both are strings? */
+    return l_strcmp(tsvalue(l), tsvalue(r)) <= 0;
+  else if ((res = luaT_callorderTM(L, l, r, TM_LE)) >= 0)  /* try 'le' */
+    return res;
+  else {  /* try 'lt': */
+    L->ci->callstatus |= CIST_LEQ;  /* mark it is doing 'lt' for 'le' */
+    res = luaT_callorderTM(L, r, l, TM_LT);
+    L->ci->callstatus ^= CIST_LEQ;  /* clear mark */
+    if (res < 0)
+      luaG_ordererror(L, l, r);
+    return !res;  /* result is negated */
+  }
+}
+
+
+/*
+** Main operation for equality of Lua values; return 't1 == t2'.
+** L == NULL means raw equality (no metamethods)
+*/
+int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2) {
+  const TValue *tm;
+  if (ttype(t1) != ttype(t2)) {  /* not the same variant? */
+    if (ttnov(t1) != ttnov(t2) || ttnov(t1) != LUA_TNUMBER)
+      return 0;  /* only numbers can be equal with different variants */
+    else {  /* two numbers with different variants */
+      lua_Integer i1, i2;  /* compare them as integers */
+      return (tointeger(t1, &i1) && tointeger(t2, &i2) && i1 == i2);
+    }
+  }
+  /* values have same type and same variant */
+  switch (ttype(t1)) {
+    case LUA_TNIL: return 1;
+    case LUA_TNUMINT: return (ivalue(t1) == ivalue(t2));
+    case LUA_TNUMFLT: return luai_numeq(fltvalue(t1), fltvalue(t2));
+    case LUA_TBOOLEAN: return bvalue(t1) == bvalue(t2);  /* true must be 1 !! */
+    case LUA_TLIGHTUSERDATA: return pvalue(t1) == pvalue(t2);
+    case LUA_TLCF: return fvalue(t1) == fvalue(t2);
+    case LUA_TSHRSTR: return eqshrstr(tsvalue(t1), tsvalue(t2));
+    case LUA_TLNGSTR: return luaS_eqlngstr(tsvalue(t1), tsvalue(t2));
+    case LUA_TUSERDATA: {
+      if (uvalue(t1) == uvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, uvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, uvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    case LUA_TTABLE: {
+      if (hvalue(t1) == hvalue(t2)) return 1;
+      else if (L == NULL) return 0;
+      tm = fasttm(L, hvalue(t1)->metatable, TM_EQ);
+      if (tm == NULL)
+        tm = fasttm(L, hvalue(t2)->metatable, TM_EQ);
+      break;  /* will try TM */
+    }
+    default:
+      return gcvalue(t1) == gcvalue(t2);
+  }
+  if (tm == NULL)  /* no TM? */
+    return 0;  /* objects are different */
+  luaT_callTM(L, tm, t1, t2, L->top, 1);  /* call TM */
+  return !l_isfalse(L->top);
+}
+
+
+/* macro used by 'luaV_concat' to ensure that element at 'o' is a string */
+#define tostring(L,o)  \
+	(ttisstring(o) || (cvt2str(o) && (luaO_tostring(L, o), 1)))
+
+#define isemptystr(o)	(ttisshrstring(o) && tsvalue(o)->shrlen == 0)
+
+/* copy strings in stack from top - n up to top - 1 to buffer */
+static void copy2buff (StkId top, int n, char *buff) {
+  size_t tl = 0;  /* size already copied */
+  do {
+    size_t l = vslen(top - n);  /* length of string being copied */
+    memcpy(buff + tl, svalue(top - n), l * sizeof(char));
+    tl += l;
+  } while (--n > 0);
+}
+
+
+/*
+** Main operation for concatenation: concat 'total' values in the stack,
+** from 'L->top - total' up to 'L->top - 1'.
+*/
+void luaV_concat (lua_State *L, int total) {
+  lua_assert(total >= 2);
+  do {
+    StkId top = L->top;
+    int n = 2;  /* number of elements handled in this pass (at least 2) */
+    if (!(ttisstring(top-2) || cvt2str(top-2)) || !tostring(L, top-1))
+      luaT_trybinTM(L, top-2, top-1, top-2, TM_CONCAT);
+    else if (isemptystr(top - 1))  /* second operand is empty? */
+      cast_void(tostring(L, top - 2));  /* result is first operand */
+    else if (isemptystr(top - 2)) {  /* first operand is an empty string? */
+      setobjs2s(L, top - 2, top - 1);  /* result is second op. */
+    }
+    else {
+      /* at least two non-empty string values; get as many as possible */
+      size_t tl = vslen(top - 1);
+      TString *ts;
+      /* collect total length and number of strings */
+      for (n = 1; n < total && tostring(L, top - n - 1); n++) {
+        size_t l = vslen(top - n - 1);
+        if (l >= (MAX_SIZE/sizeof(char)) - tl)
+          luaG_runerror(L, "string length overflow");
+        tl += l;
+      }
+      if (tl <= LUAI_MAXSHORTLEN) {  /* is result a short string? */
+        char buff[LUAI_MAXSHORTLEN];
+        copy2buff(top, n, buff);  /* copy strings to buffer */
+        ts = luaS_newlstr(L, buff, tl);
+      }
+      else {  /* long string; copy strings directly to final result */
+        ts = luaS_createlngstrobj(L, tl);
+        copy2buff(top, n, getstr(ts));
+      }
+      setsvalue2s(L, top - n, ts);  /* create result */
+    }
+    total -= n-1;  /* got 'n' strings to create 1 new */
+    L->top -= n-1;  /* popped 'n' strings and pushed one */
+  } while (total > 1);  /* repeat until only 1 result left */
+}
+
+
+/*
+** Main operation 'ra' = #rb'.
+*/
+void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
+  const TValue *tm;
+  switch (ttype(rb)) {
+    case LUA_TTABLE: {
+      Table *h = hvalue(rb);
+      tm = fasttm(L, h->metatable, TM_LEN);
+      if (tm) break;  /* metamethod? break switch to call it */
+      setivalue(ra, luaH_getn(h));  /* else primitive len */
+      return;
+    }
+    case LUA_TSHRSTR: {
+      setivalue(ra, tsvalue(rb)->shrlen);
+      return;
+    }
+    case LUA_TLNGSTR: {
+      setivalue(ra, tsvalue(rb)->u.lnglen);
+      return;
+    }
+    default: {  /* try metamethod */
+      tm = luaT_gettmbyobj(L, rb, TM_LEN);
+      if (ttisnil(tm))  /* no metamethod? */
+        luaG_typeerror(L, rb, "get length of");
+      break;
+    }
+  }
+  luaT_callTM(L, tm, rb, rb, ra, 1);
+}
+
+
+/*
+** Integer division; return 'm // n', that is, floor(m/n).
+** C division truncates its result (rounds towards zero).
+** 'floor(q) == trunc(q)' when 'q >= 0' or when 'q' is integer,
+** otherwise 'floor(q) == trunc(q) - 1'.
+*/
+lua_Integer luaV_div (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_castS2U(n) + 1u <= 1u) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to divide by zero");
+    return intop(-, 0, m);   /* n==-1; avoid overflow with 0x80000...//-1 */
+  }
+  else {
+    lua_Integer q = m / n;  /* perform C division */
+    if ((m ^ n) < 0 && m % n != 0)  /* 'm/n' would be negative non-integer? */
+      q -= 1;  /* correct result for different rounding */
+    return q;
+  }
+}
+
+
+/*
+** Integer modulus; return 'm % n'. (Assume that C '%' with
+** negative operands follows C99 behavior. See previous comment
+** about luaV_div.)
+*/
+lua_Integer luaV_mod (lua_State *L, lua_Integer m, lua_Integer n) {
+  if (l_castS2U(n) + 1u <= 1u) {  /* special cases: -1 or 0 */
+    if (n == 0)
+      luaG_runerror(L, "attempt to perform 'n%%0'");
+    return 0;   /* m % -1 == 0; avoid overflow with 0x80000...%-1 */
+  }
+  else {
+    lua_Integer r = m % n;
+    if (r != 0 && (m ^ n) < 0)  /* 'm/n' would be non-integer negative? */
+      r += n;  /* correct result for different rounding */
+    return r;
+  }
+}
+
+
+/* number of bits in an integer */
+#define NBITS	cast_int(sizeof(lua_Integer) * CHAR_BIT)
+
+/*
+** Shift left operation. (Shift right just negates 'y'.)
+*/
+lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y) {
+  if (y < 0) {  /* shift right? */
+    if (y <= -NBITS) return 0;
+    else return intop(>>, x, -y);
+  }
+  else {  /* shift left */
+    if (y >= NBITS) return 0;
+    else return intop(<<, x, y);
+  }
+}
+
+
+/*
+** check whether cached closure in prototype 'p' may be reused, that is,
+** whether there is a cached closure with the same upvalues needed by
+** new closure to be created.
+*/
+static LClosure *getcached (Proto *p, UpVal **encup, StkId base) {
+  LClosure *c = p->cache;
+  if (c != NULL) {  /* is there a cached closure? */
+    int nup = p->sizeupvalues;
+    Upvaldesc *uv = p->upvalues;
+    int i;
+    for (i = 0; i < nup; i++) {  /* check whether it has right upvalues */
+      TValue *v = uv[i].instack ? base + uv[i].idx : encup[uv[i].idx]->v;
+      if (c->upvals[i]->v != v)
+        return NULL;  /* wrong upvalue; cannot reuse closure */
+    }
+  }
+  return c;  /* return cached closure (or NULL if no cached closure) */
+}
+
+
+/*
+** create a new Lua closure, push it in the stack, and initialize
+** its upvalues. Note that the closure is not cached if prototype is
+** already black (which means that 'cache' was already cleared by the
+** GC).
+*/
+static void pushclosure (lua_State *L, Proto *p, UpVal **encup, StkId base,
+                         StkId ra) {
+  int nup = p->sizeupvalues;
+  Upvaldesc *uv = p->upvalues;
+  int i;
+  LClosure *ncl = luaF_newLclosure(L, nup);
+  ncl->p = p;
+  setclLvalue(L, ra, ncl);  /* anchor new closure in stack */
+  for (i = 0; i < nup; i++) {  /* fill in its upvalues */
+    if (uv[i].instack)  /* upvalue refers to local variable? */
+      ncl->upvals[i] = luaF_findupval(L, base + uv[i].idx);
+    else  /* get upvalue from enclosing function */
+      ncl->upvals[i] = encup[uv[i].idx];
+    ncl->upvals[i]->refcount++;
+    /* new closure is white, so we do not need a barrier here */
+  }
+  if (!isblack(p))  /* cache will not break GC invariant? */
+    p->cache = ncl;  /* save it on cache for reuse */
+}
+
+
+/*
+** finish execution of an opcode interrupted by an yield
+*/
+void luaV_finishOp (lua_State *L) {
+  CallInfo *ci = L->ci;
+  StkId base = ci->u.l.base;
+  Instruction inst = *(ci->u.l.savedpc - 1);  /* interrupted instruction */
+  OpCode op = GET_OPCODE(inst);
+  switch (op) {  /* finish its execution */
+    case OP_ADD: case OP_SUB: case OP_MUL: case OP_DIV: case OP_IDIV:
+    case OP_BAND: case OP_BOR: case OP_BXOR: case OP_SHL: case OP_SHR:
+    case OP_MOD: case OP_POW:
+    case OP_UNM: case OP_BNOT: case OP_LEN:
+    case OP_GETTABUP: case OP_GETTABLE: case OP_SELF: {
+      setobjs2s(L, base + GETARG_A(inst), --L->top);
+      break;
+    }
+    case OP_LE: case OP_LT: case OP_EQ: {
+      int res = !l_isfalse(L->top - 1);
+      L->top--;
+      if (ci->callstatus & CIST_LEQ) {  /* "<=" using "<" instead? */
+        lua_assert(op == OP_LE);
+        ci->callstatus ^= CIST_LEQ;  /* clear mark */
+        res = !res;  /* negate result */
+      }
+      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_JMP);
+      if (res != GETARG_A(inst))  /* condition failed? */
+        ci->u.l.savedpc++;  /* skip jump instruction */
+      break;
+    }
+    case OP_CONCAT: {
+      StkId top = L->top - 1;  /* top when 'luaT_trybinTM' was called */
+      int b = GETARG_B(inst);      /* first element to concatenate */
+      int total = cast_int(top - 1 - (base + b));  /* yet to concatenate */
+      setobj2s(L, top - 2, top);  /* put TM result in proper position */
+      if (total > 1) {  /* are there elements to concat? */
+        L->top = top - 1;  /* top is one after last element (at top-2) */
+        luaV_concat(L, total);  /* concat them (may yield again) */
+      }
+      /* move final result to final position */
+      setobj2s(L, ci->u.l.base + GETARG_A(inst), L->top - 1);
+      L->top = ci->top;  /* restore top */
+      break;
+    }
+    case OP_TFORCALL: {
+      lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_TFORLOOP);
+      L->top = ci->top;  /* correct top */
+      break;
+    }
+    case OP_CALL: {
+      if (GETARG_C(inst) - 1 >= 0)  /* nresults >= 0? */
+        L->top = ci->top;  /* adjust results */
+      break;
+    }
+    case OP_TAILCALL: case OP_SETTABUP: case OP_SETTABLE:
+      break;
+    default: lua_assert(0);
+  }
+}
+
+
+
+
+/*
+** {==================================================================
+** Function 'luaV_execute': main interpreter loop
+** ===================================================================
+*/
+
+
+/*
+** some macros for common tasks in 'luaV_execute'
+*/
+
+
+#define RA(i)	(base+GETARG_A(i))
+#define RB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgR, base+GETARG_B(i))
+#define RC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgR, base+GETARG_C(i))
+#define RKB(i)	check_exp(getBMode(GET_OPCODE(i)) == OpArgK, \
+	ISK(GETARG_B(i)) ? k+INDEXK(GETARG_B(i)) : base+GETARG_B(i))
+#define RKC(i)	check_exp(getCMode(GET_OPCODE(i)) == OpArgK, \
+	ISK(GETARG_C(i)) ? k+INDEXK(GETARG_C(i)) : base+GETARG_C(i))
+
+
+/* execute a jump instruction */
+#define dojump(ci,i,e) \
+  { int a = GETARG_A(i); \
+    if (a != 0) luaF_close(L, ci->u.l.base + a - 1); \
+    ci->u.l.savedpc += GETARG_sBx(i) + e; }
+
+/* for test instructions, execute the jump instruction that follows it */
+#define donextjump(ci)	{ i = *ci->u.l.savedpc; dojump(ci, i, 1); }
+
+
+#define Protect(x)	{ {x;}; base = ci->u.l.base; }
+
+#define checkGC(L,c)  \
+	{ luaC_condGC(L, L->top = (c),  /* limit of live values */ \
+                         Protect(L->top = ci->top));  /* restore top */ \
+           luai_threadyield(L); }
+
+
+/* fetch an instruction and prepare its execution */
+#define vmfetch()	{ \
+  i = *(ci->u.l.savedpc++); \
+  if (L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) \
+    Protect(luaG_traceexec(L)); \
+  ra = RA(i); /* WARNING: any stack reallocation invalidates 'ra' */ \
+  lua_assert(base == ci->u.l.base); \
+  lua_assert(base <= L->top && L->top < L->stack + L->stacksize); \
+}
+
+#define vmdispatch(o)	switch(o)
+#define vmcase(l)	case l:
+#define vmbreak		break
+
+
+/*
+** copy of 'luaV_gettable', but protecting the call to potential
+** metamethod (which can reallocate the stack)
+*/
+#define gettableProtected(L,t,k,v)  { const TValue *slot; \
+  if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
+  else Protect(luaV_finishget(L,t,k,v,slot)); }
+
+
+/* same for 'luaV_settable' */
+#define settableProtected(L,t,k,v) { const TValue *slot; \
+  if (!luaV_fastset(L,t,k,slot,luaH_get,v)) \
+    Protect(luaV_finishset(L,t,k,v,slot)); }
+
+
+
+void luaV_execute (lua_State *L) {
+  CallInfo *ci = L->ci;
+  LClosure *cl;
+  TValue *k;
+  StkId base;
+  ci->callstatus |= CIST_FRESH;  /* fresh invocation of 'luaV_execute" */
+ newframe:  /* reentry point when frame changes (call/return) */
+  lua_assert(ci == L->ci);
+  cl = clLvalue(ci->func);  /* local reference to function's closure */
+  k = cl->p->k;  /* local reference to function's constant table */
+  base = ci->u.l.base;  /* local copy of function's base */
+  /* main loop of interpreter */
+  for (;;) {
+    Instruction i;
+    StkId ra;
+    vmfetch();
+    vmdispatch (GET_OPCODE(i)) {
+      vmcase(OP_MOVE) {
+        setobjs2s(L, ra, RB(i));
+        vmbreak;
+      }
+      vmcase(OP_LOADK) {
+        TValue *rb = k + GETARG_Bx(i);
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADKX) {
+        TValue *rb;
+        lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+        rb = k + GETARG_Ax(*ci->u.l.savedpc++);
+        setobj2s(L, ra, rb);
+        vmbreak;
+      }
+      vmcase(OP_LOADBOOL) {
+        setbvalue(ra, GETARG_B(i));
+        if (GETARG_C(i)) ci->u.l.savedpc++;  /* skip next instruction (if C) */
+        vmbreak;
+      }
+      vmcase(OP_LOADNIL) {
+        int b = GETARG_B(i);
+        do {
+          setnilvalue(ra++);
+        } while (b--);
+        vmbreak;
+      }
+      vmcase(OP_GETUPVAL) {
+        int b = GETARG_B(i);
+        setobj2s(L, ra, cl->upvals[b]->v);
+        vmbreak;
+      }
+      vmcase(OP_GETTABUP) {
+        TValue *upval = cl->upvals[GETARG_B(i)]->v;
+        TValue *rc = RKC(i);
+        gettableProtected(L, upval, rc, ra);
+        vmbreak;
+      }
+      vmcase(OP_GETTABLE) {
+        StkId rb = RB(i);
+        TValue *rc = RKC(i);
+        gettableProtected(L, rb, rc, ra);
+        vmbreak;
+      }
+      vmcase(OP_SETTABUP) {
+        TValue *upval = cl->upvals[GETARG_A(i)]->v;
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        settableProtected(L, upval, rb, rc);
+        vmbreak;
+      }
+      vmcase(OP_SETUPVAL) {
+        UpVal *uv = cl->upvals[GETARG_B(i)];
+        setobj(L, uv->v, ra);
+        luaC_upvalbarrier(L, uv);
+        vmbreak;
+      }
+      vmcase(OP_SETTABLE) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        settableProtected(L, ra, rb, rc);
+        vmbreak;
+      }
+      vmcase(OP_NEWTABLE) {
+        int b = GETARG_B(i);
+        int c = GETARG_C(i);
+        Table *t = luaH_new(L);
+        sethvalue(L, ra, t);
+        if (b != 0 || c != 0)
+          luaH_resize(L, t, luaO_fb2int(b), luaO_fb2int(c));
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_SELF) {
+        const TValue *aux;
+        StkId rb = RB(i);
+        TValue *rc = RKC(i);
+        TString *key = tsvalue(rc);  /* key must be a string */
+        setobjs2s(L, ra + 1, rb);
+        if (luaV_fastget(L, rb, key, aux, luaH_getstr)) {
+          setobj2s(L, ra, aux);
+        }
+        else Protect(luaV_finishget(L, rb, rc, ra, aux));
+        vmbreak;
+      }
+      vmcase(OP_ADD) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (ttisinteger(rb) && ttisinteger(rc)) {
+          lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
+          setivalue(ra, intop(+, ib, ic));
+        }
+        else if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_numadd(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_ADD)); }
+        vmbreak;
+      }
+      vmcase(OP_SUB) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (ttisinteger(rb) && ttisinteger(rc)) {
+          lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
+          setivalue(ra, intop(-, ib, ic));
+        }
+        else if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_numsub(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SUB)); }
+        vmbreak;
+      }
+      vmcase(OP_MUL) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (ttisinteger(rb) && ttisinteger(rc)) {
+          lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
+          setivalue(ra, intop(*, ib, ic));
+        }
+        else if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_nummul(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MUL)); }
+        vmbreak;
+      }
+      vmcase(OP_DIV) {  /* float division (always with floats) */
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_numdiv(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_DIV)); }
+        vmbreak;
+      }
+      vmcase(OP_BAND) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Integer ib; lua_Integer ic;
+        if (tointeger(rb, &ib) && tointeger(rc, &ic)) {
+          setivalue(ra, intop(&, ib, ic));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BAND)); }
+        vmbreak;
+      }
+      vmcase(OP_BOR) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Integer ib; lua_Integer ic;
+        if (tointeger(rb, &ib) && tointeger(rc, &ic)) {
+          setivalue(ra, intop(|, ib, ic));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BOR)); }
+        vmbreak;
+      }
+      vmcase(OP_BXOR) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Integer ib; lua_Integer ic;
+        if (tointeger(rb, &ib) && tointeger(rc, &ic)) {
+          setivalue(ra, intop(^, ib, ic));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_BXOR)); }
+        vmbreak;
+      }
+      vmcase(OP_SHL) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Integer ib; lua_Integer ic;
+        if (tointeger(rb, &ib) && tointeger(rc, &ic)) {
+          setivalue(ra, luaV_shiftl(ib, ic));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHL)); }
+        vmbreak;
+      }
+      vmcase(OP_SHR) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Integer ib; lua_Integer ic;
+        if (tointeger(rb, &ib) && tointeger(rc, &ic)) {
+          setivalue(ra, luaV_shiftl(ib, -ic));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_SHR)); }
+        vmbreak;
+      }
+      vmcase(OP_MOD) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (ttisinteger(rb) && ttisinteger(rc)) {
+          lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
+          setivalue(ra, luaV_mod(L, ib, ic));
+        }
+        else if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          lua_Number m;
+          luai_nummod(L, nb, nc, m);
+          setfltvalue(ra, m);
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_MOD)); }
+        vmbreak;
+      }
+      vmcase(OP_IDIV) {  /* floor division */
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (ttisinteger(rb) && ttisinteger(rc)) {
+          lua_Integer ib = ivalue(rb); lua_Integer ic = ivalue(rc);
+          setivalue(ra, luaV_div(L, ib, ic));
+        }
+        else if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_numidiv(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_IDIV)); }
+        vmbreak;
+      }
+      vmcase(OP_POW) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        lua_Number nb; lua_Number nc;
+        if (tonumber(rb, &nb) && tonumber(rc, &nc)) {
+          setfltvalue(ra, luai_numpow(L, nb, nc));
+        }
+        else { Protect(luaT_trybinTM(L, rb, rc, ra, TM_POW)); }
+        vmbreak;
+      }
+      vmcase(OP_UNM) {
+        TValue *rb = RB(i);
+        lua_Number nb;
+        if (ttisinteger(rb)) {
+          lua_Integer ib = ivalue(rb);
+          setivalue(ra, intop(-, 0, ib));
+        }
+        else if (tonumber(rb, &nb)) {
+          setfltvalue(ra, luai_numunm(L, nb));
+        }
+        else {
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_UNM));
+        }
+        vmbreak;
+      }
+      vmcase(OP_BNOT) {
+        TValue *rb = RB(i);
+        lua_Integer ib;
+        if (tointeger(rb, &ib)) {
+          setivalue(ra, intop(^, ~l_castS2U(0), ib));
+        }
+        else {
+          Protect(luaT_trybinTM(L, rb, rb, ra, TM_BNOT));
+        }
+        vmbreak;
+      }
+      vmcase(OP_NOT) {
+        TValue *rb = RB(i);
+        int res = l_isfalse(rb);  /* next assignment may change this value */
+        setbvalue(ra, res);
+        vmbreak;
+      }
+      vmcase(OP_LEN) {
+        Protect(luaV_objlen(L, ra, RB(i)));
+        vmbreak;
+      }
+      vmcase(OP_CONCAT) {
+        int b = GETARG_B(i);
+        int c = GETARG_C(i);
+        StkId rb;
+        L->top = base + c + 1;  /* mark the end of concat operands */
+        Protect(luaV_concat(L, c - b + 1));
+        ra = RA(i);  /* 'luaV_concat' may invoke TMs and move the stack */
+        rb = base + b;
+        setobjs2s(L, ra, rb);
+        checkGC(L, (ra >= rb ? ra + 1 : rb));
+        L->top = ci->top;  /* restore top */
+        vmbreak;
+      }
+      vmcase(OP_JMP) {
+        dojump(ci, i, 0);
+        vmbreak;
+      }
+      vmcase(OP_EQ) {
+        TValue *rb = RKB(i);
+        TValue *rc = RKC(i);
+        Protect(
+          if (luaV_equalobj(L, rb, rc) != GETARG_A(i))
+            ci->u.l.savedpc++;
+          else
+            donextjump(ci);
+        )
+        vmbreak;
+      }
+      vmcase(OP_LT) {
+        Protect(
+          if (luaV_lessthan(L, RKB(i), RKC(i)) != GETARG_A(i))
+            ci->u.l.savedpc++;
+          else
+            donextjump(ci);
+        )
+        vmbreak;
+      }
+      vmcase(OP_LE) {
+        Protect(
+          if (luaV_lessequal(L, RKB(i), RKC(i)) != GETARG_A(i))
+            ci->u.l.savedpc++;
+          else
+            donextjump(ci);
+        )
+        vmbreak;
+      }
+      vmcase(OP_TEST) {
+        if (GETARG_C(i) ? l_isfalse(ra) : !l_isfalse(ra))
+            ci->u.l.savedpc++;
+          else
+          donextjump(ci);
+        vmbreak;
+      }
+      vmcase(OP_TESTSET) {
+        TValue *rb = RB(i);
+        if (GETARG_C(i) ? l_isfalse(rb) : !l_isfalse(rb))
+          ci->u.l.savedpc++;
+        else {
+          setobjs2s(L, ra, rb);
+          donextjump(ci);
+        }
+        vmbreak;
+      }
+      vmcase(OP_CALL) {
+        int b = GETARG_B(i);
+        int nresults = GETARG_C(i) - 1;
+        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
+        if (luaD_precall(L, ra, nresults)) {  /* C function? */
+          if (nresults >= 0)
+            L->top = ci->top;  /* adjust results */
+          Protect((void)0);  /* update 'base' */
+        }
+        else {  /* Lua function */
+          ci = L->ci;
+          goto newframe;  /* restart luaV_execute over new Lua function */
+        }
+        vmbreak;
+      }
+      vmcase(OP_TAILCALL) {
+        int b = GETARG_B(i);
+        if (b != 0) L->top = ra+b;  /* else previous instruction set top */
+        lua_assert(GETARG_C(i) - 1 == LUA_MULTRET);
+        if (luaD_precall(L, ra, LUA_MULTRET)) {  /* C function? */
+          Protect((void)0);  /* update 'base' */
+        }
+        else {
+          /* tail call: put called frame (n) in place of caller one (o) */
+          CallInfo *nci = L->ci;  /* called frame */
+          CallInfo *oci = nci->previous;  /* caller frame */
+          StkId nfunc = nci->func;  /* called function */
+          StkId ofunc = oci->func;  /* caller function */
+          /* last stack slot filled by 'precall' */
+          StkId lim = nci->u.l.base + getproto(nfunc)->numparams;
+          int aux;
+          /* close all upvalues from previous call */
+          if (cl->p->sizep > 0) luaF_close(L, oci->u.l.base);
+          /* move new frame into old one */
+          for (aux = 0; nfunc + aux < lim; aux++)
+            setobjs2s(L, ofunc + aux, nfunc + aux);
+          oci->u.l.base = ofunc + (nci->u.l.base - nfunc);  /* correct base */
+          oci->top = L->top = ofunc + (L->top - nfunc);  /* correct top */
+          oci->u.l.savedpc = nci->u.l.savedpc;
+          oci->callstatus |= CIST_TAIL;  /* function was tail called */
+          ci = L->ci = oci;  /* remove new frame */
+          lua_assert(L->top == oci->u.l.base + getproto(ofunc)->maxstacksize);
+          goto newframe;  /* restart luaV_execute over new Lua function */
+        }
+        vmbreak;
+      }
+      vmcase(OP_RETURN) {
+        int b = GETARG_B(i);
+        if (cl->p->sizep > 0) luaF_close(L, base);
+        b = luaD_poscall(L, ci, ra, (b != 0 ? b - 1 : cast_int(L->top - ra)));
+        if (ci->callstatus & CIST_FRESH)  /* local 'ci' still from callee */
+          return;  /* external invocation: return */
+        else {  /* invocation via reentry: continue execution */
+          ci = L->ci;
+          if (b) L->top = ci->top;
+          lua_assert(isLua(ci));
+          lua_assert(GET_OPCODE(*((ci)->u.l.savedpc - 1)) == OP_CALL);
+          goto newframe;  /* restart luaV_execute over new Lua function */
+        }
+      }
+      vmcase(OP_FORLOOP) {
+        if (ttisinteger(ra)) {  /* integer loop? */
+          lua_Integer step = ivalue(ra + 2);
+          lua_Integer idx = intop(+, ivalue(ra), step); /* increment index */
+          lua_Integer limit = ivalue(ra + 1);
+          if ((0 < step) ? (idx <= limit) : (limit <= idx)) {
+            ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+            chgivalue(ra, idx);  /* update internal index... */
+            setivalue(ra + 3, idx);  /* ...and external index */
+          }
+        }
+        else {  /* floating loop */
+          lua_Number step = fltvalue(ra + 2);
+          lua_Number idx = luai_numadd(L, fltvalue(ra), step); /* inc. index */
+          lua_Number limit = fltvalue(ra + 1);
+          if (luai_numlt(0, step) ? luai_numle(idx, limit)
+                                  : luai_numle(limit, idx)) {
+            ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+            chgfltvalue(ra, idx);  /* update internal index... */
+            setfltvalue(ra + 3, idx);  /* ...and external index */
+          }
+        }
+        vmbreak;
+      }
+      vmcase(OP_FORPREP) {
+        TValue *init = ra;
+        TValue *plimit = ra + 1;
+        TValue *pstep = ra + 2;
+        lua_Integer ilimit;
+        int stopnow;
+        if (ttisinteger(init) && ttisinteger(pstep) &&
+            forlimit(plimit, &ilimit, ivalue(pstep), &stopnow)) {
+          /* all values are integer */
+          lua_Integer initv = (stopnow ? 0 : ivalue(init));
+          setivalue(plimit, ilimit);
+          setivalue(init, intop(-, initv, ivalue(pstep)));
+        }
+        else {  /* try making all values floats */
+          lua_Number ninit; lua_Number nlimit; lua_Number nstep;
+          if (!tonumber(plimit, &nlimit))
+            luaG_runerror(L, "'for' limit must be a number");
+          setfltvalue(plimit, nlimit);
+          if (!tonumber(pstep, &nstep))
+            luaG_runerror(L, "'for' step must be a number");
+          setfltvalue(pstep, nstep);
+          if (!tonumber(init, &ninit))
+            luaG_runerror(L, "'for' initial value must be a number");
+          setfltvalue(init, luai_numsub(L, ninit, nstep));
+        }
+        ci->u.l.savedpc += GETARG_sBx(i);
+        vmbreak;
+      }
+      vmcase(OP_TFORCALL) {
+        StkId cb = ra + 3;  /* call base */
+        setobjs2s(L, cb+2, ra+2);
+        setobjs2s(L, cb+1, ra+1);
+        setobjs2s(L, cb, ra);
+        L->top = cb + 3;  /* func. + 2 args (state and index) */
+        Protect(luaD_call(L, cb, GETARG_C(i)));
+        L->top = ci->top;
+        i = *(ci->u.l.savedpc++);  /* go to next instruction */
+        ra = RA(i);
+        lua_assert(GET_OPCODE(i) == OP_TFORLOOP);
+        goto l_tforloop;
+      }
+      vmcase(OP_TFORLOOP) {
+        l_tforloop:
+        if (!ttisnil(ra + 1)) {  /* continue loop? */
+          setobjs2s(L, ra, ra + 1);  /* save control variable */
+           ci->u.l.savedpc += GETARG_sBx(i);  /* jump back */
+        }
+        vmbreak;
+      }
+      vmcase(OP_SETLIST) {
+        int n = GETARG_B(i);
+        int c = GETARG_C(i);
+        unsigned int last;
+        Table *h;
+        if (n == 0) n = cast_int(L->top - ra) - 1;
+        if (c == 0) {
+          lua_assert(GET_OPCODE(*ci->u.l.savedpc) == OP_EXTRAARG);
+          c = GETARG_Ax(*ci->u.l.savedpc++);
+        }
+        h = hvalue(ra);
+        last = ((c-1)*LFIELDS_PER_FLUSH) + n;
+        if (last > h->sizearray)  /* needs more space? */
+          luaH_resizearray(L, h, last);  /* preallocate it at once */
+        for (; n > 0; n--) {
+          TValue *val = ra+n;
+          luaH_setint(L, h, last--, val);
+          luaC_barrierback(L, h, val);
+        }
+        L->top = ci->top;  /* correct top (in case of previous open call) */
+        vmbreak;
+      }
+      vmcase(OP_CLOSURE) {
+        Proto *p = cl->p->p[GETARG_Bx(i)];
+        LClosure *ncl = getcached(p, cl->upvals, base);  /* cached closure */
+        if (ncl == NULL)  /* no match? */
+          pushclosure(L, p, cl->upvals, base, ra);  /* create a new one */
+        else
+          setclLvalue(L, ra, ncl);  /* push cashed closure */
+        checkGC(L, ra + 1);
+        vmbreak;
+      }
+      vmcase(OP_VARARG) {
+        int b = GETARG_B(i) - 1;  /* required results */
+        int j;
+        int n = cast_int(base - ci->func) - cl->p->numparams - 1;
+        if (n < 0)  /* less arguments than parameters? */
+          n = 0;  /* no vararg arguments */
+        if (b < 0) {  /* B == 0? */
+          b = n;  /* get all var. arguments */
+          Protect(luaD_checkstack(L, n));
+          ra = RA(i);  /* previous call may change the stack */
+          L->top = ra + n;
+        }
+        for (j = 0; j < b && j < n; j++)
+          setobjs2s(L, ra + j, base - n + j);
+        for (; j < b; j++)  /* complete required results with nil */
+          setnilvalue(ra + j);
+        vmbreak;
+      }
+      vmcase(OP_EXTRAARG) {
+        lua_assert(0);
+        vmbreak;
+      }
+    }
+  }
+}
+
+/* }================================================================== */
+
diff --git a/scite-app/scite/lua/src/lvm.h b/scite-app/scite/lua/src/lvm.h
new file mode 100644
index 0000000..422f871
--- /dev/null
+++ b/scite-app/scite/lua/src/lvm.h
@@ -0,0 +1,113 @@
+/*
+** $Id: lvm.h,v 2.41 2016/12/22 13:08:50 roberto Exp $
+** Lua virtual machine
+** See Copyright Notice in lua.h
+*/
+
+#ifndef lvm_h
+#define lvm_h
+
+
+#include "ldo.h"
+#include "lobject.h"
+#include "ltm.h"
+
+
+#if !defined(LUA_NOCVTN2S)
+#define cvt2str(o)	ttisnumber(o)
+#else
+#define cvt2str(o)	0	/* no conversion from numbers to strings */
+#endif
+
+
+#if !defined(LUA_NOCVTS2N)
+#define cvt2num(o)	ttisstring(o)
+#else
+#define cvt2num(o)	0	/* no conversion from strings to numbers */
+#endif
+
+
+/*
+** You can define LUA_FLOORN2I if you want to convert floats to integers
+** by flooring them (instead of raising an error if they are not
+** integral values)
+*/
+#if !defined(LUA_FLOORN2I)
+#define LUA_FLOORN2I		0
+#endif
+
+
+#define tonumber(o,n) \
+	(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
+
+#define tointeger(o,i) \
+    (ttisinteger(o) ? (*(i) = ivalue(o), 1) : luaV_tointeger(o,i,LUA_FLOORN2I))
+
+#define intop(op,v1,v2) l_castU2S(l_castS2U(v1) op l_castS2U(v2))
+
+#define luaV_rawequalobj(t1,t2)		luaV_equalobj(NULL,t1,t2)
+
+
+/*
+** fast track for 'gettable': if 't' is a table and 't[k]' is not nil,
+** return 1 with 'slot' pointing to 't[k]' (final result).  Otherwise,
+** return 0 (meaning it will have to check metamethod) with 'slot'
+** pointing to a nil 't[k]' (if 't' is a table) or NULL (otherwise).
+** 'f' is the raw get function to use.
+*/
+#define luaV_fastget(L,t,k,slot,f) \
+  (!ttistable(t)  \
+   ? (slot = NULL, 0)  /* not a table; 'slot' is NULL and result is 0 */  \
+   : (slot = f(hvalue(t), k),  /* else, do raw access */  \
+      !ttisnil(slot)))  /* result not nil? */
+
+/*
+** standard implementation for 'gettable'
+*/
+#define luaV_gettable(L,t,k,v) { const TValue *slot; \
+  if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
+  else luaV_finishget(L,t,k,v,slot); }
+
+
+/*
+** Fast track for set table. If 't' is a table and 't[k]' is not nil,
+** call GC barrier, do a raw 't[k]=v', and return true; otherwise,
+** return false with 'slot' equal to NULL (if 't' is not a table) or
+** 'nil'. (This is needed by 'luaV_finishget'.) Note that, if the macro
+** returns true, there is no need to 'invalidateTMcache', because the
+** call is not creating a new entry.
+*/
+#define luaV_fastset(L,t,k,slot,f,v) \
+  (!ttistable(t) \
+   ? (slot = NULL, 0) \
+   : (slot = f(hvalue(t), k), \
+     ttisnil(slot) ? 0 \
+     : (luaC_barrierback(L, hvalue(t), v), \
+        setobj2t(L, cast(TValue *,slot), v), \
+        1)))
+
+
+#define luaV_settable(L,t,k,v) { const TValue *slot; \
+  if (!luaV_fastset(L,t,k,slot,luaH_get,v)) \
+    luaV_finishset(L,t,k,v,slot); }
+
+
+
+LUAI_FUNC int luaV_equalobj (lua_State *L, const TValue *t1, const TValue *t2);
+LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
+LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
+LUAI_FUNC int luaV_tointeger (const TValue *obj, lua_Integer *p, int mode);
+LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
+                               StkId val, const TValue *slot);
+LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
+                               StkId val, const TValue *slot);
+LUAI_FUNC void luaV_finishOp (lua_State *L);
+LUAI_FUNC void luaV_execute (lua_State *L);
+LUAI_FUNC void luaV_concat (lua_State *L, int total);
+LUAI_FUNC lua_Integer luaV_div (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Integer luaV_mod (lua_State *L, lua_Integer x, lua_Integer y);
+LUAI_FUNC lua_Integer luaV_shiftl (lua_Integer x, lua_Integer y);
+LUAI_FUNC void luaV_objlen (lua_State *L, StkId ra, const TValue *rb);
+
+#endif
diff --git a/scite-app/scite/lua/src/lzio.c b/scite-app/scite/lua/src/lzio.c
new file mode 100644
index 0000000..c9e1f49
--- /dev/null
+++ b/scite-app/scite/lua/src/lzio.c
@@ -0,0 +1,68 @@
+/*
+** $Id: lzio.c,v 1.37 2015/09/08 15:41:05 roberto Exp $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+#define lzio_c
+#define LUA_CORE
+
+#include "lprefix.h"
+
+
+#include <string.h>
+
+#include "lua.h"
+
+#include "llimits.h"
+#include "lmem.h"
+#include "lstate.h"
+#include "lzio.h"
+
+
+int luaZ_fill (ZIO *z) {
+  size_t size;
+  lua_State *L = z->L;
+  const char *buff;
+  lua_unlock(L);
+  buff = z->reader(L, z->data, &size);
+  lua_lock(L);
+  if (buff == NULL || size == 0)
+    return EOZ;
+  z->n = size - 1;  /* discount char being returned */
+  z->p = buff;
+  return cast_uchar(*(z->p++));
+}
+
+
+void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader, void *data) {
+  z->L = L;
+  z->reader = reader;
+  z->data = data;
+  z->n = 0;
+  z->p = NULL;
+}
+
+
+/* --------------------------------------------------------------- read --- */
+size_t luaZ_read (ZIO *z, void *b, size_t n) {
+  while (n) {
+    size_t m;
+    if (z->n == 0) {  /* no bytes in buffer? */
+      if (luaZ_fill(z) == EOZ)  /* try to read more */
+        return n;  /* no more input; return number of missing bytes */
+      else {
+        z->n++;  /* luaZ_fill consumed first byte; put it back */
+        z->p--;
+      }
+    }
+    m = (n <= z->n) ? n : z->n;  /* min. between n and z->n */
+    memcpy(b, z->p, m);
+    z->n -= m;
+    z->p += m;
+    b = (char *)b + m;
+    n -= m;
+  }
+  return 0;
+}
+
diff --git a/scite-app/scite/lua/src/lzio.h b/scite-app/scite/lua/src/lzio.h
new file mode 100644
index 0000000..e7b6f34
--- /dev/null
+++ b/scite-app/scite/lua/src/lzio.h
@@ -0,0 +1,66 @@
+/*
+** $Id: lzio.h,v 1.31 2015/09/08 15:41:05 roberto Exp $
+** Buffered streams
+** See Copyright Notice in lua.h
+*/
+
+
+#ifndef lzio_h
+#define lzio_h
+
+#include "lua.h"
+
+#include "lmem.h"
+
+
+#define EOZ	(-1)			/* end of stream */
+
+typedef struct Zio ZIO;
+
+#define zgetc(z)  (((z)->n--)>0 ?  cast_uchar(*(z)->p++) : luaZ_fill(z))
+
+
+typedef struct Mbuffer {
+  char *buffer;
+  size_t n;
+  size_t buffsize;
+} Mbuffer;
+
+#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
+
+#define luaZ_buffer(buff)	((buff)->buffer)
+#define luaZ_sizebuffer(buff)	((buff)->buffsize)
+#define luaZ_bufflen(buff)	((buff)->n)
+
+#define luaZ_buffremove(buff,i)	((buff)->n -= (i))
+#define luaZ_resetbuffer(buff) ((buff)->n = 0)
+
+
+#define luaZ_resizebuffer(L, buff, size) \
+	((buff)->buffer = luaM_reallocvchar(L, (buff)->buffer, \
+				(buff)->buffsize, size), \
+	(buff)->buffsize = size)
+
+#define luaZ_freebuffer(L, buff)	luaZ_resizebuffer(L, buff, 0)
+
+
+LUAI_FUNC void luaZ_init (lua_State *L, ZIO *z, lua_Reader reader,
+                                        void *data);
+LUAI_FUNC size_t luaZ_read (ZIO* z, void *b, size_t n);	/* read next n bytes */
+
+
+
+/* --------- Private Part ------------------ */
+
+struct Zio {
+  size_t n;			/* bytes still unread */
+  const char *p;		/* current position in buffer */
+  lua_Reader reader;		/* reader function */
+  void *data;			/* additional data */
+  lua_State *L;			/* Lua state (for reader) */
+};
+
+
+LUAI_FUNC int luaZ_fill (ZIO *z);
+
+#endif
diff --git a/scite-app/scite/scripts/CheckAtFile.py b/scite-app/scite/scripts/CheckAtFile.py
new file mode 100644
index 0000000..5b0da9a
--- /dev/null
+++ b/scite-app/scite/scripts/CheckAtFile.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python3
+# CheckAtFile.py
+# Check that file headers mention the file name in a standard way
+# Check that include guards are present when needed and follow a common naming convention
+# Implemented 2019 by Neil Hodgson neilh@scintilla.org
+# Requires Python 3.6 or later
+
+import pathlib
+
+srcRoot = pathlib.Path(__file__).resolve().parent.parent.parent
+
+neutralEncoding = "cp437"	# Each byte value is valid in cp437
+
+# Find all the files in the second level directories
+# moc_* generated by Qt moc
+# scintilla-marshal.* generated by glib-genmarshal
+srcPaths = []
+for base in ["scintilla", "lexilla", "scite"]:
+	baseDir = srcRoot / base
+	for src in baseDir.glob("**/*"):
+		if src.suffix in [".cxx", ".h", ".mm", ".m", ".cpp", ".c"]:
+			if not src.name.startswith("moc_") and \
+				not src.name.startswith("scintilla-marshal") and \
+				"cov-int" not in src.parts:
+				srcPaths.append(src)
+
+#~ for p in srcPaths:
+	#~ print(p.parts)
+
+headerPaths = [f for f in srcPaths if f.suffix == ".h"]
+
+# Check whether a file name comment is present
+for p in srcPaths:
+	if "lexilla/test/examples/" in str(p).replace("\\", "/"):
+		# Weed out test example files
+		continue
+	baseName = p.name
+	with p.open(encoding=neutralEncoding) as f:
+		lines = f.readlines()
+		if "pyside_global.h" in lines[0]:
+			# Weed out generated file
+			continue
+		for i in range(min(20, len(lines))):
+			atLine = lines[i]
+			if "@file" in atLine:
+				break
+		if "@file" in atLine:
+			#~ print(atLine, p)
+			_a, _b, fileName = atLine.partition("@file")
+			fileName = fileName.strip().split()[0]
+			if baseName != fileName:
+				if baseName.lower() == fileName.lower():
+					print(f"{p}:2: wrong case @file:{fileName}")
+				else:
+					print(f"{p}:2: wrong @file:{fileName}")
+		else:
+			atLine = lines[1]
+			if "$Id:" in atLine:
+				# Lua uses source code control "$Id" variable so
+				# strip it and the ",v" that follows the file name.
+				atLine = atLine.replace(",v", "")
+				atLine = atLine.replace("$Id:", "")
+			fields = atLine.strip().split()
+			fileName = ""
+			if len(fields) > 1:
+				fileName = fields[1]
+			if baseName != fileName:
+				if baseName.lower() == fileName.lower():
+					print(f"{p}:2: wrong case @file:{fileName}")
+				else:
+					print(f"{p}:2: wrong file comment:{atLine.rstrip()}")
+			else:
+				#~ print(f"{p}:2: no @file [" + fileName + "] [" + baseName + "]")
+				pass
+
+# Check whether a header guard is present
+for header in headerPaths:
+	# For Cocoa, using #import avoids need for guards
+	if "cocoa" in header.parent.parts: continue
+	# global.h generated for ScintillaEditPy
+	if header.parent.name == "ScintillaEditPy" and header.name == "global.h": continue
+	# XPM pixmap files may need to be edited with a graphics program
+	if header.name == "pixmapsGNOME.h": continue
+	if header.name == "SciIcon.h": continue
+
+	with header.open(encoding=neutralEncoding) as f:
+		# ScintillaWidget.h -> SCINTILLAWIDGET_H
+		guard = header.name.upper().replace(".", "_")
+		if "lua" in str(header.parent):
+			guard = guard.lower()
+		lines = f.readlines()
+		matches = [line.strip() for line in lines if guard in line.split() and "#endif" not in line]
+		#ifndef XPM_H:#define XPM_H
+		standardGuardSet = "#ifndef " + guard + ":#define " + guard
+		if ":".join(matches) != standardGuardSet:
+			print(f"{header}:0: ", guard, ":".join(matches))
+			print("\n".join(standardGuardSet.split(":")))
diff --git a/scite-app/scite/scripts/CheckPropsDoc.py b/scite-app/scite/scripts/CheckPropsDoc.py
new file mode 100755
index 0000000..6cc6cb8
--- /dev/null
+++ b/scite-app/scite/scripts/CheckPropsDoc.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python3
+# CheckPropsDoc.py
+# Check that various elements are documented and localized.
+# Find all the properties used in SciTE source files and check that they
+# are mentioned in scite/doc/SciTEDoc.html and scite/src/SciTEGlobal.properties.
+# Find all the strings used in the UI and check that there is a localization key for each.
+# List any properties that are set in .properties files for different languages.
+# Requires Python 3.6 or later
+
+import pathlib, re, string
+
+srcRoot = pathlib.Path(__file__).resolve().parent.parent
+srcDir = srcRoot / "src"
+docFileName = srcRoot / "doc" / "SciTEDoc.html"
+propsFileName = srcDir / "SciTEGlobal.properties"
+localeFileName = srcRoot / "win32" / "locale.properties"
+resourceFileName = srcRoot / "win32" / "SciTERes.rc"
+
+neutralEncoding = "cp437"	# Each byte value is valid in cp437
+
+identCharacters = "_*." + string.ascii_letters + string.digits
+
+# These properties are for debugging or for optionally attached features or are archaic
+# and kept to preserve compatibility.
+knownDebugOptionalAndArchaicProperties = {
+	"ext.lua.debug.traceback",	# Debug
+	"asynchronous.sleep",	# Debug
+	"dwell.period",	# Debug
+	"bookmark.pixmap",	# Debug
+	"ipc.director.name",	# Archaic
+	"two.phase.draw",	# Archaic
+	"translation.encoding",	# Used in translations
+	"selection.alpha",	# Archaic
+	"selection.additional.alpha",	# Archaic
+	"caret.line.back.alpha",	# Archaic
+}
+
+# These properties are either set by SciTE and used (not set) in property files or
+# should only be located in known lexer-specific property files.
+knownOutputAndLexerProperties = {
+	"find.directory",
+	"find.what",
+	"xml.auto.close.tags",
+	"indent.python.colon",
+	"ScaleFactor",
+}
+knownOutputAndLexerProperties.update(knownDebugOptionalAndArchaicProperties)
+
+# Convert all punctuation characters except '_', '*', and '.' into spaces.
+def depunctuate(s):
+	return "".join(ch if ch in identCharacters else " " for ch in s)
+
+def grabQuoted(s):
+	parts = s.split('"')
+	if len(parts) >= 3:
+		return parts[1]
+	return ""
+
+def stripComment(s):
+	if "//" in s:
+		return s[:s.find("//")]
+	return s
+
+def keyOfLine(line):
+	if '=' in line:
+		line = line.strip()
+		if line[0] == "#":
+			line = line[1:]
+		line = line[:line.find("=")]
+		line = line.strip()
+		return line
+	else:
+		return None
+
+# Find all source and properties files
+
+sourcePaths = srcRoot.glob("**/*.cxx")
+
+propertiesPaths = [p for p in srcDir.glob("*.properties") if p.stem not in ["SciTE", "Embedded"]]
+
+# Read files to find properties and check against other files
+
+propertyNames = set()
+for sourcePath in sourcePaths:
+	with sourcePath.open(encoding=neutralEncoding) as srcFile:
+		for srcLine in srcFile:
+			srcLine = stripComment(srcLine).strip()
+			# "[ .\)]Get.*(.*\".*\""
+			if re.search('[ .(]Get[a-zA-Z]*\(\".*\"', srcLine):
+				parts = srcLine.split('\"')
+				if len(parts) > 1 and "GetTranslationToAbout" not in srcLine:
+					propertyName = parts[1]
+					if propertyName and propertyName != "1":
+						propertyNames.add(propertyName)
+
+propertiesInDoc = set()
+with docFileName.open(encoding=neutralEncoding) as docFile:
+	for docLine in docFile:
+		for word in depunctuate(docLine).split():
+			if word in propertyNames:
+				propertiesInDoc.add(word)
+
+propertiesAnchoredInDoc = set()
+docText = docFileName.read_text(encoding=neutralEncoding)
+for ident in re.findall(" id='property-([a-z0-9*.]+)'>", docText):
+	propertiesAnchoredInDoc.add(ident)
+for ident in re.findall("<a name='property-([a-z.]+)'>", docText):
+	propertiesAnchoredInDoc.add(ident)
+
+propertiesInGlobal = set()
+with propsFileName.open(encoding=neutralEncoding) as propsFile:
+	for propLine in propsFile:
+		if propLine:
+			key = keyOfLine(propLine)
+			if key:
+				if key in propertyNames:
+					propertiesInGlobal.add(key)
+
+localeSet = set()
+with localeFileName.open(encoding=neutralEncoding) as localeFile:
+	for line in localeFile:
+		if not line.startswith("#"):
+			line = line.strip().strip("=")
+			localeSet.add(line.lower())
+
+resourceSet = set()
+with resourceFileName.open(encoding=neutralEncoding) as resourceFile:
+	for line in resourceFile:
+		line = line.strip()
+		if "VIRTKEY" not in line and \
+			"VALUE" not in line and \
+			"1234567" not in line and \
+			not line.startswith("BLOCK") and \
+			not line.startswith("FONT") and \
+			not line.startswith("ICON") and \
+			not line.startswith("ID") and \
+			"#include" not in line:
+			line = grabQuoted(line)
+			if line:
+				if '\\t' in line:
+					line = line[:line.find('\\t')]
+				line = line.replace('&','')
+				line = line.replace('...','')
+				if len(line) > 2:
+					resourceSet.add(line)
+
+propertyToFiles = {}
+for propPath in propertiesPaths:
+	with propPath.open(encoding=neutralEncoding) as propsFile:
+		for propLine in propsFile:
+			if propLine and not propLine.startswith("#"):
+				key = keyOfLine(propLine)
+				if key:
+					if key not in propertyToFiles:
+						propertyToFiles[key] = set()
+					propertyToFiles[key].add(str(propPath))
+
+# Warn about problems
+
+print(f"# Not mentioned in {docFileName}")
+for identifier in sorted(propertyNames - propertiesInDoc - knownDebugOptionalAndArchaicProperties):
+	print(identifier)
+
+print(f"\n# Not anchored in {docFileName}")
+propertyNamesNoDots = set([s.rstrip(".") for s in propertyNames])
+for identifier in sorted(propertyNamesNoDots - propertiesAnchoredInDoc - knownOutputAndLexerProperties):
+	print(identifier)
+
+print(f"\n# Not mentioned in {propsFileName}")
+for identifier in sorted(propertyNames - propertiesInGlobal - knownOutputAndLexerProperties):
+	if not identifier.endswith("."):
+		print(identifier)
+
+print("\n# Missing localization of resource")
+for l in sorted(resourceSet):
+	if l.lower() not in localeSet:
+		print(l)
+
+print("\n# Duplicate properties")
+for property, files in sorted(propertyToFiles.items()):
+	if len(files) > 1:
+		print(property + " " + (", ".join(files)))
diff --git a/scite-app/scite/scripts/HeaderOrder.txt b/scite-app/scite/scripts/HeaderOrder.txt
new file mode 100644
index 0000000..7acf792
--- /dev/null
+++ b/scite-app/scite/scripts/HeaderOrder.txt
@@ -0,0 +1,143 @@
+// Define the standard order in which to include header files
+// All platform headers should be included before Scintilla headers
+// and each of these groups are then divided into directory groups.
+// Based on Scintilla's HeaderOrder.txt and compatible with it.
+
+// Base of the repository relative to this file
+
+//base:..
+
+// File patterns to check:
+//source:**/*.h
+//source:**/*.cxx
+
+// Exclude lua implementation as it is an external project that follows different rules
+//exclude:lua
+
+// C++ wrappers of C standard library
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+#include <cmath>
+#include <clocale>
+#include <cerrno>
+#include <csignal>
+
+// C++ standard library
+#include <stdexcept>
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <deque>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <iomanip>
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+// POSIX
+// Also on Windows
+#include <fcntl.h>
+
+#include <unistd.h>
+#include <dirent.h>
+
+// Also on Windows
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <sys/wait.h>
+
+// GTK headers
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+// Windows headers
+#include <io.h>
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+#include <uxtheme.h>
+#include <vsstyle.h>
+#include <vssym32.h>
+#include <shlwapi.h>
+#include <shlobj.h>
+
+#include <direct.h>
+
+// Scintilla headers
+
+// Non-platform-specific headers
+
+// include
+
+#include "ILoader.h"
+#include "ILexer.h"
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+#include "Scintilla.h"
+#include "ScintillaWidget.h"
+
+#include "SciLexer.h"
+#include "Lexilla.h"
+#include "LexillaAccess.h"
+
+// SciTE headers
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "pixmapsGNOME.h"
+#include "SciIcon.h"
+#include "Widget.h"
+
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "MatchMarker.h"
+#include "EditorConfig.h"
+#include "SciTEBase.h"
+#include "UniqueInstance.h"
+#include "StripDefinition.h"
+#include "Strips.h"
+#include "Utf8_16.h"
+
+#include "IFaceTable.h"
+#include "SciTEKeys.h"
+
+#include "SciTEWin.h"
+#include "DLLFunction.h"
+#include "MultiplexExtension.h"
+#include "DirectorExtension.h"
+#include "LuaExtension.h"
+
+// Lua headers
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+
diff --git a/scite-app/scite/scripts/IFaceTableGen.py b/scite-app/scite/scripts/IFaceTableGen.py
new file mode 100755
index 0000000..78408f9
--- /dev/null
+++ b/scite-app/scite/scripts/IFaceTableGen.py
@@ -0,0 +1,406 @@
+#!/usr/bin/env python3
+# IFaceTableGen.py - regenerate the IFaceTable.cxx from the Scintilla.iface
+# interface definition file.  Based on Scintilla's HFacer.py.
+# The header files are copied to a temporary file apart from the section between a //++Autogenerated
+# comment and a //--Autogenerated comment which is generated by the printHFile and printLexHFile
+# functions. After the temporary file is created, it is copied back to the original file name.
+# Requires Python 3.6 or later
+
+import sys
+import os
+
+srcRoot = "../.."
+
+sys.path.append(srcRoot + "/scintilla/scripts")
+
+import Face
+import FileGenerator
+
+def CommentString(prop):
+	if prop and prop["Comment"]:
+		return (" -- " + " ".join(prop["Comment"])).replace("<", "&lt;")
+	return ""
+
+def ConvertEnu(t):
+	if Face.IsEnumeration(t):
+		return "int"
+	else:
+		return t
+
+def GetScriptableInterface(f):
+	"""Returns a tuple of (constants, functions, properties)
+constants - a sorted list of (name, features) tuples, including all
+	constants except for SCLEX_ constants which are presumed not used by
+	scripts.  The SCI_ constants for functions are omitted, since they
+	can be derived, but the SCI_ constants for properties are included
+	since they cannot be derived from the property names.
+functions - a sorted list of (name, features) tuples, for the features
+	that should be exposed to script as functions.  This includes all
+	'fun' functions; it is up to the program to decide if a given
+	function cannot be scripted.  It is also up to the caller to
+	export the SCI_ constants for functions.
+properties - a sorted list of (name, property), where property is a
+	dictionary containing these keys: "GetterValue", "SetterValue",
+	"PropertyType", "IndexParamType", "IndexParamName", "GetterName",
+	"SetterName", "GetterComment", "SetterComment", and "Category".
+	If the property is read-only, SetterValue will be 0, and the other
+	Setter attribtes will be None.  Likewise for write-only properties,
+	GetterValue will be 0 etc.  If the getter and/or setter are not
+	compatible with one another, or with our interpretation of how
+	properties work, then the functions are instead added to the
+	functions list.  It is still up to the language binding to decide
+	whether the property can / should be exposed to script."""
+
+	constants = [] # returned as a sorted list
+	functions = {} # returned as a sorted list of items
+	properties = {} # returned as a sorted list of items
+
+	for name in f.order:
+		features = f.features[name]
+		if features["Category"] != "Deprecated":
+			if features["FeatureType"] == "val":
+				constants.append( (name, features) )
+			elif features["FeatureType"] in ["fun","get","set"]:
+				if features["FeatureType"] == "get":
+					propname = name.replace("Get", "", 1)
+					properties[propname] = (name, properties.get(propname,(None,None))[1])
+
+				elif features["FeatureType"] == "set":
+					propname = name.replace("Set", "", 1)
+					properties[propname] = (properties.get(propname,(None,None))[0], name)
+
+				else:
+					functions[name] = features
+
+	propertiesCopy = properties.copy()
+	for propname, (getterName, setterName) in propertiesCopy.items():
+		getter = getterName and f.features[getterName]
+		setter = setterName and f.features[setterName]
+
+		getterValue, getterIndex, getterIndexName, getterType = 0, None, None, None
+		setterValue, setterIndex, setterIndexName, setterType = 0, None, None, None
+		propType, propIndex, propIndexName = None, None, None
+
+		isok = (getterName or setterName) and not (getter is setter)
+
+		if isok and getter:
+			if getter['Param2Type'] == 'stringresult':
+				getterType = getter['Param2Type']
+			else:
+				getterType = getter['ReturnType']
+			getterType = ConvertEnu(getterType)
+			getterValue = getter['Value']
+			getterIndex = getter['Param1Type'] or 'void'
+			getterIndexName = getter['Param1Name']
+
+			isok = ((getter['Param2Type'] or 'void') == 'void') or (getterType == 'stringresult')
+
+		if isok and setter:
+			setterValue = setter['Value']
+			setterType = ConvertEnu(setter['Param1Type']) or 'void'
+			setterIndex = 'void'
+			if (setter['Param2Type'] or 'void') != 'void':
+				setterIndex = setterType
+				setterIndexName = setter['Param1Name']
+				setterType = ConvertEnu(setter['Param2Type'])
+
+			isok = (setter['ReturnType'] == 'void') or (setter['ReturnType'] == 'int' and setterType=='string')
+
+		if isok and getter and setter:
+			isok = ((getterType == setterType) or (getterType == 'stringresult' and setterType == 'string')) and (getterIndex == setterIndex)
+
+		propType = getterType or setterType
+		propIndex = getterIndex or setterIndex
+		propIndexName = getterIndexName or setterIndexName
+
+		if isok:
+			# do the types appear to be useable?  THIS IS OVERRIDDEN BELOW
+			isok = (propType in ('int', 'position', 'line', 'pointer', 'colour', 'colouralpha', 'bool', 'string', 'stringresult')
+				and propIndex in ('void','int','position','line','string','bool'))
+
+			# getters on string properties follow a different protocol with this signature
+			# for a string getter and setter:
+			#   get int funcname(void,stringresult)
+			#   set void funcname(void,string)
+			#
+			# For an indexed string getter and setter, the indexer goes in
+			# wparam and must not be called 'int length', since 'int length'
+			# has special meaning.
+
+			# A bool indexer has a special meaning.  It means "if the script
+			# assigns the language's nil value to the property, call the
+			# setter with args (0,0); otherwise call it with (1, value)."
+			#
+			# Although there are no getters indexed by bool, I suggest the
+			# following protocol:  If getter(1,0) returns 0, return nil to
+			# the script.  Otherwise return getter(0,0).
+
+
+		if isok:
+			properties[propname] = {
+				"GetterValue"    : getterValue,
+				"SetterValue"    : setterValue,
+				"PropertyType"   : propType,
+				"IndexParamType" : propIndex,
+				"IndexParamName" : propIndexName,
+				# The rest of this metadata is added to help generate documentation
+				"Category"       : (getter or setter)["Category"],
+				"GetterName"     : getterName,
+				"SetterName"     : setterName,
+				"GetterComment"  : CommentString(getter),
+				"SetterComment"  : CommentString(setter)
+			}
+			#~ print(properties[propname])
+
+			# If it is exposed as a property, the constant name is not picked up implicitly
+			# (because the name is different) but its constant should still be exposed.
+			if getter:
+				constants.append( ("SCI_" + getterName.upper(), getter))
+			if setter:
+				constants.append( ("SCI_" + setterName.upper(), setter))
+		else:
+			# Cannot parse as scriptable property (e.g. not symmetrical), so export as functions
+			del(properties[propname])
+			if getter:
+				functions[getterName] = getter
+			if setter:
+				functions[setterName] = setter
+
+	funclist = list(functions.items())
+	funclist.sort()
+
+	proplist = list(properties.items())
+	proplist.sort()
+
+	constants.sort()
+
+	return (constants, funclist, proplist)
+
+
+def printIFaceTableCXXFile(facesAndIDs):
+	out = []
+	f, fLex, ids = facesAndIDs
+	(constants, functions, properties) = GetScriptableInterface(f)
+	# Lexilla only defines constants, no functions or properties
+	(constantsLex, _, _) = GetScriptableInterface(fLex)
+	constants.extend(constantsLex)
+	constants.extend(ids)
+	constants.sort()
+
+	out.append("")
+	out.append("static IFaceConstant ifaceConstants[] = {")
+
+	if constants:
+		lastName = constants[-1][0]
+		for name, features in constants:
+			comma = "" if name == lastName else ","
+			val = features["Value"]
+			if int(val, base=0) >= 0x8000000:
+				val = "static_cast<int>(" + val + ")"
+			out.append('\t{"%s",%s}%s' % (name, val, comma))
+
+		out.append("};")
+	else:
+		out.append('{"",0}};')
+
+	# Write an array of function descriptions.  This can be
+	# used as a sort of compiled typelib.
+
+	out.append("")
+	out.append("static IFaceFunction ifaceFunctions[] = {")
+	if functions:
+		lastName = functions[-1][0]
+		for name, features in functions:
+			comma = "" if name == lastName else ","
+
+			returnType = ConvertEnu(features["ReturnType"])
+			param1Type = ConvertEnu(features["Param1Type"]) or "void"
+			param2Type = ConvertEnu(features["Param2Type"]) or "void"
+
+			# Fix-up: if a param is an int (or position) named length, change to iface_type_length.
+			if param1Type in ["int", "position"] and features["Param1Name"] == "length":
+				param1Type = "length"
+
+			if param2Type in ["int", "position"] and features["Param2Name"] == "length":
+				param2Type = "length"
+
+			out.append('\t{"%s", %s, iface_%s, {iface_%s, iface_%s}}%s' % (
+				name, features["Value"], returnType, param1Type, param2Type, comma
+			))
+
+		out.append("};")
+	else:
+		out.append('{"",0,iface_void,{iface_void,iface_void}} };')
+
+
+	out.append("")
+	out.append("static IFaceProperty ifaceProperties[] = {")
+	if properties:
+		lastName = properties[-1][0]
+		for propname, property in properties:
+			comma = "" if propname == lastName else ","
+			out.append('\t{"%s", %s, %s, iface_%s, iface_%s}%s' % (
+				propname,
+				property["GetterValue"],
+				property["SetterValue"],
+				property["PropertyType"], property["IndexParamType"],
+				comma
+			))
+
+		out.append("};")
+		out.append("")
+	else:
+		out.append('{"", 0, iface_void, iface_void} };')
+
+	out.append("enum {")
+	out.append("\tifaceFunctionCount = %d," % len(functions))
+	out.append("\tifaceConstantCount = %d," % len(constants))
+	out.append("\tifacePropertyCount = %d" % len(properties))
+	out.append("};")
+	out.append("")
+	return out
+
+def convertStringResult(s):
+	if s == "stringresult":
+		return "string"
+	else:
+		return s
+
+def idsFromDocumentation(filename):
+	""" Read the Scintilla documentation and return a list of all the features
+	in the same order as they are explained in the documentation.
+	Also include the previous header with each feature. """
+	idsInOrder = []
+	segment = ""
+	with open(filename) as f:
+		for l in f:
+			if "<h2" in l:
+				segment = l.split(">")[1].split("<")[0]
+			if 'id="SCI_' in l:
+				idFeature = l.split('"')[1]
+				#~ print(idFeature)
+				idsInOrder.append([segment, idFeature])
+	return idsInOrder
+
+nonScriptableTypes = ["cells", "textrange", "findtext", "formatrange"]
+
+def printIFaceTableHTMLFile(faceAndIDs):
+	out = []
+	f, ids, idsInOrder = faceAndIDs
+	(constants, functions, properties) = GetScriptableInterface(f)
+	explanations = {}
+	for name, features in functions:
+		featureDefineName = "SCI_" + name.upper()
+		explanation = ""
+		href = ""
+		hrefEnd = ""
+		href = "<a href='https://www.scintilla.org/ScintillaDoc.html#" + featureDefineName + "'>"
+		hrefEnd = "</a>"
+
+		if features['Param1Type'] in nonScriptableTypes or features['Param2Type'] in nonScriptableTypes:
+			#~ print(name, features)
+			continue
+
+		parameters = ""
+		stringresult = ""
+		if features['Param2Type'] == "stringresult":
+			stringresult = "string "
+			if features['Param1Name'] and features['Param1Name'] != "length":
+				parameters += features['Param1Type'] + " " + features['Param1Name']
+		else:
+			if features['Param1Name']:
+				parameters += ConvertEnu(features['Param1Type']) + " " + features['Param1Name']
+				if features['Param1Name'] == "length" and features['Param2Type'] == "string":
+					# special case removal
+					parameters = ""
+			if features['Param2Name']:
+				if parameters:
+					parameters += ", "
+				parameters += ConvertEnu(features['Param2Type']) + " " + features['Param2Name']
+
+		returnType = stringresult
+		if not returnType and Face.IsEnumeration(features["ReturnType"]):
+			returnType = "int "
+		if not returnType and features["ReturnType"] != "void":
+			returnType = convertStringResult(features["ReturnType"]) + " "
+
+		explanation += '%seditor:%s%s%s(%s)' % (
+			returnType,
+			href,
+			name,
+			hrefEnd,
+			parameters
+		)
+		if features["Comment"]:
+			explanation += '<span class="comment">%s</span>' % CommentString(features)
+
+		explanations[featureDefineName] = explanation
+
+	for propname, property in properties:
+		functionName = property['SetterName'] or property['GetterName']
+		featureDefineName = "SCI_" + functionName.upper()
+		explanation = ""
+		href = "<a href='https://www.scintilla.org/ScintillaDoc.html#" + featureDefineName + "'>"
+		hrefEnd = "</a>"
+
+		direction = ""
+		if not property['SetterName']:
+			direction = " read-only"
+		if not property['GetterName']:
+			direction = " write-only"
+		indexExpression = ""
+		if property["IndexParamType"] != "void":
+			indexExpression = "[" + property["IndexParamType"] + " " + property["IndexParamName"] + "]"
+
+		explanation += '%s editor.%s%s%s%s%s' % (
+			convertStringResult(property["PropertyType"]),
+			href,
+			propname,
+			hrefEnd,
+			indexExpression,
+			direction
+		)
+		if property["SetterComment"]:
+			explanation += '<span class="comment">%s</span>' % (property["SetterComment"].replace("<", "&lt;"))
+		explanations[featureDefineName] = explanation
+
+	lastSegment = ""
+	for segment, featureId in idsInOrder:
+		if featureId in explanations:
+			if segment != lastSegment:
+				out.append('\t<h2>' + segment + '</h2>')
+				lastSegment = segment
+			out.append('\t<p>' + explanations[featureId] + '</p>')
+	out.append("")
+	return out
+
+def ReadMenuIDs(filename):
+	ids = []
+	f = open(filename)
+	try:
+		for l in f:
+			if l.startswith("#define"):
+				#~ print l
+				try:
+					_d, name, number = l.split()
+					if name.startswith("IDM_"):
+						ids.append((name, {"Value":number}))
+				except ValueError:
+					# No value present
+					pass
+	finally:
+		f.close()
+	return ids
+
+def RegenerateAll():
+	faceLex = Face.Face()
+	faceLex.ReadFromFile(srcRoot + "/lexilla/include/LexicalStyles.iface")
+	face = Face.Face()
+	face.ReadFromFile(srcRoot + "/scintilla/include/Scintilla.iface")
+	menuIDs  = ReadMenuIDs(srcRoot + "/scite/src/SciTE.h")
+	idsInOrder = idsFromDocumentation(srcRoot + "/scintilla/doc/ScintillaDoc.html")
+	FileGenerator.Regenerate(srcRoot + "/scite/src/IFaceTable.cxx", "//", printIFaceTableCXXFile([face, faceLex, menuIDs]))
+	FileGenerator.Regenerate(srcRoot + "/scite/doc/PaneAPI.html", "<!--", printIFaceTableHTMLFile([face, menuIDs, idsInOrder]))
+
+if __name__=="__main__":
+	RegenerateAll()
diff --git a/scite-app/scite/scripts/RegenerateSource.py b/scite-app/scite/scripts/RegenerateSource.py
new file mode 100644
index 0000000..81b6ec7
--- /dev/null
+++ b/scite-app/scite/scripts/RegenerateSource.py
@@ -0,0 +1,330 @@
+#!/usr/bin/env python3
+# RegenerateSource.py - implemented 2013 by Neil Hodgson neilh@scintilla.org
+# Released to the public domain.
+
+# Regenerate the SciTE source files that list all the lexers and all the
+# properties files.
+# Should be run whenever a new lexer is added or removed.
+# Requires Python 3.6 or later
+# Most files are regenerated in place with templates stored in comments.
+# The VS .NET project file is generated into a different file as the
+# VS .NET environment will not retain comments when modifying the file.
+# The format of generation comments is documented in FileGenerator.py.
+
+# Regenerates Scintilla files by calling LexGen.RegenerateAll
+
+import datetime, pathlib, re, sys
+
+sciteBase = pathlib.Path(__file__).resolve().parent.parent
+baseDirectory = sciteBase.parent
+sciDirectory = baseDirectory / "scintilla"
+lexDirectory = baseDirectory / "lexilla"
+
+sys.path.append(str(sciDirectory / "scripts"))
+sys.path.append(str(lexDirectory / "scripts"))
+
+from FileGenerator import lineEnd, Generate, Regenerate, UpdateFile, UpdateLineInFile, ReplaceREInFile
+import ScintillaData
+import LexGen
+import LexillaData
+import LexillaGen
+import IFaceTableGen
+import commandsdoc
+
+sys.path.append(str(sciteBase))
+
+import win32.AppDepGen
+import gtk.AppDepGen
+
+neutralEncoding = "cp437"	# Each byte value is valid in cp437
+
+def FindCredits(historyFile, removeLinks=True):
+    credits = []
+    stage = 0
+    with historyFile.open(encoding="utf-8") as f:
+        for l in f.readlines():
+            l = l.strip()
+            if stage == 0 and l == "<table>":
+                stage = 1
+            elif stage == 1 and l == "</table>":
+                stage = 2
+            if stage == 1 and l.startswith("<td>"):
+                credit = l[4:-5]
+                if removeLinks and "<a" in l:
+                    title, _a, rest = credit.partition("<a href=")
+                    urlplus, _bracket, end = rest.partition(">")
+                    name = end.split("<")[0]
+                    url = urlplus[1:-1]
+                    credit = title.strip()
+                    if credit:
+                        credit += " "
+                    credit += name + " " + url
+                credits.append(credit)
+    return credits
+
+class SciTEData:
+    def __init__(self, sciteRoot):
+        # Discover version information
+        self.version = (sciteRoot / "version.txt").read_text().strip()
+        self.versionDotted = self.version[0] + '.' + self.version[1] + '.' + \
+            self.version[2]
+        self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
+        self.scintillaVersion = (sciteRoot / "src" / "scintillaVersion.txt").read_text().strip()
+        self.lexillaVersion = (sciteRoot / "src" / "lexillaVersion.txt").read_text().strip()
+
+        with (sciteRoot / "doc" / "SciTE.html").open() as f:
+            self.dateModified = [l for l in f.readlines() if "Date.Modified" in l]\
+                [0].split('\"')[3]
+            # 20130602
+            # index.html, SciTE.html
+            dtModified = datetime.datetime.strptime(self.dateModified, "%Y%m%d")
+            self.yearModified = self.dateModified[0:4]
+            monthModified = dtModified.strftime("%B")
+            dayModified = "%d" % dtModified.day
+            self.mdyModified = monthModified + " " + dayModified + " " + self.yearModified
+            # May 22 2013
+            # index.html, SciTE.html
+            self.dmyModified = dayModified + " " + monthModified + " " + self.yearModified
+            # 22 May 2013
+            # ScintillaHistory.html -- only first should change
+            self.myModified = monthModified + " " + self.yearModified
+
+        self.credits = FindCredits(sciteRoot / "doc" / "SciTEHistory.html")
+
+def UpdateVersionNumbers(sci, pathSciTE, lexVersion, scintillaVersion):
+    pathHeader = pathSciTE / "src" / "SciTE.h"
+    UpdateLineInFile(pathHeader,
+        '#define VERSION_SCITE',
+        '#define VERSION_SCITE "' + sci.versionDotted + '"')
+    UpdateLineInFile(pathHeader,
+        "#define VERSION_WORDS",
+        "#define VERSION_WORDS " + sci.versionCommad)
+    UpdateLineInFile(pathHeader,
+        '#define COPYRIGHT_DATES',
+        '#define COPYRIGHT_DATES "December 1998-' + sci.myModified + '"')
+    UpdateLineInFile(pathHeader,
+        '#define COPYRIGHT_YEARS',
+        '#define COPYRIGHT_YEARS "1998-' + sci.yearModified + '"')
+    UpdateLineInFile(pathHeader,
+        '#define VERSION_LEXILLA',
+        '#define VERSION_LEXILLA "' + lexVersion + '"')
+    UpdateLineInFile(pathHeader,
+        '#define VERSION_SCINTILLA',
+        '#define VERSION_SCINTILLA "' + scintillaVersion + '"')
+
+    pathDownload = pathSciTE / "doc" / "SciTEDownload.html"
+    UpdateLineInFile(pathDownload,
+        "       Release",
+        "       Release " + sci.versionDotted)
+    ReplaceREInFile(pathDownload,
+        r"/www.scintilla.org/([a-zA-Z]+)\d\d\d",
+        r"/www.scintilla.org/\g<1>" +  sci.version,
+        0)
+    ReplaceREInFile(pathDownload,
+        r"/www.scintilla.org/(wscite32_)\d\d\d",
+        r"/www.scintilla.org/\g<1>" +  sci.version)
+    ReplaceREInFile(pathDownload,
+        r"/www.scintilla.org/(Sc32_)\d\d\d",
+        r"/www.scintilla.org/\g<1>" +  sci.version)
+
+    pathMain = pathSciTE / "doc" / "SciTE.html"
+    UpdateLineInFile(pathMain,
+        '          <font color="#FFCC99" size="3"> Release version',
+        '          <font color="#FFCC99" size="3"> Release version ' + \
+        sci.versionDotted + '<br />')
+    UpdateLineInFile(pathMain,
+        '           Site last modified',
+        '           Site last modified ' + sci.mdyModified + '</font>')
+    UpdateLineInFile(pathMain,
+        '    <meta name="Date.Modified"',
+        '    <meta name="Date.Modified" content="' + sci.dateModified + '" />')
+
+    UpdateLineInFile(pathSciTE / "doc/SciTEHistory.html",
+        '\t\tReleased ',
+        '\t\tReleased ' + sci.dmyModified + '.')
+
+def OctalEscape(s):
+    result = []
+    for char in s:
+        # Python 3.x, s is a byte string
+        if char < 128:
+            result.append(chr(char))
+        else:
+            result.append("\%o" % char)
+    return ''.join(result)
+
+def UpdateEmbedded(pathSciTE, propFiles):
+    propFilesSpecial = ["SciTEGlobal.properties", "abbrev.properties"]
+    propFilesAll = propFilesSpecial + propFiles
+    linesEmbedded = []
+    for pf in propFilesAll:
+        fullPath = pathSciTE / "src" / pf
+        with fullPath.open(encoding=neutralEncoding) as fi:
+            fileBase = pathlib.Path(pf).stem
+            if pf not in propFilesSpecial:
+                linesEmbedded.append("\n" + "module " + fileBase + "\n")
+            for line in fi:
+                if not line.startswith("#"):
+                    linesEmbedded.append(line)
+            if not linesEmbedded[-1].endswith("\n"):
+                linesEmbedded[-1] += "\n"
+    textEmbedded = "".join(linesEmbedded)
+    pathEmbedded = pathSciTE / "src" / "Embedded.properties"
+    original = pathEmbedded.read_text(encoding=neutralEncoding)
+    if textEmbedded != original:
+        pathEmbedded.write_text(textEmbedded, encoding=neutralEncoding)
+        print("Changed %s" % pathEmbedded)
+
+def UpdateHistory(pathHistory, credits):
+    text = []
+    text.append("<table>")
+    text.append("      <tr>")
+    count = 0
+    for c in credits:
+        text.append("	<td>" + c + "</td>")
+        count = (count + 1) % 4
+        if count == 0:
+            text.append("      </tr><tr>")
+    text.append("      </tr>")
+    text.append("    </table>")
+    insertion = lineEnd.join(text)
+    # [^^] is trying to be . but . doesn't include \n.
+    ReplaceREInFile(pathHistory, r"<table>[^\0]*</table>", insertion)
+
+def ExtractItems(pathHistory):
+    markStart = "<h2>Releases</h2>"
+    markEnd = "scite446.zip"
+    items = []
+    with pathHistory.open(encoding=neutralEncoding) as history:
+        afterStart = False
+        for l in history:
+            if markEnd in l:
+                break
+            if afterStart:
+                if "</li>" in l or "<ul>" in l or "</ul>" in l or "<h3>" in l or "</h3>" in l:
+                    pass
+                elif "<li>" in l:
+                    items.append("")
+                elif "Lexilla became a separate project at this point." in l:
+                    pass
+                elif '<a href="https://www.scintilla.org/' in l:
+                    pass
+                elif re.match("Released \d+ \w+ \d+", l.strip()):
+                    #Released 5 March 2021.
+                    pass
+                else:
+                    items[-1] = items[-1] + l
+            if markStart in l:
+                afterStart = True
+    # Remove empty items
+    items = [i for i in items if i]
+    #print("|\n".join(items))
+    return items
+
+def CondenseItem(item):
+    return " ".join(l.strip() for l in item.splitlines())
+
+def NewItems(sciteHistory, items):
+    condensedHistory = [CondenseItem(i) for i in sciteHistory]
+    #~ print("SciTE condensed=\n   ", "\n    ".join(condensedHistory), "\n")
+    #~ print("Other condensed=\n   ", "\n    ".join([CondenseItem(i) for i in items]), "\n")
+    new = []
+    for item in items:
+        condensed = CondenseItem(item)
+        if condensed not in condensedHistory:
+            #~ print(f"New item:\n{condensed}\n{item}")
+            new.append(item)
+    return new
+
+def NewsFormatted(section, items):
+    text = "\t<li>" + section + "</li>" + lineEnd
+    text += "\t<ul>" + lineEnd
+    for item in items:
+        text += "\t\t<li>" + lineEnd
+        for t in item.splitlines():
+            text += "\t\t" + t.lstrip() + lineEnd
+        text += "\t\t</li>" + lineEnd
+    text += "\t</ul>" + lineEnd
+    return text
+
+def SortListInsensitive(l):
+    l.sort(key=lambda p: str(p).lower())
+
+def RegenerateAll():
+    sci = ScintillaData.ScintillaData(sciDirectory)
+    lex = LexillaData.LexillaData(lexDirectory)
+    pathSciTE = sciteBase
+    scite = SciTEData(pathSciTE)
+
+    # Generate HTML to document each property
+    # This is done because tags can not be safely put inside comments in HTML
+    documentProperties = list(lex.propertyDocuments.keys())
+    SortListInsensitive(documentProperties)
+    propertiesHTML = []
+    for k in documentProperties:
+        propertiesHTML.append("        <tr id='property-%s'>\n        <td>%s</td>\n        <td>%s</td>\n        </tr>" %
+            (k, k, lex.propertyDocuments[k]))
+
+    # Find all the SciTE properties files
+    otherProps = [
+        "abbrev.properties",
+        "Embedded.properties",
+        "SciTEGlobal.properties",
+        "SciTE.properties"]
+    propFilePaths = list((pathSciTE / "src").glob("*.properties"))
+    SortListInsensitive(propFilePaths)
+    propFiles = [f.name for f in propFilePaths if f.name not in otherProps]
+    SortListInsensitive(propFiles)
+
+    UpdateEmbedded(pathSciTE, propFiles)
+    Regenerate(pathSciTE / "win32" / "makefile", "#", propFiles)
+    Regenerate(pathSciTE / "win32" / "scite.mak", "#", propFiles)
+    Regenerate(pathSciTE / "src" / "SciTEProps.cxx", "//", lex.lexerProperties)
+    Regenerate(pathSciTE / "doc" / "SciTEDoc.html", "<!--", propertiesHTML)
+    
+    sciHistory = sciDirectory / "doc" / "ScintillaHistory.html"
+    sciCredits = ScintillaData.FindCredits(sciHistory, False)
+    sciItems = ExtractItems(sciHistory)
+    lexHistory = lexDirectory / "doc" / "LexillaHistory.html"
+    lexCredits = ScintillaData.FindCredits(lexHistory, False)
+    lexItems = ExtractItems(lexHistory)
+    pathHistory = pathSciTE / "doc" / "SciTEHistory.html"
+    sciteCredits = ScintillaData.FindCredits(pathHistory, False)
+    sciteItems = ExtractItems(pathHistory)
+
+    newFromSci = NewItems(sciteItems, sciItems)
+    newFromLex = NewItems(sciteItems, lexItems)
+    if newFromSci or newFromLex:
+        news = ""
+        if newFromLex:
+            news += NewsFormatted("Lexilla " + lex.versionDotted, newFromLex)
+        if newFromSci:
+            news += NewsFormatted("Scintilla " + sci.versionDotted, newFromSci)
+        contents = pathHistory.read_text("utf-8")
+        withAdditions = contents.replace(
+            r"    </ul>",
+            news + r"    </ul>",
+            1)
+        UpdateFile(pathHistory, withAdditions)
+
+    for c in sciCredits + lexCredits:
+        if c not in sciteCredits:
+            sys.stdout.buffer.write(f"new: {c}\n".encode("utf-8"))
+            sciteCredits.append(c)
+    UpdateHistory(pathHistory, sciteCredits)
+
+    sciteCreditsWithoutLinks = ScintillaData.FindCredits(pathHistory, True)
+
+    credits = [OctalEscape(c.encode("utf-8")) for c in sciteCreditsWithoutLinks]
+    Regenerate(pathSciTE / "src" / "Credits.cxx", "//", credits)
+
+    win32.AppDepGen.Generate()
+    gtk.AppDepGen.Generate()
+
+    UpdateVersionNumbers(scite, pathSciTE, lex.versionDotted, sci.versionDotted)
+
+LexGen.RegenerateAll(sciteBase.parent / "scintilla")
+LexillaGen.RegenerateAll(sciteBase.parent / "lexilla")
+RegenerateAll()
+IFaceTableGen.RegenerateAll()
+commandsdoc.RegenerateAll()
diff --git a/scite-app/scite/scripts/UpdateSizeInDocs.py b/scite-app/scite/scripts/UpdateSizeInDocs.py
new file mode 100644
index 0000000..4146a59
--- /dev/null
+++ b/scite-app/scite/scripts/UpdateSizeInDocs.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+# UpdateSizeInDocs.py
+# Update the documented sizes of downloads to match the current release.
+# Uses local build directory (../../../arc/upload<version>) on Neil's machine
+# so must be modified for other installations.
+# Implemented 2019 by Neil Hodgson neilh@scintilla.org
+# Requires Python 3.6 or later
+
+import pathlib
+
+downloadHome = "https://www.scintilla.org/"
+
+def ExtractFileName(s):
+    pre, _quote, rest = s.partition('"')
+    url, _quote, rest = rest.partition('"')
+    _domain, _slash, name = url.rpartition('/')
+    return name
+
+def FileSizeInMB(filePath):
+    size = filePath.stat().st_size
+    sizeInM = size / 1024 / 1024
+    roundToNearest = round(sizeInM * 10) / 10
+    return str(roundToNearest) + "M"
+
+def FileSizesInDirectory(base):
+    return {p.name : FileSizeInMB(p) for p in base.glob("*")}
+
+def UpdateFileSizes(scriptsPath):
+    sciteRoot = scriptsPath.parent
+    scintillaRoot = sciteRoot.parent / "scintilla"
+    lexillaRoot = sciteRoot.parent / "lexilla"
+    releaseRoot = sciteRoot.parent.parent / "arc"
+
+    uploadDocs = [
+        sciteRoot / "doc" / "SciTEDownload.html",
+        scintillaRoot / "doc" / "ScintillaDownload.html",
+        lexillaRoot / "doc" / "LexillaDownload.html",
+    ]
+
+    version = (scintillaRoot / "version.txt").read_text().strip()
+    currentRelease = releaseRoot / ("upload" + version)
+    fileSizes = FileSizesInDirectory(currentRelease)
+    if not fileSizes:
+        print("No files in", currentRelease)
+
+    for docFileName in uploadDocs:
+        outLines = ""
+        changes = False
+        with docFileName.open() as docFile:
+            for line in docFile:
+                if downloadHome in line and '(' in line and ')' in line:
+                    fileName = ExtractFileName(line)
+                    if fileName in fileSizes:
+                        pre, bracket, rest = line.partition('(')
+                        size, rbracket, end = rest.partition(')')
+                        if size != fileSizes[fileName]:
+                            line = pre + bracket + fileSizes[fileName] + rbracket + end
+                            changes = True
+                            print(f"{size} -> {fileSizes[fileName]} {fileName}")
+                outLines += line
+        if changes:
+            print("Updating", docFileName)
+            docFileName.write_text(outLines)
+
+if __name__=="__main__":
+    UpdateFileSizes(pathlib.Path(__file__).resolve().parent)
diff --git a/scite-app/scite/scripts/archive.sh b/scite-app/scite/scripts/archive.sh
new file mode 100644
index 0000000..cdc035b
--- /dev/null
+++ b/scite-app/scite/scripts/archive.sh
@@ -0,0 +1,17 @@
+# Up to parent directory of scite
+cd ../..
+
+# Archive both Scintilla and SciTE to scite-clean
+rm -rf scite-clean
+hg archive --repository scintilla scite-clean/scintilla
+hg archive --repository scite scite-clean/scite
+
+# tar both scintilla and scite into scite.tgz
+rm -f scite.tgz
+(
+cd scite-clean || exit
+tar -czf ../scite.tgz scintilla scite
+)
+
+# Remove temporary directory
+rm -rf scite-clean
diff --git a/scite-app/scite/scripts/ba b/scite-app/scite/scripts/ba
new file mode 100644
index 0000000..f2b49ec
--- /dev/null
+++ b/scite-app/scite/scripts/ba
@@ -0,0 +1,13 @@
+sci_base=`pwd`
+cd $sci_base/scintilla/gtk
+make $*
+cd $sci_base/scite/gtk
+make $*
+#make install $*
+cd $sci_base/scintilla
+sh tgzsrc
+cd $sci_base/scite
+sh tgzsrc
+cd $sci_base/scite
+sh tgzgscite
+
diff --git a/scite-app/scite/scripts/builddist.bat b/scite-app/scite/scripts/builddist.bat
new file mode 100644
index 0000000..d40121c
--- /dev/null
+++ b/scite-app/scite/scripts/builddist.bat
@@ -0,0 +1,123 @@
+:: builddist.bat
+:: Build all of Scintilla and SciTE for distribution and place into a subdirectory called upload%SCINTILLA_VERSION%
+:: This batch file is distributed inside scite but is commonly copied out into its own working directory
+:: Does not yet handle Scintilla and Lexilla with different version numbers
+
+:: Requires hg and zip to be in the path. nmake, cl, and link are found by vcvars*.bat
+
+:: Define local paths here
+
+set "MSVC_DIRECTORY=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build"
+set "MSVC17_DIRECTORY=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build"
+set REPOSITORY_DIRECTORY=..\hg
+
+:: Discover the Scintilla version as that is used in file and directory names
+for /F %%i IN (%REPOSITORY_DIRECTORY%\scintilla\version.txt) do set "SCINTILLA_VERSION=%%i"
+set "UPLOAD_DIRECTORY=upload%SCINTILLA_VERSION%"
+
+:: Clean then copy from archive into scintilla and scite subdirectories
+
+rd /s/q lexilla scintilla scite
+del/q Sc1.exe
+
+git clone %REPOSITORY_DIRECTORY%/lexilla lexilla
+hg archive -R %REPOSITORY_DIRECTORY%/scintilla scintilla
+hg archive -R %REPOSITORY_DIRECTORY%/scite scite
+
+:: Create source archives
+pushd lexilla
+call zipsrc
+popd
+hg archive -R %REPOSITORY_DIRECTORY%/scintilla scintilla.zip
+pushd scite
+call zipsrc
+popd
+
+:: Build the 64-bit executables
+setlocal
+call "%MSVC_DIRECTORY%\vcvars64.bat"
+
+pushd lexilla
+pushd src
+nmake -f lexilla.mak SUPPORT_XP=1
+popd
+popd
+
+pushd scintilla
+pushd win32
+nmake -f scintilla.mak SUPPORT_XP=1
+popd
+del/q bin\*.pdb
+popd
+
+pushd scite
+pushd win32
+nmake -f scite.mak SUPPORT_XP=1
+popd
+copy bin\Sc1.exe ..\Sc1.exe
+call zipwscite
+popd
+
+:: Copy into correctly numbered upload directory
+echo %UPLOAD_DIRECTORY%
+mkdir upload%SCINTILLA_VERSION%
+copy lexilla.zip %UPLOAD_DIRECTORY%\lexilla%SCINTILLA_VERSION%.zip
+copy scintilla.zip %UPLOAD_DIRECTORY%\scintilla%SCINTILLA_VERSION%.zip
+copy scite.zip %UPLOAD_DIRECTORY%\scite%SCINTILLA_VERSION%.zip
+copy wscite.zip %UPLOAD_DIRECTORY%\wscite%SCINTILLA_VERSION%.zip
+copy Sc1.exe %UPLOAD_DIRECTORY%\Sc%SCINTILLA_VERSION%.exe
+
+:: Clean all
+pushd scite
+call delbin
+popd
+pushd scintilla
+call delbin
+popd
+pushd lexilla
+call delbin
+popd
+
+endlocal
+
+:: Build the 32-bit executables with MSVC 2017 as it suports XP
+call "%MSVC17_DIRECTORY%\vcvars32.bat"
+
+pushd lexilla
+pushd src
+nmake -f lexilla.mak SUPPORT_XP=1
+popd
+popd
+
+pushd scintilla
+pushd win32
+nmake -f scintilla.mak SUPPORT_XP=1
+popd
+del/q bin\*.pdb
+popd
+
+pushd scite
+pushd win32
+nmake -f scite.mak SUPPORT_XP=1
+popd
+move bin\SciTE.exe bin\SciTE32.exe
+copy bin\Sc1.exe ..\Sc1.exe
+call zipwscite
+popd
+
+:: Copy into correctly numbered upload directory
+copy wscite.zip %UPLOAD_DIRECTORY%\wscite32_%SCINTILLA_VERSION%.zip
+copy Sc1.exe %UPLOAD_DIRECTORY%\Sc32_%SCINTILLA_VERSION%.exe
+
+:: Clean all
+pushd scite
+call delbin
+popd
+pushd scintilla
+call delbin
+popd
+pushd lexilla
+call delbin
+popd
+
+:: scintilla and scite directories remain so can be examined if something went wrong
\ No newline at end of file
diff --git a/scite-app/scite/scripts/checkbuildlinux.sh b/scite-app/scite/scripts/checkbuildlinux.sh
new file mode 100755
index 0000000..5d830e8
--- /dev/null
+++ b/scite-app/scite/scripts/checkbuildlinux.sh
@@ -0,0 +1,204 @@
+# Script to build Scintilla and SciTE for Linux with most supported build files.
+# Both gcc and clang are used for both GTK+ 2 and 3 and the clang static analyzer
+# run for GTK+2.
+# All three Qt libraries are built with gcc.
+# Current directory should be scite\scripts before running.
+
+# Pre-requisite packages on Ubuntu:
+# sudo apt-get install --yes g++
+# sudo apt-get install --yes libgtk-3-dev
+# sudo apt-get install --yes libgtk2.0-dev
+# sudo apt-get install --yes clang
+# sudo apt-get install --yes qtcreator
+# sudo apt-get install --yes python-dev
+# sudo apt-get install --yes libshiboken-dev
+# sudo apt-get install --yes shiboken
+# sudo apt-get install --yes libpyside-dev
+# sudo apt-get install --yes python-pyside
+# sudo apt-get install --yes cppcheck
+
+# Pre-requisite packages on Fedora:
+# sudo yum install -y gcc-c++
+# sudo yum install -y gtk3-devel
+# sudo yum install -y gtk2-devel
+# sudo yum install -y clang
+# sudo yum install -y qt-creator
+# sudo yum install -y python-devel
+# sudo yum install -y shiboken-devel
+# sudo yum install -y python-pyside-devel
+
+# On Fedora 17, qmake is called qmake-qt4 so sepbuild.py should probe for correct name.
+# There are also problems with clang failing in the g++ 4.7 headers.
+
+# Turn off glib deprecation warnings since gtk headers use deprecated items
+NO_GLIB_DEPRECATIONS="CXXFLAGS=-D GLIB_DISABLE_DEPRECATION_WARNINGS"
+
+# Run commands in parallel up to number of processors
+JOBS="--jobs=$(getconf _NPROCESSORS_ONLN)"
+
+cd ../..
+
+# ************************************************************
+# Target 1: gcc build for GTK+ 2
+(
+cd scintilla/test/unit || exit
+make clean
+make "$JOBS" test
+make clean
+)
+
+(
+cd lexilla/src || exit
+make clean
+make "$JOBS"
+)
+(
+cd lexilla/test || exit
+make clean
+make test
+make clean
+)
+(
+cd lexilla/test/unit || exit
+make clean
+make test
+make clean
+)
+
+(
+cd scintilla/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" GTK2=1
+)
+
+(
+cd scite/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" GTK2=1
+)
+
+# ************************************************************
+# Target 2: gcc build for GTK+ 3
+(
+cd scintilla/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" GTK3=1
+)
+
+(
+cd scite/gtk || exit
+make clean
+make "$JOBS" GTK3=1
+)
+
+# ************************************************************
+# Target 3: Qt builds
+# Requires Qt development libraries and qmake to be installed
+
+# Find best available qmake
+QMAKENAME=""
+if hash qmake-qt5 2>/dev/null; then
+	QMAKENAME="qmake-qt5"
+elif hash qmake 2>/dev/null; then
+	QMAKENAME="qmake -qt=5"
+elif hash qmake-qt4 2>/dev/null; then
+	QMAKENAME="qmake-qt4"
+fi
+
+(
+cd scintilla/qt || exit
+
+(
+cd ScintillaEditBase || exit
+$QMAKENAME
+make clean
+make "$JOBS"
+make distclean
+)
+
+(
+cd ScintillaEdit || exit
+python3 WidgetGen.py
+$QMAKENAME
+make clean
+make "$JOBS"
+make distclean
+)
+
+(
+cd ScintillaEditPy || exit
+python2 sepbuild.py
+cd ../../test || exit
+python2 simpleTests.py
+python2 lexTests.py
+python2 performanceTests.py
+cd ../qt/ScintillaEditPy || exit
+python2 sepbuild.py --clean
+)
+
+)
+
+# ************************************************************
+# Target 4: clang build for GTK+ 2
+(
+cd lexilla/src || exit
+make clean
+make "$JOBS" CLANG=1 GTK2=1
+)
+
+(
+cd scintilla/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" CLANG=1 GTK2=1
+)
+
+(
+cd scite/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" CLANG=1 GTK2=1
+)
+
+# ************************************************************
+# Target 5: clang build for GTK+ 3
+(
+cd scintilla/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" CLANG=1 GTK3=1
+)
+
+(
+cd scite/gtk || exit
+make clean
+make "$JOBS" CLANG=1 GTK3=1
+)
+
+# ************************************************************
+# Target 6: clang analyze for GTK+ 2
+(
+cd lexilla/src || exit
+make clean
+make "$JOBS" CLANG=1 analyze
+)
+
+(
+cd scintilla/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" analyze
+)
+
+(
+cd scite/gtk || exit
+make clean
+make "$JOBS" "$NO_GLIB_DEPRECATIONS" analyze
+make clean
+cd ../..
+cd scintilla/gtk || exit
+make clean
+)
+
+# ************************************************************
+# Target 7: cppcheck static checker
+# Disabled as there are false warnings and some different style choices
+cppcheck --enable=all --max-configs=120 --suppressions-list=lexilla/cppcheck.suppress -I lexilla/include -I lexilla/lexlib --template=gcc --quiet lexilla
+cppcheck --enable=all --max-configs=100 --suppressions-list=scintilla/cppcheck.suppress -I scintilla/src -I scintilla/include -I scintilla/qt/ScintillaEditBase "-DSTDMETHODIMP_(type) type STDMETHODCALLTYPE" --template=gcc --quiet scintilla
+cppcheck --enable=all --max-configs=100 --suppressions-list=scite/cppcheck.suppress -I scite/src -I scintilla/include -I scite/lua/src -Ulua_assert -DPATH_MAX=260 --template=gcc --quiet scite
diff --git a/scite-app/scite/scripts/checkbuilds.bat b/scite-app/scite/scripts/checkbuilds.bat
new file mode 100755
index 0000000..ead0604
--- /dev/null
+++ b/scite-app/scite/scripts/checkbuilds.bat
@@ -0,0 +1,200 @@
+@rem Script to build SciTE for Windows with all the different
+@rem compilers and exercise all the projects and makefiles.
+@rem Current directory must be scite\scripts before running.
+@rem Contains references to local install directories on Neil's
+@rem machine so must be modified for other installations.
+@rem Assumes environment set up so gcc, MSVC amd cppcheck can be called.
+@rem
+@cd ..\..
+@rem Check that Scintilla and Lexilla have the same version number
+@for /F %%i IN (scintilla\version.txt) do set "SCINTILLA_VERSION=%%i"
+@for /F %%i IN (lexilla\version.txt) do set "LEXILLA_VERSION=%%i"
+@if [%SCINTILLA_VERSION%]==[%LEXILLA_VERSION%] goto VERSIONS_MATCH
+@echo checkbuilds.bat:12: Scintilla and Lexilla have different versions %SCINTILLA_VERSION%, %LEXILLA_VERSION%
+goto CLEANUP
+:VERSIONS_MATCH
+@rem
+rem ************************************************************
+rem Target 1: basic unit tests with gcc
+@call scite\scripts\clearboth
+@pushd scintilla\test\unit
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+.\unitTest
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 2: Build and check Lexilla
+@call scite\scripts\clearboth
+@pushd lexilla\src
+mingw32-make clean
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd lexilla\test
+mingw32-make clean
+mingw32-make test
+@popd
+@pushd lexilla\test\unit
+mingw32-make clean
+mingw32-make test
+@popd
+@rem
+rem ************************************************************
+rem Target 3: Normal gcc build
+@call scite\scripts\clearboth
+@pushd scintilla\win32
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd lexilla\src
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd scintilla\test
+pythonw simpleTests.py
+pythonw performanceTests.py
+pythonw win32Tests.py
+pythonw simpleTests.py -large
+@popd
+@pushd scite\win32
+mingw32-make -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 4: Microsoft VC++ build
+@call scite\scripts\clearboth
+@pushd scintilla\win32
+cl
+nmake -f scintilla.mak QUIET=1
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd lexilla\src
+nmake -f lexilla.mak QUIET=1
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd scintilla\test
+pythonw simpleTests.py
+pythonw performanceTests.py
+pythonw win32Tests.py
+@popd
+@pushd scite\win32
+nmake -f scite.mak QUIET=1
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 5: Visual C++ using scintilla\win32\Scintilla.vcxproj and scite\win32\SciTE.vcxproj
+@echo on
+@call scite\scripts\clearboth
+@pushd scintilla\win32
+msbuild /verbosity:minimal /p:Platform=Win32 /p:Configuration=Release Scintilla.vcxproj
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@call scite\scripts\clearboth
+@pushd scite\win32
+msbuild /verbosity:minimal /p:Platform=Win32 /p:Configuration=Release SciTE.vcxproj
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 6: GTK+ version using gcc on scintilla\gtk\makefile
+@call scite\scripts\clearboth
+@pushd scintilla\gtk
+set PATH=c:\opt\gtk\bin;%PATH%
+rem -Wno-parentheses is temporary for GTK+ header gtkfilechooserbutton.h
+mingw32-make -j CXXFLAGS=-Wno-parentheses static
+@if ERRORLEVEL 2 goto ERROR
+@popd ..\..
+@rem
+rem ************************************************************
+rem Target 7: Visual C++ 64 bit
+@call scite\scripts\clearboth
+@pushd lexilla\src
+msbuild /verbosity:minimal /p:Platform=x64 /p:Configuration=Release Lexilla.vcxproj
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd scintilla\win32
+msbuild /verbosity:minimal /p:Platform=x64 /p:Configuration=Release Scintilla.vcxproj
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@call scite\scripts\clearboth
+@pushd scite\win32
+msbuild /verbosity:minimal /p:Platform=x64 /p:Configuration=Release SciTE.vcxproj
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 8: Clang analyze
+REM ~ call scite\scripts\clearboth
+REM ~ set PATH=c:\mingw32-dw2\bin;%PATH%
+REM ~ cd scintilla\win32
+REM ~ mingw32-make CLANG=1 analyze
+REM ~ if ERRORLEVEL 2 goto ERROR
+REM ~ cd ..\..\scite\win32
+REM ~ mingw32-make CLANG=1 analyze
+REM ~ if ERRORLEVEL 2 goto ERROR
+REM ~ cd ..\..
+@rem
+rem ************************************************************
+rem Target 9: Clang build
+@call scite\scripts\clearboth
+@pushd scintilla\win32
+mingw32-make CLANG=1 -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd lexilla\src
+mingw32-make CLANG=1 -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd scintilla\test
+pythonw simpleTests.py
+pythonw performanceTests.py
+pythonw win32Tests.py
+@popd
+@pushd scite\win32
+mingw32-make CLANG=1 -j
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 10: qt with msvc
+@call scite\scripts\clearboth
+@set QBIN=C:\Qt\5.14.2\msvc2017_64\bin
+@pushd scintilla\qt\ScintillaEditBase
+%QBIN%\qmake
+nmake
+nmake distclean
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@pushd scintilla\qt\ScintillaEdit
+pyw WidgetGen.py
+%QBIN%\qmake
+nmake
+nmake distclean
+@if ERRORLEVEL 2 goto ERROR
+@popd
+@rem
+rem ************************************************************
+rem Target 11: cppcheck
+@call scite\scripts\clearboth
+cppcheck -j 8 --enable=all --suppressions-list=lexilla/cppcheck.suppress --max-configs=120 -I lexilla/include -I lexilla/access -I lexilla/lexlib -I scintilla/include --template=gcc --quiet lexilla
+cppcheck -j 8 --enable=all --suppressions-list=scintilla/cppcheck.suppress --max-configs=100 -I scintilla/src -I scintilla/include -I scintilla/qt/ScintillaEditBase "-DSTDMETHODIMP_(type) type STDMETHODCALLTYPE" --template=gcc --quiet scintilla
+cppcheck -j 8 --enable=all --suppressions-list=scite/cppcheck.suppress --max-configs=100 -I scite/src -I lexilla/include -I lexilla/access -I scintilla/include -I scite/lua/src -Ulua_assert -DINVALID_HANDLE_VALUE=((HANDLE)(LONG_PTR)-1) --template=gcc --quiet scite
+@rem
+rem ************************************************************
+rem Target 12: header order check
+pyw scintilla\scripts\HeaderCheck.py scintilla\scripts\HeaderOrder.txt
+pyw scintilla\scripts\HeaderCheck.py lexilla\scripts\HeaderOrder.txt
+pyw scintilla\scripts\HeaderCheck.py scite\scripts\HeaderOrder.txt
+@rem
+rem Finished
+@call scite\scripts\clearboth
+goto CLEANUP
+:ERROR
+@echo checkbuilds.bat:1: Failed %ERRORLEVEL%
+:CLEANUP
+@set SAVE_PATH=
+@set SAVE_INCLUDE=
diff --git a/scite-app/scite/scripts/clearboth.bat b/scite-app/scite/scripts/clearboth.bat
new file mode 100755
index 0000000..fcc1813
--- /dev/null
+++ b/scite-app/scite/scripts/clearboth.bat
@@ -0,0 +1,12 @@
+@rem clearboth.bat - script to clear both scintilla and scite
+@rem directory trees of all compiler output files.
+@rem Current directory must be parent of scintilla and scite before running.
+@pushd lexilla
+@call delbin
+@popd
+@pushd scintilla
+@call delbin
+@popd
+@pushd scite
+@call delbin
+@popd
diff --git a/scite-app/scite/scripts/commandsdoc.py b/scite-app/scite/scripts/commandsdoc.py
new file mode 100755
index 0000000..f0360f0
--- /dev/null
+++ b/scite-app/scite/scripts/commandsdoc.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Requires Python 3.6 or later
+
+from __future__ import with_statement
+
+import os, sys
+
+scintillaDirectory = os.path.join("..", "..", "scintilla")
+scintillaScriptsDirectory = os.path.join(scintillaDirectory, "scripts")
+sys.path.append(scintillaScriptsDirectory)
+import Face
+
+def head(s):
+	return "<th>%s</th>" % s
+
+def cell(s):
+	return "<td>%s</td>" % s
+
+def faceFeatures(out):
+	out.write("<h2>Scintilla key commands</h2>\n")
+	out.write("<table>\n")
+	out.write("<thead><tr>%s%s%s</tr></thead>\n" % (head("Command"), head("Name"), head("Explanation")))
+	face = Face.Face()
+	face.ReadFromFile(os.path.join(scintillaDirectory, "include", "Scintilla.iface"))
+	texts = []
+	for name in face.features:
+		#~ print name
+		f = face.features[name]
+		if f["FeatureType"] == "fun" and \
+			f["ReturnType"] == "void" and \
+			not (f["Param1Type"] or f["Param2Type"]):
+			texts.append([name, f["Value"], " ".join(f["Comment"])])
+	texts.sort()
+	for t in texts:
+		out.write("<tr>%s%s%s</tr>\n" % (cell(t[1]), cell(t[0]), cell(t[2])))
+	out.write("</table>\n")
+
+def menuFeatures(out):
+	out.write("<h2>SciTE menu commands</h2>\n")
+	out.write("<table>\n")
+	out.write("<thead><tr>%s%s</tr></thead>\n" % (head("Command"), head("Menu text")))
+	with open(os.path.join("..", "win32", "SciTERes.rc"), "rt") as f:
+		for l in f:
+			l = l.strip()
+			if l.startswith("MENUITEM") and "SEPARATOR" not in l:
+				l = l.replace("MENUITEM", "").strip()
+				text, symbol = l.split('",', 1)
+				symbol = symbol.strip()
+				text = text[1:].replace("&", "").replace("...", "")
+				if "\\t" in text:
+					text = text.split("\\t",1)[0]
+				if text:
+					out.write("<tr><td>%s</td><td>%s</td></tr>\n" % (symbol, text))
+	out.write("</table>\n")
+
+startFile = """
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--Generated by scite/scripts/commandsdoc.py -->
+<style type="text/css">
+    table { border: 1px solid #1F1F1F; border-collapse: collapse; }
+    td { border: 1px solid; border-color: #E0E0E0 #000000; padding: 1px 5px 1px 5px; }
+    th { border: 1px solid #1F1F1F; padding: 1px 5px 1px 5px; }
+    thead { background-color: #000000; color: #FFFFFF; }
+</style>
+<body>
+"""
+
+def RegenerateAll():
+	with open(os.path.join("..", "doc", "CommandValues.html"), "w") as out:
+		out.write(startFile)
+		menuFeatures(out)
+		faceFeatures(out)
+		out.write("</body>\n</html>\n")
+
+if __name__ == "__main__":
+	RegenerateAll()
diff --git a/scite-app/scite/scripts/makerpms.py b/scite-app/scite/scripts/makerpms.py
new file mode 100755
index 0000000..e731291
--- /dev/null
+++ b/scite-app/scite/scripts/makerpms.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# makerpms.py
+# Copy files all over the place build RPMs and copy to top level directory
+# Contributed file - not tested before releases made.
+
+import os
+import shutil
+srcRoot = "../../"
+rpmRoot = "/usr/src/redhat/SOURCES/"
+rpmBin = "/usr/src/redhat/RPMS/i386/"
+rpmSource = "/usr/src/redhat/SRPMS/"
+
+verFileName = srcRoot + "scintilla/version.txt"
+vers = open(verFileName)
+#139
+vFull = vers.read().strip()
+vers.close()
+
+#1.39
+vPoint = vFull[0] + "." + vFull[1:]
+
+#1, 3, 9, 0
+vComma = vFull[0] + ", " + vFull[1] + ", " + vFull[2] + ", 0"
+
+print("[ %s | %s | %s ]" % (vFull, vPoint, vComma))
+
+tgzV = "scite" + vFull + ".tgz"
+tgzFileName = srcRoot + "scite.tgz"
+tgzVFileName = srcRoot + tgzV
+
+print("[ %s | %s ]" % (tgzFileName, tgzVFileName))
+
+if not os.access(tgzFileName, os.F_OK):
+	print("Base file '" + tgzFileName + "' does not exist.")
+else:
+	shutil.copyfile(tgzFileName, tgzVFileName)
+	os.unlink(tgzFileName)
+
+	rpmVFileName = rpmRoot + tgzV
+
+	shutil.copyfile(tgzVFileName, rpmVFileName)
+
+	# Run the rpm build command
+	os.system("rpm -ba scite.spec")
+
+	rpmB = "scite-" + vPoint + "-1.i386.rpm"
+	shutil.copyfile(rpmBin + rpmB, srcRoot + rpmB)
+	rpmS = "scite-" + vPoint + "-1.src.rpm"
+	shutil.copyfile(rpmSource + rpmS, srcRoot + rpmS)
+
diff --git a/scite-app/scite/scripts/scite.spec b/scite-app/scite/scripts/scite.spec
new file mode 100644
index 0000000..fc4edab
--- /dev/null
+++ b/scite-app/scite/scripts/scite.spec
@@ -0,0 +1,98 @@
+#
+# SciTE code editor using the Scintilla editing component
+# SciTE had syntax highlighting and support for building and running programs
+#
+# This package contains the gtk enabled varsion, distributed as a binary
+# tarball from http://www.scintilla.org/SciTE.html
+#
+# The tarball is named gscite???.tgz, however the actual name of the app
+# is still SciTE.
+#
+# This package name purposely uses all lower case letters in the its package
+# name so that one can issue the command "rpm -q scite" without having to
+# remember the exact case of all the letters. However, none of the files
+# contained in this package have been renamed.
+#
+#
+####
+
+Name:           scite
+Version:        1.39
+Release:        1
+Summary:        SciTE code editor with syntax highlighting for building and running programs.
+Group:          Applications/Editors
+Copyright:      Python-Type License
+Vendor:         Scintilla by Neil Hodgson
+URL:            http://www.scintilla.org/SciTE.html
+Packager:       AAP <devel@aminvestments.com> Victor Soroka <vs240@yahoo.com>
+Source0:	http://www.scintilla.org/scite139.tgz
+BuildRoot:      /var/tmp/scite-%{version}-rootdir
+Requires:       gtk+ >= 1.2.0
+
+%description
+SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to
+be a generally useful editor with facilities for building and running programs. It is best used for
+jobs with simple configurations - I use it for building test and demonstration programs as well
+as SciTE and Scintilla, themselves.
+
+SciTE is currently available for Intel Win32 and Linux compatible operating systems with
+GTK+.
+
+##########
+#
+# The following environment variables are automatically defined for use
+# in any of the following shell scripts:
+#
+#   RPM_SOURCE_DIR      { where sources originally reside }
+#   RPM_BUILD_DIR       { where sources get unpacked into }
+#   RPM_DOC_DIR
+#   RPM_OPT_FLAGS
+#   RPM_ARCH
+#   RPM_OS
+#   RPM_ROOT_DIR
+#   RPM_BUILD_ROOT      { where final images get placed before packaging }
+#   RPM_PACKAGE_NAME
+#   RPM_PACKAGE_VERSION
+#   RPM_PACKAGE_RELEASE
+#
+##########
+
+%prep
+%setup -q -c {name}-%{version}
+
+%build
+cd $RPM_BUILD_DIR/%{name}-%{version}/scintilla/gtk
+make
+cd $RPM_BUILD_DIR/%{name}-%{version}/scite/gtk
+make
+
+####
+# Section: Install-After-Build Script (Often Just 'make install')
+####
+%install
+rm -rf $RPM_BUILD_ROOT
+install -m0755 --directory      $RPM_BUILD_ROOT/usr/bin
+install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/scite
+install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/man/man1
+install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/pixmaps
+install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/gnome/apps/Applications
+cd $RPM_BUILD_DIR/%{name}-%{version}/scite/gtk
+make gnomeprefix=$RPM_BUILD_ROOT/usr install
+install -m 0644 $RPM_BUILD_DIR/%{name}-%{version}/scite/doc/scite.1 $RPM_BUILD_ROOT/usr/share/man/man1
+mv $RPM_BUILD_ROOT/usr/share/gnome/apps/Applications $RPM_BUILD_ROOT/usr/share/gnome/apps/Development
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+
+
+
+%files
+%defattr(-, root, root)
+%attr(0644,root,root)	%doc 	scite/doc/*.html scite/doc/*.png scite/doc/*.jpg
+%attr(0755,root,root)	%dir	/usr/share/scite
+%attr(0755,root,root)	/usr/bin/SciTE
+%attr(0644,root,root)	/usr/share/scite/*
+%attr(0644,root,root)	/usr/share/pixmaps/Sci48M.png
+%attr(0644,root,root)	/usr/share/gnome/apps/Development/SciTE.desktop
+%attr(0644,root,root)	/usr/share/man/man1/scite.1*
diff --git a/scite-app/scite/scripts/tags2api.py b/scite-app/scite/scripts/tags2api.py
new file mode 100755
index 0000000..b9aa0c8
--- /dev/null
+++ b/scite-app/scite/scripts/tags2api.py
@@ -0,0 +1,135 @@
+#! /usr/bin/env python
+# Contributed file - not tested before releases made.
+
+# Produces a .api file for SciTE's identifier completion and calltip features.
+# invoke as
+# 	python tags2api.py tags >x.api
+# before running this program, create a tags file with
+# 	ctags --excmd=number --c-types=pcdgstu <header files>
+
+import fileinput
+import time
+
+# Definitions that start with _ are often used for infrastructure
+# like include guards and can be removed with
+removePrivate=1
+
+# The Windows headers include both ANSI and UniCode versions
+# of many functions with macros that default to one or the other.
+# When winMode is on, these 4 lines are replaced with either the
+# ANSI or UniCode prototype.
+winMode = 1
+include="A"	# Set to "W" if you want the UniCode prototypes.
+
+class FileCache:
+	'''Caches the contents of a set of files.
+	Avoids reading files repeatedly from disk by holding onto the
+	contents of each file as a list of strings.
+	'''
+
+	def __init__(self):
+		self.filecache = {}
+
+	def grabFile(self, filename):
+		'''Return the contents of a file as a list of strings.
+		New line characters are removed.
+		'''
+		if filename not in self.filecache:
+			contents=[]
+			f = open(filename)
+			for line in f.readlines():
+				if line[-1:] == '\n': line = line[:-1]
+				contents.append(line)
+			f.close()
+			self.filecache[filename] = contents
+		return self.filecache[filename]
+
+def bracesDiff(s):
+	''' Counts the number of '(' and ')' in a string and returns the difference between the two.
+	Used to work out when a function prototype is complete.
+	'''
+	diff = 0
+	mode=0 # 0 <=> default, 1 <=> comment, 2 <=> string
+	for i in range(len(s)):
+		if mode == 0: # default mode
+			if s[i]=='(':
+				diff += 1
+			elif s[i]==')':
+				diff -= 1
+			elif s[i]=='"':
+				mode=2
+			elif i>0 and s[i-1]=='/' and s[i]=='/':
+				return diff
+			elif i>0 and s[i-1]=='/' and s[i]=='*':
+				mode=1
+		elif mode == 1: # comment
+			if i>0 and s[i-1]=='*' and s[i]=='/':
+				mode=0
+		elif mode == 2: # string
+			if s[i]=='"':
+				mode=0
+	return diff
+
+fc = FileCache()
+apis = {}
+for line in fileinput.input():
+	if line[0] != '!':	# Not a comment.
+		(entityName, fileName, lineNo, tagType) = line.split("\t")[:4]
+		curLineNo = int(lineNo[:-2]) - 1	# -1 because line numbers in tags file start at 1.
+		contents = fc.grabFile(fileName)
+		if (not removePrivate or entityName[0] != '_') and not entityName.startswith("operator "):
+			if tagType[0] in "pf":	# Function prototype.
+				try:
+					braces = bracesDiff(contents[curLineNo])
+					curDef = contents[curLineNo]
+					while braces > 0:	# Search for end of prototype.
+						curLineNo = curLineNo + 1
+						braces = braces + bracesDiff(contents[curLineNo])
+						curDef = curDef + contents[curLineNo]
+					# Normalise the appearance of the prototype.
+					curDef = curDef.strip()
+					# Replace whitespace sequences with a single space character.
+					curDef = " ".join(curDef.split())
+					# Remove space around the '('.
+					curDef = curDef.replace(" (", '(').replace("( ", '(')
+					# Remove trailing semicolon.
+					curDef = curDef.replace(";", '')
+					# Remove implementation if present.
+					if "{" in curDef and "}" in curDef:
+						startImpl = curDef.find("{")
+						endImpl = curDef.find("}")
+						curDef = curDef[:startImpl] + curDef[endImpl+1:]
+					else:
+						# Remove trailing brace.
+						curDef = curDef.rstrip("{")
+					# Remove return type.
+					curDef = curDef[curDef.find(entityName):]
+					# Remove virtual indicator.
+					if curDef.replace(" ", "").endswith(")=0"):
+						curDef = curDef.rstrip("0 ")
+						curDef = curDef.rstrip("= ")
+					# Remove trailing space.
+					curDef = curDef.rstrip()
+					if winMode:
+						if curDef.find("A(") >= 0:
+							if "A" in include:
+								apis[curDef.replace("A(", '(')] = 1
+						elif curDef.find("W(") >= 0:
+							if "W" in include:
+								apis[curDef.replace("W(", '(')] = 1
+						else:	# A character set independent function.
+							apis[curDef] = 1
+					else:
+						apis[curDef] = 1
+				except IndexError:
+					pass
+			elif tagType[0] == 'd':	# Macro definition.
+				curDef = contents[curLineNo]
+				if (not winMode) or (curDef[-1] not in "AW"):
+					apis[entityName] = 1
+			else:
+				apis[entityName] = 1
+apisKeys = list(apis.keys())
+apisKeys.sort()
+print("\n".join(apisKeys))
+
diff --git a/scite-app/scite/src/Cookie.cxx b/scite-app/scite/src/Cookie.cxx
new file mode 100644
index 0000000..7184cda
--- /dev/null
+++ b/scite-app/scite/src/Cookie.cxx
@@ -0,0 +1,90 @@
+// SciTE - Scintilla based Text Editor
+/** @file Cookie.cxx
+ ** Examine start of files for coding cookies and type information.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <chrono>
+
+#include "GUI.h"
+
+#include "StringHelpers.h"
+#include "Cookie.h"
+
+std::string_view ExtractLine(std::string_view sv) noexcept {
+	std::string_view remainder = sv;
+	while ((remainder.length() > 0) && (remainder[0] != '\r') && (remainder[0] != '\n')) {
+		remainder.remove_prefix(1);
+	}
+	if ((remainder.length() > 1) && (remainder[0] == '\r') && (remainder[1] == '\n')) {
+		remainder.remove_prefix(1);
+	}
+	if (remainder.length() > 0) {
+		remainder.remove_prefix(1);
+	}
+	sv.remove_suffix(remainder.length());
+	return sv;
+}
+
+namespace {
+
+constexpr std::string_view codingCookie("coding");
+constexpr std::string_view utf8Name("utf-8");
+
+constexpr bool isEncodingChar(char ch) noexcept {
+	return (ch == '_') || (ch == '-') || (ch == '.') ||
+	       (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
+	       (ch >= '0' && ch <= '9');
+}
+
+constexpr bool isSpaceChar(char ch) noexcept {
+	return (ch == ' ') || (ch == '\t');
+}
+
+UniMode CookieValue(std::string_view s) noexcept {
+	const size_t posCoding = s.find(codingCookie);
+	if (posCoding != std::string_view::npos) {
+		s.remove_prefix(posCoding + codingCookie.length());
+		if ((s.length() > 0) && ((s[0] == ':') || (s[0] == '='))) {
+			s.remove_prefix(1);
+			if ((s.length() > 0) && ((s[0] == '\"') || (s[0] == '\''))) {
+				s.remove_prefix(1);
+			}
+			while ((s.length() > 0) && (isSpaceChar(s[0]))) {
+				s.remove_prefix(1);
+			}
+			size_t endCoding = 0;
+			while ((endCoding < s.length()) &&
+					(isEncodingChar(s[endCoding]))) {
+				endCoding++;
+			}
+			s.remove_suffix(s.length() - endCoding);
+			if (EqualCaseInsensitive(s, utf8Name)) {
+				return uniCookie;
+			}
+		}
+	}
+	return uni8Bit;
+}
+
+}
+
+UniMode CodingCookieValue(std::string_view sv) noexcept {
+	const std::string_view l1 = ExtractLine(sv);
+	UniMode unicodeMode = CookieValue(l1);
+	if (unicodeMode == uni8Bit) {
+		sv.remove_prefix(l1.length());
+		const std::string_view l2 = ExtractLine(sv);
+		unicodeMode = CookieValue(l2);
+	}
+	return unicodeMode;
+}
+
diff --git a/scite-app/scite/src/Cookie.h b/scite-app/scite/src/Cookie.h
new file mode 100644
index 0000000..06542c6
--- /dev/null
+++ b/scite-app/scite/src/Cookie.h
@@ -0,0 +1,20 @@
+// SciTE - Scintilla based Text Editor
+/** @file Cookie.h
+ ** Examine start of files for coding cookies and type information.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef COOKIE_H
+#define COOKIE_H
+
+// Related to Utf8_16::encodingType but with additional values at end
+enum UniMode {
+	uni8Bit = 0, uni16BE = 1, uni16LE = 2, uniUTF8 = 3,
+	uniCookie = 4
+};
+
+std::string_view ExtractLine(std::string_view sv) noexcept;
+UniMode CodingCookieValue(std::string_view sv) noexcept;
+
+#endif
diff --git a/scite-app/scite/src/Credits.cxx b/scite-app/scite/src/Credits.cxx
new file mode 100644
index 0000000..bfa8c79
--- /dev/null
+++ b/scite-app/scite/src/Credits.cxx
@@ -0,0 +1,616 @@
+// SciTE - Scintilla based Text Editor
+/** @file Credits.cxx
+ ** Display a list of contributors in the about box.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#if defined(GTK)
+#include <gtk/gtk.h>
+#endif
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+// Contributor names are in UTF-8
+static const char *contributors[] = {
+#if defined(GTK)
+            "Icons Copyright(C) 1998 by Dean S. Jones",
+            "    http://jfa.javalobby.org/projects/icons/",
+#endif
+//++Autogenerated -- run ../scripts/RegenerateSource.py to regenerate
+//**\(            "\*",\n\)
+            "Atsuo Ishimoto",
+            "Mark Hammond",
+            "Francois Le Coguiec",
+            "Dale Nagata",
+            "Ralf Reinhardt",
+            "Philippe Lhoste",
+            "Andrew McKinlay",
+            "Stephan R. A. Deibel",
+            "Hans Eckardt",
+            "Vassili Bourdo",
+            "Maksim Lin",
+            "Robin Dunn",
+            "John Ehresman",
+            "Steffen Goeldner",
+            "Deepak S.",
+            "DevelopMentor http://www.develop.com",
+            "Yann Gaillard",
+            "Aubin Paul",
+            "Jason Diamond",
+            "Ahmad Baitalmal",
+            "Paul Winwood",
+            "Maxim Baranov",
+            "Ragnar H\303\270jland",
+            "Christian Obrecht",
+            "Andreas Neukoetter",
+            "Adam Gates",
+            "Steve Lhomme",
+            "Ferdinand Prantl",
+            "Jan Dries",
+            "Markus Gritsch",
+            "Tahir Karaca",
+            "Ahmad Zawawi",
+            "Laurent le Tynevez",
+            "Walter Braeu",
+            "Ashley Cambrell",
+            "Garrett Serack",
+            "Holger Schmidt",
+            "ActiveState http://www.activestate.com",
+            "James Larcombe",
+            "Alexey Yutkin",
+            "Jan Hercek",
+            "Richard Pecl",
+            "Edward K. Ream",
+            "Valery Kondakoff",
+            "Sm\303\241ri McCarthy",
+            "Clemens Wyss",
+            "Simon Steele",
+            "Serge A. Baranov",
+            "Xavier Nodet",
+            "Willy Devaux",
+            "David Clain",
+            "Brendon Yenson",
+            "Vamsi Potluru http://www.baanboard.com",
+            "Praveen Ambekar",
+            "Alan Knowles",
+            "Kengo Jinno",
+            "Valentin Valchev",
+            "Marcos E. Wurzius",
+            "Martin Alderson",
+            "Robert Gustavsson",
+            "Jos\303\251 Fonseca",
+            "Holger Kiemes",
+            "Francis Irving",
+            "Scott Kirkwood",
+            "Brian Quinlan",
+            "Ubi",
+            "Michael R. Duerig",
+            "Deepak T",
+            "Don Paul Beletsky",
+            "Gerhard Kalab",
+            "Olivier Dagenais",
+            "Josh Wingstrom",
+            "Bruce Dodson",
+            "Sergey Koshcheyev",
+            "Chuan-jian Shen",
+            "Shane Caraveo",
+            "Alexander Scripnik",
+            "Ryan Christianson",
+            "Martin Steffensen",
+            "Jakub Vr\303\241na",
+            "The Black Horus",
+            "Bernd Kreuss",
+            "Thomas Lauer",
+            "Mike Lansdaal",
+            "Yukihiro Nakai",
+            "Jochen Tucht",
+            "Greg Smith",
+            "Steve Schoettler",
+            "Mauritius Thinnes",
+            "Darren Schroeder",
+            "Pedro Guerreiro",
+            "Steven te Brinke",
+            "Dan Petitt",
+            "Biswapesh Chattopadhyay",
+            "Kein-Hong Man",
+            "Patrizio Bekerle",
+            "Nigel Hathaway",
+            "Hrishikesh Desai",
+            "Sergey Puljajev",
+            "Mathias Rauen",
+            "Angelo Mandato http://www.spaceblue.com",
+            "Denis Sureau",
+            "Kaspar Schiess",
+            "Christoph H\303\266sler",
+            "Jo\303\243o Paulo F Farias",
+            "Ron Schofield",
+            "Stefan Wosnik",
+            "Marius Gheorghe",
+            "Naba Kumar",
+            "Sean O'Dell",
+            "Stefanos Togoulidis",
+            "Hans Hagen",
+            "Jim Cape",
+            "Roland Walter",
+            "Brian Mosher",
+            "Nicholas Nemtsev",
+            "Roy Wood",
+            "Peter-Henry Mander",
+            "Robert Boucher",
+            "Christoph Dalitz",
+            "April White",
+            "S. Umar",
+            "Trent Mick",
+            "Filip Yaghob",
+            "Avi Yegudin",
+            "Vivi Orunitia",
+            "Manfred Becker",
+            "Dimitris Keletsekis",
+            "Yuiga",
+            "Davide Scola",
+            "Jason Boggs",
+            "Reinhold Niesner",
+            "Jos van der Zande",
+            "Pescuma",
+            "Pavol Bosik",
+            "Johannes Schmid",
+            "Blair McGlashan",
+            "Mikael Hultgren",
+            "Florian Balmer",
+            "Hadar Raz",
+            "Herr Pfarrer",
+            "Ben Key",
+            "Gene Barry",
+            "Niki Spahiev",
+            "Carsten Sperber",
+            "Phil Reid",
+            "Iago Rubio",
+            "R\303\251gis Vaquette",
+            "Massimo Cor\303\240",
+            "Elias Pschernig",
+            "Chris Jones",
+            "Josiah Reynolds",
+            "Robert Roessler rftp.com http://www.rftp.com",
+            "Steve Donovan",
+            "Jan Martin Pettersen",
+            "Sergey Philippov",
+            "Borujoa",
+            "Michael Owens",
+            "Franck Marcia",
+            "Massimo Maria Ghisalberti",
+            "Frank Wunderlich",
+            "Josepmaria Roca",
+            "Tobias Engvall",
+            "Suzumizaki Kimitaka",
+            "Michael Cartmell",
+            "Pascal Hurni",
+            "Andre",
+            "Randy Butler",
+            "Georg Ritter",
+            "Michael Goffioul",
+            "Ben Harper",
+            "Adam Strzelecki",
+            "Kamen Stanev",
+            "Steve Menard",
+            "Oliver Yeoh",
+            "Eric Promislow",
+            "Joseph Galbraith",
+            "Jeffrey Ren",
+            "Armel Asselin",
+            "Jim Pattee",
+            "Friedrich Vedder",
+            "Sebastian Pipping",
+            "Andre Arpin",
+            "Stanislav Maslovski",
+            "Martin Stone",
+            "Fabien Proriol",
+            "mimir",
+            "Nicola Civran",
+            "Snow",
+            "Mitchell Foral",
+            "Pieter Holtzhausen",
+            "Waldemar Augustyn",
+            "Jason Haslam",
+            "Sebastian Steinlechner",
+            "Chris Rickard",
+            "Rob McMullen",
+            "Stefan Schwendeler",
+            "Cristian Adam",
+            "Nicolas Chachereau",
+            "Istvan Szollosi",
+            "Xie Renhui",
+            "Enrico Tr\303\266ger",
+            "Todd Whiteman",
+            "Yuval Papish",
+            "instanton",
+            "Sergio Lucato",
+            "VladVRO",
+            "Dmitry Maslov",
+            "chupakabra",
+            "Juan Carlos Arevalo Baeza",
+            "Nick Treleaven",
+            "Stephen Stagg",
+            "Jean-Paul Iribarren",
+            "Tim Gerundt",
+            "Sam Harwell",
+            "Boris",
+            "Jason Oster",
+            "Gertjan Kloosterman",
+            "alexbodn",
+            "Sergiu Dotenco",
+            "Anders Karlsson",
+            "ozlooper",
+            "Marko Njezic",
+            "Eugen Bitter",
+            "Christoph Baumann",
+            "Christopher Bean",
+            "Sergey Kishchenko",
+            "Kai Liu",
+            "Andreas Rumpf",
+            "James Moffatt",
+            "Yuzhou Xin",
+            "Nic Jansma",
+            "Evan Jones",
+            "Mike Lischke",
+            "Eric Kidd",
+            "maXmo",
+            "David Severwright",
+            "Jon Strait",
+            "Oliver Kiddle",
+            "Etienne Girondel",
+            "Haimag Ren",
+            "Andrey Moskalyov",
+            "Xavi",
+            "Toby Inkster",
+            "Eric Forgeot",
+            "Colomban Wendling",
+            "Neo",
+            "Jordan Russell",
+            "Farshid Lashkari",
+            "Sam Rawlins",
+            "Michael Mullin",
+            "Carlos SS",
+            "vim",
+            "Martial Demolins",
+            "Tino Weinkauf",
+            "J\303\251r\303\264me Laforge",
+            "Udo Lechner",
+            "Marco Falda",
+            "Dariusz Knoci\305\204ski",
+            "Ben Fisher",
+            "Don Gobin",
+            "John Yeung",
+            "Adobe",
+            "Elizabeth A. Irizarry",
+            "Mike Schroeder",
+            "Morten MacFly",
+            "Jaime Gimeno",
+            "Thomas Linder Puls",
+            "Artyom Zuikov",
+            "Gerrit",
+            "Occam's Razor",
+            "Ben Bluemel",
+            "David Wolfendale",
+            "Chris Angelico",
+            "Marat Dukhan",
+            "Stefan Weil",
+            "Rex Conn",
+            "Ross McKay",
+            "Bruno Barbieri",
+            "Gordon Smith",
+            "dimitar",
+            "S\303\251bastien Granjoux",
+            "zeniko",
+            "James Ribe",
+            "Markus Ni\303\237l",
+            "Martin Panter",
+            "Mark Yen",
+            "Philippe Elsass",
+            "Dimitar Zhekov",
+            "Fan Yang",
+            "Denis Shelomovskij",
+            "darmar",
+            "John Vella",
+            "Chinh Nguyen",
+            "Sakshi Verma",
+            "Joel B. Mohler",
+            "Isiledhel",
+            "Vidya Wasi",
+            "G. Hu",
+            "Byron Hawkins",
+            "Alpha",
+            "John Donoghue",
+            "kudah",
+            "Igor Shaula",
+            "Pavel Bulochkin",
+            "Yosef Or Boczko",
+            "Brian Griffin",
+            "\303\226zg\303\274r Emir",
+            "Neomi",
+            "OmegaPhil",
+            "SiegeLord",
+            "Erik",
+            "TJF",
+            "Mark Robinson",
+            "Thomas Martitz",
+            "felix",
+            "Christian Walther",
+            "Ebben",
+            "Robert Gieseke",
+            "Mike M",
+            "nkmathew",
+            "Andreas Tscharner",
+            "Lee Wilmott",
+            "johnsonj",
+            "Vicente",
+            "Nick Gravgaard",
+            "Ian Goldby",
+            "Holger Stenger",
+            "danselmi",
+            "Mat Berchtold",
+            "Michael Staszewski",
+            "Baurzhan Muftakhidinov",
+            "Erik Angelin",
+            "Yusuf Ramazan Karag\303\266z",
+            "Markus Heidelberg",
+            "Joe Mueller",
+            "Mika Attila",
+            "JoMazM",
+            "Markus Moser",
+            "Stefan K\303\274ng",
+            "Ji\305\231\303\255 Techet",
+            "Jonathan Hunt",
+            "Serg Stetsuk",
+            "Jordan Jueckstock",
+            "Yury Dubinsky",
+            "Sam Hocevar",
+            "Luyomi",
+            "Matt Gilarde",
+            "Mark C",
+            "Johannes Sasongko",
+            "fstirlitz",
+            "Robin Haberkorn",
+            "Pavel Sountsov",
+            "Dirk Lorenzen",
+            "Kasper B. Graversen",
+            "Chris Mayo",
+            "Van de Bugger",
+            "Tse Kit Yam",
+            "SmartShare Systems https://www.smartsharesystems.com/",
+            "Morten Br\303\270rup",
+            "Alexey Denisov",
+            "Justin Dailey",
+            "oirfeodent",
+            "A-R-C-A",
+            "Roberto Rossi",
+            "Kenny Liu",
+            "Iain Clarke",
+            "desto",
+            "John Flatness",
+            "Thorsten Kani",
+            "Bernhard M. Wiedemann",
+            "Baldur Karlsson",
+            "Martin Kleusberg",
+            "Jannick",
+            "Zufu Liu",
+            "Simon Sobisch",
+            "Georger Ara\303\272jo",
+            "Tobias K\303\274hne",
+            "Dimitar Radev",
+            "Liang Bai",
+            "Gunter K\303\266nigsmann",
+            "Nicholai Benalal",
+            "Uniface",
+            "Raghda Morsy",
+            "Giuseppe Corbelli",
+            "Andreas R\303\266nnquist",
+            "Henrik Hank",
+            "Luke Rasmussen",
+            "Philipp",
+            "maboroshin",
+            "Gokul Krishnan",
+            "John Horigan",
+            "jj5",
+            "Jad Altahan",
+            "Andrea Ricchi",
+            "Juarez Rudsatz",
+            "Wil van Antwerpen",
+            "Hodong Kim",
+            "Michael Conrad",
+            "Dejan Budimir",
+            "Andreas Falkenhahn",
+            "Mark Reay",
+            "David Shuman",
+            "McLoo",
+            "Shmuel Zeigerman",
+            "Chris Graham",
+            "Hugues Larrive",
+            "Prakash Sahni",
+            "Michel Sauvard",
+            "uhf7",
+            "gnombat",
+            "Derek Brown",
+            "cshnik",
+            "Robert Di Pardo",
+            "YX Hao",
+            "Petko Georgiev",
+            "Damiano Lombardi",
+            "riQQ",
+            "Bertrand Lacoste",
+            "Michael Neuroth",
+            "Ivan Ust\303\273\305\276anin",
+
+//--Autogenerated -- end of automatically generated section
+        };
+
+// AddStyledText only called from About so static size buffer is OK
+static void AddStyledText(GUI::ScintillaWindow &wsci, const char *s, int attr) {
+	const size_t len = strlen(s);
+	std::vector<char> buf(len*2);
+	for (size_t i = 0; i < len; i++) {
+		buf[i*2] = s[i];
+		buf[i*2 + 1] = static_cast<char>(attr);
+	}
+	wsci.AddStyledText(len*2, &buf[0]);
+}
+
+static void SetAboutStyle(GUI::ScintillaWindow &wsci, int style, Scintilla::Colour fore) {
+	wsci.StyleSetFore(style, fore);
+}
+
+namespace {
+
+// Implement low quality pseudo-random colours for the pretties.
+// Pseudo-random algorithm based on R. G. Dromey "How to Solve it by Computer" page 122.
+
+class RandomColour {
+	int mult;
+	int incr;
+	int modulus;
+	int randomValue;
+	int NextRandom() noexcept {
+		randomValue = (mult * randomValue + incr) % modulus;
+		return randomValue;
+	}
+	void HackColour(int &n) noexcept {
+		n += (NextRandom() % 100) - 50;
+		if (n > 0xE7)
+			n = 0x60;
+		if (n < 0)
+			n = 0x80;
+	}
+public:
+	int r;
+	int g;
+	int b;
+	RandomColour() noexcept :
+		mult(109),
+		incr(853),
+		modulus(4096),
+		randomValue(time(nullptr) % modulus),
+		r(NextRandom() % 256),
+		g(NextRandom() % 256),
+		b(NextRandom() % 256) {
+	}
+	void Next() noexcept {
+		HackColour(r);
+		HackColour(g);
+		HackColour(b);
+	}
+};
+
+}
+
+void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle) {
+	if (wsci.Created()) {
+		wsci.StyleResetDefault();
+		std::string sVersion = " ";
+		sVersion += VERSION_SCITE;
+		sVersion += "   Scintilla:";
+		sVersion += VERSION_SCINTILLA;
+		sVersion += "   Lexilla:";
+		sVersion += VERSION_LEXILLA;
+#if defined(GTK)
+		wsci.StyleSetFont(StyleDefault, "Serif");
+		constexpr int fontSize = 14;
+		sVersion += "\n    compiled for GTK:";
+		sVersion += StdStringFromInteger(GTK_MAJOR_VERSION);
+		sVersion += ".";
+		sVersion += StdStringFromInteger(GTK_MINOR_VERSION);
+		sVersion += ".";
+		sVersion += StdStringFromInteger(GTK_MICRO_VERSION);
+#else
+		constexpr int fontSize = 15;
+#endif
+		sVersion += "\n";
+
+		wsci.SetCodePage(SA::CpUtf8);
+
+		wsci.StyleSetSize(StyleDefault, fontSize);
+		wsci.StyleSetBack(StyleDefault, ColourRGB(0xff, 0xff, 0xff));
+		wsci.StyleClearAll();
+
+		SetAboutStyle(wsci, 0, ColourRGB(0xff, 0xff, 0xff));
+		wsci.StyleSetSize(0, fontSize);
+		wsci.StyleSetBack(0, ColourRGB(0, 0, 0x80));
+		wsci.StyleSetEOLFilled(0, true);
+		wsci.StyleSetBold(0, true);
+		AddStyledText(wsci, "\t\t\t\t", 0);
+		AddStyledText(wsci, appTitle, 0);
+		AddStyledText(wsci, "\n", 0);
+		SetAboutStyle(wsci, 1, ColourRGB(0, 0, 0));
+		constexpr int trsSty = 5; // define the stylenumber to assign font for translators.
+		std::string translator = GetTranslationToAbout("TranslationCredit", false);
+		SetAboutStyle(wsci, trsSty, ColourRGB(0, 0, 0));
+		if constexpr (sizeof(void *) == 4) {
+			AddStyledText(wsci, "32-bit\n", 1);
+		}
+		AddStyledText(wsci, GetTranslationToAbout("Version").c_str(), trsSty);
+		AddStyledText(wsci, sVersion.c_str(), 1);
+		AddStyledText(wsci, "    " __DATE__ " " __TIME__ "\n", 1);
+		SetAboutStyle(wsci, 2, ColourRGB(0, 0, 0));
+		wsci.StyleSetItalic(2, true);
+		AddStyledText(wsci, GetTranslationToAbout("by").c_str(), trsSty);
+		AddStyledText(wsci, " Neil Hodgson.\n", 2);
+		SetAboutStyle(wsci, 3, ColourRGB(0, 0, 0));
+		AddStyledText(wsci, COPYRIGHT_DATES ".\n", 3);
+		SetAboutStyle(wsci, 4, ColourRGB(0, 0x7f, 0x7f));
+		AddStyledText(wsci, "http://www.scintilla.org\n", 4);
+		AddStyledText(wsci, "Lua scripting language by TeCGraf, PUC-Rio\n", 3);
+		AddStyledText(wsci, "    http://www.lua.org\n", 4);
+		if (translator.length()) {
+			AddStyledText(wsci, translator.c_str(), trsSty);
+			AddStyledText(wsci, "\n", 5);
+		}
+		AddStyledText(wsci, GetTranslationToAbout("Contributors:").c_str(), trsSty);
+		for (unsigned int co = 0; co < std::size(contributors); co++) {
+			const int colourIndex = 50 + (co % 78);
+			AddStyledText(wsci, "\n    ", colourIndex);
+			AddStyledText(wsci, contributors[co], colourIndex);
+		}
+		RandomColour colour;
+		for (unsigned int sty = 0; sty < 78; sty++) {
+			colour.Next();
+			SetAboutStyle(wsci, sty + 50, ColourRGB(colour.r, colour.g, colour.b));
+		}
+		wsci.SetReadOnly(true);
+	}
+}
diff --git a/scite-app/scite/src/EditorConfig.cxx b/scite-app/scite/src/EditorConfig.cxx
new file mode 100644
index 0000000..a01696c
--- /dev/null
+++ b/scite-app/scite/src/EditorConfig.cxx
@@ -0,0 +1,369 @@
+// SciTE - Scintilla based Text Editor
+/** @file EditorConfig.cxx
+ ** Read and interpret settings files in the EditorConfig format.
+ ** http://editorconfig.org/
+ **/
+// Copyright 2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cassert>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+
+#include "GUI.h"
+
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "EditorConfig.h"
+
+namespace {
+
+struct ECForDirectory {
+	bool isRoot;
+	std::string directory;
+	std::vector<std::string> lines;
+	ECForDirectory();
+	void ReadOneDirectory(const FilePath &dir);
+};
+
+class EditorConfig : public IEditorConfig {
+	std::vector<ECForDirectory> config;
+public:
+	~EditorConfig() override;
+	void ReadFromDirectory(const FilePath &dirStart) override;
+	std::map<std::string, std::string> MapFromAbsolutePath(const FilePath &absolutePath) const override;
+	void Clear() noexcept override;
+};
+
+const GUI::gui_char editorConfigName[] = GUI_TEXT(".editorconfig");
+
+bool PatternMatch(std::u32string_view pattern, std::u32string_view text) {
+	if (pattern == text) {
+		return true;
+	} else if (pattern.empty()) {
+		return false;
+	} else if (pattern.front() == '\\') {
+		pattern.remove_prefix(1);
+		if (pattern.empty()) {
+			// Escape with nothing being escaped
+			return false;
+		}
+		if (text.empty()) {
+			return false;
+		}
+		if (pattern.front() == text.front()) {
+			pattern.remove_prefix(1);
+			text.remove_prefix(1);
+			return PatternMatch(pattern, text);
+		}
+		return false;
+	} else if (pattern.front() == '*') {
+		pattern.remove_prefix(1);
+		if (!pattern.empty() && pattern.front() == '*') {
+			pattern.remove_prefix(1);
+			// "**" matches anything including "/"
+			while (!text.empty()) {
+				if (PatternMatch(pattern, text)) {
+					return true;
+				}
+				text.remove_prefix(1);
+			}
+		} else {
+			while (!text.empty()) {
+				if (PatternMatch(pattern, text)) {
+					return true;
+				}
+				if (text.front() == '/') {
+					// "/" not matched by single "*"
+					return PatternMatch(pattern, text);
+				}
+				text.remove_prefix(1);
+			}
+		}
+		assert(text.empty());
+		// Consumed whole text with wildcard so match if pattern consumed
+		return pattern.empty();
+	} else if (text.empty()) {
+		return false;
+	} else if (pattern.front() == '?') {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return PatternMatch(pattern, text);
+	} else if (pattern.front() == text.front()) {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return PatternMatch(pattern, text);
+	} else if (pattern.front() == '[') {
+		pattern.remove_prefix(1);
+		if (pattern.empty()) {
+			return false;
+		}
+		const bool positive = pattern.front() != '!';
+		if (!positive) {
+			pattern.remove_prefix(1);
+			if (pattern.empty()) {
+				return false;
+			}
+		}
+		bool inSet = false;
+		while (!pattern.empty() && pattern.front() != ']') {
+			if (pattern.front() == text.front()) {
+				inSet = true;
+			}
+			pattern.remove_prefix(1);
+		}
+		if (!pattern.empty()) {
+			pattern.remove_prefix(1);
+		}
+		if (inSet != positive) {
+			return false;
+		}
+		text.remove_prefix(1);
+		return PatternMatch(pattern, text);
+	} else if (pattern.front() == '{') {
+		pattern.remove_prefix(1);
+		if (pattern.empty()) {
+			return false;
+		}
+		std::u32string_view textAlt = text;
+		bool inSet = false;
+		size_t altSuccessLen = 0;
+		while (!pattern.empty()) {
+			if (pattern.front() == '}' || pattern.front() == ',') {
+				inSet = true;
+				text.remove_prefix(altSuccessLen);
+				break;
+			}
+			if (textAlt.empty()) {
+				return false;
+			}
+			if (pattern.front() == textAlt.front()) {
+				pattern.remove_prefix(1);
+				textAlt.remove_prefix(1);
+				altSuccessLen++;
+			} else {
+				while (!pattern.empty() && pattern.front() != '}' && pattern.front() != ',') {
+					pattern.remove_prefix(1);
+				}
+				if (!pattern.empty() && pattern.front() == ',') {
+					pattern.remove_prefix(1);
+				}
+				textAlt = text;
+				altSuccessLen = 0;
+			}
+		}
+		if (!inSet) {
+			return false;
+		}
+		while (!pattern.empty() && pattern.front() != '}') {
+			pattern.remove_prefix(1);
+		}
+		if (!pattern.empty()) {
+			pattern.remove_prefix(1);
+		}
+		return PatternMatch(pattern, text);
+	}
+	return false;
+}
+
+}
+
+ECForDirectory::ECForDirectory() : isRoot(false) {
+}
+
+void ECForDirectory::ReadOneDirectory(const FilePath &dir) {
+	directory = dir.AsUTF8();
+	directory.append("/");
+	FilePath fpec(dir, editorConfigName);
+	std::string configString = fpec.Read();
+	if (configString.size() > 0) {
+		const std::string_view svUtf8BOM(UTF8BOM);
+		if (StartsWith(configString, svUtf8BOM)) {
+			configString.erase(0, svUtf8BOM.length());
+		}
+		// Carriage returns aren't wanted
+		Remove(configString, std::string("\r"));
+		std::vector<std::string> configLines = StringSplit(configString, '\n');
+		for (std::string &line : configLines) {
+			if (line.empty() || StartsWith(line, "#") || StartsWith(line, ";")) {
+				// Drop comments
+			} else if (StartsWith(line, "[")) {
+				// Pattern
+				lines.push_back(line);
+			} else if (Contains(line, '=')) {
+				LowerCaseAZ(line);
+				Remove(line, std::string(" "));
+				lines.push_back(line);
+				std::vector<std::string> nameVal = StringSplit(line, '=');
+				if (nameVal.size() == 2) {
+					if ((nameVal[0] == "root") && nameVal[1] == "true") {
+						isRoot = true;
+					}
+				}
+			}
+		}
+	}
+}
+
+EditorConfig::~EditorConfig() = default;
+
+void EditorConfig::ReadFromDirectory(const FilePath &dirStart) {
+	FilePath dir = dirStart;
+	while (true) {
+		ECForDirectory ecfd;
+		ecfd.ReadOneDirectory(dir);
+		config.insert(config.begin(), ecfd);
+		if (ecfd.isRoot || !dir.IsSet() || dir.IsRoot()) {
+			break;
+		}
+		// Up a level
+		dir = dir.Directory();
+	}
+}
+
+std::map<std::string, std::string> EditorConfig::MapFromAbsolutePath(const FilePath &absolutePath) const {
+	std::map<std::string, std::string> ret;
+	std::string fullPath = absolutePath.AsUTF8();
+#ifdef WIN32
+	// Convert Windows path separators to Unix
+	std::replace(fullPath.begin(), fullPath.end(), '\\', '/');
+#endif
+	for (const ECForDirectory &level : config) {
+		std::string relPath;
+		if (level.directory.length() <= fullPath.length()) {
+			relPath = fullPath.substr(level.directory.length());
+		}
+		bool inActiveSection = false;
+		for (auto line : level.lines) {
+			if (StartsWith(line, "[")) {
+				std::string pattern = line.substr(1, line.size() - 2);
+				if (!FilePath::CaseSensitive()) {
+					pattern = GUI::LowerCaseUTF8(pattern);
+					relPath = GUI::LowerCaseUTF8(relPath);
+				}
+				if ((pattern.find('/') == std::string::npos) && (relPath.find('/') != std::string::npos)) {
+					// Simple pattern without directories so make match in any directory
+					pattern.insert(0, "**/");
+				}
+				// Convert to u32string to treat as characters, not bytes
+				std::u32string patternU32 = UTF32FromUTF8(pattern);
+				std::u32string relPathU32 = UTF32FromUTF8(relPath);
+				inActiveSection = PatternMatch(patternU32, relPathU32);
+				// PatternMatch only works with literal filenames, '?', '*', '**', '[]', '[!]', '{,}', '\x'.
+				// Other formats not yet handled:
+				//   {num1..num2}
+			} else if (inActiveSection && Contains(line, '=')) {
+				const std::vector<std::string> nameVal = StringSplit(line, '=');
+				if (nameVal.size() == 2) {
+					if (nameVal[1] == "unset") {
+						std::map<std::string, std::string>::iterator it = ret.find(nameVal[0]);
+						if (it != ret.end())
+							ret.erase(it);
+					} else {
+						ret[nameVal[0]] = nameVal[1];
+					}
+				}
+			}
+		}
+	}
+
+	// Install defaults for indentation/tab
+
+	// if indent_style == "tab" and !indent_size: indent_size = "tab"
+	if (ret.count("indent_style") && ret["indent_style"] == "tab" && !ret.count("indent_size")) {
+		ret["indent_size"] = "tab";
+	}
+
+	// if indent_size != "tab" and !tab_width: tab_width = indent_size
+	if (ret.count("indent_size") && ret["indent_size"] != "tab" && !ret.count("tab_width")) {
+		ret["tab_width"] = ret["indent_size"];
+	}
+
+	// if indent_size == "tab": indent_size = tab_width
+	if (ret.count("indent_size") && ret["indent_size"] == "tab" && ret.count("tab_width")) {
+		ret["indent_size"] = ret["tab_width"];
+	}
+
+	return ret;
+}
+
+void EditorConfig::Clear() noexcept {
+	config.clear();
+}
+
+#if defined(TESTING)
+
+static void TestPatternMatch() {
+	// Literals
+	assert(PatternMatch(U"", U""));
+	assert(PatternMatch(U"a", U"a"));
+	assert(PatternMatch(U"a", U"b") == false);
+	assert(PatternMatch(U"ab", U"ab"));
+	assert(PatternMatch(U"ab", U"a") == false);
+	assert(PatternMatch(U"a", U"ab") == false);
+
+	// * matches anything except for '/'
+	assert(PatternMatch(U"*", U""));
+	assert(PatternMatch(U"*", U"a"));
+	assert(PatternMatch(U"*", U"ab"));
+
+	assert(PatternMatch(U"a*", U"a"));
+	assert(PatternMatch(U"a*", U"ab"));
+	assert(PatternMatch(U"a*", U"abc"));
+	assert(PatternMatch(U"a*", U"bc") == false);
+
+	assert(PatternMatch(U"*a", U"a"));
+	assert(PatternMatch(U"*a", U"za"));
+	assert(PatternMatch(U"*a", U"yza"));
+	assert(PatternMatch(U"*a", U"xyz") == false);
+	assert(PatternMatch(U"a*z", U"a/z") == false);
+	assert(PatternMatch(U"a*b*c", U"abc"));
+	assert(PatternMatch(U"a*b*c", U"a1b234c"));
+
+	// ? matches one character
+	assert(PatternMatch(U"?", U"a"));
+	assert(PatternMatch(U"?", U"") == false);
+	assert(PatternMatch(U"a?c", U"abc"));
+
+	// [set] matches one character from set
+	assert(PatternMatch(U"a[123]z", U"a2z"));
+	assert(PatternMatch(U"a[123]z", U"az") == false);
+	assert(PatternMatch(U"a[123]z", U"a2") == false);
+
+	// [!set] matches one character not from set
+	assert(PatternMatch(U"a[!123]z", U"ayz"));
+	assert(PatternMatch(U"a[!123]", U"az"));
+	assert(PatternMatch(U"a[!123]", U"a2") == false);
+
+	// ** matches anything including '/'
+	assert(PatternMatch(U"**a", U"a"));
+	assert(PatternMatch(U"**a", U"za"));
+	assert(PatternMatch(U"**a", U"yza"));
+	assert(PatternMatch(U"**a", U"xyz") == false);
+	assert(PatternMatch(U"a**z", U"a/z"));
+	assert(PatternMatch(U"a**z", U"a/b/z"));
+	assert(PatternMatch(U"a**", U"a/b/z"));
+
+	// {alt1,alt2,...} matches any of the alternatives
+	assert(PatternMatch(U"<{ab}>", U"<ab>"));
+	assert(PatternMatch(U"<{ab,lm,xyz}>", U"<ab>"));
+	assert(PatternMatch(U"<{ab,lm,xyz}>", U"<lm>"));
+	assert(PatternMatch(U"<{ab,lm,xyz}>", U"<xyz>"));
+	assert(PatternMatch(U"<{ab,lm,xyz}>", U"<rs>") == false);
+}
+
+#endif
+
+std::unique_ptr<IEditorConfig> IEditorConfig::Create() {
+#if defined(TESTING)
+	TestPatternMatch();
+#endif
+	return std::make_unique<EditorConfig>();
+}
diff --git a/scite-app/scite/src/EditorConfig.h b/scite-app/scite/src/EditorConfig.h
new file mode 100644
index 0000000..132d5da
--- /dev/null
+++ b/scite-app/scite/src/EditorConfig.h
@@ -0,0 +1,22 @@
+// SciTE - Scintilla based Text Editor
+/** @file EditorConfig.h
+ ** Read and interpret settings files in the EditorConfig format..
+ **/
+// Copyright 2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef EDITORCONFIG_H
+#define EDITORCONFIG_H
+
+class FilePath;
+
+class IEditorConfig {
+public:
+	virtual ~IEditorConfig() = default;
+	virtual void ReadFromDirectory(const FilePath &dirStart) = 0;
+	virtual std::map<std::string, std::string> MapFromAbsolutePath(const FilePath &absolutePath) const = 0;
+	virtual void Clear() = 0;
+	static std::unique_ptr<IEditorConfig> Create();
+};
+
+#endif
diff --git a/scite-app/scite/src/Embedded.properties b/scite-app/scite/src/Embedded.properties
new file mode 100644
index 0000000..5a9cd55
--- /dev/null
+++ b/scite-app/scite/src/Embedded.properties
@@ -0,0 +1,9946 @@
+
+
+if PLAT_WIN
+	position.left=0
+	position.top=0
+if PLAT_GTK
+	position.left=5
+	position.top=22
+position.width=$(scale 576)
+position.height=$(scale 740)
+split.vertical=1
+tabbar.visible=1
+
+line.margin.width=4
+margin.width=$(scale 16)
+fold.margin.width=$(scale 14)
+buffered.draw=0
+if PLAT_WIN
+	technology=1
+if PLAT_MAC
+	font.quality=3
+
+caret.period=500
+view.whitespace=0
+view.indentation.whitespace=1
+view.indentation.guides=1
+view.indentation.examine=3
+highlight.indentation.guides=1
+edge.column=200
+edge.mode=0
+edge.colour=#C0DCC0
+braces.check=1
+braces.sloppy=1
+selection.layer=2
+if PLAT_WINNT
+	selection.back=#00000020
+if PLAT_GTK
+	selection.back=#0000001E
+	selection.secondary.back=#00800010
+if PLAT_MAC
+	selection.back=#00000020
+selection.additional.back=#00000010
+selection.inactive.back=#00000010
+selection.always.visible=1
+bookmark.fore=#BE0000
+
+ext.lua.startup.script=$(SciteUserHome)/SciTEStartup.lua
+ext.lua.auto.reload=1
+
+are.you.sure=1
+default.file.ext=.cxx
+buffers=100
+if PLAT_GTK
+	background.save.size=10000000
+file.size.large=100000000
+file.size.no.styles=10000000
+
+tabsize=8
+indent.size=8
+use.tabs=1
+indent.automatic=1
+indent.opening=0
+indent.closing=0
+
+
+
+fold=1
+fold.compact=1
+fold.flags=16
+fold.symbols=1
+fold.comment=1
+fold.preprocessor=1
+
+find.command=
+find.files=*.c *.cxx *.h
+find.use.strip=1
+replace.use.strip=1
+
+eol.auto=1
+clear.before.execute=0
+
+caret.policy.xslop=1
+caret.policy.width=20
+caret.policy.xstrict=0
+caret.policy.xeven=0
+caret.policy.xjumps=0
+caret.policy.yslop=1
+caret.policy.lines=1
+caret.policy.ystrict=1
+caret.policy.yeven=1
+caret.policy.yjumps=0
+
+statusbar.number=4
+statusbar.text.1=\
+li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr)
+statusbar.text.2=\
+$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars.
+statusbar.text.3=\
+Now is: Date=$(CurrentDate) Time=$(CurrentTime)
+statusbar.text.4=\
+$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr)
+
+if PLAT_WIN
+	command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
+	command.scite.help.subsystem=2
+if PLAT_GTK
+	command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
+
+code.page=0
+if PLAT_GTK
+	output.code.page=65001
+if PLAT_MAC
+	output.code.page=65001
+
+export.html.wysiwyg=1
+export.html.styleused=1
+export.pdf.magnification=0
+export.pdf.font=Helvetica
+export.pdf.pagesize=595,842
+export.pdf.margins=72,72,72,72
+export.xml.collapse.spaces=1
+export.xml.collapse.lines=1
+
+chars.alpha=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+chars.numeric=0123456789
+chars.accented=�������������������������������������������������������������������
+
+
+source.files=$(star *source.patterns.)
+source.all.filter=All Source|$(source.files)|
+
+if PLAT_WIN
+	all.files=All Files (*.*)|*.*|
+	top.filters=$(source.all.filter)$(all.files)
+if PLAT_GTK
+	all.files=All Files (*)|*|Hidden Files (.*)|.*|
+	top.filters=$(source.all.filter)$(all.files)
+if PLAT_MAC
+	all.files=All Files (*.*)|*.*|
+	top.filters=$(all.files)$(source.all.filter)
+
+list.filters=$(star *filter.)
+
+open.filter=$(top.filters)$(list.filters)
+
+
+if PLAT_WIN
+	font.base=font:Verdana,size:9.4
+	font.small=font:Verdana,size:8
+	font.comment=font:Georgia,size:10.1
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:11
+	font.text.comment=font:Verdana,size:9
+	font.embedded.base=font:Verdana,size:9
+	font.embedded.comment=font:Comic Sans MS,size:8
+	font.monospace=font:Consolas,size:8.9
+	font.monospace.small=font:Consolas,size:8
+	font.vbs=font:Candara,size:10
+if PLAT_GTK
+	font.base=font:DejaVu Sans,size:9
+	font.small=font:DejaVu Sans,size:8
+	font.comment=font:DejaVu Serif,size:9
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:DejaVu Serif,size:10
+	font.text.comment=font:Serif,size:9
+	font.embedded.base=font:Serif,size:9
+	font.embedded.comment=font:Serif,size:9
+	font.monospace=font:DejaVu Sans Mono,size:9
+	font.monospace.small=font:DejaVu Sans Mono,size:8
+	font.vbs=font:DejaVu Sans Mono,size:9
+if PLAT_MAC
+	font.base=font:Verdana,size:12
+	font.small=font:Verdana,size:10
+	font.comment=font:Georgia,size:13
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:13
+	font.text.comment=font:Verdana,size:11
+	font.embedded.base=font:Verdana,size:11
+	font.embedded.comment=font:Comic Sans MS,size:10
+	font.monospace=font:Courier New,size:12
+	font.monospace.small=font:Courier New,size:10
+	font.vbs=font:Lucida Sans Unicode,size:12
+font.js=$(font.comment)
+
+colour.code.comment.box=fore:#007F00
+colour.code.comment.line=fore:#007F00
+colour.code.comment.doc=fore:#3F703F
+colour.code.comment.nested=fore:#A0C0A0
+colour.text.comment=fore:#0000FF,back:#D0F0D0
+colour.other.comment=fore:#007F00
+colour.embedded.comment=back:#E0EEFF
+colour.embedded.js=back:#F0F0FF
+colour.notused=back:#FF0000
+
+colour.number=fore:#007F7F
+colour.keyword=fore:#00007F
+colour.string=fore:#7F007F
+colour.char=fore:#7F007F
+colour.operator=fore:#000000
+colour.preproc=fore:#7F7F00
+colour.error=fore:#FFFF00,back:#FF0000
+
+traits.inactive=
+
+style.*.32=$(font.base)
+style.*.33=back:#E7E7E7,$(font.base)
+style.*.34=fore:#0000FF,bold
+style.*.35=fore:#FF0000,bold
+style.*.36=
+style.*.37=fore:#C0C0C0,back:#FFFFFF
+
+print.magnification=-1
+print.margins=1500,1000,1000,1500
+print.header.format=$(FileNameExt) -- Printed on $(CurrentDate), $(CurrentTime) -- Page $(CurrentPage)
+print.footer.format=$(FilePath) -- File date: $(FileDate) -- File time: $(FileTime)
+print.header.style=font:Arial,size:12,bold
+print.footer.style=font:Arial Narrow,size:10,italics
+
+
+
+
+
+keyText=Shift+F11
+keyMake=Ctrl+Shift+F11
+keyHTML=F12
+keyXML=Shift+F12
+keyIndent=Ctrl+Shift+F12
+if PLAT_MAC
+	os.x.home.end.keys=1
+	keyText=Shift+F13
+	keyMake=Ctrl+Shift+F13
+	keyHTML=Ctrl+Shift+F14
+	keyXML=Shift+F14
+	keyIndent=
+
+menu.language=$(star *language.)
+
+user.shortcuts=\
+Ctrl+Shift+V|IDM_PASTEANDDOWN|\
+Ctrl+PageUp|IDM_PREVFILE|\
+Ctrl+PageDown|IDM_NEXTFILE|
+
+
+
+imports.exclude=abaqus asl asn1 au3 ave avs baan blitzbasic bullant \
+cil cmake cobol coffeescript csound dataflex ecl eiffel erlang escript \
+flagship forth freebasic fsharp \
+gap haskell hex inno kix latex lot lout \
+markdown maxima metapost mmixal modula3 nim nimrod nncrontab nsis \
+opal oscript pov powerpro powershell ps purebasic r raku rebol rust \
+sas scriptol smalltalk sorcins spice specman \
+tacl tal txt2tags verilog vhdl visualprolog
+
+import *
+
+
+
+module abaqus
+
+file.patterns.abaqus=*.inp;*.dat;*.msg
+filter.abaqus=ABAQUS input (inp)|$(file.patterns.abaqus)|
+
+*filter.abaqus=$(filter.abaqus)
+
+lexer.$(file.patterns.abaqus)=abaqus
+
+keywords=*amplitude *assembly \
+*beam *boundary *buckle *bulk \
+*cload *conditions *conductivity *contact \
+*damping *density *dload *dsflux *dsload *dynamic \
+*el *elastic *element *element output *elgen *elset *encastre *end step \
+*expansion *explicit *equation *embedded element \
+*field *freq *frequency *friction \
+*generate \
+*heading *heat transfer *history \
+*imperfectio *import *include *initial *initial conditions *instance *interactio \
+*internal *interval \
+*marks *material *monitor *mpc \
+*ncopy *nfill *ngen *nlgeom *node *node output *node print *nset *number \
+*output \
+*pair *parameter *part *physical constants *plastic *print *preprint \
+*radiate *restart \
+*shell *shell section *solid section *specific heat *sradiate *static *step \
+*surface \
+*temperature *time *type \
+*variable *viscosity
+
+arguments=elset engineering inc input line material name nset pin tie type write generate field variable history \
+stefan boltzmann absolute zero zero frequency steady state new old set change number shift \
+model position newset oldset host
+
+keywords.$(file.patterns.abaqus)=
+keywords2.$(file.patterns.abaqus)=$(keywords)
+keywords3.$(file.patterns.abaqus)=
+keywords4.$(file.patterns.abaqus)=
+keywords5.$(file.patterns.abaqus)=$(arguments)
+keywords6.$(file.patterns.abaqus)=
+
+comment.block.abaqus=**
+
+style.abaqus.0=fore:#000000
+style.abaqus.1=fore:#999999,$(font.comment),italics
+style.abaqus.2=fore:#999999,$(font.comment),italics
+style.abaqus.3=$(colour.number)
+style.abaqus.4=$(colour.string)
+style.abaqus.5=fore:#990000
+style.abaqus.6=fore:#000000
+style.abaqus.7=fore:#008888,bold
+style.abaqus.8=fore:#0000CC
+style.abaqus.9=fore:#0000CC,bold
+style.abaqus.10=fore:#6600DD,bold
+style.abaqus.11=fore:#0077FF
+style.abaqus.12=fore:#0077DD
+
+command.compile.*.inp=
+command.build.*.inp=abaqus job=$(FileName) cpus=4
+command.go.*.inp=
+
+autocomplete.abaqus.ignorecase=1
+calltip.abaqus.ignorecase=1
+
+module ada
+
+filter.ada=Ada (ads adb)|*.ads;*.adb|
+
+*filter.ada=$(filter.ada)
+
+file.patterns.ada=*.ads;*.adb
+
+*source.patterns.ada=$(file.patterns.ada);
+
+lexer.$(file.patterns.ada)=ada
+
+*language.ada=Ada|ads||
+
+
+keywordclass.ada.main=abort abstract accept access aliased all array at begin body \
+case constant declare delay delta digits do else elsif end entry exception exit for \
+function generic goto if in is limited loop new null of others out package pragma \
+private procedure protected raise range record renames requeue return reverse \
+select separate subtype tagged task terminate then type until use when while with
+keywordclass.ada.operators=abs and mod not or rem xor
+
+keywordclass.ada=$(keywordclass.ada.main) $(keywordclass.ada.operators)
+
+keywords.$(file.patterns.ada)=$(keywordclass.ada)
+
+style.ada.0=fore:#808080
+style.ada.1=$(colour.keyword),bold
+style.ada.2=
+style.ada.3=$(colour.number)
+style.ada.4=$(colour.operator),bold
+style.ada.5=$(colour.char)
+style.ada.6=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.ada.7=$(colour.string)
+style.ada.8=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.ada.9=fore:#7F0000
+style.ada.10=$(colour.code.comment.line),$(font.code.comment.line)
+style.ada.11=fore:#FF0000
+
+comment.block.ada=--~
+
+braces.ada.style=4
+
+statement.indent.$(file.patterns.ada)=1 begin declare else elsif exception for if is loop while
+statement.lookback.$(file.patterns.ada)=20
+block.start.$(file.patterns.ada)=10 then is
+block.end.$(file.patterns.ada)=10 end
+
+calltip.ada.word.characters=._$(chars.alpha)
+
+adagcc=gcc -c $(FileNameExt)
+
+command.compile.*.ads=$(adagcc)
+command.build.*.ads=gnatmake
+command.go.*.ads=$(FileName)
+
+command.compile.*.adb=$(adagcc)
+command.build.*.adb=gnatmake
+command.go.*.adb=$(FileName)
+
+module asl
+file.patterns.asl=*.asl;*.dsl
+lexer.$(file.patterns.asl)=cpp
+
+keywordclass.asl=\
+AccessAs Acquire Add Alias And Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Arg6 \
+BankField Break BreakPoint Buffer Case Concatenate ConcatenateResTemplate \
+CondRefOf Connection Continue CopyObject CreateBitField CreateByteField \
+CreateDWordField CreateField CreateQWordField CreateWordField DataTableRegion \
+Debug Decrement Default DefinitionBlock DerefOf Device Device Divide DMA \
+DWordIO DWordMemory DWordSpace EisaId ElseIf Else EndDependentFn Event \
+ExtendedIO ExtendedMemory ExtendedMemory ExtendedSpace External Fatal Field \
+FindSetLeftBit FindSetRightBit FixedDMA FixedIO FromBCD Function GpioInt GpioIo \
+I2CSerialBus If Include Increment Index IndexField Interrupt IO IRQNoFlags IRQ \
+LAnd LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual LNot Load LoadTable \
+Local0 Local1 Local2 Local3 Local4 Local5 Local6 Local7 LOr Match Memory24 \
+Memory32 Memory32Fixed Method Mid Mod Multiply Mutex Name NAnd NoOp NOr Not \
+Notify Offset ObjectType Ones One OperationRegion Or Package PowerResource \
+Processor QWordIO QWordMemory QWordSpace RawDataBuffer RefOf Register Release \
+Reset ResourceTemplate Return Revision Scope ShiftLeft ShiftRight Signal SizeOf \
+Sleep SPISerialBus Stall StartDependentFn StartDependentFnNoPri Store Subtract \
+Switch ThermalZone Timer ToBCD ToBuffer ToDecimalString ToHexString ToInteger \
+ToString ToUUID UARTSerialBus Unicode Unload VendorLong VendorShort Wait While \
+WordBusNumber WordIO WordSpace XOr Zero
+
+keywordclass2.asl=\
+AttribQuick AttribSendReceive AttribByte AttribBytes AttribRawBytes \
+AttribRawProcessBytes AttribWord AttribBlock AttribProcessCall AttribBlockProcessCall \
+AnyAcc ByteAcc WordAcc DWordAcc QWordAcc BufferAcc AddressRangeMemory \
+AddressRangeReserved AddressRangeNVS AddressRangeACPI RegionSpaceKeyword \
+FFixedHW PCC AddressingMode7Bit AddressingMode10Bit DataBitsFive DataBitsSix \
+DataBitsSeven DataBitsEight DataBitsNine BusMaster NotBusMaster ClockPhaseFirst \
+ClockPhaseSecond ClockPolarityLow ClockPolarityHigh SubDecode PosDecode BigEndianing \
+LittleEndian AttribBytes AttribRawBytes AttribRawProcessBytes FlowControlNone \
+FlowControlXon FlowControlHardware Edge Level ActiveHigh ActiveLow ActiveHigh \
+ActiveLow ActiveBoth Decode16 Decode10 IoRestrictionNone IoRestrictionInputOnly \
+IoRestrictionOutputOnly IoRestrictionNoneAndPreserve Lock NoLock \
+MTR MEQ MLE MLT MGE MGT MaxFixed MaxNotFixed Cacheable WriteCombining Prefetchable \
+NonCacheable MinFixed MinNotFixed UnknownObj IntObj StrObj BuffObj PkgObj FieldUnitObj \
+DeviceObj EventObj MethodObj MutexObj OpRegionObj PowerResObj ProcessorObj \
+ThermalZoneObj BuffFieldObj DDBHandleObj ParityTypeNone ParityTypeSpace ParityTypeMark \
+ParityTypeOdd ParityTypeEven PullDefault PullUp PullDown PullNone PolarityHigh \
+PolarityLow ISAOnlyRanges NonISAOnlyRanges EntireRange ReadWrite ReadOnly \
+UserDefRegionSpace SystemIO SystemMemory PCI_Config EmbeddedControl SMBus SystemCMOS \
+PciBarTarget IPMI GeneralPurposeIO GenericSerialBus ResourceConsumer ResourceProducer \
+Serialized NotSerialized Shared Exclusive SharedAndWake ExclusiveAndWake \
+ControllerInitiated DeviceInitiated StopBitsZero StopBitsOne StopBitsOnePlusHalf \
+StopBitsTwo Width8Bit Width16Bit Width32Bit Width64Bit Width128Bit Width256Bit \
+SparseTranslation DenseTranslation TypeTranslation TypeStatic Preserve WriteAsOnes \
+WriteAsZeros Transfer8 Transfer16 Transfer8_16 ThreeWireMode FourWireMode
+
+keywords.$(file.patterns.asl)=$(keywordclass.asl)
+keywords2.$(file.patterns.asl)=$(keywordclass2.asl)
+
+module asm
+
+file.patterns.asm=*.asm
+file.patterns.as=*.s
+
+*source.patterns.asm=$(file.patterns.asm);
+
+filter.asm=Assembler x86/x64 (asm)|$(file.patterns.asm)|
+filter.as=Assembler x86/x64 (as)|$(file.patterns.as)|
+
+*filter.asm=$(filter.asm)
+
+lexer.$(file.patterns.asm)=asm
+lexer.$(file.patterns.as)=as
+
+*language.assembler=Assembler|asm||
+
+
+bcd_instruction=aaa aad aam aas daa das
+flow_instruction=ja jae jb jbe jc jcxz je jg jge jl jle jmp jna \
+	jnae jnb jnbe jnc jne jng jnge jnl jnle jno jnp jns jnz \
+	jo jp jpe jpo js jz \
+	jcxz jecxz jrcxz \
+	loop loope loopne loopz loopnz \
+	call ret
+
+alu_instruction=add sub adc sbb neg cmp inc dec \
+	and or xor not test \
+	shl shr sal sar shld shrd rol ror rcl rcr \
+	cbw cwd cwde cdq cdqe cqo \
+	bsf bsr bt btc btr bts \
+	idiv imul div mul bswap \
+	nop
+
+mem_instruction=lea \
+	mov movsx movsxd movzx \
+	xlatb bound \
+	xchg xadd cmpxchg cmpxchg8b cmpxchg16b
+
+stack_instruction=push pop pushad popad pushf popf pushfd popfd pushfq popfq
+
+pred_instruction=seta setae setb setbe setc sete setg setge setl \
+	setle setna setnae setnb setnbe setnc setne setng setnge \
+	setnl setnle setno setnp setns setnz seto setp setpe setpo \
+	sets setz \
+	salc
+
+flag_instruction=clc cld stc std cmc lahf sahf
+
+cmov_instruction=cmovo cmovno cmovb cmovc cmovnae cmovae cmovnb \
+	cmovnc cmove cmovz cmovne cmovnz cmovbe cmovna cmova \
+	cmovnbe cmovs cmovns cmovp cmovpe cmovnp cmovpo cmovl \
+	cmovnge cmovge cmovnl cmovle cmovng cmovg cmovnle
+
+prefix_instruction=lock rep repe repz repne repnz
+
+string_instruction=cmpsb cmpsw cmpsq \
+	movsb movsw movsq \
+	scasb scasw scasd scasq \
+	stosb stosw stosd stosq
+
+info_instruction=cpuid rdtsc rdtscp rdpmc xgetbv
+
+lwp_instruction=llwpcb slwpcb lwpval lwpins
+
+ext_instruction=crc32 popcnt lzcnt tzcnt movbe pclmulqdq rdrand
+
+bmi1_instruction=andn bextr blsi blsmk blsr
+
+bmi2_instruction=bzhi mulx pdep pext rorx sarx shlx shrx
+
+tbm_instruction=blcfill blci blcic blcmsk blcs blsfill blsic t1mskc tzmsk
+
+fpu_instruction=f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcom fcomp fcompp fdecstp \
+	fdisi fdiv fdivp fdivr fdivrp feni ffree fiadd ficom ficomp fidiv \
+	fidivr fild fimul fincstp finit fist fistp fisub fisubr fld fld1 \
+	fldcw fldenv fldenvw fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul \
+	fmulp fnclex fndisi fneni fninit fnop fnsave fnsavew fnstcw fnstenv \
+	fnstenvw fnstsw fpatan fprem fptan frndint frstor frstorw fsave \
+	fsavew fscale fsqrt fst fstcw fstenv fstenvw fstp fstsw fsub fsubp \
+	fsubr fsubrp ftst fwait fxam fxch fxtract fyl2x fyl2xp1 \
+	fsetpm fcos fldenvd fnsaved fnstenvd fprem1 frstord fsaved fsin fsincos \
+	fstenvd fucom fucomp fucompp fcomi fcomip fucomi fucomip ffreep \
+	fcmovb fcmove fcmovbe fcmovu fcmovnb fcmovne fcmovnbe fcmovnu
+
+mmx_instruction=movd movq \
+	paddb paddw paddd paddsb paddsw paddusb paddusw \
+	psubb psubw psubd psubsb psubsw psubusb psubusw \
+	pand pandn por pxor \
+	pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw \
+	pmaddwd pmulhw pmullw \
+	psllw pslld psllq psrlw psrld psrlq psraw psrad \
+	packuswb packsswb packssdw \
+	punpcklbw punpcklwd punpckldq punpckhbw punpckhwd punpckhdq \
+	emms
+
+mmx2_instruction=pavgb pavgw \
+	pextrw pinsrw pmovmskb \
+	pmaxsw pmaxub pminsw pminub \
+	pmulhuw psadbw pshufw \
+	prefetchnta prefetcht0 prefetcht1 prefetcht2 \
+	maskmovq movntq sfence
+
+emmx_instruction=paddsiw psubsiw \
+	pmulhrw pmachriw pmulhriw \
+	pmagw pdistib paveb \
+	pmvzb pmvnzb pmvlzb pmvgezb
+
+k3d_instruction=pfacc pfadd pfsub pfsubr pfmul \
+	pfcmpeq pfcmpge pfcmpgt \
+	pfmax pfmin \
+	pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt \
+	pi2fd pf2id \
+	pavgusb pmulhrw \
+	femms
+
+k3d2_instruction=pfnacc pfpnacc pi2fw pf2iw pswapd
+
+k3dgeode_instruction=pfrsqrtv pfrcpv
+
+k3dprefetch_instruction=prefetch prefetchw
+
+sse_instruction=addss addps subss subps \
+	mulss mulps divss divps sqrtss sqrtps \
+	rcpss rcpps rsqrtss rsqrtps \
+	maxss maxps minss minps \
+	cmpss comiss ucomiss cmpps \
+	cmpeqss cmpltss cmpless cmpunordss cmpneqss cmpnltss cmpnless cmpordss \
+	cmpeqps cmpltps cmpleps cmpunordps cmpneqps cmpnltps cmpnleps cmpordps \
+	andnps andps orps xorps \
+	cvtsi2ss cvtss2si cvttss2si \
+	cvtpi2ps cvtps2pi cvttps2pi \
+	movss movlps movhps movlhps movhlps movaps movups movntps movmskps \
+	shufps unpckhps unpcklps \
+	ldmxcsr stmxcsr
+
+sse2_instruction=addpd addsd subpd subsd \
+	mulsd mulpd divsd divpd sqrtsd sqrtpd \
+	maxsd maxpd minsd minpd \
+	cmpsd comisd ucomisd cmppd \
+	cmpeqsd cmpltsd cmplesd cmpunordsd cmpneqsd cmpnltsd cmpnlesd cmpordsd \
+	cmpeqpd cmpltpd cmplepd cmpunordpd cmpneqpd cmpnltpd cmpnlepd cmpordpd \
+	andnpd andpd orpd xorpd \
+	cvtsd2ss cvtpd2ps cvtss2sd cvtps2pd \
+	cvtdq2ps cvtps2dq cvttps2dq \
+	cvtdq2pd cvtpd2dq cvttpd2dq \
+	cvtsi2sd cvtsd2si cvttsd2si \
+	cvtpi2pd cvtpd2pi cvttpd2pi \
+	movsd movlpd movhpd movapd movupd movntpd movmskpd \
+	shufpd unpckhpd unpcklpd \
+	movnti movdqa movdqu movntdq maskmovdqu \
+	movdq2q movq2dq \
+	paddq psubq pmuludq \
+	pslldq psrldq \
+	punpcklqdq punpckhqdq \
+	pshufhw pshuflw pshufd \
+	lfence mfence
+
+sse3_instruction=addsubps addsubpd \
+	haddps haddpd hsubps hsubpd \
+	movsldup movshdup movddup \
+	lddqu \
+	fisttp
+
+ssse3_instruction=psignb psignw psignd \
+	pabsb pabsw pabsd \
+	palignr pshufb \
+	pmulhrsw pmaddubsw \
+	phaddw phaddd phaddsw \
+	phsubw phsubd phsubsw
+
+sse4a_instruction=extrq insertq \
+	movntsd movntss
+
+sse41_instruction=mpsadbw phminposuw \
+	pmuldq pmulld \
+	dpps dppd \
+	blendps blendpd blendvps blendvpd pblendvb pblendw \
+	pmaxsb pmaxuw pmaxsd pmaxud pminsb pminuw pminsd pminud \
+	roundps roundss roundpd roundsd \
+	insertps pinsrb pinsrd pinsrq \
+	extractps pextrb pextrd pextrq \
+	pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq \
+	pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq \
+	ptest \
+	pcmpeqq \
+	packusdw \
+	movntdqa
+
+sse42_instruction=pcmpgtq \
+	pcmpestri pcmpestrm pcmpistri pcmpistrm
+
+aes_instruction=aesenc aesenclast aesdec aesdeclast aeskeygenassist aesimc
+
+padlock_instruction=xcryptcbc xcryptcfb xcryptctr xcryptecb xcryptofb \
+	xsha1 xsha256 montmul xstore
+
+
+avx_instruction=vaddss vaddps vaddsd vaddpd vsubss vsubps vsubsd vsubpd \
+	vaddsubps vaddsubpd \
+	vhaddps vhaddpd vhsubps vhsubpd \
+	vmulss vmulps vmulsd vmulpd \
+	vmaxss vmaxps vmaxsd vmaxpd vminss vminps vminsd vminpd \
+	vandps vandpd vandnps vandnpd vorps vorpd vxorps vxorpd \
+	vblendps vblendpd vblendvps vblendvpd \
+	vcmpss vcomiss vucomiss vcmpsd vcomisd vucomisd vcmpps vcmppd \
+	vcmpeqss vcmpltss vcmpless vcmpunordss vcmpneqss vcmpnltss vcmpnless vcmpordss \
+	vcmpeq_uqss vcmpngess vcmpngtss vcmpfalsess vcmpneq_oqss vcmpgess vcmpgtss vcmptruess \
+	vcmpeq_osss vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss \
+	vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss \
+	vcmpeqps vcmpltps vcmpleps vcmpunordps vcmpneqps vcmpnltps vcmpnleps vcmpordps \
+	vcmpeq_uqps vcmpngeps vcmpngtps vcmpfalseps vcmpneq_oqps vcmpgeps vcmpgtps vcmptrueps \
+	vcmpeq_osps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps \
+	vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps \
+	vcmpeqsd vcmpltsd vcmplesd vcmpunordsd vcmpneqsd vcmpnltsd vcmpnlesd vcmpordsd \
+	vcmpeq_uqsd vcmpngesd vcmpngtsd vcmpfalsesd vcmpneq_oqsd vcmpgesd vcmpgtsd vcmptruesd \
+	vcmpeq_ossd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd \
+	vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd \
+	vcmpeqpd vcmpltpd vcmplepd vcmpunordpd vcmpneqpd vcmpnltpd vcmpnlepd vcmpordpd \
+	vcmpeq_uqpd vcmpngepd vcmpngtpd vcmpfalsepd vcmpneq_oqpd vcmpgepd vcmpgtpd vcmptruepd \
+	vcmpeq_ospd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd \
+	vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd \
+	vcvtsd2ss vcvtpd2ps vcvtss2sd vcvtps2pd \
+	vcvtsi2ss vcvtss2si vcvttss2si \
+	vcvtpi2ps vcvtps2pi vcvttps2pi \
+	vcvtdq2ps vcvtps2dq vcvttps2dq \
+	vcvtdq2pd vcvtpd2dq vcvttpd2dq \
+	vcvtsi2sd vcvtsd2si vcvttsd2si \
+	vcvtpi2pd vcvtpd2pi vcvttpd2pi \
+	vdivss vdivps vdivsd vdivpd vsqrtss vsqrtps vsqrtsd vsqrtpd \
+	vdpps vdppd \
+	vmaskmovps vmaskmovpd \
+	vmovss vmovsd vmovaps vmovapd vmovups vmovupd vmovntps vmovntpd \
+	vmovhlps vmovlhps vmovlps vmovlpd vmovhps vmovhpd \
+	vmovsldup vmovshdup vmovddup \
+	vmovmskps vmovmskpd \
+	vroundss vroundps vroundsd vroundpd \
+	vrcpss vrcpps vrsqrtss vrsqrtps \
+	vunpcklps vunpckhps vunpcklpd vunpckhpd \
+	vbroadcastss vbroadcastsd vbroadcastf128 \
+	vextractps vinsertps vextractf128 vinsertf128 \
+	vshufps vshufpd vpermilps vpermilpd vperm2f128 \
+	vtestps vtestpd \
+	vpaddb vpaddusb vpaddsb vpaddw vpaddusw vpaddsw vpaddd vpaddq \
+	vpsubb vpsubusb vpsubsb vpsubw vpsubusw vpsubsw vpsubd vpsubq \
+	vphaddw vphaddsw vphaddd vphsubw vphsubsw vphsubd \
+	vpsllw vpslld vpsllq vpsrlw vpsrld vpsrlq vpsraw vpsrad \
+	vpand vpandn vpor vpxor \
+	vpblendwb vpblendw \
+	vpsignb vpsignw vpsignd \
+	vpavgb vpavgw \
+	vpabsb vpabsw vpabsd \
+	vmovd vmovq vmovdqa vmovdqu vlddqu vmovntdq vmovntdqa vmaskmovdqu \
+	vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq \
+	vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq \
+	vpackuswb vpacksswb vpackusdw vpackssdw \
+	vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq \
+	vpmaddubsw vpmaddwd \
+	vpmullw vpmulhuw vpmulhw vpmulhrsw vpmulld vpmuludq vpmuldq \
+	vpmaxub vpmaxsb vpmaxuw vpmaxsw vpmaxud vpmaxsd \
+	vpminub vpminsb vpminuw vpminsw vpminud vpminsd \
+	vpmovmskb vptest \
+	vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq \
+	vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq \
+	vpslldq vpsrldq vpalignr \
+	vpshufb vpshuflw vpshufhw vpshufd \
+	vpextrb vpextrw vpextrd vpextrq vpinsrb vpinsrw vpinsrd vpinsrq \
+	vpsadbw vmpsadbw vphminposuw \
+	vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm \
+	vpclmulqdq vaesenc vaesenclast vaesdec vaesdeclast vaeskeygenassist vaesimc \
+	vldmxcsr vstmxcsr vzeroall vzeroupper
+
+avx2_instruction=vbroadcasti128 vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq \
+	vpblendd \
+	vpermd vpermq vperm2i128 \
+	vextracti128 vinserti128 \
+	vpmaskmovd vpmaskmovq \
+	vpsllvd vpsllvq vpsravd vpsrlvd vpsrldq \
+	vpgatherdd vpgatherqd vgatherdq vgatherqq \
+	vpermps vpermpd \
+	vgatherdpd vgatherqpd vgatherdps vgatherqps
+
+xop_instruction=vfrczss vfrczps vfrczsd vfrczpd \
+	vpermil2ps vperlil2pd \
+	vtestps vtestpd \
+	vpcomub vpcomb vpcomuw vpcomw vpcomud vpcomd vpcomuq vpcomq \
+	vphaddubw vphaddbw vphaddubd vphaddbd vphaddubq vphaddbq \
+	vphadduwd vphaddwd vphadduwq vphaddwq vphaddudq vphadddq \
+	vphsubbw vphsubwd vphsubdq \
+	vpmacsdd vpmacssdd vpmacsdql vpmacssdql vpmacsdqh vpmacssdqh \
+	vpmacsww vpmacssww vpmacswd vpmacsswd \
+	vpmadcswd vpmadcsswd \
+	vpcmov vpperm \
+	vprotb vprotw vprotd vprotq \
+	vpshab vpshaw vpshad vpshaq \
+	vpshlb vpshlw vpshld vpshlq
+
+cvt16_instruction=vcvtph2ps vcvtps2ph
+
+fma4_instruction=vfmaddss vfmaddps vfmaddsd vfmaddpd \
+	vfmsubss vfmsubps vfmsubsd vfmsubpd \
+	vnfmaddss vnfmaddps vnfmaddsd vnfmaddpd \
+	vnfmsubss vnfmsubps vnfmsubsd vnfmsubpd \
+	vfmaddsubps vfmaddsubpd vfmsubaddps vfmsubaddpd
+
+fma3_instruction=vfmadd132ss vfmadd213ss vfmadd231ss \
+	vfmadd132ps vfmadd213ps vfmadd231ps \
+	vfmadd132sd vfmadd213sd vfmadd231sd \
+	vfmadd132pd vfmadd213pd vfmadd231pd \
+	vfmaddsub132ps vfmaddsub213ps vfmaddsub231ps \
+	vfmaddsub132pd vfmaddsub213pd vfmaddsub231pd \
+	vfmsubadd132ps vfmsubadd213ps vfmsubadd231ps \
+	vfmsubadd132pd vfmsubadd213pd vfmsubadd231pd \
+	vfmsub132ss vfmsub213ss vfmsub231ss \
+	vfmsub132ps vfmsub213ps vfmsub231ps \
+	vfmsub132sd vfmsub213sd vfmsub231sd \
+	vfmsub132pd vfmsub213pd vfmsub231pd \
+	vfnmadd132ss vfnmadd213ss vfnmadd231ss \
+	vfnmadd132ps vfnmadd213ps vfnmadd231ps \
+	vfnmadd132sd vfnmadd213sd vfnmadd231sd \
+	vfnmadd132pd vfnmadd213pd vfnmadd231pd \
+	vfnmsub132ss vfnmsub213ss vfnmsub231ss \
+	vfnmsub132ps vfnmsub213ps vfnmsub231ps \
+	vfnmsub132sd vfnmsub213sd vfnmsub231sd \
+	vfnmsub132pd vfnmsub213pd vfnmsub231pd
+
+register=al ah bl bh cl ch dl dh \
+	ax bx cx dx si di bp \
+	eax ebx ecx edx esi edi ebx esp \
+	st0 st1 st2 st3 st4 st5 st6 st7 \
+	mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 \
+	xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 \
+	ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 \
+	fs
+
+register_64=sil dil bpl \
+	r8b r9b r10b r11b r12b r13b r14b r15b \
+	r8w r9w r10w r11w r12w r13w r14w r15w \
+	rax rcx rdx rbx rsp rbp rsi rdi \
+	r8 r9 r10 r11 r12 r13 r14 r15 \
+	xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 \
+	ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 \
+	gs
+
+directive_nasm=db dw dd dq dt do dy \
+	resb resw resd resq rest reso resy incbin equ times safeseh \
+	__utf16__ __utf32__ %+ \
+	default cpu float start imagebase osabi \
+	..start ..imagebase ..gotpc ..gotoff ..gottpoff ..got ..plt ..sym ..tlsie \
+	section segment __sect__ group absolute \
+	.bss .comment .data .lbss .ldata .lrodata .rdata .rodata .tbss .tdata .text \
+	alloc bss code exec data noalloc nobits noexec nowrite progbits rdata tls write \
+	private public common stack overlay class \
+	extern global common import export \
+	%define %idefine %xdefine %ixdefine %assign %undef %? %?? \
+	%defstr %idefstr %deftok %ideftok \
+	%strcat %strlen %substr \
+	%macro %imacro %rmacro %exitmacro %endmacro %unmacro \
+	%if %ifn %elif %elifn %else %endif \
+	%ifdef %ifndef %elifdef %elifndef \
+	%ifmacro %ifnmacro %elifmacro %elifnmacro \
+	%ifctx %ifnctx %elifctx %elifnctx \
+	%ifidn %ifnidn %elifidn %elifnidn \
+	%ifidni %ifnidni %elifidni %elifnidni \
+	%ifid %ifnid %elifid %elifnid \
+	%ifnum %ifnnum %elifnum %elifnnum \
+	%ifstr %ifnstr %elifstr %elifnstr \
+	%iftoken %ifntoken %eliftoken %elifntoken \
+	%ifempty %elifempty %ifnempty %elifnempty \
+	%ifenv %ifnenv %elifenv %elifnenv \
+	%rep %exitrep %endrep \
+	%while %exitwhile %endwhile \
+	%include %pathsearch %depend %use \
+	%push %pop %repl %arg %local %stacksize flat flat64 large small \
+	%error %warning %fatal \
+	%00 .nolist %rotate %line %! %final %clear \
+	struc endstruc istruc at iend \
+	align alignb sectalign \
+	bits use16 use32 use64 \
+	__nasm_major__ __nasm_minor__ __nasm_subminor__ ___nasm_patchlevel__ \
+	__nasm_version_id__ __nasm_ver__ \
+	__file__ __line__ __pass__ __bits__ __output_format__ \
+	__date__ __time__ __date_num__ __time_num__ __posix_time__ \
+	__utc_date__ __utc_time__ __utc_date_num__ __utc_time_num__ \
+	__float_daz__ __float_round__ __float__ \
+	__use_altreg__ altreg \
+	__use_smartalign__ smartalign __alignmode__ \
+	__use_fp__ __infinity__ __nan__ __qnan__ __snan__ \
+	__float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__
+
+directive_operand_nasm=a16 a32 a64 o16 o32 o64 strict \
+	byte word dword qword tword oword yword nosplit \
+	%0 %1 %2 %3 %4 %5 %6 %7 %8 %9 \
+	abs rel \
+	$ $$ \
+	seg wrt
+
+keywords.$(file.patterns.asm)=$(bcd_instruction) $(flow_instruction) $(alu_instruction) $(mem_instruction) $(stack_instruction) $(pred_instruction) $(flag_instruction) $(cmov_instruction) $(prefix_instruction) $(string_instruction) $(info_instruction) $(lwp_instruction) $(ext_instruction) $(bmi1_instruction) $(bmi2_instruction)
+keywords2.$(file.patterns.asm)=$(fpu_instruction)
+keywords3.$(file.patterns.asm)=$(register) $(register_64)
+keywords4.$(file.patterns.asm)=$(directive_nasm)
+keywords5.$(file.patterns.asm)=$(directive_operand_nasm)
+keywords6.$(file.patterns.asm)=$(mmx_instruction) $(mmx2_instruction) $(emmx_instruction) $(k3d_instruction) $(k3d2_instruction) $(k3dgeode_instruction) $(k3dprefetch_instruction) $(sse_instruction) $(sse2_instruction) $(sse3_instruction) $(ssse3_instruction) $(sse4a_instruction) $(sse41_instruction) $(sse42_instruction) $(aes_instruction) $(padlock_instruction) $(avx_instruction) $(avx2_instruction) $(xop_instruction) $(cvt16_instruction) $(fma4_instruction) $(fma3_instruction)
+
+keywords.$(file.patterns.as)=$(bcd_instruction) $(flow_instruction) $(alu_instruction) $(mem_instruction) $(stack_instruction) $(pred_instruction) $(flag_instruction) $(cmov_instruction) $(prefix_instruction) $(string_instruction) $(info_instruction) $(lwp_instruction) $(ext_instruction) $(bmi1_instruction) $(bmi2_instruction)
+keywords2.$(file.patterns.as)=$(fpu_instruction)
+keywords3.$(file.patterns.as)=$(register) $(register_64)
+keywords4.$(file.patterns.as)=$(directive_nasm)
+keywords5.$(file.patterns.as)=$(directive_operand_nasm)
+keywords6.$(file.patterns.as)=$(mmx_instruction) $(mmx2_instruction) $(emmx_instruction) $(k3d_instruction) $(k3d2_instruction) $(k3dgeode_instruction) $(k3dprefetch_instruction) $(sse_instruction) $(sse2_instruction) $(sse3_instruction) $(ssse3_instruction) $(sse4a_instruction) $(sse41_instruction) $(sse42_instruction) $(aes_instruction) $(padlock_instruction) $(avx_instruction) $(avx2_instruction) $(xop_instruction) $(cvt16_instruction) $(fma4_instruction) $(fma3_instruction)
+
+comment.block.asm=;
+comment.block.as=#
+
+
+style.asm.0=
+style.as.0=$(style.asm.0)
+style.asm.1=fore:#adadad
+style.as.1=$(style.asm.1)
+style.asm.2=fore:#ff0000
+style.as.2=$(style.asm.2)
+style.asm.3=$(colour.string)
+style.as.3=$(style.asm.3)
+style.asm.4=$(colour.operator),bold
+style.as.4=$(style.asm.4)
+style.asm.5=
+style.as.5=$(style.asm.5)
+style.asm.6=$(colour.keyword),bold
+style.as.6=$(style.asm.6)
+style.asm.7=fore:#0000ff
+style.as.7=$(style.asm.7)
+style.asm.8=fore:#46aa03,bold
+style.as.8=$(style.asm.8)
+style.asm.9=fore:#0000ff
+style.as.9=$(style.asm.9)
+style.asm.10=fore:#0000ff
+style.as.10=$(style.asm.10)
+style.asm.11=$(colour.code.comment.box),$(font.code.comment.box)
+style.as.11=$(style.asm.11)
+style.asm.12=$(colour.char)
+style.as.12=$(style.asm.12)
+style.asm.13=fore:#000000,back:#E0C0E0,eolfilled
+style.as.13=$(style.asm.13)
+style.asm.14=fore:#B00040
+style.as.14=$(style.asm.14)
+style.asm.15=fore:#66AA00
+style.as.15=$(style.asm.15)
+
+
+command.compile.$(file.patterns.asm)=nasm $(FileNameExt)
+
+command.name.0.*.asm=Link
+command.0.*.asm=link $(FileName)
+
+
+statement.indent.$(file.patterns.asm)=9 .if
+statement.indent.$(file.patterns.as)=9 .if
+
+module asn1
+
+filter.asn1=ASN.1 (asn1)|*.mib|
+
+*filter.asn1=$(filter.asn1)
+
+file.patterns.asn1=*.mib
+
+lexer.$(file.patterns.asn1)=asn1
+
+*language.asn=ASN.1|mib||
+
+style.asn1.0=fore:#000000
+style.asn1.1=fore:#007F00,$(font.comment)
+style.asn1.2=fore:#000000,bold
+style.asn1.3=fore:#7F007F
+style.asn1.4=fore:#007F7F,bold
+style.asn1.5=fore:#7F0000
+style.asn1.6=fore:#00007F
+style.asn1.7=fore:#F07800
+style.asn1.8=fore:#00007F
+style.asn1.9=fore:#00007F
+style.asn1.10=fore:#222222
+
+keywords.$(file.patterns.asn1)=\
+ACCESS AGENT AUGMENTS \
+BEGIN BITS \
+CAPABILITIES CHOICE COMPLIANCE CONTACT CONVENTION \
+DEFINITIONS DEFVAL DESCRIPTION DISPLAY \
+END ENTERPRISE EXPORTS \
+FALSE FROM \
+GROUP GROUPS \
+HINT \
+IDENTITY IMPLIED IMPORTS INCLUDES INDEX INFO \
+LAST \
+MANDATORY MAX MIN MODULE \
+NOTATION NOTIFICATION NULL \
+OBJECTS OBJECT-TYPE OF ORGANIZATION \
+PRODUCT \
+RELEASE REFERENCE REQUIRES REVISION \
+SEQUENCE SIZE STATUS SUPPORTS SYNTAX \
+TEXTUAL TRAP TYPE TRAP-TYPE \
+UPDATED \
+VALUE VARIABLES VARIATION \
+WRITE
+
+keywords2.$(file.patterns.asn1)=\
+accessible \
+create current \
+deprecated \
+for \
+mandatory \
+not notify not-accessible \
+obsolete only optional \
+read read-only read-write \
+write
+
+keywords3.$(file.patterns.asn1)=\
+ABSENT ANY APPLICATION \
+BIT BOOLEAN BY \
+COMPONENT COMPONENTS \
+DEFAULT DEFINED \
+ENUMERATED EXPLICIT EXTERNAL \
+IMPLICIT INIFINITY \
+MAX MIN MINUS \
+OPTIONAL \
+PRESENT PRIVATE \
+REAL \
+SET \
+TAGS TRUE
+
+keywords4.$(file.patterns.asn1)=\
+Counter Counter32 Counter64 \
+DisplayString \
+Gauge Gauge32 \
+IDENTIFIER INTEGER Integer32 IpAddress \
+NetworkAddress NsapAddress \
+OBJECT OCTET Opaque \
+PhysAddress \
+STRING \
+TimeTicks \
+UInteger32 UNITS Unsigned32
+
+
+module au3
+
+file.patterns.au3=*.au3
+filter.au3=AutoIt (au3)|$(file.patterns.au3)|
+lexer.$(file.patterns.au3)=au3
+
+*filter.au3=$(filter.au3)
+*language.au3=AutoIt|au3||
+*source.patterns.au3=$(file.patterns.au3);
+
+autocomplete.au3.ignorecase=1
+autocomplete.au3.start.characters=$(chars.alpha)$(chars.numeric)_@#$
+calltip.au3.end.definition=)
+calltip.au3.ignorecase=1
+calltip.au3.use.escapes=1
+calltip.au3.word.characters=$(chars.alpha)$(chars.numeric)_.
+word.characters.$(file.patterns.au3)=$(chars.alpha)$(chars.numeric)$(chars.accented)_@#$.
+
+indent.size.$(file.patterns.au3)=4
+tab.size.$(file.patterns.au3)=4
+use.tabs.$(file.patterns.au3)=1
+
+block.start.$(file.patterns.au3)=5\
+ case if do for func else elseif while select switch with\
+ Case If Do For Func Else ElseIf While Select Switch With\
+ CASE IF DO FOR FUNC ELSE ELSEIF WHILE SELECT SWITCH WITH
+
+block.end.$(file.patterns.au3)=5\
+ case else endif elseif endfunc endselect endswitch next until wend endwith\
+ Case Else EndIf ElseIf EndFunc EndSelect EndSwitch Next Until WEnd EndWith Wend\
+ CASE ELSE ENDIF ELSEIF ENDFUNC ENDSELECT ENDSWITCH NEXT UNTIL WEND ENDWITH
+
+comment.block.au3=;~
+comment.block.at.line.start.au3=1
+comment.box.start.au3=#cs
+comment.box.middle.au3=;
+comment.box.end.au3=#ce
+comment.stream.start.au3=#cs
+comment.stream.end.au3=#ce
+
+
+keywords.$(file.patterns.au3)=and byref case const continuecase continueloop default dim\
+ do else elseif endfunc endif endselect endswitch endwith enum exit exitloop false\
+ for func global if in local next not null or redim return select static step switch\
+ then to true until volatile wend while with
+
+keywords2.$(file.patterns.au3)=abs acos adlibregister adlibunregister asc ascw asin assign\
+ atan autoitsetoption autoitwingettitle autoitwinsettitle beep binary binarylen binarymid\
+ binarytostring bitand bitnot bitor bitrotate bitshift bitxor blockinput break call\
+ cdtray ceiling chr chrw clipget clipput consoleread consolewrite consolewriteerror\
+ controlclick controlcommand controldisable controlenable controlfocus controlgetfocus\
+ controlgethandle controlgetpos controlgettext controlhide controllistview controlmove\
+ controlsend controlsettext controlshow controltreeview cos dec dircopy dircreate\
+ dirgetsize dirmove dirremove dllcall dllcalladdress dllcallbackfree dllcallbackgetptr\
+ dllcallbackregister dllclose dllopen dllstructcreate dllstructgetdata dllstructgetptr\
+ dllstructgetsize dllstructsetdata drivegetdrive drivegetfilesystem drivegetlabel\
+ drivegetserial drivegettype drivemapadd drivemapdel drivemapget drivesetlabel drivespacefree\
+ drivespacetotal drivestatus envget envset envupdate eval execute exp filechangedir\
+ fileclose filecopy filecreatentfslink filecreateshortcut filedelete fileexists filefindfirstfile\
+ filefindnextfile fileflush filegetattrib filegetencoding filegetlongname filegetpos\
+ filegetshortcut filegetshortname filegetsize filegettime filegetversion fileinstall\
+ filemove fileopen fileopendialog fileread filereadline filereadtoarray filerecycle\
+ filerecycleempty filesavedialog fileselectfolder filesetattrib filesetend filesetpos\
+ filesettime filewrite filewriteline floor ftpsetproxy funcname guicreate guictrlcreateavi\
+ guictrlcreatebutton guictrlcreatecheckbox guictrlcreatecombo guictrlcreatecontextmenu\
+ guictrlcreatedate guictrlcreatedummy guictrlcreateedit guictrlcreategraphic guictrlcreategroup\
+ guictrlcreateicon guictrlcreateinput guictrlcreatelabel guictrlcreatelist guictrlcreatelistview\
+ guictrlcreatelistviewitem guictrlcreatemenu guictrlcreatemenuitem guictrlcreatemonthcal\
+ guictrlcreateobj guictrlcreatepic guictrlcreateprogress guictrlcreateradio guictrlcreateslider\
+ guictrlcreatetab guictrlcreatetabitem guictrlcreatetreeview guictrlcreatetreeviewitem\
+ guictrlcreateupdown guictrldelete guictrlgethandle guictrlgetstate guictrlread guictrlrecvmsg\
+ guictrlregisterlistviewsort guictrlsendmsg guictrlsendtodummy guictrlsetbkcolor guictrlsetcolor\
+ guictrlsetcursor guictrlsetdata guictrlsetdefbkcolor guictrlsetdefcolor guictrlsetfont\
+ guictrlsetgraphic guictrlsetimage guictrlsetlimit guictrlsetonevent guictrlsetpos\
+ guictrlsetresizing guictrlsetstate guictrlsetstyle guictrlsettip guidelete guigetcursorinfo\
+ guigetmsg guigetstyle guiregistermsg guisetaccelerators guisetbkcolor guisetcoord\
+ guisetcursor guisetfont guisethelp guiseticon guisetonevent guisetstate guisetstyle\
+ guistartgroup guiswitch hex hotkeyset httpsetproxy httpsetuseragent hwnd inetclose\
+ inetget inetgetinfo inetgetsize inetread inidelete iniread inireadsection inireadsectionnames\
+ inirenamesection iniwrite iniwritesection inputbox int isadmin isarray isbinary isbool\
+ isdeclared isdllstruct isfloat isfunc ishwnd isint iskeyword isnumber isobj isptr\
+ isstring log memgetstats mod mouseclick mouseclickdrag mousedown mousegetcursor mousegetpos\
+ mousemove mouseup mousewheel msgbox number objcreate objcreateinterface objevent\
+ objevent objget objname onautoitexitregister onautoitexitunregister opt ping pixelchecksum\
+ pixelgetcolor pixelsearch processclose processexists processgetstats processlist\
+ processsetpriority processwait processwaitclose progressoff progresson progressset\
+ ptr random regdelete regenumkey regenumval regread regwrite round run runas runaswait\
+ runwait send sendkeepactive seterror setextended shellexecute shellexecutewait shutdown\
+ sin sleep soundplay soundsetwavevolume splashimageon splashoff splashtexton sqrt\
+ srandom statusbargettext stderrread stdinwrite stdioclose stdoutread string stringaddcr\
+ stringcompare stringformat stringfromasciiarray stringinstr stringisalnum stringisalpha\
+ stringisascii stringisdigit stringisfloat stringisint stringislower stringisspace\
+ stringisupper stringisxdigit stringleft stringlen stringlower stringmid stringregexp\
+ stringregexpreplace stringreplace stringreverse stringright stringsplit stringstripcr\
+ stringstripws stringtoasciiarray stringtobinary stringtrimleft stringtrimright stringupper\
+ tan tcpaccept tcpclosesocket tcpconnect tcplisten tcpnametoip tcprecv tcpsend tcpshutdown\
+ tcpstartup timerdiff timerinit tooltip traycreateitem traycreatemenu traygetmsg trayitemdelete\
+ trayitemgethandle trayitemgetstate trayitemgettext trayitemsetonevent trayitemsetstate\
+ trayitemsettext traysetclick trayseticon traysetonevent traysetpauseicon traysetstate\
+ traysettooltip traytip ubound udpbind udpclosesocket udpopen udprecv udpsend udpshutdown\
+ udpstartup vargettype winactivate winactive winclose winexists winflash wingetcaretpos\
+ wingetclasslist wingetclientsize wingethandle wingetpos wingetprocess wingetstate\
+ wingettext wingettitle winkill winlist winmenuselectitem winminimizeall winminimizeallundo\
+ winmove winsetontop winsetstate winsettitle winsettrans winwait winwaitactive winwaitclose\
+ winwaitnotactive
+
+keywords3.$(file.patterns.au3)=@appdatacommondir @appdatadir @autoitexe @autoitpid @autoitversion\
+ @autoitx64 @com_eventobj @commonfilesdir @compiled @computername @comspec @cpuarch\
+ @cr @crlf @desktopcommondir @desktopdepth @desktopdir @desktopheight @desktoprefresh\
+ @desktopwidth @documentscommondir @error @exitcode @exitmethod @extended @favoritescommondir\
+ @favoritesdir @gui_ctrlhandle @gui_ctrlid @gui_dragfile @gui_dragid @gui_dropid @gui_winhandle\
+ @homedrive @homepath @homeshare @hotkeypressed @hour @ipaddress1 @ipaddress2 @ipaddress3\
+ @ipaddress4 @kblayout @lf @localappdatadir @logondnsdomain @logondomain @logonserver\
+ @mday @min @mon @msec @muilang @mydocumentsdir @numparams @osarch @osbuild @oslang\
+ @osservicepack @ostype @osversion @programfilesdir @programscommondir @programsdir\
+ @scriptdir @scriptfullpath @scriptlinenumber @scriptname @sec @startmenucommondir\
+ @startmenudir @startupcommondir @startupdir @sw_disable @sw_enable @sw_hide @sw_lock\
+ @sw_maximize @sw_minimize @sw_restore @sw_show @sw_showdefault @sw_showmaximized\
+ @sw_showminimized @sw_showminnoactive @sw_showna @sw_shownoactivate @sw_shownormal\
+ @sw_unlock @systemdir @tab @tempdir @tray_id @trayiconflashing @trayiconvisible @username\
+ @userprofiledir @wday @windowsdir @workingdir @yday @year
+
+keywords4.$(file.patterns.au3)={!} {#} {^} {{} {}} {+} {alt} {altdown} {altup} {appskey}\
+ {asc} {backspace} {break} {browser_back} {browser_favorites} {browser_forward} {browser_home}\
+ {browser_refresh} {browser_search} {browser_stop} {bs} {capslock} {ctrldown} {ctrlup}\
+ {del} {delete} {down} {end} {enter} {esc} {escape} {f1} {f10} {f11} {f12} {f2} {f3}\
+ {f4} {f5} {f6} {f7} {f8} {f9} {home} {ins} {insert} {lalt} {launch_app1} {launch_app2}\
+ {launch_mail} {launch_media} {lctrl} {left} {lshift} {lwin} {lwindown} {lwinup} {media_next}\
+ {media_play_pause} {media_prev} {media_stop} {numlock} {numpad0} {numpad1} {numpad2}\
+ {numpad3} {numpad4} {numpad5} {numpad6} {numpad7} {numpad8} {numpad9} {numpadadd}\
+ {numpaddiv} {numpaddot} {numpadenter} {numpadmult} {numpadsub} {oem_102} {pause}\
+ {pgdn} {pgup} {printscreen} {ralt} {rctrl} {right} {rshift} {rwin} {rwindown} {rwinup}\
+ {scrolllock} {shiftdown} {shiftup} {sleep} {space} {tab} {up} {volume_down} {volume_mute}\
+ {volume_up}
+
+keywords5.$(file.patterns.au3)=#ce #comments-end #comments-start #cs #include #include-once\
+ #notrayicon #onautoitstartregister #requireadmin
+
+keywords6.$(file.patterns.au3)=#endregion #forcedef #forceref #ignorefunc #pragma #region\
+ $(autoit3wrapper.keywords.special)
+
+keywords7.$(file.patterns.au3)=$(au3.keywords.abbrev) $(au3.keywords.userabbrev)
+
+keywords8.$(file.patterns.au3)=$(au3.keywords.udfs)
+
+
+style.au3.0=fore:#000000
+style.au3.1=$(colour.code.comment.line)
+style.au3.2=back:#F7F7F7,eolfilled,$(colour.code.comment.box)
+style.au3.3=$(colour.number)
+style.au3.4=$(colour.keyword)
+style.au3.5=$(colour.keyword)
+style.au3.6=$(style.au3.9)
+style.au3.7=back:#FFF9FF,$(colour.string)
+style.au3.8=$(colour.operator)
+style.au3.9=fore:#800000
+style.au3.10=back:#FFF9FF,bold,$(colour.string)
+style.au3.11=back:#FFFFF8,$(colour.preproc)
+style.au3.12=fore:#B00000,back:#FFFDFD
+style.au3.13=fore:#FF0000
+style.au3.14=$(style.au3.9)
+style.au3.15=fore:#0080FF
+
+
+autoit3dir=$(SciteDefaultHome)\..
+
+api.$(file.patterns.au3)=$(SciteDefaultHome)\api\au3.api;$(SciteDefaultHome)\api\au3.autoit3wrapper.api;$(SciteUserHome)\au3.user.calltips.api
+
+command.help.$(file.patterns.au3)=$(CurrentWord)!$(autoit3dir)\AutoIt.chm
+command.help.subsystem.$(file.patterns.au3)=4
+
+command.compile.$(file.patterns.au3)="$(autoit3dir)\Aut2Exe\Aut2exe.exe" /in "$(FilePath)"
+command.build.$(file.patterns.au3)="$(autoit3dir)\Aut2Exe\Aut2exe.exe" /in "$(FilePath)" /x64
+command.go.$(file.patterns.au3)="$(autoit3dir)\AutoIt3.exe" /ErrorStdOut "$(FilePath)" $(1) $(2) $(3) $(4)
+
+command.0.$(file.patterns.au3)="$(autoit3dir)\Au3Check.exe" -q "$(FilePath)"
+command.name.0.$(file.patterns.au3)=Syntax Check
+command.shortcut.0.$(file.patterns.au3)=Ctrl+F5
+command.save.before.0.$(file.patterns.au3)=1
+
+module ave
+
+filter.ave=AVE (ave)|*.ave|
+
+*filter.ave=$(filter.ave)
+
+file.patterns.ave=*.ave
+
+lexer.*.ave=ave
+lexer.$(file.patterns.ave)=ave
+
+*language.avenue=Avenue|ave||
+
+
+keywords.$(file.patterns.ave)=nil true false else for if while then elseif end av self in exit
+word.chars.ave=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ave)=$(word.chars.ave)
+
+statement.indent.$(file.patterns.ave)=1 else for if while then
+statement.lookback.$(file.patterns.ave)=1 end
+
+
+
+comment.block.ave='--
+
+comment.box.start.ave='--
+comment.box.middle.ave='--
+comment.box.end.ave='--
+autocomplete.ave.ignorecase=1
+calltip.ave.ignorecase=1
+autocomplete.ave.start.characters=.
+calltip.ave.word.characters=.$(word.chars.ave)
+
+style.ave.32=$(font.code.base),fore:#000000
+style.ave.0=fore:#FF0000
+style.ave.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.ave.2=$(colour.number),bold
+style.ave.3=$(colour.keyword),bold
+style.ave.6=$(colour.string)
+style.ave.7=$(colour.preproc),bold
+style.ave.8=back:#E0C0E0,eolfilled
+style.ave.10=$(colour.operator)
+style.ave.9=$(font.code.base),fore:#000000
+style.ave.11=back:#FF0000
+style.ave.12=$(font.code.base),fore:#003355,bold
+style.ave.13=$(font.code.base),fore:#005533,bold
+style.ave.14=$(colour.keyword)
+style.ave.15=$(colour.keyword)
+style.ave.16=$(colour.keyword)
+braces.ave.style=10
+
+
+avenue=ave "$(FilePath)"
+avenueGo=avego "$(FilePath)"
+avenueBuild=avebuild "$(FilePath)"
+
+
+
+
+
+module avs
+
+file.patterns.avs=*.avs;*.avsi
+
+filter.avs=AviSynth (avs avsi)|$(file.patterns.avs)|
+
+lexer.$(file.patterns.avs)=avs
+
+word.chars.avs=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.avs)=$(word.chars.avs)
+
+autocomplete.avs.ignorecase=1
+autocomplete.avs.fillups=(
+calltip.avs_quote.ignorecase=1
+calltip.avs.word.characters=$(word.chars.avs)
+
+comment.block.at.line.start.avs=1
+comment.block.avs=#~
+comment.stream.start.avs=/*
+comment.stream.end.avs=*/
+comment.box.start.avs=/*
+comment.box.middle.avs= *
+comment.box.end.avs= */
+
+keywords.$(file.patterns.avs)=true false return global
+
+keywords2.$(file.patterns.avs)=addborders alignedsplice amplify amplifydb animate applyrange assumebff \
+assumefieldbased assumefps assumeframebased assumesamplerate assumescaledfps assumetff audiodub audiodubex \
+avifilesource avisource bicubicresize bilinearresize blackmanresize blackness blankclip blur bob cache \
+changefps colorbars colorkeymask coloryuv compare complementparity conditionalfilter conditionalreader \
+convertaudio convertaudioto16bit convertaudioto24bit convertaudioto32bit convertaudioto8bit convertaudiotofloat \
+convertbacktoyuy2 convertfps converttobackyuy2 converttomono converttorgb converttorgb24 converttorgb32 \
+converttoy8 converttoyv16 converttoyv24 converttoyv411 converttoyuy2 converttoyv12 crop cropbottom delayaudio \
+deleteframe dissolve distributor doubleweave duplicateframe ensurevbrmp3sync fadein fadein0 fadein2 fadeio fadeio0 \
+fadeio2 fadeout fadeout0 fadeout2 fixbrokenchromaupsampling fixluminance fliphorizontal flipvertical frameevaluate \
+freezeframe gaussresize generalconvolution getchannel getchannels getmtmode getparity grayscale greyscale histogram \
+horizontalreduceby2 imagereader imagesource imagewriter info interleave internalcache internalcachemt invert killaudio \
+killvideo lanczos4resize lanczosresize layer letterbox levels limiter loop mask maskhs max merge mergeargb mergechannels \
+mergechroma mergeluma mergergb messageclip min mixaudio monotostereo normalize null opendmlsource overlay peculiarblend \
+pointresize pulldown reduceby2 resampleaudio resetmask reverse rgbadjust scriptclip segmentedavisource segmenteddirectshowsource \
+selecteven selectevery selectodd selectrangeevery separatefields setmtmode sharpen showalpha showblue showfiveversions \
+showframenumber showgreen showred showsmpte showtime sincresize skewrows spatialsoften spline16resize spline36resize \
+spline64resize ssrc stackhorizontal stackvertical subtitle subtract supereq swapfields swapuv temporalsoften timestretch \
+tone trim turn180 turnleft turnright tweak unalignedsplice utoy utoy8 version verticalreduceby2 vtoy vtoy8 wavsource \
+weave writefile writefileend writefileif writefilestart ytouv
+
+keywords3.$(file.patterns.avs)=addgrain addgrainc agc_hdragc analyzelogo animeivtc asharp audiograph autocrop \
+autoyuy2 avsrecursion awarpsharp bassaudiosource bicublinresize bifrost binarize blendfields blindpp blockbuster \
+bordercontrol cfielddiff cframediff chromashift cnr2 colormatrix combmask contra convolution3d convolution3dyv12 \
+dctfilter ddcc deblendlogo deblock deblock_qed decimate decomb dedup deen deflate degrainmedian depan depanestimate \
+depaninterleave depanscenes depanstabilize descratch despot dfttest dgbob dgsource directshowsource distancefunction \
+dss2 dup dupmc edeen edgemask ediupsizer eedi2 eedi3 eedi3_rpow2 expand faerydust fastbicubicresize fastbilinearresize \
+fastediupsizer dedgemask fdecimate ffaudiosource ffdshow ffindex ffmpegsource ffmpegsource2 fft3dfilter fft3dgpu \
+ffvideosource fielddeinterlace fielddiff fillmargins fity2uv fity2u fity2v fitu2y fitv2y fluxsmooth fluxsmoothst fluxsmootht \
+framediff framenumber frfun3b frfun7 gicocu golddust gradfun2db grapesmoother greedyhma grid guavacomb hqdn3d hybridfupp \
+hysteresymask ibob improvesceneswitch inflate inpand inpaintlogo interframe interlacedresize interlacedwarpedresize \
+interleaved2planar iscombed iscombedt iscombedtivtc kerneldeint leakkernelbob leakkerneldeint limitedsharpen limitedsharpenfaster \
+logic lsfmod lumafilter lumayv12 manalyse maskeddeinterlace maskedmerge maskedmix mblockfps mcompensate mctemporaldenoise \
+mctemporaldenoisepp mdegrain1 mdegrain2 mdegrain3 mdepan medianblur mergehints mflow mflowblur mflowfps mflowinter minblur mipsmooth \
+mmask moderatesharpen monitorfilter motionmask mpasource mpeg2source mrecalculate mscdetection msharpen mshow msmooth msu_fieldshiftfixer \
+msu_frc msuper mt mt_adddiff mt_average mt_binarize mt_circle mt_clamp mt_convolution mt_deflate mt_diamond mt_edge mt_ellipse \
+mt_expand mt_freeellipse mt_freelosange mt_freerectangle mt_hysteresis mt_infix mt_inflate mt_inpand mt_invert mt_logic mt_losange \
+mt_lut mt_lutf mt_luts mt_lutspa mt_lutsx mt_lutxy mt_lutxyz mt_makediff mt_mappedblur mt_merge mt_motion mt_polish mt_rectangle \
+mt_square mti mtsource multidecimate mvanalyse mvblockfps mvchangecompensate mvcompensate mvdegrain1 mvdegrain2 mvdegrain3 mvdenoise \
+mvdepan mvflow mvflowblur mvflowfps mvflowfps2 mvflowinter mvincrease mvmask mvrecalculate mvscdetection mvshow nicac3source nicdtssource \
+niclpcmsource nicmpasource nicmpg123source nnedi nnedi2 nnedi2_rpow2 nnedi3 nnedi3_rpow2 nomosmooth overlaymask peachsmoother pixiedust \
+planar2interleaved qtgmc qtinput rawavsource rawsource reduceflicker reinterpolate411 removedirt removedust removegrain removegrainhd \
+removetemporalgrain repair requestlinear reversefielddominance rgb3dlut rgdeinterlace rgsdeinterlace rgblut rotate sangnom seesaw sharpen2 \
+showchannels showcombedtivtc smartdecimate smartdeinterlace smdegrain smoothdeinterlace smoothuv soothess soxfilter spacedust sshiq ssim \
+ssiq stmedianfilter t3dlut tanisotropic tbilateral tcanny tcomb tcombmask tcpserver tcpsource tdecimate tdeint tedgemask telecide \
+temporalcleaner temporalrepair temporalsmoother tfieldblank tfm tisophote tivtc tmaskblank tmaskedmerge tmaskedmerge3 tmm tmonitor tnlmeans \
+tomsmocomp toon textsub ttempsmooth ttempsmoothf tunsharp unblock uncomb undot unfilter unsharpmask vaguedenoiser variableblur verticalcleaner \
+videoscope vinverse vobsub vqmcalc warpedresize warpsharp xsharpen yadif yadifmod yuy2lut yv12convolution yv12interlacedreduceby2 \
+yv12interlacedselecttopfields yv12layer yv12lut yv12lutxy yv12substract yv12torgb24 yv12toyuy2
+
+keywords4.$(file.patterns.avs)=abs apply assert bool ceil chr clip continueddenominator continuednumerator cos default defined \
+eval averagechromau averagechromav averageluma chromaudifference chromavdifference lumadifference exist exp findstr float floor \
+frac hexvalue import int isbool isclip isfloat isint isstring lcase leftstr load_stdcall_plugin loadcplugin loadplugin loadvfapiplugin \
+loadvirtualdubplugin log midstr muldiv nop opt_allowfloataudio opt_avipadscanlines opt_dwchannelmask opt_usewaveextensible \
+opt_vdubplanarhack pi pow rand revstr rightstr round scriptdir scriptfile scriptname select setmemorymax setplanarlegacyalignment \
+rgbdifference rgbdifferencefromprevious rgbdifferencetonext udifferencefromprevious udifferencetonext setworkingdir sign sin spline \
+sqrt string strlen time ucase undefined value versionnumber versionstring uplanemax uplanemedian uplanemin uplaneminmaxdifference \
+vdifferencefromprevious vdifferencetonext vplanemax vplanemedian vplanemin vplaneminmaxdifference ydifferencefromprevious \
+ydifferencetonext yplanemax yplanemedian yplanemin yplaneminmaxdifference
+
+keywords5.$(file.patterns.avs)=audiobits audiochannels audiolength audiolengthf audiorate framecount framerate frameratedenominator \
+frameratenumerator getleftchannel getrightchannel hasaudio hasvideo height isaudiofloat isaudioint isfieldbased isframebased \
+isinterleaved isplanar isrgb isrgb24 isrgb32 isyuv isyuy2 isyv12 width
+
+keywords6.$(file.patterns.avs)=
+
+
+style.avs.32=$(font.base)
+style.avs.0=fore:#000000,$(font.base)
+style.avs.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.avs.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.avs.3=$(colour.code.comment.line),$(font.code.comment.line)
+style.avs.4=$(colour.number)
+style.avs.5=$(colour.operator)
+style.avs.6=
+style.avs.7=$(colour.string)
+style.avs.8=$(colour.string)
+style.avs.9=fore:#00007F,bold
+style.avs.10=fore:#00007F,bold
+style.avs.11=fore:#0080C0,bold
+style.avs.12=fore:#007F7F
+style.avs.13=fore:#00007F
+style.avs.14=fore:#8000FF
+braces.avs.style=5
+
+module baan
+font.baan.monospace=font:Consolas,size:10
+
+fold.baan.keywords.based=1
+fold.baan.syntax.based=0
+fold.baan.sections=1
+fold.baan.inner.level=0
+lexer.baan.styling.within.preprocessor=1
+
+
+
+file.patterns.baan=*.bc;*.cln
+
+filter.baan=Baan (baan)|$(file.patterns.baan)|
+
+*filter.baan=$(filter.baan)
+
+lexer.$(file.patterns.baan)=baan
+
+*language.baan=Baan|bc||
+
+word.characters.$(file.patterns.baan)=$(chars.alpha)$(chars.numeric)_#.$
+calltip.baan.word.characters=$(chars.alpha)$(chars.numeric)_#.$
+autocomplete.baan.ignorecase=1
+calltip.baan.ignorecase=1
+autocomplete.baan.start.characters="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_."
+
+preprocessor.symbol.$(file.patterns.baan)=#
+preprocessor.start.$(file.patterns.baan)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.baan)=else elif
+preprocessor.end.$(file.patterns.baan)=endif
+
+comment.block.baan=|
+comment.block.at.line.start.baan=1
+
+block.start.$(file.patterns.baan)=4 case  else for  if repeat selectdo selectempty selecteos selecterror
+block.end.$(file.patterns.baan)=4 else endcase  endfor  endif endselect endwhile selectempty selecteos selecterror
+statement.lookback.$(file.patterns.baan)=0
+
+colour.baan.whitespace=fore:#808080
+colour.baan.preproc=fore:#808000
+colour.baan.string=fore:#FF00FF
+colour.baan.comment.doc=fore:#008080
+colour.baan.comment.line=fore:#008000
+colour.baan.numbers=fore:#FF0000
+colour.baan.keyword=fore:#800000
+colour.baan.keyword2=fore:#0000FF
+colour.baan.keyword3=fore:#0000FF
+colour.baan.keyword4=fore:#FF4500
+colour.baan.keyword5=fore:#800080
+colour.baan.keyword6=fore:#FF00FF,back:#4EE2EC
+colour.baan.keyword7=fore:#FF0000,back:#90EE90
+colour.baan.keyword8=fore:#CC00CC,back:#FFFF99
+colour.baan.keyword9=fore:#00FFFF
+colour.baan.tabledef=fore:#9932CC
+colour.baan.tablesql=fore:#8A2BE2
+colour.baan.functions=fore:#000080
+colour.baan.domaindef=fore:#B8860B
+colour.baan.funcdefs=fore:#B22222
+colour.baan.objdefs=fore:#FF4500
+colour.baan.definedefs=fore:#556B2F
+
+colour.baan.braces.highlight=fore:#0000FF
+colour.baan.braces.incomplete=fore:#FF0000
+colour.baan.eol.string.not.closed=fore:#000000,back:#E0C0E0
+colour.baan.operator=fore:#007F00
+
+style.baan.32=$(font.baan.monospace)
+style.baan.0=$(colour.baan.whitespace),$(font.baan.monospace)
+style.baan.1=$(colour.baan.comment.line),$(font.baan.monospace),bold,italics
+style.baan.2=$(colour.baan.comment.doc),$(font.baan.monospace),bold,italics
+style.baan.3=$(colour.baan.numbers),$(font.baan.monospace),bold
+style.baan.4=$(colour.baan.keyword),$(font.baan.monospace),bold
+style.baan.5=$(colour.baan.string),$(font.baan.monospace),bold
+style.baan.6=$(colour.baan.preproc),$(font.baan.monospace),bold
+style.baan.7=$(colour.baan.operator),$(font.baan.monospace),bold
+style.baan.8=$(font.baan.monospace)
+style.baan.9=$(colour.baan.eol.string.not.closed),$(font.baan.monospace),eolfilled
+style.baan.10=$(colour.baan.keyword2),$(font.baan.monospace),bold
+style.baan.11=$(colour.baan.keyword3),$(font.baan.monospace),bold
+style.baan.12=$(colour.baan.keyword4),$(font.baan.monospace),bold
+style.baan.13=$(colour.baan.keyword5),$(font.baan.monospace),bold
+style.baan.14=$(colour.baan.keyword6),$(font.baan.monospace),bold
+style.baan.15=$(colour.baan.keyword7),$(font.baan.monospace),bold
+style.baan.16=$(colour.baan.keyword8),$(font.baan.monospace),bold
+style.baan.17=$(colour.baan.keyword9),$(font.baan.monospace),bold
+style.baan.18=$(colour.baan.tabledef),$(font.baan.monospace),bold
+style.baan.19=$(colour.baan.tablesql),$(font.baan.monospace),bold
+style.baan.20=$(colour.baan.functions),$(font.baan.monospace),bold
+style.baan.21=$(colour.baan.domaindef),$(font.baan.monospace),bold
+style.baan.22=$(colour.baan.funcdefs),$(font.baan.monospace),bold
+style.baan.23=$(colour.baan.objdefs),$(font.baan.monospace),bold
+style.baan.24=$(colour.baan.definedefs),$(font.baan.monospace),bold
+
+braces.baan.style=7
+style.baan.34=$(colour.baan.braces.highlight),bold
+style.baan.35=$(colour.baan.braces.incomplete),bold
+
+statement.indent.$(file.patterns.baan)=12 after.choice: after.delete: after.display: after.field: after.form.read: after.form: \
+after.group: after.input: after.layout: after.program: after.receive.data: after.rewrite: after.skip.delete: after.skip.rewrite: \
+after.skip.write: after.update.db.commit: after.write: after.zoom: before.checks: before.choice: before.delete: before.display.object: \
+before.display: before.field: before.form: before.group: before.input: before.layout: before.new.object: before.print: before.program: \
+before.read: before.rewrite: before.write: before.zoom: check.input: declaration: domain.error: init.field: init.form: init.group: on.choice: \
+on.display.total.line: on.entry: on.error: on.exit: on.input: read.view: ref.display: ref.input: selection.filter: when.field.changes:
+
+keywords.$(file.patterns.baan)=alike all and array as asc at avg base based between boolean both break bset buffer by call case cast chart clear \
+clearunref common const continue count cross current_date current_timestamp date date.num date.to.num debug default delete deleteempty \
+deleteerror desc dim distinct dll dllusage domain double else empty end endcase enddelete enddllusage endfor endfunctionusage endif endselect \
+endupdate endwhile enum_description eq escape exists extern false fatal fetching field first fixed for from full function functionusage ge global goto \
+group gt having hint hints if in include index inner input inrange integer is join label last le leading left like long lt max mb menu message min multibyte \
+ne no nodebug not notransactions nowarnings null on or order ordered outer path pi prepared print prompt question raw real ref reference refers repeat \
+retry return right row rows select selectbind selectdo selectempty selecteos selecterror session set setunref size skip static step sticky stop strict_boolean \
+string subhint sum table text_content then timestamp to trailing trim true union unref until update updateempty updateerror use used void warning warnings \
+when where wherebind whereused while with
+
+keywords2.$(file.patterns.baan)=abort abort.io  \
+db.after.delete db.after.insert db.after.update \
+xmlSetData \
+zoom.to$
+
+keywords3.$(file.patterns.baan)=~.is.mandatory
+
+keywords4.$(file.patterns.baan)=after.choice: after.delete: after.display: after.field: after.form: after.group: after.input: after.layout: after.read: after.rewrite: \
+after.skip.delete: after.skip.rewrite: after.skip.write: after.write: after.zoom: before.checks:  before.choice: before.delete: before.display: before.field: before.form: \
+before.group: before.input: before.layout: before.print: before.read: before.rewrite: before.write: before.zoom: check.input: domain.error: init.field: init.form: \
+init.group: on.choice: on.entry: on.exit: on.input: read.view: ref.display: ref.input: selection.filter: when.field.changes:
+
+keywords5.$(file.patterns.baan)=after.~: before.~: choice.abort.program: choice.abort.work: choice.add.set: choice.ask.helpinfo: choice.attachments: \
+choice.bms: choice.calculator: choice.calender: choice.cancel.work: choice.change.frm: choice.change.order: choice.cmd.about.baan: choice.cmd.copy: \
+choice.cmd.cut: choice.cmd.options: choice.cmd.paste: choice.cont.process: choice.create.job: choice.current.work: choice.cust.grid: choice.def.find: \
+choice.display.set: choice.dupl.occur: choice.end.program: choice.field.browse: choice.field.help: choice.find.data: choice.first.frm: choice.first.set: \
+choice.first.view: choice.freeze.columns: choice.get.defaults: choice.global.copy: choice.global.delete: choice.glossary: choice.help.index: choice.hide.fields: \
+choice.interrupt: choice.last.frm: choice.last.set: choice.last.view: choice.mark.delete: choice.mark.occur: choice.modify.set: choice.next.frm: choice.next.set: \
+choice.next.view: choice.next.work: choice.prev.frm: choice.prev.set: choice.prev.view: choice.print.data: choice.processes: choice.recover.set: choice.reference: \
+choice.resize.frm: choice.rotate.curr: choice.run.job: choice.save.defaults: choice.select.all: choice.send.data: choice.sendto.desktop: choice.sendto.editor: \
+choice.sendto.mail: choice.sendto.tasklst: choice.start.chart: choice.start.query: choice.start.set: choice.suspend.work: choice.switch.windows: choice.synchronize: \
+choice.text.manager: choice.to.clipboard: choice.unfreeze.colum: choice.update.db: choice.user.0: choice.user.1: choice.user.2: choice.user.3: choice.user.4: choice.user.5: \
+choice.user.6: choice.user.7: choice.user.8: choice.user.9: choice.using.help: choice.zoom:  declaration: detail.~: field.~: footer.~: form.~: functions: group.~: \
+header.~:  main.table.io: on.display.total.line: on.error: zoom.from.~:
+
+keywords6.$(file.patterns.baan)=actual.occ \
+zoomreturn$
+
+keywords7.$(file.patterns.baan)=__file__ \
+z.session
+
+keywords8.$(file.patterns.baan)=^tcyesno. ^tdsls.corg.
+
+keywords9.$(file.patterns.baan)=dalnew dalupdate
+
+
+module blitzbasic
+
+file.patterns.blitzbasic=*.bb
+
+filter.blitzbasic=BlitzBasic (bb)|$(file.patterns.blitzbasic)|
+
+*filter.blitzbasic=$(filter.blitzbasic)
+
+lexer.$(file.patterns.blitzbasic)=blitzbasic
+
+
+keywordclass.blitzbasic=abs accepttcpstream acos after and apptitle asc asin atan atan2 \
+automidhandle autosuspend availvidmem backbuffer banksize before bin calldll \
+case ceil changedir channelpan channelpitch channelplaying channelvolume chr \
+closedir closefile closemovie closetcpserver closetcpstream closeudpstream cls \
+clscolor color colorblue colorgreen colorred commandline const copybank copyfile \
+copyimage copypixel copypixelfast copyrect copystream cos countgfxdrivers \
+countgfxmodes counthostips createbank createdir createimage createnetplayer \
+createprocess createtcpserver createtimer createudpstream currentdate currentdir \
+currenttime data debuglog default delay delete deletedir deletefile \
+deletenetplayer desktopbuffer dim dottedip drawblock drawblockrect drawimage \
+drawimagerect drawmovie each else else if elseif end end function end if end \
+select end type endgraphics endif eof execfile exit exp false field filepos \
+filesize filetype first flip float floor flushjoy flushkeys flushmouse \
+fontheight fontname fontsize fontstyle fontwidth for forever freebank freefont \
+freeimage freesound freetimer frontbuffer function gammablue gammagreen gammared \
+getcolor getenv getkey getmouse gfxdrivername gfxmodedepth gfxmodeexists \
+gfxmodeformat gfxmodeheight gfxmodewidth global gosub goto grabimage graphics \
+graphicsbuffer graphicsdepth graphicsformat graphicsheight graphicswidth \
+handleimage hex hidepointer hostip hostnetgame if imagebuffer imageheight \
+imagerectcollide imagerectoverlap imagescollide imagesoverlap imagewidth \
+imagexhandle imageyhandle include input insert instr int joinnetgame joydown \
+joyhat joyhit joypitch joyroll joytype joyu joyudir joyv joyvdir joyx joyxdir \
+joyy joyyaw joyydir joyz joyzdir keydown keyhit keywait last left len line \
+loadanimimage loadbuffer loadfont loadimage loadsound local lockbuffer \
+lockedformat lockedpitch lockedpixels log log10 loopsound lower lset maskimage \
+mid midhandle millisecs mod morefiles mousedown mousehit mousex mousexspeed \
+mousey mouseyspeed mousez mousezspeed movemouse movieheight movieplaying \
+moviewidth netmsgdata netmsgfrom netmsgto netmsgtype netplayerlocal \
+netplayername new next nextfile not null openfile openmovie opentcpstream or \
+origin oval pausechannel pausetimer peekbyte peekfloat peekint peekshort pi \
+playcdtrack playmusic playsound plot pokebyte pokefloat pokeint pokeshort print \
+queryobject rand read readavail readbyte readbytes readdir readfile readfloat \
+readint readline readpixel readpixelfast readshort readstring rect rectsoverlap \
+recvnetmsg recvudpmsg repeat replace resettimer resizebank resizeimage restore \
+resumechannel resumetimer return right rnd rndseed rotateimage rset runtimeerror \
+sar savebuffer saveimage scaleimage scanline seedrnd seekfile select sendnetmsg \
+sendudpmsg setbuffer setenv setfont setgamma setgfxdriver sgn shl showpointer \
+shr sin soundpan soundpitch soundvolume sqr startnetgame step stop stopchannel \
+stopnetgame str string stringheight stringwidth systemproperty tan tcpstreamip \
+tcpstreamport tcptimeouts text tformfilter tformimage then tileblock tileimage \
+timerticks to totalvidmem trim true type udpmsgip udpmsgport udpstreamip \
+udpstreamport udptimeouts unlockbuffer until updategamma upper viewport vwait \
+waitkey waitmouse waittimer wend while write writebyte writebytes writefile \
+writefloat writeint writeline writepixel writepixelfast writeshort writestring \
+xor
+
+keywords.$(file.patterns.blitzbasic)=$(keywordclass.blitzbasic)
+
+style.blitzbasic.0=fore:#000000
+style.blitzbasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.blitzbasic.2=$(colour.number)
+style.blitzbasic.3=$(colour.keyword)
+style.blitzbasic.4=$(colour.string)
+style.blitzbasic.6=$(colour.operator)
+style.blitzbasic.7=$(style.blitzbasic.0)
+style.blitzbasic.10=$(colour.keyword)
+style.blitzbasic.11=$(colour.keyword)
+style.blitzbasic.12=$(colour.keyword)
+style.blitzbasic.15=$(colour.preproc)
+style.blitzbasic.16=$(colour.error)
+style.blitzbasic.17=$(colour.number)
+style.blitzbasic.18=$(colour.number)
+
+
+module bullant
+
+filter.bullant=Bullant (.ant)|*.ant|
+
+*filter.bullant=$(filter.bullant)
+
+file.patterns.bullant=*.ant
+
+lexer.$(file.patterns.bullant)=bullant
+
+*language.bullant=Bullant|ant||
+
+keywordclass.bullant=abstract all ancestor and application \
+assert attributes author \
+begin \
+callback class concrete config constants construct continue \
+depends description downcast driver \
+elif else ensures error exception exposure extension \
+false fatal final function \
+generics glyph \
+help hidden host \
+immutable in inherits is \
+kernel \
+label leave library locals \
+mutable \
+none not null \
+obsolete options or other \
+parameters peer private public \
+raise reason restricted retry return \
+returns rollback route \
+security self settings severity step \
+task test transaction true \
+unknown \
+varying \
+warning when \
+method end if until while trap case debug for foreach lock \
+boolean \
+character character$ \
+date date$ datetime datetime$ \
+float \
+hex$ \
+identifier identifier$ integer interval interval$ \
+money money$ \
+raw raw$ \
+string \
+tick tick$ time time$ \
+version version$
+
+
+keywords.$(file.patterns.bullant)=$(keywordclass.bullant)
+
+style.bullant.0=fore:#000000,$(font.monospace)
+style.bullant.1=fore:#007F00,$(font.monospace)
+style.bullant.2=fore:#007F00,$(font.monospace)
+style.bullant.3=fore:#7F7F7F
+style.bullant.4=fore:#007F7F
+
+
+style.bullant.5=fore:#00007F,bold
+style.bullant.6=fore:#7F007F,$(font.monospace)
+style.bullant.7=fore:#7F007F,$(font.monospace)
+style.bullant.8=fore:#007F7F
+style.bullant.9=fore:#7F7F00
+
+command.compile.*.ant=
+
+command.go.*.ant=
+command.go.subsystem.*.ant=
+
+command.build.*.ant=
+command.build.subsystem.*.ant=
+
+
+module caml
+
+file.patterns.caml=*.ml;*.mli
+file.patterns.sml=*.sml
+
+*filter.objectivecaml=$(filter.caml)
+
+filter.caml=Objective Caml (ml mli)|$(file.patterns.caml)|
+filter.sml=Standard ML 97 (sml ml)|$(file.patterns.sml)|
+
+lexer.*.caml=caml
+lexer.$(file.patterns.caml)=caml
+lexer.$(file.patterns.sml)=caml
+
+
+keywordstandard.caml= \
+and as assert asr begin class \
+constraint do done downto else end \
+exception external false for fun function \
+functor if in include inherit initializer \
+land lazy let lor lsl lsr \
+lxor match method mod module mutable \
+new object of open or private \
+rec sig struct then to true \
+try type val virtual when while \
+with
+keywords.$(file.patterns.caml)=$(keywordstandard.caml)
+
+keywordstandard.sml= \
+abstype andalso and as case datatype div do \
+else end eqtype exception \
+false fn fun functor handle if infixr infix include in let local \
+mod nonfix not of open op orelse raise rec \
+sharing signature sig structure struct then true type use \
+val while withtype with
+keywords.$(file.patterns.sml)=$(keywordstandard.sml)
+
+keywordoptional1.caml= \
+option Some None ignore ref lnot succ pred parser
+keywords2.$(file.patterns.caml)=$(keywordoptional1.caml)
+
+keywordoptional1.sml= \
+option SOME NONE ignore ref \
+chr explode implode ord size
+keywords2.$(file.patterns.sml)=$(keywordoptional1.sml)
+
+keywordoptional2.caml= \
+array bool char float int list string unit
+keywords3.$(file.patterns.caml)=$(keywordoptional2.caml)
+
+keywordoptional2.sml= \
+array bool char int list nil real string unit vector word
+keywords3.$(file.patterns.sml)=$(keywordoptional2.sml)
+
+word.characters.$(file.patterns.caml)=$(chars.alpha)$(chars.numeric)_'`
+word.characters.$(file.patterns.sml)=$(chars.alpha)$(chars.numeric)_'
+
+comment.stream.start.caml=(*
+comment.stream.end.caml=*)
+comment.box.start.caml=(*
+comment.box.middle.caml= *
+comment.box.end.caml= *)
+
+
+style.caml.32=$(font.base)
+style.caml.0=fore:#808080
+style.caml.1=
+style.caml.2=fore:#000000,back:#ffe0ff
+style.caml.3=$(colour.keyword),bold
+style.caml.4=fore:#000000,back:#e0e0ff
+style.caml.5=fore:#a0000,bold
+style.caml.6=back:#C0C0C0,$(font.base)
+style.caml.7=$(colour.operator),bold
+style.caml.8=fore:#000000,back:#ffff00
+style.caml.9=fore:#000000,back:#ffff00
+style.caml.10=fore:#000000,back:#e0e0e0
+style.caml.11=fore:#000000,back:#ffff00
+style.caml.12=$(colour.code.comment.box),$(font.code.comment.box)
+style.caml.13=$(colour.embedded.comment),$(font.code.comment.box)
+style.caml.14=$(colour.embedded.comment),$(font.code.comment.box)
+style.caml.15=$(colour.embedded.comment),$(font.code.comment.box)
+
+braces.caml.style=7
+
+command.compile.$(file.patterns.caml)=ocamlc -c $(FileNameExt)
+
+module cil
+
+file.patterns.cil=*.il
+filter.cil=CIL (il)|$(file.patterns.cil)|
+lexer.$(file.patterns.cil)=cil
+
+*filter.cil=$(filter.cil)
+*language.cil=CIL|cil||
+*source.patterns.cil=$(file.patterns.cil);
+
+keywordclass.cil.main=abstract ansi assembly auto autochar beforefieldinit \
+catch cdecl cil class compilercontrolled explicit extends extern famandassem \
+family famorassem fastcall final finally forwardref hidebysig implements \
+initonly instance interface internalcall lasterr literal managed nested \
+newslot noinlining nomangle nooptimization notserialized optil pinvokeimpl \
+platformapi preservesig private privatescope public reqsecobj rtspecialname \
+runtime sealed sequential serializable specialname static stdcall strict \
+synchronized thiscall unicode unmanaged unmanagedexp valuetype vararg virtual \
+void winapi
+
+keywordclass.cil.main.extras=bool char float32 float64 int int8 int16 int32 \
+int64 native nullref object string typedref uint8 uint32 unsigned
+
+keywordclass.cil.metadata=.addon .assembly .cctor .class .corflags .ctor \
+.custom .data .emitbyte .entrypoint .event .export .field .file .fire .get \
+.hash .imagebase .import .language .line .locale .localized .locals \
+.manifestres .maxstack .method .module .mresource .namespace .other .override \
+.pack .param .pdirect .permission .permissionset .property .property \
+.publickey .publickeytoken .removeon .set .size .stackreserve .subsystem .try \
+.ver .vtable .vtentry .vtfixup .zeroinit
+
+keywordclass.cil.opcode=add add.ovf add.ovf.un and arglist beq beq.s \
+bge bge.s bge.un bge.un.s bgt bgt.s bgt.un bgt.un.s ble ble.s ble.un ble.un.s \
+blt blt.s blt.un blt.un.s bne.un bne.un.s box br br.s break brfalse brfalse.s \
+brinst brinst.s brnull brnull.s brtrue brtrue.s brzero brzero.s bstr call \
+calli callmostderived callvirt castclass ceq cgt cgt.un ckfinite ckfinite clt \
+clt.un constrained. conv.i conv.i1 conv.i2 conv.i4 conv.i8 conv.ovf.i \
+conv.ovf.i.un conv.ovf.i1 conv.ovf.i1.un conv.ovf.i2 conv.ovf.i2.un \
+conv.ovf.i4 conv.ovf.i4.un conv.ovf.i8 conv.ovf.i8.un conv.ovf.u \
+conv.ovf.u.un conv.ovf.u1 conv.ovf.u1.un conv.ovf.u2 conv.ovf.u2.un \
+conv.ovf.u4 conv.ovf.u4.un conv.ovf.u8 conv.ovf.u8.un conv.r.un conv.r4 \
+conv.r8 conv.u conv.u1 conv.u2 conv.u4 conv.u8 cpblk cpobj div div.un dup \
+endfault endfilter endfinally initblk initobj isinst jmp ldarg ldarg.0 ldarg.1 \
+ldarg.2 ldarg.3 ldarg.s ldarga ldarga.s ldc.i4 ldc.i4.0 ldc.i4.1 ldc.i4.2 \
+ldc.i4.3 ldc.i4.4 ldc.i4.5 ldc.i4.6 ldc.i4.7 ldc.i4.8 ldc.i4.m1 ldc.i4.s \
+ldc.i8 ldc.r4 ldc.r8 ldelem ldelem.i ldelem.i1 ldelem.i2 ldelem.i4 ldelem.i8 \
+ldelem.r4 ldelem.r8 ldelem.ref ldelem.u1 ldelem.u2 ldelem.u4 ldelema ldfld \
+ldflda ldftn ldind.i ldind.i1 ldind.i2 ldind.i4 ldind.i8 ldind.r4 ldind.r8 \
+ldind.ref ldind.u1 ldind.u2 ldind.u4 ldlen ldloc ldloc.0 ldloc.1 ldloc.2 \
+ldloc.3 ldloc.s ldloca ldloca.s ldnull ldobj ldsfld ldsflda ldstr ldtoken \
+ldvirtftn leave leave.s localloc mkrefany mul mul.ovf mul.ovf.un neg newarr \
+newobj no. nop not or pop readonly. refanytype refanyval rem rem.un ret \
+rethrow shl shr shr.un sizeof starg starg.s stelem stelem.i stelem.i1 \
+stelem.i2 stelem.i4 stelem.i8 stelem.r4 stelem.r8 stelem.ref stfld stind.i \
+stind.i1 stind.i2 stind.i4 stind.i8 stind.r4 stind.r8 stind.ref stloc stloc.0 \
+stloc.1 stloc.2 stloc.3 stloc.s stobj stsfld sub sub.ovf sub.ovf.un switch \
+tail. throw unaligned. unbox unbox.any volatile. xor
+
+keywords.$(file.patterns.cil)=$(keywordclass.cil.main)
+keywords2.$(file.patterns.cil)=$(keywordclass.cil.metadata)
+keywords3.$(file.patterns.cil)=$(keywordclass.cil.opcode)
+
+comment.block.cil=//
+comment.stream.start.cil=/*
+comment.stream.end.cil=*/
+comment.box.start.cil=/*
+comment.box.middle.cil= *
+comment.box.end.cil=*/
+
+block.start.$(file.patterns.cil)=8 {
+block.end.$(file.patterns.cil)=8 }
+
+fold.cil.comment.multiline=0
+
+style.cil.0=fore:#000000
+style.cil.1=$(colour.code.comment.box),$(font.comment)
+style.cil.2=$(colour.code.comment.line),$(font.comment)
+style.cil.3=fore:#00007F,bold
+style.cil.4=fore:#C80000,bold
+style.cil.5=fore:#0040E0
+style.cil.6=fore:#7F007F
+style.cil.7=fore:#808080
+style.cil.8=$(colour.operator),bold
+style.cil.9=fore:#000000
+style.cil.10=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+
+if PLAT_WIN
+    # https://docs.microsoft.com/en-us/dotnet/framework/tools/ilasm-exe-il-assembler
+    command.compile.$(file.patterns.cil)=ilasm /nologo $(FileNameExt)
+    command.compile.subsystem.$(file.patterns.cil)=1
+    
+    command.go.$(file.patterns.cil)=$(FileName).exe
+    command.go.subsystem.$(file.patterns.cil)l=1
+    
+    command.help.$(file.patterns.cil)=ilasm /?
+
+module cmake
+
+filter.cmake=CMake (CMakeLists.txt cmake ctest)|CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in|
+*filter.cmake=$(filter.cmake)
+file.patterns.cmake=CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in
+lexer.$(file.patterns.cmake)=cmake
+*language.cmake=CMake|cmake||
+
+keywords.$(file.patterns.cmake)= add_custom_command \
+add_compile_definitions \
+add_compile_options \
+add_custom_command \
+add_custom_target \
+add_definitions \
+add_dependencies \
+add_executable \
+add_library \
+add_link_options \
+add_subdirectory \
+add_test \
+aux_source_directory \
+build_command \
+build_name \
+cmake_minimum_required \
+configure_file \
+create_test_sourcelist \
+else \
+elseif \
+enable_language \
+enable_testing \
+endforeach \
+endfunction \
+endif \
+endmacro \
+endwhile \
+exec_program \
+execute_process \
+export \
+export_library_dependencies \
+file \
+find_file \
+find_library \
+find_package \
+find_path \
+find_program \
+fltk_wrap_ui \
+foreach \
+function \
+get_cmake_property \
+get_directory_property \
+get_filename_component \
+get_source_file_property \
+get_target_property \
+get_test_property \
+if \
+include \
+include_directories \
+include_external_msproject \
+include_regular_expression \
+install \
+install_files \
+install_programs \
+install_targets \
+link_directories \
+link_libraries \
+list \
+load_cache \
+load_command \
+macro \
+make_directory \
+mark_as_advanced \
+math \
+message \
+option \
+output_required_files \
+project \
+qt_wrap_cpp \
+qt_wrap_ui \
+remove \
+remove_definitions \
+separate_arguments \
+set \
+set_directory_properties \
+set_source_files_properties \
+set_target_properties \
+set_tests_properties \
+site_name \
+source_group \
+string \
+subdir_depends \
+subdirs \
+target_compile_definitions \
+target_compile_features \
+target_compile_options \
+target_include_directories \
+target_link_directories \
+target_link_libraries \
+target_link_options \
+target_sources \
+try_compile \
+try_run \
+use_mangled_mesa \
+utility_source \
+variable_requires \
+vtk_make_instantiator \
+vtk_wrap_java \
+vtk_wrap_python \
+vtk_wrap_tcl \
+while \
+write_file
+
+keywords2.$(file.patterns.cmake)= ABSOLUTE \
+ABSTRACT \
+ADDITIONAL_MAKE_CLEAN_FILES \
+ALL \
+AND \
+APPEND \
+ARGS \
+ASCII \
+BEFORE \
+CACHE \
+CACHE_VARIABLES \
+CLEAR \
+COMMAND \
+COMMANDS \
+COMMAND_NAME \
+COMMENT \
+COMPARE \
+COMPILE_FLAGS \
+COPYONLY \
+DEFINED \
+DEFINE_SYMBOL \
+DEPENDS \
+DOC \
+EQUAL \
+ESCAPE_QUOTES \
+EXCLUDE \
+EXCLUDE_FROM_ALL \
+EXISTS \
+EXPORT_MACRO \
+EXT \
+EXTRA_INCLUDE \
+FATAL_ERROR \
+FILE \
+FILES \
+FORCE \
+FUNCTION \
+GENERATED \
+GLOB \
+GLOB_RECURSE \
+GREATER \
+GROUP_SIZE \
+HEADER_FILE_ONLY \
+HEADER_LOCATION \
+IMMEDIATE \
+INCLUDES \
+INCLUDE_DIRECTORIES \
+INCLUDE_INTERNALS \
+INCLUDE_REGULAR_EXPRESSION \
+LESS \
+LINK_DIRECTORIES \
+LINK_FLAGS \
+LOCATION \
+MACOSX_BUNDLE \
+MACROS \
+MAIN_DEPENDENCY \
+MAKE_DIRECTORY \
+MATCH \
+MATCHALL \
+MATCHES \
+MODULE \
+NAME \
+NAME_WE \
+NOT \
+NOTEQUAL \
+NO_SYSTEM_PATH \
+OBJECT_DEPENDS \
+OPTIONAL \
+OR \
+OUTPUT \
+OUTPUT_VARIABLE \
+PATH \
+PATHS \
+POST_BUILD \
+POST_INSTALL_SCRIPT \
+PREFIX \
+PREORDER \
+PRE_BUILD \
+PRE_INSTALL_SCRIPT \
+PRE_LINK \
+PROGRAM \
+PROGRAM_ARGS \
+PROPERTIES \
+QUIET \
+RANGE \
+READ \
+REGEX \
+REGULAR_EXPRESSION \
+REPLACE \
+REQUIRED \
+RETURN_VALUE \
+RUNTIME_DIRECTORY \
+SEND_ERROR \
+SHARED \
+SOURCES \
+STATIC \
+STATUS \
+STREQUAL \
+STRGREATER \
+STRLESS \
+SUFFIX \
+TARGET \
+TOLOWER \
+TOUPPER \
+VAR \
+VARIABLES \
+VERSION \
+WIN32 \
+WRAP_EXCLUDE \
+WRITE \
+APPLE  \
+MINGW \
+MSYS \
+CYGWIN  \
+BORLAND \
+WATCOM \
+MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 CMAKE_COMPILER_2005 \
+OFF ON \
+
+
+statement.indent.$(file.patterns.cmake)=5 if while foreach macro
+comment.block.cmake=#~
+comment.block.at.line.start.cmake=1
+calltip.cmake.ignorecase=1
+calltip.cmake.parameters.start=(
+calltip.cmake.parameters.separators=,
+calltip.cmake.parameters.end=)
+
+style.cmake.0=fore:#000000,$(font.base)
+style.cmake.1=fore:#007F00,$(font.comment)
+style.cmake.2=fore:#7F007F,back:#EEEEEE
+style.cmake.3=fore:#7F007F,back:#EEEEEE
+style.cmake.4=fore:#7F007F,back:#EEEEEE
+style.cmake.5=fore:#00007F,bold
+style.cmake.6=fore:#800000
+style.cmake.7=fore:#CC3300
+style.cmake.8=fore:#000000
+style.cmake.9=fore:#00007F,bold
+style.cmake.10=fore:#00007F,bold
+style.cmake.11=fore:#00007F,bold
+style.cmake.12=fore:#00007F,bold
+style.cmake.13=fore:#CC3300,back:#EEEEEE
+style.cmake.14=$(colour.number)
+
+module cobol
+
+file.patterns.COBOL=*.cob;*.cbl;*.cpy;*.copy
+filter.cobol=COBOL (cob cbl cpy copy)|$(file.patterns.COBOL)|
+*filter.cobol=$(filter.cobol)
+
+lexer.$(file.patterns.COBOL)=COBOL
+
+*language.cobol=COBOL|cob||
+
+word.characters.$(file.patterns.COBOL)=$(chars.alpha)$(chars.numeric)$(chars.accented)_-
+
+keywords.$(file.patterns.COBOL)=configuration data declaratives division environment file file-control function function-id i-o i-o-control identification input input-output linkage local-storage output procedure program program-id screen section special-names working-storage exec end-exec .
+keywords2.$(file.patterns.COBOL)=accept add allocate alter call cancel close commit compute continue delete destroy disable display divide enable entry evaluate also when exit free generate go to goback if else initialize initiate inquire invoke inspect merge modify move multiply next sentence \
+open perform purge raise read ready receive release reset resume return rewrite rollback search send set sort start stop string subtract suppress terminate transform unlock unstring use validate write \
+end-accept end-add end-call end-compute end-delete end-display end-divide end-evaluate end-if end-multiply end-of-page end-perform end-read end-receive end-return end-rewrite end-search end-start end-string end-subtract end-unstring end-write \
+copy replace \
+abs acos annuity asin atan boolean-of-integer byte-length char char-national combined-datetime concatenate cos currency-symbol current-date date-of-integer date-to-yyyymmdd day-of-integer day-to-yyyyddd display-of \
+e exception-file exception-file-n exception-location exception-location-n exception-statement exception-status exp exp10 factorial formatted-current-date formatted-date formatted-datetime formatted-time fraction-part highest-algebraic \
+integer integer-of-boolean integer-of-date integer-of-day integer-of-formatted-date integer-part length length-an locale-compare locale-date locale-time locale-time-from-seconds log log10 lower-case lowest-algebraic \
+max mean median midrange min mod module-caller-id module-date module-formatted-date module-id module-path module-source module-time monetary-decimal-point monetary-thousands-separator national-of numeric-decimal-point numeric-thousands-separator numval numval-c numval-f \
+ord ord-max ord-min pi present-value random range rem reverse seconds-from-formatted-time seconds-past-midnight sign sin sqrt standard-compare standard-deviation stored-char-length substitute substitute-case sum \
+tan test-date-yyyymmdd test-day-yyyyddd test-formatted-datetime test-numval test-numval-c test-numval-f trim upper-case variance when-compiled year-to-yyyy
+keywords3.$(file.patterns.COBOL)=high-value high-values low-value low-values space spaces quote quotes zero zeroes zeros \
+author date-compiled date-modified date-written installation remarks security \
+cob-crt-status debug-item debug-line debug-name debug-sub-1 debug-sub-2 debug-sub-3 debug-contents number-of-call-parameters return-code return-code-unsigned sort-return \
+tally dialect-all jnienvptr json-code linage-counter shift-in shift-out sort-control sort-core-size sort-file-size sort-message sort-mode-size \
+xml-code xml-event xml-information xml-namespace xml-namespace-prefix xml-nnamespace xml-nnamespace-prefix xml-ntext xml-text \
+sysin sysipt stdin sysout syslist syslst stdout print printer printer-1 syserr stderr console c01 c02 c03 c04 c05 c06 c07 c08 c09 c10 c11 c12 csp formfeed call-convention \
+switch-0 switch-1 switch-2 switch-3 switch-4 switch-5 switch-6 switch-7 switch-8 switch-9 switch-10 switch-11 switch-12 switch-13 switch-14 switch-15 switch-16 switch-17 switch-18 \
+switch-19 switch-20 switch-21 switch-22 switch-23 switch-24 switch-25 switch-26 switch-27 switch-28 switch-29 switch-30 switch-31 switch-32 switch-33 switch-34 switch-35 switch-36 \
+upsi-0 upsi-1 upsi-2 upsi-3 upsi-4 upsi-5 upsi-6 upsi-7 \
+access active-class address advancing after aligned all alphabet alphabetic alphabetic-lower alphabetic-upper alphanumeric alphanumeric-edited alternate and any anycase are area areas as ascending assign at automatic \
+b-and b-not b-or b-xor based before binary binary-char binary-double binary-long binary-sequential binary-short bit blank block boolean bottom by \
+cd cf ch character characters class class-id clock-units code-set col collating cols column columns comma common communication comp comp-3 comp-5 computational computational-3 computational-5 condition constant contains content control controls converting corr corresponding count crt currency cursor \
+data-pointer date day day-of-week de debugging decimal-point default delimited delimiter depending descending destination detail down duplicates dynamic ec egi emi end enter eo eop equal equals error esi every exception exception-object exclusive extend external \
+factory false farthest-from-zero fd filler final first float-binary-128 float-binary-32 float-binary-64 float-decimal-16 float-decimal-34 float-extended float-infinity float-long float-not-a-number-quiet float-not-a-number-signaling float-short footing for format from function-pointer \
+get giving global greater group group-usage heading in in-arithmetic-range index indexed indicate inherits initial initialized interface interface-id into invalid is just justified key label last leading left less limit limits linage line line-counter line-sequential lines locale lock \
+manual message method method-id minus mode modules multiple national national-edited native nearest-to-zero negative negative-infinity nested no not null number numbers numeric numeric-edited\
+object object-computer object-reference occurs of off omitted on only optional options or order organization other overflow override \
+packed-decimal padding page page-counter pf ph physical pic picture plus pointer position positive positive-infinity present previous printing procedures proceed program-pointer property prototype queue \
+raising rd record records redefines reel reference references relative remainder removal renames replacing report reporting reports repository rerun reserve retry returning reversed rewind rf rh right rounded run \
+same sd segment segment-limit select self separate sequence sequential sharing signed size sort-merge source source-computer sources standard standard-1 standard-2 status step sub-queue-1 sub-queue-2 sub-queue-3 super symbolic sync synchronized system-default \
+table tallying terminal test text than then through thru time times top trailing true type typedef unit universal unsigned until up upon usage user-default using val-status valid validate-status value values varying with words \
+arithmetic attribute auto away-from-zero background-color bell binary-c-long binary-encoding blink capacity center chaining classification cobol comp-1 comp-4 comp-6 comp-x computational-1 computational-4 computational-6 computational-x cycle \
+decimal-encoding entry-convention eol eos erase expands float-binary float-decimal float-not-a-number foreground-color forever full high-order-left high-order-right highlight ignoring implements intermediate intrinsic lc_all lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time lowlight \
+memory nearest-away-from-zero nearest-even-intermediate nearest-toward-zero none normal \
+paragraph prefixed prohibited recursive relation required reverse-video rounding seconds secure short standard-binary standard-decimal statement strong structure symbol tape toward-greater toward-lesser truncation ucs-4 underline utf-16 utf-8 yyyyddd yyyymmdd \
+3-d apply background background-high background-low bar blob bold box busy cbl clob combo-box dbclob dbcs draw drop grid grip high hot-track hscroll hscroll-pos id imp kanji low num-rows o-fill oostackptr pos prompt public rowid scroll scroll-bar shadow skip1 skip2 skip3 sql \
+tab track-thumb unbounded variant virtual-width vscroll vscroll-bar vscroll-pos wait width wrap xml
+
+
+style.COBOL.0=fore:#808080,$(font.monospace)
+
+style.COBOL.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.COBOL.3=$(colour.code.comment.document),$(font.code.comment.document)
+style.COBOL.4=$(colour.number),$(font.monospace)
+style.COBOL.5=$(colour.keyword),bold,$(font.monospace)
+style.COBOL.6=$(colour.string),$(font.monospace)
+style.COBOL.7=$(colour.char),$(font.monospace)
+style.COBOL.8=$(colour.keyword),bold,$(font.monospace)
+style.COBOL.9=$(colour.preproc),$(font.preproc)
+style.COBOL.10=$(colour.operator),bold,$(font.monospace)
+style.COBOL.11=$(colour.identifier),$(font.identifier),$(font.monospace)
+style.COBOL.16=$(colour.keyword),bold,$(font.monospace)
+
+
+
+
+module coffeescript
+
+filter.coffeescript=CoffeeScript (coffee)|*.coffee|
+
+file.patterns.coffeescript=*.coffee
+
+lexer.$(file.patterns.coffeescript)=coffeescript
+
+style.coffeescript.32=$(font.base)
+style.coffeescript.0=fore:#808080
+style.coffeescript.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.coffeescript.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.coffeescript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.coffeescript.4=$(colour.number)
+style.coffeescript.5=$(colour.keyword),bold
+style.coffeescript.6=$(colour.string)
+style.coffeescript.7=$(colour.char)
+style.coffeescript.8=fore:#804080
+style.coffeescript.9=$(colour.preproc)
+style.coffeescript.10=$(colour.operator),bold
+style.coffeescript.11=
+style.coffeescript.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.coffeescript.13=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+style.coffeescript.14=fore:#3F7F3F,$(font.monospace),back:#E0F0FF,eolfilled
+style.coffeescript.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.coffeescript.16=fore:#B00040
+style.coffeescript.17=fore:#3060A0,$(font.code.comment.doc)
+style.coffeescript.18=fore:#804020,$(font.code.comment.doc)
+style.coffeescript.19=fore:#DD9900
+style.coffeescript.20=$(colour.string),back:#FFF3FF,eolfilled
+style.coffeescript.21=$(font.monospace),fore:#007F00,back:#E0FFE0,eolfilled
+style.coffeescript.22=$(font.monospace),fore:#007F00,back:#E7FFD7,eolfilled
+style.coffeescript.23=fore:#659900
+style.coffeescript.24=$(colour.code.comment.doc)
+style.coffeescript.25=fore:#C06000
+
+module conf
+
+file.patterns.conf=*.conf;.htaccess
+*source.patterns.conf=$(file.patterns.conf);
+filter.conf=Apache Conf (conf)|$(file.patterns.conf)|
+*filter.apacheconfig=$(filter.conf)
+lexer.$(file.patterns.conf)=conf
+
+keywords.$(file.patterns.conf)=\
+acceptmutex acceptpathinfo accessconfig accessfilename \
+action addalt addaltbyencoding addaltbytype addcharset \
+adddefaultcharset adddescription addencoding \
+addhandler addicon addiconbyencoding addiconbytype \
+addinputfilter addlanguage addmodule addmoduleinfo \
+addoutputfilter addoutputfilterbytype addtype agentlog \
+alias aliasmatch all allow allowconnect \
+allowencodedslashes allowoverride anonymous \
+anonymous_authoritative anonymous_logemail \
+anonymous_mustgiveemail anonymous_nouserid \
+anonymous_verifyemail assignuserid authauthoritative \
+authdbauthoritative authdbgroupfile \
+authdbmauthoritative authdbmgroupfile authdbmtype \
+authdbmuserfile authdbuserfile authdigestalgorithm \
+authdigestdomain authdigestfile authdigestgroupfile \
+authdigestnccheck authdigestnonceformat \
+authdigestnoncelifetime authdigestqop \
+authdigestshmemsize authgroupfile \
+authldapauthoritative authldapbinddn \
+authldapbindpassword authldapcharsetconfig \
+authldapcomparednonserver authldapdereferencealiases \
+authldapenabled authldapfrontpagehack \
+authldapgroupattribute authldapgroupattributeisdn \
+authldapremoteuserisdn authldapurl authname authtype \
+authuserfile bindaddress browsermatch \
+browsermatchnocase bs2000account bufferedlogs \
+cachedefaultexpire cachedirlength cachedirlevels \
+cachedisable cacheenable cacheexpirycheck cachefile \
+cacheforcecompletion cachegcclean cachegcdaily \
+cachegcinterval cachegcmemusage cachegcunused \
+cacheignorecachecontrol cacheignoreheaders \
+cacheignorenolastmod cachelastmodifiedfactor \
+cachemaxexpire cachemaxfilesize cacheminfilesize \
+cachenegotiateddocs cacheroot cachesize \
+cachetimemargin cgimapextension charsetdefault \
+charsetoptions charsetsourceenc checkspelling \
+childperuserid clearmodulelist contentdigest \
+cookiedomain cookieexpires cookielog cookiename \
+cookiestyle cookietracking coredumpdirectory customlog \
+dav davdepthinfinity davlockdb davmintimeout \
+defaulticon defaultlanguage defaulttype define \
+deflatebuffersize deflatecompressionlevel \
+deflatefilternote deflatememlevel deflatewindowsize \
+deny directory directoryindex directorymatch \
+directoryslash documentroot dumpioinput dumpiooutput \
+enableexceptionhook enablemmap enablesendfile \
+errordocument errorlog example expiresactive \
+expiresbytype expiresdefault extendedstatus \
+extfilterdefine extfilteroptions fancyindexing \
+fileetag files filesmatch forcelanguagepriority \
+forcetype forensiclog from group header headername \
+hostnamelookups identitycheck ifdefine ifmodule \
+imapbase imapdefault imapmenu include indexignore \
+indexoptions indexorderdefault isapiappendlogtoerrors \
+isapiappendlogtoquery isapicachefile isapifakeasync \
+isapilognotsupported isapireadaheadbuffer keepalive \
+keepalivetimeout languagepriority ldapcacheentries \
+ldapcachettl ldapconnectiontimeout ldapopcacheentries \
+ldapopcachettl ldapsharedcachefile ldapsharedcachesize \
+ldaptrustedca ldaptrustedcatype limit limitexcept \
+limitinternalrecursion limitrequestbody \
+limitrequestfields limitrequestfieldsize \
+limitrequestline limitxmlrequestbody listen \
+listenbacklog loadfile loadmodule location \
+locationmatch lockfile logformat loglevel maxclients \
+maxkeepaliverequests maxmemfree maxrequestsperchild \
+maxrequestsperthread maxspareservers maxsparethreads \
+maxthreads maxthreadsperchild mcachemaxobjectcount \
+mcachemaxobjectsize mcachemaxstreamingbuffer \
+mcacheminobjectsize mcacheremovalalgorithm mcachesize \
+metadir metafiles metasuffix mimemagicfile \
+minspareservers minsparethreads mmapfile \
+modmimeusepathinfo multiviewsmatch namevirtualhost \
+nocache noproxy numservers nwssltrustedcerts \
+nwsslupgradeable options order passenv pidfile port \
+protocolecho proxy proxybadheader proxyblock \
+proxydomain proxyerroroverride proxyiobuffersize \
+proxymatch proxymaxforwards proxypass proxypassreverse \
+proxypreservehost proxyreceivebuffersize proxyremote \
+proxyremotematch proxyrequests proxytimeout proxyvia \
+qsc readmename redirect redirectmatch \
+redirectpermanent redirecttemp refererignore \
+refererlog removecharset removeencoding removehandler \
+removeinputfilter removelanguage removeoutputfilter \
+removetype requestheader require resourceconfig \
+rewritebase rewritecond rewriteengine rewritelock \
+rewritelog rewriteloglevel rewritemap rewriteoptions \
+rewriterule rlimitcpu rlimitmem rlimitnproc satisfy \
+scoreboardfile script scriptalias scriptaliasmatch \
+scriptinterpretersource scriptlog scriptlogbuffer \
+scriptloglength scriptsock securelisten sendbuffersize \
+serveradmin serveralias serverlimit servername \
+serverpath serverroot serversignature servertokens \
+servertype setenv setenvif setenvifnocase sethandler \
+setinputfilter setoutputfilter singlelisten ssiendtag \
+ssierrormsg ssistarttag ssitimeformat ssiundefinedecho \
+sslcacertificatefile sslcacertificatepath \
+sslcarevocationfile sslcarevocationpath \
+sslcertificatechainfile sslcertificatefile \
+sslcertificatekeyfile sslciphersuite sslengine \
+sslmutex ssloptions sslpassphrasedialog sslprotocol \
+sslproxycacertificatefile sslproxycacertificatepath \
+sslproxycarevocationfile sslproxycarevocationpath \
+sslproxyciphersuite sslproxyengine \
+sslproxymachinecertificatefile \
+sslproxymachinecertificatepath sslproxyprotocol \
+sslproxyverify sslproxyverifydepth sslrandomseed \
+sslrequire sslrequiressl sslsessioncache \
+sslsessioncachetimeout sslusername sslverifyclient \
+sslverifydepth startservers startthreads \
+suexecusergroup threadlimit threadsperchild \
+threadstacksize timeout transferlog typesconfig \
+unsetenv usecanonicalname user userdir \
+virtualdocumentroot virtualdocumentrootip virtualhost \
+virtualscriptalias virtualscriptaliasip \
+win32disableacceptex xbithack
+
+keywords2.$(file.patterns.conf)=\
+on off standalone inetd \
+force-response-1.0 downgrade-1.0 nokeepalive \
+indexes includes followsymlinks none \
+x-compress x-gzip
+
+style.conf.0=fore:#808080,$(font.base)
+style.conf.1=fore:#007F00,$(font.comment)
+style.conf.2=fore:#007F7F
+style.conf.9=fore:#00007F,bold
+style.conf.4=fore:#000000,back:#FFE0FF
+style.conf.5=fore:#000000,back:#FFE0FF
+style.conf.6=fore:#7F007F,$(font.monospace)
+style.conf.7=bold
+style.conf.8=fore:#007F7F,bold
+style.conf.3=fore:#000000,back:#A0FFA0
+
+command.compile.$(file.patterns.conf)=httpd -t -f $(FilePath)
+command.build.$(file.patterns.conf)=httpd -t -f $(FilePath)
+
+module cpp
+
+file.patterns.cpp=*.c;*.cc;*.cpp;*.cxx;*.h;*.hh;*.hpp;*.hxx;*.ipp;*.m;*.mm;*.sma
+file.patterns.cplusplus=*.cc;*.cpp;*.cxx
+file.patterns.java=*.java;*.jad;*.pde
+file.patterns.test=*.pln;*.inc;*.t
+file.patterns.js=*.js;*.es;*.ts;*.jse;*.jsm;*.mjs;*.qs
+file.patterns.cs=*.cs
+file.patterns.rc=*.rc;*.rc2;*.dlg
+file.patterns.idl=*.idl;*.odl
+file.patterns.flash=*.as;*.asc;*.jsfl
+file.patterns.ch=*.ch;*.chf;*.chs
+file.patterns.vala=*.vala
+file.patterns.go=*.go
+file.patterns.pike=*.pike
+file.patterns.swift=*.swift
+file.patterns.c.like=$(file.patterns.cpp);$(file.patterns.cs);$(file.patterns.idl);$(file.patterns.java);$(file.patterns.js);$(file.patterns.flash);$(file.patterns.ch);$(file.patterns.vala);$(file.patterns.pike)
+file.patterns.meson=meson.build
+
+*source.patterns.cpp=$(file.patterns.c.like);
+*source.patterns.resource=$(file.patterns.rc);*.def;
+
+shbang.tcc=cpp
+shbang.tinycc=cpp
+
+filter.cpp=C/C++ (c cc cpp cxx cs vala h hh hxx hpp ipp dlg rc rc2 mak)|\
+$(file.patterns.cpp);$(file.patterns.cs);$(file.patterns.rc);$(file.patterns.vala);*.mak;make*|
+filter.java=Java (java)|*.java|
+filter.js=JavaScript (js es ts)|$(file.patterns.js)|
+filter.idl=IDL (idl odl)|$(file.patterns.idl)|
+filter.test=SilkTest (pln inc t)|$(file.patterns.test)|
+filter.flash=Flash (as asc jsfl)|$(file.patterns.flash)|
+filter.ch=Ch (ch chf chs)|$(file.patterns.ch)|
+filter.go=Go (go)|$(file.patterns.go)|
+filter.pike=Pike (pike)|$(file.patterns.pike)|
+filter.swift=Swift (swift)|$(file.patterns.swift)|
+
+*filter.cpp=$(filter.cpp)
+*filter.java=$(filter.java)
+*filter.javascript=$(filter.js)
+*filter.idl=$(filter.idl)
+
+lexer.$(file.patterns.java)=cpp
+lexer.$(file.patterns.cpp)=cpp
+lexer.$(file.patterns.rc)=cpp
+lexer.$(file.patterns.idl)=cpp
+lexer.$(file.patterns.cs)=cpp
+lexer.$(file.patterns.js)=cpp
+lexer.$(file.patterns.test)=cpp
+lexer.$(file.patterns.flash)=cpp
+lexer.$(file.patterns.ch)=cpp
+lexer.$(file.patterns.vala)=cpp
+lexer.$(file.patterns.go)=cpp
+lexer.$(file.patterns.pike)=cpp
+lexer.$(file.patterns.swift)=cpp
+lexer.$(file.patterns.meson)=cpp
+
+*language.c=&C / C++|c||
+*language.csharp=C&#|cs||
+*language.java=&Java|java||
+*language.javascript=Java&Script|js||
+
+keywordclass.cpp=alignas alignof and and_eq asm audit auto axiom bitand bitor bool break \
+case catch char char8_t char16_t char32_t class compl concept \
+const consteval constexpr const_cast continue co_await co_return co_yield \
+decltype default delete do double dynamic_cast else enum explicit export extern false final float for \
+friend goto if import inline int long module mutable namespace new noexcept not not_eq nullptr \
+operator or or_eq override private protected public \
+register reinterpret_cast requires return \
+short signed sizeof static static_assert static_cast struct switch \
+template this thread_local throw true try typedef typeid typename union unsigned using \
+virtual void volatile wchar_t while xor xor_eq
+
+directives.objective.c=\
+@class @defs @protocol @required @optional @end \
+@interface @public @package @protected @private @property \
+@implementation @synthesize @dynamic \
+@throw @try @catch @finally \
+@synchronized @autoreleasepool \
+@selector @encode \
+@compatibility_alias
+
+keywords.$(file.patterns.cpp)=$(keywordclass.cpp) $(directives.objective.c)
+
+
+file.patterns.doxygen.langs=$(file.patterns.cpp);$(file.patterns.java)
+keywordclass.doxygen=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param param[in] param[out] \
+post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw throws todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+keywords3.$(file.patterns.doxygen.langs)=$(keywordclass.doxygen)
+
+
+word.chars.cxx=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.cpp)=$(word.chars.cxx)
+calltip.cpp.word.characters=$(chars.alpha)$(chars.numeric)_
+comment.block.cpp=//~
+comment.stream.start.cpp=/*
+comment.stream.end.cpp=*/
+comment.box.start.cpp=/*
+comment.box.middle.cpp= *
+comment.box.end.cpp= */
+
+
+file.patterns.c.except.cpp=$(file.patterns.cs);$(file.patterns.idl);*.java;$(file.patterns.flash);$(file.patterns.ch)
+statement.indent.$(file.patterns.c.except.cpp)=5 case default do else for if while
+statement.indent.$(file.patterns.cpp)=5 case default do else for if private protected public while
+statement.end.$(file.patterns.c.like)=10 ;
+statement.lookback.$(file.patterns.c.like)=20
+block.start.$(file.patterns.c.like)=10 {
+block.end.$(file.patterns.c.like)=10 }
+
+
+preprocessor.symbol.$(file.patterns.cpp)=#
+preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.cpp)=else elif
+preprocessor.end.$(file.patterns.cpp)=endif
+
+preprocessor.symbol.$(file.patterns.cs)=#
+preprocessor.start.$(file.patterns.cs)=if region
+preprocessor.middle.$(file.patterns.cs)=else elif
+preprocessor.end.$(file.patterns.cs)=endif endregion
+
+keywordclass.ch=\
+auto array bool break case char class complex ComplexInf ComplexNaN \
+const continue default delete \
+do double else enum export extern float for foreach goto if Inf inline int \
+long namespace NaN new NULL private public register restrict return short \
+signed sizeof static string_t struct switch this typedef union unsigned \
+using void volatile wchar_t while __declspec
+keywords.$(file.patterns.ch)=$(keywordclass.ch)
+word.chars.ch=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ch)=$(word.chars.cxx)
+comment.block.ch=//~
+comment.stream.start.ch=/*
+comment.stream.end.ch=*/
+comment.box.start.ch=/*
+comment.box.middle.ch= *
+comment.box.end.ch= */
+preprocessor.symbol.$(file.patterns.ch)=#
+preprocessor.start.$(file.patterns.ch)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.ch)=else elif
+preprocessor.end.$(file.patterns.ch)=endif
+
+keywordclass.cs=abstract as ascending base bool break by byte case catch char checked \
+class const continue decimal default delegate descending do double else enum \
+equals event explicit extern false finally fixed float for foreach from goto group if \
+implicit in int interface internal into is join lock let long namespace new null \
+object on operator orderby out override params private protected public \
+readonly ref return sbyte sealed select short sizeof stackalloc static \
+string struct switch this throw true try typeof uint ulong \
+unchecked unsafe ushort using var virtual void volatile where while
+keywords.$(file.patterns.cs)=$(keywordclass.cs)
+word.characters.$(file.patterns.cs)=$(word.chars.cxx)
+
+keywordclass.go=\
+bool byte break case chan complex64 complex128 const continue defer default  \
+else  for func go goto fallthrough false float32 float64 if import int interface int8 int16 int32 int64 \
+len map nil package range return select string struct switch true type \
+uint uintptr uint8 uint16 uint32 uint64  var
+keywords.$(file.patterns.go)=$(keywordclass.go)
+
+keywordclass.rc=\
+ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON \
+BEGIN BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS \
+COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX DISCARDABLE \
+EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE LISTBOX LTEXT \
+MENU MENUEX MENUITEM MESSAGETABLE POPUP \
+PUSHBUTTON RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 \
+STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY
+keywords.$(file.patterns.rc)=$(keywordclass.rc)
+
+keywordclass.idl=\
+aggregatable allocate appobject arrays async async_uuid \
+auto_handle \
+bindable boolean broadcast byte byte_count \
+call_as callback char coclass code comm_status \
+const context_handle context_handle_noserialize \
+context_handle_serialize control cpp_quote custom \
+decode default defaultbind defaultcollelem \
+defaultvalue defaultvtable dispinterface displaybind dllname \
+double dual \
+enable_allocate encode endpoint entry enum error_status_t \
+explicit_handle \
+fault_status first_is float \
+handle_t heap helpcontext helpfile helpstring \
+helpstringcontext helpstringdll hidden hyper \
+id idempotent ignore iid_as iid_is immediatebind implicit_handle \
+import importlib in include in_line int __int64 __int3264 interface \
+last_is lcid length_is library licensed local long \
+max_is maybe message methods midl_pragma \
+midl_user_allocate midl_user_free min_is module ms_union \
+ncacn_at_dsp ncacn_dnet_nsp ncacn_http ncacn_ip_tcp \
+ncacn_nb_ipx ncacn_nb_nb ncacn_nb_tcp ncacn_np \
+ncacn_spx ncacn_vns_spp ncadg_ip_udp ncadg_ipx ncadg_mq \
+ncalrpc nocode nonbrowsable noncreatable nonextensible notify \
+object odl oleautomation optimize optional out out_of_line \
+pipe pointer_default pragma properties propget propput propputref \
+ptr public \
+range readonly ref represent_as requestedit restricted retval \
+shape short signed size_is small source strict_context_handle \
+string struct switch switch_is switch_type \
+transmit_as typedef \
+uidefault union unique unsigned user_marshal usesgetlasterror uuid \
+v1_enum vararg version void wchar_t wire_marshal
+
+keywordclass.msidl=handle
+keywordclass.xpidl=attribute native noscript scriptable shared wstring inout
+keywords.$(file.patterns.idl)=$(keywordclass.idl) $(keywordclass.xpidl)
+
+keywordclass.java=abstract assert boolean break byte case catch char class \
+const continue default do double else enum extends final finally float for \
+goto if implements import instanceof int interface long \
+native new package private protected public \
+return short static strictfp super switch synchronized this throw throws \
+transient try var void volatile while
+keywords.$(file.patterns.java)=$(keywordclass.java)
+
+keywordclass.javascript=abstract boolean break byte case catch char class \
+const continue debugger default delete do double else enum export extends \
+final finally float for function goto if implements import in instanceof \
+int interface long native new package private protected public \
+return short static super switch synchronized this throw throws \
+transient try typeof var void volatile while with
+keywords.$(file.patterns.js)=$(keywordclass.javascript)
+
+keywordclass.flash=add and break case catch class continue default delete do \
+dynamic else eq extends false finally for function ge get gt if implements import in \
+instanceof interface intrinsic le lt ne new not null or private public return \
+set static super switch this throw true try typeof undefined var void while with
+
+keywordclass2.flash=Array Arguments Accessibility Boolean Button Camera Color \
+ContextMenu ContextMenuItem Date Error Function Key LoadVars LocalConnection Math \
+Microphone Mouse MovieClip MovieClipLoader NetConnection NetStream Number Object \
+PrintJob Selection SharedObject Sound Stage String StyleSheet System TextField \
+TextFormat TextSnapshot Video Void XML XMLNode XMLSocket \
+_accProps _focusrect _global _highquality _parent _quality _root _soundbuftime \
+arguments asfunction call capabilities chr clearInterval duplicateMovieClip \
+escape eval fscommand getProperty getTimer getURL getVersion gotoAndPlay gotoAndStop \
+ifFrameLoaded Infinity -Infinity int isFinite isNaN length loadMovie loadMovieNum \
+loadVariables loadVariablesNum maxscroll mbchr mblength mbord mbsubstring MMExecute \
+NaN newline nextFrame nextScene on onClipEvent onUpdate ord parseFloat parseInt play \
+prevFrame prevScene print printAsBitmap printAsBitmapNum printNum random removeMovieClip \
+scroll set setInterval setProperty startDrag stop stopAllSounds stopDrag substring \
+targetPath tellTarget toggleHighQuality trace unescape unloadMovie unLoadMovieNum updateAfterEvent
+
+keywords.$(file.patterns.flash)=$(keywordclass.flash)
+keywords2.$(file.patterns.flash)=$(keywordclass2.flash)
+
+keywordclass.vala=if else switch case default break continue return yield for foreach in \
+do while try catch finally throw
+
+keywordclass2.vala=namespace interface class struct enum delegate signal errordomain \
+construct get set value base const static var dynamic weak unowned virtual abstract \
+override public protected private extern throws requires ensures yields out ref lock \
+using true false null delete generic new this typeof sizeof as owned int string char bool
+
+keywords.$(file.patterns.vala)=$(keywordclass.vala)
+keywords2.$(file.patterns.vala)=$(keywordclass2.vala)
+
+keywordclass.pike=constant enum if do for while else foreach case switch break continue \
+return typeof catch class lambda import inherit static void int string float mixed object \
+function program array mapping multiset
+keywords.$(file.patterns.pike)=$(keywordclass.pike)
+
+keywordclass.swift.declarations=class deinit enum extension func import init \
+internal let operator private protocol public static struct subscript typealias var
+keywordclass.swift.statements=break case continue default do else fallthrough \
+for if in return switch where while
+keywordclass.swift.expressions=as dynamicType false is nil self Self super \
+true __COLUMN__ __FILE__ __FUNCTION__ __LINE__
+keywordclass.swift.contextual=associativity convenience dynamic didSet final get \
+infix inout lazy left mutating none nonmutating optional override postfix \
+precedence prefix Protocol required right set Type unowned weak willSet
+
+keywords.$(file.patterns.swift)=$(keywordclass.swift.declarations) \
+$(keywordclass.swift.statements) $(keywordclass.swift.expressions) \
+$(keywordclass.swift.contextual)
+
+keywords.$(file.patterns.meson)=if else elif endif
+keywords2.$(file.patterns.meson)=import meson project \
+executable static_library shared_library dependencies \
+include_directories get_option get_compiler get_id compile_resources \
+cpp_args link_args override_options name_prefix link_with
+
+
+
+
+
+
+style.cpp.32=$(font.base)
+style.cpp.0=fore:#808080
+style.cpp.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.cpp.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.cpp.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.cpp.4=$(colour.number)
+style.cpp.5=$(colour.keyword),bold
+style.cpp.6=$(colour.string)
+style.cpp.7=$(colour.char)
+style.cpp.8=fore:#804080
+style.cpp.9=$(colour.preproc)
+style.cpp.10=$(colour.operator),bold
+style.cpp.11=
+style.cpp.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.cpp.13=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+style.cpp.14=fore:#3F7F3F,$(font.monospace),back:#E0F0FF,eolfilled
+style.cpp.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.cpp.16=fore:#B00040
+style.cpp.17=fore:#3060A0,$(font.code.comment.doc)
+style.cpp.18=fore:#804020,$(font.code.comment.doc)
+style.cpp.19=fore:#DD9900
+style.cpp.20=$(colour.string),back:#FFF3FF,eolfilled
+style.cpp.21=$(font.monospace),fore:#007F00,back:#E0FFE0,eolfilled
+style.cpp.22=$(font.monospace),fore:#007F00,back:#E7FFD7,eolfilled
+style.cpp.23=fore:#659900
+style.cpp.24=$(colour.code.comment.doc)
+style.cpp.25=fore:#C06000
+style.cpp.26=fore:#BE07FF,$(font.code.comment.line)
+style.cpp.27=$(colour.string)
+
+
+style.cpp.64=fore:#C0C0C0,$(traits.inactive)
+style.cpp.65=$(style.cpp.1),fore:#90B090,$(traits.inactive)
+style.cpp.66=$(style.cpp.2),fore:#90B090,$(traits.inactive)
+style.cpp.67=$(style.cpp.3),fore:#D0D0D0,$(traits.inactive)
+style.cpp.68=$(style.cpp.4),fore:#90B0B0,$(traits.inactive)
+style.cpp.69=$(style.cpp.5),fore:#9090B0,$(traits.inactive)
+style.cpp.70=$(style.cpp.6),fore:#B090B0,$(traits.inactive)
+style.cpp.71=$(style.cpp.7),fore:#B090B0,$(traits.inactive)
+style.cpp.72=$(style.cpp.8),fore:#C0C0C0,$(traits.inactive)
+style.cpp.73=$(style.cpp.9),fore:#B0B090,$(traits.inactive)
+style.cpp.74=$(style.cpp.10),fore:#B0B0B0,$(traits.inactive)
+style.cpp.75=$(style.cpp.11),fore:#B0B0B0,$(traits.inactive)
+style.cpp.76=$(style.cpp.12),fore:#000000,$(traits.inactive)
+style.cpp.77=$(style.cpp.13),fore:#90B090,$(traits.inactive)
+style.cpp.78=$(style.cpp.14),fore:#7FAF7F,$(traits.inactive)
+style.cpp.79=$(style.cpp.15),fore:#C0C0C0,$(traits.inactive)
+style.cpp.80=$(style.cpp.16),fore:#C0C0C0,$(traits.inactive)
+style.cpp.81=$(style.cpp.17),fore:#C0C0C0,$(traits.inactive)
+style.cpp.82=$(style.cpp.18),fore:#C0C0C0,$(traits.inactive)
+style.cpp.84=$(style.cpp.20),fore:#B090B0,$(traits.inactive)
+style.cpp.85=$(style.cpp.21),fore:#90B090,$(traits.inactive)
+style.cpp.86=$(style.cpp.22),fore:#90B090,$(traits.inactive)
+style.cpp.87=$(style.cpp.23),fore:#A0C090,$(traits.inactive)
+style.cpp.88=$(style.cpp.23),fore:#C0C0C0,$(traits.inactive)
+style.cpp.89=fore:#D7A090,$(traits.inactive)
+style.cpp.90=fore:#C3A1CF,$(font.code.comment.line),$(traits.inactive)
+
+braces.cpp.style=10
+
+ccopts=-pedantic -Os
+cc=g++ $(ccopts) -c $(FileNameExt) -o $(FileName).o
+ccc=gcc $(ccopts) -c $(FileNameExt) -o $(FileName).o
+
+make.command=make
+command.compile.*.c=$(ccc) -std=c99
+command.build.*.c=$(make.command)
+command.build.*.h=$(make.command)
+command.clean.*.c=$(make.command) clean
+command.clean.*.h=$(make.command) clean
+command.go.*.c=./$(FileName)
+
+command.compile.$(file.patterns.cplusplus)=$(cc)
+command.build.$(file.patterns.cplusplus)=$(make.command)
+command.clean.$(file.patterns.cplusplus)=$(make.command) clean
+command.go.$(file.patterns.cplusplus)=./$(FileName)
+command.go.needs.$(file.patterns.cplusplus)=g++ $(ccopts) $(FileNameExt) -o $(FileName)
+
+command.name.0.$(file.patterns.cpp)=Indent
+command.0.$(file.patterns.cpp)=astyle --style=attach --indent=force-tab=8 --keep-one-line-blocks \
+--pad-header --unpad-paren --pad-comma --indent-cases --align-pointer=name --pad-method-prefix \
+--pad-return-type --pad-param-type --align-method-colon --pad-method-colon=after $(FileNameExt)
+command.is.filter.0.$(file.patterns.cpp)=1
+
+command.name.1.$(file.patterns.cplusplus)=Lint
+command.1.$(file.patterns.cplusplus)=g++ -W -Wall -Wshadow -Wwrite-strings -Wold-style-cast \
+	-Woverloaded-virtual -pedantic -Os -fno-exceptions -c $(FileNameExt)
+
+if PLAT_WIN
+	command.compile.*.rc=windres $(FileNameExt) $(FileName).o
+	command.build.*.rc=$(make.command)
+	command.help.$(file.patterns.cpp)=$(CurrentWord)!G:\Program Files\Microsoft Visual Studio\MSDN98\98VSa\1033\MSDNVS6A.COL
+	command.help.subsystem.$(file.patterns.cpp)=4
+	command.go.*.js=cscript /nologo $(FileNameExt)
+
+if PLAT_GTK
+	command.help.$(file.patterns.cpp)=man $(CurrentWord) | col -b
+
+if PLAT_WIN
+	command.build.*.cs=csc /t:winexe $(FileNameExt) /r:system.dll,system.drawing.dll
+	command.go.*.cs=$(FileName)
+	command.go.subsystem.*.cs=0
+if PLAT_GTK
+	command.build.*.cs=mcs /t:winexe $(FileNameExt) /r:System,System.Drawing
+	command.go.*.cs=mono $(FileName).exe
+	command.go.subsystem.*.cs=1
+
+command.compile.*.java=javac $(FileNameExt)
+command.build.*.java=javac *.java
+command.go.*.java=java -cp . $(FileName)
+
+if PLAT_WIN
+	command.help.*.java=http://java.sun.com/javase/6/docs/api/java/util/$(CurrentWord).html
+	command.help.subsystem.*.java=2
+
+command.compile.*.ch=ch -n $(FileNameExt)
+command.build.*.ch=ch -n  $(FileNameExt)
+command.go.*.ch=ch -u $(FileNameExt)
+
+command.compile.*.as=mtasc -strict $(FileNameExt)
+command.build.*.as=mtasc -strict *.as
+
+command.build.$(file.patterns.vala)=valac $(FileNameExt)
+command.go.*.vala=./$(FileName)
+
+command.compile.*.go=8g $(FileNameExt)
+command.build.*.go=$(make.command)
+command.go.*.go=./$(FileName)
+
+command.compile.*.ts=tsc $(FileNameExt)
+
+module csound
+
+file.patterns.csound=*.orc;*.sco;*.csd
+filter.csound=Csound (orc sco csd)|$(file.patterns.csound)|
+*filter.csound=$(filter.csound)
+
+lexer.$(file.patterns.csound)=csound
+
+*language.csound=Csound|orc||
+
+
+
+csound_opcodes=\
+	a i db in or zr Add Dec Div Inc Mul Sub abs and cos dam dec div exp \
+	fin fof fog inh ino inq ins int inx inz lfo log mac mod mul not out \
+	pan pow rms rnd shl sin sqr sub sum tab tan tb0 tb1 tb2 tb3 tb4 tb5 \
+	tb6 tb7 tb8 tb9 urd vco xin xor zar zaw zir ziw zkr zkw adsr babo \
+	buzz cent clip comb cosh diff divz fini fink fmb3 fof2 fold fout \
+	frac ftsr gain goto in32 inch init line maca moog mute nrpn outc \
+	outh outo outq outs outx outz peak port pset pvoc rand seed sinh \
+	sqrt stix tabw tanh tb10 tb11 tb12 tb13 tb14 tb15 tone vadd vco2 \
+	vdiv vexp vibr vmap vmul vpow wrap xout xyin zacl zarg zawm ziwm \
+	zkcl zkwm FLbox FLjoy FLrun adsyn ampdb atone birnd bqrez butbp \
+	butbr buthp butlp clear ctrl7 dbamp dconv delay dumpk endin endop \
+	event expon fouti foutk ftgen ftlen gauss gbuzz grain guiro igoto \
+	ihold instr integ kgoto limit linen log10 loopg loopl lpf18 madsr \
+	max_k metro noise nsamp oscil out32 outch outic outkc outq1 outq2 \
+	outq3 outq4 outs1 outs2 pareq pitch pluck portk print pvadd randh \
+	randi rbjeq readk reson rezzy rnd31 scans scanu sense space tab_i \
+	table tbvcf tempo timek times tival tonek tonex vaddv vbap4 vbap8 \
+	vbapz vcomb vcopy vdecr vdivv veloc vexpv vibes vincr vmult voice \
+	vport vpowv vpvoc vsubv vwrap wgbow xadsr zamod zkmod FLhide FLkeyb \
+	FLknob FLpack FLshow FLtabs FLtext active adsynt alpass areson \
+	atonek atonex bamboo bbcutm bbcuts biquad cabasa cauchy cggoto \
+	cigoto ckgoto clfilt cngoto convle cosinv cpsoct cpspch cpstun \
+	cpuprc cross2 crunch ctrl14 ctrl21 delay1 delayk delayr delayw \
+	deltap denorm diskin dumpk2 dumpk3 dumpk4 envlpx expseg filesr \
+	fiopen fmbell follow foscil foutir ftlen2 ftload ftmorf ftsave \
+	grain2 grain3 harmon hrtfer initc7 interp jitter linenr lineto \
+	linseg locsig loopge loople lorenz loscil lowres lpread lpslot \
+	mandel mandol mclock mdelay midic7 midiin midion mirror moscil \
+	mpulse mrtmsg mxadsr nlfilt noteon notnum ntrpol octave octcps \
+	octpch opcode oscbnk oscil1 oscil3 oscili osciln oscils oscilx \
+	outiat outipb outipc outkat outkpb outkpc pchoct phasor planet \
+	poscil printk prints pvread pvsftr pvsftw random readk2 readk3 \
+	readk4 reinit resonk resonr resonx resony resonz reverb rigoto \
+	s16b14 s32b14 sekere sfload sfplay shaker sininv spat3d spdist \
+	spsend strset table3 tablei tablew tabw_i taninv tigoto timout \
+	turnon upsamp vbap16 vcella vco2ft vdel_k vdelay vlimit vmultv \
+	vrandh vrandi wgclar xscans xscanu FLcolor FLcount FLgroup FLlabel \
+	FLpanel FLvalue aftouch ampdbfs ampmidi aresonk balance bexprnd \
+	biquada changed clockon cps2pch cpsmidi cpstmid cpstuni cpsxpch \
+	dbfsamp dcblock deltap3 deltapi deltapn deltapx dispfft display \
+	envlpxr exprand expsega expsegr filelen filter2 flanger fmmetal \
+	fmrhode fmvoice follow2 foscili fprints ftchnls ftloadk ftlptim \
+	ftsavek gogobel granule hilbert initc14 initc21 invalue jitter2 \
+	jspline linrand linsegr locsend logbtwo loopseg loscil3 lowresx \
+	lphasor lposcil lpreson lpshold marimba massign midic14 midic21 \
+	midichn midion2 midiout moogvcf noteoff nreverb nstrnum octmidi \
+	oscil1i outic14 outipat outkc14 outkpat pcauchy pchbend pchmidi \
+	phaser1 phaser2 pinkish poisson polyaft poscil3 printk2 printks \
+	product pvcross pvsanal pvsinfo pvsynth randomh randomi release \
+	repluck reverb2 rspline rtclock seqtime sfilist sfinstr sfplay3 \
+	sfplaym sfplist slider8 sndwarp soundin spat3di spat3dt specsum \
+	streson tableiw tablekt tableng tablera tablewa taninv2 tempest \
+	tlineto transeg trigger trigseq trirand turnoff unirand valpass \
+	vco2ift vdelay3 vdelayk vdelayx vexpseg vibrato vlinseg vlowres \
+	vmirror waveset weibull wgbrass wgflute wgpluck wguide1 wguide2 \
+	xtratim zakinit FLbutton FLcolor2 FLprintk FLroller FLscroll \
+	FLsetBox FLsetVal FLslider FLupdate betarand butterbp butterbr \
+	butterhp butterlp chanctrl clockoff convolve cpsmidib ctrlinit \
+	cuserrnd deltapxw distort1 downsamp duserrnd filepeak fmpercfl \
+	fmwurlie fprintks hsboscil lowpass2 lpfreson lpinterp lposcil3 \
+	maxalloc midictrl multitap nestedap octmidib oscilikt outvalue \
+	pchmidib powoftwo prealloc pvinterp pvsadsyn pvscross pvsfread \
+	pvsmaska rireturn samphold schedule semitone sensekey setksmps \
+	sfinstr3 sfinstrm sfplay3m sfpreset slider16 slider32 slider64 \
+	slider8f soundout specaddm specdiff specdisp specfilt spechist \
+	specptrk specscal spectrum sprintks subinstr svfilter tablegpw \
+	tableikt tablemix tableseg tablewkt tablexkt tb0_init tb1_init \
+	tb2_init tb3_init tb4_init tb5_init tb6_init tb7_init tb8_init \
+	tb9_init tempoval vco2init vdelayxq vdelayxs vdelayxw vecdelay \
+	wgpluck2 wterrain xscanmap zfilter2 FLbutBank FLgetsnap FLpackEnd \
+	FLprintk2 FLsetFont FLsetSize FLsetText FLsetsnap FLslidBnk \
+	FLtabsEnd dripwater eventname ktableseg noteondur osciliktp \
+	oscilikts pgmassign phasorbnk pitchamdf pvbufread readclock \
+	sandpaper scantable schedwhen sfinstr3m sfpassign slider16f \
+	slider32f slider64f sndwarpst soundoutc soundouts tablecopy \
+	tableigpw tableimix tablexseg tb10_init tb11_init tb12_init \
+	tb13_init tb14_init tb15_init timeinstk timeinsts vbap4move \
+	vbap8move vbapzmove vdelayxwq vdelayxws xscansmap FLgroupEnd \
+	FLloadsnap FLpack_end FLpanelEnd FLsavesnap FLsetAlign FLsetColor \
+	FLsetVal_i FLtabs_end filenchnls noteondur2 scanhammer schedkwhen \
+	tableicopy tambourine vbap16move vbaplsinit wgbowedbar FLgroup_end \
+	FLpanel_end FLscrollEnd FLsetColor2 mididefault midinoteoff \
+	sleighbells FLscroll_end subinstrinit FLsetPosition FLsetTextSize \
+	FLsetTextType midinoteoncps midinoteonkey midinoteonoct \
+	midinoteonpch midipitchbend schedwhenname FLsetTextColor \
+	schedkwhenname midicontrolchange midiprogramchange \
+	midipolyaftertouch midichannelaftertouch
+
+csound_header_stmts=sr kr ar ksmps nchnls
+
+csound_other_keywords=
+
+keywords.$(file.patterns.csound)=$(csound_opcodes)
+keywords2.$(file.patterns.csound)=$(csound_header_stmts)
+keywords3.$(file.patterns.csound)=$(csound_other_keywords)
+
+comment.block.csound=;
+
+
+style.csound.0=$(font.monospace)
+style.csound.1=$(font.monospace),fore:#669999
+style.csound.2=$(font.monospace),fore:#339933
+style.csound.3=$(font.monospace)
+style.csound.4=$(font.monospace)
+style.csound.5=
+style.csound.6=$(font.monospace),fore:#0000FF,bold
+style.csound.7=$(font.monospace),fore:#CC2200
+style.csound.8=$(font.monospace)
+style.csound.9=$(font.monospace)
+style.csound.10=$(font.monospace),fore:#660099,bold
+style.csound.11=$(font.monospace),fore:#660099
+style.csound.12=$(font.monospace),fore:#660099
+style.csound.13=$(font.monospace),fore:#660099
+style.csound.14=$(font.monospace),fore:#660099
+style.csound.15=$(font.monospace),fore:#000000,back:#E0C0E0,eolfilled
+
+module css
+
+filter.css=CSS (css)|*.css|
+*filter.css=$(filter.css)
+lexer.*.css=css
+*language.css=CSS|css||
+
+*source.patterns.css=*.css;
+
+indent.size.*.css=4
+tab.size.*.css=4
+use.tabs.*.css=1
+
+keywordclass.css1=\
+color background-color background-image background-repeat background-attachment background-position background \
+font-family font-style font-variant font-weight font-size font \
+word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height \
+margin-top margin-right margin-bottom margin-left margin \
+padding-top padding-right padding-bottom padding-left padding \
+border-top-width border-right-width border-bottom-width border-left-width border-width \
+border-top border-right border-bottom border-left border \
+border-color border-style width height float clear \
+display white-space list-style-type list-style-image list-style-position list-style
+
+keywordclass.values=\
+auto none normal italic oblique small-caps bold bolder lighter \
+xx-small x-small small medium large x-large xx-large larger smaller \
+transparent repeat repeat-x repeat-y no-repeat scroll fixed \
+top bottom left center right justify both \
+underline overline line-through blink \
+baseline sub super text-top middle text-bottom \
+capitalize uppercase lowercase thin medium thick \
+dotted dashed solid double groove ridge inset outset \
+block inline list-item pre no-wrap inside outside \
+disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha \
+aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
+
+
+
+
+keywordclass.css2=\
+border-top-color border-right-color border-bottom-color border-left-color border-color \
+border-top-style border-right-style border-bottom-style border-left-style border-style \
+top right bottom left position z-index direction unicode-bidi \
+min-width max-width min-height max-height overflow clip visibility content quotes \
+counter-reset counter-increment marker-offset \
+size marks page-break-before page-break-after page-break-inside page orphans widows \
+font-stretch font-size-adjust unicode-range units-per-em src \
+panose-1 stemv stemh slope cap-height x-height ascent descent widths bbox definition-src \
+baseline centerline mathline topline text-shadow \
+caption-side table-layout border-collapse border-spacing empty-cells speak-header \
+cursor outline outline-width outline-style outline-color \
+volume speak pause-before pause-after pause cue-before cue-after cue \
+play-during azimuth elevation speech-rate voice-family pitch pitch-range stress richness \
+speak-punctuation speak-numeral
+
+keywordclass.values2=\
+inherit \
+run-in compact marker table inline-table table-row-group table-header-group table-footer-group \
+table-row table-column-group table-column table-cell table-caption \
+static relative absolute fixed ltr rtl embed bidi-override \
+visible hidden scroll collapse open-quote close-quote no-open-quote no-close-quote \
+decimal-leading-zero lower-greek lower-latin upper-latin hebrew armenian georgian \
+cjk-ideographic hiragana katakana hiragana-iroha katakana-iroha \
+landscape portrait crop cross always avoid \
+wider narrower ultra-condensed extra-condensed condensed semi-condensed \
+semi-expanded expanded extra-expanded ultra-expanded \
+caption icon menu message-box small-caption status-bar \
+separate show hide once crosshair default pointer move text wait help \
+e-resize ne-resize nw-resize n-resize se-resize sw-resize s-resize w-resize \
+ActiveBorder ActiveCaption AppWorkspace Background ButtonFace ButtonHighlight ButtonShadow \
+InactiveCaptionText ButtonText CaptionText GrayText Highlight HighlightText InactiveBorder \
+InactiveCaption InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow \
+ThreeDFace ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame WindowText \
+silent x-soft soft medium loud x-loud spell-out mix \
+left-side far-left center-left center-right far-right right-side behind leftwards rightwards \
+below level above higher lower x-slow slow medium fast x-fast faster slower \
+male female child x-low low high x-high code digits continuous
+
+keywordclass.vendor.prefixes=^-moz- ^-webkit- ^-o- ^-ms-
+
+keywordclass.css3=background-size \
+border-radius border-top-right-radius border-bottom-right-radius border-bottom-left-radius border-top-left-radius \
+box-shadow \
+columns column-width column-count column-rule column-gap column-rule-color column-rule-style column-rule-width \
+resize opacity word-wrap
+
+keywordclass.pseudoclass.css1=link active visited
+keywordclass.pseudoclass.css2=first-child focus hover lang left right first
+keywordclass.pseudoclass.css3=empty enabled disabled checked not root target \
+only-child last-child nth-child nth-last-child \
+first-of-type last-of-type nth-of-type nth-last-of-type only-of-type \
+valid invalid required optional
+keywordclass.pseudoclass.other=indeterminate default
+
+keywordclass.pseudoelement.css=first-letter first-line before after
+keywordclass.pseudoelement.css3=selection
+
+
+
+
+keywords.*.css=$(keywordclass.css1)
+keywords2.*.css=$(keywordclass.pseudoclass.css1) $(keywordclass.pseudoclass.css2) \
+    $(keywordclass.pseudoclass.css3) $(keywordclass.pseudoelement.css)
+keywords3.*.css=$(keywordclass.css2)
+keywords4.*.css=$(keywordclass.css3)
+keywords5.*.css=$(keywordclass.pseudoelement.css) $(keywordclass.pseudoelement.css3)
+keywords6.*.css=$(keywordclass.vendor.prefixes) filter
+keywords7.*.css=$(keywordclass.pseudoclass.other) $(keywordclass.vendor.prefixes)
+keywords8.*.css=$(keywordclass.pseudoelement.other) $(keywordclass.vendor.prefixes)
+
+word.characters.*.css=$(chars.alpha)$(chars.numeric)-
+comment.stream.start.css=/*
+comment.stream.end.css=*/
+
+style.css.32=$(font.code.base)
+style.css.0=fore:#FF0080
+style.css.1=$(colour.keyword),bold
+style.css.2=
+style.css.3=fore:#800000
+style.css.4=$(colour.error)
+style.css.5=$(colour.operator)
+style.css.6=fore:#0040E0
+style.css.7=fore:#FF0000
+style.css.8=$(colour.string)
+style.css.9=$(colour.code.comment.box),$(font.code.comment.box)
+style.css.10=$(colour.number),italics
+style.css.11=fore:#FF8000,bold
+style.css.12=$(colour.preproc)
+style.css.13=$(colour.string)
+style.css.14=$(colour.string)
+style.css.15=fore:#0040E0
+style.css.16=fore:#800000
+style.css.17=fore:#00A0E0
+style.css.18=fore:#C80000
+style.css.19=fore:#7F7F00
+style.css.20=fore:#7F7F00
+style.css.21=fore:#7F7F00
+style.css.22=$(colour.preproc),bold
+style.css.23=fore:#DD9900
+
+block.start.*.css=5 {
+block.end.*.css=5 }
+
+module d
+
+file.patterns.d=*.d
+filter.d=D (d)|$(file.patterns.d)|
+*filter.d=$(filter.d)
+lexer.$(file.patterns.d)=d
+*language.d=D|d||
+
+word.chars.d=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.d)=$(word.chars.d)
+calltip.d.word.characters=$(chars.alpha)$(chars.numeric)_
+
+
+comment.block.d=//~
+comment.stream.start.d=/+
+comment.stream.end.d=+/
+comment.box.start.d=/*
+comment.box.middle.d= *
+comment.box.end.d= */
+
+statement.indent.$(file.patterns.d)=6 case catch class debug default do else \
+finally for foreach foreach_reverse if private protected public scope struct \
+try union while with
+statement.end.$(file.patterns.d)=13 ;
+statement.lookback.$(file.patterns.d)=20
+block.start.$(file.patterns.d)=13 {
+block.end.$(file.patterns.d)=13 }
+
+keywords.$(file.patterns.d)=abstract alias align asm assert auto \
+ body bool break byte \
+ case cast catch cdouble cent cfloat char class const continue creal \
+ dchar debug default delegate delete deprecated do double \
+ else enum export extern \
+ false final finally float for foreach foreach_reverse function \
+ goto \
+ idouble if ifloat import in inout int interface invariant ireal is \
+ lazy long \
+ mixin module \
+ new null \
+ out override \
+ package pragma private protected public \
+ real return \
+ scope short static struct super switch synchronized \
+ template this throw true try typedef typeid typeof \
+ ubyte ucent uint ulong union unittest ushort \
+ version void volatile \
+ wchar while with
+
+
+keywords3.$(file.patterns.d)=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+
+
+
+
+
+style.d.32=$(font.base)
+style.d.0=fore:#808080
+style.d.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.d.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.d.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.d.4=$(colour.code.comment.nested),$(font.code.comment.nested)
+style.d.5=$(colour.number)
+style.d.6=$(colour.keyword),bold
+style.d.7=$(colour.keyword),bold
+style.d.8=$(colour.keyword),bold
+style.d.9=$(colour.keyword),bold
+style.d.10=$(colour.string)
+style.d.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.d.12=$(colour.char)
+style.d.13=$(colour.operator),bold
+style.d.14=
+style.d.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.d.16=fore:#3060A0,$(font.code.comment.doc)
+style.d.17=fore:#804020,$(font.code.comment.doc)
+style.d.18=fore:#DD9900
+style.d.19=fore:#DD9900
+style.d.20=fore:#DD9900
+style.d.21=fore:#DD9900
+style.d.22=fore:#DD9900
+braces.d.style=13
+
+
+command.compile.*.d=dmd -O $(FileNameExt)
+command.build.*.d=$(make.command)
+command.go.*.d=$(FileName)
+
+
+module dataflex
+
+filter.dataflex=Dataflex (src vw dg sl pkg bp inc dd h rv wo prn)|*.src;*.vw;*.dg;*.sl;*.pkg;*.bp;*.inc;*.dd;*.h;*.rv;*.wo;*.prn|
+
+*filter.dataflex=$(filter.dataflex)
+
+file.patterns.dataflex=*.src;*.vw;*.dg;*.sl;*.pkg;*.bp;*.inc;*.dd;*.h;*.rv;*.wo;*.prn
+file.patterns.dataflex.all=$(file.patterns.dataflex)
+lexer.$(file.patterns.dataflex.all)=dataflex
+*language.dataflex=Dataflex|src||
+
+keywords.$(file.patterns.dataflex)=\
+abort abort_transaction activate_view add address append append_output ascii at attach bigint boolean break broadcast \
+broadcast_focus byref calc call_driver callstackdump case channel char character clear close close_input close_output constrain constrained_clear \
+constrained_find constraint_set constraint_validate convert copy_db copy_records copyfile create_field create_index currency date datetime \
+decimal declare_datafile decrement deferred_view define delegate delete delete_db delete_field delete_index direct_input direct_output diskfree \
+do dword else entry_item erasefile error external_function field field_map file_exist file_field fill_field find float for forward from function_return \
+get get_argument_size get_attribute get_channel_position get_channel_size get_current_directory get_current_input_channel \
+get_current_output_channel get_current_user_count get_date_attribute get_directory get_environment get_field_value get_fieldnumber \
+get_file_mod_time get_file_path get_filenumber get_licensed_max_users get_stricteval get_transaction_retry get_windows_directory getaddress \
+getbuff getbuff_string getdskinfo global_variable handle if ifnot import_class_protocol include_resource increment indicate indicator integer is item \
+left length load_def load_driver local lock login logout ltrim make_directory make_file make_temp_file mid move moveint movenum movestr \
+newrecord number of on_item on_key open overstrike output output_aux_file output_wrap pad playwave pointer pos procedure_return property \
+public put read read_block read_hex readln real reg_key_enum reg_integer_value_enum reg_string_value_enum register_function register_object \
+register_procedure relate remove_directory renamefile repeat report_breaks replace replaces reread returns right rowid rtrim runprogram save \
+saverecord self send set set_argument_size set_attribute set_channel_position set_date_attribute set_directory set_field_value set_file_mod_time set_relate \
+set_stricteval set_transaction_retry shift_state short show showln sleep sort start_ui string structure_abort structure_copy structure_end structure_start subtract \
+sysdate sysdate4 time timespan to trim ubigint uchar uinteger unload_driver unlock use ushort valid_drive valuetreedeserializeparameter \
+valuetreeserializeparameter variant vconstrain version_information vfind virtual_key webget webpublishfunction webpublishprocedure webset \
+websetresponsive write write_hex writeln xmlhandle zerofile zerostring zerotype #check #error #include #pop #push #replace #set \
+
+keywords2.$(file.patterns.dataflex)=\
+begin class function procedure object repeat for while begin_constraints procedure_section begin_row \
+item_list enumeration_list enum_list #ifdef #ifdef #else cd_popup_object #command begin_transaction repeat #if for_all dfcreate_menu \
+dfcreate_menu #if type #ifsame struct
+
+keywords3.$(file.patterns.dataflex)=\
+end end_class end_function end_procedure end_object until loop loop end_constraints end_procedure end_row \
+end_item_list end_enumeration_list end_enum_list #else #endif #endif cd_end_object #endcommand end_transaction until #endif end_for_all \
+end_pull_down end_menu #else end_type #endif end_struct
+
+keywords4.$(file.patterns.dataflex)=\
++ - = * / < > <= >= <> Or And In Contains Eq Ne Lt Gt Ge Le Not Iand Ior found seqeof ~ ^ True False err lasterr
+
+fold.dataflex.compilerlist=0
+
+style.dataflex.32=$(font.base)
+style.dataflex.0=fore:#808080
+style.dataflex.1=
+style.dataflex.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.dataflex.3=$(colour.code.comment.box),$(font.code.comment.box)
+style.dataflex.4=$(colour.code.comment.line),$(font.code.comment.line)
+style.dataflex.5=$(colour.preproc)
+style.dataflex.6=$(colour.preproc)
+style.dataflex.7=$(colour.number)
+style.dataflex.8=$(colour.number)
+style.dataflex.9=fore:#000080
+style.dataflex.10=$(colour.string)
+style.dataflex.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.dataflex.12=fore:#000080,bold
+style.dataflex.13=$(colour.operator),bold
+style.dataflex.14=fore:#804080
+
+module ecl
+file.patterns.ecl=*.ecl;*.eclattr;*.hql
+filter.ecl=ECL (ecl eclattr hql)|$(file.patterns.ecl)|
+*filter.ecl=$(filter.ecl)
+lexer.$(file.patterns.ecl)=ecl
+
+word.chars.ecl=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ecl)=$(word.chars.ecl)
+calltip.ecl.word.characters=$(chars.alpha)$(chars.numeric)_
+
+comment.block.ecl=//
+comment.stream.start.ecl=/+
+comment.stream.end.ecl=+/
+comment.box.start.ecl=/*
+comment.box.middle.ecl= *
+comment.box.end.ecl= */
+
+statement.indent.$(file.patterns.ecl)=record module
+statement.end.$(file.patterns.ecl)=13 ;
+statement.lookback.$(file.patterns.ecl)=20
+block.start.$(file.patterns.ecl)=13 {
+block.end.$(file.patterns.ecl)=13 }
+
+style.ecl.0=fore:#00000000
+style.ecl.1=fore:#00800000
+style.ecl.2=fore:#00800000
+style.ecl.3=fore:#00000000
+style.ecl.4=fore:#80808000
+style.ecl.5=fore:#0000FF00
+style.ecl.6=fore:#00000000
+style.ecl.7=fore:#80808000
+style.ecl.8=fore:#00000000
+style.ecl.9=fore:#00408000
+style.ecl.10=fore:#00000000
+style.ecl.11=fore:#00000000
+style.ecl.12=fore:#00000000
+style.ecl.13=fore:#00000000
+style.ecl.14=fore:#00000000
+style.ecl.15=fore:#00000000
+style.ecl.16=bold,fore:#00008000
+style.ecl.17=bold,fore:#7F7F7F00
+style.ecl.18=fore:#FF000000
+style.ecl.19=fore:#80000000
+style.ecl.20=fore:#80000000
+style.ecl.21=fore:#80008000
+style.ecl.22=fore:#80008000
+style.ecl.23=fore:#7F7F7F00
+style.ecl.24=fore:#00000000
+style.ecl.25=fore:#00000000
+style.ecl.26=fore:#00000000
+style.ecl.27=fore:#00000000
+style.ecl.32=fore:#00000000,$(font.monospace)
+style.ecl.34=bold,fore:#00000000
+style.ecl.35=fore:#FF000000
+style.ecl.36=fore:#80800000
+style.ecl.37=fore:#80000000
+
+keywords.$(file.patterns.ecl)=abs acos ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize cos cosh count cron dataset dedup denormalize distribute distributed distribution ebcdic enth error evaluate event exists exp fetch fromunicode getisvalid global group hash hash32 hash64 hashcrc hashmd5 if index intformat isvalid iterate join keyunicode length limit ln log map matched matchlength matchposition matchtext matchunicode max merge min normalize parse pipe power preload project pull random rank ranked realformat recordof regexfind regexreplace rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt sum table tan tanh topn tounicode transfer trim truncate typeof ungroup unicodeorder which workunit xmldecode xmlencode xmltext xmlunicode
+keywords2.$(file.patterns.ecl)=apply build buildindex evaluate fail keydiff keypatch loadxml notify output parallel sequential soapcall
+keywords3.$(file.patterns.ecl)=__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat full function group header heading hole ifblock import in joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase( noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath
+keywords4.$(file.patterns.ecl)=ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode
+keywords5.$(file.patterns.ecl)=checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when
+keywords6.$(file.patterns.ecl)=#append #break #declare #demangle #end #for #getdatatype #if #inmodule #loop #mangle #onwarning #option #set #stored #uniquename #workunit integer symbol value text symbol value
+
+
+module eiffel
+
+filter.eiffel=Eiffel (e)|*.e|
+
+*filter.eiffel=$(filter.eiffel)
+
+file.patterns.eiffel=*.e
+
+*source.patterns.eiffel=$(file.patterns.eiffel);
+
+lexer.$(file.patterns.eiffel)=eiffel
+
+*language.eiffel=&Eiffel|e||
+
+keywordclass.eiffel=\
+alias all and any as bit boolean \
+check class character clone create creation current \
+debug deferred div do double \
+else elseif end ensure equal expanded export external \
+false feature forget from frozen general \
+if implies indexing infix inherit inspect integer invariant is \
+language like local loop mod name nochange none not \
+obsolete old once or platform pointer prefix precursor \
+real redefine rename require rescue result retry \
+select separate string strip then true undefine unique until \
+variant void when xor
+
+keywords.$(file.patterns.eiffel)=$(keywordclass.eiffel)
+
+style.eiffel.0=fore:#808080
+style.eiffelkw.0=$(style.eiffel.0)
+style.eiffel.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.eiffelkw.1=$(style.eiffel.1)
+style.eiffel.2=$(colour.number)
+style.eiffelkw.2=$(style.eiffel.2)
+style.eiffel.3=$(colour.keyword),bold
+style.eiffelkw.3=$(style.eiffel.3)
+style.eiffel.4=$(colour.string),$(font.monospace)
+style.eiffelkw.4=$(style.eiffel.4)
+style.eiffel.5=$(colour.char),$(font.monospace)
+style.eiffelkw.5=$(style.eiffel.5)
+style.eiffel.6=$(colour.operator),bold
+style.eiffelkw.6=$(style.eiffel.6)
+style.eiffel.7=
+style.eiffelkw.7=$(style.eiffel.7)
+style.eiffel.8=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.eiffelkw.8=$(style.eiffel.8)
+braces.eiffel.style=6
+braces.eiffelkw.style=$(braces.eiffel.style)
+
+statement.indent.$(file.patterns.eiffel)=3 do else elsif rescue if is loop
+statement.end.$(file.patterns.eiffel)=10 ;
+statement.lookback.$(file.patterns.eiffel)=20
+block.start.$(file.patterns.eiffel)=10 check debug deferred do from if inspect once
+block.end.$(file.patterns.eiffel)=10 end
+
+command.compile.*.e=compile $(FileName)
+
+module erlang
+
+file.patterns.erlang=*.erl;*.hrl
+
+filter.erlang=Erlang (erl hrl)|$(file.patterns.erlang)|
+
+*filter.erlang=$(filter.erlang)
+
+lexer.$(file.patterns.erlang)=erlang
+
+
+keywords.$(file.patterns.erlang)=after and andalso band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse query receive rem try when xor
+keywords2.$(file.patterns.erlang)=erlang: abs adler32 adler32_combine erlang:append_element apply atom_to_binary atom_to_list binary_to_atom binary_to_existing_atom binary_to_list bitstring_to_list binary_to_term bit_size erlang:bump_reductions byte_size erlang:cancel_timer check_process_code concat_binary crc32 crc32_combine date decode_packet delete_module erlang:demonitor disconnect_node erlang:display element erase erlang:error exit float float_to_list erlang:fun_info erlang:fun_to_list erlang:function_exported garbage_collect get erlang:get_cookie get_keys erlang:get_stacktrace group_leader halt erlang:hash hd erlang:hibernate integer_to_list erlang:integer_to_list iolist_to_binary iolist_size is_alive is_atom is_binary is_bitstring is_boolean erlang:is_builtin is_float is_function is_integer is_list is_number is_pid is_port is_process_alive is_record is_reference is_tuple length link list_to_atom list_to_binary list_to_bitstring list_to_existing_atom list_to_float list_to_integer erlang:list_to_integer list_to_pid list_to_tuple load_module erlang:load_nif erlang:loaded erlang:localtime erlang:localtime_to_universaltime make_ref erlang:make_tuple erlang:max erlang:md5 erlang:md5_final erlang:md5_init erlang:md5_update erlang:memory erlang:min module_loaded erlang:monitor monitor_node node nodes now open_port erlang:phash erlang:phash2 pid_to_list port_close port_command erlang:port_command port_connect port_control erlang:port_call erlang:port_info erlang:port_to_list erlang:ports pre_loaded erlang:process_display process_flag process_info processes purge_module put erlang:raise erlang:read_timer erlang:ref_to_list register registered erlang:resume_process round self erlang:send erlang:send_after erlang:send_nosuspend erlang:set_cookie setelement size spawn spawn_link spawn_monitor spawn_opt split_binary erlang:start_timer statistics erlang:suspend_process erlang:system_flag erlang:system_info erlang:system_monitor erlang:system_profile term_to_binary throw time tl erlang:trace erlang:trace_delivered erlang:trace_info erlang:trace_pattern trunc tuple_size tuple_to_list erlang:universaltime erlang:universaltime_to_localtime unlink unregister whereis erlang:yield
+keywords3.$(file.patterns.erlang)=-define -else -endif -ifdef -ifndef -include -include_lib -undef
+keywords4.$(file.patterns.erlang)=-behavior -behaviour -compile -created -created_by -export -file -import -module -modified -modified_by -record -revision -spec -type -vsn
+keywords5.$(file.patterns.erlang)=@author @clear @copyright @deprecated @doc @docfile @end @equiv @headerfile @hidden @private @reference @see @since @spec @throws @title @todo @TODO @type @version
+keywords6.$(file.patterns.erlang)=@date @docRoot @link @module @package @section @time @type @version
+
+comment.block.erlang=%~
+
+
+style.erlang.0=fore:#000000
+
+style.erlang.1=fore:#d00000
+style.erlang.14=fore:#3f5fbf
+style.erlang.15=fore:#3f5fbf
+style.erlang.16=fore:#3f5fbf,bold
+style.erlang.17=fore:#3f5fbf,bold,italics
+
+style.erlang.2=fore:#7f0000
+style.erlang.3=fore:#007f00
+style.erlang.5=fore:#ff901e
+style.erlang.9=fore:#007f00
+style.erlang.10=fore:#7f007f
+style.erlang.19=fore:#7f007f
+style.erlang.11=fore:#7f7f00,bold
+style.erlang.20=fore:#7f7f00,bold
+style.erlang.7=fore:#7f7f00
+style.erlang.18=fore:#7f7f00
+style.erlang.13=fore:#007f7f
+style.erlang.21=fore:#007f7f
+
+style.erlang.4=fore:#00007f,bold
+style.erlang.22=fore:#0000ff,bold
+style.erlang.8=fore:#00007f
+style.erlang.23=fore:#00cccc
+style.erlang.24=fore:#007f7f
+style.erlang.12=fore:#007f7f
+style.erlang.6=fore:#000000
+style.erlang.31=back:#FF0000
+
+module escript
+ECOMPILEHOME=C:\Daten\Code\CVS Workspace\etheria-pol095\scripts
+
+filter.escript=E-Script (src em)|$(file.patterns.escript)|
+*filter.escript=$(filter.escript)
+
+file.patterns.escript=*.src;*.em
+
+lexer.$(file.patterns.escript)=escript
+escript.case.sensitive=0
+
+
+command.compile.*.src="$(ECOMPILEHOME)\ecompile.exe" $(FileNameExt)
+
+style.escript.0=$(font.base)
+style.escript.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.escript.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.escript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.escript.4=$(colour.number)
+style.escript.5=fore:#FF4000
+style.escript.6=fore:#FF8000,$(font.string.literal)
+style.escript.7=fore:#FF0000
+style.escript.8=
+style.escript.9=fore:#0000FF
+style.escript.10=fore:#B00040
+style.escript.11=fore:#B00040
+
+
+
+keywords.$(file.patterns.escript)=\
+basic basicio boats \
+cfgfile \
+file \
+http \
+npc \
+os \
+uo util \
+accessible \
+addmenuitem \
+appendconfigfileelem \
+applyconstraint \
+applydamage \
+applyrawdamage \
+assignrecttoweatherregion \
+append \
+baseskilltorawskill \
+boatfromitem \
+broadcast \
+ban \
+cdbl \
+cint \
+cstr \
+checklineofsight \
+checklosat \
+checkskill \
+consumemana \
+consumereagents \
+consumesubstance \
+createaccount \
+createitematlocation \
+createiteminbackpack \
+createitemininventory \
+createitemincontainer \
+createmenu \
+createmultiatlocation \
+createnpcfromtemplate \
+createrootiteminstoragearea \
+createstoragearea \
+clear_script_profile_counters \
+close \
+damage \
+destroyitem \
+destroymulti \
+destroyrootiteminstoragearea \
+detach \
+disableevents \
+disconnectclient \
+distance \
+disable \
+enableevents \
+enumerateitemsincontainer \
+enumerateonlinecharacters \
+equipfromtemplate \
+equipitem \
+eraseglobalproperty \
+eraseobjproperty \
+enable \
+enabled \
+erase \
+events_waiting \
+exists \
+findconfigelem \
+findobjtypeincontainer \
+findrootiteminstoragearea \
+findstoragearea \
+fclose \
+find \
+fopen \
+fread \
+fseek \
+ftell \
+fwrite \
+gamestat \
+getamount \
+getcommandhelp \
+getconfigint \
+getconfigintkeys \
+getconfigmaxintkey \
+getconfigreal \
+getconfigstring \
+getconfigstringkeys \
+getconfigstringarray \
+getelemproperty \
+getequipmentbylayer \
+getglobalproperty \
+getharvestdifficulty \
+getmapinfo \
+getmenuobjtypes \
+getobjproperty \
+getobjtype \
+getobjtypebyname \
+getproperty \
+getrawskill \
+getregionstring \
+getskill \
+getspelldifficulty \
+getstandingheight \
+getworldheight \
+grantprivilege \
+harvestresource \
+healdamage \
+hex \
+islegalmove \
+insert \
+keys \
+listequippeditems \
+listghostsnearlocation \
+listhostiles \
+listitemsatlocation \
+listitemsnearlocation \
+listitemsnearlocationoftype \
+listmobilesinlineofsight \
+listmobilesnearlocation \
+listmobilesnearlocationex \
+listobjectsinbox \
+loadtusscpfile \
+left \
+len \
+log_profile \
+lower \
+makeboundingbox \
+move \
+moveboat \
+moveboatrelative \
+movecharactertolocation \
+moveitemtocontainer \
+moveitemtolocation \
+move_offline_mobiles \
+openpaperdoll \
+open \
+pack \
+performaction \
+playlightningbolteffect \
+playmovingeffect \
+playmovingeffectxyz \
+playobjectcenteredeffect \
+playsoundeffect \
+playsoundeffectprivate \
+playstationaryeffect \
+printtextabove \
+printtextaboveprivate \
+packages \
+polcore \
+position \
+print \
+queryparam \
+randomdiceroll \
+randomint \
+rawskilltobaseskill \
+readconfigfile \
+readgameclock \
+releaseitem \
+registerforspeechevents \
+registeritemwithboat \
+requestinput \
+reserveitem \
+restartscript \
+resurrect \
+revokeprivilege \
+runawayfrom \
+runawayfromlocation \
+runtoward \
+runtowardlocation \
+reverse \
+run_script_to_completion \
+saveworldstate \
+selectmenuitem2 \
+self \
+sendbuywindow \
+senddialoggump \
+sendevent \
+sendopenspecialcontainer \
+sendpacket \
+sendsellwindow \
+sendskillwindow \
+sendstringastipwindow \
+sendsysmessage \
+sendtextentrygump \
+setanchor \
+setglobalproperty \
+setname \
+setobjproperty \
+setopponent \
+setproperty \
+setrawskill \
+setregionlightlevel \
+setregionweatherlevel \
+setscriptcontroller \
+setwarmode \
+shutdown \
+speakpowerwords \
+splitwords \
+startspelleffect \
+subtractamount \
+systemfindboatbyserial \
+systemfindobjectbyserial \
+say \
+set_critical \
+set_debug \
+set_priority \
+set_priority_divide \
+set_script_option \
+setcmdlevel \
+setdex \
+setint \
+setlightlevel \
+setmaster \
+setname \
+setpassword \
+setstr \
+shrink \
+size \
+sleep \
+sleepms \
+sort \
+spendgold \
+squelch \
+start_script \
+syslog \
+system_rpm \
+target \
+targetcoordinates \
+targetmultiplacement \
+turnawayfrom \
+turnawayfromlocation \
+turnboat \
+turntoward \
+turntowardlocation \
+toggle \
+unloadconfigfile \
+unpack \
+unban \
+unload_scripts \
+upper \
+walkawayfrom \
+walkawayfromlocation \
+walktoward \
+walktowardlocation \
+wander \
+writehtml \
+writehtmlraw \
+wait_for_event \
+movechar_forcelocation \
+moveitem_forcelocation \
+moveitem_normal \
+scriptopt_debug \
+scriptopt_no_interrupt \
+scriptopt_no_runaway \
+te_cancel_disable \
+te_cancel_enable \
+te_style_disable \
+te_style_normal \
+te_style_numerical \
+tgtopt_check_los \
+tgtopt_harmful \
+tgtopt_helpful \
+tgtopt_neutral \
+tgtopt_nocheck_los \
+setprop \
+getprop
+
+
+keywords2.$(file.patterns.escript)=\
+array \
+const \
+dictionary \
+global \
+local \
+var \
+and \
+default \
+in \
+next not \
+or \
+return \
+to \
+include \
+use \
+enum
+
+
+keywords3.$(file.patterns.escript)=\
+while \
+for \
+endfor \
+function \
+program \
+endprogram endfunction \
+foreach \
+case \
+else elseif \
+if endcase endenum endforeach endif endwhile
+
+
+
+module flagship
+
+file.patterns.flagship=*.prg
+
+lexer.$(file.patterns.flagship)=flagship
+
+*language.flagship=FlagShip|prg||
+
+keywordclass.fs6commands=\
+? @ accept access all alternate announce ansi any append as assign autolock average \
+begin bell bitmap blank box \
+call cancel case century charset checkbox clear close cls color combobox commit \
+confirm console constant continue copy count create cursor \
+date dbread dbwrite decimals declare default delete deleted delimiters device dir \
+directory display do draw \
+edit else elseif eject end endcase enddo endif endtext epoch erase error escape eval eventmask \
+exact exclusive extended external extra \
+field file filter find fixed font for form format from \
+get gets global global_extern go goto gotop guialign guicolor guicursor guitransl \
+html htmltext \
+if image index input intensity \
+join \
+key keyboard keytransl \
+label lines list listbox local locate \
+margin memory memvar menu message method multibyte multilocks \
+next nfs nfslock nfs_force note \
+on openerror order outmode \
+pack parameters path pixel pop printer private prompt public push pushbutton \
+quit \
+radiobutton radiogroup read recall refresh reindex relation release rename replace report request restore \
+richtext rowadapt rowalign run \
+save say scoreboard scrcompress screen seek select sequence set setenhanced setstandard setunselected \
+skip softseek sort source static store struct structure sum \
+tag tbrowse text to total type typeahead \
+unique unlock update use \
+wait while with wrap \
+xml zap zerobyteout
+
+keywordclass.fs6libfunc=\
+_displarr _displarrerr _displarrstd _displobj _displobjerr _displobjstd \
+aadd abs achoice aclone acopy adel adir aelemtype aeval afields afill ains alert alias alltrim altd ansi2oem \
+appiomode appmdimode appobject array asc ascan asize asort at atail atanychar autoxlock \
+between bin2i bin2l bin2w binand binlshift binor binrshift binxor bof break browse \
+cdow chr chr2screen cmonth col col2pixel color2rgb colorselect colvisible consoleopen consolesize crc32 ctod curdir \
+date datevalid day dbappend dbclearfilter dbclearindex dbclearrelation dbcloseall dbclosearea dbcommit dbcommitall \
+dbcreate dbcreateindex dbdelete dbedit dbeval dbf dbfilter dbfinfo dbflock dbfused dbgetlocate dbgobottom dbgoto \
+dbgotop dbobject dbrecall dbreindex dbrelation dbrlock dbrlocklist dbrselect dbrunlock dbseek dbselectarea \
+dbsetdriver dbsetfilter dbsetindex dbsetlocate dbsetorder dbsetrelation dbskip dbstruct dbunlock dbunlockall \
+dbusearea default deleted descend devout devoutpict devpos directory diskspace dispbegin dispbox dispcount \
+dispend dispout doserror doserror2str dow drawline dtoc dtos \
+empty eof errorblock errorlevel eval execname execpidnum exp \
+fattrib fclose fcount fcreate ferase ferror ferror2str fieldblock fielddeci fieldget fieldgetarr fieldlen fieldname \
+fieldpos fieldput fieldputarr fieldtype fieldwblock file findexefile fklabel fkmax flagship_dir flock flockf fopen \
+found fread freadstdin freadstr freadtxt frename fs_set fseek fwrite \
+getactive getalign getapplykey getdosetkey getenv getenvarr getfunction getpostvalid getprevalid getreader guidrawline \
+hardcr header hex2num \
+i2bin iif indexcheck indexcount indexdbf indexext indexkey indexnames indexord infobox inkey inkey2read inkey2str inkeytrap \
+instdchar instdstring int int2num isalpha isbegseq iscolor isdbexcl isdbflock isdbmultip isdbmultiple isdbmultipleopen \
+isdbrlock isdigit isfunction isguimode islower isobjclass isobjequiv isobjproperty isprinter isupper \
+l2bin lastkey lastrec left len listbox lock log lower ltrim lupdate \
+macroeval macrosubst max max_col max_row maxcol maxrow mcol mdblck mdiclose mdiopen mdiselect memocode memodecode \
+memoedit memoencode memoline memoread memory memotran memowrit memvarblock mhide min minmax mlcount mlctopos mleftdown \
+mlpos mod month mpostolc mpresent mreststate mrightdown mrow msavestate msetcursor msetpos mshow mstate \
+neterr netname nextkey num2hex num2int \
+objclone oem2ansi onkey ordbagext ordbagname ordcond ordcondset ordcreate orddescend orddestroy ordfor ordisinique \
+ordkey ordkeyadd ordkeycount ordkeydel ordkeygoto ordkeyno ordkeyval ordlistadd ordlistclear ordlistrebui ordname \
+ordnumber ordscope ordsetfocu ordsetrelat ordskipunique os outerr outstd \
+padc padl padr param parameters pcalls pcol pcount pixel2col pixel2row printstatus procfile procline procname procstack proper prow \
+qout qout2 qqout qqout2 \
+rat rddlist rddname rddsetdefault readexit readinsert readkey readkill readmodal readsave readupdated readvar reccount recno recsize \
+replicate restscreen right rlock rlockverify round row row2pixel rowadapt rowvisible rtrim \
+savescreen scrdos2unix screen2chr scroll scrunix2dos seconds secondscpu select serial set setansi setblink setcancel setcol2get \
+setcolor setcolorba setcursor setevent setguicursor setkey setmode setpos setprc setvarempty sleep sleepms soundex space \
+sqrt statbarmsg statusmessage stod str strlen strlen2col strlen2pix strlen2space strpeek strpoke strtran strzero stuff substr \
+tbcolumnnew tbmouse tbrowsearr tbrowsedb tbrowsenew tempfilename time tone transform trim truepath type \
+updated upper used usersactive usersdbf usersmax \
+val valtype version \
+webdate weberrorhandler webgetenvir webgetformdata webhtmlbegin webhtmlend weblogerr webmaildomain weboutdata websendmail word \
+year
+
+keywordclass.fs6funcproc=\
+function procedure return exit
+
+keywordclass.fs6class=\
+class instance export hidden protect prototype
+
+keywordclass.fs6doxygen=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param param[in] param[out] \
+post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw throws todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+
+keywords.$(file.patterns.flagship)=$(keywordclass.fs6commands)
+keywords2.$(file.patterns.flagship)=$(keywordclass.fs6libfunc)
+keywords3.$(file.patterns.flagship)=$(keywordclass.fs6funcproc)
+keywords4.$(file.patterns.flagship)=$(keywordclass.fs6class)
+keywords5.$(file.patterns.flagship)=$(keywordclass.fs6doxygen)
+
+comment.block.flagship=//~
+comment.stream.start.flagship=/*
+comment.stream.end.flagship=*/
+comment.box.start.flagship=/*
+comment.box.middle.flagship= *
+comment.box.end.flagship= */
+
+
+
+style.flagship.32=$(font.base)
+style.flagship.0=
+style.flagship.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.flagship.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.flagship.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.flagship.4=$(colour.code.comment.line),$(font.code.comment.line)
+style.flagship.5=fore:#3060A0,$(font.code.comment.doc)
+style.flagship.6=fore:#804020,$(font.code.comment.doc)
+
+style.flagship.7=$(colour.keyword)
+style.flagship.8=$(colour.keyword)
+style.flagship.9=$(colour.keyword),bold
+style.flagship.10=$(colour.keyword),bold
+
+style.flagship.11=$(colour.number)
+style.flagship.12=$(colour.string)
+style.flagship.13=$(colour.preproc)
+style.flagship.14=$(colour.operator)
+style.flagship.15=
+style.flagship.16=$(colour.number)
+style.flagship.17=$(style.stringeol)
+style.flagship.18=$(colour.number)
+style.flagship.19=$(colour.operator)
+style.flagship.20=
+style.flagship.21=
+style.flagship.22=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.flagship.23=$(colour.code.comment.line),$(font.code.comment.line)
+style.flagship.24=$(colour.keyword)
+style.flagship.25=$(colour.keyword)
+style.flagship.26=$(colour.number)
+style.flagship.27=$(colour.string)
+style.flagship.28=$(colour.preproc)
+style.flagship.29=$(colour.operator)
+style.flagship.30=
+style.flagship.31=$(style.stringeol)
+
+fsOptObj=-c -q -w1 -w2 -w3
+fsOptExe=-q -w1 -w2 -w3
+
+fsObj=FlagShip $(fsOptObj) $(FileNameExt) -o $(FileName).o
+
+fsExe=FlagShip $(fsOptExe) $(FileNameExt) -o $(FileName)
+
+command.compile.*.prg=$(fsObj)
+command.build.*.prg=$(fsExe)
+command.go.*.prg=$(FileName)
+
+
+command.help.$(file.patterns.flagship)=fsman
+
+module forth
+
+file.patterns.forth=*.forth
+
+
+lexer.$(file.patterns.forth)=forth
+
+*language.forth=Forth|forth||
+
+filter.forth=Forth files (f spf)|$(file.patterns.forth)|
+
+*filter.forth=$(filter.forth)
+
+word.characters.$(file.patterns.forth)=$(chars.alpha)$(chars.numeric)%-
+
+comment.block.forth=\
+comment.stream.start.forth=(
+comment.stream.end.forth=)
+comment.box.start.forth=\
+comment.box.middle.forth=\
+comment.box.end.forth=\
+
+
+keywords.$(file.patterns.forth)=\
+AGAIN BEGIN CASE DO ELSE ENDCASE ENDOF IF LOOP OF REPEAT THEN UNTIL  WHILE \
+[IF] [ELSE] [THEN] ?DO
+
+keywords2.$(file.patterns.forth)=\
+DUP DROP ROT SWAP OVER @ ! 2@ 2! 2DUP 2DROP 2SWAP 2OVER NIP R@ >R R> 2R@ 2>R 2R> \
+0= 0< SP@ SP! W@ W! C@ C! < > = <> 0<>\
+SPACE SPACES KEY? KEY THROW CATCH ABORT */ 2* /MOD CELL+ CELLS CHAR+ \
+CHARS MOVE ERASE DABS TITLE HEX DECIMAL HOLD <# # #S #> SIGN \
+D. . U. DUMP (.") >NUMBER ' IMMEDIATE EXIT RECURSE UNLOOP LEAVE HERE ALLOT , \
+C, W, COMPILE, BRANCH, RET, LIT, DLIT, ?BRANCH, ", >MARK >RESOLVE1 <MARK >RESOLVE \
+ALIGN ALIGNED USER-ALLOT USER-HERE HEADER DOES> SMUDGE HIDE :NONAME LAST-WORD \
+?ERROR ERROR2 FIND1 SFIND SET-CURRENT GET-CURRENT DEFINITIONS GET-ORDER FORTH \
+ONLY SET-ORDER ALSO PREVIOUS VOC-NAME. ORDER LATEST LITERAL 2LITERAL SLITERAL \
+CLITERAL ?LITERAL1 ?SLITERAL1 HEX-LITERAL HEX-SLITERAL ?LITERAL2 ?SLITERAL2 SOURCE \
+EndOfChunk CharAddr PeekChar IsDelimiter GetChar OnDelimiter SkipDelimiters OnNotDelimiter \
+SkipWord SkipUpTo ParseWord NextWord PARSE SKIP CONSOLE-HANDLES REFILL DEPTH ?STACK \
+?COMP WORD INTERPRET BYE QUIT MAIN1 EVALUATE INCLUDE-FILE INCLUDED >BODY +WORD \
+WORDLIST CLASS! CLASS@ PAR! PAR@ ID. ?IMMEDIATE ?VOC IMMEDIATE VOC WordByAddrWl \
+WordByAddr NLIST WORDS SAVE OPTIONS /notransl ANSI>OEM ACCEPT EMIT CR TYPE EKEY? \
+EKEY EKEY>CHAR EXTERNTASK ERASE-IMPORTS ModuleName ModuleDirName ENVIRONMENT? \
+DROP-EXC-HANDLER SET-EXC-HANDLER HALT ERR CLOSE-FILE CREATE-FILE CREATE-FILE-SHARED \
+OPEN-FILE-SHARED DELETE-FILE FILE-POSITION FILE-SIZE OPEN-FILE READ-FILE REPOSITION-FILE \
+DOS-LINES UNIX-LINES READ-LINE WRITE-FILE RESIZE-FILE WRITE-LINE ALLOCATE FREE RESIZE \
+START SUSPEND RESUME STOP PAUSE MIN MAX TRUE FALSE ASCIIZ> \
+R/O W/O ;CLASS ENDWITH OR AND /STRING SEARCH COMPARE EXPORT ;MODULE SPACE
+
+keywords3.$(file.patterns.forth)=\
+VARIABLE CREATE : VALUE CONSTANT VM: M: var dvar chars OBJ \
+CONSTR: DESTR: CLASS: OBJECT: POINTER \
+USER USER-CREATE USER-VALUE VECT \
+WNDPROC: VOCABULARY -- TASK: CEZ: MODULE:
+
+keywords4.$(file.patterns.forth)=\
+CHAR [CHAR] POSTPONE WITH ['] TO [COMPILE] CHAR ASCII \'
+
+keywords5.$(file.patterns.forth)=\
+REQUIRE WINAPI:
+
+keywords6.$(file.patterns.forth)=\
+S" ABORT" Z" " ." C"
+
+style.forth.0=$(font.monospace)
+style.forth.1=fore:#009933,$(font.comment),$(font.monospace)
+style.forth.2=fore:#007F00,$(font.comment)
+style.forth.3=fore:#000000,bold
+style.forth.4=fore:#00007F,bold
+style.forth.5=fore:#000000,$(font.monospace),bold
+style.forth.6=fore:#FF0000,bold,$(font.monospace)
+style.forth.7=fore:#CC3300,bold,$(font.monospace)
+style.forth.8=fore:#996633,bold,$(font.monospace)
+style.forth.9=fore:#007F7F,$(font.monospace)
+style.forth.10=fore:#CC3300,$(font.monospace)
+style.forth.11=fore:#0000CC,$(font.monospace)
+
+
+module fortran
+
+filter.fortran=Fortran (f for f90 f95 f2k)|*.f;*.for;*.f90;*.f95;*.f2k|
+
+*filter.fortran=$(filter.fortran)
+
+file.patterns.f95=*.f90;*.f95;*.f2k
+file.patterns.f77=*.f;*.for
+file.patterns.fortran=$(file.patterns.f95);$(file.patterns.f77)
+
+lexer.$(file.patterns.f95)=fortran
+lexer.$(file.patterns.f77)=f77
+
+*language.fortran=&Fortran|f90||
+
+keywordclass.fortran=access action advance allocatable allocate \
+apostrophe assign assignment associate asynchronous backspace \
+bind blank blockdata call case character class close common \
+complex contains continue critical cycle data deallocate decimal delim \
+default dimension direct do dowhile double doubleprecision else \
+elseif elsewhere encoding end endassociate endblockdata enddo \
+endfile endforall endfunction endif endinterface endmodule endprogram \
+endselect endsubroutine endtype endwhere entry eor equivalence \
+err errmsg exist exit external file flush fmt forall form format \
+formatted function go goto id if implicit in include inout \
+integer inquire intent interface intrinsic iomsg iolength \
+iostat is kind len logical module name named namelist nextrec nml \
+none nullify number only open opened operator optional out pad \
+parameter pass pause pending pointer pos position precision \
+print private procedure program protected public quote read readwrite \
+real rec recl recursive result return rewind save select \
+selectcase selecttype sequential sign size stat status stop stream \
+subroutine target then to type unformatted unit use value \
+volatile wait where while write
+
+keywords.$(file.patterns.f95)=$(keywordclass.fortran)
+keywords.$(file.patterns.f77)=$(keywordclass.fortran)
+
+keywords2.$(file.patterns.fortran)=abs achar acos acosd adjustl adjustr \
+aimag aimax0 aimin0 aint ajmax0 ajmin0 akmax0 akmin0 all allocated alog \
+alog10 amax0 amax1 amin0 amin1 amod anint any asin asind associated \
+atan atan2 atan2d atand bitest bitl bitlr bitrl bjtest bit_size bktest break \
+btest cabs ccos cdabs cdcos cdexp cdlog cdsin cdsqrt ceiling cexp char \
+clog cmplx conjg cos cosd cosh count cpu_time cshift csin csqrt dabs \
+dacos dacosd dasin dasind datan datan2 datan2d datand date \
+date_and_time dble dcmplx dconjg dcos dcosd dcosh dcotan ddim dexp \
+dfloat dflotk dfloti dflotj digits dim dimag dint dlog dlog10 dmax1 dmin1 \
+dmod dnint dot_product dprod dreal dsign dsin dsind dsinh dsqrt dtan dtand \
+dtanh eoshift epsilon errsns exp exponent float floati floatj floatk floor fraction \
+free huge iabs iachar iand ibclr ibits ibset ichar idate idim idint idnint ieor ifix \
+iiabs iiand iibclr iibits iibset iidim iidint iidnnt iieor iifix iint iior iiqint iiqnnt iishft \
+iishftc iisign ilen imax0 imax1 imin0 imin1 imod index inint inot int int1 int2 int4 \
+int8 iqint iqnint ior ishft ishftc isign isnan izext jiand jibclr jibits jibset jidim jidint \
+jidnnt jieor jifix jint jior jiqint jiqnnt jishft jishftc jisign jmax0 jmax1 jmin0 jmin1 \
+jmod jnint jnot jzext kiabs kiand kibclr kibits kibset kidim kidint kidnnt kieor kifix \
+kind kint kior kishft kishftc kisign kmax0 kmax1 kmin0 kmin1 kmod knint knot kzext \
+lbound leadz len len_trim lenlge lge lgt lle llt log log10 logical lshift malloc matmul \
+max max0 max1 maxexponent maxloc maxval merge min min0 min1 minexponent minloc \
+minval mod modulo mvbits nearest nint not nworkers number_of_processors pack popcnt \
+poppar precision present product radix random random_number random_seed range real \
+repeat reshape rrspacing rshift scale scan secnds selected_int_kind \
+selected_real_kind set_exponent shape sign sin sind sinh size sizeof sngl snglq spacing \
+spread sqrt sum system_clock tan tand tanh tiny transfer transpose trim ubound unpack verify
+
+keywords3.$(file.patterns.fortran)=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand \
+dcmplx dconjg dcotan dcotand decode dimag dll_export dll_import doublecomplex dreal \
+dvchk encode find flen flush getarg getcharqq getcl getdat getenv gettim hfix ibchng \
+identifier imag int1 int2 int4 intc intrup invalop iostat_msg isha ishc ishl jfix \
+lacfar locking locnear map nargs nbreak ndperr ndpexc offset ovefl peekcharqq precfill \
+prompt qabs qacos qacosd qasin qasind qatan qatand qatan2 qcmplx qconjg qcos qcosd \
+qcosh qdim qexp qext qextd qfloat qimag qlog qlog10 qmax1 qmin1 qmod qreal qsign qsin \
+qsind qsinh qsqrt qtan qtand qtanh ran rand randu rewrite segment setdat settim system \
+timer undfl unlock union val virtual volatile zabs zcos zexp zlog zsin zsqrt
+
+
+comment.block.fortran=!~
+
+
+style.fortran.0=fore:#808080
+style.f77.0=fore:#808080
+style.fortran.32=
+style.f77.32=
+style.fortran.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.f77.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.fortran.2=$(colour.number)
+style.f77.2=$(colour.number)
+style.fortran.3=$(colour.string)
+style.f77.3=$(colour.string)
+style.fortran.4=$(colour.string)
+style.f77.4=$(colour.string)
+style.fortran.5=fore:#000000,back:#E0C0E0,eolfilled
+style.f77.5=fore:#000000,back:#E0C0E0,eolfilled
+style.fortran.6=$(colour.operator),bold
+style.f77.6=$(colour.operator),bold
+style.fortran.7=
+style.f77.7=
+style.fortran.8=$(colour.keyword),case:u
+style.f77.8=$(colour.keyword),case:u
+style.fortran.9=fore:#B00040
+style.f77.9=fore:#B00040
+style.fortran.10=fore:#B04080
+style.f77.10=fore:#B04080
+style.fortran.11=$(colour.preproc)
+style.f77.11=$(colour.preproc)
+style.fortran.12=$(colour.operator),bold
+style.f77.12=$(colour.operator),bold
+style.fortran.13=fore:#E0C0E0
+style.f77.13=fore:#E0C0E0
+style.fortran.14=fore:#000000,back:#F0E080
+style.f77.14=fore:#000000,back:#F0E080
+braces.fortran.style=0
+
+if PLAT_WIN
+	fc77=lf95 $(FileNameExt) -c -fix
+	fc90=lf95 $(FileNameExt) -c
+if PLAT_GTK
+	fc77=f77 -c -o $(FileName).o $(FileNameExt)
+	fc90=f90 -c -o $(FileName).o $(FileNameExt)
+
+command.compile.*.f=$(fc77)
+command.build.*.f=make
+command.go.*.f=$(FileName)
+
+command.compile.*.for=$(fc77)
+command.build.*.for=make
+command.go.*.for=$(FileName)
+
+command.compile.*.f90=$(fc90)
+command.build.*.f90=make
+command.go.*.f90=$(FileName)
+
+command.compile.*.f95=$(fc90)
+command.build.*.f95=make
+command.go.*.f95=$(FileName)
+
+if PLAT_WIN
+    api.$(file.patterns.fortran)=$(SciteDefaultHome)\fortran.api
+
+autocomplete.fortran.ignorecase=1
+autocomplete.f77.ignorecase=1
+calltip.fortran.ignorecase=1
+calltip.f77.ignorecase=1
+
+module freebasic
+
+file.patterns.freebasic=*.bas;*.bi
+
+filter.freebasic=FreeBasic (bb bi)|$(file.patterns.freebasic)|
+
+*filter.freebasic=$(filter.freebasic)
+
+lexer.$(file.patterns.freebasic)=freebasic
+
+*language.freebasic=FreeBasic|bas||
+
+
+keywordclass.freebasic=\
+append as asc asin asm atan2 atn beep bin binary bit bitreset bitset bload \
+bsave byref byte byval call callocate case cbyte cdbl cdecl chain chdir chr \
+cint circle clear clng clngint close cls color command common cons const \
+continue cos cshort csign csng csrlin cubyte cuint culngint cunsg curdir \
+cushort custom cvd cvi cvl cvlongint cvs cvshort data date deallocate declare \
+defbyte defdbl defined defint deflng deflngint defshort defsng defstr defubyte \
+defuint defulngint defushort dim dir do double draw dylibload dylibsymbol else \
+elseif end enum environ environ$ eof eqv erase err error exec exepath exit exp \
+export extern field fix flip for fre freefile function get getjoystick getkey \
+getmouse gosub goto hex hibyte hiword if iif imagecreate imagedestroy imp \
+inkey inp input instr int integer is kill lbound lcase left len let lib line \
+lobyte loc local locate lock lof log long longint loop loword lset ltrim \
+mid mkd mkdir mki mkl mklongint mks mkshort mod multikey mutexcreate \
+mutexdestroy mutexlock mutexunlock name next not oct on once open option or out \
+output overload paint palette pascal pcopy peek peeki peeks pipe pmap point \
+pointer poke pokei pokes pos preserve preset print private procptr pset ptr \
+public put random randomize read reallocate redim rem reset restore resume \
+resume next return rgb rgba right rmdir rnd rset rtrim run sadd screen \
+screencopy screeninfo screenlock screenptr screenres screenset screensync \
+screenunlock seek statement seek function selectcase setdate setenviron \
+setmouse settime sgn shared shell shl short shr sin single sizeof sleep space \
+spc sqr static stdcall step stop str string string strptr sub swap system tab \
+tan then threadcreate threadwait time time timer to trans trim type ubound \
+ubyte ucase uinteger ulongint union unlock unsigned until ushort using va_arg \
+va_first va_next val val64 valint varptr view viewprint wait wend while width \
+window windowtitle with write xor zstring
+
+keywordclass.preprocessor=\
+
+keywords.$(file.patterns.freebasic)=$(keywordclass.freebasic)
+keywords2.$(file.patterns.freebasic)=$(keywordclass.preprocessor)
+
+style.freebasic.0=fore:#000000
+style.freebasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.freebasic.2=$(colour.number)
+style.freebasic.3=$(colour.keyword),bold
+style.freebasic.4=$(colour.string)
+style.freebasic.5=$(colour.preproc)
+style.freebasic.6=$(colour.operator)
+style.freebasic.7=$(style.freebasic.0)
+style.freebasic.10=$(colour.keyword)
+style.freebasic.11=$(colour.keyword)
+style.freebasic.12=$(colour.keyword)
+style.freebasic.15=$(colour.preproc)
+style.freebasic.16=$(colour.error)
+style.freebasic.17=$(colour.number)
+style.freebasic.18=$(colour.number)
+
+
+module fsharp
+*language.fsharp=F#|fsharp||
+file.patterns.fsharp=*.fs;*.fsi;*.fsx;*.fsscript
+lexer.$(file.patterns.fsharp)=fsharp
+filter.fsharp=F# (fs fsi fsx fsscript)|$(file.patterns.fsharp)|
+*filter.fsharp=$(filter.fsharp)
+
+word.chars.fsharp=$(chars.alpha)$(chars.numeric)_'`
+word.characters.$(file.patterns.fsharp)=$(word.chars.fsharp)
+
+indent.size.$(file.patterns.fsharp)=4
+statement.indent.$(file.patterns.fsharp)=4 let type
+use.tabs.$(file.patterns.fsharp)=0
+
+comment.block.fsharp=//
+comment.stream.start.fsharp=(*
+comment.stream.end.fsharp=*)
+
+preprocessor.symbol.$(file.patterns.fsharp)=#
+preprocessor.start.$(file.patterns.fsharp)=if indent light load nowarn r
+preprocessor.middle.$(file.patterns.fsharp)=else
+preprocessor.end.$(file.patterns.fsharp)=endif
+
+fold.fsharp.preprocessor=1
+
+style.fsharp.0=$(font.base)
+style.fsharp.1=$(colour.keyword)
+style.fsharp.2=$(colour.keyword),bold
+style.fsharp.3=fore:#378bba,bold
+style.fsharp.4=fore:#b72f14,bold
+style.fsharp.5=fore:#378bba
+style.fsharp.6=fore:#686868
+style.fsharp.7=fore:#a00100
+style.fsharp.8=$(colour.code.comment.line)
+style.fsharp.9=$(colour.code.comment.line)
+style.fsharp.10=fore:#5c2c26
+style.fsharp.11=fore:#5c2c26,back:#e0f3ff
+style.fsharp.12=$(colour.operator),bold
+style.fsharp.13=$(colour.number)
+style.fsharp.14=fore:#cd6000
+style.fsharp.15=fore:#cd6000
+style.fsharp.16=fore:#800080
+style.fsharp.17=fore:#b72f14,back:#fefde0
+style.fsharp.18=fore:#378bba
+style.fsharp.19=$(colour.operator)
+
+keywords.standard.fsharp= \
+abstract and as assert base begin class default delegate do done downcast \
+downto elif else end exception extern false finally fixed for fun function \
+global if in inherit inline interface internal lazy let let! match match! \
+member module mutable namespace new null of open or override private public \
+rec return return! select static struct then to true try type upcast use use! \
+val void when while with yield yield! atomic break checked component const \
+constraint constructor continue eager event external fixed functor global \
+include method mixin object parallel process protected pure sealed tailcall \
+trait virtual volatile
+
+keywords.functions.fsharp= \
+abs acos add allPairs append asin asr atan atan2 average averageBy base1 base2 \
+blit cache cast ceil choose chunkBySize collect compareWith concat contains containsKey \
+copy cos cosh count countBy create createBased delay difference distinct distinctBy empty \
+eprintf except exists exists2 exactlyOne failwith fill filter find findBack findIndex findIndexBack \
+findKey floor fold fold2 foldBack foldBack2 forall forall2 fprintf fst get groupBy head ignore indexed \
+init initBased initInfinite intersect intersectMany invalidArg isEmpty isProperSubset \
+isProperSuperset isSubset isSuperset item iter iter2 iteri iteri2 land last length \
+length1 length2 length3 length4 lor lsl lsr lxor map map2 map3 mapFold mapFoldBack mapi mapi2 \
+max maxBy maxElement min minBy minElement mod nameof not ofArray ofList ofSeq pairwise partition \
+permute pick pown printf printfn raise readonly rebase reduce reduceBack remove replicate rev round scan \
+scanBack seq set sig sin sinh singleton skip skipWhile snd sort sortBy sortByDescending sortDescending \
+sortInPlace sortInPlaceBy sortInPlaceWith sortWith splitAt splitInto sprintf sqrt sub sum \
+sumBy tail take takeWhile tan tanh toArray toList toSeq transpose truncate \
+tryExactlyOne tryFind tryFindBack tryFindIndex tryFindIndexBack tryHead \
+tryItem tryFindKey tryLast tryPick typeof unfold union unionMany unzip unzip3 where \
+windowed zeroCreate zeroCreateBased zip zip3
+
+keywords.types.fsharp= \
+ArgumentException Array Array2D Array3D Array4D BigInteger Boolean Byte Char Collections Console Core \
+CultureInfo DateTime Decimal Double Environment Expr Float FSharp Globalization Int16 Int32 Int64 IntPtr \
+IO Linq List Map Math Microsoft NumberStyles Object Parallel Printf Random Regex ResizeArray SByte Seq Set Single \
+String System UInt16 UInt32 UInt64 UIntPtr array bigint bool byte byref char comparison decimal double enum \
+equality Error Exception exn float float32 inref int int8 int16 int32 int64 list nativeint nativeptr None obj \
+Ok option Option outref ref Result sbyte Some single string unmanaged unativeint uint uint8 uint16 uint32 uint64 \
+unit void voidptr voption
+
+keywords.optional.1.fsharp=
+keywords.optional.2.fsharp=
+
+keywords.$(file.patterns.fsharp)=$(keywords.standard.fsharp)
+keywords2.$(file.patterns.fsharp)=$(keywords.functions.fsharp)
+keywords3.$(file.patterns.fsharp)=$(keywords.types.fsharp)
+keywords4.$(file.patterns.fsharp)=$(keywords.optional.1.fsharp)
+keywords5.$(file.patterns.fsharp)=$(keywords.optional.2.fsharp)
+
+command.compile.$(file.patterns.fsharp)=fsc /nologo $(FileNameExt)
+command.go.$(file.patterns.fsharp)=dotnet fsi /nologo /exec $(FileNameExt)
+
+module gap
+
+file.patterns.gap=*.g;*.gd;*.gi
+
+filter.gap=Gap (g gi gd)|$(file.patterns.gap)|
+
+*filter.gap=$(filter.gap)
+
+*source.patterns.gap=$(file.patterns.gap);
+
+lexer.$(file.patterns.gap)=gap
+
+*language.gap=Gap|g||
+
+keywords.$(file.patterns.gap)=and break continue do elif else end fi for function \
+if in local mod not od or quit rec repeat return then until while QUIT
+
+keywords2.$(file.patterns.gap)=false true IsBound Unbind TryNextMethod \
+Info Assert SaveWorkspace fail
+
+
+comment.block.gap=#~
+
+style.gap.0=fore:#808080
+style.gap.1=
+style.gap.2=$(colour.keyword),bold
+style.gap.3=$(colour.keyword)
+style.gap.4=$(colour.keyword)
+style.gap.5=$(colour.keyword)
+style.gap.6=$(colour.string)
+style.gap.7=$(colour.char)
+style.gap.8=$(colour.operator),bold
+style.gap.9=$(colour.code.comment.line)
+style.gap.10=$(colour.number)
+style.gap.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+
+braces.gap.style=8
+
+module haskell
+
+lexer.*.hs=haskell
+filter.hs=Haskell (hs)|*.hs|
+
+*filter.hs=$(filter.hs)
+
+*language.haskell=Haskell|hs||
+
+style.haskell.0=fore:#808080
+style.haskell.1=
+style.haskell.2=$(colour.keyword),bold
+style.haskell.3=$(colour.number)
+style.haskell.4=$(colour.string)
+style.haskell.5=$(colour.char)
+style.haskell.6=back:#FF0000
+style.haskell.7=
+style.haskell.8=
+style.haskell.9=back:#FF0000
+style.haskell.10=back:#FF0000
+style.haskell.11=$(colour.operator),bold
+style.haskell.12=back:#FF0000
+style.haskell.13=$(colour.code.comment.line),$(font.code.comment.line)
+style.haskell.14=$(colour.code.comment.box),$(font.code.comment.box)
+style.haskell.15=$(colour.code.comment.box),$(font.code.comment.box)
+style.haskell.16=$(colour.code.comment.box),$(font.code.comment.box)
+style.haskell.17=fore:#BF6F00
+style.haskell.18=$(colour.preproc)
+style.haskell.19=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.haskell.20=back:#FF8080
+
+style.haskell.21=fore:#DD9900,$(font.code.comment.line),italics
+style.haskell.22=fore:#EE00AA
+
+keywordclass.haskell98=case class data default deriving do else hiding if \
+import in infix infixl infixr instance let module \
+newtype of then type where forall foreign
+
+keywordclass.ffi=export label dynamic safe threadsafe \
+unsafe stdcall ccall prim
+
+keywords.*.hs=$(keywordclass.haskell98)
+
+keywords2.*.hs=$(keywordclass.ffi)
+
+module hex
+
+file.patterns.srec=*.mot;*.srec
+file.patterns.ihex=*.hex
+file.patterns.tehex=*.tek
+
+filter.srec=S-Record (mot)|$(file.patterns.srec)|
+filter.ihex=Intel HEX (hex)|$(file.patterns.ihex)|
+filter.tehex=Tektronix extended HEX (tek)|$(file.patterns.tehex)|
+
+*filter.srec=$(filter.srec)
+*filter.ihex=$(filter.ihex)
+*filter.tehex=$(filter.tehex)
+
+lexer.$(file.patterns.srec)=srec
+lexer.$(file.patterns.ihex)=ihex
+lexer.$(file.patterns.tehex)=tehex
+
+*language.srecord=S-Record|mot||
+*language.intelhex=Intel HEX|hex||
+*language.tektronixhex=Tektronix extended HEX|tek||
+
+style.srec.0=
+style.srec.1=$(style.srec.2)
+style.srec.2=fore:#7F0000
+style.srec.3=$(style.srec.2),$(style.srec.10)
+style.srec.4=fore:#7F7F00
+style.srec.5=$(colour.error)
+style.srec.6=fore:#7F00FF
+style.srec.7=fore:#007FFF
+style.srec.8=$(style.srec.6)
+style.srec.9=$(style.srec.7)
+style.srec.10=italics
+style.srec.12=bold
+style.srec.13=
+style.srec.14=$(style.srec.10)
+style.srec.15=
+style.srec.16=fore:#00BF00
+style.srec.17=$(colour.error)
+style.srec.18=$(style.srec.10)
+
+style.ihex.0=$(style.srec.0)
+style.ihex.1=$(style.srec.1)
+style.ihex.2=$(style.srec.2)
+style.ihex.3=$(style.srec.3)
+style.ihex.4=$(style.srec.4)
+style.ihex.5=$(style.srec.5)
+style.ihex.6=$(style.srec.6)
+style.ihex.7=$(style.srec.7)
+style.ihex.9=$(style.srec.9)
+style.ihex.10=$(style.srec.10)
+style.ihex.11=$(style.ihex.9)
+style.ihex.12=$(style.srec.12)
+style.ihex.13=$(style.srec.13)
+style.ihex.14=$(style.srec.14)
+style.ihex.15=$(style.srec.15)
+style.ihex.16=$(style.srec.16)
+style.ihex.17=$(style.srec.17)
+style.ihex.18=$(style.srec.18)
+
+style.tehex.0=$(style.srec.0)
+style.tehex.1=$(style.srec.1)
+style.tehex.2=$(style.srec.2)
+style.tehex.3=$(style.srec.3)
+style.tehex.4=$(style.srec.4)
+style.tehex.5=$(style.srec.5)
+style.tehex.7=$(style.srec.7)
+style.tehex.9=$(style.srec.9)
+style.tehex.10=$(style.srec.10)
+style.tehex.12=$(style.srec.12)
+style.tehex.13=$(style.srec.13)
+style.tehex.16=$(style.srec.16)
+style.tehex.17=$(style.srec.17)
+style.tehex.18=$(style.srec.18)
+
+module html
+
+
+file.patterns.web=*.html;*.htm;*.asp;*.shtml;*.htd;*.jsp;*.xhtml
+file.patterns.php=*.php3;*.phtml;*.php
+file.patterns.html=$(file.patterns.web);$(file.patterns.php);*.htt;*.cfm;*.tpl;*.dtd;*.hta
+file.patterns.vxml=*.vxml
+file.patterns.xml=*.xml;*.xsl;*.svg;*.xul;*.xsd;*.dtd;*.xslt;*.axl;*.xrc;*.rdf
+file.patterns.docbook=*.docbook
+
+file.patterns.mako=*.mako
+
+*source.patterns.cgi=*.cgi;
+*source.patterns.html=$(file.patterns.web);
+*source.patterns.xml=$(file.patterns.xml);
+
+lexer.$(file.patterns.html)=hypertext
+lexer.$(file.patterns.vxml)=hypertext
+lexer.$(file.patterns.xml)=xml
+lexer.$(file.patterns.docbook)=hypertext
+lexer.$(file.patterns.mako)=hypertext
+
+filter.web=Web (html htm asp shtml css xml docbook jsp)|$(file.patterns.web);*.css;*.xml;*.docbook|
+filter.php=PHP (php php3 phtml)|$(file.patterns.php)|
+
+*filter.web=$(filter.web)
+*filter.php=$(filter.php)
+
+*language.html=H&ypertext|html|$(keyHTML)|
+*language.php=P&HP|php||
+*language.xml=&XML|xml|$(keyXML)|
+
+fold.html=1
+
+
+
+
+hypertext.elements=\
+a abbr acronym address applet area b base basefont \
+bdo bgsound big blink blockquote body br button caption center \
+cite code col colgroup dd del dfn dir div dl dt em \
+fieldset font form frame frameset h1 h2 h3 h4 h5 h6 \
+head hr html i iframe img input ins isindex kbd label \
+legend li link listing map marquee menu menuitem meta multicol nobr noembed noframes noscript \
+object ol optgroup option p param plaintext pre q s samp \
+script select small spacer span strike strong style sub sup \
+table tbody td textarea tfoot th thead title tr tt u ul \
+var xml xmlns xmp
+
+hypertext.attributes=\
+abbr accept-charset accept accesskey action align alink \
+allowtransparency alt archive axis background bgcolor border bordercolor bottommargin \
+cellpadding cellspacing char charoff charset checked cite \
+class classid clear codebase codetype color cols colspan \
+compact content coords \
+data datafld dataformatas datapagesize datasrc datetime \
+declare defer dir disabled enctype event \
+face for frame frameborder framespacing \
+headers height href hreflang hspace http-equiv \
+id is ismap itemid itemprop itemref itemscope itemtype \
+label lang language leftmargin link longdesc lowsrc \
+marginwidth marginheight maxlength media method methods multiple \
+name nohref noresize noshade nowrap \
+object onblur onchange onclick ondblclick onfocus \
+onkeydown onkeypress onkeyup onload onmousedown \
+onmousemove onmouseover onmouseout onmouseup \
+onreset onselect onsubmit onunload \
+profile prompt readonly rel rev rightmargin rows rowspan rules \
+scheme scope scrolling selected shape size span src standby start style \
+summary tabindex target text title topmargin type usemap urn \
+valign value valuetype version vlink vspace width \
+text password checkbox radio submit reset \
+file hidden image \
+^data-
+
+html5.elements=\
+address article aside audio base bdi canvas command details datalist dialog embed \
+figure figcaption footer header hgroup keygen main mark menu meter nav output \
+picture progress ruby rb rt rtc rp section source template track time video wbr
+
+html5.attributes=\
+allowfullscreen allowpaymentrequest async autocomplete autofocus autoplay \
+controls contenteditable contextmenu crossorigin default dirname download draggable \
+form formaction formenctype formmethod formnovalidate formtarget high kind \
+list low loop manifest max muted min minlength nonce novalidate open optimum \
+onabort onaddtrack onafterprint onauxclick onbeforeprint onbeforeunload \
+oncancel oncanplay oncanplaythrough onclose oncopy oncuechange oncut \
+ondrag ondragend ondragenter ondragexit ondragleave ondragover ondragstart ondrop ondurationchange \
+onemptied onended onerror onenter onexit onhashchange oninput oninvalid \
+onlanguagechange onloadeddata onloadedmetadata onloadend onloadstart \
+onmessage onmouseenter onmouseleave onoffline ononline \
+onpagehide onpageshow onpaste onpause onplay onplaying onprogress onpopstate \
+onratechange onremovetrack onresize onrejectionhandled onresize \
+onscroll onseeked onseeking onshow onstalled onstorage onsuspend ontimeupdate ontoggle \
+onunhandledrejection onvolumechange onwaiting onwheel \
+pattern placeholder poster preload \
+referrerpolicy required reversed role sandbox scoped seamless sizes spellcheck srcdoc srclang srcset step \
+translate typemustmatch wrap
+
+keywordclass.hypertext=\
+$(hypertext.elements) $(hypertext.attributes) $(html5.elements) $(html5.attributes) public !doctype
+
+vxml.elements=\
+assign audio block break catch choice clear disconnect else elseif \
+emphasis enumerate error exit field filled form goto grammar help \
+if initial link log menu meta noinput nomatch object option p paragraph \
+param phoneme prompt property prosody record reprompt return s say-as \
+script sentence subdialog submit throw transfer value var voice vxml
+
+vxml.attributes=\
+accept age alphabet anchor application base beep bridge category charset \
+classid cond connecttimeout content contour count dest destexpr dtmf dtmfterm \
+duration enctype event eventexpr expr expritem fetchtimeout finalsilence \
+gender http-equiv id level maxage maxstale maxtime message messageexpr \
+method mime modal mode name namelist next nextitem ph pitch range rate \
+scope size sizeexpr skiplist slot src srcexpr sub time timeexpr timeout \
+transferaudio type value variant version volume xml:lang
+
+keywordclass.vxml=\
+$(vxml.elements) $(vxml.attributes) public !doctype
+
+keywordclass.php=\
+and array as bool boolean break case cfunction class const continue declare \
+default die directory do double echo else elseif empty enddeclare endfor \
+endforeach endif endswitch endwhile eval exit extends false float for \
+foreach function global goto if include include_once int integer isset list namespace \
+new null object old_function or parent print real require require_once resource \
+return static stdclass string switch true unset use var while xor \
+abstract catch clone exception final implements interface php_user_filter \
+private protected public this throw try \
+__class__ __dir__ __file__ __function__ __line__ __method__ \
+__namespace__ __sleep __wakeup
+
+import phpfunctions
+
+keywords.$(file.patterns.html)=$(keywordclass.hypertext)
+keywords2.$(file.patterns.html)=$(keywordclass.javascript)
+keywords3.$(file.patterns.html)=$(keywordclass.vb)
+keywords4.$(file.patterns.html)=$(keywordclass.python)
+keywords5.$(file.patterns.html)=$(keywordclass.php)
+keywords6.$(file.patterns.html)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+docbook.elements42=\
+abbrev abstract accel ackno acronym action address affiliation alt anchor \
+answer appendix appendixinfo application area areaset areaspec arg article \
+articleinfo artpagenums attribution audiodata audioobject author authorblurb \
+authorgroup authorinitials beginpage bibliocoverage bibliodiv biblioentry \
+bibliography bibliographyinfo biblioid bibliomisc bibliomixed bibliomset \
+bibliorelation biblioset bibliosource blockinfo blockquote book bookinfo \
+bridgehead callout calloutlist caption caution chapter chapterinfo citation \
+citebiblioid citerefentry citetitle city classname classsynopsis classsynopsisinfo \
+cmdsynopsis co collab collabname colophon colspec command computeroutput \
+confdates confgroup confnum confsponsor conftitle constant constraint \
+constraintdef constructorsynopsis contractnum contractsponsor contrib \
+copyright coref corpauthor corpname country database date dedication \
+destructorsynopsis edition editor email emphasis entry entrytbl envar \
+epigraph equation errorcode errorname errortext errortype example \
+exceptionname fax fieldsynopsis figure filename firstname firstterm \
+footnote footnoteref foreignphrase formalpara funcdef funcparams \
+funcprototype funcsynopsis funcsynopsisinfo function glossary glossaryinfo \
+glossdef glossdiv glossentry glosslist glosssee glossseealso glossterm \
+graphic graphicco group guibutton guiicon guilabel guimenu guimenuitem \
+guisubmenu hardware highlights holder honorific htm imagedata imageobject \
+imageobjectco important index indexdiv indexentry indexinfo indexterm \
+informalequation informalexample informalfigure informaltable initializer \
+inlineequation inlinegraphic inlinemediaobject interface interfacename \
+invpartnumber isbn issn issuenum itemizedlist itermset jobtitle keycap \
+keycode keycombo keysym keyword keywordset label legalnotice lhs lineage \
+lineannotation link listitem iteral literallayout lot lotentry manvolnum \
+markup medialabel mediaobject mediaobjectco member menuchoice methodname \
+methodparam methodsynopsis mm modespec modifier ousebutton msg msgaud \
+msgentry msgexplan msginfo msglevel msgmain msgorig msgrel msgset msgsub \
+msgtext nonterminal note objectinfo olink ooclass ooexception oointerface \
+option optional orderedlist orgdiv orgname otheraddr othercredit othername \
+pagenums para paramdef parameter part partinfo partintro personblurb \
+personname phone phrase pob postcode preface prefaceinfo primary primaryie \
+printhistory procedure production productionrecap productionset productname \
+productnumber programlisting programlistingco prompt property pubdate publisher \
+publishername pubsnumber qandadiv qandaentry qandaset question quote refclass \
+refdescriptor refentry refentryinfo refentrytitle reference referenceinfo \
+refmeta refmiscinfo refname refnamediv refpurpose refsect1 refsect1info refsect2 \
+refsect2info refsect3 refsect3info refsection refsectioninfo refsynopsisdiv \
+refsynopsisdivinfo releaseinfo remark replaceable returnvalue revdescription \
+revhistory revision revnumber revremark rhs row sbr screen screenco screeninfo \
+screenshot secondary secondaryie sect1 sect1info sect2 sect2info sect3 sect3info \
+sect4 sect4info sect5 sect5info section sectioninfo see seealso seealsoie \
+seeie seg seglistitem segmentedlist segtitle seriesvolnums set setindex \
+setindexinfo setinfo sgmltag shortaffil shortcut sidebar sidebarinfo simpara \
+simplelist simplemsgentry simplesect spanspec state step street structfield \
+structname subject subjectset subjectterm subscript substeps subtitle \
+superscript surname sv symbol synopfragment synopfragmentref synopsis \
+systemitem table tbody term tertiary tertiaryie textdata textobject tfoot \
+tgroup thead tip title titleabbrev toc tocback tocchap tocentry tocfront \
+toclevel1 toclevel2 toclevel3 toclevel4 toclevel5 tocpart token trademark \
+type ulink userinput varargs variablelist varlistentry varname videodata \
+videoobject void volumenum warning wordasword xref year
+
+docbook.attributes=\
+arch condition conformance id lang os remap role revision revisionflag security \
+userlevel vendor xreflabel \
+status label endterm linkend space width
+
+keywordclass.docbook=\
+$(docbook.elements42) $(docbook.attributes)
+
+keywordclass.mako=$(keywordclass.hypertext)
+keywords.$(file.patterns.mako)=$(keywordclass.hypertext)
+keywords2.$(file.patterns.mako)=$(keywordclass.javascript)
+keywords3.$(file.patterns.mako)=$(keywordclass.vb)
+keywords4.$(file.patterns.mako)=$(keywordclass.python) include namespace inherit \
+call doc text page endclass endexcept endfinally endfor endif endtry endwhile block
+keywords5.$(file.patterns.mako)=$(keywordclass.php)
+keywords6.$(file.patterns.mako)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+keywordclass.django= not in autoescape with \
+csrf_token cycle empty block endblock filter endfilter for endfor firstof \
+if endif ifchanged endifchanged ifequal endifequal include load now regroup spaceless \
+endspaceless ssi url widthratio add addslashes capfirst center cut date \
+default default_if_none dictsort dictsortreversed divisibleby escape escapejs \
+filesizeformat first fix_ampersands float_format force_escape get_digit \
+iriencode join last length length_is linebreaks linebreaksbr linenumbers ljust \
+lower make_list phone2numeric pluralize pprint random removetags rjust safe \
+safeseq slice slugify stringformat striptags time timesince timeuntil title \
+truncatewords truncatewords_html unordered_list upper urlencode urlize \
+urlizetrunc wordcount wordwrap yesno apnumber intcomma intword ordinal \
+naturalday lorem
+
+keywords.$(file.patterns.docbook)=$(keywordclass.docbook)
+keywords6.$(file.patterns.docbook)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+word.characters.$(file.patterns.html)=$(chars.alpha)$(chars.numeric)$(chars.accented)_-$
+comment.stream.start.hypertext=<!--
+comment.stream.end.hypertext=-->
+comment.block.hypertext=//~
+comment.block.at.line.start.hypertext=1
+
+comment.box.start.xml=
+comment.stream.start.xml=
+
+keywords.$(file.patterns.xml)=
+keywords6.$(file.patterns.xml)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+word.characters.$(file.patterns.xml)=$(chars.alpha)$(chars.numeric)_-
+
+keywords.$(file.patterns.vxml)=$(keywordclass.vxml)
+keywords2.$(file.patterns.vxml)=$(keywordclass.javascript)
+
+
+
+word.characters.$(file.patterns.vxml)=$(chars.alpha)$(chars.numeric)_-
+
+colour.hypertext.sgml.back=back:#EFEFFF
+colour.hypertext.server.javascript.back=back:#DFDF7F
+colour.hypertext.client.vbs.back=back:#EFEFFF
+colour.hypertext.server.vbs.back=back:#CFCFEF
+colour.hypertext.client.python.back=back:#EFFFEF
+colour.hypertext.server.python.back=back:#CFEFCF
+colour.hypertext.server.php.back=back:#FFF8F8
+
+
+style.hypertext.0=fore:#000000,$(font.text)
+style.hypertext.1=fore:#000080
+style.hypertext.2=fore:#FF0000
+style.hypertext.3=fore:#008080
+style.hypertext.4=fore:#FF0000
+style.hypertext.5=$(colour.number)
+style.hypertext.6=$(colour.string)
+style.hypertext.7=$(colour.string)
+style.hypertext.8=fore:#800080
+style.hypertext.9=fore:#808000,$(font.text.comment)
+style.hypertext.10=fore:#800080,$(font.text)
+style.hypertext.11=fore:#000080
+style.hypertext.12=fore:#0000FF
+style.hypertext.13=fore:#0000FF
+style.hypertext.14=back:#FF0000
+style.hypertext.15=back:#FFFF00
+style.hypertext.16=back:#FFDF00
+style.hypertext.17=back:#FFDF00
+style.hypertext.18=fore:#0000FF,back:#FFEFBF
+style.hypertext.19=fore:#FF00FF,back:#FFEFFF
+style.hypertext.20=fore:#000000,back:#FFFFD0
+style.hypertext.21=fore:#000080,$(colour.hypertext.sgml.back)
+style.hypertext.22=fore:#000080,$(colour.hypertext.sgml.back),bold
+style.hypertext.23=fore:#006600,$(colour.hypertext.sgml.back)
+style.hypertext.24=fore:#800000,$(colour.hypertext.sgml.back)
+style.hypertext.25=fore:#993300,$(colour.hypertext.sgml.back)
+style.hypertext.26=fore:#800000,back:#FF6666
+style.hypertext.27=fore:#3366FF,$(colour.hypertext.sgml.back)
+style.hypertext.28=fore:#333333,$(colour.hypertext.sgml.back)
+style.hypertext.29=fore:#808000,$(colour.hypertext.sgml.back)
+style.hypertext.30=fore:#808000,back:#FF0000
+style.hypertext.31=fore:#000066,back:#CCCCE0
+style.hypertext.34=fore:#0000FF,notbold,$(font.text)
+style.hypertext.35=fore:#FF0000,notbold,$(font.text)
+
+fontcolour.js=$(colour.embedded.js),$(font.js)
+style.hypertext.40=fore:#7F7F00
+style.hypertext.41=fore:#000000,bold,$(fontcolour.js),eolfilled
+style.hypertext.42=$(colour.code.comment.box),$(fontcolour.js),eolfilled
+style.hypertext.43=$(colour.code.comment.line),$(fontcolour.js)
+style.hypertext.44=$(colour.code.comment.doc),bold,$(fontcolour.js),eolfilled
+style.hypertext.45=$(colour.number),$(fontcolour.js)
+style.hypertext.46=fore:#000000,$(fontcolour.js)
+style.hypertext.47=$(colour.keyword),bold,$(fontcolour.js)
+style.hypertext.48=$(colour.string),$(fontcolour.js)
+style.hypertext.49=$(colour.string),$(fontcolour.js)
+style.hypertext.50=$(colour.operator),bold,$(fontcolour.js)
+style.hypertext.51=back:#BFBBB0,eolfilled
+style.hypertext.52=back:#FFBBB0
+
+style.hypertext.55=fore:#7F7F00
+style.hypertext.56=fore:#000000,bold,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+style.hypertext.57=fore:#007F00,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+style.hypertext.58=fore:#007F00,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.59=fore:#7F7F7F,bold,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+style.hypertext.60=fore:#007F7F,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.61=fore:#000000,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.62=fore:#00007F,bold,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.63=fore:#7F007F,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.64=fore:#7F007F,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.65=fore:#000000,bold,$(font.js),$(colour.hypertext.server.javascript.back)
+style.hypertext.66=back:#BFBBB0,eolfilled
+style.hypertext.67=back:#FFBBB0
+
+style.hypertext.70=
+style.hypertext.71=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000000,eolfilled
+style.hypertext.72=$(font.comment),$(colour.hypertext.client.vbs.back),fore:#008000,eolfilled
+style.hypertext.73=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#008080,eolfilled
+style.hypertext.74=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000080,bold,eolfilled
+style.hypertext.75=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#800080,eolfilled
+style.hypertext.76=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000080,eolfilled
+style.hypertext.77=$(font.vbs),back:#7F7FFF,fore:#000080,eolfilled
+
+style.hypertext.80=
+style.hypertext.81=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000000,eolfilled
+style.hypertext.82=$(font.comment),$(colour.hypertext.server.vbs.back),fore:#008000,eolfilled
+style.hypertext.83=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#008080,eolfilled
+style.hypertext.84=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000080,bold,eolfilled
+style.hypertext.85=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#800080,eolfilled
+style.hypertext.86=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000080,eolfilled
+style.hypertext.87=$(font.vbs),back:#7F7FBF,fore:#000080,eolfilled
+
+style.hypertext.90=fore:#808080
+style.hypertext.91=fore:#808080,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.92=fore:#007F00,$(font.comment),$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.93=fore:#007F7F,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.94=fore:#7F007F,$(font.monospace),$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.95=fore:#7F007F,$(font.monospace),$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.96=fore:#00007F,bold,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.97=fore:#7F0000,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.98=fore:#7F0000,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.99=fore:#0000FF,bold,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.100=fore:#007F7F,bold,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.101=bold,$(colour.hypertext.client.python.back),eolfilled
+style.hypertext.102=$(colour.hypertext.client.python.back),eolfilled
+
+style.hypertext.104=fore:#007F00,italics,$(colour.hypertext.server.php.back)
+
+style.hypertext.105=fore:#808080
+style.hypertext.106=fore:#808080,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.107=fore:#007F00,$(font.comment),$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.108=fore:#007F7F,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.109=fore:#7F007F,$(font.monospace),$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.110=fore:#7F007F,$(font.monospace),$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.111=fore:#00007F,bold,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.112=fore:#7F0000,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.113=fore:#7F0000,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.114=fore:#0000FF,bold,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.115=fore:#007F7F,bold,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.116=bold,$(colour.hypertext.server.python.back),eolfilled
+style.hypertext.117=$(colour.hypertext.server.python.back),eolfilled
+
+style.hypertext.118=fore:#000033,$(colour.hypertext.server.php.back),eolfilled
+style.hypertext.119=fore:#007F00,$(colour.hypertext.server.php.back)
+style.hypertext.120=fore:#009F00,$(colour.hypertext.server.php.back)
+style.hypertext.121=fore:#7F007F,italics,$(colour.hypertext.server.php.back)
+style.hypertext.122=fore:#CC9900,$(colour.hypertext.server.php.back)
+style.hypertext.123=fore:#00007F,italics,$(colour.hypertext.server.php.back)
+style.hypertext.124=fore:#999999,$(font.comment),$(colour.hypertext.server.php.back)
+style.hypertext.125=fore:#666666,italics,$(font.comment),$(colour.hypertext.server.php.back)
+style.hypertext.126=fore:#007F00,italics,$(colour.hypertext.server.php.back)
+style.hypertext.127=fore:#000000,$(colour.hypertext.server.php.back)
+
+
+style.xml.0=fore:#000000,$(font.text)
+style.xml.1=fore:#000080
+style.xml.2=fore:#000080
+style.xml.3=fore:#008080
+style.xml.4=fore:#008080
+style.xml.5=$(colour.number)
+style.xml.6=$(colour.string)
+style.xml.7=$(colour.string)
+style.xml.8=fore:#800080
+style.xml.9=fore:#808000
+style.xml.10=fore:#800080,$(font.text)
+style.xml.11=fore:#000080
+style.xml.12=fore:#800080,bold
+style.xml.13=fore:#800080,bold
+style.xml.17=fore:#800000,back:#FFF0F0,$(font.text),eolfilled
+style.xml.18=fore:#800000
+style.xml.19=fore:#608060
+style.xml.21=fore:#000080,$(colour.hypertext.sgml.back)
+style.xml.22=fore:#000080,$(colour.hypertext.sgml.back),bold
+style.xml.23=fore:#006600,$(colour.hypertext.sgml.back)
+style.xml.24=fore:#800000,$(colour.hypertext.sgml.back)
+style.xml.25=fore:#993300,$(colour.hypertext.sgml.back)
+style.xml.26=fore:#800000,back:#FF6666
+style.xml.27=fore:#3366FF,$(colour.hypertext.sgml.back)
+style.xml.28=fore:#333333,$(colour.hypertext.sgml.back)
+style.xml.29=fore:#808000,$(colour.hypertext.sgml.back)
+style.xml.31=fore:#000066,back:#CCCCE0
+braces.xml.style=31
+
+if PLAT_WIN
+	command.go.$(file.patterns.web)="file://$(FilePath)"
+	command.go.subsystem.$(file.patterns.web)=2
+if PLAT_GTK
+	command.go.$(file.patterns.web)=xdg-open "file://$(FilePath)"
+if PLAT_MAC
+	command.go.$(file.patterns.web)=open "file://$(FilePath)"
+	command.go.subsystem.$(file.patterns.web)=2
+
+command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
+command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
+
+module inno
+
+file.patterns.inno=*.iss;*.isl
+
+filter.inno=Inno Setup (iss isl)|$(file.patterns.inno)|
+
+*filter.inno=$(filter.inno)
+
+lexer.$(file.patterns.inno)=inno
+
+*language.innosetup=&InnoSetup|iss||
+
+comment.block.inno=;~
+
+keywords.$(file.patterns.inno)=\
+ code components custommessages dirs files icons ini installdelete \
+ langoptions languages messages registry run setup types tasks \
+ uninstalldelete uninstallrun _istool
+
+keywords2.$(file.patterns.inno)=\
+ allowcancelduringinstall allownoicons allowrootdirectory allowuncpath \
+ alwaysrestart alwaysshowcomponentslist alwaysshowdironreadypage \
+ alwaysshowgrouponreadypage alwaysusepersonalgroup appcomments appcontact \
+ appcopyright appid appmodifypath appmutex appname apppublisher \
+ apppublisherurl appreadmefile appsupportphone appsupporturl appupdatesurl \
+ appvername appversion appenddefaultdirname appenddefaultgroupname \
+ architecturesallowed architecturesinstallin64bitmode backcolor backcolor2 \
+ backcolordirection backsolid changesassociations changesenvironment \
+ compression compressionthreads copyrightfontname copyrightfontsize \
+ createappdir createuninstallregkey defaultdirname defaultgroupname \
+ defaultuserinfoname defaultuserinfoorg defaultuserinfoserial dialogfontname \
+ dialogfontsize dialogfontstandardheight direxistswarning disabledirpage \
+ disablefinishedpage disableprogramgrouppage disablereadymemo \
+ disablereadypage disablestartupprompt diskclustersize diskslicesize \
+ diskspanning dontmergeduplicatefiles enabledirdoesntexistwarning encryption \
+ extradiskspacerequired flatcomponentslist infoafterfile infobeforefile \
+ internalcompresslevel languagecodepage languagedetectionmethod languageid \
+ languagename licensefile mergeduplicatefiles messagesfile minversion \
+ onlybelowversion outputbasefilename outputdir outputmanifestfile password \
+ privilegesrequired reservebytes restartifneededbyrun righttoleft \
+ setupiconfile setuplogging showcomponentsizes showlanguagedialog \
+ showtaskstreelines showundisplayablelanguages signtool signeduninstaller \
+ signeduninstallerdir slicesperdisk solidcompression sourcedir \
+ terminalservicesaware timestamprounding timestampsinutc titlefontname \
+ titlefontsize touchdate touchtime uninstalldisplayicon uninstalldisplayname \
+ uninstallfilesdir uninstalliconfile uninstalllogmode \
+ uninstallrestartcomputer uninstallstyle uninstallable \
+ updateuninstalllogappname usepreviousappdir usepreviousgroup \
+ useprevioussetuptype useprevioustasks useprevioususerinfo usesetupldr \
+ userinfopage versioninfocompany versioninfocopyright versioninfodescription \
+ versioninfoproductname versioninfoproductversion versioninfotextversion \
+ versioninfoversion welcomefontname welcomefontsize windowresizable \
+ windowshowcaption windowstartmaximized windowvisible wizardimagebackcolor \
+ wizardimagefile wizardimagestretch wizardsmallimagebackcolor \
+ wizardsmallimagefile wizardstyle
+
+keywords3.$(file.patterns.inno)=\
+ afterinstall attribs beforeinstall check comment components copymode \
+ description destdir destname excludes externalsize extradiskspacerequired \
+ filename flags fontinstall groupdescription hotkey iconfilename iconindex \
+ key languages minversion name onlybelowversion parameters permissions root \
+ runonceid section source statusmsg string subkey tasks type types valuedata \
+ valuename valuetype verb workingdir
+
+keywords4.$(file.patterns.inno)=\
+ append define dim elif else emit endif endsub error expr file for if ifdef \
+ ifexist ifndef ifnexist include insert pragma sub undef
+
+keywords5.$(file.patterns.inno)=\
+ begin break case const continue do downto else end except finally for \
+ function if of procedure repeat then to try until uses var while with
+
+keywords6.$(file.patterns.inno)=
+
+
+style.inno.0=
+style.inno.1=fore:#007F7F,$(font.comment)
+style.inno.2=$(colour.keyword)
+style.inno.3=$(colour.string)
+style.inno.4=back:#FFFFC0
+style.inno.5=$(colour.preproc)
+style.inno.6=$(colour.preproc)
+style.inno.7=fore:#007F7F,$(font.comment)
+style.inno.8=$(colour.keyword)
+style.inno.9=$(colour.keyword)
+style.inno.10=$(colour.string)
+style.inno.11=$(colour.char)
+style.inno.12=back:#FF0000
+
+
+module json
+
+file.patterns.json=*.json;*.eslintrc;*.jshintrc;*.jsonld;*.ipynb;*.babelrc;*.prettierrc;*.stylelintrc;*.jsonc;*.jscop
+*source.patterns.json=$(file.patterns.json);
+
+filter.json=JSON (json eshintrc jshintrc)|$(file.patterns.json)|
+*filter.json=$(filter.json)
+
+lexer.$(file.patterns.json)=json
+
+*language.json=JSON|json||
+
+lexer.json.allow.comments=1
+lexer.json.escape.sequence=1
+
+keywords.$(file.patterns.json)=false true null
+
+keywords2.$(file.patterns.json)=@id @context @type @value @language @container \
+@list @set @reverse @index @base @vocab @graph
+
+style.json.0=fore:FFFFFF
+style.json.1=fore:#007F7F
+style.json.2=fore:#7F0000
+style.json.3=fore:#FFFFFF,back:#FF0000,eolfilled
+style.json.4=fore:#880AE8
+style.json.5=fore:#0B982E
+style.json.6=fore:#05BBAE,italics
+style.json.7=$(style.json.6)
+style.json.8=fore:#18644A
+style.json.9=fore:#0000FF
+style.json.10=fore:#D137C1
+style.json.11=fore:#0BCEA7,bold
+style.json.12=fore:#EC2806
+style.json.13=fore:#FFFFFF,back:#FF0000
+
+module kix
+
+file.patterns.kix=*.kix
+filter.kix=Kix-Script (kix)|$(file.patterns.kix)|
+
+*filter.kix=$(filter.kix)
+
+lexer.$(file.patterns.kix)=kix
+
+*language.kix=&Kix|kix||
+
+keywords.$(file.patterns.kix)=? and beep big break call cd cls color cookie1 copy \
+	debug del dim display do until exit flushkb for each next function endfunction \
+	get gets global go gosub goto if else endif md or password play quit \
+	rd redim return run select case endselect set setl setm settime \
+	shell sleep small use while loop
+
+keywords2.$(file.patterns.kix)=abs addkey addprinterconnection addprogramgroup \
+	addprogramitem asc ascan at backupeventlog box cdbl chr cint cleareventlog \
+	close comparefiletimes createobject cstr dectohex delkey delprinterconnection \
+	delprogramgroup delprogramitem deltree delvalue dir enumgroup enumipinfo enumkey \
+	enumlocalgroup enumvalue execute exist existkey expandenvironmentvars fix \
+	formatnumber freefilehandle getdiskspace getfileattr getfilesize getfiletime \
+	getfileversion getobject iif ingroup instr instrrev int isdeclared join \
+	kbhit keyexist lcase left len loadhive loadkey logevent logoff ltrim \
+	memorysize messagebox open readline readprofilestring readtype readvalue \
+	redirectoutput right rnd round rtrim savekey sendkeys sendmessage setascii \
+	setconsole setdefaultprinter setfileattr setfocus setoption setsystemstate \
+	settitle setwallpaper showprogramgroup shutdown sidtoname split srnd substr \
+	trim ubound ucase unloadhive val vartype vartypename writeline \
+	writeprofilestring writevalue
+
+keywords3.$(file.patterns.kix)=address build color comment cpu crlf csd curdir \
+	date day domain dos error fullname homedir homedrive homeshr hostname \
+	inwin ipaddress0 ipaddress1 ipaddress2 ipaddress3 kix lanroot ldomain \
+	ldrive lm logonmode longhomedir lserver maxpwage mdayno mhz monthno \
+	month msecs pid primarygroup priv productsuite producttype pwage ras \
+	result rserver scriptdir scriptexe scriptname serror sid site startdir \
+	syslang ticks time userid userlang wdayno wksta wuserid ydayno year
+
+comment.block.kix=;
+comment.block.at.line.start.kix=1
+
+style.kix.0=fore:#000000,$(font.vbs)
+style.kix.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.kix.2=$(colour.string)
+style.kix.3=$(colour.string)
+style.kix.4=$(colour.number)
+style.kix.5=fore:#B00040
+style.kix.6=$(colour.preproc)
+style.kix.7=$(colour.keyword),bold
+style.kix.8=$(colour.keyword)
+style.kix.9=$(colour.operator),bold
+style.kix.10=$(colour.code.comment.box),$(font.code.comment.box)
+style.kix.31=
+
+command.go.*.kix=kix32 $(FileName)
+
+tab.size.$(file.patterns.kix)=6
+indent.size.$(file.patterns.kix)=3
+use.tabs.$(file.patterns.kix)=1
+
+statement.indent.$(file.patterns.kix)=7 if else for do while function case
+
+module latex
+
+file.patterns.latex=*.tex;*.sty
+
+filter.latex=LaTeX (tex sty)|$(file.patterns.latex)|
+
+*filter.latex=$(filter.latex)
+
+lexer.$(file.patterns.latex)=latex
+
+style.latex.0=fore:#000000
+style.latex.1=fore:#AA0000,bold
+style.latex.2=fore:#880088,bold
+style.latex.3=fore:#0000FF
+style.latex.4=fore:#00AA00
+style.latex.5=fore:#880088,bold
+style.latex.6=fore:#0000AA
+style.latex.7=fore:#00AA00
+style.latex.8=fore:#666666
+style.latex.9=fore:#AA6600,bold
+style.latex.10=fore:#AAAA00
+style.latex.11=fore:#FF9900
+style.latex.12=fore:#ffffff,back:#ff0000
+
+command.compile.*.tex=latex $(FileNameExt)
+command.build.*.tex=dvips -f $(FileName).dvi > $(FileName).ps
+command.go.*.tex=dvips $(FileName).dvi
+
+command.name.0.*.tex=View
+command.0.*.tex=xdvi $(FileName).dvi
+command.name.1.*.tex=View PS
+command.1.*.tex=gv $(FileName).ps
+
+module lisp
+
+file.patterns.lisp=*.lsp;*.lisp
+
+filter.lisp=LISP (lsp lisp)|$(file.patterns.lisp)|
+
+file.patterns.scheme=*.scm;*.smd;*.ss
+filter.scheme=Scheme (scm smd)|$(file.patterns.scheme)|
+
+
+lexer.$(file.patterns.lisp)=lisp
+lexer.$(file.patterns.scheme)=lisp
+
+*language.lisp=Lisp|lisp||
+
+keywords.$(file.patterns.lisp)= not defun + - * / = < > <= >= princ \
+eval apply funcall quote identity function complement backquote lambda set setq setf \
+defun defmacro gensym make symbol intern symbol name symbol value symbol plist get \
+getf putprop remprop hash make array aref car cdr caar cadr cdar cddr caaar caadr cadar \
+caddr cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr \
+cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr cons list append reverse last nth \
+nthcdr member assoc subst sublis nsubst  nsublis remove length list length \
+mapc mapcar mapl maplist mapcan mapcon rplaca rplacd nconc delete atom symbolp numberp \
+boundp null listp consp minusp zerop plusp evenp oddp eq eql equal cond case and or let l if prog \
+prog1 prog2 progn go return do dolist dotimes catch throw error cerror break \
+continue errset baktrace evalhook truncate float rem min max abs sin cos tan expt exp sqrt \
+random logand logior logxor lognot bignums logeqv lognand lognor \
+logorc2 logtest logbitp logcount integer length nil
+
+word.chars.lisp=$(chars.alpha)$(chars.numeric)_-<>.#+@$%^&=*!?
+word.characters.$(file.patterns.lisp)=$(word.chars.lisp)
+
+keywords.$(file.patterns.scheme)= + - * / = < > <= >= => \
+abs acos and angle append apply asin assoc assoc assq assv atan \
+begin boolean? \
+caar cadr call-with-current-continuation call/cc \
+call-with-input-file call-with-output-file call-with-values \
+car cdr \
+caar cadr cdar cddr \
+caaar caadr cadar caddr cdaar cdadr cddar cdddr \
+caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr \
+cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr \
+case ceiling char->integer \
+char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? \
+char-downcase char-lower-case? char-numeric? char-ready? \
+char-upcase char-upper-case? char-whitespace? \
+char<=? char<? char=? char>=? char>? char? \
+close-input-port close-output-port complex? cond cons cos \
+current-input-port current-output-port \
+define define-syntax delay denominator display do dynamic-wind \
+else eof-object? eq? equal? eqv? eval even? exact->inexact exact? \
+exp expt \
+floor for-each force \
+gcd \
+if imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment \
+lambda lcm length let let* let-syntax letrec letrec-syntax \
+list list->string list->vector list-ref list-tail list? load log \
+magnitude make-polar make-rectangular make-string make-vector \
+map max member memq memv min modulo \
+negative? newline not null-environment null? number->string number? numerator \
+odd? open-input-file open-output-file or output-port? \
+pair? peek-char input-port? output-port? positive? procedure? \
+quasiquote quote quotient \
+rational? rationalize read read-char real-part real? remainder reverse round \
+scheme-report-environment set! set-car! set-cdr! sin sqrt string \
+string->list string->number string->symbol string-append \
+string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? \
+string-copy string-fill! string-length string-ref string-set! \
+string<=? string<? string=? string>=? string>? string? \
+substring symbol->string symbol? syntax-rules \
+transcript-off transcript-on truncate \
+unquote unquote-splicing \
+values vector vector->list vector-fill! vector-length vector-ref vector-set! vector? \
+with-input-from-file with-output-to-file write write-char \
+zero?
+
+word.chars.scheme=$(chars.alpha)$(chars.numeric)!$%&*/:<=>?^_~+-.@
+word.characters.$(file.patterns.scheme)=$(word.chars.scheme)
+
+
+comment.block.lisp=;
+comment.box.start.lisp=;;
+comment.box.middle.lisp=;;
+comment.box.end.lisp=;;
+
+
+
+style.lisp.32=$(font.base)
+style.lisp.0=fore:#808080
+style.lisp.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.lisp.2=$(colour.number)
+style.lisp.3=$(colour.keyword),bold
+style.lisp.4=fore:#EE00AA
+style.lisp.5=fore:#DD9900
+style.lisp.6=$(colour.string)
+style.lisp.10=$(colour.operator),bold
+style.lisp.9=
+style.lisp.8=fore:#000000,font:Verdana,size:9,back:#fefecc,eolfilled
+style.lisp.11=fore:#60AA00
+style.lisp.12=$(colour.code.comment.box),$(font.code.comment.box)
+style.lisp.34=fore:#0000FF,bold
+style.lisp.35=fore:#FF0000,bold
+braces.lisp.style=10
+
+command.go.$(file.patterns.scheme)=c:\tools\gambit\gsi.exe -f $(FilePath)
+command.go.subsystem.$(file.patterns.scheme)=0
+
+module lot
+file.patterns.lot=*.lot
+
+filter.lot=Lot (lot)|$(file.patterns.lot)|
+
+*filter.lot=$(filter.lot)
+
+lexer.$(file.patterns.lot)=lot
+
+*language.lot=Lot|lot||
+
+word.characters.$(file.patterns.lot)=$(chars.alpha)$(chars.numeric)
+
+style.lot.0=fore:#000000
+style.lot.1=back:#00F0FF,eolfilled
+style.lot.2=back:#FFFF00,eolfilled
+ style.lot.3=fore:#FFFFFF,back:#0000FF,bold,eolfilled
+ style.lot.4=back:#00FF00,eolfilled
+style.lot.5=back:#FF0000,eolfilled,bold
+style.lot.6=back:#0000FF,bold,eolfilled
+
+module lout
+
+file.patterns.lout=*.lt
+
+filter.lout=Lout (lt)|*.lt|
+
+*filter.lout=$(filter.lout)
+
+lexer.$(file.patterns.lout)=lout
+
+*language.lout=Lout|lt||
+
+keywords.$(file.patterns.lout)= \
+@OptGall @FontDef @Family @Face @Name @Metrics @ExtraMetrics \
+@Mapping @Recode @Filter @FilterIn @FilterOut @FilterErr \
+@Common @Rump @Meld @Insert @OneOf @Next @Plus @Minus @Wide \
+@High @HShift @VShift @BeginHeaderComponent @EndHeaderComponent \
+@SetHeaderComponent @ClearHeaderComponent @OneCol @OneRow \
+@HMirror @VMirror @HScale @VScale @HCover @VCover @Scale \
+@KernShrink @HContract @VContract @HLimited @VLimited @HExpand \
+@VExpand @StartHVSpan @StartHSpan @StartVSpan @HSpan @VSpan \
+@PAdjust @HAdjust @VAdjust @Rotate @Background @IncludeGraphic \
+@SysIncludeGraphic @Graphic @LinkSource @LinkDest @URLLink \
+@PlainGraphic @Verbatim @RawVerbatim @Case @Yield @BackEnd \
+@Char @Font @Space @YUnit @ZUnit @Break @Underline @SetColour \
+@SetColor @SetUnderlineColour @SetUnderlineColor @SetTexture \
+@Outline @Language @CurrLang @CurrFamily @CurrFace @CurrYUnit \
+@CurrZUnit @LEnv @@A @@B @@C @@D @@E @LClos @@V @LUse @LEO \
+@Open @Use @NotRevealed @Tagged @Database @SysDatabase \
+@Include @SysInclude @IncludeGraphicRepeated \
+@SysIncludeGraphicRepeated @PrependGraphic @SysPrependGraphic \
+@Target @Null @PageLabel @Galley @ForceGalley @LInput @Split \
+@Tag @Key @Optimize @Merge @Enclose @Begin @End @Moment \
+@Second @Minute @Hour @Day @Month @Year @Century @WeekDay \
+@YearDay @DaylightSaving @SetContext @GetContext
+
+keywords2.$(file.patterns.lout)= &&& && & ^// ^/ ^|| ^| ^& // / || |
+
+keywords3.$(file.patterns.lout)= def langdef force horizontally into \
+extend import export precedence associativity left right body macro \
+named compulsory following preceding foll_or_prec now
+
+comment.block.lout=#~
+
+indent.maintain.$(file.patterns.lout)=1
+
+
+style.lout.32=$(font.base)
+style.lout.0=fore:#808080
+style.lout.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.lout.2=$(colour.number)
+style.lout.3=$(colour.keyword),bold
+style.lout.4=$(colour.keyword),bold
+style.lout.5=$(colour.keyword),bold
+style.lout.6=$(colour.keyword)
+style.lout.7=$(colour.string)
+style.lout.8=$(colour.operator),bold
+style.lout.9=
+style.lout.10=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+braces.lout.style=8
+
+command.compile.$(file.patterns.lout)=lout "$(FileNameExt)" > "$(FileName).ps"
+command.build.$(file.patterns.lout)=make
+
+if PLAT_WIN
+	command.go.$(file.patterns.lout)=gview "$(FileName).ps"
+
+if PLAT_GTK
+	command.go.$(file.patterns.lout)=gview32 "$(FileName).ps"
+
+
+module lua
+
+file.patterns.lua=*.lua
+
+*source.patterns.lua=$(file.patterns.lua);
+
+shbang.lua=lua
+
+filter.lua=Lua (lua)|$(file.patterns.lua)|
+
+*filter.lua=$(filter.lua)
+
+lexer.$(file.patterns.lua)=lua
+
+*language.lua=Lu&a|lua||
+
+word.chars.lua=$(chars.alpha)$(chars.numeric)$(chars.accented)_%
+word.characters.$(file.patterns.lua)=$(word.chars.lua)
+
+
+keywordclass.lua4=\
+and break do else elseif \
+end for function if in \
+local nil not or repeat \
+return then until while
+
+keywordclass2.lua4=\
+_ALERT assert call collectgarbage copytagmethods \
+dofile dostring error foreach foreachi \
+gcinfo getglobal getn gettagmethod globals \
+newtag next print rawget rawset \
+setglobal settag settagmethod sort tag \
+tonumber tostring tinsert tremove type \
+_VERSION _ERRORMESSAGE
+
+keywordclass3.lua4=\
+strbyte strchar strfind strlen strlower \
+strrep strsub strupper format gsub \
+abs acos asin atan atan2 \
+ceil cos deg exp floor \
+log log10 max min mod \
+rad sin sqrt tan frexp \
+ldexp random randomseed PI
+
+keywordclass4.lua4=\
+openfile closefile readfrom writeto appendto \
+remove rename flush seek tmpname read write \
+clock date execute exit getenv setlocale \
+_INPUT _OUTPUT _STDIN _STDOUT _STDERR -- file descriptors
+
+keywordclass5.lua4=\
+getinfo getlocal setlocal setcallhook setlinehook
+
+
+keywordclass.lua50=$(keywordclass.lua4) false true
+
+keywordclass2.lua5=\
+assert collectgarbage dofile error _G \
+getmetatable ipairs loadfile next pairs \
+pcall print rawequal rawget rawset \
+setmetatable tonumber tostring type _VERSION \
+xpcall string table math coroutine io os debug
+
+keywordclass2.lua50=$(keywordclass2.lua5) \
+getfenv gcinfo loadlib loadstring require \
+setfenv unpack _LOADED LUA_PATH _REQUIREDNAME
+
+keywordclass3.lua5=\
+string.byte string.char string.dump string.find string.format \
+string.gsub string.len string.lower string.rep string.sub string.upper \
+table.concat table.insert table.remove table.sort \
+math.abs math.acos math.asin math.atan math.atan2 \
+math.ceil math.cos math.deg math.exp math.floor \
+math.frexp math.ldexp math.log math.max math.min \
+math.pi math.pow math.rad math.random math.randomseed \
+math.sin math.sqrt math.tan
+
+keywordclass3.lua50=$(keywordclass3.lua5) \
+string.gfind \
+table.foreach table.foreachi table.getn table.setn \
+math.mod math.log10
+
+keywordclass4.lua50=\
+coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield \
+io.close io.flush io.input io.lines io.open \
+io.output io.read io.tmpfile io.type io.write \
+io.stdin io.stdout io.stderr \
+os.clock os.date os.difftime os.execute os.exit \
+os.getenv os.remove os.rename os.setlocale os.time \
+os.tmpname
+
+keywordclass5.lua50=\
+debug.debug debug.gethook debug.getinfo debug.getlocal debug.getupvalue \
+debug.setlocal debug.setupvalue debug.sethook debug.traceback
+
+
+keywordclass.lua51=$(keywordclass.lua50)
+
+keywordclass2.lua51=$(keywordclass2.lua5) \
+getfenv load loadstring select \
+setfenv unpack package
+
+keywordclass3.lua51=$(keywordclass3.lua5) \
+string.gmatch string.match string.reverse \
+table.maxn \
+math.cosh math.fmod math.huge math.log10 math.modf \
+math.sinh math.tanh
+
+keywordclass4.package=\
+require package.cpath package.loaded \
+package.loadlib package.path package.preload
+
+keywordclass4.lua51=$(keywordclass4.lua50) \
+coroutine.running io.popen \
+module package.loaders package.seeall \
+$(keywordclass4.package)
+
+keywordclass5.lua51=$(keywordclass5.lua50) \
+debug.getfenv debug.getmetatable debug.getregistry debug.setfenv debug.setmetatable
+
+
+keywordclass.lua52=$(keywordclass.lua50) goto
+
+keywordclass2.lua52=$(keywordclass2.lua5) \
+load rawlen select package bit32 _ENV
+
+keywordclass3.bit32=\
+bit32.arshift bit32.band bit32.bnot bit32.bor bit32.btest \
+bit32.bxor bit32.extract bit32.replace bit32.lrotate bit32.lshift \
+bit32.rrotate bit32.rshift
+
+keywordclass3.lua52=$(keywordclass3.lua5) \
+string.gmatch string.match string.reverse \
+table.pack table.unpack \
+math.cosh math.fmod math.huge math.modf math.sinh math.tanh \
+$(keywordclass3.bit32)
+
+keywordclass4.lua52=$(keywordclass4.lua50) \
+coroutine.running io.popen \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+keywordclass5.lua52=$(keywordclass5.lua50) \
+debug.getmetatable debug.getregistry debug.setmetatable \
+debug.getuservalue debug.setuservalue debug.upvalueid debug.upvaluejoin
+
+
+keywordclass.lua53=$(keywordclass.lua50) goto
+
+keywordclass2.lua53=$(keywordclass2.lua5) \
+load rawlen select package utf8 _ENV
+
+keywordclass3.utf8=\
+utf8.char utf8.charpattern utf8.codes \
+utf8.codepoint utf8.len utf8.offset
+
+keywordclass3.lua53=\
+string.byte string.char string.dump string.find string.format \
+string.gmatch string.gsub string.len string.lower string.match \
+string.pack string.packsize string.rep \
+string.reverse string.sub string.unpack string.upper \
+table.concat table.insert table.move table.pack \
+table.remove table.sort table.unpack \
+math.abs math.acos math.asin math.atan \
+math.ceil math.cos math.deg math.exp \
+math.floor math.fmod math.huge \
+math.log math.max math.maxinteger math.min math.mininteger \
+math.modf math.pi math.rad \
+math.random math.randomseed math.sin \
+math.sqrt math.tan \
+math.tointeger math.type math.ult \
+$(keywordclass3.utf8)
+
+keywordclass4.lua53=$(keywordclass4.lua50) \
+coroutine.isyieldable coroutine.running io.popen \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+keywordclass5.lua53=$(keywordclass5.lua52)
+
+
+keywordclass.lua5x=$(keywordclass.lua53)
+
+keywordclass2.lua5x=$(keywordclass2.lua5) \
+getfenv gcinfo load loadlib loadstring \
+require select setfenv unpack \
+_LOADED LUA_PATH _REQUIREDNAME \
+package rawlen package bit32 utf8 _ENV
+
+keywordclass3.lua5x=$(keywordclass3.lua5) \
+string.gfind string.gmatch string.match string.reverse \
+string.pack string.packsize string.unpack \
+table.foreach table.foreachi table.getn table.setn \
+table.maxn table.pack table.unpack table.move \
+math.cosh math.fmod math.huge math.log10 math.modf \
+math.mod math.sinh math.tanh math.maxinteger math.mininteger \
+math.tointeger math.type math.ult \
+$(keywordclass3.bit32) \
+$(keywordclass3.utf8)
+
+keywordclass4.lua5x=$(keywordclass4.lua50) \
+coroutine.isyieldable coroutine.running io.popen \
+module package.loaders package.seeall \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+keywordclass5.lua5x=$(keywordclass5.lua50) \
+debug.getfenv debug.getmetatable debug.getregistry debug.setfenv debug.setmetatable \
+debug.getuservalue debug.setuservalue debug.upvalueid debug.upvaluejoin
+
+keywords.$(file.patterns.lua)=$(keywordclass.lua5x)
+keywords2.$(file.patterns.lua)=$(keywordclass2.lua5x)
+keywords3.$(file.patterns.lua)=$(keywordclass3.lua5x)
+keywords4.$(file.patterns.lua)=$(keywordclass4.lua5x)
+
+
+indent.maintain.$(file.patterns.lua)=1
+
+comment.block.lua=--~
+comment.block.at.line.start.lua=1
+
+
+style.lua.32=$(font.code.base),fore:#000000
+style.lua.0=fore:#FF0000
+style.lua.1=$(colour.code.comment.box),$(font.code.comment.box),back:#D0F0F0,eolfilled
+style.lua.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.lua.3=$(colour.notused),$(font.notused)
+style.lua.4=$(colour.number)
+style.lua.5=$(colour.keyword)
+style.lua.6=$(colour.string)
+style.lua.7=$(colour.char)
+style.lua.8=$(colour.string),$(font.code.comment.box),back:#E0FFFF
+style.lua.9=$(colour.preproc)
+style.lua.10=$(colour.operator)
+style.lua.11=
+style.lua.12=back:#E0C0E0,eolfilled
+style.lua.13=$(style.lua.5),back:#F5FFF5
+style.lua.14=$(style.lua.5),back:#F5F5FF
+style.lua.15=$(style.lua.5),back:#FFF5F5
+style.lua.16=$(style.lua.5),back:#FFF5FF
+style.lua.17=$(style.lua.5),back:#FFFFF5
+style.lua.18=$(style.lua.5),back:#FFA0A0
+style.lua.19=$(style.lua.5),back:#FFF5F5
+style.lua.20=fore:#7F7F00
+braces.lua.style=10
+
+command.compile.*.lua=luac5.1 -o "$(FileName).luc" "$(FileNameExt)"
+command.go.*.lua=lua5.1 "$(FileNameExt)"
+
+module markdown
+
+file.patterns.markdown=*.md;*.markdown
+
+filter.markdown=Markdown (md markdown)|$(file.patterns.markdown)|
+*filter.markdown=$(filter.markdown)
+
+lexer.$(file.patterns.markdown)=markdown
+
+*language.markdown=Markdo&wn|markdown||
+
+style.markdown.0=
+
+style.markdown.1=
+
+style.markdown.2=fore:#224466,bold
+style.markdown.3=fore:#224466,bold
+
+style.markdown.4=fore:#663300,italics
+style.markdown.5=fore:#663300,italics
+
+style.markdown.6=fore:#5183C4,bold,$(font.monospace)
+style.markdown.7=fore:#5183C4,bold,$(font.monospace)
+style.markdown.8=fore:#5183C4,bold,$(font.monospace)
+style.markdown.9=fore:#5183C4,bold,$(font.monospace)
+style.markdown.10=fore:#5183C4,bold,$(font.monospace)
+style.markdown.11=fore:#5183C4,bold,$(font.monospace)
+
+style.markdown.12=back:#EEEEAA,fore:#000000
+
+style.markdown.13=fore:#555555
+style.markdown.14=fore:#555555
+
+style.markdown.15=fore:#000088
+
+style.markdown.16=back:#A9BA9D,fore:#18453B,$(font.monospace)
+
+style.markdown.17=fore:#555555,bold,$(font.monospace)
+
+style.markdown.18=fore:#0000AA,underlined
+
+style.markdown.19=back:#EEEEEE,fore:#000088,$(font.monospace)
+style.markdown.20=back:#EEEEEE,fore:#000088,$(font.monospace)
+style.markdown.21=back:#EEEEEE,fore:#000088,$(font.monospace)
+
+module matlab
+
+DEFAULT_M_LEXER_OCTAVE=1
+DEFAULT_M_LEXER_MATLAB=0
+
+
+file.patterns.octave=*.m.octave
+	#~ file.patterns.octave=*.m;$(file.patterns.octave)
+file.patterns.matlab=*.m;*.m.octave
+
+filter.octave=Octave (m)|$(file.patterns.octave)|
+
+lexer.$(file.patterns.octave)=octave
+
+
+keywordclass.octave=\
+__FILE__ \
+__LINE__ \
+break \
+case \
+catch \
+classdef \
+continue \
+do \
+else \
+elseif \
+end \
+end_try_catch \
+end_unwind_protect \
+endclassdef \
+endenumeration \
+endevents \
+endfor \
+endif \
+endmethods \
+endparfor \
+endproperties \
+endswitch \
+endwhile \
+enumeration \
+events \
+for \
+function endfunction \
+get \
+global \
+if \
+methods \
+otherwise \
+parfor \
+persistent \
+properties \
+return \
+set \
+static \
+switch \
+try \
+until \
+unwind_protect \
+unwind_protect_cleanup \
+while
+
+keywords.$(file.patterns.octave)=$(keywordclass.octave)
+
+comment.block.octave=#
+
+style.octave.0=fore:#000000
+style.octave.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.octave.2=$(colour.preproc)
+style.octave.3=$(colour.number)
+style.octave.4=$(colour.keyword),bold
+style.octave.5=$(colour.string)
+style.octave.8=$(colour.string)
+style.octave.6=$(colour.operator),bold
+style.octave.7=
+
+
+file.patterns.matlab=*.m.matlab
+	#~ file.patterns.matlab=*.m;$(file.patterns.matlab)
+filter.matlab=Matlab (m)|$(file.patterns.matlab)|
+
+*filter.matlab=$(filter.matlab)
+
+lexer.$(file.patterns.matlab)=matlab
+
+*language.matlab=Matlab|m.matlab||
+
+keywordclass.matlab=break case catch continue else elseif end for function \
+global if otherwise persistent return switch try while
+
+keywords.$(file.patterns.matlab)=$(keywordclass.matlab)
+
+comment.block.matlab=%~
+
+style.matlab.0=fore:#000000
+style.matlab.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.matlab.2=$(colour.preproc)
+style.matlab.3=$(colour.number)
+style.matlab.4=$(colour.keyword),bold
+style.matlab.5=$(colour.string)
+style.matlab.8=$(colour.string)
+style.matlab.6=$(colour.operator),bold
+style.matlab.7=
+
+
+module maxima
+
+
+file.patterns.maxima=*.wxm;*.mac
+
+
+filter.maxima=maxima (mac wxm)|$(file.patterns.maxima)|
+lexer.$(file.patterns.maxima)=maxima
+
+*language.maxima=Maxima|mac||
+
+
+style.maxima.0=fore:#2060d0
+style.maxima.1=fore:#a0a0a0
+style.maxima.2=fore:#80ff80
+style.maxima.3=fore:#8080FF
+style.maxima.4=fore:#808080
+style.maxima.5=fore:#000000
+style.maxima.6=fore:#00007F
+style.maxima.7=fore:#000000
+
+
+comment.stream.start.maxima=/*
+comment.stream.end.maxima=*/
+comment.box.start.maxima=/*
+comment.box.middle.maxima= *
+comment.box.end.maxima= */
+
+
+module metapost
+
+
+file.patterns.metapost=*.mp;*.mpx
+file.patterns.metafun=*.mp;*.mpx;*.mpy
+
+filter.metapost=MetaPost (mp mpx)|$(file.patterns.metapost)|
+filter.metafun=MetaFun (mp mpx mpy)|$(file.patterns.metafun)|
+
+*filter.metapost=$(filter.metapost)
+
+lexer.$(file.patterns.metapost)=metapost
+lexer.$(file.patterns.metafun)=metapost
+
+*language.metapost=MetaPost|mp||
+
+
+command.compile.$(file.patterns.metapost)=
+command.build.$(file.patterns.metapost)=mpost $(FileNameExt)
+command.go.$(file.patterns.metapost)=gv $(FileName).1
+
+command.compile.$(file.patterns.metafun)=
+command.build.$(file.patterns.metafun)=texexec --mptex $(FileNameExt)
+command.go.$(file.patterns.metafun)=gv $(FileName).1
+
+command.0.$(file.patterns.metapost)=
+command.1.$(file.patterns.metapost)=
+command.2.$(file.patterns.metapost)=
+command.3.$(file.patterns.metapost)=
+command.4.$(file.patterns.metapost)=
+command.5.$(file.patterns.metapost)=
+command.6.$(file.patterns.metapost)=
+command.7.$(file.patterns.metapost)=
+command.8.$(file.patterns.metapost)=
+command.9.$(file.patterns.metapost)=
+
+command.0.$(file.patterns.metafun)=
+command.1.$(file.patterns.metafun)=
+command.2.$(file.patterns.metafun)=
+command.3.$(file.patterns.metafun)=
+command.4.$(file.patterns.metafun)=
+command.5.$(file.patterns.metafun)=
+command.6.$(file.patterns.metafun)=
+command.7.$(file.patterns.metafun)=
+command.8.$(file.patterns.metafun)=
+command.9.$(file.patterns.metafun)=
+
+
+style.metapost.0=fore:#3F3F3F
+style.metapost.1=fore:#007F7F
+style.metapost.2=fore:#7F0000
+style.metapost.3=fore:#7F7F00
+style.metapost.4=fore:#007F00
+style.metapost.5=fore:#000000
+style.metapost.6=fore:#007F00,italics
+
+style.metapost.34=fore:#00007F
+style.metapost.35=fore:#7F007F
+
+
+comment.block.metapost=%
+comment.block.at.line.start.metapost=1
+
+
+lexer.metapost.interface.default=1
+
+
+lexer.metapost.comment.process=0
+
+
+keywordclass.metapost.tex=\
+    btex verbatimtex etex
+
+keywordclass.metapost.primitives=\
+    charcode day linecap linejoin miterlimit month pausing \
+    prologues showstopping time tracingcapsules tracingchoices \
+    tracingcommands tracingequations tracinglostchars \
+    tracingmacros tracingonline tracingoutput tracingrestores \
+    tracingspecs tracingstats tracingtitles truecorners \
+    warningcheck year \
+    false nullpicture pencircle true \
+    and angle arclength arctime ASCII bluepart boolean bot \
+    char color cosd cycle decimal directiontime floor fontsize \
+    greenpart hex infont intersectiontimes known length llcorner \
+    lrcorner makepath makepen mexp mlog normaldeviate not \
+    numeric oct odd or path pair pen penoffset picture point \
+    postcontrol precontrol redpart reverse rotated scaled \
+    shifted sind slanted sqrt str string subpath substring \
+    transform transformed ulcorner uniformdeviate unknown \
+    urcorner xpart xscaled xxpart xypart ypart yscaled yxpart \
+    yypart zscaled \
+    addto clip input interim let newinternal save setbounds \
+    shipout show showdependencies showtoken showvariable \
+    special \
+    begingroup endgroup of curl tension and controls \
+    reflectedabout rotatedaround interpath on off beginfig \
+    endfig def vardef enddef epxr suffix text primary secondary \
+    tertiary primarydef secondarydef tertiarydef top bottom \
+    ulft urt llft lrt randomseed also contour doublepath \
+    withcolor withpen dashed if else elseif fi for endfor forever exitif \
+    forsuffixes downto upto step until \
+    charlist extensible fontdimen headerbyte kern ligtable \
+    boundarychar chardp charext charht charic charwd designsize \
+    fontmaking charexists \
+    cullit currenttransform gfcorners grayfont hround \
+    imagerules lowres_fix nodisplays notransforms openit \
+    displaying currentwindow screen_rows screen_cols \
+    pixels_per_inch cull display openwindow numspecial \
+    totalweight autorounding fillin proofing tracingpens \
+    xoffset chardx granularity smoothing turningcheck yoffset \
+    chardy hppp tracingedges vppp \
+    extra_beginfig extra_endfig mpxbreak \
+    end
+
+keywordclass.metapost.plain=\
+    ahangle ahlength bboxmargin defaultpen defaultscale \
+    labeloffset background currentpen currentpicture cuttings \
+    defaultfont extra_beginfig extra_endfig \
+    beveled black blue bp butt cc cm dd ditto down epsilon \
+    evenly fullcircle green halfcircle identity in infinity left \
+    mitered mm origin pensquare pt quartercircle red right \
+    rounded squared unitsquare up white withdots \
+    abs bbox ceiling center cutafter cutbefore dir \
+    directionpoint div dotprod intersectionpoint inverse mod lft \
+    round rt unitvector whatever \
+    cutdraw draw drawarrow drawdblarrow fill filldraw drawdot \
+    loggingall pickup tracingall tracingnone undraw unfill \
+    unfilldraw \
+    buildcycle dashpattern decr dotlabel dotlabels drawoptions \
+    incr label labels max min thelabel z \
+    beginchar blacker capsule_end change_width \
+    define_blacker_pixels define_corrected_pixels \
+    define_good_x_pixels define_good_y_pixels \
+    define_horizontal_corrected_pixels define_pixels \
+    define_whole_blacker_pixels define_whole_pixels \
+    define_whole_vertical_blacker_pixels \
+    define_whole_vertical_pixels endchar extra_beginchar \
+    extra_endchar extra_setup font_coding_scheme\
+    font_extra_space
+
+keywordclass.metapost.all=\
+    $(keywordclass.metapost.tex) \
+    $(keywordclass.metapost.primitives) \
+    $(keywordclass.metapost.plain)
+
+keywordclass.metafun.all=
+
+keywords.$(file.patterns.metapost)=$(keywordclass.metapost.all)
+
+keywords.$(file.patterns.metafun)=$(keywordclass.metapost.all)
+keywords2.$(file.patterns.metafun)=$(keywordclass.metafun.all)
+
+keywords4.$(file.patterns.metapost)=beginfig for verbatimtex def begingroup \
+    if btex forsuffixes vardef primarydef
+keywords5.$(file.patterns.metapost)=etex fi endfig endgroup end endfor endif \
+    enddef
+
+import metafun-scite.properties
+
+
+module mmixal
+
+
+file.patterns.mmixal=*.mms
+filter.mmixal=MMIXAL (mms)|$(file.patterns.mmixal)|
+*filter.mmixal=$(filter.mmixal)
+
+lexer.$(file.patterns.mmixal)=mmixal
+
+*language.mmixal=MMIXAL|mms||
+
+opcodes=2ADDU 4ADDU 8ADDU 16ADDU ADD ADDU AND ANDNH ANDNL ANDNMH ANDNML \
+	BDIF BEV BN BNN BNP BNZ BOD BP BSPEC BYTE BZ CMP CMPU CSEV CSN CSNN CSNP CSNZ CSOD CSP CSWAP CSZ \
+	DIV DIVU ESPEC EXPR FADD FCMP FCMPE FDIV FEQL FEQLE FIX FIXU FLOT FLOTU FMUL FREM FSQRT FSUB FUN FUNE \
+	GET GETA GO GREG I_BIT INCH INCL INCMH INCML IS JMP LDA LDB LDBU LDHT LDO LDOU LDSF LDT LDTU LDUNC LDVTS LDW LDWU LOC LOCAL \
+	MOR MUL MULU MUX MXOR NAND NEG NEGU NNIX NOR NXOR O_BIT OCTA ODIF OR ORH ORL ORMH ORML ORN \
+	PBEV PBN PBNN PBNP PBNZ PBOD PBP PBZ POP PREFIX PREGO PRELD PREST PUSHGO PUSHJ PUT \
+	RESUME SAVE SET SETH SETL SETMH SETML SFLOT SFLOTU SL SLU SR SRU \
+	STB STBU STCO STHT STO STOU STSF STT STTU STUNC STW STWU SUB SUBU SWYM SYNC SYNCD TDIF TETRA TRAP TRIP UNSAVE \
+	WDIF WYDEXOR ZSEV ZSN ZSNN ZSNP ZSNZ ZSOD ZSP ZSZ
+
+special_register=rA rB rC rD rE rF rG rH rI rJ rK rL rM rN rO rP rQ rR rS rT rU rV rW rX rY rZ rBB rTT rWW rXX rYY rZZ
+
+predef_symbols=@ Text_Segment Data_Segment Pool_Segment Stack_Segment \
+	StdErr StdIn StdOut \
+	Fopen Fclose Fread Fwrite Fgets Fputs Fgetws Fputws Ftell Fseek \
+	TextRead TextWrite BinaryRead BinaryWrite BinaryReadWrite
+
+keywords.$(file.patterns.mmixal)=$(opcodes)
+keywords2.$(file.patterns.mmixal)=$(special_register)
+keywords3.$(file.patterns.mmixal)=$(predef_symbols)
+
+style.mmixal.0=
+style.mmixal.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.mmixal.2=$(font.base)
+style.mmixal.3=
+style.mmixal.4=
+style.mmixal.5=$(colour.keyword),bold
+style.mmixal.6=$(colour.error)
+style.mmixal.7=
+style.mmixal.8=
+style.mmixal.9=$(colour.number)
+style.mmixal.10=$(font.base)
+style.mmixal.11=$(colour.char)
+style.mmixal.12=$(colour.string)
+style.mmixal.13=fore:#7F007F
+style.mmixal.14=fore:#7F0000
+style.mmixal.15=bold
+style.mmixal.16=fore:#FF7777
+style.mmixal.17=$(colour.code.comment.line),$(font.code.comment.line)
+
+comment.block.mmixal=%
+
+tab.size.$(file.patterns.mmixal)=16
+indent.size.$(file.patterns.mmixal)=16
+
+command.compile.$(file.patterns.mmixal)=mmixal -l $(FileName).map -b 200 $(FilePath)
+command.go.$(file.patterns.mmixal)=mmix $(1) $(FileName).mmo
+command.name.2.$(file.patterns.mmixal)=mmotype
+command.2.$(file.patterns.mmixal)=mmotype $(FileName).mmo $(FileName).out
+
+module modula3
+
+file.patterns.m3=*.m3;*.mg;*.i3;*.ig
+
+filter.modula3=Modula-3 (m3 i3 mg ig)|$(file.patterns.m3)|
+*filter.modula3=$(filter.modula3)
+lexer.$(file.patterns.m3)=modula
+*language.modula3=Modula-3|m3||
+
+keywords.$(file.patterns.m3)=AND ANY ARRAY AS BEGIN BITS BRANDED BY CASE CONST\
+	DIV DO ELSE ELSIF END EVAL EXCEPT EXCEPTION EXIT EXPORTS FINALLY FOR FROM\
+	GENERIC IF IMPORT IN INTERFACE LOCK LOOP METHODS MOD MODULE NOT OBJECT OF\
+	OR OVERRIDES PROCEDURE RAISE RAISES READONLY RECORD REF REPEAT RETURN\
+	REVEAL ROOT SET THEN TO TRY TYPE TYPECASE UNSAFE UNTIL UNTRACED VALUE VAR\
+	WHILE WITH
+
+keywords2.$(file.patterns.m3)=ABS ADDRESS ADR ADRSIZE BITSIZE BOOLEAN BYTESIZE\
+	CARDINAL CEILING CHAR DEC DISPOSE EXTENDED FALSE FIRST FLOAT FLOOR INC\
+	INTEGER ISTYPE LAST LONGINT LONGREAL LOOPHOLE MAX MIN MUTEX NARROW NEW NIL\
+	NULL NUMBER ORD REAL REFANY ROUND SUBARRAY TEXT TRUE TRUNC TYPECODE VAL\
+	WIDECHAR
+
+keywords3.$(file.patterns.m3)= + < # = ; .. : - > { } | := <: * <= ( ) ^ , =>\
+	/ >= [ ] . &
+
+keywords4.$(file.patterns.m3)= EXTERNAL INLINE ASSERT TRACE FATAL UNUSED\
+	OBSOLETE NOWARN LINE PRAGMA
+
+keywords5.$(file.patterns.m3)= f n r t \ " '
+
+keywords6.$(file.patterns.m3)= author authors file brief date proc param result
+
+font.module.base=$(font.base)
+font.modula.code=font:$(font.module.base),size:10
+font.modula.comment=font:$(font.module.base),size:10,italics
+font.modula.doxykey=font:$(font.module.base),size:10,bold,italics
+font.modula.keywords=font:$(font.module.base),size:10,bold
+font.modula.reserved=font:$(font.module.base),size:10
+font.modula.strings=font:$(font.module.base),size:10,italics
+font.modula.strspec=font:$(font.module.base),size:10,bold,italics
+font.modula.char=font:$(font.module.base),size:10,italics
+font.modula.charspec=font:$(font.module.base),size:10,bold,italics
+font.modula.badstr=font:$(font.module.base),size:10,bold
+
+style.modula.0=fore:#383838,$(font.modula.code)
+
+style.modula.1=fore:#008000,$(font.modula.comment)
+
+style.modula.2=fore:#3F5FBF,$(font.modula.comment)
+
+style.modula.3=fore:#3F5FBF,$(font.modula.doxykey)
+
+style.modula.4=fore:#000080,$(font.modula.keywords)
+
+style.modula.5=fore:#0000C0,$(font.modula.reserved)
+
+style.modula.6=fore:#006600,$(font.modula.code)
+
+style.modula.7=fore:#3F0066,$(font.modula.code)
+
+style.modula.8=fore:#006665,$(font.modula.code)
+
+style.modula.9=fore:#FE9800,$(font.modula.strings)
+
+style.modula.10=fore:#E38800,$(font.modula.strspec)
+
+style.modula.11=fore:#FE9800,$(font.modula.char)
+
+style.modula.12=fore:#E38800,$(font.modula.charspec)
+
+style.modula.13=fore:#BF00B0,$(font.modula.code)
+
+style.modula.14=fore:#BF00B0,$(font.modula.code)
+
+style.modula.15=fore:#BF00B0,$(font.modula.keywords)
+
+style.modula.16=fore:#000080,$(font.modula.code)
+
+style.modula.17=fore:#FF0000,$(font.modula.badstr)
+
+
+module nim
+
+file.patterns.nim=*.nim
+filter.nim=Nim (nim)|$(file.patterns.nim)|
+lexer.$(file.patterns.nim)=nim
+
+*filter.nim=$(filter.nim)
+*language.nim=Nim|nim||
+*source.patterns.nim=$(file.patterns.nim);
+
+keywords.$(file.patterns.nim)=addr and as asm bind block break case cast concept \
+const continue converter defer discard distinct div do elif else end enum \
+except export finally for from func if import in include interface is \
+isnot iterator let macro method mixin mod nil not notin object of or out \
+proc ptr raise ref return shl shr static template try tuple type \
+using var when while xor yield
+
+statement.indent.$(file.patterns.nim)=15 :
+statement.lookback.$(file.patterns.nim)=0
+
+view.indentation.examine.*.nim=2
+
+lexer.nim.raw.strings.highlight.ident=0
+
+comment.block.nim=#
+comment.stream.start.nim=#[
+comment.stream.end.nim=]#
+comment.box.start.nim=#[
+comment.box.middle.nim= #
+comment.box.end.nim=]#
+
+style.nim.0=fore:#808080
+style.nim.1=fore:#007F00,$(font.comment)
+style.nim.2=fore:#0000FF,$(font.comment)
+style.nim.3=fore:#007F00,$(font.comment)
+style.nim.4=fore:#D73A49,$(font.comment)
+style.nim.5=fore:#007F7F
+style.nim.6=fore:#7F007F
+style.nim.7=fore:#7F007F
+style.nim.8=fore:#00007F,bold
+style.nim.9=fore:#7F0000
+style.nim.10=fore:#7F0000
+style.nim.11=fore:#000000
+style.nim.12=fore:#007F7F,bold
+style.nim.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.nim.14=fore:#000000,back:#FF8080
+style.nim.15=bold
+style.nim.16=fore:#000000
+
+if PLAT_WIN
+	command.go.$(file.patterns.nim)=nim c -r "$(FileNameExt)"
+	command.go.subsystem.$(file.patterns.nim)=1
+
+if PLAT_GTK
+	command.go.$(file.patterns.nim)=nim c -r "$(FileNameExt)"
+
+command.compile.$(file.patterns.nim)=nim c "$(FilePath)"
+command.help.$(file.patterns.nim)=nim -h
+
+command.name.1.$(file.patterns.nim)=Compile Release Version
+command.1.$(file.patterns.nim)=nim c -d:release "$(FileNameExt)"
+
+module nimrod
+
+file.patterns.nimrod=*.nim
+
+shbang.nimrod=nim
+
+filter.nimrod=Nimrod (nim)|$(file.patterns.nimrod)|
+
+*filter.nimrod=$(filter.nimrod)
+
+lexer.$(file.patterns.nimrod)=nimrod
+
+keywordclass.nimrod=addr and as asm \
+block break \
+case cast const continue converter \
+discard div \
+elif else end enum except exception \
+finally for from generic \
+if implies import in include is isnot iterator \
+lambda \
+macro method mod \
+nil not notin \
+object of or out \
+proc ptr \
+raise ref return \
+shl shr \
+template try tuple type \
+var \
+when where while with without \
+xor \
+yield
+
+keywords.$(file.patterns.nimrod)=$(keywordclass.nimrod)
+
+statement.indent.$(file.patterns.nimrod)=5 elif else except finally of \
+for if try while
+
+statement.lookback.$(file.patterns.nimrod)=0
+block.start.$(file.patterns.nimrod)=
+block.end.$(file.patterns.nimrod)=
+
+view.indentation.examine.*.nim=2
+
+
+comment.block.nimrod=#~
+
+style.nimrod.0=fore:#808080
+style.nimrod.1=fore:#007F00,$(font.comment)
+style.nimrod.2=fore:#007F7F
+style.nimrod.3=fore:#7F007F,$(font.monospace)
+style.nimrod.4=fore:#7F007F,$(font.monospace)
+style.nimrod.5=fore:#00007F,bold
+style.nimrod.6=fore:#7F0000
+style.nimrod.7=fore:#7F0000
+style.nimrod.8=fore:#0000FF,bold
+style.nimrod.9=fore:#007F7F,bold
+style.nimrod.10=bold
+style.nimrod.11=
+style.nimrod.12=fore:#7F7F7F
+style.nimrod.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.nimrod.14=fore:#407090
+style.nimrod.15=fore:#805000
+style.nimrod.34=fore:#0000FF,bold
+style.nimrod.35=fore:#FF0000,bold
+braces.nimrod.style=10
+
+if PLAT_WIN
+	command.go.*.nim=nimrod c -r "$(FileNameExt)"
+	command.go.subsystem.*.nim=1
+
+if PLAT_GTK
+	command.go.*.nim=nimrod c -r "$(FileNameExt)"
+
+command.name.1.*.nim=Syntax Check
+command.1.*.nim=nimrod check "$(FilePath)"
+
+command.compile.*.nim=nimrod c "$(FilePath)"
+
+command.build.*.nim=nimrod --forcebuild "$(FilePath)"
+command.build.subsystem.*.nim=1
+
+
+
+module nncrontab
+
+file.patterns.nncron=*.tab;*.spf
+
+lexer.$(file.patterns.nncron)=nncrontab
+
+*language.nnCron=&nnCron crontab|tab||
+
+filter.nncrontab=nnCron files (tab spf)|$(file.patterns.nncron)|
+
+*filter.nncrontab=$(filter.nncrontab)
+
+word.characters.$(file.patterns.nncron)=$(chars.alpha)$(chars.numeric)%-
+
+comment.block.nncrontab=\
+
+
+keywords.$(file.patterns.nncron)=\
+AGAIN ALLOT AND Action BEGIN CASE COMPARE CONSTANT CREATE DO Days ELSE \
+ENDCASE ENDOF EVAL-SUBST EVALUATE FALSE Hours I IF LEAVE LOOP Minutes \
+Months NOT OF OFF ON OR PAD REPEAT Rule SET THEN TRUE Time UNTIL VALUE \
+VARIABLE WHILE WeekDays Years
+
+keywords2.$(file.patterns.nncron)=\
+</JScript> </SCRIPT> </VBScript> <JScript> <VBScript> ACCESS-DATE BEEP \
+CALL_DIAL CALL_HANGUP CHAR CLIPBOARD CONSOLE CREATION-DATE CUR-DATE DATE- \
+DATE-INTERVAL DELAY DIAL DIR-CREATE DIR-DELETE DIR-EMPTY DIR-SIZE Day@ \
+Domain ERR-MSG EXIST FILE-ACCESS-DATE FILE-APPEND FILE-COPY FILE-CREATE \
+FILE-CREATION-DATE FILE-CROP FILE-DATE FILE-DELETE FILE-EMPTY FILE-EXIST \
+FILE-MOVE FILE-RENAME FILE-SIZE FILE-WRITE FILE-WRITE-DATE FOR-CHILD-WINDOWS \
+FOR-FILES FOR-WINDOWS FREE-SPACE GET-CUR-TIME GET-REG GET-VER GetTickCount \
+HANGUP HIDE-ICON HINT HINT-OFF HINT-POS HINT-SIZE HINTW HOST-EXIST Hour@ \
+IDLE INTERVAL IS-ARCHIVE IS-DIR IS-HIDDEN IS-READONLY IS-SYSTEM KILL LAUNCH \
+LOG LOGGEDON LOGOFF LogonBatch LogonInteractive LogonNetwork MOUSE-LBCLK \
+MOUSE-LBDCLK MOUSE-LBDN MOUSE-LBUP MOUSE-MOVE MOUSE-MOVER MOUSE-MOVEW \
+MOUSE-RBCLK MOUSE-RBDCLK MOUSE-RBDN MOUSE-RBUP MSG Min@ Mon@ \
+MonitorResponseTime NHOST-EXIST No ONLINE PAUSE PLAY-SOUND PLAY-SOUNDW \
+POP3-CHECK POWEROFF PROC-EXIST PROC-TIME PURGE-OLD PURGE-OLDA PURGE-OLDW \
+Password QSTART-APP QSTART-APPW QUERY QUIT RASDomain RASError RASPassword \
+RASPhone RASSecPassword RASUser RE-ALL RE-MATCH REBOOT REG-DELETE-KEY \
+REG-DELETE-VALUE REG-DWORD REG-SZ REMINDER RUN SEND-KEYS SEND-KEYS-DELAY \
+SHOW-ICON SHUTDOWN START-APP START-APPW START-QUIT START-TIME Sec@ \
+SecPassword THINT THINTW TimeSec@ TMSG TQUERY User WDay@ WIN-ACTIVATE \
+WIN-ACTIVE WIN-CLICK WIN-CLOSE WIN-EXIST WIN-HIDE WIN-HWND WIN-MAXIMIZE \
+WIN-MINIMIZE WIN-MOVE WIN-MOVER WIN-RESTORE WIN-SEND-KEYS WIN-SHOW \
+WIN-TERMINATE WIN-TOPMOST WIN-VER WIN-WAIT WINAPI WRITE-DATE WatchClipboard \
+WatchConnect WatchDir WatchDisconnect WatchDriveInsert WatchDriveRemove \
+WatchFile WatchProc WatchProcStop WatchWinActivate WatchWinCreate \
+WatchWinDestroy WatchWindow WinNT Year@ Yes
+
+keywords3.$(file.patterns.nncron)=\
+ALL AboveNormalPriority AsService BelowNormalPriority FILESONLY \
+HighPriority IdlePriority LoadProfile NoActive NoDel NoLog NoRunAs \
+NormalPriority OnceADay OnceAHour OnceAMonth OnceAWeek RECURSIVE \
+RealtimePriority RunOnce SWHide ShowMaximized ShowMinimized ShowNoActivate \
+ShowNormal StartIn StartPos StartSize TODEPTH WATCH-CHANGE-ATTRIBUTES \
+WATCH-CHANGE-DIR-NAME WATCH-CHANGE-FILE-NAME WATCH-CHANGE-LAST-WRITE \
+WATCH-CHANGE-SECURITY WATCH-CHANGE-SIZE WaitFor WatchSubtree WithoutProfile
+
+style.nncrontab.0=
+style.nncrontab.1=fore:#007F00,$(font.comment)
+style.nncrontab.2=$(colour.string),back:#606060,fore:#FFFF00
+style.nncrontab.3=fore:#00007F,bold
+style.nncrontab.4=fore:#000000,bold
+style.nncrontab.5=fore:#00007F,italics
+style.nncrontab.6=fore:#000000,bold,back:#FFE0FF
+style.nncrontab.7=fore:#007F7F
+style.nncrontab.8=fore:#7F007F,$(font.monospace)
+style.nncrontab.9=back:#FFFFE0
+style.nncrontab.10=back:#FF0000
+
+module nsis
+
+filter.nsis=NSIS (nsi nsh)|*.nsi;*.nsh|
+*filter.nsis=$(filter.nsis)
+file.patterns.nsis=*.nsi;*.nsh
+lexer.$(file.patterns.nsis)=nsis
+*language.nsis=NSIS|nsis||
+
+nsis.uservars=1
+
+keywords.$(file.patterns.nsis)=!addincludedir !addplugindir MakeNSIS Portions \
+Contributors: Abort AddBrandingImage AddSize AutoCloseWindow BGFont \
+BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI \
+ClearErrors ComponentText GetDLLVersion GetDLLVersionLocal GetFileTime \
+GetFileTimeLocal CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut \
+SetDatablockOptimize DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue \
+Delete DetailPrint DirText DirShow DirVar DirVerify GetInstDirError AllowRootDirInstall \
+CheckBitmap EnableWindow EnumRegKey EnumRegValue Exch Exec ExecWait \
+ExecShell ExpandEnvStrings FindWindow FindClose FindFirst FindNext File FileBufSize \
+FlushINI ReserveFile FileClose FileErrorText FileOpen FileRead FileWrite FileReadByte \
+FileWriteByte FileSeek Function FunctionEnd GetDlgItem GetFullPathName \
+GetTempFileName HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent \
+InstallDirRegKey InstallColors InstallDir InstProgressFlags InstType IntOp IntCmp \
+IntCmpU IntFmt IsWindow Goto LangString LangStringUP LicenseData \
+LicenseForceSelection LicenseLangString LicenseText LicenseBkColor \
+LoadLanguageFile LogSet LogText MessageBox Nop Name OutFile Page \
+PageCallbacks PageEx PageExEnd Pop Push Quit ReadINIStr ReadRegDWORD \
+ReadRegStr ReadEnvStr Reboot RegDLL Rename Return RMDir Section SectionEnd \
+SectionIn SubSection SectionGroup SubSectionEnd SectionGroupEnd SearchPath \
+SectionSetFlags SectionGetFlags SectionSetInstTypes SectionGetInstTypes \
+SectionGetText SectionSetText SectionGetSize SectionSetSize GetCurInstType \
+SetCurInstType InstTypeSetText InstTypeGetText SendMessage SetAutoClose \
+SetCtlColors SetBrandingImage SetCompress SetCompressor SetCompressorDictSize \
+SetCompressionLevel SetDateSave SetDetailsView SetDetailsPrint SetErrors \
+SetErrorLevel GetErrorLevel SetFileAttributes SetFont SetOutPath SetOverwrite \
+SetPluginUnload SetRebootFlag SetShellVarContext SetSilent ShowInstDetails \
+ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep StrCmp StrCpy \
+StrLen SubCaption UninstallExeName UninstallCaption UninstallIcon UninstPage \
+UninstallText UninstallSubCaption UnRegDLL WindowIcon WriteINIStr WriteRegBin \
+WriteRegDWORD WriteRegStr WriteRegExpandStr WriteUninstaller XPStyle !packhdr \
+!system !execute !AddIncludeDir !include !cd !ifdef !ifndef !endif !define !undef !else !echo !warning \
+!error !verbose !macro !macroend !insertmacro !ifmacrodef !ifmacrondef MiscButtonText \
+DetailsButtonText UninstallButtonText InstallButtonText SpaceTexts \
+CompletedText GetFunctionAddress GetLabelAddress GetCurrentAddress \
+!AddPluginDir InitPluginsDir AllowSkipFiles Var VIAddVersionKey VIProductVersion LockWindow
+
+
+keywords2.$(file.patterns.nsis)=$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 \
+$R0 $R1 $R2 $R3 $R4 $R5 $R6 $R7 $R8 $R9 $\t $\" $\' $\` \
+$VARNAME $0, $INSTDIR $OUTDIR $CMDLINE $LANGUAGE $PROGRAMFILES \
+$COMMONFILES $DESKTOP $EXEDIR ${NSISDIR} $WINDIR $SYSDIR $TEMP \
+$STARTMENU $SMPROGRAMS $SMSTARTUP $QUICKLAUNCH $DOCUMENTS \
+$SENDTO $RECENT $FAVORITES $MUSIC $PICTURES $VIDEOS $NETHOOD \
+$FONTS $TEMPLATES $APPDATA $PRINTHOOD $INTERNET_CACHE $COOKIES \
+$HISTORY $PROFILE $ADMINTOOLS $RESOURCES $RESOURCES_LOCALIZED \
+$CDBURN_AREA $HWNDPARENT $PLUGINSDIR $$ $\r $\n
+
+keywords3.$(file.patterns.nsis)=ARCHIVE FILE_ATTRIBUTE_ARCHIVE FILE_ATTRIBUTE_HIDDEN \
+FILE_ATTRIBUTE_NORMAL FILE_ATTRIBUTE_OFFLINE FILE_ATTRIBUTE_READONLY \
+FILE_ATTRIBUTE_SYSTEM FILE_ATTRIBUTE_TEMPORARY HIDDEN HKCC HKCR HKCU \
+HKDD HKEY_CLASSES_ROOT HKEY_CURRENT_CONFIG HKEY_CURRENT_USER HKEY_DYN_DATA \
+HKEY_LOCAL_MACHINE HKEY_PERFORMANCE_DATA HKEY_USERS HKLM HKPD HKU IDABORT \
+IDCANCEL IDIGNORE IDNO IDOK IDRETRY IDYES MB_ABORTRETRYIGNORE MB_DEFBUTTON1 \
+MB_DEFBUTTON2 MB_DEFBUTTON3 MB_DEFBUTTON4 MB_ICONEXCLAMATION \
+MB_ICONINFORMATION MB_ICONQUESTION MB_ICONSTOP MB_OK MB_OKCANCEL \
+MB_RETRYCANCEL MB_RIGHT MB_SETFOREGROUND MB_TOPMOST MB_YESNO \
+MB_YESNOCANCEL NORMAL OFFLINE READONLY SW_SHOWMAXIMIZED SW_SHOWMINIMIZED \
+SW_SHOWNORMAL SYSTEM TEMPORARY auto colored false force hide ifnewer nevershow \
+normal off on show silent silentlog smooth true try lzma zlib bzip2 none listonly textonly \
+both top left bottom right license components directory instfiles uninstConfirm custom \
+all leave current ifdiff lastused LEFT RIGHT CENTER dlg_id ALT CONTROL EXT SHIFT \
+open print manual alwaysoff
+
+
+style.nsis.0=fore:#000000,$(font.base)
+style.nsis.1=fore:#007F00,$(font.comment)
+style.nsis.2=fore:#999999,back:#EEEEEE
+style.nsis.3=fore:#999999,back:#EEEEEE
+style.nsis.4=fore:#999999,back:#EEEEEE
+style.nsis.5=fore:#00007F,bold
+style.nsis.6=fore:#CC3300
+style.nsis.7=fore:#FF9900
+style.nsis.8=fore:#000000
+style.nsis.9=fore:#00007F,bold
+style.nsis.10=fore:#00007F,bold
+style.nsis.11=fore:#00007F,bold
+style.nsis.12=fore:#00007F,bold
+style.nsis.13=fore:#CC3300,back:#EEEEEE
+style.nsis.14=fore:#007F7F
+style.nsis.15=fore:#00007F,bold
+style.nsis.16=fore:#00007F,bold
+style.nsis.17=fore:#00007F,bold
+style.nsis.18=fore:#007F00,$(font.comment),bold
+
+
+command.compile.$(file.patterns.nsis)=c:/program files/nsis/makensis.exe "$(FilePath)"
+command.build.$(file.patterns.nsis)=c:/program files/nsis/makensis.exe "$(FilePath)"
+
+command.go.$(file.patterns.nsis)=$(FileName).exe
+
+command.help.$(file.patterns.nsis)=$(CurrentWord)!C:\Program files\NSIS\NSIS.chm
+command.help.subsystem.$(file.patterns.nsis)=4
+
+comment.block.nsis=;
+comment.block.at.line.start.nsis=1
+comment.stream.start.nsis=/*
+comment.stream.end.nsis=*/
+comment.box.start.nsis=/*
+comment.box.middle.nsis=;
+comment.box.end.nsis=*/
+
+module opal
+
+filter.opal=OPAL (impl sign)|*.impl;*.sign|
+
+*filter.opal=$(filter.opal)
+
+file.patterns.opal=*.impl;*.sign
+lexer.$(file.patterns.opal)=opal
+*language.opal=Opal|impl||
+
+keywordclass.opal_keywords=ALL AND ANDIF ANY AS ASSERT AXM COMPLETELY DATA DEF DERIVE \
+DFD DISCRIMINATORS ELSE EX EXTERNAL FI FIX FUN IF IMPLEMENTATION IMPLIES IMPORT \
+IN INHERIT INJECTIONS INTERFACE INTERNAL LAW LAZY LEFTASSOC LET MODULE NOT ONLY \
+OR ORIF OTHERWISE POST PRE PRED PRIORITY PROPERTIES REALIZES REQUIRE RIGHTASSOC \
+SELECTORS SIGNATURE SORT SPC SPEC SPECIFICATION STRUCTURE THE THEN THEORY THM \
+TYPE UNIQ WHERE
+
+keywordclass.opal_sorts=aEntry agent align anchor ans arg arg1 arg2 array \
+arrowWhere bag bitmap bool bstree byte callback canvasEditor capStyle channel \
+char childstat codom codomFrom codomTo color colorModel com composeOp config \
+configCom cursor dArray data data1 data11 data2 data21 data3 data31 data4 \
+data41 dataFrom dataTo defaultPrio denotation device dist distOut dom domFrom \
+domTo drawing dyn emitter env event eventInfo file filemode filestat filetype \
+first first1 first2 first3 fission fmt font from from1 from2 funct group groupid \
+heap iconfig image in inData index inode input int inter interdom interpreter \
+iseq items joinStyle justifyHow long manager managerRequest map mapEntry mark \
+mid modifier nat natMap OBJECT option orient out outData output packOp pair \
+parser permission point positionRequest process procstat quad range real \
+regulator rel relief res res1 res2 result role sap script scroller scrollView \
+scrollWindow searchOpt second seekMode selector semaphor seq seqEntry set \
+setEntry short sigaction sighandler sigmask signal size sizeRequest some \
+sreal state stateId stateRequest string subrel tag textEditor time to tree \
+triple union user userid version view void wconfig wconfigCom wday widget \
+window wrapStyle
+
+keywords.$(file.patterns.opal)=$(keywordclass.opal_keywords)
+keywords2.$(file.patterns.opal)=$(keywordclass.opal_sorts)
+
+
+style.opal.0=fore:#000000,$(font.opal)
+style.opal.1=fore:#007F00,italics,$(font.comment)
+style.opal.2=fore:#007F00,italics,$(font.comment)
+style.opal.3=fore:#007F7F
+style.opal.4=fore:#00007F,bold
+style.opal.5=fore:#007F7F
+style.opal.6=fore:#7F007F,italics,$(font.comment)
+style.opal.7=fore:#000000
+style.opal.8=fore:#A00000
+
+style.opal.32=fore:#000000
+style.opal.34=fore:#FF0000,back:#FFFF00,bold
+style.opal.35=fore:#FF0000,back:#00FF00,bold
+
+module oscript
+
+
+file.patterns.oscript=*.osx
+filter.oscript=OScript (osx)|$(file.patterns.oscript)|
+*filter.oscript=$(filter.oscript)
+lexer.$(file.patterns.oscript)=oscript
+
+
+word.chars.oscript=$(chars.alpha)$(chars.numeric)_$
+word.characters.$(file.patterns.oscript)=$(word.chars.oscript)
+
+comment.block.oscript=//~
+comment.stream.start.oscript=/*
+comment.stream.end.oscript=*/
+comment.box.start.oscript=/*
+comment.box.middle.oscript= *
+comment.box.end.oscript= */
+
+statement.indent.$(file.patterns.oscript)=6 case default else for if \
+repeat switch while
+statement.lookback.$(file.patterns.oscript)=20
+statement.end.$(file.patterns.oscript)=10 ;
+block.start.$(file.patterns.oscript)=10 if
+block.end.$(file.patterns.oscript)=10 end
+indent.maintain.$(file.patterns.oscript)=1
+indent.size.$(file.patterns.oscript)=4
+use.tabs.$(file.patterns.oscript)=1
+tab.size.$(file.patterns.oscript)=4
+
+preprocessor.symbol.$(file.patterns.oscript)=#
+preprocessor.start.$(file.patterns.oscript)=ifdef ifndef
+preprocessor.middle.$(file.patterns.oscript)=else
+preprocessor.end.$(file.patterns.oscript)=endif
+
+
+api.$(file.patterns.oscript)=$(SciteDefaultHome)\api\oscript.api
+autocomplete.oscript.ignorecase=1
+calltip.oscript.ignorecase=1
+calltip.oscript.use.escapes=1
+calltip.oscript.word.characters=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$.
+
+
+keywordclass.type=\
+assoc boolean bytes date dynamic error extern file integer list long object \
+point real recarray record script string
+
+keywordclass.operator=\
+and eq ge gt le lt ne not or xor
+
+keywordclass.oscript.control=\
+break breakif by case continue continueif default downto else elseif end for \
+goto if in repeat switch to until while
+
+keywordclass.function=\
+function return void
+
+keywordclass.miscellaneous=\
+dll inbyref inout linked nodebug super this xcmd xfcn
+
+keywordclass.constant=\
+false true undefined
+
+keywordclass.coreconstant=\
+booleantype bytestype datatype dynamictype errortype externtype integertype \
+listtype longtype objecttype objreftype pointtype realtype scripttype \
+stringtype undefinedtype voidtype
+
+keywordclass.corefunction=\
+datatypename echo echodebug echoerror echoinfo echostamp echowarn \
+getfeatures isdefined iserror isfeature isinvokable isnoterror isnotset \
+isobject isset isundefined length nparameters parameters pointh pointv type
+
+keywordclass.builtintype=\
+cachetree capiconnect capierr capilog capilogin compiler dapisession \
+dapinode dapiversion dapistream filecopy fileprefs frame javaobject \
+mailmessage pop3session smtpsession ssloptions patfind patchange regex \
+socket sqlconnection sqlcursor uapisession uapiuser wapisession wapimap \
+wapimaptask wapiwork wapisubwork domattr domcdatasection domcharacterdata \
+domcomment domdocument domdocumentfragment domdocumenttype domelement \
+domentity domentityreference domimplementation domnamednodemap domnode \
+domnodelist domnotation domparser domprocessinginstruction domtext saxparser \
+xslprocessor
+
+keywordclass.builtinobject=\
+capi dapi env global language logging math memcached otds pattern security \
+sql str system uapi vis wapi web zip
+
+keywordclass.weblingo=\
+call html oscript
+
+
+keywords.$(file.patterns.oscript)=$(keywordclass.oscript.control) \
+$(keywordclass.function) $(keywordclass.miscellaneous)
+
+keywords2.$(file.patterns.oscript)=$(keywordclass.constant) \
+$(keywordclass.coreconstant)
+
+keywords3.$(file.patterns.oscript)=$(keywordclass.operator)
+
+keywords4.$(file.patterns.oscript)=$(keywordclass.type) \
+$(keywordclass.builtintype)
+
+keywords5.$(file.patterns.oscript)=$(keywordclass.corefunction)
+
+keywords6.$(file.patterns.oscript)=$(keywordclass.builtinobject)
+
+
+style.oscript.0=
+style.oscript.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.oscript.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.oscript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.oscript.4=$(colour.preproc)
+style.oscript.5=$(colour.number)
+style.oscript.6=$(colour.string)
+style.oscript.7=$(colour.string)
+style.oscript.8=fore:#FF7F3F
+style.oscript.9=
+style.oscript.10=fore:#7F007F
+style.oscript.11=$(colour.keyword),bold
+style.oscript.12=$(colour.operator),bold
+style.oscript.13=fore:#FF00FF
+style.oscript.14=fore:#00007F
+style.oscript.15=fore:#0000FF
+style.oscript.16=fore:#007F7F
+style.oscript.17=
+style.oscript.18=
+
+braces.oscript.style=12
+
+
+if PLAT_WIN
+	command.help.$(file.patterns.oscript)=$(CurrentWord)!C:\LL971\builder\documentation.chm
+	command.help.subsystem.$(file.patterns.oscript)=4
+
+module others
+
+file.patterns.props=*.properties;*.session;*.ini;*.inf;*.url;*.cfg;*.cnf;*.aut
+file.patterns.text=*.txt;*.log;*.lst;*.doc;*.diz;*.nfo
+file.patterns.batch=*.bat;*.cmd;*.nt
+file.patterns.diff=*.diff;*.patch
+file.patterns.make=makefile;Makefile;*.mak;configure
+file.patterns.indent=*.indent
+
+*source.patterns.props=$(file.patterns.props);
+*source.patterns.batch=$(file.patterns.batch);
+*source.patterns.diff=$(file.patterns.diff);
+*source.patterns.make=$(file.patterns.make);*.iface;
+
+filter.properties=Properties (ini inf reg url cfg cnf)|$(file.patterns.props)|
+filter.text=Text (txt log lst doc diz nfo)|$(file.patterns.text);make*|
+filter.batch=Batch (bat cmd nt)|$(file.patterns.batch)|
+filter.diff=Difference (diff patch)|$(file.patterns.diff)|
+
+*filter.properties=$(filter.properties)
+*filter.text=$(filter.text)
+
+lexer.$(file.patterns.props)=props
+lexer.$(file.patterns.batch)=batch
+lexer.*.err=errorlist
+lexer.$(file.patterns.make)=makefile
+lexer.*.iface=makefile
+lexer.$(file.patterns.diff)=diff
+lexer.$(file.patterns.indent)=indent
+
+*language.batch=&Batch|bat||
+*language.difference=&Difference|diff||
+*language.errorlist=&Errorlist|err||
+*language.properties=&Properties|properties||
+*language.makefile=&Makefile|mak|$(keyMake)|
+*language._text=Text|txt|$(keyText)|
+*language.indent=Indent|indent|$(keyIndent)|
+
+word.characters.$(file.patterns.text)=$(chars.alpha)$(chars.numeric)$(chars.accented)-'
+
+colour.other.operator=fore:#B06000
+
+
+style.props.0=
+style.props.1=fore:#007F7F,$(font.comment)
+style.props.2=$(colour.string),back:#E0F0F0,eolfilled
+style.props.3=$(colour.other.operator)
+style.props.4=$(colour.preproc)
+style.props.5=
+style.props.34=fore:#0000FF,notbold
+style.props.35=fore:#FF0000,notbold
+comment.block.props=#~
+preprocessor.symbol.$(file.patterns.make)=!
+preprocessor.start.$(file.patterns.make)=IF IFDEF IFNDEF
+preprocessor.middle.$(file.patterns.make)=ELSE ELSEIF ELSEIFDEF ELSEIFNDEF
+preprocessor.end.$(file.patterns.make)=ENDIF
+
+
+keywordclass.batch=\
+assoc aux break call cd chcp chdir choice cls cmdextversion \
+color com1 com2 com3 com4 con copy ctty date defined \
+del dir do dpath echo else endlocal erase errorlevel exist \
+exit for ftype goto if in lpt1 lpt2 lpt3 lpt4 md mkdir move \
+not nul path pause popd prompt prn pushd rd rem ren \
+rename rmdir set setlocal shift start time title type ver \
+verify vol
+keywords.$(file.patterns.batch)=$(keywordclass.batch)
+
+
+style.batch.0=fore:#000000
+style.batch.1=fore:#007F00,$(font.comment)
+style.batch.2=$(colour.keyword),bold
+style.batch.3=$(colour.string),back:#606060,fore:#FFFF00,eolfilled
+style.batch.4=$(colour.preproc)
+style.batch.5=fore:#007090,$(font.monospace),bold
+style.batch.6=fore:#800080
+style.batch.7=fore:#000000
+
+comment.block.batch=REM ~
+
+
+style.makefile.0=fore:#000000
+style.makefile.1=$(colour.other.comment),$(font.code.comment.box)
+style.makefile.2=$(colour.preproc)
+style.makefile.3=fore:#000080
+style.makefile.4=$(colour.other.operator)
+style.makefile.5=fore:#A00000
+style.makefile.9=$(colour.error),eolfilled
+style.makefile.34=fore:#0000FF,notbold
+style.makefile.35=fore:#FF0000,notbold
+
+comment.block.makefile=#~
+
+
+style.errorlist.32=fore:#B06000,$(font.small)
+style.errorlist.0=fore:#000000
+style.errorlist.1=fore:#FF0000
+style.errorlist.2=fore:#800080
+style.errorlist.3=fore:#808000
+style.errorlist.4=fore:#0000FF
+style.errorlist.5=fore:#B06000
+style.errorlist.6=fore:#FF0000
+style.errorlist.7=fore:#FF0000
+style.errorlist.8=fore:#FF0000
+style.errorlist.9=fore:#FF00FF
+style.errorlist.10=fore:#007F00
+style.errorlist.11=fore:#00007F
+style.errorlist.12=fore:#007F7F
+style.errorlist.13=fore:#7F0000
+style.errorlist.14=fore:#FF0000
+style.errorlist.15=fore:#FF0000
+style.errorlist.16=fore:#FF0000
+style.errorlist.17=fore:#FF0000
+style.errorlist.18=fore:#FF0000
+style.errorlist.19=fore:#FF0000
+style.errorlist.20=fore:#FF0000
+style.errorlist.21=fore:#000000
+style.errorlist.22=fore:#800080
+style.errorlist.25=fore:#CF008F,$(font.monospace.small)
+style.errorlist.23=fore:#000000,notvisible,back:#FFFFFF,$(error.background)
+style.errorlist.24=back:#FFE0A0
+style.errorlist.33=$(font.small)
+style.errorlist.40=fore:#000000
+style.errorlist.41=fore:#800000,$(error.background)
+style.errorlist.42=fore:#008000,$(error.background)
+style.errorlist.43=fore:#808000,$(error.background)
+style.errorlist.44=fore:#000080,$(error.background)
+style.errorlist.45=fore:#800080,$(error.background)
+style.errorlist.46=fore:#008080,$(error.background)
+style.errorlist.47=fore:#A0A0A0,$(error.background)
+style.errorlist.48=fore:#000000,bold,$(error.background)
+style.errorlist.49=fore:#800000,bold,$(error.background)
+style.errorlist.50=fore:#008000,bold,$(error.background)
+style.errorlist.51=fore:#808000,bold,$(error.background)
+style.errorlist.52=fore:#000080,bold,$(error.background)
+style.errorlist.53=fore:#800080,bold,$(error.background)
+style.errorlist.54=fore:#008080,bold,$(error.background)
+style.errorlist.55=fore:#A0A0A0,bold,$(error.background)
+
+error.background=back:#FFF7E7,eolfilled
+
+lexer.errorlist.value.separate=1
+
+
+style.diff.0=fore:#000000
+style.diff.1=fore:#007F00
+style.diff.2=fore:#7F7F00
+style.diff.3=fore:#7F0000
+style.diff.4=fore:#7F007F
+style.diff.5=fore:#007F7F
+style.diff.6=fore:#00007F
+style.diff.7=fore:#7F7F7F
+style.diff.8=fore:#00007F,back:#F0FAFF,eolfilled
+style.diff.9=fore:#007F7F,back:#F0FAFF,eolfilled
+style.diff.10=fore:#00007F,back:#FFFAF0,eolfilled
+style.diff.11=fore:#007F7F,back:#FFFAF0,eolfilled
+
+command.build.makefile=make
+command.build.*.mak=make
+
+if PLAT_WIN
+	command.help.*.properties="file://$(SciteDefaultHome)/SciTEDoc.html#property-$(CurrentSelection)"
+	command.help.subsystem.*.properties=2
+if PLAT_GTK
+	command.help.*.properties=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html#property-$(CurrentSelection)"
+
+if PLAT_WIN
+	command.go.*.bat="$(FileNameExt)"
+	command.name.0.*.bat=Execute Selection
+	command.0.*.bat=$(CurrentSelection)
+	command.name.1.*.mak=nmake
+	command.1.*.mak=nmake -f $(FileNameExt)
+
+module pascal
+
+filter.pascal=Pascal (dpr dpk pas dfm inc pp)|*.dpr;*.dpk;*.pas;*.dfm;*.inc;*.pp|
+
+*filter.pascal=$(filter.pascal)
+
+file.patterns.pascal=*.dpr;*.pas;*.dfm;*.inc;*.pp
+file.patterns.pascal.package=*.dpk
+file.patterns.pascal.all=$(file.patterns.pascal);$(file.patterns.pascal.package)
+lexer.$(file.patterns.pascal.all)=pascal
+*language.pascal=Pascal|pas||
+
+keywordclass.pascal=absolute abstract and array as asm assembler automated begin case \
+cdecl class const constructor delayed deprecated destructor dispid dispinterface \
+div do downto dynamic else end except experimental export exports external far \
+file final finalization finally for forward function goto helper if \
+implementation in inherited initialization inline interface is label library \
+message mod near nil not object of on operator or out overload override packed \
+pascal platform private procedure program property protected public published \
+raise record reference register reintroduce repeat resourcestring safecall \
+sealed set shl shr static stdcall strict string then threadvar to try type unit \
+unsafe until uses var varargs virtual while winapi with xor
+
+keywordclass.pascal.smart=add default implements index name nodefault read readonly \
+remove stored write writeonly
+
+keywordclass.pascal.package=package contains requires
+
+keywords.$(file.patterns.pascal)=$(keywordclass.pascal) $(keywordclass.pascal.smart)
+keywords.$(file.patterns.pascal.package)=$(keywordclass.pascal) $(keywordclass.pascal.smart) $(keywordclass.pascal.package)
+
+lexer.pascal.smart.highlighting=1
+
+
+style.pascal.32=$(font.base)
+style.pascal.0=fore:#808080
+style.pascal.1=
+style.pascal.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.pascal.3=$(colour.code.comment.box),$(font.code.comment.box)
+style.pascal.4=$(colour.code.comment.line),$(font.code.comment.line)
+style.pascal.5=$(colour.preproc)
+style.pascal.6=$(colour.preproc)
+style.pascal.7=$(colour.number)
+style.pascal.8=$(colour.number)
+style.pascal.9=$(colour.keyword),bold
+style.pascal.10=$(colour.string)
+style.pascal.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.pascal.12=$(colour.char)
+style.pascal.13=$(colour.operator),bold
+style.pascal.14=fore:#804080
+
+braces.pascal.style=13
+
+comment.block.pascal=//~
+comment.stream.start.pascal={
+comment.stream.end.pascal=}
+comment.box.start.pascal=(*
+comment.box.middle.pascal= *
+comment.box.end.pascal= *)
+
+statement.indent.$(file.patterns.pascal)=9 case class do else for then \
+private protected public published repeat try while type
+statement.end.$(file.patterns.pascal)=13 ;
+statement.lookback.$(file.patterns.pascal)=20
+block.start.$(file.patterns.pascal)=9 begin
+block.end.$(file.patterns.pascal)=9 end
+
+
+
+command.compile.*.pas=fpc "$(FilePath)"
+
+if PLAT_WIN
+	command.go.*.pas="$(FileName).exe"
+	command.go.subsystem.*.pas=2
+if PLAT_GTK
+	command.go.*.pas="kvt -e $(FileName)"
+
+command.build.*.pas=fpc -B "$(FilePath)"
+command.build.subsystem.*.pas=1
+
+command.name.0.*.pas=Debug Compile
+command.0.*.pas=fpc -g "$(FilePath)"
+command.name.1.*.pas=Debug Build
+command.1.*.pas=fpc -g -B "$(FilePath)"
+command.name.2.*.pas=GDB
+if PLAT_WIN
+	command.2.*.pas=gdbpasw "$(FileName)"
+if PLAT_GTK
+	command.2.*.pas=gdb "$(FileName)"
+	command.name.3.*.pas=DDD
+	command.3.*.pas=ddd "$(FileName)"
+
+
+module perl
+
+file.patterns.perl=*.pl;*.pm;*.pod
+file.patterns.bash=*.sh;*.bsh;configure;*.ksh
+file.patterns.awk=*.awk
+
+*source.patterns.perl=$(file.patterns.perl);
+*source.patterns.bash=$(file.patterns.bash);
+
+shbang.perl=pl
+shbang.sh=sh
+shbang.bash=sh
+
+shbang.gawk=awk
+shbang.nawk=awk
+shbang.mawk=awk
+
+filter.perl=Perl (pl pm)|$(file.patterns.perl)|
+filter.bash=Bash (sh bsh)|$(file.patterns.bash)|
+filter.awk=GAWK  (awk)|$(file.patterns.awk)|
+
+*filter.perl=$(filter.perl)
+*filter.bash=$(filter.bash)
+
+*language.perl=Pe&rl|pl||
+*language.shell=Shell|sh||
+
+lexer.$(file.patterns.perl)=perl
+lexer.$(file.patterns.bash)=bash
+lexer.$(file.patterns.awk)=perl
+
+keywords.$(file.patterns.perl)=\
+NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD \
+BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept \
+alarm and atan2 bind binmode bless caller chdir chmod chomp chop \
+chown chr chroot close closedir cmp connect continue cos crypt \
+dbmclose dbmopen defined delete die do dump each else elsif endgrent \
+endhostent endnetent endprotoent endpwent endservent eof eq eval \
+exec exists exit exp fcntl fileno flock for foreach fork format \
+formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname \
+gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername \
+getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent \
+getpwent getpwnam getpwuid getservbyname getservbyport getservent \
+getsockname getsockopt glob gmtime goto grep gt hex if index \
+int ioctl join keys kill last lc lcfirst le length link listen \
+local localtime lock log lstat lt map mkdir msgctl msgget msgrcv \
+msgsnd my ne next no not oct open opendir or ord our pack package \
+pipe pop pos print printf prototype push quotemeta qu \
+rand read readdir readline readlink readpipe recv redo \
+ref rename require reset return reverse rewinddir rindex rmdir \
+scalar seek seekdir select semctl semget semop send setgrent \
+sethostent setnetent setpgrp setpriority setprotoent setpwent \
+setservent setsockopt shift shmctl shmget shmread shmwrite shutdown \
+sin sleep socket socketpair sort splice split sprintf sqrt srand \
+stat study sub substr symlink syscall sysopen sysread sysseek \
+system syswrite tell telldir tie tied time times truncate \
+uc ucfirst umask undef unless unlink unpack unshift untie until \
+use utime values vec wait waitpid wantarray warn while write \
+xor \
+given when default break say state UNITCHECK __SUB__ fc
+
+keywords.$(file.patterns.awk)=\
+BEGIN END \
+if else while do for in break continue delete exit function return \
+print printf sprintf \
+system close getline next nextfile fflush \
+atan2 cos exp int log rand sin sqrt srand \
+asort asorti gensub sub gsub index length match split \
+strtonum substr tolower toupper \
+mktime strftime systime \
+and compl lshift or rshift xor \
+bindtextdomain dcgettext dcngettext \
+ARGC ARGIND ARGV BINMODE CONVFMT ENVIRON ERRNO FIELDWIDTHS \
+FILENAME FNR FS IGNORECASE LINT NF NR OFMT OFS ORS PROCINFO \
+RS RT RSTART RLENGTH SUBSEP TEXTDOMAIN
+
+
+comment.block.awk=#~
+block.start.$(file.patterns.awk)=10 {
+block.end.$(file.patterns.awk)=10 }
+
+
+word.characters.$(file.patterns.perl)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.perl=#~
+block.start.$(file.patterns.perl)=10 {
+block.end.$(file.patterns.perl)=10 }
+
+colour.perl.heredoc=$(colour.embedded.comment)
+
+
+bash_keywords1=alias \
+ar asa awk banner basename bash bc bdiff break \
+bunzip2 bzip2 cal calendar case cat cc cd chmod cksum \
+clear cmp col comm compress continue cp cpio crypt \
+csplit ctags cut date dc dd declare deroff dev df diff diff3 \
+dircmp dirname dirs do done du echo ed egrep elif else env \
+esac eval ex exec exit expand export expr false fc \
+fgrep fi file find fmt fold for function functions \
+getconf getopt getopts grep gres hash head help \
+history iconv id if in integer jobs join kill local lc \
+let line ln logname look ls m4 mail mailx make \
+man mkdir more mt mv newgrp nl nm nohup ntps od \
+pack paste patch pathchk pax pcat perl pg popd pr print \
+printf ps pushd pwd read readonly red return rev rm rmdir \
+sed select set sh shift size sleep sort spell \
+split start stop strings strip stty sum suspend \
+sync tail tar tee test then time times touch tr \
+trap true tsort tty type typeset ulimit umask unalias \
+uname uncompress unexpand uniq unpack unset until \
+uudecode uuencode vi vim vpax wait wc whence which \
+while who wpaste wstart xargs zcat
+
+bash_keywords2=chgrp chown chroot dir dircolors \
+factor groups hostid install link md5sum mkfifo \
+mknod nice pinky printenv ptx readlink seq \
+sha1sum shred stat su tac unlink users vdir whoami yes
+
+keywords.$(file.patterns.bash)=$(bash_keywords1) $(bash_keywords2)
+
+word.characters.$(file.patterns.bash)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.bash=#~
+
+colour.bash.heredoc=$(colour.embedded.comment)
+
+style.perl.32=
+style.perl.0=fore:#808080,$(font.base)
+style.perl.1=$(colour.error)
+style.perl.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.perl.3=fore:#004000,back:#E0FFE0,$(font.text),eolfilled
+style.perl.4=$(colour.number)
+style.perl.5=$(colour.keyword),bold
+style.perl.6=$(colour.string),$(font.monospace)
+style.perl.7=$(colour.char),$(font.monospace)
+style.perl.8=$(colour.notused),$(font.notused)
+style.perl.9=$(colour.notused),$(font.notused)
+style.perl.10=$(colour.operator),bold
+style.perl.11=fore:#000000
+style.perl.12=fore:#000000,back:#FFE0E0
+style.perl.13=fore:#000000,back:#FFFFE0
+style.perl.14=fore:#000000,back:#FFE0FF
+style.perl.15=fore:#000000,back:#E0E0E0
+style.perl.16=back:#FF0000
+style.perl.17=fore:#000000,back:#A0FFA0
+style.perl.18=fore:#000000,back:#F0E080
+style.perl.19=fore:#FFFF00,back:#8080A0
+style.perl.20=$(style.perl.6),back:#90FFFF
+style.perl.21=fore:#600000,back:#FFF0D8,eolfilled
+style.perl.22=fore:#000000,back:#DDD0DD
+style.perl.23=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+style.perl.24=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+style.perl.25=fore:#7F007F,back:#DDD0DD,eolfilled,italics
+style.perl.26=fore:#7F007F,$(font.monospace),notbold
+style.perl.27=$(style.perl.6)
+style.perl.28=$(style.perl.20)
+style.perl.29=$(style.perl.17)
+style.perl.30=$(style.perl.13)
+style.perl.31=fore:#004000,back:#C0FFC0,$(font.monospace),eolfilled
+style.perl.40=$(style.perl.10),italics
+style.perl.41=fore:#C000C0,bold
+style.perl.42=fore:#C000C0,back:#FFF0FF,eolfilled
+style.perl.44=$(style.perl.18)
+
+style.perl.43=$(style.perl.6),fore:#D00000,bold
+style.perl.54=$(style.perl.17),fore:#D00000,bold
+style.perl.55=$(style.perl.18),fore:#D00000,bold
+style.perl.57=$(style.perl.20),fore:#D00000,bold
+style.perl.61=$(style.perl.24),fore:#D00000,bold
+style.perl.62=$(style.perl.61)
+style.perl.64=$(style.perl.43)
+style.perl.65=$(style.perl.57)
+style.perl.66=$(style.perl.54)
+
+braces.perl.style=10
+
+style.bash.32=
+style.bash.0=fore:#808080,$(font.base)
+style.bash.1=$(colour.error)
+style.bash.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.bash.3=$(colour.number)
+style.bash.4=$(colour.keyword),bold
+style.bash.5=$(colour.string),$(font.monospace)
+style.bash.6=$(colour.char),$(font.monospace)
+style.bash.7=$(colour.operator),bold
+style.bash.8=fore:#000000
+style.bash.9=fore:#000000,back:#FFE0E0
+style.bash.10=fore:#000000,back:#FFFFE0
+style.bash.11=fore:#FFFF00,back:#A08080
+style.bash.12=fore:#000000,back:#DDD0DD
+style.bash.13=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+braces.bash.style=7
+
+command.go.$(file.patterns.awk)=gawk -f $(FileNameExt)
+
+command.go.$(file.patterns.perl)=perl -w $(FileNameExt)
+
+command.compile.$(file.patterns.perl)=perl -c -w $(FileNameExt)
+command.name.0.$(file.patterns.perl)=Lint
+command.0.$(file.patterns.perl)=perl -MO=Lint,all $(FileNameExt)
+
+command.name.1.$(file.patterns.perl)=Check Syntax
+command.1.$(file.patterns.perl)=perl -cw $(FileNameExt)
+
+command.name.2.$(file.patterns.perl)=Code Profiler
+command.2.$(file.patterns.perl)=perl -d:DProf $(FileNameExt)
+
+command.name.3.$(file.patterns.perl)=Profiler Parser
+command.3.$(file.patterns.perl)=C:\Perl\bin\dprofpp.bat $(FileDir)\tmon.out
+
+command.go.$(file.patterns.bash)=bash $(FileNameExt)
+
+module pov
+
+file.patterns.pov=*.pov;*.inc
+
+filter.pov=POV-Ray SDL (pov)|$(file.patterns.pov)|
+
+*filter.pov=$(filter.pov)
+
+indent.size.*.pov=2
+tab.size.*.pov=2
+use.tabs.*.pov=0
+indent.size.*.inc=2
+tab.size.*.inc=2
+use.tabs.*.inc=0
+
+lexer.$(file.patterns.pov)=pov
+
+*language.povray=P&OV-Ray SDL|pov||
+
+word.chars.pov=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.pov)=$(word.chars.pov)
+
+api.*.pov=POV-Ray_SDL.api
+autocomplete.pov.start.characters=.
+calltip.pov.word.characters=.$(word.chars.pov)
+
+comment.block.at.line.start.pov=1
+comment.block.pov=//~
+comment.stream.start.pov=/*
+comment.stream.end.pov=*/
+comment.box.start.pov=/*
+comment.box.middle.pov= *
+comment.box.end.pov= */
+
+
+preprocessor.symbol.$(file.patterns.pov)=#
+preprocessor.start.$(file.patterns.pov)=if ifdef ifndef switch while macro
+preprocessor.middle.$(file.patterns.pov)=else
+preprocessor.end.$(file.patterns.pov)=end
+
+keywordclass.pov=declare local include undef fopen fclose read write default version \
+case range break debug error warning \
+if ifdef ifndef switch while macro else end
+
+keywords.$(file.patterns.pov)=$(keywordclass.pov)
+
+keywords2.$(file.patterns.pov)=camera light_source light_group \
+object blob sphere cylinder box cone height_field julia_fractal \
+lathe prism sphere_sweep superellipsoid sor text torus \
+bicubic_patch disc mesh mesh2 polygon triangle smooth_triangle \
+plane poly cubic quartic quadric isosurface parametric \
+union intersection difference merge function array spline \
+vertex_vectors normal_vectors uv_vectors face_indices normal_indices uv_indices \
+texture texture_list interior_texture \
+texture_map material_map image_map color_map colour_map pigment_map \
+normal_map slope_map bump_map density_map \
+pigment normal material interior finish reflection irid slope pigment_pattern image_pattern \
+warp media scattering density background fog sky_sphere rainbow \
+global_settings radiosity photons pattern \
+transform looks_like projected_through contained_by clipped_by bounded_by
+
+keywords3.$(file.patterns.pov)=linear_spline quadratic_spline cubic_spline natural_spline bezier_spline b_spline \
+read write append inverse open \
+perspective orthographic fisheye ultra_wide_angle omnimax panoramic \
+spherical spotlight jitter circular orient \
+media_attenuation media_interaction shadowless parallel \
+refraction collect pass_through global_lights hierarchy sturm smooth \
+gif tga iff pot png pgm ppm jpeg tiff sys ttf \
+quaternion hypercomplex linear_sweep conic_sweep \
+type all_intersections split_union cutaway_textures \
+no_shadow no_image no_reflection double_illuminate hollow \
+uv_mapping all use_index use_color use_colour no_bump_scale \
+conserve_energy fresnel \
+average agate boxed bozo bumps cells crackle cylindrical density_file dents \
+facets granite leopard marble onion planar quilted radial ripples spotted waves wood wrinkles \
+solid use_alpha interpolate magnet noise_generator toroidal \
+ramp_wave triangle_wave sine_wave scallop_wave cubic_wave poly_wave \
+once map_type method fog_type hf_gray_16 charset ascii utf8 \
+rotate scale translate matrix location right up direction sky \
+angle look_at aperture blur_samples focal_point confidence variance \
+radius falloff tightness point_at area_light adaptive fade_distance fade_power \
+threshold strength water_level tolerance max_iteration precision slice \
+u_steps v_steps flatness inside_vector \
+accuracy max_gradient evaluate max_trace precompute \
+target ior dispersion dispersion_samples caustics \
+color colour rgb rgbf rgbt rgbft red green blue filter transmit gray hf \
+fade_color fade_colour quick_color quick_colour \
+brick checker hexagon brick_size mortar bump_size \
+ambient diffuse brilliance crand phong phong_size metallic specular \
+roughness reflection_exponent exponent thickness \
+gradient spiral1 spiral2 agate_turb form metric \
+offset df3 coords size mandel exterior julia \
+control0 control1 altitude turbulence octaves omega lambda \
+repeat flip black-hole orientation dist_exp major_radius \
+frequency phase intervals samples ratio absorption emission aa_threshold aa_level \
+eccentricity extinction distance turb_depth fog_offset fog_alt width arc_angle falloff_angle \
+adc_bailout ambient_light assumed_gamma irid_wavelength number_of_waves \
+always_sample brigthness count error_bound gray_threshold load_file \
+low_error_factor max_sample minimum_reuse nearest_count \
+pretrace_end pretrace_start recursion_limit save_file \
+spacing gather max_trace_level autostop expand_thresholds
+
+keywords4.$(file.patterns.pov)=x y z t u v \
+yes no true false on off \
+clock clock_delta clock_on final_clock final_frame frame_number \
+image_height image_width initial_clock initial_frame pi version
+
+keywords5.$(file.patterns.pov)=abs acos acosh asc asin asinh atan atanh atan2 \
+ceil cos cosh defined degrees dimensions dimension_size div exp file_exists floor \
+inside int ln log max min mod pow prod radians rand seed select sin sinh sqrt strcmp \
+strlen sum tan tanh val vdot vlength min_extent max_extent trace vaxis_rotate \
+vcross vrotate vnormalize vturbulence chr concat str strlwr strupr substr vstr \
+sqr cube reciprocal pwr
+
+keywords6.$(file.patterns.pov)=
+
+keywords7.$(file.patterns.pov)=
+
+keywords8.$(file.patterns.pov)=
+
+
+style.pov.32=$(font.code.base)
+style.pov.0=fore:#FF0080
+style.pov.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.pov.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.pov.3=$(colour.number)
+style.pov.4=$(colour.operator)
+style.pov.5=
+style.pov.6=$(colour.string)
+style.pov.7=back:#E0C0E0,eolfilled,$(font.computer),bold
+style.pov.8=$(colour.preproc)
+style.pov.9=fore:#804020,$(font.code.comment.doc),italics
+style.pov.10=$(colour.keyword),back:#FFD0D0
+style.pov.11=$(colour.keyword),back:#FFFFD0
+style.pov.12=$(colour.keyword),bold
+style.pov.13=$(colour.keyword),back:#D0D0FF
+style.pov.14=$(colour.keyword),back:#D0FFD0
+style.pov.15=$(colour.keyword),back:#D0D0D0
+style.pov.16=$(colour.keyword),back:#E0E0E0
+braces.pov.style=4
+
+if PLAT_WIN
+	command.compile.*.pov=pvengine.exe $(FileName)
+	command.build.*.pov=
+	command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_GTK
+	command.compile.*.pov=povray +P $(FileName).pov
+	command.build.*.pov=
+	command.go.*.pov=povray +P $(FileName).pov
+
+if PLAT_WIN
+	command.help.$(file.patterns.pov)=$(CurrentWord)!D:\Programmes\UImages\POV-Ray 3.5\help\povray35.chm
+	command.help.subsystem.$(file.patterns.pov)=4
+
+module powerpro
+file.patterns.powerpro=*.powerpro
+
+filter.powerpro=PowerPro (powerpro)|$(file.patterns.powerpro)|
+*filter.powerpro=$(filter.powerpro)
+lexer.$(file.patterns.powerpro)=powerpro
+*language.powerpro=PowerPro|powerpro||
+
+keywordclass.control=\
+break do else elseif endfor endif for function global gt if ifelse \
+ifx jump local lt quit static
+
+keywords.$(file.patterns.powerpro)=$(keywordclass.control)
+
+keywordclass.plugins=\
+win.debug win.debugshow win.exists win.getdisplayrect win.getfocus win.gethandle win.getrect \
+win.getsystemmetrics win.gettext win.maximize win.minimize win.move win.sendkeys win.setdebug \
+win.setfocus win.setrect win.settext win.show
+
+keywordclass.functions=\
+bar case clip env exec fill flag floattostring format formattime ftos \
+index input inputcancel inputdefault inputdialog join length messagebox mouse \
+not note readline remove replace replacechars replaceg revindex select \
+stof validpath visiblewindow wait wait.activity wait.for wait.forinterval wait.message \
+wait.quit wait.ready wait.sleep wait.until wallpaper window window word
+
+keywords2.$(file.patterns.powerpro)=$(keywordclass.plugins)|$(keywordclass.functions)
+
+calltip.powerpro.word.characters=$(chars.alpha)$(chars.numeric)_
+comment.block.powerpro=//~
+comment.stream.start.powerpro=/*
+comment.stream.end.powerpro=*/
+comment.box.start.powerpro=/*
+comment.box.middle.powerpro= *
+comment.box.end.powerpro= */
+
+word.characters.*.powerpro=$(chars.alpha)$(chars.numeric)@$_
+
+style.powerpro.32=$(font.base)
+style.powerpro.0=#fore:$(font.base)
+style.powerpro.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.powerpro.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.powerpro.3=$(colour.number)
+style.powerpro.4=fore:#0000FF
+style.powerpro.5=fore:#B00040
+style.powerpro.6=fore:#0000FF
+style.powerpro.7=fore:#0000FF
+style.powerpro.8=$(colour.string)
+style.powerpro.9=$(colour.char)
+style.powerpro.10=$(colour.preproc)
+style.powerpro.11=$(colour.operator),bold
+braces.powerpro.style=11
+style.powerpro.12=#0000FF
+style.powerpro.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.powerpro.14=$(colour.char)
+style.powerpro.15=$(colour.string)
+style.powerpro.16=fore:#B00040,bold
+
+
+command.go.$(file.patterns.powerpro)="$(FilePath)"
+command.go.subsystem.$(file.patterns.powerpro)=2
+
+command.help.$(file.patterns.powerpro)=$(CurrentWord)!C:\Program Files\PowerPro\powerpro.chm
+command.help.subsystem.$(file.patterns.powerpro)=4
+
+module powershell
+
+file.patterns.powershell=*.ps1
+
+filter.powershell=PowerShell (ps1)|$(file.patterns.powershell)|
+
+*filter.powershell=$(filter.powershell)
+
+lexer.$(file.patterns.powershell)=powershell
+
+*language.powershell=PowerShell|ps1||
+
+word.characters.$(file.patterns.powershell)=$(chars.alpha)$(chars.numeric)_-$
+
+keywords.$(file.patterns.powershell)=\
+begin break catch continue data do dynamicparam else elseif end exit filter \
+finally for foreach from function if in local param private process return \
+switch throw trap try until where while
+
+keywords2.$(file.patterns.powershell)=\
+add-computer add-content add-history add-member add-pssnapin add-type \
+checkpoint-computer clear-content clear-eventlog clear-history clear-item \
+clear-itemproperty clear-variable compare-object complete-transaction \
+connect-wsman convert-path convertfrom-csv convertfrom-securestring \
+convertfrom-stringdata convertto-csv convertto-html convertto-securestring \
+convertto-xml copy-item copy-itemproperty debug-process disable-computerrestore \
+disable-psbreakpoint disable-pssessionconfiguration disable-wsmancredssp \
+disconnect-wsman enable-computerrestore enable-psbreakpoint enable-psremoting \
+enable-pssessionconfiguration enable-wsmancredssp enter-pssession exit-pssession \
+export-alias export-clixml export-console export-counter export-csv \
+export-formatdata export-modulemember export-pssession foreach-object \
+format-custom format-list format-table format-wide get-acl get-alias \
+get-authenticodesignature get-childitem get-command get-computerrestorepoint \
+get-content get-counter get-credential get-culture get-date get-event \
+get-eventlog get-eventsubscriber get-executionpolicy get-formatdata get-help \
+get-history get-host get-hotfix get-item get-itemproperty get-job get-location \
+get-member get-module get-psbreakpoint get-pscallstack get-psdrive \
+get-psprovider get-pssession get-pssessionconfiguration get-pssnapin \
+get-pfxcertificate get-process get-random get-service get-tracesource \
+get-transaction get-uiculture get-unique get-variable get-wsmancredssp \
+get-wsmaninstance get-winevent get-wmiobject group-object import-alias \
+import-clixml import-counter import-csv import-localizeddata import-module \
+import-pssession invoke-command invoke-expression invoke-history invoke-item \
+invoke-wsmanaction invoke-wmimethod join-path limit-eventlog measure-command \
+measure-object move-item move-itemproperty new-alias new-event new-eventlog \
+new-item new-itemproperty new-module new-modulemanifest new-object new-psdrive \
+new-pssession new-pssessionoption new-service new-timespan new-variable \
+new-wsmaninstance new-wsmansessionoption new-webserviceproxy out-default \
+out-file out-gridview out-host out-null out-printer out-string pop-location \
+push-location read-host receive-job register-engineevent register-objectevent \
+register-pssessionconfiguration register-wmievent remove-computer remove-event \
+remove-eventlog remove-item remove-itemproperty remove-job remove-module \
+remove-psbreakpoint remove-psdrive remove-pssession remove-pssnapin \
+remove-variable remove-wsmaninstance remove-wmiobject rename-item \
+rename-itemproperty reset-computermachinepassword resolve-path restart-computer \
+restart-service restore-computer resume-service select-object select-string \
+select-xml send-mailmessage set-acl set-alias set-authenticodesignature \
+set-content set-date set-executionpolicy set-item set-itemproperty set-location \
+set-psbreakpoint set-psdebug set-pssessionconfiguration set-service \
+set-strictmode set-tracesource set-variable set-wsmaninstance \
+set-wsmanquickconfig set-wmiinstance show-eventlog sort-object split-path \
+start-job start-process start-service start-sleep start-transaction \
+start-transcript stop-computer stop-job stop-process stop-service \
+stop-transcript suspend-service tee-object test-computersecurechannel \
+test-connection test-modulemanifest test-path test-wsman trace-command \
+undo-transaction unregister-event unregister-pssessionconfiguration \
+update-formatdata update-list update-typedata use-transaction wait-event \
+wait-job wait-process where-object write-debug write-error write-eventlog \
+write-host write-output write-progress write-verbose write-warning
+
+keywords3.$(file.patterns.powershell)=\
+ac asnp cat cd chdir clc clear clhy cli clp cls clv compare copy cp cpi cpp cvpa \
+dbp del diff dir ebp echo epal epcsv epsn erase etsn exsn fc fl foreach ft fw \
+gal gbp gc gci gcm gcs gdr ghy gi gjb gl gm gmo gp gps group gsn gsnp gsv gu gv \
+gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn ise iwmi kill lp ls man md \
+measure mi mount move mp mv nal ndr ni nmo nsn nv ogv oh popd ps pushd pwd r rbp \
+rcjb rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rv rvpa rwmi sajb sal \
+saps sasv sbp sc select set si sl sleep sort sp spjb spps spsv start sv swmi tee \
+type where wjb write
+
+keywords4.$(file.patterns.powershell)=\
+clear-host disable-psremoting enable-psremoting get-verb help importsystemmodules \
+mkdir more prompt psedit tabexpansion
+
+
+comment.block.powershell=#~
+comment.block.at.line.start.powershell=1
+
+style.powershell.0=fore:#000000
+style.powershell.1=fore:#008000
+style.powershell.2=fore:#800000
+style.powershell.3=fore:#800000
+style.powershell.4=fore:#FF0000
+style.powershell.5=fore:#800080
+style.powershell.6=fore:#000000,bold
+style.powershell.7=$(style.powershell.0)
+style.powershell.8=fore:#000080,bold
+style.powershell.9=fore:#008080,bold
+style.powershell.10=fore:#008080,italics
+style.powershell.11=fore:#808000,bold
+style.powershell.12=
+style.powershell.13=$(style.powershell.1)
+style.powershell.14=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+style.powershell.15=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+style.powershell.16=fore:#3060A0
+
+module ps
+
+file.patterns.ps=*.ps
+
+filter.ps=PostScript (ps)|$(file.patterns.ps)|
+
+*filter.ps=$(filter.ps)
+
+lexer.$(file.patterns.ps)=ps
+
+*language.postscript=P&ostScript|ps||
+
+ps.tokenize=0
+ps.level=3
+
+comment.block.ps=%~
+
+keywords.$(file.patterns.ps)=\
+$error = == FontDirectory StandardEncoding UserObjects abs add aload \
+anchorsearch and arc arcn arcto array ashow astore atan awidthshow begin bind \
+bitshift bytesavailable cachestatus ceiling charpath clear cleardictstack \
+cleartomark clip clippath closefile closepath concat concatmatrix copy copypage \
+cos count countdictstack countexecstack counttomark currentcmykcolor \
+currentcolorspace currentdash currentdict currentfile currentflat currentfont \
+currentgray currenthsbcolor currentlinecap currentlinejoin currentlinewidth \
+currentmatrix currentmiterlimit currentpagedevice currentpoint currentrgbcolor \
+currentscreen currenttransfer cvi cvlit cvn cvr cvrs cvs cvx def defaultmatrix \
+definefont dict dictstack div dtransform dup echo end eoclip eofill eq \
+erasepage errordict exch exec execstack executeonly executive exit exp false \
+file fill findfont flattenpath floor flush flushfile for forall ge get \
+getinterval grestore grestoreall gsave gt idetmatrix idiv idtransform if ifelse \
+image imagemask index initclip initgraphics initmatrix inustroke invertmatrix \
+itransform known kshow le length lineto ln load log loop lt makefont mark \
+matrix maxlength mod moveto mul ne neg newpath noaccess nor not null nulldevice \
+or pathbbox pathforall pop print prompt pstack put putinterval quit rand rcheck \
+rcurveto read readhexstring readline readonly readstring rectstroke repeat \
+resetfile restore reversepath rlineto rmoveto roll rotate round rrand run save \
+scale scalefont search setblackgeneration setcachedevice setcachelimit \
+setcharwidth setcolorscreen setcolortransfer setdash setflat setfont setgray \
+sethsbcolor setlinecap setlinejoin setlinewidth setmatrix setmiterlimit \
+setpagedevice setrgbcolor setscreen settransfer setvmthreshold show showpage \
+sin sqrt srand stack start status statusdict stop stopped store string \
+stringwidth stroke strokepath sub systemdict token token transform translate \
+true truncate type ueofill undefineresource userdict usertime version vmstatus \
+wcheck where widthshow write writehexstring writestring xcheck xor
+
+keywords2.$(file.patterns.ps)=\
+GlobalFontDirectory ISOLatin1Encoding SharedFontDirectory UserObject arct \
+colorimage cshow currentblackgeneration currentcacheparams currentcmykcolor \
+currentcolor currentcolorrendering currentcolorscreen currentcolorspace \
+currentcolortransfer currentdevparams currentglobal currentgstate \
+currenthalftone currentobjectformat currentoverprint currentpacking \
+currentpagedevice currentshared currentstrokeadjust currentsystemparams \
+currentundercolorremoval currentuserparams defineresource defineuserobject \
+deletefile execform execuserobject filenameforall fileposition filter \
+findencoding findresource gcheck globaldict glyphshow gstate ineofill infill \
+instroke inueofill inufill inustroke languagelevel makepattern packedarray \
+printobject product realtime rectclip rectfill rectstroke renamefile \
+resourceforall resourcestatus revision rootfont scheck selectfont serialnumber \
+setbbox setblackgeneration setcachedevice2 setcacheparams setcmykcolor setcolor \
+setcolorrendering setcolorscreen setcolorspace setcolortranfer setdevparams \
+setfileposition setglobal setgstate sethalftone setobjectformat setoverprint \
+setpacking setpagedevice setpattern setshared setstrokeadjust setsystemparams \
+setucacheparams setundercolorremoval setuserparams setvmthreshold shareddict \
+startjob uappend ucache ucachestatus ueofill ufill undef undefinefont \
+undefineresource undefineuserobject upath ustroke ustrokepath vmreclaim \
+writeobject xshow xyshow yshow
+
+keywords3.$(file.patterns.ps)=\
+cliprestore clipsave composefont currentsmoothness findcolorrendering \
+setsmoothness shfill
+
+keywords4.$(file.patterns.ps)=\
+.begintransparencygroup .begintransparencymask .bytestring .charboxpath \
+.currentaccuratecurves .currentblendmode .currentcurvejoin .currentdashadapt \
+.currentdotlength .currentfilladjust2 .currentlimitclamp .currentopacityalpha \
+.currentoverprintmode .currentrasterop .currentshapealpha \
+.currentsourcetransparent .currenttextknockout .currenttexturetransparent \
+.dashpath .dicttomark .discardtransparencygroup .discardtransparencymask \
+.endtransparencygroup .endtransparencymask .execn .filename .filename \
+.fileposition .forceput .forceundef .forgetsave .getbitsrect .getdevice \
+.inittransparencymask .knownget .locksafe .makeoperator .namestring .oserrno \
+.oserrorstring .peekstring .rectappend .runandhide .setaccuratecurves \
+.setblendmode .setcurvejoin .setdashadapt .setdebug .setdefaultmatrix \
+.setdotlength .setfilladjust2 .setlimitclamp .setmaxlength .setopacityalpha \
+.setoverprintmode .setrasterop .setsafe .setshapealpha .setsourcetransparent \
+.settextknockout .settexturetransparent .stringbreak .stringmatch .tempfile \
+.type1decrypt .type1encrypt .type1execchar .unread arccos arcsin copydevice \
+copyscanlines currentdevice finddevice findlibfile findprotodevice flushpage \
+getdeviceprops getenv makeimagedevice makewordimagedevice max min \
+putdeviceprops setdevice
+
+
+style.ps.0=$(font.base)
+style.ps.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.ps.2=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.ps.3=fore:#3060A0,$(font.code.comment.doc)
+style.ps.4=$(colour.number)
+style.ps.5=$(colour.operator)
+style.ps.6=$(colour.keyword),bold
+style.ps.7=$(colour.preproc)
+style.ps.8=$(colour.preproc),bold
+style.ps.9=$(colour.keyword)
+style.ps.10=fore:#3060A0
+style.ps.11=$(colour.operator),bold
+style.ps.12=$(colour.string),$(font.text)
+style.ps.13=fore:#3F7F3F
+style.ps.14=$(colour.string)
+style.ps.15=$(colour.error)
+braces.ps.style=11
+
+if PLAT_WIN
+    command.go.*.ps=gswin32c "$(FileNameExt)"
+
+if PLAT_GTK
+    command.go.*.ps=gs "$(FileNameExt)"
+
+
+module purebasic
+
+file.patterns.purebasic=*.pb
+
+filter.purebasic=PureBasic (pb)|$(file.patterns.purebasic)|
+
+*filter.purebasic=$(filter.purebasic)
+
+lexer.$(file.patterns.purebasic)=purebasic
+
+
+keywords.$(file.patterns.purebasic)=and break case continue data \
+datasection declare declarecdll declaredll default deftype dim else \
+elseif end enddatasection endenumeration endif endinterface endprocedure \
+endselect endstructure endstructureunion enumeration extends fakereturn \
+for foreach forever global gosub goto if includebinary includefile \
+includepath interface newlist next or procedure procedurecdll \
+proceduredll procedurereturn protected read repeat restore return select \
+shared static step structure structureunion to until wend while xincludefile
+
+keywords2.$(file.patterns.purebasic)=compilercase compilerdefault \
+compilerelse compilerendif compilerendselect compilerif compilerselect
+
+style.purebasic.0=fore:#000000
+style.purebasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.purebasic.2=$(colour.number)
+style.purebasic.3=$(colour.keyword)
+style.purebasic.4=$(colour.string)
+style.purebasic.6=$(colour.operator)
+style.purebasic.7=$(style.purebasic.0)
+style.purebasic.10=$(colour.preproc)
+style.purebasic.11=$(colour.keyword)
+style.purebasic.12=$(colour.keyword)
+style.purebasic.13=$(colour.number)
+style.purebasic.15=$(colour.preproc)
+style.purebasic.16=$(colour.error)
+style.purebasic.17=$(colour.number)
+style.purebasic.18=$(colour.number)
+
+
+module python
+
+file.patterns.py=*.py;*.pyw;*.pyx;*.pxd;*.pxi
+file.patterns.scons=SConstruct;SConscript
+
+*source.patterns.python=$(file.patterns.py);
+
+shbang.python=py
+shbang.python3=py
+
+filter.python=Python (py pyw)|$(file.patterns.py)|
+
+*filter.python=$(filter.python)
+
+lexer.$(file.patterns.py)=python
+lexer.$(file.patterns.scons)=python
+
+*language.python=Pytho&n|py||
+
+keywordclass.python2=and as assert break class continue def del elif \
+else except exec finally for from global if import in is lambda not \
+or pass print raise return try while with yield
+
+keywordclass.python3=False None True and as assert break class continue \
+def del elif else except finally for from global if import in is lambda \
+nonlocal not or pass raise return try while with yield
+
+keywordclass.python=$(keywordclass.python2)
+
+keywordclass.cython=cdef cimport cpdef
+
+keywords.$(file.patterns.py)=$(keywordclass.python) $(keywordclass.cython)
+keywords.$(file.patterns.scons)=$(keywordclass.python)
+
+
+
+substyles.python.11=2
+
+substylewords.11.1.$(file.patterns.py)=\
+__main__ _dummy_thread _thread abc aifc argparse \
+array ast asynchat asyncio asyncore atexit audioop \
+base64 bdb binascii binhex bisect builtins bz2 \
+calendar cgi cgitb chunk cmath cmd code codecs \
+codeop collections colorsys compileall concurrent \
+configparser contextlib copy copyreg crypt csv \
+ctypes curses datetime dbm decimal difflib dis \
+distutils dummy_threading email ensurepip enum \
+errno faulthandler fcntl filecmp fileinput fnmatch \
+formatter fpectl fractions ftplib functools gc getopt \
+getpass gettext glob grp gzip hashlib heapq hmac \
+html http http imaplib imghdr importlib inspect io \
+ipaddress itertools json keyword linecache locale \
+logging lzma macpath mailbox mailcap marshal math \
+mimetypes mmap modulefinder msilib msvcrt \
+multiprocessing netrc nis nntplib numbers operator \
+os os ossaudiodev parser pathlib pdb pickle \
+pickletools pipes pkgutil platform plistlib poplib posix \
+pprint pty pwd py_compile pyclbr queue quopri \
+random re readline reprlib resource rlcompleter runpy \
+sched select selectors shelve shlex shutil signal site \
+smtpd smtplib sndhdr socket socketserver spwd \
+sqlite3 ssl stat statistics string stringprep struct \
+subprocess sunau symbol symtable sys sysconfig \
+syslog tabnanny tarfile telnetlib tempfile termios \
+textwrap threading time timeit tkinter token \
+tokenize trace traceback tracemalloc tty turtle \
+types unicodedata unittest urllib uu uuid venv warnings \
+wave weakref webbrowser winreg winsound wsgiref \
+xdrlib xml xmlrpc zipfile zipimport zlib
+style.python.11.1=fore:#DD9900
+
+substylewords.11.2.$(file.patterns.py)=__future__ \
+with_statement unicode_literals print_function
+style.python.11.2=fore:#EE00AA,italics
+
+statement.indent.$(file.patterns.py)=5 class def elif else except finally \
+for if try while with
+
+statement.lookback.$(file.patterns.py)=0
+block.start.$(file.patterns.py)=
+block.end.$(file.patterns.py)=
+
+view.indentation.examine.*.py=2
+
+tab.timmy.whinge.level=1
+
+
+comment.block.python=#~
+
+indent.python.colon=1
+
+style.python.0=fore:#808080
+style.python.1=fore:#007F00,$(font.comment)
+style.python.2=fore:#007F7F
+style.python.3=fore:#7F007F,$(font.monospace)
+style.python.4=fore:#7F007F,$(font.monospace)
+style.python.5=fore:#00007F,bold
+style.python.6=fore:#7F0000
+style.python.7=fore:#7F0000
+style.python.8=fore:#0000FF,bold
+style.python.9=fore:#007F7F,bold
+style.python.10=bold
+style.python.11=
+style.python.12=fore:#7F7F7F
+style.python.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.python.14=fore:#407090
+style.python.15=fore:#805000
+style.python.16=fore:#7F007F,$(font.monospace)
+style.python.17=fore:#7F007F,$(font.monospace)
+style.python.18=fore:#7F0000
+style.python.19=fore:#7F0000
+style.python.34=fore:#0000FF,bold
+style.python.35=fore:#FF0000,bold
+braces.python.style=10
+
+if PLAT_WIN
+	python.command=pyw
+if PLAT_GTK
+	python.command=python3
+if PLAT_MAC
+	python.command=python
+
+if PLAT_WIN
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.go.subsystem.*.py=1
+	command.go.*.pyw=$(python.command) -u "$(FileNameExt)"
+	command.go.subsystem.*.pyw=1
+	command.build.SConscript=scons.bat --up .
+	command.build.SConstruct=scons.bat .
+
+if PLAT_GTK
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.build.SConscript=scons --up .
+	command.build.SConstruct=scons .
+
+if PLAT_MAC
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.build.SConscript=scons --up .
+	command.build.SConstruct=scons .
+
+command.name.1.$(file.patterns.py)=Syntax Check
+command.1.$(file.patterns.py)=$(python.command) -c "import py_compile; py_compile.compile(r'$(FilePath)')"
+
+module r
+
+file.patterns.r=*.r;*.R;*.rsource
+file.patterns.r.like=$(file.patterns.r)
+
+filter.r=R (R rsource)|$(file.patterns.r)|
+
+*filter.r=$(filter.r)
+
+lexer.$(file.patterns.r)=r
+
+*language.r=R|R||
+
+keywordclass.r=if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN
+
+keywords.$(file.patterns.r)=$(keywordclass.r)
+
+keywords2.$(file.patterns.r)=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote break browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable function gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol next nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep repeat replace replicate replications require reshape resid residuals restart return rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort source spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system t table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which while window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall
+
+keywords3.$(file.patterns.r)=acme aids aircondit amis aml banking barchart barley beaver bigcity boot brambles breslow bs bwplot calcium cane capability cav censboot channing city claridge cloth cloud coal condense contourplot control corr darwin densityplot dogs dotplot ducks empinf envelope environmental ethanol fir frets gpar grav gravity grob hirose histogram islay knn larrows levelplot llines logit lpoints lsegments lset ltext lvqinit lvqtest manaus melanoma melanoma motor multiedit neuro nitrofen nodal ns nuclear oneway parallel paulsen poisons polar qq qqmath remission rfs saddle salinity shingle simplex singer somgrid splom stripplot survival tau tmd tsboot tuna unit urine viewport wireframe wool xyplot
+
+
+word.chars.r=$(chars.alpha)$(chars.numeric)_.#
+word.characters.$(file.patterns.r)=$(word.chars.r)
+comment.block.r=#~
+
+statement.indent.$(file.patterns.r.like)=5 for if
+statement.end.$(file.patterns.r.like)=10 ;
+statement.lookback.$(file.patterns.r.like)=20
+block.start.$(file.patterns.r.like)=10 {
+block.end.$(file.patterns.r.like)=10 }
+
+
+style.r.32=$(font.base)
+style.r.0=fore:#808080
+style.r.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.r.2=$(colour.keyword),bold
+style.r.3=fore:#7f0000,bold
+style.r.4=fore:#7f007F,bold
+style.r.5=$(colour.number)
+style.r.6=$(colour.string)
+style.r.7=$(colour.string)
+style.r.8=$(colour.operator),bold
+style.r.9=$(colour.identifier)
+style.r.10=$(colour.operator),bold
+style.r.11=$(colour.operator),$(font.monospace),back:#E0C0E0,eolfilled
+
+braces.r.style=8
+
+module raku
+
+file.patterns.raku=*.p6;*.pm6;*.pod6;*.t6;*.raku;*.rakumod;*.rakudoc;*.rakutest
+
+*source.patterns.raku=$(file.patterns.raku);
+
+*filter.raku=Raku (p6 pm6)|$(file.patterns.raku)|
+
+*language.raku=Raku|p6||
+
+lexer.$(file.patterns.raku)=raku
+
+keywords.$(file.patterns.raku)=BEGIN CATCH CHECK CONTROL END ENTER EVAL FIRST \
+ INIT KEEP LAST LEAVE NEXT POST PRE START TEMP UNDO after also andthen as \
+ async augment bag before but category circumfix class cmp complex constant \
+ contend default defer div does dynamic else elsif enum eq eqv extra fail \
+ fatal ff fff for gather gcd ge given grammar gt handles has if infix is lcm \
+ le leave leg let lift loop lt macro make maybe method mix mod module multi \
+ ne not o only oo or orelse orwith postcircumfix postfix prefix proto regex \
+ repeat require return-rw returns role rule size_t slang start str submethod \
+ subset supersede take temp term token trusts try unit unless until when \
+ where while with without x xor xx
+keywords2.$(file.patterns.raku)=ACCEPTS AT-KEY EVALFILE EXISTS-KEY Filetests \
+ IO STORE abs accept acos acosec acosech acosh acotan acotanh alarm and \
+ antipairs asec asech asin asinh atan atan2 atanh base bind binmode bless \
+ break caller ceiling chars chdir chmod chomp chop chr chroot chrs cis close \
+ closedir codes comb conj connect contains continue cos cosec cosech cosh \
+ cotan cotanh crypt dbm defined die do dump each elems eof exec exists exit \
+ exp expmod fc fcntl fileno flat flip flock floor fmt fork formats functions \
+ get getc getpeername getpgrp getppid getpriority getsock gist glob gmtime \
+ goto grep hyper import index int invert ioctl is-prime iterator join keyof \
+ keys kill kv last lazy lc lcfirst lines link list listen local localtime \
+ lock log log10 lsb lstat map match mkdir msb msg my narrow new next no of \
+ open ord ords our pack package pairs path pick pipe polymod pop pos pred \
+ print printf prototype push quoting race rand read readdir readline readlink \
+ readpipe recv redo ref rename requires reset return reverse rewinddir rindex \
+ rmdir roots round samecase say scalar sec sech seek seekdir select semctl \
+ semget semop send set setpgrp setpriority setsockopt shift shm shutdown sign \
+ sin sinh sleep sockets sort splice split sprintf sqrt srand stat state study \
+ sub subst substr substr-rw succ symlink sys syscall system syswrite tan tanh \
+ tc tclc tell telldir tie time times trans trim trim-leading trim-trailing \
+ truncate uc ucfirst unimatch uniname uninames uniprop uniprops unival unlink \
+ unpack unpolar unshift untie use utime values wait waitpid wantarray warn \
+ wordcase words write
+keywords3.$(file.patterns.raku)=AST Any Block Bool CallFrame Callable Code \
+ Collation Compiler Complex ComplexStr Cool CurrentThreadScheduler Date \
+ DateTime Dateish Distribution Distribution::Hash Distribution::Locally \
+ Distribution::Path Duration Encoding Encoding::Registry Endian FatRat \
+ ForeignCode HyperSeq HyperWhatever Instant Int IntStr Junction Label \
+ Lock::Async Macro Method Mu Nil Num NumStr Numeric ObjAt Parameter Perl \
+ PredictiveIterator Proxy RaceSeq Rat RatStr Rational Real Routine \
+ Routine::WrapHandle Scalar Sequence Signature Str StrDistance Stringy Sub \
+ Submethod Telemetry Telemetry::Instrument::Thread \
+ Telemetry::Instrument::ThreadPool Telemetry::Instrument::Usage \
+ Telemetry::Period Telemetry::Sampler UInt ValueObjAt Variable Version \
+ Whatever WhateverCode atomicint bit bool buf buf1 buf16 buf2 buf32 buf4 \
+ buf64 buf8 int int1 int16 int2 int32 int4 int64 int8 long longlong num \
+ num32 num64 rat rat1 rat16 rat2 rat32 rat4 rat64 rat8 uint uint1 uint16 \
+ uint2 uint32 uint4 uint64 uint8 utf16 utf32 utf8
+keywords4.$(file.patterns.raku)=Array Associative Bag BagHash Baggy Blob Buf \
+ Capture Enumeration Hash Iterable Iterator List Map Mix MixHash Mixy NFC NFD \
+ NFKC NFKD Pair Positional PositionalBindFailover PseudoStash QuantHash Range \
+ Seq Set SetHash Setty Slip Stash Uni utf8
+keywords5.$(file.patterns.raku)=Attribute Cancellation Channel CompUnit \
+ CompUnit::Repository CompUnit::Repository::FileSystem \
+ CompUnit::Repository::Installation Distro Grammar IO IO::ArgFiles \
+ IO::CatHandle IO::Handle IO::Notification IO::Path IO::Path::Cygwin \
+ IO::Path::QNX IO::Path::Unix IO::Path::Win32 IO::Pipe IO::Socket \
+ IO::Socket::Async IO::Socket::INET IO::Spec IO::Spec::Cygwin \
+ IO::Spec::QNX IO::Spec::Unix IO::Spec::Win32 IO::Special Kernel Lock \
+ Match Order Pod::Block Pod::Block::Code Pod::Block::Comment \
+ Pod::Block::Declarator Pod::Block::Named Pod::Block::Para Pod::Block::Table \
+ Pod::Defn Pod::FormattingCode Pod::Heading Pod::Item Proc Proc::Async \
+ Promise Regex Scheduler Semaphore Supplier Supplier::Preserving Supply \
+ Systemic Tap Thread ThreadPoolScheduler VM
+keywords6.$(file.patterns.raku)=Backtrace Backtrace::Frame CX::Done CX::Emit \
+ CX::Last CX::Next CX::Proceed CX::Redo CX::Return CX::Succeed CX::Take \
+ CX::Warn Exception Failure X::AdHoc X::Anon::Augment X::Anon::Multi \
+ X::Assignment::RO X::Attribute::NoPackage X::Attribute::Package \
+ X::Attribute::Required X::Attribute::Undeclared X::Augment::NoSuchType \
+ X::Bind X::Bind::NativeType X::Bind::Slice X::Caller::NotDynamic \
+ X::Channel::ReceiveOnClosed X::Channel::SendOnClosed X::Comp \
+ X::Composition::NotComposable X::Constructor::Positional X::Control \
+ X::ControlFlow X::ControlFlow::Return X::DateTime::TimezoneClash \
+ X::Declaration::Scope X::Declaration::Scope::Multi X::Does::TypeObject \
+ X::Dynamic::NotFound X::Eval::NoSuchLang X::Export::NameClash X::IO \
+ X::IO::Chdir X::IO::Chmod X::IO::Copy X::IO::Cwd X::IO::Dir X::IO::DoesNotExist \
+ X::IO::Link X::IO::Mkdir X::IO::Move X::IO::Rename X::IO::Rmdir \
+ X::IO::Symlink X::IO::Unlink X::Inheritance::NotComposed \
+ X::Inheritance::Unsupported X::Method::InvalidQualifier X::Method::NotFound \
+ X::Method::Private::Permission X::Method::Private::Unqualified \
+ X::Mixin::NotComposable X::NYI X::NoDispatcher X::Numeric::Real \
+ X::OS X::Obsolete X::OutOfRange X::Package::Stubbed X::Parameter::Default \
+ X::Parameter::MultipleTypeConstraints X::Parameter::Placeholder \
+ X::Parameter::Twigil X::Parameter::WrongOrder X::Phaser::Multiple \
+ X::Phaser::PrePost X::Placeholder::Block X::Placeholder::Mainline \
+ X::Pod X::Proc::Async X::Proc::Async::AlreadyStarted X::Proc::Async::BindOrUse \
+ X::Proc::Async::CharsOrBytes X::Proc::Async::MustBeStarted \
+ X::Proc::Async::OpenForWriting X::Proc::Async::TapBeforeSpawn \
+ X::Proc::Unsuccessful X::Promise::CauseOnlyValidOnBroken X::Promise::Vowed \
+ X::Redeclaration X::Role::Initialization X::Scheduler::CueInNaNSeconds \
+ X::Seq::Consumed X::Sequence::Deduction X::Signature::NameClash \
+ X::Signature::Placeholder X::Str::Numeric X::StubCode X::Syntax \
+ X::Syntax::Augment::WithoutMonkeyTyping X::Syntax::Comment::Embedded \
+ X::Syntax::Confused X::Syntax::InfixInTermPosition X::Syntax::Malformed \
+ X::Syntax::Missing X::Syntax::NegatedPair X::Syntax::NoSelf \
+ X::Syntax::Number::RadixOutOfRange X::Syntax::P5 X::Syntax::Perl5Var \
+ X::Syntax::Regex::Adverb X::Syntax::Regex::SolitaryQuantifier \
+ X::Syntax::Reserved X::Syntax::Self::WithoutObject \
+ X::Syntax::Signature::InvocantMarker X::Syntax::Term::MissingInitializer \
+ X::Syntax::UnlessElse X::Syntax::Variable::Match X::Syntax::Variable::Numeric \
+ X::Syntax::Variable::Twigil X::Temporal X::Temporal::InvalidFormat \
+ X::TypeCheck X::TypeCheck::Assignment X::TypeCheck::Binding \
+ X::TypeCheck::Return X::TypeCheck::Splice X::Undeclared
+keywords7.$(file.patterns.raku)=D a array b backslash c closure delete double \
+ exec exists f function h hash heredoc k kv p q qq quotewords s scalar single \
+ sym to v val w words ww x
+
+word.characters.$(file.patterns.raku)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.raku=#~
+
+colour.raku.heredoc=$(colour.embedded.comment)
+
+fold.raku.comment.multiline=1
+fold.raku.comment.pod=1
+
+style.raku.0=fore:#808080
+style.raku.1=$(colour.error)
+style.raku.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.raku.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.raku.4=$(colour.code.comment.box),$(font.code.comment.box)
+style.raku.5=$(colour.char),$(font.monospace)
+style.raku.6=fore:#7F007F,back:#DDD0DD,notbold
+style.raku.7=fore:#7F007F,back:#DDD0DD,bold
+style.raku.8=$(colour.char),$(font.monospace)
+style.raku.9=$(style.raku.8)
+style.raku.10=$(colour.string),$(font.monospace)
+style.raku.11=$(style.raku.10)
+style.raku.12=fore:#D600B5,bold
+style.raku.13=fore:#000000,back:#A0FFA0
+style.raku.14=$(style.raku.12),back:#A0FFA0
+style.raku.15=$(colour.preproc),bold
+style.raku.16=$(colour.number)
+style.raku.17=$(colour.notused),$(font.notused)
+style.raku.18=$(colour.operator),bold
+style.raku.19=$(colour.keyword),bold
+style.raku.20=$(style.raku.19)
+style.raku.21=$(colour.operator)
+style.raku.22=$(style.raku.19)
+style.raku.23=$(style.raku.0)
+style.raku.24=fore:#6E05BE
+style.raku.25=fore:#F4D50A
+style.raku.26=$(style.raku.21)
+style.raku.27=$(style.raku.15)
+style.raku.28=$(style.raku.15)
+
+braces.raku.style=18
+
+command.go.$(file.patterns.raku)=perl6 -w $(FileNameExt)
+command.compile.$(file.patterns.raku)=perl6 -c -w $(FileNameExt)
+command.name.0.$(file.patterns.raku)=Check Syntax
+command.0.$(file.patterns.raku)=perl6 -c $(FileNameExt)
+
+module rebol
+
+file.patterns.rebol=*.r;*.reb
+
+filter.rebol=REBOL (r)|$(file.patterns.rebol)|
+
+*filter.rebol=$(filter.rebol)
+
+lexer.$(file.patterns.rebol)=rebol
+
+keywords.$(file.patterns.rebol)=about abs absolute add \
+alert alias all alter and \
+any any-block? any-function? any-string? any-type? \
+any-word? append arccosine arcsine arctangent \
+array as-pair ask at attempt \
+back binary? bind bitset? block? \
+break brightness? browse build-tag caret-to-offset \
+catch center-face change change-dir char? \
+charset checksum choose clean-path clear \
+clear-fields close comment complement component? \
+compose compress confirm connected? construct \
+context copy cosine datatype? date? \
+debase decimal? decode-cgi decompress dehex \
+delete detab difference dir? dirize \
+disarm dispatch divide do do-events \
+does dump-face dump-obj echo either \
+else email? empty? enbase entab \
+equal? error? even? event? exclude \
+exists? exit exp extract fifth \
+file? find first flash focus \
+for forall foreach forever form \
+forskip found? fourth free func \
+function function? get get-modes get-word? \
+greater-or-equal? greater? halt has hash? \
+head head? help hide hide-popup \
+if image? import-email in in-window? \
+index? info? inform input input? \
+insert integer? intersect issue? join \
+last launch layout length? lesser-or-equal? \
+lesser? library? license link? list-dir \
+list? lit-path? lit-word? load load-image \
+log-10 log-2 log-e logic? loop \
+lowercase make make-dir make-face max \
+maximum maximum-of min minimum minimum-of \
+modified? mold money? multiply native? \
+negate negative? next none? not \
+not-equal? now number? object? odd? \
+offset-to-caret offset? op? open or \
+pair? paren? parse parse-xml path? \
+pick poke port? positive? power \
+prin print probe protect protect-system \
+query quit random read read-io \
+recycle reduce refinement? reform rejoin \
+remainder remold remove remove-each rename \
+repeat repend replace request request-color \
+request-date request-download request-file request-list request-pass \
+request-text resend return reverse routine? \
+same? save script? second secure \
+select send series? set set-modes \
+set-net set-path? set-word? show show-popup \
+sign? sine size-text size? skip \
+sort source span? split-path square-root \
+strict-equal? strict-not-equal? string? struct? stylize \
+subtract suffix? switch tag? tail \
+tail? tangent third throw time? \
+to to-binary to-bitset to-block to-char \
+to-date to-decimal to-email to-file to-get-word \
+to-hash to-hex to-idate to-image to-integer \
+to-issue to-list to-lit-path to-lit-word to-local-file \
+to-logic to-money to-pair to-paren to-path \
+to-rebol-file to-refinement to-set-path to-set-word to-string \
+to-tag to-time to-tuple to-url to-word \
+trace trim try tuple? type? \
+unfocus union unique unprotect unset \
+unset? until unview update upgrade \
+uppercase url? usage use value? \
+view viewed? wait what what-dir \
+while within? word? write write-io xor zero?
+
+keywords2.$(file.patterns.rebol)=action? any-block? any-function? any-string? \
+any-type? any-word? binary? bitset? block? char? component? connected? \
+datatype? date? decimal? dir? email? empty? equal? error? even? event? exists? \
+file? found? function? get-word? greater-or-equal greater? hash? head? image? \
+index? info? input? integer? issue? length? lesser-or-equal? lesser? library? \
+link-app? link? list? lit-path? lit-word? logic? modified? money? native? negative? \
+none? not-equal? number? object? odd? offset? op? pair? paren? path? port? \
+positive? rebol-command? rebol-encap? rebol-link? rebol-pro? rebol-view? \
+refinement? routine? same? script? series? set-path? set-word? sign? size? \
+strict-equal? strict-not-equal string? struct? suffix? tag? tail? time? tuple? type? \
+unset? url? value? view? word? zero?
+
+keywords3.$(file.patterns.rebol)=action! any-block! any-function! any-string! any-type! \
+ any-word! binary! bitset! block! char! datatype! date! decimal! email! error! \
+ event! file! function! get-word! hash! image! integer! issue! library! list! lit-path! \
+ lit-word! logic! money! native! none! number! object! op! pair! paren! path! \
+ port! refinement! routine! series! set-path! set-word! string! struct! symbol! tag! \
+ time! tuple! unset! url! word!
+
+word.chars.rebol=$(chars.alpha)$(chars.numeric)?!.�+-*&|=_~
+word.characters.$(file.patterns.rebol)=$(word.chars.rebol)
+
+comment.block.rebol=;
+comment.box.start.rebol=;;
+comment.box.middle.rebol=;;
+comment.box.end.rebol=;;
+
+
+style.rebol.32=$(font.base)
+style.rebol.0=fore:#000000,bold
+style.rebol.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.rebol.2=$(colour.code.comment.box),$(font.code.comment.box)
+style.rebol.3=$(colour.code.comment.box),$(font.code.comment.box),bold
+style.rebol.4=$(colour.operator),bold
+style.rebol.5=$(colour.string)
+style.rebol.6=$(colour.string)
+style.rebol.7=$(colour.string)
+style.rebol.8=$(colour.number)
+style.rebol.9=fore:#005090
+style.rebol.10=fore:#005090
+style.rebol.11=fore:#C000C0
+style.rebol.12=fore:#003070
+style.rebol.13=fore:#800000
+style.rebol.14=fore:#C00000
+style.rebol.15=fore:#0080FF
+style.rebol.16=fore:#0080FF
+style.rebol.17=fore:#0080FF
+style.rebol.18=fore:#8000FF
+style.rebol.19=fore:#8000FF
+
+style.rebol.20=
+style.rebol.21=$(colour.keyword),bold
+style.rebol.22=fore:#8000C0,bold
+style.rebol.23=fore:#800060,bold
+style.rebol.24=fore:#DD9900
+style.rebol.25=fore:#DD9900
+style.rebol.26=fore:#DD9900
+style.rebol.27=fore:#DD9900
+style.rebol.28=fore:#DD9900
+
+style.rebol.34=fore:#0000FF,bold
+style.rebol.35=fore:#FF0000,bold
+braces.rebol.style=0
+
+command.go.$(file.patterns.rebol)=E:\tools\lang\rebol\core\rebol.exe $(FilePath)
+
+
+module registry
+
+file.patterns.registry=*.reg
+filter.registry=Registration files (reg)|$(file.patterns.registry)|
+lexer.$(file.patterns.registry)=registry
+
+comment.block.registry=;;
+
+[Styles]
+
+style.registry.32=$(font.text)
+style.registry.0=fore:#000000
+style.registry.1=$(colour.code.comment.line)
+style.registry.2=fore:#0000FF
+style.registry.3=$(colour.string)
+style.registry.4=fore:#7F0B0C
+style.registry.5=fore:#00007F,bold
+style.registry.6=fore:#530155
+style.registry.7=fore:#FF0000
+style.registry.8=fore:#7D8187,bold
+style.registry.9=fore:#7B5F15
+style.registry.10=$(style.registry.9)
+style.registry.11=fore:#0B6561
+style.registry.12=bold
+
+module ruby
+
+file.patterns.rb=*.rb;*.rbw;*.rake;*.rjs;Rakefile
+
+*source.patterns.ruby=$(file.patterns.rb);
+
+shbang.ruby=rb
+
+filter.ruby=Ruby (rb rbw)|$(file.patterns.rb)|
+
+*filter.ruby=$(filter.ruby)
+
+lexer.$(file.patterns.rb)=ruby
+
+*language.ruby=Ruby|rb||
+
+keywordclass.ruby=__FILE__ and def end in or self unless __LINE__ begin \
+defined? ensure module redo super until BEGIN break do false next rescue \
+then when END case else for nil retry true while alias class elsif if \
+not return undef yield
+keywords.$(file.patterns.rb)=$(keywordclass.ruby)
+
+statement.indent.$(file.patterns.rb)=5 def class if do elsif else case while for
+
+block.start.$(file.patterns.rb)=5 do
+block.end.$(file.patterns.rb)=5 end
+
+indent.opening.$(file.patterns.rb)=1
+indent.closing.$(file.patterns.rb)=1
+
+comment.block.ruby=#~
+
+style.ruby.0=fore:#808080
+style.ruby.1=back:#FF0000
+style.ruby.2=fore:#007F00,$(font.comment)
+style.ruby.3=fore:#004000,back:#C0FFC0,$(font.monospace),eolfilled
+style.ruby.4=fore:#007F7F
+style.ruby.5=fore:#00007F,bold
+style.ruby.6=fore:#7F007F,$(font.monospace)
+style.ruby.7=fore:#7F007F,$(font.monospace)
+style.ruby.8=fore:#0000FF,bold
+style.ruby.9=fore:#007F7F,bold
+style.ruby.10=bold
+style.ruby.11=
+style.ruby.12=fore:#000000,back:#A0FFA0
+style.ruby.13=fore:#800080
+style.ruby.14=fore:#C0A030
+style.ruby.15=fore:#A000A0,bold
+style.ruby.16=fore:#B00080
+style.ruby.17=fore:#8000B0
+style.ruby.18=fore:#FFFF00,back:#A08080
+style.ruby.19=fore:#600000,back:#FFF0D8,eolfilled
+style.ruby.20=fore:#000000,back:#DDD0DD
+style.ruby.21=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+style.ruby.22=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+style.ruby.23=fore:#7F007F,back:#DDD0DD,eolfilled,italics
+style.ruby.24=fore:#7F007F,$(font.monospace),notbold
+style.ruby.25=$(colour.string),$(font.monospace)
+style.ruby.26=fore:#FFFF00,back:#A08080
+style.ruby.27=fore:#000000,back:#A0FFA0
+style.ruby.28=fore:#000000,back:#FFFFE0
+style.ruby.29=$(style.ruby.5)
+style.ruby.30=back:#FF8080
+style.ruby.31=back:#FF8080
+style.ruby.40=back:#FF8080
+style.ruby.41=back:#FF0000
+
+style.ruby.34=fore:#0000FF,bold
+style.ruby.35=fore:#FF0000,bold
+braces.ruby.style=10
+
+if PLAT_WIN
+	command.go.*.rb=ruby $(FileNameExt)
+	command.go.subsystem.*.rb=1
+	command.go.*.rbw=rubyw $(FileNameExt)
+	command.go.subsystem.*.rbw=1
+	command.help.*.rb=$(CurrentWord)!c:\apps\ruby\ProgrammingRuby.chm
+	command.help.subsystem.*.rb=4
+
+if PLAT_GTK
+	command.go.*.rb=ruby $(FileNameExt)
+
+	command.name.1.*.rb=Check Syntax
+	command.1.*.rb=ruby -cw $(FileNameExt)
+
+	command.name.2.*.rb=Code Profiler
+	command.2.*.rb=ruby -r profile $(FileNameExt)
+
+if PLAT_MAC
+	command.go.*.rb=ruby $(FileNameExt)
+	command.name.1.*.rb=Check Syntax
+	command.1.*.rb=ruby -cw $(FileNameExt)
+	command.name.2.*.rb=Code Profiler
+	command.2.*.rb=ruby -r profile $(FileNameExt)
+
+module rust
+
+file.patterns.rust=*.rs
+filter.rust=Rust (rs)|$(file.patterns.rust)|
+*filter.rust=$(filter.rust)
+lexer.$(file.patterns.rust)=rust
+*language.rust=Rust|rs||
+
+word.chars.rust=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.rust)=$(word.chars.rust)
+calltip.rust.word.characters=$(chars.alpha)$(chars.numeric)_
+
+comment.block.at.line.start.rust=1
+comment.block.rust=//~
+comment.stream.start.rust=/*
+comment.stream.end.rust=*/
+comment.box.start.rust=/*
+comment.box.middle.rust= *
+comment.box.end.rust= */
+
+statement.indent.$(file.patterns.rust)=6
+statement.end.$(file.patterns.rust)=16 ;
+statement.lookback.$(file.patterns.rust)=20
+block.start.$(file.patterns.rust)=16 {
+block.end.$(file.patterns.rust)=16 }
+braces.rust.style=16
+
+keywords.$(file.patterns.rust)=alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self sizeof static struct super trait true type typeof unsafe unsized use virtual while yield
+
+keywords2.$(file.patterns.rust)=bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint
+
+keywords3.$(file.patterns.rust)=Self
+
+
+style.rust.32=$(font.base)
+style.rust.0=fore:#808080
+style.rust.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.rust.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.rust.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.rust.4=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.rust.5=$(colour.number)
+style.rust.6=$(colour.keyword),bold
+style.rust.7=$(colour.keyword),bold
+style.rust.8=$(colour.keyword)
+style.rust.9=$(colour.keyword),bold
+style.rust.10=$(colour.keyword),bold
+style.rust.11=$(colour.keyword),bold
+style.rust.12=$(colour.keyword),bold
+style.rust.13=$(colour.string)
+style.rust.14=fore:#B090B0
+style.rust.15=$(colour.char)
+style.rust.16=$(colour.operator),bold
+style.rust.17=
+style.rust.18=fore:#007F7F
+style.rust.19=$(colour.preproc)
+style.rust.20=fore:#000000,$(font.monospace),back:#E0C0E0
+style.rust.21=$(colour.string)
+style.rust.22=fore:#B090B0
+style.rust.23=$(colour.char)
+
+command.compile.*.rs=rustc $(FileNameExt)
+command.build.*.rs=$(make.command)
+command.go.*.rs=./$(FileName)
+
+
+module sas
+
+
+file.patterns.sas=*.sas;
+
+*source.patterns.sas=$(file.patterns.sas);
+
+filter.sas=SAS (sas)|$(file.patterns.sas)|
+
+lexer.$(file.patterns.sas)=sas
+
+*language.sas=&SAS|sas||
+
+
+
+keywords.$(file.patterns.sas)=%let %do
+
+keywords2.$(file.patterns.sas)=also cards class data input model ods proc var where
+
+keywords3.$(file.patterns.sas)=%printz
+
+keywords4.$(file.patterns.sas)=run
+
+
+
+
+
+comment.stream.start.sas=*
+comment.stream.end.sas=;
+
+
+
+
+
+comment.box.start.sas=*
+comment.box.middle.sas=*
+comment.box.end.sas=;
+
+
+
+
+
+style.sas.0=
+
+style.sas.1=$(colour.code.comment.box),$(font.code.comment.box)
+
+style.sas.2=$(colour.code.comment.line),$(font.code.comment.line)
+
+style.sas.3=$(colour.code.comment.box),$(font.code.comment.box)
+
+style.sas.4=$(colour.number)
+
+style.sas.5=$(colour.operator),bold
+
+style.sas.6=fore:#000000
+
+style.sas.7=$(colour.string)
+
+
+
+
+style.sas.11=fore:#CC66FF,bold
+
+style.sas.12=fore:#CC66FF
+
+style.sas.13=fore:#000080,bold
+
+style.sas.14=fore:#FF66FF,bold
+
+style.sas.15=fore:#AA0000,bold
+
+module scriptol
+
+filter.scriptol=Scriptol (sol)|*.sol|
+
+*filter.scriptol=$(filter.scriptol)
+
+lexer.*.sol=scriptol
+
+file.patterns.sol=*.sol
+
+keywordclass.scriptol= act action alias always and array as \
+bool boolean break by byte \
+class case catch const constant continue \
+dyn def define dict do double \
+echo else elsif end enum error false file for float forever function \
+globak gtk \
+in if ifdef import include int integer java javax \
+let long match mod nil not natural null number \
+or print protected public real return redo \
+scan script scriptol sol short super static step until using \
+var text then this true try \
+void volatile while when \
+undef zero
+keywords.$(file.patterns.sol)=$(keywordclass.scriptol)
+
+statement.indent.*.sol=
+statement.lookback.*.sol=1
+block.start.*.sol=10
+
+comment.block.scriptol=`~
+
+style.scriptol.0=fore:#000000
+style.scriptol.1=fore:#808080
+style.scriptol.2=fore:#007F00,$(font.comment)
+style.scriptol.3=fore:#007F00,$(font.comment)
+style.scriptol.4=fore:#007F00
+style.scriptol.5=fore:#007F00,$(font.comment)
+style.scriptol.6=fore:#007F7F
+style.scriptol.7=fore:#7F007F,$(font.monospace)
+style.scriptol.8=fore:#7F007F,$(font.monospace)
+style.scriptol.9=fore:#FF0000,$(font.monospace),back:#E0C0E0,eolfilled
+style.scriptol.10=fore:#00007F,bold
+style.scriptol.11=bold
+style.scriptol.12=fore:#333333
+style.scriptol.13=
+style.scriptol.14=fore:#0000FF,bold
+style.scriptol.15=
+
+
+if PLAT_WIN
+        command.help.$(file.patterns.sol)="file://$(SciteDefaultHome)\manual.html"
+        command.help.subsystem.$(file.patterns.sol)=2
+
+if PLAT_GTK
+        command.help.$(file.patterns.sol)=man $(CurrentWord) | col -b
+
+command.compile.*.sol=solc -c $(FileNameExt)
+command.build.*.sol=solc -be $(FileNameExt)
+command.go.*.sol=$(FileName)
+command.go.subsystem.*.sol=1
+
+command.name.0.*.sol=XSolP
+command.0.*.sol =xsolp -be $(FileNameExt)
+command.is.filter.0.*.sol=1
+
+command.name.1.*.sol=XSolC
+command.1.*.sol =xsolc -be $(FileNameExt)
+command.is.filter.1.*.sol=1
+
+command.name.2.*.sol=Compile to Php
+command.2.*.sol=solp -b $(FileNameExt)
+command.is.filter.2.*.sol=1
+
+command.name.3.*.sol=Compile Web page
+command.3.*.sol=solp -b -w $(FileNameExt)
+command.is.filter.3.*.sol=1
+
+command.name.4.*.sol=Interpret
+command.4.*.sol=solp $(FileNameExt)
+command.is.filter.4.*.sol=1
+
+
+module smalltalk
+
+file.patterns.smalltalk=*.st
+
+filter.smalltalk=Smalltalk (st)|$(file.patterns.smalltalk)|
+
+*filter.smalltalk=$(filter.smalltalk)
+
+lexer.$(file.patterns.smalltalk)=smalltalk
+
+keywords.$(file.patterns.smalltalk)=\
+    ifTrue: ifFalse: whileTrue: whileFalse: ifNil: ifNotNil: whileTrue whileFalse repeat isNil notNil
+
+
+style.smalltalk.0=
+style.smalltalk.1=$(colour.string),eolfilled
+style.smalltalk.2=$(colour.number)
+style.smalltalk.3=$(colour.code.comment.box)
+style.smalltalk.4=fore:#800080
+style.smalltalk.5=$(colour.operator)
+style.smalltalk.6=$(colour.keyword),bold
+style.smalltalk.7=$(colour.keyword),bold
+style.smalltalk.8=$(colour.keyword),bold
+style.smalltalk.9=$(colour.keyword),bold
+style.smalltalk.10=bold
+style.smalltalk.11=fore:#A00000,bold
+style.smalltalk.12=bold
+style.smalltalk.13=fore:#008000
+style.smalltalk.14=bold
+style.smalltalk.15=$(colour.char)
+style.smalltalk.16=$(colour.keyword),bold
+
+module sorcins
+
+file.patterns.sorcins=*.ins
+filter.sorcins=SORCUS Installation File (ins)|$(file.patterns.sorcins)|
+
+*filter.sorcins=$(filter.sorcins)
+
+lexer.$(file.patterns.sorcins)=sorcins
+
+commands=ARGUSCONNECTCHANNELS \
+    M2DEVICE M2INST M2PAR M2PROC M2FUNC M2CMD M2LOADMODUL \
+    M6DEVICE M6INST M6PAR M6PROC M6FUNC M6CMD M6LOADMODUL \
+    M7DEVICE M7INST M7PAR M7PROC M7FUNC M7CMD M7LOADMODUL \
+    M8DEVICE M8INST M8PAR M8PROC M8FUNC M8CMD M8LOADMODUL \
+    MAXRESET MAXCONNECTCPU MAXLOADOSX MAXINST MAXPROC \
+    MAXFUNC MAXPAR MAXLOADMDD MAXFLASHFILE
+
+parameter=board slot layer osx file no usage task tasktype level irq flags \
+    datasize func para start progno name count index TIMEOUT RESET
+
+constants=MAX_NI_TASK MAX_TI_TASK MAX_II_TASK MAX_DI_TASK
+
+keywords.$(file.patterns.sorcins)=$(commands)
+keywords2.$(file.patterns.sorcins)=$(parameter)
+keywords3.$(file.patterns.sorcins)=$(constants)
+
+comment.block.sorcins=;
+
+style.sorcins.0=
+style.sorcins.1=fore:#0000ff
+style.sorcins.2=fore:#808080
+style.sorcins.3=fore:#008000
+style.sorcins.4=fore:#ff0000
+style.sorcins.5=
+style.sorcins.6=
+style.sorcins.7=
+style.sorcins.8=
+style.sorcins.9=fore:#ff00ff
+
+module specman
+
+file.patterns.specman=*.e
+
+filter.specman=Specman (e)|\
+$(file.patterns.specman)|
+
+*filter.specman=$(filter.specman)
+
+lexer.$(file.patterns.specman)=specman
+
+*language.specman=Specman|e||
+
+keywords.$(file.patterns.specman)= \
+struct unit \
+integer real bool int long uint nibble byte bits bytes bit time string \
+var instance event \
+verilog vhdl \
+on compute start expect check that routine \
+specman is also first only with like \
+list of all radix hex dec bin ignore illegal \
+traceable untraceable \
+cover using count_only trace_only at_least transition item ranges \
+cross text call task within \
+packing low high \
+locker address \
+body code vec chars \
+byte_array external_pointer \
+choose matches \
+if then else when try \
+case casex casez default \
+and or not xor \
+until repeat while for from to step each do break continue \
+before next always -kind network \
+index it me in new return result select \
+cycle sample events forever \
+wait  change  negedge rise fall delay sync sim true detach eventually emit \
+gen keep keeping soft before \
+define as computed type extend \
+variable global sys \
+import \
+untyped symtab ECHO DOECHO \
+initialize non_terminal testgroup delayed exit finish \
+out append print outf appendf \
+post_generate pre_generate setup_test finalize_test extract_test \
+init run copy as_a a set_config dut_error add clear lock quit \
+lock unlock release swap quit to_string value stop_run \
+crc_8 crc_32 crc_32_flip get_config add0 all_indices and_all \
+apply average count delete exists first_index get_indices \
+has insert is_a_permutation is_empty key key_exists key_index \
+last last_index max max_index max_value min min_index \
+min_value or_all pop pop0 push push0 product resize reverse \
+sort split sum top top0 unique clear is_all_iterations \
+get_enclosing_unit hdl_path exec deep_compare deep_compare_physical \
+pack unpack warning error fatal \
+size \
+files load module ntv source_ref script read write \
+initial idle others posedge clock cycles \
+statement action command member exp block num file
+
+keywords2.$(file.patterns.specman)= \
+TRUE FALSE \
+MAX_INT MIN_INT NULL UNDEF \
+
+keywords3.$(file.patterns.specman)= \
+any_sequence_item sequence any_sequence_driver driver \
+created_driver  parent_sequence \
+bfm_interaction_mode PULL_MODE PUSH_MODE MAIN SIMPLE RANDOM \
+max_random_count max_random_depth num_of_last_items \
+NORMAL NONE FULL LOW HIGH MEDIUM logger message \
+get_tags show_units show_actions show_message ignore_tags \
+set_style set_screen set_file set_flush_frequency \
+set_format set_units set_actions at_message_verbosity \
+short_name short_name_path short_name_style \
+\
+private protected package rerun any_env \
+unqualified_clk clk reset_start reset_end \
+message_logger verbosity tags to_file \
+\
+body pre_body post_body get_next_item send_to_bfm \
+get_depth get_driver nice_string get_index grab \
+is_blocked is_relevant ungrab mid_do post_do post_trace \
+pre_do current_grabber get_current_item get_num_items_sent \
+get_sequence_trace_list get_trace_list is_grabbed \
+try_next_item check_is_relevant delay_clock \
+get_sub_drivers regenerate_data wait_for_sequences \
+stop
+
+keywords4.$(file.patterns.specman)=
+
+word.chars.specman=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.specman)=$(word.chars.specman)
+comment.block.specman=//~
+comment.block.at.line.start.specman=1
+comment.stream.start.specman=
+comment.stream.end.specman=
+comment.box.start.specman=
+comment.box.middle.specman=
+comment.box.end.specman=
+
+
+indent.maintain.$(file.patterns.specman)=1;
+
+
+preprocessor.symbol.$(file.patterns.specman)=#
+preprocessor.start.$(file.patterns.specman)=ifdef ifndef
+preprocessor.middle.$(file.patterns.specman)=else
+preprocessor.end.$(file.patterns.specman)=}
+
+
+
+style.specman.32=$(font.base)
+style.specman.0=fore:#808080
+style.specman.1=$(font.base)
+style.specman.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.specman.3=fore:red
+style.specman.4=$(colour.number)
+style.specman.5=$(colour.keyword),bold
+style.specman.6=$(colour.string)
+style.specman.7=fore:#B00040
+style.specman.8=fore:#804080,bold
+style.specman.9=$(colour.preproc)
+style.specman.10=$(colour.operator),bold
+style.specman.11=
+style.specman.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.specman.13=fore:#007F00,back:#E0FFE0
+style.specman.14=fore:#00005F
+style.specman.19=back:#E0F0FF
+
+braces.specman.style=10
+
+
+module spice
+
+file.patterns.spice=*.scp;*.out
+filter.spice=Spice (out scp)|$(file.patterns.spice)|
+*filter.spice=$(filter.spice)
+lexer.$(file.patterns.spice)=spice
+
+
+keywordclass.spice.command=\
+ac  alias  alter  alterparam append askvalues assertvalid autoscale \
+break compose copy copytodoc dc  delete  destroy  destroyvec diff  display \
+disto  dowhile  echo  else  end  errorstop  fftinit filter foreach  fourier \
+freqtotime function  functionundef goto  homecursors if isdisplayed label \
+let  linearize listing  load  loadaccumulator makelabel movelabel makesmithplot \
+movecursorleft movecursorright  msgbox nameplot  newplot nextparam noise \
+nopoints  op plot plotf plotref poly print  printcursors  printevent printname \
+printplot printstatus printtext printtol printunits printval printvector \
+pwl  pz  quit  removesmithplot rename repeat  resume  rotate  runs rusage \
+save sendplot sendscript sens  set  setcursor setdoc setlabel setlabeltype \
+setmargins setnthtrigger  setunits setvec setparam setplot  setquery \
+setscaletype settracecolor settracestyle setsource settrigger  setvec \
+setxlimits setylimits show  showmod  sort status  step  stop  switch \
+tf  timetofreq  timetowave tran  unalias  unlet  unset  unalterparam \
+update version view   wavefilter  wavetotime where  while  write
+keywordclass.spice.functions=\
+abs askvalue atan average ceil cos db differentiate differentiatex \
+exp finalvalue floor getcursorx getcursory getcursory0 getcursory1 \
+getparam im ln initialvalue integrate integratex interpolate isdef \
+isdisplayed j log length mag, max maxscale mean meanpts min minscale \
+nextplot  nextvector  norm operatingpoint ph phase phaseextend pk_pk \
+pos pulse re rms rmspts rnd sameplot  sin sqrt stddev stddevpts tan \
+tfall tolerance trise unitvec vector
+keywordclass.spice.params=param nodeset include options dcconv subckt ends model
+
+
+keywordclass.spice=$(keywordclass.spice.command) $(keywordclass.spice.functions) $(keywordclass.spice.params)
+
+keywords.$(file.patterns.spice)=$(keywordclass.spice.command)
+keywords2.$(file.patterns.spice)=$(keywordclass.spice.functions)
+keywords3.$(file.patterns.spice)=$(keywordclass.spice.params)
+
+style.spice.0=fore:#808080
+style.spice.1=
+style.spice.2=$(colour.keyword)
+style.spice.3=$(colour.keyword),bold
+style.spice.4=fore:#0040E0
+style.spice.5=$(colour.number)
+style.spice.6=$(colour.operator),bold
+style.spice.7=$(colour.char)
+style.spice.8=$(colour.code.comment.line),$(font.code.comment.line)
+
+comment.block.spice=*~
+
+braces.spice.style=4
+
+statement.indent.$(file.patterns.spice)=5 begin declare else elsif exception for if is loop while
+statement.lookback.$(file.patterns.spice)=20
+block.start.$(file.patterns.spice)=10 then is
+block.end.$(file.patterns.spice)=10 end
+
+calltip.spice.word.characters=._$(chars.alpha)
+
+module sql
+
+file.patterns.sql=*.sql
+file.patterns.plsql=*.spec;*.body;*.sps;*.spb;*.sf;*.sp
+file.patterns.hql=*.hql
+file.patterns.pig=*.pig
+
+lexer.$(file.patterns.sql)=sql
+lexer.$(file.patterns.plsql)=sql
+lexer.$(file.patterns.hql)=sql
+lexer.$(file.patterns.pig)=sql
+
+file.patterns.sql.like=$(file.patterns.sql);$(file.patterns.plsql);$(file.patterns.hql);$(file.patterns.pig)
+
+*source.patterns.sql=$(file.patterns.sql.like);
+
+filter.sql=SQL (sql)|$(file.patterns.sql.like)|
+
+*filter.sql=$(filter.sql)
+
+*language.sql=S&QL|sql||
+
+
+comment.block.sql=--
+comment.stream.start.sql=/*
+comment.stream.end.sql=*/
+comment.box.start.sql=/*
+comment.box.middle.sql= *
+comment.box.end.sql= */
+
+style.sql.0=fore:#808080
+style.sql.1=fore:#007F00,$(font.comment)
+style.sql.2=fore:#007F00,$(font.comment)
+style.sql.3=fore:#7F7F7F
+style.sql.4=fore:#007F7F
+style.sql.5=fore:#00007F,bold
+style.sql.6=fore:#7F007F,$(font.monospace)
+style.sql.7=fore:#7F007F,$(font.monospace)
+style.sql.8=$(colour.preproc)
+style.sql.9=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+style.sql.10=bold
+style.sql.11=
+style.sql.13=fore:#007F00,$(font.comment)
+style.sql.15=fore:#007F00,$(font.comment)
+style.sql.16=fore:#B00040
+style.sql.17=fore:#3060A0,$(font.code.comment.doc)
+style.sql.18=fore:#804020,$(font.code.comment.doc)
+style.sql.19=fore:#4B0082
+style.sql.20=fore:#B00040
+style.sql.21=fore:#8B0000
+style.sql.22=fore:#800080
+style.sql.23=fore:#DD9900
+style.sql.24=fore:#EE00AA
+
+braces.sql.style=10
+
+
+
+
+keywords.$(file.patterns.sql)=\
+absolute action add admin after aggregate \
+alias all allocate alter and any are array as asc \
+assertion at authorization \
+before begin binary bit blob body boolean both breadth by \
+call cascade cascaded case cast catalog char character \
+check class clob close collate collation column commit \
+completion connect connection constraint constraints \
+constructor continue corresponding create cross cube current \
+current_date current_path current_role current_time current_timestamp \
+current_user cursor cycle \
+data date datetime day deallocate dec decimal declare default \
+deferrable deferred delete depth deref desc describe descriptor \
+destroy destructor deterministic dictionary diagnostics disconnect \
+distinct domain double drop dynamic \
+each else end end-exec equals escape every except \
+exception exec execute exists exit external \
+false fetch first float for foreign found from free full \
+function \
+general get global go goto grant group grouping \
+having host hour \
+identity if ignore immediate in indicator initialize initially \
+inner inout input insert int integer intersect interval \
+into is isolation iterate \
+join \
+key \
+language large last lateral leading left less level like \
+limit local localtime localtimestamp locator \
+map match merge minute modifies modify module month \
+names national natural nchar nclob new next no none \
+not null numeric \
+object of off old on only open operation option \
+or order ordinality out outer output \
+package pad parameter parameters partial path postfix precision prefix \
+preorder prepare preserve primary \
+prior privileges procedure public \
+read reads real recursive ref references referencing relative \
+restrict result return returns revoke right \
+role rollback rollup routine row rows \
+savepoint schema scroll scope search second section select \
+sequence session session_user set sets size smallint some| space \
+specific specifictype sql sqlexception sqlstate sqlwarning start \
+state statement static structure system_user \
+table temporary terminate than then time timestamp \
+timezone_hour timezone_minute to trailing transaction translation \
+treat trigger true \
+under union unique unknown \
+unnest update usage user using \
+value values varchar variable varying view \
+when whenever where with without work write \
+year \
+zone
+
+keywords.$(file.patterns.plsql)=\
+all alter and any array as asc at authid avg begin between \
+binary_integer \
+body boolean bulk by char char_base check close cluster collect \
+comment commit compress connect constant create current currval \
+cursor date day declare decimal default delete desc distinct \
+do drop else elsif end exception exclusive execute exists exit \
+extends false fetch float for forall from function goto group \
+having heap hour if immediate in index indicator insert integer \
+interface intersect interval into is isolation java level like \
+limited lock long loop max min minus minute mlslabel mod mode \
+month natural naturaln new nextval nocopy not nowait null number \
+number_base ocirowid of on opaque open operator option or order \
+organization others out package partition pctfree pls_integer \
+positive positiven pragma prior private procedure public raise \
+range raw real record ref release return reverse rollback row \
+rowid rownum rowtype savepoint second select separate set share \
+smallint space sql sqlcode sqlerrm start stddev subtype successful \
+sum synonym sysdate table then time timestamp to trigger true \
+type uid union unique update use user validate values varchar \
+varchar2 variance view when whenever where while with work write \
+year zone
+
+keywords3.$(file.patterns.sql)=\
+param author since return see deprecated todo
+
+keywords4.$(file.patterns.sql)=\
+acc~ept a~ppend archive log attribute \
+bre~ak bti~tle \
+c~hange cl~ear col~umn comp~ute conn~ect copy \
+def~ine del desc~ribe disc~onnect \
+e~dit exec~ute exit \
+get \
+help ho~st \
+i~nput \
+l~ist \
+passw~ord pau~se pri~nt pro~mpt \
+quit \
+recover rem~ark repf~ooter reph~eader r~un \
+sav~e set sho~w shutdown spo~ol sta~rt startup store \
+timi~ng tti~tle \
+undef~ine \
+var~iable \
+whenever oserror whenever sqlerror \
+
+keywords5.$(file.patterns.sql)=\
+dbms_output.disable dbms_output.enable dbms_output.get_line \
+dbms_output.get_lines dbms_output.new_line dbms_output.put \
+dbms_output.put_line \
+
+
+keywords.$(file.patterns.hql)=\
+all alter and as authorization between both by \
+case cast column conf create cross cube current \
+cursor database delete describe distinct \
+drop else end exchange exists extended external fetch following \
+for from full function grant group grouping having if import in inner insert \
+intersect interval into is join lateral left less like local macro map \
+more not of on or order out outer over partialscan partition percent \
+preceding preserve procedure range reads reduce revoke right rollup row rows \
+select set table tablesample then to transform trigger \
+truncate unbounded union uniquejoin update user using values \
+when where window with commit only regexp rlike rollback start \
+cache constraint foreign primary references \
+extract floor precision views \
+sync
+
+keywords6.$(file.patterns.hql)=\
+add admin after analyze archive asc before bucket buckets cascade change \
+cluster clustered clusterstatus collection columns comment compact compactions \
+compute concatenate continue data databases dbproperties deferred \
+defined delimited dependency desc directories directory disable distribute \
+elem_type enable escaped exclusive explain export fields file fileformat first \
+format formatted functions hold_ddltime idxproperties ignore index \
+indexes inpath inputdriver inputformat items jar keys key_type limit lines \
+load location lock locks logical mapjoin materialized metadata minus \
+msck noscan no_drop offline option outputdriver outputformat \
+overwrite owner partitioned partitions plus pretty principals protection purge \
+read readonly rebuild recordreader recordwriter regexp reload rename repair \
+replace replication restrict rewrite rlike role roles schema schemas \
+semi serde serdeproperties server sets shared show show_database skewed sort \
+sorted ssl statistics stored streamtable tables tblproperties \
+temporary terminated touch transactions unarchive undo uniontype \
+unlock unset uri use utc value_type view while \
+autocommit isolation level offset snapshot transaction work write \
+abort key last norely novalidate nulls rely validate \
+detail expression operator quarter summary vectorization \
+zone
+
+keywords7.$(file.patterns.hql)=\
+array bigint boolean char date decimal double float int smallint timestamp \
+utc_tmestamp varchar integer time numeric \
+datetime long string struct tinyint timestamptz unsigned utctimestamp
+
+keywords4.$(file.patterns.hql)=\
+round floor ceil rand exp ln log10 log2 log pow sqrt bin hex unhex conv abs \
+pmod sin asin cos acos tan atan degrees radians positive negative sign e pi \
+size map_keys map_values array_contains sort_array \
+binary cast \
+from_unixtime unix_timestamp to_date datediff date_add date_sub \
+from_utc_timestamp to_utc_timestamp \
+day hour minute second month year weekofyear \
+if case coalesce nullif \
+ascii concat concat_ws context_ngrams find_in_set format_number \
+get_json_object in_file instr length locate lower lpad ltrim ngrams parse_url \
+printf regexp_extract regexp_replace repeat reverse rpad rtrim sentences \
+space split str_to_map substr substring translate trim upper \
+hash
+
+keywords8.$(file.patterns.hql)=\
+current_timestamp false none null true dayofweek \
+dow week years months weeks days hours minutes seconds \
+orc csv parquet rc
+
+keywords.$(file.patterns.pig)=\
+and any all arrange as asc by cache case \
+%declare %default dense desc else end eval flatten full generate if \
+inner input in into is left matches not onschema or outer output \
+parallel partition returns right rollup ship stderr stdin stdout then \
+through using when
+
+keywords6.$(file.patterns.pig)=\
+assert cogroup cross cube define distinct filter foreach group  import join \
+limit load native order rank sample split set store stream union register
+
+keywords7.$(file.patterns.pig)=\
+int long float double chararray bytearray boolean datetime biginteger bigdecimal \
+tuple bag map \
+pigstorage pigdump jsonloader jsonstorage avrostorage orcstorage textloader \
+hbasestorage trevnistorage accumulostorage
+
+keywords8.$(file.patterns.pig)=\
+true false null void
+
+keywords4.$(file.patterns.pig)=\
+avg bagtostring bagtotuple bloom buildbloom concat count count_star diff \
+isempty max min plucktuple size subtract sum tokenize \
+abs acos asin atan cbrt ceil cos cosh exp floor log log10 random round \
+round_to sin sinh sqrt tan tanh \
+endswith equalsignorecase indexof last_index_of lcfirst lower ltrim \
+regex_extract regex_extract_all regex_search replace rtrim sprintf startswith \
+strsplit strsplittobag substring trim ucfirst upper \
+uniqueid addduration currenttime daysbetween getday gethour getmillisecond \
+getminute getmonth getsecond getweek getweekyear getyear hoursbetween \
+millisecondsbetween minutesbetween monthsbetween secondsbetween \
+subtractduration todate tomilliseconds tostring tounixtime weeksbetween \
+yearsbetween \
+totuple tobag tomap top
+
+keywords5.$(file.patterns.pig)=\
+cat cd cp du ls mkdir mv pwd rm rmf \
+copyfromlocal copytolocal pig \
+fs sh clear exec help history kill quit run \
+describe dump explain illustrate
+
+
+module tacl
+
+file.patterns.TACL=*.tacl
+filter.tacl=TACL (TACL)|$(file.patterns.TACL)|
+*filter.tacl=$(filter.tacl)
+
+lexer.$(file.patterns.TACL)=TACL
+
+keywords.$(file.patterns.TACL)=activate add adddsttransition adduser alter altpri assign attachseg backupcpu break builtins buscmd clear columnize comment compute copy dump copyvar create createseg debug debugnow default delete deluser detachseg env exit fileinfo filenames files filetovar help history home info initterm inlecho inleof inlout inlprefix inlto join keep keys lights load loaded files logoff logon o obey outvar param password pause pmsearch pmsg pop ppd purge push rcvdump receivedump reload remotepassword rename reset rpasswrd run rund seginfo set setprompt settime show sink status stop suspend switch system systimes time timestamp_to_text useusers variables varinfo vartofile vchange vcopy vdelete vfind vinsert vlist vmove volume vtree wakeup who xbusdown xbusup ybusdown ybusup _comparev _contime_to_text _contime_to_text_date _contime_to_text_time _debugger _execute _longest _month3
+
+comment.block.TACL===
+
+style.TACL.0=fore:#808080,$(font.monospace)
+
+style.TACL.1=$(colour.text.comment),$(font.code.comment)
+style.TACL.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.TACL.3=$(colour.code.comment.document),$(font.code.comment.document)
+style.TACL.4=$(colour.number),$(font.monospace)
+style.TACL.5=$(colour.keyword),bold,$(font.monospace)
+style.TACL.6=$(colour.string),$(font.monospace),$(font.monospace)
+style.TACL.7=$(colour.char),$(font.monospace),$(font.monospace)
+style.TACL.8=back:#C0C0C0,bold,$(font.monospace)
+style.TACL.9=$(colour.preproc),$(font.preproc),$(font.monospace)
+style.TACL.10=$(colour.operator),bold,$(font.monospace)
+style.TACL.11=$(colour.identifier),$(font.identifier),$(font.monospace)
+style.TACL.16=fore:#0020F0,$(font.monospace)
+
+
+
+module tal
+file.patterns.TAL=*.TAL
+filter.tal=TAL (TAL)|$(file.patterns.TAL)|
+*filter.tal=$(filter.tal)
+
+lexer.$(file.patterns.TAL)=TAL
+
+keywords.$(file.patterns.TAL)=and assert baddr begin by call callable case cbaddr code cwaddr define do downto drop else end entry external fixed for forward goto if int interrupt label land literal lor main not of or otherwise priv proc procaddr real resident return rscan scan sgbaddr sgwaddr sgxbaddr sgxwaddr stack store string struct subproc then to unsigned until use variable waddr while xor
+keywords2.$(file.patterns.TAL)=at below bit_filler block bytes c cobol elements ext extensible filler fortran language name pascal private unspecified words
+
+comment.block.TAL=--
+
+style.TAL.0=fore:#808080
+
+style.TAL.1=fore:#008000,$(font.code.comment)
+style.TAL.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.TAL.3=$(colour.code.comment.document),$(font.code.comment.document)
+style.TAL.4=$(colour.number)
+style.TAL.5=$(colour.keyword),bold
+style.TAL.6=$(colour.string),$(font.monospace)
+style.TAL.7=$(colour.char),$(font.monospace)
+style.TAL.8=$(colour.keyword),bold
+style.TAL.9=$(colour.preproc),$(font.preproc)
+style.TAL.10=$(colour.operator),bold
+style.TAL.11=$(colour.identifier),$(font.identifier)
+
+
+
+
+module tcl
+
+file.patterns.tcl=*.tcl;*.exp
+file.patterns.itcl=*.itcl
+file.patterns.tcl.like=$(file.patterns.tcl);$(file.patterns.itcl);
+
+filter.tcl=Tcl (tcl)|$(file.patterns.tcl)|
+filter.itcl=itcl (itcl)|$(file.patterns.itcl)|
+
+*filter.tcl=$(filter.tcl)
+
+lexer.$(file.patterns.tcl)=tcl
+lexer.$(file.patterns.itcl)=tcl
+
+*language.tcl=&TCL|tcl||
+
+keywordclass.tcl=after append array auto_execok \
+auto_import auto_load auto_load_index auto_qualify \
+beep bgerror binary break case catch cd clock \
+close concat continue dde default echo else elseif \
+encoding eof error eval exec exit expr fblocked \
+fconfigure fcopy file fileevent flush for foreach format \
+gets glob global history http if incr info \
+interp join lappend lindex linsert list llength load \
+loadTk lrange lreplace lsearch lset lsort memory msgcat \
+namespace open package pid pkg::create pkg_mkIndex Platform-specific proc \
+puts pwd re_syntax read regexp registry regsub rename \
+resource return scan seek set socket source split \
+string subst switch tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tell \
+time trace unknown unset update uplevel upvar variable \
+vwait while
+
+keywordclass.tk=bell bind bindtags bitmap button canvas checkbutton clipboard \
+colors console cursors destroy entry event focus font \
+frame grab grid image Inter-client keysyms label labelframe \
+listbox lower menu menubutton message option options pack \
+panedwindow photo place radiobutton raise scale scrollbar selection \
+send spinbox text tk tk_chooseColor tk_chooseDirectory tk_dialog tk_focusNext \
+tk_getOpenFile tk_messageBox tk_optionMenu tk_popup tk_setPalette tkerror tkvars tkwait \
+toplevel winfo wish wm
+
+keywordclass.itcl=@scope body class code common component configbody \
+constructor define destructor hull import inherit itcl itk itk_component \
+itk_initialize itk_interior itk_option iwidgets keep method \
+private protected public
+
+keywordclass.TkCommands=tk_bisque tk_chooseColor tk_dialog tk_focusFollowsMouse tk_focusNext \
+tk_focusPrev tk_getOpenFile tk_getSaveFile tk_messageBox tk_optionMenu \
+tk_popup tk_setPalette tk_textCopy tk_textCut tk_textPaste \
+tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave \
+tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke \
+tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector \
+tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues \
+tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor \
+tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove \
+tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory \
+tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt \
+tkConsoleSource tkDarken tkEntryAutoScan tkEntryBackspace tkEntryButton1 \
+tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect \
+tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor \
+tkEntryTranspose tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tkFocusGroup_BindIn \
+tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out \
+tkFocusOK tkGenerateMenuSelect tkIconList tkIconList_Add tkIconList_Arrange \
+tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 \
+tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn \
+tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke \
+tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset \
+tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 \
+tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect \
+tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto \
+tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion \
+tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave \
+tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup \
+tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke \
+tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu \
+tkMenuRightArrow tkMenuUnpost tkMenuUpArrow tkMessageBox tkMotifFDialog \
+tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList \
+tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create \
+tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList \
+tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tkPostOverPoint \
+tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down \
+tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement \
+tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp \
+tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect \
+tkScrollStartDrag tkScrollTopBottom tkScrollToPos tkTabToWindow tkTearOffMenu \
+tkTextAutoScan tkTextButton1 tkTextClosestGap tkTextInsert tkTextKeyExtend \
+tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tkTextPaste \
+tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages \
+tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu \
+tkTraverseWithinMenu
+
+keywords.$(file.patterns.tcl.like)=$(keywordclass.tcl)
+keywords2.$(file.patterns.tcl.like)=$(keywordclass.tk)
+keywords3.$(file.patterns.tcl.like)= $(keywordclass.TkCommands)
+keywords4.$(file.patterns.itcl)=$(keywordclass.itcl)
+keywords5.$(file.patterns.tcl.like)=expand
+
+comment.block.tcl=#~
+comment.box.start.tcl=##
+comment.box.middle.tcl= #
+comment.box.end.tcl= ##
+
+style.tcl.32=$(font.base)
+style.tcl.0=fore:#808080
+style.tcl.1=$(colour.code.comment.line),$(font.comment),back:#f0FFE0
+style.tcl.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.tcl.3=$(colour.number)
+style.tcl.4=$(colour.string),bold,back:#FFF0F0
+style.tcl.5=$(colour.string),back:#FFf0f0,eolfilled
+style.tcl.6=$(colour.operator),bold
+style.tcl.7=$(colour.keyword)
+style.tcl.8=$(colour.preproc)
+style.tcl.9=$(colour.preproc),back:#effff0
+style.tcl.10=$(colour.char)
+style.tcl.11=$(colour.keyword),back:#FFFF80,bold
+style.tcl.12=$(colour.keyword),bold
+style.tcl.13=$(colour.keyword),back:#e0ffff,bold
+style.tcl.14=$(colour.keyword),back:#FFf0f0,bold
+style.tcl.15=$(colour.keyword),back:#FFD0D0,bold
+style.tcl.16=$(style.tcl.7),back:#FFD0FF,bold
+style.tcl.17=$(style.tcl.7),back:#FFFFD0,bold
+style.tcl.18=$(style.tcl.7),back:#FFA0A0,bold,
+style.tcl.19=$(style.tcl.7),back:#FFD0D0
+style.tcl.20=$(colour.code.comment.box),$(font.code.comment.box),back:#f0FFf0,eolfilled
+style.tcl.21=$(colour.embedded.comment),$(font.embedded.comment),back:#f0FFf0
+
+style.tcl.34=fore:#f0f0f0,bold,back:#7070ff
+style.tcl.35=fore:#FF0000,bold,back:#FF00FF
+
+braces.tcl.style=6
+
+module tex
+
+
+
+file.patterns.tex=*.tex;*.sty
+file.patterns.latex=*.tex;*.sty;*.aux;*.toc;*.idx
+file.patterns.context=*.tex;*.tui;*.tuo;*.sty
+
+
+filter.tex=TeX (tex sty)|$(file.patterns.tex)|
+filter.latex=LaTeX (tex sty aux toc idx)|$(file.patterns.latex)|
+filter.context=ConTeXt (tex tui tuo sty)|$(file.patterns.context)|
+
+lexer.$(file.patterns.tex)=tex
+lexer.$(file.patterns.latex)=tex
+lexer.$(file.patterns.context)=tex
+
+*language.tex=TeX|tex||
+
+
+command.compile.$(file.patterns.tex)=
+command.build.$(file.patterns.tex)=tex $(FileNameExt)
+command.go.$(file.patterns.tex)=gv $(FileName).pdf
+
+command.compile.$(file.patterns.latex)=
+command.build.$(file.patterns.latex)=pdflatex $(FileNameExt)
+command.go.$(file.patterns.latex)=gv $(FileName).pdf
+
+command.compile.$(file.patterns.context)=
+command.build.$(file.patterns.context)=texexec --pdf $(FileNameExt)
+command.go.$(file.patterns.context)=gv $(FileName).pdf
+
+command.0.$(file.patterns.tex)=
+command.1.$(file.patterns.tex)=
+command.2.$(file.patterns.tex)=
+command.3.$(file.patterns.tex)=
+command.4.$(file.patterns.tex)=
+command.5.$(file.patterns.tex)=
+command.6.$(file.patterns.tex)=
+command.7.$(file.patterns.tex)=
+command.8.$(file.patterns.tex)=
+command.9.$(file.patterns.tex)=
+
+command.0.$(file.patterns.latex)=
+command.1.$(file.patterns.latex)=
+command.2.$(file.patterns.latex)=
+command.3.$(file.patterns.latex)=
+command.4.$(file.patterns.latex)=
+command.5.$(file.patterns.latex)=
+command.6.$(file.patterns.latex)=
+command.7.$(file.patterns.latex)=
+command.8.$(file.patterns.latex)=
+command.9.$(file.patterns.latex)=
+
+command.0.$(file.patterns.context)=
+command.1.$(file.patterns.context)=
+command.2.$(file.patterns.context)=
+command.3.$(file.patterns.context)=
+command.4.$(file.patterns.context)=
+command.5.$(file.patterns.context)=
+command.6.$(file.patterns.context)=
+command.7.$(file.patterns.context)=
+command.8.$(file.patterns.context)=
+command.9.$(file.patterns.context)=
+
+command.name.2.$(file.patterns.tex)=BibTeX
+command.name.2.$(file.patterns.latex)=BibTeX
+command.name.2.$(file.patterns.context)=BibTeX
+command.2.$(file.patterns.tex)=bibtex $(FileName)
+command.2.$(file.patterns.latex)=bibtex $(FileName)
+command.2.$(file.patterns.context)=bibtex $(FileName)
+
+
+style.tex.0=fore:#3F3F3F
+style.tex.1=fore:#007F7F
+style.tex.2=fore:#7F0000
+style.tex.3=fore:#7F7F00
+style.tex.4=fore:#007F00
+style.tex.5=
+
+style.tex.34=fore:#00007F
+style.tex.35=fore:#7F007F
+
+
+comment.block.tex=%
+comment.block.at.line.start.tex=1
+
+
+lexer.tex.interface.default=0
+
+
+lexer.tex.use.keywords=1
+
+
+lexer.tex.comment.process=0
+
+
+lexer.tex.auto.if=1
+
+
+keywordclass.primitives.tex=\
+    above abovedisplayshortskip abovedisplayskip \
+    abovewithdelims accent adjdemerits advance afterassignment \
+    aftergroup atop atopwithdelims \
+    badness baselineskip batchmode begingroup \
+    belowdisplayshortskip belowdisplayskip binoppenalty botmark \
+    box boxmaxdepth brokenpenalty \
+    catcode char chardef cleaders closein closeout clubpenalty \
+    copy count countdef cr crcr csname \
+    day deadcycles def defaulthyphenchar defaultskewchar \
+    delcode delimiter delimiterfactor delimeters \
+    delimitershortfall delimeters dimen dimendef discretionary \
+    displayindent displaylimits displaystyle \
+    displaywidowpenalty displaywidth divide \
+    doublehyphendemerits dp dump \
+    edef else emergencystretch end endcsname endgroup endinput \
+    endlinechar eqno errhelp errmessage errorcontextlines \
+    errorstopmode escapechar everycr everydisplay everyhbox \
+    everyjob everymath everypar everyvbox exhyphenpenalty \
+    expandafter  \
+    fam fi finalhyphendemerits firstmark floatingpenalty font \
+    fontdimen fontname futurelet \
+    gdef global group globaldefs \
+    halign hangafter hangindent hbadness hbox hfil horizontal \
+    hfill horizontal hfilneg hfuzz hoffset holdinginserts hrule \
+    hsize hskip hss horizontal ht hyphenation hyphenchar \
+    hyphenpenalty hyphen \
+    if ifcase ifcat ifdim ifeof iffalse ifhbox ifhmode ifinner \
+    ifmmode ifnum ifodd iftrue ifvbox ifvmode ifvoid ifx \
+    ignorespaces immediate indent input inputlineno input \
+    insert insertpenalties interlinepenalty \
+    jobname \
+    kern \
+    language lastbox lastkern lastpenalty lastskip lccode \
+    leaders left lefthyphenmin leftskip leqno let limits \
+    linepenalty line lineskip lineskiplimit long looseness \
+    lower lowercase \
+    mag mark mathaccent mathbin mathchar mathchardef mathchoice \
+    mathclose mathcode mathinner mathop mathopen mathord \
+    mathpunct mathrel mathsurround maxdeadcycles maxdepth \
+    meaning medmuskip message mkern month moveleft moveright \
+    mskip multiply muskip muskipdef \
+    newlinechar noalign noboundary noexpand noindent nolimits \
+    nonscript scriptscript nonstopmode nulldelimiterspace \
+    nullfont number \
+    omit openin openout or outer output outputpenalty over \
+    overfullrule overline overwithdelims \
+    pagedepth pagefilllstretch pagefillstretch pagefilstretch \
+    pagegoal pageshrink pagestretch pagetotal par parfillskip \
+    parindent parshape parskip patterns pausing penalty \
+    postdisplaypenalty predisplaypenalty predisplaysize \
+    pretolerance prevdepth prevgraf \
+    radical raise read relax relpenalty right righthyphenmin \
+    rightskip romannumeral \
+    scriptfont scriptscriptfont scriptscriptstyle scriptspace \
+    scriptstyle scrollmode setbox setlanguage sfcode shipout \
+    show showbox showboxbreadth showboxdepth showlists showthe \
+    skewchar skip skipdef spacefactor spaceskip span special \
+    splitbotmark splitfirstmark splitmaxdepth splittopskip \
+    string \
+    tabskip textfont textstyle the thickmuskip thinmuskip time \
+    toks toksdef tolerance topmark topskip tracingcommands \
+    tracinglostchars tracingmacros tracingonline tracingoutput \
+    tracingpages tracingparagraphs tracingrestores tracingstats \
+    uccode uchyph underline unhbox unhcopy unkern unpenalty \
+    unskip unvbox unvcopy uppercase \
+    vadjust valign vbadness vbox vcenter vfil vfill vfilneg \
+    vfuzz voffset vrule vsize vskip vsplit vss vtop \
+    wd widowpenalty write \
+    xdef xleaders xspaceskip \
+    year
+
+keywordclass.primitives.etex=\
+    beginL beginR botmarks \
+    clubpenalties currentgrouplevel currentgrouptype \
+    currentifbranch currentiflevel currentiftype \
+    detokenize dimexpr displaywidowpenalties \
+    endL endR eTeXrevision eTeXversion everyeof \
+    firstmarks fontchardp fontcharht fontcharic fontcharwd \
+    glueexpr glueshrink glueshrinkorder gluestretch \
+    gluestretchorder gluetomu \
+    ifcsname ifdefined iffontchar interactionmode \
+    interactionmode interlinepenalties \
+    lastlinefit lastnodetype \
+    marks topmarks middle muexpr mutoglue \
+    numexpr \
+    pagediscards parshapedimen parshapeindent parshapelength \
+    predisplaydirection \
+    savinghyphcodes savingvdiscards scantokens showgroups \
+    showifs showtokens splitdiscards splitfirstmarks \
+    TeXXeTstate tracingassigns tracinggroups tracingifs \
+    tracingnesting tracingscantokens \
+    unexpanded unless \
+    widowpenalties
+
+keywordclass.primitives.pdftex=\
+    pdfadjustspacing pdfannot pdfavoidoverfull \
+    pdfcatalog pdfcompresslevel \
+    pdfdecimaldigits pdfdest pdfdestmargin \
+    pdfendlink pdfendthread \
+    pdffontattr pdffontexpand pdffontname pdffontobjnum pdffontsize \
+    pdfhorigin \
+    pdfimageresolution pdfincludechars pdfinfo \
+    pdflastannot pdflastdemerits pdflastobj \
+    pdflastvbreakpenalty pdflastxform pdflastximage \
+    pdflastximagepages pdflastxpos pdflastypos \
+    pdflinesnapx pdflinesnapy pdflinkmargin pdfliteral \
+    pdfmapfile pdfmaxpenalty pdfminpenalty pdfmovechars \
+    pdfnames \
+    pdfobj pdfoptionpdfminorversion pdfoutline pdfoutput \
+    pdfpageattr pdfpageheight pdfpageresources pdfpagesattr \
+    pdfpagewidth pdfpkresolution pdfprotrudechars \
+    pdfrefobj pdfrefxform pdfrefximage \
+    pdfsavepos pdfsnaprefpoint pdfsnapx pdfsnapy pdfstartlink \
+    pdfstartthread \
+    pdftexrevision pdftexversion pdfthread pdfthreadmargin \
+    pdfuniqueresname \
+    pdfvorigin \
+    pdfxform pdfximage
+
+keywordclass.primitives.omega=\
+    odelimiter omathaccent omathchar oradical omathchardef omathcode odelcode \
+    leftghost rightghost \
+    charwd charht chardp charit \
+    localleftbox localrightbox \
+    localinterlinepenalty localbrokenpenalty \
+    pagedir bodydir pardir textdir mathdir \
+    boxdir nextfakemath \
+    pagewidth pageheight pagerightoffset pagebottomoffset \
+    nullocp nullocplist ocp externalocp ocplist pushocplist popocplist clearocplists ocptracelevel \
+    addbeforeocplist addafterocplist removebeforeocplist removeafterocplist \
+    OmegaVersion \
+    InputTranslation OutputTranslation DefaultInputTranslation DefaultOutputTranslation \
+    noInputTranslation noOutputTranslation \
+    InputMode OutputMode DefaultInputMode DefaultOutputMode \
+    noInputMode noOutputMode noDefaultInputMode noDefaultOutputMode
+
+
+keywordclass.macros.plain.partial=\
+    TeX \
+    bgroup egroup endgraf space empty null \
+    newcount newdimen newskip newmuskip newbox newtoks newhelp newread newwrite newfam newlanguage newinsert newif \
+    maxdimen magstephalf magstep \
+    frenchspacing nonfrenchspacing normalbaselines obeylines obeyspaces raggedright ttraggedright \
+    thinspace negthinspace enspace enskip quad qquad \
+    smallskip medskip bigskip removelastskip topglue vglue hglue \
+    break nobreak allowbreak filbreak goodbreak smallbreak medbreak bigbreak \
+    line leftline rightline centerline rlap llap underbar strutbox strut \
+    cases matrix pmatrix bordermatrix eqalign displaylines eqalignno leqalignno \
+    pageno folio tracingall showhyphens fmtname fmtversion \
+    hphantom vphantom phantom smash
+
+keywordclass.macros.eplain.partial=\
+    eTeX \
+    newmarks grouptype interactionmode nodetype iftype \
+    tracingall loggingall tracingnone
+
+
+keywordclass.primitives.pdftex.experimental=
+
+keywordclass.primitives.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.primitives.pdftex.experimental) \
+    $(keywordclass.primitives.omega)
+
+
+keywordclass.macros.context.undocumented.en=
+keywordclass.macros.context.undocumented.nl=
+keywordclass.macros.context.undocumented.de=
+keywordclass.macros.context.undocumented.cz=
+keywordclass.macros.context.undocumented.it=
+keywordclass.macros.context.undocumented.ro=
+
+keywordclass.macros.context.extras=
+
+keywordclass.macros.context.nl=
+keywordclass.macros.context.en=
+keywordclass.macros.context.de=
+keywordclass.macros.context.cz=
+keywordclass.macros.context.it=
+keywordclass.macros.context.ro=
+
+import cont-en-scite
+import cont-nl-scite
+import cont-de-scite
+import cont-cz-scite
+import cont-it-scite
+import cont-ro-scite
+
+import cont-xx-scite
+
+
+keywordclass.macros.latex.all=
+
+import latex-scite
+
+
+keywordclass.tex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.macros.plain.partial)
+
+keywordclass.etex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.macros.plain.partial) \
+    $(keywordclass.macros.eplain.partial)
+
+keywordclass.latex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.macros.latex.all)
+
+keywordclass.pdflatex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.macros.latex.all)
+
+
+keywordclass.context.base=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.primitives.pdftex.experimental) \
+    $(keywordclass.primitives.omega) \
+    $(keywordclass.macros.plain.partial) \
+    $(keywordclass.macros.eplain.partial)
+
+keywordclass.context.all=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.en) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.en)
+
+keywordclass.context.all.nl=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.nl) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.nl)
+
+keywordclass.context.all.en=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.en) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.en)
+
+keywordclass.context.all.de=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.de) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.de)
+
+keywordclass.context.all.cz=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.cz) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.cz)
+
+keywordclass.context.all.it=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.it) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.it)
+
+keywordclass.context.all.ro=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.ro) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.ro)
+
+
+keywords.$(file.patterns.tex)=$(keywordclass.tex.all)
+keywords.$(file.patterns.latex)=$(keywordclass.latex.all)
+keywords.$(file.patterns.context)=$(keywordclass.context.all)
+
+
+keywords.$(file.patterns.context)=$(keywordclass.context.base)
+
+keywords2.$(file.patterns.context)=$(keywordclass.context.all.nl)
+keywords3.$(file.patterns.context)=$(keywordclass.context.all.en)
+keywords4.$(file.patterns.context)=$(keywordclass.context.all.de)
+keywords5.$(file.patterns.context)=$(keywordclass.context.all.cz)
+keywords6.$(file.patterns.context)=$(keywordclass.context.all.it)
+keywords7.$(file.patterns.context)=$(keywordclass.context.all.ro)
+
+
+
+keywords8.$(file.patterns.context)=$(keywordclass.pdflatex.all)
+
+
+word.characters.$(file.patterns.tex)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@
+word.characters.$(file.patterns.latex)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@
+word.characters.$(file.patterns.context)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@!?
+
+
+module txt2tags
+
+file.patterns.txt2tags=*.t2t
+
+shbang.txt2tags=txt2tags
+
+filter.txt2tags=Txt2tags (t2t)|$(file.patterns.txt2tags)|
+
+*filter.txt2tags=$(filter.txt2tags)
+
+lexer.$(file.patterns.txt2tags)=txt2tags
+
+*language.txt2tags=&txt2tags|t2t||
+
+style.txt2tags.0=fore:#000000
+
+style.txt2tags.1=fore:#000000
+
+style.txt2tags.2=fore:#445675,bold
+
+style.txt2tags.3=fore:#445675
+
+style.txt2tags.4=fore:#653A39,italics
+
+style.txt2tags.5=fore:#386742
+
+style.txt2tags.6=fore:#E20700,bold
+
+style.txt2tags.7=fore:#E20700,bold
+
+style.txt2tags.8=fore:#A81D05,bold
+
+style.txt2tags.9=fore:#871704,bold
+
+style.txt2tags.10=fore:#871704,bold
+
+style.txt2tags.11=fore:#871704,bold
+
+style.txt2tags.12=fore:#871704,bold
+
+style.txt2tags.13=fore:#E300EE
+
+style.txt2tags.14=fore:#E300EE
+
+style.txt2tags.15=fore:#015F52
+
+style.txt2tags.16=fore:#644A9B
+
+style.txt2tags.17=fore:#ff901e
+
+style.txt2tags.18=fore:#0930DE,italics
+
+style.txt2tags.19=fore:#009f00
+
+style.txt2tags.20=fore:#009f00
+
+style.txt2tags.21=fore:#005f00
+
+style.txt2tags.22=fore:#777777
+
+style.txt2tags.23=fore:#C0036E
+
+style.txt2tags.24=fore:#848B00
+
+style.txt2tags.25=fore:#C05600
+
+
+
+
+module vb
+
+file.patterns.vb=*.vb;*.bas;*.frm;*.cls;*.ctl;*.pag;*.dsr;*.dob
+file.patterns.wscript=*.vbs;*.dsm
+
+*source.patterns.vb=$(file.patterns.vb);$(file.patterns.wscript);
+
+filter.vb=VB (vb vbp vbs bas frm cls ctl pag dsr dob)|$(file.patterns.vb);$(file.patterns.wscript);*.vbp;*.vbg;*.mak;*.vbw|
+
+*filter.vb=$(filter.vb)
+
+lexer.$(file.patterns.vb)=vb
+lexer.$(file.patterns.wscript)=vbscript
+
+*language.vb=&VB|vb||
+
+keywordclass.vb6=\
+addressof alias and as attribute base begin binary boolean byref byte byval call case cdbl \
+cint clng compare const csng cstr currency date decimal declare defbool defbyte defcur \
+defdate defdbl defdec defint deflng defobj defsng defstr defvar dim do double each else \
+elseif empty end enum eqv erase error event exit explicit false for friend function get \
+global gosub goto if imp implements in input integer is len let lib like load lock long \
+loop lset me mid midb mod new next not nothing null object on option optional or paramarray \
+preserve print private property public raiseevent randomize redim rem resume return rset \
+seek select set single static step stop string sub text then time to true type typeof \
+unload until variant wend while with withevents xor
+
+keywordclass.vb=$(keywordclass.vb6)
+
+keywordclass.vbotherstatements=\
+appactivate beep chdir chdrive close filecopy get input kill line unlock mkdir name \
+open print put reset rmdir savepicture savesetting seek sendkeys setattr width write
+
+keywordclass.vbnet=\
+addhandler andalso ansi assembly auto catch cbool cbyte cchar cdate cdec char class \
+cobj continue csbyte cshort ctype cuint culng cushort custom default delegate directcast \
+endif externalsource finally gettype handles imports inherits interface isfalse isnot \
+istrue module mustinherit mustoverride my mybase myclass namespace narrowing notinheritable \
+notoverridable of off operator orelse overloads overridable overrides partial protected \
+readonly region removehandler sbyte shadows shared short strict structure synclock \
+throw try trycast uinteger ulong unicode ushort using when widening writeonly
+
+keywords.$(file.patterns.vb)=$(keywordclass.vb6) $(keywordclass.vbnet)
+keywords.$(file.patterns.wscript)=$(keywordclass.vb6)
+
+keywords2.$(file.patterns.vb)=$(keywordclass.vbotherstatements)
+
+comment.block.vb='~
+comment.block.vbscript='~
+
+style.vb.32=$(font.base)
+style.vb.0=
+style.vb.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.vb.2=$(colour.number)
+style.vb.3=$(colour.keyword)
+style.vb.4=$(colour.string)
+style.vb.5=$(colour.preproc)
+style.vb.6=$(colour.operator)
+style.vb.7=
+style.vb.8=$(colour.number)
+style.vb.9=$(style.stringeol)
+style.vb.10=$(style.vb.5),back:#D0FFD0
+style.vb.11=$(style.vb.5),back:#D0D0FF
+style.vb.12=$(style.vb.5),back:#FFD0D0
+
+style.vbscript.0=$(style.vb.0)
+style.vbscript.1=$(style.vb.1)
+style.vbscript.2=$(style.vb.2)
+style.vbscript.3=$(style.vb.3)
+style.vbscript.4=$(style.vb.4)
+style.vbscript.5=$(style.vb.5)
+style.vbscript.6=$(style.vb.6)
+style.vbscript.7=$(style.vb.7)
+style.vbscript.8=$(style.vb.8)
+style.vbscript.9=$(style.vb.9)
+style.vbscript.10=$(style.vb.10)
+style.vbscript.11=$(style.vb.11)
+style.vbscript.12=$(style.vb.12)
+
+command.go.$(file.patterns.wscript)="$(FilePath)"
+command.go.subsystem.$(file.patterns.wscript)=2
+
+command.build.$(file.patterns.wscript)=cscript "$(FilePath)"
+command.build.subsystem.$(file.patterns.wscript)=1
+
+command.help.$(file.patterns.wscript)=$(CurrentWord)!C:\Program Files\Microsoft Visual Studio\MSDN\2001OCT\1033\MSDN130.COL
+command.help.subsystem.$(file.patterns.wscript)=4
+command.help.$(file.patterns.vb)=$(CurrentWord)!C:\Program Files\Microsoft Visual Studio\MSDN\2001OCT\1033\MSDN130.COL
+command.help.subsystem.$(file.patterns.vb)=4
+
+module verilog
+
+file.patterns.verilog=*.v;*.vh
+filter.verilog=Verilog (verilog)|$(file.patterns.verilog)|
+
+*filter.verilog=$(filter.verilog)
+
+lexer.$(file.patterns.verilog)=verilog
+
+*language.verilog=Verilog|v||
+
+word.chars.verilog=$(chars.alpha)$(chars.numeric)_`$#
+word.characters.$(file.patterns.verilog)=$(word.chars.verilog)
+
+calltip.verilog.word.characters=$(chars.alpha)$(chars.numeric)_$
+
+comment.block.verilog=//~
+comment.stream.start.verilog=/*
+comment.stream.end.verilog=*/
+comment.box.start.verilog=/*
+comment.box.middle.verilog= *
+comment.box.end.verilog= */
+
+fold.verilog.flags=0
+
+statement.lookback.$(file.patterns.verilog)=20
+statement.end.$(file.patterns.verilog)=10 ;
+block.start.$(file.patterns.verilog)=5 begin case casex casez
+block.end.$(file.patterns.verilog)=5 begin end endcase
+statement.indent.$(file.patterns.verilog)=5 always else for if while
+
+indent.maintain.$(file.patterns.verilog)=0
+
+preprocessor.symbol.$(file.patterns.verilog)=`
+preprocessor.start.$(file.patterns.verilog)=ifdef ifndef
+preprocessor.middle.$(file.patterns.verilog)=else
+preprocessor.end.$(file.patterns.verilog)=endif
+
+keywordclass.verilog= \
+always and assign automatic \
+begin buf bufif0 bufif1 \
+case casex casez cell cmos config \
+deassign default defparam design disable \
+edge else end endcase endconfig endfunction endgenerate endmodule endprimitive endspecify endtable endtask event \
+for force forever fork function \
+generate genvar \
+highz0 highz1 \
+if ifnone incdir include initial inout input instance integer \
+join \
+large liblist library localparam \
+macromodule medium module \
+nand negedge nmos nor noshowcancelled not notif0 notif1 \
+or output \
+parameter pmos posedge primitive pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent \
+rcmos real realtime reg release repeat rnmos rpmos rtran rtranif0 rtranif1 \
+scalared showcancelled signed small specify specparam strong0 strong1 supply0 supply1 \
+table task time tran tranif0 tranif1 tri tri0 tri1 triand trior trireg \
+unsigned use uwire \
+vectored \
+wait wand weak0 weak1 while wire wor \
+xnor xor
+
+keywords.$(file.patterns.verilog)=$(keywordclass.verilog)
+
+keywords2.$(file.patterns.verilog)=
+keywords3.$(file.patterns.verilog)= \
+$async$and$array $async$and$plane $async$nand$array $async$nand$plane $async$nor$array $async$nor$plane $async$or$array $async$or$plane \
+$bitstoreal \
+$countdrivers \
+$display $displayb $displayh $displayo \
+$dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform \
+$dumpall $dumpfile $dumpflush $dumplimit $dumpoff $dumpon $dumpportsall $dumpportsflush $dumpportslimit $dumpportsoff $dumpportson $dumpvars \
+$fclose $fdisplayh $fdisplay $fdisplayf $fdisplayb $feof $ferror $fflush $fgetc $fgets $finish $fmonitorb $fmonitor $fmonitorf $fmonitorh $fopen $fread $fscanf $fseek $fsscanf $fstrobe $fstrobebb $fstrobef $fstrobeh $ftel $fullskew $fwriteb $fwritef $fwriteh $fwrite \
+$getpattern \
+$history $hold \
+$incsave $input $itor \
+$key \
+$list $log \
+$monitorb $monitorh $monitoroff $monitoron $monitor $monitoro \
+$nochange $nokey $nolog \
+$period $printtimescale \
+$q_add $q_exam $q_full $q_initialize $q_remove \
+$random $readmemb $readmemh $readmemh $realtime $realtobits $recovery $recrem $removal $reset_count $reset $reset_value $restart $rewind $rtoi \
+$save $scale $scope $sdf_annotate $setup $setuphold $sformat $showscopes $showvariables $showvars $signed $skew $sreadmemb $sreadmemh $stime $stop $strobeb $strobe $strobeh $strobeo $swriteb $swriteh $swriteo $swrite $sync$and$array $sync$and$plane $sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane $sync$or$array $sync$or$plane \
+$test$plusargs $time $timeformat $timeskew \
+$ungetc $unsigned \
+$value$plusargs \
+$width $writeb $writeh $write $writeo
+keywords4.$(file.patterns.verilog)=
+keywords5.$(file.patterns.verilog)= synopsys parallel_case infer_mux TODO
+
+
+
+file.patterns.systemverilog=*.sv;*.svh
+filter.systemverilog=systemverilog (systemverilog)|$(file.patterns.systemverilog)|
+lexer.$(file.patterns.systemverilog)=verilog
+
+word.chars.systemverilog=$(chars.alpha)$(chars.numeric)_`$#
+word.characters.$(file.patterns.systemverilog)=$(word.chars.systemverilog)
+
+statement.lookback.$(file.patterns.systemverilog)=20
+statement.end.$(file.patterns.systemverilog)=10 ;
+block.start.$(file.patterns.systemverilog)=5 begin case casex casez
+block.end.$(file.patterns.systemverilog)=5 begin end endcase
+statement.indent.$(file.patterns.systemverilog)=5 always else for if while
+
+indent.maintain.$(file.patterns.systemverilog)= 0
+
+preprocessor.symbol.$(file.patterns.systemverilog)=`
+preprocessor.start.$(file.patterns.systemverilog)=ifdef ifndef
+preprocessor.middle.$(file.patterns.systemverilog)=else
+preprocessor.end.$(file.patterns.systemverilog)=endif
+
+keywords.$(file.patterns.systemverilog)=\
+alias always always_comb always_ff always_latch and assert assign assume \
+automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case \
+casex casez cell chandle class clocking cmos config const constraint context \
+continue cover covergroup coverpoint cross deassign default defparam design \
+disable dist do edge else end endcase endclass endclocking endconfig \
+endfunction endgenerate endgroup endinterface endmodule endpackage \
+endprimitive endprogram endproperty endspecify endsequence endtable endtask \
+enum event expect export extends extern final first_match for force foreach \
+forever fork forkjoin function generate genvar highz0 highz1 if iff ifnone \
+ignore_bins illegal_bins import incdir include initial inout input inside \
+instance int integer interface intersect join join_any join_none large liblist \
+library local localparam logic longint macromodule matches medium modport \
+module nand negedge new nmos nor noshowcancelled not notif0 notif1 null or \
+output package packed parameter pmos posedge primitive priority program \
+property protected pull0 pull1 pulldown pullup pulsestyle_onevent \
+pulsestyle_ondetect pure rand randc randcase randsequence rcmos real realtime \
+ref reg release repeat return rnmos rpmos rtran rtranif0 rtranif1 scalared \
+sequence shortint shortreal showcancelled signed small solve specify specparam \
+static string strong0 strong1 struct super supply0 supply1 table tagged task \
+this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 \
+triand trior trireg type typedef union unique unsigned use uwire var vectored \
+virtual void wait wait_order wand weak0 weak1 while wildcard wire with within \
+wor xnor xor
+
+keywords2.$(file.patterns.systemverilog)=
+
+keywords3.$(file.patterns.systemverilog)=\
+$acos $acosh $asin $asinh $assertfailoff $assertfailon $assertkill \
+$assertnonvacuouson $assertoff $asserton $assertpassoff $assertpasson \
+$assertvacuousoff $async$and$array $async$and$plane $async$nand$array \
+$async$nand$plane $async$nor$array $async$nor$plane $async$or$array \
+$async$or$plane $atan $atan2 $atanh $bits $bitstoreal $bitstoshortreal $cast \
+$ceil $changed $changed_gclk $changing_gclk $clog2 $cos $cosh $countdrivers \
+$countones $coverage_control $coverage_get $coverage_get_max $coverage_merge \
+$coverage_save $dimensions $display $displayb $displayh $displayo \
+$dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson \
+$dist_t $dist_uniform $dumpall $dumpfile $dumpflush $dumplimit $dumpoff \
+$dumpon $dumpports $dumpportsall $dumpportsflush $dumpportslimit $dumpportsoff \
+$dumpportson $dumpvars $error $exit $exp $falling_gclk $fatal $fclose \
+$fdisplay $fdisplayb $fdisplayf $fdisplayh $fdisplayo $fell $fell_gclk $feof \
+$ferror $fflush $fgetc $fgets $finish $floor $fmonitor $fmonitorb $fmonitorf \
+$fmonitorh $fmonitoro $fopen $fread $fscanf $fseek $fsscanf $fstrobe $fstrobeb \
+$fstrobebb $fstrobef $fstrobeh $fstrobeo $ftel $ftell $fullskew $future_gclk \
+$fwrite $fwriteb $fwritef $fwriteh $fwriteo $get_coverage $getpattern $high \
+$history $hold $hypot $increment $incsave $info $input $isunbounded $isunknown \
+$itor $key $left $list $ln $load_coverage_db $log $log10 $low $monitor \
+$monitorb $monitorh $monitoro $monitoroff $monitoron $nochange $nokey $nolog \
+$onehot $onehot0 $past $past_gclk $period $pow $printtimescale $q_add $q_exam \
+$q_full $q_initialize $q_remove $random $readmemb $readmemh $realtime \
+$realtobits $recovery $recrem $removal $reset $reset_count $reset_value \
+$restart $rewind $right $rising_gclk $root $rose $rose_gclk $rtoi $sampled \
+$save $scale $scope $sdf_annotate $set_coverage_db_name $setup $setuphold \
+$sformat $sformatf $shortrealtobits $showscopes $showvariables $showvars \
+$signed $sin $sinh $size $skew $sqrt $sreadmemb $sreadmemh $sscanf $stable \
+$stable_gclk $steady_gclk $stime $stop $strobe $strobeb $strobeh $strobeo \
+$swrite $swriteb $swriteh $swriteo $sync$and$array $sync$and$plane \
+$sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane \
+$sync$or$array $sync$or$plane $system $tan $tanh $test$plusargs $time \
+$timeformat $timeskew $typename $ungetc $unit $unpacked_dimensions $unsigned \
+$urandom $urandom_range $value$plusargs $warning $width $write $writeb $writeh \
+$writememb $writememh $writeo
+
+keywords4.$(file.patterns.systemverilog)=
+keywords5.$(file.patterns.systemverilog)= synopsys parallel_case infer_mux TODO
+
+
+
+style.verilog.32=$(font.base)
+style.verilog.0=fore:#808080
+style.verilog.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.verilog.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.verilog.3=fore:#3F7F3F,$(font.code.comment.line),back:#E0F0FF,eolfilled
+style.verilog.4=$(colour.number)
+style.verilog.5=fore:#7f005f,bold
+style.verilog.6=$(colour.string),$(font.string.literal)
+style.verilog.7=fore:#007F7F
+style.verilog.8=fore:#804020
+style.verilog.9=$(colour.preproc)
+style.verilog.10=fore:#007070
+style.verilog.11=
+style.verilog.12=fore:#000000,$(font.string.literal),back:#E0C0E0,eolfilled
+style.verilog.19=fore:#2a00ff
+style.verilog.20=fore:#2A00FF
+style.verilog.21=fore:#7F0000
+style.verilog.22=fore:#00007F
+style.verilog.23=fore:#0000FF
+style.verilog.24=fore:#005032,bold
+
+lexer.verilog.portstyling=1
+lexer.verilog.allupperkeywords=1
+
+lexer.verilog.track.preprocessor=1
+lexer.verilog.update.preprocessor=1
+
+
+style.verilog.64=back:#E0E0E0,eolfilled
+style.verilog.65=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.66=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.67=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.68=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.69=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.70=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.71=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.72=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.73=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.74=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.75=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.76=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.83=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.84=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.85=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.86=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.87=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.88=back:#E0E0E0,eolfilled,fore:#808080,italics
+
+braces.verilog.style=10
+
+
+module vhdl
+
+file.patterns.vhdl=*.vhd;*.vhdl
+filter.vhdl=VHDL (vhd vhdl)|$(file.patterns.vhdl)|
+
+*filter.vhdl=$(filter.vhdl)
+
+lexer.$(file.patterns.vhdl)=vhdl
+
+*language.vhdl=VHDL|vhd||
+
+word.chars.vhdl=$(chars.alpha)$(chars.numeric)_
+word.characters.$(file.patterns.vhdl)=$(word.chars.vhdl)
+
+
+comment.block.vhdl=--
+
+
+
+indent.maintain.$(file.patterns.vhdl)=1;
+
+
+keywords.$(file.patterns.vhdl)=access after alias all architecture array assert attribute begin block \
+body buffer bus case component configuration constant disconnect downto else elsif end entity exit file \
+for function generate generic group guarded if impure in inertial inout is label library linkage literal \
+loop map new next null of on open others out package port postponed procedure process pure range record \
+register reject report return select severity shared signal subtype then to transport type unaffected \
+units until use variable wait when while with
+
+keywords2.$(file.patterns.vhdl)=                                                                            \
+ abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor
+
+keywords3.$(file.patterns.vhdl)=                                                                            \
+ left right low high ascending image value pos val succ pred leftof rightof base range reverse_range        \
+ length delayed stable quiet transaction event active last_event last_active last_value driving             \
+ driving_value simple_name path_name instance_name
+
+keywords4.$(file.patterns.vhdl)=                                                                            \
+ now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector      \
+ to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left \
+ rotate_right resize to_integer to_unsigned to_signed std_match to_01
+
+keywords5.$(file.patterns.vhdl)=                                                                            \
+ std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed               \
+ std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives        \
+ vital_timing
+
+keywords6.$(file.patterns.vhdl)=                                                                            \
+ boolean bit character severity_level integer real time delay_length natural positive string bit_vector     \
+ file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic                \
+ std_logic_vector X01 X01Z UX01 UX01Z unsigned signed
+
+
+style.vhdl.32=$(font.base)
+style.vhdl.0=fore:#800080
+style.vhdl.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.vhdl.2=fore:#3F7F3F,$(font.code.comment.line)
+style.vhdl.3=$(colour.number)
+style.vhdl.4=$(colour.string)
+style.vhdl.5=
+style.vhdl.6=
+style.vhdl.7=fore:#000000,$(font.string.literal),back:#E0C0E0,eolfilled
+style.vhdl.8=$(colour.keyword)
+style.vhdl.9=fore:#007F7F
+style.vhdl.10=fore:#804020
+style.vhdl.11=fore:#808020
+style.vhdl.12=fore:#208020
+style.vhdl.13=fore:#208080
+style.vhdl.14=fore:#804020,$(font.code.comment.doc)
+style.vhdl.15=$(colour.code.comment.box),$(font.code.comment.box)
+braces.vhdl.style=5
+
+module visualprolog
+
+file.patterns.visualprolog=*.pro;*.cl;*.i;*.ph;*.pack
+file.patterns.visualprologgrammar=*.vipgrm
+file.patterns.visualprolog.like=$(file.patterns.visualprolog);$(file.patterns.visualprologgrammar)
+
+filter.visualprolog=Visual Prolog source|$(file.patterns.visualprolog.like)|
+
+*filter.visualprolog=$(filter.visualprolog)
+
+lexer.$(file.patterns.visualprolog.like)=visualprolog
+
+*language.visualprolog=Visual Prolog|visualprolog||
+
+keywords.$(file.patterns.visualprolog)=goal namespace interface \
+class implement open inherits supports resolve delegate monitor constants \
+domains predicates constructors properties clauses facts
+keywords2.$(file.patterns.visualprolog)=guard language stdcall apicall c thiscall prolog \
+digits if then elseif else foreach do try catch finally erroneous failure procedure determ \
+multi nondeterm anyflow and or externally from div mod rem quot in orelse otherwise
+keywords3.$(file.patterns.visualprolog)=include bininclude requires orrequires if then \
+else elseif endif error message export externally options
+
+keywords.$(file.patterns.visualprologgrammar)=namespace open grammar terminals nonterminals startsymbols precedence rules
+keywords2.$(file.patterns.visualprologgrammar)=left right nonassoc
+keywords3.$(file.patterns.visualprologgrammar)=
+
+keywords4.$(file.patterns.visualprolog.like)=short detail end exception withdomain
+
+word.chars.visualprolog=$(chars.alpha)$(chars.numeric)_
+word.characters.$(file.patterns.visualprolog.like)=$(word.chars.visualprolog)
+comment.block.visualprolog=%
+comment.stream.start.visualprolog=/*
+comment.stream.end.visualprolog=*/
+
+statement.indent.$(file.patterns.visualprolog)=2 do then :-
+statement.$(file.patterns.visualprolog)=1 . end
+statement.lookback.$(file.visualprolog)=20
+
+style.visualprolog.32=$(font.base)
+style.visualprolog.0=fore:#808080
+style.visualprolog.1=fore:#808000,$(font.keyword)
+style.visualprolog.2=fore:#333399,$(font.keyword)
+style.visualprolog.3=fore:#800080,$(font.keyword)
+style.visualprolog.4=fore:#808080,$(font.code.comment.box)
+style.visualprolog.5=$(style.visualprolog.4)
+style.visualprolog.6=fore:#8050A0,$(font.code.comment.doc)
+style.visualprolog.7=$(style.visualprolog.4),$(font.code.comment.box)
+style.visualprolog.8=fore:#000000,$(font.identifier)
+style.visualprolog.9=fore:#008000,$(font.identifier)
+style.visualprolog.10=fore:#A0C0A0,$(font.identifier)
+style.visualprolog.11=fore:#0000C0,$(font.number)
+style.visualprolog.12=fore:#A00000,$(font.operator)
+style.visualprolog.16=fore:#3898B2,$(font.string.literal)
+style.visualprolog.17=fore:#F07000,$(font.string.literal)
+style.visualprolog.18=fore:#FFFFFF,back:#FF4040,$(font.error)
+style.visualprolog.19=$(style.visualprolog.18)
+style.visualprolog.20=fore:#8064A2,$(font.string.literal)
+style.visualprolog.21=$(style.visualprolog.14)
+style.visualprolog.22=back:#0xFFB060,$(font.string.literal)
+
+braces.visualprolog.style=12
+
+
+module yaml
+
+file.patterns.yaml=*.yaml;*.yml;*.clang-format;*.clang-tidy;*.mir;*.apinotes;*.ifs
+filter.yaml=YAML (yaml)|$(file.patterns.yaml)|
+*filter.yaml=$(filter.yaml)
+lexer.$(file.patterns.yaml)=yaml
+*language.yaml=YAML|yaml||
+
+tabsize.$(file.patterns.yaml)=2
+indent.size.$(file.patterns.yaml)=2
+use.tabs.$(file.patterns.yaml)=0
+
+comment.block.yaml=#~
+
+keywords.$(file.patterns.yaml)=true false yes no
+
+style.yaml.0=$(font.text),fore:#000000
+style.yaml.1=$(font.comment),fore:#008800
+style.yaml.2=$(font.base),fore:#000088,bold
+style.yaml.3=$(font.base),fore:#880088
+style.yaml.4=$(font.base),fore:#880000
+style.yaml.5=$(font.base),fore:#008888
+style.yaml.6=$(font.comment),fore:#FFFFFF,bold,back:#000088,eolfilled
+style.yaml.7=$(font.text),fore:#333366
+style.yaml.8=$(font.text),fore:#FFFFFF,italics,bold,back:#FF0000,eolfilled
+style.yaml.9=$(colour.operator)
diff --git a/scite-app/scite/src/ExportHTML.cxx b/scite-app/scite/src/ExportHTML.cxx
new file mode 100644
index 0000000..d75404d
--- /dev/null
+++ b/scite-app/scite/src/ExportHTML.cxx
@@ -0,0 +1,388 @@
+// SciTE - Scintilla based Text Editor
+/** @file ExportHTML.cxx
+ ** Export the current document to HTML.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+//---------- Save to HTML ----------
+
+void SciTEBase::SaveToHTML(const FilePath &saveName) {
+	RemoveFindMarks();
+	wEditor.ColouriseAll();
+	int tabSize = props.GetInt("tabsize");
+	if (tabSize == 0)
+		tabSize = 4;
+	const int wysiwyg = props.GetInt("export.html.wysiwyg", 1);
+	const int tabs = props.GetInt("export.html.tabs", 0);
+	const int folding = props.GetInt("export.html.folding", 0);
+	const int onlyStylesUsed = props.GetInt("export.html.styleused", 0);
+	const int titleFullPath = props.GetInt("export.html.title.fullpath", 0);
+
+	const SA::Position lengthDoc = LengthDocument();
+	TextReader acc(wEditor);
+
+	constexpr int StyleLastPredefined = static_cast<int>(SA::StylesCommon::LastPredefined);
+
+	bool styleIsUsed[StyleMax + 1] = {};
+	if (onlyStylesUsed) {
+		// check the used styles
+		for (SA::Position i = 0; i < lengthDoc; i++) {
+			styleIsUsed[acc.StyleAt(i)] = true;
+		}
+	} else {
+		for (int i = 0; i <= StyleMax; i++) {
+			styleIsUsed[i] = true;
+		}
+	}
+	styleIsUsed[StyleDefault] = true;
+
+	FILE *fp = saveName.Open(GUI_TEXT("wt"));
+	bool failedWrite = fp == nullptr;
+	if (fp) {
+		fputs("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n", fp);
+		fputs("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n", fp);
+		fputs("<head>\n", fp);
+		if (titleFullPath)
+			fprintf(fp, "<title>%s</title>\n",
+				filePath.AsUTF8().c_str());
+		else
+			fprintf(fp, "<title>%s</title>\n",
+				filePath.Name().AsUTF8().c_str());
+		// Probably not used by robots, but making a little advertisement for those looking
+		// at the source code doesn't hurt...
+		fputs("<meta name=\"Generator\" content=\"SciTE - www.Scintilla.org\" />\n", fp);
+		if (codePage == SA::CpUtf8)
+			fputs("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n", fp);
+
+		if (folding) {
+			fputs("<script language=\"JavaScript\" type=\"text/javascript\">\n"
+			      "<!--\n"
+			      "function symbol(id, sym) {\n"
+			      " if (id.textContent==undefined) {\n"
+			      " id.innerText=sym; } else {\n"
+			      " id.textContent=sym; }\n"
+			      "}\n"
+			      "function toggle(id) {\n"
+			      "var thislayer=document.getElementById('ln'+id);\n"
+			      "id-=1;\n"
+			      "var togline=document.getElementById('hd'+id);\n"
+			      "var togsym=document.getElementById('bt'+id);\n"
+			      "if (thislayer.style.display == 'none') {\n"
+			      " thislayer.style.display='';\n"
+			      " togline.style.textDecoration='none';\n"
+			      " symbol(togsym,'- ');\n"
+			      "} else {\n"
+			      " thislayer.style.display='none';\n"
+			      " togline.style.textDecoration='underline';\n"
+			      " symbol(togsym,'+ ');\n"
+			      "}\n"
+			      "}\n"
+			      "//-->\n"
+			      "</script>\n", fp);
+		}
+
+		fputs("<style type=\"text/css\">\n", fp);
+
+		std::string bgColour;
+
+		StyleDefinition sddef = StyleDefinitionFor(StyleDefault);
+
+		if (sddef.back.length()) {
+			bgColour = sddef.back;
+		}
+
+		std::string sval = props.GetExpandedString("font.monospace");
+		StyleDefinition sdmono(sval.c_str());
+
+		for (int istyle = 0; istyle <= StyleMax; istyle++) {
+			if ((istyle > StyleDefault) && (istyle <= StyleLastPredefined))
+				continue;
+			if (styleIsUsed[istyle]) {
+
+				StyleDefinition sd = StyleDefinitionFor(istyle);
+
+				if (CurrentBufferConst()->useMonoFont && sd.font.length() && sdmono.font.length()) {
+					sd.font = sdmono.font;
+					sd.size = sdmono.size;
+					sd.italics = sdmono.italics;
+					sd.weight = sdmono.weight;
+				}
+
+				if (sd.specified != StyleDefinition::sdNone) {
+					if (istyle == StyleDefault) {
+						fprintf(fp, "span {\n");
+					} else {
+						fprintf(fp, ".S%0d {\n", istyle);
+					}
+					if (sd.italics) {
+						fprintf(fp, "\tfont-style: italic;\n");
+					}
+					if (sd.IsBold()) {
+						fprintf(fp, "\tfont-weight: bold;\n");
+					}
+					if (wysiwyg && sd.font.length()) {
+						fprintf(fp, "\tfont-family: '%s';\n", sd.font.c_str());
+					}
+					if (sd.fore.length()) {
+						fprintf(fp, "\tcolor: %s;\n", sd.fore.c_str());
+					} else if (istyle == StyleDefault) {
+						fprintf(fp, "\tcolor: #000000;\n");
+					}
+					if ((sd.specified & StyleDefinition::sdBack) && sd.back.length()) {
+						if (istyle != StyleDefault && bgColour != sd.back) {
+							fprintf(fp, "\tbackground: %s;\n", sd.back.c_str());
+							fprintf(fp, "\ttext-decoration: inherit;\n");
+						}
+					}
+					if (wysiwyg && sd.size) {
+						fprintf(fp, "\tfont-size: %0dpt;\n", sd.size);
+					}
+					fprintf(fp, "}\n");
+				} else {
+					styleIsUsed[istyle] = false;	// No definition, it uses default style (32)
+				}
+			}
+		}
+		fputs("</style>\n", fp);
+		fputs("</head>\n", fp);
+		if (bgColour.length() > 0)
+			fprintf(fp, "<body bgcolor=\"%s\">\n", bgColour.c_str());
+		else
+			fputs("<body>\n", fp);
+
+		SA::Line line = acc.GetLine(0);
+		int level = LevelNumber(acc.LevelAt(line)) - static_cast<int>(SA::FoldLevel::Base);
+		int styleCurrent = acc.StyleAt(0);
+		bool inStyleSpan = false;
+		bool inFoldSpan = false;
+		// Global span for default attributes
+		if (wysiwyg) {
+			fputs("<span>", fp);
+		} else {
+			fputs("<pre>", fp);
+		}
+
+		if (folding) {
+			const SA::FoldLevel lvl = acc.LevelAt(0);
+			level = LevelNumber(lvl) - static_cast<int>(SA::FoldLevel::Base);
+
+			if (LevelIsHeader(lvl)) {
+				const std::string sLine = std::to_string(line);
+				const std::string sLineNext = std::to_string(line+1);
+				fprintf(fp, "<span id=\"hd%s\" onclick=\"toggle('%s')\">", sLine.c_str(), sLineNext.c_str());
+				fprintf(fp, "<span id=\"bt%s\">- </span>", sLine.c_str());
+				inFoldSpan = true;
+			} else {
+				fputs("&nbsp; ", fp);
+			}
+		}
+
+		if (styleIsUsed[styleCurrent]) {
+			fprintf(fp, "<span class=\"S%0d\">", styleCurrent);
+			inStyleSpan = true;
+		}
+		// Else, this style has no definition (beside default one):
+		// no span for it, except the global one
+
+		int column = 0;
+		for (SA::Position i = 0; i < lengthDoc; i++) {
+			const char ch = acc[i];
+			const int style = acc.StyleAt(i);
+
+			if (style != styleCurrent) {
+				if (inStyleSpan) {
+					fputs("</span>", fp);
+					inStyleSpan = false;
+				}
+				if (ch != '\r' && ch != '\n') {	// No need of a span for the EOL
+					if (styleIsUsed[style]) {
+						fprintf(fp, "<span class=\"S%0d\">", style);
+						inStyleSpan = true;
+					}
+					styleCurrent = style;
+				}
+			}
+			if (ch == ' ') {
+				if (wysiwyg) {
+					char prevCh = '\0';
+					if (column == 0) {	// At start of line, must put a &nbsp; because regular space will be collapsed
+						prevCh = ' ';
+					}
+					while (i < lengthDoc && acc[i] == ' ') {
+						if (prevCh != ' ') {
+							fputc(' ', fp);
+						} else {
+							fputs("&nbsp;", fp);
+						}
+						prevCh = acc[i];
+						i++;
+						column++;
+					}
+					i--; // the last incrementation will be done by the for loop
+				} else {
+					fputc(' ', fp);
+					column++;
+				}
+			} else if (ch == '\t') {
+				const int ts = tabSize - (column % tabSize);
+				if (wysiwyg) {
+					for (int itab = 0; itab < ts; itab++) {
+						if (itab % 2) {
+							fputc(' ', fp);
+						} else {
+							fputs("&nbsp;", fp);
+						}
+					}
+					column += ts;
+				} else {
+					if (tabs) {
+						fputc(ch, fp);
+						column++;
+					} else {
+						for (int itab = 0; itab < ts; itab++) {
+							fputc(' ', fp);
+						}
+						column += ts;
+					}
+				}
+			} else if (ch == '\r' || ch == '\n') {
+				if (inStyleSpan) {
+					fputs("</span>", fp);
+					inStyleSpan = false;
+				}
+				if (inFoldSpan) {
+					fputs("</span>", fp);
+					inFoldSpan = false;
+				}
+				if (ch == '\r' && acc[i + 1] == '\n') {
+					i++;	// CR+LF line ending, skip the "extra" EOL char
+				}
+				column = 0;
+				if (wysiwyg) {
+					fputs("<br />", fp);
+				}
+
+				styleCurrent = acc.StyleAt(i + 1);
+				if (folding) {
+					line = acc.GetLine(i + 1);
+
+					const SA::FoldLevel lvl = acc.LevelAt(line);
+					const int newLevel = LevelNumber(lvl) - static_cast<int>(SA::FoldLevel::Base);
+
+					if (newLevel < level)
+						fprintf(fp, "</span>");
+					fputc('\n', fp); // here to get clean code
+					if (newLevel > level) {
+						const std::string sLine = std::to_string(line);
+						fprintf(fp, "<span id=\"ln%s\">", sLine.c_str());
+					}
+
+					if (LevelIsHeader(lvl)) {
+						const std::string sLine = std::to_string(line);
+						const std::string sLineNext = std::to_string(line + 1);
+						fprintf(fp, "<span id=\"hd%s\" onclick=\"toggle('%s')\">", sLine.c_str(), sLineNext.c_str());
+						fprintf(fp, "<span id=\"bt%s\">- </span>", sLine.c_str());
+						inFoldSpan = true;
+					} else
+						fputs("&nbsp; ", fp);
+					level = newLevel;
+				} else {
+					fputc('\n', fp);
+				}
+
+				if (styleIsUsed[styleCurrent] && acc[i + 1] != '\r' && acc[i + 1] != '\n') {
+					// We know it's the correct next style,
+					// but no (empty) span for an empty line
+					fprintf(fp, "<span class=\"S%0d\">", styleCurrent);
+					inStyleSpan = true;
+				}
+			} else {
+				switch (ch) {
+				case '<':
+					fputs("&lt;", fp);
+					break;
+				case '>':
+					fputs("&gt;", fp);
+					break;
+				case '&':
+					fputs("&amp;", fp);
+					break;
+				default:
+					fputc(ch, fp);
+				}
+				column++;
+			}
+		}
+
+		if (inStyleSpan) {
+			fputs("</span>", fp);
+		}
+
+		if (folding) {
+			while (level > 0) {
+				fprintf(fp, "</span>");
+				level--;
+			}
+		}
+
+		if (!wysiwyg) {
+			fputs("</pre>", fp);
+		} else {
+			fputs("</span>", fp);
+		}
+
+		fputs("\n</body>\n</html>\n", fp);
+		if (fclose(fp) != 0) {
+			failedWrite = true;
+		}
+	}
+	if (failedWrite) {
+		FailedSaveMessageBox(saveName);
+	}
+}
+
diff --git a/scite-app/scite/src/ExportPDF.cxx b/scite-app/scite/src/ExportPDF.cxx
new file mode 100644
index 0000000..7b8bf9a
--- /dev/null
+++ b/scite-app/scite/src/ExportPDF.cxx
@@ -0,0 +1,559 @@
+// SciTE - Scintilla based Text Editor
+/** @file ExportPDF.cxx
+ ** Export the current document to PDF.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+//---------- Save to PDF ----------
+
+/*
+	PDF Exporter. Status: Beta
+	Contributed by Ahmad M. Zawawi <zeus_go64@hotmail.com>
+	Modifications by Darren Schroeder Feb 22, 2003; Philippe Lhoste 2003-10
+	Overhauled by Kein-Hong Man 2003-11
+
+	This exporter is meant to be small and simple; users are expected to
+	use other methods for heavy-duty formatting. PDF elements marked with
+	"PDF1.4Ref" states where in the PDF 1.4 Reference Spec (the PDF file of
+	which is freely available from Adobe) the particular element can be found.
+
+	Possible TODOs that will probably not be implemented: full styling,
+	optimization, font substitution, compression, character set encoding.
+*/
+#define PDF_TAB_DEFAULT		8
+#define PDF_FONT_DEFAULT	1	// Helvetica
+#define PDF_FONTSIZE_DEFAULT	10
+#define PDF_SPACING_DEFAULT	1.2
+#define PDF_HEIGHT_DEFAULT	792	// Letter
+#define PDF_WIDTH_DEFAULT	612
+#define PDF_MARGIN_DEFAULT	72	// 1.0"
+#define PDF_ENCODING		"WinAnsiEncoding"
+
+struct PDFStyle {
+	std::string fore;
+	int font=0;
+};
+
+namespace {
+
+const char *PDFfontNames[] = {
+	"Courier", "Courier-Bold", "Courier-Oblique", "Courier-BoldOblique",
+	"Helvetica", "Helvetica-Bold", "Helvetica-Oblique", "Helvetica-BoldOblique",
+	"Times-Roman", "Times-Bold", "Times-Italic", "Times-BoldItalic"
+};
+
+// ascender, descender aligns font origin point with page
+short PDFfontAscenders[] =  { 629, 718, 699 };
+short PDFfontDescenders[] = { 157, 207, 217 };
+short PDFfontWidths[] =     { 600,   0,   0 };
+
+}
+
+inline std::string getPDFRGB(const char *stylecolour) {
+	std::string ret;
+	// grab colour components (max string length produced = 18)
+	for (int i = 1; i < 6; i += 2) {
+		char val[20] = "";
+		// 3 decimal places for enough dynamic range
+		const int c = (IntFromHexByte(stylecolour + i) * 1000 + 127) / 255;
+		if (c == 0 || c == 1000) {	// optimise
+			sprintf(val, "%d ", c / 1000);
+		} else {
+			sprintf(val, "0.%03d ", c);
+		}
+		ret += val;
+	}
+	return ret;
+}
+
+void SciTEBase::SaveToPDF(const FilePath &saveName) {
+	// This class conveniently handles the tracking of PDF objects
+	// so that the cross-reference table can be built (PDF1.4Ref(p39))
+	// All writes to fp passes through a PDFObjectTracker object.
+	class PDFObjectTracker {
+	private:
+		FILE *fp;
+		std::vector<long> offsetList;
+	public:
+		int index;
+		explicit PDFObjectTracker(FILE *fp_) {
+			fp = fp_;
+			index = 1;
+		}
+		// Deleted so PDFObjectTracker objects can not be copied.
+		PDFObjectTracker(const PDFObjectTracker &) = delete;
+		~PDFObjectTracker() {
+		}
+		void write(const char *objectData) {
+			const size_t length = strlen(objectData);
+			// note binary write used, open with "wb"
+			fwrite(objectData, sizeof(char), length, fp);
+		}
+		void write(int objectData) {
+			char val[20];
+			sprintf(val, "%d", objectData);
+			write(val);
+		}
+		// returns object number assigned to the supplied data
+		int add(const char *objectData) {
+			// save offset, then format and write object
+			offsetList.push_back(ftell(fp));
+			write(index);
+			write(" 0 obj\n");
+			write(objectData);
+			write("endobj\n");
+			return index++;
+		}
+		// builds xref table, returns file offset of xref table
+		long xref() {
+			char val[32] = "";
+			// xref start index and number of entries
+			const long xrefStart = ftell(fp);
+			write("xref\n0 ");
+			write(index);
+			// a xref entry *must* be 20 bytes long (PDF1.4Ref(p64))
+			// so extra space added; also the first entry is special
+			write("\n0000000000 65535 f \n");
+			for (int i = 0; i < index - 1; i++) {
+				sprintf(val, "%010ld 00000 n \n", offsetList[i]);
+				write(val);
+			}
+			return xrefStart;
+		}
+	};
+
+	// Object to manage line and page rendering. Apart from startPDF, endPDF
+	// everything goes in via add() and nextLine() so that line formatting
+	// and pagination can be done properly.
+	class PDFRender {
+	private:
+		bool pageStarted;
+		bool firstLine;
+		int pageCount;
+		int pageContentStart;
+		double xPos, yPos;	// position tracking for line wrapping
+		std::string pageData;	// holds PDF stream contents
+		std::string segment;	// character data
+		std::string segStyle;		// style of segment
+		bool justWhiteSpace;
+		int styleCurrent, stylePrev;
+		double leading;
+		char buffer[250];
+	public:
+		PDFObjectTracker *oT;
+		std::vector<PDFStyle> style;
+		int fontSize;		// properties supplied by user
+		int fontSet;
+		long pageWidth, pageHeight;
+		GUI::Rectangle pageMargin;
+		//
+		PDFRender() : buffer{} {
+			pageStarted = false;
+			firstLine = false;
+			pageCount = 0;
+			pageContentStart = 0;
+			xPos = 0.0;
+			yPos = 0.0;
+			justWhiteSpace = true;
+			styleCurrent = StyleDefault;
+			stylePrev = StyleDefault;
+			leading = PDF_FONTSIZE_DEFAULT * PDF_SPACING_DEFAULT;
+			buffer[0] = '\0';
+			oT = nullptr;
+			fontSize = 0;
+			fontSet = PDF_FONT_DEFAULT;
+			pageWidth = 100;
+			pageHeight = 100;
+		}
+		// Deleted so PDFRender objects can not be copied.
+		PDFRender(const PDFRender &) = delete;
+		~PDFRender() {
+		}
+		//
+		double fontToPoints(int thousandths) const {
+			return (double)fontSize * thousandths / 1000.0;
+		}
+		std::string setStyle(int style_) {
+			int styleNext = style_;
+			if (style_ == -1) { styleNext = styleCurrent; }
+			std::string buff;
+			if (styleNext != styleCurrent || style_ == -1) {
+				if (style[styleCurrent].font != style[styleNext].font
+						|| style_ == -1) {
+					char fontSpec[100];
+					sprintf(fontSpec, "/F%d %d Tf ",
+						style[styleNext].font + 1, fontSize);
+					buff += fontSpec;
+				}
+				if ((style[styleCurrent].fore != style[styleNext].fore)
+						|| style_ == -1) {
+					buff += style[styleNext].fore;
+					buff += "rg ";
+				}
+			}
+			return buff;
+		}
+		//
+		void startPDF() {
+			if (fontSize <= 0) {
+				fontSize = PDF_FONTSIZE_DEFAULT;
+			}
+			// leading is the term for distance between lines
+			leading = fontSize * PDF_SPACING_DEFAULT;
+			// sanity check for page size and margins
+			const int pageWidthMin = (int)leading + pageMargin.left + pageMargin.right;
+			if (pageWidth < pageWidthMin) {
+				pageWidth = pageWidthMin;
+			}
+			const int pageHeightMin = (int)leading + pageMargin.top + pageMargin.bottom;
+			if (pageHeight < pageHeightMin) {
+				pageHeight = pageHeightMin;
+			}
+			// start to write PDF file here (PDF1.4Ref(p63))
+			// ASCII>127 characters to indicate binary-possible stream
+			oT->write("%PDF-1.3\n%\xc7\xec\x8f\xa2\n");
+			styleCurrent = StyleDefault;
+
+			// build objects for font resources; note that font objects are
+			// *expected* to start from index 1 since they are the first objects
+			// to be inserted (PDF1.4Ref(p317))
+			for (int i = 0; i < 4; i++) {
+				sprintf(buffer, "<</Type/Font/Subtype/Type1"
+					"/Name/F%d/BaseFont/%s/Encoding/"
+					PDF_ENCODING
+					">>\n", i + 1,
+					PDFfontNames[fontSet * 4 + i]);
+				oT->add(buffer);
+			}
+			pageContentStart = oT->index;
+		}
+		void endPDF() {
+			if (pageStarted) {	// flush buffers
+				endPage();
+			}
+			// refer to all used or unused fonts for simplicity
+			const int resourceRef = oT->add(
+							"<</ProcSet[/PDF/Text]\n"
+							"/Font<</F1 1 0 R/F2 2 0 R/F3 3 0 R"
+							"/F4 4 0 R>> >>\n");
+			// create all the page objects (PDF1.4Ref(p88))
+			// forward reference pages object; calculate its object number
+			const int pageObjectStart = oT->index;
+			const int pagesRef = pageObjectStart + pageCount;
+			for (int i = 0; i < pageCount; i++) {
+				sprintf(buffer, "<</Type/Page/Parent %d 0 R\n"
+					"/MediaBox[ 0 0 %ld %ld"
+					"]\n/Contents %d 0 R\n"
+					"/Resources %d 0 R\n>>\n",
+					pagesRef, pageWidth, pageHeight,
+					pageContentStart + i, resourceRef);
+				oT->add(buffer);
+			}
+			// create page tree object (PDF1.4Ref(p86))
+			pageData = "<</Type/Pages/Kids[\n";
+			for (int j = 0; j < pageCount; j++) {
+				sprintf(buffer, "%d 0 R\n", pageObjectStart + j);
+				pageData += buffer;
+			}
+			sprintf(buffer, "]/Count %d\n>>\n", pageCount);
+			pageData += buffer;
+			oT->add(pageData.c_str());
+			// create catalog object (PDF1.4Ref(p83))
+			sprintf(buffer, "<</Type/Catalog/Pages %d 0 R >>\n", pagesRef);
+			const int catalogRef = oT->add(buffer);
+			// append the cross reference table (PDF1.4Ref(p64))
+			const long xref = oT->xref();
+			// end the file with the trailer (PDF1.4Ref(p67))
+			sprintf(buffer, "trailer\n<< /Size %d /Root %d 0 R\n>>"
+				"\nstartxref\n%ld\n%%%%EOF\n",
+				oT->index, catalogRef, xref);
+			oT->write(buffer);
+		}
+		void add(char ch, int style_) {
+			if (!pageStarted) {
+				startPage();
+			}
+			// get glyph width (TODO future non-monospace handling)
+			const double glyphWidth = fontToPoints(PDFfontWidths[fontSet]);
+			xPos += glyphWidth;
+			// if cannot fit into a line, flush, wrap to next line
+			if (xPos > pageWidth - pageMargin.right) {
+				nextLine();
+				xPos += glyphWidth;
+			}
+			// if different style, then change to style
+			if (style_ != styleCurrent) {
+				flushSegment();
+				// output code (if needed) for new style
+				segStyle = setStyle(style_);
+				stylePrev = styleCurrent;
+				styleCurrent = style_;
+			}
+			// escape these characters
+			if (ch == ')' || ch == '(' || ch == '\\') {
+				segment += '\\';
+			}
+			if (ch != ' ') { justWhiteSpace = false; }
+			segment += ch;	// add to segment data
+		}
+		void flushSegment() {
+			if (segment.length() > 0) {
+				if (justWhiteSpace) {	// optimise
+					styleCurrent = stylePrev;
+				} else {
+					pageData += segStyle;
+				}
+				pageData += "(";
+				pageData += segment;
+				pageData += ")Tj\n";
+			}
+			segment.clear();
+			segStyle = "";
+			justWhiteSpace = true;
+		}
+		void startPage() {
+			pageStarted = true;
+			firstLine = true;
+			pageCount++;
+			const double fontAscender = fontToPoints(PDFfontAscenders[fontSet]);
+			yPos = pageHeight - pageMargin.top - fontAscender;
+			// start a new page
+			sprintf(buffer, "BT 1 0 0 1 %d %d Tm\n",
+				pageMargin.left, (int)yPos);
+			pageData = buffer;
+			// force setting of initial font, colour
+			segStyle = setStyle(-1);
+			pageData += segStyle;
+			xPos = pageMargin.left;
+			segment.clear();
+			flushSegment();
+		}
+		void endPage() {
+			pageStarted = false;
+			flushSegment();
+			try {
+				// build actual text object; +3 is for "ET\n"
+				// PDF1.4Ref(p38) EOL marker preceding endstream not counted
+				std::ostringstream osTextObj;
+				// concatenate stream within the text object
+				osTextObj
+						<< "<</Length "
+						<< (pageData.length() - 1 + 3)
+						<< ">>\nstream\n"
+						<< pageData.c_str()
+						<< "ET\nendstream\n";
+				const std::string textObj = osTextObj.str();
+				oT->add(textObj.c_str());
+			} catch (std::exception &) {
+				// Exceptions not enabled on stream but still causes diagnostic in Coverity.
+				// Simply swallow the failure.
+			}
+		}
+		void nextLine() {
+			if (!pageStarted) {
+				startPage();
+			}
+			xPos = pageMargin.left;
+			flushSegment();
+			// PDF follows cartesian coords, subtract -> down
+			yPos -= leading;
+			const double fontDescender = fontToPoints(PDFfontDescenders[fontSet]);
+			if (yPos < pageMargin.bottom + fontDescender) {
+				endPage();
+				startPage();
+				return;
+			}
+			if (firstLine) {
+				// avoid breakage due to locale setting
+				const int f = static_cast<int>(leading * 10 + 0.5);
+				sprintf(buffer, "0 -%d.%d TD\n", f / 10, f % 10);
+				firstLine = false;
+			} else {
+				sprintf(buffer, "T*\n");
+			}
+			pageData += buffer;
+		}
+	};
+	PDFRender pr;
+
+	RemoveFindMarks();
+	wEditor.ColouriseAll();
+	// read exporter flags
+	int tabSize = props.GetInt("tabsize", PDF_TAB_DEFAULT);
+	if (tabSize < 0) {
+		tabSize = PDF_TAB_DEFAULT;
+	}
+	// read magnification value to add to default screen font size
+	pr.fontSize = props.GetInt("export.pdf.magnification");
+	// set font family according to face name
+	std::string propItem = props.GetExpandedString("export.pdf.font");
+	pr.fontSet = PDF_FONT_DEFAULT;
+	if (propItem.length()) {
+		if (propItem == "Courier")
+			pr.fontSet = 0;
+		else if (propItem == "Helvetica")
+			pr.fontSet = 1;
+		else if (propItem == "Times")
+			pr.fontSet = 2;
+	}
+	// page size: width, height
+	propItem = props.GetExpandedString("export.pdf.pagesize");
+	char buffer[200] = "";
+	const char *ps = propItem.c_str();
+	const char *next = GetNextPropItem(ps, buffer, 32);
+	if (0 >= (pr.pageWidth = atol(buffer))) {
+		pr.pageWidth = PDF_WIDTH_DEFAULT;
+	}
+	GetNextPropItem(next, buffer, 32);
+	if (0 >= (pr.pageHeight = atol(buffer))) {
+		pr.pageHeight = PDF_HEIGHT_DEFAULT;
+	}
+	// page margins: left, right, top, bottom
+	propItem = props.GetExpandedString("export.pdf.margins");
+	ps = propItem.c_str();
+	next = GetNextPropItem(ps, buffer, 32);
+	if (0 >= (pr.pageMargin.left = static_cast<int>(atol(buffer)))) {
+		pr.pageMargin.left = PDF_MARGIN_DEFAULT;
+	}
+	next = GetNextPropItem(next, buffer, 32);
+	if (0 >= (pr.pageMargin.right = static_cast<int>(atol(buffer)))) {
+		pr.pageMargin.right = PDF_MARGIN_DEFAULT;
+	}
+	next = GetNextPropItem(next, buffer, 32);
+	if (0 >= (pr.pageMargin.top = static_cast<int>(atol(buffer)))) {
+		pr.pageMargin.top = PDF_MARGIN_DEFAULT;
+	}
+	GetNextPropItem(next, buffer, 32);
+	if (0 >= (pr.pageMargin.bottom = static_cast<int>(atol(buffer)))) {
+		pr.pageMargin.bottom = PDF_MARGIN_DEFAULT;
+	}
+
+	// collect all styles available for that 'language'
+	// or the default style if no language is available...
+	pr.style.resize(StyleMax + 1);
+	for (int i = 0; i <= StyleMax; i++) {	// get keys
+		pr.style[i].font = 0;
+		pr.style[i].fore = "";
+
+		StyleDefinition sd = StyleDefinitionFor(i);
+
+		if (sd.specified != StyleDefinition::sdNone) {
+			if (sd.italics) { pr.style[i].font |= 2; }
+			if (sd.IsBold()) { pr.style[i].font |= 1; }
+			if (sd.fore.length()) {
+				pr.style[i].fore = getPDFRGB(sd.fore.c_str());
+			} else if (i == StyleDefault) {
+				pr.style[i].fore = "0 0 0 ";
+			}
+			// grab font size from default style
+			if (i == StyleDefault) {
+				if (sd.size > 0)
+					pr.fontSize += sd.size;
+				else
+					pr.fontSize = PDF_FONTSIZE_DEFAULT;
+			}
+		}
+	}
+	// patch in default foregrounds
+	for (int j = 0; j <= StyleMax; j++) {
+		if (pr.style[j].fore.empty()) {
+			pr.style[j].fore = pr.style[StyleDefault].fore;
+		}
+	}
+
+	FILE *fp = saveName.Open(GUI_TEXT("wb"));
+	if (!fp) {
+		// couldn't open the file for saving, issue an error message
+		FailedSaveMessageBox(saveName);
+		return;
+	}
+	// initialise PDF rendering
+	PDFObjectTracker ot(fp);
+	pr.oT = &ot;
+	pr.startPDF();
+
+	// do here all the writing
+	const SA::Position lengthDoc = LengthDocument();
+	TextReader acc(wEditor);
+
+	if (!lengthDoc) {	// enable zero length docs
+		pr.nextLine();
+	} else {
+		int lineIndex = 0;
+		for (SA::Position i = 0; i < lengthDoc; i++) {
+			const char ch = acc[i];
+			const int style = acc.StyleAt(i);
+
+			if (ch == '\t') {
+				// expand tabs
+				int ts = tabSize - (lineIndex % tabSize);
+				lineIndex += ts;
+				for (; ts; ts--) {	// add ts count of spaces
+					pr.add(' ', style);	// add spaces
+				}
+			} else if (ch == '\r' || ch == '\n') {
+				if (ch == '\r' && acc[i + 1] == '\n') {
+					i++;
+				}
+				// close and begin a newline...
+				pr.nextLine();
+				lineIndex = 0;
+			} else {
+				// write the character normally...
+				pr.add(ch, style);
+				lineIndex++;
+			}
+		}
+	}
+	// write required stuff and close the PDF file
+	pr.endPDF();
+	if (fclose(fp) != 0) {
+		FailedSaveMessageBox(saveName);
+	}
+}
+
diff --git a/scite-app/scite/src/ExportRTF.cxx b/scite-app/scite/src/ExportRTF.cxx
new file mode 100644
index 0000000..707f1e5
--- /dev/null
+++ b/scite-app/scite/src/ExportRTF.cxx
@@ -0,0 +1,311 @@
+// SciTE - Scintilla based Text Editor
+/** @file ExportRTF.cxx
+ ** Export the current document to RTF.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+
+//---------- Save to RTF ----------
+
+#define RTF_HEADEROPEN "{\\rtf1\\ansi\\deff0\\deftab720"
+#define RTF_FONTDEFOPEN "{\\fonttbl"
+#define RTF_FONTDEFCLOSE "}"
+#define RTF_COLORDEFOPEN "{\\colortbl"
+#define RTF_COLORDEFCLOSE "}"
+#define RTF_HEADERCLOSE "\n"
+#define RTF_BODYOPEN ""
+#define RTF_BODYCLOSE "}"
+
+#define RTF_SETFONTFACE "\\f"
+#define RTF_SETFONTSIZE "\\fs"
+#define RTF_SETCOLOR "\\cf"
+#define RTF_SETBACKGROUND "\\highlight"
+#define RTF_BOLD_ON "\\b"
+#define RTF_BOLD_OFF "\\b0"
+#define RTF_ITALIC_ON "\\i"
+#define RTF_ITALIC_OFF "\\i0"
+#define RTF_UNDERLINE_ON "\\ul"
+#define RTF_UNDERLINE_OFF "\\ulnone"
+#define RTF_STRIKE_ON "\\i"
+#define RTF_STRIKE_OFF "\\strike0"
+
+#define RTF_EOLN "\\par\n"
+#define RTF_TAB "\\tab "
+
+#define MAX_STYLEDEF 128
+#define RTF_FONTFACE "Courier New"
+#define RTF_COLOR "#000000"
+
+static size_t FindCaseInsensitive(const std::vector<std::string> &values, const std::string &s) {
+	for (size_t i = 0; i < values.size(); i++)
+		if (EqualCaseInsensitive(s.c_str(), values[i].c_str()))
+			return i;
+	return values.size();
+}
+
+// extract the next RTF control word from *style
+static void GetRTFNextControl(const char **style, char *control) noexcept {
+	const char *pos = *style;
+	*control = '\0';
+	if ('\0' == *pos) return;
+	pos++; // implicit skip over leading '\'
+	while ('\0' != *pos && '\\' != *pos) { pos++; }
+	ptrdiff_t len = pos - *style;
+	memcpy(control, *style, len);
+	*(control + len) = '\0';
+	*style = pos;
+}
+
+// extracts control words that are different between two styles
+static std::string GetRTFStyleChange(const char *last, const char *current) { // \f0\fs20\cf0\highlight0\b0\i0
+	char lastControl[MAX_STYLEDEF] = "";
+	char currentControl[MAX_STYLEDEF] = "";
+	const char *lastPos = last;
+	const char *currentPos = current;
+	std::string delta;
+	// font face, size, color, background, bold, italic
+	for (int i = 0; i < 6; i++) {
+		GetRTFNextControl(&lastPos, lastControl);
+		GetRTFNextControl(&currentPos, currentControl);
+		if (strcmp(lastControl, currentControl)) {	// changed
+			delta += currentControl;
+		}
+	}
+	if (!delta.empty()) { delta += " "; }
+	return delta;
+}
+
+void SciTEBase::SaveToStreamRTF(std::ostream &os, SA::Position start, SA::Position end) {
+	const SA::Position lengthDoc = LengthDocument();
+	if (end < 0)
+		end = lengthDoc;
+	RemoveFindMarks();
+	wEditor.ColouriseAll();
+
+	StyleDefinition defaultStyle = StyleDefinitionFor(StyleDefault);
+
+	int tabSize = props.GetInt("export.rtf.tabsize", props.GetInt("tabsize"));
+	const int wysiwyg = props.GetInt("export.rtf.wysiwyg", 1);
+	std::string fontFace = props.GetExpandedString("export.rtf.font.face");
+	if (fontFace.length()) {
+		defaultStyle.font = fontFace;
+	} else if (defaultStyle.font.length() == 0) {
+		defaultStyle.font = RTF_FONTFACE;
+	}
+	const int fontSize = props.GetInt("export.rtf.font.size", 0);
+	if (fontSize > 0) {
+		defaultStyle.size = fontSize << 1;
+	} else if (defaultStyle.size == 0) {
+		defaultStyle.size = 10 << 1;
+	} else {
+		defaultStyle.size <<= 1;
+	}
+	const bool isUTF8 = wEditor.CodePage() == SA::CpUtf8;
+	const unsigned int characterset = props.GetInt("character.set", static_cast<int>(SA::CharacterSet::Default));
+	const int tabs = props.GetInt("export.rtf.tabs", 0);
+	if (tabSize == 0)
+		tabSize = 4;
+
+	std::vector<std::string> styles;
+	std::vector<std::string> fonts;
+	std::vector<std::string> colors;
+	os << RTF_HEADEROPEN << RTF_FONTDEFOPEN;
+	fonts.push_back(defaultStyle.font);
+	os << "{\\f" << 0 << "\\fnil\\fcharset" << characterset << " " << defaultStyle.font.c_str() << ";}";
+	colors.push_back(defaultStyle.fore);
+	colors.push_back(defaultStyle.back);
+
+	for (int istyle = 0; istyle <= StyleMax; istyle++) {
+		std::ostringstream osStyle;
+
+		const StyleDefinition sd = StyleDefinitionFor(istyle);
+
+		if (sd.specified != StyleDefinition::sdNone) {
+			size_t iFont = 0;
+			if (wysiwyg && sd.font.length()) {
+				iFont = FindCaseInsensitive(fonts, sd.font);
+				if (iFont >= fonts.size()) {
+					fonts.push_back(sd.font);
+					os << "{\\f" << iFont << "\\fnil\\fcharset" << characterset << " " << sd.font.c_str() << ";}";
+				}
+			}
+			osStyle << RTF_SETFONTFACE << iFont;
+
+			osStyle << RTF_SETFONTSIZE << (wysiwyg && sd.size ? sd.size << 1 : defaultStyle.size);
+
+			size_t iFore = 0;
+			if (sd.specified & StyleDefinition::sdFore) {
+				iFore = FindCaseInsensitive(colors, sd.fore);
+				if (iFore >= colors.size())
+					colors.push_back(sd.fore);
+			}
+			osStyle << RTF_SETCOLOR << iFore;
+
+			// PL: highlights doesn't seems to follow a distinct table, at least with WordPad and Word 97
+			// Perhaps it is different for Word 6?
+			size_t iBack = 1;
+			if (sd.specified & StyleDefinition::sdBack) {
+				iBack = FindCaseInsensitive(colors, sd.back);
+				if (iBack >= colors.size())
+					colors.push_back(sd.back);
+			}
+			osStyle << RTF_SETBACKGROUND << iBack;
+
+			if (sd.specified & StyleDefinition::sdWeight) {
+				osStyle << (sd.IsBold() ? RTF_BOLD_ON : RTF_BOLD_OFF);
+			} else {
+				osStyle << (defaultStyle.IsBold() ? RTF_BOLD_ON : RTF_BOLD_OFF);
+			}
+			if (sd.specified & StyleDefinition::sdItalics) {
+				osStyle << (sd.italics ? RTF_ITALIC_ON : RTF_ITALIC_OFF);
+			} else {
+				osStyle << (defaultStyle.italics ? RTF_ITALIC_ON : RTF_ITALIC_OFF);
+			}
+		} else {
+			osStyle << RTF_SETFONTFACE "0" RTF_SETFONTSIZE << defaultStyle.size <<
+				RTF_SETCOLOR "0" RTF_SETBACKGROUND "1"
+				RTF_BOLD_OFF RTF_ITALIC_OFF;
+		}
+		styles.push_back(osStyle.str());
+	}
+	os << RTF_FONTDEFCLOSE RTF_COLORDEFOPEN;
+	for (const std::string &color : colors) {
+		os << "\\red" << IntFromHexByte(color.c_str() + 1) << "\\green" << IntFromHexByte(color.c_str() + 3) <<
+		   "\\blue" << IntFromHexByte(color.c_str() + 5) << ";";
+	}
+	os << RTF_COLORDEFCLOSE RTF_HEADERCLOSE RTF_BODYOPEN RTF_SETFONTFACE "0"
+	   RTF_SETFONTSIZE << defaultStyle.size << RTF_SETCOLOR "0 ";
+	std::ostringstream osStyleDefault;
+	osStyleDefault << RTF_SETFONTFACE "0" RTF_SETFONTSIZE << defaultStyle.size <<
+		       RTF_SETCOLOR "0" RTF_SETBACKGROUND "1"
+		       RTF_BOLD_OFF RTF_ITALIC_OFF;
+	std::string lastStyle = osStyleDefault.str();
+	bool prevCR = false;
+	int styleCurrent = -1;
+	TextReader acc(wEditor);
+	int column = 0;
+	for (SA::Position iPos = start; iPos < end; iPos++) {
+		const char ch = acc[iPos];
+		int style = acc.StyleAt(iPos);
+		if (style > StyleMax)
+			style = 0;
+		if (style != styleCurrent) {
+			const std::string deltaStyle = GetRTFStyleChange(lastStyle.c_str(), styles[style].c_str());
+			lastStyle = styles[style];
+			if (!deltaStyle.empty())
+				os << deltaStyle;
+			styleCurrent = style;
+		}
+		if (ch == '{')
+			os << "\\{";
+		else if (ch == '}')
+			os << "\\}";
+		else if (ch == '\\')
+			os << "\\\\";
+		else if (ch == '\t') {
+			if (tabs) {
+				os << RTF_TAB;
+			} else {
+				const int ts = tabSize - (column % tabSize);
+				for (int itab = 0; itab < ts; itab++) {
+					os << ' ';
+				}
+				column += ts - 1;
+			}
+		} else if (ch == '\n') {
+			if (!prevCR) {
+				os << RTF_EOLN;
+				column = -1;
+			}
+		} else if (ch == '\r') {
+			os << RTF_EOLN;
+			column = -1;
+		} else if (isUTF8 && !IsASCII(ch)) {
+			const SA::Position nextPosition = wEditor.PositionAfter(iPos);
+			wEditor.SetTarget(SA::Span(iPos, nextPosition));
+			char u8Char[5] = "";
+			wEditor.TargetAsUTF8(u8Char);
+			const unsigned int u32 = UTF32Character(u8Char);
+			if (u32 < 0x10000) {
+				os << "\\u" << static_cast<short>(u32) << "?";
+			} else {
+				os << "\\u" << static_cast<short>(((u32 - 0x10000) >> 10) + 0xD800) << "?";
+				os << "\\u" << static_cast<short>((u32 & 0x3ff) + 0xDC00) << "?";
+			}
+			iPos = nextPosition - 1;
+		} else {
+			os << ch;
+		}
+		column++;
+		prevCR = ch == '\r';
+	}
+	os << RTF_BODYCLOSE;
+}
+
+void SciTEBase::SaveToRTF(const FilePath &saveName, SA::Position start, SA::Position end) {
+	FILE *fp = saveName.Open(GUI_TEXT("wt"));
+	bool failedWrite = fp == nullptr;
+	if (fp) {
+		try {
+			std::ostringstream oss;
+			SaveToStreamRTF(oss, start, end);
+			const std::string rtf = oss.str();
+			if (fwrite(rtf.c_str(), 1, rtf.length(), fp) != rtf.length()) {
+				failedWrite = true;
+			}
+			if (fclose(fp) != 0) {
+				failedWrite = true;
+			}
+		} catch (std::exception &) {
+			failedWrite = true;
+		}
+	}
+	if (failedWrite) {
+		FailedSaveMessageBox(saveName);
+	}
+}
+
diff --git a/scite-app/scite/src/ExportTEX.cxx b/scite-app/scite/src/ExportTEX.cxx
new file mode 100644
index 0000000..03df7e2
--- /dev/null
+++ b/scite-app/scite/src/ExportTEX.cxx
@@ -0,0 +1,215 @@
+// SciTE - Scintilla based Text Editor
+/** @file ExportTEX.cxx
+ ** Export the current document to TEX.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+//---------- Save to TeX ----------
+
+static char *getTexRGB(char *texcolor, const char *stylecolor) noexcept {
+	//texcolor[rgb]{0,0.5,0}{....}
+	const double rf = IntFromHexByte(stylecolor + 1) / 256.0;
+	const double gf = IntFromHexByte(stylecolor + 3) / 256.0;
+	const double bf = IntFromHexByte(stylecolor + 5) / 256.0;
+	// avoid breakage due to locale setting
+	const int r = static_cast<int>(rf * 10 + 0.5);
+	const int g = static_cast<int>(gf * 10 + 0.5);
+	const int b = static_cast<int>(bf * 10 + 0.5);
+	sprintf(texcolor, "%d.%d, %d.%d, %d.%d", r / 10, r % 10, g / 10, g % 10, b / 10, b % 10);
+	return texcolor;
+}
+
+#define CHARZ ('z' - 'b')
+static char *texStyle(int style) noexcept {
+	static char buf[10];
+	int i = 0;
+	do {
+		buf[i++] = static_cast<char>('a' + (style % CHARZ));
+		style /= CHARZ;
+	} while (style > 0);
+	buf[i] = 0;
+	return buf;
+}
+
+static void defineTexStyle(const StyleDefinition &style, FILE *fp, int istyle) {
+	int closing_brackets = 2;
+	char rgb[200] = "";
+	fprintf(fp, "\\newcommand{\\scite%s}[1]{\\noindent{\\ttfamily{", texStyle(istyle));
+	if (style.italics) {
+		fputs("\\textit{", fp);
+		closing_brackets++;
+	}
+	if (style.IsBold()) {
+		fputs("\\textbf{", fp);
+		closing_brackets++;
+	}
+	if (style.fore.length()) {
+		fprintf(fp, "\\textcolor[rgb]{%s}{", getTexRGB(rgb, style.fore.c_str()));
+		closing_brackets++;
+	}
+	if (style.back.length()) {
+		fprintf(fp, "\\colorbox[rgb]{%s}{", getTexRGB(rgb, style.back.c_str()));
+		closing_brackets++;
+	}
+	fputs("#1", fp);
+	for (int i = 0; i <= closing_brackets; i++) {
+		fputc('}', fp);
+	}
+	fputc('\n', fp);
+}
+
+void SciTEBase::SaveToTEX(const FilePath &saveName) {
+	RemoveFindMarks();
+	wEditor.ColouriseAll();
+	int tabSize = props.GetInt("tabsize");
+	if (tabSize == 0)
+		tabSize = 4;
+
+	const SA::Position lengthDoc = LengthDocument();
+	TextReader acc(wEditor);
+	bool styleIsUsed[StyleMax + 1] = {};
+
+	const int titleFullPath = props.GetInt("export.tex.title.fullpath", 0);
+
+	for (SA::Position pos = 0; pos < lengthDoc; pos++) {	// check the used styles
+		styleIsUsed[acc.StyleAt(pos)] = true;
+	}
+	styleIsUsed[StyleDefault] = true;
+
+	FILE *fp = saveName.Open(GUI_TEXT("wt"));
+	bool failedWrite = fp == nullptr;
+	if (fp) {
+		fputs("\\documentclass[a4paper]{article}\n"
+		      "\\usepackage[a4paper,margin=2cm]{geometry}\n"
+		      "\\usepackage[T1]{fontenc}\n"
+		      "\\usepackage{color}\n"
+		      "\\usepackage{alltt}\n"
+		      "\\usepackage{times}\n"
+		      "\\setlength{\\fboxsep}{0pt}\n", fp);
+
+		for (int istyle = 0; istyle < StyleMax; istyle++) {      // get keys
+			if (styleIsUsed[istyle]) {
+				StyleDefinition sd = StyleDefinitionFor(istyle);
+				defineTexStyle(sd, fp, istyle); // writeout style macroses
+			}
+		}
+
+		fputs("\\begin{document}\n\n", fp);
+		fprintf(fp, "Source File: %s\n\n\\noindent\n\\small{\n",
+			titleFullPath ? filePath.AsUTF8().c_str() : filePath.Name().AsUTF8().c_str());
+
+		int styleCurrent = acc.StyleAt(0);
+
+		fprintf(fp, "\\scite%s{", texStyle(styleCurrent));
+
+		int lineIdx = 0;
+
+		for (SA::Position i = 0; i < lengthDoc; i++) { //here process each character of the document
+			const char ch = acc[i];
+			const int style = acc.StyleAt(i);
+
+			if (style != styleCurrent) { //new style?
+				fprintf(fp, "}\\scite%s{", texStyle(style));
+				styleCurrent = style;
+			}
+
+			switch (ch) {   //write out current character.
+			case '\t': {
+					const int ts = tabSize - (lineIdx % tabSize);
+					lineIdx += ts - 1;
+					fprintf(fp, "\\hspace*{%dem}", ts);
+					break;
+				}
+			case '\\':
+				fputs("{\\textbackslash}", fp);
+				break;
+			case '>':
+			case '<':
+			case '@':
+				fprintf(fp, "$%c$", ch);
+				break;
+			case '{':
+			case '}':
+			case '^':
+			case '_':
+			case '&':
+			case '$':
+			case '#':
+			case '%':
+			case '~':
+				fprintf(fp, "\\%c", ch);
+				break;
+			case '\r':
+			case '\n':
+				lineIdx = -1;	// Because incremented below
+				if (ch == '\r' && acc[i + 1] == '\n')
+					i++;	// Skip the LF
+				styleCurrent = acc.StyleAt(i + 1);
+				fprintf(fp, "} \\\\\n\\scite%s{", texStyle(styleCurrent));
+				break;
+			case ' ':
+				if (acc[i + 1] == ' ') {
+					fputs("{\\hspace*{1em}}", fp);
+				} else {
+					fputc(' ', fp);
+				}
+				break;
+			default:
+				fputc(ch, fp);
+			}
+			lineIdx++;
+		}
+		fputs("}\n} %end small\n\n\\end{document}\n", fp); //close last empty style macros and document too
+		if (fclose(fp) != 0) {
+			failedWrite = true;
+		}
+	}
+	if (failedWrite) {
+		FailedSaveMessageBox(saveName);
+	}
+}
diff --git a/scite-app/scite/src/ExportXML.cxx b/scite-app/scite/src/ExportXML.cxx
new file mode 100644
index 0000000..3bcc727
--- /dev/null
+++ b/scite-app/scite/src/ExportXML.cxx
@@ -0,0 +1,231 @@
+// SciTE - Scintilla based Text Editor
+/** @file ExportXML.cxx
+ ** Export the current document to XML.
+ **/
+// Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+//---------- Save to XML ----------
+
+void SciTEBase::SaveToXML(const FilePath &saveName) {
+
+	// Author: Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+	// Version: 1.0 / august 18, 2003
+	// Remark: for a suitable style, see ConTeXt (future) distributions
+
+	// The idea is that one can use whole files, or ranges of lines in manuals
+	// and alike. Since ConTeXt can handle XML files, it's quite convenient to
+	// use this format instead of raw TeX, although the output would not look
+	// much different in structure.
+
+	// We don't put style definitions in here since the main document will in
+	// most cases determine the look and feel. This way we have full control over
+	// the layout. The type attribute will hold the current lexer value.
+
+	// <document>            : the whole thing
+	// <data>                : reserved for metadata
+	// <text>                : the main bodyof text
+	// <line n-'number'>     : a line of text
+
+	// <t n='number'>...<t/> : tag
+	// <s n='number'/>       : space
+	// <g/>                  : >
+	// <l/>                  : <
+	// <a/>                  : &
+	// <h/>                  : #
+
+	// We don't use entities, but empty elements for special characters
+	// but will eventually use utf-8 (once i know how to get them out).
+
+	RemoveFindMarks();
+	wEditor.ColouriseAll();
+
+	int tabSize = props.GetInt("tabsize");
+	if (tabSize == 0) {
+		tabSize = 4;
+	}
+
+	const SA::Position lengthDoc = LengthDocument();
+
+	TextReader acc(wEditor);
+
+	FILE *fp = saveName.Open(GUI_TEXT("wt"));
+	bool failedWrite = fp == nullptr;
+
+	if (fp) {
+
+		const bool collapseSpaces = (props.GetInt("export.xml.collapse.spaces", 1) == 1);
+		const bool collapseLines  = (props.GetInt("export.xml.collapse.lines", 1) == 1);
+
+		fprintf(fp, "<?xml version='1.0' encoding='%s'?>\n", (codePage == SA::CpUtf8) ? "utf-8" : "ascii");
+
+		fputs("<document xmlns='http://www.scintilla.org/scite.rng'", fp);
+		fprintf(fp, " filename='%s'",
+			filePath.Name().AsUTF8().c_str());
+		fprintf(fp, " type='%s'", "unknown");
+		fprintf(fp, " version='%s'", "1.0");
+		fputs(">\n", fp);
+
+		fputs("<data comment='This element is reserved for future usage.'/>\n", fp);
+
+		fputs("<text>\n", fp);
+
+		int styleCurrent = -1; // acc.StyleAt(0);
+		SA::Line lineNumber = 1;
+		int lineIndex = 0;
+		bool styleDone = false;
+		bool lineDone = false;
+		bool charDone = false;
+		int styleNew = -1;
+		int spaceLen = 0;
+		int emptyLines = 0;
+
+		for (SA::Position i = 0; i < lengthDoc; i++) {
+			const char ch = acc[i];
+			const int style = acc.StyleAt(i);
+			if (style != styleCurrent) {
+				styleCurrent = style;
+				styleNew = style;
+			}
+			if (ch == ' ') {
+				spaceLen++;
+			} else if (ch == '\t') {
+				const int ts = tabSize - (lineIndex % tabSize);
+				lineIndex += ts - 1;
+				spaceLen += ts;
+			} else if (ch == '\f') {
+				// ignore this animal
+			} else if (ch == '\r' || ch == '\n') {
+				if (ch == '\r' && acc[i + 1] == '\n') {
+					i++;
+				}
+				if (styleDone) {
+					fputs("</t>", fp);
+					styleDone = false;
+				}
+				lineIndex = -1;
+				if (lineDone) {
+					fputs("</line>\n", fp);
+					lineDone = false;
+				} else if (collapseLines) {
+					emptyLines++;
+				} else {
+					fprintf(fp, "<line n='%s'/>\n", std::to_string(lineNumber).c_str());
+				}
+				charDone = false;
+				lineNumber++;
+				styleCurrent = -1; // acc.StyleAt(i + 1);
+			} else {
+				if (collapseLines && (emptyLines > 0)) {
+					fputs("<line/>\n", fp);
+				}
+				emptyLines = 0;
+				if (! lineDone) {
+					fprintf(fp, "<line n='%s'>", std::to_string(lineNumber).c_str());
+					lineDone = true;
+				}
+				if (styleNew >= 0) {
+					if (styleDone) { fputs("</t>", fp); }
+				}
+				if (! collapseSpaces) {
+					while (spaceLen > 0) {
+						fputs("<s/>", fp);
+						spaceLen--;
+					}
+				} else if (spaceLen == 1) {
+					fputs("<s/>", fp);
+					spaceLen = 0;
+				} else if (spaceLen > 1) {
+					fprintf(fp, "<s n='%d'/>", spaceLen);
+					spaceLen = 0;
+				}
+				if (styleNew >= 0) {
+					fprintf(fp, "<t n='%d'>", style);
+					styleNew = -1;
+					styleDone = true;
+				}
+				switch (ch) {
+				case '>' :
+					fputs("<g/>", fp);
+					break;
+				case '<' :
+					fputs("<l/>", fp);
+					break;
+				case '&' :
+					fputs("<a/>", fp);
+					break;
+				case '#' :
+					fputs("<h/>", fp);
+					break;
+				default  :
+					fputc(ch, fp);
+				}
+				charDone = true;
+			}
+			lineIndex++;
+		}
+		if (styleDone) {
+			fputs("</t>", fp);
+		}
+		if (lineDone) {
+			fputs("</line>\n", fp);
+		}
+		if (charDone) {
+			// no last empty line: fprintf(fp, "<line n='%d'/>", lineNumber);
+		}
+
+		fputs("</text>\n", fp);
+		fputs("</document>\n", fp);
+
+		if (fclose(fp) != 0) {
+			failedWrite = true;
+		}
+	}
+	if (failedWrite) {
+		FailedSaveMessageBox(saveName);
+	}
+}
diff --git a/scite-app/scite/src/Extender.h b/scite-app/scite/src/Extender.h
new file mode 100644
index 0000000..1fcc01b
--- /dev/null
+++ b/scite-app/scite/src/Extender.h
@@ -0,0 +1,93 @@
+// SciTE - Scintilla based Text Editor
+/** @file Extender.h
+ ** SciTE extension interface.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef EXTENDER_H
+#define EXTENDER_H
+
+class StyleWriter;
+
+inline intptr_t SptrFromPointer(void *p) noexcept {
+	return reinterpret_cast<intptr_t>(p);
+}
+
+inline intptr_t SptrFromString(const char *cp) noexcept {
+	return reinterpret_cast<intptr_t>(cp);
+}
+
+inline uintptr_t UptrFromString(const char *cp) noexcept {
+	return reinterpret_cast<uintptr_t>(cp);
+}
+
+class ExtensionAPI {
+public:
+	virtual ~ExtensionAPI() {
+	}
+	enum Pane { paneEditor=1, paneOutput=2, paneFindOutput=3 };
+	virtual intptr_t Send(Pane p, Scintilla::Message msg, uintptr_t wParam=0, intptr_t lParam=0)=0;
+	virtual std::string Range(Pane p, Scintilla::Span range)=0;
+	virtual void Remove(Pane p, Scintilla::Position start, Scintilla::Position end)=0;
+	virtual void Insert(Pane p, Scintilla::Position pos, const char *s)=0;
+	virtual void Trace(const char *s)=0;
+	virtual std::string Property(const char *key)=0;
+	virtual void SetProperty(const char *key, const char *val)=0;
+	virtual void UnsetProperty(const char *key)=0;
+	virtual uintptr_t GetInstance()=0;
+	virtual void ShutDown()=0;
+	virtual void Perform(const char *actions)=0;
+	virtual void DoMenuCommand(int cmdID)=0;
+	virtual void UpdateStatusBar(bool bUpdateSlowData)=0;
+	virtual void UserStripShow(const char *description)=0;
+	virtual void UserStripSet(int control, const char *value)=0;
+	virtual void UserStripSetList(int control, const char *value)=0;
+	virtual std::string UserStripValue(int control)=0;
+	virtual Scintilla::ScintillaCall &PaneCaller(Pane p) noexcept =0;
+};
+
+/**
+ * Methods in extensions return true if they have completely handled an event and
+ * false if default processing is to continue.
+ */
+class Extension {
+public:
+	virtual ~Extension() {}
+
+	virtual bool Initialise(ExtensionAPI *host_)=0;
+	virtual bool Finalise() noexcept =0;
+	virtual bool Clear()=0;
+	virtual bool Load(const char *filename)=0;
+
+	virtual bool InitBuffer(int) { return false; }
+	virtual bool ActivateBuffer(int) { return false; }
+	virtual bool RemoveBuffer(int) { return false; }
+
+	virtual bool OnOpen(const char *) { return false; }
+	virtual bool OnSwitchFile(const char *) { return false; }
+	virtual bool OnBeforeSave(const char *) { return false; }
+	virtual bool OnSave(const char *) { return false; }
+	virtual bool OnChar(char) { return false; }
+	virtual bool OnExecute(const char *) { return false; }
+	virtual bool OnSavePointReached() { return false; }
+	virtual bool OnSavePointLeft() { return false; }
+	virtual bool OnStyle(Scintilla::Position, Scintilla::Position, int, StyleWriter *) {
+		return false;
+	}
+	virtual bool OnDoubleClick() { return false; }
+	virtual bool OnUpdateUI() { return false; }
+	virtual bool OnMarginClick() { return false; }
+	virtual bool OnMacro(const char *, const char *) { return false; }
+	virtual bool OnUserListSelection(int, const char *) { return false; }
+
+	virtual bool SendProperty(const char *) { return false; }
+
+	virtual bool OnKey(int, int) { return false; }
+	virtual bool OnDwellStart(Scintilla::Position, const char *) { return false; }
+	virtual bool OnClose(const char *) { return false; }
+	virtual bool OnUserStrip(int /* control */, int /* change */) { return false; }
+	virtual bool NeedsOnClose() { return true; }
+};
+
+#endif
diff --git a/scite-app/scite/src/FilePath.cxx b/scite-app/scite/src/FilePath.cxx
new file mode 100644
index 0000000..da43278
--- /dev/null
+++ b/scite-app/scite/src/FilePath.cxx
@@ -0,0 +1,749 @@
+// SciTE - Scintilla based Text Editor
+/** @file FilePath.cxx
+ ** Encapsulate a file path.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+#include <cerrno>
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <chrono>
+
+#include <fcntl.h>
+
+#if defined(__unix__) || defined(__APPLE__)
+
+#include <unistd.h>
+#include <dirent.h>
+
+#endif
+
+#include <sys/stat.h>
+
+#if !(defined(__unix__) || defined(__APPLE__))
+
+#include <io.h>
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT  0x0602
+#include <windows.h>
+#include <commctrl.h>
+
+// For chdir
+#include <direct.h>
+
+#endif
+
+#include "GUI.h"
+
+#include "FilePath.h"
+
+#if defined(__unix__) || defined(__APPLE__)
+const GUI::gui_char pathSepString[] = "/";
+const GUI::gui_char pathSepChar = '/';
+const GUI::gui_char listSepString[] = ":";
+const GUI::gui_char configFileVisibilityString[] = ".";
+#endif
+#ifdef WIN32
+// Windows
+const GUI::gui_char pathSepString[] = GUI_TEXT("\\");
+const GUI::gui_char pathSepChar = '\\';
+const GUI::gui_char listSepString[] = GUI_TEXT(";");
+const GUI::gui_char configFileVisibilityString[] = GUI_TEXT("");
+#endif
+
+const GUI::gui_char fileRead[] = GUI_TEXT("rb");
+const GUI::gui_char fileWrite[] = GUI_TEXT("wb");
+
+namespace {
+const GUI::gui_char currentDirectory[] = GUI_TEXT(".");
+const GUI::gui_char parentDirectory[] = GUI_TEXT("..");
+}
+
+FilePath::FilePath() noexcept = default;
+
+FilePath::FilePath(const GUI::gui_char *fileName_) : fileName(fileName_ ? fileName_ : GUI_TEXT("")) {}
+
+FilePath::FilePath(const GUI::gui_string &fileName_) : fileName(fileName_) {}
+
+FilePath::FilePath(FilePath const &directory, FilePath const &name) {
+	Set(directory, name);
+}
+
+void FilePath::Set(const GUI::gui_char *fileName_) {
+	fileName = fileName_;
+}
+
+void FilePath::Set(FilePath const &other) {
+	fileName = other.fileName;
+}
+
+void FilePath::Set(FilePath const &directory, FilePath const &name) {
+	if (name.IsAbsolute()) {
+		fileName = name.fileName;
+	} else {
+		fileName = directory.fileName;
+		if (fileName.size() && (fileName[fileName.size()-1] != pathSepChar))
+			fileName += pathSepString;
+		fileName += name.fileName;
+	}
+}
+
+void FilePath::SetDirectory(FilePath const &directory) {
+	FilePath curName(*this);
+	Set(directory, curName);
+}
+
+void FilePath::Init() noexcept {
+	fileName.clear();
+}
+
+bool FilePath::operator==(const FilePath &other) const noexcept {
+	return SameNameAs(other);
+}
+
+bool FilePath::operator<(const FilePath &other) const noexcept {
+	return fileName < other.fileName;
+}
+
+bool FilePath::SameNameAs(const GUI::gui_char *other) const noexcept {
+#ifdef WIN32
+	return CSTR_EQUAL == CompareString(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE,
+					   fileName.c_str(), -1, other, -1);
+#else
+	return fileName == other;
+#endif
+}
+
+bool FilePath::SameNameAs(const FilePath &other) const noexcept {
+	return SameNameAs(other.fileName.c_str());
+}
+
+bool FilePath::IsSet() const noexcept {
+	return fileName.length() > 0;
+}
+
+bool FilePath::IsUntitled() const {
+	const size_t dirEnd = fileName.rfind(pathSepChar);
+	return (dirEnd == GUI::gui_string::npos) || (!fileName[dirEnd+1]);
+}
+
+bool FilePath::IsAbsolute() const {
+	if (fileName.length() == 0)
+		return false;
+#if defined(__unix__) || defined(__APPLE__)
+	if (fileName[0] == '/')
+		return true;
+#endif
+#ifdef WIN32
+	if (fileName[0] == pathSepChar || fileName[1] == ':')	// UNC path or drive separator
+		return true;
+#endif
+
+	return false;
+}
+
+bool FilePath::IsRoot() const {
+#ifdef WIN32
+	if ((fileName[0] == pathSepChar) && (fileName[1] == pathSepChar) && (fileName.find(pathSepString, 2) == GUI::gui_string::npos))
+		return true; // UNC path like \\server
+	return (fileName.length() == 3) && (fileName[1] == ':') && (fileName[2] == pathSepChar);
+#else
+	return fileName == "/";
+#endif
+}
+
+int FilePath::RootLength() noexcept {
+#ifdef WIN32
+	return 3;
+#else
+	return 1;
+#endif
+}
+
+const GUI::gui_char *FilePath::AsInternal() const noexcept {
+	return fileName.c_str();
+}
+
+std::string FilePath::AsUTF8() const {
+	return GUI::UTF8FromString(fileName);
+}
+
+FilePath FilePath::Name() const {
+	const size_t dirEnd = fileName.rfind(pathSepChar);
+	if (dirEnd != GUI::gui_string::npos)
+		return fileName.substr(dirEnd + 1);
+	else
+		return fileName;
+}
+
+FilePath FilePath::BaseName() const {
+	const size_t dirEnd = fileName.rfind(pathSepChar);
+	const size_t extStart = fileName.rfind('.');
+	if (dirEnd != GUI::gui_string::npos) {
+		if (extStart > dirEnd) {
+			return FilePath(fileName.substr(dirEnd + 1, extStart - dirEnd - 1));
+		} else {
+			return FilePath(fileName.substr(dirEnd + 1));
+		}
+	} else if (extStart != GUI::gui_string::npos) {
+		return FilePath(fileName.substr(0, extStart));
+	} else {
+		return fileName;
+	}
+}
+
+FilePath FilePath::Extension() const {
+	const size_t dirEnd = fileName.rfind(pathSepChar);
+	const size_t extStart = fileName.rfind('.');
+	if ((extStart != GUI::gui_string::npos) && ((dirEnd == GUI::gui_string::npos) || (extStart > dirEnd)))
+		return fileName.substr(extStart + 1);
+	else
+		return GUI_TEXT("");
+}
+
+FilePath FilePath::Directory() const {
+	if (IsRoot()) {
+		return FilePath(fileName.c_str());
+	} else {
+		size_t lenDirectory = fileName.rfind(pathSepChar);
+		if (lenDirectory != GUI::gui_string::npos) {
+			if (lenDirectory < static_cast<size_t>(RootLength())) {
+				lenDirectory = static_cast<size_t>(RootLength());
+			}
+			return FilePath(fileName.substr(0, lenDirectory));
+		} else {
+			return FilePath();
+		}
+	}
+}
+
+#ifdef _WIN32
+
+// Substitute functions that take wchar_t arguments but have the same name
+// as char functions so that the compiler will choose the right form.
+
+static size_t strlen(const wchar_t *str) noexcept {
+	return wcslen(str);
+}
+
+static int chdir(const wchar_t *dirname) noexcept {
+	return _wchdir(dirname);
+}
+
+static FILE *fopen(const wchar_t *filename, const wchar_t *mode) noexcept {
+	return _wfopen(filename, mode);
+}
+
+static int unlink(const wchar_t *filename) noexcept {
+	return _wunlink(filename);
+}
+
+static int access(const wchar_t *path, int mode) noexcept {
+	return _waccess(path, mode);
+}
+
+#if defined(_MSC_VER)
+static int stat(const wchar_t *path, struct _stat64i32 *buffer) noexcept {
+	return _wstat(path, buffer);
+}
+#else
+static int stat(const wchar_t *path, struct _stat *buffer) noexcept {
+	return _wstat(path, buffer);
+}
+#endif
+
+#endif
+
+FilePath FilePath::NormalizePath() const {
+	if (fileName.empty()) {
+		return FilePath();
+	}
+	GUI::gui_string path(fileName);
+#ifdef WIN32
+	// Convert unix path separators to Windows
+	std::replace(path.begin(), path.end(), L'/', pathSepChar);
+#endif
+	GUI::gui_string_view source = path;
+	GUI::gui_string absPathString;
+	// Result is always same size or shorter so can allocate once for maximum
+	// possible and avoid a reallocation for common path lengths.
+	absPathString.reserve(fileName.length());
+	if (source.front() == pathSepChar) {
+		absPathString.push_back(pathSepChar);
+		source.remove_prefix(1);
+	}
+	// Split into components and remove x/.. and .
+	while (true) {
+		const size_t separator = source.find_first_of(pathSepChar);
+		// If no pathSepChar then separator == npos, so substr -> rest of string, OK
+		const GUI::gui_string_view part = source.substr(0, separator);
+		if (part != currentDirectory) {
+			bool appendPart = true;
+			if (part == parentDirectory) {
+				const size_t last = absPathString.find_last_of(pathSepChar);
+				if (last != GUI::gui_string::npos) {
+					// Erase the last component from the path separator, unless that would erase
+					// the entire string, in which case leave a single path separator.
+					const size_t truncPoint = (last > 0) ? last : last + 1;
+					absPathString.erase(truncPoint);
+					appendPart = false;
+				}
+			}
+			if (appendPart) {
+				if (!absPathString.empty() && (absPathString.back() != pathSepChar))
+					absPathString.push_back(pathSepChar);
+				absPathString.append(part);
+			}
+		}
+		if (separator == GUI::gui_string::npos)	// Consumed last part
+			break;
+		source.remove_prefix(separator+1);
+	}
+	return FilePath(absPathString);
+}
+
+/**
+ * Take a filename or relative path and put it at the end of the current path.
+ * If the path is absolute, return the same path.
+ */
+FilePath FilePath::AbsolutePath() const {
+#ifdef WIN32
+	// The runtime libraries for GCC and Visual C++ give different results for _fullpath
+	// so use the OS.
+	GUI::gui_char absPath[2000];
+	absPath[0] = '\0';
+	GUI::gui_char *fileBit = nullptr;
+	::GetFullPathNameW(AsInternal(), sizeof(absPath)/sizeof(absPath[0]), absPath, &fileBit);
+	return FilePath(absPath);
+#else
+	if (IsAbsolute()) {
+		return NormalizePath();
+	} else {
+		return FilePath(GetWorkingDirectory(), *this).NormalizePath();
+	}
+#endif
+}
+
+FilePath FilePath::GetWorkingDirectory() {
+	// Call getcwd with (nullptr, 0) to always allocate
+#ifdef WIN32
+	GUI::gui_char *pdir = _wgetcwd(nullptr, 0);
+#else
+	GUI::gui_char *pdir = getcwd(nullptr, 0);
+#endif
+	if (pdir) {
+		GUI::gui_string gswd(pdir);
+		free(pdir);
+		// In Windows, getcwd returns a trailing backslash
+		// when the CWD is at the root of a disk, so remove it
+		if (!gswd.empty() && (gswd.back() == pathSepChar)) {
+			gswd.pop_back();
+		}
+		return FilePath(gswd);
+	}
+	return FilePath();
+}
+
+bool FilePath::SetWorkingDirectory() const noexcept {
+	return chdir(AsInternal()) == 0;
+}
+
+void FilePath::List(FilePathSet &directories, FilePathSet &files) const {
+#ifdef WIN32
+	FilePath wildCard(*this, GUI_TEXT("*.*"));
+	WIN32_FIND_DATAW findFileData;
+	HANDLE hFind = ::FindFirstFileW(wildCard.AsInternal(), &findFileData);
+	if (hFind != INVALID_HANDLE_VALUE) {
+		bool complete = false;
+		while (!complete) {
+			const std::wstring_view entryName = findFileData.cFileName;
+			if ((entryName != currentDirectory) && (entryName != parentDirectory)) {
+				FilePath pathFull(*this, findFileData.cFileName);
+				if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+					directories.push_back(pathFull);
+				} else {
+					files.push_back(pathFull);
+				}
+			}
+			if (!::FindNextFileW(hFind, &findFileData)) {
+				complete = true;
+			}
+		}
+		::FindClose(hFind);
+	}
+#else
+	errno = 0;
+	DIR *dp = opendir(AsInternal());
+	if (dp == NULL) {
+		//~ fprintf(stderr, "%s: cannot open for reading: %s\n", AsInternal(), strerror(errno));
+		return;
+	}
+	struct dirent *ent;
+	while ((ent = readdir(dp)) != NULL) {
+		std::string_view entryName = ent->d_name;
+		if ((entryName != currentDirectory) && (entryName != parentDirectory)) {
+			FilePath pathFull(AsInternal(), ent->d_name);
+			if (pathFull.IsDirectory()) {
+				directories.push_back(pathFull);
+			} else {
+				files.push_back(pathFull);
+			}
+		}
+	}
+
+	closedir(dp);
+#endif
+	std::sort(files.begin(), files.end());
+	std::sort(directories.begin(), directories.end());
+}
+
+FILE *FilePath::Open(const GUI::gui_char *mode) const noexcept {
+	if (IsSet()) {
+		return fopen(fileName.c_str(), mode);
+	} else {
+		return nullptr;
+	}
+}
+
+/// Size of block for file reading.
+static constexpr size_t readBlockSize = 64 * 1024;
+
+std::string FilePath::Read() const {
+	std::string data;
+	FILE *fp = Open(fileRead);
+	if (fp) {
+		std::string block(readBlockSize, '\0');
+		size_t lenBlock = fread(&block[0], 1, block.size(), fp);
+		while (lenBlock > 0) {
+			data.append(block, 0, lenBlock);
+			lenBlock = fread(&block[0], 1, block.size(), fp);
+		}
+		fclose(fp);
+	}
+	return data;
+}
+
+void FilePath::Remove() const noexcept {
+	unlink(AsInternal());
+}
+
+#ifndef R_OK
+// Microsoft does not define the constants used to call access
+#define R_OK 4
+#endif
+
+time_t FilePath::ModifiedTime() const {
+	if (IsUntitled())
+		return 0;
+	if (access(AsInternal(), R_OK) == -1)
+		return 0;
+#ifdef _WIN32
+#if defined(_MSC_VER)
+	struct _stat64i32 statusFile;
+#else
+	struct _stat statusFile;
+#endif
+#else
+	struct stat statusFile;
+#endif
+	if (stat(AsInternal(), &statusFile) != -1)
+		return statusFile.st_mtime;
+	else
+		return 0;
+}
+
+long long FilePath::GetFileLength() const noexcept {
+#ifdef WIN32
+	// Using Win32 API as stat variants are complex and there were problems with stat
+	// working on XP when compiling with XP compatibility flag.
+	WIN32_FILE_ATTRIBUTE_DATA fad;
+	if (!GetFileAttributesEx(AsInternal(), GetFileExInfoStandard, &fad))
+		return 0;
+	return (static_cast<unsigned long long>(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow;
+#else
+	struct stat statusFile;
+	if (stat(AsInternal(), &statusFile) != -1)
+		return statusFile.st_size;
+	return 0;
+#endif
+}
+
+bool FilePath::Exists() const noexcept {
+	bool ret = false;
+	if (IsSet()) {
+		FILE *fp = Open(fileRead);
+		if (fp) {
+			ret = true;
+			fclose(fp);
+		}
+	}
+	return ret;
+}
+
+bool FilePath::IsDirectory() const noexcept {
+#ifdef _WIN32
+#if defined(_MSC_VER)
+	struct _stat64i32 statusFile;
+#else
+	struct _stat statusFile;
+#endif
+#else
+	struct stat statusFile;
+#endif
+	if (stat(AsInternal(), &statusFile) != -1)
+#ifdef WIN32
+		return (statusFile.st_mode & _S_IFDIR) != 0;
+#else
+		return (statusFile.st_mode & S_IFDIR) != 0;
+#endif
+	else
+		return false;
+}
+
+namespace {
+
+#ifdef _WIN32
+void Lowercase(GUI::gui_string &s) {
+	const int sLength = static_cast<int>(s.length());
+	const int chars = ::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, s.c_str(), sLength, nullptr, 0);
+	GUI::gui_string vc(chars, 0);
+	::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, s.c_str(), sLength, vc.data(), chars);
+	s = vc;
+}
+#endif
+
+bool PatternMatch(GUI::gui_string_view pattern, GUI::gui_string_view text) {
+	if (pattern == text) {
+		return true;
+	} else if (pattern.empty()) {
+		return false;
+	} else if (pattern.front() == '*') {
+		pattern.remove_prefix(1);
+		if (pattern.empty()) {
+			return true;
+		}
+		while (!text.empty()) {
+			if (PatternMatch(pattern, text)) {
+				return true;
+			}
+			text.remove_prefix(1);
+		}
+	} else if (text.empty()) {
+		return false;
+	} else if (pattern.front() == '?') {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return PatternMatch(pattern, text);
+	} else if (pattern.front() == text.front()) {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return PatternMatch(pattern, text);
+	}
+	return false;
+}
+
+}
+
+bool FilePath::Matches(const GUI::gui_char *pattern) const {
+	GUI::gui_string pat(pattern);
+	GUI::gui_string nameCopy(Name().fileName);
+#ifdef _WIN32
+	Lowercase(pat);
+	Lowercase(nameCopy);
+#endif
+	std::replace(pat.begin(), pat.end(), ' ', '\0');
+	size_t start = 0;
+	while (start < pat.length()) {
+		const GUI::gui_char *patElement = pat.c_str() + start;
+		if (PatternMatch(patElement, nameCopy)) {
+			return true;
+		}
+		start += strlen(patElement) + 1;
+	}
+	return false;
+}
+
+#ifdef WIN32
+/**
+ * Makes a long path from a given, possibly short path/file.
+ *
+ * The short path/file must exist, and if it is a file it must be fully specified
+ * otherwise the function fails.
+ *
+ * @returns true on success, and the long path in @a longPath,
+ * false on failure.
+ */
+static bool MakeLongPath(const GUI::gui_char *shortPath, GUI::gui_string &longPath) {
+	if (!*shortPath) {
+		return false;
+	}
+	typedef DWORD (STDAPICALLTYPE* GetLongSig)(const GUI::gui_char* lpszShortPath, GUI::gui_char* lpszLongPath, DWORD cchBuffer);
+	static GetLongSig pfnGetLong = nullptr;
+	static bool kernelTried = false;
+
+	if (!kernelTried) {
+		kernelTried = true;
+		HMODULE hModule = ::GetModuleHandle(TEXT("kernel32.dll"));
+		if (hModule) {
+			// attempt to get GetLongPathNameW implemented in Windows 2000 or newer
+			pfnGetLong = reinterpret_cast<GetLongSig>(::GetProcAddress(hModule, "GetLongPathNameW"));
+		}
+	}
+
+	if (!pfnGetLong) {
+		return false;
+	}
+	GUI::gui_string gsLong(1, L'\0');
+	// Call with too-short string returns size + terminating NUL
+	const DWORD size = (pfnGetLong)(shortPath, &gsLong[0], 0);
+	if (size == 0) {
+		return false;
+	}
+	gsLong.resize(size);
+	// Call with correct size string returns size without terminating NUL
+	const DWORD characters = (pfnGetLong)(shortPath, &gsLong[0], size);
+	if (characters != 0) {
+		longPath.assign(gsLong, 0, characters);
+	}
+	return characters != 0;
+}
+#endif
+
+void FilePath::FixName() {
+#ifdef WIN32
+	// Only used on Windows to use long file names and fix the case of file names
+	GUI::gui_string longPath;
+	// first try MakeLongPath which corrects the path and the case of filename too
+	if (MakeLongPath(AsInternal(), longPath)) {
+		Set(longPath);
+	} else {
+		// On Windows file comparison is done case insensitively so the user can
+		// enter scite.cxx and still open this file, SciTE.cxx. To ensure that the file
+		// is saved with correct capitalisation FindFirstFile is used to find out the
+		// real name of the file.
+		WIN32_FIND_DATAW FindFileData;
+		HANDLE hFind = ::FindFirstFileW(AsInternal(), &FindFileData);
+		FilePath dir = Directory();
+		if (hFind != INVALID_HANDLE_VALUE) {	// FindFirstFile found the file
+			Set(dir, FindFileData.cFileName);
+			::FindClose(hFind);
+		}
+	}
+#endif
+}
+
+bool FilePath::CaseSensitive() noexcept {
+#if defined (__APPLE__)
+	return false;
+#elif defined(__unix__)
+	return true;
+#else
+	return false;
+#endif
+}
+
+std::string CommandExecute(const GUI::gui_char *command, const GUI::gui_char *directoryForRun) {
+	std::string output;
+#ifdef _WIN32
+	SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), nullptr, TRUE};
+
+	HANDLE hPipeWrite {};
+	HANDLE hPipeRead {};
+	// Create pipe for output redirection
+	// read handle, write handle, security attributes,  number of bytes reserved for pipe - 0 default
+	::CreatePipe(&hPipeRead, &hPipeWrite, &sa, 0);
+
+	// Create pipe for input redirection. In this code, you do not
+	// redirect the output of the child process, but you need a handle
+	// to set the hStdInput field in the STARTUP_INFO struct. For safety,
+	// you should not set the handles to an invalid handle.
+
+	HANDLE hWriteSubProcess {};
+	//subProcessGroupId = 0;
+	HANDLE hRead2 {};
+	// read handle, write handle, security attributes,  number of bytes reserved for pipe - 0 default
+	::CreatePipe(&hRead2, &hWriteSubProcess, &sa, 0);
+
+	::SetHandleInformation(hPipeRead, HANDLE_FLAG_INHERIT, 0);
+	::SetHandleInformation(hWriteSubProcess, HANDLE_FLAG_INHERIT, 0);
+
+	// Make child process use hPipeWrite as standard out, and make
+	// sure it does not show on screen.
+	STARTUPINFOW si = {};
+	si.cb = sizeof(STARTUPINFO);
+	si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+	si.wShowWindow = SW_HIDE;
+	si.hStdInput = hRead2;
+	si.hStdOutput = hPipeWrite;
+	si.hStdError = hPipeWrite;
+
+	PROCESS_INFORMATION pi = {};
+
+	std::vector<wchar_t> vwcCommand(command, command + wcslen(command) + 1);
+
+	const BOOL running = ::CreateProcessW(
+				     nullptr,
+				     &vwcCommand[0],
+				     nullptr, nullptr,
+				     TRUE, CREATE_NEW_PROCESS_GROUP,
+				     nullptr,
+				     (directoryForRun && directoryForRun[0]) ? directoryForRun : nullptr,
+				     &si, &pi);
+
+	if (running && pi.hProcess && pi.hThread) {
+		// Wait until child process exits but time out after 5 seconds.
+		::WaitForSingleObject(pi.hProcess, 5 * 1000);
+
+		DWORD bytesRead = 0;
+		DWORD bytesAvail = 0;
+		char buffer[8 * 1024];
+
+		if (::PeekNamedPipe(hPipeRead, buffer, sizeof(buffer), &bytesRead, &bytesAvail, nullptr)) {
+			if (bytesAvail > 0) {
+				int bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, nullptr);
+				while (bTest && bytesRead) {
+					output.append(buffer, buffer+bytesRead);
+					bytesRead = 0;
+					if (::PeekNamedPipe(hPipeRead, buffer, sizeof(buffer), &bytesRead, &bytesAvail, nullptr)) {
+						if (bytesAvail) {
+							bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, nullptr);
+						}
+					}
+				}
+			}
+		}
+		::CloseHandle(pi.hProcess);
+		::CloseHandle(pi.hThread);
+	}
+
+	::CloseHandle(hPipeRead);
+	::CloseHandle(hPipeWrite);
+	::CloseHandle(hRead2);
+	::CloseHandle(hWriteSubProcess);
+
+#else
+	FilePath startDirectory= FilePath::GetWorkingDirectory();	// Save
+	FilePath(directoryForRun).SetWorkingDirectory();
+	FILE *fp = popen(command, "r");
+	if (fp) {
+		char buffer[16 * 1024];
+		size_t lenData = fread(buffer, 1, sizeof(buffer), fp);
+		while (lenData > 0) {
+			output.append(buffer, buffer+lenData);
+			lenData = fread(buffer, 1, sizeof(buffer), fp);
+		}
+		pclose(fp);
+	}
+	startDirectory.SetWorkingDirectory();
+#endif
+	return output;
+}
diff --git a/scite-app/scite/src/FilePath.h b/scite-app/scite/src/FilePath.h
new file mode 100644
index 0000000..0d6992b
--- /dev/null
+++ b/scite-app/scite/src/FilePath.h
@@ -0,0 +1,74 @@
+// SciTE - Scintilla based Text Editor
+/** @file FilePath.h
+ ** Definition of platform independent base class of editor.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef FILEPATH_H
+#define FILEPATH_H
+
+extern const GUI::gui_char pathSepString[];
+extern const GUI::gui_char pathSepChar;
+extern const GUI::gui_char listSepString[];
+extern const GUI::gui_char configFileVisibilityString[];
+extern const GUI::gui_char fileRead[];
+extern const GUI::gui_char fileWrite[];
+
+class FilePath;
+
+typedef std::vector<FilePath> FilePathSet;
+
+class FilePath {
+	GUI::gui_string fileName;
+public:
+	FilePath() noexcept;
+	FilePath(const GUI::gui_char *fileName_);
+	FilePath(const GUI::gui_string &fileName_);
+	FilePath(FilePath const &directory, FilePath const &name);
+	FilePath(FilePath const &) = default;
+	FilePath(FilePath &&) noexcept = default;
+	FilePath &operator=(FilePath const &) = default;
+	FilePath &operator=(FilePath &&) noexcept = default;
+	virtual ~FilePath() = default;
+
+	void Set(const GUI::gui_char *fileName_);
+	void Set(FilePath const &other);
+	void Set(FilePath const &directory, FilePath const &name);
+	void SetDirectory(FilePath const &directory);
+	virtual void Init() noexcept;
+	bool SameNameAs(const GUI::gui_char *other) const noexcept;
+	bool SameNameAs(const FilePath &other) const noexcept;
+	bool operator==(const FilePath &other) const noexcept;
+	bool operator<(const FilePath &other) const noexcept;
+	bool IsSet() const noexcept;
+	bool IsUntitled() const;
+	bool IsAbsolute() const;
+	bool IsRoot() const;
+	static int RootLength() noexcept;
+	const GUI::gui_char *AsInternal() const noexcept;
+	std::string AsUTF8() const;
+	FilePath Name() const;
+	FilePath BaseName() const;
+	FilePath Extension() const;
+	FilePath Directory() const;
+	void FixName();
+	FilePath AbsolutePath() const;
+	FilePath NormalizePath() const;
+	static FilePath GetWorkingDirectory();
+	bool SetWorkingDirectory() const noexcept;
+	void List(FilePathSet &directories, FilePathSet &files) const;
+	FILE *Open(const GUI::gui_char *mode) const noexcept;
+	std::string Read() const;
+	void Remove() const noexcept;
+	time_t ModifiedTime() const;
+	long long GetFileLength() const noexcept;
+	bool Exists() const noexcept;
+	bool IsDirectory() const noexcept;
+	bool Matches(const GUI::gui_char *pattern) const;
+	static bool CaseSensitive() noexcept;
+};
+
+std::string CommandExecute(const GUI::gui_char *command, const GUI::gui_char *directoryForRun);
+
+#endif
diff --git a/scite-app/scite/src/FileWorker.cxx b/scite-app/scite/src/FileWorker.cxx
new file mode 100644
index 0000000..c2fec5e
--- /dev/null
+++ b/scite-app/scite/src/FileWorker.cxx
@@ -0,0 +1,156 @@
+// SciTE - Scintilla based Text Editor
+/** @file FileWorker.cxx
+ ** Implementation of classes to perform background file tasks as threads.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+
+#include <string>
+#include <vector>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include "ILoader.h"
+
+#include "GUI.h"
+
+#include "FilePath.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "Utf8_16.h"
+
+constexpr double timeBetweenProgress = 0.4;
+
+FileWorker::FileWorker(WorkerListener *pListener_, const FilePath &path_, size_t size_, FILE *fp_) :
+	pListener(pListener_), path(path_), size(size_), err(0), fp(fp_), sleepTime(0), nextProgress(timeBetweenProgress) {
+}
+
+FileWorker::~FileWorker() {
+}
+
+double FileWorker::Duration() noexcept {
+	return et.Duration();
+}
+
+FileLoader::FileLoader(WorkerListener *pListener_, Scintilla::ILoader *pLoader_, const FilePath &path_, size_t size_, FILE *fp_) :
+	FileWorker(pListener_, path_, size_, fp_), pLoader(pLoader_), readSoFar(0), unicodeMode(uni8Bit) {
+	SetSizeJob(size);
+}
+
+FileLoader::~FileLoader() {
+}
+
+void FileLoader::Execute() {
+	if (fp) {
+		Utf8_16_Read convert;
+		std::vector<char> data(blockSize);
+		size_t lenFile = fread(&data[0], 1, blockSize, fp);
+		const UniMode umCodingCookie = CodingCookieValue(std::string_view(data.data(), lenFile));
+		while ((lenFile > 0) && (err == 0) && (!Cancelling())) {
+			GUI::SleepMilliseconds(sleepTime);
+			lenFile = convert.convert(&data[0], lenFile);
+			const char *dataBlock = convert.getNewBuf();
+			err = pLoader->AddData(dataBlock, lenFile);
+			IncrementProgress(lenFile);
+			if (et.Duration() > nextProgress) {
+				nextProgress = et.Duration() + timeBetweenProgress;
+				pListener->PostOnMainThread(WORK_FILEPROGRESS, this);
+			}
+			lenFile = fread(&data[0], 1, blockSize, fp);
+			if ((lenFile == 0) && (err == 0)) {
+				// Handle case where convert is holding a lead surrogate but no more data
+				const size_t lenFileTrail = convert.convert(nullptr, lenFile);
+				if (lenFileTrail) {
+					const char *dataTrail = convert.getNewBuf();
+					err = pLoader->AddData(dataTrail, lenFileTrail);
+				}
+			}
+		}
+		fclose(fp);
+		fp = nullptr;
+		unicodeMode = static_cast<UniMode>(
+				      static_cast<int>(convert.getEncoding()));
+		// Check the first two lines for coding cookies
+		if (unicodeMode == uni8Bit) {
+			unicodeMode = umCodingCookie;
+		}
+	}
+	SetCompleted();
+	pListener->PostOnMainThread(WORK_FILEREAD, this);
+}
+
+void FileLoader::Cancel() {
+	FileWorker::Cancel();
+	pLoader->Release();
+	pLoader = nullptr;
+}
+
+FileStorer::FileStorer(WorkerListener *pListener_, const char *documentBytes_, const FilePath &path_,
+		       size_t size_, FILE *fp_, UniMode unicodeMode_, bool visibleProgress_) :
+	FileWorker(pListener_, path_, size_, fp_), documentBytes(documentBytes_), writtenSoFar(0),
+	unicodeMode(unicodeMode_), visibleProgress(visibleProgress_) {
+	SetSizeJob(size);
+}
+
+FileStorer::~FileStorer() {
+}
+
+static constexpr bool IsUTF8TrailByte(int ch) noexcept {
+	return (ch >= 0x80) && (ch < (0x80 + 0x40));
+}
+
+void FileStorer::Execute() {
+	if (fp) {
+		Utf8_16_Write convert;
+		if (unicodeMode != uniCookie) {	// Save file with cookie without BOM.
+			convert.setEncoding(static_cast<Utf8_16::encodingType>(
+						    static_cast<int>(unicodeMode)));
+		}
+		convert.setfile(fp);
+		std::vector<char> data(blockSize + 1);
+		const size_t lengthDoc = size;
+		size_t grabSize;
+		for (size_t i = 0; i < lengthDoc && (!Cancelling()); i += grabSize) {
+			GUI::SleepMilliseconds(sleepTime);
+			grabSize = lengthDoc - i;
+			if (grabSize > blockSize)
+				grabSize = blockSize;
+			if ((unicodeMode != uni8Bit) && (i + grabSize < lengthDoc)) {
+				// Round down so only whole characters retrieved.
+				size_t startLast = grabSize;
+				while ((startLast > 0) && ((grabSize - startLast) < 6) && IsUTF8TrailByte(static_cast<unsigned char>(documentBytes[i + startLast])))
+					startLast--;
+				if ((grabSize - startLast) < 5)
+					grabSize = startLast;
+			}
+			memcpy(&data[0], documentBytes+i, grabSize);
+			const size_t written = convert.fwrite(&data[0], grabSize);
+			IncrementProgress(grabSize);
+			if (et.Duration() > nextProgress) {
+				nextProgress = et.Duration() + timeBetweenProgress;
+				pListener->PostOnMainThread(WORK_FILEPROGRESS, this);
+			}
+			if (written == 0) {
+				err = 1;
+				break;
+			}
+		}
+		if (convert.fclose() != 0) {
+			err = 1;
+		}
+	}
+	SetCompleted();
+	pListener->PostOnMainThread(WORK_FILEWRITTEN, this);
+}
+
+void FileStorer::Cancel() {
+	FileWorker::Cancel();
+}
diff --git a/scite-app/scite/src/FileWorker.h b/scite-app/scite/src/FileWorker.h
new file mode 100644
index 0000000..4dde596
--- /dev/null
+++ b/scite-app/scite/src/FileWorker.h
@@ -0,0 +1,72 @@
+// SciTE - Scintilla based Text Editor
+/** @file FileWorker.h
+ ** Definition of classes to perform background file tasks as threads.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef FILEWORKER_H
+#define FILEWORKER_H
+
+/// Base size of file I/O operations.
+constexpr size_t blockSize = 128 * 1024;
+
+struct FileWorker : public Worker {
+	WorkerListener *pListener;
+	FilePath path;
+	size_t size;
+	int err;
+	FILE *fp;
+	GUI::ElapsedTime et;
+	int sleepTime;
+	double nextProgress;
+
+	FileWorker(WorkerListener *pListener_, const FilePath &path_, size_t size_, FILE *fp_);
+	~FileWorker() override;
+	virtual double Duration() noexcept;
+	void Cancel() override {
+		Worker::Cancel();
+	}
+	virtual bool IsLoading() const noexcept = 0;
+};
+
+class FileLoader : public FileWorker {
+public:
+	Scintilla::ILoader *pLoader;
+	size_t readSoFar;
+	UniMode unicodeMode;
+
+	FileLoader(WorkerListener *pListener_, Scintilla::ILoader *pLoader_, const FilePath &path_, size_t size_, FILE *fp_);
+	~FileLoader() override;
+	void Execute() override;
+	void Cancel() override;
+	bool IsLoading() const noexcept override {
+		return true;
+	}
+};
+
+class FileStorer : public FileWorker {
+public:
+	const char *documentBytes;
+	size_t writtenSoFar;
+	UniMode unicodeMode;
+	bool visibleProgress;
+
+	FileStorer(WorkerListener *pListener_, const char *documentBytes_, const FilePath &path_,
+		   size_t size_, FILE *fp_, UniMode unicodeMode_, bool visibleProgress_);
+	~FileStorer() override;
+	void Execute() override;
+	void Cancel() override;
+	bool IsLoading() const noexcept override {
+		return false;
+	}
+};
+
+enum {
+	WORK_FILEREAD = 1,
+	WORK_FILEWRITTEN = 2,
+	WORK_FILEPROGRESS = 3,
+	WORK_PLATFORM = 100
+};
+
+#endif
diff --git a/scite-app/scite/src/GUI.h b/scite-app/scite/src/GUI.h
new file mode 100644
index 0000000..8cc04e5
--- /dev/null
+++ b/scite-app/scite/src/GUI.h
@@ -0,0 +1,163 @@
+// SciTE - Scintilla based Text Editor
+/** @file GUI.h
+ ** Interface to platform GUI facilities.
+ ** Split off from Scintilla's Platform.h to avoid SciTE depending on implementation of Scintilla.
+ ** Implementation in win32/GUIWin.cxx for Windows and gtk/GUIGTK.cxx for GTK.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef GUI_H
+#define GUI_H
+
+namespace GUI {
+
+class Point {
+public:
+	int x;
+	int y;
+
+	explicit constexpr Point(int x_=0, int y_=0) noexcept : x(x_), y(y_) {
+	}
+};
+
+class Rectangle {
+public:
+	int left;
+	int top;
+	int right;
+	int bottom;
+
+	constexpr Rectangle(int left_=0, int top_=0, int right_=0, int bottom_ = 0) noexcept :
+		left(left_), top(top_), right(right_), bottom(bottom_) {
+	}
+	bool Contains(Point pt) const noexcept {
+		return (pt.x >= left) && (pt.x <= right) &&
+		       (pt.y >= top) && (pt.y <= bottom);
+	}
+	int Width() const noexcept { return right - left; }
+	int Height() const noexcept { return bottom - top; }
+	bool operator==(const Rectangle &other) const noexcept {
+		return (left == other.left) &&
+		       (top == other.top) &&
+		       (right == other.right) &&
+		       (bottom == other.bottom);
+	}
+};
+
+#if defined(GTK) || defined(__APPLE__)
+
+// On GTK and OS X use UTF-8 char strings
+
+typedef char gui_char;
+typedef std::string gui_string;
+typedef std::string_view gui_string_view;
+
+#define GUI_TEXT(q) q
+
+#else
+
+// On Win32 use UTF-16 wide char strings
+
+typedef wchar_t gui_char;
+typedef std::wstring gui_string;
+typedef std::wstring_view gui_string_view;
+
+#define GUI_TEXT(q) L##q
+
+#endif
+
+gui_string StringFromUTF8(const char *s);
+gui_string StringFromUTF8(const std::string &s);
+std::string UTF8FromString(const gui_string &s);
+gui_string StringFromInteger(long i);
+gui_string StringFromLongLong(long long i);
+gui_string HexStringFromInteger(long i);
+
+std::string LowerCaseUTF8(std::string_view sv);
+
+typedef void *WindowID;
+class Window {
+protected:
+	WindowID wid {};
+public:
+	Window() noexcept {
+	}
+	Window(Window const &) = default;
+	Window(Window &&) = default;
+	Window &operator=(Window const &) = default;
+	Window &operator=(Window &&) = default;
+	Window &operator=(WindowID wid_) noexcept {
+		wid = wid_;
+		return *this;
+	}
+	virtual ~Window() = default;
+
+	WindowID GetID() const noexcept {
+		return wid;
+	}
+	void SetID(WindowID wid_) noexcept {
+		wid = wid_;
+	}
+	bool Created() const noexcept {
+		return !!wid;
+	}
+	void Destroy();
+	bool HasFocus();
+	Rectangle GetPosition();
+	void SetPosition(Rectangle rc);
+	Rectangle GetClientPosition();
+	void Show(bool show=true);
+	void InvalidateAll();
+	void SetTitle(const gui_char *s);
+	void SetRedraw(bool redraw);
+};
+
+typedef void *MenuID;
+class Menu {
+	MenuID mid {};
+public:
+	Menu() noexcept {
+	}
+	MenuID GetID() const noexcept {
+		return mid;
+	}
+	void CreatePopUp();
+	void Destroy() noexcept;
+	void Show(Point pt, Window &w);
+};
+
+// Simplified access to high precision timing.
+// Copied from Scintilla.
+class ElapsedTime {
+	std::chrono::high_resolution_clock::time_point tp;
+public:
+	/// Capture the moment
+	ElapsedTime() noexcept : tp(std::chrono::high_resolution_clock::now()) {
+	}
+	/// Return duration as floating point seconds
+	double Duration(bool reset=false) noexcept {
+		const std::chrono::high_resolution_clock::time_point tpNow =
+			std::chrono::high_resolution_clock::now();
+		const std::chrono::duration<double> stylingDuration =
+			std::chrono::duration_cast<std::chrono::duration<double>>(tpNow - tp);
+		if (reset) {
+			tp = tpNow;
+		}
+		return stylingDuration.count();
+	}
+};
+
+class ScintillaPrimitive : public Window {
+public:
+	// Send is the basic method and can be used between threads on Win32
+	intptr_t Send(unsigned int msg, uintptr_t wParam=0, intptr_t lParam=0);
+};
+
+bool IsDBCSLeadByte(int codePage, char ch);
+
+void SleepMilliseconds(int sleepTime);
+
+}
+
+#endif
diff --git a/scite-app/scite/src/IFaceTable.cxx b/scite-app/scite/src/IFaceTable.cxx
new file mode 100644
index 0000000..d57762c
--- /dev/null
+++ b/scite-app/scite/src/IFaceTable.cxx
@@ -0,0 +1,3722 @@
+// SciTE - Scintilla based Text Editor
+/** @file IFaceTable.cxx
+ ** SciTE iface function and constant descriptors.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstring>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <chrono>
+
+#include "GUI.h"
+
+#include "StringHelpers.h"
+
+#include "IFaceTable.h"
+
+int IFaceTable::FindConstant(const char *name) noexcept {
+	int lo = 0;
+	int hi = IFaceTable::constantCount - 1;
+	do {
+		const int idx = (lo+hi)/2;
+		const int cmp = strcmp(name, constants[idx].name);
+
+		if (cmp > 0) {
+			lo = idx + 1;
+		} else if (cmp < 0) {
+			hi = idx - 1;
+		} else {
+			return idx;
+		}
+	} while (lo <= hi);
+
+	return -1;
+}
+
+int IFaceTable::FindFunction(const char *name) noexcept {
+	int lo = 0;
+	int hi = IFaceTable::functionCount - 1;
+	do {
+		const int idx = (lo+hi)/2;
+		const int cmp = strcmp(name, functions[idx].name);
+		if (cmp > 0) {
+			lo = idx + 1;
+		} else if (cmp < 0) {
+			hi = idx - 1;
+		} else {
+			return idx;
+		}
+	} while (lo <= hi);
+
+	return -1;
+}
+
+int IFaceTable::FindFunctionByConstantName(const char *name) noexcept {
+	if (strncmp(name, "SCI_", 4)==0) {
+		// This looks like a constant for an iface function.  This requires
+		// a sequential search.  Take special care since the function names
+		// are mixed case, whereas the constants are all-caps.
+
+		for (int idx = 0; idx < functionCount; ++idx) {
+			const char *nm = name+4;
+			const char *fn = IFaceTable::functions[idx].name;
+			while (*nm && *fn && (*nm == MakeUpperCase(*fn))) {
+				++nm;
+				++fn;
+			}
+			if (!*nm && !*fn) {
+				return idx;
+			}
+		}
+	}
+	return -1;
+}
+
+int IFaceTable::FindProperty(const char *name) noexcept {
+	int lo = 0;
+	int hi = IFaceTable::propertyCount - 1;
+	do {
+		const int idx = (lo+hi)/2;
+		const int cmp = strcmp(name, properties[idx].name);
+
+		if (cmp > 0) {
+			lo = idx + 1;
+		} else if (cmp < 0) {
+			hi = idx - 1;
+		} else {
+			return idx;
+		}
+	} while (lo <= hi);
+
+	return -1;
+}
+
+std::string IFaceTable::GetConstantName(int value, const char *prefix) {
+	// Look in both the constants table and the functions table.  Start with functions.
+	for (int funcIdx = 0; funcIdx < functionCount; ++funcIdx) {
+		if (functions[funcIdx].value == value) {
+			std::string nameOut = "SCI_";
+			nameOut += functions[funcIdx].name;
+			// Transform name to upper case.
+			for (char &ch : nameOut) {
+				ch = MakeUpperCase(ch);
+			}
+			return nameOut;
+		}
+	}
+
+	for (int constIdx = 0; constIdx < constantCount; ++constIdx) {
+		if (constants[constIdx].value == value && (!prefix || strncmp(prefix, constants[constIdx].name, strlen(prefix)) == 0)) {
+			std::string nameOut = constants[constIdx].name;
+			return nameOut;
+		}
+	}
+
+	return std::string();
+}
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wnarrowing"
+#endif
+
+//++Autogenerated -- start of section automatically generated from Scintilla.iface
+
+static IFaceConstant ifaceConstants[] = {
+	{"ANNOTATION_BOXED",2},
+	{"ANNOTATION_HIDDEN",0},
+	{"ANNOTATION_INDENTED",3},
+	{"ANNOTATION_STANDARD",1},
+	{"CARETSTYLE_BLOCK",2},
+	{"CARETSTYLE_BLOCK_AFTER",0x100},
+	{"CARETSTYLE_INS_MASK",0xF},
+	{"CARETSTYLE_INVISIBLE",0},
+	{"CARETSTYLE_LINE",1},
+	{"CARETSTYLE_OVERSTRIKE_BAR",0},
+	{"CARETSTYLE_OVERSTRIKE_BLOCK",0x10},
+	{"CARET_EVEN",0x08},
+	{"CARET_JUMPS",0x10},
+	{"CARET_SLOP",0x01},
+	{"CARET_STRICT",0x04},
+	{"EDGE_BACKGROUND",2},
+	{"EDGE_LINE",1},
+	{"EDGE_MULTILINE",3},
+	{"EDGE_NONE",0},
+	{"EOLANNOTATION_ANGLES",0x122},
+	{"EOLANNOTATION_ANGLE_CIRCLE",0x102},
+	{"EOLANNOTATION_ANGLE_FLAT",0x112},
+	{"EOLANNOTATION_BOXED",0x2},
+	{"EOLANNOTATION_CIRCLE_ANGLE",0x120},
+	{"EOLANNOTATION_CIRCLE_FLAT",0x110},
+	{"EOLANNOTATION_FLATS",0x111},
+	{"EOLANNOTATION_FLAT_ANGLE",0x121},
+	{"EOLANNOTATION_FLAT_CIRCLE",0x101},
+	{"EOLANNOTATION_HIDDEN",0x0},
+	{"EOLANNOTATION_STADIUM",0x100},
+	{"EOLANNOTATION_STANDARD",0x1},
+	{"IDM_ABBREV",242},
+	{"IDM_ABOUT",902},
+	{"IDM_ACTIVATE",320},
+	{"IDM_ALLOWACCESS",119},
+	{"IDM_BLOCK_COMMENT",243},
+	{"IDM_BOOKMARK_CLEARALL",224},
+	{"IDM_BOOKMARK_NEXT",221},
+	{"IDM_BOOKMARK_NEXT_SELECT",225},
+	{"IDM_BOOKMARK_PREV",223},
+	{"IDM_BOOKMARK_PREV_SELECT",226},
+	{"IDM_BOOKMARK_SELECT_ALL",227},
+	{"IDM_BOOKMARK_TOGGLE",222},
+	{"IDM_BOX_COMMENT",246},
+	{"IDM_BUFFER",1200},
+	{"IDM_BUFFERSEP",505},
+	{"IDM_BUILD",302},
+	{"IDM_CLEAN",308},
+	{"IDM_CLEAR",206},
+	{"IDM_CLEAROUTPUT",420},
+	{"IDM_CLOSE",105},
+	{"IDM_CLOSEALL",503},
+	{"IDM_COMPILE",301},
+	{"IDM_COMPLETE",233},
+	{"IDM_COMPLETEWORD",234},
+	{"IDM_COPY",204},
+	{"IDM_COPYASRTF",245},
+	{"IDM_COPYPATH",118},
+	{"IDM_CUT",203},
+	{"IDM_DIRECTIONDOWN",806},
+	{"IDM_DIRECTIONUP",805},
+	{"IDM_DUPLICATE",250},
+	{"IDM_ENCODING_DEFAULT",150},
+	{"IDM_ENCODING_UCOOKIE",154},
+	{"IDM_ENCODING_UCS2BE",151},
+	{"IDM_ENCODING_UCS2LE",152},
+	{"IDM_ENCODING_UTF8",153},
+	{"IDM_ENTERSELECTION",256},
+	{"IDM_EOL_CONVERT",433},
+	{"IDM_EOL_CR",431},
+	{"IDM_EOL_CRLF",430},
+	{"IDM_EOL_LF",432},
+	{"IDM_EXPAND",235},
+	{"IDM_EXPAND_ENSURECHILDRENVISIBLE",238},
+	{"IDM_FILER",114},
+	{"IDM_FIND",210},
+	{"IDM_FINDINFILES",215},
+	{"IDM_FINDNEXT",211},
+	{"IDM_FINDNEXTBACK",212},
+	{"IDM_FINDNEXTBACKSEL",214},
+	{"IDM_FINDNEXTSEL",213},
+	{"IDM_FINISHEDEXECUTE",305},
+	{"IDM_FOLDMARGIN",406},
+	{"IDM_FULLSCREEN",961},
+	{"IDM_GO",303},
+	{"IDM_GOTO",220},
+	{"IDM_HELP",901},
+	{"IDM_HELP_SCITE",903},
+	{"IDM_IMPORT",1300},
+	{"IDM_INCSEARCH",252},
+	{"IDM_INS_ABBREV",247},
+	{"IDM_JOIN",248},
+	{"IDM_LANGUAGE",1400},
+	{"IDM_LINENUMBERMARGIN",407},
+	{"IDM_LINEREVERSE",218},
+	{"IDM_LOADSESSION",132},
+	{"IDM_LWRCASE",241},
+	{"IDM_MACROLIST",314},
+	{"IDM_MACROPLAY",313},
+	{"IDM_MACRORECORD",311},
+	{"IDM_MACROSTOPRECORD",312},
+	{"IDM_MACRO_SEP",310},
+	{"IDM_MATCHBRACE",230},
+	{"IDM_MATCHCASE",801},
+	{"IDM_MONOFONT",450},
+	{"IDM_MOVETABLEFT",509},
+	{"IDM_MOVETABRIGHT",508},
+	{"IDM_MRUFILE",1000},
+	{"IDM_MRU_SEP",120},
+	{"IDM_MRU_SUB",121},
+	{"IDM_NEW",101},
+	{"IDM_NEXTFILE",502},
+	{"IDM_NEXTFILESTACK",507},
+	{"IDM_NEXTMATCHPPC",262},
+	{"IDM_NEXTMSG",306},
+	{"IDM_ONTOP",960},
+	{"IDM_OPEN",102},
+	{"IDM_OPENABBREVPROPERTIES",463},
+	{"IDM_OPENDIRECTORYPROPERTIES",465},
+	{"IDM_OPENFILESHERE",413},
+	{"IDM_OPENGLOBALPROPERTIES",462},
+	{"IDM_OPENLOCALPROPERTIES",460},
+	{"IDM_OPENLUAEXTERNALFILE",464},
+	{"IDM_OPENSELECTED",103},
+	{"IDM_OPENUSERPROPERTIES",461},
+	{"IDM_PASTE",205},
+	{"IDM_PASTEANDDOWN",208},
+	{"IDM_PREVFILE",501},
+	{"IDM_PREVFILESTACK",506},
+	{"IDM_PREVMATCHPPC",260},
+	{"IDM_PREVMSG",307},
+	{"IDM_PRINT",131},
+	{"IDM_PRINTSETUP",130},
+	{"IDM_QUIT",140},
+	{"IDM_READONLY",416},
+	{"IDM_REDO",202},
+	{"IDM_REGEXP",802},
+	{"IDM_REPLACE",216},
+	{"IDM_REVERT",104},
+	{"IDM_RUNWIN",351},
+	{"IDM_SAVE",106},
+	{"IDM_SAVEACOPY",116},
+	{"IDM_SAVEALL",504},
+	{"IDM_SAVEAS",110},
+	{"IDM_SAVEASHTML",111},
+	{"IDM_SAVEASPDF",113},
+	{"IDM_SAVEASRTF",112},
+	{"IDM_SAVEASTEX",115},
+	{"IDM_SAVEASXML",117},
+	{"IDM_SAVESESSION",133},
+	{"IDM_SELECTALL",207},
+	{"IDM_SELECTIONADDEACH",258},
+	{"IDM_SELECTIONADDNEXT",257},
+	{"IDM_SELECTION_FOR_FIND",217},
+	{"IDM_SELECTTOBRACE",231},
+	{"IDM_SELECTTONEXTMATCHPPC",263},
+	{"IDM_SELECTTOPREVMATCHPPC",261},
+	{"IDM_SELMARGIN",405},
+	{"IDM_SHOWCALLTIP",232},
+	{"IDM_SPLIT",249},
+	{"IDM_SPLITVERTICAL",401},
+	{"IDM_SRCWIN",350},
+	{"IDM_STATUSWIN",353},
+	{"IDM_STOPEXECUTE",304},
+	{"IDM_STREAM_COMMENT",244},
+	{"IDM_SWITCHPANE",421},
+	{"IDM_TABSIZE",440},
+	{"IDM_TABWIN",354},
+	{"IDM_TOGGLEOUTPUT",409},
+	{"IDM_TOGGLEPARAMETERS",412},
+	{"IDM_TOGGLE_FOLDALL",236},
+	{"IDM_TOGGLE_FOLDRECURSIVE",237},
+	{"IDM_TOOLS",1100},
+	{"IDM_TOOLWIN",352},
+	{"IDM_UNDO",201},
+	{"IDM_UNSLASH",804},
+	{"IDM_UPRCASE",240},
+	{"IDM_VIEWEOL",403},
+	{"IDM_VIEWGUIDES",404},
+	{"IDM_VIEWSPACE",402},
+	{"IDM_VIEWSTATUSBAR",411},
+	{"IDM_VIEWTABBAR",410},
+	{"IDM_VIEWTOOLBAR",408},
+	{"IDM_WHOLEWORD",800},
+	{"IDM_WRAP",414},
+	{"IDM_WRAPAROUND",803},
+	{"IDM_WRAPOUTPUT",415},
+	{"INDICATOR_CONTAINER",8},
+	{"INDICATOR_IME",32},
+	{"INDICATOR_IME_MAX",35},
+	{"INDICATOR_MAX",35},
+	{"INDIC_BOX",6},
+	{"INDIC_COMPOSITIONTHICK",14},
+	{"INDIC_COMPOSITIONTHIN",15},
+	{"INDIC_CONTAINER",8},
+	{"INDIC_DASH",9},
+	{"INDIC_DIAGONAL",3},
+	{"INDIC_DOTBOX",12},
+	{"INDIC_DOTS",10},
+	{"INDIC_FULLBOX",16},
+	{"INDIC_GRADIENT",20},
+	{"INDIC_GRADIENTCENTRE",21},
+	{"INDIC_HIDDEN",5},
+	{"INDIC_IME",32},
+	{"INDIC_IME_MAX",35},
+	{"INDIC_MAX",35},
+	{"INDIC_PLAIN",0},
+	{"INDIC_POINT",18},
+	{"INDIC_POINTCHARACTER",19},
+	{"INDIC_ROUNDBOX",7},
+	{"INDIC_SQUIGGLE",1},
+	{"INDIC_SQUIGGLELOW",11},
+	{"INDIC_SQUIGGLEPIXMAP",13},
+	{"INDIC_STRAIGHTBOX",8},
+	{"INDIC_STRIKE",4},
+	{"INDIC_TEXTFORE",17},
+	{"INDIC_TT",2},
+	{"INVALID_POSITION",-1},
+	{"KEYWORDSET_MAX",8},
+	{"MARKER_MAX",31},
+	{"SCEN_CHANGE",768},
+	{"SCEN_KILLFOCUS",256},
+	{"SCEN_SETFOCUS",512},
+	{"SCE_A68K_COMMENT",1},
+	{"SCE_A68K_COMMENT_DOXYGEN",18},
+	{"SCE_A68K_COMMENT_SPECIAL",17},
+	{"SCE_A68K_COMMENT_WORD",16},
+	{"SCE_A68K_CPUINSTRUCTION",7},
+	{"SCE_A68K_DEFAULT",0},
+	{"SCE_A68K_DIRECTIVE",10},
+	{"SCE_A68K_EXTINSTRUCTION",8},
+	{"SCE_A68K_IDENTIFIER",14},
+	{"SCE_A68K_LABEL",12},
+	{"SCE_A68K_MACRO_ARG",11},
+	{"SCE_A68K_MACRO_DECLARATION",15},
+	{"SCE_A68K_NUMBER_BIN",3},
+	{"SCE_A68K_NUMBER_DEC",2},
+	{"SCE_A68K_NUMBER_HEX",4},
+	{"SCE_A68K_OPERATOR",6},
+	{"SCE_A68K_REGISTER",9},
+	{"SCE_A68K_STRING1",5},
+	{"SCE_A68K_STRING2",13},
+	{"SCE_ABAQUS_ARGUMENT",11},
+	{"SCE_ABAQUS_COMMAND",8},
+	{"SCE_ABAQUS_COMMENT",1},
+	{"SCE_ABAQUS_COMMENTBLOCK",2},
+	{"SCE_ABAQUS_DEFAULT",0},
+	{"SCE_ABAQUS_FUNCTION",12},
+	{"SCE_ABAQUS_NUMBER",3},
+	{"SCE_ABAQUS_OPERATOR",5},
+	{"SCE_ABAQUS_PROCESSOR",7},
+	{"SCE_ABAQUS_SLASHCOMMAND",9},
+	{"SCE_ABAQUS_STARCOMMAND",10},
+	{"SCE_ABAQUS_STRING",4},
+	{"SCE_ABAQUS_WORD",6},
+	{"SCE_ABL_BLOCK",8},
+	{"SCE_ABL_CHARACTER",4},
+	{"SCE_ABL_COMMENT",10},
+	{"SCE_ABL_DEFAULT",0},
+	{"SCE_ABL_END",9},
+	{"SCE_ABL_IDENTIFIER",7},
+	{"SCE_ABL_LINECOMMENT",12},
+	{"SCE_ABL_NUMBER",1},
+	{"SCE_ABL_OPERATOR",6},
+	{"SCE_ABL_PREPROCESSOR",5},
+	{"SCE_ABL_STRING",3},
+	{"SCE_ABL_TASKMARKER",11},
+	{"SCE_ABL_WORD",2},
+	{"SCE_ADA_CHARACTER",5},
+	{"SCE_ADA_CHARACTEREOL",6},
+	{"SCE_ADA_COMMENTLINE",10},
+	{"SCE_ADA_DEFAULT",0},
+	{"SCE_ADA_DELIMITER",4},
+	{"SCE_ADA_IDENTIFIER",2},
+	{"SCE_ADA_ILLEGAL",11},
+	{"SCE_ADA_LABEL",9},
+	{"SCE_ADA_NUMBER",3},
+	{"SCE_ADA_STRING",7},
+	{"SCE_ADA_STRINGEOL",8},
+	{"SCE_ADA_WORD",1},
+	{"SCE_APDL_ARGUMENT",11},
+	{"SCE_APDL_COMMAND",8},
+	{"SCE_APDL_COMMENT",1},
+	{"SCE_APDL_COMMENTBLOCK",2},
+	{"SCE_APDL_DEFAULT",0},
+	{"SCE_APDL_FUNCTION",12},
+	{"SCE_APDL_NUMBER",3},
+	{"SCE_APDL_OPERATOR",5},
+	{"SCE_APDL_PROCESSOR",7},
+	{"SCE_APDL_SLASHCOMMAND",9},
+	{"SCE_APDL_STARCOMMAND",10},
+	{"SCE_APDL_STRING",4},
+	{"SCE_APDL_WORD",6},
+	{"SCE_ASM_CHARACTER",12},
+	{"SCE_ASM_COMMENT",1},
+	{"SCE_ASM_COMMENTBLOCK",11},
+	{"SCE_ASM_COMMENTDIRECTIVE",15},
+	{"SCE_ASM_CPUINSTRUCTION",6},
+	{"SCE_ASM_DEFAULT",0},
+	{"SCE_ASM_DIRECTIVE",9},
+	{"SCE_ASM_DIRECTIVEOPERAND",10},
+	{"SCE_ASM_EXTINSTRUCTION",14},
+	{"SCE_ASM_IDENTIFIER",5},
+	{"SCE_ASM_MATHINSTRUCTION",7},
+	{"SCE_ASM_NUMBER",2},
+	{"SCE_ASM_OPERATOR",4},
+	{"SCE_ASM_REGISTER",8},
+	{"SCE_ASM_STRING",3},
+	{"SCE_ASM_STRINGEOL",13},
+	{"SCE_ASN1_ATTRIBUTE",7},
+	{"SCE_ASN1_COMMENT",1},
+	{"SCE_ASN1_DEFAULT",0},
+	{"SCE_ASN1_DESCRIPTOR",8},
+	{"SCE_ASN1_IDENTIFIER",2},
+	{"SCE_ASN1_KEYWORD",6},
+	{"SCE_ASN1_OID",4},
+	{"SCE_ASN1_OPERATOR",10},
+	{"SCE_ASN1_SCALAR",5},
+	{"SCE_ASN1_STRING",3},
+	{"SCE_ASN1_TYPE",9},
+	{"SCE_ASY_CHARACTER",6},
+	{"SCE_ASY_COMMENT",1},
+	{"SCE_ASY_COMMENTLINE",2},
+	{"SCE_ASY_COMMENTLINEDOC",10},
+	{"SCE_ASY_DEFAULT",0},
+	{"SCE_ASY_IDENTIFIER",8},
+	{"SCE_ASY_NUMBER",3},
+	{"SCE_ASY_OPERATOR",7},
+	{"SCE_ASY_STRING",5},
+	{"SCE_ASY_STRINGEOL",9},
+	{"SCE_ASY_WORD",4},
+	{"SCE_ASY_WORD2",11},
+	{"SCE_AU3_COMMENT",1},
+	{"SCE_AU3_COMMENTBLOCK",2},
+	{"SCE_AU3_COMOBJ",14},
+	{"SCE_AU3_DEFAULT",0},
+	{"SCE_AU3_EXPAND",13},
+	{"SCE_AU3_FUNCTION",4},
+	{"SCE_AU3_KEYWORD",5},
+	{"SCE_AU3_MACRO",6},
+	{"SCE_AU3_NUMBER",3},
+	{"SCE_AU3_OPERATOR",8},
+	{"SCE_AU3_PREPROCESSOR",11},
+	{"SCE_AU3_SENT",10},
+	{"SCE_AU3_SPECIAL",12},
+	{"SCE_AU3_STRING",7},
+	{"SCE_AU3_UDF",15},
+	{"SCE_AU3_VARIABLE",9},
+	{"SCE_AVE_COMMENT",1},
+	{"SCE_AVE_DEFAULT",0},
+	{"SCE_AVE_ENUM",7},
+	{"SCE_AVE_IDENTIFIER",9},
+	{"SCE_AVE_NUMBER",2},
+	{"SCE_AVE_OPERATOR",10},
+	{"SCE_AVE_STRING",6},
+	{"SCE_AVE_STRINGEOL",8},
+	{"SCE_AVE_WORD",3},
+	{"SCE_AVE_WORD1",11},
+	{"SCE_AVE_WORD2",12},
+	{"SCE_AVE_WORD3",13},
+	{"SCE_AVE_WORD4",14},
+	{"SCE_AVE_WORD5",15},
+	{"SCE_AVE_WORD6",16},
+	{"SCE_AVS_CLIPPROP",13},
+	{"SCE_AVS_COMMENTBLOCK",1},
+	{"SCE_AVS_COMMENTBLOCKN",2},
+	{"SCE_AVS_COMMENTLINE",3},
+	{"SCE_AVS_DEFAULT",0},
+	{"SCE_AVS_FILTER",10},
+	{"SCE_AVS_FUNCTION",12},
+	{"SCE_AVS_IDENTIFIER",6},
+	{"SCE_AVS_KEYWORD",9},
+	{"SCE_AVS_NUMBER",4},
+	{"SCE_AVS_OPERATOR",5},
+	{"SCE_AVS_PLUGIN",11},
+	{"SCE_AVS_STRING",7},
+	{"SCE_AVS_TRIPLESTRING",8},
+	{"SCE_AVS_USERDFN",14},
+	{"SCE_BAAN_COMMENT",1},
+	{"SCE_BAAN_COMMENTDOC",2},
+	{"SCE_BAAN_DEFAULT",0},
+	{"SCE_BAAN_DEFINEDEF",24},
+	{"SCE_BAAN_DOMDEF",21},
+	{"SCE_BAAN_FUNCDEF",22},
+	{"SCE_BAAN_FUNCTION",20},
+	{"SCE_BAAN_IDENTIFIER",8},
+	{"SCE_BAAN_NUMBER",3},
+	{"SCE_BAAN_OBJECTDEF",23},
+	{"SCE_BAAN_OPERATOR",7},
+	{"SCE_BAAN_PREPROCESSOR",6},
+	{"SCE_BAAN_STRING",5},
+	{"SCE_BAAN_STRINGEOL",9},
+	{"SCE_BAAN_TABLEDEF",18},
+	{"SCE_BAAN_TABLESQL",19},
+	{"SCE_BAAN_WORD",4},
+	{"SCE_BAAN_WORD2",10},
+	{"SCE_BAAN_WORD3",11},
+	{"SCE_BAAN_WORD4",12},
+	{"SCE_BAAN_WORD5",13},
+	{"SCE_BAAN_WORD6",14},
+	{"SCE_BAAN_WORD7",15},
+	{"SCE_BAAN_WORD8",16},
+	{"SCE_BAAN_WORD9",17},
+	{"SCE_BAT_COMMAND",5},
+	{"SCE_BAT_COMMENT",1},
+	{"SCE_BAT_DEFAULT",0},
+	{"SCE_BAT_HIDE",4},
+	{"SCE_BAT_IDENTIFIER",6},
+	{"SCE_BAT_LABEL",3},
+	{"SCE_BAT_OPERATOR",7},
+	{"SCE_BAT_WORD",2},
+	{"SCE_BIBTEX_COMMENT",6},
+	{"SCE_BIBTEX_DEFAULT",0},
+	{"SCE_BIBTEX_ENTRY",1},
+	{"SCE_BIBTEX_KEY",3},
+	{"SCE_BIBTEX_PARAMETER",4},
+	{"SCE_BIBTEX_UNKNOWN_ENTRY",2},
+	{"SCE_BIBTEX_VALUE",5},
+	{"SCE_B_ASM",14},
+	{"SCE_B_BINNUMBER",18},
+	{"SCE_B_COMMENT",1},
+	{"SCE_B_COMMENTBLOCK",19},
+	{"SCE_B_CONSTANT",13},
+	{"SCE_B_DATE",8},
+	{"SCE_B_DEFAULT",0},
+	{"SCE_B_DOCBLOCK",21},
+	{"SCE_B_DOCKEYWORD",22},
+	{"SCE_B_DOCLINE",20},
+	{"SCE_B_ERROR",16},
+	{"SCE_B_HEXNUMBER",17},
+	{"SCE_B_IDENTIFIER",7},
+	{"SCE_B_KEYWORD",3},
+	{"SCE_B_KEYWORD2",10},
+	{"SCE_B_KEYWORD3",11},
+	{"SCE_B_KEYWORD4",12},
+	{"SCE_B_LABEL",15},
+	{"SCE_B_NUMBER",2},
+	{"SCE_B_OPERATOR",6},
+	{"SCE_B_PREPROCESSOR",5},
+	{"SCE_B_STRING",4},
+	{"SCE_B_STRINGEOL",9},
+	{"SCE_CAML_CHAR",9},
+	{"SCE_CAML_COMMENT",12},
+	{"SCE_CAML_COMMENT1",13},
+	{"SCE_CAML_COMMENT2",14},
+	{"SCE_CAML_COMMENT3",15},
+	{"SCE_CAML_DEFAULT",0},
+	{"SCE_CAML_IDENTIFIER",1},
+	{"SCE_CAML_KEYWORD",3},
+	{"SCE_CAML_KEYWORD2",4},
+	{"SCE_CAML_KEYWORD3",5},
+	{"SCE_CAML_LINENUM",6},
+	{"SCE_CAML_NUMBER",8},
+	{"SCE_CAML_OPERATOR",7},
+	{"SCE_CAML_STRING",11},
+	{"SCE_CAML_TAGNAME",2},
+	{"SCE_CAML_WHITE",10},
+	{"SCE_CIL_COMMENT",1},
+	{"SCE_CIL_COMMENTLINE",2},
+	{"SCE_CIL_DEFAULT",0},
+	{"SCE_CIL_IDENTIFIER",9},
+	{"SCE_CIL_LABEL",7},
+	{"SCE_CIL_OPERATOR",8},
+	{"SCE_CIL_STRING",6},
+	{"SCE_CIL_STRINGEOL",10},
+	{"SCE_CIL_WORD",3},
+	{"SCE_CIL_WORD2",4},
+	{"SCE_CIL_WORD3",5},
+	{"SCE_CLW_ATTRIBUTE",13},
+	{"SCE_CLW_BUILTIN_PROCEDURES_FUNCTION",11},
+	{"SCE_CLW_COMMENT",2},
+	{"SCE_CLW_COMPILER_DIRECTIVE",9},
+	{"SCE_CLW_DEFAULT",0},
+	{"SCE_CLW_DEPRECATED",16},
+	{"SCE_CLW_ERROR",15},
+	{"SCE_CLW_INTEGER_CONSTANT",5},
+	{"SCE_CLW_KEYWORD",8},
+	{"SCE_CLW_LABEL",1},
+	{"SCE_CLW_PICTURE_STRING",7},
+	{"SCE_CLW_REAL_CONSTANT",6},
+	{"SCE_CLW_RUNTIME_EXPRESSIONS",10},
+	{"SCE_CLW_STANDARD_EQUATE",14},
+	{"SCE_CLW_STRING",3},
+	{"SCE_CLW_STRUCTURE_DATA_TYPE",12},
+	{"SCE_CLW_USER_IDENTIFIER",4},
+	{"SCE_CMAKE_COMMANDS",5},
+	{"SCE_CMAKE_COMMENT",1},
+	{"SCE_CMAKE_DEFAULT",0},
+	{"SCE_CMAKE_FOREACHDEF",10},
+	{"SCE_CMAKE_IFDEFINEDEF",11},
+	{"SCE_CMAKE_MACRODEF",12},
+	{"SCE_CMAKE_NUMBER",14},
+	{"SCE_CMAKE_PARAMETERS",6},
+	{"SCE_CMAKE_STRINGDQ",2},
+	{"SCE_CMAKE_STRINGLQ",3},
+	{"SCE_CMAKE_STRINGRQ",4},
+	{"SCE_CMAKE_STRINGVAR",13},
+	{"SCE_CMAKE_USERDEFINED",8},
+	{"SCE_CMAKE_VARIABLE",7},
+	{"SCE_CMAKE_WHILEDEF",9},
+	{"SCE_COFFEESCRIPT_CHARACTER",7},
+	{"SCE_COFFEESCRIPT_COMMENT",1},
+	{"SCE_COFFEESCRIPT_COMMENTBLOCK",22},
+	{"SCE_COFFEESCRIPT_COMMENTDOC",3},
+	{"SCE_COFFEESCRIPT_COMMENTDOCKEYWORD",17},
+	{"SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR",18},
+	{"SCE_COFFEESCRIPT_COMMENTLINE",2},
+	{"SCE_COFFEESCRIPT_COMMENTLINEDOC",15},
+	{"SCE_COFFEESCRIPT_DEFAULT",0},
+	{"SCE_COFFEESCRIPT_GLOBALCLASS",19},
+	{"SCE_COFFEESCRIPT_IDENTIFIER",11},
+	{"SCE_COFFEESCRIPT_INSTANCEPROPERTY",25},
+	{"SCE_COFFEESCRIPT_NUMBER",4},
+	{"SCE_COFFEESCRIPT_OPERATOR",10},
+	{"SCE_COFFEESCRIPT_PREPROCESSOR",9},
+	{"SCE_COFFEESCRIPT_REGEX",14},
+	{"SCE_COFFEESCRIPT_STRING",6},
+	{"SCE_COFFEESCRIPT_STRINGEOL",12},
+	{"SCE_COFFEESCRIPT_STRINGRAW",20},
+	{"SCE_COFFEESCRIPT_TRIPLEVERBATIM",21},
+	{"SCE_COFFEESCRIPT_UUID",8},
+	{"SCE_COFFEESCRIPT_VERBATIM",13},
+	{"SCE_COFFEESCRIPT_VERBOSE_REGEX",23},
+	{"SCE_COFFEESCRIPT_VERBOSE_REGEX_COMMENT",24},
+	{"SCE_COFFEESCRIPT_WORD",5},
+	{"SCE_COFFEESCRIPT_WORD2",16},
+	{"SCE_CONF_COMMENT",1},
+	{"SCE_CONF_DEFAULT",0},
+	{"SCE_CONF_DIRECTIVE",9},
+	{"SCE_CONF_EXTENSION",4},
+	{"SCE_CONF_IDENTIFIER",3},
+	{"SCE_CONF_IP",8},
+	{"SCE_CONF_NUMBER",2},
+	{"SCE_CONF_OPERATOR",7},
+	{"SCE_CONF_PARAMETER",5},
+	{"SCE_CONF_STRING",6},
+	{"SCE_CSOUND_ARATE_VAR",11},
+	{"SCE_CSOUND_COMMENT",1},
+	{"SCE_CSOUND_COMMENTBLOCK",9},
+	{"SCE_CSOUND_DEFAULT",0},
+	{"SCE_CSOUND_GLOBAL_VAR",14},
+	{"SCE_CSOUND_HEADERSTMT",7},
+	{"SCE_CSOUND_IDENTIFIER",5},
+	{"SCE_CSOUND_INSTR",4},
+	{"SCE_CSOUND_IRATE_VAR",13},
+	{"SCE_CSOUND_KRATE_VAR",12},
+	{"SCE_CSOUND_NUMBER",2},
+	{"SCE_CSOUND_OPCODE",6},
+	{"SCE_CSOUND_OPERATOR",3},
+	{"SCE_CSOUND_PARAM",10},
+	{"SCE_CSOUND_STRINGEOL",15},
+	{"SCE_CSOUND_USERKEYWORD",8},
+	{"SCE_CSS_ATTRIBUTE",16},
+	{"SCE_CSS_CLASS",2},
+	{"SCE_CSS_COMMENT",9},
+	{"SCE_CSS_DEFAULT",0},
+	{"SCE_CSS_DIRECTIVE",12},
+	{"SCE_CSS_DOUBLESTRING",13},
+	{"SCE_CSS_EXTENDED_IDENTIFIER",19},
+	{"SCE_CSS_EXTENDED_PSEUDOCLASS",20},
+	{"SCE_CSS_EXTENDED_PSEUDOELEMENT",21},
+	{"SCE_CSS_ID",10},
+	{"SCE_CSS_IDENTIFIER",6},
+	{"SCE_CSS_IDENTIFIER2",15},
+	{"SCE_CSS_IDENTIFIER3",17},
+	{"SCE_CSS_IMPORTANT",11},
+	{"SCE_CSS_MEDIA",22},
+	{"SCE_CSS_OPERATOR",5},
+	{"SCE_CSS_PSEUDOCLASS",3},
+	{"SCE_CSS_PSEUDOELEMENT",18},
+	{"SCE_CSS_SINGLESTRING",14},
+	{"SCE_CSS_TAG",1},
+	{"SCE_CSS_UNKNOWN_IDENTIFIER",7},
+	{"SCE_CSS_UNKNOWN_PSEUDOCLASS",4},
+	{"SCE_CSS_VALUE",8},
+	{"SCE_CSS_VARIABLE",23},
+	{"SCE_C_CHARACTER",7},
+	{"SCE_C_COMMENT",1},
+	{"SCE_C_COMMENTDOC",3},
+	{"SCE_C_COMMENTDOCKEYWORD",17},
+	{"SCE_C_COMMENTDOCKEYWORDERROR",18},
+	{"SCE_C_COMMENTLINE",2},
+	{"SCE_C_COMMENTLINEDOC",15},
+	{"SCE_C_DEFAULT",0},
+	{"SCE_C_ESCAPESEQUENCE",27},
+	{"SCE_C_GLOBALCLASS",19},
+	{"SCE_C_HASHQUOTEDSTRING",22},
+	{"SCE_C_IDENTIFIER",11},
+	{"SCE_C_NUMBER",4},
+	{"SCE_C_OPERATOR",10},
+	{"SCE_C_PREPROCESSOR",9},
+	{"SCE_C_PREPROCESSORCOMMENT",23},
+	{"SCE_C_PREPROCESSORCOMMENTDOC",24},
+	{"SCE_C_REGEX",14},
+	{"SCE_C_STRING",6},
+	{"SCE_C_STRINGEOL",12},
+	{"SCE_C_STRINGRAW",20},
+	{"SCE_C_TASKMARKER",26},
+	{"SCE_C_TRIPLEVERBATIM",21},
+	{"SCE_C_USERLITERAL",25},
+	{"SCE_C_UUID",8},
+	{"SCE_C_VERBATIM",13},
+	{"SCE_C_WORD",5},
+	{"SCE_C_WORD2",16},
+	{"SCE_DF_COMMENTLINE",4},
+	{"SCE_DF_DEFAULT",0},
+	{"SCE_DF_HEXNUMBER",8},
+	{"SCE_DF_ICODE",14},
+	{"SCE_DF_IDENTIFIER",1},
+	{"SCE_DF_IMAGE",3},
+	{"SCE_DF_METATAG",2},
+	{"SCE_DF_NUMBER",7},
+	{"SCE_DF_OPERATOR",13},
+	{"SCE_DF_PREPROCESSOR",5},
+	{"SCE_DF_PREPROCESSOR2",6},
+	{"SCE_DF_SCOPEWORD",12},
+	{"SCE_DF_STRING",10},
+	{"SCE_DF_STRINGEOL",11},
+	{"SCE_DF_WORD",9},
+	{"SCE_DIFF_ADDED",6},
+	{"SCE_DIFF_CHANGED",7},
+	{"SCE_DIFF_COMMAND",2},
+	{"SCE_DIFF_COMMENT",1},
+	{"SCE_DIFF_DEFAULT",0},
+	{"SCE_DIFF_DELETED",5},
+	{"SCE_DIFF_HEADER",3},
+	{"SCE_DIFF_PATCH_ADD",8},
+	{"SCE_DIFF_PATCH_DELETE",9},
+	{"SCE_DIFF_POSITION",4},
+	{"SCE_DIFF_REMOVED_PATCH_ADD",10},
+	{"SCE_DIFF_REMOVED_PATCH_DELETE",11},
+	{"SCE_DMAP_COMMENT",1},
+	{"SCE_DMAP_DEFAULT",0},
+	{"SCE_DMAP_IDENTIFIER",7},
+	{"SCE_DMAP_NUMBER",2},
+	{"SCE_DMAP_OPERATOR",6},
+	{"SCE_DMAP_STRING1",3},
+	{"SCE_DMAP_STRING2",4},
+	{"SCE_DMAP_STRINGEOL",5},
+	{"SCE_DMAP_WORD",8},
+	{"SCE_DMAP_WORD2",9},
+	{"SCE_DMAP_WORD3",10},
+	{"SCE_DMIS_COMMENT",1},
+	{"SCE_DMIS_DEFAULT",0},
+	{"SCE_DMIS_KEYWORD",4},
+	{"SCE_DMIS_LABEL",9},
+	{"SCE_DMIS_MAJORWORD",5},
+	{"SCE_DMIS_MINORWORD",6},
+	{"SCE_DMIS_NUMBER",3},
+	{"SCE_DMIS_STRING",2},
+	{"SCE_DMIS_UNSUPPORTED_MAJOR",7},
+	{"SCE_DMIS_UNSUPPORTED_MINOR",8},
+	{"SCE_D_CHARACTER",12},
+	{"SCE_D_COMMENT",1},
+	{"SCE_D_COMMENTDOC",3},
+	{"SCE_D_COMMENTDOCKEYWORD",16},
+	{"SCE_D_COMMENTDOCKEYWORDERROR",17},
+	{"SCE_D_COMMENTLINE",2},
+	{"SCE_D_COMMENTLINEDOC",15},
+	{"SCE_D_COMMENTNESTED",4},
+	{"SCE_D_DEFAULT",0},
+	{"SCE_D_IDENTIFIER",14},
+	{"SCE_D_NUMBER",5},
+	{"SCE_D_OPERATOR",13},
+	{"SCE_D_STRING",10},
+	{"SCE_D_STRINGB",18},
+	{"SCE_D_STRINGEOL",11},
+	{"SCE_D_STRINGR",19},
+	{"SCE_D_TYPEDEF",9},
+	{"SCE_D_WORD",6},
+	{"SCE_D_WORD2",7},
+	{"SCE_D_WORD3",8},
+	{"SCE_D_WORD5",20},
+	{"SCE_D_WORD6",21},
+	{"SCE_D_WORD7",22},
+	{"SCE_ECL_ADDED",24},
+	{"SCE_ECL_CHANGED",26},
+	{"SCE_ECL_CHARACTER",7},
+	{"SCE_ECL_COMMENT",1},
+	{"SCE_ECL_COMMENTDOC",23},
+	{"SCE_ECL_COMMENTDOCKEYWORD",17},
+	{"SCE_ECL_COMMENTDOCKEYWORDERROR",18},
+	{"SCE_ECL_COMMENTLINE",2},
+	{"SCE_ECL_COMMENTLINEDOC",15},
+	{"SCE_ECL_DEFAULT",0},
+	{"SCE_ECL_DELETED",25},
+	{"SCE_ECL_IDENTIFIER",11},
+	{"SCE_ECL_MOVED",27},
+	{"SCE_ECL_NUMBER",3},
+	{"SCE_ECL_OPERATOR",6},
+	{"SCE_ECL_PREPROCESSOR",9},
+	{"SCE_ECL_REGEX",14},
+	{"SCE_ECL_STRING",4},
+	{"SCE_ECL_STRINGEOL",12},
+	{"SCE_ECL_UNKNOWN",10},
+	{"SCE_ECL_UUID",8},
+	{"SCE_ECL_VERBATIM",13},
+	{"SCE_ECL_WORD0",5},
+	{"SCE_ECL_WORD1",16},
+	{"SCE_ECL_WORD2",19},
+	{"SCE_ECL_WORD3",20},
+	{"SCE_ECL_WORD4",21},
+	{"SCE_ECL_WORD5",22},
+	{"SCE_EDI_BADSEGMENT",8},
+	{"SCE_EDI_DEFAULT",0},
+	{"SCE_EDI_SEGMENTEND",2},
+	{"SCE_EDI_SEGMENTSTART",1},
+	{"SCE_EDI_SEP_COMPOSITE",4},
+	{"SCE_EDI_SEP_ELEMENT",3},
+	{"SCE_EDI_SEP_RELEASE",5},
+	{"SCE_EDI_UNA",6},
+	{"SCE_EDI_UNH",7},
+	{"SCE_EIFFEL_CHARACTER",5},
+	{"SCE_EIFFEL_COMMENTLINE",1},
+	{"SCE_EIFFEL_DEFAULT",0},
+	{"SCE_EIFFEL_IDENTIFIER",7},
+	{"SCE_EIFFEL_NUMBER",2},
+	{"SCE_EIFFEL_OPERATOR",6},
+	{"SCE_EIFFEL_STRING",4},
+	{"SCE_EIFFEL_STRINGEOL",8},
+	{"SCE_EIFFEL_WORD",3},
+	{"SCE_ERLANG_ATOM",7},
+	{"SCE_ERLANG_ATOM_QUOTED",18},
+	{"SCE_ERLANG_BIFS",22},
+	{"SCE_ERLANG_CHARACTER",9},
+	{"SCE_ERLANG_COMMENT",1},
+	{"SCE_ERLANG_COMMENT_DOC",16},
+	{"SCE_ERLANG_COMMENT_DOC_MACRO",17},
+	{"SCE_ERLANG_COMMENT_FUNCTION",14},
+	{"SCE_ERLANG_COMMENT_MODULE",15},
+	{"SCE_ERLANG_DEFAULT",0},
+	{"SCE_ERLANG_FUNCTION_NAME",8},
+	{"SCE_ERLANG_KEYWORD",4},
+	{"SCE_ERLANG_MACRO",10},
+	{"SCE_ERLANG_MACRO_QUOTED",19},
+	{"SCE_ERLANG_MODULES",23},
+	{"SCE_ERLANG_MODULES_ATT",24},
+	{"SCE_ERLANG_NODE_NAME",13},
+	{"SCE_ERLANG_NODE_NAME_QUOTED",21},
+	{"SCE_ERLANG_NUMBER",3},
+	{"SCE_ERLANG_OPERATOR",6},
+	{"SCE_ERLANG_PREPROC",12},
+	{"SCE_ERLANG_RECORD",11},
+	{"SCE_ERLANG_RECORD_QUOTED",20},
+	{"SCE_ERLANG_STRING",5},
+	{"SCE_ERLANG_UNKNOWN",31},
+	{"SCE_ERLANG_VARIABLE",2},
+	{"SCE_ERR_ABSF",18},
+	{"SCE_ERR_BORLAND",5},
+	{"SCE_ERR_CMD",4},
+	{"SCE_ERR_CTAG",9},
+	{"SCE_ERR_DEFAULT",0},
+	{"SCE_ERR_DIFF_ADDITION",11},
+	{"SCE_ERR_DIFF_CHANGED",10},
+	{"SCE_ERR_DIFF_DELETION",12},
+	{"SCE_ERR_DIFF_MESSAGE",13},
+	{"SCE_ERR_ELF",15},
+	{"SCE_ERR_ESCSEQ",23},
+	{"SCE_ERR_ESCSEQ_UNKNOWN",24},
+	{"SCE_ERR_ES_BLACK",40},
+	{"SCE_ERR_ES_BLUE",44},
+	{"SCE_ERR_ES_BRIGHT_BLUE",52},
+	{"SCE_ERR_ES_BRIGHT_CYAN",54},
+	{"SCE_ERR_ES_BRIGHT_GREEN",50},
+	{"SCE_ERR_ES_BRIGHT_MAGENTA",53},
+	{"SCE_ERR_ES_BRIGHT_RED",49},
+	{"SCE_ERR_ES_BROWN",43},
+	{"SCE_ERR_ES_CYAN",46},
+	{"SCE_ERR_ES_DARK_GRAY",48},
+	{"SCE_ERR_ES_GRAY",47},
+	{"SCE_ERR_ES_GREEN",42},
+	{"SCE_ERR_ES_MAGENTA",45},
+	{"SCE_ERR_ES_RED",41},
+	{"SCE_ERR_ES_WHITE",55},
+	{"SCE_ERR_ES_YELLOW",51},
+	{"SCE_ERR_GCC",2},
+	{"SCE_ERR_GCC_EXCERPT",25},
+	{"SCE_ERR_GCC_INCLUDED_FROM",22},
+	{"SCE_ERR_IFC",16},
+	{"SCE_ERR_IFORT",17},
+	{"SCE_ERR_JAVA_STACK",20},
+	{"SCE_ERR_LUA",8},
+	{"SCE_ERR_MS",3},
+	{"SCE_ERR_NET",7},
+	{"SCE_ERR_PERL",6},
+	{"SCE_ERR_PHP",14},
+	{"SCE_ERR_PYTHON",1},
+	{"SCE_ERR_TIDY",19},
+	{"SCE_ERR_VALUE",21},
+	{"SCE_ESCRIPT_BRACE",9},
+	{"SCE_ESCRIPT_COMMENT",1},
+	{"SCE_ESCRIPT_COMMENTDOC",3},
+	{"SCE_ESCRIPT_COMMENTLINE",2},
+	{"SCE_ESCRIPT_DEFAULT",0},
+	{"SCE_ESCRIPT_IDENTIFIER",8},
+	{"SCE_ESCRIPT_NUMBER",4},
+	{"SCE_ESCRIPT_OPERATOR",7},
+	{"SCE_ESCRIPT_STRING",6},
+	{"SCE_ESCRIPT_WORD",5},
+	{"SCE_ESCRIPT_WORD2",10},
+	{"SCE_ESCRIPT_WORD3",11},
+	{"SCE_FORTH_COMMENT",1},
+	{"SCE_FORTH_COMMENT_ML",2},
+	{"SCE_FORTH_CONTROL",4},
+	{"SCE_FORTH_DEFAULT",0},
+	{"SCE_FORTH_DEFWORD",6},
+	{"SCE_FORTH_IDENTIFIER",3},
+	{"SCE_FORTH_KEYWORD",5},
+	{"SCE_FORTH_LOCALE",11},
+	{"SCE_FORTH_NUMBER",9},
+	{"SCE_FORTH_PREWORD1",7},
+	{"SCE_FORTH_PREWORD2",8},
+	{"SCE_FORTH_STRING",10},
+	{"SCE_FSHARP_ATTRIBUTE",18},
+	{"SCE_FSHARP_CHARACTER",14},
+	{"SCE_FSHARP_COMMENT",8},
+	{"SCE_FSHARP_COMMENTLINE",9},
+	{"SCE_FSHARP_DEFAULT",0},
+	{"SCE_FSHARP_FORMAT_SPEC",19},
+	{"SCE_FSHARP_IDENTIFIER",6},
+	{"SCE_FSHARP_KEYWORD",1},
+	{"SCE_FSHARP_KEYWORD2",2},
+	{"SCE_FSHARP_KEYWORD3",3},
+	{"SCE_FSHARP_KEYWORD4",4},
+	{"SCE_FSHARP_KEYWORD5",5},
+	{"SCE_FSHARP_LINENUM",11},
+	{"SCE_FSHARP_NUMBER",13},
+	{"SCE_FSHARP_OPERATOR",12},
+	{"SCE_FSHARP_PREPROCESSOR",10},
+	{"SCE_FSHARP_QUOTATION",17},
+	{"SCE_FSHARP_QUOT_IDENTIFIER",7},
+	{"SCE_FSHARP_STRING",15},
+	{"SCE_FSHARP_VERBATIM",16},
+	{"SCE_FS_COMMENT",1},
+	{"SCE_FS_COMMENTDOC",3},
+	{"SCE_FS_COMMENTDOCKEYWORD",5},
+	{"SCE_FS_COMMENTDOCKEYWORDERROR",6},
+	{"SCE_FS_COMMENTDOC_C",22},
+	{"SCE_FS_COMMENTLINE",2},
+	{"SCE_FS_COMMENTLINEDOC",4},
+	{"SCE_FS_COMMENTLINEDOC_C",23},
+	{"SCE_FS_CONSTANT",18},
+	{"SCE_FS_DATE",16},
+	{"SCE_FS_DEFAULT",0},
+	{"SCE_FS_DEFAULT_C",21},
+	{"SCE_FS_DISABLEDCODE",20},
+	{"SCE_FS_IDENTIFIER",15},
+	{"SCE_FS_IDENTIFIER_C",30},
+	{"SCE_FS_KEYWORD",7},
+	{"SCE_FS_KEYWORD2",8},
+	{"SCE_FS_KEYWORD2_C",25},
+	{"SCE_FS_KEYWORD3",9},
+	{"SCE_FS_KEYWORD4",10},
+	{"SCE_FS_KEYWORD_C",24},
+	{"SCE_FS_NUMBER",11},
+	{"SCE_FS_NUMBER_C",26},
+	{"SCE_FS_OPERATOR",14},
+	{"SCE_FS_OPERATOR_C",29},
+	{"SCE_FS_PREPROCESSOR",13},
+	{"SCE_FS_PREPROCESSOR_C",28},
+	{"SCE_FS_STRING",12},
+	{"SCE_FS_STRINGEOL",17},
+	{"SCE_FS_STRINGEOL_C",31},
+	{"SCE_FS_STRING_C",27},
+	{"SCE_FS_WORDOPERATOR",19},
+	{"SCE_F_COMMENT",1},
+	{"SCE_F_CONTINUATION",14},
+	{"SCE_F_DEFAULT",0},
+	{"SCE_F_IDENTIFIER",7},
+	{"SCE_F_LABEL",13},
+	{"SCE_F_NUMBER",2},
+	{"SCE_F_OPERATOR",6},
+	{"SCE_F_OPERATOR2",12},
+	{"SCE_F_PREPROCESSOR",11},
+	{"SCE_F_STRING1",3},
+	{"SCE_F_STRING2",4},
+	{"SCE_F_STRINGEOL",5},
+	{"SCE_F_WORD",8},
+	{"SCE_F_WORD2",9},
+	{"SCE_F_WORD3",10},
+	{"SCE_GAP_CHAR",7},
+	{"SCE_GAP_COMMENT",9},
+	{"SCE_GAP_DEFAULT",0},
+	{"SCE_GAP_IDENTIFIER",1},
+	{"SCE_GAP_KEYWORD",2},
+	{"SCE_GAP_KEYWORD2",3},
+	{"SCE_GAP_KEYWORD3",4},
+	{"SCE_GAP_KEYWORD4",5},
+	{"SCE_GAP_NUMBER",10},
+	{"SCE_GAP_OPERATOR",8},
+	{"SCE_GAP_STRING",6},
+	{"SCE_GAP_STRINGEOL",11},
+	{"SCE_GC_ATTRIBUTE",5},
+	{"SCE_GC_COMMAND",7},
+	{"SCE_GC_COMMENTBLOCK",2},
+	{"SCE_GC_COMMENTLINE",1},
+	{"SCE_GC_CONTROL",6},
+	{"SCE_GC_DEFAULT",0},
+	{"SCE_GC_EVENT",4},
+	{"SCE_GC_GLOBAL",3},
+	{"SCE_GC_OPERATOR",9},
+	{"SCE_GC_STRING",8},
+	{"SCE_HA_CAPITAL",8},
+	{"SCE_HA_CHARACTER",5},
+	{"SCE_HA_CLASS",6},
+	{"SCE_HA_COMMENTBLOCK",14},
+	{"SCE_HA_COMMENTBLOCK2",15},
+	{"SCE_HA_COMMENTBLOCK3",16},
+	{"SCE_HA_COMMENTLINE",13},
+	{"SCE_HA_DATA",9},
+	{"SCE_HA_DEFAULT",0},
+	{"SCE_HA_IDENTIFIER",1},
+	{"SCE_HA_IMPORT",10},
+	{"SCE_HA_INSTANCE",12},
+	{"SCE_HA_KEYWORD",2},
+	{"SCE_HA_LITERATE_CODEDELIM",22},
+	{"SCE_HA_LITERATE_COMMENT",21},
+	{"SCE_HA_MODULE",7},
+	{"SCE_HA_NUMBER",3},
+	{"SCE_HA_OPERATOR",11},
+	{"SCE_HA_PRAGMA",17},
+	{"SCE_HA_PREPROCESSOR",18},
+	{"SCE_HA_RESERVED_OPERATOR",20},
+	{"SCE_HA_STRING",4},
+	{"SCE_HA_STRINGEOL",19},
+	{"SCE_HBA_COMMENTLINE",82},
+	{"SCE_HBA_DEFAULT",81},
+	{"SCE_HBA_IDENTIFIER",86},
+	{"SCE_HBA_NUMBER",83},
+	{"SCE_HBA_START",80},
+	{"SCE_HBA_STRING",85},
+	{"SCE_HBA_STRINGEOL",87},
+	{"SCE_HBA_WORD",84},
+	{"SCE_HB_COMMENTLINE",72},
+	{"SCE_HB_DEFAULT",71},
+	{"SCE_HB_IDENTIFIER",76},
+	{"SCE_HB_NUMBER",73},
+	{"SCE_HB_START",70},
+	{"SCE_HB_STRING",75},
+	{"SCE_HB_STRINGEOL",77},
+	{"SCE_HB_WORD",74},
+	{"SCE_HEX_ADDRESSFIELD_UNKNOWN",10},
+	{"SCE_HEX_BYTECOUNT",4},
+	{"SCE_HEX_BYTECOUNT_WRONG",5},
+	{"SCE_HEX_CHECKSUM",16},
+	{"SCE_HEX_CHECKSUM_WRONG",17},
+	{"SCE_HEX_DATAADDRESS",7},
+	{"SCE_HEX_DATA_EMPTY",15},
+	{"SCE_HEX_DATA_EVEN",13},
+	{"SCE_HEX_DATA_ODD",12},
+	{"SCE_HEX_DATA_UNKNOWN",14},
+	{"SCE_HEX_DEFAULT",0},
+	{"SCE_HEX_EXTENDEDADDRESS",11},
+	{"SCE_HEX_GARBAGE",18},
+	{"SCE_HEX_NOADDRESS",6},
+	{"SCE_HEX_RECCOUNT",8},
+	{"SCE_HEX_RECSTART",1},
+	{"SCE_HEX_RECTYPE",2},
+	{"SCE_HEX_RECTYPE_UNKNOWN",3},
+	{"SCE_HEX_STARTADDRESS",9},
+	{"SCE_HJA_COMMENT",57},
+	{"SCE_HJA_COMMENTDOC",59},
+	{"SCE_HJA_COMMENTLINE",58},
+	{"SCE_HJA_DEFAULT",56},
+	{"SCE_HJA_DOUBLESTRING",63},
+	{"SCE_HJA_KEYWORD",62},
+	{"SCE_HJA_NUMBER",60},
+	{"SCE_HJA_REGEX",67},
+	{"SCE_HJA_SINGLESTRING",64},
+	{"SCE_HJA_START",55},
+	{"SCE_HJA_STRINGEOL",66},
+	{"SCE_HJA_SYMBOLS",65},
+	{"SCE_HJA_WORD",61},
+	{"SCE_HJ_COMMENT",42},
+	{"SCE_HJ_COMMENTDOC",44},
+	{"SCE_HJ_COMMENTLINE",43},
+	{"SCE_HJ_DEFAULT",41},
+	{"SCE_HJ_DOUBLESTRING",48},
+	{"SCE_HJ_KEYWORD",47},
+	{"SCE_HJ_NUMBER",45},
+	{"SCE_HJ_REGEX",52},
+	{"SCE_HJ_SINGLESTRING",49},
+	{"SCE_HJ_START",40},
+	{"SCE_HJ_STRINGEOL",51},
+	{"SCE_HJ_SYMBOLS",50},
+	{"SCE_HJ_WORD",46},
+	{"SCE_HOLLYWOOD_COMMENT",1},
+	{"SCE_HOLLYWOOD_COMMENTBLOCK",2},
+	{"SCE_HOLLYWOOD_CONSTANT",13},
+	{"SCE_HOLLYWOOD_DEFAULT",0},
+	{"SCE_HOLLYWOOD_HEXNUMBER",14},
+	{"SCE_HOLLYWOOD_IDENTIFIER",12},
+	{"SCE_HOLLYWOOD_KEYWORD",4},
+	{"SCE_HOLLYWOOD_NUMBER",3},
+	{"SCE_HOLLYWOOD_OPERATOR",11},
+	{"SCE_HOLLYWOOD_PLUGINAPI",6},
+	{"SCE_HOLLYWOOD_PLUGINMETHOD",7},
+	{"SCE_HOLLYWOOD_PREPROCESSOR",10},
+	{"SCE_HOLLYWOOD_STDAPI",5},
+	{"SCE_HOLLYWOOD_STRING",8},
+	{"SCE_HOLLYWOOD_STRINGBLOCK",9},
+	{"SCE_HPA_CHARACTER",110},
+	{"SCE_HPA_CLASSNAME",114},
+	{"SCE_HPA_COMMENTLINE",107},
+	{"SCE_HPA_DEFAULT",106},
+	{"SCE_HPA_DEFNAME",115},
+	{"SCE_HPA_IDENTIFIER",117},
+	{"SCE_HPA_NUMBER",108},
+	{"SCE_HPA_OPERATOR",116},
+	{"SCE_HPA_START",105},
+	{"SCE_HPA_STRING",109},
+	{"SCE_HPA_TRIPLE",112},
+	{"SCE_HPA_TRIPLEDOUBLE",113},
+	{"SCE_HPA_WORD",111},
+	{"SCE_HPHP_COMMENT",124},
+	{"SCE_HPHP_COMMENTLINE",125},
+	{"SCE_HPHP_COMPLEX_VARIABLE",104},
+	{"SCE_HPHP_DEFAULT",118},
+	{"SCE_HPHP_HSTRING",119},
+	{"SCE_HPHP_HSTRING_VARIABLE",126},
+	{"SCE_HPHP_NUMBER",122},
+	{"SCE_HPHP_OPERATOR",127},
+	{"SCE_HPHP_SIMPLESTRING",120},
+	{"SCE_HPHP_VARIABLE",123},
+	{"SCE_HPHP_WORD",121},
+	{"SCE_HP_CHARACTER",95},
+	{"SCE_HP_CLASSNAME",99},
+	{"SCE_HP_COMMENTLINE",92},
+	{"SCE_HP_DEFAULT",91},
+	{"SCE_HP_DEFNAME",100},
+	{"SCE_HP_IDENTIFIER",102},
+	{"SCE_HP_NUMBER",93},
+	{"SCE_HP_OPERATOR",101},
+	{"SCE_HP_START",90},
+	{"SCE_HP_STRING",94},
+	{"SCE_HP_TRIPLE",97},
+	{"SCE_HP_TRIPLEDOUBLE",98},
+	{"SCE_HP_WORD",96},
+	{"SCE_H_ASP",15},
+	{"SCE_H_ASPAT",16},
+	{"SCE_H_ATTRIBUTE",3},
+	{"SCE_H_ATTRIBUTEUNKNOWN",4},
+	{"SCE_H_CDATA",17},
+	{"SCE_H_COMMENT",9},
+	{"SCE_H_DEFAULT",0},
+	{"SCE_H_DOUBLESTRING",6},
+	{"SCE_H_ENTITY",10},
+	{"SCE_H_NUMBER",5},
+	{"SCE_H_OTHER",8},
+	{"SCE_H_QUESTION",18},
+	{"SCE_H_SCRIPT",14},
+	{"SCE_H_SGML_1ST_PARAM",23},
+	{"SCE_H_SGML_1ST_PARAM_COMMENT",30},
+	{"SCE_H_SGML_BLOCK_DEFAULT",31},
+	{"SCE_H_SGML_COMMAND",22},
+	{"SCE_H_SGML_COMMENT",29},
+	{"SCE_H_SGML_DEFAULT",21},
+	{"SCE_H_SGML_DOUBLESTRING",24},
+	{"SCE_H_SGML_ENTITY",28},
+	{"SCE_H_SGML_ERROR",26},
+	{"SCE_H_SGML_SIMPLESTRING",25},
+	{"SCE_H_SGML_SPECIAL",27},
+	{"SCE_H_SINGLESTRING",7},
+	{"SCE_H_TAG",1},
+	{"SCE_H_TAGEND",11},
+	{"SCE_H_TAGUNKNOWN",2},
+	{"SCE_H_VALUE",19},
+	{"SCE_H_XCCOMMENT",20},
+	{"SCE_H_XMLEND",13},
+	{"SCE_H_XMLSTART",12},
+	{"SCE_INNO_COMMENT",1},
+	{"SCE_INNO_COMMENT_PASCAL",7},
+	{"SCE_INNO_DEFAULT",0},
+	{"SCE_INNO_IDENTIFIER",12},
+	{"SCE_INNO_INLINE_EXPANSION",6},
+	{"SCE_INNO_KEYWORD",2},
+	{"SCE_INNO_KEYWORD_PASCAL",8},
+	{"SCE_INNO_KEYWORD_USER",9},
+	{"SCE_INNO_PARAMETER",3},
+	{"SCE_INNO_PREPROC",5},
+	{"SCE_INNO_SECTION",4},
+	{"SCE_INNO_STRING_DOUBLE",10},
+	{"SCE_INNO_STRING_SINGLE",11},
+	{"SCE_JSON_BLOCKCOMMENT",7},
+	{"SCE_JSON_COMPACTIRI",10},
+	{"SCE_JSON_DEFAULT",0},
+	{"SCE_JSON_ERROR",13},
+	{"SCE_JSON_ESCAPESEQUENCE",5},
+	{"SCE_JSON_KEYWORD",11},
+	{"SCE_JSON_LDKEYWORD",12},
+	{"SCE_JSON_LINECOMMENT",6},
+	{"SCE_JSON_NUMBER",1},
+	{"SCE_JSON_OPERATOR",8},
+	{"SCE_JSON_PROPERTYNAME",4},
+	{"SCE_JSON_STRING",2},
+	{"SCE_JSON_STRINGEOL",3},
+	{"SCE_JSON_URI",9},
+	{"SCE_JULIA_BRACKET",8},
+	{"SCE_JULIA_CHAR",6},
+	{"SCE_JULIA_COMMAND",16},
+	{"SCE_JULIA_COMMANDLITERAL",17},
+	{"SCE_JULIA_COMMENT",1},
+	{"SCE_JULIA_DEFAULT",0},
+	{"SCE_JULIA_DOCSTRING",14},
+	{"SCE_JULIA_IDENTIFIER",9},
+	{"SCE_JULIA_KEYWORD1",3},
+	{"SCE_JULIA_KEYWORD2",4},
+	{"SCE_JULIA_KEYWORD3",5},
+	{"SCE_JULIA_KEYWORD4",20},
+	{"SCE_JULIA_LEXERROR",19},
+	{"SCE_JULIA_MACRO",12},
+	{"SCE_JULIA_NUMBER",2},
+	{"SCE_JULIA_OPERATOR",7},
+	{"SCE_JULIA_STRING",10},
+	{"SCE_JULIA_STRINGINTERP",13},
+	{"SCE_JULIA_STRINGLITERAL",15},
+	{"SCE_JULIA_SYMBOL",11},
+	{"SCE_JULIA_TYPEANNOT",18},
+	{"SCE_JULIA_TYPEOPERATOR",21},
+	{"SCE_KIX_COMMENT",1},
+	{"SCE_KIX_COMMENTSTREAM",10},
+	{"SCE_KIX_DEFAULT",0},
+	{"SCE_KIX_FUNCTIONS",8},
+	{"SCE_KIX_IDENTIFIER",31},
+	{"SCE_KIX_KEYWORD",7},
+	{"SCE_KIX_MACRO",6},
+	{"SCE_KIX_NUMBER",4},
+	{"SCE_KIX_OPERATOR",9},
+	{"SCE_KIX_STRING1",2},
+	{"SCE_KIX_STRING2",3},
+	{"SCE_KIX_VAR",5},
+	{"SCE_KVIRC_COMMENT",1},
+	{"SCE_KVIRC_COMMENTBLOCK",2},
+	{"SCE_KVIRC_DEFAULT",0},
+	{"SCE_KVIRC_FUNCTION",7},
+	{"SCE_KVIRC_FUNCTION_KEYWORD",6},
+	{"SCE_KVIRC_KEYWORD",5},
+	{"SCE_KVIRC_NUMBER",9},
+	{"SCE_KVIRC_OPERATOR",10},
+	{"SCE_KVIRC_STRING",3},
+	{"SCE_KVIRC_STRING_FUNCTION",11},
+	{"SCE_KVIRC_STRING_VARIABLE",12},
+	{"SCE_KVIRC_VARIABLE",8},
+	{"SCE_KVIRC_WORD",4},
+	{"SCE_LISP_COMMENT",1},
+	{"SCE_LISP_DEFAULT",0},
+	{"SCE_LISP_IDENTIFIER",9},
+	{"SCE_LISP_KEYWORD",3},
+	{"SCE_LISP_KEYWORD_KW",4},
+	{"SCE_LISP_MULTI_COMMENT",12},
+	{"SCE_LISP_NUMBER",2},
+	{"SCE_LISP_OPERATOR",10},
+	{"SCE_LISP_SPECIAL",11},
+	{"SCE_LISP_STRING",6},
+	{"SCE_LISP_STRINGEOL",8},
+	{"SCE_LISP_SYMBOL",5},
+	{"SCE_LOT_ABORT",6},
+	{"SCE_LOT_BREAK",2},
+	{"SCE_LOT_DEFAULT",0},
+	{"SCE_LOT_FAIL",5},
+	{"SCE_LOT_HEADER",1},
+	{"SCE_LOT_PASS",4},
+	{"SCE_LOT_SET",3},
+	{"SCE_LOUT_COMMENT",1},
+	{"SCE_LOUT_DEFAULT",0},
+	{"SCE_LOUT_IDENTIFIER",9},
+	{"SCE_LOUT_NUMBER",2},
+	{"SCE_LOUT_OPERATOR",8},
+	{"SCE_LOUT_STRING",7},
+	{"SCE_LOUT_STRINGEOL",10},
+	{"SCE_LOUT_WORD",3},
+	{"SCE_LOUT_WORD2",4},
+	{"SCE_LOUT_WORD3",5},
+	{"SCE_LOUT_WORD4",6},
+	{"SCE_LUA_CHARACTER",7},
+	{"SCE_LUA_COMMENT",1},
+	{"SCE_LUA_COMMENTDOC",3},
+	{"SCE_LUA_COMMENTLINE",2},
+	{"SCE_LUA_DEFAULT",0},
+	{"SCE_LUA_IDENTIFIER",11},
+	{"SCE_LUA_LABEL",20},
+	{"SCE_LUA_LITERALSTRING",8},
+	{"SCE_LUA_NUMBER",4},
+	{"SCE_LUA_OPERATOR",10},
+	{"SCE_LUA_PREPROCESSOR",9},
+	{"SCE_LUA_STRING",6},
+	{"SCE_LUA_STRINGEOL",12},
+	{"SCE_LUA_WORD",5},
+	{"SCE_LUA_WORD2",13},
+	{"SCE_LUA_WORD3",14},
+	{"SCE_LUA_WORD4",15},
+	{"SCE_LUA_WORD5",16},
+	{"SCE_LUA_WORD6",17},
+	{"SCE_LUA_WORD7",18},
+	{"SCE_LUA_WORD8",19},
+	{"SCE_L_CMDOPT",11},
+	{"SCE_L_COMMAND",1},
+	{"SCE_L_COMMENT",4},
+	{"SCE_L_COMMENT2",7},
+	{"SCE_L_DEFAULT",0},
+	{"SCE_L_ERROR",12},
+	{"SCE_L_MATH",3},
+	{"SCE_L_MATH2",6},
+	{"SCE_L_SHORTCMD",9},
+	{"SCE_L_SPECIAL",10},
+	{"SCE_L_TAG",2},
+	{"SCE_L_TAG2",5},
+	{"SCE_L_VERBATIM",8},
+	{"SCE_MAGIK_BRACE_BLOCK",10},
+	{"SCE_MAGIK_BRACKET_BLOCK",9},
+	{"SCE_MAGIK_CHARACTER",3},
+	{"SCE_MAGIK_COMMENT",1},
+	{"SCE_MAGIK_CONTAINER",8},
+	{"SCE_MAGIK_DEFAULT",0},
+	{"SCE_MAGIK_FLOW",7},
+	{"SCE_MAGIK_HYPER_COMMENT",16},
+	{"SCE_MAGIK_IDENTIFIER",5},
+	{"SCE_MAGIK_KEYWORD",13},
+	{"SCE_MAGIK_NUMBER",4},
+	{"SCE_MAGIK_OPERATOR",6},
+	{"SCE_MAGIK_PRAGMA",14},
+	{"SCE_MAGIK_SQBRACKET_BLOCK",11},
+	{"SCE_MAGIK_STRING",2},
+	{"SCE_MAGIK_SYMBOL",15},
+	{"SCE_MAGIK_UNKNOWN_KEYWORD",12},
+	{"SCE_MAKE_COMMENT",1},
+	{"SCE_MAKE_DEFAULT",0},
+	{"SCE_MAKE_IDENTIFIER",3},
+	{"SCE_MAKE_IDEOL",9},
+	{"SCE_MAKE_OPERATOR",4},
+	{"SCE_MAKE_PREPROCESSOR",2},
+	{"SCE_MAKE_TARGET",5},
+	{"SCE_MARKDOWN_BLOCKQUOTE",15},
+	{"SCE_MARKDOWN_CODE",19},
+	{"SCE_MARKDOWN_CODE2",20},
+	{"SCE_MARKDOWN_CODEBK",21},
+	{"SCE_MARKDOWN_DEFAULT",0},
+	{"SCE_MARKDOWN_EM1",4},
+	{"SCE_MARKDOWN_EM2",5},
+	{"SCE_MARKDOWN_HEADER1",6},
+	{"SCE_MARKDOWN_HEADER2",7},
+	{"SCE_MARKDOWN_HEADER3",8},
+	{"SCE_MARKDOWN_HEADER4",9},
+	{"SCE_MARKDOWN_HEADER5",10},
+	{"SCE_MARKDOWN_HEADER6",11},
+	{"SCE_MARKDOWN_HRULE",17},
+	{"SCE_MARKDOWN_LINE_BEGIN",1},
+	{"SCE_MARKDOWN_LINK",18},
+	{"SCE_MARKDOWN_OLIST_ITEM",14},
+	{"SCE_MARKDOWN_PRECHAR",12},
+	{"SCE_MARKDOWN_STRIKEOUT",16},
+	{"SCE_MARKDOWN_STRONG1",2},
+	{"SCE_MARKDOWN_STRONG2",3},
+	{"SCE_MARKDOWN_ULIST_ITEM",13},
+	{"SCE_MATLAB_COMMAND",2},
+	{"SCE_MATLAB_COMMENT",1},
+	{"SCE_MATLAB_DEFAULT",0},
+	{"SCE_MATLAB_DOUBLEQUOTESTRING",8},
+	{"SCE_MATLAB_IDENTIFIER",7},
+	{"SCE_MATLAB_KEYWORD",4},
+	{"SCE_MATLAB_NUMBER",3},
+	{"SCE_MATLAB_OPERATOR",6},
+	{"SCE_MATLAB_STRING",5},
+	{"SCE_MAXIMA_COMMAND",5},
+	{"SCE_MAXIMA_COMMANDENDING",1},
+	{"SCE_MAXIMA_COMMENT",2},
+	{"SCE_MAXIMA_NUMBER",3},
+	{"SCE_MAXIMA_OPERATOR",0},
+	{"SCE_MAXIMA_STRING",4},
+	{"SCE_MAXIMA_UNKNOWN",7},
+	{"SCE_MAXIMA_VARIABLE",6},
+	{"SCE_METAPOST_COMMAND",4},
+	{"SCE_METAPOST_DEFAULT",0},
+	{"SCE_METAPOST_EXTRA",6},
+	{"SCE_METAPOST_GROUP",2},
+	{"SCE_METAPOST_SPECIAL",1},
+	{"SCE_METAPOST_SYMBOL",3},
+	{"SCE_METAPOST_TEXT",5},
+	{"SCE_MMIXAL_CHAR",11},
+	{"SCE_MMIXAL_COMMENT",1},
+	{"SCE_MMIXAL_HEX",14},
+	{"SCE_MMIXAL_INCLUDE",17},
+	{"SCE_MMIXAL_LABEL",2},
+	{"SCE_MMIXAL_LEADWS",0},
+	{"SCE_MMIXAL_NUMBER",9},
+	{"SCE_MMIXAL_OPCODE",3},
+	{"SCE_MMIXAL_OPCODE_POST",7},
+	{"SCE_MMIXAL_OPCODE_PRE",4},
+	{"SCE_MMIXAL_OPCODE_UNKNOWN",6},
+	{"SCE_MMIXAL_OPCODE_VALID",5},
+	{"SCE_MMIXAL_OPERANDS",8},
+	{"SCE_MMIXAL_OPERATOR",15},
+	{"SCE_MMIXAL_REF",10},
+	{"SCE_MMIXAL_REGISTER",13},
+	{"SCE_MMIXAL_STRING",12},
+	{"SCE_MMIXAL_SYMBOL",16},
+	{"SCE_MODULA_BADSTR",17},
+	{"SCE_MODULA_BASENUM",7},
+	{"SCE_MODULA_CHAR",11},
+	{"SCE_MODULA_CHARSPEC",12},
+	{"SCE_MODULA_COMMENT",1},
+	{"SCE_MODULA_DEFAULT",0},
+	{"SCE_MODULA_DOXYCOMM",2},
+	{"SCE_MODULA_DOXYKEY",3},
+	{"SCE_MODULA_FLOAT",8},
+	{"SCE_MODULA_KEYWORD",4},
+	{"SCE_MODULA_NUMBER",6},
+	{"SCE_MODULA_OPERATOR",16},
+	{"SCE_MODULA_PRAGMA",14},
+	{"SCE_MODULA_PRGKEY",15},
+	{"SCE_MODULA_PROC",13},
+	{"SCE_MODULA_RESERVED",5},
+	{"SCE_MODULA_STRING",9},
+	{"SCE_MODULA_STRSPEC",10},
+	{"SCE_MSSQL_COLUMN_NAME",8},
+	{"SCE_MSSQL_COLUMN_NAME_2",16},
+	{"SCE_MSSQL_COMMENT",1},
+	{"SCE_MSSQL_DATATYPE",10},
+	{"SCE_MSSQL_DEFAULT",0},
+	{"SCE_MSSQL_DEFAULT_PREF_DATATYPE",15},
+	{"SCE_MSSQL_FUNCTION",13},
+	{"SCE_MSSQL_GLOBAL_VARIABLE",12},
+	{"SCE_MSSQL_IDENTIFIER",6},
+	{"SCE_MSSQL_LINE_COMMENT",2},
+	{"SCE_MSSQL_NUMBER",3},
+	{"SCE_MSSQL_OPERATOR",5},
+	{"SCE_MSSQL_STATEMENT",9},
+	{"SCE_MSSQL_STORED_PROCEDURE",14},
+	{"SCE_MSSQL_STRING",4},
+	{"SCE_MSSQL_SYSTABLE",11},
+	{"SCE_MSSQL_VARIABLE",7},
+	{"SCE_MYSQL_COMMENT",1},
+	{"SCE_MYSQL_COMMENTLINE",2},
+	{"SCE_MYSQL_DATABASEOBJECT",9},
+	{"SCE_MYSQL_DEFAULT",0},
+	{"SCE_MYSQL_DQSTRING",13},
+	{"SCE_MYSQL_FUNCTION",15},
+	{"SCE_MYSQL_HIDDENCOMMAND",21},
+	{"SCE_MYSQL_IDENTIFIER",16},
+	{"SCE_MYSQL_KEYWORD",8},
+	{"SCE_MYSQL_KNOWNSYSTEMVARIABLE",5},
+	{"SCE_MYSQL_MAJORKEYWORD",7},
+	{"SCE_MYSQL_NUMBER",6},
+	{"SCE_MYSQL_OPERATOR",14},
+	{"SCE_MYSQL_PLACEHOLDER",22},
+	{"SCE_MYSQL_PROCEDUREKEYWORD",10},
+	{"SCE_MYSQL_QUOTEDIDENTIFIER",17},
+	{"SCE_MYSQL_SQSTRING",12},
+	{"SCE_MYSQL_STRING",11},
+	{"SCE_MYSQL_SYSTEMVARIABLE",4},
+	{"SCE_MYSQL_USER1",18},
+	{"SCE_MYSQL_USER2",19},
+	{"SCE_MYSQL_USER3",20},
+	{"SCE_MYSQL_VARIABLE",3},
+	{"SCE_NIM_BACKTICKS",11},
+	{"SCE_NIM_CHARACTER",7},
+	{"SCE_NIM_COMMENT",1},
+	{"SCE_NIM_COMMENTDOC",2},
+	{"SCE_NIM_COMMENTLINE",3},
+	{"SCE_NIM_COMMENTLINEDOC",4},
+	{"SCE_NIM_DEFAULT",0},
+	{"SCE_NIM_FUNCNAME",12},
+	{"SCE_NIM_IDENTIFIER",16},
+	{"SCE_NIM_NUMBER",5},
+	{"SCE_NIM_NUMERROR",14},
+	{"SCE_NIM_OPERATOR",15},
+	{"SCE_NIM_STRING",6},
+	{"SCE_NIM_STRINGEOL",13},
+	{"SCE_NIM_TRIPLE",9},
+	{"SCE_NIM_TRIPLEDOUBLE",10},
+	{"SCE_NIM_WORD",8},
+	{"SCE_NNCRONTAB_ASTERISK",6},
+	{"SCE_NNCRONTAB_COMMENT",1},
+	{"SCE_NNCRONTAB_DEFAULT",0},
+	{"SCE_NNCRONTAB_ENVIRONMENT",9},
+	{"SCE_NNCRONTAB_IDENTIFIER",10},
+	{"SCE_NNCRONTAB_KEYWORD",4},
+	{"SCE_NNCRONTAB_MODIFIER",5},
+	{"SCE_NNCRONTAB_NUMBER",7},
+	{"SCE_NNCRONTAB_SECTION",3},
+	{"SCE_NNCRONTAB_STRING",8},
+	{"SCE_NNCRONTAB_TASK",2},
+	{"SCE_NSIS_COMMENT",1},
+	{"SCE_NSIS_COMMENTBOX",18},
+	{"SCE_NSIS_DEFAULT",0},
+	{"SCE_NSIS_FUNCTION",5},
+	{"SCE_NSIS_FUNCTIONDEF",17},
+	{"SCE_NSIS_IFDEFINEDEF",11},
+	{"SCE_NSIS_LABEL",7},
+	{"SCE_NSIS_MACRODEF",12},
+	{"SCE_NSIS_NUMBER",14},
+	{"SCE_NSIS_PAGEEX",16},
+	{"SCE_NSIS_SECTIONDEF",9},
+	{"SCE_NSIS_SECTIONGROUP",15},
+	{"SCE_NSIS_STRINGDQ",2},
+	{"SCE_NSIS_STRINGLQ",3},
+	{"SCE_NSIS_STRINGRQ",4},
+	{"SCE_NSIS_STRINGVAR",13},
+	{"SCE_NSIS_SUBSECTIONDEF",10},
+	{"SCE_NSIS_USERDEFINED",8},
+	{"SCE_NSIS_VARIABLE",6},
+	{"SCE_OPAL_BOOL_CONST",8},
+	{"SCE_OPAL_COMMENT_BLOCK",1},
+	{"SCE_OPAL_COMMENT_LINE",2},
+	{"SCE_OPAL_DEFAULT",32},
+	{"SCE_OPAL_INTEGER",3},
+	{"SCE_OPAL_KEYWORD",4},
+	{"SCE_OPAL_PAR",7},
+	{"SCE_OPAL_SORT",5},
+	{"SCE_OPAL_SPACE",0},
+	{"SCE_OPAL_STRING",6},
+	{"SCE_OSCRIPT_BLOCK_COMMENT",2},
+	{"SCE_OSCRIPT_CONSTANT",8},
+	{"SCE_OSCRIPT_DEFAULT",0},
+	{"SCE_OSCRIPT_DOC_COMMENT",3},
+	{"SCE_OSCRIPT_DOUBLEQUOTE_STRING",7},
+	{"SCE_OSCRIPT_FUNCTION",15},
+	{"SCE_OSCRIPT_GLOBAL",10},
+	{"SCE_OSCRIPT_IDENTIFIER",9},
+	{"SCE_OSCRIPT_KEYWORD",11},
+	{"SCE_OSCRIPT_LABEL",13},
+	{"SCE_OSCRIPT_LINE_COMMENT",1},
+	{"SCE_OSCRIPT_METHOD",18},
+	{"SCE_OSCRIPT_NUMBER",5},
+	{"SCE_OSCRIPT_OBJECT",16},
+	{"SCE_OSCRIPT_OPERATOR",12},
+	{"SCE_OSCRIPT_PREPROCESSOR",4},
+	{"SCE_OSCRIPT_PROPERTY",17},
+	{"SCE_OSCRIPT_SINGLEQUOTE_STRING",6},
+	{"SCE_OSCRIPT_TYPE",14},
+	{"SCE_PAS_ASM",14},
+	{"SCE_PAS_CHARACTER",12},
+	{"SCE_PAS_COMMENT",2},
+	{"SCE_PAS_COMMENT2",3},
+	{"SCE_PAS_COMMENTLINE",4},
+	{"SCE_PAS_DEFAULT",0},
+	{"SCE_PAS_HEXNUMBER",8},
+	{"SCE_PAS_IDENTIFIER",1},
+	{"SCE_PAS_NUMBER",7},
+	{"SCE_PAS_OPERATOR",13},
+	{"SCE_PAS_PREPROCESSOR",5},
+	{"SCE_PAS_PREPROCESSOR2",6},
+	{"SCE_PAS_STRING",10},
+	{"SCE_PAS_STRINGEOL",11},
+	{"SCE_PAS_WORD",9},
+	{"SCE_PLM_COMMENT",1},
+	{"SCE_PLM_CONTROL",6},
+	{"SCE_PLM_DEFAULT",0},
+	{"SCE_PLM_IDENTIFIER",4},
+	{"SCE_PLM_KEYWORD",7},
+	{"SCE_PLM_NUMBER",3},
+	{"SCE_PLM_OPERATOR",5},
+	{"SCE_PLM_STRING",2},
+	{"SCE_PL_ARRAY",13},
+	{"SCE_PL_BACKTICKS",20},
+	{"SCE_PL_BACKTICKS_VAR",57},
+	{"SCE_PL_CHARACTER",7},
+	{"SCE_PL_COMMENTLINE",2},
+	{"SCE_PL_DATASECTION",21},
+	{"SCE_PL_DEFAULT",0},
+	{"SCE_PL_ERROR",1},
+	{"SCE_PL_FORMAT",42},
+	{"SCE_PL_FORMAT_IDENT",41},
+	{"SCE_PL_HASH",14},
+	{"SCE_PL_HERE_DELIM",22},
+	{"SCE_PL_HERE_Q",23},
+	{"SCE_PL_HERE_QQ",24},
+	{"SCE_PL_HERE_QQ_VAR",61},
+	{"SCE_PL_HERE_QX",25},
+	{"SCE_PL_HERE_QX_VAR",62},
+	{"SCE_PL_IDENTIFIER",11},
+	{"SCE_PL_LONGQUOTE",19},
+	{"SCE_PL_NUMBER",4},
+	{"SCE_PL_OPERATOR",10},
+	{"SCE_PL_POD",3},
+	{"SCE_PL_POD_VERB",31},
+	{"SCE_PL_PREPROCESSOR",9},
+	{"SCE_PL_PUNCTUATION",8},
+	{"SCE_PL_REGEX",17},
+	{"SCE_PL_REGEX_VAR",54},
+	{"SCE_PL_REGSUBST",18},
+	{"SCE_PL_REGSUBST_VAR",55},
+	{"SCE_PL_SCALAR",12},
+	{"SCE_PL_STRING",6},
+	{"SCE_PL_STRING_Q",26},
+	{"SCE_PL_STRING_QQ",27},
+	{"SCE_PL_STRING_QQ_VAR",64},
+	{"SCE_PL_STRING_QR",29},
+	{"SCE_PL_STRING_QR_VAR",66},
+	{"SCE_PL_STRING_QW",30},
+	{"SCE_PL_STRING_QX",28},
+	{"SCE_PL_STRING_QX_VAR",65},
+	{"SCE_PL_STRING_VAR",43},
+	{"SCE_PL_SUB_PROTOTYPE",40},
+	{"SCE_PL_SYMBOLTABLE",15},
+	{"SCE_PL_VARIABLE_INDEXER",16},
+	{"SCE_PL_WORD",5},
+	{"SCE_PL_XLAT",44},
+	{"SCE_POV_BADDIRECTIVE",9},
+	{"SCE_POV_COMMENT",1},
+	{"SCE_POV_COMMENTLINE",2},
+	{"SCE_POV_DEFAULT",0},
+	{"SCE_POV_DIRECTIVE",8},
+	{"SCE_POV_IDENTIFIER",5},
+	{"SCE_POV_NUMBER",3},
+	{"SCE_POV_OPERATOR",4},
+	{"SCE_POV_STRING",6},
+	{"SCE_POV_STRINGEOL",7},
+	{"SCE_POV_WORD2",10},
+	{"SCE_POV_WORD3",11},
+	{"SCE_POV_WORD4",12},
+	{"SCE_POV_WORD5",13},
+	{"SCE_POV_WORD6",14},
+	{"SCE_POV_WORD7",15},
+	{"SCE_POV_WORD8",16},
+	{"SCE_POWERPRO_ALTQUOTE",15},
+	{"SCE_POWERPRO_COMMENTBLOCK",1},
+	{"SCE_POWERPRO_COMMENTLINE",2},
+	{"SCE_POWERPRO_DEFAULT",0},
+	{"SCE_POWERPRO_DOUBLEQUOTEDSTRING",8},
+	{"SCE_POWERPRO_FUNCTION",16},
+	{"SCE_POWERPRO_IDENTIFIER",12},
+	{"SCE_POWERPRO_LINECONTINUE",10},
+	{"SCE_POWERPRO_NUMBER",3},
+	{"SCE_POWERPRO_OPERATOR",11},
+	{"SCE_POWERPRO_SINGLEQUOTEDSTRING",9},
+	{"SCE_POWERPRO_STRINGEOL",13},
+	{"SCE_POWERPRO_VERBATIM",14},
+	{"SCE_POWERPRO_WORD",4},
+	{"SCE_POWERPRO_WORD2",5},
+	{"SCE_POWERPRO_WORD3",6},
+	{"SCE_POWERPRO_WORD4",7},
+	{"SCE_POWERSHELL_ALIAS",10},
+	{"SCE_POWERSHELL_CHARACTER",3},
+	{"SCE_POWERSHELL_CMDLET",9},
+	{"SCE_POWERSHELL_COMMENT",1},
+	{"SCE_POWERSHELL_COMMENTDOCKEYWORD",16},
+	{"SCE_POWERSHELL_COMMENTSTREAM",13},
+	{"SCE_POWERSHELL_DEFAULT",0},
+	{"SCE_POWERSHELL_FUNCTION",11},
+	{"SCE_POWERSHELL_HERE_CHARACTER",15},
+	{"SCE_POWERSHELL_HERE_STRING",14},
+	{"SCE_POWERSHELL_IDENTIFIER",7},
+	{"SCE_POWERSHELL_KEYWORD",8},
+	{"SCE_POWERSHELL_NUMBER",4},
+	{"SCE_POWERSHELL_OPERATOR",6},
+	{"SCE_POWERSHELL_STRING",2},
+	{"SCE_POWERSHELL_USER1",12},
+	{"SCE_POWERSHELL_VARIABLE",5},
+	{"SCE_PO_COMMENT",1},
+	{"SCE_PO_DEFAULT",0},
+	{"SCE_PO_ERROR",15},
+	{"SCE_PO_FLAGS",11},
+	{"SCE_PO_FUZZY",8},
+	{"SCE_PO_MSGCTXT",6},
+	{"SCE_PO_MSGCTXT_TEXT",7},
+	{"SCE_PO_MSGCTXT_TEXT_EOL",14},
+	{"SCE_PO_MSGID",2},
+	{"SCE_PO_MSGID_TEXT",3},
+	{"SCE_PO_MSGID_TEXT_EOL",12},
+	{"SCE_PO_MSGSTR",4},
+	{"SCE_PO_MSGSTR_TEXT",5},
+	{"SCE_PO_MSGSTR_TEXT_EOL",13},
+	{"SCE_PO_PROGRAMMER_COMMENT",9},
+	{"SCE_PO_REFERENCE",10},
+	{"SCE_PROPS_ASSIGNMENT",3},
+	{"SCE_PROPS_COMMENT",1},
+	{"SCE_PROPS_DEFAULT",0},
+	{"SCE_PROPS_DEFVAL",4},
+	{"SCE_PROPS_KEY",5},
+	{"SCE_PROPS_SECTION",2},
+	{"SCE_PS_BADSTRINGCHAR",15},
+	{"SCE_PS_BASE85STRING",14},
+	{"SCE_PS_COMMENT",1},
+	{"SCE_PS_DEFAULT",0},
+	{"SCE_PS_DSC_COMMENT",2},
+	{"SCE_PS_DSC_VALUE",3},
+	{"SCE_PS_HEXSTRING",13},
+	{"SCE_PS_IMMEVAL",8},
+	{"SCE_PS_KEYWORD",6},
+	{"SCE_PS_LITERAL",7},
+	{"SCE_PS_NAME",5},
+	{"SCE_PS_NUMBER",4},
+	{"SCE_PS_PAREN_ARRAY",9},
+	{"SCE_PS_PAREN_DICT",10},
+	{"SCE_PS_PAREN_PROC",11},
+	{"SCE_PS_TEXT",12},
+	{"SCE_P_CHARACTER",4},
+	{"SCE_P_CLASSNAME",8},
+	{"SCE_P_COMMENTBLOCK",12},
+	{"SCE_P_COMMENTLINE",1},
+	{"SCE_P_DECORATOR",15},
+	{"SCE_P_DEFAULT",0},
+	{"SCE_P_DEFNAME",9},
+	{"SCE_P_FCHARACTER",17},
+	{"SCE_P_FSTRING",16},
+	{"SCE_P_FTRIPLE",18},
+	{"SCE_P_FTRIPLEDOUBLE",19},
+	{"SCE_P_IDENTIFIER",11},
+	{"SCE_P_NUMBER",2},
+	{"SCE_P_OPERATOR",10},
+	{"SCE_P_STRING",3},
+	{"SCE_P_STRINGEOL",13},
+	{"SCE_P_TRIPLE",6},
+	{"SCE_P_TRIPLEDOUBLE",7},
+	{"SCE_P_WORD",5},
+	{"SCE_P_WORD2",14},
+	{"SCE_RAKU_ADVERB",15},
+	{"SCE_RAKU_ASSOCIATIVE",25},
+	{"SCE_RAKU_CALLABLE",26},
+	{"SCE_RAKU_CHARACTER",5},
+	{"SCE_RAKU_CLASS",28},
+	{"SCE_RAKU_COMMENTEMBED",3},
+	{"SCE_RAKU_COMMENTLINE",2},
+	{"SCE_RAKU_DEFAULT",0},
+	{"SCE_RAKU_ERROR",1},
+	{"SCE_RAKU_FUNCTION",20},
+	{"SCE_RAKU_GRAMMAR",27},
+	{"SCE_RAKU_HEREDOC_Q",6},
+	{"SCE_RAKU_HEREDOC_QQ",7},
+	{"SCE_RAKU_IDENTIFIER",21},
+	{"SCE_RAKU_MU",23},
+	{"SCE_RAKU_NUMBER",16},
+	{"SCE_RAKU_OPERATOR",18},
+	{"SCE_RAKU_POD",4},
+	{"SCE_RAKU_POSITIONAL",24},
+	{"SCE_RAKU_PREPROCESSOR",17},
+	{"SCE_RAKU_REGEX",13},
+	{"SCE_RAKU_REGEX_VAR",14},
+	{"SCE_RAKU_STRING",8},
+	{"SCE_RAKU_STRING_Q",9},
+	{"SCE_RAKU_STRING_QQ",10},
+	{"SCE_RAKU_STRING_Q_LANG",11},
+	{"SCE_RAKU_STRING_VAR",12},
+	{"SCE_RAKU_TYPEDEF",22},
+	{"SCE_RAKU_WORD",19},
+	{"SCE_RB_BACKTICKS",18},
+	{"SCE_RB_CHARACTER",7},
+	{"SCE_RB_CLASSNAME",8},
+	{"SCE_RB_CLASS_VAR",17},
+	{"SCE_RB_COMMENTLINE",2},
+	{"SCE_RB_DATASECTION",19},
+	{"SCE_RB_DEFAULT",0},
+	{"SCE_RB_DEFNAME",9},
+	{"SCE_RB_ERROR",1},
+	{"SCE_RB_GLOBAL",13},
+	{"SCE_RB_HERE_DELIM",20},
+	{"SCE_RB_HERE_Q",21},
+	{"SCE_RB_HERE_QQ",22},
+	{"SCE_RB_HERE_QX",23},
+	{"SCE_RB_IDENTIFIER",11},
+	{"SCE_RB_INSTANCE_VAR",16},
+	{"SCE_RB_MODULE_NAME",15},
+	{"SCE_RB_NUMBER",4},
+	{"SCE_RB_OPERATOR",10},
+	{"SCE_RB_POD",3},
+	{"SCE_RB_REGEX",12},
+	{"SCE_RB_STDERR",40},
+	{"SCE_RB_STDIN",30},
+	{"SCE_RB_STDOUT",31},
+	{"SCE_RB_STRING",6},
+	{"SCE_RB_STRING_Q",24},
+	{"SCE_RB_STRING_QQ",25},
+	{"SCE_RB_STRING_QR",27},
+	{"SCE_RB_STRING_QW",28},
+	{"SCE_RB_STRING_QX",26},
+	{"SCE_RB_SYMBOL",14},
+	{"SCE_RB_UPPER_BOUND",41},
+	{"SCE_RB_WORD",5},
+	{"SCE_RB_WORD_DEMOTED",29},
+	{"SCE_REBOL_BINARY",11},
+	{"SCE_REBOL_BRACEDSTRING",7},
+	{"SCE_REBOL_CHARACTER",5},
+	{"SCE_REBOL_COMMENTBLOCK",2},
+	{"SCE_REBOL_COMMENTLINE",1},
+	{"SCE_REBOL_DATE",18},
+	{"SCE_REBOL_DEFAULT",0},
+	{"SCE_REBOL_EMAIL",16},
+	{"SCE_REBOL_FILE",15},
+	{"SCE_REBOL_IDENTIFIER",20},
+	{"SCE_REBOL_ISSUE",13},
+	{"SCE_REBOL_MONEY",12},
+	{"SCE_REBOL_NUMBER",8},
+	{"SCE_REBOL_OPERATOR",4},
+	{"SCE_REBOL_PAIR",9},
+	{"SCE_REBOL_PREFACE",3},
+	{"SCE_REBOL_QUOTEDSTRING",6},
+	{"SCE_REBOL_TAG",14},
+	{"SCE_REBOL_TIME",19},
+	{"SCE_REBOL_TUPLE",10},
+	{"SCE_REBOL_URL",17},
+	{"SCE_REBOL_WORD",21},
+	{"SCE_REBOL_WORD2",22},
+	{"SCE_REBOL_WORD3",23},
+	{"SCE_REBOL_WORD4",24},
+	{"SCE_REBOL_WORD5",25},
+	{"SCE_REBOL_WORD6",26},
+	{"SCE_REBOL_WORD7",27},
+	{"SCE_REBOL_WORD8",28},
+	{"SCE_REG_ADDEDKEY",6},
+	{"SCE_REG_COMMENT",1},
+	{"SCE_REG_DEFAULT",0},
+	{"SCE_REG_DELETEDKEY",7},
+	{"SCE_REG_ESCAPED",8},
+	{"SCE_REG_HEXDIGIT",4},
+	{"SCE_REG_KEYPATH_GUID",9},
+	{"SCE_REG_OPERATOR",12},
+	{"SCE_REG_PARAMETER",11},
+	{"SCE_REG_STRING",3},
+	{"SCE_REG_STRING_GUID",10},
+	{"SCE_REG_VALUENAME",2},
+	{"SCE_REG_VALUETYPE",5},
+	{"SCE_RUST_BYTECHARACTER",23},
+	{"SCE_RUST_BYTESTRING",21},
+	{"SCE_RUST_BYTESTRINGR",22},
+	{"SCE_RUST_CHARACTER",15},
+	{"SCE_RUST_COMMENTBLOCK",1},
+	{"SCE_RUST_COMMENTBLOCKDOC",3},
+	{"SCE_RUST_COMMENTLINE",2},
+	{"SCE_RUST_COMMENTLINEDOC",4},
+	{"SCE_RUST_DEFAULT",0},
+	{"SCE_RUST_IDENTIFIER",17},
+	{"SCE_RUST_LEXERROR",20},
+	{"SCE_RUST_LIFETIME",18},
+	{"SCE_RUST_MACRO",19},
+	{"SCE_RUST_NUMBER",5},
+	{"SCE_RUST_OPERATOR",16},
+	{"SCE_RUST_STRING",13},
+	{"SCE_RUST_STRINGR",14},
+	{"SCE_RUST_WORD",6},
+	{"SCE_RUST_WORD2",7},
+	{"SCE_RUST_WORD3",8},
+	{"SCE_RUST_WORD4",9},
+	{"SCE_RUST_WORD5",10},
+	{"SCE_RUST_WORD6",11},
+	{"SCE_RUST_WORD7",12},
+	{"SCE_R_BASEKWORD",3},
+	{"SCE_R_COMMENT",1},
+	{"SCE_R_DEFAULT",0},
+	{"SCE_R_IDENTIFIER",9},
+	{"SCE_R_INFIX",10},
+	{"SCE_R_INFIXEOL",11},
+	{"SCE_R_KWORD",2},
+	{"SCE_R_NUMBER",5},
+	{"SCE_R_OPERATOR",8},
+	{"SCE_R_OTHERKWORD",4},
+	{"SCE_R_STRING",6},
+	{"SCE_R_STRING2",7},
+	{"SCE_SAS_BLOCK_KEYWORD",13},
+	{"SCE_SAS_COMMENT",1},
+	{"SCE_SAS_COMMENTBLOCK",3},
+	{"SCE_SAS_COMMENTLINE",2},
+	{"SCE_SAS_DEFAULT",0},
+	{"SCE_SAS_GLOBAL_MACRO",10},
+	{"SCE_SAS_IDENTIFIER",6},
+	{"SCE_SAS_MACRO",11},
+	{"SCE_SAS_MACRO_FUNCTION",14},
+	{"SCE_SAS_MACRO_KEYWORD",12},
+	{"SCE_SAS_NUMBER",4},
+	{"SCE_SAS_OPERATOR",5},
+	{"SCE_SAS_STATEMENT",15},
+	{"SCE_SAS_STRING",7},
+	{"SCE_SAS_TYPE",8},
+	{"SCE_SAS_WORD",9},
+	{"SCE_SCRIPTOL_CHARACTER",8},
+	{"SCE_SCRIPTOL_CLASSNAME",14},
+	{"SCE_SCRIPTOL_COMMENTBLOCK",5},
+	{"SCE_SCRIPTOL_COMMENTLINE",2},
+	{"SCE_SCRIPTOL_CSTYLE",4},
+	{"SCE_SCRIPTOL_DEFAULT",0},
+	{"SCE_SCRIPTOL_IDENTIFIER",12},
+	{"SCE_SCRIPTOL_KEYWORD",10},
+	{"SCE_SCRIPTOL_NUMBER",6},
+	{"SCE_SCRIPTOL_OPERATOR",11},
+	{"SCE_SCRIPTOL_PERSISTENT",3},
+	{"SCE_SCRIPTOL_PREPROCESSOR",15},
+	{"SCE_SCRIPTOL_STRING",7},
+	{"SCE_SCRIPTOL_STRINGEOL",9},
+	{"SCE_SCRIPTOL_TRIPLE",13},
+	{"SCE_SCRIPTOL_WHITE",1},
+	{"SCE_SH_BACKTICKS",11},
+	{"SCE_SH_CHARACTER",6},
+	{"SCE_SH_COMMENTLINE",2},
+	{"SCE_SH_DEFAULT",0},
+	{"SCE_SH_ERROR",1},
+	{"SCE_SH_HERE_DELIM",12},
+	{"SCE_SH_HERE_Q",13},
+	{"SCE_SH_IDENTIFIER",8},
+	{"SCE_SH_NUMBER",3},
+	{"SCE_SH_OPERATOR",7},
+	{"SCE_SH_PARAM",10},
+	{"SCE_SH_SCALAR",9},
+	{"SCE_SH_STRING",5},
+	{"SCE_SH_WORD",4},
+	{"SCE_SML_CHAR",9},
+	{"SCE_SML_COMMENT",12},
+	{"SCE_SML_COMMENT1",13},
+	{"SCE_SML_COMMENT2",14},
+	{"SCE_SML_COMMENT3",15},
+	{"SCE_SML_DEFAULT",0},
+	{"SCE_SML_IDENTIFIER",1},
+	{"SCE_SML_KEYWORD",3},
+	{"SCE_SML_KEYWORD2",4},
+	{"SCE_SML_KEYWORD3",5},
+	{"SCE_SML_LINENUM",6},
+	{"SCE_SML_NUMBER",8},
+	{"SCE_SML_OPERATOR",7},
+	{"SCE_SML_STRING",11},
+	{"SCE_SML_TAGNAME",2},
+	{"SCE_SN_CODE",1},
+	{"SCE_SN_COMMENTLINE",2},
+	{"SCE_SN_COMMENTLINEBANG",3},
+	{"SCE_SN_DEFAULT",0},
+	{"SCE_SN_IDENTIFIER",11},
+	{"SCE_SN_NUMBER",4},
+	{"SCE_SN_OPERATOR",10},
+	{"SCE_SN_PREPROCESSOR",9},
+	{"SCE_SN_REGEXTAG",13},
+	{"SCE_SN_SIGNAL",14},
+	{"SCE_SN_STRING",6},
+	{"SCE_SN_STRINGEOL",12},
+	{"SCE_SN_USER",19},
+	{"SCE_SN_WORD",5},
+	{"SCE_SN_WORD2",7},
+	{"SCE_SN_WORD3",8},
+	{"SCE_SORCUS_COMMAND",1},
+	{"SCE_SORCUS_COMMENTLINE",3},
+	{"SCE_SORCUS_CONSTANT",9},
+	{"SCE_SORCUS_DEFAULT",0},
+	{"SCE_SORCUS_IDENTIFIER",6},
+	{"SCE_SORCUS_NUMBER",8},
+	{"SCE_SORCUS_OPERATOR",7},
+	{"SCE_SORCUS_PARAMETER",2},
+	{"SCE_SORCUS_STRING",4},
+	{"SCE_SORCUS_STRINGEOL",5},
+	{"SCE_SPICE_COMMENTLINE",8},
+	{"SCE_SPICE_DEFAULT",0},
+	{"SCE_SPICE_DELIMITER",6},
+	{"SCE_SPICE_IDENTIFIER",1},
+	{"SCE_SPICE_KEYWORD",2},
+	{"SCE_SPICE_KEYWORD2",3},
+	{"SCE_SPICE_KEYWORD3",4},
+	{"SCE_SPICE_NUMBER",5},
+	{"SCE_SPICE_VALUE",7},
+	{"SCE_SQL_CHARACTER",7},
+	{"SCE_SQL_COMMENT",1},
+	{"SCE_SQL_COMMENTDOC",3},
+	{"SCE_SQL_COMMENTDOCKEYWORD",17},
+	{"SCE_SQL_COMMENTDOCKEYWORDERROR",18},
+	{"SCE_SQL_COMMENTLINE",2},
+	{"SCE_SQL_COMMENTLINEDOC",15},
+	{"SCE_SQL_DEFAULT",0},
+	{"SCE_SQL_IDENTIFIER",11},
+	{"SCE_SQL_NUMBER",4},
+	{"SCE_SQL_OPERATOR",10},
+	{"SCE_SQL_QOPERATOR",24},
+	{"SCE_SQL_QUOTEDIDENTIFIER",23},
+	{"SCE_SQL_SQLPLUS",8},
+	{"SCE_SQL_SQLPLUS_COMMENT",13},
+	{"SCE_SQL_SQLPLUS_PROMPT",9},
+	{"SCE_SQL_STRING",6},
+	{"SCE_SQL_USER1",19},
+	{"SCE_SQL_USER2",20},
+	{"SCE_SQL_USER3",21},
+	{"SCE_SQL_USER4",22},
+	{"SCE_SQL_WORD",5},
+	{"SCE_SQL_WORD2",16},
+	{"SCE_STATA_COMMENT",1},
+	{"SCE_STATA_COMMENTBLOCK",3},
+	{"SCE_STATA_COMMENTLINE",2},
+	{"SCE_STATA_DEFAULT",0},
+	{"SCE_STATA_GLOBAL_MACRO",10},
+	{"SCE_STATA_IDENTIFIER",6},
+	{"SCE_STATA_MACRO",11},
+	{"SCE_STATA_NUMBER",4},
+	{"SCE_STATA_OPERATOR",5},
+	{"SCE_STATA_STRING",7},
+	{"SCE_STATA_TYPE",8},
+	{"SCE_STATA_WORD",9},
+	{"SCE_STTXT_CHARACTER",11},
+	{"SCE_STTXT_COMMENT",1},
+	{"SCE_STTXT_COMMENTLINE",2},
+	{"SCE_STTXT_DATETIME",16},
+	{"SCE_STTXT_DEFAULT",0},
+	{"SCE_STTXT_FB",6},
+	{"SCE_STTXT_FUNCTION",5},
+	{"SCE_STTXT_HEXNUMBER",8},
+	{"SCE_STTXT_IDENTIFIER",15},
+	{"SCE_STTXT_KEYWORD",3},
+	{"SCE_STTXT_NUMBER",7},
+	{"SCE_STTXT_OPERATOR",10},
+	{"SCE_STTXT_PRAGMA",9},
+	{"SCE_STTXT_PRAGMAS",18},
+	{"SCE_STTXT_STRING1",12},
+	{"SCE_STTXT_STRING2",13},
+	{"SCE_STTXT_STRINGEOL",14},
+	{"SCE_STTXT_TYPE",4},
+	{"SCE_STTXT_VARS",17},
+	{"SCE_ST_ASSIGN",14},
+	{"SCE_ST_BINARY",5},
+	{"SCE_ST_BOOL",6},
+	{"SCE_ST_CHARACTER",15},
+	{"SCE_ST_COMMENT",3},
+	{"SCE_ST_DEFAULT",0},
+	{"SCE_ST_GLOBAL",10},
+	{"SCE_ST_KWSEND",13},
+	{"SCE_ST_NIL",9},
+	{"SCE_ST_NUMBER",2},
+	{"SCE_ST_RETURN",11},
+	{"SCE_ST_SELF",7},
+	{"SCE_ST_SPECIAL",12},
+	{"SCE_ST_SPEC_SEL",16},
+	{"SCE_ST_STRING",1},
+	{"SCE_ST_SUPER",8},
+	{"SCE_ST_SYMBOL",4},
+	{"SCE_T3_BLOCK_COMMENT",3},
+	{"SCE_T3_BRACE",20},
+	{"SCE_T3_DEFAULT",0},
+	{"SCE_T3_D_STRING",10},
+	{"SCE_T3_HTML_DEFAULT",15},
+	{"SCE_T3_HTML_STRING",16},
+	{"SCE_T3_HTML_TAG",14},
+	{"SCE_T3_IDENTIFIER",8},
+	{"SCE_T3_KEYWORD",6},
+	{"SCE_T3_LIB_DIRECTIVE",12},
+	{"SCE_T3_LINE_COMMENT",4},
+	{"SCE_T3_MSG_PARAM",13},
+	{"SCE_T3_NUMBER",7},
+	{"SCE_T3_OPERATOR",5},
+	{"SCE_T3_PREPROCESSOR",2},
+	{"SCE_T3_S_STRING",9},
+	{"SCE_T3_USER1",17},
+	{"SCE_T3_USER2",18},
+	{"SCE_T3_USER3",19},
+	{"SCE_T3_X_DEFAULT",1},
+	{"SCE_T3_X_STRING",11},
+	{"SCE_TCL_BLOCK_COMMENT",21},
+	{"SCE_TCL_COMMENT",1},
+	{"SCE_TCL_COMMENTLINE",2},
+	{"SCE_TCL_COMMENT_BOX",20},
+	{"SCE_TCL_DEFAULT",0},
+	{"SCE_TCL_EXPAND",11},
+	{"SCE_TCL_IDENTIFIER",7},
+	{"SCE_TCL_IN_QUOTE",5},
+	{"SCE_TCL_MODIFIER",10},
+	{"SCE_TCL_NUMBER",3},
+	{"SCE_TCL_OPERATOR",6},
+	{"SCE_TCL_SUBSTITUTION",8},
+	{"SCE_TCL_SUB_BRACE",9},
+	{"SCE_TCL_WORD",12},
+	{"SCE_TCL_WORD2",13},
+	{"SCE_TCL_WORD3",14},
+	{"SCE_TCL_WORD4",15},
+	{"SCE_TCL_WORD5",16},
+	{"SCE_TCL_WORD6",17},
+	{"SCE_TCL_WORD7",18},
+	{"SCE_TCL_WORD8",19},
+	{"SCE_TCL_WORD_IN_QUOTE",4},
+	{"SCE_TCMD_CLABEL",10},
+	{"SCE_TCMD_COMMAND",5},
+	{"SCE_TCMD_COMMENT",1},
+	{"SCE_TCMD_DEFAULT",0},
+	{"SCE_TCMD_ENVIRONMENT",8},
+	{"SCE_TCMD_EXPANSION",9},
+	{"SCE_TCMD_HIDE",4},
+	{"SCE_TCMD_IDENTIFIER",6},
+	{"SCE_TCMD_LABEL",3},
+	{"SCE_TCMD_OPERATOR",7},
+	{"SCE_TCMD_WORD",2},
+	{"SCE_TEX_COMMAND",4},
+	{"SCE_TEX_DEFAULT",0},
+	{"SCE_TEX_GROUP",2},
+	{"SCE_TEX_SPECIAL",1},
+	{"SCE_TEX_SYMBOL",3},
+	{"SCE_TEX_TEXT",5},
+	{"SCE_TXT2TAGS_BLOCKQUOTE",15},
+	{"SCE_TXT2TAGS_CODE",19},
+	{"SCE_TXT2TAGS_CODE2",20},
+	{"SCE_TXT2TAGS_CODEBK",21},
+	{"SCE_TXT2TAGS_COMMENT",22},
+	{"SCE_TXT2TAGS_DEFAULT",0},
+	{"SCE_TXT2TAGS_EM1",4},
+	{"SCE_TXT2TAGS_EM2",5},
+	{"SCE_TXT2TAGS_HEADER1",6},
+	{"SCE_TXT2TAGS_HEADER2",7},
+	{"SCE_TXT2TAGS_HEADER3",8},
+	{"SCE_TXT2TAGS_HEADER4",9},
+	{"SCE_TXT2TAGS_HEADER5",10},
+	{"SCE_TXT2TAGS_HEADER6",11},
+	{"SCE_TXT2TAGS_HRULE",17},
+	{"SCE_TXT2TAGS_LINE_BEGIN",1},
+	{"SCE_TXT2TAGS_LINK",18},
+	{"SCE_TXT2TAGS_OLIST_ITEM",14},
+	{"SCE_TXT2TAGS_OPTION",23},
+	{"SCE_TXT2TAGS_POSTPROC",25},
+	{"SCE_TXT2TAGS_PRECHAR",12},
+	{"SCE_TXT2TAGS_PREPROC",24},
+	{"SCE_TXT2TAGS_STRIKEOUT",16},
+	{"SCE_TXT2TAGS_STRONG1",2},
+	{"SCE_TXT2TAGS_STRONG2",3},
+	{"SCE_TXT2TAGS_ULIST_ITEM",13},
+	{"SCE_VHDL_ATTRIBUTE",10},
+	{"SCE_VHDL_BLOCK_COMMENT",15},
+	{"SCE_VHDL_COMMENT",1},
+	{"SCE_VHDL_COMMENTLINEBANG",2},
+	{"SCE_VHDL_DEFAULT",0},
+	{"SCE_VHDL_IDENTIFIER",6},
+	{"SCE_VHDL_KEYWORD",8},
+	{"SCE_VHDL_NUMBER",3},
+	{"SCE_VHDL_OPERATOR",5},
+	{"SCE_VHDL_STDFUNCTION",11},
+	{"SCE_VHDL_STDOPERATOR",9},
+	{"SCE_VHDL_STDPACKAGE",12},
+	{"SCE_VHDL_STDTYPE",13},
+	{"SCE_VHDL_STRING",4},
+	{"SCE_VHDL_STRINGEOL",7},
+	{"SCE_VHDL_USERWORD",14},
+	{"SCE_VISUALPROLOG_ANONYMOUS",10},
+	{"SCE_VISUALPROLOG_CHARACTER",13},
+	{"SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR",15},
+	{"SCE_VISUALPROLOG_CHARACTER_TOO_MANY",14},
+	{"SCE_VISUALPROLOG_COMMENT_BLOCK",4},
+	{"SCE_VISUALPROLOG_COMMENT_KEY",6},
+	{"SCE_VISUALPROLOG_COMMENT_KEY_ERROR",7},
+	{"SCE_VISUALPROLOG_COMMENT_LINE",5},
+	{"SCE_VISUALPROLOG_DEFAULT",0},
+	{"SCE_VISUALPROLOG_IDENTIFIER",8},
+	{"SCE_VISUALPROLOG_KEY_DIRECTIVE",3},
+	{"SCE_VISUALPROLOG_KEY_MAJOR",1},
+	{"SCE_VISUALPROLOG_KEY_MINOR",2},
+	{"SCE_VISUALPROLOG_NUMBER",11},
+	{"SCE_VISUALPROLOG_OPERATOR",12},
+	{"SCE_VISUALPROLOG_STRING",16},
+	{"SCE_VISUALPROLOG_STRING_EOL_OPEN",19},
+	{"SCE_VISUALPROLOG_STRING_ESCAPE",17},
+	{"SCE_VISUALPROLOG_STRING_ESCAPE_ERROR",18},
+	{"SCE_VISUALPROLOG_STRING_VERBATIM",20},
+	{"SCE_VISUALPROLOG_STRING_VERBATIM_EOL",22},
+	{"SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL",21},
+	{"SCE_VISUALPROLOG_VARIABLE",9},
+	{"SCE_V_COMMENT",1},
+	{"SCE_V_COMMENTLINE",2},
+	{"SCE_V_COMMENTLINEBANG",3},
+	{"SCE_V_COMMENT_WORD",20},
+	{"SCE_V_DEFAULT",0},
+	{"SCE_V_IDENTIFIER",11},
+	{"SCE_V_INOUT",23},
+	{"SCE_V_INPUT",21},
+	{"SCE_V_NUMBER",4},
+	{"SCE_V_OPERATOR",10},
+	{"SCE_V_OUTPUT",22},
+	{"SCE_V_PORT_CONNECT",24},
+	{"SCE_V_PREPROCESSOR",9},
+	{"SCE_V_STRING",6},
+	{"SCE_V_STRINGEOL",12},
+	{"SCE_V_USER",19},
+	{"SCE_V_WORD",5},
+	{"SCE_V_WORD2",7},
+	{"SCE_V_WORD3",8},
+	{"SCE_X12_BAD",1},
+	{"SCE_X12_DEFAULT",0},
+	{"SCE_X12_ENVELOPE",2},
+	{"SCE_X12_FUNCTIONGROUP",3},
+	{"SCE_X12_SEGMENTEND",6},
+	{"SCE_X12_SEGMENTHEADER",5},
+	{"SCE_X12_SEP_ELEMENT",7},
+	{"SCE_X12_SEP_SUBELEMENT",8},
+	{"SCE_X12_TRANSACTIONSET",4},
+	{"SCE_YAML_COMMENT",1},
+	{"SCE_YAML_DEFAULT",0},
+	{"SCE_YAML_DOCUMENT",6},
+	{"SCE_YAML_ERROR",8},
+	{"SCE_YAML_IDENTIFIER",2},
+	{"SCE_YAML_KEYWORD",3},
+	{"SCE_YAML_NUMBER",4},
+	{"SCE_YAML_OPERATOR",9},
+	{"SCE_YAML_REFERENCE",5},
+	{"SCE_YAML_TEXT",7},
+	{"SCFIND_CXX11REGEX",0x00800000},
+	{"SCFIND_MATCHCASE",0x4},
+	{"SCFIND_NONE",0x0},
+	{"SCFIND_POSIX",0x00400000},
+	{"SCFIND_REGEXP",0x00200000},
+	{"SCFIND_WHOLEWORD",0x2},
+	{"SCFIND_WORDSTART",0x00100000},
+	{"SCI_ALLOCATELINES",2089},
+	{"SCI_ANNOTATIONGETLINES",2546},
+	{"SCI_ANNOTATIONGETSTYLE",2543},
+	{"SCI_ANNOTATIONGETSTYLEOFFSET",2551},
+	{"SCI_ANNOTATIONGETSTYLES",2545},
+	{"SCI_ANNOTATIONGETTEXT",2541},
+	{"SCI_ANNOTATIONGETVISIBLE",2549},
+	{"SCI_ANNOTATIONSETSTYLE",2542},
+	{"SCI_ANNOTATIONSETSTYLEOFFSET",2550},
+	{"SCI_ANNOTATIONSETSTYLES",2544},
+	{"SCI_ANNOTATIONSETTEXT",2540},
+	{"SCI_ANNOTATIONSETVISIBLE",2548},
+	{"SCI_AUTOCGETAUTOHIDE",2119},
+	{"SCI_AUTOCGETCANCELATSTART",2111},
+	{"SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR",2635},
+	{"SCI_AUTOCGETCHOOSESINGLE",2114},
+	{"SCI_AUTOCGETCURRENT",2445},
+	{"SCI_AUTOCGETCURRENTTEXT",2610},
+	{"SCI_AUTOCGETDROPRESTOFWORD",2271},
+	{"SCI_AUTOCGETIGNORECASE",2116},
+	{"SCI_AUTOCGETMAXHEIGHT",2211},
+	{"SCI_AUTOCGETMAXWIDTH",2209},
+	{"SCI_AUTOCGETMULTI",2637},
+	{"SCI_AUTOCGETOPTIONS",2639},
+	{"SCI_AUTOCGETORDER",2661},
+	{"SCI_AUTOCGETSEPARATOR",2107},
+	{"SCI_AUTOCGETTYPESEPARATOR",2285},
+	{"SCI_AUTOCSETAUTOHIDE",2118},
+	{"SCI_AUTOCSETCANCELATSTART",2110},
+	{"SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR",2634},
+	{"SCI_AUTOCSETCHOOSESINGLE",2113},
+	{"SCI_AUTOCSETDROPRESTOFWORD",2270},
+	{"SCI_AUTOCSETFILLUPS",2112},
+	{"SCI_AUTOCSETIGNORECASE",2115},
+	{"SCI_AUTOCSETMAXHEIGHT",2210},
+	{"SCI_AUTOCSETMAXWIDTH",2208},
+	{"SCI_AUTOCSETMULTI",2636},
+	{"SCI_AUTOCSETOPTIONS",2638},
+	{"SCI_AUTOCSETORDER",2660},
+	{"SCI_AUTOCSETSEPARATOR",2106},
+	{"SCI_AUTOCSETTYPESEPARATOR",2286},
+	{"SCI_CALLTIPSETBACK",2205},
+	{"SCI_CALLTIPSETFORE",2206},
+	{"SCI_CALLTIPSETFOREHLT",2207},
+	{"SCI_CALLTIPSETPOSITION",2213},
+	{"SCI_CALLTIPSETPOSSTART",2214},
+	{"SCI_CALLTIPUSESTYLE",2212},
+	{"SCI_DISTANCETOSECONDARYSTYLES",4025},
+	{"SCI_EOLANNOTATIONGETSTYLE",2743},
+	{"SCI_EOLANNOTATIONGETSTYLEOFFSET",2748},
+	{"SCI_EOLANNOTATIONGETTEXT",2741},
+	{"SCI_EOLANNOTATIONGETVISIBLE",2746},
+	{"SCI_EOLANNOTATIONSETSTYLE",2742},
+	{"SCI_EOLANNOTATIONSETSTYLEOFFSET",2747},
+	{"SCI_EOLANNOTATIONSETTEXT",2740},
+	{"SCI_EOLANNOTATIONSETVISIBLE",2745},
+	{"SCI_FOLDDISPLAYTEXTGETSTYLE",2707},
+	{"SCI_FOLDDISPLAYTEXTSETSTYLE",2701},
+	{"SCI_GETACCESSIBILITY",2703},
+	{"SCI_GETADDITIONALCARETFORE",2605},
+	{"SCI_GETADDITIONALCARETSBLINK",2568},
+	{"SCI_GETADDITIONALCARETSVISIBLE",2609},
+	{"SCI_GETADDITIONALSELALPHA",2603},
+	{"SCI_GETADDITIONALSELECTIONTYPING",2566},
+	{"SCI_GETALLLINESVISIBLE",2236},
+	{"SCI_GETANCHOR",2009},
+	{"SCI_GETAUTOMATICFOLD",2664},
+	{"SCI_GETBACKSPACEUNINDENTS",2263},
+	{"SCI_GETBIDIRECTIONAL",2708},
+	{"SCI_GETBUFFEREDDRAW",2034},
+	{"SCI_GETCARETFORE",2138},
+	{"SCI_GETCARETLINEBACK",2097},
+	{"SCI_GETCARETLINEBACKALPHA",2471},
+	{"SCI_GETCARETLINEFRAME",2704},
+	{"SCI_GETCARETLINELAYER",2764},
+	{"SCI_GETCARETLINEVISIBLE",2095},
+	{"SCI_GETCARETLINEVISIBLEALWAYS",2654},
+	{"SCI_GETCARETPERIOD",2075},
+	{"SCI_GETCARETSTICKY",2457},
+	{"SCI_GETCARETSTYLE",2513},
+	{"SCI_GETCARETWIDTH",2189},
+	{"SCI_GETCHARACTERCATEGORYOPTIMIZATION",2721},
+	{"SCI_GETCHARACTERPOINTER",2520},
+	{"SCI_GETCHARAT",2007},
+	{"SCI_GETCODEPAGE",2137},
+	{"SCI_GETCOLUMN",2129},
+	{"SCI_GETCOMMANDEVENTS",2718},
+	{"SCI_GETCONTROLCHARSYMBOL",2389},
+	{"SCI_GETCURRENTPOS",2008},
+	{"SCI_GETCURSOR",2387},
+	{"SCI_GETDIRECTFUNCTION",2184},
+	{"SCI_GETDIRECTPOINTER",2185},
+	{"SCI_GETDIRECTSTATUSFUNCTION",2772},
+	{"SCI_GETDOCPOINTER",2357},
+	{"SCI_GETDOCUMENTOPTIONS",2379},
+	{"SCI_GETEDGECOLOUR",2364},
+	{"SCI_GETEDGECOLUMN",2360},
+	{"SCI_GETEDGEMODE",2362},
+	{"SCI_GETENDATLASTLINE",2278},
+	{"SCI_GETENDSTYLED",2028},
+	{"SCI_GETEOLMODE",2030},
+	{"SCI_GETEXTRAASCENT",2526},
+	{"SCI_GETEXTRADESCENT",2528},
+	{"SCI_GETFIRSTVISIBLELINE",2152},
+	{"SCI_GETFOCUS",2381},
+	{"SCI_GETFOLDEXPANDED",2230},
+	{"SCI_GETFOLDLEVEL",2223},
+	{"SCI_GETFOLDPARENT",2225},
+	{"SCI_GETFONTLOCALE",2761},
+	{"SCI_GETFONTQUALITY",2612},
+	{"SCI_GETGAPPOSITION",2644},
+	{"SCI_GETHIGHLIGHTGUIDE",2135},
+	{"SCI_GETHOTSPOTACTIVEUNDERLINE",2496},
+	{"SCI_GETHOTSPOTSINGLELINE",2497},
+	{"SCI_GETHSCROLLBAR",2131},
+	{"SCI_GETIDENTIFIER",2623},
+	{"SCI_GETIDLESTYLING",2693},
+	{"SCI_GETIMEINTERACTION",2678},
+	{"SCI_GETINDENT",2123},
+	{"SCI_GETINDENTATIONGUIDES",2133},
+	{"SCI_GETINDICATORCURRENT",2501},
+	{"SCI_GETINDICATORVALUE",2503},
+	{"SCI_GETLAYOUTCACHE",2273},
+	{"SCI_GETLENGTH",2006},
+	{"SCI_GETLEXER",4002},
+	{"SCI_GETLEXERLANGUAGE",4012},
+	{"SCI_GETLINECHARACTERINDEX",2710},
+	{"SCI_GETLINECOUNT",2154},
+	{"SCI_GETLINEENDPOSITION",2136},
+	{"SCI_GETLINEENDTYPESACTIVE",2658},
+	{"SCI_GETLINEENDTYPESALLOWED",2657},
+	{"SCI_GETLINEENDTYPESSUPPORTED",4018},
+	{"SCI_GETLINEINDENTATION",2127},
+	{"SCI_GETLINEINDENTPOSITION",2128},
+	{"SCI_GETLINESTATE",2093},
+	{"SCI_GETLINEVISIBLE",2228},
+	{"SCI_GETMAINSELECTION",2575},
+	{"SCI_GETMARGINBACKN",2251},
+	{"SCI_GETMARGINCURSORN",2249},
+	{"SCI_GETMARGINLEFT",2156},
+	{"SCI_GETMARGINMASKN",2245},
+	{"SCI_GETMARGINOPTIONS",2557},
+	{"SCI_GETMARGINRIGHT",2158},
+	{"SCI_GETMARGINS",2253},
+	{"SCI_GETMARGINSENSITIVEN",2247},
+	{"SCI_GETMARGINTYPEN",2241},
+	{"SCI_GETMARGINWIDTHN",2243},
+	{"SCI_GETMAXLINESTATE",2094},
+	{"SCI_GETMODEVENTMASK",2378},
+	{"SCI_GETMODIFY",2159},
+	{"SCI_GETMOUSEDOWNCAPTURES",2385},
+	{"SCI_GETMOUSEDWELLTIME",2265},
+	{"SCI_GETMOUSESELECTIONRECTANGULARSWITCH",2669},
+	{"SCI_GETMOUSEWHEELCAPTURES",2697},
+	{"SCI_GETMOVEEXTENDSSELECTION",2706},
+	{"SCI_GETMULTIEDGECOLUMN",2749},
+	{"SCI_GETMULTIPASTE",2615},
+	{"SCI_GETMULTIPLESELECTION",2564},
+	{"SCI_GETNAMEDSTYLES",4029},
+	{"SCI_GETOVERTYPE",2187},
+	{"SCI_GETPASTECONVERTENDINGS",2468},
+	{"SCI_GETPHASESDRAW",2673},
+	{"SCI_GETPOSITIONCACHE",2515},
+	{"SCI_GETPRIMARYSTYLEFROMSTYLE",4028},
+	{"SCI_GETPRINTCOLOURMODE",2149},
+	{"SCI_GETPRINTMAGNIFICATION",2147},
+	{"SCI_GETPRINTWRAPMODE",2407},
+	{"SCI_GETPROPERTY",4008},
+	{"SCI_GETPROPERTYEXPANDED",4009},
+	{"SCI_GETPUNCTUATIONCHARS",2649},
+	{"SCI_GETREADONLY",2140},
+	{"SCI_GETRECTANGULARSELECTIONANCHOR",2591},
+	{"SCI_GETRECTANGULARSELECTIONANCHORVIRTUALSPACE",2595},
+	{"SCI_GETRECTANGULARSELECTIONCARET",2589},
+	{"SCI_GETRECTANGULARSELECTIONCARETVIRTUALSPACE",2593},
+	{"SCI_GETRECTANGULARSELECTIONMODIFIER",2599},
+	{"SCI_GETREPRESENTATION",2666},
+	{"SCI_GETREPRESENTATIONAPPEARANCE",2767},
+	{"SCI_GETREPRESENTATIONCOLOUR",2769},
+	{"SCI_GETSCROLLWIDTH",2275},
+	{"SCI_GETSCROLLWIDTHTRACKING",2517},
+	{"SCI_GETSEARCHFLAGS",2199},
+	{"SCI_GETSELALPHA",2477},
+	{"SCI_GETSELECTIONEMPTY",2650},
+	{"SCI_GETSELECTIONEND",2145},
+	{"SCI_GETSELECTIONLAYER",2762},
+	{"SCI_GETSELECTIONMODE",2423},
+	{"SCI_GETSELECTIONNANCHOR",2579},
+	{"SCI_GETSELECTIONNANCHORVIRTUALSPACE",2583},
+	{"SCI_GETSELECTIONNCARET",2577},
+	{"SCI_GETSELECTIONNCARETVIRTUALSPACE",2581},
+	{"SCI_GETSELECTIONNEND",2587},
+	{"SCI_GETSELECTIONNENDVIRTUALSPACE",2727},
+	{"SCI_GETSELECTIONNSTART",2585},
+	{"SCI_GETSELECTIONNSTARTVIRTUALSPACE",2726},
+	{"SCI_GETSELECTIONS",2570},
+	{"SCI_GETSELECTIONSTART",2143},
+	{"SCI_GETSELEOLFILLED",2479},
+	{"SCI_GETSTATUS",2383},
+	{"SCI_GETSTYLEAT",2010},
+	{"SCI_GETSTYLEFROMSUBSTYLE",4027},
+	{"SCI_GETSUBSTYLEBASES",4026},
+	{"SCI_GETSUBSTYLESLENGTH",4022},
+	{"SCI_GETSUBSTYLESSTART",4021},
+	{"SCI_GETTABDRAWMODE",2698},
+	{"SCI_GETTABINDENTS",2261},
+	{"SCI_GETTABMINIMUMWIDTH",2725},
+	{"SCI_GETTABWIDTH",2121},
+	{"SCI_GETTAG",2616},
+	{"SCI_GETTARGETEND",2193},
+	{"SCI_GETTARGETENDVIRTUALSPACE",2731},
+	{"SCI_GETTARGETSTART",2191},
+	{"SCI_GETTARGETSTARTVIRTUALSPACE",2729},
+	{"SCI_GETTARGETTEXT",2687},
+	{"SCI_GETTECHNOLOGY",2631},
+	{"SCI_GETTEXTLENGTH",2183},
+	{"SCI_GETUNDOCOLLECTION",2019},
+	{"SCI_GETUSETABS",2125},
+	{"SCI_GETVIEWEOL",2355},
+	{"SCI_GETVIEWWS",2020},
+	{"SCI_GETVIRTUALSPACEOPTIONS",2597},
+	{"SCI_GETVSCROLLBAR",2281},
+	{"SCI_GETWHITESPACECHARS",2647},
+	{"SCI_GETWHITESPACESIZE",2087},
+	{"SCI_GETWORDCHARS",2646},
+	{"SCI_GETWRAPINDENTMODE",2473},
+	{"SCI_GETWRAPMODE",2269},
+	{"SCI_GETWRAPSTARTINDENT",2465},
+	{"SCI_GETWRAPVISUALFLAGS",2461},
+	{"SCI_GETWRAPVISUALFLAGSLOCATION",2463},
+	{"SCI_GETXOFFSET",2398},
+	{"SCI_GETZOOM",2374},
+	{"SCI_INDICGETALPHA",2524},
+	{"SCI_INDICGETFLAGS",2685},
+	{"SCI_INDICGETFORE",2083},
+	{"SCI_INDICGETHOVERFORE",2683},
+	{"SCI_INDICGETHOVERSTYLE",2681},
+	{"SCI_INDICGETOUTLINEALPHA",2559},
+	{"SCI_INDICGETSTROKEWIDTH",2752},
+	{"SCI_INDICGETSTYLE",2081},
+	{"SCI_INDICGETUNDER",2511},
+	{"SCI_INDICSETALPHA",2523},
+	{"SCI_INDICSETFLAGS",2684},
+	{"SCI_INDICSETFORE",2082},
+	{"SCI_INDICSETHOVERFORE",2682},
+	{"SCI_INDICSETHOVERSTYLE",2680},
+	{"SCI_INDICSETOUTLINEALPHA",2558},
+	{"SCI_INDICSETSTROKEWIDTH",2751},
+	{"SCI_INDICSETSTYLE",2080},
+	{"SCI_INDICSETUNDER",2510},
+	{"SCI_LEXER_START",4000},
+	{"SCI_LINESONSCREEN",2370},
+	{"SCI_MARGINGETSTYLE",2533},
+	{"SCI_MARGINGETSTYLEOFFSET",2538},
+	{"SCI_MARGINGETSTYLES",2535},
+	{"SCI_MARGINGETTEXT",2531},
+	{"SCI_MARGINSETSTYLE",2532},
+	{"SCI_MARGINSETSTYLEOFFSET",2537},
+	{"SCI_MARGINSETSTYLES",2534},
+	{"SCI_MARGINSETTEXT",2530},
+	{"SCI_MARKERGETLAYER",2734},
+	{"SCI_MARKERSETALPHA",2476},
+	{"SCI_MARKERSETBACK",2042},
+	{"SCI_MARKERSETBACKSELECTED",2292},
+	{"SCI_MARKERSETBACKSELECTEDTRANSLUCENT",2296},
+	{"SCI_MARKERSETBACKTRANSLUCENT",2295},
+	{"SCI_MARKERSETFORE",2041},
+	{"SCI_MARKERSETFORETRANSLUCENT",2294},
+	{"SCI_MARKERSETLAYER",2735},
+	{"SCI_MARKERSETSTROKEWIDTH",2297},
+	{"SCI_OPTIONAL_START",3000},
+	{"SCI_RGBAIMAGESETHEIGHT",2625},
+	{"SCI_RGBAIMAGESETSCALE",2651},
+	{"SCI_RGBAIMAGESETWIDTH",2624},
+	{"SCI_SELECTIONISRECTANGLE",2372},
+	{"SCI_SETACCESSIBILITY",2702},
+	{"SCI_SETADDITIONALCARETFORE",2604},
+	{"SCI_SETADDITIONALCARETSBLINK",2567},
+	{"SCI_SETADDITIONALCARETSVISIBLE",2608},
+	{"SCI_SETADDITIONALSELALPHA",2602},
+	{"SCI_SETADDITIONALSELBACK",2601},
+	{"SCI_SETADDITIONALSELECTIONTYPING",2565},
+	{"SCI_SETADDITIONALSELFORE",2600},
+	{"SCI_SETANCHOR",2026},
+	{"SCI_SETAUTOMATICFOLD",2663},
+	{"SCI_SETBACKSPACEUNINDENTS",2262},
+	{"SCI_SETBIDIRECTIONAL",2709},
+	{"SCI_SETBUFFEREDDRAW",2035},
+	{"SCI_SETCARETFORE",2069},
+	{"SCI_SETCARETLINEBACK",2098},
+	{"SCI_SETCARETLINEBACKALPHA",2470},
+	{"SCI_SETCARETLINEFRAME",2705},
+	{"SCI_SETCARETLINELAYER",2765},
+	{"SCI_SETCARETLINEVISIBLE",2096},
+	{"SCI_SETCARETLINEVISIBLEALWAYS",2655},
+	{"SCI_SETCARETPERIOD",2076},
+	{"SCI_SETCARETSTICKY",2458},
+	{"SCI_SETCARETSTYLE",2512},
+	{"SCI_SETCARETWIDTH",2188},
+	{"SCI_SETCHARACTERCATEGORYOPTIMIZATION",2720},
+	{"SCI_SETCODEPAGE",2037},
+	{"SCI_SETCOMMANDEVENTS",2717},
+	{"SCI_SETCONTROLCHARSYMBOL",2388},
+	{"SCI_SETCURRENTPOS",2141},
+	{"SCI_SETCURSOR",2386},
+	{"SCI_SETDOCPOINTER",2358},
+	{"SCI_SETEDGECOLOUR",2365},
+	{"SCI_SETEDGECOLUMN",2361},
+	{"SCI_SETEDGEMODE",2363},
+	{"SCI_SETENDATLASTLINE",2277},
+	{"SCI_SETEOLMODE",2031},
+	{"SCI_SETEXTRAASCENT",2525},
+	{"SCI_SETEXTRADESCENT",2527},
+	{"SCI_SETFIRSTVISIBLELINE",2613},
+	{"SCI_SETFOCUS",2380},
+	{"SCI_SETFOLDEXPANDED",2229},
+	{"SCI_SETFOLDFLAGS",2233},
+	{"SCI_SETFOLDLEVEL",2222},
+	{"SCI_SETFONTLOCALE",2760},
+	{"SCI_SETFONTQUALITY",2611},
+	{"SCI_SETHIGHLIGHTGUIDE",2134},
+	{"SCI_SETHOTSPOTACTIVEUNDERLINE",2412},
+	{"SCI_SETHOTSPOTSINGLELINE",2421},
+	{"SCI_SETHSCROLLBAR",2130},
+	{"SCI_SETIDENTIFIER",2622},
+	{"SCI_SETIDENTIFIERS",4024},
+	{"SCI_SETIDLESTYLING",2692},
+	{"SCI_SETILEXER",4033},
+	{"SCI_SETIMEINTERACTION",2679},
+	{"SCI_SETINDENT",2122},
+	{"SCI_SETINDENTATIONGUIDES",2132},
+	{"SCI_SETINDICATORCURRENT",2500},
+	{"SCI_SETINDICATORVALUE",2502},
+	{"SCI_SETKEYWORDS",4005},
+	{"SCI_SETLAYOUTCACHE",2272},
+	{"SCI_SETLINEENDTYPESALLOWED",2656},
+	{"SCI_SETLINEINDENTATION",2126},
+	{"SCI_SETLINESTATE",2092},
+	{"SCI_SETMAINSELECTION",2574},
+	{"SCI_SETMARGINBACKN",2250},
+	{"SCI_SETMARGINCURSORN",2248},
+	{"SCI_SETMARGINLEFT",2155},
+	{"SCI_SETMARGINMASKN",2244},
+	{"SCI_SETMARGINOPTIONS",2539},
+	{"SCI_SETMARGINRIGHT",2157},
+	{"SCI_SETMARGINS",2252},
+	{"SCI_SETMARGINSENSITIVEN",2246},
+	{"SCI_SETMARGINTYPEN",2240},
+	{"SCI_SETMARGINWIDTHN",2242},
+	{"SCI_SETMODEVENTMASK",2359},
+	{"SCI_SETMOUSEDOWNCAPTURES",2384},
+	{"SCI_SETMOUSEDWELLTIME",2264},
+	{"SCI_SETMOUSESELECTIONRECTANGULARSWITCH",2668},
+	{"SCI_SETMOUSEWHEELCAPTURES",2696},
+	{"SCI_SETMULTIPASTE",2614},
+	{"SCI_SETMULTIPLESELECTION",2563},
+	{"SCI_SETOVERTYPE",2186},
+	{"SCI_SETPASTECONVERTENDINGS",2467},
+	{"SCI_SETPHASESDRAW",2674},
+	{"SCI_SETPOSITIONCACHE",2514},
+	{"SCI_SETPRINTCOLOURMODE",2148},
+	{"SCI_SETPRINTMAGNIFICATION",2146},
+	{"SCI_SETPRINTWRAPMODE",2406},
+	{"SCI_SETPROPERTY",4004},
+	{"SCI_SETPUNCTUATIONCHARS",2648},
+	{"SCI_SETREADONLY",2171},
+	{"SCI_SETRECTANGULARSELECTIONANCHOR",2590},
+	{"SCI_SETRECTANGULARSELECTIONANCHORVIRTUALSPACE",2594},
+	{"SCI_SETRECTANGULARSELECTIONCARET",2588},
+	{"SCI_SETRECTANGULARSELECTIONCARETVIRTUALSPACE",2592},
+	{"SCI_SETRECTANGULARSELECTIONMODIFIER",2598},
+	{"SCI_SETREPRESENTATION",2665},
+	{"SCI_SETREPRESENTATIONAPPEARANCE",2766},
+	{"SCI_SETREPRESENTATIONCOLOUR",2768},
+	{"SCI_SETSCROLLWIDTH",2274},
+	{"SCI_SETSCROLLWIDTHTRACKING",2516},
+	{"SCI_SETSEARCHFLAGS",2198},
+	{"SCI_SETSELALPHA",2478},
+	{"SCI_SETSELECTIONEND",2144},
+	{"SCI_SETSELECTIONLAYER",2763},
+	{"SCI_SETSELECTIONMODE",2422},
+	{"SCI_SETSELECTIONNANCHOR",2578},
+	{"SCI_SETSELECTIONNANCHORVIRTUALSPACE",2582},
+	{"SCI_SETSELECTIONNCARET",2576},
+	{"SCI_SETSELECTIONNCARETVIRTUALSPACE",2580},
+	{"SCI_SETSELECTIONNEND",2586},
+	{"SCI_SETSELECTIONNSTART",2584},
+	{"SCI_SETSELECTIONSTART",2142},
+	{"SCI_SETSELEOLFILLED",2480},
+	{"SCI_SETSTATUS",2382},
+	{"SCI_SETTABDRAWMODE",2699},
+	{"SCI_SETTABINDENTS",2260},
+	{"SCI_SETTABMINIMUMWIDTH",2724},
+	{"SCI_SETTABWIDTH",2036},
+	{"SCI_SETTARGETEND",2192},
+	{"SCI_SETTARGETENDVIRTUALSPACE",2730},
+	{"SCI_SETTARGETSTART",2190},
+	{"SCI_SETTARGETSTARTVIRTUALSPACE",2728},
+	{"SCI_SETTECHNOLOGY",2630},
+	{"SCI_SETUNDOCOLLECTION",2012},
+	{"SCI_SETUSETABS",2124},
+	{"SCI_SETVIEWEOL",2356},
+	{"SCI_SETVIEWWS",2021},
+	{"SCI_SETVIRTUALSPACEOPTIONS",2596},
+	{"SCI_SETVSCROLLBAR",2280},
+	{"SCI_SETWHITESPACECHARS",2443},
+	{"SCI_SETWHITESPACESIZE",2086},
+	{"SCI_SETWORDCHARS",2077},
+	{"SCI_SETWRAPINDENTMODE",2472},
+	{"SCI_SETWRAPMODE",2268},
+	{"SCI_SETWRAPSTARTINDENT",2464},
+	{"SCI_SETWRAPVISUALFLAGS",2460},
+	{"SCI_SETWRAPVISUALFLAGSLOCATION",2462},
+	{"SCI_SETXOFFSET",2397},
+	{"SCI_SETZOOM",2373},
+	{"SCI_START",2000},
+	{"SCI_STYLEGETBACK",2482},
+	{"SCI_STYLEGETBOLD",2483},
+	{"SCI_STYLEGETCASE",2489},
+	{"SCI_STYLEGETCHANGEABLE",2492},
+	{"SCI_STYLEGETCHARACTERSET",2490},
+	{"SCI_STYLEGETEOLFILLED",2487},
+	{"SCI_STYLEGETFONT",2486},
+	{"SCI_STYLEGETFORE",2481},
+	{"SCI_STYLEGETHOTSPOT",2493},
+	{"SCI_STYLEGETITALIC",2484},
+	{"SCI_STYLEGETSIZE",2485},
+	{"SCI_STYLEGETSIZEFRACTIONAL",2062},
+	{"SCI_STYLEGETUNDERLINE",2488},
+	{"SCI_STYLEGETVISIBLE",2491},
+	{"SCI_STYLEGETWEIGHT",2064},
+	{"SCI_STYLESETBACK",2052},
+	{"SCI_STYLESETBOLD",2053},
+	{"SCI_STYLESETCASE",2060},
+	{"SCI_STYLESETCHANGEABLE",2099},
+	{"SCI_STYLESETCHARACTERSET",2066},
+	{"SCI_STYLESETEOLFILLED",2057},
+	{"SCI_STYLESETFONT",2056},
+	{"SCI_STYLESETFORE",2051},
+	{"SCI_STYLESETHOTSPOT",2409},
+	{"SCI_STYLESETITALIC",2054},
+	{"SCI_STYLESETSIZE",2055},
+	{"SCI_STYLESETSIZEFRACTIONAL",2061},
+	{"SCI_STYLESETUNDERLINE",2059},
+	{"SCI_STYLESETVISIBLE",2074},
+	{"SCI_STYLESETWEIGHT",2063},
+	{"SCK_ADD",310},
+	{"SCK_BACK",8},
+	{"SCK_DELETE",308},
+	{"SCK_DIVIDE",312},
+	{"SCK_DOWN",300},
+	{"SCK_END",305},
+	{"SCK_ESCAPE",7},
+	{"SCK_HOME",304},
+	{"SCK_INSERT",309},
+	{"SCK_LEFT",302},
+	{"SCK_MENU",315},
+	{"SCK_NEXT",307},
+	{"SCK_PRIOR",306},
+	{"SCK_RETURN",13},
+	{"SCK_RIGHT",303},
+	{"SCK_RWIN",314},
+	{"SCK_SUBTRACT",311},
+	{"SCK_TAB",9},
+	{"SCK_UP",301},
+	{"SCK_WIN",313},
+	{"SCLEX_A68K",100},
+	{"SCLEX_ABAQUS",84},
+	{"SCLEX_ADA",20},
+	{"SCLEX_APDL",61},
+	{"SCLEX_AS",113},
+	{"SCLEX_ASM",34},
+	{"SCLEX_ASN1",63},
+	{"SCLEX_ASYMPTOTE",85},
+	{"SCLEX_AU3",60},
+	{"SCLEX_AUTOMATIC",1000},
+	{"SCLEX_AVE",19},
+	{"SCLEX_AVS",104},
+	{"SCLEX_BAAN",31},
+	{"SCLEX_BASH",62},
+	{"SCLEX_BATCH",12},
+	{"SCLEX_BIBTEX",116},
+	{"SCLEX_BLITZBASIC",66},
+	{"SCLEX_BULLANT",27},
+	{"SCLEX_CAML",65},
+	{"SCLEX_CIL",127},
+	{"SCLEX_CLW",45},
+	{"SCLEX_CLWNOCASE",46},
+	{"SCLEX_CMAKE",80},
+	{"SCLEX_COBOL",92},
+	{"SCLEX_COFFEESCRIPT",102},
+	{"SCLEX_CONF",17},
+	{"SCLEX_CONTAINER",0},
+	{"SCLEX_CPP",3},
+	{"SCLEX_CPPNOCASE",35},
+	{"SCLEX_CSOUND",74},
+	{"SCLEX_CSS",38},
+	{"SCLEX_D",79},
+	{"SCLEX_DATAFLEX",129},
+	{"SCLEX_DIFF",16},
+	{"SCLEX_DMAP",112},
+	{"SCLEX_DMIS",114},
+	{"SCLEX_ECL",105},
+	{"SCLEX_EDIFACT",121},
+	{"SCLEX_EIFFEL",23},
+	{"SCLEX_EIFFELKW",24},
+	{"SCLEX_ERLANG",53},
+	{"SCLEX_ERRORLIST",10},
+	{"SCLEX_ESCRIPT",41},
+	{"SCLEX_F77",37},
+	{"SCLEX_FLAGSHIP",73},
+	{"SCLEX_FORTH",52},
+	{"SCLEX_FORTRAN",36},
+	{"SCLEX_FREEBASIC",75},
+	{"SCLEX_FSHARP",132},
+	{"SCLEX_GAP",81},
+	{"SCLEX_GUI4CLI",58},
+	{"SCLEX_HASKELL",68},
+	{"SCLEX_HOLLYWOOD",130},
+	{"SCLEX_HTML",4},
+	{"SCLEX_IHEX",118},
+	{"SCLEX_INDENT",122},
+	{"SCLEX_INNOSETUP",76},
+	{"SCLEX_JSON",120},
+	{"SCLEX_JULIA",133},
+	{"SCLEX_KIX",57},
+	{"SCLEX_KVIRC",110},
+	{"SCLEX_LATEX",14},
+	{"SCLEX_LISP",21},
+	{"SCLEX_LITERATEHASKELL",108},
+	{"SCLEX_LOT",47},
+	{"SCLEX_LOUT",40},
+	{"SCLEX_LUA",15},
+	{"SCLEX_MAGIK",87},
+	{"SCLEX_MAKEFILE",11},
+	{"SCLEX_MARKDOWN",98},
+	{"SCLEX_MATLAB",32},
+	{"SCLEX_MAXIMA",123},
+	{"SCLEX_METAPOST",50},
+	{"SCLEX_MMIXAL",44},
+	{"SCLEX_MODULA",101},
+	{"SCLEX_MSSQL",55},
+	{"SCLEX_MYSQL",89},
+	{"SCLEX_NIM",126},
+	{"SCLEX_NIMROD",96},
+	{"SCLEX_NNCRONTAB",26},
+	{"SCLEX_NSIS",43},
+	{"SCLEX_NULL",1},
+	{"SCLEX_OCTAVE",54},
+	{"SCLEX_OPAL",77},
+	{"SCLEX_OSCRIPT",106},
+	{"SCLEX_PASCAL",18},
+	{"SCLEX_PERL",6},
+	{"SCLEX_PHPSCRIPT",69},
+	{"SCLEX_PLM",82},
+	{"SCLEX_PO",90},
+	{"SCLEX_POV",39},
+	{"SCLEX_POWERBASIC",51},
+	{"SCLEX_POWERPRO",95},
+	{"SCLEX_POWERSHELL",88},
+	{"SCLEX_PROGRESS",83},
+	{"SCLEX_PROPERTIES",9},
+	{"SCLEX_PS",42},
+	{"SCLEX_PUREBASIC",67},
+	{"SCLEX_PYTHON",2},
+	{"SCLEX_R",86},
+	{"SCLEX_RAKU",131},
+	{"SCLEX_REBOL",71},
+	{"SCLEX_REGISTRY",115},
+	{"SCLEX_RUBY",22},
+	{"SCLEX_RUST",111},
+	{"SCLEX_SAS",125},
+	{"SCLEX_SCRIPTOL",33},
+	{"SCLEX_SMALLTALK",72},
+	{"SCLEX_SML",97},
+	{"SCLEX_SORCUS",94},
+	{"SCLEX_SPECMAN",59},
+	{"SCLEX_SPICE",78},
+	{"SCLEX_SQL",7},
+	{"SCLEX_SREC",117},
+	{"SCLEX_STATA",124},
+	{"SCLEX_STTXT",109},
+	{"SCLEX_TACL",93},
+	{"SCLEX_TADS3",70},
+	{"SCLEX_TAL",91},
+	{"SCLEX_TCL",25},
+	{"SCLEX_TCMD",103},
+	{"SCLEX_TEHEX",119},
+	{"SCLEX_TEX",49},
+	{"SCLEX_TXT2TAGS",99},
+	{"SCLEX_VB",8},
+	{"SCLEX_VBSCRIPT",28},
+	{"SCLEX_VERILOG",56},
+	{"SCLEX_VHDL",64},
+	{"SCLEX_VISUALPROLOG",107},
+	{"SCLEX_X12",128},
+	{"SCLEX_XCODE",13},
+	{"SCLEX_XML",5},
+	{"SCLEX_YAML",48},
+	{"SCMOD_ALT",4},
+	{"SCMOD_CTRL",2},
+	{"SCMOD_META",16},
+	{"SCMOD_NORM",0},
+	{"SCMOD_SHIFT",1},
+	{"SCMOD_SUPER",8},
+	{"SCTD_LONGARROW",0},
+	{"SCTD_STRIKEOUT",1},
+	{"SCVS_NONE",0},
+	{"SCVS_NOWRAPLINESTART",4},
+	{"SCVS_RECTANGULARSELECTION",1},
+	{"SCVS_USERACCESSIBLE",2},
+	{"SCWS_INVISIBLE",0},
+	{"SCWS_VISIBLEAFTERINDENT",2},
+	{"SCWS_VISIBLEALWAYS",1},
+	{"SCWS_VISIBLEONLYININDENT",3},
+	{"SC_ACCESSIBILITY_DISABLED",0},
+	{"SC_ACCESSIBILITY_ENABLED",1},
+	{"SC_AC_COMMAND",5},
+	{"SC_AC_DOUBLECLICK",2},
+	{"SC_AC_FILLUP",1},
+	{"SC_AC_NEWLINE",4},
+	{"SC_AC_TAB",3},
+	{"SC_ALPHA_NOALPHA",256},
+	{"SC_ALPHA_OPAQUE",255},
+	{"SC_ALPHA_TRANSPARENT",0},
+	{"SC_AUTOCOMPLETE_FIXED_SIZE",1},
+	{"SC_AUTOCOMPLETE_NORMAL",0},
+	{"SC_AUTOMATICFOLD_CHANGE",0x0004},
+	{"SC_AUTOMATICFOLD_CLICK",0x0002},
+	{"SC_AUTOMATICFOLD_NONE",0x0000},
+	{"SC_AUTOMATICFOLD_SHOW",0x0001},
+	{"SC_BIDIRECTIONAL_DISABLED",0},
+	{"SC_BIDIRECTIONAL_L2R",1},
+	{"SC_BIDIRECTIONAL_R2L",2},
+	{"SC_CACHE_CARET",1},
+	{"SC_CACHE_DOCUMENT",3},
+	{"SC_CACHE_NONE",0},
+	{"SC_CACHE_PAGE",2},
+	{"SC_CARETSTICKY_OFF",0},
+	{"SC_CARETSTICKY_ON",1},
+	{"SC_CARETSTICKY_WHITESPACE",2},
+	{"SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE",1},
+	{"SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE",0},
+	{"SC_CASE_CAMEL",3},
+	{"SC_CASE_LOWER",2},
+	{"SC_CASE_MIXED",0},
+	{"SC_CASE_UPPER",1},
+	{"SC_CHARACTERSOURCE_DIRECT_INPUT",0},
+	{"SC_CHARACTERSOURCE_IME_RESULT",2},
+	{"SC_CHARACTERSOURCE_TENTATIVE_INPUT",1},
+	{"SC_CHARSET_8859_15",1000},
+	{"SC_CHARSET_ANSI",0},
+	{"SC_CHARSET_ARABIC",178},
+	{"SC_CHARSET_BALTIC",186},
+	{"SC_CHARSET_CHINESEBIG5",136},
+	{"SC_CHARSET_CYRILLIC",1251},
+	{"SC_CHARSET_DEFAULT",1},
+	{"SC_CHARSET_EASTEUROPE",238},
+	{"SC_CHARSET_GB2312",134},
+	{"SC_CHARSET_GREEK",161},
+	{"SC_CHARSET_HANGUL",129},
+	{"SC_CHARSET_HEBREW",177},
+	{"SC_CHARSET_JOHAB",130},
+	{"SC_CHARSET_MAC",77},
+	{"SC_CHARSET_OEM",255},
+	{"SC_CHARSET_OEM866",866},
+	{"SC_CHARSET_RUSSIAN",204},
+	{"SC_CHARSET_SHIFTJIS",128},
+	{"SC_CHARSET_SYMBOL",2},
+	{"SC_CHARSET_THAI",222},
+	{"SC_CHARSET_TURKISH",162},
+	{"SC_CHARSET_VIETNAMESE",163},
+	{"SC_CP_UTF8",65001},
+	{"SC_CURSORARROW",2},
+	{"SC_CURSORNORMAL",-1},
+	{"SC_CURSORREVERSEARROW",7},
+	{"SC_CURSORWAIT",4},
+	{"SC_DOCUMENTOPTION_DEFAULT",0},
+	{"SC_DOCUMENTOPTION_STYLES_NONE",0x1},
+	{"SC_DOCUMENTOPTION_TEXT_LARGE",0x100},
+	{"SC_EFF_QUALITY_ANTIALIASED",2},
+	{"SC_EFF_QUALITY_DEFAULT",0},
+	{"SC_EFF_QUALITY_LCD_OPTIMIZED",3},
+	{"SC_EFF_QUALITY_MASK",0xF},
+	{"SC_EFF_QUALITY_NON_ANTIALIASED",1},
+	{"SC_ELEMENT_CARET",40},
+	{"SC_ELEMENT_CARET_ADDITIONAL",41},
+	{"SC_ELEMENT_CARET_LINE_BACK",50},
+	{"SC_ELEMENT_HOT_SPOT_ACTIVE",70},
+	{"SC_ELEMENT_HOT_SPOT_ACTIVE_BACK",71},
+	{"SC_ELEMENT_LIST",0},
+	{"SC_ELEMENT_LIST_BACK",1},
+	{"SC_ELEMENT_LIST_SELECTED",2},
+	{"SC_ELEMENT_LIST_SELECTED_BACK",3},
+	{"SC_ELEMENT_SELECTION_ADDITIONAL_BACK",13},
+	{"SC_ELEMENT_SELECTION_ADDITIONAL_TEXT",12},
+	{"SC_ELEMENT_SELECTION_BACK",11},
+	{"SC_ELEMENT_SELECTION_INACTIVE_BACK",17},
+	{"SC_ELEMENT_SELECTION_INACTIVE_TEXT",16},
+	{"SC_ELEMENT_SELECTION_SECONDARY_BACK",15},
+	{"SC_ELEMENT_SELECTION_SECONDARY_TEXT",14},
+	{"SC_ELEMENT_SELECTION_TEXT",10},
+	{"SC_ELEMENT_WHITE_SPACE",60},
+	{"SC_ELEMENT_WHITE_SPACE_BACK",61},
+	{"SC_EOL_CR",1},
+	{"SC_EOL_CRLF",0},
+	{"SC_EOL_LF",2},
+	{"SC_FOLDACTION_CONTRACT",0},
+	{"SC_FOLDACTION_EXPAND",1},
+	{"SC_FOLDACTION_TOGGLE",2},
+	{"SC_FOLDDISPLAYTEXT_BOXED",2},
+	{"SC_FOLDDISPLAYTEXT_HIDDEN",0},
+	{"SC_FOLDDISPLAYTEXT_STANDARD",1},
+	{"SC_FOLDFLAG_LEVELNUMBERS",0x0040},
+	{"SC_FOLDFLAG_LINEAFTER_CONTRACTED",0x0010},
+	{"SC_FOLDFLAG_LINEAFTER_EXPANDED",0x0008},
+	{"SC_FOLDFLAG_LINEBEFORE_CONTRACTED",0x0004},
+	{"SC_FOLDFLAG_LINEBEFORE_EXPANDED",0x0002},
+	{"SC_FOLDFLAG_LINESTATE",0x0080},
+	{"SC_FOLDFLAG_NONE",0x0000},
+	{"SC_FOLDLEVELBASE",0x400},
+	{"SC_FOLDLEVELHEADERFLAG",0x2000},
+	{"SC_FOLDLEVELNONE",0x0},
+	{"SC_FOLDLEVELNUMBERMASK",0x0FFF},
+	{"SC_FOLDLEVELWHITEFLAG",0x1000},
+	{"SC_FONT_SIZE_MULTIPLIER",100},
+	{"SC_IDLESTYLING_AFTERVISIBLE",2},
+	{"SC_IDLESTYLING_ALL",3},
+	{"SC_IDLESTYLING_NONE",0},
+	{"SC_IDLESTYLING_TOVISIBLE",1},
+	{"SC_IME_INLINE",1},
+	{"SC_IME_WINDOWED",0},
+	{"SC_INDICFLAG_NONE",0},
+	{"SC_INDICFLAG_VALUEFORE",1},
+	{"SC_INDICVALUEBIT",0x1000000},
+	{"SC_INDICVALUEMASK",0xFFFFFF},
+	{"SC_IV_LOOKBOTH",3},
+	{"SC_IV_LOOKFORWARD",2},
+	{"SC_IV_NONE",0},
+	{"SC_IV_REAL",1},
+	{"SC_LASTSTEPINUNDOREDO",0x100},
+	{"SC_LAYER_BASE",0},
+	{"SC_LAYER_OVER_TEXT",2},
+	{"SC_LAYER_UNDER_TEXT",1},
+	{"SC_LINECHARACTERINDEX_NONE",0},
+	{"SC_LINECHARACTERINDEX_UTF16",2},
+	{"SC_LINECHARACTERINDEX_UTF32",1},
+	{"SC_LINE_END_TYPE_DEFAULT",0},
+	{"SC_LINE_END_TYPE_UNICODE",1},
+	{"SC_MARGINOPTION_NONE",0},
+	{"SC_MARGINOPTION_SUBLINESELECT",1},
+	{"SC_MARGIN_BACK",2},
+	{"SC_MARGIN_COLOUR",6},
+	{"SC_MARGIN_FORE",3},
+	{"SC_MARGIN_NUMBER",1},
+	{"SC_MARGIN_RTEXT",5},
+	{"SC_MARGIN_SYMBOL",0},
+	{"SC_MARGIN_TEXT",4},
+	{"SC_MARKNUM_FOLDER",30},
+	{"SC_MARKNUM_FOLDEREND",25},
+	{"SC_MARKNUM_FOLDERMIDTAIL",27},
+	{"SC_MARKNUM_FOLDEROPEN",31},
+	{"SC_MARKNUM_FOLDEROPENMID",26},
+	{"SC_MARKNUM_FOLDERSUB",29},
+	{"SC_MARKNUM_FOLDERTAIL",28},
+	{"SC_MARK_ARROW",2},
+	{"SC_MARK_ARROWDOWN",6},
+	{"SC_MARK_ARROWS",24},
+	{"SC_MARK_AVAILABLE",28},
+	{"SC_MARK_BACKGROUND",22},
+	{"SC_MARK_BOOKMARK",31},
+	{"SC_MARK_BOXMINUS",14},
+	{"SC_MARK_BOXMINUSCONNECTED",15},
+	{"SC_MARK_BOXPLUS",12},
+	{"SC_MARK_BOXPLUSCONNECTED",13},
+	{"SC_MARK_CHARACTER",10000},
+	{"SC_MARK_CIRCLE",0},
+	{"SC_MARK_CIRCLEMINUS",20},
+	{"SC_MARK_CIRCLEMINUSCONNECTED",21},
+	{"SC_MARK_CIRCLEPLUS",18},
+	{"SC_MARK_CIRCLEPLUSCONNECTED",19},
+	{"SC_MARK_DOTDOTDOT",23},
+	{"SC_MARK_EMPTY",5},
+	{"SC_MARK_FULLRECT",26},
+	{"SC_MARK_LCORNER",10},
+	{"SC_MARK_LCORNERCURVE",16},
+	{"SC_MARK_LEFTRECT",27},
+	{"SC_MARK_MINUS",7},
+	{"SC_MARK_PIXMAP",25},
+	{"SC_MARK_PLUS",8},
+	{"SC_MARK_RGBAIMAGE",30},
+	{"SC_MARK_ROUNDRECT",1},
+	{"SC_MARK_SHORTARROW",4},
+	{"SC_MARK_SMALLRECT",3},
+	{"SC_MARK_TCORNER",11},
+	{"SC_MARK_TCORNERCURVE",17},
+	{"SC_MARK_UNDERLINE",29},
+	{"SC_MARK_VERTICALBOOKMARK",32},
+	{"SC_MARK_VLINE",9},
+	{"SC_MASK_FOLDERS",static_cast<int>(0xFE000000)},
+	{"SC_MAX_MARGIN",4},
+	{"SC_MODEVENTMASKALL",0x7FFFFF},
+	{"SC_MOD_BEFOREDELETE",0x800},
+	{"SC_MOD_BEFOREINSERT",0x400},
+	{"SC_MOD_CHANGEANNOTATION",0x20000},
+	{"SC_MOD_CHANGEEOLANNOTATION",0x400000},
+	{"SC_MOD_CHANGEFOLD",0x8},
+	{"SC_MOD_CHANGEINDICATOR",0x4000},
+	{"SC_MOD_CHANGELINESTATE",0x8000},
+	{"SC_MOD_CHANGEMARGIN",0x10000},
+	{"SC_MOD_CHANGEMARKER",0x200},
+	{"SC_MOD_CHANGESTYLE",0x4},
+	{"SC_MOD_CHANGETABSTOPS",0x200000},
+	{"SC_MOD_CONTAINER",0x40000},
+	{"SC_MOD_DELETETEXT",0x2},
+	{"SC_MOD_INSERTCHECK",0x100000},
+	{"SC_MOD_INSERTTEXT",0x1},
+	{"SC_MOD_LEXERSTATE",0x80000},
+	{"SC_MOD_NONE",0x0},
+	{"SC_MULTIAUTOC_EACH",1},
+	{"SC_MULTIAUTOC_ONCE",0},
+	{"SC_MULTILINEUNDOREDO",0x1000},
+	{"SC_MULTIPASTE_EACH",1},
+	{"SC_MULTIPASTE_ONCE",0},
+	{"SC_MULTISTEPUNDOREDO",0x80},
+	{"SC_ORDER_CUSTOM",2},
+	{"SC_ORDER_PERFORMSORT",1},
+	{"SC_ORDER_PRESORTED",0},
+	{"SC_PERFORMED_REDO",0x40},
+	{"SC_PERFORMED_UNDO",0x20},
+	{"SC_PERFORMED_USER",0x10},
+	{"SC_PHASES_MULTIPLE",2},
+	{"SC_PHASES_ONE",0},
+	{"SC_PHASES_TWO",1},
+	{"SC_POPUP_ALL",1},
+	{"SC_POPUP_NEVER",0},
+	{"SC_POPUP_TEXT",2},
+	{"SC_PRINT_BLACKONWHITE",2},
+	{"SC_PRINT_COLOURONWHITE",3},
+	{"SC_PRINT_COLOURONWHITEDEFAULTBG",4},
+	{"SC_PRINT_INVERTLIGHT",1},
+	{"SC_PRINT_NORMAL",0},
+	{"SC_PRINT_SCREENCOLOURS",5},
+	{"SC_REPRESENTATION_BLOB",1},
+	{"SC_REPRESENTATION_COLOUR",0x10},
+	{"SC_REPRESENTATION_PLAIN",0},
+	{"SC_SEL_LINES",2},
+	{"SC_SEL_RECTANGLE",1},
+	{"SC_SEL_STREAM",0},
+	{"SC_SEL_THIN",3},
+	{"SC_STARTACTION",0x2000},
+	{"SC_STATUS_BADALLOC",2},
+	{"SC_STATUS_FAILURE",1},
+	{"SC_STATUS_OK",0},
+	{"SC_STATUS_WARN_REGEX",1001},
+	{"SC_STATUS_WARN_START",1000},
+	{"SC_SUPPORTS_FRACTIONAL_STROKE_WIDTH",2},
+	{"SC_SUPPORTS_LINE_DRAWS_FINAL",0},
+	{"SC_SUPPORTS_PIXEL_DIVISIONS",1},
+	{"SC_SUPPORTS_PIXEL_MODIFICATION",4},
+	{"SC_SUPPORTS_TRANSLUCENT_STROKE",3},
+	{"SC_TECHNOLOGY_DEFAULT",0},
+	{"SC_TECHNOLOGY_DIRECTWRITE",1},
+	{"SC_TECHNOLOGY_DIRECTWRITEDC",3},
+	{"SC_TECHNOLOGY_DIRECTWRITERETAIN",2},
+	{"SC_TIME_FOREVER",10000000},
+	{"SC_TYPE_BOOLEAN",0},
+	{"SC_TYPE_INTEGER",1},
+	{"SC_TYPE_STRING",2},
+	{"SC_UPDATE_CONTENT",0x1},
+	{"SC_UPDATE_H_SCROLL",0x8},
+	{"SC_UPDATE_NONE",0x0},
+	{"SC_UPDATE_SELECTION",0x2},
+	{"SC_UPDATE_V_SCROLL",0x4},
+	{"SC_WEIGHT_BOLD",700},
+	{"SC_WEIGHT_NORMAL",400},
+	{"SC_WEIGHT_SEMIBOLD",600},
+	{"SC_WRAPINDENT_DEEPINDENT",3},
+	{"SC_WRAPINDENT_FIXED",0},
+	{"SC_WRAPINDENT_INDENT",2},
+	{"SC_WRAPINDENT_SAME",1},
+	{"SC_WRAPVISUALFLAGLOC_DEFAULT",0x0000},
+	{"SC_WRAPVISUALFLAGLOC_END_BY_TEXT",0x0001},
+	{"SC_WRAPVISUALFLAGLOC_START_BY_TEXT",0x0002},
+	{"SC_WRAPVISUALFLAG_END",0x0001},
+	{"SC_WRAPVISUALFLAG_MARGIN",0x0004},
+	{"SC_WRAPVISUALFLAG_NONE",0x0000},
+	{"SC_WRAPVISUALFLAG_START",0x0002},
+	{"SC_WRAP_CHAR",2},
+	{"SC_WRAP_NONE",0},
+	{"SC_WRAP_WHITESPACE",3},
+	{"SC_WRAP_WORD",1},
+	{"STYLE_BRACEBAD",35},
+	{"STYLE_BRACELIGHT",34},
+	{"STYLE_CALLTIP",38},
+	{"STYLE_CONTROLCHAR",36},
+	{"STYLE_DEFAULT",32},
+	{"STYLE_FOLDDISPLAYTEXT",39},
+	{"STYLE_INDENTGUIDE",37},
+	{"STYLE_LASTPREDEFINED",39},
+	{"STYLE_LINENUMBER",33},
+	{"STYLE_MAX",255},
+	{"UNDO_MAY_COALESCE",1},
+	{"UNDO_NONE",0},
+	{"VISIBLE_SLOP",0x01},
+	{"VISIBLE_STRICT",0x04}
+};
+
+static IFaceFunction ifaceFunctions[] = {
+	{"AddRefDocument", 2376, iface_void, {iface_void, iface_pointer}},
+	{"AddSelection", 2573, iface_void, {iface_position, iface_position}},
+	{"AddStyledText", 2002, iface_void, {iface_length, iface_cells}},
+	{"AddTabStop", 2676, iface_void, {iface_line, iface_int}},
+	{"AddText", 2001, iface_void, {iface_length, iface_string}},
+	{"AddUndoAction", 2560, iface_void, {iface_int, iface_int}},
+	{"Allocate", 2446, iface_void, {iface_position, iface_void}},
+	{"AllocateExtendedStyles", 2553, iface_int, {iface_int, iface_void}},
+	{"AllocateLineCharacterIndex", 2711, iface_void, {iface_int, iface_void}},
+	{"AllocateSubStyles", 4020, iface_int, {iface_int, iface_int}},
+	{"AnnotationClearAll", 2547, iface_void, {iface_void, iface_void}},
+	{"AppendText", 2282, iface_void, {iface_length, iface_string}},
+	{"AssignCmdKey", 2070, iface_void, {iface_keymod, iface_int}},
+	{"AutoCActive", 2102, iface_bool, {iface_void, iface_void}},
+	{"AutoCCancel", 2101, iface_void, {iface_void, iface_void}},
+	{"AutoCComplete", 2104, iface_void, {iface_void, iface_void}},
+	{"AutoCPosStart", 2103, iface_position, {iface_void, iface_void}},
+	{"AutoCSelect", 2108, iface_void, {iface_void, iface_string}},
+	{"AutoCShow", 2100, iface_void, {iface_position, iface_string}},
+	{"AutoCStops", 2105, iface_void, {iface_void, iface_string}},
+	{"BackTab", 2328, iface_void, {iface_void, iface_void}},
+	{"BeginUndoAction", 2078, iface_void, {iface_void, iface_void}},
+	{"BraceBadLight", 2352, iface_void, {iface_position, iface_void}},
+	{"BraceBadLightIndicator", 2499, iface_void, {iface_bool, iface_int}},
+	{"BraceHighlight", 2351, iface_void, {iface_position, iface_position}},
+	{"BraceHighlightIndicator", 2498, iface_void, {iface_bool, iface_int}},
+	{"BraceMatch", 2353, iface_position, {iface_position, iface_int}},
+	{"BraceMatchNext", 2369, iface_position, {iface_position, iface_position}},
+	{"CallTipActive", 2202, iface_bool, {iface_void, iface_void}},
+	{"CallTipCancel", 2201, iface_void, {iface_void, iface_void}},
+	{"CallTipPosStart", 2203, iface_position, {iface_void, iface_void}},
+	{"CallTipSetHlt", 2204, iface_void, {iface_position, iface_position}},
+	{"CallTipShow", 2200, iface_void, {iface_position, iface_string}},
+	{"CanPaste", 2173, iface_bool, {iface_void, iface_void}},
+	{"CanRedo", 2016, iface_bool, {iface_void, iface_void}},
+	{"CanUndo", 2174, iface_bool, {iface_void, iface_void}},
+	{"Cancel", 2325, iface_void, {iface_void, iface_void}},
+	{"ChangeInsertion", 2672, iface_void, {iface_length, iface_string}},
+	{"ChangeLexerState", 2617, iface_int, {iface_position, iface_position}},
+	{"CharLeft", 2304, iface_void, {iface_void, iface_void}},
+	{"CharLeftExtend", 2305, iface_void, {iface_void, iface_void}},
+	{"CharLeftRectExtend", 2428, iface_void, {iface_void, iface_void}},
+	{"CharPositionFromPoint", 2561, iface_position, {iface_int, iface_int}},
+	{"CharPositionFromPointClose", 2562, iface_position, {iface_int, iface_int}},
+	{"CharRight", 2306, iface_void, {iface_void, iface_void}},
+	{"CharRightExtend", 2307, iface_void, {iface_void, iface_void}},
+	{"CharRightRectExtend", 2429, iface_void, {iface_void, iface_void}},
+	{"ChooseCaretX", 2399, iface_void, {iface_void, iface_void}},
+	{"Clear", 2180, iface_void, {iface_void, iface_void}},
+	{"ClearAll", 2004, iface_void, {iface_void, iface_void}},
+	{"ClearAllCmdKeys", 2072, iface_void, {iface_void, iface_void}},
+	{"ClearAllRepresentations", 2770, iface_void, {iface_void, iface_void}},
+	{"ClearCmdKey", 2071, iface_void, {iface_keymod, iface_void}},
+	{"ClearDocumentStyle", 2005, iface_void, {iface_void, iface_void}},
+	{"ClearRegisteredImages", 2408, iface_void, {iface_void, iface_void}},
+	{"ClearRepresentation", 2667, iface_void, {iface_string, iface_void}},
+	{"ClearSelections", 2571, iface_void, {iface_void, iface_void}},
+	{"ClearTabStops", 2675, iface_void, {iface_line, iface_void}},
+	{"Colourise", 4003, iface_void, {iface_position, iface_position}},
+	{"ContractedFoldNext", 2618, iface_line, {iface_line, iface_void}},
+	{"ConvertEOLs", 2029, iface_void, {iface_int, iface_void}},
+	{"Copy", 2178, iface_void, {iface_void, iface_void}},
+	{"CopyAllowLine", 2519, iface_void, {iface_void, iface_void}},
+	{"CopyRange", 2419, iface_void, {iface_position, iface_position}},
+	{"CopyText", 2420, iface_void, {iface_length, iface_string}},
+	{"CountCharacters", 2633, iface_position, {iface_position, iface_position}},
+	{"CountCodeUnits", 2715, iface_position, {iface_position, iface_position}},
+	{"CreateDocument", 2375, iface_pointer, {iface_position, iface_int}},
+	{"CreateLoader", 2632, iface_pointer, {iface_position, iface_int}},
+	{"Cut", 2177, iface_void, {iface_void, iface_void}},
+	{"DelLineLeft", 2395, iface_void, {iface_void, iface_void}},
+	{"DelLineRight", 2396, iface_void, {iface_void, iface_void}},
+	{"DelWordLeft", 2335, iface_void, {iface_void, iface_void}},
+	{"DelWordRight", 2336, iface_void, {iface_void, iface_void}},
+	{"DelWordRightEnd", 2518, iface_void, {iface_void, iface_void}},
+	{"DeleteBack", 2326, iface_void, {iface_void, iface_void}},
+	{"DeleteBackNotLine", 2344, iface_void, {iface_void, iface_void}},
+	{"DeleteRange", 2645, iface_void, {iface_position, iface_position}},
+	{"DescribeKeyWordSets", 4017, iface_int, {iface_void, iface_stringresult}},
+	{"DescribeProperty", 4016, iface_int, {iface_string, iface_stringresult}},
+	{"DescriptionOfStyle", 4032, iface_int, {iface_int, iface_stringresult}},
+	{"DocLineFromVisible", 2221, iface_line, {iface_line, iface_void}},
+	{"DocumentEnd", 2318, iface_void, {iface_void, iface_void}},
+	{"DocumentEndExtend", 2319, iface_void, {iface_void, iface_void}},
+	{"DocumentStart", 2316, iface_void, {iface_void, iface_void}},
+	{"DocumentStartExtend", 2317, iface_void, {iface_void, iface_void}},
+	{"DropSelectionN", 2671, iface_void, {iface_int, iface_void}},
+	{"EOLAnnotationClearAll", 2744, iface_void, {iface_void, iface_void}},
+	{"EditToggleOvertype", 2324, iface_void, {iface_void, iface_void}},
+	{"EmptyUndoBuffer", 2175, iface_void, {iface_void, iface_void}},
+	{"EncodedFromUTF8", 2449, iface_position, {iface_string, iface_stringresult}},
+	{"EndUndoAction", 2079, iface_void, {iface_void, iface_void}},
+	{"EnsureVisible", 2232, iface_void, {iface_line, iface_void}},
+	{"EnsureVisibleEnforcePolicy", 2234, iface_void, {iface_line, iface_void}},
+	{"ExpandChildren", 2239, iface_void, {iface_line, iface_int}},
+	{"FindColumn", 2456, iface_position, {iface_line, iface_position}},
+	{"FindIndicatorFlash", 2641, iface_void, {iface_position, iface_position}},
+	{"FindIndicatorHide", 2642, iface_void, {iface_void, iface_void}},
+	{"FindIndicatorShow", 2640, iface_void, {iface_position, iface_position}},
+	{"FindText", 2150, iface_position, {iface_int, iface_findtext}},
+	{"FoldAll", 2662, iface_void, {iface_int, iface_void}},
+	{"FoldChildren", 2238, iface_void, {iface_line, iface_int}},
+	{"FoldLine", 2237, iface_void, {iface_line, iface_int}},
+	{"FormFeed", 2330, iface_void, {iface_void, iface_void}},
+	{"FormatRange", 2151, iface_position, {iface_bool, iface_formatrange}},
+	{"FreeSubStyles", 4023, iface_void, {iface_void, iface_void}},
+	{"GetCurLine", 2027, iface_position, {iface_length, iface_stringresult}},
+	{"GetDefaultFoldDisplayText", 2723, iface_int, {iface_void, iface_stringresult}},
+	{"GetElementAllowsTranslucent", 2757, iface_bool, {iface_int, iface_void}},
+	{"GetElementBaseColour", 2758, iface_colouralpha, {iface_int, iface_void}},
+	{"GetElementColour", 2754, iface_colouralpha, {iface_int, iface_void}},
+	{"GetElementIsSet", 2756, iface_bool, {iface_int, iface_void}},
+	{"GetHotspotActiveBack", 2495, iface_colour, {iface_void, iface_void}},
+	{"GetHotspotActiveFore", 2494, iface_colour, {iface_void, iface_void}},
+	{"GetLastChild", 2224, iface_line, {iface_line, iface_int}},
+	{"GetLine", 2153, iface_position, {iface_line, iface_stringresult}},
+	{"GetLineSelEndPosition", 2425, iface_position, {iface_line, iface_void}},
+	{"GetLineSelStartPosition", 2424, iface_position, {iface_line, iface_void}},
+	{"GetNextTabStop", 2677, iface_int, {iface_line, iface_int}},
+	{"GetPropertyInt", 4010, iface_int, {iface_string, iface_int}},
+	{"GetRangePointer", 2643, iface_pointer, {iface_position, iface_position}},
+	{"GetSelText", 2161, iface_position, {iface_void, iface_stringresult}},
+	{"GetStyledText", 2015, iface_position, {iface_void, iface_textrange}},
+	{"GetText", 2182, iface_position, {iface_length, iface_stringresult}},
+	{"GetTextRange", 2162, iface_position, {iface_void, iface_textrange}},
+	{"GotoLine", 2024, iface_void, {iface_line, iface_void}},
+	{"GotoPos", 2025, iface_void, {iface_position, iface_void}},
+	{"GrabFocus", 2400, iface_void, {iface_void, iface_void}},
+	{"HideLines", 2227, iface_void, {iface_line, iface_line}},
+	{"HideSelection", 2163, iface_void, {iface_bool, iface_void}},
+	{"Home", 2312, iface_void, {iface_void, iface_void}},
+	{"HomeDisplay", 2345, iface_void, {iface_void, iface_void}},
+	{"HomeDisplayExtend", 2346, iface_void, {iface_void, iface_void}},
+	{"HomeExtend", 2313, iface_void, {iface_void, iface_void}},
+	{"HomeRectExtend", 2430, iface_void, {iface_void, iface_void}},
+	{"HomeWrap", 2349, iface_void, {iface_void, iface_void}},
+	{"HomeWrapExtend", 2450, iface_void, {iface_void, iface_void}},
+	{"IndexPositionFromLine", 2714, iface_position, {iface_line, iface_int}},
+	{"IndicatorAllOnFor", 2506, iface_int, {iface_position, iface_void}},
+	{"IndicatorClearRange", 2505, iface_void, {iface_position, iface_position}},
+	{"IndicatorEnd", 2509, iface_position, {iface_int, iface_position}},
+	{"IndicatorFillRange", 2504, iface_void, {iface_position, iface_position}},
+	{"IndicatorStart", 2508, iface_position, {iface_int, iface_position}},
+	{"IndicatorValueAt", 2507, iface_int, {iface_int, iface_position}},
+	{"InsertText", 2003, iface_void, {iface_position, iface_string}},
+	{"IsRangeWord", 2691, iface_bool, {iface_position, iface_position}},
+	{"LineCopy", 2455, iface_void, {iface_void, iface_void}},
+	{"LineCut", 2337, iface_void, {iface_void, iface_void}},
+	{"LineDelete", 2338, iface_void, {iface_void, iface_void}},
+	{"LineDown", 2300, iface_void, {iface_void, iface_void}},
+	{"LineDownExtend", 2301, iface_void, {iface_void, iface_void}},
+	{"LineDownRectExtend", 2426, iface_void, {iface_void, iface_void}},
+	{"LineDuplicate", 2404, iface_void, {iface_void, iface_void}},
+	{"LineEnd", 2314, iface_void, {iface_void, iface_void}},
+	{"LineEndDisplay", 2347, iface_void, {iface_void, iface_void}},
+	{"LineEndDisplayExtend", 2348, iface_void, {iface_void, iface_void}},
+	{"LineEndExtend", 2315, iface_void, {iface_void, iface_void}},
+	{"LineEndRectExtend", 2432, iface_void, {iface_void, iface_void}},
+	{"LineEndWrap", 2451, iface_void, {iface_void, iface_void}},
+	{"LineEndWrapExtend", 2452, iface_void, {iface_void, iface_void}},
+	{"LineFromIndexPosition", 2713, iface_line, {iface_position, iface_int}},
+	{"LineFromPosition", 2166, iface_line, {iface_position, iface_void}},
+	{"LineLength", 2350, iface_position, {iface_line, iface_void}},
+	{"LineReverse", 2354, iface_void, {iface_void, iface_void}},
+	{"LineScroll", 2168, iface_void, {iface_position, iface_line}},
+	{"LineScrollDown", 2342, iface_void, {iface_void, iface_void}},
+	{"LineScrollUp", 2343, iface_void, {iface_void, iface_void}},
+	{"LineTranspose", 2339, iface_void, {iface_void, iface_void}},
+	{"LineUp", 2302, iface_void, {iface_void, iface_void}},
+	{"LineUpExtend", 2303, iface_void, {iface_void, iface_void}},
+	{"LineUpRectExtend", 2427, iface_void, {iface_void, iface_void}},
+	{"LinesJoin", 2288, iface_void, {iface_void, iface_void}},
+	{"LinesSplit", 2289, iface_void, {iface_int, iface_void}},
+	{"LowerCase", 2340, iface_void, {iface_void, iface_void}},
+	{"MarginTextClearAll", 2536, iface_void, {iface_void, iface_void}},
+	{"MarkerAdd", 2043, iface_int, {iface_line, iface_int}},
+	{"MarkerAddSet", 2466, iface_void, {iface_line, iface_int}},
+	{"MarkerDefine", 2040, iface_void, {iface_int, iface_int}},
+	{"MarkerDefinePixmap", 2049, iface_void, {iface_int, iface_string}},
+	{"MarkerDefineRGBAImage", 2626, iface_void, {iface_int, iface_string}},
+	{"MarkerDelete", 2044, iface_void, {iface_line, iface_int}},
+	{"MarkerDeleteAll", 2045, iface_void, {iface_int, iface_void}},
+	{"MarkerDeleteHandle", 2018, iface_void, {iface_int, iface_void}},
+	{"MarkerEnableHighlight", 2293, iface_void, {iface_bool, iface_void}},
+	{"MarkerGet", 2046, iface_int, {iface_line, iface_void}},
+	{"MarkerHandleFromLine", 2732, iface_int, {iface_line, iface_int}},
+	{"MarkerLineFromHandle", 2017, iface_line, {iface_int, iface_void}},
+	{"MarkerNext", 2047, iface_line, {iface_line, iface_int}},
+	{"MarkerNumberFromLine", 2733, iface_int, {iface_line, iface_int}},
+	{"MarkerPrevious", 2048, iface_line, {iface_line, iface_int}},
+	{"MarkerSymbolDefined", 2529, iface_int, {iface_int, iface_void}},
+	{"MoveCaretInsideView", 2401, iface_void, {iface_void, iface_void}},
+	{"MoveSelectedLinesDown", 2621, iface_void, {iface_void, iface_void}},
+	{"MoveSelectedLinesUp", 2620, iface_void, {iface_void, iface_void}},
+	{"MultiEdgeAddLine", 2694, iface_void, {iface_position, iface_colour}},
+	{"MultiEdgeClearAll", 2695, iface_void, {iface_void, iface_void}},
+	{"MultipleSelectAddEach", 2689, iface_void, {iface_void, iface_void}},
+	{"MultipleSelectAddNext", 2688, iface_void, {iface_void, iface_void}},
+	{"NameOfStyle", 4030, iface_int, {iface_int, iface_stringresult}},
+	{"NewLine", 2329, iface_void, {iface_void, iface_void}},
+	{"Null", 2172, iface_void, {iface_void, iface_void}},
+	{"PageDown", 2322, iface_void, {iface_void, iface_void}},
+	{"PageDownExtend", 2323, iface_void, {iface_void, iface_void}},
+	{"PageDownRectExtend", 2434, iface_void, {iface_void, iface_void}},
+	{"PageUp", 2320, iface_void, {iface_void, iface_void}},
+	{"PageUpExtend", 2321, iface_void, {iface_void, iface_void}},
+	{"PageUpRectExtend", 2433, iface_void, {iface_void, iface_void}},
+	{"ParaDown", 2413, iface_void, {iface_void, iface_void}},
+	{"ParaDownExtend", 2414, iface_void, {iface_void, iface_void}},
+	{"ParaUp", 2415, iface_void, {iface_void, iface_void}},
+	{"ParaUpExtend", 2416, iface_void, {iface_void, iface_void}},
+	{"Paste", 2179, iface_void, {iface_void, iface_void}},
+	{"PointXFromPosition", 2164, iface_int, {iface_void, iface_position}},
+	{"PointYFromPosition", 2165, iface_int, {iface_void, iface_position}},
+	{"PositionAfter", 2418, iface_position, {iface_position, iface_void}},
+	{"PositionBefore", 2417, iface_position, {iface_position, iface_void}},
+	{"PositionFromLine", 2167, iface_position, {iface_line, iface_void}},
+	{"PositionFromPoint", 2022, iface_position, {iface_int, iface_int}},
+	{"PositionFromPointClose", 2023, iface_position, {iface_int, iface_int}},
+	{"PositionRelative", 2670, iface_position, {iface_position, iface_position}},
+	{"PositionRelativeCodeUnits", 2716, iface_position, {iface_position, iface_position}},
+	{"PrivateLexerCall", 4013, iface_pointer, {iface_int, iface_pointer}},
+	{"PropertyNames", 4014, iface_int, {iface_void, iface_stringresult}},
+	{"PropertyType", 4015, iface_int, {iface_string, iface_void}},
+	{"Redo", 2011, iface_void, {iface_void, iface_void}},
+	{"RegisterImage", 2405, iface_void, {iface_int, iface_string}},
+	{"RegisterRGBAImage", 2627, iface_void, {iface_int, iface_string}},
+	{"ReleaseAllExtendedStyles", 2552, iface_void, {iface_void, iface_void}},
+	{"ReleaseDocument", 2377, iface_void, {iface_void, iface_pointer}},
+	{"ReleaseLineCharacterIndex", 2712, iface_void, {iface_int, iface_void}},
+	{"ReplaceRectangular", 2771, iface_void, {iface_length, iface_string}},
+	{"ReplaceSel", 2170, iface_void, {iface_void, iface_string}},
+	{"ReplaceTarget", 2194, iface_position, {iface_length, iface_string}},
+	{"ReplaceTargetRE", 2195, iface_position, {iface_length, iface_string}},
+	{"ResetElementColour", 2755, iface_void, {iface_int, iface_void}},
+	{"RotateSelection", 2606, iface_void, {iface_void, iface_void}},
+	{"ScrollCaret", 2169, iface_void, {iface_void, iface_void}},
+	{"ScrollRange", 2569, iface_void, {iface_position, iface_position}},
+	{"ScrollToEnd", 2629, iface_void, {iface_void, iface_void}},
+	{"ScrollToStart", 2628, iface_void, {iface_void, iface_void}},
+	{"SearchAnchor", 2366, iface_void, {iface_void, iface_void}},
+	{"SearchInTarget", 2197, iface_position, {iface_length, iface_string}},
+	{"SearchNext", 2367, iface_position, {iface_int, iface_string}},
+	{"SearchPrev", 2368, iface_position, {iface_int, iface_string}},
+	{"SelectAll", 2013, iface_void, {iface_void, iface_void}},
+	{"SelectionDuplicate", 2469, iface_void, {iface_void, iface_void}},
+	{"SetCharsDefault", 2444, iface_void, {iface_void, iface_void}},
+	{"SetDefaultFoldDisplayText", 2722, iface_void, {iface_void, iface_string}},
+	{"SetElementColour", 2753, iface_void, {iface_int, iface_colouralpha}},
+	{"SetEmptySelection", 2556, iface_void, {iface_position, iface_void}},
+	{"SetFoldMarginColour", 2290, iface_void, {iface_bool, iface_colour}},
+	{"SetFoldMarginHiColour", 2291, iface_void, {iface_bool, iface_colour}},
+	{"SetHotspotActiveBack", 2411, iface_void, {iface_bool, iface_colour}},
+	{"SetHotspotActiveFore", 2410, iface_void, {iface_bool, iface_colour}},
+	{"SetLengthForEncode", 2448, iface_void, {iface_position, iface_void}},
+	{"SetSavePoint", 2014, iface_void, {iface_void, iface_void}},
+	{"SetSel", 2160, iface_void, {iface_position, iface_position}},
+	{"SetSelBack", 2068, iface_void, {iface_bool, iface_colour}},
+	{"SetSelFore", 2067, iface_void, {iface_bool, iface_colour}},
+	{"SetSelection", 2572, iface_void, {iface_position, iface_position}},
+	{"SetStyling", 2033, iface_void, {iface_length, iface_int}},
+	{"SetStylingEx", 2073, iface_void, {iface_length, iface_string}},
+	{"SetTargetRange", 2686, iface_void, {iface_position, iface_position}},
+	{"SetText", 2181, iface_void, {iface_void, iface_string}},
+	{"SetVisiblePolicy", 2394, iface_void, {iface_int, iface_int}},
+	{"SetWhitespaceBack", 2085, iface_void, {iface_bool, iface_colour}},
+	{"SetWhitespaceFore", 2084, iface_void, {iface_bool, iface_colour}},
+	{"SetXCaretPolicy", 2402, iface_void, {iface_int, iface_int}},
+	{"SetYCaretPolicy", 2403, iface_void, {iface_int, iface_int}},
+	{"ShowLines", 2226, iface_void, {iface_line, iface_line}},
+	{"StartRecord", 3001, iface_void, {iface_void, iface_void}},
+	{"StartStyling", 2032, iface_void, {iface_position, iface_int}},
+	{"StopRecord", 3002, iface_void, {iface_void, iface_void}},
+	{"StutteredPageDown", 2437, iface_void, {iface_void, iface_void}},
+	{"StutteredPageDownExtend", 2438, iface_void, {iface_void, iface_void}},
+	{"StutteredPageUp", 2435, iface_void, {iface_void, iface_void}},
+	{"StutteredPageUpExtend", 2436, iface_void, {iface_void, iface_void}},
+	{"StyleClearAll", 2050, iface_void, {iface_void, iface_void}},
+	{"StyleResetDefault", 2058, iface_void, {iface_void, iface_void}},
+	{"SupportsFeature", 2750, iface_bool, {iface_int, iface_void}},
+	{"SwapMainAnchorCaret", 2607, iface_void, {iface_void, iface_void}},
+	{"Tab", 2327, iface_void, {iface_void, iface_void}},
+	{"TagsOfStyle", 4031, iface_int, {iface_int, iface_stringresult}},
+	{"TargetAsUTF8", 2447, iface_position, {iface_void, iface_stringresult}},
+	{"TargetFromSelection", 2287, iface_void, {iface_void, iface_void}},
+	{"TargetWholeDocument", 2690, iface_void, {iface_void, iface_void}},
+	{"TextHeight", 2279, iface_int, {iface_line, iface_void}},
+	{"TextWidth", 2276, iface_int, {iface_int, iface_string}},
+	{"ToggleCaretSticky", 2459, iface_void, {iface_void, iface_void}},
+	{"ToggleFold", 2231, iface_void, {iface_line, iface_void}},
+	{"ToggleFoldShowText", 2700, iface_void, {iface_line, iface_string}},
+	{"Undo", 2176, iface_void, {iface_void, iface_void}},
+	{"UpperCase", 2341, iface_void, {iface_void, iface_void}},
+	{"UsePopUp", 2371, iface_void, {iface_int, iface_void}},
+	{"UserListShow", 2117, iface_void, {iface_int, iface_string}},
+	{"VCHome", 2331, iface_void, {iface_void, iface_void}},
+	{"VCHomeDisplay", 2652, iface_void, {iface_void, iface_void}},
+	{"VCHomeDisplayExtend", 2653, iface_void, {iface_void, iface_void}},
+	{"VCHomeExtend", 2332, iface_void, {iface_void, iface_void}},
+	{"VCHomeRectExtend", 2431, iface_void, {iface_void, iface_void}},
+	{"VCHomeWrap", 2453, iface_void, {iface_void, iface_void}},
+	{"VCHomeWrapExtend", 2454, iface_void, {iface_void, iface_void}},
+	{"VerticalCentreCaret", 2619, iface_void, {iface_void, iface_void}},
+	{"VisibleFromDocLine", 2220, iface_line, {iface_line, iface_void}},
+	{"WordEndPosition", 2267, iface_position, {iface_position, iface_bool}},
+	{"WordLeft", 2308, iface_void, {iface_void, iface_void}},
+	{"WordLeftEnd", 2439, iface_void, {iface_void, iface_void}},
+	{"WordLeftEndExtend", 2440, iface_void, {iface_void, iface_void}},
+	{"WordLeftExtend", 2309, iface_void, {iface_void, iface_void}},
+	{"WordPartLeft", 2390, iface_void, {iface_void, iface_void}},
+	{"WordPartLeftExtend", 2391, iface_void, {iface_void, iface_void}},
+	{"WordPartRight", 2392, iface_void, {iface_void, iface_void}},
+	{"WordPartRightExtend", 2393, iface_void, {iface_void, iface_void}},
+	{"WordRight", 2310, iface_void, {iface_void, iface_void}},
+	{"WordRightEnd", 2441, iface_void, {iface_void, iface_void}},
+	{"WordRightEndExtend", 2442, iface_void, {iface_void, iface_void}},
+	{"WordRightExtend", 2311, iface_void, {iface_void, iface_void}},
+	{"WordStartPosition", 2266, iface_position, {iface_position, iface_bool}},
+	{"WrapCount", 2235, iface_line, {iface_line, iface_void}},
+	{"ZoomIn", 2333, iface_void, {iface_void, iface_void}},
+	{"ZoomOut", 2334, iface_void, {iface_void, iface_void}}
+};
+
+static IFaceProperty ifaceProperties[] = {
+	{"Accessibility", 2703, 2702, iface_int, iface_void},
+	{"AdditionalCaretFore", 2605, 2604, iface_colour, iface_void},
+	{"AdditionalCaretsBlink", 2568, 2567, iface_bool, iface_void},
+	{"AdditionalCaretsVisible", 2609, 2608, iface_bool, iface_void},
+	{"AdditionalSelAlpha", 2603, 2602, iface_int, iface_void},
+	{"AdditionalSelBack", 0, 2601, iface_colour, iface_void},
+	{"AdditionalSelFore", 0, 2600, iface_colour, iface_void},
+	{"AdditionalSelectionTyping", 2566, 2565, iface_bool, iface_void},
+	{"AllLinesVisible", 2236, 0, iface_bool, iface_void},
+	{"AllocateLines", 0, 2089, iface_line, iface_void},
+	{"Anchor", 2009, 2026, iface_position, iface_void},
+	{"AnnotationLines", 2546, 0, iface_int, iface_line},
+	{"AnnotationStyle", 2543, 2542, iface_int, iface_line},
+	{"AnnotationStyleOffset", 2551, 2550, iface_int, iface_void},
+	{"AnnotationStyles", 2545, 2544, iface_stringresult, iface_line},
+	{"AnnotationText", 2541, 2540, iface_stringresult, iface_line},
+	{"AnnotationVisible", 2549, 2548, iface_int, iface_void},
+	{"AutoCAutoHide", 2119, 2118, iface_bool, iface_void},
+	{"AutoCCancelAtStart", 2111, 2110, iface_bool, iface_void},
+	{"AutoCCaseInsensitiveBehaviour", 2635, 2634, iface_int, iface_void},
+	{"AutoCChooseSingle", 2114, 2113, iface_bool, iface_void},
+	{"AutoCCurrent", 2445, 0, iface_int, iface_void},
+	{"AutoCCurrentText", 2610, 0, iface_stringresult, iface_void},
+	{"AutoCDropRestOfWord", 2271, 2270, iface_bool, iface_void},
+	{"AutoCFillUps", 0, 2112, iface_string, iface_void},
+	{"AutoCIgnoreCase", 2116, 2115, iface_bool, iface_void},
+	{"AutoCMaxHeight", 2211, 2210, iface_int, iface_void},
+	{"AutoCMaxWidth", 2209, 2208, iface_int, iface_void},
+	{"AutoCMulti", 2637, 2636, iface_int, iface_void},
+	{"AutoCOptions", 2639, 2638, iface_int, iface_void},
+	{"AutoCOrder", 2661, 2660, iface_int, iface_void},
+	{"AutoCSeparator", 2107, 2106, iface_int, iface_void},
+	{"AutoCTypeSeparator", 2285, 2286, iface_int, iface_void},
+	{"AutomaticFold", 2664, 2663, iface_int, iface_void},
+	{"BackSpaceUnIndents", 2263, 2262, iface_bool, iface_void},
+	{"Bidirectional", 2708, 2709, iface_int, iface_void},
+	{"BufferedDraw", 2034, 2035, iface_bool, iface_void},
+	{"CallTipBack", 0, 2205, iface_colour, iface_void},
+	{"CallTipFore", 0, 2206, iface_colour, iface_void},
+	{"CallTipForeHlt", 0, 2207, iface_colour, iface_void},
+	{"CallTipPosStart", 0, 2214, iface_position, iface_void},
+	{"CallTipPosition", 0, 2213, iface_bool, iface_void},
+	{"CallTipUseStyle", 0, 2212, iface_int, iface_void},
+	{"CaretFore", 2138, 2069, iface_colour, iface_void},
+	{"CaretLineBack", 2097, 2098, iface_colour, iface_void},
+	{"CaretLineBackAlpha", 2471, 2470, iface_int, iface_void},
+	{"CaretLineFrame", 2704, 2705, iface_int, iface_void},
+	{"CaretLineLayer", 2764, 2765, iface_int, iface_void},
+	{"CaretLineVisible", 2095, 2096, iface_bool, iface_void},
+	{"CaretLineVisibleAlways", 2654, 2655, iface_bool, iface_void},
+	{"CaretPeriod", 2075, 2076, iface_int, iface_void},
+	{"CaretSticky", 2457, 2458, iface_int, iface_void},
+	{"CaretStyle", 2513, 2512, iface_int, iface_void},
+	{"CaretWidth", 2189, 2188, iface_int, iface_void},
+	{"CharAt", 2007, 0, iface_int, iface_position},
+	{"CharacterCategoryOptimization", 2721, 2720, iface_int, iface_void},
+	{"CharacterPointer", 2520, 0, iface_pointer, iface_void},
+	{"CodePage", 2137, 2037, iface_int, iface_void},
+	{"Column", 2129, 0, iface_position, iface_position},
+	{"CommandEvents", 2718, 2717, iface_bool, iface_void},
+	{"ControlCharSymbol", 2389, 2388, iface_int, iface_void},
+	{"CurrentPos", 2008, 2141, iface_position, iface_void},
+	{"Cursor", 2387, 2386, iface_int, iface_void},
+	{"DirectFunction", 2184, 0, iface_pointer, iface_void},
+	{"DirectPointer", 2185, 0, iface_pointer, iface_void},
+	{"DirectStatusFunction", 2772, 0, iface_pointer, iface_void},
+	{"DistanceToSecondaryStyles", 4025, 0, iface_int, iface_void},
+	{"DocPointer", 2357, 2358, iface_pointer, iface_void},
+	{"DocumentOptions", 2379, 0, iface_int, iface_void},
+	{"EOLAnnotationStyle", 2743, 2742, iface_int, iface_line},
+	{"EOLAnnotationStyleOffset", 2748, 2747, iface_int, iface_void},
+	{"EOLAnnotationText", 2741, 2740, iface_stringresult, iface_line},
+	{"EOLAnnotationVisible", 2746, 2745, iface_int, iface_void},
+	{"EOLMode", 2030, 2031, iface_int, iface_void},
+	{"EdgeColour", 2364, 2365, iface_colour, iface_void},
+	{"EdgeColumn", 2360, 2361, iface_position, iface_void},
+	{"EdgeMode", 2362, 2363, iface_int, iface_void},
+	{"EndAtLastLine", 2278, 2277, iface_bool, iface_void},
+	{"EndStyled", 2028, 0, iface_position, iface_void},
+	{"ExtraAscent", 2526, 2525, iface_int, iface_void},
+	{"ExtraDescent", 2528, 2527, iface_int, iface_void},
+	{"FirstVisibleLine", 2152, 2613, iface_line, iface_void},
+	{"Focus", 2381, 2380, iface_bool, iface_void},
+	{"FoldDisplayTextStyle", 2707, 2701, iface_int, iface_void},
+	{"FoldExpanded", 2230, 2229, iface_bool, iface_line},
+	{"FoldFlags", 0, 2233, iface_int, iface_void},
+	{"FoldLevel", 2223, 2222, iface_int, iface_line},
+	{"FoldParent", 2225, 0, iface_line, iface_line},
+	{"FontLocale", 2761, 2760, iface_stringresult, iface_void},
+	{"FontQuality", 2612, 2611, iface_int, iface_void},
+	{"GapPosition", 2644, 0, iface_position, iface_void},
+	{"HScrollBar", 2131, 2130, iface_bool, iface_void},
+	{"HighlightGuide", 2135, 2134, iface_position, iface_void},
+	{"HotspotActiveUnderline", 2496, 2412, iface_bool, iface_void},
+	{"HotspotSingleLine", 2497, 2421, iface_bool, iface_void},
+	{"ILexer", 0, 4033, iface_pointer, iface_void},
+	{"IMEInteraction", 2678, 2679, iface_int, iface_void},
+	{"Identifier", 2623, 2622, iface_int, iface_void},
+	{"Identifiers", 0, 4024, iface_string, iface_int},
+	{"IdleStyling", 2693, 2692, iface_int, iface_void},
+	{"Indent", 2123, 2122, iface_int, iface_void},
+	{"IndentationGuides", 2133, 2132, iface_int, iface_void},
+	{"IndicAlpha", 2524, 2523, iface_int, iface_int},
+	{"IndicFlags", 2685, 2684, iface_int, iface_int},
+	{"IndicFore", 2083, 2082, iface_colour, iface_int},
+	{"IndicHoverFore", 2683, 2682, iface_colour, iface_int},
+	{"IndicHoverStyle", 2681, 2680, iface_int, iface_int},
+	{"IndicOutlineAlpha", 2559, 2558, iface_int, iface_int},
+	{"IndicStrokeWidth", 2752, 2751, iface_int, iface_int},
+	{"IndicStyle", 2081, 2080, iface_int, iface_int},
+	{"IndicUnder", 2511, 2510, iface_bool, iface_int},
+	{"IndicatorCurrent", 2501, 2500, iface_int, iface_void},
+	{"IndicatorValue", 2503, 2502, iface_int, iface_void},
+	{"KeyWords", 0, 4005, iface_string, iface_int},
+	{"LayoutCache", 2273, 2272, iface_int, iface_void},
+	{"Length", 2006, 0, iface_position, iface_void},
+	{"Lexer", 4002, 0, iface_int, iface_void},
+	{"LexerLanguage", 4012, 0, iface_stringresult, iface_void},
+	{"LineCharacterIndex", 2710, 0, iface_int, iface_void},
+	{"LineCount", 2154, 0, iface_line, iface_void},
+	{"LineEndPosition", 2136, 0, iface_position, iface_line},
+	{"LineEndTypesActive", 2658, 0, iface_int, iface_void},
+	{"LineEndTypesAllowed", 2657, 2656, iface_int, iface_void},
+	{"LineEndTypesSupported", 4018, 0, iface_int, iface_void},
+	{"LineIndentPosition", 2128, 0, iface_position, iface_line},
+	{"LineIndentation", 2127, 2126, iface_int, iface_line},
+	{"LineState", 2093, 2092, iface_int, iface_line},
+	{"LineVisible", 2228, 0, iface_bool, iface_line},
+	{"LinesOnScreen", 2370, 0, iface_line, iface_void},
+	{"MainSelection", 2575, 2574, iface_int, iface_void},
+	{"MarginBackN", 2251, 2250, iface_colour, iface_int},
+	{"MarginCursorN", 2249, 2248, iface_int, iface_int},
+	{"MarginLeft", 2156, 2155, iface_int, iface_void},
+	{"MarginMaskN", 2245, 2244, iface_int, iface_int},
+	{"MarginOptions", 2557, 2539, iface_int, iface_void},
+	{"MarginRight", 2158, 2157, iface_int, iface_void},
+	{"MarginSensitiveN", 2247, 2246, iface_bool, iface_int},
+	{"MarginStyle", 2533, 2532, iface_int, iface_line},
+	{"MarginStyleOffset", 2538, 2537, iface_int, iface_void},
+	{"MarginStyles", 2535, 2534, iface_stringresult, iface_line},
+	{"MarginText", 2531, 2530, iface_stringresult, iface_line},
+	{"MarginTypeN", 2241, 2240, iface_int, iface_int},
+	{"MarginWidthN", 2243, 2242, iface_int, iface_int},
+	{"Margins", 2253, 2252, iface_int, iface_void},
+	{"MarkerAlpha", 0, 2476, iface_int, iface_int},
+	{"MarkerBack", 0, 2042, iface_colour, iface_int},
+	{"MarkerBackSelected", 0, 2292, iface_colour, iface_int},
+	{"MarkerBackSelectedTranslucent", 0, 2296, iface_colouralpha, iface_int},
+	{"MarkerBackTranslucent", 0, 2295, iface_colouralpha, iface_int},
+	{"MarkerFore", 0, 2041, iface_colour, iface_int},
+	{"MarkerForeTranslucent", 0, 2294, iface_colouralpha, iface_int},
+	{"MarkerLayer", 2734, 2735, iface_int, iface_int},
+	{"MarkerStrokeWidth", 0, 2297, iface_int, iface_int},
+	{"MaxLineState", 2094, 0, iface_int, iface_void},
+	{"ModEventMask", 2378, 2359, iface_int, iface_void},
+	{"Modify", 2159, 0, iface_bool, iface_void},
+	{"MouseDownCaptures", 2385, 2384, iface_bool, iface_void},
+	{"MouseDwellTime", 2265, 2264, iface_int, iface_void},
+	{"MouseSelectionRectangularSwitch", 2669, 2668, iface_bool, iface_void},
+	{"MouseWheelCaptures", 2697, 2696, iface_bool, iface_void},
+	{"MoveExtendsSelection", 2706, 0, iface_bool, iface_void},
+	{"MultiEdgeColumn", 2749, 0, iface_position, iface_int},
+	{"MultiPaste", 2615, 2614, iface_int, iface_void},
+	{"MultipleSelection", 2564, 2563, iface_bool, iface_void},
+	{"NamedStyles", 4029, 0, iface_int, iface_void},
+	{"Overtype", 2187, 2186, iface_bool, iface_void},
+	{"PasteConvertEndings", 2468, 2467, iface_bool, iface_void},
+	{"PhasesDraw", 2673, 2674, iface_int, iface_void},
+	{"PositionCache", 2515, 2514, iface_int, iface_void},
+	{"PrimaryStyleFromStyle", 4028, 0, iface_int, iface_int},
+	{"PrintColourMode", 2149, 2148, iface_int, iface_void},
+	{"PrintMagnification", 2147, 2146, iface_int, iface_void},
+	{"PrintWrapMode", 2407, 2406, iface_int, iface_void},
+	{"Property", 4008, 4004, iface_stringresult, iface_string},
+	{"PropertyExpanded", 4009, 0, iface_stringresult, iface_string},
+	{"PunctuationChars", 2649, 2648, iface_stringresult, iface_void},
+	{"RGBAImageHeight", 0, 2625, iface_int, iface_void},
+	{"RGBAImageScale", 0, 2651, iface_int, iface_void},
+	{"RGBAImageWidth", 0, 2624, iface_int, iface_void},
+	{"ReadOnly", 2140, 2171, iface_bool, iface_void},
+	{"RectangularSelectionAnchor", 2591, 2590, iface_position, iface_void},
+	{"RectangularSelectionAnchorVirtualSpace", 2595, 2594, iface_position, iface_void},
+	{"RectangularSelectionCaret", 2589, 2588, iface_position, iface_void},
+	{"RectangularSelectionCaretVirtualSpace", 2593, 2592, iface_position, iface_void},
+	{"RectangularSelectionModifier", 2599, 2598, iface_int, iface_void},
+	{"Representation", 2666, 2665, iface_stringresult, iface_string},
+	{"RepresentationAppearance", 2767, 2766, iface_int, iface_string},
+	{"RepresentationColour", 2769, 2768, iface_colouralpha, iface_string},
+	{"ScrollWidth", 2275, 2274, iface_int, iface_void},
+	{"ScrollWidthTracking", 2517, 2516, iface_bool, iface_void},
+	{"SearchFlags", 2199, 2198, iface_int, iface_void},
+	{"SelAlpha", 2477, 2478, iface_int, iface_void},
+	{"SelEOLFilled", 2479, 2480, iface_bool, iface_void},
+	{"SelectionEmpty", 2650, 0, iface_bool, iface_void},
+	{"SelectionEnd", 2145, 2144, iface_position, iface_void},
+	{"SelectionIsRectangle", 2372, 0, iface_bool, iface_void},
+	{"SelectionLayer", 2762, 2763, iface_int, iface_void},
+	{"SelectionMode", 2423, 2422, iface_int, iface_void},
+	{"SelectionNAnchor", 2579, 2578, iface_position, iface_int},
+	{"SelectionNAnchorVirtualSpace", 2583, 2582, iface_position, iface_int},
+	{"SelectionNCaret", 2577, 2576, iface_position, iface_int},
+	{"SelectionNCaretVirtualSpace", 2581, 2580, iface_position, iface_int},
+	{"SelectionNEnd", 2587, 2586, iface_position, iface_int},
+	{"SelectionNEndVirtualSpace", 2727, 0, iface_position, iface_int},
+	{"SelectionNStart", 2585, 2584, iface_position, iface_int},
+	{"SelectionNStartVirtualSpace", 2726, 0, iface_position, iface_int},
+	{"SelectionStart", 2143, 2142, iface_position, iface_void},
+	{"Selections", 2570, 0, iface_int, iface_void},
+	{"Status", 2383, 2382, iface_int, iface_void},
+	{"StyleAt", 2010, 0, iface_int, iface_position},
+	{"StyleBack", 2482, 2052, iface_colour, iface_int},
+	{"StyleBold", 2483, 2053, iface_bool, iface_int},
+	{"StyleCase", 2489, 2060, iface_int, iface_int},
+	{"StyleChangeable", 2492, 2099, iface_bool, iface_int},
+	{"StyleCharacterSet", 2490, 2066, iface_int, iface_int},
+	{"StyleEOLFilled", 2487, 2057, iface_bool, iface_int},
+	{"StyleFont", 2486, 2056, iface_stringresult, iface_int},
+	{"StyleFore", 2481, 2051, iface_colour, iface_int},
+	{"StyleFromSubStyle", 4027, 0, iface_int, iface_int},
+	{"StyleHotSpot", 2493, 2409, iface_bool, iface_int},
+	{"StyleItalic", 2484, 2054, iface_bool, iface_int},
+	{"StyleSize", 2485, 2055, iface_int, iface_int},
+	{"StyleSizeFractional", 2062, 2061, iface_int, iface_int},
+	{"StyleUnderline", 2488, 2059, iface_bool, iface_int},
+	{"StyleVisible", 2491, 2074, iface_bool, iface_int},
+	{"StyleWeight", 2064, 2063, iface_int, iface_int},
+	{"SubStyleBases", 4026, 0, iface_stringresult, iface_void},
+	{"SubStylesLength", 4022, 0, iface_int, iface_int},
+	{"SubStylesStart", 4021, 0, iface_int, iface_int},
+	{"TabDrawMode", 2698, 2699, iface_int, iface_void},
+	{"TabIndents", 2261, 2260, iface_bool, iface_void},
+	{"TabMinimumWidth", 2725, 2724, iface_int, iface_void},
+	{"TabWidth", 2121, 2036, iface_int, iface_void},
+	{"Tag", 2616, 0, iface_stringresult, iface_int},
+	{"TargetEnd", 2193, 2192, iface_position, iface_void},
+	{"TargetEndVirtualSpace", 2731, 2730, iface_position, iface_void},
+	{"TargetStart", 2191, 2190, iface_position, iface_void},
+	{"TargetStartVirtualSpace", 2729, 2728, iface_position, iface_void},
+	{"TargetText", 2687, 0, iface_stringresult, iface_void},
+	{"Technology", 2631, 2630, iface_int, iface_void},
+	{"TextLength", 2183, 0, iface_position, iface_void},
+	{"UndoCollection", 2019, 2012, iface_bool, iface_void},
+	{"UseTabs", 2125, 2124, iface_bool, iface_void},
+	{"VScrollBar", 2281, 2280, iface_bool, iface_void},
+	{"ViewEOL", 2355, 2356, iface_bool, iface_void},
+	{"ViewWS", 2020, 2021, iface_int, iface_void},
+	{"VirtualSpaceOptions", 2597, 2596, iface_int, iface_void},
+	{"WhitespaceChars", 2647, 2443, iface_stringresult, iface_void},
+	{"WhitespaceSize", 2087, 2086, iface_int, iface_void},
+	{"WordChars", 2646, 2077, iface_stringresult, iface_void},
+	{"WrapIndentMode", 2473, 2472, iface_int, iface_void},
+	{"WrapMode", 2269, 2268, iface_int, iface_void},
+	{"WrapStartIndent", 2465, 2464, iface_int, iface_void},
+	{"WrapVisualFlags", 2461, 2460, iface_int, iface_void},
+	{"WrapVisualFlagsLocation", 2463, 2462, iface_int, iface_void},
+	{"XOffset", 2398, 2397, iface_int, iface_void},
+	{"Zoom", 2374, 2373, iface_int, iface_void}
+};
+
+enum {
+	ifaceFunctionCount = 321,
+	ifaceConstantCount = 2991,
+	ifacePropertyCount = 257
+};
+
+//--Autogenerated
+
+const IFaceFunction *const IFaceTable::functions = ifaceFunctions;
+const int IFaceTable::functionCount = ifaceFunctionCount;
+
+const IFaceConstant *const IFaceTable::constants = ifaceConstants;
+const int IFaceTable::constantCount = ifaceConstantCount;
+
+const IFaceProperty *const IFaceTable::properties = ifaceProperties;
+const int IFaceTable::propertyCount = ifacePropertyCount;
diff --git a/scite-app/scite/src/IFaceTable.h b/scite-app/scite/src/IFaceTable.h
new file mode 100644
index 0000000..d856960
--- /dev/null
+++ b/scite-app/scite/src/IFaceTable.h
@@ -0,0 +1,98 @@
+// SciTE - Scintilla based Text Editor
+/** @file IFaceTable.h
+ ** SciTE iface function and constant descriptors.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef IFACETABLE_H
+#define IFACETABLE_H
+
+enum IFaceType {
+	iface_void,
+	iface_int,
+	iface_length,
+	iface_position,
+	iface_line,
+	iface_pointer,
+	iface_colour,
+	iface_colouralpha,
+	iface_bool,
+	iface_keymod,
+	iface_string,
+	iface_stringresult,
+	iface_cells,
+	iface_textrange,
+	iface_findtext,
+	iface_formatrange
+};
+
+struct IFaceConstant {
+	const char *name;
+	int value;
+};
+
+struct IFaceFunction {
+	const char *name;
+	int value;
+	IFaceType returnType;
+	IFaceType paramType[2];
+};
+
+struct IFaceProperty {
+	const char *name;
+	int getter;
+	int setter;
+	IFaceType valueType;
+	IFaceType paramType;
+
+	IFaceFunction GetterFunction() const noexcept {
+		IFaceFunction result = {"(property getter)", getter, valueType, {paramType, iface_void}};
+		return result;
+	}
+
+	IFaceFunction SetterFunction() const noexcept {
+		IFaceFunction result = {"(property setter)", setter, iface_void, {valueType, iface_void}};
+		if (paramType != iface_void) {
+			result.paramType[0] = paramType;
+			if (valueType == iface_stringresult)
+				result.paramType[1] = iface_string;
+			else
+				result.paramType[1] = valueType;
+		}
+		if ((paramType == iface_void) && ((valueType == iface_string) || (valueType == iface_stringresult))) {
+			result.paramType[0] = paramType;
+			if (valueType == iface_stringresult)
+				result.paramType[1] = iface_string;
+			else
+				result.paramType[1] = valueType;
+		}
+		return result;
+	}
+};
+
+struct IFaceObject {
+	const char *name;
+	const char *prefix;
+	IFaceType indexType;
+};
+
+class IFaceTable {
+public:
+	static const IFaceFunction *const functions;
+	static const IFaceConstant *const constants;
+	static const IFaceProperty *const properties;
+
+	static const int functionCount;
+	static const int constantCount;
+	static const int propertyCount;
+
+	static int FindConstant(const char *name) noexcept;
+	static int FindFunction(const char *name) noexcept;
+	static int FindFunctionByConstantName(const char *name) noexcept;
+	static int FindProperty(const char *name) noexcept;
+
+	static std::string GetConstantName(int value, const char *prefix);
+};
+
+#endif
diff --git a/scite-app/scite/src/JobQueue.cxx b/scite-app/scite/src/JobQueue.cxx
new file mode 100644
index 0000000..74d1427
--- /dev/null
+++ b/scite-app/scite/src/JobQueue.cxx
@@ -0,0 +1,267 @@
+// SciTE - Scintilla based Text Editor
+/** @file JobQueue.cxx
+ ** Define job queue
+ **/
+// SciTE & Scintilla copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 2007 by Neil Hodgson <neilh@scintilla.org>, from April White <april_white@sympatico.ca>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include <sys/stat.h>
+
+#include "GUI.h"
+
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "PropSetFile.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+
+JobSubsystem SubsystemFromChar(char c) noexcept {
+	if (c == '1')
+		return jobGUI;
+	else if (c == '2')
+		return jobShell;
+	else if (c == '3')
+		return jobExtension;
+	else if (c == '4')
+		return jobHelp;
+	else if (c == '5')
+		return jobOtherHelp;
+	else if (c == '7')
+		return jobImmediate;
+	return jobCLI;
+}
+
+JobMode::JobMode(PropSetFile &props, int item, const char *fileNameExt) : jobType(jobCLI), saveBefore(0), isFilter(false), flags(0) {
+	bool quiet = false;
+	int repSel = 0;
+	bool groupUndo = false;
+
+	const std::string itemSuffix = StdStringFromInteger(item) + ".";
+	std::string propName = std::string("command.mode.") + itemSuffix;
+	std::string modeVal(props.GetNewExpandString(propName.c_str(), fileNameExt));
+
+	modeVal.erase(std::remove(modeVal.begin(), modeVal.end(), ' '), modeVal.end());
+	std::vector<std::string> modes = StringSplit(modeVal, ',');
+	for (const std::string &mode : modes) {
+
+		std::vector<std::string> optValue = StringSplit(mode, ':');
+
+		if (optValue.size() == 0) {
+			continue;
+		}
+
+		const std::string opt = optValue[0];
+		const std::string value = (optValue.size() > 1) ? optValue[1] : std::string();
+
+		if (opt == "subsystem" && !value.empty()) {
+			if (value[0] == '0' || value == "console")
+				jobType = jobCLI;
+			else if (value[0] == '1' || value == "windows")
+				jobType = jobGUI;
+			else if (value[0] == '2' || value == "shellexec")
+				jobType = jobShell;
+			else if (value[0] == '3' || value == "lua" || value == "director")
+				jobType = jobExtension;
+			else if (value[0] == '4' || value == "htmlhelp")
+				jobType = jobHelp;
+			else if (value[0] == '5' || value == "winhelp")
+				jobType = jobOtherHelp;
+			else if (value[0] == '7' || value == "immediate")
+				jobType = jobImmediate;
+		}
+
+		if (opt == "quiet") {
+			if (value.empty() || value[0] == '1' || value == "yes")
+				quiet = true;
+			else if (value[0] == '0' || value == "no")
+				quiet = false;
+		}
+
+		if (opt == "savebefore") {
+			if (value.empty() || value[0] == '1' || value == "yes")
+				saveBefore = 1;
+			else if (value[0] == '0' || value == "no")
+				saveBefore = 2;
+			else if (value == "prompt")
+				saveBefore = 0;
+		}
+
+		if (opt == "filter") {
+			if (value.empty() || value[0] == '1' || value == "yes")
+				isFilter = true;
+			else if (value[0] == '0' || value == "no")
+				isFilter = false;
+		}
+
+		if (opt == "replaceselection") {
+			if (value.empty() || value[0] == '1' || value == "yes")
+				repSel = 1;
+			else if (value[0] == '0' || value == "no")
+				repSel = 0;
+			else if (value == "auto")
+				repSel = 2;
+		}
+
+		if (opt == "groupundo") {
+			if (value.empty() || value[0] == '1' || value == "yes")
+				groupUndo = true;
+			else if (value[0] == '0' || value == "no")
+				groupUndo = false;
+		}
+	}
+
+	// The mode flags also have classic properties with similar effect.
+	// If the classic property is specified, it overrides the mode.
+	// To see if the property is absent (as opposed to merely evaluating
+	// to nothing after variable expansion), use GetWild for the
+	// existence check.  However, for the value check, use GetNewExpandString.
+
+	propName = "command.save.before.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length())
+		saveBefore = atoi(props.GetNewExpandString(propName.c_str(), fileNameExt).c_str());
+
+	propName = "command.is.filter.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length())
+		isFilter = (props.GetNewExpandString(propName.c_str(), fileNameExt) == "1");
+
+	propName = "command.subsystem.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length()) {
+		std::string subsystemVal = props.GetNewExpandString(propName.c_str(), fileNameExt);
+		jobType = SubsystemFromChar(subsystemVal[0]);
+	}
+
+	propName = "command.input.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length()) {
+		input = props.GetNewExpandString(propName.c_str(), fileNameExt);
+		flags |= jobHasInput;
+	}
+
+	propName = "command.quiet.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length())
+		quiet = props.GetNewExpandString(propName.c_str(), fileNameExt) == "1";
+	if (quiet)
+		flags |= jobQuiet;
+
+	propName = "command.replace.selection.";
+	propName += itemSuffix;
+	if (props.GetWild(propName.c_str(), fileNameExt).length())
+		repSel = atoi(props.GetNewExpandString(propName.c_str(), fileNameExt).c_str());
+
+	if (repSel == 1)
+		flags |= jobRepSelYes;
+	else if (repSel == 2)
+		flags |= jobRepSelAuto;
+
+	if (groupUndo)
+		flags |= jobGroupUndo;
+}
+
+Job::Job() noexcept : jobType(jobCLI), flags(0) {
+	Clear();
+}
+
+Job::Job(const std::string &command_, const FilePath &directory_, JobSubsystem jobType_, const std::string &input_, int flags_)
+	: command(command_), directory(directory_), jobType(jobType_), input(input_), flags(flags_) {
+}
+
+void Job::Clear() noexcept {
+	command.clear();
+	directory.Init();
+	jobType = jobCLI;
+	input.clear();
+	flags = 0;
+}
+
+
+JobQueue::JobQueue() : jobQueue(commandMax) {
+	clearBeforeExecute = false;
+	isBuilding = false;
+	isBuilt = false;
+	executing = false;
+	commandCurrent = 0;
+	jobUsesOutputPane = false;
+	cancelFlag = false;
+	timeCommands = false;
+}
+
+JobQueue::~JobQueue() {
+}
+
+bool JobQueue::TimeCommands() const noexcept {
+	return timeCommands;
+}
+
+bool JobQueue::ClearBeforeExecute() const noexcept {
+	return clearBeforeExecute;
+}
+
+bool JobQueue::ShowOutputPane() const noexcept {
+	return jobUsesOutputPane;
+}
+
+bool JobQueue::IsExecuting() const noexcept {
+	return executing;
+}
+
+void JobQueue::SetExecuting(bool state) noexcept {
+	executing = state;
+}
+
+bool JobQueue::HasCommandToRun() const noexcept {
+	return commandCurrent > 0;
+}
+
+bool JobQueue::SetCancelFlag(bool value) {
+	std::lock_guard<std::mutex> guard(mutex);
+	const bool cancelFlagPrevious = cancelFlag;
+	cancelFlag = value;
+	return cancelFlagPrevious;
+}
+
+bool JobQueue::Cancelled() noexcept {
+	return cancelFlag;
+}
+
+void JobQueue::ClearJobs() noexcept {
+	for (Job &ic : jobQueue) {
+		ic.Clear();
+	}
+	commandCurrent = 0;
+}
+
+void JobQueue::AddCommand(const std::string &command, const FilePath &directory, JobSubsystem jobType, const std::string &input, int flags) {
+	if ((commandCurrent < commandMax) && (command.length())) {
+		if (commandCurrent == 0)
+			jobUsesOutputPane = false;
+		jobQueue[commandCurrent] = Job(command, directory, jobType, input, flags);
+		commandCurrent++;
+		if (jobType == jobCLI && !(flags & jobQuiet))
+			jobUsesOutputPane = true;
+		// For jobExtension, the Trace() method shows output pane on demand.
+	}
+}
diff --git a/scite-app/scite/src/JobQueue.h b/scite-app/scite/src/JobQueue.h
new file mode 100644
index 0000000..56b3483
--- /dev/null
+++ b/scite-app/scite/src/JobQueue.h
@@ -0,0 +1,87 @@
+// SciTE - Scintilla based Text Editor
+/** @file JobQueue.h
+ ** Define job queue
+ **/
+// SciTE & Scintilla copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 2007 by Neil Hodgson <neilh@scintilla.org>, from April White <april_white@sympatico.ca>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+// TODO: see http://www.codeproject.com/threads/cppsyncstm.asp
+
+#ifndef JOBQUEUE_H
+#define JOBQUEUE_H
+
+enum JobSubsystem {
+	jobCLI = 0, jobGUI = 1, jobShell = 2, jobExtension = 3, jobHelp = 4, jobOtherHelp = 5, jobGrep = 6, jobImmediate = 7
+};
+
+JobSubsystem SubsystemFromChar(char c) noexcept;
+
+enum JobFlags {
+	jobForceQueue = 1,
+	jobHasInput = 2,
+	jobQuiet = 4,
+	// 8 reserved for jobVeryQuiet
+	jobRepSelMask = 48,
+	jobRepSelYes = 16,
+	jobRepSelAuto = 32,
+	jobGroupUndo = 64
+};
+
+struct JobMode {
+	JobSubsystem jobType;
+	int saveBefore;
+	bool isFilter;
+	int flags;
+	std::string input;
+	JobMode(PropSetFile &props, int item, const char *fileNameExt);
+};
+
+class Job {
+public:
+	std::string command;
+	FilePath directory;
+	JobSubsystem jobType;
+	std::string input;
+	int flags;
+
+	Job() noexcept;
+	Job(const std::string &command_, const FilePath &directory_, JobSubsystem jobType_, const std::string &input_, int flags_);
+	void Clear() noexcept;
+};
+
+class JobQueue {
+	std::atomic_bool cancelFlag;
+public:
+	std::mutex mutex;
+	std::atomic_bool clearBeforeExecute;
+	std::atomic_bool isBuilding;
+	std::atomic_bool isBuilt;
+	std::atomic_bool executing;
+	static constexpr size_t commandMax = 2;
+	std::atomic_size_t commandCurrent;
+	std::vector<Job> jobQueue;
+	std::atomic_bool jobUsesOutputPane;
+	std::atomic_bool timeCommands;
+
+	JobQueue();
+	// Deleted so JobQueue objects can not be copied.
+	JobQueue(const JobQueue &) = delete;
+	JobQueue(JobQueue &&) = delete;
+	JobQueue &operator=(const JobQueue &) = delete;
+	JobQueue &operator=(JobQueue &&) = delete;
+	~JobQueue();
+	bool TimeCommands() const noexcept;
+	bool ClearBeforeExecute() const noexcept;
+	bool ShowOutputPane() const noexcept;
+	bool IsExecuting() const noexcept;
+	void SetExecuting(bool state) noexcept;
+	bool HasCommandToRun() const noexcept;
+	bool SetCancelFlag(bool value);
+	bool Cancelled() noexcept;
+
+	void ClearJobs() noexcept;
+	void AddCommand(const std::string &command, const FilePath &directory, JobSubsystem jobType, const std::string &input, int flags);
+};
+
+#endif
diff --git a/scite-app/scite/src/LuaExtension.cxx b/scite-app/scite/src/LuaExtension.cxx
new file mode 100644
index 0000000..0f4e402
--- /dev/null
+++ b/scite-app/scite/src/LuaExtension.cxx
@@ -0,0 +1,2140 @@
+// SciTE - Scintilla based Text Editor
+// LuaExtension.cxx - Lua scripting extension
+// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+
+#include "IFaceTable.h"
+#include "SciTEKeys.h"
+#include "LuaExtension.h"
+
+#define LUA_COMPAT_5_1
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
+
+#if (LUA_VERSION_NUM < 502)
+#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX)
+#undef  lua_getglobal
+#define lua_getglobal(L,s) (lua_getfield(L, LUA_GLOBALSINDEX, s), lua_type(L, -1))
+#else
+#define LUA_GLOBALSINDEX LUA_RIDX_GLOBALS
+#endif
+
+#if defined(_WIN32) && defined(_MSC_VER)
+
+// MSVC looks deeper into the code than other compilers, sees that
+// lua_error calls longjmp, and complains about unreachable code.
+#pragma warning(disable: 4702)
+
+#endif
+
+namespace SA = Scintilla;
+
+// A note on naming conventions:
+// I've gone back and forth on this a bit, trying different styles.
+// It isn't easy to get something that feels consistent, considering
+// that the Lua API uses lower case, underscore-separated words and
+// Scintilla of course uses mixed case with no underscores.
+
+// What I've settled on is that functions that require you to think
+// about the Lua stack are likely to be mixed with Lua API functions,
+// so these should using a naming convention similar to Lua itself.
+// Functions that don't manipulate Lua at a low level should follow
+// the normal SciTE convention.  There is some grey area of course,
+// and for these I just make a judgement call
+
+
+static ExtensionAPI *host = nullptr;
+static lua_State *luaState = nullptr;
+static bool luaDisabled = false;
+
+static std::string startupScript;
+static std::string extensionScript;
+
+static bool tracebackEnabled = true;
+
+static int maxBufferIndex = -1;
+static int curBufferIndex = -1;
+
+static int GetPropertyInt(const char *propName) {
+	int propVal = 0;
+	if (host) {
+		std::string sPropVal = host->Property(propName);
+		if (sPropVal.length()) {
+			propVal = atoi(sPropVal.c_str());
+		}
+	}
+	return propVal;
+}
+
+LuaExtension::LuaExtension() {}
+
+LuaExtension::~LuaExtension() {}
+
+LuaExtension &LuaExtension::Instance() {
+	static LuaExtension singleton;
+	return singleton;
+}
+
+// Forward declarations
+static ExtensionAPI::Pane check_pane_object(lua_State *L, int index);
+static void push_pane_object(lua_State *L, ExtensionAPI::Pane p) noexcept;
+static int iface_function_helper(lua_State *L, const IFaceFunction &func);
+
+inline bool IFaceTypeIsScriptable(IFaceType t, int index) noexcept {
+	return t < iface_stringresult || (index==1 && t == iface_stringresult);
+}
+
+inline bool IFaceTypeIsNumeric(IFaceType t) noexcept {
+	return (t > iface_void && t < iface_bool);
+}
+
+inline bool IFaceFunctionIsScriptable(const IFaceFunction &f) noexcept {
+	return IFaceTypeIsScriptable(f.paramType[0], 0) && IFaceTypeIsScriptable(f.paramType[1], 1);
+}
+
+inline bool IFacePropertyIsScriptable(const IFaceProperty &p) noexcept {
+	return (((p.valueType > iface_void) && (p.valueType <= iface_stringresult) && (p.valueType != iface_keymod)) &&
+		((p.paramType < iface_colour) || (p.paramType == iface_string) ||
+		 (p.paramType == iface_bool)) && (p.getter || p.setter));
+}
+
+inline void raise_error(lua_State *L, const char *errMsg=nullptr) {
+	luaL_where(L, 1);
+	if (errMsg) {
+		lua_pushstring(L, errMsg);
+	} else {
+		lua_insert(L, -2);
+	}
+	lua_concat(L, 2);
+	lua_error(L);
+}
+
+// lua_absindex for LUA <5.1
+inline int absolute_index(lua_State *L, int index) noexcept {
+	if (index > LUA_REGISTRYINDEX && index < 0)
+		return lua_gettop(L) + index + 1;
+	else
+		return index;
+}
+
+/**
+* merge_table / clone_table / clear_table utilized to
+* "soft-replace" an existing global scope instead of using new_table,
+* because then startup script would be bound to a different copy
+* of the globals than the extension script.
+**/
+
+// copy the contents of one table into another returning the size
+static int merge_table(lua_State *L, int destTableIdx, int srcTableIdx, bool copyMetatable = false) {
+	int count = 0;
+	if (lua_istable(L, destTableIdx) && lua_istable(L, srcTableIdx)) {
+		srcTableIdx = absolute_index(L, srcTableIdx);
+		destTableIdx = absolute_index(L, destTableIdx);
+		if (copyMetatable) {
+			lua_getmetatable(L, srcTableIdx);
+			lua_setmetatable(L, destTableIdx);
+		}
+		lua_pushnil(L); // first key
+		while (lua_next(L, srcTableIdx) != 0) {
+			// key is at index -2 and value at index -1
+			lua_pushvalue(L, -2); // the key
+			lua_insert(L, -2); // leaving value (-1), key (-2), key (-3)
+			lua_rawset(L, destTableIdx);
+			++count;
+		}
+	}
+	return count;
+}
+
+// make a copy of a table (not deep), leaving it at the top of the stack
+static bool clone_table(lua_State *L, int srcTableIdx, bool copyMetatable = false) {
+	if (lua_istable(L, srcTableIdx)) {
+		srcTableIdx = absolute_index(L, srcTableIdx);
+		lua_newtable(L);
+		merge_table(L, -1, srcTableIdx, copyMetatable);
+		return true;
+	} else {
+		lua_pushnil(L);
+		return false;
+	}
+}
+
+// loop through each key in the table and set its value to nil
+static void clear_table(lua_State *L, int tableIdx, bool clearMetatable = true) {
+	if (lua_istable(L, tableIdx)) {
+		tableIdx = absolute_index(L, tableIdx);
+		if (clearMetatable) {
+			lua_pushnil(L);
+			lua_setmetatable(L, tableIdx);
+		}
+		lua_pushnil(L); // first key
+		while (lua_next(L, tableIdx) != 0) {
+			// key is at index -2 and value at index -1
+			lua_pop(L, 1); // discard value
+			lua_pushnil(L);
+			lua_rawset(L, tableIdx); // table[key] = nil
+			lua_pushnil(L); // get 'new' first key
+		}
+	}
+}
+
+// Lua 5.1's checkudata throws an error on failure, we don't want that, we want NULL
+static void *checkudata(lua_State *L, int ud, const char *tname) noexcept {
+	void *p = lua_touserdata(L, ud);
+	if (p) { // value is a userdata?
+		if (lua_getmetatable(L, ud)) { // does it have a metatable?
+			lua_getfield(L, LUA_REGISTRYINDEX, tname); // get correct metatable
+			if (lua_rawequal(L, -1, -2)) { // does it have correct mt?
+				lua_pop(L, 2);
+				return p;
+			} else {
+				lua_pop(L, 2);
+			}
+		}
+	}
+	return nullptr;
+}
+
+static int cf_scite_send(lua_State *L) {
+	// This is reinstated as a replacement for the old <pane>:send, which was removed
+	// due to safety concerns.  Is now exposed as scite.SendEditor / scite.SendOutput.
+	// It is rewritten to be typesafe, checking the arguments against the metadata in
+	// IFaceTable in the same way that the object interface does.
+
+	const int paneIndex = lua_upvalueindex(1);
+	check_pane_object(L, paneIndex);
+	const int message = luaL_checkint(L, 1);
+
+	lua_pushvalue(L, paneIndex);
+	lua_replace(L, 1);
+
+	IFaceFunction func = { "", 0, iface_void, {iface_void, iface_void} };
+	for (int funcIdx = 0; funcIdx < IFaceTable::functionCount; ++funcIdx) {
+		if (IFaceTable::functions[funcIdx].value == message) {
+			func = IFaceTable::functions[funcIdx];
+			break;
+		}
+	}
+
+	if (func.value == 0) {
+		for (int propIdx = 0; propIdx < IFaceTable::propertyCount; ++propIdx) {
+			if (IFaceTable::properties[propIdx].getter == message) {
+				func = IFaceTable::properties[propIdx].GetterFunction();
+				break;
+			} else if (IFaceTable::properties[propIdx].setter == message) {
+				func = IFaceTable::properties[propIdx].SetterFunction();
+				break;
+			}
+		}
+	}
+
+	if (func.value != 0) {
+		if (IFaceFunctionIsScriptable(func)) {
+			return iface_function_helper(L, func);
+		} else {
+			raise_error(L, "Cannot call send for this function: not scriptable.");
+			return 0;
+		}
+	} else {
+		raise_error(L, "Message number does not match any published Scintilla function or property");
+		return 0;
+	}
+}
+
+static int cf_scite_constname(lua_State *L) {
+	const int message = luaL_checkint(L, 1);
+	const char *prefix = luaL_optstring(L, 2, nullptr);
+	const std::string constName = IFaceTable::GetConstantName(message, prefix);
+	if (constName.length() > 0) {
+		lua_pushstring(L, constName.c_str());
+		return 1;
+	} else {
+		raise_error(L, "Argument does not match any Scintilla / SciTE constant");
+		return 0;
+	}
+}
+
+static int cf_scite_open(lua_State *L) {
+	const char *s = luaL_checkstring(L, 1);
+	if (s) {
+		std::string cmd = "open:";
+		cmd += s;
+		Substitute(cmd, "\\", "\\\\");
+		host->Perform(cmd.c_str());
+	}
+	return 0;
+}
+
+static int cf_scite_menu_command(lua_State *L) {
+	const int cmdID = luaL_checkint(L, 1);
+	if (cmdID) {
+		host->DoMenuCommand(cmdID);
+	}
+	return 0;
+}
+
+static int cf_scite_update_status_bar(lua_State *L) {
+	const bool bUpdateSlowData = (lua_gettop(L) > 0 ? lua_toboolean(L, 1) : false) != 0;
+	host->UpdateStatusBar(bUpdateSlowData);
+	return 0;
+}
+
+static int cf_scite_strip_show(lua_State *L) {
+	const char *s = luaL_checkstring(L, 1);
+	if (s) {
+		host->UserStripShow(s);
+	}
+	return 0;
+}
+
+static int cf_scite_strip_set(lua_State *L) {
+	const int control = luaL_checkint(L, 1);
+	const char *value = luaL_checkstring(L, 2);
+	if (value) {
+		host->UserStripSet(control, value);
+	}
+	return 0;
+}
+
+static int cf_scite_strip_set_list(lua_State *L) {
+	const int control = luaL_checkint(L, 1);
+	const char *value = luaL_checkstring(L, 2);
+	if (value) {
+		host->UserStripSetList(control, value);
+	}
+	return 0;
+}
+
+static int cf_scite_strip_value(lua_State *L) {
+	const int control = luaL_checkint(L, 1);
+	std::string value = host->UserStripValue(control);
+	lua_pushstring(L, value.c_str());
+	return 1;
+}
+
+static ExtensionAPI::Pane check_pane_object(lua_State *L, int index) {
+	ExtensionAPI::Pane *pPane = static_cast<ExtensionAPI::Pane *>(checkudata(L, index, "SciTE_MT_Pane"));
+
+	if ((!pPane) && lua_istable(L, index)) {
+		// so that nested objects have a convenient way to do a back reference
+		const int absIndex = absolute_index(L, index);
+		lua_pushliteral(L, "pane");
+		lua_gettable(L, absIndex);
+		pPane = static_cast<ExtensionAPI::Pane *>(checkudata(L, -1, "SciTE_MT_Pane"));
+	}
+
+	if (pPane) {
+		if ((*pPane == ExtensionAPI::paneEditor) && (curBufferIndex < 0))
+			raise_error(L, "Editor pane is not accessible at this time.");
+
+		return *pPane;
+	}
+
+	if (index == 1)
+		lua_pushliteral(L, "Self object is missing in pane method or property access.");
+	else if (index == lua_upvalueindex(1))
+		lua_pushliteral(L, "Internal error: pane object expected in closure.");
+	else
+		lua_pushliteral(L, "Pane object expected.");
+
+	raise_error(L);
+	return ExtensionAPI::paneOutput; // this line never reached
+}
+
+static int cf_pane_textrange(lua_State *L) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+
+	if (lua_gettop(L) >= 3) {
+		const SA::Position cpMin = luaL_checkinteger(L, 2);
+		const SA::Position cpMax = luaL_checkinteger(L, 3);
+		if (cpMax >= 0) {
+			std::string range = host->Range(p, SA::Span(cpMin, cpMax));
+			lua_pushstring(L, range.c_str());
+			return 1;
+		} else {
+			raise_error(L, "Invalid argument 2 for <pane>:textrange.  Positive number or zero expected.");
+		}
+	} else {
+		raise_error(L, "Not enough arguments for <pane>:textrange");
+	}
+
+	return 0;
+}
+
+static int cf_pane_insert(lua_State *L) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+	const SA::Position pos = luaL_checkinteger(L, 2);
+	const char *s = luaL_checkstring(L, 3);
+	host->Insert(p, pos, s);
+	return 0;
+}
+
+static int cf_pane_remove(lua_State *L) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+	const SA::Position cpMin = luaL_checkinteger(L, 2);
+	const SA::Position cpMax = luaL_checkinteger(L, 3);
+	host->Remove(p, cpMin, cpMax);
+	return 0;
+}
+
+static int cf_pane_append(lua_State *L) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+	const char *s = luaL_checkstring(L, 2);
+	host->Insert(p, host->PaneCaller(p).Length(), s);
+	return 0;
+}
+
+static int cf_pane_findtext(lua_State *L) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+
+	const int nArgs = lua_gettop(L);
+
+	const char *t = luaL_checkstring(L, 2);
+	bool hasError = (!t);
+
+	if (!hasError) {
+		SA::Position rangeStart = 0;
+		SA::Position rangeEnd = 0;
+
+		const int flags = (nArgs > 2) ? luaL_checkint(L, 3) : 0;
+		hasError = (flags == 0 && lua_gettop(L) > nArgs);
+
+		if (!hasError) {
+			if (nArgs > 3) {
+				rangeStart = luaL_checkinteger(L, 4);
+				hasError = (lua_gettop(L) > nArgs);
+			}
+		}
+
+		SA::ScintillaCall &sc = host->PaneCaller(p);
+
+		if (!hasError) {
+			if (nArgs > 4) {
+				rangeEnd = luaL_checkinteger(L, 5);
+				hasError = (lua_gettop(L) > nArgs);
+			} else {
+				rangeEnd = sc.Length();
+			}
+		}
+
+		if (!hasError) {
+			sc.SetTargetRange(rangeStart, rangeEnd);
+			sc.SetSearchFlags(static_cast<SA::FindOption>(flags));
+			const SA::Span result = sc.SpanSearchInTarget(t);
+			if (result.start >= 0) {
+				lua_pushinteger(L, result.start);
+				lua_pushinteger(L, result.end);
+				return 2;
+			} else {
+				lua_pushnil(L);
+				return 1;
+			}
+		}
+	}
+
+	if (hasError) {
+		raise_error(L, "Invalid arguments for <pane>:findtext");
+	}
+
+	return 0;
+}
+
+// Pane match generator.  This was prototyped in about 30 lines of Lua.
+// I hope the C++ version is more robust at least, e.g. prevents infinite
+// loops and is more tamper-resistant.
+
+struct PaneMatchObject {
+	ExtensionAPI::Pane pane;
+	SA::Span range;
+	int flags; // this is really part of the state, but is kept here for convenience
+	SA::Position endPosOrig; // has to do with preventing infinite loop on a 0-length match
+	bool RangeValid() const noexcept {
+		return (range.start >= 0) && (range.end >= 0) && (range.start <= range.end);
+	}
+};
+
+static int cf_match_replace(lua_State *L) {
+	PaneMatchObject *pmo = static_cast<PaneMatchObject *>(checkudata(L, 1, "SciTE_MT_PaneMatchObject"));
+	if (!pmo) {
+		raise_error(L, "Self argument for match:replace() should be a pane match object.");
+		return 0;
+	} else if (!pmo->RangeValid()) {
+		raise_error(L, "Blocked attempt to use invalidated pane match object.");
+		return 0;
+	}
+	const char *replacement = luaL_checkstring(L, 2);
+
+	// If an option were added to process \d back-references, it would just
+	// be an optional boolean argument, i.e. m:replace([[\1]], true), and
+	// this would just change ReplaceTarget to ReplaceTargetRE.
+	// The problem is, even if SCFIND_REGEXP was used, it's hard to know
+	// whether the back references are still valid.  So for now this is
+	// left out.
+
+	SA::ScintillaCall &sc = host->PaneCaller(pmo->pane);
+	sc.SetTarget(pmo->range);
+	sc.ReplaceTarget(lua_strlen(L, 2), replacement);
+	pmo->range.end = sc.TargetEnd();
+	return 0;
+}
+
+static int cf_match_metatable_index(lua_State *L) {
+	const PaneMatchObject *pmo = static_cast<PaneMatchObject *>(checkudata(L, 1, "SciTE_MT_PaneMatchObject"));
+	if (!pmo) {
+		raise_error(L, "Internal error: pane match object is missing.");
+		return 0;
+	} else if (!pmo->RangeValid()) {
+		raise_error(L, "Blocked attempt to use invalidated pane match object.");
+		return 0;
+	}
+
+	if (lua_isstring(L, 2)) {
+		const char *key = lua_tostring(L, 2);
+
+		if (0 == strcmp(key, "pos")) {
+			lua_pushinteger(L, pmo->range.start);
+			return 1;
+		} else if (0 == strcmp(key, "len")) {
+			lua_pushinteger(L, pmo->range.Length());
+			return 1;
+		} else if (0 == strcmp(key, "text")) {
+			// If the document is changed while in the match loop, this will be broken.
+			// Exception: if the changes are made exclusively through match:replace,
+			// everything will be fine.
+			const std::string range = host->Range(pmo->pane, pmo->range);
+			lua_pushstring(L, range.c_str());
+			return 1;
+		} else if (0 == strcmp(key, "replace")) {
+			const int replaceMethodIndex = lua_upvalueindex(1);
+			if (lua_iscfunction(L, replaceMethodIndex)) {
+				lua_pushvalue(L, replaceMethodIndex);
+				return 1;
+			} else {
+				return 0;
+			}
+		}
+	}
+
+	raise_error(L, "Invalid property / method name for pane match object.");
+	return 0;
+}
+
+static int cf_match_metatable_tostring(lua_State *L) {
+	const PaneMatchObject *pmo = static_cast<PaneMatchObject *>(checkudata(L, 1, "SciTE_MT_PaneMatchObject"));
+	if (!pmo) {
+		raise_error(L, "Internal error: pane match object is missing.");
+		return 0;
+	} else if (!pmo->RangeValid()) {
+		lua_pushliteral(L, "match(invalidated)");
+		return 1;
+	} else {
+		lua_pushfstring(L, "match{pos=%d,len=%d}", pmo->range.start, pmo->range.Length());
+		return 1;
+	}
+}
+
+static int cf_pane_match(lua_State *L) {
+	const int nargs = lua_gettop(L);
+
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+	luaL_checkstring(L, 2);
+
+	const int generatorIndex = lua_upvalueindex(1);
+	if (!lua_isfunction(L, generatorIndex)) {
+		raise_error(L, "Internal error: match generator is missing.");
+		return 0;
+	}
+
+	lua_pushvalue(L, generatorIndex);
+
+	// I'm putting some of the state in the match userdata for more convenient
+	// access.  But, the search string is going in state because that part is
+	// more convenient to leave in Lua form.
+	lua_pushvalue(L, 2);
+
+	PaneMatchObject *pmo = static_cast<PaneMatchObject *>(lua_newuserdata(L, sizeof(PaneMatchObject)));
+	if (pmo) {
+		pmo->pane = p;
+		pmo->range = SA::Span(-1, 0);
+		pmo->endPosOrig = 0;
+		pmo->flags = 0;
+		if (nargs >= 3) {
+			pmo->flags = luaL_checkint(L, 3);
+			if (nargs >= 4) {
+				pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4);
+				if (pmo->range.end < 0) {
+					raise_error(L, "Invalid argument 3 for <pane>:match.  Positive number or zero expected.");
+					return 0;
+				}
+			}
+		}
+		if (luaL_newmetatable(L, "SciTE_MT_PaneMatchObject")) {
+			lua_pushliteral(L, "__index");
+			lua_pushcfunction(L, cf_match_replace);
+			lua_pushcclosure(L, cf_match_metatable_index, 1);
+			lua_settable(L, -3);
+
+			lua_pushliteral(L, "__tostring");
+			lua_pushcfunction(L, cf_match_metatable_tostring);
+			lua_settable(L, -3);
+		}
+		lua_setmetatable(L, -2);
+
+		return 3;
+	} else {
+		raise_error(L, "Internal error: could not create match object.");
+		return 0;
+	}
+}
+
+static int cf_pane_match_generator(lua_State *L) {
+	const char *text = lua_tostring(L, 1);
+	PaneMatchObject *pmo = static_cast<PaneMatchObject *>(checkudata(L, 2, "SciTE_MT_PaneMatchObject"));
+
+	if (!(text)) {
+		raise_error(L, "Internal error: invalid state for <pane>:match generator.");
+		return 0;
+	} else if (!pmo) {
+		raise_error(L, "Internal error: invalid match object initializer for <pane>:match generator");
+		return 0;
+	}
+
+	if ((pmo->range.end < 0) || (pmo->range.end < pmo->range.start)) {
+		raise_error(L, "Blocked attempt to use invalidated pane match object.");
+		return 0;
+	}
+
+	SA::Position searchPos = pmo->range.end;
+	if ((pmo->range.start == pmo->endPosOrig) && (pmo->range.end == pmo->endPosOrig)) {
+		// prevent infinite loop on zero-length match by stepping forward
+		searchPos++;
+	}
+
+	SA::ScintillaCall &sc = host->PaneCaller(pmo->pane);
+
+	const SA::Span range(searchPos, sc.Length());
+
+	if (range.end > range.start) {
+		sc.SetTarget(range);
+		sc.SetSearchFlags(static_cast<SA::FindOption>(pmo->flags));
+		const SA::Span result = sc.SpanSearchInTarget(text);
+		if (result.start >= 0) {
+			pmo->range = result;
+			pmo->endPosOrig = result.end;
+			lua_pushvalue(L, 2);
+			return 1;
+		}
+	}
+
+	// One match object is used throughout the entire iteration.
+	// This means it's bad to try to save the match object for later
+	// reference.
+	pmo->range.start = pmo->range.end = pmo->endPosOrig = -1;
+	lua_pushnil(L);
+	return 1;
+}
+
+static int cf_props_metatable_index(lua_State *L) {
+	const int selfArg = lua_isuserdata(L, 1) ? 1 : 0;
+
+	if (lua_isstring(L, selfArg + 1)) {
+		std::string value = host->Property(lua_tostring(L, selfArg + 1));
+		lua_pushstring(L, value.c_str());
+		return 1;
+	} else {
+		raise_error(L, "String argument required for property access");
+	}
+	return 0;
+}
+
+static int cf_props_metatable_newindex(lua_State *L) {
+	const int selfArg = lua_isuserdata(L, 1) ? 1 : 0;
+
+	const char *key = lua_isstring(L, selfArg + 1) ? lua_tostring(L, selfArg + 1) : nullptr;
+	const char *val = lua_tostring(L, selfArg + 2);
+
+	if (key && *key) {
+		if (val) {
+			host->SetProperty(key, val);
+		} else if (lua_isnil(L, selfArg + 2)) {
+			host->UnsetProperty(key);
+		} else {
+			raise_error(L, "Expected string or nil for property assignment.");
+		}
+	} else {
+		raise_error(L, "Property name must be a non-empty string.");
+	}
+	return 0;
+}
+
+/*
+static int cf_os_execute(lua_State *L) {
+	// The SciTE version of os.execute would pipe its stdout and stderr
+	// to the output pane.  This can be implemented in terms of popen
+	// on GTK and in terms of CreateProcess on Windows.  Either way,
+	// stdin should be null, and the Lua script should wait for the
+	// subprocess to finish before continuing.  (What if it takes
+	// a very long time?  Timeout?)
+
+	raise_error(L, "Not implemented.");
+	return 0;
+}
+*/
+
+static int cf_global_print(lua_State *L) {
+	const int nargs = lua_gettop(L);
+
+	lua_getglobal(L, "tostring");
+
+	for (int i = 1; i <= nargs; ++i) {
+		if (i > 1)
+			host->Trace("\t");
+
+		const char *argStr = lua_tostring(L, i);
+		if (argStr) {
+			host->Trace(argStr);
+		} else {
+			lua_pushvalue(L, -1); // tostring
+			lua_pushvalue(L, i);
+			lua_call(L, 1, 1);
+			argStr = lua_tostring(L, -1);
+			if (argStr) {
+				host->Trace(argStr);
+			} else {
+				raise_error(L, "tostring (called from print) returned a non-string");
+			}
+			lua_settop(L, nargs + 1);
+		}
+	}
+
+	host->Trace("\n");
+	return 0;
+}
+
+
+static int cf_global_trace(lua_State *L) {
+	const char *s = lua_tostring(L, 1);
+	if (s) {
+		host->Trace(s);
+	}
+	return 0;
+}
+
+static int cf_global_dostring(lua_State *L) {
+	const int nargs = lua_gettop(L);
+	const char *code = luaL_checkstring(L, 1);
+	const char *name = luaL_optstring(L, 2, code);
+	if (0 == luaL_loadbuffer(L, code, lua_strlen(L, 1), name)) {
+		lua_call(L, 0, LUA_MULTRET);
+		return lua_gettop(L) - nargs;
+	} else {
+		raise_error(L);
+	}
+	return 0;
+}
+
+static bool call_function(lua_State *L, int nargs, bool ignoreFunctionReturnValue=false) {
+	bool handled = false;
+	if (L) {
+		int traceback = 0;
+		if (tracebackEnabled) {
+			lua_getglobal(L, "debug");
+			lua_getfield(L, -1, "traceback");
+			lua_remove(L, -2);
+			if (lua_isfunction(L, -1)) {
+				traceback = lua_gettop(L) - nargs - 1;
+				lua_insert(L, traceback);
+			} else {
+				lua_pop(L, 1);
+			}
+		}
+
+		const int result = lua_pcall(L, nargs, ignoreFunctionReturnValue ? 0 : 1, traceback);
+
+		if (traceback) {
+			lua_remove(L, traceback);
+		}
+
+		if (0 == result) {
+			if (ignoreFunctionReturnValue) {
+				handled = true;
+			} else {
+				handled = (0 != lua_toboolean(L, -1));
+				lua_pop(L, 1);
+			}
+		} else if (result == LUA_ERRRUN) {
+			lua_getglobal(L, "print");
+			lua_insert(L, -2); // use pushed error message
+			lua_pcall(L, 1, 0, 0);
+		} else {
+			lua_pop(L, 1);
+			if (result == LUA_ERRMEM) {
+				host->Trace("> Lua: memory allocation error\n");
+			} else if (result == LUA_ERRERR) {
+				host->Trace("> Lua: an error occurred, but cannot be reported due to failure in _TRACEBACK\n");
+			} else {
+				host->Trace("> Lua: unexpected error\n");
+			}
+		}
+	}
+	return handled;
+}
+
+static bool HasNamedFunction(const char *name) noexcept {
+	bool hasFunction = false;
+	if (luaState) {
+		hasFunction = lua_getglobal(luaState, name) != LUA_TNIL;
+		lua_pop(luaState, 1);
+	}
+	return hasFunction;
+}
+
+static bool CallNamedFunction(const char *name) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, name) != LUA_TNIL) {
+			handled = call_function(luaState, 0);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+static bool CallNamedFunction(const char *name, const char *arg) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, name) != LUA_TNIL) {
+			lua_pushstring(luaState, arg);
+			handled = call_function(luaState, 1);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+static bool CallNamedFunction(const char *name, int numberArg, const char *stringArg) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, name) != LUA_TNIL) {
+			lua_pushinteger(luaState, numberArg);
+			lua_pushstring(luaState, stringArg);
+			handled = call_function(luaState, 2);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+static bool CallNamedFunction(const char *name, int numberArg, int numberArg2) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, name) != LUA_TNIL) {
+			lua_pushinteger(luaState, numberArg);
+			lua_pushinteger(luaState, numberArg2);
+			handled = call_function(luaState, 2);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+static int iface_function_helper(lua_State *L, const IFaceFunction &func) {
+	const ExtensionAPI::Pane p = check_pane_object(L, 1);
+
+	int arg = 2;
+
+	intptr_t params[2] = {0, 0};
+
+	std::string stringResult;
+	bool needStringResult = false;
+
+	int loopParamCount = 2;
+
+	if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) {
+		params[0] = lua_strlen(L, arg);
+		params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : "");
+		loopParamCount = 0;
+	} else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) {
+		needStringResult = true;
+		// The buffer will be allocated later, so it won't leak if Lua does
+		// a longjmp in response to a bad arg.
+		if (func.paramType[0] == iface_length) {
+			loopParamCount = 0;
+		} else {
+			loopParamCount = 1;
+		}
+	}
+
+	for (int i=0; i<loopParamCount; ++i) {
+		if (func.paramType[i] == iface_string) {
+			const char *s = lua_tostring(L, arg++);
+			params[i] = SptrFromString(s ? s : "");
+		} else if (func.paramType[i] == iface_keymod) {
+			const int keycode = luaL_checkint(L, arg++) & 0xFFFF;
+			const int modifiers = luaL_checkint(L, arg++) &
+					      static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt);
+			params[i] = keycode | (modifiers<<16);
+		} else if (func.paramType[i] == iface_bool) {
+			params[i] = lua_toboolean(L, arg++);
+		} else if (IFaceTypeIsNumeric(func.paramType[i])) {
+			params[i] = luaL_checkinteger(L, arg++);
+		}
+	}
+
+	if (needStringResult) {
+		const intptr_t stringResultLen = host->Send(p, static_cast<SA::Message>(func.value), params[0], 0);
+		if (stringResultLen > 0) {
+			// not all string result methods are guaranteed to add a null terminator
+			stringResult.assign(stringResultLen + 1, '\0');
+			params[1] = SptrFromPointer(&stringResult[0]);
+		} else {
+			// Is this an error?  Are there any cases where it's not an error,
+			// and where the right thing to do is just return a blank string?
+			return 0;
+		}
+		if (func.paramType[0] == iface_length) {
+			params[0] = stringResultLen;
+		}
+	}
+
+	// Now figure out what to do with the param types and return type.
+	// - stringresult gets inserted at the start of return tuple.
+	// - numeric return type gets returned to lua as a number (following the stringresult)
+	// - other return types e.g. void get dropped.
+
+	intptr_t result = 0;
+	try {
+		result = host->Send(p, static_cast<SA::Message>(func.value), params[0], params[1]);
+	} catch (const SA::Failure &sf) {
+		std::string failureExplanation;
+		failureExplanation += ">Lua: Scintilla failure ";
+		failureExplanation += StdStringFromInteger(static_cast<int>(sf.status));
+		failureExplanation += " for message ";
+		failureExplanation += StdStringFromInteger(func.value);
+		failureExplanation += ".\n";
+		// Reset status before continuing
+		host->PaneCaller(p).SetStatus(SA::Status::Ok);
+		host->Trace(failureExplanation.c_str());
+	}
+
+	int resultCount = 0;
+
+	if (needStringResult) {
+		lua_pushstring(L, stringResult.c_str());
+		resultCount++;
+	}
+
+	if (func.returnType == iface_bool) {
+		lua_pushboolean(L, static_cast<int>(result));
+		resultCount++;
+	} else if (IFaceTypeIsNumeric(func.returnType)) {
+		lua_pushinteger(L, result);
+		resultCount++;
+	}
+
+	return resultCount;
+}
+
+struct IFacePropertyBinding {
+	ExtensionAPI::Pane pane;
+	const IFaceProperty *prop;
+};
+
+static int cf_ifaceprop_metatable_index(lua_State *L) {
+	// if there is a getter, __index calls it
+	// otherwise, __index raises "property 'name' is write-only".
+	const IFacePropertyBinding *ipb = static_cast<IFacePropertyBinding *>(checkudata(L, 1, "SciTE_MT_IFacePropertyBinding"));
+	if (!(ipb && IFacePropertyIsScriptable(*(ipb->prop)))) {
+		raise_error(L, "Internal error: property binding is improperly set up");
+		return 0;
+	}
+	if (ipb->prop->getter == 0) {
+		raise_error(L, "Attempt to read a write-only indexed property");
+		return 0;
+	}
+	const IFaceFunction func = ipb->prop->GetterFunction();
+
+	// rewrite the stack to match what the function expects.  put pane at index 1; param is already at index 2.
+	push_pane_object(L, ipb->pane);
+	lua_replace(L, 1);
+	lua_settop(L, 2);
+	return iface_function_helper(L, func);
+}
+
+static int cf_ifaceprop_metatable_newindex(lua_State *L) {
+	const IFacePropertyBinding *ipb = static_cast<IFacePropertyBinding *>(checkudata(L, 1, "SciTE_MT_IFacePropertyBinding"));
+	if (!(ipb && IFacePropertyIsScriptable(*(ipb->prop)))) {
+		raise_error(L, "Internal error: property binding is improperly set up");
+		return 0;
+	}
+	if (ipb->prop->setter == 0) {
+		raise_error(L, "Attempt to write a read-only indexed property");
+		return 0;
+	}
+	const IFaceFunction func = ipb->prop->SetterFunction();
+
+	// rewrite the stack to match what the function expects.
+	// pane at index 1; param at index 2, value at index 3
+	push_pane_object(L, ipb->pane);
+	lua_replace(L, 1);
+	lua_settop(L, 3);
+	return iface_function_helper(L, func);
+}
+
+static int cf_pane_iface_function(lua_State *L) {
+	const int funcidx = lua_upvalueindex(1);
+	const IFaceFunction *func = static_cast<IFaceFunction *>(lua_touserdata(L, funcidx));
+	if (func) {
+		return iface_function_helper(L, *func);
+	} else {
+		raise_error(L, "Internal error - bad upvalue in iface function closure");
+		return 0;
+	}
+}
+
+static int push_iface_function(lua_State *L, const char *name) {
+	int i = IFaceTable::FindFunction(name);
+	if (i >= 0) {
+		if (IFaceFunctionIsScriptable(IFaceTable::functions[i])) {
+			lua_pushlightuserdata(L, const_cast<IFaceFunction *>(IFaceTable::functions+i));
+			lua_pushcclosure(L, cf_pane_iface_function, 1);
+
+			// Since Lua experts say it is inefficient to create closures / cfunctions
+			// in an inner loop, I tried caching the closures in the metatable, and looking
+			// for them there first.  However, it made very little difference and did not
+			// seem worth the added complexity. - WBD
+
+			return 1;
+		}
+	}
+	return -1; // signal to try next pane index handler
+}
+
+static int push_iface_propval(lua_State *L, const char *name) {
+	// this function doesn't raise errors, but returns 0 if the function is not handled.
+
+	const int propidx = IFaceTable::FindProperty(name);
+	if (propidx >= 0) {
+		const IFaceProperty &prop = IFaceTable::properties[propidx];
+		if (!IFacePropertyIsScriptable(prop)) {
+			raise_error(L, "Error: iface property is not scriptable.");
+			return -1;
+		}
+
+		if (prop.paramType == iface_void) {
+			if (prop.getter) {
+				lua_settop(L, 1);
+				return iface_function_helper(L, prop.GetterFunction());
+			}
+		} else if (prop.paramType == iface_bool) {
+			// The bool getter is untested since there are none in the iface.
+			// However, the following is suggested as a reference protocol.
+			const ExtensionAPI::Pane p = check_pane_object(L, 1);
+
+			if (prop.getter) {
+				if (host->Send(p, static_cast<SA::Message>(prop.getter), 1, 0)) {
+					lua_pushnil(L);
+					return 1;
+				} else {
+					lua_settop(L, 1);
+					lua_pushboolean(L, 0);
+					return iface_function_helper(L, prop.GetterFunction());
+				}
+			}
+		} else {
+			// Indexed property.  These return an object with the following behavior:
+			// if there is a getter, __index calls it
+			// otherwise, __index raises "property 'name' is write-only".
+			// if there is a setter, __newindex calls it
+			// otherwise, __newindex raises "property 'name' is read-only"
+
+			IFacePropertyBinding *ipb = static_cast<IFacePropertyBinding *>(lua_newuserdata(L, sizeof(IFacePropertyBinding)));
+			if (ipb) {
+				ipb->pane = check_pane_object(L, 1);
+				ipb->prop = &prop;
+				if (luaL_newmetatable(L, "SciTE_MT_IFacePropertyBinding")) {
+					lua_pushliteral(L, "__index");
+					lua_pushcfunction(L, cf_ifaceprop_metatable_index);
+					lua_settable(L, -3);
+					lua_pushliteral(L, "__newindex");
+					lua_pushcfunction(L, cf_ifaceprop_metatable_newindex);
+					lua_settable(L, -3);
+				}
+				lua_setmetatable(L, -2);
+				return 1;
+			} else {
+				raise_error(L, "Internal error: failed to allocate userdata for indexed property");
+				return -1;
+			}
+		}
+	}
+
+	return -1; // signal to try next pane index handler
+}
+
+static int cf_pane_metatable_index(lua_State *L) {
+	if (lua_isstring(L, 2)) {
+		const char *name = lua_tostring(L, 2);
+
+		// these return the number of values pushed (possibly 0), or -1 if no match
+		int results = push_iface_function(L, name);
+		if (results < 0)
+			results = push_iface_propval(L, name);
+
+		if (results >= 0) {
+			return results;
+		} else if (name[0] != '_') {
+			lua_getmetatable(L, 1);
+			if (lua_istable(L, -1)) {
+				lua_pushvalue(L, 2);
+				lua_gettable(L, -2);
+				if (!lua_isnil(L, -1))
+					return 1;
+			}
+		}
+	}
+
+	raise_error(L, "Pane function / readable property / indexed writable property name expected");
+	return 0;
+}
+
+static int cf_pane_metatable_newindex(lua_State *L) {
+	if (lua_isstring(L, 2)) {
+		const int propidx = IFaceTable::FindProperty(lua_tostring(L, 2));
+		if (propidx >= 0) {
+			const IFaceProperty &prop = IFaceTable::properties[propidx];
+			if (IFacePropertyIsScriptable(prop)) {
+				if (prop.setter) {
+					// stack needs to be rearranged to look like an iface function call
+					lua_remove(L, 2);
+
+					if (prop.paramType == iface_void) {
+						return iface_function_helper(L, prop.SetterFunction());
+
+					} else if ((prop.paramType == iface_bool)) {
+						if (!lua_isnil(L, 3)) {
+							lua_pushboolean(L, 1);
+							lua_insert(L, 2);
+						} else {
+							// the nil will do as a false value.
+							// just push an arbitrary numeric value that Scintilla will ignore
+							lua_pushinteger(L, 0);
+						}
+						return iface_function_helper(L, prop.SetterFunction());
+
+					} else {
+						raise_error(L, "Error - (pane object) cannot assign directly to indexed property");
+					}
+				} else {
+					raise_error(L, "Error - (pane object) cannot assign to a read-only property");
+				}
+			}
+		}
+	}
+
+	raise_error(L, "Error - (pane object) expected the name of a writable property");
+	return 0;
+}
+
+void push_pane_object(lua_State *L, ExtensionAPI::Pane p) noexcept {
+	*static_cast<ExtensionAPI::Pane *>(lua_newuserdata(L, sizeof(p))) = p;
+	if (luaL_newmetatable(L, "SciTE_MT_Pane")) {
+		lua_pushcfunction(L, cf_pane_metatable_index);
+		lua_setfield(L, -2, "__index");
+		lua_pushcfunction(L, cf_pane_metatable_newindex);
+		lua_setfield(L, -2, "__newindex");
+
+		// Push built-in functions into the metatable, where the custom
+		// __index metamethod will find them.
+
+		lua_pushcfunction(L, cf_pane_findtext);
+		lua_setfield(L, -2, "findtext");
+		lua_pushcfunction(L, cf_pane_textrange);
+		lua_setfield(L, -2, "textrange");
+		lua_pushcfunction(L, cf_pane_insert);
+		lua_setfield(L, -2, "insert");
+		lua_pushcfunction(L, cf_pane_remove);
+		lua_setfield(L, -2, "remove");
+		lua_pushcfunction(L, cf_pane_append);
+		lua_setfield(L, -2, "append");
+
+		lua_pushcfunction(L, cf_pane_match_generator);
+		lua_pushcclosure(L, cf_pane_match, 1);
+		lua_setfield(L, -2, "match");
+	}
+	lua_setmetatable(L, -2);
+}
+
+static int cf_global_metatable_index(lua_State *L) {
+	if (lua_isstring(L, 2)) {
+		const char *name = lua_tostring(L, 2);
+		if ((name[0] < 'A') || (name[0] > 'Z') || ((name[1] >= 'a') && (name[1] <= 'z'))) {
+			// short circuit; iface constants are always upper-case and start with a letter
+			return 0;
+		}
+
+		int i = IFaceTable::FindConstant(name);
+		if (i >= 0) {
+			lua_pushinteger(L, IFaceTable::constants[i].value);
+			return 1;
+		} else {
+			i = IFaceTable::FindFunctionByConstantName(name);
+			if (i >= 0) {
+				lua_pushinteger(L, IFaceTable::functions[i].value);
+
+				// FindFunctionByConstantName is slow, so cache the result into the
+				// global table.  My tests show this gives an order of magnitude
+				// improvement.
+				lua_pushvalue(L, 2);
+				lua_pushvalue(L, -2);
+				lua_rawset(L, 1);
+
+				return 1;
+			}
+		}
+	}
+
+	return 0; // global namespace access should not raise errors
+}
+
+static int LuaPanicFunction(lua_State *L) {
+	if (L == luaState) {
+		lua_close(luaState);
+		luaState = nullptr;
+		luaDisabled = true;
+	}
+	host->Trace("\n> Lua: error occurred in unprotected call.  This is very bad.\n");
+	return 1;
+}
+
+// Don't initialise Lua in LuaExtension::Initialise.  Wait and initialise Lua the
+// first time Lua is used, e.g. when a Load event is called with an argument that
+// appears to be the name of a Lua script.  This just-in-time initialisation logic
+// does add a little extra complexity but not a lot.  It's probably worth it,
+// since it means a user who is having trouble with Lua can just refrain from
+// using it.
+
+static bool CheckStartupScript() {
+	startupScript = host->Property("ext.lua.startup.script");
+	return startupScript.length() > 0;
+}
+
+static void PublishGlobalBufferData() noexcept {
+// release 1.62
+// A Lua table called 'buffer' is associated with each buffer
+// and can be used to maintain buffer-specific state.
+	if (curBufferIndex >= 0) {
+		lua_pushliteral(luaState, "SciTE_BufferData_Array");
+		lua_rawget(luaState, LUA_REGISTRYINDEX);
+		// Create new SciTE_BufferData_Array / append to LUA_REGISTRYINDEX
+		if (!lua_istable(luaState, -1)) {
+			lua_pop(luaState, 1);
+			lua_newtable(luaState);
+			lua_pushliteral(luaState, "SciTE_BufferData_Array");
+			lua_pushvalue(luaState, -2);
+			lua_rawset(luaState, LUA_REGISTRYINDEX);
+		}
+		//  create new entry for current buffer in SciTE_BufferData_Array(idx)
+		lua_rawgeti(luaState, -1, curBufferIndex);
+		if (!lua_istable(luaState, -1)) {
+			lua_pop(luaState, 1);
+			lua_newtable(luaState);
+			// remember it
+			lua_pushvalue(luaState, -1);
+			lua_rawseti(luaState, -3, curBufferIndex);
+		}
+		// replace SciTE_BufferData_Array on the Stack (Leaving (buffer=-1, 'buffer'=-2))
+		// done to apply the expanded  SciTE_BufferData_Array ?
+		lua_replace(luaState, -2);
+	} else {
+		/// ensure that the luatable "buffer" will be empty during startup and before any InitBuffer / ActivateBuffer
+		lua_pushnil(luaState);
+	}
+	lua_setglobal(luaState, "buffer");
+}
+
+static bool InitGlobalScope(bool checkProperties, bool forceReload = false) {
+	bool reload = forceReload;
+	if (checkProperties) {
+		const int resetMode = GetPropertyInt("ext.lua.reset");
+		if (resetMode >= 1) {
+			reload = true;
+		}
+	}
+
+	tracebackEnabled = (GetPropertyInt("ext.lua.debug.traceback") == 1);
+
+	if (luaState) {
+		// The Clear / Load used to use metatables to setup without having to re-run the scripts,
+		// but this was unreliable e.g. a few library functions and some third-party code use
+		// rawget to access functions in the global scope.  So the new method makes a shallow
+		// copy of the initialized global environment, and uses that to re-init the scope.
+
+		if (!reload) {
+			lua_pushglobaltable(luaState);
+			lua_getfield(luaState, LUA_REGISTRYINDEX, "SciTE_InitialState");
+			if (lua_istable(luaState, -1)) {
+				clear_table(luaState, -2, true);
+				merge_table(luaState, -2, -1, true);
+				lua_pop(luaState, 2);
+
+				// restore initial package.loaded state
+				lua_getfield(luaState, LUA_REGISTRYINDEX, "SciTE_InitialPackageState");
+				lua_getfield(luaState, LUA_REGISTRYINDEX, "_LOADED");
+				clear_table(luaState, -1, false);
+				merge_table(luaState, -1, -2, false);
+				lua_pop(luaState, 2);
+
+				PublishGlobalBufferData();
+
+				return true;
+			} else {
+				lua_pop(luaState, 1);
+			}
+		}
+
+		// reload mode is enabled, or else the initial state has been broken.
+		// either way, we're going to need a "new" initial state.
+
+		lua_pushnil(luaState);
+		lua_setfield(luaState, LUA_REGISTRYINDEX, "SciTE_InitialState");
+
+		// Also reset buffer data, since scripts might depend on this to know
+		// whether they need to re-initialize something.
+		lua_pushnil(luaState);
+		lua_setfield(luaState, LUA_REGISTRYINDEX, "SciTE_BufferData_Array");
+
+		// Don't replace global scope using new_table, because then startup script is
+		// bound to a different copy of the globals than the extension script.
+
+		lua_pushglobaltable(luaState);
+		clear_table(luaState, -1, true);
+		lua_pop(luaState, 1);
+
+		// Lua 5.1: _LOADED is in LUA_REGISTRYINDEX, so it must be cleared before
+		// loading libraries or they will not load because Lua's package system
+		// thinks they are already loaded
+		lua_pushnil(luaState);
+		lua_setfield(luaState, LUA_REGISTRYINDEX, "_LOADED");
+
+	} else if (!luaDisabled) {
+		luaState = luaL_newstate();
+		if (!luaState) {
+			luaDisabled = true;
+			host->Trace("> Lua: scripting engine failed to initialise\n");
+			return false;
+		}
+		lua_atpanic(luaState, LuaPanicFunction);
+
+	} else {
+		return false;
+	}
+
+	// ...register standard libraries
+	luaL_openlibs(luaState);
+
+	lua_register(luaState, "_ALERT", cf_global_print);
+
+	// although this is mostly redundant with output:append
+	// it is still included for now
+	lua_register(luaState, "trace", cf_global_trace);
+
+	// emulate a Lua 4 function that is useful in menu commands
+	lua_register(luaState, "dostring", cf_global_dostring);
+
+	// override a library function whose default impl uses stdout
+	lua_register(luaState, "print", cf_global_print);
+
+	// props object - provides access to Property and SetProperty
+	lua_newuserdata(luaState, 1); // the value doesn't matter.
+	if (luaL_newmetatable(luaState, "SciTE_MT_Props")) {
+		lua_pushcfunction(luaState, cf_props_metatable_index);
+		lua_setfield(luaState, -2, "__index");
+		lua_pushcfunction(luaState, cf_props_metatable_newindex);
+		lua_setfield(luaState, -2, "__newindex");
+	}
+	lua_setmetatable(luaState, -2);
+	lua_setglobal(luaState, "props");
+
+	// pane objects
+	push_pane_object(luaState, ExtensionAPI::paneEditor);
+	lua_setglobal(luaState, "editor");
+
+	push_pane_object(luaState, ExtensionAPI::paneOutput);
+	lua_setglobal(luaState, "output");
+
+	// scite
+	lua_newtable(luaState);
+
+	lua_getglobal(luaState, "editor");
+	lua_pushcclosure(luaState, cf_scite_send, 1);
+	lua_setfield(luaState, -2, "SendEditor");
+
+	lua_getglobal(luaState, "output");
+	lua_pushcclosure(luaState, cf_scite_send, 1);
+	lua_setfield(luaState, -2, "SendOutput");
+
+	lua_pushcfunction(luaState, cf_scite_constname);
+	lua_setfield(luaState, -2, "ConstantName");
+
+	lua_pushcfunction(luaState, cf_scite_open);
+	lua_setfield(luaState, -2, "Open");
+
+	lua_pushcfunction(luaState, cf_scite_menu_command);
+	lua_setfield(luaState, -2, "MenuCommand");
+
+	lua_pushcfunction(luaState, cf_scite_update_status_bar);
+	lua_setfield(luaState, -2, "UpdateStatusBar");
+
+	lua_pushcfunction(luaState, cf_scite_strip_show);
+	lua_setfield(luaState, -2, "StripShow");
+
+	lua_pushcfunction(luaState, cf_scite_strip_set);
+	lua_setfield(luaState, -2, "StripSet");
+
+	lua_pushcfunction(luaState, cf_scite_strip_set_list);
+	lua_setfield(luaState, -2, "StripSetList");
+
+	lua_pushcfunction(luaState, cf_scite_strip_value);
+	lua_setfield(luaState, -2, "StripValue");
+
+	lua_setglobal(luaState, "scite");
+
+	// append a Metatable onto global namespace, to publish iface constants
+	lua_pushglobaltable(luaState);
+	if (luaL_newmetatable(luaState, "SciTE_MT_GlobalScope")) {
+		lua_pushcfunction(luaState, cf_global_metatable_index);
+		lua_setfield(luaState, -2, "__index");
+	}
+
+	lua_setmetatable(luaState, -2);
+	lua_pop(luaState, 1);
+
+	if (checkProperties && reload) {
+		CheckStartupScript();
+	}
+
+	if (startupScript.length()) {
+		// TODO: Should buffer be deactivated temporarily, so editor iface
+		// functions won't be available during a reset, just as they are not
+		// available during a normal startup?  Are there any other functions
+		// that should be blocked during startup, e.g. the ones that allow
+		// you to add or switch buffers?
+
+		FilePath fpTest(GUI::StringFromUTF8(startupScript));
+		if (fpTest.Exists()) {
+			if (0 == luaL_loadfile(luaState, startupScript.c_str())) {
+				if (!call_function(luaState, 0, true)) {
+					host->Trace(">Lua: error occurred while running startup script\n");
+				}
+			} else {
+				host->Trace(lua_tostring(luaState, -1));
+				host->Trace("\n>Lua: error occurred while loading startup script\n");
+				lua_pop(luaState, 1);
+			}
+		}
+	}
+
+	// Clone the initial (globalsindex) state (including metatable) in the registry so that it can be restored.
+	// (If reset==1 this will not be used, but this is a shallow copy, not very expensive, and
+	// who knows what the value of reset will be the next time InitGlobalScope runs.)
+
+	lua_pushglobaltable(luaState);
+	clone_table(luaState, -1, true);
+	lua_setfield(luaState, LUA_REGISTRYINDEX, "SciTE_InitialState");
+	lua_pop(luaState, 1);
+
+	// Clone loaded packages (package.loaded) state in the registry so that it can be restored.
+	lua_getfield(luaState, LUA_REGISTRYINDEX, "_LOADED");
+	clone_table(luaState, -1);
+	lua_setfield(luaState, LUA_REGISTRYINDEX, "SciTE_InitialPackageState");
+	lua_pop(luaState, 1);
+
+	PublishGlobalBufferData();
+
+	return true;
+}
+
+bool LuaExtension::Initialise(ExtensionAPI *host_) {
+	host = host_;
+
+	if (CheckStartupScript()) {
+		InitGlobalScope(false);
+	}
+
+	return false;
+}
+
+bool LuaExtension::Finalise() noexcept {
+	if (luaState) {
+		lua_close(luaState);
+	}
+
+	luaState = nullptr;
+	host = nullptr;
+
+	// The rest don't strictly need to be cleared since they
+	// are never accessed except when luaState and host are set
+
+	startupScript.clear();
+
+	return false;
+}
+
+bool LuaExtension::Clear() {
+	if (luaState) {
+		CallNamedFunction("OnClear");
+	}
+	if (luaState) {
+		InitGlobalScope(true);
+		extensionScript.clear();
+	} else if ((GetPropertyInt("ext.lua.reset") >= 1) && CheckStartupScript()) {
+		InitGlobalScope(false);
+	}
+	return false;
+}
+
+bool LuaExtension::Load(const char *filename) {
+	bool loaded = false;
+
+	if (!luaDisabled) {
+		const size_t sl = strlen(filename);
+		if (sl >= 4 && strcmp(filename+sl-4, ".lua")==0) {
+			if (luaState || InitGlobalScope(false)) {
+				extensionScript = filename;
+				luaL_loadfile(luaState, extensionScript.c_str());
+				if (!call_function(luaState, 0, true)) {
+					host->Trace(">Lua: error occurred while loading extension script\n");
+				}
+				loaded = true;
+			}
+		}
+	}
+	return loaded;
+}
+
+
+bool LuaExtension::InitBuffer(int index) {
+	/*
+	char msg[100];
+	sprintf(msg, "InitBuffer(%d)\n", index);
+	host->Trace(msg);
+	*/
+
+	if (index > maxBufferIndex)
+		maxBufferIndex = index;
+
+	if (luaState) {
+		// This buffer might be recycled.  Clear the data associated
+		// with the old file.
+
+		lua_getfield(luaState, LUA_REGISTRYINDEX, "SciTE_BufferData_Array");
+		if (lua_istable(luaState, -1)) {
+			lua_pushnil(luaState);
+			lua_rawseti(luaState, -2, index);
+		}
+		lua_pop(luaState, 1);
+		// We also need to handle cases where Lua initialization is
+		// delayed (e.g. no startup script).  For that we'll just
+		// explicitly call InitBuffer(curBufferIndex)
+	}
+
+	curBufferIndex = index;
+
+	return false;
+}
+
+bool LuaExtension::ActivateBuffer(int index) {
+	/*
+	char msg[100];
+	sprintf(msg, "ActivateBuffer(%d)\n", index);
+	host->Trace(msg);
+	*/
+
+	// Probably don't need to do anything with Lua here.  Setting
+	// curBufferIndex is important so that InitGlobalScope knows
+	// which buffer is active, in order to populate the 'buffer'
+	// global with the right data.
+
+	curBufferIndex = index;
+
+	return false;
+}
+
+bool LuaExtension::RemoveBuffer(int index) {
+	//char msg[100];
+	//sprintf(msg, "RemoveBuffer(%d)\n", index);
+	//host->Trace(msg);
+
+	if (luaState) {
+		// Remove the bufferdata element at index, and move
+		// the other elements down.  The element at the
+		// current maxBufferIndex can be discarded after
+		// it gets copied to maxBufferIndex-1.
+
+		lua_getfield(luaState, LUA_REGISTRYINDEX, "SciTE_BufferData_Array");
+		if (lua_istable(luaState, -1)) {
+			for (lua_Integer i = index; i < maxBufferIndex; ++i) {
+				lua_rawgeti(luaState, -1, i+1);
+				lua_rawseti(luaState, -2, i);
+			}
+
+			lua_pushnil(luaState);
+			lua_rawseti(luaState, -2, maxBufferIndex);
+
+			lua_pop(luaState, 1); // the bufferdata table
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+
+	if (maxBufferIndex > 0)
+		maxBufferIndex--;
+
+	// Invalidate current buffer index; Activate or Init will follow.
+	curBufferIndex = -1;
+
+	return false;
+}
+
+bool LuaExtension::OnExecute(const char *s) {
+// gets called when selecting a luaScript within the tools menu
+// pcalls string.find(s) -> if that succeeds, insert the function onto the stack and try to call_function(s).
+	bool handled = false;
+	/*	std::string msg = "lua: selected Tools->";
+		msg.append(s);
+		msg.append("\n");
+		host->Trace(msg.c_str());
+	*/
+
+	if (luaState || InitGlobalScope(false)) {
+		// May as well use Lua's pattern matcher to parse the command.
+		// Scintilla's RESearch was the other option.
+		const int stackBase = lua_gettop(luaState);
+		lua_pushglobaltable(luaState);
+		lua_pushliteral(luaState, "string");
+		lua_rawget(luaState, -2);
+		if (lua_istable(luaState, -1)) {
+			lua_pushliteral(luaState, "find");
+			lua_rawget(luaState, -2);
+			if (lua_isfunction(luaState, -1)) {
+				lua_pushstring(luaState, s);
+				lua_pushliteral(luaState, "^%s*([%a_][%a%d_]*)%s*(.-)%s*$");
+				const int status = lua_pcall(luaState, 2, 4, 0);
+				if (status==0) {
+					lua_insert(luaState, stackBase+1);	//function
+					lua_gettable(luaState, LUA_GLOBALSINDEX);
+					if (!lua_isnil(luaState, -1)) {
+						if (lua_isfunction(luaState, -1)) {
+							// Try calling it and, even if it fails, short-circuit Filerx
+							handled = true;
+							lua_insert(luaState, stackBase+1);
+							lua_settop(luaState, stackBase+2);
+							if (!call_function(luaState, 1, true)) {
+								std::string traceMessage = "> Lua: error occurred while processing command '";
+								traceMessage += s;
+								traceMessage += "'\n";
+								host->Trace(traceMessage.c_str());
+							}
+						}
+					} else {
+						std::string traceMessage = "> Lua: error checking global scope for command '";
+						traceMessage += s;
+						traceMessage += "'\n";
+						host->Trace(traceMessage.c_str());
+					}
+				}
+			}
+		} else {
+			host->Trace("> Lua: string library not loaded\n");
+		}
+		lua_settop(luaState, stackBase);
+	}
+
+	return handled;
+}
+
+bool LuaExtension::OnOpen(const char *filename) {
+	return CallNamedFunction("OnOpen", filename);
+}
+
+bool LuaExtension::OnSwitchFile(const char *filename) {
+	return CallNamedFunction("OnSwitchFile", filename);
+}
+
+bool LuaExtension::OnBeforeSave(const char *filename) {
+	return CallNamedFunction("OnBeforeSave", filename);
+}
+
+bool LuaExtension::OnSave(const char *filename) {
+	const bool result = CallNamedFunction("OnSave", filename);
+
+	FilePath fpSaving = FilePath(GUI::StringFromUTF8(filename)).NormalizePath();
+	if (startupScript.length() && fpSaving == FilePath(GUI::StringFromUTF8(startupScript)).NormalizePath()) {
+		if (GetPropertyInt("ext.lua.auto.reload") > 0) {
+			InitGlobalScope(false, true);
+			if (extensionScript.length()) {
+				Load(extensionScript.c_str());
+			}
+		}
+	} else if (extensionScript.length() && 0 == strcmp(filename, extensionScript.c_str())) {
+		if (GetPropertyInt("ext.lua.auto.reload") > 0) {
+			InitGlobalScope(false, false);
+			Load(extensionScript.c_str());
+		}
+	}
+
+	return result;
+}
+
+bool LuaExtension::OnChar(char ch) {
+	const char chs[2] = {ch, '\0'};
+	return CallNamedFunction("OnChar", chs);
+}
+
+bool LuaExtension::OnSavePointReached() {
+	return CallNamedFunction("OnSavePointReached");
+}
+
+bool LuaExtension::OnSavePointLeft() {
+	return CallNamedFunction("OnSavePointLeft");
+}
+
+// Similar to StyleContext class in Scintilla
+struct StylingContext {
+	SA::Position startPos;
+	SA::Position lengthDoc;
+	int initStyle;
+	StyleWriter *styler;
+
+	SA::Position endPos;
+	SA::Position endDoc;
+
+	SA::Position currentPos;
+	bool atLineStart;
+	bool atLineEnd;
+	int state;
+
+	char cursor[3][8];
+	SA::Position cursorPos;
+	int codePage;
+	SA::Position lenCurrent;
+	SA::Position lenNext;
+
+	static StylingContext *Context(lua_State *L) noexcept {
+		return static_cast<StylingContext *>(
+			       lua_touserdata(L, lua_upvalueindex(1)));
+	}
+
+	void Colourize() {
+		SA::Position end = currentPos - 1;
+		if (end >= endDoc)
+			end = endDoc - 1;
+		styler->ColourTo(end, state);
+	}
+
+	static int Line(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Position position = luaL_checkinteger(L, 2);
+		lua_pushinteger(L, context->styler->GetLine(position));
+		return 1;
+	}
+
+	static int CharAt(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Position position = luaL_checkinteger(L, 2);
+		lua_pushinteger(L, context->styler->SafeGetCharAt(position));
+		return 1;
+	}
+
+	static int StyleAt(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Position position = luaL_checkinteger(L, 2);
+		lua_pushinteger(L, context->styler->StyleAt(position));
+		return 1;
+	}
+
+	static int LevelAt(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Line line = luaL_checkinteger(L, 2);
+		lua_pushinteger(L, static_cast<int>(context->styler->LevelAt(line)));
+		return 1;
+	}
+
+	static int SetLevelAt(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Line line = luaL_checkinteger(L, 2);
+		const int level = luaL_checkint(L, 3);
+		context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level));
+		return 0;
+	}
+
+	static int LineState(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Line line = luaL_checkinteger(L, 2);
+		lua_pushinteger(L, context->styler->GetLineState(line));
+		return 1;
+	}
+
+	static int SetLineState(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Line line = luaL_checkinteger(L, 2);
+		const int stateOfLine = luaL_checkint(L, 3);
+		context->styler->SetLineState(line, stateOfLine);
+		return 0;
+	}
+
+
+	void GetNextChar() {
+		lenCurrent = lenNext;
+		lenNext = 1;
+		const SA::Position nextPos = currentPos + lenCurrent;
+		unsigned char byteNext = styler->SafeGetCharAt(nextPos);
+		unsigned int nextSlot = (cursorPos + 1) % 3;
+		memcpy(cursor[nextSlot], "\0\0\0\0\0\0\0\0", 8);
+		cursor[nextSlot][0] = byteNext;
+		if (codePage) {
+			if (codePage == SA::CpUtf8) {
+				if (byteNext >= 0x80) {
+					cursor[nextSlot][1] = styler->SafeGetCharAt(nextPos+1);
+					lenNext = 2;
+					if (byteNext >= 0x80 + 0x40 + 0x20) {
+						lenNext = 3;
+						cursor[nextSlot][2] = styler->SafeGetCharAt(nextPos+2);
+						if (byteNext >= 0x80 + 0x40 + 0x20 + 0x10) {
+							lenNext = 4;
+							cursor[nextSlot][3] = styler->SafeGetCharAt(nextPos+3);
+						}
+					}
+				}
+			} else {
+				if (styler->IsLeadByte(byteNext)) {
+					lenNext = 2;
+					cursor[nextSlot][1] = styler->SafeGetCharAt(nextPos+1);
+				}
+			}
+		}
+
+		// End of line?
+		// Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win)
+		// or on LF alone (Unix). Avoid triggering two times on Dos/Win.
+		const char ch = cursor[(cursorPos) % 3][0];
+		atLineEnd = (ch == '\r' && cursor[nextSlot][0] != '\n') ||
+			    (ch == '\n') ||
+			    (currentPos >= endPos);
+	}
+
+	void StartStyling(SA::Position startPos_, SA::Position length, int initStyle_) {
+		endDoc = styler->Length();
+		endPos = startPos_ + length;
+		if (endPos == endDoc)
+			endPos = endDoc + 1;
+		currentPos = startPos_;
+		atLineStart = true;
+		atLineEnd = false;
+		state = initStyle_;
+		cursorPos = 0;
+		lenCurrent = 0;
+		lenNext = 0;
+		memcpy(cursor[0], "\0\0\0\0\0\0\0\0", 8);
+		memcpy(cursor[1], "\0\0\0\0\0\0\0\0", 8);
+		memcpy(cursor[2], "\0\0\0\0\0\0\0\0", 8);
+		styler->StartAt(startPos_, static_cast<char>(0xffu));
+		styler->StartSegment(startPos_);
+
+		GetNextChar();
+		cursorPos++;
+		GetNextChar();
+	}
+
+	static int EndStyling(lua_State *L) {
+		StylingContext *context = Context(L);
+		context->Colourize();
+		return 0;
+	}
+
+	static int StartStyling(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Position startPosStyle = luaL_checkinteger(L, 2);
+		const SA::Position lengthStyle = luaL_checkinteger(L, 3);
+		const int initialStyle = luaL_checkint(L, 4);
+		context->StartStyling(startPosStyle, lengthStyle, initialStyle);
+		return 0;
+	}
+
+	static int More(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushboolean(L, context->currentPos < context->endPos);
+		return 1;
+	}
+
+	void Forward() {
+		if (currentPos < endPos) {
+			atLineStart = atLineEnd;
+			currentPos += lenCurrent;
+			cursorPos++;
+			GetNextChar();
+		} else {
+			atLineStart = false;
+			memcpy(cursor[0], "\0\0\0\0\0\0\0\0", 8);
+			memcpy(cursor[1], "\0\0\0\0\0\0\0\0", 8);
+			memcpy(cursor[2], "\0\0\0\0\0\0\0\0", 8);
+			atLineEnd = true;
+		}
+	}
+
+	static int Forward(lua_State *L) {
+		StylingContext *context = Context(L);
+		context->Forward();
+		return 0;
+	}
+
+	static int Position(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushinteger(L, context->currentPos);
+		return 1;
+	}
+
+	static int AtLineStart(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushboolean(L, context->atLineStart);
+		return 1;
+	}
+
+	static int AtLineEnd(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushboolean(L, context->atLineEnd);
+		return 1;
+	}
+
+	static int State(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushinteger(L, context->state);
+		return 1;
+	}
+
+	static int SetState(lua_State *L) {
+		StylingContext *context = Context(L);
+		context->Colourize();
+		context->state = luaL_checkint(L, 2);
+		return 0;
+	}
+
+	static int ForwardSetState(lua_State *L) {
+		StylingContext *context = Context(L);
+		context->Forward();
+		context->Colourize();
+		context->state = luaL_checkint(L, 2);
+		return 0;
+	}
+
+	static int ChangeState(lua_State *L) {
+		StylingContext *context = Context(L);
+		context->state = luaL_checkint(L, 2);
+		return 0;
+	}
+
+	static int Current(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushstring(L, context->cursor[context->cursorPos % 3]);
+		return 1;
+	}
+
+	static int Next(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushstring(L, context->cursor[(context->cursorPos + 1) % 3]);
+		return 1;
+	}
+
+	static int Previous(lua_State *L) {
+		const StylingContext *context = Context(L);
+		lua_pushstring(L, context->cursor[(context->cursorPos + 2) % 3]);
+		return 1;
+	}
+
+	static int Token(lua_State *L) {
+		StylingContext *context = Context(L);
+		const SA::Position start = context->styler->GetStartSegment();
+		const SA::Position end = context->currentPos - 1;
+		SA::Position len = end - start + 1;
+		if (len <= 0)
+			len = 1;
+		std::string sReturn(len, '\0');
+		for (SA::Position i = 0; i < len; i++) {
+			sReturn[i] = context->styler->SafeGetCharAt(start + i);
+		}
+		lua_pushstring(L, sReturn.c_str());
+		return 1;
+	}
+
+	bool Match(const char *s) {
+		for (SA::Position n=0; *s; n++) {
+			if (*s != styler->SafeGetCharAt(currentPos+n))
+				return false;
+			s++;
+		}
+		return true;
+	}
+
+	static int Match(lua_State *L) {
+		StylingContext *context = Context(L);
+		const char *s = luaL_checkstring(L, 2);
+		lua_pushboolean(L, context->Match(s));
+		return 1;
+	}
+
+	void PushMethod(lua_State *L, lua_CFunction fn, const char *name) noexcept {
+		lua_pushlightuserdata(L, this);
+		lua_pushcclosure(L, fn, 1);
+		lua_setfield(luaState, -2, name);
+	}
+};
+
+bool LuaExtension::OnStyle(SA::Position startPos, SA::Position lengthDoc, int initStyle, StyleWriter *styler) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, "OnStyle") != LUA_TNIL) {
+
+			StylingContext sc {};
+			sc.startPos = startPos;
+			sc.lengthDoc = lengthDoc;
+			sc.initStyle = initStyle;
+			sc.styler = styler;
+			sc.codePage = host->PaneCaller(ExtensionAPI::paneEditor).CodePage();
+
+			lua_newtable(luaState);
+
+			lua_pushstring(luaState, "startPos");
+			lua_pushinteger(luaState, startPos);
+			lua_settable(luaState, -3);
+
+			lua_pushstring(luaState, "lengthDoc");
+			lua_pushinteger(luaState, lengthDoc);
+			lua_settable(luaState, -3);
+
+			lua_pushstring(luaState, "initStyle");
+			lua_pushinteger(luaState, initStyle);
+			lua_settable(luaState, -3);
+
+			lua_pushstring(luaState, "language");
+			std::string lang = host->Property("Language");
+			lua_pushstring(luaState, lang.c_str());
+			lua_settable(luaState, -3);
+
+			sc.PushMethod(luaState, StylingContext::Line, "Line");
+			sc.PushMethod(luaState, StylingContext::CharAt, "CharAt");
+			sc.PushMethod(luaState, StylingContext::StyleAt, "StyleAt");
+			sc.PushMethod(luaState, StylingContext::LevelAt, "LevelAt");
+			sc.PushMethod(luaState, StylingContext::SetLevelAt, "SetLevelAt");
+			sc.PushMethod(luaState, StylingContext::LineState, "LineState");
+			sc.PushMethod(luaState, StylingContext::SetLineState, "SetLineState");
+
+			sc.PushMethod(luaState, StylingContext::StartStyling, "StartStyling");
+			sc.PushMethod(luaState, StylingContext::EndStyling, "EndStyling");
+			sc.PushMethod(luaState, StylingContext::More, "More");
+			sc.PushMethod(luaState, StylingContext::Forward, "Forward");
+			sc.PushMethod(luaState, StylingContext::Position, "Position");
+			sc.PushMethod(luaState, StylingContext::AtLineStart, "AtLineStart");
+			sc.PushMethod(luaState, StylingContext::AtLineEnd, "AtLineEnd");
+			sc.PushMethod(luaState, StylingContext::State, "State");
+			sc.PushMethod(luaState, StylingContext::SetState, "SetState");
+			sc.PushMethod(luaState, StylingContext::ForwardSetState, "ForwardSetState");
+			sc.PushMethod(luaState, StylingContext::ChangeState, "ChangeState");
+			sc.PushMethod(luaState, StylingContext::Current, "Current");
+			sc.PushMethod(luaState, StylingContext::Next, "Next");
+			sc.PushMethod(luaState, StylingContext::Previous, "Previous");
+			sc.PushMethod(luaState, StylingContext::Token, "Token");
+			sc.PushMethod(luaState, StylingContext::Match, "Match");
+
+			handled = call_function(luaState, 1);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+bool LuaExtension::OnDoubleClick() {
+	return CallNamedFunction("OnDoubleClick");
+}
+
+bool LuaExtension::OnUpdateUI() {
+	return CallNamedFunction("OnUpdateUI");
+}
+
+bool LuaExtension::OnMarginClick() {
+	return CallNamedFunction("OnMarginClick");
+}
+
+bool LuaExtension::OnUserListSelection(int listType, const char *selection) {
+	return CallNamedFunction("OnUserListSelection", listType, selection);
+}
+
+namespace {
+
+bool CheckModifiers(int modifiers, SA::KeyMod mod) noexcept {
+	return (static_cast<int>(mod) & modifiers) != 0;
+}
+
+}
+
+bool LuaExtension::OnKey(int keyval, int modifiers) {
+	bool handled = false;
+	if (luaState) {
+		if (lua_getglobal(luaState, "OnKey") != LUA_TNIL) {
+			lua_pushinteger(luaState, keyval);
+			lua_pushboolean(luaState, CheckModifiers(modifiers, SA::KeyMod::Shift)); // shift/lock
+			lua_pushboolean(luaState, CheckModifiers(modifiers, SA::KeyMod::Ctrl)); // control
+			lua_pushboolean(luaState, CheckModifiers(modifiers, SA::KeyMod::Alt)); // alt
+			handled = call_function(luaState, 4);
+		} else {
+			lua_pop(luaState, 1);
+		}
+	}
+	return handled;
+}
+
+bool LuaExtension::OnDwellStart(SA::Position pos, const char *word) {
+	return CallNamedFunction("OnDwellStart", pos, word);
+}
+
+bool LuaExtension::OnClose(const char *filename) {
+	return CallNamedFunction("OnClose", filename);
+}
+
+bool LuaExtension::OnUserStrip(int control, int change) {
+	return CallNamedFunction("OnStrip", control, change);
+}
+
+bool LuaExtension::NeedsOnClose() {
+	return HasNamedFunction("OnClose");
+}
diff --git a/scite-app/scite/src/LuaExtension.h b/scite-app/scite/src/LuaExtension.h
new file mode 100644
index 0000000..0374bb0
--- /dev/null
+++ b/scite-app/scite/src/LuaExtension.h
@@ -0,0 +1,50 @@
+// SciTE - Scintilla based Text Editor
+// LuaExtension.h - Lua scripting extension
+// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef LUAEXTENSION_H
+#define LUAEXTENSION_H
+
+class LuaExtension : public Extension {
+private:
+	LuaExtension(); // Singleton
+
+public:
+	static LuaExtension &Instance();
+
+	// Deleted so LuaExtension objects can not be copied.
+	LuaExtension(const LuaExtension &) = delete;
+	void operator=(const LuaExtension &) = delete;
+	~LuaExtension() override;
+
+	bool Initialise(ExtensionAPI *host_) override;
+	bool Finalise() noexcept override;
+	bool Clear() override;
+	bool Load(const char *filename) override;
+
+	bool InitBuffer(int) override;
+	bool ActivateBuffer(int) override;
+	bool RemoveBuffer(int) override;
+
+	bool OnOpen(const char *filename) override;
+	bool OnSwitchFile(const char *filename) override;
+	bool OnBeforeSave(const char *filename) override;
+	bool OnSave(const char *filename) override;
+	bool OnChar(char ch) override;
+	bool OnExecute(const char *s) override;
+	bool OnSavePointReached() override;
+	bool OnSavePointLeft() override;
+	bool OnStyle(Scintilla::Position startPos, Scintilla::Position lengthDoc, int initStyle, StyleWriter *styler) override;
+	bool OnDoubleClick() override;
+	bool OnUpdateUI() override;
+	bool OnMarginClick() override;
+	bool OnUserListSelection(int listType, const char *selection) override;
+	bool OnKey(int keyval, int modifiers) override;
+	bool OnDwellStart(Scintilla::Position pos, const char *word) override;
+	bool OnClose(const char *filename) override;
+	bool OnUserStrip(int control, int change) override;
+	bool NeedsOnClose() override;
+};
+
+#endif
diff --git a/scite-app/scite/src/MatchMarker.cxx b/scite-app/scite/src/MatchMarker.cxx
new file mode 100644
index 0000000..ab8c634
--- /dev/null
+++ b/scite-app/scite/src/MatchMarker.cxx
@@ -0,0 +1,128 @@
+// SciTE - Scintilla based Text Editor
+/** @file MatchMarker.cxx
+ ** Mark all the matches of a string.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string>
+#include <string_view>
+#include <vector>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+
+#include "MatchMarker.h"
+
+namespace SA = Scintilla;
+
+std::vector<LineRange> LinesBreak(SA::ScintillaCall *pSci) {
+	std::vector<LineRange> lineRanges;
+	if (pSci) {
+		const SA::Line lineEnd = pSci->LineCount();
+		const SA::Line lineStartVisible = pSci->FirstVisibleLine();
+		const SA::Line docLineStartVisible = pSci->DocLineFromVisible(lineStartVisible);
+		const SA::Line linesOnScreen = pSci->LinesOnScreen();
+		constexpr SA::Line surround = 40;
+		LineRange rangePriority(docLineStartVisible - surround, docLineStartVisible + linesOnScreen + surround);
+		if (rangePriority.lineStart < 0)
+			rangePriority.lineStart = 0;
+		if (rangePriority.lineEnd > lineEnd)
+			rangePriority.lineEnd = lineEnd;
+		lineRanges.push_back(rangePriority);
+		if (rangePriority.lineEnd < lineEnd)
+			lineRanges.emplace_back(rangePriority.lineEnd, lineEnd);
+		if (rangePriority.lineStart > 0)
+			lineRanges.emplace_back(0, rangePriority.lineStart);
+	}
+	return lineRanges;
+}
+
+MatchMarker::MatchMarker() :
+	pSci(nullptr), styleMatch(-1), flagsMatch(static_cast<SA::FindOption>(0)), indicator(0), bookMark(-1) {
+}
+
+void MatchMarker::StartMatch(SA::ScintillaCall *pSci_,
+			     const std::string &textMatch_, SA::FindOption flagsMatch_, int styleMatch_,
+			     int indicator_, int bookMark_) {
+	lineRanges.clear();
+	pSci = pSci_;
+	textMatch = textMatch_;
+	flagsMatch = flagsMatch_;
+	styleMatch = styleMatch_;
+	indicator = indicator_;
+	bookMark = bookMark_;
+	lineRanges = LinesBreak(pSci);
+	// Perform the initial marking immediately to avoid flashing
+	Continue();
+}
+
+bool MatchMarker::Complete() const noexcept {
+	return lineRanges.empty();
+}
+
+void MatchMarker::Continue() {
+	constexpr int segment = 200;
+
+	// Remove old indicators if any exist.
+	pSci->SetIndicatorCurrent(indicator);
+
+	const LineRange rangeSearch = lineRanges[0];
+	SA::Line lineEndSegment = rangeSearch.lineStart + segment;
+	if (lineEndSegment > rangeSearch.lineEnd)
+		lineEndSegment = rangeSearch.lineEnd;
+
+	pSci->SetSearchFlags(flagsMatch);
+	const SA::Position positionStart = pSci->LineStart(rangeSearch.lineStart);
+	const SA::Position positionEnd = pSci->LineStart(lineEndSegment);
+	pSci->SetTarget(SA::Span(positionStart, positionEnd));
+	pSci->IndicatorClearRange(positionStart, positionEnd - positionStart);
+
+	//Monitor the amount of time took by the search.
+	GUI::ElapsedTime searchElapsedTime;
+
+	// Find the first occurrence of word.
+	SA::Span rangeFound = pSci->SpanSearchInTarget(textMatch);
+	while (rangeFound.start >= 0) {
+		// Limit the search duration to 250 ms. Avoid to freeze editor for huge lines.
+		if (searchElapsedTime.Duration() > 0.25) {
+			// Clear all indicators because timer has expired.
+			pSci->IndicatorClearRange(0, pSci->Length());
+			lineRanges.clear();
+			break;
+		}
+
+		if ((styleMatch < 0) || (styleMatch == pSci->UnsignedStyleAt(rangeFound.start))) {
+			pSci->IndicatorFillRange(rangeFound.start, rangeFound.Length());
+			if (bookMark >= 0) {
+				pSci->MarkerAdd(
+					pSci->LineFromPosition(rangeFound.start), bookMark);
+			}
+		}
+		if (rangeFound.Length() == 0) {
+			// Empty matches are possible for regex
+			rangeFound.end = pSci->PositionAfter(rangeFound.end);
+		}
+		// Try to find next occurrence of word.
+		pSci->SetTarget(SA::Span(rangeFound.end, positionEnd));
+		rangeFound = pSci->SpanSearchInTarget(textMatch);
+	}
+
+	// Retire searched lines
+	if (!lineRanges.empty()) {
+		// Check in case of re-entrance
+		if (lineEndSegment >= rangeSearch.lineEnd) {
+			lineRanges.erase(lineRanges.begin());
+		} else {
+			lineRanges[0].lineStart = lineEndSegment;
+		}
+	}
+}
+
+void MatchMarker::Stop() noexcept {
+	pSci = nullptr;
+	lineRanges.clear();
+}
diff --git a/scite-app/scite/src/MatchMarker.h b/scite-app/scite/src/MatchMarker.h
new file mode 100644
index 0000000..a0b4eba
--- /dev/null
+++ b/scite-app/scite/src/MatchMarker.h
@@ -0,0 +1,37 @@
+// SciTE - Scintilla based Text Editor
+/** @file MatchMarker.h
+ ** Mark all the matches of a string.
+ **/
+// Copyright 1998-2014 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef MATCHMARKER_H
+#define MATCHMARKER_H
+
+struct LineRange {
+	Scintilla::Line lineStart;
+	Scintilla::Line lineEnd;
+	LineRange(Scintilla::Line lineStart_, Scintilla::Line lineEnd_) noexcept : lineStart(lineStart_), lineEnd(lineEnd_) {}
+};
+
+std::vector<LineRange> LinesBreak(Scintilla::ScintillaCall *pSci);
+
+class MatchMarker {
+	Scintilla::ScintillaCall *pSci;
+	std::string textMatch;
+	int styleMatch;
+	Scintilla::FindOption flagsMatch;
+	int indicator;
+	int bookMark;
+	std::vector<LineRange> lineRanges;
+public:
+	MatchMarker();	// Not noexcept as std::vector constructor throws
+	void StartMatch(Scintilla::ScintillaCall *pSci_,
+			const std::string &textMatch_, Scintilla::FindOption flagsMatch_, int styleMatch_,
+			int indicator_, int bookMark_);
+	bool Complete() const noexcept;
+	void Continue();
+	void Stop() noexcept;
+};
+
+#endif
diff --git a/scite-app/scite/src/MultiplexExtension.cxx b/scite-app/scite/src/MultiplexExtension.cxx
new file mode 100644
index 0000000..51278bc
--- /dev/null
+++ b/scite-app/scite/src/MultiplexExtension.cxx
@@ -0,0 +1,266 @@
+// SciTE - Scintilla based Text Editor
+/** @file MultiplexExtension.cxx
+ ** Extension that manages / dispatches messages to multiple extensions.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "MultiplexExtension.h"
+
+MultiplexExtension::MultiplexExtension(): host(nullptr) {}
+
+MultiplexExtension::~MultiplexExtension() {
+}
+
+bool MultiplexExtension::RegisterExtension(Extension &ext_) {
+	for (const Extension *pexp : extensions)
+		if (pexp == &ext_)
+			return true;
+
+	extensions.push_back(&ext_);
+
+	if (host)
+		ext_.Initialise(host);
+
+	return true;
+}
+
+
+// Initialise, Finalise, Clear, and SetProperty get broadcast to all extensions,
+// regardless of return code.  This does not strictly match the documentation, but
+// seems like the right thing to do.  The others methods stop processing once one
+// Extension returns true.
+//
+// Load will eventually be changed to be smarter, so that each Extension can have
+// something different loaded into it.  OnExecute and OnMacro might also be made
+// smarter with a syntax to indicate to which extension the command should be sent.
+
+bool MultiplexExtension::Initialise(ExtensionAPI *host_) {
+	if (host)
+		Finalise(); // shouldn't happen.
+
+	host = host_;
+	for (Extension *pexp : extensions)
+		pexp->Initialise(host_);
+
+	return false;
+}
+
+bool MultiplexExtension::Finalise() noexcept {
+	if (host) {
+		for (int i = static_cast<int>(extensions.size()) - 1; i >= 0; --i)
+			extensions[i]->Finalise();
+
+		host = nullptr;
+	}
+	return false;
+}
+
+bool MultiplexExtension::Clear() {
+	for (Extension *pexp : extensions)
+		pexp->Clear();
+	return false;
+}
+
+bool MultiplexExtension::Load(const char *filename) {
+	for (Extension *pexp : extensions) {
+		if (pexp->Load(filename)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::InitBuffer(int index) {
+	for (Extension *pexp : extensions)
+		pexp->InitBuffer(index);
+	return false;
+}
+
+bool MultiplexExtension::ActivateBuffer(int index) {
+	for (Extension *pexp : extensions)
+		pexp->ActivateBuffer(index);
+	return false;
+}
+
+bool MultiplexExtension::RemoveBuffer(int index) {
+	for (Extension *pexp : extensions)
+		pexp->RemoveBuffer(index);
+	return false;
+}
+
+bool MultiplexExtension::OnOpen(const char *filename) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnOpen(filename)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnSwitchFile(const char *filename) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnSwitchFile(filename)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnBeforeSave(const char *filename) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnBeforeSave(filename)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnSave(const char *filename) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnSave(filename)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnChar(char c) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnChar(c)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnExecute(const char *cmd) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnExecute(cmd)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnSavePointReached() {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnSavePointReached()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnSavePointLeft() {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnSavePointLeft()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnStyle(Scintilla::Position p, Scintilla::Position q, int r, StyleWriter *s) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnStyle(p, q, r, s)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnDoubleClick() {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnDoubleClick()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnUpdateUI() {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnUpdateUI()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnMarginClick() {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnMarginClick()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnMacro(const char *p, const char *q) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnMacro(p, q)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnUserListSelection(int listType, const char *selection) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnUserListSelection(listType, selection)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::SendProperty(const char *prop) {
+	for (Extension *pexp : extensions)
+		pexp->SendProperty(prop);
+	return false;
+}
+
+bool MultiplexExtension::OnKey(int keyval, int modifiers) {
+	for (Extension *pexp : extensions) {
+		if (pexp->OnKey(keyval, modifiers)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool MultiplexExtension::OnDwellStart(Scintilla::Position pos, const char *word) {
+	for (Extension *pexp : extensions)
+		pexp->OnDwellStart(pos, word);
+	return false;
+}
+
+bool MultiplexExtension::OnClose(const char *filename) {
+	for (Extension *pexp : extensions)
+		pexp->OnClose(filename);
+	return false;
+}
+
+bool MultiplexExtension::OnUserStrip(int control, int change) {
+	for (Extension *pexp : extensions)
+		pexp->OnUserStrip(control, change);
+	return false;
+}
+
+bool MultiplexExtension::NeedsOnClose() {
+	for (Extension *pexp : extensions) {
+		if (pexp->NeedsOnClose()) {
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/scite-app/scite/src/MultiplexExtension.h b/scite-app/scite/src/MultiplexExtension.h
new file mode 100644
index 0000000..f8dba67
--- /dev/null
+++ b/scite-app/scite/src/MultiplexExtension.h
@@ -0,0 +1,87 @@
+// SciTE - Scintilla based Text Editor
+/** @file MultiplexExtension.h
+ ** Extension that manages / dispatches messages to multiple extensions.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef MULTIPLEXEXTENSION_H
+#define MULTIPLEXEXTENSION_H
+
+#include "Extender.h"
+
+// MultiplexExtension manages multiple Extension objects, similar to
+// what is proposed in the SciTE Extension documentation.  Each
+// message is sent to each contained extension object in turn until
+// one indicates that the message has been handled and does not need
+// to be processed further.  Certain messages (Initialise, Finalise
+// Clear, and SendProperty) are sent to all contained extensions
+// regardless of return code.
+//
+// The Director extension incorrectly returns true for all messages,
+// meaning that other extensions will never see the message if
+// DirectorExtension comes before them in the list.  This has been
+// fixed at source.
+//
+// Extensions are added to the multiplexer by calling RegisterExtension.
+// The extensions are prioritized with the first one added having the
+// highest priority.  If more flexibility is needed in order to support
+// dynamic discovery of extensions and assignment of priority, that will
+// be added later.  If the ability to remove extensions becomes important,
+// that can be added as well (later).
+//
+// The multiplexer does not manage the lifetime of the extension objects
+// that are registered with it.  If that functionality later turns out
+// to be needed, it will be added at that time.  (Broken record?  Do the
+// simplest thing...)  However, the option to "not" manage the lifecycle
+// is a valid one, since it often makes sense to implement extensions as
+// singletons.
+
+class MultiplexExtension: public Extension {
+public:
+	MultiplexExtension();
+	// Copying is unsupported.
+	MultiplexExtension(const MultiplexExtension &copy) = delete;
+	MultiplexExtension &operator=(const MultiplexExtension &copy) = delete;
+	~MultiplexExtension() override;
+
+	bool RegisterExtension(Extension &ext_);
+
+	bool Initialise(ExtensionAPI *host_) override;
+	bool Finalise() noexcept override;
+	bool Clear() override;
+	bool Load(const char *filename) override;
+
+	bool InitBuffer(int) override;
+	bool ActivateBuffer(int) override;
+	bool RemoveBuffer(int) override;
+
+	bool OnOpen(const char *) override;
+	bool OnSwitchFile(const char *) override;
+	bool OnBeforeSave(const char *) override;
+	bool OnSave(const char *) override;
+	bool OnChar(char) override;
+	bool OnExecute(const char *) override;
+	bool OnSavePointReached() override;
+	bool OnSavePointLeft() override;
+	bool OnStyle(Scintilla::Position, Scintilla::Position, int, StyleWriter *) override;
+	bool OnDoubleClick() override;
+	bool OnUpdateUI() override;
+	bool OnMarginClick() override;
+	bool OnMacro(const char *, const char *) override;
+	bool OnUserListSelection(int, const char *) override;
+
+	bool SendProperty(const char *) override;
+
+	bool OnKey(int, int) override;
+	bool OnDwellStart(Scintilla::Position, const char *) override;
+	bool OnClose(const char *) override;
+	bool OnUserStrip(int control, int change) override;
+	bool NeedsOnClose() override;
+
+private:
+	std::vector<Extension *> extensions;
+	ExtensionAPI *host;
+};
+
+#endif
diff --git a/scite-app/scite/src/PropSetFile.cxx b/scite-app/scite/src/PropSetFile.cxx
new file mode 100644
index 0000000..440df8c
--- /dev/null
+++ b/scite-app/scite/src/PropSetFile.cxx
@@ -0,0 +1,636 @@
+// SciTE - Scintilla based Text Editor
+/** @file PropSetFile.cxx
+ ** Property set implementation.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <stdexcept>
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <chrono>
+#include <sstream>
+
+#include <fcntl.h>
+
+#if defined(GTK)
+
+#include <unistd.h>
+
+#endif
+
+#include "GUI.h"
+
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "PropSetFile.h"
+
+// The comparison and case changing functions here assume ASCII
+// or extended ASCII such as the normal Windows code page.
+
+static std::set<std::string> FilterFromString(const std::string &values) {
+	std::vector<std::string> vsFilter = StringSplit(values, ' ');
+	std::set<std::string> fs;
+	for (std::vector<std::string>::const_iterator it=vsFilter.begin(); it != vsFilter.end(); ++it) {
+		if (!it->empty())
+			fs.insert(*it);
+	}
+	return fs;
+}
+
+void ImportFilter::SetFilter(const std::string &sExcludes, const std::string &sIncludes) {
+	excludes = FilterFromString(sExcludes);
+	includes = FilterFromString(sIncludes);
+}
+
+bool ImportFilter::IsValid(const std::string &name) const {
+	if (!includes.empty()) {
+		return includes.count(name) > 0;
+	} else {
+		return excludes.count(name) == 0;
+	}
+}
+
+bool PropSetFile::caseSensitiveFilenames = false;
+
+PropSetFile::PropSetFile(bool lowerKeys_) : lowerKeys(lowerKeys_), superPS(nullptr) {
+}
+
+PropSetFile::PropSetFile(const PropSetFile &copy) : lowerKeys(copy.lowerKeys), props(copy.props), superPS(copy.superPS) {
+}
+
+PropSetFile::~PropSetFile() {
+	superPS = nullptr;
+	Clear();
+}
+
+PropSetFile &PropSetFile::operator=(const PropSetFile &assign) {
+	if (this != &assign) {
+		lowerKeys = assign.lowerKeys;
+		superPS = assign.superPS;
+		props = assign.props;
+	}
+	return *this;
+}
+
+void PropSetFile::Set(std::string_view key, std::string_view val) {
+	if (key.empty())	// Empty keys are not supported
+		return;
+	props[std::string(key)] = std::string(val);
+}
+
+void PropSetFile::SetLine(const char *keyVal) {
+	while (IsASpace(*keyVal))
+		keyVal++;
+	const char *endVal = keyVal;
+	while (*endVal && (*endVal != '\n'))
+		endVal++;
+	const char *eqAt = strchr(keyVal, '=');
+	if (eqAt) {
+		const char *pKeyEnd = eqAt - 1;
+		while ((pKeyEnd >= keyVal) && IsASpace(*pKeyEnd)) {
+			--pKeyEnd;
+		}
+		const ptrdiff_t lenVal = endVal - eqAt - 1;
+		const ptrdiff_t lenKey = pKeyEnd - keyVal + 1;
+		Set(std::string_view(keyVal, lenKey), std::string_view(eqAt + 1, lenVal));
+	} else if (*keyVal) {	// No '=' so assume '=1'
+		Set(keyVal, "1");
+	}
+}
+
+void PropSetFile::Unset(std::string_view key) {
+	if (key.empty())	// Empty keys are not supported
+		return;
+	mapss::iterator keyPos = props.find(std::string(key));
+	if (keyPos != props.end())
+		props.erase(keyPos);
+}
+
+bool PropSetFile::Exists(const char *key) const {
+	mapss::const_iterator keyPos = props.find(std::string(key));
+	if (keyPos != props.end()) {
+		return true;
+	} else {
+		if (superPS) {
+			// Failed here, so try in base property set
+			return superPS->Exists(key);
+		} else {
+			return false;
+		}
+	}
+}
+
+std::string PropSetFile::GetString(const char *key) const {
+	const std::string sKey(key);
+	const PropSetFile *psf = this;
+	while (psf) {
+		mapss::const_iterator keyPos = psf->props.find(sKey);
+		if (keyPos != psf->props.end()) {
+			return keyPos->second;
+		}
+		// Failed here, so try in base property set
+		psf = psf->superPS;
+	}
+	return "";
+}
+
+static std::string ShellEscape(const char *toEscape) {
+	std::string str(toEscape);
+	for (ptrdiff_t i = str.length()-1; i >= 0; --i) {
+		switch (str[i]) {
+		case ' ':
+		case '|':
+		case '&':
+		case ',':
+		case '`':
+		case '"':
+		case ';':
+		case ':':
+		case '!':
+		case '^':
+		case '$':
+		case '{':
+		case '}':
+		case '(':
+		case ')':
+		case '[':
+		case ']':
+		case '=':
+		case '<':
+		case '>':
+		case '\\':
+		case '\'':
+			str.insert(i, "\\");
+			break;
+		default:
+			break;
+		}
+	}
+	return str;
+}
+
+std::string PropSetFile::Evaluate(const char *key) const {
+	if (strchr(key, ' ')) {
+		if (isprefix(key, "escape ")) {
+			std::string val = GetString(key+7);
+			std::string escaped = ShellEscape(val.c_str());
+			return escaped;
+		} else if (isprefix(key, "= ")) {
+			const std::string sExpressions(key + 2);
+			std::vector<std::string> parts = StringSplit(sExpressions, ';');
+			if (parts.size() > 1) {
+				bool equal = true;
+				for (size_t part = 1; part < parts.size(); part++) {
+					if (parts[part] != parts[0]) {
+						equal = false;
+					}
+				}
+				return equal ? "1" : "0";
+			}
+		} else if (isprefix(key, "star ")) {
+			const std::string sKeybase(key + 5);
+			// Create set of variables with values
+			mapss values;
+			// For this property set and all base sets
+			for (const PropSetFile *psf = this; psf; psf = psf->superPS) {
+				mapss::const_iterator it = psf->props.lower_bound(sKeybase);
+				while ((it != psf->props.end()) && (it->first.find(sKeybase) == 0)) {
+					mapss::iterator itDestination = values.find(it->first);
+					if (itDestination == values.end()) {
+						// Not present so add
+						values[it->first] = it->second;
+					}
+					++it;
+				}
+			}
+			// Concatenate all variables
+			std::string combination;
+			for (mapss::const_iterator itV = values.begin(); itV != values.end(); ++itV) {
+				combination += itV->second;
+			}
+			return combination;
+		} else if (isprefix(key, "scale ")) {
+			const int scaleFactor = GetInt("ScaleFactor", 100);
+			const char *val = key + 6;
+			if (scaleFactor == 100) {
+				return val;
+			} else {
+				const int value = atoi(val);
+				return StdStringFromInteger(value * scaleFactor / 100);
+			}
+		}
+	} else {
+		return GetString(key);
+	}
+	return "";
+}
+
+// There is some inconsistency between GetExpanded("foo") and Expand("$(foo)").
+// A solution is to keep a stack of variables that have been expanded, so that
+// recursive expansions can be skipped.  For now I'll just use the C++ stack
+// for that, through a recursive function and a simple chain of pointers.
+
+struct VarChain {
+	VarChain(const char *var_=nullptr, const VarChain *link_=nullptr) noexcept : var(var_), link(link_) {}
+
+	bool contains(const char *testVar) const {
+		return (var && (0 == strcmp(var, testVar)))
+		       || (link && link->contains(testVar));
+	}
+
+	const char *var;
+	const VarChain *link;
+};
+
+static int ExpandAllInPlace(const PropSetFile &props, std::string &withVars, int maxExpands, const VarChain &blankVars = VarChain()) {
+	size_t varStart = withVars.find("$(");
+	while ((varStart != std::string::npos) && (maxExpands > 0)) {
+		const size_t varEnd = withVars.find(')', varStart+2);
+		if (varEnd == std::string::npos) {
+			break;
+		}
+
+		// For consistency, when we see '$(ab$(cde))', expand the inner variable first,
+		// regardless whether there is actually a degenerate variable named 'ab$(cde'.
+		size_t innerVarStart = withVars.find("$(", varStart+2);
+		while ((innerVarStart != std::string::npos) && (innerVarStart < varEnd)) {
+			varStart = innerVarStart;
+			innerVarStart = withVars.find("$(", varStart+2);
+		}
+
+		std::string var(withVars, varStart + 2, varEnd - (varStart + 2));
+		std::string val = props.Evaluate(var.c_str());
+
+		if (blankVars.contains(var.c_str())) {
+			val.clear(); // treat blankVar as an empty string (e.g. to block self-reference)
+		}
+
+		if (--maxExpands >= 0) {
+			maxExpands = ExpandAllInPlace(props, val, maxExpands, VarChain(var.c_str(), &blankVars));
+		}
+
+		withVars.erase(varStart, varEnd-varStart+1);
+		withVars.insert(varStart, val);
+
+		varStart = withVars.find("$(");
+	}
+
+	return maxExpands;
+}
+
+std::string PropSetFile::GetExpandedString(const char *key) const {
+	std::string val = GetString(key);
+	ExpandAllInPlace(*this, val, 200, VarChain(key));
+	return val;
+}
+
+std::string PropSetFile::Expand(const std::string &withVars, int maxExpands) const {
+	std::string val = withVars;
+	ExpandAllInPlace(*this, val, maxExpands);
+	return val;
+}
+
+int PropSetFile::GetInt(const char *key, int defaultValue) const {
+	return IntegerFromString(GetExpandedString(key), defaultValue);
+}
+
+intptr_t PropSetFile::GetInteger(const char *key, intptr_t defaultValue) const {
+	return IntPtrFromString(GetExpandedString(key), defaultValue);
+}
+
+long long PropSetFile::GetLongLong(const char *key, long long defaultValue) const {
+	return LongLongFromString(GetExpandedString(key), defaultValue);
+}
+
+void PropSetFile::Clear() noexcept {
+	props.clear();
+}
+
+/**
+ * Get a line of input. If end of line escaped with '\\' then continue reading.
+ */
+static bool GetFullLine(const char *&fpc, size_t &lenData, char *s, size_t len) noexcept {
+	bool continuation = true;
+	s[0] = '\0';
+	while ((len > 1) && lenData > 0) {
+		char ch = *fpc;
+		fpc++;
+		lenData--;
+		if ((ch == '\r') || (ch == '\n')) {
+			if (!continuation) {
+				if ((lenData > 0) && (ch == '\r') && ((*fpc) == '\n')) {
+					// munch the second half of a crlf
+					fpc++;
+					lenData--;
+				}
+				*s = '\0';
+				return true;
+			}
+		} else if ((ch == '\\') && (lenData > 0) && ((*fpc == '\r') || (*fpc == '\n'))) {
+			continuation = true;
+			if ((lenData > 1) && (((*fpc == '\r') && (*(fpc+1) == '\r')) || ((*fpc == '\n') && (*(fpc+1) == '\n'))))
+				continuation = false;
+			else if ((lenData > 2) && ((*fpc == '\r') && (*(fpc+1) == '\n') && (*(fpc+2) == '\n' || *(fpc+2) == '\r')))
+				continuation = false;
+		} else {
+			continuation = false;
+			*s++ = ch;
+			*s = '\0';
+			len--;
+		}
+	}
+	return false;
+}
+
+static constexpr bool IsSpaceOrTab(char ch) noexcept {
+	return (ch == ' ') || (ch == '\t');
+}
+
+static bool IsCommentLine(const char *line) noexcept {
+	while (IsSpaceOrTab(*line)) ++line;
+	return (*line == '#');
+}
+
+static bool GenericPropertiesFile(const FilePath &filename) {
+	std::string name = filename.BaseName().AsUTF8();
+	if (name == "abbrev" || name == "Embedded")
+		return true;
+	return name.find("SciTE") != std::string::npos;
+}
+
+void PropSetFile::Import(const FilePath &filename, const FilePath &directoryForImports, const ImportFilter &filter,
+			 FilePathSet *imports, size_t depth) {
+	if (depth > 20)	// Possibly recursive import so give up to avoid crash
+		return;
+	if (Read(filename, directoryForImports, filter, imports, depth)) {
+		if (imports && (std::find(imports->begin(), imports->end(), filename) == imports->end())) {
+			imports->push_back(filename);
+		}
+	}
+}
+
+PropSetFile::ReadLineState PropSetFile::ReadLine(const char *lineBuffer, ReadLineState rls, const FilePath &directoryForImports,
+		const ImportFilter &filter, FilePathSet *imports, size_t depth) {
+	//UnSlash(lineBuffer);
+	if ((rls == rlConditionFalse) && (!IsSpaceOrTab(lineBuffer[0])))    // If clause ends with first non-indented line
+		rls = rlActive;
+	if (isprefix(lineBuffer, "module ")) {
+		std::string module = lineBuffer + strlen("module") + 1;
+		if (module.empty() || filter.IsValid(module)) {
+			rls = rlActive;
+		} else {
+			rls = rlExcludedModule;
+		}
+		return rls;
+	}
+	if (rls != rlActive) {
+		return rls;
+	}
+	if (isprefix(lineBuffer, "if ")) {
+		const char *expr = lineBuffer + strlen("if") + 1;
+		std::string value = Expand(expr);
+		if (value == "0" || value == "") {
+			rls = rlConditionFalse;
+		} else if (value == "1") {
+			rls = rlActive;
+		} else {
+			rls = (GetInt(value.c_str()) != 0) ? rlActive : rlConditionFalse;
+		}
+	} else if (isprefix(lineBuffer, "import ")) {
+		if (directoryForImports.IsSet()) {
+			std::string importName(lineBuffer + strlen("import") + 1);
+			if (importName == "*") {
+				// Import all .properties files in this directory except for system properties
+				FilePathSet directories;
+				FilePathSet files;
+				directoryForImports.List(directories, files);
+				for (const FilePath &fpFile : files) {
+					if (IsPropertiesFile(fpFile) &&
+							!GenericPropertiesFile(fpFile) &&
+							filter.IsValid(fpFile.BaseName().AsUTF8())) {
+						FilePath importPath(directoryForImports, fpFile);
+						Import(importPath, directoryForImports, filter, imports, depth + 1);
+					}
+				}
+			} else if (filter.IsValid(importName)) {
+				importName += ".properties";
+				FilePath importPath(directoryForImports, FilePath(GUI::StringFromUTF8(importName)));
+				Import(importPath, directoryForImports, filter, imports, depth + 1);
+			}
+		}
+	} else if (!IsCommentLine(lineBuffer)) {
+		SetLine(lineBuffer);
+	}
+	return rls;
+}
+
+void PropSetFile::ReadFromMemory(const char *data, size_t len, const FilePath &directoryForImports,
+				 const ImportFilter &filter, FilePathSet *imports, size_t depth) {
+	const char *pd = data;
+	std::vector<char> lineBuffer(len+1);	// +1 for NUL
+	ReadLineState rls = rlActive;
+	while (len > 0) {
+		GetFullLine(pd, len, &lineBuffer[0], lineBuffer.size());
+		if (lowerKeys) {
+			for (int i=0; lineBuffer[i] && (lineBuffer[i] != '='); i++) {
+				if ((lineBuffer[i] >= 'A') && (lineBuffer[i] <= 'Z')) {
+					lineBuffer[i] = static_cast<char>(lineBuffer[i] - 'A' + 'a');
+				}
+			}
+		}
+		rls = ReadLine(&lineBuffer[0], rls, directoryForImports, filter, imports, depth);
+	}
+}
+
+bool PropSetFile::Read(const FilePath &filename, const FilePath &directoryForImports,
+		       const ImportFilter &filter, FilePathSet *imports, size_t depth) {
+	const std::string propsData = filename.Read();
+	const size_t lenFile = propsData.size();
+	if (lenFile > 0) {
+		std::string_view data(propsData.c_str(), lenFile);
+		const std::string_view svUtf8BOM(UTF8BOM);
+		if (StartsWith(data, svUtf8BOM)) {
+			data.remove_prefix(svUtf8BOM.length());
+		}
+		ReadFromMemory(data.data(), data.length(), directoryForImports, filter, imports, depth);
+		return true;
+	}
+	return false;
+}
+
+namespace {
+
+bool StringEqual(std::string_view a, std::string_view b, bool caseSensitive) noexcept {
+	if (caseSensitive) {
+		return a == b;
+	} else {
+		if (a.length() != b.length()) {
+			return false;
+		}
+		for (size_t i = 0; i < a.length(); i++) {
+			if (MakeUpperCase(a[i]) != MakeUpperCase(b[i]))
+				return false;
+		}
+	}
+	return true;
+}
+
+// Match file names to patterns allowing for '*' and '?'.
+
+bool MatchWild(std::string_view pattern, std::string_view text, bool caseSensitive) {
+	if (StringEqual(pattern, text, caseSensitive)) {
+		return true;
+	} else if (pattern.empty()) {
+		return false;
+	} else if (pattern.front() == '*') {
+		pattern.remove_prefix(1);
+		if (pattern.empty()) {
+			return true;
+		}
+		while (!text.empty()) {
+			if (MatchWild(pattern, text, caseSensitive)) {
+				return true;
+			}
+			text.remove_prefix(1);
+		}
+	} else if (text.empty()) {
+		return false;
+	} else if (pattern.front() == '?') {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return MatchWild(pattern, text, caseSensitive);
+	} else if (caseSensitive && pattern.front() == text.front()) {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return MatchWild(pattern, text, caseSensitive);
+	} else if (!caseSensitive && MakeUpperCase(pattern.front()) == MakeUpperCase(text.front())) {
+		pattern.remove_prefix(1);
+		text.remove_prefix(1);
+		return MatchWild(pattern, text, caseSensitive);
+	}
+	return false;
+}
+
+bool startswith(const std::string &s, const char *keybase) noexcept {
+	return isprefix(s.c_str(), keybase);
+}
+
+}
+
+std::string PropSetFile::GetWildUsingStart(const PropSetFile &psStart, const char *keybase, const char *filename) {
+	const std::string sKeybase(keybase);
+	const PropSetFile *psf = this;
+	while (psf) {
+		mapss::const_iterator it = psf->props.lower_bound(sKeybase);
+		while ((it != psf->props.end()) && startswith(it->first, sKeybase.c_str())) {
+			const std::string_view orgkeyfile = it->first.c_str() + sKeybase.length();
+			std::string key;	// keyFile may point into key so key lifetime must cover keyFile
+			std::string_view keyFile = orgkeyfile;
+
+			if (orgkeyfile.find("$(") == 0) {
+				// $(X) is a variable so extract X and find its value
+				const size_t endVar = orgkeyfile.find_first_of(')');
+				if (endVar != std::string_view::npos) {
+					const std::string var(orgkeyfile.substr(2, endVar-2));
+					key = psStart.GetExpandedString(var.c_str());
+					keyFile = key;
+				}
+			}
+
+			while (!keyFile.empty()) {
+				const size_t sepPos = keyFile.find_first_of(';');
+				const std::string_view pattern = keyFile.substr(0, sepPos);
+				if (MatchWild(pattern, filename, caseSensitiveFilenames)) {
+					return it->second;
+				}
+				// Move to next
+				keyFile = (sepPos == std::string_view::npos) ? "" : keyFile.substr(sepPos + 1);
+			}
+
+			if (it->first == sKeybase) {
+				return it->second;
+			}
+			++it;
+		}
+		// Failed here, so try in base property set
+		psf = psf->superPS;
+	}
+	return "";
+}
+
+std::string PropSetFile::GetWild(const char *keybase, const char *filename) {
+	return GetWildUsingStart(*this, keybase, filename);
+}
+
+// GetNewExpandString does not use Expand as it has to use GetWild with the filename for each
+// variable reference found.
+
+std::string PropSetFile::GetNewExpandString(const char *keybase, const char *filename) {
+	std::string withVars = GetWild(keybase, filename);
+	size_t varStart = withVars.find("$(");
+	int maxExpands = 1000;	// Avoid infinite expansion of recursive definitions
+	while ((varStart != std::string::npos) && (maxExpands > 0)) {
+		const size_t varEnd = withVars.find(')', varStart+2);
+		if (varEnd == std::string::npos) {
+			break;
+		}
+		std::string var(withVars, varStart + 2, varEnd - varStart - 2);	// Subtract the $(
+		std::string val = GetWild(var.c_str(), filename);
+		if (var == keybase)
+			val.clear(); // Self-references evaluate to empty string
+		withVars.replace(varStart, varEnd - varStart + 1, val);
+		varStart = withVars.find("$(");
+		maxExpands--;
+	}
+	return withVars;
+}
+
+/**
+ * Initiate enumeration.
+ */
+bool PropSetFile::GetFirst(const char *&key, const char *&val) {
+	mapss::iterator it = props.begin();
+	if (it != props.end()) {
+		key = it->first.c_str();
+		val = it->second.c_str();
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Continue enumeration.
+ */
+bool PropSetFile::GetNext(const char *&key, const char *&val) {
+	mapss::iterator it = props.find(key);
+	if (it != props.end()) {
+		++it;
+		if (it != props.end()) {
+			key = it->first.c_str();
+			val = it->second.c_str();
+			return true;
+		}
+	}
+	return false;
+}
+
+bool IsPropertiesFile(const FilePath &filename) {
+	FilePath ext = filename.Extension();
+	if (EqualCaseInsensitive(ext.AsUTF8().c_str(), extensionProperties + 1))
+		return true;
+	return false;
+}
diff --git a/scite-app/scite/src/PropSetFile.h b/scite-app/scite/src/PropSetFile.h
new file mode 100644
index 0000000..347a568
--- /dev/null
+++ b/scite-app/scite/src/PropSetFile.h
@@ -0,0 +1,70 @@
+// SciTE - Scintilla based Text Editor
+/** @file PropSetFile.h
+ ** Definition of platform independent base class of editor.
+ **/
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef PROPSETFILE_H
+#define PROPSETFILE_H
+
+/**
+ */
+
+typedef std::map<std::string, std::string> mapss;
+
+class ImportFilter {
+public:
+	std::set<std::string> excludes;
+	std::set<std::string> includes;
+	void SetFilter(const std::string &sExcludes, const std::string &sIncludes);
+	bool IsValid(const std::string &name) const;
+};
+
+class PropSetFile {
+	bool lowerKeys;
+	std::string GetWildUsingStart(const PropSetFile &psStart, const char *keybase, const char *filename);
+	static bool caseSensitiveFilenames;
+	mapss props;
+public:
+	PropSetFile *superPS;
+	explicit PropSetFile(bool lowerKeys_=false);
+	PropSetFile(const PropSetFile &copy);
+	PropSetFile &operator=(const PropSetFile &assign);
+	virtual ~PropSetFile();
+
+	void Set(std::string_view key, std::string_view val);
+	void SetLine(const char *keyVal);
+	void Unset(std::string_view key);
+	bool Exists(const char *key) const;
+	std::string GetString(const char *key) const;
+	std::string Evaluate(const char *key) const;
+	std::string GetExpandedString(const char *key) const;
+	std::string Expand(const std::string &withVars, int maxExpands=200) const;
+	int GetInt(const char *key, int defaultValue=0) const;
+	intptr_t GetInteger(const char *key, intptr_t defaultValue=0) const;
+	long long GetLongLong(const char *key, long long defaultValue=0) const;
+	void Clear() noexcept;
+
+	enum ReadLineState { rlActive, rlExcludedModule, rlConditionFalse };
+	ReadLineState ReadLine(const char *lineBuffer, ReadLineState rls, const FilePath &directoryForImports, const ImportFilter &filter,
+			       FilePathSet *imports, size_t depth);
+	void ReadFromMemory(const char *data, size_t len, const FilePath &directoryForImports, const ImportFilter &filter,
+			    FilePathSet *imports, size_t depth);
+	void Import(const FilePath &filename, const FilePath &directoryForImports, const ImportFilter &filter,
+		    FilePathSet *imports, size_t depth);
+	bool Read(const FilePath &filename, const FilePath &directoryForImports, const ImportFilter &filter,
+		  FilePathSet *imports, size_t depth);
+	std::string GetWild(const char *keybase, const char *filename);
+	std::string GetNewExpandString(const char *keybase, const char *filename = "");
+	bool GetFirst(const char *&key, const char *&val);
+	bool GetNext(const char *&key, const char *&val);
+	static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) noexcept {
+		caseSensitiveFilenames = caseSensitiveFilenames_;
+	}
+};
+
+constexpr const char *extensionProperties = ".properties";
+bool IsPropertiesFile(const FilePath &filename);
+
+#endif
diff --git a/scite-app/scite/src/SciTE.h b/scite-app/scite/src/SciTE.h
new file mode 100644
index 0000000..3bd16ae
--- /dev/null
+++ b/scite-app/scite/src/SciTE.h
@@ -0,0 +1,302 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTE.h
+ ** Define command IDs used within SciTE.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCITE_H
+#define SCITE_H
+
+// Version numbers and dates
+#define VERSION_SCITE "5.1.1"
+#define VERSION_WORDS 5, 1, 1, 0
+#define COPYRIGHT_DATES "December 1998-July 2021"
+#define COPYRIGHT_YEARS "1998-2021"
+#define VERSION_SCINTILLA "5.1.1"
+#define VERSION_LEXILLA "5.1.1"
+
+// Menu IDs.
+// These are located 100 apart. No one will want more than 100 in each menu ;)
+#define IDM_MRUFILE			1000
+#define IDM_TOOLS			1100
+#define IDM_BUFFER			1200
+#define IDM_IMPORT			1300
+#define IDM_LANGUAGE			1400
+
+// File
+#define IDM_NEW			101
+#define IDM_OPEN			102
+#define IDM_OPENSELECTED		103
+#define IDM_REVERT			104
+#define IDM_CLOSE			105
+#define IDM_SAVE			106
+#define IDM_SAVEAS			110
+#define IDM_SAVEASHTML		111
+#define IDM_SAVEASRTF		112
+#define IDM_SAVEASPDF		113
+#define IDM_FILER			114
+#define IDM_SAVEASTEX		115
+#define IDM_SAVEACOPY		116
+#define IDM_SAVEASXML		117
+#define IDM_COPYPATH			118
+#define IDM_ALLOWACCESS		119
+#define IDM_MRU_SEP			120
+#define IDM_MRU_SUB			121
+#define IDM_PRINTSETUP		130
+#define IDM_PRINT			131
+#define IDM_LOADSESSION		132
+#define IDM_SAVESESSION		133
+#define IDM_QUIT			140
+#define IDM_ENCODING_DEFAULT	150
+#define IDM_ENCODING_UCS2BE	151
+#define IDM_ENCODING_UCS2LE	152
+#define IDM_ENCODING_UTF8	153
+#define IDM_ENCODING_UCOOKIE	154
+
+#define MRU_START	17
+#define IMPORT_START 20
+#define TOOLS_START 4
+
+// Edit
+#define IDM_UNDO			201
+#define IDM_REDO			202
+#define IDM_CUT				203
+#define IDM_COPY			204
+#define IDM_PASTE			205
+#define IDM_CLEAR			206
+#define IDM_SELECTALL		207
+#define IDM_PASTEANDDOWN	208
+#define IDM_FIND			210
+#define IDM_FINDNEXT			211
+#define IDM_FINDNEXTBACK		212
+#define IDM_FINDNEXTSEL		213
+#define IDM_FINDNEXTBACKSEL	214
+#define IDM_FINDINFILES		215
+#define IDM_REPLACE			216
+#define IDM_SELECTION_FOR_FIND  217
+#define IDM_LINEREVERSE			218
+#define IDM_GOTO			220
+#define IDM_BOOKMARK_NEXT	221
+#define IDM_BOOKMARK_TOGGLE	222
+#define IDM_BOOKMARK_PREV	223
+#define IDM_BOOKMARK_CLEARALL	224
+#define IDM_BOOKMARK_NEXT_SELECT	225
+#define IDM_BOOKMARK_PREV_SELECT	226
+#define IDM_BOOKMARK_SELECT_ALL	227
+#define IDM_MATCHBRACE		230
+#define IDM_SELECTTOBRACE	231
+#define IDM_SHOWCALLTIP		232
+#define IDM_COMPLETE		233
+#define IDM_COMPLETEWORD	234
+#define IDM_EXPAND			235
+#define IDM_TOGGLE_FOLDALL	236
+#define IDM_TOGGLE_FOLDRECURSIVE 237
+#define IDM_EXPAND_ENSURECHILDRENVISIBLE 238
+#define IDM_UPRCASE			240
+#define IDM_LWRCASE			241
+#define IDM_ABBREV			242
+#define IDM_BLOCK_COMMENT	243
+#define IDM_STREAM_COMMENT	244
+#define IDM_COPYASRTF		245
+#define IDM_BOX_COMMENT		246
+#define IDM_INS_ABBREV		247
+#define IDM_JOIN		248
+#define IDM_SPLIT		249
+#define IDM_DUPLICATE	250
+#define IDM_INCSEARCH 		252
+#define IDM_ENTERSELECTION  256
+#define IDM_SELECTIONADDNEXT  257
+#define IDM_SELECTIONADDEACH  258
+
+#define IDC_INCFINDTEXT     253
+#define IDC_INCFINDBTNOK	254
+#define IDC_EDIT1           1000
+#define IDC_STATIC          -1
+
+
+#define IDM_PREVMATCHPPC	260
+#define IDM_SELECTTOPREVMATCHPPC	261
+#define IDM_NEXTMATCHPPC	262
+#define IDM_SELECTTONEXTMATCHPPC	263
+
+// Tools
+#define IDM_COMPILE			301
+#define IDM_BUILD			302
+#define IDM_GO				303
+#define IDM_STOPEXECUTE		304
+#define IDM_FINISHEDEXECUTE	305
+#define IDM_NEXTMSG			306
+#define IDM_PREVMSG			307
+#define IDM_CLEAN			308
+
+#define IDM_MACRO_SEP		310
+#define IDM_MACRORECORD		311
+#define IDM_MACROSTOPRECORD	312
+#define IDM_MACROPLAY		313
+#define IDM_MACROLIST		314
+
+#define IDM_ACTIVATE			320
+
+#define IDM_SRCWIN			350
+#define IDM_RUNWIN			351
+#define IDM_TOOLWIN			352
+#define IDM_STATUSWIN		353
+#define IDM_TABWIN			354
+
+// Options
+#define IDM_SPLITVERTICAL		401
+#define IDM_VIEWSPACE		402
+#define IDM_VIEWEOL			403
+#define IDM_VIEWGUIDES		404
+#define IDM_SELMARGIN		405
+#define IDM_FOLDMARGIN		406
+#define IDM_LINENUMBERMARGIN	407
+#define IDM_VIEWTOOLBAR		408
+#define IDM_TOGGLEOUTPUT		409
+#define IDM_VIEWTABBAR		410
+#define IDM_VIEWSTATUSBAR	411
+#define IDM_TOGGLEPARAMETERS	412
+#define IDM_OPENFILESHERE		413
+#define IDM_WRAP			414
+#define IDM_WRAPOUTPUT		415
+#define IDM_READONLY			416
+
+#define IDM_CLEAROUTPUT		420
+#define IDM_SWITCHPANE			421
+
+#define IDM_EOL_CRLF			430
+#define IDM_EOL_CR			431
+#define IDM_EOL_LF			432
+#define IDM_EOL_CONVERT		433
+
+#define IDM_TABSIZE			440
+
+#define IDM_MONOFONT		450
+
+#define IDM_OPENLOCALPROPERTIES	460
+#define IDM_OPENUSERPROPERTIES	461
+#define IDM_OPENGLOBALPROPERTIES	462
+#define IDM_OPENABBREVPROPERTIES	463
+#define IDM_OPENLUAEXTERNALFILE	464
+#define IDM_OPENDIRECTORYPROPERTIES	465
+
+//#define IDM_SELECTIONMARGIN	490
+//#define IDM_BUFFEREDDRAW	491
+
+// Buffers
+#define IDM_PREVFILE			501
+#define IDM_NEXTFILE			502
+#define IDM_CLOSEALL			503
+#define IDM_SAVEALL			504
+#define IDM_BUFFERSEP		505
+#define IDM_PREVFILESTACK			506
+#define IDM_NEXTFILESTACK			507
+#define IDM_MOVETABRIGHT			508
+#define IDM_MOVETABLEFT			509
+
+#define IDM_WHOLEWORD			800
+#define IDM_MATCHCASE			801
+#define IDM_REGEXP					802
+#define IDM_WRAPAROUND		803
+#define IDM_UNSLASH				804
+#define IDM_DIRECTIONUP			805
+#define IDM_DIRECTIONDOWN	806
+
+// Help
+#define IDM_HELP			901
+#define IDM_ABOUT			902
+#define IDM_HELP_SCITE		903
+
+// Windows specific windowing options
+#define IDM_ONTOP			960
+#define IDM_FULLSCREEN		961
+#define IDC_TABCLOSE		962
+#define IDC_SHIFTTAB		963
+
+// Dialog control IDs
+#define IDGOLINE			220
+#define IDABOUTSCINTILLA	221
+#define IDFINDWHAT			222
+#define IDFILES				223
+#define IDDIRECTORY			224
+#define IDCURRLINE			225
+#define IDLASTLINE			226
+#define IDEXTEND			227
+#define IDTABSIZE			228
+#define IDINDENTSIZE		229
+#define IDUSETABS			230
+
+#define IDREPLACEWITH		231
+#define IDWHOLEWORD			232
+#define IDMATCHCASE			233
+#define IDDIRECTIONUP		234
+#define IDDIRECTIONDOWN		235
+#define IDREPLACE			236
+#define IDREPLACEALL		237
+#define IDREPLACEINSEL		238
+#define IDREGEXP			239
+#define IDWRAP			240
+
+#define IDUNSLASH			241
+#define IDCMD			242
+
+// id for the browse button in the grep dialog
+#define IDBROWSE 243
+
+#define IDABBREV			244
+
+#define IDREPLACEINBUF		244
+#define IDMARKALL 			245
+
+#define IDGOLINECHAR		246
+#define IDCURRLINECHAR		247
+#define IDREPLDONE			248
+
+#define IDDOTDOT			249
+#define IDFINDINSTYLE		250
+#define IDFINDSTYLE			251
+#define IDCONVERT			252
+
+#define IDPARAMSTART		300
+
+// Dialog IDs
+#define IDD_FIND			400
+#define IDD_REPLACE			401
+#define IDD_BUFFERS			402
+#define IDD_FIND_ADV		403
+#define IDD_REPLACE_ADV		404
+
+// Resource IDs
+#define IDR_CLOSEFILE 100
+#define IDC_DRAGDROP        401
+#define IDBM_WORD 101
+#define IDBM_CASE 102
+#define IDBM_REGEX 103
+#define IDBM_BACKSLASH 104
+#define IDBM_AROUND 105
+#define IDBM_UP 106
+#define IDR_CLOSEFILE24 107
+
+#define IDBM_20_WORD 201
+#define IDBM_20_CASE 202
+#define IDBM_20_REGEX 203
+#define IDBM_20_BACKSLASH 204
+#define IDBM_20_AROUND 205
+#define IDBM_20_UP 206
+
+#define IDBM_24_WORD 301
+#define IDBM_24_CASE 302
+#define IDBM_24_REGEX 303
+#define IDBM_24_BACKSLASH 304
+#define IDBM_24_AROUND 305
+#define IDBM_24_UP 306
+
+#define IDBM_32_WORD 401
+#define IDBM_32_CASE 402
+#define IDBM_32_REGEX 403
+#define IDBM_32_BACKSLASH 404
+#define IDBM_32_AROUND 405
+#define IDBM_32_UP 406
+
+#endif
diff --git a/scite-app/scite/src/SciTE.properties b/scite-app/scite/src/SciTE.properties
new file mode 100644
index 0000000..b0d92eb
--- /dev/null
+++ b/scite-app/scite/src/SciTE.properties
@@ -0,0 +1,10 @@
+# SciTE.properties is the per directory local options file and can be used to
+# override settings made in SciTEGlobal.properties, SciTEUser.properties and
+# SciTEDirectory.properties.
+command.build.directory.*.cxx=..\win32
+command.build.directory.*.h=..\win32
+command.build.*.cxx=nmake -f scite.mak DEBUG=1 QUIET=1
+command.build.*.h=nmake -f scite.mak DEBUG=1 QUIET=1
+command.go.*.cxx=..\bin\SciTE
+command.go.*.h=..\bin\SciTE
+command.go.needs.*.cxx=cmd /c cd ..\win32 && nmake -f scite.mak DEBUG=1 QUIET=1
diff --git a/scite-app/scite/src/SciTEBase.cxx b/scite-app/scite/src/SciTEBase.cxx
new file mode 100644
index 0000000..7b2bc5b
--- /dev/null
+++ b/scite-app/scite/src/SciTEBase.cxx
@@ -0,0 +1,4814 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEBase.cxx
+ ** Platform independent base class of editor.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <ctime>
+#include <cmath>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "ILoader.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "MatchMarker.h"
+#include "EditorConfig.h"
+#include "SciTEBase.h"
+
+Searcher::Searcher() {
+	wholeWord = false;
+	matchCase = false;
+	regExp = false;
+	unSlash = false;
+	wrapFind = true;
+	reverseFind = false;
+
+	searchStartPosition = 0;
+	replacing = false;
+	havefound = false;
+	failedfind = false;
+	findInStyle = false;
+	findStyle = 0;
+	closeFind = CloseFind::closeAlways;
+
+	focusOnReplace = false;
+}
+
+void Searcher::InsertFindInMemory() {
+	memFinds.Insert(findWhat);
+}
+
+// The find and replace dialogs and strips often manipulate boolean
+// flags based on dialog control IDs and menu IDs.
+bool &Searcher::FlagFromCmd(int cmd) noexcept {
+	static bool notFound = false;
+	switch (cmd) {
+	case IDWHOLEWORD:
+	case IDM_WHOLEWORD:
+		return wholeWord;
+	case IDMATCHCASE:
+	case IDM_MATCHCASE:
+		return matchCase;
+	case IDREGEXP:
+	case IDM_REGEXP:
+		return regExp;
+	case IDUNSLASH:
+	case IDM_UNSLASH:
+		return unSlash;
+	case IDWRAP:
+	case IDM_WRAPAROUND:
+		return wrapFind;
+	case IDDIRECTIONUP:
+	case IDM_DIRECTIONUP:
+		return reverseFind;
+	}
+	return notFound;
+}
+
+SciTEBase::SciTEBase(Extension *ext) : apis(true), pwFocussed(&wEditor), extender(ext) {
+	needIdle = false;
+	codePage = 0;
+	characterSet = SA::CharacterSet::Ansi;
+	language = "java";
+	lexLanguage = SCLEX_CPP;
+	functionDefinition = "";
+	diagnosticStyleStart = 0;
+	stripTrailingSpaces = false;
+	ensureFinalLineEnd = false;
+	ensureConsistentLineEnds = false;
+	indentOpening = true;
+	indentClosing = true;
+	indentMaintain = false;
+	statementLookback = 10;
+	preprocessorSymbol = '\0';
+
+	tbVisible = false;
+	sbVisible = false;
+	tabVisible = false;
+	tabHideOne = false;
+	tabMultiLine = false;
+	sbNum = 1;
+	visHeightTools = 0;
+	visHeightTab = 0;
+	visHeightStatus = 0;
+	visHeightEditor = 1;
+	heightBar = 7;
+	dialogsOnScreen = 0;
+	topMost = false;
+	wrap = false;
+	wrapOutput = false;
+	wrapStyle = SA::Wrap::Word;
+	idleStyling = SA::IdleStyling::None;
+	alphaIndicator = static_cast<SA::Alpha>(30);
+	underIndicator = false;
+	openFilesHere = false;
+	fullScreen = false;
+	appearance = {};
+
+	heightOutput = 0;
+	heightOutputStartDrag = 0;
+	previousHeightOutput = 0;
+
+	allowMenuActions = true;
+	scrollOutput = 1;
+	returnOutputToCommand = true;
+
+	ptStartDrag.x = 0;
+	ptStartDrag.y = 0;
+	capturedMouse = false;
+	firstPropertiesRead = true;
+	localiser.read = false;
+	splitVertical = false;
+	bufferedDraw = true;
+	bracesCheck = true;
+	bracesSloppy = false;
+	bracesStyle = 0;
+	braceCount = 0;
+
+	indentationWSVisible = true;
+	indentExamine = SA::IndentView::LookBoth;
+	autoCompleteIgnoreCase = false;
+	imeAutoComplete = false;
+	callTipUseEscapes = false;
+	callTipIgnoreCase = false;
+	autoCCausedByOnlyOne = false;
+	autoCompleteVisibleItemCount = 9;
+	startCalltipWord = 0;
+	currentCallTip = 0;
+	maxCallTips = 1;
+	currentCallTipWord = "";
+	lastPosCallTip = 0;
+
+	margin = false;
+	marginWidth = marginWidthDefault;
+	foldMargin = true;
+	foldMarginWidth = foldMarginWidthDefault;
+	lineNumbers = false;
+	lineNumbersWidth = lineNumbersWidthDefault;
+	lineNumbersExpand = false;
+
+	macrosEnabled = false;
+	recording = false;
+
+	propsEmbed.superPS = &propsPlatform;
+	propsBase.superPS = &propsEmbed;
+	propsUser.superPS = &propsBase;
+	propsDirectory.superPS = &propsUser;
+	propsLocal.superPS = &propsDirectory;
+	propsDiscovered.superPS = &propsLocal;
+	props.superPS = &propsDiscovered;
+
+	propsStatus.superPS = &props;
+
+	needReadProperties = false;
+	quitting = false;
+
+	timerMask = 0;
+	delayBeforeAutoSave = 0;
+
+	editorConfig = IEditorConfig::Create();
+}
+
+SciTEBase::~SciTEBase() {
+	if (extender)
+		extender->Finalise();
+	popup.Destroy();
+}
+
+void SciTEBase::Finalise() {
+	TimerEnd(timerAutoSave);
+}
+
+bool SciTEBase::PerformOnNewThread(Worker *pWorker) {
+	try {
+		std::thread thread([pWorker] {
+			pWorker->Execute();
+		});
+		thread.detach();
+		return true;
+	} catch (std::system_error &) {
+		return false;
+	}
+}
+
+void SciTEBase::WorkerCommand(int cmd, Worker *pWorker) {
+	switch (cmd) {
+	case WORK_FILEREAD:
+		TextRead(static_cast<FileLoader *>(pWorker));
+		UpdateProgress(pWorker);
+		break;
+	case WORK_FILEWRITTEN:
+		TextWritten(static_cast<FileStorer *>(pWorker));
+		UpdateProgress(pWorker);
+		break;
+	case WORK_FILEPROGRESS:
+		UpdateProgress(pWorker);
+		break;
+	}
+}
+
+SystemAppearance SciTEBase::CurrentAppearance() const noexcept {
+	return {};
+}
+
+void SciTEBase::CheckAppearanceChanged() {
+	const SystemAppearance currentAppearance = CurrentAppearance();
+	if (!(appearance == currentAppearance)) {
+		appearance = currentAppearance;
+		ReloadProperties();
+	}
+}
+
+// The system focus may move to other controls including the menu bar
+// but we are normally interested in whether the edit or output pane was
+// most recently focused and should be used by menu commands.
+void SciTEBase::SetPaneFocus(bool editPane) noexcept {
+	pwFocussed = editPane ? &wEditor : &wOutput;
+}
+
+GUI::ScintillaWindow &SciTEBase::PaneFocused() {
+	return wOutput.HasFocus() ? wOutput : wEditor;
+}
+
+GUI::ScintillaWindow &SciTEBase::PaneSource(int destination) {
+	if (destination == IDM_SRCWIN)
+		return wEditor;
+	else if (destination == IDM_RUNWIN)
+		return wOutput;
+	else
+		return PaneFocused();
+}
+
+intptr_t SciTEBase::CallFocusedElseDefault(int defaultValue, SA::Message msg, uintptr_t wParam, intptr_t lParam) {
+	if (wOutput.HasFocus())
+		return wOutput.Call(msg, wParam, lParam);
+	else if (wEditor.HasFocus())
+		return wEditor.Call(msg, wParam, lParam);
+	else
+		return defaultValue;
+}
+
+void SciTEBase::CallChildren(SA::Message msg, uintptr_t wParam, intptr_t lParam) {
+	wEditor.Call(msg, wParam, lParam);
+	wOutput.Call(msg, wParam, lParam);
+}
+
+std::string SciTEBase::GetTranslationToAbout(const char *const propname, bool retainIfNotFound) {
+#if !defined(GTK)
+	return GUI::UTF8FromString(localiser.Text(propname, retainIfNotFound));
+#else
+	// On GTK, localiser.Text always converts to UTF-8.
+	return localiser.Text(propname, retainIfNotFound);
+#endif
+}
+
+void SciTEBase::ViewWhitespace(bool view) {
+	if (view && indentationWSVisible == 2)
+		wEditor.SetViewWS(SA::WhiteSpace::VisibleOnlyInIndent);
+	else if (view && indentationWSVisible)
+		wEditor.SetViewWS(SA::WhiteSpace::VisibleAlways);
+	else if (view)
+		wEditor.SetViewWS(SA::WhiteSpace::VisibleAfterIndent);
+	else
+		wEditor.SetViewWS(SA::WhiteSpace::Invisible);
+}
+
+StyleAndWords SciTEBase::GetStyleAndWords(const char *base) {
+	StyleAndWords sw;
+	std::string fileNameForExtension = ExtensionFileName();
+	std::string sAndW = props.GetNewExpandString(base, fileNameForExtension.c_str());
+	sw.styleNumber = atoi(sAndW.c_str());
+	const char *space = strchr(sAndW.c_str(), ' ');
+	if (space)
+		sw.words = space + 1;
+	return sw;
+}
+
+void SciTEBase::AssignKey(SA::Keys key, SA::KeyMod mods, int cmd) {
+	wEditor.AssignCmdKey(
+		IntFromTwoShorts(static_cast<short>(key),
+				 static_cast<short>(mods)), cmd);
+}
+
+/**
+ * Override the language of the current file with the one indicated by @a cmdID.
+ * Mostly used to set a language on a file of unknown extension.
+ */
+void SciTEBase::SetOverrideLanguage(int cmdID) {
+	RecentFile rf = GetFilePosition();
+	EnsureRangeVisible(wEditor, SA::Span(0, wEditor.Length()), false);
+	// Zero all the style bytes
+	wEditor.ClearDocumentStyle();
+
+	CurrentBuffer()->overrideExtension = "x.";
+	CurrentBuffer()->overrideExtension += languageMenu[cmdID].extension;
+	ReadProperties();
+	SetIndentSettings();
+	wEditor.ColouriseAll();
+	Redraw();
+	DisplayAround(rf);
+}
+
+SA::Position SciTEBase::LengthDocument() {
+	return wEditor.Length();
+}
+
+SA::Position SciTEBase::GetCaretInLine() {
+	const SA::Position caret = wEditor.CurrentPos();
+	const SA::Line line = wEditor.LineFromPosition(caret);
+	const SA::Position lineStart = wEditor.LineStart(line);
+	return caret - lineStart;
+}
+
+std::string SciTEBase::GetLine(SA::Line line) {
+	const SA::Span rangeLine(wEditor.LineStart(line), wEditor.LineEnd(line));
+	return wEditor.StringOfSpan(rangeLine);
+}
+
+std::string SciTEBase::GetCurrentLine() {
+	// Get needed buffer size
+	const SA::Position len = wEditor.GetCurLine(0, nullptr);
+	// Allocate buffer, including space for NUL
+	std::string text(len, '\0');
+	// And get the line
+	wEditor.GetCurLine(len, &text[0]);
+	// Return without extra NUL
+	return text.substr(0, text.length()-1);
+}
+
+/**
+ * Check if the given line is a preprocessor condition line.
+ * @return The kind of preprocessor condition (enum values).
+ */
+SciTEBase::PreProc SciTEBase::LinePreprocessorCondition(SA::Line line) {
+	const std::string text = GetLine(line);
+
+	const char *currChar = text.c_str();
+
+	if (!currChar) {
+		return PreProc::None;
+	}
+	while (IsASpace(*currChar) && *currChar) {
+		currChar++;
+	}
+	if (preprocessorSymbol && (*currChar == preprocessorSymbol)) {
+		currChar++;
+		while (IsASpace(*currChar) && *currChar) {
+			currChar++;
+		}
+		char word[32] = "";
+		size_t i = 0;
+		while (!IsASpace(*currChar) && *currChar && (i < (sizeof(word) - 1))) {
+			word[i++] = *currChar++;
+		}
+		word[i] = '\0';
+		std::map<std::string, PreProc>::const_iterator it = preprocOfString.find(word);
+		if (it != preprocOfString.end()) {
+			return it->second;
+		}
+	}
+	return PreProc::None;
+}
+
+/**
+ * Search a matching preprocessor condition line.
+ * @return @c true if the end condition are meet.
+ * Also set curLine to the line where one of these conditions is mmet.
+ */
+bool SciTEBase::FindMatchingPreprocessorCondition(
+	SA::Line &curLine,   		///< Number of the line where to start the search
+	int direction,   		///< Direction of search: 1 = forward, -1 = backward
+	PreProc condEnd1,   		///< First status of line for which the search is OK
+	PreProc condEnd2) {		///< Second one
+
+	bool isInside = false;
+	int level = 0;
+	const SA::Line maxLines = wEditor.LineCount() - 1;
+
+	while (curLine < maxLines && curLine > 0 && !isInside) {
+		curLine += direction;	// Increment or decrement
+		const PreProc status = LinePreprocessorCondition(curLine);
+
+		if ((direction == 1 && status == PreProc::Start) || (direction == -1 && status == PreProc::End)) {
+			level++;
+		} else if (level > 0 && ((direction == 1 && status == PreProc::End) || (direction == -1 && status == PreProc::Start))) {
+			level--;
+		} else if (level == 0 && (status == condEnd1 || status == condEnd2)) {
+			isInside = true;
+		}
+	}
+
+	return isInside;
+}
+
+/**
+ * Find if there is a preprocessor condition after or before the caret position,
+ * @return @c true if inside a preprocessor condition.
+ */
+bool SciTEBase::FindMatchingPreprocCondPosition(
+	bool isForward,   		///< @c true if search forward
+	SA::Position mppcAtCaret,   	///< Matching preproc. cond.: current position of caret
+	SA::Position &mppcMatch) {		///< Matching preproc. cond.: matching position
+
+	bool isInside = false;
+
+	// Get current line
+	SA::Line curLine = wEditor.LineFromPosition(mppcAtCaret);
+	const PreProc status = LinePreprocessorCondition(curLine);
+
+	switch (status) {
+	case PreProc::Start:
+		if (isForward) {
+			isInside = FindMatchingPreprocessorCondition(curLine, 1,
+					PreProc::Middle, PreProc::End);
+		} else {
+			mppcMatch = mppcAtCaret;
+			return true;
+		}
+		break;
+	case PreProc::Middle:
+		if (isForward) {
+			isInside = FindMatchingPreprocessorCondition(curLine, 1,
+					PreProc::Middle, PreProc::End);
+		} else {
+			isInside = FindMatchingPreprocessorCondition(curLine, -1,
+					PreProc::Start, PreProc::Middle);
+		}
+		break;
+	case PreProc::End:
+		if (isForward) {
+			mppcMatch = mppcAtCaret;
+			return true;
+		} else {
+			isInside = FindMatchingPreprocessorCondition(curLine, -1,
+					PreProc::Start, PreProc::Middle);
+		}
+		break;
+	default:   	// Should be noPPC
+
+		if (isForward) {
+			isInside = FindMatchingPreprocessorCondition(curLine, 1,
+					PreProc::Middle, PreProc::End);
+		} else {
+			isInside = FindMatchingPreprocessorCondition(curLine, -1,
+					PreProc::Start, PreProc::Middle);
+		}
+		break;
+	}
+
+	if (isInside) {
+		mppcMatch = wEditor.LineStart(curLine);
+	}
+	return isInside;
+}
+
+static constexpr bool IsBrace(char ch) noexcept {
+	return ch == '[' || ch == ']' || ch == '(' || ch == ')' || ch == '{' || ch == '}';
+}
+
+/**
+ * Find if there is a brace next to the caret, checking before caret first, then
+ * after caret. If brace found also find its matching brace.
+ * @return @c true if inside a bracket pair.
+ */
+bool SciTEBase::FindMatchingBracePosition(bool editor, SA::Position &braceAtCaret, SA::Position &braceOpposite, bool sloppy) {
+	bool isInside = false;
+	GUI::ScintillaWindow &win = editor ? wEditor : wOutput;
+
+	const int mainSel = win.MainSelection();
+	if (win.SelectionNCaretVirtualSpace(mainSel) > 0)
+		return false;
+
+	const int bracesStyleCheck = editor ? bracesStyle : 0;
+	SA::Position caretPos = win.CurrentPos();
+	braceAtCaret = -1;
+	braceOpposite = -1;
+	char charBefore = '\0';
+	int styleBefore = 0;
+	const SA::Position lengthDoc = win.Length();
+	TextReader acc(win);
+	if ((lengthDoc > 0) && (caretPos > 0)) {
+		// Check to ensure not matching brace that is part of a multibyte character
+		if (win.PositionBefore(caretPos) == (caretPos - 1)) {
+			charBefore = acc[caretPos - 1];
+			styleBefore = acc.StyleAt(caretPos - 1);
+		}
+	}
+	// Priority goes to character before caret
+	if (charBefore && IsBrace(charBefore) &&
+			((styleBefore == bracesStyleCheck) || (!bracesStyle))) {
+		braceAtCaret = caretPos - 1;
+	}
+	bool colonMode = false;
+	if ((lexLanguage == SCLEX_PYTHON) &&
+			(':' == charBefore) && (SCE_P_OPERATOR == styleBefore)) {
+		braceAtCaret = caretPos - 1;
+		colonMode = true;
+	}
+	bool isAfter = true;
+	if (lengthDoc > 0 && sloppy && (braceAtCaret < 0) && (caretPos < lengthDoc)) {
+		// No brace found so check other side
+		// Check to ensure not matching brace that is part of a multibyte character
+		if (win.PositionAfter(caretPos) == (caretPos + 1)) {
+			const char charAfter = acc[caretPos];
+			const int styleAfter = acc.StyleAt(caretPos);
+			if (charAfter && IsBrace(charAfter) && ((styleAfter == bracesStyleCheck) || (!bracesStyle))) {
+				braceAtCaret = caretPos;
+				isAfter = false;
+			}
+			if ((lexLanguage == SCLEX_PYTHON) &&
+					(':' == charAfter) && (SCE_P_OPERATOR == styleAfter)) {
+				braceAtCaret = caretPos;
+				colonMode = true;
+			}
+		}
+	}
+	if (braceAtCaret >= 0) {
+		if (colonMode) {
+			const SA::Line lineStart = win.LineFromPosition(braceAtCaret);
+			const SA::Line lineMaxSubord = win.LastChild(lineStart, static_cast<SA::FoldLevel>(-1));
+			braceOpposite = win.LineEnd(lineMaxSubord);
+		} else {
+			braceOpposite = win.BraceMatch(braceAtCaret, 0);
+		}
+		if (braceOpposite > braceAtCaret) {
+			isInside = isAfter;
+		} else {
+			isInside = !isAfter;
+		}
+	}
+	return isInside;
+}
+
+void SciTEBase::BraceMatch(bool editor) {
+	if (!bracesCheck)
+		return;
+	SA::Position braceAtCaret = -1;
+	SA::Position braceOpposite = -1;
+	FindMatchingBracePosition(editor, braceAtCaret, braceOpposite, bracesSloppy);
+	GUI::ScintillaWindow &win = editor ? wEditor : wOutput;
+	if ((braceAtCaret != -1) && (braceOpposite == -1)) {
+		win.BraceBadLight(braceAtCaret);
+		wEditor.SetHighlightGuide(0);
+	} else {
+		char chBrace = 0;
+		if (braceAtCaret >= 0)
+			chBrace = win.CharacterAt(braceAtCaret);
+		win.BraceHighlight(braceAtCaret, braceOpposite);
+		SA::Position columnAtCaret = win.Column(braceAtCaret);
+		SA::Position columnOpposite = win.Column(braceOpposite);
+		if (chBrace == ':') {
+			const SA::Line lineStart = win.LineFromPosition(braceAtCaret);
+			const SA::Position indentPos = win.LineIndentPosition(lineStart);
+			const SA::Position indentPosNext = win.LineIndentPosition(lineStart + 1);
+			columnAtCaret = win.Column(indentPos);
+			const SA::Position columnAtCaretNext = win.Column(indentPosNext);
+			const int indentSize = win.Indent();
+			if (columnAtCaretNext - indentSize > 1)
+				columnAtCaret = columnAtCaretNext - indentSize;
+			if (columnOpposite == 0)	// If the final line of the structure is empty
+				columnOpposite = columnAtCaret;
+		} else {
+			if (win.LineFromPosition(braceAtCaret) == win.LineFromPosition(braceOpposite)) {
+				// Avoid attempting to draw a highlight guide
+				columnAtCaret = 0;
+				columnOpposite = 0;
+			}
+		}
+
+		if (props.GetInt("highlight.indentation.guides"))
+			win.SetHighlightGuide(std::min(columnAtCaret, columnOpposite));
+	}
+}
+
+void SciTEBase::SetWindowName() {
+	if (filePath.IsUntitled()) {
+		windowName = localiser.Text("Untitled");
+		windowName.insert(0, GUI_TEXT("("));
+		windowName += GUI_TEXT(")");
+	} else if (props.GetInt("title.full.path") == 2) {
+		windowName = FileNameExt().AsInternal();
+		windowName += GUI_TEXT(" ");
+		windowName += localiser.Text("in");
+		windowName += GUI_TEXT(" ");
+		windowName += filePath.Directory().AsInternal();
+	} else if (props.GetInt("title.full.path") == 1) {
+		windowName = filePath.AsInternal();
+	} else {
+		windowName = FileNameExt().AsInternal();
+	}
+	if (CurrentBufferConst()->isDirty)
+		windowName += GUI_TEXT(" * ");
+	else
+		windowName += GUI_TEXT(" - ");
+	windowName += appName;
+
+	if (buffers.length > 1 && props.GetInt("title.show.buffers")) {
+		windowName += GUI_TEXT(" [");
+		windowName += GUI::StringFromInteger(buffers.Current() + 1);
+		windowName += GUI_TEXT(" ");
+		windowName += localiser.Text("of");
+		windowName += GUI_TEXT(" ");
+		windowName += GUI::StringFromInteger(buffers.length);
+		windowName += GUI_TEXT("]");
+	}
+
+	wSciTE.SetTitle(windowName.c_str());
+}
+
+SA::Span SciTEBase::GetSelection() {
+	return wEditor.SelectionSpan();
+}
+
+SelectedRange SciTEBase::GetSelectedRange() {
+	return SelectedRange(wEditor.CurrentPos(), wEditor.Anchor());
+}
+
+void SciTEBase::SetSelection(SA::Position anchor, SA::Position currentPos) {
+	wEditor.SetSel(anchor, currentPos);
+}
+
+std::string SciTEBase::GetCTag() {
+	const SA::Position lengthDoc = pwFocussed->Length();
+	SA::Position selEnd = pwFocussed->SelectionEnd();
+	SA::Position selStart = selEnd;
+	TextReader acc(*pwFocussed);
+	int mustStop = 0;
+	while (!mustStop) {
+		if (selStart < lengthDoc - 1) {
+			selStart++;
+			const char c = acc[selStart];
+			if (c == '\r' || c == '\n') {
+				mustStop = -1;
+			} else if (c == '\t' && ((acc[selStart + 1] == '/' && acc[selStart + 2] == '^') || IsADigit(acc[selStart + 1]))) {
+				mustStop = 1;
+			}
+		} else {
+			mustStop = -1;
+		}
+	}
+	if (mustStop == 1 && (acc[selStart + 1] == '/' && acc[selStart + 2] == '^')) {	// Found
+		selEnd = selStart += 3;
+		mustStop = 0;
+		while (!mustStop) {
+			if (selEnd < lengthDoc - 1) {
+				selEnd++;
+				const char c = acc[selEnd];
+				if (c == '\r' || c == '\n') {
+					mustStop = -1;
+				} else if (c == '$' && acc[selEnd + 1] == '/') {
+					mustStop = 1;	// Found!
+				}
+
+			} else {
+				mustStop = -1;
+			}
+		}
+	} else if (mustStop == 1 && IsADigit(acc[selStart + 1])) {
+		// a Tag can be referenced by line Number also
+		selEnd = selStart += 1;
+		while ((selEnd < lengthDoc) && IsADigit(acc[selEnd])) {
+			selEnd++;
+		}
+	}
+
+	if (selStart < selEnd) {
+		return pwFocussed->StringOfSpan(SA::Span(selStart, selEnd));
+	} else {
+		return std::string();
+	}
+}
+
+// Default characters that can appear in a word
+bool SciTEBase::iswordcharforsel(char ch) {
+	return !strchr("\t\n\r !\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", ch);
+}
+
+// Accept slightly more characters than for a word
+// Doesn't accept all valid characters, as they are rarely used in source filenames...
+// Accept path separators '/' and '\', extension separator '.', and ':', MS drive unit
+// separator, and also used for separating the line number for grep. Same for '(' and ')' for cl.
+// Accept '?' and '%' which are used in URL.
+bool SciTEBase::isfilenamecharforsel(char ch) {
+	return !strchr("\t\n\r \"$'*,;<>[]^`{|}", ch);
+}
+
+bool SciTEBase::islexerwordcharforsel(char ch) {
+	// If there are no word.characters defined for the current file, fall back on the original function
+	if (wordCharacters.length())
+		return Contains(wordCharacters, ch);
+	else
+		return iswordcharforsel(ch);
+}
+
+void SciTEBase::HighlightCurrentWord(bool highlight) {
+	if (!currentWordHighlight.isEnabled)
+		return;
+	if (!wEditor.HasFocus() && !wOutput.HasFocus()) {
+		// Neither text window has focus, possibly app is inactive so do not highlight
+		return;
+	}
+	GUI::ScintillaWindow &wCurrent = wOutput.HasFocus() ? wOutput : wEditor;
+	// Remove old indicators if any exist.
+	wCurrent.SetIndicatorCurrent(indicatorHighlightCurrentWord);
+	const SA::Position lenDoc = wCurrent.Length();
+	wCurrent.IndicatorClearRange(0, lenDoc);
+	if (!highlight)
+		return;
+	// Get start & end selection.
+	SA::Span sel = wCurrent.SelectionSpan();
+	const bool noUserSelection = sel.start == sel.end;
+	std::string sWordToFind = RangeExtendAndGrab(wCurrent, sel,
+				  &SciTEBase::islexerwordcharforsel);
+	if (sWordToFind.length() == 0 || (sWordToFind.find_first_of("\n\r ") != std::string::npos))
+		return; // No highlight when no selection or multi-lines selection.
+	if (noUserSelection && currentWordHighlight.statesOfDelay == currentWordHighlight.noDelay) {
+		// Manage delay before highlight when no user selection but there is word at the caret.
+		currentWordHighlight.statesOfDelay = currentWordHighlight.delay;
+		// Reset timer
+		currentWordHighlight.elapsedTimes.Duration(true);
+		return;
+	}
+	// Get style of the current word to highlight only word with same style.
+	int selectedStyle = wCurrent.UnsignedStyleAt(sel.start);
+	if (!currentWordHighlight.isOnlyWithSameStyle)
+		selectedStyle = -1;
+
+	// Manage word with DBCS.
+	const std::string wordToFind = EncodeString(sWordToFind);
+
+	const SA::FindOption searchFlags = SA::FindOption::MatchCase | SA::FindOption::WholeWord;
+	matchMarker.StartMatch(&wCurrent, wordToFind,
+			       searchFlags, selectedStyle,
+			       indicatorHighlightCurrentWord, -1);
+	SetIdler(true);
+}
+
+std::string SciTEBase::GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span span) {
+	return win.StringOfSpan(span);
+}
+
+std::string SciTEBase::GetLine(GUI::ScintillaWindow &win, SA::Line line) {
+	const SA::Position lineStart = win.LineStart(line);
+	const SA::Position lineEnd = win.LineEnd(line);
+	if ((lineStart < 0) || (lineEnd < 0))
+		return std::string();
+	return win.StringOfSpan(SA::Span(lineStart, lineEnd));
+}
+
+void SciTEBase::RangeExtend(
+	GUI::ScintillaWindow &wCurrent,
+	SA::Span &span,
+	bool (SciTEBase::*ischarforsel)(char ch)) {	///< Function returning @c true if the given char. is part of the selection.
+	if (span.start == span.end && ischarforsel) {
+		// Empty span and have a function to extend it
+		const SA::Position lengthDoc = wCurrent.Length();
+		TextReader acc(wCurrent);
+		// Try and find a word at the caret
+		// On the left...
+		while ((span.start > 0) && ((this->*ischarforsel)(acc[span.start - 1]))) {
+			span.start--;
+		}
+		// and on the right
+		while ((span.end < lengthDoc) && ((this->*ischarforsel)(acc[span.end]))) {
+			span.end++;
+		}
+	}
+}
+
+std::string SciTEBase::RangeExtendAndGrab(
+	GUI::ScintillaWindow &wCurrent,
+	SA::Span &span,
+	bool (SciTEBase::*ischarforsel)(char ch),	///< Function returning @c true if the given char. is part of the selection.
+	bool stripEol /*=true*/) {
+
+	RangeExtend(wCurrent, span, ischarforsel);
+	std::string selected;
+	if (span.start != span.end) {
+		selected = GetRangeInUIEncoding(wCurrent, span);
+	}
+	if (stripEol) {
+		// Change whole line selected but normally end of line characters not wanted.
+		// Remove possible terminating \r, \n, or \r\n.
+		const size_t sellen = selected.length();
+		if (sellen >= 2 && (selected[sellen - 2] == '\r' && selected[sellen - 1] == '\n')) {
+			selected.erase(sellen - 2);
+		} else if (sellen >= 1 && (selected[sellen - 1] == '\r' || selected[sellen - 1] == '\n')) {
+			selected.erase(sellen - 1);
+		}
+	}
+
+	return selected;
+}
+
+/**
+ * If there is selected text, either in the editor or the output pane,
+ * put the selection in the @a sel buffer, up to @a len characters.
+ * Otherwise, try and select characters around the caret, as long as they are OK
+ * for the @a ischarforsel function.
+ * Remove the last two character controls from the result, as they are likely
+ * to be CR and/or LF.
+ */
+std::string SciTEBase::SelectionExtend(
+	bool (SciTEBase::*ischarforsel)(char ch),	///< Function returning @c true if the given char. is part of the selection.
+	bool stripEol /*=true*/) {
+
+	SA::Span sel = pwFocussed->SelectionSpan();
+	return RangeExtendAndGrab(*pwFocussed, sel, ischarforsel, stripEol);
+}
+
+std::string SciTEBase::SelectionWord(bool stripEol /*=true*/) {
+	return SelectionExtend(&SciTEBase::islexerwordcharforsel, stripEol);
+}
+
+std::string SciTEBase::SelectionFilename() {
+	return SelectionExtend(&SciTEBase::isfilenamecharforsel);
+}
+
+void SciTEBase::SelectionIntoProperties() {
+	std::string currentSelection = SelectionExtend(nullptr, false);
+	props.Set("CurrentSelection", currentSelection.c_str());
+
+	std::string word = SelectionWord();
+	props.Set("CurrentWord", word.c_str());
+
+	const SA::Span range = PaneFocused().SelectionSpan();
+	props.Set("SelectionStartLine", std::to_string(PaneFocused().LineFromPosition(range.start) + 1));
+	props.Set("SelectionStartColumn", std::to_string(PaneFocused().Column(range.start) + 1));
+	props.Set("SelectionEndLine", std::to_string(PaneFocused().LineFromPosition(range.end) + 1));
+	props.Set("SelectionEndColumn", std::to_string(PaneFocused().Column(range.end) + 1));
+}
+
+void SciTEBase::SelectionIntoFind(bool stripEol /*=true*/) {
+	std::string sel = SelectionWord(stripEol);
+	if (sel.length() && (sel.find_first_of("\r\n") == std::string::npos)) {
+		// The selection does not include a new line, so is likely to be
+		// the expression to search...
+		findWhat = sel;
+		if (unSlash) {
+			std::string slashedFind = Slash(findWhat, false);
+			findWhat = slashedFind;
+		}
+	}
+	// else findWhat remains the same as last time.
+}
+
+void SciTEBase::SelectionAdd(AddSelection add) {
+	SA::FindOption flags = SA::FindOption::None;
+	if (!pwFocussed->SelectionEmpty()) {
+		// If selection is word then match as word.
+		if (pwFocussed->IsRangeWord(pwFocussed->SelectionStart(),
+					    pwFocussed->SelectionEnd()))
+			flags = SA::FindOption::WholeWord;
+	}
+	pwFocussed->TargetWholeDocument();
+	pwFocussed->SetSearchFlags(flags);
+	if (add == addNext) {
+		pwFocussed->MultipleSelectAddNext();
+	} else {
+		if (pwFocussed->SelectionEmpty()) {
+			pwFocussed->MultipleSelectAddNext();
+		}
+		pwFocussed->MultipleSelectAddEach();
+	}
+}
+
+std::string SciTEBase::EncodeString(const std::string &s) {
+	return s;
+}
+
+static std::string UnSlashAsNeeded(const std::string &s, bool escapes, bool regularExpression) {
+	if (escapes) {
+		if (regularExpression) {
+			// For regular expressions, the only escape sequences allowed start with \0
+			// Other sequences, like \t, are handled by the RE engine.
+			return UnSlashLowOctalString(s.c_str());
+		} else {
+			// C style escapes allowed
+			return UnSlashString(s.c_str());
+		}
+	} else {
+		return s;
+	}
+}
+
+void SciTEBase::RemoveFindMarks() {
+	findMarker.Stop();	// Cancel ongoing background find
+	if (CurrentBuffer()->findMarks != Buffer::fmNone) {
+		wEditor.SetIndicatorCurrent(indicatorMatch);
+		wEditor.IndicatorClearRange(0, LengthDocument());
+		CurrentBuffer()->findMarks = Buffer::fmNone;
+	}
+	wEditor.AnnotationClearAll();
+}
+
+SA::FindOption SciTEBase::SearchFlags(bool regularExpressions) const {
+	SA::FindOption opt = SA::FindOption::None;
+	if (wholeWord)
+		opt |= SA::FindOption::WholeWord;
+	if (matchCase)
+		opt |= SA::FindOption::MatchCase;
+	if (regularExpressions)
+		opt |= SA::FindOption::RegExp;
+	if (props.GetInt("find.replace.regexp.posix"))
+		opt |= SA::FindOption::Posix;
+	if (props.GetInt("find.replace.regexp.cpp11"))
+		opt |= SA::FindOption::Cxx11RegEx;
+	return opt;
+}
+
+void SciTEBase::MarkAll(MarkPurpose purpose) {
+	RemoveFindMarks();
+	wEditor.SetIndicatorCurrent(indicatorMatch);
+	if (purpose == markIncremental) {
+		CurrentBuffer()->findMarks = Buffer::fmTemporary;
+		SetOneIndicator(wEditor, indicatorMatch,
+				IndicatorDefinition(props.GetString("find.indicator.incremental")));
+	} else {
+		CurrentBuffer()->findMarks = Buffer::fmMarked;
+		std::string findIndicatorString = props.GetString("find.mark.indicator");
+		IndicatorDefinition findIndicator(findIndicatorString);
+		if (!findIndicatorString.length()) {
+			findIndicator.style = SA::IndicatorStyle::RoundBox;
+			std::string findMark = props.GetString("find.mark");
+			if (findMark.length())
+				findIndicator.colour = ColourFromString(findMark);
+			findIndicator.fillAlpha = alphaIndicator;
+			findIndicator.under = underIndicator;
+		}
+		SetOneIndicator(wEditor, indicatorMatch, findIndicator);
+	}
+
+	const std::string findTarget = UnSlashAsNeeded(EncodeString(findWhat), unSlash, regExp);
+	if (findTarget.length() == 0) {
+		return;
+	}
+
+	findMarker.StartMatch(&wEditor, findTarget,
+			      SearchFlags(regExp), -1,
+			      indicatorMatch, (purpose == markWithBookMarks) ? markerBookmark : -1);
+	SetIdler(true);
+}
+
+int SciTEBase::IncrementSearchMode() {
+	FindIncrement();
+	return 0;
+}
+
+void SciTEBase::FailedSaveMessageBox(const FilePath &filePathSaving) {
+	const GUI::gui_string msg = LocaliseMessage(
+					    "Could not save file \"^0\".", filePathSaving.AsInternal());
+	WindowMessageBox(wSciTE, msg);
+}
+
+bool SciTEBase::FindReplaceAdvanced() const {
+	return props.GetInt("find.replace.advanced");
+}
+
+SA::Position SciTEBase::FindInTarget(const std::string &findWhatText, SA::Span range) {
+	wEditor.SetTarget(range);
+	SA::Position posFind = wEditor.SearchInTarget(findWhatText);
+	while (findInStyle && (posFind >= 0) && (findStyle != wEditor.UnsignedStyleAt(posFind))) {
+		if (range.start < range.end) {
+			wEditor.SetTarget(SA::Span(posFind + 1, range.end));
+		} else {
+			wEditor.SetTarget(SA::Span(range.start, posFind + 1));
+		}
+		posFind = wEditor.SearchInTarget(findWhatText);
+	}
+	return posFind;
+}
+
+void SciTEBase::SetFindText(const char *sFind) {
+	findWhat = sFind;
+	props.Set("find.what", findWhat.c_str());
+}
+
+void SciTEBase::SetFind(const char *sFind) {
+	SetFindText(sFind);
+	InsertFindInMemory();
+}
+
+bool SciTEBase::FindHasText() const noexcept {
+	return !findWhat.empty();
+}
+
+void SciTEBase::SetReplace(const char *sReplace) {
+	replaceWhat = sReplace;
+	memReplaces.Insert(replaceWhat);
+}
+
+void SciTEBase::SetCaretAsStart() {
+	searchStartPosition = wEditor.SelectionStart();
+}
+
+void SciTEBase::MoveBack() {
+	SetSelection(searchStartPosition, searchStartPosition);
+}
+
+void SciTEBase::ScrollEditorIfNeeded() {
+	GUI::Point ptCaret;
+	const SA::Position caret = wEditor.CurrentPos();
+	ptCaret.x = wEditor.PointXFromPosition(caret);
+	ptCaret.y = wEditor.PointYFromPosition(caret);
+	ptCaret.y += wEditor.TextHeight(0) - 1;
+
+	const GUI::Rectangle rcEditor = wEditor.GetClientPosition();
+	if (!rcEditor.Contains(ptCaret))
+		wEditor.ScrollCaret();
+}
+
+SA::Position SciTEBase::FindNext(bool reverseDirection, bool showWarnings, bool allowRegExp) {
+	if (findWhat.length() == 0) {
+		Find();
+		return -1;
+	}
+	const std::string findTarget = UnSlashAsNeeded(EncodeString(findWhat), unSlash, regExp);
+	if (findTarget.length() == 0)
+		return -1;
+
+	const SA::Position lengthDoc = wEditor.Length();
+	const SA::Span rangeSelection = wEditor.SelectionSpan();
+	SA::Span rangeSearch(rangeSelection.end, lengthDoc);
+	if (reverseDirection) {
+		rangeSearch = SA::Span(rangeSelection.start, 0);
+	}
+
+	wEditor.SetSearchFlags(SearchFlags(allowRegExp && regExp));
+	SA::Position posFind = FindInTarget(findTarget, rangeSearch);
+	if (posFind == -1 && wrapFind) {
+		// Failed to find in indicated direction
+		// so search from the beginning (forward) or from the end (reverse)
+		// unless wrapFind is false
+		const SA::Span rangeAll = reverseDirection ?
+					   SA::Span(lengthDoc, 0) : SA::Span(0, lengthDoc);
+		posFind = FindInTarget(findTarget, rangeAll);
+		WarnUser(warnFindWrapped);
+	}
+	if (posFind < 0) {
+		havefound = false;
+		failedfind = true;
+		if (showWarnings) {
+			WarnUser(warnNotFound);
+			FindMessageBox("Can not find the string '^0'.",
+				       &findWhat);
+		}
+	} else {
+		havefound = true;
+		failedfind = false;
+		const SA::Span rangeTarget = wEditor.TargetSpan();
+		// Ensure found text is styled so that caret will be made visible but
+		// only perform style in synchronous styling mode.
+		const SA::Position endStyled = wEditor.EndStyled();
+		if ((endStyled < rangeTarget.end) && (idleStyling == SA::IdleStyling::None)) {
+			wEditor.Colourise(endStyled,
+					  wEditor.LineStart(wEditor.LineFromPosition(rangeTarget.end) + 1));
+		}
+		EnsureRangeVisible(wEditor, rangeTarget);
+		wEditor.ScrollRange(rangeTarget.start, rangeTarget.end);
+		SetSelection(rangeTarget.start, rangeTarget.end);
+		if (!replacing && (closeFind != CloseFind::closePrevent)) {
+			DestroyFindReplace();
+		}
+	}
+	return posFind;
+}
+
+void SciTEBase::HideMatch() {
+}
+
+void SciTEBase::ReplaceOnce(bool showWarnings) {
+	if (!FindHasText())
+		return;
+
+	bool haveWarned = false;
+	if (!havefound) {
+		const SA::Span rangeSelection = wEditor.SelectionSpan();
+		SetSelection(rangeSelection.start, rangeSelection.start);
+		FindNext(false);
+		haveWarned = !havefound;
+	}
+
+	if (havefound) {
+		const std::string replaceTarget = UnSlashAsNeeded(EncodeString(replaceWhat), unSlash, regExp);
+		const SA::Span rangeSelection = wEditor.SelectionSpan();
+		wEditor.SetTarget(rangeSelection);
+		SA::Position lenReplaced = replaceTarget.length();
+		if (regExp)
+			lenReplaced = wEditor.ReplaceTargetRE(replaceTarget);
+		else	// Allow \0 in replacement
+			wEditor.ReplaceTarget(replaceTarget);
+		SetSelection(rangeSelection.start + lenReplaced, rangeSelection.start);
+		havefound = false;
+	}
+
+	FindNext(false, showWarnings && !haveWarned);
+}
+
+intptr_t SciTEBase::DoReplaceAll(bool inSelection) {
+	const std::string findTarget = UnSlashAsNeeded(EncodeString(findWhat), unSlash, regExp);
+	if (findTarget.length() == 0) {
+		return -1;
+	}
+
+	const SA::Span rangeSelection = wEditor.SelectionSpan();
+	SA::Span rangeSearch = rangeSelection;
+	const int countSelections = wEditor.Selections();
+	if (inSelection) {
+		const SA::SelectionMode selType = wEditor.SelectionMode();
+		if (selType == SA::SelectionMode::Lines) {
+			// Take care to replace in whole lines
+			const SA::Line startLine = wEditor.LineFromPosition(rangeSearch.start);
+			rangeSearch.start = wEditor.LineStart(startLine);
+			const SA::Line endLine = wEditor.LineFromPosition(rangeSearch.end);
+			rangeSearch.end = wEditor.LineStart(endLine + 1);
+		} else {
+			for (int i=0; i<countSelections; i++) {
+				rangeSearch.start = std::min(rangeSearch.start, wEditor.SelectionNStart(i));
+				rangeSearch.end = std::max(rangeSearch.end, wEditor.SelectionNEnd(i));
+			}
+		}
+		if (rangeSearch.Length() == 0) {
+			return -2;
+		}
+	} else {
+		rangeSearch.end = LengthDocument();
+		if (wrapFind) {
+			// Whole document
+			rangeSearch.start = 0;
+		}
+		// If not wrapFind, replace all only from caret to end of document
+	}
+
+	const std::string replaceTarget = UnSlashAsNeeded(EncodeString(replaceWhat), unSlash, regExp);
+	wEditor.SetSearchFlags(SearchFlags(regExp));
+	SA::Position posFind = FindInTarget(findTarget, rangeSearch);
+	if ((posFind >= 0) && (posFind <= rangeSearch.end)) {
+		SA::Position lastMatch = posFind;
+		intptr_t replacements = 0;
+		wEditor.BeginUndoAction();
+		// Replacement loop
+		while (posFind >= 0) {
+			const SA::Position lenTarget = wEditor.TargetEnd() - wEditor.TargetStart();
+			if (inSelection && countSelections > 1) {
+				// We must check that the found target is entirely inside a selection
+				bool insideASelection = false;
+				for (int i=0; i<countSelections && !insideASelection; i++) {
+					const SA::Position startPos = wEditor.SelectionNStart(i);
+					const SA::Position endPos = wEditor.SelectionNEnd(i);
+					if (posFind >= startPos && posFind + lenTarget <= endPos)
+						insideASelection = true;
+				}
+				if (!insideASelection) {
+					// Found target is totally or partly outside the selections
+					lastMatch = posFind + 1;
+					if (lastMatch >= rangeSearch.end) {
+						// Run off the end of the document/selection with an empty match
+						posFind = -1;
+					} else {
+						posFind = FindInTarget(findTarget, SA::Span(lastMatch, rangeSearch.end));
+					}
+					continue;	// No replacement
+				}
+			}
+			SA::Position lenReplaced = replaceTarget.length();
+			if (regExp) {
+				lenReplaced = wEditor.ReplaceTargetRE(replaceTarget);
+			} else {
+				wEditor.ReplaceTarget(replaceTarget);
+			}
+			// Modify for change caused by replacement
+			rangeSearch.end += lenReplaced - lenTarget;
+			// For the special cases of start of line and end of line
+			// something better could be done but there are too many special cases
+			lastMatch = posFind + lenReplaced;
+			if (lenTarget <= 0) {
+				lastMatch = wEditor.PositionAfter(lastMatch);
+			}
+			if (lastMatch >= rangeSearch.end) {
+				// Run off the end of the document/selection with an empty match
+				posFind = -1;
+			} else {
+				posFind = FindInTarget(findTarget, SA::Span(lastMatch, rangeSearch.end));
+			}
+			replacements++;
+		}
+		if (inSelection) {
+			if (countSelections == 1)
+				SetSelection(rangeSearch.start, rangeSearch.end);
+		} else {
+			SetSelection(lastMatch, lastMatch);
+		}
+		wEditor.EndUndoAction();
+		return replacements;
+	}
+	return 0;
+}
+
+intptr_t SciTEBase::ReplaceAll(bool inSelection) {
+	wEditor.SetRedraw(false);
+	const intptr_t replacements = DoReplaceAll(inSelection);
+	wEditor.SetRedraw(true);
+	props.Set("Replacements", std::to_string(replacements > 0 ? replacements : 0));
+	UpdateStatusBar(false);
+	if (replacements == -1) {
+		FindMessageBox(
+			inSelection ?
+			"Find string must not be empty for 'Replace in Selection' command." :
+			"Find string must not be empty for 'Replace All' command.");
+	} else if (replacements == -2) {
+		FindMessageBox(
+			"Selection must not be empty for 'Replace in Selection' command.");
+	} else if (replacements == 0) {
+		FindMessageBox(
+			"No replacements because string '^0' was not present.", &findWhat);
+	}
+	return replacements;
+}
+
+intptr_t SciTEBase::ReplaceInBuffers() {
+	const int currentBuffer = buffers.Current();
+	intptr_t replacements = 0;
+	for (int i = 0; i < buffers.length; i++) {
+		SetDocumentAt(i);
+		replacements += DoReplaceAll(false);
+		if (i == 0 && replacements < 0) {
+			FindMessageBox(
+				"Find string must not be empty for 'Replace in Buffers' command.");
+			break;
+		}
+	}
+	SetDocumentAt(currentBuffer);
+	props.Set("Replacements", std::to_string(replacements));
+	UpdateStatusBar(false);
+	if (replacements == 0) {
+		FindMessageBox(
+			"No replacements because string '^0' was not present.", &findWhat);
+	}
+	return replacements;
+}
+
+void SciTEBase::UIClosed() {
+	if (CurrentBuffer()->findMarks == Buffer::fmTemporary) {
+		RemoveFindMarks();
+	}
+}
+
+void SciTEBase::UIHasFocus() {
+}
+
+void SciTEBase::OutputAppendString(const char *s, SA::Position len) {
+	if (len == -1)
+		len = strlen(s);
+	wOutput.AppendText(len, s);
+	if (scrollOutput) {
+		const SA::Line line = wOutput.LineCount();
+		const SA::Position lineStart = wOutput.LineStart(line);
+		wOutput.GotoPos(lineStart);
+	}
+}
+
+void SciTEBase::OutputAppendStringSynchronised(const char *s, SA::Position len) {
+	// This may be called from secondary thread so always use Send instead of Call
+	if (len == -1)
+		len = strlen(s);
+	wOutput.Send(SCI_APPENDTEXT, len, SptrFromString(s));
+	if (scrollOutput) {
+		const SA::Line line = wOutput.Send(SCI_GETLINECOUNT);
+		const SA::Position lineStart = wOutput.Send(SCI_POSITIONFROMLINE, line);
+		wOutput.Send(SCI_GOTOPOS, lineStart);
+	}
+}
+
+void SciTEBase::Execute() {
+	props.Set("CurrentMessage", "");
+	dirNameForExecute = FilePath();
+	bool displayParameterDialog = false;
+	parameterisedCommand = "";
+	for (size_t ic = 0; ic < jobQueue.commandMax; ic++) {
+		if (StartsWith(jobQueue.jobQueue[ic].command, "*")) {
+			displayParameterDialog = true;
+			jobQueue.jobQueue[ic].command.erase(0, 1);
+			parameterisedCommand = jobQueue.jobQueue[ic].command;
+		}
+		if (jobQueue.jobQueue[ic].directory.IsSet()) {
+			dirNameForExecute = jobQueue.jobQueue[ic].directory;
+		}
+	}
+	if (displayParameterDialog) {
+		if (!ParametersDialog(true)) {
+			jobQueue.ClearJobs();
+			return;
+		}
+	} else {
+		ParamGrab();
+	}
+	for (size_t ic = 0; ic < jobQueue.commandMax; ic++) {
+		if (jobQueue.jobQueue[ic].jobType != jobGrep) {
+			jobQueue.jobQueue[ic].command = props.Expand(jobQueue.jobQueue[ic].command);
+		}
+	}
+
+	if (jobQueue.ClearBeforeExecute()) {
+		wOutput.ClearAll();
+	}
+
+	wOutput.MarkerDeleteAll(-1);
+	wEditor.MarkerDeleteAll(0);
+	// Ensure the output pane is visible
+	if (jobQueue.ShowOutputPane()) {
+		SetOutputVisibility(true);
+	}
+
+	jobQueue.SetCancelFlag(false);
+	if (jobQueue.HasCommandToRun()) {
+		jobQueue.SetExecuting(true);
+	}
+	CheckMenus();
+	dirNameAtExecute = filePath.Directory();
+}
+
+void SciTEBase::SetOutputVisibility(bool show) {
+	if (show) {
+		if (heightOutput <= 0) {
+			if (previousHeightOutput < 20) {
+				if (splitVertical)
+					heightOutput = NormaliseSplit(300);
+				else
+					heightOutput = NormaliseSplit(100);
+				previousHeightOutput = heightOutput;
+			} else {
+				heightOutput = NormaliseSplit(previousHeightOutput);
+			}
+		}
+	} else {
+		if (heightOutput > 0) {
+			heightOutput = NormaliseSplit(0);
+			WindowSetFocus(wEditor);
+		}
+	}
+	SizeSubWindows();
+	Redraw();
+}
+
+// Background threads that are send text to the output pane want it to be made visible.
+// Derived methods for each platform may perform thread synchronization.
+void SciTEBase::ShowOutputOnMainThread() {
+	SetOutputVisibility(true);
+}
+
+void SciTEBase::ToggleOutputVisible() {
+	SetOutputVisibility(heightOutput <= 0);
+}
+
+void SciTEBase::BookmarkAdd(SA::Line lineno) {
+	if (lineno == -1)
+		lineno = GetCurrentLineNumber();
+	if (!BookmarkPresent(lineno))
+		wEditor.MarkerAdd(lineno, markerBookmark);
+}
+
+void SciTEBase::BookmarkDelete(SA::Line lineno) {
+	if (lineno == -1)
+		lineno = GetCurrentLineNumber();
+	if (BookmarkPresent(lineno))
+		wEditor.MarkerDelete(lineno, markerBookmark);
+}
+
+bool SciTEBase::BookmarkPresent(SA::Line lineno) {
+	if (lineno == -1)
+		lineno = GetCurrentLineNumber();
+	const int state = wEditor.MarkerGet(lineno);
+	return state & (1 << markerBookmark);
+}
+
+void SciTEBase::BookmarkToggle(SA::Line lineno) {
+	if (lineno == -1)
+		lineno = GetCurrentLineNumber();
+	if (BookmarkPresent(lineno)) {
+		while (BookmarkPresent(lineno)) {
+			BookmarkDelete(lineno);
+		}
+	} else {
+		BookmarkAdd(lineno);
+	}
+}
+
+void SciTEBase::BookmarkNext(bool forwardScan, bool select) {
+	const SA::Line lineno = GetCurrentLineNumber();
+	SA::Message sciMarker = SA::Message::MarkerNext;
+	SA::Line lineStart = lineno + 1;	//Scan starting from next line
+	SA::Line lineRetry = 0;				//If not found, try from the beginning
+	const SA::Position anchor = wEditor.Anchor();
+	if (!forwardScan) {
+		lineStart = lineno - 1;		//Scan starting from previous line
+		lineRetry = wEditor.LineCount();	//If not found, try from the end
+		sciMarker = SA::Message::MarkerPrevious;
+	}
+	SA::Line nextLine = wEditor.Call(sciMarker, lineStart, 1 << markerBookmark);
+	if (nextLine < 0)
+		nextLine = wEditor.Call(sciMarker, lineRetry, 1 << markerBookmark);
+	if (nextLine < 0 || nextLine == lineno)	// No bookmark (of the given type) or only one, and already on it
+		WarnUser(warnNoOtherBookmark);
+	else {
+		GotoLineEnsureVisible(nextLine);
+		if (select) {
+			wEditor.SetAnchor(anchor);
+		}
+	}
+}
+
+void SciTEBase::BookmarkSelectAll() {
+	std::vector<SA::Line> bookmarks;
+	SA::Line lineBookmark = -1;
+	while ((lineBookmark = wEditor.MarkerNext(lineBookmark + 1, 1 << markerBookmark)) >= 0) {
+		bookmarks.push_back(lineBookmark);
+	}
+	for (size_t i = 0; i < bookmarks.size(); i++) {
+		const SA::Span range = {
+			wEditor.LineStart(bookmarks[i]),
+			wEditor.LineStart(bookmarks[i] + 1)
+		};
+		if (i == 0) {
+			wEditor.SetSelection(range.end, range.start);
+		} else {
+			wEditor.AddSelection(range.end, range.start);
+		}
+	}
+}
+
+GUI::Rectangle SciTEBase::GetClientRectangle() {
+	return wContent.GetClientPosition();
+}
+
+void SciTEBase::Redraw() {
+	wSciTE.InvalidateAll();
+	wEditor.InvalidateAll();
+	wOutput.InvalidateAll();
+}
+
+std::string SciTEBase::GetNearestWords(const char *wordStart, size_t searchLen,
+				       const char *separators, bool ignoreCase /*=false*/, bool exactLen /*=false*/) {
+	std::string words;
+	while (words.empty() && *separators) {
+		words = apis.GetNearestWords(wordStart, searchLen, ignoreCase, *separators, exactLen);
+		separators++;
+	}
+	return words;
+}
+
+void SciTEBase::FillFunctionDefinition(SA::Position pos /*= -1*/) {
+	if (pos > 0) {
+		lastPosCallTip = pos;
+	}
+	if (apis) {
+		std::string words = GetNearestWords(currentCallTipWord.c_str(), currentCallTipWord.length(),
+						    calltipParametersStart.c_str(), callTipIgnoreCase, true);
+		if (words.empty())
+			return;
+		// Counts how many call tips
+		maxCallTips = static_cast<int>(std::count(words.begin(), words.end(), ' ') + 1);
+
+		// Should get current api definition
+		std::string word = apis.GetNearestWord(currentCallTipWord.c_str(), currentCallTipWord.length(),
+						       callTipIgnoreCase, calltipWordCharacters, currentCallTip);
+		if (word.length()) {
+			functionDefinition = word;
+			if (maxCallTips > 1) {
+				functionDefinition.insert(0, "\001");
+			}
+
+			if (calltipEndDefinition != "") {
+				const size_t posEndDef = functionDefinition.find(calltipEndDefinition);
+				if (maxCallTips > 1) {
+					if (posEndDef != std::string::npos) {
+						functionDefinition.insert(posEndDef + calltipEndDefinition.length(), "\n\002");
+					} else {
+						functionDefinition.append("\n\002");
+					}
+				} else {
+					if (posEndDef != std::string::npos) {
+						functionDefinition.insert(posEndDef + calltipEndDefinition.length(), "\n");
+					}
+				}
+			} else if (maxCallTips > 1) {
+				functionDefinition.insert(1, "\002");
+			}
+
+			std::string definitionForDisplay;
+			if (callTipUseEscapes) {
+				definitionForDisplay = UnSlashString(functionDefinition.c_str());
+			} else {
+				definitionForDisplay = functionDefinition;
+			}
+
+			wEditor.CallTipShow(lastPosCallTip - currentCallTipWord.length(), definitionForDisplay.c_str());
+			ContinueCallTip();
+		}
+	}
+}
+
+bool SciTEBase::StartCallTip() {
+	currentCallTip = 0;
+	currentCallTipWord = "";
+	std::string line = GetCurrentLine();
+	SA::Position current = GetCaretInLine();
+	SA::Position pos = wEditor.CurrentPos();
+	do {
+		int braces = 0;
+		while (current > 0 && (braces || !Contains(calltipParametersStart, line[current - 1]))) {
+			if (Contains(calltipParametersStart, line[current - 1]))
+				braces--;
+			else if (Contains(calltipParametersEnd, line[current - 1]))
+				braces++;
+			current--;
+			pos--;
+		}
+		if (current > 0) {
+			current--;
+			pos--;
+		} else
+			break;
+		while (current > 0 && IsASpace(line[current - 1])) {
+			current--;
+			pos--;
+		}
+	} while (current > 0 && !Contains(calltipWordCharacters, line[current - 1]));
+	if (current <= 0)
+		return true;
+
+	startCalltipWord = current - 1;
+	while (startCalltipWord > 0 &&
+			Contains(calltipWordCharacters, line[startCalltipWord - 1])) {
+		startCalltipWord--;
+	}
+
+	line.at(current) = '\0';
+	currentCallTipWord = line.c_str() + startCalltipWord;
+	functionDefinition = "";
+	FillFunctionDefinition(pos);
+	return true;
+}
+
+void SciTEBase::ContinueCallTip() {
+	std::string line = GetCurrentLine();
+	const SA::Position current = GetCaretInLine();
+
+	int braces = 0;
+	int commas = 0;
+	for (SA::Position i = startCalltipWord; i < current; i++) {
+		if (Contains(calltipParametersStart, line[i]))
+			braces++;
+		else if (Contains(calltipParametersEnd, line[i]) && braces > 0)
+			braces--;
+		else if (braces == 1 && Contains(calltipParametersSeparators, line[i]))
+			commas++;
+	}
+
+	size_t startHighlight = 0;
+	while ((startHighlight < functionDefinition.length()) && !Contains(calltipParametersStart, functionDefinition[startHighlight]))
+		startHighlight++;
+	if ((startHighlight < functionDefinition.length()) && Contains(calltipParametersStart, functionDefinition[startHighlight]))
+		startHighlight++;
+	while ((startHighlight < functionDefinition.length()) && commas > 0) {
+		if (Contains(calltipParametersSeparators, functionDefinition[startHighlight]))
+			commas--;
+		// If it reached the end of the argument list it means that the user typed in more
+		// arguments than the ones listed in the calltip
+		if (Contains(calltipParametersEnd, functionDefinition[startHighlight]))
+			commas = 0;
+		else
+			startHighlight++;
+	}
+	if ((startHighlight < functionDefinition.length()) && Contains(calltipParametersSeparators, functionDefinition[startHighlight]))
+		startHighlight++;
+	size_t endHighlight = startHighlight;
+	while ((endHighlight < functionDefinition.length()) && !Contains(calltipParametersSeparators, functionDefinition[endHighlight]) && !Contains(calltipParametersEnd, functionDefinition[endHighlight]))
+		endHighlight++;
+	if (callTipUseEscapes) {
+		std::string sPreHighlight = functionDefinition.substr(0, startHighlight);
+		std::vector<char> vPreHighlight(sPreHighlight.c_str(), sPreHighlight.c_str() + sPreHighlight.length() + 1);
+		const int unslashedStartHighlight = UnSlash(&vPreHighlight[0]);
+
+		int unslashedEndHighlight = unslashedStartHighlight;
+		if (startHighlight < endHighlight) {
+			std::string sHighlight = functionDefinition.substr(startHighlight, endHighlight - startHighlight);
+			std::vector<char> vHighlight(sHighlight.c_str(), sHighlight.c_str() + sHighlight.length() + 1);
+			unslashedEndHighlight = unslashedStartHighlight + UnSlash(&vHighlight[0]);
+		}
+
+		startHighlight = unslashedStartHighlight;
+		endHighlight = unslashedEndHighlight;
+	}
+
+	wEditor.CallTipSetHlt(startHighlight, endHighlight);
+}
+
+std::string SciTEBase::EliminateDuplicateWords(const std::string &words) {
+	std::set<std::string> wordSet;
+	std::string wordsOut;
+
+	size_t current = 0;
+	while (current < words.length()) {
+		const size_t afterWord = words.find(' ', current);
+		const std::string word(words, current, afterWord - current);
+		std::pair<std::set<std::string>::iterator, bool> result = wordSet.insert(word);
+		if (result.second) {
+			if (!wordsOut.empty())
+				wordsOut += ' ';
+			wordsOut += word;
+		}
+		current = afterWord;
+		if (current < words.length())
+			current++;
+	}
+	return wordsOut;
+}
+
+bool SciTEBase::StartAutoComplete() {
+	const std::string line = GetCurrentLine();
+	const SA::Position current = GetCaretInLine();
+
+	SA::Position startword = current;
+
+	while ((startword > 0) &&
+			(Contains(calltipWordCharacters, line[startword - 1]) ||
+			 Contains(autoCompleteStartCharacters, line[startword - 1]))) {
+		startword--;
+	}
+
+	const std::string root = line.substr(startword, current - startword);
+	if (apis) {
+		const std::string words = GetNearestWords(root.c_str(), root.length(),
+						    calltipParametersStart.c_str(), autoCompleteIgnoreCase);
+		if (!words.empty()) {
+			std::string wordsUnique = EliminateDuplicateWords(words);
+			wEditor.AutoCSetSeparator(' ');
+			wEditor.AutoCSetMaxHeight(autoCompleteVisibleItemCount);
+			wEditor.AutoCShow(root.length(), wordsUnique.c_str());
+		}
+	}
+	return true;
+}
+
+bool SciTEBase::StartAutoCompleteWord(bool onlyOneWord) {
+	const std::string line = GetCurrentLine();
+	const SA::Position current = GetCaretInLine();
+
+	SA::Position startword = current;
+	// Autocompletion of pure numbers is mostly an annoyance
+	bool allNumber = true;
+	while (startword > 0 && Contains(wordCharacters, line[startword - 1])) {
+		startword--;
+		if (line[startword] < '0' || line[startword] > '9') {
+			allNumber = false;
+		}
+	}
+	if (startword == current || allNumber)
+		return true;
+	const std::string root = line.substr(startword, current - startword);
+	const SA::Position rootLength = root.length();
+	const SA::Position doclen = LengthDocument();
+	const SA::FindOption flags =
+		SA::FindOption::WordStart | (autoCompleteIgnoreCase ? SA::FindOption::None : SA::FindOption::MatchCase);
+	const SA::Position posCurrentWord = wEditor.CurrentPos() - rootLength;
+
+	// wordList contains a list of words to display in an autocompletion list.
+	AutoCompleteWordList wordList;
+
+	wEditor.SetTarget(SA::Span(0, doclen));
+	wEditor.SetSearchFlags(flags);
+	SA::Position posFind = wEditor.SearchInTarget(root);
+	TextReader acc(wEditor);
+	while (posFind >= 0 && posFind < doclen) {	// search all the document
+		SA::Position wordEnd = posFind + rootLength;
+		if (posFind != posCurrentWord) {
+			while (Contains(wordCharacters, acc.SafeGetCharAt(wordEnd)))
+				wordEnd++;
+			const SA::Position wordLength = wordEnd - posFind;
+			if (wordLength > rootLength) {
+				const std::string word = wEditor.StringOfSpan(SA::Span(posFind, wordEnd));
+				if (wordList.Add(word)) {
+					if (onlyOneWord && wordList.Count() > 1) {
+						return true;
+					}
+				}
+			}
+		}
+		wEditor.SetTarget(SA::Span(wordEnd, doclen));
+		posFind = wEditor.SearchInTarget(root);
+	}
+	if ((wordList.Count() != 0) && (!onlyOneWord || (wordList.MinWordLength() > static_cast<size_t>(rootLength)))) {
+		// Protect spaces by temporarily transforming to \001
+		std::string wordsNear = wordList.Get();
+		std::replace(wordsNear.begin(), wordsNear.end(), ' ', '\001');
+		StringList wl(true);
+		wl.Set(wordsNear.c_str());
+		std::string acText = wl.GetNearestWords("", 0, autoCompleteIgnoreCase);
+		// Use \n as word separator
+		std::replace(acText.begin(), acText.end(), ' ', '\n');
+		// Return spaces from \001
+		std::replace(acText.begin(), acText.end(), '\001', ' ');
+		wEditor.AutoCSetSeparator('\n');
+		wEditor.AutoCSetMaxHeight(autoCompleteVisibleItemCount);
+		wEditor.AutoCShow(rootLength, acText.c_str());
+	} else {
+		wEditor.AutoCCancel();
+	}
+	return true;
+}
+
+bool SciTEBase::PerformInsertAbbreviation() {
+	const std::string data = propsAbbrev.GetString(abbrevInsert.c_str());
+	if (data.empty()) {
+		return true; // returning if expanded abbreviation is empty
+	}
+
+	const std::string expbuf = UnSlashString(data.c_str());
+	const size_t expbuflen = expbuf.length();
+
+	SA::Position caretPos = wEditor.SelectionStart();
+	SA::Position selStart = caretPos;
+	SA::Position selLength = wEditor.SelectionEnd() - selStart;
+	bool atStart = true;
+	bool doublePipe = false;
+	size_t lastPipe = expbuflen;
+	SA::Line currentLineNumber = wEditor.LineFromPosition(caretPos);
+	int indent = 0;
+	const int indentSize = wEditor.Indent();
+	const int indentChars = (wEditor.UseTabs() && wEditor.TabWidth() ? wEditor.TabWidth() : 1);
+	int indentExtra = 0;
+	bool isIndent = true;
+	const SA::EndOfLine eolMode = wEditor.EOLMode();
+	if (props.GetInt("indent.automatic")) {
+		indent = GetLineIndentation(currentLineNumber);
+	}
+
+	// find last |, can't be strrchr(exbuf, '|') because of ||
+	for (size_t i = expbuflen; i--;) {
+		if (expbuf[i] == '|' && (i == 0 || expbuf[i-1] != '|')) {
+			lastPipe = i;
+			break;
+		}
+	}
+
+	wEditor.BeginUndoAction();
+
+	// add the abbreviation one character at a time
+	for (size_t i = 0; i < expbuflen; i++) {
+		const char c = expbuf[i];
+		std::string abbrevText;
+		if (isIndent && c == '\t') {
+			if (props.GetInt("indent.automatic")) {
+				indentExtra++;
+				SetLineIndentation(currentLineNumber, indent + indentSize * indentExtra);
+				caretPos += indentSize / indentChars;
+			}
+		} else {
+			switch (c) {
+			case '|':
+				// user may want to insert '|' instead of caret
+				if (i < (expbuflen - 1) && expbuf[i + 1] == '|') {
+					// put '|' into the line
+					abbrevText += c;
+					i++;
+				} else if (i != lastPipe) {
+					doublePipe = true;
+				} else {
+					// indent on multiple lines
+					SA::Line j = currentLineNumber + 1; // first line indented as others
+					currentLineNumber = wEditor.LineFromPosition(caretPos + selLength);
+					for (; j <= currentLineNumber; j++) {
+						SetLineIndentation(j, GetLineIndentation(j) + indentSize * indentExtra);
+						caretPos += indentExtra * indentSize / indentChars;
+					}
+
+					atStart = false;
+					caretPos += selLength;
+				}
+				break;
+			case '\r':
+				// backward compatibility
+				break;
+			case '\n':
+				if (eolMode == SA::EndOfLine::CrLf || eolMode == SA::EndOfLine::Cr) {
+					abbrevText += '\r';
+				}
+				if (eolMode == SA::EndOfLine::CrLf || eolMode == SA::EndOfLine::Lf) {
+					abbrevText += '\n';
+				}
+				break;
+			default:
+				abbrevText += c;
+				break;
+			}
+			if (caretPos > wEditor.Length()) {
+				caretPos = wEditor.Length();
+			}
+			wEditor.InsertText(caretPos, abbrevText.c_str());
+			if (!doublePipe && atStart) {
+				selStart += abbrevText.length();
+			}
+			caretPos += abbrevText.length();
+			if (c == '\n') {
+				isIndent = true;
+				indentExtra = 0;
+				currentLineNumber++;
+				SetLineIndentation(currentLineNumber, indent);
+				caretPos += indent / indentChars;
+				if (!doublePipe && atStart) {
+					selStart += indent / indentChars;
+				}
+			} else {
+				isIndent = false;
+			}
+		}
+	}
+
+	// set the caret to the desired position
+	if (doublePipe) {
+		selLength = 0;
+	}
+	wEditor.SetSel(selStart, selStart + selLength);
+
+	wEditor.EndUndoAction();
+	return true;
+}
+
+bool SciTEBase::StartInsertAbbreviation() {
+	if (!AbbrevDialog()) {
+		return true;
+	}
+
+	return PerformInsertAbbreviation();
+}
+
+bool SciTEBase::StartExpandAbbreviation() {
+	const SA::Position currentPos = GetCaretInLine();
+	const SA::Position position = wEditor.CurrentPos(); // from the beginning
+	const std::string linebuf(GetCurrentLine(), 0, currentPos);	// Just get text to the left of the caret
+	const SA::Position abbrevPos = (currentPos > 32 ? currentPos - 32 : 0);
+	const char *abbrev = linebuf.c_str() + abbrevPos;
+	std::string data;
+	SA::Position abbrevLength = currentPos - abbrevPos;
+	// Try each potential abbreviation from the first letter on a line
+	// and expanding to the right.
+	// We arbitrarily limit the length of an abbreviation (seems a reasonable value..),
+	// and of course stop on the caret.
+	while (abbrevLength > 0) {
+		data = propsAbbrev.GetString(abbrev);
+		if (!data.empty()) {
+			break;	/* Found */
+		}
+		abbrev++;	// One more letter to the right
+		abbrevLength--;
+	}
+
+	if (data.empty()) {
+		WarnUser(warnNotFound);	// No need for a special warning
+		return true; // returning if expanded abbreviation is empty
+	}
+
+	const std::string expbuf = UnSlashString(data.c_str());
+	const size_t expbuflen = expbuf.length();
+
+	SA::Position caretPos = -1; // caret position
+	SA::Line currentLineNumber = GetCurrentLineNumber();
+	int indent = 0;
+	const int indentSize = wEditor.Indent();
+	int indentExtra = 0;
+	bool isIndent = true;
+	const SA::EndOfLine eolMode = wEditor.EOLMode();
+	if (props.GetInt("indent.automatic")) {
+		indent = GetLineIndentation(currentLineNumber);
+	}
+
+	wEditor.BeginUndoAction();
+	wEditor.SetSel(position - abbrevLength, position);
+
+	// add the abbreviation one character at a time
+	for (size_t i = 0; i < expbuflen; i++) {
+		const char c = expbuf[i];
+		std::string abbrevText;
+		if (isIndent && c == '\t') {
+			indentExtra++;
+			SetLineIndentation(currentLineNumber, indent + indentSize * indentExtra);
+		} else {
+			switch (c) {
+			case '|':
+				// user may want to insert '|' instead of caret
+				if (i < (expbuflen - 1) && expbuf[i + 1] == '|') {
+					// put '|' into the line
+					abbrevText += c;
+					i++;
+				} else if (caretPos == -1) {
+					if (i == 0) {
+						// when caret is set at the first place in abbreviation
+						caretPos = wEditor.CurrentPos() - abbrevLength;
+					} else {
+						caretPos = wEditor.CurrentPos();
+					}
+				}
+				break;
+			case '\n':
+				if (eolMode == SA::EndOfLine::CrLf || eolMode == SA::EndOfLine::Cr) {
+					abbrevText += '\r';
+				}
+				if (eolMode == SA::EndOfLine::CrLf || eolMode == SA::EndOfLine::Lf) {
+					abbrevText += '\n';
+				}
+				break;
+			default:
+				abbrevText += c;
+				break;
+			}
+			wEditor.ReplaceSel(abbrevText.c_str());
+			if (c == '\n') {
+				isIndent = true;
+				indentExtra = 0;
+				currentLineNumber++;
+				SetLineIndentation(currentLineNumber, indent);
+			} else {
+				isIndent = false;
+			}
+		}
+	}
+
+	// set the caret to the desired position
+	if (caretPos != -1) {
+		wEditor.GotoPos(caretPos);
+	}
+
+	wEditor.EndUndoAction();
+	return true;
+}
+
+bool SciTEBase::StartBlockComment() {
+	std::string fileNameForExtension = ExtensionFileName();
+	std::string lexerName = props.GetNewExpandString("lexer.", fileNameForExtension.c_str());
+	std::string base("comment.block.");
+	std::string commentAtLineStart("comment.block.at.line.start.");
+	base += lexerName;
+	commentAtLineStart += lexerName;
+	const bool placeCommentsAtLineStart = props.GetInt(commentAtLineStart.c_str()) != 0;
+
+	std::string comment = props.GetString(base.c_str());
+	if (comment == "") { // user friendly error message box
+		GUI::gui_string sBase = GUI::StringFromUTF8(base);
+		GUI::gui_string error = LocaliseMessage(
+						"Block comment variable '^0' is not defined in SciTE *.properties!", sBase.c_str());
+		WindowMessageBox(wSciTE, error);
+		return true;
+	}
+	const std::string longComment = comment + " ";
+	const SA::Position longCommentLength = longComment.length();
+	SA::Position selectionStart = wEditor.SelectionStart();
+	SA::Position selectionEnd = wEditor.SelectionEnd();
+	const SA::Position caretPosition = wEditor.CurrentPos();
+	// checking if caret is located in _beginning_ of selected block
+	const bool moveCaret = caretPosition < selectionEnd;
+	const SA::Line selStartLine = wEditor.LineFromPosition(selectionStart);
+	SA::Line selEndLine = wEditor.LineFromPosition(selectionEnd);
+	const SA::Line lines = selEndLine - selStartLine;
+	const SA::Position firstSelLineStart = wEditor.LineStart(selStartLine);
+	// "caret return" is part of the last selected line
+	if ((lines > 0) &&
+			(selectionEnd == wEditor.LineStart(selEndLine)))
+		selEndLine--;
+	wEditor.BeginUndoAction();
+	for (SA::Line i = selStartLine; i <= selEndLine; i++) {
+		const SA::Position lineStart = wEditor.LineStart(i);
+		SA::Position lineIndent = lineStart;
+		const SA::Position lineEnd = wEditor.LineEnd(i);
+		if (!placeCommentsAtLineStart) {
+			lineIndent = GetLineIndentPosition(i);
+		}
+		std::string linebuf = wEditor.StringOfSpan(SA::Span(lineIndent, lineEnd));
+		// empty lines are not commented
+		if (linebuf.length() < 1)
+			continue;
+		if (StartsWith(linebuf, comment.c_str())) {
+			SA::Position commentLength = comment.length();
+			if (StartsWith(linebuf, longComment.c_str())) {
+				// Removing comment with space after it.
+				commentLength = longCommentLength;
+			}
+			wEditor.SetSel(lineIndent, lineIndent + commentLength);
+			wEditor.ReplaceSel("");
+			if (i == selStartLine) // is this the first selected line?
+				selectionStart -= commentLength;
+			selectionEnd -= commentLength; // every iteration
+			continue;
+		}
+		if (i == selStartLine) // is this the first selected line?
+			selectionStart += longCommentLength;
+		selectionEnd += longCommentLength; // every iteration
+		wEditor.InsertText(lineIndent, longComment.c_str());
+	}
+	// after uncommenting selection may promote itself to the lines
+	// before the first initially selected line;
+	// another problem - if only comment symbol was selected;
+	if (selectionStart < firstSelLineStart) {
+		if (selectionStart >= selectionEnd - (longCommentLength - 1))
+			selectionEnd = firstSelLineStart;
+		selectionStart = firstSelLineStart;
+	}
+	if (moveCaret) {
+		// moving caret to the beginning of selected block
+		wEditor.GotoPos(selectionEnd);
+		wEditor.SetCurrentPos(selectionStart);
+	} else {
+		wEditor.SetSel(selectionStart, selectionEnd);
+	}
+	wEditor.EndUndoAction();
+	return true;
+}
+
+static const char *LineEndString(SA::EndOfLine eolMode) noexcept {
+	switch (eolMode) {
+	case SA::EndOfLine::CrLf:
+		return "\r\n";
+	case SA::EndOfLine::Cr:
+		return "\r";
+	case SA::EndOfLine::Lf:
+	default:
+		return "\n";
+	}
+}
+
+bool SciTEBase::StartBoxComment() {
+	// Get start/middle/end comment strings from options file(s)
+	std::string fileNameForExtension = ExtensionFileName();
+	std::string lexerName = props.GetNewExpandString("lexer.", fileNameForExtension.c_str());
+	std::string startBase("comment.box.start.");
+	std::string middleBase("comment.box.middle.");
+	std::string endBase("comment.box.end.");
+	const std::string whiteSpace(" ");
+	const std::string eol(LineEndString(wEditor.EOLMode()));
+	startBase += lexerName;
+	middleBase += lexerName;
+	endBase += lexerName;
+	std::string startComment = props.GetString(startBase.c_str());
+	std::string middleComment = props.GetString(middleBase.c_str());
+	std::string endComment = props.GetString(endBase.c_str());
+	if (startComment == "" || middleComment == "" || endComment == "") {
+		GUI::gui_string sStart = GUI::StringFromUTF8(startBase);
+		GUI::gui_string sMiddle = GUI::StringFromUTF8(middleBase);
+		GUI::gui_string sEnd = GUI::StringFromUTF8(endBase);
+		GUI::gui_string error = LocaliseMessage(
+						"Box comment variables '^0', '^1' and '^2' are not defined in SciTE *.properties!",
+						sStart.c_str(), sMiddle.c_str(), sEnd.c_str());
+		WindowMessageBox(wSciTE, error);
+		return true;
+	}
+
+	// Note selection and cursor location so that we can reselect text and reposition cursor after we insert comment strings
+	SA::Position selectionStart = wEditor.SelectionStart();
+	SA::Position selectionEnd = wEditor.SelectionEnd();
+	const SA::Position caretPosition = wEditor.CurrentPos();
+	const bool moveCaret = caretPosition < selectionEnd;
+	const SA::Line selStartLine = wEditor.LineFromPosition(selectionStart);
+	SA::Line selEndLine = wEditor.LineFromPosition(selectionEnd);
+	SA::Line lines = selEndLine - selStartLine + 1;
+
+	// If selection ends at start of last selected line, fake it so that selection goes to end of second-last selected line
+	if (lines > 1 && selectionEnd == wEditor.LineStart(selEndLine)) {
+		selEndLine--;
+		lines--;
+		selectionEnd = wEditor.LineEnd(selEndLine);
+	}
+
+	// Pad comment strings with appropriate whitespace, then figure out their lengths (endComment is a bit special-- see below)
+	startComment += whiteSpace;
+	middleComment += whiteSpace;
+	const SA::Position startCommentLength = startComment.length();
+	const SA::Position middleCommentLength = middleComment.length();
+	const SA::Position endCommentLength = endComment.length();
+
+	wEditor.BeginUndoAction();
+
+	// Insert startComment if needed
+	SA::Position lineStart = wEditor.LineStart(selStartLine);
+	std::string tempString = wEditor.StringOfSpan(SA::Span(lineStart, lineStart + startCommentLength));
+	if (startComment != tempString) {
+		wEditor.InsertText(lineStart, startComment.c_str());
+		selectionStart += startCommentLength;
+		selectionEnd += startCommentLength;
+	}
+
+	if (lines <= 1) {
+		// Only a single line was selected, so just append whitespace + end-comment at end of line if needed
+		const SA::Position lineEnd = wEditor.LineEnd(selEndLine);
+		tempString = wEditor.StringOfSpan(SA::Span(lineEnd - endCommentLength, lineEnd));
+		if (endComment != tempString) {
+			endComment.insert(0, whiteSpace);
+			wEditor.InsertText(lineEnd, endComment.c_str());
+		}
+	} else {
+		// More than one line selected, so insert middleComments where needed
+		for (SA::Line i = selStartLine + 1; i < selEndLine; i++) {
+			lineStart = wEditor.LineStart(i);
+			tempString = wEditor.StringOfSpan(SA::Span(lineStart, lineStart + middleCommentLength));
+			if (middleComment != tempString) {
+				wEditor.InsertText(lineStart, middleComment.c_str());
+				selectionEnd += middleCommentLength;
+			}
+		}
+
+		// If last selected line is not middle-comment or end-comment, we need to insert
+		// a middle-comment at the start of last selected line and possibly still insert
+		// and end-comment tag after the last line (extra logic is necessary to
+		// deal with the case that user selected the end-comment tag)
+		lineStart = wEditor.LineStart(selEndLine);
+		tempString = wEditor.StringOfSpan(SA::Span(lineStart, lineStart + endCommentLength));
+		if (endComment != tempString) {
+			tempString = wEditor.StringOfSpan(SA::Span(lineStart, lineStart + middleCommentLength));
+			if (middleComment != tempString) {
+				wEditor.InsertText(lineStart, middleComment.c_str());
+				selectionEnd += middleCommentLength;
+			}
+
+			// And since we didn't find the end-comment string yet, we need to check the *next* line
+			//  to see if it's necessary to insert an end-comment string and a linefeed there....
+			lineStart = wEditor.LineStart(selEndLine + 1);
+			tempString = wEditor.StringOfSpan(SA::Span(lineStart, lineStart + endCommentLength));
+			if (endComment != tempString) {
+				endComment += eol;
+				wEditor.InsertText(lineStart, endComment.c_str());
+			}
+		}
+	}
+
+	if (moveCaret) {
+		// moving caret to the beginning of selected block
+		wEditor.GotoPos(selectionEnd);
+		wEditor.SetCurrentPos(selectionStart);
+	} else {
+		wEditor.SetSel(selectionStart, selectionEnd);
+	}
+
+	wEditor.EndUndoAction();
+
+	return true;
+}
+
+bool SciTEBase::StartStreamComment() {
+	std::string fileNameForExtension = ExtensionFileName();
+	const std::string lexerName = props.GetNewExpandString("lexer.", fileNameForExtension.c_str());
+	std::string startBase("comment.stream.start.");
+	std::string endBase("comment.stream.end.");
+	std::string whiteSpace(" ");
+	startBase += lexerName;
+	endBase += lexerName;
+	std::string startComment = props.GetString(startBase.c_str());
+	std::string endComment = props.GetString(endBase.c_str());
+	if (startComment == "" || endComment == "") {
+		GUI::gui_string sStart = GUI::StringFromUTF8(startBase);
+		GUI::gui_string sEnd = GUI::StringFromUTF8(endBase);
+		GUI::gui_string error = LocaliseMessage(
+						"Stream comment variables '^0' and '^1' are not defined in SciTE *.properties!",
+						sStart.c_str(), sEnd.c_str());
+		WindowMessageBox(wSciTE, error);
+		return true;
+	}
+	startComment += whiteSpace;
+	whiteSpace += endComment;
+	endComment = whiteSpace;
+	const SA::Position startCommentLength = startComment.length();
+	SA::Span selection = wEditor.SelectionSpan();
+	const SA::Position caretPosition = wEditor.CurrentPos();
+	// checking if caret is located in _beginning_ of selected block
+	const bool moveCaret = caretPosition < selection.end;
+	// if there is no selection?
+	if (selection.start == selection.end) {
+		RangeExtend(wEditor, selection,
+			    &SciTEBase::islexerwordcharforsel);
+		if (selection.start == selection.end)
+			return true; // caret is located _between_ words
+	}
+	wEditor.BeginUndoAction();
+	wEditor.InsertText(selection.start, startComment.c_str());
+	selection.end += startCommentLength;
+	selection.start += startCommentLength;
+	wEditor.InsertText(selection.end, endComment.c_str());
+	if (moveCaret) {
+		// moving caret to the beginning of selected block
+		wEditor.GotoPos(selection.end);
+		wEditor.SetCurrentPos(selection.start);
+	} else {
+		wEditor.SetSel(selection.start, selection.end);
+	}
+	wEditor.EndUndoAction();
+	return true;
+}
+
+/**
+ * Return the length of the given line, not counting the EOL.
+ */
+SA::Position SciTEBase::GetLineLength(SA::Line line) {
+	return wEditor.LineEnd(line) - wEditor.LineStart(line);
+}
+
+SA::Line SciTEBase::GetCurrentLineNumber() {
+	return wEditor.LineFromPosition(
+		       wEditor.CurrentPos());
+}
+
+SA::Position SciTEBase::GetCurrentColumnNumber() {
+	const int mainSel = wEditor.MainSelection();
+	return wEditor.Column(wEditor.SelectionNCaret(mainSel)) +
+	       wEditor.SelectionNCaretVirtualSpace(mainSel);
+}
+
+SA::Line SciTEBase::GetCurrentScrollPosition() {
+	const SA::Line lineDisplayTop = wEditor.FirstVisibleLine();
+	return wEditor.DocLineFromVisible(lineDisplayTop);
+}
+
+/**
+ * Set up properties for ReadOnly, EOLMode, BufferLength, NbOfLines, SelLength, SelHeight.
+ */
+void SciTEBase::SetTextProperties(
+	PropSetFile &ps) {			///< Property set to update.
+
+	std::string ro = GUI::UTF8FromString(localiser.Text("READ"));
+	ps.Set("ReadOnly", CurrentBuffer()->isReadOnly ? ro.c_str() : "");
+
+	const SA::EndOfLine eolMode = wEditor.EOLMode();
+	ps.Set("EOLMode", eolMode == SA::EndOfLine::CrLf ? "CR+LF" : (eolMode == SA::EndOfLine::Lf ? "LF" : "CR"));
+
+	ps.Set("BufferLength", std::to_string(LengthDocument()));
+
+	ps.Set("NbOfLines", std::to_string(wEditor.LineCount()));
+
+	const SA::Span range = wEditor.SelectionSpan();
+	const SA::Line selFirstLine = wEditor.LineFromPosition(range.start);
+	const SA::Line selLastLine = wEditor.LineFromPosition(range.end);
+	SA::Position charCount = 0;
+	if (wEditor.SelectionMode() == SA::SelectionMode::Rectangle) {
+		for (SA::Line line = selFirstLine; line <= selLastLine; line++) {
+			const SA::Position startPos = wEditor.GetLineSelStartPosition(line);
+			const SA::Position endPos = wEditor.GetLineSelEndPosition(line);
+			charCount += wEditor.CountCharacters(startPos, endPos);
+		}
+	} else {
+		charCount = wEditor.CountCharacters(range.start, range.end);
+	}
+	ps.Set("SelLength", std::to_string(charCount));
+	const SA::Position caretPos = wEditor.CurrentPos();
+	const SA::Position selAnchor = wEditor.Anchor();
+	SA::Line selHeight = selLastLine - selFirstLine + 1;
+	if (0 == range.Length()) {
+		selHeight = 0;
+	} else if (selLastLine == selFirstLine) {
+		selHeight = 1;
+	} else if ((wEditor.Column(caretPos) == 0 && (selAnchor <= caretPos)) ||
+			((wEditor.Column(selAnchor) == 0) && (selAnchor > caretPos))) {
+		selHeight = selLastLine - selFirstLine;
+	}
+	ps.Set("SelHeight", std::to_string(selHeight));
+}
+
+void SciTEBase::UpdateStatusBar(bool bUpdateSlowData) {
+	if (sbVisible) {
+		if (bUpdateSlowData) {
+			SetFileProperties(propsStatus);
+		}
+		SetTextProperties(propsStatus);
+		propsStatus.Set("LineNumber", std::to_string(GetCurrentLineNumber() + 1));
+		propsStatus.Set("ColumnNumber", std::to_string(GetCurrentColumnNumber() + 1));
+		propsStatus.Set("OverType", wEditor.Overtype() ? "OVR" : "INS");
+
+		char sbKey[32];
+		sprintf(sbKey, "statusbar.text.%d", sbNum);
+		std::string msg = propsStatus.GetExpandedString(sbKey);
+		if (msg.size() && sbValue != msg) {	// To avoid flickering, update only if needed
+			SetStatusBarText(msg.c_str());
+			sbValue = msg;
+		}
+	} else {
+		sbValue = "";
+	}
+}
+
+void SciTEBase::SetLineIndentation(SA::Line line, int indent) {
+	if (indent < 0)
+		return;
+	const SA::Span rangeStart = GetSelection();
+	SA::Span range = rangeStart;
+	const SA::Position posBefore = GetLineIndentPosition(line);
+	wEditor.SetLineIndentation(line, indent);
+	const SA::Position posAfter = GetLineIndentPosition(line);
+	const SA::Position posDifference = posAfter - posBefore;
+	if (posAfter > posBefore) {
+		// Move selection on
+		if (range.start >= posBefore) {
+			range.start += posDifference;
+		}
+		if (range.end >= posBefore) {
+			range.end += posDifference;
+		}
+	} else if (posAfter < posBefore) {
+		// Move selection back
+		if (range.start >= posAfter) {
+			if (range.start >= posBefore)
+				range.start += posDifference;
+			else
+				range.start = posAfter;
+		}
+		if (range.end >= posAfter) {
+			if (range.end >= posBefore)
+				range.end += posDifference;
+			else
+				range.end = posAfter;
+		}
+	}
+	if (!(rangeStart == range)) {
+		SetSelection(range.start, range.end);
+	}
+}
+
+int SciTEBase::GetLineIndentation(SA::Line line) {
+	return wEditor.LineIndentation(line);
+}
+
+SA::Position SciTEBase::GetLineIndentPosition(SA::Line line) {
+	return wEditor.LineIndentPosition(line);
+}
+
+static std::string CreateIndentation(int indent, int tabSize, bool insertSpaces) {
+	std::string indentation;
+	if (!insertSpaces) {
+		while (indent >= tabSize) {
+			indentation.append("\t", 1);
+			indent -= tabSize;
+		}
+	}
+	while (indent > 0) {
+		indentation.append(" ", 1);
+		indent--;
+	}
+	return indentation;
+}
+
+void SciTEBase::ConvertIndentation(int tabSize, int useTabs) {
+	wEditor.BeginUndoAction();
+	const SA::Line maxLine = wEditor.LineCount();
+	for (SA::Line line = 0; line < maxLine; line++) {
+		const SA::Position lineStart = wEditor.LineStart(line);
+		const int indent = GetLineIndentation(line);
+		const SA::Position indentPos = GetLineIndentPosition(line);
+		constexpr int maxIndentation = 1000;
+		if (indent < maxIndentation) {
+			std::string indentationNow = wEditor.StringOfSpan(SA::Span(lineStart, indentPos));
+			std::string indentationWanted = CreateIndentation(indent, tabSize, !useTabs);
+			if (indentationNow != indentationWanted) {
+				wEditor.SetTarget(SA::Span(lineStart, indentPos));
+				wEditor.ReplaceTarget(indentationWanted);
+			}
+		}
+	}
+	wEditor.EndUndoAction();
+}
+
+bool SciTEBase::RangeIsAllWhitespace(SA::Position start, SA::Position end) {
+	TextReader acc(wEditor);
+	for (SA::Position i = start; i < end; i++) {
+		if ((acc[i] != ' ') && (acc[i] != '\t'))
+			return false;
+	}
+	return true;
+}
+
+std::vector<std::string> SciTEBase::GetLinePartsInStyle(SA::Line line, const StyleAndWords &saw) {
+	std::vector<std::string> sv;
+	TextReader acc(wEditor);
+	std::string s;
+	const bool separateCharacters = saw.IsSingleChar();
+	const SA::Position thisLineStart = wEditor.LineStart(line);
+	const SA::Position nextLineStart = wEditor.LineStart(line + 1);
+	for (SA::Position pos = thisLineStart; pos < nextLineStart; pos++) {
+		if (acc.StyleAt(pos) == saw.styleNumber) {
+			if (separateCharacters) {
+				// Add one character at a time, even if there is an adjacent character in the same style
+				if (s.length() > 0) {
+					sv.push_back(s);
+				}
+				s = "";
+			}
+			s += acc[pos];
+		} else if (s.length() > 0) {
+			sv.push_back(s);
+			s = "";
+		}
+	}
+	if (s.length() > 0) {
+		sv.push_back(s);
+	}
+	return sv;
+}
+
+static bool includes(const StyleAndWords &symbols, const std::string &value) {
+	if (symbols.words.length() == 0) {
+		return false;
+	} else if (IsAlphabetic(symbols.words[0])) {
+		// Set of symbols separated by spaces
+		const size_t lenVal = value.length();
+		const char *symbol = symbols.words.c_str();
+		while (symbol) {
+			const char *symbolEnd = strchr(symbol, ' ');
+			size_t lenSymbol = strlen(symbol);
+			if (symbolEnd)
+				lenSymbol = symbolEnd - symbol;
+			if (lenSymbol == lenVal) {
+				if (strncmp(symbol, value.c_str(), lenSymbol) == 0) {
+					return true;
+				}
+			}
+			symbol = symbolEnd;
+			if (symbol)
+				symbol++;
+		}
+	} else {
+		// Set of individual characters. Only one character allowed for now
+		const char ch = symbols.words[0];
+		return strchr(value.c_str(), ch) != nullptr;
+	}
+	return false;
+}
+
+IndentationStatus SciTEBase::GetIndentState(SA::Line line) {
+	// C like language indentation defined by braces and keywords
+	IndentationStatus indentState = isNone;
+	const std::vector<std::string> controlIndents = GetLinePartsInStyle(line, statementIndent);
+	for (const std::string &sIndent : controlIndents) {
+		if (includes(statementIndent, sIndent))
+			indentState = isKeyWordStart;
+	}
+	const std::vector<std::string> controlEnds = GetLinePartsInStyle(line, statementEnd);
+	for (const std::string &sEnd : controlEnds) {
+		if (includes(statementEnd, sEnd))
+			indentState = isNone;
+	}
+	// Braces override keywords
+	const std::vector<std::string> controlBlocks = GetLinePartsInStyle(line, blockEnd);
+	for (const std::string &sBlock : controlBlocks) {
+		if (includes(blockEnd, sBlock))
+			indentState = isBlockEnd;
+		if (includes(blockStart, sBlock))
+			indentState = isBlockStart;
+	}
+	return indentState;
+}
+
+int SciTEBase::IndentOfBlock(SA::Line line) {
+	if (line < 0)
+		return 0;
+	const int indentSize = wEditor.Indent();
+	int indentBlock = GetLineIndentation(line);
+	SA::Line backLine = line;
+	IndentationStatus indentState = isNone;
+	if (statementIndent.IsEmpty() && blockStart.IsEmpty() && blockEnd.IsEmpty())
+		indentState = isBlockStart;	// Don't bother searching backwards
+
+	SA::Line lineLimit = line - statementLookback;
+	if (lineLimit < 0)
+		lineLimit = 0;
+	while ((backLine >= lineLimit) && (indentState == 0)) {
+		indentState = GetIndentState(backLine);
+		if (indentState != 0) {
+			indentBlock = GetLineIndentation(backLine);
+			if (indentState == isBlockStart) {
+				if (!indentOpening)
+					indentBlock += indentSize;
+			}
+			if (indentState == isBlockEnd) {
+				if (indentClosing)
+					indentBlock -= indentSize;
+				if (indentBlock < 0)
+					indentBlock = 0;
+			}
+			if ((indentState == isKeyWordStart) && (backLine == line))
+				indentBlock += indentSize;
+		}
+		backLine--;
+	}
+	return indentBlock;
+}
+
+void SciTEBase::MaintainIndentation(char ch) {
+	const SA::EndOfLine eolMode = wEditor.EOLMode();
+	const SA::Line curLine = GetCurrentLineNumber();
+	SA::Line lastLine = curLine - 1;
+
+	if (((eolMode == SA::EndOfLine::CrLf || eolMode == SA::EndOfLine::Lf) && ch == '\n') ||
+			(eolMode == SA::EndOfLine::Cr && ch == '\r')) {
+		if (props.GetInt("indent.automatic")) {
+			while (lastLine >= 0 && GetLineLength(lastLine) == 0)
+				lastLine--;
+		}
+		int indentAmount = 0;
+		if (lastLine >= 0) {
+			indentAmount = GetLineIndentation(lastLine);
+		}
+		if (indentAmount > 0) {
+			SetLineIndentation(curLine, indentAmount);
+		}
+	}
+}
+
+void SciTEBase::AutomaticIndentation(char ch) {
+	const SA::Span range = wEditor.SelectionSpan();
+	const SA::Position selStart = range.start;
+	const SA::Line curLine = GetCurrentLineNumber();
+	const SA::Position thisLineStart = wEditor.LineStart(curLine);
+	const int indentSize = wEditor.Indent();
+	int indentBlock = IndentOfBlock(curLine - 1);
+
+	if ((wEditor.Lexer() == SCLEX_PYTHON) &&
+			(props.GetInt("indent.python.colon") == 1)) {
+		const SA::EndOfLine eolMode = wEditor.EOLMode();
+		const int eolChar = (eolMode == SA::EndOfLine::Cr ? '\r' : '\n');
+		const int eolChars = (eolMode == SA::EndOfLine::CrLf ? 2 : 1);
+		const SA::Position prevLineStart = wEditor.LineStart(curLine - 1);
+		const SA::Position prevIndentPos = GetLineIndentPosition(curLine - 1);
+		const int indentExisting = GetLineIndentation(curLine);
+
+		if (ch == eolChar) {
+			// Find last noncomment, nonwhitespace character on previous line
+			char character = '\0';
+			int style = 0;
+			for (SA::Position p = selStart - eolChars - 1; p > prevLineStart; p--) {
+				style = wEditor.UnsignedStyleAt(p);
+				if (style != SCE_P_DEFAULT && style != SCE_P_COMMENTLINE &&
+						style != SCE_P_COMMENTBLOCK) {
+					character = wEditor.CharacterAt(p);
+					break;
+				}
+			}
+			indentBlock = GetLineIndentation(curLine - 1);
+			if (style == SCE_P_OPERATOR && character == ':') {
+				SetLineIndentation(curLine, indentBlock + indentSize);
+			} else if (selStart == prevIndentPos + eolChars) {
+				// Preserve the indentation of preexisting text beyond the caret
+				SetLineIndentation(curLine, indentBlock + indentExisting);
+			} else {
+				SetLineIndentation(curLine, indentBlock);
+			}
+		}
+		return;
+	}
+
+	if (blockEnd.IsSingleChar() && ch == blockEnd.words[0]) {	// Dedent maybe
+		if (!indentClosing) {
+			if (RangeIsAllWhitespace(thisLineStart, selStart - 1)) {
+				SetLineIndentation(curLine, indentBlock - indentSize);
+			}
+		}
+	} else if (!blockEnd.IsSingleChar() && (ch == ' ')) {	// Dedent maybe
+		if (!indentClosing && (GetIndentState(curLine) == isBlockEnd)) {}
+	} else if (blockStart.IsSingleChar() && (ch == blockStart.words[0])) {
+		// Dedent maybe if first on line and previous line was starting keyword
+		if (!indentOpening && (GetIndentState(curLine - 1) == isKeyWordStart)) {
+			if (RangeIsAllWhitespace(thisLineStart, selStart - 1)) {
+				SetLineIndentation(curLine, indentBlock - indentSize);
+			}
+		}
+	} else if ((ch == '\r' || ch == '\n') && (selStart == thisLineStart)) {
+		if (!indentClosing && !blockEnd.IsSingleChar()) {	// Dedent previous line maybe
+			const std::vector<std::string> controlWords = GetLinePartsInStyle(curLine - 1, blockEnd);
+			if (!controlWords.empty()) {
+				if (includes(blockEnd, controlWords[0])) {
+					// Check if first keyword on line is an ender
+					SetLineIndentation(curLine - 1, IndentOfBlock(curLine - 2) - indentSize);
+					// Recalculate as may have changed previous line
+					indentBlock = IndentOfBlock(curLine - 1);
+				}
+			}
+		}
+		SetLineIndentation(curLine, indentBlock);
+	}
+}
+
+/**
+ * Upon a character being added, SciTE may decide to perform some action
+ * such as displaying a completion list or auto-indentation.
+ */
+void SciTEBase::CharAdded(int utf32) {
+	if (recording)
+		return;
+	const SA::Span rangeSelection = GetSelection();
+	const SA::Position selStart = rangeSelection.start;
+	const SA::Position selEnd = rangeSelection.end;
+
+	if (utf32 > 0XFF) { // MBCS, never let it go.
+		if (imeAutoComplete) {
+			if ((selEnd == selStart) && (selStart > 0)) {
+				if (wEditor.CallTipActive()) {
+					ContinueCallTip();
+				} else if (wEditor.AutoCActive()) {
+					wEditor.AutoCCancel();
+					StartAutoComplete();
+				} else {
+					StartAutoComplete();
+				}
+			}
+		}
+		return;
+	}
+
+	// SBCS
+	const char ch = static_cast<char>(utf32);
+	if ((selEnd == selStart) && (selStart > 0)) {
+		if (wEditor.CallTipActive()) {
+			if (Contains(calltipParametersEnd, ch)) {
+				braceCount--;
+				if (braceCount < 1)
+					wEditor.CallTipCancel();
+				else
+					StartCallTip();
+			} else if (Contains(calltipParametersStart, ch)) {
+				braceCount++;
+				StartCallTip();
+			} else {
+				ContinueCallTip();
+			}
+		} else if (wEditor.AutoCActive()) {
+			if (Contains(calltipParametersStart, ch)) {
+				braceCount++;
+				StartCallTip();
+			} else if (Contains(calltipParametersEnd, ch)) {
+				braceCount--;
+			} else if (!Contains(wordCharacters, ch)) {
+				wEditor.AutoCCancel();
+				if (Contains(autoCompleteStartCharacters, ch)) {
+					StartAutoComplete();
+				}
+			} else if (autoCCausedByOnlyOne) {
+				StartAutoCompleteWord(true);
+			}
+		} else if (HandleXml(ch)) {
+			// Handled in the routine
+		} else {
+			if (Contains(calltipParametersStart, ch)) {
+				braceCount = 1;
+				StartCallTip();
+			} else {
+				autoCCausedByOnlyOne = false;
+				if (indentMaintain)
+					MaintainIndentation(ch);
+				else if (props.GetInt("indent.automatic"))
+					AutomaticIndentation(ch);
+				if (Contains(autoCompleteStartCharacters, ch)) {
+					StartAutoComplete();
+				} else if (props.GetInt("autocompleteword.automatic") && Contains(wordCharacters, ch)) {
+					StartAutoCompleteWord(true);
+					autoCCausedByOnlyOne = wEditor.AutoCActive();
+				}
+			}
+		}
+	}
+}
+
+/**
+ * Upon a character being added to the output, SciTE may decide to perform some action
+ * such as displaying a completion list or running a shell command.
+ */
+void SciTEBase::CharAddedOutput(int ch) {
+	if (ch == '\n') {
+		NewLineInOutput();
+	} else if (ch == '(') {
+		// Potential autocompletion of symbols when $( typed
+		const SA::Position selStart = wOutput.SelectionStart();
+		if ((selStart > 1) && (wOutput.CharacterAt(selStart - 2) == '$')) {
+			std::string symbols;
+			const char *key = nullptr;
+			const char *val = nullptr;
+			bool b = props.GetFirst(key, val);
+			while (b) {
+				symbols.append(key);
+				symbols.append(") ");
+				b = props.GetNext(key, val);
+			}
+			StringList symList;
+			symList.Set(symbols.c_str());
+			std::string words = symList.GetNearestWords("", 0, true);
+			if (words.length()) {
+				wOutput.AutoCSetSeparator(' ');
+				wOutput.AutoCSetMaxHeight(autoCompleteVisibleItemCount);
+				wOutput.AutoCShow(0, words.c_str());
+			}
+		}
+	}
+}
+
+/**
+ * This routine will auto complete XML or HTML tags that are still open by closing them
+ * @param ch The character we are dealing with, currently only works with the '>' character
+ * @return True if handled, false otherwise
+ */
+bool SciTEBase::HandleXml(char ch) {
+	// We're looking for this char
+	// Quit quickly if not found
+	if (ch != '>') {
+		return false;
+	}
+
+	// This may make sense only in certain languages
+	if (lexLanguage != SCLEX_HTML && lexLanguage != SCLEX_XML) {
+		return false;
+	}
+
+	// If the user has turned us off, quit now.
+	// Default is off
+	const std::string value = props.GetExpandedString("xml.auto.close.tags");
+	if ((value.length() == 0) || (value == "0")) {
+		return false;
+	}
+
+	// Grab the last 512 characters or so
+	const SA::Position nCaret = wEditor.CurrentPos();
+	SA::Position nMin = nCaret - 512;
+	if (nMin < 0) {
+		nMin = 0;
+	}
+
+	if (nCaret - nMin < 3) {
+		return false; // Smallest tag is 3 characters ex. <p>
+	}
+	std::string sel = wEditor.StringOfSpan(SA::Span(nMin, nCaret));
+
+	if (sel[nCaret - nMin - 2] == '/') {
+		// User typed something like "<br/>"
+		return false;
+	}
+
+	if (sel[nCaret - nMin - 2] == '-') {
+		// User typed something like "<a $this->"
+		return false;
+	}
+
+	std::string strFound = FindOpenXmlTag(sel.c_str(), nCaret - nMin);
+
+	if (strFound.length() > 0) {
+		wEditor.BeginUndoAction();
+		std::string toInsert = "</";
+		toInsert += strFound;
+		toInsert += ">";
+		wEditor.ReplaceSel(toInsert.c_str());
+		SetSelection(nCaret, nCaret);
+		wEditor.EndUndoAction();
+		return true;
+	}
+
+	return false;
+}
+
+/** Search backward through nSize bytes looking for a '<', then return the tag if any
+ * @return The tag name
+ */
+std::string SciTEBase::FindOpenXmlTag(const char sel[], SA::Position nSize) {
+	std::string strRet;
+
+	if (nSize < 3) {
+		// Smallest tag is "<p>" which is 3 characters
+		return strRet;
+	}
+	const char *pBegin = &sel[0];
+	const char *pCur = &sel[nSize - 1];
+
+	pCur--; // Skip past the >
+	while (pCur > pBegin) {
+		if (*pCur == '<') {
+			break;
+		} else if (*pCur == '>') {
+			if (*(pCur - 1) != '-') {
+				break;
+			}
+		}
+		--pCur;
+	}
+
+	if (*pCur == '<') {
+		pCur++;
+		while (strchr(":_-.", *pCur) || IsAlphaNumeric(*pCur)) {
+			strRet += *pCur;
+			pCur++;
+		}
+	}
+
+	// Return the tag name or ""
+	return strRet;
+}
+
+void SciTEBase::GoMatchingBrace(bool select) {
+	SA::Position braceAtCaret = -1;
+	SA::Position braceOpposite = -1;
+	const bool isInside = FindMatchingBracePosition(pwFocussed == &wEditor, braceAtCaret, braceOpposite, true);
+	// Convert the character positions into caret positions based on whether
+	// the caret position was inside or outside the braces.
+	if (isInside) {
+		if (braceOpposite > braceAtCaret) {
+			braceAtCaret++;
+		} else if (braceOpposite >= 0) {
+			braceOpposite++;
+		}
+	} else {    // Outside
+		if (braceOpposite > braceAtCaret) {
+			braceOpposite++;
+		} else {
+			braceAtCaret++;
+		}
+	}
+	if (braceOpposite >= 0) {
+		EnsureRangeVisible(*pwFocussed, SA::Span(braceOpposite));
+		if (select) {
+			pwFocussed->SetSel(braceAtCaret, braceOpposite);
+		} else {
+			pwFocussed->SetSel(braceOpposite, braceOpposite);
+		}
+	}
+}
+
+// Text	ConditionalUp	Ctrl+J	Finds the previous matching preprocessor condition
+// Text	ConditionalDown	Ctrl+K	Finds the next matching preprocessor condition
+void SciTEBase::GoMatchingPreprocCond(int direction, bool select) {
+	const SA::Position mppcAtCaret = wEditor.CurrentPos();
+	SA::Position mppcMatch = -1;
+	const int forward = (direction == IDM_NEXTMATCHPPC);
+	const bool isInside = FindMatchingPreprocCondPosition(forward, mppcAtCaret, mppcMatch);
+
+	if (isInside && mppcMatch >= 0) {
+		EnsureRangeVisible(wEditor, SA::Span(mppcMatch));
+		if (select) {
+			// Selection changes the rules a bit...
+			const SA::Position selStart = wEditor.SelectionStart();
+			const SA::Position selEnd = wEditor.SelectionEnd();
+			// pivot isn't the caret position but the opposite (if there is a selection)
+			const SA::Position pivot = (mppcAtCaret == selStart ? selEnd : selStart);
+			if (forward) {
+				// Caret goes one line beyond the target, to allow selecting the whole line
+				const SA::Line lineNb = wEditor.LineFromPosition(mppcMatch);
+				mppcMatch = wEditor.LineStart(lineNb + 1);
+			}
+			SetSelection(pivot, mppcMatch);
+		} else {
+			SetSelection(mppcMatch, mppcMatch);
+		}
+	} else {
+		WarnUser(warnNotFound);
+	}
+}
+
+void SciTEBase::AddCommand(const std::string &cmd, const std::string &dir, JobSubsystem jobType, const std::string &input, int flags) {
+	// If no explicit directory, use the directory of the current file
+	FilePath directoryRun;
+	if (dir.length()) {
+		FilePath directoryExplicit(GUI::StringFromUTF8(dir));
+		if (directoryExplicit.IsAbsolute()) {
+			directoryRun = directoryExplicit;
+		} else {
+			// Relative paths are relative to the current file
+			directoryRun = FilePath(filePath.Directory(), directoryExplicit).NormalizePath();
+		}
+	} else {
+		directoryRun = filePath.Directory();
+	}
+	jobQueue.AddCommand(cmd, directoryRun, jobType, input, flags);
+}
+
+int ControlIDOfCommand(unsigned long wParam) noexcept {
+	return wParam & 0xffff;
+}
+
+void WindowSetFocus(GUI::ScintillaWindow &w) {
+	w.Send(SCI_GRABFOCUS);
+}
+
+void SciTEBase::SetLineNumberWidth() {
+	if (lineNumbers) {
+		int lineNumWidth = lineNumbersWidth;
+
+		if (lineNumbersExpand) {
+			// The margin size will be expanded if the current buffer's maximum
+			// line number would overflow the margin.
+
+			SA::Line lineCount = wEditor.LineCount();
+
+			lineNumWidth = 1;
+			while (lineCount >= 10) {
+				lineCount /= 10;
+				++lineNumWidth;
+			}
+
+			if (lineNumWidth < lineNumbersWidth) {
+				lineNumWidth = lineNumbersWidth;
+			}
+		}
+		if (lineNumWidth < 0)
+			lineNumWidth = 0;
+		// The 4 here allows for spacing: 1 pixel on left and 3 on right.
+		std::string nNines(lineNumWidth, '9');
+		const int pixelWidth = 4 + wEditor.TextWidth(
+					       static_cast<int>(SA::StylesCommon::LineNumber), nNines.c_str());
+
+		wEditor.SetMarginWidthN(0, pixelWidth);
+	} else {
+		wEditor.SetMarginWidthN(0, 0);
+	}
+}
+
+void SciTEBase::MenuCommand(int cmdID, int source) {
+	switch (cmdID) {
+	case IDM_NEW:
+		// For the New command, the "are you sure" question is always asked as this gives
+		// an opportunity to abandon the edits made to a file when are.you.sure is turned off.
+		if (CanMakeRoom()) {
+			New();
+			ReadProperties();
+			SetIndentSettings();
+			SetEol();
+			UpdateStatusBar(true);
+			WindowSetFocus(wEditor);
+		}
+		break;
+	case IDM_OPEN:
+		// No need to see if can make room as that will occur
+		// when doing the opening. Must be done there as user
+		// may decide to open multiple files so do not know yet
+		// how much room needed.
+		OpenDialog(filePath.Directory(), GUI::StringFromUTF8(props.GetExpandedString("open.filter")).c_str());
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_OPENSELECTED:
+		if (OpenSelected())
+			WindowSetFocus(wEditor);
+		break;
+	case IDM_REVERT:
+		Revert();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_CLOSE:
+		if (SaveIfUnsure() != saveCancelled) {
+			Close();
+			WindowSetFocus(wEditor);
+		}
+		break;
+	case IDM_CLOSEALL:
+		CloseAllBuffers();
+		break;
+	case IDM_SAVE:
+		Save();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEALL:
+		SaveAllBuffers(true);
+		break;
+	case IDM_SAVEAS:
+		SaveAsDialog();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEACOPY:
+		SaveACopy();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_COPYPATH:
+		CopyPath();
+		break;
+	case IDM_SAVEASHTML:
+		SaveAsHTML();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEASRTF:
+		SaveAsRTF();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEASPDF:
+		SaveAsPDF();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEASTEX:
+		SaveAsTEX();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVEASXML:
+		SaveAsXML();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_PRINT:
+		Print(true);
+		break;
+	case IDM_PRINTSETUP:
+		PrintSetup();
+		break;
+	case IDM_LOADSESSION:
+		LoadSessionDialog();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_SAVESESSION:
+		SaveSessionDialog();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_ABOUT:
+		AboutDialog();
+		break;
+	case IDM_QUIT:
+		QuitProgram();
+		break;
+	case IDM_ENCODING_DEFAULT:
+	case IDM_ENCODING_UCS2BE:
+	case IDM_ENCODING_UCS2LE:
+	case IDM_ENCODING_UTF8:
+	case IDM_ENCODING_UCOOKIE:
+		CurrentBuffer()->unicodeMode = static_cast<UniMode>(cmdID - IDM_ENCODING_DEFAULT);
+		if (CurrentBuffer()->unicodeMode != uni8Bit) {
+			// Override the code page if Unicode
+			codePage = SA::CpUtf8;
+		} else {
+			codePage = props.GetInt("code.page");
+		}
+		wEditor.SetCodePage(codePage);
+		break;
+
+	case IDM_NEXTFILESTACK:
+		if (buffers.size() > 1 && props.GetInt("buffers.zorder.switching")) {
+			NextInStack(); // next most recently selected buffer
+			WindowSetFocus(wEditor);
+			break;
+		}
+		[[fallthrough]];
+	// else fall through and do NEXTFILE behaviour...
+	case IDM_NEXTFILE:
+		if (buffers.size() > 1) {
+			Next(); // Use Next to tabs move left-to-right
+			WindowSetFocus(wEditor);
+		} else {
+			// Not using buffers - switch to next file on MRU
+			StackMenuNext();
+		}
+		break;
+
+	case IDM_PREVFILESTACK:
+		if (buffers.size() > 1 && props.GetInt("buffers.zorder.switching")) {
+			PrevInStack(); // next least recently selected buffer
+			WindowSetFocus(wEditor);
+			break;
+		}
+		[[fallthrough]];
+	// else fall through and do PREVFILE behaviour...
+	case IDM_PREVFILE:
+		if (buffers.size() > 1) {
+			Prev(); // Use Prev to tabs move right-to-left
+			WindowSetFocus(wEditor);
+		} else {
+			// Not using buffers - switch to previous file on MRU
+			StackMenuPrev();
+		}
+		break;
+
+	case IDM_MOVETABRIGHT:
+		MoveTabRight();
+		WindowSetFocus(wEditor);
+		break;
+	case IDM_MOVETABLEFT:
+		MoveTabLeft();
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_UNDO:
+		PaneSource(source).Undo();
+		CheckMenus();
+		break;
+	case IDM_REDO:
+		PaneSource(source).Redo();
+		CheckMenus();
+		break;
+
+	case IDM_CUT:
+		if (!PaneSource(source).SelectionEmpty()) {
+			PaneSource(source).Cut();
+		}
+		break;
+	case IDM_COPY:
+		if (!PaneSource(source).SelectionEmpty()) {
+			//fprintf(stderr, "Copy from %d\n", source);
+			PaneSource(source).Copy();
+		}
+		// does not trigger Notification::UpdateUI, so do CheckMenusClipboard() here
+		CheckMenusClipboard();
+		break;
+	case IDM_PASTE:
+		PaneSource(source).Paste();
+		break;
+	case IDM_DUPLICATE:
+		PaneSource(source).SelectionDuplicate();
+		break;
+	case IDM_PASTEANDDOWN: {
+			const SA::Position pos = PaneFocused().CurrentPos();
+			PaneFocused().Paste();
+			PaneFocused().SetCurrentPos(pos);
+			PaneFocused().CharLeft();
+			PaneFocused().LineDown();
+		}
+		break;
+	case IDM_CLEAR:
+		PaneSource(source).Clear();
+		break;
+	case IDM_SELECTALL:
+		PaneSource(source).SelectAll();
+		break;
+	case IDM_COPYASRTF:
+		CopyAsRTF();
+		break;
+
+	case IDM_FIND:
+		Find();
+		break;
+
+	case IDM_INCSEARCH:
+		IncrementSearchMode();
+		break;
+
+	case IDM_FINDNEXT:
+		FindNext(reverseFind);
+		break;
+
+	case IDM_FINDNEXTBACK:
+		FindNext(!reverseFind);
+		break;
+
+	case IDM_FINDNEXTSEL:
+		SelectionIntoFind();
+		FindNext(reverseFind, true, false);
+		break;
+
+	case IDM_ENTERSELECTION:
+		SelectionIntoFind();
+		break;
+
+	case IDM_SELECTIONADDNEXT:
+		SelectionAdd(addNext);
+		break;
+
+	case IDM_SELECTIONADDEACH:
+		SelectionAdd(addEach);
+		break;
+
+	case IDM_FINDNEXTBACKSEL:
+		SelectionIntoFind();
+		FindNext(!reverseFind, true, false);
+		break;
+
+	case IDM_FINDINFILES:
+		FindInFiles();
+		break;
+
+	case IDM_REPLACE:
+		Replace();
+		break;
+
+	case IDM_GOTO:
+		GoLineDialog();
+		break;
+
+	case IDM_MATCHBRACE:
+		GoMatchingBrace(false);
+		break;
+
+	case IDM_SELECTTOBRACE:
+		GoMatchingBrace(true);
+		break;
+
+	case IDM_PREVMATCHPPC:
+		GoMatchingPreprocCond(IDM_PREVMATCHPPC, false);
+		break;
+
+	case IDM_SELECTTOPREVMATCHPPC:
+		GoMatchingPreprocCond(IDM_PREVMATCHPPC, true);
+		break;
+
+	case IDM_NEXTMATCHPPC:
+		GoMatchingPreprocCond(IDM_NEXTMATCHPPC, false);
+		break;
+
+	case IDM_SELECTTONEXTMATCHPPC:
+		GoMatchingPreprocCond(IDM_NEXTMATCHPPC, true);
+		break;
+	case IDM_SHOWCALLTIP:
+		if (wEditor.CallTipActive()) {
+			currentCallTip = (currentCallTip + 1 == maxCallTips) ? 0 : currentCallTip + 1;
+			FillFunctionDefinition();
+		} else {
+			StartCallTip();
+		}
+		break;
+	case IDM_COMPLETE:
+		autoCCausedByOnlyOne = false;
+		StartAutoComplete();
+		break;
+
+	case IDM_COMPLETEWORD:
+		autoCCausedByOnlyOne = false;
+		StartAutoCompleteWord(false);
+		break;
+
+	case IDM_ABBREV:
+		wEditor.Cancel();
+		StartExpandAbbreviation();
+		break;
+
+	case IDM_INS_ABBREV:
+		wEditor.Cancel();
+		StartInsertAbbreviation();
+		break;
+
+	case IDM_BLOCK_COMMENT:
+		StartBlockComment();
+		break;
+
+	case IDM_BOX_COMMENT:
+		StartBoxComment();
+		break;
+
+	case IDM_STREAM_COMMENT:
+		StartStreamComment();
+		break;
+
+	case IDM_TOGGLE_FOLDALL:
+		FoldAll();
+		break;
+
+	case IDM_UPRCASE:
+		PaneFocused().UpperCase();
+		break;
+
+	case IDM_LWRCASE:
+		PaneFocused().LowerCase();
+		break;
+
+	case IDM_LINEREVERSE:
+		PaneFocused().LineReverse();
+		break;
+
+	case IDM_JOIN:
+		PaneFocused().TargetFromSelection();
+		PaneFocused().LinesJoin();
+		break;
+
+	case IDM_SPLIT:
+		PaneFocused().TargetFromSelection();
+		PaneFocused().LinesSplit(0);
+		break;
+
+	case IDM_EXPAND:
+		wEditor.ToggleFold(GetCurrentLineNumber());
+		break;
+
+	case IDM_TOGGLE_FOLDRECURSIVE: {
+			const SA::Line line = GetCurrentLineNumber();
+			const SA::FoldLevel level = wEditor.FoldLevel(line);
+			ToggleFoldRecursive(line, level);
+		}
+		break;
+
+	case IDM_EXPAND_ENSURECHILDRENVISIBLE: {
+			const SA::Line line = GetCurrentLineNumber();
+			const SA::FoldLevel level = wEditor.FoldLevel(line);
+			EnsureAllChildrenVisible(line, level);
+		}
+		break;
+
+	case IDM_SPLITVERTICAL: {
+			const GUI::Rectangle rcClient = GetClientRectangle();
+			const double doubleHeightOutput = heightOutput;
+			const double doublePreviousHeightOutput = previousHeightOutput;
+			heightOutput = static_cast<int>(splitVertical ?
+							std::lround(doubleHeightOutput * rcClient.Height() / rcClient.Width()) :
+							std::lround(doubleHeightOutput * rcClient.Width() / rcClient.Height()));
+			previousHeightOutput = static_cast<int>(splitVertical ?
+								std::lround(doublePreviousHeightOutput * rcClient.Height() / rcClient.Width()) :
+								std::lround(doublePreviousHeightOutput * rcClient.Width() / rcClient.Height()));
+		}
+		splitVertical = !splitVertical;
+		heightOutput = NormaliseSplit(heightOutput);
+		SizeSubWindows();
+		CheckMenus();
+		Redraw();
+		break;
+
+	case IDM_LINENUMBERMARGIN:
+		lineNumbers = !lineNumbers;
+		SetLineNumberWidth();
+		CheckMenus();
+		break;
+
+	case IDM_SELMARGIN:
+		margin = !margin;
+		wEditor.SetMarginWidthN(1, margin ? marginWidth : 0);
+		CheckMenus();
+		break;
+
+	case IDM_FOLDMARGIN:
+		foldMargin = !foldMargin;
+		wEditor.SetMarginWidthN(2, foldMargin ? foldMarginWidth : 0);
+		CheckMenus();
+		break;
+
+	case IDM_VIEWEOL:
+		wEditor.SetViewEOL(!wEditor.ViewEOL());
+		CheckMenus();
+		break;
+
+	case IDM_VIEWTOOLBAR:
+		tbVisible = !tbVisible;
+		ShowToolBar();
+		CheckMenus();
+		break;
+
+	case IDM_TOGGLEOUTPUT:
+		ToggleOutputVisible();
+		CheckMenus();
+		break;
+
+	case IDM_TOGGLEPARAMETERS:
+		ParametersDialog(false);
+		CheckMenus();
+		break;
+
+	case IDM_WRAP:
+		wrap = !wrap;
+		wEditor.SetWrapMode(wrap ? wrapStyle : SA::Wrap::None);
+		CheckMenus();
+		break;
+
+	case IDM_WRAPOUTPUT:
+		wrapOutput = !wrapOutput;
+		wOutput.SetWrapMode(wrapOutput ? wrapStyle : SA::Wrap::None);
+		CheckMenus();
+		break;
+
+	case IDM_READONLY:
+		CurrentBuffer()->isReadOnly = !CurrentBuffer()->isReadOnly;
+		wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+		UpdateStatusBar(true);
+		CheckMenus();
+		SetBuffersMenu();
+		break;
+
+	case IDM_VIEWTABBAR:
+		tabVisible = !tabVisible;
+		ShowTabBar();
+		CheckMenus();
+		break;
+
+	case IDM_VIEWSTATUSBAR:
+		sbVisible = !sbVisible;
+		ShowStatusBar();
+		UpdateStatusBar(true);
+		CheckMenus();
+		break;
+
+	case IDM_CLEAROUTPUT:
+		wOutput.ClearAll();
+		break;
+
+	case IDM_SWITCHPANE:
+		if (pwFocussed == &wEditor)
+			WindowSetFocus(wOutput);
+		else
+			WindowSetFocus(wEditor);
+		break;
+
+	case IDM_EOL_CRLF:
+		wEditor.SetEOLMode(SA::EndOfLine::CrLf);
+		CheckMenus();
+		UpdateStatusBar(false);
+		break;
+
+	case IDM_EOL_CR:
+		wEditor.SetEOLMode(SA::EndOfLine::Cr);
+		CheckMenus();
+		UpdateStatusBar(false);
+		break;
+	case IDM_EOL_LF:
+		wEditor.SetEOLMode(SA::EndOfLine::Lf);
+		CheckMenus();
+		UpdateStatusBar(false);
+		break;
+	case IDM_EOL_CONVERT:
+		wEditor.ConvertEOLs(wEditor.EOLMode());
+		break;
+
+	case IDM_VIEWSPACE:
+		ViewWhitespace(wEditor.ViewWS() == SA::WhiteSpace::Invisible);
+		CheckMenus();
+		Redraw();
+		break;
+
+	case IDM_VIEWGUIDES: {
+			const bool viewIG = wEditor.IndentationGuides() == SA::IndentView::None;
+			wEditor.SetIndentationGuides(viewIG ? indentExamine : SA::IndentView::None);
+			CheckMenus();
+			Redraw();
+		}
+		break;
+
+	case IDM_COMPILE: {
+			if (SaveIfUnsureForBuilt() != saveCancelled) {
+				SelectionIntoProperties();
+				AddCommand(props.GetWild("command.compile.", FileNameExt().AsUTF8().c_str()), "",
+					   SubsystemType("command.compile.subsystem."));
+				if (jobQueue.HasCommandToRun())
+					Execute();
+			}
+		}
+		break;
+
+	case IDM_BUILD: {
+			if (SaveIfUnsureForBuilt() != saveCancelled) {
+				SelectionIntoProperties();
+				AddCommand(
+					props.GetWild("command.build.", FileNameExt().AsUTF8().c_str()),
+					props.GetNewExpandString("command.build.directory.", FileNameExt().AsUTF8().c_str()),
+					SubsystemType("command.build.subsystem."));
+				if (jobQueue.HasCommandToRun()) {
+					jobQueue.isBuilding = true;
+					Execute();
+				}
+			}
+		}
+		break;
+
+	case IDM_CLEAN: {
+			if (SaveIfUnsureForBuilt() != saveCancelled) {
+				SelectionIntoProperties();
+				AddCommand(props.GetWild("command.clean.", FileNameExt().AsUTF8().c_str()), "",
+					   SubsystemType("command.clean.subsystem."));
+				if (jobQueue.HasCommandToRun())
+					Execute();
+			}
+		}
+		break;
+
+	case IDM_GO: {
+			if (SaveIfUnsureForBuilt() != saveCancelled) {
+				SelectionIntoProperties();
+				int flags = 0;
+
+				if (!jobQueue.isBuilt) {
+					std::string buildcmd = props.GetNewExpandString("command.go.needs.", FileNameExt().AsUTF8().c_str());
+					AddCommand(buildcmd, "",
+						   SubsystemType("command.go.needs.subsystem."));
+					if (buildcmd.length() > 0) {
+						jobQueue.isBuilding = true;
+						flags |= jobForceQueue;
+					}
+				}
+				AddCommand(props.GetWild("command.go.", FileNameExt().AsUTF8().c_str()), "",
+					   SubsystemType("command.go.subsystem."), "", flags);
+				if (jobQueue.HasCommandToRun())
+					Execute();
+			}
+		}
+		break;
+
+	case IDM_STOPEXECUTE:
+		StopExecute();
+		break;
+
+	case IDM_NEXTMSG:
+		GoMessage(1);
+		break;
+
+	case IDM_PREVMSG:
+		GoMessage(-1);
+		break;
+
+	case IDM_OPENLOCALPROPERTIES:
+		OpenProperties(IDM_OPENLOCALPROPERTIES);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_OPENUSERPROPERTIES:
+		OpenProperties(IDM_OPENUSERPROPERTIES);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_OPENGLOBALPROPERTIES:
+		OpenProperties(IDM_OPENGLOBALPROPERTIES);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_OPENABBREVPROPERTIES:
+		OpenProperties(IDM_OPENABBREVPROPERTIES);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_OPENLUAEXTERNALFILE:
+		OpenProperties(IDM_OPENLUAEXTERNALFILE);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_OPENDIRECTORYPROPERTIES:
+		OpenProperties(IDM_OPENDIRECTORYPROPERTIES);
+		WindowSetFocus(wEditor);
+		break;
+
+	case IDM_SRCWIN:
+		break;
+
+	case IDM_BOOKMARK_TOGGLE:
+		BookmarkToggle();
+		break;
+
+	case IDM_BOOKMARK_NEXT:
+		BookmarkNext(true);
+		break;
+
+	case IDM_BOOKMARK_PREV:
+		BookmarkNext(false);
+		break;
+
+	case IDM_BOOKMARK_NEXT_SELECT:
+		BookmarkNext(true, true);
+		break;
+
+	case IDM_BOOKMARK_PREV_SELECT:
+		BookmarkNext(false, true);
+		break;
+
+	case IDM_BOOKMARK_CLEARALL:
+		wEditor.MarkerDeleteAll(markerBookmark);
+		RemoveFindMarks();
+		break;
+
+	case IDM_BOOKMARK_SELECT_ALL:
+		BookmarkSelectAll();
+		break;
+
+	case IDM_TABSIZE:
+		TabSizeDialog();
+		break;
+
+	case IDM_MONOFONT:
+		CurrentBuffer()->useMonoFont = !CurrentBuffer()->useMonoFont;
+		ReadFontProperties();
+		Redraw();
+		break;
+
+	case IDM_MACROLIST:
+		AskMacroList();
+		break;
+	case IDM_MACROPLAY:
+		StartPlayMacro();
+		break;
+	case IDM_MACRORECORD:
+		StartRecordMacro();
+		break;
+	case IDM_MACROSTOPRECORD:
+		StopRecordMacro();
+		break;
+
+	case IDM_HELP: {
+			SelectionIntoProperties();
+			AddCommand(props.GetWild("command.help.", FileNameExt().AsUTF8().c_str()), "",
+				   SubsystemType("command.help.subsystem."));
+			if (!jobQueue.IsExecuting() && jobQueue.HasCommandToRun()) {
+				jobQueue.isBuilding = true;
+				Execute();
+			}
+		}
+		break;
+
+	case IDM_HELP_SCITE: {
+			SelectionIntoProperties();
+			AddCommand(props.GetString("command.scite.help"), "",
+				   SubsystemFromChar(props.GetString("command.scite.help.subsystem")[0]));
+			if (!jobQueue.IsExecuting() && jobQueue.HasCommandToRun()) {
+				jobQueue.isBuilding = true;
+				Execute();
+			}
+		}
+		break;
+
+	default:
+		if ((cmdID >= bufferCmdID) &&
+				(cmdID < bufferCmdID + buffers.size())) {
+			SetDocumentAt(cmdID - bufferCmdID);
+			CheckReload();
+		} else if ((cmdID >= fileStackCmdID) &&
+				(cmdID < fileStackCmdID + fileStackMax)) {
+			StackMenu(cmdID - fileStackCmdID);
+		} else if (cmdID >= importCmdID &&
+				(cmdID < importCmdID + importMax)) {
+			ImportMenu(cmdID - importCmdID);
+		} else if (cmdID >= IDM_TOOLS && cmdID < IDM_TOOLS + toolMax) {
+			ToolsMenu(cmdID - IDM_TOOLS);
+		} else if (cmdID >= IDM_LANGUAGE && cmdID < IDM_LANGUAGE + 100) {
+			SetOverrideLanguage(cmdID - IDM_LANGUAGE);
+		} else if (cmdID >= SCI_START) {
+			PaneFocused().Call(static_cast<SA::Message>(cmdID));
+		}
+		break;
+	}
+}
+
+void SciTEBase::FoldChanged(SA::Line line, SA::FoldLevel levelNow, SA::FoldLevel levelPrev) {
+	// Unfold any regions where the new fold structure makes that fold wrong.
+	// Will only unfold and show lines and never fold or hide lines.
+	if (LevelIsHeader(levelNow)) {
+		if (!(LevelIsHeader(levelPrev))) {
+			// Adding a fold point.
+			wEditor.SetFoldExpanded(line, true);
+			if (!wEditor.AllLinesVisible())
+				ExpandFolds(line, true, levelPrev);
+		}
+	} else if (LevelIsHeader(levelPrev)) {
+		const SA::Line prevLine = line - 1;
+		const SA::FoldLevel levelPrevLine = wEditor.FoldLevel(prevLine);
+
+		// Combining two blocks where the first block is collapsed (e.g. by deleting the line(s) which separate(s) the two blocks)
+		if ((LevelNumberPart(levelPrevLine) == LevelNumberPart(levelNow)) && !wEditor.LineVisible(prevLine)) {
+			const SA::Line parentLine = wEditor.FoldParent(prevLine);
+			const SA::FoldLevel levelParentLine = wEditor.FoldLevel(parentLine);
+			wEditor.SetFoldExpanded(parentLine, true);
+			ExpandFolds(parentLine, true, levelParentLine);
+		}
+
+		if (!wEditor.FoldExpanded(line)) {
+			// Removing the fold from one that has been contracted so should expand
+			// otherwise lines are left invisible with no way to make them visible
+			wEditor.SetFoldExpanded(line, true);
+			if (!wEditor.AllLinesVisible())
+				// Combining two blocks where the second one is collapsed (e.g. by adding characters in the line which separates the two blocks)
+				ExpandFolds(line, true, levelPrev);
+		}
+	}
+	if (!(LevelIsWhitespace(levelNow)) &&
+			(LevelNumberPart(levelPrev) > LevelNumberPart(levelNow))) {
+		if (!wEditor.AllLinesVisible()) {
+			// See if should still be hidden
+			const SA::Line parentLine = wEditor.FoldParent(line);
+			if (parentLine < 0) {
+				wEditor.ShowLines(line, line);
+			} else if (wEditor.FoldExpanded(parentLine) && wEditor.LineVisible(parentLine)) {
+				wEditor.ShowLines(line, line);
+			}
+		}
+	}
+	// Combining two blocks where the first one is collapsed (e.g. by adding characters in the line which separates the two blocks)
+	if (!(LevelIsWhitespace(levelNow) && (LevelNumberPart(levelPrev) < LevelNumberPart(levelNow)))) {
+		if (!wEditor.AllLinesVisible()) {
+			const SA::Line parentLine = wEditor.FoldParent(line);
+			if (!wEditor.FoldExpanded(parentLine) && wEditor.LineVisible(line)) {
+				wEditor.SetFoldExpanded(parentLine, true);
+				const SA::FoldLevel levelParentLine = wEditor.FoldLevel(parentLine);
+				ExpandFolds(parentLine, true, levelParentLine);
+			}
+		}
+	}
+}
+
+void SciTEBase::ExpandFolds(SA::Line line, bool expand, SA::FoldLevel level) {
+	// Expand or contract line and all subordinates
+	// level is the fold level of line
+	const SA::Line lineMaxSubord = wEditor.LastChild(line, LevelNumberPart(level));
+	line++;
+	wEditor.Call(expand ? SA::Message::ShowLines : SA::Message::HideLines, line, lineMaxSubord);
+	while (line <= lineMaxSubord) {
+		const SA::FoldLevel levelLine = wEditor.FoldLevel(line);
+		if (LevelIsHeader(levelLine)) {
+			wEditor.SetFoldExpanded(line, expand);
+		}
+		line++;
+	}
+}
+
+void SciTEBase::FoldAll() {
+	wEditor.ColouriseAll();
+	const SA::Line maxLine = wEditor.LineCount();
+	bool expanding = true;
+	for (SA::Line lineSeek = 0; lineSeek < maxLine; lineSeek++) {
+		if (LevelIsHeader(wEditor.FoldLevel(lineSeek))) {
+			expanding = !wEditor.FoldExpanded(lineSeek);
+			break;
+		}
+	}
+	for (SA::Line line = 0; line < maxLine; line++) {
+		const SA::FoldLevel level = wEditor.FoldLevel(line);
+		if (LevelIsHeader(level) &&
+				(SA::FoldLevel::Base == LevelNumberPart(level))) {
+			const SA::Line lineMaxSubord = wEditor.LastChild(line, static_cast<SA::FoldLevel>(-1));
+			if (expanding) {
+				wEditor.SetFoldExpanded(line, true);
+				ExpandFolds(line, true, level);
+				line = lineMaxSubord;
+			} else {
+				wEditor.SetFoldExpanded(line, false);
+				if (lineMaxSubord > line)
+					wEditor.HideLines(line + 1, lineMaxSubord);
+			}
+		}
+	}
+}
+
+void SciTEBase::GotoLineEnsureVisible(SA::Line line) {
+	wEditor.EnsureVisibleEnforcePolicy(line);
+	wEditor.GotoLine(line);
+}
+
+void SciTEBase::EnsureRangeVisible(GUI::ScintillaWindow &win, SA::Span range, bool enforcePolicy) {
+	const SA::Line lineStart = win.LineFromPosition(range.start);
+	const SA::Line lineEnd = win.LineFromPosition(range.end);
+	for (SA::Line line = lineStart; line <= lineEnd; line++) {
+		win.Call(enforcePolicy ? SA::Message::EnsureVisibleEnforcePolicy : SA::Message::EnsureVisible, line);
+	}
+}
+
+bool SciTEBase::MarginClick(SA::Position position, int modifiers) {
+	const SA::Line lineClick = wEditor.LineFromPosition(position);
+	const SA::KeyMod km = static_cast<SA::KeyMod>(modifiers);
+	if ((FlagIsSet(km, SA::KeyMod::Shift)) && (FlagIsSet(km, SA::KeyMod::Ctrl))) {
+		FoldAll();
+	} else {
+		const SA::FoldLevel levelClick = wEditor.FoldLevel(lineClick);
+		if (LevelIsHeader(levelClick)) {
+			if (FlagIsSet(km, SA::KeyMod::Shift)) {
+				EnsureAllChildrenVisible(lineClick, levelClick);
+			} else if (FlagIsSet(km, SA::KeyMod::Ctrl)) {
+				ToggleFoldRecursive(lineClick, levelClick);
+			} else {
+				// Toggle this line
+				wEditor.ToggleFold(lineClick);
+			}
+		}
+	}
+	return true;
+}
+
+void SciTEBase::ToggleFoldRecursive(SA::Line line, SA::FoldLevel level) {
+	if (wEditor.FoldExpanded(line)) {
+		// This ensure fold structure created before the fold is expanded
+		wEditor.LastChild(line, LevelNumberPart(level));
+		// Contract this line and all children
+		wEditor.SetFoldExpanded(line, false);
+		ExpandFolds(line, false, level);
+	} else {
+		// Expand this line and all children
+		wEditor.SetFoldExpanded(line, true);
+		ExpandFolds(line, true, level);
+	}
+}
+
+void SciTEBase::EnsureAllChildrenVisible(SA::Line line, SA::FoldLevel level) {
+	// Ensure all children visible
+	wEditor.SetFoldExpanded(line, true);
+	ExpandFolds(line, true, level);
+}
+
+void SciTEBase::NewLineInOutput() {
+	if (jobQueue.IsExecuting())
+		return;
+	SA::Line line = wOutput.LineFromPosition(
+				wOutput.CurrentPos()) - 1;
+	std::string cmd = GetLine(wOutput, line);
+	if (cmd == ">") {
+		// Search output buffer for previous command
+		line--;
+		while (line >= 0) {
+			cmd = GetLine(wOutput, line);
+			if (StartsWith(cmd, ">") && !StartsWith(cmd, ">Exit")) {
+				cmd = cmd.substr(1);
+				break;
+			}
+			line--;
+		}
+	} else if (StartsWith(cmd, ">")) {
+		cmd = cmd.substr(1);
+	}
+	returnOutputToCommand = false;
+	AddCommand(cmd, "", jobCLI);
+	Execute();
+}
+
+void SciTEBase::UpdateUI(const SCNotification *notification) {
+	const bool handled = extender && extender->OnUpdateUI();
+	if (!handled) {
+		BraceMatch(notification->nmhdr.idFrom == IDM_SRCWIN);
+		if (notification->nmhdr.idFrom == IDM_SRCWIN) {
+			UpdateStatusBar(false);
+		}
+		CheckMenusClipboard();
+	}
+	if (CurrentBuffer()->findMarks == Buffer::fmModified) {
+		RemoveFindMarks();
+	}
+	const SA::Update updated = static_cast<SA::Update>(notification->updated);
+	if (FlagIsSet(updated, SA::Update::Selection) || FlagIsSet(updated, SA::Update::Content)) {
+		if ((notification->nmhdr.idFrom == IDM_SRCWIN) == (pwFocussed == &wEditor)) {
+			// Only highlight focused pane.
+			if (FlagIsSet(updated, SA::Update::Selection)) {
+				currentWordHighlight.statesOfDelay = currentWordHighlight.noDelay; // Selection has just been updated, so delay is disabled.
+				currentWordHighlight.textHasChanged = false;
+				HighlightCurrentWord(true);
+			} else if (currentWordHighlight.textHasChanged) {
+				HighlightCurrentWord(false);
+			}
+		}
+	}
+}
+
+void SciTEBase::Modified(const SCNotification *notification) {
+	const SA::ModificationFlags modificationType =
+		static_cast<SA::ModificationFlags>(notification->modificationType);
+	const bool textWasModified = FlagIsSet(modificationType, SA::ModificationFlags::InsertText) ||
+		FlagIsSet(modificationType, SA::ModificationFlags::DeleteText);
+	if ((notification->nmhdr.idFrom == IDM_SRCWIN) && textWasModified)
+		CurrentBuffer()->DocumentModified();
+	if (FlagIsSet(modificationType, SA::ModificationFlags::LastStepInUndoRedo)) {
+		// When the user hits undo or redo, several normal insert/delete
+		// notifications may fire, but we will end up here in the end
+		EnableAMenuItem(IDM_UNDO, CallFocusedElseDefault(true, SA::Message::CanUndo));
+		EnableAMenuItem(IDM_REDO, CallFocusedElseDefault(true, SA::Message::CanRedo));
+	} else if (textWasModified) {
+		if ((notification->nmhdr.idFrom == IDM_SRCWIN) == (pwFocussed == &wEditor)) {
+			currentWordHighlight.textHasChanged = true;
+		}
+		// This will be called a lot, and usually means "typing".
+		EnableAMenuItem(IDM_UNDO, true);
+		EnableAMenuItem(IDM_REDO, false);
+		if (CurrentBuffer()->findMarks == Buffer::fmMarked) {
+			CurrentBuffer()->findMarks = Buffer::fmModified;
+		}
+	}
+
+	if (notification->linesAdded && lineNumbers && lineNumbersExpand) {
+		SetLineNumberWidth();
+	}
+
+	if (FlagIsSet(modificationType, SA::ModificationFlags::ChangeFold)) {
+		FoldChanged(notification->line,
+			    static_cast<SA::FoldLevel>(notification->foldLevelNow),
+			    static_cast<SA::FoldLevel>(notification->foldLevelPrev));
+	}
+}
+
+void SciTEBase::Notify(SCNotification *notification) {
+	bool handled = false;
+	switch (static_cast<SA::Notification>(notification->nmhdr.code)) {
+	case SA::Notification::Painted:
+		if ((notification->nmhdr.idFrom == IDM_SRCWIN) == (pwFocussed == &wEditor)) {
+			// Only highlight focused pane.
+			// Manage delay before highlight when no user selection but there is word at the caret.
+			// So the Delay is based on the blinking of caret, scroll...
+			// If currentWordHighlight.statesOfDelay == currentWordHighlight.delay,
+			// then there is word at the caret without selection, and need some delay.
+			if (currentWordHighlight.statesOfDelay == currentWordHighlight.delay) {
+				if (currentWordHighlight.elapsedTimes.Duration() >= 0.5) {
+					currentWordHighlight.statesOfDelay = currentWordHighlight.delayJustEnded;
+					HighlightCurrentWord(true);
+					pwFocussed->InvalidateAll();
+				}
+			}
+		}
+		break;
+
+	case SA::Notification::FocusIn:
+		SetPaneFocus(notification->nmhdr.idFrom == IDM_SRCWIN);
+		CheckMenus();
+		break;
+
+	case SA::Notification::FocusOut:
+		CheckMenus();
+		break;
+
+	case SA::Notification::StyleNeeded: {
+			if (extender) {
+				// Colourisation may be performed by script
+				if ((notification->nmhdr.idFrom == IDM_SRCWIN) && (lexLanguage == SCLEX_CONTAINER)) {
+					SA::Position endStyled = wEditor.EndStyled();
+					const SA::Line lineEndStyled = wEditor.LineFromPosition(endStyled);
+					endStyled = wEditor.LineStart(lineEndStyled);
+					StyleWriter styler(wEditor);
+					int styleStart = 0;
+					if (endStyled > 0)
+						styleStart = styler.StyleAt(endStyled - 1);
+					styler.SetCodePage(codePage);
+					extender->OnStyle(endStyled, notification->position - endStyled,
+							  styleStart, &styler);
+					styler.Flush();
+				}
+			}
+		}
+		break;
+
+	case SA::Notification::CharAdded:
+		if (extender)
+			handled = extender->OnChar(static_cast<char>(notification->ch));
+		if (!handled) {
+			if (notification->nmhdr.idFrom == IDM_SRCWIN) {
+				CharAdded(notification->ch);
+			} else {
+				CharAddedOutput(notification->ch);
+			}
+		}
+		break;
+
+	case SA::Notification::SavePointReached:
+		if (notification->nmhdr.idFrom == IDM_SRCWIN) {
+			if (extender)
+				handled = extender->OnSavePointReached();
+			if (!handled) {
+				CurrentBuffer()->isDirty = false;
+			}
+		}
+		CheckMenus();
+		SetWindowName();
+		SetBuffersMenu();
+		break;
+
+	case SA::Notification::SavePointLeft:
+		if (notification->nmhdr.idFrom == IDM_SRCWIN) {
+			if (extender)
+				handled = extender->OnSavePointLeft();
+			if (!handled) {
+				CurrentBuffer()->isDirty = true;
+				jobQueue.isBuilt = false;
+			}
+		}
+		CheckMenus();
+		SetWindowName();
+		SetBuffersMenu();
+		break;
+
+	case SA::Notification::DoubleClick:
+		if (extender)
+			handled = extender->OnDoubleClick();
+		if (!handled && notification->nmhdr.idFrom == IDM_RUNWIN) {
+			GoMessage(0);
+		}
+		break;
+
+	case SA::Notification::UpdateUI:
+		UpdateUI(notification);
+		break;
+
+	case SA::Notification::Modified:
+		Modified(notification);
+		break;
+
+	case SA::Notification::MarginClick: {
+			if (extender)
+				handled = extender->OnMarginClick();
+			if (!handled) {
+				if (notification->margin == 2) {
+					MarginClick(notification->position, notification->modifiers);
+				}
+			}
+		}
+		break;
+
+	case SA::Notification::NeedShown: {
+			EnsureRangeVisible(wEditor, SA::Span(notification->position, notification->position + notification->length), false);
+		}
+		break;
+
+	case SA::Notification::UserListSelection: {
+			if (notification->wParam == 2)
+				ContinueMacroList(notification->text);
+			else if (extender && notification->wParam > 2)
+				extender->OnUserListSelection(static_cast<int>(notification->wParam), notification->text);
+		}
+		break;
+
+	case SA::Notification::CallTipClick: {
+			if (notification->position == 1 && currentCallTip > 0) {
+				currentCallTip--;
+				FillFunctionDefinition();
+			} else if (notification->position == 2 && currentCallTip + 1 < maxCallTips) {
+				currentCallTip++;
+				FillFunctionDefinition();
+			}
+		}
+		break;
+
+	case SA::Notification::MacroRecord:
+		RecordMacroCommand(notification);
+		break;
+
+	case SA::Notification::URIDropped:
+		OpenUriList(notification->text);
+		break;
+
+	case SA::Notification::DwellStart:
+		if (extender && (SA::InvalidPosition != notification->position)) {
+			SA::Span range(notification->position);
+			std::string message =
+				RangeExtendAndGrab(wEditor,
+						   range, &SciTEBase::iswordcharforsel);
+			if (message.length()) {
+				extender->OnDwellStart(range.start, message.c_str());
+			}
+		}
+		break;
+
+	case SA::Notification::DwellEnd:
+		if (extender) {
+			extender->OnDwellStart(0, ""); // flags end of calltip
+		}
+		break;
+
+	case SA::Notification::Zoom:
+		SetLineNumberWidth();
+		break;
+
+	case SA::Notification::ModifyAttemptRO:
+		AbandonAutomaticSave();
+		break;
+
+	default:
+		// Avoid warning for unhandled enumeration for notifications SciTEBase not interested in
+		break;
+	}
+}
+
+void SciTEBase::CheckMenusClipboard() {
+	const bool hasSelection = !CallFocusedElseDefault(false, SA::Message::GetSelectionEmpty);
+	EnableAMenuItem(IDM_CUT, hasSelection);
+	EnableAMenuItem(IDM_COPY, hasSelection);
+	EnableAMenuItem(IDM_CLEAR, hasSelection);
+	EnableAMenuItem(IDM_PASTE, CallFocusedElseDefault(true, SA::Message::CanPaste));
+	EnableAMenuItem(IDM_SELECTALL, true);
+}
+
+void SciTEBase::CheckMenus() {
+	CheckMenusClipboard();
+	EnableAMenuItem(IDM_UNDO, CallFocusedElseDefault(true, SA::Message::CanUndo));
+	EnableAMenuItem(IDM_REDO, CallFocusedElseDefault(true, SA::Message::CanRedo));
+	EnableAMenuItem(IDM_DUPLICATE, !CurrentBuffer()->isReadOnly);
+	EnableAMenuItem(IDM_SHOWCALLTIP, apis != 0);
+	EnableAMenuItem(IDM_COMPLETE, apis != 0);
+	CheckAMenuItem(IDM_SPLITVERTICAL, splitVertical);
+	EnableAMenuItem(IDM_OPENFILESHERE, props.GetInt("check.if.already.open") != 0);
+	CheckAMenuItem(IDM_OPENFILESHERE, openFilesHere);
+	CheckAMenuItem(IDM_WRAP, wrap);
+	CheckAMenuItem(IDM_WRAPOUTPUT, wrapOutput);
+	CheckAMenuItem(IDM_READONLY, CurrentBuffer()->isReadOnly);
+	CheckAMenuItem(IDM_FULLSCREEN, fullScreen);
+	CheckAMenuItem(IDM_VIEWTOOLBAR, tbVisible);
+	CheckAMenuItem(IDM_VIEWTABBAR, tabVisible);
+	CheckAMenuItem(IDM_VIEWSTATUSBAR, sbVisible);
+	CheckAMenuItem(IDM_VIEWEOL, wEditor.ViewEOL());
+	CheckAMenuItem(IDM_VIEWSPACE, wEditor.ViewWS() != SA::WhiteSpace::Invisible);
+	CheckAMenuItem(IDM_VIEWGUIDES, wEditor.IndentationGuides() != SA::IndentView::None);
+	CheckAMenuItem(IDM_LINENUMBERMARGIN, lineNumbers);
+	CheckAMenuItem(IDM_SELMARGIN, margin);
+	CheckAMenuItem(IDM_FOLDMARGIN, foldMargin);
+	CheckAMenuItem(IDM_TOGGLEOUTPUT, heightOutput > 0);
+	CheckAMenuItem(IDM_TOGGLEPARAMETERS, ParametersOpen());
+	CheckAMenuItem(IDM_MONOFONT, CurrentBuffer()->useMonoFont);
+	EnableAMenuItem(IDM_COMPILE, !jobQueue.IsExecuting() &&
+			props.GetWild("command.compile.", FileNameExt().AsUTF8().c_str()).size() != 0);
+	EnableAMenuItem(IDM_BUILD, !jobQueue.IsExecuting() &&
+			props.GetWild("command.build.", FileNameExt().AsUTF8().c_str()).size() != 0);
+	EnableAMenuItem(IDM_CLEAN, !jobQueue.IsExecuting() &&
+			props.GetWild("command.clean.", FileNameExt().AsUTF8().c_str()).size() != 0);
+	EnableAMenuItem(IDM_GO, !jobQueue.IsExecuting() &&
+			props.GetWild("command.go.", FileNameExt().AsUTF8().c_str()).size() != 0);
+	EnableAMenuItem(IDM_OPENDIRECTORYPROPERTIES, props.GetInt("properties.directory.enable") != 0);
+	for (int toolItem = 0; toolItem < toolMax; toolItem++)
+		EnableAMenuItem(IDM_TOOLS + toolItem, ToolIsImmediate(toolItem) || !jobQueue.IsExecuting());
+	EnableAMenuItem(IDM_STOPEXECUTE, jobQueue.IsExecuting());
+	if (buffers.size() > 0) {
+		TabSelect(buffers.Current());
+		for (int bufferItem = 0; bufferItem < buffers.lengthVisible; bufferItem++) {
+			CheckAMenuItem(IDM_BUFFER + bufferItem, bufferItem == buffers.Current());
+		}
+	}
+	EnableAMenuItem(IDM_MACROPLAY, !recording);
+	EnableAMenuItem(IDM_MACRORECORD, !recording);
+	EnableAMenuItem(IDM_MACROSTOPRECORD, recording);
+}
+
+void SciTEBase::ContextMenu(GUI::ScintillaWindow &wSource, GUI::Point pt, GUI::Window wCmd) {
+	const SA::Position currentPos = wSource.CurrentPos();
+	const SA::Position anchor = wSource.Anchor();
+	popup.CreatePopUp();
+	const bool writable = !wSource.ReadOnly();
+	AddToPopUp("Undo", IDM_UNDO, writable && wSource.CanUndo());
+	AddToPopUp("Redo", IDM_REDO, writable && wSource.CanRedo());
+	AddToPopUp("");
+	AddToPopUp("Cut", IDM_CUT, writable && currentPos != anchor);
+	AddToPopUp("Copy", IDM_COPY, currentPos != anchor);
+	AddToPopUp("Paste", IDM_PASTE, writable && wSource.CanPaste());
+	AddToPopUp("Delete", IDM_CLEAR, writable && currentPos != anchor);
+	AddToPopUp("");
+	AddToPopUp("Select All", IDM_SELECTALL);
+	AddToPopUp("");
+	if (wSource.GetID() == wOutput.GetID()) {
+		AddToPopUp("Hide", IDM_TOGGLEOUTPUT, true);
+	} else {
+		AddToPopUp("Close", IDM_CLOSE, true);
+	}
+	std::string userContextMenu = props.GetNewExpandString("user.context.menu");
+	std::replace(userContextMenu.begin(), userContextMenu.end(), '|', '\0');
+	const char *userContextItem = userContextMenu.c_str();
+	const char *endDefinition = userContextItem + userContextMenu.length();
+	while (userContextItem < endDefinition) {
+		const char *caption = userContextItem;
+		userContextItem += strlen(userContextItem) + 1;
+		if (userContextItem < endDefinition) {
+			const int cmd = GetMenuCommandAsInt(userContextItem);
+			userContextItem += strlen(userContextItem) + 1;
+			AddToPopUp(caption, cmd);
+		}
+	}
+	popup.Show(pt, wCmd);
+}
+
+/**
+ * Ensure that a splitter bar position is inside the main window.
+ */
+int SciTEBase::NormaliseSplit(int splitPos) {
+	const GUI::Rectangle rcClient = GetClientRectangle();
+	const int w = rcClient.Width();
+	const int h = rcClient.Height();
+	if (splitPos < 20)
+		splitPos = 0;
+	if (splitVertical) {
+		if (splitPos > w - heightBar - 20)
+			splitPos = w - heightBar;
+	} else {
+		if (splitPos > h - heightBar - 20)
+			splitPos = h - heightBar;
+	}
+	return splitPos;
+}
+
+void SciTEBase::MoveSplit(GUI::Point ptNewDrag) {
+	int newHeightOutput = heightOutputStartDrag + (ptStartDrag.y - ptNewDrag.y);
+	if (splitVertical)
+		newHeightOutput = heightOutputStartDrag + (ptStartDrag.x - ptNewDrag.x);
+	newHeightOutput = NormaliseSplit(newHeightOutput);
+	if (heightOutput != newHeightOutput) {
+		heightOutput = newHeightOutput;
+		SizeContentWindows();
+		//Redraw();
+	}
+
+	previousHeightOutput = newHeightOutput;
+}
+
+void SciTEBase::TimerStart(int /* mask */) {
+}
+
+void SciTEBase::TimerEnd(int /* mask */) {
+}
+
+void SciTEBase::OnTimer() {
+	if (delayBeforeAutoSave && (0 == dialogsOnScreen)) {
+		// First save the visible buffer to avoid any switching if not needed
+		if (CurrentBuffer()->NeedsSave(delayBeforeAutoSave)) {
+			Save(sfNone);
+		}
+		// Then look through the other buffers to save any that need to be saved
+		const int currentBuffer = buffers.Current();
+		for (int i = 0; i < buffers.length; i++) {
+			if (buffers.buffers[i].NeedsSave(delayBeforeAutoSave)) {
+				SetDocumentAt(i);
+				Save(sfNone);
+			}
+		}
+		SetDocumentAt(currentBuffer);
+	}
+}
+
+void SciTEBase::SetIdler(bool on) {
+	needIdle = on;
+}
+
+void SciTEBase::OnIdle() {
+	if (!findMarker.Complete()) {
+		findMarker.Continue();
+		return;
+	}
+	if (!matchMarker.Complete()) {
+		matchMarker.Continue();
+		return;
+	}
+	SetIdler(false);
+}
+
+void SciTEBase::SetHomeProperties() {
+	FilePath homepath = GetSciteDefaultHome();
+	props.Set("SciteDefaultHome", homepath.AsUTF8().c_str());
+	homepath = GetSciteUserHome();
+	props.Set("SciteUserHome", homepath.AsUTF8().c_str());
+}
+
+void SciTEBase::UIAvailable() {
+	SetImportMenu();
+	if (extender) {
+		SetHomeProperties();
+		extender->Initialise(this);
+	}
+}
+
+/**
+ * Find the character following a name which is made up of characters from
+ * the set [a-zA-Z.]
+ */
+static GUI::gui_char AfterName(const GUI::gui_char *s) noexcept {
+	while (*s && ((*s == '.') ||
+			(*s >= 'a' && *s <= 'z') ||
+			(*s >= 'A' && *s <= 'Z')))
+		s++;
+	return *s;
+}
+
+void SciTEBase::PerformOne(char *action) {
+	const unsigned int len = UnSlash(action);
+	char *arg = strchr(action, ':');
+	if (arg) {
+		arg++;
+		if (isprefix(action, "askfilename:")) {
+			extender->OnMacro("filename", filePath.AsUTF8().c_str());
+		} else if (isprefix(action, "askproperty:")) {
+			PropertyToDirector(arg);
+		} else if (isprefix(action, "close:")) {
+			Close();
+			WindowSetFocus(wEditor);
+		} else if (isprefix(action, "currentmacro:")) {
+			currentMacro = arg;
+		} else if (isprefix(action, "cwd:")) {
+			FilePath dirTarget(GUI::StringFromUTF8(arg));
+			if (!dirTarget.SetWorkingDirectory()) {
+				GUI::gui_string msg = LocaliseMessage("Invalid directory '^0'.", dirTarget.AsInternal());
+				WindowMessageBox(wSciTE, msg);
+			}
+		} else if (isprefix(action, "enumproperties:")) {
+			EnumProperties(arg);
+		} else if (isprefix(action, "exportashtml:")) {
+			SaveToHTML(GUI::StringFromUTF8(arg));
+		} else if (isprefix(action, "exportasrtf:")) {
+			SaveToRTF(GUI::StringFromUTF8(arg));
+		} else if (isprefix(action, "exportaspdf:")) {
+			SaveToPDF(GUI::StringFromUTF8(arg));
+		} else if (isprefix(action, "exportaslatex:")) {
+			SaveToTEX(GUI::StringFromUTF8(arg));
+		} else if (isprefix(action, "exportasxml:")) {
+			SaveToXML(GUI::StringFromUTF8(arg));
+		} else if (isprefix(action, "find:") && wEditor.Created()) {
+			findWhat = arg;
+			FindNext(false, false);
+		} else if (isprefix(action, "goto:") && wEditor.Created()) {
+			const SA::Line line = IntegerFromText(arg) - 1;
+			GotoLineEnsureVisible(line);
+			// jump to column if given and greater than 0
+			const char *colstr = strchr(arg, ',');
+			if (colstr) {
+				const SA::Position col = IntegerFromText(colstr + 1);
+				if (col > 0) {
+					const SA::Position pos = wEditor.CurrentPos() + col;
+					// select the word you have found there
+					const SA::Position wordStart = wEditor.WordStartPosition(pos, true);
+					const SA::Position wordEnd = wEditor.WordEndPosition(pos, true);
+					wEditor.SetSel(wordStart, wordEnd);
+				}
+			}
+		} else if (isprefix(action, "insert:") && wEditor.Created()) {
+			wEditor.ReplaceSel(arg);
+		} else if (isprefix(action, "loadsession:")) {
+			if (*arg) {
+				LoadSessionFile(GUI::StringFromUTF8(arg).c_str());
+				RestoreSession();
+			}
+		} else if (isprefix(action, "macrocommand:")) {
+			ExecuteMacroCommand(arg);
+		} else if (isprefix(action, "macroenable:")) {
+			macrosEnabled = atoi(arg);
+			SetToolsMenu();
+		} else if (isprefix(action, "macrolist:")) {
+			StartMacroList(arg);
+		} else if (isprefix(action, "menucommand:")) {
+			MenuCommand(atoi(arg));
+		} else if (isprefix(action, "open:")) {
+			Open(GUI::StringFromUTF8(arg), ofSynchronous);
+		} else if (isprefix(action, "output:") && wOutput.Created()) {
+			wOutput.ReplaceSel(arg);
+		} else if (isprefix(action, "property:")) {
+			PropertyFromDirector(arg);
+		} else if (isprefix(action, "reloadproperties:")) {
+			ReloadProperties();
+		} else if (isprefix(action, "quit:")) {
+			QuitProgram();
+		} else if (isprefix(action, "replaceall:") && wEditor.Created()) {
+			if (len > strlen(action)) {
+				const char *arg2 = arg + strlen(arg) + 1;
+				findWhat = arg;
+				replaceWhat = arg2;
+				ReplaceAll(false);
+			}
+		} else if (isprefix(action, "saveas:")) {
+			if (*arg) {
+				SaveAs(GUI::StringFromUTF8(arg).c_str(), true);
+			} else {
+				SaveAsDialog();
+			}
+		} else if (isprefix(action, "savesession:")) {
+			if (*arg) {
+				SaveSessionFile(GUI::StringFromUTF8(arg).c_str());
+			}
+		} else if (isprefix(action, "setdefaultcwd:")) {
+			// This sets cwd to a value that should stay valid: either SciTE_HOME or the
+			// SciTE installation directory or directory of SciTE executable.
+			GetDefaultDirectory().SetWorkingDirectory();
+		} else if (isprefix(action, "extender:")) {
+			extender->OnExecute(arg);
+		} else if (isprefix(action, "focus:")) {
+			ActivateWindow(arg);
+		}
+	}
+}
+
+static constexpr bool IsSwitchCharacter(GUI::gui_char ch) noexcept {
+#if defined(__unix__) || defined(__APPLE__)
+	return ch == '-';
+#else
+	return (ch == '-') || (ch == '/');
+#endif
+}
+
+// Called by SciTEBase::PerformOne when action="enumproperties:"
+void SciTEBase::EnumProperties(const char *propkind) {
+	PropSetFile *pf = nullptr;
+
+	if (!extender)
+		return;
+	if (!strcmp(propkind, "dyn")) {
+		SelectionIntoProperties(); // Refresh properties ...
+		pf = &props;
+	} else if (!strcmp(propkind, "local"))
+		pf = &propsLocal;
+	else if (!strcmp(propkind, "directory"))
+		pf = &propsDirectory;
+	else if (!strcmp(propkind, "user"))
+		pf = &propsUser;
+	else if (!strcmp(propkind, "base"))
+		pf = &propsBase;
+	else if (!strcmp(propkind, "embed"))
+		pf = &propsEmbed;
+	else if (!strcmp(propkind, "platform"))
+		pf = &propsPlatform;
+	else if (!strcmp(propkind, "abbrev"))
+		pf = &propsAbbrev;
+
+	if (pf) {
+		const char *key = nullptr;
+		const char *val = nullptr;
+		bool b = pf->GetFirst(key, val);
+		while (b) {
+			SendOneProperty(propkind, key, val);
+			b = pf->GetNext(key, val);
+		}
+	}
+}
+
+void SciTEBase::SendOneProperty(const char *kind, const char *key, const char *val) {
+	std::string m = kind;
+	m += ":";
+	m += key;
+	m += "=";
+	m += val;
+	extender->SendProperty(m.c_str());
+}
+
+void SciTEBase::PropertyFromDirector(const char *arg) {
+	props.SetLine(arg);
+}
+
+void SciTEBase::PropertyToDirector(const char *arg) {
+	if (!extender)
+		return;
+	SelectionIntoProperties();
+	const std::string gotprop = props.GetString(arg);
+	extender->OnMacro("macro:stringinfo", gotprop.c_str());
+}
+
+/**
+ * Menu/Toolbar command "Record".
+ */
+void SciTEBase::StartRecordMacro() {
+	recording = true;
+	CheckMenus();
+	wEditor.StartRecord();
+}
+
+/**
+ * Received a Notification::MacroRecord from Scintilla: send it to director.
+ */
+bool SciTEBase::RecordMacroCommand(const SCNotification *notification) {
+	if (extender) {
+		std::string sMessage = StdStringFromInteger(notification->message);
+		sMessage += ";";
+		sMessage += std::to_string(notification->wParam);
+		sMessage += ";";
+		const char *t = reinterpret_cast<const char *>(notification->lParam);
+		if (t) {
+			//format : "<message>;<wParam>;1;<text>"
+			sMessage += "1;";
+			sMessage += t;
+		} else {
+			//format : "<message>;<wParam>;0;"
+			sMessage += "0;";
+		}
+		const bool handled = extender->OnMacro("macro:record", sMessage.c_str());
+		return handled;
+	}
+	return true;
+}
+
+/**
+ * Menu/Toolbar command "Stop recording".
+ */
+void SciTEBase::StopRecordMacro() {
+	wEditor.StopRecord();
+	if (extender)
+		extender->OnMacro("macro:stoprecord", "");
+	recording = false;
+	CheckMenus();
+}
+
+/**
+ * Menu/Toolbar command "Play macro...": tell director to build list of Macro names
+ * Through this call, user has access to all macros in Filerx.
+ */
+void SciTEBase::AskMacroList() {
+	if (extender)
+		extender->OnMacro("macro:getlist", "");
+}
+
+/**
+ * List of Macro names has been created. Ask Scintilla to show it.
+ */
+bool SciTEBase::StartMacroList(const char *words) {
+	if (words) {
+		wEditor.UserListShow(2, words); //listtype=2
+	}
+
+	return true;
+}
+
+/**
+ * User has chosen a macro in the list. Ask director to execute it.
+ */
+void SciTEBase::ContinueMacroList(const char *stext) {
+	if ((extender) && (*stext != '\0')) {
+		currentMacro = stext;
+		StartPlayMacro();
+	}
+}
+
+/**
+ * Menu/Toolbar command "Play current macro" (or called from ContinueMacroList).
+ */
+void SciTEBase::StartPlayMacro() {
+	if (extender)
+		extender->OnMacro("macro:run", currentMacro.c_str());
+}
+
+/*
+SciTE received a macro command from director : execute it.
+If command needs answer (SCI_GETTEXTLENGTH ...) : give answer to director
+*/
+
+static uintptr_t ReadNum(const char *&t) {
+	const char *argend = strchr(t, ';');	// find ';'
+	uintptr_t v = 0;
+	if (*t)
+		v = IntegerFromText(t);					// read value
+	t = (argend) ? (argend + 1) : nullptr;	// update pointer
+	return v;						// return value
+}
+
+void SciTEBase::ExecuteMacroCommand(const char *command) {
+	const char *nextarg = command;
+	uintptr_t wParam = 0;
+	intptr_t lParam = 0;
+	intptr_t rep = 0;				//Scintilla's answer
+	const char *answercmd = nullptr;
+	SA::Position l = 0;
+	std::string string1;
+	char params[4] = "";
+	// This code does not validate its input which may cause crashes when bad.
+	// 'params' describes types of return values and of arguments.
+	// There are exactly 3 characters: return type, wParam, lParam.
+	// 0 : void or no param
+	// I : integer
+	// S : string
+	// R : string (for wParam only)
+	// For example, "4004;0RS;fruit;mango" performs SCI_SETPROPERTY("fruit","mango") with no return
+
+	// Extract message, parameter specification, wParam, lParam
+
+	const SA::Message message = static_cast<SA::Message>(ReadNum(nextarg));
+	if (!nextarg) {
+		Trace("Malformed macro command.\n");
+		return;
+	}
+	strncpy(params, nextarg, 3);
+	params[3] = '\0';
+	nextarg += 4;
+	if (*(params + 1) == 'R') {
+		// in one function wParam is a string  : void SetProperty(string key,string name)
+		const char *s1 = nextarg;
+		while (*nextarg != ';')
+			nextarg++;
+		string1.assign(s1, nextarg - s1);
+		wParam = UptrFromString(string1.c_str());
+		nextarg++;
+	} else {
+		wParam = ReadNum(nextarg);
+	}
+
+	if (*(params + 2) == 'S')
+		lParam = SptrFromString(nextarg);
+	else if ((*(params + 2) == 'I') && nextarg)	// nextarg check avoids warning from clang analyze
+		lParam = IntegerFromText(nextarg);
+
+	if (*params == '0') {
+		// no answer ...
+		wEditor.Call(message, wParam, lParam);
+		return;
+	}
+
+	if (*params == 'S') {
+		// string answer
+		if (message == SA::Message::GetSelText) {
+			l = wEditor.GetSelText(nullptr);
+			wParam = 0;
+		} else if (message == SA::Message::GetCurLine) {
+			const SA::Line line = wEditor.LineFromPosition(wEditor.CurrentPos());
+			l = wEditor.LineLength(line);
+			wParam = l;
+		} else if (message == SA::Message::GetText) {
+			l = wEditor.Length();
+			wParam = l;
+		} else if (message == SA::Message::GetLine) {
+			l = wEditor.LineLength(wParam);
+		} else {
+			l = 0; //unsupported calls EM
+		}
+		answercmd = "stringinfo:";
+
+	} else {
+		//int answer
+		answercmd = "intinfo:";
+		l = 30;
+	}
+
+	std::string tbuff = answercmd;
+	const size_t alen = strlen(answercmd);
+	tbuff.resize(l + alen + 1);
+	if (*params == 'S')
+		lParam = SptrFromPointer(&tbuff[alen]);
+
+	if (l > 0)
+		rep = wEditor.Call(message, wParam, lParam);
+	if (*params == 'I') {
+		const std::string sRep = std::to_string(rep);
+		sprintf(&tbuff[alen], "%s", sRep.c_str());
+	}
+	extender->OnMacro("macro", tbuff.c_str());
+}
+
+/**
+ * Process all the command line arguments.
+ * Arguments that start with '-' (also '/' on Windows) are switches or commands with
+ * other arguments being file names which are opened. Commands are distinguished
+ * from switches by containing a ':' after the command name.
+ * The print switch /p is special cased.
+ * Processing occurs in two phases to allow switches that occur before any file opens
+ * to be evaluated before creating the UI.
+ * Call twice, first with phase=0, then with phase=1 after creating UI.
+ */
+bool SciTEBase::ProcessCommandLine(const GUI::gui_string &args, int phase) {
+	bool performPrint = false;
+	bool evaluate = phase == 0;
+	std::vector<GUI::gui_string> wlArgs = ListFromString(args);
+	// Convert args to vector
+	for (size_t i = 0; i < wlArgs.size(); i++) {
+		const GUI::gui_char *arg = wlArgs[i].c_str();
+		if (IsSwitchCharacter(arg[0])) {
+			arg++;
+			if (arg[0] == '\0' || (arg[0] == '-' && arg[1] == '\0')) {
+				if (phase == 1) {
+					OpenFromStdin(arg[0] == '-');
+				}
+			} else if (arg[0] == '@') {
+				if (phase == 1) {
+					OpenFilesFromStdin();
+				}
+			} else if ((arg[0] == 'p' || arg[0] == 'P') && (arg[1] == 0)) {
+				performPrint = true;
+			} else if (GUI::gui_string(arg) == GUI_TEXT("grep") && (wlArgs.size() - i >= 4) && (wlArgs[i+1].size() >= 4)) {
+				// in form -grep [w~][c~][d~][b~] "<file-patterns>" "<search-string>"
+				GrepFlags gf = grepStdOut;
+				if (wlArgs[i+1][0] == 'w')
+					gf = static_cast<GrepFlags>(gf | grepWholeWord);
+				if (wlArgs[i+1][1] == 'c')
+					gf = static_cast<GrepFlags>(gf | grepMatchCase);
+				if (wlArgs[i+1][2] == 'd')
+					gf = static_cast<GrepFlags>(gf | grepDot);
+				if (wlArgs[i+1][3] == 'b')
+					gf = static_cast<GrepFlags>(gf | grepBinary);
+				std::string sSearch = GUI::UTF8FromString(wlArgs[i+3]);
+				std::string unquoted = UnSlashString(sSearch.c_str());
+				SA::Position originalEnd = 0;
+				InternalGrep(gf, FilePath::GetWorkingDirectory().AsInternal(), wlArgs[i+2].c_str(), unquoted.c_str(), originalEnd);
+				exit(0);
+			} else {
+				if (AfterName(arg) == ':') {
+					if (StartsWith(arg, GUI_TEXT("open:")) || StartsWith(arg, GUI_TEXT("loadsession:"))) {
+						if (phase == 0)
+							return performPrint;
+						else
+							evaluate = true;
+					}
+					if (evaluate) {
+						const std::string sArg = GUI::UTF8FromString(arg);
+						std::vector<char> vcArg(sArg.size() + 1);
+						std::copy(sArg.begin(), sArg.end(), vcArg.begin());
+						PerformOne(&vcArg[0]);
+					}
+				} else {
+					if (evaluate) {
+						props.ReadLine(GUI::UTF8FromString(arg).c_str(), PropSetFile::rlActive,
+							       FilePath::GetWorkingDirectory(), filter, nullptr, 0);
+					}
+				}
+			}
+		} else {	// Not a switch: it is a file name
+			if (phase == 0)
+				return performPrint;
+			else
+				evaluate = true;
+
+			if (!buffers.initialised) {
+				InitialiseBuffers();
+				if (props.GetInt("save.recent"))
+					RestoreRecentMenu();
+			}
+
+			if (!PreOpenCheck(arg))
+				Open(arg, static_cast<OpenFlags>(ofQuiet|ofSynchronous));
+		}
+	}
+	if (phase == 1) {
+		// If we have finished with all args and no buffer is open
+		// try to load session.
+		if (!buffers.initialised) {
+			InitialiseBuffers();
+			if (props.GetInt("save.recent"))
+				RestoreRecentMenu();
+			if (props.GetInt("buffers") && props.GetInt("save.session"))
+				RestoreSession();
+		}
+		// No open file after session load so create empty document.
+		if (filePath.IsUntitled() && buffers.length == 1 && !buffers.buffers[0].isDirty) {
+			Open(FilePath());
+		}
+	}
+	return performPrint;
+}
+
+// Implement ExtensionAPI methods
+intptr_t SciTEBase::Send(Pane p, SA::Message msg, uintptr_t wParam, intptr_t lParam) {
+	if (p == paneEditor)
+		return wEditor.Call(msg, wParam, lParam);
+	else
+		return wOutput.Call(msg, wParam, lParam);
+}
+std::string SciTEBase::Range(Pane p, SA::Span range) {
+	if (p == paneEditor)
+		return wEditor.StringOfSpan(range);
+	else
+		return wOutput.StringOfSpan(range);
+}
+void SciTEBase::Remove(Pane p, SA::Position start, SA::Position end) {
+	if (p == paneEditor) {
+		wEditor.DeleteRange(start, end-start);
+	} else {
+		wOutput.DeleteRange(start, end-start);
+	}
+}
+
+void SciTEBase::Insert(Pane p, SA::Position pos, const char *s) {
+	if (p == paneEditor)
+		wEditor.InsertText(pos, s);
+	else
+		wOutput.InsertText(pos, s);
+}
+
+void SciTEBase::Trace(const char *s) {
+	ShowOutputOnMainThread();
+	OutputAppendStringSynchronised(s);
+}
+
+std::string SciTEBase::Property(const char *key) {
+	return props.GetExpandedString(key);
+}
+
+void SciTEBase::SetProperty(const char *key, const char *val) {
+	const std::string value = props.GetExpandedString(key);
+	if (value != val) {
+		props.Set(key, val);
+		needReadProperties = true;
+	}
+}
+
+void SciTEBase::UnsetProperty(const char *key) {
+	props.Unset(key);
+	needReadProperties = true;
+}
+
+uintptr_t SciTEBase::GetInstance() {
+	return 0;
+}
+
+void SciTEBase::ShutDown() {
+	QuitProgram();
+}
+
+void SciTEBase::Perform(const char *actionList) {
+	std::vector<char> vActions(actionList, actionList + strlen(actionList) + 1);
+	char *actions = &vActions[0];
+	char *nextAct;
+	while ((nextAct = strchr(actions, '\n')) != nullptr) {
+		*nextAct = '\0';
+		PerformOne(actions);
+		actions = nextAct + 1;
+	}
+	PerformOne(actions);
+}
+
+void SciTEBase::DoMenuCommand(int cmdID) {
+	MenuCommand(cmdID, 0);
+}
+
+SA::ScintillaCall &SciTEBase::PaneCaller(Pane p) noexcept {
+	if (p == paneEditor)
+		return wEditor;
+	else
+		return wOutput;
+}
+
+void SciTEBase::SetFindInFilesOptions() {
+	const std::string wholeWordName = std::string("find.option.wholeword.") + StdStringFromInteger(wholeWord);
+	props.Set("find.wholeword", props.GetNewExpandString(wholeWordName.c_str()));
+	const std::string matchCaseName = std::string("find.option.matchcase.") + StdStringFromInteger(matchCase);
+	props.Set("find.matchcase", props.GetNewExpandString(matchCaseName.c_str()));
+}
diff --git a/scite-app/scite/src/SciTEBase.h b/scite-app/scite/src/SciTEBase.h
new file mode 100644
index 0000000..8f0ccc0
--- /dev/null
+++ b/scite-app/scite/src/SciTEBase.h
@@ -0,0 +1,1032 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEBase.h
+ ** Definition of platform independent base class of editor.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCITEBASE_H
+#define SCITEBASE_H
+
+extern const GUI::gui_char appName[];
+
+extern const GUI::gui_char propUserFileName[];
+extern const GUI::gui_char propGlobalFileName[];
+extern const GUI::gui_char propAbbrevFileName[];
+
+constexpr int IntFromTwoShorts(short a, short b) noexcept {
+	return (a) | ((b) << 16);
+}
+
+/**
+ * The order of menus on Windows - the Buffers menu may not be present
+ * and there is a Help menu at the end.
+ */
+enum {
+	menuFile = 0, menuEdit = 1, menuSearch = 2, menuView = 3,
+	menuTools = 4, menuOptions = 5, menuLanguage = 6, menuBuffers = 7,
+	menuHelp = 8
+};
+
+namespace SA = Scintilla;
+
+constexpr int StyleMax = static_cast<int>(SA::StylesCommon::Max);
+constexpr int StyleDefault = static_cast<int>(SA::StylesCommon::Default);
+
+struct SelectedRange {
+	SA::Position position;
+	SA::Position anchor;
+	SelectedRange(SA::Position position_= SA::InvalidPosition, SA::Position anchor_= SA::InvalidPosition) noexcept :
+		position(position_), anchor(anchor_) {
+	}
+};
+
+class RecentFile : public FilePath {
+public:
+	SelectedRange selection;
+	SA::Line scrollPosition;
+	RecentFile() {
+		scrollPosition = 0;
+	}
+	RecentFile(const FilePath &path_, SelectedRange selection_, SA::Line scrollPosition_) :
+		FilePath(path_), selection(selection_), scrollPosition(scrollPosition_) {
+	}
+	RecentFile(RecentFile const &) = default;
+	RecentFile(RecentFile &&) = default;
+	RecentFile &operator=(RecentFile const &) = default;
+	RecentFile &operator=(RecentFile &&) = default;
+	~RecentFile() override = default;
+	void Init() noexcept override {
+		FilePath::Init();
+		selection.position = SA::InvalidPosition;
+		selection.anchor = SA::InvalidPosition;
+		scrollPosition = 0;
+	}
+};
+
+struct BufferState {
+public:
+	RecentFile file;
+	std::vector<SA::Line> foldState;
+	std::vector<SA::Line> bookmarks;
+};
+
+class Session {
+public:
+	FilePath pathActive;
+	std::vector<BufferState> buffers;
+};
+
+struct FileWorker;
+
+class Buffer {
+public:
+	RecentFile file;
+	void *doc;
+	bool isDirty;
+	bool isReadOnly;
+	bool failedSave;
+	bool useMonoFont;
+	enum { empty, reading, readAll, opened } lifeState;
+	UniMode unicodeMode;
+	time_t fileModTime;
+	time_t fileModLastAsk;
+	time_t documentModTime;
+	enum { fmNone, fmTemporary, fmMarked, fmModified} findMarks;
+	std::string overrideExtension;	///< User has chosen to use a particular language
+	std::vector<SA::Line> foldState;
+	std::vector<SA::Line> bookmarks;
+	FileWorker *pFileWorker;
+	PropSetFile props;
+	enum FutureDo { fdNone=0, fdFinishSave=1 } futureDo;
+	Buffer() :
+		file(), doc(nullptr), isDirty(false), isReadOnly(false), failedSave(false), useMonoFont(false), lifeState(empty),
+		unicodeMode(uni8Bit), fileModTime(0), fileModLastAsk(0), documentModTime(0),
+		findMarks(fmNone), pFileWorker(nullptr), futureDo(fdNone) {}
+
+	~Buffer() = default;
+	void Init() {
+		file.Init();
+		isDirty = false;
+		isReadOnly = false;
+		failedSave = false;
+		useMonoFont = false;
+		lifeState = empty;
+		unicodeMode = uni8Bit;
+		fileModTime = 0;
+		fileModLastAsk = 0;
+		documentModTime = 0;
+		findMarks = fmNone;
+		overrideExtension = "";
+		foldState.clear();
+		bookmarks.clear();
+		pFileWorker = nullptr;
+		futureDo = fdNone;
+	}
+
+	void SetTimeFromFile() {
+		fileModTime = file.ModifiedTime();
+		fileModLastAsk = fileModTime;
+		documentModTime = fileModTime;
+		failedSave = false;
+	}
+
+	void DocumentModified() noexcept;
+	bool NeedsSave(int delayBeforeSave) const;
+
+	void CompleteLoading() noexcept;
+	void CompleteStoring();
+	void AbandonAutomaticSave();
+
+	bool ShouldNotSave() const noexcept {
+		return lifeState != opened;
+	}
+
+	void CancelLoad();
+};
+
+struct BackgroundActivities {
+	int loaders;
+	int storers;
+	size_t totalWork;
+	size_t totalProgress;
+	GUI::gui_string fileNameLast;
+};
+
+class BufferList {
+protected:
+	int current;
+	int stackcurrent;
+	std::vector<int> stack;
+public:
+	std::vector<Buffer> buffers;
+	int length;
+	int lengthVisible;
+	bool initialised;
+
+	BufferList();
+	~BufferList();
+	int size() const noexcept {
+		return static_cast<int>(buffers.size());
+	}
+	void Allocate(int maxSize);
+	int Add();
+	int GetDocumentByWorker(const FileWorker *pFileWorker) const;
+	int GetDocumentByName(const FilePath &filename, bool excludeCurrent=false);
+	void RemoveInvisible(int index);
+	void RemoveCurrent();
+	int Current() const noexcept;
+	Buffer *CurrentBuffer();
+	const Buffer *CurrentBufferConst() const;
+	void SetCurrent(int index) noexcept;
+	int StackNext();
+	int StackPrev();
+	void CommitStackSelection();
+	void MoveToStackTop(int index);
+	void ShiftTo(int indexFrom, int indexTo);
+	void Swap(int indexA, int indexB);
+	bool SingleBuffer() const noexcept;
+	BackgroundActivities CountBackgroundActivities() const;
+	bool SavingInBackground() const;
+	bool GetVisible(int index) const noexcept;
+	void SetVisible(int index, bool visible);
+	void AddFuture(int index, Buffer::FutureDo fd);
+	void FinishedFuture(int index, Buffer::FutureDo fd);
+private:
+	void PopStack();
+};
+
+// class to hold user defined keyboard short cuts
+class ShortcutItem {
+public:
+	std::string menuKey; // the keyboard short cut
+	std::string menuCommand; // the menu command to be passed to "SciTEBase::MenuCommand"
+};
+
+class LanguageMenuItem {
+public:
+	std::string menuItem;
+	std::string menuKey;
+	std::string extension;
+};
+
+enum {
+	heightTools = 24,
+	heightToolsBig = 32,
+	heightTab = 24,
+	heightStatus = 20,
+	statusPosWidth = 256
+};
+
+/// Warning IDs.
+enum {
+	warnFindWrapped = 1,
+	warnNotFound,
+	warnNoOtherBookmark,
+	warnWrongFile,
+	warnExecuteOK,
+	warnExecuteKO
+};
+
+/// Codes representing the effect a line has on indentation.
+enum IndentationStatus {
+	isNone,		// no effect on indentation
+	isBlockStart,	// indentation block begin such as "{" or VB "function"
+	isBlockEnd,	// indentation end indicator such as "}" or VB "end"
+	isKeyWordStart	// Keywords that cause indentation
+};
+
+struct StyleAndWords {
+	int styleNumber;
+	std::string words;
+	StyleAndWords() noexcept : styleNumber(0) {
+	}
+	bool IsEmpty() const noexcept { return words.length() == 0; }
+	bool IsSingleChar() const noexcept { return words.length() == 1; }
+};
+
+struct CurrentWordHighlight {
+	enum {
+		noDelay,            // No delay, and no word at the caret.
+		delay,              // Delay before to highlight the word at the caret.
+		delayJustEnded,     // Delay has just ended. This state allows to ignore next HighlightCurrentWord (UpdateUI and SC_UPDATE_CONTENT for setting indicators).
+		delayAlreadyElapsed // Delay has already elapsed, word at the caret and occurrences are (or have to be) highlighted.
+	} statesOfDelay;
+	bool isEnabled;
+	bool textHasChanged;
+	GUI::ElapsedTime elapsedTimes;
+	bool isOnlyWithSameStyle;
+
+	CurrentWordHighlight() {
+		statesOfDelay = noDelay;
+		isEnabled = false;
+		textHasChanged = false;
+		isOnlyWithSameStyle = false;
+	}
+};
+
+class Localization : public PropSetFile, public ILocalize {
+	std::string missing;
+public:
+	bool read;
+	Localization() : PropSetFile(true), read(false) {
+	}
+	GUI::gui_string Text(const char *s, bool retainIfNotFound=true) override;
+	void SetMissing(const std::string &missing_) {
+		missing = missing_;
+	}
+};
+
+// Interface between SciTE and dialogs and strips for find and replace
+class Searcher {
+public:
+	std::string findWhat;
+	std::string replaceWhat;
+
+	bool wholeWord;
+	bool matchCase;
+	bool regExp;
+	bool unSlash;
+	bool wrapFind;
+	bool reverseFind;
+
+	SA::Position searchStartPosition;
+	bool replacing;
+	bool havefound;
+	bool failedfind;
+	bool findInStyle;
+	int findStyle;
+	enum class CloseFind { closePrevent, closeAlways, closeOnMatch } closeFind;
+	ComboMemory memFinds;
+	ComboMemory memReplaces;
+
+	bool focusOnReplace;
+
+	Searcher();
+
+	virtual void SetFindText(const char *sFind) = 0;
+	virtual void SetFind(const char *sFind) = 0;
+	virtual bool FindHasText() const noexcept = 0;
+	void InsertFindInMemory();
+	virtual void SetReplace(const char *sReplace) = 0;
+	virtual void SetCaretAsStart() = 0;
+	virtual void MoveBack() = 0;
+	virtual void ScrollEditorIfNeeded() = 0;
+
+	virtual SA::Position FindNext(bool reverseDirection, bool showWarnings=true, bool allowRegExp=true) = 0;
+	virtual void HideMatch() = 0;
+	enum MarkPurpose { markWithBookMarks, markIncremental };
+	virtual void MarkAll(MarkPurpose purpose=markWithBookMarks) = 0;
+	virtual intptr_t ReplaceAll(bool inSelection) = 0;
+	virtual void ReplaceOnce(bool showWarnings=true) = 0;
+	virtual void UIClosed() = 0;
+	virtual void UIHasFocus() = 0;
+	bool &FlagFromCmd(int cmd) noexcept;
+	bool ShouldClose(bool found) const noexcept {
+		return (closeFind == CloseFind::closeAlways) || (found && (closeFind == CloseFind::closeOnMatch));
+	}
+};
+
+// User interface for search options implemented as both buttons and popup menu items
+struct SearchOption {
+	enum { tWord, tCase, tRegExp, tBackslash, tWrap, tUp };
+	const char *label;
+	int cmd;	// Menu item
+	int id;	// Control in dialog
+};
+
+class SearchUI {
+protected:
+	Searcher *pSearcher;
+public:
+	SearchUI() noexcept : pSearcher(nullptr) {
+	}
+	void SetSearcher(Searcher *pSearcher_) noexcept {
+		pSearcher = pSearcher_;
+	}
+};
+
+class IEditorConfig;
+struct SCNotification;
+
+struct SystemAppearance {
+	bool dark;
+	bool highContrast;
+	bool operator==(const SystemAppearance &other) const noexcept {
+		return dark == other.dark && highContrast == other.highContrast;
+	}
+};
+
+// Titles appear different in menus and tabs
+enum class Title { menu, tab };
+
+class SciTEBase : public ExtensionAPI, public Searcher, public WorkerListener {
+protected:
+	bool needIdle;
+	GUI::gui_string windowName;
+	FilePath filePath;
+	FilePath dirNameAtExecute;
+	FilePath dirNameForExecute;
+
+	static constexpr int fileStackMax = 10;
+	RecentFile recentFileStack[fileStackMax];
+	enum { fileStackCmdID = IDM_MRUFILE, bufferCmdID = IDM_BUFFER };
+
+	static constexpr int importMax = 50;
+	FilePathSet importFiles;
+	enum { importCmdID = IDM_IMPORT };
+	ImportFilter filter;
+
+	enum { indicatorMatch = static_cast<int>(SA::IndicatorNumbers::Container),
+	       indicatorHighlightCurrentWord,
+	       indicatorSpellingMistake,
+	       indicatorSentinel
+	     };
+	enum { markerBookmark = 1 };
+	ComboMemory memFiles;
+	ComboMemory memDirectory;
+	std::string parameterisedCommand;
+	std::string abbrevInsert;
+
+	enum { languageCmdID = IDM_LANGUAGE };
+	std::vector<LanguageMenuItem> languageMenu;
+
+	// an array of short cut items that are defined by the user in the properties file.
+	std::vector<ShortcutItem> shortCutItemList;
+
+	int codePage;
+	SA::CharacterSet characterSet;
+	std::string language;
+	int lexLanguage;
+	std::string subStyleBases;
+	StringList apis;
+	std::string apisFileNames;
+	std::string functionDefinition;
+
+	int diagnosticStyleStart;
+	enum { diagnosticStyles=4};
+
+	bool stripTrailingSpaces;
+	bool ensureFinalLineEnd;
+	bool ensureConsistentLineEnds;
+
+	bool indentOpening;
+	bool indentClosing;
+	bool indentMaintain;
+	int statementLookback;
+	StyleAndWords statementIndent;
+	StyleAndWords statementEnd;
+	StyleAndWords blockStart;
+	StyleAndWords blockEnd;
+	enum class PreProc { None, Start, Middle, End, Dummy };	///< Indicate the kind of preprocessor condition line
+	char preprocessorSymbol;	///< Preprocessor symbol (in C, #)
+	std::map<std::string, PreProc> preprocOfString; ///< Map preprocessor keywords to positions
+	/// In C, if ifdef ifndef : start, else elif : middle, endif : end.
+
+	GUI::Window wSciTE;  ///< Contains wToolBar, wTabBar, wContent, and wStatusBar
+	GUI::Window wContent;    ///< Contains wEditor and wOutput
+	GUI::ScintillaWindow wEditor;
+	GUI::ScintillaWindow wOutput;
+	GUI::ScintillaWindow *pwFocussed;
+	GUI::Window wIncrement;
+	GUI::Window wToolBar;
+	GUI::Window wStatusBar;
+	GUI::Window wTabBar;
+	GUI::Menu popup;
+	bool tbVisible;
+	bool tabVisible;
+	bool tabHideOne; // Hide tab bar if one buffer is opened only
+	bool tabMultiLine;
+	bool sbVisible;	///< @c true if status bar is visible.
+	std::string sbValue;	///< Status bar text.
+	int sbNum;	///< Number of the currently displayed status bar information.
+	int visHeightTools;
+	int visHeightTab;
+	int visHeightStatus;
+	int visHeightEditor;
+	int heightBar;
+	// Prevent automatic load dialog appearing at the same time as
+	// other dialogs as this can leads to reentry errors.
+	int dialogsOnScreen;
+	bool topMost;
+	bool wrap;
+	bool wrapOutput;
+	SA::Wrap wrapStyle;
+	SA::IdleStyling idleStyling;
+	SA::Alpha alphaIndicator;
+	bool underIndicator;
+	std::string foldColour;
+	std::string foldHiliteColour;
+	bool openFilesHere;
+	bool fullScreen;
+	SystemAppearance appearance;
+	enum { toolMax = 50 };
+	Extension *extender;
+	bool needReadProperties;
+	bool quitting;
+
+	int timerMask;
+	enum { timerAutoSave=1 };
+	int delayBeforeAutoSave;
+
+	int heightOutput;
+	int heightOutputStartDrag;
+	GUI::Point ptStartDrag;
+	bool capturedMouse;
+	int previousHeightOutput;
+	bool firstPropertiesRead;
+	bool splitVertical;	///< @c true if the split bar between editor and output is vertical.
+	bool bufferedDraw;
+	bool bracesCheck;
+	bool bracesSloppy;
+	int bracesStyle;
+	int braceCount;
+
+	int indentationWSVisible;
+	SA::IndentView indentExamine;
+	bool autoCompleteIgnoreCase;
+	bool imeAutoComplete;
+	bool callTipUseEscapes;
+	bool callTipIgnoreCase;
+	bool autoCCausedByOnlyOne;
+	int autoCompleteVisibleItemCount;
+	std::string calltipWordCharacters;
+	std::string calltipParametersStart;
+	std::string calltipParametersEnd;
+	std::string calltipParametersSeparators;
+	std::string calltipEndDefinition;
+	std::string autoCompleteStartCharacters;
+	std::string autoCompleteFillUpCharacters;
+	std::string autoCompleteTypeSeparator;
+	std::string wordCharacters;
+	std::string whitespaceCharacters;
+	SA::Position startCalltipWord;
+	int currentCallTip;
+	int maxCallTips;
+	std::string currentCallTipWord;
+	SA::Position lastPosCallTip;
+
+	bool margin;
+	int marginWidth;
+	enum { marginWidthDefault = 20};
+
+	bool foldMargin;
+	int foldMarginWidth;
+	enum { foldMarginWidthDefault = 14};
+
+	bool lineNumbers;
+	int lineNumbersWidth;
+	enum { lineNumbersWidthDefault = 4 };
+	bool lineNumbersExpand;
+
+	bool allowMenuActions;
+	int scrollOutput;
+	bool returnOutputToCommand;
+	JobQueue jobQueue;
+
+	bool macrosEnabled;
+	std::string currentMacro;
+	bool recording;
+
+	PropSetFile propsPlatform;
+	PropSetFile propsEmbed;
+	PropSetFile propsBase;
+	PropSetFile propsUser;
+	PropSetFile propsDirectory;
+	PropSetFile propsLocal;
+	PropSetFile propsDiscovered;
+	PropSetFile props;
+
+	PropSetFile propsAbbrev;
+
+	PropSetFile propsSession;
+
+	FilePath pathAbbreviations;
+
+	Localization localiser;
+
+	PropSetFile propsStatus;
+
+	std::unique_ptr<IEditorConfig> editorConfig;
+
+	enum { bufferMax = IDM_IMPORT - IDM_BUFFER };
+	BufferList buffers;
+
+	// Handle buffers
+	void *GetDocumentAt(int index);
+	void SwitchDocumentAt(int index, void *pdoc);
+	void UpdateBuffersCurrent();
+	bool IsBufferAvailable() const noexcept;
+	bool CanMakeRoom(bool maySaveIfDirty = true);
+	void SetDocumentAt(int index, bool updateStack = true);
+	Buffer *CurrentBuffer() {
+		return buffers.CurrentBuffer();
+	}
+	const Buffer *CurrentBufferConst() const {
+		return buffers.CurrentBufferConst();
+	}
+	void SetBuffersMenu();
+	void BuffersMenu();
+	void Next();
+	void Prev();
+	void NextInStack();
+	void PrevInStack();
+	void EndStackedTabbing();
+
+	virtual void UpdateTabs(const std::vector<GUI::gui_string> &tabNames);
+	virtual void TabInsert(int index, const GUI::gui_char *title) = 0;
+	virtual void TabSelect(int index) = 0;
+	virtual void RemoveAllTabs() = 0;
+	void ShiftTab(int indexFrom, int indexTo);
+	void MoveTabRight();
+	void MoveTabLeft();
+
+	virtual void ReadEmbeddedProperties();
+	void ReadEnvironment();
+	void ReadGlobalPropFile();
+	void ReadAbbrevPropFile();
+	void ReadLocalPropFile();
+	void ReadDirectoryPropFile();
+
+	virtual SystemAppearance CurrentAppearance() const noexcept;
+	void CheckAppearanceChanged();
+	void SetPaneFocus(bool editPane) noexcept;
+	GUI::ScintillaWindow &PaneFocused();
+	GUI::ScintillaWindow &PaneSource(int destination);
+	intptr_t CallFocusedElseDefault(int defaultValue, SA::Message msg, uintptr_t wParam = 0, intptr_t lParam = 0);
+	void CallChildren(SA::Message msg, uintptr_t wParam = 0, intptr_t lParam = 0);
+	std::string GetTranslationToAbout(const char *const propname, bool retainIfNotFound = true);
+	SA::Position LengthDocument();
+	SA::Position GetCaretInLine();
+	std::string GetLine(SA::Line line);
+	std::string GetCurrentLine();
+	PreProc LinePreprocessorCondition(SA::Line line);
+	bool FindMatchingPreprocessorCondition(SA::Line &curLine, int direction, PreProc condEnd1, PreProc condEnd2);
+	bool FindMatchingPreprocCondPosition(bool isForward, SA::Position mppcAtCaret, SA::Position &mppcMatch);
+	bool FindMatchingBracePosition(bool editor, SA::Position &braceAtCaret, SA::Position &braceOpposite, bool sloppy);
+	void BraceMatch(bool editor);
+
+	virtual void WarnUser(int warnID) = 0;
+	void SetWindowName();
+	void SetFileName(const FilePath &openName, bool fixCase = true);
+	FilePath FileNameExt() const {
+		return filePath.Name();
+	}
+	void ClearDocument();
+	void CreateBuffers();
+	void InitialiseBuffers();
+	FilePath UserFilePath(const GUI::gui_char *name);
+	void LoadSessionFile(const GUI::gui_char *sessionName);
+	void RestoreRecentMenu();
+	void RestoreFromSession(const Session &session);
+	void RestoreSession();
+	void SaveSessionFile(const GUI::gui_char *sessionName);
+	virtual void GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) = 0;
+	void SetIndentSettings();
+	void SetEol();
+	void New();
+	void RestoreState(const Buffer &buffer, bool restoreBookmarks);
+	void Close(bool updateUI = true, bool loadingSession = false, bool makingRoomForNew = false);
+	static bool Exists(const GUI::gui_char *dir, const GUI::gui_char *path, FilePath *resultPath);
+	void DiscoverEOLSetting();
+	void DiscoverIndentSetting();
+	std::string DiscoverLanguage();
+	void OpenCurrentFile(long long fileSize, bool suppressMessage, bool asynchronous);
+	virtual void OpenUriList(const char *) {}
+	virtual bool OpenDialog(const FilePath &directory, const GUI::gui_char *filesFilter) = 0;
+	virtual bool SaveAsDialog() = 0;
+	virtual void LoadSessionDialog() {}
+	virtual void SaveSessionDialog() {}
+	void CountLineEnds(int &linesCR, int &linesLF, int &linesCRLF);
+	enum OpenFlags {
+		ofNone = 0, 		// Default
+		ofNoSaveIfDirty = 1, 	// Suppress check for unsaved changes
+		ofForceLoad = 2,	// Reload file even if already in a buffer
+		ofPreserveUndo = 4,	// Do not delete undo history
+		ofQuiet = 8,		// Avoid "Could not open file" message
+		ofSynchronous = 16	// Force synchronous read
+	};
+	void TextRead(FileWorker *pFileWorker);
+	void TextWritten(FileWorker *pFileWorker);
+	void UpdateProgress(Worker *pWorker);
+	void PerformDeferredTasks();
+	enum OpenCompletion { ocSynchronous, ocCompleteCurrent, ocCompleteSwitch };
+	void CompleteOpen(OpenCompletion oc);
+	virtual bool PreOpenCheck(const GUI::gui_char *file);
+	bool Open(const FilePath &file, OpenFlags of = ofNone);
+	bool OpenSelected();
+	void Revert();
+	FilePath SaveName(const char *ext) const;
+	enum SaveFlags {
+		sfNone = 0, 		// Default
+		sfProgressVisible = 1, 	// Show in background save strip
+		sfSynchronous = 16	// Write synchronously blocking UI
+	};
+	enum SaveResult {
+		saveCompleted,
+		saveCancelled
+	};
+	SaveResult SaveIfUnsure(bool forceQuestion = false, SaveFlags sf = sfProgressVisible);
+	SaveResult SaveIfUnsureAll();
+	SaveResult SaveIfUnsureForBuilt();
+	bool SaveIfNotOpen(const FilePath &destFile, bool fixCase);
+	void AbandonAutomaticSave();
+	virtual bool Save(SaveFlags sf = sfProgressVisible);
+	void SaveAs(const GUI::gui_char *file, bool fixCase);
+	virtual void SaveACopy() = 0;
+	void SaveToHTML(const FilePath &saveName);
+	void StripTrailingSpaces();
+	void EnsureFinalNewLine();
+	bool PrepareBufferForSave(const FilePath &saveName);
+	bool SaveBuffer(const FilePath &saveName, SaveFlags sf);
+	virtual void SaveAsHTML() = 0;
+	void SaveToStreamRTF(std::ostream &os, SA::Position start = 0, SA::Position end = -1);
+	void SaveToRTF(const FilePath &saveName, SA::Position start = 0, SA::Position end = -1);
+	virtual void SaveAsRTF() = 0;
+	void SaveToPDF(const FilePath &saveName);
+	virtual void SaveAsPDF() = 0;
+	void SaveToTEX(const FilePath &saveName);
+	virtual void SaveAsTEX() = 0;
+	void SaveToXML(const FilePath &saveName);
+	virtual void SaveAsXML() = 0;
+	virtual FilePath GetDefaultDirectory() = 0;
+	virtual FilePath GetSciteDefaultHome() = 0;
+	virtual FilePath GetSciteUserHome() = 0;
+	FilePath GetDefaultPropertiesFileName();
+	FilePath GetUserPropertiesFileName();
+	FilePath GetDirectoryPropertiesFileName();
+	FilePath GetLocalPropertiesFileName();
+	FilePath GetAbbrevPropertiesFileName();
+	void OpenProperties(int propsFile);
+	static int GetMenuCommandAsInt(std::string commandName);
+	virtual void Print(bool) {}
+	virtual void PrintSetup() {}
+	void UserStripShow(const char * /* description */) override {}
+	void UserStripSet(int /* control */, const char * /* value */) override {}
+	void UserStripSetList(int /* control */, const char * /* value */) override {}
+	std::string UserStripValue(int /* control */) override { return std::string(); }
+	virtual void ShowBackgroundProgress(const GUI::gui_string & /* explanation */, size_t /* size */, size_t /* progress */) {}
+	SA::Span GetSelection();
+	SelectedRange GetSelectedRange();
+	void SetSelection(SA::Position anchor, SA::Position currentPos);
+	std::string GetCTag();
+	virtual std::string GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span span);
+	static std::string GetLine(GUI::ScintillaWindow &win, SA::Line line);
+	void RangeExtend(GUI::ScintillaWindow &wCurrent, SA::Span &range,
+			 bool (SciTEBase::*ischarforsel)(char ch));
+	std::string RangeExtendAndGrab(GUI::ScintillaWindow &wCurrent, SA::Span &span,
+				       bool (SciTEBase::*ischarforsel)(char ch), bool stripEol = true);
+	std::string SelectionExtend(bool (SciTEBase::*ischarforsel)(char ch), bool stripEol = true);
+	std::string SelectionWord(bool stripEol = true);
+	std::string SelectionFilename();
+	void SelectionIntoProperties();
+	void SelectionIntoFind(bool stripEol = true);
+	enum AddSelection { addNext, addEach };
+	void SelectionAdd(AddSelection add);
+	virtual std::string EncodeString(const std::string &s);
+	virtual void Find() = 0;
+	enum MessageBoxChoice {
+		mbOK,
+		mbCancel,
+		mbYes,
+		mbNo
+	};
+	typedef int MessageBoxStyle;
+	enum {
+		// Same as Win32 MB_*
+		mbsOK = 0,
+		mbsYesNo = 4,
+		mbsYesNoCancel = 3,
+		mbsIconQuestion = 0x20,
+		mbsIconWarning = 0x30
+	};
+	virtual MessageBoxChoice WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, MessageBoxStyle style = mbsIconWarning) = 0;
+	void FailedSaveMessageBox(const FilePath &filePathSaving);
+	virtual void FindMessageBox(const std::string &msg, const std::string *findItem = nullptr) = 0;
+	bool FindReplaceAdvanced() const;
+	SA::Position FindInTarget(const std::string &findWhatText, SA::Span range);
+	// Implement Searcher
+	void SetFindText(const char *sFind) override;
+	void SetFind(const char *sFind) override;
+	bool FindHasText() const noexcept override;
+	void SetReplace(const char *sReplace) override;
+	void SetCaretAsStart() override;
+	void MoveBack() override;
+	void ScrollEditorIfNeeded() override;
+	SA::Position FindNext(bool reverseDirection, bool showWarnings=true, bool allowRegExp=true) override;
+	void HideMatch() override;
+	virtual void FindIncrement() = 0;
+	int IncrementSearchMode();
+	virtual void FindInFiles() = 0;
+	virtual void Replace() = 0;
+	void ReplaceOnce(bool showWarnings=true) override;
+	intptr_t DoReplaceAll(bool inSelection); // returns number of replacements or negative value if error
+	intptr_t ReplaceAll(bool inSelection) override;
+	intptr_t ReplaceInBuffers();
+	void SetFindInFilesOptions();
+	void UIClosed() override;
+	void UIHasFocus() override;
+	virtual void DestroyFindReplace() = 0;
+	virtual void GoLineDialog() = 0;
+	virtual bool AbbrevDialog() = 0;
+	virtual void TabSizeDialog() = 0;
+	virtual bool ParametersOpen() = 0;
+	virtual void ParamGrab() = 0;
+	virtual bool ParametersDialog(bool modal) = 0;
+	bool HandleXml(char ch);
+	static std::string FindOpenXmlTag(const char sel[], SA::Position nSize);
+	void GoMatchingBrace(bool select);
+	void GoMatchingPreprocCond(int direction, bool select);
+	virtual void FindReplace(bool replace) = 0;
+	void OutputAppendString(const char *s, SA::Position len = -1);
+	virtual void OutputAppendStringSynchronised(const char *s, SA::Position len = -1);
+	virtual void Execute();
+	virtual void StopExecute() = 0;
+	void ShowMessages(SA::Line line);
+	void GoMessage(int dir);
+	virtual bool StartCallTip();
+	std::string GetNearestWords(const char *wordStart, size_t searchLen,
+				    const char *separators, bool ignoreCase=false, bool exactLen=false);
+	virtual void FillFunctionDefinition(SA::Position pos = -1);
+	void ContinueCallTip();
+	std::string EliminateDuplicateWords(const std::string &words);
+	virtual bool StartAutoComplete();
+	virtual bool StartAutoCompleteWord(bool onlyOneWord);
+	virtual bool StartExpandAbbreviation();
+	bool PerformInsertAbbreviation();
+	virtual bool StartInsertAbbreviation();
+	virtual bool StartBlockComment();
+	virtual bool StartBoxComment();
+	virtual bool StartStreamComment();
+	std::vector<std::string> GetLinePartsInStyle(SA::Line line, const StyleAndWords &saw);
+	void SetLineIndentation(SA::Line line, int indent);
+	int GetLineIndentation(SA::Line line);
+	SA::Position GetLineIndentPosition(SA::Line line);
+	void ConvertIndentation(int tabSize, int useTabs);
+	bool RangeIsAllWhitespace(SA::Position start, SA::Position end);
+	IndentationStatus GetIndentState(SA::Line line);
+	int IndentOfBlock(SA::Line line);
+	void MaintainIndentation(char ch);
+	void AutomaticIndentation(char ch);
+	void CharAdded(int utf32);
+	void CharAddedOutput(int ch);
+	void SetTextProperties(PropSetFile &ps);
+	virtual void SetFileProperties(PropSetFile &ps) = 0;
+	void UpdateStatusBar(bool bUpdateSlowData) override;
+	SA::Position GetLineLength(SA::Line line);
+	SA::Line GetCurrentLineNumber();
+	SA::Position GetCurrentColumnNumber();
+	SA::Line GetCurrentScrollPosition();
+	virtual void AddCommand(const std::string &cmd, const std::string &dir,
+				JobSubsystem jobType, const std::string &input = "",
+				int flags = 0);
+	virtual void AboutDialog() = 0;
+	virtual void QuitProgram() = 0;
+	void CloseTab(int tab);
+	void CloseAllBuffers(bool loadingSession = false);
+	SaveResult SaveAllBuffers(bool alwaysYes);
+	void SaveTitledBuffers();
+	virtual void CopyAsRTF() {}
+	virtual void CopyPath() {}
+	void SetLineNumberWidth();
+	void MenuCommand(int cmdID, int source = 0);
+	void FoldChanged(SA::Line line, SA::FoldLevel levelNow, SA::FoldLevel levelPrev);
+	void ExpandFolds(SA::Line line, bool expand, SA::FoldLevel level);
+	void FoldAll();
+	void ToggleFoldRecursive(SA::Line line, SA::FoldLevel level);
+	void EnsureAllChildrenVisible(SA::Line line, SA::FoldLevel level);
+	static void EnsureRangeVisible(GUI::ScintillaWindow &win, SA::Span range, bool enforcePolicy = true);
+	void GotoLineEnsureVisible(SA::Line line);
+	bool MarginClick(SA::Position position, int modifiers);
+	void NewLineInOutput();
+	virtual void SetStatusBarText(const char *s) = 0;
+	void UpdateUI(const SCNotification *notification);
+	void Modified(const SCNotification *notification);
+	virtual void Notify(SCNotification *notification);
+	virtual void ShowToolBar() = 0;
+	virtual void ShowTabBar() = 0;
+	virtual void ShowStatusBar() = 0;
+	virtual void ActivateWindow(const char *timestamp) = 0;
+
+	void RemoveFindMarks();
+	SA::FindOption SearchFlags(bool regularExpressions) const;
+	void MarkAll(MarkPurpose purpose=markWithBookMarks) override;
+	void BookmarkAdd(SA::Line lineno = -1);
+	void BookmarkDelete(SA::Line lineno = -1);
+	bool BookmarkPresent(SA::Line lineno = -1);
+	void BookmarkToggle(SA::Line lineno = -1);
+	void BookmarkNext(bool forwardScan = true, bool select = false);
+	void BookmarkSelectAll();
+	void SetOutputVisibility(bool show);
+	virtual void ShowOutputOnMainThread();
+	void ToggleOutputVisible();
+	virtual void SizeContentWindows() = 0;
+	virtual void SizeSubWindows() = 0;
+
+	virtual void SetMenuItem(int menuNumber, int position, int itemID,
+				 const GUI::gui_char *text, const GUI::gui_char *mnemonic = nullptr) = 0;
+	virtual void RedrawMenu() {}
+	virtual void DestroyMenuItem(int menuNumber, int itemID) = 0;
+	virtual void CheckAMenuItem(int wIDCheckItem, bool val) = 0;
+	virtual void EnableAMenuItem(int wIDCheckItem, bool val) = 0;
+	virtual void CheckMenusClipboard();
+	virtual void CheckMenus();
+	virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) = 0;
+	void ContextMenu(GUI::ScintillaWindow &wSource, GUI::Point pt, GUI::Window wCmd);
+
+	void DeleteFileStackMenu();
+	void SetFileStackMenu();
+	bool AddFileToBuffer(const BufferState &bufferState);
+	void AddFileToStack(const RecentFile &file);
+	void RemoveFileFromStack(const FilePath &file);
+	RecentFile GetFilePosition();
+	void DisplayAround(const RecentFile &rf);
+	void StackMenu(int pos);
+	void StackMenuNext();
+	void StackMenuPrev();
+
+	void RemoveToolsMenu();
+	void SetMenuItemLocalised(int menuNumber, int position, int itemID,
+				  const char *text, const char *mnemonic);
+	bool ToolIsImmediate(int item);
+	void SetToolsMenu();
+	JobSubsystem SubsystemType(const char *cmd);
+	void ToolsMenu(int item);
+
+	void AssignKey(SA::Keys key, SA::KeyMod mods, int cmd);
+	void ViewWhitespace(bool view);
+	void SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle);
+	void SetImportMenu();
+	void ImportMenu(int pos);
+	void SetLanguageMenu();
+	void SetPropertiesInitial();
+	GUI::gui_string LocaliseMessage(const char *s,
+					const GUI::gui_char *param0 = nullptr, const GUI::gui_char *param1 = nullptr, const GUI::gui_char *param2 = nullptr);
+	virtual void ReadLocalization();
+	std::string GetFileNameProperty(const char *name);
+	virtual void ReadPropertiesInitial();
+	void ReadFontProperties();
+	void SetOverrideLanguage(int cmdID);
+	StyleAndWords GetStyleAndWords(const char *base);
+	std::string ExtensionFileName() const;
+	void SetElementColour(SA::Element element, const char *key);
+	static const char *GetNextPropItem(const char *pStart, char *pPropItem, int maxLen);
+	void ForwardPropertyToEditor(const char *key);
+	struct MarkerAppearance {
+		SA::ColourAlpha fore;
+		SA::ColourAlpha back;
+		SA::ColourAlpha backSelected;
+		int strokeWidth;
+	};
+	void DefineMarker(SA::MarkerOutline marker, SA::MarkerSymbol markerType, MarkerAppearance markerAppearance);
+	void ReadAPI(const std::string &fileNameForExtension);
+	std::string FindLanguageProperty(const char *pattern, const char *defaultValue = "");
+	void SetRepresentations();
+	virtual void ReadProperties();
+	void ReadEditorConfig(const std::string &fileNameForExtension);
+	std::string StyleString(const char *lang, int style) const;
+	StyleDefinition StyleDefinitionFor(int style);
+	void SetOneStyle(GUI::ScintillaWindow &win, int style, const StyleDefinition &sd);
+	void SetStyleBlock(GUI::ScintillaWindow &win, const char *lang, int start, int last);
+	void SetStyleFor(GUI::ScintillaWindow &win, const char *lang);
+	static void SetOneIndicator(GUI::ScintillaWindow &win, int indicator, const IndicatorDefinition &ind);
+	void ReloadProperties();
+
+	void CheckReload();
+	void Activate(bool activeApp);
+	GUI::Rectangle GetClientRectangle();
+	void Redraw();
+	int NormaliseSplit(int splitPos);
+	void MoveSplit(GUI::Point ptNewDrag);
+
+	virtual void TimerStart(int mask);
+	virtual void TimerEnd(int mask);
+	void OnTimer();
+	virtual void SetIdler(bool on);
+	void OnIdle();
+
+	void SetHomeProperties();
+	void UIAvailable();
+	void PerformOne(char *action);
+	void StartRecordMacro();
+	void StopRecordMacro();
+	void StartPlayMacro();
+	bool RecordMacroCommand(const SCNotification *notification);
+	void ExecuteMacroCommand(const char *command);
+	void AskMacroList();
+	bool StartMacroList(const char *words);
+	void ContinueMacroList(const char *stext);
+	bool ProcessCommandLine(const GUI::gui_string &args, int phase);
+	virtual bool IsStdinBlocked();
+	void OpenFromStdin(bool UseOutputPane);
+	void OpenFilesFromStdin();
+	enum GrepFlags {
+		grepNone = 0, grepWholeWord = 1, grepMatchCase = 2, grepStdOut = 4,
+		grepDot = 8, grepBinary = 16, grepScroll = 32
+	};
+	virtual bool GrepIntoDirectory(const FilePath &directory);
+	void GrepRecursive(GrepFlags gf, const FilePath &baseDir, const char *searchString, const GUI::gui_char *fileTypes);
+	void InternalGrep(GrepFlags gf, const GUI::gui_char *directory, const GUI::gui_char *fileTypes,
+			  const char *search, SA::Position &originalEnd);
+	void EnumProperties(const char *propkind);
+	void SendOneProperty(const char *kind, const char *key, const char *val);
+	void PropertyFromDirector(const char *arg);
+	void PropertyToDirector(const char *arg);
+	// ExtensionAPI
+	intptr_t Send(Pane p, SA::Message msg, uintptr_t wParam = 0, intptr_t lParam = 0) override;
+	std::string Range(Pane p, SA::Span range) override;
+	void Remove(Pane p, SA::Position start, SA::Position end) override;
+	void Insert(Pane p, SA::Position pos, const char *s) override;
+	void Trace(const char *s) override;
+	std::string Property(const char *key) override;
+	void SetProperty(const char *key, const char *val) override;
+	void UnsetProperty(const char *key) override;
+	uintptr_t GetInstance() override;
+	void ShutDown() override;
+	void Perform(const char *actionList) override;
+	void DoMenuCommand(int cmdID) override;
+	SA::ScintillaCall &PaneCaller(Pane p) noexcept override;
+
+	// Valid CurrentWord characters
+	bool iswordcharforsel(char ch);
+	bool isfilenamecharforsel(char ch);
+	bool islexerwordcharforsel(char ch);
+
+	CurrentWordHighlight currentWordHighlight;
+	void HighlightCurrentWord(bool highlight);
+	MatchMarker matchMarker;
+	MatchMarker findMarker;
+public:
+
+	enum { maxParam = 4 };
+
+	explicit SciTEBase(Extension *ext = 0);
+	// Deleted copy-constructor and assignment operator.
+	SciTEBase(const SciTEBase &) = delete;
+	SciTEBase(SciTEBase &&) = delete;
+	void operator=(const SciTEBase &) = delete;
+	void operator=(SciTEBase &&) = delete;
+	~SciTEBase() override;
+
+	void Finalise();
+
+	GUI::WindowID GetID() const noexcept { return wSciTE.GetID(); }
+
+	bool PerformOnNewThread(Worker *pWorker);
+	// WorkerListener
+	void PostOnMainThread(int cmd, Worker *pWorker) override = 0;
+	virtual void WorkerCommand(int cmd, Worker *pWorker);
+};
+
+int ControlIDOfCommand(unsigned long) noexcept;
+SA::Colour ColourOfProperty(const PropSetFile &props, const char *key, SA::Colour colourDefault);
+SA::ColourAlpha ColourAlphaOfProperty(const PropSetFile &props, const char *key, SA::ColourAlpha colourDefault);
+void WindowSetFocus(GUI::ScintillaWindow &w);
+
+// Test if an enum class value has the bit flag(s) of test set.
+template <typename T>
+constexpr bool FlagIsSet(T value, T test) {
+	return (static_cast<int>(value) & static_cast<int>(test)) == static_cast<int>(test);
+}
+
+#endif
diff --git a/scite-app/scite/src/SciTEBuffers.cxx b/scite-app/scite/src/SciTEBuffers.cxx
new file mode 100644
index 0000000..c964ce8
--- /dev/null
+++ b/scite-app/scite/src/SciTEBuffers.cxx
@@ -0,0 +1,2119 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEBuffers.cxx
+ ** Buffers and jobs management.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include "ILoader.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "SciLexer.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+
+const GUI::gui_char defaultSessionFileName[] = GUI_TEXT("SciTE.session");
+
+void Buffer::DocumentModified() noexcept {
+	documentModTime = time(nullptr);
+}
+
+bool Buffer::NeedsSave(int delayBeforeSave) const {
+	const time_t now = time(nullptr);
+	return now && documentModTime && isDirty && !pFileWorker && (now-documentModTime > delayBeforeSave) && !file.IsUntitled() && !failedSave;
+}
+
+void Buffer::CompleteLoading() noexcept {
+	lifeState = opened;
+	if (pFileWorker && pFileWorker->IsLoading()) {
+		delete pFileWorker;
+		pFileWorker = nullptr;
+	}
+}
+
+void Buffer::CompleteStoring() {
+	if (pFileWorker && !pFileWorker->IsLoading()) {
+		delete pFileWorker;
+		pFileWorker = nullptr;
+	}
+	SetTimeFromFile();
+}
+
+void Buffer::AbandonAutomaticSave() {
+	if (pFileWorker && !pFileWorker->IsLoading()) {
+		const FileStorer *pFileStorer = dynamic_cast<FileStorer *>(pFileWorker);
+		if (pFileStorer && !pFileStorer->visibleProgress) {
+			pFileWorker->Cancel();
+			// File is in partially saved state so may be better to remove
+		}
+	}
+}
+
+void Buffer::CancelLoad() {
+	// Complete any background loading
+	if (pFileWorker && pFileWorker->IsLoading()) {
+		pFileWorker->Cancel();
+		CompleteLoading();
+		lifeState = empty;
+	}
+}
+
+BufferList::BufferList() : current(0), stackcurrent(0), stack(0), buffers(0), length(0), lengthVisible(0), initialised(false) {}
+
+BufferList::~BufferList() {
+}
+
+void BufferList::Allocate(int maxSize) {
+	length = 1;
+	lengthVisible = 1;
+	current = 0;
+	buffers.resize(maxSize);
+	stack.resize(maxSize);
+	stack[0] = 0;
+}
+
+int BufferList::Add() {
+	if (length < size()) {
+		length++;
+	}
+	buffers[length - 1].Init();
+	stack[length - 1] = length - 1;
+	MoveToStackTop(length - 1);
+	SetVisible(length-1, true);
+
+	return lengthVisible - 1;
+}
+
+int BufferList::GetDocumentByWorker(const FileWorker *pFileWorker) const {
+	for (int i = 0; i < length; i++) {
+		if (buffers[i].pFileWorker == pFileWorker) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+int BufferList::GetDocumentByName(const FilePath &filename, bool excludeCurrent) {
+	if (!filename.IsSet()) {
+		return -1;
+	}
+	for (int i = 0; i < length; i++) {
+		if ((!excludeCurrent || i != current) && buffers[i].file.SameNameAs(filename)) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+void BufferList::RemoveInvisible(int index) {
+	assert(!GetVisible(index));
+	if (index == current) {
+		RemoveCurrent();
+	} else {
+		if (index < length-1) {
+			// Swap with last visible
+			Swap(index, length-1);
+		}
+		length--;
+	}
+}
+
+void BufferList::RemoveCurrent() {
+	// Delete and move up to fill gap but ensure doc pointer is saved.
+	void *currentDoc = buffers[current].doc;
+	buffers[current].CompleteLoading();
+	for (int i = current; i < length - 1; i++) {
+		buffers[i] = buffers[i + 1];
+	}
+	buffers[length - 1].doc = currentDoc;
+
+	if (length > 1) {
+		CommitStackSelection();
+		PopStack();
+		length--;
+		lengthVisible--;
+
+		buffers[length].Init();
+		if (current >= lengthVisible) {
+			if (lengthVisible > 0) {
+				SetCurrent(lengthVisible - 1);
+			} else {
+				SetCurrent(0);
+			}
+		}
+	} else {
+		buffers[current].Init();
+	}
+	MoveToStackTop(current);
+}
+
+int BufferList::Current() const noexcept {
+	return current;
+}
+
+Buffer *BufferList::CurrentBuffer() {
+	return &buffers[Current()];
+}
+
+const Buffer *BufferList::CurrentBufferConst() const {
+	return &buffers[Current()];
+}
+
+void BufferList::SetCurrent(int index) noexcept {
+	current = index;
+}
+
+void BufferList::PopStack() {
+	for (int i = 0; i < length - 1; ++i) {
+		int index = stack[i + 1];
+		// adjust the index for items that will move in buffers[]
+		if (index > current)
+			--index;
+		stack[i] = index;
+	}
+}
+
+int BufferList::StackNext() {
+	if (++stackcurrent >= length)
+		stackcurrent = 0;
+	return stack[stackcurrent];
+}
+
+int BufferList::StackPrev() {
+	if (--stackcurrent < 0)
+		stackcurrent = length - 1;
+	return stack[stackcurrent];
+}
+
+void BufferList::MoveToStackTop(int index) {
+	// shift top chunk of stack down into the slot that index occupies
+	bool move = false;
+	for (int i = length - 1; i > 0; --i) {
+		if (stack[i] == index)
+			move = true;
+		if (move)
+			stack[i] = stack[i-1];
+	}
+	stack[0] = index;
+}
+
+void BufferList::CommitStackSelection() {
+	// called only when ctrl key is released when ctrl-tabbing
+	// or when a document is closed (in case of Ctrl+F4 during ctrl-tabbing)
+	MoveToStackTop(stack[stackcurrent]);
+	stackcurrent = 0;
+}
+
+void BufferList::ShiftTo(int indexFrom, int indexTo) {
+	// shift buffer to new place in buffers array
+	if (indexFrom == indexTo ||
+			indexFrom < 0 || indexFrom >= length ||
+			indexTo < 0 || indexTo >= length) return;
+	int step = (indexFrom > indexTo) ? -1 : 1;
+	Buffer tmp = buffers[indexFrom];
+	int i;
+	for (i = indexFrom; i != indexTo; i += step) {
+		buffers[i] = buffers[i+step];
+	}
+	buffers[indexTo] = tmp;
+	// update stack indexes
+	for (i = 0; i < length; i++) {
+		if (stack[i] == indexFrom) {
+			stack[i] = indexTo;
+		} else if (step == 1) {
+			if (indexFrom < stack[i] && stack[i] <= indexTo) stack[i] -= step;
+		} else {
+			if (indexFrom > stack[i] && stack[i] >= indexTo) stack[i] -= step;
+		}
+	}
+}
+
+void BufferList::Swap(int indexA, int indexB) {
+	// shift buffer to new place in buffers array
+	if (indexA == indexB ||
+			indexA < 0 || indexA >= length ||
+			indexB < 0 || indexB >= length) return;
+	Buffer tmp = buffers[indexA];
+	buffers[indexA] = buffers[indexB];
+	buffers[indexB] = tmp;
+	// update stack indexes
+	for (int i = 0; i < length; i++) {
+		if (stack[i] == indexA) {
+			stack[i] = indexB;
+		} else if (stack[i] == indexB) {
+			stack[i] = indexA;
+		}
+	}
+}
+
+bool BufferList::SingleBuffer() const noexcept {
+	return size() == 1;
+}
+
+BackgroundActivities BufferList::CountBackgroundActivities() const {
+	BackgroundActivities bg {};
+	for (int i = 0; i < length; i++) {
+		if (buffers[i].pFileWorker) {
+			if (!buffers[i].pFileWorker->FinishedJob()) {
+				if (!buffers[i].pFileWorker->IsLoading()) {
+					const FileStorer *fstorer = dynamic_cast<FileStorer *>(buffers[i].pFileWorker);
+					if (fstorer && !fstorer->visibleProgress)
+						continue;
+				}
+				if (buffers[i].pFileWorker->IsLoading())
+					bg.loaders++;
+				else
+					bg.storers++;
+				bg.fileNameLast = buffers[i].file.AsInternal();
+				bg.totalWork += buffers[i].pFileWorker->SizeJob();
+				bg.totalProgress += buffers[i].pFileWorker->ProgressMade();
+			}
+		}
+	}
+	return bg;
+}
+
+bool BufferList::SavingInBackground() const {
+	for (int i = 0; i<length; i++) {
+		if (buffers[i].pFileWorker && !buffers[i].pFileWorker->IsLoading() && !buffers[i].pFileWorker->FinishedJob()) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool BufferList::GetVisible(int index) const noexcept {
+	return index < lengthVisible;
+}
+
+void BufferList::SetVisible(int index, bool visible) {
+	if (visible != GetVisible(index)) {
+		if (visible) {
+			if (index > lengthVisible) {
+				// Swap with first invisible
+				Swap(index, lengthVisible);
+			}
+			lengthVisible++;
+		} else {
+			if (index < lengthVisible-1) {
+				// Swap with last visible
+				Swap(index, lengthVisible-1);
+			}
+			lengthVisible--;
+			if (current >= lengthVisible && lengthVisible > 0)
+				SetCurrent(lengthVisible-1);
+		}
+	}
+}
+
+void BufferList::AddFuture(int index, Buffer::FutureDo fd) {
+	if (index >= 0 || index < length) {
+		buffers[index].futureDo = static_cast<Buffer::FutureDo>(buffers[index].futureDo | fd);
+	}
+}
+
+void BufferList::FinishedFuture(int index, Buffer::FutureDo fd) {
+	if (index >= 0 || index < length) {
+		buffers[index].futureDo = static_cast<Buffer::FutureDo>(buffers[index].futureDo & ~(fd));
+	}
+}
+
+void *SciTEBase::GetDocumentAt(int index) {
+	if (index < 0 || index >= buffers.size()) {
+		return nullptr;
+	}
+	if (buffers.buffers[index].doc == nullptr) {
+		// Create a new document buffer
+		buffers.buffers[index].doc = wEditor.CreateDocument(0, SA::DocumentOption::Default);
+	}
+	return buffers.buffers[index].doc;
+}
+
+void SciTEBase::SwitchDocumentAt(int index, void *pdoc) {
+	if (index < 0 || index >= buffers.size()) {
+		return;
+	}
+	void *pdocOld = buffers.buffers[index].doc;
+	buffers.buffers[index].doc = pdoc;
+	if (pdocOld) {
+		wEditor.ReleaseDocument(pdocOld);
+	}
+	if (index == buffers.Current()) {
+		wEditor.SetDocPointer(buffers.buffers[index].doc);
+	}
+}
+
+void SciTEBase::SetDocumentAt(int index, bool updateStack) {
+	const int currentbuf = buffers.Current();
+
+	if (index < 0 ||
+			index >= buffers.length ||
+			index == currentbuf ||
+			currentbuf < 0 ||
+			currentbuf >= buffers.length) {
+		return;
+	}
+	UpdateBuffersCurrent();
+
+	buffers.SetCurrent(index);
+	if (updateStack) {
+		buffers.MoveToStackTop(index);
+	}
+
+	if (extender) {
+		if (buffers.size() > 1)
+			extender->ActivateBuffer(index);
+		else
+			extender->InitBuffer(0);
+	}
+
+	const Buffer &bufferNext = buffers.buffers[buffers.Current()];
+	SetFileName(bufferNext.file);
+	propsDiscovered = bufferNext.props;
+	propsDiscovered.superPS = &propsLocal;
+	wEditor.SetDocPointer(GetDocumentAt(buffers.Current()));
+	const bool restoreBookmarks = bufferNext.lifeState == Buffer::readAll;
+	PerformDeferredTasks();
+	if (bufferNext.lifeState == Buffer::readAll) {
+		CompleteOpen(ocCompleteSwitch);
+		if (extender)
+			extender->OnOpen(filePath.AsUTF8().c_str());
+	}
+	RestoreState(bufferNext, restoreBookmarks);
+
+	TabSelect(index);
+
+	if (lineNumbers && lineNumbersExpand)
+		SetLineNumberWidth();
+
+	DisplayAround(bufferNext.file);
+	if (restoreBookmarks) {
+		// Restoring a session does not restore the scroll position
+		// so make the selection visible.
+		wEditor.ScrollCaret();
+	}
+
+	SetBuffersMenu();
+	CheckMenus();
+	UpdateStatusBar(true);
+
+	if (extender) {
+		extender->OnSwitchFile(filePath.AsUTF8().c_str());
+	}
+}
+
+void SciTEBase::UpdateBuffersCurrent() {
+	const int currentbuf = buffers.Current();
+
+	if ((buffers.length > 0) && (currentbuf >= 0) && (buffers.GetVisible(currentbuf))) {
+		Buffer &bufferCurrent = buffers.buffers[currentbuf];
+		bufferCurrent.file.Set(filePath);
+		if (bufferCurrent.lifeState != Buffer::reading && bufferCurrent.lifeState != Buffer::readAll) {
+			bufferCurrent.file.selection.position = wEditor.CurrentPos();
+			bufferCurrent.file.selection.anchor = wEditor.Anchor();
+			bufferCurrent.file.scrollPosition = GetCurrentScrollPosition();
+
+			// Retrieve fold state and store in buffer state info
+
+			std::vector<SA::Line> *f = &bufferCurrent.foldState;
+			f->clear();
+
+			if (props.GetInt("fold")) {
+				for (SA::Line line = 0; ; line++) {
+					const SA::Line lineNext = wEditor.ContractedFoldNext(line);
+					if ((line < 0) || (lineNext < line))
+						break;
+					line = lineNext;
+					f->push_back(line);
+				}
+			}
+
+			if (props.GetInt("session.bookmarks")) {
+				buffers.buffers[buffers.Current()].bookmarks.clear();
+				SA::Line lineBookmark = -1;
+				while ((lineBookmark = wEditor.MarkerNext(lineBookmark + 1, 1 << markerBookmark)) >= 0) {
+					bufferCurrent.bookmarks.push_back(lineBookmark);
+				}
+			}
+		}
+	}
+}
+
+bool SciTEBase::IsBufferAvailable() const noexcept {
+	return buffers.size() > 1 && buffers.length < buffers.size();
+}
+
+bool SciTEBase::CanMakeRoom(bool maySaveIfDirty) {
+	if (IsBufferAvailable()) {
+		return true;
+	} else if (maySaveIfDirty) {
+		// All available buffers are taken, try and close the current one
+		if (SaveIfUnsure(true, static_cast<SaveFlags>(sfProgressVisible | sfSynchronous)) != saveCancelled) {
+			// The file isn't dirty, or the user agreed to close the current one
+			return true;
+		}
+	} else {
+		return true;	// Told not to save so must be OK.
+	}
+	return false;
+}
+
+void SciTEBase::ClearDocument() {
+	wEditor.SetReadOnly(false);
+	wEditor.SetUndoCollection(false);
+	wEditor.ClearAll();
+	wEditor.EmptyUndoBuffer();
+	wEditor.SetUndoCollection(true);
+	wEditor.SetSavePoint();
+	wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+}
+
+void SciTEBase::CreateBuffers() {
+	int buffersWanted = props.GetInt("buffers");
+	if (buffersWanted > bufferMax) {
+		buffersWanted = bufferMax;
+	}
+	if (buffersWanted < 1) {
+		buffersWanted = 1;
+	}
+	buffers.Allocate(buffersWanted);
+}
+
+void SciTEBase::InitialiseBuffers() {
+	if (!buffers.initialised) {
+		buffers.initialised = true;
+		// First document is the default from creation of control
+		buffers.buffers[0].doc = wEditor.DocPointer();
+		wEditor.AddRefDocument(buffers.buffers[0].doc); // We own this reference
+		if (buffers.size() == 1) {
+			// Single buffer mode, delete the Buffers main menu entry
+			DestroyMenuItem(menuBuffers, 0);
+			// Destroy command "View Tab Bar" in the menu "View"
+			DestroyMenuItem(menuView, IDM_VIEWTABBAR);
+			// Make previous change visible.
+			RedrawMenu();
+		}
+	}
+}
+
+FilePath SciTEBase::UserFilePath(const GUI::gui_char *name) {
+	GUI::gui_string nameWithVisibility(configFileVisibilityString);
+	nameWithVisibility += name;
+	return FilePath(GetSciteUserHome(), nameWithVisibility.c_str());
+}
+
+static std::string IndexPropKey(const char *bufPrefix, int bufIndex, const char *bufAppendix) {
+	std::string pKey = bufPrefix;
+	pKey += '.';
+	pKey += StdStringFromInteger(bufIndex + 1);
+	if (bufAppendix) {
+		pKey += ".";
+		pKey += bufAppendix;
+	}
+	return pKey;
+}
+
+void SciTEBase::LoadSessionFile(const GUI::gui_char *sessionName) {
+	FilePath sessionPathName;
+	if (sessionName[0] == '\0') {
+		sessionPathName = UserFilePath(defaultSessionFileName);
+	} else {
+		sessionPathName.Set(sessionName);
+	}
+
+	propsSession.Clear();
+	propsSession.Read(sessionPathName, sessionPathName.Directory(), filter, nullptr, 0);
+
+	FilePath sessionFilePath = FilePath(sessionPathName).AbsolutePath();
+	// Add/update SessionPath environment variable
+	props.Set("SessionPath", sessionFilePath.AsUTF8().c_str());
+}
+
+void SciTEBase::RestoreRecentMenu() {
+	const SelectedRange sr(0, 0);
+
+	DeleteFileStackMenu();
+
+	for (int i = 0; i < fileStackMax; i++) {
+		std::string propKey = IndexPropKey("mru", i, "path");
+		std::string propStr = propsSession.GetString(propKey.c_str());
+		if (propStr == "")
+			continue;
+		AddFileToStack(RecentFile(GUI::StringFromUTF8(propStr), sr, 0));
+	}
+}
+
+namespace {
+
+// Line numbers are 0-based inside SciTE but are saved in session files as 1-based.
+
+std::vector<SA::Line> LinesFromString(const std::string &s) {
+	std::vector<SA::Line> result;
+	if (s.length()) {
+		size_t start = 0;
+		for (;;) {
+			const SA::Line line = IntegerFromText(s.c_str() + start) - 1;
+			result.push_back(line);
+			const size_t posComma = s.find(',', start);
+			if (posComma == std::string::npos)
+				break;
+			start = posComma + 1;
+		}
+	}
+	return result;
+}
+
+std::string StringFromLines(const std::vector<SA::Line> &lines) {
+	std::string result;
+	for (const SA::Line line : lines) {
+		if (result.length()) {
+			result.append(",");
+		}
+		std::string sLine = std::to_string(line + 1);
+		result.append(sLine);
+	}
+	return result;
+}
+
+}
+
+void SciTEBase::RestoreFromSession(const Session &session) {
+	for (const BufferState &buffer : session.buffers)
+		AddFileToBuffer(buffer);
+	const int iBuffer = buffers.GetDocumentByName(session.pathActive);
+	if (iBuffer >= 0)
+		SetDocumentAt(iBuffer);
+}
+
+void SciTEBase::RestoreSession() {
+	if (props.GetInt("save.find") != 0) {
+		for (int i = 0;; i++) {
+			std::string propKey = IndexPropKey("search", i, "findwhat");
+			std::string propStr = propsSession.GetString(propKey.c_str());
+			if (propStr == "")
+				break;
+			memFinds.AppendList(propStr);
+		}
+
+		for (int i = 0;; i++) {
+			std::string propKey = IndexPropKey("search", i, "replacewith");
+			std::string propStr = propsSession.GetString(propKey.c_str());
+			if (propStr == "")
+				break;
+			memReplaces.AppendList(propStr);
+		}
+	}
+
+	// Comment next line if you don't want to close all buffers before restoring session
+	CloseAllBuffers(true);
+
+	Session session;
+
+	for (int i = 0; i < bufferMax; i++) {
+		std::string propKey = IndexPropKey("buffer", i, "path");
+		std::string propStr = propsSession.GetString(propKey.c_str());
+		if (propStr == "")
+			continue;
+
+		BufferState bufferState;
+		bufferState.file.Set(GUI::StringFromUTF8(propStr));
+
+		propKey = IndexPropKey("buffer", i, "current");
+		if (propsSession.GetInt(propKey.c_str()))
+			session.pathActive = bufferState.file;
+
+		propKey = IndexPropKey("buffer", i, "scroll");
+		const SA::Line scroll = propsSession.GetInteger(propKey.c_str());
+		bufferState.file.scrollPosition = scroll;
+
+		propKey = IndexPropKey("buffer", i, "position");
+		const SA::Position pos = propsSession.GetInteger(propKey.c_str());
+
+		bufferState.file.selection.anchor = pos - 1;
+		bufferState.file.selection.position = bufferState.file.selection.anchor;
+
+		if (props.GetInt("session.bookmarks")) {
+			propKey = IndexPropKey("buffer", i, "bookmarks");
+			propStr = propsSession.GetString(propKey.c_str());
+			bufferState.bookmarks = LinesFromString(propStr);
+		}
+
+		if (props.GetInt("fold") && !props.GetInt("fold.on.open") &&
+				props.GetInt("session.folds")) {
+			propKey = IndexPropKey("buffer", i, "folds");
+			propStr = propsSession.GetString(propKey.c_str());
+			bufferState.foldState = LinesFromString(propStr);
+		}
+
+		session.buffers.push_back(bufferState);
+	}
+
+	RestoreFromSession(session);
+}
+
+void SciTEBase::SaveSessionFile(const GUI::gui_char *sessionName) {
+	UpdateBuffersCurrent();
+	const bool defaultSession = !*sessionName;
+	FilePath sessionPathName;
+	if (defaultSession) {
+		sessionPathName = UserFilePath(defaultSessionFileName);
+	} else {
+		sessionPathName.Set(sessionName);
+	}
+	FILE *sessionFile = sessionPathName.Open(fileWrite);
+	if (!sessionFile)
+		return;
+
+	fprintf(sessionFile, "# SciTE session file\n");
+
+	if (defaultSession && props.GetInt("save.position")) {
+		int top, left, width, height, maximize;
+		GetWindowPosition(&left, &top, &width, &height, &maximize);
+
+		fprintf(sessionFile, "\n");
+		fprintf(sessionFile, "position.left=%d\n", left);
+		fprintf(sessionFile, "position.top=%d\n", top);
+		fprintf(sessionFile, "position.width=%d\n", width);
+		fprintf(sessionFile, "position.height=%d\n", height);
+		fprintf(sessionFile, "position.maximize=%d\n", maximize);
+	}
+
+	if (defaultSession && props.GetInt("save.recent")) {
+		std::string propKey;
+		int j = 0;
+
+		fprintf(sessionFile, "\n");
+
+		// Save recent files list
+		for (int i = fileStackMax - 1; i >= 0; i--) {
+			if (recentFileStack[i].IsSet()) {
+				propKey = IndexPropKey("mru", j++, "path");
+				fprintf(sessionFile, "%s=%s\n", propKey.c_str(), recentFileStack[i].AsUTF8().c_str());
+			}
+		}
+	}
+
+	if (defaultSession && props.GetInt("save.find")) {
+		std::string propKey;
+		std::vector<std::string>::iterator it;
+		std::vector<std::string> mem = memFinds.AsVector();
+		if (!mem.empty()) {
+			fprintf(sessionFile, "\n");
+			it = mem.begin();
+			for (int i = 0; it != mem.end(); i++, ++it) {
+				propKey = IndexPropKey("search", i, "findwhat");
+				fprintf(sessionFile, "%s=%s\n", propKey.c_str(), (*it).c_str());
+			}
+		}
+
+		mem = memReplaces.AsVector();
+		if (!mem.empty()) {
+			fprintf(sessionFile, "\n");
+			mem = memReplaces.AsVector();
+			it = mem.begin();
+			for (int i = 0; it != mem.end(); i++, ++it) {
+				propKey = IndexPropKey("search", i, "replacewith");
+				fprintf(sessionFile, "%s=%s\n", propKey.c_str(), (*it).c_str());
+			}
+		}
+	}
+
+	if (props.GetInt("buffers") && (!defaultSession || props.GetInt("save.session"))) {
+		const int curr = buffers.Current();
+		for (int i = 0; i < buffers.lengthVisible; i++) {
+			const Buffer &buff = buffers.buffers[i];
+			if (buff.file.IsSet() && !buff.file.IsUntitled()) {
+				std::string propKey = IndexPropKey("buffer", i, "path");
+				fprintf(sessionFile, "\n%s=%s\n", propKey.c_str(), buff.file.AsUTF8().c_str());
+
+				const SA::Position pos = buff.file.selection.position + 1;
+				const std::string sPos = std::to_string(pos);
+				propKey = IndexPropKey("buffer", i, "position");
+				fprintf(sessionFile, "%s=%s\n", propKey.c_str(), sPos.c_str());
+
+				const SA::Line scroll = buff.file.scrollPosition;
+				const std::string sScroll = std::to_string(scroll);
+				propKey = IndexPropKey("buffer", i, "scroll");
+				fprintf(sessionFile, "%s=%s\n", propKey.c_str(), sScroll.c_str());
+
+				if (i == curr) {
+					propKey = IndexPropKey("buffer", i, "current");
+					fprintf(sessionFile, "%s=1\n", propKey.c_str());
+				}
+
+				if (props.GetInt("session.bookmarks")) {
+					const std::string bmString = StringFromLines(buff.bookmarks);
+					if (bmString.length()) {
+						propKey = IndexPropKey("buffer", i, "bookmarks");
+						fprintf(sessionFile, "%s=%s\n", propKey.c_str(), bmString.c_str());
+					}
+				}
+
+				if (props.GetInt("fold") && props.GetInt("session.folds")) {
+					const std::string foldsString = StringFromLines(buff.foldState);
+					if (foldsString.length()) {
+						propKey = IndexPropKey("buffer", i, "folds");
+						fprintf(sessionFile, "%s=%s\n", propKey.c_str(), foldsString.c_str());
+					}
+				}
+			}
+		}
+	}
+
+	if (fclose(sessionFile) != 0) {
+		FailedSaveMessageBox(sessionPathName);
+	}
+
+	FilePath sessionFilePath = FilePath(sessionPathName).AbsolutePath();
+	// Add/update SessionPath environment variable
+	props.Set("SessionPath", sessionFilePath.AsUTF8().c_str());
+}
+
+void SciTEBase::SetIndentSettings() {
+	// Get default values
+	const int useTabs = props.GetInt("use.tabs", 1);
+	const int tabSize = props.GetInt("tabsize");
+	const int indentSize = props.GetInt("indent.size");
+	// Either set the settings related to the extension or the default ones
+	std::string fileNameForExtension = ExtensionFileName();
+	std::string useTabsChars = props.GetNewExpandString("use.tabs.",
+				   fileNameForExtension.c_str());
+	if (useTabsChars.length() != 0) {
+		wEditor.SetUseTabs(atoi(useTabsChars.c_str()));
+	} else {
+		wEditor.SetUseTabs(useTabs);
+	}
+	std::string tabSizeForExt = props.GetNewExpandString("tab.size.",
+				    fileNameForExtension.c_str());
+	if (tabSizeForExt.length() != 0) {
+		wEditor.SetTabWidth(atoi(tabSizeForExt.c_str()));
+	} else if (tabSize != 0) {
+		wEditor.SetTabWidth(tabSize);
+	}
+	std::string indentSizeForExt = props.GetNewExpandString("indent.size.",
+				       fileNameForExtension.c_str());
+	if (indentSizeForExt.length() != 0) {
+		wEditor.SetIndent(atoi(indentSizeForExt.c_str()));
+	} else {
+		wEditor.SetIndent(indentSize);
+	}
+}
+
+void SciTEBase::SetEol() {
+	std::string eolMode = props.GetString("eol.mode");
+	if (eolMode == "LF") {
+		wEditor.SetEOLMode(SA::EndOfLine::Lf);
+	} else if (eolMode == "CR") {
+		wEditor.SetEOLMode(SA::EndOfLine::Cr);
+	} else if (eolMode == "CRLF") {
+		wEditor.SetEOLMode(SA::EndOfLine::CrLf);
+	}
+}
+
+void SciTEBase::New() {
+	InitialiseBuffers();
+	UpdateBuffersCurrent();
+
+	propsDiscovered.Clear();
+
+	if ((buffers.size() == 1) && (!buffers.buffers[0].file.IsUntitled())) {
+		AddFileToStack(buffers.buffers[0].file);
+	}
+
+	// If the current buffer is the initial untitled, clean buffer then overwrite it,
+	// otherwise add a new buffer.
+	if ((buffers.length > 1) ||
+			(buffers.Current() != 0) ||
+			(buffers.buffers[0].isDirty) ||
+			(!buffers.buffers[0].file.IsUntitled())) {
+		if (buffers.size() == buffers.length) {
+			Close(false, false, true);
+		}
+		buffers.SetCurrent(buffers.Add());
+	}
+
+	void *doc = GetDocumentAt(buffers.Current());
+	wEditor.SetDocPointer(doc);
+
+	FilePath curDirectory(filePath.Directory());
+	filePath.Set(curDirectory, GUI_TEXT(""));
+	SetFileName(filePath);
+	UpdateBuffersCurrent();
+	SetBuffersMenu();
+	CurrentBuffer()->isDirty = false;
+	CurrentBuffer()->failedSave = false;
+	CurrentBuffer()->lifeState = Buffer::opened;
+	jobQueue.isBuilding = false;
+	jobQueue.isBuilt = false;
+	CurrentBuffer()->isReadOnly = false;	// No sense to create an empty, read-only buffer...
+
+	ClearDocument();
+	DeleteFileStackMenu();
+	SetFileStackMenu();
+	if (extender)
+		extender->InitBuffer(buffers.Current());
+}
+
+void SciTEBase::RestoreState(const Buffer &buffer, bool restoreBookmarks) {
+	SetWindowName();
+	ReadProperties();
+	if (CurrentBuffer()->unicodeMode != uni8Bit) {
+		// Override the code page if Unicode
+		codePage = SA::CpUtf8;
+		wEditor.SetCodePage(codePage);
+	}
+
+	// check to see whether there is saved fold state, restore
+	if (!buffer.foldState.empty()) {
+		wEditor.ColouriseAll();
+		for (const SA::Line fold : buffer.foldState) {
+			wEditor.ToggleFold(fold);
+		}
+	}
+	if (restoreBookmarks) {
+		for (const SA::Line bookmark : buffer.bookmarks) {
+			wEditor.MarkerAdd(bookmark, markerBookmark);
+		}
+	}
+}
+
+void SciTEBase::Close(bool updateUI, bool loadingSession, bool makingRoomForNew) {
+	bool closingLast = true;
+	const int index = buffers.Current();
+	if ((index >= 0) && buffers.initialised) {
+		buffers.buffers[index].CancelLoad();
+	}
+
+	if (extender) {
+		extender->OnClose(filePath.AsUTF8().c_str());
+	}
+
+	if (buffers.size() == 1) {
+		// With no buffer list, Close means close from MRU
+		closingLast = !(recentFileStack[0].IsSet());
+		buffers.buffers[0].Init();
+		filePath.Set(GUI_TEXT(""));
+		ClearDocument(); //avoid double are-you-sure
+		if (!makingRoomForNew)
+			StackMenu(0); // calls New, or Open, which calls InitBuffer
+	} else if (buffers.size() > 1) {
+		if (buffers.Current() >= 0 && buffers.Current() < buffers.length) {
+			UpdateBuffersCurrent();
+			AddFileToStack(CurrentBufferConst()->file);
+		}
+		closingLast = (buffers.lengthVisible == 1) && !buffers.buffers[0].pFileWorker;
+		if (closingLast) {
+			buffers.buffers[0].Init();
+			buffers.buffers[0].lifeState = Buffer::opened;
+			if (extender)
+				extender->InitBuffer(0);
+		} else {
+			if (extender)
+				extender->RemoveBuffer(buffers.Current());
+			if (buffers.buffers[buffers.Current()].pFileWorker) {
+				buffers.SetVisible(buffers.Current(), false);
+				if (buffers.lengthVisible == 0)
+					New();
+			} else {
+				wEditor.SetReadOnly(false);
+				ClearDocument();
+				buffers.RemoveCurrent();
+			}
+			if (extender && !makingRoomForNew)
+				extender->ActivateBuffer(buffers.Current());
+		}
+		const Buffer &bufferNext = buffers.buffers[buffers.Current()];
+
+		if (updateUI)
+			SetFileName(bufferNext.file);
+		else
+			filePath = bufferNext.file;
+		propsDiscovered = bufferNext.props;
+		propsDiscovered.superPS = &propsLocal;
+		wEditor.SetDocPointer(GetDocumentAt(buffers.Current()));
+		PerformDeferredTasks();
+		if (bufferNext.lifeState == Buffer::readAll) {
+			//restoreBookmarks = true;
+			CompleteOpen(ocCompleteSwitch);
+			if (extender)
+				extender->OnOpen(filePath.AsUTF8().c_str());
+		}
+		if (closingLast) {
+			wEditor.SetReadOnly(false);
+			ClearDocument();
+		}
+		if (updateUI) {
+			CheckReload();
+			RestoreState(bufferNext, false);
+			DisplayAround(bufferNext.file);
+		}
+	}
+
+	if (updateUI && buffers.initialised) {
+		BuffersMenu();
+		UpdateStatusBar(true);
+	}
+
+	if (extender && !closingLast && !makingRoomForNew) {
+		extender->OnSwitchFile(filePath.AsUTF8().c_str());
+	}
+
+	if (closingLast && props.GetInt("quit.on.close.last") && !loadingSession) {
+		QuitProgram();
+	}
+}
+
+void SciTEBase::CloseTab(int tab) {
+	const int tabCurrent = buffers.Current();
+	if (tab == tabCurrent) {
+		if (SaveIfUnsure() != saveCancelled) {
+			Close();
+			WindowSetFocus(wEditor);
+		}
+	} else {
+		FilePath fpCurrent = buffers.buffers[tabCurrent].file.AbsolutePath();
+		SetDocumentAt(tab);
+		if (SaveIfUnsure() != saveCancelled) {
+			Close();
+			WindowSetFocus(wEditor);
+			// Return to the previous buffer
+			SetDocumentAt(buffers.GetDocumentByName(fpCurrent));
+		}
+	}
+}
+
+void SciTEBase::CloseAllBuffers(bool loadingSession) {
+	if (SaveAllBuffers(false) != saveCancelled) {
+		while (buffers.lengthVisible > 1)
+			Close(false, loadingSession);
+
+		Close(true, loadingSession);
+	}
+}
+
+SciTEBase::SaveResult SciTEBase::SaveAllBuffers(bool alwaysYes) {
+	SaveResult choice = saveCompleted;
+	UpdateBuffersCurrent();
+	const int currentBuffer = buffers.Current();
+	for (int i = 0; (i < buffers.lengthVisible) && (choice != saveCancelled); i++) {
+		if (buffers.buffers[i].isDirty) {
+			SetDocumentAt(i);
+			if (alwaysYes) {
+				if (!Save()) {
+					choice = saveCancelled;
+				}
+			} else {
+				choice = SaveIfUnsure(false);
+			}
+		}
+	}
+	SetDocumentAt(currentBuffer);
+	return choice;
+}
+
+void SciTEBase::SaveTitledBuffers() {
+	UpdateBuffersCurrent();
+	const int currentBuffer = buffers.Current();
+	for (int i = 0; i < buffers.lengthVisible; i++) {
+		if (buffers.buffers[i].isDirty && !buffers.buffers[i].file.IsUntitled()) {
+			SetDocumentAt(i);
+			Save();
+		}
+	}
+	SetDocumentAt(currentBuffer);
+}
+
+void SciTEBase::Next() {
+	int next = buffers.Current();
+	if (++next >= buffers.lengthVisible)
+		next = 0;
+	SetDocumentAt(next);
+	CheckReload();
+}
+
+void SciTEBase::Prev() {
+	int prev = buffers.Current();
+	if (--prev < 0)
+		prev = buffers.lengthVisible - 1;
+
+	SetDocumentAt(prev);
+	CheckReload();
+}
+
+void SciTEBase::ShiftTab(int indexFrom, int indexTo) {
+	buffers.ShiftTo(indexFrom, indexTo);
+	buffers.SetCurrent(indexTo);
+	BuffersMenu();
+
+	TabSelect(indexTo);
+
+	DisplayAround(buffers.buffers[buffers.Current()].file);
+}
+
+void SciTEBase::MoveTabRight() {
+	if (buffers.lengthVisible < 2) return;
+	const int indexFrom = buffers.Current();
+	int indexTo = indexFrom + 1;
+	if (indexTo >= buffers.lengthVisible) indexTo = 0;
+	ShiftTab(indexFrom, indexTo);
+}
+
+void SciTEBase::MoveTabLeft() {
+	if (buffers.lengthVisible < 2) return;
+	const int indexFrom = buffers.Current();
+	int indexTo = indexFrom - 1;
+	if (indexTo < 0) indexTo = buffers.lengthVisible - 1;
+	ShiftTab(indexFrom, indexTo);
+}
+
+void SciTEBase::NextInStack() {
+	SetDocumentAt(buffers.StackNext(), false);
+	CheckReload();
+}
+
+void SciTEBase::PrevInStack() {
+	SetDocumentAt(buffers.StackPrev(), false);
+	CheckReload();
+}
+
+void SciTEBase::EndStackedTabbing() {
+	buffers.CommitStackSelection();
+}
+
+void SciTEBase::UpdateTabs(const std::vector<GUI::gui_string> &tabNames) {
+	RemoveAllTabs();
+	for (int t = 0; t < static_cast<int>(tabNames.size()); t++) {
+		TabInsert(t, tabNames[t].c_str());
+	}
+}
+
+namespace {
+
+GUI::gui_string EscapeFilePath(const FilePath &path, [[maybe_unused]]Title destination) {
+	// Escape '&' characters in path, since they are interpreted in menus.
+	GUI::gui_string escaped(path.AsInternal());
+#if defined(_WIN32)
+	// On Windows, '&' are interpreted in menus and tab names, so we need
+	// the escaped filename
+	Substitute(escaped, GUI_TEXT("&"), GUI_TEXT("&&"));
+#else
+	if (destination == Title::menu) {
+		Substitute(escaped, GUI_TEXT("&"), GUI_TEXT("&&"));
+	}
+#endif
+	return escaped;
+}
+
+GUI::gui_string AbbreviateWithTilde(const GUI::gui_string &path) {
+#if defined(GTK)
+	const GUI::gui_string_view homeDirectory = getenv("HOME");
+	if (StartsWith(path, homeDirectory)) {
+		return GUI::gui_string(GUI_TEXT("~")) + path.substr(homeDirectory.size());
+	}
+#endif
+	return path;
+}
+
+// Produce a menu or tab title from a buffer.
+// <index> <file name> <is read only> <is dirty>
+// 3 /src/example.cxx | *
+GUI::gui_string BufferTitle([[maybe_unused]] int pos, const Buffer &buffer, Title destination,
+	PropSetFile const &props, Localization &localiser) {
+	GUI::gui_string title;
+
+	// Index
+#if defined(_WIN32) || defined(GTK)
+	if (pos < 10) {
+		const GUI::gui_string sPos = GUI::StringFromInteger((pos + 1) % 10);
+		const GUI::gui_string sHotKey = GUI_TEXT("&") + sPos + GUI_TEXT(" ");
+		if (destination == Title::menu) {
+			title = sHotKey;	// hotkey 1..0
+		} else {
+			if (props.GetInt("tabbar.hide.index") == 0) {
+#if defined(_WIN32)
+				title = sHotKey; // add hotkey to the tabbar
+#elif defined(GTK)
+				title = sPos + GUI_TEXT(" ");	// just the index
+#endif
+			}
+		}
+	}
+#endif
+
+	// File name or path
+	if (buffer.file.IsUntitled()) {
+		title += localiser.Text("Untitled");
+	} else {
+		if (destination == Title::menu) {
+			title += AbbreviateWithTilde(EscapeFilePath(buffer.file, destination));
+		} else {
+			title += EscapeFilePath(buffer.file.Name(), destination);
+		}
+	}
+
+	// Read only indicator
+	if (buffer.isReadOnly && props.GetInt("read.only.indicator")) {
+		title += GUI_TEXT(" |");
+	}
+
+	// Dirty indicator
+	if (buffer.isDirty) {
+		title += GUI_TEXT(" *");
+	}
+
+	return title;
+}
+
+}
+
+void SciTEBase::SetBuffersMenu() {
+	if (buffers.size() <= 1) {
+		DestroyMenuItem(menuBuffers, IDM_BUFFERSEP);
+	}
+
+	std::vector<GUI::gui_string> tabNames;
+
+	int pos;
+	for (pos = buffers.lengthVisible; pos < bufferMax; pos++) {
+		DestroyMenuItem(menuBuffers, IDM_BUFFER + pos);
+	}
+	if (buffers.size() > 1) {
+		constexpr int menuStart = 4;
+		SetMenuItem(menuBuffers, menuStart, IDM_BUFFERSEP, GUI_TEXT(""));
+		for (pos = 0; pos < buffers.lengthVisible; pos++) {
+			const int itemID = bufferCmdID + pos;
+			const GUI::gui_string entry = BufferTitle(pos, buffers.buffers[pos],
+				Title::menu, props, localiser);
+			SetMenuItem(menuBuffers, menuStart + pos + 1, itemID, entry.c_str());
+
+			const GUI::gui_string titleTab = BufferTitle(pos, buffers.buffers[pos],
+				Title::tab, props, localiser);
+			tabNames.push_back(titleTab);
+		}
+	}
+	UpdateTabs(tabNames);
+
+	CheckMenus();
+#if !defined(GTK)
+
+	if (tabVisible)
+		SizeSubWindows();
+#endif
+#if defined(GTK)
+	ShowTabBar();
+#endif
+}
+
+void SciTEBase::BuffersMenu() {
+	UpdateBuffersCurrent();
+	SetBuffersMenu();
+}
+
+void SciTEBase::DeleteFileStackMenu() {
+	for (int stackPos = 0; stackPos < fileStackMax; stackPos++) {
+		DestroyMenuItem(menuFile, fileStackCmdID + stackPos);
+	}
+	DestroyMenuItem(menuFile, IDM_MRU_SEP);
+}
+
+void SciTEBase::SetFileStackMenu() {
+	if (recentFileStack[0].IsSet()) {
+		SetMenuItem(menuFile, MRU_START, IDM_MRU_SEP, GUI_TEXT(""));
+		for (int stackPos = 0; stackPos < fileStackMax; stackPos++) {
+			const int itemID = fileStackCmdID + stackPos;
+			if (recentFileStack[stackPos].IsSet()) {
+				GUI::gui_string sEntry;
+
+#if defined(_WIN32) || defined(GTK)
+				GUI::gui_string sPos = GUI::StringFromInteger((stackPos + 1) % 10);
+				GUI::gui_string sHotKey = GUI_TEXT("&") + sPos + GUI_TEXT(" ");
+				sEntry = sHotKey;
+#endif
+
+				const GUI::gui_string path = EscapeFilePath(
+					recentFileStack[stackPos], Title::menu);
+
+				sEntry += path;
+				SetMenuItem(menuFile, MRU_START + stackPos + 1, itemID, sEntry.c_str());
+			}
+		}
+	}
+}
+
+bool SciTEBase::AddFileToBuffer(const BufferState &bufferState) {
+	// Return whether file loads successfully
+	bool opened = false;
+	if (bufferState.file.Exists()) {
+		opened = Open(bufferState.file, static_cast<OpenFlags>(ofForceLoad));
+		// If forced synchronous should set up position, foldState and bookmarks
+		if (opened) {
+			const int iBuffer = buffers.GetDocumentByName(bufferState.file, false);
+			if (iBuffer >= 0) {
+				buffers.buffers[iBuffer].file.scrollPosition = bufferState.file.scrollPosition;
+				buffers.buffers[iBuffer].file.selection = bufferState.file.selection;
+				buffers.buffers[iBuffer].foldState = bufferState.foldState;
+				buffers.buffers[iBuffer].bookmarks = bufferState.bookmarks;
+				if (buffers.buffers[iBuffer].lifeState == Buffer::opened) {
+					// File was opened synchronously
+					RestoreState(buffers.buffers[iBuffer], true);
+					DisplayAround(buffers.buffers[iBuffer].file);
+					wEditor.ScrollCaret();
+				}
+			}
+		}
+	}
+	return opened;
+}
+
+void SciTEBase::AddFileToStack(const RecentFile &file) {
+	if (!file.IsSet())
+		return;
+	DeleteFileStackMenu();
+	// Only stack non-empty names
+	if (file.IsSet() && !file.IsUntitled()) {
+		int eqPos = fileStackMax - 1;
+		for (int stackPos = 0; stackPos < fileStackMax; stackPos++)
+			if (recentFileStack[stackPos].SameNameAs(file))
+				eqPos = stackPos;
+		for (int stackPos = eqPos; stackPos > 0; stackPos--)
+			recentFileStack[stackPos] = recentFileStack[stackPos - 1];
+		recentFileStack[0] = file;
+	}
+	SetFileStackMenu();
+}
+
+void SciTEBase::RemoveFileFromStack(const FilePath &file) {
+	if (!file.IsSet())
+		return;
+	DeleteFileStackMenu();
+	int stackPos;
+	for (stackPos = 0; stackPos < fileStackMax; stackPos++) {
+		if (recentFileStack[stackPos].SameNameAs(file)) {
+			for (int movePos = stackPos; movePos < fileStackMax - 1; movePos++)
+				recentFileStack[movePos] = recentFileStack[movePos + 1];
+			recentFileStack[fileStackMax - 1].Init();
+			break;
+		}
+	}
+	SetFileStackMenu();
+}
+
+RecentFile SciTEBase::GetFilePosition() {
+	RecentFile rf;
+	rf.selection = GetSelectedRange();
+	rf.scrollPosition = GetCurrentScrollPosition();
+	return rf;
+}
+
+void SciTEBase::DisplayAround(const RecentFile &rf) {
+	if ((rf.selection.position != SA::InvalidPosition) && (rf.selection.anchor != SA::InvalidPosition)) {
+		SetSelection(rf.selection.anchor, rf.selection.position);
+
+		const SA::Line curTop = wEditor.FirstVisibleLine();
+		const SA::Line lineTop = wEditor.VisibleFromDocLine(rf.scrollPosition);
+		wEditor.LineScroll(0, lineTop - curTop);
+		wEditor.ChooseCaretX();
+	}
+}
+
+// Next and Prev file comments.
+// StackMenuNext and StackMenuPrev only used in single buffer mode.
+// Decided that "Prev" file should mean the file you had opened last
+// This means "Next" file means the file you opened longest ago.
+
+void SciTEBase::StackMenuNext() {
+	DeleteFileStackMenu();
+	for (int stackPos = fileStackMax - 1; stackPos >= 0; stackPos--) {
+		if (recentFileStack[stackPos].IsSet()) {
+			SetFileStackMenu();
+			StackMenu(stackPos);
+			return;
+		}
+	}
+	SetFileStackMenu();
+}
+
+void SciTEBase::StackMenuPrev() {
+	if (recentFileStack[0].IsSet()) {
+		// May need to restore last entry if removed by StackMenu
+		RecentFile rfLast = recentFileStack[fileStackMax - 1];
+		StackMenu(0);	// Swap current with top of stack
+		for (const RecentFile &rf : recentFileStack) {
+			if (rfLast.SameNameAs(rf)) {
+				rfLast.Init();
+			}
+		}
+		// And rotate the MRU
+		RecentFile rfCurrent = recentFileStack[0];
+		// Move them up
+		for (int stackPos = 0; stackPos < fileStackMax - 1; stackPos++) {
+			recentFileStack[stackPos] = recentFileStack[stackPos + 1];
+		}
+		recentFileStack[fileStackMax - 1].Init();
+		// Copy current file into first empty
+		for (RecentFile &rf : recentFileStack) {
+			if (!rf.IsSet()) {
+				if (rfLast.IsSet()) {
+					rf = rfLast;
+					rfLast.Init();
+				} else {
+					rf = rfCurrent;
+					break;
+				}
+			}
+		}
+
+		DeleteFileStackMenu();
+		SetFileStackMenu();
+	}
+}
+
+void SciTEBase::StackMenu(int pos) {
+	if (CanMakeRoom(true)) {
+		if (pos >= 0) {
+			if ((pos == 0) && (!recentFileStack[pos].IsSet())) {	// Empty
+				New();
+				SetWindowName();
+				ReadProperties();
+				SetIndentSettings();
+				SetEol();
+			} else if (recentFileStack[pos].IsSet()) {
+				RecentFile rf = recentFileStack[pos];
+				// Already asked user so don't allow Open to ask again.
+				Open(rf, ofNoSaveIfDirty);
+				CurrentBuffer()->file.scrollPosition = rf.scrollPosition;
+				CurrentBuffer()->file.selection = rf.selection;
+				DisplayAround(rf);
+			}
+		}
+	}
+}
+
+void SciTEBase::RemoveToolsMenu() {
+	for (int pos = 0; pos < toolMax; pos++) {
+		DestroyMenuItem(menuTools, IDM_TOOLS + pos);
+	}
+}
+
+void SciTEBase::SetMenuItemLocalised(int menuNumber, int position, int itemID,
+				     const char *text, const char *mnemonic) {
+	GUI::gui_string localised = localiser.Text(text);
+	SetMenuItem(menuNumber, position, itemID, localised.c_str(), GUI::StringFromUTF8(mnemonic).c_str());
+}
+
+bool SciTEBase::ToolIsImmediate(int item) {
+	std::string itemSuffix = StdStringFromInteger(item);
+	itemSuffix += '.';
+
+	std::string propName = "command.";
+	propName += itemSuffix;
+
+	std::string command = props.GetWild(propName.c_str(), FileNameExt().AsUTF8().c_str());
+	if (command.length()) {
+		JobMode jobMode(props, item, FileNameExt().AsUTF8().c_str());
+		return jobMode.jobType == jobImmediate;
+	}
+	return false;
+}
+
+void SciTEBase::SetToolsMenu() {
+	//command.name.0.*.py=Edit in PythonWin
+	//command.0.*.py="c:\program files\python\pythonwin\pythonwin" /edit c:\coloreditor.py
+	RemoveToolsMenu();
+	int menuPos = TOOLS_START;
+	for (int item = 0; item < toolMax; item++) {
+		const int itemID = IDM_TOOLS + item;
+		std::string prefix = "command.name.";
+		prefix += StdStringFromInteger(item);
+		prefix += ".";
+		std::string commandName = props.GetNewExpandString(prefix.c_str(), FileNameExt().AsUTF8().c_str());
+		if (commandName.length()) {
+			std::string sMenuItem = commandName;
+			prefix = "command.shortcut.";
+			prefix += StdStringFromInteger(item);
+			prefix += ".";
+			std::string sMnemonic = props.GetNewExpandString(prefix.c_str(), FileNameExt().AsUTF8().c_str());
+			if (item < 10 && sMnemonic.length() == 0) {
+				sMnemonic += "Ctrl+";
+				sMnemonic += StdStringFromInteger(item);
+			}
+			SetMenuItemLocalised(menuTools, menuPos, itemID, sMenuItem.c_str(),
+					     sMnemonic.length() ? sMnemonic.c_str() : nullptr);
+			menuPos++;
+		}
+	}
+
+	DestroyMenuItem(menuTools, IDM_MACRO_SEP);
+	DestroyMenuItem(menuTools, IDM_MACROLIST);
+	DestroyMenuItem(menuTools, IDM_MACROPLAY);
+	DestroyMenuItem(menuTools, IDM_MACRORECORD);
+	DestroyMenuItem(menuTools, IDM_MACROSTOPRECORD);
+	menuPos++;
+	if (macrosEnabled) {
+		SetMenuItem(menuTools, menuPos++, IDM_MACRO_SEP, GUI_TEXT(""));
+		SetMenuItemLocalised(menuTools, menuPos++, IDM_MACROLIST,
+				     "&List Macros...", "Shift+F9");
+		SetMenuItemLocalised(menuTools, menuPos++, IDM_MACROPLAY,
+				     "Run Current &Macro", "F9");
+		SetMenuItemLocalised(menuTools, menuPos++, IDM_MACRORECORD,
+				     "&Record Macro", "Ctrl+F9");
+		SetMenuItemLocalised(menuTools, menuPos, IDM_MACROSTOPRECORD,
+				     "S&top Recording Macro", "Ctrl+Shift+F9");
+	}
+}
+
+JobSubsystem SciTEBase::SubsystemType(const char *cmd) {
+	std::string subsystem = props.GetNewExpandString(cmd, FileNameExt().AsUTF8().c_str());
+	return subsystem.empty() ? jobCLI : SubsystemFromChar(subsystem.at(0));
+}
+
+void SciTEBase::ToolsMenu(int item) {
+	SelectionIntoProperties();
+
+	const std::string itemSuffix = StdStringFromInteger(item) + ".";
+	const std::string propName = std::string("command.") + itemSuffix;
+	std::string command(props.GetWild(propName.c_str(), FileNameExt().AsUTF8().c_str()));
+	if (command.length()) {
+		JobMode jobMode(props, item, FileNameExt().AsUTF8().c_str());
+		if (jobQueue.IsExecuting() && (jobMode.jobType != jobImmediate))
+			// Busy running a tool and running a second can cause failures.
+			return;
+		if (jobMode.saveBefore == 2 || (jobMode.saveBefore == 1 && (!(CurrentBuffer()->isDirty) || Save())) || SaveIfUnsure() != saveCancelled) {
+			if (jobMode.isFilter)
+				CurrentBuffer()->fileModTime -= 1;
+			if (jobMode.jobType == jobImmediate) {
+				if (extender) {
+					extender->OnExecute(command.c_str());
+				}
+			} else {
+				AddCommand(command, "", jobMode.jobType, jobMode.input, jobMode.flags);
+				if (jobQueue.HasCommandToRun())
+					Execute();
+			}
+		}
+	}
+}
+
+namespace {
+
+static SA::Line DecodeMessage(const char *cdoc, std::string &sourcePath, int format, SA::Position &column) {
+	sourcePath.clear();
+	column = -1; // default to not detected
+	switch (format) {
+	case SCE_ERR_PYTHON: {
+			// Python
+			const char *startPath = strchr(cdoc, '\"');
+			if (startPath) {
+				startPath++;
+				const char *endPath = strchr(startPath, '\"');
+				if (endPath) {
+					const ptrdiff_t length = endPath - startPath;
+					sourcePath.assign(startPath, length);
+					endPath++;
+					while (*endPath && !IsADigit(*endPath)) {
+						endPath++;
+					}
+					const SA::Line sourceNumber = IntegerFromText(endPath) - 1;
+					return sourceNumber;
+				}
+			}
+			break;
+		}
+	case SCE_ERR_GCC:
+	case SCE_ERR_GCC_INCLUDED_FROM: {
+			// GCC - look for number after colon to be line number
+			// This will be preceded by file name.
+			// Lua debug traceback messages also piggyback this style, but begin with a tab.
+			// GCC include paths are similar but start with either "In file included from " or
+			// "                 from "
+			if (format == SCE_ERR_GCC_INCLUDED_FROM) {
+				cdoc += strlen("In file included from ");
+			}
+			if (cdoc[0] == '\t')
+				++cdoc;
+			for (int i = 0; cdoc[i]; i++) {
+				if (cdoc[i] == ':' && (IsADigit(cdoc[i + 1]) || (cdoc[i + 1] == '-'))) {
+					const SA::Line sourceLine = IntegerFromText(cdoc + i + 1);
+					sourcePath.assign(cdoc, i);
+					i += 2;
+					while (IsADigit(cdoc[i]))
+						++i;
+					if (cdoc[i] == ':' && IsADigit(cdoc[i + 1]))
+						column = IntegerFromText(cdoc + i + 1) - 1;
+					// Some tools show whole file errors as occurring at line 0
+					return (sourceLine > 0) ? sourceLine - 1 : 0;
+				}
+			}
+			break;
+		}
+	case SCE_ERR_MS: {
+			// Visual *
+			const char *start = cdoc;
+			while (IsASpace(*start)) {
+				start++;
+			}
+			const char *endPath = strchr(start, '(');
+			if (endPath) {
+				if (!IsADigit(endPath[1])) {
+					// This handles the common case of include files in the C:\Program Files (x86)\ directory
+					endPath = strchr(endPath + 1, '(');
+				}
+				if (endPath) {
+					const ptrdiff_t length = endPath - start;
+					sourcePath.assign(start, length);
+					endPath++;
+					return IntegerFromText(endPath) - 1;
+				}
+			}
+			break;
+		}
+	case SCE_ERR_BORLAND: {
+			// Borland
+			const char *space = strchr(cdoc, ' ');
+			if (space) {
+				while (IsASpace(*space)) {
+					space++;
+				}
+				while (*space && !IsASpace(*space)) {
+					space++;
+				}
+				while (IsASpace(*space)) {
+					space++;
+				}
+
+				const char *space2 = nullptr;
+
+				if (strlen(space) > 2) {
+					space2 = strchr(space + 2, ':');
+				}
+
+				if (space2) {
+					while (!IsASpace(*space2)) {
+						space2--;
+					}
+
+					while (IsASpace(*(space2 - 1))) {
+						space2--;
+					}
+
+					const ptrdiff_t length = space2 - space;
+
+					if (length > 0) {
+						sourcePath.assign(space, length);
+						return IntegerFromText(space2) - 1;
+					}
+				}
+			}
+			break;
+		}
+	case SCE_ERR_PERL: {
+			// perl
+			const char *at = strstr(cdoc, " at ");
+			const char *line = strstr(cdoc, " line ");
+			if (at && line) {
+				const ptrdiff_t length = line - (at + 4);
+				if (length > 0) {
+					sourcePath.assign(at + 4, length);
+					line += 6;
+					return IntegerFromText(line) - 1;
+				}
+			}
+			break;
+		}
+	case SCE_ERR_NET: {
+			// .NET traceback
+			const char *in = strstr(cdoc, " in ");
+			const char *line = strstr(cdoc, ":line ");
+			if (in && line && (line > in)) {
+				in += 4;
+				sourcePath.assign(in, line - in);
+				line += 6;
+				return IntegerFromText(line) - 1;
+			}
+			break;
+		}
+	case SCE_ERR_LUA: {
+			// Lua 4 error looks like: last token read: `result' at line 40 in file `Test.lua'
+			const char *idLine = "at line ";
+			const char *idFile = "file ";
+			const size_t lenLine = strlen(idLine);
+			const size_t lenFile = strlen(idFile);
+			const char *line = strstr(cdoc, idLine);
+			const char *file = strstr(cdoc, idFile);
+			if (line && file) {
+				const char *fileStart = file + lenFile + 1;
+				const char *quote = strstr(fileStart, "'");
+				if (quote) {
+					const size_t length = quote - fileStart;
+					if (length > 0) {
+						sourcePath.assign(fileStart, length);
+					}
+				}
+				line += lenLine;
+				return IntegerFromText(line) - 1;
+			} else {
+				// Lua 5.1 error looks like: lua.exe: test1.lua:3: syntax error
+				// reuse the GCC error parsing code above!
+				const char *colon = strstr(cdoc, ": ");
+				if (colon)
+					return DecodeMessage(colon + 2, sourcePath, SCE_ERR_GCC, column);
+			}
+			break;
+		}
+
+	case SCE_ERR_CTAG: {
+			for (SA::Position i = 0; cdoc[i]; i++) {
+				if ((IsADigit(cdoc[i + 1]) || (cdoc[i + 1] == '/' && cdoc[i + 2] == '^')) && cdoc[i] == '\t') {
+					SA::Position j = i - 1;
+					while (j > 0 && ! strchr("\t\n\r \"$%'*,;<>?[]^`{|}", cdoc[j])) {
+						j--;
+					}
+					if (strchr("\t\n\r \"$%'*,;<>?[]^`{|}", cdoc[j])) {
+						j++;
+					}
+					sourcePath.assign(&cdoc[j], i - j);
+					// Because usually the address is a searchPattern, lineNumber has to be evaluated later
+					return 0;
+				}
+			}
+			break;
+		}
+	case SCE_ERR_PHP: {
+			// PHP error look like: Fatal error: Call to undefined function:  foo() in example.php on line 11
+			const char *idLine = " on line ";
+			const char *idFile = " in ";
+			const size_t lenLine = strlen(idLine);
+			const size_t lenFile = strlen(idFile);
+			const char *line = strstr(cdoc, idLine);
+			const char *file = strstr(cdoc, idFile);
+			if (line && file && (line > file)) {
+				file += lenFile;
+				const size_t length = line - file;
+				sourcePath.assign(file, length);
+				line += lenLine;
+				return IntegerFromText(line) - 1;
+			}
+			break;
+		}
+
+	case SCE_ERR_ELF: {
+			// Essential Lahey Fortran error look like: Line 11, file c:\fortran90\codigo\demo.f90
+			const char *line = strchr(cdoc, ' ');
+			if (line) {
+				while (IsASpace(*line)) {
+					line++;
+				}
+				const char *file = strchr(line, ' ');
+				if (file) {
+					while (IsASpace(*file)) {
+						file++;
+					}
+					while (*file && !IsASpace(*file)) {
+						file++;
+					}
+					const size_t length = strlen(file);
+					sourcePath.assign(file, length);
+					return IntegerFromText(line) - 1;
+				}
+			}
+			break;
+		}
+
+	case SCE_ERR_IFC: {
+			/* Intel Fortran Compiler error/warnings look like:
+			 * Error 71 at (17:teste.f90) : The program unit has no name
+			 * Warning 4 at (9:modteste.f90) : Tab characters are an extension to standard Fortran 95
+			 *
+			 * Depending on the option, the error/warning messages can also appear on the form:
+			 * modteste.f90(9): Warning 4 : Tab characters are an extension to standard Fortran 95
+			 *
+			 * These are trapped by the MS handler, and are identified OK, so no problem...
+			 */
+			const char *line = strchr(cdoc, '(');
+			if (line) {
+				const char *file = strchr(line, ':');
+				if (file) {
+					file++;
+					const char *endfile = strchr(file, ')');
+					const size_t length = endfile - file;
+					sourcePath.assign(file, length);
+					line++;
+					return IntegerFromText(line) - 1;
+				}
+			}
+			break;
+		}
+
+	case SCE_ERR_ABSF: {
+			// Absoft Pro Fortran 90/95 v8.x, v9.x  errors look like: cf90-113 f90fe: ERROR SHF3D, File = shf.f90, Line = 1101, Column = 19
+			const char *idFile = " File = ";
+			const char *idLine = ", Line = ";
+			const size_t lenFile = strlen(idFile);
+			const size_t lenLine = strlen(idLine);
+			const char *file = strstr(cdoc, idFile);
+			const char *line = strstr(cdoc, idLine);
+			//const char *idColumn = ", Column = ";
+			//const char *column = strstr(cdoc, idColumn);
+			if (line && file && (line > file)) {
+				file += lenFile;
+				const size_t length = line - file;
+				sourcePath.assign(file, length);
+				line += lenLine;
+				return IntegerFromText(line) - 1;
+			}
+			break;
+		}
+
+	case SCE_ERR_IFORT: {
+			/* Intel Fortran Compiler v8.x error/warnings look like:
+			 * fortcom: Error: shf.f90, line 5602: This name does not have ...
+				 */
+			const char *idFile = ": Error: ";
+			const char *idLine = ", line ";
+			const size_t lenFile = strlen(idFile);
+			const size_t lenLine = strlen(idLine);
+			const char *file = strstr(cdoc, idFile);
+			const char *line = strstr(cdoc, idLine);
+			const char *lineend = strrchr(cdoc, ':');
+			if (line && file && (line > file)) {
+				file += lenFile;
+				const size_t length = line - file;
+				sourcePath.assign(file, length);
+				line += lenLine;
+				if ((lineend > line)) {
+					return IntegerFromText(line) - 1;
+				}
+			}
+			break;
+		}
+
+	case SCE_ERR_TIDY: {
+			/* HTML Tidy error/warnings look like:
+			 * line 8 column 1 - Error: unexpected </head> in <meta>
+			 * line 41 column 1 - Warning: <table> lacks "summary" attribute
+			 */
+			const char *line = strchr(cdoc, ' ');
+			if (line) {
+				const char *col = strchr(line + 1, ' ');
+				if (col) {
+					//*col = '\0';
+					const SA::Line lnr = IntegerFromText(line) - 1;
+					col = strchr(col + 1, ' ');
+					if (col) {
+						const char *endcol = strchr(col + 1, ' ');
+						if (endcol) {
+							//*endcol = '\0';
+							column = IntegerFromText(col) - 1;
+							return lnr;
+						}
+					}
+				}
+			}
+			break;
+		}
+
+	case SCE_ERR_JAVA_STACK: {
+			/* Java runtime stack trace
+				\tat <methodname>(<filename>:<line>)
+				 */
+			const char *startPath = strrchr(cdoc, '(') + 1;
+			const char *endPath = strchr(startPath, ':');
+			const ptrdiff_t length = endPath - startPath;
+			if (length > 0) {
+				sourcePath.assign(startPath, length);
+				const SA::Line sourceNumber = IntegerFromText(endPath + 1) - 1;
+				return sourceNumber;
+			}
+			break;
+		}
+
+	case SCE_ERR_DIFF_MESSAGE: {
+			// Diff file header, either +++ <filename> or --- <filename>, may be followed by \t
+			// Often followed by a position line @@ <linenumber>
+			const char *startPath = cdoc + 4;
+			const char *endPath = strpbrk(startPath, "\t\r\n");
+			if (endPath) {
+				const ptrdiff_t length = endPath - startPath;
+				sourcePath.assign(startPath, length);
+				return 0;
+			}
+			break;
+		}
+	}	// switch
+	return -1;
+}
+
+constexpr const char *CSI = "\033[";
+
+constexpr bool SeqEnd(int ch) noexcept {
+	return (ch == 0) || ((ch >= '@') && (ch <= '~'));
+}
+
+void RemoveEscSeq(std::string &s) {
+	size_t csi = s.find(CSI);
+	while (csi != std::string::npos) {
+		size_t endSeq = csi + 2;
+		while (endSeq < s.length() && !SeqEnd(s.at(endSeq)))
+			endSeq++;
+		s.erase(csi, endSeq-csi+1);
+		csi = s.find(CSI);
+	}
+}
+
+// Remove up to and including ch
+void Chomp(std::string &s, char ch) {
+	const size_t posCh = s.find(ch);
+	if (posCh != std::string::npos)
+		s.erase(0, posCh + 1);
+}
+
+char Severity(const std::string &message) noexcept {
+	if (message.find("fatal") != std::string::npos)
+		return 3;
+	if (message.find("error") != std::string::npos)
+		return 2;
+	if (message.find("warning") != std::string::npos)
+		return 1;
+	return 0;
+}
+
+}
+
+void SciTEBase::ShowMessages(SA::Line line) {
+	wEditor.AnnotationSetStyleOffset(diagnosticStyleStart);
+	wEditor.AnnotationSetVisible(SA::AnnotationVisible::Boxed);
+	wEditor.AnnotationClearAll();
+	TextReader acc(wOutput);
+	while ((line > 0) && (acc.StyleAt(acc.LineStart(line-1)) != SCE_ERR_CMD))
+		line--;
+	const SA::Line maxLine = wOutput.LineCount();
+	while ((line < maxLine) && (acc.StyleAt(acc.LineStart(line)) != SCE_ERR_CMD)) {
+		const SA::Position startPosLine = wOutput.LineStart(line);
+		const SA::Position lineEnd = wOutput.LineEnd(line);
+		std::string message = wOutput.StringOfSpan(SA::Span(startPosLine, lineEnd));
+		std::string source;
+		SA::Position column = 0;
+		int style = acc.StyleAt(startPosLine);
+		if ((style == SCE_ERR_ESCSEQ) || (style == SCE_ERR_ESCSEQ_UNKNOWN) || (style >= SCE_ERR_ES_BLACK)) {
+			// GCC message with ANSI escape sequences
+			RemoveEscSeq(message);
+			style = SCE_ERR_GCC;
+		}
+		const SA::Line sourceLine = DecodeMessage(message.c_str(), source, style, column);
+		Chomp(message, ':');
+		if (style == SCE_ERR_GCC) {
+			Chomp(message, ':');
+		}
+		GUI::gui_string sourceString = GUI::StringFromUTF8(source);
+		FilePath sourcePath = FilePath(sourceString).NormalizePath();
+		if (filePath.Name().SameNameAs(sourcePath.Name())) {
+			if (style == SCE_ERR_GCC) {
+				const char *sColon = strchr(message.c_str(), ':');
+				if (sColon) {
+					std::string editLine = GetLine(wEditor, sourceLine);
+					if (editLine == (sColon+1)) {
+						line++;
+						continue;
+					}
+				}
+			}
+			std::string msgCurrent = wEditor.AnnotationGetText(sourceLine);
+			if (msgCurrent.find(message) == std::string::npos) {
+				// Only append unique messages
+				std::string stylesCurrent = wEditor.AnnotationGetStyles(sourceLine);
+				if (msgCurrent.length()) {
+					msgCurrent += "\n";
+					stylesCurrent += '\0';
+				}
+				msgCurrent += message;
+				const char msgStyle = Severity(message);
+				stylesCurrent += std::string(message.length(), msgStyle);
+				wEditor.AnnotationSetText(sourceLine, msgCurrent.c_str());
+				wEditor.AnnotationSetStyles(sourceLine, stylesCurrent.c_str());
+			}
+		}
+		line++;
+	}
+}
+
+void SciTEBase::GoMessage(int dir) {
+	const SA::Position selStart = wOutput.SelectionStart();
+	const SA::Line curLine = wOutput.LineFromPosition(selStart);
+	const SA::Line maxLine = wOutput.LineCount();
+	SA::Line lookLine = curLine + dir;
+	if (lookLine < 0)
+		lookLine = maxLine - 1;
+	else if (lookLine >= maxLine)
+		lookLine = 0;
+	TextReader acc(wOutput);
+	while ((dir == 0) || (lookLine != curLine)) {
+		const SA::Position startPosLine = wOutput.LineStart(lookLine);
+		const SA::Position lineLength = wOutput.LineLength(lookLine);
+		int style = acc.StyleAt(startPosLine);
+		if (style != SCE_ERR_DEFAULT &&
+				style != SCE_ERR_CMD &&
+				style != SCE_ERR_DIFF_ADDITION &&
+				style != SCE_ERR_DIFF_CHANGED &&
+				style != SCE_ERR_DIFF_DELETION) {
+			wOutput.MarkerDeleteAll(-1);
+			wOutput.MarkerDefine(0, SA::MarkerSymbol::SmallRect);
+			wOutput.MarkerSetFore(0, ColourOfProperty(props,
+					      "error.marker.fore", ColourRGB(0x7f, 0, 0)));
+			wOutput.MarkerSetBack(0, ColourOfProperty(props,
+					      "error.marker.back", ColourRGB(0xff, 0xff, 0)));
+			wOutput.MarkerAdd(lookLine, 0);
+			wOutput.SetSel(startPosLine, startPosLine);
+			std::string message = wOutput.StringOfSpan(SA::Span(startPosLine, startPosLine + lineLength));
+			if ((style == SCE_ERR_ESCSEQ) || (style == SCE_ERR_ESCSEQ_UNKNOWN) || (style >= SCE_ERR_ES_BLACK)) {
+				// GCC message with ANSI escape sequences
+				RemoveEscSeq(message);
+				style = SCE_ERR_GCC;
+			}
+			std::string source;
+			SA::Position column;
+			SA::Line sourceLine = DecodeMessage(message.c_str(), source, style, column);
+			if (sourceLine >= 0) {
+				GUI::gui_string sourceString = GUI::StringFromUTF8(source);
+				FilePath sourcePath = FilePath(sourceString).NormalizePath();
+				if (!filePath.Name().SameNameAs(sourcePath)) {
+					FilePath messagePath;
+					bool bExists = false;
+					if (Exists(dirNameAtExecute.AsInternal(), sourceString.c_str(), &messagePath)) {
+						bExists = true;
+					} else if (Exists(dirNameForExecute.AsInternal(), sourceString.c_str(), &messagePath)) {
+						bExists = true;
+					} else if (Exists(filePath.Directory().AsInternal(), sourceString.c_str(), &messagePath)) {
+						bExists = true;
+					} else if (Exists(nullptr, sourceString.c_str(), &messagePath)) {
+						bExists = true;
+					} else {
+						// Look through buffers for name match
+						for (int i = buffers.lengthVisible - 1; i >= 0; i--) {
+							if (sourcePath.Name().SameNameAs(buffers.buffers[i].file.Name())) {
+								messagePath = buffers.buffers[i].file;
+								bExists = true;
+							}
+						}
+					}
+					if (bExists) {
+						if (!Open(messagePath, ofSynchronous)) {
+							return;
+						}
+						CheckReload();
+					}
+				}
+
+				// If ctag then get line number after search tag or use ctag line number
+				if (style == SCE_ERR_CTAG) {
+					//without following focus GetCTag wouldn't work correct
+					WindowSetFocus(wOutput);
+					std::string cTag = GetCTag();
+					if (cTag.length() != 0) {
+						if (atoi(cTag.c_str()) > 0) {
+							//if tag is linenumber, get line
+							sourceLine = IntegerFromText(cTag.c_str()) - 1;
+						} else {
+							findWhat = cTag;
+							FindNext(false);
+							//get linenumber for marker from found position
+							sourceLine = wEditor.LineFromPosition(wEditor.CurrentPos());
+						}
+					}
+				}
+
+				else if (style == SCE_ERR_DIFF_MESSAGE) {
+					const bool isAdd = message.find("+++ ") == 0;
+					const SA::Line atLine = lookLine + (isAdd ? 1 : 2); // lines are in this order: ---, +++, @@
+					std::string atMessage = GetLine(wOutput, atLine);
+					if (StartsWith(atMessage, "@@ -")) {
+						size_t atPos = 4; // deleted position starts right after "@@ -"
+						if (isAdd) {
+							const size_t linePlace = atMessage.find(" +", 7);
+							if (linePlace != std::string::npos)
+								atPos = linePlace + 2; // skip "@@ -1,1" and then " +"
+						}
+						sourceLine = IntegerFromText(atMessage.c_str() + atPos) - 1;
+					}
+				}
+
+				if (props.GetInt("error.inline")) {
+					ShowMessages(lookLine);
+				}
+
+				wEditor.MarkerDeleteAll(0);
+				wEditor.MarkerDefine(0, SA::MarkerSymbol::Circle);
+				wEditor.MarkerSetFore(0, ColourOfProperty(props,
+						      "error.marker.fore", ColourRGB(0x7f, 0, 0)));
+				wEditor.MarkerSetBack(0, ColourOfProperty(props,
+						      "error.marker.back", ColourRGB(0xff, 0xff, 0)));
+				wEditor.MarkerAdd(sourceLine, 0);
+				SA::Position startSourceLine = wEditor.LineStart(sourceLine);
+				const SA::Position endSourceline = wEditor.LineStart(sourceLine + 1);
+				if (column >= 0) {
+					// Get the position in line according to current tab setting
+					startSourceLine = wEditor.FindColumn(sourceLine, column);
+				}
+				EnsureRangeVisible(wEditor, SA::Span(startSourceLine));
+				if (props.GetInt("error.select.line") == 1) {
+					//select whole source source line from column with error
+					SetSelection(endSourceline, startSourceLine);
+				} else {
+					//simply move cursor to line, don't do any selection
+					SetSelection(startSourceLine, startSourceLine);
+				}
+				std::replace(message.begin(), message.end(), '\t', ' ');
+				::Remove(message, std::string("\n"));
+				props.Set("CurrentMessage", message.c_str());
+				UpdateStatusBar(false);
+				WindowSetFocus(wEditor);
+			}
+			return;
+		}
+		lookLine += dir;
+		if (lookLine < 0)
+			lookLine = maxLine - 1;
+		else if (lookLine >= maxLine)
+			lookLine = 0;
+		if (dir == 0)
+			return;
+	}
+}
+
diff --git a/scite-app/scite/src/SciTEGlobal.properties b/scite-app/scite/src/SciTEGlobal.properties
new file mode 100644
index 0000000..065edc8
--- /dev/null
+++ b/scite-app/scite/src/SciTEGlobal.properties
@@ -0,0 +1,545 @@
+# Global initialisation file for SciTE
+# For Linux, place in $prefix/share/scite
+# For Windows, place in same directory as SciTE.EXE (or Sc1.EXE)
+# Documentation at http://www.scintilla.org/SciTEDoc.html
+
+# Globals
+
+# Window sizes and visibility
+if PLAT_WIN
+	position.left=0
+	position.top=0
+if PLAT_GTK
+	position.left=5
+	position.top=22
+position.width=$(scale 576)
+position.height=$(scale 740)
+#position.maximize=1
+#position.tile=1
+#full.screen.hides.menu=1
+#minimize.to.tray=1
+split.vertical=1
+#split.wide=1
+#output.horizontal.size=200
+#output.vertical.size=60
+#output.initial.hide=1
+#horizontal.scrollbar=0
+#horizontal.scroll.width=10000
+#horizontal.scroll.width.tracking=0
+#output.horizontal.scrollbar=0
+#output.horizontal.scroll.width=10000
+#output.horizontal.scroll.width.tracking=0
+#output.scroll=0
+#error.select.line=1
+#end.at.last.line=0
+tabbar.visible=1
+#tabbar.hide.one=1
+#tabbar.hide.index=1
+#tabbar.multiline=1
+#toolbar.visible=1
+#toolbar.usestockicons=1
+#toolbar.large=1
+#menubar.detachable=1
+#undo.redo.lazy=1
+#statusbar.visible=1
+#fileselector.width=800
+#fileselector.height=600
+#fileselector.show.hidden=1
+#magnification=-1
+#output.magnification=-1
+
+# Sizes and visibility in edit pane
+#line.margin.visible=1
+line.margin.width=4
+margin.width=$(scale 16)
+fold.margin.width=$(scale 14)
+#fold.margin.colour=#FF0000
+#fold.margin.highlight.colour=#0000FF
+#blank.margin.left=4
+#blank.margin.right=4
+#output.blank.margin.left=4
+buffered.draw=0
+#phases.draw=2
+if PLAT_WIN
+	technology=1
+#font.quality=3
+#font.locale=zh-Hans
+if PLAT_MAC
+	font.quality=3
+
+# Element styles
+#view.eol=1
+#control.char.symbol=.
+#representations=\x0D\x0A=\u20AA
+caret.period=500
+view.whitespace=0
+view.indentation.whitespace=1
+view.indentation.guides=1
+view.indentation.examine=3
+highlight.indentation.guides=1
+#caret.fore=#FF0000
+#caret.additional.blinks=0
+#caret.style=2
+#caret.width=2
+#caret.line.back=#FFFED83F
+#caret.line.layer=1
+#caret.line.frame=1
+edge.column=200
+edge.mode=0
+edge.colour=#C0DCC0
+braces.check=1
+braces.sloppy=1
+#selection.fore=#006000
+selection.layer=2
+if PLAT_WINNT
+	selection.back=#00000020
+if PLAT_GTK
+	selection.back=#0000001E
+	selection.secondary.back=#00800010
+if PLAT_MAC
+	selection.back=#00000020
+selection.additional.back=#00000010
+selection.inactive.back=#00000010
+#selection.additional.fore=#0000A0
+selection.always.visible=1
+#selection.rectangular.switch.mouse=1
+#selection.multiple=0
+#selection.additional.typing=0
+#selection.multipaste=0
+#virtual.space=3
+#rectangular.selection.modifier=8
+#whitespace.fore=#FF0000
+#whitespace.back=#FFF0F0
+#whitespace.size=2
+#error.marker.fore=#0000A0
+#error.marker.back=#DADAFF
+#error.inline=1
+bookmark.fore=#BE0000
+#bookmark.back=#FFFFA0
+#bookmark.alpha=
+#bookmark.stroke.width=200
+#bookmark.symbol=3
+#find.mark=#0000FF
+#find.mark.indicator=style:compositionthick,colour:#FFB700,under
+#highlight.current.word=1
+#highlight.current.word.by.style=1
+#highlight.current.word.colour=#00D040
+#highlight.current.word.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80
+#indicators.alpha=63
+#indicators.under=1
+
+# Scripting
+ext.lua.startup.script=$(SciteUserHome)/SciTEStartup.lua
+ext.lua.auto.reload=1
+#ext.lua.reset=1
+
+# Checking
+are.you.sure=1
+#are.you.sure.for.build=1
+#save.all.for.build=1
+#quit.on.close.last=1
+#load.on.activate=1
+#save.on.deactivate=1
+#are.you.sure.on.reload=1
+#save.on.timer=20
+#reload.preserves.undo=1
+#check.if.already.open=1
+#temp.files.sync.load=1
+default.file.ext=.cxx
+#source.default.extensions=.h|.cxx|.bat
+#title.full.path=1
+#title.show.buffers=1
+#pathbar.visible=1
+#save.recent=1
+#save.session=1
+#session.bookmarks=1
+#session.folds=1
+#save.position=1
+#save.find=1
+#open.dialog.in.file.directory=1
+#strip.trailing.spaces=1
+#ensure.final.line.end=1
+#ensure.consistent.line.ends=1
+#save.deletes.first=1
+#save.check.modified.time=1
+buffers=100
+#buffers.zorder.switching=1
+#api.*.cxx=d:\api\w.api
+#locale.properties=locale.de.properties
+#translation.missing=***
+#read.only=1
+#read.only.indicator=1
+#background.open.size=20000
+#background.save.size=20000
+if PLAT_GTK
+	background.save.size=10000000
+#max.file.size=1
+file.size.large=100000000
+file.size.no.styles=10000000
+#lexilla.path=.
+
+# Indentation
+tabsize=8
+indent.size=8
+use.tabs=1
+#indent.auto=1
+indent.automatic=1
+indent.opening=0
+indent.closing=0
+#tab.indents=0
+#backspace.unindents=0
+
+# Wrapping of long lines
+#wrap=1
+#wrap.style=2
+#cache.layout=3
+#output.wrap=1
+#output.cache.layout=3
+#wrap.visual.flags=3
+#wrap.visual.flags.location=3
+#wrap.indent.mode=1
+#wrap.visual.startindent=4
+
+#idle.styling=1
+#output.idle.styling=1
+
+# Folding
+# enable folding, and show lines below when collapsed.
+fold=1
+fold.compact=1
+fold.flags=16
+fold.symbols=1
+#fold.fore=#000000
+#fold.back=#808080
+#fold.highlight=1
+#fold.highlight.colour=#00C0C0
+#fold.stroke.width=200
+#fold.on.open=1
+fold.comment=1
+fold.preprocessor=1
+
+# Find and Replace
+# Internal search always available with recursive capability so use in preference to external tool
+find.command=
+# findstr is available on recent versions of Windows including 2000
+#if PLAT_WIN
+#	find.command=findstr /n /s $(find.what) $(find.files)
+#find.input=$(find.what)
+#if PLAT_GTK
+#	find.command=grep --line-number "$(find.what)" $(find.files)
+find.files=*.c *.cxx *.h
+#find.in.files.close.on.find=0
+#find.in.dot=1
+#find.in.binary=1
+#find.in.directory=
+#find.close.on.find=0
+#find.replace.matchcase=1
+#find.replace.escapes=1
+#find.replace.regexp=1
+#find.replace.regexp.posix=1
+#find.replace.regexp.cpp11=1
+#find.replace.wrap=0
+#find.replacewith.focus=0
+#find.replace.advanced=1
+find.use.strip=1
+#find.strip.incremental=1
+#find.indicator.incremental=style:compositionthick,colour:#FFB700,under
+replace.use.strip=1
+#replace.strip.incremental=1
+#strip.button.height=24
+#strip.shortcuts.enable=0
+
+# Behaviour
+#eol.mode=LF
+eol.auto=1
+clear.before.execute=0
+#vc.home.key=1
+#wrap.aware.home.end.keys=1
+#autocompleteword.automatic=1
+#autocomplete.choose.single=1
+#autocomplete.*.fillups=([
+#autocomplete.*.start.characters=.:
+#autocomplete.*.typesep=!
+#autocomplete.fore=#80FFA0
+#autocomplete.back=#000000
+#autocomplete.selected.fore=#00FF40
+#autocomplete.selected.back=#006040
+#autocomplete.visible.item.count=15
+
+caret.policy.xslop=1
+caret.policy.width=20
+caret.policy.xstrict=0
+caret.policy.xeven=0
+caret.policy.xjumps=0
+caret.policy.yslop=1
+caret.policy.lines=1
+caret.policy.ystrict=1
+caret.policy.yeven=1
+caret.policy.yjumps=0
+#visible.policy.strict=1
+#visible.policy.slop=1
+#visible.policy.lines=4
+#time.commands=1
+#caret.sticky=1
+#properties.directory.enable=1
+#editor.config.enable=1
+#save.path.suggestion=$(SciteUserHome)\note_$(TimeStamp).txt
+
+# Status Bar
+statusbar.number=4
+statusbar.text.1=\
+li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr)
+statusbar.text.2=\
+$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars.
+statusbar.text.3=\
+Now is: Date=$(CurrentDate) Time=$(CurrentTime)
+statusbar.text.4=\
+$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr)
+
+if PLAT_WIN
+	command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html"
+	command.scite.help.subsystem=2
+if PLAT_GTK
+	command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
+
+# Internationalisation
+# Japanese input code page 932 and ShiftJIS character set 128
+#code.page=932
+#character.set=128
+# Unicode
+#code.page=65001
+code.page=0
+#character.set=204
+#command.discover.properties=python /home/user/FileDetect.py "$(FilePath)"
+# Forward LC_CTYPE to setlocale which may affect language support.
+#LC_CTYPE=en_US.UTF-8
+if PLAT_GTK
+	output.code.page=65001
+if PLAT_MAC
+	output.code.page=65001
+#ime.interaction=1
+#ime.autocomplete=1
+#accessibility=0
+
+# Export
+#export.keep.ext=1
+export.html.wysiwyg=1
+#export.html.tabs=1
+#export.html.folding=1
+export.html.styleused=1
+#export.html.title.fullpath=1
+#export.rtf.tabs=1
+#export.rtf.font.face=Arial
+#export.rtf.font.size=9
+#export.rtf.tabsize=8
+#export.rtf.wysiwyg=0
+#export.tex.title.fullpath=1
+# Magnification (added to default screen font size)
+export.pdf.magnification=0
+# Font: Courier, Helvetica or Times (Courier line-wraps)
+export.pdf.font=Helvetica
+# Page size (in points): width, height
+# E.g. Letter 612,792; A4 595,842; maximum 14400,14400
+export.pdf.pagesize=595,842
+# Margins (in points): left, right, top, bottom
+export.pdf.margins=72,72,72,72
+export.xml.collapse.spaces=1
+export.xml.collapse.lines=1
+
+# Define values for use in the imported properties files
+chars.alpha=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+chars.numeric=0123456789
+chars.accented=�������������������������������������������������������������������
+# This is a better set for Russian:
+#chars.accented=�����������娸����������������������������������������������������
+
+# The open.filter setting is used in the file selector which has a menu of filters to apply
+# to the types of files seen when opening.
+
+# Gather all settings with "*source.patterns." prefix from all active .properties files
+source.files=$(star *source.patterns.)
+source.all.filter=All Source|$(source.files)|
+
+# Each platform has a different idea of the most important filters
+if PLAT_WIN
+	all.files=All Files (*.*)|*.*|
+	top.filters=$(source.all.filter)$(all.files)
+if PLAT_GTK
+	all.files=All Files (*)|*|Hidden Files (.*)|.*|
+	top.filters=$(source.all.filter)$(all.files)
+# As OS X only greys out filtered files, show all as default
+if PLAT_MAC
+	all.files=All Files (*.*)|*.*|
+	top.filters=$(all.files)$(source.all.filter)
+
+# Gather all settings with "*filter." prefix from all active .properties files
+list.filters=$(star *filter.)
+
+open.filter=$(top.filters)$(list.filters)
+
+#save.filter=$(open.filter)
+
+# Give symbolic names to the set of fonts used in the standard styles.
+if PLAT_WIN
+	font.base=font:Verdana,size:9.4
+	font.small=font:Verdana,size:8
+	font.comment=font:Georgia,size:10.1
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:11
+	font.text.comment=font:Verdana,size:9
+	font.embedded.base=font:Verdana,size:9
+	font.embedded.comment=font:Comic Sans MS,size:8
+	font.monospace=font:Consolas,size:8.9
+	font.monospace.small=font:Consolas,size:8
+	font.vbs=font:Candara,size:10
+if PLAT_GTK
+	font.base=font:DejaVu Sans,size:9
+	font.small=font:DejaVu Sans,size:8
+	font.comment=font:DejaVu Serif,size:9
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:DejaVu Serif,size:10
+	font.text.comment=font:Serif,size:9
+	font.embedded.base=font:Serif,size:9
+	font.embedded.comment=font:Serif,size:9
+	font.monospace=font:DejaVu Sans Mono,size:9
+	font.monospace.small=font:DejaVu Sans Mono,size:8
+	font.vbs=font:DejaVu Sans Mono,size:9
+if PLAT_MAC
+	font.base=font:Verdana,size:12
+	font.small=font:Verdana,size:10
+	font.comment=font:Georgia,size:13
+	font.code.comment.box=$(font.comment)
+	font.code.comment.line=$(font.comment)
+	font.code.comment.doc=$(font.comment)
+	font.code.comment.nested=$(font.comment)
+	font.text=font:Times New Roman,size:13
+	font.text.comment=font:Verdana,size:11
+	font.embedded.base=font:Verdana,size:11
+	font.embedded.comment=font:Comic Sans MS,size:10
+	font.monospace=font:Courier New,size:12
+	font.monospace.small=font:Courier New,size:10
+	font.vbs=font:Lucida Sans Unicode,size:12
+font.js=$(font.comment)
+
+# Give symbolic names to the set of colours used in the standard styles.
+colour.code.comment.box=fore:#007F00
+colour.code.comment.line=fore:#007F00
+colour.code.comment.doc=fore:#3F703F
+colour.code.comment.nested=fore:#A0C0A0
+colour.text.comment=fore:#0000FF,back:#D0F0D0
+colour.other.comment=fore:#007F00
+colour.embedded.comment=back:#E0EEFF
+colour.embedded.js=back:#F0F0FF
+colour.notused=back:#FF0000
+
+colour.number=fore:#007F7F
+colour.keyword=fore:#00007F
+colour.string=fore:#7F007F
+colour.char=fore:#7F007F
+colour.operator=fore:#000000
+colour.preproc=fore:#7F7F00
+colour.error=fore:#FFFF00,back:#FF0000
+
+# To de-emphasize inactive code set traits.inactive
+#traits.inactive=,back:#F0F0F0,eolfilled
+traits.inactive=
+
+# Global default styles for all languages
+# Default
+style.*.32=$(font.base)
+# Line number
+style.*.33=back:#E7E7E7,$(font.base)
+# Brace highlight
+style.*.34=fore:#0000FF,bold
+# Brace incomplete highlight
+style.*.35=fore:#FF0000,bold
+# Control characters
+style.*.36=
+# Indentation guides
+style.*.37=fore:#C0C0C0,back:#FFFFFF
+
+# Printing
+#print.colour.mode=1
+print.magnification=-1
+# Windows-only setup: left, right, top, bottom margins, in local units:
+# hundredths of millimeters or thousandths of inches
+print.margins=1500,1000,1000,1500
+# Header/footer:
+print.header.format=$(FileNameExt) -- Printed on $(CurrentDate), $(CurrentTime) -- Page $(CurrentPage)
+print.footer.format=$(FilePath) -- File date: $(FileDate) -- File time: $(FileTime)
+# Header/footer style
+print.header.style=font:Arial,size:12,bold
+print.footer.style=font:Arial Narrow,size:10,italics
+
+# Experimental undocumented settings
+#bidirectional=1
+
+# Warnings - only works on Windows and needs to be pointed at files on machine
+#if PLAT_WIN
+#	warning.findwrapped=100,E:\Windows\Media\SFX\Boing.wav
+#	warning.notfound=0,Effect.wav
+#	warning.wrongfile=0,Glass.wav
+#	warning.executeok=0,Fanfare.wav
+#	warning.executeko=100,GlassBreak.wav
+#	warning.nootherbookmark=100,Boing2.wav
+
+#create.hidden.console=1
+
+# Define the Lexer menu,
+# Each item contains three parts: menu string | file extension | key
+# The only keys allowed currently are based on F-keys and alphabetic keys and look like
+# [Ctrl+][Shift+][Fn|a] such as F12 or Ctrl+Shift+D.
+# A '&' may be placed before a letter to be used as an accelerator. This does not work on GTK+.
+
+keyText=Shift+F11
+keyMake=Ctrl+Shift+F11
+keyHTML=F12
+keyXML=Shift+F12
+keyIndent=Ctrl+Shift+F12
+# On OS X, F11 is used by Expose, F12 by Dashbard
+if PLAT_MAC
+	os.x.home.end.keys=1
+	keyText=Shift+F13
+	keyMake=Ctrl+Shift+F13
+	keyHTML=Ctrl+Shift+F14
+	keyXML=Shift+F14
+	keyIndent=
+
+# Gather all settings with "*language." prefix from all active .properties files
+menu.language=$(star *language.)
+
+# User defined key commands
+user.shortcuts=\
+Ctrl+Shift+V|IDM_PASTEANDDOWN|\
+Ctrl+PageUp|IDM_PREVFILE|\
+Ctrl+PageDown|IDM_NEXTFILE|
+
+#KeypadPlus|IDM_EXPAND|\
+#KeypadMinus|IDM_BLOCK_COMMENT|
+
+#user.context.menu=\
+#||\
+#Next File|IDM_NEXTFILE|\
+#Prev File|IDM_PREVFILE|
+
+# To keep menus short, these .properties files are not loaded by default.
+imports.exclude=abaqus asl asn1 au3 ave avs baan blitzbasic bullant \
+cil cmake cobol coffeescript csound dataflex ecl eiffel erlang escript \
+flagship forth freebasic fsharp \
+gap haskell hex inno kix latex lot lout \
+markdown maxima metapost mmixal modula3 nim nimrod nncrontab nsis \
+opal oscript pov powerpro powershell ps purebasic r raku rebol rust \
+sas scriptol smalltalk sorcins spice specman \
+tacl tal txt2tags verilog vhdl visualprolog
+# The set of imports allowed can be set with
+#imports.include=ave
+
+# Import all the language specific properties files in this directory
+import *
+
diff --git a/scite-app/scite/src/SciTEIO.cxx b/scite-app/scite/src/SciTEIO.cxx
new file mode 100644
index 0000000..2873306
--- /dev/null
+++ b/scite-app/scite/src/SciTEIO.cxx
@@ -0,0 +1,1584 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEIO.cxx
+ ** Manage input and output with the system.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+// Older versions of GNU stdint.h require this definition to be able to see INT32_MAX
+#define __STDC_LIMIT_MACROS
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+
+#include "ILoader.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+#include "Utf8_16.h"
+
+#if defined(GTK)
+const GUI::gui_char propUserFileName[] = GUI_TEXT(".SciTEUser.properties");
+#elif defined(__APPLE__)
+const GUI::gui_char propUserFileName[] = GUI_TEXT("SciTEUser.properties");
+#else
+// Windows
+const GUI::gui_char propUserFileName[] = GUI_TEXT("SciTEUser.properties");
+#endif
+const GUI::gui_char propGlobalFileName[] = GUI_TEXT("SciTEGlobal.properties");
+const GUI::gui_char propAbbrevFileName[] = GUI_TEXT("abbrev.properties");
+
+void SciTEBase::SetFileName(const FilePath &openName, bool fixCase) {
+	if (openName.AsInternal()[0] == '\"') {
+		// openName is surrounded by double quotes
+		GUI::gui_string pathCopy = openName.AsInternal();
+		pathCopy = pathCopy.substr(1, pathCopy.size() - 2);
+		filePath.Set(pathCopy);
+	} else {
+		filePath.Set(openName);
+	}
+
+	// Break fullPath into directory and file name using working directory for relative paths
+	if (!filePath.IsAbsolute()) {
+		// Relative path. Since we ran AbsolutePath, we probably are here because fullPath is empty.
+		filePath.SetDirectory(filePath.Directory());
+	}
+
+	if (fixCase) {
+		filePath.FixName();
+	}
+
+	ReadLocalPropFile();
+
+	props.Set("FilePath", filePath.AsUTF8().c_str());
+	props.Set("FileDir", filePath.Directory().AsUTF8().c_str());
+	props.Set("FileName", filePath.BaseName().AsUTF8().c_str());
+	props.Set("FileExt", filePath.Extension().AsUTF8().c_str());
+	props.Set("FileNameExt", FileNameExt().AsUTF8().c_str());
+
+	SetWindowName();
+	if (buffers.buffers.size() > 0)
+		CurrentBuffer()->file.Set(filePath);
+}
+
+// See if path exists.
+// If path is not absolute, it is combined with dir.
+// If resultPath is not NULL, it receives the absolute path if it exists.
+bool SciTEBase::Exists(const GUI::gui_char *dir, const GUI::gui_char *path, FilePath *resultPath) {
+	FilePath copy(path);
+	if (!copy.IsAbsolute() && dir) {
+		copy.SetDirectory(dir);
+	}
+	if (!copy.Exists())
+		return false;
+	if (resultPath) {
+		resultPath->Set(copy.AbsolutePath());
+	}
+	return true;
+}
+
+void SciTEBase::CountLineEnds(int &linesCR, int &linesLF, int &linesCRLF) {
+	linesCR = 0;
+	linesLF = 0;
+	linesCRLF = 0;
+	const SA::Position lengthDoc = LengthDocument();
+	char chPrev = ' ';
+	TextReader acc(wEditor);
+	char chNext = acc.SafeGetCharAt(0);
+	for (SA::Position i = 0; i < lengthDoc; i++) {
+		const char ch = chNext;
+		chNext = acc.SafeGetCharAt(i + 1);
+		if (ch == '\r') {
+			if (chNext == '\n')
+				linesCRLF++;
+			else
+				linesCR++;
+		} else if (ch == '\n') {
+			if (chPrev != '\r') {
+				linesLF++;
+			}
+		} else if (i > 1000000) {
+			return;
+		}
+		chPrev = ch;
+	}
+}
+
+void SciTEBase::DiscoverEOLSetting() {
+	SetEol();
+	if (props.GetInt("eol.auto")) {
+		int linesCR;
+		int linesLF;
+		int linesCRLF;
+		CountLineEnds(linesCR, linesLF, linesCRLF);
+		if (((linesLF >= linesCR) && (linesLF > linesCRLF)) || ((linesLF > linesCR) && (linesLF >= linesCRLF)))
+			wEditor.SetEOLMode(SA::EndOfLine::Lf);
+		else if (((linesCR >= linesLF) && (linesCR > linesCRLF)) || ((linesCR > linesLF) && (linesCR >= linesCRLF)))
+			wEditor.SetEOLMode(SA::EndOfLine::Cr);
+		else if (((linesCRLF >= linesLF) && (linesCRLF > linesCR)) || ((linesCRLF > linesLF) && (linesCRLF >= linesCR)))
+			wEditor.SetEOLMode(SA::EndOfLine::CrLf);
+	}
+}
+
+// Look inside the first line for a #! clue regarding the language
+std::string SciTEBase::DiscoverLanguage() {
+	const SA::Position length = std::min<SA::Position>(LengthDocument(), 64 * 1024);
+	std::string buf = wEditor.StringOfSpan(SA::Span(0, length));
+	std::string languageOverride;
+	std::string_view line = ExtractLine(buf);
+	if (StartsWith(line, "<?xml")) {
+		languageOverride = "xml";
+	} else if (StartsWith(line, "#!")) {
+		line.remove_prefix(2);
+		std::string l1(line);
+		std::replace(l1.begin(), l1.end(), '\\', ' ');
+		std::replace(l1.begin(), l1.end(), '/', ' ');
+		std::replace(l1.begin(), l1.end(), '\t', ' ');
+		Substitute(l1, "  ", " ");
+		Substitute(l1, "  ", " ");
+		Substitute(l1, "  ", " ");
+		::Remove(l1, std::string("\r"));
+		::Remove(l1, std::string("\n"));
+		if (StartsWith(l1, " ")) {
+			l1 = l1.substr(1);
+		}
+		std::replace(l1.begin(), l1.end(), ' ', '\0');
+		l1.append(1, '\0');
+		const char *word = l1.c_str();
+		while (*word) {
+			std::string propShBang("shbang.");
+			propShBang.append(word);
+			std::string langShBang = props.GetExpandedString(propShBang.c_str());
+			if (langShBang.length()) {
+				languageOverride = langShBang;
+			}
+			word += strlen(word) + 1;
+		}
+	}
+	if (languageOverride.length()) {
+		languageOverride.insert(0, "x.");
+	}
+	return languageOverride;
+}
+
+void SciTEBase::DiscoverIndentSetting() {
+	const SA::Position lengthDoc = std::min<SA::Position>(LengthDocument(), 1000000);
+	TextReader acc(wEditor);
+	bool newline = true;
+	int indent = 0; // current line indentation
+	int tabSizes[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // number of lines with corresponding indentation (index 0 - tab)
+	int prevIndent = 0; // previous line indentation
+	int prevTabSize = -1; // previous line tab size
+	for (int i = 0; i < lengthDoc; i++) {
+		const char ch = acc[i];
+		if (ch == '\r' || ch == '\n') {
+			indent = 0;
+			newline = true;
+		} else if (newline && ch == ' ') {
+			indent++;
+		} else if (newline) {
+			if (indent) {
+				if (indent == prevIndent && prevTabSize != -1) {
+					tabSizes[prevTabSize]++;
+				} else if (indent > prevIndent && prevIndent != -1) {
+					if (indent - prevIndent <= 8) {
+						prevTabSize = indent - prevIndent;
+						tabSizes[prevTabSize]++;
+					} else {
+						prevTabSize = -1;
+					}
+				}
+				prevIndent = indent;
+			} else if (ch == '\t') {
+				tabSizes[0]++;
+				prevIndent = -1;
+			} else {
+				prevIndent = 0;
+			}
+			newline = false;
+		}
+	}
+	// maximum non-zero indent
+	int topTabSize = -1;
+	for (int j = 0; j <= 8; j++) {
+		if (tabSizes[j] && (topTabSize == -1 || tabSizes[j] > tabSizes[topTabSize])) {
+			topTabSize = j;
+		}
+	}
+	// set indentation
+	if (topTabSize == 0) {
+		wEditor.SetUseTabs(true);
+		wEditor.SetIndent(wEditor.TabWidth());
+	} else if (topTabSize != -1) {
+		wEditor.SetUseTabs(false);
+		wEditor.SetIndent(topTabSize);
+	}
+}
+
+void SciTEBase::OpenCurrentFile(long long fileSize, bool suppressMessage, bool asynchronous) {
+	if (CurrentBuffer()->pFileWorker) {
+		// Already performing an asynchronous load or save so do not restart load
+		if (!suppressMessage) {
+			GUI::gui_string msg = LocaliseMessage("Could not open file '^0'.", filePath.AsInternal());
+			WindowMessageBox(wSciTE, msg);
+		}
+		return;
+	}
+
+	FILE *fp = filePath.Open(fileRead);
+	if (!fp) {
+		if (!suppressMessage) {
+			GUI::gui_string msg = LocaliseMessage("Could not open file '^0'.", filePath.AsInternal());
+			WindowMessageBox(wSciTE, msg);
+		}
+		if (!wEditor.UndoCollection()) {
+			wEditor.SetUndoCollection(true);
+		}
+		return;
+	}
+
+	CurrentBuffer()->SetTimeFromFile();
+
+	wEditor.BeginUndoAction();	// Group together clear and insert
+	wEditor.ClearAll();
+
+	CurrentBuffer()->lifeState = Buffer::reading;
+	if (asynchronous) {
+		// Turn grey while loading
+		wEditor.StyleSetBack(StyleDefault, 0xEEEEEE);
+		wEditor.SetReadOnly(true);
+		assert(CurrentBufferConst()->pFileWorker == nullptr);
+		Scintilla::ILoader *pdocLoad;
+		try {
+			SA::DocumentOption docOptions = SA::DocumentOption::Default;
+
+			const long long sizeLarge = props.GetLongLong("file.size.large");
+			if (sizeLarge && (fileSize > sizeLarge))
+				docOptions = SA::DocumentOption::TextLarge;
+
+			const long long sizeNoStyles = props.GetLongLong("file.size.no.styles");
+			if (sizeNoStyles && (fileSize > sizeNoStyles))
+				docOptions = static_cast<SA::DocumentOption>(
+						     static_cast<int>(docOptions) | static_cast<int>(SA::DocumentOption::StylesNone));
+
+			pdocLoad = static_cast<Scintilla::ILoader *>(
+					   wEditor.CreateLoader(static_cast<SA::Position>(fileSize) + 1000,
+								docOptions));
+		} catch (...) {
+			wEditor.SetStatus(SA::Status::Ok);
+			return;
+		}
+		CurrentBuffer()->pFileWorker = new FileLoader(this, pdocLoad, filePath, static_cast<size_t>(fileSize), fp);
+		CurrentBuffer()->pFileWorker->sleepTime = props.GetInt("asynchronous.sleep");
+		PerformOnNewThread(CurrentBuffer()->pFileWorker);
+	} else {
+		wEditor.Allocate(static_cast<SA::Position>(fileSize) + 1000);
+
+		Utf8_16_Read convert;
+		std::vector<char> data(blockSize);
+		size_t lenFile = fread(&data[0], 1, data.size(), fp);
+		const UniMode umCodingCookie = CodingCookieValue(std::string_view(data.data(), lenFile));
+		while (lenFile > 0) {
+			lenFile = convert.convert(&data[0], lenFile);
+			const char *dataBlock = convert.getNewBuf();
+			wEditor.AddText(lenFile, dataBlock);
+			lenFile = fread(&data[0], 1, data.size(), fp);
+			if (lenFile == 0) {
+				// Handle case where convert is holding a lead surrogate but no more data
+				const size_t lenFileTrail = convert.convert(nullptr, lenFile);
+				if (lenFileTrail) {
+					const char *dataTrail = convert.getNewBuf();
+					wEditor.AddText(lenFileTrail, dataTrail);
+				}
+			}
+		}
+		fclose(fp);
+		wEditor.EndUndoAction();
+
+		CurrentBuffer()->unicodeMode = static_cast<UniMode>(
+						       static_cast<int>(convert.getEncoding()));
+		// Check the first two lines for coding cookies
+		if (CurrentBuffer()->unicodeMode == uni8Bit) {
+			CurrentBuffer()->unicodeMode = umCodingCookie;
+		}
+
+		CompleteOpen(ocSynchronous);
+	}
+}
+
+void SciTEBase::TextRead(FileWorker *pFileWorker) {
+	FileLoader *pFileLoader = dynamic_cast<FileLoader *>(pFileWorker);
+	const int iBuffer = buffers.GetDocumentByWorker(pFileLoader);
+	// May not be found if load cancelled
+	if ((iBuffer >= 0) && pFileLoader) {
+		buffers.buffers[iBuffer].unicodeMode = pFileLoader->unicodeMode;
+		buffers.buffers[iBuffer].lifeState = Buffer::readAll;
+		if (pFileLoader->err) {
+			GUI::gui_string msg = LocaliseMessage("Could not open file '^0'.", pFileLoader->path.AsInternal());
+			WindowMessageBox(wSciTE, msg);
+			// Should refuse to save when failure occurs
+			buffers.buffers[iBuffer].lifeState = Buffer::empty;
+		}
+		// Switch documents
+		void *pdocLoading = pFileLoader->pLoader->ConvertToDocument();
+		pFileLoader->pLoader = nullptr;
+		SwitchDocumentAt(iBuffer, pdocLoading);
+		if (iBuffer == buffers.Current()) {
+			CompleteOpen(ocCompleteCurrent);
+			if (extender)
+				extender->OnOpen(buffers.buffers[iBuffer].file.AsUTF8().c_str());
+			RestoreState(buffers.buffers[iBuffer], true);
+			DisplayAround(buffers.buffers[iBuffer].file);
+			wEditor.ScrollCaret();
+		}
+	}
+}
+
+void SciTEBase::PerformDeferredTasks() {
+	if (buffers.buffers[buffers.Current()].futureDo & Buffer::fdFinishSave) {
+		wEditor.SetSavePoint();
+		wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+		buffers.FinishedFuture(buffers.Current(), Buffer::fdFinishSave);
+	}
+}
+
+void SciTEBase::CompleteOpen(OpenCompletion oc) {
+	wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+
+	if (oc != ocSynchronous) {
+		ReadProperties();
+	}
+
+	if (language == "" || language == "null") {
+		std::string languageOverride = DiscoverLanguage();
+		if (languageOverride.length()) {
+			CurrentBuffer()->overrideExtension = languageOverride;
+			CurrentBuffer()->lifeState = Buffer::opened;
+			ReadProperties();
+			SetIndentSettings();
+		}
+	}
+
+	if (oc != ocSynchronous) {
+		SetIndentSettings();
+		SetEol();
+		UpdateBuffersCurrent();
+		SizeSubWindows();
+	}
+
+	if (CurrentBuffer()->unicodeMode != uni8Bit) {
+		// Override the code page if Unicode
+		codePage = SA::CpUtf8;
+	} else {
+		codePage = props.GetInt("code.page");
+	}
+	wEditor.SetCodePage(codePage);
+
+	DiscoverEOLSetting();
+
+	if (props.GetInt("indent.auto")) {
+		DiscoverIndentSetting();
+	}
+
+	if (!wEditor.UndoCollection()) {
+		wEditor.SetUndoCollection(true);
+	}
+	wEditor.SetSavePoint();
+	if (props.GetInt("fold.on.open") > 0) {
+		FoldAll();
+	}
+	wEditor.GotoPos(0);
+
+	CurrentBuffer()->CompleteLoading();
+
+	Redraw();
+}
+
+void SciTEBase::TextWritten(FileWorker *pFileWorker) {
+	const FileStorer *pFileStorer = dynamic_cast<const FileStorer *>(pFileWorker);
+	assert(pFileStorer);
+	if (!pFileStorer) {
+		return;
+	}
+	const int iBuffer = buffers.GetDocumentByWorker(pFileStorer);
+
+	FilePath pathSaved = pFileStorer->path;
+	const int errSaved = pFileStorer->err;
+	const bool cancelledSaved = pFileStorer->Cancelling();
+
+	// May not be found if save cancelled or buffer closed
+	if (iBuffer >= 0) {
+		// Complete and release
+		buffers.buffers[iBuffer].CompleteStoring();
+		if (errSaved || cancelledSaved) {
+			// Background save failed (possibly out-of-space) so resurrect the
+			// buffer so can be saved to another disk or retried after making room.
+			buffers.SetVisible(iBuffer, true);
+			SetBuffersMenu();
+			if (iBuffer == buffers.Current()) {
+				wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+			}
+		} else {
+			if (!buffers.GetVisible(iBuffer)) {
+				buffers.RemoveInvisible(iBuffer);
+			}
+			if (iBuffer == buffers.Current()) {
+				wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+				if (pathSaved.SameNameAs(CurrentBuffer()->file)) {
+					wEditor.SetSavePoint();
+				}
+				if (extender)
+					extender->OnSave(buffers.buffers[iBuffer].file.AsUTF8().c_str());
+			} else {
+				buffers.buffers[iBuffer].isDirty = false;
+				buffers.buffers[iBuffer].failedSave = false;
+				// Need to make writable and set save point when next receive focus.
+				buffers.AddFuture(iBuffer, Buffer::fdFinishSave);
+				SetBuffersMenu();
+			}
+		}
+	} else {
+		GUI::gui_string msg = LocaliseMessage("Could not find buffer '^0'.", pathSaved.AsInternal());
+		WindowMessageBox(wSciTE, msg);
+	}
+
+	if (errSaved) {
+		FailedSaveMessageBox(pathSaved);
+	}
+
+	if (IsPropertiesFile(pathSaved)) {
+		ReloadProperties();
+	}
+	UpdateStatusBar(true);
+	if (!jobQueue.executing && (jobQueue.HasCommandToRun())) {
+		Execute();
+	}
+	if (quitting && !buffers.SavingInBackground()) {
+		QuitProgram();
+	}
+}
+
+void SciTEBase::UpdateProgress(Worker *) {
+	GUI::gui_string prog;
+	BackgroundActivities bgActivities = buffers.CountBackgroundActivities();
+	const int countBoth = bgActivities.loaders + bgActivities.storers;
+	if (countBoth == 0) {
+		// Should hide UI
+		ShowBackgroundProgress(GUI_TEXT(""), 0, 0);
+	} else {
+		if (countBoth == 1) {
+			prog += LocaliseMessage(bgActivities.loaders ? "Opening '^0'" : "Saving '^0'",
+						bgActivities.fileNameLast.c_str());
+		} else {
+			if (bgActivities.loaders) {
+				prog += LocaliseMessage("Opening ^0 files ", GUI::StringFromInteger(bgActivities.loaders).c_str());
+			}
+			if (bgActivities.storers) {
+				prog += LocaliseMessage("Saving ^0 files ", GUI::StringFromInteger(bgActivities.storers).c_str());
+			}
+		}
+		ShowBackgroundProgress(prog, bgActivities.totalWork, bgActivities.totalProgress);
+	}
+}
+
+bool SciTEBase::PreOpenCheck(const GUI::gui_char *) {
+	return false;
+}
+
+bool SciTEBase::Open(const FilePath &file, OpenFlags of) {
+	InitialiseBuffers();
+
+	FilePath absPath = file.AbsolutePath();
+	if (!absPath.IsUntitled() && absPath.IsDirectory()) {
+		GUI::gui_string msg = LocaliseMessage("Path '^0' is a directory so can not be opened.",
+						      absPath.AsInternal());
+		WindowMessageBox(wSciTE, msg);
+		return false;
+	}
+
+	const int index = buffers.GetDocumentByName(absPath);
+	if (index >= 0) {
+		buffers.SetVisible(index, true);
+		SetDocumentAt(index);
+		RemoveFileFromStack(absPath);
+		DeleteFileStackMenu();
+		SetFileStackMenu();
+		// If not forcing reload or currently busy with load or save, just rotate into view
+		if ((!(of & ofForceLoad)) || (CurrentBufferConst()->pFileWorker))
+			return true;
+	}
+	// See if we can have a buffer for the file to open
+	if (!CanMakeRoom(!(of & ofNoSaveIfDirty))) {
+		return false;
+	}
+
+	const long long fileSize = absPath.IsUntitled() ? 0 : absPath.GetFileLength();
+#if !defined(_WIN64)
+	// The #if is just to prevent a warning from Coverity on 64-bit Win32
+	if (fileSize > INTPTR_MAX) {
+		const GUI::gui_string sSize = GUI::StringFromLongLong(fileSize);
+		const GUI::gui_string msg = LocaliseMessage("File '^0' is ^1 bytes long, "
+					    "larger than 2GB which is the largest SciTE can open.",
+					    absPath.AsInternal(), sSize.c_str());
+		WindowMessageBox(wSciTE, msg, mbsIconWarning);
+		return false;
+	}
+#endif
+	if (fileSize > 0) {
+		// Real file, not empty buffer
+		const long long maxSize = props.GetLongLong("max.file.size", 2000000000LL);
+		if (maxSize > 0 && fileSize > maxSize) {
+			const GUI::gui_string sSize = GUI::StringFromLongLong(fileSize);
+			const GUI::gui_string sMaxSize = GUI::StringFromLongLong(maxSize);
+			const GUI::gui_string msg = LocaliseMessage("File '^0' is ^1 bytes long,\n"
+						    "larger than the ^2 bytes limit set in the properties.\n"
+						    "Do you still want to open it?",
+						    absPath.AsInternal(), sSize.c_str(), sMaxSize.c_str());
+			const MessageBoxChoice answer = WindowMessageBox(wSciTE, msg, mbsYesNo | mbsIconWarning);
+			if (answer != mbYes) {
+				return false;
+			}
+		}
+	}
+
+	if (buffers.size() == buffers.length) {
+		AddFileToStack(RecentFile(filePath, GetSelectedRange(), GetCurrentScrollPosition()));
+		ClearDocument();
+		CurrentBuffer()->lifeState = Buffer::opened;
+		if (extender)
+			extender->InitBuffer(buffers.Current());
+	} else {
+		if (index < 0 || !(of & ofForceLoad)) { // No new buffer, already opened
+			New();
+		}
+	}
+
+	assert(CurrentBufferConst()->pFileWorker == nullptr);
+	SetFileName(absPath);
+
+	propsDiscovered.Clear();
+	std::string discoveryScript = props.GetExpandedString("command.discover.properties");
+	if (discoveryScript.length()) {
+		std::string propertiesText = CommandExecute(GUI::StringFromUTF8(discoveryScript).c_str(),
+					     absPath.Directory().AsInternal());
+		if (propertiesText.size()) {
+			propsDiscovered.ReadFromMemory(propertiesText.c_str(), propertiesText.size(), absPath.Directory(), filter, nullptr, 0);
+		}
+	}
+	CurrentBuffer()->props = propsDiscovered;
+	CurrentBuffer()->overrideExtension = "";
+	ReadProperties();
+	SetIndentSettings();
+	SetEol();
+	UpdateBuffersCurrent();
+	SizeSubWindows();
+	SetBuffersMenu();
+
+	bool asynchronous = false;
+	if (!filePath.IsUntitled()) {
+		wEditor.SetReadOnly(false);
+		wEditor.Cancel();
+		if (of & ofPreserveUndo) {
+			wEditor.BeginUndoAction();
+		} else {
+			wEditor.SetUndoCollection(false);
+		}
+
+		asynchronous = (fileSize > props.GetInt("background.open.size", -1)) &&
+			       !(of & (ofPreserveUndo|ofSynchronous));
+		OpenCurrentFile(fileSize, of & ofQuiet, asynchronous);
+
+		if (of & ofPreserveUndo) {
+			wEditor.EndUndoAction();
+		} else {
+			wEditor.EmptyUndoBuffer();
+		}
+		CurrentBuffer()->isReadOnly = props.GetInt("read.only");
+		wEditor.SetReadOnly(CurrentBuffer()->isReadOnly);
+	}
+	RemoveFileFromStack(filePath);
+	DeleteFileStackMenu();
+	SetFileStackMenu();
+	SetWindowName();
+	if (lineNumbers && lineNumbersExpand)
+		SetLineNumberWidth();
+	UpdateStatusBar(true);
+	if (extender && !asynchronous)
+		extender->OnOpen(filePath.AsUTF8().c_str());
+	return true;
+}
+
+// Returns true if editor should get the focus
+bool SciTEBase::OpenSelected() {
+	std::string selName = SelectionFilename();
+	if (selName.length() == 0) {
+		WarnUser(warnWrongFile);
+		return false;	// No selection
+	}
+
+#if !defined(GTK)
+	if (StartsWith(selName, "http:") ||
+			StartsWith(selName, "https:") ||
+			StartsWith(selName, "ftp:") ||
+			StartsWith(selName, "ftps:") ||
+			StartsWith(selName, "news:") ||
+			StartsWith(selName, "mailto:")) {
+		std::string cmd = selName;
+		AddCommand(cmd, "", jobShell);
+		return false;	// Job is done
+	}
+#endif
+
+	if (StartsWith(selName, "file://")) {
+		selName.erase(0, 7);
+		if (selName[0] == '/' && selName[2] == ':') { // file:///C:/filename.ext
+			selName.erase(0, 1);
+		}
+	}
+
+	std::string fileNameForExtension = ExtensionFileName();
+	std::string openSuffix = props.GetNewExpandString("open.suffix.", fileNameForExtension.c_str());
+	selName += openSuffix;
+
+	if (EqualCaseInsensitive(selName.c_str(), FileNameExt().AsUTF8().c_str()) || EqualCaseInsensitive(selName.c_str(), filePath.AsUTF8().c_str())) {
+		WarnUser(warnWrongFile);
+		return true;	// Do not open if it is the current file!
+	}
+
+	std::string cTag;
+	SA::Line lineNumber = 0;
+	if (IsPropertiesFile(filePath) &&
+			(selName.find('.') == std::string::npos)) {
+		// We are in a properties file and try to open a file without extension,
+		// we suppose we want to open an imported .properties file
+		// So we append the correct extension to open the included file.
+		// Maybe we should check if the filename is preceded by "import"...
+		selName += extensionProperties;
+	} else {
+		// Check if we have a line number (error message or grep result)
+		// A bit of duplicate work with DecodeMessage, but we don't know
+		// here the format of the line, so we do guess work.
+		// Can't do much for space separated line numbers anyway...
+		size_t endPath = selName.find('(');
+		if (endPath != std::string::npos) {	// Visual Studio error message: F:\scite\src\SciTEBase.h(312):	bool Exists(
+			lineNumber = atol(selName.c_str() + endPath + 1);
+		} else {
+			endPath = selName.find(':', 2);	// Skip Windows' drive separator
+			if (endPath != std::string::npos) {	// grep -n line, perhaps gcc too: F:\scite\src\SciTEBase.h:312:	bool Exists(
+				lineNumber = atol(selName.c_str() + endPath + 1);
+			}
+		}
+		if (lineNumber > 0) {
+			selName.erase(endPath);
+		}
+
+		// Support the ctags format
+
+		if (lineNumber == 0) {
+			cTag = GetCTag();
+		}
+	}
+
+	FilePath path;
+	// Don't load the path of the current file if the selected
+	// filename is an absolute pathname
+	GUI::gui_string selFN = GUI::StringFromUTF8(selName);
+	if (!FilePath(selFN).IsAbsolute()) {
+		path = filePath.Directory();
+		// If not there, look in openpath
+		if (!Exists(path.AsInternal(), selFN.c_str(), nullptr)) {
+			GUI::gui_string openPath = GUI::StringFromUTF8(props.GetNewExpandString(
+							   "openpath.", fileNameForExtension.c_str()));
+			while (openPath.length()) {
+				GUI::gui_string tryPath(openPath);
+				const size_t sepIndex = tryPath.find(listSepString);
+				if ((sepIndex != GUI::gui_string::npos) && (sepIndex != 0)) {
+					tryPath.erase(sepIndex);
+					openPath.erase(0, sepIndex + 1);
+				} else {
+					openPath.erase();
+				}
+				if (Exists(tryPath.c_str(), selFN.c_str(), nullptr)) {
+					path.Set(tryPath.c_str());
+					break;
+				}
+			}
+		}
+	}
+	FilePath pathReturned;
+	if (Exists(path.AsInternal(), selFN.c_str(), &pathReturned)) {
+		// Open synchronously if want to seek line number or search tag
+		const OpenFlags of = ((lineNumber > 0) || (cTag.length() != 0)) ? ofSynchronous : ofNone;
+		if (Open(pathReturned, of)) {
+			if (lineNumber > 0) {
+				wEditor.GotoLine(lineNumber - 1);
+			} else if (cTag.length() != 0) {
+				const SA::Line cTagLine = IntegerFromText(cTag.c_str());
+				if (cTagLine > 0) {
+					wEditor.GotoLine(cTagLine - 1);
+				} else {
+					findWhat = cTag;
+					FindNext(false);
+				}
+			}
+			return true;
+		}
+	} else {
+		WarnUser(warnWrongFile);
+	}
+	return false;
+}
+
+void SciTEBase::Revert() {
+	if (filePath.IsUntitled()) {
+		wEditor.ClearAll();
+	} else {
+		RecentFile rf = GetFilePosition();
+		OpenCurrentFile(filePath.GetFileLength(), false, false);
+		DisplayAround(rf);
+	}
+}
+
+void SciTEBase::CheckReload() {
+	if (props.GetInt("load.on.activate")) {
+		// Make a copy of fullPath as otherwise it gets aliased in Open
+		const time_t newModTime = filePath.ModifiedTime();
+		if ((newModTime != 0) && (newModTime != CurrentBuffer()->fileModTime)) {
+			RecentFile rf = GetFilePosition();
+			const OpenFlags of = props.GetInt("reload.preserves.undo") ? ofPreserveUndo : ofNone;
+			if (CurrentBuffer()->isDirty || props.GetInt("are.you.sure.on.reload") != 0) {
+				if ((0 == dialogsOnScreen) && (newModTime != CurrentBuffer()->fileModLastAsk)) {
+					GUI::gui_string msg;
+					if (CurrentBuffer()->isDirty) {
+						msg = LocaliseMessage(
+							      "The file '^0' has been modified. Should it be reloaded?",
+							      filePath.AsInternal());
+					} else {
+						msg = LocaliseMessage(
+							      "The file '^0' has been modified outside SciTE. Should it be reloaded?",
+							      FileNameExt().AsInternal());
+					}
+					const MessageBoxChoice decision = WindowMessageBox(wSciTE, msg, mbsYesNo | mbsIconQuestion);
+					if (decision == mbYes) {
+						Open(filePath, static_cast<OpenFlags>(of | ofForceLoad));
+						DisplayAround(rf);
+					}
+					CurrentBuffer()->fileModLastAsk = newModTime;
+				}
+			} else {
+				Open(filePath, static_cast<OpenFlags>(of | ofForceLoad));
+				DisplayAround(rf);
+			}
+		}  else if (newModTime == 0 && CurrentBuffer()->fileModTime != 0)  {
+			// Check if the file is deleted
+			CurrentBuffer()->fileModTime = 0;
+			CurrentBuffer()->fileModLastAsk = 0;
+			CurrentBuffer()->isDirty = true;
+			CheckMenus();
+			SetWindowName();
+			SetBuffersMenu();
+			GUI::gui_string msg = LocaliseMessage(
+						      "The file '^0' has been deleted.",
+						      filePath.AsInternal());
+			WindowMessageBox(wSciTE, msg, mbsOK);
+		}
+	}
+}
+
+void SciTEBase::Activate(bool activeApp) {
+	if (activeApp) {
+		CheckReload();
+	} else {
+		if (props.GetInt("save.on.deactivate")) {
+			SaveTitledBuffers();
+		}
+	}
+}
+
+FilePath SciTEBase::SaveName(const char *ext) const {
+	GUI::gui_string savePath = filePath.AsInternal();
+	if (ext) {
+		int dot = static_cast<int>(savePath.length() - 1);
+		while ((dot >= 0) && (savePath[dot] != '.')) {
+			dot--;
+		}
+		if (dot >= 0) {
+			const int keepExt = props.GetInt("export.keep.ext");
+			if (keepExt == 0) {
+				savePath.erase(dot);
+			} else if (keepExt == 2) {
+				savePath[dot] = '_';
+			}
+		}
+		savePath += GUI::StringFromUTF8(ext);
+	}
+	//~ fprintf(stderr, "SaveName <%s> <%s> <%s>\n", filePath.AsInternal(), savePath.c_str(), ext);
+	return FilePath(savePath.c_str());
+}
+
+SciTEBase::SaveResult SciTEBase::SaveIfUnsure(bool forceQuestion, SaveFlags sf) {
+	CurrentBuffer()->failedSave = false;
+	if (CurrentBuffer()->pFileWorker) {
+		if (CurrentBuffer()->pFileWorker->IsLoading())
+			// In semi-loaded state so refuse to save
+			return saveCancelled;
+		else
+			return saveCompleted;
+	}
+	if ((CurrentBuffer()->isDirty) && (LengthDocument() || !filePath.IsUntitled() || forceQuestion)) {
+		if (props.GetInt("are.you.sure", 1) ||
+				filePath.IsUntitled() ||
+				forceQuestion) {
+			GUI::gui_string msg;
+			if (!filePath.IsUntitled()) {
+				msg = LocaliseMessage("Save changes to '^0'?", filePath.AsInternal());
+			} else {
+				msg = LocaliseMessage("Save changes to (Untitled)?");
+			}
+			const MessageBoxChoice decision = WindowMessageBox(wSciTE, msg, mbsYesNoCancel | mbsIconQuestion);
+			if (decision == mbYes) {
+				if (!Save(sf))
+					return saveCancelled;
+			}
+			return (decision == mbCancel) ? saveCancelled : saveCompleted;
+		} else {
+			if (!Save(sf))
+				return saveCancelled;
+		}
+	}
+	return saveCompleted;
+}
+
+SciTEBase::SaveResult SciTEBase::SaveIfUnsureAll() {
+	if (SaveAllBuffers(false) == saveCancelled) {
+		return saveCancelled;
+	}
+	if (props.GetInt("save.recent")) {
+		for (int i = 0; i < buffers.lengthVisible; ++i) {
+			Buffer buff = buffers.buffers[i];
+			AddFileToStack(buff.file);
+		}
+	}
+	if (props.GetInt("save.session") || props.GetInt("save.position") || props.GetInt("save.recent")) {
+		SaveSessionFile(GUI_TEXT(""));
+	}
+
+	if (extender && extender->NeedsOnClose()) {
+		// Ensure extender is told about each buffer closing
+		for (int k = 0; k < buffers.lengthVisible; k++) {
+			SetDocumentAt(k);
+			extender->OnClose(filePath.AsUTF8().c_str());
+		}
+	}
+
+	// Definitely going to exit now, so delete all documents
+	// Set editor back to initial document
+	if (buffers.lengthVisible > 0) {
+		wEditor.SetDocPointer(buffers.buffers[0].doc);
+	}
+	// Release all the extra documents
+	for (int j = 0; j < buffers.size(); j++) {
+		if (buffers.buffers[j].doc && !buffers.buffers[j].pFileWorker) {
+			wEditor.ReleaseDocument(buffers.buffers[j].doc);
+			buffers.buffers[j].doc = nullptr;
+		}
+	}
+	// Initial document will be deleted when editor deleted
+	return saveCompleted;
+}
+
+SciTEBase::SaveResult SciTEBase::SaveIfUnsureForBuilt() {
+	if (props.GetInt("save.all.for.build")) {
+		return SaveAllBuffers(!props.GetInt("are.you.sure.for.build"));
+	}
+	if (CurrentBuffer()->isDirty) {
+		if (props.GetInt("are.you.sure.for.build"))
+			return SaveIfUnsure(true);
+
+		Save();
+	}
+	return saveCompleted;
+}
+/**
+	Selection saver and restorer.
+
+	If virtual space is disabled, the class does nothing.
+
+	If virtual space is enabled, constructor saves all selections using (line, column) coordinates,
+	destructor restores all the saved selections.
+**/
+class SelectionKeeper {
+public:
+	explicit SelectionKeeper(GUI::ScintillaWindow &editor) : wEditor(editor) {
+		const SA::VirtualSpace mask = static_cast<SA::VirtualSpace>(
+						      static_cast<int>(SA::VirtualSpace::RectangularSelection) |
+						      static_cast<int>(SA::VirtualSpace::UserAccessible));
+		if (static_cast<int>(wEditor.VirtualSpaceOptions()) & static_cast<int>(mask)) {
+			const int n = wEditor.Selections();
+			for (int i = 0; i < n; ++i) {
+				selections.push_back(LocFromPos(GetSelection(i)));
+			}
+		}
+	}
+
+	~SelectionKeeper() {
+		try {
+			// Should never throw unless there was an earlier failure in Scintilla.
+			// This is just for restoring selection so swallow exceptions.
+			int i = 0;
+			for (auto const &sel : selections) {
+				SetSelection(i, PosFromLoc(sel));
+				++i;
+			}
+		} catch (...) {
+			// Ignore exceptions
+		}
+	}
+
+private:
+	struct Position {
+		Position(SA::Position pos_, SA::Position virt_) noexcept : pos(pos_), virt(virt_) {};
+		SA::Position pos;
+		SA::Position virt;
+	};
+
+	struct Location {
+		Location(SA::Line line_, SA::Position col_) noexcept : line(line_), col(col_) {};
+		SA::Line line;
+		SA::Position col;
+	};
+
+	Position GetAnchor(int i) {
+		const SA::Position pos  = wEditor.SelectionNAnchor(i);
+		const SA::Position virt = wEditor.SelectionNAnchorVirtualSpace(i);
+		return Position(pos, virt);
+	}
+
+	Position GetCaret(int i) {
+		const SA::Position pos  = wEditor.SelectionNCaret(i);
+		const SA::Position virt = wEditor.SelectionNCaretVirtualSpace(i);
+		return Position(pos, virt);
+	}
+
+	std::pair<Position, Position> GetSelection(int i) {
+		return {GetAnchor(i), GetCaret(i)};
+	};
+
+	Location LocFromPos(Position const &pos) {
+		const SA::Line line = wEditor.LineFromPosition(pos.pos);
+		const SA::Position col  = wEditor.Column(pos.pos) + pos.virt;
+		return Location(line, col);
+	}
+
+	std::pair<Location, Location> LocFromPos(std::pair<Position, Position> const &pos) {
+		return {LocFromPos(pos.first), LocFromPos(pos.second)};
+	}
+
+	Position PosFromLoc(Location const &loc) {
+		const SA::Position pos = wEditor.FindColumn(loc.line, loc.col);
+		const SA::Position col = wEditor.Column(pos);
+		return Position(pos, loc.col - col);
+	}
+
+	std::pair<Position, Position> PosFromLoc(std::pair<Location, Location> const &loc) {
+		return {PosFromLoc(loc.first), PosFromLoc(loc.second)};
+	}
+
+	void SetAnchor(int i, Position const &pos) {
+		wEditor.SetSelectionNAnchor(i, pos.pos);
+		wEditor.SetSelectionNAnchorVirtualSpace(i, pos.virt);
+	};
+
+	void SetCaret(int i, Position const &pos) {
+		wEditor.SetSelectionNCaret(i, pos.pos);
+		wEditor.SetSelectionNCaretVirtualSpace(i, pos.virt);
+	}
+
+	void SetSelection(int i, std::pair<Position, Position> const &pos) {
+		SetAnchor(i, pos.first);
+		SetCaret(i, pos.second);
+	}
+
+	GUI::ScintillaWindow &wEditor;
+	std::vector<std::pair<Location, Location>> selections;
+};
+
+void SciTEBase::StripTrailingSpaces() {
+	const SA::Line maxLines = wEditor.LineCount();
+	SelectionKeeper keeper(wEditor);
+	for (int line = 0; line < maxLines; line++) {
+		const SA::Position lineStart = wEditor.LineStart(line);
+		const SA::Position lineEnd = wEditor.LineEnd(line);
+		SA::Position i = lineEnd - 1;
+		char ch = wEditor.CharacterAt(i);
+		while ((i >= lineStart) && ((ch == ' ') || (ch == '\t'))) {
+			i--;
+			ch = wEditor.CharacterAt(i);
+		}
+		if (i < (lineEnd - 1)) {
+			wEditor.SetTarget(SA::Span(i + 1, lineEnd));
+			wEditor.ReplaceTarget("");
+		}
+	}
+}
+
+void SciTEBase::EnsureFinalNewLine() {
+	const SA::Line maxLines = wEditor.LineCount();
+	bool appendNewLine = maxLines == 1;
+	const SA::Position endDocument = wEditor.LineStart(maxLines);
+	if (maxLines > 1) {
+		appendNewLine = endDocument > wEditor.LineStart(maxLines - 1);
+	}
+	if (appendNewLine) {
+		const char *eol = "\n";
+		switch (wEditor.EOLMode()) {
+		case SA::EndOfLine::CrLf:
+			eol = "\r\n";
+			break;
+		case SA::EndOfLine::Cr:
+			eol = "\r";
+			break;
+		case SA::EndOfLine::Lf:
+			break;
+		}
+		wEditor.InsertText(endDocument, eol);
+	}
+}
+
+// Perform any changes needed before saving such as normalizing spaces and line ends.
+bool SciTEBase::PrepareBufferForSave(const FilePath &saveName) {
+	bool retVal = false;
+	// Perform clean ups on text before saving
+	wEditor.BeginUndoAction();
+	if (stripTrailingSpaces)
+		StripTrailingSpaces();
+	if (ensureFinalLineEnd)
+		EnsureFinalNewLine();
+	if (ensureConsistentLineEnds)
+		wEditor.ConvertEOLs(wEditor.EOLMode());
+
+	if (extender)
+		retVal = extender->OnBeforeSave(saveName.AsUTF8().c_str());
+
+	wEditor.EndUndoAction();
+
+	return retVal;
+}
+
+/**
+ * Writes the buffer to the given filename.
+ */
+bool SciTEBase::SaveBuffer(const FilePath &saveName, SaveFlags sf) {
+	bool retVal = PrepareBufferForSave(saveName);
+
+	if (!retVal) {
+
+		FILE *fp = saveName.Open(fileWrite);
+		if (fp) {
+			const size_t lengthDoc = LengthDocument();
+			if (!(sf & sfSynchronous)) {
+				wEditor.SetReadOnly(true);
+				const char *documentBytes = static_cast<const char *>(wEditor.CharacterPointer());
+				CurrentBuffer()->pFileWorker = new FileStorer(this, documentBytes, saveName, lengthDoc, fp, CurrentBuffer()->unicodeMode, (sf & sfProgressVisible));
+				CurrentBuffer()->pFileWorker->sleepTime = props.GetInt("asynchronous.sleep");
+				if (PerformOnNewThread(CurrentBuffer()->pFileWorker)) {
+					retVal = true;
+				} else {
+					GUI::gui_string msg = LocaliseMessage("Failed to save file '^0' as thread could not be started.", saveName.AsInternal());
+					WindowMessageBox(wSciTE, msg);
+				}
+			} else {
+				Utf8_16_Write convert;
+				if (CurrentBuffer()->unicodeMode != uniCookie) {	// Save file with cookie without BOM.
+					convert.setEncoding(static_cast<Utf8_16::encodingType>(
+								    static_cast<int>(CurrentBuffer()->unicodeMode)));
+				}
+				convert.setfile(fp);
+				std::vector<char> data(blockSize + 1);
+				retVal = true;
+				size_t grabSize = 0;
+				for (size_t i = 0; i < lengthDoc; i += grabSize) {
+					grabSize = lengthDoc - i;
+					if (grabSize > blockSize)
+						grabSize = blockSize;
+					// Round down so only whole characters retrieved.
+					grabSize = wEditor.PositionBefore(i + grabSize + 1) - i;
+					const SA::Span rangeGrab(static_cast<SA::Position>(i),
+								  static_cast<SA::Position>(i + grabSize));
+					wEditor.SetTarget(rangeGrab);
+					wEditor.TargetText(&data[0]);
+					const size_t written = convert.fwrite(&data[0], grabSize);
+					if (written == 0) {
+						retVal = false;
+						break;
+					}
+				}
+				if (convert.fclose() != 0) {
+					retVal = false;
+				}
+			}
+		}
+	}
+
+	if (retVal && extender && (sf & sfSynchronous)) {
+		extender->OnSave(saveName.AsUTF8().c_str());
+	}
+	UpdateStatusBar(true);
+	return retVal;
+}
+
+void SciTEBase::ReloadProperties() {
+	ReadGlobalPropFile();
+	SetImportMenu();
+	ReadLocalPropFile();
+	ReadAbbrevPropFile();
+	ReadProperties();
+	SetWindowName();
+	BuffersMenu();
+	Redraw();
+}
+
+// Returns false if cancelled or failed to save
+bool SciTEBase::Save(SaveFlags sf) {
+	if (!filePath.IsUntitled()) {
+		GUI::gui_string msg;
+		if (CurrentBuffer()->ShouldNotSave()) {
+			msg = LocaliseMessage(
+				      "The file '^0' has not yet been loaded entirely, so it can not be saved right now. Please retry in a while.",
+				      filePath.AsInternal());
+			WindowMessageBox(wSciTE, msg);
+			// It is OK to not save this file
+			return true;
+		}
+
+		if (CurrentBuffer()->pFileWorker) {
+			msg = LocaliseMessage(
+				      "The file '^0' is already being saved.",
+				      filePath.AsInternal());
+			WindowMessageBox(wSciTE, msg);
+			// It is OK to not save this file
+			return true;
+		}
+
+		if (props.GetInt("save.deletes.first")) {
+			filePath.Remove();
+		} else if (props.GetInt("save.check.modified.time")) {
+			const time_t newModTime = filePath.ModifiedTime();
+			if ((newModTime != 0) && (CurrentBuffer()->fileModTime != 0) &&
+					(newModTime != CurrentBuffer()->fileModTime)) {
+				msg = LocaliseMessage("The file '^0' has been modified outside SciTE. Should it be saved?",
+						      filePath.AsInternal());
+				const MessageBoxChoice decision = WindowMessageBox(wSciTE, msg, mbsYesNo | mbsIconQuestion);
+				if (decision == mbNo) {
+					return false;
+				}
+			}
+		}
+
+		if ((LengthDocument() <= props.GetInt("background.save.size", -1)) ||
+				(buffers.SingleBuffer()))
+			sf = static_cast<SaveFlags>(sf | sfSynchronous);
+		if (SaveBuffer(filePath, sf)) {
+			CurrentBuffer()->SetTimeFromFile();
+			if (sf & sfSynchronous) {
+				wEditor.SetSavePoint();
+				if (IsPropertiesFile(filePath)) {
+					ReloadProperties();
+				}
+			}
+		} else {
+			if (!CurrentBuffer()->failedSave) {
+				CurrentBuffer()->failedSave = true;
+				msg = LocaliseMessage(
+					      "Could not save file '^0'. Save under a different name?", filePath.AsInternal());
+				const MessageBoxChoice decision = WindowMessageBox(wSciTE, msg, mbsYesNo | mbsIconWarning);
+				if (decision == mbYes) {
+					return SaveAsDialog();
+				}
+			}
+			return false;
+		}
+		return true;
+	} else {
+		if (props.GetString("save.path.suggestion").length()) {
+			const time_t t = time(nullptr);
+			char timeBuff[15];
+			strftime(timeBuff, sizeof(timeBuff), "%Y%m%d%H%M%S",  localtime(&t));
+			PropSetFile propsSuggestion;
+			propsSuggestion.superPS = &props;  // Allow access to other settings
+			propsSuggestion.Set("TimeStamp", timeBuff);
+			propsSuggestion.Set("SciteUserHome", GetSciteUserHome().AsUTF8().c_str());
+			std::string savePathSuggestion = propsSuggestion.GetExpandedString("save.path.suggestion");
+			std::replace(savePathSuggestion.begin(), savePathSuggestion.end(), '\\', '/');  // To accept "\" on Unix
+			if (savePathSuggestion.size() > 0) {
+				filePath = FilePath(GUI::StringFromUTF8(savePathSuggestion)).NormalizePath();
+			}
+		}
+		const bool ret = SaveAsDialog();
+		if (!ret)
+			filePath.Set(GUI_TEXT(""));
+		return ret;
+	}
+}
+
+void SciTEBase::SaveAs(const GUI::gui_char *file, bool fixCase) {
+	SetFileName(file, fixCase);
+	Save();
+	ReadProperties();
+	wEditor.ClearDocumentStyle();
+	wEditor.Colourise(0, wEditor.LineStart(1));
+	Redraw();
+	SetWindowName();
+	BuffersMenu();
+	if (extender)
+		extender->OnSave(filePath.AsUTF8().c_str());
+}
+
+bool SciTEBase::SaveIfNotOpen(const FilePath &destFile, bool fixCase) {
+	FilePath absPath = destFile.AbsolutePath();
+	const int index = buffers.GetDocumentByName(absPath, true /* excludeCurrent */);
+	if (index >= 0) {
+		GUI::gui_string msg = LocaliseMessage(
+					      "File '^0' is already open in another buffer.", destFile.AsInternal());
+		WindowMessageBox(wSciTE, msg);
+		return false;
+	} else {
+		SaveAs(absPath.AsInternal(), fixCase);
+		return true;
+	}
+}
+
+void SciTEBase::AbandonAutomaticSave() {
+	CurrentBuffer()->AbandonAutomaticSave();
+}
+
+bool SciTEBase::IsStdinBlocked() {
+	return false; /* always default to blocked */
+}
+
+void SciTEBase::OpenFromStdin(bool UseOutputPane) {
+	Utf8_16_Read convert;
+	std::vector<char> data(blockSize);
+
+	/* if stdin is blocked, do not execute this method */
+	if (IsStdinBlocked())
+		return;
+
+	Open(FilePath());
+	if (UseOutputPane) {
+		wOutput.ClearAll();
+	} else {
+		wEditor.BeginUndoAction();	// Group together clear and insert
+		wEditor.ClearAll();
+	}
+	size_t lenFile = fread(&data[0], 1, data.size(), stdin);
+	const UniMode umCodingCookie = CodingCookieValue(std::string_view(data.data(), lenFile));
+	while (lenFile > 0) {
+		lenFile = convert.convert(&data[0], lenFile);
+		if (UseOutputPane) {
+			wOutput.AddText(lenFile, convert.getNewBuf());
+		} else {
+			wEditor.AddText(lenFile, convert.getNewBuf());
+		}
+		lenFile = fread(&data[0], 1, data.size(), stdin);
+	}
+	if (UseOutputPane) {
+		if (props.GetInt("split.vertical") == 0) {
+			heightOutput = 2000;
+		} else {
+			heightOutput = 500;
+		}
+		SizeSubWindows();
+	} else {
+		wEditor.EndUndoAction();
+	}
+	CurrentBuffer()->unicodeMode = static_cast<UniMode>(
+					       static_cast<int>(convert.getEncoding()));
+	// Check the first two lines for coding cookies
+	if (CurrentBuffer()->unicodeMode == uni8Bit) {
+		CurrentBuffer()->unicodeMode = umCodingCookie;
+	}
+	if (CurrentBuffer()->unicodeMode != uni8Bit) {
+		// Override the code page if Unicode
+		codePage = SA::CpUtf8;
+	} else {
+		codePage = props.GetInt("code.page");
+	}
+	if (UseOutputPane) {
+		wOutput.SetSel(0, 0);
+	} else {
+		wEditor.SetCodePage(codePage);
+
+		// Zero all the style bytes
+		wEditor.ClearDocumentStyle();
+
+		CurrentBuffer()->overrideExtension = "x.txt";
+		ReadProperties();
+		SetIndentSettings();
+		wEditor.ColouriseAll();
+		Redraw();
+
+		wEditor.SetSel(0, 0);
+	}
+}
+
+void SciTEBase::OpenFilesFromStdin() {
+	char data[8 * 1024] {};
+
+	/* if stdin is blocked, do not execute this method */
+	if (IsStdinBlocked())
+		return;
+
+	while (fgets(data, sizeof(data) - 1, stdin)) {
+		char *pNL;
+		if ((pNL = strchr(data, '\n')) != nullptr)
+			* pNL = '\0';
+		Open(GUI::StringFromUTF8(data), ofQuiet);
+	}
+	if (buffers.lengthVisible == 0)
+		Open(FilePath());
+}
+
+class BufferedFile {
+	FILE *fp;
+	bool readAll;
+	bool exhausted;
+	enum {bufLen = 64 * 1024};
+	char buffer[bufLen];
+	size_t pos;
+	size_t valid;
+	void EnsureData() noexcept {
+		if (pos >= valid) {
+			if (readAll || !fp) {
+				exhausted = true;
+			} else {
+				valid = fread(buffer, 1, bufLen, fp);
+				if (valid < bufLen) {
+					readAll = true;
+				}
+				pos = 0;
+			}
+		}
+	}
+public:
+	explicit BufferedFile(const FilePath &fPath) {
+		fp = fPath.Open(fileRead);
+		readAll = false;
+		exhausted = fp == nullptr;
+		buffer[0] = 0;
+		pos = 0;
+		valid = 0;
+	}
+	~BufferedFile() {
+		if (fp) {
+			fclose(fp);
+		}
+		fp = nullptr;
+	}
+	bool Exhausted() const noexcept {
+		return exhausted;
+	}
+	int NextByte() noexcept {
+		EnsureData();
+		if (pos >= valid) {
+			return 0;
+		}
+		return buffer[pos++];
+	}
+	bool BufferContainsNull() noexcept {
+		EnsureData();
+		for (size_t i = 0; i < valid; i++) {
+			if (buffer[i] == '\0')
+				return true;
+		}
+		return false;
+	}
+};
+
+class FileReader {
+	std::unique_ptr<BufferedFile> bf;
+	int lineNum;
+	bool lastWasCR;
+	std::string lineToCompare;
+	std::string lineToShow;
+	bool caseSensitive;
+public:
+	FileReader(const FilePath &fPath, bool caseSensitive_) : bf(std::make_unique<BufferedFile>(fPath)) {
+		lineNum = 0;
+		lastWasCR = false;
+		caseSensitive = caseSensitive_;
+	}
+	// Deleted so FileReader objects can not be copied.
+	FileReader(const FileReader &) = delete;
+	~FileReader() {
+	}
+	const char *Next() {
+		if (bf->Exhausted()) {
+			return nullptr;
+		}
+		lineToShow.clear();
+		while (!bf->Exhausted()) {
+			const int ch = bf->NextByte();
+			if (lastWasCR && ch == '\n' && lineToShow.empty()) {
+				lastWasCR = false;
+			} else if (ch == '\r' || ch == '\n') {
+				lastWasCR = ch == '\r';
+				break;
+			} else {
+				lineToShow.push_back(static_cast<char>(ch));
+			}
+		}
+		lineNum++;
+		lineToCompare = lineToShow;
+		if (!caseSensitive) {
+			LowerCaseAZ(lineToCompare);
+		}
+		return lineToCompare.c_str();
+	}
+	int LineNumber() const noexcept {
+		return lineNum;
+	}
+	const char *Original() const noexcept {
+		return lineToShow.c_str();
+	}
+	bool BufferContainsNull() noexcept {
+		return bf->BufferContainsNull();
+	}
+};
+
+constexpr bool IsWordCharacter(int ch) noexcept {
+	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')  || (ch >= '0' && ch <= '9')  || (ch == '_');
+}
+
+bool SciTEBase::GrepIntoDirectory(const FilePath &directory) {
+	const GUI::gui_char *sDirectory = directory.AsInternal();
+#ifdef __APPLE__
+	if (strcmp(sDirectory, "build") == 0)
+		return false;
+#endif
+	return sDirectory[0] != '.';
+}
+
+void SciTEBase::GrepRecursive(GrepFlags gf, const FilePath &baseDir, const char *searchString, const GUI::gui_char *fileTypes) {
+	constexpr int checkAfterLines = 10'000;
+	FilePathSet directories;
+	FilePathSet files;
+	baseDir.List(directories, files);
+	const size_t searchLength = strlen(searchString);
+	std::string os;
+	for (const FilePath &fPath : files) {
+		if (jobQueue.Cancelled())
+			return;
+		if (*fileTypes == '\0' || fPath.Matches(fileTypes)) {
+			//OutputAppendStringSynchronised(i->AsInternal());
+			//OutputAppendStringSynchronised("\n");
+			FileReader fr(fPath, gf & grepMatchCase);
+			if ((gf & grepBinary) || !fr.BufferContainsNull()) {
+				while (const char *line = fr.Next()) {
+					if (((fr.LineNumber() % checkAfterLines) == 0) && jobQueue.Cancelled())
+						return;
+					const char *match = strstr(line, searchString);
+					if (match) {
+						if (gf & grepWholeWord) {
+							const char *lineEnd = line + strlen(line);
+							while (match) {
+								if (((match == line) || !IsWordCharacter(match[-1])) &&
+										((match + searchLength == (lineEnd)) || !IsWordCharacter(match[searchLength]))) {
+									break;
+								}
+								match = strstr(match + 1, searchString);
+							}
+						}
+						if (match) {
+							os.append(fPath.AsUTF8());
+							os.append(":");
+							std::string lNumber = StdStringFromInteger(fr.LineNumber());
+							os.append(lNumber);
+							os.append(":");
+							os.append(fr.Original());
+							os.append("\n");
+						}
+					}
+				}
+			}
+		}
+	}
+	if (os.length()) {
+		if (gf & grepStdOut) {
+			fwrite(os.c_str(), os.length(), 1, stdout);
+		} else {
+			OutputAppendStringSynchronised(os.c_str());
+		}
+	}
+	for (const FilePath &fPath : directories) {
+		if ((gf & grepDot) || GrepIntoDirectory(fPath.Name())) {
+			GrepRecursive(gf, fPath, searchString, fileTypes);
+		}
+	}
+}
+
+void SciTEBase::InternalGrep(GrepFlags gf, const GUI::gui_char *directory, const GUI::gui_char *fileTypes, const char *search, SA::Position &originalEnd) {
+	GUI::ElapsedTime commandTime;
+	if (!(gf & grepStdOut)) {
+		std::string os;
+		os.append(">Internal search for \"");
+		os.append(search);
+		os.append("\" in \"");
+		os.append(GUI::UTF8FromString(fileTypes));
+		os.append("\"\n");
+		OutputAppendStringSynchronised(os.c_str());
+		ShowOutputOnMainThread();
+		originalEnd += os.length();
+	}
+	std::string searchString(search);
+	if (!(gf & grepMatchCase)) {
+		LowerCaseAZ(searchString);
+	}
+	GrepRecursive(gf, FilePath(directory), searchString.c_str(), fileTypes);
+	if (!(gf & grepStdOut)) {
+		std::string sExitMessage(">");
+		if (jobQueue.TimeCommands()) {
+			sExitMessage += "    Time: ";
+			sExitMessage += StdStringFromDouble(commandTime.Duration(), 3);
+		}
+		sExitMessage += "\n";
+		OutputAppendStringSynchronised(sExitMessage.c_str());
+	}
+}
+
diff --git a/scite-app/scite/src/SciTEKeys.h b/scite-app/scite/src/SciTEKeys.h
new file mode 100644
index 0000000..be05e99
--- /dev/null
+++ b/scite-app/scite/src/SciTEKeys.h
@@ -0,0 +1,17 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEKeys.h
+ ** SciTE keyboard shortcut facilities.
+ **/
+// Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCITEKEYS_H
+#define SCITEKEYS_H
+
+class SciTEKeys {
+public:
+	static long ParseKeyCode(const char *mnemonic);
+	static bool MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept;
+};
+
+#endif
diff --git a/scite-app/scite/src/SciTEProps.cxx b/scite-app/scite/src/SciTEProps.cxx
new file mode 100644
index 0000000..71b884a
--- /dev/null
+++ b/scite-app/scite/src/SciTEProps.cxx
@@ -0,0 +1,1934 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEProps.cxx
+ ** Properties management.
+ **/
+// Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
+#include <clocale>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+#include "SciLexer.h"
+#include "Lexilla.h"
+#include "LexillaAccess.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#if (defined(__unix__) || defined(__APPLE__)) && !defined(QT_QML)
+
+const GUI::gui_char menuAccessIndicator[] = GUI_TEXT("_");
+
+#else
+
+const GUI::gui_char menuAccessIndicator[] = GUI_TEXT("&");
+
+#endif
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "EditorConfig.h"
+#include "SciTEBase.h"
+#include "IFaceTable.h"
+
+void SciTEBase::SetImportMenu() {
+	for (int i = 0; i < importMax; i++) {
+		DestroyMenuItem(menuOptions, importCmdID + i);
+	}
+	if (!importFiles.empty()) {
+		for (int stackPos = 0; stackPos < static_cast<int>(importFiles.size()) && stackPos < importMax; stackPos++) {
+			const int itemID = importCmdID + stackPos;
+			if (importFiles[stackPos].IsSet()) {
+				GUI::gui_string entry = localiser.Text("Open");
+				entry += GUI_TEXT(" ");
+				entry += importFiles[stackPos].Name().AsInternal();
+				SetMenuItem(menuOptions, IMPORT_START + stackPos, itemID, entry.c_str());
+			}
+		}
+	}
+}
+
+void SciTEBase::ImportMenu(int pos) {
+	if (pos >= 0) {
+		if (importFiles[pos].IsSet()) {
+			Open(importFiles[pos]);
+		}
+	}
+}
+
+void SciTEBase::SetLanguageMenu() {
+	for (int i = 0; i < 100; i++) {
+		DestroyMenuItem(menuLanguage, languageCmdID + i);
+	}
+	for (unsigned int item = 0; item < languageMenu.size(); item++) {
+		const int itemID = languageCmdID + item;
+		GUI::gui_string entry = localiser.Text(languageMenu[item].menuItem.c_str());
+		if (languageMenu[item].menuKey.length()) {
+#if defined(GTK)
+			entry += GUI_TEXT(" ");
+#else
+			entry += GUI_TEXT("\t");
+#endif
+			entry += GUI::StringFromUTF8(languageMenu[item].menuKey);
+		}
+		if (entry.size() && entry[0] != '#') {
+			SetMenuItem(menuLanguage, item, itemID, entry.c_str());
+		}
+	}
+}
+
+// Null except on Windows where it may be overridden
+void SciTEBase::ReadEmbeddedProperties() {
+}
+
+const GUI::gui_char propLocalFileName[] = GUI_TEXT("SciTE.properties");
+const GUI::gui_char propDirectoryFileName[] = GUI_TEXT("SciTEDirectory.properties");
+
+void SciTEBase::ReadEnvironment() {
+#if defined(__unix__) || defined(__APPLE__)
+	extern char **environ;
+	char **e = environ;
+#else
+	char **e = _environ;
+#endif
+	for (; e && *e; e++) {
+		const auto [key, value] = ViewSplit(*e, '=');
+		propsPlatform.Set(key, value);
+	}
+}
+
+/**
+Read global and user properties files.
+*/
+void SciTEBase::ReadGlobalPropFile() {
+	// Appearance and Contrast may be read in embedded or global properties
+	// so set them in deepest property set propsPlatform.
+	propsPlatform.Set("Appearance", StdStringFromInteger(appearance.dark));
+	propsPlatform.Set("Contrast", StdStringFromInteger(appearance.highContrast));
+
+	std::string excludes;
+	std::string includes;
+
+	// Want to apply imports.exclude and imports.include but these may well be in
+	// user properties.
+
+	for (int attempt=0; attempt<2; attempt++) {
+
+		std::string excludesRead = props.GetString("imports.exclude");
+		std::string includesRead = props.GetString("imports.include");
+		if ((attempt > 0) && ((excludesRead == excludes) && (includesRead == includes)))
+			break;
+
+		excludes = excludesRead;
+		includes = includesRead;
+
+		filter.SetFilter(excludes, includes);
+
+		importFiles.clear();
+
+		ReadEmbeddedProperties();
+
+		propsBase.Clear();
+		FilePath propfileBase = GetDefaultPropertiesFileName();
+		propsBase.Read(propfileBase, propfileBase.Directory(), filter, &importFiles, 0);
+
+		propsUser.Clear();
+		FilePath propfileUser = GetUserPropertiesFileName();
+		propsUser.Read(propfileUser, propfileUser.Directory(), filter, &importFiles, 0);
+	}
+
+	if (!localiser.read) {
+		ReadLocalization();
+	}
+}
+
+void SciTEBase::ReadAbbrevPropFile() {
+	propsAbbrev.Clear();
+	propsAbbrev.Read(pathAbbreviations, pathAbbreviations.Directory(), filter, &importFiles, 0);
+}
+
+/**
+Reads the directory properties file depending on the variable
+"properties.directory.enable". Also sets the variable $(SciteDirectoryHome) to the path
+where this property file is found. If it is not found $(SciteDirectoryHome) will
+be set to $(FilePath).
+*/
+void SciTEBase::ReadDirectoryPropFile() {
+	propsDirectory.Clear();
+
+	if (props.GetInt("properties.directory.enable") != 0) {
+		FilePath propfile = GetDirectoryPropertiesFileName();
+		props.Set("SciteDirectoryHome", propfile.Directory().AsUTF8().c_str());
+
+		propsDirectory.Read(propfile, propfile.Directory(), filter, nullptr, 0);
+	}
+}
+
+/**
+Read local and directory properties file.
+*/
+void SciTEBase::ReadLocalPropFile() {
+	// The directory properties acts like a base local properties file.
+	// Therefore it must be read always before reading the local prop file.
+	ReadDirectoryPropFile();
+
+	FilePath propfile = GetLocalPropertiesFileName();
+
+	propsLocal.Clear();
+	propsLocal.Read(propfile, propfile.Directory(), filter, nullptr, 0);
+
+	props.Set("Chrome", "#C0C0C0");
+	props.Set("ChromeHighlight", "#FFFFFF");
+
+	FilePath fileDirectory = filePath.Directory();
+	editorConfig->Clear();
+	if (props.GetInt("editor.config.enable", 0)) {
+		editorConfig->ReadFromDirectory(fileDirectory);
+	}
+}
+
+SA::Colour ColourOfProperty(const PropSetFile &props, const char *key, SA::Colour colourDefault) {
+	std::string colour = props.GetExpandedString(key);
+	if (colour.length()) {
+		return ColourFromString(colour);
+	}
+	return colourDefault;
+}
+
+SA::ColourAlpha ColourAlphaOfProperty(const PropSetFile &props, const char *key, SA::ColourAlpha colourDefault) {
+	std::string colour = props.GetExpandedString(key);
+	if (colour.length()) {
+		return ColourAlphaFromString(colour);
+	}
+	return colourDefault;
+}
+
+namespace {
+
+void OptionalSetColour(GUI::ScintillaWindow &scintilla, SA::Element element, const PropSetFile &props, const char *key) {
+	std::string colour = props.GetExpandedString(key);
+	if (colour.length()) {
+		const SA::Colour colourElement = ColourAlphaFromString(colour);
+		scintilla.SetElementColour(element, colourElement);
+	} else {
+		scintilla.ResetElementColour(element);
+	}
+}
+
+}
+
+void SciTEBase::SetElementColour(SA::Element element, const char *key) {
+	OptionalSetColour(wEditor, element, props, key);
+	OptionalSetColour(wOutput, element, props, key);
+}
+
+/**
+ * Put the next property item from the given property string
+ * into the buffer pointed by @a pPropItem.
+ * @return NULL if the end of the list is met, else, it points to the next item.
+ */
+const char *SciTEBase::GetNextPropItem(
+	const char *pStart,	/**< the property string to parse for the first call,
+						 * pointer returned by the previous call for the following. */
+	char *pPropItem,	///< pointer on a buffer receiving the requested prop item
+	int maxLen) {		///< size of the above buffer
+	ptrdiff_t size = maxLen - 1;
+
+	*pPropItem = '\0';
+	if (!pStart) {
+		return nullptr;
+	}
+	const char *pNext = strchr(pStart, ',');
+	if (pNext) {	// Separator is found
+		if (size > pNext - pStart) {
+			// Found string fits in buffer
+			size = pNext - pStart;
+		}
+		pNext++;
+	}
+	strncpy(pPropItem, pStart, size);
+	pPropItem[size] = '\0';
+	return pNext;
+}
+
+std::string SciTEBase::StyleString(const char *lang, int style) const {
+	char key[200];
+	sprintf(key, "style.%s.%0d", lang, style);
+	return props.GetExpandedString(key);
+}
+
+StyleDefinition SciTEBase::StyleDefinitionFor(int style) {
+	const std::string ssDefault = StyleString("*", style);
+	std::string ss = StyleString(language.c_str(), style);
+
+	if (!subStyleBases.empty()) {
+		const int baseStyle = wEditor.StyleFromSubStyle(style);
+		if (baseStyle != style) {
+			const int primaryStyle = wEditor.PrimaryStyleFromStyle(style);
+			const int distanceSecondary = (style == primaryStyle) ? 0 : wEditor.DistanceToSecondaryStyles();
+			const int primaryBase = baseStyle - distanceSecondary;
+			const int subStylesStart = wEditor.SubStylesStart(primaryBase);
+			const int subStylesLength = wEditor.SubStylesLength(primaryBase);
+			const int subStyle = style - (subStylesStart + distanceSecondary);
+			if (subStyle < subStylesLength) {
+				char key[200];
+				sprintf(key, "style.%s.%0d.%0d", language.c_str(), baseStyle, subStyle + 1);
+				ss = props.GetNewExpandString(key);
+			}
+		}
+	}
+
+	StyleDefinition sd(ssDefault);
+	sd.ParseStyleDefinition(ss);
+	return sd;
+}
+
+void SciTEBase::SetOneStyle(GUI::ScintillaWindow &win, int style, const StyleDefinition &sd) {
+	if (sd.specified & StyleDefinition::sdItalics)
+		win.StyleSetItalic(style, sd.italics);
+	if (sd.specified & StyleDefinition::sdWeight)
+		win.StyleSetWeight(style, sd.weight);
+	if (sd.specified & StyleDefinition::sdFont)
+		win.StyleSetFont(style, sd.font.c_str());
+	if (sd.specified & StyleDefinition::sdFore)
+		win.StyleSetFore(style, sd.Fore());
+	if (sd.specified & StyleDefinition::sdBack)
+		win.StyleSetBack(style, sd.Back());
+	if (sd.specified & StyleDefinition::sdSize)
+		win.StyleSetSizeFractional(style, sd.FractionalSize());
+	if (sd.specified & StyleDefinition::sdEOLFilled)
+		win.StyleSetEOLFilled(style, sd.eolfilled);
+	if (sd.specified & StyleDefinition::sdUnderlined)
+		win.StyleSetUnderline(style, sd.underlined);
+	if (sd.specified & StyleDefinition::sdCaseForce)
+		win.StyleSetCase(style, sd.caseForce);
+	if (sd.specified & StyleDefinition::sdVisible)
+		win.StyleSetVisible(style, sd.visible);
+	if (sd.specified & StyleDefinition::sdChangeable)
+		win.StyleSetChangeable(style, sd.changeable);
+	win.StyleSetCharacterSet(style, characterSet);
+}
+
+void SciTEBase::SetStyleBlock(GUI::ScintillaWindow &win, const char *lang, int start, int last) {
+	for (int style = start; style <= last; style++) {
+		if (style != StyleDefault) {
+			char key[200];
+			sprintf(key, "style.%s.%0d", lang, style-start);
+			std::string sval = props.GetExpandedString(key);
+			if (sval.length()) {
+				SetOneStyle(win, style, StyleDefinition(sval));
+			}
+		}
+	}
+}
+
+void SciTEBase::SetStyleFor(GUI::ScintillaWindow &win, const char *lang) {
+	SetStyleBlock(win, lang, 0, StyleMax);
+}
+
+void SciTEBase::SetOneIndicator(GUI::ScintillaWindow &win, int indicator, const IndicatorDefinition &ind) {
+	win.IndicSetStyle(indicator, ind.style);
+	win.IndicSetFore(indicator, ind.colour);
+	win.IndicSetAlpha(indicator, ind.fillAlpha);
+	win.IndicSetOutlineAlpha(indicator, ind.outlineAlpha);
+	win.IndicSetUnder(indicator, ind.under);
+}
+
+std::string SciTEBase::ExtensionFileName() const {
+	if (CurrentBufferConst()->overrideExtension.length()) {
+		return CurrentBufferConst()->overrideExtension;
+	} else {
+		FilePath name = FileNameExt();
+		if (name.IsSet()) {
+#if !defined(GTK)
+			// Force extension to lower case
+			std::string extension = name.Extension().AsUTF8();
+			if (extension.empty()) {
+				return name.AsUTF8();
+			} else {
+				LowerCaseAZ(extension);
+				return name.BaseName().AsUTF8() + "." + extension;
+			}
+#else
+			return name.AsUTF8();
+#endif
+		} else {
+			return props.GetString("default.file.ext");
+		}
+	}
+}
+
+void SciTEBase::ForwardPropertyToEditor(const char *key) {
+	if (props.Exists(key)) {
+		std::string value = props.GetExpandedString(key);
+		wEditor.SetProperty(key, value.c_str());
+		wOutput.SetProperty(key, value.c_str());
+	}
+}
+
+void SciTEBase::DefineMarker(SA::MarkerOutline marker, SA::MarkerSymbol markerType, MarkerAppearance markerAppearance) {
+	const int markerNumber = static_cast<int>(marker);
+	wEditor.MarkerDefine(markerNumber, markerType);
+	wEditor.MarkerSetForeTranslucent(markerNumber, markerAppearance.fore);
+	wEditor.MarkerSetBackTranslucent(markerNumber, markerAppearance.back);
+	wEditor.MarkerSetBackSelectedTranslucent(markerNumber, markerAppearance.backSelected);
+	wEditor.MarkerSetStrokeWidth(markerNumber, markerAppearance.strokeWidth);
+}
+
+void SciTEBase::ReadAPI(const std::string &fileNameForExtension) {
+	std::string sApiFileNames = props.GetNewExpandString("api.",
+				    fileNameForExtension.c_str());
+	if (sApiFileNames.length() > 0) {
+		std::vector<std::string> vApiFileNames = StringSplit(sApiFileNames, ';');
+		std::vector<char> data;
+
+		// Load files into data
+		for (const std::string &vApiFileName : vApiFileNames) {
+			std::string contents = FilePath(GUI::StringFromUTF8(vApiFileName)).Read();
+			data.insert(data.end(), contents.begin(), contents.end());
+		}
+
+		// Initialise apis
+		if (data.size() > 0) {
+			apis.Set(data);
+		}
+	}
+}
+
+std::string SciTEBase::FindLanguageProperty(const char *pattern, const char *defaultValue) {
+	std::string key = pattern;
+	Substitute(key, "*", language);
+	std::string ret = props.GetExpandedString(key.c_str());
+	if (ret == "")
+		ret = props.GetExpandedString(pattern);
+	if (ret == "")
+		ret = defaultValue;
+	return ret;
+}
+
+/**
+ * A list of all the properties that should be forwarded to Scintilla lexers.
+ */
+static const char *propertiesToForward[] = {
+	"fold.lpeg.by.indentation",
+	"lexer.lpeg.color.theme",
+	"lexer.lpeg.home",
+	"lexer.lpeg.script",
+//++Autogenerated -- run ../scripts/RegenerateSource.py to regenerate
+//**\(\t"\*",\n\)
+	"asp.default.language",
+	"fold",
+	"fold.abl.comment.multiline",
+	"fold.abl.syntax.based",
+	"fold.asm.comment.explicit",
+	"fold.asm.comment.multiline",
+	"fold.asm.explicit.anywhere",
+	"fold.asm.explicit.end",
+	"fold.asm.explicit.start",
+	"fold.asm.syntax.based",
+	"fold.at.else",
+	"fold.baan.inner.level",
+	"fold.baan.keywords.based",
+	"fold.baan.sections",
+	"fold.baan.syntax.based",
+	"fold.basic.comment.explicit",
+	"fold.basic.explicit.anywhere",
+	"fold.basic.explicit.end",
+	"fold.basic.explicit.start",
+	"fold.basic.syntax.based",
+	"fold.cil.comment.multiline",
+	"fold.coffeescript.comment",
+	"fold.comment",
+	"fold.comment.nimrod",
+	"fold.comment.yaml",
+	"fold.compact",
+	"fold.cpp.comment.explicit",
+	"fold.cpp.comment.multiline",
+	"fold.cpp.explicit.anywhere",
+	"fold.cpp.explicit.end",
+	"fold.cpp.explicit.start",
+	"fold.cpp.preprocessor.at.else",
+	"fold.cpp.syntax.based",
+	"fold.d.comment.explicit",
+	"fold.d.comment.multiline",
+	"fold.d.explicit.anywhere",
+	"fold.d.explicit.end",
+	"fold.d.explicit.start",
+	"fold.d.syntax.based",
+	"fold.dataflex.compilerlist",
+	"fold.directive",
+	"fold.fsharp.comment.multiline",
+	"fold.fsharp.comment.stream",
+	"fold.fsharp.imports",
+	"fold.fsharp.preprocessor",
+	"fold.haskell.imports",
+	"fold.html",
+	"fold.html.preprocessor",
+	"fold.hypertext.comment",
+	"fold.hypertext.heredoc",
+	"fold.julia.docstring",
+	"fold.julia.syntax.based",
+	"fold.perl.at.else",
+	"fold.perl.comment.explicit",
+	"fold.perl.package",
+	"fold.perl.pod",
+	"fold.preprocessor",
+	"fold.quotes.nimrod",
+	"fold.quotes.python",
+	"fold.raku.comment.multiline",
+	"fold.raku.comment.pod",
+	"fold.rust.comment.explicit",
+	"fold.rust.comment.multiline",
+	"fold.rust.explicit.anywhere",
+	"fold.rust.explicit.end",
+	"fold.rust.explicit.start",
+	"fold.rust.syntax.based",
+	"fold.sql.at.else",
+	"fold.sql.only.begin",
+	"fold.verilog.flags",
+	"fold.xml.at.tag.open",
+	"html.tags.case.sensitive",
+	"lexer.as.comment.character",
+	"lexer.asm.comment.delimiter",
+	"lexer.baan.styling.within.preprocessor",
+	"lexer.caml.magic",
+	"lexer.cpp.allow.dollars",
+	"lexer.cpp.backquoted.strings",
+	"lexer.cpp.escape.sequence",
+	"lexer.cpp.hashquoted.strings",
+	"lexer.cpp.track.preprocessor",
+	"lexer.cpp.triplequoted.strings",
+	"lexer.cpp.update.preprocessor",
+	"lexer.cpp.verbatim.strings.allow.escapes",
+	"lexer.css.hss.language",
+	"lexer.css.less.language",
+	"lexer.css.scss.language",
+	"lexer.d.fold.at.else",
+	"lexer.edifact.highlight.un.all",
+	"lexer.errorlist.escape.sequences",
+	"lexer.errorlist.value.separate",
+	"lexer.flagship.styling.within.preprocessor",
+	"lexer.haskell.allow.hash",
+	"lexer.haskell.allow.questionmark",
+	"lexer.haskell.allow.quotes",
+	"lexer.haskell.cpp",
+	"lexer.haskell.import.safe",
+	"lexer.html.django",
+	"lexer.html.mako",
+	"lexer.json.allow.comments",
+	"lexer.json.escape.sequence",
+	"lexer.julia.highlight.lexerror",
+	"lexer.julia.highlight.typeannotation",
+	"lexer.metapost.comment.process",
+	"lexer.metapost.interface.default",
+	"lexer.nim.raw.strings.highlight.ident",
+	"lexer.pascal.smart.highlighting",
+	"lexer.props.allow.initial.spaces",
+	"lexer.python.keywords2.no.sub.identifiers",
+	"lexer.python.literals.binary",
+	"lexer.python.strings.b",
+	"lexer.python.strings.f",
+	"lexer.python.strings.over.newline",
+	"lexer.python.strings.u",
+	"lexer.python.unicode.identifiers",
+	"lexer.rust.fold.at.else",
+	"lexer.sql.allow.dotted.word",
+	"lexer.sql.backticks.identifier",
+	"lexer.sql.numbersign.comment",
+	"lexer.tex.auto.if",
+	"lexer.tex.comment.process",
+	"lexer.tex.interface.default",
+	"lexer.tex.use.keywords",
+	"lexer.verilog.allupperkeywords",
+	"lexer.verilog.fold.preprocessor.else",
+	"lexer.verilog.portstyling",
+	"lexer.verilog.track.preprocessor",
+	"lexer.verilog.update.preprocessor",
+	"lexer.xml.allow.scripts",
+	"nsis.ignorecase",
+	"nsis.uservars",
+	"ps.level",
+	"sql.backslash.escapes",
+	"styling.within.preprocessor",
+	"tab.timmy.whinge.level",
+
+//--Autogenerated -- end of automatically generated section
+
+	nullptr,
+};
+
+/* XPM */
+static const char *bookmarkBluegem[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15      64            1",
+/* colors */
+"  c none",
+". c #0c0630",
+"# c #8c8a8c",
+"a c #244a84",
+"b c #545254",
+"c c #cccecc",
+"d c #949594",
+"e c #346ab4",
+"f c #242644",
+"g c #3c3e3c",
+"h c #6ca6fc",
+"i c #143789",
+"j c #204990",
+"k c #5c8dec",
+"l c #707070",
+"m c #3c82dc",
+"n c #345db4",
+"o c #619df7",
+"p c #acacac",
+"q c #346ad4",
+"r c #1c3264",
+"s c #174091",
+"t c #5482df",
+"u c #4470c4",
+"v c #2450a0",
+"w c #14162c",
+"x c #5c94f6",
+"y c #b7b8b7",
+"z c #646464",
+"A c #3c68b8",
+"B c #7cb8fc",
+"C c #7c7a7c",
+"D c #3462b9",
+"E c #7c7eac",
+"F c #44464c",
+"G c #a4a4a4",
+"H c #24224c",
+"I c #282668",
+"J c #5c5a8c",
+"K c #7c8ebc",
+"L c #dcd7e4",
+"M c #141244",
+"N c #1c2e5c",
+"O c #24327c",
+"P c #4472cc",
+"Q c #6ca2fc",
+"R c #74b2fc",
+"S c #24367c",
+"T c #b4b2c4",
+"U c #403e58",
+"V c #4c7fd6",
+"W c #24428c",
+"X c #747284",
+"Y c #142e7c",
+"Z c #64a2fc",
+"0 c #3c72dc",
+"1 c #bcbebc",
+"2 c #6c6a6c",
+"3 c #848284",
+"4 c #2c5098",
+"5 c #1c1a1c",
+"6 c #243250",
+"7 c #7cbefc",
+"8 c #d4d2d4",
+/* pixels */
+"    yCbgbCy    ",
+"   #zGGyGGz#   ",
+"  #zXTLLLTXz#  ",
+" p5UJEKKKEJU5p ",
+" lfISa444aSIfl ",
+" wIYij444jsYIw ",
+" .OsvnAAAnvsO. ",
+" MWvDuVVVPDvWM ",
+" HsDPVkxxtPDsH ",
+" UiAtxohZxtuiU ",
+" pNnkQRBRhkDNp ",
+" 1FrqoR7Bo0rF1 ",
+" 8GC6aemea6CG8 ",
+"  cG3l2z2l3Gc  ",
+"    1GdddG1    "
+};
+
+std::string SciTEBase::GetFileNameProperty(const char *name) {
+	std::string namePlusDot = name;
+	namePlusDot.append(".");
+	std::string valueForFileName = props.GetNewExpandString(namePlusDot.c_str(),
+				       ExtensionFileName().c_str());
+	if (valueForFileName.length() != 0) {
+		return valueForFileName;
+	} else {
+		return props.GetString(name);
+	}
+}
+
+void SciTEBase::SetRepresentations() {
+	wEditor.ClearAllRepresentations();
+	const std::string representations = props.GetExpandedString("representations");
+	std::string_view reprs = representations;
+
+	bool colourSet = false;
+	SA::Colour colourRepresentation = 0;
+
+	bool appearanceSet = false;
+	SA::RepresentationAppearance appearanceRepresentation = SA::RepresentationAppearance::Blob;
+
+	while (!reprs.empty()) {
+		if (reprs[0] == ',') {
+			reprs.remove_prefix(1);
+		}
+		if (!reprs.empty()) {
+			const std::string_view item = reprs.substr(0, reprs.find_first_of(','));
+			if (!item.empty()) {
+				if (item[0] == '!') {
+					// Appearance
+					if (item.length() == 1) {
+						appearanceSet = false;
+					} else {
+						appearanceSet = true;
+						const std::string sAppearance(item.substr(1));
+						appearanceRepresentation = static_cast<SA::RepresentationAppearance>(IntegerFromString(sAppearance, 0));
+					}
+				} else if (item[0] == '#') {
+					// Colour
+					if (item.length() == 1) {
+						colourSet = false;
+					} else {
+						colourSet = true;
+						colourRepresentation = ColourAlphaFromString(item);
+					}
+				} else {
+					const size_t eqPos = item.find_first_of('=');
+					if (eqPos != std::string_view::npos) {
+						const std::string target = UnicodeUnEscape(item.substr(0, eqPos));
+						const std::string representation = UnicodeUnEscape(item.substr(eqPos+1));
+						wEditor.SetRepresentation(target.c_str(), representation.c_str());
+						if (appearanceSet) {
+							wEditor.SetRepresentationAppearance(target.c_str(), appearanceRepresentation);
+						}
+						if (colourSet) {
+							wEditor.SetRepresentationColour(target.c_str(), colourRepresentation);
+						}
+					}
+				}
+				reprs.remove_prefix(item.length());
+			}
+		}
+	}
+}
+
+void SciTEBase::ReadProperties() {
+	if (extender)
+		extender->Clear();
+
+	const std::string lexillaPath = props.GetExpandedString("lexilla.path");
+	Lexilla::Load(lexillaPath.empty() ? "." : lexillaPath);
+
+	std::vector<std::string> libraryProperties = Lexilla::LibraryProperties();
+	for (std::string property : libraryProperties) {
+		std::string key("lexilla.context.");
+		key += property;
+		std::string value = props.GetExpandedString(key.c_str());
+		Lexilla::SetProperty(property.c_str(), value.c_str());
+	}
+
+	const std::string fileNameForExtension = ExtensionFileName();
+
+	language = props.GetNewExpandString("lexer.", fileNameForExtension.c_str());
+	if (language.empty()) {
+		language = "null";
+	}
+	if (static_cast<int>(wEditor.DocumentOptions()) & static_cast<int>(SA::DocumentOption::StylesNone)) {
+		language = "null";
+	}
+	const std::string languageCurrent = wEditor.LexerLanguage();
+	if (language != languageCurrent) {
+		if (StartsWith(language, "script_")) {
+			wEditor.SetILexer(nullptr);
+		} else {
+			Scintilla::ILexer5 *plexer = Lexilla::MakeLexer(language);
+			wEditor.SetILexer(plexer);
+		}
+	}
+
+	props.Set("Language", language);
+
+	lexLanguage = wEditor.Lexer();
+
+	const std::string languageOutput = wOutput.LexerLanguage();
+	if (languageOutput != "errorlist") {
+		Scintilla::ILexer5 *plexerErrorlist = Lexilla::MakeLexer("errorlist");
+		wOutput.SetILexer(plexerErrorlist);
+	}
+
+	const std::string kw0 = props.GetNewExpandString("keywords.", fileNameForExtension.c_str());
+	wEditor.SetKeyWords(0, kw0.c_str());
+
+	for (int wl = 1; wl <= SA::KeywordsetMax; wl++) {
+		std::string kwk = StdStringFromInteger(wl+1);
+		kwk += '.';
+		kwk.insert(0, "keywords");
+		const std::string kw = props.GetNewExpandString(kwk.c_str(), fileNameForExtension.c_str());
+		wEditor.SetKeyWords(wl, kw.c_str());
+	}
+
+	subStyleBases = wEditor.SubStyleBases();
+	if (!subStyleBases.empty()) {
+		wEditor.FreeSubStyles();
+
+		for (const unsigned char subStyleBase : subStyleBases) {
+			//substyles.cpp.11=2
+			const std::string sStyleBase = StdStringFromInteger(subStyleBase);
+			std::string ssSubStylesKey = "substyles.";
+			ssSubStylesKey += language;
+			ssSubStylesKey += ".";
+			ssSubStylesKey += sStyleBase;
+			std::string ssNumber = props.GetNewExpandString(ssSubStylesKey.c_str());
+			int subStyleIdentifiers = atoi(ssNumber.c_str());
+
+			int subStyleIdentifiersStart = 0;
+			if (subStyleIdentifiers) {
+				subStyleIdentifiersStart = wEditor.AllocateSubStyles(subStyleBase, subStyleIdentifiers);
+				if (subStyleIdentifiersStart < 0)
+					subStyleIdentifiers = 0;
+			}
+			for (int subStyle=0; subStyle<subStyleIdentifiers; subStyle++) {
+				// substylewords.11.1.$(file.patterns.cpp)=CharacterSet LexAccessor SString WordList
+				std::string ssWordsKey = "substylewords.";
+				ssWordsKey += sStyleBase;
+				ssWordsKey += ".";
+				ssWordsKey += StdStringFromInteger(subStyle + 1);
+				ssWordsKey += ".";
+				std::string ssWords = props.GetNewExpandString(ssWordsKey.c_str(), fileNameForExtension.c_str());
+				wEditor.SetIdentifiers(subStyleIdentifiersStart + subStyle, ssWords.c_str());
+			}
+		}
+	}
+
+	FilePath homepath = GetSciteDefaultHome();
+	props.Set("SciteDefaultHome", homepath.AsUTF8().c_str());
+	homepath = GetSciteUserHome();
+	props.Set("SciteUserHome", homepath.AsUTF8().c_str());
+
+	for (size_t i=0; propertiesToForward[i]; i++) {
+		ForwardPropertyToEditor(propertiesToForward[i]);
+	}
+
+	if (apisFileNames != props.GetNewExpandString("api.", fileNameForExtension.c_str())) {
+		apis.Clear();
+		ReadAPI(fileNameForExtension);
+		apisFileNames = props.GetNewExpandString("api.", fileNameForExtension.c_str());
+	}
+
+	props.Set("APIPath", apisFileNames.c_str());
+
+	FilePath fileAbbrev = GUI::StringFromUTF8(props.GetNewExpandString("abbreviations.", fileNameForExtension.c_str()));
+	if (!fileAbbrev.IsSet())
+		fileAbbrev = GetAbbrevPropertiesFileName();
+	if (!pathAbbreviations.SameNameAs(fileAbbrev)) {
+		pathAbbreviations = fileAbbrev;
+		ReadAbbrevPropFile();
+	}
+
+	props.Set("AbbrevPath", pathAbbreviations.AsUTF8().c_str());
+
+	const SA::Technology tech = static_cast<SA::Technology>(props.GetInt("technology"));
+	wEditor.SetTechnology(tech);
+	wOutput.SetTechnology(tech);
+
+	const SA::Bidirectional bidirectional = static_cast<SA::Bidirectional>(props.GetInt("bidirectional"));
+	wEditor.SetBidirectional(bidirectional);
+	wOutput.SetBidirectional(bidirectional);
+
+	codePage = props.GetInt("code.page");
+	if (CurrentBuffer()->unicodeMode != uni8Bit) {
+		// Override properties file to ensure Unicode displayed.
+		codePage = SA::CpUtf8;
+	}
+	wEditor.SetCodePage(codePage);
+	const int outputCodePage = props.GetInt("output.code.page", codePage);
+	wOutput.SetCodePage(outputCodePage);
+
+	characterSet = static_cast<SA::CharacterSet>(props.GetInt("character.set", static_cast<int>(SA::CharacterSet::Default)));
+
+	SetRepresentations();
+
+#if defined(__unix__) || defined(__APPLE__)
+	const std::string localeCType = props.GetString("LC_CTYPE");
+	if (localeCType.length())
+		setlocale(LC_CTYPE, localeCType.c_str());
+	else
+		setlocale(LC_CTYPE, "C");
+#endif
+
+	std::string imeInteraction = props.GetString("ime.interaction");
+	if (imeInteraction.length()) {
+		CallChildren(SA::Message::SetIMEInteraction, props.GetInt("ime.interaction", static_cast<int>(SA::IMEInteraction::Windowed)));
+	}
+	imeAutoComplete = props.GetInt("ime.autocomplete", 0) == 1;
+
+	const SA::Accessibility accessibility = static_cast<SA::Accessibility>(props.GetInt("accessibility", 1));
+	wEditor.SetAccessibility(accessibility);
+	wOutput.SetAccessibility(accessibility);
+
+	wrapStyle = static_cast<SA::Wrap>(props.GetInt("wrap.style", static_cast<int>(SA::Wrap::Word)));
+
+	CallChildren(SA::Message::SetMouseSelectionRectangularSwitch, props.GetInt("selection.rectangular.switch.mouse", 0));
+	CallChildren(SA::Message::SetMultipleSelection, props.GetInt("selection.multiple", 1));
+	CallChildren(SA::Message::SetAdditionalSelectionTyping, props.GetInt("selection.additional.typing", 1));
+	CallChildren(SA::Message::SetMultiPaste, props.GetInt("selection.multipaste", 1));
+	CallChildren(SA::Message::SetAdditionalCaretsBlink, props.GetInt("caret.additional.blinks", 1));
+	CallChildren(SA::Message::SetVirtualSpaceOptions, props.GetInt("virtual.space"));
+
+	wEditor.SetMouseDwellTime(props.GetInt("dwell.period", SA::TimeForever));
+
+	SetElementColour(SA::Element::Caret, "caret.fore");
+	SetElementColour(SA::Element::CaretAdditional, "caret.additional.fore");
+
+	const SA::CaretStyle caretStyle = static_cast<SA::CaretStyle>(props.GetInt("caret.style", static_cast<int>(SA::CaretStyle::Line)));
+	wEditor.SetCaretStyle(caretStyle);
+	wOutput.SetCaretStyle(caretStyle);
+	wEditor.SetCaretWidth(props.GetInt("caret.width", 1));
+	wOutput.SetCaretWidth(props.GetInt("caret.width", 1));
+
+	const std::string caretLineLayer = props.GetExpandedString("caret.line.layer");
+	if (caretLineLayer.empty()) {
+		std::string caretLineBack = props.GetExpandedString("caret.line.back");
+		if (caretLineBack.length()) {
+			wEditor.SetCaretLineVisible(true);
+			wEditor.SetCaretLineBack(ColourFromString(caretLineBack));
+		} else {
+			wEditor.SetCaretLineVisible(false);
+		}
+		wEditor.SetCaretLineBackAlpha(
+			static_cast<SA::Alpha>(props.GetInt("caret.line.back.alpha", static_cast<int>(SA::Alpha::NoAlpha))));
+	} else {
+		// New scheme
+		const int layer = IntegerFromString(caretLineLayer, 0);
+		CallChildren(SA::Message::SetCaretLineLayer, layer);
+		SetElementColour(SA::Element::CaretLineBack, "caret.line.back");
+		const int caretLineFrame = props.GetInt("caret.line.frame");
+		CallChildren(SA::Message::SetCaretLineFrame, caretLineFrame);
+	}
+
+	int indicatorsAlpha = props.GetInt("indicators.alpha", 30);
+	if (indicatorsAlpha < 0 || 255 < indicatorsAlpha) // If invalid value,
+		indicatorsAlpha = 30; //then set default value.
+	alphaIndicator = static_cast<SA::Alpha>(indicatorsAlpha);
+	underIndicator = props.GetInt("indicators.under", 0) == 1;
+
+	closeFind = static_cast<CloseFind>(props.GetInt("find.close.on.find", 1));
+
+	const std::string controlCharSymbol = props.GetString("control.char.symbol");
+	if (controlCharSymbol.length()) {
+		wEditor.SetControlCharSymbol(static_cast<unsigned char>(controlCharSymbol[0]));
+	} else {
+		wEditor.SetControlCharSymbol(0);
+	}
+
+	const std::string caretPeriod = props.GetString("caret.period");
+	if (caretPeriod.length()) {
+		wEditor.SetCaretPeriod(atoi(caretPeriod.c_str()));
+		wOutput.SetCaretPeriod(atoi(caretPeriod.c_str()));
+	}
+
+	const int caretZoneX = props.GetInt("caret.policy.width", 50);
+	int caretPolicyX = 0;
+	if (props.GetInt("caret.policy.xslop", 1))
+		caretPolicyX |= static_cast<int>(SA::CaretPolicy::Slop);
+	if (props.GetInt("caret.policy.xstrict"))
+		caretPolicyX |= static_cast<int>(SA::CaretPolicy::Strict);
+	if (props.GetInt("caret.policy.xeven", 1))
+		caretPolicyX |= static_cast<int>(SA::CaretPolicy::Even);
+	if (props.GetInt("caret.policy.xjumps"))
+		caretPolicyX |= static_cast<int>(SA::CaretPolicy::Jumps);
+	//wEditor.SetXCaretPolicy(caretStrict | caretSlop | caretEven | caretJumps);
+	wEditor.SetXCaretPolicy(static_cast<SA::CaretPolicy>(caretPolicyX), caretZoneX);
+
+	const int caretZoneY = props.GetInt("caret.policy.lines");
+	int caretPolicyY = 0;
+	if (props.GetInt("caret.policy.yslop", 1))
+		caretPolicyY |= static_cast<int>(SA::CaretPolicy::Slop);
+	if (props.GetInt("caret.policy.ystrict"))
+		caretPolicyY |= static_cast<int>(SA::CaretPolicy::Strict);
+	if (props.GetInt("caret.policy.yeven", 1))
+		caretPolicyY |= static_cast<int>(SA::CaretPolicy::Even);
+	if (props.GetInt("caret.policy.yjumps"))
+		caretPolicyY |= static_cast<int>(SA::CaretPolicy::Jumps);
+	wEditor.SetYCaretPolicy(static_cast<SA::CaretPolicy>(caretPolicyY), caretZoneY);
+
+	int visiblePolicy = 0;
+	if (props.GetInt("visible.policy.strict"))
+		visiblePolicy |= static_cast<int>(SA::VisiblePolicy::Strict);
+	if (props.GetInt("visible.policy.slop", 1))
+		visiblePolicy |= static_cast<int>(SA::VisiblePolicy::Slop);
+	const int visibleLines = props.GetInt("visible.policy.lines");
+	wEditor.SetVisiblePolicy(static_cast<SA::VisiblePolicy>(visiblePolicy), visibleLines);
+
+	wEditor.SetEdgeColumn(props.GetInt("edge.column", 0));
+	wEditor.SetEdgeMode(static_cast<SA::EdgeVisualStyle>(
+				    props.GetInt("edge.mode", static_cast<int>(SA::EdgeVisualStyle::None))));
+	wEditor.SetEdgeColour(
+		ColourOfProperty(props, "edge.colour", ColourRGB(0xff, 0xda, 0xda)));
+
+	const std::string selectionLayer = props.GetExpandedString("selection.layer");
+	if (selectionLayer.empty()) {
+
+		std::string selFore = props.GetExpandedString("selection.fore");
+		if (selFore.length()) {
+			CallChildren(SA::Message::SetSelFore, 1, ColourFromString(selFore));
+		} else {
+			CallChildren(SA::Message::SetSelFore, 0, 0);
+		}
+		std::string selBack = props.GetExpandedString("selection.back");
+		if (selBack.length()) {
+			CallChildren(SA::Message::SetSelBack, 1, ColourFromString(selBack));
+		} else {
+			if (selFore.length())
+				CallChildren(SA::Message::SetSelBack, 0, 0);
+			else	// Have to show selection somehow
+				CallChildren(SA::Message::SetSelBack, 1, ColourRGB(0xC0, 0xC0, 0xC0));
+		}
+		constexpr int NoAlpha = static_cast<int>(SA::Alpha::NoAlpha);
+		const int selectionAlpha = props.GetInt("selection.alpha", NoAlpha);
+		CallChildren(SA::Message::SetSelAlpha, selectionAlpha);
+
+		std::string selAdditionalFore = props.GetString("selection.additional.fore");
+		if (selAdditionalFore.length()) {
+			CallChildren(SA::Message::SetAdditionalSelFore, ColourFromString(selAdditionalFore));
+		}
+		std::string selAdditionalBack = props.GetString("selection.additional.back");
+		if (selAdditionalBack.length()) {
+			CallChildren(SA::Message::SetAdditionalSelBack, ColourFromString(selAdditionalBack));
+		}
+		const int selectionAdditionalAlpha = (selectionAlpha == NoAlpha) ? NoAlpha : selectionAlpha / 2;
+		CallChildren(SA::Message::SetAdditionalSelAlpha, props.GetInt("selection.additional.alpha", selectionAdditionalAlpha));
+
+	} else {
+		// New scheme
+		const int layer = IntegerFromString(selectionLayer, 0);
+		CallChildren(SA::Message::SetSelectionLayer, layer);
+		SetElementColour(SA::Element::SelectionText, "selection.fore");
+		SetElementColour(SA::Element::SelectionBack, "selection.back");
+		SetElementColour(SA::Element::SelectionAdditionalText, "selection.additional.fore");
+		SetElementColour(SA::Element::SelectionAdditionalBack, "selection.additional.back");
+		SetElementColour(SA::Element::SelectionSecondaryText, "selection.secondary.fore");
+		SetElementColour(SA::Element::SelectionSecondaryBack, "selection.secondary.back");
+		SetElementColour(SA::Element::SelectionInactiveText, "selection.inactive.fore");
+		SetElementColour(SA::Element::SelectionInactiveBack, "selection.inactive.back");
+	}
+
+	foldColour = props.GetExpandedString("fold.margin.colour");
+	if (foldColour.length()) {
+		CallChildren(SA::Message::SetFoldMarginColour, 1, ColourFromString(foldColour));
+	} else {
+		CallChildren(SA::Message::SetFoldMarginColour, 0, 0);
+	}
+	foldHiliteColour = props.GetExpandedString("fold.margin.highlight.colour");
+	if (foldHiliteColour.length()) {
+		CallChildren(SA::Message::SetFoldMarginHiColour, 1, ColourFromString(foldHiliteColour));
+	} else {
+		CallChildren(SA::Message::SetFoldMarginHiColour, 0, 0);
+	}
+
+	SetElementColour(SA::Element::WhiteSpace, "whitespace.fore");
+	SetElementColour(SA::Element::WhiteSpaceBack, "whitespace.back");
+
+	CallChildren(SA::Message::SetWhitespaceSize, props.GetInt("whitespace.size", 1));
+
+	char bracesStyleKey[200];
+	sprintf(bracesStyleKey, "braces.%s.style", language.c_str());
+	bracesStyle = props.GetInt(bracesStyleKey, 0);
+
+	char key[200] = "";
+	std::string sval;
+
+	sval = FindLanguageProperty("calltip.*.ignorecase");
+	callTipIgnoreCase = sval == "1";
+	sval = FindLanguageProperty("calltip.*.use.escapes");
+	callTipUseEscapes = sval == "1";
+
+	calltipWordCharacters = FindLanguageProperty("calltip.*.word.characters",
+				"_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+	calltipParametersStart = FindLanguageProperty("calltip.*.parameters.start", "(");
+	calltipParametersEnd = FindLanguageProperty("calltip.*.parameters.end", ")");
+	calltipParametersSeparators = FindLanguageProperty("calltip.*.parameters.separators", ",;");
+
+	calltipEndDefinition = FindLanguageProperty("calltip.*.end.definition");
+
+	sprintf(key, "autocomplete.%s.start.characters", language.c_str());
+	autoCompleteStartCharacters = props.GetExpandedString(key);
+	if (autoCompleteStartCharacters == "")
+		autoCompleteStartCharacters = props.GetExpandedString("autocomplete.*.start.characters");
+	// "" is a quite reasonable value for this setting
+
+	sprintf(key, "autocomplete.%s.fillups", language.c_str());
+	autoCompleteFillUpCharacters = props.GetExpandedString(key);
+	if (autoCompleteFillUpCharacters == "")
+		autoCompleteFillUpCharacters =
+			props.GetExpandedString("autocomplete.*.fillups");
+	wEditor.AutoCSetFillUps(autoCompleteFillUpCharacters.c_str());
+
+	sprintf(key, "autocomplete.%s.typesep", language.c_str());
+	autoCompleteTypeSeparator = props.GetExpandedString(key);
+	if (autoCompleteTypeSeparator == "")
+		autoCompleteTypeSeparator =
+			props.GetExpandedString("autocomplete.*.typesep");
+	if (autoCompleteTypeSeparator.length()) {
+		wEditor.AutoCSetTypeSeparator(
+			static_cast<unsigned char>(autoCompleteTypeSeparator[0]));
+	}
+
+	sprintf(key, "autocomplete.%s.ignorecase", "*");
+	sval = props.GetNewExpandString(key);
+	autoCompleteIgnoreCase = sval == "1";
+	sprintf(key, "autocomplete.%s.ignorecase", language.c_str());
+	sval = props.GetNewExpandString(key);
+	if (sval != "")
+		autoCompleteIgnoreCase = sval == "1";
+	wEditor.AutoCSetIgnoreCase(autoCompleteIgnoreCase);
+	wOutput.AutoCSetIgnoreCase(true);
+	autoCompleteVisibleItemCount = props.GetInt("autocomplete.visible.item.count", 9);
+
+	const int autoCChooseSingle = props.GetInt("autocomplete.choose.single");
+	wEditor.AutoCSetChooseSingle(autoCChooseSingle);
+
+	wEditor.AutoCSetCancelAtStart(false);
+	wEditor.AutoCSetDropRestOfWord(false);
+
+	OptionalSetColour(wEditor, SA::Element::List, props, "autocomplete.fore");
+	OptionalSetColour(wEditor, SA::Element::ListBack, props, "autocomplete.back");
+	OptionalSetColour(wEditor, SA::Element::ListSelected, props, "autocomplete.selected.fore");
+	OptionalSetColour(wEditor, SA::Element::ListSelectedBack, props, "autocomplete.selected.back");
+
+	if (firstPropertiesRead) {
+		ReadPropertiesInitial();
+	}
+
+	ReadFontProperties();
+
+	wEditor.SetPrintMagnification(props.GetInt("print.magnification"));
+	wEditor.SetPrintColourMode(static_cast<SA::PrintOption>(props.GetInt("print.colour.mode")));
+
+	jobQueue.clearBeforeExecute = props.GetInt("clear.before.execute");
+	jobQueue.timeCommands = props.GetInt("time.commands");
+
+	const int blankMarginLeft = props.GetInt("blank.margin.left", 1);
+	const int blankMarginLeftOutput = props.GetInt("output.blank.margin.left", blankMarginLeft);
+	const int blankMarginRight = props.GetInt("blank.margin.right", 1);
+	wEditor.SetMarginLeft(blankMarginLeft);
+	wEditor.SetMarginRight(blankMarginRight);
+	wOutput.SetMarginLeft(blankMarginLeftOutput);
+	wOutput.SetMarginRight(blankMarginRight);
+
+	marginWidth = props.GetInt("margin.width");
+	if (marginWidth == 0)
+		marginWidth = marginWidthDefault;
+	wEditor.SetMarginWidthN(1, margin ? marginWidth : 0);
+
+	const std::string lineMarginProp = props.GetString("line.margin.width");
+	lineNumbersWidth = atoi(lineMarginProp.c_str());
+	if (lineNumbersWidth == 0)
+		lineNumbersWidth = lineNumbersWidthDefault;
+	lineNumbersExpand = lineMarginProp.find('+') != std::string::npos;
+
+	SetLineNumberWidth();
+
+	bufferedDraw = props.GetInt("buffered.draw");
+	wEditor.SetBufferedDraw(bufferedDraw);
+	wOutput.SetBufferedDraw(bufferedDraw);
+
+	const SA::PhasesDraw phasesDraw = static_cast<SA::PhasesDraw>(
+			props.GetInt("phases.draw", static_cast<int>(SA::PhasesDraw::Two)));
+	wEditor.SetPhasesDraw(phasesDraw);
+	wOutput.SetPhasesDraw(phasesDraw);
+
+	wEditor.SetLayoutCache(static_cast<SA::LineCache>(
+				       props.GetInt("cache.layout", static_cast<int>(SA::LineCache::Caret))));
+	wOutput.SetLayoutCache(static_cast<SA::LineCache>(
+				       props.GetInt("output.cache.layout", static_cast<int>(SA::LineCache::Caret))));
+
+	bracesCheck = props.GetInt("braces.check");
+	bracesSloppy = props.GetInt("braces.sloppy");
+
+	wEditor.SetCharsDefault();
+	wordCharacters = props.GetNewExpandString("word.characters.", fileNameForExtension.c_str());
+	if (wordCharacters.length()) {
+		wEditor.SetWordChars(wordCharacters.c_str());
+	} else {
+		wordCharacters = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+	}
+
+	whitespaceCharacters = props.GetNewExpandString("whitespace.characters.", fileNameForExtension.c_str());
+	if (whitespaceCharacters.length()) {
+		wEditor.SetWhitespaceChars(whitespaceCharacters.c_str());
+	}
+
+	const std::string viewIndentExamine = GetFileNameProperty("view.indentation.examine");
+	indentExamine = viewIndentExamine.length() ? static_cast<SA::IndentView>(atoi(viewIndentExamine.c_str())) : SA::IndentView::Real;
+	wEditor.SetIndentationGuides(props.GetInt("view.indentation.guides") ?
+				     indentExamine : SA::IndentView::None);
+
+	wEditor.SetTabIndents(props.GetInt("tab.indents", 1));
+	wEditor.SetBackSpaceUnIndents(props.GetInt("backspace.unindents", 1));
+
+	wEditor.CallTipUseStyle(32);
+
+	std::string useStripTrailingSpaces = props.GetNewExpandString("strip.trailing.spaces.", ExtensionFileName().c_str());
+	if (useStripTrailingSpaces.length() > 0) {
+		stripTrailingSpaces = atoi(useStripTrailingSpaces.c_str()) != 0;
+	} else {
+		stripTrailingSpaces = props.GetInt("strip.trailing.spaces") != 0;
+	}
+	ensureFinalLineEnd = props.GetInt("ensure.final.line.end") != 0;
+	ensureConsistentLineEnds = props.GetInt("ensure.consistent.line.ends") != 0;
+
+	indentOpening = props.GetInt("indent.opening");
+	indentClosing = props.GetInt("indent.closing");
+	indentMaintain = atoi(props.GetNewExpandString("indent.maintain.", fileNameForExtension.c_str()).c_str());
+
+	const std::string lookback = props.GetNewExpandString("statement.lookback.", fileNameForExtension.c_str());
+	statementLookback = atoi(lookback.c_str());
+	statementIndent = GetStyleAndWords("statement.indent.");
+	statementEnd = GetStyleAndWords("statement.end.");
+	blockStart = GetStyleAndWords("block.start.");
+	blockEnd = GetStyleAndWords("block.end.");
+
+	struct PropToPPC {
+		const char *propName;
+		PreProc ppc;
+	};
+	PropToPPC propToPPC[] = {
+		{"preprocessor.start.", PreProc::Start},
+		{"preprocessor.middle.", PreProc::Middle},
+		{"preprocessor.end.", PreProc::End},
+	};
+	const std::string ppSymbol = props.GetNewExpandString("preprocessor.symbol.", fileNameForExtension.c_str());
+	preprocessorSymbol = ppSymbol.empty() ? 0 : ppSymbol[0];
+	preprocOfString.clear();
+	for (const PropToPPC &preproc : propToPPC) {
+		const std::string list = props.GetNewExpandString(preproc.propName, fileNameForExtension.c_str());
+		const std::vector<std::string> words = StringSplit(list, ' ');
+		for (const std::string &word : words) {
+			preprocOfString[word] = preproc.ppc;
+		}
+	}
+
+	memFiles.AppendList(props.GetNewExpandString("find.files"));
+
+	wEditor.SetWrapVisualFlags(static_cast<SA::WrapVisualFlag>(props.GetInt("wrap.visual.flags")));
+	wEditor.SetWrapVisualFlagsLocation(static_cast<SA::WrapVisualLocation>(props.GetInt("wrap.visual.flags.location")));
+	wEditor.SetWrapStartIndent(props.GetInt("wrap.visual.startindent"));
+	wEditor.SetWrapIndentMode(static_cast<SA::WrapIndentMode>(props.GetInt("wrap.indent.mode")));
+
+	idleStyling = static_cast<SA::IdleStyling>(props.GetInt("idle.styling", static_cast<int>(SA::IdleStyling::None)));
+	wEditor.SetIdleStyling(idleStyling);
+	wOutput.SetIdleStyling(static_cast<SA::IdleStyling>(props.GetInt("output.idle.styling", static_cast<int>(SA::IdleStyling::None))));
+
+	if (props.GetInt("os.x.home.end.keys")) {
+		AssignKey(SA::Keys::Home, SA::KeyMod::Norm, SCI_SCROLLTOSTART);
+		AssignKey(SA::Keys::Home, SA::KeyMod::Shift, SCI_NULL);
+		AssignKey(SA::Keys::Home, SA::KeyMod::Shift | SA::KeyMod::Alt, SCI_NULL);
+		AssignKey(SA::Keys::End, SA::KeyMod::Norm, SCI_SCROLLTOEND);
+		AssignKey(SA::Keys::End, SA::KeyMod::Shift, SCI_NULL);
+	} else {
+		if (props.GetInt("wrap.aware.home.end.keys", 0)) {
+			if (props.GetInt("vc.home.key", 1)) {
+				AssignKey(SA::Keys::Home, SA::KeyMod::Norm, SCI_VCHOMEWRAP);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift, SCI_VCHOMEWRAPEXTEND);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift | SA::KeyMod::Alt, SCI_VCHOMERECTEXTEND);
+			} else {
+				AssignKey(SA::Keys::Home, SA::KeyMod::Norm, SCI_HOMEWRAP);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift, SCI_HOMEWRAPEXTEND);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift | SA::KeyMod::Alt, SCI_HOMERECTEXTEND);
+			}
+			AssignKey(SA::Keys::End, SA::KeyMod::Norm, SCI_LINEENDWRAP);
+			AssignKey(SA::Keys::End, SA::KeyMod::Shift, SCI_LINEENDWRAPEXTEND);
+		} else {
+			if (props.GetInt("vc.home.key", 1)) {
+				AssignKey(SA::Keys::Home, SA::KeyMod::Norm, SCI_VCHOME);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift, SCI_VCHOMEEXTEND);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift | SA::KeyMod::Alt, SCI_VCHOMERECTEXTEND);
+			} else {
+				AssignKey(SA::Keys::Home, SA::KeyMod::Norm, SCI_HOME);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift, SCI_HOMEEXTEND);
+				AssignKey(SA::Keys::Home, SA::KeyMod::Shift | SA::KeyMod::Alt, SCI_HOMERECTEXTEND);
+			}
+			AssignKey(SA::Keys::End, SA::KeyMod::Norm, SCI_LINEEND);
+			AssignKey(SA::Keys::End, SA::KeyMod::Shift, SCI_LINEENDEXTEND);
+		}
+	}
+
+	AssignKey(static_cast<SA::Keys>('L'), SA::KeyMod::Shift | SA::KeyMod::Ctrl, SCI_LINEDELETE);
+
+
+	scrollOutput = props.GetInt("output.scroll", 1);
+
+	tabHideOne = props.GetInt("tabbar.hide.one");
+
+	SetToolsMenu();
+
+	wEditor.SetFoldFlags(static_cast<SA::FoldFlag>(props.GetInt("fold.flags")));
+
+	// To put the folder markers in the line number region
+	//wEditor.SetMarginMaskN(0, SC_MASK_FOLDERS);
+
+	wEditor.SetModEventMask(SA::ModificationFlags::ChangeFold);
+
+	if (0==props.GetInt("undo.redo.lazy")) {
+		// Trap for insert/delete notifications (also fired by undo
+		// and redo) so that the buttons can be enabled if needed.
+		const SA::ModificationFlags flagsCurrent = wEditor.ModEventMask();
+		const SA::ModificationFlags flags =
+				flagsCurrent |
+				SA::ModificationFlags::InsertText |
+				SA::ModificationFlags::DeleteText |
+				SA::ModificationFlags::LastStepInUndoRedo;
+		wEditor.SetModEventMask(flags);
+
+		// LastStepInUndoRedo is probably not needed in the mask; it
+		// doesn't seem to fire as an event of its own; just modifies the
+		// insert and delete events.
+	}
+
+	// Create a margin column for the folding symbols
+	wEditor.SetMarginTypeN(2, SA::MarginType::Symbol);
+
+	foldMarginWidth = props.GetInt("fold.margin.width");
+	if (foldMarginWidth == 0)
+		foldMarginWidth = foldMarginWidthDefault;
+	wEditor.SetMarginWidthN(2, foldMargin ? foldMarginWidth : 0);
+
+	wEditor.SetMarginMaskN(2, SA::MaskFolders);
+	wEditor.SetMarginSensitiveN(2, true);
+
+	// Define foreground (outline) and background (fill) colour of folds
+	const int foldSymbols = props.GetInt("fold.symbols");
+	std::string foldFore = props.GetExpandedString("fold.fore");
+	if (foldFore.length() == 0) {
+		// Set default colour for outline
+		switch (foldSymbols) {
+		case 0: // Arrows
+			foldFore = "#000000";
+			break;
+		case 1: // + -
+			foldFore = "#FFFFFF";
+			break;
+		case 2: // Circles
+			foldFore = "#404040";
+			break;
+		case 3: // Squares
+			foldFore = "#808080";
+			break;
+		}
+	}
+	const SA::ColourAlpha colourFoldFore = ColourAlphaFromString(foldFore);
+
+	std::string foldBack = props.GetExpandedString("fold.back");
+	// Set default colour for fill
+	if (foldBack.length() == 0) {
+		switch (foldSymbols) {
+		case 0:
+		case 1:
+			foldBack = "#000000";
+			break;
+		case 2:
+		case 3:
+			foldBack = "#FFFFFF";
+			break;
+		}
+	}
+	const SA::ColourAlpha colourFoldBack = ColourAlphaFromString(foldBack);
+
+	// Enable/disable highlight for current folding block (smallest one that contains the caret)
+	const int isHighlightEnabled = props.GetInt("fold.highlight", 0);
+	// Define the colour of highlight
+	const SA::ColourAlpha colourFoldBlockHighlight = ColourAlphaOfProperty(
+		props, "fold.highlight.colour", ColourRGBA(0xFF, 0, 0));
+
+	const int foldStrokeWidth = props.GetInt("fold.stroke.width", 100);
+	// Isolated and connected fold markers use foreground and background colours differently
+	MarkerAppearance isolated {
+		colourFoldFore, colourFoldBack, colourFoldBlockHighlight, foldStrokeWidth
+	};
+	MarkerAppearance connected {
+		colourFoldBack, colourFoldFore, colourFoldBlockHighlight, foldStrokeWidth
+	};
+	switch (foldSymbols) {
+	case 0:
+		// Arrow pointing right for contracted folders, arrow pointing down for expanded
+		DefineMarker(SA::MarkerOutline::FolderOpen, SA::MarkerSymbol::ArrowDown, isolated);
+		DefineMarker(SA::MarkerOutline::Folder, SA::MarkerSymbol::Arrow, isolated);
+		DefineMarker(SA::MarkerOutline::FolderSub, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderTail, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderEnd, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderOpenMid, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderMidTail, SA::MarkerSymbol::Empty, isolated);
+		// The highlight is disabled for arrow.
+		wEditor.MarkerEnableHighlight(false);
+		break;
+	case 1:
+		// Plus for contracted folders, minus for expanded
+		DefineMarker(SA::MarkerOutline::FolderOpen, SA::MarkerSymbol::Minus, isolated);
+		DefineMarker(SA::MarkerOutline::Folder, SA::MarkerSymbol::Plus, isolated);
+		DefineMarker(SA::MarkerOutline::FolderSub, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderTail, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderEnd, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderOpenMid, SA::MarkerSymbol::Empty, isolated);
+		DefineMarker(SA::MarkerOutline::FolderMidTail, SA::MarkerSymbol::Empty, isolated);
+		// The highlight is disabled for plus/minus.
+		wEditor.MarkerEnableHighlight(false);
+		break;
+	case 2:
+		// Like a flattened tree control using circular headers and curved joins
+		DefineMarker(SA::MarkerOutline::FolderOpen, SA::MarkerSymbol::CircleMinus, connected);
+		DefineMarker(SA::MarkerOutline::Folder, SA::MarkerSymbol::CirclePlus, connected);
+		DefineMarker(SA::MarkerOutline::FolderSub, SA::MarkerSymbol::VLine, connected);
+		DefineMarker(SA::MarkerOutline::FolderTail, SA::MarkerSymbol::LCornerCurve, connected);
+		DefineMarker(SA::MarkerOutline::FolderEnd, SA::MarkerSymbol::CirclePlusConnected, connected);
+		DefineMarker(SA::MarkerOutline::FolderOpenMid, SA::MarkerSymbol::CircleMinusConnected, connected);
+		DefineMarker(SA::MarkerOutline::FolderMidTail, SA::MarkerSymbol::TCornerCurve, connected);
+		wEditor.MarkerEnableHighlight(isHighlightEnabled);
+		break;
+	case 3:
+		// Like a flattened tree control using square headers
+		DefineMarker(SA::MarkerOutline::FolderOpen, SA::MarkerSymbol::BoxMinus, connected);
+		DefineMarker(SA::MarkerOutline::Folder, SA::MarkerSymbol::BoxPlus, connected);
+		DefineMarker(SA::MarkerOutline::FolderSub, SA::MarkerSymbol::VLine, connected);
+		DefineMarker(SA::MarkerOutline::FolderTail, SA::MarkerSymbol::LCorner, connected);
+		DefineMarker(SA::MarkerOutline::FolderEnd, SA::MarkerSymbol::BoxPlusConnected, connected);
+		DefineMarker(SA::MarkerOutline::FolderOpenMid, SA::MarkerSymbol::BoxMinusConnected, connected);
+		DefineMarker(SA::MarkerOutline::FolderMidTail, SA::MarkerSymbol::TCorner, connected);
+		wEditor.MarkerEnableHighlight(isHighlightEnabled);
+		break;
+	}
+
+	wEditor.MarkerSetForeTranslucent(markerBookmark,
+			      ColourAlphaOfProperty(props, "bookmark.fore", ColourRGBA(0xbe, 0, 0)));
+	wEditor.MarkerSetBackTranslucent(markerBookmark,
+			      ColourAlphaOfProperty(props, "bookmark.back", ColourRGBA(0xe2, 0x40, 0x40)));
+	wEditor.MarkerSetAlpha(markerBookmark,
+			       static_cast<SA::Alpha>(props.GetInt("bookmark.alpha", static_cast<int>(SA::Alpha::NoAlpha))));
+	wEditor.MarkerSetStrokeWidth(markerBookmark, props.GetInt("bookmark.stroke.width", 100));
+
+	const std::string bookMarkXPM = props.GetString("bookmark.pixmap");
+	if (bookMarkXPM.length()) {
+		wEditor.MarkerDefinePixmap(markerBookmark, bookMarkXPM.c_str());
+	} else if (props.GetString("bookmark.fore").length()) {
+		wEditor.MarkerDefine(markerBookmark, static_cast<SA::MarkerSymbol>(
+					     props.GetInt("bookmark.symbol", static_cast<int>(SA::MarkerSymbol::Bookmark))));
+	} else {
+		// No bookmark.fore setting so display default pixmap.
+		wEditor.MarkerDefinePixmap(markerBookmark, reinterpret_cast<const char *>(bookmarkBluegem));
+	}
+
+	wEditor.SetScrollWidth(props.GetInt("horizontal.scroll.width", 2000));
+	wEditor.SetScrollWidthTracking(props.GetInt("horizontal.scroll.width.tracking", 1));
+	wOutput.SetScrollWidth(props.GetInt("output.horizontal.scroll.width", 2000));
+	wOutput.SetScrollWidthTracking(props.GetInt("output.horizontal.scroll.width.tracking", 1));
+
+	// Do these last as they force a style refresh
+	wEditor.SetHScrollBar(props.GetInt("horizontal.scrollbar", 1));
+	wOutput.SetHScrollBar(props.GetInt("output.horizontal.scrollbar", 1));
+
+	wEditor.SetEndAtLastLine(props.GetInt("end.at.last.line", 1));
+	wEditor.SetCaretSticky(static_cast<SA::CaretSticky>(props.GetInt("caret.sticky", 0)));
+
+	// Clear all previous indicators.
+	wEditor.SetIndicatorCurrent(indicatorHighlightCurrentWord);
+	wEditor.IndicatorClearRange(0, wEditor.Length());
+	wOutput.SetIndicatorCurrent(indicatorHighlightCurrentWord);
+	wOutput.IndicatorClearRange(0, wOutput.Length());
+	currentWordHighlight.statesOfDelay = currentWordHighlight.noDelay;
+
+	currentWordHighlight.isEnabled = props.GetInt("highlight.current.word", 0) == 1;
+	if (currentWordHighlight.isEnabled) {
+		const std::string highlightCurrentWordIndicatorString = props.GetExpandedString("highlight.current.word.indicator");
+		IndicatorDefinition highlightCurrentWordIndicator(highlightCurrentWordIndicatorString.c_str());
+		if (highlightCurrentWordIndicatorString.length() == 0) {
+			highlightCurrentWordIndicator.style = SA::IndicatorStyle::RoundBox;
+			std::string highlightCurrentWordColourString = props.GetExpandedString("highlight.current.word.colour");
+			if (highlightCurrentWordColourString.length() == 0) {
+				// Set default colour for highlight.
+				highlightCurrentWordColourString = "#A0A000";
+			}
+			highlightCurrentWordIndicator.colour = ColourFromString(highlightCurrentWordColourString);
+			highlightCurrentWordIndicator.fillAlpha = alphaIndicator;
+			highlightCurrentWordIndicator.under = underIndicator;
+		}
+		SetOneIndicator(wEditor, indicatorHighlightCurrentWord, highlightCurrentWordIndicator);
+		SetOneIndicator(wOutput, indicatorHighlightCurrentWord, highlightCurrentWordIndicator);
+		currentWordHighlight.isOnlyWithSameStyle = props.GetInt("highlight.current.word.by.style", 0) == 1;
+		HighlightCurrentWord(true);
+	}
+
+	ReadEditorConfig(fileNameForExtension);
+
+	if (extender) {
+		FilePath defaultDir = GetDefaultDirectory();
+		FilePath scriptPath;
+
+		// Check for an extension script
+		GUI::gui_string extensionFile = GUI::StringFromUTF8(
+							props.GetNewExpandString("extension.", fileNameForExtension.c_str()));
+		if (extensionFile.length()) {
+			// find file in local directory
+			FilePath docDir = filePath.Directory();
+			if (Exists(docDir.AsInternal(), extensionFile.c_str(), &scriptPath)) {
+				// Found file in document directory
+				extender->Load(scriptPath.AsUTF8().c_str());
+			} else if (Exists(defaultDir.AsInternal(), extensionFile.c_str(), &scriptPath)) {
+				// Found file in global directory
+				extender->Load(scriptPath.AsUTF8().c_str());
+			} else if (Exists(GUI_TEXT(""), extensionFile.c_str(), &scriptPath)) {
+				// Found as completely specified file name
+				extender->Load(scriptPath.AsUTF8().c_str());
+			}
+		}
+	}
+
+	delayBeforeAutoSave = props.GetInt("save.on.timer");
+	if (delayBeforeAutoSave) {
+		TimerStart(timerAutoSave);
+	} else {
+		TimerEnd(timerAutoSave);
+	}
+
+	firstPropertiesRead = false;
+	needReadProperties = false;
+}
+
+void SciTEBase::ReadEditorConfig(const std::string &fileNameForExtension) {
+	std::map<std::string, std::string> eConfig = editorConfig->MapFromAbsolutePath(filePath);
+	for (const std::pair<const std::string, std::string> &pss : eConfig) {
+		try {
+			if (pss.first == "indent_style") {
+				const bool useTabs = pss.second == "tab";
+				propsDiscovered.Set("use.tabs", useTabs ? "1" : "0");
+				propsDiscovered.Set("use.tabs." + fileNameForExtension, useTabs ? "1" : "0");
+				wEditor.SetUseTabs(useTabs);
+			} else if (pss.first == "indent_size") {
+				std::string sIndentSize = pss.second;
+				if (sIndentSize == "tab") {
+					sIndentSize = props.GetExpandedString("tabsize");
+					if (sIndentSize.empty()) {
+						sIndentSize = "8";
+					}
+				}
+				propsDiscovered.Set("indent.size", sIndentSize);
+				propsDiscovered.Set("indent.size." + fileNameForExtension, sIndentSize);
+				wEditor.SetIndent(std::stoi(sIndentSize));
+			} else if (pss.first == "tab_width") {
+				propsDiscovered.Set("tabsize", pss.second);
+				propsDiscovered.Set("tab.size." + fileNameForExtension, pss.second);
+				wEditor.SetTabWidth(std::stoi(pss.second));
+			} else if (pss.first == "end_of_line") {
+				if (pss.second == "lf") {
+					propsDiscovered.Set("eol.mode", "LF");
+					wEditor.SetEOLMode(SA::EndOfLine::Lf);
+				} else if (pss.second == "cr") {
+					propsDiscovered.Set("eol.mode", "CR");
+					wEditor.SetEOLMode(SA::EndOfLine::Cr);
+				} else if (pss.second == "crlf") {
+					propsDiscovered.Set("eol.mode", "CRLF");
+					wEditor.SetEOLMode(SA::EndOfLine::CrLf);
+				}
+			} else if (pss.first == "charset") {
+				if (pss.second == "latin1") {
+					CurrentBuffer()->unicodeMode = uni8Bit;
+					codePage = 0;
+				} else {
+					if (pss.second == "utf-8")
+						CurrentBuffer()->unicodeMode = uniCookie;
+					if (pss.second == "utf-8-bom")
+						CurrentBuffer()->unicodeMode = uniUTF8;
+					if (pss.second == "utf-16be")
+						CurrentBuffer()->unicodeMode = uni16BE;
+					if (pss.second == "utf-16le")
+						CurrentBuffer()->unicodeMode = uni16LE;
+					codePage = SA::CpUtf8;
+				}
+				wEditor.SetCodePage(codePage);
+			} else if (pss.first == "trim_trailing_whitespace") {
+				stripTrailingSpaces = pss.second == "true";
+			} else if (pss.first == "insert_final_newline") {
+				ensureFinalLineEnd = pss.second == "true";
+			}
+		} catch (std::invalid_argument &) {
+			std::string diagnostic = "Invalid argument in .editorconfig '";
+			diagnostic += pss.first;
+			diagnostic += "=";
+			diagnostic += pss.second;
+			diagnostic += "'.\n";
+			OutputAppendString(diagnostic.c_str());
+			SetOutputVisibility(true);
+		}
+	}
+}
+
+void SciTEBase::ReadFontProperties() {
+	char key[200] = "";
+	const char *languageName = language.c_str();
+
+	if (StartsWith(languageName, "lpeg.") && language.length() < 240) {
+		// Retrieve style info.
+		char propStr[256] = "";
+		for (int i = 0; i < StyleMax; i++) {
+			sprintf(key, "style.%s.%0d", languageName, i);
+			wEditor.PrivateLexerCall(i - StyleMax, propStr);
+			props.Set(key, propStr);
+		}
+	}
+
+	// Set styles
+	// For each window set the global default style, then the language default style, then the other global styles, then the other language styles
+
+	const SA::FontQuality fontQuality = static_cast<SA::FontQuality>(props.GetInt("font.quality"));
+	wEditor.SetFontQuality(fontQuality);
+	wOutput.SetFontQuality(fontQuality);
+
+	wEditor.StyleResetDefault();
+	wOutput.StyleResetDefault();
+
+	std::string fontLocale = props.GetExpandedString("font.locale");
+	if (!fontLocale.empty()) {
+		wEditor.SetFontLocale(fontLocale.c_str());
+		wOutput.SetFontLocale(fontLocale.c_str());
+	}
+
+	sprintf(key, "style.%s.%0d", "*", StyleDefault);
+	std::string sval = props.GetNewExpandString(key);
+	SetOneStyle(wEditor, StyleDefault, StyleDefinition(sval));
+	SetOneStyle(wOutput, StyleDefault, StyleDefinition(sval));
+
+	sprintf(key, "style.%s.%0d", languageName, StyleDefault);
+	sval = props.GetNewExpandString(key);
+	SetOneStyle(wEditor, StyleDefault, StyleDefinition(sval));
+
+	wEditor.StyleClearAll();
+
+	SetStyleFor(wEditor, "*");
+	SetStyleFor(wEditor, languageName);
+	if (props.GetInt("error.inline")) {
+		wEditor.ReleaseAllExtendedStyles();
+		diagnosticStyleStart = wEditor.AllocateExtendedStyles(diagnosticStyles);
+		SetStyleBlock(wEditor, "error", diagnosticStyleStart, diagnosticStyleStart+diagnosticStyles-1);
+	}
+
+	const int diffToSecondary = static_cast<int>(wEditor.DistanceToSecondaryStyles());
+	for (const unsigned char subStyleBase : subStyleBases) {
+		const int subStylesStart = wEditor.SubStylesStart(subStyleBase);
+		const int subStylesLength = wEditor.SubStylesLength(subStyleBase);
+		for (int subStyle=0; subStyle<subStylesLength; subStyle++) {
+			for (int active=0; active<(diffToSecondary?2:1); active++) {
+				const int activity = active * diffToSecondary;
+				sprintf(key, "style.%s.%0d.%0d", languageName, subStyleBase + activity, subStyle+1);
+				sval = props.GetNewExpandString(key);
+				SetOneStyle(wEditor, subStylesStart + subStyle + activity, StyleDefinition(sval));
+			}
+		}
+	}
+
+	// Turn grey while loading
+	if (CurrentBuffer()->lifeState == Buffer::reading)
+		wEditor.StyleSetBack(StyleDefault, 0xEEEEEE);
+
+	wOutput.StyleClearAll();
+
+	sprintf(key, "style.%s.%0d", "errorlist", StyleDefault);
+	sval = props.GetNewExpandString(key);
+	SetOneStyle(wOutput, StyleDefault, StyleDefinition(sval));
+
+	wOutput.StyleClearAll();
+
+	SetStyleFor(wOutput, "*");
+	SetStyleFor(wOutput, "errorlist");
+
+	if (CurrentBuffer()->useMonoFont) {
+		sval = props.GetExpandedString("font.monospace");
+		StyleDefinition sd(sval.c_str());
+		for (int style = 0; style <= StyleMax; style++) {
+			if (style != static_cast<int>(SA::StylesCommon::LineNumber)) {
+				if (sd.specified & StyleDefinition::sdFont) {
+					wEditor.StyleSetFont(style, sd.font.c_str());
+				}
+				if (sd.specified & StyleDefinition::sdSize) {
+					wEditor.StyleSetSizeFractional(style, sd.FractionalSize());
+				}
+			}
+		}
+	}
+}
+
+// Properties that are interactively modifiable are only read from the properties file once.
+void SciTEBase::SetPropertiesInitial() {
+	splitVertical = props.GetInt("split.vertical");
+	openFilesHere = props.GetInt("check.if.already.open");
+	wrap = props.GetInt("wrap");
+	wrapOutput = props.GetInt("output.wrap");
+	indentationWSVisible = props.GetInt("view.indentation.whitespace", 1);
+	sbVisible = props.GetInt("statusbar.visible");
+	tbVisible = props.GetInt("toolbar.visible");
+	tabVisible = props.GetInt("tabbar.visible");
+	tabMultiLine = props.GetInt("tabbar.multiline");
+	lineNumbers = props.GetInt("line.margin.visible");
+	margin = props.GetInt("margin.width");
+	foldMargin = props.GetInt("fold.margin.width", foldMarginWidthDefault);
+
+	matchCase = props.GetInt("find.replace.matchcase");
+	regExp = props.GetInt("find.replace.regexp");
+	unSlash = props.GetInt("find.replace.escapes");
+	wrapFind = props.GetInt("find.replace.wrap", 1);
+	focusOnReplace = props.GetInt("find.replacewith.focus", 1);
+}
+
+GUI::gui_string Localization::Text(const char *s, bool retainIfNotFound) {
+	const std::string sEllipse("...");	// An ASCII ellipse
+	const std::string utfEllipse("\xe2\x80\xa6");	// A UTF-8 ellipse
+	std::string translation = s;
+	const int ellipseIndicator = Remove(translation, sEllipse);
+	const int utfEllipseIndicator = Remove(translation, utfEllipse);
+	const std::string menuAccessIndicatorChar(1, static_cast<char>(menuAccessIndicator[0]));
+	const int accessKeyPresent = Remove(translation, menuAccessIndicatorChar);
+	LowerCaseAZ(translation);
+	Substitute(translation, "\n", "\\n");
+	translation = GetString(translation.c_str());
+	if (translation.length()) {
+		if (ellipseIndicator)
+			translation += sEllipse;
+		if (utfEllipseIndicator)
+			translation += utfEllipse;
+		if (0 == accessKeyPresent) {
+#if !defined(GTK)
+			// Following codes are required because accelerator is not always
+			// part of alphabetical word in several language. In these cases,
+			// accelerator is written like "(&O)".
+			const size_t posOpenParenAnd = translation.find("(&");
+			if ((posOpenParenAnd != std::string::npos) && (translation.find(")", posOpenParenAnd) == posOpenParenAnd + 3)) {
+				translation.erase(posOpenParenAnd, 4);
+			} else {
+				Remove(translation, std::string("&"));
+			}
+#else
+			Remove(translation, std::string("&"));
+#endif
+		}
+		Substitute(translation, "&", menuAccessIndicatorChar);
+		Substitute(translation, "\\n", "\n");
+	} else {
+		translation = missing;
+	}
+	if ((translation.length() > 0) || !retainIfNotFound) {
+		return GUI::StringFromUTF8(translation);
+	}
+	return GUI::StringFromUTF8(s);
+}
+
+GUI::gui_string SciTEBase::LocaliseMessage(const char *s, const GUI::gui_char *param0, const GUI::gui_char *param1, const GUI::gui_char *param2) {
+	GUI::gui_string translation = localiser.Text(s);
+	if (param0)
+		Substitute(translation, GUI_TEXT("^0"), param0);
+	if (param1)
+		Substitute(translation, GUI_TEXT("^1"), param1);
+	if (param2)
+		Substitute(translation, GUI_TEXT("^2"), param2);
+	return translation;
+}
+
+void SciTEBase::ReadLocalization() {
+	localiser.Clear();
+	GUI::gui_string title = GUI_TEXT("locale.properties");
+	const std::string localeProps = props.GetExpandedString("locale.properties");
+	if (localeProps.length()) {
+		title = GUI::StringFromUTF8(localeProps);
+	}
+	FilePath propdir = GetSciteDefaultHome();
+	FilePath localePath(propdir, title);
+	localiser.Read(localePath, propdir, filter, &importFiles, 0);
+	localiser.SetMissing(props.GetString("translation.missing"));
+	localiser.read = true;
+}
+
+void SciTEBase::ReadPropertiesInitial() {
+	SetPropertiesInitial();
+	const int sizeHorizontal = props.GetInt("output.horizontal.size", 0);
+	const int sizeVertical = props.GetInt("output.vertical.size", 0);
+	const int hideOutput = props.GetInt("output.initial.hide", 0);
+	if ((!splitVertical && (sizeVertical > 0) && (heightOutput < sizeVertical)) ||
+			(splitVertical && (sizeHorizontal > 0) && (heightOutput < sizeHorizontal))) {
+		previousHeightOutput = splitVertical ? sizeHorizontal : sizeVertical;
+		if (!hideOutput) {
+			heightOutput = NormaliseSplit(previousHeightOutput);
+			SizeSubWindows();
+			Redraw();
+		}
+	}
+	ViewWhitespace(props.GetInt("view.whitespace"));
+	wEditor.SetIndentationGuides(props.GetInt("view.indentation.guides") ?
+				     indentExamine : SA::IndentView::None);
+
+	wEditor.SetViewEOL(props.GetInt("view.eol"));
+	wEditor.SetZoom(props.GetInt("magnification"));
+	wOutput.SetZoom(props.GetInt("output.magnification"));
+	wEditor.SetWrapMode(wrap ? wrapStyle : SA::Wrap::None);
+	wOutput.SetWrapMode(wrapOutput ? wrapStyle : SA::Wrap::None);
+
+	std::string menuLanguageProp = props.GetExpandedString("menu.language");
+	std::replace(menuLanguageProp.begin(), menuLanguageProp.end(), '|', '\0');
+	const char *sMenuLanguage = menuLanguageProp.c_str();
+	while (*sMenuLanguage) {
+		LanguageMenuItem lmi;
+		lmi.menuItem = sMenuLanguage;
+		sMenuLanguage += strlen(sMenuLanguage) + 1;
+		lmi.extension = sMenuLanguage;
+		sMenuLanguage += strlen(sMenuLanguage) + 1;
+		lmi.menuKey = sMenuLanguage;
+		sMenuLanguage += strlen(sMenuLanguage) + 1;
+		languageMenu.push_back(lmi);
+	}
+	SetLanguageMenu();
+
+	// load the user defined short cut props
+	std::string shortCutProp = props.GetNewExpandString("user.shortcuts");
+	if (shortCutProp.length()) {
+		const size_t pipes = std::count(shortCutProp.begin(), shortCutProp.end(), '|');
+		std::replace(shortCutProp.begin(), shortCutProp.end(), '|', '\0');
+		const char *sShortCutProp = shortCutProp.c_str();
+		for (size_t item = 0; item < pipes/2; item++) {
+			ShortcutItem sci;
+			sci.menuKey = sShortCutProp;
+			sShortCutProp += strlen(sShortCutProp) + 1;
+			sci.menuCommand = sShortCutProp;
+			sShortCutProp += strlen(sShortCutProp) + 1;
+			shortCutItemList.push_back(sci);
+		}
+	}
+	// end load the user defined short cut props
+
+	FilePath homepath = GetSciteDefaultHome();
+	props.Set("SciteDefaultHome", homepath.AsUTF8().c_str());
+	homepath = GetSciteUserHome();
+	props.Set("SciteUserHome", homepath.AsUTF8().c_str());
+}
+
+FilePath SciTEBase::GetDefaultPropertiesFileName() {
+	return FilePath(GetSciteDefaultHome(), propGlobalFileName);
+}
+
+FilePath SciTEBase::GetAbbrevPropertiesFileName() {
+	return FilePath(GetSciteUserHome(), propAbbrevFileName);
+}
+
+FilePath SciTEBase::GetUserPropertiesFileName() {
+	return FilePath(GetSciteUserHome(), propUserFileName);
+}
+
+FilePath SciTEBase::GetLocalPropertiesFileName() {
+	return FilePath(filePath.Directory(), propLocalFileName);
+}
+
+FilePath SciTEBase::GetDirectoryPropertiesFileName() {
+	FilePath propfile;
+
+	if (filePath.IsSet()) {
+		propfile.Set(filePath.Directory(), propDirectoryFileName);
+
+		// if this file does not exist try to find the prop file in a parent directory
+		while (!propfile.Directory().IsRoot() && !propfile.Exists()) {
+			propfile.Set(propfile.Directory().Directory(), propDirectoryFileName);
+		}
+
+		// not found -> set it to the initial directory
+		if (!propfile.Exists()) {
+			propfile.Set(filePath.Directory(), propDirectoryFileName);
+		}
+	}
+	return propfile;
+}
+
+void SciTEBase::OpenProperties(int propsFile) {
+	FilePath propfile;
+	switch (propsFile) {
+	case IDM_OPENLOCALPROPERTIES:
+		propfile = GetLocalPropertiesFileName();
+		Open(propfile, ofQuiet);
+		break;
+	case IDM_OPENUSERPROPERTIES:
+		propfile = GetUserPropertiesFileName();
+		Open(propfile, ofQuiet);
+		break;
+	case IDM_OPENABBREVPROPERTIES:
+		propfile = pathAbbreviations;
+		Open(propfile, ofQuiet);
+		break;
+	case IDM_OPENGLOBALPROPERTIES:
+		propfile = GetDefaultPropertiesFileName();
+		Open(propfile, ofQuiet);
+		break;
+	case IDM_OPENLUAEXTERNALFILE: {
+			GUI::gui_string extlua = GUI::StringFromUTF8(props.GetExpandedString("ext.lua.startup.script"));
+			if (extlua.length()) {
+				Open(extlua, ofQuiet);
+			}
+			break;
+		}
+	case IDM_OPENDIRECTORYPROPERTIES: {
+			propfile = GetDirectoryPropertiesFileName();
+			const bool alreadyExists = propfile.Exists();
+			Open(propfile, ofQuiet);
+			if (!alreadyExists)
+				SaveAsDialog();
+		}
+		break;
+	}
+}
+
+// return the int value of the command name passed in.
+int SciTEBase::GetMenuCommandAsInt(std::string commandName) {
+	int i = IFaceTable::FindConstant(commandName.c_str());
+	if (i != -1) {
+		return IFaceTable::constants[i].value;
+	}
+
+	// Check also for a SCI command, as long as it has no parameters
+	i = IFaceTable::FindFunctionByConstantName(commandName.c_str());
+	if (i != -1 &&
+			IFaceTable::functions[i].paramType[0] == iface_void &&
+			IFaceTable::functions[i].paramType[1] == iface_void) {
+		return IFaceTable::functions[i].value;
+	}
+
+	// Otherwise we might have entered a number as command to access a "SCI_" command
+	return atoi(commandName.c_str());
+}
diff --git a/scite-app/scite/src/ScintillaWindow.cxx b/scite-app/scite/src/ScintillaWindow.cxx
new file mode 100644
index 0000000..ab16d86
--- /dev/null
+++ b/scite-app/scite/src/ScintillaWindow.cxx
@@ -0,0 +1,41 @@
+// SciTE - Scintilla based Text Editor
+/** @file ScintillaWindow.cxx
+ ** Interface to a Scintilla instance.
+ **/
+// Copyright 1998-2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <string>
+#include <string_view>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+namespace GUI {
+
+ScintillaWindow::ScintillaWindow() noexcept = default;
+
+ScintillaWindow::~ScintillaWindow() = default;
+
+void ScintillaWindow::SetScintilla(GUI::WindowID wid_) {
+	SetID(wid_);
+	if (wid) {
+		SciFnDirectStatus fn_ = reinterpret_cast<SciFnDirectStatus>(
+					  Send(static_cast<unsigned int>(Scintilla::Message::GetDirectStatusFunction)));
+		const sptr_t ptr_ = Send(static_cast<unsigned int>(Scintilla::Message::GetDirectPointer));
+		SetFnPtr(fn_, ptr_);
+	}
+}
+
+bool ScintillaWindow::CanCall() const noexcept {
+	return wid && IsValid();
+}
+
+}
diff --git a/scite-app/scite/src/ScintillaWindow.h b/scite-app/scite/src/ScintillaWindow.h
new file mode 100644
index 0000000..c4d7936
--- /dev/null
+++ b/scite-app/scite/src/ScintillaWindow.h
@@ -0,0 +1,30 @@
+// SciTE - Scintilla based Text Editor
+/** @file ScintillaWindow.h
+ ** Interface to a Scintilla instance.
+ **/
+// Copyright 1998-2018 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCINTILLAWINDOW_H
+#define SCINTILLAWINDOW_H
+
+namespace GUI {
+
+class ScintillaWindow : public GUI::ScintillaPrimitive, public Scintilla::ScintillaCall {
+public:
+	ScintillaWindow() noexcept;
+	~ScintillaWindow() override;
+	// Deleted so ScintillaWindow objects can not be copied.
+	ScintillaWindow(const ScintillaWindow &source) = delete;
+	ScintillaWindow(ScintillaWindow &&) = delete;
+	ScintillaWindow &operator=(const ScintillaWindow &) = delete;
+	ScintillaWindow &operator=(ScintillaWindow &&) = delete;
+
+	void SetScintilla(GUI::WindowID wid_);
+	bool CanCall() const noexcept;
+};
+
+}
+
+
+#endif
diff --git a/scite-app/scite/src/StringHelpers.cxx b/scite-app/scite/src/StringHelpers.cxx
new file mode 100644
index 0000000..7256f2a
--- /dev/null
+++ b/scite-app/scite/src/StringHelpers.cxx
@@ -0,0 +1,470 @@
+// SciTE - Scintilla based Text Editor
+/** @file StringHelpers.cxx
+ ** Implementation of widely useful string functions.
+ **/
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+
+#include <stdexcept>
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <functional>
+#include <chrono>
+
+#include "GUI.h"
+#include "StringHelpers.h"
+
+bool StartsWith(std::wstring_view s, std::wstring_view start) {
+	return (s.size() >= start.size()) &&
+	       (std::equal(s.begin(), s.begin() + start.size(), start.begin()));
+}
+
+bool StartsWith(std::string_view s, std::string_view start) {
+	return (s.size() >= start.size()) &&
+	       (std::equal(s.begin(), s.begin() + start.size(), start.begin()));
+}
+
+bool EndsWith(std::wstring_view s, std::wstring_view end) {
+	return (s.size() >= end.size()) &&
+	       (std::equal(s.begin() + s.size() - end.size(), s.end(), end.begin()));
+}
+
+bool Contains(std::string const &s, char ch) noexcept {
+	return s.find(ch) != std::string::npos;
+}
+
+int Substitute(std::wstring &s, std::wstring_view sFind, std::wstring_view sReplace) {
+	int c = 0;
+	const size_t lenFind = sFind.size();
+	const size_t lenReplace = sReplace.size();
+	size_t posFound = s.find(sFind);
+	while (posFound != std::wstring::npos) {
+		s.replace(posFound, lenFind, sReplace);
+		posFound = s.find(sFind, posFound + lenReplace);
+		c++;
+	}
+	return c;
+}
+
+int Substitute(std::string &s, std::string_view sFind, std::string_view sReplace) {
+	int c = 0;
+	const size_t lenFind = sFind.size();
+	const size_t lenReplace = sReplace.size();
+	size_t posFound = s.find(sFind);
+	while (posFound != std::string::npos) {
+		s.replace(posFound, lenFind, sReplace);
+		posFound = s.find(sFind, posFound + lenReplace);
+		c++;
+	}
+	return c;
+}
+
+bool RemoveStringOnce(std::string &s, const char *marker) {
+	const size_t modText = s.find(marker);
+	if (modText != std::string::npos) {
+		s.erase(modText, strlen(marker));
+		return true;
+	}
+	return false;
+}
+
+std::string StdStringFromInteger(int i) {
+	return std::to_string(i);
+}
+
+std::string StdStringFromSizeT(size_t i) {
+	return std::to_string(i);
+}
+
+std::string StdStringFromDouble(double d, int precision) {
+	char number[32];
+	sprintf(number, "%.*f", precision, d);
+	return std::string(number);
+}
+
+int IntegerFromString(const std::string &val, int defaultValue) {
+	try {
+		if (val.length()) {
+			return std::stoi(val);
+		}
+	} catch (std::logic_error &) {
+		// Ignore bad values, either non-numeric or out of range numeric
+	}
+	return defaultValue;
+}
+
+intptr_t IntPtrFromString(const std::string &val, intptr_t defaultValue) {
+	try {
+		if (val.length()) {
+			return static_cast<intptr_t>(std::stoll(val));
+		}
+	} catch (std::logic_error &) {
+		// Ignore bad values, either non-numeric or out of range numeric
+	}
+	return defaultValue;
+}
+
+long long LongLongFromString(const std::string &val, long long defaultValue) {
+	try {
+		if (val.length()) {
+			return std::stoll(val);
+		}
+	} catch (std::logic_error &) {
+		// Ignore bad values, either non-numeric or out of range numeric
+	}
+	return defaultValue;
+}
+
+void LowerCaseAZ(std::string &s) {
+	std::transform(s.begin(), s.end(), s.begin(), MakeLowerCase);
+}
+
+intptr_t IntegerFromText(const char *s) noexcept {
+	return static_cast<intptr_t>(atoll(s));
+}
+
+int CompareNoCase(const char *a, const char *b) noexcept {
+	while (*a && *b) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+	}
+	// Either *a or *b is nul
+	return *a - *b;
+}
+
+bool EqualCaseInsensitive(const char *a, const char *b) noexcept {
+	return 0 == CompareNoCase(a, b);
+}
+
+bool EqualCaseInsensitive(std::string_view a, std::string_view b) noexcept {
+	if (a.length() != b.length()) {
+		return false;
+	}
+	for (size_t i = 0; i < a.length(); i++) {
+		if (MakeUpperCase(a[i]) != MakeUpperCase(b[i])) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool isprefix(const char *target, const char *prefix) noexcept {
+	while (*target && *prefix) {
+		if (*target != *prefix)
+			return false;
+		target++;
+		prefix++;
+	}
+	if (*prefix)
+		return false;
+	else
+		return true;
+}
+
+std::u32string UTF32FromUTF8(std::string_view s) {
+	std::u32string ret;
+	while (!s.empty()) {
+		const unsigned char uc = static_cast<unsigned char>(s.front());
+		size_t lenChar = 1;
+		if (uc >= 0x80 + 0x40 + 0x20 + 0x10) {
+			lenChar = 4;
+		} else if (uc >= 0x80 + 0x40 + 0x20) {
+			lenChar = 3;
+		} else if (uc >= 0x80 + 0x40) {
+			lenChar = 2;
+		}
+		if (lenChar > s.length()) {
+			// Character fragment
+			for (size_t i = 0; i < s.length(); i++) {
+				ret.push_back(static_cast<unsigned char>(s[i]));
+			}
+			break;
+		}
+		const char32_t ch32 = UTF32Character(s.data());
+		ret.push_back(ch32);
+		s.remove_prefix(lenChar);
+	}
+	return ret;
+}
+
+unsigned int UTF32Character(const char *utf8) noexcept {
+	unsigned char ch = utf8[0];
+	unsigned int u32Char;
+	if (ch < 0x80) {
+		u32Char = ch;
+	} else if (ch < 0x80 + 0x40 + 0x20) {
+		u32Char = (ch & 0x1F) << 6;
+		ch = utf8[1];
+		u32Char += ch & 0x7F;
+	} else if (ch < 0x80 + 0x40 + 0x20 + 0x10) {
+		u32Char = (ch & 0xF) << 12;
+		ch = utf8[1];
+		u32Char += (ch & 0x7F) << 6;
+		ch = utf8[2];
+		u32Char += ch & 0x7F;
+	} else {
+		u32Char = (ch & 0x7) << 18;
+		ch = utf8[1];
+		u32Char += (ch & 0x3F) << 12;
+		ch = utf8[2];
+		u32Char += (ch & 0x3F) << 6;
+		ch = utf8[3];
+		u32Char += ch & 0x3F;
+	}
+	return u32Char;
+}
+
+namespace {
+
+// Helper for UTF8FromUTF32 processes 6 bits of input and isolates bit twiddling and cast.
+constexpr char SixBits(unsigned int uch, unsigned int shift, unsigned int mark=0x80) noexcept {
+	return static_cast<char>(mark | ((uch >> (shift * 6)) & 0b111111));
+}
+
+}
+
+std::string UTF8FromUTF32(unsigned int uch) {
+	std::string result;
+	if (uch < 0x80) {
+		result.push_back(static_cast<char>(uch));
+	} else if (uch < 0x800) {
+		result.push_back(SixBits(uch, 1, 0xC0));
+		result.push_back(SixBits(uch, 0));
+	} else if (uch < 0x10000) {
+		result.push_back(SixBits(uch, 2, 0xE0));
+		result.push_back(SixBits(uch, 1));
+		result.push_back(SixBits(uch, 0));
+	} else {
+		result.push_back(SixBits(uch, 3, 0xF0));
+		result.push_back(SixBits(uch, 2));
+		result.push_back(SixBits(uch, 1));
+		result.push_back(SixBits(uch, 0));
+	}
+	return result;
+}
+
+/**
+ * Convert a string into C string literal form using \a, \b, \f, \n, \r, \t, \v, and \ooo.
+ */
+std::string Slash(const std::string &s, bool quoteQuotes) {
+	std::string oRet;
+	for (const char ch : s) {
+		if (ch == '\a') {
+			oRet.append("\\a");
+		} else if (ch == '\b') {
+			oRet.append("\\b");
+		} else if (ch == '\f') {
+			oRet.append("\\f");
+		} else if (ch == '\n') {
+			oRet.append("\\n");
+		} else if (ch == '\r') {
+			oRet.append("\\r");
+		} else if (ch == '\t') {
+			oRet.append("\\t");
+		} else if (ch == '\v') {
+			oRet.append("\\v");
+		} else if (ch == '\\') {
+			oRet.append("\\\\");
+		} else if (quoteQuotes && (ch == '\'')) {
+			oRet.append("\\\'");
+		} else if (quoteQuotes && (ch == '\"')) {
+			oRet.append("\\\"");
+		} else if (IsASCII(ch) && (ch < ' ')) {
+			oRet.push_back('\\');
+			oRet.push_back(static_cast<char>((ch >> 6) + '0'));
+			oRet.push_back(static_cast<char>((ch >> 3) + '0'));
+			oRet.push_back(static_cast<char>((ch & 0x7) + '0'));
+		} else {
+			oRet.push_back(ch);
+		}
+	}
+	return oRet;
+}
+
+/**
+ * Is the character an octal digit?
+ */
+static constexpr bool IsOctalDigit(char ch) noexcept {
+	return ch >= '0' && ch <= '7';
+}
+
+/**
+ * If the character is an hexa digit, get its value.
+ */
+static int GetHexaDigit(char ch) noexcept {
+	if (ch >= '0' && ch <= '9') {
+		return ch - '0';
+	}
+	if (ch >= 'A' && ch <= 'F') {
+		return ch - 'A' + 10;
+	}
+	if (ch >= 'a' && ch <= 'f') {
+		return ch - 'a' + 10;
+	}
+	return -1;
+}
+
+/**
+ * Convert C style \a, \b, \f, \n, \r, \t, \v, \ooo and \xhh into their indicated characters.
+ */
+unsigned int UnSlash(char *s) noexcept {
+	const char *sStart = s;
+	char *o = s;
+
+	while (*s) {
+		if (*s == '\\') {
+			s++;
+			if (*s == 'a') {
+				*o = '\a';
+			} else if (*s == 'b') {
+				*o = '\b';
+			} else if (*s == 'f') {
+				*o = '\f';
+			} else if (*s == 'n') {
+				*o = '\n';
+			} else if (*s == 'r') {
+				*o = '\r';
+			} else if (*s == 't') {
+				*o = '\t';
+			} else if (*s == 'v') {
+				*o = '\v';
+			} else if (IsOctalDigit(*s)) {
+				int val = *s - '0';
+				if (IsOctalDigit(*(s + 1))) {
+					s++;
+					val *= 8;
+					val += *s - '0';
+					if (IsOctalDigit(*(s + 1))) {
+						s++;
+						val *= 8;
+						val += *s - '0';
+					}
+				}
+				*o = static_cast<char>(val);
+			} else if (*s == 'x') {
+				s++;
+				int val = 0;
+				int ghd = GetHexaDigit(*s);
+				if (ghd >= 0) {
+					s++;
+					val = ghd;
+					ghd = GetHexaDigit(*s);
+					if (ghd >= 0) {
+						s++;
+						val *= 16;
+						val += ghd;
+					}
+				}
+				*o = static_cast<char>(val);
+			} else {
+				*o = *s;
+			}
+		} else {
+			*o = *s;
+		}
+		o++;
+		if (*s) {
+			s++;
+		}
+	}
+	*o = '\0';
+	return static_cast<unsigned int>(o - sStart);
+}
+
+std::string UnSlashString(const char *s) {
+	std::string sCopy(s, strlen(s) + 1);
+	const unsigned int len = UnSlash(&sCopy[0]);
+	return sCopy.substr(0, len);
+}
+
+/**
+ * Convert C style \0oo into their indicated characters.
+ * This is used to get control characters into the regular expression engine.
+ */
+static unsigned int UnSlashLowOctal(char *s) noexcept {
+	const char *sStart = s;
+	char *o = s;
+	while (*s) {
+		if ((s[0] == '\\') && (s[1] == '0') && IsOctalDigit(s[2]) && IsOctalDigit(s[3])) {
+			*o = static_cast<char>(8 * (s[2] - '0') + (s[3] - '0'));
+			s += 3;
+		} else {
+			*o = *s;
+		}
+		o++;
+		if (*s)
+			s++;
+	}
+	*o = '\0';
+	return static_cast<unsigned int>(o - sStart);
+}
+
+std::string UnSlashLowOctalString(const char *s) {
+	std::string sCopy(s, strlen(s) + 1);
+	const unsigned int len = UnSlashLowOctal(&sCopy[0]);
+	return sCopy.substr(0, len);
+}
+
+unsigned int IntFromHexDigit(int ch) noexcept {
+	if ((ch >= '0') && (ch <= '9')) {
+		return ch - '0';
+	} else if (ch >= 'A' && ch <= 'F') {
+		return ch - 'A' + 10;
+	} else if (ch >= 'a' && ch <= 'f') {
+		return ch - 'a' + 10;
+	} else {
+		return 0;
+	}
+}
+
+unsigned int IntFromHexBytes(std::string_view hexBytes) noexcept {
+	unsigned int val = 0;
+	while (!hexBytes.empty()) {
+		val = val * 16 + IntFromHexDigit(hexBytes[0]);
+		hexBytes.remove_prefix(1);
+	}
+	return val;
+}
+
+std::string UnicodeUnEscape(std::string_view s) {
+	// Not concerned with invalid input, just do an OK job
+	std::string result;
+	while (!s.empty()) {
+		if (s.length() > 2 && s[0] == '\\') {
+			unsigned int val = 0;
+			if (s[1] == 'x' && s.length() >= 4) {
+				// \xAB
+				val = IntFromHexBytes(s.substr(2,2));
+				s.remove_prefix(4);
+			}  else if (s[1] == 'u' && s.length() >= 6) {
+				// \uABCD
+				val = IntFromHexBytes(s.substr(2, 4));
+				s.remove_prefix(6);
+			}  else if (s[1] == 'U' && s.length() >= 10) {
+				// \uABCDDEF9
+				val = IntFromHexBytes(s.substr(2, 8));
+				s.remove_prefix(10);
+			} else {
+				s.remove_prefix(1);
+			}
+			result.append(UTF8FromUTF32(val));
+		} else {
+			result.push_back(s[0]);
+			s.remove_prefix(1);
+		}
+	}
+	return result;
+}
diff --git a/scite-app/scite/src/StringHelpers.h b/scite-app/scite/src/StringHelpers.h
new file mode 100644
index 0000000..ce793fa
--- /dev/null
+++ b/scite-app/scite/src/StringHelpers.h
@@ -0,0 +1,214 @@
+// SciTE - Scintilla based Text Editor
+/** @file StringHelpers.h
+ ** Definition of widely useful string functions.
+ **/
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STRINGHELPERS_H
+#define STRINGHELPERS_H
+
+bool StartsWith(std::wstring_view s, std::wstring_view start);
+bool StartsWith(std::string_view s, std::string_view start);
+bool EndsWith(std::wstring_view s, std::wstring_view end);
+bool Contains(std::string const &s, char ch) noexcept;
+
+// Substitute is duplicated instead of templated as it was ambiguous when implemented as a template.
+int Substitute(std::wstring &s, std::wstring_view sFind, std::wstring_view sReplace);
+int Substitute(std::string &s, std::string_view sFind, std::string_view sReplace);
+
+template <typename T>
+int Remove(T &s, const T &sFind) {
+	return Substitute(s, sFind, T());
+}
+
+bool RemoveStringOnce(std::string &s, const char *marker);
+
+std::string StdStringFromInteger(int i);
+std::string StdStringFromSizeT(size_t i);
+std::string StdStringFromDouble(double d, int precision);
+
+int IntegerFromString(const std::string &val, int defaultValue);
+intptr_t IntPtrFromString(const std::string &val, intptr_t defaultValue);
+long long LongLongFromString(const std::string &val, long long defaultValue);
+
+// Basic case lowering that converts A-Z to a-z.
+// Does not handle non-ASCII characters.
+void LowerCaseAZ(std::string &s);
+
+constexpr char MakeUpperCase(char ch) noexcept {
+	if (ch < 'a' || ch > 'z')
+		return ch;
+	else
+		return ch - 'a' + 'A';
+}
+
+constexpr char MakeLowerCase(char c) noexcept {
+	if (c >= 'A' && c <= 'Z') {
+		return c - 'A' + 'a';
+	} else {
+		return c;
+	}
+}
+
+constexpr bool IsASCII(int ch) noexcept {
+	return (ch >= 0) && (ch < 0x80);
+}
+
+constexpr bool IsASpace(int ch) noexcept {
+	return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
+}
+
+constexpr bool IsADigit(int ch) noexcept {
+	return (ch >= '0') && (ch <= '9');
+}
+
+constexpr bool IsAlphabetic(int ch) noexcept {
+	return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
+}
+
+constexpr bool IsAlphaNumeric(int ch) noexcept {
+	return
+		((ch >= '0') && (ch <= '9')) ||
+		((ch >= 'a') && (ch <= 'z')) ||
+		((ch >= 'A') && (ch <= 'Z'));
+}
+
+intptr_t IntegerFromText(const char *s) noexcept;
+
+// StringSplit can be expanded over std::string or GUI::gui_string
+template <typename T>
+std::vector<T> StringSplit(const T &text, int separator) {
+	std::vector<T> vs(text.empty() ? 0 : 1);
+	for (typename T::const_iterator it=text.begin(); it!=text.end(); ++it) {
+		if (*it == separator) {
+			vs.push_back(T());
+		} else {
+			vs.back() += *it;
+		}
+	}
+	return vs;
+}
+
+inline std::vector<GUI::gui_string> ListFromString(const GUI::gui_string &args) {
+	return StringSplit(args, '\n');
+}
+
+typedef std::tuple<std::string_view, std::string_view> ViewPair;
+
+// Split view around first separator returning the portion before and after the separator.
+// If the separator is not present then return whole view and an empty view.
+inline ViewPair ViewSplit(std::string_view view, char separator) noexcept {
+	const size_t sepPos = view.find_first_of(separator);
+	std::string_view first = view.substr(0, sepPos);
+	std::string_view second = sepPos == (std::string_view::npos) ? "" : view.substr(sepPos + 1);
+	return { first, second };
+}
+
+// Safer version of string copy functions like strcpy, wcsncpy, etc.
+// Instantiate over fixed length strings of both char and wchar_t.
+// May truncate if source doesn't fit into dest with room for NUL.
+
+template <typename T, size_t count>
+void StringCopy(T(&dest)[count], const T *source) noexcept {
+	for (size_t i=0; i<count; i++) {
+		dest[i] = source[i];
+		if (!source[i])
+			break;
+	}
+	dest[count-1] = 0;
+}
+
+int CompareNoCase(const char *a, const char *b) noexcept;
+bool EqualCaseInsensitive(const char *a, const char *b) noexcept;
+bool EqualCaseInsensitive(std::string_view a, std::string_view b) noexcept;
+bool isprefix(const char *target, const char *prefix) noexcept;
+
+constexpr const char *UTF8BOM = "\xef\xbb\xbf";
+
+std::u32string UTF32FromUTF8(std::string_view s);
+unsigned int UTF32Character(const char *utf8) noexcept;
+std::string UTF8FromUTF32(unsigned int uch);
+
+std::string Slash(const std::string &s, bool quoteQuotes);
+unsigned int UnSlash(char *s) noexcept;
+std::string UnSlashString(const char *s);
+std::string UnSlashLowOctalString(const char *s);
+
+unsigned int IntFromHexDigit(int ch) noexcept;
+unsigned int IntFromHexBytes(std::string_view hexBytes) noexcept;
+std::string UnicodeUnEscape(std::string_view s);
+
+class ILocalize {
+public:
+	virtual GUI::gui_string Text(const char *s, bool retainIfNotFound=true) = 0;
+};
+
+/**
+ * This is a fixed length list of strings suitable for display in combo boxes
+ * as a memory of user entries.
+ */
+template < int sz >
+class EntryMemory {
+	std::string entries[sz];
+public:
+	void Insert(const std::string &s) {
+		for (int i = 0; i < sz; i++) {
+			if (entries[i] == s) {
+				for (int j = i; j > 0; j--) {
+					entries[j] = entries[j - 1];
+				}
+				entries[0] = s;
+				return;
+			}
+		}
+		for (int k = sz - 1; k > 0; k--) {
+			entries[k] = entries[k - 1];
+		}
+		entries[0] = s;
+	}
+	void AppendIfNotPresent(const std::string &s) {
+		for (int i = 0; i < sz; i++) {
+			if (entries[i] == s) {
+				return;
+			}
+			if (0 == entries[i].length()) {
+				entries[i] = s;
+				return;
+			}
+		}
+	}
+	void AppendList(const std::string &s, char sep = '|') {
+		int start = 0;
+		int end = 0;
+		while (s[end] != '\0') {
+			end = start;
+			while ((s[end] != sep) && (s[end] != '\0'))
+				++end;
+			AppendIfNotPresent(s.substr(start, end-start));
+			start = end + 1;
+		}
+	}
+	int Length() const noexcept {
+		int len = 0;
+		for (int i = 0; i < sz; i++)
+			if (entries[i].length())
+				len++;
+		return len;
+	}
+	std::string At(int n) const {
+		return entries[n];
+	}
+	std::vector<std::string>AsVector() {
+		std::vector<std::string> ret;
+		for (int i = 0; i < sz; i++) {
+			if (entries[i].length())
+				ret.push_back(entries[i].c_str());
+		}
+		return ret;
+	}
+};
+
+typedef EntryMemory < 10 > ComboMemory;
+
+#endif
diff --git a/scite-app/scite/src/StringList.cxx b/scite-app/scite/src/StringList.cxx
new file mode 100644
index 0000000..fce6791
--- /dev/null
+++ b/scite-app/scite/src/StringList.cxx
@@ -0,0 +1,289 @@
+// SciTE - Scintilla based Text Editor
+/** @file StringList.cxx
+ ** Implementation of class holding a list of strings.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <algorithm>
+#include <chrono>
+
+#include "GUI.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+
+static int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
+	while (*a && *b && len) {
+		if (*a != *b) {
+			const char upperA = MakeUpperCase(*a);
+			const char upperB = MakeUpperCase(*b);
+			if (upperA != upperB)
+				return upperA - upperB;
+		}
+		a++;
+		b++;
+		len--;
+	}
+	if (len == 0)
+		return 0;
+	else
+		// Either *a or *b is nul
+		return *a - *b;
+}
+
+/**
+ * Creates an array that points into each word in the string and puts \0 terminators
+ * after each word.
+ */
+static std::vector<char *> ArrayFromStringList(char *stringList, bool onlyLineEnds = false) {
+	int prev = '\n';
+	int words = 0;
+	// For rapid determination of whether a character is a separator, build
+	// a look up table.
+	bool wordSeparator[256] = {};
+	wordSeparator[static_cast<unsigned int>('\r')] = true;
+	wordSeparator[static_cast<unsigned int>('\n')] = true;
+	if (!onlyLineEnds) {
+		wordSeparator[static_cast<unsigned int>(' ')] = true;
+		wordSeparator[static_cast<unsigned int>('\t')] = true;
+	}
+	for (int j = 0; stringList[j]; j++) {
+		const int curr = static_cast<unsigned char>(stringList[j]);
+		if (!wordSeparator[curr] && wordSeparator[prev])
+			words++;
+		prev = curr;
+	}
+	std::vector<char *> keywords;
+	const size_t slen = strlen(stringList);
+	if (words) {
+		prev = '\0';
+		for (size_t k = 0; k < slen; k++) {
+			if (!wordSeparator[static_cast<unsigned char>(stringList[k])]) {
+				if (!prev) {
+					keywords.push_back(&stringList[k]);
+				}
+			} else {
+				stringList[k] = '\0';
+			}
+			prev = stringList[k];
+		}
+	}
+	return keywords;
+}
+
+void StringList::SetFromListText() {
+	sorted = false;
+	sortedNoCase = false;
+	words = ArrayFromStringList(&listText[0], onlyLineEnds);
+	wordsNoCase = words;
+}
+
+static bool CmpString(const char *a, const char *b) noexcept {
+	return strcmp(a, b) < 0;
+}
+
+static bool CmpStringNoCase(const char *a, const char *b) noexcept {
+	return CompareNoCase(a, b) < 0;
+}
+
+void StringList::SortIfNeeded(bool ignoreCase) {
+	// In both cases, the final empty sentinel element is not sorted.
+	if (ignoreCase) {
+		if (!sortedNoCase) {
+			sortedNoCase = true;
+			std::sort(wordsNoCase.begin(), wordsNoCase.end(), CmpStringNoCase);
+		}
+	} else {
+		if (!sorted) {
+			sorted = true;
+			std::sort(words.begin(), words.end(), CmpString);
+		}
+	}
+}
+
+void StringList::Clear() noexcept {
+	words.clear();
+	wordsNoCase.clear();
+	listText.clear();
+	sorted = false;
+	sortedNoCase = false;
+}
+
+void StringList::Set(const char *s) {
+	listText.assign(s, s+strlen(s)+1);
+	SetFromListText();
+}
+
+void StringList::Set(const std::vector<char> &data) {
+	listText.assign(data.begin(), data.end());
+	listText.push_back('\0');
+	SetFromListText();
+}
+
+namespace {
+
+// Functors used to find elements given a prefix
+
+struct CompareString {
+	size_t searchLen;
+	explicit CompareString(size_t searchLen_) noexcept : searchLen(searchLen_) {}
+	bool operator()(const char *a, const char *b) const noexcept {
+		return strncmp(a, b, searchLen) < 0;
+	}
+};
+
+struct CompareStringInsensitive {
+	size_t searchLen;
+	explicit CompareStringInsensitive(size_t searchLen_) noexcept : searchLen(searchLen_) {}
+	bool operator()(const char *a, const char *b) const noexcept {
+		return CompareNCaseInsensitive(a, b, searchLen) < 0;
+	}
+};
+
+template<typename Compare>
+std::string GetMatch(std::vector<char *>::iterator start, std::vector<char *>::iterator end,
+		     const char *wordStart, const std::string &wordCharacters, int wordIndex, Compare comp) {
+	std::vector<char *>::iterator elem = std::lower_bound(start, end, wordStart, comp);
+	if (!comp(wordStart, *elem) && !comp(*elem, wordStart)) {
+		// Found a matching element, now move forward wordIndex matching elements
+		for (; elem < end; ++elem) {
+			const char *word = *elem;
+			if (!word[comp.searchLen] || !Contains(wordCharacters, word[comp.searchLen])) {
+				if (wordIndex <= 0) {
+					return std::string(word);
+				}
+				wordIndex--;
+			}
+		}
+	}
+	return std::string();
+}
+
+}
+
+/**
+ * Returns an element (complete) of the StringList array which has
+ * the same beginning as the passed string.
+ * The length of the word to compare is passed too.
+ * Letter case can be ignored or preserved.
+ */
+std::string StringList::GetNearestWord(const char *wordStart, size_t searchLen, bool ignoreCase, const std::string &wordCharacters, int wordIndex) {
+	if (words.empty())
+		return std::string();
+	SortIfNeeded(ignoreCase);
+	if (ignoreCase) {
+		return GetMatch(wordsNoCase.begin(), wordsNoCase.end(), wordStart, wordCharacters, wordIndex, CompareStringInsensitive(searchLen));
+	} else { // preserve the letter case
+		return GetMatch(words.begin(), words.end(), wordStart, wordCharacters, wordIndex, CompareString(searchLen));
+	}
+}
+
+/**
+ * Find the length of a 'word' which is actually an identifier in a string
+ * which looks like "identifier(..." or "identifier" and where
+ * there may be extra spaces after the identifier that should not be
+ * counted in the length.
+ */
+static size_t LengthWord(const char *word, char otherSeparator) noexcept {
+	const char *endWord = nullptr;
+	// Find an otherSeparator
+	if (otherSeparator)
+		endWord = strchr(word, otherSeparator);
+	// Find a '('. If that fails go to the end of the string.
+	if (!endWord)
+		endWord = strchr(word, '(');
+	if (!endWord)
+		endWord = word + strlen(word);
+	assert(endWord);
+	// Last case always succeeds so endWord != 0
+
+	// Drop any space characters.
+	if (endWord > word) {
+		endWord--;	// Back from the '(', otherSeparator, or '\0'
+		// Move backwards over any spaces
+		while ((endWord > word) && (IsASpace(*endWord))) {
+			endWord--;
+		}
+	}
+	return endWord - word + 1;
+}
+
+template<typename Compare>
+static std::string GetMatches(std::vector<char *>::iterator start, std::vector<char *>::iterator end, const char *wordStart, char otherSeparator, bool exactLen, Compare comp) {
+	std::string wordList;
+	const size_t wordStartLength = LengthWord(wordStart, otherSeparator);
+	std::vector<char *>::iterator elem = std::lower_bound(start, end, wordStart, comp);
+	// Found a matching element, now accumulate all matches
+	for (; elem < end; ++elem) {
+		if (comp(wordStart, *elem) || comp(*elem, wordStart))
+			break;	// Not a match so stop
+		// length of the word part (before the '(' brace) of the api array element
+		const size_t wordlen = LengthWord(*elem, otherSeparator);
+		if (!exactLen || (wordlen == wordStartLength)) {
+			if (wordList.length() > 0)
+				wordList.append(" ", 1);
+			wordList.append(*elem, wordlen);
+		}
+	}
+	return wordList;
+}
+
+/**
+ * Returns elements (first words of them) of the StringList array which have
+ * the same beginning as the passed string.
+ * The length of the word to compare is passed too.
+ * Letter case can be ignored or preserved (default).
+ * If there are more words meeting the condition they are returned all of
+ * them in the ascending order separated with spaces.
+ */
+std::string StringList::GetNearestWords(
+	const char *wordStart,
+	size_t searchLen,
+	bool ignoreCase,
+	char otherSeparator /*= '\0'*/,
+	bool exactLen /*=false*/) {
+
+	if (words.empty())
+		return std::string();
+	SortIfNeeded(ignoreCase);
+	if (ignoreCase) {
+		return GetMatches(wordsNoCase.begin(), wordsNoCase.end(), wordStart, otherSeparator, exactLen, CompareStringInsensitive(searchLen));
+	} else {
+		// Preserve the letter case
+		return GetMatches(words.begin(), words.end(), wordStart, otherSeparator, exactLen, CompareString(searchLen));
+	}
+}
+
+bool AutoCompleteWordList::Add(const std::string& word) {
+	const auto [_, ok] = words.insert(word);
+	if (ok) {
+		const size_t length = word.length();
+		totalLength += 1 + length;
+		minWordLength = std::min(minWordLength, length);
+		return true;
+	}
+	return ok;
+}
+
+std::string AutoCompleteWordList::Get() const {
+	std::string result;
+	if (totalLength) {
+		result.reserve(totalLength + 2);
+		result.push_back('\n');
+		for (const std::string &word : words) {
+			result.append(word);
+			result.push_back('\n');
+		}
+	}
+	return result;
+}
diff --git a/scite-app/scite/src/StringList.h b/scite-app/scite/src/StringList.h
new file mode 100644
index 0000000..40ae993
--- /dev/null
+++ b/scite-app/scite/src/StringList.h
@@ -0,0 +1,53 @@
+// SciTE - Scintilla based Text Editor
+/** @file StringList.h
+ ** Definition of class holding a list of strings.
+ **/
+// Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STRINGLIST_H
+#define STRINGLIST_H
+
+class StringList {
+	// Text pointed into by words and wordsNoCase
+	std::string listText;
+	// Each word contains at least one character.
+	std::vector<char *> words;
+	std::vector<char *> wordsNoCase;
+	bool onlyLineEnds;	///< Delimited by any white space or only line ends
+	bool sorted;
+	bool sortedNoCase;
+	void SetFromListText();
+	void SortIfNeeded(bool ignoreCase);
+public:
+	explicit StringList(bool onlyLineEnds_ = false) :
+		words(0), wordsNoCase(0), onlyLineEnds(onlyLineEnds_),
+		sorted(false), sortedNoCase(false) {}
+	size_t Length() const noexcept { return words.size(); }
+	operator bool() const noexcept { return !words.empty(); }
+	char *operator[](size_t ind) { return words[ind]; }
+	void Clear() noexcept;
+	void Set(const char *s);
+	void Set(const std::vector<char> &data);
+	std::string GetNearestWord(const char *wordStart, size_t searchLen,
+				   bool ignoreCase, const std::string &wordCharacters, int wordIndex);
+	std::string GetNearestWords(const char *wordStart, size_t searchLen,
+				    bool ignoreCase, char otherSeparator='\0', bool exactLen=false);
+};
+
+class AutoCompleteWordList {
+	std::set<std::string> words;
+	size_t totalLength = 0;
+	size_t minWordLength = SIZE_MAX;
+public:
+	size_t Count() const noexcept {
+		return words.size();
+	}
+	size_t MinWordLength() const noexcept {
+		return minWordLength;
+	}
+	bool Add(const std::string& word);
+	std::string Get() const;
+};
+
+#endif
diff --git a/scite-app/scite/src/StripDefinition.h b/scite-app/scite/src/StripDefinition.h
new file mode 100644
index 0000000..60fc3bc
--- /dev/null
+++ b/scite-app/scite/src/StripDefinition.h
@@ -0,0 +1,160 @@
+// SciTE - Scintilla based Text Editor
+/** @file StripDefinition.h
+ ** Definition of classes build user strips from a description string.
+ **/
+// Copyright 2012 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STRIPDEFINITION_H
+#define STRIPDEFINITION_H
+
+class UserControl {
+public:
+	enum UCControlType { ucStatic, ucEdit, ucCombo, ucButton, ucDefaultButton } controlType;
+	GUI::gui_string text;
+	int item;
+	bool fixedWidth;
+	int widthDesired;
+	int widthAllocated;
+	GUI::Window w;
+	UserControl(UCControlType controlType_, const GUI::gui_string &text_, int item_) :
+		controlType(controlType_),
+		text(text_),
+		item(item_),
+		fixedWidth(true),
+		widthDesired(20),
+		widthAllocated(20)	{
+	}
+};
+
+struct ColumnWidth {
+	int widthDesired;
+	int widthAllocated;
+	bool isResizeable;
+	ColumnWidth() noexcept : widthDesired(0), widthAllocated(0), isResizeable(false) {
+	}
+};
+
+class StripDefinition {
+public:
+	bool hasClose;
+	unsigned int columns;
+	std::vector<std::vector<UserControl> > controls;
+	std::vector<ColumnWidth> widths;
+
+	explicit StripDefinition(GUI::gui_string definition) {
+		hasClose = false;
+		controls.clear();
+		columns = 0;
+		controls.push_back(std::vector<UserControl>());
+		const GUI::gui_char *pdef=definition.c_str();
+		int line = 0;
+		unsigned int column = 0;
+		int item = 0;
+		while (*pdef) {
+			if (*pdef == '\n') {
+				controls.push_back(std::vector<UserControl>());
+				column = 0;
+				line++;
+				pdef++;
+				continue;
+			}
+			if (*pdef == '!') {
+				hasClose = true;
+				pdef++;
+				continue;
+			}
+			UserControl::UCControlType controlType = UserControl::ucStatic;
+			GUI::gui_char endChar = 0;
+			switch (*pdef) {
+			case '\'':
+				controlType = UserControl::ucStatic;
+				endChar = '\'';
+				break;
+			case '[':
+				controlType = UserControl::ucEdit;
+				endChar = ']';
+				break;
+			case '{':
+				controlType = UserControl::ucCombo;
+				endChar = '}';
+				break;
+			case '(':
+				if (pdef[1] == '(') {
+					controlType = UserControl::ucDefaultButton;
+					pdef++;
+				} else {
+					controlType = UserControl::ucButton;
+				}
+				endChar = ')';
+				break;
+			}
+			pdef++;
+			GUI::gui_string text;
+			while (*pdef && (*pdef != endChar)) {
+				text += *pdef;
+				pdef++;
+			}
+			if ((controlType == UserControl::ucDefaultButton) && *pdef)
+				pdef++;
+			controls.back().push_back(UserControl(controlType, text, item));
+			column++;
+			if (columns < column)
+				columns = column;
+			if (*pdef)
+				pdef++;
+			item++;
+		}
+	}
+
+	void CalculateColumnWidths(int widthToAllocate) {
+		widths.clear();
+
+		int widthOfNonResizeables = 4 * (columns - 1);
+		int resizeables = 0;
+		for (size_t column=0; column<columns; column++) {
+			ColumnWidth cw;
+			for (size_t line=0; line<controls.size(); line++) {
+				if (column <  controls[line].size()) {
+					const UserControl *ctl = &controls[line][column];
+					if (ctl->fixedWidth) {
+						if (cw.widthDesired < ctl->widthDesired)
+							cw.widthDesired = ctl->widthDesired;
+					} else {
+						cw.isResizeable = true;
+					}
+				}
+			}
+			widths.push_back(cw);
+			widthOfNonResizeables += cw.widthDesired;
+			if (cw.isResizeable)
+				resizeables++;
+		}
+		const int widthSpareEach = resizeables ?
+					   (widthToAllocate - widthOfNonResizeables) / resizeables : 0;
+		for (std::vector<ColumnWidth>::iterator cw=widths.begin(); cw != widths.end(); ++cw) {
+			if (cw->isResizeable) {
+				cw->widthAllocated = widthSpareEach + cw->widthDesired;
+			} else {
+				cw->widthAllocated = cw->widthDesired;
+			}
+		}
+	}
+
+	UserControl *FindControl(int control) {
+		int controlID=0;
+		for (std::vector<std::vector<UserControl> >::iterator line=controls.begin(); line != controls.end(); ++line) {
+			for (std::vector<UserControl>::iterator ctl=line->begin(); ctl != line->end(); ++ctl) {
+				if (controlID == control) {
+					return &(*ctl);
+				}
+				controlID++;
+			}
+		}
+		return nullptr;
+	}
+};
+
+enum StripCommand { scUnknown, scClicked, scChange, scFocusIn, scFocusOut };
+
+#endif
diff --git a/scite-app/scite/src/StyleDefinition.cxx b/scite-app/scite/src/StyleDefinition.cxx
new file mode 100644
index 0000000..88e1106
--- /dev/null
+++ b/scite-app/scite/src/StyleDefinition.cxx
@@ -0,0 +1,264 @@
+// SciTE - Scintilla based Text Editor
+/** @file StyleDefinition.cxx
+ ** Implementation of style aggregate.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+
+#include <stdexcept>
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+
+#include "GUI.h"
+#include "StringHelpers.h"
+#include "StyleDefinition.h"
+
+namespace SA = Scintilla;
+
+StyleDefinition::StyleDefinition(std::string_view definition) :
+	sizeFractional(10.0), size(10), fore("#000000"), back("#FFFFFF"),
+	weight(SA::FontWeight::Normal), italics(false), eolfilled(false), underlined(false),
+	caseForce(SA::CaseVisible::Mixed),
+	visible(true), changeable(true),
+	specified(sdNone) {
+	ParseStyleDefinition(definition);
+}
+
+bool StyleDefinition::ParseStyleDefinition(std::string_view definition) {
+	if (definition.empty()) {
+		return false;
+	}
+	while (!definition.empty()) {
+		// Find attribute separator ',' and select front attribute
+		const ViewPair optionRest = ViewSplit(definition, ',');
+		const std::string_view option = std::get<0>(optionRest);
+		definition = std::get<1>(optionRest);
+		// Find value separator ':' and break into name and value
+		const auto [optionName, optionValue] = ViewSplit(option, ':');
+
+		if (optionName == "italics") {
+			specified = static_cast<flags>(specified | sdItalics);
+			italics = true;
+		}
+		if (optionName == "notitalics") {
+			specified = static_cast<flags>(specified | sdItalics);
+			italics = false;
+		}
+		if (optionName == "bold") {
+			specified = static_cast<flags>(specified | sdWeight);
+			weight = SA::FontWeight::Bold;
+		}
+		if (optionName == "notbold") {
+			specified = static_cast<flags>(specified | sdWeight);
+			weight = SA::FontWeight::Normal;
+		}
+		if ((optionName == "weight") && !optionValue.empty()) {
+			specified = static_cast<flags>(specified | sdWeight);
+			try {
+				weight = static_cast<SA::FontWeight>(std::stoi(std::string(optionValue)));
+			} catch (std::logic_error &) {
+				// Ignore bad values, either non-numeric or out of range numberic
+			}
+		}
+		if ((optionName == "font") && !optionValue.empty()) {
+			specified = static_cast<flags>(specified | sdFont);
+			font = optionValue;
+			std::replace(font.begin(), font.end(), '|', ',');
+		}
+		if ((optionName == "fore") && !optionValue.empty()) {
+			specified = static_cast<flags>(specified | sdFore);
+			fore = optionValue;
+		}
+		if ((optionName == "back") && !optionValue.empty()) {
+			specified = static_cast<flags>(specified | sdBack);
+			back = optionValue;
+		}
+		if ((optionName == "size") && !optionValue.empty()) {
+			specified = static_cast<flags>(specified | sdSize);
+			sizeFractional = std::stof(std::string(optionValue));
+			size = static_cast<int>(sizeFractional);
+		}
+		if (optionName == "eolfilled") {
+			specified = static_cast<flags>(specified | sdEOLFilled);
+			eolfilled = true;
+		}
+		if (optionName == "noteolfilled") {
+			specified = static_cast<flags>(specified | sdEOLFilled);
+			eolfilled = false;
+		}
+		if (optionName == "underlined") {
+			specified = static_cast<flags>(specified | sdUnderlined);
+			underlined = true;
+		}
+		if (optionName == "notunderlined") {
+			specified = static_cast<flags>(specified | sdUnderlined);
+			underlined = false;
+		}
+		if (optionName == "case") {
+			specified = static_cast<flags>(specified | sdCaseForce);
+			caseForce = SA::CaseVisible::Mixed;
+			if (!optionValue.empty()) {
+				if (optionValue.front() == 'u')
+					caseForce = SA::CaseVisible::Upper;
+				else if (optionValue.front() == 'l')
+					caseForce = SA::CaseVisible::Lower;
+				else if (optionValue.front() == 'c')
+					caseForce = SA::CaseVisible::Camel;
+			}
+		}
+		if (optionName == "visible") {
+			specified = static_cast<flags>(specified | sdVisible);
+			visible = true;
+		}
+		if (optionName == "notvisible") {
+			specified = static_cast<flags>(specified | sdVisible);
+			visible = false;
+		}
+		if (optionName == "changeable") {
+			specified = static_cast<flags>(specified | sdChangeable);
+			changeable = true;
+		}
+		if (optionName == "notchangeable") {
+			specified = static_cast<flags>(specified | sdChangeable);
+			changeable = false;
+		}
+	}
+	return true;
+}
+
+SA::Colour StyleDefinition::Fore() const {
+	return ColourFromString(fore);
+}
+
+SA::Colour StyleDefinition::Back() const {
+	return ColourFromString(back);
+}
+
+int StyleDefinition::FractionalSize() const noexcept {
+	return static_cast<int>(sizeFractional * SA::FontSizeMultiplier);
+}
+
+bool StyleDefinition::IsBold() const noexcept {
+	return weight > SA::FontWeight::Normal;
+}
+
+int IntFromHexByte(std::string_view hexByte) noexcept {
+	return IntFromHexDigit(hexByte[0]) * 16 + IntFromHexDigit(hexByte[1]);
+}
+
+SA::Colour ColourFromString(const std::string &s) {
+	if (s.length() >= 7) {
+		const int r = IntFromHexByte(&s[1]);
+		const int g = IntFromHexByte(&s[3]);
+		const int b = IntFromHexByte(&s[5]);
+		return ColourRGB(r, g, b);
+	} else {
+		return 0;
+	}
+}
+
+SA::ColourAlpha ColourAlphaFromString(std::string_view s) {
+	if (s.length() >= 7) {
+		const int r = IntFromHexByte(&s[1]);
+		const int g = IntFromHexByte(&s[3]);
+		const int b = IntFromHexByte(&s[5]);
+		const int a = (s.length() >= 9)? IntFromHexByte(&s[7]) : 0xff;
+		return ColourRGBA(r, g, b, a);
+	} else {
+		return 0;
+	}
+}
+
+IndicatorDefinition::IndicatorDefinition(std::string_view definition) :
+	style(SA::IndicatorStyle::Plain), colour(0), fillAlpha(static_cast<SA::Alpha>(30)), outlineAlpha(static_cast<SA::Alpha>(50)), under(false) {
+	ParseIndicatorDefinition(definition);
+}
+
+bool IndicatorDefinition::ParseIndicatorDefinition(std::string_view definition) {
+	if (definition.empty()) {
+		return false;
+	}
+	struct NameValue {
+		std::string_view name;
+		SA::IndicatorStyle value;
+	};
+	const NameValue indicStyleNames[] = {
+		{ "plain", SA::IndicatorStyle::Plain },
+		{ "squiggle", SA::IndicatorStyle::Squiggle },
+		{ "tt", SA::IndicatorStyle::TT },
+		{ "diagonal", SA::IndicatorStyle::Diagonal },
+		{ "strike", SA::IndicatorStyle::Strike },
+		{ "hidden", SA::IndicatorStyle::Hidden },
+		{ "box", SA::IndicatorStyle::Box },
+		{ "roundbox", SA::IndicatorStyle::RoundBox },
+		{ "straightbox", SA::IndicatorStyle::StraightBox },
+		{ "dash", SA::IndicatorStyle::Dash },
+		{ "dots", SA::IndicatorStyle::Dots },
+		{ "squigglelow", SA::IndicatorStyle::SquiggleLow },
+		{ "dotbox", SA::IndicatorStyle::DotBox },
+		{ "squigglepixmap", SA::IndicatorStyle::SquigglePixmap },
+		{ "compositionthick", SA::IndicatorStyle::CompositionThick },
+		{ "compositionthin", SA::IndicatorStyle::CompositionThin },
+		{ "fullbox", SA::IndicatorStyle::FullBox },
+		{ "textfore", SA::IndicatorStyle::TextFore },
+		{ "point", SA::IndicatorStyle::Point },
+		{ "pointcharacter", SA::IndicatorStyle::PointCharacter },
+		{ "gradient", SA::IndicatorStyle::Gradient },
+		{ "gradientverticalcentred", SA::IndicatorStyle::GradientCentre },
+	};
+
+	std::string val(definition);
+	LowerCaseAZ(val);
+	std::string_view indicatorDefinition = val;
+	while (!indicatorDefinition.empty()) {
+		// Find attribute separator ',' and select front attribute
+		const ViewPair optionRest = ViewSplit(indicatorDefinition, ',');
+		const std::string_view option = std::get<0>(optionRest);
+		indicatorDefinition = std::get<1>(optionRest);
+		// Find value separator ':' and break into name and value
+		const auto [optionName, optionValue] = ViewSplit(option, ':');
+
+		try {
+			if (!optionValue.empty() && (optionName == "style")) {
+				bool found = false;
+				for (const NameValue &indicStyleName : indicStyleNames) {
+					if (optionValue == indicStyleName.name) {
+						style = indicStyleName.value;
+						found = true;
+					}
+				}
+				if (!found) {
+					style = static_cast<SA::IndicatorStyle>(std::stoi(std::string(optionValue)));
+				}
+			}
+			if (!optionValue.empty() && ((optionName == "colour") || (optionName == "color"))) {
+				colour = ColourFromString(std::string(optionValue));
+			}
+			if (!optionValue.empty() && (optionName == "fillalpha")) {
+				fillAlpha = static_cast<SA::Alpha>(std::stoi(std::string(optionValue)));
+			}
+			if (!optionValue.empty() && (optionName == "outlinealpha")) {
+				outlineAlpha = static_cast<SA::Alpha>(std::stoi(std::string(optionValue)));
+			}
+			if (optionName == "under") {
+				under = true;
+			}
+			if (optionName == "notunder") {
+				under = false;
+			}
+		} catch (std::logic_error &) {
+			// Ignore bad values, either non-numeric or out of range numberic
+		}
+	}
+	return true;
+}
diff --git a/scite-app/scite/src/StyleDefinition.h b/scite-app/scite/src/StyleDefinition.h
new file mode 100644
index 0000000..d5d9d64
--- /dev/null
+++ b/scite-app/scite/src/StyleDefinition.h
@@ -0,0 +1,60 @@
+// SciTE - Scintilla based Text Editor
+/** @file StyleDefinition.h
+ ** Definition of style aggregate and helper functions.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STYLEDEFINITION_H
+#define STYLEDEFINITION_H
+
+class StyleDefinition {
+public:
+	std::string font;
+	float sizeFractional;
+	int size;
+	std::string fore;
+	std::string back;
+	Scintilla::FontWeight weight;
+	bool italics;
+	bool eolfilled;
+	bool underlined;
+	Scintilla::CaseVisible caseForce;
+	bool visible;
+	bool changeable;
+	enum flags { sdNone = 0, sdFont = 0x1, sdSize = 0x2, sdFore = 0x4, sdBack = 0x8,
+		     sdWeight = 0x10, sdItalics = 0x20, sdEOLFilled = 0x40, sdUnderlined = 0x80,
+		     sdCaseForce = 0x100, sdVisible = 0x200, sdChangeable = 0x400
+		   } specified;
+	explicit StyleDefinition(std::string_view definition);
+	bool ParseStyleDefinition(std::string_view definition);
+	Scintilla::Colour Fore() const;
+	Scintilla::Colour Back() const;
+	int FractionalSize() const noexcept;
+	bool IsBold() const noexcept;
+};
+
+inline constexpr Scintilla::Colour ColourRGB(unsigned int red, unsigned int green, unsigned int blue) noexcept {
+	return red | (green << 8) | (blue << 16);
+}
+
+inline constexpr Scintilla::ColourAlpha ColourRGBA(unsigned int red, unsigned int green, unsigned int blue, unsigned int alpha=0xff) noexcept {
+	return red | (green << 8) | (blue << 16) | (alpha << 24);
+}
+
+int IntFromHexByte(std::string_view hexByte) noexcept;
+
+Scintilla::Colour ColourFromString(const std::string &s);
+Scintilla::ColourAlpha ColourAlphaFromString(std::string_view s);
+
+struct IndicatorDefinition {
+	Scintilla::IndicatorStyle style;
+	Scintilla::Colour colour;
+	Scintilla::Alpha fillAlpha;
+	Scintilla::Alpha outlineAlpha;
+	bool under;
+	explicit IndicatorDefinition(std::string_view definition);
+	bool ParseIndicatorDefinition(std::string_view definition);
+};
+
+#endif
diff --git a/scite-app/scite/src/StyleWriter.cxx b/scite-app/scite/src/StyleWriter.cxx
new file mode 100644
index 0000000..d477038
--- /dev/null
+++ b/scite-app/scite/src/StyleWriter.cxx
@@ -0,0 +1,132 @@
+// SciTE - Scintilla based Text Editor
+/** @file StyleWriter.cxx
+ ** Simple buffered interface to the text and styles of a document held by Scintilla.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdint>
+
+#include <string>
+#include <string_view>
+#include <chrono>
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "StyleWriter.h"
+
+namespace SA = Scintilla;
+
+TextReader::TextReader(SA::ScintillaCall &sc_) noexcept :
+	startPos(extremePosition),
+	endPos(0),
+	codePage(0),
+	sc(sc_),
+	lenDoc(-1) {
+	buf[0] = 0;
+}
+
+bool TextReader::InternalIsLeadByte(char ch) const {
+	return GUI::IsDBCSLeadByte(codePage, ch);
+}
+
+void TextReader::Fill(SA::Position position) {
+	if (lenDoc == -1)
+		lenDoc = sc.Length();
+	startPos = position - slopSize;
+	if (startPos + bufferSize > lenDoc)
+		startPos = lenDoc - bufferSize;
+	if (startPos < 0)
+		startPos = 0;
+	endPos = startPos + bufferSize;
+	if (endPos > lenDoc)
+		endPos = lenDoc;
+	sc.SetTarget(SA::Span(startPos, endPos));
+	sc.TargetText(buf);
+}
+
+bool TextReader::Match(SA::Position pos, const char *s) {
+	for (int i=0; *s; i++) {
+		if (*s != SafeGetCharAt(pos+i))
+			return false;
+		s++;
+	}
+	return true;
+}
+
+int TextReader::StyleAt(SA::Position position) {
+	return sc.UnsignedStyleAt(position);
+}
+
+SA::Line TextReader::GetLine(SA::Position position) {
+	return sc.LineFromPosition(position);
+}
+
+SA::Position TextReader::LineStart(SA::Line line) {
+	return sc.LineStart(line);
+}
+
+SA::FoldLevel TextReader::LevelAt(SA::Line line) {
+	return sc.FoldLevel(line);
+}
+
+SA::Position TextReader::Length() {
+	if (lenDoc == -1)
+		lenDoc = sc.Length();
+	return lenDoc;
+}
+
+int TextReader::GetLineState(SA::Line line) {
+	return sc.LineState(line);
+}
+
+StyleWriter::StyleWriter(SA::ScintillaCall &sc_) noexcept :
+	TextReader(sc_),
+	validLen(0),
+	startSeg(0) {
+	styleBuf[0] = 0;
+}
+
+void StyleWriter::SetLineState(SA::Line line, int state) {
+	sc.SetLineState(line, state);
+}
+
+void StyleWriter::StartAt(SA::Position start, char chMask) {
+	sc.StartStyling(start, chMask);
+}
+
+void StyleWriter::StartSegment(SA::Position pos) noexcept {
+	startSeg = pos;
+}
+
+void StyleWriter::ColourTo(SA::Position pos, int chAttr) {
+	// Only perform styling if non empty range
+	if (pos != startSeg - 1) {
+		if (validLen + (pos - startSeg + 1) >= bufferSize)
+			Flush();
+		if (validLen + (pos - startSeg + 1) >= bufferSize) {
+			// Too big for buffer so send directly
+			sc.SetStyling(pos - startSeg + 1, chAttr);
+		} else {
+			for (SA::Position i = startSeg; i <= pos; i++) {
+				styleBuf[validLen++] = static_cast<char>(chAttr);
+			}
+		}
+	}
+	startSeg = pos+1;
+}
+
+void StyleWriter::SetLevel(SA::Line line, SA::FoldLevel level) {
+	sc.SetFoldLevel(line, level);
+}
+
+void StyleWriter::Flush() {
+	startPos = extremePosition;
+	lenDoc = -1;
+	if (validLen > 0) {
+		sc.SetStylingEx(validLen, styleBuf);
+		validLen = 0;
+	}
+}
diff --git a/scite-app/scite/src/StyleWriter.h b/scite-app/scite/src/StyleWriter.h
new file mode 100644
index 0000000..428a178
--- /dev/null
+++ b/scite-app/scite/src/StyleWriter.h
@@ -0,0 +1,89 @@
+// SciTE - Scintilla based Text Editor
+/** @file StyleWriter.h
+ ** Simple buffered interface to the text and styles of a document held by Scintilla.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STYLEWRITER_H
+#define STYLEWRITER_H
+
+// Read only access to a document, its styles and other data
+class TextReader {
+protected:
+	static constexpr Scintilla::Position extremePosition = INTPTR_MAX;
+	/** @a bufferSize is a trade off between time taken to copy the characters
+	 * and retrieval overhead.
+	 * @a slopSize positions the buffer before the desired position
+	 * in case there is some backtracking. */
+	static constexpr Scintilla::Position bufferSize = 4000;
+	static constexpr Scintilla::Position slopSize = bufferSize / 8;
+	char buf[bufferSize+1];
+	Scintilla::Position startPos;
+	Scintilla::Position endPos;
+	int codePage;
+
+	Scintilla::ScintillaCall &sc;
+	Scintilla::Position lenDoc;
+
+	bool InternalIsLeadByte(char ch) const;
+	void Fill(Scintilla::Position position);
+public:
+	explicit TextReader(Scintilla::ScintillaCall &sc_) noexcept;
+	// Deleted so TextReader objects can not be copied.
+	TextReader(const TextReader &source) = delete;
+	TextReader &operator=(const TextReader &) = delete;
+	char operator[](Scintilla::Position position) {
+		if (position < startPos || position >= endPos) {
+			Fill(position);
+		}
+		return buf[position - startPos];
+	}
+	/** Safe version of operator[], returning a defined value for invalid position. */
+	char SafeGetCharAt(Scintilla::Position position, char chDefault=' ') {
+		if (position < startPos || position >= endPos) {
+			Fill(position);
+			if (position < startPos || position >= endPos) {
+				// Position is outside range of document
+				return chDefault;
+			}
+		}
+		return buf[position - startPos];
+	}
+	bool IsLeadByte(char ch) const {
+		return codePage && InternalIsLeadByte(ch);
+	}
+	void SetCodePage(int codePage_) noexcept {
+		codePage = codePage_;
+	}
+	bool Match(Scintilla::Position pos, const char *s);
+	int StyleAt(Scintilla::Position position);
+	Scintilla::Line GetLine(Scintilla::Position position);
+	Scintilla::Position LineStart(Scintilla::Line line);
+	Scintilla::FoldLevel LevelAt(Scintilla::Line line);
+	Scintilla::Position Length();
+	int GetLineState(Scintilla::Line line);
+};
+
+// Adds methods needed to write styles and folding
+class StyleWriter : public TextReader {
+protected:
+	char styleBuf[bufferSize];
+	Scintilla::Position validLen;
+	Scintilla::Position startSeg;
+public:
+	explicit StyleWriter(Scintilla::ScintillaCall &sc_) noexcept;
+	// Deleted so StyleWriter objects can not be copied.
+	StyleWriter(const StyleWriter &source) = delete;
+	StyleWriter &operator=(const StyleWriter &) = delete;
+	void Flush();
+	void SetLineState(Scintilla::Line line, int state);
+
+	void StartAt(Scintilla::Position start, char chMask=31);
+	Scintilla::Position GetStartSegment() const noexcept { return startSeg; }
+	void StartSegment(Scintilla::Position pos) noexcept;
+	void ColourTo(Scintilla::Position pos, int chAttr);
+	void SetLevel(Scintilla::Line line, Scintilla::FoldLevel level);
+};
+
+#endif
diff --git a/scite-app/scite/src/Utf8_16.cxx b/scite-app/scite/src/Utf8_16.cxx
new file mode 100644
index 0000000..36e7505
--- /dev/null
+++ b/scite-app/scite/src/Utf8_16.cxx
@@ -0,0 +1,402 @@
+// @file Utf8_16.cxx
+// Copyright (C) 2002 Scott Kirkwood
+//
+// Permission to use, copy, modify, distribute and sell this code
+// and its documentation for any purpose is hereby granted without fee,
+// provided that the above copyright notice appear in all copies or
+// any derived copies.  Scott Kirkwood makes no representations
+// about the suitability of this software for any purpose.
+// It is provided "as is" without express or implied warranty.
+////////////////////////////////////////////////////////////////////////////////
+
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+
+#include "Utf8_16.h"
+
+const Utf8_16::utf8 Utf8_16::k_Boms[][3] = {
+	{0x00, 0x00, 0x00},  // Unknown
+	{0xFE, 0xFF, 0x00},  // Big endian
+	{0xFF, 0xFE, 0x00},  // Little endian
+	{0xEF, 0xBB, 0xBF}, // UTF8
+};
+
+enum { SURROGATE_LEAD_FIRST = 0xD800 };
+enum { SURROGATE_LEAD_LAST = 0xDBFF };
+enum { SURROGATE_TRAIL_FIRST = 0xDC00 };
+enum { SURROGATE_TRAIL_LAST = 0xDFFF };
+enum { SURROGATE_FIRST_VALUE = 0x10000 };
+
+// ==================================================================
+
+Utf8_16_Read::Utf8_16_Read() {
+	m_eEncoding = eUnknown;
+	m_nBufSize = 0;
+	m_pBuf = nullptr;
+	m_pNewBuf = nullptr;
+	m_bFirstRead = true;
+	m_nLen = 0;
+	m_leadSurrogate[0] = 0;
+	m_leadSurrogate[1] = 0;
+}
+
+Utf8_16_Read::~Utf8_16_Read() {
+	if ((m_eEncoding != eUnknown) && (m_eEncoding != eUtf8)) {
+		delete [] m_pNewBuf;
+		m_pNewBuf = nullptr;
+	}
+}
+
+size_t Utf8_16_Read::convert(char *buf, size_t len) {
+	m_pBuf = reinterpret_cast<ubyte *>(buf);
+	m_nLen = len;
+
+	int nSkip = 0;
+	if (m_bFirstRead) {
+		nSkip = determineEncoding();
+		m_bFirstRead = false;
+	}
+
+	if (m_eEncoding == eUnknown) {
+		// Do nothing, pass through
+		m_nBufSize = 0;
+		m_pNewBuf = m_pBuf;
+		return len;
+	}
+
+	if (m_eEncoding == eUtf8) {
+		// Pass through after BOM
+		m_nBufSize = 0;
+		m_pNewBuf = m_pBuf + nSkip;
+		return len - nSkip;
+	}
+
+	// Else...
+	const size_t newSize = len + len / 2 + 4 + 1;
+	if (m_nBufSize != newSize) {
+		delete [] m_pNewBuf;
+		m_pNewBuf = new ubyte[newSize];
+		m_nBufSize = newSize;
+	}
+
+	ubyte *pCur = m_pNewBuf;
+
+	ubyte endSurrogate[2] = { 0, 0 };
+	ubyte *pbufPrependSurrogate = nullptr;
+	if (m_leadSurrogate[0]) {
+		pbufPrependSurrogate = new ubyte[len - nSkip + 2];
+		memcpy(pbufPrependSurrogate, m_leadSurrogate, 2);
+		if (m_pBuf)
+			memcpy(pbufPrependSurrogate + 2, m_pBuf + nSkip, len - nSkip);
+		m_Iter16.set(pbufPrependSurrogate, len - nSkip + 2, m_eEncoding, endSurrogate);
+	} else {
+		if (!m_pBuf)
+			return 0;
+		m_Iter16.set(m_pBuf + nSkip, len - nSkip, m_eEncoding, endSurrogate);
+	}
+
+	for (; m_Iter16; ++m_Iter16) {
+		*pCur++ = m_Iter16.get();
+	}
+
+	delete []pbufPrependSurrogate;
+
+	memcpy(m_leadSurrogate, endSurrogate, 2);
+
+	// Return number of bytes written out
+	return pCur - m_pNewBuf;
+}
+
+int Utf8_16_Read::determineEncoding() noexcept {
+	m_eEncoding = eUnknown;
+
+	int nRet = 0;
+
+	if (m_nLen > 1) {
+		if (m_pBuf[0] == k_Boms[eUtf16BigEndian][0] && m_pBuf[1] == k_Boms[eUtf16BigEndian][1]) {
+			m_eEncoding = eUtf16BigEndian;
+			nRet = 2;
+		} else if (m_pBuf[0] == k_Boms[eUtf16LittleEndian][0] && m_pBuf[1] == k_Boms[eUtf16LittleEndian][1]) {
+			m_eEncoding = eUtf16LittleEndian;
+			nRet = 2;
+		} else if (m_nLen > 2 && m_pBuf[0] == k_Boms[eUtf8][0] && m_pBuf[1] == k_Boms[eUtf8][1] && m_pBuf[2] == k_Boms[eUtf8][2]) {
+			m_eEncoding = eUtf8;
+			nRet = 3;
+		}
+	}
+
+	return nRet;
+}
+
+// ==================================================================
+
+Utf8_16_Write::Utf8_16_Write() {
+	m_eEncoding = eUnknown;
+	m_pFile = nullptr;
+	m_pBuf = nullptr;
+	m_bFirstWrite = true;
+	m_nBufSize = 0;
+}
+
+Utf8_16_Write::~Utf8_16_Write() {
+	if (m_pFile) {
+		fclose();
+	}
+}
+
+void Utf8_16_Write::setfile(FILE *pFile) noexcept {
+	m_pFile = pFile;
+
+	m_bFirstWrite = true;
+}
+
+// Swap the two low order bytes of an integer value
+static int swapped(int v) noexcept {
+	return ((v & 0xFF) << 8) + (v >> 8);
+}
+
+size_t Utf8_16_Write::fwrite(const void *p, size_t _size) {
+	if (!m_pFile) {
+		return 0; // fail
+	}
+
+	if (m_eEncoding == eUnknown) {
+		// Normal write
+		return ::fwrite(p, _size, 1, m_pFile);
+	}
+
+	if (m_eEncoding == eUtf8) {
+		if (m_bFirstWrite)
+			::fwrite(k_Boms[m_eEncoding], 3, 1, m_pFile);
+		m_bFirstWrite = false;
+		return ::fwrite(p, _size, 1, m_pFile);
+	}
+
+	if (_size > m_nBufSize) {
+		m_nBufSize = _size;
+		delete [] m_pBuf;
+		m_pBuf = new utf16[_size + 1];
+	}
+
+	if (m_bFirstWrite) {
+		if (m_eEncoding == eUtf16BigEndian || m_eEncoding == eUtf16LittleEndian) {
+			// Write the BOM
+			::fwrite(k_Boms[m_eEncoding], 2, 1, m_pFile);
+		}
+
+		m_bFirstWrite = false;
+	}
+
+	Utf8_Iter iter8;
+	iter8.set(static_cast<const ubyte *>(p), _size, m_eEncoding);
+
+	utf16 *pCur = m_pBuf;
+
+	for (; iter8; ++iter8) {
+		if (iter8.canGet()) {
+			int codePoint = iter8.get();
+			if (codePoint >= SURROGATE_FIRST_VALUE) {
+				codePoint -= SURROGATE_FIRST_VALUE;
+				const int lead = (codePoint >> 10) + SURROGATE_LEAD_FIRST;
+				*pCur++ = static_cast<utf16>((m_eEncoding == eUtf16BigEndian) ?
+							     swapped(lead) : lead);
+				const int trail = (codePoint & 0x3ff) + SURROGATE_TRAIL_FIRST;
+				*pCur++ = static_cast<utf16>((m_eEncoding == eUtf16BigEndian) ?
+							     swapped(trail) : trail);
+			} else {
+				*pCur++ = static_cast<utf16>((m_eEncoding == eUtf16BigEndian) ?
+							     swapped(codePoint) : codePoint);
+			}
+		}
+	}
+
+	const size_t ret = ::fwrite(m_pBuf,
+				    reinterpret_cast<const char *>(pCur) - reinterpret_cast<const char *>(m_pBuf),
+				    1, m_pFile);
+
+	return ret;
+}
+
+int Utf8_16_Write::fclose() noexcept {
+	delete [] m_pBuf;
+	m_pBuf = nullptr;
+
+	const int ret = ::fclose(m_pFile);
+	m_pFile = nullptr;
+
+	return ret;
+}
+
+void Utf8_16_Write::setEncoding(Utf8_16::encodingType eType) noexcept {
+	m_eEncoding = eType;
+}
+
+//=================================================================
+Utf8_Iter::Utf8_Iter() noexcept {
+	reset();
+}
+
+void Utf8_Iter::reset() noexcept {
+	m_pBuf = nullptr;
+	m_pRead = nullptr;
+	m_pEnd = nullptr;
+	m_eState = eStart;
+	m_nCur = 0;
+	m_eEncoding = eUnknown;
+}
+
+void Utf8_Iter::set
+(const ubyte *pBuf, size_t nLen, encodingType eEncoding) {
+	m_pBuf = pBuf;
+	m_pRead = pBuf;
+	m_pEnd = pBuf + nLen;
+	m_eEncoding = eEncoding;
+	operator++();
+	// Note: m_eState, m_nCur not reset
+}
+// Go to the next byte.
+void Utf8_Iter::operator++() noexcept {
+	switch (m_eState) {
+	case eStart:
+		if ((0xF0 & *m_pRead) == 0xF0) {
+			m_nCur = (0x7 & *m_pRead) << 18;
+			m_eState = eSecondOf4Bytes;
+		} else if ((0xE0 & *m_pRead) == 0xE0) {
+			m_nCur = (~0xE0 & *m_pRead) << 12;
+			m_eState = ePenultimate;
+		} else if ((0xC0 & *m_pRead) == 0xC0) {
+			m_nCur = (~0xC0 & *m_pRead) << 6;
+			m_eState = eFinal;
+		} else {
+			m_nCur = *m_pRead;
+			toStart();
+		}
+		break;
+	case eSecondOf4Bytes:
+		m_nCur |= (0x3F & *m_pRead) << 12;
+		m_eState = ePenultimate;
+		break;
+	case ePenultimate:
+		m_nCur |= (0x3F & *m_pRead) << 6;
+		m_eState = eFinal;
+		break;
+	case eFinal:
+		m_nCur |= static_cast<utf8>(0x3F & *m_pRead);
+		toStart();
+		break;
+	}
+	++m_pRead;
+}
+
+void Utf8_Iter::toStart() noexcept {
+	m_eState = eStart;
+}
+
+//==================================================
+Utf16_Iter::Utf16_Iter() noexcept {
+	reset();
+}
+
+void Utf16_Iter::reset() noexcept {
+	m_pBuf = nullptr;
+	m_pRead = nullptr;
+	m_pEnd = nullptr;
+	m_eState = eStart;
+	m_nCur = 0;
+	m_nCur16 = 0;
+	m_eEncoding = eUnknown;
+}
+
+void Utf16_Iter::set
+(const ubyte *pBuf, size_t nLen, encodingType eEncoding, ubyte *endSurrogate) noexcept {
+	m_pBuf = pBuf;
+	m_pRead = pBuf;
+	m_pEnd = pBuf + nLen;
+	m_eEncoding = eEncoding;
+	if (nLen > 2) {
+		const utf16 lastElement = read(m_pEnd-2);
+		if (lastElement >= SURROGATE_LEAD_FIRST && lastElement <= SURROGATE_LEAD_LAST) {
+			// Buffer ends with lead surrogate so cut off buffer and store
+			endSurrogate[0] = m_pEnd[-2];
+			endSurrogate[1] = m_pEnd[-1];
+			m_pEnd -= 2;
+		}
+	}
+	operator++();
+	// Note: m_eState, m_nCur, m_nCur16 not reinitialized.
+}
+
+// Goes to the next byte.
+// Not the next symbol which you might expect.
+// This way we can continue from a partial buffer that doesn't align
+void Utf16_Iter::operator++() noexcept {
+	switch (m_eState) {
+	case eStart:
+		if (m_pRead >= m_pEnd) {
+			++m_pRead;
+			break;
+		}
+		if (m_eEncoding == eUtf16LittleEndian) {
+			m_nCur16 = *m_pRead++;
+			m_nCur16 |= static_cast<utf16>(*m_pRead << 8);
+		} else {
+			m_nCur16 = static_cast<utf16>(*m_pRead++ << 8);
+			m_nCur16 |= *m_pRead;
+		}
+		if (m_nCur16 >= SURROGATE_LEAD_FIRST && m_nCur16 <= SURROGATE_LEAD_LAST) {
+			++m_pRead;
+			if (m_pRead >= m_pEnd) {
+				// Have a lead surrogate at end of document with no access to trail surrogate.
+				// May be end of document.
+				--m_pRead;	// With next increment, leave pointer just past buffer
+			} else {
+				int trail;
+				if (m_eEncoding == eUtf16LittleEndian) {
+					trail = *m_pRead++;
+					trail |= static_cast<utf16>(*m_pRead << 8);
+				} else {
+					trail = static_cast<utf16>(*m_pRead++ << 8);
+					trail |= *m_pRead;
+				}
+				m_nCur16 = (((m_nCur16 & 0x3ff) << 10) | (trail & 0x3ff)) + SURROGATE_FIRST_VALUE;
+			}
+		}
+		++m_pRead;
+
+		if (m_nCur16 < 0x80) {
+			m_nCur = static_cast<ubyte>(m_nCur16 & 0xFF);
+			m_eState = eStart;
+		} else if (m_nCur16 < 0x800) {
+			m_nCur = static_cast<ubyte>(0xC0 | m_nCur16 >> 6);
+			m_eState = eFinal;
+		} else if (m_nCur16 < SURROGATE_FIRST_VALUE) {
+			m_nCur = static_cast<ubyte>(0xE0 | m_nCur16 >> 12);
+			m_eState = ePenultimate;
+		} else {
+			m_nCur = static_cast<ubyte>(0xF0 | m_nCur16 >> 18);
+			m_eState = eSecondOf4Bytes;
+		}
+		break;
+	case eSecondOf4Bytes:
+		m_nCur = static_cast<ubyte>(0x80 | ((m_nCur16 >> 12) & 0x3F));
+		m_eState = ePenultimate;
+		break;
+	case ePenultimate:
+		m_nCur = static_cast<ubyte>(0x80 | ((m_nCur16 >> 6) & 0x3F));
+		m_eState = eFinal;
+		break;
+	case eFinal:
+		m_nCur = static_cast<ubyte>(0x80 | (m_nCur16 & 0x3F));
+		m_eState = eStart;
+		break;
+	}
+}
+
+Utf8_16::utf16 Utf16_Iter::read(const ubyte *pRead) const noexcept {
+	if (m_eEncoding == eUtf16LittleEndian) {
+		return pRead[0] | static_cast<utf16>(pRead[1] << 8);
+	} else {
+		return pRead[1] | static_cast<utf16>(pRead[0] << 8);
+	}
+}
diff --git a/scite-app/scite/src/Utf8_16.h b/scite-app/scite/src/Utf8_16.h
new file mode 100644
index 0000000..4e8d721
--- /dev/null
+++ b/scite-app/scite/src/Utf8_16.h
@@ -0,0 +1,136 @@
+// @file Utf8_16.h
+// Copyright (C) 2002 Scott Kirkwood
+//
+// Permission to use, copy, modify, distribute and sell this code
+// and its documentation for any purpose is hereby granted without fee,
+// provided that the above copyright notice appear in all copies or
+// any derived copies.  Scott Kirkwood makes no representations
+// about the suitability of this software for any purpose.
+// It is provided "as is" without express or implied warranty.
+//
+// Notes: Used the UTF information I found at:
+//   http://www.cl.cam.ac.uk/~mgk25/unicode.html
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef UTF8_16_H
+#define UTF8_16_H
+
+class Utf8_16 {
+public:
+	typedef unsigned short utf16; // 16 bits
+	typedef unsigned char utf8; // 8 bits
+	typedef unsigned char ubyte;
+	enum encodingType {
+		eUnknown,
+		eUtf16BigEndian,
+		eUtf16LittleEndian,  // Default on Windows
+		eUtf8,
+		eLast
+	};
+	static const utf8 k_Boms[eLast][3];
+};
+
+// Reads UTF-16 and outputs UTF-8
+class Utf16_Iter : public Utf8_16 {
+public:
+	Utf16_Iter() noexcept;
+	void reset() noexcept;
+	void set(const ubyte *pBuf, size_t nLen, encodingType eEncoding, ubyte *endSurrogate) noexcept;
+	utf8 get() const noexcept {
+		return m_nCur;
+	}
+	void operator++() noexcept;
+	operator bool() const noexcept { return m_pRead <= m_pEnd; }
+	utf16 read(const ubyte *pRead) const noexcept;
+
+protected:
+	enum eState {
+		eStart,
+		eSecondOf4Bytes,
+		ePenultimate,
+		eFinal
+	};
+protected:
+	encodingType m_eEncoding;
+	eState m_eState;
+	utf8 m_nCur;
+	int m_nCur16;
+	const ubyte *m_pBuf;
+	const ubyte *m_pRead;
+	const ubyte *m_pEnd;
+};
+
+// Reads UTF-8 and outputs UTF-16
+class Utf8_Iter : public Utf8_16 {
+public:
+	Utf8_Iter() noexcept;
+	void reset() noexcept;
+	void set(const ubyte *pBuf, size_t nLen, encodingType eEncoding);
+	int get() const noexcept {
+		assert(m_eState == eStart);
+		return m_nCur;
+	}
+	bool canGet() const noexcept { return m_eState == eStart; }
+	void operator++() noexcept;
+	operator bool() const noexcept { return m_pRead <= m_pEnd; }
+
+protected:
+	void toStart() noexcept; // Put to start state
+	enum eState {
+		eStart,
+		eSecondOf4Bytes,
+		ePenultimate,
+		eFinal
+	};
+protected:
+	encodingType m_eEncoding;
+	eState m_eState;
+	int m_nCur;
+	const ubyte *m_pBuf;
+	const ubyte *m_pRead;
+	const ubyte *m_pEnd;
+};
+
+// Reads UTF16 and outputs UTF8
+class Utf8_16_Read : public Utf8_16 {
+public:
+	Utf8_16_Read();
+	~Utf8_16_Read();
+
+	size_t convert(char *buf, size_t len);
+	char *getNewBuf() noexcept { return reinterpret_cast<char *>(m_pNewBuf); }
+
+	encodingType getEncoding() const noexcept { return m_eEncoding; }
+protected:
+	int determineEncoding() noexcept;
+private:
+	encodingType m_eEncoding;
+	ubyte *m_pBuf;
+	ubyte *m_pNewBuf;
+	size_t m_nBufSize;
+	bool m_bFirstRead;
+	ubyte m_leadSurrogate[2];
+	size_t m_nLen;
+	Utf16_Iter m_Iter16;
+};
+
+// Read in a UTF-8 buffer and write out to UTF-16 or UTF-8
+class Utf8_16_Write : public Utf8_16 {
+public:
+	Utf8_16_Write();
+	~Utf8_16_Write();
+
+	void setEncoding(encodingType eType) noexcept;
+
+	void setfile(FILE *pFile) noexcept;
+	size_t fwrite(const void *p, size_t _size);
+	int fclose() noexcept;
+protected:
+	encodingType m_eEncoding;
+	FILE *m_pFile;
+	utf16 *m_pBuf;
+	size_t m_nBufSize;
+	bool m_bFirstWrite;
+};
+
+#endif
diff --git a/scite-app/scite/src/Worker.h b/scite-app/scite/src/Worker.h
new file mode 100644
index 0000000..f6ce6bb
--- /dev/null
+++ b/scite-app/scite/src/Worker.h
@@ -0,0 +1,63 @@
+// SciTE - Scintilla based Text Editor
+/** @file Worker.h
+ ** Definition of classes to perform background tasks as threads.
+ **/
+// Copyright 2011 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef WORKER_H
+#define WORKER_H
+
+struct Worker {
+private:
+	std::atomic_bool completed;
+	std::atomic_bool cancelling;
+	std::atomic_size_t jobSize;
+	std::atomic_size_t jobProgress;
+public:
+	Worker() : completed(false), cancelling(false), jobSize(1), jobProgress(0) {
+	}
+	// Deleted so Worker objects can not be copied.
+	Worker(const Worker &) = delete;
+	Worker(Worker &&) = delete;
+	void operator=(const Worker &) = delete;
+	void operator=(Worker &&) = delete;
+	virtual ~Worker() {
+	}
+	virtual void Execute() {}
+	bool FinishedJob() const noexcept {
+		return completed;
+	}
+	void SetCompleted() noexcept {
+		completed = true;
+	}
+	bool Cancelling() const noexcept {
+		return cancelling;
+	}
+	size_t SizeJob() const noexcept {
+		return jobSize;
+	}
+	void SetSizeJob(size_t size) noexcept {
+		jobSize = size;
+	}
+	size_t ProgressMade() const noexcept {
+		return jobProgress;
+	}
+	void IncrementProgress(size_t increment) noexcept {
+		jobProgress += increment;
+	}
+	virtual void Cancel() {
+		cancelling = true;
+		// Wait for writing thread to finish
+		for (;;) {
+			if (completed)
+				return;
+		}
+	}
+};
+
+struct WorkerListener {
+	virtual void PostOnMainThread(int cmd, Worker *pWorker) = 0;
+};
+
+#endif
diff --git a/scite-app/scite/src/abaqus.properties b/scite-app/scite/src/abaqus.properties
new file mode 100644
index 0000000..45cc4e0
--- /dev/null
+++ b/scite-app/scite/src/abaqus.properties
@@ -0,0 +1,79 @@
+# Define SciTE settings for ABAQUS files.
+
+file.patterns.abaqus=*.inp;*.dat;*.msg
+filter.abaqus=ABAQUS input (inp)|$(file.patterns.abaqus)|
+
+*filter.abaqus=$(filter.abaqus)
+
+#lexer.$(file.patterns.abaqus)=abaqus
+lexer.$(file.patterns.abaqus)=abaqus
+
+# keywords and input/output specifiers
+keywords=*amplitude *assembly \
+*beam *boundary *buckle *bulk \
+*cload *conditions *conductivity *contact \
+*damping *density *dload *dsflux *dsload *dynamic \
+*el *elastic *element *element output *elgen *elset *encastre *end step \
+*expansion *explicit *equation *embedded element \
+*field *freq *frequency *friction \
+*generate \
+*heading *heat transfer *history \
+*imperfectio *import *include *initial *initial conditions *instance *interactio \
+*internal *interval \
+*marks *material *monitor *mpc \
+*ncopy *nfill *ngen *nlgeom *node *node output *node print *nset *number \
+*output \
+*pair *parameter *part *physical constants *plastic *print *preprint \
+*radiate *restart \
+*shell *shell section *solid section *specific heat *sradiate *static *step \
+*surface \
+*temperature *time *type \
+*variable *viscosity
+
+arguments=elset engineering inc input line material name nset pin tie type write generate field variable history \
+stefan boltzmann absolute zero zero frequency steady state new old set change number shift \
+model position newset oldset host
+
+keywords.$(file.patterns.abaqus)=
+keywords2.$(file.patterns.abaqus)=$(keywords)
+keywords3.$(file.patterns.abaqus)=
+keywords4.$(file.patterns.abaqus)=
+keywords5.$(file.patterns.abaqus)=$(arguments)
+keywords6.$(file.patterns.abaqus)=
+
+comment.block.abaqus=**
+
+# ABAQUS styles
+# Default
+style.abaqus.0=fore:#000000
+# Comment
+style.abaqus.1=fore:#999999,$(font.comment),italics
+# Comment-blocks
+style.abaqus.2=fore:#999999,$(font.comment),italics
+# Number
+style.abaqus.3=$(colour.number)
+# Quoted string
+style.abaqus.4=$(colour.string)
+# Ansys operator
+style.abaqus.5=fore:#990000
+# Ansys word
+style.abaqus.6=fore:#000000
+# Ansys processor
+style.abaqus.7=fore:#008888,bold
+# Ansys command
+style.abaqus.8=fore:#0000CC
+# Ansys slashcommand
+style.abaqus.9=fore:#0000CC,bold
+# Ansys starcommand
+style.abaqus.10=fore:#6600DD,bold
+# Ansys argument
+style.abaqus.11=fore:#0077FF
+# Ansys function
+style.abaqus.12=fore:#0077DD
+
+command.compile.*.inp=
+command.build.*.inp=abaqus job=$(FileName) cpus=4
+command.go.*.inp=
+
+autocomplete.abaqus.ignorecase=1
+calltip.abaqus.ignorecase=1
diff --git a/scite-app/scite/src/abbrev.properties b/scite-app/scite/src/abbrev.properties
new file mode 100644
index 0000000..53eb82e
--- /dev/null
+++ b/scite-app/scite/src/abbrev.properties
@@ -0,0 +1,9 @@
+# Global abbreviations file for SciTE
+# Place this file in your home directory, that is, the same directory
+# as the user options file.
+# Contains a list of entries of the form abbreviation=expansion
+# Type the abbreviation and press Ctrl+B to insert the expansion
+# The '|' marks the position the caret will be after expansion.
+
+#main=int main(int argc, char *argv[]) {\n|\n}
+#i=if (|) {\n\n}
diff --git a/scite-app/scite/src/ada.properties b/scite-app/scite/src/ada.properties
new file mode 100644
index 0000000..471661d
--- /dev/null
+++ b/scite-app/scite/src/ada.properties
@@ -0,0 +1,77 @@
+# Define SciTE settings for Ada files.
+
+filter.ada=Ada (ads adb)|*.ads;*.adb|
+
+*filter.ada=$(filter.ada)
+
+file.patterns.ada=*.ads;*.adb
+
+*source.patterns.ada=$(file.patterns.ada);
+
+lexer.$(file.patterns.ada)=ada
+
+*language.ada=Ada|ads||
+
+#indent.size.$(file.patterns.ada)=3
+#use.tabs.$(file.patterns.ada)=0
+
+# Keyword except of operator keywords
+keywordclass.ada.main=abort abstract accept access aliased all array at begin body \
+case constant declare delay delta digits do else elsif end entry exception exit for \
+function generic goto if in is limited loop new null of others out package pragma \
+private procedure protected raise range record renames requeue return reverse \
+select separate subtype tagged task terminate then type until use when while with
+# Keywords for operators
+keywordclass.ada.operators=abs and mod not or rem xor
+
+keywordclass.ada=$(keywordclass.ada.main) $(keywordclass.ada.operators)
+
+keywords.$(file.patterns.ada)=$(keywordclass.ada)
+
+# Ada styles
+# Default
+style.ada.0=fore:#808080
+# Keyword
+style.ada.1=$(colour.keyword),bold
+# Identifiers
+style.ada.2=
+# Number
+style.ada.3=$(colour.number)
+# Operators (delimiters)
+style.ada.4=$(colour.operator),bold
+# Character
+style.ada.5=$(colour.char)
+# End of line where character is not closed
+style.ada.6=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# String
+style.ada.7=$(colour.string)
+# End of line where string is not closed
+style.ada.8=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Label
+style.ada.9=fore:#7F0000
+# Comment
+style.ada.10=$(colour.code.comment.line),$(font.code.comment.line)
+# Illegal token
+style.ada.11=fore:#FF0000
+
+# Comments
+comment.block.ada=--~
+
+braces.ada.style=4
+
+statement.indent.$(file.patterns.ada)=1 begin declare else elsif exception for if is loop while
+statement.lookback.$(file.patterns.ada)=20
+block.start.$(file.patterns.ada)=10 then is
+block.end.$(file.patterns.ada)=10 end
+
+calltip.ada.word.characters=._$(chars.alpha)
+
+adagcc=gcc -c $(FileNameExt)
+
+command.compile.*.ads=$(adagcc)
+command.build.*.ads=gnatmake
+command.go.*.ads=$(FileName)
+
+command.compile.*.adb=$(adagcc)
+command.build.*.adb=gnatmake
+command.go.*.adb=$(FileName)
diff --git a/scite-app/scite/src/asl.properties b/scite-app/scite/src/asl.properties
new file mode 100644
index 0000000..b294388
--- /dev/null
+++ b/scite-app/scite/src/asl.properties
@@ -0,0 +1,57 @@
+# ACPI Source Language
+file.patterns.asl=*.asl;*.dsl
+lexer.$(file.patterns.asl)=cpp
+
+# Advanced Configuration and Power Interface Specification Revision 5.0, §19.3
+# http://acpi.info/spec50.htm
+keywordclass.asl=\
+AccessAs Acquire Add Alias And Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Arg6 \
+BankField Break BreakPoint Buffer Case Concatenate ConcatenateResTemplate \
+CondRefOf Connection Continue CopyObject CreateBitField CreateByteField \
+CreateDWordField CreateField CreateQWordField CreateWordField DataTableRegion \
+Debug Decrement Default DefinitionBlock DerefOf Device Device Divide DMA \
+DWordIO DWordMemory DWordSpace EisaId ElseIf Else EndDependentFn Event \
+ExtendedIO ExtendedMemory ExtendedMemory ExtendedSpace External Fatal Field \
+FindSetLeftBit FindSetRightBit FixedDMA FixedIO FromBCD Function GpioInt GpioIo \
+I2CSerialBus If Include Increment Index IndexField Interrupt IO IRQNoFlags IRQ \
+LAnd LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual LNot Load LoadTable \
+Local0 Local1 Local2 Local3 Local4 Local5 Local6 Local7 LOr Match Memory24 \
+Memory32 Memory32Fixed Method Mid Mod Multiply Mutex Name NAnd NoOp NOr Not \
+Notify Offset ObjectType Ones One OperationRegion Or Package PowerResource \
+Processor QWordIO QWordMemory QWordSpace RawDataBuffer RefOf Register Release \
+Reset ResourceTemplate Return Revision Scope ShiftLeft ShiftRight Signal SizeOf \
+Sleep SPISerialBus Stall StartDependentFn StartDependentFnNoPri Store Subtract \
+Switch ThermalZone Timer ToBCD ToBuffer ToDecimalString ToHexString ToInteger \
+ToString ToUUID UARTSerialBus Unicode Unload VendorLong VendorShort Wait While \
+WordBusNumber WordIO WordSpace XOr Zero
+
+# ripped straight from http://pypi.python.org/packages/source/p/pygments-asl/
+# the spec itself has no convenient list of these keywords
+keywordclass2.asl=\
+AttribQuick AttribSendReceive AttribByte AttribBytes AttribRawBytes \
+AttribRawProcessBytes AttribWord AttribBlock AttribProcessCall AttribBlockProcessCall \
+AnyAcc ByteAcc WordAcc DWordAcc QWordAcc BufferAcc AddressRangeMemory \
+AddressRangeReserved AddressRangeNVS AddressRangeACPI RegionSpaceKeyword \
+FFixedHW PCC AddressingMode7Bit AddressingMode10Bit DataBitsFive DataBitsSix \
+DataBitsSeven DataBitsEight DataBitsNine BusMaster NotBusMaster ClockPhaseFirst \
+ClockPhaseSecond ClockPolarityLow ClockPolarityHigh SubDecode PosDecode BigEndianing \
+LittleEndian AttribBytes AttribRawBytes AttribRawProcessBytes FlowControlNone \
+FlowControlXon FlowControlHardware Edge Level ActiveHigh ActiveLow ActiveHigh \
+ActiveLow ActiveBoth Decode16 Decode10 IoRestrictionNone IoRestrictionInputOnly \
+IoRestrictionOutputOnly IoRestrictionNoneAndPreserve Lock NoLock \
+MTR MEQ MLE MLT MGE MGT MaxFixed MaxNotFixed Cacheable WriteCombining Prefetchable \
+NonCacheable MinFixed MinNotFixed UnknownObj IntObj StrObj BuffObj PkgObj FieldUnitObj \
+DeviceObj EventObj MethodObj MutexObj OpRegionObj PowerResObj ProcessorObj \
+ThermalZoneObj BuffFieldObj DDBHandleObj ParityTypeNone ParityTypeSpace ParityTypeMark \
+ParityTypeOdd ParityTypeEven PullDefault PullUp PullDown PullNone PolarityHigh \
+PolarityLow ISAOnlyRanges NonISAOnlyRanges EntireRange ReadWrite ReadOnly \
+UserDefRegionSpace SystemIO SystemMemory PCI_Config EmbeddedControl SMBus SystemCMOS \
+PciBarTarget IPMI GeneralPurposeIO GenericSerialBus ResourceConsumer ResourceProducer \
+Serialized NotSerialized Shared Exclusive SharedAndWake ExclusiveAndWake \
+ControllerInitiated DeviceInitiated StopBitsZero StopBitsOne StopBitsOnePlusHalf \
+StopBitsTwo Width8Bit Width16Bit Width32Bit Width64Bit Width128Bit Width256Bit \
+SparseTranslation DenseTranslation TypeTranslation TypeStatic Preserve WriteAsOnes \
+WriteAsZeros Transfer8 Transfer16 Transfer8_16 ThreeWireMode FourWireMode
+
+keywords.$(file.patterns.asl)=$(keywordclass.asl)
+keywords2.$(file.patterns.asl)=$(keywordclass2.asl)
diff --git a/scite-app/scite/src/asm.properties b/scite-app/scite/src/asm.properties
new file mode 100644
index 0000000..204f963
--- /dev/null
+++ b/scite-app/scite/src/asm.properties
@@ -0,0 +1,483 @@
+# Define SciTE settings for Assembler files (NASM)
+# Originally by Black Horus blackhorus@gmx.net 2002
+# Updated by Kein-Hong Man mkh@pl.jaring.my 2003-10
+# Updated by Marat Dukhan (mdukhan3.at.gatech.dot.edu) 10/4/2011
+
+# Nasm files
+file.patterns.asm=*.asm
+file.patterns.as=*.s
+
+*source.patterns.asm=$(file.patterns.asm);
+
+filter.asm=Assembler x86/x64 (asm)|$(file.patterns.asm)|
+filter.as=Assembler x86/x64 (as)|$(file.patterns.as)|
+
+*filter.asm=$(filter.asm)
+
+lexer.$(file.patterns.asm)=asm
+lexer.$(file.patterns.as)=as
+
+*language.assembler=Assembler|asm||
+
+# lexer.asm.comment.char=!
+
+bcd_instruction=aaa aad aam aas daa das
+flow_instruction=ja jae jb jbe jc jcxz je jg jge jl jle jmp jna \
+	jnae jnb jnbe jnc jne jng jnge jnl jnle jno jnp jns jnz \
+	jo jp jpe jpo js jz \
+	jcxz jecxz jrcxz \
+	loop loope loopne loopz loopnz \
+	call ret
+
+alu_instruction=add sub adc sbb neg cmp inc dec \
+	and or xor not test \
+	shl shr sal sar shld shrd rol ror rcl rcr \
+	cbw cwd cwde cdq cdqe cqo \
+	bsf bsr bt btc btr bts \
+	idiv imul div mul bswap \
+	nop
+
+mem_instruction=lea \
+	mov movsx movsxd movzx \
+	xlatb bound \
+	xchg xadd cmpxchg cmpxchg8b cmpxchg16b
+
+stack_instruction=push pop pushad popad pushf popf pushfd popfd pushfq popfq
+
+pred_instruction=seta setae setb setbe setc sete setg setge setl \
+	setle setna setnae setnb setnbe setnc setne setng setnge \
+	setnl setnle setno setnp setns setnz seto setp setpe setpo \
+	sets setz \
+	salc
+
+flag_instruction=clc cld stc std cmc lahf sahf
+
+cmov_instruction=cmovo cmovno cmovb cmovc cmovnae cmovae cmovnb \
+	cmovnc cmove cmovz cmovne cmovnz cmovbe cmovna cmova \
+	cmovnbe cmovs cmovns cmovp cmovpe cmovnp cmovpo cmovl \
+	cmovnge cmovge cmovnl cmovle cmovng cmovg cmovnle
+
+prefix_instruction=lock rep repe repz repne repnz
+
+string_instruction=cmpsb cmpsw cmpsq \
+	movsb movsw movsq \
+	scasb scasw scasd scasq \
+	stosb stosw stosd stosq
+
+info_instruction=cpuid rdtsc rdtscp rdpmc xgetbv
+
+lwp_instruction=llwpcb slwpcb lwpval lwpins
+
+ext_instruction=crc32 popcnt lzcnt tzcnt movbe pclmulqdq rdrand
+
+bmi1_instruction=andn bextr blsi blsmk blsr
+
+bmi2_instruction=bzhi mulx pdep pext rorx sarx shlx shrx
+
+tbm_instruction=blcfill blci blcic blcmsk blcs blsfill blsic t1mskc tzmsk
+
+fpu_instruction=f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcom fcomp fcompp fdecstp \
+	fdisi fdiv fdivp fdivr fdivrp feni ffree fiadd ficom ficomp fidiv \
+	fidivr fild fimul fincstp finit fist fistp fisub fisubr fld fld1 \
+	fldcw fldenv fldenvw fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul \
+	fmulp fnclex fndisi fneni fninit fnop fnsave fnsavew fnstcw fnstenv \
+	fnstenvw fnstsw fpatan fprem fptan frndint frstor frstorw fsave \
+	fsavew fscale fsqrt fst fstcw fstenv fstenvw fstp fstsw fsub fsubp \
+	fsubr fsubrp ftst fwait fxam fxch fxtract fyl2x fyl2xp1 \
+	fsetpm fcos fldenvd fnsaved fnstenvd fprem1 frstord fsaved fsin fsincos \
+	fstenvd fucom fucomp fucompp fcomi fcomip fucomi fucomip ffreep \
+	fcmovb fcmove fcmovbe fcmovu fcmovnb fcmovne fcmovnbe fcmovnu
+
+mmx_instruction=movd movq \
+	paddb paddw paddd paddsb paddsw paddusb paddusw \
+	psubb psubw psubd psubsb psubsw psubusb psubusw \
+	pand pandn por pxor \
+	pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw \
+	pmaddwd pmulhw pmullw \
+	psllw pslld psllq psrlw psrld psrlq psraw psrad \
+	packuswb packsswb packssdw \
+	punpcklbw punpcklwd punpckldq punpckhbw punpckhwd punpckhdq \
+	emms
+
+mmx2_instruction=pavgb pavgw \
+	pextrw pinsrw pmovmskb \
+	pmaxsw pmaxub pminsw pminub \
+	pmulhuw psadbw pshufw \
+	prefetchnta prefetcht0 prefetcht1 prefetcht2 \
+	maskmovq movntq sfence
+
+emmx_instruction=paddsiw psubsiw \
+	pmulhrw pmachriw pmulhriw \
+	pmagw pdistib paveb \
+	pmvzb pmvnzb pmvlzb pmvgezb
+
+k3d_instruction=pfacc pfadd pfsub pfsubr pfmul \
+	pfcmpeq pfcmpge pfcmpgt \
+	pfmax pfmin \
+	pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt \
+	pi2fd pf2id \
+	pavgusb pmulhrw \
+	femms
+
+k3d2_instruction=pfnacc pfpnacc pi2fw pf2iw pswapd
+
+k3dgeode_instruction=pfrsqrtv pfrcpv
+
+k3dprefetch_instruction=prefetch prefetchw
+
+sse_instruction=addss addps subss subps \
+	mulss mulps divss divps sqrtss sqrtps \
+	rcpss rcpps rsqrtss rsqrtps \
+	maxss maxps minss minps \
+	cmpss comiss ucomiss cmpps \
+	cmpeqss cmpltss cmpless cmpunordss cmpneqss cmpnltss cmpnless cmpordss \
+	cmpeqps cmpltps cmpleps cmpunordps cmpneqps cmpnltps cmpnleps cmpordps \
+	andnps andps orps xorps \
+	cvtsi2ss cvtss2si cvttss2si \
+	cvtpi2ps cvtps2pi cvttps2pi \
+	movss movlps movhps movlhps movhlps movaps movups movntps movmskps \
+	shufps unpckhps unpcklps \
+	ldmxcsr stmxcsr
+
+sse2_instruction=addpd addsd subpd subsd \
+	mulsd mulpd divsd divpd sqrtsd sqrtpd \
+	maxsd maxpd minsd minpd \
+	cmpsd comisd ucomisd cmppd \
+	cmpeqsd cmpltsd cmplesd cmpunordsd cmpneqsd cmpnltsd cmpnlesd cmpordsd \
+	cmpeqpd cmpltpd cmplepd cmpunordpd cmpneqpd cmpnltpd cmpnlepd cmpordpd \
+	andnpd andpd orpd xorpd \
+	cvtsd2ss cvtpd2ps cvtss2sd cvtps2pd \
+	cvtdq2ps cvtps2dq cvttps2dq \
+	cvtdq2pd cvtpd2dq cvttpd2dq \
+	cvtsi2sd cvtsd2si cvttsd2si \
+	cvtpi2pd cvtpd2pi cvttpd2pi \
+	movsd movlpd movhpd movapd movupd movntpd movmskpd \
+	shufpd unpckhpd unpcklpd \
+	movnti movdqa movdqu movntdq maskmovdqu \
+	movdq2q movq2dq \
+	paddq psubq pmuludq \
+	pslldq psrldq \
+	punpcklqdq punpckhqdq \
+	pshufhw pshuflw pshufd \
+	lfence mfence
+
+sse3_instruction=addsubps addsubpd \
+	haddps haddpd hsubps hsubpd \
+	movsldup movshdup movddup \
+	lddqu \
+	fisttp
+
+ssse3_instruction=psignb psignw psignd \
+	pabsb pabsw pabsd \
+	palignr pshufb \
+	pmulhrsw pmaddubsw \
+	phaddw phaddd phaddsw \
+	phsubw phsubd phsubsw
+
+sse4a_instruction=extrq insertq \
+	movntsd movntss
+
+sse41_instruction=mpsadbw phminposuw \
+	pmuldq pmulld \
+	dpps dppd \
+	blendps blendpd blendvps blendvpd pblendvb pblendw \
+	pmaxsb pmaxuw pmaxsd pmaxud pminsb pminuw pminsd pminud \
+	roundps roundss roundpd roundsd \
+	insertps pinsrb pinsrd pinsrq \
+	extractps pextrb pextrd pextrq \
+	pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq \
+	pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq \
+	ptest \
+	pcmpeqq \
+	packusdw \
+	movntdqa
+
+sse42_instruction=pcmpgtq \
+	pcmpestri pcmpestrm pcmpistri pcmpistrm
+
+aes_instruction=aesenc aesenclast aesdec aesdeclast aeskeygenassist aesimc
+
+padlock_instruction=xcryptcbc xcryptcfb xcryptctr xcryptecb xcryptofb \
+	xsha1 xsha256 montmul xstore
+
+
+avx_instruction=vaddss vaddps vaddsd vaddpd vsubss vsubps vsubsd vsubpd \
+	vaddsubps vaddsubpd \
+	vhaddps vhaddpd vhsubps vhsubpd \
+	vmulss vmulps vmulsd vmulpd \
+	vmaxss vmaxps vmaxsd vmaxpd vminss vminps vminsd vminpd \
+	vandps vandpd vandnps vandnpd vorps vorpd vxorps vxorpd \
+	vblendps vblendpd vblendvps vblendvpd \
+	vcmpss vcomiss vucomiss vcmpsd vcomisd vucomisd vcmpps vcmppd \
+	vcmpeqss vcmpltss vcmpless vcmpunordss vcmpneqss vcmpnltss vcmpnless vcmpordss \
+	vcmpeq_uqss vcmpngess vcmpngtss vcmpfalsess vcmpneq_oqss vcmpgess vcmpgtss vcmptruess \
+	vcmpeq_osss vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss \
+	vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss \
+	vcmpeqps vcmpltps vcmpleps vcmpunordps vcmpneqps vcmpnltps vcmpnleps vcmpordps \
+	vcmpeq_uqps vcmpngeps vcmpngtps vcmpfalseps vcmpneq_oqps vcmpgeps vcmpgtps vcmptrueps \
+	vcmpeq_osps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps \
+	vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps \
+	vcmpeqsd vcmpltsd vcmplesd vcmpunordsd vcmpneqsd vcmpnltsd vcmpnlesd vcmpordsd \
+	vcmpeq_uqsd vcmpngesd vcmpngtsd vcmpfalsesd vcmpneq_oqsd vcmpgesd vcmpgtsd vcmptruesd \
+	vcmpeq_ossd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd \
+	vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd \
+	vcmpeqpd vcmpltpd vcmplepd vcmpunordpd vcmpneqpd vcmpnltpd vcmpnlepd vcmpordpd \
+	vcmpeq_uqpd vcmpngepd vcmpngtpd vcmpfalsepd vcmpneq_oqpd vcmpgepd vcmpgtpd vcmptruepd \
+	vcmpeq_ospd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd \
+	vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd \
+	vcvtsd2ss vcvtpd2ps vcvtss2sd vcvtps2pd \
+	vcvtsi2ss vcvtss2si vcvttss2si \
+	vcvtpi2ps vcvtps2pi vcvttps2pi \
+	vcvtdq2ps vcvtps2dq vcvttps2dq \
+	vcvtdq2pd vcvtpd2dq vcvttpd2dq \
+	vcvtsi2sd vcvtsd2si vcvttsd2si \
+	vcvtpi2pd vcvtpd2pi vcvttpd2pi \
+	vdivss vdivps vdivsd vdivpd vsqrtss vsqrtps vsqrtsd vsqrtpd \
+	vdpps vdppd \
+	vmaskmovps vmaskmovpd \
+	vmovss vmovsd vmovaps vmovapd vmovups vmovupd vmovntps vmovntpd \
+	vmovhlps vmovlhps vmovlps vmovlpd vmovhps vmovhpd \
+	vmovsldup vmovshdup vmovddup \
+	vmovmskps vmovmskpd \
+	vroundss vroundps vroundsd vroundpd \
+	vrcpss vrcpps vrsqrtss vrsqrtps \
+	vunpcklps vunpckhps vunpcklpd vunpckhpd \
+	vbroadcastss vbroadcastsd vbroadcastf128 \
+	vextractps vinsertps vextractf128 vinsertf128 \
+	vshufps vshufpd vpermilps vpermilpd vperm2f128 \
+	vtestps vtestpd \
+	vpaddb vpaddusb vpaddsb vpaddw vpaddusw vpaddsw vpaddd vpaddq \
+	vpsubb vpsubusb vpsubsb vpsubw vpsubusw vpsubsw vpsubd vpsubq \
+	vphaddw vphaddsw vphaddd vphsubw vphsubsw vphsubd \
+	vpsllw vpslld vpsllq vpsrlw vpsrld vpsrlq vpsraw vpsrad \
+	vpand vpandn vpor vpxor \
+	vpblendwb vpblendw \
+	vpsignb vpsignw vpsignd \
+	vpavgb vpavgw \
+	vpabsb vpabsw vpabsd \
+	vmovd vmovq vmovdqa vmovdqu vlddqu vmovntdq vmovntdqa vmaskmovdqu \
+	vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq \
+	vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq \
+	vpackuswb vpacksswb vpackusdw vpackssdw \
+	vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq \
+	vpmaddubsw vpmaddwd \
+	vpmullw vpmulhuw vpmulhw vpmulhrsw vpmulld vpmuludq vpmuldq \
+	vpmaxub vpmaxsb vpmaxuw vpmaxsw vpmaxud vpmaxsd \
+	vpminub vpminsb vpminuw vpminsw vpminud vpminsd \
+	vpmovmskb vptest \
+	vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq \
+	vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq \
+	vpslldq vpsrldq vpalignr \
+	vpshufb vpshuflw vpshufhw vpshufd \
+	vpextrb vpextrw vpextrd vpextrq vpinsrb vpinsrw vpinsrd vpinsrq \
+	vpsadbw vmpsadbw vphminposuw \
+	vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm \
+	vpclmulqdq vaesenc vaesenclast vaesdec vaesdeclast vaeskeygenassist vaesimc \
+	vldmxcsr vstmxcsr vzeroall vzeroupper
+
+avx2_instruction=vbroadcasti128 vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq \
+	vpblendd \
+	vpermd vpermq vperm2i128 \
+	vextracti128 vinserti128 \
+	vpmaskmovd vpmaskmovq \
+	vpsllvd vpsllvq vpsravd vpsrlvd vpsrldq \
+	vpgatherdd vpgatherqd vgatherdq vgatherqq \
+	vpermps vpermpd \
+	vgatherdpd vgatherqpd vgatherdps vgatherqps
+
+xop_instruction=vfrczss vfrczps vfrczsd vfrczpd \
+	vpermil2ps vperlil2pd \
+	vtestps vtestpd \
+	vpcomub vpcomb vpcomuw vpcomw vpcomud vpcomd vpcomuq vpcomq \
+	vphaddubw vphaddbw vphaddubd vphaddbd vphaddubq vphaddbq \
+	vphadduwd vphaddwd vphadduwq vphaddwq vphaddudq vphadddq \
+	vphsubbw vphsubwd vphsubdq \
+	vpmacsdd vpmacssdd vpmacsdql vpmacssdql vpmacsdqh vpmacssdqh \
+	vpmacsww vpmacssww vpmacswd vpmacsswd \
+	vpmadcswd vpmadcsswd \
+	vpcmov vpperm \
+	vprotb vprotw vprotd vprotq \
+	vpshab vpshaw vpshad vpshaq \
+	vpshlb vpshlw vpshld vpshlq
+
+cvt16_instruction=vcvtph2ps vcvtps2ph
+
+fma4_instruction=vfmaddss vfmaddps vfmaddsd vfmaddpd \
+	vfmsubss vfmsubps vfmsubsd vfmsubpd \
+	vnfmaddss vnfmaddps vnfmaddsd vnfmaddpd \
+	vnfmsubss vnfmsubps vnfmsubsd vnfmsubpd \
+	vfmaddsubps vfmaddsubpd vfmsubaddps vfmsubaddpd
+
+fma3_instruction=vfmadd132ss vfmadd213ss vfmadd231ss \
+	vfmadd132ps vfmadd213ps vfmadd231ps \
+	vfmadd132sd vfmadd213sd vfmadd231sd \
+	vfmadd132pd vfmadd213pd vfmadd231pd \
+	vfmaddsub132ps vfmaddsub213ps vfmaddsub231ps \
+	vfmaddsub132pd vfmaddsub213pd vfmaddsub231pd \
+	vfmsubadd132ps vfmsubadd213ps vfmsubadd231ps \
+	vfmsubadd132pd vfmsubadd213pd vfmsubadd231pd \
+	vfmsub132ss vfmsub213ss vfmsub231ss \
+	vfmsub132ps vfmsub213ps vfmsub231ps \
+	vfmsub132sd vfmsub213sd vfmsub231sd \
+	vfmsub132pd vfmsub213pd vfmsub231pd \
+	vfnmadd132ss vfnmadd213ss vfnmadd231ss \
+	vfnmadd132ps vfnmadd213ps vfnmadd231ps \
+	vfnmadd132sd vfnmadd213sd vfnmadd231sd \
+	vfnmadd132pd vfnmadd213pd vfnmadd231pd \
+	vfnmsub132ss vfnmsub213ss vfnmsub231ss \
+	vfnmsub132ps vfnmsub213ps vfnmsub231ps \
+	vfnmsub132sd vfnmsub213sd vfnmsub231sd \
+	vfnmsub132pd vfnmsub213pd vfnmsub231pd
+
+register=al ah bl bh cl ch dl dh \
+	ax bx cx dx si di bp \
+	eax ebx ecx edx esi edi ebx esp \
+	st0 st1 st2 st3 st4 st5 st6 st7 \
+	mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 \
+	xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 \
+	ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 \
+	fs
+
+register_64=sil dil bpl \
+	r8b r9b r10b r11b r12b r13b r14b r15b \
+	r8w r9w r10w r11w r12w r13w r14w r15w \
+	rax rcx rdx rbx rsp rbp rsi rdi \
+	r8 r9 r10 r11 r12 r13 r14 r15 \
+	xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 \
+	ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 \
+	gs
+
+directive_nasm=db dw dd dq dt do dy \
+	resb resw resd resq rest reso resy incbin equ times safeseh \
+	__utf16__ __utf32__ %+ \
+	default cpu float start imagebase osabi \
+	..start ..imagebase ..gotpc ..gotoff ..gottpoff ..got ..plt ..sym ..tlsie \
+	section segment __sect__ group absolute \
+	.bss .comment .data .lbss .ldata .lrodata .rdata .rodata .tbss .tdata .text \
+	alloc bss code exec data noalloc nobits noexec nowrite progbits rdata tls write \
+	private public common stack overlay class \
+	extern global common import export \
+	%define %idefine %xdefine %ixdefine %assign %undef %? %?? \
+	%defstr %idefstr %deftok %ideftok \
+	%strcat %strlen %substr \
+	%macro %imacro %rmacro %exitmacro %endmacro %unmacro \
+	%if %ifn %elif %elifn %else %endif \
+	%ifdef %ifndef %elifdef %elifndef \
+	%ifmacro %ifnmacro %elifmacro %elifnmacro \
+	%ifctx %ifnctx %elifctx %elifnctx \
+	%ifidn %ifnidn %elifidn %elifnidn \
+	%ifidni %ifnidni %elifidni %elifnidni \
+	%ifid %ifnid %elifid %elifnid \
+	%ifnum %ifnnum %elifnum %elifnnum \
+	%ifstr %ifnstr %elifstr %elifnstr \
+	%iftoken %ifntoken %eliftoken %elifntoken \
+	%ifempty %elifempty %ifnempty %elifnempty \
+	%ifenv %ifnenv %elifenv %elifnenv \
+	%rep %exitrep %endrep \
+	%while %exitwhile %endwhile \
+	%include %pathsearch %depend %use \
+	%push %pop %repl %arg %local %stacksize flat flat64 large small \
+	%error %warning %fatal \
+	%00 .nolist %rotate %line %! %final %clear \
+	struc endstruc istruc at iend \
+	align alignb sectalign \
+	bits use16 use32 use64 \
+	__nasm_major__ __nasm_minor__ __nasm_subminor__ ___nasm_patchlevel__ \
+	__nasm_version_id__ __nasm_ver__ \
+	__file__ __line__ __pass__ __bits__ __output_format__ \
+	__date__ __time__ __date_num__ __time_num__ __posix_time__ \
+	__utc_date__ __utc_time__ __utc_date_num__ __utc_time_num__ \
+	__float_daz__ __float_round__ __float__ \
+	__use_altreg__ altreg \
+	__use_smartalign__ smartalign __alignmode__ \
+	__use_fp__ __infinity__ __nan__ __qnan__ __snan__ \
+	__float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__
+
+directive_operand_nasm=a16 a32 a64 o16 o32 o64 strict \
+	byte word dword qword tword oword yword nosplit \
+	%0 %1 %2 %3 %4 %5 %6 %7 %8 %9 \
+	abs rel \
+	$ $$ \
+	seg wrt
+
+keywords.$(file.patterns.asm)=$(bcd_instruction) $(flow_instruction) $(alu_instruction) $(mem_instruction) $(stack_instruction) $(pred_instruction) $(flag_instruction) $(cmov_instruction) $(prefix_instruction) $(string_instruction) $(info_instruction) $(lwp_instruction) $(ext_instruction) $(bmi1_instruction) $(bmi2_instruction)
+keywords2.$(file.patterns.asm)=$(fpu_instruction)
+keywords3.$(file.patterns.asm)=$(register) $(register_64)
+keywords4.$(file.patterns.asm)=$(directive_nasm)
+keywords5.$(file.patterns.asm)=$(directive_operand_nasm)
+keywords6.$(file.patterns.asm)=$(mmx_instruction) $(mmx2_instruction) $(emmx_instruction) $(k3d_instruction) $(k3d2_instruction) $(k3dgeode_instruction) $(k3dprefetch_instruction) $(sse_instruction) $(sse2_instruction) $(sse3_instruction) $(ssse3_instruction) $(sse4a_instruction) $(sse41_instruction) $(sse42_instruction) $(aes_instruction) $(padlock_instruction) $(avx_instruction) $(avx2_instruction) $(xop_instruction) $(cvt16_instruction) $(fma4_instruction) $(fma3_instruction)
+
+keywords.$(file.patterns.as)=$(bcd_instruction) $(flow_instruction) $(alu_instruction) $(mem_instruction) $(stack_instruction) $(pred_instruction) $(flag_instruction) $(cmov_instruction) $(prefix_instruction) $(string_instruction) $(info_instruction) $(lwp_instruction) $(ext_instruction) $(bmi1_instruction) $(bmi2_instruction)
+keywords2.$(file.patterns.as)=$(fpu_instruction)
+keywords3.$(file.patterns.as)=$(register) $(register_64)
+keywords4.$(file.patterns.as)=$(directive_nasm)
+keywords5.$(file.patterns.as)=$(directive_operand_nasm)
+keywords6.$(file.patterns.as)=$(mmx_instruction) $(mmx2_instruction) $(emmx_instruction) $(k3d_instruction) $(k3d2_instruction) $(k3dgeode_instruction) $(k3dprefetch_instruction) $(sse_instruction) $(sse2_instruction) $(sse3_instruction) $(ssse3_instruction) $(sse4a_instruction) $(sse41_instruction) $(sse42_instruction) $(aes_instruction) $(padlock_instruction) $(avx_instruction) $(avx2_instruction) $(xop_instruction) $(cvt16_instruction) $(fma4_instruction) $(fma3_instruction)
+
+comment.block.asm=;
+comment.block.as=#
+
+
+# Assembler Styles
+#style.asm.32=fore:#808080,font:Verdana,size:8
+#style.as.32=$(style.asm.32)
+# Default
+style.asm.0=
+style.as.0=$(style.asm.0)
+# Comment
+style.asm.1=fore:#adadad
+style.as.1=$(style.asm.1)
+#$(colour.code.comment.line),font:Comic Sans MS,size:8
+# Number
+style.asm.2=fore:#ff0000
+style.as.2=$(style.asm.2)
+# String
+style.asm.3=$(colour.string)
+style.as.3=$(style.asm.3)
+# Operator
+style.asm.4=$(colour.operator),bold
+style.as.4=$(style.asm.4)
+# Identifier
+style.asm.5=
+style.as.5=$(style.asm.5)
+# CPU instruction
+style.asm.6=$(colour.keyword),bold
+style.as.6=$(style.asm.6)
+#fore:#0000ff
+# FPU instruction
+style.asm.7=fore:#0000ff
+style.as.7=$(style.asm.7)
+# Register
+style.asm.8=fore:#46aa03,bold
+style.as.8=$(style.asm.8)
+# assembler Directive
+style.asm.9=fore:#0000ff
+style.as.9=$(style.asm.9)
+# assembler Directive Operand
+style.asm.10=fore:#0000ff
+style.as.10=$(style.asm.10)
+# Comment block (GNU as /*...*/ syntax, unimplemented)
+style.asm.11=$(colour.code.comment.box),$(font.code.comment.box)
+style.as.11=$(style.asm.11)
+# Character/String (single quote) (also character prefix in GNU as)
+style.asm.12=$(colour.char)
+style.as.12=$(style.asm.12)
+# End of line where string is not closed
+style.asm.13=fore:#000000,back:#E0C0E0,eolfilled
+style.as.13=$(style.asm.13)
+# Extended instructions
+style.asm.14=fore:#B00040
+style.as.14=$(style.asm.14)
+# Comment directive
+style.asm.15=fore:#66AA00
+style.as.15=$(style.asm.15)
+
+
+command.compile.$(file.patterns.asm)=nasm $(FileNameExt)
+
+command.name.0.*.asm=Link
+command.0.*.asm=link $(FileName)
+
+
+statement.indent.$(file.patterns.asm)=9 .if
+statement.indent.$(file.patterns.as)=9 .if
diff --git a/scite-app/scite/src/asn1.properties b/scite-app/scite/src/asn1.properties
new file mode 100644
index 0000000..2ba1753
--- /dev/null
+++ b/scite-app/scite/src/asn1.properties
@@ -0,0 +1,99 @@
+# Define SciTE settings for ASN.1 MIB definition files.
+
+filter.asn1=ASN.1 (asn1)|*.mib|
+
+*filter.asn1=$(filter.asn1)
+
+file.patterns.asn1=*.mib
+
+lexer.$(file.patterns.asn1)=asn1
+
+*language.asn=ASN.1|mib||
+
+# ASN.1 styles
+# Default
+style.asn1.0=fore:#000000
+# Comment
+style.asn1.1=fore:#007F00,$(font.comment)
+# Identifiers
+style.asn1.2=fore:#000000,bold
+# Double quoted string
+style.asn1.3=fore:#7F007F
+# Numeric OID definition
+style.asn1.4=fore:#007F7F,bold
+# Non OID numbers
+style.asn1.5=fore:#7F0000
+# Keywords
+style.asn1.6=fore:#00007F
+# Attributes
+style.asn1.7=fore:#F07800
+# Descriptors
+style.asn1.8=fore:#00007F
+# Types
+style.asn1.9=fore:#00007F
+# Operators
+style.asn1.10=fore:#222222
+
+# Keywords
+keywords.$(file.patterns.asn1)=\
+ACCESS AGENT AUGMENTS \
+BEGIN BITS \
+CAPABILITIES CHOICE COMPLIANCE CONTACT CONVENTION \
+DEFINITIONS DEFVAL DESCRIPTION DISPLAY \
+END ENTERPRISE EXPORTS \
+FALSE FROM \
+GROUP GROUPS \
+HINT \
+IDENTITY IMPLIED IMPORTS INCLUDES INDEX INFO \
+LAST \
+MANDATORY MAX MIN MODULE \
+NOTATION NOTIFICATION NULL \
+OBJECTS OBJECT-TYPE OF ORGANIZATION \
+PRODUCT \
+RELEASE REFERENCE REQUIRES REVISION \
+SEQUENCE SIZE STATUS SUPPORTS SYNTAX \
+TEXTUAL TRAP TYPE TRAP-TYPE \
+UPDATED \
+VALUE VARIABLES VARIATION \
+WRITE
+
+# Attributes
+keywords2.$(file.patterns.asn1)=\
+accessible \
+create current \
+deprecated \
+for \
+mandatory \
+not notify not-accessible \
+obsolete only optional \
+read read-only read-write \
+write
+
+# Descriptors
+keywords3.$(file.patterns.asn1)=\
+ABSENT ANY APPLICATION \
+BIT BOOLEAN BY \
+COMPONENT COMPONENTS \
+DEFAULT DEFINED \
+ENUMERATED EXPLICIT EXTERNAL \
+IMPLICIT INIFINITY \
+MAX MIN MINUS \
+OPTIONAL \
+PRESENT PRIVATE \
+REAL \
+SET \
+TAGS TRUE
+
+# Types
+keywords4.$(file.patterns.asn1)=\
+Counter Counter32 Counter64 \
+DisplayString \
+Gauge Gauge32 \
+IDENTIFIER INTEGER Integer32 IpAddress \
+NetworkAddress NsapAddress \
+OBJECT OCTET Opaque \
+PhysAddress \
+STRING \
+TimeTicks \
+UInteger32 UNITS Unsigned32
+
diff --git a/scite-app/scite/src/au3.properties b/scite-app/scite/src/au3.properties
new file mode 100644
index 0000000..7fbc411
--- /dev/null
+++ b/scite-app/scite/src/au3.properties
@@ -0,0 +1,218 @@
+# Define SciTE settings for AutoIt files.
+#
+# SciTE settings for AutoIt 3.3.14.2
+
+# File filters, patterns, language, lexer and source
+file.patterns.au3=*.au3
+filter.au3=AutoIt (au3)|$(file.patterns.au3)|
+lexer.$(file.patterns.au3)=au3
+
+*filter.au3=$(filter.au3)
+*language.au3=AutoIt|au3||
+*source.patterns.au3=$(file.patterns.au3);
+
+# Autocomplete and CallTip
+autocomplete.au3.ignorecase=1
+autocomplete.au3.start.characters=$(chars.alpha)$(chars.numeric)_@#$
+calltip.au3.end.definition=)
+calltip.au3.ignorecase=1
+calltip.au3.use.escapes=1
+calltip.au3.word.characters=$(chars.alpha)$(chars.numeric)_.
+word.characters.$(file.patterns.au3)=$(chars.alpha)$(chars.numeric)$(chars.accented)_@#$.
+
+# Indentation
+indent.size.$(file.patterns.au3)=4
+tab.size.$(file.patterns.au3)=4
+use.tabs.$(file.patterns.au3)=1
+
+block.start.$(file.patterns.au3)=5\
+ case if do for func else elseif while select switch with\
+ Case If Do For Func Else ElseIf While Select Switch With\
+ CASE IF DO FOR FUNC ELSE ELSEIF WHILE SELECT SWITCH WITH
+
+block.end.$(file.patterns.au3)=5\
+ case else endif elseif endfunc endselect endswitch next until wend endwith\
+ Case Else EndIf ElseIf EndFunc EndSelect EndSwitch Next Until WEnd EndWith Wend\
+ CASE ELSE ENDIF ELSEIF ENDFUNC ENDSELECT ENDSWITCH NEXT UNTIL WEND ENDWITH
+
+# Comment Block, Box and Stream
+comment.block.au3=;~
+comment.block.at.line.start.au3=1
+comment.box.start.au3=#cs
+comment.box.middle.au3=;
+comment.box.end.au3=#ce
+comment.stream.start.au3=#cs
+comment.stream.end.au3=#ce
+
+# Au3 keywords
+# Imported Scite4AutoIt3 files may resolve i.e. $(au3.variables.used) as keyword values
+
+# Keyword
+keywords.$(file.patterns.au3)=and byref case const continuecase continueloop default dim\
+ do else elseif endfunc endif endselect endswitch endwith enum exit exitloop false\
+ for func global if in local next not null or redim return select static step switch\
+ then to true until volatile wend while with
+
+# Function
+keywords2.$(file.patterns.au3)=abs acos adlibregister adlibunregister asc ascw asin assign\
+ atan autoitsetoption autoitwingettitle autoitwinsettitle beep binary binarylen binarymid\
+ binarytostring bitand bitnot bitor bitrotate bitshift bitxor blockinput break call\
+ cdtray ceiling chr chrw clipget clipput consoleread consolewrite consolewriteerror\
+ controlclick controlcommand controldisable controlenable controlfocus controlgetfocus\
+ controlgethandle controlgetpos controlgettext controlhide controllistview controlmove\
+ controlsend controlsettext controlshow controltreeview cos dec dircopy dircreate\
+ dirgetsize dirmove dirremove dllcall dllcalladdress dllcallbackfree dllcallbackgetptr\
+ dllcallbackregister dllclose dllopen dllstructcreate dllstructgetdata dllstructgetptr\
+ dllstructgetsize dllstructsetdata drivegetdrive drivegetfilesystem drivegetlabel\
+ drivegetserial drivegettype drivemapadd drivemapdel drivemapget drivesetlabel drivespacefree\
+ drivespacetotal drivestatus envget envset envupdate eval execute exp filechangedir\
+ fileclose filecopy filecreatentfslink filecreateshortcut filedelete fileexists filefindfirstfile\
+ filefindnextfile fileflush filegetattrib filegetencoding filegetlongname filegetpos\
+ filegetshortcut filegetshortname filegetsize filegettime filegetversion fileinstall\
+ filemove fileopen fileopendialog fileread filereadline filereadtoarray filerecycle\
+ filerecycleempty filesavedialog fileselectfolder filesetattrib filesetend filesetpos\
+ filesettime filewrite filewriteline floor ftpsetproxy funcname guicreate guictrlcreateavi\
+ guictrlcreatebutton guictrlcreatecheckbox guictrlcreatecombo guictrlcreatecontextmenu\
+ guictrlcreatedate guictrlcreatedummy guictrlcreateedit guictrlcreategraphic guictrlcreategroup\
+ guictrlcreateicon guictrlcreateinput guictrlcreatelabel guictrlcreatelist guictrlcreatelistview\
+ guictrlcreatelistviewitem guictrlcreatemenu guictrlcreatemenuitem guictrlcreatemonthcal\
+ guictrlcreateobj guictrlcreatepic guictrlcreateprogress guictrlcreateradio guictrlcreateslider\
+ guictrlcreatetab guictrlcreatetabitem guictrlcreatetreeview guictrlcreatetreeviewitem\
+ guictrlcreateupdown guictrldelete guictrlgethandle guictrlgetstate guictrlread guictrlrecvmsg\
+ guictrlregisterlistviewsort guictrlsendmsg guictrlsendtodummy guictrlsetbkcolor guictrlsetcolor\
+ guictrlsetcursor guictrlsetdata guictrlsetdefbkcolor guictrlsetdefcolor guictrlsetfont\
+ guictrlsetgraphic guictrlsetimage guictrlsetlimit guictrlsetonevent guictrlsetpos\
+ guictrlsetresizing guictrlsetstate guictrlsetstyle guictrlsettip guidelete guigetcursorinfo\
+ guigetmsg guigetstyle guiregistermsg guisetaccelerators guisetbkcolor guisetcoord\
+ guisetcursor guisetfont guisethelp guiseticon guisetonevent guisetstate guisetstyle\
+ guistartgroup guiswitch hex hotkeyset httpsetproxy httpsetuseragent hwnd inetclose\
+ inetget inetgetinfo inetgetsize inetread inidelete iniread inireadsection inireadsectionnames\
+ inirenamesection iniwrite iniwritesection inputbox int isadmin isarray isbinary isbool\
+ isdeclared isdllstruct isfloat isfunc ishwnd isint iskeyword isnumber isobj isptr\
+ isstring log memgetstats mod mouseclick mouseclickdrag mousedown mousegetcursor mousegetpos\
+ mousemove mouseup mousewheel msgbox number objcreate objcreateinterface objevent\
+ objevent objget objname onautoitexitregister onautoitexitunregister opt ping pixelchecksum\
+ pixelgetcolor pixelsearch processclose processexists processgetstats processlist\
+ processsetpriority processwait processwaitclose progressoff progresson progressset\
+ ptr random regdelete regenumkey regenumval regread regwrite round run runas runaswait\
+ runwait send sendkeepactive seterror setextended shellexecute shellexecutewait shutdown\
+ sin sleep soundplay soundsetwavevolume splashimageon splashoff splashtexton sqrt\
+ srandom statusbargettext stderrread stdinwrite stdioclose stdoutread string stringaddcr\
+ stringcompare stringformat stringfromasciiarray stringinstr stringisalnum stringisalpha\
+ stringisascii stringisdigit stringisfloat stringisint stringislower stringisspace\
+ stringisupper stringisxdigit stringleft stringlen stringlower stringmid stringregexp\
+ stringregexpreplace stringreplace stringreverse stringright stringsplit stringstripcr\
+ stringstripws stringtoasciiarray stringtobinary stringtrimleft stringtrimright stringupper\
+ tan tcpaccept tcpclosesocket tcpconnect tcplisten tcpnametoip tcprecv tcpsend tcpshutdown\
+ tcpstartup timerdiff timerinit tooltip traycreateitem traycreatemenu traygetmsg trayitemdelete\
+ trayitemgethandle trayitemgetstate trayitemgettext trayitemsetonevent trayitemsetstate\
+ trayitemsettext traysetclick trayseticon traysetonevent traysetpauseicon traysetstate\
+ traysettooltip traytip ubound udpbind udpclosesocket udpopen udprecv udpsend udpshutdown\
+ udpstartup vargettype winactivate winactive winclose winexists winflash wingetcaretpos\
+ wingetclasslist wingetclientsize wingethandle wingetpos wingetprocess wingetstate\
+ wingettext wingettitle winkill winlist winmenuselectitem winminimizeall winminimizeallundo\
+ winmove winsetontop winsetstate winsettitle winsettrans winwait winwaitactive winwaitclose\
+ winwaitnotactive
+
+# Macro
+keywords3.$(file.patterns.au3)=@appdatacommondir @appdatadir @autoitexe @autoitpid @autoitversion\
+ @autoitx64 @com_eventobj @commonfilesdir @compiled @computername @comspec @cpuarch\
+ @cr @crlf @desktopcommondir @desktopdepth @desktopdir @desktopheight @desktoprefresh\
+ @desktopwidth @documentscommondir @error @exitcode @exitmethod @extended @favoritescommondir\
+ @favoritesdir @gui_ctrlhandle @gui_ctrlid @gui_dragfile @gui_dragid @gui_dropid @gui_winhandle\
+ @homedrive @homepath @homeshare @hotkeypressed @hour @ipaddress1 @ipaddress2 @ipaddress3\
+ @ipaddress4 @kblayout @lf @localappdatadir @logondnsdomain @logondomain @logonserver\
+ @mday @min @mon @msec @muilang @mydocumentsdir @numparams @osarch @osbuild @oslang\
+ @osservicepack @ostype @osversion @programfilesdir @programscommondir @programsdir\
+ @scriptdir @scriptfullpath @scriptlinenumber @scriptname @sec @startmenucommondir\
+ @startmenudir @startupcommondir @startupdir @sw_disable @sw_enable @sw_hide @sw_lock\
+ @sw_maximize @sw_minimize @sw_restore @sw_show @sw_showdefault @sw_showmaximized\
+ @sw_showminimized @sw_showminnoactive @sw_showna @sw_shownoactivate @sw_shownormal\
+ @sw_unlock @systemdir @tab @tempdir @tray_id @trayiconflashing @trayiconvisible @username\
+ @userprofiledir @wday @windowsdir @workingdir @yday @year
+
+# Send key
+keywords4.$(file.patterns.au3)={!} {#} {^} {{} {}} {+} {alt} {altdown} {altup} {appskey}\
+ {asc} {backspace} {break} {browser_back} {browser_favorites} {browser_forward} {browser_home}\
+ {browser_refresh} {browser_search} {browser_stop} {bs} {capslock} {ctrldown} {ctrlup}\
+ {del} {delete} {down} {end} {enter} {esc} {escape} {f1} {f10} {f11} {f12} {f2} {f3}\
+ {f4} {f5} {f6} {f7} {f8} {f9} {home} {ins} {insert} {lalt} {launch_app1} {launch_app2}\
+ {launch_mail} {launch_media} {lctrl} {left} {lshift} {lwin} {lwindown} {lwinup} {media_next}\
+ {media_play_pause} {media_prev} {media_stop} {numlock} {numpad0} {numpad1} {numpad2}\
+ {numpad3} {numpad4} {numpad5} {numpad6} {numpad7} {numpad8} {numpad9} {numpadadd}\
+ {numpaddiv} {numpaddot} {numpadenter} {numpadmult} {numpadsub} {oem_102} {pause}\
+ {pgdn} {pgup} {printscreen} {ralt} {rctrl} {right} {rshift} {rwin} {rwindown} {rwinup}\
+ {scrolllock} {shiftdown} {shiftup} {sleep} {space} {tab} {up} {volume_down} {volume_mute}\
+ {volume_up}
+
+# Pre-Processor
+keywords5.$(file.patterns.au3)=#ce #comments-end #comments-start #cs #include #include-once\
+ #notrayicon #onautoitstartregister #requireadmin
+
+# Special
+keywords6.$(file.patterns.au3)=#endregion #forcedef #forceref #ignorefunc #pragma #region\
+ $(autoit3wrapper.keywords.special)
+
+# Abbrev-Expand
+keywords7.$(file.patterns.au3)=$(au3.keywords.abbrev) $(au3.keywords.userabbrev)
+
+# Standard UDF
+keywords8.$(file.patterns.au3)=$(au3.keywords.udfs)
+
+# Au3 styles
+
+# White space
+style.au3.0=fore:#000000
+# Comment block
+style.au3.1=$(colour.code.comment.line)
+# Comment stream
+style.au3.2=back:#F7F7F7,eolfilled,$(colour.code.comment.box)
+# Number
+style.au3.3=$(colour.number)
+# Function
+style.au3.4=$(colour.keyword)
+# Keyword
+style.au3.5=$(colour.keyword)
+# Macro
+style.au3.6=$(style.au3.9)
+# String
+style.au3.7=back:#FFF9FF,$(colour.string)
+# Operator
+style.au3.8=$(colour.operator)
+# Variable
+style.au3.9=fore:#800000
+# Send key
+style.au3.10=back:#FFF9FF,bold,$(colour.string)
+# Pre-Processor
+style.au3.11=back:#FFFFF8,$(colour.preproc)
+# Special
+style.au3.12=fore:#B00000,back:#FFFDFD
+# Abbrev-Expand
+style.au3.13=fore:#FF0000
+# COM Object
+style.au3.14=$(style.au3.9)
+# Standard UDF
+style.au3.15=fore:#0080FF
+
+# Properties using paths
+
+# Directory containing AutoIt program files
+autoit3dir=$(SciteDefaultHome)\..
+
+# API path
+api.$(file.patterns.au3)=$(SciteDefaultHome)\api\au3.api;$(SciteDefaultHome)\api\au3.autoit3wrapper.api;$(SciteUserHome)\au3.user.calltips.api
+
+# Commands for F1 Help
+command.help.$(file.patterns.au3)=$(CurrentWord)!$(autoit3dir)\AutoIt.chm
+command.help.subsystem.$(file.patterns.au3)=4
+
+# Commands to Compile, Build and Go
+command.compile.$(file.patterns.au3)="$(autoit3dir)\Aut2Exe\Aut2exe.exe" /in "$(FilePath)"
+command.build.$(file.patterns.au3)="$(autoit3dir)\Aut2Exe\Aut2exe.exe" /in "$(FilePath)" /x64
+command.go.$(file.patterns.au3)="$(autoit3dir)\AutoIt3.exe" /ErrorStdOut "$(FilePath)" $(1) $(2) $(3) $(4)
+
+# Au3Check
+command.0.$(file.patterns.au3)="$(autoit3dir)\Au3Check.exe" -q "$(FilePath)"
+command.name.0.$(file.patterns.au3)=Syntax Check
+command.shortcut.0.$(file.patterns.au3)=Ctrl+F5
+command.save.before.0.$(file.patterns.au3)=1
diff --git a/scite-app/scite/src/ave.properties b/scite-app/scite/src/ave.properties
new file mode 100644
index 0000000..f727beb
--- /dev/null
+++ b/scite-app/scite/src/ave.properties
@@ -0,0 +1,103 @@
+# Define SciTE settings for Avenue files.
+
+filter.ave=AVE (ave)|*.ave|
+
+*filter.ave=$(filter.ave)
+
+file.patterns.ave=*.ave
+
+lexer.*.ave=ave
+lexer.$(file.patterns.ave)=ave
+
+*language.avenue=Avenue|ave||
+
+####################################################
+# import classes and requests
+# files ave.classes &  ave.funcs is to large
+#import ave.classes
+#import ave.funcs
+
+keywords.$(file.patterns.ave)=nil true false else for if while then elseif end av self in exit
+#keywords2.$(file.patterns.ave)=$(keywordclass.ave)
+#keywords3.$(file.patterns.ave)=$(keywordfunc.ave)
+word.chars.ave=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ave)=$(word.chars.ave)
+
+statement.indent.$(file.patterns.ave)=1 else for if while then
+statement.lookback.$(file.patterns.ave)=1 end
+
+#Avenue string not support tab symbol, if You use tabs in script all tabs automatic translated to space.
+#use.tabs=0
+
+####################################################
+#Load user-defined api for current project.
+#api.$(file.patterns.ave)=ave.api
+####################################################
+
+comment.block.ave='--
+
+comment.box.start.ave='--
+comment.box.middle.ave='--
+comment.box.end.ave='--
+#Avenue is not case-sensitive lang.
+autocomplete.ave.ignorecase=1
+calltip.ave.ignorecase=1
+autocomplete.ave.start.characters=.
+calltip.ave.word.characters=.$(word.chars.ave)
+
+# AVE styles
+############################################################
+# Default
+style.ave.32=$(font.code.base),fore:#000000
+# White space: Visible only in View Whitespace mode (or if it has a back colour)
+style.ave.0=fore:#FF0000
+# Comment
+style.ave.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.ave.2=$(colour.number),bold
+# Keyword
+style.ave.3=$(colour.keyword),bold
+# String
+style.ave.6=$(colour.string)
+# Enumeration
+style.ave.7=$(colour.preproc),bold
+# End of line where string is not closed
+style.ave.8=back:#E0C0E0,eolfilled
+# Operators
+style.ave.10=$(colour.operator)
+# Identifier (everything else...)
+style.ave.9=$(font.code.base),fore:#000000
+# SCE_AVE_WORD1 allocated but unused
+style.ave.11=back:#FF0000
+# Other keywords (bozo test colors :-)
+style.ave.12=$(font.code.base),fore:#003355,bold
+style.ave.13=$(font.code.base),fore:#005533,bold
+style.ave.14=$(colour.keyword)
+style.ave.15=$(colour.keyword)
+style.ave.16=$(colour.keyword)
+# Braces are only matched in operator style
+braces.ave.style=10
+############################################################
+
+
+avenue=ave "$(FilePath)"
+avenueGo=avego "$(FilePath)"
+avenueBuild=avebuild "$(FilePath)"
+
+################################################################
+#use winhlp32 system
+#if ArcView installed in other directory please correct path <C:\ESRI\AV_GIS30\ARCVIEW\HELP\ARCVIEW>
+#command.help.$(file.patterns.ave)=$(CurrentWord)!C:\ESRI\AV_GIS30\ARCVIEW\HELP\ARCVIEW
+#command.help.subsystem.$(file.patterns.ave)=5
+
+
+#~ # compile
+#~ command.compile.$(file.patterns.ave)=$(avenue)
+#~ command.go.$(file.patterns.ave)=$(avenueGo)
+#~ #send to arcview
+#~ command.name.0.*.ave=Insert into project
+#~ command.0.*.ave=$(avenueBuild)
+#~ command.subsystem.0.*.ave=1
+
+#~ command.name.1.*.ave=Variables Report
+#~ command.1.*.ave=VarsReport.exe  "$(FilePath)"
diff --git a/scite-app/scite/src/avs.properties b/scite-app/scite/src/avs.properties
new file mode 100644
index 0000000..91b6944
--- /dev/null
+++ b/scite-app/scite/src/avs.properties
@@ -0,0 +1,133 @@
+# Define SciTE settings for AviSynth scripts.
+
+file.patterns.avs=*.avs;*.avsi
+
+filter.avs=AviSynth (avs avsi)|$(file.patterns.avs)|
+
+lexer.$(file.patterns.avs)=avs
+
+word.chars.avs=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.avs)=$(word.chars.avs)
+
+autocomplete.avs.ignorecase=1
+autocomplete.avs.fillups=(
+calltip.avs_quote.ignorecase=1
+calltip.avs.word.characters=$(word.chars.avs)
+
+comment.block.at.line.start.avs=1
+comment.block.avs=#~
+comment.stream.start.avs=/*
+comment.stream.end.avs=*/
+comment.box.start.avs=/*
+comment.box.middle.avs= *
+comment.box.end.avs= */
+
+# Keywords
+keywords.$(file.patterns.avs)=true false return global
+
+# Filters
+keywords2.$(file.patterns.avs)=addborders alignedsplice amplify amplifydb animate applyrange assumebff \
+assumefieldbased assumefps assumeframebased assumesamplerate assumescaledfps assumetff audiodub audiodubex \
+avifilesource avisource bicubicresize bilinearresize blackmanresize blackness blankclip blur bob cache \
+changefps colorbars colorkeymask coloryuv compare complementparity conditionalfilter conditionalreader \
+convertaudio convertaudioto16bit convertaudioto24bit convertaudioto32bit convertaudioto8bit convertaudiotofloat \
+convertbacktoyuy2 convertfps converttobackyuy2 converttomono converttorgb converttorgb24 converttorgb32 \
+converttoy8 converttoyv16 converttoyv24 converttoyv411 converttoyuy2 converttoyv12 crop cropbottom delayaudio \
+deleteframe dissolve distributor doubleweave duplicateframe ensurevbrmp3sync fadein fadein0 fadein2 fadeio fadeio0 \
+fadeio2 fadeout fadeout0 fadeout2 fixbrokenchromaupsampling fixluminance fliphorizontal flipvertical frameevaluate \
+freezeframe gaussresize generalconvolution getchannel getchannels getmtmode getparity grayscale greyscale histogram \
+horizontalreduceby2 imagereader imagesource imagewriter info interleave internalcache internalcachemt invert killaudio \
+killvideo lanczos4resize lanczosresize layer letterbox levels limiter loop mask maskhs max merge mergeargb mergechannels \
+mergechroma mergeluma mergergb messageclip min mixaudio monotostereo normalize null opendmlsource overlay peculiarblend \
+pointresize pulldown reduceby2 resampleaudio resetmask reverse rgbadjust scriptclip segmentedavisource segmenteddirectshowsource \
+selecteven selectevery selectodd selectrangeevery separatefields setmtmode sharpen showalpha showblue showfiveversions \
+showframenumber showgreen showred showsmpte showtime sincresize skewrows spatialsoften spline16resize spline36resize \
+spline64resize ssrc stackhorizontal stackvertical subtitle subtract supereq swapfields swapuv temporalsoften timestretch \
+tone trim turn180 turnleft turnright tweak unalignedsplice utoy utoy8 version verticalreduceby2 vtoy vtoy8 wavsource \
+weave writefile writefileend writefileif writefilestart ytouv
+
+# Plugins
+keywords3.$(file.patterns.avs)=addgrain addgrainc agc_hdragc analyzelogo animeivtc asharp audiograph autocrop \
+autoyuy2 avsrecursion awarpsharp bassaudiosource bicublinresize bifrost binarize blendfields blindpp blockbuster \
+bordercontrol cfielddiff cframediff chromashift cnr2 colormatrix combmask contra convolution3d convolution3dyv12 \
+dctfilter ddcc deblendlogo deblock deblock_qed decimate decomb dedup deen deflate degrainmedian depan depanestimate \
+depaninterleave depanscenes depanstabilize descratch despot dfttest dgbob dgsource directshowsource distancefunction \
+dss2 dup dupmc edeen edgemask ediupsizer eedi2 eedi3 eedi3_rpow2 expand faerydust fastbicubicresize fastbilinearresize \
+fastediupsizer dedgemask fdecimate ffaudiosource ffdshow ffindex ffmpegsource ffmpegsource2 fft3dfilter fft3dgpu \
+ffvideosource fielddeinterlace fielddiff fillmargins fity2uv fity2u fity2v fitu2y fitv2y fluxsmooth fluxsmoothst fluxsmootht \
+framediff framenumber frfun3b frfun7 gicocu golddust gradfun2db grapesmoother greedyhma grid guavacomb hqdn3d hybridfupp \
+hysteresymask ibob improvesceneswitch inflate inpand inpaintlogo interframe interlacedresize interlacedwarpedresize \
+interleaved2planar iscombed iscombedt iscombedtivtc kerneldeint leakkernelbob leakkerneldeint limitedsharpen limitedsharpenfaster \
+logic lsfmod lumafilter lumayv12 manalyse maskeddeinterlace maskedmerge maskedmix mblockfps mcompensate mctemporaldenoise \
+mctemporaldenoisepp mdegrain1 mdegrain2 mdegrain3 mdepan medianblur mergehints mflow mflowblur mflowfps mflowinter minblur mipsmooth \
+mmask moderatesharpen monitorfilter motionmask mpasource mpeg2source mrecalculate mscdetection msharpen mshow msmooth msu_fieldshiftfixer \
+msu_frc msuper mt mt_adddiff mt_average mt_binarize mt_circle mt_clamp mt_convolution mt_deflate mt_diamond mt_edge mt_ellipse \
+mt_expand mt_freeellipse mt_freelosange mt_freerectangle mt_hysteresis mt_infix mt_inflate mt_inpand mt_invert mt_logic mt_losange \
+mt_lut mt_lutf mt_luts mt_lutspa mt_lutsx mt_lutxy mt_lutxyz mt_makediff mt_mappedblur mt_merge mt_motion mt_polish mt_rectangle \
+mt_square mti mtsource multidecimate mvanalyse mvblockfps mvchangecompensate mvcompensate mvdegrain1 mvdegrain2 mvdegrain3 mvdenoise \
+mvdepan mvflow mvflowblur mvflowfps mvflowfps2 mvflowinter mvincrease mvmask mvrecalculate mvscdetection mvshow nicac3source nicdtssource \
+niclpcmsource nicmpasource nicmpg123source nnedi nnedi2 nnedi2_rpow2 nnedi3 nnedi3_rpow2 nomosmooth overlaymask peachsmoother pixiedust \
+planar2interleaved qtgmc qtinput rawavsource rawsource reduceflicker reinterpolate411 removedirt removedust removegrain removegrainhd \
+removetemporalgrain repair requestlinear reversefielddominance rgb3dlut rgdeinterlace rgsdeinterlace rgblut rotate sangnom seesaw sharpen2 \
+showchannels showcombedtivtc smartdecimate smartdeinterlace smdegrain smoothdeinterlace smoothuv soothess soxfilter spacedust sshiq ssim \
+ssiq stmedianfilter t3dlut tanisotropic tbilateral tcanny tcomb tcombmask tcpserver tcpsource tdecimate tdeint tedgemask telecide \
+temporalcleaner temporalrepair temporalsmoother tfieldblank tfm tisophote tivtc tmaskblank tmaskedmerge tmaskedmerge3 tmm tmonitor tnlmeans \
+tomsmocomp toon textsub ttempsmooth ttempsmoothf tunsharp unblock uncomb undot unfilter unsharpmask vaguedenoiser variableblur verticalcleaner \
+videoscope vinverse vobsub vqmcalc warpedresize warpsharp xsharpen yadif yadifmod yuy2lut yv12convolution yv12interlacedreduceby2 \
+yv12interlacedselecttopfields yv12layer yv12lut yv12lutxy yv12substract yv12torgb24 yv12toyuy2
+
+# Functions
+keywords4.$(file.patterns.avs)=abs apply assert bool ceil chr clip continueddenominator continuednumerator cos default defined \
+eval averagechromau averagechromav averageluma chromaudifference chromavdifference lumadifference exist exp findstr float floor \
+frac hexvalue import int isbool isclip isfloat isint isstring lcase leftstr load_stdcall_plugin loadcplugin loadplugin loadvfapiplugin \
+loadvirtualdubplugin log midstr muldiv nop opt_allowfloataudio opt_avipadscanlines opt_dwchannelmask opt_usewaveextensible \
+opt_vdubplanarhack pi pow rand revstr rightstr round scriptdir scriptfile scriptname select setmemorymax setplanarlegacyalignment \
+rgbdifference rgbdifferencefromprevious rgbdifferencetonext udifferencefromprevious udifferencetonext setworkingdir sign sin spline \
+sqrt string strlen time ucase undefined value versionnumber versionstring uplanemax uplanemedian uplanemin uplaneminmaxdifference \
+vdifferencefromprevious vdifferencetonext vplanemax vplanemedian vplanemin vplaneminmaxdifference ydifferencefromprevious \
+ydifferencetonext yplanemax yplanemedian yplanemin yplaneminmaxdifference
+
+# Clip properties
+keywords5.$(file.patterns.avs)=audiobits audiochannels audiolength audiolengthf audiorate framecount framerate frameratedenominator \
+frameratenumerator getleftchannel getrightchannel hasaudio hasvideo height isaudiofloat isaudioint isfieldbased isframebased \
+isinterleaved isplanar isrgb isrgb24 isrgb32 isyuv isyuy2 isyv12 width
+
+# User defined
+keywords6.$(file.patterns.avs)=
+
+# AviSynth Styles
+
+# Default
+style.avs.32=$(font.base)
+# White space: Visible only in View Whitespace mode (or if it has a back colour)
+style.avs.0=fore:#000000,$(font.base)
+# Comment: /* */. Use fixed font to keep boxed comments as boxes
+style.avs.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Comment: [* *]. Use fixed font to keep boxed comments as boxes
+style.avs.2=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: #. Proportionnal font is generally OK here
+style.avs.3=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.avs.4=$(colour.number)
+# Operators
+style.avs.5=$(colour.operator)
+# Identifiers (everything else...)
+style.avs.6=
+# Double quoted string
+style.avs.7=$(colour.string)
+# String with three double quotes
+style.avs.8=$(colour.string)
+# Keyword
+style.avs.9=fore:#00007F,bold
+# Filter
+style.avs.10=fore:#00007F,bold
+# Plugin
+style.avs.11=fore:#0080C0,bold
+# Function
+style.avs.12=fore:#007F7F
+# Clip properties
+style.avs.13=fore:#00007F
+# User defined
+style.avs.14=fore:#8000FF
+# Braces are only matched in operator style
+braces.avs.style=5
diff --git a/scite-app/scite/src/baan.properties b/scite-app/scite/src/baan.properties
new file mode 100644
index 0000000..3552c7b
--- /dev/null
+++ b/scite-app/scite/src/baan.properties
@@ -0,0 +1,215 @@
+# Define SciTE settings for Baan files.
+#set Below as per Preference.
+font.baan.monospace=font:Consolas,size:10
+
+fold.baan.keywords.based=1
+fold.baan.syntax.based=0
+fold.baan.sections=1
+fold.baan.inner.level=0
+lexer.baan.styling.within.preprocessor=1
+
+#uncomment below, set the full path of API files. If more than one, seperate it with ';'.
+#api.$(file.patterns.baan)=
+
+#Uncomment below two properties, set the full path of CHM files.
+#command.help.$(file.patterns.baan)=$(CurrentWord)!D:\
+#command.help.subsystem.$(file.patterns.baan)=4
+
+#Not much to change.  Check Baan Styles for preference.
+file.patterns.baan=*.bc;*.cln
+
+filter.baan=Baan (baan)|$(file.patterns.baan)|
+
+*filter.baan=$(filter.baan)
+
+lexer.$(file.patterns.baan)=baan
+
+*language.baan=Baan|bc||
+
+word.characters.$(file.patterns.baan)=$(chars.alpha)$(chars.numeric)_#.$
+calltip.baan.word.characters=$(chars.alpha)$(chars.numeric)_#.$
+autocomplete.baan.ignorecase=1
+calltip.baan.ignorecase=1
+autocomplete.baan.start.characters="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_."
+
+preprocessor.symbol.$(file.patterns.baan)=#
+preprocessor.start.$(file.patterns.baan)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.baan)=else elif
+preprocessor.end.$(file.patterns.baan)=endif
+
+# Comment blocks for Baan
+comment.block.baan=|
+comment.block.at.line.start.baan=1
+
+block.start.$(file.patterns.baan)=4 case  else for  if repeat selectdo selectempty selecteos selecterror
+block.end.$(file.patterns.baan)=4 else endcase  endfor  endif endselect endwhile selectempty selecteos selecterror
+statement.lookback.$(file.patterns.baan)=0
+
+# Baan styles. Change colours based on preference.
+# Gray
+colour.baan.whitespace=fore:#808080
+#Olive
+colour.baan.preproc=fore:#808000
+#Magenta
+colour.baan.string=fore:#FF00FF
+#Teal
+colour.baan.comment.doc=fore:#008080
+#green
+colour.baan.comment.line=fore:#008000
+#Red
+colour.baan.numbers=fore:#FF0000
+#Maroon
+colour.baan.keyword=fore:#800000
+#Blue
+colour.baan.keyword2=fore:#0000FF
+colour.baan.keyword3=fore:#0000FF
+#Orange Red
+colour.baan.keyword4=fore:#FF4500
+#Purple
+colour.baan.keyword5=fore:#800080
+colour.baan.keyword6=fore:#FF00FF,back:#4EE2EC
+colour.baan.keyword7=fore:#FF0000,back:#90EE90
+colour.baan.keyword8=fore:#CC00CC,back:#FFFF99
+colour.baan.keyword9=fore:#00FFFF
+#DarkOrchid
+colour.baan.tabledef=fore:#9932CC
+#BlueViolet
+colour.baan.tablesql=fore:#8A2BE2
+#Navy
+colour.baan.functions=fore:#000080
+#DarkGoldenrod
+colour.baan.domaindef=fore:#B8860B
+# FireBrick
+colour.baan.funcdefs=fore:#B22222
+# OrangeRed
+colour.baan.objdefs=fore:#FF4500
+#Dark Olive Green
+colour.baan.definedefs=fore:#556B2F
+
+colour.baan.braces.highlight=fore:#0000FF
+colour.baan.braces.incomplete=fore:#FF0000
+colour.baan.eol.string.not.closed=fore:#000000,back:#E0C0E0
+colour.baan.operator=fore:#007F00
+
+# Default
+style.baan.32=$(font.baan.monospace)
+# White space
+style.baan.0=$(colour.baan.whitespace),$(font.baan.monospace)
+# Comment
+style.baan.1=$(colour.baan.comment.line),$(font.baan.monospace),bold,italics
+# Doc comment
+style.baan.2=$(colour.baan.comment.doc),$(font.baan.monospace),bold,italics
+# Number
+style.baan.3=$(colour.baan.numbers),$(font.baan.monospace),bold
+# Keyword ~ Reserved Words
+style.baan.4=$(colour.baan.keyword),$(font.baan.monospace),bold
+# Double quoted string
+style.baan.5=$(colour.baan.string),$(font.baan.monospace),bold
+# Preprocessor
+style.baan.6=$(colour.baan.preproc),$(font.baan.monospace),bold
+# Operators
+style.baan.7=$(colour.baan.operator),$(font.baan.monospace),bold
+# Identifiers
+style.baan.8=$(font.baan.monospace)
+# End of line where string is not closed
+style.baan.9=$(colour.baan.eol.string.not.closed),$(font.baan.monospace),eolfilled
+# Keywords2 ~ Functions
+style.baan.10=$(colour.baan.keyword2),$(font.baan.monospace),bold
+# Keywords3 ~ Functions Abridged
+style.baan.11=$(colour.baan.keyword3),$(font.baan.monospace),bold
+# Keywords4 ~ Sections
+style.baan.12=$(colour.baan.keyword4),$(font.baan.monospace),bold
+# Keywords5 ~ Predefined Variables
+style.baan.13=$(colour.baan.keyword5),$(font.baan.monospace),bold
+# Keywords6 ~ Attributes Predefined
+style.baan.14=$(colour.baan.keyword6),$(font.baan.monospace),bold
+# Keywords7
+style.baan.15=$(colour.baan.keyword7),$(font.baan.monospace),bold
+# Keywords8
+style.baan.16=$(colour.baan.keyword8),$(font.baan.monospace),bold
+# Keywords9
+style.baan.17=$(colour.baan.keyword9),$(font.baan.monospace),bold
+# TableDef
+style.baan.18=$(colour.baan.tabledef),$(font.baan.monospace),bold
+# TableSQL
+style.baan.19=$(colour.baan.tablesql),$(font.baan.monospace),bold
+# Functions
+style.baan.20=$(colour.baan.functions),$(font.baan.monospace),bold
+# DomainDef
+style.baan.21=$(colour.baan.domaindef),$(font.baan.monospace),bold
+# FunctionDef
+style.baan.22=$(colour.baan.funcdefs),$(font.baan.monospace),bold
+# ObjectDef used in #include and #pragma used dll
+style.baan.23=$(colour.baan.objdefs),$(font.baan.monospace),bold
+# DefineDef used in #define
+style.baan.24=$(colour.baan.definedefs),$(font.baan.monospace),bold
+
+# Braces are only matched in operator style
+braces.baan.style=7
+# Brace highlight
+style.baan.34=$(colour.baan.braces.highlight),bold
+# Brace incomplete highlight
+style.baan.35=$(colour.baan.braces.incomplete),bold
+
+#Indent properties
+statement.indent.$(file.patterns.baan)=12 after.choice: after.delete: after.display: after.field: after.form.read: after.form: \
+after.group: after.input: after.layout: after.program: after.receive.data: after.rewrite: after.skip.delete: after.skip.rewrite: \
+after.skip.write: after.update.db.commit: after.write: after.zoom: before.checks: before.choice: before.delete: before.display.object: \
+before.display: before.field: before.form: before.group: before.input: before.layout: before.new.object: before.print: before.program: \
+before.read: before.rewrite: before.write: before.zoom: check.input: declaration: domain.error: init.field: init.form: init.group: on.choice: \
+on.display.total.line: on.entry: on.error: on.exit: on.input: read.view: ref.display: ref.input: selection.filter: when.field.changes:
+
+#keywords Reserved Keywords (Do not Change)
+keywords.$(file.patterns.baan)=alike all and array as asc at avg base based between boolean both break bset buffer by call case cast chart clear \
+clearunref common const continue count cross current_date current_timestamp date date.num date.to.num debug default delete deleteempty \
+deleteerror desc dim distinct dll dllusage domain double else empty end endcase enddelete enddllusage endfor endfunctionusage endif endselect \
+endupdate endwhile enum_description eq escape exists extern false fatal fetching field first fixed for from full function functionusage ge global goto \
+group gt having hint hints if in include index inner input inrange integer is join label last le leading left like long lt max mb menu message min multibyte \
+ne no nodebug not notransactions nowarnings null on or order ordered outer path pi prepared print prompt question raw real ref reference refers repeat \
+retry return right row rows select selectbind selectdo selectempty selecteos selecterror session set setunref size skip static step sticky stop strict_boolean \
+string subhint sum table text_content then timestamp to trailing trim true union unref until update updateempty updateerror use used void warning warnings \
+when where wherebind whereused while with
+
+#Keywords2 Functions (Set your Functions based on Baan version & TIV level.)
+keywords2.$(file.patterns.baan)=abort abort.io  \
+db.after.delete db.after.insert db.after.update \
+xmlSetData \
+zoom.to$
+
+#Keywords3 Functions InListAbridged (Set Functions, based on Baan Version & TIV Level.) ~.is.mandatory will work for <any.field>.is.mandatory() DAL function.
+keywords3.$(file.patterns.baan)=~.is.mandatory
+
+#Keywords4 Sub Sections (Sub Sections should always come before main sections, because after.~: in main section would overtake after.choice: and so on). (Do Not Change)
+keywords4.$(file.patterns.baan)=after.choice: after.delete: after.display: after.field: after.form: after.group: after.input: after.layout: after.read: after.rewrite: \
+after.skip.delete: after.skip.rewrite: after.skip.write: after.write: after.zoom: before.checks:  before.choice: before.delete: before.display: before.field: before.form: \
+before.group: before.input: before.layout: before.print: before.read: before.rewrite: before.write: before.zoom: check.input: domain.error: init.field: init.form: \
+init.group: on.choice: on.entry: on.exit: on.input: read.view: ref.display: ref.input: selection.filter: when.field.changes:
+
+#Keyword5 Main Sections InListAbridged (Do Not Change)
+keywords5.$(file.patterns.baan)=after.~: before.~: choice.abort.program: choice.abort.work: choice.add.set: choice.ask.helpinfo: choice.attachments: \
+choice.bms: choice.calculator: choice.calender: choice.cancel.work: choice.change.frm: choice.change.order: choice.cmd.about.baan: choice.cmd.copy: \
+choice.cmd.cut: choice.cmd.options: choice.cmd.paste: choice.cont.process: choice.create.job: choice.current.work: choice.cust.grid: choice.def.find: \
+choice.display.set: choice.dupl.occur: choice.end.program: choice.field.browse: choice.field.help: choice.find.data: choice.first.frm: choice.first.set: \
+choice.first.view: choice.freeze.columns: choice.get.defaults: choice.global.copy: choice.global.delete: choice.glossary: choice.help.index: choice.hide.fields: \
+choice.interrupt: choice.last.frm: choice.last.set: choice.last.view: choice.mark.delete: choice.mark.occur: choice.modify.set: choice.next.frm: choice.next.set: \
+choice.next.view: choice.next.work: choice.prev.frm: choice.prev.set: choice.prev.view: choice.print.data: choice.processes: choice.recover.set: choice.reference: \
+choice.resize.frm: choice.rotate.curr: choice.run.job: choice.save.defaults: choice.select.all: choice.send.data: choice.sendto.desktop: choice.sendto.editor: \
+choice.sendto.mail: choice.sendto.tasklst: choice.start.chart: choice.start.query: choice.start.set: choice.suspend.work: choice.switch.windows: choice.synchronize: \
+choice.text.manager: choice.to.clipboard: choice.unfreeze.colum: choice.update.db: choice.user.0: choice.user.1: choice.user.2: choice.user.3: choice.user.4: choice.user.5: \
+choice.user.6: choice.user.7: choice.user.8: choice.user.9: choice.using.help: choice.zoom:  declaration: detail.~: field.~: footer.~: form.~: functions: group.~: \
+header.~:  main.table.io: on.display.total.line: on.error: zoom.from.~:
+
+#Keyword6 PreDefined Variables (Set these predefined variables based on your Baan Version).
+keywords6.$(file.patterns.baan)=actual.occ \
+zoomreturn$
+
+#keywords7 Attributes PreDefined ( Below list needs to be typed in UPPER case in scripts, but keep it in lower here). (Set these predefined Attributes based on your Baan Version).
+keywords7.$(file.patterns.baan)=__file__ \
+z.session
+
+#keywords8 Enumerate domains. Enter domain domain names starting with '^' and ending with '.'. All the enumerates would be listed. (Based on your Baan Version).
+keywords8.$(file.patterns.baan)=^tcyesno. ^tdsls.corg.
+
+#Keywords9 MACROS from standard based on your Baan Version. Write in CAPS inside the scripts, but in lower here.
+keywords9.$(file.patterns.baan)=dalnew dalupdate
+
diff --git a/scite-app/scite/src/blitzbasic.properties b/scite-app/scite/src/blitzbasic.properties
new file mode 100644
index 0000000..a5acf38
--- /dev/null
+++ b/scite-app/scite/src/blitzbasic.properties
@@ -0,0 +1,100 @@
+# Define SciTE settings for BlitzBasic files.
+
+file.patterns.blitzbasic=*.bb
+
+filter.blitzbasic=BlitzBasic (bb)|$(file.patterns.blitzbasic)|
+
+*filter.blitzbasic=$(filter.blitzbasic)
+
+lexer.$(file.patterns.blitzbasic)=blitzbasic
+
+# keywords must be all lowercase
+
+keywordclass.blitzbasic=abs accepttcpstream acos after and apptitle asc asin atan atan2 \
+automidhandle autosuspend availvidmem backbuffer banksize before bin calldll \
+case ceil changedir channelpan channelpitch channelplaying channelvolume chr \
+closedir closefile closemovie closetcpserver closetcpstream closeudpstream cls \
+clscolor color colorblue colorgreen colorred commandline const copybank copyfile \
+copyimage copypixel copypixelfast copyrect copystream cos countgfxdrivers \
+countgfxmodes counthostips createbank createdir createimage createnetplayer \
+createprocess createtcpserver createtimer createudpstream currentdate currentdir \
+currenttime data debuglog default delay delete deletedir deletefile \
+deletenetplayer desktopbuffer dim dottedip drawblock drawblockrect drawimage \
+drawimagerect drawmovie each else else if elseif end end function end if end \
+select end type endgraphics endif eof execfile exit exp false field filepos \
+filesize filetype first flip float floor flushjoy flushkeys flushmouse \
+fontheight fontname fontsize fontstyle fontwidth for forever freebank freefont \
+freeimage freesound freetimer frontbuffer function gammablue gammagreen gammared \
+getcolor getenv getkey getmouse gfxdrivername gfxmodedepth gfxmodeexists \
+gfxmodeformat gfxmodeheight gfxmodewidth global gosub goto grabimage graphics \
+graphicsbuffer graphicsdepth graphicsformat graphicsheight graphicswidth \
+handleimage hex hidepointer hostip hostnetgame if imagebuffer imageheight \
+imagerectcollide imagerectoverlap imagescollide imagesoverlap imagewidth \
+imagexhandle imageyhandle include input insert instr int joinnetgame joydown \
+joyhat joyhit joypitch joyroll joytype joyu joyudir joyv joyvdir joyx joyxdir \
+joyy joyyaw joyydir joyz joyzdir keydown keyhit keywait last left len line \
+loadanimimage loadbuffer loadfont loadimage loadsound local lockbuffer \
+lockedformat lockedpitch lockedpixels log log10 loopsound lower lset maskimage \
+mid midhandle millisecs mod morefiles mousedown mousehit mousex mousexspeed \
+mousey mouseyspeed mousez mousezspeed movemouse movieheight movieplaying \
+moviewidth netmsgdata netmsgfrom netmsgto netmsgtype netplayerlocal \
+netplayername new next nextfile not null openfile openmovie opentcpstream or \
+origin oval pausechannel pausetimer peekbyte peekfloat peekint peekshort pi \
+playcdtrack playmusic playsound plot pokebyte pokefloat pokeint pokeshort print \
+queryobject rand read readavail readbyte readbytes readdir readfile readfloat \
+readint readline readpixel readpixelfast readshort readstring rect rectsoverlap \
+recvnetmsg recvudpmsg repeat replace resettimer resizebank resizeimage restore \
+resumechannel resumetimer return right rnd rndseed rotateimage rset runtimeerror \
+sar savebuffer saveimage scaleimage scanline seedrnd seekfile select sendnetmsg \
+sendudpmsg setbuffer setenv setfont setgamma setgfxdriver sgn shl showpointer \
+shr sin soundpan soundpitch soundvolume sqr startnetgame step stop stopchannel \
+stopnetgame str string stringheight stringwidth systemproperty tan tcpstreamip \
+tcpstreamport tcptimeouts text tformfilter tformimage then tileblock tileimage \
+timerticks to totalvidmem trim true type udpmsgip udpmsgport udpstreamip \
+udpstreamport udptimeouts unlockbuffer until updategamma upper viewport vwait \
+waitkey waitmouse waittimer wend while write writebyte writebytes writefile \
+writefloat writeint writeline writepixel writepixelfast writeshort writestring \
+xor
+
+keywords.$(file.patterns.blitzbasic)=$(keywordclass.blitzbasic)
+
+# BB styles
+# Default
+style.blitzbasic.0=fore:#000000
+# Comment
+style.blitzbasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.blitzbasic.2=$(colour.number)
+# Keyword1
+style.blitzbasic.3=$(colour.keyword)
+# String
+style.blitzbasic.4=$(colour.string)
+# Preprocessor
+# style.blitzbasic.5=$(colour.error)
+# Operator
+style.blitzbasic.6=$(colour.operator)
+# Identifier
+style.blitzbasic.7=$(style.blitzbasic.0)
+# Date
+# style.blitzbasic.8=$(colour.error)
+# StringEOL
+# style.blitzbasic.9=$(colour.error)
+# Keyword2
+style.blitzbasic.10=$(colour.keyword)
+# Keyword3
+style.blitzbasic.11=$(colour.keyword)
+# Keyword4
+style.blitzbasic.12=$(colour.keyword)
+# Constant
+# style.blitzbasic.13=$(colour.error)
+# Asm
+# style.blitzbasic.14=$(colour.error)
+# Label
+style.blitzbasic.15=$(colour.preproc)
+# Error
+style.blitzbasic.16=$(colour.error)
+# HexNumber
+style.blitzbasic.17=$(colour.number)
+# BinNumber
+style.blitzbasic.18=$(colour.number)
+
diff --git a/scite-app/scite/src/bullant.properties b/scite-app/scite/src/bullant.properties
new file mode 100644
index 0000000..40cb54a
--- /dev/null
+++ b/scite-app/scite/src/bullant.properties
@@ -0,0 +1,86 @@
+# Define SciTE settings for Bullant files.
+
+filter.bullant=Bullant (.ant)|*.ant|
+
+*filter.bullant=$(filter.bullant)
+
+file.patterns.bullant=*.ant
+
+lexer.$(file.patterns.bullant)=bullant
+
+*language.bullant=Bullant|ant||
+
+keywordclass.bullant=abstract all ancestor and application \
+assert attributes author \
+begin \
+callback class concrete config constants construct continue \
+depends description downcast driver \
+elif else ensures error exception exposure extension \
+false fatal final function \
+generics glyph \
+help hidden host \
+immutable in inherits is \
+kernel \
+label leave library locals \
+mutable \
+none not null \
+obsolete options or other \
+parameters peer private public \
+raise reason restricted retry return \
+returns rollback route \
+security self settings severity step \
+task test transaction true \
+unknown \
+varying \
+warning when \
+method end if until while trap case debug for foreach lock \
+boolean \
+character character$ \
+date date$ datetime datetime$ \
+float \
+hex$ \
+identifier identifier$ integer interval interval$ \
+money money$ \
+raw raw$ \
+string \
+tick tick$ time time$ \
+version version$
+
+
+keywords.$(file.patterns.bullant)=$(keywordclass.bullant)
+
+# Bullant styles
+# White space
+style.bullant.0=fore:#000000,$(font.monospace)
+# Comment
+style.bullant.1=fore:#007F00,$(font.monospace)
+# Line Comment
+style.bullant.2=fore:#007F00,$(font.monospace)
+# Doc comment
+style.bullant.3=fore:#7F7F7F
+# Number
+style.bullant.4=fore:#007F7F
+
+
+# Keyword
+style.bullant.5=fore:#00007F,bold
+# Double quoted string
+style.bullant.6=fore:#7F007F,$(font.monospace)
+# Single quoted string
+style.bullant.7=fore:#7F007F,$(font.monospace)
+# Symbols
+style.bullant.8=fore:#007F7F
+# Preprocessor
+style.bullant.9=fore:#7F7F00
+
+# compile
+command.compile.*.ant=
+
+# normal execute
+command.go.*.ant=
+command.go.subsystem.*.ant=
+
+#build=compile ...
+command.build.*.ant=
+command.build.subsystem.*.ant=
+
diff --git a/scite-app/scite/src/caml.properties b/scite-app/scite/src/caml.properties
new file mode 100644
index 0000000..916719b
--- /dev/null
+++ b/scite-app/scite/src/caml.properties
@@ -0,0 +1,147 @@
+#	Define SciTE settings for Objective Caml, Standard ML 97 files
+#
+#	To use with Standard ML source in .ml files, select Standard ML
+#	from the SciTE Language menu (or adjust the properties below).
+#
+# To fully enable this Scintilla lexer, make sure the following entries
+#	are present and uncommented in your SciTE properties:
+#
+#		$(filter.caml)\
+#		$(filter.sml)\
+#
+#		Objective Caml|ml||\
+#		Standard ML|sml||\
+#
+#		import caml
+
+# OCaml/SML implementation and interface files
+file.patterns.caml=*.ml;*.mli
+file.patterns.sml=*.sml
+
+*filter.objectivecaml=$(filter.caml)
+
+filter.caml=Objective Caml (ml mli)|$(file.patterns.caml)|
+filter.sml=Standard ML 97 (sml ml)|$(file.patterns.sml)|
+
+lexer.*.caml=caml
+lexer.$(file.patterns.caml)=caml
+lexer.$(file.patterns.sml)=caml
+
+#*language.objectivecaml=Objective Caml|ml||
+
+# the standard Objective Caml 3.09/3.10/3.11 language "textual" keywords
+keywordstandard.caml= \
+and as assert asr begin class \
+constraint do done downto else end \
+exception external false for fun function \
+functor if in include inherit initializer \
+land lazy let lor lsl lsr \
+lxor match method mod module mutable \
+new object of open or private \
+rec sig struct then to true \
+try type val virtual when while \
+with
+keywords.$(file.patterns.caml)=$(keywordstandard.caml)
+
+# the standard Standard ML '97 language "textual" keywords
+keywordstandard.sml= \
+abstype andalso and as case datatype div do \
+else end eqtype exception \
+false fn fun functor handle if infixr infix include in let local \
+mod nonfix not of open op orelse raise rec \
+sharing signature sig structure struct then true type use \
+val while withtype with
+keywords.$(file.patterns.sml)=$(keywordstandard.sml)
+
+# "optional" Objective Caml / library keywords; some suggested entries are here,
+# more could come from, say, Pervasives ('parser' is from Camlp4)
+keywordoptional1.caml= \
+option Some None ignore ref lnot succ pred parser
+keywords2.$(file.patterns.caml)=$(keywordoptional1.caml)
+
+# "optional" Standard ML '97 / library keywords; some suggested entries are here,
+# more could come from, say, Standard Basis Library
+keywordoptional1.sml= \
+option SOME NONE ignore ref \
+chr explode implode ord size
+keywords2.$(file.patterns.sml)=$(keywordoptional1.sml)
+
+# "optional" Objective Caml / library keywords; some suggested entries are here,
+# more could come from, say, user-defined types
+keywordoptional2.caml= \
+array bool char float int list string unit
+keywords3.$(file.patterns.caml)=$(keywordoptional2.caml)
+
+# "optional" Standard ML '97 / library keywords; some suggested entries are here,
+# more could come from, say, user-defined types
+keywordoptional2.sml= \
+array bool char int list nil real string unit vector word
+keywords3.$(file.patterns.sml)=$(keywordoptional2.sml)
+
+word.characters.$(file.patterns.caml)=$(chars.alpha)$(chars.numeric)_'`
+word.characters.$(file.patterns.sml)=$(chars.alpha)$(chars.numeric)_'
+
+comment.stream.start.caml=(*
+comment.stream.end.caml=*)
+comment.box.start.caml=(*
+comment.box.middle.caml= *
+comment.box.end.caml= *)
+
+# "folding" support not currently implemented
+
+# "Out-of-the-box" syntax colors are defined here - I like having
+# my literals (number, char, and string), tag-names, and "optional"
+# keywords stand out - you might not, so adjust accordingly!
+# Default
+style.caml.32=$(font.base)
+# White space
+style.caml.0=fore:#808080
+# Identifiers
+style.caml.1=
+# Tag-names
+#style.caml.2=
+style.caml.2=fore:#000000,back:#ffe0ff
+# Keywords (builtin language-defined keywords)
+style.caml.3=$(colour.keyword),bold
+# Keywords2 (season to taste - use for option, Some, None, etc)
+#style.caml.4=
+style.caml.4=fore:#000000,back:#e0e0ff
+# Keywords3 (season to taste - use for bool, char, float, etc)
+#style.caml.5=
+#style.caml.5=fore:#000000,back:#ffe0e0
+style.caml.5=fore:#a0000,bold
+# Linenum directive
+style.caml.6=back:#C0C0C0,$(font.base)
+# Operators
+style.caml.7=$(colour.operator),bold
+# Number
+#style.caml.8=$(colour.number)
+style.caml.8=fore:#000000,back:#ffff00
+# Single quoted string (character constant)
+#style.caml.9=$(colour.char)
+style.caml.9=fore:#000000,back:#ffff00
+# Embedded whitespace (SML character/string constant)
+#style.caml.10=
+style.caml.10=fore:#000000,back:#e0e0e0
+# Double quoted string (string constant)
+#style.caml.11=$(colour.string)
+style.caml.11=fore:#000000,back:#ffff00
+# Comment (NOT nested)
+style.caml.12=$(colour.code.comment.box),$(font.code.comment.box)
+# Comment (SINGLY nested)
+#style.caml.13=$(colour.code.comment.box),$(font.code.comment.box)
+style.caml.13=$(colour.embedded.comment),$(font.code.comment.box)
+# Comment (DOUBLY nested)
+#style.caml.14=$(colour.code.comment.box),$(font.code.comment.box)
+style.caml.14=$(colour.embedded.comment),$(font.code.comment.box)
+# Comment (TRIPLY nested)
+#style.caml.15=$(colour.code.comment.box),$(font.code.comment.box)
+style.caml.15=$(colour.embedded.comment),$(font.code.comment.box)
+
+# Braces are only matched in operator style
+braces.caml.style=7
+
+# The below command(s) can and should be adjusted to reflect your environment;
+# in addition, per-directory overrides are possible, so that project-specific "build"
+# commands may be used for more complex cases - see the SciTE documentation.
+command.compile.$(file.patterns.caml)=ocamlc -c $(FileNameExt)
diff --git a/scite-app/scite/src/cil.properties b/scite-app/scite/src/cil.properties
new file mode 100644
index 0000000..f53c2b3
--- /dev/null
+++ b/scite-app/scite/src/cil.properties
@@ -0,0 +1,116 @@
+# Define SciTE settings for Common Intermediate Language (CIL) files.
+
+# File filters, patterns, language, lexer and source
+file.patterns.cil=*.il
+filter.cil=CIL (il)|$(file.patterns.cil)|
+lexer.$(file.patterns.cil)=cil
+
+*filter.cil=$(filter.cil)
+*language.cil=CIL|cil||
+*source.patterns.cil=$(file.patterns.cil);
+
+# Primary keywords
+keywordclass.cil.main=abstract ansi assembly auto autochar beforefieldinit \
+catch cdecl cil class compilercontrolled explicit extends extern famandassem \
+family famorassem fastcall final finally forwardref hidebysig implements \
+initonly instance interface internalcall lasterr literal managed nested \
+newslot noinlining nomangle nooptimization notserialized optil pinvokeimpl \
+platformapi preservesig private privatescope public reqsecobj rtspecialname \
+runtime sealed sequential serializable specialname static stdcall strict \
+synchronized thiscall unicode unmanaged unmanagedexp valuetype vararg virtual \
+void winapi
+
+# Extra data and reference types:
+keywordclass.cil.main.extras=bool char float32 float64 int int8 int16 int32 \
+int64 native nullref object string typedref uint8 uint32 unsigned
+
+# Metadata keywords
+keywordclass.cil.metadata=.addon .assembly .cctor .class .corflags .ctor \
+.custom .data .emitbyte .entrypoint .event .export .field .file .fire .get \
+.hash .imagebase .import .language .line .locale .localized .locals \
+.manifestres .maxstack .method .module .mresource .namespace .other .override \
+.pack .param .pdirect .permission .permissionset .property .property \
+.publickey .publickeytoken .removeon .set .size .stackreserve .subsystem .try \
+.ver .vtable .vtentry .vtfixup .zeroinit
+
+# Opcode keywords
+keywordclass.cil.opcode=add add.ovf add.ovf.un and arglist beq beq.s \
+bge bge.s bge.un bge.un.s bgt bgt.s bgt.un bgt.un.s ble ble.s ble.un ble.un.s \
+blt blt.s blt.un blt.un.s bne.un bne.un.s box br br.s break brfalse brfalse.s \
+brinst brinst.s brnull brnull.s brtrue brtrue.s brzero brzero.s bstr call \
+calli callmostderived callvirt castclass ceq cgt cgt.un ckfinite ckfinite clt \
+clt.un constrained. conv.i conv.i1 conv.i2 conv.i4 conv.i8 conv.ovf.i \
+conv.ovf.i.un conv.ovf.i1 conv.ovf.i1.un conv.ovf.i2 conv.ovf.i2.un \
+conv.ovf.i4 conv.ovf.i4.un conv.ovf.i8 conv.ovf.i8.un conv.ovf.u \
+conv.ovf.u.un conv.ovf.u1 conv.ovf.u1.un conv.ovf.u2 conv.ovf.u2.un \
+conv.ovf.u4 conv.ovf.u4.un conv.ovf.u8 conv.ovf.u8.un conv.r.un conv.r4 \
+conv.r8 conv.u conv.u1 conv.u2 conv.u4 conv.u8 cpblk cpobj div div.un dup \
+endfault endfilter endfinally initblk initobj isinst jmp ldarg ldarg.0 ldarg.1 \
+ldarg.2 ldarg.3 ldarg.s ldarga ldarga.s ldc.i4 ldc.i4.0 ldc.i4.1 ldc.i4.2 \
+ldc.i4.3 ldc.i4.4 ldc.i4.5 ldc.i4.6 ldc.i4.7 ldc.i4.8 ldc.i4.m1 ldc.i4.s \
+ldc.i8 ldc.r4 ldc.r8 ldelem ldelem.i ldelem.i1 ldelem.i2 ldelem.i4 ldelem.i8 \
+ldelem.r4 ldelem.r8 ldelem.ref ldelem.u1 ldelem.u2 ldelem.u4 ldelema ldfld \
+ldflda ldftn ldind.i ldind.i1 ldind.i2 ldind.i4 ldind.i8 ldind.r4 ldind.r8 \
+ldind.ref ldind.u1 ldind.u2 ldind.u4 ldlen ldloc ldloc.0 ldloc.1 ldloc.2 \
+ldloc.3 ldloc.s ldloca ldloca.s ldnull ldobj ldsfld ldsflda ldstr ldtoken \
+ldvirtftn leave leave.s localloc mkrefany mul mul.ovf mul.ovf.un neg newarr \
+newobj no. nop not or pop readonly. refanytype refanyval rem rem.un ret \
+rethrow shl shr shr.un sizeof starg starg.s stelem stelem.i stelem.i1 \
+stelem.i2 stelem.i4 stelem.i8 stelem.r4 stelem.r8 stelem.ref stfld stind.i \
+stind.i1 stind.i2 stind.i4 stind.i8 stind.r4 stind.r8 stind.ref stloc stloc.0 \
+stloc.1 stloc.2 stloc.3 stloc.s stobj stsfld sub sub.ovf sub.ovf.un switch \
+tail. throw unaligned. unbox unbox.any volatile. xor
+
+# Set lexer keywords
+keywords.$(file.patterns.cil)=$(keywordclass.cil.main)
+keywords2.$(file.patterns.cil)=$(keywordclass.cil.metadata)
+keywords3.$(file.patterns.cil)=$(keywordclass.cil.opcode)
+
+# Comment insertion
+comment.block.cil=//
+comment.stream.start.cil=/*
+comment.stream.end.cil=*/
+comment.box.start.cil=/*
+comment.box.middle.cil= *
+comment.box.end.cil=*/
+
+# Auto indentation
+block.start.$(file.patterns.cil)=8 {
+block.end.$(file.patterns.cil)=8 }
+
+# Folding
+fold.cil.comment.multiline=0
+
+# Lexer styling
+# Default/uncategorized
+style.cil.0=fore:#000000
+# Stream comment
+style.cil.1=$(colour.code.comment.box),$(font.comment)
+# Line comment
+style.cil.2=$(colour.code.comment.line),$(font.comment)
+# Word 1
+style.cil.3=fore:#00007F,bold
+# Word 2
+style.cil.4=fore:#C80000,bold
+# Word 3
+style.cil.5=fore:#0040E0
+# String
+style.cil.6=fore:#7F007F
+# Label
+style.cil.7=fore:#808080
+# Operator
+style.cil.8=$(colour.operator),bold
+# Identifier
+style.cil.9=fore:#000000
+# End of line where string is not closed
+style.cil.10=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+
+if PLAT_WIN
+    # https://docs.microsoft.com/en-us/dotnet/framework/tools/ilasm-exe-il-assembler
+    command.compile.$(file.patterns.cil)=ilasm /nologo $(FileNameExt)
+    command.compile.subsystem.$(file.patterns.cil)=1
+    
+    command.go.$(file.patterns.cil)=$(FileName).exe
+    command.go.subsystem.$(file.patterns.cil)l=1
+    
+    command.help.$(file.patterns.cil)=ilasm /?
\ No newline at end of file
diff --git a/scite-app/scite/src/cmake.properties b/scite-app/scite/src/cmake.properties
new file mode 100644
index 0000000..d6bc58f
--- /dev/null
+++ b/scite-app/scite/src/cmake.properties
@@ -0,0 +1,274 @@
+# Define SciTE settings for CMake.
+# contributed by Cristian Adam <cristian dot adam at gmx dot net>
+
+filter.cmake=CMake (CMakeLists.txt cmake ctest)|CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in|
+*filter.cmake=$(filter.cmake)
+file.patterns.cmake=CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in
+lexer.$(file.patterns.cmake)=cmake
+*language.cmake=CMake|cmake||
+
+# Commands:
+keywords.$(file.patterns.cmake)= add_custom_command \
+add_compile_definitions \
+add_compile_options \
+add_custom_command \
+add_custom_target \
+add_definitions \
+add_dependencies \
+add_executable \
+add_library \
+add_link_options \
+add_subdirectory \
+add_test \
+aux_source_directory \
+build_command \
+build_name \
+cmake_minimum_required \
+configure_file \
+create_test_sourcelist \
+else \
+elseif \
+enable_language \
+enable_testing \
+endforeach \
+endfunction \
+endif \
+endmacro \
+endwhile \
+exec_program \
+execute_process \
+export \
+export_library_dependencies \
+file \
+find_file \
+find_library \
+find_package \
+find_path \
+find_program \
+fltk_wrap_ui \
+foreach \
+function \
+get_cmake_property \
+get_directory_property \
+get_filename_component \
+get_source_file_property \
+get_target_property \
+get_test_property \
+if \
+include \
+include_directories \
+include_external_msproject \
+include_regular_expression \
+install \
+install_files \
+install_programs \
+install_targets \
+link_directories \
+link_libraries \
+list \
+load_cache \
+load_command \
+macro \
+make_directory \
+mark_as_advanced \
+math \
+message \
+option \
+output_required_files \
+project \
+qt_wrap_cpp \
+qt_wrap_ui \
+remove \
+remove_definitions \
+separate_arguments \
+set \
+set_directory_properties \
+set_source_files_properties \
+set_target_properties \
+set_tests_properties \
+site_name \
+source_group \
+string \
+subdir_depends \
+subdirs \
+target_compile_definitions \
+target_compile_features \
+target_compile_options \
+target_include_directories \
+target_link_directories \
+target_link_libraries \
+target_link_options \
+target_sources \
+try_compile \
+try_run \
+use_mangled_mesa \
+utility_source \
+variable_requires \
+vtk_make_instantiator \
+vtk_wrap_java \
+vtk_wrap_python \
+vtk_wrap_tcl \
+while \
+write_file
+
+# Variables:
+keywords2.$(file.patterns.cmake)= ABSOLUTE \
+ABSTRACT \
+ADDITIONAL_MAKE_CLEAN_FILES \
+ALL \
+AND \
+APPEND \
+ARGS \
+ASCII \
+BEFORE \
+CACHE \
+CACHE_VARIABLES \
+CLEAR \
+COMMAND \
+COMMANDS \
+COMMAND_NAME \
+COMMENT \
+COMPARE \
+COMPILE_FLAGS \
+COPYONLY \
+DEFINED \
+DEFINE_SYMBOL \
+DEPENDS \
+DOC \
+EQUAL \
+ESCAPE_QUOTES \
+EXCLUDE \
+EXCLUDE_FROM_ALL \
+EXISTS \
+EXPORT_MACRO \
+EXT \
+EXTRA_INCLUDE \
+FATAL_ERROR \
+FILE \
+FILES \
+FORCE \
+FUNCTION \
+GENERATED \
+GLOB \
+GLOB_RECURSE \
+GREATER \
+GROUP_SIZE \
+HEADER_FILE_ONLY \
+HEADER_LOCATION \
+IMMEDIATE \
+INCLUDES \
+INCLUDE_DIRECTORIES \
+INCLUDE_INTERNALS \
+INCLUDE_REGULAR_EXPRESSION \
+LESS \
+LINK_DIRECTORIES \
+LINK_FLAGS \
+LOCATION \
+MACOSX_BUNDLE \
+MACROS \
+MAIN_DEPENDENCY \
+MAKE_DIRECTORY \
+MATCH \
+MATCHALL \
+MATCHES \
+MODULE \
+NAME \
+NAME_WE \
+NOT \
+NOTEQUAL \
+NO_SYSTEM_PATH \
+OBJECT_DEPENDS \
+OPTIONAL \
+OR \
+OUTPUT \
+OUTPUT_VARIABLE \
+PATH \
+PATHS \
+POST_BUILD \
+POST_INSTALL_SCRIPT \
+PREFIX \
+PREORDER \
+PRE_BUILD \
+PRE_INSTALL_SCRIPT \
+PRE_LINK \
+PROGRAM \
+PROGRAM_ARGS \
+PROPERTIES \
+QUIET \
+RANGE \
+READ \
+REGEX \
+REGULAR_EXPRESSION \
+REPLACE \
+REQUIRED \
+RETURN_VALUE \
+RUNTIME_DIRECTORY \
+SEND_ERROR \
+SHARED \
+SOURCES \
+STATIC \
+STATUS \
+STREQUAL \
+STRGREATER \
+STRLESS \
+SUFFIX \
+TARGET \
+TOLOWER \
+TOUPPER \
+VAR \
+VARIABLES \
+VERSION \
+WIN32 \
+WRAP_EXCLUDE \
+WRITE \
+APPLE  \
+MINGW \
+MSYS \
+CYGWIN  \
+BORLAND \
+WATCOM \
+MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 CMAKE_COMPILER_2005 \
+OFF ON \
+
+#User defined:
+#keywords3.$(file.patterns.cmake)=MyFunction MySomethingElse
+
+# Block and indenting
+statement.indent.$(file.patterns.cmake)=5 if while foreach macro
+comment.block.cmake=#~
+comment.block.at.line.start.cmake=1
+calltip.cmake.ignorecase=1
+calltip.cmake.parameters.start=(
+calltip.cmake.parameters.separators=,
+calltip.cmake.parameters.end=)
+
+# Whitespace (SCE_CMAKE_DEFAULT)
+style.cmake.0=fore:#000000,$(font.base)
+# Comment (SCE_CMAKE_COMMENT)
+style.cmake.1=fore:#007F00,$(font.comment)
+# String double quote (SCE_CMAKE_STRINGDQ)
+style.cmake.2=fore:#7F007F,back:#EEEEEE
+# String left quote (SCE_CMAKE_STRINGLQ)
+style.cmake.3=fore:#7F007F,back:#EEEEEE
+# String right quote (SCE_CMAKE_STRINGRQ)
+style.cmake.4=fore:#7F007F,back:#EEEEEE
+# Function (SCE_CMAKE_COMMANDS)
+style.cmake.5=fore:#00007F,bold
+# Variable (SCE_CMAKE_ARGUMENTS)
+style.cmake.6=fore:#800000
+# Label (SCE_CMAKE_VARIABLE)
+style.cmake.7=fore:#CC3300
+# User Defined (SCE_CMAKE_USERDEFINED)
+style.cmake.8=fore:#000000
+# Section (SCE_CMAKE_WHILEDEF)
+style.cmake.9=fore:#00007F,bold
+# Sub section (SCE_CMAKE_FOREACHDEF)
+style.cmake.10=fore:#00007F,bold
+# If def (SCE_CMAKE_IFDEFINEDEF)
+style.cmake.11=fore:#00007F,bold
+# Macro def (SCE_CMAKE_MACRODEF)
+style.cmake.12=fore:#00007F,bold
+# Variable within string (SCE_CMAKE_STRINGVAR)
+style.cmake.13=fore:#CC3300,back:#EEEEEE
+# Numbers (SCE_CMAKE_NUMBER)
+style.cmake.14=$(colour.number)
\ No newline at end of file
diff --git a/scite-app/scite/src/cobol.properties b/scite-app/scite/src/cobol.properties
new file mode 100644
index 0000000..4332ca7
--- /dev/null
+++ b/scite-app/scite/src/cobol.properties
@@ -0,0 +1,87 @@
+# Define SciTE settings for COBOL files.
+
+file.patterns.COBOL=*.cob;*.cbl;*.cpy;*.copy
+filter.cobol=COBOL (cob cbl cpy copy)|$(file.patterns.COBOL)|
+*filter.cobol=$(filter.cobol)
+
+lexer.$(file.patterns.COBOL)=COBOL
+
+*language.cobol=COBOL|cob||
+
+word.characters.$(file.patterns.COBOL)=$(chars.alpha)$(chars.numeric)$(chars.accented)_-
+
+# These keywords are case insensitive
+# note: used as "declarations" - grouping of main divisions/sections + EXEC
+keywords.$(file.patterns.COBOL)=configuration data declaratives division environment file file-control function function-id i-o i-o-control identification input input-output linkage local-storage output procedure program program-id screen section special-names working-storage exec end-exec .
+# note: used as "instructions" - statements (known to GnuCOBOL) + else/when/also + intrinsic function names
+keywords2.$(file.patterns.COBOL)=accept add allocate alter call cancel close commit compute continue delete destroy disable display divide enable entry evaluate also when exit free generate go to goback if else initialize initiate inquire invoke inspect merge modify move multiply next sentence \
+open perform purge raise read ready receive release reset resume return rewrite rollback search send set sort start stop string subtract suppress terminate transform unlock unstring use validate write \
+end-accept end-add end-call end-compute end-delete end-display end-divide end-evaluate end-if end-multiply end-of-page end-perform end-read end-receive end-return end-rewrite end-search end-start end-string end-subtract end-unstring end-write \
+copy replace \
+abs acos annuity asin atan boolean-of-integer byte-length char char-national combined-datetime concatenate cos currency-symbol current-date date-of-integer date-to-yyyymmdd day-of-integer day-to-yyyyddd display-of \
+e exception-file exception-file-n exception-location exception-location-n exception-statement exception-status exp exp10 factorial formatted-current-date formatted-date formatted-datetime formatted-time fraction-part highest-algebraic \
+integer integer-of-boolean integer-of-date integer-of-day integer-of-formatted-date integer-part length length-an locale-compare locale-date locale-time locale-time-from-seconds log log10 lower-case lowest-algebraic \
+max mean median midrange min mod module-caller-id module-date module-formatted-date module-id module-path module-source module-time monetary-decimal-point monetary-thousands-separator national-of numeric-decimal-point numeric-thousands-separator numval numval-c numval-f \
+ord ord-max ord-min pi present-value random range rem reverse seconds-from-formatted-time seconds-past-midnight sign sin sqrt standard-compare standard-deviation stored-char-length substitute substitute-case sum \
+tan test-date-yyyymmdd test-day-yyyyddd test-formatted-datetime test-numval test-numval-c test-numval-f trim upper-case variance when-compiled year-to-yyyy
+# note: used as "keywords"     - figurative constants + ANSI85 obsolete entries in IDENTIFICATION DIVISION + registers & system names + all other reserved words (known to GnuCOBOL including extensions from IBM/MF/RM/ACUCOBOL) without one-char words (fsuvxy)
+keywords3.$(file.patterns.COBOL)=high-value high-values low-value low-values space spaces quote quotes zero zeroes zeros \
+author date-compiled date-modified date-written installation remarks security \
+cob-crt-status debug-item debug-line debug-name debug-sub-1 debug-sub-2 debug-sub-3 debug-contents number-of-call-parameters return-code return-code-unsigned sort-return \
+tally dialect-all jnienvptr json-code linage-counter shift-in shift-out sort-control sort-core-size sort-file-size sort-message sort-mode-size \
+xml-code xml-event xml-information xml-namespace xml-namespace-prefix xml-nnamespace xml-nnamespace-prefix xml-ntext xml-text \
+sysin sysipt stdin sysout syslist syslst stdout print printer printer-1 syserr stderr console c01 c02 c03 c04 c05 c06 c07 c08 c09 c10 c11 c12 csp formfeed call-convention \
+switch-0 switch-1 switch-2 switch-3 switch-4 switch-5 switch-6 switch-7 switch-8 switch-9 switch-10 switch-11 switch-12 switch-13 switch-14 switch-15 switch-16 switch-17 switch-18 \
+switch-19 switch-20 switch-21 switch-22 switch-23 switch-24 switch-25 switch-26 switch-27 switch-28 switch-29 switch-30 switch-31 switch-32 switch-33 switch-34 switch-35 switch-36 \
+upsi-0 upsi-1 upsi-2 upsi-3 upsi-4 upsi-5 upsi-6 upsi-7 \
+access active-class address advancing after aligned all alphabet alphabetic alphabetic-lower alphabetic-upper alphanumeric alphanumeric-edited alternate and any anycase are area areas as ascending assign at automatic \
+b-and b-not b-or b-xor based before binary binary-char binary-double binary-long binary-sequential binary-short bit blank block boolean bottom by \
+cd cf ch character characters class class-id clock-units code-set col collating cols column columns comma common communication comp comp-3 comp-5 computational computational-3 computational-5 condition constant contains content control controls converting corr corresponding count crt currency cursor \
+data-pointer date day day-of-week de debugging decimal-point default delimited delimiter depending descending destination detail down duplicates dynamic ec egi emi end enter eo eop equal equals error esi every exception exception-object exclusive extend external \
+factory false farthest-from-zero fd filler final first float-binary-128 float-binary-32 float-binary-64 float-decimal-16 float-decimal-34 float-extended float-infinity float-long float-not-a-number-quiet float-not-a-number-signaling float-short footing for format from function-pointer \
+get giving global greater group group-usage heading in in-arithmetic-range index indexed indicate inherits initial initialized interface interface-id into invalid is just justified key label last leading left less limit limits linage line line-counter line-sequential lines locale lock \
+manual message method method-id minus mode modules multiple national national-edited native nearest-to-zero negative negative-infinity nested no not null number numbers numeric numeric-edited\
+object object-computer object-reference occurs of off omitted on only optional options or order organization other overflow override \
+packed-decimal padding page page-counter pf ph physical pic picture plus pointer position positive positive-infinity present previous printing procedures proceed program-pointer property prototype queue \
+raising rd record records redefines reel reference references relative remainder removal renames replacing report reporting reports repository rerun reserve retry returning reversed rewind rf rh right rounded run \
+same sd segment segment-limit select self separate sequence sequential sharing signed size sort-merge source source-computer sources standard standard-1 standard-2 status step sub-queue-1 sub-queue-2 sub-queue-3 super symbolic sync synchronized system-default \
+table tallying terminal test text than then through thru time times top trailing true type typedef unit universal unsigned until up upon usage user-default using val-status valid validate-status value values varying with words \
+arithmetic attribute auto away-from-zero background-color bell binary-c-long binary-encoding blink capacity center chaining classification cobol comp-1 comp-4 comp-6 comp-x computational-1 computational-4 computational-6 computational-x cycle \
+decimal-encoding entry-convention eol eos erase expands float-binary float-decimal float-not-a-number foreground-color forever full high-order-left high-order-right highlight ignoring implements intermediate intrinsic lc_all lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time lowlight \
+memory nearest-away-from-zero nearest-even-intermediate nearest-toward-zero none normal \
+paragraph prefixed prohibited recursive relation required reverse-video rounding seconds secure short standard-binary standard-decimal statement strong structure symbol tape toward-greater toward-lesser truncation ucs-4 underline utf-16 utf-8 yyyyddd yyyymmdd \
+3-d apply background background-high background-low bar blob bold box busy cbl clob combo-box dbclob dbcs draw drop grid grip high hot-track hscroll hscroll-pos id imp kanji low num-rows o-fill oostackptr pos prompt public rowid scroll scroll-bar shadow skip1 skip2 skip3 sql \
+tab track-thumb unbounded variant virtual-width vscroll vscroll-bar vscroll-pos wait width wrap xml
+
+# COBOL styles
+# 2,Line Comment|3,Doc Comment|4,Number|5,Keyword (A)|6,String|7,Character|8,Extended keyword|9,Preprocessor|10,Operator
+# 11,Identifier|16,Keyword (B)
+
+# Note: all non-comment fonts are forced to monospace
+style.COBOL.0=fore:#808080,$(font.monospace)
+
+# Line comment
+style.COBOL.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment
+style.COBOL.3=$(colour.code.comment.document),$(font.code.comment.document)
+# Number
+style.COBOL.4=$(colour.number),$(font.monospace)
+# Keyword (A)
+style.COBOL.5=$(colour.keyword),bold,$(font.monospace)
+# String
+style.COBOL.6=$(colour.string),$(font.monospace)
+# Character
+style.COBOL.7=$(colour.char),$(font.monospace)
+# Extended keyword
+style.COBOL.8=$(colour.keyword),bold,$(font.monospace)
+# Preprocessor
+style.COBOL.9=$(colour.preproc),$(font.preproc)
+# Operators
+style.COBOL.10=$(colour.operator),bold,$(font.monospace)
+# Identifier
+style.COBOL.11=$(colour.identifier),$(font.identifier),$(font.monospace)
+# Keyword (B)
+style.COBOL.16=$(colour.keyword),bold,$(font.monospace)
+
+
+
diff --git a/scite-app/scite/src/coffeescript.properties b/scite-app/scite/src/coffeescript.properties
new file mode 100644
index 0000000..43d7dff
--- /dev/null
+++ b/scite-app/scite/src/coffeescript.properties
@@ -0,0 +1,61 @@
+# Define SciTE settings for CoffeeScript files.
+
+filter.coffeescript=CoffeeScript (coffee)|*.coffee|
+
+file.patterns.coffeescript=*.coffee
+
+lexer.$(file.patterns.coffeescript)=coffeescript
+
+style.coffeescript.32=$(font.base)
+# White space
+style.coffeescript.0=fore:#808080
+# SCE_COFFEESCRIPT_COMMENT allocated but unused
+style.coffeescript.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment
+style.coffeescript.2=$(colour.code.comment.line),$(font.code.comment.line)
+# SCE_COFFEESCRIPT_COMMENTDOC allocated but unused
+style.coffeescript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Number
+style.coffeescript.4=$(colour.number)
+# Keyword
+style.coffeescript.5=$(colour.keyword),bold
+# Double quoted string
+style.coffeescript.6=$(colour.string)
+# Single quoted string
+style.coffeescript.7=$(colour.char)
+# SCE_COFFEESCRIPT_UUID allocated but unused
+style.coffeescript.8=fore:#804080
+# SCE_COFFEESCRIPT_PREPROCESSOR allocated but unused
+style.coffeescript.9=$(colour.preproc)
+# Operators
+style.coffeescript.10=$(colour.operator),bold
+# Identifiers
+style.coffeescript.11=
+# SCE_COFFEESCRIPT_STRINGEOL allocated but unused
+style.coffeescript.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# SCE_COFFEESCRIPT_VERBATIM allocated but unused
+style.coffeescript.13=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+# Regular expressions
+style.coffeescript.14=fore:#3F7F3F,$(font.monospace),back:#E0F0FF,eolfilled
+# SCE_COFFEESCRIPT_COMMENTLINEDOC allocated but unused
+style.coffeescript.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Keywords2
+style.coffeescript.16=fore:#B00040
+# SCE_COFFEESCRIPT_COMMENTDOCKEYWORD allocated but unused
+style.coffeescript.17=fore:#3060A0,$(font.code.comment.doc)
+# SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR allocated but unused
+style.coffeescript.18=fore:#804020,$(font.code.comment.doc)
+# Global class
+style.coffeescript.19=fore:#DD9900
+# SCE_COFFEESCRIPT_STRINGRAW allocated but unused
+style.coffeescript.20=$(colour.string),back:#FFF3FF,eolfilled
+# SCE_COFFEESCRIPT_TRIPLEVERBATIM allocated but unused
+style.coffeescript.21=$(font.monospace),fore:#007F00,back:#E0FFE0,eolfilled
+# Comment block ###
+style.coffeescript.22=$(font.monospace),fore:#007F00,back:#E7FFD7,eolfilled
+# Verbose REGEX
+style.coffeescript.23=fore:#659900
+# Verbose REGEX comment
+style.coffeescript.24=$(colour.code.comment.doc)
+# Iinstance property
+style.coffeescript.25=fore:#C06000
diff --git a/scite-app/scite/src/conf.properties b/scite-app/scite/src/conf.properties
new file mode 100644
index 0000000..bc3fd43
--- /dev/null
+++ b/scite-app/scite/src/conf.properties
@@ -0,0 +1,162 @@
+# Define SciTE settings for Apache Configuration files.
+# contributed by Ahmad Zawawi <zeus_go64@hotmail.com>
+
+file.patterns.conf=*.conf;.htaccess
+*source.patterns.conf=$(file.patterns.conf);
+filter.conf=Apache Conf (conf)|$(file.patterns.conf)|
+*filter.apacheconfig=$(filter.conf)
+lexer.$(file.patterns.conf)=conf
+#*language.apacheconfig=Apache Confi&g|conf||
+# for future implemention...
+#api.$(file.patterns.conf)=conf.api
+
+# Keywords for Apache's Runtime directives
+keywords.$(file.patterns.conf)=\
+acceptmutex acceptpathinfo accessconfig accessfilename \
+action addalt addaltbyencoding addaltbytype addcharset \
+adddefaultcharset adddescription addencoding \
+addhandler addicon addiconbyencoding addiconbytype \
+addinputfilter addlanguage addmodule addmoduleinfo \
+addoutputfilter addoutputfilterbytype addtype agentlog \
+alias aliasmatch all allow allowconnect \
+allowencodedslashes allowoverride anonymous \
+anonymous_authoritative anonymous_logemail \
+anonymous_mustgiveemail anonymous_nouserid \
+anonymous_verifyemail assignuserid authauthoritative \
+authdbauthoritative authdbgroupfile \
+authdbmauthoritative authdbmgroupfile authdbmtype \
+authdbmuserfile authdbuserfile authdigestalgorithm \
+authdigestdomain authdigestfile authdigestgroupfile \
+authdigestnccheck authdigestnonceformat \
+authdigestnoncelifetime authdigestqop \
+authdigestshmemsize authgroupfile \
+authldapauthoritative authldapbinddn \
+authldapbindpassword authldapcharsetconfig \
+authldapcomparednonserver authldapdereferencealiases \
+authldapenabled authldapfrontpagehack \
+authldapgroupattribute authldapgroupattributeisdn \
+authldapremoteuserisdn authldapurl authname authtype \
+authuserfile bindaddress browsermatch \
+browsermatchnocase bs2000account bufferedlogs \
+cachedefaultexpire cachedirlength cachedirlevels \
+cachedisable cacheenable cacheexpirycheck cachefile \
+cacheforcecompletion cachegcclean cachegcdaily \
+cachegcinterval cachegcmemusage cachegcunused \
+cacheignorecachecontrol cacheignoreheaders \
+cacheignorenolastmod cachelastmodifiedfactor \
+cachemaxexpire cachemaxfilesize cacheminfilesize \
+cachenegotiateddocs cacheroot cachesize \
+cachetimemargin cgimapextension charsetdefault \
+charsetoptions charsetsourceenc checkspelling \
+childperuserid clearmodulelist contentdigest \
+cookiedomain cookieexpires cookielog cookiename \
+cookiestyle cookietracking coredumpdirectory customlog \
+dav davdepthinfinity davlockdb davmintimeout \
+defaulticon defaultlanguage defaulttype define \
+deflatebuffersize deflatecompressionlevel \
+deflatefilternote deflatememlevel deflatewindowsize \
+deny directory directoryindex directorymatch \
+directoryslash documentroot dumpioinput dumpiooutput \
+enableexceptionhook enablemmap enablesendfile \
+errordocument errorlog example expiresactive \
+expiresbytype expiresdefault extendedstatus \
+extfilterdefine extfilteroptions fancyindexing \
+fileetag files filesmatch forcelanguagepriority \
+forcetype forensiclog from group header headername \
+hostnamelookups identitycheck ifdefine ifmodule \
+imapbase imapdefault imapmenu include indexignore \
+indexoptions indexorderdefault isapiappendlogtoerrors \
+isapiappendlogtoquery isapicachefile isapifakeasync \
+isapilognotsupported isapireadaheadbuffer keepalive \
+keepalivetimeout languagepriority ldapcacheentries \
+ldapcachettl ldapconnectiontimeout ldapopcacheentries \
+ldapopcachettl ldapsharedcachefile ldapsharedcachesize \
+ldaptrustedca ldaptrustedcatype limit limitexcept \
+limitinternalrecursion limitrequestbody \
+limitrequestfields limitrequestfieldsize \
+limitrequestline limitxmlrequestbody listen \
+listenbacklog loadfile loadmodule location \
+locationmatch lockfile logformat loglevel maxclients \
+maxkeepaliverequests maxmemfree maxrequestsperchild \
+maxrequestsperthread maxspareservers maxsparethreads \
+maxthreads maxthreadsperchild mcachemaxobjectcount \
+mcachemaxobjectsize mcachemaxstreamingbuffer \
+mcacheminobjectsize mcacheremovalalgorithm mcachesize \
+metadir metafiles metasuffix mimemagicfile \
+minspareservers minsparethreads mmapfile \
+modmimeusepathinfo multiviewsmatch namevirtualhost \
+nocache noproxy numservers nwssltrustedcerts \
+nwsslupgradeable options order passenv pidfile port \
+protocolecho proxy proxybadheader proxyblock \
+proxydomain proxyerroroverride proxyiobuffersize \
+proxymatch proxymaxforwards proxypass proxypassreverse \
+proxypreservehost proxyreceivebuffersize proxyremote \
+proxyremotematch proxyrequests proxytimeout proxyvia \
+qsc readmename redirect redirectmatch \
+redirectpermanent redirecttemp refererignore \
+refererlog removecharset removeencoding removehandler \
+removeinputfilter removelanguage removeoutputfilter \
+removetype requestheader require resourceconfig \
+rewritebase rewritecond rewriteengine rewritelock \
+rewritelog rewriteloglevel rewritemap rewriteoptions \
+rewriterule rlimitcpu rlimitmem rlimitnproc satisfy \
+scoreboardfile script scriptalias scriptaliasmatch \
+scriptinterpretersource scriptlog scriptlogbuffer \
+scriptloglength scriptsock securelisten sendbuffersize \
+serveradmin serveralias serverlimit servername \
+serverpath serverroot serversignature servertokens \
+servertype setenv setenvif setenvifnocase sethandler \
+setinputfilter setoutputfilter singlelisten ssiendtag \
+ssierrormsg ssistarttag ssitimeformat ssiundefinedecho \
+sslcacertificatefile sslcacertificatepath \
+sslcarevocationfile sslcarevocationpath \
+sslcertificatechainfile sslcertificatefile \
+sslcertificatekeyfile sslciphersuite sslengine \
+sslmutex ssloptions sslpassphrasedialog sslprotocol \
+sslproxycacertificatefile sslproxycacertificatepath \
+sslproxycarevocationfile sslproxycarevocationpath \
+sslproxyciphersuite sslproxyengine \
+sslproxymachinecertificatefile \
+sslproxymachinecertificatepath sslproxyprotocol \
+sslproxyverify sslproxyverifydepth sslrandomseed \
+sslrequire sslrequiressl sslsessioncache \
+sslsessioncachetimeout sslusername sslverifyclient \
+sslverifydepth startservers startthreads \
+suexecusergroup threadlimit threadsperchild \
+threadstacksize timeout transferlog typesconfig \
+unsetenv usecanonicalname user userdir \
+virtualdocumentroot virtualdocumentrootip virtualhost \
+virtualscriptalias virtualscriptaliasip \
+win32disableacceptex xbithack
+
+#common parameters for Apache runtime configuration
+keywords2.$(file.patterns.conf)=\
+on off standalone inetd \
+force-response-1.0 downgrade-1.0 nokeepalive \
+indexes includes followsymlinks none \
+x-compress x-gzip
+
+# whitespace (SCE_CONF_DEFAULT)
+style.conf.0=fore:#808080,$(font.base)
+# Comment (SCE_CONF_COMMENT)
+style.conf.1=fore:#007F00,$(font.comment)
+# Number (SCE_CONF_NUMBER)
+style.conf.2=fore:#007F7F
+# identifier (SCE_CONF_IDENTIFIER)
+style.conf.9=fore:#00007F,bold
+# extensions (like .gz, .tgz, .html) (SCE_CONF_EXTENSION)
+style.conf.4=fore:#000000,back:#FFE0FF
+# parameters for Apache Runtime directives (SCE_CONF_PARAMETER)
+style.conf.5=fore:#000000,back:#FFE0FF
+# Double quoted string (SCE_CONF_STRING)
+style.conf.6=fore:#7F007F,$(font.monospace)
+# Operators (SCE_CONF_OPERATOR)
+style.conf.7=bold
+# IP address (SCE_CONF_IP)
+style.conf.8=fore:#007F7F,bold
+# Apache Runtime Directive (SCE_CONF_DIRECTIVE)
+style.conf.3=fore:#000000,back:#A0FFA0
+
+# compiling/building simply checks for the correct symantics....
+command.compile.$(file.patterns.conf)=httpd -t -f $(FilePath)
+command.build.$(file.patterns.conf)=httpd -t -f $(FilePath)
diff --git a/scite-app/scite/src/cpp.properties b/scite-app/scite/src/cpp.properties
new file mode 100644
index 0000000..15729fc
--- /dev/null
+++ b/scite-app/scite/src/cpp.properties
@@ -0,0 +1,551 @@
+# Define SciTE settings for C++, C, C#, Ch, Java, IDL, JavaScript, Flash (ActionScript 2) files.
+
+# sma files are Small script (C-like)
+file.patterns.cpp=*.c;*.cc;*.cpp;*.cxx;*.h;*.hh;*.hpp;*.hxx;*.ipp;*.m;*.mm;*.sma
+file.patterns.cplusplus=*.cc;*.cpp;*.cxx
+# jad = decompiled class files; pde = Processing.org sketch files
+file.patterns.java=*.java;*.jad;*.pde
+# pln, inc and t are SilkTest (4Test) files.
+file.patterns.test=*.pln;*.inc;*.t
+# es = JS dialect of Abobe for SVG
+file.patterns.js=*.js;*.es;*.ts;*.jse;*.jsm;*.mjs;*.qs
+file.patterns.cs=*.cs
+file.patterns.rc=*.rc;*.rc2;*.dlg
+file.patterns.idl=*.idl;*.odl
+file.patterns.flash=*.as;*.asc;*.jsfl
+file.patterns.ch=*.ch;*.chf;*.chs
+file.patterns.vala=*.vala
+file.patterns.go=*.go
+file.patterns.pike=*.pike
+file.patterns.swift=*.swift
+file.patterns.c.like=$(file.patterns.cpp);$(file.patterns.cs);$(file.patterns.idl);$(file.patterns.java);$(file.patterns.js);$(file.patterns.flash);$(file.patterns.ch);$(file.patterns.vala);$(file.patterns.pike)
+file.patterns.meson=meson.build
+
+*source.patterns.cpp=$(file.patterns.c.like);
+*source.patterns.resource=$(file.patterns.rc);*.def;
+
+shbang.tcc=cpp
+shbang.tinycc=cpp
+
+filter.cpp=C/C++ (c cc cpp cxx cs vala h hh hxx hpp ipp dlg rc rc2 mak)|\
+$(file.patterns.cpp);$(file.patterns.cs);$(file.patterns.rc);$(file.patterns.vala);*.mak;make*|
+filter.java=Java (java)|*.java|
+filter.js=JavaScript (js es ts)|$(file.patterns.js)|
+filter.idl=IDL (idl odl)|$(file.patterns.idl)|
+filter.test=SilkTest (pln inc t)|$(file.patterns.test)|
+filter.flash=Flash (as asc jsfl)|$(file.patterns.flash)|
+filter.ch=Ch (ch chf chs)|$(file.patterns.ch)|
+filter.go=Go (go)|$(file.patterns.go)|
+filter.pike=Pike (pike)|$(file.patterns.pike)|
+filter.swift=Swift (swift)|$(file.patterns.swift)|
+
+*filter.cpp=$(filter.cpp)
+*filter.java=$(filter.java)
+*filter.javascript=$(filter.js)
+*filter.idl=$(filter.idl)
+
+lexer.$(file.patterns.java)=cpp
+lexer.$(file.patterns.cpp)=cpp
+lexer.$(file.patterns.rc)=cpp
+lexer.$(file.patterns.idl)=cpp
+lexer.$(file.patterns.cs)=cpp
+lexer.$(file.patterns.js)=cpp
+lexer.$(file.patterns.test)=cpp
+lexer.$(file.patterns.flash)=cpp
+lexer.$(file.patterns.ch)=cpp
+lexer.$(file.patterns.vala)=cpp
+lexer.$(file.patterns.go)=cpp
+lexer.$(file.patterns.pike)=cpp
+lexer.$(file.patterns.swift)=cpp
+lexer.$(file.patterns.meson)=cpp
+
+*language.c=&C / C++|c||
+*language.csharp=C&#|cs||
+*language.java=&Java|java||
+*language.javascript=Java&Script|js||
+#*language.resource=Reso&urce|rc||
+
+keywordclass.cpp=alignas alignof and and_eq asm audit auto axiom bitand bitor bool break \
+case catch char char8_t char16_t char32_t class compl concept \
+const consteval constexpr const_cast continue co_await co_return co_yield \
+decltype default delete do double dynamic_cast else enum explicit export extern false final float for \
+friend goto if import inline int long module mutable namespace new noexcept not not_eq nullptr \
+operator or or_eq override private protected public \
+register reinterpret_cast requires return \
+short signed sizeof static static_assert static_cast struct switch \
+template this thread_local throw true try typedef typeid typename union unsigned using \
+virtual void volatile wchar_t while xor xor_eq
+
+directives.objective.c=\
+@class @defs @protocol @required @optional @end \
+@interface @public @package @protected @private @property \
+@implementation @synthesize @dynamic \
+@throw @try @catch @finally \
+@synchronized @autoreleasepool \
+@selector @encode \
+@compatibility_alias
+
+# Since Objective C and C++ share the .h extension, allow Objective C directives as keywords
+# For stricter display of pure C++, specify keywords.$(file.patterns.cpp)=$(keywordclass.cpp)
+keywords.$(file.patterns.cpp)=$(keywordclass.cpp) $(directives.objective.c)
+
+# keywords2 is for highlighting user defined keywords or function calls or similar
+#keywords2.$(file.patterns.cpp)=file
+
+# keywords3 is for doc comment keywords, highlighted in style 17
+#CPP doxygen
+file.patterns.doxygen.langs=$(file.patterns.cpp);$(file.patterns.java)
+keywordclass.doxygen=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param param[in] param[out] \
+post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw throws todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+keywords3.$(file.patterns.doxygen.langs)=$(keywordclass.doxygen)
+
+# keywords5 is for preprocessor definitions and will cause inactive code
+# to be greyed out. This setting is a space separated list of definitions
+# where a definition may be of the form NAME=VALUE or simply NAME.
+#keywords5.$(file.patterns.cpp)=_MSC_VER SCI_NAMESPACE GTK_MAJOR_VERSION=2
+
+word.chars.cxx=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.cpp)=$(word.chars.cxx)
+calltip.cpp.word.characters=$(chars.alpha)$(chars.numeric)_
+comment.block.cpp=//~
+#comment.block.at.line.start.cpp=1
+comment.stream.start.cpp=/*
+comment.stream.end.cpp=*/
+comment.box.start.cpp=/*
+comment.box.middle.cpp= *
+comment.box.end.cpp= */
+
+# Folding
+#fold.cpp.syntax.based=0
+#fold.comment=0
+#fold.cpp.comment.multiline=0
+#fold.cpp.comment.explicit=0
+#defaults for fold.cpp.explicit.start=//{ and fold.cpp.explicit.end=//}
+#  can be replaced by defining custom strings, e.g. //[ and //]
+#fold.cpp.explicit.start=//[
+#fold.cpp.explicit.end=//]
+#if fold strings are set to something like /*{{{ and /*}}} (Origami/WinF style fold strings), enable
+#  fold.cpp.explicit.anywhere, allowing explicit fold points being anywhere, not just in line comments
+#fold.cpp.explicit.anywhere=1
+#fold.preprocessor=1
+#fold.compact=1
+#fold.at.else=1
+
+file.patterns.c.except.cpp=$(file.patterns.cs);$(file.patterns.idl);*.java;$(file.patterns.flash);$(file.patterns.ch)
+statement.indent.$(file.patterns.c.except.cpp)=5 case default do else for if while
+statement.indent.$(file.patterns.cpp)=5 case default do else for if private protected public while
+statement.end.$(file.patterns.c.like)=10 ;
+statement.lookback.$(file.patterns.c.like)=20
+block.start.$(file.patterns.c.like)=10 {
+block.end.$(file.patterns.c.like)=10 }
+
+#autocomplete.cpp.fillups=(
+
+#styling.within.preprocessor=1
+preprocessor.symbol.$(file.patterns.cpp)=#
+preprocessor.start.$(file.patterns.cpp)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.cpp)=else elif
+preprocessor.end.$(file.patterns.cpp)=endif
+
+preprocessor.symbol.$(file.patterns.cs)=#
+preprocessor.start.$(file.patterns.cs)=if region
+preprocessor.middle.$(file.patterns.cs)=else elif
+preprocessor.end.$(file.patterns.cs)=endif endregion
+
+keywordclass.ch=\
+auto array bool break case char class complex ComplexInf ComplexNaN \
+const continue default delete \
+do double else enum export extern float for foreach goto if Inf inline int \
+long namespace NaN new NULL private public register restrict return short \
+signed sizeof static string_t struct switch this typedef union unsigned \
+using void volatile wchar_t while __declspec
+keywords.$(file.patterns.ch)=$(keywordclass.ch)
+word.chars.ch=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ch)=$(word.chars.cxx)
+comment.block.ch=//~
+#comment.block.at.line.start.ch=1
+comment.stream.start.ch=/*
+comment.stream.end.ch=*/
+comment.box.start.ch=/*
+comment.box.middle.ch= *
+comment.box.end.ch= */
+preprocessor.symbol.$(file.patterns.ch)=#
+preprocessor.start.$(file.patterns.ch)=if ifdef ifndef
+preprocessor.middle.$(file.patterns.ch)=else elif
+preprocessor.end.$(file.patterns.ch)=endif
+
+keywordclass.cs=abstract as ascending base bool break by byte case catch char checked \
+class const continue decimal default delegate descending do double else enum \
+equals event explicit extern false finally fixed float for foreach from goto group if \
+implicit in int interface internal into is join lock let long namespace new null \
+object on operator orderby out override params private protected public \
+readonly ref return sbyte sealed select short sizeof stackalloc static \
+string struct switch this throw true try typeof uint ulong \
+unchecked unsafe ushort using var virtual void volatile where while
+keywords.$(file.patterns.cs)=$(keywordclass.cs)
+word.characters.$(file.patterns.cs)=$(word.chars.cxx)
+
+keywordclass.go=\
+bool byte break case chan complex64 complex128 const continue defer default  \
+else  for func go goto fallthrough false float32 float64 if import int interface int8 int16 int32 int64 \
+len map nil package range return select string struct switch true type \
+uint uintptr uint8 uint16 uint32 uint64  var
+keywords.$(file.patterns.go)=$(keywordclass.go)
+
+keywordclass.rc=\
+ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON \
+BEGIN BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS \
+COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX DISCARDABLE \
+EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE LISTBOX LTEXT \
+MENU MENUEX MENUITEM MESSAGETABLE POPUP \
+PUSHBUTTON RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 \
+STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY
+keywords.$(file.patterns.rc)=$(keywordclass.rc)
+
+keywordclass.idl=\
+aggregatable allocate appobject arrays async async_uuid \
+auto_handle \
+bindable boolean broadcast byte byte_count \
+call_as callback char coclass code comm_status \
+const context_handle context_handle_noserialize \
+context_handle_serialize control cpp_quote custom \
+decode default defaultbind defaultcollelem \
+defaultvalue defaultvtable dispinterface displaybind dllname \
+double dual \
+enable_allocate encode endpoint entry enum error_status_t \
+explicit_handle \
+fault_status first_is float \
+handle_t heap helpcontext helpfile helpstring \
+helpstringcontext helpstringdll hidden hyper \
+id idempotent ignore iid_as iid_is immediatebind implicit_handle \
+import importlib in include in_line int __int64 __int3264 interface \
+last_is lcid length_is library licensed local long \
+max_is maybe message methods midl_pragma \
+midl_user_allocate midl_user_free min_is module ms_union \
+ncacn_at_dsp ncacn_dnet_nsp ncacn_http ncacn_ip_tcp \
+ncacn_nb_ipx ncacn_nb_nb ncacn_nb_tcp ncacn_np \
+ncacn_spx ncacn_vns_spp ncadg_ip_udp ncadg_ipx ncadg_mq \
+ncalrpc nocode nonbrowsable noncreatable nonextensible notify \
+object odl oleautomation optimize optional out out_of_line \
+pipe pointer_default pragma properties propget propput propputref \
+ptr public \
+range readonly ref represent_as requestedit restricted retval \
+shape short signed size_is small source strict_context_handle \
+string struct switch switch_is switch_type \
+transmit_as typedef \
+uidefault union unique unsigned user_marshal usesgetlasterror uuid \
+v1_enum vararg version void wchar_t wire_marshal
+
+keywordclass.msidl=handle
+keywordclass.xpidl=attribute native noscript scriptable shared wstring inout
+keywords.$(file.patterns.idl)=$(keywordclass.idl) $(keywordclass.xpidl)
+
+# http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
+keywordclass.java=abstract assert boolean break byte case catch char class \
+const continue default do double else enum extends final finally float for \
+goto if implements import instanceof int interface long \
+native new package private protected public \
+return short static strictfp super switch synchronized this throw throws \
+transient try var void volatile while
+keywords.$(file.patterns.java)=$(keywordclass.java)
+
+keywordclass.javascript=abstract boolean break byte case catch char class \
+const continue debugger default delete do double else enum export extends \
+final finally float for function goto if implements import in instanceof \
+int interface long native new package private protected public \
+return short static super switch synchronized this throw throws \
+transient try typeof var void volatile while with
+keywords.$(file.patterns.js)=$(keywordclass.javascript)
+
+keywordclass.flash=add and break case catch class continue default delete do \
+dynamic else eq extends false finally for function ge get gt if implements import in \
+instanceof interface intrinsic le lt ne new not null or private public return \
+set static super switch this throw true try typeof undefined var void while with
+
+keywordclass2.flash=Array Arguments Accessibility Boolean Button Camera Color \
+ContextMenu ContextMenuItem Date Error Function Key LoadVars LocalConnection Math \
+Microphone Mouse MovieClip MovieClipLoader NetConnection NetStream Number Object \
+PrintJob Selection SharedObject Sound Stage String StyleSheet System TextField \
+TextFormat TextSnapshot Video Void XML XMLNode XMLSocket \
+_accProps _focusrect _global _highquality _parent _quality _root _soundbuftime \
+arguments asfunction call capabilities chr clearInterval duplicateMovieClip \
+escape eval fscommand getProperty getTimer getURL getVersion gotoAndPlay gotoAndStop \
+ifFrameLoaded Infinity -Infinity int isFinite isNaN length loadMovie loadMovieNum \
+loadVariables loadVariablesNum maxscroll mbchr mblength mbord mbsubstring MMExecute \
+NaN newline nextFrame nextScene on onClipEvent onUpdate ord parseFloat parseInt play \
+prevFrame prevScene print printAsBitmap printAsBitmapNum printNum random removeMovieClip \
+scroll set setInterval setProperty startDrag stop stopAllSounds stopDrag substring \
+targetPath tellTarget toggleHighQuality trace unescape unloadMovie unLoadMovieNum updateAfterEvent
+
+keywords.$(file.patterns.flash)=$(keywordclass.flash)
+keywords2.$(file.patterns.flash)=$(keywordclass2.flash)
+
+keywordclass.vala=if else switch case default break continue return yield for foreach in \
+do while try catch finally throw
+
+keywordclass2.vala=namespace interface class struct enum delegate signal errordomain \
+construct get set value base const static var dynamic weak unowned virtual abstract \
+override public protected private extern throws requires ensures yields out ref lock \
+using true false null delete generic new this typeof sizeof as owned int string char bool
+
+keywords.$(file.patterns.vala)=$(keywordclass.vala)
+keywords2.$(file.patterns.vala)=$(keywordclass2.vala)
+
+keywordclass.pike=constant enum if do for while else foreach case switch break continue \
+return typeof catch class lambda import inherit static void int string float mixed object \
+function program array mapping multiset
+keywords.$(file.patterns.pike)=$(keywordclass.pike)
+
+keywordclass.swift.declarations=class deinit enum extension func import init \
+internal let operator private protocol public static struct subscript typealias var
+keywordclass.swift.statements=break case continue default do else fallthrough \
+for if in return switch where while
+keywordclass.swift.expressions=as dynamicType false is nil self Self super \
+true __COLUMN__ __FILE__ __FUNCTION__ __LINE__
+# The contextual keywords are only keywords in particular contexts
+keywordclass.swift.contextual=associativity convenience dynamic didSet final get \
+infix inout lazy left mutating none nonmutating optional override postfix \
+precedence prefix Protocol required right set Type unowned weak willSet
+
+keywords.$(file.patterns.swift)=$(keywordclass.swift.declarations) \
+$(keywordclass.swift.statements) $(keywordclass.swift.expressions) \
+$(keywordclass.swift.contextual)
+
+keywords.$(file.patterns.meson)=if else elif endif
+keywords2.$(file.patterns.meson)=import meson project \
+executable static_library shared_library dependencies \
+include_directories get_option get_compiler get_id compile_resources \
+cpp_args link_args override_options name_prefix link_with
+
+# Substyles can be used for extra lists of highlighted identifiers and doc comment keywords
+# Identifiers
+#substyles.cpp.11=2
+#substylewords.11.1.$(file.patterns.cpp)=std map string vector
+#style.cpp.11.1=fore:#EE00AA
+#style.cpp.75.1=$(style.cpp.75),fore:#BB6666
+# Doc comment keywords
+#substyles.cpp.17=1
+#style.cpp.17.1=$(style.cpp.17),fore:#00AAEE
+#style.cpp.81.1=$(style.cpp.81),fore:#6699AA
+#substylewords.17.1.$(file.patterns.cpp)=check
+
+# Markers
+# keywords6.$(file.patterns.c.like)=FIXME TODO XXX HACK UnresolvedMergeConflict UNDONE
+
+#styling.within.preprocessor=1
+#lexer.cpp.allow.dollars=1
+#lexer.cpp.track.preprocessor=1
+#lexer.cpp.update.preprocessor=1
+# For C# leave lexer.cpp.verbatim.strings.allow.escapes as 0 but change to 1 for Objective C
+#lexer.cpp.verbatim.strings.allow.escapes=1
+#lexer.cpp.triplequoted.strings=1
+#lexer.cpp.hashquoted.strings=1
+#lexer.cpp.backquoted.strings=1
+#lexer.cpp.escape.sequence=1
+
+#lexer.cpp.escape.sequence=1
+
+# C++ styles
+
+# Default
+style.cpp.32=$(font.base)
+# White space
+style.cpp.0=fore:#808080
+# Comment: /* */.
+style.cpp.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: //.
+style.cpp.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment: block comments beginning with /** or /*!
+style.cpp.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Number
+style.cpp.4=$(colour.number)
+# Keyword
+style.cpp.5=$(colour.keyword),bold
+# Double quoted string
+style.cpp.6=$(colour.string)
+# Single quoted string
+style.cpp.7=$(colour.char)
+# UUIDs (only in IDL)
+style.cpp.8=fore:#804080
+# Preprocessor
+style.cpp.9=$(colour.preproc)
+# Operators
+style.cpp.10=$(colour.operator),bold
+# Identifiers
+style.cpp.11=
+# End of line where string is not closed
+style.cpp.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Verbatim strings for C#
+style.cpp.13=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+# Regular expressions for JavaScript
+style.cpp.14=fore:#3F7F3F,$(font.monospace),back:#E0F0FF,eolfilled
+# Doc Comment Line: line comments beginning with /// or //!.
+style.cpp.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Keywords2
+style.cpp.16=fore:#B00040
+# Comment keyword
+style.cpp.17=fore:#3060A0,$(font.code.comment.doc)
+# Comment keyword error
+style.cpp.18=fore:#804020,$(font.code.comment.doc)
+# Global class
+style.cpp.19=fore:#DD9900
+# Raw strings for C++0x
+style.cpp.20=$(colour.string),back:#FFF3FF,eolfilled
+# Triple-quoted strings for Vala
+style.cpp.21=$(font.monospace),fore:#007F00,back:#E0FFE0,eolfilled
+# Hash-quoted strings for Pike
+style.cpp.22=$(font.monospace),fore:#007F00,back:#E7FFD7,eolfilled
+# Preprocessor stream comment
+style.cpp.23=fore:#659900
+# Preprocessor stream doc comment
+style.cpp.24=$(colour.code.comment.doc)
+# User defined literals
+style.cpp.25=fore:#C06000
+# Task Marker
+style.cpp.26=fore:#BE07FF,$(font.code.comment.line)
+# Escape sequence
+style.cpp.27=$(colour.string)
+
+# Inactive states are 64 greater than their active counterparts
+
+# White space
+style.cpp.64=fore:#C0C0C0,$(traits.inactive)
+# Comment: /* */.
+style.cpp.65=$(style.cpp.1),fore:#90B090,$(traits.inactive)
+# Line Comment: //.
+style.cpp.66=$(style.cpp.2),fore:#90B090,$(traits.inactive)
+# Doc comment: block comments beginning with /** or /*!
+style.cpp.67=$(style.cpp.3),fore:#D0D0D0,$(traits.inactive)
+# Number
+style.cpp.68=$(style.cpp.4),fore:#90B0B0,$(traits.inactive)
+# Keyword
+style.cpp.69=$(style.cpp.5),fore:#9090B0,$(traits.inactive)
+# Double quoted string
+style.cpp.70=$(style.cpp.6),fore:#B090B0,$(traits.inactive)
+# Single quoted string
+style.cpp.71=$(style.cpp.7),fore:#B090B0,$(traits.inactive)
+# UUIDs (only in IDL)
+style.cpp.72=$(style.cpp.8),fore:#C0C0C0,$(traits.inactive)
+# Preprocessor
+style.cpp.73=$(style.cpp.9),fore:#B0B090,$(traits.inactive)
+# Operators
+style.cpp.74=$(style.cpp.10),fore:#B0B0B0,$(traits.inactive)
+# Identifiers
+style.cpp.75=$(style.cpp.11),fore:#B0B0B0,$(traits.inactive)
+# End of line where string is not closed
+style.cpp.76=$(style.cpp.12),fore:#000000,$(traits.inactive)
+# Verbatim strings for C#
+style.cpp.77=$(style.cpp.13),fore:#90B090,$(traits.inactive)
+# Regular expressions for JavaScript
+style.cpp.78=$(style.cpp.14),fore:#7FAF7F,$(traits.inactive)
+# Doc Comment Line: line comments beginning with /// or //!.
+style.cpp.79=$(style.cpp.15),fore:#C0C0C0,$(traits.inactive)
+# Keywords2
+style.cpp.80=$(style.cpp.16),fore:#C0C0C0,$(traits.inactive)
+# Comment keyword
+style.cpp.81=$(style.cpp.17),fore:#C0C0C0,$(traits.inactive)
+# Comment keyword error
+style.cpp.82=$(style.cpp.18),fore:#C0C0C0,$(traits.inactive)
+# Raw strings for C++0x
+style.cpp.84=$(style.cpp.20),fore:#B090B0,$(traits.inactive)
+# Triple-quoted strings for Vala
+style.cpp.85=$(style.cpp.21),fore:#90B090,$(traits.inactive)
+# Hash-quoted strings for Pike
+style.cpp.86=$(style.cpp.22),fore:#90B090,$(traits.inactive)
+# Preprocessor stream comment
+style.cpp.87=$(style.cpp.23),fore:#A0C090,$(traits.inactive)
+# Preprocessor stream doc comment
+style.cpp.88=$(style.cpp.23),fore:#C0C0C0,$(traits.inactive)
+# User defined literals
+style.cpp.89=fore:#D7A090,$(traits.inactive)
+# Task Marker
+style.cpp.90=fore:#C3A1CF,$(font.code.comment.line),$(traits.inactive)
+
+# Braces are only matched in operator style
+braces.cpp.style=10
+
+ccopts=-pedantic -Os
+cc=g++ $(ccopts) -c $(FileNameExt) -o $(FileName).o
+ccc=gcc $(ccopts) -c $(FileNameExt) -o $(FileName).o
+
+make.command=make
+command.compile.*.c=$(ccc) -std=c99
+command.build.*.c=$(make.command)
+command.build.*.h=$(make.command)
+command.clean.*.c=$(make.command) clean
+command.clean.*.h=$(make.command) clean
+command.go.*.c=./$(FileName)
+# To make the Go command both compile (if needed) and execute, use this setting:
+#command.go.needs.*.c=gcc $(ccopts) -std=c99 $(FileNameExt) -o $(FileName)
+
+command.compile.$(file.patterns.cplusplus)=$(cc)
+command.build.$(file.patterns.cplusplus)=$(make.command)
+command.clean.$(file.patterns.cplusplus)=$(make.command) clean
+command.go.$(file.patterns.cplusplus)=./$(FileName)
+command.go.needs.$(file.patterns.cplusplus)=g++ $(ccopts) $(FileNameExt) -o $(FileName)
+
+command.name.0.$(file.patterns.cpp)=Indent
+command.0.$(file.patterns.cpp)=astyle --style=attach --indent=force-tab=8 --keep-one-line-blocks \
+--pad-header --unpad-paren --pad-comma --indent-cases --align-pointer=name --pad-method-prefix \
+--pad-return-type --pad-param-type --align-method-colon --pad-method-colon=after $(FileNameExt)
+command.is.filter.0.$(file.patterns.cpp)=1
+
+command.name.1.$(file.patterns.cplusplus)=Lint
+command.1.$(file.patterns.cplusplus)=g++ -W -Wall -Wshadow -Wwrite-strings -Wold-style-cast \
+	-Woverloaded-virtual -pedantic -Os -fno-exceptions -c $(FileNameExt)
+
+if PLAT_WIN
+	command.compile.*.rc=windres $(FileNameExt) $(FileName).o
+	command.build.*.rc=$(make.command)
+	command.help.$(file.patterns.cpp)=$(CurrentWord)!G:\Program Files\Microsoft Visual Studio\MSDN98\98VSa\1033\MSDNVS6A.COL
+	command.help.subsystem.$(file.patterns.cpp)=4
+	command.go.*.js=cscript /nologo $(FileNameExt)
+# When maintaining old Win16 programs...
+#	command.help.$(file.patterns.cpp)=$(CurrentWord)!I:\msvc\help\win31wh.hlp
+#	command.help.subsystem.$(file.patterns.cpp)=5
+
+if PLAT_GTK
+	command.help.$(file.patterns.cpp)=man $(CurrentWord) | col -b
+
+if PLAT_WIN
+	command.build.*.cs=csc /t:winexe $(FileNameExt) /r:system.dll,system.drawing.dll
+	command.go.*.cs=$(FileName)
+	command.go.subsystem.*.cs=0
+if PLAT_GTK
+	command.build.*.cs=mcs /t:winexe $(FileNameExt) /r:System,System.Drawing
+	command.go.*.cs=mono $(FileName).exe
+	command.go.subsystem.*.cs=1
+
+command.compile.*.java=javac $(FileNameExt)
+command.build.*.java=javac *.java
+command.go.*.java=java -cp . $(FileName)
+
+if PLAT_WIN
+	command.help.*.java=http://java.sun.com/javase/6/docs/api/java/util/$(CurrentWord).html
+	command.help.subsystem.*.java=2
+
+command.compile.*.ch=ch -n $(FileNameExt)
+command.build.*.ch=ch -n  $(FileNameExt)
+command.go.*.ch=ch -u $(FileNameExt)
+
+command.compile.*.as=mtasc -strict $(FileNameExt)
+command.build.*.as=mtasc -strict *.as
+
+command.build.$(file.patterns.vala)=valac $(FileNameExt)
+command.go.*.vala=./$(FileName)
+
+# can also be 6g for 64-bit systems!
+command.compile.*.go=8g $(FileNameExt)
+command.build.*.go=$(make.command)
+command.go.*.go=./$(FileName)
+
+command.compile.*.ts=tsc $(FileNameExt)
diff --git a/scite-app/scite/src/csound.properties b/scite-app/scite/src/csound.properties
new file mode 100644
index 0000000..a9bed95
--- /dev/null
+++ b/scite-app/scite/src/csound.properties
@@ -0,0 +1,153 @@
+# SciTE settings for Csound files (orchestra and score)
+# Author:  Georg Ritter <ritterfuture A T gmail D O T com>
+# Created: Mai 2005
+
+# Csound files
+file.patterns.csound=*.orc;*.sco;*.csd
+filter.csound=Csound (orc sco csd)|$(file.patterns.csound)|
+*filter.csound=$(filter.csound)
+
+lexer.$(file.patterns.csound)=csound
+
+*language.csound=Csound|orc||
+
+# Csound opcodes
+
+# This list was extracted from Csound_opcodes.vim which can be found here:
+# http://csounds.com/istvan/archive/misc/Csound_vim_syntax-4.24.1.tar.gz
+
+csound_opcodes=\
+	a i db in or zr Add Dec Div Inc Mul Sub abs and cos dam dec div exp \
+	fin fof fog inh ino inq ins int inx inz lfo log mac mod mul not out \
+	pan pow rms rnd shl sin sqr sub sum tab tan tb0 tb1 tb2 tb3 tb4 tb5 \
+	tb6 tb7 tb8 tb9 urd vco xin xor zar zaw zir ziw zkr zkw adsr babo \
+	buzz cent clip comb cosh diff divz fini fink fmb3 fof2 fold fout \
+	frac ftsr gain goto in32 inch init line maca moog mute nrpn outc \
+	outh outo outq outs outx outz peak port pset pvoc rand seed sinh \
+	sqrt stix tabw tanh tb10 tb11 tb12 tb13 tb14 tb15 tone vadd vco2 \
+	vdiv vexp vibr vmap vmul vpow wrap xout xyin zacl zarg zawm ziwm \
+	zkcl zkwm FLbox FLjoy FLrun adsyn ampdb atone birnd bqrez butbp \
+	butbr buthp butlp clear ctrl7 dbamp dconv delay dumpk endin endop \
+	event expon fouti foutk ftgen ftlen gauss gbuzz grain guiro igoto \
+	ihold instr integ kgoto limit linen log10 loopg loopl lpf18 madsr \
+	max_k metro noise nsamp oscil out32 outch outic outkc outq1 outq2 \
+	outq3 outq4 outs1 outs2 pareq pitch pluck portk print pvadd randh \
+	randi rbjeq readk reson rezzy rnd31 scans scanu sense space tab_i \
+	table tbvcf tempo timek times tival tonek tonex vaddv vbap4 vbap8 \
+	vbapz vcomb vcopy vdecr vdivv veloc vexpv vibes vincr vmult voice \
+	vport vpowv vpvoc vsubv vwrap wgbow xadsr zamod zkmod FLhide FLkeyb \
+	FLknob FLpack FLshow FLtabs FLtext active adsynt alpass areson \
+	atonek atonex bamboo bbcutm bbcuts biquad cabasa cauchy cggoto \
+	cigoto ckgoto clfilt cngoto convle cosinv cpsoct cpspch cpstun \
+	cpuprc cross2 crunch ctrl14 ctrl21 delay1 delayk delayr delayw \
+	deltap denorm diskin dumpk2 dumpk3 dumpk4 envlpx expseg filesr \
+	fiopen fmbell follow foscil foutir ftlen2 ftload ftmorf ftsave \
+	grain2 grain3 harmon hrtfer initc7 interp jitter linenr lineto \
+	linseg locsig loopge loople lorenz loscil lowres lpread lpslot \
+	mandel mandol mclock mdelay midic7 midiin midion mirror moscil \
+	mpulse mrtmsg mxadsr nlfilt noteon notnum ntrpol octave octcps \
+	octpch opcode oscbnk oscil1 oscil3 oscili osciln oscils oscilx \
+	outiat outipb outipc outkat outkpb outkpc pchoct phasor planet \
+	poscil printk prints pvread pvsftr pvsftw random readk2 readk3 \
+	readk4 reinit resonk resonr resonx resony resonz reverb rigoto \
+	s16b14 s32b14 sekere sfload sfplay shaker sininv spat3d spdist \
+	spsend strset table3 tablei tablew tabw_i taninv tigoto timout \
+	turnon upsamp vbap16 vcella vco2ft vdel_k vdelay vlimit vmultv \
+	vrandh vrandi wgclar xscans xscanu FLcolor FLcount FLgroup FLlabel \
+	FLpanel FLvalue aftouch ampdbfs ampmidi aresonk balance bexprnd \
+	biquada changed clockon cps2pch cpsmidi cpstmid cpstuni cpsxpch \
+	dbfsamp dcblock deltap3 deltapi deltapn deltapx dispfft display \
+	envlpxr exprand expsega expsegr filelen filter2 flanger fmmetal \
+	fmrhode fmvoice follow2 foscili fprints ftchnls ftloadk ftlptim \
+	ftsavek gogobel granule hilbert initc14 initc21 invalue jitter2 \
+	jspline linrand linsegr locsend logbtwo loopseg loscil3 lowresx \
+	lphasor lposcil lpreson lpshold marimba massign midic14 midic21 \
+	midichn midion2 midiout moogvcf noteoff nreverb nstrnum octmidi \
+	oscil1i outic14 outipat outkc14 outkpat pcauchy pchbend pchmidi \
+	phaser1 phaser2 pinkish poisson polyaft poscil3 printk2 printks \
+	product pvcross pvsanal pvsinfo pvsynth randomh randomi release \
+	repluck reverb2 rspline rtclock seqtime sfilist sfinstr sfplay3 \
+	sfplaym sfplist slider8 sndwarp soundin spat3di spat3dt specsum \
+	streson tableiw tablekt tableng tablera tablewa taninv2 tempest \
+	tlineto transeg trigger trigseq trirand turnoff unirand valpass \
+	vco2ift vdelay3 vdelayk vdelayx vexpseg vibrato vlinseg vlowres \
+	vmirror waveset weibull wgbrass wgflute wgpluck wguide1 wguide2 \
+	xtratim zakinit FLbutton FLcolor2 FLprintk FLroller FLscroll \
+	FLsetBox FLsetVal FLslider FLupdate betarand butterbp butterbr \
+	butterhp butterlp chanctrl clockoff convolve cpsmidib ctrlinit \
+	cuserrnd deltapxw distort1 downsamp duserrnd filepeak fmpercfl \
+	fmwurlie fprintks hsboscil lowpass2 lpfreson lpinterp lposcil3 \
+	maxalloc midictrl multitap nestedap octmidib oscilikt outvalue \
+	pchmidib powoftwo prealloc pvinterp pvsadsyn pvscross pvsfread \
+	pvsmaska rireturn samphold schedule semitone sensekey setksmps \
+	sfinstr3 sfinstrm sfplay3m sfpreset slider16 slider32 slider64 \
+	slider8f soundout specaddm specdiff specdisp specfilt spechist \
+	specptrk specscal spectrum sprintks subinstr svfilter tablegpw \
+	tableikt tablemix tableseg tablewkt tablexkt tb0_init tb1_init \
+	tb2_init tb3_init tb4_init tb5_init tb6_init tb7_init tb8_init \
+	tb9_init tempoval vco2init vdelayxq vdelayxs vdelayxw vecdelay \
+	wgpluck2 wterrain xscanmap zfilter2 FLbutBank FLgetsnap FLpackEnd \
+	FLprintk2 FLsetFont FLsetSize FLsetText FLsetsnap FLslidBnk \
+	FLtabsEnd dripwater eventname ktableseg noteondur osciliktp \
+	oscilikts pgmassign phasorbnk pitchamdf pvbufread readclock \
+	sandpaper scantable schedwhen sfinstr3m sfpassign slider16f \
+	slider32f slider64f sndwarpst soundoutc soundouts tablecopy \
+	tableigpw tableimix tablexseg tb10_init tb11_init tb12_init \
+	tb13_init tb14_init tb15_init timeinstk timeinsts vbap4move \
+	vbap8move vbapzmove vdelayxwq vdelayxws xscansmap FLgroupEnd \
+	FLloadsnap FLpack_end FLpanelEnd FLsavesnap FLsetAlign FLsetColor \
+	FLsetVal_i FLtabs_end filenchnls noteondur2 scanhammer schedkwhen \
+	tableicopy tambourine vbap16move vbaplsinit wgbowedbar FLgroup_end \
+	FLpanel_end FLscrollEnd FLsetColor2 mididefault midinoteoff \
+	sleighbells FLscroll_end subinstrinit FLsetPosition FLsetTextSize \
+	FLsetTextType midinoteoncps midinoteonkey midinoteonoct \
+	midinoteonpch midipitchbend schedwhenname FLsetTextColor \
+	schedkwhenname midicontrolchange midiprogramchange \
+	midipolyaftertouch midichannelaftertouch
+
+# Header statements
+csound_header_stmts=sr kr ar ksmps nchnls
+
+# Other keywords
+csound_other_keywords=
+
+keywords.$(file.patterns.csound)=$(csound_opcodes)
+keywords2.$(file.patterns.csound)=$(csound_header_stmts)
+keywords3.$(file.patterns.csound)=$(csound_other_keywords)
+
+comment.block.csound=;
+
+# Styles ...
+
+# Default
+style.csound.0=$(font.monospace)
+# Comment
+style.csound.1=$(font.monospace),fore:#669999
+# Number
+style.csound.2=$(font.monospace),fore:#339933
+# Operator
+style.csound.3=$(font.monospace)
+# Instr
+style.csound.4=$(font.monospace)
+# Identifier (not a real style)
+style.csound.5=
+# Opcode
+style.csound.6=$(font.monospace),fore:#0000FF,bold
+# Header statement
+style.csound.7=$(font.monospace),fore:#CC2200
+# User keywords
+style.csound.8=$(font.monospace)
+# comment block
+style.csound.9=$(font.monospace)
+# Parameter
+style.csound.10=$(font.monospace),fore:#660099,bold
+# A-Rate variable
+style.csound.11=$(font.monospace),fore:#660099
+# K-Rate variable
+style.csound.12=$(font.monospace),fore:#660099
+# I-Rate variable
+style.csound.13=$(font.monospace),fore:#660099
+# Global variable
+style.csound.14=$(font.monospace),fore:#660099
+# End of line where string is not closed
+style.csound.15=$(font.monospace),fore:#000000,back:#E0C0E0,eolfilled
diff --git a/scite-app/scite/src/css.properties b/scite-app/scite/src/css.properties
new file mode 100644
index 0000000..10e96d2
--- /dev/null
+++ b/scite-app/scite/src/css.properties
@@ -0,0 +1,205 @@
+# Define SciTE settings for CSS files
+# Jakub Vr�na - jakub@vrana.cz
+# Updated Andy Holder - Jan 2011
+
+filter.css=CSS (css)|*.css|
+*filter.css=$(filter.css)
+lexer.*.css=css
+*language.css=CSS|css||
+
+*source.patterns.css=*.css;
+
+indent.size.*.css=4
+tab.size.*.css=4
+use.tabs.*.css=1
+
+keywordclass.css1=\
+color background-color background-image background-repeat background-attachment background-position background \
+font-family font-style font-variant font-weight font-size font \
+word-spacing letter-spacing text-decoration vertical-align text-transform text-align text-indent line-height \
+margin-top margin-right margin-bottom margin-left margin \
+padding-top padding-right padding-bottom padding-left padding \
+border-top-width border-right-width border-bottom-width border-left-width border-width \
+border-top border-right border-bottom border-left border \
+border-color border-style width height float clear \
+display white-space list-style-type list-style-image list-style-position list-style
+
+keywordclass.values=\
+auto none normal italic oblique small-caps bold bolder lighter \
+xx-small x-small small medium large x-large xx-large larger smaller \
+transparent repeat repeat-x repeat-y no-repeat scroll fixed \
+top bottom left center right justify both \
+underline overline line-through blink \
+baseline sub super text-top middle text-bottom \
+capitalize uppercase lowercase thin medium thick \
+dotted dashed solid double groove ridge inset outset \
+block inline list-item pre no-wrap inside outside \
+disc circle square decimal lower-roman upper-roman lower-alpha upper-alpha \
+aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal white yellow
+
+# rgb(i1, i2, i3) rgb(p1, p2, p3) #xxx #xxxxxx url(path)
+# path: in optional single or double quotes. If quotes, inside quotes must be backslashed.
+# length: [+-][0-9]+<unit>
+# unit: % pt mm cm pc in px em ex
+
+# at-rule: import
+
+# CSS2
+
+keywordclass.css2=\
+border-top-color border-right-color border-bottom-color border-left-color border-color \
+border-top-style border-right-style border-bottom-style border-left-style border-style \
+top right bottom left position z-index direction unicode-bidi \
+min-width max-width min-height max-height overflow clip visibility content quotes \
+counter-reset counter-increment marker-offset \
+size marks page-break-before page-break-after page-break-inside page orphans widows \
+font-stretch font-size-adjust unicode-range units-per-em src \
+panose-1 stemv stemh slope cap-height x-height ascent descent widths bbox definition-src \
+baseline centerline mathline topline text-shadow \
+caption-side table-layout border-collapse border-spacing empty-cells speak-header \
+cursor outline outline-width outline-style outline-color \
+volume speak pause-before pause-after pause cue-before cue-after cue \
+play-during azimuth elevation speech-rate voice-family pitch pitch-range stress richness \
+speak-punctuation speak-numeral
+
+keywordclass.values2=\
+inherit \
+run-in compact marker table inline-table table-row-group table-header-group table-footer-group \
+table-row table-column-group table-column table-cell table-caption \
+static relative absolute fixed ltr rtl embed bidi-override \
+visible hidden scroll collapse open-quote close-quote no-open-quote no-close-quote \
+decimal-leading-zero lower-greek lower-latin upper-latin hebrew armenian georgian \
+cjk-ideographic hiragana katakana hiragana-iroha katakana-iroha \
+landscape portrait crop cross always avoid \
+wider narrower ultra-condensed extra-condensed condensed semi-condensed \
+semi-expanded expanded extra-expanded ultra-expanded \
+caption icon menu message-box small-caption status-bar \
+separate show hide once crosshair default pointer move text wait help \
+e-resize ne-resize nw-resize n-resize se-resize sw-resize s-resize w-resize \
+ActiveBorder ActiveCaption AppWorkspace Background ButtonFace ButtonHighlight ButtonShadow \
+InactiveCaptionText ButtonText CaptionText GrayText Highlight HighlightText InactiveBorder \
+InactiveCaption InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow \
+ThreeDFace ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame WindowText \
+silent x-soft soft medium loud x-loud spell-out mix \
+left-side far-left center-left center-right far-right right-side behind leftwards rightwards \
+below level above higher lower x-slow slow medium fast x-fast faster slower \
+male female child x-low low high x-high code digits continuous
+
+# properties and pseudos starting with -moz- etc.
+keywordclass.vendor.prefixes=^-moz- ^-webkit- ^-o- ^-ms-
+
+# CSS3 is a set of standards that are currently still begin worked on,
+# so this list is certainly incomplete.
+# This list is CSS3 as recognised by firefox 4 as of start of 2011
+keywordclass.css3=background-size \
+border-radius border-top-right-radius border-bottom-right-radius border-bottom-left-radius border-top-left-radius \
+box-shadow \
+columns column-width column-count column-rule column-gap column-rule-color column-rule-style column-rule-width \
+resize opacity word-wrap
+
+# Pseudo Classes
+keywordclass.pseudoclass.css1=link active visited
+keywordclass.pseudoclass.css2=first-child focus hover lang left right first
+keywordclass.pseudoclass.css3=empty enabled disabled checked not root target \
+only-child last-child nth-child nth-last-child \
+first-of-type last-of-type nth-of-type nth-last-of-type only-of-type \
+valid invalid required optional
+keywordclass.pseudoclass.other=indeterminate default
+
+# Pseudo Elements
+keywordclass.pseudoelement.css=first-letter first-line before after
+# ::selection WAS in the css3 standard and is supported in many browsers.
+# your choice:
+keywordclass.pseudoelement.css3=selection
+#keywordclass.pseudoelement.other=selection
+
+
+# counter(id) counter(id, style) attr(X) local("name)" format("string")
+# angle: [+-][0-9]+<unit>
+# angle unit: deg grad rad
+# time: [0-9]+<unit>
+# time unit: ms s
+# frequency: [0-9]+<unit>
+# frequency unit: Hz kHz
+# Unicode range: U+x??-yyy
+
+# at-rule: media, values: all aural braille embossed handheld print projection screen tty tv
+# at-rule: page font-face charset
+
+#####
+# CSS1 properties
+keywords.*.css=$(keywordclass.css1)
+# Pseudo classes or more precisely single colon ':' selectors
+keywords2.*.css=$(keywordclass.pseudoclass.css1) $(keywordclass.pseudoclass.css2) \
+    $(keywordclass.pseudoclass.css3) $(keywordclass.pseudoelement.css)
+# CSS2 properties
+keywords3.*.css=$(keywordclass.css2)
+# CSS3 properties
+keywords4.*.css=$(keywordclass.css3)
+# Pseudo elements or more precisely double colon '::' selectors
+keywords5.*.css=$(keywordclass.pseudoelement.css) $(keywordclass.pseudoelement.css3)
+# Extra CSS Properties
+# Any CSS starting with the common vendor prefixes and microsoft's filter.
+keywords6.*.css=$(keywordclass.vendor.prefixes) filter
+# Extra pseudo classes
+keywords7.*.css=$(keywordclass.pseudoclass.other) $(keywordclass.vendor.prefixes)
+# Extra pseudo elements
+keywords8.*.css=$(keywordclass.pseudoelement.other) $(keywordclass.vendor.prefixes)
+
+word.characters.*.css=$(chars.alpha)$(chars.numeric)-
+comment.stream.start.css=/*
+comment.stream.end.css=*/
+
+# Default
+style.css.32=$(font.code.base)
+# White space: Visible only in View Whitespace mode (or if it has a back colour)
+style.css.0=fore:#FF0080
+# Selector (HTML tag)
+style.css.1=$(colour.keyword),bold
+# Class selector ([HtmlTag].classSelector)
+style.css.2=
+# Pseudo class (HtmlTag:pseudoClass) see "keywords2" above
+style.css.3=fore:#800000
+# Unknown Pseudo class
+style.css.4=$(colour.error)
+# Operator
+style.css.5=$(colour.operator)
+# CSS1 Property, see keywords
+style.css.6=fore:#0040E0
+# Unknown Property
+style.css.7=fore:#FF0000
+# Value
+style.css.8=$(colour.string)
+# Comment
+style.css.9=$(colour.code.comment.box),$(font.code.comment.box)
+# ID selector (#IdSel)
+style.css.10=$(colour.number),italics
+# "!important"
+style.css.11=fore:#FF8000,bold
+# At-rule (@) except @media
+style.css.12=$(colour.preproc)
+# Double quoted strings
+style.css.13=$(colour.string)
+# Single quoted strings
+style.css.14=$(colour.string)
+# CSS2 Property, see keywords3
+style.css.15=fore:#0040E0
+# Attribute selection ([att='val'])
+style.css.16=fore:#800000
+# CSS3 Property, see keywords4
+style.css.17=fore:#00A0E0
+# Pseudo elements, see keywords5
+style.css.18=fore:#C80000
+# Other CSS Property, see keywords6
+style.css.19=fore:#7F7F00
+# Other Pseudoclass, see keywords7
+style.css.20=fore:#7F7F00
+# Other Pseudoelement, see keywords8
+style.css.21=fore:#7F7F00
+# "@media"
+style.css.22=$(colour.preproc),bold
+# Variable in SCSS, LESS, or HSS
+style.css.23=fore:#DD9900
+
+block.start.*.css=5 {
+block.end.*.css=5 }
diff --git a/scite-app/scite/src/d.properties b/scite-app/scite/src/d.properties
new file mode 100644
index 0000000..642dcfc
--- /dev/null
+++ b/scite-app/scite/src/d.properties
@@ -0,0 +1,116 @@
+# Define SciTE settings for D
+
+file.patterns.d=*.d
+filter.d=D (d)|$(file.patterns.d)|
+*filter.d=$(filter.d)
+lexer.$(file.patterns.d)=d
+*language.d=D|d||
+
+word.chars.d=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.d)=$(word.chars.d)
+#~ word.characters.$(file.patterns.cs)=$(word.chars.d)
+calltip.d.word.characters=$(chars.alpha)$(chars.numeric)_
+
+
+#comment.block.at.line.start.d=1
+comment.block.d=//~
+comment.stream.start.d=/+
+comment.stream.end.d=+/
+comment.box.start.d=/*
+comment.box.middle.d= *
+comment.box.end.d= */
+#lexer.d.fold.at.else=1
+
+statement.indent.$(file.patterns.d)=6 case catch class debug default do else \
+finally for foreach foreach_reverse if private protected public scope struct \
+try union while with
+statement.end.$(file.patterns.d)=13 ;
+statement.lookback.$(file.patterns.d)=20
+block.start.$(file.patterns.d)=13 {
+block.end.$(file.patterns.d)=13 }
+
+# D keywords
+keywords.$(file.patterns.d)=abstract alias align asm assert auto \
+ body bool break byte \
+ case cast catch cdouble cent cfloat char class const continue creal \
+ dchar debug default delegate delete deprecated do double \
+ else enum export extern \
+ false final finally float for foreach foreach_reverse function \
+ goto \
+ idouble if ifloat import in inout int interface invariant ireal is \
+ lazy long \
+ mixin module \
+ new null \
+ out override \
+ package pragma private protected public \
+ real return \
+ scope short static struct super switch synchronized \
+ template this throw true try typedef typeid typeof \
+ ubyte ucent uint ulong union unittest ushort \
+ version void volatile \
+ wchar while with
+
+# keywords2 are intended for embedded ASM
+
+# keywords3 are intended for doxygen
+keywords3.$(file.patterns.d)=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+
+# keywords4 are intended for syntax driven or custom highlighting
+
+
+# Styles
+
+# 0 - whitespace
+# 1, 2, 3, 4 - comments:  /* */,  //,  /** */ or /*! */,  /+ +/
+# 5 - number
+# 6, 7, 8, 9 - keywords: standard, secondary, doc keywords, typedefs and aliases
+# 10 - string
+# 11 - string not closed
+# 12 - char
+# 13 - operator
+# 14 - identifier
+# 15, 16, 17 - Doc comments: line doc /// or //!, doc keyword, doc keyword err
+# 18, 19 stringb, stringr
+# 20, 21, 22 keywords 5, 6, and 7
+
+style.d.32=$(font.base)
+style.d.0=fore:#808080
+style.d.1=$(colour.code.comment.box),$(font.code.comment.box)
+style.d.2=$(colour.code.comment.line),$(font.code.comment.line)
+style.d.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.d.4=$(colour.code.comment.nested),$(font.code.comment.nested)
+style.d.5=$(colour.number)
+style.d.6=$(colour.keyword),bold
+style.d.7=$(colour.keyword),bold
+style.d.8=$(colour.keyword),bold
+style.d.9=$(colour.keyword),bold
+style.d.10=$(colour.string)
+style.d.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.d.12=$(colour.char)
+style.d.13=$(colour.operator),bold
+style.d.14=
+style.d.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+style.d.16=fore:#3060A0,$(font.code.comment.doc)
+style.d.17=fore:#804020,$(font.code.comment.doc)
+style.d.18=fore:#DD9900
+style.d.19=fore:#DD9900
+style.d.20=fore:#DD9900
+style.d.21=fore:#DD9900
+style.d.22=fore:#DD9900
+# breaces must be operator style to allow matching
+braces.d.style=13
+
+
+command.compile.*.d=dmd -O $(FileNameExt)
+command.build.*.d=$(make.command)
+command.go.*.d=$(FileName)
+
diff --git a/scite-app/scite/src/dataflex.properties b/scite-app/scite/src/dataflex.properties
new file mode 100644
index 0000000..92402a7
--- /dev/null
+++ b/scite-app/scite/src/dataflex.properties
@@ -0,0 +1,84 @@
+# Define SciTE settings for DataFlex files.
+
+filter.dataflex=Dataflex (src vw dg sl pkg bp inc dd h rv wo prn)|*.src;*.vw;*.dg;*.sl;*.pkg;*.bp;*.inc;*.dd;*.h;*.rv;*.wo;*.prn|
+
+*filter.dataflex=$(filter.dataflex)
+
+file.patterns.dataflex=*.src;*.vw;*.dg;*.sl;*.pkg;*.bp;*.inc;*.dd;*.h;*.rv;*.wo;*.prn
+file.patterns.dataflex.all=$(file.patterns.dataflex)
+lexer.$(file.patterns.dataflex.all)=dataflex
+*language.dataflex=Dataflex|src||
+
+# Keywords
+keywords.$(file.patterns.dataflex)=\
+abort abort_transaction activate_view add address append append_output ascii at attach bigint boolean break broadcast \
+broadcast_focus byref calc call_driver callstackdump case channel char character clear close close_input close_output constrain constrained_clear \
+constrained_find constraint_set constraint_validate convert copy_db copy_records copyfile create_field create_index currency date datetime \
+decimal declare_datafile decrement deferred_view define delegate delete delete_db delete_field delete_index direct_input direct_output diskfree \
+do dword else entry_item erasefile error external_function field field_map file_exist file_field fill_field find float for forward from function_return \
+get get_argument_size get_attribute get_channel_position get_channel_size get_current_directory get_current_input_channel \
+get_current_output_channel get_current_user_count get_date_attribute get_directory get_environment get_field_value get_fieldnumber \
+get_file_mod_time get_file_path get_filenumber get_licensed_max_users get_stricteval get_transaction_retry get_windows_directory getaddress \
+getbuff getbuff_string getdskinfo global_variable handle if ifnot import_class_protocol include_resource increment indicate indicator integer is item \
+left length load_def load_driver local lock login logout ltrim make_directory make_file make_temp_file mid move moveint movenum movestr \
+newrecord number of on_item on_key open overstrike output output_aux_file output_wrap pad playwave pointer pos procedure_return property \
+public put read read_block read_hex readln real reg_key_enum reg_integer_value_enum reg_string_value_enum register_function register_object \
+register_procedure relate remove_directory renamefile repeat report_breaks replace replaces reread returns right rowid rtrim runprogram save \
+saverecord self send set set_argument_size set_attribute set_channel_position set_date_attribute set_directory set_field_value set_file_mod_time set_relate \
+set_stricteval set_transaction_retry shift_state short show showln sleep sort start_ui string structure_abort structure_copy structure_end structure_start subtract \
+sysdate sysdate4 time timespan to trim ubigint uchar uinteger unload_driver unlock use ushort valid_drive valuetreedeserializeparameter \
+valuetreeserializeparameter variant vconstrain version_information vfind virtual_key webget webpublishfunction webpublishprocedure webset \
+websetresponsive write write_hex writeln xmlhandle zerofile zerostring zerotype #check #error #include #pop #push #replace #set \
+#spop #spush
+
+# Scope open
+keywords2.$(file.patterns.dataflex)=\
+begin class function procedure object repeat for while begin_constraints procedure_section begin_row \
+item_list enumeration_list enum_list #ifdef #ifdef #else cd_popup_object #command begin_transaction repeat #if for_all dfcreate_menu \
+dfcreate_menu #if type #ifsame struct
+
+# Scope close
+keywords3.$(file.patterns.dataflex)=\
+end end_class end_function end_procedure end_object until loop loop end_constraints end_procedure end_row \
+end_item_list end_enumeration_list end_enum_list #else #endif #endif cd_end_object #endcommand end_transaction until #endif end_for_all \
+end_pull_down end_menu #else end_type #endif end_struct
+
+# Operators
+keywords4.$(file.patterns.dataflex)=\
++ - = * / < > <= >= <> Or And In Contains Eq Ne Lt Gt Ge Le Not Iand Ior found seqeof ~ ^ True False err lasterr
+
+fold.dataflex.compilerlist=0
+
+# DataFlex Styles
+# Default
+style.dataflex.32=$(font.base)
+# White space
+style.dataflex.0=fore:#808080
+# Identifiers
+style.dataflex.1=
+# Metatag: { ... }
+style.dataflex.2=$(colour.code.comment.box),$(font.code.comment.box)
+# DataFlex image: \* ... *\
+style.dataflex.3=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: // ...
+style.dataflex.4=$(colour.code.comment.line),$(font.code.comment.line)
+# Preprocessor: {$ ... }
+style.dataflex.5=$(colour.preproc)
+# Preprocessor2: (*$ ... *)
+style.dataflex.6=$(colour.preproc)
+# Number
+style.dataflex.7=$(colour.number)
+# Hex Number
+style.dataflex.8=$(colour.number)
+# Keyword
+style.dataflex.9=fore:#000080
+# String
+style.dataflex.10=$(colour.string)
+# End of line where string is not closed
+style.dataflex.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Scope word
+style.dataflex.12=fore:#000080,bold
+# Operators
+style.dataflex.13=$(colour.operator),bold
+# ICode
+style.dataflex.14=fore:#804080
diff --git a/scite-app/scite/src/ecl.properties b/scite-app/scite/src/ecl.properties
new file mode 100644
index 0000000..fe4735d
--- /dev/null
+++ b/scite-app/scite/src/ecl.properties
@@ -0,0 +1,66 @@
+file.patterns.ecl=*.ecl;*.eclattr;*.hql
+filter.ecl=ECL (ecl eclattr hql)|$(file.patterns.ecl)|
+*filter.ecl=$(filter.ecl)
+lexer.$(file.patterns.ecl)=ecl
+
+word.chars.ecl=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.ecl)=$(word.chars.ecl)
+calltip.ecl.word.characters=$(chars.alpha)$(chars.numeric)_
+
+#comment.block.at.line.start.ecl=1
+comment.block.ecl=//
+comment.stream.start.ecl=/+
+comment.stream.end.ecl=+/
+comment.box.start.ecl=/*
+comment.box.middle.ecl= *
+comment.box.end.ecl= */
+#lexer.ecl.fold.at.else=1
+
+statement.indent.$(file.patterns.ecl)=record module
+statement.end.$(file.patterns.ecl)=13 ;
+statement.lookback.$(file.patterns.ecl)=20
+block.start.$(file.patterns.ecl)=13 {
+block.end.$(file.patterns.ecl)=13 }
+
+style.ecl.0=fore:#00000000
+style.ecl.1=fore:#00800000
+style.ecl.2=fore:#00800000
+style.ecl.3=fore:#00000000
+style.ecl.4=fore:#80808000
+style.ecl.5=fore:#0000FF00
+style.ecl.6=fore:#00000000
+style.ecl.7=fore:#80808000
+style.ecl.8=fore:#00000000
+style.ecl.9=fore:#00408000
+style.ecl.10=fore:#00000000
+style.ecl.11=fore:#00000000
+style.ecl.12=fore:#00000000
+style.ecl.13=fore:#00000000
+style.ecl.14=fore:#00000000
+style.ecl.15=fore:#00000000
+style.ecl.16=bold,fore:#00008000
+style.ecl.17=bold,fore:#7F7F7F00
+style.ecl.18=fore:#FF000000
+style.ecl.19=fore:#80000000
+style.ecl.20=fore:#80000000
+style.ecl.21=fore:#80008000
+style.ecl.22=fore:#80008000
+style.ecl.23=fore:#7F7F7F00
+style.ecl.24=fore:#00000000
+style.ecl.25=fore:#00000000
+style.ecl.26=fore:#00000000
+style.ecl.27=fore:#00000000
+style.ecl.32=fore:#00000000,$(font.monospace)
+style.ecl.34=bold,fore:#00000000
+style.ecl.35=fore:#FF000000
+style.ecl.36=fore:#80800000
+style.ecl.37=fore:#80000000
+
+keywords.$(file.patterns.ecl)=abs acos ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize cos cosh count cron dataset dedup denormalize distribute distributed distribution ebcdic enth error evaluate event exists exp fetch fromunicode getisvalid global group hash hash32 hash64 hashcrc hashmd5 if index intformat isvalid iterate join keyunicode length limit ln log map matched matchlength matchposition matchtext matchunicode max merge min normalize parse pipe power preload project pull random rank ranked realformat recordof regexfind regexreplace rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt sum table tan tanh topn tounicode transfer trim truncate typeof ungroup unicodeorder which workunit xmldecode xmlencode xmltext xmlunicode
+keywords2.$(file.patterns.ecl)=apply build buildindex evaluate fail keydiff keypatch loadxml notify output parallel sequential soapcall
+keywords3.$(file.patterns.ecl)=__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat full function group header heading hole ifblock import in joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase( noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath
+keywords4.$(file.patterns.ecl)=ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode
+keywords5.$(file.patterns.ecl)=checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when
+keywords6.$(file.patterns.ecl)=#append #break #declare #demangle #end #for #getdatatype #if #inmodule #loop #mangle #onwarning #option #set #stored #uniquename #workunit integer symbol value text symbol value
+
+#command.build.$(file.patterns.ecl)=eclcc.exe -I"$(HPCCBIN)\ecllibrary" -I"$(HPCCBIN)\ecllibrary" -I"$(HPCCBIN)\plugins" "$(FileNameExt)"
diff --git a/scite-app/scite/src/eiffel.properties b/scite-app/scite/src/eiffel.properties
new file mode 100644
index 0000000..9b548f4
--- /dev/null
+++ b/scite-app/scite/src/eiffel.properties
@@ -0,0 +1,74 @@
+# Define SciTE settings for Eiffel files.
+
+filter.eiffel=Eiffel (e)|*.e|
+
+*filter.eiffel=$(filter.eiffel)
+
+file.patterns.eiffel=*.e
+
+*source.patterns.eiffel=$(file.patterns.eiffel);
+
+# Main Eiffel lexer dows indentation based folding
+lexer.$(file.patterns.eiffel)=eiffel
+# Alternative key word based folding has trouble with redefine and rename clauses
+#lexer.$(file.patterns.eiffel)=eiffelkw
+
+*language.eiffel=&Eiffel|e||
+
+# These keywords are case insensitive although Eiffel has conventions for
+# keywords, predefined names and predefined classes: alias, Current, BOOLEAN
+# Could differentiate between these
+keywordclass.eiffel=\
+alias all and any as bit boolean \
+check class character clone create creation current \
+debug deferred div do double \
+else elseif end ensure equal expanded export external \
+false feature forget from frozen general \
+if implies indexing infix inherit inspect integer invariant is \
+language like local loop mod name nochange none not \
+obsolete old once or platform pointer prefix precursor \
+real redefine rename require rescue result retry \
+select separate string strip then true undefine unique until \
+variant void when xor
+
+keywords.$(file.patterns.eiffel)=$(keywordclass.eiffel)
+
+# Eiffel styles
+# Default
+style.eiffel.0=fore:#808080
+style.eiffelkw.0=$(style.eiffel.0)
+# Line comment
+style.eiffel.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.eiffelkw.1=$(style.eiffel.1)
+# Number
+style.eiffel.2=$(colour.number)
+style.eiffelkw.2=$(style.eiffel.2)
+# Keyword
+style.eiffel.3=$(colour.keyword),bold
+style.eiffelkw.3=$(style.eiffel.3)
+# String
+style.eiffel.4=$(colour.string),$(font.monospace)
+style.eiffelkw.4=$(style.eiffel.4)
+# Character
+style.eiffel.5=$(colour.char),$(font.monospace)
+style.eiffelkw.5=$(style.eiffel.5)
+# Operators
+style.eiffel.6=$(colour.operator),bold
+style.eiffelkw.6=$(style.eiffel.6)
+# Identifier
+style.eiffel.7=
+style.eiffelkw.7=$(style.eiffel.7)
+# End of line where string is not closed
+style.eiffel.8=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+style.eiffelkw.8=$(style.eiffel.8)
+# Braces are only matched in operator style
+braces.eiffel.style=6
+braces.eiffelkw.style=$(braces.eiffel.style)
+
+statement.indent.$(file.patterns.eiffel)=3 do else elsif rescue if is loop
+statement.end.$(file.patterns.eiffel)=10 ;
+statement.lookback.$(file.patterns.eiffel)=20
+block.start.$(file.patterns.eiffel)=10 check debug deferred do from if inspect once
+block.end.$(file.patterns.eiffel)=10 end
+
+command.compile.*.e=compile $(FileName)
\ No newline at end of file
diff --git a/scite-app/scite/src/erlang.properties b/scite-app/scite/src/erlang.properties
new file mode 100644
index 0000000..8206cea
--- /dev/null
+++ b/scite-app/scite/src/erlang.properties
@@ -0,0 +1,94 @@
+# Define SciTE settings for Erlang files.
+
+# M: Erlang M-Files
+file.patterns.erlang=*.erl;*.hrl
+
+# M: Erlang M-Files
+filter.erlang=Erlang (erl hrl)|$(file.patterns.erlang)|
+
+*filter.erlang=$(filter.erlang)
+
+lexer.$(file.patterns.erlang)=erlang
+
+#*language.erlang=Erlang|erl||
+
+# Reserved Erlang words
+keywords.$(file.patterns.erlang)=after and andalso band begin bnot bor bsl bsr bxor case catch cond div end fun if let not of or orelse query receive rem try when xor
+# Erlang built-in functions (BIFs)
+keywords2.$(file.patterns.erlang)=erlang: abs adler32 adler32_combine erlang:append_element apply atom_to_binary atom_to_list binary_to_atom binary_to_existing_atom binary_to_list bitstring_to_list binary_to_term bit_size erlang:bump_reductions byte_size erlang:cancel_timer check_process_code concat_binary crc32 crc32_combine date decode_packet delete_module erlang:demonitor disconnect_node erlang:display element erase erlang:error exit float float_to_list erlang:fun_info erlang:fun_to_list erlang:function_exported garbage_collect get erlang:get_cookie get_keys erlang:get_stacktrace group_leader halt erlang:hash hd erlang:hibernate integer_to_list erlang:integer_to_list iolist_to_binary iolist_size is_alive is_atom is_binary is_bitstring is_boolean erlang:is_builtin is_float is_function is_integer is_list is_number is_pid is_port is_process_alive is_record is_reference is_tuple length link list_to_atom list_to_binary list_to_bitstring list_to_existing_atom list_to_float list_to_integer erlang:list_to_integer list_to_pid list_to_tuple load_module erlang:load_nif erlang:loaded erlang:localtime erlang:localtime_to_universaltime make_ref erlang:make_tuple erlang:max erlang:md5 erlang:md5_final erlang:md5_init erlang:md5_update erlang:memory erlang:min module_loaded erlang:monitor monitor_node node nodes now open_port erlang:phash erlang:phash2 pid_to_list port_close port_command erlang:port_command port_connect port_control erlang:port_call erlang:port_info erlang:port_to_list erlang:ports pre_loaded erlang:process_display process_flag process_info processes purge_module put erlang:raise erlang:read_timer erlang:ref_to_list register registered erlang:resume_process round self erlang:send erlang:send_after erlang:send_nosuspend erlang:set_cookie setelement size spawn spawn_link spawn_monitor spawn_opt split_binary erlang:start_timer statistics erlang:suspend_process erlang:system_flag erlang:system_info erlang:system_monitor erlang:system_profile term_to_binary throw time tl erlang:trace erlang:trace_delivered erlang:trace_info erlang:trace_pattern trunc tuple_size tuple_to_list erlang:universaltime erlang:universaltime_to_localtime unlink unregister whereis erlang:yield
+# Erlang preprocessor instructions
+keywords3.$(file.patterns.erlang)=-define -else -endif -ifdef -ifndef -include -include_lib -undef
+# Erlang module attributes
+keywords4.$(file.patterns.erlang)=-behavior -behaviour -compile -created -created_by -export -file -import -module -modified -modified_by -record -revision -spec -type -vsn
+# Erlang documentation helpers
+keywords5.$(file.patterns.erlang)=@author @clear @copyright @deprecated @doc @docfile @end @equiv @headerfile @hidden @private @reference @see @since @spec @throws @title @todo @TODO @type @version
+# Erlang documentation macros
+keywords6.$(file.patterns.erlang)=@date @docRoot @link @module @package @section @time @type @version
+
+# Comment start
+comment.block.erlang=%~
+
+# Erlang styles
+# foreground;background;bold;italic
+
+# Default style
+style.erlang.0=fore:#000000
+
+# Comments
+#---------------------------
+# Default comment
+style.erlang.1=fore:#d00000
+# Function comment
+style.erlang.14=fore:#3f5fbf
+# Module comment
+style.erlang.15=fore:#3f5fbf
+# Documentation helper in comment
+style.erlang.16=fore:#3f5fbf,bold
+# Documentation macro in comment
+style.erlang.17=fore:#3f5fbf,bold,italics
+
+# Types
+#---------------------------
+# Variable
+style.erlang.2=fore:#7f0000
+# Number
+style.erlang.3=fore:#007f00
+# String
+style.erlang.5=fore:#ff901e
+# Character
+style.erlang.9=fore:#007f00
+# Macro
+style.erlang.10=fore:#7f007f
+# Macro quoted
+style.erlang.19=fore:#7f007f
+# Record
+style.erlang.11=fore:#7f7f00,bold
+# Record quoted
+style.erlang.20=fore:#7f7f00,bold
+# Atom
+style.erlang.7=fore:#7f7f00
+# Atom quoted
+style.erlang.18=fore:#7f7f00
+# Node name
+style.erlang.13=fore:#007f7f
+# Node name quoted
+style.erlang.21=fore:#007f7f
+
+# Special
+#---------------------------
+# Reserved words
+style.erlang.4=fore:#00007f,bold
+# Built-in functions
+style.erlang.22=fore:#0000ff,bold
+# Function name
+style.erlang.8=fore:#00007f
+# Module name
+style.erlang.23=fore:#00cccc
+# Module attributes
+style.erlang.24=fore:#007f7f
+# Preprocessor
+style.erlang.12=fore:#007f7f
+# Operators
+style.erlang.6=fore:#000000
+# Unknown: error
+style.erlang.31=back:#FF0000
diff --git a/scite-app/scite/src/escript.properties b/scite-app/scite/src/escript.properties
new file mode 100644
index 0000000..6f05406
--- /dev/null
+++ b/scite-app/scite/src/escript.properties
@@ -0,0 +1,343 @@
+# the directory of the ecompile.exe
+ECOMPILEHOME=C:\Daten\Code\CVS Workspace\etheria-pol095\scripts
+
+#
+# Define SciTE settings for ESCRIPT files.
+#
+filter.escript=E-Script (src em)|$(file.patterns.escript)|
+#filter.escript=E-Script (src inc cfg em)|$(file.patterns.escript)|
+*filter.escript=$(filter.escript)
+
+file.patterns.escript=*.src;*.em
+#file.patterns.escript=*.src;*.inc;*.cfg;*.em
+
+lexer.$(file.patterns.escript)=escript
+escript.case.sensitive=0
+
+
+command.compile.*.src="$(ECOMPILEHOME)\ecompile.exe" $(FileNameExt)
+
+# Default
+style.escript.0=$(font.base)
+# Comment
+style.escript.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment
+style.escript.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment
+style.escript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Number
+style.escript.4=$(colour.number)
+# Keyword
+style.escript.5=fore:#FF4000
+# Double quoted string
+style.escript.6=fore:#FF8000,$(font.string.literal)
+# Operators
+style.escript.7=fore:#FF0000
+#~ Identifiers
+style.escript.8=
+# Braces
+style.escript.9=fore:#0000FF
+# Keywords2
+style.escript.10=fore:#B00040
+# Keywords3
+style.escript.11=fore:#B00040
+#~ Braces are only matched in brace style
+#braces.escript.style=9
+
+
+
+keywords.$(file.patterns.escript)=\
+basic basicio boats \
+cfgfile \
+file \
+http \
+npc \
+os \
+uo util \
+accessible \
+addmenuitem \
+appendconfigfileelem \
+applyconstraint \
+applydamage \
+applyrawdamage \
+assignrecttoweatherregion \
+append \
+baseskilltorawskill \
+boatfromitem \
+broadcast \
+ban \
+cdbl \
+cint \
+cstr \
+checklineofsight \
+checklosat \
+checkskill \
+consumemana \
+consumereagents \
+consumesubstance \
+createaccount \
+createitematlocation \
+createiteminbackpack \
+createitemininventory \
+createitemincontainer \
+createmenu \
+createmultiatlocation \
+createnpcfromtemplate \
+createrootiteminstoragearea \
+createstoragearea \
+clear_script_profile_counters \
+close \
+damage \
+destroyitem \
+destroymulti \
+destroyrootiteminstoragearea \
+detach \
+disableevents \
+disconnectclient \
+distance \
+disable \
+enableevents \
+enumerateitemsincontainer \
+enumerateonlinecharacters \
+equipfromtemplate \
+equipitem \
+eraseglobalproperty \
+eraseobjproperty \
+enable \
+enabled \
+erase \
+events_waiting \
+exists \
+findconfigelem \
+findobjtypeincontainer \
+findrootiteminstoragearea \
+findstoragearea \
+fclose \
+find \
+fopen \
+fread \
+fseek \
+ftell \
+fwrite \
+gamestat \
+getamount \
+getcommandhelp \
+getconfigint \
+getconfigintkeys \
+getconfigmaxintkey \
+getconfigreal \
+getconfigstring \
+getconfigstringkeys \
+getconfigstringarray \
+getelemproperty \
+getequipmentbylayer \
+getglobalproperty \
+getharvestdifficulty \
+getmapinfo \
+getmenuobjtypes \
+getobjproperty \
+getobjtype \
+getobjtypebyname \
+getproperty \
+getrawskill \
+getregionstring \
+getskill \
+getspelldifficulty \
+getstandingheight \
+getworldheight \
+grantprivilege \
+harvestresource \
+healdamage \
+hex \
+islegalmove \
+insert \
+keys \
+listequippeditems \
+listghostsnearlocation \
+listhostiles \
+listitemsatlocation \
+listitemsnearlocation \
+listitemsnearlocationoftype \
+listmobilesinlineofsight \
+listmobilesnearlocation \
+listmobilesnearlocationex \
+listobjectsinbox \
+loadtusscpfile \
+left \
+len \
+log_profile \
+lower \
+makeboundingbox \
+move \
+moveboat \
+moveboatrelative \
+movecharactertolocation \
+moveitemtocontainer \
+moveitemtolocation \
+move_offline_mobiles \
+openpaperdoll \
+open \
+pack \
+performaction \
+playlightningbolteffect \
+playmovingeffect \
+playmovingeffectxyz \
+playobjectcenteredeffect \
+playsoundeffect \
+playsoundeffectprivate \
+playstationaryeffect \
+printtextabove \
+printtextaboveprivate \
+packages \
+polcore \
+position \
+print \
+queryparam \
+randomdiceroll \
+randomint \
+rawskilltobaseskill \
+readconfigfile \
+readgameclock \
+releaseitem \
+registerforspeechevents \
+registeritemwithboat \
+requestinput \
+reserveitem \
+restartscript \
+resurrect \
+revokeprivilege \
+runawayfrom \
+runawayfromlocation \
+runtoward \
+runtowardlocation \
+reverse \
+run_script_to_completion \
+saveworldstate \
+selectmenuitem2 \
+self \
+sendbuywindow \
+senddialoggump \
+sendevent \
+sendopenspecialcontainer \
+sendpacket \
+sendsellwindow \
+sendskillwindow \
+sendstringastipwindow \
+sendsysmessage \
+sendtextentrygump \
+setanchor \
+setglobalproperty \
+setname \
+setobjproperty \
+setopponent \
+setproperty \
+setrawskill \
+setregionlightlevel \
+setregionweatherlevel \
+setscriptcontroller \
+setwarmode \
+shutdown \
+speakpowerwords \
+splitwords \
+startspelleffect \
+subtractamount \
+systemfindboatbyserial \
+systemfindobjectbyserial \
+say \
+set_critical \
+set_debug \
+set_priority \
+set_priority_divide \
+set_script_option \
+setcmdlevel \
+setdex \
+setint \
+setlightlevel \
+setmaster \
+setname \
+setpassword \
+setstr \
+shrink \
+size \
+sleep \
+sleepms \
+sort \
+spendgold \
+squelch \
+start_script \
+syslog \
+system_rpm \
+target \
+targetcoordinates \
+targetmultiplacement \
+turnawayfrom \
+turnawayfromlocation \
+turnboat \
+turntoward \
+turntowardlocation \
+toggle \
+unloadconfigfile \
+unpack \
+unban \
+unload_scripts \
+upper \
+walkawayfrom \
+walkawayfromlocation \
+walktoward \
+walktowardlocation \
+wander \
+writehtml \
+writehtmlraw \
+wait_for_event \
+movechar_forcelocation \
+moveitem_forcelocation \
+moveitem_normal \
+scriptopt_debug \
+scriptopt_no_interrupt \
+scriptopt_no_runaway \
+te_cancel_disable \
+te_cancel_enable \
+te_style_disable \
+te_style_normal \
+te_style_numerical \
+tgtopt_check_los \
+tgtopt_harmful \
+tgtopt_helpful \
+tgtopt_neutral \
+tgtopt_nocheck_los \
+setprop \
+getprop
+
+
+keywords2.$(file.patterns.escript)=\
+array \
+const \
+dictionary \
+global \
+local \
+var \
+and \
+default \
+in \
+next not \
+or \
+return \
+to \
+include \
+use \
+enum
+
+
+keywords3.$(file.patterns.escript)=\
+while \
+for \
+endfor \
+function \
+program \
+endprogram endfunction \
+foreach \
+case \
+else elseif \
+if endcase endenum endforeach endif endwhile
+
+
diff --git a/scite-app/scite/src/flagship.properties b/scite-app/scite/src/flagship.properties
new file mode 100644
index 0000000..72780bb
--- /dev/null
+++ b/scite-app/scite/src/flagship.properties
@@ -0,0 +1,220 @@
+# Define SciTE settings for Harbour and FlagShip files.
+# (Syntactically compatible to other XBase dialects, like dBase, Clipper, Fox etc.)
+# Based on Version .02 by Randy Butler.
+
+# FlagShip Source code file
+file.patterns.flagship=*.prg
+
+lexer.$(file.patterns.flagship)=flagship
+
+*language.flagship=FlagShip|prg||
+
+# FlagShip 6 Commands
+keywordclass.fs6commands=\
+? @ accept access all alternate announce ansi any append as assign autolock average \
+begin bell bitmap blank box \
+call cancel case century charset checkbox clear close cls color combobox commit \
+confirm console constant continue copy count create cursor \
+date dbread dbwrite decimals declare default delete deleted delimiters device dir \
+directory display do draw \
+edit else elseif eject end endcase enddo endif endtext epoch erase error escape eval eventmask \
+exact exclusive extended external extra \
+field file filter find fixed font for form format from \
+get gets global global_extern go goto gotop guialign guicolor guicursor guitransl \
+html htmltext \
+if image index input intensity \
+join \
+key keyboard keytransl \
+label lines list listbox local locate \
+margin memory memvar menu message method multibyte multilocks \
+next nfs nfslock nfs_force note \
+on openerror order outmode \
+pack parameters path pixel pop printer private prompt public push pushbutton \
+quit \
+radiobutton radiogroup read recall refresh reindex relation release rename replace report request restore \
+richtext rowadapt rowalign run \
+save say scoreboard scrcompress screen seek select sequence set setenhanced setstandard setunselected \
+skip softseek sort source static store struct structure sum \
+tag tbrowse text to total type typeahead \
+unique unlock update use \
+wait while with wrap \
+xml zap zerobyteout
+
+# FlagShip 6 Std Library Functions
+keywordclass.fs6libfunc=\
+_displarr _displarrerr _displarrstd _displobj _displobjerr _displobjstd \
+aadd abs achoice aclone acopy adel adir aelemtype aeval afields afill ains alert alias alltrim altd ansi2oem \
+appiomode appmdimode appobject array asc ascan asize asort at atail atanychar autoxlock \
+between bin2i bin2l bin2w binand binlshift binor binrshift binxor bof break browse \
+cdow chr chr2screen cmonth col col2pixel color2rgb colorselect colvisible consoleopen consolesize crc32 ctod curdir \
+date datevalid day dbappend dbclearfilter dbclearindex dbclearrelation dbcloseall dbclosearea dbcommit dbcommitall \
+dbcreate dbcreateindex dbdelete dbedit dbeval dbf dbfilter dbfinfo dbflock dbfused dbgetlocate dbgobottom dbgoto \
+dbgotop dbobject dbrecall dbreindex dbrelation dbrlock dbrlocklist dbrselect dbrunlock dbseek dbselectarea \
+dbsetdriver dbsetfilter dbsetindex dbsetlocate dbsetorder dbsetrelation dbskip dbstruct dbunlock dbunlockall \
+dbusearea default deleted descend devout devoutpict devpos directory diskspace dispbegin dispbox dispcount \
+dispend dispout doserror doserror2str dow drawline dtoc dtos \
+empty eof errorblock errorlevel eval execname execpidnum exp \
+fattrib fclose fcount fcreate ferase ferror ferror2str fieldblock fielddeci fieldget fieldgetarr fieldlen fieldname \
+fieldpos fieldput fieldputarr fieldtype fieldwblock file findexefile fklabel fkmax flagship_dir flock flockf fopen \
+found fread freadstdin freadstr freadtxt frename fs_set fseek fwrite \
+getactive getalign getapplykey getdosetkey getenv getenvarr getfunction getpostvalid getprevalid getreader guidrawline \
+hardcr header hex2num \
+i2bin iif indexcheck indexcount indexdbf indexext indexkey indexnames indexord infobox inkey inkey2read inkey2str inkeytrap \
+instdchar instdstring int int2num isalpha isbegseq iscolor isdbexcl isdbflock isdbmultip isdbmultiple isdbmultipleopen \
+isdbrlock isdigit isfunction isguimode islower isobjclass isobjequiv isobjproperty isprinter isupper \
+l2bin lastkey lastrec left len listbox lock log lower ltrim lupdate \
+macroeval macrosubst max max_col max_row maxcol maxrow mcol mdblck mdiclose mdiopen mdiselect memocode memodecode \
+memoedit memoencode memoline memoread memory memotran memowrit memvarblock mhide min minmax mlcount mlctopos mleftdown \
+mlpos mod month mpostolc mpresent mreststate mrightdown mrow msavestate msetcursor msetpos mshow mstate \
+neterr netname nextkey num2hex num2int \
+objclone oem2ansi onkey ordbagext ordbagname ordcond ordcondset ordcreate orddescend orddestroy ordfor ordisinique \
+ordkey ordkeyadd ordkeycount ordkeydel ordkeygoto ordkeyno ordkeyval ordlistadd ordlistclear ordlistrebui ordname \
+ordnumber ordscope ordsetfocu ordsetrelat ordskipunique os outerr outstd \
+padc padl padr param parameters pcalls pcol pcount pixel2col pixel2row printstatus procfile procline procname procstack proper prow \
+qout qout2 qqout qqout2 \
+rat rddlist rddname rddsetdefault readexit readinsert readkey readkill readmodal readsave readupdated readvar reccount recno recsize \
+replicate restscreen right rlock rlockverify round row row2pixel rowadapt rowvisible rtrim \
+savescreen scrdos2unix screen2chr scroll scrunix2dos seconds secondscpu select serial set setansi setblink setcancel setcol2get \
+setcolor setcolorba setcursor setevent setguicursor setkey setmode setpos setprc setvarempty sleep sleepms soundex space \
+sqrt statbarmsg statusmessage stod str strlen strlen2col strlen2pix strlen2space strpeek strpoke strtran strzero stuff substr \
+tbcolumnnew tbmouse tbrowsearr tbrowsedb tbrowsenew tempfilename time tone transform trim truepath type \
+updated upper used usersactive usersdbf usersmax \
+val valtype version \
+webdate weberrorhandler webgetenvir webgetformdata webhtmlbegin webhtmlend weblogerr webmaildomain weboutdata websendmail word \
+year
+
+# FlagShip 6 function and procedure
+keywordclass.fs6funcproc=\
+function procedure return exit
+
+# FlagShip 6 Class (OOP)
+keywordclass.fs6class=\
+class instance export hidden protect prototype
+
+# Doxygen keywords
+keywordclass.fs6doxygen=a addindex addtogroup anchor arg attention \
+author b brief bug c class code date def defgroup deprecated dontinclude \
+e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception \
+f$ f[ f] file fn hideinitializer htmlinclude htmlonly \
+if image include ingroup internal invariant interface latexonly li line link \
+mainpage name namespace nosubgrouping note overload \
+p page par param param[in] param[out] \
+post pre ref relates remarks return retval \
+sa section see showinitializer since skip skipline struct subsection \
+test throw throws todo typedef union until \
+var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+
+keywords.$(file.patterns.flagship)=$(keywordclass.fs6commands)
+keywords2.$(file.patterns.flagship)=$(keywordclass.fs6libfunc)
+keywords3.$(file.patterns.flagship)=$(keywordclass.fs6funcproc)
+keywords4.$(file.patterns.flagship)=$(keywordclass.fs6class)
+keywords5.$(file.patterns.flagship)=$(keywordclass.fs6doxygen)
+
+#FlagShip Comments
+#comment.block.flagship='/
+comment.block.flagship=//~
+comment.stream.start.flagship=/*
+comment.stream.end.flagship=*/
+comment.box.start.flagship=/*
+comment.box.middle.flagship= *
+comment.box.end.flagship= */
+
+#lexer.flagship.styling.within.preprocessor=0
+
+# FlagShip styles
+
+# Default
+style.flagship.32=$(font.base)
+# White space
+style.flagship.0=
+# Comment * ...
+style.flagship.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Comment Line && ...
+style.flagship.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Comment Doc /* ... */
+style.flagship.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Comment Line Doc // ...
+style.flagship.4=$(colour.code.comment.line),$(font.code.comment.line)
+# Comment keyword
+style.flagship.5=fore:#3060A0,$(font.code.comment.doc)
+# Comment keyword error
+style.flagship.6=fore:#804020,$(font.code.comment.doc)
+
+# Keyword - Commands
+style.flagship.7=$(colour.keyword)
+# keywords 2 - Std Library Functions
+style.flagship.8=$(colour.keyword)
+# keywords 3 - function, procedure, return, exit
+style.flagship.9=$(colour.keyword),bold
+# keywords 4 - Class (oop)
+style.flagship.10=$(colour.keyword),bold
+#style.flagship.10=$(colour.keyword),$(font.monospace),bold
+
+# Number
+style.flagship.11=$(colour.number)
+# String
+style.flagship.12=$(colour.string)
+# Preprocessor (directives)
+style.flagship.13=$(colour.preproc)
+# Operator
+style.flagship.14=$(colour.operator)
+# Identifier
+style.flagship.15=
+# Date
+style.flagship.16=$(colour.number)
+# STRINGEOL - End of line where string is not closed
+style.flagship.17=$(style.stringeol)
+# Constant nil .t. .f.
+style.flagship.18=$(colour.number)
+# Word operator .and. .or. .not.
+style.flagship.19=$(colour.operator)
+# Diasabled code
+style.flagship.20=
+# Default C
+style.flagship.21=
+# Comment Doc C
+style.flagship.22=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Comment Line Doc C
+style.flagship.23=$(colour.code.comment.line),$(font.code.comment.line)
+# Keyword C
+style.flagship.24=$(colour.keyword)
+# Std Library Functions C
+style.flagship.25=$(colour.keyword)
+# Number C
+style.flagship.26=$(colour.number)
+# String C
+style.flagship.27=$(colour.string)
+# Preprocessor C
+style.flagship.28=$(colour.preproc)
+# Operator C
+style.flagship.29=$(colour.operator)
+# Identifier C
+style.flagship.30=
+# STRINGEOL C
+style.flagship.31=$(style.stringeol)
+
+#FlagShip Compiler Option
+fsOptObj=-c -q -w1 -w2 -w3
+fsOptExe=-q -w1 -w2 -w3
+
+#Command for obj file
+fsObj=FlagShip $(fsOptObj) $(FileNameExt) -o $(FileName).o
+
+#Command for exe file
+fsExe=FlagShip $(fsOptExe) $(FileNameExt) -o $(FileName)
+
+# Use flagship without make file
+command.compile.*.prg=$(fsObj)
+command.build.*.prg=$(fsExe)
+command.go.*.prg=$(FileName)
+
+# Use flagship with a make file
+#make.command=make
+#command.compile.*.prg=$(make.command)
+#command.build.*.prg=$(make.command)
+#command.go.*.prg=$(FileName)
+#command.build.*.ch=$(make.command)
+#command.build.*.fh=$(make.command)
+
+# help from fsman
+command.help.$(file.patterns.flagship)=fsman
diff --git a/scite-app/scite/src/forth.properties b/scite-app/scite/src/forth.properties
new file mode 100644
index 0000000..d277c1d
--- /dev/null
+++ b/scite-app/scite/src/forth.properties
@@ -0,0 +1,104 @@
+# Define SciTE settings for Forth files
+
+# These patterns conflict with fortran.properties and nncrontab.properties
+# so disable these other properties files if you want to use forth.
+#file.patterns.forth=*.f;*.spf
+file.patterns.forth=*.forth
+
+# add '*.tab;*.spf;' to 'source.files' variable in 'SciTEGlobal.properties'
+# if you want to include these file patterns into default source file list
+
+lexer.$(file.patterns.forth)=forth
+
+*language.forth=Forth|forth||
+
+filter.forth=Forth files (f spf)|$(file.patterns.forth)|
+
+*filter.forth=$(filter.forth)
+
+word.characters.$(file.patterns.forth)=$(chars.alpha)$(chars.numeric)%-
+
+comment.block.forth=\
+#comment.block.at.line.start.forth=0
+comment.stream.start.forth=(
+comment.stream.end.forth=)
+comment.box.start.forth=\
+comment.box.middle.forth=\
+comment.box.end.forth=\
+
+# Forth styles
+
+# control keywords Forth
+keywords.$(file.patterns.forth)=\
+AGAIN BEGIN CASE DO ELSE ENDCASE ENDOF IF LOOP OF REPEAT THEN UNTIL  WHILE \
+[IF] [ELSE] [THEN] ?DO
+
+# Keywords
+keywords2.$(file.patterns.forth)=\
+DUP DROP ROT SWAP OVER @ ! 2@ 2! 2DUP 2DROP 2SWAP 2OVER NIP R@ >R R> 2R@ 2>R 2R> \
+0= 0< SP@ SP! W@ W! C@ C! < > = <> 0<>\
+SPACE SPACES KEY? KEY THROW CATCH ABORT */ 2* /MOD CELL+ CELLS CHAR+ \
+CHARS MOVE ERASE DABS TITLE HEX DECIMAL HOLD <# # #S #> SIGN \
+D. . U. DUMP (.") >NUMBER ' IMMEDIATE EXIT RECURSE UNLOOP LEAVE HERE ALLOT , \
+C, W, COMPILE, BRANCH, RET, LIT, DLIT, ?BRANCH, ", >MARK >RESOLVE1 <MARK >RESOLVE \
+ALIGN ALIGNED USER-ALLOT USER-HERE HEADER DOES> SMUDGE HIDE :NONAME LAST-WORD \
+?ERROR ERROR2 FIND1 SFIND SET-CURRENT GET-CURRENT DEFINITIONS GET-ORDER FORTH \
+ONLY SET-ORDER ALSO PREVIOUS VOC-NAME. ORDER LATEST LITERAL 2LITERAL SLITERAL \
+CLITERAL ?LITERAL1 ?SLITERAL1 HEX-LITERAL HEX-SLITERAL ?LITERAL2 ?SLITERAL2 SOURCE \
+EndOfChunk CharAddr PeekChar IsDelimiter GetChar OnDelimiter SkipDelimiters OnNotDelimiter \
+SkipWord SkipUpTo ParseWord NextWord PARSE SKIP CONSOLE-HANDLES REFILL DEPTH ?STACK \
+?COMP WORD INTERPRET BYE QUIT MAIN1 EVALUATE INCLUDE-FILE INCLUDED >BODY +WORD \
+WORDLIST CLASS! CLASS@ PAR! PAR@ ID. ?IMMEDIATE ?VOC IMMEDIATE VOC WordByAddrWl \
+WordByAddr NLIST WORDS SAVE OPTIONS /notransl ANSI>OEM ACCEPT EMIT CR TYPE EKEY? \
+EKEY EKEY>CHAR EXTERNTASK ERASE-IMPORTS ModuleName ModuleDirName ENVIRONMENT? \
+DROP-EXC-HANDLER SET-EXC-HANDLER HALT ERR CLOSE-FILE CREATE-FILE CREATE-FILE-SHARED \
+OPEN-FILE-SHARED DELETE-FILE FILE-POSITION FILE-SIZE OPEN-FILE READ-FILE REPOSITION-FILE \
+DOS-LINES UNIX-LINES READ-LINE WRITE-FILE RESIZE-FILE WRITE-LINE ALLOCATE FREE RESIZE \
+START SUSPEND RESUME STOP PAUSE MIN MAX TRUE FALSE ASCIIZ> \
+R/O W/O ;CLASS ENDWITH OR AND /STRING SEARCH COMPARE EXPORT ;MODULE SPACE
+
+# defwords
+keywords3.$(file.patterns.forth)=\
+VARIABLE CREATE : VALUE CONSTANT VM: M: var dvar chars OBJ \
+CONSTR: DESTR: CLASS: OBJECT: POINTER \
+USER USER-CREATE USER-VALUE VECT \
+WNDPROC: VOCABULARY -- TASK: CEZ: MODULE:
+
+# prewords1
+keywords4.$(file.patterns.forth)=\
+CHAR [CHAR] POSTPONE WITH ['] TO [COMPILE] CHAR ASCII \'
+
+# prewords2
+keywords5.$(file.patterns.forth)=\
+REQUIRE WINAPI:
+
+# string words
+keywords6.$(file.patterns.forth)=\
+S" ABORT" Z" " ." C"
+
+# whitespace (SCE_FORTH_DEFAULT)
+style.forth.0=$(font.monospace)
+# Comment (SCE_FORTH_COMMENT)
+style.forth.1=fore:#009933,$(font.comment),$(font.monospace)
+# ML comment (SCE_FORTH_COMMENT_ML)
+style.forth.2=fore:#007F00,$(font.comment)
+# ML comment (SCE_FORTH_IDENTIFIER)
+style.forth.3=fore:#000000,bold
+# control (SCE_FORTH_CONTROL)
+style.forth.4=fore:#00007F,bold
+# Keywords (SCE_FORTH_KEYWORD)
+style.forth.5=fore:#000000,$(font.monospace),bold
+# defwords (SCE_FORTH_DEFWORD)
+style.forth.6=fore:#FF0000,bold,$(font.monospace)
+# preword1 (SCE_FORTH_PREWORD1)
+style.forth.7=fore:#CC3300,bold,$(font.monospace)
+# preword2 (SCE_FORTH_PREWORD2)
+style.forth.8=fore:#996633,bold,$(font.monospace)
+# number (SCE_FORTH_NUMBER)
+style.forth.9=fore:#007F7F,$(font.monospace)
+# Double quoted string (SCE_FORTH_STRING)
+style.forth.10=fore:#CC3300,$(font.monospace)
+# locale
+style.forth.11=fore:#0000CC,$(font.monospace)
+
+#command.compile.*.f=spf.cmd $(FileNameExt)
diff --git a/scite-app/scite/src/fortran.properties b/scite-app/scite/src/fortran.properties
new file mode 100644
index 0000000..b1dbebb
--- /dev/null
+++ b/scite-app/scite/src/fortran.properties
@@ -0,0 +1,167 @@
+# Define SciTE settings for Fortran files.
+
+filter.fortran=Fortran (f for f90 f95 f2k)|*.f;*.for;*.f90;*.f95;*.f2k|
+
+*filter.fortran=$(filter.fortran)
+
+file.patterns.f95=*.f90;*.f95;*.f2k
+file.patterns.f77=*.f;*.for
+file.patterns.fortran=$(file.patterns.f95);$(file.patterns.f77)
+
+lexer.$(file.patterns.f95)=fortran
+lexer.$(file.patterns.f77)=f77
+
+*language.fortran=&Fortran|f90||
+
+# keywords and input/output specifiers
+keywordclass.fortran=access action advance allocatable allocate \
+apostrophe assign assignment associate asynchronous backspace \
+bind blank blockdata call case character class close common \
+complex contains continue critical cycle data deallocate decimal delim \
+default dimension direct do dowhile double doubleprecision else \
+elseif elsewhere encoding end endassociate endblockdata enddo \
+endfile endforall endfunction endif endinterface endmodule endprogram \
+endselect endsubroutine endtype endwhere entry eor equivalence \
+err errmsg exist exit external file flush fmt forall form format \
+formatted function go goto id if implicit in include inout \
+integer inquire intent interface intrinsic iomsg iolength \
+iostat is kind len logical module name named namelist nextrec nml \
+none nullify number only open opened operator optional out pad \
+parameter pass pause pending pointer pos position precision \
+print private procedure program protected public quote read readwrite \
+real rec recl recursive result return rewind save select \
+selectcase selecttype sequential sign size stat status stop stream \
+subroutine target then to type unformatted unit use value \
+volatile wait where while write
+
+keywords.$(file.patterns.f95)=$(keywordclass.fortran)
+keywords.$(file.patterns.f77)=$(keywordclass.fortran)
+
+# keywords2 is for highlighting intrinsic and extended functions
+keywords2.$(file.patterns.fortran)=abs achar acos acosd adjustl adjustr \
+aimag aimax0 aimin0 aint ajmax0 ajmin0 akmax0 akmin0 all allocated alog \
+alog10 amax0 amax1 amin0 amin1 amod anint any asin asind associated \
+atan atan2 atan2d atand bitest bitl bitlr bitrl bjtest bit_size bktest break \
+btest cabs ccos cdabs cdcos cdexp cdlog cdsin cdsqrt ceiling cexp char \
+clog cmplx conjg cos cosd cosh count cpu_time cshift csin csqrt dabs \
+dacos dacosd dasin dasind datan datan2 datan2d datand date \
+date_and_time dble dcmplx dconjg dcos dcosd dcosh dcotan ddim dexp \
+dfloat dflotk dfloti dflotj digits dim dimag dint dlog dlog10 dmax1 dmin1 \
+dmod dnint dot_product dprod dreal dsign dsin dsind dsinh dsqrt dtan dtand \
+dtanh eoshift epsilon errsns exp exponent float floati floatj floatk floor fraction \
+free huge iabs iachar iand ibclr ibits ibset ichar idate idim idint idnint ieor ifix \
+iiabs iiand iibclr iibits iibset iidim iidint iidnnt iieor iifix iint iior iiqint iiqnnt iishft \
+iishftc iisign ilen imax0 imax1 imin0 imin1 imod index inint inot int int1 int2 int4 \
+int8 iqint iqnint ior ishft ishftc isign isnan izext jiand jibclr jibits jibset jidim jidint \
+jidnnt jieor jifix jint jior jiqint jiqnnt jishft jishftc jisign jmax0 jmax1 jmin0 jmin1 \
+jmod jnint jnot jzext kiabs kiand kibclr kibits kibset kidim kidint kidnnt kieor kifix \
+kind kint kior kishft kishftc kisign kmax0 kmax1 kmin0 kmin1 kmod knint knot kzext \
+lbound leadz len len_trim lenlge lge lgt lle llt log log10 logical lshift malloc matmul \
+max max0 max1 maxexponent maxloc maxval merge min min0 min1 minexponent minloc \
+minval mod modulo mvbits nearest nint not nworkers number_of_processors pack popcnt \
+poppar precision present product radix random random_number random_seed range real \
+repeat reshape rrspacing rshift scale scan secnds selected_int_kind \
+selected_real_kind set_exponent shape sign sin sind sinh size sizeof sngl snglq spacing \
+spread sqrt sum system_clock tan tand tanh tiny transfer transpose trim ubound unpack verify
+
+# keywords3 are nonstardard, extended and user defined functions
+keywords3.$(file.patterns.fortran)=cdabs cdcos cdexp cdlog cdsin cdsqrt cotan cotand \
+dcmplx dconjg dcotan dcotand decode dimag dll_export dll_import doublecomplex dreal \
+dvchk encode find flen flush getarg getcharqq getcl getdat getenv gettim hfix ibchng \
+identifier imag int1 int2 int4 intc intrup invalop iostat_msg isha ishc ishl jfix \
+lacfar locking locnear map nargs nbreak ndperr ndpexc offset ovefl peekcharqq precfill \
+prompt qabs qacos qacosd qasin qasind qatan qatand qatan2 qcmplx qconjg qcos qcosd \
+qcosh qdim qexp qext qextd qfloat qimag qlog qlog10 qmax1 qmin1 qmod qreal qsign qsin \
+qsind qsinh qsqrt qtan qtand qtanh ran rand randu rewrite segment setdat settim system \
+timer undfl unlock union val virtual volatile zabs zcos zexp zlog zsin zsqrt
+
+#fold.comment.fortran=1
+#fold.quotes.fortran=1
+
+comment.block.fortran=!~
+
+# These setting do not work very well for FORTRAN, uncoment to use it
+# statement.indent.$(file.patterns.fortran)=8 associate block blockdata case do enum \
+# 	function interface module program subroutine then type where
+
+# Fortran styles
+# Default
+style.fortran.0=fore:#808080
+style.f77.0=fore:#808080
+style.fortran.32=
+style.f77.32=
+# Comment
+style.fortran.1=$(colour.code.comment.line),$(font.code.comment.line)
+style.f77.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.fortran.2=$(colour.number)
+style.f77.2=$(colour.number)
+# Single quoted string
+style.fortran.3=$(colour.string)
+style.f77.3=$(colour.string)
+# Double quoted string
+style.fortran.4=$(colour.string)
+style.f77.4=$(colour.string)
+# End of line where string is not closed
+style.fortran.5=fore:#000000,back:#E0C0E0,eolfilled
+style.f77.5=fore:#000000,back:#E0C0E0,eolfilled
+# Operators
+style.fortran.6=$(colour.operator),bold
+style.f77.6=$(colour.operator),bold
+# Identifiers
+style.fortran.7=
+style.f77.7=
+# Keywords
+style.fortran.8=$(colour.keyword),case:u
+style.f77.8=$(colour.keyword),case:u
+# Keywords2
+style.fortran.9=fore:#B00040
+style.f77.9=fore:#B00040
+# Keywords3
+style.fortran.10=fore:#B04080
+style.f77.10=fore:#B04080
+# Preprocessor
+style.fortran.11=$(colour.preproc)
+style.f77.11=$(colour.preproc)
+# Operators in .NAME. format
+style.fortran.12=$(colour.operator),bold
+style.f77.12=$(colour.operator),bold
+# Labels
+style.fortran.13=fore:#E0C0E0
+style.f77.13=fore:#E0C0E0
+# Continuation
+style.fortran.14=fore:#000000,back:#F0E080
+style.f77.14=fore:#000000,back:#F0E080
+# Braces are matched in all cases
+braces.fortran.style=0
+
+if PLAT_WIN
+	fc77=lf95 $(FileNameExt) -c -fix
+	fc90=lf95 $(FileNameExt) -c
+if PLAT_GTK
+	fc77=f77 -c -o $(FileName).o $(FileNameExt)
+	fc90=f90 -c -o $(FileName).o $(FileNameExt)
+
+command.compile.*.f=$(fc77)
+command.build.*.f=make
+command.go.*.f=$(FileName)
+
+command.compile.*.for=$(fc77)
+command.build.*.for=make
+command.go.*.for=$(FileName)
+
+command.compile.*.f90=$(fc90)
+command.build.*.f90=make
+command.go.*.f90=$(FileName)
+
+command.compile.*.f95=$(fc90)
+command.build.*.f95=make
+command.go.*.f95=$(FileName)
+
+if PLAT_WIN
+    api.$(file.patterns.fortran)=$(SciteDefaultHome)\fortran.api
+
+autocomplete.fortran.ignorecase=1
+autocomplete.f77.ignorecase=1
+calltip.fortran.ignorecase=1
+calltip.f77.ignorecase=1
diff --git a/scite-app/scite/src/freebasic.properties b/scite-app/scite/src/freebasic.properties
new file mode 100644
index 0000000..604e1c5
--- /dev/null
+++ b/scite-app/scite/src/freebasic.properties
@@ -0,0 +1,89 @@
+# Define SciTE settings for FreeBasic files.
+
+file.patterns.freebasic=*.bas;*.bi
+
+filter.freebasic=FreeBasic (bb bi)|$(file.patterns.freebasic)|
+
+*filter.freebasic=$(filter.freebasic)
+
+lexer.$(file.patterns.freebasic)=freebasic
+
+*language.freebasic=FreeBasic|bas||
+
+# keywords must be all lowercase
+
+keywordclass.freebasic=\
+append as asc asin asm atan2 atn beep bin binary bit bitreset bitset bload \
+bsave byref byte byval call callocate case cbyte cdbl cdecl chain chdir chr \
+cint circle clear clng clngint close cls color command common cons const \
+continue cos cshort csign csng csrlin cubyte cuint culngint cunsg curdir \
+cushort custom cvd cvi cvl cvlongint cvs cvshort data date deallocate declare \
+defbyte defdbl defined defint deflng deflngint defshort defsng defstr defubyte \
+defuint defulngint defushort dim dir do double draw dylibload dylibsymbol else \
+elseif end enum environ environ$ eof eqv erase err error exec exepath exit exp \
+export extern field fix flip for fre freefile function get getjoystick getkey \
+getmouse gosub goto hex hibyte hiword if iif imagecreate imagedestroy imp \
+inkey inp input instr int integer is kill lbound lcase left len let lib line \
+lobyte loc local locate lock lof log long longint loop loword lset ltrim \
+mid mkd mkdir mki mkl mklongint mks mkshort mod multikey mutexcreate \
+mutexdestroy mutexlock mutexunlock name next not oct on once open option or out \
+output overload paint palette pascal pcopy peek peeki peeks pipe pmap point \
+pointer poke pokei pokes pos preserve preset print private procptr pset ptr \
+public put random randomize read reallocate redim rem reset restore resume \
+resume next return rgb rgba right rmdir rnd rset rtrim run sadd screen \
+screencopy screeninfo screenlock screenptr screenres screenset screensync \
+screenunlock seek statement seek function selectcase setdate setenviron \
+setmouse settime sgn shared shell shl short shr sin single sizeof sleep space \
+spc sqr static stdcall step stop str string string strptr sub swap system tab \
+tan then threadcreate threadwait time time timer to trans trim type ubound \
+ubyte ucase uinteger ulongint union unlock unsigned until ushort using va_arg \
+va_first va_next val val64 valint varptr view viewprint wait wend while width \
+window windowtitle with write xor zstring
+
+keywordclass.preprocessor=\
+#define #dynamic #else #endif #error #if #ifdef #ifndef #inclib #include \
+#print #static #undef
+
+keywords.$(file.patterns.freebasic)=$(keywordclass.freebasic)
+keywords2.$(file.patterns.freebasic)=$(keywordclass.preprocessor)
+
+# FB styles
+# Default
+style.freebasic.0=fore:#000000
+# Comment
+style.freebasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.freebasic.2=$(colour.number)
+# Keyword1
+style.freebasic.3=$(colour.keyword),bold
+# String
+style.freebasic.4=$(colour.string)
+# Preprocessor
+style.freebasic.5=$(colour.preproc)
+# Operator
+style.freebasic.6=$(colour.operator)
+# Identifier
+style.freebasic.7=$(style.freebasic.0)
+# Date
+# style.freebasic.8=$(colour.error)
+# StringEOL
+# style.freebasic.9=$(colour.error)
+# Keyword2
+style.freebasic.10=$(colour.keyword)
+# Keyword3
+style.freebasic.11=$(colour.keyword)
+# Keyword4
+style.freebasic.12=$(colour.keyword)
+# Constant
+# style.freebasic.13=$(colour.error)
+# Asm
+# style.freebasic.14=$(colour.error)
+# Label
+style.freebasic.15=$(colour.preproc)
+# Error
+style.freebasic.16=$(colour.error)
+# HexNumber
+style.freebasic.17=$(colour.number)
+# BinNumber
+style.freebasic.18=$(colour.number)
+
diff --git a/scite-app/scite/src/fsharp.properties b/scite-app/scite/src/fsharp.properties
new file mode 100644
index 0000000..f953b44
--- /dev/null
+++ b/scite-app/scite/src/fsharp.properties
@@ -0,0 +1,126 @@
+# SciTE settings for F#
+*language.fsharp=F#|fsharp||
+file.patterns.fsharp=*.fs;*.fsi;*.fsx;*.fsscript
+lexer.$(file.patterns.fsharp)=fsharp
+filter.fsharp=F# (fs fsi fsx fsscript)|$(file.patterns.fsharp)|
+*filter.fsharp=$(filter.fsharp)
+
+word.chars.fsharp=$(chars.alpha)$(chars.numeric)_'`
+word.characters.$(file.patterns.fsharp)=$(word.chars.fsharp)
+
+indent.size.$(file.patterns.fsharp)=4
+statement.indent.$(file.patterns.fsharp)=4 let type
+use.tabs.$(file.patterns.fsharp)=0
+
+comment.block.fsharp=//
+comment.stream.start.fsharp=(*
+comment.stream.end.fsharp=*)
+
+preprocessor.symbol.$(file.patterns.fsharp)=#
+preprocessor.start.$(file.patterns.fsharp)=if indent light load nowarn r
+preprocessor.middle.$(file.patterns.fsharp)=else
+preprocessor.end.$(file.patterns.fsharp)=endif
+
+# fold.fsharp.comment.stream=0
+# fold.fsharp.comment.multiline=0
+# fold.fsharp.syntax.based=0
+fold.fsharp.preprocessor=1
+# fold.fsharp.imports=0
+
+# Default
+style.fsharp.0=$(font.base)
+# Keywords (std language keywords)
+style.fsharp.1=$(colour.keyword)
+# Keywords2 (core functions)
+style.fsharp.2=$(colour.keyword),bold
+# Keywords3 (built-in types, core namespaces, modules)
+style.fsharp.3=fore:#378bba,bold
+# Keywords4 (user-defined type names)
+style.fsharp.4=fore:#b72f14,bold
+# Keywords5 (user-defined type variants)
+style.fsharp.5=fore:#378bba
+# Identifiers
+style.fsharp.6=fore:#686868
+# Quoted identifiers
+style.fsharp.7=fore:#a00100
+# Comments
+style.fsharp.8=$(colour.code.comment.line)
+style.fsharp.9=$(colour.code.comment.line)
+# Compiler directive
+style.fsharp.10=fore:#5c2c26
+# Line numbers
+style.fsharp.11=fore:#5c2c26,back:#e0f3ff
+# Operators
+style.fsharp.12=$(colour.operator),bold
+# Number
+style.fsharp.13=$(colour.number)
+# Character constant
+style.fsharp.14=fore:#cd6000
+# String constant
+style.fsharp.15=fore:#cd6000
+# Verbatim string
+style.fsharp.16=fore:#800080
+# Quoted expressions
+style.fsharp.17=fore:#b72f14,back:#fefde0
+# Attributes
+style.fsharp.18=fore:#378bba
+# Format specifiers
+style.fsharp.19=$(colour.operator)
+
+# standard language keywords
+keywords.standard.fsharp= \
+abstract and as assert base begin class default delegate do done downcast \
+downto elif else end exception extern false finally fixed for fun function \
+global if in inherit inline interface internal lazy let let! match match! \
+member module mutable namespace new null of open or override private public \
+rec return return! select static struct then to true try type upcast use use! \
+val void when while with yield yield! atomic break checked component const \
+constraint constructor continue eager event external fixed functor global \
+include method mixin object parallel process protected pure sealed tailcall \
+trait virtual volatile
+
+# core functions, including those in FSharp.Collections
+keywords.functions.fsharp= \
+abs acos add allPairs append asin asr atan atan2 average averageBy base1 base2 \
+blit cache cast ceil choose chunkBySize collect compareWith concat contains containsKey \
+copy cos cosh count countBy create createBased delay difference distinct distinctBy empty \
+eprintf except exists exists2 exactlyOne failwith fill filter find findBack findIndex findIndexBack \
+findKey floor fold fold2 foldBack foldBack2 forall forall2 fprintf fst get groupBy head ignore indexed \
+init initBased initInfinite intersect intersectMany invalidArg isEmpty isProperSubset \
+isProperSuperset isSubset isSuperset item iter iter2 iteri iteri2 land last length \
+length1 length2 length3 length4 lor lsl lsr lxor map map2 map3 mapFold mapFoldBack mapi mapi2 \
+max maxBy maxElement min minBy minElement mod nameof not ofArray ofList ofSeq pairwise partition \
+permute pick pown printf printfn raise readonly rebase reduce reduceBack remove replicate rev round scan \
+scanBack seq set sig sin sinh singleton skip skipWhile snd sort sortBy sortByDescending sortDescending \
+sortInPlace sortInPlaceBy sortInPlaceWith sortWith splitAt splitInto sprintf sqrt sub sum \
+sumBy tail take takeWhile tan tanh toArray toList toSeq transpose truncate \
+tryExactlyOne tryFind tryFindBack tryFindIndex tryFindIndexBack tryHead \
+tryItem tryFindKey tryLast tryPick typeof unfold union unionMany unzip unzip3 where \
+windowed zeroCreate zeroCreateBased zip zip3
+
+# built-in types, core namespaces, modules
+keywords.types.fsharp= \
+ArgumentException Array Array2D Array3D Array4D BigInteger Boolean Byte Char Collections Console Core \
+CultureInfo DateTime Decimal Double Environment Expr Float FSharp Globalization Int16 Int32 Int64 IntPtr \
+IO Linq List Map Math Microsoft NumberStyles Object Parallel Printf Random Regex ResizeArray SByte Seq Set Single \
+String System UInt16 UInt32 UInt64 UIntPtr array bigint bool byte byref char comparison decimal double enum \
+equality Error Exception exn float float32 inref int int8 int16 int32 int64 list nativeint nativeptr None obj \
+Ok option Option outref ref Result sbyte Some single string unmanaged unativeint uint uint8 uint16 uint32 uint64 \
+unit void voidptr voption
+
+# optional (e.g. user-defined record or union types and classes)
+keywords.optional.1.fsharp=
+# optional (e.g. user-defined union type variants, record members)
+keywords.optional.2.fsharp=
+
+keywords.$(file.patterns.fsharp)=$(keywords.standard.fsharp)
+keywords2.$(file.patterns.fsharp)=$(keywords.functions.fsharp)
+keywords3.$(file.patterns.fsharp)=$(keywords.types.fsharp)
+keywords4.$(file.patterns.fsharp)=$(keywords.optional.1.fsharp)
+keywords5.$(file.patterns.fsharp)=$(keywords.optional.2.fsharp)
+
+# The below command(s) can and should be adjusted to reflect your environment;
+# in addition, per-directory overrides are possible, so that project-specific "build"
+# commands may be used for more complex cases - see the SciTE documentation.
+command.compile.$(file.patterns.fsharp)=fsc /nologo $(FileNameExt)
+command.go.$(file.patterns.fsharp)=dotnet fsi /nologo /exec $(FileNameExt)
\ No newline at end of file
diff --git a/scite-app/scite/src/gap.properties b/scite-app/scite/src/gap.properties
new file mode 100644
index 0000000..14e1226
--- /dev/null
+++ b/scite-app/scite/src/gap.properties
@@ -0,0 +1,53 @@
+# Define SciTE settings for GAP files.
+
+file.patterns.gap=*.g;*.gd;*.gi
+
+# GAP files
+filter.gap=Gap (g gi gd)|$(file.patterns.gap)|
+
+*filter.gap=$(filter.gap)
+
+*source.patterns.gap=$(file.patterns.gap);
+
+lexer.$(file.patterns.gap)=gap
+
+*language.gap=Gap|g||
+
+keywords.$(file.patterns.gap)=and break continue do elif else end fi for function \
+if in local mod not od or quit rec repeat return then until while QUIT
+
+keywords2.$(file.patterns.gap)=false true IsBound Unbind TryNextMethod \
+Info Assert SaveWorkspace fail
+
+#keywords3.$(file.patterns.gap)
+
+comment.block.gap=#~
+
+# GAP styles
+# White space
+style.gap.0=fore:#808080
+# Identifiers
+style.gap.1=
+# Keywords
+style.gap.2=$(colour.keyword),bold
+# Keywords 2
+style.gap.3=$(colour.keyword)
+# Keywords 3
+style.gap.4=$(colour.keyword)
+# Keywords 4
+style.gap.5=$(colour.keyword)
+# Strings
+style.gap.6=$(colour.string)
+# Characters
+style.gap.7=$(colour.char)
+# Operators
+style.gap.8=$(colour.operator),bold
+# Comment
+style.gap.9=$(colour.code.comment.line)
+# Numbers
+style.gap.10=$(colour.number)
+# End of line where string is not closed
+style.gap.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+
+# Braces are only matched in operator style
+braces.gap.style=8
diff --git a/scite-app/scite/src/haskell.properties b/scite-app/scite/src/haskell.properties
new file mode 100644
index 0000000..0d57245
--- /dev/null
+++ b/scite-app/scite/src/haskell.properties
@@ -0,0 +1,70 @@
+# Define SciTE settings for Haskell.
+
+lexer.*.hs=haskell
+filter.hs=Haskell (hs)|*.hs|
+
+*filter.hs=$(filter.hs)
+
+*language.haskell=Haskell|hs||
+
+# white space
+style.haskell.0=fore:#808080
+# identifier
+style.haskell.1=
+# keyword
+style.haskell.2=$(colour.keyword),bold
+# numbers
+style.haskell.3=$(colour.number)
+# string
+style.haskell.4=$(colour.string)
+# character
+style.haskell.5=$(colour.char)
+# class: error not implemented
+style.haskell.6=back:#FF0000
+# module
+style.haskell.7=
+# capital
+style.haskell.8=
+# data: error not implemented
+style.haskell.9=back:#FF0000
+# import: error not implemented
+style.haskell.10=back:#FF0000
+# operator
+style.haskell.11=$(colour.operator),bold
+# instance: error not implemented
+style.haskell.12=back:#FF0000
+# line comment
+style.haskell.13=$(colour.code.comment.line),$(font.code.comment.line)
+# block comment
+style.haskell.14=$(colour.code.comment.box),$(font.code.comment.box)
+# block comment 2
+style.haskell.15=$(colour.code.comment.box),$(font.code.comment.box)
+# block comment 3
+style.haskell.16=$(colour.code.comment.box),$(font.code.comment.box)
+# pragma
+style.haskell.17=fore:#BF6F00
+# preprocessor
+style.haskell.18=$(colour.preproc)
+# End of line where string is not closed
+style.haskell.19=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Reserved operator
+style.haskell.20=back:#FF8080
+
+# Available in literatehaskell lexer:
+# Literate comment
+style.haskell.21=fore:#DD9900,$(font.code.comment.line),italics
+# Literate delimiter
+style.haskell.22=fore:#EE00AA
+
+# keywords for Haskell 98
+keywordclass.haskell98=case class data default deriving do else hiding if \
+import in infix infixl infixr instance let module \
+newtype of then type where forall foreign
+
+# keywords for FFI
+keywordclass.ffi=export label dynamic safe threadsafe \
+unsafe stdcall ccall prim
+
+keywords.*.hs=$(keywordclass.haskell98)
+
+keywords2.*.hs=$(keywordclass.ffi)
diff --git a/scite-app/scite/src/hex.properties b/scite-app/scite/src/hex.properties
new file mode 100644
index 0000000..8601a93
--- /dev/null
+++ b/scite-app/scite/src/hex.properties
@@ -0,0 +1,108 @@
+# Define SciTE settings for Motorola S-Record and Intel HEX files.
+
+file.patterns.srec=*.mot;*.srec
+file.patterns.ihex=*.hex
+file.patterns.tehex=*.tek
+
+filter.srec=S-Record (mot)|$(file.patterns.srec)|
+filter.ihex=Intel HEX (hex)|$(file.patterns.ihex)|
+filter.tehex=Tektronix extended HEX (tek)|$(file.patterns.tehex)|
+
+*filter.srec=$(filter.srec)
+*filter.ihex=$(filter.ihex)
+*filter.tehex=$(filter.tehex)
+
+lexer.$(file.patterns.srec)=srec
+lexer.$(file.patterns.ihex)=ihex
+lexer.$(file.patterns.tehex)=tehex
+
+*language.srecord=S-Record|mot||
+*language.intelhex=Intel HEX|hex||
+*language.tektronixhex=Tektronix extended HEX|tek||
+
+# Default
+style.srec.0=
+# Record start 'S'
+style.srec.1=$(style.srec.2)
+# Record type
+style.srec.2=fore:#7F0000
+# Record type unknown
+style.srec.3=$(style.srec.2),$(style.srec.10)
+# Byte count field: Correct byte count
+style.srec.4=fore:#7F7F00
+# Byte count field: Wrong byte count
+style.srec.5=$(colour.error)
+# Address field: No address
+style.srec.6=fore:#7F00FF
+# Address field: Data address
+style.srec.7=fore:#007FFF
+# Address field: Record count
+style.srec.8=$(style.srec.6)
+# Address field: Start address
+style.srec.9=$(style.srec.7)
+# Address field: Type unknown (this state does not contain any characters)
+style.srec.10=italics
+# .11 N/A
+# Data odd
+style.srec.12=bold
+# Data even
+style.srec.13=
+# Data field: Position unknown
+style.srec.14=$(style.srec.10)
+# Data field empty (this state does not contain any characters)
+style.srec.15=
+# Checksum field: Correct checksum
+style.srec.16=fore:#00BF00
+# Checksum field: Wrong checksum
+style.srec.17=$(colour.error)
+# Garbage data after the record
+style.srec.18=$(style.srec.10)
+
+# Same color scheme as above, comments when differing
+style.ihex.0=$(style.srec.0)
+# Record start ':'
+style.ihex.1=$(style.srec.1)
+style.ihex.2=$(style.srec.2)
+style.ihex.3=$(style.srec.3)
+style.ihex.4=$(style.srec.4)
+style.ihex.5=$(style.srec.5)
+style.ihex.6=$(style.srec.6)
+style.ihex.7=$(style.srec.7)
+# .8 N/A
+# Data field: Start address
+style.ihex.9=$(style.srec.9)
+# Address field: Type unknown (4 digits as usual)
+style.ihex.10=$(style.srec.10)
+# Data field: Extended address
+style.ihex.11=$(style.ihex.9)
+style.ihex.12=$(style.srec.12)
+style.ihex.13=$(style.srec.13)
+# Data field: Type unknown
+style.ihex.14=$(style.srec.14)
+style.ihex.15=$(style.srec.15)
+style.ihex.16=$(style.srec.16)
+style.ihex.17=$(style.srec.17)
+style.ihex.18=$(style.srec.18)
+
+# Same color scheme as above, comments when differing
+style.tehex.0=$(style.srec.0)
+# Record start '%'
+style.tehex.1=$(style.srec.1)
+style.tehex.2=$(style.srec.2)
+style.tehex.3=$(style.srec.3)
+style.tehex.4=$(style.srec.4)
+style.tehex.5=$(style.srec.5)
+# .6 N/A
+style.tehex.7=$(style.srec.7)
+# .8 N/A
+style.tehex.9=$(style.srec.9)
+# Address field: Type unknown (9 digits as usual)
+style.tehex.10=$(style.srec.10)
+# .11 N/A
+style.tehex.12=$(style.srec.12)
+style.tehex.13=$(style.srec.13)
+# .14 N/A
+# .15 N/A
+style.tehex.16=$(style.srec.16)
+style.tehex.17=$(style.srec.17)
+style.tehex.18=$(style.srec.18)
diff --git a/scite-app/scite/src/html.properties b/scite-app/scite/src/html.properties
new file mode 100644
index 0000000..3d02266
--- /dev/null
+++ b/scite-app/scite/src/html.properties
@@ -0,0 +1,610 @@
+# Define SciTE settings for HTML files.
+
+# vxml added by lseredi
+
+file.patterns.web=*.html;*.htm;*.asp;*.shtml;*.htd;*.jsp;*.xhtml
+file.patterns.php=*.php3;*.phtml;*.php
+file.patterns.html=$(file.patterns.web);$(file.patterns.php);*.htt;*.cfm;*.tpl;*.dtd;*.hta
+file.patterns.vxml=*.vxml
+file.patterns.xml=*.xml;*.xsl;*.svg;*.xul;*.xsd;*.dtd;*.xslt;*.axl;*.xrc;*.rdf
+file.patterns.docbook=*.docbook
+
+# *.mak also used for makefiles so don't include by default.
+#file.patterns.mako=*.mak;*.mako
+file.patterns.mako=*.mako
+
+*source.patterns.cgi=*.cgi;
+*source.patterns.html=$(file.patterns.web);
+*source.patterns.xml=$(file.patterns.xml);
+
+lexer.$(file.patterns.html)=hypertext
+lexer.$(file.patterns.vxml)=hypertext
+lexer.$(file.patterns.xml)=xml
+lexer.$(file.patterns.docbook)=hypertext
+lexer.$(file.patterns.mako)=hypertext
+
+filter.web=Web (html htm asp shtml css xml docbook jsp)|$(file.patterns.web);*.css;*.xml;*.docbook|
+filter.php=PHP (php php3 phtml)|$(file.patterns.php)|
+
+*filter.web=$(filter.web)
+*filter.php=$(filter.php)
+
+*language.html=H&ypertext|html|$(keyHTML)|
+*language.php=P&HP|php||
+*language.xml=&XML|xml|$(keyXML)|
+
+fold.html=1
+#fold.html.preprocessor=0
+#fold.hypertext.comment=1
+#fold.hypertext.heredoc=1
+
+#Default Language=1 for JS, 2 for VBS.
+#asp.default.language=2
+#html.tags.case.sensitive=1
+
+#lexer.html.django=1
+#lexer.html.mako=1
+
+#xml.auto.close.tags=1
+#lexer.xml.allow.scripts=0
+
+# All hypertext elements and attributes must be listed in lower case
+hypertext.elements=\
+a abbr acronym address applet area b base basefont \
+bdo bgsound big blink blockquote body br button caption center \
+cite code col colgroup dd del dfn dir div dl dt em \
+fieldset font form frame frameset h1 h2 h3 h4 h5 h6 \
+head hr html i iframe img input ins isindex kbd label \
+legend li link listing map marquee menu menuitem meta multicol nobr noembed noframes noscript \
+object ol optgroup option p param plaintext pre q s samp \
+script select small spacer span strike strong style sub sup \
+table tbody td textarea tfoot th thead title tr tt u ul \
+var xml xmlns xmp
+
+hypertext.attributes=\
+abbr accept-charset accept accesskey action align alink \
+allowtransparency alt archive axis background bgcolor border bordercolor bottommargin \
+cellpadding cellspacing char charoff charset checked cite \
+class classid clear codebase codetype color cols colspan \
+compact content coords \
+data datafld dataformatas datapagesize datasrc datetime \
+declare defer dir disabled enctype event \
+face for frame frameborder framespacing \
+headers height href hreflang hspace http-equiv \
+id is ismap itemid itemprop itemref itemscope itemtype \
+label lang language leftmargin link longdesc lowsrc \
+marginwidth marginheight maxlength media method methods multiple \
+name nohref noresize noshade nowrap \
+object onblur onchange onclick ondblclick onfocus \
+onkeydown onkeypress onkeyup onload onmousedown \
+onmousemove onmouseover onmouseout onmouseup \
+onreset onselect onsubmit onunload \
+profile prompt readonly rel rev rightmargin rows rowspan rules \
+scheme scope scrolling selected shape size span src standby start style \
+summary tabindex target text title topmargin type usemap urn \
+valign value valuetype version vlink vspace width \
+text password checkbox radio submit reset \
+file hidden image \
+^data-
+
+# As defined in "HTML5 differences from HTML4" Working Draft
+# http://www.w3.org/TR/html5-diff/
+html5.elements=\
+address article aside audio base bdi canvas command details datalist dialog embed \
+figure figcaption footer header hgroup keygen main mark menu meter nav output \
+picture progress ruby rb rt rtc rp section source template track time video wbr
+
+html5.attributes=\
+allowfullscreen allowpaymentrequest async autocomplete autofocus autoplay \
+controls contenteditable contextmenu crossorigin default dirname download draggable \
+form formaction formenctype formmethod formnovalidate formtarget high kind \
+list low loop manifest max muted min minlength nonce novalidate open optimum \
+onabort onaddtrack onafterprint onauxclick onbeforeprint onbeforeunload \
+oncancel oncanplay oncanplaythrough onclose oncopy oncuechange oncut \
+ondrag ondragend ondragenter ondragexit ondragleave ondragover ondragstart ondrop ondurationchange \
+onemptied onended onerror onenter onexit onhashchange oninput oninvalid \
+onlanguagechange onloadeddata onloadedmetadata onloadend onloadstart \
+onmessage onmouseenter onmouseleave onoffline ononline \
+onpagehide onpageshow onpaste onpause onplay onplaying onprogress onpopstate \
+onratechange onremovetrack onresize onrejectionhandled onresize \
+onscroll onseeked onseeking onshow onstalled onstorage onsuspend ontimeupdate ontoggle \
+onunhandledrejection onvolumechange onwaiting onwheel \
+pattern placeholder poster preload \
+referrerpolicy required reversed role sandbox scoped seamless sizes spellcheck srcdoc srclang srcset step \
+translate typemustmatch wrap
+
+keywordclass.hypertext=\
+$(hypertext.elements) $(hypertext.attributes) $(html5.elements) $(html5.attributes) public !doctype
+
+vxml.elements=\
+assign audio block break catch choice clear disconnect else elseif \
+emphasis enumerate error exit field filled form goto grammar help \
+if initial link log menu meta noinput nomatch object option p paragraph \
+param phoneme prompt property prosody record reprompt return s say-as \
+script sentence subdialog submit throw transfer value var voice vxml
+
+vxml.attributes=\
+accept age alphabet anchor application base beep bridge category charset \
+classid cond connecttimeout content contour count dest destexpr dtmf dtmfterm \
+duration enctype event eventexpr expr expritem fetchtimeout finalsilence \
+gender http-equiv id level maxage maxstale maxtime message messageexpr \
+method mime modal mode name namelist next nextitem ph pitch range rate \
+scope size sizeexpr skiplist slot src srcexpr sub time timeexpr timeout \
+transferaudio type value variant version volume xml:lang
+
+keywordclass.vxml=\
+$(vxml.elements) $(vxml.attributes) public !doctype
+
+# List from http://www.php.net/manual/en/reserved.php (updated for PHP 5)
+# For a list with functions http://groups.google.com/group/scite-interest/web/extras
+# All words should be lower case to ensure case insensitivity when comparing
+keywordclass.php=\
+and array as bool boolean break case cfunction class const continue declare \
+default die directory do double echo else elseif empty enddeclare endfor \
+endforeach endif endswitch endwhile eval exit extends false float for \
+foreach function global goto if include include_once int integer isset list namespace \
+new null object old_function or parent print real require require_once resource \
+return static stdclass string switch true unset use var while xor \
+abstract catch clone exception final implements interface php_user_filter \
+private protected public this throw try \
+__class__ __dir__ __file__ __function__ __line__ __method__ \
+__namespace__ __sleep __wakeup
+
+# Override keywordclass.php with another file if present
+import phpfunctions
+
+keywords.$(file.patterns.html)=$(keywordclass.hypertext)
+# JavaScript keywords are possible inside embedded Javascript
+keywords2.$(file.patterns.html)=$(keywordclass.javascript)
+# VBScript keywords are possible inside embedded VBScript
+keywords3.$(file.patterns.html)=$(keywordclass.vb)
+# Python keywords are possible inside embedded Python
+keywords4.$(file.patterns.html)=$(keywordclass.python)
+# PHP keywords are possible inside embedded PHP
+keywords5.$(file.patterns.html)=$(keywordclass.php)
+# SGML / DTD keywords
+keywords6.$(file.patterns.html)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+# START DocBook
+docbook.elements42=\
+abbrev abstract accel ackno acronym action address affiliation alt anchor \
+answer appendix appendixinfo application area areaset areaspec arg article \
+articleinfo artpagenums attribution audiodata audioobject author authorblurb \
+authorgroup authorinitials beginpage bibliocoverage bibliodiv biblioentry \
+bibliography bibliographyinfo biblioid bibliomisc bibliomixed bibliomset \
+bibliorelation biblioset bibliosource blockinfo blockquote book bookinfo \
+bridgehead callout calloutlist caption caution chapter chapterinfo citation \
+citebiblioid citerefentry citetitle city classname classsynopsis classsynopsisinfo \
+cmdsynopsis co collab collabname colophon colspec command computeroutput \
+confdates confgroup confnum confsponsor conftitle constant constraint \
+constraintdef constructorsynopsis contractnum contractsponsor contrib \
+copyright coref corpauthor corpname country database date dedication \
+destructorsynopsis edition editor email emphasis entry entrytbl envar \
+epigraph equation errorcode errorname errortext errortype example \
+exceptionname fax fieldsynopsis figure filename firstname firstterm \
+footnote footnoteref foreignphrase formalpara funcdef funcparams \
+funcprototype funcsynopsis funcsynopsisinfo function glossary glossaryinfo \
+glossdef glossdiv glossentry glosslist glosssee glossseealso glossterm \
+graphic graphicco group guibutton guiicon guilabel guimenu guimenuitem \
+guisubmenu hardware highlights holder honorific htm imagedata imageobject \
+imageobjectco important index indexdiv indexentry indexinfo indexterm \
+informalequation informalexample informalfigure informaltable initializer \
+inlineequation inlinegraphic inlinemediaobject interface interfacename \
+invpartnumber isbn issn issuenum itemizedlist itermset jobtitle keycap \
+keycode keycombo keysym keyword keywordset label legalnotice lhs lineage \
+lineannotation link listitem iteral literallayout lot lotentry manvolnum \
+markup medialabel mediaobject mediaobjectco member menuchoice methodname \
+methodparam methodsynopsis mm modespec modifier ousebutton msg msgaud \
+msgentry msgexplan msginfo msglevel msgmain msgorig msgrel msgset msgsub \
+msgtext nonterminal note objectinfo olink ooclass ooexception oointerface \
+option optional orderedlist orgdiv orgname otheraddr othercredit othername \
+pagenums para paramdef parameter part partinfo partintro personblurb \
+personname phone phrase pob postcode preface prefaceinfo primary primaryie \
+printhistory procedure production productionrecap productionset productname \
+productnumber programlisting programlistingco prompt property pubdate publisher \
+publishername pubsnumber qandadiv qandaentry qandaset question quote refclass \
+refdescriptor refentry refentryinfo refentrytitle reference referenceinfo \
+refmeta refmiscinfo refname refnamediv refpurpose refsect1 refsect1info refsect2 \
+refsect2info refsect3 refsect3info refsection refsectioninfo refsynopsisdiv \
+refsynopsisdivinfo releaseinfo remark replaceable returnvalue revdescription \
+revhistory revision revnumber revremark rhs row sbr screen screenco screeninfo \
+screenshot secondary secondaryie sect1 sect1info sect2 sect2info sect3 sect3info \
+sect4 sect4info sect5 sect5info section sectioninfo see seealso seealsoie \
+seeie seg seglistitem segmentedlist segtitle seriesvolnums set setindex \
+setindexinfo setinfo sgmltag shortaffil shortcut sidebar sidebarinfo simpara \
+simplelist simplemsgentry simplesect spanspec state step street structfield \
+structname subject subjectset subjectterm subscript substeps subtitle \
+superscript surname sv symbol synopfragment synopfragmentref synopsis \
+systemitem table tbody term tertiary tertiaryie textdata textobject tfoot \
+tgroup thead tip title titleabbrev toc tocback tocchap tocentry tocfront \
+toclevel1 toclevel2 toclevel3 toclevel4 toclevel5 tocpart token trademark \
+type ulink userinput varargs variablelist varlistentry varname videodata \
+videoobject void volumenum warning wordasword xref year
+
+docbook.attributes=\
+arch condition conformance id lang os remap role revision revisionflag security \
+userlevel vendor xreflabel \
+status label endterm linkend space width
+
+keywordclass.docbook=\
+$(docbook.elements42) $(docbook.attributes)
+
+keywordclass.mako=$(keywordclass.hypertext)
+keywords.$(file.patterns.mako)=$(keywordclass.hypertext)
+# JavaScript keywords are possible inside embedded Javascript
+keywords2.$(file.patterns.mako)=$(keywordclass.javascript)
+# VBScript keywords are possible inside embedded VBScript
+keywords3.$(file.patterns.mako)=$(keywordclass.vb)
+# Python keywords are possible inside embedded Python
+keywords4.$(file.patterns.mako)=$(keywordclass.python) include namespace inherit \
+call doc text page endclass endexcept endfinally endfor endif endtry endwhile block
+# PHP keywords are possible inside embedded PHP
+keywords5.$(file.patterns.mako)=$(keywordclass.php)
+# SGML / DTD keywords
+keywords6.$(file.patterns.mako)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+# For Django's template language. Since Django seems to use the same .html extension
+# as plain HTML, it is up to the user to integrate these keywords if desired.
+keywordclass.django= not in autoescape with \
+csrf_token cycle empty block endblock filter endfilter for endfor firstof \
+if endif ifchanged endifchanged ifequal endifequal include load now regroup spaceless \
+endspaceless ssi url widthratio add addslashes capfirst center cut date \
+default default_if_none dictsort dictsortreversed divisibleby escape escapejs \
+filesizeformat first fix_ampersands float_format force_escape get_digit \
+iriencode join last length length_is linebreaks linebreaksbr linenumbers ljust \
+lower make_list phone2numeric pluralize pprint random removetags rjust safe \
+safeseq slice slugify stringformat striptags time timesince timeuntil title \
+truncatewords truncatewords_html unordered_list upper urlencode urlize \
+urlizetrunc wordcount wordwrap yesno apnumber intcomma intword ordinal \
+naturalday lorem
+
+keywords.$(file.patterns.docbook)=$(keywordclass.docbook)
+keywords6.$(file.patterns.docbook)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+# END DocBook
+
+word.characters.$(file.patterns.html)=$(chars.alpha)$(chars.numeric)$(chars.accented)_-$
+comment.stream.start.hypertext=<!--
+comment.stream.end.hypertext=-->
+comment.block.hypertext=//~
+comment.block.at.line.start.hypertext=1
+
+comment.box.start.xml=
+comment.stream.start.xml=
+
+# No keyword for xml, as it accepts any keyword
+keywords.$(file.patterns.xml)=
+# SGML / DTD keywords
+keywords6.$(file.patterns.xml)=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
+
+word.characters.$(file.patterns.xml)=$(chars.alpha)$(chars.numeric)_-
+
+keywords.$(file.patterns.vxml)=$(keywordclass.vxml)
+keywords2.$(file.patterns.vxml)=$(keywordclass.javascript)
+
+
+
+word.characters.$(file.patterns.vxml)=$(chars.alpha)$(chars.numeric)_-
+
+# Define the background colours for SGML and each scripting language
+colour.hypertext.sgml.back=back:#EFEFFF
+colour.hypertext.server.javascript.back=back:#DFDF7F
+colour.hypertext.client.vbs.back=back:#EFEFFF
+colour.hypertext.server.vbs.back=back:#CFCFEF
+colour.hypertext.client.python.back=back:#EFFFEF
+colour.hypertext.server.python.back=back:#CFEFCF
+colour.hypertext.server.php.back=back:#FFF8F8
+
+# HTML and XML share lexing code so use the same style numbers
+# Hypertext Markup Language
+
+# Text
+style.hypertext.0=fore:#000000,$(font.text)
+# Tags
+style.hypertext.1=fore:#000080
+# Unknown Tags
+style.hypertext.2=fore:#FF0000
+# Attributes
+style.hypertext.3=fore:#008080
+# Unknown Attributes
+style.hypertext.4=fore:#FF0000
+# Numbers
+style.hypertext.5=$(colour.number)
+# Double quoted strings
+style.hypertext.6=$(colour.string)
+# Single quoted strings
+style.hypertext.7=$(colour.string)
+# Other inside tag, including space and '='
+style.hypertext.8=fore:#800080
+# Comment
+style.hypertext.9=fore:#808000,$(font.text.comment)
+# Entities
+style.hypertext.10=fore:#800080,$(font.text)
+# XML style tag ends '/>'
+style.hypertext.11=fore:#000080
+# XML identifier start '<?'
+style.hypertext.12=fore:#0000FF
+# XML identifier end '?>'
+style.hypertext.13=fore:#0000FF
+# Internal state which should never be visible
+style.hypertext.14=back:#FF0000
+# ASP <% ... %>
+style.hypertext.15=back:#FFFF00
+# ASP <% ... %>
+style.hypertext.16=back:#FFDF00
+# CDATA
+style.hypertext.17=back:#FFDF00
+# PHP
+style.hypertext.18=fore:#0000FF,back:#FFEFBF
+# Unquoted values
+style.hypertext.19=fore:#FF00FF,back:#FFEFFF
+# JSP Comment <%-- ... --%>
+style.hypertext.20=fore:#000000,back:#FFFFD0
+# SGML tags <! ... >
+style.hypertext.21=fore:#000080,$(colour.hypertext.sgml.back)
+# SGML command
+style.hypertext.22=fore:#000080,$(colour.hypertext.sgml.back),bold
+# SGML 1st param
+style.hypertext.23=fore:#006600,$(colour.hypertext.sgml.back)
+# SGML double string
+style.hypertext.24=fore:#800000,$(colour.hypertext.sgml.back)
+# SGML single string
+style.hypertext.25=fore:#993300,$(colour.hypertext.sgml.back)
+# SGML error
+style.hypertext.26=fore:#800000,back:#FF6666
+# SGML special (#XXXX type)
+style.hypertext.27=fore:#3366FF,$(colour.hypertext.sgml.back)
+# SGML entity
+style.hypertext.28=fore:#333333,$(colour.hypertext.sgml.back)
+# SGML comment
+style.hypertext.29=fore:#808000,$(colour.hypertext.sgml.back)
+# SGML first parameter - lexer internal. It is an error if any text is in this style.
+style.hypertext.30=fore:#808000,back:#FF0000
+# SGML block
+style.hypertext.31=fore:#000066,back:#CCCCE0
+# Some reasonable background colours found in the default Windows palette
+# Off White #FFFBF0    Light green #C0DCC0    Light Blue #A6CAF0
+# Matched Operators
+style.hypertext.34=fore:#0000FF,notbold,$(font.text)
+style.hypertext.35=fore:#FF0000,notbold,$(font.text)
+
+# Embedded Javascript
+fontcolour.js=$(colour.embedded.js),$(font.js)
+# JS Start - allows eol filled background to not start on same line as SCRIPT tag
+style.hypertext.40=fore:#7F7F00
+# JS Default
+style.hypertext.41=fore:#000000,bold,$(fontcolour.js),eolfilled
+# JS Comment
+style.hypertext.42=$(colour.code.comment.box),$(fontcolour.js),eolfilled
+# JS Line Comment
+style.hypertext.43=$(colour.code.comment.line),$(fontcolour.js)
+# JS Doc comment
+style.hypertext.44=$(colour.code.comment.doc),bold,$(fontcolour.js),eolfilled
+# JS Number
+style.hypertext.45=$(colour.number),$(fontcolour.js)
+# JS Word
+style.hypertext.46=fore:#000000,$(fontcolour.js)
+# JS Keyword
+style.hypertext.47=$(colour.keyword),bold,$(fontcolour.js)
+# JS Double quoted string
+style.hypertext.48=$(colour.string),$(fontcolour.js)
+# JS Single quoted string
+style.hypertext.49=$(colour.string),$(fontcolour.js)
+# JS Symbols
+style.hypertext.50=$(colour.operator),bold,$(fontcolour.js)
+# JavaScript EOL
+style.hypertext.51=back:#BFBBB0,eolfilled
+# JavaScript RegEx
+style.hypertext.52=back:#FFBBB0
+
+# ASP Javascript
+# JS Start - allows eol filled background to not start on same line as SCRIPT tag
+style.hypertext.55=fore:#7F7F00
+# JS Default
+style.hypertext.56=fore:#000000,bold,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+# JS Comment
+style.hypertext.57=fore:#007F00,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+# JS Line Comment
+style.hypertext.58=fore:#007F00,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Doc comment
+style.hypertext.59=fore:#7F7F7F,bold,$(font.js),$(colour.hypertext.server.javascript.back),eolfilled
+# JS Number
+style.hypertext.60=fore:#007F7F,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Word
+style.hypertext.61=fore:#000000,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Keyword
+style.hypertext.62=fore:#00007F,bold,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Double quoted string
+style.hypertext.63=fore:#7F007F,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Single quoted string
+style.hypertext.64=fore:#7F007F,$(font.js),$(colour.hypertext.server.javascript.back)
+# JS Symbols
+style.hypertext.65=fore:#000000,bold,$(font.js),$(colour.hypertext.server.javascript.back)
+# JavaScript EOL
+style.hypertext.66=back:#BFBBB0,eolfilled
+# JavaScript RegEx
+style.hypertext.67=back:#FFBBB0
+
+# Embedded VBS
+# Start
+style.hypertext.70=
+# Default
+style.hypertext.71=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000000,eolfilled
+# Comment
+style.hypertext.72=$(font.comment),$(colour.hypertext.client.vbs.back),fore:#008000,eolfilled
+# Number
+style.hypertext.73=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#008080,eolfilled
+# KeyWord
+style.hypertext.74=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000080,bold,eolfilled
+# String
+style.hypertext.75=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#800080,eolfilled
+# Identifier
+style.hypertext.76=$(font.vbs),$(colour.hypertext.client.vbs.back),fore:#000080,eolfilled
+# Unterminated string
+style.hypertext.77=$(font.vbs),back:#7F7FFF,fore:#000080,eolfilled
+
+# ASP VBS
+# Start
+style.hypertext.80=
+# Default
+style.hypertext.81=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000000,eolfilled
+# Comment
+style.hypertext.82=$(font.comment),$(colour.hypertext.server.vbs.back),fore:#008000,eolfilled
+# Number
+style.hypertext.83=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#008080,eolfilled
+# KeyWord
+style.hypertext.84=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000080,bold,eolfilled
+# String
+style.hypertext.85=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#800080,eolfilled
+# Identifier
+style.hypertext.86=$(font.vbs),$(colour.hypertext.server.vbs.back),fore:#000080,eolfilled
+# Unterminated string
+style.hypertext.87=$(font.vbs),back:#7F7FBF,fore:#000080,eolfilled
+
+# Embedded Python
+style.hypertext.90=fore:#808080
+style.hypertext.91=fore:#808080,$(colour.hypertext.client.python.back),eolfilled
+# Comment
+style.hypertext.92=fore:#007F00,$(font.comment),$(colour.hypertext.client.python.back),eolfilled
+# Number
+style.hypertext.93=fore:#007F7F,$(colour.hypertext.client.python.back),eolfilled
+# String
+style.hypertext.94=fore:#7F007F,$(font.monospace),$(colour.hypertext.client.python.back),eolfilled
+# Single quoted string
+style.hypertext.95=fore:#7F007F,$(font.monospace),$(colour.hypertext.client.python.back),eolfilled
+# Keyword
+style.hypertext.96=fore:#00007F,bold,$(colour.hypertext.client.python.back),eolfilled
+# Triple quotes
+style.hypertext.97=fore:#7F0000,$(colour.hypertext.client.python.back),eolfilled
+# Triple double quotes
+style.hypertext.98=fore:#7F0000,$(colour.hypertext.client.python.back),eolfilled
+# Class name definition
+style.hypertext.99=fore:#0000FF,bold,$(colour.hypertext.client.python.back),eolfilled
+# Function or method name definition
+style.hypertext.100=fore:#007F7F,bold,$(colour.hypertext.client.python.back),eolfilled
+# Operators
+style.hypertext.101=bold,$(colour.hypertext.client.python.back),eolfilled
+# Identifiers
+style.hypertext.102=$(colour.hypertext.client.python.back),eolfilled
+
+# PHP complex variable
+style.hypertext.104=fore:#007F00,italics,$(colour.hypertext.server.php.back)
+
+# ASP Python
+style.hypertext.105=fore:#808080
+style.hypertext.106=fore:#808080,$(colour.hypertext.server.python.back),eolfilled
+# Comment
+style.hypertext.107=fore:#007F00,$(font.comment),$(colour.hypertext.server.python.back),eolfilled
+# Number
+style.hypertext.108=fore:#007F7F,$(colour.hypertext.server.python.back),eolfilled
+# String
+style.hypertext.109=fore:#7F007F,$(font.monospace),$(colour.hypertext.server.python.back),eolfilled
+# Single quoted string
+style.hypertext.110=fore:#7F007F,$(font.monospace),$(colour.hypertext.server.python.back),eolfilled
+# Keyword
+style.hypertext.111=fore:#00007F,bold,$(colour.hypertext.server.python.back),eolfilled
+# Triple quotes
+style.hypertext.112=fore:#7F0000,$(colour.hypertext.server.python.back),eolfilled
+# Triple double quotes
+style.hypertext.113=fore:#7F0000,$(colour.hypertext.server.python.back),eolfilled
+# Class name definition
+style.hypertext.114=fore:#0000FF,bold,$(colour.hypertext.server.python.back),eolfilled
+# Function or method name definition
+style.hypertext.115=fore:#007F7F,bold,$(colour.hypertext.server.python.back),eolfilled
+# Operators
+style.hypertext.116=bold,$(colour.hypertext.server.python.back),eolfilled
+# Identifiers
+style.hypertext.117=$(colour.hypertext.server.python.back),eolfilled
+
+# PHP
+# Default
+style.hypertext.118=fore:#000033,$(colour.hypertext.server.php.back),eolfilled
+# Double quoted String
+style.hypertext.119=fore:#007F00,$(colour.hypertext.server.php.back)
+# Single quoted string
+style.hypertext.120=fore:#009F00,$(colour.hypertext.server.php.back)
+# Keyword
+style.hypertext.121=fore:#7F007F,italics,$(colour.hypertext.server.php.back)
+# Number
+style.hypertext.122=fore:#CC9900,$(colour.hypertext.server.php.back)
+# Variable
+style.hypertext.123=fore:#00007F,italics,$(colour.hypertext.server.php.back)
+# Comment
+style.hypertext.124=fore:#999999,$(font.comment),$(colour.hypertext.server.php.back)
+# One line comment
+style.hypertext.125=fore:#666666,italics,$(font.comment),$(colour.hypertext.server.php.back)
+# PHP variable in double quoted string
+style.hypertext.126=fore:#007F00,italics,$(colour.hypertext.server.php.back)
+# PHP operator
+style.hypertext.127=fore:#000000,$(colour.hypertext.server.php.back)
+
+# XML: eXtensible Markup Language
+# For XML, there is no list of known tags or attributes so all are coloured known
+
+# Default
+style.xml.0=fore:#000000,$(font.text)
+# Tags
+style.xml.1=fore:#000080
+# Unknown Tags
+style.xml.2=fore:#000080
+# Attributes
+style.xml.3=fore:#008080
+# Unknown Attributes
+style.xml.4=fore:#008080
+# Numbers
+style.xml.5=$(colour.number)
+# Double quoted strings
+style.xml.6=$(colour.string)
+# Single quoted strings
+style.xml.7=$(colour.string)
+# Other inside tag, including space and '='
+style.xml.8=fore:#800080
+# Comment
+style.xml.9=fore:#808000
+# Entities
+style.xml.10=fore:#800080,$(font.text)
+# XML style tag ends '/>'
+style.xml.11=fore:#000080
+# XML identifier start '<?'
+style.xml.12=fore:#800080,bold
+# XML identifier end '?>'
+style.xml.13=fore:#800080,bold
+# CDATA
+style.xml.17=fore:#800000,back:#FFF0F0,$(font.text),eolfilled
+# Question
+style.xml.18=fore:#800000
+# Unquoted Value
+style.xml.19=fore:#608060
+# SGML tags <! ... >
+style.xml.21=fore:#000080,$(colour.hypertext.sgml.back)
+# SGML command
+style.xml.22=fore:#000080,$(colour.hypertext.sgml.back),bold
+# SGML 1st param
+style.xml.23=fore:#006600,$(colour.hypertext.sgml.back)
+# SGML double string
+style.xml.24=fore:#800000,$(colour.hypertext.sgml.back)
+# SGML single string
+style.xml.25=fore:#993300,$(colour.hypertext.sgml.back)
+# SGML error
+style.xml.26=fore:#800000,back:#FF6666
+# SGML special (#XXXX type)
+style.xml.27=fore:#3366FF,$(colour.hypertext.sgml.back)
+# SGML entity
+style.xml.28=fore:#333333,$(colour.hypertext.sgml.back)
+# SGML comment
+style.xml.29=fore:#808000,$(colour.hypertext.sgml.back)
+# SGML block
+style.xml.31=fore:#000066,back:#CCCCE0
+# No brace matching in XML
+braces.xml.style=31
+
+if PLAT_WIN
+	command.go.$(file.patterns.web)="file://$(FilePath)"
+	command.go.subsystem.$(file.patterns.web)=2
+if PLAT_GTK
+	command.go.$(file.patterns.web)=xdg-open "file://$(FilePath)"
+if PLAT_MAC
+	command.go.$(file.patterns.web)=open "file://$(FilePath)"
+	command.go.subsystem.$(file.patterns.web)=2
+
+command.go.$(file.patterns.php)=php -f "$(FileNameExt)"
+command.compile.$(file.patterns.php)=php -l "$(FileNameExt)"
diff --git a/scite-app/scite/src/inno.properties b/scite-app/scite/src/inno.properties
new file mode 100644
index 0000000..064449d
--- /dev/null
+++ b/scite-app/scite/src/inno.properties
@@ -0,0 +1,113 @@
+# Define SciTE settings for Inno Setup script files.
+
+file.patterns.inno=*.iss;*.isl
+
+filter.inno=Inno Setup (iss isl)|$(file.patterns.inno)|
+
+*filter.inno=$(filter.inno)
+
+lexer.$(file.patterns.inno)=inno
+
+*language.innosetup=&InnoSetup|iss||
+
+comment.block.inno=;~
+
+# Sections
+keywords.$(file.patterns.inno)=\
+ code components custommessages dirs files icons ini installdelete \
+ langoptions languages messages registry run setup types tasks \
+ uninstalldelete uninstallrun _istool
+
+# Keywords
+keywords2.$(file.patterns.inno)=\
+ allowcancelduringinstall allownoicons allowrootdirectory allowuncpath \
+ alwaysrestart alwaysshowcomponentslist alwaysshowdironreadypage \
+ alwaysshowgrouponreadypage alwaysusepersonalgroup appcomments appcontact \
+ appcopyright appid appmodifypath appmutex appname apppublisher \
+ apppublisherurl appreadmefile appsupportphone appsupporturl appupdatesurl \
+ appvername appversion appenddefaultdirname appenddefaultgroupname \
+ architecturesallowed architecturesinstallin64bitmode backcolor backcolor2 \
+ backcolordirection backsolid changesassociations changesenvironment \
+ compression compressionthreads copyrightfontname copyrightfontsize \
+ createappdir createuninstallregkey defaultdirname defaultgroupname \
+ defaultuserinfoname defaultuserinfoorg defaultuserinfoserial dialogfontname \
+ dialogfontsize dialogfontstandardheight direxistswarning disabledirpage \
+ disablefinishedpage disableprogramgrouppage disablereadymemo \
+ disablereadypage disablestartupprompt diskclustersize diskslicesize \
+ diskspanning dontmergeduplicatefiles enabledirdoesntexistwarning encryption \
+ extradiskspacerequired flatcomponentslist infoafterfile infobeforefile \
+ internalcompresslevel languagecodepage languagedetectionmethod languageid \
+ languagename licensefile mergeduplicatefiles messagesfile minversion \
+ onlybelowversion outputbasefilename outputdir outputmanifestfile password \
+ privilegesrequired reservebytes restartifneededbyrun righttoleft \
+ setupiconfile setuplogging showcomponentsizes showlanguagedialog \
+ showtaskstreelines showundisplayablelanguages signtool signeduninstaller \
+ signeduninstallerdir slicesperdisk solidcompression sourcedir \
+ terminalservicesaware timestamprounding timestampsinutc titlefontname \
+ titlefontsize touchdate touchtime uninstalldisplayicon uninstalldisplayname \
+ uninstallfilesdir uninstalliconfile uninstalllogmode \
+ uninstallrestartcomputer uninstallstyle uninstallable \
+ updateuninstalllogappname usepreviousappdir usepreviousgroup \
+ useprevioussetuptype useprevioustasks useprevioususerinfo usesetupldr \
+ userinfopage versioninfocompany versioninfocopyright versioninfodescription \
+ versioninfoproductname versioninfoproductversion versioninfotextversion \
+ versioninfoversion welcomefontname welcomefontsize windowresizable \
+ windowshowcaption windowstartmaximized windowvisible wizardimagebackcolor \
+ wizardimagefile wizardimagestretch wizardsmallimagebackcolor \
+ wizardsmallimagefile wizardstyle
+
+# Parameters
+keywords3.$(file.patterns.inno)=\
+ afterinstall attribs beforeinstall check comment components copymode \
+ description destdir destname excludes externalsize extradiskspacerequired \
+ filename flags fontinstall groupdescription hotkey iconfilename iconindex \
+ key languages minversion name onlybelowversion parameters permissions root \
+ runonceid section source statusmsg string subkey tasks type types valuedata \
+ valuename valuetype verb workingdir
+
+# Preprocessor directives
+keywords4.$(file.patterns.inno)=\
+ append define dim elif else emit endif endsub error expr file for if ifdef \
+ ifexist ifndef ifnexist include insert pragma sub undef
+
+# Pascal keywords
+keywords5.$(file.patterns.inno)=\
+ begin break case const continue do downto else end except finally for \
+ function if of procedure repeat then to try until uses var while with
+
+# User defined keywords
+keywords6.$(file.patterns.inno)=
+
+# Properties styles
+
+# Default
+style.inno.0=
+# Comment
+style.inno.1=fore:#007F7F,$(font.comment)
+# Keyword
+style.inno.2=$(colour.keyword)
+# Parameter
+style.inno.3=$(colour.string)
+# Section
+style.inno.4=back:#FFFFC0
+# Preprocessor
+style.inno.5=$(colour.preproc)
+# Preprocessor (inline)
+style.inno.6=$(colour.preproc)
+# Pascal comment
+style.inno.7=fore:#007F7F,$(font.comment)
+# Pascal keyword
+style.inno.8=$(colour.keyword)
+# User defined keyword
+style.inno.9=$(colour.keyword)
+# Double quoted string
+style.inno.10=$(colour.string)
+# Single quoted string
+style.inno.11=$(colour.char)
+# Identifier - lexer internal. It is an error if any text is in this style.
+style.inno.12=back:#FF0000
+
+#if PLAT_WIN
+#	# Replace PATH_TO_INNOSETUP by the path to your InnoSetup installation
+#	command.compile.$(file.patterns.inno)="PATH_TO_INNOSETUP\iscc.exe" $(FileNameExt)
+#	command.go.$(file.patterns.inno)="PATH_TO_INNOSETUP\Compil32.exe" $(FileNameExt)
diff --git a/scite-app/scite/src/json.properties b/scite-app/scite/src/json.properties
new file mode 100644
index 0000000..1e93033
--- /dev/null
+++ b/scite-app/scite/src/json.properties
@@ -0,0 +1,50 @@
+# Define SciTE settings for JSON files.
+
+file.patterns.json=*.json;*.eslintrc;*.jshintrc;*.jsonld;*.ipynb;*.babelrc;*.prettierrc;*.stylelintrc;*.jsonc;*.jscop
+*source.patterns.json=$(file.patterns.json);
+
+filter.json=JSON (json eshintrc jshintrc)|$(file.patterns.json)|
+*filter.json=$(filter.json)
+
+lexer.$(file.patterns.json)=json
+
+*language.json=JSON|json||
+
+lexer.json.allow.comments=1
+lexer.json.escape.sequence=1
+
+# JSON keywords
+keywords.$(file.patterns.json)=false true null
+
+# JSON-LD keywords
+keywords2.$(file.patterns.json)=@id @context @type @value @language @container \
+@list @set @reverse @index @base @vocab @graph
+
+# Default
+style.json.0=fore:FFFFFF
+# Number
+style.json.1=fore:#007F7F
+# String
+style.json.2=fore:#7F0000
+# Unclosed string
+style.json.3=fore:#FFFFFF,back:#FF0000,eolfilled
+# Property name
+style.json.4=fore:#880AE8
+# Escape sequence
+style.json.5=fore:#0B982E
+# Line comment
+style.json.6=fore:#05BBAE,italics
+# Block comment
+style.json.7=$(style.json.6)
+# Operator
+style.json.8=fore:#18644A
+# URL/IRI
+style.json.9=fore:#0000FF
+# JSON-LD compact IRI
+style.json.10=fore:#D137C1
+# JSON keyword
+style.json.11=fore:#0BCEA7,bold
+# JSON-LD keyword
+style.json.12=fore:#EC2806
+# Parsing error
+style.json.13=fore:#FFFFFF,back:#FF0000
diff --git a/scite-app/scite/src/kix.properties b/scite-app/scite/src/kix.properties
new file mode 100644
index 0000000..6283683
--- /dev/null
+++ b/scite-app/scite/src/kix.properties
@@ -0,0 +1,84 @@
+# Define SciTE settings for Assembler files
+# Black Horus blackhorus@gmx.net
+
+# Masm files
+file.patterns.kix=*.kix
+filter.kix=Kix-Script (kix)|$(file.patterns.kix)|
+
+*filter.kix=$(filter.kix)
+
+#lexer.$(file.patterns.kix)=asm
+lexer.$(file.patterns.kix)=kix
+
+*language.kix=&Kix|kix||
+
+# These keywords are commands
+keywords.$(file.patterns.kix)=? and beep big break call cd cls color cookie1 copy \
+	debug del dim display do until exit flushkb for each next function endfunction \
+	get gets global go gosub goto if else endif md or password play quit \
+	rd redim return run select case endselect set setl setm settime \
+	shell sleep small use while loop
+
+# This keywords are functions
+keywords2.$(file.patterns.kix)=abs addkey addprinterconnection addprogramgroup \
+	addprogramitem asc ascan at backupeventlog box cdbl chr cint cleareventlog \
+	close comparefiletimes createobject cstr dectohex delkey delprinterconnection \
+	delprogramgroup delprogramitem deltree delvalue dir enumgroup enumipinfo enumkey \
+	enumlocalgroup enumvalue execute exist existkey expandenvironmentvars fix \
+	formatnumber freefilehandle getdiskspace getfileattr getfilesize getfiletime \
+	getfileversion getobject iif ingroup instr instrrev int isdeclared join \
+	kbhit keyexist lcase left len loadhive loadkey logevent logoff ltrim \
+	memorysize messagebox open readline readprofilestring readtype readvalue \
+	redirectoutput right rnd round rtrim savekey sendkeys sendmessage setascii \
+	setconsole setdefaultprinter setfileattr setfocus setoption setsystemstate \
+	settitle setwallpaper showprogramgroup shutdown sidtoname split srnd substr \
+	trim ubound ucase unloadhive val vartype vartypename writeline \
+	writeprofilestring writevalue
+
+# This keywords are macros if preceded by @
+keywords3.$(file.patterns.kix)=address build color comment cpu crlf csd curdir \
+	date day domain dos error fullname homedir homedrive homeshr hostname \
+	inwin ipaddress0 ipaddress1 ipaddress2 ipaddress3 kix lanroot ldomain \
+	ldrive lm logonmode longhomedir lserver maxpwage mdayno mhz monthno \
+	month msecs pid primarygroup priv productsuite producttype pwage ras \
+	result rserver scriptdir scriptexe scriptname serror sid site startdir \
+	syslang ticks time userid userlang wdayno wksta wuserid ydayno year
+
+# Comments
+comment.block.kix=;
+comment.block.at.line.start.kix=1
+
+# Kix Styles
+# White space
+style.kix.0=fore:#000000,$(font.vbs)
+# Comment
+style.kix.1=$(colour.code.comment.line),$(font.code.comment.line)
+# String
+style.kix.2=$(colour.string)
+style.kix.3=$(colour.string)
+# Number
+style.kix.4=$(colour.number)
+# Variables
+style.kix.5=fore:#B00040
+# Macro
+style.kix.6=$(colour.preproc)
+# Keyword
+style.kix.7=$(colour.keyword),bold
+# Function
+style.kix.8=$(colour.keyword)
+# Operator
+style.kix.9=$(colour.operator),bold
+# Stream comment
+style.kix.10=$(colour.code.comment.box),$(font.code.comment.box)
+# Identifier
+style.kix.31=
+
+# Commands
+command.go.*.kix=kix32 $(FileName)
+
+# Indenting
+tab.size.$(file.patterns.kix)=6
+indent.size.$(file.patterns.kix)=3
+use.tabs.$(file.patterns.kix)=1
+
+statement.indent.$(file.patterns.kix)=7 if else for do while function case
diff --git a/scite-app/scite/src/latex.properties b/scite-app/scite/src/latex.properties
new file mode 100644
index 0000000..8f9b103
--- /dev/null
+++ b/scite-app/scite/src/latex.properties
@@ -0,0 +1,46 @@
+# Define SciTE settings for LaTeX files.
+
+file.patterns.latex=*.tex;*.sty
+
+filter.latex=LaTeX (tex sty)|$(file.patterns.latex)|
+
+*filter.latex=$(filter.latex)
+
+lexer.$(file.patterns.latex)=latex
+
+# LaTeX styles
+# White space
+style.latex.0=fore:#000000
+# Command
+style.latex.1=fore:#AA0000,bold
+# Tag Opening
+style.latex.2=fore:#880088,bold
+# Math Inline
+style.latex.3=fore:#0000FF
+# Comment
+style.latex.4=fore:#00AA00
+# Tag Closing
+style.latex.5=fore:#880088,bold
+# Math Block
+style.latex.6=fore:#0000AA
+# Comment Block
+style.latex.7=fore:#00AA00
+# Verbatim Segment
+style.latex.8=fore:#666666
+# Short Command
+style.latex.9=fore:#AA6600,bold
+# Special Char
+style.latex.10=fore:#AAAA00
+# Command optional argument
+style.latex.11=fore:#FF9900
+# Syntax error
+style.latex.12=fore:#ffffff,back:#ff0000
+
+command.compile.*.tex=latex $(FileNameExt)
+command.build.*.tex=dvips -f $(FileName).dvi > $(FileName).ps
+command.go.*.tex=dvips $(FileName).dvi
+
+command.name.0.*.tex=View
+command.0.*.tex=xdvi $(FileName).dvi
+command.name.1.*.tex=View PS
+command.1.*.tex=gv $(FileName).ps
diff --git a/scite-app/scite/src/lexillaVersion.txt b/scite-app/scite/src/lexillaVersion.txt
new file mode 100644
index 0000000..07bfe61
--- /dev/null
+++ b/scite-app/scite/src/lexillaVersion.txt
@@ -0,0 +1 @@
+511
diff --git a/scite-app/scite/src/lisp.properties b/scite-app/scite/src/lisp.properties
new file mode 100644
index 0000000..feeb444
--- /dev/null
+++ b/scite-app/scite/src/lisp.properties
@@ -0,0 +1,128 @@
+# Define SciTE settings for lisp and Scheme files.
+
+file.patterns.lisp=*.lsp;*.lisp
+
+filter.lisp=LISP (lsp lisp)|$(file.patterns.lisp)|
+
+file.patterns.scheme=*.scm;*.smd;*.ss
+filter.scheme=Scheme (scm smd)|$(file.patterns.scheme)|
+
+#*filter.lisp=$(filter.lisp)
+#*filter.scheme=$(filter.scheme)
+
+lexer.$(file.patterns.lisp)=lisp
+lexer.$(file.patterns.scheme)=lisp
+
+*language.lisp=Lisp|lisp||
+
+# lisp build in functions, xlisp dialect
+keywords.$(file.patterns.lisp)= not defun + - * / = < > <= >= princ \
+eval apply funcall quote identity function complement backquote lambda set setq setf \
+defun defmacro gensym make symbol intern symbol name symbol value symbol plist get \
+getf putprop remprop hash make array aref car cdr caar cadr cdar cddr caaar caadr cadar \
+caddr cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr \
+cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr cons list append reverse last nth \
+nthcdr member assoc subst sublis nsubst  nsublis remove length list length \
+mapc mapcar mapl maplist mapcan mapcon rplaca rplacd nconc delete atom symbolp numberp \
+boundp null listp consp minusp zerop plusp evenp oddp eq eql equal cond case and or let l if prog \
+prog1 prog2 progn go return do dolist dotimes catch throw error cerror break \
+continue errset baktrace evalhook truncate float rem min max abs sin cos tan expt exp sqrt \
+random logand logior logxor lognot bignums logeqv lognand lognor \
+logorc2 logtest logbitp logcount integer length nil
+
+word.chars.lisp=$(chars.alpha)$(chars.numeric)_-<>.#+@$%^&=*!?
+word.characters.$(file.patterns.lisp)=$(word.chars.lisp)
+
+# Scheme functions, R5RS
+keywords.$(file.patterns.scheme)= + - * / = < > <= >= => \
+abs acos and angle append apply asin assoc assoc assq assv atan \
+begin boolean? \
+caar cadr call-with-current-continuation call/cc \
+call-with-input-file call-with-output-file call-with-values \
+car cdr \
+caar cadr cdar cddr \
+caaar caadr cadar caddr cdaar cdadr cddar cdddr \
+caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr \
+cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr \
+case ceiling char->integer \
+char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? \
+char-downcase char-lower-case? char-numeric? char-ready? \
+char-upcase char-upper-case? char-whitespace? \
+char<=? char<? char=? char>=? char>? char? \
+close-input-port close-output-port complex? cond cons cos \
+current-input-port current-output-port \
+define define-syntax delay denominator display do dynamic-wind \
+else eof-object? eq? equal? eqv? eval even? exact->inexact exact? \
+exp expt \
+floor for-each force \
+gcd \
+if imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment \
+lambda lcm length let let* let-syntax letrec letrec-syntax \
+list list->string list->vector list-ref list-tail list? load log \
+magnitude make-polar make-rectangular make-string make-vector \
+map max member memq memv min modulo \
+negative? newline not null-environment null? number->string number? numerator \
+odd? open-input-file open-output-file or output-port? \
+pair? peek-char input-port? output-port? positive? procedure? \
+quasiquote quote quotient \
+rational? rationalize read read-char real-part real? remainder reverse round \
+scheme-report-environment set! set-car! set-cdr! sin sqrt string \
+string->list string->number string->symbol string-append \
+string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? \
+string-copy string-fill! string-length string-ref string-set! \
+string<=? string<? string=? string>=? string>? string? \
+substring symbol->string symbol? syntax-rules \
+transcript-off transcript-on truncate \
+unquote unquote-splicing \
+values vector vector->list vector-fill! vector-length vector-ref vector-set! vector? \
+with-input-from-file with-output-to-file write write-char \
+zero?
+
+word.chars.scheme=$(chars.alpha)$(chars.numeric)!$%&*/:<=>?^_~+-.@
+word.characters.$(file.patterns.scheme)=$(word.chars.scheme)
+
+
+comment.block.lisp=;
+comment.box.start.lisp=;;
+comment.box.middle.lisp=;;
+comment.box.end.lisp=;;
+
+
+# LISP styles
+
+# Default
+style.lisp.32=$(font.base)
+# White space
+style.lisp.0=fore:#808080
+# Line Comment
+style.lisp.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Number
+style.lisp.2=$(colour.number)
+# Keyword
+style.lisp.3=$(colour.keyword),bold
+# Keyword 2
+style.lisp.4=fore:#EE00AA
+# Symbol
+style.lisp.5=fore:#DD9900
+# String
+style.lisp.6=$(colour.string)
+# Operators
+style.lisp.10=$(colour.operator),bold
+# Identifiers
+style.lisp.9=
+# End of line where string is not closed
+style.lisp.8=fore:#000000,font:Verdana,size:9,back:#fefecc,eolfilled
+# Special
+style.lisp.11=fore:#60AA00
+# Multi-line comment
+style.lisp.12=$(colour.code.comment.box),$(font.code.comment.box)
+# Matched Operators
+style.lisp.34=fore:#0000FF,bold
+style.lisp.35=fore:#FF0000,bold
+# Braces are only matched in operator style
+braces.lisp.style=10
+
+#command.go.$(file.patterns.scheme)=c:\tools\pscheme\pscheme.exe /r $(FilePath)
+command.go.$(file.patterns.scheme)=c:\tools\gambit\gsi.exe -f $(FilePath)
+#command.go.$(file.patterns.scheme)=c:\tools\plt\mzscheme.exe -r $(FilePath)
+command.go.subsystem.$(file.patterns.scheme)=0
diff --git a/scite-app/scite/src/lot.properties b/scite-app/scite/src/lot.properties
new file mode 100644
index 0000000..3aa617e
--- /dev/null
+++ b/scite-app/scite/src/lot.properties
@@ -0,0 +1,28 @@
+# Define SciTE settings for lot files.
+file.patterns.lot=*.lot
+
+filter.lot=Lot (lot)|$(file.patterns.lot)|
+
+*filter.lot=$(filter.lot)
+
+lexer.$(file.patterns.lot)=lot
+
+*language.lot=Lot|lot||
+
+word.characters.$(file.patterns.lot)=$(chars.alpha)$(chars.numeric)
+
+# LOT FileStyles
+# Default
+style.lot.0=fore:#000000
+# header
+style.lot.1=back:#00F0FF,eolfilled
+# break
+style.lot.2=back:#FFFF00,eolfilled
+# set
+ style.lot.3=fore:#FFFFFF,back:#0000FF,bold,eolfilled
+# pass
+ style.lot.4=back:#00FF00,eolfilled
+# fail
+style.lot.5=back:#FF0000,eolfilled,bold
+# abort
+style.lot.6=back:#0000FF,bold,eolfilled
diff --git a/scite-app/scite/src/lout.properties b/scite-app/scite/src/lout.properties
new file mode 100644
index 0000000..c351d7a
--- /dev/null
+++ b/scite-app/scite/src/lout.properties
@@ -0,0 +1,89 @@
+# Define SciTE settings for Basser Lout files.
+# Based on Lout 3.35 [April 2007]
+# * to update keywords, see or diff externs.h
+
+file.patterns.lout=*.lt
+
+filter.lout=Lout (lt)|*.lt|
+
+*filter.lout=$(filter.lout)
+
+lexer.$(file.patterns.lout)=lout
+
+*language.lout=Lout|lt||
+
+# @-prefixed keywords
+keywords.$(file.patterns.lout)= \
+@OptGall @FontDef @Family @Face @Name @Metrics @ExtraMetrics \
+@Mapping @Recode @Filter @FilterIn @FilterOut @FilterErr \
+@Common @Rump @Meld @Insert @OneOf @Next @Plus @Minus @Wide \
+@High @HShift @VShift @BeginHeaderComponent @EndHeaderComponent \
+@SetHeaderComponent @ClearHeaderComponent @OneCol @OneRow \
+@HMirror @VMirror @HScale @VScale @HCover @VCover @Scale \
+@KernShrink @HContract @VContract @HLimited @VLimited @HExpand \
+@VExpand @StartHVSpan @StartHSpan @StartVSpan @HSpan @VSpan \
+@PAdjust @HAdjust @VAdjust @Rotate @Background @IncludeGraphic \
+@SysIncludeGraphic @Graphic @LinkSource @LinkDest @URLLink \
+@PlainGraphic @Verbatim @RawVerbatim @Case @Yield @BackEnd \
+@Char @Font @Space @YUnit @ZUnit @Break @Underline @SetColour \
+@SetColor @SetUnderlineColour @SetUnderlineColor @SetTexture \
+@Outline @Language @CurrLang @CurrFamily @CurrFace @CurrYUnit \
+@CurrZUnit @LEnv @@A @@B @@C @@D @@E @LClos @@V @LUse @LEO \
+@Open @Use @NotRevealed @Tagged @Database @SysDatabase \
+@Include @SysInclude @IncludeGraphicRepeated \
+@SysIncludeGraphicRepeated @PrependGraphic @SysPrependGraphic \
+@Target @Null @PageLabel @Galley @ForceGalley @LInput @Split \
+@Tag @Key @Optimize @Merge @Enclose @Begin @End @Moment \
+@Second @Minute @Hour @Day @Month @Year @Century @WeekDay \
+@YearDay @DaylightSaving @SetContext @GetContext
+
+# symbols that are keywords (excluding braces)
+keywords2.$(file.patterns.lout)= &&& && & ^// ^/ ^|| ^| ^& // / || |
+
+# non-@-prefixed keywords
+keywords3.$(file.patterns.lout)= def langdef force horizontally into \
+extend import export precedence associativity left right body macro \
+named compulsory following preceding foll_or_prec now
+
+comment.block.lout=#~
+
+indent.maintain.$(file.patterns.lout)=1
+
+# Lout styles
+
+# Default
+style.lout.32=$(font.base)
+# White space
+style.lout.0=fore:#808080
+# Comment
+style.lout.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.lout.2=$(colour.number)
+# Keyword (@-prefixed keywords)
+style.lout.3=$(colour.keyword),bold
+# Keyword2 (symbol keywords)
+style.lout.4=$(colour.keyword),bold
+# Keyword3 (non-@ keywords)
+style.lout.5=$(colour.keyword),bold
+# Keyword4 (user or library symbols)
+style.lout.6=$(colour.keyword)
+# Double quoted string
+style.lout.7=$(colour.string)
+# Operators
+style.lout.8=$(colour.operator),bold
+# Identifiers
+style.lout.9=
+# End of line where string is not closed
+style.lout.10=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Braces are only matched in operator style
+braces.lout.style=8
+
+command.compile.$(file.patterns.lout)=lout "$(FileNameExt)" > "$(FileName).ps"
+command.build.$(file.patterns.lout)=make
+
+if PLAT_WIN
+	command.go.$(file.patterns.lout)=gview "$(FileName).ps"
+
+if PLAT_GTK
+	command.go.$(file.patterns.lout)=gview32 "$(FileName).ps"
+
diff --git a/scite-app/scite/src/lua.properties b/scite-app/scite/src/lua.properties
new file mode 100644
index 0000000..5b1c3aa
--- /dev/null
+++ b/scite-app/scite/src/lua.properties
@@ -0,0 +1,318 @@
+# Define SciTE settings for Lua files.
+# Lua 5.x highlighting is enabled by default. For other choices,
+# including Lua 4 highlighting, see below.
+
+file.patterns.lua=*.lua
+
+*source.patterns.lua=$(file.patterns.lua);
+
+shbang.lua=lua
+
+filter.lua=Lua (lua)|$(file.patterns.lua)|
+
+*filter.lua=$(filter.lua)
+
+lexer.$(file.patterns.lua)=lua
+
+*language.lua=Lu&a|lua||
+
+word.chars.lua=$(chars.alpha)$(chars.numeric)$(chars.accented)_%
+word.characters.$(file.patterns.lua)=$(word.chars.lua)
+
+#### Lua 4.0.1
+
+# Keywords
+keywordclass.lua4=\
+and break do else elseif \
+end for function if in \
+local nil not or repeat \
+return then until while
+
+# Basic Functions
+keywordclass2.lua4=\
+_ALERT assert call collectgarbage copytagmethods \
+dofile dostring error foreach foreachi \
+gcinfo getglobal getn gettagmethod globals \
+newtag next print rawget rawset \
+setglobal settag settagmethod sort tag \
+tonumber tostring tinsert tremove type \
+_VERSION _ERRORMESSAGE
+
+# String Manipulation & Mathematical Functions
+keywordclass3.lua4=\
+strbyte strchar strfind strlen strlower \
+strrep strsub strupper format gsub \
+abs acos asin atan atan2 \
+ceil cos deg exp floor \
+log log10 max min mod \
+rad sin sqrt tan frexp \
+ldexp random randomseed PI
+
+# Input and Output Facilities & System Facilities
+keywordclass4.lua4=\
+openfile closefile readfrom writeto appendto \
+remove rename flush seek tmpname read write \
+clock date execute exit getenv setlocale \
+_INPUT _OUTPUT _STDIN _STDOUT _STDERR -- file descriptors
+
+# Debug (not enabled by default)
+keywordclass5.lua4=\
+getinfo getlocal setlocal setcallhook setlinehook
+
+#### Lua 5.0.3
+
+# Keywords
+keywordclass.lua50=$(keywordclass.lua4) false true
+
+# Basic Functions
+keywordclass2.lua5=\
+assert collectgarbage dofile error _G \
+getmetatable ipairs loadfile next pairs \
+pcall print rawequal rawget rawset \
+setmetatable tonumber tostring type _VERSION \
+xpcall string table math coroutine io os debug
+
+keywordclass2.lua50=$(keywordclass2.lua5) \
+getfenv gcinfo loadlib loadstring require \
+setfenv unpack _LOADED LUA_PATH _REQUIREDNAME
+
+# String, Table , Mathematical, Bitwise
+keywordclass3.lua5=\
+string.byte string.char string.dump string.find string.format \
+string.gsub string.len string.lower string.rep string.sub string.upper \
+table.concat table.insert table.remove table.sort \
+math.abs math.acos math.asin math.atan math.atan2 \
+math.ceil math.cos math.deg math.exp math.floor \
+math.frexp math.ldexp math.log math.max math.min \
+math.pi math.pow math.rad math.random math.randomseed \
+math.sin math.sqrt math.tan
+
+keywordclass3.lua50=$(keywordclass3.lua5) \
+string.gfind \
+table.foreach table.foreachi table.getn table.setn \
+math.mod math.log10
+
+# Coroutine, Input/Output, System, Package
+keywordclass4.lua50=\
+coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield \
+io.close io.flush io.input io.lines io.open \
+io.output io.read io.tmpfile io.type io.write \
+io.stdin io.stdout io.stderr \
+os.clock os.date os.difftime os.execute os.exit \
+os.getenv os.remove os.rename os.setlocale os.time \
+os.tmpname
+
+# Debug (not enabled by default)
+keywordclass5.lua50=\
+debug.debug debug.gethook debug.getinfo debug.getlocal debug.getupvalue \
+debug.setlocal debug.setupvalue debug.sethook debug.traceback
+
+#### Lua 5.1.4
+
+# Keywords
+keywordclass.lua51=$(keywordclass.lua50)
+
+# Basic Functions
+keywordclass2.lua51=$(keywordclass2.lua5) \
+getfenv load loadstring select \
+setfenv unpack package
+
+# String, Table , Mathematical, Bitwise
+keywordclass3.lua51=$(keywordclass3.lua5) \
+string.gmatch string.match string.reverse \
+table.maxn \
+math.cosh math.fmod math.huge math.log10 math.modf \
+math.sinh math.tanh
+
+# Coroutine, Input/Output, System, Package
+keywordclass4.package=\
+require package.cpath package.loaded \
+package.loadlib package.path package.preload
+
+keywordclass4.lua51=$(keywordclass4.lua50) \
+coroutine.running io.popen \
+module package.loaders package.seeall \
+$(keywordclass4.package)
+
+# Debug (not enabled by default)
+keywordclass5.lua51=$(keywordclass5.lua50) \
+debug.getfenv debug.getmetatable debug.getregistry debug.setfenv debug.setmetatable
+
+#### Lua 5.2.0
+
+# Keywords
+keywordclass.lua52=$(keywordclass.lua50) goto
+
+# Basic Functions
+keywordclass2.lua52=$(keywordclass2.lua5) \
+load rawlen select package bit32 _ENV
+
+# String, Table , Mathematical, Bitwise
+keywordclass3.bit32=\
+bit32.arshift bit32.band bit32.bnot bit32.bor bit32.btest \
+bit32.bxor bit32.extract bit32.replace bit32.lrotate bit32.lshift \
+bit32.rrotate bit32.rshift
+
+keywordclass3.lua52=$(keywordclass3.lua5) \
+string.gmatch string.match string.reverse \
+table.pack table.unpack \
+math.cosh math.fmod math.huge math.modf math.sinh math.tanh \
+$(keywordclass3.bit32)
+
+# Coroutine, Input/Output, System, Package
+keywordclass4.lua52=$(keywordclass4.lua50) \
+coroutine.running io.popen \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+# Debug (not enabled by default)
+keywordclass5.lua52=$(keywordclass5.lua50) \
+debug.getmetatable debug.getregistry debug.setmetatable \
+debug.getuservalue debug.setuservalue debug.upvalueid debug.upvaluejoin
+
+#### Lua 5.3.0
+
+# Keywords
+keywordclass.lua53=$(keywordclass.lua50) goto
+
+# Basic Functions
+keywordclass2.lua53=$(keywordclass2.lua5) \
+load rawlen select package utf8 _ENV
+
+# String, UTF8, Table , Mathematical
+keywordclass3.utf8=\
+utf8.char utf8.charpattern utf8.codes \
+utf8.codepoint utf8.len utf8.offset
+
+keywordclass3.lua53=\
+string.byte string.char string.dump string.find string.format \
+string.gmatch string.gsub string.len string.lower string.match \
+string.pack string.packsize string.rep \
+string.reverse string.sub string.unpack string.upper \
+table.concat table.insert table.move table.pack \
+table.remove table.sort table.unpack \
+math.abs math.acos math.asin math.atan \
+math.ceil math.cos math.deg math.exp \
+math.floor math.fmod math.huge \
+math.log math.max math.maxinteger math.min math.mininteger \
+math.modf math.pi math.rad \
+math.random math.randomseed math.sin \
+math.sqrt math.tan \
+math.tointeger math.type math.ult \
+$(keywordclass3.utf8)
+
+# Coroutine, Input/Output, System, Package
+keywordclass4.lua53=$(keywordclass4.lua50) \
+coroutine.isyieldable coroutine.running io.popen \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+# Debug (not enabled by default)
+keywordclass5.lua53=$(keywordclass5.lua52)
+
+#### Lua 5.x
+
+# Keywords
+keywordclass.lua5x=$(keywordclass.lua53)
+
+# Basic Functions
+keywordclass2.lua5x=$(keywordclass2.lua5) \
+getfenv gcinfo load loadlib loadstring \
+require select setfenv unpack \
+_LOADED LUA_PATH _REQUIREDNAME \
+package rawlen package bit32 utf8 _ENV
+
+# String, Table , Mathematical, Bitwise
+keywordclass3.lua5x=$(keywordclass3.lua5) \
+string.gfind string.gmatch string.match string.reverse \
+string.pack string.packsize string.unpack \
+table.foreach table.foreachi table.getn table.setn \
+table.maxn table.pack table.unpack table.move \
+math.cosh math.fmod math.huge math.log10 math.modf \
+math.mod math.sinh math.tanh math.maxinteger math.mininteger \
+math.tointeger math.type math.ult \
+$(keywordclass3.bit32) \
+$(keywordclass3.utf8)
+
+# Coroutine, Input/Output, System, Package
+keywordclass4.lua5x=$(keywordclass4.lua50) \
+coroutine.isyieldable coroutine.running io.popen \
+module package.loaders package.seeall \
+package.config package.searchers package.searchpath \
+$(keywordclass4.package)
+
+# Debug (not enabled by default)
+keywordclass5.lua5x=$(keywordclass5.lua50) \
+debug.getfenv debug.getmetatable debug.getregistry debug.setfenv debug.setmetatable \
+debug.getuservalue debug.setuservalue debug.upvalueid debug.upvaluejoin
+
+# Keyword highlighting selection
+# Options: lua4, lua50, lua51, lua52, lua53, lua5x (default)
+# or enable everything like this: $(keywordclass.lua4)$(keywordclass.lua5x)
+keywords.$(file.patterns.lua)=$(keywordclass.lua5x)
+keywords2.$(file.patterns.lua)=$(keywordclass2.lua5x)
+keywords3.$(file.patterns.lua)=$(keywordclass3.lua5x)
+keywords4.$(file.patterns.lua)=$(keywordclass4.lua5x)
+
+# Add keywords5, 6, 7 & 8 for user-defined libraries
+#keywords5.$(file.patterns.lua)=
+#keywords6.$(file.patterns.lua)=
+#keywords7.$(file.patterns.lua)=
+#keywords8.$(file.patterns.lua)=
+
+#~ statement.indent.$(file.patterns.lua)=5 do else function then
+#~ statement.lookback.$(file.patterns.lua)=20
+indent.maintain.$(file.patterns.lua)=1
+
+comment.block.lua=--~
+comment.block.at.line.start.lua=1
+
+# Lua styles
+
+#Default
+style.lua.32=$(font.code.base),fore:#000000
+# White space: Visible only in View Whitespace mode (or if it has a back colour)
+style.lua.0=fore:#FF0000
+# Block comment (Lua 5.0)
+style.lua.1=$(colour.code.comment.box),$(font.code.comment.box),back:#D0F0F0,eolfilled
+# Line comment
+style.lua.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment -- Not used in Lua (yet?)
+style.lua.3=$(colour.notused),$(font.notused)
+# Number
+style.lua.4=$(colour.number)
+# Keyword
+style.lua.5=$(colour.keyword)
+# (Double quoted) String
+style.lua.6=$(colour.string)
+# Character (Single quoted string)
+style.lua.7=$(colour.char)
+# Literal string
+style.lua.8=$(colour.string),$(font.code.comment.box),back:#E0FFFF
+# Preprocessor (obsolete in Lua 4.0 and up)
+style.lua.9=$(colour.preproc)
+# Operators
+style.lua.10=$(colour.operator)
+# Identifier (everything else...)
+style.lua.11=
+# End of line where string is not closed
+style.lua.12=back:#E0C0E0,eolfilled
+# Other keywords (bozo test colors, but toned down ;)
+style.lua.13=$(style.lua.5),back:#F5FFF5
+style.lua.14=$(style.lua.5),back:#F5F5FF
+style.lua.15=$(style.lua.5),back:#FFF5F5
+style.lua.16=$(style.lua.5),back:#FFF5FF
+style.lua.17=$(style.lua.5),back:#FFFFF5
+style.lua.18=$(style.lua.5),back:#FFA0A0
+style.lua.19=$(style.lua.5),back:#FFF5F5
+# Labels
+style.lua.20=fore:#7F7F00
+# Braces are only matched in operator style
+braces.lua.style=10
+
+# compatible with LuaBinaries for Lua 5.1; will work on both platforms.
+command.compile.*.lua=luac5.1 -o "$(FileName).luc" "$(FileNameExt)"
+# Lua 5.1
+command.go.*.lua=lua5.1 "$(FileNameExt)"
+# Lua 4.0
+#command.go.*.lua=Lua-4.0.exe -c -f "$(FileNameExt)"
diff --git a/scite-app/scite/src/markdown.properties b/scite-app/scite/src/markdown.properties
new file mode 100644
index 0000000..7716a37
--- /dev/null
+++ b/scite-app/scite/src/markdown.properties
@@ -0,0 +1,66 @@
+# Define SciTE settings for Markdown files.
+
+file.patterns.markdown=*.md;*.markdown
+
+filter.markdown=Markdown (md markdown)|$(file.patterns.markdown)|
+*filter.markdown=$(filter.markdown)
+
+lexer.$(file.patterns.markdown)=markdown
+
+*language.markdown=Markdo&wn|markdown||
+
+# SCE_MARKDOWN_DEFAULT: Regular text
+style.markdown.0=
+
+# SCE_MARKDOWN_LINE_BEGIN: Special, e.g. end-of-line codes if enabled
+style.markdown.1=
+
+# SCE_MARKDOWN_STRONG1: "**" - Strong emphasis (bold)
+style.markdown.2=fore:#224466,bold
+# SCE_MARKDOWN_STRONG2: "__" - Strong emphasis (bold)
+style.markdown.3=fore:#224466,bold
+
+# SCE_MARKDOWN_EM1: '*' - Emphasis (italic)
+style.markdown.4=fore:#663300,italics
+# SCE_MARKDOWN_EM2: '_' - Emphasis (italic)
+style.markdown.5=fore:#663300,italics
+
+# SCE_MARKDOWN_HEADER1: "#" - Level-one header
+style.markdown.6=fore:#5183C4,bold,$(font.monospace)
+# SCE_MARKDOWN_HEADER2: "##" - Level-two header
+style.markdown.7=fore:#5183C4,bold,$(font.monospace)
+# SCE_MARKDOWN_HEADER3: "###" - Level-three header
+style.markdown.8=fore:#5183C4,bold,$(font.monospace)
+# SCE_MARKDOWN_HEADER4: "####" - Level-four header
+style.markdown.9=fore:#5183C4,bold,$(font.monospace)
+# SCE_MARKDOWN_HEADER5: "#####" - Level-five header
+style.markdown.10=fore:#5183C4,bold,$(font.monospace)
+# SCE_MARKDOWN_HEADER6: "######" - Level-six header
+style.markdown.11=fore:#5183C4,bold,$(font.monospace)
+
+# SCE_MARKDOWN_PRECHAR: Prechar (up to three indent spaces, e.g. for a second-level list)
+style.markdown.12=back:#EEEEAA,fore:#000000
+
+# SCE_MARKDOWN_ULIST_ITEM: "- ", "* ", "+ " - Unordered list item
+style.markdown.13=fore:#555555
+# SCE_MARKDOWN_OLIST_ITEM: "1. " to "9. ", "#. " - Ordered list item
+style.markdown.14=fore:#555555
+
+# SCE_MARKDOWN_BLOCKQUOTE: "> " - Block quote
+style.markdown.15=fore:#000088
+
+# SCE_MARKDOWN_STRIKEOUT: "~~" - Strikeout
+style.markdown.16=back:#A9BA9D,fore:#18453B,$(font.monospace)
+
+# SCE_MARKDOWN_HRULE: "---", "***", "___" - Horizontal rule
+style.markdown.17=fore:#555555,bold,$(font.monospace)
+
+# SCE_MARKDOWN_LINK: "[]", "![]" - Link or image
+style.markdown.18=fore:#0000AA,underlined
+
+# SCE_MARKDOWN_CODE: '`' - Inline code
+style.markdown.19=back:#EEEEEE,fore:#000088,$(font.monospace)
+# SCE_MARKDOWN_CODE2: "``" - Inline code (quotes code containing a single backtick)
+style.markdown.20=back:#EEEEEE,fore:#000088,$(font.monospace)
+# SCE_MARKDOWN_CODEBK: "~~~" - Code block
+style.markdown.21=back:#EEEEEE,fore:#000088,$(font.monospace)
diff --git a/scite-app/scite/src/matlab.properties b/scite-app/scite/src/matlab.properties
new file mode 100644
index 0000000..4d34b58
--- /dev/null
+++ b/scite-app/scite/src/matlab.properties
@@ -0,0 +1,135 @@
+# Define SciTE settings for Octave and Matlab (see below) files.
+
+# set the default lexer for .m files
+DEFAULT_M_LEXER_OCTAVE=1
+DEFAULT_M_LEXER_MATLAB=0
+
+#-----------------------------------------------------------------------
+# Octave
+#-----------------------------------------------------------------------
+
+# M: Octave M-Files (we nee .m.octave for distinguishing it from matlab)
+file.patterns.octave=*.m.octave
+#~ if DEFAULT_M_LEXER_OCTAVE
+	#~ file.patterns.octave=*.m;$(file.patterns.octave)
+file.patterns.matlab=*.m;*.m.octave
+
+# M: Octave M-Files
+filter.octave=Octave (m)|$(file.patterns.octave)|
+
+lexer.$(file.patterns.octave)=octave
+
+#*language.octave=Octave|m.octave||
+
+keywordclass.octave=\
+__FILE__ \
+__LINE__ \
+break \
+case \
+catch \
+classdef \
+continue \
+do \
+else \
+elseif \
+end \
+end_try_catch \
+end_unwind_protect \
+endclassdef \
+endenumeration \
+endevents \
+endfor \
+endif \
+endmethods \
+endparfor \
+endproperties \
+endswitch \
+endwhile \
+enumeration \
+events \
+for \
+function endfunction \
+get \
+global \
+if \
+methods \
+otherwise \
+parfor \
+persistent \
+properties \
+return \
+set \
+static \
+switch \
+try \
+until \
+unwind_protect \
+unwind_protect_cleanup \
+while
+
+keywords.$(file.patterns.octave)=$(keywordclass.octave)
+
+comment.block.octave=#
+
+# Octave styles
+# White space
+style.octave.0=fore:#000000
+# Comment
+style.octave.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Command
+style.octave.2=$(colour.preproc)
+# Number
+style.octave.3=$(colour.number)
+# Keyword
+style.octave.4=$(colour.keyword),bold
+# String (5: single quoted, 8: double quoted)
+style.octave.5=$(colour.string)
+style.octave.8=$(colour.string)
+# Operator
+style.octave.6=$(colour.operator),bold
+# Identifier
+style.octave.7=
+
+#-----------------------------------------------------------------------
+# Matlab
+#-----------------------------------------------------------------------
+
+# M: Matlab M-Files (we need .m.matlab to distinguish it from octave)
+file.patterns.matlab=*.m.matlab
+#~ if DEFAULT_M_LEXER_MATLAB
+	#~ file.patterns.matlab=*.m;$(file.patterns.matlab)
+# M: Matlab M-Files
+filter.matlab=Matlab (m)|$(file.patterns.matlab)|
+
+*filter.matlab=$(filter.matlab)
+
+lexer.$(file.patterns.matlab)=matlab
+
+*language.matlab=Matlab|m.matlab||
+
+keywordclass.matlab=break case catch continue else elseif end for function \
+global if otherwise persistent return switch try while
+
+keywords.$(file.patterns.matlab)=$(keywordclass.matlab)
+
+comment.block.matlab=%~
+
+# Matlab styles
+# White space
+style.matlab.0=fore:#000000
+# Comment
+style.matlab.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Command
+style.matlab.2=$(colour.preproc)
+# Number
+style.matlab.3=$(colour.number)
+# Keyword
+style.matlab.4=$(colour.keyword),bold
+# String (5=single quoted, 8=double quoted)
+style.matlab.5=$(colour.string)
+style.matlab.8=$(colour.string)
+# Operator
+style.matlab.6=$(colour.operator),bold
+# Identifier
+style.matlab.7=
+
diff --git a/scite-app/scite/src/maxima.properties b/scite-app/scite/src/maxima.properties
new file mode 100644
index 0000000..4aa92e6
--- /dev/null
+++ b/scite-app/scite/src/maxima.properties
@@ -0,0 +1,44 @@
+# file     : maxima.properties
+# version  : 2 march 2018
+# author   : Gunter Königsmann / www.physikbuch.de.
+# based on : tex.properties by Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+
+# Maxima: patterns
+
+file.patterns.maxima=*.wxm;*.mac
+
+# filter to be checked/tested:
+
+filter.maxima=maxima (mac wxm)|$(file.patterns.maxima)|
+lexer.$(file.patterns.maxima)=maxima
+
+*language.maxima=Maxima|mac||
+
+# maxima: highlighting
+
+# Operator
+style.maxima.0=fore:#2060d0
+# Command ending
+style.maxima.1=fore:#a0a0a0
+# Comment
+style.maxima.2=fore:#80ff80
+# Number
+style.maxima.3=fore:#8080FF
+# String
+style.maxima.4=fore:#808080
+# Command
+style.maxima.5=fore:#000000
+# Variable
+style.maxima.6=fore:#00007F
+#Unknown
+style.maxima.7=fore:#000000
+
+# Maxima: comments
+
+comment.stream.start.maxima=/*
+comment.stream.end.maxima=*/
+comment.box.start.maxima=/*
+comment.box.middle.maxima= *
+comment.box.end.maxima= */
+
+# maxima: end of file
\ No newline at end of file
diff --git a/scite-app/scite/src/metapost.properties b/scite-app/scite/src/metapost.properties
new file mode 100644
index 0000000..0634e4f
--- /dev/null
+++ b/scite-app/scite/src/metapost.properties
@@ -0,0 +1,189 @@
+# file    : metapost.properties
+# version : 18 august 2003
+# author  : Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+
+# Metapost: patterns
+
+file.patterns.metapost=*.mp;*.mpx
+file.patterns.metafun=*.mp;*.mpx;*.mpy
+
+filter.metapost=MetaPost (mp mpx)|$(file.patterns.metapost)|
+filter.metafun=MetaFun (mp mpx mpy)|$(file.patterns.metafun)|
+
+*filter.metapost=$(filter.metapost)
+
+lexer.$(file.patterns.metapost)=metapost
+lexer.$(file.patterns.metafun)=metapost
+
+*language.metapost=MetaPost|mp||
+
+# Metapost: commands (check process view)
+
+command.compile.$(file.patterns.metapost)=
+command.build.$(file.patterns.metapost)=mpost $(FileNameExt)
+command.go.$(file.patterns.metapost)=gv $(FileName).1
+
+command.compile.$(file.patterns.metafun)=
+command.build.$(file.patterns.metafun)=texexec --mptex $(FileNameExt)
+command.go.$(file.patterns.metafun)=gv $(FileName).1
+
+command.0.$(file.patterns.metapost)=
+command.1.$(file.patterns.metapost)=
+command.2.$(file.patterns.metapost)=
+command.3.$(file.patterns.metapost)=
+command.4.$(file.patterns.metapost)=
+command.5.$(file.patterns.metapost)=
+command.6.$(file.patterns.metapost)=
+command.7.$(file.patterns.metapost)=
+command.8.$(file.patterns.metapost)=
+command.9.$(file.patterns.metapost)=
+
+command.0.$(file.patterns.metafun)=
+command.1.$(file.patterns.metafun)=
+command.2.$(file.patterns.metafun)=
+command.3.$(file.patterns.metafun)=
+command.4.$(file.patterns.metafun)=
+command.5.$(file.patterns.metafun)=
+command.6.$(file.patterns.metafun)=
+command.7.$(file.patterns.metafun)=
+command.8.$(file.patterns.metafun)=
+command.9.$(file.patterns.metafun)=
+
+# Metapost: highlighting
+
+# Default
+style.metapost.0=fore:#3F3F3F
+# Special
+style.metapost.1=fore:#007F7F
+# Group
+style.metapost.2=fore:#7F0000
+# Symbol
+style.metapost.3=fore:#7F7F00
+# Command
+style.metapost.4=fore:#007F00
+# Text
+style.metapost.5=fore:#000000
+# Extra
+style.metapost.6=fore:#007F00,italics
+
+style.metapost.34=fore:#00007F
+style.metapost.35=fore:#7F007F
+
+# Metapost: comments
+
+comment.block.metapost=%
+comment.block.at.line.start.metapost=1
+
+# Metapost: lexer.metapost.interface.default
+#
+# 0 not used
+# 1 metapost primitives and commands
+# 2 metafun macros
+#
+# first lines of a metapost file are interpreted as follows:
+#
+# % interface=none|metapost|mp|metafun
+
+lexer.metapost.interface.default=1
+
+# Metapost: lexer.metapost.comment.process
+#
+# 0 don't interpret comment
+# 1 color comment like source code
+
+lexer.metapost.comment.process=0
+
+# Metapost: keywords
+
+keywordclass.metapost.tex=\
+    btex verbatimtex etex
+
+keywordclass.metapost.primitives=\
+    charcode day linecap linejoin miterlimit month pausing \
+    prologues showstopping time tracingcapsules tracingchoices \
+    tracingcommands tracingequations tracinglostchars \
+    tracingmacros tracingonline tracingoutput tracingrestores \
+    tracingspecs tracingstats tracingtitles truecorners \
+    warningcheck year \
+    false nullpicture pencircle true \
+    and angle arclength arctime ASCII bluepart boolean bot \
+    char color cosd cycle decimal directiontime floor fontsize \
+    greenpart hex infont intersectiontimes known length llcorner \
+    lrcorner makepath makepen mexp mlog normaldeviate not \
+    numeric oct odd or path pair pen penoffset picture point \
+    postcontrol precontrol redpart reverse rotated scaled \
+    shifted sind slanted sqrt str string subpath substring \
+    transform transformed ulcorner uniformdeviate unknown \
+    urcorner xpart xscaled xxpart xypart ypart yscaled yxpart \
+    yypart zscaled \
+    addto clip input interim let newinternal save setbounds \
+    shipout show showdependencies showtoken showvariable \
+    special \
+    begingroup endgroup of curl tension and controls \
+    reflectedabout rotatedaround interpath on off beginfig \
+    endfig def vardef enddef epxr suffix text primary secondary \
+    tertiary primarydef secondarydef tertiarydef top bottom \
+    ulft urt llft lrt randomseed also contour doublepath \
+    withcolor withpen dashed if else elseif fi for endfor forever exitif \
+    forsuffixes downto upto step until \
+    charlist extensible fontdimen headerbyte kern ligtable \
+    boundarychar chardp charext charht charic charwd designsize \
+    fontmaking charexists \
+    cullit currenttransform gfcorners grayfont hround \
+    imagerules lowres_fix nodisplays notransforms openit \
+    displaying currentwindow screen_rows screen_cols \
+    pixels_per_inch cull display openwindow numspecial \
+    totalweight autorounding fillin proofing tracingpens \
+    xoffset chardx granularity smoothing turningcheck yoffset \
+    chardy hppp tracingedges vppp \
+    extra_beginfig extra_endfig mpxbreak \
+    end
+
+keywordclass.metapost.plain=\
+    ahangle ahlength bboxmargin defaultpen defaultscale \
+    labeloffset background currentpen currentpicture cuttings \
+    defaultfont extra_beginfig extra_endfig \
+    beveled black blue bp butt cc cm dd ditto down epsilon \
+    evenly fullcircle green halfcircle identity in infinity left \
+    mitered mm origin pensquare pt quartercircle red right \
+    rounded squared unitsquare up white withdots \
+    abs bbox ceiling center cutafter cutbefore dir \
+    directionpoint div dotprod intersectionpoint inverse mod lft \
+    round rt unitvector whatever \
+    cutdraw draw drawarrow drawdblarrow fill filldraw drawdot \
+    loggingall pickup tracingall tracingnone undraw unfill \
+    unfilldraw \
+    buildcycle dashpattern decr dotlabel dotlabels drawoptions \
+    incr label labels max min thelabel z \
+    beginchar blacker capsule_end change_width \
+    define_blacker_pixels define_corrected_pixels \
+    define_good_x_pixels define_good_y_pixels \
+    define_horizontal_corrected_pixels define_pixels \
+    define_whole_blacker_pixels define_whole_pixels \
+    define_whole_vertical_blacker_pixels \
+    define_whole_vertical_pixels endchar extra_beginchar \
+    extra_endchar extra_setup font_coding_scheme\
+    font_extra_space
+
+keywordclass.metapost.all=\
+    $(keywordclass.metapost.tex) \
+    $(keywordclass.metapost.primitives) \
+    $(keywordclass.metapost.plain)
+
+keywordclass.metafun.all=
+
+keywords.$(file.patterns.metapost)=$(keywordclass.metapost.all)
+
+keywords.$(file.patterns.metafun)=$(keywordclass.metapost.all)
+keywords2.$(file.patterns.metafun)=$(keywordclass.metafun.all)
+
+##  Metapost fold points
+## keywords4  = fold beginning; keywords5 = fold ending.
+keywords4.$(file.patterns.metapost)=beginfig for verbatimtex def begingroup \
+    if btex forsuffixes vardef primarydef
+keywords5.$(file.patterns.metapost)=etex fi endfig endgroup end endfor endif \
+    enddef
+
+import metafun-scite.properties
+
+# Metapost: end of file
\ No newline at end of file
diff --git a/scite-app/scite/src/mmixal.properties b/scite-app/scite/src/mmixal.properties
new file mode 100644
index 0000000..ae060b3
--- /dev/null
+++ b/scite-app/scite/src/mmixal.properties
@@ -0,0 +1,81 @@
+
+# Define SciTE settings for MMIXAL files.
+
+file.patterns.mmixal=*.mms
+filter.mmixal=MMIXAL (mms)|$(file.patterns.mmixal)|
+*filter.mmixal=$(filter.mmixal)
+
+lexer.$(file.patterns.mmixal)=mmixal
+
+*language.mmixal=MMIXAL|mms||
+
+opcodes=2ADDU 4ADDU 8ADDU 16ADDU ADD ADDU AND ANDNH ANDNL ANDNMH ANDNML \
+	BDIF BEV BN BNN BNP BNZ BOD BP BSPEC BYTE BZ CMP CMPU CSEV CSN CSNN CSNP CSNZ CSOD CSP CSWAP CSZ \
+	DIV DIVU ESPEC EXPR FADD FCMP FCMPE FDIV FEQL FEQLE FIX FIXU FLOT FLOTU FMUL FREM FSQRT FSUB FUN FUNE \
+	GET GETA GO GREG I_BIT INCH INCL INCMH INCML IS JMP LDA LDB LDBU LDHT LDO LDOU LDSF LDT LDTU LDUNC LDVTS LDW LDWU LOC LOCAL \
+	MOR MUL MULU MUX MXOR NAND NEG NEGU NNIX NOR NXOR O_BIT OCTA ODIF OR ORH ORL ORMH ORML ORN \
+	PBEV PBN PBNN PBNP PBNZ PBOD PBP PBZ POP PREFIX PREGO PRELD PREST PUSHGO PUSHJ PUT \
+	RESUME SAVE SET SETH SETL SETMH SETML SFLOT SFLOTU SL SLU SR SRU \
+	STB STBU STCO STHT STO STOU STSF STT STTU STUNC STW STWU SUB SUBU SWYM SYNC SYNCD TDIF TETRA TRAP TRIP UNSAVE \
+	WDIF WYDEXOR ZSEV ZSN ZSNN ZSNP ZSNZ ZSOD ZSP ZSZ
+
+special_register=rA rB rC rD rE rF rG rH rI rJ rK rL rM rN rO rP rQ rR rS rT rU rV rW rX rY rZ rBB rTT rWW rXX rYY rZZ
+
+predef_symbols=@ Text_Segment Data_Segment Pool_Segment Stack_Segment \
+	StdErr StdIn StdOut \
+	Fopen Fclose Fread Fwrite Fgets Fputs Fgetws Fputws Ftell Fseek \
+	TextRead TextWrite BinaryRead BinaryWrite BinaryReadWrite
+
+keywords.$(file.patterns.mmixal)=$(opcodes)
+keywords2.$(file.patterns.mmixal)=$(special_register)
+keywords3.$(file.patterns.mmixal)=$(predef_symbols)
+
+# Divsion of leading whitespace in line
+style.mmixal.0=
+# Comment
+style.mmixal.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Label
+style.mmixal.2=$(font.base)
+# Opcode (not validated)
+style.mmixal.3=
+# Division between Label and Opcode
+style.mmixal.4=
+# Valid Opcode (as defined in opcodes above)
+style.mmixal.5=$(colour.keyword),bold
+# Unknown Opcode
+style.mmixal.6=$(colour.error)
+# Division between Opcode and Operands
+style.mmixal.7=
+# Division of Operands
+style.mmixal.8=
+# Number
+style.mmixal.9=$(colour.number)
+# Reference (to a Label)
+style.mmixal.10=$(font.base)
+# Char
+style.mmixal.11=$(colour.char)
+# String
+style.mmixal.12=$(colour.string)
+# Register (also special_register as defined above)
+style.mmixal.13=fore:#7F007F
+# Hexadecimal Number
+style.mmixal.14=fore:#7F0000
+# Operator
+style.mmixal.15=bold
+# Symbol (as defined in predef_symbols above)
+style.mmixal.16=fore:#FF7777
+# Include for those who use the preprocessor mmixali written by R. Loos.
+# Comment otherwise.
+#~ style.mmixal.17=$(colour.preproc)
+style.mmixal.17=$(colour.code.comment.line),$(font.code.comment.line)
+
+comment.block.mmixal=%
+
+tab.size.$(file.patterns.mmixal)=16
+indent.size.$(file.patterns.mmixal)=16
+
+command.compile.$(file.patterns.mmixal)=mmixal -l $(FileName).map -b 200 $(FilePath)
+command.go.$(file.patterns.mmixal)=mmix $(1) $(FileName).mmo
+#~ mmotype
+command.name.2.$(file.patterns.mmixal)=mmotype
+command.2.$(file.patterns.mmixal)=mmotype $(FileName).mmo $(FileName).out
diff --git a/scite-app/scite/src/modula3.properties b/scite-app/scite/src/modula3.properties
new file mode 100644
index 0000000..5002015
--- /dev/null
+++ b/scite-app/scite/src/modula3.properties
@@ -0,0 +1,139 @@
+#
+#	-*- coding: utf-8 -*-
+#	File	:	modula3.properties
+#	Author	:	Dariusz Knociński
+#	Date	:	2010/11/07 - 2010/12/11
+#	Notes	:	Define SciTE settings for Modula-3.
+#
+
+file.patterns.m3=*.m3;*.mg;*.i3;*.ig
+
+filter.modula3=Modula-3 (m3 i3 mg ig)|$(file.patterns.m3)|
+*filter.modula3=$(filter.modula3)
+lexer.$(file.patterns.m3)=modula
+*language.modula3=Modula-3|m3||
+
+#	Keywords
+#
+keywords.$(file.patterns.m3)=AND ANY ARRAY AS BEGIN BITS BRANDED BY CASE CONST\
+	DIV DO ELSE ELSIF END EVAL EXCEPT EXCEPTION EXIT EXPORTS FINALLY FOR FROM\
+	GENERIC IF IMPORT IN INTERFACE LOCK LOOP METHODS MOD MODULE NOT OBJECT OF\
+	OR OVERRIDES PROCEDURE RAISE RAISES READONLY RECORD REF REPEAT RETURN\
+	REVEAL ROOT SET THEN TO TRY TYPE TYPECASE UNSAFE UNTIL UNTRACED VALUE VAR\
+	WHILE WITH
+
+#	Reserved identifiers
+#
+keywords2.$(file.patterns.m3)=ABS ADDRESS ADR ADRSIZE BITSIZE BOOLEAN BYTESIZE\
+	CARDINAL CEILING CHAR DEC DISPOSE EXTENDED FALSE FIRST FLOAT FLOOR INC\
+	INTEGER ISTYPE LAST LONGINT LONGREAL LOOPHOLE MAX MIN MUTEX NARROW NEW NIL\
+	NULL NUMBER ORD REAL REFANY ROUND SUBARRAY TEXT TRUE TRUNC TYPECODE VAL\
+	WIDECHAR
+
+#	Operators
+#
+keywords3.$(file.patterns.m3)= + < # = ; .. : - > { } | := <: * <= ( ) ^ , =>\
+	/ >= [ ] . &
+
+#	Pragmas keywords
+#
+keywords4.$(file.patterns.m3)= EXTERNAL INLINE ASSERT TRACE FATAL UNUSED\
+	OBSOLETE NOWARN LINE PRAGMA
+
+#	Escape sequences
+#
+keywords5.$(file.patterns.m3)= f n r t \ " '
+
+#	Doxygene keywords
+#
+keywords6.$(file.patterns.m3)= author authors file brief date proc param result
+
+# Default fonts
+#
+font.module.base=$(font.base)
+font.modula.code=font:$(font.module.base),size:10
+font.modula.comment=font:$(font.module.base),size:10,italics
+font.modula.doxykey=font:$(font.module.base),size:10,bold,italics
+font.modula.keywords=font:$(font.module.base),size:10,bold
+font.modula.reserved=font:$(font.module.base),size:10
+font.modula.strings=font:$(font.module.base),size:10,italics
+font.modula.strspec=font:$(font.module.base),size:10,bold,italics
+font.modula.char=font:$(font.module.base),size:10,italics
+font.modula.charspec=font:$(font.module.base),size:10,bold,italics
+font.modula.badstr=font:$(font.module.base),size:10,bold
+
+# Default
+#
+style.modula.0=fore:#383838,$(font.modula.code)
+
+# Comments
+#
+style.modula.1=fore:#008000,$(font.modula.comment)
+
+# Doxygen comments
+#
+style.modula.2=fore:#3F5FBF,$(font.modula.comment)
+
+# Doxygene keywords
+#
+style.modula.3=fore:#3F5FBF,$(font.modula.doxykey)
+
+# Keywords
+#
+style.modula.4=fore:#000080,$(font.modula.keywords)
+
+# Reserved words
+#
+style.modula.5=fore:#0000C0,$(font.modula.reserved)
+
+# Numbers
+#
+style.modula.6=fore:#006600,$(font.modula.code)
+
+# Based numbers / #{#}_#{#} base 2-16
+#
+style.modula.7=fore:#3F0066,$(font.modula.code)
+
+# Float numbers / #{#}.#{#}Exp
+#
+style.modula.8=fore:#006665,$(font.modula.code)
+
+# Strings
+#
+style.modula.9=fore:#FE9800,$(font.modula.strings)
+
+# Strings special (escape sequences)
+#
+style.modula.10=fore:#E38800,$(font.modula.strspec)
+
+# Char
+#
+style.modula.11=fore:#FE9800,$(font.modula.char)
+
+# Char special (escape sequences and octal numbers)
+#
+style.modula.12=fore:#E38800,$(font.modula.charspec)
+
+# Procedures
+#
+style.modula.13=fore:#BF00B0,$(font.modula.code)
+
+# Pragmas
+#
+style.modula.14=fore:#BF00B0,$(font.modula.code)
+
+# Pragmas keywords
+#
+style.modula.15=fore:#BF00B0,$(font.modula.keywords)
+
+# Operators
+#
+style.modula.16=fore:#000080,$(font.modula.code)
+
+# Bad strings
+#
+style.modula.17=fore:#FF0000,$(font.modula.badstr)
+
+#
+#	EOF
+#
diff --git a/scite-app/scite/src/nim.properties b/scite-app/scite/src/nim.properties
new file mode 100644
index 0000000..2d005c4
--- /dev/null
+++ b/scite-app/scite/src/nim.properties
@@ -0,0 +1,91 @@
+# Define SciTE settings for Nim files.
+
+# File filters, patterns, language, lexer and source
+file.patterns.nim=*.nim
+filter.nim=Nim (nim)|$(file.patterns.nim)|
+lexer.$(file.patterns.nim)=nim
+
+*filter.nim=$(filter.nim)
+*language.nim=Nim|nim||
+*source.patterns.nim=$(file.patterns.nim);
+
+# Primary keywords
+keywords.$(file.patterns.nim)=addr and as asm bind block break case cast concept \
+const continue converter defer discard distinct div do elif else end enum \
+except export finally for from func if import in include interface is \
+isnot iterator let macro method mixin mod nil not notin object of or out \
+proc ptr raise ref return shl shr static template try tuple type \
+using var when while xor yield
+
+# Auto indentation
+statement.indent.$(file.patterns.nim)=15 :
+#statement.indent.$(file.patterns.nim)=8 block elif else except finally of for \
+#if iterator macro proc template try while
+statement.lookback.$(file.patterns.nim)=0
+
+# Indent view
+view.indentation.examine.*.nim=2
+
+# Determines if generalized raw string Identifiers should have the same color as
+# their corresponding string literal
+lexer.nim.raw.strings.highlight.ident=0
+
+# Comment insertion
+comment.block.nim=#
+comment.stream.start.nim=#[
+comment.stream.end.nim=]#
+comment.box.start.nim=#[
+comment.box.middle.nim= #
+comment.box.end.nim=]#
+
+# Lexer styling
+# White space/default
+style.nim.0=fore:#808080
+# Comment block
+style.nim.1=fore:#007F00,$(font.comment)
+# Comment block (doc)
+style.nim.2=fore:#0000FF,$(font.comment)
+# Comment line
+style.nim.3=fore:#007F00,$(font.comment)
+# Comment line (doc)
+style.nim.4=fore:#D73A49,$(font.comment)
+# Number
+style.nim.5=fore:#007F7F
+# String
+style.nim.6=fore:#7F007F
+# Character
+style.nim.7=fore:#7F007F
+# Word
+style.nim.8=fore:#00007F,bold
+# Triple
+style.nim.9=fore:#7F0000
+# Triple double
+style.nim.10=fore:#7F0000
+# Backticks
+style.nim.11=fore:#000000
+# Function name (eg. after proc, macro, template, etc.)
+style.nim.12=fore:#007F7F,bold
+# End of line where string is not closed
+style.nim.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Numeric format error (eg. when a binary value is incorrect, like 0b1510)
+style.nim.14=fore:#000000,back:#FF8080
+# Operator
+style.nim.15=bold
+# Identifier
+style.nim.16=fore:#000000
+
+# Nim Compiler User Guide:
+# https://nim-lang.org/docs/nimc.html
+if PLAT_WIN
+	command.go.$(file.patterns.nim)=nim c -r "$(FileNameExt)"
+	command.go.subsystem.$(file.patterns.nim)=1
+
+if PLAT_GTK
+	command.go.$(file.patterns.nim)=nim c -r "$(FileNameExt)"
+
+command.compile.$(file.patterns.nim)=nim c "$(FilePath)"
+command.help.$(file.patterns.nim)=nim -h
+
+# Add command to Tools menu
+command.name.1.$(file.patterns.nim)=Compile Release Version
+command.1.$(file.patterns.nim)=nim c -d:release "$(FileNameExt)"
diff --git a/scite-app/scite/src/nimrod.properties b/scite-app/scite/src/nimrod.properties
new file mode 100644
index 0000000..4c700b3
--- /dev/null
+++ b/scite-app/scite/src/nimrod.properties
@@ -0,0 +1,105 @@
+# Define SciTE settings for Nimrod files.
+
+file.patterns.nimrod=*.nim
+
+shbang.nimrod=nim
+
+filter.nimrod=Nimrod (nim)|$(file.patterns.nimrod)|
+
+*filter.nimrod=$(filter.nimrod)
+
+lexer.$(file.patterns.nimrod)=nimrod
+
+keywordclass.nimrod=addr and as asm \
+block break \
+case cast const continue converter \
+discard div \
+elif else end enum except exception \
+finally for from generic \
+if implies import in include is isnot iterator \
+lambda \
+macro method mod \
+nil not notin \
+object of or out \
+proc ptr \
+raise ref return \
+shl shr \
+template try tuple type \
+var \
+when where while with without \
+xor \
+yield
+
+keywords.$(file.patterns.nimrod)=$(keywordclass.nimrod)
+
+#~ statement.indent.$(file.patterns.nimrod)=10 :
+statement.indent.$(file.patterns.nimrod)=5 elif else except finally of \
+for if try while
+
+statement.lookback.$(file.patterns.nimrod)=0
+block.start.$(file.patterns.nimrod)=
+block.end.$(file.patterns.nimrod)=
+
+view.indentation.examine.*.nim=2
+
+#fold.quotes.nimrod=1
+
+comment.block.nimrod=#~
+
+# nimrod styles
+# White space
+style.nimrod.0=fore:#808080
+# Comment
+style.nimrod.1=fore:#007F00,$(font.comment)
+# Number
+style.nimrod.2=fore:#007F7F
+# String
+style.nimrod.3=fore:#7F007F,$(font.monospace)
+# Single quoted string
+style.nimrod.4=fore:#7F007F,$(font.monospace)
+# Keyword
+style.nimrod.5=fore:#00007F,bold
+# Triple quotes
+style.nimrod.6=fore:#7F0000
+# Triple double quotes
+style.nimrod.7=fore:#7F0000
+# Class name definition
+style.nimrod.8=fore:#0000FF,bold
+# Function or method name definition
+style.nimrod.9=fore:#007F7F,bold
+# Operators
+style.nimrod.10=bold
+# Identifiers
+style.nimrod.11=
+# Comment-blocks
+style.nimrod.12=fore:#7F7F7F
+# End of line where string is not closed
+style.nimrod.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Highlighted identifiers
+style.nimrod.14=fore:#407090
+# Decorators
+style.nimrod.15=fore:#805000
+# Matched Operators
+style.nimrod.34=fore:#0000FF,bold
+style.nimrod.35=fore:#FF0000,bold
+# Braces are only matched in operator style
+braces.nimrod.style=10
+
+if PLAT_WIN
+	command.go.*.nim=nimrod c -r "$(FileNameExt)"
+	command.go.subsystem.*.nim=1
+
+if PLAT_GTK
+	command.go.*.nim=nimrod c -r "$(FileNameExt)"
+
+command.name.1.*.nim=Syntax Check
+command.1.*.nim=nimrod check "$(FilePath)"
+
+# compile
+command.compile.*.nim=nimrod c "$(FilePath)"
+
+# build
+command.build.*.nim=nimrod --forcebuild "$(FilePath)"
+command.build.subsystem.*.nim=1
+
+
diff --git a/scite-app/scite/src/nncrontab.properties b/scite-app/scite/src/nncrontab.properties
new file mode 100644
index 0000000..edb22c0
--- /dev/null
+++ b/scite-app/scite/src/nncrontab.properties
@@ -0,0 +1,89 @@
+# Define SciTE settings for extended crontab files used by a powerful
+# Windows scheduler/event monitor/automation manager nnCron.
+# (http://nemtsev.eserv.ru/)
+
+file.patterns.nncron=*.tab;*.spf
+# add '*.tab;*.spf;' to 'source.files' variable in 'SciTEGlobal.properties'
+# if you want to include these file patterns into default source file list
+
+lexer.$(file.patterns.nncron)=nncrontab
+
+*language.nnCron=&nnCron crontab|tab||
+
+filter.nncrontab=nnCron files (tab spf)|$(file.patterns.nncron)|
+
+*filter.nncrontab=$(filter.nncrontab)
+
+word.characters.$(file.patterns.nncron)=$(chars.alpha)$(chars.numeric)%-
+
+comment.block.nncrontab=\
+
+# nnCrontab styles
+
+# Section keywords and Forth words for nnCrontab
+keywords.$(file.patterns.nncron)=\
+AGAIN ALLOT AND Action BEGIN CASE COMPARE CONSTANT CREATE DO Days ELSE \
+ENDCASE ENDOF EVAL-SUBST EVALUATE FALSE Hours I IF LEAVE LOOP Minutes \
+Months NOT OF OFF ON OR PAD REPEAT Rule SET THEN TRUE Time UNTIL VALUE \
+VARIABLE WHILE WeekDays Years
+
+# Keywords for nnCrontab
+keywords2.$(file.patterns.nncron)=\
+</JScript> </SCRIPT> </VBScript> <JScript> <VBScript> ACCESS-DATE BEEP \
+CALL_DIAL CALL_HANGUP CHAR CLIPBOARD CONSOLE CREATION-DATE CUR-DATE DATE- \
+DATE-INTERVAL DELAY DIAL DIR-CREATE DIR-DELETE DIR-EMPTY DIR-SIZE Day@ \
+Domain ERR-MSG EXIST FILE-ACCESS-DATE FILE-APPEND FILE-COPY FILE-CREATE \
+FILE-CREATION-DATE FILE-CROP FILE-DATE FILE-DELETE FILE-EMPTY FILE-EXIST \
+FILE-MOVE FILE-RENAME FILE-SIZE FILE-WRITE FILE-WRITE-DATE FOR-CHILD-WINDOWS \
+FOR-FILES FOR-WINDOWS FREE-SPACE GET-CUR-TIME GET-REG GET-VER GetTickCount \
+HANGUP HIDE-ICON HINT HINT-OFF HINT-POS HINT-SIZE HINTW HOST-EXIST Hour@ \
+IDLE INTERVAL IS-ARCHIVE IS-DIR IS-HIDDEN IS-READONLY IS-SYSTEM KILL LAUNCH \
+LOG LOGGEDON LOGOFF LogonBatch LogonInteractive LogonNetwork MOUSE-LBCLK \
+MOUSE-LBDCLK MOUSE-LBDN MOUSE-LBUP MOUSE-MOVE MOUSE-MOVER MOUSE-MOVEW \
+MOUSE-RBCLK MOUSE-RBDCLK MOUSE-RBDN MOUSE-RBUP MSG Min@ Mon@ \
+MonitorResponseTime NHOST-EXIST No ONLINE PAUSE PLAY-SOUND PLAY-SOUNDW \
+POP3-CHECK POWEROFF PROC-EXIST PROC-TIME PURGE-OLD PURGE-OLDA PURGE-OLDW \
+Password QSTART-APP QSTART-APPW QUERY QUIT RASDomain RASError RASPassword \
+RASPhone RASSecPassword RASUser RE-ALL RE-MATCH REBOOT REG-DELETE-KEY \
+REG-DELETE-VALUE REG-DWORD REG-SZ REMINDER RUN SEND-KEYS SEND-KEYS-DELAY \
+SHOW-ICON SHUTDOWN START-APP START-APPW START-QUIT START-TIME Sec@ \
+SecPassword THINT THINTW TimeSec@ TMSG TQUERY User WDay@ WIN-ACTIVATE \
+WIN-ACTIVE WIN-CLICK WIN-CLOSE WIN-EXIST WIN-HIDE WIN-HWND WIN-MAXIMIZE \
+WIN-MINIMIZE WIN-MOVE WIN-MOVER WIN-RESTORE WIN-SEND-KEYS WIN-SHOW \
+WIN-TERMINATE WIN-TOPMOST WIN-VER WIN-WAIT WINAPI WRITE-DATE WatchClipboard \
+WatchConnect WatchDir WatchDisconnect WatchDriveInsert WatchDriveRemove \
+WatchFile WatchProc WatchProcStop WatchWinActivate WatchWinCreate \
+WatchWinDestroy WatchWindow WinNT Year@ Yes
+
+# Modifiers for nnCrontab
+keywords3.$(file.patterns.nncron)=\
+ALL AboveNormalPriority AsService BelowNormalPriority FILESONLY \
+HighPriority IdlePriority LoadProfile NoActive NoDel NoLog NoRunAs \
+NormalPriority OnceADay OnceAHour OnceAMonth OnceAWeek RECURSIVE \
+RealtimePriority RunOnce SWHide ShowMaximized ShowMinimized ShowNoActivate \
+ShowNormal StartIn StartPos StartSize TODEPTH WATCH-CHANGE-ATTRIBUTES \
+WATCH-CHANGE-DIR-NAME WATCH-CHANGE-FILE-NAME WATCH-CHANGE-LAST-WRITE \
+WATCH-CHANGE-SECURITY WATCH-CHANGE-SIZE WaitFor WatchSubtree WithoutProfile
+
+# whitespace (SCE_NNCRONTAB_DEFAULT)
+style.nncrontab.0=
+# Comment (SCE_NNCRONTAB_COMMENT)
+style.nncrontab.1=fore:#007F00,$(font.comment)
+# Task start/end (SCE_NNCRONTAB_TASK)
+style.nncrontab.2=$(colour.string),back:#606060,fore:#FFFF00
+# Section keywords (SCE_NNCRONTAB_SECTION)
+style.nncrontab.3=fore:#00007F,bold
+# Keywords (SCE_NNCRONTAB_KEYWORD)
+style.nncrontab.4=fore:#000000,bold
+# Modificators (SCE_NNCRONTAB_MODIFIER)
+style.nncrontab.5=fore:#00007F,italics
+# Asterisk (SCE_NNCRONTAB_ASTERISK)
+style.nncrontab.6=fore:#000000,bold,back:#FFE0FF
+# Number (SCE_NNCRONTAB_NUMBER)
+style.nncrontab.7=fore:#007F7F
+# Double quoted string (SCE_NNCRONTAB_STRING)
+style.nncrontab.8=fore:#7F007F,$(font.monospace)
+# Environment variable (SCE_NNCRONTAB_ENVIRONMENT)
+style.nncrontab.9=back:#FFFFE0
+# Identifier (SCE_NNCRONTAB_IDENTIFIER) - lexer internal. It is an error if any text is in this style.
+style.nncrontab.10=back:#FF0000
diff --git a/scite-app/scite/src/nsis.properties b/scite-app/scite/src/nsis.properties
new file mode 100644
index 0000000..44cf8f3
--- /dev/null
+++ b/scite-app/scite/src/nsis.properties
@@ -0,0 +1,143 @@
+# Define SciTE settings for NSIS.
+# contributed by Angelo Mandato <angelo at spaceblue dot com>
+# Updated for NSIS v.2.02 / 2004-10-25 by flizebogen <flizebogen at gmx dot de>
+# Updated /2004-28-2 by Robert Roessler <robertr at rftp dot com>
+# Updated for NSIS v.2.05 and latest lexer / 2005-3-10 by Angelo Mandato <angelo at spaceblue dot com>
+
+filter.nsis=NSIS (nsi nsh)|*.nsi;*.nsh|
+*filter.nsis=$(filter.nsis)
+file.patterns.nsis=*.nsi;*.nsh
+lexer.$(file.patterns.nsis)=nsis
+*language.nsis=NSIS|nsis||
+
+# Advanced settings
+nsis.uservars=1
+#nsis.ignorecase=1
+# Note: keywords below must all be lowercase in order for ignorecase=1 to function correctly
+
+# Functions:
+keywords.$(file.patterns.nsis)=!addincludedir !addplugindir MakeNSIS Portions \
+Contributors: Abort AddBrandingImage AddSize AutoCloseWindow BGFont \
+BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI \
+ClearErrors ComponentText GetDLLVersion GetDLLVersionLocal GetFileTime \
+GetFileTimeLocal CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut \
+SetDatablockOptimize DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue \
+Delete DetailPrint DirText DirShow DirVar DirVerify GetInstDirError AllowRootDirInstall \
+CheckBitmap EnableWindow EnumRegKey EnumRegValue Exch Exec ExecWait \
+ExecShell ExpandEnvStrings FindWindow FindClose FindFirst FindNext File FileBufSize \
+FlushINI ReserveFile FileClose FileErrorText FileOpen FileRead FileWrite FileReadByte \
+FileWriteByte FileSeek Function FunctionEnd GetDlgItem GetFullPathName \
+GetTempFileName HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent \
+InstallDirRegKey InstallColors InstallDir InstProgressFlags InstType IntOp IntCmp \
+IntCmpU IntFmt IsWindow Goto LangString LangStringUP LicenseData \
+LicenseForceSelection LicenseLangString LicenseText LicenseBkColor \
+LoadLanguageFile LogSet LogText MessageBox Nop Name OutFile Page \
+PageCallbacks PageEx PageExEnd Pop Push Quit ReadINIStr ReadRegDWORD \
+ReadRegStr ReadEnvStr Reboot RegDLL Rename Return RMDir Section SectionEnd \
+SectionIn SubSection SectionGroup SubSectionEnd SectionGroupEnd SearchPath \
+SectionSetFlags SectionGetFlags SectionSetInstTypes SectionGetInstTypes \
+SectionGetText SectionSetText SectionGetSize SectionSetSize GetCurInstType \
+SetCurInstType InstTypeSetText InstTypeGetText SendMessage SetAutoClose \
+SetCtlColors SetBrandingImage SetCompress SetCompressor SetCompressorDictSize \
+SetCompressionLevel SetDateSave SetDetailsView SetDetailsPrint SetErrors \
+SetErrorLevel GetErrorLevel SetFileAttributes SetFont SetOutPath SetOverwrite \
+SetPluginUnload SetRebootFlag SetShellVarContext SetSilent ShowInstDetails \
+ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep StrCmp StrCpy \
+StrLen SubCaption UninstallExeName UninstallCaption UninstallIcon UninstPage \
+UninstallText UninstallSubCaption UnRegDLL WindowIcon WriteINIStr WriteRegBin \
+WriteRegDWORD WriteRegStr WriteRegExpandStr WriteUninstaller XPStyle !packhdr \
+!system !execute !AddIncludeDir !include !cd !ifdef !ifndef !endif !define !undef !else !echo !warning \
+!error !verbose !macro !macroend !insertmacro !ifmacrodef !ifmacrondef MiscButtonText \
+DetailsButtonText UninstallButtonText InstallButtonText SpaceTexts \
+CompletedText GetFunctionAddress GetLabelAddress GetCurrentAddress \
+!AddPluginDir InitPluginsDir AllowSkipFiles Var VIAddVersionKey VIProductVersion LockWindow
+
+
+# Variables:
+keywords2.$(file.patterns.nsis)=$0 $1 $2 $3 $4 $5 $6 $7 $8 $9 \
+$R0 $R1 $R2 $R3 $R4 $R5 $R6 $R7 $R8 $R9 $\t $\" $\' $\` \
+$VARNAME $0, $INSTDIR $OUTDIR $CMDLINE $LANGUAGE $PROGRAMFILES \
+$COMMONFILES $DESKTOP $EXEDIR ${NSISDIR} $WINDIR $SYSDIR $TEMP \
+$STARTMENU $SMPROGRAMS $SMSTARTUP $QUICKLAUNCH $DOCUMENTS \
+$SENDTO $RECENT $FAVORITES $MUSIC $PICTURES $VIDEOS $NETHOOD \
+$FONTS $TEMPLATES $APPDATA $PRINTHOOD $INTERNET_CACHE $COOKIES \
+$HISTORY $PROFILE $ADMINTOOLS $RESOURCES $RESOURCES_LOCALIZED \
+$CDBURN_AREA $HWNDPARENT $PLUGINSDIR $$ $\r $\n
+
+# Labels:
+keywords3.$(file.patterns.nsis)=ARCHIVE FILE_ATTRIBUTE_ARCHIVE FILE_ATTRIBUTE_HIDDEN \
+FILE_ATTRIBUTE_NORMAL FILE_ATTRIBUTE_OFFLINE FILE_ATTRIBUTE_READONLY \
+FILE_ATTRIBUTE_SYSTEM FILE_ATTRIBUTE_TEMPORARY HIDDEN HKCC HKCR HKCU \
+HKDD HKEY_CLASSES_ROOT HKEY_CURRENT_CONFIG HKEY_CURRENT_USER HKEY_DYN_DATA \
+HKEY_LOCAL_MACHINE HKEY_PERFORMANCE_DATA HKEY_USERS HKLM HKPD HKU IDABORT \
+IDCANCEL IDIGNORE IDNO IDOK IDRETRY IDYES MB_ABORTRETRYIGNORE MB_DEFBUTTON1 \
+MB_DEFBUTTON2 MB_DEFBUTTON3 MB_DEFBUTTON4 MB_ICONEXCLAMATION \
+MB_ICONINFORMATION MB_ICONQUESTION MB_ICONSTOP MB_OK MB_OKCANCEL \
+MB_RETRYCANCEL MB_RIGHT MB_SETFOREGROUND MB_TOPMOST MB_YESNO \
+MB_YESNOCANCEL NORMAL OFFLINE READONLY SW_SHOWMAXIMIZED SW_SHOWMINIMIZED \
+SW_SHOWNORMAL SYSTEM TEMPORARY auto colored false force hide ifnewer nevershow \
+normal off on show silent silentlog smooth true try lzma zlib bzip2 none listonly textonly \
+both top left bottom right license components directory instfiles uninstConfirm custom \
+all leave current ifdiff lastused LEFT RIGHT CENTER dlg_id ALT CONTROL EXT SHIFT \
+open print manual alwaysoff
+
+#User defined:
+#keywords4.$(file.patterns.nsis)=MyFunction MySomethingElse
+
+# Whitespace (SCE_NSIS_DEFAULT)
+style.nsis.0=fore:#000000,$(font.base)
+# Comment (SCE_NSIS_COMMENT)
+style.nsis.1=fore:#007F00,$(font.comment)
+# String double quote (SCE_NSIS_STRINGDQ)
+style.nsis.2=fore:#999999,back:#EEEEEE
+# String left quote (SCE_NSIS_STRINGLQ)
+style.nsis.3=fore:#999999,back:#EEEEEE
+# String right quote (SCE_NSIS_STRINGRQ)
+style.nsis.4=fore:#999999,back:#EEEEEE
+# Function (SCE_NSIS_FUNCTION)
+style.nsis.5=fore:#00007F,bold
+#style.nsis.5=fore:#0033CC,bold
+# Variable (SCE_NSIS_VARIABLE)
+style.nsis.6=fore:#CC3300
+# Label (SCE_NSIS_LABEL)
+style.nsis.7=fore:#FF9900
+# User Defined (SCE_NSIS_USERDEFINED)
+style.nsis.8=fore:#000000
+# Section (SCE_NSIS_SECTIONDEF)
+style.nsis.9=fore:#00007F,bold
+# Sub section (SCE_NSIS_SUBSECTIONDEF)
+style.nsis.10=fore:#00007F,bold
+# If def (SCE_NSIS_IFDEFINEDEF)
+style.nsis.11=fore:#00007F,bold
+# Macro def (SCE_NSIS_MACRODEF)
+style.nsis.12=fore:#00007F,bold
+# Variable within string (SCE_NSIS_STRINGVAR)
+style.nsis.13=fore:#CC3300,back:#EEEEEE
+# Numbers (SCE_NSIS_NUMBER)
+style.nsis.14=fore:#007F7F
+# Section Group SCE_NSIS_SECTIONGROUP)
+style.nsis.15=fore:#00007F,bold
+# Page Ex SCE_NSIS_PAGEEX)
+style.nsis.16=fore:#00007F,bold
+# Function Definition SCE_NSIS_FUNCTIONDEF)
+style.nsis.17=fore:#00007F,bold
+# Comment Box SCE_NSIS_COMMENTBOX)
+style.nsis.18=fore:#007F00,$(font.comment),bold
+
+
+# compiling/building simply checks for the correct symantics....
+command.compile.$(file.patterns.nsis)=c:/program files/nsis/makensis.exe "$(FilePath)"
+command.build.$(file.patterns.nsis)=c:/program files/nsis/makensis.exe "$(FilePath)"
+
+command.go.$(file.patterns.nsis)=$(FileName).exe
+
+command.help.$(file.patterns.nsis)=$(CurrentWord)!C:\Program files\NSIS\NSIS.chm
+command.help.subsystem.$(file.patterns.nsis)=4
+
+comment.block.nsis=;
+comment.block.at.line.start.nsis=1
+comment.stream.start.nsis=/*
+comment.stream.end.nsis=*/
+comment.box.start.nsis=/*
+comment.box.middle.nsis=;
+comment.box.end.nsis=*/
diff --git a/scite-app/scite/src/opal.properties b/scite-app/scite/src/opal.properties
new file mode 100644
index 0000000..2b94857
--- /dev/null
+++ b/scite-app/scite/src/opal.properties
@@ -0,0 +1,65 @@
+# Define SciTE settings for Opal files.
+
+filter.opal=OPAL (impl sign)|*.impl;*.sign|
+
+*filter.opal=$(filter.opal)
+
+file.patterns.opal=*.impl;*.sign
+lexer.$(file.patterns.opal)=opal
+*language.opal=Opal|impl||
+
+keywordclass.opal_keywords=ALL AND ANDIF ANY AS ASSERT AXM COMPLETELY DATA DEF DERIVE \
+DFD DISCRIMINATORS ELSE EX EXTERNAL FI FIX FUN IF IMPLEMENTATION IMPLIES IMPORT \
+IN INHERIT INJECTIONS INTERFACE INTERNAL LAW LAZY LEFTASSOC LET MODULE NOT ONLY \
+OR ORIF OTHERWISE POST PRE PRED PRIORITY PROPERTIES REALIZES REQUIRE RIGHTASSOC \
+SELECTORS SIGNATURE SORT SPC SPEC SPECIFICATION STRUCTURE THE THEN THEORY THM \
+TYPE UNIQ WHERE
+
+keywordclass.opal_sorts=aEntry agent align anchor ans arg arg1 arg2 array \
+arrowWhere bag bitmap bool bstree byte callback canvasEditor capStyle channel \
+char childstat codom codomFrom codomTo color colorModel com composeOp config \
+configCom cursor dArray data data1 data11 data2 data21 data3 data31 data4 \
+data41 dataFrom dataTo defaultPrio denotation device dist distOut dom domFrom \
+domTo drawing dyn emitter env event eventInfo file filemode filestat filetype \
+first first1 first2 first3 fission fmt font from from1 from2 funct group groupid \
+heap iconfig image in inData index inode input int inter interdom interpreter \
+iseq items joinStyle justifyHow long manager managerRequest map mapEntry mark \
+mid modifier nat natMap OBJECT option orient out outData output packOp pair \
+parser permission point positionRequest process procstat quad range real \
+regulator rel relief res res1 res2 result role sap script scroller scrollView \
+scrollWindow searchOpt second seekMode selector semaphor seq seqEntry set \
+setEntry short sigaction sighandler sigmask signal size sizeRequest some \
+sreal state stateId stateRequest string subrel tag textEditor time to tree \
+triple union user userid version view void wconfig wconfigCom wday widget \
+window wrapStyle
+
+keywords.$(file.patterns.opal)=$(keywordclass.opal_keywords)
+keywords2.$(file.patterns.opal)=$(keywordclass.opal_sorts)
+
+
+# Opal styles
+# White space
+style.opal.0=fore:#000000,$(font.opal)
+# Comment block
+style.opal.1=fore:#007F00,italics,$(font.comment)
+# Comment line
+style.opal.2=fore:#007F00,italics,$(font.comment)
+# Integer
+style.opal.3=fore:#007F7F
+# Keyword
+style.opal.4=fore:#00007F,bold
+# Sort
+style.opal.5=fore:#007F7F
+# Double quoted string
+style.opal.6=fore:#7F007F,italics,$(font.comment)
+# Brace normal
+style.opal.7=fore:#000000
+# Bool const
+style.opal.8=fore:#A00000
+
+# Default/Identifiers
+style.opal.32=fore:#000000
+# Brace highlight
+style.opal.34=fore:#FF0000,back:#FFFF00,bold
+# Brace incomplete highlight
+style.opal.35=fore:#FF0000,back:#00FF00,bold
diff --git a/scite-app/scite/src/oscript.properties b/scite-app/scite/src/oscript.properties
new file mode 100644
index 0000000..6c487c7
--- /dev/null
+++ b/scite-app/scite/src/oscript.properties
@@ -0,0 +1,198 @@
+# Defines SciTE settings for OScript sources; osx files and/or OSpace dumps.
+# OScript is a programming language used to develop applications for the
+# Livelink server platform.
+
+##############################################################################
+# Specify file extension and lexer class.
+
+file.patterns.oscript=*.osx
+filter.oscript=OScript (osx)|$(file.patterns.oscript)|
+*filter.oscript=$(filter.oscript)
+lexer.$(file.patterns.oscript)=oscript
+
+##############################################################################
+# Specify various editor parameters.
+
+word.chars.oscript=$(chars.alpha)$(chars.numeric)_$
+word.characters.$(file.patterns.oscript)=$(word.chars.oscript)
+
+#comment.block.at.line.start.oscript=1
+comment.block.oscript=//~
+#~ comment.stream.start.oscript=#ifdef DOC
+#~ comment.stream.end.oscript=#endif
+comment.stream.start.oscript=/*
+comment.stream.end.oscript=*/
+comment.box.start.oscript=/*
+comment.box.middle.oscript= *
+comment.box.end.oscript= */
+
+statement.indent.$(file.patterns.oscript)=6 case default else for if \
+repeat switch while
+statement.lookback.$(file.patterns.oscript)=20
+statement.end.$(file.patterns.oscript)=10 ;
+block.start.$(file.patterns.oscript)=10 if
+block.end.$(file.patterns.oscript)=10 end
+indent.maintain.$(file.patterns.oscript)=1
+indent.size.$(file.patterns.oscript)=4
+use.tabs.$(file.patterns.oscript)=1
+tab.size.$(file.patterns.oscript)=4
+
+preprocessor.symbol.$(file.patterns.oscript)=#
+preprocessor.start.$(file.patterns.oscript)=ifdef ifndef
+preprocessor.middle.$(file.patterns.oscript)=else
+preprocessor.end.$(file.patterns.oscript)=endif
+
+##############################################################################
+# Specify API autocompletion and calltip help.
+
+api.$(file.patterns.oscript)=$(SciteDefaultHome)\api\oscript.api
+autocomplete.oscript.ignorecase=1
+calltip.oscript.ignorecase=1
+calltip.oscript.use.escapes=1
+calltip.oscript.word.characters=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$.
+
+##############################################################################
+# Define keyword classes separately according to the language semantics
+# before grouping them to keywords for styling. OScript is not case-sensitive;
+# all keywords configured here must be entered in lower-case.
+
+# Language native value and reference types.
+keywordclass.type=\
+assoc boolean bytes date dynamic error extern file integer list long object \
+point real recarray record script string
+
+# Word-like (literal) operators (boolean).
+keywordclass.operator=\
+and eq ge gt le lt ne not or xor
+
+# Code-flow control statements.
+keywordclass.oscript.control=\
+break breakif by case continue continueif default downto else elseif end for \
+goto if in repeat switch to until while
+
+# Keywords to declare functions.
+keywordclass.function=\
+function return void
+
+# Various language native keywords and reserved words.
+keywordclass.miscellaneous=\
+dll inbyref inout linked nodebug super this xcmd xfcn
+
+# Constants with values and defaults for primitive types.
+keywordclass.constant=\
+false true undefined
+
+# Language native constants (type classification integers).
+keywordclass.coreconstant=\
+booleantype bytestype datatype dynamictype errortype externtype integertype \
+listtype longtype objecttype objreftype pointtype realtype scripttype \
+stringtype undefinedtype voidtype
+
+# Language native functions not bound to any object (global).
+keywordclass.corefunction=\
+datatypename echo echodebug echoerror echoinfo echostamp echowarn \
+getfeatures isdefined iserror isfeature isinvokable isnoterror isnotset \
+isobject isset isundefined length nparameters parameters pointh pointv type
+
+# Object types available in Livelink kernel and core modules.
+keywordclass.builtintype=\
+cachetree capiconnect capierr capilog capilogin compiler dapisession \
+dapinode dapiversion dapistream filecopy fileprefs frame javaobject \
+mailmessage pop3session smtpsession ssloptions patfind patchange regex \
+socket sqlconnection sqlcursor uapisession uapiuser wapisession wapimap \
+wapimaptask wapiwork wapisubwork domattr domcdatasection domcharacterdata \
+domcomment domdocument domdocumentfragment domdocumenttype domelement \
+domentity domentityreference domimplementation domnamednodemap domnode \
+domnodelist domnotation domparser domprocessinginstruction domtext saxparser \
+xslprocessor
+
+# Singletons available in Livelink kernel and core modules; they offer only
+# static methods to call.
+keywordclass.builtinobject=\
+capi dapi env global language logging math memcached otds pattern security \
+sql str system uapi vis wapi web zip
+
+# Keywords usable in WebLingo sources (HTML templates including OScript).
+keywordclass.weblingo=\
+call html oscript
+
+##############################################################################
+# Define keyword groups that are recognized by the lexer and can be assigned
+# different styles.
+
+# Language native keywords: SCE_OSCRIPT_KEYWORD state.
+keywords.$(file.patterns.oscript)=$(keywordclass.oscript.control) \
+$(keywordclass.function) $(keywordclass.miscellaneous)
+
+# Constants: SCE_OSCRIPT_CONSTANT state.
+keywords2.$(file.patterns.oscript)=$(keywordclass.constant) \
+$(keywordclass.coreconstant)
+
+# Word-like (literal) operators: SCE_OSCRIPT_OPERATOR state.
+keywords3.$(file.patterns.oscript)=$(keywordclass.operator)
+
+# Value and reference (object) types: SCE_OSCRIPT_TYPE state.
+keywords4.$(file.patterns.oscript)=$(keywordclass.type) \
+$(keywordclass.builtintype)
+
+# Language native (global) functions: SCE_OSCRIPT_FUNCTION state.
+keywords5.$(file.patterns.oscript)=$(keywordclass.corefunction)
+
+# Core static objects: SCE_OSCRIPT_OBJECT state.
+keywords6.$(file.patterns.oscript)=$(keywordclass.builtinobject)
+
+##############################################################################
+# Define Style definitions supported by the lexical states. There are multiple
+# states for language keyword groups although they all are reserved words; to
+# be able ot assign them different styles.
+
+# Default text style.
+style.oscript.0=
+# Single-line comment.
+style.oscript.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Multi-line comment.
+style.oscript.2=$(colour.code.comment.box),$(font.code.comment.box)
+# Documentation comment; a text delimited by preprocessor directives
+# #ifdef DOC and #endif; the value of DOC is supposed to be never defined.
+style.oscript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Preprocessor directive.
+style.oscript.4=$(colour.preproc)
+# Number.
+style.oscript.5=$(colour.number)
+# String enclosed in single quotes (apostrophes).
+style.oscript.6=$(colour.string)
+# String enclosed in double quotes (quotation marks).
+style.oscript.7=$(colour.string)
+# Constant literal. See the property keywords2 above.
+style.oscript.8=fore:#FF7F3F
+# Identifier of a variable, an object or a script.
+style.oscript.9=
+# Server-global variable (prefixed by $).
+style.oscript.10=fore:#7F007F
+# Language native keyword or reserved word. See the property keywords above.
+style.oscript.11=$(colour.keyword),bold
+# Operator; either symbolic or literal. See the property keywords3 above.
+style.oscript.12=$(colour.operator),bold
+# Label to jump to with the GoTo statement.
+style.oscript.13=fore:#FF00FF
+# Type available in the language, in kernel or code modules.
+# See the property keywords4 above.
+style.oscript.14=fore:#00007F
+# Global function in the language, in kernel or code modules.
+# See the property keywords5 above.
+style.oscript.15=fore:#0000FF
+# Static built-in object. See the property keywords6 above.
+style.oscript.16=fore:#007F7F
+# Object property.
+style.oscript.17=
+# Object method.
+style.oscript.18=
+
+braces.oscript.style=12
+
+##############################################################################
+# Specify help.
+
+if PLAT_WIN
+	command.help.$(file.patterns.oscript)=$(CurrentWord)!C:\LL971\builder\documentation.chm
+	command.help.subsystem.$(file.patterns.oscript)=4
diff --git a/scite-app/scite/src/others.properties b/scite-app/scite/src/others.properties
new file mode 100644
index 0000000..1bcf01c
--- /dev/null
+++ b/scite-app/scite/src/others.properties
@@ -0,0 +1,250 @@
+# Define SciTE settings for other simple files.
+
+file.patterns.props=*.properties;*.session;*.ini;*.inf;*.url;*.cfg;*.cnf;*.aut
+file.patterns.text=*.txt;*.log;*.lst;*.doc;*.diz;*.nfo
+file.patterns.batch=*.bat;*.cmd;*.nt
+file.patterns.diff=*.diff;*.patch
+file.patterns.make=makefile;Makefile;*.mak;configure
+file.patterns.indent=*.indent
+
+*source.patterns.props=$(file.patterns.props);
+*source.patterns.batch=$(file.patterns.batch);
+*source.patterns.diff=$(file.patterns.diff);
+*source.patterns.make=$(file.patterns.make);*.iface;
+
+filter.properties=Properties (ini inf reg url cfg cnf)|$(file.patterns.props)|
+filter.text=Text (txt log lst doc diz nfo)|$(file.patterns.text);make*|
+filter.batch=Batch (bat cmd nt)|$(file.patterns.batch)|
+filter.diff=Difference (diff patch)|$(file.patterns.diff)|
+
+*filter.properties=$(filter.properties)
+*filter.text=$(filter.text)
+
+lexer.$(file.patterns.props)=props
+lexer.$(file.patterns.batch)=batch
+lexer.*.err=errorlist
+lexer.$(file.patterns.make)=makefile
+lexer.*.iface=makefile
+lexer.$(file.patterns.diff)=diff
+lexer.$(file.patterns.indent)=indent
+
+*language.batch=&Batch|bat||
+*language.difference=&Difference|diff||
+*language.errorlist=&Errorlist|err||
+*language.properties=&Properties|properties||
+*language.makefile=&Makefile|mak|$(keyMake)|
+*language._text=Text|txt|$(keyText)|
+*language.indent=Indent|indent|$(keyIndent)|
+
+word.characters.$(file.patterns.text)=$(chars.alpha)$(chars.numeric)$(chars.accented)-'
+
+colour.other.operator=fore:#B06000
+
+# Properties styles
+
+# Default
+style.props.0=
+# Comment
+style.props.1=fore:#007F7F,$(font.comment)
+# Section
+style.props.2=$(colour.string),back:#E0F0F0,eolfilled
+# Assignment operator
+style.props.3=$(colour.other.operator)
+# Default value (@)
+style.props.4=$(colour.preproc)
+# Key
+style.props.5=
+# Matched Operators
+style.props.34=fore:#0000FF,notbold
+style.props.35=fore:#FF0000,notbold
+comment.block.props=#~
+preprocessor.symbol.$(file.patterns.make)=!
+preprocessor.start.$(file.patterns.make)=IF IFDEF IFNDEF
+preprocessor.middle.$(file.patterns.make)=ELSE ELSEIF ELSEIFDEF ELSEIFNDEF
+preprocessor.end.$(file.patterns.make)=ENDIF
+
+# Batch styles
+
+# List from http://www.easydos.com/dosindex.html and https://sourceforge.net/p/scintilla/bugs/1686/
+# I limit here the commands to those built in command.com, ie. I don't list external Dos commands
+# if [no] (test) (command) -- test is EXIST (filename) | (string1)==(string2) | ERRORLEVEL (number)
+# for %%(variable) IN (set) DO (command) -- variable is [a-zA-Z] -- eg for %%X in (*.txt) do type %%X
+# Also includes device names.
+keywordclass.batch=\
+assoc aux break call cd chcp chdir choice cls cmdextversion \
+color com1 com2 com3 com4 con copy ctty date defined \
+del dir do dpath echo else endlocal erase errorlevel exist \
+exit for ftype goto if in lpt1 lpt2 lpt3 lpt4 md mkdir move \
+not nul path pause popd prompt prn pushd rd rem ren \
+rename rmdir set setlocal shift start time title type ver \
+verify vol
+keywords.$(file.patterns.batch)=$(keywordclass.batch)
+
+# Optional list of external commands to highlight in style 5.
+# If not set all commands are highlighted in style 5.
+#keywords2.$(file.patterns.batch)=append attrib chkdsk comp diskcomp
+
+# Default
+style.batch.0=fore:#000000
+# Comment (rem or ::)
+style.batch.1=fore:#007F00,$(font.comment)
+# Keywords
+style.batch.2=$(colour.keyword),bold
+# Label (line beginning with ':')
+style.batch.3=$(colour.string),back:#606060,fore:#FFFF00,eolfilled
+# Hide command character ('@')
+style.batch.4=$(colour.preproc)
+# External commands
+style.batch.5=fore:#007090,$(font.monospace),bold
+# Variable: %%x (x is almost whatever, except space and %), %n (n in [0-9]), %EnvironmentVar%
+style.batch.6=fore:#800080
+# Operator: * ? < > |
+style.batch.7=fore:#000000
+
+comment.block.batch=REM ~
+
+# Makefile styles
+
+# Default
+style.makefile.0=fore:#000000
+# Comment: #
+style.makefile.1=$(colour.other.comment),$(font.code.comment.box)
+# Pre-processor or other comment: !
+style.makefile.2=$(colour.preproc)
+# Variable: $(x)
+style.makefile.3=fore:#000080
+# Operator
+style.makefile.4=$(colour.other.operator)
+# Target
+style.makefile.5=fore:#A00000
+# Error
+style.makefile.9=$(colour.error),eolfilled
+# Matched Operators
+style.makefile.34=fore:#0000FF,notbold
+style.makefile.35=fore:#FF0000,notbold
+
+comment.block.makefile=#~
+
+# Error list styles
+
+style.errorlist.32=fore:#B06000,$(font.small)
+# Default
+style.errorlist.0=fore:#000000
+# python Error
+style.errorlist.1=fore:#FF0000
+# gcc Error
+style.errorlist.2=fore:#800080
+# Microsoft Error
+style.errorlist.3=fore:#808000
+# command or return status
+style.errorlist.4=fore:#0000FF
+# Borland error and warning messages
+style.errorlist.5=fore:#B06000
+# perl error and warning messages
+style.errorlist.6=fore:#FF0000
+# .NET tracebacks
+style.errorlist.7=fore:#FF0000
+# Lua error and warning messages
+style.errorlist.8=fore:#FF0000
+# ctags
+style.errorlist.9=fore:#FF00FF
+# diff changed !
+style.errorlist.10=fore:#007F00
+# diff addition +
+style.errorlist.11=fore:#00007F
+# diff deletion -
+style.errorlist.12=fore:#007F7F
+# diff message ---
+style.errorlist.13=fore:#7F0000
+# PHP error
+style.errorlist.14=fore:#FF0000
+# Essential Lahey Fortran 90 error
+style.errorlist.15=fore:#FF0000
+# Intel Fortran Compiler error
+style.errorlist.16=fore:#FF0000
+# Intel Fortran Compiler v8.0 error/warning
+style.errorlist.17=fore:#FF0000
+# Absoft Pro Fortran 90/95 v8.2 error or warning
+style.errorlist.18=fore:#FF0000
+# HTML Tidy
+style.errorlist.19=fore:#FF0000
+# Java runtime stack trace
+style.errorlist.20=fore:#FF0000
+# Text matched with find in files and message part of GCC errors
+style.errorlist.21=fore:#000000
+# GCC showing include path to following error
+style.errorlist.22=fore:#800080
+# GCC showing excerpt of code with pointer
+style.errorlist.25=fore:#CF008F,$(font.monospace.small)
+# Escape sequence
+style.errorlist.23=fore:#000000,notvisible,back:#FFFFFF,$(error.background)
+# Escape sequence unknown
+style.errorlist.24=back:#FFE0A0
+# Ensures that spacing is not affected by line number styles
+style.errorlist.33=$(font.small)
+# Basic colours
+style.errorlist.40=fore:#000000
+style.errorlist.41=fore:#800000,$(error.background)
+style.errorlist.42=fore:#008000,$(error.background)
+style.errorlist.43=fore:#808000,$(error.background)
+style.errorlist.44=fore:#000080,$(error.background)
+style.errorlist.45=fore:#800080,$(error.background)
+style.errorlist.46=fore:#008080,$(error.background)
+style.errorlist.47=fore:#A0A0A0,$(error.background)
+# Intense colours
+style.errorlist.48=fore:#000000,bold,$(error.background)
+style.errorlist.49=fore:#800000,bold,$(error.background)
+style.errorlist.50=fore:#008000,bold,$(error.background)
+style.errorlist.51=fore:#808000,bold,$(error.background)
+style.errorlist.52=fore:#000080,bold,$(error.background)
+style.errorlist.53=fore:#800080,bold,$(error.background)
+style.errorlist.54=fore:#008080,bold,$(error.background)
+style.errorlist.55=fore:#A0A0A0,bold,$(error.background)
+
+error.background=back:#FFF7E7,eolfilled
+
+lexer.errorlist.value.separate=1
+#lexer.errorlist.escape.sequences=1
+
+# Difference styles
+
+# Default
+style.diff.0=fore:#000000
+# Comment (part before "diff ..." or "--- ..." and , Only in ..., Binary file...)
+style.diff.1=fore:#007F00
+# Command (diff ...)
+style.diff.2=fore:#7F7F00
+# Source file (--- ...) and Destination file (+++ ...)
+style.diff.3=fore:#7F0000
+# Position setting (@@ ...)
+style.diff.4=fore:#7F007F
+# Line removal (-...)
+style.diff.5=fore:#007F7F
+# Line addition (+...)
+style.diff.6=fore:#00007F
+# Line change (!...)
+style.diff.7=fore:#7F7F7F
+# Patch add (++...)
+style.diff.8=fore:#00007F,back:#F0FAFF,eolfilled
+# Patch delete (+-...)
+style.diff.9=fore:#007F7F,back:#F0FAFF,eolfilled
+# Removed patch add (-+...)
+style.diff.10=fore:#00007F,back:#FFFAF0,eolfilled
+# Removed patch delete (--...)
+style.diff.11=fore:#007F7F,back:#FFFAF0,eolfilled
+
+command.build.makefile=make
+command.build.*.mak=make
+
+if PLAT_WIN
+	command.help.*.properties="file://$(SciteDefaultHome)/SciTEDoc.html#property-$(CurrentSelection)"
+	command.help.subsystem.*.properties=2
+if PLAT_GTK
+	command.help.*.properties=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html#property-$(CurrentSelection)"
+
+if PLAT_WIN
+	command.go.*.bat="$(FileNameExt)"
+	command.name.0.*.bat=Execute Selection
+	command.0.*.bat=$(CurrentSelection)
+	command.name.1.*.mak=nmake
+	command.1.*.mak=nmake -f $(FileNameExt)
diff --git a/scite-app/scite/src/pascal.properties b/scite-app/scite/src/pascal.properties
new file mode 100644
index 0000000..5f3c858
--- /dev/null
+++ b/scite-app/scite/src/pascal.properties
@@ -0,0 +1,121 @@
+# Define SciTE settings for Pascal files.
+# Changed by Fernando Lozano <fsl@centroin.com.br> for Free Pascal
+# Changed by Mathias Rauen <scite@madshi.net> for Delphi
+# Changed by Marko Njezic <sf@maxempire.com> to match new LexPascal lexer and updated for Delphi XE4
+
+filter.pascal=Pascal (dpr dpk pas dfm inc pp)|*.dpr;*.dpk;*.pas;*.dfm;*.inc;*.pp|
+
+*filter.pascal=$(filter.pascal)
+
+file.patterns.pascal=*.dpr;*.pas;*.dfm;*.inc;*.pp
+file.patterns.pascal.package=*.dpk
+file.patterns.pascal.all=$(file.patterns.pascal);$(file.patterns.pascal.package)
+lexer.$(file.patterns.pascal.all)=pascal
+*language.pascal=Pascal|pas||
+
+keywordclass.pascal=absolute abstract and array as asm assembler automated begin case \
+cdecl class const constructor delayed deprecated destructor dispid dispinterface \
+div do downto dynamic else end except experimental export exports external far \
+file final finalization finally for forward function goto helper if \
+implementation in inherited initialization inline interface is label library \
+message mod near nil not object of on operator or out overload override packed \
+pascal platform private procedure program property protected public published \
+raise record reference register reintroduce repeat resourcestring safecall \
+sealed set shl shr static stdcall strict string then threadvar to try type unit \
+unsafe until uses var varargs virtual while winapi with xor
+
+keywordclass.pascal.smart=add default implements index name nodefault read readonly \
+remove stored write writeonly
+
+keywordclass.pascal.package=package contains requires
+
+keywords.$(file.patterns.pascal)=$(keywordclass.pascal) $(keywordclass.pascal.smart)
+keywords.$(file.patterns.pascal.package)=$(keywordclass.pascal) $(keywordclass.pascal.smart) $(keywordclass.pascal.package)
+
+# If enabled some keywords will only be highlightend in appropriate context.
+# As implemented those are keywords related to property and DLL exports declarations
+lexer.pascal.smart.highlighting=1
+
+# Pascal styles
+
+# Default
+style.pascal.32=$(font.base)
+# White space
+style.pascal.0=fore:#808080
+# Identifiers
+style.pascal.1=
+# Comment: { ... }
+style.pascal.2=$(colour.code.comment.box),$(font.code.comment.box)
+# Comment: (* ... *)
+style.pascal.3=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: // ...
+style.pascal.4=$(colour.code.comment.line),$(font.code.comment.line)
+# Preprocessor: {$ ... }
+style.pascal.5=$(colour.preproc)
+# Preprocessor: (*$ ... *)
+style.pascal.6=$(colour.preproc)
+# Number
+style.pascal.7=$(colour.number)
+# Hex Number
+style.pascal.8=$(colour.number)
+# Keyword
+style.pascal.9=$(colour.keyword),bold
+# String
+style.pascal.10=$(colour.string)
+# End of line where string is not closed
+style.pascal.11=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Character
+style.pascal.12=$(colour.char)
+# Operators
+style.pascal.13=$(colour.operator),bold
+# Inline Asm
+style.pascal.14=fore:#804080
+
+# Braces are only matched in operator style
+braces.pascal.style=13
+
+comment.block.pascal=//~
+comment.stream.start.pascal={
+comment.stream.end.pascal=}
+comment.box.start.pascal=(*
+comment.box.middle.pascal= *
+comment.box.end.pascal= *)
+
+statement.indent.$(file.patterns.pascal)=9 case class do else for then \
+private protected public published repeat try while type
+statement.end.$(file.patterns.pascal)=13 ;
+statement.lookback.$(file.patterns.pascal)=20
+block.start.$(file.patterns.pascal)=9 begin
+block.end.$(file.patterns.pascal)=9 end
+
+#using virtual pascal
+#pc=C:\Vp21\Bin.w32\Vpc.exe -VC:\Vp21\Bin.w32\Vp.vpo "$(FilePath)"
+
+#using free pascal
+
+# compile
+command.compile.*.pas=fpc "$(FilePath)"
+
+# normal execute
+if PLAT_WIN
+	command.go.*.pas="$(FileName).exe"
+	command.go.subsystem.*.pas=2
+if PLAT_GTK
+	command.go.*.pas="kvt -e $(FileName)"
+
+# build
+command.build.*.pas=fpc -B "$(FilePath)"
+command.build.subsystem.*.pas=1
+
+command.name.0.*.pas=Debug Compile
+command.0.*.pas=fpc -g "$(FilePath)"
+command.name.1.*.pas=Debug Build
+command.1.*.pas=fpc -g -B "$(FilePath)"
+command.name.2.*.pas=GDB
+if PLAT_WIN
+	command.2.*.pas=gdbpasw "$(FileName)"
+if PLAT_GTK
+	command.2.*.pas=gdb "$(FileName)"
+	command.name.3.*.pas=DDD
+	command.3.*.pas=ddd "$(FileName)"
+
diff --git a/scite-app/scite/src/perl.properties b/scite-app/scite/src/perl.properties
new file mode 100644
index 0000000..7ebfda9
--- /dev/null
+++ b/scite-app/scite/src/perl.properties
@@ -0,0 +1,282 @@
+# Define SciTE settings for Perl, Bash, and AWK files.
+
+file.patterns.perl=*.pl;*.pm;*.pod
+file.patterns.bash=*.sh;*.bsh;configure;*.ksh
+file.patterns.awk=*.awk
+
+*source.patterns.perl=$(file.patterns.perl);
+*source.patterns.bash=$(file.patterns.bash);
+
+shbang.perl=pl
+shbang.sh=sh
+shbang.bash=sh
+
+shbang.gawk=awk
+shbang.nawk=awk
+shbang.mawk=awk
+
+filter.perl=Perl (pl pm)|$(file.patterns.perl)|
+filter.bash=Bash (sh bsh)|$(file.patterns.bash)|
+filter.awk=GAWK  (awk)|$(file.patterns.awk)|
+
+*filter.perl=$(filter.perl)
+*filter.bash=$(filter.bash)
+
+*language.perl=Pe&rl|pl||
+*language.shell=Shell|sh||
+
+lexer.$(file.patterns.perl)=perl
+lexer.$(file.patterns.bash)=bash
+lexer.$(file.patterns.awk)=perl
+
+keywords.$(file.patterns.perl)=\
+NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD \
+BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept \
+alarm and atan2 bind binmode bless caller chdir chmod chomp chop \
+chown chr chroot close closedir cmp connect continue cos crypt \
+dbmclose dbmopen defined delete die do dump each else elsif endgrent \
+endhostent endnetent endprotoent endpwent endservent eof eq eval \
+exec exists exit exp fcntl fileno flock for foreach fork format \
+formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname \
+gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername \
+getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent \
+getpwent getpwnam getpwuid getservbyname getservbyport getservent \
+getsockname getsockopt glob gmtime goto grep gt hex if index \
+int ioctl join keys kill last lc lcfirst le length link listen \
+local localtime lock log lstat lt map mkdir msgctl msgget msgrcv \
+msgsnd my ne next no not oct open opendir or ord our pack package \
+pipe pop pos print printf prototype push quotemeta qu \
+rand read readdir readline readlink readpipe recv redo \
+ref rename require reset return reverse rewinddir rindex rmdir \
+scalar seek seekdir select semctl semget semop send setgrent \
+sethostent setnetent setpgrp setpriority setprotoent setpwent \
+setservent setsockopt shift shmctl shmget shmread shmwrite shutdown \
+sin sleep socket socketpair sort splice split sprintf sqrt srand \
+stat study sub substr symlink syscall sysopen sysread sysseek \
+system syswrite tell telldir tie tied time times truncate \
+uc ucfirst umask undef unless unlink unpack unshift untie until \
+use utime values vec wait waitpid wantarray warn while write \
+xor \
+given when default break say state UNITCHECK __SUB__ fc
+
+keywords.$(file.patterns.awk)=\
+BEGIN END \
+if else while do for in break continue delete exit function return \
+print printf sprintf \
+system close getline next nextfile fflush \
+atan2 cos exp int log rand sin sqrt srand \
+asort asorti gensub sub gsub index length match split \
+strtonum substr tolower toupper \
+mktime strftime systime \
+and compl lshift or rshift xor \
+bindtextdomain dcgettext dcngettext \
+ARGC ARGIND ARGV BINMODE CONVFMT ENVIRON ERRNO FIELDWIDTHS \
+FILENAME FNR FS IGNORECASE LINT NF NR OFMT OFS ORS PROCINFO \
+RS RT RSTART RLENGTH SUBSEP TEXTDOMAIN
+
+
+comment.block.awk=#~
+block.start.$(file.patterns.awk)=10 {
+block.end.$(file.patterns.awk)=10 }
+
+
+word.characters.$(file.patterns.perl)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.perl=#~
+block.start.$(file.patterns.perl)=10 {
+block.end.$(file.patterns.perl)=10 }
+
+colour.perl.heredoc=$(colour.embedded.comment)
+
+#fold.perl.package=1
+#fold.perl.pod=1
+
+# generic keywords
+bash_keywords1=alias \
+ar asa awk banner basename bash bc bdiff break \
+bunzip2 bzip2 cal calendar case cat cc cd chmod cksum \
+clear cmp col comm compress continue cp cpio crypt \
+csplit ctags cut date dc dd declare deroff dev df diff diff3 \
+dircmp dirname dirs do done du echo ed egrep elif else env \
+esac eval ex exec exit expand export expr false fc \
+fgrep fi file find fmt fold for function functions \
+getconf getopt getopts grep gres hash head help \
+history iconv id if in integer jobs join kill local lc \
+let line ln logname look ls m4 mail mailx make \
+man mkdir more mt mv newgrp nl nm nohup ntps od \
+pack paste patch pathchk pax pcat perl pg popd pr print \
+printf ps pushd pwd read readonly red return rev rm rmdir \
+sed select set sh shift size sleep sort spell \
+split start stop strings strip stty sum suspend \
+sync tail tar tee test then time times touch tr \
+trap true tsort tty type typeset ulimit umask unalias \
+uname uncompress unexpand uniq unpack unset until \
+uudecode uuencode vi vim vpax wait wc whence which \
+while who wpaste wstart xargs zcat
+
+# additional keywords from coreutils
+bash_keywords2=chgrp chown chroot dir dircolors \
+factor groups hostid install link md5sum mkfifo \
+mknod nice pinky printenv ptx readlink seq \
+sha1sum shred stat su tac unlink users vdir whoami yes
+
+keywords.$(file.patterns.bash)=$(bash_keywords1) $(bash_keywords2)
+
+word.characters.$(file.patterns.bash)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.bash=#~
+
+colour.bash.heredoc=$(colour.embedded.comment)
+
+# Perl styles
+# The perl styles are set to lots of different foreground and background colours as an
+# aid to debugging SciTE's Perl lexer - not because this is a good way to display Perl.
+style.perl.32=
+# White space
+style.perl.0=fore:#808080,$(font.base)
+# Error
+style.perl.1=$(colour.error)
+# Comment
+style.perl.2=$(colour.code.comment.box),$(font.code.comment.box)
+# POD: = at beginning of line
+style.perl.3=fore:#004000,back:#E0FFE0,$(font.text),eolfilled
+# Number
+style.perl.4=$(colour.number)
+# Keyword
+style.perl.5=$(colour.keyword),bold
+# Double quoted string
+style.perl.6=$(colour.string),$(font.monospace)
+# Single quoted string
+style.perl.7=$(colour.char),$(font.monospace)
+# Symbols / Punctuation. Currently not used by LexPerl.
+style.perl.8=$(colour.notused),$(font.notused)
+# Preprocessor. Currently not used by LexPerl.
+style.perl.9=$(colour.notused),$(font.notused)
+# Operators
+style.perl.10=$(colour.operator),bold
+# Identifiers (functions, etc.)
+style.perl.11=fore:#000000
+# Scalars: $var
+style.perl.12=fore:#000000,back:#FFE0E0
+# Array: @var
+style.perl.13=fore:#000000,back:#FFFFE0
+# Hash: %var
+style.perl.14=fore:#000000,back:#FFE0FF
+# Symbol table: *var
+style.perl.15=fore:#000000,back:#E0E0E0
+# SCE_PL_VARIABLE_INDEXER allocated but unused
+style.perl.16=back:#FF0000
+# Regex: /re/ or m{re}
+style.perl.17=fore:#000000,back:#A0FFA0
+# Substitution: s/re/ore/
+style.perl.18=fore:#000000,back:#F0E080
+# Long Quote (qq, qr, qw, qx) -- obsolete: replaced by qq, qx, qr, qw
+style.perl.19=fore:#FFFF00,back:#8080A0
+# Back Ticks
+style.perl.20=$(style.perl.6),back:#90FFFF
+# Data Section: __DATA__ or __END__ at beginning of line
+style.perl.21=fore:#600000,back:#FFF0D8,eolfilled
+# Here-doc (delimiter)
+style.perl.22=fore:#000000,back:#DDD0DD
+# Here-doc (single quoted, q)
+style.perl.23=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+# Here-doc (double quoted, qq)
+style.perl.24=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+# Here-doc (back ticks, qx)
+style.perl.25=fore:#7F007F,back:#DDD0DD,eolfilled,italics
+# Single quoted string, generic
+style.perl.26=fore:#7F007F,$(font.monospace),notbold
+# qq = Double quoted string
+style.perl.27=$(style.perl.6)
+# qx = Back ticks
+style.perl.28=$(style.perl.20)
+# qr = Regex
+style.perl.29=$(style.perl.17)
+# qw = Array
+style.perl.30=$(style.perl.13)
+# POD: verbatim paragraphs
+style.perl.31=fore:#004000,back:#C0FFC0,$(font.monospace),eolfilled
+# subroutine prototype
+style.perl.40=$(style.perl.10),italics
+# format identifier
+style.perl.41=fore:#C000C0,bold
+# format body
+style.perl.42=fore:#C000C0,back:#FFF0FF,eolfilled
+# translation: tr{}{} y{}{}
+style.perl.44=$(style.perl.18)
+
+# Double quoted string (interpolated variable)
+style.perl.43=$(style.perl.6),fore:#D00000,bold
+# Regex: /re/ or m{re} (interpolated variable)
+style.perl.54=$(style.perl.17),fore:#D00000,bold
+# Substitution: s/re/ore/ (interpolated variable)
+style.perl.55=$(style.perl.18),fore:#D00000,bold
+# Back Ticks (interpolated variable)
+style.perl.57=$(style.perl.20),fore:#D00000,bold
+# Here-doc (double quoted, qq) (interpolated variable)
+style.perl.61=$(style.perl.24),fore:#D00000,bold
+# Here-doc (back ticks, qx) (interpolated variable)
+style.perl.62=$(style.perl.61)
+# qq = Double quoted string (interpolated variable)
+style.perl.64=$(style.perl.43)
+# qx = Back ticks (interpolated variable)
+style.perl.65=$(style.perl.57)
+# qr = Regex (interpolated variable)
+style.perl.66=$(style.perl.54)
+
+# Braces are only matched in operator style
+braces.perl.style=10
+
+# Bash styles
+# The bash styles are set to lots of different foreground and background colours as an
+# aid to debugging SciTE's Bash lexer - not because this is a good way to display Bash.
+style.bash.32=
+# White space
+style.bash.0=fore:#808080,$(font.base)
+# Error
+style.bash.1=$(colour.error)
+# Comment
+style.bash.2=$(colour.code.comment.box),$(font.code.comment.box)
+# Number
+style.bash.3=$(colour.number)
+# Keyword
+style.bash.4=$(colour.keyword),bold
+# Double quoted string
+style.bash.5=$(colour.string),$(font.monospace)
+# Single quoted string
+style.bash.6=$(colour.char),$(font.monospace)
+# Operators
+style.bash.7=$(colour.operator),bold
+# Identifiers (functions, etc.)
+style.bash.8=fore:#000000
+# Scalars: $var
+style.bash.9=fore:#000000,back:#FFE0E0
+# Parameter expansion: ${var}
+style.bash.10=fore:#000000,back:#FFFFE0
+# Back Ticks
+style.bash.11=fore:#FFFF00,back:#A08080
+# Here-doc (delimiter)
+style.bash.12=fore:#000000,back:#DDD0DD
+# Here-doc (single quoted, q)
+style.bash.13=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+# Braces are only matched in operator style
+braces.bash.style=7
+
+command.go.$(file.patterns.awk)=gawk -f $(FileNameExt)
+
+command.go.$(file.patterns.perl)=perl -w $(FileNameExt)
+
+command.compile.$(file.patterns.perl)=perl -c -w $(FileNameExt)
+command.name.0.$(file.patterns.perl)=Lint
+command.0.$(file.patterns.perl)=perl -MO=Lint,all $(FileNameExt)
+
+command.name.1.$(file.patterns.perl)=Check Syntax
+command.1.$(file.patterns.perl)=perl -cw $(FileNameExt)
+
+command.name.2.$(file.patterns.perl)=Code Profiler
+command.2.$(file.patterns.perl)=perl -d:DProf $(FileNameExt)
+
+command.name.3.$(file.patterns.perl)=Profiler Parser
+command.3.$(file.patterns.perl)=C:\Perl\bin\dprofpp.bat $(FileDir)\tmon.out
+
+command.go.$(file.patterns.bash)=bash $(FileNameExt)
diff --git a/scite-app/scite/src/pov.properties b/scite-app/scite/src/pov.properties
new file mode 100644
index 0000000..dec35d4
--- /dev/null
+++ b/scite-app/scite/src/pov.properties
@@ -0,0 +1,197 @@
+# Define SciTE settings for POV-Ray SDL files.
+
+file.patterns.pov=*.pov;*.inc
+
+filter.pov=POV-Ray SDL (pov)|$(file.patterns.pov)|
+
+*filter.pov=$(filter.pov)
+
+indent.size.*.pov=2
+tab.size.*.pov=2
+use.tabs.*.pov=0
+indent.size.*.inc=2
+tab.size.*.inc=2
+use.tabs.*.inc=0
+
+lexer.$(file.patterns.pov)=pov
+
+*language.povray=P&OV-Ray SDL|pov||
+
+word.chars.pov=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.pov)=$(word.chars.pov)
+
+api.*.pov=POV-Ray_SDL.api
+#autocomplete.pov.ignorecase=1
+autocomplete.pov.start.characters=.
+#autocomplete.pov.fillups=(
+#calltip.pov_quote.ignorecase=1
+calltip.pov.word.characters=.$(word.chars.pov)
+
+comment.block.at.line.start.pov=1
+comment.block.pov=//~
+#~ comment.stream.start.pov=#ifdef BOOFOO
+#~ comment.stream.end.pov=#endif
+comment.stream.start.pov=/*
+comment.stream.end.pov=*/
+comment.box.start.pov=/*
+comment.box.middle.pov= *
+comment.box.end.pov= */
+
+#~ statement.indent.$(file.patterns.pov)=5 case catch class default do else for if \
+#~ private protected public struct try union while
+#~ statement.lookback.$(file.patterns.pov)=20
+#~ block.start.$(file.patterns.pov)=10 {
+#~ block.end.$(file.patterns.pov)=10 }
+#indent.maintain.$(file.patterns.pov)=1
+#indent.size.$(file.patterns.pov)=4
+#tab.size.$(file.patterns.pov)=4
+#use.tabs.$(file.patterns.pov)=1
+
+# Actually, these are SDL directives, but SciTE is seeking for the preprocessor.* properties
+preprocessor.symbol.$(file.patterns.pov)=#
+preprocessor.start.$(file.patterns.pov)=if ifdef ifndef switch while macro
+preprocessor.middle.$(file.patterns.pov)=else
+preprocessor.end.$(file.patterns.pov)=end
+
+# keywords(1) is for Language directives (#xxx)
+keywordclass.pov=declare local include undef fopen fclose read write default version \
+case range break debug error warning \
+if ifdef ifndef switch while macro else end
+
+keywords.$(file.patterns.pov)=$(keywordclass.pov)
+
+# keywords2 is for Objects & CSG & Appearance (xxx {})
+keywords2.$(file.patterns.pov)=camera light_source light_group \
+object blob sphere cylinder box cone height_field julia_fractal \
+lathe prism sphere_sweep superellipsoid sor text torus \
+bicubic_patch disc mesh mesh2 polygon triangle smooth_triangle \
+plane poly cubic quartic quadric isosurface parametric \
+union intersection difference merge function array spline \
+vertex_vectors normal_vectors uv_vectors face_indices normal_indices uv_indices \
+texture texture_list interior_texture \
+texture_map material_map image_map color_map colour_map pigment_map \
+normal_map slope_map bump_map density_map \
+pigment normal material interior finish reflection irid slope pigment_pattern image_pattern \
+warp media scattering density background fog sky_sphere rainbow \
+global_settings radiosity photons pattern \
+transform looks_like projected_through contained_by clipped_by bounded_by
+
+# keywords3 is for Types & Modifiers & Items
+keywords3.$(file.patterns.pov)=linear_spline quadratic_spline cubic_spline natural_spline bezier_spline b_spline \
+read write append inverse open \
+perspective orthographic fisheye ultra_wide_angle omnimax panoramic \
+spherical spotlight jitter circular orient \
+media_attenuation media_interaction shadowless parallel \
+refraction collect pass_through global_lights hierarchy sturm smooth \
+gif tga iff pot png pgm ppm jpeg tiff sys ttf \
+quaternion hypercomplex linear_sweep conic_sweep \
+type all_intersections split_union cutaway_textures \
+no_shadow no_image no_reflection double_illuminate hollow \
+uv_mapping all use_index use_color use_colour no_bump_scale \
+conserve_energy fresnel \
+average agate boxed bozo bumps cells crackle cylindrical density_file dents \
+facets granite leopard marble onion planar quilted radial ripples spotted waves wood wrinkles \
+solid use_alpha interpolate magnet noise_generator toroidal \
+ramp_wave triangle_wave sine_wave scallop_wave cubic_wave poly_wave \
+once map_type method fog_type hf_gray_16 charset ascii utf8 \
+rotate scale translate matrix location right up direction sky \
+angle look_at aperture blur_samples focal_point confidence variance \
+radius falloff tightness point_at area_light adaptive fade_distance fade_power \
+threshold strength water_level tolerance max_iteration precision slice \
+u_steps v_steps flatness inside_vector \
+accuracy max_gradient evaluate max_trace precompute \
+target ior dispersion dispersion_samples caustics \
+color colour rgb rgbf rgbt rgbft red green blue filter transmit gray hf \
+fade_color fade_colour quick_color quick_colour \
+brick checker hexagon brick_size mortar bump_size \
+ambient diffuse brilliance crand phong phong_size metallic specular \
+roughness reflection_exponent exponent thickness \
+gradient spiral1 spiral2 agate_turb form metric \
+offset df3 coords size mandel exterior julia \
+control0 control1 altitude turbulence octaves omega lambda \
+repeat flip black-hole orientation dist_exp major_radius \
+frequency phase intervals samples ratio absorption emission aa_threshold aa_level \
+eccentricity extinction distance turb_depth fog_offset fog_alt width arc_angle falloff_angle \
+adc_bailout ambient_light assumed_gamma irid_wavelength number_of_waves \
+always_sample brigthness count error_bound gray_threshold load_file \
+low_error_factor max_sample minimum_reuse nearest_count \
+pretrace_end pretrace_start recursion_limit save_file \
+spacing gather max_trace_level autostop expand_thresholds
+
+# keywords4 is for Predefined Identifiers
+keywords4.$(file.patterns.pov)=x y z t u v \
+yes no true false on off \
+clock clock_delta clock_on final_clock final_frame frame_number \
+image_height image_width initial_clock initial_frame pi version
+
+# keywords5 is for Predefined Functions
+keywords5.$(file.patterns.pov)=abs acos acosh asc asin asinh atan atanh atan2 \
+ceil cos cosh defined degrees dimensions dimension_size div exp file_exists floor \
+inside int ln log max min mod pow prod radians rand seed select sin sinh sqrt strcmp \
+strlen sum tan tanh val vdot vlength min_extent max_extent trace vaxis_rotate \
+vcross vrotate vnormalize vturbulence chr concat str strlwr strupr substr vstr \
+sqr cube reciprocal pwr
+
+# keywords6 is for User defined keywords 1
+keywords6.$(file.patterns.pov)=
+
+# keywords7 is for User defined keywords 2
+keywords7.$(file.patterns.pov)=
+
+# keywords8 is for User defined keywords 3
+keywords8.$(file.patterns.pov)=
+
+# POV-Ray SDL styles
+
+# Default
+style.pov.32=$(font.code.base)
+# White space: Visible only in View Whitespace mode (or if it has a back colour)
+style.pov.0=fore:#FF0080
+# Comment: /* */. Use fixed font to keep boxed comments as boxes
+style.pov.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: //. Proportionnal font is generally OK here
+style.pov.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.pov.3=$(colour.number)
+# Operators
+style.pov.4=$(colour.operator)
+# Identifiers (everything else...)
+style.pov.5=
+# Double quoted string
+style.pov.6=$(colour.string)
+# End of line where string is not closed
+style.pov.7=back:#E0C0E0,eolfilled,$(font.computer),bold
+# Directive: #keyword
+style.pov.8=$(colour.preproc)
+# Directive keyword error
+style.pov.9=fore:#804020,$(font.code.comment.doc),italics
+# Keywords (bozo test colors :-)
+# Keyword 2: Objects & CSG & Appearance (xxx {})
+style.pov.10=$(colour.keyword),back:#FFD0D0
+# Keyword 3: Types & Modifiers & Items
+style.pov.11=$(colour.keyword),back:#FFFFD0
+# Keyword 4: Predefined Identifiers
+style.pov.12=$(colour.keyword),bold
+# Keyword 5: Predefined Functions
+style.pov.13=$(colour.keyword),back:#D0D0FF
+# Keyword 6
+style.pov.14=$(colour.keyword),back:#D0FFD0
+# Keyword 7
+style.pov.15=$(colour.keyword),back:#D0D0D0
+# Keyword 8
+style.pov.16=$(colour.keyword),back:#E0E0E0
+# Braces are only matched in operator style
+braces.pov.style=4
+
+if PLAT_WIN
+	command.compile.*.pov=pvengine.exe $(FileName)
+	command.build.*.pov=
+	command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_GTK
+	command.compile.*.pov=povray +P $(FileName).pov
+	command.build.*.pov=
+	command.go.*.pov=povray +P $(FileName).pov
+
+if PLAT_WIN
+	command.help.$(file.patterns.pov)=$(CurrentWord)!D:\Programmes\UImages\POV-Ray 3.5\help\povray35.chm
+	command.help.subsystem.$(file.patterns.pov)=4
diff --git a/scite-app/scite/src/powerpro.properties b/scite-app/scite/src/powerpro.properties
new file mode 100644
index 0000000..d068c0b
--- /dev/null
+++ b/scite-app/scite/src/powerpro.properties
@@ -0,0 +1,86 @@
+# Define SciTE settings for powerpro files.
+file.patterns.powerpro=*.powerpro
+
+filter.powerpro=PowerPro (powerpro)|$(file.patterns.powerpro)|
+*filter.powerpro=$(filter.powerpro)
+lexer.$(file.patterns.powerpro)=powerpro
+*language.powerpro=PowerPro|powerpro||
+
+keywordclass.control=\
+break do else elseif endfor endif for function global gt if ifelse \
+ifx jump local lt quit static
+
+keywords.$(file.patterns.powerpro)=$(keywordclass.control)
+
+keywordclass.plugins=\
+win.debug win.debugshow win.exists win.getdisplayrect win.getfocus win.gethandle win.getrect \
+win.getsystemmetrics win.gettext win.maximize win.minimize win.move win.sendkeys win.setdebug \
+win.setfocus win.setrect win.settext win.show
+
+keywordclass.functions=\
+bar case clip env exec fill flag floattostring format formattime ftos \
+index input inputcancel inputdefault inputdialog join length messagebox mouse \
+not note readline remove replace replacechars replaceg revindex select \
+stof validpath visiblewindow wait wait.activity wait.for wait.forinterval wait.message \
+wait.quit wait.ready wait.sleep wait.until wallpaper window window word
+
+keywords2.$(file.patterns.powerpro)=$(keywordclass.plugins)|$(keywordclass.functions)
+
+calltip.powerpro.word.characters=$(chars.alpha)$(chars.numeric)_
+comment.block.powerpro=//~
+comment.stream.start.powerpro=/*
+comment.stream.end.powerpro=*/
+comment.box.start.powerpro=/*
+comment.box.middle.powerpro= *
+comment.box.end.powerpro= */
+
+# Autocomplete and call tip settings
+#api.*.powerpro=$(SciteDefaultHome)\api\powerpro.api
+word.characters.*.powerpro=$(chars.alpha)$(chars.numeric)@$_
+
+# Default
+style.powerpro.32=$(font.base)
+# Default text color
+style.powerpro.0=#fore:$(font.base)
+# Comment: /* */
+style.powerpro.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment: // ;; ;
+style.powerpro.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.powerpro.3=$(colour.number)
+# Keywords1
+#style.powerpro.4=$(colour.keyword),bold
+style.powerpro.4=fore:#0000FF
+# Keywords2
+style.powerpro.5=fore:#B00040
+# Keywords3
+style.powerpro.6=fore:#0000FF
+# Keywords4
+style.powerpro.7=fore:#0000FF
+# Double quoted string
+style.powerpro.8=$(colour.string)
+# Single quoted string
+style.powerpro.9=$(colour.char)
+# Line continuation
+style.powerpro.10=$(colour.preproc)
+# Operators
+style.powerpro.11=$(colour.operator),bold
+# Braces are only matched in operator style
+braces.powerpro.style=11
+# Identifiers
+style.powerpro.12=#0000FF
+# End of line where string is not closed
+style.powerpro.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Verbatim strings
+style.powerpro.14=$(colour.char)
+#alternate quote style (#)
+style.powerpro.15=$(colour.string)
+#function style
+style.powerpro.16=fore:#B00040,bold
+
+
+command.go.$(file.patterns.powerpro)="$(FilePath)"
+command.go.subsystem.$(file.patterns.powerpro)=2
+
+command.help.$(file.patterns.powerpro)=$(CurrentWord)!C:\Program Files\PowerPro\powerpro.chm
+command.help.subsystem.$(file.patterns.powerpro)=4
diff --git a/scite-app/scite/src/powershell.properties b/scite-app/scite/src/powershell.properties
new file mode 100644
index 0000000..5344ecd
--- /dev/null
+++ b/scite-app/scite/src/powershell.properties
@@ -0,0 +1,130 @@
+# Define SciTE settings for PowerShell files
+
+file.patterns.powershell=*.ps1
+
+filter.powershell=PowerShell (ps1)|$(file.patterns.powershell)|
+
+*filter.powershell=$(filter.powershell)
+
+lexer.$(file.patterns.powershell)=powershell
+
+*language.powershell=PowerShell|ps1||
+
+word.characters.$(file.patterns.powershell)=$(chars.alpha)$(chars.numeric)_-$
+
+# Keywords
+keywords.$(file.patterns.powershell)=\
+begin break catch continue data do dynamicparam else elseif end exit filter \
+finally for foreach from function if in local param private process return \
+switch throw trap try until where while
+
+# Cmdlets
+keywords2.$(file.patterns.powershell)=\
+add-computer add-content add-history add-member add-pssnapin add-type \
+checkpoint-computer clear-content clear-eventlog clear-history clear-item \
+clear-itemproperty clear-variable compare-object complete-transaction \
+connect-wsman convert-path convertfrom-csv convertfrom-securestring \
+convertfrom-stringdata convertto-csv convertto-html convertto-securestring \
+convertto-xml copy-item copy-itemproperty debug-process disable-computerrestore \
+disable-psbreakpoint disable-pssessionconfiguration disable-wsmancredssp \
+disconnect-wsman enable-computerrestore enable-psbreakpoint enable-psremoting \
+enable-pssessionconfiguration enable-wsmancredssp enter-pssession exit-pssession \
+export-alias export-clixml export-console export-counter export-csv \
+export-formatdata export-modulemember export-pssession foreach-object \
+format-custom format-list format-table format-wide get-acl get-alias \
+get-authenticodesignature get-childitem get-command get-computerrestorepoint \
+get-content get-counter get-credential get-culture get-date get-event \
+get-eventlog get-eventsubscriber get-executionpolicy get-formatdata get-help \
+get-history get-host get-hotfix get-item get-itemproperty get-job get-location \
+get-member get-module get-psbreakpoint get-pscallstack get-psdrive \
+get-psprovider get-pssession get-pssessionconfiguration get-pssnapin \
+get-pfxcertificate get-process get-random get-service get-tracesource \
+get-transaction get-uiculture get-unique get-variable get-wsmancredssp \
+get-wsmaninstance get-winevent get-wmiobject group-object import-alias \
+import-clixml import-counter import-csv import-localizeddata import-module \
+import-pssession invoke-command invoke-expression invoke-history invoke-item \
+invoke-wsmanaction invoke-wmimethod join-path limit-eventlog measure-command \
+measure-object move-item move-itemproperty new-alias new-event new-eventlog \
+new-item new-itemproperty new-module new-modulemanifest new-object new-psdrive \
+new-pssession new-pssessionoption new-service new-timespan new-variable \
+new-wsmaninstance new-wsmansessionoption new-webserviceproxy out-default \
+out-file out-gridview out-host out-null out-printer out-string pop-location \
+push-location read-host receive-job register-engineevent register-objectevent \
+register-pssessionconfiguration register-wmievent remove-computer remove-event \
+remove-eventlog remove-item remove-itemproperty remove-job remove-module \
+remove-psbreakpoint remove-psdrive remove-pssession remove-pssnapin \
+remove-variable remove-wsmaninstance remove-wmiobject rename-item \
+rename-itemproperty reset-computermachinepassword resolve-path restart-computer \
+restart-service restore-computer resume-service select-object select-string \
+select-xml send-mailmessage set-acl set-alias set-authenticodesignature \
+set-content set-date set-executionpolicy set-item set-itemproperty set-location \
+set-psbreakpoint set-psdebug set-pssessionconfiguration set-service \
+set-strictmode set-tracesource set-variable set-wsmaninstance \
+set-wsmanquickconfig set-wmiinstance show-eventlog sort-object split-path \
+start-job start-process start-service start-sleep start-transaction \
+start-transcript stop-computer stop-job stop-process stop-service \
+stop-transcript suspend-service tee-object test-computersecurechannel \
+test-connection test-modulemanifest test-path test-wsman trace-command \
+undo-transaction unregister-event unregister-pssessionconfiguration \
+update-formatdata update-list update-typedata use-transaction wait-event \
+wait-job wait-process where-object write-debug write-error write-eventlog \
+write-host write-output write-progress write-verbose write-warning
+
+# Aliases
+keywords3.$(file.patterns.powershell)=\
+ac asnp cat cd chdir clc clear clhy cli clp cls clv compare copy cp cpi cpp cvpa \
+dbp del diff dir ebp echo epal epcsv epsn erase etsn exsn fc fl foreach ft fw \
+gal gbp gc gci gcm gcs gdr ghy gi gjb gl gm gmo gp gps group gsn gsnp gsv gu gv \
+gwmi h history icm iex ihy ii ipal ipcsv ipmo ipsn ise iwmi kill lp ls man md \
+measure mi mount move mp mv nal ndr ni nmo nsn nv ogv oh popd ps pushd pwd r rbp \
+rcjb rd rdr ren ri rjb rm rmdir rmo rni rnp rp rsn rsnp rv rvpa rwmi sajb sal \
+saps sasv sbp sc select set si sl sleep sort sp spjb spps spsv start sv swmi tee \
+type where wjb write
+
+# Functions
+keywords4.$(file.patterns.powershell)=\
+clear-host disable-psremoting enable-psremoting get-verb help importsystemmodules \
+mkdir more prompt psedit tabexpansion
+
+# User-defined keywords
+#keywords5.$(file.patterns.powershell)=
+
+# Comments
+comment.block.powershell=#~
+comment.block.at.line.start.powershell=1
+
+# PowerShell Styles
+# Default
+style.powershell.0=fore:#000000
+# Comment
+style.powershell.1=fore:#008000
+# String
+style.powershell.2=fore:#800000
+# Character
+style.powershell.3=fore:#800000
+# Number
+style.powershell.4=fore:#FF0000
+# Variable
+style.powershell.5=fore:#800080
+# Operator
+style.powershell.6=fore:#000000,bold
+# Identifier
+style.powershell.7=$(style.powershell.0)
+# Keyword
+style.powershell.8=fore:#000080,bold
+# Cmdlet
+style.powershell.9=fore:#008080,bold
+# Alias
+style.powershell.10=fore:#008080,italics
+# Function
+style.powershell.11=fore:#808000,bold
+# User-defined keyword
+style.powershell.12=
+# Comment (multi-line)
+style.powershell.13=$(style.powershell.1)
+# Here-string
+style.powershell.14=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+# Here-string single quote
+style.powershell.15=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+# Comment keyword
+style.powershell.16=fore:#3060A0
diff --git a/scite-app/scite/src/ps.properties b/scite-app/scite/src/ps.properties
new file mode 100644
index 0000000..c26e644
--- /dev/null
+++ b/scite-app/scite/src/ps.properties
@@ -0,0 +1,139 @@
+# Define SciTE settings for PostScript files.
+
+file.patterns.ps=*.ps
+
+filter.ps=PostScript (ps)|$(file.patterns.ps)|
+
+*filter.ps=$(filter.ps)
+
+lexer.$(file.patterns.ps)=ps
+
+*language.postscript=P&ostScript|ps||
+
+ps.tokenize=0
+ps.level=3
+
+comment.block.ps=%~
+
+# Postscript level 1 operators
+keywords.$(file.patterns.ps)=\
+$error = == FontDirectory StandardEncoding UserObjects abs add aload \
+anchorsearch and arc arcn arcto array ashow astore atan awidthshow begin bind \
+bitshift bytesavailable cachestatus ceiling charpath clear cleardictstack \
+cleartomark clip clippath closefile closepath concat concatmatrix copy copypage \
+cos count countdictstack countexecstack counttomark currentcmykcolor \
+currentcolorspace currentdash currentdict currentfile currentflat currentfont \
+currentgray currenthsbcolor currentlinecap currentlinejoin currentlinewidth \
+currentmatrix currentmiterlimit currentpagedevice currentpoint currentrgbcolor \
+currentscreen currenttransfer cvi cvlit cvn cvr cvrs cvs cvx def defaultmatrix \
+definefont dict dictstack div dtransform dup echo end eoclip eofill eq \
+erasepage errordict exch exec execstack executeonly executive exit exp false \
+file fill findfont flattenpath floor flush flushfile for forall ge get \
+getinterval grestore grestoreall gsave gt idetmatrix idiv idtransform if ifelse \
+image imagemask index initclip initgraphics initmatrix inustroke invertmatrix \
+itransform known kshow le length lineto ln load log loop lt makefont mark \
+matrix maxlength mod moveto mul ne neg newpath noaccess nor not null nulldevice \
+or pathbbox pathforall pop print prompt pstack put putinterval quit rand rcheck \
+rcurveto read readhexstring readline readonly readstring rectstroke repeat \
+resetfile restore reversepath rlineto rmoveto roll rotate round rrand run save \
+scale scalefont search setblackgeneration setcachedevice setcachelimit \
+setcharwidth setcolorscreen setcolortransfer setdash setflat setfont setgray \
+sethsbcolor setlinecap setlinejoin setlinewidth setmatrix setmiterlimit \
+setpagedevice setrgbcolor setscreen settransfer setvmthreshold show showpage \
+sin sqrt srand stack start status statusdict stop stopped store string \
+stringwidth stroke strokepath sub systemdict token token transform translate \
+true truncate type ueofill undefineresource userdict usertime version vmstatus \
+wcheck where widthshow write writehexstring writestring xcheck xor
+
+# Postscript level 2 operators
+keywords2.$(file.patterns.ps)=\
+GlobalFontDirectory ISOLatin1Encoding SharedFontDirectory UserObject arct \
+colorimage cshow currentblackgeneration currentcacheparams currentcmykcolor \
+currentcolor currentcolorrendering currentcolorscreen currentcolorspace \
+currentcolortransfer currentdevparams currentglobal currentgstate \
+currenthalftone currentobjectformat currentoverprint currentpacking \
+currentpagedevice currentshared currentstrokeadjust currentsystemparams \
+currentundercolorremoval currentuserparams defineresource defineuserobject \
+deletefile execform execuserobject filenameforall fileposition filter \
+findencoding findresource gcheck globaldict glyphshow gstate ineofill infill \
+instroke inueofill inufill inustroke languagelevel makepattern packedarray \
+printobject product realtime rectclip rectfill rectstroke renamefile \
+resourceforall resourcestatus revision rootfont scheck selectfont serialnumber \
+setbbox setblackgeneration setcachedevice2 setcacheparams setcmykcolor setcolor \
+setcolorrendering setcolorscreen setcolorspace setcolortranfer setdevparams \
+setfileposition setglobal setgstate sethalftone setobjectformat setoverprint \
+setpacking setpagedevice setpattern setshared setstrokeadjust setsystemparams \
+setucacheparams setundercolorremoval setuserparams setvmthreshold shareddict \
+startjob uappend ucache ucachestatus ueofill ufill undef undefinefont \
+undefineresource undefineuserobject upath ustroke ustrokepath vmreclaim \
+writeobject xshow xyshow yshow
+
+# Postscript level 3 operators
+keywords3.$(file.patterns.ps)=\
+cliprestore clipsave composefont currentsmoothness findcolorrendering \
+setsmoothness shfill
+
+# RIP-specific operators (Ghostscript)
+keywords4.$(file.patterns.ps)=\
+.begintransparencygroup .begintransparencymask .bytestring .charboxpath \
+.currentaccuratecurves .currentblendmode .currentcurvejoin .currentdashadapt \
+.currentdotlength .currentfilladjust2 .currentlimitclamp .currentopacityalpha \
+.currentoverprintmode .currentrasterop .currentshapealpha \
+.currentsourcetransparent .currenttextknockout .currenttexturetransparent \
+.dashpath .dicttomark .discardtransparencygroup .discardtransparencymask \
+.endtransparencygroup .endtransparencymask .execn .filename .filename \
+.fileposition .forceput .forceundef .forgetsave .getbitsrect .getdevice \
+.inittransparencymask .knownget .locksafe .makeoperator .namestring .oserrno \
+.oserrorstring .peekstring .rectappend .runandhide .setaccuratecurves \
+.setblendmode .setcurvejoin .setdashadapt .setdebug .setdefaultmatrix \
+.setdotlength .setfilladjust2 .setlimitclamp .setmaxlength .setopacityalpha \
+.setoverprintmode .setrasterop .setsafe .setshapealpha .setsourcetransparent \
+.settextknockout .settexturetransparent .stringbreak .stringmatch .tempfile \
+.type1decrypt .type1encrypt .type1execchar .unread arccos arcsin copydevice \
+copyscanlines currentdevice finddevice findlibfile findprotodevice flushpage \
+getdeviceprops getenv makeimagedevice makewordimagedevice max min \
+putdeviceprops setdevice
+
+# PostScript styles
+
+#Default
+style.ps.0=$(font.base)
+# Comment
+style.ps.1=$(colour.code.comment.line),$(font.code.comment.line)
+# DSC comment
+style.ps.2=$(colour.code.comment.doc),$(font.code.comment.doc)
+# DSC comment value
+style.ps.3=fore:#3060A0,$(font.code.comment.doc)
+# Number
+style.ps.4=$(colour.number)
+# Name
+style.ps.5=$(colour.operator)
+# Keyword
+style.ps.6=$(colour.keyword),bold
+# Literal
+style.ps.7=$(colour.preproc)
+# Immediately evaluated literal
+style.ps.8=$(colour.preproc),bold
+# Array parenthesis
+style.ps.9=$(colour.keyword)
+# Dictionary parenthesis
+style.ps.10=fore:#3060A0
+# Procedure parenthesis
+style.ps.11=$(colour.operator),bold
+# Text
+style.ps.12=$(colour.string),$(font.text)
+# Hex string
+style.ps.13=fore:#3F7F3F
+# Base85 string
+style.ps.14=$(colour.string)
+# Bad string character
+style.ps.15=$(colour.error)
+# Braces are only matched in procedure parenthesis style
+braces.ps.style=11
+
+if PLAT_WIN
+    command.go.*.ps=gswin32c "$(FileNameExt)"
+
+if PLAT_GTK
+    command.go.*.ps=gs "$(FileNameExt)"
+
diff --git a/scite-app/scite/src/purebasic.properties b/scite-app/scite/src/purebasic.properties
new file mode 100644
index 0000000..ad0907e
--- /dev/null
+++ b/scite-app/scite/src/purebasic.properties
@@ -0,0 +1,66 @@
+# Define SciTE settings for PureBasic files.
+
+file.patterns.purebasic=*.pb
+
+filter.purebasic=PureBasic (pb)|$(file.patterns.purebasic)|
+
+*filter.purebasic=$(filter.purebasic)
+
+lexer.$(file.patterns.purebasic)=purebasic
+
+# keywords must be all lowercase
+
+#Language
+keywords.$(file.patterns.purebasic)=and break case continue data \
+datasection declare declarecdll declaredll default deftype dim else \
+elseif end enddatasection endenumeration endif endinterface endprocedure \
+endselect endstructure endstructureunion enumeration extends fakereturn \
+for foreach forever global gosub goto if includebinary includefile \
+includepath interface newlist next or procedure procedurecdll \
+proceduredll procedurereturn protected read repeat restore return select \
+shared static step structure structureunion to until wend while xincludefile
+
+#preprocessor
+keywords2.$(file.patterns.purebasic)=compilercase compilerdefault \
+compilerelse compilerendif compilerendselect compilerif compilerselect
+
+# PB styles
+# Default
+style.purebasic.0=fore:#000000
+# Comment
+style.purebasic.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.purebasic.2=$(colour.number)
+# Keyword1
+style.purebasic.3=$(colour.keyword)
+# String
+style.purebasic.4=$(colour.string)
+# Preprocessor
+# style.purebasic.5=$(colour.error)
+# Operator
+style.purebasic.6=$(colour.operator)
+# Identifier
+style.purebasic.7=$(style.purebasic.0)
+# Date
+# style.purebasic.8=$(colour.error)
+# StringEOL
+# style.purebasic.9=$(colour.error)
+# Keyword2
+style.purebasic.10=$(colour.preproc)
+# Keyword3
+style.purebasic.11=$(colour.keyword)
+# Keyword4
+style.purebasic.12=$(colour.keyword)
+# Constant
+style.purebasic.13=$(colour.number)
+# Asm
+# style.purebasic.14=$(colour.error)
+# Label
+style.purebasic.15=$(colour.preproc)
+# Error
+style.purebasic.16=$(colour.error)
+# HexNumber
+style.purebasic.17=$(colour.number)
+# BinNumber
+style.purebasic.18=$(colour.number)
+
diff --git a/scite-app/scite/src/python.properties b/scite-app/scite/src/python.properties
new file mode 100644
index 0000000..598252a
--- /dev/null
+++ b/scite-app/scite/src/python.properties
@@ -0,0 +1,178 @@
+# Define SciTE settings for Python files.
+
+file.patterns.py=*.py;*.pyw;*.pyx;*.pxd;*.pxi
+file.patterns.scons=SConstruct;SConscript
+
+*source.patterns.python=$(file.patterns.py);
+
+shbang.python=py
+shbang.python3=py
+
+filter.python=Python (py pyw)|$(file.patterns.py)|
+
+*filter.python=$(filter.python)
+
+lexer.$(file.patterns.py)=python
+lexer.$(file.patterns.scons)=python
+
+*language.python=Pytho&n|py||
+
+keywordclass.python2=and as assert break class continue def del elif \
+else except exec finally for from global if import in is lambda not \
+or pass print raise return try while with yield
+
+keywordclass.python3=False None True and as assert break class continue \
+def del elif else except finally for from global if import in is lambda \
+nonlocal not or pass raise return try while with yield
+
+keywordclass.python=$(keywordclass.python2)
+
+# Extra keywords for cython
+keywordclass.cython=cdef cimport cpdef
+
+keywords.$(file.patterns.py)=$(keywordclass.python) $(keywordclass.cython)
+keywords.$(file.patterns.scons)=$(keywordclass.python)
+
+# If you uncomment the 3 lines below,
+# and put some words after "keywordclass2.python=",
+# those words will be styled by style.python.14
+
+#keywordclass2.python=
+#keywords2.$(file.patterns.py)=$(keywordclass2.python)
+#keywords2.$(file.patterns.scons)=$(keywordclass2.python)
+
+# Use 2 sets of substyles to highlight standard library modules and
+# imports from the future.
+# Additional identifier sets can be added by incrementing the  next
+# line's value and adding extra definitions similar to below.
+substyles.python.11=2
+
+substylewords.11.1.$(file.patterns.py)=\
+__main__ _dummy_thread _thread abc aifc argparse \
+array ast asynchat asyncio asyncore atexit audioop \
+base64 bdb binascii binhex bisect builtins bz2 \
+calendar cgi cgitb chunk cmath cmd code codecs \
+codeop collections colorsys compileall concurrent \
+configparser contextlib copy copyreg crypt csv \
+ctypes curses datetime dbm decimal difflib dis \
+distutils dummy_threading email ensurepip enum \
+errno faulthandler fcntl filecmp fileinput fnmatch \
+formatter fpectl fractions ftplib functools gc getopt \
+getpass gettext glob grp gzip hashlib heapq hmac \
+html http http imaplib imghdr importlib inspect io \
+ipaddress itertools json keyword linecache locale \
+logging lzma macpath mailbox mailcap marshal math \
+mimetypes mmap modulefinder msilib msvcrt \
+multiprocessing netrc nis nntplib numbers operator \
+os os ossaudiodev parser pathlib pdb pickle \
+pickletools pipes pkgutil platform plistlib poplib posix \
+pprint pty pwd py_compile pyclbr queue quopri \
+random re readline reprlib resource rlcompleter runpy \
+sched select selectors shelve shlex shutil signal site \
+smtpd smtplib sndhdr socket socketserver spwd \
+sqlite3 ssl stat statistics string stringprep struct \
+subprocess sunau symbol symtable sys sysconfig \
+syslog tabnanny tarfile telnetlib tempfile termios \
+textwrap threading time timeit tkinter token \
+tokenize trace traceback tracemalloc tty turtle \
+types unicodedata unittest urllib uu uuid venv warnings \
+wave weakref webbrowser winreg winsound wsgiref \
+xdrlib xml xmlrpc zipfile zipimport zlib
+style.python.11.1=fore:#DD9900
+
+substylewords.11.2.$(file.patterns.py)=__future__ \
+with_statement unicode_literals print_function
+style.python.11.2=fore:#EE00AA,italics
+
+#~ statement.indent.$(file.patterns.py)=10 :
+statement.indent.$(file.patterns.py)=5 class def elif else except finally \
+for if try while with
+
+statement.lookback.$(file.patterns.py)=0
+block.start.$(file.patterns.py)=
+block.end.$(file.patterns.py)=
+
+view.indentation.examine.*.py=2
+
+tab.timmy.whinge.level=1
+
+#fold.quotes.python=1
+
+comment.block.python=#~
+
+indent.python.colon=1
+
+# Python styles
+# White space
+style.python.0=fore:#808080
+# Comment
+style.python.1=fore:#007F00,$(font.comment)
+# Number
+style.python.2=fore:#007F7F
+# String
+style.python.3=fore:#7F007F,$(font.monospace)
+# Single quoted string
+style.python.4=fore:#7F007F,$(font.monospace)
+# Keyword
+style.python.5=fore:#00007F,bold
+# Triple quotes
+style.python.6=fore:#7F0000
+# Triple double quotes
+style.python.7=fore:#7F0000
+# Class name definition
+style.python.8=fore:#0000FF,bold
+# Function or method name definition
+style.python.9=fore:#007F7F,bold
+# Operators
+style.python.10=bold
+# Identifiers
+style.python.11=
+# Comment-blocks
+style.python.12=fore:#7F7F7F
+# End of line where string is not closed
+style.python.13=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Highlighted identifiers
+style.python.14=fore:#407090
+# Decorators
+style.python.15=fore:#805000
+# F-String
+style.python.16=fore:#7F007F,$(font.monospace)
+# Single quoted f-string
+style.python.17=fore:#7F007F,$(font.monospace)
+# Triple quoted f-string
+style.python.18=fore:#7F0000
+# Triple double quoted f-string
+style.python.19=fore:#7F0000
+# Matched Operators
+style.python.34=fore:#0000FF,bold
+style.python.35=fore:#FF0000,bold
+# Braces are only matched in operator style
+braces.python.style=10
+
+if PLAT_WIN
+	python.command=pyw
+if PLAT_GTK
+	python.command=python3
+if PLAT_MAC
+	python.command=python
+
+if PLAT_WIN
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.go.subsystem.*.py=1
+	command.go.*.pyw=$(python.command) -u "$(FileNameExt)"
+	command.go.subsystem.*.pyw=1
+	command.build.SConscript=scons.bat --up .
+	command.build.SConstruct=scons.bat .
+
+if PLAT_GTK
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.build.SConscript=scons --up .
+	command.build.SConstruct=scons .
+
+if PLAT_MAC
+	command.go.*.py=$(python.command) -u "$(FileNameExt)"
+	command.build.SConscript=scons --up .
+	command.build.SConstruct=scons .
+
+command.name.1.$(file.patterns.py)=Syntax Check
+command.1.$(file.patterns.py)=$(python.command) -c "import py_compile; py_compile.compile(r'$(FilePath)')"
diff --git a/scite-app/scite/src/r.properties b/scite-app/scite/src/r.properties
new file mode 100644
index 0000000..ed2779a
--- /dev/null
+++ b/scite-app/scite/src/r.properties
@@ -0,0 +1,64 @@
+# Define SciTE settings for R and S source files
+
+file.patterns.r=*.r;*.R;*.rsource
+# The .S extension now defaults to GNU Assembler with file.patterns.as in asm.properties.
+file.patterns.r.like=$(file.patterns.r)
+
+filter.r=R (R rsource)|$(file.patterns.r)|
+
+*filter.r=$(filter.r)
+
+lexer.$(file.patterns.r)=r
+
+*language.r=R|R||
+
+keywordclass.r=if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN
+
+keywords.$(file.patterns.r)=$(keywordclass.r)
+
+keywords2.$(file.patterns.r)=abbreviate abline abs acf acos acosh addmargins aggregate agrep alarm alias alist all anova any aov aperm append apply approx approxfun apropos ar args arima array arrows asin asinh assign assocplot atan atanh attach attr attributes autoload autoloader ave axis backsolve barplot basename beta bindtextdomain binomial biplot bitmap bmp body box boxplot bquote break browser builtins bxp by bzfile c call cancor capabilities casefold cat category cbind ccf ceiling character charmatch chartr chol choose chull citation class close cm cmdscale codes coef coefficients col colnames colors colorspaces colours comment complex confint conflicts contour contrasts contributors convolve cophenetic coplot cor cos cosh cov covratio cpgram crossprod cummax cummin cumprod cumsum curve cut cutree cycle data dataentry date dbeta dbinom dcauchy dchisq de debug debugger decompose delay deltat demo dendrapply density deparse deriv det detach determinant deviance dexp df dfbeta dfbetas dffits dgamma dgeom dget dhyper diag diff diffinv difftime digamma dim dimnames dir dirname dist dlnorm dlogis dmultinom dnbinom dnorm dotchart double dpois dput drop dsignrank dt dump dunif duplicated dweibull dwilcox eapply ecdf edit effects eigen emacs embed end environment eval evalq example exists exp expression factanal factor factorial family fft fifo file filter find fitted fivenum fix floor flush for force formals format formula forwardsolve fourfoldplot frame frequency ftable function gamma gaussian gc gcinfo gctorture get getenv geterrmessage gettext gettextf getwd gl glm globalenv gray grep grey grid gsub gzcon gzfile hat hatvalues hcl hclust head heatmap help hist history hsv httpclient iconv iconvlist identical identify if ifelse image influence inherits integer integrate interaction interactive intersect invisible isoreg jitter jpeg julian kappa kernapply kernel kmeans knots kronecker ksmooth labels lag lapply layout lbeta lchoose lcm legend length letters levels lfactorial lgamma library licence license line lines list lm load loadhistory loadings local locator loess log logb logical loglin lowess ls lsfit machine mad mahalanobis makepredictcall manova mapply match matlines matplot matpoints matrix max mean median medpolish menu merge message methods mget min missing mode monthplot months mosaicplot mtext mvfft names napredict naprint naresid nargs nchar ncol next nextn ngettext nlevels nlm nls noquote nrow numeric objects offset open optim optimise optimize options order ordered outer pacf page pairlist pairs palette par parse paste pbeta pbinom pbirthday pcauchy pchisq pdf pentagamma person persp pexp pf pgamma pgeom phyper pi pico pictex pie piechart pipe plclust plnorm plogis plot pmatch pmax pmin pnbinom png pnorm points poisson poly polygon polym polyroot postscript power ppoints ppois ppr prcomp predict preplot pretty princomp print prmatrix prod profile profiler proj promax prompt provide psigamma psignrank pt ptukey punif pweibull pwilcox q qbeta qbinom qbirthday qcauchy qchisq qexp qf qgamma qgeom qhyper qlnorm qlogis qnbinom qnorm qpois qqline qqnorm qqplot qr qsignrank qt qtukey quantile quarters quasi quasibinomial quasipoisson quit qunif quote qweibull qwilcox rainbow range rank raw rbeta rbind rbinom rcauchy rchisq readline real recover rect reformulate regexpr relevel remove reorder rep repeat replace replicate replications require reshape resid residuals restart return rev rexp rf rgamma rgb rgeom rhyper rle rlnorm rlogis rm rmultinom rnbinom rnorm round row rownames rowsum rpois rsignrank rstandard rstudent rt rug runif runmed rweibull rwilcox sample sapply save savehistory scale scan screen screeplot sd search searchpaths seek segments seq sequence serialize setdiff setequal setwd shell sign signif sin single sinh sink smooth solve sort source spectrum spline splinefun split sprintf sqrt stack stars start stderr stdin stdout stem step stepfun stl stop stopifnot str strftime strheight stripchart strptime strsplit strtrim structure strwidth strwrap sub subset substitute substr substring sum summary sunflowerplot supsmu svd sweep switch symbols symnum system t table tabulate tail tan tanh tapply tempdir tempfile termplot terms tetragamma text time title toeplitz tolower topenv toupper trace traceback transform trigamma trunc truncate try ts tsdiag tsp typeof unclass undebug union unique uniroot unix unlink unlist unname unserialize unsplit unstack untrace unz update upgrade url var varimax vcov vector version vi vignette warning warnings weekdays weights which while window windows with write wsbrowser xedit xemacs xfig xinch xor xtabs xyinch yinch zapsmall
+
+keywords3.$(file.patterns.r)=acme aids aircondit amis aml banking barchart barley beaver bigcity boot brambles breslow bs bwplot calcium cane capability cav censboot channing city claridge cloth cloud coal condense contourplot control corr darwin densityplot dogs dotplot ducks empinf envelope environmental ethanol fir frets gpar grav gravity grob hirose histogram islay knn larrows levelplot llines logit lpoints lsegments lset ltext lvqinit lvqtest manaus melanoma melanoma motor multiedit neuro nitrofen nodal ns nuclear oneway parallel paulsen poisons polar qq qqmath remission rfs saddle salinity shingle simplex singer somgrid splom stripplot survival tau tmd tsboot tuna unit urine viewport wireframe wool xyplot
+
+
+word.chars.r=$(chars.alpha)$(chars.numeric)_.#
+word.characters.$(file.patterns.r)=$(word.chars.r)
+comment.block.r=#~
+
+statement.indent.$(file.patterns.r.like)=5 for if
+statement.end.$(file.patterns.r.like)=10 ;
+statement.lookback.$(file.patterns.r.like)=20
+block.start.$(file.patterns.r.like)=10 {
+block.end.$(file.patterns.r.like)=10 }
+
+# R styles
+
+# Default
+style.r.32=$(font.base)
+# White space
+style.r.0=fore:#808080
+# Comment
+style.r.1=$(colour.code.comment.box),$(font.code.comment.box)
+#Keyword
+style.r.2=$(colour.keyword),bold
+# Base Package Function
+style.r.3=fore:#7f0000,bold
+# Other Package Function
+style.r.4=fore:#7f007F,bold
+# Number
+style.r.5=$(colour.number)
+# " Delimited String
+style.r.6=$(colour.string)
+# ' Delimited String
+style.r.7=$(colour.string)
+# Operator
+style.r.8=$(colour.operator),bold
+# Identifier
+style.r.9=$(colour.identifier)
+# INFIX highlight
+style.r.10=$(colour.operator),bold
+# INFIX End of Line error
+style.r.11=$(colour.operator),$(font.monospace),back:#E0C0E0,eolfilled
+
+# Braces are only matched in operator style
+braces.r.style=8
diff --git a/scite-app/scite/src/raku.properties b/scite-app/scite/src/raku.properties
new file mode 100644
index 0000000..17e0240
--- /dev/null
+++ b/scite-app/scite/src/raku.properties
@@ -0,0 +1,201 @@
+# Define SciTE settings for Raku (Perl 6) files.
+# By Mark Reay <mark@reay.net.au>, 2019
+
+file.patterns.raku=*.p6;*.pm6;*.pod6;*.t6;*.raku;*.rakumod;*.rakudoc;*.rakutest
+
+*source.patterns.raku=$(file.patterns.raku);
+
+*filter.raku=Raku (p6 pm6)|$(file.patterns.raku)|
+
+*language.raku=Raku|p6||
+
+lexer.$(file.patterns.raku)=raku
+
+# Keywords (base)
+keywords.$(file.patterns.raku)=BEGIN CATCH CHECK CONTROL END ENTER EVAL FIRST \
+ INIT KEEP LAST LEAVE NEXT POST PRE START TEMP UNDO after also andthen as \
+ async augment bag before but category circumfix class cmp complex constant \
+ contend default defer div does dynamic else elsif enum eq eqv extra fail \
+ fatal ff fff for gather gcd ge given grammar gt handles has if infix is lcm \
+ le leave leg let lift loop lt macro make maybe method mix mod module multi \
+ ne not o only oo or orelse orwith postcircumfix postfix prefix proto regex \
+ repeat require return-rw returns role rule size_t slang start str submethod \
+ subset supersede take temp term token trusts try unit unless until when \
+ where while with without x xor xx
+# Keywords (functions)
+keywords2.$(file.patterns.raku)=ACCEPTS AT-KEY EVALFILE EXISTS-KEY Filetests \
+ IO STORE abs accept acos acosec acosech acosh acotan acotanh alarm and \
+ antipairs asec asech asin asinh atan atan2 atanh base bind binmode bless \
+ break caller ceiling chars chdir chmod chomp chop chr chroot chrs cis close \
+ closedir codes comb conj connect contains continue cos cosec cosech cosh \
+ cotan cotanh crypt dbm defined die do dump each elems eof exec exists exit \
+ exp expmod fc fcntl fileno flat flip flock floor fmt fork formats functions \
+ get getc getpeername getpgrp getppid getpriority getsock gist glob gmtime \
+ goto grep hyper import index int invert ioctl is-prime iterator join keyof \
+ keys kill kv last lazy lc lcfirst lines link list listen local localtime \
+ lock log log10 lsb lstat map match mkdir msb msg my narrow new next no of \
+ open ord ords our pack package pairs path pick pipe polymod pop pos pred \
+ print printf prototype push quoting race rand read readdir readline readlink \
+ readpipe recv redo ref rename requires reset return reverse rewinddir rindex \
+ rmdir roots round samecase say scalar sec sech seek seekdir select semctl \
+ semget semop send set setpgrp setpriority setsockopt shift shm shutdown sign \
+ sin sinh sleep sockets sort splice split sprintf sqrt srand stat state study \
+ sub subst substr substr-rw succ symlink sys syscall system syswrite tan tanh \
+ tc tclc tell telldir tie time times trans trim trim-leading trim-trailing \
+ truncate uc ucfirst unimatch uniname uninames uniprop uniprops unival unlink \
+ unpack unpolar unshift untie use utime values wait waitpid wantarray warn \
+ wordcase words write
+# Keywords (types)
+keywords3.$(file.patterns.raku)=AST Any Block Bool CallFrame Callable Code \
+ Collation Compiler Complex ComplexStr Cool CurrentThreadScheduler Date \
+ DateTime Dateish Distribution Distribution::Hash Distribution::Locally \
+ Distribution::Path Duration Encoding Encoding::Registry Endian FatRat \
+ ForeignCode HyperSeq HyperWhatever Instant Int IntStr Junction Label \
+ Lock::Async Macro Method Mu Nil Num NumStr Numeric ObjAt Parameter Perl \
+ PredictiveIterator Proxy RaceSeq Rat RatStr Rational Real Routine \
+ Routine::WrapHandle Scalar Sequence Signature Str StrDistance Stringy Sub \
+ Submethod Telemetry Telemetry::Instrument::Thread \
+ Telemetry::Instrument::ThreadPool Telemetry::Instrument::Usage \
+ Telemetry::Period Telemetry::Sampler UInt ValueObjAt Variable Version \
+ Whatever WhateverCode atomicint bit bool buf buf1 buf16 buf2 buf32 buf4 \
+ buf64 buf8 int int1 int16 int2 int32 int4 int64 int8 long longlong num \
+ num32 num64 rat rat1 rat16 rat2 rat32 rat4 rat64 rat8 uint uint1 uint16 \
+ uint2 uint32 uint4 uint64 uint8 utf16 utf32 utf8
+# Keywords (types composite)
+keywords4.$(file.patterns.raku)=Array Associative Bag BagHash Baggy Blob Buf \
+ Capture Enumeration Hash Iterable Iterator List Map Mix MixHash Mixy NFC NFD \
+ NFKC NFKD Pair Positional PositionalBindFailover PseudoStash QuantHash Range \
+ Seq Set SetHash Setty Slip Stash Uni utf8
+# Keywords (types domain specific)
+keywords5.$(file.patterns.raku)=Attribute Cancellation Channel CompUnit \
+ CompUnit::Repository CompUnit::Repository::FileSystem \
+ CompUnit::Repository::Installation Distro Grammar IO IO::ArgFiles \
+ IO::CatHandle IO::Handle IO::Notification IO::Path IO::Path::Cygwin \
+ IO::Path::QNX IO::Path::Unix IO::Path::Win32 IO::Pipe IO::Socket \
+ IO::Socket::Async IO::Socket::INET IO::Spec IO::Spec::Cygwin \
+ IO::Spec::QNX IO::Spec::Unix IO::Spec::Win32 IO::Special Kernel Lock \
+ Match Order Pod::Block Pod::Block::Code Pod::Block::Comment \
+ Pod::Block::Declarator Pod::Block::Named Pod::Block::Para Pod::Block::Table \
+ Pod::Defn Pod::FormattingCode Pod::Heading Pod::Item Proc Proc::Async \
+ Promise Regex Scheduler Semaphore Supplier Supplier::Preserving Supply \
+ Systemic Tap Thread ThreadPoolScheduler VM
+# Keywords (types domain exceptions)
+keywords6.$(file.patterns.raku)=Backtrace Backtrace::Frame CX::Done CX::Emit \
+ CX::Last CX::Next CX::Proceed CX::Redo CX::Return CX::Succeed CX::Take \
+ CX::Warn Exception Failure X::AdHoc X::Anon::Augment X::Anon::Multi \
+ X::Assignment::RO X::Attribute::NoPackage X::Attribute::Package \
+ X::Attribute::Required X::Attribute::Undeclared X::Augment::NoSuchType \
+ X::Bind X::Bind::NativeType X::Bind::Slice X::Caller::NotDynamic \
+ X::Channel::ReceiveOnClosed X::Channel::SendOnClosed X::Comp \
+ X::Composition::NotComposable X::Constructor::Positional X::Control \
+ X::ControlFlow X::ControlFlow::Return X::DateTime::TimezoneClash \
+ X::Declaration::Scope X::Declaration::Scope::Multi X::Does::TypeObject \
+ X::Dynamic::NotFound X::Eval::NoSuchLang X::Export::NameClash X::IO \
+ X::IO::Chdir X::IO::Chmod X::IO::Copy X::IO::Cwd X::IO::Dir X::IO::DoesNotExist \
+ X::IO::Link X::IO::Mkdir X::IO::Move X::IO::Rename X::IO::Rmdir \
+ X::IO::Symlink X::IO::Unlink X::Inheritance::NotComposed \
+ X::Inheritance::Unsupported X::Method::InvalidQualifier X::Method::NotFound \
+ X::Method::Private::Permission X::Method::Private::Unqualified \
+ X::Mixin::NotComposable X::NYI X::NoDispatcher X::Numeric::Real \
+ X::OS X::Obsolete X::OutOfRange X::Package::Stubbed X::Parameter::Default \
+ X::Parameter::MultipleTypeConstraints X::Parameter::Placeholder \
+ X::Parameter::Twigil X::Parameter::WrongOrder X::Phaser::Multiple \
+ X::Phaser::PrePost X::Placeholder::Block X::Placeholder::Mainline \
+ X::Pod X::Proc::Async X::Proc::Async::AlreadyStarted X::Proc::Async::BindOrUse \
+ X::Proc::Async::CharsOrBytes X::Proc::Async::MustBeStarted \
+ X::Proc::Async::OpenForWriting X::Proc::Async::TapBeforeSpawn \
+ X::Proc::Unsuccessful X::Promise::CauseOnlyValidOnBroken X::Promise::Vowed \
+ X::Redeclaration X::Role::Initialization X::Scheduler::CueInNaNSeconds \
+ X::Seq::Consumed X::Sequence::Deduction X::Signature::NameClash \
+ X::Signature::Placeholder X::Str::Numeric X::StubCode X::Syntax \
+ X::Syntax::Augment::WithoutMonkeyTyping X::Syntax::Comment::Embedded \
+ X::Syntax::Confused X::Syntax::InfixInTermPosition X::Syntax::Malformed \
+ X::Syntax::Missing X::Syntax::NegatedPair X::Syntax::NoSelf \
+ X::Syntax::Number::RadixOutOfRange X::Syntax::P5 X::Syntax::Perl5Var \
+ X::Syntax::Regex::Adverb X::Syntax::Regex::SolitaryQuantifier \
+ X::Syntax::Reserved X::Syntax::Self::WithoutObject \
+ X::Syntax::Signature::InvocantMarker X::Syntax::Term::MissingInitializer \
+ X::Syntax::UnlessElse X::Syntax::Variable::Match X::Syntax::Variable::Numeric \
+ X::Syntax::Variable::Twigil X::Temporal X::Temporal::InvalidFormat \
+ X::TypeCheck X::TypeCheck::Assignment X::TypeCheck::Binding \
+ X::TypeCheck::Return X::TypeCheck::Splice X::Undeclared
+# Keywords (adverbs)
+keywords7.$(file.patterns.raku)=D a array b backslash c closure delete double \
+ exec exists f function h hash heredoc k kv p q qq quotewords s scalar single \
+ sym to v val w words ww x
+
+word.characters.$(file.patterns.raku)=$(chars.alpha)$(chars.numeric)_$@%&
+
+comment.block.raku=#~
+
+colour.raku.heredoc=$(colour.embedded.comment)
+
+fold.raku.comment.multiline=1
+fold.raku.comment.pod=1
+
+# Raku styles
+style.raku.0=fore:#808080
+# SCE_RAKU_ERROR=1
+style.raku.1=$(colour.error)
+# SCE_RAKU_COMMENTLINE=2
+style.raku.2=$(colour.code.comment.line),$(font.code.comment.line)
+# SCE_RAKU_COMMENTEMBED=3
+style.raku.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# SCE_RAKU_POD=4
+style.raku.4=$(colour.code.comment.box),$(font.code.comment.box)
+# SCE_RAKU_CHARACTER=5
+style.raku.5=$(colour.char),$(font.monospace)
+# SCE_RAKU_HEREDOC_Q=6
+style.raku.6=fore:#7F007F,back:#DDD0DD,notbold
+# SCE_RAKU_HEREDOC_QQ=7
+style.raku.7=fore:#7F007F,back:#DDD0DD,bold
+# SCE_RAKU_STRING=8
+style.raku.8=$(colour.char),$(font.monospace)
+# SCE_RAKU_STRING_Q=9
+style.raku.9=$(style.raku.8)
+# SCE_RAKU_STRING_QQ=10
+style.raku.10=$(colour.string),$(font.monospace)
+# SCE_RAKU_STRING_Q_LANG=11
+style.raku.11=$(style.raku.10)
+# SCE_RAKU_STRING_VAR=12
+style.raku.12=fore:#D600B5,bold
+# SCE_RAKU_REGEX=13
+style.raku.13=fore:#000000,back:#A0FFA0
+# SCE_RAKU_REGEX_VAR=14
+style.raku.14=$(style.raku.12),back:#A0FFA0
+# SCE_RAKU_ADVERB=15
+style.raku.15=$(colour.preproc),bold
+# SCE_RAKU_NUMBER=16
+style.raku.16=$(colour.number)
+# SCE_RAKU_PREPROCESSOR=17
+style.raku.17=$(colour.notused),$(font.notused)
+# SCE_RAKU_OPERATOR=18
+style.raku.18=$(colour.operator),bold
+# SCE_RAKU_WORD=19
+style.raku.19=$(colour.keyword),bold
+# SCE_RAKU_FUNCTION=20
+style.raku.20=$(style.raku.19)
+# SCE_RAKU_IDENTIFIER=21
+style.raku.21=$(colour.operator)
+# SCE_RAKU_TYPEDEF=22
+style.raku.22=$(style.raku.19)
+# SCE_RAKU_MU=23
+style.raku.23=$(style.raku.0)
+# SCE_RAKU_POSITIONAL=24
+style.raku.24=fore:#6E05BE
+# SCE_RAKU_ASSOCIATIVE=25
+style.raku.25=fore:#F4D50A
+# SCE_RAKU_CALLABLE=26
+style.raku.26=$(style.raku.21)
+# SCE_RAKU_GRAMMAR=27
+style.raku.27=$(style.raku.15)
+# SCE_RAKU_CLASS=28
+style.raku.28=$(style.raku.15)
+
+# Braces are only matched in operator style
+braces.raku.style=18
+
+command.go.$(file.patterns.raku)=perl6 -w $(FileNameExt)
+command.compile.$(file.patterns.raku)=perl6 -c -w $(FileNameExt)
+command.name.0.$(file.patterns.raku)=Check Syntax
+command.0.$(file.patterns.raku)=perl6 -c $(FileNameExt)
diff --git a/scite-app/scite/src/rebol.properties b/scite-app/scite/src/rebol.properties
new file mode 100644
index 0000000..6ef68a5
--- /dev/null
+++ b/scite-app/scite/src/rebol.properties
@@ -0,0 +1,181 @@
+# Define SciTE settings for REBOL files.
+
+file.patterns.rebol=*.r;*.reb
+
+filter.rebol=REBOL (r)|$(file.patterns.rebol)|
+
+*filter.rebol=$(filter.rebol)
+
+lexer.$(file.patterns.rebol)=rebol
+
+# keywords. Found at http://www.rebol.com/docs/dictionary.html
+keywords.$(file.patterns.rebol)=about abs absolute add \
+alert alias all alter and \
+any any-block? any-function? any-string? any-type? \
+any-word? append arccosine arcsine arctangent \
+array as-pair ask at attempt \
+back binary? bind bitset? block? \
+break brightness? browse build-tag caret-to-offset \
+catch center-face change change-dir char? \
+charset checksum choose clean-path clear \
+clear-fields close comment complement component? \
+compose compress confirm connected? construct \
+context copy cosine datatype? date? \
+debase decimal? decode-cgi decompress dehex \
+delete detab difference dir? dirize \
+disarm dispatch divide do do-events \
+does dump-face dump-obj echo either \
+else email? empty? enbase entab \
+equal? error? even? event? exclude \
+exists? exit exp extract fifth \
+file? find first flash focus \
+for forall foreach forever form \
+forskip found? fourth free func \
+function function? get get-modes get-word? \
+greater-or-equal? greater? halt has hash? \
+head head? help hide hide-popup \
+if image? import-email in in-window? \
+index? info? inform input input? \
+insert integer? intersect issue? join \
+last launch layout length? lesser-or-equal? \
+lesser? library? license link? list-dir \
+list? lit-path? lit-word? load load-image \
+log-10 log-2 log-e logic? loop \
+lowercase make make-dir make-face max \
+maximum maximum-of min minimum minimum-of \
+modified? mold money? multiply native? \
+negate negative? next none? not \
+not-equal? now number? object? odd? \
+offset-to-caret offset? op? open or \
+pair? paren? parse parse-xml path? \
+pick poke port? positive? power \
+prin print probe protect protect-system \
+query quit random read read-io \
+recycle reduce refinement? reform rejoin \
+remainder remold remove remove-each rename \
+repeat repend replace request request-color \
+request-date request-download request-file request-list request-pass \
+request-text resend return reverse routine? \
+same? save script? second secure \
+select send series? set set-modes \
+set-net set-path? set-word? show show-popup \
+sign? sine size-text size? skip \
+sort source span? split-path square-root \
+strict-equal? strict-not-equal? string? struct? stylize \
+subtract suffix? switch tag? tail \
+tail? tangent third throw time? \
+to to-binary to-bitset to-block to-char \
+to-date to-decimal to-email to-file to-get-word \
+to-hash to-hex to-idate to-image to-integer \
+to-issue to-list to-lit-path to-lit-word to-local-file \
+to-logic to-money to-pair to-paren to-path \
+to-rebol-file to-refinement to-set-path to-set-word to-string \
+to-tag to-time to-tuple to-url to-word \
+trace trim try tuple? type? \
+unfocus union unique unprotect unset \
+unset? until unview update upgrade \
+uppercase url? usage use value? \
+view viewed? wait what what-dir \
+while within? word? write write-io xor zero?
+
+# test functions
+keywords2.$(file.patterns.rebol)=action? any-block? any-function? any-string? \
+any-type? any-word? binary? bitset? block? char? component? connected? \
+datatype? date? decimal? dir? email? empty? equal? error? even? event? exists? \
+file? found? function? get-word? greater-or-equal greater? hash? head? image? \
+index? info? input? integer? issue? length? lesser-or-equal? lesser? library? \
+link-app? link? list? lit-path? lit-word? logic? modified? money? native? negative? \
+none? not-equal? number? object? odd? offset? op? pair? paren? path? port? \
+positive? rebol-command? rebol-encap? rebol-link? rebol-pro? rebol-view? \
+refinement? routine? same? script? series? set-path? set-word? sign? size? \
+strict-equal? strict-not-equal string? struct? suffix? tag? tail? time? tuple? type? \
+unset? url? value? view? word? zero?
+
+# types
+keywords3.$(file.patterns.rebol)=action! any-block! any-function! any-string! any-type! \
+ any-word! binary! bitset! block! char! datatype! date! decimal! email! error! \
+ event! file! function! get-word! hash! image! integer! issue! library! list! lit-path! \
+ lit-word! logic! money! native! none! number! object! op! pair! paren! path! \
+ port! refinement! routine! series! set-path! set-word! string! struct! symbol! tag! \
+ time! tuple! unset! url! word!
+
+word.chars.rebol=$(chars.alpha)$(chars.numeric)?!.�+-*&|=_~
+word.characters.$(file.patterns.rebol)=$(word.chars.rebol)
+
+comment.block.rebol=;
+comment.box.start.rebol=;;
+comment.box.middle.rebol=;;
+comment.box.end.rebol=;;
+
+# REBOL styles
+
+# Default
+style.rebol.32=$(font.base)
+# Any other text
+style.rebol.0=fore:#000000,bold
+# Line Comment
+style.rebol.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Block Comment ( comment {the text} )
+style.rebol.2=$(colour.code.comment.box),$(font.code.comment.box)
+# Preface (text before the REBOL header)
+style.rebol.3=$(colour.code.comment.box),$(font.code.comment.box),bold
+# Operators
+style.rebol.4=$(colour.operator),bold
+# Characters ( #"a" )
+style.rebol.5=$(colour.string)
+# String with quotes
+style.rebol.6=$(colour.string)
+# String with braces
+style.rebol.7=$(colour.string)
+# Number
+style.rebol.8=$(colour.number)
+# Pair ( 800x600 )
+style.rebol.9=fore:#005090
+# Tuple ( 127.0.0.1 )
+style.rebol.10=fore:#005090
+# Binary ( 16#{1A803F59} )
+style.rebol.11=fore:#C000C0
+# Money
+style.rebol.12=fore:#003070
+# Issue { #123-CD-456 }
+style.rebol.13=fore:#800000
+# Tag { <TITLE height=100> }
+style.rebol.14=fore:#C00000
+# File { %/C/Winnt/some.dll }
+style.rebol.15=fore:#0080FF
+# Email { joe@mail.dom }
+style.rebol.16=fore:#0080FF
+# URL { ftp://there.dom }
+style.rebol.17=fore:#0080FF
+# Date { 17-Feb-2004 1/3/99 }
+style.rebol.18=fore:#8000FF
+# Time { 12:30 11:22:59 01:59:59.123 }
+style.rebol.19=fore:#8000FF
+
+# Identifiers
+style.rebol.20=
+# Keyword (all)
+style.rebol.21=$(colour.keyword),bold
+# Keyword (test functions)
+style.rebol.22=fore:#8000C0,bold
+# Keyword (datatypes)
+style.rebol.23=fore:#800060,bold
+# Keyword 4
+style.rebol.24=fore:#DD9900
+# Keyword 5
+style.rebol.25=fore:#DD9900
+# Keyword 6
+style.rebol.26=fore:#DD9900
+# Keyword 7
+style.rebol.27=fore:#DD9900
+# Keyword 8
+style.rebol.28=fore:#DD9900
+
+# Matched Operators
+style.rebol.34=fore:#0000FF,bold
+style.rebol.35=fore:#FF0000,bold
+# Braces are only matched in default style
+braces.rebol.style=0
+
+command.go.$(file.patterns.rebol)=E:\tools\lang\rebol\core\rebol.exe $(FilePath)
+
diff --git a/scite-app/scite/src/registry.properties b/scite-app/scite/src/registry.properties
new file mode 100644
index 0000000..230d58d
--- /dev/null
+++ b/scite-app/scite/src/registry.properties
@@ -0,0 +1,37 @@
+# Define SciTE settings for registry files.
+
+file.patterns.registry=*.reg
+filter.registry=Registration files (reg)|$(file.patterns.registry)|
+lexer.$(file.patterns.registry)=registry
+
+comment.block.registry=;;
+
+[Styles]
+
+style.registry.32=$(font.text)
+# Default
+style.registry.0=fore:#000000
+# Comment: ;;
+style.registry.1=$(colour.code.comment.line)
+# Value name: "Icon"="cmd.exe,-1"
+style.registry.2=fore:#0000FF
+# String
+style.registry.3=$(colour.string)
+# Hex digit
+style.registry.4=fore:#7F0B0C
+# Value type: dword, hex(2), hex(7)
+style.registry.5=fore:#00007F,bold
+# Added key, [HKLM\*\shell\notepad]
+style.registry.6=fore:#530155
+# Removed key, [-HKLM\*\shell\notepad]
+style.registry.7=fore:#FF0000
+# Escaped characters in strings
+style.registry.8=fore:#7D8187,bold
+# GUID in key path, [HKCU\{C4ACBD3E-6114-4618-904C-B206ABA9DEB0}]
+style.registry.9=fore:#7B5F15
+# GUID in string, @="{C4ACBD3E-6114-4618-904C-B206ABA9DEB0}"
+style.registry.10=$(style.registry.9)
+# Parameter: "notepad.exe %1 %*"
+style.registry.11=fore:#0B6561
+# Operators
+style.registry.12=bold
diff --git a/scite-app/scite/src/ruby.properties b/scite-app/scite/src/ruby.properties
new file mode 100644
index 0000000..b342dee
--- /dev/null
+++ b/scite-app/scite/src/ruby.properties
@@ -0,0 +1,131 @@
+# Define SciTE settings for Ruby files.
+
+file.patterns.rb=*.rb;*.rbw;*.rake;*.rjs;Rakefile
+
+*source.patterns.ruby=$(file.patterns.rb);
+
+shbang.ruby=rb
+
+filter.ruby=Ruby (rb rbw)|$(file.patterns.rb)|
+
+*filter.ruby=$(filter.ruby)
+
+lexer.$(file.patterns.rb)=ruby
+
+*language.ruby=Ruby|rb||
+
+keywordclass.ruby=__FILE__ and def end in or self unless __LINE__ begin \
+defined? ensure module redo super until BEGIN break do false next rescue \
+then when END case else for nil retry true while alias class elsif if \
+not return undef yield
+keywords.$(file.patterns.rb)=$(keywordclass.ruby)
+
+statement.indent.$(file.patterns.rb)=5 def class if do elsif else case while for
+
+block.start.$(file.patterns.rb)=5 do
+block.end.$(file.patterns.rb)=5 end
+
+indent.opening.$(file.patterns.rb)=1
+indent.closing.$(file.patterns.rb)=1
+
+comment.block.ruby=#~
+
+# ruby styles
+# White space
+style.ruby.0=fore:#808080
+# Error
+style.ruby.1=back:#FF0000
+# Comment line
+style.ruby.2=fore:#007F00,$(font.comment)
+# POD
+style.ruby.3=fore:#004000,back:#C0FFC0,$(font.monospace),eolfilled
+# Number
+style.ruby.4=fore:#007F7F
+# Word
+style.ruby.5=fore:#00007F,bold
+# String
+style.ruby.6=fore:#7F007F,$(font.monospace)
+# Character
+style.ruby.7=fore:#7F007F,$(font.monospace)
+# Class name
+style.ruby.8=fore:#0000FF,bold
+# Def name
+style.ruby.9=fore:#007F7F,bold
+# Operator
+style.ruby.10=bold
+# Identifier
+style.ruby.11=
+# Regex
+style.ruby.12=fore:#000000,back:#A0FFA0
+# Global
+style.ruby.13=fore:#800080
+# Symbol
+style.ruby.14=fore:#C0A030
+# MODULE_NAME
+style.ruby.15=fore:#A000A0,bold
+# INSTANCE_VAR
+style.ruby.16=fore:#B00080
+# CLASS_VAR
+style.ruby.17=fore:#8000B0
+# BACKTICKS
+style.ruby.18=fore:#FFFF00,back:#A08080
+# DATASECTION
+style.ruby.19=fore:#600000,back:#FFF0D8,eolfilled
+# HERE_DELIM
+style.ruby.20=fore:#000000,back:#DDD0DD
+# HERE_Q
+style.ruby.21=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+# HERE_QQ
+style.ruby.22=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+# HERE_QX
+style.ruby.23=fore:#7F007F,back:#DDD0DD,eolfilled,italics
+# STRING_Q
+style.ruby.24=fore:#7F007F,$(font.monospace),notbold
+# STRING_QQ
+style.ruby.25=$(colour.string),$(font.monospace)
+# STRING_QX
+style.ruby.26=fore:#FFFF00,back:#A08080
+# STRING_QR
+style.ruby.27=fore:#000000,back:#A0FFA0
+# STRING_QW
+style.ruby.28=fore:#000000,back:#FFFFE0
+# Demoted Keyword
+style.ruby.29=$(style.ruby.5)
+# STDIN
+style.ruby.30=back:#FF8080
+# STDOUT
+style.ruby.31=back:#FF8080
+# STDERR
+style.ruby.40=back:#FF8080
+# SCE_RB_UPPER_BOUND allocated but unused
+style.ruby.41=back:#FF0000
+
+# Matched Operators
+style.ruby.34=fore:#0000FF,bold
+style.ruby.35=fore:#FF0000,bold
+# Braces are only matched in operator style
+braces.ruby.style=10
+
+if PLAT_WIN
+	command.go.*.rb=ruby $(FileNameExt)
+	command.go.subsystem.*.rb=1
+	command.go.*.rbw=rubyw $(FileNameExt)
+	command.go.subsystem.*.rbw=1
+	command.help.*.rb=$(CurrentWord)!c:\apps\ruby\ProgrammingRuby.chm
+	command.help.subsystem.*.rb=4
+
+if PLAT_GTK
+	command.go.*.rb=ruby $(FileNameExt)
+
+	command.name.1.*.rb=Check Syntax
+	command.1.*.rb=ruby -cw $(FileNameExt)
+
+	command.name.2.*.rb=Code Profiler
+	command.2.*.rb=ruby -r profile $(FileNameExt)
+
+if PLAT_MAC
+	command.go.*.rb=ruby $(FileNameExt)
+	command.name.1.*.rb=Check Syntax
+	command.1.*.rb=ruby -cw $(FileNameExt)
+	command.name.2.*.rb=Code Profiler
+	command.2.*.rb=ruby -r profile $(FileNameExt)
diff --git a/scite-app/scite/src/rust.properties b/scite-app/scite/src/rust.properties
new file mode 100644
index 0000000..e4e2c5a
--- /dev/null
+++ b/scite-app/scite/src/rust.properties
@@ -0,0 +1,86 @@
+# Define SciTE settings for Rust
+
+file.patterns.rust=*.rs
+filter.rust=Rust (rs)|$(file.patterns.rust)|
+*filter.rust=$(filter.rust)
+lexer.$(file.patterns.rust)=rust
+*language.rust=Rust|rs||
+
+word.chars.rust=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.rust)=$(word.chars.rust)
+calltip.rust.word.characters=$(chars.alpha)$(chars.numeric)_
+
+comment.block.at.line.start.rust=1
+comment.block.rust=//~
+comment.stream.start.rust=/*
+comment.stream.end.rust=*/
+comment.box.start.rust=/*
+comment.box.middle.rust= *
+comment.box.end.rust= */
+
+statement.indent.$(file.patterns.rust)=6
+statement.end.$(file.patterns.rust)=16 ;
+statement.lookback.$(file.patterns.rust)=20
+block.start.$(file.patterns.rust)=16 {
+block.end.$(file.patterns.rust)=16 }
+braces.rust.style=16
+
+# Rust keywords
+keywords.$(file.patterns.rust)=alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self sizeof static struct super trait true type typeof unsafe unsized use virtual while yield
+
+# Built-in types
+keywords2.$(file.patterns.rust)=bool char f32 f64 i16 i32 i64 i8 int str u16 u32 u64 u8 uint
+
+# The Self parameter
+keywords3.$(file.patterns.rust)=Self
+
+# Styles
+
+style.rust.32=$(font.base)
+# Whitespace
+style.rust.0=fore:#808080
+# Block comment
+style.rust.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line comment
+style.rust.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Block doc comment
+style.rust.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Line doc comment
+style.rust.4=$(colour.code.comment.doc),$(font.code.comment.doc)
+# Number
+style.rust.5=$(colour.number)
+# Keywords 1-7
+style.rust.6=$(colour.keyword),bold
+style.rust.7=$(colour.keyword),bold
+style.rust.8=$(colour.keyword)
+style.rust.9=$(colour.keyword),bold
+style.rust.10=$(colour.keyword),bold
+style.rust.11=$(colour.keyword),bold
+style.rust.12=$(colour.keyword),bold
+# Regular string
+style.rust.13=$(colour.string)
+# Raw string
+style.rust.14=fore:#B090B0
+# Character
+style.rust.15=$(colour.char)
+# Operator
+style.rust.16=$(colour.operator),bold
+# Identifier
+style.rust.17=
+# Lifetime
+style.rust.18=fore:#007F7F
+# Macro
+style.rust.19=$(colour.preproc)
+# Lexical error
+style.rust.20=fore:#000000,$(font.monospace),back:#E0C0E0
+# Byte string
+style.rust.21=$(colour.string)
+# Raw byte string
+style.rust.22=fore:#B090B0
+# Byte character
+style.rust.23=$(colour.char)
+
+command.compile.*.rs=rustc $(FileNameExt)
+command.build.*.rs=$(make.command)
+command.go.*.rs=./$(FileName)
+
diff --git a/scite-app/scite/src/sas.properties b/scite-app/scite/src/sas.properties
new file mode 100644
index 0000000..b327a3b
--- /dev/null
+++ b/scite-app/scite/src/sas.properties
@@ -0,0 +1,120 @@
+# FIXME: The keyword lists are not complete. I don't know
+#			enough SAS to fill them sensibly. -- Dejan
+# ------
+
+### USER INTERFACE
+
+file.patterns.sas=*.sas;
+
+*source.patterns.sas=$(file.patterns.sas);
+
+filter.sas=SAS (sas)|$(file.patterns.sas)|
+
+lexer.$(file.patterns.sas)=sas
+
+*language.sas=&SAS|sas||
+
+
+### KEYWORD LISTS (Are they used ?)
+
+# Keywords
+keywords.$(file.patterns.sas)=%let %do
+
+# Block Keywords
+keywords2.$(file.patterns.sas)=also cards class data input model ods proc var where
+
+# Function Keywords
+keywords3.$(file.patterns.sas)=%printz
+
+# Statement Keywords
+keywords4.$(file.patterns.sas)=run
+
+
+### AUTO-COMMENT (see "Edit" Menu)
+
+## SAS has three kinds of block comment and no stream comment.
+
+## Choose a style for BLOCK comments.
+
+# STYLE 1: * ... ;
+comment.stream.start.sas=*
+comment.stream.end.sas=;
+
+# STYLE 3: // ... ;
+# comment.stream.start.sas=//
+# comment.stream.end.sas=;
+
+# STYLE 3: /* ... */
+# comment.stream.start.sas=/*
+# comment.stream.end.sas=*/
+
+
+# Choose a style for BOX comments (Ctrl+Shift+B). Note that
+# you can leave box.middle empty by setting it to a single
+# whitespace before the newline.
+
+# STYLE 1: * ... * ... ;
+comment.box.start.sas=*
+comment.box.middle.sas=*
+comment.box.end.sas=;
+
+# STYLE 2: // ... // ... ;
+# comment.box.start.sas=//
+# comment.box.middle.sas=//
+# comment.box.end.sas=;
+
+# STYLE 3: /* ... * ... */
+# comment.box.start.sas=/*
+# comment.box.middle.sas=*
+# comment.box.end.sas=*/
+
+
+### STYLES
+
+# Default
+style.sas.0=
+
+# Comment (* ... ;)
+style.sas.1=$(colour.code.comment.box),$(font.code.comment.box)
+
+# Comment Line (// ... ;)
+style.sas.2=$(colour.code.comment.line),$(font.code.comment.line)
+
+# Comment Block (/* ... */)
+style.sas.3=$(colour.code.comment.box),$(font.code.comment.box)
+
+# Numbers
+style.sas.4=$(colour.number)
+
+# Operators
+style.sas.5=$(colour.operator),bold
+
+# Identifier
+style.sas.6=fore:#000000
+
+# String
+style.sas.7=$(colour.string)
+
+# Types (not implemented yet)
+# style.sas.8=
+
+# Words (not implemented yet)
+# style.sas.9=
+
+# Global Macro (not implemented yet)
+# style.sas.10=
+
+# Macro (words that start with %)
+style.sas.11=fore:#CC66FF,bold
+
+# Macro Keywords (see "keywords." above)
+style.sas.12=fore:#CC66FF
+
+# Block Keywords (see "keywords2." above)
+style.sas.13=fore:#000080,bold
+
+# Macro Function Keywords (see "keywords3." above)
+style.sas.14=fore:#FF66FF,bold
+
+# Statement Keywords (see "keywords4." above)
+style.sas.15=fore:#AA0000,bold
diff --git a/scite-app/scite/src/scintillaVersion.txt b/scite-app/scite/src/scintillaVersion.txt
new file mode 100644
index 0000000..07bfe61
--- /dev/null
+++ b/scite-app/scite/src/scintillaVersion.txt
@@ -0,0 +1 @@
+511
diff --git a/scite-app/scite/src/scite_lua_win.h b/scite-app/scite/src/scite_lua_win.h
new file mode 100644
index 0000000..833b414
--- /dev/null
+++ b/scite-app/scite/src/scite_lua_win.h
@@ -0,0 +1,25 @@
+// SciTE - Scintilla based Text Editor
+/** @file scite_lua_win.h
+ ** SciTE Lua scripting interface.
+ **/
+// Copyright 2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCITE_LUA_WIN_H
+#define SCITE_LUA_WIN_H
+
+/* Modifications for Windows to allow UTF-8 file names and command lines */
+/*
+Imported into Lua build with -DLUA_USER_H=\"scite_lua_win.h\"
+Redirect fopen and _popen to functions that treat their arguments as UTF-8.
+If UTF-8 does not work then retry with the original strings as may be in locale characters.
+*/
+#if defined(LUA_USE_WINDOWS)
+#include <stdio.h>
+FILE *scite_lua_fopen(const char *filename, const char *mode);
+#define fopen scite_lua_fopen
+FILE *scite_lua_popen(const char *filename, const char *mode);
+#define _popen scite_lua_popen
+#endif
+
+#endif
diff --git a/scite-app/scite/src/scriptol.properties b/scite-app/scite/src/scriptol.properties
new file mode 100644
index 0000000..3fe3731
--- /dev/null
+++ b/scite-app/scite/src/scriptol.properties
@@ -0,0 +1,100 @@
+# Define SciTE settings for scriptol files.
+
+filter.scriptol=Scriptol (sol)|*.sol|
+
+*filter.scriptol=$(filter.scriptol)
+
+lexer.*.sol=scriptol
+
+file.patterns.sol=*.sol
+
+keywordclass.scriptol= act action alias always and array as \
+bool boolean break by byte \
+class case catch const constant continue \
+dyn def define dict do double \
+echo else elsif end enum error false file for float forever function \
+globak gtk \
+in if ifdef import include int integer java javax \
+let long match mod nil not natural null number \
+or print protected public real return redo \
+scan script scriptol sol short super static step until using \
+var text then this true try \
+void volatile while when \
+undef zero
+keywords.$(file.patterns.sol)=$(keywordclass.scriptol)
+
+statement.indent.*.sol=
+statement.lookback.*.sol=1
+block.start.*.sol=10
+
+comment.block.scriptol=`~
+
+# scriptol styles
+# Default
+style.scriptol.0=fore:#000000
+# White space
+style.scriptol.1=fore:#808080
+# Scriptol style comment line
+style.scriptol.2=fore:#007F00,$(font.comment)
+# Persistent comment line
+style.scriptol.3=fore:#007F00,$(font.comment)
+# C style comment line
+style.scriptol.4=fore:#007F00
+# Comment-blocks
+style.scriptol.5=fore:#007F00,$(font.comment)
+# Number
+style.scriptol.6=fore:#007F7F
+# String
+style.scriptol.7=fore:#7F007F,$(font.monospace)
+# Character/Single quoted string
+style.scriptol.8=fore:#7F007F,$(font.monospace)
+# End of line where string is not closed
+style.scriptol.9=fore:#FF0000,$(font.monospace),back:#E0C0E0,eolfilled
+# Keyword
+style.scriptol.10=fore:#00007F,bold
+# Operators
+style.scriptol.11=bold
+# Identifiers
+style.scriptol.12=fore:#333333
+# Triple quotes
+style.scriptol.13=
+# style.scriptol.13=fore:#007F00
+# Class name definition
+style.scriptol.14=fore:#0000FF,bold
+# Preprocessor
+style.scriptol.15=
+# style.scriptol.15=fore:#7F0000
+
+
+if PLAT_WIN
+        command.help.$(file.patterns.sol)="file://$(SciteDefaultHome)\manual.html"
+        command.help.subsystem.$(file.patterns.sol)=2
+
+if PLAT_GTK
+        command.help.$(file.patterns.sol)=man $(CurrentWord) | col -b
+
+command.compile.*.sol=solc -c $(FileNameExt)
+command.build.*.sol=solc -be $(FileNameExt)
+command.go.*.sol=$(FileName)
+command.go.subsystem.*.sol=1
+
+command.name.0.*.sol=XSolP
+command.0.*.sol =xsolp -be $(FileNameExt)
+command.is.filter.0.*.sol=1
+
+command.name.1.*.sol=XSolC
+command.1.*.sol =xsolc -be $(FileNameExt)
+command.is.filter.1.*.sol=1
+
+command.name.2.*.sol=Compile to Php
+command.2.*.sol=solp -b $(FileNameExt)
+command.is.filter.2.*.sol=1
+
+command.name.3.*.sol=Compile Web page
+command.3.*.sol=solp -b -w $(FileNameExt)
+command.is.filter.3.*.sol=1
+
+command.name.4.*.sol=Interpret
+command.4.*.sol=solp $(FileNameExt)
+command.is.filter.4.*.sol=1
+
diff --git a/scite-app/scite/src/smalltalk.properties b/scite-app/scite/src/smalltalk.properties
new file mode 100644
index 0000000..b2c5dde
--- /dev/null
+++ b/scite-app/scite/src/smalltalk.properties
@@ -0,0 +1,49 @@
+# Define SciTE settings for Smalltalk files.
+
+file.patterns.smalltalk=*.st
+
+filter.smalltalk=Smalltalk (st)|$(file.patterns.smalltalk)|
+
+*filter.smalltalk=$(filter.smalltalk)
+
+lexer.$(file.patterns.smalltalk)=smalltalk
+
+keywords.$(file.patterns.smalltalk)=\
+    ifTrue: ifFalse: whileTrue: whileFalse: ifNil: ifNotNil: whileTrue whileFalse repeat isNil notNil
+
+# Styles
+
+# Default
+style.smalltalk.0=
+# String
+style.smalltalk.1=$(colour.string),eolfilled
+# Number
+style.smalltalk.2=$(colour.number)
+# Comment
+style.smalltalk.3=$(colour.code.comment.box)
+# Symbol
+style.smalltalk.4=fore:#800080
+# Binary
+style.smalltalk.5=$(colour.operator)
+# Boolean
+style.smalltalk.6=$(colour.keyword),bold
+# self
+style.smalltalk.7=$(colour.keyword),bold
+# super
+style.smalltalk.8=$(colour.keyword),bold
+# nil
+style.smalltalk.9=$(colour.keyword),bold
+# Global
+style.smalltalk.10=bold
+# Return
+style.smalltalk.11=fore:#A00000,bold
+# Special
+style.smalltalk.12=bold
+# KwSend
+style.smalltalk.13=fore:#008000
+# Assignment
+style.smalltalk.14=bold
+# Character
+style.smalltalk.15=$(colour.char)
+# Special selector
+style.smalltalk.16=$(colour.keyword),bold
\ No newline at end of file
diff --git a/scite-app/scite/src/sorcins.properties b/scite-app/scite/src/sorcins.properties
new file mode 100644
index 0000000..fffbd98
--- /dev/null
+++ b/scite-app/scite/src/sorcins.properties
@@ -0,0 +1,50 @@
+# Define SciTE settings for SORCUS Installation Files
+# Originally by Christoph Baumann cb@sorcus.com
+
+# SORCUS Installation files end with .ins
+file.patterns.sorcins=*.ins
+filter.sorcins=SORCUS Installation File (ins)|$(file.patterns.sorcins)|
+
+*filter.sorcins=$(filter.sorcins)
+
+lexer.$(file.patterns.sorcins)=sorcins
+
+commands=ARGUSCONNECTCHANNELS \
+    M2DEVICE M2INST M2PAR M2PROC M2FUNC M2CMD M2LOADMODUL \
+    M6DEVICE M6INST M6PAR M6PROC M6FUNC M6CMD M6LOADMODUL \
+    M7DEVICE M7INST M7PAR M7PROC M7FUNC M7CMD M7LOADMODUL \
+    M8DEVICE M8INST M8PAR M8PROC M8FUNC M8CMD M8LOADMODUL \
+    MAXRESET MAXCONNECTCPU MAXLOADOSX MAXINST MAXPROC \
+    MAXFUNC MAXPAR MAXLOADMDD MAXFLASHFILE
+
+parameter=board slot layer osx file no usage task tasktype level irq flags \
+    datasize func para start progno name count index TIMEOUT RESET
+
+constants=MAX_NI_TASK MAX_TI_TASK MAX_II_TASK MAX_DI_TASK
+
+keywords.$(file.patterns.sorcins)=$(commands)
+keywords2.$(file.patterns.sorcins)=$(parameter)
+keywords3.$(file.patterns.sorcins)=$(constants)
+
+comment.block.sorcins=;
+
+# Default
+style.sorcins.0=
+# Command
+style.sorcins.1=fore:#0000ff
+# Parameter
+style.sorcins.2=fore:#808080
+# Comment line
+style.sorcins.3=fore:#008000
+# String
+style.sorcins.4=fore:#ff0000
+# End of line where string is not closed
+style.sorcins.5=
+# Identifier
+style.sorcins.6=
+# Operator
+style.sorcins.7=
+# Number
+style.sorcins.8=
+# Constant
+style.sorcins.9=fore:#ff00ff
diff --git a/scite-app/scite/src/specman.properties b/scite-app/scite/src/specman.properties
new file mode 100644
index 0000000..6f76834
--- /dev/null
+++ b/scite-app/scite/src/specman.properties
@@ -0,0 +1,162 @@
+# Define SciTE settings for Specman E language files.
+
+# specman files
+file.patterns.specman=*.e
+
+filter.specman=Specman (e)|\
+$(file.patterns.specman)|
+
+*filter.specman=$(filter.specman)
+
+lexer.$(file.patterns.specman)=specman
+
+*language.specman=Specman|e||
+
+keywords.$(file.patterns.specman)= \
+struct unit \
+integer real bool int long uint nibble byte bits bytes bit time string \
+var instance event \
+verilog vhdl \
+on compute start expect check that routine \
+specman is also first only with like \
+list of all radix hex dec bin ignore illegal \
+traceable untraceable \
+cover using count_only trace_only at_least transition item ranges \
+cross text call task within \
+packing low high \
+locker address \
+body code vec chars \
+byte_array external_pointer \
+choose matches \
+if then else when try \
+case casex casez default \
+and or not xor \
+until repeat while for from to step each do break continue \
+before next always -kind network \
+index it me in new return result select \
+cycle sample events forever \
+wait  change  negedge rise fall delay sync sim true detach eventually emit \
+gen keep keeping soft before \
+define as computed type extend \
+variable global sys \
+import \
+untyped symtab ECHO DOECHO \
+initialize non_terminal testgroup delayed exit finish \
+out append print outf appendf \
+post_generate pre_generate setup_test finalize_test extract_test \
+init run copy as_a a set_config dut_error add clear lock quit \
+lock unlock release swap quit to_string value stop_run \
+crc_8 crc_32 crc_32_flip get_config add0 all_indices and_all \
+apply average count delete exists first_index get_indices \
+has insert is_a_permutation is_empty key key_exists key_index \
+last last_index max max_index max_value min min_index \
+min_value or_all pop pop0 push push0 product resize reverse \
+sort split sum top top0 unique clear is_all_iterations \
+get_enclosing_unit hdl_path exec deep_compare deep_compare_physical \
+pack unpack warning error fatal \
+size \
+files load module ntv source_ref script read write \
+initial idle others posedge clock cycles \
+statement action command member exp block num file
+
+# keywords2 is for highlighting secondary keywords
+keywords2.$(file.patterns.specman)= \
+TRUE FALSE \
+MAX_INT MIN_INT NULL UNDEF \
+
+# keywords3 is for sequence and eRM keywords and functions
+keywords3.$(file.patterns.specman)= \
+any_sequence_item sequence any_sequence_driver driver \
+created_driver  parent_sequence \
+bfm_interaction_mode PULL_MODE PUSH_MODE MAIN SIMPLE RANDOM \
+max_random_count max_random_depth num_of_last_items \
+NORMAL NONE FULL LOW HIGH MEDIUM logger message \
+get_tags show_units show_actions show_message ignore_tags \
+set_style set_screen set_file set_flush_frequency \
+set_format set_units set_actions at_message_verbosity \
+short_name short_name_path short_name_style \
+\
+private protected package rerun any_env \
+unqualified_clk clk reset_start reset_end \
+message_logger verbosity tags to_file \
+\
+body pre_body post_body get_next_item send_to_bfm \
+get_depth get_driver nice_string get_index grab \
+is_blocked is_relevant ungrab mid_do post_do post_trace \
+pre_do current_grabber get_current_item get_num_items_sent \
+get_sequence_trace_list get_trace_list is_grabbed \
+try_next_item check_is_relevant delay_clock \
+get_sub_drivers regenerate_data wait_for_sequences \
+stop
+
+# keywords4 is for highlighting user defined keywords or function calls, highlighted in style 19
+keywords4.$(file.patterns.specman)=
+
+word.chars.specman=$(chars.alpha)$(chars.numeric)_#
+word.characters.$(file.patterns.specman)=$(word.chars.specman)
+comment.block.specman=//~
+comment.block.at.line.start.specman=1
+comment.stream.start.specman=
+comment.stream.end.specman=
+comment.box.start.specman=
+comment.box.middle.specman=
+comment.box.end.specman=
+
+#~ statement.indent.$(file.patterns.specman)=5  if else try \
+#~ case casex casez default \
+#~ until repeat while for do \
+#~ struct unit extend when
+#~ statement.lookback.$(file.patterns.specman)=20
+#~ block.start.$(file.patterns.specman)=10 {
+#~ block.end.$(file.patterns.specman)=10 }
+
+indent.maintain.$(file.patterns.specman)=1;
+
+#autocomplete.specman.fillups=(
+
+preprocessor.symbol.$(file.patterns.specman)=#
+preprocessor.start.$(file.patterns.specman)=ifdef ifndef
+preprocessor.middle.$(file.patterns.specman)=else
+preprocessor.end.$(file.patterns.specman)=}
+
+
+# Specman E styles
+
+# Default
+style.specman.32=$(font.base)
+# White space
+style.specman.0=fore:#808080
+# Code
+style.specman.1=$(font.base)
+# Line Comment
+style.specman.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Line Bang Comment
+style.specman.3=fore:red
+# Number
+style.specman.4=$(colour.number)
+# Keyword
+style.specman.5=$(colour.keyword),bold
+# Double quoted string
+style.specman.6=$(colour.string)
+# Keyword 2
+style.specman.7=fore:#B00040
+# Keyword 3
+style.specman.8=fore:#804080,bold
+# Preprocessor
+style.specman.9=$(colour.preproc)
+# Operators
+style.specman.10=$(colour.operator),bold
+# Identifiers
+style.specman.11=
+# End of line where string is not closed
+style.specman.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# Regexp tag
+style.specman.13=fore:#007F00,back:#E0FFE0
+# HDL Signal
+style.specman.14=fore:#00005F
+# User defined
+style.specman.19=back:#E0F0FF
+
+# Braces are only matched in operator style
+braces.specman.style=10
+
diff --git a/scite-app/scite/src/spice.properties b/scite-app/scite/src/spice.properties
new file mode 100644
index 0000000..8f78170
--- /dev/null
+++ b/scite-app/scite/src/spice.properties
@@ -0,0 +1,77 @@
+# Define SciTE settings for spice files.
+
+file.patterns.spice=*.scp;*.out
+filter.spice=Spice (out scp)|$(file.patterns.spice)|
+*filter.spice=$(filter.spice)
+lexer.$(file.patterns.spice)=spice
+
+#indent.size.$(file.patterns.spice)=3
+#use.tabs.$(file.patterns.spice)=0
+
+# Keyword for script commands
+keywordclass.spice.command=\
+ac  alias  alter  alterparam append askvalues assertvalid autoscale \
+break compose copy copytodoc dc  delete  destroy  destroyvec diff  display \
+disto  dowhile  echo  else  end  errorstop  fftinit filter foreach  fourier \
+freqtotime function  functionundef goto  homecursors if isdisplayed label \
+let  linearize listing  load  loadaccumulator makelabel movelabel makesmithplot \
+movecursorleft movecursorright  msgbox nameplot  newplot nextparam noise \
+nopoints  op plot plotf plotref poly print  printcursors  printevent printname \
+printplot printstatus printtext printtol printunits printval printvector \
+pwl  pz  quit  removesmithplot rename repeat  resume  rotate  runs rusage \
+save sendplot sendscript sens  set  setcursor setdoc setlabel setlabeltype \
+setmargins setnthtrigger  setunits setvec setparam setplot  setquery \
+setscaletype settracecolor settracestyle setsource settrigger  setvec \
+setxlimits setylimits show  showmod  sort status  step  stop  switch \
+tf  timetofreq  timetowave tran  unalias  unlet  unset  unalterparam \
+update version view   wavefilter  wavetotime where  while  write
+# Keywords for script functions
+keywordclass.spice.functions=\
+abs askvalue atan average ceil cos db differentiate differentiatex \
+exp finalvalue floor getcursorx getcursory getcursory0 getcursory1 \
+getparam im ln initialvalue integrate integratex interpolate isdef \
+isdisplayed j log length mag, max maxscale mean meanpts min minscale \
+nextplot  nextvector  norm operatingpoint ph phase phaseextend pk_pk \
+pos pulse re rms rmspts rnd sameplot  sin sqrt stddev stddevpts tan \
+tfall tolerance trise unitvec vector
+# Keywords for spice parameters
+keywordclass.spice.params=param nodeset include options dcconv subckt ends model
+
+
+keywordclass.spice=$(keywordclass.spice.command) $(keywordclass.spice.functions) $(keywordclass.spice.params)
+
+keywords.$(file.patterns.spice)=$(keywordclass.spice.command)
+keywords2.$(file.patterns.spice)=$(keywordclass.spice.functions)
+keywords3.$(file.patterns.spice)=$(keywordclass.spice.params)
+
+# spice styles
+# Default
+style.spice.0=fore:#808080
+# Identifiers
+style.spice.1=
+# Keyword
+style.spice.2=$(colour.keyword)
+# Keyword2
+style.spice.3=$(colour.keyword),bold
+# Keyword3
+style.spice.4=fore:#0040E0
+# Number
+style.spice.5=$(colour.number)
+# Operators (delimiters)
+style.spice.6=$(colour.operator),bold
+# Value
+style.spice.7=$(colour.char)
+# Comment
+style.spice.8=$(colour.code.comment.line),$(font.code.comment.line)
+
+# Comments
+comment.block.spice=*~
+
+braces.spice.style=4
+
+statement.indent.$(file.patterns.spice)=5 begin declare else elsif exception for if is loop while
+statement.lookback.$(file.patterns.spice)=20
+block.start.$(file.patterns.spice)=10 then is
+block.end.$(file.patterns.spice)=10 end
+
+calltip.spice.word.characters=._$(chars.alpha)
diff --git a/scite-app/scite/src/sql.properties b/scite-app/scite/src/sql.properties
new file mode 100644
index 0000000..dba201f
--- /dev/null
+++ b/scite-app/scite/src/sql.properties
@@ -0,0 +1,332 @@
+# Define SciTE settings for SQL, PL/SQL, Apache Hive and Apache Pig files.
+
+file.patterns.sql=*.sql
+file.patterns.plsql=*.spec;*.body;*.sps;*.spb;*.sf;*.sp
+file.patterns.hql=*.hql
+file.patterns.pig=*.pig
+
+lexer.$(file.patterns.sql)=sql
+lexer.$(file.patterns.plsql)=sql
+lexer.$(file.patterns.hql)=sql
+lexer.$(file.patterns.pig)=sql
+
+file.patterns.sql.like=$(file.patterns.sql);$(file.patterns.plsql);$(file.patterns.hql);$(file.patterns.pig)
+
+*source.patterns.sql=$(file.patterns.sql.like);
+
+filter.sql=SQL (sql)|$(file.patterns.sql.like)|
+
+*filter.sql=$(filter.sql)
+
+*language.sql=S&QL|sql||
+
+#*language.plsql=P&LSQL|spec||
+#*language.hql=Hive SQL|hql||
+#*language.pig=Pig Query|pig||
+
+# SQL comments
+comment.block.sql=--
+#comment.block.at.line.start.sql=1
+comment.stream.start.sql=/*
+comment.stream.end.sql=*/
+comment.box.start.sql=/*
+comment.box.middle.sql= *
+comment.box.end.sql= */
+
+# SQL styles
+# White space
+style.sql.0=fore:#808080
+# Comment
+style.sql.1=fore:#007F00,$(font.comment)
+# Line Comment
+style.sql.2=fore:#007F00,$(font.comment)
+# Doc comment
+style.sql.3=fore:#7F7F7F
+# Number
+style.sql.4=fore:#007F7F
+# Keyword
+style.sql.5=fore:#00007F,bold
+# Double quoted string
+style.sql.6=fore:#7F007F,$(font.monospace)
+# Single quoted string
+style.sql.7=fore:#7F007F,$(font.monospace)
+# SQL*Plus
+style.sql.8=$(colour.preproc)
+# SQL*Plus PROMPT
+style.sql.9=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+# Operators
+style.sql.10=bold
+# Identifiers
+style.sql.11=
+# Not used
+#style.sql.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+# SQL*Plus Comment
+style.sql.13=fore:#007F00,$(font.comment)
+# not used
+# style.sql.14=
+# Hash Line Comment
+style.sql.15=fore:#007F00,$(font.comment)
+# Keywords2: Database objects
+style.sql.16=fore:#B00040
+# Comment Doc Keyword
+style.sql.17=fore:#3060A0,$(font.code.comment.doc)
+# Comment Doc Keyword Error
+style.sql.18=fore:#804020,$(font.code.comment.doc)
+# Keywords5: User Keywords 1
+style.sql.19=fore:#4B0082
+# Keywords6: User Keywords 2
+style.sql.20=fore:#B00040
+# Keywords7: User Keywords 3
+style.sql.21=fore:#8B0000
+# Keywords8: User Keywords 4
+style.sql.22=fore:#800080
+# Quoted identifier
+style.sql.23=fore:#DD9900
+# Q operator
+style.sql.24=fore:#EE00AA
+
+# Braces are only matched in operator style
+braces.sql.style=10
+# Enables backslash as an escape character
+#sql.backslash.escapes=1
+
+# Activate '#' based comments for MySQL with 1 or disable for Oracle with 0:
+#lexer.sql.numbersign.comment=0
+
+# Set to 1 to colourise recognized words with dots
+# (recommended for Oracle PL/SQL objects)
+#lexer.sql.allow.dotted.word=1
+
+#lexer.sql.backticks.identifier=1
+
+keywords.$(file.patterns.sql)=\
+absolute action add admin after aggregate \
+alias all allocate alter and any are array as asc \
+assertion at authorization \
+before begin binary bit blob body boolean both breadth by \
+call cascade cascaded case cast catalog char character \
+check class clob close collate collation column commit \
+completion connect connection constraint constraints \
+constructor continue corresponding create cross cube current \
+current_date current_path current_role current_time current_timestamp \
+current_user cursor cycle \
+data date datetime day deallocate dec decimal declare default \
+deferrable deferred delete depth deref desc describe descriptor \
+destroy destructor deterministic dictionary diagnostics disconnect \
+distinct domain double drop dynamic \
+each else end end-exec equals escape every except \
+exception exec execute exists exit external \
+false fetch first float for foreign found from free full \
+function \
+general get global go goto grant group grouping \
+having host hour \
+identity if ignore immediate in indicator initialize initially \
+inner inout input insert int integer intersect interval \
+into is isolation iterate \
+join \
+key \
+language large last lateral leading left less level like \
+limit local localtime localtimestamp locator \
+map match merge minute modifies modify module month \
+names national natural nchar nclob new next no none \
+not null numeric \
+object of off old on only open operation option \
+or order ordinality out outer output \
+package pad parameter parameters partial path postfix precision prefix \
+preorder prepare preserve primary \
+prior privileges procedure public \
+read reads real recursive ref references referencing relative \
+restrict result return returns revoke right \
+role rollback rollup routine row rows \
+savepoint schema scroll scope search second section select \
+sequence session session_user set sets size smallint some| space \
+specific specifictype sql sqlexception sqlstate sqlwarning start \
+state statement static structure system_user \
+table temporary terminate than then time timestamp \
+timezone_hour timezone_minute to trailing transaction translation \
+treat trigger true \
+under union unique unknown \
+unnest update usage user using \
+value values varchar variable varying view \
+when whenever where with without work write \
+year \
+zone
+
+keywords.$(file.patterns.plsql)=\
+all alter and any array as asc at authid avg begin between \
+binary_integer \
+body boolean bulk by char char_base check close cluster collect \
+comment commit compress connect constant create current currval \
+cursor date day declare decimal default delete desc distinct \
+do drop else elsif end exception exclusive execute exists exit \
+extends false fetch float for forall from function goto group \
+having heap hour if immediate in index indicator insert integer \
+interface intersect interval into is isolation java level like \
+limited lock long loop max min minus minute mlslabel mod mode \
+month natural naturaln new nextval nocopy not nowait null number \
+number_base ocirowid of on opaque open operator option or order \
+organization others out package partition pctfree pls_integer \
+positive positiven pragma prior private procedure public raise \
+range raw real record ref release return reverse rollback row \
+rowid rownum rowtype savepoint second select separate set share \
+smallint space sql sqlcode sqlerrm start stddev subtype successful \
+sum synonym sysdate table then time timestamp to trigger true \
+type uid union unique update use user validate values varchar \
+varchar2 variance view when whenever where while with work write \
+year zone
+
+# Keywords for PlDoc comments
+keywords3.$(file.patterns.sql)=\
+param author since return see deprecated todo
+
+# Keywords for SQL*Plus
+keywords4.$(file.patterns.sql)=\
+acc~ept a~ppend archive log attribute \
+bre~ak bti~tle \
+c~hange cl~ear col~umn comp~ute conn~ect copy \
+def~ine del desc~ribe disc~onnect \
+e~dit exec~ute exit \
+get \
+help ho~st \
+i~nput \
+l~ist \
+passw~ord pau~se pri~nt pro~mpt \
+quit \
+recover rem~ark repf~ooter reph~eader r~un \
+sav~e set sho~w shutdown spo~ol sta~rt startup store \
+timi~ng tti~tle \
+undef~ine \
+var~iable \
+whenever oserror whenever sqlerror \
+
+# User keywords 1
+# Keywords for Standard packages
+keywords5.$(file.patterns.sql)=\
+dbms_output.disable dbms_output.enable dbms_output.get_line \
+dbms_output.get_lines dbms_output.new_line dbms_output.put \
+dbms_output.put_line \
+
+
+# Reserved Keywords for Apache Hive SQL
+keywords.$(file.patterns.hql)=\
+all alter and as authorization between both by \
+case cast column conf create cross cube current \
+cursor database delete describe distinct \
+drop else end exchange exists extended external fetch following \
+for from full function grant group grouping having if import in inner insert \
+intersect interval into is join lateral left less like local macro map \
+more not of on or order out outer over partialscan partition percent \
+preceding preserve procedure range reads reduce revoke right rollup row rows \
+select set table tablesample then to transform trigger \
+truncate unbounded union uniquejoin update user using values \
+when where window with commit only regexp rlike rollback start \
+cache constraint foreign primary references \
+extract floor precision views \
+sync
+
+# User keywords 2
+# Reserved Keywords for Apache Hive SQL
+keywords6.$(file.patterns.hql)=\
+add admin after analyze archive asc before bucket buckets cascade change \
+cluster clustered clusterstatus collection columns comment compact compactions \
+compute concatenate continue data databases dbproperties deferred \
+defined delimited dependency desc directories directory disable distribute \
+elem_type enable escaped exclusive explain export fields file fileformat first \
+format formatted functions hold_ddltime idxproperties ignore index \
+indexes inpath inputdriver inputformat items jar keys key_type limit lines \
+load location lock locks logical mapjoin materialized metadata minus \
+msck noscan no_drop offline option outputdriver outputformat \
+overwrite owner partitioned partitions plus pretty principals protection purge \
+read readonly rebuild recordreader recordwriter regexp reload rename repair \
+replace replication restrict rewrite rlike role roles schema schemas \
+semi serde serdeproperties server sets shared show show_database skewed sort \
+sorted ssl statistics stored streamtable tables tblproperties \
+temporary terminated touch transactions unarchive undo uniontype \
+unlock unset uri use utc value_type view while \
+autocommit isolation level offset snapshot transaction work write \
+abort key last norely novalidate nulls rely validate \
+detail expression operator quarter summary vectorization \
+zone
+
+# User keywords 3
+# Column/Field Types for Apache Hive SQL
+keywords7.$(file.patterns.hql)=\
+array bigint boolean char date decimal double float int smallint timestamp \
+utc_tmestamp varchar integer time numeric \
+datetime long string struct tinyint timestamptz unsigned utctimestamp
+
+# Functions for Apache Hive SQL
+keywords4.$(file.patterns.hql)=\
+round floor ceil rand exp ln log10 log2 log pow sqrt bin hex unhex conv abs \
+pmod sin asin cos acos tan atan degrees radians positive negative sign e pi \
+size map_keys map_values array_contains sort_array \
+binary cast \
+from_unixtime unix_timestamp to_date datediff date_add date_sub \
+from_utc_timestamp to_utc_timestamp \
+day hour minute second month year weekofyear \
+if case coalesce nullif \
+ascii concat concat_ws context_ngrams find_in_set format_number \
+get_json_object in_file instr length locate lower lpad ltrim ngrams parse_url \
+printf regexp_extract regexp_replace repeat reverse rpad rtrim sentences \
+space split str_to_map substr substring translate trim upper \
+hash
+
+# User keywords 4
+# Constants Types for Apache Hive SQL
+keywords8.$(file.patterns.hql)=\
+current_timestamp false none null true dayofweek \
+dow week years months weeks days hours minutes seconds \
+orc csv parquet rc
+
+# User keywords 1
+# Reserved Keywords for Apache PIG
+keywords.$(file.patterns.pig)=\
+and any all arrange as asc by cache case \
+%declare %default dense desc else end eval flatten full generate if \
+inner input in into is left matches not onschema or outer output \
+parallel partition returns right rollup ship stderr stdin stdout then \
+through using when
+
+# User keywords 2
+# Operators for Apache PIG
+keywords6.$(file.patterns.pig)=\
+assert cogroup cross cube define distinct filter foreach group  import join \
+limit load native order rank sample split set store stream union register
+
+# User keywords 3
+# Column/Field/Storage Types for Apache PIG
+keywords7.$(file.patterns.pig)=\
+int long float double chararray bytearray boolean datetime biginteger bigdecimal \
+tuple bag map \
+pigstorage pigdump jsonloader jsonstorage avrostorage orcstorage textloader \
+hbasestorage trevnistorage accumulostorage
+
+# User keywords 4
+# Constants Types for Apache PIG
+keywords8.$(file.patterns.pig)=\
+true false null void
+
+# Functions for Apache PIG
+keywords4.$(file.patterns.pig)=\
+avg bagtostring bagtotuple bloom buildbloom concat count count_star diff \
+isempty max min plucktuple size subtract sum tokenize \
+abs acos asin atan cbrt ceil cos cosh exp floor log log10 random round \
+round_to sin sinh sqrt tan tanh \
+endswith equalsignorecase indexof last_index_of lcfirst lower ltrim \
+regex_extract regex_extract_all regex_search replace rtrim sprintf startswith \
+strsplit strsplittobag substring trim ucfirst upper \
+uniqueid addduration currenttime daysbetween getday gethour getmillisecond \
+getminute getmonth getsecond getweek getweekyear getyear hoursbetween \
+millisecondsbetween minutesbetween monthsbetween secondsbetween \
+subtractduration todate tomilliseconds tostring tounixtime weeksbetween \
+yearsbetween \
+totuple tobag tomap top
+
+# User keywords 1
+# Commands for Apache PIG
+keywords5.$(file.patterns.pig)=\
+cat cd cp du ls mkdir mv pwd rm rmf \
+copyfromlocal copytolocal pig \
+fs sh clear exec help history kill quit run \
+describe dump explain illustrate
+
diff --git a/scite-app/scite/src/tacl.properties b/scite-app/scite/src/tacl.properties
new file mode 100644
index 0000000..3b6a38b
--- /dev/null
+++ b/scite-app/scite/src/tacl.properties
@@ -0,0 +1,44 @@
+# Define SciTE settings for TACL files.
+
+file.patterns.TACL=*.tacl
+filter.tacl=TACL (TACL)|$(file.patterns.TACL)|
+*filter.tacl=$(filter.tacl)
+
+lexer.$(file.patterns.TACL)=TACL
+
+# These keywords are case insensitive
+keywords.$(file.patterns.TACL)=activate add adddsttransition adduser alter altpri assign attachseg backupcpu break builtins buscmd clear columnize comment compute copy dump copyvar create createseg debug debugnow default delete deluser detachseg env exit fileinfo filenames files filetovar help history home info initterm inlecho inleof inlout inlprefix inlto join keep keys lights load loaded files logoff logon o obey outvar param password pause pmsearch pmsg pop ppd purge push rcvdump receivedump reload remotepassword rename reset rpasswrd run rund seginfo set setprompt settime show sink status stop suspend switch system systimes time timestamp_to_text useusers variables varinfo vartofile vchange vcopy vdelete vfind vinsert vlist vmove volume vtree wakeup who xbusdown xbusup ybusdown ybusup _comparev _contime_to_text _contime_to_text_date _contime_to_text_time _debugger _execute _longest _month3
+
+comment.block.TACL===
+
+# TACL styles
+# 1,Comment|2,Line Comment|3,Doc Comment|4,Number|5,Builtin|6,String|7,Character|8,Command|9,Preprocessor|10,Operator
+# 11,Identifier|16,Label|
+style.TACL.0=fore:#808080,$(font.monospace)
+
+# Comment
+style.TACL.1=$(colour.text.comment),$(font.code.comment)
+# Line comment
+style.TACL.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment
+style.TACL.3=$(colour.code.comment.document),$(font.code.comment.document)
+# Number
+style.TACL.4=$(colour.number),$(font.monospace)
+# Builtin
+style.TACL.5=$(colour.keyword),bold,$(font.monospace)
+# String
+style.TACL.6=$(colour.string),$(font.monospace),$(font.monospace)
+# Character
+style.TACL.7=$(colour.char),$(font.monospace),$(font.monospace)
+# Command
+style.TACL.8=back:#C0C0C0,bold,$(font.monospace)
+# Preprocessor
+style.TACL.9=$(colour.preproc),$(font.preproc),$(font.monospace)
+# Operators
+style.TACL.10=$(colour.operator),bold,$(font.monospace)
+# Identifier
+style.TACL.11=$(colour.identifier),$(font.identifier),$(font.monospace)
+# Label
+style.TACL.16=fore:#0020F0,$(font.monospace)
+
+
diff --git a/scite-app/scite/src/tal.properties b/scite-app/scite/src/tal.properties
new file mode 100644
index 0000000..9398e29
--- /dev/null
+++ b/scite-app/scite/src/tal.properties
@@ -0,0 +1,43 @@
+# Define SciTE settings for TAL files.
+file.patterns.TAL=*.TAL
+filter.tal=TAL (TAL)|$(file.patterns.TAL)|
+*filter.tal=$(filter.tal)
+
+lexer.$(file.patterns.TAL)=TAL
+
+# These keywords are case insensitive
+keywords.$(file.patterns.TAL)=and assert baddr begin by call callable case cbaddr code cwaddr define do downto drop else end entry external fixed for forward goto if int interrupt label land literal lor main not of or otherwise priv proc procaddr real resident return rscan scan sgbaddr sgwaddr sgxbaddr sgxwaddr stack store string struct subproc then to unsigned until use variable waddr while xor
+keywords2.$(file.patterns.TAL)=at below bit_filler block bytes c cobol elements ext extensible filler fortran language name pascal private unspecified words
+
+comment.block.TAL=--
+
+# TAL styles
+# 1,Comment|2,Line Comment|3,Doc Comment|4,Number|5,Keyword|6,String|7,Character|8,Unreserved keyword|9,Preprocessor|10,Operator
+# 11,Identifier
+style.TAL.0=fore:#808080
+
+# Comment
+style.TAL.1=fore:#008000,$(font.code.comment)
+# Line comment
+style.TAL.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Doc comment
+style.TAL.3=$(colour.code.comment.document),$(font.code.comment.document)
+# Number
+style.TAL.4=$(colour.number)
+# Keyword
+style.TAL.5=$(colour.keyword),bold
+# String
+style.TAL.6=$(colour.string),$(font.monospace)
+# Character
+style.TAL.7=$(colour.char),$(font.monospace)
+# Unreserved keyword
+style.TAL.8=$(colour.keyword),bold
+# Preprocessor
+style.TAL.9=$(colour.preproc),$(font.preproc)
+# Operators
+style.TAL.10=$(colour.operator),bold
+# Identifier
+style.TAL.11=$(colour.identifier),$(font.identifier)
+
+
+
diff --git a/scite-app/scite/src/tcl.properties b/scite-app/scite/src/tcl.properties
new file mode 100644
index 0000000..95ce6f2
--- /dev/null
+++ b/scite-app/scite/src/tcl.properties
@@ -0,0 +1,158 @@
+# Define SciTE settings for tcl and itcl files.
+
+file.patterns.tcl=*.tcl;*.exp
+file.patterns.itcl=*.itcl
+file.patterns.tcl.like=$(file.patterns.tcl);$(file.patterns.itcl);
+
+filter.tcl=Tcl (tcl)|$(file.patterns.tcl)|
+filter.itcl=itcl (itcl)|$(file.patterns.itcl)|
+
+*filter.tcl=$(filter.tcl)
+
+lexer.$(file.patterns.tcl)=tcl
+lexer.$(file.patterns.itcl)=tcl
+
+*language.tcl=&TCL|tcl||
+
+keywordclass.tcl=after append array auto_execok \
+auto_import auto_load auto_load_index auto_qualify \
+beep bgerror binary break case catch cd clock \
+close concat continue dde default echo else elseif \
+encoding eof error eval exec exit expr fblocked \
+fconfigure fcopy file fileevent flush for foreach format \
+gets glob global history http if incr info \
+interp join lappend lindex linsert list llength load \
+loadTk lrange lreplace lsearch lset lsort memory msgcat \
+namespace open package pid pkg::create pkg_mkIndex Platform-specific proc \
+puts pwd re_syntax read regexp registry regsub rename \
+resource return scan seek set socket source split \
+string subst switch tclLog tclMacPkgSearch tclPkgSetup tclPkgUnknown tell \
+time trace unknown unset update uplevel upvar variable \
+vwait while
+
+keywordclass.tk=bell bind bindtags bitmap button canvas checkbutton clipboard \
+colors console cursors destroy entry event focus font \
+frame grab grid image Inter-client keysyms label labelframe \
+listbox lower menu menubutton message option options pack \
+panedwindow photo place radiobutton raise scale scrollbar selection \
+send spinbox text tk tk_chooseColor tk_chooseDirectory tk_dialog tk_focusNext \
+tk_getOpenFile tk_messageBox tk_optionMenu tk_popup tk_setPalette tkerror tkvars tkwait \
+toplevel winfo wish wm
+
+keywordclass.itcl=@scope body class code common component configbody \
+constructor define destructor hull import inherit itcl itk itk_component \
+itk_initialize itk_interior itk_option iwidgets keep method \
+private protected public
+
+keywordclass.TkCommands=tk_bisque tk_chooseColor tk_dialog tk_focusFollowsMouse tk_focusNext \
+tk_focusPrev tk_getOpenFile tk_getSaveFile tk_messageBox tk_optionMenu \
+tk_popup tk_setPalette tk_textCopy tk_textCut tk_textPaste \
+tkButtonAutoInvoke tkButtonDown tkButtonEnter tkButtonInvoke tkButtonLeave \
+tkButtonUp tkCancelRepeat tkCheckRadioDown tkCheckRadioEnter tkCheckRadioInvoke \
+tkColorDialog tkColorDialog_BuildDialog tkColorDialog_CancelCmd tkColorDialog_Config tkColorDialog_CreateSelector \
+tkColorDialog_DrawColorScale tkColorDialog_EnterColorBar tkColorDialog_HandleRGBEntry tkColorDialog_HandleSelEntry tkColorDialog_InitValues \
+tkColorDialog_LeaveColorBar tkColorDialog_MoveSelector tkColorDialog_OkCmd tkColorDialog_RedrawColorBars tkColorDialog_RedrawFinalColor \
+tkColorDialog_ReleaseMouse tkColorDialog_ResizeColorBars tkColorDialog_RgbToX tkColorDialog_SetRGBValue tkColorDialog_StartMove \
+tkColorDialog_XToRgb tkConsoleAbout tkConsoleBind tkConsoleExit tkConsoleHistory \
+tkConsoleInit tkConsoleInsert tkConsoleInvoke tkConsoleOutput tkConsolePrompt \
+tkConsoleSource tkDarken tkEntryAutoScan tkEntryBackspace tkEntryButton1 \
+tkEntryClosestGap tkEntryGetSelection tkEntryInsert tkEntryKeySelect tkEntryMouseSelect \
+tkEntryNextWord tkEntryPaste tkEntryPreviousWord tkEntrySeeInsert tkEntrySetCursor \
+tkEntryTranspose tkEventMotifBindings tkFDGetFileTypes tkFirstMenu tkFocusGroup_BindIn \
+tkFocusGroup_BindOut tkFocusGroup_Create tkFocusGroup_Destroy tkFocusGroup_In tkFocusGroup_Out \
+tkFocusOK tkGenerateMenuSelect tkIconList tkIconList_Add tkIconList_Arrange \
+tkIconList_AutoScan tkIconList_Btn1 tkIconList_Config tkIconList_Create tkIconList_CtrlBtn1 \
+tkIconList_Curselection tkIconList_DeleteAll tkIconList_Double1 tkIconList_DrawSelection tkIconList_FocusIn \
+tkIconList_FocusOut tkIconList_Get tkIconList_Goto tkIconList_Index tkIconList_Invoke \
+tkIconList_KeyPress tkIconList_Leave1 tkIconList_LeftRight tkIconList_Motion1 tkIconList_Reset \
+tkIconList_ReturnKey tkIconList_See tkIconList_Select tkIconList_Selection tkIconList_ShiftBtn1 \
+tkIconList_UpDown tkListbox tkListboxAutoScan tkListboxBeginExtend tkListboxBeginSelect \
+tkListboxBeginToggle tkListboxCancel tkListboxDataExtend tkListboxExtendUpDown tkListboxKeyAccel_Goto \
+tkListboxKeyAccel_Key tkListboxKeyAccel_Reset tkListboxKeyAccel_Set tkListboxKeyAccel_Unset tkListboxMotion \
+tkListboxSelectAll tkListboxUpDown tkMbButtonUp tkMbEnter tkMbLeave \
+tkMbMotion tkMbPost tkMenuButtonDown tkMenuDownArrow tkMenuDup \
+tkMenuEscape tkMenuFind tkMenuFindName tkMenuFirstEntry tkMenuInvoke \
+tkMenuLeave tkMenuLeftArrow tkMenuMotion tkMenuNextEntry tkMenuNextMenu \
+tkMenuRightArrow tkMenuUnpost tkMenuUpArrow tkMessageBox tkMotifFDialog \
+tkMotifFDialog_ActivateDList tkMotifFDialog_ActivateFEnt tkMotifFDialog_ActivateFList tkMotifFDialog_ActivateSEnt tkMotifFDialog_BrowseDList \
+tkMotifFDialog_BrowseFList tkMotifFDialog_BuildUI tkMotifFDialog_CancelCmd tkMotifFDialog_Config tkMotifFDialog_Create \
+tkMotifFDialog_FileTypes tkMotifFDialog_FilterCmd tkMotifFDialog_InterpFilter tkMotifFDialog_LoadFiles tkMotifFDialog_MakeSList \
+tkMotifFDialog_OkCmd tkMotifFDialog_SetFilter tkMotifFDialog_SetListMode tkMotifFDialog_Update tkPostOverPoint \
+tkRecolorTree tkRestoreOldGrab tkSaveGrabInfo tkScaleActivate tkScaleButton2Down \
+tkScaleButtonDown tkScaleControlPress tkScaleDrag tkScaleEndDrag tkScaleIncrement \
+tkScreenChanged tkScrollButton2Down tkScrollButtonDown tkScrollButtonDrag tkScrollButtonUp \
+tkScrollByPages tkScrollByUnits tkScrollDrag tkScrollEndDrag tkScrollSelect \
+tkScrollStartDrag tkScrollTopBottom tkScrollToPos tkTabToWindow tkTearOffMenu \
+tkTextAutoScan tkTextButton1 tkTextClosestGap tkTextInsert tkTextKeyExtend \
+tkTextKeySelect tkTextNextPara tkTextNextPos tkTextNextWord tkTextPaste \
+tkTextPrevPara tkTextPrevPos tkTextPrevWord tkTextResetAnchor tkTextScrollPages \
+tkTextSelectTo tkTextSetCursor tkTextTranspose tkTextUpDownLine tkTraverseToMenu \
+tkTraverseWithinMenu
+
+keywords.$(file.patterns.tcl.like)=$(keywordclass.tcl)
+keywords2.$(file.patterns.tcl.like)=$(keywordclass.tk)
+keywords3.$(file.patterns.tcl.like)= $(keywordclass.TkCommands)
+keywords4.$(file.patterns.itcl)=$(keywordclass.itcl)
+keywords5.$(file.patterns.tcl.like)=expand
+
+comment.block.tcl=#~
+# also suported is #- for start/end of box, box.middle # can be in column 1
+comment.box.start.tcl=##
+comment.box.middle.tcl= #
+comment.box.end.tcl= ##
+
+# tcl styles
+# Default
+style.tcl.32=$(font.base)
+# White space
+style.tcl.0=fore:#808080
+# Comment:.....; #comment
+style.tcl.1=$(colour.code.comment.line),$(font.comment),back:#f0FFE0
+# Line Comment:  #comment
+style.tcl.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Number and hex number (syntax #[0-f]+)
+style.tcl.3=$(colour.number)
+# Keyword in quote
+style.tcl.4=$(colour.string),bold,back:#FFF0F0
+# In quote
+style.tcl.5=$(colour.string),back:#FFf0f0,eolfilled
+# operator
+style.tcl.6=$(colour.operator),bold
+# Identifiers
+style.tcl.7=$(colour.keyword)
+# Substitution
+style.tcl.8=$(colour.preproc)
+# Substitution starts with a brace ${woow}
+style.tcl.9=$(colour.preproc),back:#effff0
+# Modifier -xxx
+style.tcl.10=$(colour.char)
+# Expand (what and odd syntax)
+style.tcl.11=$(colour.keyword),back:#FFFF80,bold
+# Keywords
+style.tcl.12=$(colour.keyword),bold
+# Keywords 2
+style.tcl.13=$(colour.keyword),back:#e0ffff,bold
+# Keywords 3
+style.tcl.14=$(colour.keyword),back:#FFf0f0,bold
+# Keywords 4
+style.tcl.15=$(colour.keyword),back:#FFD0D0,bold
+# Other keywords (bozo test colors :-)
+# Keywords 5
+style.tcl.16=$(style.tcl.7),back:#FFD0FF,bold
+# Keywords 6
+style.tcl.17=$(style.tcl.7),back:#FFFFD0,bold
+# Keywords 7
+style.tcl.18=$(style.tcl.7),back:#FFA0A0,bold,
+# Keywords 8
+style.tcl.19=$(style.tcl.7),back:#FFD0D0
+#comment box
+style.tcl.20=$(colour.code.comment.box),$(font.code.comment.box),back:#f0FFf0,eolfilled
+#comment block
+style.tcl.21=$(colour.embedded.comment),$(font.embedded.comment),back:#f0FFf0
+
+# Matched Operators
+style.tcl.34=fore:#f0f0f0,bold,back:#7070ff
+style.tcl.35=fore:#FF0000,bold,back:#FF00FF
+
+# Braces are only matched in operator style
+braces.tcl.style=6
diff --git a/scite-app/scite/src/tex.properties b/scite-app/scite/src/tex.properties
new file mode 100644
index 0000000..d280594
--- /dev/null
+++ b/scite-app/scite/src/tex.properties
@@ -0,0 +1,464 @@
+# file    : tex.properties
+# version : 18 august 2003
+# author  : Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+
+# TeX users may want to use the Latin Modern Typewriter font:
+#
+#   font.monospace=font:LMTypewriter10,size:16.5
+#   font.errorfont=font:LMTypewriter10,size:11.5
+#
+# These and more presets are done in context.properties.
+
+# TeX: patterns
+
+file.patterns.tex=*.tex;*.sty
+file.patterns.latex=*.tex;*.sty;*.aux;*.toc;*.idx
+file.patterns.context=*.tex;*.tui;*.tuo;*.sty
+
+# filter to be checked/tested:
+
+filter.tex=TeX (tex sty)|$(file.patterns.tex)|
+filter.latex=LaTeX (tex sty aux toc idx)|$(file.patterns.latex)|
+filter.context=ConTeXt (tex tui tuo sty)|$(file.patterns.context)|
+
+lexer.$(file.patterns.tex)=tex
+lexer.$(file.patterns.latex)=tex
+lexer.$(file.patterns.context)=tex
+
+*language.tex=TeX|tex||
+
+# TeX: commands (check process view)
+
+command.compile.$(file.patterns.tex)=
+command.build.$(file.patterns.tex)=tex $(FileNameExt)
+command.go.$(file.patterns.tex)=gv $(FileName).pdf
+
+command.compile.$(file.patterns.latex)=
+command.build.$(file.patterns.latex)=pdflatex $(FileNameExt)
+command.go.$(file.patterns.latex)=gv $(FileName).pdf
+
+command.compile.$(file.patterns.context)=
+command.build.$(file.patterns.context)=texexec --pdf $(FileNameExt)
+command.go.$(file.patterns.context)=gv $(FileName).pdf
+
+command.0.$(file.patterns.tex)=
+command.1.$(file.patterns.tex)=
+command.2.$(file.patterns.tex)=
+command.3.$(file.patterns.tex)=
+command.4.$(file.patterns.tex)=
+command.5.$(file.patterns.tex)=
+command.6.$(file.patterns.tex)=
+command.7.$(file.patterns.tex)=
+command.8.$(file.patterns.tex)=
+command.9.$(file.patterns.tex)=
+
+command.0.$(file.patterns.latex)=
+command.1.$(file.patterns.latex)=
+command.2.$(file.patterns.latex)=
+command.3.$(file.patterns.latex)=
+command.4.$(file.patterns.latex)=
+command.5.$(file.patterns.latex)=
+command.6.$(file.patterns.latex)=
+command.7.$(file.patterns.latex)=
+command.8.$(file.patterns.latex)=
+command.9.$(file.patterns.latex)=
+
+command.0.$(file.patterns.context)=
+command.1.$(file.patterns.context)=
+command.2.$(file.patterns.context)=
+command.3.$(file.patterns.context)=
+command.4.$(file.patterns.context)=
+command.5.$(file.patterns.context)=
+command.6.$(file.patterns.context)=
+command.7.$(file.patterns.context)=
+command.8.$(file.patterns.context)=
+command.9.$(file.patterns.context)=
+
+# BibTeX command
+command.name.2.$(file.patterns.tex)=BibTeX
+command.name.2.$(file.patterns.latex)=BibTeX
+command.name.2.$(file.patterns.context)=BibTeX
+command.2.$(file.patterns.tex)=bibtex $(FileName)
+command.2.$(file.patterns.latex)=bibtex $(FileName)
+command.2.$(file.patterns.context)=bibtex $(FileName)
+
+# TeX: highlighting
+
+# Default
+style.tex.0=fore:#3F3F3F
+# Special
+style.tex.1=fore:#007F7F
+# Group
+style.tex.2=fore:#7F0000
+# Symbol
+style.tex.3=fore:#7F7F00
+# Command
+style.tex.4=fore:#007F00
+# Text
+style.tex.5=
+# style.tex.5=fore:#000000
+
+style.tex.34=fore:#00007F
+style.tex.35=fore:#7F007F
+
+# TeX: comments
+
+comment.block.tex=%
+comment.block.at.line.start.tex=1
+
+# TeX: lexer.tex.interface.default
+#
+# 0 all \commands
+# 1 tex etex pdftex omega primitives
+# 2 context nl (when context.properties is loaded)
+# 3 context en (when context.properties is loaded)
+# 4 context de (when context.properties is loaded)
+# 5 context cz (when context.properties is loaded)
+# 6 context it (when context.properties is loaded)
+# 7 context ro (when context.properties is loaded)
+# 8 latex (no keywords yet; will move up)
+#
+# first lines of a tex file are interpreted as follows
+#
+# % interface=all|nl|en|de|cz|it|ro|latex
+
+lexer.tex.interface.default=0
+
+# TeX: lexer.tex.use.keywords
+#
+# 0 don't use keyword lists
+# 1 use keyword lists
+
+lexer.tex.use.keywords=1
+
+# TeX: lexer.tex.comment.process
+#
+# 0 don't interpret comment
+# 1 color comment like source code
+
+lexer.tex.comment.process=0
+
+# TeX: lexer.tex.auto.if
+#
+# 0 don't handle \if<unknown>
+# 1 treat \if<unknown> as command
+
+lexer.tex.auto.if=1
+
+# TeX: keywords (incomplete, just for testing and as example)
+
+keywordclass.primitives.tex=\
+    above abovedisplayshortskip abovedisplayskip \
+    abovewithdelims accent adjdemerits advance afterassignment \
+    aftergroup atop atopwithdelims \
+    badness baselineskip batchmode begingroup \
+    belowdisplayshortskip belowdisplayskip binoppenalty botmark \
+    box boxmaxdepth brokenpenalty \
+    catcode char chardef cleaders closein closeout clubpenalty \
+    copy count countdef cr crcr csname \
+    day deadcycles def defaulthyphenchar defaultskewchar \
+    delcode delimiter delimiterfactor delimeters \
+    delimitershortfall delimeters dimen dimendef discretionary \
+    displayindent displaylimits displaystyle \
+    displaywidowpenalty displaywidth divide \
+    doublehyphendemerits dp dump \
+    edef else emergencystretch end endcsname endgroup endinput \
+    endlinechar eqno errhelp errmessage errorcontextlines \
+    errorstopmode escapechar everycr everydisplay everyhbox \
+    everyjob everymath everypar everyvbox exhyphenpenalty \
+    expandafter  \
+    fam fi finalhyphendemerits firstmark floatingpenalty font \
+    fontdimen fontname futurelet \
+    gdef global group globaldefs \
+    halign hangafter hangindent hbadness hbox hfil horizontal \
+    hfill horizontal hfilneg hfuzz hoffset holdinginserts hrule \
+    hsize hskip hss horizontal ht hyphenation hyphenchar \
+    hyphenpenalty hyphen \
+    if ifcase ifcat ifdim ifeof iffalse ifhbox ifhmode ifinner \
+    ifmmode ifnum ifodd iftrue ifvbox ifvmode ifvoid ifx \
+    ignorespaces immediate indent input inputlineno input \
+    insert insertpenalties interlinepenalty \
+    jobname \
+    kern \
+    language lastbox lastkern lastpenalty lastskip lccode \
+    leaders left lefthyphenmin leftskip leqno let limits \
+    linepenalty line lineskip lineskiplimit long looseness \
+    lower lowercase \
+    mag mark mathaccent mathbin mathchar mathchardef mathchoice \
+    mathclose mathcode mathinner mathop mathopen mathord \
+    mathpunct mathrel mathsurround maxdeadcycles maxdepth \
+    meaning medmuskip message mkern month moveleft moveright \
+    mskip multiply muskip muskipdef \
+    newlinechar noalign noboundary noexpand noindent nolimits \
+    nonscript scriptscript nonstopmode nulldelimiterspace \
+    nullfont number \
+    omit openin openout or outer output outputpenalty over \
+    overfullrule overline overwithdelims \
+    pagedepth pagefilllstretch pagefillstretch pagefilstretch \
+    pagegoal pageshrink pagestretch pagetotal par parfillskip \
+    parindent parshape parskip patterns pausing penalty \
+    postdisplaypenalty predisplaypenalty predisplaysize \
+    pretolerance prevdepth prevgraf \
+    radical raise read relax relpenalty right righthyphenmin \
+    rightskip romannumeral \
+    scriptfont scriptscriptfont scriptscriptstyle scriptspace \
+    scriptstyle scrollmode setbox setlanguage sfcode shipout \
+    show showbox showboxbreadth showboxdepth showlists showthe \
+    skewchar skip skipdef spacefactor spaceskip span special \
+    splitbotmark splitfirstmark splitmaxdepth splittopskip \
+    string \
+    tabskip textfont textstyle the thickmuskip thinmuskip time \
+    toks toksdef tolerance topmark topskip tracingcommands \
+    tracinglostchars tracingmacros tracingonline tracingoutput \
+    tracingpages tracingparagraphs tracingrestores tracingstats \
+    uccode uchyph underline unhbox unhcopy unkern unpenalty \
+    unskip unvbox unvcopy uppercase \
+    vadjust valign vbadness vbox vcenter vfil vfill vfilneg \
+    vfuzz voffset vrule vsize vskip vsplit vss vtop \
+    wd widowpenalty write \
+    xdef xleaders xspaceskip \
+    year
+
+keywordclass.primitives.etex=\
+    beginL beginR botmarks \
+    clubpenalties currentgrouplevel currentgrouptype \
+    currentifbranch currentiflevel currentiftype \
+    detokenize dimexpr displaywidowpenalties \
+    endL endR eTeXrevision eTeXversion everyeof \
+    firstmarks fontchardp fontcharht fontcharic fontcharwd \
+    glueexpr glueshrink glueshrinkorder gluestretch \
+    gluestretchorder gluetomu \
+    ifcsname ifdefined iffontchar interactionmode \
+    interactionmode interlinepenalties \
+    lastlinefit lastnodetype \
+    marks topmarks middle muexpr mutoglue \
+    numexpr \
+    pagediscards parshapedimen parshapeindent parshapelength \
+    predisplaydirection \
+    savinghyphcodes savingvdiscards scantokens showgroups \
+    showifs showtokens splitdiscards splitfirstmarks \
+    TeXXeTstate tracingassigns tracinggroups tracingifs \
+    tracingnesting tracingscantokens \
+    unexpanded unless \
+    widowpenalties
+
+keywordclass.primitives.pdftex=\
+    pdfadjustspacing pdfannot pdfavoidoverfull \
+    pdfcatalog pdfcompresslevel \
+    pdfdecimaldigits pdfdest pdfdestmargin \
+    pdfendlink pdfendthread \
+    pdffontattr pdffontexpand pdffontname pdffontobjnum pdffontsize \
+    pdfhorigin \
+    pdfimageresolution pdfincludechars pdfinfo \
+    pdflastannot pdflastdemerits pdflastobj \
+    pdflastvbreakpenalty pdflastxform pdflastximage \
+    pdflastximagepages pdflastxpos pdflastypos \
+    pdflinesnapx pdflinesnapy pdflinkmargin pdfliteral \
+    pdfmapfile pdfmaxpenalty pdfminpenalty pdfmovechars \
+    pdfnames \
+    pdfobj pdfoptionpdfminorversion pdfoutline pdfoutput \
+    pdfpageattr pdfpageheight pdfpageresources pdfpagesattr \
+    pdfpagewidth pdfpkresolution pdfprotrudechars \
+    pdfrefobj pdfrefxform pdfrefximage \
+    pdfsavepos pdfsnaprefpoint pdfsnapx pdfsnapy pdfstartlink \
+    pdfstartthread \
+    pdftexrevision pdftexversion pdfthread pdfthreadmargin \
+    pdfuniqueresname \
+    pdfvorigin \
+    pdfxform pdfximage
+
+keywordclass.primitives.omega=\
+    odelimiter omathaccent omathchar oradical omathchardef omathcode odelcode \
+    leftghost rightghost \
+    charwd charht chardp charit \
+    localleftbox localrightbox \
+    localinterlinepenalty localbrokenpenalty \
+    pagedir bodydir pardir textdir mathdir \
+    boxdir nextfakemath \
+    pagewidth pageheight pagerightoffset pagebottomoffset \
+    nullocp nullocplist ocp externalocp ocplist pushocplist popocplist clearocplists ocptracelevel \
+    addbeforeocplist addafterocplist removebeforeocplist removeafterocplist \
+    OmegaVersion \
+    InputTranslation OutputTranslation DefaultInputTranslation DefaultOutputTranslation \
+    noInputTranslation noOutputTranslation \
+    InputMode OutputMode DefaultInputMode DefaultOutputMode \
+    noInputMode noOutputMode noDefaultInputMode noDefaultOutputMode
+
+# only the macros that make sense:
+
+keywordclass.macros.plain.partial=\
+    TeX \
+    bgroup egroup endgraf space empty null \
+    newcount newdimen newskip newmuskip newbox newtoks newhelp newread newwrite newfam newlanguage newinsert newif \
+    maxdimen magstephalf magstep \
+    frenchspacing nonfrenchspacing normalbaselines obeylines obeyspaces raggedright ttraggedright \
+    thinspace negthinspace enspace enskip quad qquad \
+    smallskip medskip bigskip removelastskip topglue vglue hglue \
+    break nobreak allowbreak filbreak goodbreak smallbreak medbreak bigbreak \
+    line leftline rightline centerline rlap llap underbar strutbox strut \
+    cases matrix pmatrix bordermatrix eqalign displaylines eqalignno leqalignno \
+    pageno folio tracingall showhyphens fmtname fmtversion \
+    hphantom vphantom phantom smash
+
+keywordclass.macros.eplain.partial=\
+    eTeX \
+    newmarks grouptype interactionmode nodetype iftype \
+    tracingall loggingall tracingnone
+
+# for fun
+
+keywordclass.primitives.pdftex.experimental=
+
+keywordclass.primitives.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.primitives.pdftex.experimental) \
+    $(keywordclass.primitives.omega)
+
+# hooks for context
+
+keywordclass.macros.context.undocumented.en=
+keywordclass.macros.context.undocumented.nl=
+keywordclass.macros.context.undocumented.de=
+keywordclass.macros.context.undocumented.cz=
+keywordclass.macros.context.undocumented.it=
+keywordclass.macros.context.undocumented.ro=
+
+keywordclass.macros.context.extras=
+
+keywordclass.macros.context.nl=
+keywordclass.macros.context.en=
+keywordclass.macros.context.de=
+keywordclass.macros.context.cz=
+keywordclass.macros.context.it=
+keywordclass.macros.context.ro=
+
+import cont-en-scite
+import cont-nl-scite
+import cont-de-scite
+import cont-cz-scite
+import cont-it-scite
+import cont-ro-scite
+
+import cont-xx-scite
+
+# hooks for latex (file should define keywordclass.macros.latex.all)
+
+keywordclass.macros.latex.all=
+
+import latex-scite
+
+# collections
+
+keywordclass.tex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.macros.plain.partial)
+
+keywordclass.etex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.macros.plain.partial) \
+    $(keywordclass.macros.eplain.partial)
+
+keywordclass.latex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.macros.latex.all)
+
+keywordclass.pdflatex.all=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.macros.latex.all)
+
+# we can't use $(keywordclass.primitives.all) here due to some kind of
+# limitation in nesting
+
+keywordclass.context.base=\
+    $(keywordclass.primitives.tex) \
+    $(keywordclass.primitives.etex) \
+    $(keywordclass.primitives.pdftex) \
+    $(keywordclass.primitives.pdftex.experimental) \
+    $(keywordclass.primitives.omega) \
+    $(keywordclass.macros.plain.partial) \
+    $(keywordclass.macros.eplain.partial)
+
+keywordclass.context.all=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.en) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.en)
+
+keywordclass.context.all.nl=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.nl) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.nl)
+
+keywordclass.context.all.en=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.en) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.en)
+
+keywordclass.context.all.de=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.de) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.de)
+
+keywordclass.context.all.cz=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.cz) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.cz)
+
+keywordclass.context.all.it=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.it) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.it)
+
+keywordclass.context.all.ro=\
+    $(keywordclass.context.base) \
+    $(keywordclass.macros.context.ro) \
+    $(keywordclass.macros.context.extras) \
+    $(keywordclass.macros.context.undocumented.ro)
+
+# hm
+
+keywords.$(file.patterns.tex)=$(keywordclass.tex.all)
+keywords.$(file.patterns.latex)=$(keywordclass.latex.all)
+keywords.$(file.patterns.context)=$(keywordclass.context.all)
+
+# keywords1 is not used since scintilla takes it from 'keywords'
+
+keywords.$(file.patterns.context)=$(keywordclass.context.base)
+
+keywords2.$(file.patterns.context)=$(keywordclass.context.all.nl)
+keywords3.$(file.patterns.context)=$(keywordclass.context.all.en)
+keywords4.$(file.patterns.context)=$(keywordclass.context.all.de)
+keywords5.$(file.patterns.context)=$(keywordclass.context.all.cz)
+keywords6.$(file.patterns.context)=$(keywordclass.context.all.it)
+keywords7.$(file.patterns.context)=$(keywordclass.context.all.ro)
+
+# keywords71.$(file.patterns.context)=$(keywordclass.tex.all)
+# keywords72.$(file.patterns.context)=$(keywordclass.etex.all)
+# keywords73.$(file.patterns.context)=$(keywordclass.pdftex.all)
+# keywords74.$(file.patterns.context)=$(keywordclass.pdfetex.all)
+#
+# keywords91.$(file.patterns.context)=$(keywordclass.latex.all)
+
+# for the moment LaTeX gets slot 8, but we will move it up as soon as
+# more keyword lists can be defined
+
+keywords8.$(file.patterns.context)=$(keywordclass.pdflatex.all)
+
+# TeX: words
+
+word.characters.$(file.patterns.tex)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@
+word.characters.$(file.patterns.latex)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@
+word.characters.$(file.patterns.context)=$(chars.alpha)$(chars.numeric)$(chars.accented)\@!?
+
+# TeX: end of file
\ No newline at end of file
diff --git a/scite-app/scite/src/txt2tags.properties b/scite-app/scite/src/txt2tags.properties
new file mode 100644
index 0000000..c5a4947
--- /dev/null
+++ b/scite-app/scite/src/txt2tags.properties
@@ -0,0 +1,94 @@
+# Define SciTE settings for txt2tags.
+
+file.patterns.txt2tags=*.t2t
+
+shbang.txt2tags=txt2tags
+
+filter.txt2tags=Txt2tags (t2t)|$(file.patterns.txt2tags)|
+
+*filter.txt2tags=$(filter.txt2tags)
+
+lexer.$(file.patterns.txt2tags)=txt2tags
+
+*language.txt2tags=&txt2tags|t2t||
+
+# Default
+style.txt2tags.0=fore:#000000
+
+# Special
+style.txt2tags.1=fore:#000000
+
+# STRONG
+style.txt2tags.2=fore:#445675,bold
+
+# STRONG 2 (not used)
+style.txt2tags.3=fore:#445675
+
+# EM1 (italic)
+style.txt2tags.4=fore:#653A39,italics
+
+# EM2 (underline)
+style.txt2tags.5=fore:#386742
+
+# H1
+style.txt2tags.6=fore:#E20700,bold
+
+# H2
+style.txt2tags.7=fore:#E20700,bold
+
+# H3
+style.txt2tags.8=fore:#A81D05,bold
+
+# H4
+style.txt2tags.9=fore:#871704,bold
+
+# H5
+style.txt2tags.10=fore:#871704,bold
+
+# H6
+style.txt2tags.11=fore:#871704,bold
+
+# prechar (not used)
+style.txt2tags.12=fore:#871704,bold
+
+# list
+style.txt2tags.13=fore:#E300EE
+
+# list
+style.txt2tags.14=fore:#E300EE
+
+# BLOCKQUOTE
+style.txt2tags.15=fore:#015F52
+
+# STRIKEOUT
+style.txt2tags.16=fore:#644A9B
+
+# HRULE
+style.txt2tags.17=fore:#ff901e
+
+# LINK
+style.txt2tags.18=fore:#0930DE,italics
+
+# CODE
+style.txt2tags.19=fore:#009f00
+
+# CODE2
+style.txt2tags.20=fore:#009f00
+
+# CODEBLOCK
+style.txt2tags.21=fore:#005f00
+
+# COMMENT
+style.txt2tags.22=fore:#777777
+
+# OPTION
+style.txt2tags.23=fore:#C0036E
+
+# PREPROC
+style.txt2tags.24=fore:#848B00
+
+# POSTPROC
+style.txt2tags.25=fore:#C05600
+
+
+
diff --git a/scite-app/scite/src/vb.properties b/scite-app/scite/src/vb.properties
new file mode 100644
index 0000000..f4daf8e
--- /dev/null
+++ b/scite-app/scite/src/vb.properties
@@ -0,0 +1,117 @@
+# Define SciTE settings for VB files.
+
+# BAS: Module, FRM: Form, CLS: Class Module, CTL: User Control
+# PAG: Property Page, DSR: Data Report, DOB: User Document
+file.patterns.vb=*.vb;*.bas;*.frm;*.cls;*.ctl;*.pag;*.dsr;*.dob
+# VBS: VBScript, DSM: Visual[ex. Dev] Studio macro
+file.patterns.wscript=*.vbs;*.dsm
+
+*source.patterns.vb=$(file.patterns.vb);$(file.patterns.wscript);
+
+# VBP: VB Project, VBG: VB Project Group (ActiveX), MAK: old (VB3) project file, VBW: VB Workspace
+filter.vb=VB (vb vbp vbs bas frm cls ctl pag dsr dob)|$(file.patterns.vb);$(file.patterns.wscript);*.vbp;*.vbg;*.mak;*.vbw|
+
+*filter.vb=$(filter.vb)
+
+lexer.$(file.patterns.vb)=vb
+lexer.$(file.patterns.wscript)=vbscript
+
+*language.vb=&VB|vb||
+#*language.vbscript=VBScr&ipt|vbs||
+
+# Keywords, operators, statements, data types and some words in .frm files
+keywordclass.vb6=\
+addressof alias and as attribute base begin binary boolean byref byte byval call case cdbl \
+cint clng compare const csng cstr currency date decimal declare defbool defbyte defcur \
+defdate defdbl defdec defint deflng defobj defsng defstr defvar dim do double each else \
+elseif empty end enum eqv erase error event exit explicit false for friend function get \
+global gosub goto if imp implements in input integer is len let lib like load lock long \
+loop lset me mid midb mod new next not nothing null object on option optional or paramarray \
+preserve print private property public raiseevent randomize redim rem resume return rset \
+seek select set single static step stop string sub text then time to true type typeof \
+unload until variant wend while with withevents xor
+
+# html.properties picks up VB keywords from keywordclass.vb
+keywordclass.vb=$(keywordclass.vb6)
+
+# Mostly system statements (files, registry, I/O...) that
+# I am not sure to include with the regular statements.
+keywordclass.vbotherstatements=\
+appactivate beep chdir chdrive close filecopy get input kill line unlock mkdir name \
+open print put reset rmdir savepicture savesetting seek sendkeys setattr width write
+
+# VBNet specific keywords
+keywordclass.vbnet=\
+addhandler andalso ansi assembly auto catch cbool cbyte cchar cdate cdec char class \
+cobj continue csbyte cshort ctype cuint culng cushort custom default delegate directcast \
+endif externalsource finally gettype handles imports inherits interface isfalse isnot \
+istrue module mustinherit mustoverride my mybase myclass namespace narrowing notinheritable \
+notoverridable of off operator orelse overloads overridable overrides partial protected \
+readonly region removehandler sbyte shadows shared short strict structure synclock \
+throw try trycast uinteger ulong unicode ushort using when widening writeonly
+
+keywords.$(file.patterns.vb)=$(keywordclass.vb6) $(keywordclass.vbnet)
+keywords.$(file.patterns.wscript)=$(keywordclass.vb6)
+
+keywords2.$(file.patterns.vb)=$(keywordclass.vbotherstatements)
+
+comment.block.vb='~
+comment.block.vbscript='~
+# VB styles
+
+# Default
+style.vb.32=$(font.base)
+# White space
+style.vb.0=
+# Comment
+style.vb.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Number
+style.vb.2=$(colour.number)
+# Keyword
+style.vb.3=$(colour.keyword)
+# String
+style.vb.4=$(colour.string)
+# Preprocessor (directives)
+style.vb.5=$(colour.preproc)
+# Operator
+style.vb.6=$(colour.operator)
+# Identifier
+style.vb.7=
+# Date
+style.vb.8=$(colour.number)
+# End of line where string is not closed
+style.vb.9=$(style.stringeol)
+# Other keywords (bozo test colors :-)
+style.vb.10=$(style.vb.5),back:#D0FFD0
+style.vb.11=$(style.vb.5),back:#D0D0FF
+style.vb.12=$(style.vb.5),back:#FFD0D0
+
+# VBScript styles same as VB styles
+style.vbscript.0=$(style.vb.0)
+style.vbscript.1=$(style.vb.1)
+style.vbscript.2=$(style.vb.2)
+style.vbscript.3=$(style.vb.3)
+style.vbscript.4=$(style.vb.4)
+style.vbscript.5=$(style.vb.5)
+style.vbscript.6=$(style.vb.6)
+style.vbscript.7=$(style.vb.7)
+style.vbscript.8=$(style.vb.8)
+style.vbscript.9=$(style.vb.9)
+style.vbscript.10=$(style.vb.10)
+style.vbscript.11=$(style.vb.11)
+style.vbscript.12=$(style.vb.12)
+
+# wscript
+# normal execute
+command.go.$(file.patterns.wscript)="$(FilePath)"
+command.go.subsystem.$(file.patterns.wscript)=2
+
+# note we have no real "build"; rather "execute and capture
+# compiletime and runtime errors"
+command.build.$(file.patterns.wscript)=cscript "$(FilePath)"
+command.build.subsystem.$(file.patterns.wscript)=1
+
+command.help.$(file.patterns.wscript)=$(CurrentWord)!C:\Program Files\Microsoft Visual Studio\MSDN\2001OCT\1033\MSDN130.COL
+command.help.subsystem.$(file.patterns.wscript)=4
+command.help.$(file.patterns.vb)=$(CurrentWord)!C:\Program Files\Microsoft Visual Studio\MSDN\2001OCT\1033\MSDN130.COL
+command.help.subsystem.$(file.patterns.vb)=4
diff --git a/scite-app/scite/src/verilog.properties b/scite-app/scite/src/verilog.properties
new file mode 100644
index 0000000..0394587
--- /dev/null
+++ b/scite-app/scite/src/verilog.properties
@@ -0,0 +1,268 @@
+# Define SciTE settings for Verilog files.
+
+# Verilog files
+file.patterns.verilog=*.v;*.vh
+filter.verilog=Verilog (verilog)|$(file.patterns.verilog)|
+
+*filter.verilog=$(filter.verilog)
+
+lexer.$(file.patterns.verilog)=verilog
+
+*language.verilog=Verilog|v||
+
+word.chars.verilog=$(chars.alpha)$(chars.numeric)_`$#
+word.characters.$(file.patterns.verilog)=$(word.chars.verilog)
+
+calltip.verilog.word.characters=$(chars.alpha)$(chars.numeric)_$
+
+comment.block.verilog=//~
+#comment.block.at.line.start.verilog=1
+comment.stream.start.verilog=/*
+comment.stream.end.verilog=*/
+comment.box.start.verilog=/*
+comment.box.middle.verilog= *
+comment.box.end.verilog= */
+
+fold.verilog.flags=0
+
+statement.lookback.$(file.patterns.verilog)=20
+statement.end.$(file.patterns.verilog)=10 ;
+block.start.$(file.patterns.verilog)=5 begin case casex casez
+block.end.$(file.patterns.verilog)=5 begin end endcase
+statement.indent.$(file.patterns.verilog)=5 always else for if while
+
+indent.maintain.$(file.patterns.verilog)=0
+
+preprocessor.symbol.$(file.patterns.verilog)=`
+preprocessor.start.$(file.patterns.verilog)=ifdef ifndef
+preprocessor.middle.$(file.patterns.verilog)=else
+preprocessor.end.$(file.patterns.verilog)=endif
+
+keywordclass.verilog= \
+always and assign automatic \
+begin buf bufif0 bufif1 \
+case casex casez cell cmos config \
+deassign default defparam design disable \
+edge else end endcase endconfig endfunction endgenerate endmodule endprimitive endspecify endtable endtask event \
+for force forever fork function \
+generate genvar \
+highz0 highz1 \
+if ifnone incdir include initial inout input instance integer \
+join \
+large liblist library localparam \
+macromodule medium module \
+nand negedge nmos nor noshowcancelled not notif0 notif1 \
+or output \
+parameter pmos posedge primitive pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent \
+rcmos real realtime reg release repeat rnmos rpmos rtran rtranif0 rtranif1 \
+scalared showcancelled signed small specify specparam strong0 strong1 supply0 supply1 \
+table task time tran tranif0 tranif1 tri tri0 tri1 triand trior trireg \
+unsigned use uwire \
+vectored \
+wait wand weak0 weak1 while wire wor \
+xnor xor
+
+keywords.$(file.patterns.verilog)=$(keywordclass.verilog)
+
+# Secondary keywords and identifiers
+keywords2.$(file.patterns.verilog)=
+keywords3.$(file.patterns.verilog)= \
+$async$and$array $async$and$plane $async$nand$array $async$nand$plane $async$nor$array $async$nor$plane $async$or$array $async$or$plane \
+$bitstoreal \
+$countdrivers \
+$display $displayb $displayh $displayo \
+$dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform \
+$dumpall $dumpfile $dumpflush $dumplimit $dumpoff $dumpon $dumpportsall $dumpportsflush $dumpportslimit $dumpportsoff $dumpportson $dumpvars \
+$fclose $fdisplayh $fdisplay $fdisplayf $fdisplayb $feof $ferror $fflush $fgetc $fgets $finish $fmonitorb $fmonitor $fmonitorf $fmonitorh $fopen $fread $fscanf $fseek $fsscanf $fstrobe $fstrobebb $fstrobef $fstrobeh $ftel $fullskew $fwriteb $fwritef $fwriteh $fwrite \
+$getpattern \
+$history $hold \
+$incsave $input $itor \
+$key \
+$list $log \
+$monitorb $monitorh $monitoroff $monitoron $monitor $monitoro \
+$nochange $nokey $nolog \
+$period $printtimescale \
+$q_add $q_exam $q_full $q_initialize $q_remove \
+$random $readmemb $readmemh $readmemh $realtime $realtobits $recovery $recrem $removal $reset_count $reset $reset_value $restart $rewind $rtoi \
+$save $scale $scope $sdf_annotate $setup $setuphold $sformat $showscopes $showvariables $showvars $signed $skew $sreadmemb $sreadmemh $stime $stop $strobeb $strobe $strobeh $strobeo $swriteb $swriteh $swriteo $swrite $sync$and$array $sync$and$plane $sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane $sync$or$array $sync$or$plane \
+$test$plusargs $time $timeformat $timeskew \
+$ungetc $unsigned \
+$value$plusargs \
+$width $writeb $writeh $write $writeo
+# User defined tasks and identifiers
+keywords4.$(file.patterns.verilog)=
+# comment keyword
+keywords5.$(file.patterns.verilog)= synopsys parallel_case infer_mux TODO
+
+
+# Define SciTE settings for SystemVerilog files.
+
+# systemverilog files
+file.patterns.systemverilog=*.sv;*.svh
+filter.systemverilog=systemverilog (systemverilog)|$(file.patterns.systemverilog)|
+lexer.$(file.patterns.systemverilog)=verilog
+
+word.chars.systemverilog=$(chars.alpha)$(chars.numeric)_`$#
+word.characters.$(file.patterns.systemverilog)=$(word.chars.systemverilog)
+
+statement.lookback.$(file.patterns.systemverilog)=20
+statement.end.$(file.patterns.systemverilog)=10 ;
+block.start.$(file.patterns.systemverilog)=5 begin case casex casez
+block.end.$(file.patterns.systemverilog)=5 begin end endcase
+statement.indent.$(file.patterns.systemverilog)=5 always else for if while
+
+indent.maintain.$(file.patterns.systemverilog)= 0
+
+preprocessor.symbol.$(file.patterns.systemverilog)=`
+preprocessor.start.$(file.patterns.systemverilog)=ifdef ifndef
+preprocessor.middle.$(file.patterns.systemverilog)=else
+preprocessor.end.$(file.patterns.systemverilog)=endif
+
+# Taken from the SystemVerilog IEEE Std 1800-2005 Annex B
+keywords.$(file.patterns.systemverilog)=\
+alias always always_comb always_ff always_latch and assert assign assume \
+automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case \
+casex casez cell chandle class clocking cmos config const constraint context \
+continue cover covergroup coverpoint cross deassign default defparam design \
+disable dist do edge else end endcase endclass endclocking endconfig \
+endfunction endgenerate endgroup endinterface endmodule endpackage \
+endprimitive endprogram endproperty endspecify endsequence endtable endtask \
+enum event expect export extends extern final first_match for force foreach \
+forever fork forkjoin function generate genvar highz0 highz1 if iff ifnone \
+ignore_bins illegal_bins import incdir include initial inout input inside \
+instance int integer interface intersect join join_any join_none large liblist \
+library local localparam logic longint macromodule matches medium modport \
+module nand negedge new nmos nor noshowcancelled not notif0 notif1 null or \
+output package packed parameter pmos posedge primitive priority program \
+property protected pull0 pull1 pulldown pullup pulsestyle_onevent \
+pulsestyle_ondetect pure rand randc randcase randsequence rcmos real realtime \
+ref reg release repeat return rnmos rpmos rtran rtranif0 rtranif1 scalared \
+sequence shortint shortreal showcancelled signed small solve specify specparam \
+static string strong0 strong1 struct super supply0 supply1 table tagged task \
+this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 \
+triand trior trireg type typedef union unique unsigned use uwire var vectored \
+virtual void wait wait_order wand weak0 weak1 while wildcard wire with within \
+wor xnor xor
+
+# Secondary keywords and identifiers
+keywords2.$(file.patterns.systemverilog)=
+
+# System Tasks
+keywords3.$(file.patterns.systemverilog)=\
+$acos $acosh $asin $asinh $assertfailoff $assertfailon $assertkill \
+$assertnonvacuouson $assertoff $asserton $assertpassoff $assertpasson \
+$assertvacuousoff $async$and$array $async$and$plane $async$nand$array \
+$async$nand$plane $async$nor$array $async$nor$plane $async$or$array \
+$async$or$plane $atan $atan2 $atanh $bits $bitstoreal $bitstoshortreal $cast \
+$ceil $changed $changed_gclk $changing_gclk $clog2 $cos $cosh $countdrivers \
+$countones $coverage_control $coverage_get $coverage_get_max $coverage_merge \
+$coverage_save $dimensions $display $displayb $displayh $displayo \
+$dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson \
+$dist_t $dist_uniform $dumpall $dumpfile $dumpflush $dumplimit $dumpoff \
+$dumpon $dumpports $dumpportsall $dumpportsflush $dumpportslimit $dumpportsoff \
+$dumpportson $dumpvars $error $exit $exp $falling_gclk $fatal $fclose \
+$fdisplay $fdisplayb $fdisplayf $fdisplayh $fdisplayo $fell $fell_gclk $feof \
+$ferror $fflush $fgetc $fgets $finish $floor $fmonitor $fmonitorb $fmonitorf \
+$fmonitorh $fmonitoro $fopen $fread $fscanf $fseek $fsscanf $fstrobe $fstrobeb \
+$fstrobebb $fstrobef $fstrobeh $fstrobeo $ftel $ftell $fullskew $future_gclk \
+$fwrite $fwriteb $fwritef $fwriteh $fwriteo $get_coverage $getpattern $high \
+$history $hold $hypot $increment $incsave $info $input $isunbounded $isunknown \
+$itor $key $left $list $ln $load_coverage_db $log $log10 $low $monitor \
+$monitorb $monitorh $monitoro $monitoroff $monitoron $nochange $nokey $nolog \
+$onehot $onehot0 $past $past_gclk $period $pow $printtimescale $q_add $q_exam \
+$q_full $q_initialize $q_remove $random $readmemb $readmemh $realtime \
+$realtobits $recovery $recrem $removal $reset $reset_count $reset_value \
+$restart $rewind $right $rising_gclk $root $rose $rose_gclk $rtoi $sampled \
+$save $scale $scope $sdf_annotate $set_coverage_db_name $setup $setuphold \
+$sformat $sformatf $shortrealtobits $showscopes $showvariables $showvars \
+$signed $sin $sinh $size $skew $sqrt $sreadmemb $sreadmemh $sscanf $stable \
+$stable_gclk $steady_gclk $stime $stop $strobe $strobeb $strobeh $strobeo \
+$swrite $swriteb $swriteh $swriteo $sync$and$array $sync$and$plane \
+$sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane \
+$sync$or$array $sync$or$plane $system $tan $tanh $test$plusargs $time \
+$timeformat $timeskew $typename $ungetc $unit $unpacked_dimensions $unsigned \
+$urandom $urandom_range $value$plusargs $warning $width $write $writeb $writeh \
+$writememb $writememh $writeo
+
+# User defined tasks and identifiers
+keywords4.$(file.patterns.systemverilog)=
+# comment keyword
+keywords5.$(file.patterns.systemverilog)= synopsys parallel_case infer_mux TODO
+
+
+# Verilog styles
+
+# Default
+style.verilog.32=$(font.base)
+# White space
+style.verilog.0=fore:#808080
+# Comment
+style.verilog.1=$(colour.code.comment.box),$(font.code.comment.box)
+# Line Comment
+style.verilog.2=$(colour.code.comment.line),$(font.code.comment.line)
+# Bang comment
+style.verilog.3=fore:#3F7F3F,$(font.code.comment.line),back:#E0F0FF,eolfilled
+# Number
+style.verilog.4=$(colour.number)
+# Keyword
+style.verilog.5=fore:#7f005f,bold
+# Double quoted string
+style.verilog.6=$(colour.string),$(font.string.literal)
+# Keyword2, Secondary keywords and identifiers
+style.verilog.7=fore:#007F7F
+# keywords3, System tasks
+style.verilog.8=fore:#804020
+# Preprocessor
+style.verilog.9=$(colour.preproc)
+# Operators
+style.verilog.10=fore:#007070
+# Identifiers
+style.verilog.11=
+# End of line where string is not closed
+style.verilog.12=fore:#000000,$(font.string.literal),back:#E0C0E0,eolfilled
+# keywords4, User defined identifiers and tasks
+style.verilog.19=fore:#2a00ff
+# comment keyword
+style.verilog.20=fore:#2A00FF
+# port declare (input output ioput)
+style.verilog.21=fore:#7F0000
+style.verilog.22=fore:#00007F
+style.verilog.23=fore:#0000FF
+# port connection
+style.verilog.24=fore:#005032,bold
+
+# Turn on port styling features
+lexer.verilog.portstyling=1
+# Turn on treatment of all uppercase identifiers as user-defined keywords
+lexer.verilog.allupperkeywords=1
+
+# Support for colorizing inactive code due to preprocessor directives
+lexer.verilog.track.preprocessor=1
+lexer.verilog.update.preprocessor=1
+
+# Inactive states are 64 greater than their active counterparts
+
+# White space
+style.verilog.64=back:#E0E0E0,eolfilled
+style.verilog.65=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.66=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.67=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.68=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.69=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.70=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.71=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.72=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.73=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.74=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.75=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.76=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.83=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.84=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.85=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.86=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.87=back:#E0E0E0,eolfilled,fore:#808080,italics
+style.verilog.88=back:#E0E0E0,eolfilled,fore:#808080,italics
+
+# Braces are only matched in operator style
+braces.verilog.style=10
+
diff --git a/scite-app/scite/src/vhdl.properties b/scite-app/scite/src/vhdl.properties
new file mode 100644
index 0000000..bb43218
--- /dev/null
+++ b/scite-app/scite/src/vhdl.properties
@@ -0,0 +1,106 @@
+# Define SciTE settings for vhdl files.
+
+# VHDL files
+file.patterns.vhdl=*.vhd;*.vhdl
+filter.vhdl=VHDL (vhd vhdl)|$(file.patterns.vhdl)|
+
+*filter.vhdl=$(filter.vhdl)
+
+lexer.$(file.patterns.vhdl)=vhdl
+
+*language.vhdl=VHDL|vhd||
+
+word.chars.vhdl=$(chars.alpha)$(chars.numeric)_
+word.characters.$(file.patterns.vhdl)=$(word.chars.vhdl)
+
+#calltip.vhdl.word.characters=$(chars.alpha)$(chars.numeric)_
+
+comment.block.vhdl=--
+#comment.block.at.line.start.vhdl=1
+#comment.stream.start.vhdl=/*
+#comment.stream.end.vhdl=*/
+#comment.box.start.vhdl=/*
+#comment.box.middle.vhdl= *
+#comment.box.end.vhdl= */
+
+#~ fold.at.Begin=1
+#~ fold.at.Parenthese=1
+
+#statement.lookback.$(file.patterns.vhdl)=20
+#block.start.$(file.patterns.vhdl)=5 begin
+#block.end.$(file.patterns.vhdl)=5 end
+#statement.indent.$(file.patterns.vhdl)=5 always case casex casez else for if while \
+#module function task
+
+indent.maintain.$(file.patterns.vhdl)=1;
+
+
+keywords.$(file.patterns.vhdl)=access after alias all architecture array assert attribute begin block \
+body buffer bus case component configuration constant disconnect downto else elsif end entity exit file \
+for function generate generic group guarded if impure in inertial inout is label library linkage literal \
+loop map new next null of on open others out package port postponed procedure process pure range record \
+register reject report return select severity shared signal subtype then to transport type unaffected \
+units until use variable wait when while with
+
+keywords2.$(file.patterns.vhdl)=                                                                            \
+ abs and mod nand nor not or rem rol ror sla sll sra srl xnor xor
+
+keywords3.$(file.patterns.vhdl)=                                                                            \
+ left right low high ascending image value pos val succ pred leftof rightof base range reverse_range        \
+ length delayed stable quiet transaction event active last_event last_active last_value driving             \
+ driving_value simple_name path_name instance_name
+
+keywords4.$(file.patterns.vhdl)=                                                                            \
+ now readline read writeline write endfile resolved to_bit to_bitvector to_stdulogic to_stdlogicvector      \
+ to_stdulogicvector to_x01 to_x01z to_UX01 rising_edge falling_edge is_x shift_left shift_right rotate_left \
+ rotate_right resize to_integer to_unsigned to_signed std_match to_01
+
+keywords5.$(file.patterns.vhdl)=                                                                            \
+ std ieee work standard textio std_logic_1164 std_logic_arith std_logic_misc std_logic_signed               \
+ std_logic_textio std_logic_unsigned numeric_bit numeric_std math_complex math_real vital_primitives        \
+ vital_timing
+
+keywords6.$(file.patterns.vhdl)=                                                                            \
+ boolean bit character severity_level integer real time delay_length natural positive string bit_vector     \
+ file_open_kind file_open_status line text side width std_ulogic std_ulogic_vector std_logic                \
+ std_logic_vector X01 X01Z UX01 UX01Z unsigned signed
+
+# vhdl styles
+
+# Default
+style.vhdl.32=$(font.base)
+# White space
+style.vhdl.0=fore:#800080
+# Comment
+style.vhdl.1=$(colour.code.comment.line),$(font.code.comment.line)
+# Bang comment
+style.vhdl.2=fore:#3F7F3F,$(font.code.comment.line)
+# Number
+style.vhdl.3=$(colour.number)
+# Double quoted string
+style.vhdl.4=$(colour.string)
+# Operators
+style.vhdl.5=
+#style.vhdl.5=$(colour.operator)
+# Identifiers
+style.vhdl.6=
+# End of line where string is not closed
+style.vhdl.7=fore:#000000,$(font.string.literal),back:#E0C0E0,eolfilled
+# Keyword
+style.vhdl.8=$(colour.keyword)
+# Std operator
+style.vhdl.9=fore:#007F7F
+# Attribute
+style.vhdl.10=fore:#804020
+# Std Function
+style.vhdl.11=fore:#808020
+# Std Package
+style.vhdl.12=fore:#208020
+# Std Type
+style.vhdl.13=fore:#208080
+# User defined identifiers and tasks
+style.vhdl.14=fore:#804020,$(font.code.comment.doc)
+# Block comment
+style.vhdl.15=$(colour.code.comment.box),$(font.code.comment.box)
+# Braces are only matched in operator style
+braces.vhdl.style=5
diff --git a/scite-app/scite/src/visualprolog.properties b/scite-app/scite/src/visualprolog.properties
new file mode 100644
index 0000000..f835eae
--- /dev/null
+++ b/scite-app/scite/src/visualprolog.properties
@@ -0,0 +1,100 @@
+# Define SciTE settings for Visual Prolog source
+
+file.patterns.visualprolog=*.pro;*.cl;*.i;*.ph;*.pack
+file.patterns.visualprologgrammar=*.vipgrm
+file.patterns.visualprolog.like=$(file.patterns.visualprolog);$(file.patterns.visualprologgrammar)
+
+filter.visualprolog=Visual Prolog source|$(file.patterns.visualprolog.like)|
+
+*filter.visualprolog=$(filter.visualprolog)
+
+lexer.$(file.patterns.visualprolog.like)=visualprolog
+
+*language.visualprolog=Visual Prolog|visualprolog||
+
+# Visual Prolog
+# Major keywords
+keywords.$(file.patterns.visualprolog)=goal namespace interface \
+class implement open inherits supports resolve delegate monitor constants \
+domains predicates constructors properties clauses facts
+# Minor keywords
+keywords2.$(file.patterns.visualprolog)=guard language stdcall apicall c thiscall prolog \
+digits if then elseif else foreach do try catch finally erroneous failure procedure determ \
+multi nondeterm anyflow and or externally from div mod rem quot in orelse otherwise
+# Directive keywords
+keywords3.$(file.patterns.visualprolog)=include bininclude requires orrequires if then \
+else elseif endif error message export externally options
+
+# Visual Prolog Grammar files
+# Major keywords
+keywords.$(file.patterns.visualprologgrammar)=namespace open grammar terminals nonterminals startsymbols precedence rules
+# Minor keywords
+keywords2.$(file.patterns.visualprologgrammar)=left right nonassoc
+# Directive keywords
+keywords3.$(file.patterns.visualprologgrammar)=
+
+# Shared
+# Doc keywords
+keywords4.$(file.patterns.visualprolog.like)=short detail end exception withdomain
+
+word.chars.visualprolog=$(chars.alpha)$(chars.numeric)_
+word.characters.$(file.patterns.visualprolog.like)=$(word.chars.visualprolog)
+comment.block.visualprolog=%
+comment.stream.start.visualprolog=/*
+comment.stream.end.visualprolog=*/
+
+statement.indent.$(file.patterns.visualprolog)=2 do then :-
+statement.$(file.patterns.visualprolog)=1 . end
+statement.lookback.$(file.visualprolog)=20
+
+# Visual Prolog styles
+# Default
+style.visualprolog.32=$(font.base)
+# White space
+style.visualprolog.0=fore:#808080
+# Keyword major
+style.visualprolog.1=fore:#808000,$(font.keyword)
+# Keyword minor
+style.visualprolog.2=fore:#333399,$(font.keyword)
+# Keyword directive
+style.visualprolog.3=fore:#800080,$(font.keyword)
+# Comment block
+style.visualprolog.4=fore:#808080,$(font.code.comment.box)
+# Comment line
+style.visualprolog.5=$(style.visualprolog.4)
+# Comment key
+style.visualprolog.6=fore:#8050A0,$(font.code.comment.doc)
+# Comment key error
+style.visualprolog.7=$(style.visualprolog.4),$(font.code.comment.box)
+# Identifier
+style.visualprolog.8=fore:#000000,$(font.identifier)
+# Variable
+style.visualprolog.9=fore:#008000,$(font.identifier)
+# Anonymous
+style.visualprolog.10=fore:#A0C0A0,$(font.identifier)
+# Number
+style.visualprolog.11=fore:#0000C0,$(font.number)
+# Operator
+style.visualprolog.12=fore:#A00000,$(font.operator)
+# Character styles are not used any more
+# style.visualprolog.13=<<unused>>
+# style.visualprolog.14=<<unused>>
+# style.visualprolog.15=<<unused>>
+# String
+style.visualprolog.16=fore:#3898B2,$(font.string.literal)
+# String escape
+style.visualprolog.17=fore:#F07000,$(font.string.literal)
+# String escape error
+style.visualprolog.18=fore:#FFFFFF,back:#FF4040,$(font.error)
+# String EOL open
+style.visualprolog.19=$(style.visualprolog.18)
+# String verbatim
+style.visualprolog.20=fore:#8064A2,$(font.string.literal)
+# String verbatim special
+style.visualprolog.21=$(style.visualprolog.14)
+# String verbatim EOL
+style.visualprolog.22=back:#0xFFB060,$(font.string.literal)
+
+# Braces are only matched in operator style
+braces.visualprolog.style=12
+
diff --git a/scite-app/scite/src/yaml.properties b/scite-app/scite/src/yaml.properties
new file mode 100644
index 0000000..a1568a0
--- /dev/null
+++ b/scite-app/scite/src/yaml.properties
@@ -0,0 +1,41 @@
+# Define SciTE settings for YAML files.
+
+# associate YAML file patter with the YAML lexer
+file.patterns.yaml=*.yaml;*.yml;*.clang-format;*.clang-tidy;*.mir;*.apinotes;*.ifs
+filter.yaml=YAML (yaml)|$(file.patterns.yaml)|
+*filter.yaml=$(filter.yaml)
+lexer.$(file.patterns.yaml)=yaml
+*language.yaml=YAML|yaml||
+
+# YAML requires spaces for tabs
+tabsize.$(file.patterns.yaml)=2
+indent.size.$(file.patterns.yaml)=2
+use.tabs.$(file.patterns.yaml)=0
+
+# YAML comment character
+comment.block.yaml=#~
+
+# YAML convertible values
+keywords.$(file.patterns.yaml)=true false yes no
+
+# YAML font styles
+# default
+style.yaml.0=$(font.text),fore:#000000
+# comment line
+style.yaml.1=$(font.comment),fore:#008800
+# value identifier
+style.yaml.2=$(font.base),fore:#000088,bold
+# keyword value
+style.yaml.3=$(font.base),fore:#880088
+# numerical value
+style.yaml.4=$(font.base),fore:#880000
+# reference/repeating value
+style.yaml.5=$(font.base),fore:#008888
+# document delimiting line
+style.yaml.6=$(font.comment),fore:#FFFFFF,bold,back:#000088,eolfilled
+# text block marker
+style.yaml.7=$(font.text),fore:#333366
+# syntax error marker
+style.yaml.8=$(font.text),fore:#FFFFFF,italics,bold,back:#FF0000,eolfilled
+# operator
+style.yaml.9=$(colour.operator)
diff --git a/scite-app/scite/tgzgscite b/scite-app/scite/tgzgscite
new file mode 100644
index 0000000..9373dd0
--- /dev/null
+++ b/scite-app/scite/tgzgscite
@@ -0,0 +1,17 @@
+cd ..
+rm -f gscite.tgz
+mkdir gscite
+cp scite/*.txt gscite
+cp scite/bin/SciTE gscite
+cp scite/bin/*.so gscite
+strip gscite/SciTE
+cp scite/src/*.properties gscite
+rm -f gscite/Embedded.properties
+cp scite/doc/*.html gscite
+cp scite/doc/*.png gscite
+cp scite/gtk/*.png gscite
+cp scite/doc/*.jpg gscite
+cp scite/doc/*.1 gscite
+tar --create gscite/* | gzip -c >gscite.tgz
+rm -f gscite/*
+rmdir gscite
diff --git a/scite-app/scite/tgzsrc b/scite-app/scite/tgzsrc
new file mode 100644
index 0000000..1c99c8b
--- /dev/null
+++ b/scite-app/scite/tgzsrc
@@ -0,0 +1,6 @@
+cd ..
+rm -f scite.tgz
+rm -f scite/bin/*.properties
+tar --create --exclude=*.o --exclude=*.obj --exclude=*.dll --exclude=*.so --exclude=*.exe --exclude=*.a --exclude=SciTE \
+	lexilla/* scintilla/* scite/* \
+	| gzip -c >scite.tgz
diff --git a/scite-app/scite/upxsc1.bat b/scite-app/scite/upxsc1.bat
new file mode 100755
index 0000000..f314e15
--- /dev/null
+++ b/scite-app/scite/upxsc1.bat
@@ -0,0 +1,2 @@
+del/q ..\Sc1.exe
+upx --best --force -o ..\Sc1.exe bin\Sc1.exe
diff --git a/scite-app/scite/version.txt b/scite-app/scite/version.txt
new file mode 100644
index 0000000..07bfe61
--- /dev/null
+++ b/scite-app/scite/version.txt
@@ -0,0 +1 @@
+511
diff --git a/scite-app/scite/win32/AppDepGen.py b/scite-app/scite/win32/AppDepGen.py
new file mode 100644
index 0000000..0a3a5c8
--- /dev/null
+++ b/scite-app/scite/win32/AppDepGen.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+# AppDepGen.py - produce a make dependencies file for SciTE
+# Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# Requires Python 3.6 or later
+
+import sys
+
+srcRoot = "../.."
+
+sys.path.append(srcRoot + "/scintilla")
+
+from scripts import Dependencies
+
+topComment = "# Created by AppDepGen.py. To recreate, run AppDepGen.py.\n"
+
+def Generate():
+	sciteSources = ["../src/*.cxx", "../lua/src/*.c", "../../lexilla/access/*.cxx", "../../scintilla/call/*.cxx"]
+	sciteIncludes = ["../../lexilla/include", "../../lexilla/access", "../../scintilla/include", "../src", "../lua/src"]
+
+	# Header magically injected into Lua builds on Win32 to make Unicode file names work
+	luaSubsts = { "LUA_USER_H": "scite_lua_win.h"}
+
+	# Create the dependencies file for g++
+	deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sciteSources,  ["../win32"] + sciteIncludes, ".o", "../win32/", luaSubsts)
+
+	# Add Sc1 as the same as SciTEWin
+	deps = Dependencies.InsertSynonym(deps, "SciTEWin.o", "Sc1.o")
+
+	Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment)
+
+	# Create the dependencies file for MSVC
+
+	# Change extension from ".o" to ".obj"
+	deps = [[Dependencies.PathStem(obj)+".obj", headers] for obj, headers in deps]
+
+	Dependencies.UpdateDependencies("../win32/nmdeps.mak", deps, topComment)
+
+if __name__ == "__main__":
+	Generate()
\ No newline at end of file
diff --git a/scite-app/scite/win32/DLLFunction.h b/scite-app/scite/win32/DLLFunction.h
new file mode 100644
index 0000000..aea7d3c
--- /dev/null
+++ b/scite-app/scite/win32/DLLFunction.h
@@ -0,0 +1,31 @@
+// SciTE - Scintilla based Text Editor
+/** @file DLLFunction.h
+ ** Templates to load functions from DLLs.
+ **/
+// Copyright 2020 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DLLFUNCTION_H
+#define DLLFUNCTION_H
+
+/// Find a function in a DLL and convert to a function pointer.
+/// This avoids undefined and conditionally defined behaviour.
+template<typename T>
+T DLLFunction(HMODULE hModule, LPCSTR lpProcName) noexcept {
+	if (!hModule) {
+		return nullptr;
+	}
+	FARPROC function = ::GetProcAddress(hModule, lpProcName);
+	static_assert(sizeof(T) == sizeof(function));
+	T fp;
+	memcpy(&fp, &function, sizeof(T));
+	return fp;
+}
+
+/// Find a function in an already loaded DLL and convert to a function pointer.
+template<typename T>
+T DLLFunction(LPCWSTR lpModuleName, LPCSTR lpProcName) noexcept {
+	return DLLFunction<T>(::GetModuleHandleW(lpModuleName), lpProcName);
+}
+
+#endif
diff --git a/scite-app/scite/win32/DirectorExtension.cxx b/scite-app/scite/win32/DirectorExtension.cxx
new file mode 100644
index 0000000..6f07ca7
--- /dev/null
+++ b/scite-app/scite/win32/DirectorExtension.cxx
@@ -0,0 +1,326 @@
+// SciTE - Scintilla based Text Editor
+/** @file DirectorExtension.cxx
+ ** Extension for communicating with a director program.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstdio>
+#include <ctime>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+#include <set>
+#include <memory>
+#include <chrono>
+#include <atomic>
+#include <mutex>
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT  0x0602
+#include <windows.h>
+#include <commctrl.h>
+
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaCall.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+#include "DirectorExtension.h"
+
+static HWND wDirector {};
+static HWND wCorrespondent {};
+static HWND wReceiver {};
+static bool startedByDirector = false;
+static bool shuttingDown = false;
+unsigned int SDI = 0;
+
+static bool HasConnection() noexcept {
+	return wDirector || wCorrespondent;
+}
+
+static void SendDirector(const char *verb, const char *arg = nullptr) {
+	if (HasConnection()) {
+		HWND wDestination = wCorrespondent;
+		std::string addressedMessage;
+		if (wDestination) {
+			addressedMessage += ":";
+			std::string address = StdStringFromSizeT(reinterpret_cast<size_t>(wDestination));
+			addressedMessage += address;
+			addressedMessage += ":";
+		} else {
+			wDestination = wDirector;
+		}
+		addressedMessage += verb;
+		addressedMessage += ":";
+		if (arg)
+			addressedMessage += arg;
+		std::string slashedMessage = Slash(addressedMessage, false);
+		COPYDATASTRUCT cds;
+		cds.dwData = 0;
+		cds.cbData = static_cast<DWORD>(slashedMessage.length());
+		slashedMessage.append(1, '\0');	// Ensure NUL at end of string
+		cds.lpData = &slashedMessage[0];
+		::SendMessage(wDestination, WM_COPYDATA,
+			      reinterpret_cast<WPARAM>(wReceiver),
+			      reinterpret_cast<LPARAM>(&cds));
+	}
+}
+
+static void SendDirectorInteger(const char *verb, intptr_t arg) {
+	std::string s = std::to_string(arg);
+	::SendDirector(verb, s.c_str());
+}
+
+static HWND HwndFromString(const char *s) noexcept {
+	return reinterpret_cast<HWND>(static_cast<uintptr_t>(atoll(s)));
+}
+
+static void CheckEnvironment(ExtensionAPI *phost) {
+	if (phost && !shuttingDown) {
+		if (!wDirector) {
+			std::string director = phost->Property("director.hwnd");
+			if (director.length() > 0) {
+				startedByDirector = true;
+				wDirector = HwndFromString(director.c_str());
+				// Director is just seen so identify this to it
+				::SendDirectorInteger("identity", reinterpret_cast<intptr_t>(wReceiver));
+			}
+		}
+		std::string sReceiver = StdStringFromSizeT(reinterpret_cast<size_t>(wReceiver));
+		phost->SetProperty("WindowID", sReceiver.c_str());
+	}
+}
+
+static TCHAR DirectorExtension_ClassName[] = TEXT("DirectorExtension");
+
+static LRESULT HandleCopyData(LPARAM lParam) {
+	const COPYDATASTRUCT *pcds = reinterpret_cast<COPYDATASTRUCT *>(lParam);
+	// Copy into an temporary buffer to ensure \0 terminated
+	if (pcds->lpData) {
+		std::string dataCopy(static_cast<const char *>(pcds->lpData), pcds->cbData);
+		DirectorExtension::Instance().HandleStringMessage(dataCopy.c_str());
+	}
+	return 0;
+}
+
+LRESULT PASCAL DirectorExtension_WndProc(
+	HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	if (iMessage == WM_COPYDATA) {
+		return HandleCopyData(lParam);
+	} else if (iMessage == SDI) {
+		return SDI;
+	}
+	return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+}
+
+static void DirectorExtension_Register(HINSTANCE hInstance) noexcept {
+	WNDCLASS wndclass;
+	wndclass.style = 0;
+	wndclass.lpfnWndProc = DirectorExtension_WndProc;
+	wndclass.cbClsExtra = 0;
+	wndclass.cbWndExtra = 0;
+	wndclass.hInstance = hInstance;
+	wndclass.hIcon = {};
+	wndclass.hCursor = {};
+	wndclass.hbrBackground = {};
+	wndclass.lpszMenuName = nullptr;
+	wndclass.lpszClassName = DirectorExtension_ClassName;
+	if (!::RegisterClass(&wndclass))
+		::exit(FALSE);
+}
+
+DirectorExtension &DirectorExtension::Instance() {
+	static DirectorExtension singleton;
+	return singleton;
+}
+
+bool DirectorExtension::Initialise(ExtensionAPI *host_) {
+	host = host_;
+	SDI = ::RegisterWindowMessage(TEXT("SciTEDirectorInterface"));
+	HINSTANCE hInstance = reinterpret_cast<HINSTANCE>(
+				      host->GetInstance());
+	DirectorExtension_Register(hInstance);
+	wReceiver = ::CreateWindow(
+			    DirectorExtension_ClassName,
+			    DirectorExtension_ClassName,
+			    0,
+			    0, 0, 0, 0,
+			    0,
+			    0,
+			    hInstance,
+			    nullptr);
+	if (!wReceiver)
+		::exit(FALSE);
+	// Make the frame window handle available so the director can activate it.
+	const SciTEBase *hostSciTE = dynamic_cast<SciTEBase *>(host);
+	if (!hostSciTE) {
+		::exit(FALSE);
+	}
+	::SetWindowLongPtr(wReceiver, GWLP_USERDATA,
+			   reinterpret_cast<LONG_PTR>(hostSciTE->GetID()));
+	CheckEnvironment(host);
+	return true;
+}
+
+bool DirectorExtension::Finalise() noexcept {
+	try {
+		::SendDirector("closing");
+	} catch (...) {
+		// Shutting down so continue even if unable to send message to director.
+	}
+	if (wReceiver)
+		::DestroyWindow(wReceiver);
+	wReceiver = {};
+	return true;
+}
+
+bool DirectorExtension::Clear() {
+	return false;
+}
+
+bool DirectorExtension::Load(const char *) {
+	return false;
+}
+
+bool DirectorExtension::OnOpen(const char *path) {
+	CheckEnvironment(host);
+	if (*path) {
+		::SendDirector("opened", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnSwitchFile(const char *path) {
+	CheckEnvironment(host);
+	if (*path) {
+		::SendDirector("switched", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnSave(const char *path) {
+	CheckEnvironment(host);
+	if (*path) {
+		::SendDirector("saved", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::OnClose(const char *path) {
+	CheckEnvironment(host);
+	if (*path) {
+		::SendDirector("closed", path);
+	}
+	return false;
+}
+
+bool DirectorExtension::NeedsOnClose() {
+	CheckEnvironment(host);
+	return HasConnection();
+}
+
+bool DirectorExtension::OnChar(char) {
+	return false;
+}
+
+bool DirectorExtension::OnExecute(const char *cmd) {
+	CheckEnvironment(host);
+	::SendDirector("macro:run", cmd);
+	return false;
+}
+
+bool DirectorExtension::OnSavePointReached() {
+	return false;
+}
+
+bool DirectorExtension::OnSavePointLeft() {
+	return false;
+}
+
+bool DirectorExtension::OnStyle(SA::Position, SA::Position, int, StyleWriter *) {
+	return false;
+}
+
+// These should probably have arguments
+
+bool DirectorExtension::OnDoubleClick() {
+	return false;
+}
+
+bool DirectorExtension::OnUpdateUI() {
+	return false;
+}
+
+bool DirectorExtension::OnMarginClick() {
+	return false;
+}
+
+bool DirectorExtension::OnMacro(const char *command, const char *params) {
+	SendDirector(command, params);
+	return false;
+}
+
+bool DirectorExtension::SendProperty(const char *prop) {
+	CheckEnvironment(host);
+	if (*prop) {
+		::SendDirector("property", prop);
+	}
+	return false;
+}
+
+void DirectorExtension::HandleStringMessage(const char *message) {
+	// Message may contain multiple commands separated by '\n'
+	// Reentrance trouble - if this function is reentered, the wCorrespondent may
+	// be set to zero before time.
+	StringList wlMessage(true);
+	wlMessage.Set(message);
+	for (size_t i = 0; i < wlMessage.Length(); i++) {
+		// Message format is [:return address:]command:argument
+		char *cmd = wlMessage[i];
+		if (*cmd == ':') {
+			// There is a return address
+			char *colon = strchr(cmd + 1, ':');
+			if (colon) {
+				*colon = '\0';
+				wCorrespondent = HwndFromString(cmd + 1);
+				cmd = colon + 1;
+			}
+		}
+		if (isprefix(cmd, "identity:")) {
+			const char *arg = strchr(cmd, ':');
+			if (arg)
+				wDirector = HwndFromString(arg + 1);
+		} else if (isprefix(cmd, "closing:")) {
+			wDirector = {};
+			if (startedByDirector) {
+				shuttingDown = true;
+				if (host) {
+					host->ShutDown();
+				}
+				shuttingDown = false;
+			}
+		} else if (host) {
+			host->Perform(cmd);
+		}
+		wCorrespondent = {};
+	}
+}
diff --git a/scite-app/scite/win32/DirectorExtension.h b/scite-app/scite/win32/DirectorExtension.h
new file mode 100644
index 0000000..a1c87de
--- /dev/null
+++ b/scite-app/scite/win32/DirectorExtension.h
@@ -0,0 +1,49 @@
+// SciTE - Scintilla based Text Editor
+/** @file DirectorExtension.h
+ ** Extension for communicating with a director program.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef DIRECTOREXTENSION_H
+#define DIRECTOREXTENSION_H
+
+class DirectorExtension : public Extension {
+private:
+	ExtensionAPI *host {};
+	DirectorExtension() {} // Singleton
+	// Deleted so DirectorExtension objects can not be copied.
+	DirectorExtension(const DirectorExtension &) = delete;
+	void operator=(const DirectorExtension &) = delete;
+
+public:
+	static DirectorExtension &Instance();
+
+	// Implement the Extension interface
+	bool Initialise(ExtensionAPI *host_) override;
+	bool Finalise() noexcept override;
+	bool Clear() override;
+	bool Load(const char *filename) override;
+
+	bool OnOpen(const char *path) override;
+	bool OnSwitchFile(const char *path) override;
+	bool OnSave(const char *path) override;
+	bool OnChar(char ch) override;
+	bool OnExecute(const char *cmd) override;
+	bool OnSavePointReached() override;
+	bool OnSavePointLeft() override;
+	bool OnStyle(Scintilla::Position startPos, Scintilla::Position lengthDoc, int initStyle, StyleWriter *styler) override;
+	bool OnDoubleClick() override;
+	bool OnUpdateUI() override;
+	bool OnMarginClick() override;
+	bool OnMacro(const char *command, const char *params) override;
+
+	bool SendProperty(const char *prop) override;
+	bool OnClose(const char *path) override;
+	bool NeedsOnClose() override;
+
+	// Allow messages through to extension
+	void HandleStringMessage(const char *message);
+};
+
+#endif
diff --git a/scite-app/scite/win32/DragDrop.cur b/scite-app/scite/win32/DragDrop.cur
new file mode 100644
index 0000000..c5f1907
Binary files /dev/null and b/scite-app/scite/win32/DragDrop.cur differ
diff --git a/scite-app/scite/win32/GUIWin.cxx b/scite-app/scite/win32/GUIWin.cxx
new file mode 100644
index 0000000..d86e8d5
--- /dev/null
+++ b/scite-app/scite/win32/GUIWin.cxx
@@ -0,0 +1,291 @@
+// SciTE - Scintilla based Text Editor
+/** @file GUIWin.cxx
+ ** Interface to platform GUI facilities.
+ ** Split off from Scintilla's Platform.h to avoid SciTE depending on implementation of Scintilla.
+ **/
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstdio>
+#include <ctime>
+
+#include <string>
+#include <vector>
+#include <chrono>
+#include <sstream>
+
+#ifdef __MINGW_H
+#define _WIN32_IE	0x0400
+#endif
+
+#undef _WIN32_WINNT
+#define _WIN32_WINNT  0x0602
+#include <windows.h>
+
+#include "ScintillaTypes.h"
+#include "GUI.h"
+
+namespace GUI {
+
+enum { SURROGATE_LEAD_FIRST = 0xD800 };
+enum { SURROGATE_TRAIL_FIRST = 0xDC00 };
+enum { SURROGATE_TRAIL_LAST = 0xDFFF };
+
+static unsigned int UTF8Length(const wchar_t *uptr, size_t tlen) noexcept {
+	unsigned int len = 0;
+	for (size_t i = 0; i < tlen && uptr[i];) {
+		const unsigned int uch = uptr[i];
+		if (uch < 0x80) {
+			len++;
+		} else if (uch < 0x800) {
+			len += 2;
+		} else if ((uch >= SURROGATE_LEAD_FIRST) &&
+				(uch <= SURROGATE_TRAIL_LAST)) {
+			len += 4;
+			i++;
+		} else {
+			len += 3;
+		}
+		i++;
+	}
+	return len;
+}
+
+static void UTF8FromUTF16(const wchar_t *uptr, size_t tlen, char *putf) noexcept {
+	int k = 0;
+	for (size_t i = 0; i < tlen && uptr[i];) {
+		const unsigned int uch = uptr[i];
+		if (uch < 0x80) {
+			putf[k++] = static_cast<char>(uch);
+		} else if (uch < 0x800) {
+			putf[k++] = static_cast<char>(0xC0 | (uch >> 6));
+			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+		} else if ((uch >= SURROGATE_LEAD_FIRST) &&
+				(uch <= SURROGATE_TRAIL_LAST)) {
+			// Half a surrogate pair
+			i++;
+			const unsigned int xch = 0x10000 + ((uch & 0x3ff) << 10) + (uptr[i] & 0x3ff);
+			putf[k++] = static_cast<char>(0xF0 | (xch >> 18));
+			putf[k++] = static_cast<char>(0x80 | ((xch >> 12) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | ((xch >> 6) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | (xch & 0x3f));
+		} else {
+			putf[k++] = static_cast<char>(0xE0 | (uch >> 12));
+			putf[k++] = static_cast<char>(0x80 | ((uch >> 6) & 0x3f));
+			putf[k++] = static_cast<char>(0x80 | (uch & 0x3f));
+		}
+		i++;
+	}
+}
+
+static size_t UTF16Length(const char *s, size_t len) noexcept {
+	size_t ulen = 0;
+	size_t charLen;
+	for (size_t i=0; i<len;) {
+		const unsigned char ch = static_cast<unsigned char>(s[i]);
+		if (ch < 0x80) {
+			charLen = 1;
+		} else if (ch < 0x80 + 0x40 + 0x20) {
+			charLen = 2;
+		} else if (ch < 0x80 + 0x40 + 0x20 + 0x10) {
+			charLen = 3;
+		} else {
+			charLen = 4;
+			ulen++;
+		}
+		i += charLen;
+		ulen++;
+	}
+	return ulen;
+}
+
+static size_t UTF16FromUTF8(const char *s, size_t len, gui_char *tbuf, size_t tlen) noexcept {
+	size_t ui=0;
+	const unsigned char *us = reinterpret_cast<const unsigned char *>(s);
+	size_t i=0;
+	while ((i<len) && (ui<tlen)) {
+		unsigned char ch = us[i++];
+		if (ch < 0x80) {
+			tbuf[ui] = ch;
+		} else if (ch < 0x80 + 0x40 + 0x20) {
+			tbuf[ui] = static_cast<wchar_t>((ch & 0x1F) << 6);
+			ch = us[i++];
+			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + (ch & 0x7F));
+		} else if (ch < 0x80 + 0x40 + 0x20 + 0x10) {
+			tbuf[ui] = static_cast<wchar_t>((ch & 0xF) << 12);
+			ch = us[i++];
+			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + ((ch & 0x7F) << 6));
+			ch = us[i++];
+			tbuf[ui] = static_cast<wchar_t>(tbuf[ui] + (ch & 0x7F));
+		} else {
+			// Outside the BMP so need two surrogates
+			int val = (ch & 0x7) << 18;
+			ch = us[i++];
+			val += (ch & 0x3F) << 12;
+			ch = us[i++];
+			val += (ch & 0x3F) << 6;
+			ch = us[i++];
+			val += (ch & 0x3F);
+			tbuf[ui] = static_cast<wchar_t>(((val - 0x10000) >> 10) + SURROGATE_LEAD_FIRST);
+			ui++;
+			tbuf[ui] = static_cast<wchar_t>((val & 0x3ff) + SURROGATE_TRAIL_FIRST);
+		}
+		ui++;
+	}
+	return ui;
+}
+
+gui_string StringFromUTF8(const char *s) {
+	if (!s || !*s) {
+		return gui_string();
+	}
+	const size_t sLen = strlen(s);
+	const size_t wideLen = UTF16Length(s, sLen);
+	gui_string us(wideLen, 0);
+	UTF16FromUTF8(s, sLen, us.data(), wideLen);
+	return us;
+}
+
+gui_string StringFromUTF8(const std::string &s) {
+	if (s.empty()) {
+		return gui_string();
+	}
+	const size_t sLen = s.length();
+	const size_t wideLen = UTF16Length(s.c_str(), sLen);
+	gui_string us(wideLen, 0);
+	UTF16FromUTF8(s.c_str(), sLen, us.data(), wideLen);
+	return us;
+}
+
+std::string UTF8FromString(const gui_string &s) {
+	if (s.empty()) {
+		return std::string();
+	}
+	const size_t sLen = s.size();
+	const size_t narrowLen = UTF8Length(s.c_str(), sLen);
+	std::string us(narrowLen, 0);
+	UTF8FromUTF16(s.c_str(), sLen, us.data());
+	return us;
+}
+
+gui_string StringFromInteger(long i) {
+	return std::to_wstring(i);
+}
+
+gui_string StringFromLongLong(long long i) {
+	return std::to_wstring(i);
+}
+
+gui_string HexStringFromInteger(long i) {
+	char number[32];
+	sprintf(number, "%0lx", i);
+	gui_char gnumber[32] {};
+	size_t n = 0;
+	while (number[n]) {
+		gnumber[n] = static_cast<gui_char>(number[n]);
+		n++;
+	}
+	gnumber[n] = 0;
+	return gui_string(gnumber);
+}
+
+std::string LowerCaseUTF8(std::string_view sv) {
+	if (sv.empty()) {
+		return std::string();
+	}
+	const std::string s(sv);
+	const gui_string gs = StringFromUTF8(s);
+	const int chars = ::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, gs.c_str(), static_cast<int>(gs.size()), nullptr, 0);
+	gui_string lc(chars, L'\0');
+	::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, gs.c_str(), static_cast<int>(gs.size()), lc.data(), chars);
+	return UTF8FromString(lc);
+}
+
+void Window::Destroy() {
+	if (wid)
+		::DestroyWindow(static_cast<HWND>(wid));
+	wid = {};
+}
+
+bool Window::HasFocus() {
+	return ::GetFocus() == wid;
+}
+
+Rectangle Window::GetPosition() {
+	RECT rc;
+	::GetWindowRect(static_cast<HWND>(wid), &rc);
+	return Rectangle(rc.left, rc.top, rc.right, rc.bottom);
+}
+
+void Window::SetPosition(Rectangle rc) {
+	::SetWindowPos(static_cast<HWND>(wid),
+		       0, rc.left, rc.top, rc.Width(), rc.Height(), SWP_NOZORDER|SWP_NOACTIVATE);
+}
+
+Rectangle Window::GetClientPosition() {
+	RECT rc= {0, 0, 0, 0};
+	if (wid)
+		::GetClientRect(static_cast<HWND>(wid), &rc);
+	return  Rectangle(rc.left, rc.top, rc.right, rc.bottom);
+}
+
+void Window::Show(bool show) {
+	if (show)
+		::ShowWindow(static_cast<HWND>(wid), SW_SHOWNOACTIVATE);
+	else
+		::ShowWindow(static_cast<HWND>(wid), SW_HIDE);
+}
+
+void Window::InvalidateAll() {
+	::InvalidateRect(static_cast<HWND>(wid), nullptr, FALSE);
+}
+
+void Window::SetTitle(const gui_char *s) {
+	::SetWindowTextW(static_cast<HWND>(wid), s);
+}
+
+void Window::SetRedraw(bool redraw) {
+	::SendMessage(static_cast<HWND>(GetID()), WM_SETREDRAW, redraw, 0);
+	if (redraw) {
+		::RedrawWindow(static_cast<HWND>(GetID()), nullptr, {},
+			RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
+	}
+}
+
+void Menu::CreatePopUp() {
+	Destroy();
+	mid = ::CreatePopupMenu();
+}
+
+void Menu::Destroy() noexcept {
+	if (mid)
+		::DestroyMenu(static_cast<HMENU>(mid));
+	mid = {};
+}
+
+void Menu::Show(Point pt, Window &w) {
+	::TrackPopupMenu(static_cast<HMENU>(mid),
+			 TPM_RIGHTBUTTON, pt.x - 4, pt.y, 0,
+			 static_cast<HWND>(w.GetID()), nullptr);
+	Destroy();
+}
+
+intptr_t ScintillaPrimitive::Send(unsigned int msg, uintptr_t wParam, intptr_t lParam) {
+	return ::SendMessage(static_cast<HWND>(GetID()), msg, wParam, lParam);
+}
+
+bool IsDBCSLeadByte(int codePage, char ch) {
+	if (Scintilla::CpUtf8 == codePage)
+		// For lexing, all characters >= 0x80 are treated the
+		// same so none is considered a lead byte.
+		return false;
+	else
+		return ::IsDBCSLeadByteEx(codePage, ch) != 0;
+}
+
+void SleepMilliseconds(int sleepTime) {
+	::Sleep(sleepTime);
+}
+
+}
diff --git a/scite-app/scite/win32/SciBall.ico b/scite-app/scite/win32/SciBall.ico
new file mode 100644
index 0000000..28b4ff4
Binary files /dev/null and b/scite-app/scite/win32/SciBall.ico differ
diff --git a/scite-app/scite/win32/SciTE.exe.manifest b/scite-app/scite/win32/SciTE.exe.manifest
new file mode 100644
index 0000000..536068f
--- /dev/null
+++ b/scite-app/scite/win32/SciTE.exe.manifest
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+                 manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="*"
+    name="Scintilla.SciTE.SciTE"
+    type="win32"
+/>
+<description>SciTE</description>
+<asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+        <dpiAware>true</dpiAware>
+        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+</asmv3:application>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+<!-- Identify the application security requirements. -->
+<!-- level can be "asInvoker", "highestAvailable", or "requireAdministrator" -->
+   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+      <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+   </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> <!-- Vista -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- 7 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- 8 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- 8.1 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- 10 -->
+        </application>
+    </compatibility>
+</assembly>
diff --git a/scite-app/scite/win32/SciTE.vcxproj b/scite-app/scite/win32/SciTE.vcxproj
new file mode 100644
index 0000000..4d3b4fd
--- /dev/null
+++ b/scite-app/scite/win32/SciTE.vcxproj
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5641EA06-A73C-4297-B287-48B40850C708}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STATIC_BUILD;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;LUA_USER_H="scite_lua_win.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src;..\lua\src;..\..\lexilla\include;..\..\lexilla\access;..\..\lexilla\lexlib;..\..\scintilla\include;..\..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <BrowseInformation>true</BrowseInformation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DisableSpecificWarnings>4702;4324</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>gdi32.lib;msimg32.lib;comdlg32.lib;comctl32.lib;advapi32.lib;imm32.lib;shell32.lib;ole32.lib;oleaut32.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <CETCompat>true</CETCompat>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\src;..\..\Scintilla\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Culture>0x0c09</Culture>
+      <PreprocessorDefinitions>STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link />
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+      <MinimumRequiredVersion>10.00</MinimumRequiredVersion>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+      <MinimumRequiredVersion>
+      </MinimumRequiredVersion>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalManifestDependencies>type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'</AdditionalManifestDependencies>
+      <MinimumRequiredVersion>10.00</MinimumRequiredVersion>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\lexilla\lexlib\Accessor.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\CharacterCategory.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\CharacterSet.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\DefaultLexer.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\LexAccessor.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\LexerBase.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\LexerModule.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\LexerNoExceptions.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\LexerSimple.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\PropSetSimple.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\StyleContext.cxx" />
+    <ClCompile Include="..\..\lexilla\lexlib\WordList.cxx" />
+    <ClCompile Include="..\..\lexilla\lexers\*.cxx" />
+    <ClCompile Include="..\..\lexilla\access\LexillaAccess.cxx" />
+    <ClCompile Include="..\..\lexilla\src\Lexilla.cxx" />
+    <ClCompile Include="..\..\scintilla\src\*.cxx" />
+    <ClCompile Include="..\..\scintilla\call\ScintillaCall.cxx" />
+    <ClCompile Include="..\..\scintilla\win32\HanjaDic.cxx" />
+    <ClCompile Include="..\..\scintilla\win32\PlatWin.cxx" />
+    <ClCompile Include="..\..\scintilla\win32\ScintillaWin.cxx" />
+    <ClCompile Include="..\src\*.cxx" />
+    <ClCompile Include="..\win32\*.cxx" />
+    <ClCompile Include="..\lua\src\*.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\lexilla\include\*.h" />
+    <ClInclude Include="..\..\lexilla\lexlib\*.h" />
+    <ClInclude Include="..\..\scintilla\include\*.h" />
+    <ClInclude Include="..\..\scintilla\src\*.h" />
+    <ClInclude Include="..\..\scintilla\win32\*.h" />
+    <ClInclude Include="..\src\*.h" />
+    <ClInclude Include="..\win32\*.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\win32\SciTERes.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Win32\SciBall.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="SciTE.exe.manifest" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scite-app/scite/win32/SciTERes.rc b/scite-app/scite/win32/SciTERes.rc
new file mode 100644
index 0000000..a2f78e3
--- /dev/null
+++ b/scite-app/scite/win32/SciTERes.rc
@@ -0,0 +1,634 @@
+// Resource file for SciTE
+// Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <windows.h>
+
+#include "SciTE.h"
+
+SciTE ICON SciBall.ico
+
+1 RT_MANIFEST SciTE.exe.manifest
+
+SciTE MENU
+BEGIN
+
+POPUP "&File"
+BEGIN
+	MENUITEM "&New\tCtrl+N",		IDM_NEW
+	MENUITEM "&Open...\tCtrl+O",		IDM_OPEN
+	MENUITEM "Open Selected &Filename\tCtrl+Shift+O",	IDM_OPENSELECTED
+	MENUITEM "&Revert\tCtrl+R",		IDM_REVERT
+	MENUITEM "&Close\tCtrl+W",		IDM_CLOSE
+	MENUITEM "&Save\tCtrl+S",		IDM_SAVE
+	MENUITEM "Save &As...\tCtrl+Shift+S",	IDM_SAVEAS
+	MENUITEM "Save a Cop&y...\tCtrl+Shift+P",	IDM_SAVEACOPY
+	MENUITEM "Copy Pat&h",			IDM_COPYPATH
+	POPUP "Encodin&g"
+	BEGIN
+		MENUITEM "&Code Page Property",		IDM_ENCODING_DEFAULT
+		MENUITEM "UTF-16 &Big Endian",		IDM_ENCODING_UCS2BE
+		MENUITEM "UTF-16 &Little Endian",	IDM_ENCODING_UCS2LE
+		MENUITEM "UTF-8 &with BOM",		IDM_ENCODING_UTF8
+		MENUITEM "&UTF-8",		IDM_ENCODING_UCOOKIE
+	END
+	POPUP "&Export"
+	BEGIN
+		MENUITEM "As &HTML...",		IDM_SAVEASHTML
+		MENUITEM "As &RTF...",		IDM_SAVEASRTF
+		MENUITEM "As &PDF...",		IDM_SAVEASPDF
+		MENUITEM "As &LaTeX...",	IDM_SAVEASTEX
+		MENUITEM "As &XML...",  	IDM_SAVEASXML
+	END
+	MENUITEM SEPARATOR
+	MENUITEM "Page Set&up...",		IDM_PRINTSETUP
+	MENUITEM "&Print...\tCtrl+P",		IDM_PRINT
+	MENUITEM SEPARATOR
+	MENUITEM "&Load Session...",		IDM_LOADSESSION
+	MENUITEM "Sa&ve Session...",		IDM_SAVESESSION
+	MENUITEM SEPARATOR
+	MENUITEM "E&xit",				IDM_QUIT
+END
+
+POPUP "&Edit"
+BEGIN
+	MENUITEM "&Undo\tCtrl+Z",  				IDM_UNDO
+	MENUITEM "&Redo\tCtrl+Y",  				IDM_REDO
+	MENUITEM SEPARATOR
+	MENUITEM "Cu&t\tCtrl+X",				IDM_CUT
+	MENUITEM "&Copy\tCtrl+C",				IDM_COPY
+	MENUITEM "&Paste\tCtrl+V",				IDM_PASTE
+	MENUITEM "Duplicat&e\tCtrl+D",				IDM_DUPLICATE
+	MENUITEM "&Delete\tDel",				IDM_CLEAR
+	MENUITEM "Select &All\tCtrl+A",			IDM_SELECTALL
+	MENUITEM "Copy as RT&F",				IDM_COPYASRTF
+	MENUITEM SEPARATOR
+	MENUITEM "Match &Brace\tCtrl+E",			IDM_MATCHBRACE
+	MENUITEM "Select t&o Brace\tCtrl+Shift+E",	IDM_SELECTTOBRACE
+	MENUITEM "S&how Calltip\tCtrl+Shift+Space",	IDM_SHOWCALLTIP
+	MENUITEM "Complete S&ymbol\tCtrl+I",		IDM_COMPLETE
+	MENUITEM "Complete &Word\tCtrl+Enter",		IDM_COMPLETEWORD
+	MENUITEM "Expand Abbre&viation\tCtrl+B",	IDM_ABBREV
+	MENUITEM "&Insert Abbreviation\tCtrl+Shift+R",	IDM_INS_ABBREV
+	MENUITEM "Block Co&mment or Uncomment\tCtrl+Q",	IDM_BLOCK_COMMENT
+	MENUITEM "Bo&x Comment\tCtrl+Shift+B",	IDM_BOX_COMMENT
+	MENUITEM "Stream Comme&nt\tCtrl+Shift+Q",	IDM_STREAM_COMMENT
+	MENUITEM "Make &Selection Uppercase\tCtrl+Shift+U",	IDM_UPRCASE
+	MENUITEM "Make Selection &Lowercase\tCtrl+U",	IDM_LWRCASE
+	MENUITEM "Reverse Selected Lines",	IDM_LINEREVERSE
+	POPUP "Para&graph"
+	BEGIN
+		MENUITEM "&Join",						IDM_JOIN
+		MENUITEM "&Split",						IDM_SPLIT
+	END
+END // used: abcdefghilmnoprstuvwxy
+
+POPUP "&Search"
+BEGIN
+	MENUITEM "&Find...\tCtrl+F",				IDM_FIND
+	MENUITEM "Find &Next\tF3",				IDM_FINDNEXT
+	MENUITEM "Find &Previous\tShift+F3",		IDM_FINDNEXTBACK
+	MENUITEM "F&ind in Files...\tCtrl+Shift+F",	IDM_FINDINFILES
+	MENUITEM "&Replace...\tCtrl+H",			IDM_REPLACE
+	MENUITEM "Incremental &Search...\tCtrl+Alt+I",	IDM_INCSEARCH
+	MENUITEM "Selection &Add Next\tCtrl+Shift+D",	IDM_SELECTIONADDNEXT
+	MENUITEM "Selection Add &Each",			IDM_SELECTIONADDEACH
+	MENUITEM SEPARATOR
+	MENUITEM "&Go to...\tCtrl+G",			IDM_GOTO
+	MENUITEM "Next Book&mark\tF2",			IDM_BOOKMARK_NEXT
+	MENUITEM "Pre&vious Bookmark\tShift+F2",	IDM_BOOKMARK_PREV
+	MENUITEM "&Toggle Bookmark\tCtrl+F2",		IDM_BOOKMARK_TOGGLE
+	MENUITEM "&Clear All Bookmarks",			IDM_BOOKMARK_CLEARALL
+	MENUITEM "Select All &Bookmarks",		IDM_BOOKMARK_SELECT_ALL
+END // used(15): abcefgilmnprstv // Available: dhjkoquwxyz
+
+POPUP "&View"
+BEGIN
+	MENUITEM "Toggle &current fold",		IDM_EXPAND
+	MENUITEM "Toggle &all folds",		IDM_TOGGLE_FOLDALL
+	MENUITEM SEPARATOR
+	MENUITEM "Full Scree&n\tF11",		IDM_FULLSCREEN
+	MENUITEM "&Tool Bar",          			IDM_VIEWTOOLBAR
+	MENUITEM "Tab &Bar",          			IDM_VIEWTABBAR
+	MENUITEM "&Status Bar",          		IDM_VIEWSTATUSBAR
+	MENUITEM SEPARATOR
+	MENUITEM "&Whitespace\tCtrl+Shift+8", 	IDM_VIEWSPACE
+	MENUITEM "&End of Line\tCtrl+Shift+9",	IDM_VIEWEOL
+	MENUITEM "&Indentation Guides", 		IDM_VIEWGUIDES
+	MENUITEM "&Line Numbers",          		IDM_LINENUMBERMARGIN
+	MENUITEM "&Margin",          			IDM_SELMARGIN
+	MENUITEM "&Fold Margin",			IDM_FOLDMARGIN
+	MENUITEM "&Output\tF8",				IDM_TOGGLEOUTPUT
+	MENUITEM "&Parameters\tShift+F8",			IDM_TOGGLEPARAMETERS
+END
+
+POPUP "&Tools"
+BEGIN
+	MENUITEM "&Compile\tCtrl+F7",		IDM_COMPILE
+	MENUITEM "&Build\tF7",				IDM_BUILD
+	MENUITEM "&Clean\tShift+F7",			IDM_CLEAN
+	MENUITEM "&Go\tF5",					IDM_GO
+	MENUITEM "&Stop Executing\tCtrl+Break",IDM_STOPEXECUTE
+	MENUITEM SEPARATOR
+	MENUITEM "&Next Message\tF4",		IDM_NEXTMSG
+	MENUITEM "&Previous Message\tShift+F4",IDM_PREVMSG
+	MENUITEM "Clear &Output\tShift+F5",	IDM_CLEAROUTPUT
+	MENUITEM "&Switch Pane\tCtrl+F6",	IDM_SWITCHPANE
+END
+
+POPUP "&Options"
+BEGIN
+	MENUITEM "&Always On Top",			IDM_ONTOP
+	MENUITEM "Open Files &Here",		IDM_OPENFILESHERE
+	MENUITEM "Vertical &Split",			IDM_SPLITVERTICAL
+	MENUITEM "&Wrap",			IDM_WRAP
+	MENUITEM "Wrap Out&put",			IDM_WRAPOUTPUT
+	MENUITEM "&Read-Only",				IDM_READONLY
+	MENUITEM SEPARATOR
+	POPUP "&Line End Characters"
+	BEGIN
+		MENUITEM "CR &+ LF",	IDM_EOL_CRLF
+		MENUITEM "&CR",		IDM_EOL_CR
+		MENUITEM "&LF",		IDM_EOL_LF
+	END
+	MENUITEM "&Convert Line End Characters",	IDM_EOL_CONVERT
+	MENUITEM SEPARATOR
+	MENUITEM "Change Inden&tation Settings...\tCtrl+Shift+I",	IDM_TABSIZE
+	MENUITEM "Use &Monospaced Font\tCtrl+F11",	IDM_MONOFONT
+	MENUITEM SEPARATOR
+	MENUITEM "Open Local &Options File",		IDM_OPENLOCALPROPERTIES
+	MENUITEM "Open &Directory Options File",		IDM_OPENDIRECTORYPROPERTIES
+	MENUITEM "Open &User Options File",		IDM_OPENUSERPROPERTIES
+	MENUITEM "Open &Global Options File",		IDM_OPENGLOBALPROPERTIES
+	MENUITEM "Open A&bbreviations File",		IDM_OPENABBREVPROPERTIES
+	MENUITEM "Open Lua Startup Scr&ipt", 		IDM_OPENLUAEXTERNALFILE
+	MENUITEM SEPARATOR
+END // used: abcghlmoprstux
+
+POPUP "&Language"
+BEGIN
+	MENUITEM "", IDM_LANGUAGE
+END
+
+POPUP "&Buffers"
+BEGIN
+	MENUITEM "&Previous\tShift+F6",			IDM_PREVFILE
+	MENUITEM "&Next\tF6",			IDM_NEXTFILE
+	MENUITEM "&Close All",				IDM_CLOSEALL
+	MENUITEM "&Save All",				IDM_SAVEALL
+END
+
+POPUP "&Help"
+BEGIN
+	MENUITEM "&Help\tF1", 				IDM_HELP
+#ifdef STATIC_BUILD
+	MENUITEM "&Sc1 Help",			IDM_HELP_SCITE
+	MENUITEM "&About Sc1",				IDM_ABOUT
+#else
+	MENUITEM "&SciTE Help",			IDM_HELP_SCITE
+	MENUITEM "&About SciTE",			IDM_ABOUT
+#endif
+END
+
+END
+
+ABOUT DIALOGEX 26, 41, 350, 242
+CAPTION "About SciTE"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	CONTROL "", IDABOUTSCINTILLA, "Scintilla", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 1, 1, 346, 218
+	ICON "SciTE", -1, 1, 221, 32, 32, WS_CHILD | WS_VISIBLE
+	DEFPUSHBUTTON "OK", IDOK, 26, 222, 322, 20, WS_TABSTOP
+END
+
+GREP DIALOGEX 26, 41, 356, 73
+CAPTION "Find in Files"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "Fi&nd what:", -1, 5, 7, 40, 8
+	COMBOBOX IDFINDWHAT, 50, 5, 245, 50, WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+
+	LTEXT "F&iles:", -1, 5, 25, 40, 8
+	COMBOBOX IDFILES, 50, 23, 245, 50, WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+
+	LTEXT "&Directory:", -1, 5, 43, 40, 8
+	COMBOBOX IDDIRECTORY, 50, 41, 230, 50, WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+
+	AUTOCHECKBOX    "Match &whole word only", IDWHOLEWORD,5,59,120,10, WS_GROUP | WS_TABSTOP
+	AUTOCHECKBOX    "Case sensiti&ve", IDMATCHCASE,125,59,130,10, WS_TABSTOP
+
+	DEFPUSHBUTTON "&Find", IDOK, 301, 5, 50, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 301, 23, 50, 14, WS_TABSTOP
+
+	PUSHBUTTON "&..", IDDOTDOT, 285, 41, 10, 14,  WS_TABSTOP
+	PUSHBUTTON "&Browse...", IDBROWSE, 301, 41, 50, 14,  WS_TABSTOP
+
+END
+
+GOLINE DIALOGEX 26, 41, 240, 50
+CAPTION "Go To"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "&Destination Line:", -1, 5, 8, 70, 8
+	EDITTEXT IDGOLINE, 75, 6, 30, 12, WS_TABSTOP | ES_NUMBER | ES_AUTOHSCROLL
+	LTEXT "&Column:", -1, 115, 8, 35, 8
+	EDITTEXT IDGOLINECHAR, 150, 6, 30, 12, WS_TABSTOP | ES_NUMBER
+	LTEXT "Current Line:",-1,5,21,50,8,NOT WS_GROUP
+	LTEXT "1234567",IDCURRLINE,75,21,30,8,NOT WS_GROUP
+	LTEXT "Column:",-1,115,21,35,8,NOT WS_GROUP
+	LTEXT "1234567",IDCURRLINECHAR,150,21,30,8,NOT WS_GROUP
+	LTEXT "Last Line:",-1,5,34,50,8,NOT WS_GROUP
+	LTEXT "1234567",IDLASTLINE,75,34,30,8,NOT WS_GROUP
+	DEFPUSHBUTTON "&Go To", IDOK, 190, 6, 45, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 190, 26, 45, 14, WS_TABSTOP
+END
+
+INSABBREV DIALOGEX 26, 41, 181, 45
+CAPTION "Insert Abbreviation"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "&Abbreviation:", -1, 5, 8, 65, 8
+	// EDITTEXT IDABBREV, 70, 6, 106, 12, WS_TABSTOP
+	COMBOBOX IDABBREV, 70, 6, 106, 88, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_HASSTRINGS | CBS_SORT
+	DEFPUSHBUTTON "&Insert", IDOK, 70, 26, 50, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 126, 26, 50, 14, WS_TABSTOP
+END
+
+TABSIZE DIALOGEX 26, 41, 160, 60
+CAPTION "Indentation Settings"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "&Tab Size:", -1, 5, 8, 70, 8
+	EDITTEXT IDTABSIZE, 79, 6, 15, 12, WS_TABSTOP | ES_NUMBER
+	LTEXT "&Indent Size:", -1, 5, 26, 70, 8
+	EDITTEXT IDINDENTSIZE, 79, 24, 15, 12, WS_TABSTOP | ES_NUMBER
+	AUTOCHECKBOX  	"&Use tabs:", IDUSETABS, 5, 42, 90,12, WS_GROUP | WS_TABSTOP | BS_LEFTTEXT
+	DEFPUSHBUTTON "OK", IDOK, 105, 5, 50, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 105, 23, 50, 14, WS_TABSTOP
+	PUSHBUTTON "&Convert", IDCONVERT, 105, 41, 50, 14, WS_TABSTOP
+END
+
+#ifdef ALL_PARAMS
+PARAMETERS  DIALOGEX 26, 41, 130, 175
+#endif
+PARAMETERS  DIALOGEX 26, 41, 130, 100
+CAPTION "Parameters"
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "", IDCMD, 5, 5, 120, 8
+
+	LTEXT "&1:", -1, 5, 20, 8, 8
+	EDITTEXT IDPARAMSTART+0, 15, 18, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&2:", -1, 5, 35, 8, 8
+	EDITTEXT IDPARAMSTART+1, 15, 33, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&3:", -1, 5, 50, 8, 8
+	EDITTEXT IDPARAMSTART+2, 15, 48, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&4:", -1, 5, 65, 8, 8
+	EDITTEXT IDPARAMSTART+3, 15, 63, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+#ifdef ALL_PARAMS
+	LTEXT "&5:", -1, 5, 80, 8, 8
+	EDITTEXT IDPARAMSTART+4, 15, 78, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&6:", -1, 5, 95, 8, 8
+	EDITTEXT IDPARAMSTART+5, 15, 93, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&7:", -1, 5, 110, 8, 8
+	EDITTEXT IDPARAMSTART+6, 15, 108, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&8:", -1, 5, 125, 8, 8
+	EDITTEXT IDPARAMSTART+7, 15, 123, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&9:", -1, 5, 140, 8, 8
+	EDITTEXT IDPARAMSTART+8, 15, 138, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+
+	DEFPUSHBUTTON "&Execute", IDOK, 6, 155, 55, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 70, 155, 55, 14, WS_TABSTOP
+#endif
+	DEFPUSHBUTTON "&Execute", IDOK, 6, 80, 55, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 70, 80, 55, 14, WS_TABSTOP
+END
+
+#ifdef ALL_PARAMS
+PARAMETERSNONMODAL  DIALOGEX 26, 41, 130, 160
+#endif
+PARAMETERSNONMODAL  DIALOGEX 26, 41, 130, 85
+CAPTION "Parameters"
+STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT "&1:", -1, 5, 5, 8, 8
+	EDITTEXT IDPARAMSTART+0, 15, 3, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&2:", -1, 5, 20, 8, 8
+	EDITTEXT IDPARAMSTART+1, 15, 18, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&3:", -1, 5, 35, 8, 8
+	EDITTEXT IDPARAMSTART+2, 15, 33, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&4:", -1, 5, 50, 8, 8
+	EDITTEXT IDPARAMSTART+3, 15, 48, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+#ifdef ALL_PARAMS
+	LTEXT "&5:", -1, 5, 65, 8, 8
+	EDITTEXT IDPARAMSTART+4, 15, 63, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&6:", -1, 5, 80, 8, 8
+	EDITTEXT IDPARAMSTART+5, 15, 78, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&7:", -1, 5, 95, 8, 8
+	EDITTEXT IDPARAMSTART+6, 15, 93, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&8:", -1, 5, 110, 8, 8
+	EDITTEXT IDPARAMSTART+7, 15, 108, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+	LTEXT "&9:", -1, 5, 125, 8, 8
+	EDITTEXT IDPARAMSTART+8, 15, 123, 110, 12, WS_TABSTOP | ES_AUTOHSCROLL
+
+	DEFPUSHBUTTON "&Set", IDOK, 6, 140, 55, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 70, 140, 55, 14, WS_TABSTOP
+#endif
+	DEFPUSHBUTTON "&Set", IDOK, 6, 65, 55, 14, WS_TABSTOP
+	PUSHBUTTON "Cancel", IDCANCEL, 70, 65, 55, 14, WS_TABSTOP
+END
+
+IDD_FIND DIALOGEX 30, 73, 275, 84
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Find"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT           "Fi&nd what:",-1,5,7,45,8
+	COMBOBOX        IDFINDWHAT,50,5,145,50, WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	AUTOCHECKBOX    "Match &whole word only", IDWHOLEWORD,5,22,120,10, WS_GROUP | WS_TABSTOP
+	AUTOCHECKBOX    "Case sensiti&ve", IDMATCHCASE,5,34,130,10, WS_TABSTOP
+	AUTOCHECKBOX    "Regular &expression", IDREGEXP,5,46,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Wrap ar&ound", IDWRAP,5,58,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Transform &backslash expressions", IDUNSLASH,5,70,160,10, WS_TABSTOP
+	GROUPBOX        "Direction", -1, 135,22,60,34,WS_GROUP
+	AUTORADIOBUTTON "&Up",IDDIRECTIONUP,140,30,45,12, WS_GROUP
+	AUTORADIOBUTTON "&Down",IDDIRECTIONDOWN,140,42,45,12
+	DEFPUSHBUTTON   "&Find Next",IDOK,205,5,65,14,WS_GROUP
+	PUSHBUTTON      "&Mark All",IDMARKALL,205,23,65,14
+	PUSHBUTTON      "Cancel",IDCANCEL,205,41,65,14
+END
+
+IDD_FIND_ADV DIALOGEX 30, 73, 275, 96
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Find"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT           "Fi&nd what:",-1,5,7,45,8
+	COMBOBOX        IDFINDWHAT,50,5,145,50, WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	AUTOCHECKBOX    "Match &whole word only", IDWHOLEWORD,5,22,120,10, WS_GROUP | WS_TABSTOP
+	AUTOCHECKBOX    "Case sensiti&ve", IDMATCHCASE,5,34,130,10, WS_TABSTOP
+	AUTOCHECKBOX    "Regular &expression", IDREGEXP,5,46,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Wrap ar&ound", IDWRAP,5,58,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Transform &backslash expressions", IDUNSLASH,5,70,160,10, WS_TABSTOP
+	AUTOCHECKBOX    "Search only in &this style:", IDFINDINSTYLE,5,82,95,10, WS_TABSTOP
+	EDITTEXT        IDFINDSTYLE,100,81,30,12, WS_GROUP | WS_TABSTOP | ES_NUMBER
+	GROUPBOX        "Direction", -1, 135,22,60,34,WS_GROUP
+	AUTORADIOBUTTON "&Up",IDDIRECTIONUP,140,30,45,12, WS_GROUP
+	AUTORADIOBUTTON "&Down",IDDIRECTIONDOWN,140,42,45,12
+	DEFPUSHBUTTON   "&Find Next",IDOK,205,5,65,14,WS_GROUP
+	PUSHBUTTON      "&Mark All",IDMARKALL,205,23,65,14
+	PUSHBUTTON      "Cancel",IDCANCEL,205,41,65,14
+END
+
+IDD_REPLACE DIALOGEX 36, 44, 285, 110
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Replace"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT           "Fi&nd what:",-1,5,7,55,8
+	COMBOBOX        IDFINDWHAT,60,5,125,50,WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	LTEXT           "Re&place with:",-1,5,25,55,8
+	COMBOBOX        IDREPLACEWITH,60,23,125,50,WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	AUTOCHECKBOX    "Match &whole word only", IDWHOLEWORD,5,42,130,10, WS_GROUP | WS_TABSTOP
+	AUTOCHECKBOX    "Case sensiti&ve", IDMATCHCASE,5,54,130,10, WS_TABSTOP
+	AUTOCHECKBOX    "Regular &expression", IDREGEXP,5,66,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Wrap ar&ound", IDWRAP,5,78,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Transform &backslash expressions", IDUNSLASH,5,90,150,10, WS_TABSTOP
+	DEFPUSHBUTTON   "&Find Next",IDOK,190,5,90,14,WS_GROUP
+	PUSHBUTTON      "&Replace",IDREPLACE,190,23,90,14
+	PUSHBUTTON      "Replace &All",IDREPLACEALL,190,41,90,14
+	PUSHBUTTON      "Replace in &Selection",IDREPLACEINSEL,190,59,90,14
+	PUSHBUTTON      "Close",IDCANCEL,190,77,90,14
+	LTEXT           "Replacements:",-1,190,96,55,8
+	LTEXT           "1234567",IDREPLDONE,250,96,30,8,NOT WS_GROUP
+END
+
+IDD_REPLACE_ADV DIALOGEX 36, 44, 285, 128
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Replace"
+FONT 8, "MS Shell Dlg"
+BEGIN
+	LTEXT           "Fi&nd what:",-1,5,7,55,8
+	COMBOBOX        IDFINDWHAT,60,5,125,50,WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	LTEXT           "Re&place with:",-1,5,25,55,8
+	COMBOBOX        IDREPLACEWITH,60,23,125,50,WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL
+	AUTOCHECKBOX    "Match &whole word only", IDWHOLEWORD,5,42,130,10, WS_GROUP | WS_TABSTOP
+	AUTOCHECKBOX    "Case sensiti&ve", IDMATCHCASE,5,54,130,10, WS_TABSTOP
+	AUTOCHECKBOX    "Regular &expression", IDREGEXP,5,66,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Wrap ar&ound", IDWRAP,5,78,120,10, WS_TABSTOP
+	AUTOCHECKBOX    "Transform &backslash expressions", IDUNSLASH,5,90,150,10, WS_TABSTOP
+	AUTOCHECKBOX    "Search only in &this style:", IDFINDINSTYLE,5,102,95,10, WS_TABSTOP
+	EDITTEXT        IDFINDSTYLE,100,101,30,12, WS_GROUP | WS_TABSTOP | ES_NUMBER
+	DEFPUSHBUTTON   "&Find Next",IDOK,190,5,90,14,WS_GROUP
+	PUSHBUTTON      "&Replace",IDREPLACE,190,23,90,14
+	PUSHBUTTON      "Replace &All",IDREPLACEALL,190,41,90,14
+	PUSHBUTTON      "Replace in &Selection",IDREPLACEINSEL,190,59,90,14
+	PUSHBUTTON      "Replace in B&uffers",IDREPLACEINBUF,190,77,90,14
+	PUSHBUTTON      "Close",IDCANCEL,190,95,90,14
+	LTEXT           "Replacements:",-1,190,114,55,8
+	LTEXT           "1234567",IDREPLDONE,250,114,30,8,NOT WS_GROUP
+END
+
+// 0xDD is VK_OEM_6, ']}' but not in mingw headers
+
+ACCELS ACCELERATORS
+BEGIN
+	"N", IDM_NEW,   VIRTKEY, CONTROL
+	"O", IDM_OPEN,   VIRTKEY, CONTROL
+	"O", IDM_OPENSELECTED,   VIRTKEY, CONTROL, SHIFT
+	"R", IDM_REVERT,   VIRTKEY, CONTROL
+	"W", IDM_CLOSE,   VIRTKEY, CONTROL
+	"S", IDM_SAVE,   VIRTKEY, CONTROL
+	"S", IDM_SAVEAS, VIRTKEY, CONTROL, SHIFT
+	"P", IDM_SAVEACOPY, VIRTKEY, CONTROL, SHIFT
+	"P", IDM_PRINT,   VIRTKEY, CONTROL
+
+	"F", IDM_FIND,   VIRTKEY, CONTROL
+	"F", IDM_FINDINFILES,   VIRTKEY, CONTROL, SHIFT
+	"H", IDM_REPLACE,  VIRTKEY, CONTROL
+	"D", IDM_SELECTIONADDNEXT,  VIRTKEY, CONTROL, SHIFT
+	"G", IDM_GOTO, VIRTKEY, CONTROL
+	"E", IDM_MATCHBRACE, VIRTKEY, CONTROL
+	"E", IDM_SELECTTOBRACE, VIRTKEY, CONTROL, SHIFT
+	VK_SPACE, IDM_SHOWCALLTIP, VIRTKEY, CONTROL, SHIFT
+	VK_SPACE, IDM_COMPLETE, VIRTKEY, CONTROL
+	"B", IDM_ABBREV, VIRTKEY, CONTROL
+	"R", IDM_INS_ABBREV, VIRTKEY, CONTROL, SHIFT
+	"I", IDM_COMPLETE, VIRTKEY, CONTROL
+	"J", IDM_PREVMATCHPPC, VIRTKEY, CONTROL
+	"J", IDM_SELECTTOPREVMATCHPPC, VIRTKEY, CONTROL, SHIFT
+	"K", IDM_NEXTMATCHPPC, VIRTKEY, CONTROL
+	"K", IDM_SELECTTONEXTMATCHPPC, VIRTKEY, CONTROL, SHIFT
+	"Q", IDM_BLOCK_COMMENT, VIRTKEY, CONTROL
+	"Q", IDM_STREAM_COMMENT, VIRTKEY, CONTROL, SHIFT
+	"B", IDM_BOX_COMMENT, VIRTKEY, CONTROL, SHIFT
+	VK_RETURN, IDM_COMPLETEWORD, VIRTKEY, CONTROL
+
+	// this does not work and gives RC warning:
+	// ASCII character not equivalent to virtual key code
+	//"*", IDM_EXPAND,  VIRTKEY, CONTROL
+
+	// this works for a German keyboard
+	187, IDM_EXPAND,  VIRTKEY, CONTROL, SHIFT
+	VK_MULTIPLY, IDM_EXPAND,  VIRTKEY, CONTROL
+/*
+	"0", IDM_TOOLS+0, VIRTKEY, CONTROL
+	"1", IDM_TOOLS+1, VIRTKEY, CONTROL
+	"2", IDM_TOOLS+2, VIRTKEY, CONTROL
+	"3", IDM_TOOLS+3, VIRTKEY, CONTROL
+	"4", IDM_TOOLS+4, VIRTKEY, CONTROL
+	"5", IDM_TOOLS+5, VIRTKEY, CONTROL
+	"6", IDM_TOOLS+6, VIRTKEY, CONTROL
+	"7", IDM_TOOLS+7, VIRTKEY, CONTROL
+	"8", IDM_TOOLS+8, VIRTKEY, CONTROL
+	"9", IDM_TOOLS+9, VIRTKEY, CONTROL
+*/
+	"1", IDM_BUFFER+0, VIRTKEY, ALT
+	"2", IDM_BUFFER+1, VIRTKEY, ALT
+	"3", IDM_BUFFER+2, VIRTKEY, ALT
+	"4", IDM_BUFFER+3, VIRTKEY, ALT
+	"5", IDM_BUFFER+4, VIRTKEY, ALT
+	"6", IDM_BUFFER+5, VIRTKEY, ALT
+	"7", IDM_BUFFER+6, VIRTKEY, ALT
+	"8", IDM_BUFFER+7, VIRTKEY, ALT
+	"9", IDM_BUFFER+8, VIRTKEY, ALT
+	"0", IDM_BUFFER+9, VIRTKEY, ALT
+
+	"U", IDM_UPRCASE,   VIRTKEY, CONTROL, SHIFT
+	"U", IDM_LWRCASE,  VIRTKEY, CONTROL
+	"8", IDM_VIEWSPACE, VIRTKEY, CONTROL, SHIFT
+	"9", IDM_VIEWEOL, VIRTKEY, CONTROL, SHIFT
+
+	"I", IDM_TABSIZE,   VIRTKEY, CONTROL, SHIFT
+
+	VK_F1, IDM_HELP, VIRTKEY
+
+	VK_F2, IDM_BOOKMARK_NEXT, VIRTKEY
+	VK_F2, IDM_BOOKMARK_PREV, VIRTKEY, SHIFT
+	VK_F2, IDM_BOOKMARK_TOGGLE, VIRTKEY, CONTROL
+	VK_F2, IDM_BOOKMARK_NEXT_SELECT, VIRTKEY, ALT
+	VK_F2, IDM_BOOKMARK_PREV_SELECT, VIRTKEY, ALT, SHIFT
+
+	VK_F3, IDM_FINDNEXT,   VIRTKEY
+	VK_F3, IDM_FINDNEXTBACK,   VIRTKEY, SHIFT
+	VK_F3, IDM_FINDNEXTSEL,   VIRTKEY, CONTROL
+	VK_F3, IDM_FINDNEXTBACKSEL,   VIRTKEY, CONTROL, SHIFT
+
+	VK_F4, IDM_NEXTMSG,  VIRTKEY
+	VK_F4, IDM_PREVMSG,  VIRTKEY, SHIFT
+	VK_F4, IDM_CLOSE,   VIRTKEY, CONTROL
+
+	VK_F5, IDM_GO,  VIRTKEY
+	VK_F5, IDM_CLEAROUTPUT,  VIRTKEY, SHIFT
+
+	VK_F6, IDM_PREVFILE,  VIRTKEY, SHIFT
+	VK_F6, IDM_SWITCHPANE,  VIRTKEY, CONTROL
+	VK_F6, IDM_NEXTFILE,  VIRTKEY
+	VK_F6, IDM_SWITCHPANE,  VIRTKEY, CONTROL, SHIFT
+
+	VK_F7, IDM_COMPILE,  VIRTKEY, CONTROL
+	VK_F7, IDM_BUILD,  VIRTKEY
+	VK_F7, IDM_CLEAN,  VIRTKEY, SHIFT
+
+	VK_F8, IDM_TOGGLEOUTPUT, VIRTKEY
+	VK_F8, IDM_TOGGLEPARAMETERS, VIRTKEY, SHIFT
+
+	VK_F9, IDM_MACROLIST, VIRTKEY, SHIFT
+	VK_F9, IDM_MACROPLAY, VIRTKEY
+	VK_F9, IDM_MACRORECORD, VIRTKEY, CONTROL
+	VK_F9, IDM_MACROSTOPRECORD, VIRTKEY, CONTROL, SHIFT
+
+	VK_F11, IDM_FULLSCREEN,  VIRTKEY
+	VK_F11, IDM_MONOFONT,  VIRTKEY, CONTROL
+
+	VK_TAB, IDM_PREVFILESTACK,  VIRTKEY, CONTROL, SHIFT
+	VK_TAB, IDM_NEXTFILESTACK,  VIRTKEY, CONTROL
+
+	VK_BACK, IDM_UNDO,  VIRTKEY, ALT
+	VK_BACK, IDM_REDO,  VIRTKEY, ALT, SHIFT
+	VK_CANCEL, IDM_STOPEXECUTE,  VIRTKEY, CONTROL
+
+	// Workaround for the most common case where SciTE undo and
+	// redo buttons don't enable/disable when you expect.
+	"Z", IDM_UNDO,  VIRTKEY, CONTROL
+	"Y", IDM_REDO,  VIRTKEY, CONTROL
+
+	"X", IDM_CUT,  VIRTKEY, CONTROL
+	"C", IDM_COPY,  VIRTKEY, CONTROL
+
+	"I", IDM_INCSEARCH,          VIRTKEY, CONTROL, ALT
+END
+
+IDR_CLOSEFILE BITMAP "closefile.bmp"
+IDR_CLOSEFILE24 BITMAP "closefile24.bmp"
+
+IDBM_WORD BITMAP "word.bmp"
+IDBM_CASE BITMAP "case.bmp"
+IDBM_REGEX BITMAP "regex.bmp"
+IDBM_BACKSLASH BITMAP "backslash.bmp"
+IDBM_AROUND BITMAP "around.bmp"
+IDBM_UP BITMAP "up.bmp"
+
+IDBM_20_WORD BITMAP "word20.bmp"
+IDBM_20_CASE BITMAP "case20.bmp"
+IDBM_20_REGEX BITMAP "regex20.bmp"
+IDBM_20_BACKSLASH BITMAP "backslash20.bmp"
+IDBM_20_AROUND BITMAP "around20.bmp"
+IDBM_20_UP BITMAP "up20.bmp"
+
+IDBM_24_WORD BITMAP "word24.bmp"
+IDBM_24_CASE BITMAP "case24.bmp"
+IDBM_24_REGEX BITMAP "regex24.bmp"
+IDBM_24_BACKSLASH BITMAP "backslash24.bmp"
+IDBM_24_AROUND BITMAP "around24.bmp"
+IDBM_24_UP BITMAP "up24.bmp"
+
+IDBM_32_WORD BITMAP "word32.bmp"
+IDBM_32_CASE BITMAP "case32.bmp"
+IDBM_32_REGEX BITMAP "regex32.bmp"
+IDBM_32_BACKSLASH BITMAP "backslash32.bmp"
+IDBM_32_AROUND BITMAP "around32.bmp"
+IDBM_32_UP BITMAP "up32.bmp"
+
+//The embedded properties file is to allow a one file distribution of Sc1.EXE
+#ifdef STATIC_BUILD
+Embedded Properties Embedded.properties
+#endif
+IDC_DRAGDROP       CURSOR  DISCARDABLE     "DragDrop.cur"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION	VERSION_WORDS
+PRODUCTVERSION	VERSION_WORDS
+FILEFLAGSMASK	0x3fL
+FILEFLAGS 0
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+	BLOCK	"VarFileInfo"
+	BEGIN
+		VALUE	"Translation",	0x409,	1200
+	END
+	BLOCK	"StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"
+			VALUE	"FileDescription",	"SciTE - a Scintilla based Text Editor\0"
+			VALUE	"FileVersion",	VERSION_SCITE "\0"
+			VALUE	"InternalName",	"SciTE\0"
+			VALUE	"LegalCopyright",	"Copyright " COPYRIGHT_YEARS " by Neil Hodgson\0"
+			VALUE	"OriginalFilename",	"SciTE.EXE\0"
+			VALUE	"ProductName",	"SciTE\0"
+			VALUE	"ProductVersion",	VERSION_SCITE "\0"
+		END
+	END
+END
+
diff --git a/scite-app/scite/win32/SciTEWin.cxx b/scite-app/scite/win32/SciTEWin.cxx
new file mode 100644
index 0000000..ae1cec0
--- /dev/null
+++ b/scite-app/scite/win32/SciTEWin.cxx
@@ -0,0 +1,2414 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEWin.cxx
+ ** Main code for the Windows version of the editor.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <ctime>
+
+#include "SciTEWin.h"
+#include "DLLFunction.h"
+
+#ifndef WM_DPICHANGED
+#define WM_DPICHANGED 0x02E0
+#endif
+
+#ifndef NO_EXTENSIONS
+#include "MultiplexExtension.h"
+
+#ifndef NO_FILER
+#include "DirectorExtension.h"
+#endif
+
+#ifndef NO_LUA
+#include "LuaExtension.h"
+#endif
+
+#endif
+
+#ifdef STATIC_BUILD
+const GUI::gui_char appName[] = GUI_TEXT("Sc1");
+#else
+const GUI::gui_char appName[] = GUI_TEXT("SciTE");
+static const GUI::gui_char scintillaName[] = GUI_TEXT("Scintilla.DLL");
+#endif
+
+static GUI::gui_string GetErrorMessage(DWORD nRet) {
+	LPWSTR lpMsgBuf = nullptr;
+	if (::FormatMessage(
+				FORMAT_MESSAGE_ALLOCATE_BUFFER |
+				FORMAT_MESSAGE_FROM_SYSTEM |
+				FORMAT_MESSAGE_IGNORE_INSERTS,
+				nullptr,
+				nRet,
+				MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),   // Default language
+				reinterpret_cast<LPWSTR>(&lpMsgBuf),
+				0,
+				nullptr
+			) != 0) {
+		GUI::gui_string s= lpMsgBuf;
+		::LocalFree(lpMsgBuf);
+		return s;
+	} else {
+		return TEXT("");
+	}
+}
+
+long SciTEKeys::ParseKeyCode(const char *mnemonic) {
+	SA::KeyMod modsInKey = static_cast<SA::KeyMod>(0);
+	int keyval = -1;
+
+	if (mnemonic && *mnemonic) {
+		std::string sKey = mnemonic;
+
+		if (RemoveStringOnce(sKey, "Ctrl+"))
+			modsInKey = modsInKey | SA::KeyMod::Ctrl;
+		if (RemoveStringOnce(sKey, "Shift+"))
+			modsInKey = modsInKey | SA::KeyMod::Shift;
+		if (RemoveStringOnce(sKey, "Alt+"))
+			modsInKey = modsInKey | SA::KeyMod::Alt;
+
+		if (sKey.length() == 1) {
+			keyval = VkKeyScan(sKey.at(0)) & 0xFF;
+		} else if (sKey.length() > 1) {
+			if ((sKey.at(0) == 'F') && (IsADigit(sKey.at(1)))) {
+				sKey.erase(0, 1);
+				const int fkeyNum = atoi(sKey.c_str());
+				if (fkeyNum >= 1 && fkeyNum <= 12)
+					keyval = fkeyNum - 1 + VK_F1;
+			} else if ((sKey.at(0) == 'V') && (IsADigit(sKey.at(1)))) {
+				sKey.erase(0, 1);
+				const int vkey = atoi(sKey.c_str());
+				if (vkey > 0 && vkey <= 0x7FFF)
+					keyval = vkey;
+			} else if (StartsWith(sKey, "Keypad")) {
+				sKey.erase(0, strlen("Keypad"));
+				if ((sKey.length() > 0) && IsADigit(sKey.at(0))) {
+					const int keyNum = atoi(sKey.c_str());
+					if (keyNum >= 0 && keyNum <= 9)
+						keyval = keyNum + VK_NUMPAD0;
+				} else if (sKey == "Plus") {
+					keyval = VK_ADD;
+				} else if (sKey == "Minus") {
+					keyval = VK_SUBTRACT;
+				} else if (sKey == "Decimal") {
+					keyval = VK_DECIMAL;
+				} else if (sKey == "Divide") {
+					keyval = VK_DIVIDE;
+				} else if (sKey == "Multiply") {
+					keyval = VK_MULTIPLY;
+				}
+			} else if (sKey == "Left") {
+				keyval = VK_LEFT;
+			} else if (sKey == "Right") {
+				keyval = VK_RIGHT;
+			} else if (sKey == "Up") {
+				keyval = VK_UP;
+			} else if (sKey == "Down") {
+				keyval = VK_DOWN;
+			} else if (sKey == "Insert") {
+				keyval = VK_INSERT;
+			} else if (sKey == "End") {
+				keyval = VK_END;
+			} else if (sKey == "Home") {
+				keyval = VK_HOME;
+			} else if (sKey == "Enter") {
+				keyval = VK_RETURN;
+			} else if (sKey == "Space") {
+				keyval = VK_SPACE;
+			} else if (sKey == "Tab") {
+				keyval = VK_TAB;
+			} else if (sKey == "Escape") {
+				keyval = VK_ESCAPE;
+			} else if (sKey == "Delete") {
+				keyval = VK_DELETE;
+			} else if (sKey == "PageUp") {
+				keyval = VK_PRIOR;
+			} else if (sKey == "PageDown") {
+				keyval = VK_NEXT;
+			} else if (sKey == "Win") {
+				keyval = VK_LWIN;
+			} else if (sKey == "Menu") {
+				keyval = VK_APPS;
+			} else if (sKey == "Backward") {
+				keyval = VK_BROWSER_BACK;
+			} else if (sKey == "Forward") {
+				keyval = VK_BROWSER_FORWARD;
+			}
+		}
+	}
+
+	return (keyval > 0) ? (keyval | (static_cast<int>(modsInKey)<<16)) : 0;
+}
+
+bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept {
+	return parsedKeyCode && !(0xFFFF0000 & (keyval | modifiers)) && (parsedKeyCode == (keyval | (modifiers<<16)));
+}
+
+HINSTANCE SciTEWin::hInstance {};
+const TCHAR *SciTEWin::className = nullptr;
+const TCHAR *SciTEWin::classNameInternal = nullptr;
+SciTEWin *SciTEWin::app = nullptr;
+
+namespace {
+
+using SystemParametersInfoForDpiSig = BOOL (WINAPI *)(
+	UINT  uiAction,
+	UINT  uiParam,
+	PVOID pvParam,
+	UINT  fWinIni,
+	UINT  dpi
+);
+
+SystemParametersInfoForDpiSig fnSystemParametersInfoForDpi;
+
+// Using VerifyVersionInfo on Windows 10 will pretend its Windows 8
+// but that is good enough for switching UI elements to flatter.
+// The VersionHelpers.h functions can't be used as they aren't supported by GCC.
+
+bool UIShouldBeFlat() noexcept {
+	OSVERSIONINFOEX osvi = OSVERSIONINFOEX();
+	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+	osvi.dwMajorVersion = 6;
+	osvi.dwMinorVersion = 2;
+
+	constexpr BYTE op = VER_GREATER_EQUAL;
+	DWORDLONG dwlConditionMask = 0;
+	VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, op);
+	VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, op);
+
+	return VerifyVersionInfo(
+		       &osvi,
+		       VER_MAJORVERSION | VER_MINORVERSION |
+		       VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR,
+		       dwlConditionMask);
+}
+
+}
+
+SciTEWin::SciTEWin(Extension *ext) : SciTEBase(ext) {
+	app = this;
+
+	contents.SetSciTE(this);
+	contents.SetLocalizer(&localiser);
+	backgroundStrip.SetLocalizer(&localiser);
+	searchStrip.SetLocalizer(&localiser);
+	searchStrip.SetSearcher(this);
+	findStrip.SetLocalizer(&localiser);
+	findStrip.SetSearcher(this);
+	replaceStrip.SetLocalizer(&localiser);
+	replaceStrip.SetSearcher(this);
+
+	flatterUI = UIShouldBeFlat();
+
+	appearance = CurrentAppearance();
+
+	cmdShow = 0;
+	heightBar = 7;
+	fontTabs = {};
+	wFocus = {};
+
+	winPlace = WINDOWPLACEMENT();
+	winPlace.length = 0;
+	rcWorkArea = RECT();
+
+	openWhat[0] = '\0';
+	tooltipText[0] = '\0';
+	tbLarge = false;
+	modalParameters = false;
+	staticBuild = false;
+	menuSource = 0;
+
+	hWriteSubProcess = {};
+	subProcessGroupId = 0;
+
+	pathAbbreviations = GetAbbrevPropertiesFileName();
+
+	// System type properties are stored in the platform properties.
+	propsPlatform.Set("PLAT_WIN", "1");
+	propsPlatform.Set("PLAT_WINNT", "1");
+
+	ReadEnvironment();
+
+	SetScaleFactor(GetScaleFactor());
+
+	ReadGlobalPropFile();
+
+	if (props.GetInt("create.hidden.console")) {
+		// Prevent a flashing console window whenever Lua calls os.execute or
+		// io.popen by creating a hidden console to share.
+		::AllocConsole();
+		::ShowWindow(::GetConsoleWindow(), SW_HIDE);
+	}
+
+	tbLarge = props.GetInt("toolbar.large");
+	/// Need to copy properties to variables before setting up window
+	SetPropertiesInitial();
+	ReadAbbrevPropFile();
+
+	hDevMode = {};
+	hDevNames = {};
+	::ZeroMemory(&pagesetupMargin, sizeof(pagesetupMargin));
+
+	hHH = {};
+	hMM = {};
+	uniqueInstance.Init(this);
+
+	hAccTable = ::LoadAccelerators(hInstance, TEXT("ACCELS")); // md
+
+	cmdWorker.pSciTE = this;
+}
+
+SciTEWin::~SciTEWin() {
+	if (hDevMode)
+		::GlobalFree(hDevMode);
+	if (hDevNames)
+		::GlobalFree(hDevNames);
+	if (hHH)
+		::FreeLibrary(hHH);
+	if (hMM)
+		::FreeLibrary(hMM);
+	if (fontTabs)
+		::DeleteObject(fontTabs);
+	if (hAccTable)
+		::DestroyAcceleratorTable(hAccTable);
+}
+
+uintptr_t SciTEWin::GetInstance() {
+	return reinterpret_cast<uintptr_t>(hInstance);
+}
+
+void SciTEWin::Register(HINSTANCE hInstance_) {
+	const TCHAR resourceName[] = TEXT("SciTE");
+
+	hInstance = hInstance_;
+
+	WNDCLASS wndclass {};
+
+	// Register the frame window
+	className = TEXT("SciTEWindow");
+	wndclass.style = 0;
+	wndclass.lpfnWndProc = SciTEWin::TWndProc;
+	wndclass.cbClsExtra = 0;
+	wndclass.cbWndExtra = sizeof(SciTEWin *);
+	wndclass.hInstance = hInstance;
+	wndclass.hIcon = ::LoadIcon(hInstance, resourceName);
+	wndclass.hCursor = {};
+	wndclass.hbrBackground = {};
+	wndclass.lpszMenuName = resourceName;
+	wndclass.lpszClassName = className;
+	if (!::RegisterClass(&wndclass))
+		exit(FALSE);
+
+	// Register the window that holds the two Scintilla edit windows and the separator
+	classNameInternal = TEXT("SciTEWindowContent");
+	wndclass.lpfnWndProc = BaseWin::StWndProc;
+	wndclass.lpszMenuName = nullptr;
+	wndclass.lpszClassName = classNameInternal;
+	if (!::RegisterClass(&wndclass))
+		exit(FALSE);
+}
+
+static int CodePageFromName(const std::string &encodingName) {
+	struct Encoding {
+		const char *name;
+		int codePage;
+	} knownEncodings[] = {
+		{ "ascii", CP_UTF8 },
+		{ "utf-8", CP_UTF8 },
+		{ "latin1", 1252 },
+		{ "latin2", 28592 },
+		{ "big5", 950 },
+		{ "gbk", 936 },
+		{ "shift_jis", 932 },
+		{ "euc-kr", 949 },
+		{ "cyrillic", 1251 },
+		{ "iso-8859-5", 28595 },
+		{ "iso8859-11", 874 },
+		{ "1250", 1250 },
+		{ "windows-1251", 1251 },
+	};
+	for (const Encoding &enc : knownEncodings) {
+		if (encodingName == enc.name) {
+			return enc.codePage;
+		}
+	}
+	return CP_UTF8;
+}
+
+static std::string StringEncode(std::wstring s, int codePage) {
+	if (s.length()) {
+		const int sLength = static_cast<int>(s.length());
+		const int cchMulti = ::WideCharToMultiByte(codePage, 0, s.c_str(), sLength, nullptr, 0, nullptr, nullptr);
+		std::string sMulti(cchMulti, 0);
+		::WideCharToMultiByte(codePage, 0, s.c_str(), sLength, &sMulti[0], cchMulti, nullptr, nullptr);
+		return sMulti;
+	} else {
+		return std::string();
+	}
+}
+
+static std::wstring StringDecode(std::string s, int codePage) {
+	if (s.length()) {
+		const int sLength = static_cast<int>(s.length());
+		const int cchWide = ::MultiByteToWideChar(codePage, 0, s.c_str(), sLength, nullptr, 0);
+		std::wstring sWide(cchWide, 0);
+		::MultiByteToWideChar(codePage, 0, s.c_str(), sLength, &sWide[0], cchWide);
+		return sWide;
+	} else {
+		return std::wstring();
+	}
+}
+
+// Convert to UTF-8
+static std::string ConvertEncoding(const char *original, int codePage) {
+	if (codePage == CP_UTF8) {
+		return original;
+	} else {
+		GUI::gui_string sWide = StringDecode(std::string(original), codePage);
+		return GUI::UTF8FromString(sWide);
+	}
+}
+
+void SciTEWin::ReadLocalization() {
+	SciTEBase::ReadLocalization();
+	std::string encoding = localiser.GetString("translation.encoding");
+	LowerCaseAZ(encoding);
+	if (encoding.length()) {
+		const int codePageNamed = CodePageFromName(encoding);
+		const char *key = nullptr;
+		const char *val = nullptr;
+		// Get encoding
+		bool more = localiser.GetFirst(key, val);
+		while (more) {
+			std::string converted = ConvertEncoding(val, codePageNamed);
+			if (converted != "") {
+				localiser.Set(key, converted.c_str());
+			}
+			more = localiser.GetNext(key, val);
+		}
+	}
+}
+
+void SciTEWin::GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) {
+	winPlace.length = sizeof(winPlace);
+	::GetWindowPlacement(MainHWND(), &winPlace);
+
+	*left = winPlace.rcNormalPosition.left;
+	*top = winPlace.rcNormalPosition.top;
+	*width =  winPlace.rcNormalPosition.right - winPlace.rcNormalPosition.left;
+	*height = winPlace.rcNormalPosition.bottom - winPlace.rcNormalPosition.top;
+	*maximize = (winPlace.showCmd == SW_MAXIMIZE) ? 1 : 0;
+}
+
+int SciTEWin::GetScaleFactor() noexcept {
+	// Only called at startup, so just use the default for a DC
+	HDC hdcMeasure = ::CreateCompatibleDC({});
+	const int scale = ::GetDeviceCaps(hdcMeasure, LOGPIXELSY) * 100 / 96;
+	::DeleteDC(hdcMeasure);
+	return scale;
+}
+
+bool SciTEWin::SetScaleFactor(int scale) {
+	const std::string sScale = StdStringFromInteger(scale);
+	const std::string sCurrentScale = propsPlatform.GetString("ScaleFactor");
+	if (sScale == sCurrentScale) {
+		return false;
+	}
+	propsPlatform.Set("ScaleFactor", sScale);
+	return true;
+}
+
+// Allow UTF-8 file names and command lines to be used in calls to io.open and io.popen in Lua scripts.
+// The scite_lua_win.h header redirects fopen and _popen to these functions.
+
+extern "C" {
+
+	FILE *scite_lua_fopen(const char *filename, const char *mode) {
+		GUI::gui_string sFilename = GUI::StringFromUTF8(filename);
+		GUI::gui_string sMode = GUI::StringFromUTF8(mode);
+		FILE *f = _wfopen(sFilename.c_str(), sMode.c_str());
+		if (!f)
+			// Fallback on narrow string in case already in CP_ACP
+			f = fopen(filename, mode);
+		return f;
+	}
+
+	FILE *scite_lua_popen(const char *filename, const char *mode) {
+		GUI::gui_string sFilename = GUI::StringFromUTF8(filename);
+		GUI::gui_string sMode = GUI::StringFromUTF8(mode);
+		FILE *f = _wpopen(sFilename.c_str(), sMode.c_str());
+		if (!f)
+			// Fallback on narrow string in case already in CP_ACP
+			f = _popen(filename, mode);
+		return f;
+	}
+
+}
+
+// Read properties resource into propsEmbed
+// The embedded properties file is to allow distributions to be sure
+// that they have a sensible default configuration even if the properties
+// files are missing. Also allows a one file distribution of Sc1.EXE.
+void SciTEWin::ReadEmbeddedProperties() {
+
+	propsEmbed.Clear();
+
+	HRSRC handProps = ::FindResource(hInstance, TEXT("Embedded"), TEXT("Properties"));
+	if (handProps) {
+		const DWORD size = ::SizeofResource(hInstance, handProps);
+		HGLOBAL hmem = ::LoadResource(hInstance, handProps);
+		if (hmem) {
+			const void *pv = ::LockResource(hmem);
+			if (pv) {
+				propsEmbed.ReadFromMemory(
+					static_cast<const char *>(pv), size, FilePath(), filter, nullptr, 0);
+			}
+		}
+		::FreeResource(handProps);
+	}
+}
+
+SystemAppearance SciTEWin::CurrentAppearance() const noexcept {
+	SystemAppearance currentAppearance{};
+
+	HKEY hkeyPersonalize{};
+	const LSTATUS statusOpen = ::RegOpenKeyExW(HKEY_CURRENT_USER,
+		L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+		0, KEY_QUERY_VALUE, &hkeyPersonalize);
+	if (statusOpen == ERROR_SUCCESS) {
+		DWORD type = 0;
+		DWORD val = 99;
+		DWORD cbData = sizeof(val);
+		const LSTATUS status = ::RegQueryValueExW(hkeyPersonalize, L"AppsUseLightTheme", nullptr,
+			&type, reinterpret_cast<LPBYTE>(&val), reinterpret_cast<LPDWORD>(&cbData));
+		RegCloseKey(hkeyPersonalize);
+		if (status == ERROR_SUCCESS) {
+			currentAppearance.dark = val == 0;
+		}
+	}
+
+	HIGHCONTRAST info{};
+	info.cbSize = sizeof(HIGHCONTRAST)
+		;
+	const BOOL status = SystemParametersInfoW(SPI_GETHIGHCONTRAST, 0, &info, 0);
+	if (status) {
+		currentAppearance.highContrast = (info.dwFlags & HCF_HIGHCONTRASTON) != 0;
+		if (currentAppearance.highContrast) {
+			// With high contrast, AppsUseLightTheme not correct so examine system background colour
+			const DWORD dwWindowColour = ::GetSysColor(COLOR_WINDOW);
+			currentAppearance.dark = dwWindowColour < 0x40;
+		}
+	}
+
+	return currentAppearance;
+}
+
+void SciTEWin::ReadPropertiesInitial() {
+	SciTEBase::ReadPropertiesInitial();
+	if (tabMultiLine) {	// Windows specific!
+		const long wl = GetWindowStyle(HwndOf(wTabBar));
+		::SetWindowLong(HwndOf(wTabBar), GWL_STYLE, wl | TCS_MULTILINE);
+	}
+}
+
+void SciTEWin::ReadProperties() {
+	SciTEBase::ReadProperties();
+	if (flatterUI) {
+		if (foldColour.empty() && foldHiliteColour.empty()) {
+			constexpr SA::Colour lightMargin = ColourRGB(0xF7, 0xF7, 0xF7);
+			CallChildren(SA::Message::SetFoldMarginColour, 1, lightMargin);
+			CallChildren(SA::Message::SetFoldMarginHiColour, 1, lightMargin);
+		}
+	}
+}
+
+static FilePath GetSciTEPath(const FilePath &home) {
+	if (home.IsSet()) {
+		return FilePath(home);
+	} else {
+		GUI::gui_char path[MAX_PATH];
+		if (::GetModuleFileNameW(0, path, static_cast<DWORD>(std::size(path))) == 0)
+			return FilePath();
+		// Remove the SciTE.exe
+		GUI::gui_char *lastSlash = wcsrchr(path, pathSepChar);
+		if (lastSlash)
+			*lastSlash = '\0';
+		return FilePath(path);
+	}
+}
+
+FilePath SciTEWin::GetDefaultDirectory() {
+	const GUI::gui_char *home = _wgetenv(GUI_TEXT("SciTE_HOME"));
+	return GetSciTEPath(home);
+}
+
+FilePath SciTEWin::GetSciteDefaultHome() {
+	const GUI::gui_char *home = _wgetenv(GUI_TEXT("SciTE_HOME"));
+	return GetSciTEPath(home);
+}
+
+FilePath SciTEWin::GetSciteUserHome() {
+	// First looking for environment variable $SciTE_USERHOME
+	// to set SciteUserHome. If not present we look for $SciTE_HOME
+	// then defaulting to $USERPROFILE
+	GUI::gui_char *home = _wgetenv(GUI_TEXT("SciTE_USERHOME"));
+	if (!home) {
+		home = _wgetenv(GUI_TEXT("SciTE_HOME"));
+		if (!home) {
+			home = _wgetenv(GUI_TEXT("USERPROFILE"));
+		}
+	}
+	return GetSciTEPath(home);
+}
+
+// Help command lines contain topic!path
+void SciTEWin::ExecuteOtherHelp(const char *cmd) {
+	GUI::gui_string s = GUI::StringFromUTF8(cmd);
+	const size_t pos = s.find_first_of('!');
+	if (pos != GUI::gui_string::npos) {
+		GUI::gui_string topic = s.substr(0, pos);
+		GUI::gui_string path = s.substr(pos+1);
+		::WinHelpW(MainHWND(),
+			   path.c_str(),
+			   HELP_KEY,
+			   reinterpret_cast<ULONG_PTR>(topic.c_str()));
+	}
+}
+
+// HH_AKLINK not in mingw headers
+struct XHH_AKLINK {
+	long cbStruct;
+	BOOL fReserved;
+	const wchar_t *pszKeywords;
+	wchar_t *pszUrl;
+	wchar_t *pszMsgText;
+	wchar_t *pszMsgTitle;
+	wchar_t *pszWindow;
+	BOOL fIndexOnFail;
+};
+
+// Help command lines contain topic!path
+void SciTEWin::ExecuteHelp(const char *cmd) {
+	if (!hHH)
+		hHH = ::LoadLibrary(TEXT("HHCTRL.OCX"));
+
+	if (hHH) {
+		GUI::gui_string s = GUI::StringFromUTF8(cmd);
+		const size_t pos = s.find_first_of('!');
+		if (pos != GUI::gui_string::npos) {
+			GUI::gui_string topic = s.substr(0, pos);
+			GUI::gui_string path = s.substr(pos + 1);
+			typedef HWND (WINAPI *HelpFn)(HWND, const wchar_t *, UINT, DWORD_PTR);
+			HelpFn fnHHW = reinterpret_cast<HelpFn>(::GetProcAddress(hHH, "HtmlHelpW"));
+			if (fnHHW) {
+				XHH_AKLINK ak {};
+				ak.cbStruct = sizeof(ak);
+				ak.fReserved = FALSE;
+				ak.pszKeywords = topic.c_str();
+				ak.pszUrl = nullptr;
+				ak.pszMsgText = nullptr;
+				ak.pszMsgTitle = nullptr;
+				ak.pszWindow = nullptr;
+				ak.fIndexOnFail = TRUE;
+				fnHHW(NULL,
+				      path.c_str(),
+				      0x000d,          	// HH_KEYWORD_LOOKUP
+				      reinterpret_cast<DWORD_PTR>(&ak)
+				     );
+			}
+		}
+	}
+}
+
+void SciTEWin::CopyAsRTF() {
+	const SA::Span cr = GetSelection();
+	std::ostringstream oss;
+	SaveToStreamRTF(oss, cr.start, cr.end);
+	const std::string rtf = oss.str();
+	const size_t len = rtf.length() + 1;	// +1 for NUL
+	HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, len);
+	if (hand) {
+		::OpenClipboard(MainHWND());
+		::EmptyClipboard();
+		char *ptr = static_cast<char *>(::GlobalLock(hand));
+		if (ptr) {
+			memcpy(ptr, rtf.c_str(), len);
+			::GlobalUnlock(hand);
+		}
+		::SetClipboardData(::RegisterClipboardFormat(CF_RTF), hand);
+		::CloseClipboard();
+	}
+}
+
+void SciTEWin::CopyPath() {
+	if (filePath.IsUntitled())
+		return;
+
+	const GUI::gui_string clipText(filePath.AsInternal());
+	const size_t blobSize = sizeof(GUI::gui_char)*(clipText.length()+1);
+	if (::OpenClipboard(MainHWND())) {
+		HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, blobSize);
+		if (hand) {
+			::EmptyClipboard();
+			GUI::gui_char *ptr = static_cast<GUI::gui_char *>(::GlobalLock(hand));
+			if (ptr) {
+				memcpy(ptr, clipText.c_str(), blobSize);
+				::GlobalUnlock(hand);
+			}
+			::SetClipboardData(CF_UNICODETEXT, hand);
+		}
+		::CloseClipboard();
+	}
+}
+
+void SciTEWin::FullScreenToggle() {
+	HWND wTaskBar = FindWindow(TEXT("Shell_TrayWnd"), TEXT(""));
+	HWND wStartButton = FindWindow(TEXT("Button"), nullptr);
+	fullScreen = !fullScreen;
+	if (fullScreen) {
+		::SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);
+		::SystemParametersInfo(SPI_SETWORKAREA, 0, nullptr, SPIF_SENDCHANGE);
+		if (wStartButton)
+			::ShowWindow(wStartButton, SW_HIDE);
+		::ShowWindow(wTaskBar, SW_HIDE);
+
+		winPlace.length = sizeof(winPlace);
+		::GetWindowPlacement(MainHWND(), &winPlace);
+		int topStuff = ::GetSystemMetrics(SM_CYSIZEFRAME) + ::GetSystemMetrics(SM_CYCAPTION);
+		if (props.GetInt("full.screen.hides.menu"))
+			topStuff += ::GetSystemMetrics(SM_CYMENU);
+		::SetWindowLongPtr(HwndOf(wContent),
+				   GWL_EXSTYLE, 0);
+		::SetWindowPos(MainHWND(), HWND_TOP,
+			       -::GetSystemMetrics(SM_CXSIZEFRAME),
+			       -topStuff,
+			       ::GetSystemMetrics(SM_CXSCREEN) + 2 * ::GetSystemMetrics(SM_CXSIZEFRAME),
+			       ::GetSystemMetrics(SM_CYSCREEN) + topStuff + ::GetSystemMetrics(SM_CYSIZEFRAME),
+			       0);
+	} else {
+		::ShowWindow(wTaskBar, SW_SHOW);
+		if (wStartButton)
+			::ShowWindow(wStartButton, SW_SHOW);
+		::SetWindowLongPtr(HwndOf(wContent),
+				   GWL_EXSTYLE, WS_EX_CLIENTEDGE);
+		if (winPlace.length) {
+			::SystemParametersInfo(SPI_SETWORKAREA, 0, &rcWorkArea, 0);
+			if (winPlace.showCmd == SW_SHOWMAXIMIZED) {
+				::ShowWindow(MainHWND(), SW_RESTORE);
+				::ShowWindow(MainHWND(), SW_SHOWMAXIMIZED);
+			} else {
+				::SetWindowPlacement(MainHWND(), &winPlace);
+			}
+		}
+	}
+	::SetForegroundWindow(MainHWND());
+	CheckMenus();
+}
+
+HWND SciTEWin::MainHWND() noexcept {
+	return HwndOf(wSciTE);
+}
+
+void SciTEWin::Command(WPARAM wParam, LPARAM lParam) {
+	const int cmdID = ControlIDOfWParam(wParam);
+	if (wParam & 0x10000) {
+		// From accelerator -> goes to focused pane.
+		menuSource = 0;
+	}
+	if (reinterpret_cast<HWND>(lParam) == wToolBar.GetID()) {
+		// From toolbar -> goes to focused pane.
+		menuSource = 0;
+	}
+	if (!menuSource) {
+		if (!wEditor.HasFocus() && !wOutput.HasFocus()) {
+			HWND wWithFocus = ::GetFocus();
+			const GUI::gui_string classNameFocus = ClassNameOfWindow(wWithFocus);
+			if (classNameFocus == GUI_TEXT("Edit")) {
+				switch (cmdID) {
+				case IDM_UNDO:
+					::SendMessage(wWithFocus, EM_UNDO, 0, 0);
+					return;
+				case IDM_CUT:
+					::SendMessage(wWithFocus, WM_CUT, 0, 0);
+					return;
+				case IDM_COPY:
+					::SendMessage(wWithFocus, WM_COPY, 0, 0);
+					return;
+				}
+			}
+		}
+	}
+
+	switch (cmdID) {
+
+	case IDM_ACTIVATE:
+		Activate(lParam);
+		break;
+
+	case IDM_FINISHEDEXECUTE: {
+			jobQueue.SetExecuting(false);
+			if (needReadProperties)
+				ReadProperties();
+			CheckMenus();
+			jobQueue.ClearJobs();
+			CheckReload();
+		}
+		break;
+
+	case IDM_ONTOP:
+		topMost = (topMost ? false : true);
+		::SetWindowPos(MainHWND(), (topMost ? HWND_TOPMOST : HWND_NOTOPMOST), 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
+		CheckAMenuItem(IDM_ONTOP, topMost);
+		break;
+
+	case IDM_OPENFILESHERE:
+		uniqueInstance.ToggleOpenFilesHere();
+		break;
+
+	case IDM_FULLSCREEN:
+		FullScreenToggle();
+		break;
+
+	case IDC_TABCLOSE:
+		CloseTab(static_cast<int>(lParam));
+		break;
+
+	case IDC_SHIFTTAB:
+		ShiftTab(LOWORD(lParam), HIWORD(lParam));
+		break;
+
+	default:
+		SciTEBase::MenuCommand(cmdID, menuSource);
+	}
+}
+
+// from ScintillaWin.cxx
+static UINT CodePageFromCharSet(SA::CharacterSet characterSet, UINT documentCodePage) noexcept {
+	CHARSETINFO ci {};
+	const BOOL bci = ::TranslateCharsetInfo(reinterpret_cast<DWORD *>(static_cast<uintptr_t>(characterSet)),
+						&ci, TCI_SRCCHARSET);
+
+	UINT cp = (bci) ? ci.ciACP : documentCodePage;
+
+	CPINFO cpi {};
+	if (!::IsValidCodePage(cp) && !::GetCPInfo(cp, &cpi))
+		cp = CP_ACP;
+
+	return cp;
+}
+
+void SciTEWin::OutputAppendEncodedStringSynchronised(const GUI::gui_string &s, int codePageDocument) {
+	std::string sMulti = StringEncode(s, codePageDocument);
+	OutputAppendStringSynchronised(sMulti.c_str());
+}
+
+CommandWorker::CommandWorker() noexcept : pSciTE(nullptr) {
+	Initialise(true);
+}
+
+void CommandWorker::Initialise(bool resetToStart) noexcept {
+	if (resetToStart)
+		icmd = 0;
+	originalEnd = 0;
+	exitStatus = 0;
+	flags = 0;
+	seenOutput = false;
+	outputScroll = 1;
+}
+
+void CommandWorker::Execute() {
+	pSciTE->ProcessExecute();
+}
+
+void SciTEWin::ResetExecution() {
+	cmdWorker.Initialise(true);
+	jobQueue.SetExecuting(false);
+	if (needReadProperties)
+		ReadProperties();
+	CheckReload();
+	CheckMenus();
+	jobQueue.ClearJobs();
+	::SendMessage(MainHWND(), WM_COMMAND, IDM_FINISHEDEXECUTE, 0);
+}
+
+void SciTEWin::ExecuteNext() {
+	cmdWorker.icmd++;
+	if (cmdWorker.icmd < jobQueue.commandCurrent && cmdWorker.icmd < jobQueue.commandMax && cmdWorker.exitStatus == 0) {
+		Execute();
+	} else {
+		ResetExecution();
+	}
+}
+
+/**
+ * Run a command with redirected input and output streams
+ * so the output can be put in a window.
+ * It is based upon several usenet posts and a knowledge base article.
+ * This is running in a separate thread to the user interface so should always
+ * use ScintillaWindow::Send rather than a one of the direct function calls.
+ */
+DWORD SciTEWin::ExecuteOne(const Job &jobToRun) {
+	DWORD exitcode = 0;
+
+	if (jobToRun.jobType == jobShell) {
+		ShellExec(jobToRun.command, jobToRun.directory.AsUTF8().c_str());
+		return exitcode;
+	}
+
+	if (jobToRun.jobType == jobHelp) {
+		ExecuteHelp(jobToRun.command.c_str());
+		return exitcode;
+	}
+
+	if (jobToRun.jobType == jobOtherHelp) {
+		ExecuteOtherHelp(jobToRun.command.c_str());
+		return exitcode;
+	}
+
+	if (jobToRun.jobType == jobGrep) {
+		// jobToRun.command is "(w|~)(c|~)(d|~)(b|~)\0files\0text"
+		const char *grepCmd = jobToRun.command.c_str();
+		if (*grepCmd) {
+			GrepFlags gf = grepNone;
+			if (*grepCmd == 'w')
+				gf = static_cast<GrepFlags>(gf | grepWholeWord);
+			grepCmd++;
+			if (*grepCmd == 'c')
+				gf = static_cast<GrepFlags>(gf | grepMatchCase);
+			grepCmd++;
+			if (*grepCmd == 'd')
+				gf = static_cast<GrepFlags>(gf | grepDot);
+			grepCmd++;
+			if (*grepCmd == 'b')
+				gf = static_cast<GrepFlags>(gf | grepBinary);
+			const char *findFiles = grepCmd + 2;
+			const char *findText = findFiles + strlen(findFiles) + 1;
+			if (cmdWorker.outputScroll == 1)
+				gf = static_cast<GrepFlags>(gf | grepScroll);
+			SA::Position positionEnd = wOutput.Send(SCI_GETCURRENTPOS);
+			InternalGrep(gf, jobToRun.directory.AsInternal(), GUI::StringFromUTF8(findFiles).c_str(), findText, positionEnd);
+			if ((gf & grepScroll) && returnOutputToCommand)
+				wOutput.Send(SCI_GOTOPOS, positionEnd);
+		}
+		return exitcode;
+	}
+
+	UINT codePageOutput = static_cast<UINT>(wOutput.Send(SCI_GETCODEPAGE));
+	if (codePageOutput != SA::CpUtf8) {
+		codePageOutput = CodePageFromCharSet(characterSet, codePageOutput);
+	}
+
+	SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), nullptr, TRUE};
+	OutputAppendStringSynchronised(">");
+	OutputAppendEncodedStringSynchronised(GUI::StringFromUTF8(jobToRun.command), codePageOutput);
+	OutputAppendStringSynchronised("\n");
+
+	HANDLE hPipeWrite {};
+	HANDLE hPipeRead {};
+	// Create pipe for output redirection
+	// read handle, write handle, security attributes,  number of bytes reserved for pipe
+	constexpr DWORD pipeBufferSize = 64 * 1024;
+	::CreatePipe(&hPipeRead, &hPipeWrite, &sa, pipeBufferSize);
+
+	// Create pipe for input redirection. In this code, you do not
+	// redirect the output of the child process, but you need a handle
+	// to set the hStdInput field in the STARTUP_INFO struct. For safety,
+	// you should not set the handles to an invalid handle.
+
+	hWriteSubProcess = {};
+	subProcessGroupId = 0;
+	HANDLE hRead2 {};
+	// read handle, write handle, security attributes,  number of bytes reserved for pipe
+	::CreatePipe(&hRead2, &hWriteSubProcess, &sa, pipeBufferSize);
+
+	::SetHandleInformation(hPipeRead, HANDLE_FLAG_INHERIT, 0);
+	::SetHandleInformation(hWriteSubProcess, HANDLE_FLAG_INHERIT, 0);
+
+	// Make child process use hPipeWrite as standard out, and make
+	// sure it does not show on screen.
+	STARTUPINFOW si = {};
+	si.cb = sizeof(STARTUPINFO);
+	si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
+	if (jobToRun.jobType == jobCLI)
+		si.wShowWindow = SW_HIDE;
+	else
+		si.wShowWindow = SW_SHOW;
+	si.hStdInput = hRead2;
+	si.hStdOutput = hPipeWrite;
+	si.hStdError = hPipeWrite;
+
+	FilePath startDirectory = jobToRun.directory.AbsolutePath();
+
+	PROCESS_INFORMATION pi = {};
+
+	// Make a mutable copy as the CreateProcess parameter is mutable
+	const GUI::gui_string sCommand = GUI::StringFromUTF8(jobToRun.command);
+	std::vector<wchar_t> vwcCommand(sCommand.c_str(), sCommand.c_str() + sCommand.length() + 1);
+
+	BOOL running = ::CreateProcessW(
+			       nullptr,
+			       &vwcCommand[0],
+			       nullptr, nullptr,
+			       TRUE, CREATE_NEW_PROCESS_GROUP,
+			       nullptr,
+			       startDirectory.IsSet() ?
+			       startDirectory.AsInternal() : nullptr,
+			       &si, &pi);
+
+	const DWORD errCode = ::GetLastError();
+	// if jobCLI "System can't find" - try calling with command processor
+	if ((!running) && (jobToRun.jobType == jobCLI) && (
+				(errCode == ERROR_FILE_NOT_FOUND) || (errCode == ERROR_BAD_EXE_FORMAT))) {
+
+		std::string runComLine = "cmd.exe /c ";
+		runComLine = runComLine.append(jobToRun.command);
+
+		const GUI::gui_string sRunComLine = GUI::StringFromUTF8(runComLine);
+		std::vector<wchar_t> vwcRunComLine(sRunComLine.c_str(), sRunComLine.c_str() + sRunComLine.length() + 1);
+
+		running = ::CreateProcessW(
+				  nullptr,
+				  &vwcRunComLine[0],
+				  nullptr, nullptr,
+				  TRUE, CREATE_NEW_PROCESS_GROUP,
+				  nullptr,
+				  startDirectory.IsSet() ?
+				  startDirectory.AsInternal() : nullptr,
+				  &si, &pi);
+	}
+
+	if (running) {
+		subProcessGroupId = pi.dwProcessId;
+
+		bool cancelled = false;
+
+		std::string repSelBuf;
+
+		size_t totalBytesToWrite = 0;
+		if (jobToRun.flags & jobHasInput) {
+			totalBytesToWrite = jobToRun.input.length();
+		}
+
+		if (totalBytesToWrite > 0 && !(jobToRun.flags & jobQuiet)) {
+			std::string input = jobToRun.input;
+			Substitute(input, "\n", "\n>> ");
+
+			OutputAppendStringSynchronised(">> ");
+			OutputAppendStringSynchronised(input.c_str());
+			OutputAppendStringSynchronised("\n");
+		}
+
+		unsigned writingPosition = 0;
+
+		int countPeeks = 0;
+		bool processDead = false;
+		while (running) {
+			if (writingPosition >= totalBytesToWrite) {
+				if (countPeeks > 10)
+					::Sleep(100L);
+				else if (countPeeks > 2)
+					::Sleep(10L);
+				countPeeks++;
+			}
+
+			// If we don't already know the process is dead,
+			// check now (before polling the output pipe)
+			if (!processDead && (WAIT_OBJECT_0 == ::WaitForSingleObject(pi.hProcess, 0))) {
+				processDead = true;
+			}
+
+			DWORD bytesRead = 0;
+			DWORD bytesAvail = 0;
+			std::vector<char> buffer(pipeBufferSize);
+
+			if (!::PeekNamedPipe(hPipeRead, &buffer[0],
+					     static_cast<DWORD>(buffer.size()), &bytesRead, &bytesAvail, nullptr)) {
+				bytesAvail = 0;
+			}
+
+			if ((bytesAvail < 1000) && (hWriteSubProcess != INVALID_HANDLE_VALUE) && (writingPosition < totalBytesToWrite)) {
+				// There is input to transmit to the process.  Do it in small blocks, interleaved
+				// with reads, so that our hRead buffer will not be overrun with results.
+
+				size_t bytesToWrite;
+				const size_t eolPos = jobToRun.input.find("\n", writingPosition);
+				if (eolPos == std::string::npos) {
+					bytesToWrite = totalBytesToWrite - writingPosition;
+				} else {
+					bytesToWrite = eolPos + 1 - writingPosition;
+				}
+				if (bytesToWrite > 250) {
+					bytesToWrite = 250;
+				}
+
+				DWORD bytesWrote = 0;
+
+				const int bTest = ::WriteFile(hWriteSubProcess,
+							      jobToRun.input.c_str() + writingPosition,
+							      static_cast<DWORD>(bytesToWrite), &bytesWrote, nullptr);
+
+				if (bTest) {
+					if ((writingPosition + bytesToWrite) / 1024 > writingPosition / 1024) {
+						// sleep occasionally, even when writing
+						::Sleep(100L);
+					}
+
+					writingPosition += bytesWrote;
+
+					if (writingPosition >= totalBytesToWrite) {
+						::CloseHandle(hWriteSubProcess);
+						hWriteSubProcess = INVALID_HANDLE_VALUE;
+					}
+
+				} else {
+					// Is this the right thing to do when writing to the pipe fails?
+					::CloseHandle(hWriteSubProcess);
+					hWriteSubProcess = INVALID_HANDLE_VALUE;
+					OutputAppendStringSynchronised("\n>Input pipe closed due to write failure.\n");
+				}
+
+			} else if (bytesAvail > 0) {
+				const int bTest = ::ReadFile(hPipeRead, &buffer[0],
+							     static_cast<DWORD>(buffer.size()), &bytesRead, nullptr);
+
+				if (bTest && bytesRead) {
+
+					if (jobToRun.flags & jobRepSelMask) {
+						repSelBuf.append(&buffer[0], bytesRead);
+					}
+
+					if (!(jobToRun.flags & jobQuiet)) {
+						if (!cmdWorker.seenOutput) {
+							ShowOutputOnMainThread();
+							cmdWorker.seenOutput = true;
+						}
+						// Display the data
+						OutputAppendStringSynchronised(&buffer[0], bytesRead);
+					}
+
+					::UpdateWindow(MainHWND());
+				} else {
+					running = false;
+				}
+			} else {
+				// bytesAvail == 0, and if the process
+				// was already dead by the time we did
+				// PeekNamedPipe, there should not be
+				// any more data coming
+				if (processDead) {
+					running = false;
+				}
+			}
+
+			if (jobQueue.SetCancelFlag(false)) {
+				if (WAIT_OBJECT_0 != ::WaitForSingleObject(pi.hProcess, 500)) {
+					// We should use it only if the GUI process is stuck and
+					// don't answer to a normal termination command.
+					// This function is dangerous: dependent DLLs don't know the process
+					// is terminated, and memory isn't released.
+					OutputAppendStringSynchronised("\n>Process failed to respond; forcing abrupt termination...\n");
+					::TerminateProcess(pi.hProcess, 1);
+				}
+				running = false;
+				cancelled = true;
+			}
+		}
+
+		if (WAIT_OBJECT_0 != ::WaitForSingleObject(pi.hProcess, 1000)) {
+			OutputAppendStringSynchronised("\n>Process failed to respond; forcing abrupt termination...");
+			::TerminateProcess(pi.hProcess, 2);
+		}
+		::GetExitCodeProcess(pi.hProcess, &exitcode);
+		std::ostringstream stExitMessage;
+		stExitMessage << ">Exit code: " << exitcode;
+		if (jobQueue.TimeCommands()) {
+			stExitMessage << "    Time: ";
+			stExitMessage << std::setprecision(4) << cmdWorker.commandTime.Duration();
+		}
+		stExitMessage << "\n";
+		OutputAppendStringSynchronised(stExitMessage.str().c_str());
+
+		::CloseHandle(pi.hProcess);
+		::CloseHandle(pi.hThread);
+
+		if (!cancelled) {
+			bool doRepSel = false;
+			if (jobToRun.flags & jobRepSelYes)
+				doRepSel = true;
+			else if (jobToRun.flags & jobRepSelAuto)
+				doRepSel = (0 == exitcode);
+
+			if (doRepSel) {
+				const SA::Position cpMin = wEditor.Send(SCI_GETSELECTIONSTART);
+				wEditor.Send(SCI_REPLACESEL, 0, SptrFromString(repSelBuf.c_str()));
+				wEditor.Send(SCI_SETSEL, cpMin, cpMin+repSelBuf.length());
+			}
+		}
+
+		WarnUser(warnExecuteOK);
+
+	} else {
+		const DWORD nRet = ::GetLastError();
+		OutputAppendStringSynchronised(">");
+		OutputAppendEncodedStringSynchronised(GetErrorMessage(nRet), codePageOutput);
+		WarnUser(warnExecuteKO);
+	}
+	::CloseHandle(hPipeRead);
+	::CloseHandle(hPipeWrite);
+	::CloseHandle(hRead2);
+	::CloseHandle(hWriteSubProcess);
+	hWriteSubProcess = {};
+	subProcessGroupId = 0;
+	return exitcode;
+}
+
+/**
+ * Run a command in the job queue, stopping if one fails.
+ * This is running in a separate thread to the user interface so must be
+ * careful when reading and writing shared state.
+ */
+void SciTEWin::ProcessExecute() {
+	if (scrollOutput)
+		wOutput.Send(SCI_GOTOPOS, wOutput.Send(SCI_GETTEXTLENGTH));
+
+	cmdWorker.exitStatus = ExecuteOne(jobQueue.jobQueue[cmdWorker.icmd]);
+	if (jobQueue.isBuilding) {
+		// The build command is first command in a sequence so it is only built if
+		// that command succeeds not if a second returns after document is modified.
+		jobQueue.isBuilding = false;
+		if (cmdWorker.exitStatus == 0)
+			jobQueue.isBuilt = true;
+	}
+
+	// Move selection back to beginning of this run so that F4 will go
+	// to first error of this run.
+	// scroll and return only if output.scroll equals
+	// one in the properties file
+	if ((cmdWorker.outputScroll == 1) && returnOutputToCommand)
+		wOutput.Send(SCI_GOTOPOS, cmdWorker.originalEnd);
+	returnOutputToCommand = true;
+	PostOnMainThread(WORK_EXECUTE, &cmdWorker);
+}
+
+void SciTEWin::ShellExec(const std::string &cmd, const char *dir) {
+	// guess if cmd is an executable, if this succeeds it can
+	// contain spaces without enclosing it with "
+	std::string cmdLower = cmd;
+	LowerCaseAZ(cmdLower);
+	const char *mycmdLowered = cmdLower.c_str();
+
+	const char *s = strstr(mycmdLowered, ".exe");
+	if (!s)
+		s = strstr(mycmdLowered, ".cmd");
+	if (!s)
+		s = strstr(mycmdLowered, ".bat");
+	if (!s)
+		s = strstr(mycmdLowered, ".com");
+	std::vector<char> cmdcopy(cmd.c_str(), cmd.c_str() + cmd.length() + 1);
+	char *mycmdcopy = &cmdcopy[0];
+	char *mycmd;
+	char *mycmdEnd = nullptr;
+	if (s && ((*(s + 4) == '\0') || (*(s + 4) == ' '))) {
+		ptrdiff_t len_mycmd = s - mycmdLowered + 4;
+		mycmd = mycmdcopy;
+		mycmdEnd = mycmdcopy + len_mycmd;
+	} else {
+		if (*mycmdcopy != '"') {
+			// get next space to separate cmd and parameters
+			mycmd = mycmdcopy;
+			mycmdEnd = strchr(mycmdcopy, ' ');
+		} else {
+			// the cmd is surrounded by ", so it can contain spaces, but we must
+			// strip the " for ShellExec
+			mycmd = mycmdcopy + 1;
+			char *sm = strchr(mycmdcopy + 1, '"');
+			if (sm) {
+				*sm = '\0';
+				mycmdEnd = sm + 1;
+			}
+		}
+	}
+
+	std::string myparams;
+	if (mycmdEnd && (*mycmdEnd != '\0')) {
+		*mycmdEnd = '\0';
+		// test for remaining params after cmd, they may be surrounded by " but
+		// we give them as-is to ShellExec
+		++mycmdEnd;
+		while (*mycmdEnd == ' ')
+			++mycmdEnd;
+
+		if (*mycmdEnd != '\0')
+			myparams = mycmdEnd;
+	}
+
+	GUI::gui_string sMycmd = GUI::StringFromUTF8(mycmd);
+	GUI::gui_string sMyparams = GUI::StringFromUTF8(myparams);
+	GUI::gui_string sDir = GUI::StringFromUTF8(dir);
+
+	SHELLEXECUTEINFO exec {};
+	exec.cbSize = sizeof(exec);
+	exec.fMask = SEE_MASK_FLAG_NO_UI; // own msg box on return
+	exec.hwnd = MainHWND();
+	exec.lpVerb = L"open";  // better for executables to use "open" instead of NULL
+	exec.lpFile = sMycmd.c_str();   // file to open
+	exec.lpParameters = sMyparams.c_str(); // parameters
+	exec.lpDirectory = sDir.c_str(); // launch directory
+	exec.nShow = SW_SHOWNORMAL; //default show cmd
+
+	if (::ShellExecuteEx(&exec)) {
+		// it worked!
+		return;
+	}
+	const DWORD rc = GetLastError();
+
+	std::string errormsg("Error while launching:\n\"");
+	errormsg += mycmdcopy;
+	if (myparams.length()) {
+		errormsg += "\" with Params:\n\"";
+		errormsg += myparams;
+	}
+	errormsg += "\"\n";
+	GUI::gui_string sErrorMsg = GUI::StringFromUTF8(errormsg) + GetErrorMessage(rc);
+	WindowMessageBox(wSciTE, sErrorMsg, mbsOK);
+}
+
+void SciTEWin::Execute() {
+	if (buffers.SavingInBackground())
+		// May be saving file that should be used by command so wait until all saved
+		return;
+
+	SciTEBase::Execute();
+	if (!jobQueue.HasCommandToRun())
+		// No commands to execute - possibly cancelled in SciTEBase::Execute
+		return;
+
+	cmdWorker.Initialise(false);
+	cmdWorker.outputScroll = props.GetInt("output.scroll", 1);
+	cmdWorker.originalEnd = wOutput.Length();
+	cmdWorker.commandTime.Duration(true);
+	cmdWorker.flags = jobQueue.jobQueue[cmdWorker.icmd].flags;
+	if (scrollOutput)
+		wOutput.GotoPos(wOutput.Length());
+
+	if (jobQueue.jobQueue[cmdWorker.icmd].jobType == jobExtension) {
+		// Execute extensions synchronously
+		if (jobQueue.jobQueue[cmdWorker.icmd].flags & jobGroupUndo)
+			wEditor.BeginUndoAction();
+
+		if (extender)
+			extender->OnExecute(jobQueue.jobQueue[cmdWorker.icmd].command.c_str());
+
+		if (jobQueue.jobQueue[cmdWorker.icmd].flags & jobGroupUndo)
+			wEditor.EndUndoAction();
+
+		ExecuteNext();
+	} else {
+		// Execute other jobs asynchronously on a new thread
+		PerformOnNewThread(&cmdWorker);
+	}
+}
+
+void SciTEWin::StopExecute() {
+	if (hWriteSubProcess && (hWriteSubProcess != INVALID_HANDLE_VALUE)) {
+		const char stop[] = "\032";
+		DWORD bytesWrote = 0;
+		::WriteFile(hWriteSubProcess, stop, static_cast<DWORD>(strlen(stop)), &bytesWrote, nullptr);
+		Sleep(500L);
+	}
+
+#ifdef USE_CONSOLE_EVENT
+	if (subProcessGroupId) {
+		// this also doesn't work
+		OutputAppendStringSynchronised("\n>Attempting to cancel process...");
+
+		if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, subProcessGroupId)) {
+			LONG errCode = GetLastError();
+			OutputAppendStringSynchronised("\n>BREAK Failed ");
+			std::string sError = StdStringFromInteger(errCode);
+			OutputAppendStringSynchronised(sError.c_str());
+			OutputAppendStringSynchronised("\n");
+		}
+		Sleep(100L);
+	}
+#endif
+
+	jobQueue.SetCancelFlag(true);
+}
+
+void SciTEWin::AddCommand(const std::string &cmd, const std::string &dir, JobSubsystem jobType, const std::string &input, int flags) {
+	if (cmd.length()) {
+		if ((jobType == jobShell) && ((flags & jobForceQueue) == 0)) {
+			std::string pCmd = cmd;
+			parameterisedCommand = "";
+			if (pCmd[0] == '*') {
+				pCmd.erase(0, 1);
+				parameterisedCommand = pCmd;
+				if (!ParametersDialog(true)) {
+					return;
+				}
+			} else {
+				ParamGrab();
+			}
+			pCmd = props.Expand(pCmd);
+			ShellExec(pCmd, dir.c_str());
+		} else {
+			SciTEBase::AddCommand(cmd, dir, jobType, input, flags);
+		}
+	}
+}
+
+void SciTEWin::PostOnMainThread(int cmd, Worker *pWorker) {
+	::PostMessage(HwndOf(wSciTE), SCITE_WORKER, cmd, reinterpret_cast<LPARAM>(pWorker));
+}
+
+void SciTEWin::WorkerCommand(int cmd, Worker *pWorker) {
+	if (cmd < WORK_PLATFORM) {
+		SciTEBase::WorkerCommand(cmd, pWorker);
+	} else {
+		if (cmd == WORK_EXECUTE) {
+			// Move to next command
+			ExecuteNext();
+		}
+	}
+}
+
+void SciTEWin::QuitProgram() {
+	quitting = false;
+	if (SaveIfUnsureAll() != saveCancelled) {
+		if (fullScreen)	// Ensure tray visible on exit
+			FullScreenToggle();
+		quitting = true;
+		// If ongoing saves, wait for them to complete.
+		if (!buffers.SavingInBackground()) {
+			::PostQuitMessage(0);
+			wSciTE.Destroy();
+		}
+	}
+}
+
+void SciTEWin::RestorePosition() {
+	const int left = propsSession.GetInt("position.left", CW_USEDEFAULT);
+	const int top = propsSession.GetInt("position.top", CW_USEDEFAULT);
+	const int width = propsSession.GetInt("position.width", CW_USEDEFAULT);
+	const int height = propsSession.GetInt("position.height", CW_USEDEFAULT);
+	cmdShow = propsSession.GetInt("position.maximize", 0) ? SW_MAXIMIZE : 0;
+
+	constexpr int defaultValue = CW_USEDEFAULT;
+	if (left != defaultValue &&
+			top != defaultValue &&
+			width != defaultValue &&
+			height != defaultValue) {
+		winPlace.length = sizeof(winPlace);
+		winPlace.rcNormalPosition.left = left;
+		winPlace.rcNormalPosition.right = left + width;
+		winPlace.rcNormalPosition.top = top;
+		winPlace.rcNormalPosition.bottom = top + height;
+		::SetWindowPlacement(MainHWND(), &winPlace);
+	}
+}
+
+void SciTEWin::CreateUI() {
+	CreateBuffers();
+
+	int left = props.GetInt("position.left", CW_USEDEFAULT);
+	const int top = props.GetInt("position.top", CW_USEDEFAULT);
+	int width = props.GetInt("position.width", CW_USEDEFAULT);
+	int height = props.GetInt("position.height", CW_USEDEFAULT);
+	cmdShow = props.GetInt("position.maximize", 0) ? SW_MAXIMIZE : 0;
+	if (width == -1 || height == -1) {
+		cmdShow = SW_MAXIMIZE;
+		width = CW_USEDEFAULT;
+		height = CW_USEDEFAULT;
+	}
+
+	if (props.GetInt("position.tile") && ::FindWindow(TEXT("SciTEWindow"), nullptr) &&
+			(left != static_cast<int>(CW_USEDEFAULT))) {
+		left += width;
+	}
+	// Pass 'this' pointer in lpParam of CreateWindow().
+	wSciTE = ::CreateWindowEx(
+			 0,
+			 className,
+			 windowName.c_str(),
+			 WS_CAPTION | WS_SYSMENU | WS_THICKFRAME |
+			 WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
+			 WS_CLIPCHILDREN,
+			 left, top, width, height,
+			 NULL,
+			 NULL,
+			 hInstance,
+			 this);
+	if (!wSciTE.Created())
+		exit(FALSE);
+
+	if (props.GetInt("save.position"))
+		RestorePosition();
+
+	LocaliseMenus();
+	std::string pageSetup = props.GetString("print.margins");
+	char val[32] = "";
+	const char *ps = pageSetup.c_str();
+	const char *next = GetNextPropItem(ps, val, 32);
+	pagesetupMargin.left = atol(val);
+	next = GetNextPropItem(next, val, 32);
+	pagesetupMargin.right = atol(val);
+	next = GetNextPropItem(next, val, 32);
+	pagesetupMargin.top = atol(val);
+	GetNextPropItem(next, val, 32);
+	pagesetupMargin.bottom = atol(val);
+
+	UIAvailable();
+}
+
+static constexpr bool IsSpaceOrTab(GUI::gui_char ch) noexcept {
+	return (ch == ' ') || (ch == '\t');
+}
+
+/**
+ * Break up the command line into individual arguments and strip double quotes
+ * from each argument.
+ * @return A string with each argument separated by '\n'.
+ */
+GUI::gui_string SciTEWin::ProcessArgs(const GUI::gui_char *cmdLine) {
+	GUI::gui_string args;
+	const GUI::gui_char *startArg = cmdLine;
+	while (*startArg) {
+		while (IsSpaceOrTab(*startArg)) {
+			startArg++;
+		}
+		const GUI::gui_char *endArg = startArg;
+		if (*startArg == '"') {	// Opening double-quote
+			startArg++;
+			endArg = startArg;
+			while (*endArg && *endArg != '\"') {
+				endArg++;
+			}
+		} else {	// No double-quote, end of argument on first space
+			while (*endArg && !IsSpaceOrTab(*endArg)) {
+				endArg++;
+			}
+		}
+		GUI::gui_string arg(startArg, 0, endArg - startArg);
+		if (args.size() > 0)
+			args += GUI_TEXT("\n");
+		args += arg;
+		startArg = endArg;	// On a space or a double-quote, or on the end of the command line
+		if (*startArg == '"') {	// Closing double-quote
+			startArg++;	// Consume the double-quote
+		}
+		while (IsSpaceOrTab(*startArg)) {
+			// Consume spaces between arguments
+			startArg++;
+		}
+	}
+
+	return args;
+}
+
+/**
+ * Process the command line, check for other instance wanting to open files,
+ * create the SciTE window, perform batch processing (print) or transmit command line
+ * to other instance and exit or just show the window and open files.
+ */
+void SciTEWin::Run(const GUI::gui_char *cmdLine) {
+	// Load the default session file
+	if (props.GetInt("save.session") || props.GetInt("save.position") || props.GetInt("save.recent")) {
+		LoadSessionFile(GUI_TEXT(""));
+	}
+
+	// Break up the command line into individual arguments
+	GUI::gui_string args = ProcessArgs(cmdLine);
+	// Read the command line parameters:
+	// In case the check.if.already.open property has been set or reset on the command line,
+	// we still get a last chance to force checking or to open a separate instance;
+	// Check if the user just want to print the file(s).
+	// Don't process files yet.
+	const bool bBatchProcessing = ProcessCommandLine(args, 0);
+
+	// No need to check for other instances when doing a batch job:
+	// perform some tasks and exit immediately.
+	if (!bBatchProcessing && props.GetInt("check.if.already.open") != 0) {
+		uniqueInstance.CheckOtherInstance();
+	}
+
+	// We create the window, so it can be found by EnumWindows below,
+	// and the Scintilla control is thus created, allowing to print the file(s).
+	// We don't show it yet, so if it is destroyed (duplicate instance), it will
+	// not flash on the taskbar or on the display.
+	CreateUI();
+
+	if (bBatchProcessing) {
+		// Reprocess the command line and read the files
+		ProcessCommandLine(args, 1);
+		Print(false);	// Don't ask user for print parameters
+		// Done, we exit the program
+		::PostQuitMessage(0);
+		wSciTE.Destroy();
+		return;
+	}
+
+	if (props.GetInt("check.if.already.open") != 0 && uniqueInstance.FindOtherInstance()) {
+		uniqueInstance.SendCommands(GUI::UTF8FromString(cmdLine).c_str());
+
+		// Kill itself, leaving room to the previous instance
+		::PostQuitMessage(0);
+		wSciTE.Destroy();
+		return;	// Don't do anything else
+	}
+
+	// OK, the instance will be displayed
+	SizeSubWindows();
+	wSciTE.Show();
+	if (cmdShow) {	// assume SW_MAXIMIZE only
+		::ShowWindow(MainHWND(), cmdShow);
+	}
+
+	// Open all files given on command line.
+	// The filenames containing spaces must be enquoted.
+	// In case of not using buffers they get closed immediately except
+	// the last one, but they move to the MRU file list
+	ProcessCommandLine(args, 1);
+	Redraw();
+}
+
+/**
+ * Draw the split bar.
+ */
+void ContentWin::Paint(HDC hDC, GUI::Rectangle) {
+	const GUI::Rectangle rcInternal = GetClientPosition();
+
+	const int heightClient = rcInternal.Height();
+	const int widthClient = rcInternal.Width();
+
+	const int heightEditor = heightClient - pSciTEWin->heightOutput - pSciTEWin->heightBar;
+	const int yBorder = heightEditor;
+	const int xBorder = widthClient - pSciTEWin->heightOutput - pSciTEWin->heightBar;
+	for (int i = 0; i < pSciTEWin->heightBar; i++) {
+		int colourIndex = COLOR_3DFACE;
+		if (pSciTEWin->flatterUI) {
+			if (i == 0 || i == pSciTEWin->heightBar - 1)
+				colourIndex = COLOR_3DFACE;
+			else
+				colourIndex = COLOR_WINDOW;
+		} else {
+			if (i == 1)
+				colourIndex = COLOR_3DHIGHLIGHT;
+			else if (i == pSciTEWin->heightBar - 2)
+				colourIndex = COLOR_3DSHADOW;
+			else if (i == pSciTEWin->heightBar - 1)
+				colourIndex = COLOR_3DDKSHADOW;
+			else
+				colourIndex = COLOR_3DFACE;
+		}
+		HPEN pen = ::CreatePen(0, 1, ::GetSysColor(colourIndex));
+		HPEN penOld = SelectPen(hDC, pen);
+		if (pSciTEWin->splitVertical) {
+			::MoveToEx(hDC, xBorder + i, 0, nullptr);
+			::LineTo(hDC, xBorder + i, heightClient);
+		} else {
+			::MoveToEx(hDC, 0, yBorder + i, nullptr);
+			::LineTo(hDC, widthClient, yBorder + i);
+		}
+		SelectPen(hDC, penOld);
+		DeletePen(pen);
+	}
+}
+
+void SciTEWin::AboutDialog() {
+#ifdef STATIC_BUILD
+	AboutDialogWithBuild(1);
+#else
+	AboutDialogWithBuild(0);
+#endif
+}
+
+/**
+ * Open files dropped on the SciTE window.
+ */
+void SciTEWin::DropFiles(HDROP hdrop) {
+	// If drag'n'drop inside the SciTE window but outside
+	// Scintilla, hdrop is null, and an exception is generated!
+	if (hdrop) {
+		const bool tempFilesSyncLoad = props.GetInt("temp.files.sync.load") != 0;
+		GUI::gui_char tempDir[MAX_PATH];
+		const DWORD tempDirLen = ::GetTempPath(MAX_PATH, tempDir);
+		bool isTempFile = false;
+		const int filesDropped = ::DragQueryFile(hdrop, 0xffffffff, nullptr, 0);
+		// Append paths to dropFilesQueue, to finish drag operation soon
+		for (int i = 0; i < filesDropped; ++i) {
+			GUI::gui_char pathDropped[MAX_PATH];
+			::DragQueryFileW(hdrop, i, pathDropped,
+					 static_cast<UINT>(std::size(pathDropped)));
+			// Only do this for the first file in the drop op
+			// as all are coming from the same drag location
+			if (i == 0 && tempFilesSyncLoad) {
+				// check if file's parent dir is temp
+				if (::wcsncmp(tempDir, pathDropped, tempDirLen) == 0) {
+					isTempFile = true;
+				}
+			}
+			if (isTempFile) {
+				if (!Open(pathDropped, ofSynchronous)) {
+					break;
+				}
+			} else {
+				dropFilesQueue.push_back(pathDropped);
+			}
+		}
+		::DragFinish(hdrop);
+		// Put SciTE to forefront
+		// May not work for Win2k, but OK for lower versions
+		// Note: how to drop a file to an iconic window?
+		// Actually, it is the Send To command that generates a drop.
+		if (::IsIconic(MainHWND())) {
+			::ShowWindow(MainHWND(), SW_RESTORE);
+		}
+		::SetForegroundWindow(MainHWND());
+		// Post message to ourself for opening the files so we can finish the drop message and
+		// the drop source will respond when open operation takes long time (opening big files...)
+		if (!dropFilesQueue.empty()) {
+			::PostMessage(MainHWND(), SCITE_DROP, 0, 0);
+		}
+	}
+}
+
+/**
+ * Handle simple wild-card file patterns and directory requests.
+ */
+bool SciTEWin::PreOpenCheck(const GUI::gui_char *arg) {
+	bool isHandled = false;
+	HANDLE hFFile {};
+	WIN32_FIND_DATA ffile {};
+	const DWORD fileattributes = ::GetFileAttributes(arg);
+	int nbuffers = props.GetInt("buffers");
+	FilePath fpArg(arg);
+
+	if (fileattributes != INVALID_FILE_ATTRIBUTES) {	// arg is an existing directory or filename
+		// if the command line argument is a directory, use OpenDialog()
+		if (fileattributes & FILE_ATTRIBUTE_DIRECTORY) {
+			OpenDialog(fpArg, GUI::StringFromUTF8(props.GetExpandedString("open.filter")).c_str());
+			isHandled = true;
+		}
+	} else if (nbuffers > 1 && (hFFile = ::FindFirstFile(arg, &ffile)) != INVALID_HANDLE_VALUE) {
+		// If several buffers is accepted and the arg is a filename pattern matching at least an existing file
+		isHandled = true;
+		FilePath fpDir = fpArg.Directory();
+
+		do {
+			if (!(ffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {	// Skip directories
+				Open(FilePath(fpDir, ffile.cFileName));
+				--nbuffers;
+			}
+		} while (nbuffers > 0 && ::FindNextFile(hFFile, &ffile));
+		::FindClose(hFFile);
+	} else {
+
+		// if the filename is only an extension, open the dialog box with it as the extension filter
+		if (!fpArg.BaseName().IsSet()) {
+			isHandled = true;
+			FilePath fpDir = fpArg.Directory();
+			if (!fpDir.IsSet())
+				fpDir = FilePath(GUI_TEXT("."));
+			FilePath fpName = fpArg.Name();
+			GUI::gui_string wildcard(GUI_TEXT("*"));
+			wildcard += fpName.AsInternal();
+			wildcard += GUI_TEXT("|*");
+			wildcard += fpName.AsInternal();
+
+			OpenDialog(fpDir, wildcard.c_str());
+		} else if (!fpArg.Extension().IsSet()) {
+			// if the filename has no extension, try to match a file with list of standard extensions
+			std::string extensions = props.GetExpandedString("source.default.extensions");
+			if (extensions.length()) {
+				std::replace(extensions.begin(), extensions.end(), '|', '\0');
+				size_t start = 0;
+				while (start < extensions.length()) {
+					GUI::gui_string filterName = GUI::StringFromUTF8(extensions.c_str() + start);
+					GUI::gui_string nameWithExtension = fpArg.AsInternal();
+					nameWithExtension += filterName;
+					if (::GetFileAttributes(nameWithExtension.c_str()) != INVALID_FILE_ATTRIBUTES) {
+						isHandled = true;
+						Open(nameWithExtension);
+						break;	// Found!
+					} else {
+						// Next extension
+						start += strlen(extensions.c_str() + start) + 1;
+					}
+				}
+			}
+		}
+	}
+
+	return isHandled;
+}
+
+/* return true if stdin is blocked:
+	- stdin is the console (isatty() == 1)
+	- a valid handle for stdin cannot be generated
+	- the handle appears to be the console - this may be a duplicate of using isatty() == 1
+	- the pipe cannot be peeked, which appears to be from command lines such as "scite <file.txt"
+	otherwise it is unblocked
+*/
+bool SciTEWin::IsStdinBlocked() {
+	DWORD unreadMessages = 0;
+	INPUT_RECORD irec[1] = {};
+	char bytebuffer = '\0';
+	HANDLE hStdIn = ::GetStdHandle(STD_INPUT_HANDLE);
+	if (hStdIn == INVALID_HANDLE_VALUE) {
+		/* an invalid handle, assume that stdin is blocked by falling to bottom */;
+	} else if (::PeekConsoleInput(hStdIn, irec, 1, &unreadMessages) != 0) {
+		/* it is the console, assume that stdin is blocked by falling to bottom */;
+	} else if (::GetLastError() == ERROR_INVALID_HANDLE) {
+		for (int n = 0; n < 4; n++) {
+			/*	if this fails, it is either
+				- a busy pipe "scite \*.,cxx /s /b | s -@",
+				- another type of pipe "scite - <file", or
+				- a blocked pipe "findstring nothing | scite -"
+				in any case, retry in a short bit
+			*/
+			if (::PeekNamedPipe(hStdIn, &bytebuffer, sizeof(bytebuffer), nullptr, nullptr, &unreadMessages) != 0) {
+				if (unreadMessages != 0) {
+					return false; /* is a pipe and it is not blocked */
+				}
+			}
+			::Sleep(2500);
+		}
+	}
+	return true;
+}
+
+void SciTEWin::MinimizeToTray() {
+	NOTIFYICONDATA nid {};
+	nid.cbSize = sizeof(nid);
+	nid.hWnd = MainHWND();
+	nid.uID = 1;
+	nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+	nid.uCallbackMessage = SCITE_TRAY;
+	nid.hIcon = static_cast<HICON>(
+			    ::LoadImage(hInstance, TEXT("SCITE"), IMAGE_ICON, 16, 16, LR_DEFAULTSIZE));
+	StringCopy(nid.szTip, TEXT("SciTE"));
+	::ShowWindow(MainHWND(), SW_MINIMIZE);
+	if (::Shell_NotifyIcon(NIM_ADD, &nid)) {
+		::ShowWindow(MainHWND(), SW_HIDE);
+	}
+}
+
+void SciTEWin::RestoreFromTray() {
+	NOTIFYICONDATA nid {};
+	nid.cbSize = sizeof(nid);
+	nid.hWnd = MainHWND();
+	nid.uID = 1;
+	::ShowWindow(MainHWND(), SW_SHOW);
+	::Sleep(100);
+	::Shell_NotifyIcon(NIM_DELETE, &nid);
+}
+
+void SciTEWin::SettingChanged(WPARAM wParam, LPARAM lParam) {
+	if (lParam) {
+		const GUI::gui_string_view sv(reinterpret_cast<const wchar_t *>(lParam));
+		if (sv == L"ImmersiveColorSet") {
+			CheckAppearanceChanged();
+		}
+	}
+	wEditor.Send(WM_SETTINGCHANGE, wParam, lParam);
+	wOutput.Send(WM_SETTINGCHANGE, wParam, lParam);
+}
+
+void SciTEWin::SysColourChanged(WPARAM wParam, LPARAM lParam) {
+	CheckAppearanceChanged();
+	wEditor.Send(WM_SYSCOLORCHANGE, wParam, lParam);
+	wOutput.Send(WM_SYSCOLORCHANGE, wParam, lParam);
+}
+
+void SciTEWin::ScaleChanged(WPARAM wParam, LPARAM lParam) {
+	const int scale = LOWORD(wParam) * 100 / 96;
+	if (SetScaleFactor(scale)) {
+		wEditor.Send(WM_DPICHANGED, wParam, lParam);
+		wOutput.Send(WM_DPICHANGED, wParam, lParam);
+		ReloadProperties();
+		const RECT *rect = reinterpret_cast<const RECT *>(lParam);
+		::SetWindowPos(MainHWND(), NULL, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top,
+			SWP_NOZORDER | SWP_NOACTIVATE);
+
+		if (!fnSystemParametersInfoForDpi) {
+			fnSystemParametersInfoForDpi = DLLFunction<SystemParametersInfoForDpiSig>(
+				L"user32.dll", "SystemParametersInfoForDpi");
+		}
+
+		if (fnSystemParametersInfoForDpi) {
+			LOGFONTW lfIconTitle{};
+			if (fnSystemParametersInfoForDpi(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitle),
+				&lfIconTitle, FALSE, LOWORD(wParam))) {
+				const HFONT fontTabsPrevious = fontTabs;
+				fontTabs = ::CreateFontIndirectW(&lfIconTitle);
+				SetWindowFont(HwndOf(wTabBar), fontTabs, 0);
+				::DeleteObject(fontTabsPrevious);
+				SizeSubWindows();
+			}
+		}
+	}
+}
+
+inline bool KeyMatch(const std::string &sKey, int keyval, int modifiers) {
+	return SciTEKeys::MatchKeyCode(
+		       SciTEKeys::ParseKeyCode(sKey.c_str()), keyval, modifiers);
+}
+
+LRESULT SciTEWin::KeyDown(WPARAM wParam) {
+	// Look through lexer menu
+	const SA::KeyMod modifiers =
+		(IsKeyDown(VK_SHIFT) ? SA::KeyMod::Shift : SA::KeyMod::Norm) |
+		(IsKeyDown(VK_CONTROL) ? SA::KeyMod::Ctrl : SA::KeyMod::Norm) |
+		(IsKeyDown(VK_MENU) ? SA::KeyMod::Alt : SA::KeyMod::Norm);
+
+	const int keyVal = static_cast<int>(wParam);
+	const int modifierAsInt = static_cast<int>(modifiers);
+
+	if (extender && extender->OnKey(keyVal, modifierAsInt))
+		return 1l;
+
+	for (unsigned int j = 0; j < languageMenu.size(); j++) {
+		if (KeyMatch(languageMenu[j].menuKey, keyVal, modifierAsInt)) {
+			SciTEBase::MenuCommand(IDM_LANGUAGE + j);
+			return 1l;
+		}
+	}
+
+	// loop through the Tools menu's active commands.
+	HMENU hMenu = ::GetMenu(MainHWND());
+	HMENU hToolsMenu = ::GetSubMenu(hMenu, menuTools);
+	for (int tool = 0; tool < toolMax; ++tool) {
+		MENUITEMINFO mii {};
+		mii.cbSize = sizeof(MENUITEMINFO);
+		mii.fMask = MIIM_DATA;
+		if (::GetMenuItemInfo(hToolsMenu, IDM_TOOLS+tool, FALSE, &mii) && mii.dwItemData) {
+			if (SciTEKeys::MatchKeyCode(static_cast<long>(mii.dwItemData), keyVal, modifierAsInt)) {
+				SciTEBase::MenuCommand(IDM_TOOLS+tool);
+				return 1l;
+			}
+		}
+	}
+
+	// loop through the keyboard short cuts defined by user.. if found
+	// exec it the command defined
+	for (const ShortcutItem &scut : shortCutItemList) {
+		if (KeyMatch(scut.menuKey, keyVal, modifierAsInt)) {
+			const int commandNum = SciTEBase::GetMenuCommandAsInt(scut.menuCommand);
+			if (commandNum != -1) {
+				// its possible that the command is for scintilla directly
+				// all scintilla commands are larger then 2000
+				if (commandNum < 2000) {
+					SciTEBase::MenuCommand(commandNum);
+				} else {
+					PaneFocused().Call(static_cast<SA::Message>(commandNum));
+				}
+				return 1l;
+			}
+		}
+	}
+
+	return 0;
+}
+
+LRESULT SciTEWin::KeyUp(WPARAM wParam) {
+	if (wParam == VK_CONTROL) {
+		EndStackedTabbing();
+	}
+	return 0;
+}
+
+void SciTEWin::AddToPopUp(const char *label, int cmd, bool enabled) {
+	GUI::gui_string localised = localiser.Text(label);
+	HMENU menu = static_cast<HMENU>(popup.GetID());
+	if (0 == localised.length())
+		::AppendMenu(menu, MF_SEPARATOR, 0, TEXT(""));
+	else if (enabled)
+		::AppendMenu(menu, MF_STRING, cmd, localised.c_str());
+	else
+		::AppendMenu(menu, MF_STRING | MF_DISABLED | MF_GRAYED, cmd, localised.c_str());
+}
+
+LRESULT SciTEWin::ContextMenuMessage(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	GUI::ScintillaWindow *w = &wEditor;
+	GUI::Point pt = PointFromLong(lParam);
+	if ((pt.x == -1) && (pt.y == -1)) {
+		// Caused by keyboard so display menu near caret
+		if (wOutput.HasFocus())
+			w = &wOutput;
+		const SA::Position position = w->CurrentPos();
+		pt.x = w->PointXFromPosition(position);
+		pt.y = w->PointYFromPosition(position);
+		POINT spt = {pt.x, pt.y};
+		::ClientToScreen(HwndOf(*w), &spt);
+		pt = GUI::Point(spt.x, spt.y);
+	} else {
+		const GUI::Rectangle rcEditor = wEditor.GetPosition();
+		if (!rcEditor.Contains(pt)) {
+			const GUI::Rectangle rcOutput = wOutput.GetPosition();
+			if (rcOutput.Contains(pt)) {
+				w = &wOutput;
+			} else {	// In frame so use default.
+				return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+			}
+		}
+	}
+	menuSource = ::GetDlgCtrlID(HwndOf(*w));
+	ContextMenu(*w, pt, wSciTE);
+	return 0;
+}
+
+void SciTEWin::CheckForScintillaFailure(SA::Status statusFailure) {
+	static int boxesVisible = 0;
+	if ((statusFailure > SA::Status::Ok) && (boxesVisible == 0)) {
+		boxesVisible++;
+		char buff[200] = "";
+		if (statusFailure == SA::Status::BadAlloc) {
+			strcpy(buff, "Memory exhausted.");
+		} else {
+			sprintf(buff, "Scintilla failed with status %d.", static_cast<int>(statusFailure));
+		}
+		strcat(buff, " SciTE will now close.");
+		GUI::gui_string sMessage = GUI::StringFromUTF8(buff);
+		::MessageBox(MainHWND(), sMessage.c_str(), TEXT("Failure in Scintilla"), MB_OK | MB_ICONERROR | MB_APPLMODAL);
+		exit(FALSE);
+	}
+}
+
+LRESULT SciTEWin::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		const LRESULT uim = uniqueInstance.CheckMessage(iMessage, wParam, lParam);
+		if (uim != 0) {
+			return uim;
+		}
+
+		switch (iMessage) {
+
+		case WM_CREATE:
+			Creation();
+			break;
+
+		case WM_COMMAND:
+			Command(wParam, lParam);
+			break;
+
+		case WM_CONTEXTMENU:
+			return ContextMenuMessage(iMessage, wParam, lParam);
+
+		case WM_ENTERMENULOOP:
+			if (!wParam)
+				menuSource = 0;
+			break;
+
+		case WM_SYSCOMMAND:
+			if ((wParam == SC_MINIMIZE) && props.GetInt("minimize.to.tray")) {
+				MinimizeToTray();
+				return 0;
+			}
+			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+
+		case SCITE_TRAY:
+			if (lParam == WM_LBUTTONDOWN) {
+				RestoreFromTray();
+				::ShowWindow(MainHWND(), SW_RESTORE);
+				::FlashWindow(MainHWND(), FALSE);
+			}
+			break;
+
+		case SCITE_DROP:
+			// Open the files
+			while (!dropFilesQueue.empty()) {
+				FilePath file(dropFilesQueue.front());
+				dropFilesQueue.pop_front();
+				if (file.Exists()) {
+					Open(file);
+				} else {
+					GUI::gui_string msg = LocaliseMessage("Could not open file '^0'.", file.AsInternal());
+					WindowMessageBox(wSciTE, msg);
+				}
+			}
+			break;
+
+		case SCITE_WORKER:
+			WorkerCommand(static_cast<int>(wParam), reinterpret_cast<Worker *>(lParam));
+			break;
+
+		case SCITE_SHOWOUTPUT:
+			SetOutputVisibility(true);
+			break;
+
+		case WM_NOTIFY:
+			Notify(reinterpret_cast<SCNotification *>(lParam));
+			break;
+
+		case WM_KEYDOWN:
+			return KeyDown(wParam);
+
+		case WM_KEYUP:
+			return KeyUp(wParam);
+
+		case WM_APPCOMMAND:
+			switch (GET_APPCOMMAND_LPARAM(lParam)) {
+				case APPCOMMAND_BROWSER_BACKWARD:
+					return KeyDown(VK_BROWSER_BACK);
+				case APPCOMMAND_BROWSER_FORWARD:
+					return KeyDown(VK_BROWSER_FORWARD);
+				default:
+					return ::DefWindowProcW(MainHWND(), iMessage, wParam, lParam);
+			}
+			return TRUE;
+
+		case WM_SIZE:
+			if (wParam != SIZE_MINIMIZED)
+				SizeSubWindows();
+			break;
+
+		case WM_MOVE:
+			wEditor.CallTipCancel();
+			break;
+
+		case WM_GETMINMAXINFO: {
+				MINMAXINFO *pmmi = reinterpret_cast<MINMAXINFO *>(lParam);
+				if (fullScreen) {
+					pmmi->ptMaxSize.x = ::GetSystemMetrics(SM_CXSCREEN) +
+							    2 * ::GetSystemMetrics(SM_CXSIZEFRAME);
+					pmmi->ptMaxSize.y = ::GetSystemMetrics(SM_CYSCREEN) +
+							    ::GetSystemMetrics(SM_CYCAPTION) +
+							    ::GetSystemMetrics(SM_CYMENU) +
+							    2 * ::GetSystemMetrics(SM_CYSIZEFRAME);
+					pmmi->ptMaxTrackSize.x = pmmi->ptMaxSize.x;
+					pmmi->ptMaxTrackSize.y = pmmi->ptMaxSize.y;
+					return 0;
+				} else {
+					return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
+				}
+			}
+
+		case WM_INITMENU:
+			CheckMenus();
+			break;
+
+		case WM_CLOSE:
+			QuitProgram();
+			return 0;
+
+		case WM_QUERYENDSESSION:
+			QuitProgram();
+			return 1;
+
+		case WM_DESTROY:
+			break;
+
+		case WM_SETTINGCHANGE:
+			SettingChanged(wParam, lParam);
+			break;
+
+		case WM_SYSCOLORCHANGE:
+			SysColourChanged(wParam, lParam);
+			break;
+
+		case WM_DPICHANGED:
+			ScaleChanged(wParam, lParam);
+			return ::DefWindowProcW(MainHWND(), iMessage, wParam, lParam);
+
+		case WM_ACTIVATEAPP:
+			if (props.GetInt("selection.always.visible", 0) == 0) {
+				wEditor.HideSelection(!wParam);
+			}
+			// Do not want to display dialog yet as may be in middle of system mouse capture
+			::PostMessage(MainHWND(), WM_COMMAND, IDM_ACTIVATE, wParam);
+			break;
+
+		case WM_ACTIVATE:
+			if (wParam != WA_INACTIVE) {
+				if (searchStrip.visible)
+					searchStrip.Focus();
+				else if (findStrip.visible)
+					findStrip.Focus();
+				else if (replaceStrip.visible)
+					replaceStrip.Focus();
+				else if (userStrip.visible)
+					userStrip.Focus();
+				else
+					::SetFocus(wFocus);
+			}
+			break;
+
+		case WM_TIMER:
+			OnTimer();
+			break;
+
+		case WM_DROPFILES:
+			DropFiles(reinterpret_cast<HDROP>(wParam));
+			break;
+
+		case WM_COPYDATA:
+			return uniqueInstance.CopyData(reinterpret_cast<COPYDATASTRUCT *>(lParam));
+
+		default:
+			return ::DefWindowProcW(MainHWND(), iMessage, wParam, lParam);
+		}
+	} catch (const SA::Failure &sf) {
+		CheckForScintillaFailure(sf.status);
+	}
+	return 0;
+}
+
+LRESULT PASCAL SciTEWin::TWndProc(
+	HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	if (iMessage == WM_CREATE) {
+		SciTEWin *scitePassed = static_cast<SciTEWin *>(SetWindowPointerFromCreate(hWnd, lParam));
+		scitePassed->wSciTE = hWnd;
+	}
+	// Find C++ object associated with window.
+	SciTEWin *scite = static_cast<SciTEWin *>(PointerFromWindow(hWnd));
+	// scite will be zero if WM_CREATE not seen yet
+	if (scite) {
+		return scite->WndProc(iMessage, wParam, lParam);
+	} else {
+		return ::DefWindowProcW(hWnd, iMessage, wParam, lParam);
+	}
+}
+
+LRESULT ContentWin::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		switch (iMessage) {
+
+		case WM_CREATE:
+			pSciTEWin->wContent = GetID();
+			return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+		case WM_COMMAND:
+		case WM_NOTIFY:
+			return pSciTEWin->WndProc(iMessage, wParam, lParam);
+
+		case WM_PAINT: {
+				PAINTSTRUCT ps;
+				::BeginPaint(Hwnd(), &ps);
+				const GUI::Rectangle rcPaint(ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom);
+				Paint(ps.hdc, rcPaint);
+				::EndPaint(Hwnd(), &ps);
+				return 0;
+			}
+
+		case WM_ERASEBKGND: {
+				RECT rc = {0, 0, 2000, 2000};
+				HBRUSH hbrFace = CreateSolidBrush(::GetSysColor(COLOR_3DFACE));
+				::FillRect(reinterpret_cast<HDC>(wParam), &rc, hbrFace);
+				::DeleteObject(hbrFace);
+				return 0;
+			}
+
+		case WM_LBUTTONDOWN:
+			pSciTEWin->ptStartDrag = PointFromLong(lParam);
+			capturedMouse = true;
+			pSciTEWin->heightOutputStartDrag = pSciTEWin->heightOutput;
+			::SetCapture(Hwnd());
+			break;
+
+		case WM_MOUSEMOVE:
+			if (capturedMouse) {
+				pSciTEWin->MoveSplit(PointFromLong(lParam));
+			}
+			break;
+
+		case WM_LBUTTONUP:
+			if (capturedMouse) {
+				pSciTEWin->MoveSplit(PointFromLong(lParam));
+				capturedMouse = false;
+				::ReleaseCapture();
+			}
+			break;
+
+		case WM_CAPTURECHANGED:
+			capturedMouse = false;
+			break;
+
+		case WM_SETCURSOR:
+			if (ControlIDOfCommand(static_cast<unsigned long>(lParam)) == HTCLIENT) {
+				const GUI::Point ptCursor = PointOfCursor();
+				const GUI::Rectangle rcScintilla = pSciTEWin->wEditor.GetPosition();
+				const GUI::Rectangle rcOutput = pSciTEWin->wOutput.GetPosition();
+				if (!rcScintilla.Contains(ptCursor) && !rcOutput.Contains(ptCursor)) {
+					::SetCursor(::LoadCursor(NULL, pSciTEWin->splitVertical ? IDC_SIZEWE : IDC_SIZENS));
+					return TRUE;
+				}
+			}
+			return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+		default:
+			return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+		}
+	} catch (...) {
+	}
+	return 0;
+}
+
+// Convert String from UTF-8 to doc encoding
+std::string SciTEWin::EncodeString(const std::string &s) {
+	UINT codePageDocument = static_cast<UINT>(wEditor.CodePage());
+
+	if (codePageDocument != SA::CpUtf8) {
+		codePageDocument = CodePageFromCharSet(characterSet, codePageDocument);
+		std::wstring sWide = StringDecode(std::string(s.c_str(), s.length()), CP_UTF8);
+		return StringEncode(sWide, codePageDocument);
+	}
+	return SciTEBase::EncodeString(s);
+}
+
+// Convert String from doc encoding to UTF-8
+std::string SciTEWin::GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span range) {
+	std::string s = SciTEBase::GetRangeInUIEncoding(win, range);
+
+	UINT codePageDocument = wEditor.CodePage();
+
+	if (codePageDocument != SA::CpUtf8) {
+		codePageDocument = CodePageFromCharSet(characterSet, codePageDocument);
+		std::wstring sWide = StringDecode(std::string(s.c_str(), s.length()), codePageDocument);
+		return StringEncode(sWide, CP_UTF8);
+	}
+	return s;
+}
+
+uintptr_t SciTEWin::EventLoop() {
+	MSG msg {};
+	msg.wParam = 0;
+	BOOL going = TRUE;
+	while (going) {
+		if (needIdle) {
+			const BOOL haveMessage = PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE);
+			if (!haveMessage) {
+				OnIdle();
+				continue;
+			}
+		}
+		going = ::GetMessageW(&msg, NULL, 0, 0);
+		if (going > 0) {
+			if (!ModelessHandler(&msg)) {
+				if (!GetID() ||
+						::TranslateAcceleratorW(static_cast<HWND>(GetID()), GetAcceleratorTable(), &msg) == 0) {
+					::TranslateMessage(&msg);
+					::DispatchMessageW(&msg);
+				}
+			}
+		}
+	}
+	return msg.wParam;
+}
+
+static void RestrictDLLPath() noexcept {
+	// Try to limit the locations where DLLs will be loaded from to prevent binary planting.
+	// That is where a bad DLL is placed in the current directory or in the PATH.
+	typedef BOOL(WINAPI *SetDefaultDllDirectoriesSig)(DWORD DirectoryFlags);
+	typedef BOOL(WINAPI *SetDllDirectorySig)(LPCTSTR lpPathName);
+	HMODULE kernel32 = ::GetModuleHandle(TEXT("kernel32.dll"));
+	if (kernel32) {
+		// SetDefaultDllDirectories is stronger, limiting search path to just the application and
+		// system directories but is only available on Windows 8+
+		SetDefaultDllDirectoriesSig SetDefaultDllDirectoriesFn =
+			reinterpret_cast<SetDefaultDllDirectoriesSig>(::GetProcAddress(
+						kernel32, "SetDefaultDllDirectories"));
+		if (SetDefaultDllDirectoriesFn) {
+			SetDefaultDllDirectoriesFn(LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32);
+		} else {
+			SetDllDirectorySig SetDllDirectoryFn =
+				reinterpret_cast<SetDllDirectorySig>(::GetProcAddress(
+							kernel32, "SetDllDirectoryW"));
+			if (SetDllDirectoryFn) {
+				// For security, remove current directory from the DLL search path
+				SetDllDirectoryFn(TEXT(""));
+			}
+		}
+	}
+}
+
+#ifdef STATIC_BUILD
+extern "C" Scintilla::ILexer5 * __stdcall CreateLexer(const char *name);
+#endif
+
+#if defined(_MSC_VER) && defined(_PREFAST_)
+// Stop warning for WinMain. Microsoft headers have annotations and MinGW don't.
+#pragma warning(disable: 28251)
+#endif
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) {
+
+	RestrictDLLPath();
+
+#ifndef NO_EXTENSIONS
+	MultiplexExtension multiExtender;
+
+#ifndef NO_LUA
+	multiExtender.RegisterExtension(LuaExtension::Instance());
+#endif
+
+#ifndef NO_FILER
+	multiExtender.RegisterExtension(DirectorExtension::Instance());
+#endif
+#endif
+
+	SciTEWin::Register(hInstance);
+	Lexilla::SetDefaultDirectory(GetSciTEPath(FilePath()).AsUTF8());
+#ifdef STATIC_BUILD
+	Scintilla_RegisterClasses(hInstance);
+	Lexilla::SetDefault(CreateLexer);
+#else
+
+	HMODULE hmod = ::LoadLibrary(scintillaName);
+	if (!hmod) {
+		GUI::gui_string explanation = scintillaName;
+		explanation += TEXT(" could not be loaded.  SciTE will now close");
+		::MessageBox(NULL, explanation.c_str(),
+			     TEXT("Error loading Scintilla"), MB_OK | MB_ICONERROR);
+	}
+#endif
+
+	uintptr_t result = 0;
+	try {
+#ifdef NO_EXTENSIONS
+		Extension *extender = 0;
+#else
+		Extension *extender = &multiExtender;
+#endif
+		SciTEWin MainWind(extender);
+		LPTSTR lptszCmdLine = GetCommandLine();
+		if (*lptszCmdLine == '\"') {
+			lptszCmdLine++;
+			while (*lptszCmdLine && (*lptszCmdLine != '\"'))
+				lptszCmdLine++;
+			if (*lptszCmdLine == '\"')
+				lptszCmdLine++;
+		} else {
+			while (*lptszCmdLine && (*lptszCmdLine != ' '))
+				lptszCmdLine++;
+		}
+		while (*lptszCmdLine == ' ')
+			lptszCmdLine++;
+		try {
+			MainWind.Run(lptszCmdLine);
+			// Set the current directory always to the program directory
+			// to ensure a opened file directory is never locked.
+			GetSciTEPath(FilePath()).SetWorkingDirectory();
+			result = MainWind.EventLoop();
+		} catch (const SA::Failure &sf) {
+			MainWind.CheckForScintillaFailure(sf.status);
+		} catch (const std::bad_alloc &) {
+			::MessageBox({}, TEXT("Allocation failure"), TEXT("Failure in SciTE"), MB_OK | MB_ICONERROR | MB_APPLMODAL);
+		}
+		MainWind.Finalise();
+	} catch (std::bad_array_new_length &) {
+		::MessageBox({}, TEXT("Allocation failure"), TEXT("Failure to allocate SciTE at start up"), MB_OK | MB_ICONERROR | MB_APPLMODAL);
+	}
+
+#ifdef STATIC_BUILD
+	Scintilla_ReleaseResources();
+#else
+
+	::FreeLibrary(hmod);
+#endif
+
+	return static_cast<int>(result);
+}
diff --git a/scite-app/scite/win32/SciTEWin.h b/scite-app/scite/win32/SciTEWin.h
new file mode 100644
index 0000000..d481b71
--- /dev/null
+++ b/scite-app/scite/win32/SciTEWin.h
@@ -0,0 +1,450 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEWin.h
+ ** Header of main code for the Windows version of the editor.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef SCITEWIN_H
+#define SCITEWIN_H
+
+#include <cstdlib>
+#include <cstdint>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+
+#include <tuple>
+#include <string>
+#include <string_view>
+#include <vector>
+#include <deque>
+#include <map>
+#include <set>
+#include <optional>
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <chrono>
+#include <sstream>
+#include <iomanip>
+#include <atomic>
+#include <mutex>
+
+#include <fcntl.h>
+
+#include <sys/stat.h>
+
+#ifdef __MINGW_H
+#define _WIN32_IE	0x0400
+#endif
+
+#undef _WIN32_WINNT
+#undef WINVER
+#ifdef WIN_TARGET
+#define _WIN32_WINNT WIN_TARGET
+#define WINVER WIN_TARGET
+#else
+#define _WIN32_WINNT  0x0501
+#define WINVER 0x0501
+#endif
+#undef NOMINMAX
+#define NOMINMAX 1
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <windowsx.h>
+#if defined(DISABLE_THEMES)
+// Old compilers do not have Uxtheme.h
+typedef void *HTHEME;
+#else
+#include <uxtheme.h>
+#include <vsstyle.h>
+#include <vssym32.h>
+#define THEME_AVAILABLE
+#endif
+#include <shlwapi.h>
+// need this header for SHBrowseForFolder
+#include <shlobj.h>
+
+#include "ILoader.h"
+#include "ILexer.h"
+
+#include "ScintillaTypes.h"
+#include "ScintillaMessages.h"
+#include "ScintillaCall.h"
+
+#include "Scintilla.h"
+#include "Lexilla.h"
+#include "LexillaAccess.h"
+
+#include "GUI.h"
+#include "ScintillaWindow.h"
+
+#include "StringList.h"
+#include "StringHelpers.h"
+#include "FilePath.h"
+#include "StyleDefinition.h"
+#include "PropSetFile.h"
+#include "StyleWriter.h"
+#include "Extender.h"
+#include "SciTE.h"
+#include "JobQueue.h"
+#include "Cookie.h"
+#include "Worker.h"
+#include "FileWorker.h"
+#include "MatchMarker.h"
+#include "SciTEBase.h"
+#include "UniqueInstance.h"
+#include "StripDefinition.h"
+#include "Strips.h"
+#include "SciTEKeys.h"
+
+constexpr int SCITE_TRAY = WM_APP + 0;
+constexpr int SCITE_DROP = WM_APP + 1;
+constexpr int SCITE_WORKER = WM_APP + 2;
+constexpr int SCITE_SHOWOUTPUT = WM_APP + 3;
+
+enum {
+	WORK_EXECUTE = WORK_PLATFORM + 1
+};
+
+class SciTEWin;
+
+class CommandWorker : public Worker {
+public:
+	SciTEWin *pSciTE;
+	size_t icmd;
+	SA::Position originalEnd;
+	int exitStatus;
+	GUI::ElapsedTime commandTime;
+	std::string output;
+	int flags;
+	bool seenOutput;
+	int outputScroll;
+
+	CommandWorker() noexcept;
+	void Initialise(bool resetToStart) noexcept;
+	void Execute() override;
+};
+
+class Dialog;
+
+class ContentWin : public BaseWin {
+	SciTEWin *pSciTEWin;
+	bool capturedMouse;
+public:
+	ContentWin() noexcept : pSciTEWin(nullptr), capturedMouse(false) {
+	}
+	void SetSciTE(SciTEWin *pSciTEWin_) noexcept {
+		pSciTEWin = pSciTEWin_;
+	}
+	void Paint(HDC hDC, GUI::Rectangle rcPaint);
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) override;
+};
+
+struct Band {
+	bool visible;
+	int height;
+	bool expands;
+	GUI::Window win;
+	Band(bool visible_, int height_, bool expands_, GUI::Window win_) noexcept :
+		visible(visible_),
+		height(height_),
+		expands(expands_),
+		win(win_) {
+	}
+};
+
+/** Windows specific stuff.
+ **/
+class SciTEWin : public SciTEBase {
+	friend class ContentWin;
+	friend class Strip;
+	friend class SearchStrip;
+	friend class FindStrip;
+	friend class ReplaceStrip;
+	friend class UserStrip;
+
+protected:
+
+	bool flatterUI;
+	int cmdShow;
+	static HINSTANCE hInstance;
+	static const TCHAR *className;
+	static const TCHAR *classNameInternal;
+	static SciTEWin *app;
+	WINDOWPLACEMENT winPlace;
+	RECT rcWorkArea;
+	GUI::gui_char openWhat[200];
+	GUI::gui_char tooltipText[MAX_PATH*2 + 1];
+	bool tbLarge;
+	bool modalParameters;
+	GUI::gui_string openFilterDefault;
+	bool staticBuild;
+	int menuSource;
+	std::deque<GUI::gui_string> dropFilesQueue;
+
+	// Fields also used in tool execution thread
+	CommandWorker cmdWorker;
+	HANDLE hWriteSubProcess;
+	DWORD subProcessGroupId;
+
+	HACCEL hAccTable;
+
+	GUI::Rectangle pagesetupMargin;
+	HGLOBAL hDevMode;
+	HGLOBAL hDevNames;
+
+	UniqueInstance uniqueInstance;
+
+	/// HTMLHelp module
+	HMODULE hHH;
+	/// Multimedia (sound) module
+	HMODULE hMM;
+
+	// Tab Bar
+	HFONT fontTabs;
+	std::vector<GUI::gui_string> tabNamesCurrent;
+
+	/// Preserve focus during deactivation
+	HWND wFocus;
+
+	GUI::Window wFindInFiles;
+	GUI::Window wFindReplace;
+	GUI::Window wParameters;
+
+	ContentWin contents;
+	BackgroundStrip backgroundStrip;
+	UserStrip userStrip;
+	SearchStrip searchStrip;
+	FindStrip findStrip;
+	ReplaceStrip replaceStrip;
+
+	enum { bandTool, bandTab, bandContents, bandUser, bandBackground, bandSearch, bandFind, bandReplace, bandStatus };
+	std::vector<Band> bands;
+
+	void ReadLocalization() override;
+	void GetWindowPosition(int *left, int *top, int *width, int *height, int *maximize) override;
+	int GetScaleFactor() noexcept;
+	bool SetScaleFactor(int scale);
+
+	void ReadEmbeddedProperties() override;
+	void ReadPropertiesInitial() override;
+	void ReadProperties() override;
+
+	SystemAppearance CurrentAppearance() const noexcept override;
+
+	void TimerStart(int mask) override;
+	void TimerEnd(int mask) override;
+
+	void ShowOutputOnMainThread() override;
+	void SizeContentWindows() override;
+	void SizeSubWindows() override;
+
+	void SetMenuItem(int menuNumber, int position, int itemID,
+			 const GUI::gui_char *text, const GUI::gui_char *mnemonic = 0) override;
+	void RedrawMenu() override;
+	void DestroyMenuItem(int menuNumber, int itemID) override;
+	void CheckAMenuItem(int wIDCheckItem, bool val) override;
+	void EnableAMenuItem(int wIDCheckItem, bool val) override;
+	void CheckMenus() override;
+
+	void LocaliseMenu(HMENU hmenu);
+	void LocaliseMenus();
+	void LocaliseControl(HWND w);
+	void LocaliseDialog(HWND wDialog);
+
+	int DoDialog(const TCHAR *resName, DLGPROC lpProc);
+	HWND CreateParameterisedDialog(LPCWSTR lpTemplateName, DLGPROC lpProc);
+	GUI::gui_string DialogFilterFromProperty(const GUI::gui_char *filterProperty);
+	void CheckCommonDialogError();
+	bool OpenDialog(const FilePath &directory, const GUI::gui_char *filesFilter) override;
+	FilePath ChooseSaveName(const FilePath &directory, const char *title,
+				const GUI::gui_char *filesFilter = nullptr, const char *ext = nullptr);
+	bool SaveAsDialog() override;
+	void SaveACopy() override;
+	void SaveAsHTML() override;
+	void SaveAsRTF() override;
+	void SaveAsPDF() override;
+	void SaveAsTEX() override;
+	void SaveAsXML() override;
+	void LoadSessionDialog() override;
+	void SaveSessionDialog() override;
+	bool PreOpenCheck(const GUI::gui_char *arg) override;
+	bool IsStdinBlocked() override;
+
+	/// Print the current buffer.
+	void Print(bool showDialog) override;
+	/// Handle default print setup values and ask the user its preferences.
+	void PrintSetup() override;
+
+	BOOL HandleReplaceCommand(int cmd, bool reverseDirection = false);
+
+	MessageBoxChoice WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, MessageBoxStyle style = mbsIconWarning) override;
+	void FindMessageBox(const std::string &msg, const std::string *findItem = 0) override;
+	void AboutDialog() override;
+	void DropFiles(HDROP hdrop);
+	void MinimizeToTray();
+	void RestoreFromTray();
+	void SettingChanged(WPARAM wParam, LPARAM lParam);
+	void SysColourChanged(WPARAM wParam, LPARAM lParam);
+	void ScaleChanged(WPARAM wParam, LPARAM lParam);
+	static GUI::gui_string ProcessArgs(const GUI::gui_char *cmdLine);
+	void QuitProgram() override;
+
+	FilePath GetDefaultDirectory() override;
+	FilePath GetSciteDefaultHome() override;
+	FilePath GetSciteUserHome() override;
+
+	void SetFileProperties(PropSetFile &ps) override;
+	void SetStatusBarText(const char *s) override;
+
+	void UpdateTabs(const std::vector<GUI::gui_string> &tabNames) override;
+	void TabInsert(int index, const GUI::gui_char *title) override;
+	void TabSelect(int index) override;
+	void RemoveAllTabs() override;
+
+	/// Warn the user, by means defined in its properties.
+	void WarnUser(int warnID) override;
+
+	void Notify(SCNotification *notification) override;
+	void ShowToolBar() override;
+	void ShowTabBar() override;
+	void ShowStatusBar() override;
+	void ActivateWindow(const char *timestamp) override;
+	void ExecuteHelp(const char *cmd);
+	void ExecuteOtherHelp(const char *cmd);
+	void CopyAsRTF() override;
+	void CopyPath() override;
+	void FullScreenToggle();
+	void Command(WPARAM wParam, LPARAM lParam);
+	HWND MainHWND() noexcept;
+
+	void UserStripShow(const char *description) override;
+	void UserStripSet(int control, const char *value) override;
+	void UserStripSetList(int control, const char *value) override;
+	std::string UserStripValue(int control) override;
+	void UserStripClosed();
+	void ShowBackgroundProgress(const GUI::gui_string &explanation, size_t size, size_t progress) override;
+	BOOL FindMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK FindDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	BOOL ReplaceMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK ReplaceDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	void UIClosed() override;
+	void PerformGrep();
+	void FillCombos(Dialog &dlg);
+	void FillCombosForGrep(Dialog &dlg);
+	BOOL GrepMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK GrepDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	void FindIncrement() override;
+	void Find() override;
+	void FindInFiles() override;
+	void Replace() override;
+	void FindReplace(bool replace) override;
+	void DestroyFindReplace() override;
+
+	BOOL GoLineMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK GoLineDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	void GoLineDialog() override;
+
+	BOOL AbbrevMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK AbbrevDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	bool AbbrevDialog() override;
+
+	BOOL TabSizeMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK TabSizeDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	void TabSizeDialog() override;
+
+	bool ParametersOpen() override;
+	void ParamGrab() override;
+	bool ParametersDialog(bool modal) override;
+	BOOL ParametersMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK ParametersDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+	BOOL AboutMessage(HWND hDlg, UINT message, WPARAM wParam);
+	static INT_PTR CALLBACK AboutDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+	void AboutDialogWithBuild(int staticBuild_);
+
+	void RestorePosition();
+
+public:
+
+	explicit SciTEWin(Extension *ext = 0);
+	~SciTEWin();
+
+	static bool DialogHandled(GUI::WindowID id, MSG *pmsg) noexcept;
+	bool ModelessHandler(MSG *pmsg);
+
+	void CreateUI();
+	/// Management of the command line parameters.
+	void Run(const GUI::gui_char *cmdLine);
+	uintptr_t EventLoop();
+	void OutputAppendEncodedStringSynchronised(const GUI::gui_string &s, int codePageDocument);
+	void ResetExecution();
+	void ExecuteNext();
+	DWORD ExecuteOne(const Job &jobToRun);
+	void ProcessExecute();
+	void ShellExec(const std::string &cmd, const char *dir);
+	void Execute() override;
+	void StopExecute() override;
+	void AddCommand(const std::string &cmd, const std::string &dir, JobSubsystem jobType, const std::string &input = "", int flags = 0) override;
+
+	void PostOnMainThread(int cmd, Worker *pWorker) override;
+	void WorkerCommand(int cmd, Worker *pWorker) override;
+
+	void Creation();
+	LRESULT KeyDown(WPARAM wParam);
+	LRESULT KeyUp(WPARAM wParam);
+	void AddToPopUp(const char *label, int cmd=0, bool enabled=true) override;
+	LRESULT ContextMenuMessage(UINT iMessage, WPARAM wParam, LPARAM lParam);
+	void CheckForScintillaFailure(SA::Status statusFailure);
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
+
+	std::string EncodeString(const std::string &s) override;
+	std::string GetRangeInUIEncoding(GUI::ScintillaWindow &win, SA::Span span) override;
+
+	HACCEL GetAcceleratorTable() noexcept {
+		return hAccTable;
+	}
+
+	uintptr_t GetInstance() override;
+	static void Register(HINSTANCE hInstance_);
+	static LRESULT PASCAL TWndProc(
+		HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+
+	friend class UniqueInstance;
+};
+
+inline bool IsKeyDown(int key) noexcept {
+	return (::GetKeyState(key) & 0x80000000) != 0;
+}
+
+GUI::Point PointOfCursor() noexcept;
+GUI::Point ClientFromScreen(HWND hWnd, GUI::Point ptScreen) noexcept;
+
+// Common minor conversions
+
+constexpr GUI::Point PointFromLong(LPARAM lPoint) noexcept {
+	// static_cast<short> needed for negative coordinates
+	return GUI::Point(static_cast<short>(LOWORD(lPoint)), static_cast<short>(HIWORD(lPoint)));
+}
+
+constexpr int ControlIDOfWParam(WPARAM wParam) noexcept {
+	return wParam & 0xffff;
+}
+
+inline HWND HwndOf(GUI::Window w) noexcept {
+	return static_cast<HWND>(w.GetID());
+}
+
+inline HMENU HmenuID(size_t id) noexcept {
+	return reinterpret_cast<HMENU>(id);
+}
+
+inline POINT *PointPointer(GUI::Point *pt) noexcept {
+	return reinterpret_cast<POINT *>(pt);
+}
+
+#endif
diff --git a/scite-app/scite/win32/SciTEWinBar.cxx b/scite-app/scite/win32/SciTEWinBar.cxx
new file mode 100644
index 0000000..cb8b4f1
--- /dev/null
+++ b/scite-app/scite/win32/SciTEWinBar.cxx
@@ -0,0 +1,1099 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEWinBar.cxx
+ ** Bar and menu code for the Windows version of the editor.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include "SciTEWin.h"
+
+/**
+ * Set up properties for FileTime, FileDate, CurrentTime, CurrentDate and FileAttr.
+ */
+void SciTEWin::SetFileProperties(
+	PropSetFile &ps) {			///< Property set to update.
+
+	constexpr int TEMP_LEN = 100;
+	char temp[TEMP_LEN] = "";
+	HANDLE hf = ::CreateFileW(filePath.AsInternal(), GENERIC_READ, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (hf != INVALID_HANDLE_VALUE) {
+		FILETIME ft = FILETIME();
+		::GetFileTime(hf, nullptr, nullptr, &ft);
+		::CloseHandle(hf);
+		FILETIME lft = FILETIME();
+		::FileTimeToLocalFileTime(&ft, &lft);
+		SYSTEMTIME st = SYSTEMTIME();
+		if (::FileTimeToSystemTime(&lft, &st) == 0)
+			st = SYSTEMTIME();
+		::GetTimeFormatA(LOCALE_USER_DEFAULT,
+				 0, &st,
+				 nullptr, temp, TEMP_LEN);
+		ps.Set("FileTime", temp);
+
+		::GetDateFormatA(LOCALE_USER_DEFAULT,
+				 DATE_SHORTDATE, &st,
+				 nullptr, temp, TEMP_LEN);
+		ps.Set("FileDate", temp);
+
+		const DWORD attr = ::GetFileAttributesW(filePath.AsInternal());
+		std::string fa;
+		if (attr & FILE_ATTRIBUTE_READONLY) {
+			fa += "R";
+		}
+		if (attr & FILE_ATTRIBUTE_HIDDEN) {
+			fa += "H";
+		}
+		if (attr & FILE_ATTRIBUTE_SYSTEM) {
+			fa += "S";
+		}
+		ps.Set("FileAttr", fa.c_str());
+	} else {
+		/* Reset values for new buffers with no file */
+		ps.Set("FileTime", "");
+		ps.Set("FileDate", "");
+		ps.Set("FileAttr", "");
+	}
+
+	::GetDateFormatA(LOCALE_USER_DEFAULT,
+			 DATE_SHORTDATE, nullptr,     	// Current date
+			 nullptr, temp, TEMP_LEN);
+	ps.Set("CurrentDate", temp);
+
+	::GetTimeFormatA(LOCALE_USER_DEFAULT,
+			 0, nullptr,     	// Current time
+			 nullptr, temp, TEMP_LEN);
+	ps.Set("CurrentTime", temp);
+}
+
+/**
+ * Update the status bar text.
+ */
+void SciTEWin::SetStatusBarText(const char *s) {
+	GUI::gui_string barText = GUI::StringFromUTF8(s);
+	::SendMessage(HwndOf(wStatusBar),
+		      SB_SETTEXT, 0, reinterpret_cast<LPARAM>(barText.c_str()));
+}
+
+void SciTEWin::UpdateTabs(const std::vector<GUI::gui_string> &tabNames) {
+	// Synchronize the tab control titles with those passed in.
+
+	// Find the first element that differs between the two vectors.
+	const auto [misNames, misNamesCurrent] = std::mismatch(
+		tabNames.begin(), tabNames.end(),
+		tabNamesCurrent.begin(), tabNamesCurrent.end());
+	size_t tabChange = std::distance(tabNames.begin(), misNames);
+
+	if (tabNames.size() == tabNamesCurrent.size() && tabNames.size() == tabChange) {
+		// Most updates change nothing on the tabs so return early. 
+		return;
+	}
+
+	// Avoiding drawing with WM_SETREDRAW here does not improve speed or flashing.
+
+	while (tabNames.size() < tabNamesCurrent.size()) {
+		// Remove extra tabs
+		TabCtrl_DeleteItem(HwndOf(wTabBar), tabChange);
+		tabNamesCurrent.erase(tabNamesCurrent.begin() + tabChange);
+	}
+
+	while (tabNames.size() > tabNamesCurrent.size()) {
+		// Add new tabs
+		GUI::gui_string tabNameNext = tabNames.at(tabChange);
+		TCITEMW tie {};
+		tie.mask = TCIF_TEXT | TCIF_IMAGE;
+		tie.iImage = -1;
+		tie.pszText = tabNameNext.data();
+		TabCtrl_InsertItem(HwndOf(wTabBar), tabChange, &tie);
+		tabNamesCurrent.insert(tabNamesCurrent.begin() + tabChange, tabNameNext);
+		tabChange++;
+	}
+	assert(tabNames.size() == tabNamesCurrent.size());
+
+	while (tabChange < tabNames.size()) {
+		// Update tabs that are different
+		if (tabNames.at(tabChange) != tabNamesCurrent.at(tabChange)) {
+			GUI::gui_string tabNameCopy(tabNames.at(tabChange));
+			TCITEMW tie {};
+			tie.mask = TCIF_TEXT | TCIF_IMAGE;
+			tie.iImage = -1;
+			tie.pszText = tabNameCopy.data();
+			TabCtrl_SetItem(HwndOf(wTabBar), tabChange, &tie);
+			tabNamesCurrent.at(tabChange) = tabNameCopy;
+		}
+		tabChange++;
+	}
+	assert(tabNamesCurrent == tabNames);
+}
+
+void SciTEWin::TabInsert(int index, const GUI::gui_char *title) {
+	// This is no longer called as UpdateTabs performs all changes to tabs
+	TCITEMW tie {};
+	tie.mask = TCIF_TEXT | TCIF_IMAGE;
+	tie.iImage = -1;
+	GUI::gui_string titleCopy(title);
+	tie.pszText = titleCopy.data();
+	TabCtrl_InsertItem(HwndOf(wTabBar), index, &tie);
+}
+
+void SciTEWin::TabSelect(int index) {
+	if (index != TabCtrl_GetCurSel(HwndOf(wTabBar))) {
+		TabCtrl_SetCurSel(HwndOf(wTabBar), index);
+	}
+}
+
+void SciTEWin::RemoveAllTabs() {
+	// This is no longer called as UpdateTabs performs all changes to tabs
+	TabCtrl_DeleteAllItems(HwndOf(wTabBar));
+}
+
+GUI::Point PointOfCursor() noexcept {
+	POINT ptCursor;
+	::GetCursorPos(&ptCursor);
+	return GUI::Point(ptCursor.x, ptCursor.y);
+}
+
+GUI::Point ClientFromScreen(HWND hWnd, GUI::Point ptScreen) noexcept {
+	POINT ptClient = { ptScreen.x, ptScreen.y };
+	::ScreenToClient(hWnd, &ptClient);
+	return GUI::Point(ptClient.x, ptClient.y);
+}
+
+namespace {
+
+int TabAtPoint(HWND hWnd, GUI::Point pt) noexcept {
+	TCHITTESTINFO thti {};
+	thti.pt.x = pt.x;
+	thti.pt.y = pt.y;
+	thti.flags = 0;
+	return TabCtrl_HitTest(hWnd, &thti);
+}
+
+}
+
+/**
+ * Manage Windows specific notifications.
+ */
+void SciTEWin::Notify(SCNotification *notification) {
+	switch (notification->nmhdr.code) {
+	case TCN_SELCHANGE:
+		// Change of tab
+		if (notification->nmhdr.idFrom == IDM_TABWIN) {
+			const int index = TabCtrl_GetCurSel(HwndOf(wTabBar));
+			SetDocumentAt(index);
+			CheckReload();
+		}
+		break;
+
+	case NM_RCLICK:
+		// Right click on a control
+		if (notification->nmhdr.idFrom == IDM_TABWIN) {
+
+			const GUI::Point ptCursor = PointOfCursor();
+			const GUI::Point ptClient = ClientFromScreen(HwndOf(wTabBar), ptCursor);
+			const int tabbarHitLast = TabAtPoint(HwndOf(wTabBar), ptClient);
+
+			if (buffers.Current() != tabbarHitLast) {
+				SetDocumentAt(tabbarHitLast);
+				CheckReload();
+			}
+
+			// Pop up menu here:
+			popup.CreatePopUp();
+			AddToPopUp("Close", IDM_CLOSE, true);
+			AddToPopUp("");
+			AddToPopUp("Save", IDM_SAVE, true);
+			AddToPopUp("Save As", IDM_SAVEAS, true);
+			AddToPopUp("");
+
+			bool bAddSeparator = false;
+			for (int item = 0; item < toolMax; item++) {
+				const int itemID = IDM_TOOLS + item;
+				std::string prefix = "command.name.";
+				prefix += StdStringFromInteger(item);
+				prefix += ".";
+				std::string commandName = props.GetNewExpandString(prefix.c_str(), filePath.AsUTF8().c_str());
+				if (commandName.length()) {
+					AddToPopUp(commandName.c_str(), itemID, true);
+					bAddSeparator = true;
+				}
+			}
+
+			if (bAddSeparator)
+				AddToPopUp("");
+
+			AddToPopUp("Print", IDM_PRINT, true);
+			popup.Show(ptCursor, wSciTE);
+		}
+		break;
+
+	case NM_CLICK:
+		// Click on a control
+		if (notification->nmhdr.idFrom == IDM_STATUSWIN) {
+			// Click on the status bar
+			const NMMOUSE *pNMMouse = reinterpret_cast<NMMOUSE *>(notification);
+			switch (pNMMouse->dwItemSpec) {
+			case 0: 		/* Display of status */
+				sbNum++;
+				if (sbNum > props.GetInt("statusbar.number")) {
+					sbNum = 1;
+				}
+				UpdateStatusBar(true);
+				break;
+			default:
+				break;
+			}
+		}
+		break;
+
+	case TTN_GETDISPINFO:
+		// Ask for tooltip text
+		{
+			const GUI::gui_char *ttext = nullptr;
+			NMTTDISPINFOW *pDispInfo = reinterpret_cast<NMTTDISPINFOW *>(notification);
+			// Toolbar tooltips
+			switch (notification->nmhdr.idFrom) {
+			case IDM_NEW:
+				ttext = GUI_TEXT("New");
+				break;
+			case IDM_OPEN:
+				ttext = GUI_TEXT("Open");
+				break;
+			case IDM_SAVE:
+				ttext = GUI_TEXT("Save");
+				break;
+			case IDM_CLOSE:
+				ttext = GUI_TEXT("Close");
+				break;
+			case IDM_PRINT:
+				ttext = GUI_TEXT("Print");
+				break;
+			case IDM_CUT:
+				ttext = GUI_TEXT("Cut");
+				break;
+			case IDM_COPY:
+				ttext = GUI_TEXT("Copy");
+				break;
+			case IDM_PASTE:
+				ttext = GUI_TEXT("Paste");
+				break;
+			case IDM_CLEAR:
+				ttext = GUI_TEXT("Delete");
+				break;
+			case IDM_UNDO:
+				ttext = GUI_TEXT("Undo");
+				break;
+			case IDM_REDO:
+				ttext = GUI_TEXT("Redo");
+				break;
+			case IDM_FIND:
+				ttext = GUI_TEXT("Find");
+				break;
+			case IDM_REPLACE:
+				ttext = GUI_TEXT("Replace");
+				break;
+			case IDM_MACRORECORD:
+				ttext = GUI_TEXT("Record Macro");
+				break;
+			case IDM_MACROSTOPRECORD:
+				ttext = GUI_TEXT("Stop Recording");
+				break;
+			case IDM_MACROPLAY:
+				ttext = GUI_TEXT("Run Macro");
+				break;
+			default: {
+					// notification->nmhdr.idFrom appears to be the buffer number for tabbar tooltips
+					const GUI::Point ptClient = ClientFromScreen(HwndOf(wTabBar), PointOfCursor());
+					const int index = TabAtPoint(HwndOf(wTabBar), ptClient);
+					if (index >= 0) {
+						GUI::gui_string path = buffers.buffers[index].file.AsInternal();
+						// Handle '&' characters in path, since they are interpreted in
+						// tooltips.
+						size_t amp = 0;
+						while ((amp = path.find(GUI_TEXT("&"), amp)) != GUI::gui_string::npos) {
+							path.insert(amp, GUI_TEXT("&"));
+							amp += 2;
+						}
+						StringCopy(tooltipText, path.c_str());
+						pDispInfo->lpszText = tooltipText;
+					}
+				}
+				break;
+			}
+			if (ttext) {
+				GUI::gui_string localised = localiser.Text(GUI::UTF8FromString(ttext).c_str());
+				StringCopy(tooltipText, localised.c_str());
+				pDispInfo->lpszText = tooltipText;
+			}
+			break;
+		}
+
+	case SCN_CHARADDED:
+		if ((notification->nmhdr.idFrom == IDM_RUNWIN) &&
+				jobQueue.IsExecuting() &&
+				hWriteSubProcess) {
+			const char chToWrite = static_cast<char>(notification->ch);
+			if (chToWrite != '\r') {
+				DWORD bytesWrote = 0;
+				::WriteFile(hWriteSubProcess, &chToWrite,
+					    1, &bytesWrote, nullptr);
+			}
+		} else {
+			SciTEBase::Notify(notification);
+		}
+		break;
+
+	case SCN_FOCUSIN:
+		if ((notification->nmhdr.idFrom == IDM_SRCWIN) ||
+				(notification->nmhdr.idFrom == IDM_RUNWIN))
+			wFocus = static_cast<HWND>(notification->nmhdr.hwndFrom);
+		SciTEBase::Notify(notification);
+		break;
+
+	default:     	// Scintilla notification, use default treatment
+		SciTEBase::Notify(notification);
+		break;
+	}
+}
+
+void SciTEWin::ShowToolBar() {
+	SizeSubWindows();
+}
+
+void SciTEWin::ShowTabBar() {
+	SizeSubWindows();
+}
+
+void SciTEWin::ShowStatusBar() {
+	SizeSubWindows();
+}
+
+void SciTEWin::ActivateWindow(const char *) {
+	// This does nothing as, on Windows, you can no longer activate yourself
+}
+
+enum { tickerID = 100 };
+
+void SciTEWin::TimerStart(int mask) {
+	const int maskNew = timerMask | mask;
+	if (timerMask != maskNew) {
+		if (timerMask == 0) {
+			// Create a 1 second ticker
+			::SetTimer(HwndOf(wSciTE), tickerID, 1000, nullptr);
+		}
+		timerMask = maskNew;
+	}
+}
+
+void SciTEWin::TimerEnd(int mask) {
+	const int maskNew = timerMask & ~mask;
+	if (timerMask != maskNew) {
+		if (maskNew == 0) {
+			::KillTimer(HwndOf(wSciTE), tickerID);
+		}
+		timerMask = maskNew;
+	}
+}
+
+void SciTEWin::ShowOutputOnMainThread() {
+	::PostMessage(MainHWND(), SCITE_SHOWOUTPUT, 0, 0);
+}
+
+/**
+ * Resize the content windows, embedding the editor and output windows.
+ */
+void SciTEWin::SizeContentWindows() {
+	const GUI::Rectangle rcInternal = wContent.GetClientPosition();
+
+	const int w = rcInternal.Width();
+	const int h = rcInternal.Height();
+	heightOutput = NormaliseSplit(heightOutput);
+
+	if (splitVertical) {
+		wEditor.SetPosition(GUI::Rectangle(0, 0, w - heightOutput - heightBar, h));
+		wOutput.SetPosition(GUI::Rectangle(w - heightOutput, 0, w, h));
+	} else {
+		wEditor.SetPosition(GUI::Rectangle(0, 0, w, h - heightOutput - heightBar));
+		wOutput.SetPosition(GUI::Rectangle(0, h - heightOutput, w, h));
+	}
+	wContent.InvalidateAll();
+}
+
+/**
+ * Resize the sub-windows, ie. the toolbar, tab bar, status bar. And call @a SizeContentWindows.
+ */
+void SciTEWin::SizeSubWindows() {
+	const GUI::Rectangle rcClient = wSciTE.GetClientPosition();
+	bool showTab = false;
+
+	visHeightTools = tbVisible ? (tbLarge ? heightToolsBig : heightTools) : 0;
+	bands[bandTool].visible = tbVisible;
+
+	if (tabVisible) {	// ? hide one tab only
+		showTab = tabHideOne ?
+			  TabCtrl_GetItemCount(HwndOf(wTabBar)) > 1 :
+			  true;
+	}
+
+	bands[bandTab].visible = showTab;
+	if (showTab && tabMultiLine) {
+		wTabBar.SetPosition(GUI::Rectangle(
+					    rcClient.left, rcClient.top + visHeightTools,
+					    rcClient.right, rcClient.top + heightTab + visHeightTools));
+	}
+
+	RECT r = { rcClient.left, 0, rcClient.right, 0 };
+	TabCtrl_AdjustRect(HwndOf(wTabBar), TRUE, &r);
+	bands[bandTab].height = r.bottom - r.top - 4;
+
+	bands[bandBackground].visible = backgroundStrip.visible;
+	bands[bandUser].height = userStrip.Height();
+	bands[bandUser].visible = userStrip.visible;
+	bands[bandSearch].visible = searchStrip.visible;
+	bands[bandFind].visible = findStrip.visible;
+	bands[bandReplace].visible = replaceStrip.visible;
+
+	const GUI::Rectangle rcSB = wStatusBar.GetPosition();
+	bands[bandStatus].height = rcSB.Height() - 2;	// -2 hides a top border
+	bands[bandStatus].visible = sbVisible;
+
+	int heightContent = rcClient.Height();
+	if (heightContent <= 0)
+		heightContent = 1;
+
+	for (const Band &band : bands) {
+		if (band.visible && !band.expands)
+			heightContent -= band.height;
+	}
+	if (heightContent <= 0) {
+		heightContent = rcClient.Height();
+		for (size_t i=0; i<bands.size(); i++) {
+			if (i != bandContents)
+				bands[i].visible = false;
+		}
+	}
+	bands[bandContents].height = heightContent;
+
+	// May need to copy some values out to other variables
+
+	HDWP hdwp = BeginDeferWindowPos(10);
+
+	int yPos = rcClient.top;
+	for (const Band &band : bands) {
+		if (band.visible) {
+			const GUI::Rectangle rcToSet(rcClient.left, yPos, rcClient.right, yPos + band.height);
+			if (hdwp)
+				hdwp = ::DeferWindowPos(hdwp, HwndOf(band.win),
+							0, rcToSet.left, rcToSet.top, rcToSet.Width(), rcToSet.Height(),
+							SWP_NOZORDER|SWP_NOACTIVATE|SWP_SHOWWINDOW);
+			yPos += band.height;
+		} else {
+			const GUI::Rectangle rcToSet(rcClient.left, rcClient.top - 41, rcClient.Width(), rcClient.top - 40);
+			if (hdwp)
+				hdwp = ::DeferWindowPos(hdwp, HwndOf(band.win),
+							0, rcToSet.left, rcToSet.top, rcToSet.Width(), rcToSet.Height(),
+							SWP_NOZORDER|SWP_NOACTIVATE|SWP_HIDEWINDOW);
+		}
+	}
+	if (hdwp)
+		::EndDeferWindowPos(hdwp);
+
+	visHeightTools = bands[bandTool].height;
+	visHeightTab = bands[bandTab].height;
+	visHeightEditor = bands[bandContents].height;
+	visHeightStatus = bands[bandStatus].height;
+
+	SizeContentWindows();
+}
+
+
+
+// Keymod param is interpreted using the same notation (and much the same
+// code) as KeyMatch uses in SciTEWin.cxx.
+
+
+
+void SciTEWin::SetMenuItem(int menuNumber, int position, int itemID,
+			   const GUI::gui_char *text, const GUI::gui_char *mnemonic) {
+	// On Windows the menu items are modified if they already exist or are created
+	HMENU hmenu = ::GetSubMenu(::GetMenu(MainHWND()), menuNumber);
+	GUI::gui_string sTextMnemonic = text;
+	long keycode = 0;
+	if (mnemonic && *mnemonic) {
+		keycode = SciTEKeys::ParseKeyCode(GUI::UTF8FromString(mnemonic).c_str());
+		if (keycode) {
+			sTextMnemonic += GUI_TEXT("\t");
+			sTextMnemonic += mnemonic;
+		}
+		// the keycode could be used to make a custom accelerator table
+		// but for now, the menu's item data is used instead for command
+		// tools, and for other menu entries it is just discarded.
+	}
+
+	const UINT typeFlags = (text[0]) ? MF_STRING : MF_SEPARATOR;
+	if (::GetMenuState(hmenu, itemID, MF_BYCOMMAND) == static_cast<UINT>(-1)) {
+		// Not present so insert
+		::InsertMenuW(hmenu, position, MF_BYPOSITION | typeFlags, itemID, sTextMnemonic.c_str());
+	} else {
+		::ModifyMenuW(hmenu, itemID, MF_BYCOMMAND | typeFlags, itemID, sTextMnemonic.c_str());
+	}
+
+	if (itemID >= IDM_TOOLS && itemID < IDM_TOOLS + toolMax) {
+		// Stow the keycode for later retrieval.
+		// Do this even if 0, in case the menu already existed (e.g. ModifyMenu)
+		MENUITEMINFO mii {};
+		mii.cbSize = sizeof(MENUITEMINFO);
+		mii.fMask = MIIM_DATA;
+		mii.dwItemData = keycode;
+		::SetMenuItemInfo(hmenu, itemID, FALSE, &mii);
+	}
+}
+
+void SciTEWin::RedrawMenu() {
+	// Make previous change visible.
+	::DrawMenuBar(HwndOf(wSciTE));
+}
+
+void SciTEWin::DestroyMenuItem(int menuNumber, int itemID) {
+	// On Windows menu items are destroyed as they can not be hidden and they can be recreated in any position
+	HMENU hmenuBar = ::GetMenu(MainHWND());
+	if (itemID) {
+		HMENU hmenu = ::GetSubMenu(hmenuBar, menuNumber);
+		::DeleteMenu(hmenu, itemID, MF_BYCOMMAND);
+	} else {
+		::DeleteMenu(hmenuBar, menuNumber, MF_BYPOSITION);
+	}
+}
+
+void SciTEWin::CheckAMenuItem(int wIDCheckItem, bool val) {
+	if (val)
+		CheckMenuItem(::GetMenu(MainHWND()), wIDCheckItem, MF_CHECKED | MF_BYCOMMAND);
+	else
+		CheckMenuItem(::GetMenu(MainHWND()), wIDCheckItem, MF_UNCHECKED | MF_BYCOMMAND);
+}
+
+void EnableButton(HWND wTools, int id, bool enable) noexcept {
+	if (wTools) {
+		::SendMessage(wTools, TB_ENABLEBUTTON, id,
+			      IntFromTwoShorts(enable ? TRUE : FALSE, 0));
+	}
+}
+
+void SciTEWin::EnableAMenuItem(int wIDCheckItem, bool val) {
+	if (val)
+		::EnableMenuItem(::GetMenu(MainHWND()), wIDCheckItem, MF_ENABLED | MF_BYCOMMAND);
+	else
+		::EnableMenuItem(::GetMenu(MainHWND()), wIDCheckItem, MF_DISABLED | MF_GRAYED | MF_BYCOMMAND);
+	::EnableButton(HwndOf(wToolBar), wIDCheckItem, val);
+}
+
+void SciTEWin::CheckMenus() {
+	if (!MainHWND())
+		return;
+	SciTEBase::CheckMenus();
+	::CheckMenuRadioItem(::GetMenu(MainHWND()), IDM_EOL_CRLF, IDM_EOL_LF,
+			     static_cast<int>(wEditor.EOLMode()) - static_cast<int>(SA::EndOfLine::CrLf) + IDM_EOL_CRLF, 0);
+	::CheckMenuRadioItem(::GetMenu(MainHWND()), IDM_ENCODING_DEFAULT, IDM_ENCODING_UCOOKIE,
+			     CurrentBuffer()->unicodeMode + IDM_ENCODING_DEFAULT, 0);
+}
+
+void SciTEWin::LocaliseMenu(HMENU hmenu) {
+	for (int i = 0; i <= ::GetMenuItemCount(hmenu); i++) {
+		GUI::gui_char buff[200] {};
+		MENUITEMINFOW mii {};
+		mii.cbSize = sizeof(mii);
+		mii.fMask = MIIM_CHECKMARKS | MIIM_DATA | MIIM_ID |
+			    MIIM_STATE | MIIM_SUBMENU | MIIM_TYPE;
+		mii.dwTypeData = buff;
+		mii.cch = sizeof(buff) - 1;
+		if (::GetMenuItemInfoW(hmenu, i, TRUE, &mii)) {
+			if (mii.hSubMenu) {
+				LocaliseMenu(mii.hSubMenu);
+			}
+			if (mii.fType == MFT_STRING || mii.fType == MFT_RADIOCHECK) {
+				if (mii.dwTypeData) {
+					GUI::gui_string text(mii.dwTypeData);
+					GUI::gui_string accel(mii.dwTypeData);
+					const size_t len = text.length();
+					const size_t tab = text.find(GUI_TEXT("\t"));
+					if (tab != GUI::gui_string::npos) {
+						text.erase(tab, len - tab);
+						accel.erase(0, tab + 1);
+					} else {
+						accel = GUI_TEXT("");
+					}
+					text = localiser.Text(GUI::UTF8FromString(text).c_str(), true);
+					if (text.length()) {
+						if (accel != GUI_TEXT("")) {
+							text += GUI_TEXT("\t");
+							text += accel;
+						}
+						text.append(1, 0);
+						mii.dwTypeData = &text[0];
+						::SetMenuItemInfoW(hmenu, i, TRUE, &mii);
+					}
+				}
+			}
+		}
+	}
+}
+
+void SciTEWin::LocaliseMenus() {
+	LocaliseMenu(::GetMenu(MainHWND()));
+	::DrawMenuBar(MainHWND());
+}
+
+void SciTEWin::LocaliseControl(HWND w) {
+	std::string originalText = GUI::UTF8FromString(TextOfWindow(w));
+	GUI::gui_string translatedText = localiser.Text(originalText.c_str(), false);
+	if (translatedText.length())
+		::SetWindowTextW(w, translatedText.c_str());
+}
+
+void SciTEWin::LocaliseDialog(HWND wDialog) {
+	LocaliseControl(wDialog);
+	HWND wChild = GetFirstChild(wDialog);
+	while (wChild) {
+		LocaliseControl(wChild);
+		wChild = GetNextSibling(wChild);
+	}
+}
+
+struct BarButton {
+	int id;
+	int cmd;
+};
+
+static BarButton bbs[] = {
+	{ -1,           0 },
+	{ STD_FILENEW,  IDM_NEW },
+	{ STD_FILEOPEN, IDM_OPEN },
+	{ STD_FILESAVE, IDM_SAVE },
+	{ 0,            IDM_CLOSE },
+	{ -1,           0 },
+	{ STD_PRINT,    IDM_PRINT },
+	{ -1,           0 },
+	{ STD_CUT,      IDM_CUT },
+	{ STD_COPY,     IDM_COPY },
+	{ STD_PASTE,    IDM_PASTE },
+	{ STD_DELETE,   IDM_CLEAR },
+	{ -1,           0 },
+	{ STD_UNDO,     IDM_UNDO },
+	{ STD_REDOW,    IDM_REDO },
+	{ -1,           0 },
+	{ STD_FIND,     IDM_FIND },
+	{ STD_REPLACE,  IDM_REPLACE },
+};
+
+static WNDPROC stDefaultTabProc = nullptr;
+static LRESULT PASCAL TabWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+
+	static bool bDragBegin = false;
+	static int iDraggingTab = -1;
+	static int iLastClickTab = -1;
+	static HWND hwndLastFocus {};
+
+	switch (iMessage) {
+
+	case WM_LBUTTONDOWN: {
+			const GUI::Point pt = PointFromLong(lParam);
+			iLastClickTab = TabAtPoint(hWnd, pt);
+		}
+		break;
+	}
+
+	LRESULT retResult;
+	if (stDefaultTabProc != nullptr) {
+		retResult = CallWindowProc(stDefaultTabProc, hWnd, iMessage, wParam, lParam);
+	} else {
+		retResult = ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	}
+
+	switch (iMessage) {
+
+	case WM_MBUTTONDOWN: {
+			// Check if on tab bar
+			const GUI::Point pt = PointFromLong(lParam);
+			const int tab = TabAtPoint(hWnd, pt);
+			if (tab >= 0) {
+				::SendMessage(::GetParent(hWnd), WM_COMMAND, IDC_TABCLOSE, tab);
+			}
+		}
+		break;
+
+	case WM_LBUTTONUP: {
+			iLastClickTab = -1;
+			if (bDragBegin) {
+				if (hwndLastFocus) ::SetFocus(hwndLastFocus);
+				::ReleaseCapture();
+				::SetCursor(::LoadCursor(NULL, IDC_ARROW));
+				bDragBegin = false;
+				const GUI::Point pt = PointFromLong(lParam);
+				const int tab = TabAtPoint(hWnd, pt);
+				if (tab > -1 && iDraggingTab > -1 && iDraggingTab != tab) {
+					::SendMessage(::GetParent(hWnd),
+						      WM_COMMAND,
+						      IDC_SHIFTTAB,
+						      MAKELPARAM(iDraggingTab, tab));
+				}
+				iDraggingTab = -1;
+			}
+		}
+		break;
+
+	case WM_KEYDOWN: {
+			if (wParam == VK_ESCAPE) {
+				if (bDragBegin) {
+					if (hwndLastFocus) ::SetFocus(hwndLastFocus);
+					::ReleaseCapture();
+					::SetCursor(::LoadCursor(NULL, IDC_ARROW));
+					bDragBegin = false;
+					iDraggingTab = -1;
+					iLastClickTab = -1;
+					::InvalidateRect(hWnd, nullptr, FALSE);
+				}
+			}
+		}
+		break;
+
+	case WM_MOUSEMOVE: {
+
+			const GUI::Point pt = PointFromLong(lParam);
+			const int tab = TabAtPoint(hWnd, pt);
+			const int tabcount = TabCtrl_GetItemCount(hWnd);
+
+			if (wParam == MK_LBUTTON &&
+					tabcount > 1 &&
+					tab > -1 &&
+					iLastClickTab == tab &&
+					!bDragBegin) {
+				iDraggingTab = tab;
+				::SetCapture(hWnd);
+				hwndLastFocus = ::SetFocus(hWnd);
+				bDragBegin = true;
+				HCURSOR hcursor = ::LoadCursor(::GetModuleHandle(nullptr),
+							       MAKEINTRESOURCE(IDC_DRAGDROP));
+				if (hcursor) ::SetCursor(hcursor);
+			} else {
+				if (bDragBegin) {
+					if (tab > -1 && iDraggingTab > -1 /*&& iDraggingTab != tab*/) {
+						HCURSOR hcursor = ::LoadCursor(::GetModuleHandle(nullptr),
+									       MAKEINTRESOURCE(IDC_DRAGDROP));
+						if (hcursor) ::SetCursor(hcursor);
+					} else {
+						::SetCursor(::LoadCursor(NULL, IDC_NO));
+					}
+				}
+			}
+		}
+		break;
+
+	case WM_PAINT: {
+			if (bDragBegin && iDraggingTab != -1) {
+
+				const GUI::Point ptClient = ClientFromScreen(hWnd, PointOfCursor());
+				const int tab = TabAtPoint(hWnd, ptClient);
+
+				RECT tabrc {};
+				if (tab != -1 &&
+						tab != iDraggingTab &&
+						TabCtrl_GetItemRect(hWnd, tab, &tabrc)) {
+
+					HDC hDC = ::GetDC(hWnd);
+					if (hDC) {
+
+						const int xLeft = tabrc.left + 8;
+						const int yLeft = tabrc.top + (tabrc.bottom - tabrc.top) / 2;
+						POINT ptsLeftArrow[] = {
+							{xLeft, yLeft - 2},
+							{xLeft - 2, yLeft - 2},
+							{xLeft - 2, yLeft - 5},
+							{xLeft - 7, yLeft},
+							{xLeft - 2, yLeft + 5},
+							{xLeft - 2, yLeft + 2},
+							{xLeft, yLeft + 2}
+						};
+
+						const int xRight = tabrc.right - 10;
+						const int yRight = tabrc.top + (tabrc.bottom - tabrc.top) / 2;
+						POINT ptsRightArrow[] = {
+							{xRight, yRight - 2},
+							{xRight + 2, yRight - 2},
+							{xRight + 2, yRight - 5},
+							{xRight + 7, yRight},
+							{xRight + 2, yRight + 5},
+							{xRight + 2, yRight + 2},
+							{xRight, yRight + 2}
+						};
+
+						HPEN pen = ::CreatePen(0, 1, RGB(255, 0, 0));
+						HPEN penOld = SelectPen(hDC, pen);
+						const COLORREF colourNearest = ::GetNearestColor(hDC, RGB(255, 0, 0));
+						HBRUSH brush = ::CreateSolidBrush(colourNearest);
+						HBRUSH brushOld = SelectBrush(hDC, brush);
+						::Polygon(hDC, tab < iDraggingTab ? ptsLeftArrow : ptsRightArrow, 7);
+						SelectBrush(hDC, brushOld);
+						DeleteBrush(brush);
+						SelectPen(hDC, penOld);
+						DeletePen(pen);
+						::ReleaseDC(hWnd, hDC);
+					}
+				}
+			}
+		}
+		break;
+	}
+
+	return retResult;
+}
+
+/**
+ * Create all the needed windows.
+ */
+void SciTEWin::Creation() {
+
+	wContent = ::CreateWindowEx(
+			   flatterUI ? 0 : WS_EX_CLIENTEDGE,
+			   classNameInternal,
+			   TEXT("Source"),
+			   WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+			   0, 0,
+			   100, 100,
+			   MainHWND(),
+			   HmenuID(2000),
+			   hInstance,
+			   &contents);
+	wContent.Show();
+
+	wEditor.SetScintilla(::CreateWindowEx(
+				     0,
+				     TEXT("Scintilla"),
+				     TEXT("Source"),
+				     WS_CHILD | WS_VSCROLL | WS_HSCROLL | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+				     0, 0,
+				     100, 100,
+				     HwndOf(wContent),
+				     HmenuID(IDM_SRCWIN),
+				     hInstance,
+				     nullptr));
+	if (!wEditor.CanCall())
+		exit(FALSE);
+	wEditor.Show();
+	wEditor.UsePopUp(SA::PopUp::Never);
+	wEditor.SetCommandEvents(false);
+	WindowSetFocus(wEditor);
+
+	wOutput.SetScintilla(::CreateWindowEx(
+				     0,
+				     TEXT("Scintilla"),
+				     TEXT("Run"),
+				     WS_CHILD | WS_VSCROLL | WS_HSCROLL | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+				     0, 0,
+				     100, 100,
+				     HwndOf(wContent),
+				     HmenuID(IDM_RUNWIN),
+				     hInstance,
+				     nullptr));
+	if (!wOutput.CanCall())
+		exit(FALSE);
+	wOutput.Show();
+	wOutput.SetCommandEvents(false);
+	// No selection margin on output window
+	wOutput.SetMarginWidthN(1, 0);
+	//wOutput.SetCaretPeriod(0);
+	wOutput.UsePopUp(SA::PopUp::Never);
+	::DragAcceptFiles(MainHWND(), true);
+
+	HWND hwndToolBar = ::CreateWindowEx(
+				   0,
+				   TOOLBARCLASSNAME,
+				   TEXT(""),
+				   WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS |
+				   TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NORESIZE,
+				   0, 0,
+				   100, tbLarge ? heightToolsBig : heightTools,
+				   MainHWND(),
+				   HmenuID(IDM_TOOLWIN),
+				   hInstance,
+				   nullptr);
+	wToolBar = hwndToolBar;
+
+	::SendMessage(hwndToolBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
+	::SendMessage(hwndToolBar, TB_SETBITMAPSIZE, 0, tbLarge ? MAKELPARAM(24, 24) : MAKELPARAM(16, 16));
+	::SendMessage(hwndToolBar, TB_LOADIMAGES,
+		      tbLarge ? IDB_STD_LARGE_COLOR : IDB_STD_SMALL_COLOR,
+		      reinterpret_cast<LPARAM>(HINST_COMMCTRL));
+
+	TBADDBITMAP addbmp = { hInstance, IDR_CLOSEFILE };
+
+	if (tbLarge) {
+		addbmp.nID = IDR_CLOSEFILE24;
+	}
+
+	::SendMessage(hwndToolBar, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
+
+	TBBUTTON tbb[std::size(bbs)] = {};
+	for (unsigned int i = 0; i < std::size(bbs); i++) {
+		if (bbs[i].cmd == IDM_CLOSE)
+			tbb[i].iBitmap = STD_PRINT + 1;
+		else
+			tbb[i].iBitmap = bbs[i].id;
+		tbb[i].idCommand = bbs[i].cmd;
+		tbb[i].fsState = TBSTATE_ENABLED;
+		if (-1 == bbs[i].id)
+			tbb[i].fsStyle = TBSTYLE_SEP;
+		else
+			tbb[i].fsStyle = TBSTYLE_BUTTON;
+		tbb[i].dwData = 0;
+		tbb[i].iString = 0;
+	}
+
+	::SendMessage(hwndToolBar, TB_ADDBUTTONS, std::size(bbs), reinterpret_cast<LPARAM>(tbb));
+
+	wToolBar.Show();
+
+	INITCOMMONCONTROLSEX icce {};
+	icce.dwSize = sizeof(icce);
+	icce.dwICC = ICC_TAB_CLASSES;
+	InitCommonControlsEx(&icce);
+
+	WNDCLASS wndClass = {};
+	if (::GetClassInfo(NULL, WC_TABCONTROL, &wndClass) == 0)
+		exit(FALSE);
+	stDefaultTabProc = wndClass.lpfnWndProc;
+	wndClass.lpfnWndProc = TabWndProc;
+	wndClass.style = wndClass.style | CS_DBLCLKS;
+	wndClass.lpszClassName = TEXT("SciTeTabCtrl");
+	wndClass.hInstance = hInstance;
+	if (RegisterClass(&wndClass) == 0)
+		exit(FALSE);
+
+	wTabBar = ::CreateWindowEx(
+			  0,
+			  TEXT("SciTeTabCtrl"),
+			  TEXT("Tab"),
+			  WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS |
+			  TCS_FOCUSNEVER | TCS_TOOLTIPS,
+			  0, 0,
+			  100, heightTab,
+			  MainHWND(),
+			  HmenuID(IDM_TABWIN),
+			  hInstance,
+			  nullptr);
+
+	if (!wTabBar.Created())
+		exit(FALSE);
+
+	LOGFONTW lfIconTitle {};
+	if (::SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lfIconTitle), &lfIconTitle, FALSE) == 0)
+		exit(FALSE);
+	fontTabs = ::CreateFontIndirectW(&lfIconTitle);
+	SetWindowFont(HwndOf(wTabBar), fontTabs, 0);
+
+	wTabBar.Show();
+
+	HWND hwnd = ::CreateWindowEx(
+			    0,
+			    classNameInternal,
+			    TEXT("userStrip"),
+			    WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+			    0, 0,
+			    100, 100,
+			    MainHWND(),
+			    HmenuID(2001),
+			    hInstance,
+			    &userStrip);
+	if (!hwnd)
+		exit(FALSE);
+
+	hwnd = ::CreateWindowEx(
+		       0,
+		       classNameInternal,
+		       TEXT("backgroundStrip"),
+		       WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+		       0, 0,
+		       100, 100,
+		       MainHWND(),
+		       HmenuID(2001),
+		       hInstance,
+		       &backgroundStrip);
+	if (!hwnd)
+		exit(FALSE);
+
+	hwnd = ::CreateWindowEx(
+		       0,
+		       classNameInternal,
+		       TEXT("searchStrip"),
+		       WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+		       0, 0,
+		       100, 100,
+		       MainHWND(),
+		       HmenuID(2001),
+		       hInstance,
+		       &searchStrip);
+	if (!hwnd)
+		exit(FALSE);
+
+	hwnd = ::CreateWindowEx(
+		       0,
+		       classNameInternal,
+		       TEXT("FindStrip"),
+		       WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+		       0, 0,
+		       100, 100,
+		       MainHWND(),
+		       HmenuID(2002),
+		       hInstance,
+		       &findStrip);
+	if (!hwnd)
+		exit(FALSE);
+
+	hwnd = ::CreateWindowEx(
+		       0,
+		       classNameInternal,
+		       TEXT("ReplaceStrip"),
+		       WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
+		       0, 0,
+		       100, 100,
+		       MainHWND(),
+		       HmenuID(2003),
+		       hInstance,
+		       &replaceStrip);
+	if (!hwnd)
+		exit(FALSE);
+
+	wStatusBar = ::CreateWindowEx(
+			     0,
+			     STATUSCLASSNAME,
+			     TEXT(""),
+			     WS_CHILD | WS_CLIPSIBLINGS,
+			     0, 0,
+			     100, heightStatus,
+			     MainHWND(),
+			     HmenuID(IDM_STATUSWIN),
+			     hInstance,
+			     nullptr);
+	wStatusBar.Show();
+	const int widths[] = { 4000 };
+	// Perhaps we can define a syntax to create more parts,
+	// but it is probably an overkill for a marginal feature
+	::SendMessage(HwndOf(wStatusBar),
+		      SB_SETPARTS, 1,
+		      reinterpret_cast<LPARAM>(widths));
+
+	bands.push_back(Band(true, tbLarge ? heightToolsBig : heightTools, false, wToolBar));
+	bands.push_back(Band(true, heightTab, false, wTabBar));
+	bands.push_back(Band(true, 100, true, wContent));
+	bands.push_back(Band(true, userStrip.Height(), false, userStrip));
+	bands.push_back(Band(true, backgroundStrip.Height(), false, backgroundStrip));
+	bands.push_back(Band(true, searchStrip.Height(), false, searchStrip));
+	bands.push_back(Band(true, findStrip.Height(), false, findStrip));
+	bands.push_back(Band(true, replaceStrip.Height(), false, replaceStrip));
+	bands.push_back(Band(true, heightStatus, false, wStatusBar));
+
+#ifndef NO_LUA
+	if (props.GetExpandedString("ext.lua.startup.script").length() == 0)
+		DestroyMenuItem(menuOptions, IDM_OPENLUAEXTERNALFILE);
+#else
+	DestroyMenuItem(menuOptions, IDM_OPENLUAEXTERNALFILE);
+#endif
+}
diff --git a/scite-app/scite/win32/SciTEWinDlg.cxx b/scite-app/scite/win32/SciTEWinDlg.cxx
new file mode 100644
index 0000000..de06ee9
--- /dev/null
+++ b/scite-app/scite/win32/SciTEWinDlg.cxx
@@ -0,0 +1,1727 @@
+// SciTE - Scintilla based Text Editor
+/** @file SciTEWinDlg.cxx
+ ** Dialog code for the Windows version of the editor.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include "SciTEWin.h"
+
+/**
+ * Flash the given window for the asked @a duration to visually warn the user.
+ */
+static void FlashThisWindow(
+	HWND hWnd,    		///< Window to flash handle.
+	int duration) noexcept {	///< Duration of the flash state.
+
+	HDC hDC = ::GetDC(hWnd);
+	if (hDC) {
+		RECT rc;
+		::GetClientRect(hWnd, &rc);
+		::FillRect(hDC, &rc, GetStockBrush(BLACK_BRUSH));
+		::Sleep(duration);
+		::ReleaseDC(hWnd, hDC);
+	}
+	::InvalidateRect(hWnd, nullptr, true);
+}
+
+/**
+ * Play the given sound, loading if needed the corresponding DLL function.
+ */
+static void PlayThisSound(
+	const char *sound,    	///< Path to a .wav file or string with a frequency value.
+	int duration,    		///< If @a sound is a frequency, gives the duration of the sound.
+	HMODULE &hMM) noexcept {		///< Multimedia DLL handle.
+
+	BOOL bPlayOK = false;
+	int soundFreq = -1;	// Default is no sound at all
+	if (sound && *sound) {
+		soundFreq = atoi(sound);	// May be a frequency, not a filename
+	}
+
+	if (soundFreq == 0) {	// sound is probably a path
+		if (!hMM) {
+			// Load the DLL only if needed (may be slow on some systems)
+			hMM = ::LoadLibrary(TEXT("WINMM.DLL"));
+		}
+
+		if (hMM) {
+			typedef BOOL (WINAPI *MMFn)(LPCSTR, HMODULE, DWORD);
+			MMFn fnMM = reinterpret_cast<MMFn>(::GetProcAddress(hMM, "PlaySoundA"));
+			if (fnMM) {
+				bPlayOK = fnMM(sound, NULL, SND_ASYNC | SND_FILENAME);
+			}
+		}
+	}
+	if (!bPlayOK && soundFreq >= 0) {	// The sound could no be played, or user gave a frequency
+		// Will use the speaker to generate a sound
+		if (soundFreq < 37 || soundFreq > 32767) {
+			soundFreq = 440;
+		}
+		if (duration < 50) {
+			duration = 50;
+		}
+		if (duration > 5000) {	// Don't play too long...
+			duration = 5000;
+		}
+		// soundFreq and duration are not used on Win9x.
+		// On those systems, PC will either use the default sound event or
+		// emit a standard speaker sound.
+		::Beep(soundFreq, duration);
+	}
+}
+
+static SciTEWin *Caller(HWND hDlg, UINT message, LPARAM lParam) noexcept {
+	if (message == WM_INITDIALOG) {
+		::SetWindowLongPtr(hDlg, DWLP_USER, lParam);
+	}
+	return reinterpret_cast<SciTEWin *>(::GetWindowLongPtr(hDlg, DWLP_USER));
+}
+
+void SciTEWin::WarnUser(int warnID) {
+	std::string warning;
+	char flashDuration[10] = "";
+	char sound[_MAX_PATH] = "";
+	char soundDuration[10] = "";
+
+	switch (warnID) {
+	case warnFindWrapped:
+		warning = props.GetString("warning.findwrapped");
+		break;
+	case warnNotFound:
+		warning = props.GetString("warning.notfound");
+		break;
+	case warnWrongFile:
+		warning = props.GetString("warning.wrongfile");
+		break;
+	case warnExecuteOK:
+		warning = props.GetString("warning.executeok");
+		break;
+	case warnExecuteKO:
+		warning = props.GetString("warning.executeko");
+		break;
+	case warnNoOtherBookmark:
+		warning = props.GetString("warning.nootherbookmark");
+		break;
+	default:
+		warning = "";
+		break;
+	}
+	const char *warn = warning.c_str();
+	const char *next = GetNextPropItem(warn, flashDuration, 10);
+	next = GetNextPropItem(next, sound, _MAX_PATH);
+	GetNextPropItem(next, soundDuration, 10);
+
+	const int flashLen = atoi(flashDuration);
+	if (flashLen) {
+		FlashThisWindow(HwndOf(wEditor), flashLen);
+	}
+	PlayThisSound(sound, atoi(soundDuration), hMM);
+}
+
+bool SciTEWin::DialogHandled(GUI::WindowID id, MSG *pmsg) noexcept {
+	if (id) {
+		if (::IsDialogMessageW(static_cast<HWND>(id), pmsg))
+			return true;
+	}
+	return false;
+}
+
+bool SciTEWin::ModelessHandler(MSG *pmsg) {
+	if (DialogHandled(wFindReplace.GetID(), pmsg)) {
+		return true;
+	}
+	if (DialogHandled(wFindInFiles.GetID(), pmsg)) {
+		return true;
+	}
+	if (wParameters.GetID()) {
+		// Allow commands, such as Ctrl+1 to be active while the Parameters dialog is
+		// visible so that a group of commands can be easily run with differing parameters.
+		const bool menuKey = (pmsg->message == WM_KEYDOWN) &&
+				     (pmsg->wParam != VK_TAB) &&
+				     (pmsg->wParam != VK_ESCAPE) &&
+				     (pmsg->wParam != VK_RETURN) &&
+				     (pmsg->wParam < 'A' || pmsg->wParam > 'Z') &&
+				     (IsKeyDown(VK_CONTROL) || !IsKeyDown(VK_MENU));
+		if (!menuKey && DialogHandled(wParameters.GetID(), pmsg))
+			return true;
+	}
+	if ((pmsg->message == WM_KEYDOWN) || (pmsg->message == WM_SYSKEYDOWN)) {
+		if (searchStrip.KeyDown(pmsg->wParam))
+			return true;
+		if (findStrip.KeyDown(pmsg->wParam))
+			return true;
+		if (replaceStrip.KeyDown(pmsg->wParam))
+			return true;
+		if (userStrip.KeyDown(pmsg->wParam))
+			return true;
+	}
+	if (pmsg->message == WM_KEYDOWN || pmsg->message == WM_SYSKEYDOWN) {
+		if (KeyDown(pmsg->wParam))
+			return true;
+	} else if (pmsg->message == WM_KEYUP) {
+		if (KeyUp(pmsg->wParam))
+			return true;
+	}
+
+	return false;
+}
+
+//  DoDialog is a bit like something in PC Magazine May 28, 1991, page 357
+int SciTEWin::DoDialog(const TCHAR *resName, DLGPROC lpProc) {
+	const int result = static_cast<int>(
+				   ::DialogBoxParam(hInstance, resName, MainHWND(), lpProc, reinterpret_cast<LPARAM>(this)));
+
+	if (result == -1) {
+		GUI::gui_string errorNum = GUI::StringFromInteger(::GetLastError());
+		GUI::gui_string msg = LocaliseMessage("Failed to create dialog box: ^0.", errorNum.c_str());
+		::MessageBoxW(MainHWND(), msg.c_str(), appName, MB_OK | MB_SETFOREGROUND);
+	}
+
+	WindowSetFocus(wEditor);
+
+	return result;
+}
+
+HWND SciTEWin::CreateParameterisedDialog(LPCWSTR lpTemplateName, DLGPROC lpProc) {
+	return ::CreateDialogParamW(hInstance,
+				    lpTemplateName,
+				    MainHWND(),
+				    lpProc,
+				    reinterpret_cast<LPARAM>(this));
+}
+
+GUI::gui_string SciTEWin::DialogFilterFromProperty(const GUI::gui_char *filterProperty) {
+	GUI::gui_string filterText = filterProperty;
+	if (filterText.length()) {
+		std::replace(filterText.begin(), filterText.end(), '|', '\0');
+		size_t start = 0;
+		while (start < filterText.length()) {
+			const GUI::gui_char *filterName = filterText.c_str() + start;
+			if (*filterName == '#') {
+				size_t next = start + wcslen(filterText.c_str() + start) + 1;
+				next += wcslen(filterText.c_str() + next) + 1;
+				filterText.erase(start, next - start);
+			} else {
+				GUI::gui_string localised = localiser.Text(GUI::UTF8FromString(filterName).c_str(), false);
+				if (localised.size()) {
+					filterText.erase(start, wcslen(filterName));
+					filterText.insert(start, localised);
+				}
+				start += wcslen(filterText.c_str() + start) + 1;
+				start += wcslen(filterText.c_str() + start) + 1;
+			}
+		}
+	}
+	return filterText;
+}
+
+void SciTEWin::CheckCommonDialogError() {
+	const DWORD errorNumber = ::CommDlgExtendedError();
+	if (errorNumber) {
+		GUI::gui_string sError = GUI::HexStringFromInteger(errorNumber);
+		GUI::gui_string msg = LocaliseMessage("Common dialog error 0x^0.", sError.c_str());
+		WindowMessageBox(wSciTE, msg);
+	}
+}
+
+bool SciTEWin::OpenDialog(const FilePath &directory, const GUI::gui_char *filesFilter) {
+	enum {maxBufferSize=2048};
+
+	DWORD filterDefault = 1;
+	std::vector<GUI::gui_string> filters = StringSplit(GUI::gui_string(filesFilter), L'|');
+	if (!openFilterDefault.empty()) {
+		std::vector<GUI::gui_string>::iterator itFilter = std::find(filters.begin(), filters.end(), openFilterDefault);
+		if (itFilter != filters.end()) {
+			filterDefault = static_cast<DWORD>(std::distance(filters.begin(), itFilter)) / 2 + 1;
+		}
+	}
+	GUI::gui_string openFilter = DialogFilterFromProperty(filesFilter);
+
+	if (!openWhat[0]) {
+		StringCopy(openWhat, localiser.Text("Custom Filter").c_str());
+		openWhat[std::size(openWhat)-2] = L'\0';
+		// 2 NULs as there are 2 strings here: the display string and the filter string
+		openWhat[wcslen(openWhat) + 1] = L'\0';
+	}
+
+	bool succeeded = false;
+	GUI::gui_char openName[maxBufferSize] = GUI_TEXT(""); // maximum common dialog buffer size (says mfc..)
+
+	OPENFILENAMEW ofn {};
+	ofn.lStructSize = sizeof(ofn);
+	ofn.hwndOwner = MainHWND();
+	ofn.hInstance = hInstance;
+	ofn.lpstrFile = openName;
+	ofn.nMaxFile = maxBufferSize;
+	ofn.lpstrFilter = openFilter.c_str();
+	ofn.lpstrCustomFilter = openWhat;
+	ofn.nMaxCustFilter = static_cast<DWORD>(std::size(openWhat));
+	ofn.nFilterIndex = filterDefault;
+	GUI::gui_string translatedTitle = localiser.Text("Open File");
+	ofn.lpstrTitle = translatedTitle.c_str();
+	if (props.GetInt("open.dialog.in.file.directory")) {
+		ofn.lpstrInitialDir = directory.AsInternal();
+	}
+	ofn.Flags = OFN_HIDEREADONLY;
+
+	if (buffers.size() > 1) {
+		ofn.Flags |=
+			OFN_EXPLORER |
+			OFN_PATHMUSTEXIST |
+			OFN_NOCHANGEDIR |
+			OFN_ALLOWMULTISELECT;
+	}
+	if (::GetOpenFileNameW(&ofn)) {
+		succeeded = true;
+		openFilterDefault = filters[(ofn.nFilterIndex-1)*2];
+		// if single selection then have path+file
+		if (wcslen(openName) > static_cast<size_t>(ofn.nFileOffset)) {
+			Open(openName);
+		} else {
+			FilePath directoryOpen(openName);
+			GUI::gui_char *p = openName + wcslen(openName) + 1;
+			while (*p) {
+				// make path+file, add it to the list
+				Open(FilePath(directoryOpen, FilePath(p)));
+				// goto next char pos after \0
+				p += wcslen(p) + 1;
+			}
+		}
+	} else {
+		CheckCommonDialogError();
+	}
+	return succeeded;
+}
+
+FilePath SciTEWin::ChooseSaveName(const FilePath &directory, const char *title, const GUI::gui_char *filesFilter, const char *ext) {
+	FilePath path;
+	if (0 == dialogsOnScreen) {
+		GUI::gui_char saveName[MAX_PATH] = GUI_TEXT("");
+		FilePath savePath = SaveName(ext);
+		if (!savePath.IsUntitled()) {
+			StringCopy(saveName, savePath.AsInternal());
+		}
+		OPENFILENAMEW ofn {};
+		ofn.lStructSize = sizeof(ofn);
+		ofn.hwndOwner = MainHWND();
+		ofn.hInstance = hInstance;
+		ofn.lpstrFile = saveName;
+		ofn.nMaxFile = static_cast<DWORD>(std::size(saveName));
+		GUI::gui_string translatedTitle = localiser.Text(title);
+		ofn.lpstrTitle = translatedTitle.c_str();
+		ofn.Flags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
+		ofn.lpstrFilter = filesFilter;
+		ofn.lpstrInitialDir = directory.AsInternal();
+
+		dialogsOnScreen++;
+		if (::GetSaveFileNameW(&ofn)) {
+			path = saveName;
+		} else {
+			CheckCommonDialogError();
+		}
+		dialogsOnScreen--;
+	}
+	return path;
+}
+
+bool SciTEWin::SaveAsDialog() {
+	GUI::gui_string saveFilter = DialogFilterFromProperty(
+					     GUI::StringFromUTF8(props.GetExpandedString("save.filter")).c_str());
+	FilePath path = ChooseSaveName(filePath.Directory(), "Save File", saveFilter.c_str());
+	if (path.IsSet()) {
+		return SaveIfNotOpen(path, false);
+	}
+	return false;
+}
+
+void SciTEWin::SaveACopy() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Save a Copy");
+	if (path.IsSet()) {
+		SaveBuffer(path, sfNone);
+	}
+}
+
+void SciTEWin::SaveAsHTML() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Export File As HTML",
+				       GUI_TEXT("Web (.html;.htm)\0*.html;*.htm\0"), ".html");
+	if (path.IsSet()) {
+		SaveToHTML(path);
+	}
+}
+
+void SciTEWin::SaveAsRTF() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Export File As RTF",
+				       GUI_TEXT("RTF (.rtf)\0*.rtf\0"), ".rtf");
+	if (path.IsSet()) {
+		SaveToRTF(path);
+	}
+}
+
+void SciTEWin::SaveAsPDF() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Export File As PDF",
+				       GUI_TEXT("PDF (.pdf)\0*.pdf\0"), ".pdf");
+	if (path.IsSet()) {
+		SaveToPDF(path);
+	}
+}
+
+void SciTEWin::SaveAsTEX() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Export File As LaTeX",
+				       GUI_TEXT("TeX (.tex)\0*.tex\0"), ".tex");
+	if (path.IsSet()) {
+		SaveToTEX(path);
+	}
+}
+
+void SciTEWin::SaveAsXML() {
+	FilePath path = ChooseSaveName(filePath.Directory(), "Export File As XML",
+				       GUI_TEXT("XML (.xml)\0*.xml\0"), ".xml");
+	if (path.IsSet()) {
+		SaveToXML(path);
+	}
+}
+
+void SciTEWin::LoadSessionDialog() {
+	GUI::gui_char openName[MAX_PATH] = GUI_TEXT("");
+	OPENFILENAMEW ofn = {};
+	ofn.lStructSize = sizeof(ofn);
+	ofn.hwndOwner = MainHWND();
+	ofn.hInstance = hInstance;
+	ofn.lpstrFile = openName;
+	ofn.nMaxFile = static_cast<DWORD>(std::size(openName));
+	ofn.lpstrFilter = GUI_TEXT("Session (.session)\0*.session\0");
+	GUI::gui_string translatedTitle = localiser.Text("Load Session");
+	ofn.lpstrTitle = translatedTitle.c_str();
+	ofn.Flags = OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+	if (::GetOpenFileNameW(&ofn)) {
+		LoadSessionFile(openName);
+		RestoreSession();
+	} else {
+		CheckCommonDialogError();
+	}
+}
+
+void SciTEWin::SaveSessionDialog() {
+	GUI::gui_char saveName[MAX_PATH] = GUI_TEXT("\0");
+	StringCopy(saveName, GUI_TEXT("SciTE.session"));
+	OPENFILENAMEW ofn = {};
+	ofn.lStructSize = sizeof(ofn);
+	ofn.hwndOwner = MainHWND();
+	ofn.hInstance = hInstance;
+	ofn.lpstrDefExt = GUI_TEXT("session");
+	ofn.lpstrFile = saveName;
+	ofn.nMaxFile = static_cast<DWORD>(std::size(saveName));
+	GUI::gui_string translatedTitle = localiser.Text("Save Current Session");
+	ofn.lpstrTitle = translatedTitle.c_str();
+	ofn.Flags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
+	ofn.lpstrFilter = GUI_TEXT("Session (.session)\0*.session\0");
+	if (::GetSaveFileNameW(&ofn)) {
+		SaveSessionFile(saveName);
+	} else {
+		CheckCommonDialogError();
+	}
+}
+
+static void DeleteFontObject(HFONT &font) noexcept {
+	if (font) {
+		::DeleteObject(font);
+		font = {};
+	}
+}
+
+/**
+ * Display the Print dialog (if @a showDialog asks it),
+ * allowing it to choose what to print on which printer.
+ * If OK, print the user choice, with optionally defined header and footer.
+ */
+void SciTEWin::Print(
+	bool showDialog) {	///< false if must print silently (using default settings).
+
+	RemoveFindMarks();
+	PRINTDLG pdlg = {};
+	pdlg.lStructSize = sizeof(PRINTDLG);
+	pdlg.hwndOwner = MainHWND();
+	pdlg.hInstance = hInstance;
+	pdlg.Flags = PD_USEDEVMODECOPIES | PD_ALLPAGES | PD_RETURNDC;
+	pdlg.nFromPage = 1;
+	pdlg.nToPage = 1;
+	pdlg.nMinPage = 1;
+	pdlg.nMaxPage = 0xffffU; // We do not know how many pages in the
+	// document until the printer is selected and the paper size is known.
+	pdlg.nCopies = 1;
+	pdlg.hDC = {};
+	pdlg.hDevMode = hDevMode;
+	pdlg.hDevNames = hDevNames;
+
+	// This code will not work for documents > 2GB
+
+	// See if a range has been selected
+	const SA::Span rangeSelection = GetSelection();
+	const LONG startPos = static_cast<LONG>(rangeSelection.start);
+	const LONG endPos = static_cast<LONG>(rangeSelection.end);
+
+	if (startPos == endPos) {
+		pdlg.Flags |= PD_NOSELECTION;
+	} else {
+		pdlg.Flags |= PD_SELECTION;
+	}
+	if (!showDialog) {
+		// Don't display dialog box, just use the default printer and options
+		pdlg.Flags |= PD_RETURNDEFAULT;
+	}
+	if (!::PrintDlg(&pdlg)) {
+		CheckCommonDialogError();
+		return;
+	}
+
+	hDevMode = pdlg.hDevMode;
+	hDevNames = pdlg.hDevNames;
+
+	HDC hdc = pdlg.hDC;
+
+	GUI::Rectangle rectMargins, rectPhysMargins;
+	GUI::Point ptPage;
+	GUI::Point ptDpi;
+
+	// Get printer resolution
+	ptDpi.x = GetDeviceCaps(hdc, LOGPIXELSX);    // dpi in X direction
+	ptDpi.y = GetDeviceCaps(hdc, LOGPIXELSY);    // dpi in Y direction
+
+	// Start by getting the physical page size (in device units).
+	ptPage.x = GetDeviceCaps(hdc, PHYSICALWIDTH);   // device units
+	ptPage.y = GetDeviceCaps(hdc, PHYSICALHEIGHT);  // device units
+
+	// Get the dimensions of the unprintable
+	// part of the page (in device units).
+	rectPhysMargins.left = GetDeviceCaps(hdc, PHYSICALOFFSETX);
+	rectPhysMargins.top = GetDeviceCaps(hdc, PHYSICALOFFSETY);
+
+	// To get the right and lower unprintable area,
+	// we take the entire width and height of the paper and
+	// subtract everything else.
+	rectPhysMargins.right = ptPage.x						// total paper width
+				- GetDeviceCaps(hdc, HORZRES) // printable width
+				- rectPhysMargins.left;				// left unprintable margin
+
+	rectPhysMargins.bottom = ptPage.y						// total paper height
+				 - GetDeviceCaps(hdc, VERTRES)	// printable height
+				 - rectPhysMargins.top;				// right unprintable margin
+
+	// At this point, rectPhysMargins contains the widths of the
+	// unprintable regions on all four sides of the page in device units.
+
+	// Take in account the page setup given by the user (if one value is not null)
+	if (pagesetupMargin.left != 0 || pagesetupMargin.right != 0 ||
+			pagesetupMargin.top != 0 || pagesetupMargin.bottom != 0) {
+		GUI::Rectangle rectSetup;
+
+		// Convert the hundredths of millimetres (HiMetric) or
+		// thousandths of inches (HiEnglish) margin values
+		// from the Page Setup dialog to device units.
+		// (There are 2540 hundredths of a mm in an inch.)
+
+		TCHAR localeInfo[3];
+		GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IMEASURE, localeInfo, 3);
+
+		if (localeInfo[0] == '0') {	// Metric system. '1' is US System
+			rectSetup.left = MulDiv(pagesetupMargin.left, ptDpi.x, 2540);
+			rectSetup.top = MulDiv(pagesetupMargin.top, ptDpi.y, 2540);
+			rectSetup.right	= MulDiv(pagesetupMargin.right, ptDpi.x, 2540);
+			rectSetup.bottom	= MulDiv(pagesetupMargin.bottom, ptDpi.y, 2540);
+		} else {
+			rectSetup.left	= MulDiv(pagesetupMargin.left, ptDpi.x, 1000);
+			rectSetup.top	= MulDiv(pagesetupMargin.top, ptDpi.y, 1000);
+			rectSetup.right	= MulDiv(pagesetupMargin.right, ptDpi.x, 1000);
+			rectSetup.bottom	= MulDiv(pagesetupMargin.bottom, ptDpi.y, 1000);
+		}
+
+		// Don't reduce margins below the minimum printable area
+		rectMargins.left	= std::max(rectPhysMargins.left, rectSetup.left);
+		rectMargins.top	= std::max(rectPhysMargins.top, rectSetup.top);
+		rectMargins.right	= std::max(rectPhysMargins.right, rectSetup.right);
+		rectMargins.bottom	= std::max(rectPhysMargins.bottom, rectSetup.bottom);
+	} else {
+		rectMargins.left	= rectPhysMargins.left;
+		rectMargins.top	= rectPhysMargins.top;
+		rectMargins.right	= rectPhysMargins.right;
+		rectMargins.bottom	= rectPhysMargins.bottom;
+	}
+
+	// rectMargins now contains the values used to shrink the printable
+	// area of the page.
+
+	// Convert device coordinates into logical coordinates
+	DPtoLP(hdc, reinterpret_cast<LPPOINT>(&rectMargins), 2);
+	DPtoLP(hdc, reinterpret_cast<LPPOINT>(&rectPhysMargins), 2);
+
+	// Convert page size to logical units and we're done!
+	DPtoLP(hdc, reinterpret_cast<LPPOINT>(&ptPage), 1);
+
+	std::string headerFormat = props.GetString("print.header.format");
+	std::string footerFormat = props.GetString("print.footer.format");
+
+	TEXTMETRIC tm {};
+
+	std::string headerStyle = props.GetString("print.header.style");
+	StyleDefinition sdHeader(headerStyle.c_str());
+
+	int headerLineHeight = ::MulDiv(
+				       (sdHeader.specified & StyleDefinition::sdSize) ? sdHeader.size : 9,
+				       ptDpi.y, 72);
+	HFONT fontHeader = ::CreateFontA(headerLineHeight,
+					 0, 0, 0,
+					 static_cast<int>(sdHeader.weight),
+					 sdHeader.italics,
+					 sdHeader.underlined,
+					 0, 0, 0,
+					 0, 0, 0,
+					 (sdHeader.specified & StyleDefinition::sdFont) ? sdHeader.font.c_str() : "Arial");
+	::SelectObject(hdc, fontHeader);
+	::GetTextMetrics(hdc, &tm);
+	headerLineHeight = tm.tmHeight + tm.tmExternalLeading;
+
+	std::string footerStyle = props.GetString("print.footer.style");
+	StyleDefinition sdFooter(footerStyle.c_str());
+
+	int footerLineHeight = ::MulDiv(
+				       (sdFooter.specified & StyleDefinition::sdSize) ? sdFooter.size : 9,
+				       ptDpi.y, 72);
+	HFONT fontFooter = ::CreateFontA(footerLineHeight,
+					 0, 0, 0,
+					 static_cast<int>(sdFooter.weight),
+					 sdFooter.italics,
+					 sdFooter.underlined,
+					 0, 0, 0,
+					 0, 0, 0,
+					 (sdFooter.specified & StyleDefinition::sdFont) ? sdFooter.font.c_str() : "Arial");
+	::SelectObject(hdc, fontFooter);
+	::GetTextMetrics(hdc, &tm);
+	footerLineHeight = tm.tmHeight + tm.tmExternalLeading;
+
+	DOCINFO di = {};
+	di.cbSize = sizeof(DOCINFO);
+	di.lpszDocName = windowName.c_str();
+	di.lpszOutput = nullptr;
+	di.lpszDatatype = nullptr;
+	di.fwType = 0;
+	if (::StartDoc(hdc, &di) < 0) {
+		::DeleteDC(hdc);
+		DeleteFontObject(fontHeader);
+		DeleteFontObject(fontFooter);
+		GUI::gui_string msg = LocaliseMessage("Can not start printer document.");
+		WindowMessageBox(wSciTE, msg, mbsOK);
+		return;
+	}
+
+	LONG lengthDoc = static_cast<LONG>(wEditor.Length());
+	const LONG lengthDocMax = lengthDoc;
+	LONG lengthPrinted = 0;
+
+	// Requested to print selection
+	if (pdlg.Flags & PD_SELECTION) {
+		if (startPos > endPos) {
+			lengthPrinted = endPos;
+			lengthDoc = startPos;
+		} else {
+			lengthPrinted = startPos;
+			lengthDoc = endPos;
+		}
+
+		if (lengthPrinted < 0)
+			lengthPrinted = 0;
+		if (lengthDoc > lengthDocMax)
+			lengthDoc = lengthDocMax;
+	}
+
+	// We must subtract the physical margins from the printable area
+	Sci_RangeToFormat frPrint {};
+	frPrint.hdc = hdc;
+	frPrint.hdcTarget = hdc;
+	frPrint.rc.left = rectMargins.left - rectPhysMargins.left;
+	frPrint.rc.top = rectMargins.top - rectPhysMargins.top;
+	frPrint.rc.right = ptPage.x - rectMargins.right - rectPhysMargins.left;
+	frPrint.rc.bottom = ptPage.y - rectMargins.bottom - rectPhysMargins.top;
+	frPrint.rcPage.left = 0;
+	frPrint.rcPage.top = 0;
+	frPrint.rcPage.right = ptPage.x - rectPhysMargins.left - rectPhysMargins.right - 1;
+	frPrint.rcPage.bottom = ptPage.y - rectPhysMargins.top - rectPhysMargins.bottom - 1;
+	if (headerFormat.size()) {
+		frPrint.rc.top += headerLineHeight + headerLineHeight / 2;
+	}
+	if (footerFormat.size()) {
+		frPrint.rc.bottom -= footerLineHeight + footerLineHeight / 2;
+	}
+	// Print each page
+	int pageNum = 1;
+	PropSetFile propsPrint;
+	propsPrint.superPS = &props;
+	SetFileProperties(propsPrint);
+
+	while (lengthPrinted < lengthDoc) {
+		const bool printPage = (!(pdlg.Flags & PD_PAGENUMS) ||
+					((pageNum >= pdlg.nFromPage) && (pageNum <= pdlg.nToPage)));
+
+		char pageString[32];
+		sprintf(pageString, "%0d", pageNum);
+		propsPrint.Set("CurrentPage", pageString);
+
+		if (printPage) {
+			::StartPage(hdc);
+
+			if (headerFormat.size()) {
+				GUI::gui_string sHeader = GUI::StringFromUTF8(propsPrint.GetExpandedString("print.header.format"));
+				::SetTextColor(hdc, sdHeader.Fore());
+				::SetBkColor(hdc, sdHeader.Back());
+				::SelectObject(hdc, fontHeader);
+				const UINT ta = ::SetTextAlign(hdc, TA_BOTTOM);
+				RECT rcw = {frPrint.rc.left, frPrint.rc.top - headerLineHeight - headerLineHeight / 2,
+					    frPrint.rc.right, frPrint.rc.top - headerLineHeight / 2
+					   };
+				rcw.bottom = rcw.top + headerLineHeight;
+				::ExtTextOutW(hdc, frPrint.rc.left + 5, frPrint.rc.top - headerLineHeight / 2,
+					      ETO_OPAQUE, &rcw, sHeader.c_str(),
+					      static_cast<int>(sHeader.length()), nullptr);
+				::SetTextAlign(hdc, ta);
+				HPEN pen = ::CreatePen(0, 1, sdHeader.Fore());
+				HPEN penOld = SelectPen(hdc, pen);
+				::MoveToEx(hdc, frPrint.rc.left, frPrint.rc.top - headerLineHeight / 4, nullptr);
+				::LineTo(hdc, frPrint.rc.right, frPrint.rc.top - headerLineHeight / 4);
+				SelectPen(hdc, penOld);
+				DeletePen(pen);
+			}
+		}
+
+		frPrint.chrg.cpMin = lengthPrinted;
+		frPrint.chrg.cpMax = lengthDoc;
+
+		lengthPrinted = static_cast<LONG>(wEditor.FormatRange(printPage, &frPrint));
+
+		if (printPage) {
+			if (footerFormat.size()) {
+				GUI::gui_string sFooter = GUI::StringFromUTF8(propsPrint.GetExpandedString("print.footer.format"));
+				::SetTextColor(hdc, sdFooter.Fore());
+				::SetBkColor(hdc, sdFooter.Back());
+				::SelectObject(hdc, fontFooter);
+				const UINT ta = ::SetTextAlign(hdc, TA_TOP);
+				RECT rcw = {frPrint.rc.left, frPrint.rc.bottom + footerLineHeight / 2,
+					    frPrint.rc.right, frPrint.rc.bottom + footerLineHeight + footerLineHeight / 2
+					   };
+				::ExtTextOutW(hdc, frPrint.rc.left + 5, frPrint.rc.bottom + footerLineHeight / 2,
+					      ETO_OPAQUE, &rcw, sFooter.c_str(),
+					      static_cast<int>(sFooter.length()), nullptr);
+				::SetTextAlign(hdc, ta);
+				HPEN pen = ::CreatePen(0, 1, sdFooter.Fore());
+				HPEN penOld = SelectPen(hdc, pen);
+				::SetBkColor(hdc, sdFooter.Fore());
+				::MoveToEx(hdc, frPrint.rc.left, frPrint.rc.bottom + footerLineHeight / 4, nullptr);
+				::LineTo(hdc, frPrint.rc.right, frPrint.rc.bottom + footerLineHeight / 4);
+				SelectPen(hdc, penOld);
+				DeletePen(pen);
+			}
+
+			::EndPage(hdc);
+		}
+		pageNum++;
+
+		if ((pdlg.Flags & PD_PAGENUMS) && (pageNum > pdlg.nToPage))
+			break;
+	}
+
+	wEditor.FormatRange(false, nullptr);
+
+	::EndDoc(hdc);
+	::DeleteDC(hdc);
+	DeleteFontObject(fontHeader);
+	DeleteFontObject(fontFooter);
+}
+
+void SciTEWin::PrintSetup() {
+	PAGESETUPDLG pdlg = {};
+	pdlg.lStructSize = sizeof(PAGESETUPDLG);
+	pdlg.hwndOwner = MainHWND();
+	pdlg.hInstance = hInstance;
+
+	if (pagesetupMargin.left != 0 || pagesetupMargin.right != 0 ||
+			pagesetupMargin.top != 0 || pagesetupMargin.bottom != 0) {
+		pdlg.Flags = PSD_MARGINS;
+
+		pdlg.rtMargin.left = pagesetupMargin.left;
+		pdlg.rtMargin.top = pagesetupMargin.top;
+		pdlg.rtMargin.right = pagesetupMargin.right;
+		pdlg.rtMargin.bottom = pagesetupMargin.bottom;
+	}
+
+	pdlg.hDevMode = hDevMode;
+	pdlg.hDevNames = hDevNames;
+
+	if (!PageSetupDlg(&pdlg)) {
+		CheckCommonDialogError();
+		return;
+	}
+
+	pagesetupMargin.left = pdlg.rtMargin.left;
+	pagesetupMargin.top = pdlg.rtMargin.top;
+	pagesetupMargin.right = pdlg.rtMargin.right;
+	pagesetupMargin.bottom = pdlg.rtMargin.bottom;
+
+	hDevMode = pdlg.hDevMode;
+	hDevNames = pdlg.hDevNames;
+}
+
+class Dialog {
+	HWND hDlg;
+public:
+
+	explicit Dialog(HWND hDlg_) noexcept : hDlg(hDlg_) {
+	}
+
+	HWND Item(int id) noexcept {
+		return ::GetDlgItem(hDlg, id);
+	}
+
+	void Enable(int id, bool enable) noexcept {
+		::EnableWindow(Item(id), enable);
+	}
+
+	GUI::gui_string ItemTextG(int id) {
+		return TextOfWindow(Item(id));
+	}
+
+	void SetItemText(int id, const GUI::gui_char *s) noexcept {
+		::SetDlgItemTextW(hDlg, id, s);
+	}
+
+	void SetItemText(int id, const GUI::gui_string &s) noexcept {
+		SetItemText(id, s.c_str());
+	}
+
+	// Handle Unicode controls (assume strings to be UTF-8 on Windows NT)
+
+	std::string ItemTextU(int id) {
+		return GUI::UTF8FromString(ItemTextG(id));
+	}
+
+	void SetItemTextU(int id, const std::string &s) {
+		SetItemText(id, GUI::StringFromUTF8(s));
+	}
+
+	std::optional<intptr_t> ItemInteger(int id) {
+		const std::string sValue = ItemTextU(id);
+		try {
+			return static_cast<intptr_t>(std::stoll(sValue));
+		} catch (...) {
+			return std::nullopt;
+		}
+	}
+
+	void SetCheck(int id, bool value) noexcept {
+		Button_SetCheck(Item(id), value ? BST_CHECKED : BST_UNCHECKED);
+	}
+
+	bool Checked(int id) noexcept {
+		return BST_CHECKED == Button_GetCheck(Item(id));
+	}
+
+	void FillComboFromMemory(int id, const ComboMemory &mem, bool useTop = false) {
+		HWND combo = Item(id);
+		ComboBox_ResetContent(combo);
+		for (int i = 0; i < mem.Length(); i++) {
+			GUI::gui_string gs = GUI::StringFromUTF8(mem.At(i));
+			ComboBoxAppend(combo, gs);
+		}
+		if (useTop) {
+			ComboBox_SetCurSel(combo, 0);
+		}
+	}
+
+};
+
+static void FillComboFromProps(HWND combo, PropSetFile &props) {
+	const char *key = nullptr;
+	const char *val = nullptr;
+	if (props.GetFirst(key, val)) {
+		GUI::gui_string wkey = GUI::StringFromUTF8(key);
+		ComboBoxAppend(combo, wkey);
+		while (props.GetNext(key, val)) {
+			wkey = GUI::StringFromUTF8(key);
+			ComboBoxAppend(combo, wkey);
+		}
+	}
+}
+
+void SciTEWin::UserStripShow(const char *description) {
+	userStrip.visible = *description != 0;
+	if (userStrip.visible) {
+		userStrip.SetSciTE(this);
+		userStrip.SetExtender(extender);
+		userStrip.SetDescription(description);
+	} else {
+		WindowSetFocus(wEditor);
+	}
+	SizeSubWindows();
+}
+
+void SciTEWin::UserStripSet(int control, const char *value) {
+	userStrip.Set(control, value);
+}
+
+void SciTEWin::UserStripSetList(int control, const char *value) {
+	userStrip.SetList(control, value);
+}
+
+std::string SciTEWin::UserStripValue(int control) {
+	return userStrip.GetValue(control);
+}
+
+void SciTEWin::UserStripClosed() {
+	SizeSubWindows();
+	WindowSetFocus(wEditor);
+}
+
+void SciTEWin::ShowBackgroundProgress(const GUI::gui_string &explanation, size_t size, size_t progress) {
+	backgroundStrip.visible = !explanation.empty();
+	SizeSubWindows();
+	if (backgroundStrip.visible)
+		backgroundStrip.SetProgress(explanation, size, progress);
+}
+
+class DialogFindReplace : public Dialog, public SearchUI  {
+	bool advanced;
+public:
+	DialogFindReplace(HWND hDlg_, bool advanced_) noexcept :
+		Dialog(hDlg_), advanced(advanced_) {
+	}
+	void GrabFields();
+	void FillFields();
+};
+
+void DialogFindReplace::GrabFields() {
+	pSearcher->SetFind(ItemTextU(IDFINDWHAT).c_str());
+	if (pSearcher->replacing) {
+		pSearcher->SetReplace(ItemTextU(IDREPLACEWITH).c_str());
+	}
+	pSearcher->wholeWord = Checked(IDWHOLEWORD);
+	pSearcher->matchCase = Checked(IDMATCHCASE);
+	pSearcher->regExp = Checked(IDREGEXP);
+	pSearcher->wrapFind = Checked(IDWRAP);
+	pSearcher->unSlash = Checked(IDUNSLASH);
+	if (!pSearcher->replacing) {
+		pSearcher->reverseFind = Checked(IDDIRECTIONUP);
+	}
+	if (advanced) {
+		pSearcher->findInStyle = Checked(IDFINDINSTYLE);
+		pSearcher->findStyle = atoi(ItemTextU(IDFINDSTYLE).c_str());
+	}
+}
+
+void DialogFindReplace::FillFields() {
+	FillComboFromMemory(IDFINDWHAT, pSearcher->memFinds);
+	SetItemTextU(IDFINDWHAT, pSearcher->findWhat);
+	if (pSearcher->replacing) {
+		FillComboFromMemory(IDREPLACEWITH, pSearcher->memReplaces);
+		SetItemTextU(IDREPLACEWITH, pSearcher->replaceWhat);
+		SetItemText(IDREPLDONE, GUI_TEXT("0"));
+	}
+	SetCheck(IDWHOLEWORD, pSearcher->wholeWord);
+	SetCheck(IDMATCHCASE, pSearcher->matchCase);
+	SetCheck(IDREGEXP, pSearcher->regExp);
+	SetCheck(IDWRAP, pSearcher->wrapFind);
+	SetCheck(IDUNSLASH, pSearcher->unSlash);
+	if (!pSearcher->replacing) {
+		SetCheck(pSearcher->reverseFind ? IDDIRECTIONUP : IDDIRECTIONDOWN, true);
+	}
+	if (advanced) {
+		SetCheck(IDFINDINSTYLE, pSearcher->findInStyle);
+	}
+}
+
+BOOL SciTEWin::FindMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	// Avoid getting dialog items before set up or during tear down.
+	if (!(WM_INITDIALOG == message || WM_CLOSE == message || WM_COMMAND == message))
+		return FALSE;
+	DialogFindReplace dlg(hDlg, FindReplaceAdvanced());
+	dlg.SetSearcher(this);
+
+	switch (message) {
+
+	case WM_INITDIALOG:
+		LocaliseDialog(hDlg);
+		dlg.FillFields();
+		if (FindReplaceAdvanced()) {
+			dlg.SetCheck(IDFINDSTYLE, findInStyle);
+			dlg.Enable(IDFINDSTYLE, findInStyle);
+			Edit_LimitText(dlg.Item(IDFINDSTYLE), 3);
+			dlg.SetItemText(IDFINDSTYLE, std::to_wstring(
+						wEditor.UnsignedStyleAt(wEditor.CurrentPos())));
+		}
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			wFindReplace.Destroy();
+			return FALSE;
+		} else if ((ControlIDOfWParam(wParam) == IDOK) ||
+				(ControlIDOfWParam(wParam) == IDMARKALL)) {
+			dlg.GrabFields();
+			if (ControlIDOfWParam(wParam) == IDMARKALL) {
+				MarkAll(markWithBookMarks);
+			}
+			// Holding the Shift key inverts the current reverse flag
+			const bool found = FindNext(reverseFind != IsKeyDown(VK_SHIFT)) >= 0;
+			if (ShouldClose(found)) {
+				::EndDialog(hDlg, IDOK);
+				wFindReplace.Destroy();
+			} else {
+				FillCombos(dlg);
+			}
+			return TRUE;
+		} else if (ControlIDOfWParam(wParam) == IDFINDINSTYLE) {
+			if (FindReplaceAdvanced()) {
+				findInStyle = dlg.Checked(IDFINDINSTYLE);
+				dlg.Enable(IDFINDSTYLE, findInStyle);
+			}
+			FillCombos(dlg);
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::FindDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->FindMessage(hDlg, message, wParam);
+}
+
+BOOL SciTEWin::HandleReplaceCommand(int cmd, bool reverseDirection) {
+	if (!wFindReplace.GetID())
+		return TRUE;
+	HWND hwndFR = HwndOf(wFindReplace);
+	DialogFindReplace dlg(hwndFR, FindReplaceAdvanced());
+	dlg.SetSearcher(this);
+
+	if ((cmd == IDOK) || (cmd == IDREPLACE) || (cmd == IDREPLACEALL) || (cmd == IDREPLACEINSEL) || (cmd == IDREPLACEINBUF)) {
+		dlg.GrabFields();
+	}
+
+	intptr_t replacements = 0;
+	if (cmd == IDOK) {
+		FindNext(reverseDirection);
+		FillCombos(dlg);
+	} else if (cmd == IDREPLACE) {
+		ReplaceOnce();
+		FillCombos(dlg);
+	} else if ((cmd == IDREPLACEALL) || (cmd == IDREPLACEINSEL)) {
+		replacements = ReplaceAll(cmd == IDREPLACEINSEL);
+		FillCombos(dlg);
+	} else if (cmd == IDREPLACEINBUF) {
+		replacements = ReplaceInBuffers();
+		FillCombos(dlg);
+	}
+	GUI::gui_string replDone = std::to_wstring(replacements);
+	dlg.SetItemText(IDREPLDONE, replDone);
+
+	return TRUE;
+}
+
+BOOL SciTEWin::ReplaceMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	// Avoid getting dialog items before set up or during tear down.
+	if (!(WM_INITDIALOG == message || WM_CLOSE == message || WM_COMMAND == message))
+		return FALSE;
+	DialogFindReplace dlg(hDlg, FindReplaceAdvanced());
+	dlg.SetSearcher(this);
+
+	switch (message) {
+
+	case WM_INITDIALOG:
+		LocaliseDialog(hDlg);
+		dlg.FillFields();
+		if (FindReplaceAdvanced()) {
+			dlg.Enable(IDFINDSTYLE, findInStyle);
+			dlg.SetItemText(IDFINDSTYLE, std::to_wstring(
+						wEditor.UnsignedStyleAt(wEditor.CurrentPos())));
+		}
+		if (findWhat.length() != 0 && props.GetInt("find.replacewith.focus", 1)) {
+			::SetFocus(::GetDlgItem(hDlg, IDREPLACEWITH));
+			return FALSE;
+		}
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			props.Set("Replacements", "");
+			UpdateStatusBar(false);
+			::EndDialog(hDlg, IDCANCEL);
+			wFindReplace.Destroy();
+			return FALSE;
+		} else if (ControlIDOfWParam(wParam) == IDFINDINSTYLE) {
+			if (FindReplaceAdvanced()) {
+				findInStyle = dlg.Checked(IDFINDINSTYLE);
+				dlg.Enable(IDFINDSTYLE, findInStyle);
+			}
+			return TRUE;
+		} else {
+			return HandleReplaceCommand(ControlIDOfWParam(wParam), IsKeyDown(VK_SHIFT));
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::ReplaceDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->ReplaceMessage(hDlg, message, wParam);
+}
+
+void SciTEWin::UIClosed() {
+	SciTEBase::UIClosed();
+	props.Set("Replacements", "");
+	if (!searchStrip.visible)
+		bands[SciTEWin::bandSearch].visible = false;
+	if (!findStrip.visible)
+		bands[SciTEWin::bandFind].visible = false;
+	if (!replaceStrip.visible)
+		bands[SciTEWin::bandReplace].visible = false;
+	UpdateStatusBar(false);
+	SizeSubWindows();
+	WindowSetFocus(wEditor);
+}
+
+void SciTEWin::FindIncrement() {
+	if (findStrip.visible)
+		findStrip.Close();
+	if (replaceStrip.visible)
+		replaceStrip.Close();
+	searchStrip.visible = !searchStrip.visible;
+	failedfind = false;
+	SizeSubWindows();
+	if (searchStrip.visible) {
+		SetCaretAsStart();
+		findWhat = "";
+		searchStrip.Focus();
+	} else {
+		WindowSetFocus(wEditor);
+	}
+}
+
+void SciTEWin::Find() {
+	if (wFindReplace.Created()) {
+		if (!replacing) {
+			SelectionIntoFind();
+			HWND hDlg = HwndOf(wFindReplace);
+			Dialog dlg(hDlg);
+			dlg.SetItemTextU(IDFINDWHAT, findWhat);
+			::SetFocus(hDlg);
+		}
+		return;
+	}
+	SelectionIntoFind();
+
+	if (props.GetInt("find.use.strip")) {
+		if (searchStrip.visible)
+			searchStrip.Close();
+		if (replaceStrip.visible)
+			replaceStrip.Close();
+		findStrip.visible = true;
+		SizeSubWindows();
+		findStrip.SetIncrementalBehaviour(props.GetInt("find.strip.incremental"));
+		findStrip.ShowStrip();
+	} else {
+		if (searchStrip.visible || replaceStrip.visible)
+			return;
+
+		replacing = false;
+
+		const int dialogID = FindReplaceAdvanced() ? IDD_FIND_ADV : IDD_FIND;
+		wFindReplace = CreateParameterisedDialog(MAKEINTRESOURCE(dialogID), FindDlg);
+		wFindReplace.Show();
+	}
+}
+
+// Set a call back with the handle after init to set the path.
+// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/callbackfunctions/browsecallbackproc.asp
+
+static int __stdcall BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM, LPARAM pData) {
+	if (uMsg == BFFM_INITIALIZED) {
+		SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
+	}
+	return 0;
+}
+
+void SciTEWin::PerformGrep() {
+	SelectionIntoProperties();
+
+	std::string findInput;
+	long flags = 0;
+	if (props.GetString("find.input").length()) {
+		findInput = props.GetNewExpandString("find.input");
+		flags += jobHasInput;
+	}
+
+	std::string findCommand = props.GetNewExpandString("find.command");
+	if (findCommand == "") {
+		// Call InternalGrep in a new thread
+		// searchParams is "(w|~)(c|~)(d|~)(b|~)\0files\0text"
+		// A "w" indicates whole word, "c" case sensitive, "d" dot directories, "b" binary files
+		std::string searchParams;
+		searchParams.append(wholeWord ? "w" : "~");
+		searchParams.append(matchCase ? "c" : "~");
+		searchParams.append(props.GetInt("find.in.dot") ? "d" : "~");
+		searchParams.append(props.GetInt("find.in.binary") ? "b" : "~");
+		searchParams.append("\0", 1);
+		searchParams.append(props.GetString("find.files"));
+		searchParams.append("\0", 1);
+		searchParams.append(props.GetString("find.what"));
+		AddCommand(searchParams, props.GetString("find.directory"), jobGrep, findInput, flags);
+	} else {
+		AddCommand(findCommand,
+			   props.GetString("find.directory"),
+			   jobCLI, findInput, flags);
+	}
+	if (jobQueue.HasCommandToRun()) {
+		Execute();
+	}
+}
+
+void SciTEWin::FillCombos(Dialog &dlg) {
+	dlg.FillComboFromMemory(IDFINDWHAT, memFinds, true);
+	if (dlg.Item(IDREPLACEWITH))    // Replace combo is presented
+		dlg.FillComboFromMemory(IDREPLACEWITH, memReplaces, true);
+}
+
+void SciTEWin::FillCombosForGrep(Dialog &dlg) {
+	dlg.FillComboFromMemory(IDFILES, memFiles, true);
+	dlg.FillComboFromMemory(IDDIRECTORY, memDirectory, true);
+}
+
+BOOL SciTEWin::GrepMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	if (WM_SETFONT == message || WM_NCDESTROY == message)
+		return FALSE;
+	Dialog dlg(hDlg);
+
+	switch (message) {
+
+	case WM_INITDIALOG:
+		LocaliseDialog(hDlg);
+		FillCombos(dlg);
+		FillCombosForGrep(dlg);
+		dlg.SetItemTextU(IDFINDWHAT, props.GetString("find.what"));
+		dlg.SetItemTextU(IDDIRECTORY, props.GetString("find.directory"));
+		dlg.SetCheck(IDWHOLEWORD, wholeWord);
+		dlg.SetCheck(IDMATCHCASE, matchCase);
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			wFindInFiles.Destroy();
+			return FALSE;
+
+		} else if (ControlIDOfWParam(wParam) == IDOK) {
+			if (jobQueue.IsExecuting()) {
+				GUI::gui_string msgBuf = LocaliseMessage("Job is currently executing. Wait until it finishes.");
+				WindowMessageBox(wFindInFiles, msgBuf);
+				return FALSE;
+			}
+			findWhat = dlg.ItemTextU(IDFINDWHAT);
+			props.Set("find.what", findWhat.c_str());
+			InsertFindInMemory();
+
+			std::string files = dlg.ItemTextU(IDFILES);
+			props.Set("find.files", files.c_str());
+			memFiles.Insert(files);
+
+			std::string directory = dlg.ItemTextU(IDDIRECTORY);
+			props.Set("find.directory", directory.c_str());
+			memDirectory.Insert(directory);
+
+			wholeWord = dlg.Checked(IDWHOLEWORD);
+			matchCase = dlg.Checked(IDMATCHCASE);
+
+			SetFindInFilesOptions();
+
+			FillCombos(dlg);
+			FillCombosForGrep(dlg);
+
+			PerformGrep();
+			if (props.GetInt("find.in.files.close.on.find", 1)) {
+				::EndDialog(hDlg, IDOK);
+				wFindInFiles.Destroy();
+				return TRUE;
+			} else {
+				return FALSE;
+			}
+		} else if (ControlIDOfWParam(wParam) == IDDOTDOT) {
+			FilePath directory(dlg.ItemTextG(IDDIRECTORY));
+			directory = directory.Directory();
+			dlg.SetItemText(IDDIRECTORY, directory.AsInternal());
+
+		} else if (ControlIDOfWParam(wParam) == IDBROWSE) {
+
+			// This code was copied and slightly modified from:
+			// http://www.bcbdev.com/faqs/faq62.htm
+
+			// SHBrowseForFolder returns a PIDL. The memory for the PIDL is
+			// allocated by the shell. Eventually, we will need to free this
+			// memory, so we need to get a pointer to the shell malloc COM
+			// object that will free the PIDL later on.
+			LPMALLOC pShellMalloc = nullptr;
+			if (::SHGetMalloc(&pShellMalloc) == NO_ERROR) {
+				// If we were able to get the shell malloc object,
+				// then proceed by initializing the BROWSEINFO struct
+				BROWSEINFO info {};
+				info.hwndOwner = hDlg;
+				info.pidlRoot = nullptr;
+				TCHAR szDisplayName[MAX_PATH] = TEXT("");
+				info.pszDisplayName = szDisplayName;
+				GUI::gui_string title = localiser.Text("Select a folder to search from");
+				info.lpszTitle = title.c_str();
+				info.ulFlags = 0;
+				info.lpfn = BrowseCallbackProc;
+				GUI::gui_string directory = dlg.ItemTextG(IDDIRECTORY);
+				if (!EndsWith(directory, pathSepString)) {
+					directory += pathSepString;
+				}
+				info.lParam = reinterpret_cast<LPARAM>(directory.c_str());
+
+				// Execute the browsing dialog.
+				LPITEMIDLIST pidl = ::SHBrowseForFolder(&info);
+
+				// pidl will be null if they cancel the browse dialog.
+				// pidl will be not null when they select a folder.
+				if (pidl) {
+					// Try to convert the pidl to a display string.
+					// Return is true if success.
+					TCHAR szDir[MAX_PATH];
+					if (::SHGetPathFromIDList(pidl, szDir)) {
+						// Set edit control to the directory path.
+						dlg.SetItemText(IDDIRECTORY, szDir);
+					}
+					pShellMalloc->Free(pidl);
+				}
+				pShellMalloc->Release();
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::GrepDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->GrepMessage(hDlg, message, wParam);
+}
+
+void SciTEWin::FindInFiles() {
+	SelectionIntoFind();
+	if (wFindInFiles.Created()) {
+		HWND hDlg = HwndOf(wFindInFiles);
+		Dialog dlg(hDlg);
+		dlg.SetItemTextU(IDFINDWHAT, findWhat);
+		::SetFocus(hDlg);
+		return;
+	}
+	props.Set("find.what", findWhat.c_str());
+
+	std::string directory = props.GetString("find.in.directory");
+	if (directory.length()) {
+		props.Set("find.directory", directory.c_str());
+	} else {
+		FilePath findInDir = filePath.Directory();
+		props.Set("find.directory", findInDir.AsUTF8().c_str());
+	}
+	wFindInFiles = CreateParameterisedDialog(TEXT("Grep"), GrepDlg);
+	wFindInFiles.Show();
+}
+
+void SciTEWin::Replace() {
+	if (wFindReplace.Created()) {
+		if (replacing) {
+			SelectionIntoFind(false);
+			HWND hDlg = HwndOf(wFindReplace);
+			Dialog dlg(hDlg);
+			dlg.SetItemTextU(IDFINDWHAT, findWhat);
+			::SetFocus(hDlg);
+		}
+		return;
+	}
+	SelectionIntoFind(false); // don't strip EOL at end of selection
+
+	if (props.GetInt("replace.use.strip")) {
+		if (searchStrip.visible)
+			searchStrip.Close();
+		if (findStrip.visible)
+			findStrip.Close();
+		replaceStrip.visible = true;
+		SizeSubWindows();
+		replaceStrip.SetIncrementalBehaviour(props.GetInt("replace.strip.incremental"));
+		replaceStrip.ShowStrip();
+		havefound = false;
+	} else {
+		if (searchStrip.visible || findStrip.visible)
+			return;
+
+		replacing = true;
+		havefound = false;
+
+		const int dialogID = (!props.GetInt("find.replace.advanced") ? IDD_REPLACE : IDD_REPLACE_ADV);
+		wFindReplace = CreateParameterisedDialog(MAKEINTRESOURCE(dialogID), ReplaceDlg);
+		wFindReplace.Show();
+	}
+}
+
+void SciTEWin::FindReplace(bool replace) {
+	replacing = replace;
+}
+
+void SciTEWin::DestroyFindReplace() {
+	if (wFindReplace.Created()) {
+		::EndDialog(HwndOf(wFindReplace), IDCANCEL);
+		wFindReplace.Destroy();
+	}
+}
+
+BOOL SciTEWin::GoLineMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	Dialog dlg(hDlg);
+
+	switch (message) {
+
+	case WM_INITDIALOG: {
+			SA::Position position = wEditor.CurrentPos();
+			const SA::Line lineNumber = wEditor.LineFromPosition(position) + 1;
+			const SA::Position lineStart = wEditor.LineStart(lineNumber - 1);
+			int characterOnLine = 1;
+			while (position > lineStart) {
+				position = wEditor.PositionBefore(position);
+				characterOnLine++;
+			}
+
+			LocaliseDialog(hDlg);
+			::SendDlgItemMessage(hDlg, IDGOLINE, EM_LIMITTEXT, 10, 1);
+			::SendDlgItemMessage(hDlg, IDGOLINECHAR, EM_LIMITTEXT, 10, 1);
+			dlg.SetItemText(IDCURRLINE, std::to_wstring(lineNumber));
+			dlg.SetItemText(IDCURRLINECHAR, std::to_wstring(characterOnLine));
+			dlg.SetItemText(IDLASTLINE, std::to_wstring(wEditor.LineCount()));
+		}
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			return FALSE;
+		} else if (ControlIDOfWParam(wParam) == IDOK) {
+			const std::optional<intptr_t> lineNumberOpt = dlg.ItemInteger(IDGOLINE);
+			const std::optional<intptr_t> characterOnLineOpt = dlg.ItemInteger(IDGOLINECHAR);
+
+			if (lineNumberOpt || characterOnLineOpt) {
+				const intptr_t lineNumber = lineNumberOpt.value_or(
+								    wEditor.LineFromPosition(wEditor.CurrentPos()) + 1);
+
+				GotoLineEnsureVisible(lineNumber - 1);
+
+				if (characterOnLineOpt && characterOnLineOpt.value() > 1 && lineNumber <= wEditor.LineCount()) {
+					// Constrain to the requested line
+					const SA::Position lineStart = wEditor.LineStart(lineNumber - 1);
+					const SA::Position lineEnd = wEditor.LineEnd(lineNumber - 1);
+
+					SA::Position characterOnLine = characterOnLineOpt.value();
+					SA::Position position = lineStart;
+					while (--characterOnLine && position < lineEnd)
+						position = wEditor.PositionAfter(position);
+
+					wEditor.GotoPos(position);
+				}
+			}
+			::EndDialog(hDlg, IDOK);
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::GoLineDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->GoLineMessage(hDlg, message, wParam);
+}
+
+void SciTEWin::GoLineDialog() {
+	DoDialog(TEXT("GoLine"), GoLineDlg);
+}
+
+BOOL SciTEWin::AbbrevMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	Dialog dlg(hDlg);
+	HWND hAbbrev = ::GetDlgItem(hDlg, IDABBREV);
+	switch (message) {
+
+	case WM_INITDIALOG:
+		LocaliseDialog(hDlg);
+		FillComboFromProps(hAbbrev, propsAbbrev);
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			return FALSE;
+		} else if (ControlIDOfWParam(wParam) == IDOK) {
+			abbrevInsert = dlg.ItemTextU(IDABBREV);
+			::EndDialog(hDlg, IDOK);
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::AbbrevDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->AbbrevMessage(hDlg, message, wParam);
+}
+
+bool SciTEWin::AbbrevDialog() {
+	return DoDialog(TEXT("InsAbbrev"), AbbrevDlg) == IDOK;
+}
+
+BOOL SciTEWin::TabSizeMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	Dialog dlg(hDlg);
+
+	switch (message) {
+
+	case WM_INITDIALOG: {
+			LocaliseDialog(hDlg);
+			::SendDlgItemMessage(hDlg, IDTABSIZE, EM_LIMITTEXT, 2, 1);
+			int tabSize = wEditor.TabWidth();
+			if (tabSize > 99)
+				tabSize = 99;
+			dlg.SetItemText(IDTABSIZE, std::to_wstring(tabSize));
+
+			::SendDlgItemMessage(hDlg, IDINDENTSIZE, EM_LIMITTEXT, 2, 1);
+			int indentSize = wEditor.Indent();
+			if (indentSize > 99)
+				indentSize = 99;
+			dlg.SetItemText(IDINDENTSIZE, std::to_wstring(indentSize));
+
+			::CheckDlgButton(hDlg, IDUSETABS, wEditor.UseTabs());
+			return TRUE;
+		}
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			return FALSE;
+		} else if ((ControlIDOfWParam(wParam) == IDCONVERT) ||
+				(ControlIDOfWParam(wParam) == IDOK)) {
+			BOOL bOK;
+			const int tabSize = ::GetDlgItemInt(hDlg, IDTABSIZE, &bOK, FALSE);
+			if (tabSize > 0)
+				wEditor.SetTabWidth(tabSize);
+			const int indentSize = ::GetDlgItemInt(hDlg, IDINDENTSIZE, &bOK, FALSE);
+			if (indentSize > 0)
+				wEditor.SetIndent(indentSize);
+			const bool useTabs = ::IsDlgButtonChecked(hDlg, IDUSETABS) == BST_CHECKED;
+			wEditor.SetUseTabs(useTabs);
+			if (ControlIDOfWParam(wParam) == IDCONVERT) {
+				ConvertIndentation(tabSize, useTabs);
+			}
+			::EndDialog(hDlg, ControlIDOfWParam(wParam));
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::TabSizeDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->TabSizeMessage(hDlg, message, wParam);
+}
+
+void SciTEWin::TabSizeDialog() {
+	DoDialog(TEXT("TabSize"), TabSizeDlg);
+}
+
+bool SciTEWin::ParametersOpen() {
+	return wParameters.Created();
+}
+
+void SciTEWin::ParamGrab() {
+	if (wParameters.Created()) {
+		HWND hDlg = HwndOf(wParameters);
+		Dialog dlg(hDlg);
+		for (int param = 0; param < maxParam; param++) {
+			std::string paramVal = GUI::UTF8FromString(dlg.ItemTextG(IDPARAMSTART + param));
+			std::string paramText = StdStringFromInteger(param + 1);
+			props.Set(paramText.c_str(), paramVal.c_str());
+		}
+		UpdateStatusBar(true);
+	}
+}
+
+BOOL SciTEWin::ParametersMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	switch (message) {
+
+	case WM_INITDIALOG: {
+			LocaliseDialog(hDlg);
+			wParameters = hDlg;
+			Dialog dlg(hDlg);
+			if (modalParameters) {
+				GUI::gui_string sCommand = GUI::StringFromUTF8(parameterisedCommand);
+				dlg.SetItemText(IDCMD, sCommand.c_str());
+			}
+			for (int param = 0; param < maxParam; param++) {
+				std::string paramText = StdStringFromInteger(param + 1);
+				std::string paramTextVal = props.GetString(paramText.c_str());
+				GUI::gui_string sVal = GUI::StringFromUTF8(paramTextVal);
+				dlg.SetItemText(IDPARAMSTART + param, sVal.c_str());
+			}
+		}
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			if (!modalParameters) {
+				wParameters.Destroy();
+			}
+			return FALSE;
+		} else if (ControlIDOfWParam(wParam) == IDOK) {
+			ParamGrab();
+			::EndDialog(hDlg, IDOK);
+			if (!modalParameters) {
+				wParameters.Destroy();
+			}
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::ParametersDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->ParametersMessage(hDlg, message, wParam);
+}
+
+bool SciTEWin::ParametersDialog(bool modal) {
+	if (wParameters.Created()) {
+		ParamGrab();
+		if (!modal) {
+			wParameters.Destroy();
+		}
+		return true;
+	}
+	bool success = false;
+	modalParameters = modal;
+	if (modal) {
+		success = DoDialog(TEXT("PARAMETERS"), ParametersDlg) == IDOK;
+		wParameters = NULL;
+	} else {
+		CreateParameterisedDialog(TEXT("PARAMETERSNONMODAL"), ParametersDlg);
+		wParameters.Show();
+	}
+
+	return success;
+}
+
+SciTEBase::MessageBoxChoice SciTEWin::WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, MessageBoxStyle style) {
+	dialogsOnScreen++;
+	const int ret = ::MessageBoxW(HwndOf(w), msg.c_str(), appName, style | MB_SETFOREGROUND);
+	dialogsOnScreen--;
+	switch (ret) {
+	case IDOK:
+		return mbOK;
+	case IDCANCEL:
+		return mbCancel;
+	case IDYES:
+		return mbYes;
+	case IDNO:
+		return mbNo;
+	default:
+		return mbOK;
+	}
+}
+
+void SciTEWin::FindMessageBox(const std::string &msg, const std::string *findItem) {
+	if (!findItem) {
+		GUI::gui_string msgBuf = LocaliseMessage(msg.c_str());
+		WindowMessageBox(wFindReplace.Created() ? wFindReplace : wSciTE, msgBuf);
+	} else {
+		GUI::gui_string findThing = GUI::StringFromUTF8(*findItem);
+		GUI::gui_string msgBuf = LocaliseMessage(msg.c_str(), findThing.c_str());
+		WindowMessageBox(wFindReplace.Created() ? wFindReplace : wSciTE, msgBuf);
+	}
+}
+
+LRESULT CALLBACK CreditsWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	if (uMsg == WM_GETDLGCODE)
+		return DLGC_STATIC | DLGC_WANTARROWS | DLGC_WANTCHARS;
+
+	WNDPROC lpPrevWndProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
+	if (lpPrevWndProc)
+		return ::CallWindowProc(lpPrevWndProc, hwnd, uMsg, wParam, lParam);
+
+	return ::DefWindowProc(hwnd, uMsg, wParam, lParam);
+}
+
+BOOL SciTEWin::AboutMessage(HWND hDlg, UINT message, WPARAM wParam) {
+	switch (message) {
+
+	case WM_INITDIALOG: {
+			LocaliseDialog(hDlg);
+			GUI::ScintillaWindow ss;
+			HWND hwndCredits = ::GetDlgItem(hDlg, IDABOUTSCINTILLA);
+			const LONG_PTR subclassedProc = ::SetWindowLongPtr(hwndCredits, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CreditsWndProc));
+			::SetWindowLongPtr(hwndCredits, GWLP_USERDATA, subclassedProc);
+			ss.SetScintilla(hwndCredits);
+			SetAboutMessage(ss, staticBuild ? "Sc1  " : "SciTE");
+		}
+		return TRUE;
+
+	case WM_CLOSE:
+		::SendMessage(hDlg, WM_COMMAND, IDCANCEL, 0);
+		break;
+
+	case WM_COMMAND:
+		if (ControlIDOfWParam(wParam) == IDOK) {
+			::EndDialog(hDlg, IDOK);
+			return TRUE;
+		} else if (ControlIDOfWParam(wParam) == IDCANCEL) {
+			::EndDialog(hDlg, IDCANCEL);
+			return FALSE;
+		}
+	}
+
+	return FALSE;
+}
+
+INT_PTR CALLBACK SciTEWin::AboutDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	return Caller(hDlg, message, lParam)->AboutMessage(hDlg, message, wParam);
+}
+
+void SciTEWin::AboutDialogWithBuild(int staticBuild_) {
+	staticBuild = staticBuild_;
+	DoDialog(TEXT("About"), AboutDlg);
+}
diff --git a/scite-app/scite/win32/Strips.cxx b/scite-app/scite/win32/Strips.cxx
new file mode 100644
index 0000000..5fc5d84
--- /dev/null
+++ b/scite-app/scite/win32/Strips.cxx
@@ -0,0 +1,1801 @@
+// SciTE - Scintilla based Text Editor
+/** @file Strips.cxx
+ ** Implementation of UI strips.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include "SciTEWin.h"
+
+void *PointerFromWindow(HWND hWnd) noexcept {
+	return reinterpret_cast<void *>(::GetWindowLongPtr(hWnd, 0));
+}
+
+void SetWindowPointer(HWND hWnd, void *ptr) noexcept {
+	::SetWindowLongPtr(hWnd, 0, reinterpret_cast<LONG_PTR>(ptr));
+}
+
+void *SetWindowPointerFromCreate(HWND hWnd, LPARAM lParam) noexcept {
+	LPCREATESTRUCT pcs = reinterpret_cast<LPCREATESTRUCT>(lParam);
+	void *ptr = pcs->lpCreateParams;
+	SetWindowPointer(hWnd, ptr);
+	return ptr;
+}
+
+GUI::gui_string TextOfWindow(HWND hWnd) {
+	const int len = ::GetWindowTextLengthW(hWnd);
+	std::vector<GUI::gui_char> itemText(len+1);
+	GUI::gui_string gsText;
+	if (::GetWindowTextW(hWnd, &itemText[0], len+1)) {
+		gsText = GUI::gui_string(&itemText[0], len);
+	}
+	return gsText;
+}
+
+GUI::gui_string ClassNameOfWindow(HWND hWnd) {
+	// In the documentation of WNDCLASS:
+	// "The maximum length for lpszClassName is 256."
+	constexpr size_t maxClassNameLength = 256+1;	// +1 for NUL
+	GUI::gui_char className[maxClassNameLength];
+	if (::GetClassNameW(hWnd, className, maxClassNameLength))
+		return GUI::gui_string(className);
+	else
+		return GUI::gui_string();
+}
+
+void ComboBoxAppend(HWND hWnd, const GUI::gui_string &gs) noexcept {
+	ComboBox_AddString(hWnd, gs.c_str());
+}
+
+namespace {
+
+HINSTANCE ApplicationInstance() noexcept {
+	return ::GetModuleHandle(nullptr);
+}
+
+void SetFontHandle(const GUI::Window &w, HFONT hfont) noexcept {
+	SetWindowFont(HwndOf(w), hfont, 0);
+}
+
+void CheckButton(const GUI::Window &wButton, bool checked) noexcept {
+	Button_SetCheck(HwndOf(wButton), checked ? BST_CHECKED : BST_UNCHECKED);
+}
+
+SIZE SizeButton(const GUI::Window &wButton) noexcept {
+	SIZE sz = { 0, 0 };
+	// Push buttons can be measured with BCM_GETIDEALSIZE.
+	::SendMessage(HwndOf(wButton),
+		      BCM_GETIDEALSIZE, 0, reinterpret_cast<LPARAM>(&sz));
+	return sz;
+}
+
+SIZE SizeText(HFONT hfont, const GUI::gui_char *text) noexcept {
+	HDC hdcMeasure = ::CreateCompatibleDC({});
+	HFONT hfontOriginal = SelectFont(hdcMeasure, hfont);
+	RECT rcText = {0, 0, 2000, 2000};
+	::DrawText(hdcMeasure, text, -1, &rcText, DT_CALCRECT);
+	SelectFont(hdcMeasure, hfontOriginal);
+	::DeleteDC(hdcMeasure);
+	return SIZE{ rcText.right - rcText.left, rcText.bottom - rcText.top, };
+}
+
+int WidthText(HFONT hfont, const GUI::gui_char *text) noexcept {
+	return SizeText(hfont, text).cx;
+}
+
+int WidthControl(GUI::Window &w) {
+	const GUI::Rectangle rc = w.GetPosition();
+	return rc.Width();
+}
+
+GUI::gui_string ControlGText(GUI::Window w) {
+	return TextOfWindow(HwndOf(w));
+}
+
+std::string ControlText(GUI::Window w) {
+	const GUI::gui_string gsText = ControlGText(w);
+	return GUI::UTF8FromString(gsText);
+}
+
+std::string ComboSelectionText(GUI::Window w) {
+	HWND combo = HwndOf(w);
+	const int selection = ComboBox_GetCurSel(combo);
+	if (selection != CB_ERR) {
+		const int len = ComboBox_GetLBTextLen(combo, selection);
+		GUI::gui_string itemText(len+1, L'\0');
+		const int lenActual = ComboBox_GetLBText(combo, selection, &itemText[0]);
+		if (lenActual != CB_ERR) {
+			itemText.pop_back(); // Remove NUL
+			return GUI::UTF8FromString(itemText);
+		}
+	}
+	return std::string();
+}
+
+enum class ComboSelection { all, atEnd };
+
+void SetComboText(GUI::Window w, const std::string &s, ComboSelection selection) {
+	HWND combo = HwndOf(w);
+	GUI::gui_string text = GUI::StringFromUTF8(s);
+	ComboBox_SetText(combo, text.c_str());
+	if (selection == ComboSelection::all) {
+		ComboBox_SetEditSel(combo, 0, -1);
+	} else {
+		const size_t textLength = text.length();
+		ComboBox_SetEditSel(combo, textLength, textLength);
+	}
+}
+
+void SetComboFromMemory(GUI::Window w, const ComboMemory &mem) {
+	HWND combo = HwndOf(w);
+	ComboBox_ResetContent(combo);
+	for (int i = 0; i < mem.Length(); i++) {
+		GUI::gui_string gs = GUI::StringFromUTF8(mem.At(i));
+		ComboBoxAppend(combo, gs);
+	}
+}
+
+}
+
+LRESULT PASCAL BaseWin::StWndProc(
+	HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	if (iMessage == WM_CREATE) {
+		// Pointer to BaseWin passed with WM_CREATE so remember in window pointer
+		BaseWin *basePassed = static_cast<BaseWin *>(SetWindowPointerFromCreate(hWnd, lParam));
+		basePassed->SetID(hWnd);
+	}
+	// Find C++ object associated with window.
+	BaseWin *base = static_cast<BaseWin *>(::PointerFromWindow(hWnd));
+	// base will be zero if WM_CREATE not seen yet
+	if (base) {
+		return base->WndProc(iMessage, wParam, lParam);
+	} else {
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	}
+}
+
+static const char *textFindPrompt = "Fi&nd:";
+static const char *textReplacePrompt = "Rep&lace:";
+static const char *textFindNext = "&Find Next";
+static const char *textMarkAll = "&Mark All";
+
+static const char *textReplace = "&Replace";
+static const char *textReplaceAll = "Replace &All";
+static const char *textInSelection = "In &Selection";
+
+static SearchOption toggles[] = {
+	{"Match &whole word only", IDM_WHOLEWORD, IDWHOLEWORD},
+	{"Case sensiti&ve", IDM_MATCHCASE, IDMATCHCASE},
+	{"Regular &expression", IDM_REGEXP, IDREGEXP},
+	{"Transform &backslash expressions", IDM_UNSLASH, IDUNSLASH},
+	{"Wrap ar&ound", IDM_WRAPAROUND, IDWRAP},
+	{"&Up", IDM_DIRECTIONUP, IDDIRECTIONUP},
+	{nullptr, 0, 0},
+};
+
+GUI::Window Strip::CreateText(const char *text) {
+	GUI::gui_string localised = localiser->Text(text);
+	const int width = WidthText(fontText, localised.c_str()) + 4;
+	GUI::Window w;
+	w.SetID(::CreateWindowEx(0, TEXT("Static"), localised.c_str(),
+				 WS_CHILD | WS_CLIPSIBLINGS | SS_RIGHT,
+				 2, 2, width, 21,
+				 Hwnd(), HmenuID(0), ::ApplicationInstance(), nullptr));
+	SetFontHandle(w, fontText);
+	w.Show();
+	return w;
+}
+
+#define PACKVERSION(major,minor) MAKELONG(minor,major)
+
+static DWORD GetVersion(LPCTSTR lpszDllName) noexcept {
+	DWORD dwVersion = 0;
+	HINSTANCE hinstDll = ::LoadLibrary(lpszDllName);
+	if (hinstDll) {
+		DLLGETVERSIONPROC pDllGetVersion = reinterpret_cast<DLLGETVERSIONPROC>(
+				::GetProcAddress(hinstDll, "DllGetVersion"));
+
+		if (pDllGetVersion) {
+			DLLVERSIONINFO dvi;
+			::ZeroMemory(&dvi, sizeof(dvi));
+			dvi.cbSize = sizeof(dvi);
+
+			const HRESULT hr = (*pDllGetVersion)(&dvi);
+			if (SUCCEEDED(hr)) {
+				dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion);
+			}
+		}
+		::FreeLibrary(hinstDll);
+	}
+	return dwVersion;
+}
+
+GUI::Window Strip::CreateButton(const char *text, size_t ident, bool check) {
+	GUI::gui_string localised = localiser->Text(text);
+	int width = WidthText(fontText, localised.c_str());
+	int height = 19 + 2 * ::GetSystemMetrics(SM_CYEDGE);
+	if (check) {
+		width += 6;
+		const int checkSize = ::GetSystemMetrics(SM_CXMENUCHECK);
+		width += checkSize;
+	} else {
+		width += 2 * ::GetSystemMetrics(SM_CXEDGE);	// Allow for 3D borders
+		width += 2 * WidthText(fontText, TEXT(" "));	// Allow a bit of space
+	}
+
+	int bmpDimension = 16;
+	int resDifference = 0;
+	if (scale >= 192) {
+		bmpDimension = 32;
+		resDifference = 300;
+	} else if (scale >= 144) {
+		bmpDimension = 24;
+		resDifference = 200;
+	} else if (scale >= 120) {
+		bmpDimension = 20;
+		resDifference = 100;
+	}
+
+	if (check) {
+		height = bmpDimension + 3 * 2;
+		width = bmpDimension + 3 * 2;
+	}
+	GUI::Window w;
+	w.SetID(::CreateWindowEx(0, TEXT("Button"), localised.c_str(),
+				 WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS |
+				 (check ? (BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_BITMAP) : BS_PUSHBUTTON),
+				 2, 2, width, height,
+				 Hwnd(), HmenuID(ident), ::ApplicationInstance(), nullptr));
+	if (check) {
+		int resNum = IDBM_WORD;
+		switch (ident) {
+		case IDWHOLEWORD:
+			resNum = IDBM_WORD;
+			break;
+		case IDMATCHCASE:
+			resNum = IDBM_CASE;
+			break;
+		case IDREGEXP:
+			resNum = IDBM_REGEX;
+			break;
+		case IDUNSLASH:
+			resNum = IDBM_BACKSLASH;
+			break;
+		case IDWRAP:
+			resNum = IDBM_AROUND;
+			break;
+		case IDDIRECTIONUP:
+			resNum = IDBM_UP;
+			break;
+		}
+
+		const UINT flags = (GetVersion(TEXT("COMCTL32")) >= PACKVERSION(6, 0)) ?
+				   (LR_DEFAULTSIZE) : (LR_DEFAULTSIZE|LR_LOADMAP3DCOLORS);
+		HBITMAP bm = static_cast<HBITMAP>(::LoadImage(
+				::ApplicationInstance(), MAKEINTRESOURCE(resNum + resDifference), IMAGE_BITMAP,
+				bmpDimension, bmpDimension, flags));
+
+		::SendMessage(HwndOf(w),
+			      BM_SETIMAGE, IMAGE_BITMAP, reinterpret_cast<LPARAM>(bm));
+	}
+	SetFontHandle(w, fontText);
+	w.Show();
+	if (!check) {
+		const SIZE sz = SizeButton(w);
+		if (sz.cx > 0) {
+			const GUI::Rectangle rc(0, 0, sz.cx + 2 * WidthText(fontText, TEXT(" ")), sz.cy);
+			w.SetPosition(rc);
+		}
+	}
+	TOOLINFO toolInfo {};
+	toolInfo.cbSize = sizeof(toolInfo);
+	toolInfo.uFlags = TTF_SUBCLASS | TTF_IDISHWND;
+	toolInfo.hinst = ::ApplicationInstance();
+	toolInfo.hwnd = Hwnd();
+	toolInfo.uId = reinterpret_cast<UINT_PTR>(w.GetID());
+	toolInfo.lpszText = LPSTR_TEXTCALLBACK;
+	::GetClientRect(Hwnd(), &toolInfo.rect);
+	::SendMessageW(HwndOf(wToolTip), TTM_ADDTOOLW,
+		       0, reinterpret_cast<LPARAM>(&toolInfo));
+	::SendMessage(HwndOf(wToolTip), TTM_ACTIVATE, TRUE, 0);
+	return w;
+}
+
+void Strip::Tab(bool forwards) noexcept {
+	HWND wToFocus = ::GetNextDlgTabItem(Hwnd(), ::GetFocus(), !forwards);
+	if (wToFocus)
+		::SetFocus(wToFocus);
+}
+
+void Strip::Creation() {
+	// Use the message box font for the strip's font
+	NONCLIENTMETRICS ncm = NONCLIENTMETRICS();
+	ncm.cbSize = sizeof(ncm);
+	SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE);
+	fontText = ::CreateFontIndirect(&ncm.lfMessageFont);
+
+	wToolTip = ::CreateWindowEx(0,
+				    TOOLTIPS_CLASSW, nullptr,
+				    WS_POPUP | TTS_ALWAYSTIP,
+				    CW_USEDEFAULT, CW_USEDEFAULT,
+				    CW_USEDEFAULT, CW_USEDEFAULT,
+				    Hwnd(), NULL, ::ApplicationInstance(), nullptr);
+
+	SetTheme();
+}
+
+void Strip::Destruction() noexcept {
+	if (fontText)
+		::DeleteObject(fontText);
+	fontText = {};
+#ifdef THEME_AVAILABLE
+	if (hTheme)
+		::CloseThemeData(hTheme);
+#endif
+	hTheme = {};
+}
+
+void Strip::Close() {
+	visible = false;
+}
+
+bool Strip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	switch (key) {
+	case VK_MENU:
+		::SendMessage(Hwnd(), WM_UPDATEUISTATE, (UISF_HIDEACCEL|UISF_HIDEFOCUS) << 16 | UIS_CLEAR, 0);
+		return false;
+	case VK_TAB:
+		if (IsChild(Hwnd(), ::GetFocus())) {
+			::SendMessage(Hwnd(), WM_UPDATEUISTATE, (UISF_HIDEACCEL|UISF_HIDEFOCUS) << 16 | UIS_CLEAR, 0);
+			Tab((::GetKeyState(VK_SHIFT) & 0x80000000) == 0);
+			return true;
+		} else {
+			return false;
+		}
+	case VK_ESCAPE:
+		Close();
+		return true;
+	default:
+		if ((::GetKeyState(VK_MENU) & 0x80000000) != 0) {
+			HWND wChild = GetFirstChild(Hwnd());
+			while (wChild) {
+				const GUI::gui_string className = ClassNameOfWindow(wChild);
+				if ((className == TEXT("Button")) || (className == TEXT("Static"))) {
+					const std::string caption = GUI::UTF8FromString(TextOfWindow(wChild));
+					for (int i=0; caption[i]; i++) {
+						if ((caption[i] == L'&') && (MakeUpperCase(caption[i+1]) == static_cast<int>(key))) {
+							if (className == TEXT("Button")) {
+								::SendMessage(wChild, BM_CLICK, 0, 0);
+							} else {	// Static caption
+								wChild = GetNextSibling(wChild);
+								::SetFocus(wChild);
+							}
+							return true;
+						}
+					}
+				}
+				wChild = GetNextSibling(wChild);
+			};
+		}
+	}
+	return false;
+}
+
+bool Strip::Command(WPARAM) {
+	return false;
+}
+
+void Strip::Size() {
+}
+
+namespace {
+
+constexpr RECT RECTFromRectangle(GUI::Rectangle r) noexcept {
+	RECT rc = { r.left, r.top, r.right, r.bottom };
+	return rc;
+}
+
+}
+
+void Strip::Paint(HDC hDC) {
+	const GUI::Rectangle rcStrip = GetClientPosition();
+	const RECT rc = RECTFromRectangle(rcStrip);
+	HBRUSH hbrFace = CreateSolidBrush(::GetSysColor(COLOR_3DFACE));
+	::FillRect(hDC, &rc, hbrFace);
+	::DeleteObject(hbrFace);
+
+	if (HasClose()) {
+		// Draw close box
+		RECT rcClose = RECTFromRectangle(CloseArea());
+		if (hTheme) {
+#ifdef THEME_AVAILABLE
+			int closeAppearence = CBS_NORMAL;
+			if (closeState == csOver) {
+				closeAppearence = CBS_HOT;
+			} else if (closeState == csClickedOver) {
+				closeAppearence = CBS_PUSHED;
+			}
+			::DrawThemeBackground(hTheme, hDC, WP_SMALLCLOSEBUTTON, closeAppearence,
+					      &rcClose, nullptr);
+#endif
+		} else {
+			int closeAppearence = 0;
+			if (closeState == csOver) {
+				closeAppearence = DFCS_HOT;
+			} else if (closeState == csClickedOver) {
+				closeAppearence = DFCS_PUSHED;
+			}
+
+			DrawFrameControl(hDC, &rcClose, DFC_CAPTION,
+					 DFCS_CAPTIONCLOSE | closeAppearence);
+		}
+	}
+}
+
+bool Strip::HasClose() const noexcept {
+	return true;
+}
+
+GUI::Rectangle Strip::CloseArea() {
+	if (HasClose()) {
+		GUI::Rectangle rcClose = GetClientPosition();
+		rcClose.right -= space;
+		rcClose.left = rcClose.right - closeSize.cx;
+		rcClose.top += space;
+		rcClose.bottom = rcClose.top + closeSize.cy;
+		return rcClose;
+	} else {
+		return GUI::Rectangle(-1, -1, -1, -1);
+	}
+}
+
+GUI::Rectangle Strip::LineArea(int line) {
+	GUI::Rectangle rcLine = GetPosition();
+
+	rcLine.right -= rcLine.left;
+
+	rcLine.left = space;
+	rcLine.top = space + line * lineHeight;
+	rcLine.right -= space;
+	rcLine.bottom = rcLine.top + lineHeight - space;
+
+	if (HasClose())
+		rcLine.right -= closeSize.cx + space;	// Allow for close box and gap
+
+	return rcLine;
+}
+
+int Strip::Lines() const noexcept {
+	return 1;
+}
+
+void Strip::InvalidateClose() {
+	const RECT rc = RECTFromRectangle(CloseArea());
+	::InvalidateRect(Hwnd(), &rc, TRUE);
+}
+
+bool Strip::MouseInClose(GUI::Point pt) {
+	const GUI::Rectangle rcClose = CloseArea();
+	return rcClose.Contains(pt);
+}
+
+void Strip::TrackMouse(GUI::Point pt) {
+	const stripCloseState closeStateStart = closeState;
+	if (MouseInClose(pt)) {
+		if (closeState == csNone)
+			closeState = csOver;
+		if (closeState == csClicked)
+			closeState = csClickedOver;
+	} else {
+		if (closeState == csOver)
+			closeState = csNone;
+		if (closeState == csClickedOver)
+			closeState = csClicked;
+	}
+	if ((closeState != csNone) && !capturedMouse) {
+		TRACKMOUSEEVENT tme {};
+		tme.cbSize = sizeof(tme);
+		tme.dwFlags = TME_LEAVE;
+		tme.hwndTrack = Hwnd();
+		TrackMouseEvent(&tme);
+	}
+	if (closeStateStart != closeState)
+		InvalidateClose();
+}
+
+void Strip::SetTheme() noexcept {
+#ifdef THEME_AVAILABLE
+	if (hTheme)
+		::CloseThemeData(hTheme);
+	scale = 96;
+	hTheme = ::OpenThemeData(Hwnd(), TEXT("Window"));
+	if (hTheme) {
+		HDC hdc = ::GetDC(Hwnd());
+		scale = ::GetDeviceCaps(hdc, LOGPIXELSX);
+		::ReleaseDC(Hwnd(), hdc);
+		space = scale * 2 / 96;
+		const HRESULT hr = ::GetThemePartSize(hTheme, NULL, WP_SMALLCLOSEBUTTON, CBS_NORMAL,
+						      nullptr, TS_TRUE, &closeSize);
+		//HRESULT hr = ::GetThemePartSize(hTheme, NULL, WP_MDICLOSEBUTTON, CBS_NORMAL,
+		//	NULL, TS_TRUE, &closeSize);
+		if (!SUCCEEDED(hr)) {
+			closeSize.cx = 11;
+			closeSize.cy = 11;
+		}
+		closeSize.cx = closeSize.cx * scale / 96;
+		closeSize.cy = closeSize.cy * scale / 96;
+	}
+#endif
+}
+
+static bool HideKeyboardCues() noexcept {
+	BOOL b=FALSE;
+	if (::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &b, 0) == 0)
+		return FALSE;
+	return !b;
+}
+
+LRESULT Strip::EditColour(HWND hwnd, HDC hdc) noexcept {
+	return ::DefWindowProc(Hwnd(), WM_CTLCOLOREDIT, reinterpret_cast<WPARAM>(hdc),
+			       reinterpret_cast<LPARAM>(hwnd));
+}
+
+LRESULT Strip::CustomDraw(NMHDR *pnmh) noexcept {
+	const int btnStyle = GetWindowStyle(pnmh->hwndFrom);
+	if ((btnStyle & BS_AUTOCHECKBOX) != BS_AUTOCHECKBOX) {
+		return CDRF_DODEFAULT;
+	}
+#ifdef THEME_AVAILABLE
+	LPNMCUSTOMDRAW pcd = reinterpret_cast<LPNMCUSTOMDRAW>(pnmh);
+	if (pcd->dwDrawStage == CDDS_PREERASE) {
+		::DrawThemeParentBackground(pnmh->hwndFrom, pcd->hdc, &pcd->rc);
+	}
+
+	if ((pcd->dwDrawStage == CDDS_PREERASE) || (pcd->dwDrawStage == CDDS_PREPAINT)) {
+		HTHEME hThemeButton = ::OpenThemeData(pnmh->hwndFrom, TEXT("Toolbar"));
+		if (!hThemeButton) {
+			return CDRF_DODEFAULT;
+		}
+		const bool checked = Button_GetCheck(pnmh->hwndFrom) == BST_CHECKED;
+
+		int buttonAppearence = checked ? TS_CHECKED : TS_NORMAL;
+		if (pcd->uItemState & CDIS_SELECTED)
+			buttonAppearence = TS_PRESSED;
+		else if (pcd->uItemState & CDIS_HOT)
+			buttonAppearence = checked ? TS_HOTCHECKED : TS_HOT;
+		HBRUSH hbrFace = CreateSolidBrush(::GetSysColor(COLOR_3DFACE));
+		::FillRect(pcd->hdc, &pcd->rc, hbrFace);
+		::DeleteObject(hbrFace);
+		::DrawThemeBackground(hThemeButton, pcd->hdc, TP_BUTTON, buttonAppearence,
+				      &pcd->rc, nullptr);
+
+		RECT rcButton = pcd->rc;
+		rcButton.bottom--;
+		const HRESULT hr = ::GetThemeBackgroundContentRect(hThemeButton, pcd->hdc, TP_BUTTON,
+				   buttonAppearence, &pcd->rc, &rcButton);
+		if (!SUCCEEDED(hr)) {
+			return CDRF_DODEFAULT;
+		}
+
+		HBITMAP hBitmap = reinterpret_cast<HBITMAP>(::SendMessage(
+					  pnmh->hwndFrom, BM_GETIMAGE, IMAGE_BITMAP, 0));
+
+		// Retrieve the bitmap dimensions
+		BITMAPINFO rbmi = BITMAPINFO();
+		rbmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+		::GetDIBits(pcd->hdc, hBitmap, 0, 0, nullptr, &rbmi, DIB_RGB_COLORS);
+
+		constexpr DWORD colourTransparent = RGB(0xC0, 0xC0, 0xC0);
+
+		// Offset from button edge to contents.
+		const int xOffset = ((rcButton.right - rcButton.left) - rbmi.bmiHeader.biWidth) / 2 + 1;
+		const int yOffset = ((rcButton.bottom - rcButton.top) - rbmi.bmiHeader.biHeight) / 2;
+
+		HDC hdcBM = ::CreateCompatibleDC({});
+		HBITMAP hbmOriginal = SelectBitmap(hdcBM, hBitmap);
+		::TransparentBlt(pcd->hdc, xOffset, yOffset,
+				 rbmi.bmiHeader.biWidth, rbmi.bmiHeader.biHeight,
+				 hdcBM, 0, 0, rbmi.bmiHeader.biWidth, rbmi.bmiHeader.biHeight, colourTransparent);
+		SelectBitmap(hdcBM, hbmOriginal);
+		::DeleteDC(hdcBM);
+
+		if (pcd->uItemState & CDIS_FOCUS) {
+			// Draw focus rectangle
+			rcButton.left += 2;
+			rcButton.top += 3;
+			rcButton.right -= 2;
+			rcButton.bottom -= 3;
+			::DrawFocusRect(pcd->hdc, &rcButton);
+		}
+		::CloseThemeData(hThemeButton);
+		return CDRF_SKIPDEFAULT;
+	}
+#endif
+	return CDRF_DODEFAULT;
+}
+
+LRESULT Strip::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	switch (iMessage) {
+	case WM_CREATE:
+		Creation();
+		return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+	case WM_DESTROY:
+		Destruction();
+		return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+	case WM_COMMAND:
+		if (Command(wParam))
+			return 0;
+		else
+			return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+	case WM_SETCURSOR: {
+			HWND hWnd = reinterpret_cast<HWND>(wParam);
+			const GUI::gui_string className = ClassNameOfWindow(hWnd);
+			if (className == TEXT("Edit") || className == TEXT("ComboBox")) {
+				return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+			} else {
+				::SetCursor(::LoadCursor(NULL, IDC_ARROW));
+				return 0;
+			}
+		}
+
+	case WM_SIZE:
+		Size();
+		break;
+
+	case WM_WINDOWPOSCHANGED:
+		if ((reinterpret_cast<WINDOWPOS *>(lParam)->flags & SWP_SHOWWINDOW) && HideKeyboardCues())
+			::SendMessage(Hwnd(), WM_UPDATEUISTATE, (UISF_HIDEACCEL|UISF_HIDEFOCUS) << 16 | UIS_SET, 0);
+		return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+
+	case WM_PAINT: {
+			PAINTSTRUCT ps;
+			::BeginPaint(Hwnd(), &ps);
+			Paint(ps.hdc);
+			::EndPaint(Hwnd(), &ps);
+			return 0;
+		}
+
+#ifdef THEME_AVAILABLE
+	case WM_THEMECHANGED:
+		SetTheme();
+		break;
+#endif
+
+	case WM_LBUTTONDOWN:
+		if (MouseInClose(PointFromLong(lParam))) {
+			closeState = csClickedOver;
+			InvalidateClose();
+			capturedMouse = true;
+			::SetCapture(Hwnd());
+		}
+		break;
+
+	case WM_MOUSEMOVE:
+		TrackMouse(PointFromLong(lParam));
+		break;
+
+	case WM_LBUTTONUP:
+		if (capturedMouse) {
+			if (MouseInClose(PointFromLong(lParam))) {
+				Close();
+			}
+			capturedMouse = false;
+			closeState = csNone;
+			InvalidateClose();
+			::ReleaseCapture();
+		}
+		break;
+
+	case WM_MOUSELEAVE:
+		if (!capturedMouse) {
+			closeState = csNone;
+			InvalidateClose();
+		}
+		break;
+
+	case WM_CONTEXTMENU:
+		ShowPopup();
+		return 0;
+
+	case WM_CTLCOLOREDIT:
+		return EditColour(reinterpret_cast<HWND>(lParam), reinterpret_cast<HDC>(wParam));
+
+	case WM_NOTIFY: {
+			NMHDR *pnmh = reinterpret_cast<LPNMHDR>(lParam);
+			if (pnmh->code == NM_CUSTOMDRAW) {
+				return CustomDraw(pnmh);
+			} else if (pnmh->code == TTN_GETDISPINFO) {
+				NMTTDISPINFOW *pnmtdi = reinterpret_cast<LPNMTTDISPINFO>(lParam);
+				const int idButton = static_cast<int>(
+							     (pnmtdi->uFlags & TTF_IDISHWND) ?
+							     ::GetDlgCtrlID(reinterpret_cast<HWND>(pnmtdi->hdr.idFrom)) : pnmtdi->hdr.idFrom);
+				for (const SearchOption &so : toggles) {
+					if (so.id == idButton) {
+						GUI::gui_string localised = localiser->Text(so.label);
+						StringCopy(pnmtdi->szText, localised.c_str());
+					}
+				}
+				return 0;
+			} else {
+				return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+			}
+		}
+
+	default:
+		return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+	}
+
+	return 0;
+}
+
+void Strip::AddToPopUp(GUI::Menu &popup, const char *label, int cmd, bool checked) const {
+	const GUI::gui_string localised = localiser->Text(label);
+	HMENU menu = static_cast<HMENU>(popup.GetID());
+	if (localised.empty())
+		::AppendMenu(menu, MF_SEPARATOR, 0, TEXT(""));
+	else
+		::AppendMenu(menu, MF_STRING | (checked ? MF_CHECKED : 0), cmd, localised.c_str());
+}
+
+void Strip::ShowPopup() {
+}
+
+void BackgroundStrip::Creation() {
+	Strip::Creation();
+	lineHeight = SizeText(fontText, GUI_TEXT("\u00C5Ay")).cy + space * 2 + 1;
+
+	wExplanation = ::CreateWindowEx(0, TEXT("Static"), TEXT(""),
+					WS_CHILD | WS_CLIPSIBLINGS,
+					2, 2, 100, 21,
+					Hwnd(), HmenuID(0), ::ApplicationInstance(), nullptr);
+	wExplanation.Show();
+	SetFontHandle(wExplanation, fontText);
+
+	wProgress = ::CreateWindowEx(0, PROGRESS_CLASS, TEXT(""),
+				     WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE,
+				     2, 2, 100, 21,
+				     Hwnd(), HmenuID(0), ::ApplicationInstance(), nullptr);
+}
+
+void BackgroundStrip::Destruction() noexcept {
+	Strip::Destruction();
+}
+
+void BackgroundStrip::Close() {
+	entered++;
+	::SetWindowText(HwndOf(wExplanation), TEXT(""));
+	entered--;
+	Strip::Close();
+}
+
+void BackgroundStrip::Size() {
+	if (!visible)
+		return;
+	Strip::Size();
+	const GUI::Rectangle rcArea = LineArea(0);
+
+	constexpr int progWidth = 200;
+
+	GUI::Rectangle rcProgress = rcArea;
+	rcProgress.right = rcProgress.left + progWidth;
+	wProgress.SetPosition(rcProgress);
+
+	GUI::Rectangle rcExplanation = rcArea;
+	rcExplanation.left += progWidth + 8;
+	rcExplanation.top -= 1;
+	rcExplanation.bottom += 1;
+	wExplanation.SetPosition(rcExplanation);
+
+	::InvalidateRect(Hwnd(), nullptr, TRUE);
+}
+
+bool BackgroundStrip::HasClose() const noexcept {
+	return false;
+}
+
+void BackgroundStrip::Focus() noexcept {
+	::SetFocus(HwndOf(wExplanation));
+}
+
+bool BackgroundStrip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	if (Strip::KeyDown(key))
+		return true;
+
+	return false;
+}
+
+bool BackgroundStrip::Command(WPARAM /* wParam */) {
+	return false;
+}
+
+LRESULT BackgroundStrip::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		return Strip::WndProc(iMessage, wParam, lParam);
+	} catch (...) {
+	}
+	return 0;
+}
+
+void BackgroundStrip::SetProgress(const GUI::gui_string &explanation, size_t size, size_t progress) {
+	if (explanation != ControlGText(wExplanation)) {
+		::SetWindowTextW(HwndOf(wExplanation), explanation.c_str());
+	}
+	// Scale values by 1000 as PBM_SETRANGE32 limited to 32-bit
+	constexpr int scaleProgress = 1000;
+	::SendMessage(HwndOf(wProgress), PBM_SETRANGE32, 0, size/scaleProgress);
+	::SendMessage(HwndOf(wProgress), PBM_SETPOS, progress/scaleProgress, 0);
+}
+
+static constexpr COLORREF colourNoMatch = RGB(0xff, 0x66, 0x66);
+
+void SearchStripBase::Creation() {
+	Strip::Creation();
+
+	hbrNoMatch = CreateSolidBrush(colourNoMatch);
+}
+
+void SearchStripBase::Destruction() noexcept {
+	::DeleteObject(hbrNoMatch);
+	hbrNoMatch = {};
+	Strip::Destruction();
+}
+
+LRESULT SearchStripBase::NoMatchColour(HDC hdc) noexcept {
+	SetTextColor(hdc, RGB(0xff, 0xff, 0xff));
+	SetBkColor(hdc, colourNoMatch);
+	return reinterpret_cast<LRESULT>(hbrNoMatch);
+}
+
+void SearchStrip::Creation() {
+	SearchStripBase::Creation();
+
+	wStaticFind = CreateText(textFindPrompt);
+
+	wText = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("Edit"), TEXT(""),
+			       WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
+			       50, 2, 300, 21,
+			       Hwnd(), HmenuID(IDC_INCFINDTEXT), ::ApplicationInstance(), nullptr);
+	wText.Show();
+
+	SetFontHandle(wText, fontText);
+
+	wButton = CreateButton(textFindNext, IDC_INCFINDBTNOK);
+
+	const GUI::Rectangle rcButton = wButton.GetPosition();
+	lineHeight = rcButton.Height() + space + 1;
+}
+
+void SearchStrip::Destruction() noexcept {
+	SearchStripBase::Destruction();
+}
+
+void SearchStrip::Close() {
+	entered++;
+	::SetWindowText(HwndOf(wText), TEXT(""));
+	entered--;
+	Strip::Close();
+	pSearcher->UIClosed();
+}
+
+void SearchStrip::Size() {
+	if (!visible)
+		return;
+	Strip::Size();
+	const GUI::Rectangle rcArea = LineArea(0);
+
+	GUI::Rectangle rcButton = rcArea;
+	rcButton.top -= 1;
+	rcButton.bottom += 1;
+	rcButton.left = rcButton.right - WidthControl(wButton);
+	wButton.SetPosition(rcButton);
+
+	GUI::Rectangle rcText = rcArea;
+	rcText.left = WidthControl(wStaticFind) + 8;
+	rcText.right = rcButton.left - 4;
+	wText.SetPosition(rcText);
+
+	rcText.right = rcText.left - 4;
+	rcText.left = 4;
+	rcText.top = rcArea.top + 3;
+
+	wStaticFind.SetPosition(rcText);
+
+	::InvalidateRect(Hwnd(), nullptr, TRUE);
+}
+
+void SearchStrip::Paint(HDC hDC) {
+	Strip::Paint(hDC);
+}
+
+void SearchStrip::Focus() noexcept {
+	::SetFocus(HwndOf(wText));
+}
+
+bool SearchStrip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	if (Strip::KeyDown(key))
+		return true;
+
+	if (key == VK_RETURN) {
+		if (IsChild(Hwnd(), ::GetFocus())) {
+			Next(false);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void SearchStrip::Next(bool select) {
+	if (select) {
+		pSearcher->MoveBack();
+	}
+	pSearcher->SetFindText(ControlText(wText).c_str());
+	pSearcher->wholeWord = false;
+	if (pSearcher->FindHasText()) {
+		pSearcher->FindNext(false, false);
+		if (!select) {
+			pSearcher->SetCaretAsStart();
+		}
+	}
+	wText.InvalidateAll();
+}
+
+bool SearchStrip::Command(WPARAM wParam) {
+	if (entered)
+		return false;
+	const int control = ControlIDOfWParam(wParam);
+	const int subCommand = static_cast<int>(wParam >> 16);
+	if (((control == IDC_INCFINDTEXT) && (subCommand == EN_CHANGE)) ||
+			(control == IDC_INCFINDBTNOK)) {
+		Next(control != IDC_INCFINDBTNOK);
+		return true;
+	}
+	return false;
+}
+
+LRESULT SearchStrip::EditColour(HWND hwnd, HDC hdc) noexcept {
+	if (GetDlgItem(static_cast<HWND>(GetID()), IDC_INCFINDTEXT) == hwnd) {
+		if (pSearcher->FindHasText() && pSearcher->failedfind) {
+			return NoMatchColour(hdc);
+		}
+	}
+	return Strip::EditColour(hwnd, hdc);
+}
+
+LRESULT SearchStrip::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		return Strip::WndProc(iMessage, wParam, lParam);
+	} catch (...) {
+	}
+	return 0;
+}
+
+LRESULT FindReplaceStrip::EditColour(HWND hwnd, HDC hdc) noexcept {
+	if (GetDlgItem(static_cast<HWND>(GetID()), IDFINDWHAT) == ::GetParent(hwnd)) {
+		if (pSearcher->FindHasText() &&
+				(incrementalBehaviour != simple) &&
+				pSearcher->failedfind) {
+			return NoMatchColour(hdc);
+		}
+	}
+	return Strip::EditColour(hwnd, hdc);
+}
+
+void FindReplaceStrip::NextIncremental(ChangingSource source) {
+	if (incrementalBehaviour == simple)
+		return;
+	if (pSearcher->findWhat.length()) {
+		pSearcher->MoveBack();
+	}
+
+	if (source == changingEdit) {
+		pSearcher->SetFindText(ControlText(wText).c_str());
+	} else {
+		pSearcher->SetFindText(ComboSelectionText(wText).c_str());
+	}
+
+	if (pSearcher->FindHasText()) {
+		pSearcher->FindNext(pSearcher->reverseFind, false, true);
+		pSearcher->SetCaretAsStart();
+	}
+	MarkIncremental();	// Mark all secondary hits
+	wText.InvalidateAll();
+}
+
+void FindReplaceStrip::SetIncrementalBehaviour(int behaviour) noexcept {
+	incrementalBehaviour = static_cast<FindReplaceStrip::IncrementalBehaviour>(behaviour);
+}
+
+void FindReplaceStrip::MarkIncremental() {
+	if (incrementalBehaviour == showAllMatches) {
+		pSearcher->MarkAll(Searcher::markIncremental);
+	}
+}
+
+void FindReplaceStrip::Close() {
+	if (pSearcher->havefound) {
+		pSearcher->InsertFindInMemory();
+	}
+	Strip::Close();
+	pSearcher->UIClosed();
+}
+
+void FindStrip::Creation() {
+	SearchStripBase::Creation();
+
+	wStaticFind = CreateText(textFindPrompt);
+
+	wText = CreateWindowEx(0, TEXT("ComboBox"), TEXT(""),
+			       WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL,
+			       50, 2, 300, 80,
+			       Hwnd(), HmenuID(IDFINDWHAT), ::ApplicationInstance(), nullptr);
+	SetFontHandle(wText, fontText);
+	wText.Show();
+
+	const GUI::Rectangle rcCombo = wText.GetPosition();
+	lineHeight = rcCombo.Height() + space + 1;
+
+	wButton = CreateButton(textFindNext, IDOK);
+	wButtonMarkAll = CreateButton(textMarkAll, IDMARKALL);
+
+	wCheckWord = CreateButton(toggles[SearchOption::tWord].label, toggles[SearchOption::tWord].id, true);
+	wCheckCase = CreateButton(toggles[SearchOption::tCase].label, toggles[SearchOption::tCase].id, true);
+	wCheckRE = CreateButton(toggles[SearchOption::tRegExp].label, toggles[SearchOption::tRegExp].id, true);
+	wCheckBE = CreateButton(toggles[SearchOption::tBackslash].label, toggles[SearchOption::tBackslash].id, true);
+	wCheckWrap = CreateButton(toggles[SearchOption::tWrap].label, toggles[SearchOption::tWrap].id, true);
+	wCheckUp = CreateButton(toggles[SearchOption::tUp].label, toggles[SearchOption::tUp].id, true);
+}
+
+void FindStrip::Destruction() noexcept {
+	SearchStripBase::Destruction();
+}
+
+void FindStrip::Size() {
+	if (!visible)
+		return;
+	Strip::Size();
+	const GUI::Rectangle rcArea = LineArea(0);
+
+	GUI::Rectangle rcButton = rcArea;
+	rcButton.top -= 1;
+	rcButton.bottom += 1;
+
+	const int checkWidth = rcButton.Height() - 2;	// Using height to make square
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckUp.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckWrap.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckBE.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckRE.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckCase.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckWord.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - WidthControl(wButtonMarkAll);
+	wButtonMarkAll.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - WidthControl(wButton);
+	wButton.SetPosition(rcButton);
+
+	GUI::Rectangle rcText = rcArea;
+	rcText.bottom += 60;
+	rcText.left = WidthControl(wStaticFind) + 8;
+	rcText.right = rcButton.left - 4;
+	wText.SetPosition(rcText);
+	wText.Show();
+
+	rcText.right = rcText.left - 4;
+	rcText.left = 4;
+	rcText.top = rcArea.top + 3;
+	rcText.bottom = rcArea.bottom;
+	wStaticFind.SetPosition(rcText);
+
+	::InvalidateRect(Hwnd(), nullptr, TRUE);
+}
+
+void FindStrip::Paint(HDC hDC) {
+	Strip::Paint(hDC);
+}
+
+void FindStrip::Focus() noexcept {
+	::SetFocus(HwndOf(wText));
+}
+
+bool FindStrip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	if (Strip::KeyDown(key))
+		return true;
+	switch (key) {
+	case VK_RETURN:
+		if (IsChild(Hwnd(), ::GetFocus())) {
+			if (incrementalBehaviour == simple) {
+				Next(false, IsKeyDown(VK_SHIFT));
+			} else {
+				if (pSearcher->closeFind == Searcher::CloseFind::closePrevent) {
+					Next(false, IsKeyDown(VK_SHIFT));
+				} else {
+					Close();
+				}
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+void FindStrip::Next(bool markAll, bool invertDirection) {
+	pSearcher->SetFind(ControlText(wText).c_str());
+	if (markAll) {
+		pSearcher->MarkAll(Searcher::markWithBookMarks);
+	}
+	const bool found = pSearcher->FindNext(pSearcher->reverseFind ^ invertDirection) >= 0;
+	if (pSearcher->ShouldClose(found)) {
+		Close();
+	} else {
+		SetComboFromMemory(wText, pSearcher->memFinds);
+		SetComboText(wText, pSearcher->findWhat, ComboSelection::atEnd);
+	}
+}
+
+void FindStrip::ShowPopup() {
+	GUI::Menu popup;
+	popup.CreatePopUp();
+	for (int i=SearchOption::tWord; i<=SearchOption::tUp; i++) {
+		AddToPopUp(popup, toggles[i].label, toggles[i].cmd, pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+	const GUI::Rectangle rcButton = wButton.GetPosition();
+	const GUI::Point pt(rcButton.left, rcButton.bottom);
+	popup.Show(pt, *this);
+}
+
+bool FindStrip::Command(WPARAM wParam) {
+	if (entered)
+		return false;
+	const int control = ControlIDOfWParam(wParam);
+	const int subCommand = static_cast<int>(wParam >> 16);
+	if (control == IDOK) {
+		if (incrementalBehaviour == simple) {
+			Next(false, false);
+		} else {
+			if (pSearcher->closeFind == Searcher::CloseFind::closePrevent) {
+				Next(false, false);
+			} else {
+				Close();
+			}
+		}
+		return true;
+	} else if (control == IDMARKALL) {
+		Next(true, false);
+		return true;
+	} else if (control == IDFINDWHAT) {
+		if (subCommand == CBN_EDITCHANGE) {
+			NextIncremental(changingEdit);
+			return true;
+		} else if (subCommand == CBN_SELCHANGE) {
+			NextIncremental(changingCombo);
+			return true;
+		}
+	} else {
+		pSearcher->FlagFromCmd(control) = !pSearcher->FlagFromCmd(control);
+		NextIncremental(changingEdit);
+		CheckButtons();
+	}
+	return false;
+}
+
+void FindStrip::CheckButtons() noexcept {
+	entered++;
+	CheckButton(wCheckWord, pSearcher->wholeWord);
+	CheckButton(wCheckCase, pSearcher->matchCase);
+	CheckButton(wCheckRE, pSearcher->regExp);
+	CheckButton(wCheckWrap, pSearcher->wrapFind);
+	CheckButton(wCheckBE, pSearcher->unSlash);
+	CheckButton(wCheckUp, pSearcher->reverseFind);
+	entered--;
+}
+
+void FindStrip::ShowStrip() {
+	pSearcher->failedfind = false;
+	Focus();
+	pSearcher->SetCaretAsStart();
+	SetComboFromMemory(wText, pSearcher->memFinds);
+	SetComboText(wText, pSearcher->findWhat, ComboSelection::all);
+	CheckButtons();
+	pSearcher->ScrollEditorIfNeeded();
+	MarkIncremental();
+}
+
+void ReplaceStrip::Creation() {
+	SearchStripBase::Creation();
+
+	lineHeight = 23;
+
+	wStaticFind = CreateText(textFindPrompt);
+
+	wText = CreateWindowEx(0, TEXT("ComboBox"), TEXT(""),
+			       WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL,
+			       50, 2, 300, 80,
+			       Hwnd(), HmenuID(IDFINDWHAT), ::ApplicationInstance(), nullptr);
+	SetFontHandle(wText, fontText);
+	wText.Show();
+
+	const GUI::Rectangle rcCombo = wText.GetPosition();
+	lineHeight = rcCombo.Height() + space + 1;
+
+	wStaticReplace = CreateText(textReplacePrompt);
+
+	wReplace = CreateWindowEx(0, TEXT("ComboBox"), TEXT(""),
+				  WS_CHILD | WS_TABSTOP | CBS_DROPDOWN | CBS_AUTOHSCROLL,
+				  50, 2, 300, 80,
+				  Hwnd(), HmenuID(IDREPLACEWITH), ::ApplicationInstance(), nullptr);
+	SetFontHandle(wReplace, fontText);
+	wReplace.Show();
+
+	wButtonFind = CreateButton(textFindNext, IDOK);
+	wButtonReplace = CreateButton(textReplace, IDREPLACE);
+
+	wButtonReplaceAll = CreateButton(textReplaceAll, IDREPLACEALL);
+	wButtonReplaceInSelection = CreateButton(textInSelection, IDREPLACEINSEL);
+
+	wCheckWord = CreateButton(toggles[SearchOption::tWord].label, toggles[SearchOption::tWord].id, true);
+	wCheckRE = CreateButton(toggles[SearchOption::tRegExp].label, toggles[SearchOption::tRegExp].id, true);
+
+	wCheckCase = CreateButton(toggles[SearchOption::tCase].label, toggles[SearchOption::tCase].id, true);
+	wCheckBE = CreateButton(toggles[SearchOption::tBackslash].label, toggles[SearchOption::tBackslash].id, true);
+
+	wCheckWrap = CreateButton(toggles[SearchOption::tWrap].label, toggles[SearchOption::tWrap].id, true);
+}
+
+void ReplaceStrip::Destruction() noexcept {
+	SearchStripBase::Destruction();
+}
+
+int ReplaceStrip::Lines() const noexcept {
+	return 2;
+}
+
+void ReplaceStrip::Size() {
+	if (!visible)
+		return;
+	Strip::Size();
+
+	const int widthCaption = std::max(WidthControl(wStaticFind), WidthControl(wStaticReplace));
+
+	GUI::Rectangle rcLine = LineArea(0);
+
+	const int widthButtons = std::max(WidthControl(wButtonFind), WidthControl(wButtonReplace));
+	const int widthLastButtons = std::max(WidthControl(wButtonReplaceAll), WidthControl(wButtonReplaceInSelection));
+
+	GUI::Rectangle rcButton = rcLine;
+	rcButton.top -= 1;
+
+	const int checkWidth = rcButton.Height() - 2;	// Using height to make square
+
+	// Allow empty slot to match wrap button on next line
+	rcButton.right = rcButton.right - (checkWidth + 4);
+
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckCase.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckWord.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - widthLastButtons;
+	wButtonReplaceAll.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - widthButtons;
+	wButtonFind.SetPosition(rcButton);
+
+	GUI::Rectangle rcText = rcLine;
+	rcText.bottom += 60;
+	rcText.left = widthCaption + 8;
+	rcText.right = rcButton.left - 4;
+	wText.SetPosition(rcText);
+
+	GUI::Rectangle rcStatic = rcLine;
+	rcStatic.right = rcText.left - 4;
+	rcStatic.left = 4;
+	rcStatic.top = rcLine.top + 3;
+	wStaticFind.SetPosition(rcStatic);
+
+	rcLine = LineArea(1);
+
+	rcButton = rcLine;
+	rcButton.top -= 1;
+
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckWrap.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckBE.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - checkWidth;
+	wCheckRE.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - widthLastButtons;
+	wButtonReplaceInSelection.SetPosition(rcButton);
+
+	rcButton.right = rcButton.left - 4;
+	rcButton.left = rcButton.right - widthButtons;
+	wButtonReplace.SetPosition(rcButton);
+
+	GUI::Rectangle rcReplace = rcLine;
+	rcReplace.bottom += 60;
+	rcReplace.left = rcText.left;
+	rcReplace.right = rcText.right;
+	wReplace.SetPosition(rcReplace);
+
+	rcStatic = rcLine;
+	rcStatic.right = rcReplace.left - 4;
+	rcStatic.left = 4;
+	rcStatic.top = rcLine.top + 3;
+	wStaticReplace.SetPosition(rcStatic);
+
+	::InvalidateRect(Hwnd(), nullptr, TRUE);
+}
+
+void ReplaceStrip::Paint(HDC hDC) {
+	Strip::Paint(hDC);
+}
+
+void ReplaceStrip::Focus() noexcept {
+	::SetFocus(HwndOf(wText));
+}
+
+static bool IsSameOrChild(const GUI::Window &wParent, HWND wChild) noexcept {
+	HWND hwnd = HwndOf(wParent);
+	return (wChild == hwnd) || IsChild(hwnd, wChild);
+}
+
+bool ReplaceStrip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	if (Strip::KeyDown(key))
+		return true;
+	switch (key) {
+	case VK_RETURN:
+		if (IsChild(Hwnd(), ::GetFocus())) {
+			if (IsSameOrChild(wButtonFind, ::GetFocus()))
+				HandleReplaceCommand(IDOK, IsKeyDown(VK_SHIFT));
+			else if (IsSameOrChild(wReplace, ::GetFocus()))
+				HandleReplaceCommand(IDOK, IsKeyDown(VK_SHIFT));
+			else if (IsSameOrChild(wButtonReplace, ::GetFocus()))
+				HandleReplaceCommand(IDREPLACE);
+			else if (IsSameOrChild(wButtonReplaceAll, ::GetFocus()))
+				HandleReplaceCommand(IDREPLACEALL);
+			else if (IsSameOrChild(wButtonReplaceInSelection, ::GetFocus()))
+				HandleReplaceCommand(IDREPLACEINSEL);
+			else
+				HandleReplaceCommand(IDOK, IsKeyDown(VK_SHIFT));
+			return true;
+		}
+	}
+	return false;
+}
+
+void ReplaceStrip::ShowPopup() {
+	GUI::Menu popup;
+	popup.CreatePopUp();
+	for (int i=SearchOption::tWord; i<=SearchOption::tWrap; i++) {
+		AddToPopUp(popup, toggles[i].label, toggles[i].cmd, pSearcher->FlagFromCmd(toggles[i].cmd));
+	}
+	const GUI::Rectangle rcButton = wCheckWord.GetPosition();
+	const GUI::Point pt(rcButton.left, rcButton.bottom);
+	popup.Show(pt, *this);
+}
+
+void ReplaceStrip::HandleReplaceCommand(int cmd, bool reverseFind) {
+	pSearcher->SetFind(ControlText(wText).c_str());
+	SetComboFromMemory(wText, pSearcher->memFinds);
+	SetComboText(wText, pSearcher->findWhat, ComboSelection::atEnd);
+	if (cmd != IDOK) {
+		pSearcher->SetReplace(ControlText(wReplace).c_str());
+		SetComboFromMemory(wReplace, pSearcher->memReplaces);
+		SetComboText(wReplace, pSearcher->replaceWhat, ComboSelection::atEnd);
+	}
+	//int replacements = 0;
+	if (cmd == IDOK) {
+		if (pSearcher->FindHasText()) {
+			pSearcher->FindNext(reverseFind);
+		}
+	} else if (cmd == IDREPLACE) {
+		pSearcher->ReplaceOnce(incrementalBehaviour == simple);
+		NextIncremental(changingEdit);	// Show not found colour if no more matches.
+	} else if ((cmd == IDREPLACEALL) || (cmd == IDREPLACEINSEL)) {
+		//~ replacements = pSciTEWin->ReplaceAll(cmd == IDREPLACEINSEL);
+		pSearcher->ReplaceAll(cmd == IDREPLACEINSEL);
+		NextIncremental(changingEdit);	// Show not found colour if no more matches.
+	}
+	//GUI::gui_string replDone = GUI::StringFromInteger(replacements);
+	//dlg.SetItemText(IDREPLDONE, replDone.c_str());
+}
+
+bool ReplaceStrip::Command(WPARAM wParam) {
+	if (entered)
+		return false;
+	const int control = ControlIDOfWParam(wParam);
+	switch (control) {
+
+	case IDFINDWHAT:
+		switch (HIWORD(wParam)) {
+		case CBN_SETFOCUS:
+		case CBN_KILLFOCUS:
+		case CBN_SELENDCANCEL:
+			return false;
+		case CBN_EDITCHANGE:
+			NextIncremental(changingEdit);
+			return true;
+		case CBN_SELCHANGE:
+			NextIncremental(changingCombo);
+			return true;
+		default:
+			return false;
+		}
+
+	case IDOK:
+	case IDREPLACEALL:
+	case IDREPLACE:
+	case IDREPLACEINSEL:
+		HandleReplaceCommand(control);
+		return true;
+
+	case IDWHOLEWORD:
+	case IDMATCHCASE:
+	case IDREGEXP:
+	case IDUNSLASH:
+	case IDWRAP:
+	case IDM_WHOLEWORD:
+	case IDM_MATCHCASE:
+	case IDM_REGEXP:
+	case IDM_WRAPAROUND:
+	case IDM_UNSLASH:
+		pSearcher->FlagFromCmd(control) = !pSearcher->FlagFromCmd(control);
+		NextIncremental(changingEdit);
+		break;
+
+	default:
+		return false;
+	}
+	CheckButtons();
+	return false;
+}
+
+void ReplaceStrip::CheckButtons() noexcept {
+	entered++;
+	CheckButton(wCheckWord, pSearcher->wholeWord);
+	CheckButton(wCheckCase, pSearcher->matchCase);
+	CheckButton(wCheckRE, pSearcher->regExp);
+	CheckButton(wCheckWrap, pSearcher->wrapFind);
+	CheckButton(wCheckBE, pSearcher->unSlash);
+	entered--;
+}
+
+void ReplaceStrip::ShowStrip() {
+	pSearcher->failedfind = false;
+	Focus();
+	pSearcher->SetCaretAsStart();
+	SetComboFromMemory(wText, pSearcher->memFinds);
+	SetComboText(wText, pSearcher->findWhat, ComboSelection::all);
+	SetComboFromMemory(wReplace, pSearcher->memReplaces);
+
+	CheckButtons();
+
+	if (pSearcher->FindHasText() != 0 && pSearcher->focusOnReplace) {
+		::SetFocus(HwndOf(wReplace));
+	}
+
+	pSearcher->ScrollEditorIfNeeded();
+	MarkIncremental();
+}
+
+void UserStrip::Creation() {
+	Strip::Creation();
+	// Combo boxes automatically size to a reasonable height so create a temporary and measure
+	HWND wComboTest = ::CreateWindowEx(0, TEXT("ComboBox"), TEXT("Aby"),
+					   WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL,
+					   50, 2, 300, 80,
+					   Hwnd(), 0, ::ApplicationInstance(), nullptr);
+	SetWindowFont(wComboTest, fontText, 0);
+	RECT rc;
+	::GetWindowRect(wComboTest, &rc);
+	::DestroyWindow(wComboTest);
+	lineHeight = rc.bottom - rc.top + 3;
+}
+
+void UserStrip::Destruction() noexcept {
+	psd.reset();
+	Strip::Destruction();
+}
+
+void UserStrip::Close() {
+	Strip::Close();
+	if (pSciTEWin)
+		pSciTEWin->UserStripClosed();
+}
+
+void UserStrip::Size() {
+	if (!visible)
+		return;
+	Strip::Size();
+	GUI::Rectangle rcArea = GetPosition();
+
+	rcArea.bottom -= rcArea.top;
+	rcArea.right -= rcArea.left;
+
+	rcArea.left = 2;
+	rcArea.top = 2;
+	rcArea.right -= 2;
+	rcArea.bottom -= 2;
+
+	if (HasClose())
+		rcArea.right -= closeSize.cx + 2;	// Allow for close box and gap
+
+	// Calculate widths of buttons.
+	for (std::vector<UserControl> &line : psd->controls) {
+		for (UserControl &ctl : line) {
+			if (ctl.controlType == UserControl::ucButton) {
+				const SIZE sz = SizeButton(ctl.w);
+				if (sz.cx > 0) {
+					ctl.widthDesired = sz.cx + 2 * WidthText(fontText, TEXT(" "));
+				}
+			}
+		}
+	}
+
+	psd->CalculateColumnWidths(rcArea.Width());
+
+	// Position each control.
+	int top = rcArea.top;
+	for (std::vector<UserControl> &line : psd->controls) {
+		int left = rcArea.left;
+		size_t column = 0;
+		for (UserControl &ctl : line) {
+			ctl.widthAllocated = psd->widths[column].widthAllocated;
+
+			GUI::Rectangle rcSize = ctl.w.GetClientPosition();
+			int topWithFix = top;
+			if (ctl.controlType == UserControl::ucButton)
+				topWithFix--;
+			if (ctl.controlType == UserControl::ucStatic)
+				topWithFix += 3;
+			if (ctl.controlType == UserControl::ucEdit)
+				rcSize.bottom = rcSize.top + lineHeight - 3;
+			if (ctl.controlType == UserControl::ucCombo)
+				rcSize.bottom = rcSize.top + 180;
+			const GUI::Rectangle rcControl(left, topWithFix, left + ctl.widthAllocated, topWithFix + rcSize.Height());
+			ctl.w.SetPosition(rcControl);
+			left += ctl.widthAllocated + 4;
+
+			column++;
+		}
+		top += lineHeight;
+	}
+
+	::InvalidateRect(Hwnd(), nullptr, TRUE);
+}
+
+bool UserStrip::HasClose() const noexcept {
+	return psd && psd->hasClose;
+}
+
+void UserStrip::Focus() noexcept {
+	for (const std::vector<UserControl> &line : psd->controls) {
+		for (const UserControl &ctl : line) {
+			if (ctl.controlType != UserControl::ucStatic) {
+				::SetFocus(HwndOf(ctl.w));
+				return;
+			}
+		}
+	}
+}
+
+bool UserStrip::KeyDown(WPARAM key) {
+	if (!visible)
+		return false;
+	if (Strip::KeyDown(key))
+		return true;
+	if (key == VK_RETURN) {
+		if (IsChild(Hwnd(), ::GetFocus())) {
+			// Treat Enter as pressing the first default button
+			for (const std::vector<UserControl> &line : psd->controls) {
+				for (const UserControl &ctl : line) {
+					if (ctl.controlType == UserControl::ucDefaultButton) {
+						extender->OnUserStrip(ctl.item, scClicked);
+						return true;
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+static StripCommand NotificationToStripCommand(int notification) noexcept {
+	switch (notification) {
+	case BN_CLICKED:
+		return scClicked;
+	case EN_CHANGE:
+	case CBN_EDITCHANGE:
+		return scChange;
+	case EN_UPDATE:
+		return scUnknown;
+	case CBN_SETFOCUS:
+	case EN_SETFOCUS:
+		return scFocusIn;
+	case CBN_KILLFOCUS:
+	case EN_KILLFOCUS:
+		return scFocusOut;
+	default:
+		return scUnknown;
+	}
+}
+
+bool UserStrip::Command(WPARAM wParam) {
+	if (entered)
+		return false;
+	const int control = ControlIDOfWParam(wParam);
+	const int notification = HIWORD(wParam);
+	if (extender) {
+		const StripCommand sc = NotificationToStripCommand(notification);
+		if (sc != scUnknown)
+			return extender->OnUserStrip(control, sc);
+	}
+	return false;
+}
+
+LRESULT UserStrip::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	try {
+		return Strip::WndProc(iMessage, wParam, lParam);
+	} catch (...) {
+	}
+	return 0;
+}
+
+int UserStrip::Lines() const noexcept {
+	return psd ? static_cast<int>(psd->controls.size()) : 1;
+}
+
+void UserStrip::SetDescription(const char *description) {
+	entered++;
+	GUI::gui_string sDescription = GUI::StringFromUTF8(description);
+	const bool resetting = psd != nullptr;
+	if (psd) {
+		for (std::vector<UserControl> &line : psd->controls) {
+			for (UserControl &ctl : line) {
+				ctl.w.Destroy();
+			}
+		}
+	}
+	psd.reset(new StripDefinition(sDescription));
+	// Create all the controls but with arbitrary initial positions which will be fixed up later.
+	size_t controlID=0;
+	int top = space;
+	for (std::vector<UserControl> &line : psd->controls) {
+		int left = 0;
+		for (UserControl &ctl : line) {
+			switch (ctl.controlType) {
+			case UserControl::ucEdit:
+				ctl.widthDesired = 100;
+				ctl.fixedWidth = false;
+				ctl.w = ::CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("Edit"), ctl.text.c_str(),
+							 WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
+							 left, top, ctl.widthDesired, lineHeight - 3,
+							 Hwnd(), HmenuID(controlID), ::ApplicationInstance(), nullptr);
+				break;
+
+			case UserControl::ucCombo:
+				ctl.widthDesired = 100;
+				ctl.fixedWidth = false;
+				ctl.w = ::CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("ComboBox"), ctl.text.c_str(),
+							 WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL,
+							 left, top, ctl.widthDesired, 180,
+							 Hwnd(), HmenuID(controlID), ::ApplicationInstance(), nullptr);
+				break;
+
+			case UserControl::ucButton:
+			case UserControl::ucDefaultButton:
+				ctl.widthDesired = WidthText(fontText, ctl.text.c_str()) +
+						   2 * ::GetSystemMetrics(SM_CXEDGE) +
+						   2 * WidthText(fontText, TEXT(" "));
+				ctl.w = ::CreateWindowEx(0, TEXT("Button"), ctl.text.c_str(),
+							 WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS |
+							 ((ctl.controlType == UserControl::ucDefaultButton) ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON),
+							 left, top, ctl.widthDesired, lineHeight-1,
+							 Hwnd(), HmenuID(controlID), ::ApplicationInstance(), nullptr);
+				break;
+
+			default:
+				ctl.widthDesired = WidthText(fontText, ctl.text.c_str());
+				ctl.w = ::CreateWindowEx(0, TEXT("Static"), ctl.text.c_str(),
+							 WS_CHILD | WS_CLIPSIBLINGS | ES_RIGHT,
+							 left, top, ctl.widthDesired, lineHeight - 5,
+							 Hwnd(), HmenuID(controlID), ::ApplicationInstance(), nullptr);
+				break;
+			}
+			ctl.w.Show();
+			SetFontHandle(ctl.w, fontText);
+			controlID++;
+			left += 60;
+		}
+		top += lineHeight;
+	}
+	if (resetting)
+		Size();
+	entered--;
+	Focus();
+}
+
+void UserStrip::SetExtender(Extension *extender_) noexcept {
+	extender = extender_;
+}
+
+void UserStrip::SetSciTE(SciTEWin *pSciTEWin_) noexcept {
+	pSciTEWin = pSciTEWin_;
+}
+
+UserControl *UserStrip::FindControl(int control) {
+	return psd->FindControl(control);
+}
+
+void UserStrip::Set(int control, const char *value) {
+	const UserControl *ctl = FindControl(control);
+	if (ctl) {
+		GUI::gui_string sValue = GUI::StringFromUTF8(value);
+		::SetWindowTextW(HwndOf(ctl->w), sValue.c_str());
+	}
+}
+
+void UserStrip::SetList(int control, const char *value) {
+	const UserControl *ctl = FindControl(control);
+	if (ctl) {
+		if (ctl->controlType == UserControl::ucCombo) {
+			const GUI::gui_string sValue = GUI::StringFromUTF8(value);
+			const std::vector<GUI::gui_string> listValues = ListFromString(sValue);
+			HWND combo = HwndOf(ctl->w);
+			ComboBox_ResetContent(combo);
+			for (const GUI::gui_string &gs : listValues) {
+				ComboBoxAppend(combo, gs);
+			}
+		}
+	}
+}
+
+std::string UserStrip::GetValue(int control) {
+	const UserControl *ctl = FindControl(control);
+	if (ctl) {
+		return ControlText(ctl->w);
+	}
+	return "";
+}
diff --git a/scite-app/scite/win32/Strips.h b/scite-app/scite/win32/Strips.h
new file mode 100644
index 0000000..b256096
--- /dev/null
+++ b/scite-app/scite/win32/Strips.h
@@ -0,0 +1,238 @@
+// SciTE - Scintilla based Text Editor
+/** @file Strips.h
+ ** Definition of UI strips.
+ **/
+// Copyright 2013 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef STRIPS_H
+#define STRIPS_H
+
+void *PointerFromWindow(HWND hWnd) noexcept;
+void SetWindowPointer(HWND hWnd, void *ptr) noexcept;
+void *SetWindowPointerFromCreate(HWND hWnd, LPARAM lParam) noexcept;
+GUI::gui_string TextOfWindow(HWND hWnd);
+GUI::gui_string ClassNameOfWindow(HWND hWnd);
+void ComboBoxAppend(HWND hWnd, const GUI::gui_string &gs) noexcept;
+
+class BaseWin : public GUI::Window {
+protected:
+	ILocalize *localiser = nullptr;
+public:
+	BaseWin() noexcept {
+	}
+	void SetLocalizer(ILocalize *localiser_) noexcept {
+		localiser = localiser_;
+	}
+	HWND Hwnd() const noexcept {
+		return static_cast<HWND>(GetID());
+	}
+	virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) = 0;
+	static LRESULT PASCAL StWndProc(
+		HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
+};
+
+class Strip : public BaseWin {
+protected:
+	HFONT fontText;
+	HTHEME hTheme;
+	int scale;
+	int space;
+	bool capturedMouse;
+	SIZE closeSize;
+	enum stripCloseState { csNone, csOver, csClicked, csClickedOver } closeState;
+	GUI::Window wToolTip;
+	int entered;
+	int lineHeight;
+
+	GUI::Window CreateText(const char *text);
+	GUI::Window CreateButton(const char *text, size_t ident, bool check=false);
+	void Tab(bool forwards) noexcept;
+	virtual void Creation();
+	virtual void Destruction() noexcept;
+	virtual void Close();
+	virtual bool KeyDown(WPARAM key);
+	virtual bool Command(WPARAM wParam);
+	virtual void Size();
+	virtual void Paint(HDC hDC);
+	virtual bool HasClose() const noexcept;
+	GUI::Rectangle CloseArea();
+	GUI::Rectangle LineArea(int line);
+	virtual int Lines() const noexcept;
+	void InvalidateClose();
+	bool MouseInClose(GUI::Point pt);
+	void TrackMouse(GUI::Point pt);
+	void SetTheme() noexcept;
+	virtual LRESULT EditColour(HWND hwnd, HDC hdc) noexcept;
+	virtual LRESULT CustomDraw(NMHDR *pnmh) noexcept;
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) override;
+	void AddToPopUp(GUI::Menu &popup, const char *label, int cmd, bool checked) const;
+	virtual void ShowPopup();
+public:
+	bool visible;
+	Strip() : fontText(0), hTheme(0), scale(96), space(2), capturedMouse(false), closeState(csNone), entered(0), lineHeight(20), visible(false) {
+		closeSize.cx = 11;
+		closeSize.cy = 11;
+	}
+	virtual ~Strip() = default;
+	virtual int Height() noexcept {
+		return lineHeight * Lines() + space - 1;
+	}
+};
+
+class BackgroundStrip : public Strip {
+	GUI::Window wExplanation;
+	GUI::Window wProgress;
+public:
+	BackgroundStrip() {
+	}
+	virtual ~BackgroundStrip() = default;
+	void Creation() override;
+	void Destruction() noexcept override;
+	void Close() override;
+	void Focus() noexcept;
+	bool KeyDown(WPARAM key) override;
+	bool Command(WPARAM wParam) override;
+	void Size() override;
+	bool HasClose() const noexcept override;
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) override;
+	void SetProgress(const GUI::gui_string &explanation, size_t size, size_t progress);
+};
+
+class SearchStripBase : public Strip {
+protected:
+	Searcher *pSearcher = nullptr;
+	HBRUSH hbrNoMatch {};
+public:
+	SearchStripBase() {
+	}
+	virtual ~SearchStripBase() = default;
+	void SetSearcher(Searcher *pSearcher_) noexcept {
+		pSearcher = pSearcher_;
+	}
+	void Creation() override;
+	void Destruction() noexcept override;
+	LRESULT NoMatchColour(HDC hdc) noexcept;
+};
+
+class SearchStrip : public SearchStripBase {
+	GUI::Window wStaticFind;
+	GUI::Window wText;
+	GUI::Window wButton;
+public:
+	SearchStrip() {
+	}
+	virtual ~SearchStrip() = default;
+	void Creation() override;
+	void Destruction() noexcept override;
+	void Close() override;
+	void Focus() noexcept;
+	bool KeyDown(WPARAM key) override;
+	void Next(bool select);
+	bool Command(WPARAM wParam) override;
+	void Size() override;
+	void Paint(HDC hDC) override;
+	LRESULT EditColour(HWND hwnd, HDC hdc) noexcept override;
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) override;
+};
+
+class FindReplaceStrip : public SearchStripBase {
+protected:
+	GUI::Window wStaticFind;
+	GUI::Window wText;
+	GUI::Window wCheckWord;
+	GUI::Window wCheckCase;
+	GUI::Window wCheckRE;
+	GUI::Window wCheckBE;
+	GUI::Window wCheckWrap;
+	enum IncrementalBehaviour { simple, incremental, showAllMatches };
+	IncrementalBehaviour incrementalBehaviour;
+	FindReplaceStrip() noexcept : incrementalBehaviour(simple) {
+	}
+	LRESULT EditColour(HWND hwnd, HDC hdc) noexcept override;
+	enum ChangingSource { changingEdit, changingCombo };
+	void NextIncremental(ChangingSource source);
+public:
+	virtual ~FindReplaceStrip() = default;
+	void Close() override;
+	void SetIncrementalBehaviour(int behaviour) noexcept;
+	void MarkIncremental();
+};
+
+class FindStrip : public FindReplaceStrip {
+	GUI::Window wButton;
+	GUI::Window wButtonMarkAll;
+	GUI::Window wCheckUp;
+public:
+	FindStrip() noexcept {
+	}
+	virtual ~FindStrip() = default;
+	void Creation() override;
+	void Destruction() noexcept override;
+	void Focus() noexcept;
+	bool KeyDown(WPARAM key) override;
+	void Next(bool markAll, bool invertDirection);
+	void ShowPopup() override;
+	bool Command(WPARAM wParam) override;
+	void Size() override;
+	void Paint(HDC hDC) override;
+	void CheckButtons() noexcept;
+	void ShowStrip();
+};
+
+class ReplaceStrip : public FindReplaceStrip {
+	GUI::Window wButtonFind;
+	GUI::Window wButtonReplaceAll;
+	GUI::Window wStaticReplace;
+	GUI::Window wReplace;
+	GUI::Window wButtonReplace;
+	GUI::Window wButtonReplaceInSelection;
+public:
+	ReplaceStrip() noexcept {
+	}
+	virtual ~ReplaceStrip() = default;
+	void Creation() override;
+	void Destruction() noexcept override;
+	int Lines() const noexcept override;
+	void Focus() noexcept;
+	bool KeyDown(WPARAM key) override;
+	void ShowPopup() override;
+	void HandleReplaceCommand(int cmd, bool reverseFind = false);
+	bool Command(WPARAM wParam) override;
+	void Size() override;
+	void Paint(HDC hDC) override;
+	void CheckButtons() noexcept;
+	void ShowStrip();
+};
+
+class StripDefinition;
+
+class UserStrip : public Strip {
+	std::unique_ptr<StripDefinition> psd;
+	Extension *extender;
+	SciTEWin *pSciTEWin;
+public:
+	UserStrip() noexcept : extender(nullptr), pSciTEWin(nullptr) {
+		lineHeight = 26;
+	}
+	virtual ~UserStrip() = default;
+	void Creation() override;
+	void Destruction() noexcept override;
+	void Close() override;
+	void Focus() noexcept;
+	bool KeyDown(WPARAM key) override;
+	bool Command(WPARAM wParam) override;
+	void Size() override;
+	bool HasClose() const noexcept override;
+	LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) override;
+	int Lines() const noexcept override;
+	void SetDescription(const char *description);
+	void SetExtender(Extension *extender_) noexcept;
+	void SetSciTE(SciTEWin *pSciTEWin_) noexcept;
+	UserControl *FindControl(int control);
+	void Set(int control, const char *value);
+	void SetList(int control, const char *value);
+	std::string GetValue(int control);
+};
+
+#endif
diff --git a/scite-app/scite/win32/UniqueInstance.cxx b/scite-app/scite/win32/UniqueInstance.cxx
new file mode 100644
index 0000000..9a43bfc
--- /dev/null
+++ b/scite-app/scite/win32/UniqueInstance.cxx
@@ -0,0 +1,246 @@
+// SciTE - Scintilla based Text Editor
+/** @file UniqueInstance.cxx
+ ** Class to ensure a unique instance of the editor, if requested.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstdlib>
+#include <cstring>
+
+#include <string>
+
+#include "SciTEWin.h"
+
+UniqueInstance::UniqueInstance() {
+	stw = nullptr;
+	identityMessage = ::RegisterWindowMessage(TEXT("SciTEInstanceIdentifier"));
+	mutex = {};
+	bAlreadyRunning = false;
+	hOtherWindow = {};
+}
+
+UniqueInstance::~UniqueInstance() {
+	if (mutex) {
+		::CloseHandle(mutex);
+	}
+}
+
+void UniqueInstance::Init(SciTEWin *stw_) noexcept {
+	stw = stw_;
+}
+
+/**
+ * Try to create a mutex.
+ * If succeed, it is the first/only instance.
+ * Otherwise, there is already an instance holding this mutex.
+ */
+bool UniqueInstance::AcceptToOpenFiles(bool bAccept) {
+	bool bError = false;
+
+	stw->openFilesHere = bAccept;
+	if (bAccept) {
+		// We create a mutex because it is an atomic operation.
+		// An operation like EnumWindows is long, so if we use it only, we can fall in a race condition.
+		// Note from MSDN: "The system closes the handle automatically when the process terminates.
+		// The mutex object is destroyed when its last handle has been closed."
+		// If the mutex already exists, the new process get a handle on it, so even if the first
+		// process exits, the mutex isn't destroyed, until all SciTE instances exit.
+		mutex = ::CreateMutex(nullptr, FALSE, mutexName.c_str());
+		// The call fails with ERROR_ACCESS_DENIED if the mutex was
+		// created in a different user session because of passing
+		// NULL for the SECURITY_ATTRIBUTES on mutex creation
+		bError = (::GetLastError() == ERROR_ALREADY_EXISTS ||
+			  ::GetLastError() == ERROR_ACCESS_DENIED);
+	} else {
+		::CloseHandle(mutex);
+	}
+	return !bError;
+}
+
+void UniqueInstance::CallSearchOnAllWindows() {
+	::EnumWindows(SearchOtherInstance, reinterpret_cast<LPARAM>(this));
+}
+
+/**
+ * Toggle the open files here option.
+ * If set, search if another instance have this option set.
+ * If found, we ask it to yield this option,
+ * so we are the only one to accept files.
+ */
+void UniqueInstance::ToggleOpenFilesHere() {
+	// If the openFilesHere option is set, we unset it and remove the handle.
+	// Else, we set the option and try to set the mutex.
+	if (!AcceptToOpenFiles(!stw->openFilesHere)) {
+		// Cannot set the mutex, search the previous instance holding it
+		CallSearchOnAllWindows();
+		if (hOtherWindow) {
+			// Found, we indicate it to yield the acceptation of files
+			::SendMessage(hOtherWindow, identityMessage, 0,
+				      static_cast<LPARAM>(1));
+		}
+	}
+	stw->CheckMenus();
+}
+
+/**
+ * Manage the received COPYDATA message with a command line from another instance.
+ */
+LRESULT UniqueInstance::CopyData(const COPYDATASTRUCT *pcds) {
+	if (pcds) {
+		if (stw->props.GetInt("minimize.to.tray")) {
+			stw->RestoreFromTray();
+		}
+		const char *text = static_cast<const char *>(pcds->lpData);
+		if (text && strlen(text) > 0) {
+			GUI::gui_string args = stw->ProcessArgs(GUI::StringFromUTF8(text).c_str());
+			stw->ProcessCommandLine(args, 0);
+			stw->ProcessCommandLine(args, 1);
+		}
+		::FlashWindow(stw->MainHWND(), FALSE);
+	}
+	return TRUE;
+}
+
+/**
+ * If the given message is the identity message and we hold the
+ * open files here option, we answer the message (so other instances know
+ * we are the one holding the option).
+ * If the message ask to yield this option, we do it nicely...
+ */
+LRESULT UniqueInstance::CheckMessage(UINT message, WPARAM wParam, LPARAM lParam) {
+	if (message == identityMessage) {
+		if (stw->openFilesHere || wParam != 0) {
+			// We answer only if the menu item is checked to accept files,
+			// or if the caller force answering by setting wParam to non null
+			// which can be used to find all instances (not used yet).
+			if (stw->openFilesHere && lParam != 0) {
+				// An instance indicates it takes control of the Open Files Here
+				// feature, so this one no longer accept them.
+				AcceptToOpenFiles(false);
+				stw->CheckMenus();	// Update the checkmark
+			}
+			return identityMessage;
+		}
+	}
+	return 0;
+}
+
+/**
+ * To be called only if check.if.already.open option is set to 1.
+ * Create the mutex name, try to set the mutex.
+ * If failed, renounce to the open files here option.
+ */
+void UniqueInstance::CheckOtherInstance() {
+	// Use the method explained by Joseph M. Newcomer to avoid multiple instances of an application:
+	// http://www.codeproject.com/cpp/avoidmultinstance.asp
+	// I limit instances by desktop, it seems to make sense with a GUI application...
+	mutexName = TEXT("SciTE-UniqueInstanceMutex-");	// I doubt I really need a GUID here...
+	HDESK desktop = ::GetThreadDesktop(::GetCurrentThreadId());
+	DWORD len = 0;
+	// Query the needed size for the buffer
+	const BOOL result = ::GetUserObjectInformation(desktop, UOI_NAME, nullptr, 0, &len);
+	if (result == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+		// WinNT / Win2000
+		std::wstring info(len, 0);	// len is actually bytes so this is twice length needed
+		::GetUserObjectInformation(desktop, UOI_NAME, &info[0], len, nullptr);
+		mutexName += info;
+	}
+	// Try to set the mutex. If return false, it failed, there is already another instance.
+	bAlreadyRunning = !AcceptToOpenFiles(true);
+	if (bAlreadyRunning) {
+		// Don't answer to requests from other starting instances
+		stw->openFilesHere = false;
+	}
+}
+
+/**
+ * If we know there is another instance with open files here option,
+ * we search it by enumerating windows.
+ * @return true if found.
+ */
+bool UniqueInstance::FindOtherInstance() {
+	if (bAlreadyRunning && identityMessage != 0) {
+		CallSearchOnAllWindows();
+		if (hOtherWindow) {
+			return true;
+		}
+	}
+	return false;
+}
+
+void UniqueInstance::WindowCopyData(std::string_view s) {
+	std::string sCopy(s);	// Ensure NUL at end of string
+	COPYDATASTRUCT cds {};
+	cds.dwData = 0;
+	cds.cbData = static_cast<DWORD>(sCopy.length() + 1);
+	cds.lpData = sCopy.data();
+	::SendMessage(hOtherWindow, WM_COPYDATA, 0, reinterpret_cast<LPARAM>(&cds));
+}
+
+/**
+ * Send the COPYDATA messages to transmit the command line to
+ * the instance holding the open files here option.
+ * After that, the current instance will exit.
+ */
+void UniqueInstance::SendCommands(const char *cmdLine) {
+	// On Win2k, windows can't get focus by themselves,
+	// so it is the responsibility of the new process to bring the window
+	// to foreground.
+	// Put the other SciTE uniconized and to forefront.
+	if (::IsIconic(hOtherWindow)) {
+		::ShowWindow(hOtherWindow, SW_RESTORE);
+	}
+	::SetForegroundWindow(hOtherWindow);
+
+	// Send 3 messages:
+	// 1) first the cwd, so paths relative to the new instance can be
+	// resolved in the old instance,
+	// 2) then the real command line, 
+	// 3) then setdefaultcwd to set a reasonable default cwd and prevent
+	// locking of directories.
+	std::string cwdCmd("\"-cwd:");
+	FilePath cwd = FilePath::GetWorkingDirectory();
+	cwdCmd.append(cwd.AsUTF8());
+	cwdCmd.append("\"");
+	// Defeat the "\" mangling - convert "\" to "/"
+	std::replace(cwdCmd.begin(), cwdCmd.end(), '\\', '/');
+	WindowCopyData(cwdCmd);
+	// Now the command line itself.
+	WindowCopyData(cmdLine);
+	// Restore default working directory
+	WindowCopyData("-setdefaultcwd:");
+}
+
+/**
+ * Function called by EnumWindows.
+ * @a hWnd is the handle to the currently enumerated window.
+ * @a lParam is seen as a pointer to the current UniqueInstance
+ * so it can be used to access all members.
+ * @return FALSE if found, to stop EnumWindows.
+ */
+BOOL CALLBACK UniqueInstance::SearchOtherInstance(HWND hWnd, LPARAM lParam) {
+	BOOL bResult = TRUE;
+
+	UniqueInstance *ui = reinterpret_cast<UniqueInstance *>(lParam);
+
+	// First, avoid to send a message to ourself
+	if (hWnd != ui->stw->MainHWND()) {
+		// Send a message to the given window, to see if it will answer with
+		// the same message. If it does, it is a Gui window with
+		// openFilesHere set.
+		// We use a timeout to avoid being blocked by hung processes.
+		DWORD_PTR result = 0;
+		const LRESULT found = ::SendMessageTimeout(hWnd,
+				      ui->identityMessage, 0, 0,
+				      SMTO_BLOCK | SMTO_ABORTIFHUNG, 200, &result);
+		if (found != 0 && result == static_cast<DWORD_PTR>(ui->identityMessage)) {
+			// Another Gui window found!
+			// We memorise its window handle
+			ui->hOtherWindow = hWnd;
+			// We stop the EnumWindows
+			bResult = FALSE;
+		}
+	}
+	return bResult;
+}
diff --git a/scite-app/scite/win32/UniqueInstance.h b/scite-app/scite/win32/UniqueInstance.h
new file mode 100644
index 0000000..994122d
--- /dev/null
+++ b/scite-app/scite/win32/UniqueInstance.h
@@ -0,0 +1,42 @@
+// SciTE - Scintilla based Text Editor
+/** @file UniqueInstance.h
+ ** Header of the class to ensure a unique instance of the editor.
+ **/
+// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef UNIQUEINSTANCE_H
+#define UNIQUEINSTANCE_H
+
+class SciTEWin;
+
+/**
+ */
+class UniqueInstance {
+
+private:
+	SciTEWin *stw;	///< Access to SciTEWin interface
+	UINT identityMessage;	///< Registered message to identify SciTE instances
+	HANDLE mutex;	///< Mutex to avoid concurrent running
+	std::wstring mutexName;	///< Name of the above
+	bool bAlreadyRunning;	///< true if another instance accepting files is found
+	HWND hOtherWindow;	///< Handle of the window of the found other instance
+
+public:
+	UniqueInstance();
+	~UniqueInstance();
+
+	void Init(SciTEWin *stw_) noexcept;	///< To set the access to the SciTEWin interface
+	bool AcceptToOpenFiles(bool bAccept);	///< Set mutex and see if succeed
+	void CallSearchOnAllWindows();	///< Common code used by ToggleOpenFilesHere and FindOtherInstance
+	void ToggleOpenFilesHere();	///< Change the option to open files in this instance and ask other instance to give up this option
+	LRESULT CopyData(const COPYDATASTRUCT *pcds);	///< Send command line to existing instance
+	LRESULT CheckMessage(UINT message, WPARAM wParam, LPARAM lParam);	///< Test if a given message is the identity message
+	void CheckOtherInstance();	///< Create mutex name and try to set it
+	bool FindOtherInstance();	///< Find another instance answering to the identity message
+	void WindowCopyData(std::string_view s);	///< Send data to hOtherWindow
+	void SendCommands(const char *cmdLine);	///< Send the command line to the other instance
+	static BOOL CALLBACK SearchOtherInstance(HWND hWnd, LPARAM lParam);	///< Callback in the window enumeration
+};
+
+#endif
diff --git a/scite-app/scite/win32/around.bmp b/scite-app/scite/win32/around.bmp
new file mode 100644
index 0000000..df190c3
Binary files /dev/null and b/scite-app/scite/win32/around.bmp differ
diff --git a/scite-app/scite/win32/around20.bmp b/scite-app/scite/win32/around20.bmp
new file mode 100644
index 0000000..7a8f4c8
Binary files /dev/null and b/scite-app/scite/win32/around20.bmp differ
diff --git a/scite-app/scite/win32/around24.bmp b/scite-app/scite/win32/around24.bmp
new file mode 100644
index 0000000..62cf8fd
Binary files /dev/null and b/scite-app/scite/win32/around24.bmp differ
diff --git a/scite-app/scite/win32/around32.bmp b/scite-app/scite/win32/around32.bmp
new file mode 100644
index 0000000..524072a
Binary files /dev/null and b/scite-app/scite/win32/around32.bmp differ
diff --git a/scite-app/scite/win32/backslash.bmp b/scite-app/scite/win32/backslash.bmp
new file mode 100644
index 0000000..9129c72
Binary files /dev/null and b/scite-app/scite/win32/backslash.bmp differ
diff --git a/scite-app/scite/win32/backslash20.bmp b/scite-app/scite/win32/backslash20.bmp
new file mode 100644
index 0000000..5f1623b
Binary files /dev/null and b/scite-app/scite/win32/backslash20.bmp differ
diff --git a/scite-app/scite/win32/backslash24.bmp b/scite-app/scite/win32/backslash24.bmp
new file mode 100644
index 0000000..14bbbc2
Binary files /dev/null and b/scite-app/scite/win32/backslash24.bmp differ
diff --git a/scite-app/scite/win32/backslash32.bmp b/scite-app/scite/win32/backslash32.bmp
new file mode 100644
index 0000000..4b7ddb0
Binary files /dev/null and b/scite-app/scite/win32/backslash32.bmp differ
diff --git a/scite-app/scite/win32/case.bmp b/scite-app/scite/win32/case.bmp
new file mode 100644
index 0000000..8da3969
Binary files /dev/null and b/scite-app/scite/win32/case.bmp differ
diff --git a/scite-app/scite/win32/case20.bmp b/scite-app/scite/win32/case20.bmp
new file mode 100644
index 0000000..5e7e4c6
Binary files /dev/null and b/scite-app/scite/win32/case20.bmp differ
diff --git a/scite-app/scite/win32/case24.bmp b/scite-app/scite/win32/case24.bmp
new file mode 100644
index 0000000..5481148
Binary files /dev/null and b/scite-app/scite/win32/case24.bmp differ
diff --git a/scite-app/scite/win32/case32.bmp b/scite-app/scite/win32/case32.bmp
new file mode 100644
index 0000000..7ac05c6
Binary files /dev/null and b/scite-app/scite/win32/case32.bmp differ
diff --git a/scite-app/scite/win32/closefile.bmp b/scite-app/scite/win32/closefile.bmp
new file mode 100644
index 0000000..1050a29
Binary files /dev/null and b/scite-app/scite/win32/closefile.bmp differ
diff --git a/scite-app/scite/win32/closefile24.bmp b/scite-app/scite/win32/closefile24.bmp
new file mode 100644
index 0000000..755dc66
Binary files /dev/null and b/scite-app/scite/win32/closefile24.bmp differ
diff --git a/scite-app/scite/win32/deps.mak b/scite-app/scite/win32/deps.mak
new file mode 100644
index 0000000..4dcb814
--- /dev/null
+++ b/scite-app/scite/win32/deps.mak
@@ -0,0 +1,1022 @@
+# Created by AppDepGen.py. To recreate, run AppDepGen.py.
+DirectorExtension.o: \
+	DirectorExtension.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	DirectorExtension.h
+GUIWin.o: \
+	GUIWin.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../src/GUI.h
+SciTEWin.o: \
+	SciTEWin.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h \
+	DLLFunction.h \
+	../src/MultiplexExtension.h \
+	DirectorExtension.h \
+	../src/LuaExtension.h
+Sc1.o: \
+	SciTEWin.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h \
+	DLLFunction.h \
+	../src/MultiplexExtension.h \
+	DirectorExtension.h \
+	../src/LuaExtension.h
+SciTEWinBar.o: \
+	SciTEWinBar.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+SciTEWinDlg.o: \
+	SciTEWinDlg.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+Strips.o: \
+	Strips.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+UniqueInstance.o: \
+	UniqueInstance.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+Cookie.o: \
+	../src/Cookie.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/Cookie.h
+Credits.o: \
+	../src/Credits.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+EditorConfig.o: \
+	../src/EditorConfig.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/EditorConfig.h
+ExportHTML.o: \
+	../src/ExportHTML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportPDF.o: \
+	../src/ExportPDF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportRTF.o: \
+	../src/ExportRTF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportTEX.o: \
+	../src/ExportTEX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportXML.o: \
+	../src/ExportXML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+FilePath.o: \
+	../src/FilePath.cxx \
+	../src/GUI.h \
+	../src/FilePath.h
+FileWorker.o: \
+	../src/FileWorker.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/FilePath.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/Utf8_16.h
+IFaceTable.o: \
+	../src/IFaceTable.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/IFaceTable.h
+JobQueue.o: \
+	../src/JobQueue.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h \
+	../src/SciTE.h \
+	../src/JobQueue.h
+LuaExtension.o: \
+	../src/LuaExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/IFaceTable.h \
+	../src/SciTEKeys.h \
+	../src/LuaExtension.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+MatchMarker.o: \
+	../src/MatchMarker.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/MatchMarker.h
+MultiplexExtension.o: \
+	../src/MultiplexExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/MultiplexExtension.h \
+	../src/Extender.h
+PropSetFile.o: \
+	../src/PropSetFile.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h
+ScintillaWindow.o: \
+	../src/ScintillaWindow.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h
+SciTEBase.o: \
+	../src/SciTEBase.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h
+SciTEBuffers.o: \
+	../src/SciTEBuffers.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+SciTEIO.o: \
+	../src/SciTEIO.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	../src/Utf8_16.h
+SciTEProps.o: \
+	../src/SciTEProps.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h \
+	../src/IFaceTable.h
+StringHelpers.o: \
+	../src/StringHelpers.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h
+StringList.o: \
+	../src/StringList.cxx \
+	../src/GUI.h \
+	../src/StringList.h \
+	../src/StringHelpers.h
+StyleDefinition.o: \
+	../src/StyleDefinition.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/StyleDefinition.h
+StyleWriter.o: \
+	../src/StyleWriter.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StyleWriter.h
+Utf8_16.o: \
+	../src/Utf8_16.cxx \
+	../src/Utf8_16.h
+lapi.o: \
+	../lua/src/lapi.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+lauxlib.o: \
+	../lua/src/lauxlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h
+lbaselib.o: \
+	../lua/src/lbaselib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lbitlib.o: \
+	../lua/src/lbitlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lcode.o: \
+	../lua/src/lcode.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lcorolib.o: \
+	../lua/src/lcorolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lctype.o: \
+	../lua/src/lctype.c \
+	../lua/src/lprefix.h \
+	../lua/src/lctype.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/llimits.h
+ldblib.o: \
+	../lua/src/ldblib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ldebug.o: \
+	../lua/src/ldebug.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ldo.o: \
+	../lua/src/ldo.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+ldump.o: \
+	../lua/src/ldump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lundump.h
+lfunc.o: \
+	../lua/src/lfunc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lfunc.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lgc.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h
+lgc.o: \
+	../lua/src/lgc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+linit.o: \
+	../lua/src/linit.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+liolib.o: \
+	../lua/src/liolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+llex.o: \
+	../lua/src/llex.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lmathlib.o: \
+	../lua/src/lmathlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lmem.o: \
+	../lua/src/lmem.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h
+loadlib.o: \
+	../lua/src/loadlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lobject.o: \
+	../lua/src/lobject.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lvm.h
+lopcodes.o: \
+	../lua/src/lopcodes.c \
+	../lua/src/lprefix.h \
+	../lua/src/lopcodes.h \
+	../lua/src/llimits.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h
+loslib.o: \
+	../lua/src/loslib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lparser.o: \
+	../lua/src/lparser.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h
+lstate.o: \
+	../lua/src/lstate.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lstring.o: \
+	../lua/src/lstring.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h
+lstrlib.o: \
+	../lua/src/lstrlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltable.o: \
+	../lua/src/ltable.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ltablib.o: \
+	../lua/src/ltablib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltm.o: \
+	../lua/src/ltm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lundump.o: \
+	../lua/src/lundump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lundump.h
+lutf8lib.o: \
+	../lua/src/lutf8lib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lvm.o: \
+	../lua/src/lvm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lzio.o: \
+	../lua/src/lzio.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/llimits.h \
+	../lua/src/lmem.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h
+LexillaAccess.o: \
+	../../lexilla/access/LexillaAccess.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h
+ScintillaCall.o: \
+	../../scintilla/call/ScintillaCall.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h
diff --git a/scite-app/scite/win32/locale.properties b/scite-app/scite/win32/locale.properties
new file mode 100644
index 0000000..f7bf2f7
--- /dev/null
+++ b/scite-app/scite/win32/locale.properties
@@ -0,0 +1,407 @@
+# locale.properties by Neil Hodgson neilh@scintilla.org
+# Placed in the public domain 2001
+
+# locale.properties defines the localised text for the user interface
+# Some definitions are commented out because they duplicate another string
+# The format of each line is original=localised, such as File=&Fichier
+# Even though the original text may have ellipses "..." and access key
+# indicators "&" in the user interface, these do not appear in this file
+# for the original texts. Translated texts should have an access key indicator
+# if needed as the translated text may not include the original access key.
+# Ellipses are automatically added when needed.
+# The "/" character should not be used in menu entries as on GTK+ the "/" is
+# used to specifiy the menu hierarchy and so will produce extra menu items.
+# Each original text may have only one translation, even if it appears in
+# different parts of the user interface.
+
+# Please state any further license conditions and copyright notices you desire.
+# If there are no further notices then contributed translations will be assumed
+# to be made freely available under the same conditions as SciTE.
+# Email addresses included in this file may attract spam if the file is published.
+
+# Define the encoding of this file so that on GTK+ 2, the file can be
+# reencoded as UTF-8 as that is the GTK+ 2 user interface encoding.
+# It's recommended that translations use UTF-8 with no BOM.
+translation.encoding=
+
+# This is to add something like: Swahili translation 1.41.1 by Neil Hodgson
+TranslationCredit=
+
+# Menus
+
+# File menu
+File=
+New=
+Open=
+Open Selected Filename=
+Revert=
+Close=
+Save=
+Save As=
+Export=
+As HTML=
+As RTF=
+Page Setup=
+Print=
+Load Session=
+Save Session=
+Exit=
+
+# Edit menu
+Edit=
+Undo=
+Redo=
+Cut=
+Copy=
+Paste=
+Delete=
+Select All=
+Copy as RTF=
+Match Brace=
+Select to Brace=
+Show Calltip=
+Complete Symbol=
+Complete Word=
+Expand Abbreviation=
+Block Comment or Uncomment=
+Box Comment=
+Stream Comment=
+Make Selection Uppercase=
+Make Selection Lowercase=
+
+# Search menu
+Search=
+Find=
+Find Next=
+Find Previous=
+Find in Files=
+Replace=
+Next Bookmark=
+Previous Bookmark=
+Toggle Bookmark=
+Clear All Bookmarks=
+
+# View menu
+View=
+Toggle current fold=
+Toggle all folds=
+Full Screen=
+Tool Bar=
+Tab Bar=
+Status Bar=
+Whitespace=
+End of Line=
+Indentation Guides=
+Line Numbers=
+Margin=
+Fold Margin=
+Output=
+Parameters=
+
+# Tools menu
+Tools=
+Compile=
+Build=
+Go=
+Stop Executing=
+Next Message=
+Previous Message=
+Clear Output=
+Switch Pane=
+
+# Options menu
+Options=
+Always On Top=
+Vertical Split=
+Line End Characters=
+CR + LF=
+CR=
+LF=
+Convert Line End Characters=
+Change Indentation Settings=
+Use Monospaced Font=
+Open Local Options File=
+Open User Options File=
+Open Global Options File=
+Open Abbreviations File=
+
+# Language menu
+Language=
+
+# Buffers menu
+Buffers=
+Previous=
+Next=
+Close All=
+
+# Help menu
+Help=
+About Sc1=
+About SciTE=
+
+# Dialogs
+
+# Generic dialog
+OK=
+Cancel=
+Yes=
+No=
+
+# About dialog
+#About SciTE=
+Contributors:=
+
+# Open, Save dialogs
+Open File=
+Save File=
+Save File As=
+Export File As HTML=
+Export File As RTF=
+Save Current Session=
+Custom Filter=
+
+# Find in Files dialog
+#Find in Files=
+Find what:=
+Files:=
+#Find=
+
+# Go To dialog
+Go To=
+Destination Line Number:=
+Current line:=
+Last line:=
+
+# Indentation Settings dialog
+Indentation Settings=
+Tab Size:=
+Indent Size:=
+Use tabs:=
+
+# Replace and Find dialogs
+#Replace=
+#Find=
+#Find what:=
+Replace with:=
+Match whole word only=
+Match case=
+Regular expression=
+Wrap around=
+Transform backslash expressions=
+#Find Next=
+Replace All=
+Replace in Selection=
+#Close=
+Direction=
+Reverse direction=
+Up=
+Down=
+
+# Parameters dialog
+Execute=
+Set=
+
+# Other UI strings
+Untitled=
+
+# Properties used in global options
+Text=
+All Source=
+All Files (*.*)=
+
+# Messages
+# Messages may contain variables such as file names or search strings indicated
+# by ^0 which are replaced by values before display. ^1, ^2, ... may be used in the future.
+Can not find the string '^0'.=
+Find string must not be empty for 'Replace All' command.=
+Selection must not be empty for 'Replace in Selection' command.=
+No replacements because string '^0' was not present.=
+Could not open file '^0'.=
+Could not save file '^0'.=
+Save changes to '^0'?=
+Save changes to (Untitled)?=
+The file '^0' has been modified. Should it be reloaded?=
+Bad file.=
+Failed to create dialog box: ^0.=
+Can not start printer document.=
+URI '^0' not understood.=
+Invalid directory '^0'.=
+
+# 1.42
+Directory:=
+Wrap=
+Hide=
+Check if already open=
+
+# 1.43
+Find string must not be empty for 'Replace in Selection' command.=
+List Macros=
+Run Current Macro=
+Record Macro=
+Stop Recording Macro=
+SciTE Help=
+Sc1 Help=
+Edit Properties=
+Wrap Output=
+
+# 1.44
+Read-Only=
+READ=
+
+# 1.46
+As TeX=
+Export File As TeX=
+Save a Copy=
+
+# 1.47
+As LaTeX=
+Export File As LaTeX=
+Encoding=
+8 Bit=
+UTF-8=
+
+# 1.49
+Save All=
+Browse=
+Select a folder to search from=
+UTF-8 Cookie=
+
+# 1.50
+Insert Abbreviation=
+Abbreviation:=
+Insert=
+Mark All=
+
+# 1.51
+In Selection=
+Paragraph=
+Join=
+Split=
+
+# 1.52
+Block comment variable '^0' is not defined in SciTE *.properties!=
+Box comment variables '^0', '^1' and '^2' are not defined in SciTE *.properties!=
+Stream comment variables '^0' and '^1' are not defined in SciTE *.properties!=
+The file '^0' has been modified outside SciTE. Should it be reloaded?=
+As PDF=
+Export File As PDF=
+
+# 1.53
+Version=
+by=
+
+#1.54
+Incremental Search=
+Search for:=
+
+#1.55
+Could not save file '^0'. Save under a different name?=
+
+#1.56
+As XML=
+Export File As XML=
+
+#1.57
+Destination Line:=
+Column:=
+
+#1.58
+Replacements:=
+Open Files Here=
+
+#1.59
+
+#1.60
+
+#1.61
+File '^0' is ^1 bytes long,\nlarger than the ^2 bytes limit set in the properties.\nDo you still want to open it?=
+Open Lua Startup Script=
+All Files (*)=
+Hidden Files (.*)=
+
+#1.62
+Show hidden files=
+
+#1.63
+Replace in Buffers=
+Find string must not be empty for 'Replace in Buffers' command.=
+Search only in this style:=
+
+#1.67
+Duplicate=
+
+#1.72
+Convert=
+
+#1.73
+Code Page Property=
+UTF-8 with BOM=
+Open Directory Options File=
+
+#1.77
+File '^0' is already open in another buffer.=
+
+# 2.10
+UTF-16 Big Endian=
+UTF-16 Little Endian=
+
+# 2.12
+The file '^0' has been modified outside SciTE. Should it be saved?=
+Copy Path=
+in=
+of=
+
+# 2.20
+Find:=
+Replace:=
+
+# 2.21
+Use tabs=
+Case sensitive=
+
+# 3.0.0
+The file '^0' has not yet been loaded entirely, so it can not be saved right now. Please retry in a while.=
+
+# 3.0.2
+Opening '^0'=
+Saving '^0'=
+Opening ^0 files =
+Saving ^0 files =
+
+# 3.0.4
+Job is currently executing. Wait until it finishes.=
+
+# Mac OS X 3.2.3
+Hide SciTE=
+Hide Others=
+Show All=
+Quit SciTE=
+Open Recent=
+Revert to Saved=
+Allow Access=
+Use Selection for Find=
+Enter Full Screen=
+Toolbar=
+Open Abbreviations Options File=
+
+# Mac OS X 3.3.5
+Spelling=
+No guesses for '^0'=
+
+# 3.3.8
+Path '^0' is a directory so can not be opened.=
+
+#3.4.5
+Clean=
+
+#3.5.7
+Selection Add Next=
+Selection Add Each=
+
+#3.7.1
+File '^0' is ^1 bytes long, larger than 2GB which is the largest SciTE can open.=
+
+#3.7.5
+Reverse Selected Lines=
+The file '^0' has been deleted.=
+Select All Bookmarks=
diff --git a/scite-app/scite/win32/makefile b/scite-app/scite/win32/makefile
new file mode 100644
index 0000000..05b699c
--- /dev/null
+++ b/scite-app/scite/win32/makefile
@@ -0,0 +1,217 @@
+# Make file for SciTE on Windows
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile assumes the mingw32 version of GCC 4.x is used and changes will
+# be needed to use other compilers.
+
+.PHONY: all clean analyze depend
+
+.SUFFIXES: .cxx .properties
+WINDRES ?= windres
+
+# normalize changes Unix style '/' directory separator to '\' for Windows shell
+ifeq (\,$(shell echo \\))
+	SHELL_TYPE = sh
+	normalize = $1
+else
+	normalize = $(subst /,\,$1)
+endif
+
+PYTHON = $(if $(windir),pyw,python3)
+
+WARNINGS += -Wall -pedantic -Wextra
+
+ifdef CLANG
+# 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
+SANITIZE = address
+#SANITIZE = undefined
+CXX = clang++
+CC = clang
+# Microsoft headers are used so _CRT_SECURE_NO_DEPRECATE avoids warnings for standard library like strcat,
+DEFINES += -D_CRT_SECURE_NO_DEPRECATE
+BASE_FLAGS += -fsanitize=$(SANITIZE)
+# Clang doesn't like omitting braces in array initialization but they just add noise,
+WARNINGS += -Wno-deprecated-register
+WARNINGS += -Wno-missing-braces
+WARNINGS += -Wno-language-extension-token
+else
+WARNINGS += -Wno-cast-function-type
+SUBSYSTEM_OPT = -Xlinker --subsystem -Xlinker windows
+endif
+
+ifeq ($(OS),Windows_NT)
+	ifndef CLANG
+		CC = gcc
+	endif
+	DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del)
+	COPY = $(if $(wildcard $(dir $(SHELL))cp.exe), $(dir $(SHELL))cp.exe -a, xcopy /Y)
+	VER = cmd /c ver
+	# Discover Windows version by running 'VER' command and parsing output
+	# For Windows 2000 looks like:Microsoft Windows 2000 [Version 5.00.2195]
+	WINVERWORDS:=$(wordlist 1,2,$(subst ., ,$(lastword $(shell $(VER)))))
+	WINVER:=$(firstword $(WINVERWORDS)).$(lastword $(WINVERWORDS))
+	# Windows NT 4 and Windows 2000 do not support themes so turn off
+ifeq '$(WINVER)' '4.0'
+	DEFINES += -DDISABLE_THEMES -DWIN_TARGET=0x0400
+else
+ifeq '$(WINVER)' '5.00'
+	DEFINES += -DDISABLE_THEMES
+else
+	LIBS += -luxtheme
+endif
+endif
+else
+	DEL = rm -f
+	COPY = cp -a
+	LIBS += -luxtheme
+endif
+
+PROG	= ../bin/SciTE.exe
+PROGSTATIC = ../bin/Sc1.exe
+DEFINES += -DUNICODE -D_UNICODE
+
+vpath %.h ../src ../../lexilla/include ../../lexilla/access ../../scintilla/include
+vpath %.cxx ../src ../../lexilla/access ../../scintilla/call
+vpath %.a ../../lexilla/bin ../../scintilla/bin
+
+LIBS += -lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 -lshell32 -lcomdlg32 -lcomctl32 -ladvapi32
+
+CXXFLAGS += --std=c++17
+
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+
+ifndef DEBUG
+ifndef CLANG
+STRIPFLAG="-Wl,-s"
+endif
+endif
+
+ifndef NO_LUA
+LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
+		ltable.o ltm.o lundump.o lvm.o lzio.o
+
+LUA_LIB_OBJS =	lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o ltablib.o \
+		lstrlib.o loadlib.o loslib.o linit.o lutf8lib.o
+
+LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+
+vpath %.c ../lua/src ../lua/src/lib
+
+INCLUDES += -I ../lua/src
+CFLAGS += -DLUA_USER_H=\"scite_lua_win.h\"
+else
+DEFINES += -DNO_LUA
+endif
+
+INCLUDES += -I ../../lexilla/include -I ../../lexilla/access -I ../../scintilla/include -I ../src
+RCINCLUDEDIRS=--include-dir ../src
+
+CBASEFLAGS = $(LUA_DEFINES) $(WIDEFLAGS)
+
+LDFLAGS += -mwindows
+
+%.o: %.cxx
+	$(CXX) $(DEFINES) $(INCLUDES) $(WARNINGS) $(CPPFLAGS) $(BASE_FLAGS) $(CXXFLAGS) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(DEFINES) $(INCLUDES) $(WARNINGS) $(CPPFLAGS) $(BASE_FLAGS) $(CFLAGS) -c $< -o $@
+
+SHAREDOBJS=\
+	Cookie.o \
+	DirectorExtension.o \
+	EditorConfig.o \
+	ExportHTML.o \
+	ExportPDF.o \
+	ExportRTF.o \
+	ExportTEX.o \
+	ExportXML.o \
+	FilePath.o \
+	FileWorker.o \
+	GUIWin.o \
+	IFaceTable.o \
+	JobQueue.o \
+	LexillaAccess.o \
+	MatchMarker.o \
+	MultiplexExtension.o \
+	PropSetFile.o \
+	ScintillaCall.o \
+	ScintillaWindow.o \
+	SciTEBase.o \
+	SciTEBuffers.o \
+	SciTEIO.o \
+	SciTEProps.o \
+	SciTEWinBar.o \
+	SciTEWinDlg.o \
+	StringHelpers.o \
+	StringList.o \
+	Strips.o \
+	StyleDefinition.o \
+	StyleWriter.o \
+	UniqueInstance.o \
+	Utf8_16.o
+
+OTHER_OBJS = $(SHAREDOBJS) $(LUA_OBJS) SciTERes.o SciTEWin.o
+
+OBJS = Credits.o $(OTHER_OBJS)
+
+DLLS=../bin/Scintilla.dll ../bin/lexilla.dll
+
+NOTBINPROPS=SciTE.properties Embedded.properties
+PROPS=$(addprefix ../bin/,$(filter-out $(NOTBINPROPS), $(notdir $(wildcard ../src/*.properties))))
+
+all:	$(PROG) $(PROGSTATIC) $(DLLS) $(PROPS) $(LUA_SCRIPTS)
+
+clean:
+	$(DEL) *.exe *.o *.obj *.dll *.res *.map *.plist
+
+analyze:
+	clang --analyze $(DEFINES) $(INCLUDES) $(WARNINGS) $(CPPFLAGS) $(BASE_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx
+
+depend deps.mak:
+	$(PYTHON) AppDepGen.py
+
+../bin/%.dll:	../../lexilla/bin/%.dll
+	$(COPY) $(call normalize,$< $(@D))
+
+../bin/%.dll:	../../scintilla/bin/%.dll
+	$(COPY) $(call normalize,$< $(@D))
+
+../bin/%.properties:	../src/%.properties
+	$(COPY) $(call normalize,$< $(@D))
+
+$(PROG): $(OBJS)
+	$(CXX) $(BASE_FLAGS) $(STRIPFLAG) $(SUBSYSTEM_OPT) -o  $@ $^ $(LDFLAGS) $(LIBS) $(LDLIBS)
+
+OBJSSTATIC = \
+	$(SHAREDOBJS) \
+	Credits.o \
+	Sc1.o \
+	Sc1Res.o \
+	libscintilla.a \
+	liblexilla.a \
+	$(LUA_OBJS)
+
+$(PROGSTATIC): $(OBJSSTATIC)
+	$(CXX) $(BASE_FLAGS) $(STRIPFLAG) $(SUBSYSTEM_OPT) -static -o $@ $^ $(LDFLAGS) $(LIBS) $(LDLIBS)
+
+# Automatically generate dependencies for most files with "make deps"
+include deps.mak
+
+Sc1.o: SciTEWin.cxx SciTEWin.h SciTE.h PropSetFile.h \
+ Scintilla.h Extender.h FilePath.h SciTEBase.h FileWorker.h JobQueue.h
+	$(CXX) $(DEFINES) $(INCLUDES) $(WARNINGS) $(CPPFLAGS) $(BASE_FLAGS) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@
+
+SciTERes.o:	SciTERes.rc SciTE.h SciTE.exe.manifest
+	$(WINDRES) $(RCINCLUDEDIRS) SciTERes.rc $@
+
+# Also depends on ../src/Embedded.properties but may not want to build everywhere
+# so must explicitly ask to build it.
+Sc1Res.o:	SciTERes.rc SciTE.h SciTE.exe.manifest
+	$(WINDRES) $(RCINCLUDEDIRS) SciTERes.rc --define STATIC_BUILD $@
+
+# Make sure Credits gets rebuilt (so its about box gets a new
+# date stamp) when any of the other objects are updated.
+Credits.o: $(OTHER_OBJS)
diff --git a/scite-app/scite/win32/nmdeps.mak b/scite-app/scite/win32/nmdeps.mak
new file mode 100644
index 0000000..9ea98e4
--- /dev/null
+++ b/scite-app/scite/win32/nmdeps.mak
@@ -0,0 +1,1022 @@
+# Created by AppDepGen.py. To recreate, run AppDepGen.py.
+DirectorExtension.obj: \
+	DirectorExtension.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	DirectorExtension.h
+GUIWin.obj: \
+	GUIWin.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../src/GUI.h
+SciTEWin.obj: \
+	SciTEWin.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h \
+	DLLFunction.h \
+	../src/MultiplexExtension.h \
+	DirectorExtension.h \
+	../src/LuaExtension.h
+Sc1.obj: \
+	SciTEWin.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h \
+	DLLFunction.h \
+	../src/MultiplexExtension.h \
+	DirectorExtension.h \
+	../src/LuaExtension.h
+SciTEWinBar.obj: \
+	SciTEWinBar.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+SciTEWinDlg.obj: \
+	SciTEWinDlg.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+Strips.obj: \
+	Strips.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+UniqueInstance.obj: \
+	UniqueInstance.cxx \
+	SciTEWin.h \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	UniqueInstance.h \
+	../src/StripDefinition.h \
+	Strips.h \
+	../src/SciTEKeys.h
+Cookie.obj: \
+	../src/Cookie.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/Cookie.h
+Credits.obj: \
+	../src/Credits.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+EditorConfig.obj: \
+	../src/EditorConfig.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/EditorConfig.h
+ExportHTML.obj: \
+	../src/ExportHTML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportPDF.obj: \
+	../src/ExportPDF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportRTF.obj: \
+	../src/ExportRTF.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportTEX.obj: \
+	../src/ExportTEX.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+ExportXML.obj: \
+	../src/ExportXML.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+FilePath.obj: \
+	../src/FilePath.cxx \
+	../src/GUI.h \
+	../src/FilePath.h
+FileWorker.obj: \
+	../src/FileWorker.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/FilePath.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/Utf8_16.h
+IFaceTable.obj: \
+	../src/IFaceTable.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/IFaceTable.h
+JobQueue.obj: \
+	../src/JobQueue.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h \
+	../src/SciTE.h \
+	../src/JobQueue.h
+LuaExtension.obj: \
+	../src/LuaExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/IFaceTable.h \
+	../src/SciTEKeys.h \
+	../src/LuaExtension.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+MatchMarker.obj: \
+	../src/MatchMarker.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/MatchMarker.h
+MultiplexExtension.obj: \
+	../src/MultiplexExtension.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/MultiplexExtension.h \
+	../src/Extender.h
+PropSetFile.obj: \
+	../src/PropSetFile.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/PropSetFile.h
+ScintillaWindow.obj: \
+	../src/ScintillaWindow.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../scintilla/include/Sci_Position.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h
+SciTEBase.obj: \
+	../src/SciTEBase.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h
+SciTEBuffers.obj: \
+	../src/SciTEBuffers.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../lexilla/include/SciLexer.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h
+SciTEIO.obj: \
+	../src/SciTEIO.cxx \
+	../../scintilla/include/ILoader.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/FileWorker.h \
+	../src/MatchMarker.h \
+	../src/SciTEBase.h \
+	../src/Utf8_16.h
+SciTEProps.obj: \
+	../src/SciTEProps.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h \
+	../../scintilla/include/Scintilla.h \
+	../../lexilla/include/SciLexer.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h \
+	../src/GUI.h \
+	../src/ScintillaWindow.h \
+	../src/StringList.h \
+	../src/StringHelpers.h \
+	../src/FilePath.h \
+	../src/StyleDefinition.h \
+	../src/PropSetFile.h \
+	../src/StyleWriter.h \
+	../src/Extender.h \
+	../src/SciTE.h \
+	../src/JobQueue.h \
+	../src/Cookie.h \
+	../src/Worker.h \
+	../src/MatchMarker.h \
+	../src/EditorConfig.h \
+	../src/SciTEBase.h \
+	../src/IFaceTable.h
+StringHelpers.obj: \
+	../src/StringHelpers.cxx \
+	../src/GUI.h \
+	../src/StringHelpers.h
+StringList.obj: \
+	../src/StringList.cxx \
+	../src/GUI.h \
+	../src/StringList.h \
+	../src/StringHelpers.h
+StyleDefinition.obj: \
+	../src/StyleDefinition.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../src/GUI.h \
+	../src/StringHelpers.h \
+	../src/StyleDefinition.h
+StyleWriter.obj: \
+	../src/StyleWriter.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaCall.h \
+	../src/GUI.h \
+	../src/StyleWriter.h
+Utf8_16.obj: \
+	../src/Utf8_16.cxx \
+	../src/Utf8_16.h
+lapi.obj: \
+	../lua/src/lapi.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+lauxlib.obj: \
+	../lua/src/lauxlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h
+lbaselib.obj: \
+	../lua/src/lbaselib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lbitlib.obj: \
+	../lua/src/lbitlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lcode.obj: \
+	../lua/src/lcode.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lcorolib.obj: \
+	../lua/src/lcorolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lctype.obj: \
+	../lua/src/lctype.c \
+	../lua/src/lprefix.h \
+	../lua/src/lctype.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/llimits.h
+ldblib.obj: \
+	../lua/src/ldblib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ldebug.obj: \
+	../lua/src/ldebug.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ldo.obj: \
+	../lua/src/ldo.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lundump.h \
+	../lua/src/lvm.h
+ldump.obj: \
+	../lua/src/ldump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lundump.h
+lfunc.obj: \
+	../lua/src/lfunc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lfunc.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lgc.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h
+lgc.obj: \
+	../lua/src/lgc.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+linit.obj: \
+	../lua/src/linit.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lualib.h \
+	../lua/src/lauxlib.h
+liolib.obj: \
+	../lua/src/liolib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+llex.obj: \
+	../lua/src/llex.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lparser.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lmathlib.obj: \
+	../lua/src/lmathlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lmem.obj: \
+	../lua/src/lmem.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h
+loadlib.obj: \
+	../lua/src/loadlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lobject.obj: \
+	../lua/src/lobject.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lctype.h \
+	../lua/src/llimits.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lvm.h
+lopcodes.obj: \
+	../lua/src/lopcodes.c \
+	../lua/src/lprefix.h \
+	../lua/src/lopcodes.h \
+	../lua/src/llimits.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h
+loslib.obj: \
+	../lua/src/loslib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lparser.obj: \
+	../lua/src/lparser.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lcode.h \
+	../lua/src/llex.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lparser.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/ltm.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h
+lstate.obj: \
+	../lua/src/lstate.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lapi.h \
+	../lua/src/llimits.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldebug.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/llex.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h
+lstring.obj: \
+	../lua/src/lstring.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h
+lstrlib.obj: \
+	../lua/src/lstrlib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltable.obj: \
+	../lua/src/ltable.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lgc.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+ltablib.obj: \
+	../lua/src/ltablib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+ltm.obj: \
+	../lua/src/ltm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lundump.obj: \
+	../lua/src/lundump.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lstring.h \
+	../lua/src/lgc.h \
+	../lua/src/lundump.h
+lutf8lib.obj: \
+	../lua/src/lutf8lib.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/lauxlib.h \
+	../lua/src/lualib.h
+lvm.obj: \
+	../lua/src/lvm.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/ldebug.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/llimits.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h \
+	../lua/src/lmem.h \
+	../lua/src/ldo.h \
+	../lua/src/lfunc.h \
+	../lua/src/lgc.h \
+	../lua/src/lopcodes.h \
+	../lua/src/lstring.h \
+	../lua/src/ltable.h \
+	../lua/src/lvm.h
+lzio.obj: \
+	../lua/src/lzio.c \
+	../lua/src/lprefix.h \
+	../lua/src/lua.h \
+	../lua/src/luaconf.h \
+	../src/scite_lua_win.h \
+	../lua/src/llimits.h \
+	../lua/src/lmem.h \
+	../lua/src/lstate.h \
+	../lua/src/lobject.h \
+	../lua/src/ltm.h \
+	../lua/src/lzio.h
+LexillaAccess.obj: \
+	../../lexilla/access/LexillaAccess.cxx \
+	../../scintilla/include/ILexer.h \
+	../../scintilla/include/Sci_Position.h \
+	../../lexilla/include/Lexilla.h \
+	../../lexilla/access/LexillaAccess.h
+ScintillaCall.obj: \
+	../../scintilla/call/ScintillaCall.cxx \
+	../../scintilla/include/ScintillaTypes.h \
+	../../scintilla/include/ScintillaMessages.h \
+	../../scintilla/include/ScintillaCall.h
diff --git a/scite-app/scite/win32/regex.bmp b/scite-app/scite/win32/regex.bmp
new file mode 100644
index 0000000..0278241
Binary files /dev/null and b/scite-app/scite/win32/regex.bmp differ
diff --git a/scite-app/scite/win32/regex20.bmp b/scite-app/scite/win32/regex20.bmp
new file mode 100644
index 0000000..c46e961
Binary files /dev/null and b/scite-app/scite/win32/regex20.bmp differ
diff --git a/scite-app/scite/win32/regex24.bmp b/scite-app/scite/win32/regex24.bmp
new file mode 100644
index 0000000..a402db7
Binary files /dev/null and b/scite-app/scite/win32/regex24.bmp differ
diff --git a/scite-app/scite/win32/regex32.bmp b/scite-app/scite/win32/regex32.bmp
new file mode 100644
index 0000000..e036dc2
Binary files /dev/null and b/scite-app/scite/win32/regex32.bmp differ
diff --git a/scite-app/scite/win32/scite.mak b/scite-app/scite/win32/scite.mak
new file mode 100644
index 0000000..f4f2f63
--- /dev/null
+++ b/scite-app/scite/win32/scite.mak
@@ -0,0 +1,248 @@
+# Make file for SciTE on Windows Visual C++ version
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
+# The License.txt file describes the conditions under which this software may be distributed.
+# This makefile is for using Visual C++ with nmake.
+# Usage for Microsoft:
+#     nmake -f scite.mak
+# For debug versions define DEBUG on the command line.
+# For a build without Lua, define NO_LUA on the command line.
+# The main makefile uses mingw32 gcc and may be more current than this file.
+
+.SUFFIXES: .cxx .properties .dll
+
+DIR_BIN=..\bin
+DIR_SCINTILLA=..\..\scintilla
+DIR_SCINTILLA_BIN=$(DIR_SCINTILLA)\bin
+DIR_LEXILLA=..\..\lexilla
+DIR_LEXILLA_BIN=$(DIR_LEXILLA)\bin
+
+PROG=$(DIR_BIN)\SciTE.exe
+PROGSTATIC=$(DIR_BIN)\Sc1.exe
+DLLS=$(DIR_BIN)\Scintilla.dll $(DIR_BIN)\Lexilla.dll
+
+WIDEFLAGS=-DUNICODE -D_UNICODE
+
+LD=link
+
+!IFDEF SUPPORT_XP
+ADD_DEFINE=-D_USING_V110_SDK71_
+# Different subsystems for 32-bit and 64-bit Windows XP so detect based on Platform
+# environment vairable set by vcvars*.bat to be either x86 or x64
+!IF "$(PLATFORM)" == "x64"
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.02
+!ELSE
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,5.01
+!ENDIF
+!ELSE
+CETCOMPAT=-CETCOMPAT
+!IFDEF ARM64
+ADD_DEFINE=-D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1
+SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
+!ENDIF
+!ENDIF
+
+CXXFLAGS=-Zi -TP -MP -W4 -EHsc -Zc:forScope -Zc:wchar_t -std:c++17 -D_CRT_SECURE_NO_DEPRECATE=1 -D_CRT_NONSTDC_NO_DEPRECATE $(WIDEFLAGS) $(ADD_DEFINE)
+CCFLAGS=-TC -MP -W3 -wd4244 -D_CRT_SECURE_NO_DEPRECATE=1 -DLUA_USER_H=\"scite_lua_win.h\" $(ADD_DEFINE)
+
+CXXDEBUG=-Od -MTd -DDEBUG
+# Don't use "-MD", even with "-D_STATIC_CPPLIB" because it links to MSVCR71.DLL
+CXXNDEBUG=-O1 -Oi -MT -DNDEBUG -GL
+NAME=-Fo
+LDFLAGS=-OPT:REF -LTCG -DEBUG $(SUBSYSTEM) $(CETCOMPAT)
+LDDEBUG=
+LIBS=KERNEL32.lib USER32.lib GDI32.lib MSIMG32.lib COMDLG32.lib COMCTL32.lib ADVAPI32.lib IMM32.lib SHELL32.LIB OLE32.LIB OLEAUT32.LIB UXTHEME.LIB
+NOLOGO=-nologo
+
+!IFDEF QUIET
+CXX=@$(CXX)
+CXXFLAGS=$(CXXFLAGS) $(NOLOGO)
+CCFLAGS=$(CCFLAGS) $(NOLOGO)
+LDFLAGS=$(LDFLAGS) $(NOLOGO)
+!ENDIF
+
+!IFDEF DEBUG
+CXXFLAGS=$(CXXFLAGS) $(CXXDEBUG)
+CCFLAGS=$(CCFLAGS) $(CXXDEBUG)
+LDFLAGS=$(LDDEBUG) $(LDFLAGS)
+!ELSE
+CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
+CCFLAGS=$(CCFLAGS) $(CXXNDEBUG)
+!ENDIF
+
+INCLUDEDIRS=-I../../lexilla/include -I../../lexilla/access -I../../scintilla/include -I../src
+
+SHAREDOBJS=\
+	Cookie.obj \
+	Credits.obj \
+	DirectorExtension.obj \
+	EditorConfig.obj \
+	ExportHTML.obj \
+	ExportPDF.obj \
+	ExportRTF.obj \
+	ExportTEX.obj \
+	ExportXML.obj \
+	FilePath.obj \
+	FileWorker.obj \
+	GUIWin.obj \
+	IFaceTable.obj \
+	JobQueue.obj \
+	LexillaAccess.obj \
+	MatchMarker.obj \
+	MultiplexExtension.obj \
+	PropSetFile.obj \
+	ScintillaCall.obj \
+	ScintillaWindow.obj \
+	SciTEBase.obj \
+	SciTEBuffers.obj \
+	SciTEIO.obj \
+	SciTEProps.obj \
+	SciTEWinBar.obj \
+	SciTEWinDlg.obj \
+	StringHelpers.obj \
+	StringList.obj \
+	Strips.obj \
+	StyleDefinition.obj \
+	StyleWriter.obj \
+	UniqueInstance.obj \
+	Utf8_16.obj
+
+OBJS=\
+	$(SHAREDOBJS) \
+	SciTEWin.obj
+
+LIBSCI=$(DIR_SCINTILLA_BIN)\libscintilla.lib
+LIBLEX=$(DIR_LEXILLA_BIN)\liblexilla.lib
+
+OBJSSTATIC=$(SHAREDOBJS) Sc1.obj
+
+#++Autogenerated -- run ../scripts/RegenerateSource.py to regenerate
+#**LEXPROPS=\\\n\($(DIR_BIN)\\\* \)
+LEXPROPS=\
+$(DIR_BIN)\abaqus.properties $(DIR_BIN)\ada.properties \
+$(DIR_BIN)\asl.properties $(DIR_BIN)\asm.properties $(DIR_BIN)\asn1.properties \
+$(DIR_BIN)\au3.properties $(DIR_BIN)\ave.properties $(DIR_BIN)\avs.properties \
+$(DIR_BIN)\baan.properties $(DIR_BIN)\blitzbasic.properties \
+$(DIR_BIN)\bullant.properties $(DIR_BIN)\caml.properties \
+$(DIR_BIN)\cil.properties $(DIR_BIN)\cmake.properties \
+$(DIR_BIN)\cobol.properties $(DIR_BIN)\coffeescript.properties \
+$(DIR_BIN)\conf.properties $(DIR_BIN)\cpp.properties \
+$(DIR_BIN)\csound.properties $(DIR_BIN)\css.properties $(DIR_BIN)\d.properties \
+$(DIR_BIN)\dataflex.properties $(DIR_BIN)\ecl.properties \
+$(DIR_BIN)\eiffel.properties $(DIR_BIN)\erlang.properties \
+$(DIR_BIN)\escript.properties $(DIR_BIN)\flagship.properties \
+$(DIR_BIN)\forth.properties $(DIR_BIN)\fortran.properties \
+$(DIR_BIN)\freebasic.properties $(DIR_BIN)\fsharp.properties \
+$(DIR_BIN)\gap.properties $(DIR_BIN)\haskell.properties \
+$(DIR_BIN)\hex.properties $(DIR_BIN)\html.properties \
+$(DIR_BIN)\inno.properties $(DIR_BIN)\json.properties \
+$(DIR_BIN)\kix.properties $(DIR_BIN)\latex.properties \
+$(DIR_BIN)\lisp.properties $(DIR_BIN)\lot.properties \
+$(DIR_BIN)\lout.properties $(DIR_BIN)\lua.properties \
+$(DIR_BIN)\markdown.properties $(DIR_BIN)\matlab.properties \
+$(DIR_BIN)\maxima.properties $(DIR_BIN)\metapost.properties \
+$(DIR_BIN)\mmixal.properties $(DIR_BIN)\modula3.properties \
+$(DIR_BIN)\nim.properties $(DIR_BIN)\nimrod.properties \
+$(DIR_BIN)\nncrontab.properties $(DIR_BIN)\nsis.properties \
+$(DIR_BIN)\opal.properties $(DIR_BIN)\oscript.properties \
+$(DIR_BIN)\others.properties $(DIR_BIN)\pascal.properties \
+$(DIR_BIN)\perl.properties $(DIR_BIN)\pov.properties \
+$(DIR_BIN)\powerpro.properties $(DIR_BIN)\powershell.properties \
+$(DIR_BIN)\ps.properties $(DIR_BIN)\purebasic.properties \
+$(DIR_BIN)\python.properties $(DIR_BIN)\r.properties \
+$(DIR_BIN)\raku.properties $(DIR_BIN)\rebol.properties \
+$(DIR_BIN)\registry.properties $(DIR_BIN)\ruby.properties \
+$(DIR_BIN)\rust.properties $(DIR_BIN)\sas.properties \
+$(DIR_BIN)\scriptol.properties $(DIR_BIN)\smalltalk.properties \
+$(DIR_BIN)\sorcins.properties $(DIR_BIN)\specman.properties \
+$(DIR_BIN)\spice.properties $(DIR_BIN)\sql.properties \
+$(DIR_BIN)\tacl.properties $(DIR_BIN)\tal.properties $(DIR_BIN)\tcl.properties \
+$(DIR_BIN)\tex.properties $(DIR_BIN)\txt2tags.properties \
+$(DIR_BIN)\vb.properties $(DIR_BIN)\verilog.properties \
+$(DIR_BIN)\vhdl.properties $(DIR_BIN)\visualprolog.properties \
+$(DIR_BIN)\yaml.properties
+#--Autogenerated -- end of automatically generated section
+
+PROPS=$(DIR_BIN)\SciTEGlobal.properties $(DIR_BIN)\abbrev.properties $(LEXPROPS)
+
+!IFNDEF NO_LUA
+LUA_CORE_OBJS = lapi.obj lcode.obj lctype.obj ldebug.obj ldo.obj ldump.obj lfunc.obj lgc.obj llex.obj \
+                lmem.obj lobject.obj lopcodes.obj lparser.obj lstate.obj lstring.obj \
+                ltable.obj ltm.obj lundump.obj lvm.obj lzio.obj
+
+LUA_LIB_OBJS =	lauxlib.obj lbaselib.obj lbitlib.obj lcorolib.obj ldblib.obj liolib.obj lmathlib.obj ltablib.obj \
+                lstrlib.obj loadlib.obj loslib.obj linit.obj lutf8lib.obj
+
+LUA_OBJS = LuaExtension.obj $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+
+OBJS = $(OBJS) $(LUA_OBJS)
+OBJSSTATIC = $(OBJSSTATIC) $(LUA_OBJS)
+INCLUDEDIRS = $(INCLUDEDIRS) -I../lua/src
+!ELSE
+CXXFLAGS=$(CXXFLAGS) -DNO_LUA
+!ENDIF
+
+CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS)
+CCFLAGS=$(CCFLAGS) $(INCLUDEDIRS)
+
+
+ALL: $(PROG) $(PROGSTATIC) $(DLLS) $(PROPS)
+
+clean:
+	del /q $(DIR_BIN)\*.exe *.o *.obj $(DIR_BIN)\*.dll *.res *.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.lib $(DIR_BIN)\*.pdb
+
+depend:
+	pyw AppDepGen.py
+
+{$(DIR_SCINTILLA_BIN)}.dll{$(DIR_BIN)}.dll:
+	copy $< $@
+
+{$(DIR_LEXILLA_BIN)}.dll{$(DIR_BIN)}.dll:
+	copy $< $@
+
+{..\src}.properties{$(DIR_BIN)}.properties:
+	copy $< $@
+
+# A custom rule for .obj files built by scintilla:
+..\..\scintilla\win32\PlatWin.obj: 	..\..\scintilla\win32\PlatWin.cxx
+	@echo You must run the Scintilla makefile to build $*.obj
+	@exit 255
+
+SciTERes.res: SciTERes.rc ..\src\SciTE.h SciTE.exe.manifest
+	$(RC) $(INCLUDEDIRS) -fo$@ SciTERes.rc
+
+Sc1Res.res: SciTERes.rc ..\src\SciTE.h SciTE.exe.manifest
+	$(RC) $(INCLUDEDIRS) -dSTATIC_BUILD -fo$@ SciTERes.rc
+
+$(PROG): $(OBJS) SciTERes.res
+	$(LD) $(LDFLAGS) -OUT:$@ $** $(LIBS)
+
+$(PROGSTATIC): $(OBJSSTATIC) $(LIBSCI) $(LIBLEX) Sc1Res.res
+	$(LD) $(LDFLAGS) -OUT:$@ $** $(LIBS)
+
+# Define how to build all the objects and what they depend on
+# Some source files are compiled into more than one object because of different conditional compilation
+
+{..\src}.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+{..\..\lexilla\access}.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+{..\..\scintilla\call}.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+{.}.cxx.obj::
+	$(CXX) $(CXXFLAGS) -c $<
+
+{..\lua\src}.c.obj::
+	$(CXX) $(CCFLAGS) -c $<
+
+Sc1.obj: SciTEWin.cxx
+	$(CXX) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAME)$@ SciTEWin.cxx
+
+# Dependencies
+
+!IF EXISTS(nmdeps.mak)
+
+# Protect with !IF EXISTS to handle accidental deletion - just 'nmake -f scite.mak deps'
+
+!INCLUDE nmdeps.mak
+
+!ENDIF
diff --git a/scite-app/scite/win32/up.bmp b/scite-app/scite/win32/up.bmp
new file mode 100644
index 0000000..d6ac35d
Binary files /dev/null and b/scite-app/scite/win32/up.bmp differ
diff --git a/scite-app/scite/win32/up20.bmp b/scite-app/scite/win32/up20.bmp
new file mode 100644
index 0000000..02d62ae
Binary files /dev/null and b/scite-app/scite/win32/up20.bmp differ
diff --git a/scite-app/scite/win32/up24.bmp b/scite-app/scite/win32/up24.bmp
new file mode 100644
index 0000000..347a41c
Binary files /dev/null and b/scite-app/scite/win32/up24.bmp differ
diff --git a/scite-app/scite/win32/up32.bmp b/scite-app/scite/win32/up32.bmp
new file mode 100644
index 0000000..ae205ce
Binary files /dev/null and b/scite-app/scite/win32/up32.bmp differ
diff --git a/scite-app/scite/win32/word.bmp b/scite-app/scite/win32/word.bmp
new file mode 100644
index 0000000..c176270
Binary files /dev/null and b/scite-app/scite/win32/word.bmp differ
diff --git a/scite-app/scite/win32/word20.bmp b/scite-app/scite/win32/word20.bmp
new file mode 100644
index 0000000..a56489d
Binary files /dev/null and b/scite-app/scite/win32/word20.bmp differ
diff --git a/scite-app/scite/win32/word24.bmp b/scite-app/scite/win32/word24.bmp
new file mode 100644
index 0000000..d610ec1
Binary files /dev/null and b/scite-app/scite/win32/word24.bmp differ
diff --git a/scite-app/scite/win32/word32.bmp b/scite-app/scite/win32/word32.bmp
new file mode 100644
index 0000000..ae7bcdd
Binary files /dev/null and b/scite-app/scite/win32/word32.bmp differ
diff --git a/scite-app/scite/zipsrc.bat b/scite-app/scite/zipsrc.bat
new file mode 100755
index 0000000..54fe804
--- /dev/null
+++ b/scite-app/scite/zipsrc.bat
@@ -0,0 +1,7 @@
+cd ..
+del/q scite.zip
+zip scite.zip lexilla\*.* lexilla\*\*.* lexilla\*\*\*.* lexilla\*\*\*\*.* lexilla\*\*\*\*\*.*  scintilla\*.* scintilla\*\*.* scintilla\*\*\*.* scintilla\*\*\*\*.* scintilla\*\*\*\*\*.* scite\*.* scite\*\*.* scite\*\*\*.* scite\*\*\*\*.* -x *.o -x *.obj -x *.a -x *.lib -x *.dll -x *.exe -x *.pdb -x *.i -x *.res -x *.exp -x *.ncb -x *.sbr -x *.bsc -x *.tlog -x *.ilk -x *.ipch -x *.idb -x *.sdf -x *.dpsession -x *.bak
+zip scite.zip -d scintilla/.hg/*
+zip scite.zip -d lexilla/.hg/*
+zip scite.zip -d scite/.hg/*
+cd scite
diff --git a/scite-app/scite/zipwscite.bat b/scite-app/scite/zipwscite.bat
new file mode 100755
index 0000000..81454f1
--- /dev/null
+++ b/scite-app/scite/zipwscite.bat
@@ -0,0 +1,18 @@
+cd ..
+del/q wscite.zip
+mkdir wscite
+copy scite\license.txt wscite
+copy scite\bin\SciTE*.exe wscite
+copy scite\bin\Lexilla.dll wscite
+copy scite\bin\Scintilla.dll wscite
+copy scite\src\*.properties wscite
+copy scite\lua\COPYRIGHT wscite\luaCOPYRIGHT
+del/q wscite\Embedded.properties
+copy scite\doc\*.html wscite
+copy scite\doc\*.png wscite
+copy scite\doc\*.jpg wscite
+copy scite\doc\*.1 wscite
+zip wscite.zip wscite\*.*
+del/q wscite\*.*
+rmdir wscite
+cd scite
diff --git a/scite-app/scite/zipwscited.bat b/scite-app/scite/zipwscited.bat
new file mode 100755
index 0000000..7e639c0
--- /dev/null
+++ b/scite-app/scite/zipwscited.bat
@@ -0,0 +1,19 @@
+cd ..
+del/q wscite.zip
+mkdir wscite
+copy scite\license.txt wscite
+copy scite\bin\SciTE*.exe wscite
+copy scite\bin\SciTE.pdb wscite
+copy scite\bin\SciLexer.dll wscite
+copy scite\bin\SciLexer.pdb wscite
+copy scite\src\*.properties wscite
+copy scite\lua\COPYRIGHT wscite\luaCOPYRIGHT
+del/q wscite\Embedded.properties
+copy scite\doc\*.html wscite
+copy scite\doc\*.png wscite
+copy scite\doc\*.jpg wscite
+copy scite\doc\*.1 wscite
+zip wscite.zip wscite\*.*
+del/q wscite\*.*
+rmdir wscite
+cd scite